diff --git a/ChangeLog b/ChangeLog
index 13cf705a2..9c1eb636c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-13  Dirk Eddelbuettel  <edd@debian.org>
+
+	* DESCRIPTION (Version, Date):  Release 1.87.0-0 pre-release
+
+2024-12-12  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/boost/*: Upgraded to Boost 1.87.0, as usual with
+	requested patch to comment out 'diagnostic ignored' for CRAN
+	* local/patches/bh_1.87.0-0.patch: Added new single patch file
+
+	* local/scripts/CreateBoost.sh: Update for 1.87.0, no additions
+
 2024-08-05  Dirk Eddelbuettel  <edd@debian.org>
 
 	* README.md: Switch two more some URLs from http to https
diff --git a/DESCRIPTION b/DESCRIPTION
index d544d94fc..489eeb256 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: BH
 Type: Package
 Title: Boost C++ Header Files
-Version: 1.84.0-0.1
-Date: 2024-08-02
+Version: 1.87.0-0
+Date: 2024-12-12
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org",
                     comment = c(ORCID = "0000-0001-6419-907X")),
              person("John W.", "Emerson", role = "aut"), 
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
index dd2354c89..092cdceaa 100644
--- a/inst/NEWS.Rd
+++ b/inst/NEWS.Rd
@@ -7,6 +7,14 @@
 \newcommand{\ghit}{\href{https://github.com/eddelbuettel/bh/issues/#1}{##1}}
 \newcommand{\ghpr}{\href{https://github.com/eddelbuettel/bh/pull/#1}{##1}}
 
+\section{Changes in version 1.87.0-0 (2024-12-13 non-CRAN pre-release)}{
+  \itemize{
+    \item Upgrade to \boost 1.87.0, patched as usual to comment-out
+    diagnostic suppression messages per the request of CRAN
+    \item Switched to Authors@R
+  }
+}
+
 \section{Changes in version 1.84.0-0 (2024-01-09)}{
   \itemize{
     \item Upgrade to \boost 1.84.0 
diff --git a/inst/include/boost/any.hpp b/inst/include/boost/any.hpp
index f7812eef9..483498b10 100644
--- a/inst/include/boost/any.hpp
+++ b/inst/include/boost/any.hpp
@@ -358,7 +358,7 @@ namespace boost
 }
 
 // Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
-// Copyright Antony Polukhin, 2013-2023.
+// Copyright Antony Polukhin, 2013-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/any/bad_any_cast.hpp b/inst/include/boost/any/bad_any_cast.hpp
index ed456021a..309b8a0b9 100644
--- a/inst/include/boost/any/bad_any_cast.hpp
+++ b/inst/include/boost/any/bad_any_cast.hpp
@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2020-2023.
+// Copyright Antony Polukhin, 2020-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/any/basic_any.hpp b/inst/include/boost/any/basic_any.hpp
index 116cb4e1a..47d9fd7e1 100644
--- a/inst/include/boost/any/basic_any.hpp
+++ b/inst/include/boost/any/basic_any.hpp
@@ -1,5 +1,5 @@
 // Copyright Ruslan Arutyunyan, 2019-2021.
-// Copyright Antony Polukhin, 2021-2023.
+// Copyright Antony Polukhin, 2021-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/any/detail/placeholder.hpp b/inst/include/boost/any/detail/placeholder.hpp
index 360d78cb0..bf7395c17 100644
--- a/inst/include/boost/any/detail/placeholder.hpp
+++ b/inst/include/boost/any/detail/placeholder.hpp
@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2021-2023.
+// Copyright Antony Polukhin, 2021-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/any/fwd.hpp b/inst/include/boost/any/fwd.hpp
index 752f3acef..be70d6008 100644
--- a/inst/include/boost/any/fwd.hpp
+++ b/inst/include/boost/any/fwd.hpp
@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2021-2023.
+// Copyright Antony Polukhin, 2021-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/any/unique_any.hpp b/inst/include/boost/any/unique_any.hpp
index 9f4f41c17..fb250d43d 100644
--- a/inst/include/boost/any/unique_any.hpp
+++ b/inst/include/boost/any/unique_any.hpp
@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2020-2023.
+// Copyright Antony Polukhin, 2020-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/asio.hpp b/inst/include/boost/asio.hpp
index 7b889de4a..a0f93111a 100644
--- a/inst/include/boost/asio.hpp
+++ b/inst/include/boost/asio.hpp
@@ -2,7 +2,7 @@
 // asio.hpp
 // ~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -61,12 +61,17 @@
 #include <boost/asio/buffered_write_stream_fwd.hpp>
 #include <boost/asio/buffered_write_stream.hpp>
 #include <boost/asio/buffers_iterator.hpp>
+#include <boost/asio/cancel_after.hpp>
+#include <boost/asio/cancel_at.hpp>
 #include <boost/asio/cancellation_signal.hpp>
 #include <boost/asio/cancellation_state.hpp>
 #include <boost/asio/cancellation_type.hpp>
+#include <boost/asio/co_composed.hpp>
 #include <boost/asio/co_spawn.hpp>
 #include <boost/asio/completion_condition.hpp>
 #include <boost/asio/compose.hpp>
+#include <boost/asio/composed.hpp>
+#include <boost/asio/config.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/connect_pipe.hpp>
 #include <boost/asio/consign.hpp>
@@ -74,8 +79,10 @@
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/asio/defer.hpp>
 #include <boost/asio/deferred.hpp>
+#include <boost/asio/default_completion_token.hpp>
 #include <boost/asio/detached.hpp>
 #include <boost/asio/dispatch.hpp>
+#include <boost/asio/disposition.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/execution.hpp>
 #include <boost/asio/execution/allocator.hpp>
@@ -101,10 +108,9 @@
 #include <boost/asio/generic/stream_protocol.hpp>
 #include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/asio/high_resolution_timer.hpp>
+#include <boost/asio/immediate.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/io_context_strand.hpp>
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/io_service_strand.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/address_v4.hpp>
 #include <boost/asio/ip/address_v4_iterator.hpp>
diff --git a/inst/include/boost/asio/any_completion_executor.hpp b/inst/include/boost/asio/any_completion_executor.hpp
index 319fab23f..861ef7efc 100644
--- a/inst/include/boost/asio/any_completion_executor.hpp
+++ b/inst/include/boost/asio/any_completion_executor.hpp
@@ -2,7 +2,7 @@
 // any_completion_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/any_completion_handler.hpp b/inst/include/boost/asio/any_completion_handler.hpp
index 17c727592..ed48e7694 100644
--- a/inst/include/boost/asio/any_completion_handler.hpp
+++ b/inst/include/boost/asio/any_completion_handler.hpp
@@ -2,7 +2,7 @@
 // any_completion_handler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/any_io_executor.hpp b/inst/include/boost/asio/any_io_executor.hpp
index 4d6a058d9..5f96d57c0 100644
--- a/inst/include/boost/asio/any_io_executor.hpp
+++ b/inst/include/boost/asio/any_io_executor.hpp
@@ -2,7 +2,7 @@
 // any_io_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/append.hpp b/inst/include/boost/asio/append.hpp
index fc3d86249..b6714a7be 100644
--- a/inst/include/boost/asio/append.hpp
+++ b/inst/include/boost/asio/append.hpp
@@ -2,7 +2,7 @@
 // append.hpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/as_tuple.hpp b/inst/include/boost/asio/as_tuple.hpp
index 0f89b4600..be508b868 100644
--- a/inst/include/boost/asio/as_tuple.hpp
+++ b/inst/include/boost/asio/as_tuple.hpp
@@ -2,7 +2,7 @@
 // as_tuple.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -107,16 +107,42 @@ class as_tuple_t
   CompletionToken token_;
 };
 
-/// Adapt a @ref completion_token to specify that the completion handler
-/// arguments should be combined into a single tuple argument.
-template <typename CompletionToken>
-BOOST_ASIO_NODISCARD inline
-constexpr as_tuple_t<decay_t<CompletionToken>>
-as_tuple(CompletionToken&& completion_token)
+/// A function object type that adapts a @ref completion_token to specify that
+/// the completion handler arguments should be combined into a single tuple
+/// argument.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+struct partial_as_tuple
 {
-  return as_tuple_t<decay_t<CompletionToken>>(
-      static_cast<CompletionToken&&>(completion_token));
-}
+  /// Default constructor.
+  constexpr partial_as_tuple()
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// arguments should be combined into a single tuple argument.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr as_tuple_t<decay_t<CompletionToken>>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return as_tuple_t<decay_t<CompletionToken>>(
+        static_cast<CompletionToken&&>(completion_token));
+  }
+};
+
+/// A function object that adapts a @ref completion_token to specify that the
+/// completion handler arguments should be combined into a single tuple
+/// argument.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+BOOST_ASIO_INLINE_VARIABLE constexpr partial_as_tuple as_tuple;
 
 } // namespace asio
 } // namespace boost
diff --git a/inst/include/boost/asio/associated_allocator.hpp b/inst/include/boost/asio/associated_allocator.hpp
index 38825fa31..0a8db18a3 100644
--- a/inst/include/boost/asio/associated_allocator.hpp
+++ b/inst/include/boost/asio/associated_allocator.hpp
@@ -2,7 +2,7 @@
 // associated_allocator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/associated_cancellation_slot.hpp b/inst/include/boost/asio/associated_cancellation_slot.hpp
index e44bff9f4..ec44de0bd 100644
--- a/inst/include/boost/asio/associated_cancellation_slot.hpp
+++ b/inst/include/boost/asio/associated_cancellation_slot.hpp
@@ -2,7 +2,7 @@
 // associated_cancellation_slot.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/associated_executor.hpp b/inst/include/boost/asio/associated_executor.hpp
index a8d4776a0..bf36647e6 100644
--- a/inst/include/boost/asio/associated_executor.hpp
+++ b/inst/include/boost/asio/associated_executor.hpp
@@ -2,7 +2,7 @@
 // associated_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/associated_immediate_executor.hpp b/inst/include/boost/asio/associated_immediate_executor.hpp
index ff0b8b882..64fa4d943 100644
--- a/inst/include/boost/asio/associated_immediate_executor.hpp
+++ b/inst/include/boost/asio/associated_immediate_executor.hpp
@@ -2,7 +2,7 @@
 // associated_immediate_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -50,9 +50,10 @@ struct has_immediate_executor_type<T,
 template <typename E, typename = void, typename = void>
 struct default_immediate_executor
 {
-  typedef require_result_t<E, execution::blocking_t::never_t> type;
+  typedef decay_t<require_result_t<E, execution::blocking_t::never_t>> type;
 
-  static type get(const E& e) noexcept
+  static auto get(const E& e) noexcept
+    -> decltype(boost::asio::require(e, execution::blocking.never))
   {
     return boost::asio::require(e, execution::blocking.never);
   }
diff --git a/inst/include/boost/asio/associator.hpp b/inst/include/boost/asio/associator.hpp
index b0b5b44c0..d9f5e6e94 100644
--- a/inst/include/boost/asio/associator.hpp
+++ b/inst/include/boost/asio/associator.hpp
@@ -2,7 +2,7 @@
 // associator.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -24,7 +24,7 @@ namespace asio {
 
 /// Used to generically specialise associators for a type.
 template <template <typename, typename> class Associator,
-    typename T, typename DefaultCandidate>
+    typename T, typename DefaultCandidate, typename _ = void>
 struct associator
 {
 };
diff --git a/inst/include/boost/asio/async_result.hpp b/inst/include/boost/asio/async_result.hpp
index a45259518..9e1f4d729 100644
--- a/inst/include/boost/asio/async_result.hpp
+++ b/inst/include/boost/asio/async_result.hpp
@@ -2,7 +2,7 @@
 // async_result.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -22,9 +22,6 @@
 
 namespace boost {
 namespace asio {
-
-#if defined(BOOST_ASIO_HAS_CONCEPTS)
-
 namespace detail {
 
 template <typename T>
@@ -71,6 +68,12 @@ struct are_completion_signatures : false_type
 {
 };
 
+template <>
+struct are_completion_signatures<>
+  : true_type
+{
+};
+
 template <typename T0>
 struct are_completion_signatures<T0>
   : is_completion_signature<T0>
@@ -85,6 +88,12 @@ struct are_completion_signatures<T0, TN...>
 {
 };
 
+} // namespace detail
+
+#if defined(BOOST_ASIO_HAS_CONCEPTS)
+
+namespace detail {
+
 template <typename T, typename... Args>
 BOOST_ASIO_CONCEPT callable_with = requires(T&& t, Args&&... args)
 {
@@ -98,19 +107,19 @@ struct is_completion_handler_for : false_type
 
 template <typename T, typename R, typename... Args>
 struct is_completion_handler_for<T, R(Args...)>
-  : integral_constant<bool, (callable_with<T, Args...>)>
+  : integral_constant<bool, (callable_with<decay_t<T>, Args...>)>
 {
 };
 
 template <typename T, typename R, typename... Args>
 struct is_completion_handler_for<T, R(Args...) &>
-  : integral_constant<bool, (callable_with<T&, Args...>)>
+  : integral_constant<bool, (callable_with<decay_t<T>&, Args...>)>
 {
 };
 
 template <typename T, typename R, typename... Args>
 struct is_completion_handler_for<T, R(Args...) &&>
-  : integral_constant<bool, (callable_with<T&&, Args...>)>
+  : integral_constant<bool, (callable_with<decay_t<T>&&, Args...>)>
 {
 };
 
@@ -118,19 +127,19 @@ struct is_completion_handler_for<T, R(Args...) &&>
 
 template <typename T, typename R, typename... Args>
 struct is_completion_handler_for<T, R(Args...) noexcept>
-  : integral_constant<bool, (callable_with<T, Args...>)>
+  : integral_constant<bool, (callable_with<decay_t<T>, Args...>)>
 {
 };
 
 template <typename T, typename R, typename... Args>
 struct is_completion_handler_for<T, R(Args...) & noexcept>
-  : integral_constant<bool, (callable_with<T&, Args...>)>
+  : integral_constant<bool, (callable_with<decay_t<T>&, Args...>)>
 {
 };
 
 template <typename T, typename R, typename... Args>
 struct is_completion_handler_for<T, R(Args...) && noexcept>
-  : integral_constant<bool, (callable_with<T&&, Args...>)>
+  : integral_constant<bool, (callable_with<decay_t<T>&&, Args...>)>
 {
 };
 
@@ -177,37 +186,84 @@ BOOST_ASIO_CONCEPT completion_handler_for =
 namespace detail {
 
 template <typename T>
-struct is_simple_completion_signature : false_type
+struct is_lvalue_completion_signature : false_type
+{
+};
+
+template <typename R, typename... Args>
+struct is_lvalue_completion_signature<R(Args...) &> : true_type
+{
+};
+
+# if defined(BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE)
+
+template <typename R, typename... Args>
+struct is_lvalue_completion_signature<R(Args...) & noexcept> : true_type
+{
+};
+
+# endif // defined(BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE)
+
+template <typename... Signatures>
+struct are_any_lvalue_completion_signatures : false_type
+{
+};
+
+template <typename Sig0>
+struct are_any_lvalue_completion_signatures<Sig0>
+  : is_lvalue_completion_signature<Sig0>
+{
+};
+
+template <typename Sig0, typename... SigN>
+struct are_any_lvalue_completion_signatures<Sig0, SigN...>
+  : integral_constant<bool, (
+      is_lvalue_completion_signature<Sig0>::value
+        || are_any_lvalue_completion_signatures<SigN...>::value)>
 {
 };
 
 template <typename T>
-struct simple_completion_signature;
+struct is_rvalue_completion_signature : false_type
+{
+};
 
 template <typename R, typename... Args>
-struct is_simple_completion_signature<R(Args...)> : true_type
+struct is_rvalue_completion_signature<R(Args...) &&> : true_type
 {
 };
 
+# if defined(BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE)
+
+template <typename R, typename... Args>
+struct is_rvalue_completion_signature<R(Args...) && noexcept> : true_type
+{
+};
+
+# endif // defined(BOOST_ASIO_HAS_NOEXCEPT_FUNCTION_TYPE)
+
 template <typename... Signatures>
-struct are_simple_completion_signatures : false_type
+struct are_any_rvalue_completion_signatures : false_type
 {
 };
 
 template <typename Sig0>
-struct are_simple_completion_signatures<Sig0>
-  : is_simple_completion_signature<Sig0>
+struct are_any_rvalue_completion_signatures<Sig0>
+  : is_rvalue_completion_signature<Sig0>
 {
 };
 
 template <typename Sig0, typename... SigN>
-struct are_simple_completion_signatures<Sig0, SigN...>
+struct are_any_rvalue_completion_signatures<Sig0, SigN...>
   : integral_constant<bool, (
-      is_simple_completion_signature<Sig0>::value
-        && are_simple_completion_signatures<SigN...>::value)>
+      is_rvalue_completion_signature<Sig0>::value
+        || are_any_rvalue_completion_signatures<SigN...>::value)>
 {
 };
 
+template <typename T>
+struct simple_completion_signature;
+
 template <typename R, typename... Args>
 struct simple_completion_signature<R(Args...)>
 {
@@ -345,7 +401,8 @@ template <typename CompletionToken,
     BOOST_ASIO_COMPLETION_SIGNATURE... Signatures>
 class async_result :
   public conditional_t<
-      detail::are_simple_completion_signatures<Signatures...>::value,
+      detail::are_any_lvalue_completion_signatures<Signatures...>::value
+        || !detail::are_any_rvalue_completion_signatures<Signatures...>::value,
       detail::completion_handler_async_result<CompletionToken, Signatures...>,
       async_result<CompletionToken,
         typename detail::simple_completion_signature<Signatures>::type...>
@@ -353,7 +410,8 @@ class async_result :
 {
 public:
   typedef conditional_t<
-      detail::are_simple_completion_signatures<Signatures...>::value,
+      detail::are_any_lvalue_completion_signatures<Signatures...>::value
+        || !detail::are_any_rvalue_completion_signatures<Signatures...>::value,
       detail::completion_handler_async_result<CompletionToken, Signatures...>,
       async_result<CompletionToken,
         typename detail::simple_completion_signature<Signatures>::type...>
@@ -558,14 +616,36 @@ template <typename CompletionToken,
     typename Initiation, typename... Args>
 inline auto async_initiate(Initiation&& initiation,
     type_identity_t<CompletionToken>& token, Args&&... args)
-  -> constraint_t<
-    detail::async_result_has_initiate_memfn<
-      CompletionToken, Signatures...>::value,
-    decltype(
-      async_result<decay_t<CompletionToken>, Signatures...>::initiate(
-        static_cast<Initiation&&>(initiation),
-        static_cast<CompletionToken&&>(token),
-        static_cast<Args&&>(args)...))>
+  -> decltype(enable_if_t<
+    enable_if_t<
+      detail::are_completion_signatures<Signatures...>::value,
+      detail::async_result_has_initiate_memfn<
+        CompletionToken, Signatures...>>::value,
+    async_result<decay_t<CompletionToken>, Signatures...>>::initiate(
+      static_cast<Initiation&&>(initiation),
+      static_cast<CompletionToken&&>(token),
+      static_cast<Args&&>(args)...))
+{
+  return async_result<decay_t<CompletionToken>, Signatures...>::initiate(
+      static_cast<Initiation&&>(initiation),
+      static_cast<CompletionToken&&>(token),
+      static_cast<Args&&>(args)...);
+}
+
+template <
+    BOOST_ASIO_COMPLETION_SIGNATURE... Signatures,
+    typename CompletionToken, typename Initiation, typename... Args>
+inline auto async_initiate(Initiation&& initiation,
+    CompletionToken&& token, Args&&... args)
+  -> decltype(enable_if_t<
+    enable_if_t<
+      detail::are_completion_signatures<Signatures...>::value,
+      detail::async_result_has_initiate_memfn<
+        CompletionToken, Signatures...>>::value,
+    async_result<decay_t<CompletionToken>, Signatures...>>::initiate(
+      static_cast<Initiation&&>(initiation),
+      static_cast<CompletionToken&&>(token),
+      static_cast<Args&&>(args)...))
 {
   return async_result<decay_t<CompletionToken>, Signatures...>::initiate(
       static_cast<Initiation&&>(initiation),
@@ -576,10 +656,13 @@ inline auto async_initiate(Initiation&& initiation,
 template <typename CompletionToken,
     BOOST_ASIO_COMPLETION_SIGNATURE... Signatures,
     typename Initiation, typename... Args>
-inline constraint_t<
-    !detail::async_result_has_initiate_memfn<
-      CompletionToken, Signatures...>::value,
-    typename async_result<decay_t<CompletionToken>, Signatures...>::return_type>
+inline typename enable_if_t<
+    !enable_if_t<
+      detail::are_completion_signatures<Signatures...>::value,
+      detail::async_result_has_initiate_memfn<
+        CompletionToken, Signatures...>>::value,
+    async_result<decay_t<CompletionToken>, Signatures...>
+  >::return_type
 async_initiate(Initiation&& initiation,
     type_identity_t<CompletionToken>& token, Args&&... args)
 {
@@ -595,6 +678,29 @@ async_initiate(Initiation&& initiation,
   return completion.result.get();
 }
 
+template <BOOST_ASIO_COMPLETION_SIGNATURE... Signatures,
+    typename CompletionToken, typename Initiation, typename... Args>
+inline typename enable_if_t<
+    !enable_if_t<
+      detail::are_completion_signatures<Signatures...>::value,
+      detail::async_result_has_initiate_memfn<
+        CompletionToken, Signatures...>>::value,
+    async_result<decay_t<CompletionToken>, Signatures...>
+  >::return_type
+async_initiate(Initiation&& initiation, CompletionToken&& token, Args&&... args)
+{
+  async_completion<CompletionToken, Signatures...> completion(token);
+
+  static_cast<Initiation&&>(initiation)(
+      static_cast<
+        typename async_result<decay_t<CompletionToken>,
+          Signatures...>::completion_handler_type&&>(
+            completion.completion_handler),
+      static_cast<Args&&>(args)...);
+
+  return completion.result.get();
+}
+
 #endif // defined(GENERATING_DOCUMENTATION)
 
 #if defined(BOOST_ASIO_HAS_CONCEPTS)
@@ -712,21 +818,21 @@ struct is_async_operation :
 template <typename T, typename... Args>
 BOOST_ASIO_CONCEPT async_operation = is_async_operation<T, Args...>::value;
 
-#define BOOST_ASIO_ASYNC_OPERATION(t) \
-  ::boost::asio::async_operation<t>
-#define BOOST_ASIO_ASYNC_OPERATION1(t, a0) \
-  ::boost::asio::async_operation<t, a0>
-#define BOOST_ASIO_ASYNC_OPERATION2(t, a0, a1) \
-  ::boost::asio::async_operation<t, a0, a1>
-#define BOOST_ASIO_ASYNC_OPERATION3(t, a0, a1, a2) \
-  ::boost::asio::async_operation<t, a0, a1, a2>
+#define BOOST_ASIO_ASYNC_OPERATION \
+  ::boost::asio::async_operation
+#define BOOST_ASIO_ASYNC_OPERATION1(a0) \
+  ::boost::asio::async_operation<a0>
+#define BOOST_ASIO_ASYNC_OPERATION2(a0, a1) \
+  ::boost::asio::async_operation<a0, a1>
+#define BOOST_ASIO_ASYNC_OPERATION3(a0, a1, a2) \
+  ::boost::asio::async_operation<a0, a1, a2>
 
 #else // defined(BOOST_ASIO_HAS_CONCEPTS)
 
-#define BOOST_ASIO_ASYNC_OPERATION(t) typename
-#define BOOST_ASIO_ASYNC_OPERATION1(t, a0) typename
-#define BOOST_ASIO_ASYNC_OPERATION2(t, a0, a1) typename
-#define BOOST_ASIO_ASYNC_OPERATION3(t, a0, a1, a2) typename
+#define BOOST_ASIO_ASYNC_OPERATION typename
+#define BOOST_ASIO_ASYNC_OPERATION1(a0) typename
+#define BOOST_ASIO_ASYNC_OPERATION2(a0, a1) typename
+#define BOOST_ASIO_ASYNC_OPERATION3(a0, a1, a2) typename
 
 #endif // defined(BOOST_ASIO_HAS_CONCEPTS)
 
@@ -834,62 +940,11 @@ template <typename T, typename... Args>
 using completion_signature_of_t =
   typename completion_signature_of<T, Args...>::type;
 
-namespace detail {
-
-template <typename T, typename = void>
-struct default_completion_token_impl
-{
-  typedef void type;
-};
-
-template <typename T>
-struct default_completion_token_impl<T,
-    void_t<typename T::default_completion_token_type>
-  >
-{
-  typedef typename T::default_completion_token_type type;
-};
-
-} // namespace detail
-
-#if defined(GENERATING_DOCUMENTATION)
-
-/// Traits type used to determine the default completion token type associated
-/// with a type (such as an executor).
-/**
- * A program may specialise this traits type if the @c T template parameter in
- * the specialisation is a user-defined type.
- *
- * Specialisations of this trait may provide a nested typedef @c type, which is
- * a default-constructible completion token type.
- */
-template <typename T>
-struct default_completion_token
-{
-  /// If @c T has a nested type @c default_completion_token_type,
-  /// <tt>T::default_completion_token_type</tt>. Otherwise the typedef @c type
-  /// is not defined.
-  typedef see_below type;
-};
-#else
-template <typename T>
-struct default_completion_token
-  : detail::default_completion_token_impl<T>
-{
-};
-#endif
-
-template <typename T>
-using default_completion_token_t = typename default_completion_token<T>::type;
-
-#define BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(e) \
-  = typename ::boost::asio::default_completion_token<e>::type
-#define BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(e) \
-  = typename ::boost::asio::default_completion_token<e>::type()
-
 } // namespace asio
 } // namespace boost
 
 #include <boost/asio/detail/pop_options.hpp>
 
+#include <boost/asio/default_completion_token.hpp>
+
 #endif // BOOST_ASIO_ASYNC_RESULT_HPP
diff --git a/inst/include/boost/asio/awaitable.hpp b/inst/include/boost/asio/awaitable.hpp
index d346b2ad2..317681a45 100644
--- a/inst/include/boost/asio/awaitable.hpp
+++ b/inst/include/boost/asio/awaitable.hpp
@@ -2,7 +2,7 @@
 // awaitable.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/basic_datagram_socket.hpp b/inst/include/boost/asio/basic_datagram_socket.hpp
index c2287db70..9421007e3 100644
--- a/inst/include/boost/asio/basic_datagram_socket.hpp
+++ b/inst/include/boost/asio/basic_datagram_socket.hpp
@@ -2,7 +2,7 @@
 // basic_datagram_socket.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -346,7 +346,7 @@ class basic_datagram_socket
    * call will block until the data has been sent successfully or an error
    * occurs.
    *
-   * @param buffers One ore more data buffers to be sent on the socket.
+   * @param buffers One or more data buffers to be sent on the socket.
    *
    * @returns The number of bytes sent.
    *
@@ -378,7 +378,7 @@ class basic_datagram_socket
    * call will block until the data has been sent successfully or an error
    * occurs.
    *
-   * @param buffers One ore more data buffers to be sent on the socket.
+   * @param buffers One or more data buffers to be sent on the socket.
    *
    * @param flags Flags specifying how the send call is to be made.
    *
@@ -448,7 +448,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -518,7 +518,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -667,7 +667,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -740,7 +740,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -885,7 +885,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -956,7 +956,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1027,7 +1027,7 @@ class basic_datagram_socket
     boost::asio::detail::throw_error(ec, "receive_from");
     return s;
   }
-  
+
   /// Receive a datagram with the endpoint of the sender.
   /**
    * This function is used to receive a datagram. The function call will block
@@ -1054,7 +1054,7 @@ class basic_datagram_socket
     boost::asio::detail::throw_error(ec, "receive_from");
     return s;
   }
-  
+
   /// Receive a datagram with the endpoint of the sender.
   /**
    * This function is used to receive a datagram. The function call will block
@@ -1108,7 +1108,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1180,7 +1180,7 @@ class basic_datagram_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1220,7 +1220,7 @@ class basic_datagram_socket
       const basic_datagram_socket&) = delete;
 
   class initiate_async_send
-  { 
+  {
   public:
     typedef Executor executor_type;
 
diff --git a/inst/include/boost/asio/basic_deadline_timer.hpp b/inst/include/boost/asio/basic_deadline_timer.hpp
index 0ef81efa0..1e4b3dfea 100644
--- a/inst/include/boost/asio/basic_deadline_timer.hpp
+++ b/inst/include/boost/asio/basic_deadline_timer.hpp
@@ -2,7 +2,7 @@
 // basic_deadline_timer.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,8 @@
 
 #include <boost/asio/detail/config.hpp>
 
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
   || defined(GENERATING_DOCUMENTATION)
 
@@ -36,7 +38,8 @@
 namespace boost {
 namespace asio {
 
-/// Provides waitable timer functionality.
+/// (Deprecated: Use basic_waitable_timer.) Provides waitable timer
+/// functionality.
 /**
  * The basic_deadline_timer class template provides the ability to perform a
  * blocking or asynchronous wait for a timer to expire.
@@ -64,7 +67,7 @@ namespace asio {
  * timer.wait();
  * @endcode
  *
- * @par 
+ * @par
  * Performing an asynchronous wait:
  * @code
  * void handler(const boost::system::error_code& error)
@@ -631,7 +634,7 @@ class basic_deadline_timer
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -709,4 +712,6 @@ class basic_deadline_timer
 #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
        // || defined(GENERATING_DOCUMENTATION)
 
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #endif // BOOST_ASIO_BASIC_DEADLINE_TIMER_HPP
diff --git a/inst/include/boost/asio/basic_file.hpp b/inst/include/boost/asio/basic_file.hpp
index 8b7fcb6ec..a0b1cf7c7 100644
--- a/inst/include/boost/asio/basic_file.hpp
+++ b/inst/include/boost/asio/basic_file.hpp
@@ -2,7 +2,7 @@
 // basic_file.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/basic_io_object.hpp b/inst/include/boost/asio/basic_io_object.hpp
index 1ec10b557..48740c478 100644
--- a/inst/include/boost/asio/basic_io_object.hpp
+++ b/inst/include/boost/asio/basic_io_object.hpp
@@ -2,7 +2,7 @@
 // basic_io_object.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,6 +16,10 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+
+#if !defined(BOOST_ASIO_NO_DEPRECATED) \
+  || defined(GENERATING_DOCUMENTATION)
+
 #include <boost/asio/io_context.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -46,7 +50,7 @@ namespace detail
   };
 }
 
-/// Base class for all I/O objects.
+/// (Deprecated) Base class for all I/O objects.
 /**
  * @note All I/O objects are non-copyable. However, when using C++0x, certain
  * I/O objects do support move construction and move assignment.
@@ -66,9 +70,7 @@ class basic_io_object
   /// The underlying implementation type of I/O object.
   typedef typename service_type::implementation_type implementation_type;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use get_executor().) Get the io_context associated with the
-  /// object.
+  /// Get the io_context associated with the object.
   /**
    * This function may be used to obtain the io_context object that the I/O
    * object uses to dispatch handlers for asynchronous operations.
@@ -81,8 +83,7 @@ class basic_io_object
     return service_.get_io_context();
   }
 
-  /// (Deprecated: Use get_executor().) Get the io_context associated with the
-  /// object.
+  /// Get the io_context associated with the object.
   /**
    * This function may be used to obtain the io_context object that the I/O
    * object uses to dispatch handlers for asynchronous operations.
@@ -94,7 +95,6 @@ class basic_io_object
   {
     return service_.get_io_context();
   }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
   /// The type of the executor associated with the object.
   typedef boost::asio::io_context::executor_type executor_type;
@@ -197,7 +197,6 @@ class basic_io_object<IoObjectService, true>
   typedef IoObjectService service_type;
   typedef typename service_type::implementation_type implementation_type;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
   boost::asio::io_context& get_io_context()
   {
     return service_->get_io_context();
@@ -207,7 +206,6 @@ class basic_io_object<IoObjectService, true>
   {
     return service_->get_io_context();
   }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
   typedef boost::asio::io_context::executor_type executor_type;
 
@@ -285,4 +283,7 @@ class basic_io_object<IoObjectService, true>
 
 #include <boost/asio/detail/pop_options.hpp>
 
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+       //   || defined(GENERATING_DOCUMENTATION)
+
 #endif // BOOST_ASIO_BASIC_IO_OBJECT_HPP
diff --git a/inst/include/boost/asio/basic_random_access_file.hpp b/inst/include/boost/asio/basic_random_access_file.hpp
index 551295634..099514f68 100644
--- a/inst/include/boost/asio/basic_random_access_file.hpp
+++ b/inst/include/boost/asio/basic_random_access_file.hpp
@@ -2,7 +2,7 @@
 // basic_random_access_file.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -428,7 +428,7 @@ class basic_random_access_file
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -563,7 +563,7 @@ class basic_random_access_file
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_raw_socket.hpp b/inst/include/boost/asio/basic_raw_socket.hpp
index 724c2110c..f8d744b85 100644
--- a/inst/include/boost/asio/basic_raw_socket.hpp
+++ b/inst/include/boost/asio/basic_raw_socket.hpp
@@ -2,7 +2,7 @@
 // basic_raw_socket.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -340,7 +340,7 @@ class basic_raw_socket
    * This function is used to send data on the raw socket. The function call
    * will block until the data has been sent successfully or an error occurs.
    *
-   * @param buffers One ore more data buffers to be sent on the socket.
+   * @param buffers One or more data buffers to be sent on the socket.
    *
    * @returns The number of bytes sent.
    *
@@ -371,7 +371,7 @@ class basic_raw_socket
    * This function is used to send data on the raw socket. The function call
    * will block until the data has been sent successfully or an error occurs.
    *
-   * @param buffers One ore more data buffers to be sent on the socket.
+   * @param buffers One or more data buffers to be sent on the socket.
    *
    * @param flags Flags specifying how the send call is to be made.
    *
@@ -440,7 +440,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -510,7 +510,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -659,7 +659,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -732,7 +732,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -877,7 +877,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -948,7 +948,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1020,7 +1020,7 @@ class basic_raw_socket
     boost::asio::detail::throw_error(ec, "receive_from");
     return s;
   }
-  
+
   /// Receive raw data with the endpoint of the sender.
   /**
    * This function is used to receive raw data. The function call will block
@@ -1047,7 +1047,7 @@ class basic_raw_socket
     boost::asio::detail::throw_error(ec, "receive_from");
     return s;
   }
-  
+
   /// Receive raw data with the endpoint of the sender.
   /**
    * This function is used to receive raw data. The function call will block
@@ -1101,7 +1101,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1174,7 +1174,7 @@ class basic_raw_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_readable_pipe.hpp b/inst/include/boost/asio/basic_readable_pipe.hpp
index ab737ba48..2e88cad8e 100644
--- a/inst/include/boost/asio/basic_readable_pipe.hpp
+++ b/inst/include/boost/asio/basic_readable_pipe.hpp
@@ -2,7 +2,7 @@
 // basic_readable_pipe.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -535,7 +535,7 @@ class basic_readable_pipe
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_seq_packet_socket.hpp b/inst/include/boost/asio/basic_seq_packet_socket.hpp
index f03f388b5..7928d881f 100644
--- a/inst/include/boost/asio/basic_seq_packet_socket.hpp
+++ b/inst/include/boost/asio/basic_seq_packet_socket.hpp
@@ -2,7 +2,7 @@
 // basic_seq_packet_socket.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -431,7 +431,7 @@ class basic_seq_packet_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -621,7 +621,7 @@ class basic_seq_packet_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -695,7 +695,7 @@ class basic_seq_packet_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_serial_port.hpp b/inst/include/boost/asio/basic_serial_port.hpp
index 835ed0164..fdfc01bfe 100644
--- a/inst/include/boost/asio/basic_serial_port.hpp
+++ b/inst/include/boost/asio/basic_serial_port.hpp
@@ -2,7 +2,7 @@
 // basic_serial_port.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -725,7 +725,7 @@ class basic_serial_port
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -855,7 +855,7 @@ class basic_serial_port
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_signal_set.hpp b/inst/include/boost/asio/basic_signal_set.hpp
index 4753f9151..fb3b22d2e 100644
--- a/inst/include/boost/asio/basic_signal_set.hpp
+++ b/inst/include/boost/asio/basic_signal_set.hpp
@@ -2,7 +2,7 @@
 // basic_signal_set.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -574,7 +574,7 @@ class basic_signal_set : public signal_set_base
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, int) @endcode
diff --git a/inst/include/boost/asio/basic_socket.hpp b/inst/include/boost/asio/basic_socket.hpp
index 8db1e06be..aacce47a7 100644
--- a/inst/include/boost/asio/basic_socket.hpp
+++ b/inst/include/boost/asio/basic_socket.hpp
@@ -2,7 +2,7 @@
 // basic_socket.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -928,7 +928,7 @@ class basic_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -1780,7 +1780,7 @@ class basic_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
diff --git a/inst/include/boost/asio/basic_socket_acceptor.hpp b/inst/include/boost/asio/basic_socket_acceptor.hpp
index e06ed7fa0..a2254a43e 100644
--- a/inst/include/boost/asio/basic_socket_acceptor.hpp
+++ b/inst/include/boost/asio/basic_socket_acceptor.hpp
@@ -2,7 +2,7 @@
 // basic_socket_acceptor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -1214,7 +1214,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -1349,7 +1349,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -1497,7 +1497,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -1617,7 +1617,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code,
@@ -1867,7 +1867,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code,
@@ -1963,7 +1963,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code,
@@ -2133,7 +2133,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code,
@@ -2415,7 +2415,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code,
@@ -2515,7 +2515,7 @@ class basic_socket_acceptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code,
diff --git a/inst/include/boost/asio/basic_socket_iostream.hpp b/inst/include/boost/asio/basic_socket_iostream.hpp
index d5d324d00..16db72782 100644
--- a/inst/include/boost/asio/basic_socket_iostream.hpp
+++ b/inst/include/boost/asio/basic_socket_iostream.hpp
@@ -2,7 +2,7 @@
 // basic_socket_iostream.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -65,16 +65,8 @@ class socket_iostream_base
 
 // Forward declaration with defaulted arguments.
 template <typename Protocol,
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-    typename Clock = boost::posix_time::ptime,
-    typename WaitTraits = time_traits<Clock>>
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
     typename Clock = chrono::steady_clock,
     typename WaitTraits = wait_traits<Clock>>
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-       // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
 class basic_socket_iostream;
 
 #endif // !defined(BOOST_ASIO_BASIC_SOCKET_IOSTREAM_FWD_DECL)
@@ -92,16 +84,7 @@ class basic_socket_iostream
     public std::basic_iostream<char>
 {
 private:
-  // These typedefs are intended keep this class's implementation independent
-  // of whether it's using Boost.DateClock, Boost.Chrono or std::chrono.
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-  typedef WaitTraits traits_helper;
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
   typedef detail::chrono_time_traits<Clock, WaitTraits> traits_helper;
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-       // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
 
 public:
   /// The protocol type.
@@ -114,22 +97,12 @@ class basic_socket_iostream
   typedef Clock clock_type;
 
 #if defined(GENERATING_DOCUMENTATION)
-  /// (Deprecated: Use time_point.) The time type.
-  typedef typename WaitTraits::time_type time_type;
-
   /// The time type.
   typedef typename WaitTraits::time_point time_point;
 
-  /// (Deprecated: Use duration.) The duration type.
-  typedef typename WaitTraits::duration_type duration_type;
-
   /// The duration type.
   typedef typename WaitTraits::duration duration;
 #else
-# if !defined(BOOST_ASIO_NO_DEPRECATED)
-  typedef typename traits_helper::time_type time_type;
-  typedef typename traits_helper::duration_type duration_type;
-# endif // !defined(BOOST_ASIO_NO_DEPRECATED)
   typedef typename traits_helper::time_type time_point;
   typedef typename traits_helper::duration_type duration;
 #endif
@@ -241,18 +214,6 @@ class basic_socket_iostream
     return rdbuf()->error();
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use expiry().) Get the stream's expiry time as an absolute
-  /// time.
-  /**
-   * @return An absolute time value representing the stream's expiry time.
-   */
-  time_point expires_at() const
-  {
-    return rdbuf()->expires_at();
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Get the stream's expiry time as an absolute time.
   /**
    * @return An absolute time value representing the stream's expiry time.
@@ -290,32 +251,6 @@ class basic_socket_iostream
     rdbuf()->expires_after(expiry_time);
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use expiry().) Get the stream's expiry time relative to now.
-  /**
-   * @return A relative time value representing the stream's expiry time.
-   */
-  duration expires_from_now() const
-  {
-    return rdbuf()->expires_from_now();
-  }
-
-  /// (Deprecated: Use expires_after().) Set the stream's expiry time relative
-  /// to now.
-  /**
-   * This function sets the expiry time associated with the stream. Stream
-   * operations performed after this time (where the operations cannot be
-   * completed using the internal buffers) will fail with the error
-   * boost::asio::error::operation_aborted.
-   *
-   * @param expiry_time The expiry time to be used for the timer.
-   */
-  void expires_from_now(const duration& expiry_time)
-  {
-    rdbuf()->expires_from_now(expiry_time);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 private:
   // Disallow copying and assignment.
   basic_socket_iostream(const basic_socket_iostream&) = delete;
diff --git a/inst/include/boost/asio/basic_socket_streambuf.hpp b/inst/include/boost/asio/basic_socket_streambuf.hpp
index 23114a38f..5099a0565 100644
--- a/inst/include/boost/asio/basic_socket_streambuf.hpp
+++ b/inst/include/boost/asio/basic_socket_streambuf.hpp
@@ -2,7 +2,7 @@
 // basic_socket_streambuf.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -27,15 +27,7 @@
 #include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/throw_error.hpp>
 #include <boost/asio/io_context.hpp>
-
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-# include <boost/asio/detail/deadline_timer_service.hpp>
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-# include <boost/asio/steady_timer.hpp>
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-       // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
+#include <boost/asio/steady_timer.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -82,16 +74,8 @@ class socket_streambuf_buffers
 
 // Forward declaration with defaulted arguments.
 template <typename Protocol,
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-    typename Clock = boost::posix_time::ptime,
-    typename WaitTraits = time_traits<Clock>>
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
     typename Clock = chrono::steady_clock,
     typename WaitTraits = wait_traits<Clock>>
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-       // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
 class basic_socket_streambuf;
 
 #endif // !defined(BOOST_ASIO_BASIC_SOCKET_STREAMBUF_FWD_DECL)
@@ -108,23 +92,10 @@ class basic_socket_streambuf
   : public std::streambuf,
     private detail::socket_streambuf_io_context,
     private detail::socket_streambuf_buffers,
-#if defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION)
     private basic_socket<Protocol>
-#else // defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION)
-    public basic_socket<Protocol>
-#endif // defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION)
 {
 private:
-  // These typedefs are intended keep this class's implementation independent
-  // of whether it's using Boost.DateClock, Boost.Chrono or std::chrono.
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-  typedef WaitTraits traits_helper;
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
   typedef detail::chrono_time_traits<Clock, WaitTraits> traits_helper;
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-       // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
 
 public:
   /// The protocol type.
@@ -137,22 +108,12 @@ class basic_socket_streambuf
   typedef Clock clock_type;
 
 #if defined(GENERATING_DOCUMENTATION)
-  /// (Deprecated: Use time_point.) The time type.
-  typedef typename WaitTraits::time_type time_type;
-
   /// The time type.
   typedef typename WaitTraits::time_point time_point;
 
-  /// (Deprecated: Use duration.) The duration type.
-  typedef typename WaitTraits::duration_type duration_type;
-
   /// The duration type.
   typedef typename WaitTraits::duration duration;
 #else
-# if !defined(BOOST_ASIO_NO_DEPRECATED)
-  typedef typename traits_helper::time_type time_type;
-  typedef typename traits_helper::duration_type duration_type;
-# endif // !defined(BOOST_ASIO_NO_DEPRECATED)
   typedef typename traits_helper::time_type time_point;
   typedef typename traits_helper::duration_type duration;
 #endif
@@ -281,30 +242,6 @@ class basic_socket_streambuf
     return ec_;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use error().) Get the last error associated with the stream
-  /// buffer.
-  /**
-   * @return An \c error_code corresponding to the last error from the stream
-   * buffer.
-   */
-  const boost::system::error_code& puberror() const
-  {
-    return error();
-  }
-
-  /// (Deprecated: Use expiry().) Get the stream buffer's expiry time as an
-  /// absolute time.
-  /**
-   * @return An absolute time value representing the stream buffer's expiry
-   * time.
-   */
-  time_point expires_at() const
-  {
-    return expiry_time_;
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Get the stream buffer's expiry time as an absolute time.
   /**
    * @return An absolute time value representing the stream buffer's expiry
@@ -343,33 +280,6 @@ class basic_socket_streambuf
     expiry_time_ = traits_helper::add(traits_helper::now(), expiry_time);
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use expiry().) Get the stream buffer's expiry time relative
-  /// to now.
-  /**
-   * @return A relative time value representing the stream buffer's expiry time.
-   */
-  duration expires_from_now() const
-  {
-    return traits_helper::subtract(expires_at(), traits_helper::now());
-  }
-
-  /// (Deprecated: Use expires_after().) Set the stream buffer's expiry time
-  /// relative to now.
-  /**
-   * This function sets the expiry time associated with the stream. Stream
-   * operations performed after this time (where the operations cannot be
-   * completed using the internal buffers) will fail with the error
-   * boost::asio::error::operation_aborted.
-   *
-   * @param expiry_time The expiry time to be used for the timer.
-   */
-  void expires_from_now(const duration& expiry_time)
-  {
-    expiry_time_ = traits_helper::add(traits_helper::now(), expiry_time);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 protected:
   int_type underflow()
   {
@@ -619,14 +529,7 @@ class basic_socket_streambuf
   // Helper function to get the maximum expiry time.
   static time_point max_expiry_time()
   {
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
-    return boost::posix_time::pos_infin;
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
     return (time_point::max)();
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-       // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM)
   }
 
   enum { putback_max = 8 };
diff --git a/inst/include/boost/asio/basic_stream_file.hpp b/inst/include/boost/asio/basic_stream_file.hpp
index 66115a1c2..b99fa9b60 100644
--- a/inst/include/boost/asio/basic_stream_file.hpp
+++ b/inst/include/boost/asio/basic_stream_file.hpp
@@ -2,7 +2,7 @@
 // basic_stream_file.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -491,7 +491,7 @@ class basic_stream_file
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -619,7 +619,7 @@ class basic_stream_file
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_stream_socket.hpp b/inst/include/boost/asio/basic_stream_socket.hpp
index 441210d8b..77896a48a 100644
--- a/inst/include/boost/asio/basic_stream_socket.hpp
+++ b/inst/include/boost/asio/basic_stream_socket.hpp
@@ -2,7 +2,7 @@
 // basic_stream_socket.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -462,7 +462,7 @@ class basic_stream_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -532,7 +532,7 @@ class basic_stream_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -704,7 +704,7 @@ class basic_stream_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -776,7 +776,7 @@ class basic_stream_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -906,7 +906,7 @@ class basic_stream_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1037,7 +1037,7 @@ class basic_stream_socket
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/basic_streambuf.hpp b/inst/include/boost/asio/basic_streambuf.hpp
index 801c6a132..b6084040f 100644
--- a/inst/include/boost/asio/basic_streambuf.hpp
+++ b/inst/include/boost/asio/basic_streambuf.hpp
@@ -2,7 +2,7 @@
 // basic_streambuf.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -120,8 +120,8 @@ class basic_streambuf
   /// The type used to represent the output sequence as a list of buffers.
   typedef implementation_defined mutable_buffers_type;
 #else
-  typedef BOOST_ASIO_CONST_BUFFER const_buffers_type;
-  typedef BOOST_ASIO_MUTABLE_BUFFER mutable_buffers_type;
+  typedef const_buffer const_buffers_type;
+  typedef mutable_buffer mutable_buffers_type;
 #endif
 
   /// Construct a basic_streambuf object.
diff --git a/inst/include/boost/asio/basic_streambuf_fwd.hpp b/inst/include/boost/asio/basic_streambuf_fwd.hpp
index c4d6110b0..52ac16ee2 100644
--- a/inst/include/boost/asio/basic_streambuf_fwd.hpp
+++ b/inst/include/boost/asio/basic_streambuf_fwd.hpp
@@ -2,7 +2,7 @@
 // basic_streambuf_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/basic_waitable_timer.hpp b/inst/include/boost/asio/basic_waitable_timer.hpp
index a2d590d42..6aa5daefe 100644
--- a/inst/include/boost/asio/basic_waitable_timer.hpp
+++ b/inst/include/boost/asio/basic_waitable_timer.hpp
@@ -2,7 +2,7 @@
 // basic_waitable_timer.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -76,7 +76,7 @@ class basic_waitable_timer;
  * timer.wait();
  * @endcode
  *
- * @par 
+ * @par
  * Performing an asynchronous wait (C++11):
  * @code
  * void handler(const boost::system::error_code& error)
@@ -412,36 +412,6 @@ class basic_waitable_timer
     return s;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Cancel any asynchronous
-  /// operations that are waiting on the timer.
-  /**
-   * This function forces the completion of any pending asynchronous wait
-   * operations against the timer. The handler for each cancelled operation will
-   * be invoked with the boost::asio::error::operation_aborted error code.
-   *
-   * Cancelling the timer does not change the expiry time.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of asynchronous operations that were cancelled.
-   *
-   * @note If the timer has already expired when cancel() is called, then the
-   * handlers for asynchronous wait operations will:
-   *
-   * @li have already been invoked; or
-   *
-   * @li have been queued for invocation in the near future.
-   *
-   * These handlers can no longer be cancelled, and therefore are passed an
-   * error code that indicates the successful completion of the wait operation.
-   */
-  std::size_t cancel(boost::system::error_code& ec)
-  {
-    return impl_.get_service().cancel(impl_.get_implementation(), ec);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Cancels one asynchronous operation that is waiting on the timer.
   /**
    * This function forces the completion of one pending asynchronous wait
@@ -475,49 +445,6 @@ class basic_waitable_timer
     return s;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Cancels one asynchronous
-  /// operation that is waiting on the timer.
-  /**
-   * This function forces the completion of one pending asynchronous wait
-   * operation against the timer. Handlers are cancelled in FIFO order. The
-   * handler for the cancelled operation will be invoked with the
-   * boost::asio::error::operation_aborted error code.
-   *
-   * Cancelling the timer does not change the expiry time.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of asynchronous operations that were cancelled. That is,
-   * either 0 or 1.
-   *
-   * @note If the timer has already expired when cancel_one() is called, then
-   * the handlers for asynchronous wait operations will:
-   *
-   * @li have already been invoked; or
-   *
-   * @li have been queued for invocation in the near future.
-   *
-   * These handlers can no longer be cancelled, and therefore are passed an
-   * error code that indicates the successful completion of the wait operation.
-   */
-  std::size_t cancel_one(boost::system::error_code& ec)
-  {
-    return impl_.get_service().cancel_one(impl_.get_implementation(), ec);
-  }
-
-  /// (Deprecated: Use expiry().) Get the timer's expiry time as an absolute
-  /// time.
-  /**
-   * This function may be used to obtain the timer's current expiry time.
-   * Whether the timer has expired or not does not affect this value.
-   */
-  time_point expires_at() const
-  {
-    return impl_.get_service().expires_at(impl_.get_implementation());
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Get the timer's expiry time as an absolute time.
   /**
    * This function may be used to obtain the timer's current expiry time.
@@ -559,38 +486,6 @@ class basic_waitable_timer
     return s;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Set the timer's expiry time as
-  /// an absolute time.
-  /**
-   * This function sets the expiry time. Any pending asynchronous wait
-   * operations will be cancelled. The handler for each cancelled operation will
-   * be invoked with the boost::asio::error::operation_aborted error code.
-   *
-   * @param expiry_time The expiry time to be used for the timer.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of asynchronous operations that were cancelled.
-   *
-   * @note If the timer has already expired when expires_at() is called, then
-   * the handlers for asynchronous wait operations will:
-   *
-   * @li have already been invoked; or
-   *
-   * @li have been queued for invocation in the near future.
-   *
-   * These handlers can no longer be cancelled, and therefore are passed an
-   * error code that indicates the successful completion of the wait operation.
-   */
-  std::size_t expires_at(const time_point& expiry_time,
-      boost::system::error_code& ec)
-  {
-    return impl_.get_service().expires_at(
-        impl_.get_implementation(), expiry_time, ec);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Set the timer's expiry time relative to now.
   /**
    * This function sets the expiry time. Any pending asynchronous wait
@@ -622,80 +517,6 @@ class basic_waitable_timer
     return s;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use expiry().) Get the timer's expiry time relative to now.
-  /**
-   * This function may be used to obtain the timer's current expiry time.
-   * Whether the timer has expired or not does not affect this value.
-   */
-  duration expires_from_now() const
-  {
-    return impl_.get_service().expires_from_now(impl_.get_implementation());
-  }
-
-  /// (Deprecated: Use expires_after().) Set the timer's expiry time relative
-  /// to now.
-  /**
-   * This function sets the expiry time. Any pending asynchronous wait
-   * operations will be cancelled. The handler for each cancelled operation will
-   * be invoked with the boost::asio::error::operation_aborted error code.
-   *
-   * @param expiry_time The expiry time to be used for the timer.
-   *
-   * @return The number of asynchronous operations that were cancelled.
-   *
-   * @throws boost::system::system_error Thrown on failure.
-   *
-   * @note If the timer has already expired when expires_from_now() is called,
-   * then the handlers for asynchronous wait operations will:
-   *
-   * @li have already been invoked; or
-   *
-   * @li have been queued for invocation in the near future.
-   *
-   * These handlers can no longer be cancelled, and therefore are passed an
-   * error code that indicates the successful completion of the wait operation.
-   */
-  std::size_t expires_from_now(const duration& expiry_time)
-  {
-    boost::system::error_code ec;
-    std::size_t s = impl_.get_service().expires_from_now(
-        impl_.get_implementation(), expiry_time, ec);
-    boost::asio::detail::throw_error(ec, "expires_from_now");
-    return s;
-  }
-
-  /// (Deprecated: Use expires_after().) Set the timer's expiry time relative
-  /// to now.
-  /**
-   * This function sets the expiry time. Any pending asynchronous wait
-   * operations will be cancelled. The handler for each cancelled operation will
-   * be invoked with the boost::asio::error::operation_aborted error code.
-   *
-   * @param expiry_time The expiry time to be used for the timer.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of asynchronous operations that were cancelled.
-   *
-   * @note If the timer has already expired when expires_from_now() is called,
-   * then the handlers for asynchronous wait operations will:
-   *
-   * @li have already been invoked; or
-   *
-   * @li have been queued for invocation in the near future.
-   *
-   * These handlers can no longer be cancelled, and therefore are passed an
-   * error code that indicates the successful completion of the wait operation.
-   */
-  std::size_t expires_from_now(const duration& expiry_time,
-      boost::system::error_code& ec)
-  {
-    return impl_.get_service().expires_from_now(
-        impl_.get_implementation(), expiry_time, ec);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Perform a blocking wait on the timer.
   /**
    * This function is used to wait for the timer to expire. This function
@@ -747,7 +568,7 @@ class basic_waitable_timer
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
diff --git a/inst/include/boost/asio/basic_writable_pipe.hpp b/inst/include/boost/asio/basic_writable_pipe.hpp
index 27f790352..9aa58525f 100644
--- a/inst/include/boost/asio/basic_writable_pipe.hpp
+++ b/inst/include/boost/asio/basic_writable_pipe.hpp
@@ -2,7 +2,7 @@
 // basic_writable_pipe.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -533,7 +533,7 @@ class basic_writable_pipe
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/bind_allocator.hpp b/inst/include/boost/asio/bind_allocator.hpp
index 7cb4c75dc..33c2da389 100644
--- a/inst/include/boost/asio/bind_allocator.hpp
+++ b/inst/include/boost/asio/bind_allocator.hpp
@@ -2,7 +2,7 @@
 // bind_allocator.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,10 +16,12 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/associated_allocator.hpp>
+#include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -257,7 +259,9 @@ class allocator_binder
    * constructible from type @c U.
    */
   template <typename U, typename OtherAllocator>
-  allocator_binder(const allocator_binder<U, OtherAllocator>& other)
+  allocator_binder(const allocator_binder<U, OtherAllocator>& other,
+      constraint_t<is_constructible<Allocator, OtherAllocator>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : allocator_(other.get_allocator()),
       target_(other.get())
   {
@@ -271,7 +275,8 @@ class allocator_binder
    */
   template <typename U, typename OtherAllocator>
   allocator_binder(const allocator_type& s,
-      const allocator_binder<U, OtherAllocator>& other)
+      const allocator_binder<U, OtherAllocator>& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : allocator_(s),
       target_(other.get())
   {
@@ -296,7 +301,9 @@ class allocator_binder
   /// Move construct from a different allocator wrapper type.
   template <typename U, typename OtherAllocator>
   allocator_binder(
-      allocator_binder<U, OtherAllocator>&& other)
+      allocator_binder<U, OtherAllocator>&& other,
+      constraint_t<is_constructible<Allocator, OtherAllocator>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : allocator_(static_cast<OtherAllocator&&>(
           other.get_allocator())),
       target_(static_cast<U&&>(other.get()))
@@ -307,7 +314,8 @@ class allocator_binder
   /// specify a different allocator.
   template <typename U, typename OtherAllocator>
   allocator_binder(const allocator_type& s,
-      allocator_binder<U, OtherAllocator>&& other)
+      allocator_binder<U, OtherAllocator>&& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : allocator_(s),
       target_(static_cast<U&&>(other.get()))
   {
@@ -338,14 +346,21 @@ class allocator_binder
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args)
+  result_of_t<T(Args...)> operator()(Args&&... args) &
   {
     return target_(static_cast<Args&&>(args)...);
   }
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args) const
+  result_of_t<T(Args...)> operator()(Args&&... args) &&
+  {
+    return static_cast<T&&>(target_)(static_cast<Args&&>(args)...);
+  }
+
+  /// Forwarding function call operator.
+  template <typename... Args>
+  result_of_t<T(Args...)> operator()(Args&&... args) const&
   {
     return target_(static_cast<Args&&>(args)...);
   }
@@ -355,6 +370,46 @@ class allocator_binder
   T target_;
 };
 
+/// A function object type that adapts a @ref completion_token to specify that
+/// the completion handler should have the supplied allocator as its associated
+/// allocator.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Allocator>
+struct partial_allocator_binder
+{
+  /// Constructor that specifies associated allocator.
+  explicit partial_allocator_binder(const Allocator& ex)
+    : allocator_(ex)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// should have the allocator as its associated allocator.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr allocator_binder<decay_t<CompletionToken>, Allocator>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return allocator_binder<decay_t<CompletionToken>, Allocator>(
+        allocator_, static_cast<CompletionToken&&>(completion_token));
+  }
+
+//private:
+  Allocator allocator_;
+};
+
+/// Create a partial completion token that associates an allocator.
+template <typename Allocator>
+BOOST_ASIO_NODISCARD inline partial_allocator_binder<Allocator>
+bind_allocator(const Allocator& ex)
+{
+  return partial_allocator_binder<Allocator>(ex);
+}
+
 /// Associate an object of type @c T with an allocator of type
 /// @c Allocator.
 template <typename Allocator, typename T>
@@ -383,6 +438,9 @@ class allocator_binder_completion_handler_async_result<
     TargetAsyncResult, Allocator,
     void_t<typename TargetAsyncResult::completion_handler_type>>
 {
+private:
+  TargetAsyncResult target_;
+
 public:
   typedef allocator_binder<
     typename TargetAsyncResult::completion_handler_type, Allocator>
@@ -394,13 +452,10 @@ class allocator_binder_completion_handler_async_result<
   {
   }
 
-  typename TargetAsyncResult::return_type get()
+  auto get() -> decltype(target_.get())
   {
     return target_.get();
   }
-
-private:
-  TargetAsyncResult target_;
 };
 
 template <typename TargetAsyncResult, typename = void>
@@ -432,49 +487,48 @@ class async_result<allocator_binder<T, Allocator>, Signature> :
   }
 
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    template <typename Init>
-    init_wrapper(const Allocator& allocator, Init&& init)
-      : allocator_(allocator),
-        initiation_(static_cast<Init&&>(init))
-    {
-    }
+    using detail::initiation_base<Initiation>::initiation_base;
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args)
+    void operator()(Handler&& handler, const Allocator& a, Args&&... args) &&
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<Initiation&&>(*this)(
           allocator_binder<decay_t<Handler>, Allocator>(
-              allocator_, static_cast<Handler&&>(handler)),
+              a, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args) const
+    void operator()(Handler&& handler,
+        const Allocator& a, Args&&... args) const &
     {
-      initiation_(
+      static_cast<const Initiation&>(*this)(
           allocator_binder<decay_t<Handler>, Allocator>(
-              allocator_, static_cast<Handler&&>(handler)),
+              a, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    Allocator allocator_;
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static auto initiate(Initiation&& initiation,
       RawCompletionToken&& token, Args&&... args)
     -> decltype(
-      async_initiate<T, Signature>(
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+        Signature>(
         declval<init_wrapper<decay_t<Initiation>>>(),
-        token.get(), static_cast<Args&&>(args)...))
+        token.get(), token.get_allocator(), static_cast<Args&&>(args)...))
   {
-    return async_initiate<T, Signature>(
-        init_wrapper<decay_t<Initiation>>(token.get_allocator(),
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+      Signature>(
+        init_wrapper<decay_t<Initiation>>(
           static_cast<Initiation&&>(initiation)),
-        token.get(), static_cast<Args&&>(args)...);
+        token.get(), token.get_allocator(), static_cast<Args&&>(args)...);
   }
 
 private:
@@ -484,6 +538,31 @@ class async_result<allocator_binder<T, Allocator>, Signature> :
   async_result<T, Signature> target_;
 };
 
+template <typename Allocator, typename... Signatures>
+struct async_result<partial_allocator_binder<Allocator>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        allocator_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Allocator>(token.allocator_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        allocator_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Allocator>(token.allocator_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...);
+  }
+};
+
 template <template <typename, typename> class Associator,
     typename T, typename Allocator, typename DefaultCandidate>
 struct associator<Associator, allocator_binder<T, Allocator>, DefaultCandidate>
diff --git a/inst/include/boost/asio/bind_cancellation_slot.hpp b/inst/include/boost/asio/bind_cancellation_slot.hpp
index 53f0a9c43..3d7c8b09e 100644
--- a/inst/include/boost/asio/bind_cancellation_slot.hpp
+++ b/inst/include/boost/asio/bind_cancellation_slot.hpp
@@ -2,7 +2,7 @@
 // bind_cancellation_slot.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,10 +16,12 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/associated_cancellation_slot.hpp>
+#include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -260,7 +262,10 @@ class cancellation_slot_binder
    */
   template <typename U, typename OtherCancellationSlot>
   cancellation_slot_binder(
-      const cancellation_slot_binder<U, OtherCancellationSlot>& other)
+      const cancellation_slot_binder<U, OtherCancellationSlot>& other,
+      constraint_t<is_constructible<CancellationSlot,
+        OtherCancellationSlot>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : slot_(other.get_cancellation_slot()),
       target_(other.get())
   {
@@ -274,7 +279,8 @@ class cancellation_slot_binder
    */
   template <typename U, typename OtherCancellationSlot>
   cancellation_slot_binder(const cancellation_slot_type& s,
-      const cancellation_slot_binder<U, OtherCancellationSlot>& other)
+      const cancellation_slot_binder<U, OtherCancellationSlot>& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : slot_(s),
       target_(other.get())
   {
@@ -300,7 +306,10 @@ class cancellation_slot_binder
   /// Move construct from a different cancellation slot wrapper type.
   template <typename U, typename OtherCancellationSlot>
   cancellation_slot_binder(
-      cancellation_slot_binder<U, OtherCancellationSlot>&& other)
+      cancellation_slot_binder<U, OtherCancellationSlot>&& other,
+      constraint_t<is_constructible<CancellationSlot,
+        OtherCancellationSlot>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : slot_(static_cast<OtherCancellationSlot&&>(
           other.get_cancellation_slot())),
       target_(static_cast<U&&>(other.get()))
@@ -311,7 +320,8 @@ class cancellation_slot_binder
   /// specify a different cancellation slot.
   template <typename U, typename OtherCancellationSlot>
   cancellation_slot_binder(const cancellation_slot_type& s,
-      cancellation_slot_binder<U, OtherCancellationSlot>&& other)
+      cancellation_slot_binder<U, OtherCancellationSlot>&& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : slot_(s),
       target_(static_cast<U&&>(other.get()))
   {
@@ -342,14 +352,21 @@ class cancellation_slot_binder
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args)
+  result_of_t<T(Args...)> operator()(Args&&... args) &
   {
     return target_(static_cast<Args&&>(args)...);
   }
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args) const
+  result_of_t<T(Args...)> operator()(Args&&... args) &&
+  {
+    return static_cast<T&&>(target_)(static_cast<Args&&>(args)...);
+  }
+
+  /// Forwarding function call operator.
+  template <typename... Args>
+  result_of_t<T(Args...)> operator()(Args&&... args) const&
   {
     return target_(static_cast<Args&&>(args)...);
   }
@@ -359,6 +376,46 @@ class cancellation_slot_binder
   T target_;
 };
 
+/// A function object type that adapts a @ref completion_token to specify that
+/// the completion handler should have the supplied cancellation slot as its
+/// associated cancellation slot.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename CancellationSlot>
+struct partial_cancellation_slot_binder
+{
+  /// Constructor that specifies associated cancellation slot.
+  explicit partial_cancellation_slot_binder(const CancellationSlot& ex)
+    : cancellation_slot_(ex)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// should have the cancellation slot as its associated cancellation slot.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr cancellation_slot_binder<decay_t<CompletionToken>, CancellationSlot>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return cancellation_slot_binder<decay_t<CompletionToken>, CancellationSlot>(
+        static_cast<CompletionToken&&>(completion_token), cancellation_slot_);
+  }
+
+//private:
+  CancellationSlot cancellation_slot_;
+};
+
+/// Create a partial completion token that associates a cancellation slot.
+template <typename CancellationSlot>
+BOOST_ASIO_NODISCARD inline partial_cancellation_slot_binder<CancellationSlot>
+bind_cancellation_slot(const CancellationSlot& ex)
+{
+  return partial_cancellation_slot_binder<CancellationSlot>(ex);
+}
+
 /// Associate an object of type @c T with a cancellation slot of type
 /// @c CancellationSlot.
 template <typename CancellationSlot, typename T>
@@ -390,6 +447,9 @@ class cancellation_slot_binder_completion_handler_async_result<
     TargetAsyncResult, CancellationSlot,
     void_t<typename TargetAsyncResult::completion_handler_type>>
 {
+private:
+  TargetAsyncResult target_;
+
 public:
   typedef cancellation_slot_binder<
     typename TargetAsyncResult::completion_handler_type, CancellationSlot>
@@ -401,13 +461,10 @@ class cancellation_slot_binder_completion_handler_async_result<
   {
   }
 
-  typename TargetAsyncResult::return_type get()
+  auto get() -> decltype(target_.get())
   {
     return target_.get();
   }
-
-private:
-  TargetAsyncResult target_;
 };
 
 template <typename TargetAsyncResult, typename = void>
@@ -439,50 +496,51 @@ class async_result<cancellation_slot_binder<T, CancellationSlot>, Signature> :
   }
 
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    template <typename Init>
-    init_wrapper(const CancellationSlot& slot, Init&& init)
-      : slot_(slot),
-        initiation_(static_cast<Init&&>(init))
-    {
-    }
+    using detail::initiation_base<Initiation>::initiation_base;
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args)
+    void operator()(Handler&& handler,
+        const CancellationSlot& slot, Args&&... args) &&
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<Initiation&&>(*this)(
           cancellation_slot_binder<decay_t<Handler>, CancellationSlot>(
-              slot_, static_cast<Handler&&>(handler)),
+              slot, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args) const
+    void operator()(Handler&& handler,
+        const CancellationSlot& slot, Args&&... args) const &
     {
-      initiation_(
+      static_cast<const Initiation&>(*this)(
           cancellation_slot_binder<decay_t<Handler>, CancellationSlot>(
-              slot_, static_cast<Handler&&>(handler)),
+              slot, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    CancellationSlot slot_;
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static auto initiate(Initiation&& initiation,
       RawCompletionToken&& token, Args&&... args)
     -> decltype(
-      async_initiate<T, Signature>(
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+        Signature>(
         declval<init_wrapper<decay_t<Initiation>>>(),
-        token.get(), static_cast<Args&&>(args)...))
+        token.get(), token.get_cancellation_slot(),
+        static_cast<Args&&>(args)...))
   {
-    return async_initiate<T, Signature>(
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+      Signature>(
         init_wrapper<decay_t<Initiation>>(
-          token.get_cancellation_slot(),
           static_cast<Initiation&&>(initiation)),
-        token.get(), static_cast<Args&&>(args)...);
+        token.get(), token.get_cancellation_slot(),
+        static_cast<Args&&>(args)...);
   }
 
 private:
@@ -492,6 +550,32 @@ class async_result<cancellation_slot_binder<T, CancellationSlot>, Signature> :
   async_result<T, Signature> target_;
 };
 
+template <typename CancellationSlot, typename... Signatures>
+struct async_result<partial_cancellation_slot_binder<CancellationSlot>,
+    Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancellation_slot_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          CancellationSlot>(token.cancellation_slot_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancellation_slot_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          CancellationSlot>(token.cancellation_slot_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...);
+  }
+};
+
 template <template <typename, typename> class Associator,
     typename T, typename CancellationSlot, typename DefaultCandidate>
 struct associator<Associator,
diff --git a/inst/include/boost/asio/bind_executor.hpp b/inst/include/boost/asio/bind_executor.hpp
index e66ce3767..f55b059f4 100644
--- a/inst/include/boost/asio/bind_executor.hpp
+++ b/inst/include/boost/asio/bind_executor.hpp
@@ -2,7 +2,7 @@
 // bind_executor.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,10 +16,11 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/execution/executor.hpp>
 #include <boost/asio/execution_context.hpp>
 #include <boost/asio/is_executor.hpp>
@@ -298,7 +299,9 @@ class executor_binder
    * @c U.
    */
   template <typename U, typename OtherExecutor>
-  executor_binder(const executor_binder<U, OtherExecutor>& other)
+  executor_binder(const executor_binder<U, OtherExecutor>& other,
+      constraint_t<is_constructible<Executor, OtherExecutor>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : base_type(other.get_executor(), other.get())
   {
   }
@@ -311,7 +314,8 @@ class executor_binder
    */
   template <typename U, typename OtherExecutor>
   executor_binder(executor_arg_t, const executor_type& e,
-      const executor_binder<U, OtherExecutor>& other)
+      const executor_binder<U, OtherExecutor>& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : base_type(e, other.get())
   {
   }
@@ -332,7 +336,9 @@ class executor_binder
 
   /// Move construct from a different executor wrapper type.
   template <typename U, typename OtherExecutor>
-  executor_binder(executor_binder<U, OtherExecutor>&& other)
+  executor_binder(executor_binder<U, OtherExecutor>&& other,
+      constraint_t<is_constructible<Executor, OtherExecutor>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : base_type(static_cast<OtherExecutor&&>(other.get_executor()),
         static_cast<U&&>(other.get()))
   {
@@ -342,7 +348,8 @@ class executor_binder
   /// different executor.
   template <typename U, typename OtherExecutor>
   executor_binder(executor_arg_t, const executor_type& e,
-      executor_binder<U, OtherExecutor>&& other)
+      executor_binder<U, OtherExecutor>&& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : base_type(e, static_cast<U&&>(other.get()))
   {
   }
@@ -372,14 +379,21 @@ class executor_binder
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args)
+  result_of_t<T(Args...)> operator()(Args&&... args) &
   {
     return this->target_(static_cast<Args&&>(args)...);
   }
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args) const
+  result_of_t<T(Args...)> operator()(Args&&... args) &&
+  {
+    return static_cast<T&&>(this->target_)(static_cast<Args&&>(args)...);
+  }
+
+  /// Forwarding function call operator.
+  template <typename... Args>
+  result_of_t<T(Args...)> operator()(Args&&... args) const&
   {
     return this->target_(static_cast<Args&&>(args)...);
   }
@@ -389,6 +403,49 @@ class executor_binder
     uses_executor<T, Executor>::value> base_type;
 };
 
+/// A function object type that adapts a @ref completion_token to specify that
+/// the completion handler should have the supplied executor as its associated
+/// executor.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Executor>
+struct partial_executor_binder
+{
+  /// Constructor that specifies associated executor.
+  explicit partial_executor_binder(const Executor& ex)
+    : executor_(ex)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// should have the executor as its associated executor.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr executor_binder<decay_t<CompletionToken>, Executor>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return executor_binder<decay_t<CompletionToken>, Executor>(executor_arg_t(),
+        static_cast<CompletionToken&&>(completion_token), executor_);
+  }
+
+//private:
+  Executor executor_;
+};
+
+/// Create a partial completion token that associates an executor.
+template <typename Executor>
+BOOST_ASIO_NODISCARD inline partial_executor_binder<Executor>
+bind_executor(const Executor& ex,
+    constraint_t<
+      is_executor<Executor>::value || execution::is_executor<Executor>::value
+    > = 0)
+{
+  return partial_executor_binder<Executor>(ex);
+}
+
 /// Associate an object of type @c T with an executor of type @c Executor.
 template <typename Executor, typename T>
 BOOST_ASIO_NODISCARD inline executor_binder<decay_t<T>, Executor>
@@ -401,6 +458,20 @@ bind_executor(const Executor& ex, T&& t,
       executor_arg_t(), ex, static_cast<T&&>(t));
 }
 
+/// Create a partial completion token that associates an execution context's
+/// executor.
+template <typename ExecutionContext>
+BOOST_ASIO_NODISCARD inline partial_executor_binder<
+    typename ExecutionContext::executor_type>
+bind_executor(ExecutionContext& ctx,
+    constraint_t<
+      is_convertible<ExecutionContext&, execution_context&>::value
+    > = 0)
+{
+  return partial_executor_binder<typename ExecutionContext::executor_type>(
+      ctx.get_executor());
+}
+
 /// Associate an object of type @c T with an execution context's executor.
 template <typename ExecutionContext, typename T>
 BOOST_ASIO_NODISCARD inline executor_binder<decay_t<T>,
@@ -437,6 +508,9 @@ class executor_binder_completion_handler_async_result<
     TargetAsyncResult, Executor,
     void_t<typename TargetAsyncResult::completion_handler_type >>
 {
+private:
+  TargetAsyncResult target_;
+
 public:
   typedef executor_binder<
     typename TargetAsyncResult::completion_handler_type, Executor>
@@ -448,13 +522,10 @@ class executor_binder_completion_handler_async_result<
   {
   }
 
-  typename TargetAsyncResult::return_type get()
+  auto get() -> decltype(target_.get())
   {
     return target_.get();
   }
-
-private:
-  TargetAsyncResult target_;
 };
 
 template <typename TargetAsyncResult, typename = void>
@@ -486,49 +557,48 @@ class async_result<executor_binder<T, Executor>, Signature> :
   }
 
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    template <typename Init>
-    init_wrapper(const Executor& ex, Init&& init)
-      : ex_(ex),
-        initiation_(static_cast<Init&&>(init))
-    {
-    }
+    using detail::initiation_base<Initiation>::initiation_base;
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args)
+    void operator()(Handler&& handler, const Executor& e, Args&&... args) &&
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<Initiation&&>(*this)(
           executor_binder<decay_t<Handler>, Executor>(
-            executor_arg_t(), ex_, static_cast<Handler&&>(handler)),
+            executor_arg_t(), e, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args) const
+    void operator()(Handler&& handler,
+        const Executor& e, Args&&... args) const &
     {
-      initiation_(
+      static_cast<const Initiation&>(*this)(
           executor_binder<decay_t<Handler>, Executor>(
-            executor_arg_t(), ex_, static_cast<Handler&&>(handler)),
+            executor_arg_t(), e, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    Executor ex_;
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static auto initiate(Initiation&& initiation,
       RawCompletionToken&& token, Args&&... args)
     -> decltype(
-      async_initiate<T, Signature>(
-        declval<init_wrapper<decay_t<Initiation>>>(),
-        token.get(), static_cast<Args&&>(args)...))
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+        Signature>(
+          declval<init_wrapper<decay_t<Initiation>>>(),
+          token.get(), token.get_executor(), static_cast<Args&&>(args)...))
   {
-    return async_initiate<T, Signature>(
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+      Signature>(
         init_wrapper<decay_t<Initiation>>(
-          token.get_executor(), static_cast<Initiation&&>(initiation)),
-        token.get(), static_cast<Args&&>(args)...);
+          static_cast<Initiation&&>(initiation)),
+        token.get(), token.get_executor(), static_cast<Args&&>(args)...);
   }
 
 private:
@@ -536,6 +606,31 @@ class async_result<executor_binder<T, Executor>, Signature> :
   async_result& operator=(const async_result&) = delete;
 };
 
+template <typename Executor, typename... Signatures>
+struct async_result<partial_executor_binder<Executor>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        executor_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Executor>(executor_arg_t(), token.executor_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        executor_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Executor>(executor_arg_t(), token.executor_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...);
+  }
+};
+
 template <template <typename, typename> class Associator,
     typename T, typename Executor, typename DefaultCandidate>
 struct associator<Associator, executor_binder<T, Executor>, DefaultCandidate>
diff --git a/inst/include/boost/asio/bind_immediate_executor.hpp b/inst/include/boost/asio/bind_immediate_executor.hpp
index cefc2dfa7..e28366943 100644
--- a/inst/include/boost/asio/bind_immediate_executor.hpp
+++ b/inst/include/boost/asio/bind_immediate_executor.hpp
@@ -1,8 +1,8 @@
 //
 // bind_immediate_executor.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,10 +16,12 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associated_immediate_executor.hpp>
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -261,7 +263,9 @@ class immediate_executor_binder
    */
   template <typename U, typename OtherExecutor>
   immediate_executor_binder(
-      const immediate_executor_binder<U, OtherExecutor>& other)
+      const immediate_executor_binder<U, OtherExecutor>& other,
+      constraint_t<is_constructible<Executor, OtherExecutor>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : executor_(other.get_immediate_executor()),
       target_(other.get())
   {
@@ -275,7 +279,8 @@ class immediate_executor_binder
    */
   template <typename U, typename OtherExecutor>
   immediate_executor_binder(const immediate_executor_type& e,
-      const immediate_executor_binder<U, OtherExecutor>& other)
+      const immediate_executor_binder<U, OtherExecutor>& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : executor_(e),
       target_(other.get())
   {
@@ -301,7 +306,9 @@ class immediate_executor_binder
   /// Move construct from a different immediate executor wrapper type.
   template <typename U, typename OtherExecutor>
   immediate_executor_binder(
-      immediate_executor_binder<U, OtherExecutor>&& other)
+      immediate_executor_binder<U, OtherExecutor>&& other,
+      constraint_t<is_constructible<Executor, OtherExecutor>::value> = 0,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : executor_(static_cast<OtherExecutor&&>(
           other.get_immediate_executor())),
       target_(static_cast<U&&>(other.get()))
@@ -312,7 +319,8 @@ class immediate_executor_binder
   /// specify a different immediate executor.
   template <typename U, typename OtherExecutor>
   immediate_executor_binder(const immediate_executor_type& e,
-      immediate_executor_binder<U, OtherExecutor>&& other)
+      immediate_executor_binder<U, OtherExecutor>&& other,
+      constraint_t<is_constructible<T, U>::value> = 0)
     : executor_(e),
       target_(static_cast<U&&>(other.get()))
   {
@@ -343,14 +351,21 @@ class immediate_executor_binder
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args)
+  result_of_t<T(Args...)> operator()(Args&&... args) &
   {
     return target_(static_cast<Args&&>(args)...);
   }
 
   /// Forwarding function call operator.
   template <typename... Args>
-  result_of_t<T(Args...)> operator()(Args&&... args) const
+  result_of_t<T(Args...)> operator()(Args&&... args) &&
+  {
+    return static_cast<T&&>(target_)(static_cast<Args&&>(args)...);
+  }
+
+  /// Forwarding function call operator.
+  template <typename... Args>
+  result_of_t<T(Args...)> operator()(Args&&... args) const&
   {
     return target_(static_cast<Args&&>(args)...);
   }
@@ -360,6 +375,46 @@ class immediate_executor_binder
   T target_;
 };
 
+/// A function object type that adapts a @ref completion_token to specify that
+/// the completion handler should have the supplied executor as its associated
+/// immediate executor.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Executor>
+struct partial_immediate_executor_binder
+{
+  /// Constructor that specifies associated executor.
+  explicit partial_immediate_executor_binder(const Executor& ex)
+    : executor_(ex)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// should have the executor as its associated immediate executor.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr immediate_executor_binder<decay_t<CompletionToken>, Executor>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return immediate_executor_binder<decay_t<CompletionToken>, Executor>(
+        static_cast<CompletionToken&&>(completion_token), executor_);
+  }
+
+//private:
+  Executor executor_;
+};
+
+/// Create a partial completion token that associates an executor.
+template <typename Executor>
+BOOST_ASIO_NODISCARD inline partial_immediate_executor_binder<Executor>
+bind_immediate_executor(const Executor& ex)
+{
+  return partial_immediate_executor_binder<Executor>(ex);
+}
+
 /// Associate an object of type @c T with a immediate executor of type
 /// @c Executor.
 template <typename Executor, typename T>
@@ -392,6 +447,9 @@ class immediate_executor_binder_completion_handler_async_result<
     typename TargetAsyncResult::completion_handler_type
   >>
 {
+private:
+  TargetAsyncResult target_;
+
 public:
   typedef immediate_executor_binder<
     typename TargetAsyncResult::completion_handler_type, Executor>
@@ -403,13 +461,10 @@ class immediate_executor_binder_completion_handler_async_result<
   {
   }
 
-  typename TargetAsyncResult::return_type get()
+  auto get() -> decltype(target_.get())
   {
     return target_.get();
   }
-
-private:
-  TargetAsyncResult target_;
 };
 
 template <typename TargetAsyncResult, typename = void>
@@ -444,52 +499,52 @@ class async_result<immediate_executor_binder<T, Executor>, Signature> :
   }
 
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    template <typename Init>
-    init_wrapper(const Executor& e, Init&& init)
-      : executor_(e),
-        initiation_(static_cast<Init&&>(init))
-    {
-    }
+    using detail::initiation_base<Initiation>::initiation_base;
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args)
+    void operator()(Handler&& handler, const Executor& e, Args&&... args) &&
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<Initiation&&>(*this)(
           immediate_executor_binder<
             decay_t<Handler>, Executor>(
-              executor_, static_cast<Handler&&>(handler)),
+              e, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args) const
+    void operator()(Handler&& handler,
+        const Executor& e, Args&&... args) const &
     {
-      initiation_(
+      static_cast<const Initiation&>(*this)(
           immediate_executor_binder<
             decay_t<Handler>, Executor>(
-              executor_, static_cast<Handler&&>(handler)),
+              e, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    Executor executor_;
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static auto initiate(Initiation&& initiation,
       RawCompletionToken&& token, Args&&... args)
     -> decltype(
-      async_initiate<T, Signature>(
-        declval<init_wrapper<decay_t<Initiation>>>(),
-        token.get(), static_cast<Args&&>(args)...))
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+        Signature>(
+          declval<init_wrapper<decay_t<Initiation>>>(),
+          token.get(), token.get_immediate_executor(),
+          static_cast<Args&&>(args)...))
   {
-    return async_initiate<T, Signature>(
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value, const T, T>,
+      Signature>(
         init_wrapper<decay_t<Initiation>>(
-          token.get_immediate_executor(),
           static_cast<Initiation&&>(initiation)),
-        token.get(), static_cast<Args&&>(args)...);
+        token.get(), token.get_immediate_executor(),
+        static_cast<Args&&>(args)...);
   }
 
 private:
@@ -499,6 +554,31 @@ class async_result<immediate_executor_binder<T, Executor>, Signature> :
   async_result<T, Signature> target_;
 };
 
+template <typename Executor, typename... Signatures>
+struct async_result<partial_immediate_executor_binder<Executor>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        immediate_executor_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Executor>(token.executor_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        immediate_executor_binder<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Executor>(token.executor_,
+            default_completion_token_t<associated_executor_t<Initiation>>{}),
+        static_cast<Args&&>(args)...);
+  }
+};
+
 template <template <typename, typename> class Associator,
     typename T, typename Executor, typename DefaultCandidate>
 struct associator<Associator,
diff --git a/inst/include/boost/asio/buffer.hpp b/inst/include/boost/asio/buffer.hpp
index 2e92e7fe2..dc63ce338 100644
--- a/inst/include/boost/asio/buffer.hpp
+++ b/inst/include/boost/asio/buffer.hpp
@@ -2,7 +2,7 @@
 // buffer.hpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -53,6 +53,43 @@
 
 namespace boost {
 namespace asio {
+namespace detail {
+
+#if defined(BOOST_ASIO_MSVC)
+
+struct span_memfns_base
+{
+  void subspan();
+};
+
+template <typename T>
+struct span_memfns_derived : T, span_memfns_base
+{
+};
+
+template <typename T, T>
+struct span_memfns_check
+{
+};
+
+template <typename>
+char (&subspan_memfn_helper(...))[2];
+
+template <typename T>
+char subspan_memfn_helper(
+    span_memfns_check<
+      void (span_memfns_base::*)(),
+      &span_memfns_derived<T>::subspan>*);
+
+template <typename T>
+struct has_subspan_memfn :
+  integral_constant<bool, sizeof(subspan_memfn_helper<T>(0)) != 1>
+{
+};
+
+#endif // defined(BOOST_ASIO_MSVC)
+
+} // namespace detail
 
 class mutable_buffer;
 class const_buffer;
@@ -93,6 +130,34 @@ class mutable_buffer
   {
   }
 
+  /// Construct a buffer from a span of bytes.
+  template <template <typename, std::size_t> class Span,
+      typename T, std::size_t Extent>
+  mutable_buffer(const Span<T, Extent>& span,
+      constraint_t<
+        !is_const<T>::value,
+        defaulted_constraint
+      > = defaulted_constraint(),
+      constraint_t<
+        sizeof(T) == 1,
+        defaulted_constraint
+      > = defaulted_constraint(),
+      constraint_t<
+#if defined(BOOST_ASIO_MSVC)
+        detail::has_subspan_memfn<Span<T, Extent>>::value,
+#else // defined(BOOST_ASIO_MSVC)
+        is_same<
+          decltype(span.subspan(0, 0)),
+          Span<T, static_cast<std::size_t>(-1)>
+        >::value,
+#endif // defined(BOOST_ASIO_MSVC)
+        defaulted_constraint
+      > = defaulted_constraint())
+    : data_(span.data()),
+      size_(span.size())
+  {
+  }
+
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
   mutable_buffer(void* data, std::size_t size,
       boost::asio::detail::function<void()> debug_check)
@@ -142,55 +207,6 @@ class mutable_buffer
 #endif // BOOST_ASIO_ENABLE_BUFFER_DEBUGGING
 };
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-/// (Deprecated: Use mutable_buffer.) Adapts a single modifiable buffer so that
-/// it meets the requirements of the MutableBufferSequence concept.
-class mutable_buffers_1
-  : public mutable_buffer
-{
-public:
-  /// The type for each element in the list of buffers.
-  typedef mutable_buffer value_type;
-
-  /// A random-access iterator type that may be used to read elements.
-  typedef const mutable_buffer* const_iterator;
-
-  /// Construct to represent a given memory range.
-  mutable_buffers_1(void* data, std::size_t size) noexcept
-    : mutable_buffer(data, size)
-  {
-  }
-
-#if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-  mutable_buffers_1(void* data, std::size_t size,
-      boost::asio::detail::function<void()> debug_check)
-    : mutable_buffer(data, size, debug_check)
-  {
-  }
-#endif // BOOST_ASIO_ENABLE_BUFFER_DEBUGGING
-
-  /// Construct to represent a single modifiable buffer.
-  explicit mutable_buffers_1(const mutable_buffer& b) noexcept
-    : mutable_buffer(b)
-  {
-  }
-
-  /// Get a random-access iterator to the first element.
-  const_iterator begin() const noexcept
-  {
-    return this;
-  }
-
-  /// Get a random-access iterator for one past the last element.
-  const_iterator end() const noexcept
-  {
-    return begin() + 1;
-  }
-};
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 /// Holds a buffer that cannot be modified.
 /**
  * The const_buffer class provides a safe representation of a buffer that cannot
@@ -237,6 +253,30 @@ class const_buffer
   {
   }
 
+  /// Construct a buffer from a span of bytes.
+  template <template <typename, std::size_t> class Span,
+      typename T, std::size_t Extent>
+  const_buffer(const Span<T, Extent>& span,
+      constraint_t<
+        sizeof(T) == 1,
+        defaulted_constraint
+      > = defaulted_constraint(),
+      constraint_t<
+#if defined(BOOST_ASIO_MSVC)
+        detail::has_subspan_memfn<Span<T, Extent>>::value,
+#else // defined(BOOST_ASIO_MSVC)
+        is_same<
+          decltype(span.subspan(0, 0)),
+          Span<T, static_cast<std::size_t>(-1)>
+        >::value,
+#endif // defined(BOOST_ASIO_MSVC)
+        defaulted_constraint
+      > = defaulted_constraint())
+    : data_(span.data()),
+      size_(span.size())
+  {
+  }
+
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
   const_buffer(const void* data, std::size_t size,
       boost::asio::detail::function<void()> debug_check)
@@ -286,55 +326,6 @@ class const_buffer
 #endif // BOOST_ASIO_ENABLE_BUFFER_DEBUGGING
 };
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-/// (Deprecated: Use const_buffer.) Adapts a single non-modifiable buffer so
-/// that it meets the requirements of the ConstBufferSequence concept.
-class const_buffers_1
-  : public const_buffer
-{
-public:
-  /// The type for each element in the list of buffers.
-  typedef const_buffer value_type;
-
-  /// A random-access iterator type that may be used to read elements.
-  typedef const const_buffer* const_iterator;
-
-  /// Construct to represent a given memory range.
-  const_buffers_1(const void* data, std::size_t size) noexcept
-    : const_buffer(data, size)
-  {
-  }
-
-#if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
-  const_buffers_1(const void* data, std::size_t size,
-      boost::asio::detail::function<void()> debug_check)
-    : const_buffer(data, size, debug_check)
-  {
-  }
-#endif // BOOST_ASIO_ENABLE_BUFFER_DEBUGGING
-
-  /// Construct to represent a single non-modifiable buffer.
-  explicit const_buffers_1(const const_buffer& b) noexcept
-    : const_buffer(b)
-  {
-  }
-
-  /// Get a random-access iterator to the first element.
-  const_iterator begin() const noexcept
-  {
-    return this;
-  }
-
-  /// Get a random-access iterator for one past the last element.
-  const_iterator end() const noexcept
-  {
-    return begin() + 1;
-  }
-};
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 /// (Deprecated: Use the socket/descriptor wait() and async_wait() member
 /// functions.) An implementation of both the ConstBufferSequence and
 /// MutableBufferSequence concepts to represent a null buffer sequence.
@@ -390,12 +381,38 @@ inline const const_buffer* buffer_sequence_begin(const ConstBuffer& b,
   return static_cast<const const_buffer*>(detail::addressof(b));
 }
 
+/// Get an iterator to the first element in a buffer sequence.
+template <typename ConvertibleToBuffer>
+inline const ConvertibleToBuffer* buffer_sequence_begin(
+    const ConvertibleToBuffer& b,
+    constraint_t<
+      !is_convertible<const ConvertibleToBuffer*, const mutable_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<const ConvertibleToBuffer*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      is_convertible<ConvertibleToBuffer, mutable_buffer>::value
+        || is_convertible<ConvertibleToBuffer, const_buffer>::value
+    > = 0) noexcept
+{
+  return detail::addressof(b);
+}
+
 /// Get an iterator to the first element in a buffer sequence.
 template <typename C>
 inline auto buffer_sequence_begin(C& c,
     constraint_t<
       !is_convertible<const C*, const mutable_buffer*>::value
-        && !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, mutable_buffer>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, const_buffer>::value
     > = 0) noexcept -> decltype(c.begin())
 {
   return c.begin();
@@ -406,7 +423,15 @@ template <typename C>
 inline auto buffer_sequence_begin(const C& c,
     constraint_t<
       !is_convertible<const C*, const mutable_buffer*>::value
-        && !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, mutable_buffer>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, const_buffer>::value
     > = 0) noexcept -> decltype(c.begin())
 {
   return c.begin();
@@ -441,12 +466,38 @@ inline const const_buffer* buffer_sequence_end(const ConstBuffer& b,
   return static_cast<const const_buffer*>(detail::addressof(b)) + 1;
 }
 
+/// Get an iterator to one past the end element in a buffer sequence.
+template <typename ConvertibleToBuffer>
+inline const ConvertibleToBuffer* buffer_sequence_end(
+    const ConvertibleToBuffer& b,
+    constraint_t<
+      !is_convertible<const ConvertibleToBuffer*, const mutable_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<const ConvertibleToBuffer*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      is_convertible<ConvertibleToBuffer, mutable_buffer>::value
+        || is_convertible<ConvertibleToBuffer, const_buffer>::value
+    > = 0) noexcept
+{
+  return detail::addressof(b) + 1;
+}
+
 /// Get an iterator to one past the end element in a buffer sequence.
 template <typename C>
 inline auto buffer_sequence_end(C& c,
     constraint_t<
       !is_convertible<const C*, const mutable_buffer*>::value
-        && !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, mutable_buffer>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, const_buffer>::value
     > = 0) noexcept -> decltype(c.end())
 {
   return c.end();
@@ -457,7 +508,15 @@ template <typename C>
 inline auto buffer_sequence_end(const C& c,
     constraint_t<
       !is_convertible<const C*, const mutable_buffer*>::value
-        && !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<const C*, const const_buffer*>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, mutable_buffer>::value
+    > = 0,
+    constraint_t<
+      !is_convertible<C, const_buffer>::value
     > = 0) noexcept -> decltype(c.end())
 {
   return c.end();
@@ -476,10 +535,6 @@ template <typename BufferSequence>
 struct buffer_sequence_cardinality :
   conditional_t<
     is_same<BufferSequence, mutable_buffer>::value
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-      || is_same<BufferSequence, mutable_buffers_1>::value
-      || is_same<BufferSequence, const_buffers_1>::value
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
       || is_same<BufferSequence, const_buffer>::value,
     one_buffer, multiple_buffers> {};
 
@@ -535,49 +590,6 @@ inline std::size_t buffer_size(const BufferSequence& b) noexcept
       boost::asio::buffer_sequence_end(b));
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-/** @defgroup buffer_cast boost::asio::buffer_cast
- *
- * @brief (Deprecated: Use the @c data() member function.) The
- * boost::asio::buffer_cast function is used to obtain a pointer to the
- * underlying memory region associated with a buffer.
- *
- * @par Examples:
- *
- * To access the memory of a non-modifiable buffer, use:
- * @code boost::asio::const_buffer b1 = ...;
- * const unsigned char* p1 = boost::asio::buffer_cast<const unsigned char*>(b1);
- * @endcode
- *
- * To access the memory of a modifiable buffer, use:
- * @code boost::asio::mutable_buffer b2 = ...;
- * unsigned char* p2 = boost::asio::buffer_cast<unsigned char*>(b2);
- * @endcode
- *
- * The boost::asio::buffer_cast function permits violations of type safety, so
- * uses of it in application code should be carefully considered.
- */
-/*@{*/
-
-/// Cast a non-modifiable buffer to a specified pointer to POD type.
-template <typename PointerToPodType>
-inline PointerToPodType buffer_cast(const mutable_buffer& b) noexcept
-{
-  return static_cast<PointerToPodType>(b.data());
-}
-
-/// Cast a non-modifiable buffer to a specified pointer to POD type.
-template <typename PointerToPodType>
-inline PointerToPodType buffer_cast(const const_buffer& b) noexcept
-{
-  return static_cast<PointerToPodType>(b.data());
-}
-
-/*@}*/
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 /// Create a new modifiable buffer that is offset from the start of another.
 /**
  * @relates mutable_buffer
@@ -848,22 +860,17 @@ class buffer_debug_check
  */
 /*@{*/
 
-#if defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION)
-# define BOOST_ASIO_MUTABLE_BUFFER mutable_buffer
-# define BOOST_ASIO_CONST_BUFFER const_buffer
-#else // defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION)
-# define BOOST_ASIO_MUTABLE_BUFFER mutable_buffers_1
-# define BOOST_ASIO_CONST_BUFFER const_buffers_1
-#endif // defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION)
+# define mutable_buffer mutable_buffer
+# define const_buffer const_buffer
 
 /// Create a new modifiable buffer from an existing buffer.
 /**
  * @returns <tt>mutable_buffer(b)</tt>.
  */
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     const mutable_buffer& b) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(b);
+  return mutable_buffer(b);
 }
 
 /// Create a new modifiable buffer from an existing buffer.
@@ -873,11 +880,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     b.data(),
  *     min(b.size(), max_size_in_bytes)); @endcode
  */
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     const mutable_buffer& b,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(
+  return mutable_buffer(
       mutable_buffer(b.data(),
         b.size() < max_size_in_bytes
         ? b.size() : max_size_in_bytes
@@ -891,10 +898,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
 /**
  * @returns <tt>const_buffer(b)</tt>.
  */
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const const_buffer& b) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(b);
+  return const_buffer(b);
 }
 
 /// Create a new non-modifiable buffer from an existing buffer.
@@ -904,11 +911,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     b.data(),
  *     min(b.size(), max_size_in_bytes)); @endcode
  */
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const const_buffer& b,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(b.data(),
+  return const_buffer(b.data(),
       b.size() < max_size_in_bytes
       ? b.size() : max_size_in_bytes
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
@@ -921,20 +928,20 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
 /**
  * @returns <tt>mutable_buffer(data, size_in_bytes)</tt>.
  */
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     void* data, std::size_t size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data, size_in_bytes);
+  return mutable_buffer(data, size_in_bytes);
 }
 
 /// Create a new non-modifiable buffer that represents the given memory range.
 /**
  * @returns <tt>const_buffer(data, size_in_bytes)</tt>.
  */
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const void* data, std::size_t size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data, size_in_bytes);
+  return const_buffer(data, size_in_bytes);
 }
 
 /// Create a new modifiable buffer that represents the given POD array.
@@ -945,12 +952,12 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     N * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     PodType (&data)[N]) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data, N * sizeof(PodType));
+  return mutable_buffer(data, N * sizeof(PodType));
 }
- 
+
 /// Create a new modifiable buffer that represents the given POD array.
 /**
  * @returns A mutable_buffer value equivalent to:
@@ -959,15 +966,15 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     min(N * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     PodType (&data)[N],
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data,
+  return mutable_buffer(data,
       N * sizeof(PodType) < max_size_in_bytes
       ? N * sizeof(PodType) : max_size_in_bytes);
 }
- 
+
 /// Create a new non-modifiable buffer that represents the given POD array.
 /**
  * @returns A const_buffer value equivalent to:
@@ -976,10 +983,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     N * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const PodType (&data)[N]) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data, N * sizeof(PodType));
+  return const_buffer(data, N * sizeof(PodType));
 }
 
 /// Create a new non-modifiable buffer that represents the given POD array.
@@ -990,11 +997,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     min(N * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const PodType (&data)[N],
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data,
+  return const_buffer(data,
       N * sizeof(PodType) < max_size_in_bytes
       ? N * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1007,10 +1014,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     data.size() * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     boost::array<PodType, N>& data) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(
+  return mutable_buffer(
       data.c_array(), data.size() * sizeof(PodType));
 }
 
@@ -1022,11 +1029,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     min(data.size() * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     boost::array<PodType, N>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data.c_array(),
+  return mutable_buffer(data.c_array(),
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1039,10 +1046,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     data.size() * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     boost::array<const PodType, N>& data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(), data.size() * sizeof(PodType));
+  return const_buffer(data.data(), data.size() * sizeof(PodType));
 }
 
 /// Create a new non-modifiable buffer that represents the given POD array.
@@ -1053,11 +1060,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     min(data.size() * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     boost::array<const PodType, N>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(),
+  return const_buffer(data.data(),
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1070,10 +1077,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     data.size() * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const boost::array<PodType, N>& data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(), data.size() * sizeof(PodType));
+  return const_buffer(data.data(), data.size() * sizeof(PodType));
 }
 
 /// Create a new non-modifiable buffer that represents the given POD array.
@@ -1084,11 +1091,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     min(data.size() * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const boost::array<PodType, N>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(),
+  return const_buffer(data.data(),
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1101,10 +1108,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     data.size() * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     std::array<PodType, N>& data) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data.data(), data.size() * sizeof(PodType));
+  return mutable_buffer(data.data(), data.size() * sizeof(PodType));
 }
 
 /// Create a new modifiable buffer that represents the given POD array.
@@ -1115,11 +1122,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     min(data.size() * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     std::array<PodType, N>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data.data(),
+  return mutable_buffer(data.data(),
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1132,10 +1139,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     data.size() * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     std::array<const PodType, N>& data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(), data.size() * sizeof(PodType));
+  return const_buffer(data.data(), data.size() * sizeof(PodType));
 }
 
 /// Create a new non-modifiable buffer that represents the given POD array.
@@ -1146,11 +1153,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     min(data.size() * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     std::array<const PodType, N>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(),
+  return const_buffer(data.data(),
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1163,10 +1170,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     data.size() * sizeof(PodType)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const std::array<PodType, N>& data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(), data.size() * sizeof(PodType));
+  return const_buffer(data.data(), data.size() * sizeof(PodType));
 }
 
 /// Create a new non-modifiable buffer that represents the given POD array.
@@ -1177,11 +1184,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     min(data.size() * sizeof(PodType), max_size_in_bytes)); @endcode
  */
 template <typename PodType, std::size_t N>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const std::array<PodType, N>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(),
+  return const_buffer(data.data(),
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes);
 }
@@ -1197,10 +1204,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  * invalidate iterators.
  */
 template <typename PodType, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     std::vector<PodType, Allocator>& data) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(
+  return mutable_buffer(
       data.size() ? &data[0] : 0, data.size() * sizeof(PodType)
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
       , detail::buffer_debug_check<
@@ -1221,11 +1228,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  * invalidate iterators.
  */
 template <typename PodType, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     std::vector<PodType, Allocator>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data.size() ? &data[0] : 0,
+  return mutable_buffer(data.size() ? &data[0] : 0,
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
@@ -1247,10 +1254,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  * invalidate iterators.
  */
 template <typename PodType, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const std::vector<PodType, Allocator>& data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(
+  return const_buffer(
       data.size() ? &data[0] : 0, data.size() * sizeof(PodType)
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
       , detail::buffer_debug_check<
@@ -1271,11 +1278,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  * invalidate iterators.
  */
 template <typename PodType, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const std::vector<PodType, Allocator>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.size() ? &data[0] : 0,
+  return const_buffer(data.size() ? &data[0] : 0,
       data.size() * sizeof(PodType) < max_size_in_bytes
       ? data.size() * sizeof(PodType) : max_size_in_bytes
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
@@ -1295,10 +1302,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  * given string object.
  */
 template <typename Elem, typename Traits, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     std::basic_string<Elem, Traits, Allocator>& data) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data.size() ? &data[0] : 0,
+  return mutable_buffer(data.size() ? &data[0] : 0,
       data.size() * sizeof(Elem)
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
       , detail::buffer_debug_check<
@@ -1319,11 +1326,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  * given string object.
  */
 template <typename Elem, typename Traits, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     std::basic_string<Elem, Traits, Allocator>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(data.size() ? &data[0] : 0,
+  return mutable_buffer(data.size() ? &data[0] : 0,
       data.size() * sizeof(Elem) < max_size_in_bytes
       ? data.size() * sizeof(Elem) : max_size_in_bytes
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
@@ -1342,10 +1349,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  * given string object.
  */
 template <typename Elem, typename Traits, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const std::basic_string<Elem, Traits, Allocator>& data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(), data.size() * sizeof(Elem)
+  return const_buffer(data.data(), data.size() * sizeof(Elem)
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
       , detail::buffer_debug_check<
           typename std::basic_string<Elem, Traits, Allocator>::const_iterator
@@ -1365,11 +1372,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  * given string object.
  */
 template <typename Elem, typename Traits, typename Allocator>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const std::basic_string<Elem, Traits, Allocator>& data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.data(),
+  return const_buffer(data.data(),
       data.size() * sizeof(Elem) < max_size_in_bytes
       ? data.size() * sizeof(Elem) : max_size_in_bytes
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
@@ -1389,10 +1396,10 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  * data.size() * sizeof(Elem))</tt>.
  */
 template <typename Elem, typename Traits>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     basic_string_view<Elem, Traits> data) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.size() ? &data[0] : 0,
+  return const_buffer(data.size() ? &data[0] : 0,
       data.size() * sizeof(Elem)
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
       , detail::buffer_debug_check<
@@ -1410,11 +1417,11 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     min(data.size() * sizeof(Elem), max_size_in_bytes)); @endcode
  */
 template <typename Elem, typename Traits>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     basic_string_view<Elem, Traits> data,
     std::size_t max_size_in_bytes) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(data.size() ? &data[0] : 0,
+  return const_buffer(data.size() ? &data[0] : 0,
       data.size() * sizeof(Elem) < max_size_in_bytes
       ? data.size() * sizeof(Elem) : max_size_in_bytes
 #if defined(BOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
@@ -1436,7 +1443,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     data.size() * sizeof(typename T::value_type)); @endcode
  */
 template <typename T>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     T& data,
     constraint_t<
       is_contiguous_iterator<typename T::iterator>::value,
@@ -1459,7 +1466,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
       defaulted_constraint
     > = defaulted_constraint()) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(
+  return mutable_buffer(
       data.size() ? detail::to_address(data.begin()) : 0,
       data.size() * sizeof(typename T::value_type));
 }
@@ -1474,7 +1481,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *       max_size_in_bytes)); @endcode
  */
 template <typename T>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline mutable_buffer buffer(
     T& data, std::size_t max_size_in_bytes,
     constraint_t<
       is_contiguous_iterator<typename T::iterator>::value,
@@ -1497,7 +1504,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
       defaulted_constraint
     > = defaulted_constraint()) noexcept
 {
-  return BOOST_ASIO_MUTABLE_BUFFER(
+  return mutable_buffer(
       data.size() ? detail::to_address(data.begin()) : 0,
       data.size() * sizeof(typename T::value_type) < max_size_in_bytes
       ? data.size() * sizeof(typename T::value_type) : max_size_in_bytes);
@@ -1511,7 +1518,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_MUTABLE_BUFFER buffer(
  *     data.size() * sizeof(typename T::value_type)); @endcode
  */
 template <typename T>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     T& data,
     constraint_t<
       is_contiguous_iterator<typename T::iterator>::value,
@@ -1534,7 +1541,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
       defaulted_constraint
     > = defaulted_constraint()) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(
+  return const_buffer(
       data.size() ? detail::to_address(data.begin()) : 0,
       data.size() * sizeof(typename T::value_type));
 }
@@ -1549,7 +1556,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *       max_size_in_bytes)); @endcode
  */
 template <typename T>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     T& data, std::size_t max_size_in_bytes,
     constraint_t<
       is_contiguous_iterator<typename T::iterator>::value,
@@ -1572,7 +1579,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
       defaulted_constraint
     > = defaulted_constraint()) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(
+  return const_buffer(
       data.size() ? detail::to_address(data.begin()) : 0,
       data.size() * sizeof(typename T::value_type) < max_size_in_bytes
       ? data.size() * sizeof(typename T::value_type) : max_size_in_bytes);
@@ -1586,7 +1593,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *     data.size() * sizeof(typename T::value_type)); @endcode
  */
 template <typename T>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const T& data,
     constraint_t<
       is_contiguous_iterator<typename T::const_iterator>::value,
@@ -1601,7 +1608,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
       defaulted_constraint
     > = defaulted_constraint()) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(
+  return const_buffer(
       data.size() ? detail::to_address(data.begin()) : 0,
       data.size() * sizeof(typename T::value_type));
 }
@@ -1616,7 +1623,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
  *       max_size_in_bytes)); @endcode
  */
 template <typename T>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
+BOOST_ASIO_NODISCARD inline const_buffer buffer(
     const T& data, std::size_t max_size_in_bytes,
     constraint_t<
       is_contiguous_iterator<typename T::const_iterator>::value,
@@ -1631,7 +1638,7 @@ BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONST_BUFFER buffer(
       defaulted_constraint
     > = defaulted_constraint()) noexcept
 {
-  return BOOST_ASIO_CONST_BUFFER(
+  return const_buffer(
       data.size() ? detail::to_address(data.begin()) : 0,
       data.size() * sizeof(typename T::value_type) < max_size_in_bytes
       ? data.size() * sizeof(typename T::value_type) : max_size_in_bytes);
@@ -1649,11 +1656,11 @@ class dynamic_string_buffer
 public:
   /// The type used to represent a sequence of constant buffers that refers to
   /// the underlying memory.
-  typedef BOOST_ASIO_CONST_BUFFER const_buffers_type;
+  typedef const_buffer const_buffers_type;
 
   /// The type used to represent a sequence of mutable buffers that refers to
   /// the underlying memory.
-  typedef BOOST_ASIO_MUTABLE_BUFFER mutable_buffers_type;
+  typedef mutable_buffer mutable_buffers_type;
 
   /// Construct a dynamic buffer from a string.
   /**
@@ -1918,11 +1925,11 @@ class dynamic_vector_buffer
 public:
   /// The type used to represent a sequence of constant buffers that refers to
   /// the underlying memory.
-  typedef BOOST_ASIO_CONST_BUFFER const_buffers_type;
+  typedef const_buffer const_buffers_type;
 
   /// The type used to represent a sequence of mutable buffers that refers to
   /// the underlying memory.
-  typedef BOOST_ASIO_MUTABLE_BUFFER mutable_buffers_type;
+  typedef mutable_buffer mutable_buffers_type;
 
   /// Construct a dynamic buffer from a vector.
   /**
@@ -2731,17 +2738,17 @@ struct literal<'0', 'X', Chars...> :
 } // namespace detail
 
 /// Literal operator for creating const_buffer objects from string literals.
-inline BOOST_ASIO_CONST_BUFFER operator ""_buf(const char* data, std::size_t n)
+inline const_buffer operator ""_buf(const char* data, std::size_t n)
 {
-  return BOOST_ASIO_CONST_BUFFER(data, n);
+  return const_buffer(data, n);
 }
 
 /// Literal operator for creating const_buffer objects from unbounded binary or
 /// hexadecimal integer literals.
 template <char... Chars>
-inline BOOST_ASIO_CONST_BUFFER operator ""_buf()
+inline const_buffer operator ""_buf()
 {
-  return BOOST_ASIO_CONST_BUFFER(
+  return const_buffer(
       +detail::literal<Chars...>::data,
       detail::literal<Chars...>::size);
 }
diff --git a/inst/include/boost/asio/buffer_registration.hpp b/inst/include/boost/asio/buffer_registration.hpp
index b39b84bd8..6b412ca60 100644
--- a/inst/include/boost/asio/buffer_registration.hpp
+++ b/inst/include/boost/asio/buffer_registration.hpp
@@ -2,7 +2,7 @@
 // buffer_registration.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -130,7 +130,7 @@ class buffer_registration
       service_->unregister_buffers();
 #endif // defined(BOOST_ASIO_HAS_IO_URING)
   }
-  
+
   /// Move assignment.
   buffer_registration& operator=(buffer_registration&& other) noexcept
   {
diff --git a/inst/include/boost/asio/buffered_read_stream.hpp b/inst/include/boost/asio/buffered_read_stream.hpp
index 2cff3e986..320782913 100644
--- a/inst/include/boost/asio/buffered_read_stream.hpp
+++ b/inst/include/boost/asio/buffered_read_stream.hpp
@@ -2,7 +2,7 @@
 // buffered_read_stream.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/buffered_read_stream_fwd.hpp b/inst/include/boost/asio/buffered_read_stream_fwd.hpp
index f5ed2c847..81691e0e0 100644
--- a/inst/include/boost/asio/buffered_read_stream_fwd.hpp
+++ b/inst/include/boost/asio/buffered_read_stream_fwd.hpp
@@ -2,7 +2,7 @@
 // buffered_read_stream_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/buffered_stream.hpp b/inst/include/boost/asio/buffered_stream.hpp
index 247978456..c68d603a4 100644
--- a/inst/include/boost/asio/buffered_stream.hpp
+++ b/inst/include/boost/asio/buffered_stream.hpp
@@ -2,7 +2,7 @@
 // buffered_stream.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/buffered_stream_fwd.hpp b/inst/include/boost/asio/buffered_stream_fwd.hpp
index 7a6911d0b..1f3b35a19 100644
--- a/inst/include/boost/asio/buffered_stream_fwd.hpp
+++ b/inst/include/boost/asio/buffered_stream_fwd.hpp
@@ -2,7 +2,7 @@
 // buffered_stream_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/buffered_write_stream.hpp b/inst/include/boost/asio/buffered_write_stream.hpp
index 75c87a952..3239adb22 100644
--- a/inst/include/boost/asio/buffered_write_stream.hpp
+++ b/inst/include/boost/asio/buffered_write_stream.hpp
@@ -2,7 +2,7 @@
 // buffered_write_stream.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/buffered_write_stream_fwd.hpp b/inst/include/boost/asio/buffered_write_stream_fwd.hpp
index 33ec1570e..c1f5b2093 100644
--- a/inst/include/boost/asio/buffered_write_stream_fwd.hpp
+++ b/inst/include/boost/asio/buffered_write_stream_fwd.hpp
@@ -2,7 +2,7 @@
 // buffered_write_stream_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/buffers_iterator.hpp b/inst/include/boost/asio/buffers_iterator.hpp
index 992931f7b..359981f62 100644
--- a/inst/include/boost/asio/buffers_iterator.hpp
+++ b/inst/include/boost/asio/buffers_iterator.hpp
@@ -2,7 +2,7 @@
 // buffers_iterator.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -84,27 +84,7 @@ namespace detail
     typedef add_const_t<ByteType> byte_type;
     typedef const const_buffer* const_iterator;
   };
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-  template <typename ByteType>
-  struct buffers_iterator_types<mutable_buffers_1, ByteType>
-  {
-    typedef mutable_buffer buffer_type;
-    typedef ByteType byte_type;
-    typedef const mutable_buffer* const_iterator;
-  };
-
-  template <typename ByteType>
-  struct buffers_iterator_types<const_buffers_1, ByteType>
-  {
-    typedef const_buffer buffer_type;
-    typedef add_const_t<ByteType> byte_type;
-    typedef const const_buffer* const_iterator;
-  };
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-}
+} // namespace detail
 
 /// A random access iterator over the bytes in a buffer sequence.
 template <typename BufferSequence, typename ByteType = char>
diff --git a/inst/include/boost/asio/cancel_after.hpp b/inst/include/boost/asio/cancel_after.hpp
new file mode 100644
index 000000000..220402b9d
--- /dev/null
+++ b/inst/include/boost/asio/cancel_after.hpp
@@ -0,0 +1,303 @@
+//
+// cancel_after.hpp
+// ~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_CANCEL_AFTER_HPP
+#define BOOST_ASIO_CANCEL_AFTER_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/cancellation_type.hpp>
+#include <boost/asio/detail/chrono.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/wait_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+/// A @ref completion_token adapter that cancels an operation after a timeout.
+/**
+ * The cancel_after_t class is used to indicate that an asynchronous operation
+ * should be cancelled if not complete before the specified duration has
+ * elapsed.
+ */
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits = boost::asio::wait_traits<Clock>>
+class cancel_after_t
+{
+public:
+  /// Constructor.
+  template <typename T>
+  cancel_after_t(T&& completion_token, const typename Clock::duration& timeout,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : token_(static_cast<T&&>(completion_token)),
+      timeout_(timeout),
+      cancel_type_(cancel_type)
+  {
+  }
+
+//private:
+  CompletionToken token_;
+  typename Clock::duration timeout_;
+  cancellation_type_t cancel_type_;
+};
+
+/// A @ref completion_token adapter that cancels an operation after a timeout.
+/**
+ * The cancel_after_timer class is used to indicate that an asynchronous
+ * operation should be cancelled if not complete before the specified duration
+ * has elapsed.
+ */
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits = boost::asio::wait_traits<Clock>,
+    typename Executor = any_io_executor>
+class cancel_after_timer
+{
+public:
+  /// Constructor.
+  template <typename T>
+  cancel_after_timer(T&& completion_token,
+      basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+      const typename Clock::duration& timeout,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : token_(static_cast<T&&>(completion_token)),
+      timer_(timer),
+      timeout_(timeout),
+      cancel_type_(cancel_type)
+  {
+  }
+
+//private:
+  CompletionToken token_;
+  basic_waitable_timer<Clock, WaitTraits, Executor>& timer_;
+  typename Clock::duration timeout_;
+  cancellation_type_t cancel_type_;
+};
+
+/// A function object type that adapts a @ref completion_token to cancel an
+/// operation after a timeout.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Clock, typename WaitTraits = boost::asio::wait_traits<Clock>>
+class partial_cancel_after
+{
+public:
+  /// Constructor that specifies the timeout duration and cancellation type.
+  explicit partial_cancel_after(const typename Clock::duration& timeout,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : timeout_(timeout),
+      cancel_type_(cancel_type)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// arguments should be combined into a single tuple argument.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  cancel_after_t<decay_t<CompletionToken>, Clock, WaitTraits>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return cancel_after_t<decay_t<CompletionToken>, Clock, WaitTraits>(
+        static_cast<CompletionToken&&>(completion_token),
+        timeout_, cancel_type_);
+  }
+
+//private:
+  typename Clock::duration timeout_;
+  cancellation_type_t cancel_type_;
+};
+
+/// A function object type that adapts a @ref completion_token to cancel an
+/// operation after a timeout.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Clock, typename WaitTraits = boost::asio::wait_traits<Clock>,
+    typename Executor = any_io_executor>
+class partial_cancel_after_timer
+{
+public:
+  /// Constructor that specifies the timeout duration and cancellation type.
+  explicit partial_cancel_after_timer(
+      basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+      const typename Clock::duration& timeout,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : timer_(timer),
+      timeout_(timeout),
+      cancel_type_(cancel_type)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// arguments should be combined into a single tuple argument.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  cancel_after_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return cancel_after_timer<decay_t<CompletionToken>,
+      Clock, WaitTraits, Executor>(
+        static_cast<CompletionToken&&>(completion_token),
+        timeout_, cancel_type_);
+  }
+
+//private:
+  basic_waitable_timer<Clock, WaitTraits, Executor>& timer_;
+  typename Clock::duration timeout_;
+  cancellation_type_t cancel_type_;
+};
+
+/// Create a partial completion token adapter that cancels an operation if not
+/// complete before the specified relative timeout has elapsed.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_after, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Rep, typename Period>
+BOOST_ASIO_NODISCARD inline partial_cancel_after<chrono::steady_clock>
+cancel_after(const chrono::duration<Rep, Period>& timeout,
+    cancellation_type_t cancel_type = cancellation_type::terminal)
+{
+  return partial_cancel_after<chrono::steady_clock>(timeout, cancel_type);
+}
+
+/// Create a partial completion token adapter that cancels an operation if not
+/// complete before the specified relative timeout has elapsed.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_after, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Clock, typename WaitTraits,
+    typename Executor, typename Rep, typename Period>
+BOOST_ASIO_NODISCARD inline
+partial_cancel_after_timer<Clock, WaitTraits, Executor>
+cancel_after(basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+    const chrono::duration<Rep, Period>& timeout,
+    cancellation_type_t cancel_type = cancellation_type::terminal)
+{
+  return partial_cancel_after_timer<Clock, WaitTraits, Executor>(
+      timer, timeout, cancel_type);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete before
+/// the specified relative timeout has elapsed.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_after, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Rep, typename Period, typename CompletionToken>
+BOOST_ASIO_NODISCARD inline
+cancel_after_t<decay_t<CompletionToken>, chrono::steady_clock>
+cancel_after(const chrono::duration<Rep, Period>& timeout,
+    CompletionToken&& completion_token)
+{
+  return cancel_after_t<decay_t<CompletionToken>, chrono::steady_clock>(
+      static_cast<CompletionToken&&>(completion_token),
+      timeout, cancellation_type::terminal);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete before
+/// the specified relative timeout has elapsed.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_after, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Rep, typename Period, typename CompletionToken>
+BOOST_ASIO_NODISCARD inline
+cancel_after_t<decay_t<CompletionToken>, chrono::steady_clock>
+cancel_after(const chrono::duration<Rep, Period>& timeout,
+    cancellation_type_t cancel_type, CompletionToken&& completion_token)
+{
+  return cancel_after_t<decay_t<CompletionToken>, chrono::steady_clock>(
+      static_cast<CompletionToken&&>(completion_token), timeout, cancel_type);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete before
+/// the specified relative timeout has elapsed.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_after, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Clock, typename WaitTraits, typename Executor,
+    typename Rep, typename Period, typename CompletionToken>
+BOOST_ASIO_NODISCARD inline
+cancel_after_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>
+cancel_after(basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+    const chrono::duration<Rep, Period>& timeout,
+    CompletionToken&& completion_token)
+{
+  return cancel_after_timer<decay_t<CompletionToken>,
+    Clock, WaitTraits, Executor>(
+      static_cast<CompletionToken&&>(completion_token),
+      timer, timeout, cancellation_type::terminal);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete before
+/// the specified relative timeout has elapsed.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_after, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Clock, typename WaitTraits, typename Executor,
+    typename Rep, typename Period, typename CompletionToken>
+BOOST_ASIO_NODISCARD inline
+cancel_after_timer<decay_t<CompletionToken>, chrono::steady_clock>
+cancel_after(basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+    const chrono::duration<Rep, Period>& timeout,
+    cancellation_type_t cancel_type, CompletionToken&& completion_token)
+{
+  return cancel_after_timer<decay_t<CompletionToken>,
+    Clock, WaitTraits, Executor>(
+      static_cast<CompletionToken&&>(completion_token),
+      timer, timeout, cancel_type);
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#include <boost/asio/impl/cancel_after.hpp>
+
+#endif // BOOST_ASIO_CANCEL_AFTER_HPP
diff --git a/inst/include/boost/asio/cancel_at.hpp b/inst/include/boost/asio/cancel_at.hpp
new file mode 100644
index 000000000..c9d39b13e
--- /dev/null
+++ b/inst/include/boost/asio/cancel_at.hpp
@@ -0,0 +1,296 @@
+//
+// cancel_at.hpp
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_CANCEL_AT_HPP
+#define BOOST_ASIO_CANCEL_AT_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/cancellation_type.hpp>
+#include <boost/asio/detail/chrono.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/wait_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+/// A @ref completion_token adapter that cancels an operation at a given time.
+/**
+ * The cancel_at_t class is used to indicate that an asynchronous operation
+ * should be cancelled if not complete at the specified absolute time.
+ */
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits = boost::asio::wait_traits<Clock>>
+class cancel_at_t
+{
+public:
+  /// Constructor.
+  template <typename T>
+  cancel_at_t(T&& completion_token, const typename Clock::time_point& expiry,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : token_(static_cast<T&&>(completion_token)),
+      expiry_(expiry),
+      cancel_type_(cancel_type)
+  {
+  }
+
+//private:
+  CompletionToken token_;
+  typename Clock::time_point expiry_;
+  cancellation_type_t cancel_type_;
+};
+
+/// A @ref completion_token adapter that cancels an operation at a given time.
+/**
+ * The cancel_at_timer class is used to indicate that an asynchronous operation
+ * should be cancelled if not complete at the specified absolute time.
+ */
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits = boost::asio::wait_traits<Clock>,
+    typename Executor = any_io_executor>
+class cancel_at_timer
+{
+public:
+  /// Constructor.
+  template <typename T>
+  cancel_at_timer(T&& completion_token,
+      basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+      const typename Clock::time_point& expiry,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : token_(static_cast<T&&>(completion_token)),
+      timer_(timer),
+      expiry_(expiry),
+      cancel_type_(cancel_type)
+  {
+  }
+
+//private:
+  CompletionToken token_;
+  basic_waitable_timer<Clock, WaitTraits, Executor>& timer_;
+  typename Clock::time_point expiry_;
+  cancellation_type_t cancel_type_;
+};
+
+/// A function object type that adapts a @ref completion_token to cancel an
+/// operation at a given time.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Clock, typename WaitTraits = boost::asio::wait_traits<Clock>>
+class partial_cancel_at
+{
+public:
+  /// Constructor that specifies the expiry and cancellation type.
+  explicit partial_cancel_at(const typename Clock::time_point& expiry,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : expiry_(expiry),
+      cancel_type_(cancel_type)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// arguments should be combined into a single tuple argument.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr cancel_at_t<decay_t<CompletionToken>, Clock, WaitTraits>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return cancel_at_t<decay_t<CompletionToken>, Clock, WaitTraits>(
+        static_cast<CompletionToken&&>(completion_token),
+        expiry_, cancel_type_);
+  }
+
+//private:
+  typename Clock::time_point expiry_;
+  cancellation_type_t cancel_type_;
+};
+
+/// A function object type that adapts a @ref completion_token to cancel an
+/// operation at a given time.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+template <typename Clock, typename WaitTraits = boost::asio::wait_traits<Clock>,
+    typename Executor = any_io_executor>
+class partial_cancel_at_timer
+{
+public:
+  /// Constructor that specifies the expiry and cancellation type.
+  explicit partial_cancel_at_timer(
+      basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+      const typename Clock::time_point& expiry,
+      cancellation_type_t cancel_type = cancellation_type::terminal)
+    : timer_(timer),
+      expiry_(expiry),
+      cancel_type_(cancel_type)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// arguments should be combined into a single tuple argument.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  cancel_at_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return cancel_at_timer<decay_t<CompletionToken>,
+      Clock, WaitTraits, Executor>(
+        static_cast<CompletionToken&&>(completion_token),
+        timer_, expiry_, cancel_type_);
+  }
+
+//private:
+  basic_waitable_timer<Clock, WaitTraits, Executor>& timer_;
+  typename Clock::time_point expiry_;
+  cancellation_type_t cancel_type_;
+};
+
+/// Create a partial completion token adapter that cancels an operation if not
+/// complete by the specified absolute time.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_at, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Clock, typename Duration>
+BOOST_ASIO_NODISCARD inline partial_cancel_at<Clock>
+cancel_at(const chrono::time_point<Clock, Duration>& expiry,
+    cancellation_type_t cancel_type = cancellation_type::terminal)
+{
+  return partial_cancel_at<Clock>(expiry, cancel_type);
+}
+
+/// Create a partial completion token adapter that cancels an operation if not
+/// complete by the specified absolute time.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_at, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename Clock, typename WaitTraits,
+    typename Executor, typename Duration>
+BOOST_ASIO_NODISCARD inline partial_cancel_at_timer<Clock, WaitTraits, Executor>
+cancel_at(basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+    const chrono::time_point<Clock, Duration>& expiry,
+    cancellation_type_t cancel_type = cancellation_type::terminal)
+{
+  return partial_cancel_at_timer<Clock, WaitTraits, Executor>(
+      timer, expiry, cancel_type);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete by the
+/// specified absolute time.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_at, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename CompletionToken, typename Clock, typename Duration>
+BOOST_ASIO_NODISCARD inline cancel_at_t<decay_t<CompletionToken>, Clock>
+cancel_at(const chrono::time_point<Clock, Duration>& expiry,
+    CompletionToken&& completion_token)
+{
+  return cancel_at_t<decay_t<CompletionToken>, Clock>(
+      static_cast<CompletionToken&&>(completion_token),
+      expiry, cancellation_type::terminal);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete by the
+/// specified absolute time.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_at, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename CompletionToken, typename Clock, typename Duration>
+BOOST_ASIO_NODISCARD inline cancel_at_t<decay_t<CompletionToken>, Clock>
+cancel_at(const chrono::time_point<Clock, Duration>& expiry,
+    cancellation_type_t cancel_type, CompletionToken&& completion_token)
+{
+  return cancel_at_t<decay_t<CompletionToken>, Clock>(
+      static_cast<CompletionToken&&>(completion_token), expiry, cancel_type);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete by the
+/// specified absolute time.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_at, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits, typename Executor, typename Duration>
+BOOST_ASIO_NODISCARD inline
+cancel_at_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>
+cancel_at(basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+    const chrono::time_point<Clock, Duration>& expiry,
+    CompletionToken&& completion_token)
+{
+  return cancel_at_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>(
+      static_cast<CompletionToken&&>(completion_token),
+      timer, expiry, cancellation_type::terminal);
+}
+
+/// Adapt a @ref completion_token to cancel an operation if not complete by the
+/// specified absolute time.
+/**
+ * @par Thread Safety
+ * When an asynchronous operation is used with cancel_at, a timer async_wait
+ * operation is performed in parallel to the main operation. If this parallel
+ * async_wait completes first, a cancellation request is emitted to cancel the
+ * main operation. Consequently, the application must ensure that the
+ * asynchronous operation is performed within an implicit or explicit strand.
+ */
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits, typename Executor, typename Duration>
+BOOST_ASIO_NODISCARD inline
+cancel_at_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>
+cancel_at(basic_waitable_timer<Clock, WaitTraits, Executor>& timer,
+    const chrono::time_point<Clock, Duration>& expiry,
+    cancellation_type_t cancel_type, CompletionToken&& completion_token)
+{
+  return cancel_at_timer<decay_t<CompletionToken>, Clock, WaitTraits, Executor>(
+      static_cast<CompletionToken&&>(completion_token),
+      timer, expiry, cancel_type);
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#include <boost/asio/impl/cancel_at.hpp>
+
+#endif // BOOST_ASIO_CANCEL_AT_HPP
diff --git a/inst/include/boost/asio/cancellation_signal.hpp b/inst/include/boost/asio/cancellation_signal.hpp
index 7f17c9110..491119c5c 100644
--- a/inst/include/boost/asio/cancellation_signal.hpp
+++ b/inst/include/boost/asio/cancellation_signal.hpp
@@ -2,7 +2,7 @@
 // cancellation_signal.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/cancellation_state.hpp b/inst/include/boost/asio/cancellation_state.hpp
index 9b4926c79..a73aeb85a 100644
--- a/inst/include/boost/asio/cancellation_state.hpp
+++ b/inst/include/boost/asio/cancellation_state.hpp
@@ -2,7 +2,7 @@
 // cancellation_state.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/cancellation_type.hpp b/inst/include/boost/asio/cancellation_type.hpp
index 374c529f3..bebbeb7df 100644
--- a/inst/include/boost/asio/cancellation_type.hpp
+++ b/inst/include/boost/asio/cancellation_type.hpp
@@ -2,7 +2,7 @@
 // cancellation_type.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/co_composed.hpp b/inst/include/boost/asio/co_composed.hpp
new file mode 100644
index 000000000..716a76e11
--- /dev/null
+++ b/inst/include/boost/asio/co_composed.hpp
@@ -0,0 +1,1323 @@
+//
+// co_composed.hpp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_CO_COMPOSED_HPP
+#define BOOST_ASIO_CO_COMPOSED_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+
+#if defined(BOOST_ASIO_HAS_CO_AWAIT) || defined(GENERATING_DOCUMENTATION)
+
+#include <new>
+#include <tuple>
+#include <variant>
+#include <boost/asio/associated_cancellation_slot.hpp>
+#include <boost/asio/associator.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/cancellation_state.hpp>
+#include <boost/asio/detail/composed_work.hpp>
+#include <boost/asio/detail/recycling_allocator.hpp>
+#include <boost/asio/detail/throw_error.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/error.hpp>
+
+#if defined(BOOST_ASIO_HAS_STD_COROUTINE)
+# include <coroutine>
+#else // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+# include <experimental/coroutine>
+#endif // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#  include <boost/asio/detail/source_location.hpp>
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+#if defined(BOOST_ASIO_HAS_STD_COROUTINE)
+using std::coroutine_handle;
+using std::suspend_always;
+using std::suspend_never;
+#else // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+using std::experimental::coroutine_handle;
+using std::experimental::suspend_always;
+using std::experimental::suspend_never;
+#endif // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+
+using boost::asio::detail::composed_io_executors;
+using boost::asio::detail::composed_work;
+using boost::asio::detail::composed_work_guard;
+using boost::asio::detail::get_composed_io_executor;
+using boost::asio::detail::make_composed_io_executors;
+using boost::asio::detail::recycling_allocator;
+using boost::asio::detail::throw_error;
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_state;
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_handler_base;
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_promise;
+
+template <BOOST_ASIO_COMPLETION_SIGNATURE... Signatures>
+class co_composed_returns
+{
+};
+
+struct co_composed_on_suspend
+{
+  void (*fn_)(void*) = nullptr;
+  void* arg_ = nullptr;
+};
+
+template <typename... T>
+struct co_composed_completion : std::tuple<T&&...>
+{
+  template <typename... U>
+  co_composed_completion(U&&... u) noexcept
+    : std::tuple<T&&...>(static_cast<U&&>(u)...)
+  {
+  }
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename Signature>
+class co_composed_state_return_overload;
+
+template <typename Executors, typename Handler,
+    typename Return, typename R, typename... Args>
+class co_composed_state_return_overload<
+    Executors, Handler, Return, R(Args...)>
+{
+public:
+  using derived_type = co_composed_state<Executors, Handler, Return>;
+  using promise_type = co_composed_promise<Executors, Handler, Return>;
+  using return_type = std::tuple<Args...>;
+
+  void on_cancellation_complete_with(Args... args)
+  {
+    derived_type& state = *static_cast<derived_type*>(this);
+    state.return_value_ = std::make_tuple(std::move(args)...);
+    state.cancellation_on_suspend_fn(
+        [](void* p)
+        {
+          auto& promise = *static_cast<promise_type*>(p);
+
+          co_composed_handler_base<Executors, Handler,
+            Return> composed_handler(promise);
+
+          Handler handler(std::move(promise.state().handler_));
+          return_type result(
+              std::move(std::get<return_type>(promise.state().return_value_)));
+
+          co_composed_handler_base<Executors, Handler,
+            Return>(std::move(composed_handler));
+
+          std::apply(std::move(handler), std::move(result));
+        });
+  }
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_state_return;
+
+template <typename Executors, typename Handler, typename... Signatures>
+class co_composed_state_return<
+    Executors, Handler, co_composed_returns<Signatures...>>
+  : public co_composed_state_return_overload<Executors,
+      Handler, co_composed_returns<Signatures...>, Signatures>...
+{
+public:
+  using co_composed_state_return_overload<Executors,
+    Handler, co_composed_returns<Signatures...>,
+      Signatures>::on_cancellation_complete_with...;
+
+private:
+  template <typename, typename, typename, typename>
+    friend class co_composed_promise_return_overload;
+  template <typename, typename, typename, typename>
+    friend class co_composed_state_return_overload;
+
+  std::variant<std::monostate,
+    typename co_composed_state_return_overload<
+      Executors, Handler, co_composed_returns<Signatures...>,
+        Signatures>::return_type...> return_value_;
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename... Signatures>
+struct co_composed_state_default_cancellation_on_suspend_impl;
+
+template <typename Executors, typename Handler, typename Return>
+struct co_composed_state_default_cancellation_on_suspend_impl<
+    Executors, Handler, Return>
+{
+  static constexpr void (*fn())(void*)
+  {
+    return nullptr;
+  }
+};
+
+template <typename Executors, typename Handler, typename Return,
+    typename R, typename... Args, typename... Signatures>
+struct co_composed_state_default_cancellation_on_suspend_impl<
+    Executors, Handler, Return, R(Args...), Signatures...>
+{
+  static constexpr void (*fn())(void*)
+  {
+    return co_composed_state_default_cancellation_on_suspend_impl<
+      Executors, Handler, Return, Signatures...>::fn();
+  }
+};
+
+template <typename Executors, typename Handler, typename Return,
+    typename R, typename... Args, typename... Signatures>
+struct co_composed_state_default_cancellation_on_suspend_impl<Executors,
+    Handler, Return, R(boost::system::error_code, Args...), Signatures...>
+{
+  using promise_type = co_composed_promise<Executors, Handler, Return>;
+  using return_type = std::tuple<boost::system::error_code, Args...>;
+
+  static constexpr void (*fn())(void*)
+  {
+    if constexpr ((is_constructible<Args>::value && ...))
+    {
+      return [](void* p)
+      {
+        auto& promise = *static_cast<promise_type*>(p);
+
+        co_composed_handler_base<Executors, Handler,
+          Return> composed_handler(promise);
+
+        Handler handler(std::move(promise.state().handler_));
+
+        co_composed_handler_base<Executors, Handler,
+          Return>(std::move(composed_handler));
+
+        std::move(handler)(
+            boost::system::error_code(boost::asio::error::operation_aborted),
+            Args{}...);
+      };
+    }
+    else
+    {
+      return co_composed_state_default_cancellation_on_suspend_impl<
+        Executors, Handler, Return, Signatures...>::fn();
+    }
+  }
+};
+
+template <typename Executors, typename Handler, typename Return,
+    typename R, typename... Args, typename... Signatures>
+struct co_composed_state_default_cancellation_on_suspend_impl<Executors,
+    Handler, Return, R(std::exception_ptr, Args...), Signatures...>
+{
+  using promise_type = co_composed_promise<Executors, Handler, Return>;
+  using return_type = std::tuple<std::exception_ptr, Args...>;
+
+  static constexpr void (*fn())(void*)
+  {
+    if constexpr ((is_constructible<Args>::value && ...))
+    {
+      return [](void* p)
+      {
+        auto& promise = *static_cast<promise_type*>(p);
+
+        co_composed_handler_base<Executors, Handler,
+          Return> composed_handler(promise);
+
+        Handler handler(std::move(promise.state().handler_));
+
+        co_composed_handler_base<Executors, Handler,
+          Return>(std::move(composed_handler));
+
+        std::move(handler)(
+            std::make_exception_ptr(
+              boost::system::system_error(
+                boost::asio::error::operation_aborted, "co_await")),
+            Args{}...);
+      };
+    }
+    else
+    {
+      return co_composed_state_default_cancellation_on_suspend_impl<
+        Executors, Handler, Return, Signatures...>::fn();
+    }
+  }
+};
+
+template <typename Executors, typename Handler, typename Return>
+struct co_composed_state_default_cancellation_on_suspend;
+
+template <typename Executors, typename Handler, typename... Signatures>
+struct co_composed_state_default_cancellation_on_suspend<
+    Executors, Handler, co_composed_returns<Signatures...>>
+  : co_composed_state_default_cancellation_on_suspend_impl<Executors,
+      Handler, co_composed_returns<Signatures...>, Signatures...>
+{
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_state_cancellation
+{
+public:
+  using cancellation_slot_type = cancellation_slot;
+
+  cancellation_slot_type get_cancellation_slot() const noexcept
+  {
+    return cancellation_state_.slot();
+  }
+
+  cancellation_state get_cancellation_state() const noexcept
+  {
+    return cancellation_state_;
+  }
+
+  void reset_cancellation_state()
+  {
+    cancellation_state_ = cancellation_state(
+        (get_associated_cancellation_slot)(
+          static_cast<co_composed_state<Executors, Handler, Return>*>(
+            this)->handler()));
+  }
+
+  template <typename Filter>
+  void reset_cancellation_state(Filter filter)
+  {
+    cancellation_state_ = cancellation_state(
+        (get_associated_cancellation_slot)(
+          static_cast<co_composed_state<Executors, Handler, Return>*>(
+            this)->handler()), filter, filter);
+  }
+
+  template <typename InFilter, typename OutFilter>
+  void reset_cancellation_state(InFilter&& in_filter, OutFilter&& out_filter)
+  {
+    cancellation_state_ = cancellation_state(
+        (get_associated_cancellation_slot)(
+          static_cast<co_composed_state<Executors, Handler, Return>*>(
+            this)->handler()),
+        static_cast<InFilter&&>(in_filter),
+        static_cast<OutFilter&&>(out_filter));
+  }
+
+  cancellation_type_t cancelled() const noexcept
+  {
+    return cancellation_state_.cancelled();
+  }
+
+  void clear_cancellation_slot() noexcept
+  {
+    cancellation_state_.slot().clear();
+  }
+
+  [[nodiscard]] bool throw_if_cancelled() const noexcept
+  {
+    return throw_if_cancelled_;
+  }
+
+  void throw_if_cancelled(bool b) noexcept
+  {
+    throw_if_cancelled_ = b;
+  }
+
+  [[nodiscard]] bool complete_if_cancelled() const noexcept
+  {
+    return complete_if_cancelled_;
+  }
+
+  void complete_if_cancelled(bool b) noexcept
+  {
+    complete_if_cancelled_ = b;
+  }
+
+private:
+  template <typename, typename, typename>
+    friend class co_composed_promise;
+  template <typename, typename, typename, typename>
+    friend class co_composed_state_return_overload;
+
+  void cancellation_on_suspend_fn(void (*fn)(void*))
+  {
+    cancellation_on_suspend_fn_ = fn;
+  }
+
+  void check_for_cancellation_on_transform()
+  {
+    if (throw_if_cancelled_ && !!cancelled())
+      throw_error(boost::asio::error::operation_aborted, "co_await");
+  }
+
+  bool check_for_cancellation_on_suspend(
+      co_composed_promise<Executors, Handler, Return>& promise) noexcept
+  {
+    if (complete_if_cancelled_ && !!cancelled() && cancellation_on_suspend_fn_)
+    {
+      promise.state().work_.reset();
+      promise.state().on_suspend_->fn_ = cancellation_on_suspend_fn_;
+      promise.state().on_suspend_->arg_ = &promise;
+      return false;
+    }
+    return true;
+  }
+
+  cancellation_state cancellation_state_;
+  void (*cancellation_on_suspend_fn_)(void*) =
+    co_composed_state_default_cancellation_on_suspend<
+      Executors, Handler, Return>::fn();
+  bool throw_if_cancelled_ = false;
+  bool complete_if_cancelled_ = true;
+};
+
+template <typename Executors, typename Handler, typename Return>
+  requires is_same<
+    typename associated_cancellation_slot<
+      Handler, cancellation_slot
+    >::asio_associated_cancellation_slot_is_unspecialised,
+    void>::value
+class co_composed_state_cancellation<Executors, Handler, Return>
+{
+public:
+  void reset_cancellation_state()
+  {
+  }
+
+  template <typename Filter>
+  void reset_cancellation_state(Filter)
+  {
+  }
+
+  template <typename InFilter, typename OutFilter>
+  void reset_cancellation_state(InFilter&&, OutFilter&&)
+  {
+  }
+
+  cancellation_type_t cancelled() const noexcept
+  {
+    return cancellation_type::none;
+  }
+
+  void clear_cancellation_slot() noexcept
+  {
+  }
+
+  [[nodiscard]] bool throw_if_cancelled() const noexcept
+  {
+    return false;
+  }
+
+  void throw_if_cancelled(bool) noexcept
+  {
+  }
+
+  [[nodiscard]] bool complete_if_cancelled() const noexcept
+  {
+    return false;
+  }
+
+  void complete_if_cancelled(bool) noexcept
+  {
+  }
+
+private:
+  template <typename, typename, typename>
+    friend class co_composed_promise;
+  template <typename, typename, typename, typename>
+    friend class co_composed_state_return_overload;
+
+  void cancellation_on_suspend_fn(void (*)(void*))
+  {
+  }
+
+  void check_for_cancellation_on_transform() noexcept
+  {
+  }
+
+  bool check_for_cancellation_on_suspend(
+      co_composed_promise<Executors, Handler, Return>&) noexcept
+  {
+    return true;
+  }
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_state
+  : public co_composed_state_return<Executors, Handler, Return>,
+    public co_composed_state_cancellation<Executors, Handler, Return>
+{
+public:
+  using io_executor_type = typename composed_work_guard<
+    typename composed_work<Executors>::head_type>::executor_type;
+
+  template <typename H>
+  co_composed_state(composed_io_executors<Executors>&& executors,
+      H&& h, co_composed_on_suspend& on_suspend)
+    : work_(std::move(executors)),
+      handler_(static_cast<H&&>(h)),
+      on_suspend_(&on_suspend)
+  {
+    this->reset_cancellation_state(enable_terminal_cancellation());
+  }
+
+  io_executor_type get_io_executor() const noexcept
+  {
+    return work_.head_.get_executor();
+  }
+
+  template <typename... Args>
+  [[nodiscard]] co_composed_completion<Args...> complete(Args&&... args)
+    requires requires { declval<Handler>()(static_cast<Args&&>(args)...); }
+  {
+    return co_composed_completion<Args...>(static_cast<Args&&>(args)...);
+  }
+
+  const Handler& handler() const noexcept
+  {
+    return handler_;
+  }
+
+private:
+  template <typename, typename, typename>
+    friend class co_composed_handler_base;
+  template <typename, typename, typename>
+    friend class co_composed_promise;
+  template <typename, typename, typename, typename>
+    friend class co_composed_promise_return_overload;
+  template <typename, typename, typename>
+    friend class co_composed_state_cancellation;
+  template <typename, typename, typename, typename>
+    friend class co_composed_state_return_overload;
+  template <typename, typename, typename, typename...>
+    friend struct co_composed_state_default_cancellation_on_suspend_impl;
+
+  composed_work<Executors> work_;
+  Handler handler_;
+  co_composed_on_suspend* on_suspend_;
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_handler_cancellation
+{
+public:
+  using cancellation_slot_type = cancellation_slot;
+
+  cancellation_slot_type get_cancellation_slot() const noexcept
+  {
+    return static_cast<
+      const co_composed_handler_base<Executors, Handler, Return>*>(
+        this)->promise().state().get_cancellation_slot();
+  }
+};
+
+template <typename Executors, typename Handler, typename Return>
+  requires is_same<
+    typename associated_cancellation_slot<
+      Handler, cancellation_slot
+    >::asio_associated_cancellation_slot_is_unspecialised,
+    void>::value
+class co_composed_handler_cancellation<Executors, Handler, Return>
+{
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_handler_base :
+  public co_composed_handler_cancellation<Executors, Handler, Return>
+{
+public:
+  co_composed_handler_base(
+      co_composed_promise<Executors, Handler, Return>& p) noexcept
+    : p_(&p)
+  {
+  }
+
+  co_composed_handler_base(co_composed_handler_base&& other) noexcept
+    : p_(std::exchange(other.p_, nullptr))
+  {
+  }
+
+  ~co_composed_handler_base()
+  {
+    if (p_) [[unlikely]]
+      p_->destroy();
+  }
+
+  co_composed_promise<Executors, Handler, Return>& promise() const noexcept
+  {
+    return *p_;
+  }
+
+protected:
+  void resume(void* result)
+  {
+    co_composed_on_suspend on_suspend{};
+    std::exchange(p_, nullptr)->resume(p_, result, on_suspend);
+    if (on_suspend.fn_)
+      on_suspend.fn_(on_suspend.arg_);
+  }
+
+private:
+  co_composed_promise<Executors, Handler, Return>* p_;
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename Signature>
+class co_composed_handler;
+
+template <typename Executors, typename Handler,
+    typename Return, typename R, typename... Args>
+class co_composed_handler<Executors, Handler, Return, R(Args...)>
+  : public co_composed_handler_base<Executors, Handler, Return>
+{
+public:
+  using co_composed_handler_base<Executors,
+    Handler, Return>::co_composed_handler_base;
+
+  using result_type = std::tuple<decay_t<Args>...>;
+
+  template <typename... T>
+  void operator()(T&&... args)
+  {
+    result_type result(static_cast<T&&>(args)...);
+    this->resume(&result);
+  }
+
+  static auto on_resume(void* result)
+  {
+    auto& args = *static_cast<result_type*>(result);
+    if constexpr (sizeof...(Args) == 0)
+      return;
+    else if constexpr (sizeof...(Args) == 1)
+      return std::move(std::get<0>(args));
+    else
+      return std::move(args);
+  }
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename R, typename... Args>
+class co_composed_handler<Executors, Handler,
+    Return, R(boost::system::error_code, Args...)>
+  : public co_composed_handler_base<Executors, Handler, Return>
+{
+public:
+  using co_composed_handler_base<Executors,
+    Handler, Return>::co_composed_handler_base;
+
+  using args_type = std::tuple<decay_t<Args>...>;
+  using result_type = std::tuple<boost::system::error_code, args_type>;
+
+  template <typename... T>
+  void operator()(const boost::system::error_code& ec, T&&... args)
+  {
+    result_type result(ec, args_type(static_cast<T&&>(args)...));
+    this->resume(&result);
+  }
+
+  static auto on_resume(void* result)
+  {
+    auto& [ec, args] = *static_cast<result_type*>(result);
+    throw_error(ec);
+    if constexpr (sizeof...(Args) == 0)
+      return;
+    else if constexpr (sizeof...(Args) == 1)
+      return std::move(std::get<0>(args));
+    else
+      return std::move(args);
+  }
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename R, typename... Args>
+class co_composed_handler<Executors, Handler,
+    Return, R(std::exception_ptr, Args...)>
+  : public co_composed_handler_base<Executors, Handler, Return>
+{
+public:
+  using co_composed_handler_base<Executors,
+    Handler, Return>::co_composed_handler_base;
+
+  using args_type = std::tuple<decay_t<Args>...>;
+  using result_type = std::tuple<std::exception_ptr, args_type>;
+
+  template <typename... T>
+  void operator()(std::exception_ptr ex, T&&... args)
+  {
+    result_type result(std::move(ex), args_type(static_cast<T&&>(args)...));
+    this->resume(&result);
+  }
+
+  static auto on_resume(void* result)
+  {
+    auto& [ex, args] = *static_cast<result_type*>(result);
+    if (ex)
+      std::rethrow_exception(ex);
+    if constexpr (sizeof...(Args) == 0)
+      return;
+    else if constexpr (sizeof...(Args) == 1)
+      return std::move(std::get<0>(args));
+    else
+      return std::move(args);
+  }
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_promise_return;
+
+template <typename Executors, typename Handler>
+class co_composed_promise_return<Executors, Handler, co_composed_returns<>>
+{
+public:
+  auto final_suspend() noexcept
+  {
+    return suspend_never();
+  }
+
+  void return_void() noexcept
+  {
+  }
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename Signature>
+class co_composed_promise_return_overload;
+
+template <typename Executors, typename Handler,
+    typename Return, typename R, typename... Args>
+class co_composed_promise_return_overload<
+    Executors, Handler, Return, R(Args...)>
+{
+public:
+  using derived_type = co_composed_promise<Executors, Handler, Return>;
+  using return_type = std::tuple<Args...>;
+
+  void return_value(std::tuple<Args...>&& value)
+  {
+    derived_type& promise = *static_cast<derived_type*>(this);
+    promise.state().return_value_ = std::move(value);
+    promise.state().work_.reset();
+    promise.state().on_suspend_->arg_ = this;
+    promise.state().on_suspend_->fn_ =
+      [](void* p)
+      {
+        auto& promise = *static_cast<derived_type*>(p);
+
+        co_composed_handler_base<Executors, Handler,
+          Return> composed_handler(promise);
+
+        Handler handler(std::move(promise.state().handler_));
+        return_type result(
+            std::move(std::get<return_type>(promise.state().return_value_)));
+
+        co_composed_handler_base<Executors, Handler,
+          Return>(std::move(composed_handler));
+
+        std::apply(std::move(handler), std::move(result));
+      };
+  }
+};
+
+template <typename Executors, typename Handler, typename... Signatures>
+class co_composed_promise_return<Executors,
+    Handler, co_composed_returns<Signatures...>>
+  : public co_composed_promise_return_overload<Executors,
+      Handler, co_composed_returns<Signatures...>, Signatures>...
+{
+public:
+  auto final_suspend() noexcept
+  {
+    return suspend_always();
+  }
+
+  using co_composed_promise_return_overload<Executors, Handler,
+    co_composed_returns<Signatures...>, Signatures>::return_value...;
+
+private:
+  template <typename, typename, typename, typename>
+    friend class co_composed_promise_return_overload;
+};
+
+template <typename Executors, typename Handler, typename Return>
+class co_composed_promise
+  : public co_composed_promise_return<Executors, Handler, Return>
+{
+public:
+  template <typename... Args>
+  void* operator new(std::size_t size,
+      co_composed_state<Executors, Handler, Return>& state, Args&&...)
+  {
+    block_allocator_type allocator(
+      (get_associated_allocator)(state.handler_,
+        recycling_allocator<void>()));
+
+    block* base_ptr = std::allocator_traits<block_allocator_type>::allocate(
+        allocator, blocks(sizeof(allocator_type)) + blocks(size));
+
+    new (static_cast<void*>(base_ptr)) allocator_type(std::move(allocator));
+
+    return base_ptr + blocks(sizeof(allocator_type));
+  }
+
+  template <typename C, typename... Args>
+  void* operator new(std::size_t size, C&&,
+      co_composed_state<Executors, Handler, Return>& state, Args&&...)
+  {
+    return co_composed_promise::operator new(size, state);
+  }
+
+  void operator delete(void* ptr, std::size_t size)
+  {
+    block* base_ptr = static_cast<block*>(ptr) - blocks(sizeof(allocator_type));
+
+    allocator_type* allocator_ptr = std::launder(
+        static_cast<allocator_type*>(static_cast<void*>(base_ptr)));
+
+    block_allocator_type block_allocator(std::move(*allocator_ptr));
+    allocator_ptr->~allocator_type();
+
+    std::allocator_traits<block_allocator_type>::deallocate(block_allocator,
+        base_ptr, blocks(sizeof(allocator_type)) + blocks(size));
+  }
+
+  template <typename... Args>
+  co_composed_promise(
+      co_composed_state<Executors, Handler, Return>& state, Args&&...)
+    : state_(state)
+  {
+  }
+
+  template <typename C, typename... Args>
+  co_composed_promise(C&&,
+      co_composed_state<Executors, Handler, Return>& state, Args&&...)
+    : state_(state)
+  {
+  }
+
+  void destroy() noexcept
+  {
+    coroutine_handle<co_composed_promise>::from_promise(*this).destroy();
+  }
+
+  void resume(co_composed_promise*& owner, void* result,
+      co_composed_on_suspend& on_suspend)
+  {
+    state_.on_suspend_ = &on_suspend;
+    state_.clear_cancellation_slot();
+    owner_ = &owner;
+    result_ = result;
+    coroutine_handle<co_composed_promise>::from_promise(*this).resume();
+  }
+
+  co_composed_state<Executors, Handler, Return>& state() noexcept
+  {
+    return state_;
+  }
+
+  void get_return_object() noexcept
+  {
+  }
+
+  auto initial_suspend() noexcept
+  {
+    return suspend_never();
+  }
+
+  void unhandled_exception()
+  {
+    if (owner_)
+      *owner_ = this;
+    throw;
+  }
+
+  template <BOOST_ASIO_ASYNC_OPERATION Op>
+  auto await_transform(Op&& op,
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+      boost::asio::detail::source_location location
+        = boost::asio::detail::source_location::current(),
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+      constraint_t<is_async_operation<Op>::value> = 0)
+  {
+    class [[nodiscard]] awaitable
+    {
+    public:
+      awaitable(Op&& op, co_composed_promise& promise
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+          , const boost::asio::detail::source_location& location
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+        )
+        : op_(static_cast<Op&&>(op)),
+          promise_(promise)
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+        , location_(location)
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+      {
+      }
+
+      constexpr bool await_ready() const noexcept
+      {
+        return false;
+      }
+
+      void await_suspend(coroutine_handle<co_composed_promise>)
+      {
+        if (promise_.state_.check_for_cancellation_on_suspend(promise_))
+        {
+          promise_.state_.on_suspend_->arg_ = this;
+          promise_.state_.on_suspend_->fn_ =
+            [](void* p)
+            {
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+              BOOST_ASIO_HANDLER_LOCATION((
+                  static_cast<awaitable*>(p)->location_.file_name(),
+                  static_cast<awaitable*>(p)->location_.line(),
+                  static_cast<awaitable*>(p)->location_.function_name()));
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+              static_cast<Op&&>(static_cast<awaitable*>(p)->op_)(
+                  co_composed_handler<Executors, Handler,
+                    Return, completion_signature_of_t<Op>>(
+                      static_cast<awaitable*>(p)->promise_));
+            };
+        }
+      }
+
+      auto await_resume()
+      {
+        return co_composed_handler<Executors, Handler, Return,
+          completion_signature_of_t<Op>>::on_resume(promise_.result_);
+      }
+
+    private:
+      Op&& op_;
+      co_composed_promise& promise_;
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+      boost::asio::detail::source_location location_;
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+    };
+
+    state_.check_for_cancellation_on_transform();
+    return awaitable{static_cast<Op&&>(op), *this
+#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+# if defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+        , location
+# endif // defined(BOOST_ASIO_HAS_SOURCE_LOCATION)
+#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
+      };
+  }
+
+  template <typename... Args>
+  auto yield_value(co_composed_completion<Args...>&& result)
+  {
+    class [[nodiscard]] awaitable
+    {
+    public:
+      awaitable(co_composed_completion<Args...>&& result,
+          co_composed_promise& promise)
+        : result_(std::move(result)),
+          promise_(promise)
+      {
+      }
+
+      constexpr bool await_ready() const noexcept
+      {
+        return false;
+      }
+
+      void await_suspend(coroutine_handle<co_composed_promise>)
+      {
+        promise_.state_.work_.reset();
+        promise_.state_.on_suspend_->arg_ = this;
+        promise_.state_.on_suspend_->fn_ =
+          [](void* p)
+          {
+            awaitable& a = *static_cast<awaitable*>(p);
+
+            co_composed_handler_base<Executors, Handler,
+              Return> composed_handler(a.promise_);
+
+            Handler handler(std::move(a.promise_.state_.handler_));
+            std::tuple<decay_t<Args>...> result(
+                std::move(static_cast<std::tuple<Args&&...>&>(a.result_)));
+
+            co_composed_handler_base<Executors, Handler,
+              Return>(std::move(composed_handler));
+
+            std::apply(std::move(handler), std::move(result));
+          };
+      }
+
+      void await_resume() noexcept
+      {
+      }
+
+    private:
+      co_composed_completion<Args...> result_;
+      co_composed_promise& promise_;
+    };
+
+    return awaitable{std::move(result), *this};
+  }
+
+private:
+  using allocator_type =
+    associated_allocator_t<Handler, recycling_allocator<void>>;
+
+  union block
+  {
+    std::max_align_t max_align;
+    alignas(allocator_type) char pad[alignof(allocator_type)];
+  };
+
+  using block_allocator_type =
+    typename std::allocator_traits<allocator_type>
+      ::template rebind_alloc<block>;
+
+  static constexpr std::size_t blocks(std::size_t size)
+  {
+    return (size + sizeof(block) - 1) / sizeof(block);
+  }
+
+  co_composed_state<Executors, Handler, Return>& state_;
+  co_composed_promise** owner_ = nullptr;
+  void* result_ = nullptr;
+};
+
+template <typename Implementation, typename Executors, typename... Signatures>
+class initiate_co_composed
+{
+public:
+  using executor_type = typename composed_io_executors<Executors>::head_type;
+
+  template <typename I>
+  initiate_co_composed(I&& impl, composed_io_executors<Executors>&& executors)
+    : implementation_(static_cast<I&&>(impl)),
+      executors_(std::move(executors))
+  {
+  }
+
+  executor_type get_executor() const noexcept
+  {
+    return executors_.head_;
+  }
+
+  template <typename Handler, typename... InitArgs>
+  void operator()(Handler&& handler, InitArgs&&... init_args) const &
+  {
+    using handler_type = decay_t<Handler>;
+    using returns_type = co_composed_returns<Signatures...>;
+    co_composed_on_suspend on_suspend{};
+    implementation_(
+        co_composed_state<Executors, handler_type, returns_type>(
+          executors_, static_cast<Handler&&>(handler), on_suspend),
+        static_cast<InitArgs&&>(init_args)...);
+    if (on_suspend.fn_)
+      on_suspend.fn_(on_suspend.arg_);
+  }
+
+  template <typename Handler, typename... InitArgs>
+  void operator()(Handler&& handler, InitArgs&&... init_args) &&
+  {
+    using handler_type = decay_t<Handler>;
+    using returns_type = co_composed_returns<Signatures...>;
+    co_composed_on_suspend on_suspend{};
+    std::move(implementation_)(
+        co_composed_state<Executors, handler_type, returns_type>(
+          std::move(executors_), static_cast<Handler&&>(handler), on_suspend),
+        static_cast<InitArgs&&>(init_args)...);
+    if (on_suspend.fn_)
+      on_suspend.fn_(on_suspend.arg_);
+  }
+
+private:
+  Implementation implementation_;
+  composed_io_executors<Executors> executors_;
+};
+
+template <typename Implementation, typename... Signatures>
+class initiate_co_composed<Implementation, void(), Signatures...>
+{
+public:
+  template <typename I>
+  initiate_co_composed(I&& impl, composed_io_executors<void()>&&)
+    : implementation_(static_cast<I&&>(impl))
+  {
+  }
+
+  template <typename Handler, typename... InitArgs>
+  void operator()(Handler&& handler, InitArgs&&... init_args) const &
+  {
+    using handler_type = decay_t<Handler>;
+    using returns_type = co_composed_returns<Signatures...>;
+    co_composed_on_suspend on_suspend{};
+    implementation_(
+        co_composed_state<void(), handler_type, returns_type>(
+          composed_io_executors<void()>(),
+          static_cast<Handler&&>(handler), on_suspend),
+        static_cast<InitArgs&&>(init_args)...);
+    if (on_suspend.fn_)
+      on_suspend.fn_(on_suspend.arg_);
+  }
+
+  template <typename Handler, typename... InitArgs>
+  void operator()(Handler&& handler, InitArgs&&... init_args) &&
+  {
+    using handler_type = decay_t<Handler>;
+    using returns_type = co_composed_returns<Signatures...>;
+    co_composed_on_suspend on_suspend{};
+    std::move(implementation_)(
+        co_composed_state<void(), handler_type, returns_type>(
+          composed_io_executors<void()>(),
+          static_cast<Handler&&>(handler), on_suspend),
+        static_cast<InitArgs&&>(init_args)...);
+    if (on_suspend.fn_)
+      on_suspend.fn_(on_suspend.arg_);
+  }
+
+private:
+  Implementation implementation_;
+};
+
+template <typename... Signatures, typename Implementation, typename Executors>
+inline initiate_co_composed<decay_t<Implementation>, Executors, Signatures...>
+make_initiate_co_composed(Implementation&& implementation,
+    composed_io_executors<Executors>&& executors)
+{
+  return initiate_co_composed<
+    decay_t<Implementation>, Executors, Signatures...>(
+        static_cast<Implementation&&>(implementation), std::move(executors));
+}
+
+} // namespace detail
+
+#if !defined(GENERATING_DOCUMENTATION)
+
+template <template <typename, typename> class Associator,
+    typename Executors, typename Handler, typename Return,
+    typename Signature, typename DefaultCandidate>
+struct associator<Associator,
+    detail::co_composed_handler<Executors, Handler, Return, Signature>,
+    DefaultCandidate>
+  : Associator<Handler, DefaultCandidate>
+{
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::co_composed_handler<
+        Executors, Handler, Return, Signature>& h) noexcept
+  {
+    return Associator<Handler, DefaultCandidate>::get(
+        h.promise().state().handler());
+  }
+
+  static auto get(
+      const detail::co_composed_handler<
+        Executors, Handler, Return, Signature>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(
+      Associator<Handler, DefaultCandidate>::get(
+        h.promise().state().handler(), c))
+  {
+    return Associator<Handler, DefaultCandidate>::get(
+        h.promise().state().handler(), c);
+  }
+};
+
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+} // namespace asio
+} // namespace boost
+
+#if !defined(GENERATING_DOCUMENTATION)
+# if defined(BOOST_ASIO_HAS_STD_COROUTINE)
+namespace std {
+# else // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+namespace std { namespace experimental {
+# endif // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+
+template <typename C, typename Executors,
+    typename Handler, typename Return, typename... Args>
+struct coroutine_traits<void, C&,
+    boost::asio::detail::co_composed_state<Executors, Handler, Return>, Args...>
+{
+  using promise_type =
+    boost::asio::detail::co_composed_promise<Executors, Handler, Return>;
+};
+
+template <typename C, typename Executors,
+    typename Handler, typename Return, typename... Args>
+struct coroutine_traits<void, C&&,
+    boost::asio::detail::co_composed_state<Executors, Handler, Return>, Args...>
+{
+  using promise_type =
+    boost::asio::detail::co_composed_promise<Executors, Handler, Return>;
+};
+
+template <typename Executors, typename Handler,
+    typename Return, typename... Args>
+struct coroutine_traits<void,
+    boost::asio::detail::co_composed_state<Executors, Handler, Return>, Args...>
+{
+  using promise_type =
+    boost::asio::detail::co_composed_promise<Executors, Handler, Return>;
+};
+
+# if defined(BOOST_ASIO_HAS_STD_COROUTINE)
+} // namespace std
+# else // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+}} // namespace std::experimental
+# endif // defined(BOOST_ASIO_HAS_STD_COROUTINE)
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+namespace boost {
+namespace asio {
+
+/// Creates an initiation function object that may be used to launch a
+/// coroutine-based composed asynchronous operation.
+/**
+ * The co_composed utility simplifies the implementation of composed
+ * asynchronous operations by automatically adapting a coroutine to be an
+ * initiation function object for use with @c async_initiate. When awaiting
+ * asynchronous operations, the coroutine automatically uses a conforming
+ * intermediate completion handler.
+ *
+ * @param implementation A function object that contains the coroutine-based
+ * implementation of the composed asynchronous operation. The first argument to
+ * the function object represents the state of the operation, and may be used
+ * to test for cancellation. The remaining arguments are those passed to @c
+ * async_initiate after the completion token.
+ *
+ * @param io_objects_or_executors Zero or more I/O objects or I/O executors for
+ * which outstanding work must be maintained while the operation is incomplete.
+ *
+ * @par Per-Operation Cancellation
+ * By default, terminal per-operation cancellation is enabled for composed
+ * operations that use co_composed. To disable cancellation for the composed
+ * operation, or to alter its supported cancellation types, call the state's
+ * @c reset_cancellation_state function.
+ *
+ * @par Examples
+ * The following example illustrates manual error handling and explicit checks
+ * for cancellation. The completion handler is invoked via a @c co_yield to the
+ * state's @c complete function, which never returns.
+ *
+ * @code template <typename CompletionToken>
+ * auto async_echo(tcp::socket& socket,
+ *     CompletionToken&& token)
+ * {
+ *   return boost::asio::async_initiate<
+ *     CompletionToken, void(boost::system::error_code)>(
+ *       boost::asio::co_composed(
+ *         [](auto state, tcp::socket& socket) -> void
+ *         {
+ *           state.reset_cancellation_state(
+ *             boost::asio::enable_terminal_cancellation());
+ *
+ *           while (!state.cancelled())
+ *           {
+ *             char data[1024];
+ *             auto [e1, n1] =
+ *               co_await socket.async_read_some(
+ *                 boost::asio::buffer(data));
+ *
+ *             if (e1)
+ *               co_yield state.complete(e1);
+ *
+ *             if (!!state.cancelled())
+ *               co_yield state.complete(
+ *                 make_error_code(boost::asio::error::operation_aborted));
+ *
+ *             auto [e2, n2] =
+ *               co_await boost::asio::async_write(socket,
+ *                 boost::asio::buffer(data, n1));
+ *
+ *             if (e2)
+ *               co_yield state.complete(e2);
+ *           }
+ *         }, socket),
+ *       token, std::ref(socket));
+ * } @endcode
+ *
+ * This next example shows exception-based error handling and implicit checks
+ * for cancellation. The completion handler is invoked after returning from the
+ * coroutine via @c co_return. Valid @c co_return values are specified using
+ * completion signatures passed to the @c co_composed function.
+ *
+ * @code template <typename CompletionToken>
+ * auto async_echo(tcp::socket& socket,
+ *     CompletionToken&& token)
+ * {
+ *   return boost::asio::async_initiate<
+ *     CompletionToken, void(boost::system::error_code)>(
+ *       boost::asio::co_composed<
+ *         void(boost::system::error_code)>(
+ *           [](auto state, tcp::socket& socket) -> void
+ *           {
+ *             try
+ *             {
+ *               state.throw_if_cancelled(true);
+ *               state.reset_cancellation_state(
+ *                 boost::asio::enable_terminal_cancellation());
+ *
+ *               for (;;)
+ *               {
+ *                 char data[1024];
+ *                 std::size_t n = co_await socket.async_read_some(
+ *                     boost::asio::buffer(data));
+ *
+ *                 co_await boost::asio::async_write(socket,
+ *                     boost::asio::buffer(data, n));
+ *               }
+ *             }
+ *             catch (const boost::system::system_error& e)
+ *             {
+ *               co_return {e.code()};
+ *             }
+ *           }, socket),
+ *       token, std::ref(socket));
+ * } @endcode
+ */
+template <BOOST_ASIO_COMPLETION_SIGNATURE... Signatures,
+    typename Implementation, typename... IoObjectsOrExecutors>
+inline auto co_composed(Implementation&& implementation,
+    IoObjectsOrExecutors&&... io_objects_or_executors)
+{
+  return detail::make_initiate_co_composed<Signatures...>(
+      static_cast<Implementation&&>(implementation),
+      detail::make_composed_io_executors(
+        detail::get_composed_io_executor(
+          static_cast<IoObjectsOrExecutors&&>(
+            io_objects_or_executors))...));
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // defined(BOOST_ASIO_HAS_CO_AWAIT) || defined(GENERATING_DOCUMENTATION)
+
+#endif // BOOST_ASIO_CO_COMPOSED_HPP
diff --git a/inst/include/boost/asio/co_spawn.hpp b/inst/include/boost/asio/co_spawn.hpp
index b60cd4337..1f42be7a1 100644
--- a/inst/include/boost/asio/co_spawn.hpp
+++ b/inst/include/boost/asio/co_spawn.hpp
@@ -2,7 +2,7 @@
 // co_spawn.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/completion_condition.hpp b/inst/include/boost/asio/completion_condition.hpp
index f16238ef1..4cd941092 100644
--- a/inst/include/boost/asio/completion_condition.hpp
+++ b/inst/include/boost/asio/completion_condition.hpp
@@ -2,7 +2,7 @@
 // completion_condition.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,8 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <cstddef>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/system/error_code.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -98,8 +100,55 @@ class transfer_exactly_t
   std::size_t size_;
 };
 
+template <typename T, typename = void>
+struct is_completion_condition_helper : false_type
+{
+};
+
+template <typename T>
+struct is_completion_condition_helper<T,
+    enable_if_t<
+      is_same<
+        result_of_t<T(boost::system::error_code, std::size_t)>,
+        bool
+      >::value
+    >
+  > : true_type
+{
+};
+
+template <typename T>
+struct is_completion_condition_helper<T,
+    enable_if_t<
+      is_same<
+        result_of_t<T(boost::system::error_code, std::size_t)>,
+        std::size_t
+      >::value
+    >
+  > : true_type
+{
+};
+
 } // namespace detail
 
+#if defined(GENERATING_DOCUMENTATION)
+
+/// Trait for determining whether a function object is a completion condition.
+template <typename T>
+struct is_completion_condition
+{
+  static constexpr bool value = automatically_determined;
+};
+
+#else // defined(GENERATING_DOCUMENTATION)
+
+template <typename T>
+struct is_completion_condition : detail::is_completion_condition_helper<T>
+{
+};
+
+#endif // defined(GENERATING_DOCUMENTATION)
+
 /**
  * @defgroup completion_condition Completion Condition Function Objects
  *
diff --git a/inst/include/boost/asio/compose.hpp b/inst/include/boost/asio/compose.hpp
index 9e42d192e..f23bd79e6 100644
--- a/inst/include/boost/asio/compose.hpp
+++ b/inst/include/boost/asio/compose.hpp
@@ -2,7 +2,7 @@
 // compose.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,197 +16,12 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/associated_executor.hpp>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/detail/base_from_cancellation_state.hpp>
-#include <boost/asio/detail/composed_work.hpp>
-#include <boost/asio/detail/handler_cont_helpers.hpp>
-#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/composed.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
-namespace detail {
-
-template <typename Impl, typename Work, typename Handler, typename Signature>
-class composed_op;
-
-template <typename Impl, typename Work, typename Handler,
-    typename R, typename... Args>
-class composed_op<Impl, Work, Handler, R(Args...)>
-  : public base_from_cancellation_state<Handler>
-{
-public:
-  template <typename I, typename W, typename H>
-  composed_op(I&& impl,
-      W&& work,
-      H&& handler)
-    : base_from_cancellation_state<Handler>(
-        handler, enable_terminal_cancellation()),
-      impl_(static_cast<I&&>(impl)),
-      work_(static_cast<W&&>(work)),
-      handler_(static_cast<H&&>(handler)),
-      invocations_(0)
-  {
-  }
-
-  composed_op(composed_op&& other)
-    : base_from_cancellation_state<Handler>(
-        static_cast<base_from_cancellation_state<Handler>&&>(other)),
-      impl_(static_cast<Impl&&>(other.impl_)),
-      work_(static_cast<Work&&>(other.work_)),
-      handler_(static_cast<Handler&&>(other.handler_)),
-      invocations_(other.invocations_)
-  {
-  }
-
-  typedef typename composed_work_guard<
-    typename Work::head_type>::executor_type io_executor_type;
-
-  io_executor_type get_io_executor() const noexcept
-  {
-    return work_.head_.get_executor();
-  }
-
-  typedef associated_executor_t<Handler, io_executor_type> executor_type;
-
-  executor_type get_executor() const noexcept
-  {
-    return (get_associated_executor)(handler_, work_.head_.get_executor());
-  }
-
-  typedef associated_allocator_t<Handler, std::allocator<void>> allocator_type;
-
-  allocator_type get_allocator() const noexcept
-  {
-    return (get_associated_allocator)(handler_, std::allocator<void>());
-  }
-
-  template<typename... T>
-  void operator()(T&&... t)
-  {
-    if (invocations_ < ~0u)
-      ++invocations_;
-    this->get_cancellation_state().slot().clear();
-    impl_(*this, static_cast<T&&>(t)...);
-  }
-
-  void complete(Args... args)
-  {
-    this->work_.reset();
-    static_cast<Handler&&>(this->handler_)(static_cast<Args&&>(args)...);
-  }
-
-  void reset_cancellation_state()
-  {
-    base_from_cancellation_state<Handler>::reset_cancellation_state(handler_);
-  }
-
-  template <typename Filter>
-  void reset_cancellation_state(Filter&& filter)
-  {
-    base_from_cancellation_state<Handler>::reset_cancellation_state(handler_,
-        static_cast<Filter&&>(filter));
-  }
-
-  template <typename InFilter, typename OutFilter>
-  void reset_cancellation_state(InFilter&& in_filter,
-      OutFilter&& out_filter)
-  {
-    base_from_cancellation_state<Handler>::reset_cancellation_state(handler_,
-        static_cast<InFilter&&>(in_filter),
-        static_cast<OutFilter&&>(out_filter));
-  }
-
-  cancellation_type_t cancelled() const noexcept
-  {
-    return base_from_cancellation_state<Handler>::cancelled();
-  }
-
-//private:
-  Impl impl_;
-  Work work_;
-  Handler handler_;
-  unsigned invocations_;
-};
-
-template <typename Impl, typename Work, typename Handler, typename Signature>
-inline bool asio_handler_is_continuation(
-    composed_op<Impl, Work, Handler, Signature>* this_handler)
-{
-  return this_handler->invocations_ > 1 ? true
-    : boost_asio_handler_cont_helpers::is_continuation(
-        this_handler->handler_);
-}
-
-template <typename Signature, typename Executors>
-class initiate_composed_op
-{
-public:
-  typedef typename composed_io_executors<Executors>::head_type executor_type;
-
-  template <typename T>
-  explicit initiate_composed_op(int, T&& executors)
-    : executors_(static_cast<T&&>(executors))
-  {
-  }
-
-  executor_type get_executor() const noexcept
-  {
-    return executors_.head_;
-  }
-
-  template <typename Handler, typename Impl>
-  void operator()(Handler&& handler,
-      Impl&& impl) const
-  {
-    composed_op<decay_t<Impl>, composed_work<Executors>,
-      decay_t<Handler>, Signature>(
-        static_cast<Impl&&>(impl),
-        composed_work<Executors>(executors_),
-        static_cast<Handler&&>(handler))();
-  }
-
-private:
-  composed_io_executors<Executors> executors_;
-};
-
-template <typename Signature, typename Executors>
-inline initiate_composed_op<Signature, Executors> make_initiate_composed_op(
-    composed_io_executors<Executors>&& executors)
-{
-  return initiate_composed_op<Signature, Executors>(0,
-      static_cast<composed_io_executors<Executors>&&>(executors));
-}
-
-} // namespace detail
-
-#if !defined(GENERATING_DOCUMENTATION)
-
-template <template <typename, typename> class Associator,
-    typename Impl, typename Work, typename Handler,
-    typename Signature, typename DefaultCandidate>
-struct associator<Associator,
-    detail::composed_op<Impl, Work, Handler, Signature>,
-    DefaultCandidate>
-  : Associator<Handler, DefaultCandidate>
-{
-  static typename Associator<Handler, DefaultCandidate>::type get(
-      const detail::composed_op<Impl, Work, Handler, Signature>& h) noexcept
-  {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_);
-  }
-
-  static auto get(const detail::composed_op<Impl, Work, Handler, Signature>& h,
-      const DefaultCandidate& c) noexcept
-    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
-  {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
-  }
-};
-
-#endif // !defined(GENERATING_DOCUMENTATION)
 
 /// Launch an asynchronous operation with a stateful implementation.
 /**
@@ -276,8 +91,8 @@ struct associator<Associator,
  * template <typename CompletionToken>
  * auto async_echo(tcp::socket& socket,
  *     boost::asio::mutable_buffer buffer,
- *     CompletionToken&& token) ->
- *   decltype(
+ *     CompletionToken&& token)
+ *   -> decltype(
  *     boost::asio::async_compose<CompletionToken,
  *       void(boost::system::error_code, std::size_t)>(
  *         std::declval<async_echo_implementation>(),
@@ -292,25 +107,19 @@ struct associator<Associator,
  */
 template <typename CompletionToken, typename Signature,
     typename Implementation, typename... IoObjectsOrExecutors>
-auto async_compose(Implementation&& implementation,
+inline auto async_compose(Implementation&& implementation,
     type_identity_t<CompletionToken>& token,
     IoObjectsOrExecutors&&... io_objects_or_executors)
   -> decltype(
     async_initiate<CompletionToken, Signature>(
-      detail::make_initiate_composed_op<Signature>(
-        detail::make_composed_io_executors(
-          detail::get_composed_io_executor(
-            static_cast<IoObjectsOrExecutors&&>(
-              io_objects_or_executors))...)),
-      token, static_cast<Implementation&&>(implementation)))
+      composed<Signature>(static_cast<Implementation&&>(implementation),
+        static_cast<IoObjectsOrExecutors&&>(io_objects_or_executors)...),
+      token))
 {
   return async_initiate<CompletionToken, Signature>(
-      detail::make_initiate_composed_op<Signature>(
-        detail::make_composed_io_executors(
-          detail::get_composed_io_executor(
-            static_cast<IoObjectsOrExecutors&&>(
-              io_objects_or_executors))...)),
-      token, static_cast<Implementation&&>(implementation));
+      composed<Signature>(static_cast<Implementation&&>(implementation),
+        static_cast<IoObjectsOrExecutors&&>(io_objects_or_executors)...),
+      token);
 }
 
 } // namespace asio
diff --git a/inst/include/boost/asio/composed.hpp b/inst/include/boost/asio/composed.hpp
new file mode 100644
index 000000000..bda148775
--- /dev/null
+++ b/inst/include/boost/asio/composed.hpp
@@ -0,0 +1,415 @@
+//
+// composed.hpp
+// ~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_COMPOSED_HPP
+#define BOOST_ASIO_COMPOSED_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/base_from_cancellation_state.hpp>
+#include <boost/asio/detail/composed_work.hpp>
+#include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Impl, typename Work,
+    typename Handler, typename... Signatures>
+class composed_op;
+
+template <typename Impl, typename Work, typename Handler>
+class composed_op<Impl, Work, Handler>
+  : public base_from_cancellation_state<Handler>
+{
+public:
+  template <typename I, typename W, typename H>
+  composed_op(I&& impl,
+      W&& work,
+      H&& handler)
+    : base_from_cancellation_state<Handler>(
+        handler, enable_terminal_cancellation()),
+      impl_(static_cast<I&&>(impl)),
+      work_(static_cast<W&&>(work)),
+      handler_(static_cast<H&&>(handler)),
+      invocations_(0)
+  {
+  }
+
+  composed_op(composed_op&& other)
+    : base_from_cancellation_state<Handler>(
+        static_cast<base_from_cancellation_state<Handler>&&>(other)),
+      impl_(static_cast<Impl&&>(other.impl_)),
+      work_(static_cast<Work&&>(other.work_)),
+      handler_(static_cast<Handler&&>(other.handler_)),
+      invocations_(other.invocations_)
+  {
+  }
+
+  typedef typename composed_work_guard<
+    typename Work::head_type>::executor_type io_executor_type;
+
+  io_executor_type get_io_executor() const noexcept
+  {
+    return work_.head_.get_executor();
+  }
+
+  typedef associated_executor_t<Handler, io_executor_type> executor_type;
+
+  executor_type get_executor() const noexcept
+  {
+    return (get_associated_executor)(handler_, work_.head_.get_executor());
+  }
+
+  typedef associated_allocator_t<Handler, std::allocator<void>> allocator_type;
+
+  allocator_type get_allocator() const noexcept
+  {
+    return (get_associated_allocator)(handler_, std::allocator<void>());
+  }
+
+  template <typename... T>
+  void operator()(T&&... t)
+  {
+    if (invocations_ < ~0u)
+      ++invocations_;
+    this->get_cancellation_state().slot().clear();
+    impl_(*this, static_cast<T&&>(t)...);
+  }
+
+  template <typename... Args>
+  auto complete(Args&&... args)
+    -> decltype(declval<Handler>()(static_cast<Args&&>(args)...))
+  {
+    return static_cast<Handler&&>(this->handler_)(static_cast<Args&&>(args)...);
+  }
+
+  void reset_cancellation_state()
+  {
+    base_from_cancellation_state<Handler>::reset_cancellation_state(handler_);
+  }
+
+  template <typename Filter>
+  void reset_cancellation_state(Filter&& filter)
+  {
+    base_from_cancellation_state<Handler>::reset_cancellation_state(handler_,
+        static_cast<Filter&&>(filter));
+  }
+
+  template <typename InFilter, typename OutFilter>
+  void reset_cancellation_state(InFilter&& in_filter,
+      OutFilter&& out_filter)
+  {
+    base_from_cancellation_state<Handler>::reset_cancellation_state(handler_,
+        static_cast<InFilter&&>(in_filter),
+        static_cast<OutFilter&&>(out_filter));
+  }
+
+  cancellation_type_t cancelled() const noexcept
+  {
+    return base_from_cancellation_state<Handler>::cancelled();
+  }
+
+//private:
+  Impl impl_;
+  Work work_;
+  Handler handler_;
+  unsigned invocations_;
+};
+
+template <typename Impl, typename Work, typename Handler,
+    typename R, typename... Args>
+class composed_op<Impl, Work, Handler, R(Args...)>
+  : public composed_op<Impl, Work, Handler>
+{
+public:
+  using composed_op<Impl, Work, Handler>::composed_op;
+
+  template <typename... T>
+  void operator()(T&&... t)
+  {
+    if (this->invocations_ < ~0u)
+      ++this->invocations_;
+    this->get_cancellation_state().slot().clear();
+    this->impl_(*this, static_cast<T&&>(t)...);
+  }
+
+  void complete(Args... args)
+  {
+    this->work_.reset();
+    static_cast<Handler&&>(this->handler_)(static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Impl, typename Work, typename Handler,
+    typename R, typename... Args, typename... Signatures>
+class composed_op<Impl, Work, Handler, R(Args...), Signatures...>
+  : public composed_op<Impl, Work, Handler, Signatures...>
+{
+public:
+  using composed_op<Impl, Work, Handler, Signatures...>::composed_op;
+
+  template <typename... T>
+  void operator()(T&&... t)
+  {
+    if (this->invocations_ < ~0u)
+      ++this->invocations_;
+    this->get_cancellation_state().slot().clear();
+    this->impl_(*this, static_cast<T&&>(t)...);
+  }
+
+  using composed_op<Impl, Work, Handler, Signatures...>::complete;
+
+  void complete(Args... args)
+  {
+    this->work_.reset();
+    static_cast<Handler&&>(this->handler_)(static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Impl, typename Work, typename Handler, typename Signature>
+inline bool asio_handler_is_continuation(
+    composed_op<Impl, Work, Handler, Signature>* this_handler)
+{
+  return this_handler->invocations_ > 1 ? true
+    : boost_asio_handler_cont_helpers::is_continuation(
+        this_handler->handler_);
+}
+
+template <typename Implementation, typename Executors, typename... Signatures>
+class initiate_composed
+{
+public:
+  typedef typename composed_io_executors<Executors>::head_type executor_type;
+
+  template <typename I>
+  initiate_composed(I&& impl, composed_io_executors<Executors>&& executors)
+    : implementation_(std::forward<I>(impl)),
+      executors_(std::move(executors))
+  {
+  }
+
+  executor_type get_executor() const noexcept
+  {
+    return executors_.head_;
+  }
+
+  template <typename Handler, typename... Args>
+  void operator()(Handler&& handler, Args&&... args) const &
+  {
+    composed_op<decay_t<Implementation>, composed_work<Executors>,
+      decay_t<Handler>, Signatures...>(implementation_,
+        composed_work<Executors>(executors_),
+        static_cast<Handler&&>(handler))(static_cast<Args&&>(args)...);
+  }
+
+  template <typename Handler, typename... Args>
+  void operator()(Handler&& handler, Args&&... args) &&
+  {
+    composed_op<decay_t<Implementation>, composed_work<Executors>,
+      decay_t<Handler>, Signatures...>(
+        static_cast<Implementation&&>(implementation_),
+        composed_work<Executors>(executors_),
+        static_cast<Handler&&>(handler))(static_cast<Args&&>(args)...);
+  }
+
+private:
+  Implementation implementation_;
+  composed_io_executors<Executors> executors_;
+};
+
+template <typename Implementation, typename... Signatures>
+class initiate_composed<Implementation, void(), Signatures...>
+{
+public:
+  template <typename I>
+  initiate_composed(I&& impl, composed_io_executors<void()>&&)
+    : implementation_(std::forward<I>(impl))
+  {
+  }
+
+  template <typename Handler, typename... Args>
+  void operator()(Handler&& handler, Args&&... args) const &
+  {
+    composed_op<decay_t<Implementation>, composed_work<void()>,
+      decay_t<Handler>, Signatures...>(implementation_,
+        composed_work<void()>(composed_io_executors<void()>()),
+        static_cast<Handler&&>(handler))(static_cast<Args&&>(args)...);
+  }
+
+  template <typename Handler, typename... Args>
+  void operator()(Handler&& handler, Args&&... args) &&
+  {
+    composed_op<decay_t<Implementation>, composed_work<void()>,
+      decay_t<Handler>, Signatures...>(
+        static_cast<Implementation&&>(implementation_),
+        composed_work<void()>(composed_io_executors<void()>()),
+        static_cast<Handler&&>(handler))(static_cast<Args&&>(args)...);
+  }
+
+private:
+  Implementation implementation_;
+};
+
+template <typename... Signatures, typename Implementation, typename Executors>
+inline initiate_composed<Implementation, Executors, Signatures...>
+make_initiate_composed(Implementation&& implementation,
+    composed_io_executors<Executors>&& executors)
+{
+  return initiate_composed<decay_t<Implementation>, Executors, Signatures...>(
+      static_cast<Implementation&&>(implementation),
+      static_cast<composed_io_executors<Executors>&&>(executors));
+}
+
+} // namespace detail
+
+#if !defined(GENERATING_DOCUMENTATION)
+
+template <template <typename, typename> class Associator,
+    typename Impl, typename Work, typename Handler,
+    typename Signature, typename DefaultCandidate>
+struct associator<Associator,
+    detail::composed_op<Impl, Work, Handler, Signature>,
+    DefaultCandidate>
+  : Associator<Handler, DefaultCandidate>
+{
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::composed_op<Impl, Work, Handler, Signature>& h) noexcept
+  {
+    return Associator<Handler, DefaultCandidate>::get(h.handler_);
+  }
+
+  static auto get(const detail::composed_op<Impl, Work, Handler, Signature>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
+  {
+    return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
+  }
+};
+
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+/// Creates an initiation function object that may be used to launch an
+/// asynchronous operation with a stateful implementation.
+/**
+ * The @c composed function simplifies the implementation of composed
+ * asynchronous operations automatically by wrapping a stateful function object
+ * for use as an initiation function object.
+ *
+ * @param implementation A function object that contains the implementation of
+ * the composed asynchronous operation. The first argument to the function
+ * object is a non-const reference to the enclosing intermediate completion
+ * handler. The remaining arguments are any arguments that originate from the
+ * completion handlers of any asynchronous operations performed by the
+ * implementation.
+ *
+ * @param io_objects_or_executors Zero or more I/O objects or I/O executors for
+ * which outstanding work must be maintained.
+ *
+ * @par Per-Operation Cancellation
+ * By default, terminal per-operation cancellation is enabled for composed
+ * operations that are implemented using @c composed. To disable cancellation
+ * for the composed operation, or to alter its supported cancellation types,
+ * call the @c self object's @c reset_cancellation_state function.
+ *
+ * @par Example:
+ *
+ * @code struct async_echo_implementation
+ * {
+ *   tcp::socket& socket_;
+ *   boost::asio::mutable_buffer buffer_;
+ *   enum { starting, reading, writing } state_;
+ *
+ *   template <typename Self>
+ *   void operator()(Self& self,
+ *       boost::system::error_code error,
+ *       std::size_t n)
+ *   {
+ *     switch (state_)
+ *     {
+ *     case starting:
+ *       state_ = reading;
+ *       socket_.async_read_some(
+ *           buffer_, std::move(self));
+ *       break;
+ *     case reading:
+ *       if (error)
+ *       {
+ *         self.complete(error, 0);
+ *       }
+ *       else
+ *       {
+ *         state_ = writing;
+ *         boost::asio::async_write(socket_, buffer_,
+ *             boost::asio::transfer_exactly(n),
+ *             std::move(self));
+ *       }
+ *       break;
+ *     case writing:
+ *       self.complete(error, n);
+ *       break;
+ *     }
+ *   }
+ * };
+ *
+ * template <typename CompletionToken>
+ * auto async_echo(tcp::socket& socket,
+ *     boost::asio::mutable_buffer buffer,
+ *     CompletionToken&& token)
+ *   -> decltype(
+ *     boost::asio::async_initiate<CompletionToken,
+ *       void(boost::system::error_code, std::size_t)>(
+ *         boost::asio::composed(
+ *           async_echo_implementation{socket, buffer,
+ *             async_echo_implementation::starting}, socket),
+ *         token))
+ * {
+ *   return boost::asio::async_initiate<CompletionToken,
+ *     void(boost::system::error_code, std::size_t)>(
+ *       boost::asio::composed(
+ *         async_echo_implementation{socket, buffer,
+ *           async_echo_implementation::starting}, socket),
+ *       token, boost::system::error_code{}, 0);
+ * } @endcode
+ */
+template <BOOST_ASIO_COMPLETION_SIGNATURE... Signatures,
+    typename Implementation, typename... IoObjectsOrExecutors>
+inline auto composed(Implementation&& implementation,
+    IoObjectsOrExecutors&&... io_objects_or_executors)
+  -> decltype(
+    detail::make_initiate_composed<Signatures...>(
+      static_cast<Implementation&&>(implementation),
+      detail::make_composed_io_executors(
+        detail::get_composed_io_executor(
+          static_cast<IoObjectsOrExecutors&&>(
+            io_objects_or_executors))...)))
+{
+  return detail::make_initiate_composed<Signatures...>(
+      static_cast<Implementation&&>(implementation),
+      detail::make_composed_io_executors(
+        detail::get_composed_io_executor(
+          static_cast<IoObjectsOrExecutors&&>(
+            io_objects_or_executors))...));
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_COMPOSE_HPP
diff --git a/inst/include/boost/asio/config.hpp b/inst/include/boost/asio/config.hpp
new file mode 100644
index 000000000..3b35f35bf
--- /dev/null
+++ b/inst/include/boost/asio/config.hpp
@@ -0,0 +1,195 @@
+//
+// config.hpp
+// ~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_CONFIG_HPP
+#define BOOST_ASIO_CONFIG_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/detail/throw_exception.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/execution_context.hpp>
+#include <cstddef>
+#include <string>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+/// Base class for configuration implementations.
+class config_service :
+#if defined(GENERATING_DOCUMENTATION)
+  public execution_context::service
+#else // defined(GENERATING_DOCUMENTATION)
+  public detail::execution_context_service_base<config_service>
+#endif // defined(GENERATING_DOCUMENTATION)
+{
+public:
+#if defined(GENERATING_DOCUMENTATION)
+  typedef config_service key_type;
+#endif // defined(GENERATING_DOCUMENTATION)
+
+  /// Constructor.
+  BOOST_ASIO_DECL explicit config_service(execution_context& ctx);
+
+  /// Shutdown the service.
+  BOOST_ASIO_DECL void shutdown() override;
+
+  /// Retrieve a configuration value.
+  BOOST_ASIO_DECL virtual const char* get_value(const char* section,
+      const char* key, char* value, std::size_t value_len) const;
+};
+
+/// Provides access to the configuration values associated with an execution
+/// context.
+class config
+{
+public:
+  /// Constructor.
+  /**
+   * This constructor initialises a @c config object to retrieve configuration
+   * values associated with the specified execution context.
+   */
+  explicit config(execution_context& context)
+    : service_(use_service<config_service>(context))
+  {
+  }
+
+  /// Copy constructor.
+  config(const config& other) noexcept
+    : service_(other.service_)
+  {
+  }
+
+  /// Retrieve an integral configuration value.
+  template <typename T>
+  constraint_t<is_integral<T>::value, T>
+  get(const char* section, const char* key, T default_value) const;
+
+private:
+  config_service& service_;
+};
+
+/// Configures an execution context based on a concurrency hint.
+/**
+ * This configuration service is provided for backwards compatibility with
+ * the existing concurrency hint mechanism.
+ *
+ * @par Example
+ * @code boost::asio::io_context my_io_context{
+ *     boost::asio::config_from_concurrency_hint{1}}; @endcode
+ */
+class config_from_concurrency_hint : public execution_context::service_maker
+{
+public:
+  /// Construct with a default concurrency hint.
+  BOOST_ASIO_DECL config_from_concurrency_hint();
+
+  /// Construct with a specified concurrency hint.
+  explicit config_from_concurrency_hint(int concurrency_hint)
+    : concurrency_hint_(concurrency_hint)
+  {
+  }
+
+  /// Add a concrete service to the specified execution context.
+  BOOST_ASIO_DECL void make(execution_context& ctx) const override;
+
+private:
+  int concurrency_hint_;
+};
+
+/// Configures an execution context by reading variables from a string.
+/**
+ * Each variable must be on a line of its own, and of the form:
+ *
+ * <tt>section.key=value</tt>
+ *
+ * or, if an optional prefix is specified:
+ *
+ * <tt>prefix.section.key=value</tt>
+ *
+ * Blank lines and lines starting with <tt>#</tt> are ignored. It is also
+ * permitted to include a comment starting with <tt>#</tt> after the value.
+ *
+ * @par Example
+ * @code boost::asio::io_context my_io_context{
+ *     boost::asio::config_from_string{
+ *       "scheduler.concurrency_hint=10\n"
+ *       "scheduler.locking=1"}}; @endcode
+ */
+class config_from_string : public execution_context::service_maker
+{
+public:
+  /// Construct with the default prefix "asio".
+  explicit config_from_string(std::string s)
+    : string_(static_cast<std::string&&>(s)),
+      prefix_()
+  {
+  }
+
+  /// Construct with a specified prefix.
+  config_from_string(std::string s, std::string prefix)
+    : string_(static_cast<std::string&&>(s)),
+      prefix_(static_cast<std::string&&>(prefix))
+  {
+  }
+
+  /// Add a concrete service to the specified execution context.
+  BOOST_ASIO_DECL void make(execution_context& ctx) const override;
+
+private:
+  std::string string_;
+  std::string prefix_;
+};
+
+/// Configures an execution context by reading environment variables.
+/**
+ * The environment variable names are formed by concatenating the prefix,
+ * section, and key, with underscore as delimiter, and then converting the
+ * resulting string to upper case.
+ *
+ * @par Example
+ * @code boost::asio::io_context my_io_context{
+ *     boost::asio::config_from_env{"my_app"}}; @endcode
+ */
+class config_from_env : public execution_context::service_maker
+{
+public:
+  /// Construct with the default prefix "asio".
+  BOOST_ASIO_DECL config_from_env();
+
+  /// Construct with a specified prefix.
+  explicit config_from_env(std::string prefix)
+    : prefix_(static_cast<std::string&&>(prefix))
+  {
+  }
+
+  /// Add a concrete service to the specified execution context.
+  BOOST_ASIO_DECL void make(execution_context& ctx) const override;
+
+private:
+  std::string prefix_;
+};
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#include <boost/asio/impl/config.hpp>
+#if defined(BOOST_ASIO_HEADER_ONLY)
+# include <boost/asio/impl/config.ipp>
+#endif // defined(BOOST_ASIO_HEADER_ONLY)
+
+#endif // BOOST_ASIO_CONFIG_HPP
diff --git a/inst/include/boost/asio/connect.hpp b/inst/include/boost/asio/connect.hpp
index bc86480a0..a38a46553 100644
--- a/inst/include/boost/asio/connect.hpp
+++ b/inst/include/boost/asio/connect.hpp
@@ -2,7 +2,7 @@
 // connect.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -32,34 +32,97 @@ namespace detail
   template <typename, typename> class initiate_async_range_connect;
   template <typename, typename> class initiate_async_iterator_connect;
 
-  char (&has_iterator_helper(...))[2];
+  template <typename T, typename = void, typename = void>
+  struct is_endpoint_sequence_helper : false_type
+  {
+  };
 
   template <typename T>
-  char has_iterator_helper(T*, typename T::iterator* = 0);
+  struct is_endpoint_sequence_helper<T,
+      void_t<
+        decltype(declval<T>().begin())
+      >,
+      void_t<
+        decltype(declval<T>().end())
+      >
+    > : true_type
+  {
+  };
 
-  template <typename T>
-  struct has_iterator_typedef
+  template <typename T, typename Iterator, typename = void>
+  struct is_connect_condition_helper : false_type
   {
-    enum { value = (sizeof((has_iterator_helper)((T*)(0))) == 1) };
+  };
+
+  template <typename T, typename Iterator>
+  struct is_connect_condition_helper<T, Iterator,
+      enable_if_t<
+        is_same<
+          result_of_t<T(boost::system::error_code, Iterator)>,
+          Iterator
+        >::value
+      >
+    > : true_type
+  {
+  };
+
+  template <typename T, typename Iterator>
+  struct is_connect_condition_helper<T, Iterator,
+      enable_if_t<
+        is_same<
+          result_of_t<T(boost::system::error_code,
+            decltype(*declval<Iterator>()))>,
+          bool
+        >::value
+      >
+    > : true_type
+  {
+  };
+
+  struct default_connect_condition
+  {
+    template <typename Endpoint>
+    bool operator()(const boost::system::error_code&, const Endpoint&)
+    {
+      return true;
+    }
   };
 } // namespace detail
 
+#if defined(GENERATING_DOCUMENTATION)
+
 /// Type trait used to determine whether a type is an endpoint sequence that can
 /// be used with with @c connect and @c async_connect.
 template <typename T>
 struct is_endpoint_sequence
 {
-#if defined(GENERATING_DOCUMENTATION)
   /// The value member is true if the type may be used as an endpoint sequence.
-  static const bool value;
-#else
-  enum
-  {
-    value = detail::has_iterator_typedef<T>::value
-  };
-#endif
+  static const bool value = automatically_determined;
+};
+
+/// Trait for determining whether a function object is a connect condition that
+/// can be used with @c connect and @c async_connect.
+template <typename T, typename Iterator>
+struct is_connect_condition
+{
+  /// The value member is true if the type may be used as a connect condition.
+  static constexpr bool value = automatically_determined;
 };
 
+#else // defined(GENERATING_DOCUMENTATION)
+
+template <typename T>
+struct is_endpoint_sequence : detail::is_endpoint_sequence_helper<T>
+{
+};
+
+template <typename T, typename Iterator>
+struct is_connect_condition : detail::is_connect_condition_helper<T, Iterator>
+{
+};
+
+#endif // defined(GENERATING_DOCUMENTATION)
+
 /**
  * @defgroup connect boost::asio::connect
  *
@@ -95,7 +158,9 @@ struct is_endpoint_sequence
 template <typename Protocol, typename Executor, typename EndpointSequence>
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value> = 0);
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    > = 0);
 
 /// Establishes a socket connection by trying each endpoint in a sequence.
 /**
@@ -130,66 +195,9 @@ typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
 template <typename Protocol, typename Executor, typename EndpointSequence>
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, boost::system::error_code& ec,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value> = 0);
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated: Use range overload.) Establishes a socket connection by trying
-/// each endpoint in a sequence.
-/**
- * This function attempts to connect a socket to one of a sequence of
- * endpoints. It does this by repeated calls to the socket's @c connect member
- * function, once for each endpoint in the sequence, until a connection is
- * successfully established.
- *
- * @param s The socket to be connected. If the socket is already open, it will
- * be closed.
- *
- * @param begin An iterator pointing to the start of a sequence of endpoints.
- *
- * @returns On success, an iterator denoting the successfully connected
- * endpoint. Otherwise, the end iterator.
- *
- * @throws boost::system::system_error Thrown on failure. If the sequence is
- * empty, the associated @c error_code is boost::asio::error::not_found.
- * Otherwise, contains the error from the last connection attempt.
- *
- * @note This overload assumes that a default constructed object of type @c
- * Iterator represents the end of the sequence. This is a valid assumption for
- * iterator types such as @c boost::asio::ip::tcp::resolver::iterator.
- */
-template <typename Protocol, typename Executor, typename Iterator>
-Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    constraint_t<!is_endpoint_sequence<Iterator>::value> = 0);
-
-/// (Deprecated: Use range overload.) Establishes a socket connection by trying
-/// each endpoint in a sequence.
-/**
- * This function attempts to connect a socket to one of a sequence of
- * endpoints. It does this by repeated calls to the socket's @c connect member
- * function, once for each endpoint in the sequence, until a connection is
- * successfully established.
- *
- * @param s The socket to be connected. If the socket is already open, it will
- * be closed.
- *
- * @param begin An iterator pointing to the start of a sequence of endpoints.
- *
- * @param ec Set to indicate what error occurred, if any. If the sequence is
- * empty, set to boost::asio::error::not_found. Otherwise, contains the error
- * from the last connection attempt.
- *
- * @returns On success, an iterator denoting the successfully connected
- * endpoint. Otherwise, the end iterator.
- *
- * @note This overload assumes that a default constructed object of type @c
- * Iterator represents the end of the sequence. This is a valid assumption for
- * iterator types such as @c boost::asio::ip::tcp::resolver::iterator.
- */
-template <typename Protocol, typename Executor, typename Iterator>
-Iterator connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, boost::system::error_code& ec,
-    constraint_t<!is_endpoint_sequence<Iterator>::value> = 0);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    > = 0);
 
 /// Establishes a socket connection by trying each endpoint in a sequence.
 /**
@@ -314,7 +322,13 @@ template <typename Protocol, typename Executor,
     typename EndpointSequence, typename ConnectCondition>
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, ConnectCondition connect_condition,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value> = 0);
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    > = 0,
+    constraint_t<
+      is_connect_condition<ConnectCondition,
+        decltype(declval<const EndpointSequence&>().begin())>::value
+    > = 0);
 
 /// Establishes a socket connection by trying each endpoint in a sequence.
 /**
@@ -381,91 +395,13 @@ template <typename Protocol, typename Executor,
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, ConnectCondition connect_condition,
     boost::system::error_code& ec,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value> = 0);
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated: Use range overload.) Establishes a socket connection by trying
-/// each endpoint in a sequence.
-/**
- * This function attempts to connect a socket to one of a sequence of
- * endpoints. It does this by repeated calls to the socket's @c connect member
- * function, once for each endpoint in the sequence, until a connection is
- * successfully established.
- *
- * @param s The socket to be connected. If the socket is already open, it will
- * be closed.
- *
- * @param begin An iterator pointing to the start of a sequence of endpoints.
- *
- * @param connect_condition A function object that is called prior to each
- * connection attempt. The signature of the function object must be:
- * @code bool connect_condition(
- *     const boost::system::error_code& ec,
- *     const typename Protocol::endpoint& next); @endcode
- * The @c ec parameter contains the result from the most recent connect
- * operation. Before the first connection attempt, @c ec is always set to
- * indicate success. The @c next parameter is the next endpoint to be tried.
- * The function object should return true if the next endpoint should be tried,
- * and false if it should be skipped.
- *
- * @returns On success, an iterator denoting the successfully connected
- * endpoint. Otherwise, the end iterator.
- *
- * @throws boost::system::system_error Thrown on failure. If the sequence is
- * empty, the associated @c error_code is boost::asio::error::not_found.
- * Otherwise, contains the error from the last connection attempt.
- *
- * @note This overload assumes that a default constructed object of type @c
- * Iterator represents the end of the sequence. This is a valid assumption for
- * iterator types such as @c boost::asio::ip::tcp::resolver::iterator.
- */
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition>
-Iterator connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, ConnectCondition connect_condition,
-    constraint_t<!is_endpoint_sequence<Iterator>::value> = 0);
-
-/// (Deprecated: Use range overload.) Establishes a socket connection by trying
-/// each endpoint in a sequence.
-/**
- * This function attempts to connect a socket to one of a sequence of
- * endpoints. It does this by repeated calls to the socket's @c connect member
- * function, once for each endpoint in the sequence, until a connection is
- * successfully established.
- *
- * @param s The socket to be connected. If the socket is already open, it will
- * be closed.
- *
- * @param begin An iterator pointing to the start of a sequence of endpoints.
- *
- * @param connect_condition A function object that is called prior to each
- * connection attempt. The signature of the function object must be:
- * @code bool connect_condition(
- *     const boost::system::error_code& ec,
- *     const typename Protocol::endpoint& next); @endcode
- * The @c ec parameter contains the result from the most recent connect
- * operation. Before the first connection attempt, @c ec is always set to
- * indicate success. The @c next parameter is the next endpoint to be tried.
- * The function object should return true if the next endpoint should be tried,
- * and false if it should be skipped.
- *
- * @param ec Set to indicate what error occurred, if any. If the sequence is
- * empty, set to boost::asio::error::not_found. Otherwise, contains the error
- * from the last connection attempt.
- *
- * @returns On success, an iterator denoting the successfully connected
- * endpoint. Otherwise, the end iterator.
- *
- * @note This overload assumes that a default constructed object of type @c
- * Iterator represents the end of the sequence. This is a valid assumption for
- * iterator types such as @c boost::asio::ip::tcp::resolver::iterator.
- */
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition>
-Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    ConnectCondition connect_condition, boost::system::error_code& ec,
-    constraint_t<!is_endpoint_sequence<Iterator>::value> = 0);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    > = 0,
+    constraint_t<
+      is_connect_condition<ConnectCondition,
+        decltype(declval<const EndpointSequence&>().begin())>::value
+    > = 0);
 
 /// Establishes a socket connection by trying each endpoint in a sequence.
 /**
@@ -524,7 +460,10 @@ Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
 template <typename Protocol, typename Executor,
     typename Iterator, typename ConnectCondition>
 Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    Iterator end, ConnectCondition connect_condition);
+    Iterator end, ConnectCondition connect_condition,
+    constraint_t<
+      is_connect_condition<ConnectCondition, Iterator>::value
+    > = 0);
 
 /// Establishes a socket connection by trying each endpoint in a sequence.
 /**
@@ -593,7 +532,10 @@ template <typename Protocol, typename Executor,
     typename Iterator, typename ConnectCondition>
 Iterator connect(basic_socket<Protocol, Executor>& s,
     Iterator begin, Iterator end, ConnectCondition connect_condition,
-    boost::system::error_code& ec);
+    boost::system::error_code& ec,
+    constraint_t<
+      is_connect_condition<ConnectCondition, Iterator>::value
+    > = 0);
 
 /*@}*/
 
@@ -637,7 +579,7 @@ Iterator connect(basic_socket<Protocol, Executor>& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, typename Protocol::endpoint) @endcode
@@ -686,81 +628,27 @@ template <typename Protocol, typename Executor, typename EndpointSequence,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       typename Protocol::endpoint)) RangeConnectToken
         = default_completion_token_t<Executor>>
-auto async_connect(basic_socket<Protocol, Executor>& s,
+inline auto async_connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints,
     RangeConnectToken&& token = default_completion_token_t<Executor>(),
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value> = 0)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    > = 0,
+    constraint_t<
+      !is_connect_condition<RangeConnectToken,
+        decltype(declval<const EndpointSequence&>().begin())>::value
+    > = 0)
   -> decltype(
     async_initiate<RangeConnectToken,
       void (boost::system::error_code, typename Protocol::endpoint)>(
         declval<detail::initiate_async_range_connect<Protocol, Executor>>(),
-        token, endpoints, declval<detail::default_connect_condition>()));
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated: Use range overload.) Asynchronously establishes a socket
-/// connection by trying each endpoint in a sequence.
-/**
- * This function attempts to connect a socket to one of a sequence of
- * endpoints. It does this by repeated calls to the socket's @c async_connect
- * member function, once for each endpoint in the sequence, until a connection
- * is successfully established. It is an initiating function for an @ref
- * asynchronous_operation, and always returns immediately.
- *
- * @param s The socket to be connected. If the socket is already open, it will
- * be closed.
- *
- * @param begin An iterator pointing to the start of a sequence of endpoints.
- *
- * @param token The @ref completion_token that will be used to produce a
- * completion handler, which will be called when the connect completes.
- * Potential completion tokens include @ref use_future, @ref use_awaitable,
- * @ref yield_context, or a function object with the correct completion
- * signature. The function signature of the completion handler must be:
- * @code void handler(
- *   // Result of operation. if the sequence is empty, set to
- *   // boost::asio::error::not_found. Otherwise, contains the
- *   // error from the last connection attempt.
- *   const boost::system::error_code& error,
- *
- *   // On success, an iterator denoting the successfully
- *   // connected endpoint. Otherwise, the end iterator.
- *   Iterator iterator
- * ); @endcode
- * Regardless of whether the asynchronous operation completes immediately or
- * not, the completion handler will not be invoked from within this function.
- * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
- *
- * @par Completion Signature
- * @code void(boost::system::error_code, Iterator) @endcode
- *
- * @note This overload assumes that a default constructed object of type @c
- * Iterator represents the end of the sequence. This is a valid assumption for
- * iterator types such as @c boost::asio::ip::tcp::resolver::iterator.
- *
- * @par Per-Operation Cancellation
- * This asynchronous operation supports cancellation for the following
- * boost::asio::cancellation_type values:
- *
- * @li @c cancellation_type::terminal
- *
- * @li @c cancellation_type::partial
- *
- * if they are also supported by the socket's @c async_connect operation.
- */
-template <typename Protocol, typename Executor, typename Iterator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      Iterator)) IteratorConnectToken = default_completion_token_t<Executor>>
-auto async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    IteratorConnectToken&& token = default_completion_token_t<Executor>(),
-    constraint_t<!is_endpoint_sequence<Iterator>::value> = 0)
-  -> decltype(
-    async_initiate<IteratorConnectToken,
-      void (boost::system::error_code, Iterator)>(
-        declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, Iterator(),
-        declval<detail::default_connect_condition>()));
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+        token, endpoints, declval<detail::default_connect_condition>()))
+{
+  return async_initiate<RangeConnectToken,
+    void (boost::system::error_code, typename Protocol::endpoint)>(
+      detail::initiate_async_range_connect<Protocol, Executor>(s),
+      token, endpoints, detail::default_connect_condition());
+}
 
 /// Asynchronously establishes a socket connection by trying each endpoint in a
 /// sequence.
@@ -796,7 +684,7 @@ auto async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, Iterator) @endcode
@@ -830,14 +718,23 @@ auto async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
 template <typename Protocol, typename Executor, typename Iterator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       Iterator)) IteratorConnectToken = default_completion_token_t<Executor>>
-auto async_connect(
+inline auto async_connect(
     basic_socket<Protocol, Executor>& s, Iterator begin, Iterator end,
-    IteratorConnectToken&& token = default_completion_token_t<Executor>())
+    IteratorConnectToken&& token = default_completion_token_t<Executor>(),
+    constraint_t<
+      !is_connect_condition<IteratorConnectToken, Iterator>::value
+    > = 0)
   -> decltype(
     async_initiate<IteratorConnectToken,
       void (boost::system::error_code, Iterator)>(
         declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, end, declval<detail::default_connect_condition>()));
+        token, begin, end, declval<detail::default_connect_condition>()))
+{
+  return async_initiate<IteratorConnectToken,
+    void (boost::system::error_code, Iterator)>(
+      detail::initiate_async_iterator_connect<Protocol, Executor>(s),
+      token, begin, end, detail::default_connect_condition());
+}
 
 /// Asynchronously establishes a socket connection by trying each endpoint in a
 /// sequence.
@@ -882,7 +779,7 @@ auto async_connect(
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, typename Protocol::endpoint) @endcode
@@ -955,93 +852,27 @@ template <typename Protocol, typename Executor,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       typename Protocol::endpoint)) RangeConnectToken
         = default_completion_token_t<Executor>>
-auto async_connect(basic_socket<Protocol, Executor>& s,
+inline auto async_connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, ConnectCondition connect_condition,
     RangeConnectToken&& token = default_completion_token_t<Executor>(),
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value> = 0)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    > = 0,
+    constraint_t<
+      is_connect_condition<ConnectCondition,
+        decltype(declval<const EndpointSequence&>().begin())>::value
+    > = 0)
   -> decltype(
     async_initiate<RangeConnectToken,
       void (boost::system::error_code, typename Protocol::endpoint)>(
         declval<detail::initiate_async_range_connect<Protocol, Executor>>(),
-        token, endpoints, connect_condition));
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated: Use range overload.) Asynchronously establishes a socket
-/// connection by trying each endpoint in a sequence.
-/**
- * This function attempts to connect a socket to one of a sequence of
- * endpoints. It does this by repeated calls to the socket's @c async_connect
- * member function, once for each endpoint in the sequence, until a connection
- * is successfully established. It is an initiating function for an @ref
- * asynchronous_operation, and always returns immediately.
- *
- * @param s The socket to be connected. If the socket is already open, it will
- * be closed.
- *
- * @param begin An iterator pointing to the start of a sequence of endpoints.
- *
- * @param connect_condition A function object that is called prior to each
- * connection attempt. The signature of the function object must be:
- * @code bool connect_condition(
- *     const boost::system::error_code& ec,
- *     const typename Protocol::endpoint& next); @endcode
- * The @c ec parameter contains the result from the most recent connect
- * operation. Before the first connection attempt, @c ec is always set to
- * indicate success. The @c next parameter is the next endpoint to be tried.
- * The function object should return true if the next endpoint should be tried,
- * and false if it should be skipped.
- *
- * @param token The @ref completion_token that will be used to produce a
- * completion handler, which will be called when the connect completes.
- * Potential completion tokens include @ref use_future, @ref use_awaitable,
- * @ref yield_context, or a function object with the correct completion
- * signature. The function signature of the completion handler must be:
- * @code void handler(
- *   // Result of operation. if the sequence is empty, set to
- *   // boost::asio::error::not_found. Otherwise, contains the
- *   // error from the last connection attempt.
- *   const boost::system::error_code& error,
- *
- *   // On success, an iterator denoting the successfully
- *   // connected endpoint. Otherwise, the end iterator.
- *   Iterator iterator
- * ); @endcode
- * Regardless of whether the asynchronous operation completes immediately or
- * not, the completion handler will not be invoked from within this function.
- * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
- *
- * @par Completion Signature
- * @code void(boost::system::error_code, Iterator) @endcode
- *
- * @note This overload assumes that a default constructed object of type @c
- * Iterator represents the end of the sequence. This is a valid assumption for
- * iterator types such as @c boost::asio::ip::tcp::resolver::iterator.
- *
- * @par Per-Operation Cancellation
- * This asynchronous operation supports cancellation for the following
- * boost::asio::cancellation_type values:
- *
- * @li @c cancellation_type::terminal
- *
- * @li @c cancellation_type::partial
- *
- * if they are also supported by the socket's @c async_connect operation.
- */
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      Iterator)) IteratorConnectToken = default_completion_token_t<Executor>>
-auto async_connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, ConnectCondition connect_condition,
-    IteratorConnectToken&& token = default_completion_token_t<Executor>(),
-    constraint_t<!is_endpoint_sequence<Iterator>::value> = 0)
-  -> decltype(
-    async_initiate<IteratorConnectToken,
-      void (boost::system::error_code, Iterator)>(
-        declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, Iterator(), connect_condition));
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+        token, endpoints, connect_condition))
+{
+  return async_initiate<RangeConnectToken,
+    void (boost::system::error_code, typename Protocol::endpoint)>(
+      detail::initiate_async_range_connect<Protocol, Executor>(s),
+      token, endpoints, connect_condition);
+}
 
 /// Asynchronously establishes a socket connection by trying each endpoint in a
 /// sequence.
@@ -1088,7 +919,7 @@ auto async_connect(basic_socket<Protocol, Executor>& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, Iterator) @endcode
@@ -1161,14 +992,23 @@ template <typename Protocol, typename Executor,
     typename Iterator, typename ConnectCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       Iterator)) IteratorConnectToken = default_completion_token_t<Executor>>
-auto async_connect(basic_socket<Protocol, Executor>& s,
+inline auto async_connect(basic_socket<Protocol, Executor>& s,
     Iterator begin, Iterator end, ConnectCondition connect_condition,
-    IteratorConnectToken&& token = default_completion_token_t<Executor>())
+    IteratorConnectToken&& token = default_completion_token_t<Executor>(),
+    constraint_t<
+      is_connect_condition<ConnectCondition, Iterator>::value
+    > = 0)
   -> decltype(
     async_initiate<IteratorConnectToken,
       void (boost::system::error_code, Iterator)>(
         declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, end, connect_condition));
+        token, begin, end, connect_condition))
+{
+  return async_initiate<IteratorConnectToken,
+    void (boost::system::error_code, Iterator)>(
+      detail::initiate_async_iterator_connect<Protocol, Executor>(s),
+      token, begin, end, connect_condition);
+}
 
 /*@}*/
 
@@ -1179,4 +1019,4 @@ auto async_connect(basic_socket<Protocol, Executor>& s,
 
 #include <boost/asio/impl/connect.hpp>
 
-#endif
+#endif // BOOST_ASIO_CONNECT_HPP
diff --git a/inst/include/boost/asio/connect_pipe.hpp b/inst/include/boost/asio/connect_pipe.hpp
index 627d7b6fa..a872d5562 100644
--- a/inst/include/boost/asio/connect_pipe.hpp
+++ b/inst/include/boost/asio/connect_pipe.hpp
@@ -2,7 +2,7 @@
 // connect_pipe.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/consign.hpp b/inst/include/boost/asio/consign.hpp
index ca256c9bb..701f53a4a 100644
--- a/inst/include/boost/asio/consign.hpp
+++ b/inst/include/boost/asio/consign.hpp
@@ -2,7 +2,7 @@
 // consign.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/coroutine.hpp b/inst/include/boost/asio/coroutine.hpp
index 2f92a8b23..1bf63d2f4 100644
--- a/inst/include/boost/asio/coroutine.hpp
+++ b/inst/include/boost/asio/coroutine.hpp
@@ -2,7 +2,7 @@
 // coroutine.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -112,7 +112,7 @@ class coroutine_ref;
  *
  * @code yield
  * {
- *   mutable_buffers_1 b = buffer(*buffer_);
+ *   mutable_buffer b = buffer(*buffer_);
  *   socket_->async_read_some(b, *this);
  * } @endcode
  *
@@ -201,7 +201,7 @@ class coroutine_ref;
  * The @c fork pseudo-keyword is used when "forking" a coroutine, i.e. splitting
  * it into two (or more) copies. One use of @c fork is in a server, where a new
  * coroutine is created to handle each client connection:
- * 
+ *
  * @code reenter (this)
  * {
  *   do
@@ -212,9 +212,9 @@ class coroutine_ref;
  *   } while (is_parent());
  *   ... client-specific handling follows ...
  * } @endcode
- * 
+ *
  * The logical steps involved in a @c fork are:
- * 
+ *
  * @li @c fork saves the current state of the coroutine.
  * @li The statement creates a copy of the coroutine and either executes it
  *     immediately or schedules it for later execution.
@@ -259,7 +259,6 @@ class coroutine
   int value_;
 };
 
-
 namespace detail {
 
 class coroutine_ref
@@ -267,6 +266,7 @@ class coroutine_ref
 public:
   coroutine_ref(coroutine& c) : value_(c.value_), modified_(false) {}
   coroutine_ref(coroutine* c) : value_(c->value_), modified_(false) {}
+  coroutine_ref(const coroutine_ref&) = default;
   ~coroutine_ref() { if (!modified_) value_ = -1; }
   operator int() const { return value_; }
   int& operator=(int v) { modified_ = true; return value_ = v; }
diff --git a/inst/include/boost/asio/deadline_timer.hpp b/inst/include/boost/asio/deadline_timer.hpp
index 9bd02d001..c8e817f5e 100644
--- a/inst/include/boost/asio/deadline_timer.hpp
+++ b/inst/include/boost/asio/deadline_timer.hpp
@@ -2,7 +2,7 @@
 // deadline_timer.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,8 @@
 
 #include <boost/asio/detail/config.hpp>
 
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
   || defined(GENERATING_DOCUMENTATION)
 
@@ -28,7 +30,8 @@
 namespace boost {
 namespace asio {
 
-/// Typedef for the typical usage of timer. Uses a UTC clock.
+/// (Deprecated: Use system_timer.) Typedef for the typical usage of timer. Uses
+/// a UTC clock.
 typedef basic_deadline_timer<boost::posix_time::ptime> deadline_timer;
 
 } // namespace asio
@@ -37,4 +40,6 @@ typedef basic_deadline_timer<boost::posix_time::ptime> deadline_timer;
 #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
        // || defined(GENERATING_DOCUMENTATION)
 
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #endif // BOOST_ASIO_DEADLINE_TIMER_HPP
diff --git a/inst/include/boost/asio/default_completion_token.hpp b/inst/include/boost/asio/default_completion_token.hpp
new file mode 100644
index 000000000..f7a41ccff
--- /dev/null
+++ b/inst/include/boost/asio/default_completion_token.hpp
@@ -0,0 +1,91 @@
+//
+// default_completion_token.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_HPP
+#define BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+class deferred_t;
+
+namespace detail {
+
+template <typename T, typename = void>
+struct default_completion_token_impl
+{
+  typedef deferred_t type;
+};
+
+template <typename T>
+struct default_completion_token_impl<T,
+    void_t<typename T::default_completion_token_type>
+  >
+{
+  typedef typename T::default_completion_token_type type;
+};
+
+} // namespace detail
+
+#if defined(GENERATING_DOCUMENTATION)
+
+/// Traits type used to determine the default completion token type associated
+/// with a type (such as an executor).
+/**
+ * A program may specialise this traits type if the @c T template parameter in
+ * the specialisation is a user-defined type.
+ *
+ * Specialisations of this trait may provide a nested typedef @c type, which is
+ * a default-constructible completion token type.
+ *
+ * If not otherwise specialised, the default completion token type is
+ * boost::asio::deferred_t.
+ */
+template <typename T>
+struct default_completion_token
+{
+  /// If @c T has a nested type @c default_completion_token_type,
+  /// <tt>T::default_completion_token_type</tt>. Otherwise the typedef @c type
+  /// is boost::asio::deferred_t.
+  typedef see_below type;
+};
+#else
+template <typename T>
+struct default_completion_token
+  : detail::default_completion_token_impl<T>
+{
+};
+#endif
+
+template <typename T>
+using default_completion_token_t = typename default_completion_token<T>::type;
+
+#define BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(e) \
+  = typename ::boost::asio::default_completion_token<e>::type
+#define BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(e) \
+  = typename ::boost::asio::default_completion_token<e>::type()
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#include <boost/asio/deferred.hpp>
+
+#endif // BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_HPP
diff --git a/inst/include/boost/asio/defer.hpp b/inst/include/boost/asio/defer.hpp
index c66c951f9..4f4473e13 100644
--- a/inst/include/boost/asio/defer.hpp
+++ b/inst/include/boost/asio/defer.hpp
@@ -2,7 +2,7 @@
 // defer.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/deferred.hpp b/inst/include/boost/asio/deferred.hpp
index d1d936c26..dfb8e51fe 100644
--- a/inst/include/boost/asio/deferred.hpp
+++ b/inst/include/boost/asio/deferred.hpp
@@ -2,7 +2,7 @@
 // deferred.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -185,7 +185,7 @@ template <typename Function>
 class deferred_function
 {
 public:
-  /// Constructor. 
+  /// Constructor.
   template <typename F>
   constexpr explicit deferred_function(deferred_init_tag, F&& function)
     : function_(static_cast<F&&>(function))
@@ -326,7 +326,8 @@ class BOOST_ASIO_NODISCARD deferred_async_operation
       detail::index_sequence<I...>) const &
     -> decltype(
       async_initiate<CompletionToken, Signature>(
-        initiation_t(initiation_), token, std::get<I>(init_args_)...))
+        conditional_t<true, initiation_t, CompletionToken>(initiation_),
+        token, std::get<I>(init_args_)...))
   {
     return async_initiate<CompletionToken, Signature>(
         initiation_t(initiation_), token, std::get<I>(init_args_)...);
@@ -593,8 +594,11 @@ struct is_deferred<deferred_conditional<OnTrue, OnFalse>> : true_type
  * The deferred_t class is used to indicate that an asynchronous operation
  * should return a function object which is itself an initiation function. A
  * deferred_t object may be passed as a completion token to an asynchronous
- * operation, typically using the special value @c boost::asio::deferred. For
- * example:
+ * operation, typically as the default completion token:
+ *
+ * @code auto my_deferred_op = my_socket.async_read_some(my_buffer); @endcode
+ *
+ * or by explicitly passing the special value @c boost::asio::deferred:
  *
  * @code auto my_deferred_op
  *   = my_socket.async_read_some(my_buffer,
@@ -705,7 +709,7 @@ inline auto operator|(Head head, Tail&& tail)
 /**
  * See the documentation for boost::asio::deferred_t for a usage example.
  */
-constexpr deferred_t deferred;
+BOOST_ASIO_INLINE_VARIABLE constexpr deferred_t deferred;
 
 } // namespace asio
 } // namespace boost
diff --git a/inst/include/boost/asio/detached.hpp b/inst/include/boost/asio/detached.hpp
index 5c99137f4..d0dfce729 100644
--- a/inst/include/boost/asio/detached.hpp
+++ b/inst/include/boost/asio/detached.hpp
@@ -2,7 +2,7 @@
 // detached.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -39,7 +39,7 @@ namespace asio {
 class detached_t
 {
 public:
-  /// Constructor. 
+  /// Constructor.
   constexpr detached_t()
   {
   }
@@ -95,7 +95,7 @@ class detached_t
 /**
  * See the documentation for boost::asio::detached_t for a usage example.
  */
-constexpr detached_t detached;
+BOOST_ASIO_INLINE_VARIABLE constexpr detached_t detached;
 
 } // namespace asio
 } // namespace boost
diff --git a/inst/include/boost/asio/detail/array.hpp b/inst/include/boost/asio/detail/array.hpp
index 563330ed2..d2933e945 100644
--- a/inst/include/boost/asio/detail/array.hpp
+++ b/inst/include/boost/asio/detail/array.hpp
@@ -2,7 +2,7 @@
 // detail/array.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/array_fwd.hpp b/inst/include/boost/asio/detail/array_fwd.hpp
index 4f75b6c7e..7876b629e 100644
--- a/inst/include/boost/asio/detail/array_fwd.hpp
+++ b/inst/include/boost/asio/detail/array_fwd.hpp
@@ -2,7 +2,7 @@
 // detail/array_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/assert.hpp b/inst/include/boost/asio/detail/assert.hpp
index 964f61856..28c997009 100644
--- a/inst/include/boost/asio/detail/assert.hpp
+++ b/inst/include/boost/asio/detail/assert.hpp
@@ -2,7 +2,7 @@
 // detail/assert.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/atomic_count.hpp b/inst/include/boost/asio/detail/atomic_count.hpp
index 2885e2a3e..79cf9f205 100644
--- a/inst/include/boost/asio/detail/atomic_count.hpp
+++ b/inst/include/boost/asio/detail/atomic_count.hpp
@@ -2,7 +2,7 @@
 // detail/atomic_count.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/base_from_cancellation_state.hpp b/inst/include/boost/asio/detail/base_from_cancellation_state.hpp
index 7e03c1831..adc774338 100644
--- a/inst/include/boost/asio/detail/base_from_cancellation_state.hpp
+++ b/inst/include/boost/asio/detail/base_from_cancellation_state.hpp
@@ -2,7 +2,7 @@
 // detail/base_from_cancellation_state.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/base_from_completion_cond.hpp b/inst/include/boost/asio/detail/base_from_completion_cond.hpp
index 1460971eb..ee3882662 100644
--- a/inst/include/boost/asio/detail/base_from_completion_cond.hpp
+++ b/inst/include/boost/asio/detail/base_from_completion_cond.hpp
@@ -2,7 +2,7 @@
 // detail/base_from_completion_cond.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/bind_handler.hpp b/inst/include/boost/asio/detail/bind_handler.hpp
index 03d7c37c9..2c769ff42 100644
--- a/inst/include/boost/asio/detail/bind_handler.hpp
+++ b/inst/include/boost/asio/detail/bind_handler.hpp
@@ -2,7 +2,7 @@
 // detail/bind_handler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/blocking_executor_op.hpp b/inst/include/boost/asio/detail/blocking_executor_op.hpp
index c378a8bba..256d6bb80 100644
--- a/inst/include/boost/asio/detail/blocking_executor_op.hpp
+++ b/inst/include/boost/asio/detail/blocking_executor_op.hpp
@@ -2,7 +2,7 @@
 // detail/blocking_executor_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/buffer_resize_guard.hpp b/inst/include/boost/asio/detail/buffer_resize_guard.hpp
index e2f4040a5..3ac4e8227 100644
--- a/inst/include/boost/asio/detail/buffer_resize_guard.hpp
+++ b/inst/include/boost/asio/detail/buffer_resize_guard.hpp
@@ -2,7 +2,7 @@
 // detail/buffer_resize_guard.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/buffer_sequence_adapter.hpp b/inst/include/boost/asio/detail/buffer_sequence_adapter.hpp
index d67c2e8e4..6aad09294 100644
--- a/inst/include/boost/asio/detail/buffer_sequence_adapter.hpp
+++ b/inst/include/boost/asio/detail/buffer_sequence_adapter.hpp
@@ -2,7 +2,7 @@
 // detail/buffer_sequence_adapter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -386,146 +386,6 @@ class buffer_sequence_adapter<Buffer, boost::asio::const_buffer>
   std::size_t total_buffer_size_;
 };
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-template <typename Buffer>
-class buffer_sequence_adapter<Buffer, boost::asio::mutable_buffers_1>
-  : buffer_sequence_adapter_base
-{
-public:
-  enum { is_single_buffer = true };
-  enum { is_registered_buffer = false };
-
-  explicit buffer_sequence_adapter(
-      const boost::asio::mutable_buffers_1& buffer_sequence)
-  {
-    init_native_buffer(buffer_, Buffer(buffer_sequence));
-    total_buffer_size_ = buffer_sequence.size();
-  }
-
-  native_buffer_type* buffers()
-  {
-    return &buffer_;
-  }
-
-  std::size_t count() const
-  {
-    return 1;
-  }
-
-  std::size_t total_size() const
-  {
-    return total_buffer_size_;
-  }
-
-  registered_buffer_id registered_id() const
-  {
-    return registered_buffer_id();
-  }
-
-  bool all_empty() const
-  {
-    return total_buffer_size_ == 0;
-  }
-
-  static bool all_empty(const boost::asio::mutable_buffers_1& buffer_sequence)
-  {
-    return buffer_sequence.size() == 0;
-  }
-
-  static void validate(const boost::asio::mutable_buffers_1& buffer_sequence)
-  {
-    buffer_sequence.data();
-  }
-
-  static Buffer first(const boost::asio::mutable_buffers_1& buffer_sequence)
-  {
-    return Buffer(buffer_sequence);
-  }
-
-  enum { linearisation_storage_size = 1 };
-
-  static Buffer linearise(const boost::asio::mutable_buffers_1& buffer_sequence,
-      const Buffer&)
-  {
-    return Buffer(buffer_sequence);
-  }
-
-private:
-  native_buffer_type buffer_;
-  std::size_t total_buffer_size_;
-};
-
-template <typename Buffer>
-class buffer_sequence_adapter<Buffer, boost::asio::const_buffers_1>
-  : buffer_sequence_adapter_base
-{
-public:
-  enum { is_single_buffer = true };
-  enum { is_registered_buffer = false };
-
-  explicit buffer_sequence_adapter(
-      const boost::asio::const_buffers_1& buffer_sequence)
-  {
-    init_native_buffer(buffer_, Buffer(buffer_sequence));
-    total_buffer_size_ = buffer_sequence.size();
-  }
-
-  native_buffer_type* buffers()
-  {
-    return &buffer_;
-  }
-
-  std::size_t count() const
-  {
-    return 1;
-  }
-
-  std::size_t total_size() const
-  {
-    return total_buffer_size_;
-  }
-
-  registered_buffer_id registered_id() const
-  {
-    return registered_buffer_id();
-  }
-
-  bool all_empty() const
-  {
-    return total_buffer_size_ == 0;
-  }
-
-  static bool all_empty(const boost::asio::const_buffers_1& buffer_sequence)
-  {
-    return buffer_sequence.size() == 0;
-  }
-
-  static void validate(const boost::asio::const_buffers_1& buffer_sequence)
-  {
-    buffer_sequence.data();
-  }
-
-  static Buffer first(const boost::asio::const_buffers_1& buffer_sequence)
-  {
-    return Buffer(buffer_sequence);
-  }
-
-  enum { linearisation_storage_size = 1 };
-
-  static Buffer linearise(const boost::asio::const_buffers_1& buffer_sequence,
-      const Buffer&)
-  {
-    return Buffer(buffer_sequence);
-  }
-
-private:
-  native_buffer_type buffer_;
-  std::size_t total_buffer_size_;
-};
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Buffer>
 class buffer_sequence_adapter<Buffer, boost::asio::mutable_registered_buffer>
   : buffer_sequence_adapter_base
diff --git a/inst/include/boost/asio/detail/buffered_stream_storage.hpp b/inst/include/boost/asio/detail/buffered_stream_storage.hpp
index fc4d0ccce..096efc82f 100644
--- a/inst/include/boost/asio/detail/buffered_stream_storage.hpp
+++ b/inst/include/boost/asio/detail/buffered_stream_storage.hpp
@@ -2,7 +2,7 @@
 // detail/buffered_stream_storage.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -114,7 +114,7 @@ class buffered_stream_storage
 
   // The offset to the end of the unread data.
   size_type end_offset_;
-  
+
   // The data in the buffer.
   std::vector<byte_type> buffer_;
 };
diff --git a/inst/include/boost/asio/detail/call_stack.hpp b/inst/include/boost/asio/detail/call_stack.hpp
index 7e96fcd0d..110d4b7ec 100644
--- a/inst/include/boost/asio/detail/call_stack.hpp
+++ b/inst/include/boost/asio/detail/call_stack.hpp
@@ -2,7 +2,7 @@
 // detail/call_stack.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/chrono.hpp b/inst/include/boost/asio/detail/chrono.hpp
index a7e72eb8e..34db501d9 100644
--- a/inst/include/boost/asio/detail/chrono.hpp
+++ b/inst/include/boost/asio/detail/chrono.hpp
@@ -2,7 +2,7 @@
 // detail/chrono.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/chrono_time_traits.hpp b/inst/include/boost/asio/detail/chrono_time_traits.hpp
index e391f2259..e259db304 100644
--- a/inst/include/boost/asio/detail/chrono_time_traits.hpp
+++ b/inst/include/boost/asio/detail/chrono_time_traits.hpp
@@ -2,7 +2,7 @@
 // detail/chrono_time_traits.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/completion_handler.hpp b/inst/include/boost/asio/detail/completion_handler.hpp
index 9642cbfe5..ecca51f4f 100644
--- a/inst/include/boost/asio/detail/completion_handler.hpp
+++ b/inst/include/boost/asio/detail/completion_handler.hpp
@@ -2,7 +2,7 @@
 // detail/completion_handler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/completion_message.hpp b/inst/include/boost/asio/detail/completion_message.hpp
new file mode 100644
index 000000000..345deb210
--- /dev/null
+++ b/inst/include/boost/asio/detail/completion_message.hpp
@@ -0,0 +1,129 @@
+//
+// detail/completion_message.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DETAIL_COMPLETION_MESSAGE_HPP
+#define BOOST_ASIO_DETAIL_COMPLETION_MESSAGE_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <tuple>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/detail/utility.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Signature>
+class completion_message;
+
+template <typename R>
+class completion_message<R()>
+{
+public:
+  completion_message(int)
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    static_cast<Handler&&>(handler)();
+  }
+};
+
+template <typename R, typename Arg0>
+class completion_message<R(Arg0)>
+{
+public:
+  template <typename T0>
+  completion_message(int, T0&& t0)
+    : arg0_(static_cast<T0&&>(t0))
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    static_cast<Handler&&>(handler)(
+        static_cast<arg0_type&&>(arg0_));
+  }
+
+private:
+  typedef decay_t<Arg0> arg0_type;
+  arg0_type arg0_;
+};
+
+template <typename R, typename Arg0, typename Arg1>
+class completion_message<R(Arg0, Arg1)>
+{
+public:
+  template <typename T0, typename T1>
+  completion_message(int, T0&& t0, T1&& t1)
+    : arg0_(static_cast<T0&&>(t0)),
+      arg1_(static_cast<T1&&>(t1))
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    static_cast<Handler&&>(handler)(
+        static_cast<arg0_type&&>(arg0_),
+        static_cast<arg1_type&&>(arg1_));
+  }
+
+private:
+  typedef decay_t<Arg0> arg0_type;
+  arg0_type arg0_;
+  typedef decay_t<Arg1> arg1_type;
+  arg1_type arg1_;
+};
+
+template <typename R, typename... Args>
+class completion_message<R(Args...)>
+{
+public:
+  template <typename... T>
+  completion_message(int, T&&... t)
+    : args_(static_cast<T&&>(t)...)
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& h)
+  {
+    this->do_receive(h, boost::asio::detail::index_sequence_for<Args...>());
+  }
+
+private:
+  template <typename Handler, std::size_t... I>
+  void do_receive(Handler& h, boost::asio::detail::index_sequence<I...>)
+  {
+    static_cast<Handler&&>(h)(
+        std::get<I>(static_cast<args_type&&>(args_))...);
+  }
+
+  typedef std::tuple<decay_t<Args>...> args_type;
+  args_type args_;
+};
+
+} // namespace detail
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DETAIL_COMPLETION_MESSAGE_HPP
diff --git a/inst/include/boost/asio/detail/completion_payload.hpp b/inst/include/boost/asio/detail/completion_payload.hpp
new file mode 100644
index 000000000..1135bff3f
--- /dev/null
+++ b/inst/include/boost/asio/detail/completion_payload.hpp
@@ -0,0 +1,222 @@
+//
+// detail/completion_payload.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HPP
+#define BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/system/error_code.hpp>
+#include <boost/asio/detail/completion_message.hpp>
+
+#if defined(BOOST_ASIO_HAS_STD_VARIANT)
+# include <variant>
+#else // defined(BOOST_ASIO_HAS_STD_VARIANT)
+# include <new>
+#endif // defined(BOOST_ASIO_HAS_STD_VARIANT)
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename... Signatures>
+class completion_payload;
+
+template <typename R>
+class completion_payload<R()>
+{
+public:
+  explicit completion_payload(completion_message<R()>)
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    static_cast<Handler&&>(handler)();
+  }
+};
+
+template <typename Signature>
+class completion_payload<Signature>
+{
+public:
+  completion_payload(completion_message<Signature>&& m)
+    : message_(static_cast<completion_message<Signature>&&>(m))
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    message_.receive(handler);
+  }
+
+private:
+  completion_message<Signature> message_;
+};
+
+#if defined(BOOST_ASIO_HAS_STD_VARIANT)
+
+template <typename... Signatures>
+class completion_payload
+{
+public:
+  template <typename Signature>
+  completion_payload(completion_message<Signature>&& m)
+    : message_(static_cast<completion_message<Signature>&&>(m))
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    std::visit(
+        [&](auto& message)
+        {
+          message.receive(handler);
+        }, message_);
+  }
+
+private:
+  std::variant<completion_message<Signatures>...> message_;
+};
+
+#else // defined(BOOST_ASIO_HAS_STD_VARIANT)
+
+template <typename R1, typename R2>
+class completion_payload<R1(), R2(boost::system::error_code)>
+{
+public:
+  typedef completion_message<R1()> void_message_type;
+  typedef completion_message<R2(boost::system::error_code)> error_message_type;
+
+  completion_payload(void_message_type&&)
+    : message_(0, boost::system::error_code()),
+      empty_(true)
+  {
+  }
+
+  completion_payload(error_message_type&& m)
+    : message_(static_cast<error_message_type&&>(m)),
+      empty_(false)
+  {
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    if (empty_)
+      completion_message<R1()>(0).receive(handler);
+    else
+      message_.receive(handler);
+  }
+
+private:
+  error_message_type message_;
+  bool empty_;
+};
+
+template <typename Sig1, typename Sig2>
+class completion_payload<Sig1, Sig2>
+{
+public:
+  typedef completion_message<Sig1> message_1_type;
+  typedef completion_message<Sig2> message_2_type;
+
+  completion_payload(message_1_type&& m)
+    : index_(1)
+  {
+    new (&storage_.message_1_) message_1_type(static_cast<message_1_type&&>(m));
+  }
+
+  completion_payload(message_2_type&& m)
+    : index_(2)
+  {
+    new (&storage_.message_2_) message_2_type(static_cast<message_2_type&&>(m));
+  }
+
+  completion_payload(completion_payload&& other)
+    : index_(other.index_)
+  {
+    switch (index_)
+    {
+    case 1:
+      new (&storage_.message_1_) message_1_type(
+          static_cast<message_1_type&&>(other.storage_.message_1_));
+      break;
+    case 2:
+      new (&storage_.message_2_) message_2_type(
+          static_cast<message_2_type&&>(other.storage_.message_2_));
+      break;
+    default:
+      break;
+    }
+  }
+
+  ~completion_payload()
+  {
+    switch (index_)
+    {
+    case 1:
+      storage_.message_1_.~message_1_type();
+      break;
+    case 2:
+      storage_.message_2_.~message_2_type();
+      break;
+    default:
+      break;
+    }
+  }
+
+  template <typename Handler>
+  void receive(Handler& handler)
+  {
+    switch (index_)
+    {
+    case 1:
+      storage_.message_1_.receive(handler);
+      break;
+    case 2:
+      storage_.message_2_.receive(handler);
+      break;
+    default:
+      break;
+    }
+  }
+
+private:
+  union storage
+  {
+    storage() {}
+    ~storage() {}
+
+    char dummy_;
+    message_1_type message_1_;
+    message_2_type message_2_;
+  } storage_;
+  unsigned char index_;
+};
+
+#endif // defined(BOOST_ASIO_HAS_STD_VARIANT)
+
+} // namespace detail
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HPP
diff --git a/inst/include/boost/asio/detail/completion_payload_handler.hpp b/inst/include/boost/asio/detail/completion_payload_handler.hpp
new file mode 100644
index 000000000..db08b2501
--- /dev/null
+++ b/inst/include/boost/asio/detail/completion_payload_handler.hpp
@@ -0,0 +1,81 @@
+//
+// detail/completion_payload_handler.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HANDLER_HPP
+#define BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HANDLER_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/associator.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Payload, typename Handler>
+class completion_payload_handler
+{
+public:
+  completion_payload_handler(Payload&& p, Handler& h)
+    : payload_(static_cast<Payload&&>(p)),
+      handler_(static_cast<Handler&&>(h))
+  {
+  }
+
+  void operator()()
+  {
+    payload_.receive(handler_);
+  }
+
+  Handler& handler()
+  {
+    return handler_;
+  }
+
+//private:
+  Payload payload_;
+  Handler handler_;
+};
+
+} // namespace detail
+
+template <template <typename, typename> class Associator,
+    typename Payload, typename Handler, typename DefaultCandidate>
+struct associator<Associator,
+    detail::completion_payload_handler<Payload, Handler>,
+    DefaultCandidate>
+  : Associator<Handler, DefaultCandidate>
+{
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::completion_payload_handler<Payload, Handler>& h) noexcept
+  {
+    return Associator<Handler, DefaultCandidate>::get(h.handler_);
+  }
+
+  static auto get(
+      const detail::completion_payload_handler<Payload, Handler>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
+  {
+    return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
+  }
+};
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HANDLER_HPP
diff --git a/inst/include/boost/asio/detail/composed_work.hpp b/inst/include/boost/asio/detail/composed_work.hpp
index c22cba9e7..19284359b 100644
--- a/inst/include/boost/asio/detail/composed_work.hpp
+++ b/inst/include/boost/asio/detail/composed_work.hpp
@@ -2,7 +2,7 @@
 // detail/composed_work.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/concurrency_hint.hpp b/inst/include/boost/asio/detail/concurrency_hint.hpp
index 30d90b2ed..3efcfeb08 100644
--- a/inst/include/boost/asio/detail/concurrency_hint.hpp
+++ b/inst/include/boost/asio/detail/concurrency_hint.hpp
@@ -2,7 +2,7 @@
 // detail/concurrency_hint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/conditionally_enabled_event.hpp b/inst/include/boost/asio/detail/conditionally_enabled_event.hpp
index d4b6585c6..aa8a6b3df 100644
--- a/inst/include/boost/asio/detail/conditionally_enabled_event.hpp
+++ b/inst/include/boost/asio/detail/conditionally_enabled_event.hpp
@@ -2,7 +2,7 @@
 // detail/conditionally_enabled_event.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/conditionally_enabled_mutex.hpp b/inst/include/boost/asio/detail/conditionally_enabled_mutex.hpp
index 3046c64f7..79824695f 100644
--- a/inst/include/boost/asio/detail/conditionally_enabled_mutex.hpp
+++ b/inst/include/boost/asio/detail/conditionally_enabled_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/conditionally_enabled_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -71,6 +71,14 @@ class conditionally_enabled_mutex
     {
       if (mutex_.enabled_ && !locked_)
       {
+        for (int n = mutex_.spin_count_; n != 0; n -= (n > 0) ? 1 : 0)
+        {
+          if (mutex_.mutex_.try_lock())
+          {
+            locked_ = true;
+            return;
+          }
+        }
         mutex_.mutex_.lock();
         locked_ = true;
       }
@@ -105,8 +113,9 @@ class conditionally_enabled_mutex
   };
 
   // Constructor.
-  explicit conditionally_enabled_mutex(bool enabled)
-    : enabled_(enabled)
+  explicit conditionally_enabled_mutex(bool enabled, int spin_count = 0)
+    : spin_count_(spin_count),
+      enabled_(enabled)
   {
   }
 
@@ -121,11 +130,22 @@ class conditionally_enabled_mutex
     return enabled_;
   }
 
+  // Get the spin count.
+  int spin_count() const
+  {
+    return spin_count_;
+  }
+
   // Lock the mutex.
   void lock()
   {
     if (enabled_)
+    {
+      for (int n = spin_count_; n != 0; n -= (n > 0) ? 1 : 0)
+        if (mutex_.try_lock())
+          return;
       mutex_.lock();
+    }
   }
 
   // Unlock the mutex.
@@ -139,6 +159,7 @@ class conditionally_enabled_mutex
   friend class scoped_lock;
   friend class conditionally_enabled_event;
   boost::asio::detail::mutex mutex_;
+  const int spin_count_;
   const bool enabled_;
 };
 
diff --git a/inst/include/boost/asio/detail/config.hpp b/inst/include/boost/asio/detail/config.hpp
index c4e5fefbe..6d4688b8c 100644
--- a/inst/include/boost/asio/detail/config.hpp
+++ b/inst/include/boost/asio/detail/config.hpp
@@ -2,7 +2,7 @@
 // detail/config.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -341,6 +341,19 @@
 # endif // !defined(BOOST_ASIO_DISABLE_VARIADIC_LAMBDA_CAPTURES)
 #endif // !defined(BOOST_ASIO_HAS_VARIADIC_LAMBDA_CAPTURES)
 
+// Support for inline variables.
+#if !defined(BOOST_ASIO_HAS_INLINE_VARIABLES)
+# if !defined(BOOST_ASIO_DISABLE_INLINE_VARIABLES)
+#  if (__cplusplus >= 201703) && (__cpp_inline_variables >= 201606)
+#   define BOOST_ASIO_HAS_INLINE_VARIABLES 1
+#   define BOOST_ASIO_INLINE_VARIABLE inline
+#  endif // (__cplusplus >= 201703) && (__cpp_inline_variables >= 201606)
+# endif // !defined(BOOST_ASIO_DISABLE_INLINE_VARIABLES)
+#endif // !defined(BOOST_ASIO_HAS_INLINE_VARIABLES)
+#if !defined(BOOST_ASIO_INLINE_VARIABLE)
+# define BOOST_ASIO_INLINE_VARIABLE
+#endif // !defined(BOOST_ASIO_INLINE_VARIABLE)
+
 // Default alignment.
 #if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
 # define BOOST_ASIO_DEFAULT_ALIGN __STDCPP_DEFAULT_NEW_ALIGNMENT__
@@ -362,7 +375,9 @@
 #    if defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
 #     if (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC) \
         && !defined(_LIBCPP_MSVCRT) && !defined(__MINGW32__)
-#      if defined(__APPLE__)
+#      if defined(__ANDROID__) && (__ANDROID_API__ >= 28)
+#        define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
+#      elif defined(__APPLE__)
 #       if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #        if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #         define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
@@ -424,13 +439,6 @@
 # endif // !defined(BOOST_ASIO_DISABLE_BOOST_DATE_TIME)
 #endif // !defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
-// Boost support for the Coroutine library.
-#if !defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-# if !defined(BOOST_ASIO_DISABLE_BOOST_COROUTINE)
-#  define BOOST_ASIO_HAS_BOOST_COROUTINE 1
-# endif // !defined(BOOST_ASIO_DISABLE_BOOST_COROUTINE)
-#endif // !defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-
 // Boost support for the Context library's fibers.
 #if !defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
 # if !defined(BOOST_ASIO_DISABLE_BOOST_CONTEXT_FIBER)
@@ -532,9 +540,9 @@
 #    define BOOST_ASIO_HAS_STD_INVOKE_RESULT 1
 #   endif // (_MSC_VER >= 1911 && _MSVC_LANG >= 201703)
 #  else // defined(BOOST_ASIO_MSVC)
-#   if (__cplusplus >= 201703)
+#   if (__cplusplus >= 201703) && (__cpp_lib_is_invocable >= 201703)
 #    define BOOST_ASIO_HAS_STD_INVOKE_RESULT 1
-#   endif // (__cplusplus >= 201703)
+#   endif // (__cplusplus >= 201703) && (__cpp_lib_is_invocable >= 201703)
 #  endif // defined(BOOST_ASIO_MSVC)
 # endif // !defined(BOOST_ASIO_DISABLE_STD_INVOKE_RESULT)
 #endif // !defined(BOOST_ASIO_HAS_STD_INVOKE_RESULT)
@@ -1275,7 +1283,10 @@
 // Support the co_await keyword on compilers known to allow it.
 #if !defined(BOOST_ASIO_HAS_CO_AWAIT)
 # if !defined(BOOST_ASIO_DISABLE_CO_AWAIT)
-#  if defined(BOOST_ASIO_MSVC)
+#  if (__cplusplus >= 202002) \
+     && (__cpp_impl_coroutine >= 201902) && (__cpp_lib_coroutine >= 201902)
+#   define BOOST_ASIO_HAS_CO_AWAIT 1
+#  elif defined(BOOST_ASIO_MSVC)
 #   if (_MSC_VER >= 1928) && (_MSVC_LANG >= 201705) && !defined(__clang__)
 #    define BOOST_ASIO_HAS_CO_AWAIT 1
 #   elif (_MSC_FULL_VER >= 190023506)
@@ -1386,11 +1397,9 @@
 // Standard library support for snprintf.
 #if !defined(BOOST_ASIO_HAS_SNPRINTF)
 # if !defined(BOOST_ASIO_DISABLE_SNPRINTF)
-#  if defined(__apple_build_version__)
-#    if (__clang_major__ >= 14)
-#     define BOOST_ASIO_HAS_SNPRINTF 1
-#    endif // (__clang_major__ >= 14)
-#  endif // defined(__apple_build_version__)
+#  if defined(__APPLE__)
+#   define BOOST_ASIO_HAS_SNPRINTF 1
+#  endif // defined(__APPLE__)
 # endif // !defined(BOOST_ASIO_DISABLE_SNPRINTF)
 #endif // !defined(BOOST_ASIO_HAS_SNPRINTF)
 
diff --git a/inst/include/boost/asio/detail/consuming_buffers.hpp b/inst/include/boost/asio/detail/consuming_buffers.hpp
index fea82aae6..aad51165b 100644
--- a/inst/include/boost/asio/detail/consuming_buffers.hpp
+++ b/inst/include/boost/asio/detail/consuming_buffers.hpp
@@ -2,7 +2,7 @@
 // detail/consuming_buffers.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -198,75 +198,37 @@ class consuming_single_buffer
 
 template <>
 class consuming_buffers<mutable_buffer, mutable_buffer, const mutable_buffer*>
-  : public consuming_single_buffer<BOOST_ASIO_MUTABLE_BUFFER>
+  : public consuming_single_buffer<mutable_buffer>
 {
 public:
   explicit consuming_buffers(const mutable_buffer& buffer)
-    : consuming_single_buffer<BOOST_ASIO_MUTABLE_BUFFER>(buffer)
+    : consuming_single_buffer<mutable_buffer>(buffer)
   {
   }
 };
 
 template <>
 class consuming_buffers<const_buffer, mutable_buffer, const mutable_buffer*>
-  : public consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>
+  : public consuming_single_buffer<const_buffer>
 {
 public:
   explicit consuming_buffers(const mutable_buffer& buffer)
-    : consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>(buffer)
+    : consuming_single_buffer<const_buffer>(buffer)
   {
   }
 };
 
 template <>
 class consuming_buffers<const_buffer, const_buffer, const const_buffer*>
-  : public consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>
+  : public consuming_single_buffer<const_buffer>
 {
 public:
   explicit consuming_buffers(const const_buffer& buffer)
-    : consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>(buffer)
+    : consuming_single_buffer<const_buffer>(buffer)
   {
   }
 };
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-template <>
-class consuming_buffers<mutable_buffer,
-    mutable_buffers_1, const mutable_buffer*>
-  : public consuming_single_buffer<BOOST_ASIO_MUTABLE_BUFFER>
-{
-public:
-  explicit consuming_buffers(const mutable_buffers_1& buffer)
-    : consuming_single_buffer<BOOST_ASIO_MUTABLE_BUFFER>(buffer)
-  {
-  }
-};
-
-template <>
-class consuming_buffers<const_buffer, mutable_buffers_1, const mutable_buffer*>
-  : public consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>
-{
-public:
-  explicit consuming_buffers(const mutable_buffers_1& buffer)
-    : consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>(buffer)
-  {
-  }
-};
-
-template <>
-class consuming_buffers<const_buffer, const_buffers_1, const const_buffer*>
-  : public consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>
-{
-public:
-  explicit consuming_buffers(const const_buffers_1& buffer)
-    : consuming_single_buffer<BOOST_ASIO_CONST_BUFFER>(buffer)
-  {
-  }
-};
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <>
 class consuming_buffers<mutable_buffer,
     mutable_registered_buffer, const mutable_buffer*>
diff --git a/inst/include/boost/asio/detail/cstddef.hpp b/inst/include/boost/asio/detail/cstddef.hpp
index 2af3753d2..feb741c21 100644
--- a/inst/include/boost/asio/detail/cstddef.hpp
+++ b/inst/include/boost/asio/detail/cstddef.hpp
@@ -2,7 +2,7 @@
 // detail/cstddef.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/cstdint.hpp b/inst/include/boost/asio/detail/cstdint.hpp
index 0bd502cff..4b199780f 100644
--- a/inst/include/boost/asio/detail/cstdint.hpp
+++ b/inst/include/boost/asio/detail/cstdint.hpp
@@ -2,7 +2,7 @@
 // detail/cstdint.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/date_time_fwd.hpp b/inst/include/boost/asio/detail/date_time_fwd.hpp
index 38eabde05..a118c4be8 100644
--- a/inst/include/boost/asio/detail/date_time_fwd.hpp
+++ b/inst/include/boost/asio/detail/date_time_fwd.hpp
@@ -2,7 +2,7 @@
 // detail/date_time_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/deadline_timer_service.hpp b/inst/include/boost/asio/detail/deadline_timer_service.hpp
index 09e281b8a..72059ce72 100644
--- a/inst/include/boost/asio/detail/deadline_timer_service.hpp
+++ b/inst/include/boost/asio/detail/deadline_timer_service.hpp
@@ -2,7 +2,7 @@
 // detail/deadline_timer_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -104,7 +104,11 @@ class deadline_timer_service
   void move_construct(implementation_type& impl,
       implementation_type& other_impl)
   {
-    scheduler_.move_timer(timer_queue_, impl.timer_data, other_impl.timer_data);
+    if (other_impl.might_have_pending_waits)
+    {
+      scheduler_.move_timer(timer_queue_,
+          impl.timer_data, other_impl.timer_data);
+    }
 
     impl.expiry = other_impl.expiry;
     other_impl.expiry = time_type();
diff --git a/inst/include/boost/asio/detail/dependent_type.hpp b/inst/include/boost/asio/detail/dependent_type.hpp
index 069465af2..7fb5a3db7 100644
--- a/inst/include/boost/asio/detail/dependent_type.hpp
+++ b/inst/include/boost/asio/detail/dependent_type.hpp
@@ -2,7 +2,7 @@
 // detail/dependent_type.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/descriptor_ops.hpp b/inst/include/boost/asio/detail/descriptor_ops.hpp
index 6413a5db0..5949747e9 100644
--- a/inst/include/boost/asio/detail/descriptor_ops.hpp
+++ b/inst/include/boost/asio/detail/descriptor_ops.hpp
@@ -2,7 +2,7 @@
 // detail/descriptor_ops.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/descriptor_read_op.hpp b/inst/include/boost/asio/detail/descriptor_read_op.hpp
index 0724c0e11..85bf74e04 100644
--- a/inst/include/boost/asio/detail/descriptor_read_op.hpp
+++ b/inst/include/boost/asio/detail/descriptor_read_op.hpp
@@ -2,7 +2,7 @@
 // detail/descriptor_read_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/descriptor_write_op.hpp b/inst/include/boost/asio/detail/descriptor_write_op.hpp
index 436d0f5f4..ae86443ed 100644
--- a/inst/include/boost/asio/detail/descriptor_write_op.hpp
+++ b/inst/include/boost/asio/detail/descriptor_write_op.hpp
@@ -2,7 +2,7 @@
 // detail/descriptor_write_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/dev_poll_reactor.hpp b/inst/include/boost/asio/detail/dev_poll_reactor.hpp
index 97a66f04d..68a172db9 100644
--- a/inst/include/boost/asio/detail/dev_poll_reactor.hpp
+++ b/inst/include/boost/asio/detail/dev_poll_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/dev_poll_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/epoll_reactor.hpp b/inst/include/boost/asio/detail/epoll_reactor.hpp
index 7947641f5..bcc1a784f 100644
--- a/inst/include/boost/asio/detail/epoll_reactor.hpp
+++ b/inst/include/boost/asio/detail/epoll_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/epoll_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -72,7 +72,7 @@ class epoll_reactor
     bool try_speculative_[max_ops];
     bool shutdown_;
 
-    BOOST_ASIO_DECL descriptor_state(bool locking);
+    BOOST_ASIO_DECL descriptor_state(bool locking, int spin_count);
     void set_ready_events(uint32_t events) { task_result_ = events; }
     void add_ready_events(uint32_t events) { task_result_ |= events; }
     BOOST_ASIO_DECL operation* perform_io(uint32_t events);
@@ -270,6 +270,12 @@ class epoll_reactor
   // Whether the service has been shut down.
   bool shutdown_;
 
+  // Whether I/O locking is enabled.
+  const bool io_locking_;
+
+  // How any times to spin waiting for the I/O mutex.
+  const int io_locking_spin_count_;
+
   // Mutex to protect access to the registered descriptors.
   mutex registered_descriptors_mutex_;
 
diff --git a/inst/include/boost/asio/detail/event.hpp b/inst/include/boost/asio/detail/event.hpp
index 5d99137a9..84f7b6829 100644
--- a/inst/include/boost/asio/detail/event.hpp
+++ b/inst/include/boost/asio/detail/event.hpp
@@ -2,7 +2,7 @@
 // detail/event.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/eventfd_select_interrupter.hpp b/inst/include/boost/asio/detail/eventfd_select_interrupter.hpp
index 4a9761209..18ffb757b 100644
--- a/inst/include/boost/asio/detail/eventfd_select_interrupter.hpp
+++ b/inst/include/boost/asio/detail/eventfd_select_interrupter.hpp
@@ -2,7 +2,7 @@
 // detail/eventfd_select_interrupter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/exception.hpp b/inst/include/boost/asio/detail/exception.hpp
index d0a1e8e2b..2636ea59c 100644
--- a/inst/include/boost/asio/detail/exception.hpp
+++ b/inst/include/boost/asio/detail/exception.hpp
@@ -2,7 +2,7 @@
 // detail/exception.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/executor_function.hpp b/inst/include/boost/asio/detail/executor_function.hpp
index 8e383400d..fd111e633 100644
--- a/inst/include/boost/asio/detail/executor_function.hpp
+++ b/inst/include/boost/asio/detail/executor_function.hpp
@@ -2,7 +2,7 @@
 // detail/executor_function.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/executor_op.hpp b/inst/include/boost/asio/detail/executor_op.hpp
index dace98c2e..6e80ea93d 100644
--- a/inst/include/boost/asio/detail/executor_op.hpp
+++ b/inst/include/boost/asio/detail/executor_op.hpp
@@ -2,7 +2,7 @@
 // detail/executor_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/fd_set_adapter.hpp b/inst/include/boost/asio/detail/fd_set_adapter.hpp
index b4191a82e..7e6e3f218 100644
--- a/inst/include/boost/asio/detail/fd_set_adapter.hpp
+++ b/inst/include/boost/asio/detail/fd_set_adapter.hpp
@@ -2,7 +2,7 @@
 // detail/fd_set_adapter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/fenced_block.hpp b/inst/include/boost/asio/detail/fenced_block.hpp
index ac3724d54..4d10ab6a6 100644
--- a/inst/include/boost/asio/detail/fenced_block.hpp
+++ b/inst/include/boost/asio/detail/fenced_block.hpp
@@ -2,7 +2,7 @@
 // detail/fenced_block.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/functional.hpp b/inst/include/boost/asio/detail/functional.hpp
index 847c5115a..cc7ff1333 100644
--- a/inst/include/boost/asio/detail/functional.hpp
+++ b/inst/include/boost/asio/detail/functional.hpp
@@ -2,7 +2,7 @@
 // detail/functional.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/future.hpp b/inst/include/boost/asio/detail/future.hpp
index 518867ff5..f98c1e89c 100644
--- a/inst/include/boost/asio/detail/future.hpp
+++ b/inst/include/boost/asio/detail/future.hpp
@@ -2,7 +2,7 @@
 // detail/future.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/global.hpp b/inst/include/boost/asio/detail/global.hpp
index d6b757f88..9ed7e9e31 100644
--- a/inst/include/boost/asio/detail/global.hpp
+++ b/inst/include/boost/asio/detail/global.hpp
@@ -2,7 +2,7 @@
 // detail/global.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/handler_alloc_helpers.hpp b/inst/include/boost/asio/detail/handler_alloc_helpers.hpp
index 57af59fd8..6c0a37ca3 100644
--- a/inst/include/boost/asio/detail/handler_alloc_helpers.hpp
+++ b/inst/include/boost/asio/detail/handler_alloc_helpers.hpp
@@ -2,7 +2,7 @@
 // detail/handler_alloc_helpers.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,121 +17,12 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/memory.hpp>
-#include <boost/asio/detail/noncopyable.hpp>
 #include <boost/asio/detail/recycling_allocator.hpp>
-#include <boost/asio/detail/thread_info_base.hpp>
 #include <boost/asio/associated_allocator.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
-namespace boost {
-namespace asio {
-namespace detail {
-
-inline void* default_allocate(std::size_t s,
-    std::size_t align = BOOST_ASIO_DEFAULT_ALIGN)
-{
-#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  return boost::asio::detail::thread_info_base::allocate(
-      boost::asio::detail::thread_context::top_of_thread_call_stack(),
-      s, align);
-#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  return boost::asio::aligned_new(align, s);
-#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-}
-
-inline void default_deallocate(void* p, std::size_t s)
-{
-#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  boost::asio::detail::thread_info_base::deallocate(
-      boost::asio::detail::thread_context::top_of_thread_call_stack(), p, s);
-#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  (void)s;
-  boost::asio::aligned_delete(p);
-#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-}
-
-template <typename T>
-class default_allocator
-{
-public:
-  typedef T value_type;
-
-  template <typename U>
-  struct rebind
-  {
-    typedef default_allocator<U> other;
-  };
-
-  default_allocator() noexcept
-  {
-  }
-
-  template <typename U>
-  default_allocator(const default_allocator<U>&) noexcept
-  {
-  }
-
-  T* allocate(std::size_t n)
-  {
-    return static_cast<T*>(default_allocate(sizeof(T) * n, alignof(T)));
-  }
-
-  void deallocate(T* p, std::size_t n)
-  {
-    default_deallocate(p, sizeof(T) * n);
-  }
-};
-
-template <>
-class default_allocator<void>
-{
-public:
-  typedef void value_type;
-
-  template <typename U>
-  struct rebind
-  {
-    typedef default_allocator<U> other;
-  };
-
-  default_allocator() noexcept
-  {
-  }
-
-  template <typename U>
-  default_allocator(const default_allocator<U>&) noexcept
-  {
-  }
-};
-
-template <typename Allocator>
-struct get_default_allocator
-{
-  typedef Allocator type;
-
-  static type get(const Allocator& a)
-  {
-    return a;
-  }
-};
-
-template <typename T>
-struct get_default_allocator<std::allocator<T>>
-{
-  typedef default_allocator<T> type;
-
-  static type get(const std::allocator<T>&)
-  {
-    return type();
-  }
-};
-
-} // namespace detail
-} // namespace asio
-} // namespace boost
-
-#define BOOST_ASIO_DEFINE_HANDLER_PTR(op) \
+#define BOOST_ASIO_DEFINE_TAGGED_HANDLER_PTR(purpose, op) \
   struct ptr \
   { \
     Handler* h; \
@@ -145,11 +36,11 @@ struct get_default_allocator<std::allocator<T>>
     { \
       typedef typename ::boost::asio::associated_allocator< \
         Handler>::type associated_allocator_type; \
-      typedef typename ::boost::asio::detail::get_default_allocator< \
-        associated_allocator_type>::type default_allocator_type; \
+      typedef typename ::boost::asio::detail::get_recycling_allocator< \
+        associated_allocator_type, purpose>::type default_allocator_type; \
       BOOST_ASIO_REBIND_ALLOC(default_allocator_type, op) a( \
-            ::boost::asio::detail::get_default_allocator< \
-              associated_allocator_type>::get( \
+            ::boost::asio::detail::get_recycling_allocator< \
+              associated_allocator_type, purpose>::get( \
                 ::boost::asio::get_associated_allocator(handler))); \
       return a.allocate(1); \
     } \
@@ -164,11 +55,11 @@ struct get_default_allocator<std::allocator<T>>
       { \
         typedef typename ::boost::asio::associated_allocator< \
           Handler>::type associated_allocator_type; \
-        typedef typename ::boost::asio::detail::get_default_allocator< \
-          associated_allocator_type>::type default_allocator_type; \
+        typedef typename ::boost::asio::detail::get_recycling_allocator< \
+          associated_allocator_type, purpose>::type default_allocator_type; \
         BOOST_ASIO_REBIND_ALLOC(default_allocator_type, op) a( \
-              ::boost::asio::detail::get_default_allocator< \
-                associated_allocator_type>::get( \
+              ::boost::asio::detail::get_recycling_allocator< \
+                associated_allocator_type, purpose>::get( \
                   ::boost::asio::get_associated_allocator(*h))); \
         a.deallocate(static_cast<op*>(v), 1); \
         v = 0; \
@@ -177,6 +68,11 @@ struct get_default_allocator<std::allocator<T>>
   } \
   /**/
 
+#define BOOST_ASIO_DEFINE_HANDLER_PTR(op) \
+  BOOST_ASIO_DEFINE_TAGGED_HANDLER_PTR( \
+      ::boost::asio::detail::thread_info_base::default_tag, op ) \
+  /**/
+
 #define BOOST_ASIO_DEFINE_TAGGED_HANDLER_ALLOCATOR_PTR(purpose, op) \
   struct ptr \
   { \
diff --git a/inst/include/boost/asio/detail/handler_cont_helpers.hpp b/inst/include/boost/asio/detail/handler_cont_helpers.hpp
index c5976801c..121323021 100644
--- a/inst/include/boost/asio/detail/handler_cont_helpers.hpp
+++ b/inst/include/boost/asio/detail/handler_cont_helpers.hpp
@@ -2,7 +2,7 @@
 // detail/handler_cont_helpers.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/handler_tracking.hpp b/inst/include/boost/asio/detail/handler_tracking.hpp
index 8b13117b6..e1be43991 100644
--- a/inst/include/boost/asio/detail/handler_tracking.hpp
+++ b/inst/include/boost/asio/detail/handler_tracking.hpp
@@ -2,7 +2,7 @@
 // detail/handler_tracking.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/handler_type_requirements.hpp b/inst/include/boost/asio/detail/handler_type_requirements.hpp
index a64afd989..035ecafc6 100644
--- a/inst/include/boost/asio/detail/handler_type_requirements.hpp
+++ b/inst/include/boost/asio/detail/handler_type_requirements.hpp
@@ -2,7 +2,7 @@
 // detail/handler_type_requirements.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -125,28 +125,6 @@ struct handler_type_requirements
 {
 };
 
-#define BOOST_ASIO_LEGACY_COMPLETION_HANDLER_CHECK( \
-    handler_type, handler) \
-  \
-  typedef BOOST_ASIO_HANDLER_TYPE(handler_type, \
-      void()) asio_true_handler_type; \
-  \
-  BOOST_ASIO_HANDLER_TYPE_REQUIREMENTS_ASSERT( \
-      sizeof(boost::asio::detail::zero_arg_copyable_handler_test( \
-          boost::asio::detail::clvref< \
-            asio_true_handler_type>(), 0)) == 1, \
-      "CompletionHandler type requirements not met") \
-  \
-  typedef boost::asio::detail::handler_type_requirements< \
-      sizeof( \
-        boost::asio::detail::argbyv( \
-          boost::asio::detail::clvref< \
-            asio_true_handler_type>())) + \
-      sizeof( \
-        boost::asio::detail::rorlvref< \
-          asio_true_handler_type>()(), \
-        char(0))> BOOST_ASIO_UNUSED_TYPEDEF
-
 #define BOOST_ASIO_READ_HANDLER_CHECK( \
     handler_type, handler) \
   \
diff --git a/inst/include/boost/asio/detail/handler_work.hpp b/inst/include/boost/asio/detail/handler_work.hpp
index 5464b00a5..493bb3955 100644
--- a/inst/include/boost/asio/detail/handler_work.hpp
+++ b/inst/include/boost/asio/detail/handler_work.hpp
@@ -2,7 +2,7 @@
 // detail/handler_work.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/hash_map.hpp b/inst/include/boost/asio/detail/hash_map.hpp
index 98d17a43f..653ca0cd0 100644
--- a/inst/include/boost/asio/detail/hash_map.hpp
+++ b/inst/include/boost/asio/detail/hash_map.hpp
@@ -2,7 +2,7 @@
 // detail/hash_map.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/buffer_sequence_adapter.ipp b/inst/include/boost/asio/detail/impl/buffer_sequence_adapter.ipp
index 3e072b3c3..6cca83a4c 100644
--- a/inst/include/boost/asio/detail/impl/buffer_sequence_adapter.ipp
+++ b/inst/include/boost/asio/detail/impl/buffer_sequence_adapter.ipp
@@ -2,7 +2,7 @@
 // detail/impl/buffer_sequence_adapter.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/descriptor_ops.ipp b/inst/include/boost/asio/detail/impl/descriptor_ops.ipp
index c9d0d8752..b60835bc0 100644
--- a/inst/include/boost/asio/detail/impl/descriptor_ops.ipp
+++ b/inst/include/boost/asio/detail/impl/descriptor_ops.ipp
@@ -2,7 +2,7 @@
 // detail/impl/descriptor_ops.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -70,18 +70,24 @@ int close(int d, state_type& state, boost::system::error_code& ec)
         ::fcntl(d, F_SETFL, flags & ~O_NONBLOCK);
 #else // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
       ioctl_arg_type arg = 0;
+      if ((state & possible_dup) == 0)
+      {
+        result = ::ioctl(d, FIONBIO, &arg);
+        get_last_error(ec, result < 0);
+      }
+      if ((state & possible_dup) != 0
 # if defined(ENOTTY)
-      result = ::ioctl(d, FIONBIO, &arg);
-      get_last_error(ec, result < 0);
-      if (ec.value() == ENOTTY)
+          || ec.value() == ENOTTY
+# endif // defined(ENOTTY)
+# if defined(ENOTCAPABLE)
+          || ec.value() == ENOTCAPABLE
+# endif // defined(ENOTCAPABLE)
+        )
       {
         int flags = ::fcntl(d, F_GETFL, 0);
         if (flags >= 0)
           ::fcntl(d, F_SETFL, flags & ~O_NONBLOCK);
       }
-# else // defined(ENOTTY)
-      ::ioctl(d, FIONBIO, &arg);
-# endif // defined(ENOTTY)
 #endif // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
       state &= ~non_blocking;
 
@@ -108,26 +114,35 @@ bool set_user_non_blocking(int d, state_type& state,
   if (result >= 0)
   {
     int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
-    result = ::fcntl(d, F_SETFL, flag);
+    result = (flag != result) ? ::fcntl(d, F_SETFL, flag) : 0;
     get_last_error(ec, result < 0);
   }
 #else // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
   ioctl_arg_type arg = (value ? 1 : 0);
-  int result = ::ioctl(d, FIONBIO, &arg);
-  get_last_error(ec, result < 0);
+  int result = 0;
+  if ((state & possible_dup) == 0)
+  {
+    result = ::ioctl(d, FIONBIO, &arg);
+    get_last_error(ec, result < 0);
+  }
+  if ((state & possible_dup) != 0
 # if defined(ENOTTY)
-  if (ec.value() == ENOTTY)
+      || ec.value() == ENOTTY
+# endif // defined(ENOTTY)
+# if defined(ENOTCAPABLE)
+      || ec.value() == ENOTCAPABLE
+# endif // defined(ENOTCAPABLE)
+    )
   {
     result = ::fcntl(d, F_GETFL, 0);
     get_last_error(ec, result < 0);
     if (result >= 0)
     {
       int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
-      result = ::fcntl(d, F_SETFL, flag);
+      result = (flag != result) ? ::fcntl(d, F_SETFL, flag) : 0;
       get_last_error(ec, result < 0);
     }
   }
-# endif // defined(ENOTTY)
 #endif // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
 
   if (result >= 0)
@@ -171,26 +186,35 @@ bool set_internal_non_blocking(int d, state_type& state,
   if (result >= 0)
   {
     int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
-    result = ::fcntl(d, F_SETFL, flag);
+    result = (flag != result) ? ::fcntl(d, F_SETFL, flag) : 0;
     get_last_error(ec, result < 0);
   }
 #else // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
   ioctl_arg_type arg = (value ? 1 : 0);
-  int result = ::ioctl(d, FIONBIO, &arg);
-  get_last_error(ec, result < 0);
+  int result = 0;
+  if ((state & possible_dup) == 0)
+  {
+    result = ::ioctl(d, FIONBIO, &arg);
+    get_last_error(ec, result < 0);
+  }
+  if ((state & possible_dup) != 0
 # if defined(ENOTTY)
-  if (ec.value() == ENOTTY)
+      || ec.value() == ENOTTY
+# endif // defined(ENOTTY)
+# if defined(ENOTCAPABLE)
+      || ec.value() == ENOTCAPABLE
+# endif // defined(ENOTCAPABLE)
+    )
   {
     result = ::fcntl(d, F_GETFL, 0);
     get_last_error(ec, result < 0);
     if (result >= 0)
     {
       int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
-      result = ::fcntl(d, F_SETFL, flag);
+      result = (flag != result) ? ::fcntl(d, F_SETFL, flag) : 0;
       get_last_error(ec, result < 0);
     }
   }
-# endif // defined(ENOTTY)
 #endif // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
 
   if (result >= 0)
diff --git a/inst/include/boost/asio/detail/impl/dev_poll_reactor.hpp b/inst/include/boost/asio/detail/impl/dev_poll_reactor.hpp
index 4eea4f152..95badd962 100644
--- a/inst/include/boost/asio/detail/impl/dev_poll_reactor.hpp
+++ b/inst/include/boost/asio/detail/impl/dev_poll_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/impl/dev_poll_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/dev_poll_reactor.ipp b/inst/include/boost/asio/detail/impl/dev_poll_reactor.ipp
index 96b4f3707..e50f696d4 100644
--- a/inst/include/boost/asio/detail/impl/dev_poll_reactor.ipp
+++ b/inst/include/boost/asio/detail/impl/dev_poll_reactor.ipp
@@ -2,7 +2,7 @@
 // detail/impl/dev_poll_reactor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -67,7 +67,7 @@ void dev_poll_reactor::shutdown()
   timer_queues_.get_all_timers(ops);
 
   scheduler_.abandon_operations(ops);
-} 
+}
 
 void dev_poll_reactor::notify_fork(
     boost::asio::execution_context::fork_event fork_ev)
diff --git a/inst/include/boost/asio/detail/impl/epoll_reactor.hpp b/inst/include/boost/asio/detail/impl/epoll_reactor.hpp
index 0611bcb7f..f95dd1767 100644
--- a/inst/include/boost/asio/detail/impl/epoll_reactor.hpp
+++ b/inst/include/boost/asio/detail/impl/epoll_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/impl/epoll_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/epoll_reactor.ipp b/inst/include/boost/asio/detail/impl/epoll_reactor.ipp
index 5bbb43427..746456a27 100644
--- a/inst/include/boost/asio/detail/impl/epoll_reactor.ipp
+++ b/inst/include/boost/asio/detail/impl/epoll_reactor.ipp
@@ -2,7 +2,7 @@
 // detail/impl/epoll_reactor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -21,6 +21,7 @@
 
 #include <cstddef>
 #include <sys/epoll.h>
+#include <boost/asio/config.hpp>
 #include <boost/asio/detail/epoll_reactor.hpp>
 #include <boost/asio/detail/scheduler.hpp>
 #include <boost/asio/detail/throw_error.hpp>
@@ -39,13 +40,19 @@ namespace detail {
 epoll_reactor::epoll_reactor(boost::asio::execution_context& ctx)
   : execution_context_service_base<epoll_reactor>(ctx),
     scheduler_(use_service<scheduler>(ctx)),
-    mutex_(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-          REACTOR_REGISTRATION, scheduler_.concurrency_hint())),
+    mutex_(config(ctx).get("reactor", "registration_locking", true),
+        config(ctx).get("reactor", "registration_locking_spin_count", 0)),
     interrupter_(),
     epoll_fd_(do_epoll_create()),
     timer_fd_(do_timerfd_create()),
     shutdown_(false),
-    registered_descriptors_mutex_(mutex_.enabled())
+    io_locking_(config(ctx).get("reactor", "io_locking", true)),
+    io_locking_spin_count_(
+        config(ctx).get("reactor", "io_locking_spin_count", 0)),
+    registered_descriptors_mutex_(mutex_.enabled(), mutex_.spin_count()),
+    registered_descriptors_(
+        config(ctx).get("reactor", "preallocated_io_objects", 0U),
+        io_locking_, io_locking_spin_count_)
 {
   // Add the interrupter's descriptor to epoll.
   epoll_event ev = { 0, { 0 } };
@@ -131,14 +138,18 @@ void epoll_reactor::notify_fork(
     for (descriptor_state* state = registered_descriptors_.first();
         state != 0; state = state->next_)
     {
-      ev.events = state->registered_events_;
-      ev.data.ptr = state;
-      int result = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, state->descriptor_, &ev);
-      if (result != 0)
+      if (state->registered_events_ != 0)
       {
-        boost::system::error_code ec(errno,
-            boost::asio::error::get_system_category());
-        boost::asio::detail::throw_error(ec, "epoll re-registration");
+        ev.events = state->registered_events_;
+        ev.data.ptr = state;
+        int result = epoll_ctl(epoll_fd_,
+            EPOLL_CTL_ADD, state->descriptor_, &ev);
+        if (result != 0)
+        {
+          boost::system::error_code ec(errno,
+              boost::asio::error::get_system_category());
+          boost::asio::detail::throw_error(ec, "epoll re-registration");
+        }
       }
     }
   }
@@ -664,8 +675,7 @@ int epoll_reactor::do_timerfd_create()
 epoll_reactor::descriptor_state* epoll_reactor::allocate_descriptor_state()
 {
   mutex::scoped_lock descriptors_lock(registered_descriptors_mutex_);
-  return registered_descriptors_.alloc(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-        REACTOR_IO, scheduler_.concurrency_hint()));
+  return registered_descriptors_.alloc(io_locking_, io_locking_spin_count_);
 }
 
 void epoll_reactor::free_descriptor_state(epoll_reactor::descriptor_state* s)
@@ -757,9 +767,9 @@ struct epoll_reactor::perform_io_cleanup_on_block_exit
   operation* first_op_;
 };
 
-epoll_reactor::descriptor_state::descriptor_state(bool locking)
+epoll_reactor::descriptor_state::descriptor_state(bool locking, int spin_count)
   : operation(&epoll_reactor::descriptor_state::do_complete),
-    mutex_(locking)
+    mutex_(locking, spin_count)
 {
 }
 
diff --git a/inst/include/boost/asio/detail/impl/eventfd_select_interrupter.ipp b/inst/include/boost/asio/detail/impl/eventfd_select_interrupter.ipp
index ac86f5c2d..bb0d4311b 100644
--- a/inst/include/boost/asio/detail/impl/eventfd_select_interrupter.ipp
+++ b/inst/include/boost/asio/detail/impl/eventfd_select_interrupter.ipp
@@ -2,7 +2,7 @@
 // detail/impl/eventfd_select_interrupter.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/impl/handler_tracking.ipp b/inst/include/boost/asio/detail/impl/handler_tracking.ipp
index 89e40ec08..f18689f69 100644
--- a/inst/include/boost/asio/detail/impl/handler_tracking.ipp
+++ b/inst/include/boost/asio/detail/impl/handler_tracking.ipp
@@ -2,7 +2,7 @@
 // detail/impl/handler_tracking.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -25,15 +25,10 @@
 
 #include <cstdarg>
 #include <cstdio>
+#include <boost/asio/detail/chrono.hpp>
+#include <boost/asio/detail/chrono_time_traits.hpp>
 #include <boost/asio/detail/handler_tracking.hpp>
-
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-# include <boost/asio/time_traits.hpp>
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-# include <boost/asio/detail/chrono.hpp>
-# include <boost/asio/detail/chrono_time_traits.hpp>
-# include <boost/asio/wait_traits.hpp>
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
+#include <boost/asio/wait_traits.hpp>
 
 #if defined(BOOST_ASIO_WINDOWS_RUNTIME)
 # include <boost/asio/detail/socket_types.hpp>
@@ -54,16 +49,10 @@ struct handler_tracking_timestamp
 
   handler_tracking_timestamp()
   {
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-    boost::posix_time::ptime epoch(boost::gregorian::date(1970, 1, 1));
-    boost::posix_time::time_duration now =
-      boost::posix_time::microsec_clock::universal_time() - epoch;
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
     typedef chrono_time_traits<chrono::system_clock,
         boost::asio::wait_traits<chrono::system_clock>> traits_helper;
     traits_helper::posix_time_duration now(
         chrono::system_clock::now().time_since_epoch());
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
     seconds = static_cast<uint64_t>(now.total_seconds());
     microseconds = static_cast<uint64_t>(now.total_microseconds() % 1000000);
   }
diff --git a/inst/include/boost/asio/detail/impl/io_uring_descriptor_service.ipp b/inst/include/boost/asio/detail/impl/io_uring_descriptor_service.ipp
index 78c4ed0f7..cf63f6ad3 100644
--- a/inst/include/boost/asio/detail/impl/io_uring_descriptor_service.ipp
+++ b/inst/include/boost/asio/detail/impl/io_uring_descriptor_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/io_uring_descriptor_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/io_uring_file_service.ipp b/inst/include/boost/asio/detail/impl/io_uring_file_service.ipp
index 91ef41ca3..ac19ae293 100644
--- a/inst/include/boost/asio/detail/impl/io_uring_file_service.ipp
+++ b/inst/include/boost/asio/detail/impl/io_uring_file_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/io_uring_file_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/io_uring_service.hpp b/inst/include/boost/asio/detail/impl/io_uring_service.hpp
index c90adb90c..878ccd847 100644
--- a/inst/include/boost/asio/detail/impl/io_uring_service.hpp
+++ b/inst/include/boost/asio/detail/impl/io_uring_service.hpp
@@ -2,7 +2,7 @@
 // detail/impl/io_uring_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/io_uring_service.ipp b/inst/include/boost/asio/detail/impl/io_uring_service.ipp
index f0f4c84d8..4f0804422 100644
--- a/inst/include/boost/asio/detail/impl/io_uring_service.ipp
+++ b/inst/include/boost/asio/detail/impl/io_uring_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/io_uring_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -36,15 +36,21 @@ namespace detail {
 io_uring_service::io_uring_service(boost::asio::execution_context& ctx)
   : execution_context_service_base<io_uring_service>(ctx),
     scheduler_(use_service<scheduler>(ctx)),
-    mutex_(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-          REACTOR_REGISTRATION, scheduler_.concurrency_hint())),
+    mutex_(config(ctx).get("reactor", "registration_locking", true),
+        config(ctx).get("reactor", "registration_locking_spin_count", 0)),
     outstanding_work_(0),
     submit_sqes_op_(this),
     pending_sqes_(0),
     pending_submit_sqes_op_(false),
     shutdown_(false),
+    io_locking_(config(ctx).get("reactor", "io_locking", true)),
+    io_locking_spin_count_(
+        config(ctx).get("reactor", "io_locking_spin_count", 0)),
     timeout_(),
     registration_mutex_(mutex_.enabled()),
+    registered_io_objects_(
+        config(ctx).get("reactor", "preallocated_io_objects", 0U),
+        io_locking_, io_locking_spin_count_),
     reactor_(use_service<reactor>(ctx)),
     reactor_data_(),
     event_fd_(-1)
@@ -613,9 +619,7 @@ void io_uring_service::register_with_reactor()
 io_uring_service::io_object* io_uring_service::allocate_io_object()
 {
   mutex::scoped_lock registration_lock(registration_mutex_);
-  return registered_io_objects_.alloc(
-      BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-        REACTOR_IO, scheduler_.concurrency_hint()));
+  return registered_io_objects_.alloc(io_locking_, io_locking_spin_count_);
 }
 
 void io_uring_service::free_io_object(io_uring_service::io_object* io_obj)
@@ -900,8 +904,8 @@ void io_uring_service::io_queue::do_complete(void* owner, operation* base,
   }
 }
 
-io_uring_service::io_object::io_object(bool locking)
-  : mutex_(locking)
+io_uring_service::io_object::io_object(bool locking, int spin_count)
+  : mutex_(locking, spin_count)
 {
 }
 
diff --git a/inst/include/boost/asio/detail/impl/io_uring_socket_service_base.ipp b/inst/include/boost/asio/detail/impl/io_uring_socket_service_base.ipp
index 757d6fb2c..dff46df82 100644
--- a/inst/include/boost/asio/detail/impl/io_uring_socket_service_base.ipp
+++ b/inst/include/boost/asio/detail/impl/io_uring_socket_service_base.ipp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_service_base.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/kqueue_reactor.hpp b/inst/include/boost/asio/detail/impl/kqueue_reactor.hpp
index 91561a873..238599ffd 100644
--- a/inst/include/boost/asio/detail/impl/kqueue_reactor.hpp
+++ b/inst/include/boost/asio/detail/impl/kqueue_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/impl/kqueue_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2005 Stefan Arentz (stefan at soze dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/impl/kqueue_reactor.ipp b/inst/include/boost/asio/detail/impl/kqueue_reactor.ipp
index 47a9d4ab6..4aec3e647 100644
--- a/inst/include/boost/asio/detail/impl/kqueue_reactor.ipp
+++ b/inst/include/boost/asio/detail/impl/kqueue_reactor.ipp
@@ -2,7 +2,7 @@
 // detail/impl/kqueue_reactor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2005 Stefan Arentz (stefan at soze dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -20,6 +20,7 @@
 
 #if defined(BOOST_ASIO_HAS_KQUEUE)
 
+#include <boost/asio/config.hpp>
 #include <boost/asio/detail/kqueue_reactor.hpp>
 #include <boost/asio/detail/scheduler.hpp>
 #include <boost/asio/detail/throw_error.hpp>
@@ -47,12 +48,18 @@ namespace detail {
 kqueue_reactor::kqueue_reactor(boost::asio::execution_context& ctx)
   : execution_context_service_base<kqueue_reactor>(ctx),
     scheduler_(use_service<scheduler>(ctx)),
-    mutex_(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-          REACTOR_REGISTRATION, scheduler_.concurrency_hint())),
+    mutex_(config(ctx).get("reactor", "registration_locking", true),
+        config(ctx).get("reactor", "registration_locking_spin_count", 0)),
     kqueue_fd_(do_kqueue_create()),
     interrupter_(),
     shutdown_(false),
-    registered_descriptors_mutex_(mutex_.enabled())
+    io_locking_(config(ctx).get("reactor", "io_locking", true)),
+    io_locking_spin_count_(
+        config(ctx).get("reactor", "io_locking_spin_count", 0)),
+    registered_descriptors_mutex_(mutex_.enabled()),
+    registered_descriptors_(
+        config(ctx).get("reactor", "preallocated_io_objects", 0U),
+        io_locking_, io_locking_spin_count_)
 {
   struct kevent events[1];
   BOOST_ASIO_KQUEUE_EV_SET(&events[0], interrupter_.read_descriptor(),
@@ -563,8 +570,7 @@ int kqueue_reactor::do_kqueue_create()
 kqueue_reactor::descriptor_state* kqueue_reactor::allocate_descriptor_state()
 {
   mutex::scoped_lock descriptors_lock(registered_descriptors_mutex_);
-  return registered_descriptors_.alloc(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-        REACTOR_IO, scheduler_.concurrency_hint()));
+  return registered_descriptors_.alloc(io_locking_, io_locking_spin_count_);
 }
 
 void kqueue_reactor::free_descriptor_state(kqueue_reactor::descriptor_state* s)
diff --git a/inst/include/boost/asio/detail/impl/null_event.ipp b/inst/include/boost/asio/detail/impl/null_event.ipp
index 05be28eaf..6572165aa 100644
--- a/inst/include/boost/asio/detail/impl/null_event.ipp
+++ b/inst/include/boost/asio/detail/impl/null_event.ipp
@@ -2,7 +2,7 @@
 // detail/impl/null_event.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/pipe_select_interrupter.ipp b/inst/include/boost/asio/detail/impl/pipe_select_interrupter.ipp
index 52dd43f68..206aef004 100644
--- a/inst/include/boost/asio/detail/impl/pipe_select_interrupter.ipp
+++ b/inst/include/boost/asio/detail/impl/pipe_select_interrupter.ipp
@@ -2,7 +2,7 @@
 // detail/impl/pipe_select_interrupter.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/posix_event.ipp b/inst/include/boost/asio/detail/impl/posix_event.ipp
index dfe20bcc3..fbf101773 100644
--- a/inst/include/boost/asio/detail/impl/posix_event.ipp
+++ b/inst/include/boost/asio/detail/impl/posix_event.ipp
@@ -2,7 +2,7 @@
 // detail/impl/posix_event.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/posix_mutex.ipp b/inst/include/boost/asio/detail/impl/posix_mutex.ipp
index 743df56d4..6e611e7ec 100644
--- a/inst/include/boost/asio/detail/impl/posix_mutex.ipp
+++ b/inst/include/boost/asio/detail/impl/posix_mutex.ipp
@@ -2,7 +2,7 @@
 // detail/impl/posix_mutex.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/posix_serial_port_service.ipp b/inst/include/boost/asio/detail/impl/posix_serial_port_service.ipp
index d96c4ba79..69b6873f4 100644
--- a/inst/include/boost/asio/detail/impl/posix_serial_port_service.ipp
+++ b/inst/include/boost/asio/detail/impl/posix_serial_port_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/posix_serial_port_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/impl/posix_thread.ipp b/inst/include/boost/asio/detail/impl/posix_thread.ipp
index d14dcff74..4dff3bfc7 100644
--- a/inst/include/boost/asio/detail/impl/posix_thread.ipp
+++ b/inst/include/boost/asio/detail/impl/posix_thread.ipp
@@ -2,7 +2,7 @@
 // detail/impl/posix_thread.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/posix_tss_ptr.ipp b/inst/include/boost/asio/detail/impl/posix_tss_ptr.ipp
index eb2cf7f59..fd7be4421 100644
--- a/inst/include/boost/asio/detail/impl/posix_tss_ptr.ipp
+++ b/inst/include/boost/asio/detail/impl/posix_tss_ptr.ipp
@@ -2,7 +2,7 @@
 // detail/impl/posix_tss_ptr.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/reactive_descriptor_service.ipp b/inst/include/boost/asio/detail/impl/reactive_descriptor_service.ipp
index 119c44be4..858a135b3 100644
--- a/inst/include/boost/asio/detail/impl/reactive_descriptor_service.ipp
+++ b/inst/include/boost/asio/detail/impl/reactive_descriptor_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/reactive_descriptor_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -199,18 +199,20 @@ boost::system::error_code reactive_descriptor_service::cancel(
 }
 
 void reactive_descriptor_service::do_start_op(implementation_type& impl,
-    int op_type, reactor_op* op, bool is_continuation, bool is_non_blocking,
-    bool noop, void (*on_immediate)(operation* op, bool, const void*),
+    int op_type, reactor_op* op, bool is_continuation,
+    bool allow_speculative, bool noop, bool needs_non_blocking,
+    void (*on_immediate)(operation* op, bool, const void*),
     const void* immediate_arg)
 {
   if (!noop)
   {
-    if ((impl.state_ & descriptor_ops::non_blocking) ||
-        descriptor_ops::set_internal_non_blocking(
+    if ((impl.state_ & descriptor_ops::non_blocking)
+        || !needs_non_blocking
+        || descriptor_ops::set_internal_non_blocking(
           impl.descriptor_, impl.state_, true, op->ec_))
     {
       reactor_.start_op(op_type, impl.descriptor_, impl.reactor_data_, op,
-          is_continuation, is_non_blocking, on_immediate, immediate_arg);
+          is_continuation, allow_speculative, on_immediate, immediate_arg);
       return;
     }
   }
diff --git a/inst/include/boost/asio/detail/impl/reactive_socket_service_base.ipp b/inst/include/boost/asio/detail/impl/reactive_socket_service_base.ipp
index 7c155f879..22f6ba3a6 100644
--- a/inst/include/boost/asio/detail/impl/reactive_socket_service_base.ipp
+++ b/inst/include/boost/asio/detail/impl/reactive_socket_service_base.ipp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_service_base.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -235,19 +235,21 @@ boost::system::error_code reactive_socket_service_base::do_assign(
 }
 
 void reactive_socket_service_base::do_start_op(
-    reactive_socket_service_base::base_implementation_type& impl, int op_type,
-    reactor_op* op, bool is_continuation, bool is_non_blocking, bool noop,
+    reactive_socket_service_base::base_implementation_type& impl,
+    int op_type, reactor_op* op, bool is_continuation,
+    bool allow_speculative, bool noop, bool needs_non_blocking,
     void (*on_immediate)(operation* op, bool, const void*),
     const void* immediate_arg)
 {
   if (!noop)
   {
     if ((impl.state_ & socket_ops::non_blocking)
+        || !needs_non_blocking
         || socket_ops::set_internal_non_blocking(
           impl.socket_, impl.state_, true, op->ec_))
     {
       reactor_.start_op(op_type, impl.socket_, impl.reactor_data_, op,
-          is_continuation, is_non_blocking, on_immediate, immediate_arg);
+          is_continuation, allow_speculative, on_immediate, immediate_arg);
       return;
     }
   }
@@ -264,7 +266,7 @@ void reactive_socket_service_base::do_start_accept_op(
   if (!peer_is_open)
   {
     do_start_op(impl, reactor::read_op, op, is_continuation,
-        true, false, on_immediate, immediate_arg);
+        true, false, true, on_immediate, immediate_arg);
   }
   else
   {
diff --git a/inst/include/boost/asio/detail/impl/resolver_service_base.ipp b/inst/include/boost/asio/detail/impl/resolver_service_base.ipp
index d987216e6..e13933d43 100644
--- a/inst/include/boost/asio/detail/impl/resolver_service_base.ipp
+++ b/inst/include/boost/asio/detail/impl/resolver_service_base.ipp
@@ -2,7 +2,7 @@
 // detail/impl/resolver_service_base.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,6 +16,7 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <boost/asio/config.hpp>
 #include <boost/asio/detail/resolver_service_base.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -44,8 +45,9 @@ private:
 
 resolver_service_base::resolver_service_base(execution_context& context)
   : scheduler_(boost::asio::use_service<scheduler_impl>(context)),
-    work_scheduler_(new scheduler_impl(context, -1, false)),
-    work_thread_(0)
+    work_scheduler_(new scheduler_impl(context, false)),
+    work_thread_(0),
+    scheduler_locking_(config(context).get("scheduler", "locking", true))
 {
   work_scheduler_->work_started();
 }
@@ -127,8 +129,7 @@ void resolver_service_base::cancel(
 
 void resolver_service_base::start_resolve_op(resolve_op* op)
 {
-  if (BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(SCHEDULER,
-        scheduler_.concurrency_hint()))
+  if (scheduler_locking_)
   {
     start_work_thread();
     scheduler_.work_started();
diff --git a/inst/include/boost/asio/detail/impl/scheduler.ipp b/inst/include/boost/asio/detail/impl/scheduler.ipp
index 28f34dddc..06a9ccb55 100644
--- a/inst/include/boost/asio/detail/impl/scheduler.ipp
+++ b/inst/include/boost/asio/detail/impl/scheduler.ipp
@@ -2,7 +2,7 @@
 // detail/impl/scheduler.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,7 +17,7 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#include <boost/asio/detail/concurrency_hint.hpp>
+#include <boost/asio/config.hpp>
 #include <boost/asio/detail/event.hpp>
 #include <boost/asio/detail/limits.hpp>
 #include <boost/asio/detail/scheduler.hpp>
@@ -110,22 +110,20 @@ struct scheduler::work_cleanup
 };
 
 scheduler::scheduler(boost::asio::execution_context& ctx,
-    int concurrency_hint, bool own_thread, get_task_func_type get_task)
+    bool own_thread, get_task_func_type get_task)
   : boost::asio::detail::execution_context_service_base<scheduler>(ctx),
-    one_thread_(concurrency_hint == 1
-        || !BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-          SCHEDULER, concurrency_hint)
-        || !BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-          REACTOR_IO, concurrency_hint)),
-    mutex_(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
-          SCHEDULER, concurrency_hint)),
+    one_thread_(config(ctx).get("scheduler", "concurrency_hint", 0) == 1),
+    mutex_(config(ctx).get("scheduler", "locking", true),
+        config(ctx).get("scheduler", "locking_spin_count", 0)),
     task_(0),
     get_task_(get_task),
     task_interrupted_(true),
     outstanding_work_(0),
     stopped_(false),
     shutdown_(false),
-    concurrency_hint_(concurrency_hint),
+    concurrency_hint_(config(ctx).get("scheduler", "concurrency_hint", 0)),
+    task_usec_(config(ctx).get("scheduler", "task_usec", -1L)),
+    wait_usec_(config(ctx).get("scheduler", "wait_usec", -1L)),
     thread_(0)
 {
   BOOST_ASIO_HANDLER_TRACKING_INIT;
@@ -461,9 +459,9 @@ std::size_t scheduler::do_run_one(mutex::scoped_lock& lock,
 
       if (o == &task_operation_)
       {
-        task_interrupted_ = more_handlers;
+        task_interrupted_ = more_handlers || task_usec_ == 0;
 
-        if (more_handlers && !one_thread_)
+        if (more_handlers && !one_thread_ && wait_usec_ != 0)
           wakeup_event_.unlock_and_signal_one(lock);
         else
           lock.unlock();
@@ -474,7 +472,8 @@ std::size_t scheduler::do_run_one(mutex::scoped_lock& lock,
         // Run the task. May throw an exception. Only block if the operation
         // queue is empty and we're not polling, otherwise we want to return
         // as soon as possible.
-        task_->run(more_handlers ? 0 : -1, this_thread.private_op_queue);
+        task_->run(more_handlers ? 0 : task_usec_,
+            this_thread.private_op_queue);
       }
       else
       {
@@ -498,8 +497,19 @@ std::size_t scheduler::do_run_one(mutex::scoped_lock& lock,
     }
     else
     {
-      wakeup_event_.clear(lock);
-      wakeup_event_.wait(lock);
+      if (wait_usec_ == 0)
+      {
+        lock.unlock();
+        lock.lock();
+      }
+      else
+      {
+        wakeup_event_.clear(lock);
+        if (wait_usec_ > 0)
+          wakeup_event_.wait_for_usec(lock, wait_usec_);
+        else
+          wakeup_event_.wait(lock);
+      }
     }
   }
 
@@ -517,6 +527,7 @@ std::size_t scheduler::do_wait_one(mutex::scoped_lock& lock,
   if (o == 0)
   {
     wakeup_event_.clear(lock);
+    usec = (wait_usec_ >= 0 && wait_usec_ < usec) ? wait_usec_ : usec;
     wakeup_event_.wait_for_usec(lock, usec);
     usec = 0; // Wait at most once.
     o = op_queue_.front();
@@ -527,9 +538,10 @@ std::size_t scheduler::do_wait_one(mutex::scoped_lock& lock,
     op_queue_.pop();
     bool more_handlers = (!op_queue_.empty());
 
-    task_interrupted_ = more_handlers;
+    usec = (task_usec_ >= 0 && task_usec_ < usec) ? task_usec_ : usec;
+    task_interrupted_ = more_handlers || usec == 0;
 
-    if (more_handlers && !one_thread_)
+    if (more_handlers && !one_thread_ && wait_usec_ != 0)
       wakeup_event_.unlock_and_signal_one(lock);
     else
       lock.unlock();
@@ -648,7 +660,7 @@ void scheduler::stop_all_threads(
 void scheduler::wake_one_thread_and_unlock(
     mutex::scoped_lock& lock)
 {
-  if (!wakeup_event_.maybe_unlock_and_signal_one(lock))
+  if (wait_usec_ == 0 || !wakeup_event_.maybe_unlock_and_signal_one(lock))
   {
     if (!task_interrupted_ && task_)
     {
diff --git a/inst/include/boost/asio/detail/impl/select_reactor.hpp b/inst/include/boost/asio/detail/impl/select_reactor.hpp
index b7d862a0a..2ab2abcbc 100644
--- a/inst/include/boost/asio/detail/impl/select_reactor.hpp
+++ b/inst/include/boost/asio/detail/impl/select_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/impl/select_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/select_reactor.ipp b/inst/include/boost/asio/detail/impl/select_reactor.ipp
index 33887e244..09d4fc0de 100644
--- a/inst/include/boost/asio/detail/impl/select_reactor.ipp
+++ b/inst/include/boost/asio/detail/impl/select_reactor.ipp
@@ -2,7 +2,7 @@
 // detail/impl/select_reactor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/service_registry.hpp b/inst/include/boost/asio/detail/impl/service_registry.hpp
index 796e0cd5a..b7042d23c 100644
--- a/inst/include/boost/asio/detail/impl/service_registry.hpp
+++ b/inst/include/boost/asio/detail/impl/service_registry.hpp
@@ -2,7 +2,7 @@
 // detail/impl/service_registry.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/service_registry.ipp b/inst/include/boost/asio/detail/impl/service_registry.ipp
index 8cb97b3c9..6575596b8 100644
--- a/inst/include/boost/asio/detail/impl/service_registry.ipp
+++ b/inst/include/boost/asio/detail/impl/service_registry.ipp
@@ -2,7 +2,7 @@
 // detail/impl/service_registry.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/signal_set_service.ipp b/inst/include/boost/asio/detail/impl/signal_set_service.ipp
index 5719f2a11..63b6e78e4 100644
--- a/inst/include/boost/asio/detail/impl/signal_set_service.ipp
+++ b/inst/include/boost/asio/detail/impl/signal_set_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/signal_set_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -659,10 +659,9 @@ void signal_set_service::add_service(signal_set_service* service)
   // scheduler used to create signal_set objects.
   if (state->service_list_ != 0)
   {
-    if (!BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(SCHEDULER,
-          service->scheduler_.concurrency_hint())
-        || !BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(SCHEDULER,
-          state->service_list_->scheduler_.concurrency_hint()))
+    if (!config(service->context()).get("scheduler", "locking", true)
+        || !config(state->service_list_->context()).get(
+            "scheduler", "locking", true))
     {
       std::logic_error ex(
           "Thread-unsafe execution context objects require "
diff --git a/inst/include/boost/asio/detail/impl/socket_ops.ipp b/inst/include/boost/asio/detail/impl/socket_ops.ipp
index 8bf264211..2548c2987 100644
--- a/inst/include/boost/asio/detail/impl/socket_ops.ipp
+++ b/inst/include/boost/asio/detail/impl/socket_ops.ipp
@@ -2,7 +2,7 @@
 // detail/impl/socket_ops.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -41,6 +41,10 @@
 #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
        // || defined(__MACH__) && defined(__APPLE__)
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+# include <malloc.h>
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1800)
+
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
@@ -340,7 +344,24 @@ int close(socket_type s, state_type& state,
         ::fcntl(s, F_SETFL, flags & ~O_NONBLOCK);
 # else // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
       ioctl_arg_type arg = 0;
-      ::ioctl(s, FIONBIO, &arg);
+      if ((state & possible_dup) == 0)
+      {
+        result = ::ioctl(s, FIONBIO, &arg);
+        get_last_error(ec, result < 0);
+      }
+      if ((state & possible_dup) != 0
+#  if defined(ENOTTY)
+          || ec.value() == ENOTTY
+#  endif // defined(ENOTTY)
+#  if defined(ENOTCAPABLE)
+          || ec.value() == ENOTCAPABLE
+#  endif // defined(ENOTCAPABLE)
+        )
+      {
+        int flags = ::fcntl(s, F_GETFL, 0);
+        if (flags >= 0)
+          ::fcntl(s, F_SETFL, flags & ~O_NONBLOCK);
+      }
 # endif // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
 #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
       state &= ~non_blocking;
@@ -376,14 +397,36 @@ bool set_user_non_blocking(socket_type s,
   if (result >= 0)
   {
     int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
-    result = ::fcntl(s, F_SETFL, flag);
+    result = (flag != result) ? ::fcntl(s, F_SETFL, flag) : 0;
     get_last_error(ec, result < 0);
   }
-#else
+#else // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
   ioctl_arg_type arg = (value ? 1 : 0);
-  int result = ::ioctl(s, FIONBIO, &arg);
-  get_last_error(ec, result < 0);
-#endif
+  int result = 0;
+  if ((state & possible_dup) == 0)
+  {
+    result = ::ioctl(s, FIONBIO, &arg);
+    get_last_error(ec, result < 0);
+  }
+  if ((state & possible_dup) != 0
+# if defined(ENOTTY)
+      || ec.value() == ENOTTY
+# endif // defined(ENOTTY)
+# if defined(ENOTCAPABLE)
+      || ec.value() == ENOTCAPABLE
+# endif // defined(ENOTCAPABLE)
+    )
+  {
+    result = ::fcntl(s, F_GETFL, 0);
+    get_last_error(ec, result < 0);
+    if (result >= 0)
+    {
+      int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
+      result = (flag != result) ? ::fcntl(s, F_SETFL, flag) : 0;
+      get_last_error(ec, result < 0);
+    }
+  }
+#endif // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
 
   if (result >= 0)
   {
@@ -430,14 +473,36 @@ bool set_internal_non_blocking(socket_type s,
   if (result >= 0)
   {
     int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
-    result = ::fcntl(s, F_SETFL, flag);
+    result = (flag != result) ? ::fcntl(s, F_SETFL, flag) : 0;
     get_last_error(ec, result < 0);
   }
-#else
+#else // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
   ioctl_arg_type arg = (value ? 1 : 0);
-  int result = ::ioctl(s, FIONBIO, &arg);
-  get_last_error(ec, result < 0);
-#endif
+  int result = 0;
+  if ((state & possible_dup) == 0)
+  {
+    result = ::ioctl(s, FIONBIO, &arg);
+    get_last_error(ec, result < 0);
+  }
+  if ((state & possible_dup) != 0
+# if defined(ENOTTY)
+      || ec.value() == ENOTTY
+# endif // defined(ENOTTY)
+# if defined(ENOTCAPABLE)
+      || ec.value() == ENOTCAPABLE
+# endif // defined(ENOTCAPABLE)
+    )
+  {
+    result = ::fcntl(s, F_GETFL, 0);
+    get_last_error(ec, result < 0);
+    if (result >= 0)
+    {
+      int flag = (value ? (result | O_NONBLOCK) : (result & ~O_NONBLOCK));
+      result = (flag != result) ? ::fcntl(s, F_SETFL, flag) : 0;
+      get_last_error(ec, result < 0);
+    }
+  }
+#endif // defined(__SYMBIAN32__) || defined(__EMSCRIPTEN__)
 
   if (result >= 0)
   {
@@ -2522,9 +2587,11 @@ const char* inet_ntop(int af, const void* src, char* dest, size_t length,
         || if_indextoname(static_cast<unsigned>(scope_id), if_name + 1) == 0)
 #if defined(BOOST_ASIO_HAS_SNPRINTF)
       snprintf(if_name + 1, sizeof(if_name) - 1, "%lu", scope_id);
-#else // defined(BOOST_ASIO_HAS_SNPRINTF)
+#elif defined(BOOST_ASIO_HAS_SECURE_RTL)
+      sprintf_s(if_name + 1, sizeof(if_name) -1, "%lu", scope_id);
+#else // defined(BOOST_ASIO_HAS_SECURE_RTL)
       sprintf(if_name + 1, "%lu", scope_id);
-#endif // defined(BOOST_ASIO_HAS_SNPRINTF)
+#endif // defined(BOOST_ASIO_HAS_SECURE_RTL)
     strcat(dest, if_name);
   }
   return result;
diff --git a/inst/include/boost/asio/detail/impl/socket_select_interrupter.ipp b/inst/include/boost/asio/detail/impl/socket_select_interrupter.ipp
index ca352008c..cb62e1471 100644
--- a/inst/include/boost/asio/detail/impl/socket_select_interrupter.ipp
+++ b/inst/include/boost/asio/detail/impl/socket_select_interrupter.ipp
@@ -2,7 +2,7 @@
 // detail/impl/socket_select_interrupter.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -91,7 +91,7 @@ void socket_select_interrupter::open_descriptors()
   socket_holder server(socket_ops::accept(acceptor.get(), 0, 0, ec));
   if (server.get() == invalid_socket)
     boost::asio::detail::throw_error(ec, "socket_select_interrupter");
-  
+
   ioctl_arg_type non_blocking = 1;
   socket_ops::state_type client_state = 0;
   if (socket_ops::ioctl(client.get(), client_state,
diff --git a/inst/include/boost/asio/detail/impl/strand_executor_service.hpp b/inst/include/boost/asio/detail/impl/strand_executor_service.hpp
index 687e7f197..a46e6280e 100644
--- a/inst/include/boost/asio/detail/impl/strand_executor_service.hpp
+++ b/inst/include/boost/asio/detail/impl/strand_executor_service.hpp
@@ -2,7 +2,7 @@
 // detail/impl/strand_executor_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/strand_executor_service.ipp b/inst/include/boost/asio/detail/impl/strand_executor_service.ipp
index de009063e..3502d72ab 100644
--- a/inst/include/boost/asio/detail/impl/strand_executor_service.ipp
+++ b/inst/include/boost/asio/detail/impl/strand_executor_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/strand_executor_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/strand_service.hpp b/inst/include/boost/asio/detail/impl/strand_service.hpp
index d39eac6a1..ce74664c8 100644
--- a/inst/include/boost/asio/detail/impl/strand_service.hpp
+++ b/inst/include/boost/asio/detail/impl/strand_service.hpp
@@ -2,7 +2,7 @@
 // detail/impl/strand_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/strand_service.ipp b/inst/include/boost/asio/detail/impl/strand_service.ipp
index c7e088b07..90679a857 100644
--- a/inst/include/boost/asio/detail/impl/strand_service.ipp
+++ b/inst/include/boost/asio/detail/impl/strand_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/strand_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/thread_context.ipp b/inst/include/boost/asio/detail/impl/thread_context.ipp
index 4ffbc509c..d1131760f 100644
--- a/inst/include/boost/asio/detail/impl/thread_context.ipp
+++ b/inst/include/boost/asio/detail/impl/thread_context.ipp
@@ -2,7 +2,7 @@
 // detail/impl/thread_context.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/throw_error.ipp b/inst/include/boost/asio/detail/impl/throw_error.ipp
index cee9ee76e..4d1620279 100644
--- a/inst/include/boost/asio/detail/impl/throw_error.ipp
+++ b/inst/include/boost/asio/detail/impl/throw_error.ipp
@@ -2,7 +2,7 @@
 // detail/impl/throw_error.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/timer_queue_ptime.ipp b/inst/include/boost/asio/detail/impl/timer_queue_ptime.ipp
index 3662799ad..e0f09c826 100644
--- a/inst/include/boost/asio/detail/impl/timer_queue_ptime.ipp
+++ b/inst/include/boost/asio/detail/impl/timer_queue_ptime.ipp
@@ -2,7 +2,7 @@
 // detail/impl/timer_queue_ptime.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,8 @@
 
 #include <boost/asio/detail/config.hpp>
 
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
 #include <boost/asio/detail/timer_queue_ptime.hpp>
@@ -96,4 +98,6 @@ void timer_queue<time_traits<boost::posix_time::ptime>>::move_timer(
 
 #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #endif // BOOST_ASIO_DETAIL_IMPL_TIMER_QUEUE_PTIME_IPP
diff --git a/inst/include/boost/asio/detail/impl/timer_queue_set.ipp b/inst/include/boost/asio/detail/impl/timer_queue_set.ipp
index e1db22945..4e7b42bcb 100644
--- a/inst/include/boost/asio/detail/impl/timer_queue_set.ipp
+++ b/inst/include/boost/asio/detail/impl/timer_queue_set.ipp
@@ -2,7 +2,7 @@
 // detail/impl/timer_queue_set.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_event.ipp b/inst/include/boost/asio/detail/impl/win_event.ipp
index c86600bd8..0f7d8f4b1 100644
--- a/inst/include/boost/asio/detail/impl/win_event.ipp
+++ b/inst/include/boost/asio/detail/impl/win_event.ipp
@@ -2,7 +2,7 @@
 // detail/win_event.ipp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_iocp_file_service.ipp b/inst/include/boost/asio/detail/impl/win_iocp_file_service.ipp
index 7e47a5213..9d34f1e25 100644
--- a/inst/include/boost/asio/detail/impl/win_iocp_file_service.ipp
+++ b/inst/include/boost/asio/detail/impl/win_iocp_file_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_iocp_file_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -95,25 +95,48 @@ boost::system::error_code win_iocp_file_service::open(
   if ((open_flags & file_base::sync_all_on_write) != 0)
     flags |= FILE_FLAG_WRITE_THROUGH;
 
+  impl.offset_ = 0;
   HANDLE handle = ::CreateFileA(path, access, share, 0, disposition, flags, 0);
   if (handle != INVALID_HANDLE_VALUE)
   {
-    if (disposition == OPEN_ALWAYS && (open_flags & file_base::truncate) != 0)
+    if (disposition == OPEN_ALWAYS)
     {
-      if (!::SetEndOfFile(handle))
+      if ((open_flags & file_base::truncate) != 0)
       {
-        DWORD last_error = ::GetLastError();
-        ::CloseHandle(handle);
-        ec.assign(last_error, boost::asio::error::get_system_category());
-        BOOST_ASIO_ERROR_LOCATION(ec);
-        return ec;
+        if (!::SetEndOfFile(handle))
+        {
+          DWORD last_error = ::GetLastError();
+          ::CloseHandle(handle);
+          ec.assign(last_error, boost::asio::error::get_system_category());
+          BOOST_ASIO_ERROR_LOCATION(ec);
+          return ec;
+        }
+      }
+    }
+    if (disposition == OPEN_ALWAYS || disposition == OPEN_EXISTING)
+    {
+      if ((open_flags & file_base::append) != 0)
+      {
+        LARGE_INTEGER distance, new_offset;
+        distance.QuadPart = 0;
+        if (::SetFilePointerEx(handle, distance, &new_offset, FILE_END))
+        {
+          impl.offset_ = static_cast<uint64_t>(new_offset.QuadPart);
+        }
+        else
+        {
+          DWORD last_error = ::GetLastError();
+          ::CloseHandle(handle);
+          ec.assign(last_error, boost::asio::error::get_system_category());
+          BOOST_ASIO_ERROR_LOCATION(ec);
+          return ec;
+        }
       }
     }
 
     handle_service_.assign(impl, handle, ec);
     if (ec)
       ::CloseHandle(handle);
-    impl.offset_ = 0;
     BOOST_ASIO_ERROR_LOCATION(ec);
     return ec;
   }
diff --git a/inst/include/boost/asio/detail/impl/win_iocp_handle_service.ipp b/inst/include/boost/asio/detail/impl/win_iocp_handle_service.ipp
index 96d07b611..9354570fe 100644
--- a/inst/include/boost/asio/detail/impl/win_iocp_handle_service.ipp
+++ b/inst/include/boost/asio/detail/impl/win_iocp_handle_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_iocp_handle_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -164,7 +164,7 @@ void win_iocp_handle_service::destroy(
     win_iocp_handle_service::implementation_type& impl)
 {
   close_for_destruction(impl);
-  
+
   // Remove implementation from linked list of all implementations.
   boost::asio::detail::mutex::scoped_lock lock(mutex_);
   if (impl_list_ == &impl)
@@ -366,12 +366,12 @@ size_t win_iocp_handle_service::do_write(
     return 0;
   }
 
-  // Write the data. 
+  // Write the data.
   overlapped.Offset = offset & 0xFFFFFFFF;
   overlapped.OffsetHigh = (offset >> 32) & 0xFFFFFFFF;
   BOOL ok = ::WriteFile(impl.handle_, buffer.data(),
       static_cast<DWORD>(buffer.size()), 0, &overlapped);
-  if (!ok) 
+  if (!ok)
   {
     DWORD last_error = ::GetLastError();
     if (last_error != ERROR_IO_PENDING)
@@ -447,7 +447,7 @@ size_t win_iocp_handle_service::do_read(
     BOOST_ASIO_ERROR_LOCATION(ec);
     return 0;
   }
-  
+
   // A request to read 0 bytes on a stream handle is a no-op.
   if (buffer.size() == 0)
   {
@@ -467,7 +467,7 @@ size_t win_iocp_handle_service::do_read(
   overlapped.OffsetHigh = (offset >> 32) & 0xFFFFFFFF;
   BOOL ok = ::ReadFile(impl.handle_, buffer.data(),
       static_cast<DWORD>(buffer.size()), 0, &overlapped);
-  if (!ok) 
+  if (!ok)
   {
     DWORD last_error = ::GetLastError();
     if (last_error != ERROR_IO_PENDING && last_error != ERROR_MORE_DATA)
diff --git a/inst/include/boost/asio/detail/impl/win_iocp_io_context.hpp b/inst/include/boost/asio/detail/impl/win_iocp_io_context.hpp
index e8aeb4080..e63e802a9 100644
--- a/inst/include/boost/asio/detail/impl/win_iocp_io_context.hpp
+++ b/inst/include/boost/asio/detail/impl/win_iocp_io_context.hpp
@@ -2,7 +2,7 @@
 // detail/impl/win_iocp_io_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_iocp_io_context.ipp b/inst/include/boost/asio/detail/impl/win_iocp_io_context.ipp
index de56d7e06..be313df59 100644
--- a/inst/include/boost/asio/detail/impl/win_iocp_io_context.ipp
+++ b/inst/include/boost/asio/detail/impl/win_iocp_io_context.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_iocp_io_context.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,6 +19,7 @@
 
 #if defined(BOOST_ASIO_HAS_IOCP)
 
+#include <boost/asio/config.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/detail/cstdint.hpp>
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
@@ -79,7 +80,7 @@ struct win_iocp_io_context::timer_thread_function
 };
 
 win_iocp_io_context::win_iocp_io_context(
-    boost::asio::execution_context& ctx, int concurrency_hint, bool own_thread)
+    boost::asio::execution_context& ctx, bool own_thread)
   : execution_context_service_base<win_iocp_io_context>(ctx),
     iocp_(),
     outstanding_work_(0),
@@ -88,12 +89,13 @@ win_iocp_io_context::win_iocp_io_context(
     shutdown_(0),
     gqcs_timeout_(get_gqcs_timeout()),
     dispatch_required_(0),
-    concurrency_hint_(concurrency_hint)
+    concurrency_hint_(config(ctx).get("scheduler", "concurrency_hint", -1))
 {
   BOOST_ASIO_HANDLER_TRACKING_INIT;
 
   iocp_.handle = ::CreateIoCompletionPort(INVALID_HANDLE_VALUE, 0, 0,
-      static_cast<DWORD>(concurrency_hint >= 0 ? concurrency_hint : DWORD(~0)));
+      static_cast<DWORD>(concurrency_hint_ >= 0
+        ? concurrency_hint_ : DWORD(~0)));
   if (!iocp_.handle)
   {
     DWORD last_error = ::GetLastError();
diff --git a/inst/include/boost/asio/detail/impl/win_iocp_serial_port_service.ipp b/inst/include/boost/asio/detail/impl/win_iocp_serial_port_service.ipp
index 3102a992d..28f9119ec 100644
--- a/inst/include/boost/asio/detail/impl/win_iocp_serial_port_service.ipp
+++ b/inst/include/boost/asio/detail/impl/win_iocp_serial_port_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_iocp_serial_port_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/impl/win_iocp_socket_service_base.ipp b/inst/include/boost/asio/detail/impl/win_iocp_socket_service_base.ipp
index f6c41c26d..de309a006 100644
--- a/inst/include/boost/asio/detail/impl/win_iocp_socket_service_base.ipp
+++ b/inst/include/boost/asio/detail/impl/win_iocp_socket_service_base.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_iocp_socket_service_base.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_mutex.ipp b/inst/include/boost/asio/detail/impl/win_mutex.ipp
index eeb293158..a537ff741 100644
--- a/inst/include/boost/asio/detail/impl/win_mutex.ipp
+++ b/inst/include/boost/asio/detail/impl/win_mutex.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_mutex.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_object_handle_service.ipp b/inst/include/boost/asio/detail/impl/win_object_handle_service.ipp
index 5fbd49eb4..412a48c79 100644
--- a/inst/include/boost/asio/detail/impl/win_object_handle_service.ipp
+++ b/inst/include/boost/asio/detail/impl/win_object_handle_service.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_object_handle_service.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2011 Boris Schaeling (boris@highscore.de)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/impl/win_static_mutex.ipp b/inst/include/boost/asio/detail/impl/win_static_mutex.ipp
index aaef4dd02..6f0a9eea0 100644
--- a/inst/include/boost/asio/detail/impl/win_static_mutex.ipp
+++ b/inst/include/boost/asio/detail/impl/win_static_mutex.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_static_mutex.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_thread.ipp b/inst/include/boost/asio/detail/impl/win_thread.ipp
index 8a9241a68..84280f099 100644
--- a/inst/include/boost/asio/detail/impl/win_thread.ipp
+++ b/inst/include/boost/asio/detail/impl/win_thread.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_thread.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/win_tss_ptr.ipp b/inst/include/boost/asio/detail/impl/win_tss_ptr.ipp
index 580c7b7e9..7efee05db 100644
--- a/inst/include/boost/asio/detail/impl/win_tss_ptr.ipp
+++ b/inst/include/boost/asio/detail/impl/win_tss_ptr.ipp
@@ -2,7 +2,7 @@
 // detail/impl/win_tss_ptr.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/winrt_ssocket_service_base.ipp b/inst/include/boost/asio/detail/impl/winrt_ssocket_service_base.ipp
index dade85034..57721f8c3 100644
--- a/inst/include/boost/asio/detail/impl/winrt_ssocket_service_base.ipp
+++ b/inst/include/boost/asio/detail/impl/winrt_ssocket_service_base.ipp
@@ -2,7 +2,7 @@
 // detail/impl/winrt_ssocket_service_base.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.hpp b/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.hpp
index 4a3b230ab..ba5416286 100644
--- a/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.hpp
+++ b/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.hpp
@@ -2,7 +2,7 @@
 // detail/impl/winrt_timer_scheduler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.ipp b/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.ipp
index d294ac74d..0a893587b 100644
--- a/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.ipp
+++ b/inst/include/boost/asio/detail/impl/winrt_timer_scheduler.ipp
@@ -2,7 +2,7 @@
 // detail/impl/winrt_timer_scheduler.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/impl/winsock_init.ipp b/inst/include/boost/asio/detail/impl/winsock_init.ipp
index 5331bdfdb..2a4c79ea1 100644
--- a/inst/include/boost/asio/detail/impl/winsock_init.ipp
+++ b/inst/include/boost/asio/detail/impl/winsock_init.ipp
@@ -2,7 +2,7 @@
 // detail/impl/winsock_init.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/initiate_defer.hpp b/inst/include/boost/asio/detail/initiate_defer.hpp
index a5ca4692a..9d35f2adc 100644
--- a/inst/include/boost/asio/detail/initiate_defer.hpp
+++ b/inst/include/boost/asio/detail/initiate_defer.hpp
@@ -2,7 +2,7 @@
 // detail/initiate_defer.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/initiate_dispatch.hpp b/inst/include/boost/asio/detail/initiate_dispatch.hpp
index bc567ecbd..a75cac700 100644
--- a/inst/include/boost/asio/detail/initiate_dispatch.hpp
+++ b/inst/include/boost/asio/detail/initiate_dispatch.hpp
@@ -2,7 +2,7 @@
 // detail/initiate_dispatch.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/initiate_post.hpp b/inst/include/boost/asio/detail/initiate_post.hpp
index a8f1edf04..4e9070db7 100644
--- a/inst/include/boost/asio/detail/initiate_post.hpp
+++ b/inst/include/boost/asio/detail/initiate_post.hpp
@@ -2,7 +2,7 @@
 // detail/initiate_post.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/initiation_base.hpp b/inst/include/boost/asio/detail/initiation_base.hpp
new file mode 100644
index 000000000..9c1597b24
--- /dev/null
+++ b/inst/include/boost/asio/detail/initiation_base.hpp
@@ -0,0 +1,64 @@
+//
+// detail/initiation_base.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DETAIL_INITIATION_BASE_HPP
+#define BOOST_ASIO_DETAIL_INITIATION_BASE_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Initiation, typename = void>
+class initiation_base : public Initiation
+{
+public:
+  template <typename I>
+  explicit initiation_base(I&& initiation)
+    : Initiation(static_cast<I&&>(initiation))
+  {
+  }
+};
+
+template <typename Initiation>
+class initiation_base<Initiation, enable_if_t<!is_class<Initiation>::value>>
+{
+public:
+  template <typename I>
+  explicit initiation_base(I&& initiation)
+    : initiation_(static_cast<I&&>(initiation))
+  {
+  }
+
+  template <typename... Args>
+  void operator()(Args&&... args) const
+  {
+    initiation_(static_cast<Args&&>(args)...);
+  }
+
+private:
+  Initiation initiation_;
+};
+
+} // namespace detail
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DETAIL_INITIATION_BASE_HPP
diff --git a/inst/include/boost/asio/detail/io_control.hpp b/inst/include/boost/asio/detail/io_control.hpp
index efcd161a1..08401817b 100644
--- a/inst/include/boost/asio/detail/io_control.hpp
+++ b/inst/include/boost/asio/detail/io_control.hpp
@@ -2,7 +2,7 @@
 // detail/io_control.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_object_impl.hpp b/inst/include/boost/asio/detail/io_object_impl.hpp
index 62874eb1a..166fbccec 100644
--- a/inst/include/boost/asio/detail/io_object_impl.hpp
+++ b/inst/include/boost/asio/detail/io_object_impl.hpp
@@ -1,8 +1,8 @@
 //
-// io_object_impl.hpp
-// ~~~~~~~~~~~~~~~~~~
+// detail/io_object_impl.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_descriptor_read_at_op.hpp b/inst/include/boost/asio/detail/io_uring_descriptor_read_at_op.hpp
index 5e24ce6a3..132ac7a12 100644
--- a/inst/include/boost/asio/detail/io_uring_descriptor_read_at_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_descriptor_read_at_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_descriptor_read_at_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_descriptor_read_op.hpp b/inst/include/boost/asio/detail/io_uring_descriptor_read_op.hpp
index c6982d500..4f3444e98 100644
--- a/inst/include/boost/asio/detail/io_uring_descriptor_read_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_descriptor_read_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_descriptor_read_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -64,7 +64,7 @@ class io_uring_descriptor_read_op_base : public io_uring_operation
     {
       ::io_uring_prep_read_fixed(sqe, o->descriptor_,
           o->bufs_.buffers()->iov_base, o->bufs_.buffers()->iov_len,
-          0, o->bufs_.registered_id().native_handle());
+          -1, o->bufs_.registered_id().native_handle());
     }
     else
     {
diff --git a/inst/include/boost/asio/detail/io_uring_descriptor_service.hpp b/inst/include/boost/asio/detail/io_uring_descriptor_service.hpp
index db6d75ac6..994d1e563 100644
--- a/inst/include/boost/asio/detail/io_uring_descriptor_service.hpp
+++ b/inst/include/boost/asio/detail/io_uring_descriptor_service.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_descriptor_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_descriptor_write_at_op.hpp b/inst/include/boost/asio/detail/io_uring_descriptor_write_at_op.hpp
index 8f96d2611..f1f105171 100644
--- a/inst/include/boost/asio/detail/io_uring_descriptor_write_at_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_descriptor_write_at_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_descriptor_write_at_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_descriptor_write_op.hpp b/inst/include/boost/asio/detail/io_uring_descriptor_write_op.hpp
index 2a9a32dc1..d82860eda 100644
--- a/inst/include/boost/asio/detail/io_uring_descriptor_write_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_descriptor_write_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_descriptor_write_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -64,7 +64,7 @@ class io_uring_descriptor_write_op_base : public io_uring_operation
     {
       ::io_uring_prep_write_fixed(sqe, o->descriptor_,
           o->bufs_.buffers()->iov_base, o->bufs_.buffers()->iov_len,
-          0, o->bufs_.registered_id().native_handle());
+          -1, o->bufs_.registered_id().native_handle());
     }
     else
     {
diff --git a/inst/include/boost/asio/detail/io_uring_file_service.hpp b/inst/include/boost/asio/detail/io_uring_file_service.hpp
index 142d62e8a..b44446241 100644
--- a/inst/include/boost/asio/detail/io_uring_file_service.hpp
+++ b/inst/include/boost/asio/detail/io_uring_file_service.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_file_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_null_buffers_op.hpp b/inst/include/boost/asio/detail/io_uring_null_buffers_op.hpp
index 6855af604..95280cb67 100644
--- a/inst/include/boost/asio/detail/io_uring_null_buffers_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_null_buffers_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_null_buffers_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_operation.hpp b/inst/include/boost/asio/detail/io_uring_operation.hpp
index 2d65718f1..4a43aaccc 100644
--- a/inst/include/boost/asio/detail/io_uring_operation.hpp
+++ b/inst/include/boost/asio/detail/io_uring_operation.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_operation.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_service.hpp b/inst/include/boost/asio/detail/io_uring_service.hpp
index 2b6c0dbb3..a5138a7b8 100644
--- a/inst/include/boost/asio/detail/io_uring_service.hpp
+++ b/inst/include/boost/asio/detail/io_uring_service.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -83,7 +83,7 @@ class io_uring_service
     io_queue queues_[max_ops];
     bool shutdown_;
 
-    BOOST_ASIO_DECL io_object(bool locking);
+    BOOST_ASIO_DECL io_object(bool locking, int spin_count);
   };
 
   // Per I/O object data.
@@ -278,6 +278,12 @@ class io_uring_service
   // Whether the service has been shut down.
   bool shutdown_;
 
+  // Whether I/O locking is enabled.
+  const bool io_locking_;
+
+  // How any times to spin waiting for the I/O mutex.
+  const int io_locking_spin_count_;
+
   // The timer queues.
   timer_queue_set timer_queues_;
 
diff --git a/inst/include/boost/asio/detail/io_uring_socket_accept_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_accept_op.hpp
index 9881db6c6..51c1c88a5 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_accept_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_accept_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_accept_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_socket_connect_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_connect_op.hpp
index 893d2b02c..5822838cc 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_connect_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_connect_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_connect_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_socket_recv_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_recv_op.hpp
index 70a3db34b..93d511d87 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_recv_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_recv_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_recv_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -71,7 +71,7 @@ class io_uring_socket_recv_op_base : public io_uring_operation
     {
       ::io_uring_prep_read_fixed(sqe, o->socket_,
           o->bufs_.buffers()->iov_base, o->bufs_.buffers()->iov_len,
-          0, o->bufs_.registered_id().native_handle());
+          -1, o->bufs_.registered_id().native_handle());
     }
     else
     {
diff --git a/inst/include/boost/asio/detail/io_uring_socket_recvfrom_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_recvfrom_op.hpp
index 97d3dc93f..789592211 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_recvfrom_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_recvfrom_op.hpp
@@ -1,8 +1,8 @@
 //
 // detail/io_uring_socket_recvfrom_op.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_socket_recvmsg_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_recvmsg_op.hpp
index d0832b69d..9d9ed0c60 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_recvmsg_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_recvmsg_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_recvmsg_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_socket_send_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_send_op.hpp
index b94322c80..4f44a8aab 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_send_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_send_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_send_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -70,7 +70,7 @@ class io_uring_socket_send_op_base : public io_uring_operation
     {
       ::io_uring_prep_write_fixed(sqe, o->socket_,
           o->bufs_.buffers()->iov_base, o->bufs_.buffers()->iov_len,
-          0, o->bufs_.registered_id().native_handle());
+          -1, o->bufs_.registered_id().native_handle());
     }
     else
     {
diff --git a/inst/include/boost/asio/detail/io_uring_socket_sendto_op.hpp b/inst/include/boost/asio/detail/io_uring_socket_sendto_op.hpp
index 547eaf50e..77dfe1b5a 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_sendto_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_sendto_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_sendto_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_socket_service.hpp b/inst/include/boost/asio/detail/io_uring_socket_service.hpp
index 8dbbd70f9..f9b67f9fc 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_service.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_service.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_socket_service_base.hpp b/inst/include/boost/asio/detail/io_uring_socket_service_base.hpp
index cafe513b4..da3d9d428 100644
--- a/inst/include/boost/asio/detail/io_uring_socket_service_base.hpp
+++ b/inst/include/boost/asio/detail/io_uring_socket_service_base.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_socket_service_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/io_uring_wait_op.hpp b/inst/include/boost/asio/detail/io_uring_wait_op.hpp
index 6b9b9c95f..5eaa53121 100644
--- a/inst/include/boost/asio/detail/io_uring_wait_op.hpp
+++ b/inst/include/boost/asio/detail/io_uring_wait_op.hpp
@@ -2,7 +2,7 @@
 // detail/io_uring_wait_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/is_buffer_sequence.hpp b/inst/include/boost/asio/detail/is_buffer_sequence.hpp
index 709702992..d684aab5e 100644
--- a/inst/include/boost/asio/detail/is_buffer_sequence.hpp
+++ b/inst/include/boost/asio/detail/is_buffer_sequence.hpp
@@ -2,7 +2,7 @@
 // detail/is_buffer_sequence.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/is_executor.hpp b/inst/include/boost/asio/detail/is_executor.hpp
index 8d3f3468a..e84397784 100644
--- a/inst/include/boost/asio/detail/is_executor.hpp
+++ b/inst/include/boost/asio/detail/is_executor.hpp
@@ -2,7 +2,7 @@
 // detail/is_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/keyword_tss_ptr.hpp b/inst/include/boost/asio/detail/keyword_tss_ptr.hpp
index 6b8e3b7d1..0b6bace91 100644
--- a/inst/include/boost/asio/detail/keyword_tss_ptr.hpp
+++ b/inst/include/boost/asio/detail/keyword_tss_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/keyword_tss_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/kqueue_reactor.hpp b/inst/include/boost/asio/detail/kqueue_reactor.hpp
index 665914333..42590104b 100644
--- a/inst/include/boost/asio/detail/kqueue_reactor.hpp
+++ b/inst/include/boost/asio/detail/kqueue_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/kqueue_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2005 Stefan Arentz (stefan at soze dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -66,7 +66,8 @@ class kqueue_reactor
   // Per-descriptor queues.
   struct descriptor_state
   {
-    descriptor_state(bool locking) : mutex_(locking) {}
+    descriptor_state(bool locking, int spin_count)
+      : mutex_(locking, spin_count) {}
 
     friend class kqueue_reactor;
     friend class object_pool_access;
@@ -250,6 +251,12 @@ class kqueue_reactor
   // Whether the service has been shut down.
   bool shutdown_;
 
+  // Whether I/O locking is enabled.
+  const bool io_locking_;
+
+  // How any times to spin waiting for the I/O mutex.
+  const int io_locking_spin_count_;
+
   // Mutex to protect access to the registered descriptors.
   mutex registered_descriptors_mutex_;
 
diff --git a/inst/include/boost/asio/detail/memory.hpp b/inst/include/boost/asio/detail/memory.hpp
index 571e568ee..4d8822429 100644
--- a/inst/include/boost/asio/detail/memory.hpp
+++ b/inst/include/boost/asio/detail/memory.hpp
@@ -2,7 +2,7 @@
 // detail/memory.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/mutex.hpp b/inst/include/boost/asio/detail/mutex.hpp
index a85497419..b3572995e 100644
--- a/inst/include/boost/asio/detail/mutex.hpp
+++ b/inst/include/boost/asio/detail/mutex.hpp
@@ -2,7 +2,7 @@
 // detail/mutex.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/non_const_lvalue.hpp b/inst/include/boost/asio/detail/non_const_lvalue.hpp
index ed373f625..b90297c9e 100644
--- a/inst/include/boost/asio/detail/non_const_lvalue.hpp
+++ b/inst/include/boost/asio/detail/non_const_lvalue.hpp
@@ -2,7 +2,7 @@
 // detail/non_const_lvalue.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/noncopyable.hpp b/inst/include/boost/asio/detail/noncopyable.hpp
index 4c625a024..e6e5e5773 100644
--- a/inst/include/boost/asio/detail/noncopyable.hpp
+++ b/inst/include/boost/asio/detail/noncopyable.hpp
@@ -2,7 +2,7 @@
 // detail/noncopyable.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_event.hpp b/inst/include/boost/asio/detail/null_event.hpp
index 1a6dcb709..5ec09f00f 100644
--- a/inst/include/boost/asio/detail/null_event.hpp
+++ b/inst/include/boost/asio/detail/null_event.hpp
@@ -2,7 +2,7 @@
 // detail/null_event.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_fenced_block.hpp b/inst/include/boost/asio/detail/null_fenced_block.hpp
index d79edc317..0c40fa7fa 100644
--- a/inst/include/boost/asio/detail/null_fenced_block.hpp
+++ b/inst/include/boost/asio/detail/null_fenced_block.hpp
@@ -2,7 +2,7 @@
 // detail/null_fenced_block.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_global.hpp b/inst/include/boost/asio/detail/null_global.hpp
index c65c77d1b..c79144d49 100644
--- a/inst/include/boost/asio/detail/null_global.hpp
+++ b/inst/include/boost/asio/detail/null_global.hpp
@@ -2,7 +2,7 @@
 // detail/null_global.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_mutex.hpp b/inst/include/boost/asio/detail/null_mutex.hpp
index c43168f06..f31e10509 100644
--- a/inst/include/boost/asio/detail/null_mutex.hpp
+++ b/inst/include/boost/asio/detail/null_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/null_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -42,6 +42,12 @@ class null_mutex
   {
   }
 
+  // Try to lock the mutex.
+  bool try_lock()
+  {
+    return true;
+  }
+
   // Lock the mutex.
   void lock()
   {
diff --git a/inst/include/boost/asio/detail/null_reactor.hpp b/inst/include/boost/asio/detail/null_reactor.hpp
index fde40d70f..3ba9cb0c3 100644
--- a/inst/include/boost/asio/detail/null_reactor.hpp
+++ b/inst/include/boost/asio/detail/null_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/null_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_signal_blocker.hpp b/inst/include/boost/asio/detail/null_signal_blocker.hpp
index 14d6807ae..b23587a56 100644
--- a/inst/include/boost/asio/detail/null_signal_blocker.hpp
+++ b/inst/include/boost/asio/detail/null_signal_blocker.hpp
@@ -2,7 +2,7 @@
 // detail/null_signal_blocker.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_socket_service.hpp b/inst/include/boost/asio/detail/null_socket_service.hpp
index e7777ef5a..10f25bc34 100644
--- a/inst/include/boost/asio/detail/null_socket_service.hpp
+++ b/inst/include/boost/asio/detail/null_socket_service.hpp
@@ -2,7 +2,7 @@
 // detail/null_socket_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_static_mutex.hpp b/inst/include/boost/asio/detail/null_static_mutex.hpp
index 08f31aa80..9205f3a8e 100644
--- a/inst/include/boost/asio/detail/null_static_mutex.hpp
+++ b/inst/include/boost/asio/detail/null_static_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/null_static_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -36,6 +36,12 @@ struct null_static_mutex
   {
   }
 
+  // Try to lock the mutex without blocking.
+  bool try_lock()
+  {
+    return true;
+  }
+
   // Lock the mutex.
   void lock()
   {
diff --git a/inst/include/boost/asio/detail/null_thread.hpp b/inst/include/boost/asio/detail/null_thread.hpp
index 973535718..3f4ec75cd 100644
--- a/inst/include/boost/asio/detail/null_thread.hpp
+++ b/inst/include/boost/asio/detail/null_thread.hpp
@@ -2,7 +2,7 @@
 // detail/null_thread.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/null_tss_ptr.hpp b/inst/include/boost/asio/detail/null_tss_ptr.hpp
index 4f7738934..47104483a 100644
--- a/inst/include/boost/asio/detail/null_tss_ptr.hpp
+++ b/inst/include/boost/asio/detail/null_tss_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/null_tss_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/object_pool.hpp b/inst/include/boost/asio/detail/object_pool.hpp
index 4243e90a7..31497fb59 100644
--- a/inst/include/boost/asio/detail/object_pool.hpp
+++ b/inst/include/boost/asio/detail/object_pool.hpp
@@ -2,7 +2,7 @@
 // detail/object_pool.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,6 +16,7 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/noncopyable.hpp>
+#include <cstddef>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -35,10 +36,10 @@ class object_pool_access
     return new Object;
   }
 
-  template <typename Object, typename Arg>
-  static Object* create(Arg arg)
+  template <typename Object, typename... Args>
+  static Object* create(Args... args)
   {
-    return new Object(arg);
+    return new Object(args...);
   }
 
   template <typename Object>
@@ -66,10 +67,19 @@ class object_pool
 {
 public:
   // Constructor.
-  object_pool()
+  template <typename... Args>
+  object_pool(unsigned int preallocated, Args... args)
     : live_list_(0),
       free_list_(0)
   {
+    while (preallocated > 0)
+    {
+      Object* o = object_pool_access::create<Object>(args...);
+      object_pool_access::next(o) = free_list_;
+      object_pool_access::prev(o) = 0;
+      free_list_ = o;
+      --preallocated;
+    }
   }
 
   // Destructor destroys all objects.
@@ -85,33 +95,15 @@ class object_pool
     return live_list_;
   }
 
-  // Allocate a new object.
-  Object* alloc()
-  {
-    Object* o = free_list_;
-    if (o)
-      free_list_ = object_pool_access::next(free_list_);
-    else
-      o = object_pool_access::create<Object>();
-
-    object_pool_access::next(o) = live_list_;
-    object_pool_access::prev(o) = 0;
-    if (live_list_)
-      object_pool_access::prev(live_list_) = o;
-    live_list_ = o;
-
-    return o;
-  }
-
   // Allocate a new object with an argument.
-  template <typename Arg>
-  Object* alloc(Arg arg)
+  template <typename... Args>
+  Object* alloc(Args... args)
   {
     Object* o = free_list_;
     if (o)
       free_list_ = object_pool_access::next(free_list_);
     else
-      o = object_pool_access::create<Object>(arg);
+      o = object_pool_access::create<Object>(args...);
 
     object_pool_access::next(o) = live_list_;
     object_pool_access::prev(o) = 0;
diff --git a/inst/include/boost/asio/detail/old_win_sdk_compat.hpp b/inst/include/boost/asio/detail/old_win_sdk_compat.hpp
index d494ac251..5bc5ddedf 100644
--- a/inst/include/boost/asio/detail/old_win_sdk_compat.hpp
+++ b/inst/include/boost/asio/detail/old_win_sdk_compat.hpp
@@ -2,7 +2,7 @@
 // detail/old_win_sdk_compat.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/op_queue.hpp b/inst/include/boost/asio/detail/op_queue.hpp
index 4f7b14250..c00341918 100644
--- a/inst/include/boost/asio/detail/op_queue.hpp
+++ b/inst/include/boost/asio/detail/op_queue.hpp
@@ -2,7 +2,7 @@
 // detail/op_queue.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/operation.hpp b/inst/include/boost/asio/detail/operation.hpp
index 088a92a40..7d8db28c6 100644
--- a/inst/include/boost/asio/detail/operation.hpp
+++ b/inst/include/boost/asio/detail/operation.hpp
@@ -2,7 +2,7 @@
 // detail/operation.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/pipe_select_interrupter.hpp b/inst/include/boost/asio/detail/pipe_select_interrupter.hpp
index 141818764..5e39cf436 100644
--- a/inst/include/boost/asio/detail/pipe_select_interrupter.hpp
+++ b/inst/include/boost/asio/detail/pipe_select_interrupter.hpp
@@ -2,7 +2,7 @@
 // detail/pipe_select_interrupter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/pop_options.hpp b/inst/include/boost/asio/detail/pop_options.hpp
index b119ae80f..a9e841f64 100644
--- a/inst/include/boost/asio/detail/pop_options.hpp
+++ b/inst/include/boost/asio/detail/pop_options.hpp
@@ -2,7 +2,7 @@
 // detail/pop_options.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_event.hpp b/inst/include/boost/asio/detail/posix_event.hpp
index caf80e70b..ed0f44607 100644
--- a/inst/include/boost/asio/detail/posix_event.hpp
+++ b/inst/include/boost/asio/detail/posix_event.hpp
@@ -2,7 +2,7 @@
 // detail/posix_event.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_fd_set_adapter.hpp b/inst/include/boost/asio/detail/posix_fd_set_adapter.hpp
index 3cd3887c0..cca47f7df 100644
--- a/inst/include/boost/asio/detail/posix_fd_set_adapter.hpp
+++ b/inst/include/boost/asio/detail/posix_fd_set_adapter.hpp
@@ -2,7 +2,7 @@
 // detail/posix_fd_set_adapter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_global.hpp b/inst/include/boost/asio/detail/posix_global.hpp
index 3e9e3a380..ea61c7379 100644
--- a/inst/include/boost/asio/detail/posix_global.hpp
+++ b/inst/include/boost/asio/detail/posix_global.hpp
@@ -2,7 +2,7 @@
 // detail/posix_global.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_mutex.hpp b/inst/include/boost/asio/detail/posix_mutex.hpp
index 6c09b8445..b31302fb2 100644
--- a/inst/include/boost/asio/detail/posix_mutex.hpp
+++ b/inst/include/boost/asio/detail/posix_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/posix_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -46,6 +46,12 @@ class posix_mutex
     ::pthread_mutex_destroy(&mutex_); // Ignore EBUSY.
   }
 
+  // Try to lock the mutex.
+  bool try_lock()
+  {
+    return ::pthread_mutex_trylock(&mutex_) == 0; // Ignore EINVAL.
+  }
+
   // Lock the mutex.
   void lock()
   {
diff --git a/inst/include/boost/asio/detail/posix_serial_port_service.hpp b/inst/include/boost/asio/detail/posix_serial_port_service.hpp
index 61552c95e..a7c1d9fba 100644
--- a/inst/include/boost/asio/detail/posix_serial_port_service.hpp
+++ b/inst/include/boost/asio/detail/posix_serial_port_service.hpp
@@ -2,7 +2,7 @@
 // detail/posix_serial_port_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/posix_signal_blocker.hpp b/inst/include/boost/asio/detail/posix_signal_blocker.hpp
index 168fe351d..0a51c34a7 100644
--- a/inst/include/boost/asio/detail/posix_signal_blocker.hpp
+++ b/inst/include/boost/asio/detail/posix_signal_blocker.hpp
@@ -2,7 +2,7 @@
 // detail/posix_signal_blocker.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_static_mutex.hpp b/inst/include/boost/asio/detail/posix_static_mutex.hpp
index a722ae82f..efe7734f6 100644
--- a/inst/include/boost/asio/detail/posix_static_mutex.hpp
+++ b/inst/include/boost/asio/detail/posix_static_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/posix_static_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_thread.hpp b/inst/include/boost/asio/detail/posix_thread.hpp
index b5f12d14b..115299425 100644
--- a/inst/include/boost/asio/detail/posix_thread.hpp
+++ b/inst/include/boost/asio/detail/posix_thread.hpp
@@ -2,7 +2,7 @@
 // detail/posix_thread.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/posix_tss_ptr.hpp b/inst/include/boost/asio/detail/posix_tss_ptr.hpp
index 9d8560d62..4394b2a08 100644
--- a/inst/include/boost/asio/detail/posix_tss_ptr.hpp
+++ b/inst/include/boost/asio/detail/posix_tss_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/posix_tss_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/push_options.hpp b/inst/include/boost/asio/detail/push_options.hpp
index 9d85645f9..8ea8c5896 100644
--- a/inst/include/boost/asio/detail/push_options.hpp
+++ b/inst/include/boost/asio/detail/push_options.hpp
@@ -2,7 +2,7 @@
 // detail/push_options.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_descriptor_service.hpp b/inst/include/boost/asio/detail/reactive_descriptor_service.hpp
index d5501efbc..301c7c478 100644
--- a/inst/include/boost/asio/detail/reactive_descriptor_service.hpp
+++ b/inst/include/boost/asio/detail/reactive_descriptor_service.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_descriptor_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -240,7 +240,7 @@ class reactive_descriptor_service :
     default:
       p.p->ec_ = boost::asio::error::invalid_argument;
       start_op(impl, reactor::read_op, p.p,
-          is_continuation, false, true, &io_ex, 0);
+          is_continuation, false, true, false, &io_ex, 0);
       p.v = p.p = 0;
       return;
     }
@@ -253,7 +253,8 @@ class reactive_descriptor_service :
             &reactor_, &impl.reactor_data_, impl.descriptor_, op_type);
     }
 
-    start_op(impl, op_type, p.p, is_continuation, false, false, &io_ex, 0);
+    start_op(impl, op_type, p.p, is_continuation,
+        false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -327,7 +328,7 @@ class reactive_descriptor_service :
 
     start_op(impl, reactor::write_op, p.p, is_continuation, true,
         buffer_sequence_adapter<boost::asio::const_buffer,
-          ConstBufferSequence>::all_empty(buffers), &io_ex, 0);
+          ConstBufferSequence>::all_empty(buffers), true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -361,7 +362,7 @@ class reactive_descriptor_service :
           &impl, impl.descriptor_, "async_write_some(null_buffers)"));
 
     start_op(impl, reactor::write_op, p.p,
-        is_continuation, false, false, &io_ex, 0);
+        is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -436,7 +437,7 @@ class reactive_descriptor_service :
 
     start_op(impl, reactor::read_op, p.p, is_continuation, true,
         buffer_sequence_adapter<boost::asio::mutable_buffer,
-          MutableBufferSequence>::all_empty(buffers), &io_ex, 0);
+          MutableBufferSequence>::all_empty(buffers), true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -470,14 +471,15 @@ class reactive_descriptor_service :
           &impl, impl.descriptor_, "async_read_some(null_buffers)"));
 
     start_op(impl, reactor::read_op, p.p,
-        is_continuation, false, false, &io_ex, 0);
+        is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
 private:
   // Start the asynchronous operation.
-  BOOST_ASIO_DECL void do_start_op(implementation_type& impl, int op_type,
-      reactor_op* op, bool is_continuation, bool is_non_blocking, bool noop,
+  BOOST_ASIO_DECL void do_start_op(implementation_type& impl,
+      int op_type, reactor_op* op, bool is_continuation,
+      bool allow_speculative, bool noop, bool needs_non_blocking,
       void (*on_immediate)(operation* op, bool, const void*),
       const void* immediate_arg);
 
@@ -485,18 +487,19 @@ class reactive_descriptor_service :
   // immediate completion.
   template <typename Op>
   void start_op(implementation_type& impl, int op_type, Op* op,
-      bool is_continuation, bool is_non_blocking, bool noop,
-      const void* io_ex, ...)
+      bool is_continuation, bool allow_speculative, bool noop,
+      bool needs_non_blocking, const void* io_ex, ...)
   {
-    return do_start_op(impl, op_type, op, is_continuation,
-        is_non_blocking, noop, &Op::do_immediate, io_ex);
+    return do_start_op(impl, op_type, op, is_continuation, allow_speculative,
+        noop, needs_non_blocking, &Op::do_immediate, io_ex);
   }
 
   // Start the asynchronous operation for handlers that are not specialised for
   // immediate completion.
   template <typename Op>
-  void start_op(implementation_type& impl, int op_type, Op* op,
-      bool is_continuation, bool is_non_blocking, bool noop, const void*,
+  void start_op(implementation_type& impl, int op_type,
+      Op* op, bool is_continuation, bool allow_speculative,
+      bool noop, bool needs_non_blocking, const void*,
       enable_if_t<
         is_same<
           typename associated_immediate_executor<
@@ -507,8 +510,9 @@ class reactive_descriptor_service :
         >::value
       >*)
   {
-    return do_start_op(impl, op_type, op, is_continuation, is_non_blocking,
-        noop, &reactor::call_post_immediate_completion, &reactor_);
+    return do_start_op(impl, op_type, op, is_continuation,
+        allow_speculative, noop, needs_non_blocking,
+        &reactor::call_post_immediate_completion, &reactor_);
   }
 
   // Helper class used to implement per-operation cancellation
diff --git a/inst/include/boost/asio/detail/reactive_null_buffers_op.hpp b/inst/include/boost/asio/detail/reactive_null_buffers_op.hpp
index 6517da1a4..2b0cc89d5 100644
--- a/inst/include/boost/asio/detail/reactive_null_buffers_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_null_buffers_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_null_buffers_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_accept_op.hpp b/inst/include/boost/asio/detail/reactive_socket_accept_op.hpp
index 3cb0050a3..b22aedfeb 100644
--- a/inst/include/boost/asio/detail/reactive_socket_accept_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_accept_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_accept_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_connect_op.hpp b/inst/include/boost/asio/detail/reactive_socket_connect_op.hpp
index 92fc41a5a..4711c5e08 100644
--- a/inst/include/boost/asio/detail/reactive_socket_connect_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_connect_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_connect_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_recv_op.hpp b/inst/include/boost/asio/detail/reactive_socket_recv_op.hpp
index c280894e4..9ad6bdff8 100644
--- a/inst/include/boost/asio/detail/reactive_socket_recv_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_recv_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_recv_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_recvfrom_op.hpp b/inst/include/boost/asio/detail/reactive_socket_recvfrom_op.hpp
index 36674a20c..c8cd39fd2 100644
--- a/inst/include/boost/asio/detail/reactive_socket_recvfrom_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_recvfrom_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_recvfrom_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_recvmsg_op.hpp b/inst/include/boost/asio/detail/reactive_socket_recvmsg_op.hpp
index 16e7ae85f..58a525d2a 100644
--- a/inst/include/boost/asio/detail/reactive_socket_recvmsg_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_recvmsg_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_recvmsg_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_send_op.hpp b/inst/include/boost/asio/detail/reactive_socket_send_op.hpp
index 5bcb3a239..09740564a 100644
--- a/inst/include/boost/asio/detail/reactive_socket_send_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_send_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_send_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -188,7 +188,6 @@ class reactive_socket_send_op :
     BOOST_ASIO_HANDLER_INVOCATION_END;
   }
 
-
 private:
   Handler handler_;
   handler_work<Handler, IoExecutor> work_;
diff --git a/inst/include/boost/asio/detail/reactive_socket_sendto_op.hpp b/inst/include/boost/asio/detail/reactive_socket_sendto_op.hpp
index 0b8867a57..163510c35 100644
--- a/inst/include/boost/asio/detail/reactive_socket_sendto_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_sendto_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_sendto_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactive_socket_service.hpp b/inst/include/boost/asio/detail/reactive_socket_service.hpp
index 65deb0db4..85e92e6b4 100644
--- a/inst/include/boost/asio/detail/reactive_socket_service.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_service.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -308,7 +308,7 @@ class reactive_socket_service :
           &impl, impl.socket_, "async_send_to"));
 
     start_op(impl, reactor::write_op, p.p,
-        is_continuation, true, false, &io_ex, 0);
+        is_continuation, true, false, true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -342,7 +342,7 @@ class reactive_socket_service :
           &impl, impl.socket_, "async_send_to(null_buffers)"));
 
     start_op(impl, reactor::write_op, p.p,
-        is_continuation, false, false, &io_ex, 0);
+        is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -433,7 +433,7 @@ class reactive_socket_service :
     start_op(impl,
         (flags & socket_base::message_out_of_band)
           ? reactor::except_op : reactor::read_op,
-        p.p, is_continuation, true, false, &io_ex, 0);
+        p.p, is_continuation, true, false, true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -472,7 +472,7 @@ class reactive_socket_service :
     start_op(impl,
         (flags & socket_base::message_out_of_band)
           ? reactor::except_op : reactor::read_op,
-        p.p, is_continuation, false, false, &io_ex, 0);
+        p.p, is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
diff --git a/inst/include/boost/asio/detail/reactive_socket_service_base.hpp b/inst/include/boost/asio/detail/reactive_socket_service_base.hpp
index dfce541cf..0de10a94d 100644
--- a/inst/include/boost/asio/detail/reactive_socket_service_base.hpp
+++ b/inst/include/boost/asio/detail/reactive_socket_service_base.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_service_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -230,7 +230,7 @@ class reactive_socket_service_base
     default:
       p.p->ec_ = boost::asio::error::invalid_argument;
       start_op(impl, reactor::read_op, p.p,
-          is_continuation, false, true, &io_ex, 0);
+          is_continuation, false, true, false, &io_ex, 0);
       p.v = p.p = 0;
       return;
     }
@@ -243,7 +243,8 @@ class reactive_socket_service_base
             &reactor_, &impl.reactor_data_, impl.socket_, op_type);
     }
 
-    start_op(impl, op_type, p.p, is_continuation, false, false, &io_ex, 0);
+    start_op(impl, op_type, p.p, is_continuation,
+        false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -315,7 +316,7 @@ class reactive_socket_service_base
     start_op(impl, reactor::write_op, p.p, is_continuation, true,
         ((impl.state_ & socket_ops::stream_oriented)
           && buffer_sequence_adapter<boost::asio::const_buffer,
-            ConstBufferSequence>::all_empty(buffers)), &io_ex, 0);
+            ConstBufferSequence>::all_empty(buffers)), true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -348,7 +349,7 @@ class reactive_socket_service_base
           &impl, impl.socket_, "async_send(null_buffers)"));
 
     start_op(impl, reactor::write_op, p.p,
-        is_continuation, false, false, &io_ex, 0);
+        is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -425,7 +426,7 @@ class reactive_socket_service_base
         (flags & socket_base::message_out_of_band) == 0,
         ((impl.state_ & socket_ops::stream_oriented)
           && buffer_sequence_adapter<boost::asio::mutable_buffer,
-            MutableBufferSequence>::all_empty(buffers)), &io_ex, 0);
+            MutableBufferSequence>::all_empty(buffers)), true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -461,7 +462,7 @@ class reactive_socket_service_base
     start_op(impl,
         (flags & socket_base::message_out_of_band)
           ? reactor::except_op : reactor::read_op,
-        p.p, is_continuation, false, false, &io_ex, 0);
+        p.p, is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -533,7 +534,8 @@ class reactive_socket_service_base
         (in_flags & socket_base::message_out_of_band)
           ? reactor::except_op : reactor::read_op,
         p.p, is_continuation,
-        (in_flags & socket_base::message_out_of_band) == 0, false, &io_ex, 0);
+        (in_flags & socket_base::message_out_of_band) == 0,
+        false, true, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -574,7 +576,7 @@ class reactive_socket_service_base
     start_op(impl,
         (in_flags & socket_base::message_out_of_band)
           ? reactor::except_op : reactor::read_op,
-        p.p, is_continuation, false, false, &io_ex, 0);
+        p.p, is_continuation, false, false, false, &io_ex, 0);
     p.v = p.p = 0;
   }
 
@@ -590,8 +592,9 @@ class reactive_socket_service_base
       const native_handle_type& native_socket, boost::system::error_code& ec);
 
   // Start the asynchronous read or write operation.
-  BOOST_ASIO_DECL void do_start_op(base_implementation_type& impl, int op_type,
-      reactor_op* op, bool is_continuation, bool is_non_blocking, bool noop,
+  BOOST_ASIO_DECL void do_start_op(base_implementation_type& impl,
+      int op_type, reactor_op* op, bool is_continuation,
+      bool allow_speculative, bool noop, bool needs_non_blocking,
       void (*on_immediate)(operation* op, bool, const void*),
       const void* immediate_arg);
 
@@ -599,18 +602,19 @@ class reactive_socket_service_base
   // immediate completion.
   template <typename Op>
   void start_op(base_implementation_type& impl, int op_type, Op* op,
-      bool is_continuation, bool is_non_blocking, bool noop,
-      const void* io_ex, ...)
+      bool is_continuation, bool allow_speculative, bool noop,
+      bool needs_non_blocking, const void* io_ex, ...)
   {
-    return do_start_op(impl, op_type, op, is_continuation,
-        is_non_blocking, noop, &Op::do_immediate, io_ex);
+    return do_start_op(impl, op_type, op, is_continuation, allow_speculative,
+        noop, needs_non_blocking, &Op::do_immediate, io_ex);
   }
 
   // Start the asynchronous operation for handlers that are not specialised for
   // immediate completion.
   template <typename Op>
-  void start_op(base_implementation_type& impl, int op_type, Op* op,
-      bool is_continuation, bool is_non_blocking, bool noop, const void*,
+  void start_op(base_implementation_type& impl, int op_type,
+      Op* op, bool is_continuation, bool allow_speculative,
+      bool noop, bool needs_non_blocking, const void*,
       enable_if_t<
         is_same<
           typename associated_immediate_executor<
@@ -621,8 +625,9 @@ class reactive_socket_service_base
         >::value
       >*)
   {
-    return do_start_op(impl, op_type, op, is_continuation, is_non_blocking,
-        noop, &reactor::call_post_immediate_completion, &reactor_);
+    return do_start_op(impl, op_type, op, is_continuation,
+        allow_speculative, noop, needs_non_blocking,
+        &reactor::call_post_immediate_completion, &reactor_);
   }
 
   // Start the asynchronous accept operation.
diff --git a/inst/include/boost/asio/detail/reactive_wait_op.hpp b/inst/include/boost/asio/detail/reactive_wait_op.hpp
index 34ed60efb..baf8bae6e 100644
--- a/inst/include/boost/asio/detail/reactive_wait_op.hpp
+++ b/inst/include/boost/asio/detail/reactive_wait_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_wait_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactor.hpp b/inst/include/boost/asio/detail/reactor.hpp
index 76ca947ee..112083a53 100644
--- a/inst/include/boost/asio/detail/reactor.hpp
+++ b/inst/include/boost/asio/detail/reactor.hpp
@@ -2,7 +2,7 @@
 // detail/reactor.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactor_op.hpp b/inst/include/boost/asio/detail/reactor_op.hpp
index 1f37e6eb9..72f108e8b 100644
--- a/inst/include/boost/asio/detail/reactor_op.hpp
+++ b/inst/include/boost/asio/detail/reactor_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactor_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/reactor_op_queue.hpp b/inst/include/boost/asio/detail/reactor_op_queue.hpp
index e527ea0bd..3d90a981e 100644
--- a/inst/include/boost/asio/detail/reactor_op_queue.hpp
+++ b/inst/include/boost/asio/detail/reactor_op_queue.hpp
@@ -2,7 +2,7 @@
 // detail/reactor_op_queue.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/recycling_allocator.hpp b/inst/include/boost/asio/detail/recycling_allocator.hpp
index 6662bf40e..46331f33f 100644
--- a/inst/include/boost/asio/detail/recycling_allocator.hpp
+++ b/inst/include/boost/asio/detail/recycling_allocator.hpp
@@ -2,7 +2,7 @@
 // detail/recycling_allocator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -49,16 +49,25 @@ class recycling_allocator
 
   T* allocate(std::size_t n)
   {
+#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
     void* p = thread_info_base::allocate(Purpose(),
         thread_context::top_of_thread_call_stack(),
         sizeof(T) * n, alignof(T));
+#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
+    void* p = boost::asio::aligned_new(alignof(T), sizeof(T) * n);
+#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
     return static_cast<T*>(p);
   }
 
   void deallocate(T* p, std::size_t n)
   {
+#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
     thread_info_base::deallocate(Purpose(),
         thread_context::top_of_thread_call_stack(), p, sizeof(T) * n);
+#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
+    (void)n;
+    boost::asio::aligned_delete(p);
+#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
   }
 };
 
diff --git a/inst/include/boost/asio/detail/regex_fwd.hpp b/inst/include/boost/asio/detail/regex_fwd.hpp
index 09aa0cc21..42aad7e2d 100644
--- a/inst/include/boost/asio/detail/regex_fwd.hpp
+++ b/inst/include/boost/asio/detail/regex_fwd.hpp
@@ -2,7 +2,7 @@
 // detail/regex_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/resolve_endpoint_op.hpp b/inst/include/boost/asio/detail/resolve_endpoint_op.hpp
index c2a0b436d..74f19855d 100644
--- a/inst/include/boost/asio/detail/resolve_endpoint_op.hpp
+++ b/inst/include/boost/asio/detail/resolve_endpoint_op.hpp
@@ -2,7 +2,7 @@
 // detail/resolve_endpoint_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -78,7 +78,7 @@ class resolve_endpoint_op : public resolve_op
     {
       // The operation is being run on the worker io_context. Time to perform
       // the resolver operation.
-    
+
       // Perform the blocking endpoint resolution operation.
       char host_name[NI_MAXHOST] = "";
       char service_name[NI_MAXSERV] = "";
diff --git a/inst/include/boost/asio/detail/resolve_op.hpp b/inst/include/boost/asio/detail/resolve_op.hpp
index 2d8ba749a..3a8ac12c4 100644
--- a/inst/include/boost/asio/detail/resolve_op.hpp
+++ b/inst/include/boost/asio/detail/resolve_op.hpp
@@ -2,7 +2,7 @@
 // detail/resolve_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/resolve_query_op.hpp b/inst/include/boost/asio/detail/resolve_query_op.hpp
index 60eb659cc..369131da4 100644
--- a/inst/include/boost/asio/detail/resolve_query_op.hpp
+++ b/inst/include/boost/asio/detail/resolve_query_op.hpp
@@ -2,7 +2,7 @@
 // detail/resolve_query_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -86,7 +86,7 @@ class resolve_query_op : public resolve_op
     {
       // The operation is being run on the worker io_context. Time to perform
       // the resolver operation.
-    
+
       // Perform the blocking host resolution operation.
       socket_ops::background_getaddrinfo(o->cancel_token_,
           o->query_.host_name().c_str(), o->query_.service_name().c_str(),
diff --git a/inst/include/boost/asio/detail/resolver_service.hpp b/inst/include/boost/asio/detail/resolver_service.hpp
index d7cff9dc6..9cac88882 100644
--- a/inst/include/boost/asio/detail/resolver_service.hpp
+++ b/inst/include/boost/asio/detail/resolver_service.hpp
@@ -2,7 +2,7 @@
 // detail/resolver_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -21,7 +21,6 @@
 
 #include <boost/asio/ip/basic_resolver_query.hpp>
 #include <boost/asio/ip/basic_resolver_results.hpp>
-#include <boost/asio/detail/concurrency_hint.hpp>
 #include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/resolve_endpoint_op.hpp>
 #include <boost/asio/detail/resolve_query_op.hpp>
diff --git a/inst/include/boost/asio/detail/resolver_service_base.hpp b/inst/include/boost/asio/detail/resolver_service_base.hpp
index 0fce6e347..b9ffa18c6 100644
--- a/inst/include/boost/asio/detail/resolver_service_base.hpp
+++ b/inst/include/boost/asio/detail/resolver_service_base.hpp
@@ -2,7 +2,7 @@
 // detail/resolver_service_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -145,6 +145,9 @@ class resolver_service_base
 
   // Thread used for running the work io_context's run loop.
   boost::asio::detail::scoped_ptr<boost::asio::detail::thread> work_thread_;
+
+  // Whether the scheduler locking is enabled.
+  bool scheduler_locking_;
 };
 
 } // namespace detail
diff --git a/inst/include/boost/asio/detail/scheduler.hpp b/inst/include/boost/asio/detail/scheduler.hpp
index b68f541d5..a8757ab0d 100644
--- a/inst/include/boost/asio/detail/scheduler.hpp
+++ b/inst/include/boost/asio/detail/scheduler.hpp
@@ -2,7 +2,7 @@
 // detail/scheduler.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -47,10 +47,9 @@ class scheduler
   typedef scheduler_task* (*get_task_func_type)(
       boost::asio::execution_context&);
 
-  // Constructor. Specifies the number of concurrent threads that are likely to
-  // run the scheduler. If set to 1 certain optimisation are performed.
+  // Constructor.
   BOOST_ASIO_DECL scheduler(boost::asio::execution_context& ctx,
-      int concurrency_hint = 0, bool own_thread = true,
+      bool own_thread = true,
       get_task_func_type get_task = &scheduler::get_default_task);
 
   // Destructor.
@@ -136,12 +135,6 @@ class scheduler
   // work_started() was previously called for the operations.
   BOOST_ASIO_DECL void abandon_operations(op_queue<operation>& ops);
 
-  // Get the concurrency hint that was used to initialise the scheduler.
-  int concurrency_hint() const
-  {
-    return concurrency_hint_;
-  }
-
 private:
   // The mutex type used by this scheduler.
   typedef conditionally_enabled_mutex mutex;
@@ -226,6 +219,12 @@ class scheduler
   // The concurrency hint used to initialise the scheduler.
   const int concurrency_hint_;
 
+  // The time limit on running the scheduler task, in microseconds.
+  const long task_usec_;
+
+  // The time limit on waiting when the queue is empty, in microseconds.
+  const long wait_usec_;
+
   // The thread that is running the scheduler.
   boost::asio::detail::thread* thread_;
 };
diff --git a/inst/include/boost/asio/detail/scheduler_operation.hpp b/inst/include/boost/asio/detail/scheduler_operation.hpp
index 8b66e814f..c2d7dc53e 100644
--- a/inst/include/boost/asio/detail/scheduler_operation.hpp
+++ b/inst/include/boost/asio/detail/scheduler_operation.hpp
@@ -2,7 +2,7 @@
 // detail/scheduler_operation.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/scheduler_task.hpp b/inst/include/boost/asio/detail/scheduler_task.hpp
index f8fac9b1f..eb2716a69 100644
--- a/inst/include/boost/asio/detail/scheduler_task.hpp
+++ b/inst/include/boost/asio/detail/scheduler_task.hpp
@@ -2,7 +2,7 @@
 // detail/scheduler_task.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/scheduler_thread_info.hpp b/inst/include/boost/asio/detail/scheduler_thread_info.hpp
index c692ced35..986a813bc 100644
--- a/inst/include/boost/asio/detail/scheduler_thread_info.hpp
+++ b/inst/include/boost/asio/detail/scheduler_thread_info.hpp
@@ -2,7 +2,7 @@
 // detail/scheduler_thread_info.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/scoped_lock.hpp b/inst/include/boost/asio/detail/scoped_lock.hpp
index 56a8f2742..7231d615b 100644
--- a/inst/include/boost/asio/detail/scoped_lock.hpp
+++ b/inst/include/boost/asio/detail/scoped_lock.hpp
@@ -2,7 +2,7 @@
 // detail/scoped_lock.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/scoped_ptr.hpp b/inst/include/boost/asio/detail/scoped_ptr.hpp
index a5ef527b8..d77052b22 100644
--- a/inst/include/boost/asio/detail/scoped_ptr.hpp
+++ b/inst/include/boost/asio/detail/scoped_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/scoped_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/select_interrupter.hpp b/inst/include/boost/asio/detail/select_interrupter.hpp
index 953b81756..ced0e9d56 100644
--- a/inst/include/boost/asio/detail/select_interrupter.hpp
+++ b/inst/include/boost/asio/detail/select_interrupter.hpp
@@ -2,7 +2,7 @@
 // detail/select_interrupter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/select_reactor.hpp b/inst/include/boost/asio/detail/select_reactor.hpp
index a4b8b81ab..3c8f0ad51 100644
--- a/inst/include/boost/asio/detail/select_reactor.hpp
+++ b/inst/include/boost/asio/detail/select_reactor.hpp
@@ -2,7 +2,7 @@
 // detail/select_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/service_registry.hpp b/inst/include/boost/asio/detail/service_registry.hpp
index 77049faa1..664128805 100644
--- a/inst/include/boost/asio/detail/service_registry.hpp
+++ b/inst/include/boost/asio/detail/service_registry.hpp
@@ -2,7 +2,7 @@
 // detail/service_registry.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -77,12 +77,12 @@ class service_registry
   bool has_service() const;
 
 private:
-  // Initalise a service's key when the key_type typedef is not available.
+  // Initialise a service's key when the key_type typedef is not available.
   template <typename Service>
   static void init_key(execution_context::service::key& key, ...);
 
 #if !defined(BOOST_ASIO_NO_TYPEID)
-  // Initalise a service's key when the key_type typedef is available.
+  // Initialise a service's key when the key_type typedef is available.
   template <typename Service>
   static void init_key(execution_context::service::key& key,
       enable_if_t<is_base_of<typename Service::key_type, Service>::value>*);
diff --git a/inst/include/boost/asio/detail/signal_blocker.hpp b/inst/include/boost/asio/detail/signal_blocker.hpp
index 88ac5f632..1dc478640 100644
--- a/inst/include/boost/asio/detail/signal_blocker.hpp
+++ b/inst/include/boost/asio/detail/signal_blocker.hpp
@@ -2,7 +2,7 @@
 // detail/signal_blocker.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/signal_handler.hpp b/inst/include/boost/asio/detail/signal_handler.hpp
index 01cc0ec27..d88b1d5d7 100644
--- a/inst/include/boost/asio/detail/signal_handler.hpp
+++ b/inst/include/boost/asio/detail/signal_handler.hpp
@@ -2,7 +2,7 @@
 // detail/signal_handler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/signal_init.hpp b/inst/include/boost/asio/detail/signal_init.hpp
index 9fbb092cc..35fed75df 100644
--- a/inst/include/boost/asio/detail/signal_init.hpp
+++ b/inst/include/boost/asio/detail/signal_init.hpp
@@ -2,7 +2,7 @@
 // detail/signal_init.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/signal_op.hpp b/inst/include/boost/asio/detail/signal_op.hpp
index 82c1e50f1..cad9967e7 100644
--- a/inst/include/boost/asio/detail/signal_op.hpp
+++ b/inst/include/boost/asio/detail/signal_op.hpp
@@ -2,7 +2,7 @@
 // detail/signal_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/signal_set_service.hpp b/inst/include/boost/asio/detail/signal_set_service.hpp
index ea2dddf7a..62271698d 100644
--- a/inst/include/boost/asio/detail/signal_set_service.hpp
+++ b/inst/include/boost/asio/detail/signal_set_service.hpp
@@ -2,7 +2,7 @@
 // detail/signal_set_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/socket_holder.hpp b/inst/include/boost/asio/detail/socket_holder.hpp
index 73c37f1d6..0aed4f06c 100644
--- a/inst/include/boost/asio/detail/socket_holder.hpp
+++ b/inst/include/boost/asio/detail/socket_holder.hpp
@@ -2,7 +2,7 @@
 // detail/socket_holder.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/socket_ops.hpp b/inst/include/boost/asio/detail/socket_ops.hpp
index 8ce16c139..8d80e5d40 100644
--- a/inst/include/boost/asio/detail/socket_ops.hpp
+++ b/inst/include/boost/asio/detail/socket_ops.hpp
@@ -2,7 +2,7 @@
 // detail/socket_ops.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/socket_option.hpp b/inst/include/boost/asio/detail/socket_option.hpp
index 04c6a8769..c1545e048 100644
--- a/inst/include/boost/asio/detail/socket_option.hpp
+++ b/inst/include/boost/asio/detail/socket_option.hpp
@@ -2,7 +2,7 @@
 // detail/socket_option.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/socket_select_interrupter.hpp b/inst/include/boost/asio/detail/socket_select_interrupter.hpp
index 217542edb..b124694a7 100644
--- a/inst/include/boost/asio/detail/socket_select_interrupter.hpp
+++ b/inst/include/boost/asio/detail/socket_select_interrupter.hpp
@@ -2,7 +2,7 @@
 // detail/socket_select_interrupter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/socket_types.hpp b/inst/include/boost/asio/detail/socket_types.hpp
index 7c6f0cd47..300f30945 100644
--- a/inst/include/boost/asio/detail/socket_types.hpp
+++ b/inst/include/boost/asio/detail/socket_types.hpp
@@ -2,7 +2,7 @@
 // detail/socket_types.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/source_location.hpp b/inst/include/boost/asio/detail/source_location.hpp
index ef7bec1ef..176733f26 100644
--- a/inst/include/boost/asio/detail/source_location.hpp
+++ b/inst/include/boost/asio/detail/source_location.hpp
@@ -2,7 +2,7 @@
 // detail/source_location.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/static_mutex.hpp b/inst/include/boost/asio/detail/static_mutex.hpp
index ecd1f989f..f3603dce9 100644
--- a/inst/include/boost/asio/detail/static_mutex.hpp
+++ b/inst/include/boost/asio/detail/static_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/static_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/std_event.hpp b/inst/include/boost/asio/detail/std_event.hpp
index 2bd126b5d..e16f627dd 100644
--- a/inst/include/boost/asio/detail/std_event.hpp
+++ b/inst/include/boost/asio/detail/std_event.hpp
@@ -2,7 +2,7 @@
 // detail/std_event.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/std_fenced_block.hpp b/inst/include/boost/asio/detail/std_fenced_block.hpp
index 5aa605a41..8ff3f6a79 100644
--- a/inst/include/boost/asio/detail/std_fenced_block.hpp
+++ b/inst/include/boost/asio/detail/std_fenced_block.hpp
@@ -2,7 +2,7 @@
 // detail/std_fenced_block.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/std_global.hpp b/inst/include/boost/asio/detail/std_global.hpp
index 5826dd0da..ed5b8a379 100644
--- a/inst/include/boost/asio/detail/std_global.hpp
+++ b/inst/include/boost/asio/detail/std_global.hpp
@@ -2,7 +2,7 @@
 // detail/std_global.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/std_mutex.hpp b/inst/include/boost/asio/detail/std_mutex.hpp
index 84f67d113..8bf901d6c 100644
--- a/inst/include/boost/asio/detail/std_mutex.hpp
+++ b/inst/include/boost/asio/detail/std_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/std_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -44,6 +44,12 @@ class std_mutex
   {
   }
 
+  // Try to lock the mutex.
+  bool try_lock()
+  {
+    return mutex_.try_lock();
+  }
+
   // Lock the mutex.
   void lock()
   {
diff --git a/inst/include/boost/asio/detail/std_static_mutex.hpp b/inst/include/boost/asio/detail/std_static_mutex.hpp
index 2dff75baf..9c94340e2 100644
--- a/inst/include/boost/asio/detail/std_static_mutex.hpp
+++ b/inst/include/boost/asio/detail/std_static_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/std_static_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/std_thread.hpp b/inst/include/boost/asio/detail/std_thread.hpp
index e8cc2f15c..99b2feb27 100644
--- a/inst/include/boost/asio/detail/std_thread.hpp
+++ b/inst/include/boost/asio/detail/std_thread.hpp
@@ -2,7 +2,7 @@
 // detail/std_thread.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/strand_executor_service.hpp b/inst/include/boost/asio/detail/strand_executor_service.hpp
index 9534a9e78..6c2438757 100644
--- a/inst/include/boost/asio/detail/strand_executor_service.hpp
+++ b/inst/include/boost/asio/detail/strand_executor_service.hpp
@@ -2,7 +2,7 @@
 // detail/strand_executor_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/strand_service.hpp b/inst/include/boost/asio/detail/strand_service.hpp
index 3959056a1..fe9cff5cf 100644
--- a/inst/include/boost/asio/detail/strand_service.hpp
+++ b/inst/include/boost/asio/detail/strand_service.hpp
@@ -2,7 +2,7 @@
 // detail/strand_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/string_view.hpp b/inst/include/boost/asio/detail/string_view.hpp
index ad27b3480..19c00f596 100644
--- a/inst/include/boost/asio/detail/string_view.hpp
+++ b/inst/include/boost/asio/detail/string_view.hpp
@@ -2,7 +2,7 @@
 // detail/string_view.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/thread.hpp b/inst/include/boost/asio/detail/thread.hpp
index a8064508d..70365845c 100644
--- a/inst/include/boost/asio/detail/thread.hpp
+++ b/inst/include/boost/asio/detail/thread.hpp
@@ -2,7 +2,7 @@
 // detail/thread.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/thread_context.hpp b/inst/include/boost/asio/detail/thread_context.hpp
index c5ca10c04..58542fa78 100644
--- a/inst/include/boost/asio/detail/thread_context.hpp
+++ b/inst/include/boost/asio/detail/thread_context.hpp
@@ -2,7 +2,7 @@
 // detail/thread_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/thread_group.hpp b/inst/include/boost/asio/detail/thread_group.hpp
index cfcd849c9..787c23e8f 100644
--- a/inst/include/boost/asio/detail/thread_group.hpp
+++ b/inst/include/boost/asio/detail/thread_group.hpp
@@ -2,7 +2,7 @@
 // detail/thread_group.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/thread_info_base.hpp b/inst/include/boost/asio/detail/thread_info_base.hpp
index 7a26041ea..8676ccc50 100644
--- a/inst/include/boost/asio/detail/thread_info_base.hpp
+++ b/inst/include/boost/asio/detail/thread_info_base.hpp
@@ -2,7 +2,7 @@
 // detail/thread_info_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -90,7 +90,17 @@ class thread_info_base
     };
   };
 
-  enum { max_mem_index = parallel_group_tag::end_mem_index };
+  struct timed_cancel_tag
+  {
+    enum
+    {
+      cache_size = BOOST_ASIO_RECYCLING_ALLOCATOR_CACHE_SIZE,
+      begin_mem_index = parallel_group_tag::end_mem_index,
+      end_mem_index = begin_mem_index + cache_size
+    };
+  };
+
+  enum { max_mem_index = timed_cancel_tag::end_mem_index };
 
   thread_info_base()
 #if !defined(BOOST_ASIO_NO_EXCEPTIONS)
diff --git a/inst/include/boost/asio/detail/throw_error.hpp b/inst/include/boost/asio/detail/throw_error.hpp
index 57d40560b..fd4e23228 100644
--- a/inst/include/boost/asio/detail/throw_error.hpp
+++ b/inst/include/boost/asio/detail/throw_error.hpp
@@ -2,7 +2,7 @@
 // detail/throw_error.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/throw_exception.hpp b/inst/include/boost/asio/detail/throw_exception.hpp
index 394ceef5e..2de5a10df 100644
--- a/inst/include/boost/asio/detail/throw_exception.hpp
+++ b/inst/include/boost/asio/detail/throw_exception.hpp
@@ -2,7 +2,7 @@
 // detail/throw_exception.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/timed_cancel_op.hpp b/inst/include/boost/asio/detail/timed_cancel_op.hpp
new file mode 100644
index 000000000..3464e48bc
--- /dev/null
+++ b/inst/include/boost/asio/detail/timed_cancel_op.hpp
@@ -0,0 +1,363 @@
+//
+// detail/timed_cancel_op.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DETAIL_TIMED_CANCEL_OP_HPP
+#define BOOST_ASIO_DETAIL_TIMED_CANCEL_OP_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/associated_cancellation_slot.hpp>
+#include <boost/asio/associator.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/cancellation_signal.hpp>
+#include <boost/asio/detail/atomic_count.hpp>
+#include <boost/asio/detail/completion_payload.hpp>
+#include <boost/asio/detail/completion_payload_handler.hpp>
+#include <boost/asio/detail/handler_alloc_helpers.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Op, typename... Signatures>
+class timed_cancel_op_handler;
+
+template <typename Op>
+class timed_cancel_timer_handler;
+
+template <typename Handler, typename Timer, typename... Signatures>
+class timed_cancel_op
+{
+public:
+  using handler_type = Handler;
+
+  BOOST_ASIO_DEFINE_TAGGED_HANDLER_PTR(
+      thread_info_base::timed_cancel_tag, timed_cancel_op);
+
+  timed_cancel_op(Handler& handler, Timer timer,
+      cancellation_type_t cancel_type)
+    : ref_count_(2),
+      handler_(static_cast<Handler&&>(handler)),
+      timer_(static_cast<Timer&&>(timer)),
+      cancellation_type_(cancel_type),
+      cancel_proxy_(nullptr),
+      has_payload_(false),
+      has_pending_timer_wait_(true)
+  {
+  }
+
+  ~timed_cancel_op()
+  {
+    if (has_payload_)
+      payload_storage_.payload_.~payload_type();
+  }
+
+  cancellation_slot get_cancellation_slot() noexcept
+  {
+    return cancellation_signal_.slot();
+  }
+
+  template <typename Initiation, typename... Args>
+  void start(Initiation&& initiation, Args&&... args)
+  {
+    using op_handler_type =
+      timed_cancel_op_handler<timed_cancel_op, Signatures...>;
+    op_handler_type op_handler(this);
+
+    using timer_handler_type =
+      timed_cancel_timer_handler<timed_cancel_op>;
+    timer_handler_type timer_handler(this);
+
+    associated_cancellation_slot_t<Handler> slot
+      = (get_associated_cancellation_slot)(handler_);
+    if (slot.is_connected())
+      cancel_proxy_ = &slot.template emplace<cancel_proxy>(this);
+
+    timer_.async_wait(static_cast<timer_handler_type&&>(timer_handler));
+    async_initiate<op_handler_type, Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        static_cast<op_handler_type&>(op_handler),
+        static_cast<Args&&>(args)...);
+  }
+
+  template <typename Message>
+  void handle_op(Message&& message)
+  {
+    if (cancel_proxy_)
+      cancel_proxy_->op_ = nullptr;
+
+    new (&payload_storage_.payload_) payload_type(
+        static_cast<Message&&>(message));
+    has_payload_ = true;
+
+    if (has_pending_timer_wait_)
+    {
+      timer_.cancel();
+      release();
+    }
+    else
+    {
+      complete();
+    }
+  }
+
+  void handle_timer()
+  {
+    has_pending_timer_wait_ = false;
+
+    if (has_payload_)
+    {
+      complete();
+    }
+    else
+    {
+      cancellation_signal_.emit(cancellation_type_);
+      release();
+    }
+  }
+
+  void release()
+  {
+    if (--ref_count_ == 0)
+    {
+      ptr p = { boost::asio::detail::addressof(handler_), this, this };
+      Handler handler(static_cast<Handler&&>(handler_));
+      p.h = boost::asio::detail::addressof(handler);
+      p.reset();
+    }
+  }
+
+  void complete()
+  {
+    if (--ref_count_ == 0)
+    {
+      ptr p = { boost::asio::detail::addressof(handler_), this, this };
+      completion_payload_handler<payload_type, Handler> handler(
+          static_cast<payload_type&&>(payload_storage_.payload_), handler_);
+      p.h = boost::asio::detail::addressof(handler.handler());
+      p.reset();
+      handler();
+    }
+  }
+
+//private:
+  typedef completion_payload<Signatures...> payload_type;
+
+  struct cancel_proxy
+  {
+    cancel_proxy(timed_cancel_op* op)
+      : op_(op)
+    {
+    }
+
+    void operator()(cancellation_type_t type)
+    {
+      if (op_)
+        op_->cancellation_signal_.emit(type);
+    }
+
+    timed_cancel_op* op_;
+  };
+
+  // The number of handlers that share a reference to the state.
+  atomic_count ref_count_;
+
+  // The handler to be called when the operation completes.
+  Handler handler_;
+
+  // The timer used to determine when to cancel the pending operation.
+  Timer timer_;
+
+  // The cancellation signal and type used to cancel the pending operation.
+  cancellation_signal cancellation_signal_;
+  cancellation_type_t cancellation_type_;
+
+  // A proxy cancel handler used to allow cancellation of the timed operation.
+  cancel_proxy* cancel_proxy_;
+
+  // Arguments to be passed to the completion handler.
+  union payload_storage
+  {
+    payload_storage() {}
+    ~payload_storage() {}
+
+    char dummy_;
+    payload_type payload_;
+  } payload_storage_;
+
+  // Whether the payload storage contains a valid payload.
+  bool has_payload_;
+
+  // Whether the asynchronous wait on the timer is still pending
+  bool has_pending_timer_wait_;
+};
+
+template <typename Op, typename R, typename... Args>
+class timed_cancel_op_handler<Op, R(Args...)>
+{
+public:
+  using cancellation_slot_type = cancellation_slot;
+
+  explicit timed_cancel_op_handler(Op* op)
+    : op_(op)
+  {
+  }
+
+  timed_cancel_op_handler(timed_cancel_op_handler&& other) noexcept
+    : op_(other.op_)
+  {
+    other.op_ = nullptr;
+  }
+
+  ~timed_cancel_op_handler()
+  {
+    if (op_)
+      op_->release();
+  }
+
+  cancellation_slot_type get_cancellation_slot() const noexcept
+  {
+    return op_->get_cancellation_slot();
+  }
+
+  template <typename... Args2>
+  enable_if_t<
+    is_constructible<completion_message<R(Args...)>, int, Args2...>::value
+  > operator()(Args2&&... args)
+  {
+    Op* op = op_;
+    op_ = nullptr;
+    typedef completion_message<R(Args...)> message_type;
+    op->handle_op(message_type(0, static_cast<Args2&&>(args)...));
+  }
+
+//protected:
+  Op* op_;
+};
+
+template <typename Op, typename R, typename... Args, typename... Signatures>
+class timed_cancel_op_handler<Op, R(Args...), Signatures...> :
+  public timed_cancel_op_handler<Op, Signatures...>
+{
+public:
+  using timed_cancel_op_handler<Op, Signatures...>::timed_cancel_op_handler;
+  using timed_cancel_op_handler<Op, Signatures...>::operator();
+
+  template <typename... Args2>
+  enable_if_t<
+    is_constructible<completion_message<R(Args...)>, int, Args2...>::value
+  > operator()(Args2&&... args)
+  {
+    Op* op = this->op_;
+    this->op_ = nullptr;
+    typedef completion_message<R(Args...)> message_type;
+    op->handle_op(message_type(0, static_cast<Args2&&>(args)...));
+  }
+};
+
+template <typename Op>
+class timed_cancel_timer_handler
+{
+public:
+  using cancellation_slot_type = cancellation_slot;
+
+  explicit timed_cancel_timer_handler(Op* op)
+    : op_(op)
+  {
+  }
+
+  timed_cancel_timer_handler(timed_cancel_timer_handler&& other) noexcept
+    : op_(other.op_)
+  {
+    other.op_ = nullptr;
+  }
+
+  ~timed_cancel_timer_handler()
+  {
+    if (op_)
+      op_->release();
+  }
+
+  cancellation_slot_type get_cancellation_slot() const noexcept
+  {
+    return cancellation_slot_type();
+  }
+
+  void operator()(const boost::system::error_code&)
+  {
+    Op* op = op_;
+    op_ = nullptr;
+    op->handle_timer();
+  }
+
+//private:
+  Op* op_;
+};
+
+} // namespace detail
+
+template <template <typename, typename> class Associator,
+    typename Op, typename... Signatures, typename DefaultCandidate>
+struct associator<Associator,
+    detail::timed_cancel_op_handler<Op, Signatures...>, DefaultCandidate>
+  : Associator<typename Op::handler_type, DefaultCandidate>
+{
+  static typename Associator<typename Op::handler_type, DefaultCandidate>::type
+  get(const detail::timed_cancel_op_handler<Op, Signatures...>& h) noexcept
+  {
+    return Associator<typename Op::handler_type, DefaultCandidate>::get(
+        h.op_->handler_);
+  }
+
+  static auto get(const detail::timed_cancel_op_handler<Op, Signatures...>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<typename Op::handler_type, DefaultCandidate>::get(
+        h.op_->handler_, c))
+  {
+    return Associator<typename Op::handler_type, DefaultCandidate>::get(
+        h.op_->handler_, c);
+  }
+};
+
+template <template <typename, typename> class Associator,
+    typename Op, typename DefaultCandidate>
+struct associator<Associator,
+    detail::timed_cancel_timer_handler<Op>, DefaultCandidate>
+  : Associator<typename Op::handler_type, DefaultCandidate>
+{
+  static typename Associator<typename Op::handler_type, DefaultCandidate>::type
+  get(const detail::timed_cancel_timer_handler<Op>& h) noexcept
+  {
+    return Associator<typename Op::handler_type, DefaultCandidate>::get(
+        h.op_->handler_);
+  }
+
+  static auto get(const detail::timed_cancel_timer_handler<Op>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<typename Op::handler_type, DefaultCandidate>::get(
+        h.op_->handler_, c))
+  {
+    return Associator<typename Op::handler_type, DefaultCandidate>::get(
+        h.op_->handler_, c);
+  }
+};
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DETAIL_TIMED_CANCEL_OP_HPP
diff --git a/inst/include/boost/asio/detail/timer_queue.hpp b/inst/include/boost/asio/detail/timer_queue.hpp
index 7235ef524..8898aaa51 100644
--- a/inst/include/boost/asio/detail/timer_queue.hpp
+++ b/inst/include/boost/asio/detail/timer_queue.hpp
@@ -2,7 +2,7 @@
 // detail/timer_queue.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/timer_queue_base.hpp b/inst/include/boost/asio/detail/timer_queue_base.hpp
index 240674a20..a356bf09b 100644
--- a/inst/include/boost/asio/detail/timer_queue_base.hpp
+++ b/inst/include/boost/asio/detail/timer_queue_base.hpp
@@ -2,7 +2,7 @@
 // detail/timer_queue_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/timer_queue_ptime.hpp b/inst/include/boost/asio/detail/timer_queue_ptime.hpp
index c2b0d8f2e..89fd641cd 100644
--- a/inst/include/boost/asio/detail/timer_queue_ptime.hpp
+++ b/inst/include/boost/asio/detail/timer_queue_ptime.hpp
@@ -2,7 +2,7 @@
 // detail/timer_queue_ptime.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,8 @@
 
 #include <boost/asio/detail/config.hpp>
 
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
 #include <boost/asio/time_traits.hpp>
@@ -30,7 +32,7 @@ namespace detail {
 
 struct forwarding_posix_time_traits : time_traits<boost::posix_time::ptime> {};
 
-// Template specialisation for the commonly used instantation.
+// Template specialisation for the commonly used instantiation.
 template <>
 class timer_queue<time_traits<boost::posix_time::ptime>>
   : public timer_queue_base
@@ -102,4 +104,6 @@ class timer_queue<time_traits<boost::posix_time::ptime>>
 
 #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #endif // BOOST_ASIO_DETAIL_TIMER_QUEUE_PTIME_HPP
diff --git a/inst/include/boost/asio/detail/timer_queue_set.hpp b/inst/include/boost/asio/detail/timer_queue_set.hpp
index c5c1e03b4..2427e6369 100644
--- a/inst/include/boost/asio/detail/timer_queue_set.hpp
+++ b/inst/include/boost/asio/detail/timer_queue_set.hpp
@@ -2,7 +2,7 @@
 // detail/timer_queue_set.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/timer_scheduler.hpp b/inst/include/boost/asio/detail/timer_scheduler.hpp
index b8372bf53..0c0d4594a 100644
--- a/inst/include/boost/asio/detail/timer_scheduler.hpp
+++ b/inst/include/boost/asio/detail/timer_scheduler.hpp
@@ -2,7 +2,7 @@
 // detail/timer_scheduler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/timer_scheduler_fwd.hpp b/inst/include/boost/asio/detail/timer_scheduler_fwd.hpp
index e99eda74e..c539ad367 100644
--- a/inst/include/boost/asio/detail/timer_scheduler_fwd.hpp
+++ b/inst/include/boost/asio/detail/timer_scheduler_fwd.hpp
@@ -2,7 +2,7 @@
 // detail/timer_scheduler_fwd.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/tss_ptr.hpp b/inst/include/boost/asio/detail/tss_ptr.hpp
index c6a6ba90c..744c2a53d 100644
--- a/inst/include/boost/asio/detail/tss_ptr.hpp
+++ b/inst/include/boost/asio/detail/tss_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/tss_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/type_traits.hpp b/inst/include/boost/asio/detail/type_traits.hpp
index 794c50635..131fe9e7d 100644
--- a/inst/include/boost/asio/detail/type_traits.hpp
+++ b/inst/include/boost/asio/detail/type_traits.hpp
@@ -2,7 +2,7 @@
 // detail/type_traits.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -78,16 +78,26 @@ using std::is_convertible;
 
 using std::is_copy_constructible;
 
+using std::is_nothrow_default_constructible;
+
 using std::is_destructible;
 
 using std::is_function;
 
+using std::is_integral;
+
 using std::is_move_constructible;
 
 using std::is_nothrow_copy_constructible;
 
+using std::is_nothrow_copy_assignable;
+
 using std::is_nothrow_destructible;
 
+using std::is_nothrow_move_constructible;
+
+using std::is_nothrow_move_assignable;
+
 using std::is_object;
 
 using std::is_pointer;
@@ -98,6 +108,8 @@ using std::is_same;
 
 using std::is_scalar;
 
+using std::is_unsigned;
+
 using std::remove_cv;
 
 template <typename T>
diff --git a/inst/include/boost/asio/detail/utility.hpp b/inst/include/boost/asio/detail/utility.hpp
index eebf8a43a..e665c6538 100644
--- a/inst/include/boost/asio/detail/utility.hpp
+++ b/inst/include/boost/asio/detail/utility.hpp
@@ -2,7 +2,7 @@
 // detail/utility.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/wait_handler.hpp b/inst/include/boost/asio/detail/wait_handler.hpp
index cbda6c726..c235c315a 100644
--- a/inst/include/boost/asio/detail/wait_handler.hpp
+++ b/inst/include/boost/asio/detail/wait_handler.hpp
@@ -2,7 +2,7 @@
 // detail/wait_handler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/wait_op.hpp b/inst/include/boost/asio/detail/wait_op.hpp
index b5a5bdf66..89cf4b0d9 100644
--- a/inst/include/boost/asio/detail/wait_op.hpp
+++ b/inst/include/boost/asio/detail/wait_op.hpp
@@ -2,7 +2,7 @@
 // detail/wait_op.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_event.hpp b/inst/include/boost/asio/detail/win_event.hpp
index 25e119e25..9f2d40f63 100644
--- a/inst/include/boost/asio/detail/win_event.hpp
+++ b/inst/include/boost/asio/detail/win_event.hpp
@@ -2,7 +2,7 @@
 // detail/win_event.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_fd_set_adapter.hpp b/inst/include/boost/asio/detail/win_fd_set_adapter.hpp
index daac5307d..d546778d7 100644
--- a/inst/include/boost/asio/detail/win_fd_set_adapter.hpp
+++ b/inst/include/boost/asio/detail/win_fd_set_adapter.hpp
@@ -2,7 +2,7 @@
 // detail/win_fd_set_adapter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_global.hpp b/inst/include/boost/asio/detail/win_global.hpp
index 951467ced..e6ebd13c0 100644
--- a/inst/include/boost/asio/detail/win_global.hpp
+++ b/inst/include/boost/asio/detail/win_global.hpp
@@ -2,7 +2,7 @@
 // detail/win_global.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_file_service.hpp b/inst/include/boost/asio/detail/win_iocp_file_service.hpp
index 22802a042..ee31ae3d1 100644
--- a/inst/include/boost/asio/detail/win_iocp_file_service.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_file_service.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_file_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_handle_read_op.hpp b/inst/include/boost/asio/detail/win_iocp_handle_read_op.hpp
index 47bca66ff..fb0d0e99d 100644
--- a/inst/include/boost/asio/detail/win_iocp_handle_read_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_handle_read_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_handle_read_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/win_iocp_handle_service.hpp b/inst/include/boost/asio/detail/win_iocp_handle_service.hpp
index ff603dd60..75e26d32e 100644
--- a/inst/include/boost/asio/detail/win_iocp_handle_service.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_handle_service.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_handle_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/win_iocp_handle_write_op.hpp b/inst/include/boost/asio/detail/win_iocp_handle_write_op.hpp
index ee5bb6430..53d9d1022 100644
--- a/inst/include/boost/asio/detail/win_iocp_handle_write_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_handle_write_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_handle_write_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/win_iocp_io_context.hpp b/inst/include/boost/asio/detail/win_iocp_io_context.hpp
index f91a70d03..a69001250 100644
--- a/inst/include/boost/asio/detail/win_iocp_io_context.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_io_context.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_io_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -46,10 +46,9 @@ class win_iocp_io_context
     public thread_context
 {
 public:
-  // Constructor. Specifies a concurrency hint that is passed through to the
-  // underlying I/O completion port.
-  BOOST_ASIO_DECL win_iocp_io_context(boost::asio::execution_context& ctx,
-      int concurrency_hint = -1, bool own_thread = true);
+  // Constructor.
+  BOOST_ASIO_DECL win_iocp_io_context(
+      boost::asio::execution_context& ctx, bool own_thread = true);
 
   // Destructor.
   BOOST_ASIO_DECL ~win_iocp_io_context();
@@ -210,12 +209,6 @@ class win_iocp_io_context
       typename timer_queue<Time_Traits>::per_timer_data& to,
       typename timer_queue<Time_Traits>::per_timer_data& from);
 
-  // Get the concurrency hint that was used to initialise the io_context.
-  int concurrency_hint() const
-  {
-    return concurrency_hint_;
-  }
-
 private:
 #if defined(WINVER) && (WINVER < 0x0500)
   typedef DWORD dword_ptr_t;
@@ -265,7 +258,7 @@ class win_iocp_io_context
 
   // Flag to indicate whether there is an in-flight stop event. Every event
   // posted using PostQueuedCompletionStatus consumes non-paged pool, so to
-  // avoid exhausting this resouce we limit the number of outstanding events.
+  // avoid exhausting this resource we limit the number of outstanding events.
   long stop_event_posted_;
 
   // Flag to indicate whether the service has been shut down.
diff --git a/inst/include/boost/asio/detail/win_iocp_null_buffers_op.hpp b/inst/include/boost/asio/detail/win_iocp_null_buffers_op.hpp
index 7320309f4..bb322264d 100644
--- a/inst/include/boost/asio/detail/win_iocp_null_buffers_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_null_buffers_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_null_buffers_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_operation.hpp b/inst/include/boost/asio/detail/win_iocp_operation.hpp
index c724a305c..429c244f1 100644
--- a/inst/include/boost/asio/detail/win_iocp_operation.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_operation.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_operation.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_overlapped_op.hpp b/inst/include/boost/asio/detail/win_iocp_overlapped_op.hpp
index 8bd0b9aab..a0cd9e49a 100644
--- a/inst/include/boost/asio/detail/win_iocp_overlapped_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_overlapped_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_overlapped_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_overlapped_ptr.hpp b/inst/include/boost/asio/detail/win_iocp_overlapped_ptr.hpp
index ea01e2f92..4cb066f4e 100644
--- a/inst/include/boost/asio/detail/win_iocp_overlapped_ptr.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_overlapped_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_overlapped_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_serial_port_service.hpp b/inst/include/boost/asio/detail/win_iocp_serial_port_service.hpp
index d41f49b0c..b8a477f21 100644
--- a/inst/include/boost/asio/detail/win_iocp_serial_port_service.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_serial_port_service.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_serial_port_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_accept_op.hpp b/inst/include/boost/asio/detail/win_iocp_socket_accept_op.hpp
index 2c9c94c6a..f093e8f53 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_accept_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_accept_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_accept_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_connect_op.hpp b/inst/include/boost/asio/detail/win_iocp_socket_connect_op.hpp
index a1ba98e94..fb459a706 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_connect_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_connect_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_connect_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_recv_op.hpp b/inst/include/boost/asio/detail/win_iocp_socket_recv_op.hpp
index bb6592e31..8d56ada91 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_recv_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_recv_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_recv_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp b/inst/include/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp
index 78ee44b29..938ae0eee 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_recvfrom_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp b/inst/include/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp
index 597eff3e0..7b6c102d3 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp
@@ -1,8 +1,8 @@
 //
 // detail/win_iocp_socket_recvmsg_op.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_send_op.hpp b/inst/include/boost/asio/detail/win_iocp_socket_send_op.hpp
index cbffbae9b..26abf4284 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_send_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_send_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_send_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_service.hpp b/inst/include/boost/asio/detail/win_iocp_socket_service.hpp
index 8d6b04a6d..d10c534bc 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_service.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_service.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_socket_service_base.hpp b/inst/include/boost/asio/detail/win_iocp_socket_service_base.hpp
index ef644b9a1..a518375dd 100644
--- a/inst/include/boost/asio/detail/win_iocp_socket_service_base.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_socket_service_base.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_socket_service_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -809,7 +809,7 @@ class win_iocp_socket_service_base
   // Pointer to NtSetInformationFile implementation.
   void* nt_set_info_;
 
-  // Mutex to protect access to the linked list of implementations. 
+  // Mutex to protect access to the linked list of implementations.
   boost::asio::detail::mutex mutex_;
 
   // The head of a linked list of all implementations.
diff --git a/inst/include/boost/asio/detail/win_iocp_thread_info.hpp b/inst/include/boost/asio/detail/win_iocp_thread_info.hpp
index 6283715ed..8ba172a98 100644
--- a/inst/include/boost/asio/detail/win_iocp_thread_info.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_thread_info.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_thread_info.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_iocp_wait_op.hpp b/inst/include/boost/asio/detail/win_iocp_wait_op.hpp
index 9e932d8f8..38935e1d5 100644
--- a/inst/include/boost/asio/detail/win_iocp_wait_op.hpp
+++ b/inst/include/boost/asio/detail/win_iocp_wait_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_wait_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_mutex.hpp b/inst/include/boost/asio/detail/win_mutex.hpp
index fd4733044..5ebc4585d 100644
--- a/inst/include/boost/asio/detail/win_mutex.hpp
+++ b/inst/include/boost/asio/detail/win_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/win_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -44,6 +44,12 @@ class win_mutex
     ::DeleteCriticalSection(&crit_section_);
   }
 
+  // Try to lock the mutex.
+  bool try_lock()
+  {
+    return ::TryEnterCriticalSection(&crit_section_) != 0;
+  }
+
   // Lock the mutex.
   void lock()
   {
diff --git a/inst/include/boost/asio/detail/win_object_handle_service.hpp b/inst/include/boost/asio/detail/win_object_handle_service.hpp
index 058108756..35bb0de82 100644
--- a/inst/include/boost/asio/detail/win_object_handle_service.hpp
+++ b/inst/include/boost/asio/detail/win_object_handle_service.hpp
@@ -2,7 +2,7 @@
 // detail/win_object_handle_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2011 Boris Schaeling (boris@highscore.de)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/detail/win_static_mutex.hpp b/inst/include/boost/asio/detail/win_static_mutex.hpp
index de2ad6c83..48bc9d4ca 100644
--- a/inst/include/boost/asio/detail/win_static_mutex.hpp
+++ b/inst/include/boost/asio/detail/win_static_mutex.hpp
@@ -2,7 +2,7 @@
 // detail/win_static_mutex.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_thread.hpp b/inst/include/boost/asio/detail/win_thread.hpp
index 996a73cc3..e48e4c163 100644
--- a/inst/include/boost/asio/detail/win_thread.hpp
+++ b/inst/include/boost/asio/detail/win_thread.hpp
@@ -2,7 +2,7 @@
 // detail/win_thread.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/win_tss_ptr.hpp b/inst/include/boost/asio/detail/win_tss_ptr.hpp
index 91d76c73f..271babbcc 100644
--- a/inst/include/boost/asio/detail/win_tss_ptr.hpp
+++ b/inst/include/boost/asio/detail/win_tss_ptr.hpp
@@ -2,7 +2,7 @@
 // detail/win_tss_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winapp_thread.hpp b/inst/include/boost/asio/detail/winapp_thread.hpp
index 7a755eb0c..c2c36af33 100644
--- a/inst/include/boost/asio/detail/winapp_thread.hpp
+++ b/inst/include/boost/asio/detail/winapp_thread.hpp
@@ -2,7 +2,7 @@
 // detail/winapp_thread.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/wince_thread.hpp b/inst/include/boost/asio/detail/wince_thread.hpp
index b0069a692..da6601581 100644
--- a/inst/include/boost/asio/detail/wince_thread.hpp
+++ b/inst/include/boost/asio/detail/wince_thread.hpp
@@ -2,7 +2,7 @@
 // detail/wince_thread.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_async_manager.hpp b/inst/include/boost/asio/detail/winrt_async_manager.hpp
index 01398d54c..8612f0d72 100644
--- a/inst/include/boost/asio/detail/winrt_async_manager.hpp
+++ b/inst/include/boost/asio/detail/winrt_async_manager.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_async_manager.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_async_op.hpp b/inst/include/boost/asio/detail/winrt_async_op.hpp
index c873e6791..0bc644350 100644
--- a/inst/include/boost/asio/detail/winrt_async_op.hpp
+++ b/inst/include/boost/asio/detail/winrt_async_op.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_async_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_resolve_op.hpp b/inst/include/boost/asio/detail/winrt_resolve_op.hpp
index 581bf395a..b5afc1e5c 100644
--- a/inst/include/boost/asio/detail/winrt_resolve_op.hpp
+++ b/inst/include/boost/asio/detail/winrt_resolve_op.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_resolve_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_resolver_service.hpp b/inst/include/boost/asio/detail/winrt_resolver_service.hpp
index debf7db93..d883f42b3 100644
--- a/inst/include/boost/asio/detail/winrt_resolver_service.hpp
+++ b/inst/include/boost/asio/detail/winrt_resolver_service.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_resolver_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_socket_recv_op.hpp b/inst/include/boost/asio/detail/winrt_socket_recv_op.hpp
index eeab978b8..9fc60acd3 100644
--- a/inst/include/boost/asio/detail/winrt_socket_recv_op.hpp
+++ b/inst/include/boost/asio/detail/winrt_socket_recv_op.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_socket_recv_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_socket_send_op.hpp b/inst/include/boost/asio/detail/winrt_socket_send_op.hpp
index c7ef5e818..2ca047406 100644
--- a/inst/include/boost/asio/detail/winrt_socket_send_op.hpp
+++ b/inst/include/boost/asio/detail/winrt_socket_send_op.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_socket_send_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_ssocket_service_base.hpp b/inst/include/boost/asio/detail/winrt_ssocket_service_base.hpp
index cdb771185..a94451075 100644
--- a/inst/include/boost/asio/detail/winrt_ssocket_service_base.hpp
+++ b/inst/include/boost/asio/detail/winrt_ssocket_service_base.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_ssocket_service_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -342,7 +342,7 @@ class winrt_ssocket_service_base
   // The manager that keeps track of outstanding operations.
   winrt_async_manager& async_manager_;
 
-  // Mutex to protect access to the linked list of implementations. 
+  // Mutex to protect access to the linked list of implementations.
   boost::asio::detail::mutex mutex_;
 
   // The head of a linked list of all implementations.
diff --git a/inst/include/boost/asio/detail/winrt_timer_scheduler.hpp b/inst/include/boost/asio/detail/winrt_timer_scheduler.hpp
index fdc41211e..21d27b0ac 100644
--- a/inst/include/boost/asio/detail/winrt_timer_scheduler.hpp
+++ b/inst/include/boost/asio/detail/winrt_timer_scheduler.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_timer_scheduler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winrt_utils.hpp b/inst/include/boost/asio/detail/winrt_utils.hpp
index d225cee06..df46728ee 100644
--- a/inst/include/boost/asio/detail/winrt_utils.hpp
+++ b/inst/include/boost/asio/detail/winrt_utils.hpp
@@ -2,7 +2,7 @@
 // detail/winrt_utils.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/winsock_init.hpp b/inst/include/boost/asio/detail/winsock_init.hpp
index c4b67d747..3ff75096b 100644
--- a/inst/include/boost/asio/detail/winsock_init.hpp
+++ b/inst/include/boost/asio/detail/winsock_init.hpp
@@ -2,7 +2,7 @@
 // detail/winsock_init.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -48,7 +48,7 @@ class winsock_init_base
   BOOST_ASIO_DECL static void throw_on_error(data& d);
 };
 
-template <int Major = 2, int Minor = 0>
+template <int Major = 2, int Minor = 2>
 class winsock_init : private winsock_init_base
 {
 public:
diff --git a/inst/include/boost/asio/detail/work_dispatcher.hpp b/inst/include/boost/asio/detail/work_dispatcher.hpp
index 743325d2d..d67f2a41d 100644
--- a/inst/include/boost/asio/detail/work_dispatcher.hpp
+++ b/inst/include/boost/asio/detail/work_dispatcher.hpp
@@ -2,7 +2,7 @@
 // detail/work_dispatcher.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/detail/wrapped_handler.hpp b/inst/include/boost/asio/detail/wrapped_handler.hpp
index 7f7238812..0e63df80c 100644
--- a/inst/include/boost/asio/detail/wrapped_handler.hpp
+++ b/inst/include/boost/asio/detail/wrapped_handler.hpp
@@ -2,7 +2,7 @@
 // detail/wrapped_handler.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,7 @@
 
 #include <boost/asio/detail/bind_handler.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/initiate_dispatch.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -42,12 +43,36 @@ struct is_continuation_if_running
   }
 };
 
+template <typename Dispatcher, typename = void>
+struct wrapped_executor
+{
+  typedef Dispatcher executor_type;
+
+  static const Dispatcher& get(const Dispatcher& dispatcher) noexcept
+  {
+    return dispatcher;
+  }
+};
+
+template <typename Dispatcher>
+struct wrapped_executor<Dispatcher,
+    void_type<typename Dispatcher::executor_type>>
+{
+  typedef typename Dispatcher::executor_type executor_type;
+
+  static executor_type get(const Dispatcher& dispatcher) noexcept
+  {
+    return dispatcher.get_executor();
+  }
+};
+
 template <typename Dispatcher, typename Handler,
     typename IsContinuation = is_continuation_delegated>
 class wrapped_handler
 {
 public:
   typedef void result_type;
+  typedef typename wrapped_executor<Dispatcher>::executor_type executor_type;
 
   wrapped_handler(Dispatcher dispatcher, Handler& handler)
     : dispatcher_(dispatcher),
@@ -67,66 +92,81 @@ class wrapped_handler
   {
   }
 
+  executor_type get_executor() const noexcept
+  {
+    return wrapped_executor<Dispatcher>::get(dispatcher_);
+  }
+
   void operator()()
   {
-    dispatcher_.dispatch(static_cast<Handler&&>(handler_));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(static_cast<Handler&&>(handler_));
   }
 
   void operator()() const
   {
-    dispatcher_.dispatch(handler_);
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(handler_);
   }
 
   template <typename Arg1>
   void operator()(const Arg1& arg1)
   {
-    dispatcher_.dispatch(detail::bind_handler(handler_, arg1));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(detail::bind_handler(handler_, arg1));
   }
 
   template <typename Arg1>
   void operator()(const Arg1& arg1) const
   {
-    dispatcher_.dispatch(detail::bind_handler(handler_, arg1));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(detail::bind_handler(handler_, arg1));
   }
 
   template <typename Arg1, typename Arg2>
   void operator()(const Arg1& arg1, const Arg2& arg2)
   {
-    dispatcher_.dispatch(detail::bind_handler(handler_, arg1, arg2));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(detail::bind_handler(handler_, arg1, arg2));
   }
 
   template <typename Arg1, typename Arg2>
   void operator()(const Arg1& arg1, const Arg2& arg2) const
   {
-    dispatcher_.dispatch(detail::bind_handler(handler_, arg1, arg2));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(detail::bind_handler(handler_, arg1, arg2));
   }
 
   template <typename Arg1, typename Arg2, typename Arg3>
   void operator()(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3)
   {
-    dispatcher_.dispatch(detail::bind_handler(handler_, arg1, arg2, arg3));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(detail::bind_handler(handler_, arg1, arg2, arg3));
   }
 
   template <typename Arg1, typename Arg2, typename Arg3>
   void operator()(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3) const
   {
-    dispatcher_.dispatch(detail::bind_handler(handler_, arg1, arg2, arg3));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(detail::bind_handler(handler_, arg1, arg2, arg3));
   }
 
   template <typename Arg1, typename Arg2, typename Arg3, typename Arg4>
   void operator()(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
       const Arg4& arg4)
   {
-    dispatcher_.dispatch(
-        detail::bind_handler(handler_, arg1, arg2, arg3, arg4));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(
+          detail::bind_handler(handler_, arg1, arg2, arg3, arg4));
   }
 
   template <typename Arg1, typename Arg2, typename Arg3, typename Arg4>
   void operator()(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
       const Arg4& arg4) const
   {
-    dispatcher_.dispatch(
-        detail::bind_handler(handler_, arg1, arg2, arg3, arg4));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(
+          detail::bind_handler(handler_, arg1, arg2, arg3, arg4));
   }
 
   template <typename Arg1, typename Arg2, typename Arg3, typename Arg4,
@@ -134,8 +174,9 @@ class wrapped_handler
   void operator()(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
       const Arg4& arg4, const Arg5& arg5)
   {
-    dispatcher_.dispatch(
-        detail::bind_handler(handler_, arg1, arg2, arg3, arg4, arg5));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(
+          detail::bind_handler(handler_, arg1, arg2, arg3, arg4, arg5));
   }
 
   template <typename Arg1, typename Arg2, typename Arg3, typename Arg4,
@@ -143,8 +184,9 @@ class wrapped_handler
   void operator()(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
       const Arg4& arg4, const Arg5& arg5) const
   {
-    dispatcher_.dispatch(
-        detail::bind_handler(handler_, arg1, arg2, arg3, arg4, arg5));
+    detail::initiate_dispatch_with_executor<executor_type>(
+        this->get_executor())(
+          detail::bind_handler(handler_, arg1, arg2, arg3, arg4, arg5));
   }
 
 //private:
@@ -152,49 +194,6 @@ class wrapped_handler
   Handler handler_;
 };
 
-template <typename Handler, typename Context>
-class rewrapped_handler
-{
-public:
-  explicit rewrapped_handler(Handler& handler, const Context& context)
-    : context_(context),
-      handler_(static_cast<Handler&&>(handler))
-  {
-  }
-
-  explicit rewrapped_handler(const Handler& handler, const Context& context)
-    : context_(context),
-      handler_(handler)
-  {
-  }
-
-  rewrapped_handler(const rewrapped_handler& other)
-    : context_(other.context_),
-      handler_(other.handler_)
-  {
-  }
-
-  rewrapped_handler(rewrapped_handler&& other)
-    : context_(static_cast<Context&&>(other.context_)),
-      handler_(static_cast<Handler&&>(other.handler_))
-  {
-  }
-
-  void operator()()
-  {
-    handler_();
-  }
-
-  void operator()() const
-  {
-    handler_();
-  }
-
-//private:
-  Context context_;
-  Handler handler_;
-};
-
 template <typename Dispatcher, typename Handler, typename IsContinuation>
 inline bool asio_handler_is_continuation(
     wrapped_handler<Dispatcher, Handler, IsContinuation>* this_handler)
@@ -202,14 +201,6 @@ inline bool asio_handler_is_continuation(
   return IsContinuation()(this_handler->dispatcher_, this_handler->handler_);
 }
 
-template <typename Dispatcher, typename Context>
-inline bool asio_handler_is_continuation(
-    rewrapped_handler<Dispatcher, Context>* this_handler)
-{
-  return boost_asio_handler_cont_helpers::is_continuation(
-      this_handler->context_);
-}
-
 } // namespace detail
 } // namespace asio
 } // namespace boost
diff --git a/inst/include/boost/asio/dispatch.hpp b/inst/include/boost/asio/dispatch.hpp
index 687b6c0a7..50de09093 100644
--- a/inst/include/boost/asio/dispatch.hpp
+++ b/inst/include/boost/asio/dispatch.hpp
@@ -2,7 +2,7 @@
 // dispatch.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/disposition.hpp b/inst/include/boost/asio/disposition.hpp
new file mode 100644
index 000000000..2496ca828
--- /dev/null
+++ b/inst/include/boost/asio/disposition.hpp
@@ -0,0 +1,284 @@
+//
+// disposition.hpp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DISPOSITION_HPP
+#define BOOST_ASIO_DISPOSITION_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/detail/throw_exception.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/system/error_code.hpp>
+#include <boost/system/system_error.hpp>
+#include <exception>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+/// Traits type to adapt arbitrary error types as dispositions.
+/**
+ * This type may be specialised for user-defined types, to allow them to be
+ * treated as a disposition by asio.
+ *
+ * The primary trait is not defined.
+ */
+#if defined(GENERATING_DOCUMENTATION)
+template <typename T>
+struct disposition_traits
+{
+  /// Determine whether a disposition represents no error.
+  static bool not_an_error(const T& d) noexcept;
+
+  /// Throw an exception if the disposition represents an error.
+  static void throw_exception(T d);
+
+  /// Convert a disposition into an @c exception_ptr.
+  static std::exception_ptr to_exception_ptr(T d) noexcept;
+};
+#else // defined(GENERATING_DOCUMENTATION)
+template <typename T>
+struct disposition_traits;
+#endif // defined(GENERATING_DOCUMENTATION)
+
+namespace detail {
+
+template <typename T, typename = void, typename = void,
+  typename = void, typename = void, typename = void, typename = void>
+struct is_disposition_impl : false_type
+{
+};
+
+template <typename T>
+struct is_disposition_impl<T,
+  enable_if_t<
+    is_nothrow_default_constructible<T>::value
+  >,
+  enable_if_t<
+    is_nothrow_move_constructible<T>::value
+  >,
+  enable_if_t<
+    is_nothrow_move_assignable<T>::value
+  >,
+  enable_if_t<
+    is_same<
+      decltype(disposition_traits<T>::not_an_error(declval<const T&>())),
+      bool
+    >::value
+  >,
+  void_t<
+    decltype(disposition_traits<T>::throw_exception(declval<T>()))
+  >,
+  enable_if_t<
+    is_same<
+      decltype(disposition_traits<T>::to_exception_ptr(declval<T>())),
+      std::exception_ptr
+    >::value
+  >> : true_type
+{
+};
+
+} // namespace detail
+
+/// Trait used for testing whether a type satisfies the requirements of a
+/// disposition.
+/**
+ * To be a valid disposition, a type must be nothrow default-constructible,
+ * nothrow move-constructible, nothrow move-assignable, and there must be a
+ * specialisation of the disposition_traits template for the type that provides
+ * the following static member functions:
+ * @li @c not_an_error: Takes an argument of type <tt>const T&</tt> and returns
+ *     a @c bool.
+ * @li @c throw_exception: Takes an argument of type <tt>T</tt>. The
+ *     caller of this function must not pass a disposition value for which
+ *     @c not_an_error returns true. This function must not return.
+ * @li @c to_exception_ptr: Takes an argument of type <tt>T</tt> and returns a
+ *     value of type @c std::exception_ptr.
+ */
+template <typename T>
+struct is_disposition :
+#if defined(GENERATING_DOCUMENTATION)
+  integral_constant<bool, automatically_determined>
+#else // defined(GENERATING_DOCUMENTATION)
+  detail::is_disposition_impl<T>
+#endif // defined(GENERATING_DOCUMENTATION)
+{
+};
+
+#if defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
+
+template <typename T>
+constexpr const bool is_disposition_v = is_disposition<T>::value;
+
+#endif // defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
+
+#if defined(BOOST_ASIO_HAS_CONCEPTS)
+
+template <typename T>
+BOOST_ASIO_CONCEPT disposition = is_disposition<T>::value;
+
+#define BOOST_ASIO_DISPOSITION ::boost::asio::disposition
+
+#else // defined(BOOST_ASIO_HAS_CONCEPTS)
+
+#define BOOST_ASIO_DISPOSITION typename
+
+#endif // defined(BOOST_ASIO_HAS_CONCEPTS)
+
+/// Specialisation of @c disposition_traits for @c error_code.
+template <>
+struct disposition_traits<boost::system::error_code>
+{
+  static bool not_an_error(const boost::system::error_code& ec) noexcept
+  {
+    return !ec;
+  }
+
+  static void throw_exception(const boost::system::error_code& ec)
+  {
+    detail::throw_exception(boost::system::system_error(ec));
+  }
+
+  static std::exception_ptr to_exception_ptr(
+      const boost::system::error_code& ec) noexcept
+  {
+    return ec
+      ? std::make_exception_ptr(boost::system::system_error(ec))
+      : nullptr;
+  }
+};
+
+/// Specialisation of @c disposition_traits for @c std::exception_ptr.
+template <>
+struct disposition_traits<std::exception_ptr>
+{
+  static bool not_an_error(const std::exception_ptr& e) noexcept
+  {
+    return !e;
+  }
+
+  static void throw_exception(std::exception_ptr e)
+  {
+    std::rethrow_exception(static_cast<std::exception_ptr&&>(e));
+  }
+
+  static std::exception_ptr to_exception_ptr(std::exception_ptr e) noexcept
+  {
+    return e;
+  }
+};
+
+/// A tag type used to indicate the absence of an error.
+struct no_error_t
+{
+  /// Default constructor.
+  constexpr no_error_t()
+  {
+  }
+
+  /// Equality operator.
+  friend constexpr bool operator==(
+      const no_error_t&, const no_error_t&) noexcept
+  {
+    return true;
+  }
+
+  /// Inequality operator.
+  friend constexpr bool operator!=(
+      const no_error_t&, const no_error_t&) noexcept
+  {
+    return false;
+  }
+
+  /// Equality operator, returns true if the disposition does not contain an
+  /// error.
+  template <BOOST_ASIO_DISPOSITION Disposition>
+  friend constexpr constraint_t<is_disposition<Disposition>::value, bool>
+  operator==(const no_error_t&, const Disposition& d) noexcept
+  {
+    return disposition_traits<Disposition>::not_an_error(d);
+  }
+
+  /// Equality operator, returns true if the disposition does not contain an
+  /// error.
+  template <BOOST_ASIO_DISPOSITION Disposition>
+  friend constexpr constraint_t<is_disposition<Disposition>::value, bool>
+  operator==(const Disposition& d, const no_error_t&) noexcept
+  {
+    return disposition_traits<Disposition>::not_an_error(d);
+  }
+
+  /// Inequality operator, returns true if the disposition contains an error.
+  template <BOOST_ASIO_DISPOSITION Disposition>
+  friend constexpr constraint_t<is_disposition<Disposition>::value, bool>
+  operator!=(const no_error_t&, const Disposition& d) noexcept
+  {
+    return !disposition_traits<Disposition>::not_an_error(d);
+  }
+
+  /// Inequality operator, returns true if the disposition contains an error.
+  template <BOOST_ASIO_DISPOSITION Disposition>
+  friend constexpr constraint_t<is_disposition<Disposition>::value, bool>
+  operator!=(const Disposition& d, const no_error_t&) noexcept
+  {
+    return !disposition_traits<Disposition>::not_an_error(d);
+  }
+};
+
+/// A special value used to indicate the absence of an error.
+BOOST_ASIO_INLINE_VARIABLE constexpr no_error_t no_error;
+
+/// Specialisation of @c disposition_traits for @c no_error_t.
+template <>
+struct disposition_traits<no_error_t>
+{
+  static bool not_an_error(no_error_t) noexcept
+  {
+    return true;
+  }
+
+  static void throw_exception(no_error_t)
+  {
+  }
+
+  static std::exception_ptr to_exception_ptr(no_error_t) noexcept
+  {
+    return std::exception_ptr();
+  }
+};
+
+/// Helper function to throw an exception arising from a disposition.
+template <typename Disposition>
+inline void throw_exception(Disposition&& d,
+    constraint_t<is_disposition<decay_t<Disposition>>::value> = 0)
+{
+  disposition_traits<decay_t<Disposition>>::throw_exception(
+      static_cast<Disposition&&>(d));
+}
+
+/// Helper function to convert a disposition to an @c exception_ptr.
+template <typename Disposition>
+inline std::exception_ptr to_exception_ptr(Disposition&& d,
+    constraint_t<is_disposition<decay_t<Disposition>>::value> = 0) noexcept
+{
+  return disposition_traits<decay_t<Disposition>>::to_exception_ptr(
+      static_cast<Disposition&&>(d));
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DISPOSITION_HPP
diff --git a/inst/include/boost/asio/error.hpp b/inst/include/boost/asio/error.hpp
index 03640067f..9c6e24fae 100644
--- a/inst/include/boost/asio/error.hpp
+++ b/inst/include/boost/asio/error.hpp
@@ -2,7 +2,7 @@
 // error.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution.hpp b/inst/include/boost/asio/execution.hpp
index 0e5b0a43e..cbcbf7a40 100644
--- a/inst/include/boost/asio/execution.hpp
+++ b/inst/include/boost/asio/execution.hpp
@@ -2,7 +2,7 @@
 // execution.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/allocator.hpp b/inst/include/boost/asio/execution/allocator.hpp
index 5f787d26f..9fc9c35bb 100644
--- a/inst/include/boost/asio/execution/allocator.hpp
+++ b/inst/include/boost/asio/execution/allocator.hpp
@@ -2,7 +2,7 @@
 // execution/allocator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -226,7 +226,7 @@ const T allocator_t<void>::static_query_v;
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-constexpr allocator_t<void> allocator;
+BOOST_ASIO_INLINE_VARIABLE constexpr allocator_t<void> allocator;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/any_executor.hpp b/inst/include/boost/asio/execution/any_executor.hpp
index e66eadf0c..6a26286c1 100644
--- a/inst/include/boost/asio/execution/any_executor.hpp
+++ b/inst/include/boost/asio/execution/any_executor.hpp
@@ -2,7 +2,7 @@
 // execution/any_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -110,7 +110,7 @@ class any_executor
    *
    * For example:
    * @code execution::any_executor<execution::blocking_t::possibly_t> ex = ...;
-   * auto ex2 = boost::asio::requre(ex, execution::blocking.possibly); @endcode
+   * auto ex2 = boost::asio::require(ex, execution::blocking.possibly); @endcode
    */
   template <typename Property>
   any_executor require(Property) const;
diff --git a/inst/include/boost/asio/execution/bad_executor.hpp b/inst/include/boost/asio/execution/bad_executor.hpp
index 31cdaab16..484a72231 100644
--- a/inst/include/boost/asio/execution/bad_executor.hpp
+++ b/inst/include/boost/asio/execution/bad_executor.hpp
@@ -2,7 +2,7 @@
 // execution/bad_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/blocking.hpp b/inst/include/boost/asio/execution/blocking.hpp
index 4f4fe2029..7501aecbc 100644
--- a/inst/include/boost/asio/execution/blocking.hpp
+++ b/inst/include/boost/asio/execution/blocking.hpp
@@ -2,7 +2,7 @@
 // execution/blocking.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -893,7 +893,7 @@ const T never_t<I>::static_query_v;
 
 typedef detail::blocking_t<> blocking_t;
 
-constexpr blocking_t blocking;
+BOOST_ASIO_INLINE_VARIABLE constexpr blocking_t blocking;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/blocking_adaptation.hpp b/inst/include/boost/asio/execution/blocking_adaptation.hpp
index 88f056c74..9374d571f 100644
--- a/inst/include/boost/asio/execution/blocking_adaptation.hpp
+++ b/inst/include/boost/asio/execution/blocking_adaptation.hpp
@@ -2,7 +2,7 @@
 // execution/blocking_adaptation.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -471,6 +471,36 @@ const T disallowed_t<I>::static_query_v;
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
+template <typename>
+struct is_blocking_adaptation_t : false_type
+{
+};
+
+template <int I>
+struct is_blocking_adaptation_t<blocking_adaptation_t<I>> : true_type
+{
+};
+
+template <typename>
+struct is_allowed_t : false_type
+{
+};
+
+template <int I>
+struct is_allowed_t<allowed_t<I>> : true_type
+{
+};
+
+template <typename>
+struct is_disallowed_t : false_type
+{
+};
+
+template <int I>
+struct is_disallowed_t<disallowed_t<I>> : true_type
+{
+};
+
 template <typename Executor>
 class adapter
 {
@@ -510,7 +540,10 @@ class adapter
 
   template <typename Property>
   enable_if_t<
-    can_query<const Executor&, Property>::value,
+    can_query<const Executor&, Property>::value
+      && !is_blocking_adaptation_t<Property>::value
+      && !is_allowed_t<Property>::value
+      && !is_disallowed_t<Property>::value,
     query_result_t<const Executor&, Property>
   > query(const Property& p) const
     noexcept(is_nothrow_query<const Executor&, Property>::value)
@@ -526,7 +559,10 @@ class adapter
 
   template <typename Property>
   enable_if_t<
-    can_require<const Executor&, Property>::value,
+    can_require<const Executor&, Property>::value
+      && !is_blocking_adaptation_t<Property>::value
+      && !is_allowed_t<Property>::value
+      && !is_disallowed_t<Property>::value,
     adapter<decay_t<require_result_t<const Executor&, Property>>>
   > require(const Property& p) const
     noexcept(is_nothrow_require<const Executor&, Property>::value)
@@ -537,7 +573,10 @@ class adapter
 
   template <typename Property>
   enable_if_t<
-    can_prefer<const Executor&, Property>::value,
+    can_prefer<const Executor&, Property>::value
+      && !is_blocking_adaptation_t<Property>::value
+      && !is_allowed_t<Property>::value
+      && !is_disallowed_t<Property>::value,
     adapter<decay_t<prefer_result_t<const Executor&, Property>>>
   > prefer(const Property& p) const
     noexcept(is_nothrow_prefer<const Executor&, Property>::value)
@@ -719,7 +758,7 @@ void blocking_execute(
 
 typedef detail::blocking_adaptation_t<> blocking_adaptation_t;
 
-constexpr blocking_adaptation_t blocking_adaptation;
+BOOST_ASIO_INLINE_VARIABLE constexpr blocking_adaptation_t blocking_adaptation;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/context.hpp b/inst/include/boost/asio/execution/context.hpp
index 5232a3044..6c9fd9a13 100644
--- a/inst/include/boost/asio/execution/context.hpp
+++ b/inst/include/boost/asio/execution/context.hpp
@@ -2,7 +2,7 @@
 // execution/context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -139,7 +139,7 @@ const T context_t<I>::static_query_v;
 
 typedef detail::context_t<> context_t;
 
-constexpr context_t context;
+BOOST_ASIO_INLINE_VARIABLE constexpr context_t context;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/context_as.hpp b/inst/include/boost/asio/execution/context_as.hpp
index c28b54246..0a5db227a 100644
--- a/inst/include/boost/asio/execution/context_as.hpp
+++ b/inst/include/boost/asio/execution/context_as.hpp
@@ -2,7 +2,7 @@
 // execution/context_as.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/executor.hpp b/inst/include/boost/asio/execution/executor.hpp
index 11d528124..5349d0886 100644
--- a/inst/include/boost/asio/execution/executor.hpp
+++ b/inst/include/boost/asio/execution/executor.hpp
@@ -2,7 +2,7 @@
 // execution/executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/impl/bad_executor.ipp b/inst/include/boost/asio/execution/impl/bad_executor.ipp
index d7ea8355f..8ec72c500 100644
--- a/inst/include/boost/asio/execution/impl/bad_executor.ipp
+++ b/inst/include/boost/asio/execution/impl/bad_executor.ipp
@@ -1,8 +1,8 @@
 //
-// exection/impl/bad_executor.ipp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// execution/impl/bad_executor.ipp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/invocable_archetype.hpp b/inst/include/boost/asio/execution/invocable_archetype.hpp
index b270b1497..739d11e5f 100644
--- a/inst/include/boost/asio/execution/invocable_archetype.hpp
+++ b/inst/include/boost/asio/execution/invocable_archetype.hpp
@@ -2,7 +2,7 @@
 // execution/invocable_archetype.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/mapping.hpp b/inst/include/boost/asio/execution/mapping.hpp
index e974b52ef..769ad8c28 100644
--- a/inst/include/boost/asio/execution/mapping.hpp
+++ b/inst/include/boost/asio/execution/mapping.hpp
@@ -2,7 +2,7 @@
 // execution/mapping.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -734,7 +734,7 @@ const T other_t<I>::static_query_v;
 
 typedef detail::mapping_t<> mapping_t;
 
-constexpr mapping_t mapping;
+BOOST_ASIO_INLINE_VARIABLE constexpr mapping_t mapping;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/occupancy.hpp b/inst/include/boost/asio/execution/occupancy.hpp
index b151a3793..20bc40a39 100644
--- a/inst/include/boost/asio/execution/occupancy.hpp
+++ b/inst/include/boost/asio/execution/occupancy.hpp
@@ -2,7 +2,7 @@
 // execution/occupancy.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -132,7 +132,7 @@ const T occupancy_t<I>::static_query_v;
 
 typedef detail::occupancy_t<> occupancy_t;
 
-constexpr occupancy_t occupancy;
+BOOST_ASIO_INLINE_VARIABLE constexpr occupancy_t occupancy;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/outstanding_work.hpp b/inst/include/boost/asio/execution/outstanding_work.hpp
index 7500ac95e..f5ea64ceb 100644
--- a/inst/include/boost/asio/execution/outstanding_work.hpp
+++ b/inst/include/boost/asio/execution/outstanding_work.hpp
@@ -2,7 +2,7 @@
 // execution/outstanding_work.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -545,7 +545,7 @@ const T tracked_t<I>::static_query_v;
 
 typedef detail::outstanding_work_t<> outstanding_work_t;
 
-constexpr outstanding_work_t outstanding_work;
+BOOST_ASIO_INLINE_VARIABLE constexpr outstanding_work_t outstanding_work;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution/prefer_only.hpp b/inst/include/boost/asio/execution/prefer_only.hpp
index 1a594a56b..01eef69fa 100644
--- a/inst/include/boost/asio/execution/prefer_only.hpp
+++ b/inst/include/boost/asio/execution/prefer_only.hpp
@@ -2,7 +2,7 @@
 // execution/prefer_only.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/execution/relationship.hpp b/inst/include/boost/asio/execution/relationship.hpp
index 9bbc3845f..9cc0fe4f1 100644
--- a/inst/include/boost/asio/execution/relationship.hpp
+++ b/inst/include/boost/asio/execution/relationship.hpp
@@ -2,7 +2,7 @@
 // execution/relationship.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -543,7 +543,7 @@ const T continuation_t<I>::static_query_v;
 
 typedef detail::relationship_t<> relationship_t;
 
-constexpr relationship_t relationship;
+BOOST_ASIO_INLINE_VARIABLE constexpr relationship_t relationship;
 
 } // namespace execution
 
diff --git a/inst/include/boost/asio/execution_context.hpp b/inst/include/boost/asio/execution_context.hpp
index 6e7d86585..f3b9af346 100644
--- a/inst/include/boost/asio/execution_context.hpp
+++ b/inst/include/boost/asio/execution_context.hpp
@@ -2,7 +2,7 @@
 // execution_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -108,11 +108,23 @@ class execution_context
 public:
   class id;
   class service;
+  class service_maker;
 
 public:
   /// Constructor.
   BOOST_ASIO_DECL execution_context();
 
+  /// Constructor.
+  /**
+   * Construct with a service maker, to create an initial set of services that
+   * will be installed into the execution context at construction time.
+   *
+   * @param initial_services Used to create the initial services. The @c make
+   * function will be called once at the end of execution_context construction.
+   */
+  BOOST_ASIO_DECL explicit execution_context(
+      const service_maker& initial_services);
+
   /// Destructor.
   BOOST_ASIO_DECL ~execution_context();
 
@@ -288,7 +300,7 @@ class execution_context::id
   id() {}
 };
 
-/// Base class for all io_context services.
+/// Base class for all execution context services.
 class execution_context::service
   : private noncopyable
 {
@@ -331,6 +343,23 @@ class execution_context::service
   service* next_;
 };
 
+/// Base class for all execution context service makers.
+/**
+ * A service maker is called by the execution context to create services that
+ * need to be installed into the execution context at construction time.
+ */
+class execution_context::service_maker
+  : private noncopyable
+{
+public:
+  /// Make services to be added to the execution context.
+  virtual void make(execution_context& context) const = 0;
+
+protected:
+  /// Destructor.
+  BOOST_ASIO_DECL virtual ~service_maker();
+};
+
 /// Exception thrown when trying to add a duplicate service to an
 /// execution_context.
 class service_already_exists
diff --git a/inst/include/boost/asio/executor.hpp b/inst/include/boost/asio/executor.hpp
index 8fe3c5924..1c277b7ab 100644
--- a/inst/include/boost/asio/executor.hpp
+++ b/inst/include/boost/asio/executor.hpp
@@ -2,7 +2,7 @@
 // executor.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/executor_work_guard.hpp b/inst/include/boost/asio/executor_work_guard.hpp
index b7a11f001..8859a052b 100644
--- a/inst/include/boost/asio/executor_work_guard.hpp
+++ b/inst/include/boost/asio/executor_work_guard.hpp
@@ -2,7 +2,7 @@
 // executor_work_guard.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/experimental/cancellation_condition.hpp b/inst/include/boost/asio/experimental/cancellation_condition.hpp
deleted file mode 100644
index 7c669c8ea..000000000
--- a/inst/include/boost/asio/experimental/cancellation_condition.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// experimental/cancellation_condition.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_EXPERIMENTAL_CANCELLATION_CONDITION_HPP
-#define BOOST_ASIO_EXPERIMENTAL_CANCELLATION_CONDITION_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/detail/config.hpp>
-#include <exception>
-#include <boost/asio/cancellation_type.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/asio/detail/type_traits.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-
-namespace boost {
-namespace asio {
-namespace experimental {
-
-/// Wait for all operations to complete.
-class wait_for_all
-{
-public:
-  template <typename... Args>
-  constexpr cancellation_type_t operator()(Args&&...) const noexcept
-  {
-    return cancellation_type::none;
-  }
-};
-
-/// Wait until an operation completes, then cancel the others.
-class wait_for_one
-{
-public:
-  constexpr explicit wait_for_one(
-      cancellation_type_t cancel_type = cancellation_type::all)
-    : cancel_type_(cancel_type)
-  {
-  }
-
-  template <typename... Args>
-  constexpr cancellation_type_t operator()(Args&&...) const noexcept
-  {
-    return cancel_type_;
-  }
-
-private:
-  cancellation_type_t cancel_type_;
-};
-
-/// Wait until an operation completes without an error, then cancel the others.
-/**
- * If no operation completes without an error, waits for completion of all
- * operations.
- */
-class wait_for_one_success
-{
-public:
-  constexpr explicit wait_for_one_success(
-      cancellation_type_t cancel_type = cancellation_type::all)
-    : cancel_type_(cancel_type)
-  {
-  }
-
-  constexpr cancellation_type_t
-  operator()() const noexcept
-  {
-    return cancel_type_;
-  }
-
-  template <typename E, typename... Args>
-  constexpr constraint_t<
-    !is_same<decay_t<E>, boost::system::error_code>::value
-      && !is_same<decay_t<E>, std::exception_ptr>::value,
-    cancellation_type_t
-  > operator()(const E&, Args&&...) const noexcept
-  {
-    return cancel_type_;
-  }
-
-  template <typename E, typename... Args>
-  constexpr constraint_t<
-      is_same<decay_t<E>, boost::system::error_code>::value
-        || is_same<decay_t<E>, std::exception_ptr>::value,
-      cancellation_type_t
-  > operator()(const E& e, Args&&...) const noexcept
-  {
-    return !!e ? cancellation_type::none : cancel_type_;
-  }
-
-private:
-  cancellation_type_t cancel_type_;
-};
-
-/// Wait until an operation completes with an error, then cancel the others.
-/**
- * If no operation completes with an error, waits for completion of all
- * operations.
- */
-class wait_for_one_error
-{
-public:
-  constexpr explicit wait_for_one_error(
-      cancellation_type_t cancel_type = cancellation_type::all)
-    : cancel_type_(cancel_type)
-  {
-  }
-
-  constexpr cancellation_type_t operator()() const noexcept
-  {
-    return cancellation_type::none;
-  }
-
-  template <typename E, typename... Args>
-  constexpr constraint_t<
-    !is_same<decay_t<E>, boost::system::error_code>::value
-      && !is_same<decay_t<E>, std::exception_ptr>::value,
-    cancellation_type_t
-  > operator()(const E&, Args&&...) const noexcept
-  {
-    return cancellation_type::none;
-  }
-
-  template <typename E, typename... Args>
-  constexpr constraint_t<
-      is_same<decay_t<E>, boost::system::error_code>::value
-        || is_same<decay_t<E>, std::exception_ptr>::value,
-      cancellation_type_t
-  > operator()(const E& e, Args&&...) const noexcept
-  {
-    return !!e ? cancel_type_ : cancellation_type::none;
-  }
-
-private:
-  cancellation_type_t cancel_type_;
-};
-
-} // namespace experimental
-} // namespace asio
-} // namespace boost
-
-#include <boost/asio/detail/pop_options.hpp>
-
-#endif // BOOST_ASIO_EXPERIMENTAL_CANCELLATION_CONDITION_HPP
diff --git a/inst/include/boost/asio/experimental/channel_error.hpp b/inst/include/boost/asio/experimental/channel_error.hpp
index 6e0569673..189d6ccb0 100644
--- a/inst/include/boost/asio/experimental/channel_error.hpp
+++ b/inst/include/boost/asio/experimental/channel_error.hpp
@@ -2,7 +2,7 @@
 // experimental/channel_error.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/experimental/impl/channel_error.ipp b/inst/include/boost/asio/experimental/impl/channel_error.ipp
index 53f1fa19a..ce3910ec1 100644
--- a/inst/include/boost/asio/experimental/impl/channel_error.ipp
+++ b/inst/include/boost/asio/experimental/impl/channel_error.ipp
@@ -2,7 +2,7 @@
 // experimental/impl/channel_error.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/experimental/impl/parallel_group.hpp b/inst/include/boost/asio/experimental/impl/parallel_group.hpp
deleted file mode 100644
index c254a0229..000000000
--- a/inst/include/boost/asio/experimental/impl/parallel_group.hpp
+++ /dev/null
@@ -1,789 +0,0 @@
-//
-// experimental/impl/parallel_group.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_IMPL_EXPERIMENTAL_PARALLEL_GROUP_HPP
-#define BOOST_ASIO_IMPL_EXPERIMENTAL_PARALLEL_GROUP_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/detail/config.hpp>
-#include <atomic>
-#include <deque>
-#include <memory>
-#include <new>
-#include <tuple>
-#include <boost/asio/associated_cancellation_slot.hpp>
-#include <boost/asio/detail/recycling_allocator.hpp>
-#include <boost/asio/detail/type_traits.hpp>
-#include <boost/asio/dispatch.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-
-namespace boost {
-namespace asio {
-namespace experimental {
-namespace detail {
-
-// Stores the result from an individual asynchronous operation.
-template <typename T, typename = void>
-struct parallel_group_op_result
-{
-public:
-  parallel_group_op_result()
-    : has_value_(false)
-  {
-  }
-
-  parallel_group_op_result(parallel_group_op_result&& other)
-    : has_value_(other.has_value_)
-  {
-    if (has_value_)
-      new (&u_.value_) T(std::move(other.get()));
-  }
-
-  ~parallel_group_op_result()
-  {
-    if (has_value_)
-      u_.value_.~T();
-  }
-
-  T& get() noexcept
-  {
-    return u_.value_;
-  }
-
-  template <typename... Args>
-  void emplace(Args&&... args)
-  {
-    new (&u_.value_) T(std::forward<Args>(args)...);
-    has_value_ = true;
-  }
-
-private:
-  union u
-  {
-    u() {}
-    ~u() {}
-    char c_;
-    T value_;
-  } u_;
-  bool has_value_;
-};
-
-// Proxy completion handler for the group of parallel operatations. Unpacks and
-// concatenates the individual operations' results, and invokes the user's
-// completion handler.
-template <typename Handler, typename... Ops>
-struct parallel_group_completion_handler
-{
-  typedef decay_t<
-      prefer_result_t<
-        associated_executor_t<Handler>,
-        execution::outstanding_work_t::tracked_t
-      >
-    > executor_type;
-
-  parallel_group_completion_handler(Handler&& h)
-    : handler_(std::move(h)),
-      executor_(
-          boost::asio::prefer(
-            boost::asio::get_associated_executor(handler_),
-            execution::outstanding_work.tracked))
-  {
-  }
-
-  executor_type get_executor() const noexcept
-  {
-    return executor_;
-  }
-
-  void operator()()
-  {
-    this->invoke(boost::asio::detail::make_index_sequence<sizeof...(Ops)>());
-  }
-
-  template <std::size_t... I>
-  void invoke(boost::asio::detail::index_sequence<I...>)
-  {
-    this->invoke(std::tuple_cat(std::move(std::get<I>(args_).get())...));
-  }
-
-  template <typename... Args>
-  void invoke(std::tuple<Args...>&& args)
-  {
-    this->invoke(std::move(args),
-        boost::asio::detail::index_sequence_for<Args...>());
-  }
-
-  template <typename... Args, std::size_t... I>
-  void invoke(std::tuple<Args...>&& args,
-      boost::asio::detail::index_sequence<I...>)
-  {
-    std::move(handler_)(completion_order_, std::move(std::get<I>(args))...);
-  }
-
-  Handler handler_;
-  executor_type executor_;
-  std::array<std::size_t, sizeof...(Ops)> completion_order_{};
-  std::tuple<
-      parallel_group_op_result<
-        typename parallel_op_signature_as_tuple<
-          completion_signature_of_t<Ops>
-        >::type
-      >...
-    > args_{};
-};
-
-// Shared state for the parallel group.
-template <typename Condition, typename Handler, typename... Ops>
-struct parallel_group_state
-{
-  parallel_group_state(Condition&& c, Handler&& h)
-    : cancellation_condition_(std::move(c)),
-      handler_(std::move(h))
-  {
-  }
-
-  // The number of operations that have completed so far. Used to determine the
-  // order of completion.
-  std::atomic<unsigned int> completed_{0};
-
-  // The non-none cancellation type that resulted from a cancellation condition.
-  // Stored here for use by the group's initiating function.
-  std::atomic<cancellation_type_t> cancel_type_{cancellation_type::none};
-
-  // The number of cancellations that have been requested, either on completion
-  // of the operations within the group, or via the cancellation slot for the
-  // group operation. Initially set to the number of operations to prevent
-  // cancellation signals from being emitted until after all of the group's
-  // operations' initiating functions have completed.
-  std::atomic<unsigned int> cancellations_requested_{sizeof...(Ops)};
-
-  // The number of operations that are yet to complete. Used to determine when
-  // it is safe to invoke the user's completion handler.
-  std::atomic<unsigned int> outstanding_{sizeof...(Ops)};
-
-  // The cancellation signals for each operation in the group.
-  boost::asio::cancellation_signal cancellation_signals_[sizeof...(Ops)];
-
-  // The cancellation condition is used to determine whether the results from an
-  // individual operation warrant a cancellation request for the whole group.
-  Condition cancellation_condition_;
-
-  // The proxy handler to be invoked once all operations in the group complete.
-  parallel_group_completion_handler<Handler, Ops...> handler_;
-};
-
-// Handler for an individual operation within the parallel group.
-template <std::size_t I, typename Condition, typename Handler, typename... Ops>
-struct parallel_group_op_handler
-{
-  typedef boost::asio::cancellation_slot cancellation_slot_type;
-
-  parallel_group_op_handler(
-    std::shared_ptr<parallel_group_state<Condition, Handler, Ops...>> state)
-    : state_(std::move(state))
-  {
-  }
-
-  cancellation_slot_type get_cancellation_slot() const noexcept
-  {
-    return state_->cancellation_signals_[I].slot();
-  }
-
-  template <typename... Args>
-  void operator()(Args... args)
-  {
-    // Capture this operation into the completion order.
-    state_->handler_.completion_order_[state_->completed_++] = I;
-
-    // Determine whether the results of this operation require cancellation of
-    // the whole group.
-    cancellation_type_t cancel_type = state_->cancellation_condition_(args...);
-
-    // Capture the result of the operation into the proxy completion handler.
-    std::get<I>(state_->handler_.args_).emplace(std::move(args)...);
-
-    if (cancel_type != cancellation_type::none)
-    {
-      // Save the type for potential use by the group's initiating function.
-      state_->cancel_type_ = cancel_type;
-
-      // If we are the first operation to request cancellation, emit a signal
-      // for each operation in the group.
-      if (state_->cancellations_requested_++ == 0)
-        for (std::size_t i = 0; i < sizeof...(Ops); ++i)
-          if (i != I)
-            state_->cancellation_signals_[i].emit(cancel_type);
-    }
-
-    // If this is the last outstanding operation, invoke the user's handler.
-    if (--state_->outstanding_ == 0)
-      boost::asio::dispatch(std::move(state_->handler_));
-  }
-
-  std::shared_ptr<parallel_group_state<Condition, Handler, Ops...>> state_;
-};
-
-// Handler for an individual operation within the parallel group that has an
-// explicitly specified executor.
-template <typename Executor, std::size_t I,
-    typename Condition, typename Handler, typename... Ops>
-struct parallel_group_op_handler_with_executor :
-  parallel_group_op_handler<I, Condition, Handler, Ops...>
-{
-  typedef parallel_group_op_handler<I, Condition, Handler, Ops...> base_type;
-  typedef boost::asio::cancellation_slot cancellation_slot_type;
-  typedef Executor executor_type;
-
-  parallel_group_op_handler_with_executor(
-      std::shared_ptr<parallel_group_state<Condition, Handler, Ops...>> state,
-      executor_type ex)
-    : parallel_group_op_handler<I, Condition, Handler, Ops...>(std::move(state))
-  {
-    cancel_proxy_ =
-      &this->state_->cancellation_signals_[I].slot().template
-        emplace<cancel_proxy>(this->state_, std::move(ex));
-  }
-
-  cancellation_slot_type get_cancellation_slot() const noexcept
-  {
-    return cancel_proxy_->signal_.slot();
-  }
-
-  executor_type get_executor() const noexcept
-  {
-    return cancel_proxy_->executor_;
-  }
-
-  // Proxy handler that forwards the emitted signal to the correct executor.
-  struct cancel_proxy
-  {
-    cancel_proxy(
-        std::shared_ptr<parallel_group_state<
-          Condition, Handler, Ops...>> state,
-        executor_type ex)
-      : state_(std::move(state)),
-        executor_(std::move(ex))
-    {
-    }
-
-    void operator()(cancellation_type_t type)
-    {
-      if (auto state = state_.lock())
-      {
-        boost::asio::cancellation_signal* sig = &signal_;
-        boost::asio::dispatch(executor_,
-            [state, sig, type]{ sig->emit(type); });
-      }
-    }
-
-    std::weak_ptr<parallel_group_state<Condition, Handler, Ops...>> state_;
-    boost::asio::cancellation_signal signal_;
-    executor_type executor_;
-  };
-
-  cancel_proxy* cancel_proxy_;
-};
-
-// Helper to launch an operation using the correct executor, if any.
-template <std::size_t I, typename Op, typename = void>
-struct parallel_group_op_launcher
-{
-  template <typename Condition, typename Handler, typename... Ops>
-  static void launch(Op& op,
-    const std::shared_ptr<parallel_group_state<
-      Condition, Handler, Ops...>>& state)
-  {
-    typedef associated_executor_t<Op> ex_type;
-    ex_type ex = boost::asio::get_associated_executor(op);
-    std::move(op)(
-        parallel_group_op_handler_with_executor<ex_type, I,
-          Condition, Handler, Ops...>(state, std::move(ex)));
-  }
-};
-
-// Specialised launcher for operations that specify no executor.
-template <std::size_t I, typename Op>
-struct parallel_group_op_launcher<I, Op,
-    enable_if_t<
-      is_same<
-        typename associated_executor<
-          Op>::asio_associated_executor_is_unspecialised,
-        void
-      >::value
-    >>
-{
-  template <typename Condition, typename Handler, typename... Ops>
-  static void launch(Op& op,
-    const std::shared_ptr<parallel_group_state<
-      Condition, Handler, Ops...>>& state)
-  {
-    std::move(op)(
-        parallel_group_op_handler<I, Condition, Handler, Ops...>(state));
-  }
-};
-
-template <typename Condition, typename Handler, typename... Ops>
-struct parallel_group_cancellation_handler
-{
-  parallel_group_cancellation_handler(
-    std::shared_ptr<parallel_group_state<Condition, Handler, Ops...>> state)
-    : state_(std::move(state))
-  {
-  }
-
-  void operator()(cancellation_type_t cancel_type)
-  {
-    // If we are the first place to request cancellation, i.e. no operation has
-    // yet completed and requested cancellation, emit a signal for each
-    // operation in the group.
-    if (cancel_type != cancellation_type::none)
-      if (auto state = state_.lock())
-        if (state->cancellations_requested_++ == 0)
-          for (std::size_t i = 0; i < sizeof...(Ops); ++i)
-            state->cancellation_signals_[i].emit(cancel_type);
-  }
-
-  std::weak_ptr<parallel_group_state<Condition, Handler, Ops...>> state_;
-};
-
-template <typename Condition, typename Handler,
-    typename... Ops, std::size_t... I>
-void parallel_group_launch(Condition cancellation_condition, Handler handler,
-    std::tuple<Ops...>& ops, boost::asio::detail::index_sequence<I...>)
-{
-  // Get the user's completion handler's cancellation slot, so that we can allow
-  // cancellation of the entire group.
-  associated_cancellation_slot_t<Handler> slot
-    = boost::asio::get_associated_cancellation_slot(handler);
-
-  // Create the shared state for the operation.
-  typedef parallel_group_state<Condition, Handler, Ops...> state_type;
-  std::shared_ptr<state_type> state = std::allocate_shared<state_type>(
-      boost::asio::detail::recycling_allocator<state_type,
-        boost::asio::detail::thread_info_base::parallel_group_tag>(),
-      std::move(cancellation_condition), std::move(handler));
-
-  // Initiate each individual operation in the group.
-  int fold[] = { 0,
-    ( parallel_group_op_launcher<I, Ops>::launch(std::get<I>(ops), state),
-      0 )...
-  };
-  (void)fold;
-
-  // Check if any of the operations has already requested cancellation, and if
-  // so, emit a signal for each operation in the group.
-  if ((state->cancellations_requested_ -= sizeof...(Ops)) > 0)
-    for (auto& signal : state->cancellation_signals_)
-      signal.emit(state->cancel_type_);
-
-  // Register a handler with the user's completion handler's cancellation slot.
-  if (slot.is_connected())
-    slot.template emplace<
-      parallel_group_cancellation_handler<
-        Condition, Handler, Ops...>>(state);
-}
-
-// Proxy completion handler for the ranged group of parallel operatations.
-// Unpacks and recombines the individual operations' results, and invokes the
-// user's completion handler.
-template <typename Handler, typename Op, typename Allocator>
-struct ranged_parallel_group_completion_handler
-{
-  typedef decay_t<
-      prefer_result_t<
-        associated_executor_t<Handler>,
-        execution::outstanding_work_t::tracked_t
-      >
-    > executor_type;
-
-  typedef typename parallel_op_signature_as_tuple<
-      completion_signature_of_t<Op>
-    >::type op_tuple_type;
-
-  typedef parallel_group_op_result<op_tuple_type> op_result_type;
-
-  ranged_parallel_group_completion_handler(Handler&& h,
-      std::size_t size, const Allocator& allocator)
-    : handler_(std::move(h)),
-      executor_(
-          boost::asio::prefer(
-            boost::asio::get_associated_executor(handler_),
-            execution::outstanding_work.tracked)),
-      allocator_(allocator),
-      completion_order_(size, 0,
-          BOOST_ASIO_REBIND_ALLOC(Allocator, std::size_t)(allocator)),
-      args_(BOOST_ASIO_REBIND_ALLOC(Allocator, op_result_type)(allocator))
-  {
-    for (std::size_t i = 0; i < size; ++i)
-      args_.emplace_back();
-  }
-
-  executor_type get_executor() const noexcept
-  {
-    return executor_;
-  }
-
-  void operator()()
-  {
-    this->invoke(
-        boost::asio::detail::make_index_sequence<
-          std::tuple_size<op_tuple_type>::value>());
-  }
-
-  template <std::size_t... I>
-  void invoke(boost::asio::detail::index_sequence<I...>)
-  {
-    typedef typename parallel_op_signature_as_tuple<
-        typename ranged_parallel_group_signature<
-          completion_signature_of_t<Op>,
-          Allocator
-        >::raw_type
-      >::type vectors_type;
-
-    // Construct all result vectors using the supplied allocator.
-    vectors_type vectors{
-        typename std::tuple_element<I, vectors_type>::type(
-          BOOST_ASIO_REBIND_ALLOC(Allocator, int)(allocator_))...};
-
-    // Reserve sufficient space in each of the result vectors.
-    int reserve_fold[] = { 0,
-      ( std::get<I>(vectors).reserve(completion_order_.size()),
-        0 )...
-    };
-    (void)reserve_fold;
-
-    // Copy the results from all operations into the result vectors.
-    for (std::size_t idx = 0; idx < completion_order_.size(); ++idx)
-    {
-      int pushback_fold[] = { 0,
-        ( std::get<I>(vectors).push_back(
-            std::move(std::get<I>(args_[idx].get()))),
-          0 )...
-      };
-      (void)pushback_fold;
-    }
-
-    std::move(handler_)(completion_order_, std::move(std::get<I>(vectors))...);
-  }
-
-  Handler handler_;
-  executor_type executor_;
-  Allocator allocator_;
-  std::vector<std::size_t,
-    BOOST_ASIO_REBIND_ALLOC(Allocator, std::size_t)> completion_order_;
-  std::deque<op_result_type,
-    BOOST_ASIO_REBIND_ALLOC(Allocator, op_result_type)> args_;
-};
-
-// Shared state for the parallel group.
-template <typename Condition, typename Handler, typename Op, typename Allocator>
-struct ranged_parallel_group_state
-{
-  ranged_parallel_group_state(Condition&& c, Handler&& h,
-      std::size_t size, const Allocator& allocator)
-    : cancellations_requested_(size),
-      outstanding_(size),
-      cancellation_signals_(
-          BOOST_ASIO_REBIND_ALLOC(Allocator,
-            boost::asio::cancellation_signal)(allocator)),
-      cancellation_condition_(std::move(c)),
-      handler_(std::move(h), size, allocator)
-  {
-    for (std::size_t i = 0; i < size; ++i)
-      cancellation_signals_.emplace_back();
-  }
-
-  // The number of operations that have completed so far. Used to determine the
-  // order of completion.
-  std::atomic<unsigned int> completed_{0};
-
-  // The non-none cancellation type that resulted from a cancellation condition.
-  // Stored here for use by the group's initiating function.
-  std::atomic<cancellation_type_t> cancel_type_{cancellation_type::none};
-
-  // The number of cancellations that have been requested, either on completion
-  // of the operations within the group, or via the cancellation slot for the
-  // group operation. Initially set to the number of operations to prevent
-  // cancellation signals from being emitted until after all of the group's
-  // operations' initiating functions have completed.
-  std::atomic<unsigned int> cancellations_requested_;
-
-  // The number of operations that are yet to complete. Used to determine when
-  // it is safe to invoke the user's completion handler.
-  std::atomic<unsigned int> outstanding_;
-
-  // The cancellation signals for each operation in the group.
-  std::deque<boost::asio::cancellation_signal,
-    BOOST_ASIO_REBIND_ALLOC(Allocator, boost::asio::cancellation_signal)>
-      cancellation_signals_;
-
-  // The cancellation condition is used to determine whether the results from an
-  // individual operation warrant a cancellation request for the whole group.
-  Condition cancellation_condition_;
-
-  // The proxy handler to be invoked once all operations in the group complete.
-  ranged_parallel_group_completion_handler<Handler, Op, Allocator> handler_;
-};
-
-// Handler for an individual operation within the parallel group.
-template <typename Condition, typename Handler, typename Op, typename Allocator>
-struct ranged_parallel_group_op_handler
-{
-  typedef boost::asio::cancellation_slot cancellation_slot_type;
-
-  ranged_parallel_group_op_handler(
-      std::shared_ptr<ranged_parallel_group_state<
-        Condition, Handler, Op, Allocator>> state,
-      std::size_t idx)
-    : state_(std::move(state)),
-      idx_(idx)
-  {
-  }
-
-  cancellation_slot_type get_cancellation_slot() const noexcept
-  {
-    return state_->cancellation_signals_[idx_].slot();
-  }
-
-  template <typename... Args>
-  void operator()(Args... args)
-  {
-    // Capture this operation into the completion order.
-    state_->handler_.completion_order_[state_->completed_++] = idx_;
-
-    // Determine whether the results of this operation require cancellation of
-    // the whole group.
-    cancellation_type_t cancel_type = state_->cancellation_condition_(args...);
-
-    // Capture the result of the operation into the proxy completion handler.
-    state_->handler_.args_[idx_].emplace(std::move(args)...);
-
-    if (cancel_type != cancellation_type::none)
-    {
-      // Save the type for potential use by the group's initiating function.
-      state_->cancel_type_ = cancel_type;
-
-      // If we are the first operation to request cancellation, emit a signal
-      // for each operation in the group.
-      if (state_->cancellations_requested_++ == 0)
-        for (std::size_t i = 0; i < state_->cancellation_signals_.size(); ++i)
-          if (i != idx_)
-            state_->cancellation_signals_[i].emit(cancel_type);
-    }
-
-    // If this is the last outstanding operation, invoke the user's handler.
-    if (--state_->outstanding_ == 0)
-      boost::asio::dispatch(std::move(state_->handler_));
-  }
-
-  std::shared_ptr<ranged_parallel_group_state<
-    Condition, Handler, Op, Allocator>> state_;
-  std::size_t idx_;
-};
-
-// Handler for an individual operation within the parallel group that has an
-// explicitly specified executor.
-template <typename Executor, typename Condition,
-    typename Handler, typename Op, typename Allocator>
-struct ranged_parallel_group_op_handler_with_executor :
-  ranged_parallel_group_op_handler<Condition, Handler, Op, Allocator>
-{
-  typedef ranged_parallel_group_op_handler<
-    Condition, Handler, Op, Allocator> base_type;
-  typedef boost::asio::cancellation_slot cancellation_slot_type;
-  typedef Executor executor_type;
-
-  ranged_parallel_group_op_handler_with_executor(
-      std::shared_ptr<ranged_parallel_group_state<
-        Condition, Handler, Op, Allocator>> state,
-      executor_type ex, std::size_t idx)
-    : ranged_parallel_group_op_handler<Condition, Handler, Op, Allocator>(
-        std::move(state), idx)
-  {
-    cancel_proxy_ =
-      &this->state_->cancellation_signals_[idx].slot().template
-        emplace<cancel_proxy>(this->state_, std::move(ex));
-  }
-
-  cancellation_slot_type get_cancellation_slot() const noexcept
-  {
-    return cancel_proxy_->signal_.slot();
-  }
-
-  executor_type get_executor() const noexcept
-  {
-    return cancel_proxy_->executor_;
-  }
-
-  // Proxy handler that forwards the emitted signal to the correct executor.
-  struct cancel_proxy
-  {
-    cancel_proxy(
-        std::shared_ptr<ranged_parallel_group_state<
-          Condition, Handler, Op, Allocator>> state,
-        executor_type ex)
-      : state_(std::move(state)),
-        executor_(std::move(ex))
-    {
-    }
-
-    void operator()(cancellation_type_t type)
-    {
-      if (auto state = state_.lock())
-      {
-        boost::asio::cancellation_signal* sig = &signal_;
-        boost::asio::dispatch(executor_,
-            [state, sig, type]{ sig->emit(type); });
-      }
-    }
-
-    std::weak_ptr<ranged_parallel_group_state<
-      Condition, Handler, Op, Allocator>> state_;
-    boost::asio::cancellation_signal signal_;
-    executor_type executor_;
-  };
-
-  cancel_proxy* cancel_proxy_;
-};
-
-template <typename Condition, typename Handler, typename Op, typename Allocator>
-struct ranged_parallel_group_cancellation_handler
-{
-  ranged_parallel_group_cancellation_handler(
-      std::shared_ptr<ranged_parallel_group_state<
-        Condition, Handler, Op, Allocator>> state)
-    : state_(std::move(state))
-  {
-  }
-
-  void operator()(cancellation_type_t cancel_type)
-  {
-    // If we are the first place to request cancellation, i.e. no operation has
-    // yet completed and requested cancellation, emit a signal for each
-    // operation in the group.
-    if (cancel_type != cancellation_type::none)
-      if (auto state = state_.lock())
-        if (state->cancellations_requested_++ == 0)
-          for (std::size_t i = 0; i < state->cancellation_signals_.size(); ++i)
-            state->cancellation_signals_[i].emit(cancel_type);
-  }
-
-  std::weak_ptr<ranged_parallel_group_state<
-    Condition, Handler, Op, Allocator>> state_;
-};
-
-template <typename Condition, typename Handler,
-    typename Range, typename Allocator>
-void ranged_parallel_group_launch(Condition cancellation_condition,
-    Handler handler, Range&& range, const Allocator& allocator)
-{
-  // Get the user's completion handler's cancellation slot, so that we can allow
-  // cancellation of the entire group.
-  associated_cancellation_slot_t<Handler> slot
-    = boost::asio::get_associated_cancellation_slot(handler);
-
-  // The type of the asynchronous operation.
-  typedef decay_t<decltype(*declval<typename Range::iterator>())> op_type;
-
-  // Create the shared state for the operation.
-  typedef ranged_parallel_group_state<Condition,
-    Handler, op_type, Allocator> state_type;
-  std::shared_ptr<state_type> state = std::allocate_shared<state_type>(
-      boost::asio::detail::recycling_allocator<state_type,
-        boost::asio::detail::thread_info_base::parallel_group_tag>(),
-      std::move(cancellation_condition),
-      std::move(handler), range.size(), allocator);
-
-  std::size_t idx = 0;
-  for (auto&& op : std::forward<Range>(range))
-  {
-    typedef associated_executor_t<op_type> ex_type;
-    ex_type ex = boost::asio::get_associated_executor(op);
-    std::move(op)(
-        ranged_parallel_group_op_handler_with_executor<
-          ex_type, Condition, Handler, op_type, Allocator>(
-            state, std::move(ex), idx++));
-  }
-
-  // Check if any of the operations has already requested cancellation, and if
-  // so, emit a signal for each operation in the group.
-  if ((state->cancellations_requested_ -= range.size()) > 0)
-    for (auto& signal : state->cancellation_signals_)
-      signal.emit(state->cancel_type_);
-
-  // Register a handler with the user's completion handler's cancellation slot.
-  if (slot.is_connected())
-    slot.template emplace<
-      ranged_parallel_group_cancellation_handler<
-        Condition, Handler, op_type, Allocator>>(state);
-}
-
-} // namespace detail
-} // namespace experimental
-
-template <template <typename, typename> class Associator,
-    typename Handler, typename... Ops, typename DefaultCandidate>
-struct associator<Associator,
-    experimental::detail::parallel_group_completion_handler<Handler, Ops...>,
-    DefaultCandidate>
-  : Associator<Handler, DefaultCandidate>
-{
-  static typename Associator<Handler, DefaultCandidate>::type get(
-      const experimental::detail::parallel_group_completion_handler<
-        Handler, Ops...>& h) noexcept
-  {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_);
-  }
-
-  static auto get(
-      const experimental::detail::parallel_group_completion_handler<
-        Handler, Ops...>& h,
-      const DefaultCandidate& c) noexcept
-    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
-  {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
-  }
-};
-
-template <template <typename, typename> class Associator, typename Handler,
-    typename Op, typename Allocator, typename DefaultCandidate>
-struct associator<Associator,
-    experimental::detail::ranged_parallel_group_completion_handler<
-      Handler, Op, Allocator>,
-    DefaultCandidate>
-  : Associator<Handler, DefaultCandidate>
-{
-  static typename Associator<Handler, DefaultCandidate>::type get(
-      const experimental::detail::ranged_parallel_group_completion_handler<
-        Handler, Op, Allocator>& h) noexcept
-  {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_);
-  }
-
-  static auto get(
-      const experimental::detail::ranged_parallel_group_completion_handler<
-        Handler, Op, Allocator>& h,
-      const DefaultCandidate& c) noexcept
-    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
-  {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
-  }
-};
-
-} // namespace asio
-} // namespace boost
-
-#include <boost/asio/detail/pop_options.hpp>
-
-#endif // BOOST_ASIO_IMPL_EXPERIMENTAL_PARALLEL_GROUP_HPP
diff --git a/inst/include/boost/asio/experimental/parallel_group.hpp b/inst/include/boost/asio/experimental/parallel_group.hpp
deleted file mode 100644
index d538e3b13..000000000
--- a/inst/include/boost/asio/experimental/parallel_group.hpp
+++ /dev/null
@@ -1,458 +0,0 @@
-//
-// experimental/parallel_group.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_EXPERIMENTAL_PARALLEL_GROUP_HPP
-#define BOOST_ASIO_EXPERIMENTAL_PARALLEL_GROUP_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/detail/config.hpp>
-#include <vector>
-#include <boost/asio/detail/array.hpp>
-#include <boost/asio/detail/memory.hpp>
-#include <boost/asio/detail/type_traits.hpp>
-#include <boost/asio/detail/utility.hpp>
-#include <boost/asio/experimental/cancellation_condition.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-
-namespace boost {
-namespace asio {
-namespace experimental {
-namespace detail {
-
-// Helper trait for getting a tuple from a completion signature.
-
-template <typename Signature>
-struct parallel_op_signature_as_tuple;
-
-template <typename R, typename... Args>
-struct parallel_op_signature_as_tuple<R(Args...)>
-{
-  typedef std::tuple<decay_t<Args>...> type;
-};
-
-// Helper trait for concatenating completion signatures.
-
-template <std::size_t N, typename Offsets, typename... Signatures>
-struct parallel_group_signature;
-
-template <std::size_t N, typename R0, typename... Args0>
-struct parallel_group_signature<N, R0(Args0...)>
-{
-  typedef boost::asio::detail::array<std::size_t, N> order_type;
-  typedef R0 raw_type(Args0...);
-  typedef R0 type(order_type, Args0...);
-};
-
-template <std::size_t N,
-    typename R0, typename... Args0,
-    typename R1, typename... Args1>
-struct parallel_group_signature<N, R0(Args0...), R1(Args1...)>
-{
-  typedef boost::asio::detail::array<std::size_t, N> order_type;
-  typedef R0 raw_type(Args0..., Args1...);
-  typedef R0 type(order_type, Args0..., Args1...);
-};
-
-template <std::size_t N, typename Sig0,
-    typename Sig1, typename... SigN>
-struct parallel_group_signature<N, Sig0, Sig1, SigN...>
-{
-  typedef boost::asio::detail::array<std::size_t, N> order_type;
-  typedef typename parallel_group_signature<N,
-    typename parallel_group_signature<N, Sig0, Sig1>::raw_type,
-      SigN...>::raw_type raw_type;
-  typedef typename parallel_group_signature<N,
-    typename parallel_group_signature<N, Sig0, Sig1>::raw_type,
-      SigN...>::type type;
-};
-
-template <typename Condition, typename Handler,
-    typename... Ops, std::size_t... I>
-void parallel_group_launch(Condition cancellation_condition, Handler handler,
-    std::tuple<Ops...>& ops, boost::asio::detail::index_sequence<I...>);
-
-// Helper trait for determining ranged parallel group completion signatures.
-
-template <typename Signature, typename Allocator>
-struct ranged_parallel_group_signature;
-
-template <typename R, typename... Args, typename Allocator>
-struct ranged_parallel_group_signature<R(Args...), Allocator>
-{
-  typedef std::vector<std::size_t,
-    BOOST_ASIO_REBIND_ALLOC(Allocator, std::size_t)> order_type;
-  typedef R raw_type(
-      std::vector<Args, BOOST_ASIO_REBIND_ALLOC(Allocator, Args)>...);
-  typedef R type(order_type,
-      std::vector<Args, BOOST_ASIO_REBIND_ALLOC(Allocator, Args)>...);
-};
-
-template <typename Condition, typename Handler,
-    typename Range, typename Allocator>
-void ranged_parallel_group_launch(Condition cancellation_condition,
-    Handler handler, Range&& range, const Allocator& allocator);
-
-char (&parallel_group_has_iterator_helper(...))[2];
-
-template <typename T>
-char parallel_group_has_iterator_helper(T*, typename T::iterator* = 0);
-
-template <typename T>
-struct parallel_group_has_iterator_typedef
-{
-  enum { value = (sizeof((parallel_group_has_iterator_helper)((T*)(0))) == 1) };
-};
-
-} // namespace detail
-
-/// Type trait used to determine whether a type is a range of asynchronous
-/// operations that can be used with with @c make_parallel_group.
-template <typename T>
-struct is_async_operation_range
-{
-#if defined(GENERATING_DOCUMENTATION)
-  /// The value member is true if the type may be used as a range of
-  /// asynchronous operations.
-  static const bool value;
-#else
-  enum
-  {
-    value = detail::parallel_group_has_iterator_typedef<T>::value
-  };
-#endif
-};
-
-/// A group of asynchronous operations that may be launched in parallel.
-/**
- * See the documentation for boost::asio::experimental::make_parallel_group for
- * a usage example.
- */
-template <typename... Ops>
-class parallel_group
-{
-private:
-  struct initiate_async_wait
-  {
-    template <typename Handler, typename Condition>
-    void operator()(Handler&& h, Condition&& c, std::tuple<Ops...>&& ops) const
-    {
-      detail::parallel_group_launch(
-          std::forward<Condition>(c), std::forward<Handler>(h),
-          ops, boost::asio::detail::index_sequence_for<Ops...>());
-    }
-  };
-
-  std::tuple<Ops...> ops_;
-
-public:
-  /// Constructor.
-  explicit parallel_group(Ops... ops)
-    : ops_(std::move(ops)...)
-  {
-  }
-
-  /// The completion signature for the group of operations.
-  typedef typename detail::parallel_group_signature<sizeof...(Ops),
-      completion_signature_of_t<Ops>...>::type signature;
-
-  /// Initiate an asynchronous wait for the group of operations.
-  /**
-   * Launches the group and asynchronously waits for completion.
-   *
-   * @param cancellation_condition A function object, called on completion of
-   * an operation within the group, that is used to determine whether to cancel
-   * the remaining operations. The function object is passed the arguments of
-   * the completed operation's handler. To trigger cancellation of the remaining
-   * operations, it must return a boost::asio::cancellation_type value other
-   * than <tt>boost::asio::cancellation_type::none</tt>.
-   *
-   * @param token A @ref completion_token whose signature is comprised of
-   * a @c std::array<std::size_t, N> indicating the completion order of the
-   * operations, followed by all operations' completion handler arguments.
-   *
-   * The library provides the following @c cancellation_condition types:
-   *
-   * @li boost::asio::experimental::wait_for_all
-   * @li boost::asio::experimental::wait_for_one
-   * @li boost::asio::experimental::wait_for_one_error
-   * @li boost::asio::experimental::wait_for_one_success
-   */
-  template <typename CancellationCondition,
-      BOOST_ASIO_COMPLETION_TOKEN_FOR(signature) CompletionToken>
-  auto async_wait(CancellationCondition cancellation_condition,
-      CompletionToken&& token)
-    -> decltype(
-      boost::asio::async_initiate<CompletionToken, signature>(
-        declval<initiate_async_wait>(), token,
-        std::move(cancellation_condition), std::move(ops_)))
-  {
-    return boost::asio::async_initiate<CompletionToken, signature>(
-        initiate_async_wait(), token,
-        std::move(cancellation_condition), std::move(ops_));
-  }
-};
-
-/// Create a group of operations that may be launched in parallel.
-/**
- * For example:
- * @code boost::asio::experimental::make_parallel_group(
- *    [&](auto token)
- *    {
- *      return in.async_read_some(boost::asio::buffer(data), token);
- *    },
- *    [&](auto token)
- *    {
- *      return timer.async_wait(token);
- *    }
- *  ).async_wait(
- *    boost::asio::experimental::wait_for_all(),
- *    [](
- *        std::array<std::size_t, 2> completion_order,
- *        boost::system::error_code ec1, std::size_t n1,
- *        boost::system::error_code ec2
- *    )
- *    {
- *      switch (completion_order[0])
- *      {
- *      case 0:
- *        {
- *          std::cout << "descriptor finished: " << ec1 << ", " << n1 << "\n";
- *        }
- *        break;
- *      case 1:
- *        {
- *          std::cout << "timer finished: " << ec2 << "\n";
- *        }
- *        break;
- *      }
- *    }
- *  );
- * @endcode
- */
-template <typename... Ops>
-BOOST_ASIO_NODISCARD inline parallel_group<Ops...>
-make_parallel_group(Ops... ops)
-{
-  return parallel_group<Ops...>(std::move(ops)...);
-}
-
-/// A range-based group of asynchronous operations that may be launched in
-/// parallel.
-/**
- * See the documentation for boost::asio::experimental::make_parallel_group for
- * a usage example.
- */
-template <typename Range, typename Allocator = std::allocator<void>>
-class ranged_parallel_group
-{
-private:
-  struct initiate_async_wait
-  {
-    template <typename Handler, typename Condition>
-    void operator()(Handler&& h, Condition&& c,
-        Range&& range, const Allocator& allocator) const
-    {
-      detail::ranged_parallel_group_launch(std::move(c),
-          std::move(h), std::forward<Range>(range), allocator);
-    }
-  };
-
-  Range range_;
-  Allocator allocator_;
-
-public:
-  /// Constructor.
-  explicit ranged_parallel_group(Range range,
-      const Allocator& allocator = Allocator())
-    : range_(std::move(range)),
-      allocator_(allocator)
-  {
-  }
-
-  /// The completion signature for the group of operations.
-  typedef typename detail::ranged_parallel_group_signature<
-      completion_signature_of_t<
-        decay_t<decltype(*std::declval<typename Range::iterator>())>>,
-      Allocator>::type signature;
-
-  /// Initiate an asynchronous wait for the group of operations.
-  /**
-   * Launches the group and asynchronously waits for completion.
-   *
-   * @param cancellation_condition A function object, called on completion of
-   * an operation within the group, that is used to determine whether to cancel
-   * the remaining operations. The function object is passed the arguments of
-   * the completed operation's handler. To trigger cancellation of the remaining
-   * operations, it must return a boost::asio::cancellation_type value other
-   * than <tt>boost::asio::cancellation_type::none</tt>.
-   *
-   * @param token A @ref completion_token whose signature is comprised of
-   * a @c std::vector<std::size_t, Allocator> indicating the completion order of
-   * the operations, followed by a vector for each of the completion signature's
-   * arguments.
-   *
-   * The library provides the following @c cancellation_condition types:
-   *
-   * @li boost::asio::experimental::wait_for_all
-   * @li boost::asio::experimental::wait_for_one
-   * @li boost::asio::experimental::wait_for_one_error
-   * @li boost::asio::experimental::wait_for_one_success
-   */
-  template <typename CancellationCondition,
-      BOOST_ASIO_COMPLETION_TOKEN_FOR(signature) CompletionToken>
-  auto async_wait(CancellationCondition cancellation_condition,
-      CompletionToken&& token)
-    -> decltype(
-      boost::asio::async_initiate<CompletionToken, signature>(
-        declval<initiate_async_wait>(), token,
-        std::move(cancellation_condition),
-        std::move(range_), allocator_))
-  {
-    return boost::asio::async_initiate<CompletionToken, signature>(
-        initiate_async_wait(), token,
-        std::move(cancellation_condition),
-        std::move(range_), allocator_);
-  }
-};
-
-/// Create a group of operations that may be launched in parallel.
-/**
- * @param range A range containing the operations to be launched.
- *
- * For example:
- * @code
- * using op_type = decltype(
- *     socket1.async_read_some(
- *       boost::asio::buffer(data1),
- *       boost::asio::deferred
- *     )
- *   );
- *
- * std::vector<op_type> ops;
- *
- * ops.push_back(
- *     socket1.async_read_some(
- *       boost::asio::buffer(data1),
- *       boost::asio::deferred
- *     )
- *   );
- *
- * ops.push_back(
- *     socket2.async_read_some(
- *       boost::asio::buffer(data2),
- *       boost::asio::deferred
- *     )
- *   );
- *
- * boost::asio::experimental::make_parallel_group(ops).async_wait(
- *     boost::asio::experimental::wait_for_all(),
- *     [](
- *         std::vector<std::size_t> completion_order,
- *         std::vector<boost::system::error_code> e,
- *         std::vector<std::size_t> n
- *       )
- *     {
- *       for (std::size_t i = 0; i < completion_order.size(); ++i)
- *       {
- *         std::size_t idx = completion_order[i];
- *         std::cout << "socket " << idx << " finished: ";
- *         std::cout << e[idx] << ", " << n[idx] << "\n";
- *       }
- *     }
- *   );
- * @endcode
- */
-template <typename Range>
-BOOST_ASIO_NODISCARD inline ranged_parallel_group<decay_t<Range>>
-make_parallel_group(Range&& range,
-    constraint_t<
-      is_async_operation_range<decay_t<Range>>::value
-    > = 0)
-{
-  return ranged_parallel_group<decay_t<Range>>(std::forward<Range>(range));
-}
-
-/// Create a group of operations that may be launched in parallel.
-/**
- * @param allocator Specifies the allocator to be used with the result vectors.
- *
- * @param range A range containing the operations to be launched.
- *
- * For example:
- * @code
- * using op_type = decltype(
- *     socket1.async_read_some(
- *       boost::asio::buffer(data1),
- *       boost::asio::deferred
- *     )
- *   );
- *
- * std::vector<op_type> ops;
- *
- * ops.push_back(
- *     socket1.async_read_some(
- *       boost::asio::buffer(data1),
- *       boost::asio::deferred
- *     )
- *   );
- *
- * ops.push_back(
- *     socket2.async_read_some(
- *       boost::asio::buffer(data2),
- *       boost::asio::deferred
- *     )
- *   );
- *
- * boost::asio::experimental::make_parallel_group(
- *     std::allocator_arg_t,
- *     my_allocator,
- *     ops
- *   ).async_wait(
- *     boost::asio::experimental::wait_for_all(),
- *     [](
- *         std::vector<std::size_t> completion_order,
- *         std::vector<boost::system::error_code> e,
- *         std::vector<std::size_t> n
- *       )
- *     {
- *       for (std::size_t i = 0; i < completion_order.size(); ++i)
- *       {
- *         std::size_t idx = completion_order[i];
- *         std::cout << "socket " << idx << " finished: ";
- *         std::cout << e[idx] << ", " << n[idx] << "\n";
- *       }
- *     }
- *   );
- * @endcode
- */
-template <typename Allocator, typename Range>
-BOOST_ASIO_NODISCARD inline ranged_parallel_group<decay_t<Range>, Allocator>
-make_parallel_group(allocator_arg_t, const Allocator& allocator, Range&& range,
-    constraint_t<
-      is_async_operation_range<decay_t<Range>>::value
-    > = 0)
-{
-  return ranged_parallel_group<decay_t<Range>, Allocator>(
-      std::forward<Range>(range), allocator);
-}
-
-} // namespace experimental
-} // namespace asio
-} // namespace boost
-
-#include <boost/asio/detail/pop_options.hpp>
-
-#include <boost/asio/experimental/impl/parallel_group.hpp>
-
-#endif // BOOST_ASIO_EXPERIMENTAL_PARALLEL_GROUP_HPP
diff --git a/inst/include/boost/asio/file_base.hpp b/inst/include/boost/asio/file_base.hpp
index fbaabfcd0..97a295672 100644
--- a/inst/include/boost/asio/file_base.hpp
+++ b/inst/include/boost/asio/file_base.hpp
@@ -2,7 +2,7 @@
 // file_base.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/basic_endpoint.hpp b/inst/include/boost/asio/generic/basic_endpoint.hpp
index 5fb69d17e..c48a1694d 100644
--- a/inst/include/boost/asio/generic/basic_endpoint.hpp
+++ b/inst/include/boost/asio/generic/basic_endpoint.hpp
@@ -2,7 +2,7 @@
 // generic/basic_endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/datagram_protocol.hpp b/inst/include/boost/asio/generic/datagram_protocol.hpp
index da0bc9a30..7609e8aba 100644
--- a/inst/include/boost/asio/generic/datagram_protocol.hpp
+++ b/inst/include/boost/asio/generic/datagram_protocol.hpp
@@ -2,7 +2,7 @@
 // generic/datagram_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/detail/endpoint.hpp b/inst/include/boost/asio/generic/detail/endpoint.hpp
index 88ae981c0..a98ea7b16 100644
--- a/inst/include/boost/asio/generic/detail/endpoint.hpp
+++ b/inst/include/boost/asio/generic/detail/endpoint.hpp
@@ -2,7 +2,7 @@
 // generic/detail/endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/detail/impl/endpoint.ipp b/inst/include/boost/asio/generic/detail/impl/endpoint.ipp
index 1f8bbd7e9..11e5bf6e6 100644
--- a/inst/include/boost/asio/generic/detail/impl/endpoint.ipp
+++ b/inst/include/boost/asio/generic/detail/impl/endpoint.ipp
@@ -2,7 +2,7 @@
 // generic/detail/impl/endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/raw_protocol.hpp b/inst/include/boost/asio/generic/raw_protocol.hpp
index f5e06abd4..5b7907f67 100644
--- a/inst/include/boost/asio/generic/raw_protocol.hpp
+++ b/inst/include/boost/asio/generic/raw_protocol.hpp
@@ -2,7 +2,7 @@
 // generic/raw_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/seq_packet_protocol.hpp b/inst/include/boost/asio/generic/seq_packet_protocol.hpp
index 26654405c..ede21a32c 100644
--- a/inst/include/boost/asio/generic/seq_packet_protocol.hpp
+++ b/inst/include/boost/asio/generic/seq_packet_protocol.hpp
@@ -2,7 +2,7 @@
 // generic/seq_packet_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/generic/stream_protocol.hpp b/inst/include/boost/asio/generic/stream_protocol.hpp
index 16039bfdd..0c4e07a5a 100644
--- a/inst/include/boost/asio/generic/stream_protocol.hpp
+++ b/inst/include/boost/asio/generic/stream_protocol.hpp
@@ -2,7 +2,7 @@
 // generic/stream_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/handler_continuation_hook.hpp b/inst/include/boost/asio/handler_continuation_hook.hpp
index 97fe525fa..158d9197e 100644
--- a/inst/include/boost/asio/handler_continuation_hook.hpp
+++ b/inst/include/boost/asio/handler_continuation_hook.hpp
@@ -2,7 +2,7 @@
 // handler_continuation_hook.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/high_resolution_timer.hpp b/inst/include/boost/asio/high_resolution_timer.hpp
index bacbd4fb6..1713e2e87 100644
--- a/inst/include/boost/asio/high_resolution_timer.hpp
+++ b/inst/include/boost/asio/high_resolution_timer.hpp
@@ -2,7 +2,7 @@
 // high_resolution_timer.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/immediate.hpp b/inst/include/boost/asio/immediate.hpp
new file mode 100644
index 000000000..c5ff2f67a
--- /dev/null
+++ b/inst/include/boost/asio/immediate.hpp
@@ -0,0 +1,144 @@
+//
+// immediate.hpp
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_IMMEDIATE_HPP
+#define BOOST_ASIO_IMMEDIATE_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/associated_immediate_executor.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/dispatch.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Executor>
+class initiate_immediate
+{
+public:
+  typedef Executor executor_type;
+
+  explicit initiate_immediate(const Executor& ex)
+    : ex_(ex)
+  {
+  }
+
+  executor_type get_executor() const noexcept
+  {
+    return ex_;
+  }
+
+  template <typename CompletionHandler>
+  void operator()(CompletionHandler&& handler) const
+  {
+    typename associated_immediate_executor<
+      CompletionHandler, executor_type>::type ex =
+        (get_associated_immediate_executor)(handler, ex_);
+    (dispatch)(ex, static_cast<CompletionHandler&&>(handler));
+  }
+
+private:
+  Executor ex_;
+};
+
+} // namespace detail
+
+/// Launch a trivial asynchronous operation that completes immediately.
+/**
+ * The async_immediate function is intended for use by composed operations,
+ * which can delegate to this operation in order to implement the correct
+ * semantics for immediate completion.
+ *
+ * @param ex The asynchronous operation's I/O executor.
+ *
+ * @param token The completion token.
+ *
+ * The completion handler is immediately submitted for execution by calling
+ * boost::asio::dispatch() on the handler's associated immediate executor.
+ *
+ * If the completion handler does not have a customised associated immediate
+ * executor, then the handler is submitted as if by calling boost::asio::post()
+ * on the supplied I/O executor.
+ *
+ * @par Completion Signature
+ * @code void() @endcode
+ */
+template <typename Executor,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(void()) NullaryToken
+      = default_completion_token_t<Executor>>
+inline auto async_immediate(const Executor& ex,
+    NullaryToken&& token = default_completion_token_t<Executor>(),
+    constraint_t<
+      (execution::is_executor<Executor>::value
+          && can_require<Executor, execution::blocking_t::never_t>::value)
+        || is_executor<Executor>::value
+    > = 0)
+  -> decltype(
+    async_initiate<NullaryToken, void()>(
+      declval<detail::initiate_immediate<Executor>>(), token))
+{
+  return async_initiate<NullaryToken, void()>(
+      detail::initiate_immediate<Executor>(ex), token);
+}
+
+/// Launch a trivial asynchronous operation that completes immediately.
+/**
+ * The async_immediate function is intended for use by composed operations,
+ * which can delegate to this operation in order to implement the correct
+ * semantics for immediate completion.
+ *
+ * @param ex The execution context used to obtain the asynchronous operation's
+ * I/O executor.
+ *
+ * @param token The completion token.
+ *
+ * The completion handler is immediately submitted for execution by calling
+ * boost::asio::dispatch() on the handler's associated immediate executor.
+ *
+ * If the completion handler does not have a customised associated immediate
+ * executor, then the handler is submitted as if by calling boost::asio::post()
+ * on the I/O executor obtained from the supplied execution context.
+ *
+ * @par Completion Signature
+ * @code void() @endcode
+ */
+template <typename ExecutionContext,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(void()) NullaryToken
+      = default_completion_token_t<typename ExecutionContext::executor_type>>
+inline auto async_immediate(ExecutionContext& ctx,
+    NullaryToken&& token = default_completion_token_t<
+      typename ExecutionContext::executor_type>(),
+    constraint_t<
+      is_convertible<ExecutionContext&, execution_context&>::value
+    > = 0)
+  -> decltype(
+    async_initiate<NullaryToken, void()>(
+      declval<detail::initiate_immediate<
+        typename ExecutionContext::executor_type>>(), token))
+{
+  return async_initiate<NullaryToken, void()>(
+      detail::initiate_immediate<
+        typename ExecutionContext::executor_type>(
+          ctx.get_executor()), token);
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_IMMEDIATE_HPP
diff --git a/inst/include/boost/asio/impl/any_completion_executor.ipp b/inst/include/boost/asio/impl/any_completion_executor.ipp
index c83abd980..f0d8082e9 100644
--- a/inst/include/boost/asio/impl/any_completion_executor.ipp
+++ b/inst/include/boost/asio/impl/any_completion_executor.ipp
@@ -2,7 +2,7 @@
 // impl/any_completion_executor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/any_io_executor.ipp b/inst/include/boost/asio/impl/any_io_executor.ipp
index 86688d086..89fe6535b 100644
--- a/inst/include/boost/asio/impl/any_io_executor.ipp
+++ b/inst/include/boost/asio/impl/any_io_executor.ipp
@@ -2,7 +2,7 @@
 // impl/any_io_executor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/append.hpp b/inst/include/boost/asio/impl/append.hpp
index 5370ed61b..e358ea2b0 100644
--- a/inst/include/boost/asio/impl/append.hpp
+++ b/inst/include/boost/asio/impl/append.hpp
@@ -2,7 +2,7 @@
 // impl/append.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,6 +19,7 @@
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/utility.hpp>
 
@@ -94,25 +95,31 @@ struct async_result<append_t<CompletionToken, Values...>, Signature>
       Signature, Values...>::type signature;
 
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    init_wrapper(Initiation init)
-      : initiation_(static_cast<Initiation&&>(init))
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler,
+        std::tuple<Values...> values, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::append_handler<decay_t<Handler>, Values...>(
+            static_cast<Handler&&>(handler),
+            static_cast<std::tuple<Values...>&&>(values)),
+          static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
     void operator()(Handler&& handler,
-        std::tuple<Values...> values, Args&&... args)
+        std::tuple<Values...> values, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<const Initiation&>(*this)(
           detail::append_handler<decay_t<Handler>, Values...>(
             static_cast<Handler&&>(handler),
             static_cast<std::tuple<Values...>&&>(values)),
           static_cast<Args&&>(args)...);
     }
-
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
diff --git a/inst/include/boost/asio/impl/as_tuple.hpp b/inst/include/boost/asio/impl/as_tuple.hpp
index b38cf628a..912e2666f 100644
--- a/inst/include/boost/asio/impl/as_tuple.hpp
+++ b/inst/include/boost/asio/impl/as_tuple.hpp
@@ -2,7 +2,7 @@
 // impl/as_tuple.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,9 +17,11 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <tuple>
+#include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -119,23 +121,27 @@ struct async_result<as_tuple_t<CompletionToken>, Signatures...>
       typename detail::as_tuple_signature<Signatures>::type...>
 {
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    init_wrapper(Initiation init)
-      : initiation_(static_cast<Initiation&&>(init))
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::as_tuple_handler<decay_t<Handler>>(
+            static_cast<Handler&&>(handler)),
+          static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args)
+    void operator()(Handler&& handler, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<const Initiation&>(*this)(
           detail::as_tuple_handler<decay_t<Handler>>(
             static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
@@ -172,23 +178,27 @@ struct async_result<as_tuple_t<CompletionToken>, Signature>
       typename detail::as_tuple_signature<Signature>::type>
 {
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    init_wrapper(Initiation init)
-      : initiation_(static_cast<Initiation&&>(init))
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::as_tuple_handler<decay_t<Handler>>(
+            static_cast<Handler&&>(handler)),
+          static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
-    void operator()(Handler&& handler, Args&&... args)
+    void operator()(Handler&& handler, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<const Initiation&>(*this)(
           detail::as_tuple_handler<decay_t<Handler>>(
             static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
@@ -237,6 +247,27 @@ struct associator<Associator,
   }
 };
 
+template <typename... Signatures>
+struct async_result<partial_as_tuple, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&&, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        as_tuple_t<
+          default_completion_token_t<associated_executor_t<Initiation>>>{},
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        as_tuple_t<
+          default_completion_token_t<associated_executor_t<Initiation>>>{},
+        static_cast<Args&&>(args)...);
+  }
+};
+
 #endif // !defined(GENERATING_DOCUMENTATION)
 
 } // namespace asio
diff --git a/inst/include/boost/asio/impl/awaitable.hpp b/inst/include/boost/asio/impl/awaitable.hpp
index 03bc6b171..ce6a2ae95 100644
--- a/inst/include/boost/asio/impl/awaitable.hpp
+++ b/inst/include/boost/asio/impl/awaitable.hpp
@@ -2,7 +2,7 @@
 // impl/awaitable.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -21,10 +21,12 @@
 #include <tuple>
 #include <boost/asio/cancellation_signal.hpp>
 #include <boost/asio/cancellation_state.hpp>
+#include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/thread_context.hpp>
 #include <boost/asio/detail/thread_info_base.hpp>
 #include <boost/asio/detail/throw_error.hpp>
 #include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/disposition.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/system/system_error.hpp>
@@ -43,7 +45,7 @@ namespace asio {
 namespace detail {
 
 struct awaitable_thread_has_context_switched {};
-template <typename, typename> class awaitable_async_op_handler;
+template <typename, typename, typename> class awaitable_async_op_handler;
 template <typename, typename, typename> class awaitable_async_op;
 
 // An awaitable_thread represents a thread-of-execution that is composed of one
@@ -136,19 +138,15 @@ class awaitable_frame_base
     return result{this};
   }
 
-  void set_except(std::exception_ptr e) noexcept
+  template <typename Disposition>
+  void set_disposition(Disposition&& d) noexcept
   {
-    pending_exception_ = e;
-  }
-
-  void set_error(const boost::system::error_code& ec)
-  {
-    this->set_except(std::make_exception_ptr(boost::system::system_error(ec)));
+    pending_exception_ = (to_exception_ptr)(static_cast<Disposition&&>(d));
   }
 
   void unhandled_exception()
   {
-    set_except(std::current_exception());
+    set_disposition(std::current_exception());
   }
 
   void rethrow_exception()
@@ -539,14 +537,14 @@ class awaitable_frame
   ~awaitable_frame()
   {
     if (has_result_)
-      static_cast<T*>(static_cast<void*>(result_))->~T();
+      std::launder(static_cast<T*>(static_cast<void*>(result_)))->~T();
   }
 
   awaitable<T, Executor> get_return_object() noexcept
   {
     this->coro_ = coroutine_handle<awaitable_frame>::from_promise(*this);
     return awaitable<T, Executor>(this);
-  };
+  }
 
   template <typename U>
   void return_value(U&& u)
@@ -565,7 +563,8 @@ class awaitable_frame
   {
     this->caller_ = nullptr;
     this->rethrow_exception();
-    return std::move(*static_cast<T*>(static_cast<void*>(result_)));
+    return std::move(*std::launder(
+          static_cast<T*>(static_cast<void*>(result_))));
   }
 
 private:
@@ -582,7 +581,7 @@ class awaitable_frame<void, Executor>
   {
     this->coro_ = coroutine_handle<awaitable_frame>::from_promise(*this);
     return awaitable<void, Executor>(this);
-  };
+  }
 
   void return_void()
   {
@@ -620,7 +619,7 @@ class awaitable_frame<awaitable_thread_entry_point, Executor>
   {
     this->coro_ = coroutine_handle<awaitable_frame>::from_promise(*this);
     return awaitable<awaitable_thread_entry_point, Executor>(this);
-  };
+  }
 
   void return_void()
   {
@@ -634,7 +633,8 @@ class awaitable_frame<awaitable_thread_entry_point, Executor>
 
 private:
   template <typename> friend class awaitable_frame_base;
-  template <typename, typename> friend class awaitable_async_op_handler;
+  template <typename, typename, typename>
+    friend class awaitable_async_op_handler;
   template <typename, typename> friend class awaitable_handler_base;
   template <typename> friend class awaitable_thread;
 
@@ -780,7 +780,7 @@ class awaitable_thread
   awaitable<awaitable_thread_entry_point, Executor> bottom_of_stack_;
 };
 
-template <typename Signature, typename Executor>
+template <typename Signature, typename Executor, typename = void>
 class awaitable_async_op_handler;
 
 template <typename R, typename Executor>
@@ -808,74 +808,9 @@ class awaitable_async_op_handler<R(), Executor>
   }
 };
 
-template <typename R, typename Executor>
-class awaitable_async_op_handler<R(boost::system::error_code), Executor>
-  : public awaitable_thread<Executor>
-{
-public:
-  typedef boost::system::error_code* result_type;
-
-  awaitable_async_op_handler(
-      awaitable_thread<Executor>* h, result_type& result)
-    : awaitable_thread<Executor>(std::move(*h)),
-      result_(result)
-  {
-  }
-
-  void operator()(boost::system::error_code ec)
-  {
-    result_ = &ec;
-    this->entry_point()->top_of_stack_->attach_thread(this);
-    this->entry_point()->top_of_stack_->clear_cancellation_slot();
-    this->pump();
-  }
-
-  static void resume(result_type& result)
-  {
-    throw_error(*result);
-  }
-
-private:
-  result_type& result_;
-};
-
-template <typename R, typename Executor>
-class awaitable_async_op_handler<R(std::exception_ptr), Executor>
-  : public awaitable_thread<Executor>
-{
-public:
-  typedef std::exception_ptr* result_type;
-
-  awaitable_async_op_handler(
-      awaitable_thread<Executor>* h, result_type& result)
-    : awaitable_thread<Executor>(std::move(*h)),
-      result_(result)
-  {
-  }
-
-  void operator()(std::exception_ptr ex)
-  {
-    result_ = &ex;
-    this->entry_point()->top_of_stack_->attach_thread(this);
-    this->entry_point()->top_of_stack_->clear_cancellation_slot();
-    this->pump();
-  }
-
-  static void resume(result_type& result)
-  {
-    if (*result)
-    {
-      std::exception_ptr ex = std::exchange(*result, nullptr);
-      std::rethrow_exception(ex);
-    }
-  }
-
-private:
-  result_type& result_;
-};
-
 template <typename R, typename T, typename Executor>
-class awaitable_async_op_handler<R(T), Executor>
+class awaitable_async_op_handler<R(T), Executor,
+    enable_if_t<!is_disposition<T>::value>>
   : public awaitable_thread<Executor>
 {
 public:
@@ -890,7 +825,7 @@ class awaitable_async_op_handler<R(T), Executor>
 
   void operator()(T result)
   {
-    result_ = &result;
+    result_ = detail::addressof(result);
     this->entry_point()->top_of_stack_->attach_thread(this);
     this->entry_point()->top_of_stack_->clear_cancellation_slot();
     this->pump();
@@ -905,16 +840,13 @@ class awaitable_async_op_handler<R(T), Executor>
   result_type& result_;
 };
 
-template <typename R, typename T, typename Executor>
-class awaitable_async_op_handler<R(boost::system::error_code, T), Executor>
+template <typename R, typename Disposition, typename Executor>
+class awaitable_async_op_handler<R(Disposition), Executor,
+    enable_if_t<is_disposition<Disposition>::value>>
   : public awaitable_thread<Executor>
 {
 public:
-  struct result_type
-  {
-    boost::system::error_code* ec_;
-    T* value_;
-  };
+  typedef Disposition* result_type;
 
   awaitable_async_op_handler(
       awaitable_thread<Executor>* h, result_type& result)
@@ -923,33 +855,36 @@ class awaitable_async_op_handler<R(boost::system::error_code, T), Executor>
   {
   }
 
-  void operator()(boost::system::error_code ec, T value)
+  void operator()(Disposition d)
   {
-    result_.ec_ = &ec;
-    result_.value_ = &value;
+    result_ = detail::addressof(d);
     this->entry_point()->top_of_stack_->attach_thread(this);
     this->entry_point()->top_of_stack_->clear_cancellation_slot();
     this->pump();
   }
 
-  static T resume(result_type& result)
+  static void resume(result_type& result)
   {
-    throw_error(*result.ec_);
-    return std::move(*result.value_);
+    if (*result != no_error)
+    {
+      Disposition d = std::exchange(*result, Disposition());
+      boost::asio::throw_exception(static_cast<Disposition&&>(d));
+    }
   }
 
 private:
   result_type& result_;
 };
 
-template <typename R, typename T, typename Executor>
-class awaitable_async_op_handler<R(std::exception_ptr, T), Executor>
+template <typename R, typename Disposition, typename T, typename Executor>
+class awaitable_async_op_handler<R(Disposition, T), Executor,
+    enable_if_t<is_disposition<Disposition>::value>>
   : public awaitable_thread<Executor>
 {
 public:
   struct result_type
   {
-    std::exception_ptr* ex_;
+    Disposition* disposition_;
     T* value_;
   };
 
@@ -960,10 +895,10 @@ class awaitable_async_op_handler<R(std::exception_ptr, T), Executor>
   {
   }
 
-  void operator()(std::exception_ptr ex, T value)
+  void operator()(Disposition d, T value)
   {
-    result_.ex_ = &ex;
-    result_.value_ = &value;
+    result_.disposition_ = detail::addressof(d);
+    result_.value_ = detail::addressof(value);
     this->entry_point()->top_of_stack_->attach_thread(this);
     this->entry_point()->top_of_stack_->clear_cancellation_slot();
     this->pump();
@@ -971,10 +906,10 @@ class awaitable_async_op_handler<R(std::exception_ptr, T), Executor>
 
   static T resume(result_type& result)
   {
-    if (*result.ex_)
+    if (*result.disposition_ != no_error)
     {
-      std::exception_ptr ex = std::exchange(*result.ex_, nullptr);
-      std::rethrow_exception(ex);
+      Disposition d = std::exchange(*result.disposition_, Disposition());
+      boost::asio::throw_exception(static_cast<Disposition&&>(d));
     }
     return std::move(*result.value_);
   }
@@ -983,12 +918,13 @@ class awaitable_async_op_handler<R(std::exception_ptr, T), Executor>
   result_type& result_;
 };
 
-template <typename R, typename... Ts, typename Executor>
-class awaitable_async_op_handler<R(Ts...), Executor>
+template <typename R, typename T, typename... Ts, typename Executor>
+class awaitable_async_op_handler<R(T, Ts...), Executor,
+    enable_if_t<!is_disposition<T>::value>>
   : public awaitable_thread<Executor>
 {
 public:
-  typedef std::tuple<Ts...>* result_type;
+  typedef std::tuple<T, Ts...>* result_type;
 
   awaitable_async_op_handler(
       awaitable_thread<Executor>* h, result_type& result)
@@ -1000,14 +936,14 @@ class awaitable_async_op_handler<R(Ts...), Executor>
   template <typename... Args>
   void operator()(Args&&... args)
   {
-    std::tuple<Ts...> result(std::forward<Args>(args)...);
-    result_ = &result;
+    std::tuple<T, Ts...> result(std::forward<Args>(args)...);
+    result_ = detail::addressof(result);
     this->entry_point()->top_of_stack_->attach_thread(this);
     this->entry_point()->top_of_stack_->clear_cancellation_slot();
     this->pump();
   }
 
-  static std::tuple<Ts...> resume(result_type& result)
+  static std::tuple<T, Ts...> resume(result_type& result)
   {
     return std::move(*result);
   }
@@ -1016,14 +952,15 @@ class awaitable_async_op_handler<R(Ts...), Executor>
   result_type& result_;
 };
 
-template <typename R, typename... Ts, typename Executor>
-class awaitable_async_op_handler<R(boost::system::error_code, Ts...), Executor>
+template <typename R, typename Disposition, typename... Ts, typename Executor>
+class awaitable_async_op_handler<R(Disposition, Ts...), Executor,
+    enable_if_t<is_disposition<Disposition>::value>>
   : public awaitable_thread<Executor>
 {
 public:
   struct result_type
   {
-    boost::system::error_code* ec_;
+    Disposition* disposition_;
     std::tuple<Ts...>* value_;
   };
 
@@ -1035,11 +972,11 @@ class awaitable_async_op_handler<R(boost::system::error_code, Ts...), Executor>
   }
 
   template <typename... Args>
-  void operator()(boost::system::error_code ec, Args&&... args)
+  void operator()(Disposition d, Args&&... args)
   {
-    result_.ec_ = &ec;
+    result_.disposition_ = detail::addressof(d);
     std::tuple<Ts...> value(std::forward<Args>(args)...);
-    result_.value_ = &value;
+    result_.value_ = detail::addressof(value);
     this->entry_point()->top_of_stack_->attach_thread(this);
     this->entry_point()->top_of_stack_->clear_cancellation_slot();
     this->pump();
@@ -1047,49 +984,10 @@ class awaitable_async_op_handler<R(boost::system::error_code, Ts...), Executor>
 
   static std::tuple<Ts...> resume(result_type& result)
   {
-    throw_error(*result.ec_);
-    return std::move(*result.value_);
-  }
-
-private:
-  result_type& result_;
-};
-
-template <typename R, typename... Ts, typename Executor>
-class awaitable_async_op_handler<R(std::exception_ptr, Ts...), Executor>
-  : public awaitable_thread<Executor>
-{
-public:
-  struct result_type
-  {
-    std::exception_ptr* ex_;
-    std::tuple<Ts...>* value_;
-  };
-
-  awaitable_async_op_handler(
-      awaitable_thread<Executor>* h, result_type& result)
-    : awaitable_thread<Executor>(std::move(*h)),
-      result_(result)
-  {
-  }
-
-  template <typename... Args>
-  void operator()(std::exception_ptr ex, Args&&... args)
-  {
-    result_.ex_ = &ex;
-    std::tuple<Ts...> value(std::forward<Args>(args)...);
-    result_.value_ = &value;
-    this->entry_point()->top_of_stack_->attach_thread(this);
-    this->entry_point()->top_of_stack_->clear_cancellation_slot();
-    this->pump();
-  }
-
-  static std::tuple<Ts...> resume(result_type& result)
-  {
-    if (*result.ex_)
+    if (*result.disposition_ != no_error)
     {
-      std::exception_ptr ex = std::exchange(*result.ex_, nullptr);
-      std::rethrow_exception(ex);
+      Disposition d = std::exchange(*result.disposition_, Disposition());
+      boost::asio::throw_exception(static_cast<Disposition&&>(d));
     }
     return std::move(*result.value_);
   }
diff --git a/inst/include/boost/asio/impl/buffered_read_stream.hpp b/inst/include/boost/asio/impl/buffered_read_stream.hpp
index 9c4985299..f8410515d 100644
--- a/inst/include/boost/asio/impl/buffered_read_stream.hpp
+++ b/inst/include/boost/asio/impl/buffered_read_stream.hpp
@@ -2,7 +2,7 @@
 // impl/buffered_read_stream.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -310,7 +310,7 @@ namespace detail
       non_const_lvalue<ReadHandler> handler2(handler);
       if (buffer_size(buffers) == 0 || !storage->empty())
       {
-        next_layer_.async_read_some(BOOST_ASIO_MUTABLE_BUFFER(0, 0),
+        next_layer_.async_read_some(mutable_buffer(0, 0),
             buffered_read_some_handler<MutableBufferSequence,
               decay_t<ReadHandler>>(
                 *storage, buffers, handler2.value));
diff --git a/inst/include/boost/asio/impl/buffered_write_stream.hpp b/inst/include/boost/asio/impl/buffered_write_stream.hpp
index 2ac2dd920..dfaa69d65 100644
--- a/inst/include/boost/asio/impl/buffered_write_stream.hpp
+++ b/inst/include/boost/asio/impl/buffered_write_stream.hpp
@@ -2,7 +2,7 @@
 // impl/buffered_write_stream.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -296,7 +296,7 @@ namespace detail
       non_const_lvalue<WriteHandler> handler2(handler);
       if (buffer_size(buffers) == 0 || storage->size() < storage->capacity())
       {
-        next_layer_.async_write_some(BOOST_ASIO_CONST_BUFFER(0, 0),
+        next_layer_.async_write_some(const_buffer(0, 0),
             buffered_write_some_handler<ConstBufferSequence,
               decay_t<WriteHandler>>(
                 *storage, buffers, handler2.value));
diff --git a/inst/include/boost/asio/impl/cancel_after.hpp b/inst/include/boost/asio/impl/cancel_after.hpp
new file mode 100644
index 000000000..1a89a5589
--- /dev/null
+++ b/inst/include/boost/asio/impl/cancel_after.hpp
@@ -0,0 +1,270 @@
+//
+// impl/cancel_after.hpp
+// ~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_IMPL_CANCEL_AFTER_HPP
+#define BOOST_ASIO_IMPL_CANCEL_AFTER_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
+#include <boost/asio/detail/timed_cancel_op.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Initiation, typename Clock,
+    typename WaitTraits, typename... Signatures>
+struct initiate_cancel_after : initiation_base<Initiation>
+{
+  using initiation_base<Initiation>::initiation_base;
+
+  template <typename Handler, typename Rep, typename Period, typename... Args>
+  void operator()(Handler&& handler,
+      const chrono::duration<Rep, Period>& timeout,
+      cancellation_type_t cancel_type, Args&&... args) &&
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits>, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    p.p = new (p.v) op(handler2.value,
+        basic_waitable_timer<Clock, WaitTraits,
+          typename Initiation::executor_type>(this->get_executor(), timeout),
+        cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<Initiation&&>(*this), static_cast<Args&&>(args)...);
+  }
+
+  template <typename Handler, typename Rep, typename Period, typename... Args>
+  void operator()(Handler&& handler,
+      const chrono::duration<Rep, Period>& timeout,
+      cancellation_type_t cancel_type, Args&&... args) const &
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits>, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    p.p = new (p.v) op(handler2.value,
+        basic_waitable_timer<Clock, WaitTraits,
+          typename Initiation::executor_type>(this->get_executor(), timeout),
+        cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<const Initiation&>(*this),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Initiation, typename Clock,
+    typename WaitTraits, typename Executor, typename... Signatures>
+struct initiate_cancel_after_timer : initiation_base<Initiation>
+{
+  using initiation_base<Initiation>::initiation_base;
+
+  template <typename Handler, typename Rep, typename Period, typename... Args>
+  void operator()(Handler&& handler,
+      basic_waitable_timer<Clock, WaitTraits, Executor>* timer,
+      const chrono::duration<Rep, Period>& timeout,
+      cancellation_type_t cancel_type, Args&&... args) &&
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits, Executor>&, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    timer->expires_after(timeout);
+    p.p = new (p.v) op(handler2.value, *timer, cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<Initiation&&>(*this), static_cast<Args&&>(args)...);
+  }
+
+  template <typename Handler, typename Rep, typename Period, typename... Args>
+  void operator()(Handler&& handler,
+      basic_waitable_timer<Clock, WaitTraits, Executor>* timer,
+      const chrono::duration<Rep, Period>& timeout,
+      cancellation_type_t cancel_type, Args&&... args) const &
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits, Executor>&, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    timer->expires_after(timeout);
+    p.p = new (p.v) op(handler2.value, *timer, cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<const Initiation&>(*this),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+} // namespace detail
+
+#if !defined(GENERATING_DOCUMENTATION)
+
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits, typename... Signatures>
+struct async_result<
+    cancel_after_t<CompletionToken, Clock, WaitTraits>, Signatures...>
+  : async_result<CompletionToken, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value,
+            const CompletionToken, CompletionToken>,
+        Signatures...>(
+          declval<detail::initiate_cancel_after<
+            decay_t<Initiation>, Clock, WaitTraits, Signatures...>>(),
+          token.token_, token.timeout_, token.cancel_type_,
+          static_cast<Args&&>(args)...))
+  {
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value,
+          const CompletionToken, CompletionToken>,
+      Signatures...>(
+        detail::initiate_cancel_after<
+          decay_t<Initiation>, Clock, WaitTraits, Signatures...>(
+            static_cast<Initiation&&>(initiation)),
+        token.token_, token.timeout_, token.cancel_type_,
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits, typename Executor, typename... Signatures>
+struct async_result<
+    cancel_after_timer<CompletionToken, Clock, WaitTraits, Executor>,
+    Signatures...>
+  : async_result<CompletionToken, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value,
+            const CompletionToken, CompletionToken>,
+        Signatures...>(
+          declval<detail::initiate_cancel_after_timer<
+            decay_t<Initiation>, Clock, WaitTraits, Executor, Signatures...>>(),
+          token.token_, &token.timer_, token.timeout_,
+          token.cancel_type_, static_cast<Args&&>(args)...))
+  {
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value,
+          const CompletionToken, CompletionToken>,
+      Signatures...>(
+        detail::initiate_cancel_after_timer<
+          decay_t<Initiation>, Clock, WaitTraits, Executor, Signatures...>(
+            static_cast<Initiation&&>(initiation)),
+        token.token_, &token.timer_, token.timeout_,
+        token.cancel_type_, static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Clock, typename WaitTraits, typename... Signatures>
+struct async_result<partial_cancel_after<Clock, WaitTraits>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<
+        const cancel_after_t<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits>&,
+        Signatures...>(
+          static_cast<Initiation&&>(initiation),
+          cancel_after_t<
+            default_completion_token_t<associated_executor_t<Initiation>>,
+            Clock, WaitTraits>(
+              default_completion_token_t<associated_executor_t<Initiation>>{},
+              token.timeout_, token.cancel_type_),
+          static_cast<Args&&>(args)...))
+  {
+    return async_initiate<
+      const cancel_after_t<
+        default_completion_token_t<associated_executor_t<Initiation>>,
+        Clock, WaitTraits>&,
+      Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancel_after_t<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.timeout_, token.cancel_type_),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Clock, typename WaitTraits,
+    typename Executor, typename... Signatures>
+struct async_result<
+    partial_cancel_after_timer<Clock, WaitTraits, Executor>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancel_after_timer<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits, Executor>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.timer_, token.timeout_, token.cancel_type_),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancel_after_timer<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits, Executor>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.timer_, token.timeout_, token.cancel_type_),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_IMPL_CANCEL_AFTER_HPP
diff --git a/inst/include/boost/asio/impl/cancel_at.hpp b/inst/include/boost/asio/impl/cancel_at.hpp
new file mode 100644
index 000000000..7634b5da0
--- /dev/null
+++ b/inst/include/boost/asio/impl/cancel_at.hpp
@@ -0,0 +1,270 @@
+//
+// impl/cancel_at.hpp
+// ~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_IMPL_CANCEL_AT_HPP
+#define BOOST_ASIO_IMPL_CANCEL_AT_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
+#include <boost/asio/detail/timed_cancel_op.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Initiation, typename Clock,
+    typename WaitTraits, typename... Signatures>
+struct initiate_cancel_at : initiation_base<Initiation>
+{
+  using initiation_base<Initiation>::initiation_base;
+
+  template <typename Handler, typename Duration, typename... Args>
+  void operator()(Handler&& handler,
+      const chrono::time_point<Clock, Duration>& expiry,
+      cancellation_type_t cancel_type, Args&&... args) &&
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits>, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    p.p = new (p.v) op(handler2.value,
+        basic_waitable_timer<Clock, WaitTraits,
+          typename Initiation::executor_type>(this->get_executor(), expiry),
+        cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<Initiation&&>(*this), static_cast<Args&&>(args)...);
+  }
+
+  template <typename Handler, typename Duration, typename... Args>
+  void operator()(Handler&& handler,
+      const chrono::time_point<Clock, Duration>& expiry,
+      cancellation_type_t cancel_type, Args&&... args) const &
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits>, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    p.p = new (p.v) op(handler2.value,
+        basic_waitable_timer<Clock, WaitTraits,
+          typename Initiation::executor_type>(this->get_executor(), expiry),
+        cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<const Initiation&>(*this),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Initiation, typename Clock,
+    typename WaitTraits, typename Executor, typename... Signatures>
+struct initiate_cancel_at_timer : initiation_base<Initiation>
+{
+  using initiation_base<Initiation>::initiation_base;
+
+  template <typename Handler, typename Duration, typename... Args>
+  void operator()(Handler&& handler,
+      basic_waitable_timer<Clock, WaitTraits, Executor>* timer,
+      const chrono::time_point<Clock, Duration>& expiry,
+      cancellation_type_t cancel_type, Args&&... args) &&
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits, Executor>&, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    timer->expires_at(expiry);
+    p.p = new (p.v) op(handler2.value, *timer, cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<Initiation&&>(*this), static_cast<Args&&>(args)...);
+  }
+
+  template <typename Handler, typename Duration, typename... Args>
+  void operator()(Handler&& handler,
+      basic_waitable_timer<Clock, WaitTraits, Executor>* timer,
+      const chrono::time_point<Clock, Duration>& expiry,
+      cancellation_type_t cancel_type, Args&&... args) const &
+  {
+    using op = detail::timed_cancel_op<decay_t<Handler>,
+        basic_waitable_timer<Clock, WaitTraits, Executor>&, Signatures...>;
+
+    non_const_lvalue<Handler> handler2(handler);
+    typename op::ptr p = { boost::asio::detail::addressof(handler2.value),
+        op::ptr::allocate(handler2.value), 0 };
+    timer->expires_at(expiry);
+    p.p = new (p.v) op(handler2.value, *timer, cancel_type);
+
+    op* o = p.p;
+    p.v = p.p = 0;
+    o->start(static_cast<const Initiation&>(*this),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+} // namespace detail
+
+#if !defined(GENERATING_DOCUMENTATION)
+
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits, typename... Signatures>
+struct async_result<
+    cancel_at_t<CompletionToken, Clock, WaitTraits>, Signatures...>
+  : async_result<CompletionToken, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value,
+            const CompletionToken, CompletionToken>,
+        Signatures...>(
+          declval<detail::initiate_cancel_at<
+            decay_t<Initiation>, Clock, WaitTraits, Signatures...>>(),
+          token.token_, token.expiry_, token.cancel_type_,
+          static_cast<Args&&>(args)...))
+  {
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value,
+          const CompletionToken, CompletionToken>,
+      Signatures...>(
+        detail::initiate_cancel_at<
+          decay_t<Initiation>, Clock, WaitTraits, Signatures...>(
+            static_cast<Initiation&&>(initiation)),
+        token.token_, token.expiry_, token.cancel_type_,
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename CompletionToken, typename Clock,
+    typename WaitTraits, typename Executor, typename... Signatures>
+struct async_result<
+    cancel_at_timer<CompletionToken, Clock, WaitTraits, Executor>,
+    Signatures...>
+  : async_result<CompletionToken, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value,
+            const CompletionToken, CompletionToken>,
+        Signatures...>(
+          declval<detail::initiate_cancel_at_timer<
+            decay_t<Initiation>, Clock, WaitTraits, Executor, Signatures...>>(),
+          token.token_, &token.timer_, token.expiry_, token.cancel_type_,
+          static_cast<Args&&>(args)...))
+  {
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value,
+          const CompletionToken, CompletionToken>,
+      Signatures...>(
+        detail::initiate_cancel_at_timer<
+          decay_t<Initiation>, Clock, WaitTraits, Executor, Signatures...>(
+            static_cast<Initiation&&>(initiation)),
+        token.token_, &token.timer_, token.expiry_, token.cancel_type_,
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Clock, typename WaitTraits, typename... Signatures>
+struct async_result<partial_cancel_at<Clock, WaitTraits>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<
+        const cancel_at_t<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits>&,
+        Signatures...>(
+          static_cast<Initiation&&>(initiation),
+          cancel_at_t<
+            default_completion_token_t<associated_executor_t<Initiation>>,
+            Clock, WaitTraits>(
+              default_completion_token_t<associated_executor_t<Initiation>>{},
+              token.expiry_, token.cancel_type_),
+          static_cast<Args&&>(args)...))
+  {
+    return async_initiate<
+      const cancel_at_t<
+        default_completion_token_t<associated_executor_t<Initiation>>,
+        Clock, WaitTraits>&,
+      Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancel_at_t<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.expiry_, token.cancel_type_),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+template <typename Clock, typename WaitTraits,
+    typename Executor, typename... Signatures>
+struct async_result<
+    partial_cancel_at_timer<Clock, WaitTraits, Executor>, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancel_at_timer<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits, Executor>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.timer_, token.expiry_, token.cancel_type_),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        cancel_at_timer<
+          default_completion_token_t<associated_executor_t<Initiation>>,
+          Clock, WaitTraits, Executor>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.timer_, token.expiry_, token.cancel_type_),
+        static_cast<Args&&>(args)...);
+  }
+};
+
+#endif // !defined(GENERATING_DOCUMENTATION)
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_IMPL_CANCEL_AT_HPP
diff --git a/inst/include/boost/asio/impl/cancellation_signal.ipp b/inst/include/boost/asio/impl/cancellation_signal.ipp
index 33e80bac3..81177b865 100644
--- a/inst/include/boost/asio/impl/cancellation_signal.ipp
+++ b/inst/include/boost/asio/impl/cancellation_signal.ipp
@@ -2,7 +2,7 @@
 // impl/cancellation_signal.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/co_spawn.hpp b/inst/include/boost/asio/impl/co_spawn.hpp
index 6b7d932b9..31d3311c0 100644
--- a/inst/include/boost/asio/impl/co_spawn.hpp
+++ b/inst/include/boost/asio/impl/co_spawn.hpp
@@ -2,7 +2,7 @@
 // impl/co_spawn.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -143,7 +143,9 @@ awaitable<awaitable_thread_entry_point, Executor> co_spawn_entry_point(
   (co_await awaitable_thread_has_context_switched{}) = false;
   std::exception_ptr e = nullptr;
   bool done = false;
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
   try
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
   {
     T t = co_await s.function();
 
@@ -151,7 +153,10 @@ awaitable<awaitable_thread_entry_point, Executor> co_spawn_entry_point(
 
     bool switched = (co_await awaitable_thread_has_context_switched{});
     if (!switched)
+    {
+      co_await this_coro::throw_if_cancelled(false);
       (void) co_await co_spawn_post();
+    }
 
     (dispatch)(s.handler_work.get_executor(),
         [handler = std::move(s.handler), t = std::move(t)]() mutable
@@ -161,6 +166,7 @@ awaitable<awaitable_thread_entry_point, Executor> co_spawn_entry_point(
 
     co_return;
   }
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
   catch (...)
   {
     if (done)
@@ -168,10 +174,14 @@ awaitable<awaitable_thread_entry_point, Executor> co_spawn_entry_point(
 
     e = std::current_exception();
   }
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
 
   bool switched = (co_await awaitable_thread_has_context_switched{});
   if (!switched)
+  {
+    co_await this_coro::throw_if_cancelled(false);
     (void) co_await co_spawn_post();
+  }
 
   (dispatch)(s.handler_work.get_executor(),
       [handler = std::move(s.handler), e]() mutable
@@ -188,18 +198,25 @@ awaitable<awaitable_thread_entry_point, Executor> co_spawn_entry_point(
 
   (co_await awaitable_thread_has_context_switched{}) = false;
   std::exception_ptr e = nullptr;
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
   try
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
   {
     co_await s.function();
   }
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
   catch (...)
   {
     e = std::current_exception();
   }
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
 
   bool switched = (co_await awaitable_thread_has_context_switched{});
   if (!switched)
+  {
+    co_await this_coro::throw_if_cancelled(false);
     (void) co_await co_spawn_post();
+  }
 
   (dispatch)(s.handler_work.get_executor(),
       [handler = std::move(s.handler), e]() mutable
diff --git a/inst/include/boost/asio/impl/config.hpp b/inst/include/boost/asio/impl/config.hpp
new file mode 100644
index 000000000..3e96d2e90
--- /dev/null
+++ b/inst/include/boost/asio/impl/config.hpp
@@ -0,0 +1,93 @@
+//
+// impl/config.hpp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_IMPL_CONFIG_HPP
+#define BOOST_ASIO_IMPL_CONFIG_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+#include <cerrno>
+#include <cstdlib>
+#include <limits>
+#include <stdexcept>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename T>
+T config_get(const config_service& service, const char* section,
+    const char* key, T default_value, false_type /*is_bool*/)
+{
+  if (is_unsigned<T>::value)
+  {
+    char buf[std::numeric_limits<unsigned long long>::max_digits10 + 1];
+    if (const char* str = service.get_value(section, key, buf, sizeof(buf)))
+    {
+      char* end = nullptr;
+      unsigned long long result = std::strtoull(str, &end, 0);
+      if (errno == ERANGE || result > (std::numeric_limits<T>::max)())
+        detail::throw_exception(std::out_of_range("config out of range"));
+      return static_cast<T>(result);
+    }
+  }
+  else
+  {
+    char buf[std::numeric_limits<long long>::max_digits10 + 1];
+    if (const char* str = service.get_value(section, key, buf, sizeof(buf)))
+    {
+      char* end = nullptr;
+      long long result = std::strtoll(str, &end, 0);
+      if (errno == ERANGE || result < (std::numeric_limits<T>::min)()
+          || result > (std::numeric_limits<T>::max)())
+        detail::throw_exception(std::out_of_range("config out of range"));
+      return static_cast<T>(result);
+    }
+  }
+  return default_value;
+}
+
+template <typename T>
+T config_get(const config_service& service, const char* section,
+    const char* key, T default_value, true_type /*is_bool*/)
+{
+  char buf[std::numeric_limits<unsigned long long>::max_digits10 + 1];
+  if (const char* str = service.get_value(section, key, buf, sizeof(buf)))
+  {
+    char* end = nullptr;
+    unsigned long long result = std::strtoll(str, &end, 0);
+    if (errno == ERANGE || (result != 0 && result != 1))
+      detail::throw_exception(std::out_of_range("config out of range"));
+    return static_cast<T>(result != 0);
+  }
+  return default_value;
+}
+
+} // namespace detail
+
+template <typename T>
+constraint_t<is_integral<T>::value, T>
+config::get(const char* section, const char* key, T default_value) const
+{
+  return detail::config_get(service_, section,
+      key, default_value, is_same<T, bool>());
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_IMPL_CONFIG_HPP
diff --git a/inst/include/boost/asio/impl/config.ipp b/inst/include/boost/asio/impl/config.ipp
new file mode 100644
index 000000000..68876a0db
--- /dev/null
+++ b/inst/include/boost/asio/impl/config.ipp
@@ -0,0 +1,338 @@
+//
+// impl/config.ipp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_IMPL_CONFIG_IPP
+#define BOOST_ASIO_IMPL_CONFIG_IPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/config.hpp>
+#include <boost/asio/detail/concurrency_hint.hpp>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <vector>
+#include <utility>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+
+config_service::config_service(execution_context& ctx)
+  : detail::execution_context_service_base<config_service>(ctx)
+{
+}
+
+void config_service::shutdown()
+{
+}
+
+const char* config_service::get_value(const char* /*section*/,
+    const char* /*key*/, char* /*value*/, std::size_t /*value_len*/) const
+{
+  return nullptr;
+}
+
+namespace detail {
+
+class config_from_concurrency_hint_service : public config_service
+{
+public:
+  explicit config_from_concurrency_hint_service(
+      execution_context& ctx, int concurrency_hint)
+    : config_service(ctx),
+      concurrency_hint_(concurrency_hint)
+  {
+  }
+
+  const char* get_value(const char* section, const char* key,
+      char* value, std::size_t value_len) const override
+  {
+    if (std::strcmp(section, "scheduler") == 0)
+    {
+      if (std::strcmp(key, "concurrency_hint") == 0)
+      {
+        std::snprintf(value, value_len, "%d",
+            BOOST_ASIO_CONCURRENCY_HINT_IS_SPECIAL(concurrency_hint_)
+              ? 1 : concurrency_hint_);
+        return value;
+      }
+      else if (std::strcmp(key, "locking") == 0)
+      {
+        return BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
+            SCHEDULER, concurrency_hint_) ? "1" : "0";
+      }
+    }
+    else if (std::strcmp(section, "reactor") == 0)
+    {
+      if (std::strcmp(key, "io_locking") == 0)
+      {
+        return BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
+            REACTOR_IO, concurrency_hint_) ? "1" : "0";
+      }
+      else if (std::strcmp(key, "registration_locking") == 0)
+      {
+        return BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
+            REACTOR_REGISTRATION, concurrency_hint_) ? "1" : "0";
+      }
+    }
+    return nullptr;
+  }
+
+private:
+  int concurrency_hint_;
+};
+
+} // namespace detail
+
+config_from_concurrency_hint::config_from_concurrency_hint()
+  : concurrency_hint_(BOOST_ASIO_CONCURRENCY_HINT_DEFAULT)
+{
+}
+
+void config_from_concurrency_hint::make(execution_context& ctx) const
+{
+  (void)make_service<detail::config_from_concurrency_hint_service>(ctx,
+      concurrency_hint_ == 1
+        ? BOOST_ASIO_CONCURRENCY_HINT_1 : concurrency_hint_);
+}
+
+namespace detail {
+
+class config_from_string_service : public config_service
+{
+public:
+  config_from_string_service(execution_context& ctx,
+      std::string s, std::string prefix)
+    : config_service(ctx),
+      string_(static_cast<std::string&&>(s)),
+      prefix_(static_cast<std::string&&>(prefix))
+  {
+    enum
+    {
+      expecting_key,
+      key,
+      expecting_equals,
+      expecting_value,
+      value,
+      expecting_eol
+    } state = expecting_key;
+    std::pair<const char*, const char*> entry{};
+
+    for (char& c : string_)
+    {
+      switch (state)
+      {
+      case expecting_key:
+        switch (c)
+        {
+        case ' ': case '\t': case '\n':
+          break;
+        case '#':
+          state = expecting_eol;
+          break;
+        default:
+          entry.first = &c;
+          state = key;
+          break;
+        }
+        break;
+      case key:
+        switch (c)
+        {
+        case ' ': case '\t':
+          c = 0;
+          state = expecting_equals;
+          break;
+        case '=':
+          c = 0;
+          state = expecting_value;
+          break;
+        case '\n':
+          entry.first = nullptr;
+          state = expecting_key;
+          break;
+        case '#':
+          entry.first = nullptr;
+          state = expecting_eol;
+          break;
+        default:
+          break;
+        }
+        break;
+      case expecting_equals:
+        switch (c)
+        {
+        case ' ': case '\t':
+          break;
+        case '=':
+          state = expecting_value;
+          break;
+        case '\n':
+          entry.first = nullptr;
+          state = expecting_key;
+          break;
+        default:
+          entry.first = nullptr;
+          state = expecting_eol;
+          break;
+        }
+        break;
+      case expecting_value:
+        switch (c)
+        {
+        case ' ': case '\t':
+          break;
+        case '\n':
+          entry.first = nullptr;
+          state = expecting_key;
+          break;
+        case '#':
+          entry.first = nullptr;
+          state = expecting_eol;
+          break;
+        default:
+          entry.second = &c;
+          state = value;
+          break;
+        }
+        break;
+      case value:
+        switch (c)
+        {
+        case '\n':
+          c = 0;
+          entries_.push_back(entry);
+          entry.first = entry.second = nullptr;
+          state = expecting_key;
+          break;
+        case '#':
+          c = 0;
+          entries_.push_back(entry);
+          entry.first = entry.second = nullptr;
+          state = expecting_eol;
+          break;
+        default:
+          break;
+        }
+        break;
+      case expecting_eol:
+        switch (c)
+        {
+        case '\n':
+          state = expecting_key;
+          break;
+        default:
+          break;
+        }
+        break;
+      }
+    }
+    if (entry.first && entry.second)
+      entries_.push_back(entry);
+  }
+
+  const char* get_value(const char* section, const char* key,
+      char* /*value*/, std::size_t /*value_len*/) const override
+  {
+    std::string entry_key;
+    entry_key.reserve(prefix_.length() + 1
+        + std::strlen(section) + 1
+        + std::strlen(key) + 1);
+    entry_key.append(prefix_);
+    if (!entry_key.empty())
+      entry_key.append(".");
+    entry_key.append(section);
+    entry_key.append(".");
+    entry_key.append(key);
+    for (const std::pair<const char*, const char*>& entry : entries_)
+      if (entry_key == entry.first)
+        return entry.second;
+    return nullptr;
+  }
+
+private:
+  std::string string_;
+  std::string prefix_;
+  std::vector<std::pair<const char*, const char*>> entries_;
+};
+
+} // namespace detail
+
+void config_from_string::make(execution_context& ctx) const
+{
+  (void)make_service<detail::config_from_string_service>(ctx, string_, prefix_);
+}
+
+namespace detail {
+
+#if defined(BOOST_ASIO_MSVC)
+# pragma warning (push)
+# pragma warning (disable:4996) // suppress unsafe warning for std::getenv
+#endif // defined(BOOST_ASIO_MSVC)
+
+class config_from_env_service : public config_service
+{
+public:
+  explicit config_from_env_service(
+      execution_context& ctx, std::string prefix)
+    : config_service(ctx),
+      prefix_(static_cast<std::string&&>(prefix))
+  {
+  }
+
+  const char* get_value(const char* section, const char* key,
+      char* /*value*/, std::size_t /*value_len*/) const override
+  {
+    std::string env_var;
+    env_var.reserve(prefix_.length() + 1
+        + std::strlen(section) + 1
+        + std::strlen(key) + 1);
+    env_var.append(prefix_);
+    if (!env_var.empty())
+      env_var.append("_");
+    env_var.append(section);
+    env_var.append("_");
+    env_var.append(key);
+    for (char& c : env_var)
+      c = static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
+    return std::getenv(env_var.c_str());
+  }
+
+private:
+  std::string prefix_;
+};
+
+#if defined(BOOST_ASIO_MSVC)
+# pragma warning (pop)
+#endif // defined(BOOST_ASIO_MSVC)
+
+} // namespace detail
+
+config_from_env::config_from_env()
+  : prefix_("asio")
+{
+}
+
+void config_from_env::make(execution_context& ctx) const
+{
+  (void)make_service<detail::config_from_env_service>(ctx, prefix_);
+}
+
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_IMPL_CONFIG_IPP
diff --git a/inst/include/boost/asio/impl/connect.hpp b/inst/include/boost/asio/impl/connect.hpp
index 38f658e96..b4188da91 100644
--- a/inst/include/boost/asio/impl/connect.hpp
+++ b/inst/include/boost/asio/impl/connect.hpp
@@ -2,7 +2,7 @@
 // impl/connect.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -35,15 +35,6 @@ namespace asio {
 
 namespace detail
 {
-  struct default_connect_condition
-  {
-    template <typename Endpoint>
-    bool operator()(const boost::system::error_code&, const Endpoint&)
-    {
-      return true;
-    }
-  };
-
   template <typename Protocol, typename Iterator>
   inline typename Protocol::endpoint deref_connect_result(
       Iterator iter, boost::system::error_code& ec)
@@ -51,38 +42,15 @@ namespace detail
     return ec ? typename Protocol::endpoint() : *iter;
   }
 
-  template <typename T, typename Iterator>
-  struct legacy_connect_condition_helper : T
-  {
-    typedef char (*fallback_func_type)(...);
-    operator fallback_func_type() const;
-  };
-
-  template <typename R, typename Arg1, typename Arg2, typename Iterator>
-  struct legacy_connect_condition_helper<R (*)(Arg1, Arg2), Iterator>
-  {
-    R operator()(Arg1, Arg2) const;
-    char operator()(...) const;
-  };
-
-  template <typename T, typename Iterator>
-  struct is_legacy_connect_condition
-  {
-    static char asio_connect_condition_check(char);
-    static char (&asio_connect_condition_check(Iterator))[2];
-
-    static const bool value =
-      sizeof(asio_connect_condition_check(
-        (declval<legacy_connect_condition_helper<T, Iterator>>())(
-          declval<const boost::system::error_code>(),
-          declval<const Iterator>()))) != 1;
-  };
-
   template <typename ConnectCondition, typename Iterator>
   inline Iterator call_connect_condition(ConnectCondition& connect_condition,
       const boost::system::error_code& ec, Iterator next, Iterator end,
-      enable_if_t<is_legacy_connect_condition<
-        ConnectCondition, Iterator>::value>* = 0)
+      constraint_t<
+        is_same<
+          result_of_t<ConnectCondition(boost::system::error_code, Iterator)>,
+          Iterator
+        >::value
+      > = 0)
   {
     if (next != end)
       return connect_condition(ec, next);
@@ -92,20 +60,27 @@ namespace detail
   template <typename ConnectCondition, typename Iterator>
   inline Iterator call_connect_condition(ConnectCondition& connect_condition,
       const boost::system::error_code& ec, Iterator next, Iterator end,
-      enable_if_t<!is_legacy_connect_condition<
-        ConnectCondition, Iterator>::value>* = 0)
+      constraint_t<
+        is_same<
+          result_of_t<ConnectCondition(boost::system::error_code,
+            decltype(*declval<Iterator>()))>,
+          bool
+        >::value
+      > = 0)
   {
     for (;next != end; ++next)
       if (connect_condition(ec, *next))
         return next;
     return end;
   }
-}
+} // namespace detail
 
 template <typename Protocol, typename Executor, typename EndpointSequence>
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value>)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    >)
 {
   boost::system::error_code ec;
   typename Protocol::endpoint result = connect(s, endpoints, ec);
@@ -116,33 +91,15 @@ typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
 template <typename Protocol, typename Executor, typename EndpointSequence>
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, boost::system::error_code& ec,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value>)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    >)
 {
   return detail::deref_connect_result<Protocol>(
       connect(s, endpoints.begin(), endpoints.end(),
         detail::default_connect_condition(), ec), ec);
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-template <typename Protocol, typename Executor, typename Iterator>
-Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    constraint_t<!is_endpoint_sequence<Iterator>::value>)
-{
-  boost::system::error_code ec;
-  Iterator result = connect(s, begin, ec);
-  boost::asio::detail::throw_error(ec, "connect");
-  return result;
-}
-
-template <typename Protocol, typename Executor, typename Iterator>
-inline Iterator connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, boost::system::error_code& ec,
-    constraint_t<!is_endpoint_sequence<Iterator>::value>)
-{
-  return connect(s, begin, Iterator(), detail::default_connect_condition(), ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Protocol, typename Executor, typename Iterator>
 Iterator connect(basic_socket<Protocol, Executor>& s,
     Iterator begin, Iterator end)
@@ -164,7 +121,13 @@ template <typename Protocol, typename Executor,
     typename EndpointSequence, typename ConnectCondition>
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, ConnectCondition connect_condition,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value>)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    >,
+    constraint_t<
+      is_connect_condition<ConnectCondition,
+        decltype(declval<const EndpointSequence&>().begin())>::value
+    >)
 {
   boost::system::error_code ec;
   typename Protocol::endpoint result = connect(
@@ -178,41 +141,26 @@ template <typename Protocol, typename Executor,
 typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
     const EndpointSequence& endpoints, ConnectCondition connect_condition,
     boost::system::error_code& ec,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value>)
+    constraint_t<
+      is_endpoint_sequence<EndpointSequence>::value
+    >,
+    constraint_t<
+      is_connect_condition<ConnectCondition,
+        decltype(declval<const EndpointSequence&>().begin())>::value
+    >)
 {
   return detail::deref_connect_result<Protocol>(
       connect(s, endpoints.begin(), endpoints.end(),
         connect_condition, ec), ec);
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition>
-Iterator connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, ConnectCondition connect_condition,
-    constraint_t<!is_endpoint_sequence<Iterator>::value>)
-{
-  boost::system::error_code ec;
-  Iterator result = connect(s, begin, connect_condition, ec);
-  boost::asio::detail::throw_error(ec, "connect");
-  return result;
-}
-
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition>
-inline Iterator connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, ConnectCondition connect_condition,
-    boost::system::error_code& ec,
-    constraint_t<!is_endpoint_sequence<Iterator>::value>)
-{
-  return connect(s, begin, Iterator(), connect_condition, ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Protocol, typename Executor,
     typename Iterator, typename ConnectCondition>
 Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    Iterator end, ConnectCondition connect_condition)
+    Iterator end, ConnectCondition connect_condition,
+    constraint_t<
+      is_connect_condition<ConnectCondition, Iterator>::value
+    >)
 {
   boost::system::error_code ec;
   Iterator result = connect(s, begin, end, connect_condition, ec);
@@ -224,7 +172,10 @@ template <typename Protocol, typename Executor,
     typename Iterator, typename ConnectCondition>
 Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
     Iterator end, ConnectCondition connect_condition,
-    boost::system::error_code& ec)
+    boost::system::error_code& ec,
+    constraint_t<
+      is_connect_condition<ConnectCondition, Iterator>::value
+    >)
 {
   ec = boost::system::error_code();
 
@@ -688,121 +639,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename Protocol, typename Executor, typename EndpointSequence,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      typename Protocol::endpoint)) RangeConnectToken>
-inline auto async_connect(basic_socket<Protocol, Executor>& s,
-    const EndpointSequence& endpoints, RangeConnectToken&& token,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value>)
-  -> decltype(
-    async_initiate<RangeConnectToken,
-      void (boost::system::error_code, typename Protocol::endpoint)>(
-        declval<detail::initiate_async_range_connect<Protocol, Executor>>(),
-        token, endpoints, declval<detail::default_connect_condition>()))
-{
-  return async_initiate<RangeConnectToken,
-    void (boost::system::error_code, typename Protocol::endpoint)>(
-      detail::initiate_async_range_connect<Protocol, Executor>(s),
-      token, endpoints, detail::default_connect_condition());
-}
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-template <typename Protocol, typename Executor, typename Iterator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      Iterator)) IteratorConnectToken>
-inline auto async_connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, IteratorConnectToken&& token,
-    constraint_t<!is_endpoint_sequence<Iterator>::value>)
-  -> decltype(
-    async_initiate<IteratorConnectToken,
-      void (boost::system::error_code, Iterator)>(
-        declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, Iterator(), declval<detail::default_connect_condition>()))
-{
-  return async_initiate<IteratorConnectToken,
-    void (boost::system::error_code, Iterator)>(
-      detail::initiate_async_iterator_connect<Protocol, Executor>(s),
-      token, begin, Iterator(), detail::default_connect_condition());
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-template <typename Protocol, typename Executor, typename Iterator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      Iterator)) IteratorConnectToken>
-inline auto async_connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, Iterator end, IteratorConnectToken&& token)
-  -> decltype(
-    async_initiate<IteratorConnectToken,
-      void (boost::system::error_code, Iterator)>(
-        declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, end, declval<detail::default_connect_condition>()))
-{
-  return async_initiate<IteratorConnectToken,
-    void (boost::system::error_code, Iterator)>(
-      detail::initiate_async_iterator_connect<Protocol, Executor>(s),
-      token, begin, end, detail::default_connect_condition());
-}
-
-template <typename Protocol, typename Executor,
-    typename EndpointSequence, typename ConnectCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      typename Protocol::endpoint)) RangeConnectToken>
-inline auto async_connect(basic_socket<Protocol, Executor>& s,
-    const EndpointSequence& endpoints, ConnectCondition connect_condition,
-    RangeConnectToken&& token,
-    constraint_t<is_endpoint_sequence<EndpointSequence>::value>)
-  -> decltype(
-    async_initiate<RangeConnectToken,
-      void (boost::system::error_code, typename Protocol::endpoint)>(
-        declval<detail::initiate_async_range_connect<Protocol, Executor>>(),
-        token, endpoints, connect_condition))
-{
-  return async_initiate<RangeConnectToken,
-    void (boost::system::error_code, typename Protocol::endpoint)>(
-      detail::initiate_async_range_connect<Protocol, Executor>(s),
-      token, endpoints, connect_condition);
-}
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      Iterator)) IteratorConnectToken>
-inline auto async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
-    ConnectCondition connect_condition, IteratorConnectToken&& token,
-    constraint_t<!is_endpoint_sequence<Iterator>::value>)
-  -> decltype(
-    async_initiate<IteratorConnectToken,
-      void (boost::system::error_code, Iterator)>(
-        declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, Iterator(), connect_condition))
-{
-  return async_initiate<IteratorConnectToken,
-    void (boost::system::error_code, Iterator)>(
-      detail::initiate_async_iterator_connect<Protocol, Executor>(s),
-      token, begin, Iterator(), connect_condition);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-template <typename Protocol, typename Executor,
-    typename Iterator, typename ConnectCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      Iterator)) IteratorConnectToken>
-inline auto async_connect(basic_socket<Protocol, Executor>& s,
-    Iterator begin, Iterator end, ConnectCondition connect_condition,
-    IteratorConnectToken&& token)
-  -> decltype(
-    async_initiate<IteratorConnectToken,
-      void (boost::system::error_code, Iterator)>(
-        declval<detail::initiate_async_iterator_connect<Protocol, Executor>>(),
-        token, begin, end, connect_condition))
-{
-  return async_initiate<IteratorConnectToken,
-    void (boost::system::error_code, Iterator)>(
-      detail::initiate_async_iterator_connect<Protocol, Executor>(s),
-      token, begin, end, connect_condition);
-}
-
 } // namespace asio
 } // namespace boost
 
diff --git a/inst/include/boost/asio/impl/connect_pipe.hpp b/inst/include/boost/asio/impl/connect_pipe.hpp
index 6908dfb48..880a17bea 100644
--- a/inst/include/boost/asio/impl/connect_pipe.hpp
+++ b/inst/include/boost/asio/impl/connect_pipe.hpp
@@ -2,7 +2,7 @@
 // impl/connect_pipe.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/connect_pipe.ipp b/inst/include/boost/asio/impl/connect_pipe.ipp
index 0f1952235..f5de7aadc 100644
--- a/inst/include/boost/asio/impl/connect_pipe.ipp
+++ b/inst/include/boost/asio/impl/connect_pipe.ipp
@@ -2,7 +2,7 @@
 // impl/connect_pipe.ipp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2021 Klemens D. Morgenstern
 //                    (klemens dot morgenstern at gmx dot net)
 //
diff --git a/inst/include/boost/asio/impl/consign.hpp b/inst/include/boost/asio/impl/consign.hpp
index a24d03a72..03942963c 100644
--- a/inst/include/boost/asio/impl/consign.hpp
+++ b/inst/include/boost/asio/impl/consign.hpp
@@ -2,7 +2,7 @@
 // impl/consign.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,6 +19,7 @@
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/utility.hpp>
 
@@ -70,25 +71,31 @@ struct async_result<consign_t<CompletionToken, Values...>, Signatures...>
   : async_result<CompletionToken, Signatures...>
 {
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    init_wrapper(Initiation init)
-      : initiation_(static_cast<Initiation&&>(init))
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler,
+        std::tuple<Values...> values, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::consign_handler<decay_t<Handler>, Values...>(
+            static_cast<Handler&&>(handler),
+            static_cast<std::tuple<Values...>&&>(values)),
+          static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
     void operator()(Handler&& handler,
-        std::tuple<Values...> values, Args&&... args)
+        std::tuple<Values...> values, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<const Initiation&>(*this)(
           detail::consign_handler<decay_t<Handler>, Values...>(
             static_cast<Handler&&>(handler),
             static_cast<std::tuple<Values...>&&>(values)),
           static_cast<Args&&>(args)...);
     }
-
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
diff --git a/inst/include/boost/asio/impl/deferred.hpp b/inst/include/boost/asio/impl/deferred.hpp
index cc071b311..cdd9245fa 100644
--- a/inst/include/boost/asio/impl/deferred.hpp
+++ b/inst/include/boost/asio/impl/deferred.hpp
@@ -2,7 +2,7 @@
 // impl/deferred.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/detached.hpp b/inst/include/boost/asio/impl/detached.hpp
index 3f5665dab..2ad31cb29 100644
--- a/inst/include/boost/asio/impl/detached.hpp
+++ b/inst/include/boost/asio/impl/detached.hpp
@@ -2,7 +2,7 @@
 // impl/detached.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -44,8 +44,8 @@ namespace detail {
 
 #if !defined(GENERATING_DOCUMENTATION)
 
-template <typename Signature>
-struct async_result<detached_t, Signature>
+template <typename... Signatures>
+struct async_result<detached_t, Signatures...>
 {
   typedef boost::asio::detail::detached_handler completion_handler_type;
 
diff --git a/inst/include/boost/asio/impl/error.ipp b/inst/include/boost/asio/impl/error.ipp
index 24befe216..5c7a11552 100644
--- a/inst/include/boost/asio/impl/error.ipp
+++ b/inst/include/boost/asio/impl/error.ipp
@@ -2,7 +2,7 @@
 // impl/error.ipp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/execution_context.hpp b/inst/include/boost/asio/impl/execution_context.hpp
index 2bfdf1cef..346ce24c9 100644
--- a/inst/include/boost/asio/impl/execution_context.hpp
+++ b/inst/include/boost/asio/impl/execution_context.hpp
@@ -2,7 +2,7 @@
 // impl/execution_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/execution_context.ipp b/inst/include/boost/asio/impl/execution_context.ipp
index 52f4e5cb0..946591775 100644
--- a/inst/include/boost/asio/impl/execution_context.ipp
+++ b/inst/include/boost/asio/impl/execution_context.ipp
@@ -2,7 +2,7 @@
 // impl/execution_context.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -29,6 +29,13 @@ execution_context::execution_context()
 {
 }
 
+execution_context::execution_context(
+    const execution_context::service_maker& initial_services)
+  : service_registry_(new boost::asio::detail::service_registry(*this))
+{
+  initial_services.make(*this);
+}
+
 execution_context::~execution_context()
 {
   shutdown();
@@ -66,6 +73,10 @@ void execution_context::service::notify_fork(execution_context::fork_event)
 {
 }
 
+execution_context::service_maker::~service_maker()
+{
+}
+
 service_already_exists::service_already_exists()
   : std::logic_error("Service already exists.")
 {
diff --git a/inst/include/boost/asio/impl/executor.hpp b/inst/include/boost/asio/impl/executor.hpp
index fcad7299e..869df21b6 100644
--- a/inst/include/boost/asio/impl/executor.hpp
+++ b/inst/include/boost/asio/impl/executor.hpp
@@ -2,7 +2,7 @@
 // impl/executor.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/executor.ipp b/inst/include/boost/asio/impl/executor.ipp
index c0a6b94f7..41c6d29e0 100644
--- a/inst/include/boost/asio/impl/executor.ipp
+++ b/inst/include/boost/asio/impl/executor.ipp
@@ -2,7 +2,7 @@
 // impl/executor.ipp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/io_context.hpp b/inst/include/boost/asio/impl/io_context.hpp
index b19273343..67ddc51ed 100644
--- a/inst/include/boost/asio/impl/io_context.hpp
+++ b/inst/include/boost/asio/impl/io_context.hpp
@@ -2,7 +2,7 @@
 // impl/io_context.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -109,97 +109,6 @@ std::size_t io_context::run_one_until(
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
 
-inline void io_context::reset()
-{
-  restart();
-}
-
-struct io_context::initiate_dispatch
-{
-  template <typename LegacyCompletionHandler>
-  void operator()(LegacyCompletionHandler&& handler,
-      io_context* self) const
-  {
-    // If you get an error on the following line it means that your handler does
-    // not meet the documented type requirements for a LegacyCompletionHandler.
-    BOOST_ASIO_LEGACY_COMPLETION_HANDLER_CHECK(
-        LegacyCompletionHandler, handler) type_check;
-
-    detail::non_const_lvalue<LegacyCompletionHandler> handler2(handler);
-    if (self->impl_.can_dispatch())
-    {
-      detail::fenced_block b(detail::fenced_block::full);
-      static_cast<decay_t<LegacyCompletionHandler>&&>(handler2.value)();
-    }
-    else
-    {
-      // Allocate and construct an operation to wrap the handler.
-      typedef detail::completion_handler<
-        decay_t<LegacyCompletionHandler>, executor_type> op;
-      typename op::ptr p = { detail::addressof(handler2.value),
-        op::ptr::allocate(handler2.value), 0 };
-      p.p = new (p.v) op(handler2.value, self->get_executor());
-
-      BOOST_ASIO_HANDLER_CREATION((*self, *p.p,
-            "io_context", self, 0, "dispatch"));
-
-      self->impl_.do_dispatch(p.p);
-      p.v = p.p = 0;
-    }
-  }
-};
-
-template <typename LegacyCompletionHandler>
-auto io_context::dispatch(LegacyCompletionHandler&& handler)
-  -> decltype(
-    async_initiate<LegacyCompletionHandler, void ()>(
-      declval<initiate_dispatch>(), handler, this))
-{
-  return async_initiate<LegacyCompletionHandler, void ()>(
-      initiate_dispatch(), handler, this);
-}
-
-struct io_context::initiate_post
-{
-  template <typename LegacyCompletionHandler>
-  void operator()(LegacyCompletionHandler&& handler,
-      io_context* self) const
-  {
-    // If you get an error on the following line it means that your handler does
-    // not meet the documented type requirements for a LegacyCompletionHandler.
-    BOOST_ASIO_LEGACY_COMPLETION_HANDLER_CHECK(
-        LegacyCompletionHandler, handler) type_check;
-
-    detail::non_const_lvalue<LegacyCompletionHandler> handler2(handler);
-
-    bool is_continuation =
-      boost_asio_handler_cont_helpers::is_continuation(handler2.value);
-
-    // Allocate and construct an operation to wrap the handler.
-    typedef detail::completion_handler<
-      decay_t<LegacyCompletionHandler>, executor_type> op;
-    typename op::ptr p = { detail::addressof(handler2.value),
-        op::ptr::allocate(handler2.value), 0 };
-    p.p = new (p.v) op(handler2.value, self->get_executor());
-
-    BOOST_ASIO_HANDLER_CREATION((*self, *p.p,
-          "io_context", self, 0, "post"));
-
-    self->impl_.post_immediate_completion(p.p, is_continuation);
-    p.v = p.p = 0;
-  }
-};
-
-template <typename LegacyCompletionHandler>
-auto io_context::post(LegacyCompletionHandler&& handler)
-  -> decltype(
-    async_initiate<LegacyCompletionHandler, void ()>(
-      declval<initiate_post>(), handler, this))
-{
-  return async_initiate<LegacyCompletionHandler, void ()>(
-      initiate_post(), handler, this);
-}
-
 template <typename Handler>
 #if defined(GENERATING_DOCUMENTATION)
 unspecified
@@ -398,30 +307,6 @@ void io_context::basic_executor_type<Allocator, Bits>::defer(
 }
 #endif // !defined(BOOST_ASIO_NO_TS_EXECUTORS)
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-inline io_context::work::work(boost::asio::io_context& io_context)
-  : io_context_impl_(io_context.impl_)
-{
-  io_context_impl_.work_started();
-}
-
-inline io_context::work::work(const work& other)
-  : io_context_impl_(other.io_context_impl_)
-{
-  io_context_impl_.work_started();
-}
-
-inline io_context::work::~work()
-{
-  io_context_impl_.work_finished();
-}
-
-inline boost::asio::io_context& io_context::work::get_io_context()
-{
-  return static_cast<boost::asio::io_context&>(io_context_impl_.context());
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 inline boost::asio::io_context& io_context::service::get_io_context()
 {
   return static_cast<boost::asio::io_context&>(context());
diff --git a/inst/include/boost/asio/impl/io_context.ipp b/inst/include/boost/asio/impl/io_context.ipp
index 712f744bf..968d6e457 100644
--- a/inst/include/boost/asio/impl/io_context.ipp
+++ b/inst/include/boost/asio/impl/io_context.ipp
@@ -2,7 +2,7 @@
 // impl/io_context.ipp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,6 +16,7 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <boost/asio/config.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/detail/concurrency_hint.hpp>
 #include <boost/asio/detail/limits.hpp>
@@ -35,14 +36,20 @@ namespace boost {
 namespace asio {
 
 io_context::io_context()
-  : impl_(add_impl(new impl_type(*this,
-          BOOST_ASIO_CONCURRENCY_HINT_DEFAULT, false)))
+  : execution_context(config_from_concurrency_hint()),
+    impl_(add_impl(new impl_type(*this, false)))
 {
 }
 
 io_context::io_context(int concurrency_hint)
-  : impl_(add_impl(new impl_type(*this, concurrency_hint == 1
-          ? BOOST_ASIO_CONCURRENCY_HINT_1 : concurrency_hint, false)))
+  : execution_context(config_from_concurrency_hint(concurrency_hint)),
+    impl_(add_impl(new impl_type(*this, false)))
+{
+}
+
+io_context::io_context(const execution_context::service_maker& initial_services)
+  : execution_context(initial_services),
+    impl_(add_impl(new impl_type(*this, false)))
 {
 }
 
@@ -66,13 +73,6 @@ io_context::count_type io_context::run()
   return s;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-io_context::count_type io_context::run(boost::system::error_code& ec)
-{
-  return impl_.run(ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 io_context::count_type io_context::run_one()
 {
   boost::system::error_code ec;
@@ -81,13 +81,6 @@ io_context::count_type io_context::run_one()
   return s;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-io_context::count_type io_context::run_one(boost::system::error_code& ec)
-{
-  return impl_.run_one(ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 io_context::count_type io_context::poll()
 {
   boost::system::error_code ec;
@@ -96,13 +89,6 @@ io_context::count_type io_context::poll()
   return s;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-io_context::count_type io_context::poll(boost::system::error_code& ec)
-{
-  return impl_.poll(ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 io_context::count_type io_context::poll_one()
 {
   boost::system::error_code ec;
@@ -111,13 +97,6 @@ io_context::count_type io_context::poll_one()
   return s;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-io_context::count_type io_context::poll_one(boost::system::error_code& ec)
-{
-  return impl_.poll_one(ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 void io_context::stop()
 {
   impl_.stop();
@@ -144,31 +123,11 @@ io_context::service::~service()
 
 void io_context::service::shutdown()
 {
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  shutdown_service();
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-}
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-void io_context::service::shutdown_service()
-{
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-void io_context::service::notify_fork(io_context::fork_event ev)
-{
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  fork_service(ev);
-#else // !defined(BOOST_ASIO_NO_DEPRECATED)
-  (void)ev;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-void io_context::service::fork_service(io_context::fork_event)
+void io_context::service::notify_fork(io_context::fork_event)
 {
 }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
 } // namespace asio
 } // namespace boost
diff --git a/inst/include/boost/asio/impl/multiple_exceptions.ipp b/inst/include/boost/asio/impl/multiple_exceptions.ipp
index ff1ddd071..46bcf5307 100644
--- a/inst/include/boost/asio/impl/multiple_exceptions.ipp
+++ b/inst/include/boost/asio/impl/multiple_exceptions.ipp
@@ -2,7 +2,7 @@
 // impl/multiple_exceptions.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/prepend.hpp b/inst/include/boost/asio/impl/prepend.hpp
index dd3807721..7db1bf2f1 100644
--- a/inst/include/boost/asio/impl/prepend.hpp
+++ b/inst/include/boost/asio/impl/prepend.hpp
@@ -2,7 +2,7 @@
 // impl/prepend.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,6 +19,7 @@
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/utility.hpp>
 
@@ -95,25 +96,31 @@ struct async_result<
       Signature, Values...>::type signature;
 
   template <typename Initiation>
-  struct init_wrapper
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    init_wrapper(Initiation init)
-      : initiation_(static_cast<Initiation&&>(init))
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler,
+        std::tuple<Values...> values, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::prepend_handler<decay_t<Handler>, Values...>(
+            static_cast<Handler&&>(handler),
+            static_cast<std::tuple<Values...>&&>(values)),
+          static_cast<Args&&>(args)...);
     }
 
     template <typename Handler, typename... Args>
     void operator()(Handler&& handler,
-        std::tuple<Values...> values, Args&&... args)
+        std::tuple<Values...> values, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation_)(
+      static_cast<const Initiation&>(*this)(
           detail::prepend_handler<decay_t<Handler>, Values...>(
             static_cast<Handler&&>(handler),
             static_cast<std::tuple<Values...>&&>(values)),
           static_cast<Args&&>(args)...);
     }
-
-    Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
diff --git a/inst/include/boost/asio/impl/read.hpp b/inst/include/boost/asio/impl/read.hpp
index f48c3f537..9b05a671f 100644
--- a/inst/include/boost/asio/impl/read.hpp
+++ b/inst/include/boost/asio/impl/read.hpp
@@ -2,7 +2,7 @@
 // impl/read.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -65,6 +65,9 @@ std::size_t read(SyncReadStream& s, const MutableBufferSequence& buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_mutable_buffer_sequence<MutableBufferSequence>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   return detail::read_buffer_seq(s, buffers,
@@ -100,6 +103,9 @@ inline std::size_t read(SyncReadStream& s, const MutableBufferSequence& buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_mutable_buffer_sequence<MutableBufferSequence>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   boost::system::error_code ec;
@@ -121,6 +127,9 @@ std::size_t read(SyncReadStream& s,
     >,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   decay_t<DynamicBuffer_v1> b(
@@ -189,6 +198,9 @@ inline std::size_t read(SyncReadStream& s,
     >,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   boost::system::error_code ec;
@@ -206,7 +218,10 @@ template <typename SyncReadStream, typename Allocator,
     typename CompletionCondition>
 inline std::size_t read(SyncReadStream& s,
     boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec)
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   return read(s, basic_streambuf_ref<Allocator>(b),
       static_cast<CompletionCondition&&>(completion_condition), ec);
@@ -231,7 +246,10 @@ template <typename SyncReadStream, typename Allocator,
     typename CompletionCondition>
 inline std::size_t read(SyncReadStream& s,
     boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition)
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   return read(s, basic_streambuf_ref<Allocator>(b),
       static_cast<CompletionCondition&&>(completion_condition));
@@ -247,6 +265,9 @@ std::size_t read(SyncReadStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   DynamicBuffer_v2& b = buffers;
@@ -305,6 +326,9 @@ inline std::size_t read(SyncReadStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   boost::system::error_code ec;
@@ -498,47 +522,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream,
-    typename MutableBufferSequence, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
-    CompletionCondition completion_condition, ReadToken&& token,
-    constraint_t<
-      is_mutable_buffer_sequence<MutableBufferSequence>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read<AsyncReadStream>>(), token, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read<AsyncReadStream>(s), token, buffers,
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-template <typename AsyncReadStream, typename MutableBufferSequence,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s,
-    const MutableBufferSequence& buffers, ReadToken&& token,
-    constraint_t<
-      is_mutable_buffer_sequence<MutableBufferSequence>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read<AsyncReadStream>>(),
-        token, buffers, transfer_all()))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read<AsyncReadStream>(s),
-      token, buffers, transfer_all());
-}
-
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
 namespace detail
@@ -723,97 +706,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v1,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s,
-    DynamicBuffer_v1&& buffers, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers), transfer_all()))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers), transfer_all());
-}
-
-template <typename AsyncReadStream,
-    typename DynamicBuffer_v1, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
-    CompletionCondition completion_condition, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers),
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-#if !defined(BOOST_ASIO_NO_EXTENSIONS)
-#if !defined(BOOST_ASIO_NO_IOSTREAM)
-
-template <typename AsyncReadStream, typename Allocator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s,
-    basic_streambuf<Allocator>& b, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), transfer_all()))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
-      token, basic_streambuf_ref<Allocator>(b), transfer_all());
-}
-
-template <typename AsyncReadStream,
-    typename Allocator, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b),
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
-      token, basic_streambuf_ref<Allocator>(b),
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-#endif // !defined(BOOST_ASIO_NO_IOSTREAM)
-#endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 #endif // !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
 namespace detail
@@ -1004,49 +896,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v2,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s,
-    DynamicBuffer_v2 buffers, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_dynbuf_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), transfer_all()))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_dynbuf_v2<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers), transfer_all());
-}
-
-template <typename AsyncReadStream,
-    typename DynamicBuffer_v2, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read(AsyncReadStream& s, DynamicBuffer_v2 buffers,
-    CompletionCondition completion_condition, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_dynbuf_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_dynbuf_v2<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers),
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
 } // namespace asio
 } // namespace boost
 
diff --git a/inst/include/boost/asio/impl/read_at.hpp b/inst/include/boost/asio/impl/read_at.hpp
index c691e1774..44cc717d3 100644
--- a/inst/include/boost/asio/impl/read_at.hpp
+++ b/inst/include/boost/asio/impl/read_at.hpp
@@ -2,7 +2,7 @@
 // impl/read_at.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -67,7 +67,10 @@ template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence,
     typename CompletionCondition>
 std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, const MutableBufferSequence& buffers,
-    CompletionCondition completion_condition, boost::system::error_code& ec)
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   return detail::read_at_buffer_sequence(d, offset, buffers,
       boost::asio::buffer_sequence_begin(buffers),
@@ -97,7 +100,10 @@ template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence,
     typename CompletionCondition>
 inline std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, const MutableBufferSequence& buffers,
-    CompletionCondition completion_condition)
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   boost::system::error_code ec;
   std::size_t bytes_transferred = read_at(d, offset, buffers,
@@ -113,7 +119,10 @@ template <typename SyncRandomAccessReadDevice, typename Allocator,
     typename CompletionCondition>
 std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec)
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   ec = boost::system::error_code();
   std::size_t total_transferred = 0;
@@ -156,7 +165,10 @@ template <typename SyncRandomAccessReadDevice, typename Allocator,
     typename CompletionCondition>
 inline std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition)
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   boost::system::error_code ec;
   std::size_t bytes_transferred = read_at(d, offset, b,
@@ -360,44 +372,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncRandomAccessReadDevice,
-    typename MutableBufferSequence, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_at(AsyncRandomAccessReadDevice& d,
-    uint64_t offset, const MutableBufferSequence& buffers,
-    CompletionCondition completion_condition, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_at<AsyncRandomAccessReadDevice>>(),
-        token, offset, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_at<AsyncRandomAccessReadDevice>(d),
-      token, offset, buffers,
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-template <typename AsyncRandomAccessReadDevice, typename MutableBufferSequence,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_at(AsyncRandomAccessReadDevice& d,
-    uint64_t offset, const MutableBufferSequence& buffers, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_at<AsyncRandomAccessReadDevice>>(),
-        token, offset, buffers, transfer_all()))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_at<AsyncRandomAccessReadDevice>(d),
-      token, offset, buffers, transfer_all());
-}
-
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
@@ -579,46 +553,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncRandomAccessReadDevice,
-    typename Allocator, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_at(AsyncRandomAccessReadDevice& d,
-    uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_at_streambuf<
-          AsyncRandomAccessReadDevice>>(),
-        token, offset, &b,
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_at_streambuf<AsyncRandomAccessReadDevice>(d),
-      token, offset, &b,
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-template <typename AsyncRandomAccessReadDevice, typename Allocator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_at(AsyncRandomAccessReadDevice& d, uint64_t offset,
-    boost::asio::basic_streambuf<Allocator>& b, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_at_streambuf<
-          AsyncRandomAccessReadDevice>>(),
-        token, offset, &b, transfer_all()))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_at_streambuf<AsyncRandomAccessReadDevice>(d),
-      token, offset, &b, transfer_all());
-}
-
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 
diff --git a/inst/include/boost/asio/impl/read_until.hpp b/inst/include/boost/asio/impl/read_until.hpp
index 8520fe112..08e51ecc4 100644
--- a/inst/include/boost/asio/impl/read_until.hpp
+++ b/inst/include/boost/asio/impl/read_until.hpp
@@ -2,7 +2,7 @@
 // impl/read_until.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -69,6 +69,19 @@ namespace detail
     }
     return std::make_pair(last1, false);
   }
+
+#if !defined(BOOST_ASIO_NO_EXTENSIONS)
+#if defined(BOOST_ASIO_HAS_BOOST_REGEX)
+  struct regex_match_flags
+  {
+    template <typename T>
+    operator T() const
+    {
+      return T::match_default | T::match_partial;
+    }
+  };
+#endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
+#endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
 } // namespace detail
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
@@ -232,19 +245,6 @@ std::size_t read_until(SyncReadStream& s,
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if defined(BOOST_ASIO_HAS_BOOST_REGEX)
 
-namespace detail {
-
-struct regex_match_flags
-{
-  template <typename T>
-  operator T() const
-  {
-    return T::match_default | T::match_partial;
-  }
-};
-
-} // namespace detail
-
 template <typename SyncReadStream, typename DynamicBuffer_v1, typename Traits>
 inline std::size_t read_until(SyncReadStream& s, DynamicBuffer_v1&& buffers,
     const boost::basic_regex<char, Traits>& expr,
@@ -1029,29 +1029,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v1,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s,
-    DynamicBuffer_v1&& buffers, char delim, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_delim_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers), delim))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_delim_v1<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers), delim);
-}
-
 namespace detail
 {
   template <typename AsyncReadStream,
@@ -1280,32 +1257,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v1,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
-    BOOST_ASIO_STRING_VIEW_PARAM delim, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_delim_string_v1<
-          AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers),
-        static_cast<std::string>(delim)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_delim_string_v1<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers),
-      static_cast<std::string>(delim));
-}
-
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if defined(BOOST_ASIO_HAS_BOOST_REGEX)
 
@@ -1538,29 +1489,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v1, typename Traits,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
-    const boost::basic_regex<char, Traits>& expr, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_expr_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers), expr))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_expr_v1<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers), expr);
-}
-
 #endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
 
 namespace detail
@@ -1791,117 +1719,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream,
-    typename DynamicBuffer_v1, typename MatchCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
-    MatchCondition match_condition, ReadToken&& token,
-    constraint_t<
-      is_match_condition<MatchCondition>::value
-    >,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_match_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers),
-        match_condition))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_match_v1<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers),
-      match_condition);
-}
-
-#if !defined(BOOST_ASIO_NO_IOSTREAM)
-
-template <typename AsyncReadStream, typename Allocator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s,
-    boost::asio::basic_streambuf<Allocator>& b, char delim, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_delim_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), delim))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_delim_v1<AsyncReadStream>(s),
-      token, basic_streambuf_ref<Allocator>(b), delim);
-}
-
-template <typename AsyncReadStream, typename Allocator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s,
-    boost::asio::basic_streambuf<Allocator>& b,
-    BOOST_ASIO_STRING_VIEW_PARAM delim, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_delim_string_v1<
-          AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b),
-        static_cast<std::string>(delim)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_delim_string_v1<AsyncReadStream>(s),
-      token, basic_streambuf_ref<Allocator>(b),
-      static_cast<std::string>(delim));
-}
-
-#if defined(BOOST_ASIO_HAS_BOOST_REGEX)
-
-template <typename AsyncReadStream, typename Allocator, typename Traits,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s,
-    boost::asio::basic_streambuf<Allocator>& b,
-    const boost::basic_regex<char, Traits>& expr, ReadToken&& token)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_expr_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), expr))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_expr_v1<AsyncReadStream>(s),
-      token, basic_streambuf_ref<Allocator>(b), expr);
-}
-
-#endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
-
-template <typename AsyncReadStream, typename Allocator, typename MatchCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s,
-    boost::asio::basic_streambuf<Allocator>& b,
-    MatchCondition match_condition, ReadToken&& token,
-    constraint_t<is_match_condition<MatchCondition>::value>)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_match_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), match_condition))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_match_v1<AsyncReadStream>(s),
-      token, basic_streambuf_ref<Allocator>(b), match_condition);
-}
-
-#endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 #endif // !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
@@ -2129,26 +1946,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v2,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s,
-    DynamicBuffer_v2 buffers, char delim, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_delim_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), delim))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_delim_v2<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers), delim);
-}
-
 namespace detail
 {
   template <typename AsyncReadStream,
@@ -2385,30 +2182,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream,
-    typename DynamicBuffer_v2,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
-    BOOST_ASIO_STRING_VIEW_PARAM delim, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_delim_string_v2<
-          AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers),
-        static_cast<std::string>(delim)))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_delim_string_v2<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers),
-      static_cast<std::string>(delim));
-}
-
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if defined(BOOST_ASIO_HAS_BOOST_REGEX)
 
@@ -2650,26 +2423,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream, typename DynamicBuffer_v2, typename Traits,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
-    const boost::basic_regex<char, Traits>& expr, ReadToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_expr_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), expr))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_expr_v2<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers), expr);
-}
-
 #endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
 
 namespace detail
@@ -2907,32 +2660,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncReadStream,
-    typename DynamicBuffer_v2, typename MatchCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) ReadToken>
-inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
-    MatchCondition match_condition, ReadToken&& token,
-    constraint_t<
-      is_match_condition<MatchCondition>::value
-    >,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<ReadToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_read_until_match_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers),
-        match_condition))
-{
-  return async_initiate<ReadToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_read_until_match_v2<AsyncReadStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers),
-      match_condition);
-}
-
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 
 } // namespace asio
diff --git a/inst/include/boost/asio/impl/redirect_error.hpp b/inst/include/boost/asio/impl/redirect_error.hpp
index 8ed49d58d..b2f8ac7f3 100644
--- a/inst/include/boost/asio/impl/redirect_error.hpp
+++ b/inst/include/boost/asio/impl/redirect_error.hpp
@@ -2,7 +2,7 @@
 // impl/redirect_error.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,9 +16,11 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/initiation_base.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/system/system_error.hpp>
 
@@ -183,42 +185,52 @@ struct async_result<redirect_error_t<CompletionToken>, Signature>
   : async_result<CompletionToken,
       typename detail::redirect_error_signature<Signature>::type>
 {
-
-  struct init_wrapper
+  template <typename Initiation>
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    explicit init_wrapper(boost::system::error_code& ec)
-      : ec_(ec)
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler,
+        boost::system::error_code* ec, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::redirect_error_handler<decay_t<Handler>>(
+            *ec, static_cast<Handler&&>(handler)),
+          static_cast<Args&&>(args)...);
     }
 
-    template <typename Handler, typename Initiation, typename... Args>
+    template <typename Handler, typename... Args>
     void operator()(Handler&& handler,
-        Initiation&& initiation, Args&&... args) const
+        boost::system::error_code* ec, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation)(
+      static_cast<const Initiation&>(*this)(
           detail::redirect_error_handler<decay_t<Handler>>(
-            ec_, static_cast<Handler&&>(handler)),
+            *ec, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    boost::system::error_code& ec_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static auto initiate(Initiation&& initiation,
       RawCompletionToken&& token, Args&&... args)
     -> decltype(
-      async_initiate<CompletionToken,
+      async_initiate<
+        conditional_t<
+          is_const<remove_reference_t<RawCompletionToken>>::value,
+            const CompletionToken, CompletionToken>,
         typename detail::redirect_error_signature<Signature>::type>(
-          declval<init_wrapper>(), token.token_,
-          static_cast<Initiation&&>(initiation),
-          static_cast<Args&&>(args)...))
+          declval<init_wrapper<decay_t<Initiation>>>(),
+          token.token_, &token.ec_, static_cast<Args&&>(args)...))
   {
-    return async_initiate<CompletionToken,
+    return async_initiate<
+      conditional_t<
+        is_const<remove_reference_t<RawCompletionToken>>::value,
+          const CompletionToken, CompletionToken>,
       typename detail::redirect_error_signature<Signature>::type>(
-        init_wrapper(token.ec_), token.token_,
-        static_cast<Initiation&&>(initiation),
-        static_cast<Args&&>(args)...);
+        init_wrapper<decay_t<Initiation>>(
+          static_cast<Initiation&&>(initiation)),
+        token.token_, &token.ec_, static_cast<Args&&>(args)...);
   }
 };
 
@@ -242,6 +254,31 @@ struct associator<Associator,
   }
 };
 
+template <typename... Signatures>
+struct async_result<partial_redirect_error, Signatures...>
+{
+  template <typename Initiation, typename RawCompletionToken, typename... Args>
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        redirect_error_t<
+          default_completion_token_t<associated_executor_t<Initiation>>>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.ec_),
+        static_cast<Args&&>(args)...))
+  {
+    return async_initiate<Signatures...>(
+        static_cast<Initiation&&>(initiation),
+        redirect_error_t<
+          default_completion_token_t<associated_executor_t<Initiation>>>(
+            default_completion_token_t<associated_executor_t<Initiation>>{},
+            token.ec_),
+        static_cast<Args&&>(args)...);
+  }
+};
+
 #endif // !defined(GENERATING_DOCUMENTATION)
 
 } // namespace asio
diff --git a/inst/include/boost/asio/impl/serial_port_base.hpp b/inst/include/boost/asio/impl/serial_port_base.hpp
index a55bed37e..7c6c1cf44 100644
--- a/inst/include/boost/asio/impl/serial_port_base.hpp
+++ b/inst/include/boost/asio/impl/serial_port_base.hpp
@@ -2,7 +2,7 @@
 // impl/serial_port_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/impl/serial_port_base.ipp b/inst/include/boost/asio/impl/serial_port_base.ipp
index 4e786d46e..3fa96fd74 100644
--- a/inst/include/boost/asio/impl/serial_port_base.ipp
+++ b/inst/include/boost/asio/impl/serial_port_base.ipp
@@ -2,7 +2,7 @@
 // impl/serial_port_base.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/impl/spawn.hpp b/inst/include/boost/asio/impl/spawn.hpp
index 26263ff19..9c709df12 100644
--- a/inst/include/boost/asio/impl/spawn.hpp
+++ b/inst/include/boost/asio/impl/spawn.hpp
@@ -2,7 +2,7 @@
 // impl/spawn.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -29,6 +29,8 @@
 #include <boost/asio/detail/noncopyable.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/utility.hpp>
+#include <boost/asio/disposition.hpp>
+#include <boost/asio/error.hpp>
 #include <boost/system/system_error.hpp>
 
 #if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
@@ -49,137 +51,6 @@ inline void spawned_thread_rethrow(void* ex)
 }
 #endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
 
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-
-// Spawned thread implementation using Boost.Coroutine.
-class spawned_coroutine_thread : public spawned_thread_base
-{
-public:
-#if defined(BOOST_COROUTINES_UNIDIRECT) || defined(BOOST_COROUTINES_V2)
-  typedef boost::coroutines::pull_coroutine<void> callee_type;
-  typedef boost::coroutines::push_coroutine<void> caller_type;
-#else
-  typedef boost::coroutines::coroutine<void()> callee_type;
-  typedef boost::coroutines::coroutine<void()> caller_type;
-#endif
-
-  spawned_coroutine_thread(caller_type& caller)
-    : caller_(caller),
-      on_suspend_fn_(0),
-      on_suspend_arg_(0)
-  {
-  }
-
-  template <typename F>
-  static spawned_thread_base* spawn(F&& f,
-      const boost::coroutines::attributes& attributes,
-      cancellation_slot parent_cancel_slot = cancellation_slot(),
-      cancellation_state cancel_state = cancellation_state())
-  {
-    spawned_coroutine_thread* spawned_thread = 0;
-    callee_type callee(entry_point<decay_t<F>>(
-          static_cast<F&&>(f), &spawned_thread), attributes);
-    spawned_thread->callee_.swap(callee);
-    spawned_thread->parent_cancellation_slot_ = parent_cancel_slot;
-    spawned_thread->cancellation_state_ = cancel_state;
-    return spawned_thread;
-  }
-
-  template <typename F>
-  static spawned_thread_base* spawn(F&& f,
-      cancellation_slot parent_cancel_slot = cancellation_slot(),
-      cancellation_state cancel_state = cancellation_state())
-  {
-    return spawn(static_cast<F&&>(f), boost::coroutines::attributes(),
-        parent_cancel_slot, cancel_state);
-  }
-
-  void resume()
-  {
-    callee_();
-    if (on_suspend_fn_)
-    {
-      void (*fn)(void*) = on_suspend_fn_;
-      void* arg = on_suspend_arg_;
-      on_suspend_fn_ = 0;
-      fn(arg);
-    }
-  }
-
-  void suspend_with(void (*fn)(void*), void* arg)
-  {
-    if (throw_if_cancelled_)
-      if (!!cancellation_state_.cancelled())
-        throw_error(boost::asio::error::operation_aborted, "yield");
-    has_context_switched_ = true;
-    on_suspend_fn_ = fn;
-    on_suspend_arg_ = arg;
-    caller_();
-  }
-
-  void destroy()
-  {
-    callee_type callee;
-    callee.swap(callee_);
-    if (terminal_)
-      callee();
-  }
-
-private:
-  template <typename Function>
-  class entry_point
-  {
-  public:
-    template <typename F>
-    entry_point(F&& f,
-        spawned_coroutine_thread** spawned_thread_out)
-      : function_(static_cast<F&&>(f)),
-        spawned_thread_out_(spawned_thread_out)
-    {
-    }
-
-    void operator()(caller_type& caller)
-    {
-      Function function(static_cast<Function&&>(function_));
-      spawned_coroutine_thread spawned_thread(caller);
-      *spawned_thread_out_ = &spawned_thread;
-      spawned_thread_out_ = 0;
-      spawned_thread.suspend();
-#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
-      try
-#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
-      {
-        function(&spawned_thread);
-        spawned_thread.terminal_ = true;
-        spawned_thread.suspend();
-      }
-#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
-      catch (const boost::coroutines::detail::forced_unwind&)
-      {
-        throw;
-      }
-      catch (...)
-      {
-        exception_ptr ex = current_exception();
-        spawned_thread.terminal_ = true;
-        spawned_thread.suspend_with(spawned_thread_rethrow, &ex);
-      }
-#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
-    }
-
-  private:
-    Function function_;
-    spawned_coroutine_thread** spawned_thread_out_;
-  };
-
-  caller_type& caller_;
-  callee_type callee_;
-  void (*on_suspend_fn_)(void*);
-  void* on_suspend_arg_;
-};
-
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-
 #if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
 
 // Spawned thread implementation using Boost.Context's fiber.
@@ -312,8 +183,6 @@ class spawned_fiber_thread : public spawned_thread_base
 
 #if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
 typedef spawned_fiber_thread default_spawned_thread_type;
-#elif defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-typedef spawned_coroutine_thread default_spawned_thread_type;
 #else
 # error No spawn() implementation available
 #endif
@@ -436,7 +305,7 @@ class spawn_handler_base
 };
 
 // Completion handlers for when basic_yield_context is used as a token.
-template <typename Executor, typename Signature>
+template <typename Executor, typename Signature, typename = void>
 class spawn_handler;
 
 template <typename Executor, typename R>
@@ -499,13 +368,14 @@ class spawn_handler<Executor, R(boost::system::error_code)>
   result_type& result_;
 };
 
-template <typename Executor, typename R>
-class spawn_handler<Executor, R(exception_ptr)>
-  : public spawn_handler_base<Executor>
+template <typename Executor, typename R, typename Disposition>
+class spawn_handler<Executor, R(Disposition),
+    enable_if_t<is_disposition<Disposition>::value>
+  > : public spawn_handler_base<Executor>
 {
 public:
   typedef void return_type;
-  typedef exception_ptr* result_type;
+  typedef Disposition* result_type;
 
   spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
     : spawn_handler_base<Executor>(yield),
@@ -513,16 +383,16 @@ class spawn_handler<Executor, R(exception_ptr)>
   {
   }
 
-  void operator()(exception_ptr ex)
+  void operator()(Disposition d)
   {
-    result_ = &ex;
+    result_ = detail::addressof(d);
     this->resume();
   }
 
   static return_type on_resume(result_type& result)
   {
-    if (*result)
-      rethrow_exception(*result);
+    if (*result != no_error)
+      boost::asio::throw_exception(static_cast<Disposition&&>(*result));
   }
 
 private:
@@ -530,8 +400,9 @@ class spawn_handler<Executor, R(exception_ptr)>
 };
 
 template <typename Executor, typename R, typename T>
-class spawn_handler<Executor, R(T)>
-  : public spawn_handler_base<Executor>
+class spawn_handler<Executor, R(T),
+    enable_if_t<!is_disposition<T>::value>
+  > : public spawn_handler_base<Executor>
 {
 public:
   typedef T return_type;
@@ -545,7 +416,7 @@ class spawn_handler<Executor, R(T)>
 
   void operator()(T value)
   {
-    result_ = &value;
+    result_ = detail::addressof(value);
     this->resume();
   }
 
@@ -586,7 +457,7 @@ class spawn_handler<Executor, R(boost::system::error_code, T)>
     }
     else
       result_.ec_ = &ec;
-    result_.value_ = &value;
+    result_.value_ = detail::addressof(value);
     this->resume();
   }
 
@@ -601,16 +472,17 @@ class spawn_handler<Executor, R(boost::system::error_code, T)>
   result_type& result_;
 };
 
-template <typename Executor, typename R, typename T>
-class spawn_handler<Executor, R(exception_ptr, T)>
-  : public spawn_handler_base<Executor>
+template <typename Executor, typename R, typename Disposition, typename T>
+class spawn_handler<Executor, R(Disposition, T),
+    enable_if_t<is_disposition<Disposition>::value>
+  > : public spawn_handler_base<Executor>
 {
 public:
   typedef T return_type;
 
   struct result_type
   {
-    exception_ptr* ex_;
+    Disposition* disposition_;
     return_type* value_;
   };
 
@@ -620,17 +492,20 @@ class spawn_handler<Executor, R(exception_ptr, T)>
   {
   }
 
-  void operator()(exception_ptr ex, T value)
+  void operator()(Disposition d, T value)
   {
-    result_.ex_ = &ex;
-    result_.value_ = &value;
+    result_.disposition_ = detail::addressof(d);
+    result_.value_ = detail::addressof(value);
     this->resume();
   }
 
   static return_type on_resume(result_type& result)
   {
-    if (*result.ex_)
-      rethrow_exception(*result.ex_);
+    if (*result.disposition_ != no_error)
+    {
+      boost::asio::throw_exception(
+          static_cast<Disposition&&>(*result.disposition_));
+    }
     return static_cast<return_type&&>(*result.value_);
   }
 
@@ -638,12 +513,13 @@ class spawn_handler<Executor, R(exception_ptr, T)>
   result_type& result_;
 };
 
-template <typename Executor, typename R, typename... Ts>
-class spawn_handler<Executor, R(Ts...)>
-  : public spawn_handler_base<Executor>
+template <typename Executor, typename R, typename T, typename... Ts>
+class spawn_handler<Executor, R(T, Ts...),
+    enable_if_t<!is_disposition<T>::value>
+  > : public spawn_handler_base<Executor>
 {
 public:
-  typedef std::tuple<Ts...> return_type;
+  typedef std::tuple<T, Ts...> return_type;
 
   typedef return_type* result_type;
 
@@ -657,7 +533,7 @@ class spawn_handler<Executor, R(Ts...)>
   void operator()(Args&&... args)
   {
     return_type value(static_cast<Args&&>(args)...);
-    result_ = &value;
+    result_ = detail::addressof(value);
     this->resume();
   }
 
@@ -701,7 +577,7 @@ class spawn_handler<Executor, R(boost::system::error_code, Ts...)>
     }
     else
       result_.ec_ = &ec;
-    result_.value_ = &value;
+    result_.value_ = detail::addressof(value);
     this->resume();
   }
 
@@ -716,16 +592,17 @@ class spawn_handler<Executor, R(boost::system::error_code, Ts...)>
   result_type& result_;
 };
 
-template <typename Executor, typename R, typename... Ts>
-class spawn_handler<Executor, R(exception_ptr, Ts...)>
-  : public spawn_handler_base<Executor>
+template <typename Executor, typename R, typename Disposition, typename... Ts>
+class spawn_handler<Executor, R(Disposition, Ts...),
+    enable_if_t<is_disposition<Disposition>::value>
+  > : public spawn_handler_base<Executor>
 {
 public:
   typedef std::tuple<Ts...> return_type;
 
   struct result_type
   {
-    exception_ptr* ex_;
+    Disposition* disposition_;
     return_type* value_;
   };
 
@@ -736,18 +613,21 @@ class spawn_handler<Executor, R(exception_ptr, Ts...)>
   }
 
   template <typename... Args>
-  void operator()(exception_ptr ex, Args&&... args)
+  void operator()(Disposition d, Args&&... args)
   {
     return_type value(static_cast<Args&&>(args)...);
-    result_.ex_ = &ex;
-    result_.value_ = &value;
+    result_.disposition_ = detail::addressof(d);
+    result_.value_ = detail::addressof(value);
     this->resume();
   }
 
   static return_type on_resume(result_type& result)
   {
-    if (*result.ex_)
-      rethrow_exception(*result.ex_);
+    if (*result.disposition_ != no_error)
+    {
+      boost::asio::throw_exception(
+          static_cast<Disposition&&>(*result.disposition_));
+    }
     return static_cast<return_type&&>(*result.value_);
   }
 
@@ -879,12 +759,6 @@ class spawn_entry_point
       throw;
     }
 # endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
-# if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    catch (const boost::coroutines::detail::forced_unwind&)
-    {
-      throw;
-    }
-# endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     catch (...)
     {
       exception_ptr ex = current_exception();
@@ -906,8 +780,9 @@ class spawn_entry_point
       T result(function_(yield));
       if (!yield.spawned_thread_->has_context_switched())
         (post)(yield);
-      detail::binder2<Handler, exception_ptr, T>
-        handler(handler_, exception_ptr(), static_cast<T&&>(result));
+      detail::move_binder2<Handler, exception_ptr, T>
+        handler(0, static_cast<Handler&&>(handler_),
+          exception_ptr(), static_cast<T&&>(result));
       work_.complete(handler, handler.handler_);
     }
 #if !defined(BOOST_ASIO_NO_EXCEPTIONS)
@@ -917,18 +792,13 @@ class spawn_entry_point
       throw;
     }
 # endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
-# if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    catch (const boost::coroutines::detail::forced_unwind&)
-    {
-      throw;
-    }
-# endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     catch (...)
     {
       exception_ptr ex = current_exception();
       if (!yield.spawned_thread_->has_context_switched())
         (post)(yield);
-      detail::binder2<Handler, exception_ptr, T> handler(handler_, ex, T());
+      detail::move_binder2<Handler, exception_ptr, T>
+        handler(0, static_cast<Handler&&>(handler_), ex, T());
       work_.complete(handler, handler.handler_);
     }
 #endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
@@ -976,7 +846,6 @@ class spawn_cancellation_handler
   Executor ex_;
 };
 
-
 template <typename Handler, typename Executor>
 class spawn_cancellation_handler<Handler, Executor,
     enable_if_t<
@@ -1102,14 +971,6 @@ template <typename Executor, typename F,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
       result_of_t<F(basic_yield_context<Executor>)>>::type) CompletionToken>
 inline auto spawn(const Executor& ex, F&& function, CompletionToken&& token,
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    constraint_t<
-      !is_same<
-        decay_t<CompletionToken>,
-        boost::coroutines::attributes
-      >::value
-    >,
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     constraint_t<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
     >)
@@ -1132,14 +993,6 @@ template <typename ExecutionContext, typename F,
       result_of_t<F(basic_yield_context<
         typename ExecutionContext::executor_type>)>>::type) CompletionToken>
 inline auto spawn(ExecutionContext& ctx, F&& function, CompletionToken&& token,
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    constraint_t<
-      !is_same<
-        decay_t<CompletionToken>,
-        boost::coroutines::attributes
-      >::value
-    >,
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     constraint_t<
       is_convertible<ExecutionContext&, execution_context&>::value
     >)
@@ -1162,14 +1015,6 @@ template <typename Executor, typename F,
         CompletionToken>
 inline auto spawn(const basic_yield_context<Executor>& ctx,
     F&& function, CompletionToken&& token,
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    constraint_t<
-      !is_same<
-        decay_t<CompletionToken>,
-        boost::coroutines::attributes
-      >::value
-    >,
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     constraint_t<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
     >)
@@ -1260,140 +1105,6 @@ inline auto spawn(const basic_yield_context<Executor>& ctx, allocator_arg_t,
 
 #endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
 
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-
-namespace detail {
-
-template <typename Executor, typename Function, typename Handler>
-class old_spawn_entry_point
-{
-public:
-  template <typename F, typename H>
-  old_spawn_entry_point(const Executor& ex, F&& f, H&& h)
-    : executor_(ex),
-      function_(static_cast<F&&>(f)),
-      handler_(static_cast<H&&>(h))
-  {
-  }
-
-  void operator()(spawned_thread_base* spawned_thread)
-  {
-    const basic_yield_context<Executor> yield(spawned_thread, executor_);
-    this->call(yield,
-        void_type<result_of_t<Function(basic_yield_context<Executor>)>>());
-  }
-
-private:
-  void call(const basic_yield_context<Executor>& yield, void_type<void>)
-  {
-    function_(yield);
-    static_cast<Handler&&>(handler_)();
-  }
-
-  template <typename T>
-  void call(const basic_yield_context<Executor>& yield, void_type<T>)
-  {
-    static_cast<Handler&&>(handler_)(function_(yield));
-  }
-
-  Executor executor_;
-  Function function_;
-  Handler handler_;
-};
-
-inline void default_spawn_handler() {}
-
-} // namespace detail
-
-template <typename Function>
-inline void spawn(Function&& function,
-    const boost::coroutines::attributes& attributes)
-{
-  associated_executor_t<decay_t<Function>> ex(
-      (get_associated_executor)(function));
-
-  boost::asio::spawn(ex, static_cast<Function&&>(function), attributes);
-}
-
-template <typename Handler, typename Function>
-void spawn(Handler&& handler, Function&& function,
-    const boost::coroutines::attributes& attributes,
-    constraint_t<
-      !is_executor<decay_t<Handler>>::value &&
-      !execution::is_executor<decay_t<Handler>>::value &&
-      !is_convertible<Handler&, execution_context&>::value>)
-{
-  typedef associated_executor_t<decay_t<Handler>> executor_type;
-  executor_type ex((get_associated_executor)(handler));
-
-  (dispatch)(ex,
-      detail::spawned_thread_resumer(
-        detail::spawned_coroutine_thread::spawn(
-          detail::old_spawn_entry_point<executor_type,
-            decay_t<Function>, void (*)()>(
-              ex, static_cast<Function&&>(function),
-              &detail::default_spawn_handler), attributes)));
-}
-
-template <typename Executor, typename Function>
-void spawn(basic_yield_context<Executor> ctx, Function&& function,
-    const boost::coroutines::attributes& attributes)
-{
-  (dispatch)(ctx.get_executor(),
-      detail::spawned_thread_resumer(
-        detail::spawned_coroutine_thread::spawn(
-          detail::old_spawn_entry_point<Executor,
-            decay_t<Function>, void (*)()>(
-              ctx.get_executor(), static_cast<Function&&>(function),
-              &detail::default_spawn_handler), attributes)));
-}
-
-template <typename Function, typename Executor>
-inline void spawn(const Executor& ex, Function&& function,
-    const boost::coroutines::attributes& attributes,
-    constraint_t<
-      is_executor<Executor>::value || execution::is_executor<Executor>::value
-    >)
-{
-  boost::asio::spawn(boost::asio::strand<Executor>(ex),
-      static_cast<Function&&>(function), attributes);
-}
-
-template <typename Function, typename Executor>
-inline void spawn(const strand<Executor>& ex, Function&& function,
-    const boost::coroutines::attributes& attributes)
-{
-  boost::asio::spawn(boost::asio::bind_executor(
-        ex, &detail::default_spawn_handler),
-      static_cast<Function&&>(function), attributes);
-}
-
-#if !defined(BOOST_ASIO_NO_TS_EXECUTORS)
-
-template <typename Function>
-inline void spawn(const boost::asio::io_context::strand& s, Function&& function,
-    const boost::coroutines::attributes& attributes)
-{
-  boost::asio::spawn(boost::asio::bind_executor(
-        s, &detail::default_spawn_handler),
-      static_cast<Function&&>(function), attributes);
-}
-
-#endif // !defined(BOOST_ASIO_NO_TS_EXECUTORS)
-
-template <typename Function, typename ExecutionContext>
-inline void spawn(ExecutionContext& ctx, Function&& function,
-    const boost::coroutines::attributes& attributes,
-    constraint_t<
-      is_convertible<ExecutionContext&, execution_context&>::value
-    >)
-{
-  boost::asio::spawn(ctx.get_executor(),
-      static_cast<Function&&>(function), attributes);
-}
-
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-
 } // namespace asio
 } // namespace boost
 
diff --git a/inst/include/boost/asio/impl/src.hpp b/inst/include/boost/asio/impl/src.hpp
index d692922cd..6c4f996dd 100644
--- a/inst/include/boost/asio/impl/src.hpp
+++ b/inst/include/boost/asio/impl/src.hpp
@@ -2,7 +2,7 @@
 // impl/src.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -22,6 +22,7 @@
 #include <boost/asio/impl/any_completion_executor.ipp>
 #include <boost/asio/impl/any_io_executor.ipp>
 #include <boost/asio/impl/cancellation_signal.ipp>
+#include <boost/asio/impl/config.ipp>
 #include <boost/asio/impl/connect_pipe.ipp>
 #include <boost/asio/impl/error.ipp>
 #include <boost/asio/impl/execution_context.ipp>
diff --git a/inst/include/boost/asio/impl/system_context.hpp b/inst/include/boost/asio/impl/system_context.hpp
index 69adc70ad..e57aa1c36 100644
--- a/inst/include/boost/asio/impl/system_context.hpp
+++ b/inst/include/boost/asio/impl/system_context.hpp
@@ -2,7 +2,7 @@
 // impl/system_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/system_context.ipp b/inst/include/boost/asio/impl/system_context.ipp
index 4f334edcd..d1272d020 100644
--- a/inst/include/boost/asio/impl/system_context.ipp
+++ b/inst/include/boost/asio/impl/system_context.ipp
@@ -2,7 +2,7 @@
 // impl/system_context.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -46,7 +46,7 @@ struct system_context::thread_function
 };
 
 system_context::system_context()
-  : scheduler_(add_scheduler(new detail::scheduler(*this, 0, false)))
+  : scheduler_(add_scheduler(new detail::scheduler(*this, false)))
 {
   scheduler_.work_started();
 
diff --git a/inst/include/boost/asio/impl/system_executor.hpp b/inst/include/boost/asio/impl/system_executor.hpp
index 80ac4b3fc..b544eeae8 100644
--- a/inst/include/boost/asio/impl/system_executor.hpp
+++ b/inst/include/boost/asio/impl/system_executor.hpp
@@ -2,7 +2,7 @@
 // impl/system_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/thread_pool.hpp b/inst/include/boost/asio/impl/thread_pool.hpp
index 9046858df..9066f5097 100644
--- a/inst/include/boost/asio/impl/thread_pool.hpp
+++ b/inst/include/boost/asio/impl/thread_pool.hpp
@@ -2,7 +2,7 @@
 // impl/thread_pool.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/impl/thread_pool.ipp b/inst/include/boost/asio/impl/thread_pool.ipp
index bb7861a17..0fd2972d0 100644
--- a/inst/include/boost/asio/impl/thread_pool.ipp
+++ b/inst/include/boost/asio/impl/thread_pool.ipp
@@ -2,7 +2,7 @@
 // impl/thread_pool.ipp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -60,7 +60,7 @@ inline long default_thread_pool_size()
 } // namespace detail
 
 thread_pool::thread_pool()
-  : scheduler_(add_scheduler(new detail::scheduler(*this, 0, false))),
+  : scheduler_(add_scheduler(new detail::scheduler(*this, false))),
     num_threads_(detail::default_thread_pool_size())
 {
   scheduler_.work_started();
@@ -85,9 +85,23 @@ inline long clamp_thread_pool_size(std::size_t n)
 } // namespace detail
 
 thread_pool::thread_pool(std::size_t num_threads)
-  : scheduler_(add_scheduler(new detail::scheduler(
-          *this, num_threads == 1 ? 1 : 0, false))),
-    num_threads_(detail::clamp_thread_pool_size(num_threads))
+  : execution_context(config_from_concurrency_hint(num_threads == 1 ? 1 : 0)),
+    scheduler_(add_scheduler(new detail::scheduler(*this, false))),
+    num_threads_(detail::clamp_thread_pool_size(num_threads)),
+    joinable_(true)
+{
+  scheduler_.work_started();
+
+  thread_function f = { &scheduler_ };
+  threads_.create_threads(f, static_cast<std::size_t>(num_threads_));
+}
+
+thread_pool::thread_pool(std::size_t num_threads,
+    const execution_context::service_maker& initial_services)
+  : execution_context(initial_services),
+    scheduler_(add_scheduler(new detail::scheduler(*this, false))),
+    num_threads_(detail::clamp_thread_pool_size(num_threads)),
+    joinable_(true)
 {
   scheduler_.work_started();
 
@@ -116,11 +130,12 @@ void thread_pool::attach()
 
 void thread_pool::join()
 {
-  if (num_threads_)
+  if (joinable_)
+  {
+    joinable_ = false;
     scheduler_.work_finished();
-
-  if (!threads_.empty())
     threads_.join();
+  }
 }
 
 detail::scheduler& thread_pool::add_scheduler(detail::scheduler* s)
@@ -132,8 +147,7 @@ detail::scheduler& thread_pool::add_scheduler(detail::scheduler* s)
 
 void thread_pool::wait()
 {
-  scheduler_.work_finished();
-  threads_.join();
+  join();
 }
 
 } // namespace asio
diff --git a/inst/include/boost/asio/impl/use_awaitable.hpp b/inst/include/boost/asio/impl/use_awaitable.hpp
index 311a596e1..15cc18d3b 100644
--- a/inst/include/boost/asio/impl/use_awaitable.hpp
+++ b/inst/include/boost/asio/impl/use_awaitable.hpp
@@ -2,7 +2,7 @@
 // impl/use_awaitable.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +18,7 @@
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/cancellation_signal.hpp>
+#include <boost/asio/disposition.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -74,77 +75,27 @@ class awaitable_handler<Executor>
   }
 };
 
-template <typename Executor>
-class awaitable_handler<Executor, boost::system::error_code>
-  : public awaitable_handler_base<Executor, void>
-{
-public:
-  using awaitable_handler_base<Executor, void>::awaitable_handler_base;
-
-  void operator()(const boost::system::error_code& ec)
-  {
-    this->frame()->attach_thread(this);
-    if (ec)
-      this->frame()->set_error(ec);
-    else
-      this->frame()->return_void();
-    this->frame()->clear_cancellation_slot();
-    this->frame()->pop_frame();
-    this->pump();
-  }
-};
-
-template <typename Executor>
-class awaitable_handler<Executor, std::exception_ptr>
-  : public awaitable_handler_base<Executor, void>
-{
-public:
-  using awaitable_handler_base<Executor, void>::awaitable_handler_base;
-
-  void operator()(std::exception_ptr ex)
-  {
-    this->frame()->attach_thread(this);
-    if (ex)
-      this->frame()->set_except(ex);
-    else
-      this->frame()->return_void();
-    this->frame()->clear_cancellation_slot();
-    this->frame()->pop_frame();
-    this->pump();
-  }
-};
-
 template <typename Executor, typename T>
 class awaitable_handler<Executor, T>
-  : public awaitable_handler_base<Executor, T>
+  : public awaitable_handler_base<Executor,
+      conditional_t<is_disposition<T>::value, void, T>>
 {
 public:
-  using awaitable_handler_base<Executor, T>::awaitable_handler_base;
+  using awaitable_handler_base<Executor,
+    conditional_t<is_disposition<T>::value, void, T>>
+      ::awaitable_handler_base;
 
   template <typename Arg>
   void operator()(Arg&& arg)
   {
     this->frame()->attach_thread(this);
-    this->frame()->return_value(std::forward<Arg>(arg));
-    this->frame()->clear_cancellation_slot();
-    this->frame()->pop_frame();
-    this->pump();
-  }
-};
-
-template <typename Executor, typename T>
-class awaitable_handler<Executor, boost::system::error_code, T>
-  : public awaitable_handler_base<Executor, T>
-{
-public:
-  using awaitable_handler_base<Executor, T>::awaitable_handler_base;
-
-  template <typename Arg>
-  void operator()(const boost::system::error_code& ec, Arg&& arg)
-  {
-    this->frame()->attach_thread(this);
-    if (ec)
-      this->frame()->set_error(ec);
+    if constexpr (is_disposition<T>::value)
+    {
+      if (arg == no_error)
+        this->frame()->return_void();
+      else
+        this->frame()->set_disposition(arg);
+    }
     else
       this->frame()->return_value(std::forward<Arg>(arg));
     this->frame()->clear_cancellation_slot();
@@ -153,84 +104,66 @@ class awaitable_handler<Executor, boost::system::error_code, T>
   }
 };
 
-template <typename Executor, typename T>
-class awaitable_handler<Executor, std::exception_ptr, T>
-  : public awaitable_handler_base<Executor, T>
-{
-public:
-  using awaitable_handler_base<Executor, T>::awaitable_handler_base;
-
-  template <typename Arg>
-  void operator()(std::exception_ptr ex, Arg&& arg)
-  {
-    this->frame()->attach_thread(this);
-    if (ex)
-      this->frame()->set_except(ex);
-    else
-      this->frame()->return_value(std::forward<Arg>(arg));
-    this->frame()->clear_cancellation_slot();
-    this->frame()->pop_frame();
-    this->pump();
-  }
-};
-
-template <typename Executor, typename... Ts>
-class awaitable_handler
-  : public awaitable_handler_base<Executor, std::tuple<Ts...>>
-{
-public:
-  using awaitable_handler_base<Executor,
-    std::tuple<Ts...>>::awaitable_handler_base;
-
-  template <typename... Args>
-  void operator()(Args&&... args)
-  {
-    this->frame()->attach_thread(this);
-    this->frame()->return_values(std::forward<Args>(args)...);
-    this->frame()->clear_cancellation_slot();
-    this->frame()->pop_frame();
-    this->pump();
-  }
-};
-
-template <typename Executor, typename... Ts>
-class awaitable_handler<Executor, boost::system::error_code, Ts...>
-  : public awaitable_handler_base<Executor, std::tuple<Ts...>>
+template <typename Executor, typename T0, typename T1>
+class awaitable_handler<Executor, T0, T1>
+  : public awaitable_handler_base<Executor,
+      conditional_t<is_disposition<T0>::value, T1, std::tuple<T0, T1>>>
 {
 public:
   using awaitable_handler_base<Executor,
-    std::tuple<Ts...>>::awaitable_handler_base;
+    conditional_t<is_disposition<T0>::value, T1, std::tuple<T0, T1>>>
+      ::awaitable_handler_base;
 
-  template <typename... Args>
-  void operator()(const boost::system::error_code& ec, Args&&... args)
+  template <typename Arg0, typename Arg1>
+  void operator()(Arg0&& arg0, Arg1&& arg1)
   {
     this->frame()->attach_thread(this);
-    if (ec)
-      this->frame()->set_error(ec);
+    if constexpr (is_disposition<T0>::value)
+    {
+      if (arg0 == no_error)
+        this->frame()->return_value(std::forward<Arg1>(arg1));
+      else
+        this->frame()->set_disposition(std::forward<Arg0>(arg0));
+    }
     else
-      this->frame()->return_values(std::forward<Args>(args)...);
+    {
+      this->frame()->return_values(std::forward<Arg0>(arg0),
+          std::forward<Arg1>(arg1));
+    }
     this->frame()->clear_cancellation_slot();
     this->frame()->pop_frame();
     this->pump();
   }
 };
 
-template <typename Executor, typename... Ts>
-class awaitable_handler<Executor, std::exception_ptr, Ts...>
-  : public awaitable_handler_base<Executor, std::tuple<Ts...>>
+template <typename Executor, typename T0, typename... Ts>
+class awaitable_handler<Executor, T0, Ts...>
+  : public awaitable_handler_base<Executor,
+      conditional_t<is_disposition<T0>::value,
+        std::tuple<Ts...>, std::tuple<T0, Ts...>>>
 {
 public:
   using awaitable_handler_base<Executor,
-    std::tuple<Ts...>>::awaitable_handler_base;
+      conditional_t<is_disposition<T0>::value,
+        std::tuple<Ts...>, std::tuple<T0, Ts...>>>
+          ::awaitable_handler_base;
 
-  template <typename... Args>
-  void operator()(std::exception_ptr ex, Args&&... args)
+  template <typename Arg0, typename... Args>
+  void operator()(Arg0&& arg0, Args&&... args)
   {
     this->frame()->attach_thread(this);
-    if (ex)
-      this->frame()->set_except(ex);
+    if constexpr (is_disposition<T0>::value)
+    {
+      if (arg0 == no_error)
+        this->frame()->return_values(std::forward<Args>(args)...);
+      else
+        this->frame()->set_disposition(std::forward<Arg0>(arg0));
+    }
     else
-      this->frame()->return_values(std::forward<Args>(args)...);
+    {
+      this->frame()->return_values(std::forward<Arg0>(arg0),
+          std::forward<Args>(args)...);
+    }
     this->frame()->clear_cancellation_slot();
     this->frame()->pop_frame();
     this->pump();
diff --git a/inst/include/boost/asio/impl/use_future.hpp b/inst/include/boost/asio/impl/use_future.hpp
index 89d72e432..4e860b5a9 100644
--- a/inst/include/boost/asio/impl/use_future.hpp
+++ b/inst/include/boost/asio/impl/use_future.hpp
@@ -2,7 +2,7 @@
 // impl/use_future.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,8 +19,9 @@
 #include <tuple>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/memory.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/dispatch.hpp>
-#include <boost/system/error_code.hpp>
+#include <boost/asio/disposition.hpp>
 #include <boost/asio/execution.hpp>
 #include <boost/asio/packaged_task.hpp>
 #include <boost/system/system_error.hpp>
@@ -102,7 +103,7 @@ class promise_invoker
   decay_t<F> f_;
 };
 
-// An executor that adapts the system_executor to capture any exeption thrown
+// An executor that adapts the system_executor to capture any exception thrown
 // by a submitted function object and save it into a promise.
 template <typename T, typename Blocking = execution::blocking_t::possibly_t>
 class promise_executor
@@ -229,36 +230,18 @@ class promise_handler_0
   }
 };
 
-// For completion signature void(error_code).
-class promise_handler_ec_0
+// For completion signature void(disposition auto).
+template <typename Disposition>
+class promise_handler_d_0
   : public promise_creator<void>
 {
 public:
-  void operator()(const boost::system::error_code& ec)
+  void operator()(Disposition d)
   {
-    if (ec)
+    if (d != no_error)
     {
       this->p_->set_exception(
-          std::make_exception_ptr(
-            boost::system::system_error(ec)));
-    }
-    else
-    {
-      this->p_->set_value();
-    }
-  }
-};
-
-// For completion signature void(exception_ptr).
-class promise_handler_ex_0
-  : public promise_creator<void>
-{
-public:
-  void operator()(const std::exception_ptr& ex)
-  {
-    if (ex)
-    {
-      this->p_->set_exception(ex);
+          (to_exception_ptr)(static_cast<Disposition&&>(d)));
     }
     else
     {
@@ -280,44 +263,25 @@ class promise_handler_1
   }
 };
 
-// For completion signature void(error_code, T).
-template <typename T>
-class promise_handler_ec_1
+// For completion signature void(disposition auto, T).
+template <typename Disposition, typename T>
+class promise_handler_d_1
   : public promise_creator<T>
 {
 public:
   template <typename Arg>
-  void operator()(const boost::system::error_code& ec,
-      Arg&& arg)
+  void operator()(Disposition d, Arg&& arg)
   {
-    if (ec)
+    if (d != no_error)
     {
       this->p_->set_exception(
-          std::make_exception_ptr(
-            boost::system::system_error(ec)));
+          (to_exception_ptr)(static_cast<Disposition&&>(d)));
     }
     else
       this->p_->set_value(static_cast<Arg&&>(arg));
   }
 };
 
-// For completion signature void(exception_ptr, T).
-template <typename T>
-class promise_handler_ex_1
-  : public promise_creator<T>
-{
-public:
-  template <typename Arg>
-  void operator()(const std::exception_ptr& ex,
-      Arg&& arg)
-  {
-    if (ex)
-      this->p_->set_exception(ex);
-    else
-      this->p_->set_value(static_cast<Arg&&>(arg));
-  }
-};
-
 // For completion signature void(T1, ..., Tn);
 template <typename T>
 class promise_handler_n
@@ -334,19 +298,18 @@ class promise_handler_n
 };
 
 // For completion signature void(error_code, T1, ..., Tn);
-template <typename T>
-class promise_handler_ec_n
+template <typename Disposition, typename T>
+class promise_handler_d_n
   : public promise_creator<T>
 {
 public:
   template <typename... Args>
-  void operator()(const boost::system::error_code& ec, Args&&... args)
+  void operator()(Disposition d, Args&&... args)
   {
-    if (ec)
+    if (d != no_error)
     {
       this->p_->set_exception(
-          std::make_exception_ptr(
-            boost::system::system_error(ec)));
+          (to_exception_ptr)(static_cast<Disposition&&>(d)));
     }
     else
     {
@@ -357,66 +320,38 @@ class promise_handler_ec_n
   }
 };
 
-// For completion signature void(exception_ptr, T1, ..., Tn);
-template <typename T>
-class promise_handler_ex_n
-  : public promise_creator<T>
-{
-public:
-  template <typename... Args>
-  void operator()(const std::exception_ptr& ex,
-      Args&&... args)
-  {
-    if (ex)
-      this->p_->set_exception(ex);
-    else
-    {
-      this->p_->set_value(
-          std::forward_as_tuple(
-            static_cast<Args&&>(args)...));
-    }
-  }
-};
-
 // Helper template to choose the appropriate concrete promise handler
 // implementation based on the supplied completion signature.
-template <typename> class promise_handler_selector;
+template <typename, typename = void> class promise_handler_selector;
 
 template <>
 class promise_handler_selector<void()>
   : public promise_handler_0 {};
 
-template <>
-class promise_handler_selector<void(boost::system::error_code)>
-  : public promise_handler_ec_0 {};
-
-template <>
-class promise_handler_selector<void(std::exception_ptr)>
-  : public promise_handler_ex_0 {};
-
-template <typename Arg>
-class promise_handler_selector<void(Arg)>
-  : public promise_handler_1<Arg> {};
-
 template <typename Arg>
-class promise_handler_selector<void(boost::system::error_code, Arg)>
-  : public promise_handler_ec_1<Arg> {};
+class promise_handler_selector<void(Arg),
+  enable_if_t<is_disposition<Arg>::value>>
+    : public promise_handler_d_0<Arg> {};
 
 template <typename Arg>
-class promise_handler_selector<void(std::exception_ptr, Arg)>
-  : public promise_handler_ex_1<Arg> {};
-
-template <typename... Arg>
-class promise_handler_selector<void(Arg...)>
-  : public promise_handler_n<std::tuple<Arg...>> {};
-
-template <typename... Arg>
-class promise_handler_selector<void(boost::system::error_code, Arg...)>
-  : public promise_handler_ec_n<std::tuple<Arg...>> {};
-
-template <typename... Arg>
-class promise_handler_selector<void(std::exception_ptr, Arg...)>
-  : public promise_handler_ex_n<std::tuple<Arg...>> {};
+class promise_handler_selector<void(Arg),
+  enable_if_t<!is_disposition<Arg>::value>>
+    : public promise_handler_1<Arg> {};
+
+template <typename Arg0, typename Arg1>
+class promise_handler_selector<void(Arg0, Arg1),
+  enable_if_t<is_disposition<Arg0>::value>>
+    : public promise_handler_d_1<Arg0, Arg1> {};
+
+template <typename Arg0, typename... ArgN>
+class promise_handler_selector<void(Arg0, ArgN...),
+  enable_if_t<!is_disposition<Arg0>::value>>
+    : public promise_handler_n<std::tuple<Arg0, ArgN...>> {};
+
+template <typename Arg0, typename... ArgN>
+class promise_handler_selector<void(Arg0, ArgN...),
+  enable_if_t<is_disposition<Arg0>::value>>
+    : public promise_handler_d_n<Arg0, std::tuple<ArgN...>> {};
 
 // Completion handlers produced from the use_future completion token, when not
 // using use_future::operator().
diff --git a/inst/include/boost/asio/impl/write.hpp b/inst/include/boost/asio/impl/write.hpp
index 597a7313f..ff26e1773 100644
--- a/inst/include/boost/asio/impl/write.hpp
+++ b/inst/include/boost/asio/impl/write.hpp
@@ -2,7 +2,7 @@
 // impl/write.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -63,6 +63,9 @@ inline std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_const_buffer_sequence<ConstBufferSequence>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   return detail::write(s, buffers,
@@ -98,6 +101,9 @@ inline std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_const_buffer_sequence<ConstBufferSequence>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   boost::system::error_code ec;
@@ -119,6 +125,9 @@ std::size_t write(SyncWriteStream& s,
     >,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   decay_t<DynamicBuffer_v1> b(
@@ -173,6 +182,9 @@ inline std::size_t write(SyncWriteStream& s,
     >,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   boost::system::error_code ec;
@@ -190,7 +202,10 @@ template <typename SyncWriteStream, typename Allocator,
     typename CompletionCondition>
 inline std::size_t write(SyncWriteStream& s,
     boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec)
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   return write(s, basic_streambuf_ref<Allocator>(b),
       static_cast<CompletionCondition&&>(completion_condition), ec);
@@ -215,7 +230,10 @@ template <typename SyncWriteStream, typename Allocator,
     typename CompletionCondition>
 inline std::size_t write(SyncWriteStream& s,
     boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition)
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   return write(s, basic_streambuf_ref<Allocator>(b),
       static_cast<CompletionCondition&&>(completion_condition));
@@ -231,6 +249,9 @@ std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   std::size_t bytes_transferred = write(s, buffers.data(0, buffers.size()),
@@ -270,6 +291,9 @@ inline std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    >,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     >)
 {
   boost::system::error_code ec;
@@ -463,49 +487,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncWriteStream,
-    typename ConstBufferSequence, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
-    CompletionCondition completion_condition, WriteToken&& token,
-    constraint_t<
-      is_const_buffer_sequence<ConstBufferSequence>::value
-    >)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write<AsyncWriteStream>>(),
-        token, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write<AsyncWriteStream>(s),
-      token, buffers,
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-template <typename AsyncWriteStream, typename ConstBufferSequence,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s,
-    const ConstBufferSequence& buffers, WriteToken&& token,
-    constraint_t<
-      is_const_buffer_sequence<ConstBufferSequence>::value
-    >)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write<AsyncWriteStream>>(),
-        token, buffers, transfer_all()))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write<AsyncWriteStream>(s),
-      token, buffers, transfer_all());
-}
-
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
 namespace detail
@@ -650,101 +631,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncWriteStream, typename DynamicBuffer_v1,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s,
-    DynamicBuffer_v1&& buffers, WriteToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers),
-        transfer_all()))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers),
-      transfer_all());
-}
-
-template <typename AsyncWriteStream,
-    typename DynamicBuffer_v1, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
-    CompletionCondition completion_condition, WriteToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
-    >,
-    constraint_t<
-      !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
-    >)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
-      token, static_cast<DynamicBuffer_v1&&>(buffers),
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-#if !defined(BOOST_ASIO_NO_EXTENSIONS)
-#if !defined(BOOST_ASIO_NO_IOSTREAM)
-
-template <typename AsyncWriteStream, typename Allocator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s,
-    boost::asio::basic_streambuf<Allocator>& b,
-    WriteToken&& token)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), transfer_all()))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
-      token, basic_streambuf_ref<Allocator>(b), transfer_all());
-}
-
-template <typename AsyncWriteStream,
-    typename Allocator, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s,
-    boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, WriteToken&& token)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
-        token, basic_streambuf_ref<Allocator>(b),
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
-      token, basic_streambuf_ref<Allocator>(b),
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-#endif // !defined(BOOST_ASIO_NO_IOSTREAM)
-#endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 #endif // !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
 namespace detail
@@ -888,51 +774,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncWriteStream, typename DynamicBuffer_v2,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s,
-    DynamicBuffer_v2 buffers, WriteToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers),
-        transfer_all()))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers),
-      transfer_all());
-}
-
-template <typename AsyncWriteStream,
-    typename DynamicBuffer_v2, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
-    CompletionCondition completion_condition, WriteToken&& token,
-    constraint_t<
-      is_dynamic_buffer_v2<DynamicBuffer_v2>::value
-    >)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>(s),
-      token, static_cast<DynamicBuffer_v2&&>(buffers),
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
 } // namespace asio
 } // namespace boost
 
diff --git a/inst/include/boost/asio/impl/write_at.hpp b/inst/include/boost/asio/impl/write_at.hpp
index 0ba948b20..faa0ed2cc 100644
--- a/inst/include/boost/asio/impl/write_at.hpp
+++ b/inst/include/boost/asio/impl/write_at.hpp
@@ -2,7 +2,7 @@
 // impl/write_at.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -65,7 +65,10 @@ template <typename SyncRandomAccessWriteDevice, typename ConstBufferSequence,
     typename CompletionCondition>
 std::size_t write_at(SyncRandomAccessWriteDevice& d,
     uint64_t offset, const ConstBufferSequence& buffers,
-    CompletionCondition completion_condition, boost::system::error_code& ec)
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   return detail::write_at_buffer_sequence(d, offset, buffers,
       boost::asio::buffer_sequence_begin(buffers),
@@ -95,7 +98,10 @@ template <typename SyncRandomAccessWriteDevice, typename ConstBufferSequence,
     typename CompletionCondition>
 inline std::size_t write_at(SyncRandomAccessWriteDevice& d,
     uint64_t offset, const ConstBufferSequence& buffers,
-    CompletionCondition completion_condition)
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   boost::system::error_code ec;
   std::size_t bytes_transferred = write_at(d, offset, buffers,
@@ -111,7 +117,10 @@ template <typename SyncRandomAccessWriteDevice, typename Allocator,
     typename CompletionCondition>
 std::size_t write_at(SyncRandomAccessWriteDevice& d,
     uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec)
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   std::size_t bytes_transferred = write_at(d, offset, b.data(),
       static_cast<CompletionCondition&&>(completion_condition), ec);
@@ -141,7 +150,10 @@ template <typename SyncRandomAccessWriteDevice, typename Allocator,
     typename CompletionCondition>
 inline std::size_t write_at(SyncRandomAccessWriteDevice& d,
     uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition)
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    >)
 {
   boost::system::error_code ec;
   std::size_t bytes_transferred = write_at(d, offset, b,
@@ -345,46 +357,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncRandomAccessWriteDevice,
-    typename ConstBufferSequence, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
-    uint64_t offset, const ConstBufferSequence& buffers,
-    CompletionCondition completion_condition, WriteToken&& token)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_at<
-          AsyncRandomAccessWriteDevice>>(),
-        token, offset, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_at<AsyncRandomAccessWriteDevice>(d),
-      token, offset, buffers,
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-template <typename AsyncRandomAccessWriteDevice, typename ConstBufferSequence,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
-    uint64_t offset, const ConstBufferSequence& buffers, WriteToken&& token)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_at<
-          AsyncRandomAccessWriteDevice>>(),
-        token, offset, buffers, transfer_all()))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_at<AsyncRandomAccessWriteDevice>(d),
-      token, offset, buffers, transfer_all());
-}
-
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
@@ -499,49 +471,6 @@ struct associator<Associator,
 
 #endif // !defined(GENERATING_DOCUMENTATION)
 
-template <typename AsyncRandomAccessWriteDevice,
-    typename Allocator, typename CompletionCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
-    uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, WriteToken&& token)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_at_streambuf<
-          AsyncRandomAccessWriteDevice>>(),
-        token, offset, &b,
-        static_cast<CompletionCondition&&>(completion_condition)))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_at_streambuf<
-        AsyncRandomAccessWriteDevice>(d),
-      token, offset, &b,
-      static_cast<CompletionCondition&&>(completion_condition));
-}
-
-template <typename AsyncRandomAccessWriteDevice, typename Allocator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
-    uint64_t offset, boost::asio::basic_streambuf<Allocator>& b,
-    WriteToken&& token)
-  -> decltype(
-    async_initiate<WriteToken,
-      void (boost::system::error_code, std::size_t)>(
-        declval<detail::initiate_async_write_at_streambuf<
-          AsyncRandomAccessWriteDevice>>(),
-        token, offset, &b, transfer_all()))
-{
-  return async_initiate<WriteToken,
-    void (boost::system::error_code, std::size_t)>(
-      detail::initiate_async_write_at_streambuf<
-        AsyncRandomAccessWriteDevice>(d),
-      token, offset, &b, transfer_all());
-}
-
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 
diff --git a/inst/include/boost/asio/io_context.hpp b/inst/include/boost/asio/io_context.hpp
index 23551026e..544450175 100644
--- a/inst/include/boost/asio/io_context.hpp
+++ b/inst/include/boost/asio/io_context.hpp
@@ -2,7 +2,7 @@
 // io_context.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -198,11 +198,6 @@ class io_context
   friend class detail::win_iocp_overlapped_ptr;
 #endif
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  struct initiate_dispatch;
-  struct initiate_post;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 public:
   template <typename Allocator, uintptr_t Bits>
   class basic_executor_type;
@@ -213,11 +208,6 @@ class io_context
   /// Executor used to submit functions to an io_context.
   typedef basic_executor_type<std::allocator<void>, 0> executor_type;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  class work;
-  friend class work;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   class service;
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS) \
@@ -241,6 +231,17 @@ class io_context
    */
   BOOST_ASIO_DECL explicit io_context(int concurrency_hint);
 
+  /// Constructor.
+  /**
+   * Construct with a service maker, to create an initial set of services that
+   * will be installed into the execution context at construction time.
+   *
+   * @param initial_services Used to create the initial services. The @c make
+   * function will be called once at the end of execution_context construction.
+   */
+  BOOST_ASIO_DECL explicit io_context(
+      const execution_context::service_maker& initial_services);
+
   /// Destructor.
   /**
    * On destruction, the io_context performs the following sequence of
@@ -298,45 +299,13 @@ class io_context
    * @note Calling the run() function from a thread that is currently calling
    * one of run(), run_one(), run_for(), run_until(), poll() or poll_one() on
    * the same io_context object may introduce the potential for deadlock. It is
-   * the caller's reponsibility to avoid this.
+   * the caller's responsibility to avoid this.
    *
    * The poll() function may also be used to dispatch ready handlers, but
    * without blocking.
    */
   BOOST_ASIO_DECL count_type run();
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Run the io_context object's
-  /// event processing loop.
-  /**
-   * The run() function blocks until all work has finished and there are no
-   * more handlers to be dispatched, or until the io_context has been stopped.
-   *
-   * Multiple threads may call the run() function to set up a pool of threads
-   * from which the io_context may execute handlers. All threads that are
-   * waiting in the pool are equivalent and the io_context may choose any one
-   * of them to invoke a handler.
-   *
-   * A normal exit from the run() function implies that the io_context object
-   * is stopped (the stopped() function returns @c true). Subsequent calls to
-   * run(), run_one(), poll() or poll_one() will return immediately unless there
-   * is a prior call to restart().
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of handlers that were executed.
-   *
-   * @note Calling the run() function from a thread that is currently calling
-   * one of run(), run_one(), run_for(), run_until(), poll() or poll_one() on
-   * the same io_context object may introduce the potential for deadlock. It is
-   * the caller's reponsibility to avoid this.
-   *
-   * The poll() function may also be used to dispatch ready handlers, but
-   * without blocking.
-   */
-  BOOST_ASIO_DECL count_type run(boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Run the io_context object's event processing loop for a specified
   /// duration.
   /**
@@ -379,33 +348,10 @@ class io_context
    * @note Calling the run_one() function from a thread that is currently
    * calling one of run(), run_one(), run_for(), run_until(), poll() or
    * poll_one() on the same io_context object may introduce the potential for
-   * deadlock. It is the caller's reponsibility to avoid this.
+   * deadlock. It is the caller's responsibility to avoid this.
    */
   BOOST_ASIO_DECL count_type run_one();
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Run the io_context object's
-  /// event processing loop to execute at most one handler.
-  /**
-   * The run_one() function blocks until one handler has been dispatched, or
-   * until the io_context has been stopped.
-   *
-   * @return The number of handlers that were executed. A zero return value
-   * implies that the io_context object is stopped (the stopped() function
-   * returns @c true). Subsequent calls to run(), run_one(), poll() or
-   * poll_one() will return immediately unless there is a prior call to
-   * restart().
-   *
-   * @return The number of handlers that were executed.
-   *
-   * @note Calling the run_one() function from a thread that is currently
-   * calling one of run(), run_one(), run_for(), run_until(), poll() or
-   * poll_one() on the same io_context object may introduce the potential for
-   * deadlock. It is the caller's reponsibility to avoid this.
-   */
-  BOOST_ASIO_DECL count_type run_one(boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Run the io_context object's event processing loop for a specified duration
   /// to execute at most one handler.
   /**
@@ -445,20 +391,6 @@ class io_context
    */
   BOOST_ASIO_DECL count_type poll();
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Run the io_context object's
-  /// event processing loop to execute ready handlers.
-  /**
-   * The poll() function runs handlers that are ready to run, without blocking,
-   * until the io_context has been stopped or there are no more ready handlers.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of handlers that were executed.
-   */
-  BOOST_ASIO_DECL count_type poll(boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Run the io_context object's event processing loop to execute one ready
   /// handler.
   /**
@@ -469,20 +401,6 @@ class io_context
    */
   BOOST_ASIO_DECL count_type poll_one();
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use non-error_code overload.) Run the io_context object's
-  /// event processing loop to execute one ready handler.
-  /**
-   * The poll_one() function runs at most one handler that is ready to run,
-   * without blocking.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @return The number of handlers that were executed.
-   */
-  BOOST_ASIO_DECL count_type poll_one(boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Stop the io_context object's event processing loop.
   /**
    * This function does not block, but instead simply signals the io_context to
@@ -518,77 +436,6 @@ class io_context
   BOOST_ASIO_DECL void restart();
 
 #if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use restart().) Reset the io_context in preparation for a
-  /// subsequent run() invocation.
-  /**
-   * This function must be called prior to any second or later set of
-   * invocations of the run(), run_one(), poll() or poll_one() functions when a
-   * previous invocation of these functions returned due to the io_context
-   * being stopped or running out of work. After a call to restart(), the
-   * io_context object's stopped() function will return @c false.
-   *
-   * This function must not be called while there are any unfinished calls to
-   * the run(), run_one(), poll() or poll_one() functions.
-   */
-  void reset();
-
-  /// (Deprecated: Use boost::asio::dispatch().) Request the io_context to
-  /// invoke the given handler.
-  /**
-   * This function is used to ask the io_context to execute the given handler.
-   *
-   * The io_context guarantees that the handler will only be called in a thread
-   * in which the run(), run_one(), poll() or poll_one() member functions is
-   * currently being invoked. The handler may be executed inside this function
-   * if the guarantee can be met.
-   *
-   * @param handler The handler to be called. The io_context will make
-   * a copy of the handler object as required. The function signature of the
-   * handler must be: @code void handler(); @endcode
-   *
-   * @note This function throws an exception only if:
-   *
-   * @li the handler's associated allocator; or
-   *
-   * @li the handler's copy constructor
-   *
-   * throws an exception.
-   */
-  template <typename LegacyCompletionHandler>
-  auto dispatch(LegacyCompletionHandler&& handler)
-    -> decltype(
-      async_initiate<LegacyCompletionHandler, void ()>(
-        declval<initiate_dispatch>(), handler, this));
-
-  /// (Deprecated: Use boost::asio::post().) Request the io_context to invoke
-  /// the given handler and return immediately.
-  /**
-   * This function is used to ask the io_context to execute the given handler,
-   * but without allowing the io_context to call the handler from inside this
-   * function.
-   *
-   * The io_context guarantees that the handler will only be called in a thread
-   * in which the run(), run_one(), poll() or poll_one() member functions is
-   * currently being invoked.
-   *
-   * @param handler The handler to be called. The io_context will make
-   * a copy of the handler object as required. The function signature of the
-   * handler must be: @code void handler(); @endcode
-   *
-   * @note This function throws an exception only if:
-   *
-   * @li the handler's associated allocator; or
-   *
-   * @li the handler's copy constructor
-   *
-   * throws an exception.
-   */
-  template <typename LegacyCompletionHandler>
-  auto post(LegacyCompletionHandler&& handler)
-    -> decltype(
-      async_initiate<LegacyCompletionHandler, void ()>(
-        declval<initiate_post>(), handler, this));
-
   /// (Deprecated: Use boost::asio::bind_executor().) Create a new handler that
   /// automatically dispatches the wrapped handler on the io_context.
   /**
@@ -609,7 +456,8 @@ class io_context
    * then the return value is a function object with the signature
    * @code void g(A1 a1, ... An an); @endcode
    * that, when invoked, executes code equivalent to:
-   * @code io_context.dispatch(boost::bind(f, a1, ... an)); @endcode
+   * @code boost::asio::dispatch(io_context,
+   *     boost::bind(f, a1, ... an)); @endcode
    */
   template <typename Handler>
 #if defined(GENERATING_DOCUMENTATION)
@@ -643,10 +491,6 @@ class io_context
   impl_type& impl_;
 };
 
-namespace detail {
-
-} // namespace detail
-
 /// Executor implementation type used to submit functions to an io_context.
 template <typename Allocator, uintptr_t Bits>
 class io_context::basic_executor_type :
@@ -1101,57 +945,6 @@ class io_context::basic_executor_type :
   uintptr_t target_;
 };
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// (Deprecated: Use executor_work_guard.) Class to inform the io_context when
-/// it has work to do.
-/**
- * The work class is used to inform the io_context when work starts and
- * finishes. This ensures that the io_context object's run() function will not
- * exit while work is underway, and that it does exit when there is no
- * unfinished work remaining.
- *
- * The work class is copy-constructible so that it may be used as a data member
- * in a handler class. It is not assignable.
- */
-class io_context::work
-{
-public:
-  /// Constructor notifies the io_context that work is starting.
-  /**
-   * The constructor is used to inform the io_context that some work has begun.
-   * This ensures that the io_context object's run() function will not exit
-   * while the work is underway.
-   */
-  explicit work(boost::asio::io_context& io_context);
-
-  /// Copy constructor notifies the io_context that work is starting.
-  /**
-   * The constructor is used to inform the io_context that some work has begun.
-   * This ensures that the io_context object's run() function will not exit
-   * while the work is underway.
-   */
-  work(const work& other);
-
-  /// Destructor notifies the io_context that the work is complete.
-  /**
-   * The destructor is used to inform the io_context that some work has
-   * finished. Once the count of unfinished work reaches zero, the io_context
-   * object's run() function is permitted to exit.
-   */
-  ~work();
-
-  /// Get the io_context associated with the work.
-  boost::asio::io_context& get_io_context();
-
-private:
-  // Prevent assignment.
-  void operator=(const work& other);
-
-  // The io_context implementation.
-  detail::io_context_impl& io_context_impl_;
-};
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 /// Base class for all io_context services.
 class io_context::service
   : public execution_context::service
@@ -1164,12 +957,6 @@ class io_context::service
   /// Destroy all user-defined handler objects owned by the service.
   BOOST_ASIO_DECL virtual void shutdown();
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use shutdown().) Destroy all user-defined handler objects
-  /// owned by the service.
-  BOOST_ASIO_DECL virtual void shutdown_service();
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Handle notification of a fork-related event to perform any necessary
   /// housekeeping.
   /**
@@ -1179,17 +966,6 @@ class io_context::service
   BOOST_ASIO_DECL virtual void notify_fork(
       execution_context::fork_event event);
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use notify_fork().) Handle notification of a fork-related
-  /// event to perform any necessary housekeeping.
-  /**
-   * This function is not a pure virtual so that services only have to
-   * implement it if necessary. The default implementation does nothing.
-   */
-  BOOST_ASIO_DECL virtual void fork_service(
-      execution_context::fork_event event);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 protected:
   /// Constructor.
   /**
diff --git a/inst/include/boost/asio/io_context_strand.hpp b/inst/include/boost/asio/io_context_strand.hpp
index d077d0ee6..bc0551c0f 100644
--- a/inst/include/boost/asio/io_context_strand.hpp
+++ b/inst/include/boost/asio/io_context_strand.hpp
@@ -2,7 +2,7 @@
 // io_context_strand.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -55,18 +55,18 @@ namespace asio {
  * if any of the following conditions are true:
  *
  * @li @c s.post(a) happens-before @c s.post(b)
- * 
+ *
  * @li @c s.post(a) happens-before @c s.dispatch(b), where the latter is
  * performed outside the strand
- * 
+ *
  * @li @c s.dispatch(a) happens-before @c s.post(b), where the former is
  * performed outside the strand
- * 
+ *
  * @li @c s.dispatch(a) happens-before @c s.dispatch(b), where both are
  * performed outside the strand
- *   
+ *
  * then @c a() happens-before @c b()
- * 
+ *
  * Note that in the following case:
  * @code async_op_1(..., s.wrap(a));
  * async_op_2(..., s.wrap(b)); @endcode
@@ -88,12 +88,6 @@ namespace asio {
  */
 class io_context::strand
 {
-private:
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  struct initiate_dispatch;
-  struct initiate_post;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 public:
   /// Constructor.
   /**
@@ -109,6 +103,17 @@ class io_context::strand
     service_.construct(impl_);
   }
 
+  /// Copy constructor.
+  /**
+   * Creates a copy such that both strand objects share the same underlying
+   * state.
+   */
+  strand(const strand& other) noexcept
+    : service_(other.service_),
+      impl_(other.impl_)
+  {
+  }
+
   /// Destructor.
   /**
    * Destroys a strand.
@@ -167,38 +172,6 @@ class io_context::strand
     (void)a;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use boost::asio::dispatch().) Request the strand to invoke
-  /// the given handler.
-  /**
-   * This function is used to ask the strand to execute the given handler.
-   *
-   * The strand object guarantees that handlers posted or dispatched through
-   * the strand will not be executed concurrently. The handler may be executed
-   * inside this function if the guarantee can be met. If this function is
-   * called from within a handler that was posted or dispatched through the same
-   * strand, then the new handler will be executed immediately.
-   *
-   * The strand's guarantee is in addition to the guarantee provided by the
-   * underlying io_context. The io_context guarantees that the handler will only
-   * be called in a thread in which the io_context's run member function is
-   * currently being invoked.
-   *
-   * @param handler The handler to be called. The strand will make a copy of the
-   * handler object as required. The function signature of the handler must be:
-   * @code void handler(); @endcode
-   */
-  template <typename LegacyCompletionHandler>
-  auto dispatch(LegacyCompletionHandler&& handler)
-    -> decltype(
-      async_initiate<LegacyCompletionHandler, void ()>(
-        declval<initiate_dispatch>(), handler, this))
-  {
-    return async_initiate<LegacyCompletionHandler, void ()>(
-        initiate_dispatch(), handler, this);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Request the strand to invoke the given function object.
   /**
    * This function is used to ask the executor to execute the given function
@@ -220,34 +193,6 @@ class io_context::strand
     (void)a;
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use boost::asio::post().) Request the strand to invoke the
-  /// given handler and return immediately.
-  /**
-   * This function is used to ask the strand to execute the given handler, but
-   * without allowing the strand to call the handler from inside this function.
-   *
-   * The strand object guarantees that handlers posted or dispatched through
-   * the strand will not be executed concurrently. The strand's guarantee is in
-   * addition to the guarantee provided by the underlying io_context. The
-   * io_context guarantees that the handler will only be called in a thread in
-   * which the io_context's run member function is currently being invoked.
-   *
-   * @param handler The handler to be called. The strand will make a copy of the
-   * handler object as required. The function signature of the handler must be:
-   * @code void handler(); @endcode
-   */
-  template <typename LegacyCompletionHandler>
-  auto post(LegacyCompletionHandler&& handler)
-    -> decltype(
-      async_initiate<LegacyCompletionHandler, void ()>(
-        declval<initiate_post>(), handler, this))
-  {
-    return async_initiate<LegacyCompletionHandler, void ()>(
-        initiate_post(), handler, this);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Request the strand to invoke the given function object.
   /**
    * This function is used to ask the executor to execute the given function
@@ -289,7 +234,7 @@ class io_context::strand
    * then the return value is a function object with the signature
    * @code void g(A1 a1, ... An an); @endcode
    * that, when invoked, executes code equivalent to:
-   * @code strand.dispatch(boost::bind(f, a1, ... an)); @endcode
+   * @code boost::asio::dispatch(strand, boost::bind(f, a1, ... an)); @endcode
    */
   template <typename Handler>
 #if defined(GENERATING_DOCUMENTATION)
@@ -336,42 +281,6 @@ class io_context::strand
   }
 
 private:
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  struct initiate_dispatch
-  {
-    template <typename LegacyCompletionHandler>
-    void operator()(LegacyCompletionHandler&& handler,
-        strand* self) const
-    {
-      // If you get an error on the following line it means that your
-      // handler does not meet the documented type requirements for a
-      // LegacyCompletionHandler.
-      BOOST_ASIO_LEGACY_COMPLETION_HANDLER_CHECK(
-          LegacyCompletionHandler, handler) type_check;
-
-      detail::non_const_lvalue<LegacyCompletionHandler> handler2(handler);
-      self->service_.dispatch(self->impl_, handler2.value);
-    }
-  };
-
-  struct initiate_post
-  {
-    template <typename LegacyCompletionHandler>
-    void operator()(LegacyCompletionHandler&& handler,
-        strand* self) const
-    {
-      // If you get an error on the following line it means that your
-      // handler does not meet the documented type requirements for a
-      // LegacyCompletionHandler.
-      BOOST_ASIO_LEGACY_COMPLETION_HANDLER_CHECK(
-          LegacyCompletionHandler, handler) type_check;
-
-      detail::non_const_lvalue<LegacyCompletionHandler> handler2(handler);
-      self->service_.post(self->impl_, handler2.value);
-    }
-  };
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   boost::asio::detail::strand_service& service_;
   mutable boost::asio::detail::strand_service::implementation_type impl_;
 };
diff --git a/inst/include/boost/asio/io_service.hpp b/inst/include/boost/asio/io_service.hpp
deleted file mode 100644
index 326293683..000000000
--- a/inst/include/boost/asio/io_service.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// io_service.hpp
-// ~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_IO_SERVICE_HPP
-#define BOOST_ASIO_IO_SERVICE_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/io_context.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-
-namespace boost {
-namespace asio {
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-/// Typedef for backwards compatibility.
-typedef io_context io_service;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-} // namespace asio
-} // namespace boost
-
-#include <boost/asio/detail/pop_options.hpp>
-
-#endif // BOOST_ASIO_IO_SERVICE_HPP
diff --git a/inst/include/boost/asio/io_service_strand.hpp b/inst/include/boost/asio/io_service_strand.hpp
deleted file mode 100644
index f4a6d6e04..000000000
--- a/inst/include/boost/asio/io_service_strand.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// io_service_strand.hpp
-// ~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_IO_SERVICE_STRAND_HPP
-#define BOOST_ASIO_IO_SERVICE_STRAND_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/io_context_strand.hpp>
-
-#endif // BOOST_ASIO_IO_SERVICE_STRAND_HPP
diff --git a/inst/include/boost/asio/ip/address.hpp b/inst/include/boost/asio/ip/address.hpp
index 7e2a1f4ba..c52f277f2 100644
--- a/inst/include/boost/asio/ip/address.hpp
+++ b/inst/include/boost/asio/ip/address.hpp
@@ -2,7 +2,7 @@
 // ip/address.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -100,32 +100,6 @@ class address
   /// Get the address as a string.
   BOOST_ASIO_DECL std::string to_string() const;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use other overload.) Get the address as a string.
-  BOOST_ASIO_DECL std::string to_string(boost::system::error_code& ec) const;
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(const char* str);
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(const char* str, boost::system::error_code& ec);
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(const std::string& str);
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(
-      const std::string& str, boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Determine whether the address is a loopback address.
   BOOST_ASIO_DECL bool is_loopback() const noexcept;
 
diff --git a/inst/include/boost/asio/ip/address_v4.hpp b/inst/include/boost/asio/ip/address_v4.hpp
index bc24c1f03..f81b1e89c 100644
--- a/inst/include/boost/asio/ip/address_v4.hpp
+++ b/inst/include/boost/asio/ip/address_v4.hpp
@@ -2,7 +2,7 @@
 // ip/address_v4.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -121,39 +121,9 @@ class address_v4
   /// Get the address as an unsigned integer in host byte order.
   BOOST_ASIO_DECL uint_type to_uint() const noexcept;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use to_uint().) Get the address as an unsigned long in host
-  /// byte order.
-  BOOST_ASIO_DECL unsigned long to_ulong() const;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Get the address as a string in dotted decimal format.
   BOOST_ASIO_DECL std::string to_string() const;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use other overload.) Get the address as a string in dotted
-  /// decimal format.
-  BOOST_ASIO_DECL std::string to_string(boost::system::error_code& ec) const;
-
-  /// (Deprecated: Use make_address_v4().) Create an address from an IP address
-  /// string in dotted decimal form.
-  static address_v4 from_string(const char* str);
-
-  /// (Deprecated: Use make_address_v4().) Create an address from an IP address
-  /// string in dotted decimal form.
-  static address_v4 from_string(
-      const char* str, boost::system::error_code& ec);
-
-  /// (Deprecated: Use make_address_v4().) Create an address from an IP address
-  /// string in dotted decimal form.
-  static address_v4 from_string(const std::string& str);
-
-  /// (Deprecated: Use make_address_v4().) Create an address from an IP address
-  /// string in dotted decimal form.
-  static address_v4 from_string(
-      const std::string& str, boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Determine whether the address is a loopback address.
   /**
    * This function tests whether the address is in the address block
@@ -173,20 +143,6 @@ class address_v4
    */
   BOOST_ASIO_DECL bool is_unspecified() const noexcept;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use network_v4 class.) Determine whether the address is a
-  /// class A address.
-  BOOST_ASIO_DECL bool is_class_a() const;
-
-  /// (Deprecated: Use network_v4 class.) Determine whether the address is a
-  /// class B address.
-  BOOST_ASIO_DECL bool is_class_b() const;
-
-  /// (Deprecated: Use network_v4 class.) Determine whether the address is a
-  /// class C address.
-  BOOST_ASIO_DECL bool is_class_c() const;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Determine whether the address is a multicast address.
   /**
    * This function tests whether the address is in the multicast address block
@@ -295,18 +251,6 @@ class address_v4
     return address_v4(0xFFFFFFFF);
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use network_v4 class.) Obtain an address object that
-  /// represents the broadcast address that corresponds to the specified
-  /// address and netmask.
-  BOOST_ASIO_DECL static address_v4 broadcast(
-      const address_v4& addr, const address_v4& mask);
-
-  /// (Deprecated: Use network_v4 class.) Obtain the netmask that corresponds
-  /// to the address, based on its address class.
-  BOOST_ASIO_DECL static address_v4 netmask(const address_v4& addr);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 private:
   // The underlying IPv4 address.
   boost::asio::detail::in4_addr_type addr_;
diff --git a/inst/include/boost/asio/ip/address_v4_iterator.hpp b/inst/include/boost/asio/ip/address_v4_iterator.hpp
index b5cf18968..38dc8cfc0 100644
--- a/inst/include/boost/asio/ip/address_v4_iterator.hpp
+++ b/inst/include/boost/asio/ip/address_v4_iterator.hpp
@@ -2,7 +2,7 @@
 // ip/address_v4_iterator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/address_v4_range.hpp b/inst/include/boost/asio/ip/address_v4_range.hpp
index 60861c41b..f97e5f626 100644
--- a/inst/include/boost/asio/ip/address_v4_range.hpp
+++ b/inst/include/boost/asio/ip/address_v4_range.hpp
@@ -2,7 +2,7 @@
 // ip/address_v4_range.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/address_v6.hpp b/inst/include/boost/asio/ip/address_v6.hpp
index 9a52b916d..0946b5bc5 100644
--- a/inst/include/boost/asio/ip/address_v6.hpp
+++ b/inst/include/boost/asio/ip/address_v6.hpp
@@ -2,7 +2,7 @@
 // ip/address_v6.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -124,33 +124,6 @@ class address_v6
   /// Get the address as a string.
   BOOST_ASIO_DECL std::string to_string() const;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use other overload.) Get the address as a string.
-  BOOST_ASIO_DECL std::string to_string(boost::system::error_code& ec) const;
-
-  /// (Deprecated: Use make_address_v6().) Create an IPv6 address from an IP
-  /// address string.
-  static address_v6 from_string(const char* str);
-
-  /// (Deprecated: Use make_address_v6().) Create an IPv6 address from an IP
-  /// address string.
-  static address_v6 from_string(
-      const char* str, boost::system::error_code& ec);
-
-  /// (Deprecated: Use make_address_v6().) Create an IPv6 address from an IP
-  /// address string.
-  static address_v6 from_string(const std::string& str);
-
-  /// (Deprecated: Use make_address_v6().) Create an IPv6 address from an IP
-  /// address string.
-  static address_v6 from_string(
-      const std::string& str, boost::system::error_code& ec);
-
-  /// (Deprecated: Use make_address_v4().) Converts an IPv4-mapped or
-  /// IPv4-compatible address to an IPv4 address.
-  BOOST_ASIO_DECL address_v4 to_v4() const;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Determine whether the address is a loopback address.
   /**
    * This function tests whether the address is the loopback address
@@ -174,12 +147,6 @@ class address_v6
   /// Determine whether the address is a mapped IPv4 address.
   BOOST_ASIO_DECL bool is_v4_mapped() const noexcept;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: No replacement.) Determine whether the address is an
-  /// IPv4-compatible address.
-  BOOST_ASIO_DECL bool is_v4_compatible() const;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Determine whether the address is a multicast address.
   BOOST_ASIO_DECL bool is_multicast() const noexcept;
 
@@ -253,14 +220,6 @@ class address_v6
    */
   BOOST_ASIO_DECL static address_v6 loopback() noexcept;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use make_address_v6().) Create an IPv4-mapped IPv6 address.
-  BOOST_ASIO_DECL static address_v6 v4_mapped(const address_v4& addr);
-
-  /// (Deprecated: No replacement.) Create an IPv4-compatible IPv6 address.
-  BOOST_ASIO_DECL static address_v6 v4_compatible(const address_v4& addr);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 private:
   friend class basic_address_iterator<address_v6>;
 
diff --git a/inst/include/boost/asio/ip/address_v6_iterator.hpp b/inst/include/boost/asio/ip/address_v6_iterator.hpp
index c2c25fa7d..4c96bc9e7 100644
--- a/inst/include/boost/asio/ip/address_v6_iterator.hpp
+++ b/inst/include/boost/asio/ip/address_v6_iterator.hpp
@@ -2,7 +2,7 @@
 // ip/address_v6_iterator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //                         Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/address_v6_range.hpp b/inst/include/boost/asio/ip/address_v6_range.hpp
index 0eb6c0058..8fc44b5e6 100644
--- a/inst/include/boost/asio/ip/address_v6_range.hpp
+++ b/inst/include/boost/asio/ip/address_v6_range.hpp
@@ -2,7 +2,7 @@
 // ip/address_v6_range.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //                         Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/bad_address_cast.hpp b/inst/include/boost/asio/ip/bad_address_cast.hpp
index a354fbb89..b976135d8 100644
--- a/inst/include/boost/asio/ip/bad_address_cast.hpp
+++ b/inst/include/boost/asio/ip/bad_address_cast.hpp
@@ -2,7 +2,7 @@
 // ip/bad_address_cast.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/basic_endpoint.hpp b/inst/include/boost/asio/ip/basic_endpoint.hpp
index 41e98834d..cc5bdc50c 100644
--- a/inst/include/boost/asio/ip/basic_endpoint.hpp
+++ b/inst/include/boost/asio/ip/basic_endpoint.hpp
@@ -2,7 +2,7 @@
 // ip/basic_endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/basic_resolver.hpp b/inst/include/boost/asio/ip/basic_resolver.hpp
index 43901ad1b..2b9eb3771 100644
--- a/inst/include/boost/asio/ip/basic_resolver.hpp
+++ b/inst/include/boost/asio/ip/basic_resolver.hpp
@@ -2,7 +2,7 @@
 // ip/basic_resolver.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -86,14 +86,6 @@ class basic_resolver
   /// The endpoint type.
   typedef typename InternetProtocol::endpoint endpoint_type;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated.) The query type.
-  typedef basic_resolver_query<InternetProtocol> query;
-
-  /// (Deprecated.) The iterator type.
-  typedef basic_resolver_iterator<InternetProtocol> iterator;
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// The results type.
   typedef basic_resolver_results<InternetProtocol> results_type;
 
@@ -233,48 +225,6 @@ class basic_resolver
     return impl_.get_service().cancel(impl_.get_implementation());
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use overload with separate host and service parameters.)
-  /// Perform forward resolution of a query to a list of entries.
-  /**
-   * This function is used to resolve a query into a list of endpoint entries.
-   *
-   * @param q A query object that determines what endpoints will be returned.
-   *
-   * @returns A range object representing the list of endpoint entries. A
-   * successful call to this function is guaranteed to return a non-empty
-   * range.
-   *
-   * @throws boost::system::system_error Thrown on failure.
-   */
-  results_type resolve(const query& q)
-  {
-    boost::system::error_code ec;
-    results_type r = impl_.get_service().resolve(
-        impl_.get_implementation(), q, ec);
-    boost::asio::detail::throw_error(ec, "resolve");
-    return r;
-  }
-
-  /// (Deprecated: Use overload with separate host and service parameters.)
-  /// Perform forward resolution of a query to a list of entries.
-  /**
-   * This function is used to resolve a query into a list of endpoint entries.
-   *
-   * @param q A query object that determines what endpoints will be returned.
-   *
-   * @param ec Set to indicate what error occurred, if any.
-   *
-   * @returns A range object representing the list of endpoint entries. An
-   * empty range is returned if an error occurs. A successful call to this
-   * function is guaranteed to return a non-empty range.
-   */
-  results_type resolve(const query& q, boost::system::error_code& ec)
-  {
-    return impl_.get_service().resolve(impl_.get_implementation(), q, ec);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Perform forward resolution of a query to a list of entries.
   /**
    * This function is used to resolve host and service names into a list of
@@ -641,52 +591,6 @@ class basic_resolver
     return impl_.get_service().resolve(impl_.get_implementation(), q, ec);
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use overload with separate host and service parameters.)
-  /// Asynchronously perform forward resolution of a query to a list of entries.
-  /**
-   * This function is used to asynchronously resolve a query into a list of
-   * endpoint entries. It is an initiating function for an @ref
-   * asynchronous_operation, and always returns immediately.
-   *
-   * @param q A query object that determines what endpoints will be returned.
-   *
-   * @param token The @ref completion_token that will be used to produce a
-   * completion handler, which will be called when the resolve completes.
-   * Potential completion tokens include @ref use_future, @ref use_awaitable,
-   * @ref yield_context, or a function object with the correct completion
-   * signature. The function signature of the completion handler must be:
-   * @code void handler(
-   *   const boost::system::error_code& error, // Result of operation.
-   *   resolver::results_type results // Resolved endpoints as a range.
-   * ); @endcode
-   * Regardless of whether the asynchronous operation completes immediately or
-   * not, the completion handler will not be invoked from within this function.
-   * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
-   *
-   * A successful resolve operation is guaranteed to pass a non-empty range to
-   * the handler.
-   *
-   * @par Completion Signature
-   * @code void(boost::system::error_code, results_type) @endcode
-   */
-  template <
-      BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-        results_type)) ResolveToken = default_completion_token_t<executor_type>>
-  auto async_resolve(const query& q,
-      ResolveToken&& token = default_completion_token_t<executor_type>())
-    -> decltype(
-      boost::asio::async_initiate<ResolveToken,
-        void (boost::system::error_code, results_type)>(
-          declval<initiate_async_resolve>(), token, q))
-  {
-    return boost::asio::async_initiate<ResolveToken,
-      void (boost::system::error_code, results_type)>(
-        initiate_async_resolve(this), token, q);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Asynchronously perform forward resolution of a query to a list of entries.
   /**
    * This function is used to resolve host and service names into a list of
@@ -715,7 +619,7 @@ class basic_resolver
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * A successful resolve operation is guaranteed to pass a non-empty range to
    * the handler.
@@ -784,7 +688,7 @@ class basic_resolver
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * A successful resolve operation is guaranteed to pass a non-empty range to
    * the handler.
@@ -855,7 +759,7 @@ class basic_resolver
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * A successful resolve operation is guaranteed to pass a non-empty range to
    * the handler.
@@ -927,7 +831,7 @@ class basic_resolver
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * A successful resolve operation is guaranteed to pass a non-empty range to
    * the handler.
@@ -1032,7 +936,7 @@ class basic_resolver
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * A successful resolve operation is guaranteed to pass a non-empty range to
    * the handler.
diff --git a/inst/include/boost/asio/ip/basic_resolver_entry.hpp b/inst/include/boost/asio/ip/basic_resolver_entry.hpp
index 9f19f3c61..c76acf0f2 100644
--- a/inst/include/boost/asio/ip/basic_resolver_entry.hpp
+++ b/inst/include/boost/asio/ip/basic_resolver_entry.hpp
@@ -2,7 +2,7 @@
 // ip/basic_resolver_entry.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/basic_resolver_iterator.hpp b/inst/include/boost/asio/ip/basic_resolver_iterator.hpp
index f2b74cf4a..392aad4de 100644
--- a/inst/include/boost/asio/ip/basic_resolver_iterator.hpp
+++ b/inst/include/boost/asio/ip/basic_resolver_iterator.hpp
@@ -2,7 +2,7 @@
 // ip/basic_resolver_iterator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/basic_resolver_query.hpp b/inst/include/boost/asio/ip/basic_resolver_query.hpp
index 43f401078..df2d1e526 100644
--- a/inst/include/boost/asio/ip/basic_resolver_query.hpp
+++ b/inst/include/boost/asio/ip/basic_resolver_query.hpp
@@ -2,7 +2,7 @@
 // ip/basic_resolver_query.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -213,6 +213,22 @@ class basic_resolver_query
     hints_.ai_next = 0;
   }
 
+  /// Copy construct a @c basic_resolver_query from another.
+  basic_resolver_query(const basic_resolver_query& other)
+    : hints_(other.hints_),
+      host_name_(other.host_name_),
+      service_name_(other.service_name_)
+  {
+  }
+
+  /// Move construct a @c basic_resolver_query from another.
+  basic_resolver_query(basic_resolver_query&& other)
+    : hints_(other.hints_),
+      host_name_(static_cast<std::string&&>(other.host_name_)),
+      service_name_(static_cast<std::string&&>(other.service_name_))
+  {
+  }
+
   /// Get the hints associated with the query.
   const boost::asio::detail::addrinfo_type& hints() const
   {
diff --git a/inst/include/boost/asio/ip/basic_resolver_results.hpp b/inst/include/boost/asio/ip/basic_resolver_results.hpp
index 47ee524ef..aecd72631 100644
--- a/inst/include/boost/asio/ip/basic_resolver_results.hpp
+++ b/inst/include/boost/asio/ip/basic_resolver_results.hpp
@@ -2,7 +2,7 @@
 // ip/basic_resolver_results.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -49,11 +49,7 @@ namespace ip {
  */
 template <typename InternetProtocol>
 class basic_resolver_results
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  : public basic_resolver_iterator<InternetProtocol>
-#else // !defined(BOOST_ASIO_NO_DEPRECATED)
   : private basic_resolver_iterator<InternetProtocol>
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 {
 public:
   /// The protocol type associated with the results.
diff --git a/inst/include/boost/asio/ip/detail/endpoint.hpp b/inst/include/boost/asio/ip/detail/endpoint.hpp
index ef7d9c56b..b8770cbeb 100644
--- a/inst/include/boost/asio/ip/detail/endpoint.hpp
+++ b/inst/include/boost/asio/ip/detail/endpoint.hpp
@@ -2,7 +2,7 @@
 // ip/detail/endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -29,7 +29,7 @@ namespace asio {
 namespace ip {
 namespace detail {
 
-// Helper class for implementating an IP endpoint.
+// Helper class for implementing an IP endpoint.
 class endpoint
 {
 public:
diff --git a/inst/include/boost/asio/ip/detail/impl/endpoint.ipp b/inst/include/boost/asio/ip/detail/impl/endpoint.ipp
index 1ade31812..de584b858 100644
--- a/inst/include/boost/asio/ip/detail/impl/endpoint.ipp
+++ b/inst/include/boost/asio/ip/detail/impl/endpoint.ipp
@@ -2,7 +2,7 @@
 // ip/detail/impl/endpoint.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/detail/socket_option.hpp b/inst/include/boost/asio/ip/detail/socket_option.hpp
index 30df18e73..3ae928c7f 100644
--- a/inst/include/boost/asio/ip/detail/socket_option.hpp
+++ b/inst/include/boost/asio/ip/detail/socket_option.hpp
@@ -2,7 +2,7 @@
 // detail/socket_option.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -40,7 +40,7 @@ class multicast_enable_loopback
 #if defined(__sun) || defined(__osf__)
   typedef unsigned char ipv4_value_type;
   typedef unsigned char ipv6_value_type;
-#elif defined(_AIX) || defined(__hpux) || defined(__QNXNTO__) 
+#elif defined(_AIX) || defined(__hpux) || defined(__QNXNTO__)
   typedef unsigned char ipv4_value_type;
   typedef unsigned int ipv6_value_type;
 #else
diff --git a/inst/include/boost/asio/ip/host_name.hpp b/inst/include/boost/asio/ip/host_name.hpp
index 8647af96d..ad589b30b 100644
--- a/inst/include/boost/asio/ip/host_name.hpp
+++ b/inst/include/boost/asio/ip/host_name.hpp
@@ -2,7 +2,7 @@
 // ip/host_name.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/icmp.hpp b/inst/include/boost/asio/ip/icmp.hpp
index 12025e0f8..2b46091c4 100644
--- a/inst/include/boost/asio/ip/icmp.hpp
+++ b/inst/include/boost/asio/ip/icmp.hpp
@@ -2,7 +2,7 @@
 // ip/icmp.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/impl/address.hpp b/inst/include/boost/asio/ip/impl/address.hpp
index 7b384e5bb..f9ef08ab9 100644
--- a/inst/include/boost/asio/ip/impl/address.hpp
+++ b/inst/include/boost/asio/ip/impl/address.hpp
@@ -2,7 +2,7 @@
 // ip/impl/address.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,40 +17,12 @@
 
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
-#include <boost/asio/detail/throw_error.hpp>
-
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 namespace ip {
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-inline address address::from_string(const char* str)
-{
-  return boost::asio::ip::make_address(str);
-}
-
-inline address address::from_string(
-    const char* str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address(str, ec);
-}
-
-inline address address::from_string(const std::string& str)
-{
-  return boost::asio::ip::make_address(str);
-}
-
-inline address address::from_string(
-    const std::string& str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address(str, ec);
-}
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Elem, typename Traits>
 std::basic_ostream<Elem, Traits>& operator<<(
     std::basic_ostream<Elem, Traits>& os, const address& addr)
diff --git a/inst/include/boost/asio/ip/impl/address.ipp b/inst/include/boost/asio/ip/impl/address.ipp
index c3f68c04e..001c4f91d 100644
--- a/inst/include/boost/asio/ip/impl/address.ipp
+++ b/inst/include/boost/asio/ip/impl/address.ipp
@@ -2,7 +2,7 @@
 // ip/impl/address.ipp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -178,15 +178,6 @@ std::string address::to_string() const
   return ipv4_address_.to_string();
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-std::string address::to_string(boost::system::error_code& ec) const
-{
-  if (type_ == ipv6)
-    return ipv6_address_.to_string(ec);
-  return ipv4_address_.to_string(ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 bool address::is_loopback() const noexcept
 {
   return (type_ == ipv4)
diff --git a/inst/include/boost/asio/ip/impl/address_v4.hpp b/inst/include/boost/asio/ip/impl/address_v4.hpp
index 98d0c45d3..93b5c4dc6 100644
--- a/inst/include/boost/asio/ip/impl/address_v4.hpp
+++ b/inst/include/boost/asio/ip/impl/address_v4.hpp
@@ -2,7 +2,7 @@
 // ip/impl/address_v4.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,40 +17,12 @@
 
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
-#include <boost/asio/detail/throw_error.hpp>
-
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 namespace ip {
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-inline address_v4 address_v4::from_string(const char* str)
-{
-  return boost::asio::ip::make_address_v4(str);
-}
-
-inline address_v4 address_v4::from_string(
-    const char* str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address_v4(str, ec);
-}
-
-inline address_v4 address_v4::from_string(const std::string& str)
-{
-  return boost::asio::ip::make_address_v4(str);
-}
-
-inline address_v4 address_v4::from_string(
-    const std::string& str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address_v4(str, ec);
-}
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Elem, typename Traits>
 std::basic_ostream<Elem, Traits>& operator<<(
     std::basic_ostream<Elem, Traits>& os, const address_v4& addr)
diff --git a/inst/include/boost/asio/ip/impl/address_v4.ipp b/inst/include/boost/asio/ip/impl/address_v4.ipp
index 4faa6c25c..c12f32b0e 100644
--- a/inst/include/boost/asio/ip/impl/address_v4.ipp
+++ b/inst/include/boost/asio/ip/impl/address_v4.ipp
@@ -2,7 +2,7 @@
 // ip/impl/address_v4.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -71,13 +71,6 @@ address_v4::uint_type address_v4::to_uint() const noexcept
   return boost::asio::detail::socket_ops::network_to_host_long(addr_.s_addr);
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-unsigned long address_v4::to_ulong() const
-{
-  return boost::asio::detail::socket_ops::network_to_host_long(addr_.s_addr);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 std::string address_v4::to_string() const
 {
   boost::system::error_code ec;
@@ -91,20 +84,6 @@ std::string address_v4::to_string() const
   return addr;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-std::string address_v4::to_string(boost::system::error_code& ec) const
-{
-  char addr_str[boost::asio::detail::max_addr_v4_str_len];
-  const char* addr =
-    boost::asio::detail::socket_ops::inet_ntop(
-        BOOST_ASIO_OS_DEF(AF_INET), &addr_, addr_str,
-        boost::asio::detail::max_addr_v4_str_len, 0, ec);
-  if (addr == 0)
-    return std::string();
-  return addr;
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 bool address_v4::is_loopback() const noexcept
 {
   return (to_uint() & 0xFF000000) == 0x7F000000;
@@ -115,46 +94,11 @@ bool address_v4::is_unspecified() const noexcept
   return to_uint() == 0;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-bool address_v4::is_class_a() const
-{
-  return (to_uint() & 0x80000000) == 0;
-}
-
-bool address_v4::is_class_b() const
-{
-  return (to_uint() & 0xC0000000) == 0x80000000;
-}
-
-bool address_v4::is_class_c() const
-{
-  return (to_uint() & 0xE0000000) == 0xC0000000;
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 bool address_v4::is_multicast() const noexcept
 {
   return (to_uint() & 0xF0000000) == 0xE0000000;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-address_v4 address_v4::broadcast(const address_v4& addr, const address_v4& mask)
-{
-  return address_v4(addr.to_uint() | (mask.to_uint() ^ 0xFFFFFFFF));
-}
-
-address_v4 address_v4::netmask(const address_v4& addr)
-{
-  if (addr.is_class_a())
-    return address_v4(0xFF000000);
-  if (addr.is_class_b())
-    return address_v4(0xFFFF0000);
-  if (addr.is_class_c())
-    return address_v4(0xFFFFFF00);
-  return address_v4(0xFFFFFFFF);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 address_v4 make_address_v4(const char* str)
 {
   boost::system::error_code ec;
diff --git a/inst/include/boost/asio/ip/impl/address_v6.hpp b/inst/include/boost/asio/ip/impl/address_v6.hpp
index a6ee15f3d..2df2b6684 100644
--- a/inst/include/boost/asio/ip/impl/address_v6.hpp
+++ b/inst/include/boost/asio/ip/impl/address_v6.hpp
@@ -2,7 +2,7 @@
 // ip/impl/address_v6.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,40 +17,12 @@
 
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
-#include <boost/asio/detail/throw_error.hpp>
-
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 namespace ip {
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-inline address_v6 address_v6::from_string(const char* str)
-{
-  return boost::asio::ip::make_address_v6(str);
-}
-
-inline address_v6 address_v6::from_string(
-    const char* str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address_v6(str, ec);
-}
-
-inline address_v6 address_v6::from_string(const std::string& str)
-{
-  return boost::asio::ip::make_address_v6(str);
-}
-
-inline address_v6 address_v6::from_string(
-    const std::string& str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address_v6(str, ec);
-}
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Elem, typename Traits>
 std::basic_ostream<Elem, Traits>& operator<<(
     std::basic_ostream<Elem, Traits>& os, const address_v6& addr)
diff --git a/inst/include/boost/asio/ip/impl/address_v6.ipp b/inst/include/boost/asio/ip/impl/address_v6.ipp
index e3f5049a6..29a5e1585 100644
--- a/inst/include/boost/asio/ip/impl/address_v6.ipp
+++ b/inst/include/boost/asio/ip/impl/address_v6.ipp
@@ -2,7 +2,7 @@
 // ip/impl/address_v6.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -104,33 +104,6 @@ std::string address_v6::to_string() const
   return addr;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-std::string address_v6::to_string(boost::system::error_code& ec) const
-{
-  char addr_str[boost::asio::detail::max_addr_v6_str_len];
-  const char* addr =
-    boost::asio::detail::socket_ops::inet_ntop(
-        BOOST_ASIO_OS_DEF(AF_INET6), &addr_, addr_str,
-        boost::asio::detail::max_addr_v6_str_len, scope_id_, ec);
-  if (addr == 0)
-    return std::string();
-  return addr;
-}
-
-address_v4 address_v6::to_v4() const
-{
-  if (!is_v4_mapped() && !is_v4_compatible())
-  {
-    bad_address_cast ex;
-    boost::asio::detail::throw_exception(ex);
-  }
-
-  address_v4::bytes_type v4_bytes = { { addr_.s6_addr[12],
-    addr_.s6_addr[13], addr_.s6_addr[14], addr_.s6_addr[15] } };
-  return address_v4(v4_bytes);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 bool address_v6::is_loopback() const noexcept
 {
   return ((addr_.s6_addr[0] == 0) && (addr_.s6_addr[1] == 0)
@@ -175,22 +148,6 @@ bool address_v6::is_v4_mapped() const noexcept
       && (addr_.s6_addr[10] == 0xff) && (addr_.s6_addr[11] == 0xff));
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-bool address_v6::is_v4_compatible() const
-{
-  return ((addr_.s6_addr[0] == 0) && (addr_.s6_addr[1] == 0)
-      && (addr_.s6_addr[2] == 0) && (addr_.s6_addr[3] == 0)
-      && (addr_.s6_addr[4] == 0) && (addr_.s6_addr[5] == 0)
-      && (addr_.s6_addr[6] == 0) && (addr_.s6_addr[7] == 0)
-      && (addr_.s6_addr[8] == 0) && (addr_.s6_addr[9] == 0)
-      && (addr_.s6_addr[10] == 0) && (addr_.s6_addr[11] == 0)
-      && !((addr_.s6_addr[12] == 0)
-        && (addr_.s6_addr[13] == 0)
-        && (addr_.s6_addr[14] == 0)
-        && ((addr_.s6_addr[15] == 0) || (addr_.s6_addr[15] == 1))));
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 bool address_v6::is_multicast() const noexcept
 {
   return (addr_.s6_addr[0] == 0xff);
@@ -248,24 +205,6 @@ address_v6 address_v6::loopback() noexcept
   return tmp;
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-address_v6 address_v6::v4_mapped(const address_v4& addr)
-{
-  address_v4::bytes_type v4_bytes = addr.to_bytes();
-  bytes_type v6_bytes = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF,
-    v4_bytes[0], v4_bytes[1], v4_bytes[2], v4_bytes[3] } };
-  return address_v6(v6_bytes);
-}
-
-address_v6 address_v6::v4_compatible(const address_v4& addr)
-{
-  address_v4::bytes_type v4_bytes = addr.to_bytes();
-  bytes_type v6_bytes = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    v4_bytes[0], v4_bytes[1], v4_bytes[2], v4_bytes[3] } };
-  return address_v6(v6_bytes);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 address_v6 make_address_v6(const char* str)
 {
   boost::system::error_code ec;
@@ -282,7 +221,7 @@ address_v6 make_address_v6(const char* str,
   if (boost::asio::detail::socket_ops::inet_pton(
         BOOST_ASIO_OS_DEF(AF_INET6), str, &bytes[0], &scope_id, ec) <= 0)
     return address_v6();
-  return address_v6(bytes, scope_id);
+  return address_v6(bytes, static_cast<scope_id_type>(scope_id));
 }
 
 address_v6 make_address_v6(const std::string& str)
diff --git a/inst/include/boost/asio/ip/impl/basic_endpoint.hpp b/inst/include/boost/asio/ip/impl/basic_endpoint.hpp
index 8f3ec18ce..3f2dadf53 100644
--- a/inst/include/boost/asio/ip/impl/basic_endpoint.hpp
+++ b/inst/include/boost/asio/ip/impl/basic_endpoint.hpp
@@ -2,7 +2,7 @@
 // ip/impl/basic_endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/impl/host_name.ipp b/inst/include/boost/asio/ip/impl/host_name.ipp
index b2d6b6a80..ba2592d2b 100644
--- a/inst/include/boost/asio/ip/impl/host_name.ipp
+++ b/inst/include/boost/asio/ip/impl/host_name.ipp
@@ -2,7 +2,7 @@
 // ip/impl/host_name.ipp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/impl/network_v4.hpp b/inst/include/boost/asio/ip/impl/network_v4.hpp
index b1d53cc77..cac2bf72d 100644
--- a/inst/include/boost/asio/ip/impl/network_v4.hpp
+++ b/inst/include/boost/asio/ip/impl/network_v4.hpp
@@ -2,7 +2,7 @@
 // ip/impl/network_v4.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/impl/network_v4.ipp b/inst/include/boost/asio/ip/impl/network_v4.ipp
index 508893274..b53be5385 100644
--- a/inst/include/boost/asio/ip/impl/network_v4.ipp
+++ b/inst/include/boost/asio/ip/impl/network_v4.ipp
@@ -2,7 +2,7 @@
 // ip/impl/network_v4.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/impl/network_v6.hpp b/inst/include/boost/asio/ip/impl/network_v6.hpp
index b3b2135d6..b59672616 100644
--- a/inst/include/boost/asio/ip/impl/network_v6.hpp
+++ b/inst/include/boost/asio/ip/impl/network_v6.hpp
@@ -2,7 +2,7 @@
 // ip/impl/network_v6.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/impl/network_v6.ipp b/inst/include/boost/asio/ip/impl/network_v6.ipp
index c39f7c71a..cebc75837 100644
--- a/inst/include/boost/asio/ip/impl/network_v6.ipp
+++ b/inst/include/boost/asio/ip/impl/network_v6.ipp
@@ -2,7 +2,7 @@
 // ip/impl/network_v6.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/multicast.hpp b/inst/include/boost/asio/ip/multicast.hpp
index 83ff9eb6f..fab24c6a1 100644
--- a/inst/include/boost/asio/ip/multicast.hpp
+++ b/inst/include/boost/asio/ip/multicast.hpp
@@ -2,7 +2,7 @@
 // ip/multicast.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/network_v4.hpp b/inst/include/boost/asio/ip/network_v4.hpp
index d4990280f..bdfb54466 100644
--- a/inst/include/boost/asio/ip/network_v4.hpp
+++ b/inst/include/boost/asio/ip/network_v4.hpp
@@ -2,7 +2,7 @@
 // ip/network_v4.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/network_v6.hpp b/inst/include/boost/asio/ip/network_v6.hpp
index 807bd40fc..8d3a54534 100644
--- a/inst/include/boost/asio/ip/network_v6.hpp
+++ b/inst/include/boost/asio/ip/network_v6.hpp
@@ -2,7 +2,7 @@
 // ip/network_v6.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/ip/resolver_base.hpp b/inst/include/boost/asio/ip/resolver_base.hpp
index 2678d5b80..11acf3bfb 100644
--- a/inst/include/boost/asio/ip/resolver_base.hpp
+++ b/inst/include/boost/asio/ip/resolver_base.hpp
@@ -2,7 +2,7 @@
 // ip/resolver_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/resolver_query_base.hpp b/inst/include/boost/asio/ip/resolver_query_base.hpp
index ec6b848e5..87b6cdd5c 100644
--- a/inst/include/boost/asio/ip/resolver_query_base.hpp
+++ b/inst/include/boost/asio/ip/resolver_query_base.hpp
@@ -2,7 +2,7 @@
 // ip/resolver_query_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/tcp.hpp b/inst/include/boost/asio/ip/tcp.hpp
index 2d0d0e290..c496b4b9c 100644
--- a/inst/include/boost/asio/ip/tcp.hpp
+++ b/inst/include/boost/asio/ip/tcp.hpp
@@ -2,7 +2,7 @@
 // ip/tcp.hpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/udp.hpp b/inst/include/boost/asio/ip/udp.hpp
index b706b0821..dc0b7a46b 100644
--- a/inst/include/boost/asio/ip/udp.hpp
+++ b/inst/include/boost/asio/ip/udp.hpp
@@ -2,7 +2,7 @@
 // ip/udp.hpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/unicast.hpp b/inst/include/boost/asio/ip/unicast.hpp
index ad6af3783..519d3b900 100644
--- a/inst/include/boost/asio/ip/unicast.hpp
+++ b/inst/include/boost/asio/ip/unicast.hpp
@@ -2,7 +2,7 @@
 // ip/unicast.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ip/v6_only.hpp b/inst/include/boost/asio/ip/v6_only.hpp
index 721a21ba4..0e0154439 100644
--- a/inst/include/boost/asio/ip/v6_only.hpp
+++ b/inst/include/boost/asio/ip/v6_only.hpp
@@ -2,7 +2,7 @@
 // ip/v6_only.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/is_applicable_property.hpp b/inst/include/boost/asio/is_applicable_property.hpp
index e85a45510..401e9f28c 100644
--- a/inst/include/boost/asio/is_applicable_property.hpp
+++ b/inst/include/boost/asio/is_applicable_property.hpp
@@ -2,7 +2,7 @@
 // is_applicable_property.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/is_contiguous_iterator.hpp b/inst/include/boost/asio/is_contiguous_iterator.hpp
index 54d341739..f327dd1fb 100644
--- a/inst/include/boost/asio/is_contiguous_iterator.hpp
+++ b/inst/include/boost/asio/is_contiguous_iterator.hpp
@@ -2,7 +2,7 @@
 // is_contiguous_iterator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/is_executor.hpp b/inst/include/boost/asio/is_executor.hpp
index c4a488ca0..3ccd0c5a5 100644
--- a/inst/include/boost/asio/is_executor.hpp
+++ b/inst/include/boost/asio/is_executor.hpp
@@ -2,7 +2,7 @@
 // is_executor.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/is_read_buffered.hpp b/inst/include/boost/asio/is_read_buffered.hpp
index 425f79474..304bb275c 100644
--- a/inst/include/boost/asio/is_read_buffered.hpp
+++ b/inst/include/boost/asio/is_read_buffered.hpp
@@ -2,7 +2,7 @@
 // is_read_buffered.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/is_write_buffered.hpp b/inst/include/boost/asio/is_write_buffered.hpp
index 819e4520f..4c137a5b6 100644
--- a/inst/include/boost/asio/is_write_buffered.hpp
+++ b/inst/include/boost/asio/is_write_buffered.hpp
@@ -2,7 +2,7 @@
 // is_write_buffered.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/local/basic_endpoint.hpp b/inst/include/boost/asio/local/basic_endpoint.hpp
index 24476edcc..366fd129b 100644
--- a/inst/include/boost/asio/local/basic_endpoint.hpp
+++ b/inst/include/boost/asio/local/basic_endpoint.hpp
@@ -2,7 +2,7 @@
 // local/basic_endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Derived from a public domain implementation written by Daniel Casimiro.
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/local/connect_pair.hpp b/inst/include/boost/asio/local/connect_pair.hpp
index 50c91bdaa..86e660af4 100644
--- a/inst/include/boost/asio/local/connect_pair.hpp
+++ b/inst/include/boost/asio/local/connect_pair.hpp
@@ -2,7 +2,7 @@
 // local/connect_pair.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/local/datagram_protocol.hpp b/inst/include/boost/asio/local/datagram_protocol.hpp
index 28721b356..e94d348cd 100644
--- a/inst/include/boost/asio/local/datagram_protocol.hpp
+++ b/inst/include/boost/asio/local/datagram_protocol.hpp
@@ -2,7 +2,7 @@
 // local/datagram_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/local/detail/endpoint.hpp b/inst/include/boost/asio/local/detail/endpoint.hpp
index 072ae58cb..f92518b69 100644
--- a/inst/include/boost/asio/local/detail/endpoint.hpp
+++ b/inst/include/boost/asio/local/detail/endpoint.hpp
@@ -2,7 +2,7 @@
 // local/detail/endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Derived from a public domain implementation written by Daniel Casimiro.
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/local/detail/impl/endpoint.ipp b/inst/include/boost/asio/local/detail/impl/endpoint.ipp
index b3e20c47b..812e7d3e5 100644
--- a/inst/include/boost/asio/local/detail/impl/endpoint.ipp
+++ b/inst/include/boost/asio/local/detail/impl/endpoint.ipp
@@ -2,7 +2,7 @@
 // local/detail/impl/endpoint.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Derived from a public domain implementation written by Daniel Casimiro.
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/local/seq_packet_protocol.hpp b/inst/include/boost/asio/local/seq_packet_protocol.hpp
index ea57ead4f..cfe7db254 100644
--- a/inst/include/boost/asio/local/seq_packet_protocol.hpp
+++ b/inst/include/boost/asio/local/seq_packet_protocol.hpp
@@ -2,7 +2,7 @@
 // local/seq_packet_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/local/stream_protocol.hpp b/inst/include/boost/asio/local/stream_protocol.hpp
index b41fe04f9..5d15a56bf 100644
--- a/inst/include/boost/asio/local/stream_protocol.hpp
+++ b/inst/include/boost/asio/local/stream_protocol.hpp
@@ -2,7 +2,7 @@
 // local/stream_protocol.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/multiple_exceptions.hpp b/inst/include/boost/asio/multiple_exceptions.hpp
index b23f7999d..a2e0901a6 100644
--- a/inst/include/boost/asio/multiple_exceptions.hpp
+++ b/inst/include/boost/asio/multiple_exceptions.hpp
@@ -2,7 +2,7 @@
 // multiple_exceptions.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/packaged_task.hpp b/inst/include/boost/asio/packaged_task.hpp
index b8c453703..0b6dac4ff 100644
--- a/inst/include/boost/asio/packaged_task.hpp
+++ b/inst/include/boost/asio/packaged_task.hpp
@@ -2,7 +2,7 @@
 // packaged_task.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/placeholders.hpp b/inst/include/boost/asio/placeholders.hpp
index 26eefb159..5476c800c 100644
--- a/inst/include/boost/asio/placeholders.hpp
+++ b/inst/include/boost/asio/placeholders.hpp
@@ -2,7 +2,7 @@
 // placeholders.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -59,12 +59,18 @@ unspecified signal_number;
 
 #else
 
-static constexpr auto& error = std::placeholders::_1;
-static constexpr auto& bytes_transferred = std::placeholders::_2;
-static constexpr auto& iterator = std::placeholders::_2;
-static constexpr auto& results = std::placeholders::_2;
-static constexpr auto& endpoint = std::placeholders::_2;
-static constexpr auto& signal_number = std::placeholders::_2;
+static BOOST_ASIO_INLINE_VARIABLE constexpr auto& error
+  = std::placeholders::_1;
+static BOOST_ASIO_INLINE_VARIABLE constexpr auto& bytes_transferred
+  = std::placeholders::_2;
+static BOOST_ASIO_INLINE_VARIABLE constexpr auto& iterator
+  = std::placeholders::_2;
+static BOOST_ASIO_INLINE_VARIABLE constexpr auto& results
+  = std::placeholders::_2;
+static BOOST_ASIO_INLINE_VARIABLE constexpr auto& endpoint
+  = std::placeholders::_2;
+static BOOST_ASIO_INLINE_VARIABLE constexpr auto& signal_number
+  = std::placeholders::_2;
 
 #endif
 
diff --git a/inst/include/boost/asio/posix/basic_descriptor.hpp b/inst/include/boost/asio/posix/basic_descriptor.hpp
index 553c633bb..82ea554df 100644
--- a/inst/include/boost/asio/posix/basic_descriptor.hpp
+++ b/inst/include/boost/asio/posix/basic_descriptor.hpp
@@ -2,7 +2,7 @@
 // posix/basic_descriptor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -661,7 +661,7 @@ class basic_descriptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
diff --git a/inst/include/boost/asio/posix/basic_stream_descriptor.hpp b/inst/include/boost/asio/posix/basic_stream_descriptor.hpp
index 909e15ce5..149e85db3 100644
--- a/inst/include/boost/asio/posix/basic_stream_descriptor.hpp
+++ b/inst/include/boost/asio/posix/basic_stream_descriptor.hpp
@@ -2,7 +2,7 @@
 // posix/basic_stream_descriptor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -308,7 +308,7 @@ class basic_stream_descriptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -437,7 +437,7 @@ class basic_stream_descriptor
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/posix/descriptor.hpp b/inst/include/boost/asio/posix/descriptor.hpp
index 2e602932c..0d72e173c 100644
--- a/inst/include/boost/asio/posix/descriptor.hpp
+++ b/inst/include/boost/asio/posix/descriptor.hpp
@@ -2,7 +2,7 @@
 // posix/descriptor.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/posix/descriptor_base.hpp b/inst/include/boost/asio/posix/descriptor_base.hpp
index 7a75742a6..cefc08d5f 100644
--- a/inst/include/boost/asio/posix/descriptor_base.hpp
+++ b/inst/include/boost/asio/posix/descriptor_base.hpp
@@ -2,7 +2,7 @@
 // posix/descriptor_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/posix/stream_descriptor.hpp b/inst/include/boost/asio/posix/stream_descriptor.hpp
index 12f100c55..2a3fcca86 100644
--- a/inst/include/boost/asio/posix/stream_descriptor.hpp
+++ b/inst/include/boost/asio/posix/stream_descriptor.hpp
@@ -2,7 +2,7 @@
 // posix/stream_descriptor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/post.hpp b/inst/include/boost/asio/post.hpp
index fed2d0680..b9bd101c6 100644
--- a/inst/include/boost/asio/post.hpp
+++ b/inst/include/boost/asio/post.hpp
@@ -2,7 +2,7 @@
 // post.hpp
 // ~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/prefer.hpp b/inst/include/boost/asio/prefer.hpp
index 4e8dab68a..71174aac1 100644
--- a/inst/include/boost/asio/prefer.hpp
+++ b/inst/include/boost/asio/prefer.hpp
@@ -2,7 +2,7 @@
 // prefer.hpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/prepend.hpp b/inst/include/boost/asio/prepend.hpp
index 0470e0214..b86136f9e 100644
--- a/inst/include/boost/asio/prepend.hpp
+++ b/inst/include/boost/asio/prepend.hpp
@@ -2,7 +2,7 @@
 // prepend.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/query.hpp b/inst/include/boost/asio/query.hpp
index 0f5649ea4..4e791a3e3 100644
--- a/inst/include/boost/asio/query.hpp
+++ b/inst/include/boost/asio/query.hpp
@@ -2,7 +2,7 @@
 // query.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/random_access_file.hpp b/inst/include/boost/asio/random_access_file.hpp
index 270978ac1..a38a2917a 100644
--- a/inst/include/boost/asio/random_access_file.hpp
+++ b/inst/include/boost/asio/random_access_file.hpp
@@ -2,7 +2,7 @@
 // random_access_file.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/read.hpp b/inst/include/boost/asio/read.hpp
index 61cd76135..6e1733d60 100644
--- a/inst/include/boost/asio/read.hpp
+++ b/inst/include/boost/asio/read.hpp
@@ -2,7 +2,7 @@
 // read.hpp
 // ~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -185,6 +185,9 @@ std::size_t read(SyncReadStream& s, const MutableBufferSequence& buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_mutable_buffer_sequence<MutableBufferSequence>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /// Attempt to read a certain amount of data from a stream before returning.
@@ -232,6 +235,9 @@ std::size_t read(SyncReadStream& s, const MutableBufferSequence& buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_mutable_buffer_sequence<MutableBufferSequence>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
@@ -356,6 +362,9 @@ std::size_t read(SyncReadStream& s,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /// Attempt to read a certain amount of data from a stream before returning.
@@ -405,6 +414,9 @@ std::size_t read(SyncReadStream& s,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -507,7 +519,10 @@ std::size_t read(SyncReadStream& s, basic_streambuf<Allocator>& b,
 template <typename SyncReadStream, typename Allocator,
     typename CompletionCondition>
 std::size_t read(SyncReadStream& s, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition);
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 /// Attempt to read a certain amount of data from a stream before returning.
 /**
@@ -548,7 +563,10 @@ std::size_t read(SyncReadStream& s, basic_streambuf<Allocator>& b,
 template <typename SyncReadStream, typename Allocator,
     typename CompletionCondition>
 std::size_t read(SyncReadStream& s, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec);
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -662,6 +680,9 @@ std::size_t read(SyncReadStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /// Attempt to read a certain amount of data from a stream before returning.
@@ -707,6 +728,9 @@ std::size_t read(SyncReadStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /*@}*/
@@ -763,7 +787,7 @@ std::size_t read(SyncReadStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -798,17 +822,26 @@ template <typename AsyncReadStream, typename MutableBufferSequence,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
+inline auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
     constraint_t<
       is_mutable_buffer_sequence<MutableBufferSequence>::value
+    > = 0,
+    constraint_t<
+      !is_completion_condition<ReadToken>::value
     > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read<AsyncReadStream>>(),
-        token, buffers, transfer_all()));
+        token, buffers, transfer_all()))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read<AsyncReadStream>(s),
+      token, buffers, transfer_all());
+}
 
 /// Start an asynchronous operation to read a certain amount of data from a
 /// stream.
@@ -863,7 +896,7 @@ auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -894,19 +927,28 @@ template <typename AsyncReadStream,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
+inline auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
     CompletionCondition completion_condition,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
     constraint_t<
       is_mutable_buffer_sequence<MutableBufferSequence>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read<AsyncReadStream>>(),
         token, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read<AsyncReadStream>(s), token, buffers,
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
@@ -954,7 +996,7 @@ auto async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -980,7 +1022,7 @@ template <typename AsyncReadStream, typename DynamicBuffer_v1,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
+inline auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
     constraint_t<
@@ -988,12 +1030,21 @@ auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      !is_completion_condition<ReadToken>::value
     > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers), transfer_all()));
+        token, static_cast<DynamicBuffer_v1&&>(buffers), transfer_all()))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers), transfer_all());
+}
 
 /// Start an asynchronous operation to read a certain amount of data from a
 /// stream.
@@ -1053,7 +1104,7 @@ auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1074,7 +1125,7 @@ template <typename AsyncReadStream,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
+inline auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
     CompletionCondition completion_condition,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -1083,13 +1134,23 @@ auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
         token, static_cast<DynamicBuffer_v1&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers),
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -1136,7 +1197,7 @@ auto async_read(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1162,14 +1223,23 @@ template <typename AsyncReadStream, typename Allocator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
+inline auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
     ReadToken&& token = default_completion_token_t<
-      typename AsyncReadStream::executor_type>())
+      typename AsyncReadStream::executor_type>(),
+    constraint_t<
+      !is_completion_condition<ReadToken>::value
+    > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), transfer_all()));
+        token, basic_streambuf_ref<Allocator>(b), transfer_all()))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
+      token, basic_streambuf_ref<Allocator>(b), transfer_all());
+}
 
 /// Start an asynchronous operation to read a certain amount of data from a
 /// stream.
@@ -1227,7 +1297,7 @@ auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1248,16 +1318,26 @@ template <typename AsyncReadStream,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
+inline auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
     CompletionCondition completion_condition,
     ReadToken&& token = default_completion_token_t<
-      typename AsyncReadStream::executor_type>())
+      typename AsyncReadStream::executor_type>(),
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_dynbuf_v1<AsyncReadStream>>(),
         token, basic_streambuf_ref<Allocator>(b),
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_dynbuf_v1<AsyncReadStream>(s),
+      token, basic_streambuf_ref<Allocator>(b),
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -1307,7 +1387,7 @@ auto async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1333,17 +1413,26 @@ template <typename AsyncReadStream, typename DynamicBuffer_v2,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, DynamicBuffer_v2 buffers,
+inline auto async_read(AsyncReadStream& s, DynamicBuffer_v2 buffers,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      !is_completion_condition<ReadToken>::value
     > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_dynbuf_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), transfer_all()));
+        token, static_cast<DynamicBuffer_v2&&>(buffers), transfer_all()))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_dynbuf_v2<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers), transfer_all());
+}
 
 /// Start an asynchronous operation to read a certain amount of data from a
 /// stream.
@@ -1403,7 +1492,7 @@ auto async_read(AsyncReadStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1424,19 +1513,29 @@ template <typename AsyncReadStream,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read(AsyncReadStream& s, DynamicBuffer_v2 buffers,
+inline auto async_read(AsyncReadStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_dynbuf_v2<AsyncReadStream>>(),
         token, static_cast<DynamicBuffer_v2&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_dynbuf_v2<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers),
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 /*@}*/
 
diff --git a/inst/include/boost/asio/read_at.hpp b/inst/include/boost/asio/read_at.hpp
index 541eceef2..ee6f267fc 100644
--- a/inst/include/boost/asio/read_at.hpp
+++ b/inst/include/boost/asio/read_at.hpp
@@ -2,7 +2,7 @@
 // read_at.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -191,7 +191,10 @@ template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence,
     typename CompletionCondition>
 std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, const MutableBufferSequence& buffers,
-    CompletionCondition completion_condition);
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 /// Attempt to read a certain amount of data at the specified offset before
 /// returning.
@@ -240,7 +243,10 @@ template <typename SyncRandomAccessReadDevice, typename MutableBufferSequence,
     typename CompletionCondition>
 std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, const MutableBufferSequence& buffers,
-    CompletionCondition completion_condition, boost::system::error_code& ec);
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -351,7 +357,10 @@ template <typename SyncRandomAccessReadDevice, typename Allocator,
     typename CompletionCondition>
 std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition);
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 /// Attempt to read a certain amount of data at the specified offset before
 /// returning.
@@ -395,7 +404,10 @@ template <typename SyncRandomAccessReadDevice, typename Allocator,
     typename CompletionCondition>
 std::size_t read_at(SyncRandomAccessReadDevice& d,
     uint64_t offset, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec);
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -454,7 +466,7 @@ std::size_t read_at(SyncRandomAccessReadDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -489,15 +501,24 @@ template <typename AsyncRandomAccessReadDevice, typename MutableBufferSequence,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncRandomAccessReadDevice::executor_type>>
-auto async_read_at(AsyncRandomAccessReadDevice& d,
+inline auto async_read_at(AsyncRandomAccessReadDevice& d,
     uint64_t offset, const MutableBufferSequence& buffers,
     ReadToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessReadDevice::executor_type>())
+      typename AsyncRandomAccessReadDevice::executor_type>(),
+    constraint_t<
+      !is_completion_condition<ReadToken>::value
+    > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_at<AsyncRandomAccessReadDevice>>(),
-        token, offset, buffers, transfer_all()));
+        token, offset, buffers, transfer_all()))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_at<AsyncRandomAccessReadDevice>(d),
+      token, offset, buffers, transfer_all());
+}
 
 /// Start an asynchronous operation to read a certain amount of data at the
 /// specified offset.
@@ -555,7 +576,7 @@ auto async_read_at(AsyncRandomAccessReadDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -586,17 +607,27 @@ template <typename AsyncRandomAccessReadDevice,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncRandomAccessReadDevice::executor_type>>
-auto async_read_at(AsyncRandomAccessReadDevice& d,
+inline auto async_read_at(AsyncRandomAccessReadDevice& d,
     uint64_t offset, const MutableBufferSequence& buffers,
     CompletionCondition completion_condition,
     ReadToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessReadDevice::executor_type>())
+      typename AsyncRandomAccessReadDevice::executor_type>(),
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_at<AsyncRandomAccessReadDevice>>(),
         token, offset, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_at<AsyncRandomAccessReadDevice>(d),
+      token, offset, buffers,
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -641,7 +672,7 @@ auto async_read_at(AsyncRandomAccessReadDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -667,16 +698,25 @@ template <typename AsyncRandomAccessReadDevice, typename Allocator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncRandomAccessReadDevice::executor_type>>
-auto async_read_at(AsyncRandomAccessReadDevice& d,
+inline auto async_read_at(AsyncRandomAccessReadDevice& d,
     uint64_t offset, basic_streambuf<Allocator>& b,
     ReadToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessReadDevice::executor_type>())
+      typename AsyncRandomAccessReadDevice::executor_type>(),
+    constraint_t<
+      !is_completion_condition<ReadToken>::value
+    > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_at_streambuf<
           AsyncRandomAccessReadDevice>>(),
-        token, offset, &b, transfer_all()));
+        token, offset, &b, transfer_all()))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_at_streambuf<AsyncRandomAccessReadDevice>(d),
+      token, offset, &b, transfer_all());
+}
 
 /// Start an asynchronous operation to read a certain amount of data at the
 /// specified offset.
@@ -732,7 +772,7 @@ auto async_read_at(AsyncRandomAccessReadDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -753,17 +793,27 @@ template <typename AsyncRandomAccessReadDevice,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncRandomAccessReadDevice::executor_type>>
-auto async_read_at(AsyncRandomAccessReadDevice& d, uint64_t offset,
+inline auto async_read_at(AsyncRandomAccessReadDevice& d, uint64_t offset,
     basic_streambuf<Allocator>& b, CompletionCondition completion_condition,
     ReadToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessReadDevice::executor_type>())
+      typename AsyncRandomAccessReadDevice::executor_type>(),
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0)
   -> decltype(
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_at_streambuf<
           AsyncRandomAccessReadDevice>>(),
         token, offset, &b,
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_at_streambuf<AsyncRandomAccessReadDevice>(d),
+      token, offset, &b,
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
diff --git a/inst/include/boost/asio/read_until.hpp b/inst/include/boost/asio/read_until.hpp
index 07a46ff1f..38e284e27 100644
--- a/inst/include/boost/asio/read_until.hpp
+++ b/inst/include/boost/asio/read_until.hpp
@@ -2,7 +2,7 @@
 // read_until.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -481,7 +481,7 @@ std::size_t read_until(SyncReadStream& s, DynamicBuffer_v1&& buffers,
  * @par Examples
  * To read data into a dynamic buffer sequence until whitespace is encountered:
  * @code typedef boost::asio::buffers_iterator<
- *     boost::asio::const_buffers_1> iterator;
+ *     boost::asio::const_buffer> iterator;
  *
  * std::pair<iterator, bool>
  * match_whitespace(iterator begin, iterator end)
@@ -1419,7 +1419,7 @@ std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers,
  * @par Examples
  * To read data into a dynamic buffer sequence until whitespace is encountered:
  * @code typedef boost::asio::buffers_iterator<
- *     boost::asio::const_buffers_1> iterator;
+ *     boost::asio::const_buffer> iterator;
  *
  * std::pair<iterator, bool>
  * match_whitespace(iterator begin, iterator end)
@@ -1603,7 +1603,7 @@ std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1656,7 +1656,7 @@ template <typename AsyncReadStream, typename DynamicBuffer_v1,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     DynamicBuffer_v1&& buffers, char delim,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -1670,7 +1670,13 @@ auto async_read_until(AsyncReadStream& s,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_delim_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers), delim));
+        token, static_cast<DynamicBuffer_v1&&>(buffers), delim))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_delim_v1<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers), delim);
+}
 
 /// Start an asynchronous operation to read data into a dynamic buffer sequence
 /// until it contains a specified delimiter.
@@ -1720,7 +1726,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1773,7 +1779,7 @@ template <typename AsyncReadStream, typename DynamicBuffer_v1,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     DynamicBuffer_v1&& buffers,
     BOOST_ASIO_STRING_VIEW_PARAM delim,
     ReadToken&& token = default_completion_token_t<
@@ -1790,7 +1796,14 @@ auto async_read_until(AsyncReadStream& s,
         declval<detail::initiate_async_read_until_delim_string_v1<
           AsyncReadStream>>(),
         token, static_cast<DynamicBuffer_v1&&>(buffers),
-        static_cast<std::string>(delim)));
+        static_cast<std::string>(delim)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_delim_string_v1<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers),
+      static_cast<std::string>(delim));
+}
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if defined(BOOST_ASIO_HAS_BOOST_REGEX) \
@@ -1848,7 +1861,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1902,7 +1915,7 @@ template <typename AsyncReadStream, typename DynamicBuffer_v1, typename Traits,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
+inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
     const boost::basic_regex<char, Traits>& expr,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -1916,7 +1929,13 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_expr_v1<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v1&&>(buffers), expr));
+        token, static_cast<DynamicBuffer_v1&&>(buffers), expr))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_expr_v1<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers), expr);
+}
 
 #endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
        // || defined(GENERATING_DOCUMENTATION)
@@ -1984,7 +2003,7 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @note After a successful async_read_until operation, the dynamic buffer
  * sequence may contain additional data beyond that which matched the function
@@ -2003,7 +2022,7 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers,
  * To asynchronously read data into a @c std::string until whitespace is
  * encountered:
  * @code typedef boost::asio::buffers_iterator<
- *     boost::asio::const_buffers_1> iterator;
+ *     boost::asio::const_buffer> iterator;
  *
  * std::pair<iterator, bool>
  * match_whitespace(iterator begin, iterator end)
@@ -2070,7 +2089,7 @@ template <typename AsyncReadStream,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     DynamicBuffer_v1&& buffers, MatchCondition match_condition,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -2088,7 +2107,14 @@ auto async_read_until(AsyncReadStream& s,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_match_v1<AsyncReadStream>>(),
         token, static_cast<DynamicBuffer_v1&&>(buffers),
-        match_condition));
+        match_condition))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_match_v1<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers),
+      match_condition);
+}
 
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
@@ -2139,7 +2165,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -2191,7 +2217,7 @@ template <typename AsyncReadStream, typename Allocator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     boost::asio::basic_streambuf<Allocator>& b, char delim,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>())
@@ -2199,7 +2225,13 @@ auto async_read_until(AsyncReadStream& s,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_delim_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), delim));
+        token, basic_streambuf_ref<Allocator>(b), delim))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_delim_v1<AsyncReadStream>(s),
+      token, basic_streambuf_ref<Allocator>(b), delim);
+}
 
 /// Start an asynchronous operation to read data into a streambuf until it
 /// contains a specified delimiter.
@@ -2248,7 +2280,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -2300,7 +2332,7 @@ template <typename AsyncReadStream, typename Allocator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     boost::asio::basic_streambuf<Allocator>& b,
     BOOST_ASIO_STRING_VIEW_PARAM delim,
     ReadToken&& token = default_completion_token_t<
@@ -2311,7 +2343,14 @@ auto async_read_until(AsyncReadStream& s,
         declval<detail::initiate_async_read_until_delim_string_v1<
           AsyncReadStream>>(),
         token, basic_streambuf_ref<Allocator>(b),
-        static_cast<std::string>(delim)));
+        static_cast<std::string>(delim)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_delim_string_v1<AsyncReadStream>(s),
+      token, basic_streambuf_ref<Allocator>(b),
+      static_cast<std::string>(delim));
+}
 
 #if defined(BOOST_ASIO_HAS_BOOST_REGEX) \
   || defined(GENERATING_DOCUMENTATION)
@@ -2365,7 +2404,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -2418,7 +2457,7 @@ template <typename AsyncReadStream, typename Allocator, typename Traits,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     boost::asio::basic_streambuf<Allocator>& b,
     const boost::basic_regex<char, Traits>& expr,
     ReadToken&& token = default_completion_token_t<
@@ -2427,7 +2466,13 @@ auto async_read_until(AsyncReadStream& s,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_expr_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), expr));
+        token, basic_streambuf_ref<Allocator>(b), expr))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_expr_v1<AsyncReadStream>(s),
+      token, basic_streambuf_ref<Allocator>(b), expr);
+}
 
 #endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
        // || defined(GENERATING_DOCUMENTATION)
@@ -2492,7 +2537,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @note After a successful async_read_until operation, the streambuf may
  * contain additional data beyond that which matched the function object. An
@@ -2576,7 +2621,7 @@ template <typename AsyncReadStream, typename Allocator, typename MatchCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     boost::asio::basic_streambuf<Allocator>& b, MatchCondition match_condition,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -2585,7 +2630,13 @@ auto async_read_until(AsyncReadStream& s,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_match_v1<AsyncReadStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), match_condition));
+        token, basic_streambuf_ref<Allocator>(b), match_condition))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_match_v1<AsyncReadStream>(s),
+      token, basic_streambuf_ref<Allocator>(b), match_condition);
+}
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -2640,7 +2691,7 @@ auto async_read_until(AsyncReadStream& s,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -2693,7 +2744,8 @@ template <typename AsyncReadStream, typename DynamicBuffer_v2,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers, char delim,
+inline auto async_read_until(AsyncReadStream& s,
+    DynamicBuffer_v2 buffers, char delim,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
     constraint_t<
@@ -2703,7 +2755,13 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers, char delim,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_delim_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), delim));
+        token, static_cast<DynamicBuffer_v2&&>(buffers), delim))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_delim_v2<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers), delim);
+}
 
 /// Start an asynchronous operation to read data into a dynamic buffer sequence
 /// until it contains a specified delimiter.
@@ -2753,7 +2811,7 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers, char delim,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -2806,7 +2864,7 @@ template <typename AsyncReadStream, typename DynamicBuffer_v2,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
+inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
     BOOST_ASIO_STRING_VIEW_PARAM delim,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -2819,7 +2877,14 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
         declval<detail::initiate_async_read_until_delim_string_v2<
           AsyncReadStream>>(),
         token, static_cast<DynamicBuffer_v2&&>(buffers),
-        static_cast<std::string>(delim)));
+        static_cast<std::string>(delim)))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_delim_string_v2<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers),
+      static_cast<std::string>(delim));
+}
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if defined(BOOST_ASIO_HAS_BOOST_REGEX) \
@@ -2877,7 +2942,7 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -2931,7 +2996,7 @@ template <typename AsyncReadStream, typename DynamicBuffer_v2, typename Traits,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
+inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
     const boost::basic_regex<char, Traits>& expr,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -2942,7 +3007,13 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_expr_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), expr));
+        token, static_cast<DynamicBuffer_v2&&>(buffers), expr))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_expr_v2<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers), expr);
+}
 
 #endif // defined(BOOST_ASIO_HAS_BOOST_REGEX)
        // || defined(GENERATING_DOCUMENTATION)
@@ -3010,7 +3081,7 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @note After a successful async_read_until operation, the dynamic buffer
  * sequence may contain additional data beyond that which matched the function
@@ -3029,7 +3100,7 @@ auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers,
  * To asynchronously read data into a @c std::string until whitespace is
  * encountered:
  * @code typedef boost::asio::buffers_iterator<
- *     boost::asio::const_buffers_1> iterator;
+ *     boost::asio::const_buffer> iterator;
  *
  * std::pair<iterator, bool>
  * match_whitespace(iterator begin, iterator end)
@@ -3096,7 +3167,7 @@ template <typename AsyncReadStream,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) ReadToken = default_completion_token_t<
         typename AsyncReadStream::executor_type>>
-auto async_read_until(AsyncReadStream& s,
+inline auto async_read_until(AsyncReadStream& s,
     DynamicBuffer_v2 buffers, MatchCondition match_condition,
     ReadToken&& token = default_completion_token_t<
       typename AsyncReadStream::executor_type>(),
@@ -3110,7 +3181,14 @@ auto async_read_until(AsyncReadStream& s,
     async_initiate<ReadToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_read_until_match_v2<AsyncReadStream>>(),
-        token, static_cast<DynamicBuffer_v2&&>(buffers), match_condition));
+        token, static_cast<DynamicBuffer_v2&&>(buffers), match_condition))
+{
+  return async_initiate<ReadToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_read_until_match_v2<AsyncReadStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers),
+      match_condition);
+}
 
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 
diff --git a/inst/include/boost/asio/readable_pipe.hpp b/inst/include/boost/asio/readable_pipe.hpp
index 89fd749bd..e3b582178 100644
--- a/inst/include/boost/asio/readable_pipe.hpp
+++ b/inst/include/boost/asio/readable_pipe.hpp
@@ -2,7 +2,7 @@
 // readable_pipe.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/recycling_allocator.hpp b/inst/include/boost/asio/recycling_allocator.hpp
index 7d9dfe176..ad77ca163 100644
--- a/inst/include/boost/asio/recycling_allocator.hpp
+++ b/inst/include/boost/asio/recycling_allocator.hpp
@@ -2,7 +2,7 @@
 // recycling_allocator.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/redirect_error.hpp b/inst/include/boost/asio/redirect_error.hpp
index b7036a696..af62e2803 100644
--- a/inst/include/boost/asio/redirect_error.hpp
+++ b/inst/include/boost/asio/redirect_error.hpp
@@ -2,7 +2,7 @@
 // redirect_error.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -34,7 +34,7 @@ template <typename CompletionToken>
 class redirect_error_t
 {
 public:
-  /// Constructor. 
+  /// Constructor.
   template <typename T>
   redirect_error_t(T&& completion_token, boost::system::error_code& ec)
     : token_(static_cast<T&&>(completion_token)),
@@ -47,10 +47,50 @@ class redirect_error_t
   boost::system::error_code& ec_;
 };
 
+/// A function object type that adapts a @ref completion_token to capture
+/// error_code values to a variable.
+/**
+ * May also be used directly as a completion token, in which case it adapts the
+ * asynchronous operation's default completion token (or boost::asio::deferred
+ * if no default is available).
+ */
+class partial_redirect_error
+{
+public:
+  /// Constructor that specifies the variable used to capture error_code values.
+  explicit partial_redirect_error(boost::system::error_code& ec)
+    : ec_(ec)
+  {
+  }
+
+  /// Adapt a @ref completion_token to specify that the completion handler
+  /// should capture error_code values to a variable.
+  template <typename CompletionToken>
+  BOOST_ASIO_NODISCARD inline
+  constexpr redirect_error_t<decay_t<CompletionToken>>
+  operator()(CompletionToken&& completion_token) const
+  {
+    return redirect_error_t<decay_t<CompletionToken>>(
+        static_cast<CompletionToken&&>(completion_token), ec_);
+  }
+
+//private:
+  boost::system::error_code& ec_;
+};
+
+/// Create a partial completion token adapter that captures error_code values
+/// to a variable.
+BOOST_ASIO_NODISCARD inline partial_redirect_error
+redirect_error(boost::system::error_code& ec)
+{
+  return partial_redirect_error(ec);
+}
+
 /// Adapt a @ref completion_token to capture error_code values to a variable.
 template <typename CompletionToken>
-inline redirect_error_t<decay_t<CompletionToken>> redirect_error(
-    CompletionToken&& completion_token, boost::system::error_code& ec)
+BOOST_ASIO_NODISCARD inline redirect_error_t<decay_t<CompletionToken>>
+redirect_error(CompletionToken&& completion_token,
+    boost::system::error_code& ec)
 {
   return redirect_error_t<decay_t<CompletionToken>>(
       static_cast<CompletionToken&&>(completion_token), ec);
diff --git a/inst/include/boost/asio/registered_buffer.hpp b/inst/include/boost/asio/registered_buffer.hpp
index 7a683efaa..1396b20e7 100644
--- a/inst/include/boost/asio/registered_buffer.hpp
+++ b/inst/include/boost/asio/registered_buffer.hpp
@@ -2,7 +2,7 @@
 // registered_buffer.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -79,7 +79,7 @@ class registered_buffer_id
 };
 
 /// Holds a registered buffer over modifiable data.
-/** 
+/**
  * Satisfies the @c MutableBufferSequence type requirements.
  */
 class mutable_registered_buffer
@@ -150,7 +150,7 @@ class mutable_registered_buffer
 };
 
 /// Holds a registered buffer over non-modifiable data.
-/** 
+/**
  * Satisfies the @c ConstBufferSequence type requirements.
  */
 class const_registered_buffer
diff --git a/inst/include/boost/asio/require.hpp b/inst/include/boost/asio/require.hpp
index 06f53cf32..6ae3f18c7 100644
--- a/inst/include/boost/asio/require.hpp
+++ b/inst/include/boost/asio/require.hpp
@@ -2,7 +2,7 @@
 // require.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/require_concept.hpp b/inst/include/boost/asio/require_concept.hpp
index 66d4332bb..be458060e 100644
--- a/inst/include/boost/asio/require_concept.hpp
+++ b/inst/include/boost/asio/require_concept.hpp
@@ -2,7 +2,7 @@
 // require_concept.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/serial_port.hpp b/inst/include/boost/asio/serial_port.hpp
index 72cb92dac..3fd24de43 100644
--- a/inst/include/boost/asio/serial_port.hpp
+++ b/inst/include/boost/asio/serial_port.hpp
@@ -2,7 +2,7 @@
 // serial_port.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/serial_port_base.hpp b/inst/include/boost/asio/serial_port_base.hpp
index ba8d879d8..ac32982f7 100644
--- a/inst/include/boost/asio/serial_port_base.hpp
+++ b/inst/include/boost/asio/serial_port_base.hpp
@@ -2,7 +2,7 @@
 // serial_port_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/signal_set.hpp b/inst/include/boost/asio/signal_set.hpp
index 7155b6b3c..2fc57573c 100644
--- a/inst/include/boost/asio/signal_set.hpp
+++ b/inst/include/boost/asio/signal_set.hpp
@@ -2,7 +2,7 @@
 // signal_set.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/signal_set_base.hpp b/inst/include/boost/asio/signal_set_base.hpp
index f7d960901..816781865 100644
--- a/inst/include/boost/asio/signal_set_base.hpp
+++ b/inst/include/boost/asio/signal_set_base.hpp
@@ -2,7 +2,7 @@
 // signal_set_base.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/socket_base.hpp b/inst/include/boost/asio/socket_base.hpp
index 012c014a6..edd9c4724 100644
--- a/inst/include/boost/asio/socket_base.hpp
+++ b/inst/include/boost/asio/socket_base.hpp
@@ -2,7 +2,7 @@
 // socket_base.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -535,17 +535,6 @@ class socket_base
       = BOOST_ASIO_OS_DEF(SOMAXCONN));
 #endif
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use max_listen_connections.) The maximum length of the queue
-  /// of pending incoming connections.
-#if defined(GENERATING_DOCUMENTATION)
-  static const int max_connections = implementation_defined;
-#else
-  BOOST_ASIO_STATIC_CONSTANT(int, max_connections
-      = BOOST_ASIO_OS_DEF(SOMAXCONN));
-#endif
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 protected:
   /// Protected destructor to prevent deletion through this type.
   ~socket_base()
diff --git a/inst/include/boost/asio/spawn.hpp b/inst/include/boost/asio/spawn.hpp
index 6cd073223..675c8c32d 100644
--- a/inst/include/boost/asio/spawn.hpp
+++ b/inst/include/boost/asio/spawn.hpp
@@ -2,7 +2,7 @@
 // spawn.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -26,10 +26,6 @@
 #include <boost/asio/is_executor.hpp>
 #include <boost/asio/strand.hpp>
 
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-# include <boost/coroutine/all.hpp>
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
@@ -146,7 +142,6 @@ class spawned_thread_base
   }
 };
 
-
 template <typename T>
 struct spawn_signature
 {
@@ -407,14 +402,6 @@ template <typename Executor, typename F,
         CompletionToken = default_completion_token_t<Executor>>
 auto spawn(const Executor& ex, F&& function,
     CompletionToken&& token = default_completion_token_t<Executor>(),
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    constraint_t<
-      !is_same<
-        decay_t<CompletionToken>,
-        boost::coroutines::attributes
-      >::value
-    > = 0,
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     constraint_t<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
     > = 0)
@@ -463,14 +450,6 @@ template <typename ExecutionContext, typename F,
 auto spawn(ExecutionContext& ctx, F&& function,
     CompletionToken&& token
       = default_completion_token_t<typename ExecutionContext::executor_type>(),
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    constraint_t<
-      !is_same<
-        decay_t<CompletionToken>,
-        boost::coroutines::attributes
-      >::value
-    > = 0,
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     constraint_t<
       is_convertible<ExecutionContext&, execution_context&>::value
     > = 0)
@@ -520,14 +499,6 @@ template <typename Executor, typename F,
         CompletionToken = default_completion_token_t<Executor>>
 auto spawn(const basic_yield_context<Executor>& ctx, F&& function,
     CompletionToken&& token = default_completion_token_t<Executor>(),
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-    constraint_t<
-      !is_same<
-        decay_t<CompletionToken>,
-        boost::coroutines::attributes
-      >::value
-    > = 0,
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
     constraint_t<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
     > = 0)
@@ -709,159 +680,6 @@ auto spawn(const basic_yield_context<Executor>& ctx, allocator_arg_t,
 #endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
        //   || defined(GENERATING_DOCUMENTATION)
 
-#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE) \
-  || defined(GENERATING_DOCUMENTATION)
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine, calling the specified handler when it completes.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(basic_yield_context<Executor> yield); @endcode
- * where Executor is the associated executor type of @c Function.
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Function>
-void spawn(Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes());
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine, calling the specified handler when it completes.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param handler A handler to be called when the coroutine exits. More
- * importantly, the handler provides an execution context (via the the handler
- * invocation hook) for the coroutine. The handler must have the signature:
- * @code void handler(); @endcode
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(basic_yield_context<Executor> yield); @endcode
- * where Executor is the associated executor type of @c Handler.
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Handler, typename Function>
-void spawn(Handler&& handler, Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes(),
-    constraint_t<
-      !is_executor<decay_t<Handler>>::value &&
-      !execution::is_executor<decay_t<Handler>>::value &&
-      !is_convertible<Handler&, execution_context&>::value
-    > = 0);
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine, inheriting the execution context of another.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param ctx Identifies the current coroutine as a parent of the new
- * coroutine. This specifies that the new coroutine should inherit the
- * execution context of the parent. For example, if the parent coroutine is
- * executing in a particular strand, then the new coroutine will execute in the
- * same strand.
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(basic_yield_context<Executor> yield); @endcode
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Executor, typename Function>
-void spawn(basic_yield_context<Executor> ctx, Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes());
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine that executes on a given executor.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param ex Identifies the executor that will run the coroutine. The new
- * coroutine is automatically given its own explicit strand within this
- * executor.
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(yield_context yield); @endcode
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Function, typename Executor>
-void spawn(const Executor& ex, Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes(),
-    constraint_t<
-      is_executor<Executor>::value || execution::is_executor<Executor>::value
-    > = 0);
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine that executes on a given strand.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param ex Identifies the strand that will run the coroutine.
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(yield_context yield); @endcode
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Function, typename Executor>
-void spawn(const strand<Executor>& ex, Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes());
-
-#if !defined(BOOST_ASIO_NO_TS_EXECUTORS)
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine that executes in the context of a strand.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param s Identifies a strand. By starting multiple coroutines on the same
- * strand, the implementation ensures that none of those coroutines can execute
- * simultaneously.
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(yield_context yield); @endcode
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Function>
-void spawn(const boost::asio::io_context::strand& s, Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes());
-
-#endif // !defined(BOOST_ASIO_NO_TS_EXECUTORS)
-
-/// (Deprecated: Use overloads with a completion token.) Start a new stackful
-/// coroutine that executes on a given execution context.
-/**
- * This function is used to launch a new coroutine.
- *
- * @param ctx Identifies the execution context that will run the coroutine. The
- * new coroutine is implicitly given its own strand within this execution
- * context.
- *
- * @param function The coroutine function. The function must have the signature:
- * @code void function(yield_context yield); @endcode
- *
- * @param attributes Boost.Coroutine attributes used to customise the coroutine.
- */
-template <typename Function, typename ExecutionContext>
-void spawn(ExecutionContext& ctx, Function&& function,
-    const boost::coroutines::attributes& attributes
-      = boost::coroutines::attributes(),
-    constraint_t<
-      is_convertible<ExecutionContext&, execution_context&>::value
-    > = 0);
-
-#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
-       //   || defined(GENERATING_DOCUMENTATION)
-
 /*@}*/
 
 } // namespace asio
diff --git a/inst/include/boost/asio/ssl.hpp b/inst/include/boost/asio/ssl.hpp
index ed7d4e730..e6b6e40f9 100644
--- a/inst/include/boost/asio/ssl.hpp
+++ b/inst/include/boost/asio/ssl.hpp
@@ -2,7 +2,7 @@
 // ssl.hpp
 // ~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,7 +18,6 @@
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/ssl/context_base.hpp>
 #include <boost/asio/ssl/error.hpp>
-#include <boost/asio/ssl/rfc2818_verification.hpp>
 #include <boost/asio/ssl/host_name_verification.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/asio/ssl/stream_base.hpp>
diff --git a/inst/include/boost/asio/ssl/context.hpp b/inst/include/boost/asio/ssl/context.hpp
index 372a0d3dc..4c3262979 100644
--- a/inst/include/boost/asio/ssl/context.hpp
+++ b/inst/include/boost/asio/ssl/context.hpp
@@ -2,7 +2,7 @@
 // ssl/context.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/context_base.hpp b/inst/include/boost/asio/ssl/context_base.hpp
index 6a418c7b6..8d7d8aa94 100644
--- a/inst/include/boost/asio/ssl/context_base.hpp
+++ b/inst/include/boost/asio/ssl/context_base.hpp
@@ -2,7 +2,7 @@
 // ssl/context_base.hpp
 // ~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/buffered_handshake_op.hpp b/inst/include/boost/asio/ssl/detail/buffered_handshake_op.hpp
index 1aff9160e..22a2da389 100644
--- a/inst/include/boost/asio/ssl/detail/buffered_handshake_op.hpp
+++ b/inst/include/boost/asio/ssl/detail/buffered_handshake_op.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/buffered_handshake_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/engine.hpp b/inst/include/boost/asio/ssl/detail/engine.hpp
index 59dbe55c9..aeff49a43 100644
--- a/inst/include/boost/asio/ssl/detail/engine.hpp
+++ b/inst/include/boost/asio/ssl/detail/engine.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/engine.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/handshake_op.hpp b/inst/include/boost/asio/ssl/detail/handshake_op.hpp
index c91bc0f7e..e509b4293 100644
--- a/inst/include/boost/asio/ssl/detail/handshake_op.hpp
+++ b/inst/include/boost/asio/ssl/detail/handshake_op.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/handshake_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/impl/engine.ipp b/inst/include/boost/asio/ssl/detail/impl/engine.ipp
index ec3b2820f..e6e4dad88 100644
--- a/inst/include/boost/asio/ssl/detail/impl/engine.ipp
+++ b/inst/include/boost/asio/ssl/detail/impl/engine.ipp
@@ -2,7 +2,7 @@
 // ssl/detail/impl/engine.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -101,6 +101,12 @@ engine& engine::operator=(engine&& other) noexcept
 {
   if (this != &other)
   {
+    if (ext_bio_)
+      ::BIO_free(ext_bio_);
+
+    if (ssl_)
+      ::SSL_free(ssl_);
+
     ssl_ = other.ssl_;
     ext_bio_ = other.ext_bio_;
     other.ssl_ = 0;
diff --git a/inst/include/boost/asio/ssl/detail/impl/openssl_init.ipp b/inst/include/boost/asio/ssl/detail/impl/openssl_init.ipp
index 46080ca3a..ea10e242f 100644
--- a/inst/include/boost/asio/ssl/detail/impl/openssl_init.ipp
+++ b/inst/include/boost/asio/ssl/detail/impl/openssl_init.ipp
@@ -3,7 +3,7 @@
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com
-// Copyright (c) 2005-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2005-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -38,7 +38,7 @@ public:
   {
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     ::SSL_library_init();
-    ::SSL_load_error_strings();        
+    ::SSL_load_error_strings();
     ::OpenSSL_add_all_algorithms();
 
     mutexes_.resize(::CRYPTO_num_locks());
@@ -124,7 +124,7 @@ private:
 #endif // (OPENSSL_VERSION_NUMBER < 0x10000000L)
 
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-  static void openssl_locking_func(int mode, int n, 
+  static void openssl_locking_func(int mode, int n,
     const char* /*file*/, int /*line*/)
   {
     if (mode & CRYPTO_LOCK)
diff --git a/inst/include/boost/asio/ssl/detail/io.hpp b/inst/include/boost/asio/ssl/detail/io.hpp
index 879267c7e..0545a5b53 100644
--- a/inst/include/boost/asio/ssl/detail/io.hpp
+++ b/inst/include/boost/asio/ssl/detail/io.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/io.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/openssl_init.hpp b/inst/include/boost/asio/ssl/detail/openssl_init.hpp
index e1aa4d518..d23f9768d 100644
--- a/inst/include/boost/asio/ssl/detail/openssl_init.hpp
+++ b/inst/include/boost/asio/ssl/detail/openssl_init.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/openssl_init.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/openssl_types.hpp b/inst/include/boost/asio/ssl/detail/openssl_types.hpp
index de5a51276..e689f1dba 100644
--- a/inst/include/boost/asio/ssl/detail/openssl_types.hpp
+++ b/inst/include/boost/asio/ssl/detail/openssl_types.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/openssl_types.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/password_callback.hpp b/inst/include/boost/asio/ssl/detail/password_callback.hpp
index 971ba4c32..fb6b2a69f 100644
--- a/inst/include/boost/asio/ssl/detail/password_callback.hpp
+++ b/inst/include/boost/asio/ssl/detail/password_callback.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/password_callback.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/read_op.hpp b/inst/include/boost/asio/ssl/detail/read_op.hpp
index ad613d1d6..60856dd19 100644
--- a/inst/include/boost/asio/ssl/detail/read_op.hpp
+++ b/inst/include/boost/asio/ssl/detail/read_op.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/read_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/shutdown_op.hpp b/inst/include/boost/asio/ssl/detail/shutdown_op.hpp
index 6699a8203..8bff9f94e 100644
--- a/inst/include/boost/asio/ssl/detail/shutdown_op.hpp
+++ b/inst/include/boost/asio/ssl/detail/shutdown_op.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/shutdown_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/stream_core.hpp b/inst/include/boost/asio/ssl/detail/stream_core.hpp
index 1507a9211..ad98ad12c 100644
--- a/inst/include/boost/asio/ssl/detail/stream_core.hpp
+++ b/inst/include/boost/asio/ssl/detail/stream_core.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/stream_core.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,13 +17,9 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-# include <boost/asio/deadline_timer.hpp>
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-# include <boost/asio/steady_timer.hpp>
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 #include <boost/asio/ssl/detail/engine.hpp>
 #include <boost/asio/buffer.hpp>
+#include <boost/asio/steady_timer.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -68,21 +64,12 @@ struct stream_core
 
   stream_core(stream_core&& other)
     : engine_(static_cast<engine&&>(other.engine_)),
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      pending_read_(
-         static_cast<boost::asio::deadline_timer&&>(
-           other.pending_read_)),
-      pending_write_(
-         static_cast<boost::asio::deadline_timer&&>(
-           other.pending_write_)),
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
       pending_read_(
          static_cast<boost::asio::steady_timer&&>(
            other.pending_read_)),
       pending_write_(
          static_cast<boost::asio::steady_timer&&>(
            other.pending_write_)),
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
       output_buffer_space_(
           static_cast<std::vector<unsigned char>&&>(
             other.output_buffer_space_)),
@@ -107,21 +94,12 @@ struct stream_core
     if (this != &other)
     {
       engine_ = static_cast<engine&&>(other.engine_);
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-      pending_read_ =
-        static_cast<boost::asio::deadline_timer&&>(
-          other.pending_read_);
-      pending_write_ =
-        static_cast<boost::asio::deadline_timer&&>(
-          other.pending_write_);
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
       pending_read_ =
         static_cast<boost::asio::steady_timer&&>(
           other.pending_read_);
       pending_write_ =
         static_cast<boost::asio::steady_timer&&>(
           other.pending_write_);
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
       output_buffer_space_ =
         static_cast<std::vector<unsigned char>&&>(
           other.output_buffer_space_);
@@ -141,32 +119,6 @@ struct stream_core
   // The SSL engine.
   engine engine_;
 
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-  // Timer used for storing queued read operations.
-  boost::asio::deadline_timer pending_read_;
-
-  // Timer used for storing queued write operations.
-  boost::asio::deadline_timer pending_write_;
-
-  // Helper function for obtaining a time value that always fires.
-  static boost::asio::deadline_timer::time_type neg_infin()
-  {
-    return boost::posix_time::neg_infin;
-  }
-
-  // Helper function for obtaining a time value that never fires.
-  static boost::asio::deadline_timer::time_type pos_infin()
-  {
-    return boost::posix_time::pos_infin;
-  }
-
-  // Helper function to get a timer's expiry time.
-  static boost::asio::deadline_timer::time_type expiry(
-      const boost::asio::deadline_timer& timer)
-  {
-    return timer.expires_at();
-  }
-#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
   // Timer used for storing queued read operations.
   boost::asio::steady_timer pending_read_;
 
@@ -191,7 +143,6 @@ struct stream_core
   {
     return timer.expiry();
   }
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
   // Buffer space used to prepare output intended for the transport.
   std::vector<unsigned char> output_buffer_space_;
diff --git a/inst/include/boost/asio/ssl/detail/verify_callback.hpp b/inst/include/boost/asio/ssl/detail/verify_callback.hpp
index 6faeef882..fad72884e 100644
--- a/inst/include/boost/asio/ssl/detail/verify_callback.hpp
+++ b/inst/include/boost/asio/ssl/detail/verify_callback.hpp
@@ -1,8 +1,8 @@
 //
 // ssl/detail/verify_callback.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/detail/write_op.hpp b/inst/include/boost/asio/ssl/detail/write_op.hpp
index ff719b4df..959bc43b3 100644
--- a/inst/include/boost/asio/ssl/detail/write_op.hpp
+++ b/inst/include/boost/asio/ssl/detail/write_op.hpp
@@ -2,7 +2,7 @@
 // ssl/detail/write_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/error.hpp b/inst/include/boost/asio/ssl/error.hpp
index b3c674e78..76c2d0d0f 100644
--- a/inst/include/boost/asio/ssl/error.hpp
+++ b/inst/include/boost/asio/ssl/error.hpp
@@ -2,7 +2,7 @@
 // ssl/error.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/host_name_verification.hpp b/inst/include/boost/asio/ssl/host_name_verification.hpp
index 35d7c01b2..6d78375d1 100644
--- a/inst/include/boost/asio/ssl/host_name_verification.hpp
+++ b/inst/include/boost/asio/ssl/host_name_verification.hpp
@@ -2,7 +2,7 @@
 // ssl/host_name_verification.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/impl/context.hpp b/inst/include/boost/asio/ssl/impl/context.hpp
index 345a389cf..d9fbeb5b3 100644
--- a/inst/include/boost/asio/ssl/impl/context.hpp
+++ b/inst/include/boost/asio/ssl/impl/context.hpp
@@ -3,7 +3,7 @@
 // ~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com
-// Copyright (c) 2005-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2005-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/impl/context.ipp b/inst/include/boost/asio/ssl/impl/context.ipp
index b3873605f..3b1b7f536 100644
--- a/inst/include/boost/asio/ssl/impl/context.ipp
+++ b/inst/include/boost/asio/ssl/impl/context.ipp
@@ -3,7 +3,7 @@
 // ~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com
-// Copyright (c) 2005-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2005-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -270,8 +270,9 @@ context::context(context::method m)
 #endif // defined(SSL_TXT_TLSV1_2)
 
     // TLS v1.3.
-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) \
-    && !defined(LIBRESSL_VERSION_NUMBER)
+#if ((OPENSSL_VERSION_NUMBER >= 0x10101000L) \
+      && !defined(LIBRESSL_VERSION_NUMBER)) \
+    || defined(BOOST_ASIO_USE_WOLFSSL)
   case context::tlsv13:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -296,16 +297,18 @@ context::context(context::method m)
       SSL_CTX_set_max_proto_version(handle_, TLS1_3_VERSION);
     }
     break;
-#else // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-      //   && !defined(LIBRESSL_VERSION_NUMBER)
+#else // ((OPENSSL_VERSION_NUMBER >= 0x10101000L)
+      //     && !defined(LIBRESSL_VERSION_NUMBER))
+      //   || defined(BOOST_ASIO_USE_WOLFSSL)
   case context::tlsv13:
   case context::tlsv13_client:
   case context::tlsv13_server:
     boost::asio::detail::throw_error(
         boost::asio::error::invalid_argument, "context");
     break;
-#endif // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-       //   && !defined(LIBRESSL_VERSION_NUMBER)
+#endif // ((OPENSSL_VERSION_NUMBER >= 0x10101000L)
+       //     && !defined(LIBRESSL_VERSION_NUMBER))
+       //   || defined(BOOST_ASIO_USE_WOLFSSL)
 
     // Any supported SSL/TLS version.
   case context::sslv23:
@@ -795,7 +798,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain(
         BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
       }
     }
-  
+
     result = ::ERR_peek_last_error();
     if ((ERR_GET_LIB(result) == ERR_LIB_PEM)
         && (ERR_GET_REASON(result) == PEM_R_NO_START_LINE))
diff --git a/inst/include/boost/asio/ssl/impl/error.ipp b/inst/include/boost/asio/ssl/impl/error.ipp
index c37ffd82f..e0b6d3707 100644
--- a/inst/include/boost/asio/ssl/impl/error.ipp
+++ b/inst/include/boost/asio/ssl/impl/error.ipp
@@ -2,7 +2,7 @@
 // ssl/impl/error.ipp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/impl/host_name_verification.ipp b/inst/include/boost/asio/ssl/impl/host_name_verification.ipp
index ff49f5380..4abf394a4 100644
--- a/inst/include/boost/asio/ssl/impl/host_name_verification.ipp
+++ b/inst/include/boost/asio/ssl/impl/host_name_verification.ipp
@@ -2,7 +2,7 @@
 // ssl/impl/host_name_verification.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/impl/rfc2818_verification.ipp b/inst/include/boost/asio/ssl/impl/rfc2818_verification.ipp
deleted file mode 100644
index 0996831d6..000000000
--- a/inst/include/boost/asio/ssl/impl/rfc2818_verification.ipp
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// ssl/impl/rfc2818_verification.ipp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_SSL_IMPL_RFC2818_VERIFICATION_IPP
-#define BOOST_ASIO_SSL_IMPL_RFC2818_VERIFICATION_IPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/detail/config.hpp>
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-#include <cctype>
-#include <cstring>
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/ssl/rfc2818_verification.hpp>
-#include <boost/asio/ssl/detail/openssl_types.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-
-namespace boost {
-namespace asio {
-namespace ssl {
-
-bool rfc2818_verification::operator()(
-    bool preverified, verify_context& ctx) const
-{
-  using namespace std; // For memcmp.
-
-  // Don't bother looking at certificates that have failed pre-verification.
-  if (!preverified)
-    return false;
-
-  // We're only interested in checking the certificate at the end of the chain.
-  int depth = X509_STORE_CTX_get_error_depth(ctx.native_handle());
-  if (depth > 0)
-    return true;
-
-  // Try converting the host name to an address. If it is an address then we
-  // need to look for an IP address in the certificate rather than a host name.
-  boost::system::error_code ec;
-  ip::address address = ip::make_address(host_, ec);
-  bool is_address = !ec;
-
-  X509* cert = X509_STORE_CTX_get_current_cert(ctx.native_handle());
-
-  // Go through the alternate names in the certificate looking for matching DNS
-  // or IP address entries.
-  GENERAL_NAMES* gens = static_cast<GENERAL_NAMES*>(
-      X509_get_ext_d2i(cert, NID_subject_alt_name, 0, 0));
-  for (int i = 0; i < sk_GENERAL_NAME_num(gens); ++i)
-  {
-    GENERAL_NAME* gen = sk_GENERAL_NAME_value(gens, i);
-    if (gen->type == GEN_DNS && !is_address)
-    {
-      ASN1_IA5STRING* domain = gen->d.dNSName;
-      if (domain->type == V_ASN1_IA5STRING && domain->data && domain->length)
-      {
-        const char* pattern = reinterpret_cast<const char*>(domain->data);
-        std::size_t pattern_length = domain->length;
-        if (match_pattern(pattern, pattern_length, host_.c_str()))
-        {
-          GENERAL_NAMES_free(gens);
-          return true;
-        }
-      }
-    }
-    else if (gen->type == GEN_IPADD && is_address)
-    {
-      ASN1_OCTET_STRING* ip_address = gen->d.iPAddress;
-      if (ip_address->type == V_ASN1_OCTET_STRING && ip_address->data)
-      {
-        if (address.is_v4() && ip_address->length == 4)
-        {
-          ip::address_v4::bytes_type bytes = address.to_v4().to_bytes();
-          if (memcmp(bytes.data(), ip_address->data, 4) == 0)
-          {
-            GENERAL_NAMES_free(gens);
-            return true;
-          }
-        }
-        else if (address.is_v6() && ip_address->length == 16)
-        {
-          ip::address_v6::bytes_type bytes = address.to_v6().to_bytes();
-          if (memcmp(bytes.data(), ip_address->data, 16) == 0)
-          {
-            GENERAL_NAMES_free(gens);
-            return true;
-          }
-        }
-      }
-    }
-  }
-  GENERAL_NAMES_free(gens);
-
-  // No match in the alternate names, so try the common names. We should only
-  // use the "most specific" common name, which is the last one in the list.
-  X509_NAME* name = X509_get_subject_name(cert);
-  int i = -1;
-  ASN1_STRING* common_name = 0;
-  while ((i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) >= 0)
-  {
-    X509_NAME_ENTRY* name_entry = X509_NAME_get_entry(name, i);
-    common_name = X509_NAME_ENTRY_get_data(name_entry);
-  }
-  if (common_name && common_name->data && common_name->length)
-  {
-    const char* pattern = reinterpret_cast<const char*>(common_name->data);
-    std::size_t pattern_length = common_name->length;
-    if (match_pattern(pattern, pattern_length, host_.c_str()))
-      return true;
-  }
-
-  return false;
-}
-
-bool rfc2818_verification::match_pattern(const char* pattern,
-    std::size_t pattern_length, const char* host)
-{
-  using namespace std; // For tolower.
-
-  const char* p = pattern;
-  const char* p_end = p + pattern_length;
-  const char* h = host;
-
-  while (p != p_end && *h)
-  {
-    if (*p == '*')
-    {
-      ++p;
-      while (*h && *h != '.')
-        if (match_pattern(p, p_end - p, h++))
-          return true;
-    }
-    else if (tolower(*p) == tolower(*h))
-    {
-      ++p;
-      ++h;
-    }
-    else
-    {
-      return false;
-    }
-  }
-
-  return p == p_end && !*h;
-}
-
-} // namespace ssl
-} // namespace asio
-} // namespace boost
-
-#include <boost/asio/detail/pop_options.hpp>
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-#endif // BOOST_ASIO_SSL_IMPL_RFC2818_VERIFICATION_IPP
diff --git a/inst/include/boost/asio/ssl/impl/src.hpp b/inst/include/boost/asio/ssl/impl/src.hpp
index 0f9d7b80d..64bf8a1f7 100644
--- a/inst/include/boost/asio/ssl/impl/src.hpp
+++ b/inst/include/boost/asio/ssl/impl/src.hpp
@@ -2,7 +2,7 @@
 // impl/ssl/src.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -24,6 +24,5 @@
 #include <boost/asio/ssl/detail/impl/engine.ipp>
 #include <boost/asio/ssl/detail/impl/openssl_init.ipp>
 #include <boost/asio/ssl/impl/host_name_verification.ipp>
-#include <boost/asio/ssl/impl/rfc2818_verification.ipp>
 
 #endif // BOOST_ASIO_SSL_IMPL_SRC_HPP
diff --git a/inst/include/boost/asio/ssl/rfc2818_verification.hpp b/inst/include/boost/asio/ssl/rfc2818_verification.hpp
deleted file mode 100644
index f5a36a9b7..000000000
--- a/inst/include/boost/asio/ssl/rfc2818_verification.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// ssl/rfc2818_verification.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_ASIO_SSL_RFC2818_VERIFICATION_HPP
-#define BOOST_ASIO_SSL_RFC2818_VERIFICATION_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include <boost/asio/detail/config.hpp>
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-#include <string>
-#include <boost/asio/ssl/detail/openssl_types.hpp>
-#include <boost/asio/ssl/verify_context.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-
-namespace boost {
-namespace asio {
-namespace ssl {
-
-/// (Deprecated. Use ssl::host_name_verification.) Verifies a certificate
-/// against a hostname according to the rules described in RFC 2818.
-/**
- * @par Example
- * The following example shows how to synchronously open a secure connection to
- * a given host name:
- * @code
- * using boost::asio::ip::tcp;
- * namespace ssl = boost::asio::ssl;
- * typedef ssl::stream<tcp::socket> ssl_socket;
- *
- * // Create a context that uses the default paths for finding CA certificates.
- * ssl::context ctx(ssl::context::sslv23);
- * ctx.set_default_verify_paths();
- *
- * // Open a socket and connect it to the remote host.
- * boost::asio::io_context io_context;
- * ssl_socket sock(io_context, ctx);
- * tcp::resolver resolver(io_context);
- * tcp::resolver::query query("host.name", "https");
- * boost::asio::connect(sock.lowest_layer(), resolver.resolve(query));
- * sock.lowest_layer().set_option(tcp::no_delay(true));
- *
- * // Perform SSL handshake and verify the remote host's certificate.
- * sock.set_verify_mode(ssl::verify_peer);
- * sock.set_verify_callback(ssl::rfc2818_verification("host.name"));
- * sock.handshake(ssl_socket::client);
- *
- * // ... read and write as normal ...
- * @endcode
- */
-class rfc2818_verification
-{
-public:
-  /// The type of the function object's result.
-  typedef bool result_type;
-
-  /// Constructor.
-  explicit rfc2818_verification(const std::string& host)
-    : host_(host)
-  {
-  }
-
-  /// Perform certificate verification.
-  BOOST_ASIO_DECL bool operator()(bool preverified, verify_context& ctx) const;
-
-private:
-  // Helper function to check a host name against a pattern.
-  BOOST_ASIO_DECL static bool match_pattern(const char* pattern,
-      std::size_t pattern_length, const char* host);
-
-  // Helper function to check a host name against an IPv4 address
-  // The host name to be checked.
-  std::string host_;
-};
-
-} // namespace ssl
-} // namespace asio
-} // namespace boost
-
-#include <boost/asio/detail/pop_options.hpp>
-
-#if defined(BOOST_ASIO_HEADER_ONLY)
-# include <boost/asio/ssl/impl/rfc2818_verification.ipp>
-#endif // defined(BOOST_ASIO_HEADER_ONLY)
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-#endif // BOOST_ASIO_SSL_RFC2818_VERIFICATION_HPP
diff --git a/inst/include/boost/asio/ssl/stream.hpp b/inst/include/boost/asio/ssl/stream.hpp
index 45f358585..de2559bea 100644
--- a/inst/include/boost/asio/ssl/stream.hpp
+++ b/inst/include/boost/asio/ssl/stream.hpp
@@ -2,7 +2,7 @@
 // ssl/stream.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -56,7 +56,7 @@ namespace ssl {
  * @code
  * boost::asio::io_context my_context;
  * boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23);
- * boost::asio::ssl::stream<asio:ip::tcp::socket> sock(my_context, ctx);
+ * boost::asio::ssl::stream<boost::asio::ip::tcp::socket> sock(my_context, ctx);
  * @endcode
  *
  * @par Concepts:
@@ -188,7 +188,7 @@ class stream :
    * suitable for passing to functions such as @c SSL_get_verify_result and
    * @c SSL_get_peer_certificate:
    * @code
-   * boost::asio::ssl::stream<asio:ip::tcp::socket> sock(my_context, ctx);
+   * boost::asio::ssl::stream<boost::asio::ip::tcp::socket> sock(io_ctx, ctx);
    *
    * // ... establish connection and perform handshake ...
    *
@@ -482,7 +482,7 @@ class stream :
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -539,7 +539,7 @@ class stream :
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -619,7 +619,7 @@ class stream :
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
@@ -723,7 +723,7 @@ class stream :
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -831,7 +831,7 @@ class stream :
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/ssl/stream_base.hpp b/inst/include/boost/asio/ssl/stream_base.hpp
index 769bc2cfe..42036da91 100644
--- a/inst/include/boost/asio/ssl/stream_base.hpp
+++ b/inst/include/boost/asio/ssl/stream_base.hpp
@@ -2,7 +2,7 @@
 // ssl/stream_base.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/verify_context.hpp b/inst/include/boost/asio/ssl/verify_context.hpp
index 107b12845..61c225e0f 100644
--- a/inst/include/boost/asio/ssl/verify_context.hpp
+++ b/inst/include/boost/asio/ssl/verify_context.hpp
@@ -2,7 +2,7 @@
 // ssl/verify_context.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ssl/verify_mode.hpp b/inst/include/boost/asio/ssl/verify_mode.hpp
index cd22a6b47..68991637b 100644
--- a/inst/include/boost/asio/ssl/verify_mode.hpp
+++ b/inst/include/boost/asio/ssl/verify_mode.hpp
@@ -2,7 +2,7 @@
 // ssl/verify_mode.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/static_thread_pool.hpp b/inst/include/boost/asio/static_thread_pool.hpp
index 50b4da351..a021830a4 100644
--- a/inst/include/boost/asio/static_thread_pool.hpp
+++ b/inst/include/boost/asio/static_thread_pool.hpp
@@ -2,7 +2,7 @@
 // static_thread_pool.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/steady_timer.hpp b/inst/include/boost/asio/steady_timer.hpp
index 75ace35f3..47900bf1d 100644
--- a/inst/include/boost/asio/steady_timer.hpp
+++ b/inst/include/boost/asio/steady_timer.hpp
@@ -2,7 +2,7 @@
 // steady_timer.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/strand.hpp b/inst/include/boost/asio/strand.hpp
index d647b81d1..5d11fb1a8 100644
--- a/inst/include/boost/asio/strand.hpp
+++ b/inst/include/boost/asio/strand.hpp
@@ -2,7 +2,7 @@
 // strand.hpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/stream_file.hpp b/inst/include/boost/asio/stream_file.hpp
index 7579cbbb4..6b377656a 100644
--- a/inst/include/boost/asio/stream_file.hpp
+++ b/inst/include/boost/asio/stream_file.hpp
@@ -2,7 +2,7 @@
 // stream_file.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/streambuf.hpp b/inst/include/boost/asio/streambuf.hpp
index af0b78102..20aa97afd 100644
--- a/inst/include/boost/asio/streambuf.hpp
+++ b/inst/include/boost/asio/streambuf.hpp
@@ -2,7 +2,7 @@
 // streambuf.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/system_context.hpp b/inst/include/boost/asio/system_context.hpp
index 5c4581bbe..0a37571f6 100644
--- a/inst/include/boost/asio/system_context.hpp
+++ b/inst/include/boost/asio/system_context.hpp
@@ -2,7 +2,7 @@
 // system_context.hpp
 // ~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/system_executor.hpp b/inst/include/boost/asio/system_executor.hpp
index a30792e79..eaabd3b71 100644
--- a/inst/include/boost/asio/system_executor.hpp
+++ b/inst/include/boost/asio/system_executor.hpp
@@ -2,7 +2,7 @@
 // system_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/system_timer.hpp b/inst/include/boost/asio/system_timer.hpp
index 23062d162..2cc2e79cb 100644
--- a/inst/include/boost/asio/system_timer.hpp
+++ b/inst/include/boost/asio/system_timer.hpp
@@ -2,7 +2,7 @@
 // system_timer.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/this_coro.hpp b/inst/include/boost/asio/this_coro.hpp
index e03771e2d..02accdf78 100644
--- a/inst/include/boost/asio/this_coro.hpp
+++ b/inst/include/boost/asio/this_coro.hpp
@@ -2,7 +2,7 @@
 // this_coro.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -33,7 +33,7 @@ struct executor_t
 };
 
 /// Awaitable object that returns the executor of the current coroutine.
-constexpr executor_t executor;
+BOOST_ASIO_INLINE_VARIABLE constexpr executor_t executor;
 
 /// Awaitable type that returns the cancellation state of the current coroutine.
 struct cancellation_state_t
@@ -58,7 +58,7 @@ struct cancellation_state_t
  *     // ...
  * } @endcode
  */
-constexpr cancellation_state_t cancellation_state;
+BOOST_ASIO_INLINE_VARIABLE constexpr cancellation_state_t cancellation_state;
 
 #if defined(GENERATING_DOCUMENTATION)
 
diff --git a/inst/include/boost/asio/thread_pool.hpp b/inst/include/boost/asio/thread_pool.hpp
index 2c16edaba..c6b984362 100644
--- a/inst/include/boost/asio/thread_pool.hpp
+++ b/inst/include/boost/asio/thread_pool.hpp
@@ -2,7 +2,7 @@
 // thread_pool.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -42,6 +42,17 @@ namespace detail {
  * The thread pool class is an execution context where functions are permitted
  * to run on one of a fixed number of threads.
  *
+ * @par Thread Safety
+ * @e Distinct @e objects: Safe.@n
+ * @e Shared @e objects: Safe, with the specific exceptions of the join()
+ * wait() and notify_fork() functions. The join() and wait() functions must not
+ * be called at the same time as other calls to join() or wait() on the same
+ * pool. The notify_fork() function should not be called while any thread_pool
+ * function, or any function on an I/O object that is associated with the
+ * thread_pool, is being called in another thread. (In effect, this means that
+ * notify_fork() is safe only on a thread pool that has no internal or attached
+ * threads at the time.)
+ *
  * @par Submitting tasks to the pool
  *
  * To submit functions to the thread pool, use the @ref boost::asio::dispatch,
@@ -93,6 +104,19 @@ class thread_pool
   /// Constructs a pool with a specified number of threads.
   BOOST_ASIO_DECL thread_pool(std::size_t num_threads);
 
+  /// Constructs a pool with a specified number of threads.
+  /**
+   * Construct with a service maker, to create an initial set of services that
+   * will be installed into the execution context at construction time.
+   *
+   * @param num_threads The number of threads required.
+   *
+   * @param initial_services Used to create the initial services. The @c make
+   * function will be called once at the end of execution_context construction.
+   */
+  BOOST_ASIO_DECL thread_pool(std::size_t num_threads,
+      const execution_context::service_maker& initial_services);
+
   /// Destructor.
   /**
    * Automatically stops and joins the pool, if not explicitly done beforehand.
@@ -133,6 +157,8 @@ class thread_pool
    * This function blocks until the threads in the pool have completed. If @c
    * stop() is not called prior to @c wait(), the @c wait() call will wait
    * until the pool has no more outstanding work.
+   *
+   * @note @c wait() is synonymous with @c join().
    */
   BOOST_ASIO_DECL void wait();
 
@@ -153,6 +179,9 @@ class thread_pool
 
   // The current number of threads in the pool.
   detail::atomic_count num_threads_;
+
+  // Whether a join call will have any effect.
+  bool joinable_;
 };
 
 /// Executor implementation type used to submit functions to a thread pool.
diff --git a/inst/include/boost/asio/time_traits.hpp b/inst/include/boost/asio/time_traits.hpp
index 80d40b771..90169257b 100644
--- a/inst/include/boost/asio/time_traits.hpp
+++ b/inst/include/boost/asio/time_traits.hpp
@@ -2,7 +2,7 @@
 // time_traits.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,8 @@
 
 #include <boost/asio/detail/socket_types.hpp> // Must come before posix_time.
 
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
   || defined(GENERATING_DOCUMENTATION)
 
@@ -27,11 +29,11 @@
 namespace boost {
 namespace asio {
 
-/// Time traits suitable for use with the deadline timer.
+/// (Deprecated) Time traits suitable for use with the deadline timer.
 template <typename Time>
 struct time_traits;
 
-/// Time traits specialised for posix_time.
+/// (Deprecated) Time traits specialised for posix_time.
 template <>
 struct time_traits<boost::posix_time::ptime>
 {
@@ -85,4 +87,6 @@ struct time_traits<boost::posix_time::ptime>
 #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
        // || defined(GENERATING_DOCUMENTATION)
 
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
+
 #endif // BOOST_ASIO_TIME_TRAITS_HPP
diff --git a/inst/include/boost/asio/traits/equality_comparable.hpp b/inst/include/boost/asio/traits/equality_comparable.hpp
index 8a6898ac2..43a58c15a 100644
--- a/inst/include/boost/asio/traits/equality_comparable.hpp
+++ b/inst/include/boost/asio/traits/equality_comparable.hpp
@@ -2,7 +2,7 @@
 // traits/equality_comparable.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/execute_member.hpp b/inst/include/boost/asio/traits/execute_member.hpp
index 403e7004f..b5fb3a6f4 100644
--- a/inst/include/boost/asio/traits/execute_member.hpp
+++ b/inst/include/boost/asio/traits/execute_member.hpp
@@ -2,7 +2,7 @@
 // traits/execute_member.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/prefer_free.hpp b/inst/include/boost/asio/traits/prefer_free.hpp
index 3ce9e7189..59a412da8 100644
--- a/inst/include/boost/asio/traits/prefer_free.hpp
+++ b/inst/include/boost/asio/traits/prefer_free.hpp
@@ -2,7 +2,7 @@
 // traits/prefer_free.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/prefer_member.hpp b/inst/include/boost/asio/traits/prefer_member.hpp
index fafff093c..f86ccb3f6 100644
--- a/inst/include/boost/asio/traits/prefer_member.hpp
+++ b/inst/include/boost/asio/traits/prefer_member.hpp
@@ -2,7 +2,7 @@
 // traits/prefer_member.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/query_free.hpp b/inst/include/boost/asio/traits/query_free.hpp
index 51ef1eeaf..75de475f2 100644
--- a/inst/include/boost/asio/traits/query_free.hpp
+++ b/inst/include/boost/asio/traits/query_free.hpp
@@ -2,7 +2,7 @@
 // traits/query_free.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/query_member.hpp b/inst/include/boost/asio/traits/query_member.hpp
index bb48c7d16..bd846290f 100644
--- a/inst/include/boost/asio/traits/query_member.hpp
+++ b/inst/include/boost/asio/traits/query_member.hpp
@@ -2,7 +2,7 @@
 // traits/query_member.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/query_static_constexpr_member.hpp b/inst/include/boost/asio/traits/query_static_constexpr_member.hpp
index f63905373..2b9290ecd 100644
--- a/inst/include/boost/asio/traits/query_static_constexpr_member.hpp
+++ b/inst/include/boost/asio/traits/query_static_constexpr_member.hpp
@@ -2,7 +2,7 @@
 // traits/query_static_constexpr_member.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/require_concept_free.hpp b/inst/include/boost/asio/traits/require_concept_free.hpp
index 557c85ab7..992c8e14c 100644
--- a/inst/include/boost/asio/traits/require_concept_free.hpp
+++ b/inst/include/boost/asio/traits/require_concept_free.hpp
@@ -2,7 +2,7 @@
 // traits/require_concept_free.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/require_concept_member.hpp b/inst/include/boost/asio/traits/require_concept_member.hpp
index 59e53e6b5..6ebdfe4f6 100644
--- a/inst/include/boost/asio/traits/require_concept_member.hpp
+++ b/inst/include/boost/asio/traits/require_concept_member.hpp
@@ -2,7 +2,7 @@
 // traits/require_concept_member.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/require_free.hpp b/inst/include/boost/asio/traits/require_free.hpp
index ab6e3ab55..9d0a4cb20 100644
--- a/inst/include/boost/asio/traits/require_free.hpp
+++ b/inst/include/boost/asio/traits/require_free.hpp
@@ -2,7 +2,7 @@
 // traits/require_free.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/require_member.hpp b/inst/include/boost/asio/traits/require_member.hpp
index debc6ada1..144313190 100644
--- a/inst/include/boost/asio/traits/require_member.hpp
+++ b/inst/include/boost/asio/traits/require_member.hpp
@@ -2,7 +2,7 @@
 // traits/require_member.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/static_query.hpp b/inst/include/boost/asio/traits/static_query.hpp
index e5671b038..7d0617ad8 100644
--- a/inst/include/boost/asio/traits/static_query.hpp
+++ b/inst/include/boost/asio/traits/static_query.hpp
@@ -2,7 +2,7 @@
 // traits/static_query.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/static_require.hpp b/inst/include/boost/asio/traits/static_require.hpp
index 9eb87507d..2f1cb1388 100644
--- a/inst/include/boost/asio/traits/static_require.hpp
+++ b/inst/include/boost/asio/traits/static_require.hpp
@@ -2,7 +2,7 @@
 // traits/static_require.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/traits/static_require_concept.hpp b/inst/include/boost/asio/traits/static_require_concept.hpp
index de280becd..9767eb60d 100644
--- a/inst/include/boost/asio/traits/static_require_concept.hpp
+++ b/inst/include/boost/asio/traits/static_require_concept.hpp
@@ -2,7 +2,7 @@
 // traits/static_require_concept.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/ts/netfwd.hpp b/inst/include/boost/asio/ts/netfwd.hpp
index 848201bb2..327ea920a 100644
--- a/inst/include/boost/asio/ts/netfwd.hpp
+++ b/inst/include/boost/asio/ts/netfwd.hpp
@@ -2,7 +2,7 @@
 // ts/netfwd.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,10 +18,6 @@
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/chrono.hpp>
 
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-# include <boost/asio/detail/date_time_fwd.hpp>
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-
 #if !defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
 #include <boost/asio/execution/blocking.hpp>
 #include <boost/asio/execution/outstanding_work.hpp>
@@ -89,13 +85,6 @@ class io_context;
 template <typename Clock>
 struct wait_traits;
 
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-
-template <typename Time>
-struct time_traits;
-
-#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-
 #if !defined(BOOST_ASIO_BASIC_WAITABLE_TIMER_FWD_DECL)
 #define BOOST_ASIO_BASIC_WAITABLE_TIMER_FWD_DECL
 
@@ -151,14 +140,8 @@ class basic_socket_acceptor;
 
 // Forward declaration with defaulted arguments.
 template <typename Protocol,
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  || defined(GENERATING_DOCUMENTATION)
-    typename Clock = boost::posix_time::ptime,
-    typename WaitTraits = time_traits<Clock>>
-#else
     typename Clock = chrono::steady_clock,
     typename WaitTraits = wait_traits<Clock>>
-#endif
 class basic_socket_streambuf;
 
 #endif // !defined(BOOST_ASIO_BASIC_SOCKET_STREAMBUF_FWD_DECL)
@@ -168,14 +151,8 @@ class basic_socket_streambuf;
 
 // Forward declaration with defaulted arguments.
 template <typename Protocol,
-#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \
-  || defined(GENERATING_DOCUMENTATION)
-    typename Clock = boost::posix_time::ptime,
-    typename WaitTraits = time_traits<Clock>>
-#else
     typename Clock = chrono::steady_clock,
     typename WaitTraits = wait_traits<Clock>>
-#endif
 class basic_socket_iostream;
 
 #endif // !defined(BOOST_ASIO_BASIC_SOCKET_IOSTREAM_FWD_DECL)
diff --git a/inst/include/boost/asio/unyield.hpp b/inst/include/boost/asio/unyield.hpp
index ed70d5f50..f843d6137 100644
--- a/inst/include/boost/asio/unyield.hpp
+++ b/inst/include/boost/asio/unyield.hpp
@@ -2,7 +2,7 @@
 // unyield.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/use_awaitable.hpp b/inst/include/boost/asio/use_awaitable.hpp
index bb6cd27ba..5e0e95a9c 100644
--- a/inst/include/boost/asio/use_awaitable.hpp
+++ b/inst/include/boost/asio/use_awaitable.hpp
@@ -2,7 +2,7 @@
 // use_awaitable.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -146,9 +146,9 @@ struct use_awaitable_t
  * See the documentation for boost::asio::use_awaitable_t for a usage example.
  */
 #if defined(GENERATING_DOCUMENTATION)
-constexpr use_awaitable_t<> use_awaitable;
+BOOST_ASIO_INLINE_VARIABLE constexpr use_awaitable_t<> use_awaitable;
 #else
-constexpr use_awaitable_t<> use_awaitable(0, 0, 0);
+BOOST_ASIO_INLINE_VARIABLE constexpr use_awaitable_t<> use_awaitable(0, 0, 0);
 #endif
 
 } // namespace asio
diff --git a/inst/include/boost/asio/use_future.hpp b/inst/include/boost/asio/use_future.hpp
index bc14d0c1a..489c1d3be 100644
--- a/inst/include/boost/asio/use_future.hpp
+++ b/inst/include/boost/asio/use_future.hpp
@@ -2,7 +2,7 @@
 // use_future.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -74,15 +74,6 @@ class use_future_t
   {
   }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use rebind().) Specify an alternate allocator.
-  template <typename OtherAllocator>
-  use_future_t<OtherAllocator> operator[](const OtherAllocator& allocator) const
-  {
-    return use_future_t<OtherAllocator>(allocator);
-  }
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Specify an alternate allocator.
   template <typename OtherAllocator>
   use_future_t<OtherAllocator> rebind(const OtherAllocator& allocator) const
@@ -100,7 +91,7 @@ class use_future_t
   /**
    * The @c package function is used to adapt a function object as a packaged
    * task. When this adapter is passed as a completion token to an asynchronous
-   * operation, the result of the function object is retuned via a std::future.
+   * operation, the result of the function object is returned via a std::future.
    *
    * @par Example
    *
@@ -146,7 +137,7 @@ class use_future_t
 /**
  * See the documentation for boost::asio::use_future_t for a usage example.
  */
-constexpr use_future_t<> use_future;
+BOOST_ASIO_INLINE_VARIABLE constexpr use_future_t<> use_future;
 
 } // namespace asio
 } // namespace boost
diff --git a/inst/include/boost/asio/uses_executor.hpp b/inst/include/boost/asio/uses_executor.hpp
index d339d3aa2..d91f21781 100644
--- a/inst/include/boost/asio/uses_executor.hpp
+++ b/inst/include/boost/asio/uses_executor.hpp
@@ -2,7 +2,7 @@
 // uses_executor.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -46,7 +46,7 @@ struct executor_arg_t
  * See boost::asio::executor_arg_t and boost::asio::uses_executor
  * for more information.
  */
-constexpr executor_arg_t executor_arg;
+BOOST_ASIO_INLINE_VARIABLE constexpr executor_arg_t executor_arg;
 
 /// The uses_executor trait detects whether a type T has an associated executor
 /// that is convertible from type Executor.
diff --git a/inst/include/boost/asio/version.hpp b/inst/include/boost/asio/version.hpp
index a1c396dad..c0f19d3c6 100644
--- a/inst/include/boost/asio/version.hpp
+++ b/inst/include/boost/asio/version.hpp
@@ -2,7 +2,7 @@
 // version.hpp
 // ~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +18,6 @@
 // BOOST_ASIO_VERSION % 100 is the sub-minor version
 // BOOST_ASIO_VERSION / 100 % 1000 is the minor version
 // BOOST_ASIO_VERSION / 100000 is the major version
-#define BOOST_ASIO_VERSION 103000 // 1.30.0
+#define BOOST_ASIO_VERSION 103400 // 1.34.0
 
 #endif // BOOST_ASIO_VERSION_HPP
diff --git a/inst/include/boost/asio/wait_traits.hpp b/inst/include/boost/asio/wait_traits.hpp
index 9075b6d1a..6be03582c 100644
--- a/inst/include/boost/asio/wait_traits.hpp
+++ b/inst/include/boost/asio/wait_traits.hpp
@@ -2,7 +2,7 @@
 // wait_traits.hpp
 // ~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/windows/basic_object_handle.hpp b/inst/include/boost/asio/windows/basic_object_handle.hpp
index b39ed6244..d019e9b06 100644
--- a/inst/include/boost/asio/windows/basic_object_handle.hpp
+++ b/inst/include/boost/asio/windows/basic_object_handle.hpp
@@ -2,7 +2,7 @@
 // windows/basic_object_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2011 Boris Schaeling (boris@highscore.de)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -416,7 +416,7 @@ class basic_object_handle
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code) @endcode
diff --git a/inst/include/boost/asio/windows/basic_overlapped_handle.hpp b/inst/include/boost/asio/windows/basic_overlapped_handle.hpp
index 2389fe438..8fe69c784 100644
--- a/inst/include/boost/asio/windows/basic_overlapped_handle.hpp
+++ b/inst/include/boost/asio/windows/basic_overlapped_handle.hpp
@@ -2,7 +2,7 @@
 // windows/basic_overlapped_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/windows/basic_random_access_handle.hpp b/inst/include/boost/asio/windows/basic_random_access_handle.hpp
index 86f6d6497..7f191ca7d 100644
--- a/inst/include/boost/asio/windows/basic_random_access_handle.hpp
+++ b/inst/include/boost/asio/windows/basic_random_access_handle.hpp
@@ -2,7 +2,7 @@
 // windows/basic_random_access_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -309,7 +309,7 @@ class basic_random_access_handle
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -445,7 +445,7 @@ class basic_random_access_handle
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/windows/basic_stream_handle.hpp b/inst/include/boost/asio/windows/basic_stream_handle.hpp
index 25ea51b54..68cc7fac5 100644
--- a/inst/include/boost/asio/windows/basic_stream_handle.hpp
+++ b/inst/include/boost/asio/windows/basic_stream_handle.hpp
@@ -2,7 +2,7 @@
 // windows/basic_stream_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -300,7 +300,7 @@ class basic_stream_handle
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
@@ -429,7 +429,7 @@ class basic_stream_handle
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the completion handler will not be invoked from within this function.
    * On immediate completion, invocation of the handler will be performed in a
-   * manner equivalent to using boost::asio::post().
+   * manner equivalent to using boost::asio::async_immediate().
    *
    * @par Completion Signature
    * @code void(boost::system::error_code, std::size_t) @endcode
diff --git a/inst/include/boost/asio/windows/object_handle.hpp b/inst/include/boost/asio/windows/object_handle.hpp
index 3740337b3..003835454 100644
--- a/inst/include/boost/asio/windows/object_handle.hpp
+++ b/inst/include/boost/asio/windows/object_handle.hpp
@@ -2,7 +2,7 @@
 // windows/object_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2011 Boris Schaeling (boris@highscore.de)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/asio/windows/overlapped_handle.hpp b/inst/include/boost/asio/windows/overlapped_handle.hpp
index f3e6e04fa..dc2aa5946 100644
--- a/inst/include/boost/asio/windows/overlapped_handle.hpp
+++ b/inst/include/boost/asio/windows/overlapped_handle.hpp
@@ -2,7 +2,7 @@
 // windows/overlapped_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/windows/overlapped_ptr.hpp b/inst/include/boost/asio/windows/overlapped_ptr.hpp
index f6cd74ad0..cd2788ac6 100644
--- a/inst/include/boost/asio/windows/overlapped_ptr.hpp
+++ b/inst/include/boost/asio/windows/overlapped_ptr.hpp
@@ -2,7 +2,7 @@
 // windows/overlapped_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/windows/random_access_handle.hpp b/inst/include/boost/asio/windows/random_access_handle.hpp
index b62dfca10..714048e6d 100644
--- a/inst/include/boost/asio/windows/random_access_handle.hpp
+++ b/inst/include/boost/asio/windows/random_access_handle.hpp
@@ -2,7 +2,7 @@
 // windows/random_access_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/windows/stream_handle.hpp b/inst/include/boost/asio/windows/stream_handle.hpp
index 1530bf4f1..c57fa197a 100644
--- a/inst/include/boost/asio/windows/stream_handle.hpp
+++ b/inst/include/boost/asio/windows/stream_handle.hpp
@@ -2,7 +2,7 @@
 // windows/stream_handle.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/writable_pipe.hpp b/inst/include/boost/asio/writable_pipe.hpp
index 881df7924..ea659b0b5 100644
--- a/inst/include/boost/asio/writable_pipe.hpp
+++ b/inst/include/boost/asio/writable_pipe.hpp
@@ -2,7 +2,7 @@
 // writable_pipe.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/asio/write.hpp b/inst/include/boost/asio/write.hpp
index 870f96170..9888f79db 100644
--- a/inst/include/boost/asio/write.hpp
+++ b/inst/include/boost/asio/write.hpp
@@ -2,7 +2,7 @@
 // write.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -185,6 +185,9 @@ std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_const_buffer_sequence<ConstBufferSequence>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /// Write a certain amount of data to a stream before returning.
@@ -232,6 +235,9 @@ std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_const_buffer_sequence<ConstBufferSequence>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
@@ -357,6 +363,9 @@ std::size_t write(SyncWriteStream& s,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /// Write a certain amount of data to a stream before returning.
@@ -406,6 +415,9 @@ std::size_t write(SyncWriteStream& s,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -508,7 +520,10 @@ std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
 template <typename SyncWriteStream, typename Allocator,
     typename CompletionCondition>
 std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition);
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 /// Write a certain amount of data to a stream before returning.
 /**
@@ -549,7 +564,10 @@ std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
 template <typename SyncWriteStream, typename Allocator,
     typename CompletionCondition>
 std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, boost::system::error_code& ec);
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -664,6 +682,9 @@ std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /// Write a certain amount of data to a stream before returning.
@@ -709,6 +730,9 @@ std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition, boost::system::error_code& ec,
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0);
 
 /*@}*/
@@ -763,7 +787,7 @@ std::size_t write(SyncWriteStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -792,17 +816,26 @@ template <typename AsyncWriteStream, typename ConstBufferSequence,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken
         = default_completion_token_t<typename AsyncWriteStream::executor_type>>
-auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
+inline auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
     WriteToken&& token
       = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
     constraint_t<
       is_const_buffer_sequence<ConstBufferSequence>::value
+    > = 0,
+    constraint_t<
+      !is_completion_condition<decay_t<WriteToken>>::value
     > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write<AsyncWriteStream>>(),
-        token, buffers, transfer_all()));
+        token, buffers, transfer_all()))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write<AsyncWriteStream>(s),
+      token, buffers, transfer_all());
+}
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -861,7 +894,7 @@ auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -890,19 +923,31 @@ auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
 template <typename AsyncWriteStream,
     typename ConstBufferSequence, typename CompletionCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
+      std::size_t)) WriteToken
+        = default_completion_token_t<typename AsyncWriteStream::executor_type>>
+inline auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition,
-    WriteToken&& token,
+    WriteToken&& token
+      = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
     constraint_t<
       is_const_buffer_sequence<ConstBufferSequence>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write<AsyncWriteStream>>(),
         token, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write<AsyncWriteStream>(s),
+      token, buffers,
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #if !defined(BOOST_ASIO_NO_DYNAMIC_BUFFER_V1)
 
@@ -949,7 +994,7 @@ auto async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -969,7 +1014,7 @@ template <typename AsyncWriteStream, typename DynamicBuffer_v1,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken
         = default_completion_token_t<typename AsyncWriteStream::executor_type>>
-auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
+inline auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
     WriteToken&& token
       = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
     constraint_t<
@@ -977,13 +1022,23 @@ auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      !is_completion_condition<decay_t<WriteToken>>::value
     > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
         token, static_cast<DynamicBuffer_v1&&>(buffers),
-        transfer_all()));
+        transfer_all()))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers),
+      transfer_all());
+}
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -1042,7 +1097,7 @@ auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1061,21 +1116,34 @@ auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
 template <typename AsyncWriteStream,
     typename DynamicBuffer_v1, typename CompletionCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
-    CompletionCondition completion_condition, WriteToken&& token,
+      std::size_t)) WriteToken
+        = default_completion_token_t<typename AsyncWriteStream::executor_type>>
+inline auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
+    CompletionCondition completion_condition,
+    WriteToken&& token
+      = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
     constraint_t<
       is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value
     > = 0,
     constraint_t<
       !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
         token, static_cast<DynamicBuffer_v1&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
+      token, static_cast<DynamicBuffer_v1&&>(buffers),
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -1121,7 +1189,7 @@ auto async_write(AsyncWriteStream& s, DynamicBuffer_v1&& buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1141,14 +1209,23 @@ template <typename AsyncWriteStream, typename Allocator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken
         = default_completion_token_t<typename AsyncWriteStream::executor_type>>
-auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
+inline auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
     WriteToken&& token
-      = default_completion_token_t<typename AsyncWriteStream::executor_type>())
+      = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
+    constraint_t<
+      !is_completion_condition<decay_t<WriteToken>>::value
+    > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
-        token, basic_streambuf_ref<Allocator>(b), transfer_all()));
+        token, basic_streambuf_ref<Allocator>(b), transfer_all()))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
+      token, basic_streambuf_ref<Allocator>(b), transfer_all());
+}
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -1205,7 +1282,7 @@ auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1224,15 +1301,28 @@ auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
 template <typename AsyncWriteStream,
     typename Allocator, typename CompletionCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
-    CompletionCondition completion_condition, WriteToken&& token)
+      std::size_t)) WriteToken
+        = default_completion_token_t<typename AsyncWriteStream::executor_type>>
+inline auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
+    CompletionCondition completion_condition,
+    WriteToken&& token
+      = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>>(),
         token, basic_streambuf_ref<Allocator>(b),
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_dynbuf_v1<AsyncWriteStream>(s),
+      token, basic_streambuf_ref<Allocator>(b),
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -1281,7 +1371,7 @@ auto async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1301,18 +1391,28 @@ template <typename AsyncWriteStream, typename DynamicBuffer_v2,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken
         = default_completion_token_t<typename AsyncWriteStream::executor_type>>
-auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
+inline auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
     WriteToken&& token
       = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      !is_completion_condition<decay_t<WriteToken>>::value
     > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>>(),
         token, static_cast<DynamicBuffer_v2&&>(buffers),
-        transfer_all()));
+        transfer_all()))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers),
+      transfer_all());
+}
 
 /// Start an asynchronous operation to write a certain amount of data to a
 /// stream.
@@ -1371,7 +1471,7 @@ auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -1390,19 +1490,31 @@ auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
 template <typename AsyncWriteStream,
     typename DynamicBuffer_v2, typename CompletionCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-      std::size_t)) WriteToken>
-auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
+      std::size_t)) WriteToken
+        = default_completion_token_t<typename AsyncWriteStream::executor_type>>
+inline auto async_write(AsyncWriteStream& s, DynamicBuffer_v2 buffers,
     CompletionCondition completion_condition,
-    WriteToken&& token,
+    WriteToken&& token
+      = default_completion_token_t<typename AsyncWriteStream::executor_type>(),
     constraint_t<
       is_dynamic_buffer_v2<DynamicBuffer_v2>::value
+    > = 0,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
     > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>>(),
         token, static_cast<DynamicBuffer_v2&&>(buffers),
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_dynbuf_v2<AsyncWriteStream>(s),
+      token, static_cast<DynamicBuffer_v2&&>(buffers),
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 /*@}*/
 
diff --git a/inst/include/boost/asio/write_at.hpp b/inst/include/boost/asio/write_at.hpp
index af9525bb9..504a2d1e9 100644
--- a/inst/include/boost/asio/write_at.hpp
+++ b/inst/include/boost/asio/write_at.hpp
@@ -2,7 +2,7 @@
 // write_at.hpp
 // ~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -188,7 +188,10 @@ template <typename SyncRandomAccessWriteDevice, typename ConstBufferSequence,
     typename CompletionCondition>
 std::size_t write_at(SyncRandomAccessWriteDevice& d,
     uint64_t offset, const ConstBufferSequence& buffers,
-    CompletionCondition completion_condition);
+    CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 /// Write a certain amount of data at a specified offset before returning.
 /**
@@ -236,7 +239,10 @@ template <typename SyncRandomAccessWriteDevice, typename ConstBufferSequence,
     typename CompletionCondition>
 std::size_t write_at(SyncRandomAccessWriteDevice& d,
     uint64_t offset, const ConstBufferSequence& buffers,
-    CompletionCondition completion_condition, boost::system::error_code& ec);
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -349,7 +355,10 @@ std::size_t write_at(SyncRandomAccessWriteDevice& d,
 template <typename SyncRandomAccessWriteDevice, typename Allocator,
     typename CompletionCondition>
 std::size_t write_at(SyncRandomAccessWriteDevice& d, uint64_t offset,
-    basic_streambuf<Allocator>& b, CompletionCondition completion_condition);
+    basic_streambuf<Allocator>& b, CompletionCondition completion_condition,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 /// Write a certain amount of data at a specified offset before returning.
 /**
@@ -392,9 +401,12 @@ std::size_t write_at(SyncRandomAccessWriteDevice& d, uint64_t offset,
  */
 template <typename SyncRandomAccessWriteDevice, typename Allocator,
     typename CompletionCondition>
-std::size_t write_at(SyncRandomAccessWriteDevice& d, uint64_t offset,
-    basic_streambuf<Allocator>& b, CompletionCondition completion_condition,
-    boost::system::error_code& ec);
+std::size_t write_at(SyncRandomAccessWriteDevice& d,
+    uint64_t offset, basic_streambuf<Allocator>& b,
+    CompletionCondition completion_condition, boost::system::error_code& ec,
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0);
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
@@ -457,7 +469,7 @@ std::size_t write_at(SyncRandomAccessWriteDevice& d, uint64_t offset,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -486,16 +498,25 @@ template <typename AsyncRandomAccessWriteDevice, typename ConstBufferSequence,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken = default_completion_token_t<
         typename AsyncRandomAccessWriteDevice::executor_type>>
-auto async_write_at(AsyncRandomAccessWriteDevice& d,
+inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
     uint64_t offset, const ConstBufferSequence& buffers,
     WriteToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessWriteDevice::executor_type>())
+      typename AsyncRandomAccessWriteDevice::executor_type>(),
+    constraint_t<
+      !is_completion_condition<WriteToken>::value
+    > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_at<
           AsyncRandomAccessWriteDevice>>(),
-        token, offset, buffers, transfer_all()));
+        token, offset, buffers, transfer_all()))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_at<AsyncRandomAccessWriteDevice>(d),
+      token, offset, buffers, transfer_all());
+}
 
 /// Start an asynchronous operation to write a certain amount of data at the
 /// specified offset.
@@ -559,7 +580,7 @@ auto async_write_at(AsyncRandomAccessWriteDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -590,18 +611,28 @@ template <typename AsyncRandomAccessWriteDevice,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken = default_completion_token_t<
         typename AsyncRandomAccessWriteDevice::executor_type>>
-auto async_write_at(AsyncRandomAccessWriteDevice& d,
+inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
     uint64_t offset, const ConstBufferSequence& buffers,
     CompletionCondition completion_condition,
     WriteToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessWriteDevice::executor_type>())
+      typename AsyncRandomAccessWriteDevice::executor_type>(),
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_at<
           AsyncRandomAccessWriteDevice>>(),
         token, offset, buffers,
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_at<AsyncRandomAccessWriteDevice>(d),
+      token, offset, buffers,
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #if !defined(BOOST_ASIO_NO_EXTENSIONS)
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
@@ -652,7 +683,7 @@ auto async_write_at(AsyncRandomAccessWriteDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -672,16 +703,26 @@ template <typename AsyncRandomAccessWriteDevice, typename Allocator,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken = default_completion_token_t<
         typename AsyncRandomAccessWriteDevice::executor_type>>
-auto async_write_at(AsyncRandomAccessWriteDevice& d,
+inline auto async_write_at(AsyncRandomAccessWriteDevice& d,
     uint64_t offset, basic_streambuf<Allocator>& b,
     WriteToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessWriteDevice::executor_type>())
+      typename AsyncRandomAccessWriteDevice::executor_type>(),
+    constraint_t<
+      !is_completion_condition<WriteToken>::value
+    > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_at_streambuf<
           AsyncRandomAccessWriteDevice>>(),
-        token, offset, &b, transfer_all()));
+        token, offset, &b, transfer_all()))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_at_streambuf<
+        AsyncRandomAccessWriteDevice>(d),
+      token, offset, &b, transfer_all());
+}
 
 /// Start an asynchronous operation to write a certain amount of data at the
 /// specified offset.
@@ -743,7 +784,7 @@ auto async_write_at(AsyncRandomAccessWriteDevice& d,
  * Regardless of whether the asynchronous operation completes immediately or
  * not, the completion handler will not be invoked from within this function.
  * On immediate completion, invocation of the handler will be performed in a
- * manner equivalent to using boost::asio::post().
+ * manner equivalent to using boost::asio::async_immediate().
  *
  * @par Completion Signature
  * @code void(boost::system::error_code, std::size_t) @endcode
@@ -764,17 +805,28 @@ template <typename AsyncRandomAccessWriteDevice,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
       std::size_t)) WriteToken = default_completion_token_t<
         typename AsyncRandomAccessWriteDevice::executor_type>>
-auto async_write_at(AsyncRandomAccessWriteDevice& d, uint64_t offset,
+inline auto async_write_at(AsyncRandomAccessWriteDevice& d, uint64_t offset,
     basic_streambuf<Allocator>& b, CompletionCondition completion_condition,
     WriteToken&& token = default_completion_token_t<
-      typename AsyncRandomAccessWriteDevice::executor_type>())
+      typename AsyncRandomAccessWriteDevice::executor_type>(),
+    constraint_t<
+      is_completion_condition<CompletionCondition>::value
+    > = 0)
   -> decltype(
     async_initiate<WriteToken,
       void (boost::system::error_code, std::size_t)>(
         declval<detail::initiate_async_write_at_streambuf<
           AsyncRandomAccessWriteDevice>>(),
         token, offset, &b,
-        static_cast<CompletionCondition&&>(completion_condition)));
+        static_cast<CompletionCondition&&>(completion_condition)))
+{
+  return async_initiate<WriteToken,
+    void (boost::system::error_code, std::size_t)>(
+      detail::initiate_async_write_at_streambuf<
+        AsyncRandomAccessWriteDevice>(d),
+      token, offset, &b,
+      static_cast<CompletionCondition&&>(completion_condition));
+}
 
 #endif // !defined(BOOST_ASIO_NO_IOSTREAM)
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
diff --git a/inst/include/boost/asio/yield.hpp b/inst/include/boost/asio/yield.hpp
index ad2172fe4..1513fac55 100644
--- a/inst/include/boost/asio/yield.hpp
+++ b/inst/include/boost/asio/yield.hpp
@@ -2,7 +2,7 @@
 // yield.hpp
 // ~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/assert/source_location.hpp b/inst/include/boost/assert/source_location.hpp
index a265ad5cb..c6eae3251 100644
--- a/inst/include/boost/assert/source_location.hpp
+++ b/inst/include/boost/assert/source_location.hpp
@@ -144,6 +144,10 @@ template<class E, class T> std::basic_ostream<E, T> & operator<<( std::basic_ost
 
 # define BOOST_CURRENT_LOCATION ::boost::source_location()
 
+#elif defined(BOOST_MSVC) && BOOST_MSVC >= 1935
+
+# define BOOST_CURRENT_LOCATION ::boost::source_location(__builtin_FILE(), __builtin_LINE(), __builtin_FUNCSIG(), __builtin_COLUMN())
+
 #elif defined(BOOST_MSVC) && BOOST_MSVC >= 1926
 
 // std::source_location::current() is available in -std:c++20, but fails with consteval errors before 19.31, and doesn't produce
@@ -170,9 +174,12 @@ template<class E, class T> std::basic_ostream<E, T> & operator<<( std::basic_ost
 
 # define BOOST_CURRENT_LOCATION ::boost::source_location(__builtin_FILE(), __builtin_LINE(), __builtin_FUNCTION(), __builtin_COLUMN())
 
-#elif defined(BOOST_GCC) && BOOST_GCC >= 70000
+#elif defined(BOOST_GCC) && BOOST_GCC >= 80000
 
 // The built-ins are available in 4.8+, but are not constant expressions until 7
+// In addition, reproducible builds require -ffile-prefix-map, which is GCC 8
+// https://github.com/boostorg/assert/issues/38
+
 # define BOOST_CURRENT_LOCATION ::boost::source_location(__builtin_FILE(), __builtin_LINE(), __builtin_FUNCTION())
 
 #elif defined(BOOST_GCC) && BOOST_GCC >= 50000
diff --git a/inst/include/boost/atomic/detail/futex.hpp b/inst/include/boost/atomic/detail/futex.hpp
index f5cb98922..55407ed84 100644
--- a/inst/include/boost/atomic/detail/futex.hpp
+++ b/inst/include/boost/atomic/detail/futex.hpp
@@ -23,7 +23,7 @@
 #pragma once
 #endif
 
-#if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__NETBSD__) || defined(__NetBSD__)
 
 #include <sys/syscall.h>
 
@@ -45,7 +45,21 @@
 #define BOOST_ATOMIC_DETAIL_NETBSD_FUTEX
 #endif
 
-#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX)
+#elif defined(__OpenBSD__)
+
+// OpenBSD provides futex(2) function wrapper since OpenBSD 6.2 (https://man.openbsd.org/OpenBSD-6.2/futex.2).
+// It has also removed syscall(2) interface:
+// https://github.com/openbsd/src/commit/cafeb892b121ee89c39c2b940e8ccd6950f50009
+
+#include <sys/param.h>
+
+#if OpenBSD >= 201711
+#define BOOST_ATOMIC_DETAIL_OPENBSD_FUTEX
+#endif
+
+#endif
+
+#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX) || defined(BOOST_ATOMIC_DETAIL_OPENBSD_FUTEX)
 
 #include <cstddef>
 #if defined(__linux__)
@@ -53,6 +67,7 @@
 #else
 #include <sys/futex.h>
 #endif
+#include <boost/cstdint.hpp>
 #include <boost/atomic/detail/intptr.hpp>
 #include <boost/atomic/detail/header.hpp>
 
@@ -74,22 +89,40 @@ namespace detail {
 //! Invokes an operation on the futex
 BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, const void* timeout = NULL, void* addr2 = NULL, unsigned int val3 = 0) BOOST_NOEXCEPT
 {
-#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
-    return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, timeout, addr2, val3);
-#else
+#if defined(BOOST_ATOMIC_DETAIL_OPENBSD_FUTEX)
+    return ::futex
+    (
+        static_cast< volatile uint32_t* >(addr1),
+        op,
+        static_cast< int >(val1),
+        static_cast< const struct timespec* >(timeout),
+        static_cast< volatile uint32_t* >(addr2)
+    );
+#elif defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
     // Pass 0 in val2.
     return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, timeout, addr2, 0u, val3);
+#else
+    return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, timeout, addr2, val3);
 #endif
 }
 
 //! Invokes an operation on the futex
 BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, unsigned int val2, void* addr2 = NULL, unsigned int val3 = 0) BOOST_NOEXCEPT
 {
-#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
-    return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, static_cast< atomics::detail::uintptr_t >(val2), addr2, val3);
-#else
+#if defined(BOOST_ATOMIC_DETAIL_OPENBSD_FUTEX)
+    return ::futex
+    (
+        static_cast< volatile uint32_t* >(addr1),
+        op,
+        static_cast< int >(val1),
+        reinterpret_cast< const struct timespec* >(static_cast< atomics::detail::uintptr_t >(val2)),
+        static_cast< volatile uint32_t* >(addr2)
+    );
+#elif defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
     // Pass NULL in timeout.
     return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, static_cast< void* >(NULL), addr2, val2, val3);
+#else
+    return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, static_cast< atomics::detail::uintptr_t >(val2), addr2, val3);
 #endif
 }
 
@@ -147,8 +180,6 @@ BOOST_FORCEINLINE int futex_requeue_private(void* pval1, void* pval2, unsigned i
 
 #include <boost/atomic/detail/footer.hpp>
 
-#endif // defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX)
-
-#endif // defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || defined(__NetBSD__)
+#endif // defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX) || defined(BOOST_ATOMIC_DETAIL_OPENBSD_FUTEX)
 
 #endif // BOOST_ATOMIC_DETAIL_FUTEX_HPP_INCLUDED_
diff --git a/inst/include/boost/atomic/detail/pause.hpp b/inst/include/boost/atomic/detail/pause.hpp
index efdfb62b6..0d47c927a 100644
--- a/inst/include/boost/atomic/detail/pause.hpp
+++ b/inst/include/boost/atomic/detail/pause.hpp
@@ -48,6 +48,13 @@ BOOST_FORCEINLINE void pause() BOOST_NOEXCEPT
     __asm__ __volatile__("pause;" : : : "memory");
 #elif (defined(__ARM_ARCH) && __ARM_ARCH >= 8) || defined(__ARM_ARCH_8A__) || defined(__aarch64__)
     __asm__ __volatile__("yield;" : : : "memory");
+#elif defined(__riscv) && __riscv_xlen == 64
+#if defined(__riscv_zihintpause)
+    __asm__ __volatile__("pause" : : : "memory");
+#else
+    /* Encoding of the pause instruction */
+    __asm__ __volatile__ (".4byte 0x100000F");
+#endif
 #endif
 #endif
 }
diff --git a/inst/include/boost/beast/_experimental/http/impl/icy_stream.hpp b/inst/include/boost/beast/_experimental/http/impl/icy_stream.hpp
index e207f9357..0e8657fdf 100644
--- a/inst/include/boost/beast/_experimental/http/impl/icy_stream.hpp
+++ b/inst/include/boost/beast/_experimental/http/impl/icy_stream.hpp
@@ -167,11 +167,20 @@ class read_op
 
 struct run_read_op
 {
+    icy_stream* self;
+
+    using executor_type = typename icy_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<class ReadHandler, class Buffers>
     void
     operator()(
         ReadHandler&& h,
-        icy_stream* s,
         Buffers const& b)
     {
         // If you get an error on the following line it means
@@ -186,7 +195,7 @@ struct run_read_op
         read_op<
             Buffers,
             typename std::decay<ReadHandler>::type>(
-                std::forward<ReadHandler>(h), *s, b);
+                std::forward<ReadHandler>(h), *self, b);
     }
 };
 
@@ -292,9 +301,8 @@ async_read_some(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            typename ops::run_read_op{},
+            typename ops::run_read_op{this},
             handler,
-            this,
             buffers);
 }
 
diff --git a/inst/include/boost/beast/_experimental/test/detail/stream_state.ipp b/inst/include/boost/beast/_experimental/test/detail/stream_state.ipp
index 268c76051..3347c21b3 100644
--- a/inst/include/boost/beast/_experimental/test/detail/stream_state.ipp
+++ b/inst/include/boost/beast/_experimental/test/detail/stream_state.ipp
@@ -12,6 +12,7 @@
 #define BOOST_BEAST_TEST_DETAIL_STREAM_STATE_IPP
 
 #include <boost/beast/_experimental/test/error.hpp>
+#include <boost/asio/error.hpp>
 #include <boost/make_shared.hpp>
 
 namespace boost {
diff --git a/inst/include/boost/beast/_experimental/test/immediate_executor.hpp b/inst/include/boost/beast/_experimental/test/immediate_executor.hpp
index cb469fcbb..513e1d698 100644
--- a/inst/include/boost/beast/_experimental/test/immediate_executor.hpp
+++ b/inst/include/boost/beast/_experimental/test/immediate_executor.hpp
@@ -9,6 +9,7 @@
 #define BOOST_BEAST_TEST_IMMEDIATE_EXECUTOR_HPP
 
 #include <boost/asio/any_io_executor.hpp>
+#include <boost/asio/execution_context.hpp>
 
 namespace boost
 {
@@ -21,14 +22,16 @@ namespace test
 
 class immediate_executor
 {
+    asio::execution_context* context_ = nullptr;
     std::size_t &count_;
+
   public:
     immediate_executor(std::size_t & count) noexcept : count_(count) {}
 
-    asio::execution_context &query(asio::execution::context_t) const
+    asio::execution_context &query(asio::execution::context_t) const noexcept
     {
         BOOST_ASSERT(false);
-        return *static_cast<asio::execution_context*>(nullptr);
+        return *context_;
     }
 
     constexpr static asio::execution::blocking_t
@@ -52,20 +55,67 @@ class immediate_executor
     }
 
     bool
-    operator==(immediate_executor const &other) const noexcept
+    operator==(immediate_executor const &) const noexcept
     {
         return true;
     }
 
     bool
-    operator!=(immediate_executor const &other) const noexcept
+    operator!=(immediate_executor const &) const noexcept
     {
         return false;
     }
 };
 
-}
-}
-}
+} // test
+} // beast
+
+#if ! BOOST_BEAST_DOXYGEN
+namespace asio
+{
+namespace traits
+{
+template<typename F>
+struct execute_member<beast::test::immediate_executor, F>
+{
+    static constexpr bool is_valid    = true;
+    static constexpr bool is_noexcept = false;
+    typedef void result_type;
+};
+
+template<>
+struct equality_comparable<beast::test::immediate_executor>
+{
+    static constexpr bool is_valid    = true;
+    static constexpr bool is_noexcept = true;
+};
+
+template<>
+struct query_member<beast::test::immediate_executor, execution::context_t>
+{
+    static constexpr bool is_valid    = true;
+    static constexpr bool is_noexcept = true;
+    typedef execution_context& result_type;
+};
+
+template<typename Property>
+struct query_static_constexpr_member<
+    beast::test::immediate_executor,
+    Property,
+    typename enable_if<std::is_convertible<Property, execution::blocking_t>::value>::type>
+{
+    static constexpr bool is_valid    = true;
+    static constexpr bool is_noexcept = true;
+    typedef execution::blocking_t::never_t result_type;
+    static constexpr result_type value() noexcept
+    {
+        return result_type();
+    }
+};
+} // traits
+} // asio
+#endif
+
+} // boost
 
 #endif //BOOST_BEAST_TEST_IMMEDIATE_EXECUTOR_HPP
diff --git a/inst/include/boost/beast/_experimental/test/impl/error.ipp b/inst/include/boost/beast/_experimental/test/impl/error.ipp
index f44471376..45d2030d3 100644
--- a/inst/include/boost/beast/_experimental/test/impl/error.ipp
+++ b/inst/include/boost/beast/_experimental/test/impl/error.ipp
@@ -29,8 +29,8 @@ public:
     }
 
     BOOST_BEAST_DECL
-    std::string
-    message(int ev) const override
+    char const*
+    message(int ev, char*, std::size_t) const noexcept override
     {
         switch(static_cast<error>(ev))
         {
@@ -40,6 +40,13 @@ public:
         }
     }
 
+    BOOST_BEAST_DECL
+    std::string
+    message(int ev) const override
+    {
+        return message(ev, nullptr, 0);
+    }
+
     BOOST_BEAST_DECL
     error_condition
     default_error_condition(int ev) const noexcept override
diff --git a/inst/include/boost/beast/_experimental/test/impl/stream.hpp b/inst/include/boost/beast/_experimental/test/impl/stream.hpp
index 0971a5b00..1bbf77a12 100644
--- a/inst/include/boost/beast/_experimental/test/impl/stream.hpp
+++ b/inst/include/boost/beast/_experimental/test/impl/stream.hpp
@@ -10,11 +10,12 @@
 #ifndef BOOST_BEAST_TEST_IMPL_STREAM_HPP
 #define BOOST_BEAST_TEST_IMPL_STREAM_HPP
 
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/detail/service_base.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
 #include <boost/asio/any_io_executor.hpp>
+#include <boost/asio/append.hpp>
+#include <boost/asio/associated_cancellation_slot.hpp>
 #include <boost/asio/dispatch.hpp>
 #include <boost/asio/post.hpp>
 #include <mutex>
@@ -25,7 +26,27 @@ namespace boost {
 namespace beast {
 namespace test {
 
-//------------------------------------------------------------------------------
+namespace detail
+{
+template<class To>
+struct extract_executor_op
+{
+    To operator()(net::any_io_executor& ex) const
+    {
+        assert(ex.template target<To>());
+        return *ex.template target<To>();
+    }
+};
+
+template<>
+struct extract_executor_op<net::any_io_executor>
+{
+    net::any_io_executor operator()(net::any_io_executor& ex) const
+    {
+        return ex;
+    }
+};
+} // detail
 
 template<class Executor>
 template<class Handler, class Buffers>
@@ -112,13 +133,11 @@ class basic_stream<Executor>::read_op : public detail::stream_read_op_base
 
 #if defined(BOOST_ASIO_NO_TS_EXECUTORS)
             net::dispatch(wg2_,
-                beast::bind_front_handler(std::move(h_),
-                    ec, bytes_transferred));
+                net::append(std::move(h_), ec, bytes_transferred));
             wg2_ = net::any_io_executor(); // probably unnecessary
 #else // defined(BOOST_ASIO_NO_TS_EXECUTORS)
             net::dispatch(wg2_.get_executor(),
-                beast::bind_front_handler(std::move(h_),
-                    ec, bytes_transferred));
+                net::append(std::move(h_), ec, bytes_transferred));
             wg2_.reset();
 #endif // defined(BOOST_ASIO_NO_TS_EXECUTORS)
         }
@@ -151,11 +170,10 @@ class basic_stream<Executor>::read_op : public detail::stream_read_op_base
     operator()(error_code ec) override
     {
 #if defined(BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
-        net::post(wg1_.get_executor(),
-            beast::bind_front_handler(std::move(fn_), ec));
+        net::post(wg1_.get_executor(), net::append(std::move(fn_), ec));
         wg1_.reset();
 #else
-        net::post(wg1_, beast::bind_front_handler(std::move(fn_), ec));
+        net::post(wg1_, net::append(std::move(fn_), ec));
         wg1_ = net::any_io_executor(); // probably unnecessary
 #endif
     }
@@ -164,13 +182,22 @@ class basic_stream<Executor>::read_op : public detail::stream_read_op_base
 template<class Executor>
 struct basic_stream<Executor>::run_read_op
 {
+    boost::shared_ptr<detail::stream_state> const& in;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return detail::extract_executor_op<Executor>()(in->exec);
+    }
+
     template<
         class ReadHandler,
         class MutableBufferSequence>
     void
     operator()(
         ReadHandler&& h,
-        boost::shared_ptr<detail::stream_state> const& in,
         MutableBufferSequence const& buffers)
     {
         // If you get an error on the following line it means
@@ -198,13 +225,22 @@ struct basic_stream<Executor>::run_read_op
 template<class Executor>
 struct basic_stream<Executor>::run_write_op
 {
+    boost::shared_ptr<detail::stream_state> const& in_;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return detail::extract_executor_op<Executor>()(in_->exec);
+    }
+
     template<
         class WriteHandler,
         class ConstBufferSequence>
     void
     operator()(
         WriteHandler&& h,
-        boost::shared_ptr<detail::stream_state> in_,
         boost::weak_ptr<detail::stream_state> out_,
         ConstBufferSequence const& buffers)
     {
@@ -220,9 +256,7 @@ struct basic_stream<Executor>::run_write_op
         ++in_->nwrite;
         auto const upcall = [&](error_code ec, std::size_t n)
         {
-            net::post(
-                in_->exec,
-                beast::bind_front_handler(std::move(h), ec, n));
+            net::post(in_->exec, net::append(std::move(h), ec, n));
         };
 
         // test failure
@@ -339,9 +373,8 @@ async_read_some(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            run_read_op{},
+            run_read_op{in_},
             handler,
-            in_,
             buffers);
 }
 
@@ -423,9 +456,8 @@ async_write_some(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            run_write_op{},
+            run_write_op{in_},
             handler,
-            in_,
             out_,
             buffers);
 }
@@ -444,8 +476,7 @@ async_teardown(
         s.in_->fc->fail(ec))
         return net::post(
             s.get_executor(),
-            beast::bind_front_handler(
-                std::move(handler), ec));
+            net::append(std::move(handler), ec));
     s.close();
     if( s.in_->fc &&
         s.in_->fc->fail(ec))
@@ -455,10 +486,7 @@ async_teardown(
     else
         ec = {};
 
-    net::post(
-        s.get_executor(),
-        beast::bind_front_handler(
-            std::move(handler), ec));
+    net::post(s.get_executor(), net::append(std::move(handler), ec));
 }
 
 //------------------------------------------------------------------------------
@@ -474,28 +502,6 @@ connect(stream& to, Arg1&& arg1, ArgN&&... argn)
     return from;
 }
 
-namespace detail
-{
-template<class To>
-struct extract_executor_op
-{
-    To operator()(net::any_io_executor& ex) const
-    {
-        assert(ex.template target<To>());
-        return *ex.template target<To>();
-    }
-};
-
-template<>
-struct extract_executor_op<net::any_io_executor>
-{
-    net::any_io_executor operator()(net::any_io_executor& ex) const
-    {
-        return ex;
-    }
-};
-}
-
 template<class Executor>
 auto basic_stream<Executor>::get_executor() noexcept -> executor_type
 {
diff --git a/inst/include/boost/beast/_experimental/test/impl/stream.ipp b/inst/include/boost/beast/_experimental/test/impl/stream.ipp
index 09a6e12c0..82395ba14 100644
--- a/inst/include/boost/beast/_experimental/test/impl/stream.ipp
+++ b/inst/include/boost/beast/_experimental/test/impl/stream.ipp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_TEST_IMPL_STREAM_IPP
 
 #include <boost/beast/_experimental/test/stream.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/make_shared.hpp>
 #include <stdexcept>
diff --git a/inst/include/boost/beast/_experimental/test/stream.hpp b/inst/include/boost/beast/_experimental/test/stream.hpp
index 8e87a9e50..2394f3bb7 100644
--- a/inst/include/boost/beast/_experimental/test/stream.hpp
+++ b/inst/include/boost/beast/_experimental/test/stream.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_TEST_STREAM_HPP
 
 #include <boost/beast/core/detail/config.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/role.hpp>
 #include <boost/beast/core/string.hpp>
@@ -236,11 +235,11 @@ class basic_stream
         @param context The `io_context` object that the stream will use to
         dispatch handlers for any asynchronous operations.
     */
-    template <typename ExecutionContext>
-    explicit basic_stream(ExecutionContext& context,
-        typename std::enable_if<
-            std::is_convertible<ExecutionContext&, net::execution_context&>::value
-        >::type* = 0)
+    template <class ExecutionContext,
+        class = typename std::enable_if<
+            std::is_convertible<ExecutionContext&, net::execution_context&>::value>::type>
+    explicit
+    basic_stream(ExecutionContext& context)
     : basic_stream(context.get_executor())
     {
     }
diff --git a/inst/include/boost/beast/_experimental/unit_test/match.hpp b/inst/include/boost/beast/_experimental/unit_test/match.hpp
index 0168af802..7520b1ab0 100644
--- a/inst/include/boost/beast/_experimental/unit_test/match.hpp
+++ b/inst/include/boost/beast/_experimental/unit_test/match.hpp
@@ -113,7 +113,6 @@ selector::operator()(suite_info const& s)
 
     case all:
     default:
-        // fall through
         break;
     };
 
diff --git a/inst/include/boost/beast/_experimental/unit_test/suite.hpp b/inst/include/boost/beast/_experimental/unit_test/suite.hpp
index 68daeac65..7e5b55fde 100644
--- a/inst/include/boost/beast/_experimental/unit_test/suite.hpp
+++ b/inst/include/boost/beast/_experimental/unit_test/suite.hpp
@@ -16,6 +16,11 @@
 #include <sstream>
 #include <string>
 
+#if defined(BOOST_GCC) && BOOST_GCC >= 70000 && BOOST_GCC < 80000
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wnoexcept-type"
+#endif
+
 namespace boost {
 namespace beast {
 namespace unit_test {
@@ -731,6 +736,10 @@ run(runner& r)
 
 #endif
 
+#if defined(BOOST_GCC) && BOOST_GCC >= 70000 && BOOST_GCC < 80000
+#pragma GCC diagnostic pop
+#endif
+
 //------------------------------------------------------------------------------
 
 #endif
diff --git a/inst/include/boost/beast/core/async_base.hpp b/inst/include/boost/beast/core/async_base.hpp
index d8fe12ece..55e912c19 100644
--- a/inst/include/boost/beast/core/async_base.hpp
+++ b/inst/include/boost/beast/core/async_base.hpp
@@ -11,17 +11,18 @@
 #define BOOST_BEAST_CORE_ASYNC_BASE_HPP
 
 #include <boost/beast/core/detail/config.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/detail/allocator.hpp>
 #include <boost/beast/core/detail/async_base.hpp>
 #include <boost/beast/core/detail/filtering_cancellation_slot.hpp>
 #include <boost/beast/core/detail/work_guard.hpp>
+#include <boost/asio/append.hpp>
 #include <boost/asio/associated_allocator.hpp>
+#include <boost/asio/associated_cancellation_slot.hpp>
 #include <boost/asio/associated_executor.hpp>
 #include <boost/asio/associated_immediate_executor.hpp>
 #include <boost/asio/bind_executor.hpp>
-#include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/asio/dispatch.hpp>
+#include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/core/exchange.hpp>
 #include <boost/core/empty_value.hpp>
@@ -424,9 +425,7 @@ class async_base
             auto const ex = this->get_immediate_executor();
             net::dispatch(
                 ex,
-                beast::bind_front_handler(
-                    std::move(h_),
-                    std::forward<Args>(args)...));
+                net::append(std::move(h_), std::forward<Args>(args)...));
             wg1_.reset();
         }
         else
diff --git a/inst/include/boost/beast/core/basic_stream.hpp b/inst/include/boost/beast/core/basic_stream.hpp
index 8b6ae39d4..9c08006df 100644
--- a/inst/include/boost/beast/core/basic_stream.hpp
+++ b/inst/include/boost/beast/core/basic_stream.hpp
@@ -450,7 +450,7 @@ class basic_stream
         return impl_->policy();
     }
 
-    /** Set the timeout for the next logical operation.
+    /** Set the timeout for subsequent logical operations.
 
         This sets either the read timer, the write timer, or
         both timers to expire after the specified amount of time
@@ -473,7 +473,7 @@ class basic_stream
     expires_after(
         net::steady_timer::duration expiry_time);
 
-    /** Set the timeout for the next logical operation.
+    /** Set the timeout for subsequent logical operations.
 
         This sets either the read timer, the write timer, or both
         timers to expire at the specified time point. If a timer
@@ -495,7 +495,7 @@ class basic_stream
     void
     expires_at(net::steady_timer::time_point expiry_time);
 
-    /// Disable the timeout for the next logical operation.
+    /// Disable the timeout for subsequent logical operations.
     void
     expires_never();
 
@@ -1026,6 +1026,10 @@ class basic_stream
         ,class = typename std::enable_if<
             net::is_endpoint_sequence<
                 EndpointSequence>::value>::type
+        ,class = typename std::enable_if<
+            !net::is_connect_condition<RangeConnectHandler,
+                decltype(std::declval<const EndpointSequence&>().begin())>::value
+        >::type
     #endif
     >
     BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(
@@ -1132,6 +1136,10 @@ class basic_stream
         ,class = typename std::enable_if<
             net::is_endpoint_sequence<
                 EndpointSequence>::value>::type
+        ,class = typename std::enable_if<
+            net::is_connect_condition<ConnectCondition,
+                decltype(std::declval<const EndpointSequence&>().begin())>::value
+        >::type
     #endif
     >
     BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(
@@ -1204,7 +1212,13 @@ class basic_stream
         BOOST_ASIO_COMPLETION_TOKEN_FOR(
             void(error_code, Iterator))
             IteratorConnectHandler =
-                net::default_completion_token_t<executor_type>>
+                net::default_completion_token_t<executor_type>
+    #if ! BOOST_BEAST_DOXYGEN
+        ,class = typename std::enable_if<
+            !net::is_connect_condition<IteratorConnectHandler, Iterator>::value
+        >::type
+    #endif
+    >
     BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(
         IteratorConnectHandler,
         void(error_code, Iterator))
@@ -1278,7 +1292,13 @@ class basic_stream
         BOOST_ASIO_COMPLETION_TOKEN_FOR(
             void(error_code, Iterator))
             IteratorConnectHandler =
-                net::default_completion_token_t<executor_type>>
+                net::default_completion_token_t<executor_type>
+    #if ! BOOST_BEAST_DOXYGEN
+        ,class = typename std::enable_if<
+            net::is_connect_condition<ConnectCondition, Iterator>::value
+        >::type
+    #endif
+    >
     BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(
         IteratorConnectHandler,
         void(error_code, Iterator))
diff --git a/inst/include/boost/beast/core/detail/bind_handler.hpp b/inst/include/boost/beast/core/detail/bind_handler.hpp
index 4b1d188d4..4f1dd2068 100644
--- a/inst/include/boost/beast/core/detail/bind_handler.hpp
+++ b/inst/include/boost/beast/core/detail/bind_handler.hpp
@@ -12,9 +12,7 @@
 
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/detail/tuple.hpp>
-#include <boost/asio/associated_allocator.hpp>
-#include <boost/asio/associated_cancellation_slot.hpp>
-#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/associator.hpp>
 #include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/mp11/integer_sequence.hpp>
@@ -42,14 +40,9 @@ class bind_wrapper
     Handler h_;
     args_type args_;
 
-    template<class T, class Executor>
-    friend struct net::associated_executor;
-
-    template<class T, class Allocator>
-    friend struct net::associated_allocator;
-
-    template<class T, class CancellationSlot>
-    friend struct net::associated_cancellation_slot;
+    template <template <typename, typename> class,
+        typename, typename, typename>
+    friend struct net::associator;
 
     template<class Arg, class Vals>
     static
@@ -186,15 +179,9 @@ class bind_front_wrapper
     Handler h_;
     detail::tuple<Args...> args_;
 
-    template<class T, class Executor>
-    friend struct net::associated_executor;
-
-    template<class T, class Allocator>
-    friend struct net::associated_allocator;
-
-    template<class T, class CancellationSlot>
-    friend struct net::associated_cancellation_slot;
-
+    template <template <typename, typename> class,
+        typename, typename, typename>
+    friend struct net::associator;
 
     template<std::size_t... I, class... Ts>
     void
@@ -264,112 +251,46 @@ class bind_front_wrapper
 namespace boost {
 namespace asio {
 
-template<class Handler, class... Args, class Executor>
-struct associated_executor<
-    beast::detail::bind_wrapper<Handler, Args...>, Executor>
+template <template <typename, typename> class Associator,
+    typename Handler, typename... Args, typename DefaultCandidate>
+struct associator<Associator,
+    beast::detail::bind_wrapper<Handler, Args...>, DefaultCandidate>
+    : Associator<Handler, DefaultCandidate>
 {
-    using type = typename
-        associated_executor<Handler, Executor>::type;
-
-    static
-    type
-    get(beast::detail::bind_wrapper<Handler, Args...> const& op,
-        Executor const& ex = Executor{}) noexcept
+    static typename Associator<Handler, DefaultCandidate>::type get(
+        const beast::detail::bind_wrapper<Handler, Args...>& h) noexcept
     {
-        return associated_executor<
-            Handler, Executor>::get(op.h_, ex);
+        return Associator<Handler, DefaultCandidate>::get(h.h_);
     }
-};
-
-template<class Handler, class... Args, class Executor>
-struct associated_executor<
-    beast::detail::bind_front_wrapper<Handler, Args...>, Executor>
-{
-    using type = typename
-        associated_executor<Handler, Executor>::type;
 
-    static
-    type
-    get(beast::detail::bind_front_wrapper<Handler, Args...> const& op,
-        Executor const& ex = Executor{}) noexcept
+    static auto get(const beast::detail::bind_wrapper<Handler, Args...>& h,
+        const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.h_, c))
     {
-        return associated_executor<
-            Handler, Executor>::get(op.h_, ex);
+    return Associator<Handler, DefaultCandidate>::get(h.h_, c);
     }
 };
 
-//
-
-template<class Handler, class... Args, class Allocator>
-struct associated_allocator<
-    beast::detail::bind_wrapper<Handler, Args...>, Allocator>
+template <template <typename, typename> class Associator,
+    typename Handler, typename... Args, typename DefaultCandidate>
+struct associator<Associator,
+    beast::detail::bind_front_wrapper<Handler, Args...>, DefaultCandidate>
+    : Associator<Handler, DefaultCandidate>
 {
-    using type = typename
-        associated_allocator<Handler, Allocator>::type;
-
-    static
-    type
-    get(beast::detail::bind_wrapper<Handler, Args...> const& op,
-        Allocator const& alloc = Allocator{}) noexcept
+    static typename Associator<Handler, DefaultCandidate>::type get(
+        const beast::detail::bind_front_wrapper<Handler, Args...>& h) noexcept
     {
-        return associated_allocator<
-            Handler, Allocator>::get(op.h_, alloc);
+        return Associator<Handler, DefaultCandidate>::get(h.h_);
     }
-};
-
-template<class Handler, class... Args, class Allocator>
-struct associated_allocator<
-    beast::detail::bind_front_wrapper<Handler, Args...>, Allocator>
-{
-    using type = typename
-        associated_allocator<Handler, Allocator>::type;
 
-    static
-    type
-    get(beast::detail::bind_front_wrapper<Handler, Args...> const& op,
-        Allocator const& alloc = Allocator{}) noexcept
+    static auto get(const beast::detail::bind_front_wrapper<Handler, Args...>& h,
+        const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.h_, c))
     {
-        return associated_allocator<
-            Handler, Allocator>::get(op.h_, alloc);
+        return Associator<Handler, DefaultCandidate>::get(h.h_, c);
     }
 };
 
-template<class Handler, class... Args, class CancellationSlot>
-struct associated_cancellation_slot<
-    beast::detail::bind_wrapper<Handler, Args...>, CancellationSlot>
-{
-    using type = typename
-        associated_cancellation_slot<Handler>::type;
-
-    static
-    type
-    get(beast::detail::bind_wrapper<Handler, Args...> const& op,
-        CancellationSlot const& slot = CancellationSlot{}) noexcept
-    {
-        return associated_cancellation_slot<
-            Handler, CancellationSlot>::get(op.h_, slot);
-    }
-};
-
-template<class Handler, class... Args, class CancellationSlot>
-struct associated_cancellation_slot<
-    beast::detail::bind_front_wrapper<Handler, Args...>, CancellationSlot>
-{
-    using type = typename
-        associated_cancellation_slot<Handler>::type;
-
-    static
-    type
-    get(beast::detail::bind_front_wrapper<Handler, Args...> const& op,
-        CancellationSlot const& slot = CancellationSlot{}) noexcept
-    {
-        return associated_cancellation_slot<
-            Handler, CancellationSlot>::get(op.h_, slot);
-    }
-};
-
-
-
 } // asio
 } // boost
 
diff --git a/inst/include/boost/beast/core/detail/clamp.hpp b/inst/include/boost/beast/core/detail/clamp.hpp
index 0ec2768ca..5474fe44b 100644
--- a/inst/include/boost/beast/core/detail/clamp.hpp
+++ b/inst/include/boost/beast/core/detail/clamp.hpp
@@ -19,7 +19,6 @@ namespace beast {
 namespace detail {
 
 template<class UInt>
-static
 std::size_t
 clamp(UInt x)
 {
@@ -29,7 +28,6 @@ clamp(UInt x)
 }
 
 template<class UInt>
-static
 std::size_t
 clamp(UInt x, std::size_t limit)
 {
diff --git a/inst/include/boost/beast/core/detail/impl/read.hpp b/inst/include/boost/beast/core/detail/impl/read.hpp
index 172bed231..bbc4491c7 100644
--- a/inst/include/boost/beast/core/detail/impl/read.hpp
+++ b/inst/include/boost/beast/core/detail/impl/read.hpp
@@ -10,7 +10,6 @@
 #ifndef BOOST_BEAST_DETAIL_IMPL_READ_HPP
 #define BOOST_BEAST_DETAIL_IMPL_READ_HPP
 
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/async_base.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/beast/core/read_size.hpp>
@@ -105,17 +104,26 @@ class read_op
 
 //------------------------------------------------------------------------------
 
+template <typename AsyncReadStream>
 struct run_read_op
 {
+    AsyncReadStream* stream;
+
+    using executor_type = typename AsyncReadStream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
     template<
-        class AsyncReadStream,
         class DynamicBuffer,
         class Condition,
         class ReadHandler>
     void
     operator()(
         ReadHandler&& h,
-        AsyncReadStream* s,
         DynamicBuffer* b,
         Condition&& c)
     {
@@ -134,7 +142,7 @@ struct run_read_op
             typename std::decay<Condition>::type,
             typename std::decay<ReadHandler>::type>(
                 std::forward<ReadHandler>(h),
-                *s,
+                *stream,
                 *b,
                 std::forward<Condition>(c));
     }
@@ -235,9 +243,8 @@ async_read(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            typename dynamic_read_ops::run_read_op{},
+            typename dynamic_read_ops::run_read_op<AsyncReadStream>{&stream},
             handler,
-            &stream,
             &buffer,
             std::forward<CompletionCondition>(cond));
 }
diff --git a/inst/include/boost/beast/core/detail/stream_base.hpp b/inst/include/boost/beast/core/detail/stream_base.hpp
index 8080e9492..1c6b2a9a9 100644
--- a/inst/include/boost/beast/core/detail/stream_base.hpp
+++ b/inst/include/boost/beast/core/detail/stream_base.hpp
@@ -132,6 +132,11 @@ struct stream_base
         return (time_point::max)();
     }
 
+    static time_point now() noexcept
+    {
+        return clock_type::now();
+    }
+
     static std::size_t constexpr no_limit =
         (std::numeric_limits<std::size_t>::max)();
 };
diff --git a/inst/include/boost/beast/core/detail/string.hpp b/inst/include/boost/beast/core/detail/string.hpp
index b553c6043..fcaefb882 100644
--- a/inst/include/boost/beast/core/detail/string.hpp
+++ b/inst/include/boost/beast/core/detail/string.hpp
@@ -23,7 +23,7 @@ namespace string_literals {
 
 inline
 string_view
-operator"" _sv(char const* p, std::size_t n)
+operator""_sv(char const* p, std::size_t n)
 {
     return string_view{p, n};
 }
diff --git a/inst/include/boost/beast/core/detect_ssl.hpp b/inst/include/boost/beast/core/detect_ssl.hpp
index f497f7b42..6ad0ffd53 100644
--- a/inst/include/boost/beast/core/detect_ssl.hpp
+++ b/inst/include/boost/beast/core/detect_ssl.hpp
@@ -348,6 +348,7 @@ class detect_ssl_op;
 // authors of composed operations need to write it this way to get the
 // very best performance, for example when using Coroutines TS (`co_await`).
 
+template <typename AsyncReadStream>
 struct run_detect_ssl_op
 {
     // The implementation of `net::async_initiate` captures the
@@ -361,20 +362,29 @@ struct run_detect_ssl_op
     // token into the "real handler" which must have the correct
     // signature, in this case `void(error_code, boost::tri_bool)`.
 
+    AsyncReadStream* stream;
+
+    using executor_type = typename AsyncReadStream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
     template<
         class DetectHandler,
-        class AsyncReadStream,
         class DynamicBuffer>
-    void operator()(
+    void
+    operator()(
         DetectHandler&& h,
-        AsyncReadStream* s, // references are passed as pointers
         DynamicBuffer* b)
     {
         detect_ssl_op<
             typename std::decay<DetectHandler>::type,
             AsyncReadStream,
             DynamicBuffer>(
-                std::forward<DetectHandler>(h), *s, *b);
+                std::forward<DetectHandler>(h), *stream, *b);
     }
 };
 
@@ -423,9 +433,8 @@ async_detect_ssl(
     return net::async_initiate<
         CompletionToken,
         void(error_code, bool)>(
-            detail::run_detect_ssl_op{},
+            detail::run_detect_ssl_op<AsyncReadStream>{&stream},
             token,
-            &stream, // pass the reference by pointer
             &buffer);
 }
 
diff --git a/inst/include/boost/beast/core/flat_buffer.hpp b/inst/include/boost/beast/core/flat_buffer.hpp
index 550e44142..85115e379 100644
--- a/inst/include/boost/beast/core/flat_buffer.hpp
+++ b/inst/include/boost/beast/core/flat_buffer.hpp
@@ -43,7 +43,7 @@ namespace beast {
 
     @li Buffer sequences representing the readable and writable
     bytes, returned by @ref data and @ref prepare, will have
-    length one.
+    a type of net::const_buffer or net::mutable_buffer.
 
     Upon construction, a maximum size for the buffer may be
     specified. If this limit is exceeded, the `std::length_error`
diff --git a/inst/include/boost/beast/core/flat_static_buffer.hpp b/inst/include/boost/beast/core/flat_static_buffer.hpp
index 48b378d8e..c5cd2fe36 100644
--- a/inst/include/boost/beast/core/flat_static_buffer.hpp
+++ b/inst/include/boost/beast/core/flat_static_buffer.hpp
@@ -19,7 +19,7 @@
 namespace boost {
 namespace beast {
 
-/** A dynamic buffer using a fixed size internal buffer.
+/** A dynamic buffer using a fixed size internal buffer using no memory allocations.
 
     A dynamic buffer encapsulates memory storage that may be
     automatically resized as required, where the memory is
@@ -37,7 +37,7 @@ namespace beast {
 
     @li Buffer sequences representing the readable and writable
     bytes, returned by @ref data and @ref prepare, will have
-    length one.
+    a type of net::const_buffer or net::mutable_buffer.
 
     @li Ownership of the underlying storage belongs to the
     derived class.
@@ -245,11 +245,11 @@ class flat_static_buffer_base
 
 //------------------------------------------------------------------------------
 
-/** A <em>DynamicBuffer</em> with a fixed size internal buffer.
+/** A <em>DynamicBuffer</em> with a fixed size internal buffer using no memory allocations.
 
-    Buffer sequences returned by @ref data and @ref prepare
-    will always be of length one.
-    This implements a dynamic buffer using no memory allocations.
+    Buffer sequences representing the readable and writable
+    bytes, returned by @ref data and @ref prepare, will have
+    a type of net::const_buffer or net::mutable_buffer.
 
     @tparam N The number of bytes in the internal buffer.
 
diff --git a/inst/include/boost/beast/core/flat_stream.hpp b/inst/include/boost/beast/core/flat_stream.hpp
index 42844ba5f..d1df1afec 100644
--- a/inst/include/boost/beast/core/flat_stream.hpp
+++ b/inst/include/boost/beast/core/flat_stream.hpp
@@ -22,7 +22,9 @@
 namespace boost {
 namespace beast {
 
-/** Stream wrapper to improve write performance.
+/** (Deprecated: This wrapper is no longer needed; Asio linearizes
+    scatter/gather I/O in ssl::stream.) Stream wrapper to improve write
+    performance.
 
     This wrapper flattens writes for buffer sequences having length
     greater than 1 and total size below a predefined amount, using
diff --git a/inst/include/boost/beast/core/impl/basic_stream.hpp b/inst/include/boost/beast/core/impl/basic_stream.hpp
index e3cb83f0b..4a7f042a6 100644
--- a/inst/include/boost/beast/core/impl/basic_stream.hpp
+++ b/inst/include/boost/beast/core/impl/basic_stream.hpp
@@ -14,6 +14,7 @@
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/websocket/teardown.hpp>
+#include <boost/asio/append.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/assert.hpp>
 #include <boost/make_shared.hpp>
@@ -313,6 +314,26 @@ class transfer_op
     {
         BOOST_ASIO_CORO_REENTER(*this)
         {
+            // apply the timeout manually, otherwise
+            // behavior varies across platforms.
+            if(state().timer.expiry() <= now())
+            {
+                BOOST_ASIO_CORO_YIELD
+                {
+                    BOOST_ASIO_HANDLER_LOCATION((
+                        __FILE__, __LINE__,
+                        (isRead ? "basic_stream::async_read_some"
+                            : "basic_stream::async_write_some")));
+
+                    const auto ex = this->get_immediate_executor();
+                    net::dispatch(ex, net::append(std::move(*this), ec, 0));
+                }
+
+                impl_->close();
+                BOOST_BEAST_ASSIGN_EC(ec, beast::error::timeout);
+                goto upcall;
+            }
+
             // handle empty buffers
             if(detail::buffers_empty(b_))
             {
@@ -326,13 +347,6 @@ class transfer_op
 
                     async_perform(0, is_read{});
                 }
-                // apply the timeout manually, otherwise
-                // behavior varies across platforms.
-                if(state().timer.expiry() <= clock_type::now())
-                {
-                    impl_->close();
-                    BOOST_BEAST_ASSIGN_EC(ec, beast::error::timeout);
-                }
                 goto upcall;
             }
 
@@ -593,11 +607,20 @@ class connect_op
 
 struct run_read_op
 {
+    basic_stream* self;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<class ReadHandler, class Buffers>
     void
     operator()(
         ReadHandler&& h,
-        basic_stream* s,
         Buffers const& b)
     {
         // If you get an error on the following line it means
@@ -613,17 +636,26 @@ struct run_read_op
             true,
             Buffers,
             typename std::decay<ReadHandler>::type>(
-                std::forward<ReadHandler>(h), *s, b);
+                std::forward<ReadHandler>(h), *self, b);
     }
 };
 
 struct run_write_op
 {
+    basic_stream* self;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<class WriteHandler, class Buffers>
     void
     operator()(
         WriteHandler&& h,
-        basic_stream* s,
         Buffers const& b)
     {
         // If you get an error on the following line it means
@@ -639,17 +671,26 @@ struct run_write_op
             false,
             Buffers,
             typename std::decay<WriteHandler>::type>(
-                std::forward<WriteHandler>(h), *s, b);
+                std::forward<WriteHandler>(h), *self, b);
     }
 };
 
 struct run_connect_op
 {
+    basic_stream* self;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<class ConnectHandler>
     void
     operator()(
         ConnectHandler&& h,
-        basic_stream* s,
         endpoint_type const& ep)
     {
         // If you get an error on the following line it means
@@ -662,12 +703,22 @@ struct run_connect_op
             "ConnectHandler type requirements not met");
 
         connect_op<typename std::decay<ConnectHandler>::type>(
-            std::forward<ConnectHandler>(h), *s, ep);
+            std::forward<ConnectHandler>(h), *self, ep);
     }
 };
 
 struct run_connect_range_op
 {
+    basic_stream* self;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<
         class RangeConnectHandler,
         class EndpointSequence,
@@ -675,7 +726,6 @@ struct run_connect_range_op
     void
     operator()(
         RangeConnectHandler&& h,
-        basic_stream* s,
         EndpointSequence const& eps,
         Condition const& cond)
     {
@@ -689,12 +739,22 @@ struct run_connect_range_op
             "RangeConnectHandler type requirements not met");
 
         connect_op<typename std::decay<RangeConnectHandler>::type>(
-            std::forward<RangeConnectHandler>(h), *s, eps, cond);
+            std::forward<RangeConnectHandler>(h), *self, eps, cond);
     }
 };
 
 struct run_connect_iter_op
 {
+    basic_stream* self;
+
+    using executor_type = typename basic_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<
         class IteratorConnectHandler,
         class Iterator,
@@ -702,7 +762,6 @@ struct run_connect_iter_op
     void
     operator()(
         IteratorConnectHandler&& h,
-        basic_stream* s,
         Iterator begin, Iterator end,
         Condition const& cond)
     {
@@ -716,7 +775,7 @@ struct run_connect_iter_op
             "IteratorConnectHandler type requirements not met");
 
         connect_op<typename std::decay<IteratorConnectHandler>::type>(
-            std::forward<IteratorConnectHandler>(h), *s, begin, end, cond);
+            std::forward<IteratorConnectHandler>(h), *self, begin, end, cond);
     }
 };
 
@@ -882,9 +941,8 @@ async_connect(
     return net::async_initiate<
         ConnectHandler,
         void(error_code)>(
-            typename ops::run_connect_op{},
+            typename ops::run_connect_op{this},
             handler,
-            this,
             ep);
 }
 
@@ -892,6 +950,7 @@ template<class Protocol, class Executor, class RatePolicy>
 template<
     class EndpointSequence,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, typename Protocol::endpoint)) RangeConnectHandler,
+    class,
     class>
 BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(RangeConnectHandler,void(error_code, typename Protocol::endpoint))
 basic_stream<Protocol, Executor, RatePolicy>::
@@ -902,9 +961,8 @@ async_connect(
     return net::async_initiate<
         RangeConnectHandler,
         void(error_code, typename Protocol::endpoint)>(
-            typename ops::run_connect_range_op{},
+            typename ops::run_connect_range_op{this},
             handler,
-            this,
             endpoints,
             detail::any_endpoint{});
 }
@@ -914,6 +972,7 @@ template<
     class EndpointSequence,
     class ConnectCondition,
     BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, typename Protocol::endpoint)) RangeConnectHandler,
+    class,
     class>
 BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(RangeConnectHandler,void (error_code, typename Protocol::endpoint))
 basic_stream<Protocol, Executor, RatePolicy>::
@@ -925,9 +984,8 @@ async_connect(
     return net::async_initiate<
         RangeConnectHandler,
         void(error_code, typename Protocol::endpoint)>(
-            typename ops::run_connect_range_op{},
+            typename ops::run_connect_range_op{this},
             handler,
-            this,
             endpoints,
             connect_condition);
 }
@@ -935,7 +993,8 @@ async_connect(
 template<class Protocol, class Executor, class RatePolicy>
 template<
     class Iterator,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, Iterator)) IteratorConnectHandler>
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, Iterator)) IteratorConnectHandler,
+    class>
 BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(IteratorConnectHandler,void (error_code, Iterator))
 basic_stream<Protocol, Executor, RatePolicy>::
 async_connect(
@@ -945,9 +1004,8 @@ async_connect(
     return net::async_initiate<
         IteratorConnectHandler,
         void(error_code, Iterator)>(
-            typename ops::run_connect_iter_op{},
+            typename ops::run_connect_iter_op{this},
             handler,
-            this,
             begin, end,
             detail::any_endpoint{});
 }
@@ -956,7 +1014,8 @@ template<class Protocol, class Executor, class RatePolicy>
 template<
     class Iterator,
     class ConnectCondition,
-    BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, Iterator)) IteratorConnectHandler>
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(void(error_code, Iterator)) IteratorConnectHandler,
+    class>
 BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(IteratorConnectHandler,void (error_code, Iterator))
 basic_stream<Protocol, Executor, RatePolicy>::
 async_connect(
@@ -967,9 +1026,8 @@ async_connect(
     return net::async_initiate<
         IteratorConnectHandler,
         void(error_code, Iterator)>(
-            typename ops::run_connect_iter_op{},
+            typename ops::run_connect_iter_op{this},
             handler,
-            this,
             begin, end,
             connect_condition);
 }
@@ -990,9 +1048,8 @@ async_read_some(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            typename ops::run_read_op{},
+            typename ops::run_read_op{this},
             handler,
-            this,
             buffers);
 }
 
@@ -1010,9 +1067,8 @@ async_write_some(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            typename ops::run_write_op{},
+            typename ops::run_write_op{this},
             handler,
-            this,
             buffers);
 }
 
diff --git a/inst/include/boost/beast/core/impl/buffered_read_stream.hpp b/inst/include/boost/beast/core/impl/buffered_read_stream.hpp
index 6b861c89f..45e47ac80 100644
--- a/inst/include/boost/beast/core/impl/buffered_read_stream.hpp
+++ b/inst/include/boost/beast/core/impl/buffered_read_stream.hpp
@@ -11,11 +11,11 @@
 #define BOOST_BEAST_IMPL_BUFFERED_READ_STREAM_HPP
 
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/read_size.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
+#include <boost/asio/append.hpp>
 #include <boost/asio/dispatch.hpp>
 #include <boost/throw_exception.hpp>
 
@@ -84,8 +84,7 @@ class read_op
                 const auto ex = this->get_immediate_executor();
                 return net::dispatch(
                     ex,
-                    beast::bind_front_handler(
-                        std::move(*this), ec, 0));
+                    net::append(std::move(*this), ec, 0));
             }
         case 1:
             // upcall
@@ -107,11 +106,20 @@ class read_op
 
 struct run_read_op
 {
+    buffered_read_stream* self;
+
+    using executor_type = typename buffered_read_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<class ReadHandler, class Buffers>
     void
     operator()(
         ReadHandler&& h,
-        buffered_read_stream* s,
         Buffers const* b)
     {
         // If you get an error on the following line it means
@@ -126,7 +134,7 @@ struct run_read_op
         read_op<
             Buffers,
             typename std::decay<ReadHandler>::type>(
-                std::forward<ReadHandler>(h), *s, *b);
+                std::forward<ReadHandler>(h), *self, *b);
     }
 };
 
@@ -232,9 +240,8 @@ async_read_some(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            typename ops::run_read_op{},
+            typename ops::run_read_op{this},
             handler,
-            this,
             &buffers);
 }
 
diff --git a/inst/include/boost/beast/core/impl/buffers_adaptor.hpp b/inst/include/boost/beast/core/impl/buffers_adaptor.hpp
index dc13efa53..94f03b5c8 100644
--- a/inst/include/boost/beast/core/impl/buffers_adaptor.hpp
+++ b/inst/include/boost/beast/core/impl/buffers_adaptor.hpp
@@ -44,6 +44,7 @@ class buffers_adaptor<MutableBufferSequence>::subrange
         net::const_buffer>::type;
 
     struct iterator;
+    using const_iterator = iterator;
 
     // construct from two iterators plus optionally subrange definition
     subrange(
diff --git a/inst/include/boost/beast/core/impl/buffers_cat.hpp b/inst/include/boost/beast/core/impl/buffers_cat.hpp
index cf6641ada..98c477585 100644
--- a/inst/include/boost/beast/core/impl/buffers_cat.hpp
+++ b/inst/include/boost/beast/core/impl/buffers_cat.hpp
@@ -52,11 +52,8 @@ class buffers_cat_view<Buffer>
 
 #if defined(_MSC_VER) && ! defined(__clang__)
 # define BOOST_BEAST_UNREACHABLE() __assume(false)
-# define BOOST_BEAST_UNREACHABLE_RETURN(v) return v
 #else
 # define BOOST_BEAST_UNREACHABLE() __builtin_unreachable()
-# define BOOST_BEAST_UNREACHABLE_RETURN(v) \
-    do { __builtin_unreachable(); return v; } while(false)
 #endif
 
 #ifdef BOOST_BEAST_TESTS
@@ -64,7 +61,11 @@ class buffers_cat_view<Buffer>
 #define BOOST_BEAST_LOGIC_ERROR(s) \
     { \
         BOOST_THROW_EXCEPTION(std::logic_error((s))); \
-        BOOST_BEAST_UNREACHABLE(); \
+    }
+
+#define BOOST_BEAST_LOGIC_ERROR_RETURN(s, v) \
+    { \
+        BOOST_THROW_EXCEPTION(std::logic_error((s))); \
     }
 
 #else
@@ -75,6 +76,12 @@ class buffers_cat_view<Buffer>
         BOOST_BEAST_UNREACHABLE(); \
     }
 
+#define BOOST_BEAST_LOGIC_ERROR_RETURN(s, v) \
+    { \
+        BOOST_ASSERT_MSG(false, s); \
+        return v; \
+    }
+
 #endif
 
 namespace detail {
@@ -85,13 +92,6 @@ struct buffers_cat_view_iterator_base
     {
         char unused = 0; // make g++8 happy
 
-        BOOST_NORETURN net::mutable_buffer
-        operator*() const
-        {
-            BOOST_BEAST_LOGIC_ERROR(
-                    "Dereferencing a one-past-the-end iterator");
-        }
-
         operator bool() const noexcept
         {
             return true;
@@ -173,11 +173,18 @@ class buffers_cat_view<Bn...>::const_iterator
     {
         const_iterator const& self;
 
-        BOOST_NORETURN reference
+        reference
         operator()(mp11::mp_size_t<0>)
         {
-            BOOST_BEAST_LOGIC_ERROR(
-                "Dereferencing a default-constructed iterator");
+            BOOST_BEAST_LOGIC_ERROR_RETURN(
+                "Dereferencing a default-constructed iterator", {});
+        }
+
+        reference
+        operator()(mp11::mp_size_t<sizeof...(Bn)+1>)
+        {
+            BOOST_BEAST_LOGIC_ERROR_RETURN(
+                "Dereferencing a one-past-the-end iterator", {});
         }
 
         template<class I>
diff --git a/inst/include/boost/beast/core/impl/error.ipp b/inst/include/boost/beast/core/impl/error.ipp
index 4cf43d769..a5f51b84a 100644
--- a/inst/include/boost/beast/core/impl/error.ipp
+++ b/inst/include/boost/beast/core/impl/error.ipp
@@ -28,10 +28,9 @@ public:
 
     error_codes() : error_category(0x002f6e94401c6e8bu)  {}
 
-
     BOOST_BEAST_DECL
-    std::string
-    message(int ev) const override
+    char const*
+    message(int ev, char*, std::size_t) const noexcept override
     {
         switch(static_cast<error>(ev))
         {
@@ -41,6 +40,13 @@ public:
         }
     }
 
+    BOOST_BEAST_DECL
+    std::string
+    message(int ev) const override
+    {
+        return message(ev, nullptr, 0);
+    }
+
     BOOST_BEAST_DECL
     error_condition
     default_error_condition(int ev) const noexcept override
@@ -67,10 +73,9 @@ public:
 
     error_conditions() : error_category(0x3dd0b0ce843c5b10u)  {}
 
-
     BOOST_BEAST_DECL
-    std::string
-    message(int cv) const override
+    char const*
+    message(int cv, char*, std::size_t) const noexcept override
     {
         switch(static_cast<condition>(cv))
         {
@@ -79,6 +84,13 @@ public:
             return "The operation timed out";
         }
     }
+
+    BOOST_BEAST_DECL
+    std::string
+    message(int cv) const override
+    {
+        return message(cv, nullptr, 0);
+    }
 };
 
 } // detail
diff --git a/inst/include/boost/beast/core/impl/flat_stream.hpp b/inst/include/boost/beast/core/impl/flat_stream.hpp
index 11c75c4c1..2250b4250 100644
--- a/inst/include/boost/beast/core/impl/flat_stream.hpp
+++ b/inst/include/boost/beast/core/impl/flat_stream.hpp
@@ -85,11 +85,20 @@ class write_op
 
 struct run_write_op
 {
+    flat_stream* self;
+
+    using executor_type = typename flat_stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->get_executor();
+    }
+
     template<class WriteHandler, class Buffers>
     void
     operator()(
         WriteHandler&& h,
-        flat_stream* s,
         Buffers const& b)
     {
         // If you get an error on the following line it means
@@ -103,7 +112,7 @@ struct run_write_op
 
         write_op<
             typename std::decay<WriteHandler>::type>(
-                std::forward<WriteHandler>(h), *s, b);
+                std::forward<WriteHandler>(h), *self, b);
     }
 };
 
@@ -250,9 +259,8 @@ async_write_some(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            typename ops::run_write_op{},
+            typename ops::run_write_op{this},
             handler,
-            this,
             buffers);
 }
 
diff --git a/inst/include/boost/beast/core/string_type.hpp b/inst/include/boost/beast/core/string_type.hpp
index bbb09db80..4bc6e5c67 100644
--- a/inst/include/boost/beast/core/string_type.hpp
+++ b/inst/include/boost/beast/core/string_type.hpp
@@ -11,12 +11,7 @@
 #define BOOST_BEAST_STRING_TYPE_HPP
 
 #include <boost/beast/core/detail/config.hpp>
-
 #include <boost/core/detail/string_view.hpp>
-#if defined(BOOST_BEAST_USE_STD_STRING_VIEW)
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("BOOST_BEAST_USE_STD_STRING_VIEW is deprecated, use BOOST_NO_CXX17_HDR_STRING_VIEW instead");
-#endif
 
 namespace boost {
 namespace beast {
diff --git a/inst/include/boost/beast/http/basic_dynamic_body.hpp b/inst/include/boost/beast/http/basic_dynamic_body.hpp
index fb5f8d430..16b9fbff0 100644
--- a/inst/include/boost/beast/http/basic_dynamic_body.hpp
+++ b/inst/include/boost/beast/http/basic_dynamic_body.hpp
@@ -10,10 +10,12 @@
 #ifndef BOOST_BEAST_HTTP_BASIC_DYNAMIC_BODY_HPP
 #define BOOST_BEAST_HTTP_BASIC_DYNAMIC_BODY_HPP
 
-#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/basic_dynamic_body_fwd.hpp>
+
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/detail/buffer.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
+#include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/optional.hpp>
diff --git a/inst/include/boost/beast/http/basic_dynamic_body_fwd.hpp b/inst/include/boost/beast/http/basic_dynamic_body_fwd.hpp
new file mode 100644
index 000000000..a6fe9714f
--- /dev/null
+++ b/inst/include/boost/beast/http/basic_dynamic_body_fwd.hpp
@@ -0,0 +1,24 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_BASIC_DYNAMIC_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_BASIC_DYNAMIC_BODY_FWD_HPP
+
+namespace boost {
+namespace beast {
+namespace http {
+
+template<class DynamicBuffer>
+struct basic_dynamic_body;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/basic_file_body.hpp b/inst/include/boost/beast/http/basic_file_body.hpp
index 28ecacf96..43646df09 100644
--- a/inst/include/boost/beast/http/basic_file_body.hpp
+++ b/inst/include/boost/beast/http/basic_file_body.hpp
@@ -10,6 +10,8 @@
 #ifndef BOOST_BEAST_HTTP_BASIC_FILE_BODY_HPP
 #define BOOST_BEAST_HTTP_BASIC_FILE_BODY_HPP
 
+#include <boost/beast/http/basic_file_body_fwd.hpp>
+
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/file_base.hpp>
diff --git a/inst/include/boost/beast/http/basic_file_body_fwd.hpp b/inst/include/boost/beast/http/basic_file_body_fwd.hpp
new file mode 100644
index 000000000..13b1af38f
--- /dev/null
+++ b/inst/include/boost/beast/http/basic_file_body_fwd.hpp
@@ -0,0 +1,24 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_BASIC_FILE_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_BASIC_FILE_BODY_FWD_HPP
+
+namespace boost {
+namespace beast {
+namespace http {
+
+template<class File>
+struct basic_file_body;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/basic_parser.hpp b/inst/include/boost/beast/http/basic_parser.hpp
index d2eda05ff..fbc44273e 100644
--- a/inst/include/boost/beast/http/basic_parser.hpp
+++ b/inst/include/boost/beast/http/basic_parser.hpp
@@ -78,7 +78,6 @@ class basic_parser
     std::uint64_t len0_ = 0;                // content length if known
     std::unique_ptr<char[]> buf_;           // temp storage
     std::size_t buf_len_ = 0;               // size of buf_
-    std::size_t skip_ = 0;                  // resume search here
     std::uint32_t header_limit_ = 8192;     // max header size
     unsigned short status_ = 0;             // response status
     state state_ = state::nothing_yet;      // initial state
@@ -110,7 +109,6 @@ class basic_parser
     static unsigned constexpr flagContentLength         = 1<< 10;
     static unsigned constexpr flagChunked               = 1<< 11;
     static unsigned constexpr flagUpgrade               = 1<< 12;
-    static unsigned constexpr flagFinalChunk            = 1<< 13;
 
     static constexpr
     std::uint64_t
@@ -642,23 +640,28 @@ class basic_parser
         error_code& ec);
 
     void
-    maybe_need_more(
-        char const* p, std::size_t n,
-            error_code& ec);
+    inner_parse_start_line(
+        char const*& p, char const* last,
+            error_code& ec, std::true_type);
 
     void
-    parse_start_line(
+    inner_parse_start_line(
         char const*& p, char const* last,
-            error_code& ec, std::true_type);
+            error_code& ec, std::false_type);
 
     void
     parse_start_line(
+        char const*& p, std::size_t n,
+            error_code& ec);
+
+    void
+    inner_parse_fields(
         char const*& p, char const* last,
-            error_code& ec, std::false_type);
+            error_code& ec);
 
     void
     parse_fields(
-        char const*& p, char const* last,
+        char const*& p, std::size_t n,
             error_code& ec);
 
     void
diff --git a/inst/include/boost/beast/http/buffer_body.hpp b/inst/include/boost/beast/http/buffer_body.hpp
index 98768cb8a..cd04f841c 100644
--- a/inst/include/boost/beast/http/buffer_body.hpp
+++ b/inst/include/boost/beast/http/buffer_body.hpp
@@ -10,15 +10,15 @@
 #ifndef BOOST_BEAST_HTTP_BUFFER_BODY_HPP
 #define BOOST_BEAST_HTTP_BUFFER_BODY_HPP
 
-#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/buffer_body_fwd.hpp>
+
 #include <boost/beast/core/buffer_traits.hpp>
+#include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/type_traits.hpp>
 #include <boost/optional.hpp>
-
 #include <cstdint>
-#include <type_traits>
 #include <utility>
 
 namespace boost {
diff --git a/inst/include/boost/beast/http/buffer_body_fwd.hpp b/inst/include/boost/beast/http/buffer_body_fwd.hpp
new file mode 100644
index 000000000..66174d7a3
--- /dev/null
+++ b/inst/include/boost/beast/http/buffer_body_fwd.hpp
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_BUFFER_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_BUFFER_BODY_FWD_HPP
+
+namespace boost {
+namespace beast {
+namespace http {
+
+struct buffer_body;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/detail/basic_parser.hpp b/inst/include/boost/beast/http/detail/basic_parser.hpp
index 196d1c0a2..5fa25333f 100644
--- a/inst/include/boost/beast/http/detail/basic_parser.hpp
+++ b/inst/include/boost/beast/http/detail/basic_parser.hpp
@@ -44,6 +44,7 @@ struct basic_parser_base
         chunk_header0,
         chunk_header,
         chunk_body,
+        trailer_fields,
         complete
     };
 
@@ -108,11 +109,6 @@ struct basic_parser_base
         char const* it, char const* last,
             error_code& ec);
 
-    BOOST_BEAST_DECL
-    static
-    char const*
-    find_eom(char const* p, char const* last);
-
     //--------------------------------------------------------------------------
 
     BOOST_BEAST_DECL
diff --git a/inst/include/boost/beast/http/detail/basic_parser.ipp b/inst/include/boost/beast/http/detail/basic_parser.ipp
index 31d7cd404..117fd36a3 100644
--- a/inst/include/boost/beast/http/detail/basic_parser.ipp
+++ b/inst/include/boost/beast/http/detail/basic_parser.ipp
@@ -201,40 +201,6 @@ parse_hex(char const*& it, std::uint64_t& v)
     return true;
 }
 
-char const*
-basic_parser_base::
-find_eom(char const* p, char const* last)
-{
-    for(;;)
-    {
-        if(p + 4 > last)
-            return nullptr;
-        if(p[3] != '\n')
-        {
-            if(p[3] == '\r')
-                ++p;
-            else
-                p += 4;
-        }
-        else if(p[2] != '\r')
-        {
-            p += 4;
-        }
-        else if(p[1] != '\n')
-        {
-            p += 2;
-        }
-        else if(p[0] != '\r')
-        {
-            p += 2;
-        }
-        else
-        {
-            return p + 4;
-        }
-    }
-}
-
 //--------------------------------------------------------------------------
 
 char const*
diff --git a/inst/include/boost/beast/http/detail/type_traits.hpp b/inst/include/boost/beast/http/detail/type_traits.hpp
index 1da4c4e41..a9b5d6408 100644
--- a/inst/include/boost/beast/http/detail/type_traits.hpp
+++ b/inst/include/boost/beast/http/detail/type_traits.hpp
@@ -11,22 +11,14 @@
 #define BOOST_BEAST_HTTP_DETAIL_TYPE_TRAITS_HPP
 
 #include <boost/beast/core/detail/type_traits.hpp>
+#include <boost/beast/http/message_fwd.hpp>
+#include <boost/beast/http/parser_fwd.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
 
 namespace boost {
 namespace beast {
 namespace http {
-
-template<bool isRequest, class Fields>
-class header;
-
-template<bool, class, class>
-class message;
-
-template<bool isRequest, class Body, class Fields>
-class parser;
-
 namespace detail {
 
 template<class T>
diff --git a/inst/include/boost/beast/http/dynamic_body.hpp b/inst/include/boost/beast/http/dynamic_body.hpp
index a55fff45e..58aa1b602 100644
--- a/inst/include/boost/beast/http/dynamic_body.hpp
+++ b/inst/include/boost/beast/http/dynamic_body.hpp
@@ -10,6 +10,8 @@
 #ifndef BOOST_BEAST_HTTP_DYNAMIC_BODY_HPP
 #define BOOST_BEAST_HTTP_DYNAMIC_BODY_HPP
 
+#include <boost/beast/http/dynamic_body_fwd.hpp>
+
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http/basic_dynamic_body.hpp>
 
@@ -17,11 +19,13 @@ namespace boost {
 namespace beast {
 namespace http {
 
+#if BOOST_BEAST_DOXYGEN
 /** A dynamic message body represented by a @ref multi_buffer
 
     Meets the requirements of <em>Body</em>.
 */
 using dynamic_body = basic_dynamic_body<multi_buffer>;
+#endif
 
 } // http
 } // beast
diff --git a/inst/include/boost/beast/http/dynamic_body_fwd.hpp b/inst/include/boost/beast/http/dynamic_body_fwd.hpp
new file mode 100644
index 000000000..8d758ea69
--- /dev/null
+++ b/inst/include/boost/beast/http/dynamic_body_fwd.hpp
@@ -0,0 +1,37 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_DYNAMIC_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_DYNAMIC_BODY_FWD_HPP
+
+#include <boost/beast/http/basic_dynamic_body_fwd.hpp>
+
+#include <memory>
+
+namespace boost {
+namespace beast {
+
+#ifndef BOOST_BEAST_DOXYGEN
+template<class Allocator>
+class basic_multi_buffer;
+
+using multi_buffer = basic_multi_buffer<std::allocator<char>>;
+#endif
+
+namespace http {
+
+#ifndef BOOST_BEAST_DOXYGEN
+using dynamic_body = basic_dynamic_body<multi_buffer>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/empty_body.hpp b/inst/include/boost/beast/http/empty_body.hpp
index fb90e0619..e75a46ad4 100644
--- a/inst/include/boost/beast/http/empty_body.hpp
+++ b/inst/include/boost/beast/http/empty_body.hpp
@@ -10,6 +10,8 @@
 #ifndef BOOST_BEAST_HTTP_EMPTY_BODY_HPP
 #define BOOST_BEAST_HTTP_EMPTY_BODY_HPP
 
+#include <boost/beast/http/empty_body_fwd.hpp>
+
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
diff --git a/inst/include/boost/beast/http/empty_body_fwd.hpp b/inst/include/boost/beast/http/empty_body_fwd.hpp
new file mode 100644
index 000000000..a25806c91
--- /dev/null
+++ b/inst/include/boost/beast/http/empty_body_fwd.hpp
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_EMPTY_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_EMPTY_BODY_FWD_HPP
+
+namespace boost {
+namespace beast {
+namespace http {
+
+struct empty_body;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/error.hpp b/inst/include/boost/beast/http/error.hpp
index 079c6b753..3018bc895 100644
--- a/inst/include/boost/beast/http/error.hpp
+++ b/inst/include/boost/beast/http/error.hpp
@@ -164,7 +164,13 @@ enum class error
         unexpected end-of-file condition is encountered while trying
         to read from the file.
     */
-    short_read
+    short_read,
+
+    /// Header field name exceeds @ref basic_fields::max_name_size.
+    header_field_name_too_large,
+
+    /// Header field value exceeds @ref basic_fields::max_value_size.
+    header_field_value_too_large
 };
 
 } // http
diff --git a/inst/include/boost/beast/http/fields.hpp b/inst/include/boost/beast/http/fields.hpp
index 2a8982f0f..d799d3abd 100644
--- a/inst/include/boost/beast/http/fields.hpp
+++ b/inst/include/boost/beast/http/fields.hpp
@@ -10,20 +10,21 @@
 #ifndef BOOST_BEAST_HTTP_FIELDS_HPP
 #define BOOST_BEAST_HTTP_FIELDS_HPP
 
+#include <boost/beast/http/fields_fwd.hpp>
+
+#include <boost/beast/core/detail/allocator.hpp>
 #include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/core/error.hpp>
 #include <boost/beast/core/string.hpp>
-#include <boost/beast/core/detail/allocator.hpp>
 #include <boost/beast/http/field.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/optional.hpp>
-#include <algorithm>
 #include <cctype>
 #include <cstring>
 #include <memory>
-#include <string>
 #include <type_traits>
 #include <utility>
 
@@ -204,11 +205,28 @@ class basic_fields
     using alloc_traits =
         beast::detail::allocator_traits<rebind_type>;
 
+    using pocma = typename
+        alloc_traits::propagate_on_container_move_assignment;
+
+    using pocca = typename
+        alloc_traits::propagate_on_container_copy_assignment;
+
+    using pocs = typename
+        alloc_traits::propagate_on_container_swap;
+
     using size_type = typename
         beast::detail::allocator_traits<Allocator>::size_type;
 
 
 public:
+    /// Maximum field name size
+    static std::size_t constexpr max_name_size =
+        (std::numeric_limits<std::uint16_t>::max)() - 2;
+
+    /// Maximum field value size
+    static std::size_t constexpr max_value_size =
+        (std::numeric_limits<std::uint16_t>::max)() - 2;
+
     /// Destructor
     ~basic_fields();
 
@@ -265,7 +283,7 @@ class basic_fields
         as if constructed using the same allocator.
     */
     basic_fields& operator=(basic_fields&&) noexcept(
-        alloc_traits::propagate_on_container_move_assignment::value);
+        pocma::value && std::is_nothrow_move_assignable<Allocator>::value);
 
     /// Copy assignment.
     basic_fields& operator=(basic_fields const&);
@@ -425,13 +443,15 @@ class basic_fields
 
         @param name The field name.
 
-        @param value The value of the field, as a @ref boost::beast::string_view
+        @param value The field value.
+
+        @throws boost::system::system_error Thrown if an error occurs:
+            @li If the size of @c value exceeds @ref max_value_size, the
+            error code will be @ref error::header_field_value_too_large.
     */
     void
-    insert(field name, string_view const& value);
+    insert(field name, string_view value);
 
-    /* Set a field from a null pointer (deleted).
-    */
     void
     insert(field, std::nullptr_t) = delete;
 
@@ -444,13 +464,17 @@ class basic_fields
 
         @param name The field name. It is interpreted as a case-insensitive string.
 
-        @param value The value of the field, as a @ref boost::beast::string_view
+        @param value The field value.
+
+        @throws boost::system::system_error Thrown if an error occurs:
+            @li If the size of @c name exceeds @ref max_name_size, the
+            error code will be @ref error::header_field_name_too_large.
+            @li If the size of @c value exceeds @ref max_value_size, the
+            error code will be @ref error::header_field_value_too_large.
     */
     void
-    insert(string_view name, string_view const& value);
+    insert(string_view name, string_view value);
 
-    /* Insert a field from a null pointer (deleted).
-    */
     void
     insert(string_view, std::nullptr_t) = delete;
 
@@ -468,15 +492,50 @@ class basic_fields
         must be equal to `to_string(name)` using a case-insensitive
         comparison, otherwise the behavior is undefined.
 
-        @param value The value of the field, as a @ref boost::beast::string_view
+        @param value The field value.
+
+        @throws boost::system::system_error Thrown if an error occurs:
+            @li If the size of @c name_string exceeds @ref max_name_size,
+            the error code will be @ref error::header_field_name_too_large.
+            @li If the size of @c value exceeds @ref max_value_size, the
+            error code will be @ref error::header_field_value_too_large.
     */
     void
     insert(field name, string_view name_string,
-           string_view const& value);
+        string_view value);
 
     void
     insert(field, string_view, std::nullptr_t) = delete;
 
+    /** Insert a field.
+
+        If one or more fields with the same name already exist,
+        the new field will be inserted after the last field with
+        the matching name, in serialization order.
+        The value can be an empty string.
+
+        @param name The field name.
+
+        @param name_string The literal text corresponding to the
+        field name. If `name != field::unknown`, then this value
+        must be equal to `to_string(name)` using a case-insensitive
+        comparison, otherwise the behavior is undefined.
+
+        @param value The field value.
+
+        @param ec Set to indicate what error occurred:
+            @li If the size of @c name_string exceeds @ref max_name_size,
+            the error code will be @ref error::header_field_name_too_large.
+            @li If the size of @c value exceeds @ref max_value_size, the
+            error code will be @ref error::header_field_value_too_large.
+    */
+    void
+    insert(field name, string_view name_string,
+        string_view value, error_code& ec);
+
+    void
+    insert(field, string_view, std::nullptr_t, error_code& ec) = delete;
+
     /** Set a field value, removing any other instances of that field.
 
         First removes any values with matching field names, then
@@ -484,13 +543,14 @@ class basic_fields
 
         @param name The field name.
 
-        @param value The value of the field, as a @ref boost::beast::string_view
-
-        @return The field value.
+        @param value The field value.
 
+        @throws boost::system::system_error Thrown if an error occurs:
+            @li If the size of @c value exceeds @ref max_value_size, the
+            error code will be @ref error::header_field_value_too_large.
     */
     void
-    set(field name, string_view const& value);
+    set(field name, string_view value);
 
     void
     set(field, std::nullptr_t) = delete;
@@ -502,15 +562,21 @@ class basic_fields
 
         @param name The field name. It is interpreted as a case-insensitive string.
 
-        @param value The value of the field, as a @ref boost::beast::string_view
+        @param value The field value.
+
+        @throws boost::system::system_error Thrown if an error occurs:
+            @li If the size of @c name exceeds @ref max_name_size, the
+            error code will be @ref error::header_field_name_too_large.
+            @li If the size of @c value exceeds @ref max_value_size, the
+            error code will be @ref error::header_field_value_too_large.
     */
     void
-    set(string_view name, string_view const& value);
+    set(string_view name, string_view value);
 
     void
     set(string_view, std::nullptr_t) = delete;
 
-        /** Remove a field.
+    /** Remove a field.
 
         References and iterators to the erased elements are
         invalidated. Other references and iterators are not
@@ -735,9 +801,21 @@ class basic_fields
     template<class OtherAlloc>
     friend class basic_fields;
 
+    element*
+    try_create_new_element(
+        field name,
+        string_view sname,
+        string_view value,
+        error_code& ec);
+
     element&
-    new_element(field name,
-        string_view sname, string_view value);
+    new_element(
+        field name,
+        string_view sname,
+        string_view value);
+
+    void
+    insert_element(element& e);
 
     void
     delete_element(element& e);
@@ -786,8 +864,10 @@ class basic_fields
     string_view target_or_reason_;
 };
 
+#if BOOST_BEAST_DOXYGEN
 /// A typical HTTP header fields container
 using fields = basic_fields<std::allocator<char>>;
+#endif
 
 } // http
 } // beast
diff --git a/inst/include/boost/beast/http/fields_fwd.hpp b/inst/include/boost/beast/http/fields_fwd.hpp
new file mode 100644
index 000000000..3849159dd
--- /dev/null
+++ b/inst/include/boost/beast/http/fields_fwd.hpp
@@ -0,0 +1,30 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_FIELDS_FWD_HPP
+#define BOOST_BEAST_HTTP_FIELDS_FWD_HPP
+
+#include <memory>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+template<class Allocator>
+class basic_fields;
+
+#ifndef BOOST_BEAST_DOXYGEN
+using fields = basic_fields<std::allocator<char>>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/file_body.hpp b/inst/include/boost/beast/http/file_body.hpp
index a78d7901d..08cbacb0d 100644
--- a/inst/include/boost/beast/http/file_body.hpp
+++ b/inst/include/boost/beast/http/file_body.hpp
@@ -10,21 +10,22 @@
 #ifndef BOOST_BEAST_HTTP_FILE_BODY_HPP
 #define BOOST_BEAST_HTTP_FILE_BODY_HPP
 
+#include <boost/beast/http/file_body_fwd.hpp>
+
 #include <boost/beast/core/file.hpp>
 #include <boost/beast/http/basic_file_body.hpp>
 #include <boost/assert.hpp>
 #include <boost/optional.hpp>
-#include <algorithm>
 #include <cstdio>
-#include <cstdint>
-#include <utility>
 
 namespace boost {
 namespace beast {
 namespace http {
 
+#if BOOST_BEAST_DOXYGEN
 /// A message body represented by a file on the filesystem.
 using file_body = basic_file_body<file>;
+#endif
 
 } // http
 } // beast
diff --git a/inst/include/boost/beast/http/file_body_fwd.hpp b/inst/include/boost/beast/http/file_body_fwd.hpp
new file mode 100644
index 000000000..29e08777d
--- /dev/null
+++ b/inst/include/boost/beast/http/file_body_fwd.hpp
@@ -0,0 +1,29 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_FILE_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_FILE_BODY_FWD_HPP
+
+#include <boost/beast/http/basic_file_body_fwd.hpp>
+
+#include <boost/beast/core/file.hpp>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+#ifndef BOOST_BEAST_DOXYGEN
+using file_body = basic_file_body<file>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/impl/basic_parser.ipp b/inst/include/boost/beast/http/impl/basic_parser.ipp
index 1e3a357cb..d2c28d1be 100644
--- a/inst/include/boost/beast/http/impl/basic_parser.ipp
+++ b/inst/include/boost/beast/http/impl/basic_parser.ipp
@@ -111,65 +111,23 @@ loop:
         BOOST_FALLTHROUGH;
 
     case state::start_line:
-    {
-        maybe_need_more(p, n, ec);
+        parse_start_line(p, n, ec);
         if(ec)
             goto done;
-        parse_start_line(p, p + (std::min<std::size_t>)(
-            header_limit_, n), ec, is_request{});
-        if(ec)
-        {
-            if(ec == error::need_more)
-            {
-                if(n >= header_limit_)
-                {
-                    BOOST_BEAST_ASSIGN_EC(ec, error::header_limit);
-                    goto done;
-                }
-                if(p + 3 <= p1)
-                    skip_ = static_cast<
-                        std::size_t>(p1 - p - 3);
-            }
-            goto done;
-        }
         BOOST_ASSERT(! is_done());
         n = static_cast<std::size_t>(p1 - p);
-        if(p >= p1)
-        {
-            BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
-            goto done;
-        }
         BOOST_FALLTHROUGH;
-    }
 
     case state::fields:
-        maybe_need_more(p, n, ec);
-        if(ec)
-            goto done;
-        parse_fields(p, p + (std::min<std::size_t>)(
-            header_limit_, n), ec);
+        parse_fields(p, n, ec);
         if(ec)
-        {
-            if(ec == error::need_more)
-            {
-                if(n >= header_limit_)
-                {
-                    BOOST_BEAST_ASSIGN_EC(ec, error::header_limit);
-                    goto done;
-                }
-                if(p + 3 <= p1)
-                    skip_ = static_cast<
-                        std::size_t>(p1 - p - 3);
-            }
             goto done;
-        }
         finish_header(ec, is_request{});
         if(ec)
             goto done;
         break;
 
     case state::body0:
-        BOOST_ASSERT(! skip_);
         this->on_body_init_impl(content_length(), ec);
         if(ec)
             goto done;
@@ -177,14 +135,12 @@ loop:
         BOOST_FALLTHROUGH;
 
     case state::body:
-        BOOST_ASSERT(! skip_);
         parse_body(p, n, ec);
         if(ec)
             goto done;
         break;
 
     case state::body_to_eof0:
-        BOOST_ASSERT(! skip_);
         this->on_body_init_impl(content_length(), ec);
         if(ec)
             goto done;
@@ -192,7 +148,6 @@ loop:
         BOOST_FALLTHROUGH;
 
     case state::body_to_eof:
-        BOOST_ASSERT(! skip_);
         parse_body_to_eof(p, n, ec);
         if(ec)
             goto done;
@@ -209,7 +164,18 @@ loop:
         parse_chunk_header(p, n, ec);
         if(ec)
             goto done;
-        break;
+        if(state_ != state::trailer_fields)
+            break;
+        n = static_cast<std::size_t>(p1 - p);
+        BOOST_FALLTHROUGH;
+
+    case state::trailer_fields:
+        parse_fields(p, n, ec);
+        if(ec)
+            goto done;
+        state_ = state::complete;
+        this->on_finish_impl(ec);
+        goto done;
 
     case state::chunk_body:
         parse_chunk_body(p, n, ec);
@@ -252,49 +218,15 @@ put_eof(error_code& ec)
         ec = {};
         return;
     }
+    state_ = state::complete;
     ec = {};
     this->on_finish_impl(ec);
-    if(ec)
-        return;
-    state_ = state::complete;
 }
 
 template<bool isRequest>
 void
 basic_parser<isRequest>::
-maybe_need_more(
-    char const* p, std::size_t n,
-        error_code& ec)
-{
-    if(skip_ == 0)
-        return;
-    if( n > header_limit_)
-        n = header_limit_;
-    if(n < skip_ + 4)
-    {
-        BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
-        return;
-    }
-    auto const term =
-        find_eom(p + skip_, p + n);
-    if(! term)
-    {
-        skip_ = n - 3;
-        if(skip_ + 4 > header_limit_)
-        {
-            BOOST_BEAST_ASSIGN_EC(ec, error::header_limit);
-            return;
-        }
-        BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
-        return;
-    }
-    skip_ = 0;
-}
-
-template<bool isRequest>
-void
-basic_parser<isRequest>::
-parse_start_line(
+inner_parse_start_line(
     char const*& in, char const* last,
     error_code& ec, std::true_type)
 {
@@ -351,7 +283,7 @@ parse_start_line(
 template<bool isRequest>
 void
 basic_parser<isRequest>::
-parse_start_line(
+inner_parse_start_line(
     char const*& in, char const* last,
     error_code& ec, std::false_type)
 {
@@ -409,7 +341,24 @@ parse_start_line(
 template<bool isRequest>
 void
 basic_parser<isRequest>::
-parse_fields(char const*& in,
+parse_start_line(
+    char const*& in, std::size_t n, error_code& ec)
+{
+    auto const p0 = in;
+
+    inner_parse_start_line(in, in + (std::min<std::size_t>)
+        (n, header_limit_), ec, is_request{});
+    if(ec == error::need_more && n >= header_limit_)
+    {
+        BOOST_BEAST_ASSIGN_EC(ec, error::header_limit);
+    }
+    header_limit_ -= static_cast<std::uint32_t>(in - p0);
+}
+
+template<bool isRequest>
+void
+basic_parser<isRequest>::
+inner_parse_fields(char const*& in,
     char const* last, error_code& ec)
 {
     string_view name;
@@ -447,6 +396,22 @@ parse_fields(char const*& in,
     }
 }
 
+template<bool isRequest>
+void
+basic_parser<isRequest>::
+parse_fields(char const*& in, std::size_t n, error_code& ec)
+{
+    auto const p0 = in;
+
+    inner_parse_fields(in, in + (std::min<std::size_t>)
+        (n, header_limit_), ec);
+    if(ec == error::need_more && n >= header_limit_)
+    {
+        BOOST_BEAST_ASSIGN_EC(ec, error::header_limit);
+    }
+    header_limit_ -= static_cast<std::uint32_t>(in - p0);
+}
+
 template<bool isRequest>
 void
 basic_parser<isRequest>::
@@ -494,11 +459,7 @@ finish_header(error_code& ec, std::true_type)
     if(ec)
         return;
     if(state_ == state::complete)
-    {
         this->on_finish_impl(ec);
-        if(ec)
-            return;
-    }
 }
 
 template<bool isRequest>
@@ -555,11 +516,7 @@ finish_header(error_code& ec, std::false_type)
     if(ec)
         return;
     if(state_ == state::complete)
-    {
         this->on_finish_impl(ec);
-        if(ec)
-            return;
-    }
 }
 
 template<bool isRequest>
@@ -577,10 +534,8 @@ parse_body(char const*& p,
         return;
     if(len_ > 0)
         return;
-    this->on_finish_impl(ec);
-    if(ec)
-        return;
     state_ = state::complete;
+    this->on_finish_impl(ec);
 }
 
 template<bool isRequest>
@@ -608,7 +563,7 @@ parse_body_to_eof(char const*& p,
 template<bool isRequest>
 void
 basic_parser<isRequest>::
-parse_chunk_header(char const*& p0,
+parse_chunk_header(char const*& in,
     std::size_t n, error_code& ec)
 {
 /*
@@ -625,99 +580,50 @@ parse_chunk_header(char const*& p0,
     chunk-ext-val  = token / quoted-string
 */
 
-    auto p = p0;
+    auto p = in;
     auto const pend = p + n;
-    char const* eol;
 
-    if(! (f_ & flagFinalChunk))
+    if(n < 2)
     {
-        if(n < skip_ + 2)
-        {
-            BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
-            return;
-        }
-        if(f_ & flagExpectCRLF)
-        {
-            // Treat the last CRLF in a chunk as
-            // part of the next chunk, so p can
-            // be parsed in one call instead of two.
-            if(! parse_crlf(p))
-            {
-                BOOST_BEAST_ASSIGN_EC(ec, error::bad_chunk);
-                return;
-            }
-        }
-        eol = find_eol(p0 + skip_, pend, ec);
-        if(ec)
-            return;
-        if(! eol)
-        {
-            BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
-            skip_ = n - 1;
-            return;
-        }
-        skip_ = static_cast<
-            std::size_t>(eol - 2 - p0);
-
-        std::uint64_t size;
-        if(! parse_hex(p, size))
+        BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
+        return;
+    }
+    if(f_ & flagExpectCRLF)
+    {
+        // Treat the last CRLF in a chunk as
+        // part of the next chunk, so p can
+        // be parsed in one call instead of two.
+        if(! parse_crlf(p))
         {
             BOOST_BEAST_ASSIGN_EC(ec, error::bad_chunk);
             return;
         }
-        if(size != 0)
-        {
-            if (body_limit_.has_value())
-            {
-                if (size > *body_limit_)
-                {
-                    BOOST_BEAST_ASSIGN_EC(ec, error::body_limit);
-                    return;
-                }
-                *body_limit_ -= size;
-            }
-            auto const start = p;
-            parse_chunk_extensions(p, pend, ec);
-            if(ec)
-                return;
-            if(p != eol -2 )
-            {
-                BOOST_BEAST_ASSIGN_EC(ec, error::bad_chunk_extension);
-                return;
-            }
-            auto const ext = make_string(start, p);
-            this->on_chunk_header_impl(size, ext, ec);
-            if(ec)
-                return;
-            len_ = size;
-            skip_ = 2;
-            p0 = eol;
-            f_ |= flagExpectCRLF;
-            state_ = state::chunk_body;
-            return;
-        }
-
-        f_ |= flagFinalChunk;
     }
-    else
+
+    auto const eol = find_eol(p, pend, ec);
+    if(ec)
+        return;
+    if(! eol)
     {
-        BOOST_ASSERT(n >= 5);
-        if(f_ & flagExpectCRLF)
-            BOOST_VERIFY(parse_crlf(p));
-        std::uint64_t size;
-        BOOST_VERIFY(parse_hex(p, size));
-        eol = find_eol(p, pend, ec);
-        BOOST_ASSERT(! ec);
+        BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
+        return;
     }
 
-    auto eom = find_eom(p0 + skip_, pend);
-    if(! eom)
+    std::uint64_t size;
+    if(! parse_hex(p, size))
     {
-        BOOST_ASSERT(n >= 3);
-        skip_ = n - 3;
-        BOOST_BEAST_ASSIGN_EC(ec, error::need_more);
+        BOOST_BEAST_ASSIGN_EC(ec, error::bad_chunk);
         return;
     }
+    if (body_limit_.has_value())
+    {
+        if (size > *body_limit_)
+        {
+            BOOST_BEAST_ASSIGN_EC(ec, error::body_limit);
+            return;
+        }
+        *body_limit_ -= size;
+    }
 
     auto const start = p;
     parse_chunk_extensions(p, pend, ec);
@@ -729,20 +635,20 @@ parse_chunk_header(char const*& p0,
         return;
     }
     auto const ext = make_string(start, p);
-    this->on_chunk_header_impl(0, ext, ec);
-    if(ec)
-        return;
-    p = eol;
-    parse_fields(p, eom, ec);
+    this->on_chunk_header_impl(size, ext, ec);
     if(ec)
         return;
-    BOOST_ASSERT(p == eom);
-    p0 = eom;
 
-    this->on_finish_impl(ec);
-    if(ec)
+    len_ = size;
+    in = eol;
+    f_ |= flagExpectCRLF;
+    if(size != 0)
+    {
+        state_ = state::chunk_body;
         return;
-    state_ = state::complete;
+    }
+    state_ = state::trailer_fields;
+    header_limit_ += 2; // for the final chunk's CRLF
 }
 
 template<bool isRequest>
diff --git a/inst/include/boost/beast/http/impl/error.ipp b/inst/include/boost/beast/http/impl/error.ipp
index c1ee23665..e3721f7cf 100644
--- a/inst/include/boost/beast/http/impl/error.ipp
+++ b/inst/include/boost/beast/http/impl/error.ipp
@@ -29,8 +29,9 @@ public:
 
     http_error_category() : error_category(0x964627da815bf210u)  {}
 
-    std::string
-    message(int ev) const override
+    BOOST_BEAST_DECL
+    char const*
+    message(int ev, char*, std::size_t) const noexcept override
     {
         switch(static_cast<error>(ev))
         {
@@ -60,12 +61,20 @@ public:
         case error::multiple_content_length: return "multiple Content-Length";
         case error::stale_parser: return "stale parser";
         case error::short_read: return "unexpected eof in body";
+        case error::header_field_name_too_large: return "header field name too large";
+        case error::header_field_value_too_large: return "header field value too large";
 
         default:
             return "beast.http error";
         }
     }
 
+    std::string
+    message(int ev) const override
+    {
+        return message(ev, nullptr, 0);
+    }
+
     error_condition
     default_error_condition(
         int ev) const noexcept override
diff --git a/inst/include/boost/beast/http/impl/fields.hpp b/inst/include/boost/beast/http/impl/fields.hpp
index b97d49c26..bd3e74a90 100644
--- a/inst/include/boost/beast/http/impl/fields.hpp
+++ b/inst/include/boost/beast/http/impl/fields.hpp
@@ -23,8 +23,6 @@
 #include <boost/beast/http/chunk_encode.hpp>
 #include <boost/core/exchange.hpp>
 #include <boost/throw_exception.hpp>
-#include <stdexcept>
-#include <string>
 
 namespace boost {
 namespace beast {
@@ -434,15 +432,12 @@ template<class Allocator>
 auto
 basic_fields<Allocator>::
 operator=(basic_fields&& other) noexcept(
-    alloc_traits::propagate_on_container_move_assignment::value)
-      -> basic_fields&
+    pocma::value && std::is_nothrow_move_assignable<Allocator>::value)
+    -> basic_fields&
 {
-    static_assert(is_nothrow_move_assignable<Allocator>::value,
-        "Allocator must be noexcept assignable.");
     if(this == &other)
         return *this;
-    move_assign(other, std::integral_constant<bool,
-        alloc_traits:: propagate_on_container_move_assignment::value>{});
+    move_assign(other, pocma{});
     return *this;
 }
 
@@ -452,8 +447,7 @@ basic_fields<Allocator>::
 operator=(basic_fields const& other) ->
     basic_fields&
 {
-    copy_assign(other, std::integral_constant<bool,
-        alloc_traits::propagate_on_container_copy_assignment::value>{});
+    copy_assign(other, pocca{});
     return *this;
 }
 
@@ -543,7 +537,7 @@ template<class Allocator>
 inline
 void
 basic_fields<Allocator>::
-insert(field name, string_view const& value)
+insert(field name, string_view value)
 {
     BOOST_ASSERT(name != field::unknown);
     insert(name, to_string(name), value);
@@ -552,58 +546,52 @@ insert(field name, string_view const& value)
 template<class Allocator>
 void
 basic_fields<Allocator>::
-insert(string_view sname, string_view const& value)
+insert(string_view sname, string_view value)
 {
-    auto const name =
-        string_to_field(sname);
-    insert(name, sname, value);
+    insert(
+        string_to_field(sname), sname, value);
 }
 
 template<class Allocator>
 void
 basic_fields<Allocator>::
-insert(field name,
-    string_view sname, string_view const& value)
+insert(
+    field name,
+    string_view sname,
+    string_view value,
+    error_code& ec)
 {
-    auto& e = new_element(name, sname,
-        static_cast<string_view>(value));
-    auto const before =
-        set_.upper_bound(sname, key_compare{});
-    if(before == set_.begin())
-    {
-        BOOST_ASSERT(count(sname) == 0);
-        set_.insert_before(before, e);
-        list_.push_back(e);
-        return;
-    }
-    auto const last = std::prev(before);
-    // VFALCO is it worth comparing `field name` first?
-    if(! beast::iequals(sname, last->name_string()))
-    {
-        BOOST_ASSERT(count(sname) == 0);
-        set_.insert_before(before, e);
-        list_.push_back(e);
+    ec = {};
+    auto* e = try_create_new_element(name, sname, value, ec);
+    if(ec.failed())
         return;
-    }
-    // keep duplicate fields together in the list
-    set_.insert_before(before, e);
-    list_.insert(++list_.iterator_to(*last), e);
+    insert_element(*e);
 }
 
 template<class Allocator>
 void
 basic_fields<Allocator>::
-set(field name, string_view const& value)
+insert(field name,
+    string_view sname, string_view value)
+{
+    insert_element(
+        new_element(name, sname, value));
+}
+
+template<class Allocator>
+void
+basic_fields<Allocator>::
+set(field name, string_view value)
 {
     BOOST_ASSERT(name != field::unknown);
-    set_element(new_element(name, to_string(name),
-        static_cast<string_view>(value)));
+    set_element(
+        new_element(name, to_string(name), value));
 }
 
 template<class Allocator>
 void
 basic_fields<Allocator>::
-set(string_view sname, string_view const& value)
+set(string_view sname, string_view value)
 {
     set_element(new_element(
         string_to_field(sname), sname, value));
@@ -653,8 +641,7 @@ void
 basic_fields<Allocator>::
 swap(basic_fields<Allocator>& other)
 {
-    swap(other, std::integral_constant<bool,
-        alloc_traits::propagate_on_container_swap::value>{});
+    swap(other, pocs{});
 }
 
 template<class Allocator>
@@ -960,18 +947,22 @@ set_keep_alive_impl(
 template<class Allocator>
 auto
 basic_fields<Allocator>::
-new_element(field name,
-    string_view sname, string_view value) ->
-        element&
-{
-    if(sname.size() + 2 >
-            (std::numeric_limits<off_t>::max)())
-        BOOST_THROW_EXCEPTION(std::length_error{
-            "field name too large"});
-    if(value.size() + 2 >
-            (std::numeric_limits<off_t>::max)())
-        BOOST_THROW_EXCEPTION(std::length_error{
-            "field value too large"});
+try_create_new_element(
+    field name,
+    string_view sname,
+    string_view value,
+    error_code& ec) -> element*
+{
+    if(sname.size() > max_name_size)
+    {
+        BOOST_BEAST_ASSIGN_EC(ec, error::header_field_name_too_large);
+        return nullptr;
+    }
+    if(value.size() > max_value_size)
+    {
+        BOOST_BEAST_ASSIGN_EC(ec, error::header_field_value_too_large);
+        return nullptr;
+    }
     value = detail::trim(value);
     std::uint16_t const off =
         static_cast<off_t>(sname.size() + 2);
@@ -981,7 +972,50 @@ new_element(field name,
     auto const p = alloc_traits::allocate(a,
         (sizeof(element) + off + len + 2 + sizeof(align_type) - 1) /
             sizeof(align_type));
-    return *(::new(p) element(name, sname, value));
+    return ::new(p) element(name, sname, value);
+}
+
+template<class Allocator>
+auto
+basic_fields<Allocator>::
+new_element(
+    field name,
+    string_view sname,
+    string_view value) -> element&
+{
+    error_code ec;
+    auto* e = try_create_new_element(name, sname, value, ec);
+    if(ec.failed())
+        BOOST_THROW_EXCEPTION(system_error{ec});
+    return *e;
+}
+
+template<class Allocator>
+void
+basic_fields<Allocator>::
+insert_element(element& e)
+{
+    auto const before =
+        set_.upper_bound(e.name_string(), key_compare{});
+    if(before == set_.begin())
+    {
+        BOOST_ASSERT(count(e.name_string()) == 0);
+        set_.insert_before(before, e);
+        list_.push_back(e);
+        return;
+    }
+    auto const last = std::prev(before);
+    // VFALCO is it worth comparing `field name` first?
+    if(! beast::iequals(e.name_string(), last->name_string()))
+    {
+        BOOST_ASSERT(count(e.name_string()) == 0);
+        set_.insert_before(before, e);
+        list_.push_back(e);
+        return;
+    }
+    // keep duplicate fields together in the list
+    set_.insert_before(before, e);
+    list_.insert(++list_.iterator_to(*last), e);
 }
 
 template<class Allocator>
@@ -1124,13 +1158,13 @@ basic_fields<Allocator>::
 move_assign(basic_fields& other, std::true_type)
 {
     clear_all();
+    this->get() = std::move(other.get());
     set_ = std::move(other.set_);
     list_ = std::move(other.list_);
     method_ = other.method_;
     target_or_reason_ = other.target_or_reason_;
     other.method_ = {};
     other.target_or_reason_ = {};
-    this->get() = other.get();
 }
 
 template<class Allocator>
diff --git a/inst/include/boost/beast/http/impl/file_body_win32.hpp b/inst/include/boost/beast/http/impl/file_body_win32.hpp
index 44ce64d69..cd863793e 100644
--- a/inst/include/boost/beast/http/impl/file_body_win32.hpp
+++ b/inst/include/boost/beast/http/impl/file_body_win32.hpp
@@ -13,7 +13,6 @@
 #if BOOST_BEAST_USE_WIN32_FILE
 
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
@@ -510,17 +509,23 @@ class write_some_win32_op
     }
 };
 
+template<class Protocol, class Executor>
 struct run_write_some_win32_op
 {
-    template<
-        class Protocol, class Executor,
-        bool isRequest, class Fields,
-        class WriteHandler>
+    net::basic_stream_socket<Protocol, Executor>* stream;
+
+    using executor_type = typename net::basic_stream_socket<Protocol, Executor>::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
+    template<bool isRequest, class Fields, class WriteHandler>
     void
     operator()(
         WriteHandler&& h,
-        net::basic_stream_socket<
-            Protocol, Executor>* s,
         serializer<isRequest,
             basic_file_body<file_win32>, Fields>* sr)
     {
@@ -537,7 +542,7 @@ struct run_write_some_win32_op
             Protocol, Executor,
             isRequest, Fields,
             typename std::decay<WriteHandler>::type>(
-                std::forward<WriteHandler>(h), *s, *sr);
+                std::forward<WriteHandler>(h), *stream, *sr);
     }
 };
 
@@ -630,9 +635,8 @@ async_write_some(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            detail::run_write_some_win32_op{},
+            detail::run_write_some_win32_op<Protocol, Executor>{&sock},
             handler,
-            &sock,
             &sr);
 }
 
diff --git a/inst/include/boost/beast/http/impl/read.hpp b/inst/include/boost/beast/http/impl/read.hpp
index 09c8303d0..f7c032496 100644
--- a/inst/include/boost/beast/http/impl/read.hpp
+++ b/inst/include/boost/beast/http/impl/read.hpp
@@ -19,9 +19,10 @@
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/buffer.hpp>
 #include <boost/beast/core/detail/read.hpp>
-#include <boost/asio/error.hpp>
+#include <boost/asio/append.hpp>
 #include <boost/asio/compose.hpp>
 #include <boost/asio/coroutine.hpp>
+#include <boost/asio/error.hpp>
 
 namespace boost {
 namespace beast {
@@ -115,17 +116,26 @@ class read_msg_op
     }
 };
 
+template <typename AsyncReadStream>
 struct run_read_msg_op
 {
+    AsyncReadStream* stream;
+
+    using executor_type = typename AsyncReadStream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
     template<
         class ReadHandler,
-        class AsyncReadStream,
         class DynamicBuffer,
         bool isRequest, class Body, class Allocator>
     void
     operator()(
         ReadHandler&& h,
-        AsyncReadStream* s,
         DynamicBuffer* b,
         message<isRequest, Body,
             basic_fields<Allocator>>* m)
@@ -144,7 +154,7 @@ struct run_read_msg_op
             DynamicBuffer,
             isRequest, Body, Allocator,
             typename std::decay<ReadHandler>::type>(
-                std::forward<ReadHandler>(h), *s, *b, *m);
+                std::forward<ReadHandler>(h), *stream, *b, *m);
     }
 };
 
@@ -249,9 +259,7 @@ class read_some_op : asio::coroutine
                         asio::get_associated_immediate_executor(
                             self, s_.get_executor());
 
-                    net::dispatch(
-                        ex,
-                        beast::bind_front_handler(std::move(self), ec));
+                    net::dispatch(ex, net::append(std::move(self), ec));
                 }
             }
             self.complete(ec, bytes_transferred_);
@@ -711,8 +719,8 @@ async_read(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            detail::run_read_msg_op{},
-                handler, &stream, &buffer, &msg);
+            detail::run_read_msg_op<AsyncReadStream>{&stream},
+                handler, &buffer, &msg);
 }
 
 } // http
diff --git a/inst/include/boost/beast/http/impl/status.ipp b/inst/include/boost/beast/http/impl/status.ipp
index 2a61acd5c..61bcdbe1c 100644
--- a/inst/include/boost/beast/http/impl/status.ipp
+++ b/inst/include/boost/beast/http/impl/status.ipp
@@ -26,6 +26,7 @@ int_to_status(unsigned v)
     case status::continue_:
     case status::switching_protocols:
     case status::processing:
+    case status::early_hints:
         BOOST_FALLTHROUGH;
 
     // 2xx
@@ -71,17 +72,17 @@ int_to_status(unsigned v)
     case status::unsupported_media_type:
     case status::range_not_satisfiable:
     case status::expectation_failed:
+    case status::i_am_a_teapot:
     case status::misdirected_request:
     case status::unprocessable_entity:
     case status::locked:
     case status::failed_dependency:
+    case status::too_early:
     case status::upgrade_required:
     case status::precondition_required:
     case status::too_many_requests:
     case status::request_header_fields_too_large:
-    case status::connection_closed_without_response:
     case status::unavailable_for_legal_reasons:
-    case status::client_closed_request:
         BOOST_FALLTHROUGH;
 
     // 5xx
@@ -96,7 +97,6 @@ int_to_status(unsigned v)
     case status::loop_detected:
     case status::not_extended:
     case status::network_authentication_required:
-    case status::network_connect_timeout_error:
         return static_cast<status>(v);
 
     default:
@@ -136,6 +136,7 @@ obsolete_reason(status v)
     case status::continue_:                             return "Continue";
     case status::switching_protocols:                   return "Switching Protocols";
     case status::processing:                            return "Processing";
+    case status::early_hints:                           return "Early Hints";
 
     // 2xx
     case status::ok:                                    return "OK";
@@ -178,17 +179,17 @@ obsolete_reason(status v)
     case status::unsupported_media_type:                return "Unsupported Media Type";
     case status::range_not_satisfiable:                 return "Range Not Satisfiable";
     case status::expectation_failed:                    return "Expectation Failed";
+    case status::i_am_a_teapot:                         return "I'm a teapot";
     case status::misdirected_request:                   return "Misdirected Request";
     case status::unprocessable_entity:                  return "Unprocessable Entity";
     case status::locked:                                return "Locked";
     case status::failed_dependency:                     return "Failed Dependency";
+    case status::too_early:                             return "Too Early";
     case status::upgrade_required:                      return "Upgrade Required";
     case status::precondition_required:                 return "Precondition Required";
     case status::too_many_requests:                     return "Too Many Requests";
     case status::request_header_fields_too_large:       return "Request Header Fields Too Large";
-    case status::connection_closed_without_response:    return "Connection Closed Without Response";
     case status::unavailable_for_legal_reasons:         return "Unavailable For Legal Reasons";
-    case status::client_closed_request:                 return "Client Closed Request";
     // 5xx
     case status::internal_server_error:                 return "Internal Server Error";
     case status::not_implemented:                       return "Not Implemented";
@@ -201,7 +202,6 @@ obsolete_reason(status v)
     case status::loop_detected:                         return "Loop Detected";
     case status::not_extended:                          return "Not Extended";
     case status::network_authentication_required:       return "Network Authentication Required";
-    case status::network_connect_timeout_error:         return "Network Connect Timeout Error";
 
     default:
         break;
diff --git a/inst/include/boost/beast/http/impl/write.hpp b/inst/include/boost/beast/http/impl/write.hpp
index f76ea68c4..36fd9caec 100644
--- a/inst/include/boost/beast/http/impl/write.hpp
+++ b/inst/include/boost/beast/http/impl/write.hpp
@@ -12,11 +12,11 @@
 
 #include <boost/beast/http/type_traits.hpp>
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/make_printable.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
+#include <boost/asio/append.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/dispatch.hpp>
 #include <boost/asio/write.hpp>
@@ -102,11 +102,8 @@ class write_some_op
                     __FILE__, __LINE__,
                     "http::async_write_some"));
 
-                auto ex = asio::get_associated_immediate_executor(*this, s_.get_executor());
-                return net::dispatch(
-                    ex,
-                    beast::bind_front_handler(
-                        std::move(*this), ec, 0));
+                const auto ex = asio::get_associated_immediate_executor(*this, s_.get_executor());
+                return net::dispatch(ex, net::append(std::move(*this), ec, 0));
             }
             if(f.invoked)
             {
@@ -122,10 +119,7 @@ class write_some_op
             "http::async_write_some"));
 
         const auto ex = this->get_immediate_executor();
-        return net::dispatch(
-            ex,
-            beast::bind_front_handler(
-                std::move(*this), ec, 0));
+        return net::dispatch(ex, net::append(std::move(*this), ec, 0));
     }
 
     void
@@ -196,13 +190,15 @@ class write_op
     write_op(
         Handler_&& h,
         Stream& s,
-        serializer<isRequest, Body, Fields>& sr)
+        serializer<isRequest, Body, Fields>& sr,
+        bool split)
         : async_base<
             Handler, beast::executor_type<Stream>>(
                 std::forward<Handler_>(h), s.get_executor())
         , s_(s)
         , sr_(sr)
     {
+        sr.split(split);
         (*this)();
     }
 
@@ -305,16 +301,25 @@ class write_msg_op
     }
 };
 
+template <typename AsyncWriteStream>
 struct run_write_some_op
 {
+    AsyncWriteStream* stream;
+
+    using executor_type = typename AsyncWriteStream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
     template<
         class WriteHandler,
-        class Stream,
         bool isRequest, class Body, class Fields>
     void
     operator()(
         WriteHandler&& h,
-        Stream* s,
         serializer<isRequest, Body, Fields>* sr)
     {
         // If you get an error on the following line it means
@@ -328,25 +333,35 @@ struct run_write_some_op
 
         write_some_op<
             typename std::decay<WriteHandler>::type,
-            Stream,
+            AsyncWriteStream,
             isRequest, Body, Fields>(
-                std::forward<WriteHandler>(h), *s, *sr);
+                std::forward<WriteHandler>(h), *stream, *sr);
     }
 };
 
+template <typename AsyncWriteStream>
 struct run_write_op
 {
+    AsyncWriteStream* stream;
+
+    using executor_type = typename AsyncWriteStream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
     template<
         class WriteHandler,
-        class Stream,
         class Predicate,
         bool isRequest, class Body, class Fields>
     void
     operator()(
         WriteHandler&& h,
-        Stream* s,
         Predicate const&,
-        serializer<isRequest, Body, Fields>* sr)
+        serializer<isRequest, Body, Fields>* sr,
+        bool split)
     {
         // If you get an error on the following line it means
         // that your handler does not meet the documented type
@@ -359,24 +374,33 @@ struct run_write_op
 
         write_op<
             typename std::decay<WriteHandler>::type,
-            Stream,
+            AsyncWriteStream,
             Predicate,
             isRequest, Body, Fields>(
-                std::forward<WriteHandler>(h), *s, *sr);
+                std::forward<WriteHandler>(h), *stream, *sr, split);
     }
 };
 
+template <typename AsyncWriteStream>
 struct run_write_msg_op
 {
+    AsyncWriteStream* stream;
+
+    using executor_type = typename AsyncWriteStream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return stream->get_executor();
+    }
+
     template<
         class WriteHandler,
-        class Stream,
         bool isRequest, class Body, class Fields,
         class... Args>
     void
     operator()(
         WriteHandler&& h,
-        Stream* s,
         message<isRequest, Body, Fields>* m,
         std::false_type,
         Args&&... args)
@@ -392,21 +416,19 @@ struct run_write_msg_op
 
         write_msg_op<
             typename std::decay<WriteHandler>::type,
-            Stream,
+            AsyncWriteStream,
             isRequest, Body, Fields>(
-                std::forward<WriteHandler>(h), *s, *m,
+                std::forward<WriteHandler>(h), *stream, *m,
                 std::forward<Args>(args)...);
     }
 
     template<
         class WriteHandler,
-        class Stream,
         bool isRequest, class Body, class Fields,
         class... Args>
     void
     operator()(
         WriteHandler&& h,
-        Stream* s,
         message<isRequest, Body, Fields> const* m,
         std::true_type,
         Args&&... args)
@@ -422,9 +444,9 @@ struct run_write_msg_op
 
         write_msg_op<
             typename std::decay<WriteHandler>::type,
-            Stream,
+            AsyncWriteStream,
             isRequest, Body, Fields>(
-                std::forward<WriteHandler>(h), *s, *m,
+                std::forward<WriteHandler>(h), *stream, *m,
                 std::forward<Args>(args)...);
     }
 };
@@ -519,9 +541,8 @@ async_write_some_impl(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            run_write_some_op{},
+            run_write_some_op<AsyncWriteStream>{&stream},
             handler,
-            &stream,
             &sr);
 }
 
@@ -668,15 +689,14 @@ async_write_header(
         "Body type requirements not met");
     static_assert(is_body_writer<Body>::value,
         "BodyWriter type requirements not met");
-    sr.split(true);
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            detail::run_write_op{},
+            detail::run_write_op<AsyncWriteStream>{&stream},
             handler,
-            &stream,
             detail::serializer_is_header_done{},
-            &sr);
+            &sr,
+            true);
 }
 
 //------------------------------------------------------------------------------
@@ -741,15 +761,14 @@ async_write(
         "Body type requirements not met");
     static_assert(is_body_writer<Body>::value,
         "BodyWriter type requirements not met");
-    sr.split(false);
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            detail::run_write_op{},
+            detail::run_write_op<AsyncWriteStream>{&stream},
             handler,
-            &stream,
             detail::serializer_is_done{},
-            &sr);
+            &sr,
+            false);
 }
 
 //------------------------------------------------------------------------------
@@ -866,9 +885,8 @@ async_write(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            detail::run_write_msg_op{},
+            detail::run_write_msg_op<AsyncWriteStream>{&stream},
             handler,
-            &stream,
             &msg,
             std::false_type{});
 }
@@ -895,9 +913,8 @@ async_write(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            detail::run_write_msg_op{},
+            detail::run_write_msg_op<AsyncWriteStream>{&stream},
             handler,
-            &stream,
             &msg,
             std::true_type{});
 }
diff --git a/inst/include/boost/beast/http/message.hpp b/inst/include/boost/beast/http/message.hpp
index c21e3685f..3c75ac26f 100644
--- a/inst/include/boost/beast/http/message.hpp
+++ b/inst/include/boost/beast/http/message.hpp
@@ -10,20 +10,19 @@
 #ifndef BOOST_BEAST_HTTP_MESSAGE_HPP
 #define BOOST_BEAST_HTTP_MESSAGE_HPP
 
+#include <boost/beast/http/message_fwd.hpp>
+
 #include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/core/string.hpp>
 #include <boost/beast/http/fields.hpp>
-#include <boost/beast/http/verb.hpp>
 #include <boost/beast/http/status.hpp>
 #include <boost/beast/http/type_traits.hpp>
-#include <boost/beast/core/string.hpp>
+#include <boost/beast/http/verb.hpp>
+#include <boost/assert.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/mp11/integer_sequence.hpp>
-#include <boost/assert.hpp>
 #include <boost/optional.hpp>
 #include <boost/throw_exception.hpp>
-#include <memory>
-#include <stdexcept>
-#include <string>
 #include <tuple>
 #include <utility>
 
@@ -48,11 +47,7 @@ namespace http {
 #if BOOST_BEAST_DOXYGEN
 template<bool isRequest, class Fields = fields>
 class header : public Fields
-
 #else
-template<bool isRequest, class Fields = fields>
-class header;
-
 template<class Fields>
 class header<true, Fields> : public Fields
 #endif
@@ -445,6 +440,7 @@ class header<false, Fields> : public Fields
 #endif
 };
 
+#if BOOST_BEAST_DOXYGEN
 /// A typical HTTP request header
 template<class Fields = fields>
 using request_header = header<true, Fields>;
@@ -452,6 +448,7 @@ using request_header = header<true, Fields>;
 /// A typical HTTP response header
 template<class Fields = fields>
 using response_header = header<false, Fields>;
+#endif
 
 #if defined(BOOST_MSVC)
 // Workaround for MSVC bug with private base classes
@@ -490,7 +487,11 @@ using value_type_t = typename T::value_type;
     @tparam Fields The type of container used to hold the
     field value pairs.
 */
+#if BOOST_BEAST_DOXYGEN
 template<bool isRequest, class Body, class Fields = fields>
+#else
+template<bool isRequest, class Body, class Fields>
+#endif
 class message
     : public header<isRequest, Fields>
 #if ! BOOST_BEAST_DOXYGEN
@@ -852,6 +853,13 @@ class message
         req.body() = "Hello, world!";
         req.prepare_payload();
         @endcode
+
+        @note
+
+        This function is not necessary to call in the following situations:
+
+        @li The request doesn't contain a body, such as in a GET or HEAD request.
+        @li The Content-Length and Transfer-Encoding are set manually.
     */
     void
     prepare_payload()
@@ -965,6 +973,7 @@ class message
     prepare_payload(std::false_type);
 };
 
+#if BOOST_BEAST_DOXYGEN
 /// A typical HTTP request
 template<class Body, class Fields = fields>
 using request = message<true, Body, Fields>;
@@ -972,6 +981,7 @@ using request = message<true, Body, Fields>;
 /// A typical HTTP response
 template<class Body, class Fields = fields>
 using response = message<false, Body, Fields>;
+#endif
 
 //------------------------------------------------------------------------------
 
diff --git a/inst/include/boost/beast/http/message_fwd.hpp b/inst/include/boost/beast/http/message_fwd.hpp
new file mode 100644
index 000000000..ec0548274
--- /dev/null
+++ b/inst/include/boost/beast/http/message_fwd.hpp
@@ -0,0 +1,43 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_MESSAGE_FWD_HPP
+#define BOOST_BEAST_HTTP_MESSAGE_FWD_HPP
+
+#include <boost/beast/http/fields_fwd.hpp>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+#ifndef BOOST_BEAST_DOXYGEN
+template<bool isRequest, class Fields = fields>
+class header;
+
+template<bool isRequest, class Body, class Fields = fields>
+class message;
+
+template<class Fields = fields>
+using request_header = header<true, Fields>;
+
+template<class Fields = fields>
+using response_header = header<false, Fields>;
+
+template<class Body, class Fields = fields>
+using request = message<true, Body, Fields>;
+
+template<class Body, class Fields = fields>
+using response = message<false, Body, Fields>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/message_generator.hpp b/inst/include/boost/beast/http/message_generator.hpp
index b4af27678..b81184b90 100644
--- a/inst/include/boost/beast/http/message_generator.hpp
+++ b/inst/include/boost/beast/http/message_generator.hpp
@@ -9,6 +9,8 @@
 #ifndef BOOST_BEAST_HTTP_MESSAGE_GENERATOR_HPP
 #define BOOST_BEAST_HTTP_MESSAGE_GENERATOR_HPP
 
+#include <boost/beast/http/message_generator_fwd.hpp>
+
 #include <boost/beast/core/span.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/serializer.hpp>
diff --git a/inst/include/boost/beast/http/message_generator_fwd.hpp b/inst/include/boost/beast/http/message_generator_fwd.hpp
new file mode 100644
index 000000000..c6721bb78
--- /dev/null
+++ b/inst/include/boost/beast/http/message_generator_fwd.hpp
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_MESSAGE_GENERATOR_FWD_HPP
+#define BOOST_BEAST_HTTP_MESSAGE_GENERATOR_FWD_HPP
+
+namespace boost {
+namespace beast {
+namespace http {
+
+class message_generator;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/parser.hpp b/inst/include/boost/beast/http/parser.hpp
index 4851fe8f3..76954adbc 100644
--- a/inst/include/boost/beast/http/parser.hpp
+++ b/inst/include/boost/beast/http/parser.hpp
@@ -10,6 +10,8 @@
 #ifndef BOOST_BEAST_HTTP_PARSER_HPP
 #define BOOST_BEAST_HTTP_PARSER_HPP
 
+#include <boost/beast/http/parser_fwd.hpp>
+
 #include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/http/basic_parser.hpp>
 #include <boost/beast/http/message.hpp>
@@ -43,10 +45,17 @@ namespace http {
 
     @note A new instance of the parser is required for each message.
 */
+#if BOOST_BEAST_DOXYGEN
 template<
     bool isRequest,
     class Body,
     class Allocator = std::allocator<char>>
+#else
+template<
+    bool isRequest,
+    class Body,
+    class Allocator>
+#endif
 class parser
     : public basic_parser<isRequest>
 {
@@ -430,9 +439,9 @@ class parser
         field name,
         string_view name_string,
         string_view value,
-        error_code&) override
+        error_code& ec) override
     {
-        m_.insert(name, name_string, value);
+        m_.insert(name, name_string, value, ec);
     }
 
     void
@@ -489,6 +498,7 @@ class parser
     }
 };
 
+#if BOOST_BEAST_DOXYGEN
 /// An HTTP/1 parser for producing a request message.
 template<class Body, class Allocator = std::allocator<char>>
 using request_parser = parser<true, Body, Allocator>;
@@ -496,6 +506,7 @@ using request_parser = parser<true, Body, Allocator>;
 /// An HTTP/1 parser for producing a response message.
 template<class Body, class Allocator = std::allocator<char>>
 using response_parser = parser<false, Body, Allocator>;
+#endif
 
 } // http
 } // beast
diff --git a/inst/include/boost/beast/http/parser_fwd.hpp b/inst/include/boost/beast/http/parser_fwd.hpp
new file mode 100644
index 000000000..47a5e84e3
--- /dev/null
+++ b/inst/include/boost/beast/http/parser_fwd.hpp
@@ -0,0 +1,37 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_PARSER_FWD_HPP
+#define BOOST_BEAST_HTTP_PARSER_FWD_HPP
+
+#include <memory>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+#ifndef BOOST_BEAST_DOXYGEN
+template<
+    bool isRequest,
+    class Body,
+    class Allocator = std::allocator<char>>
+class parser;
+
+template<class Body, class Allocator = std::allocator<char>>
+using request_parser = parser<true, Body, Allocator>;
+
+template<class Body, class Allocator = std::allocator<char>>
+using response_parser = parser<false, Body, Allocator>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/read.hpp b/inst/include/boost/beast/http/read.hpp
index ffe0793cb..ec6ba06ff 100644
--- a/inst/include/boost/beast/http/read.hpp
+++ b/inst/include/boost/beast/http/read.hpp
@@ -62,13 +62,9 @@ namespace http {
 
     @param parser The parser to use.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
     @throws system_error Thrown on failure.
-
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer.
 */
 template<
     class SyncReadStream,
@@ -121,11 +117,7 @@ read_some(
 
     @param ec Set to the error, if any occurred.
 
-    @return The number of bytes transferred from the stream.
-
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer.
+    @return The number of bytes consumed by the parser.
 */
 template<
     class SyncReadStream,
@@ -189,7 +181,7 @@ read_some(
     @code
     void handler(
         error_code const& error,        // result of operation
-        std::size_t bytes_transferred   // the total number of bytes transferred from the stream
+        std::size_t bytes_transferred   // the number of bytes consumed by the parser
     );
     @endcode
     If the handler has an associated immediate executor,
@@ -198,10 +190,6 @@ read_some(
     this function. Invocation of the handler will be performed in a
     manner equivalent to using `net::post`.
 
-    @note The completion handler will receive as a parameter the total number
-    of bytes transferred from the stream. This may be zero for the case where
-    there is sufficient pre-existing message data in the dynamic buffer.
-
     @par Per-Operation Cancellation
 
     This asynchronous operation supports cancellation for the following
@@ -209,10 +197,9 @@ read_some(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
 */
 template<
@@ -271,14 +258,12 @@ async_read_some(
 
     @param parser The parser to use.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
     @throws system_error Thrown on failure.
 
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer. The implementation will call
-    @ref basic_parser::eager with the value `false` on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `false` on the parser passed in.
 */
 template<
     class SyncReadStream,
@@ -330,12 +315,10 @@ read_header(
 
     @param ec Set to the error, if any occurred.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer. The implementation will call
-    @ref basic_parser::eager with the value `false` on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `false` on the parser passed in.
 */
 template<
     class SyncReadStream,
@@ -398,7 +381,7 @@ read_header(
     @code
     void handler(
         error_code const& error,        // result of operation
-        std::size_t bytes_transferred   // the total number of bytes transferred from the stream
+        std::size_t bytes_transferred   // the number of bytes consumed by the parser
     );
     @endcode
     If the handler has an associated immediate executor,
@@ -407,11 +390,8 @@ read_header(
     this function. Invocation of the handler will be performed in a
     manner equivalent to using `net::post`.
 
-    @note The completion handler will receive as a parameter the total number
-    of bytes transferred from the stream. This may be zero for the case where
-    there is sufficient pre-existing message data in the dynamic buffer. The
-    implementation will call @ref basic_parser::eager with the value `false`
-    on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `false` on the parser passed in.
 
     @par Per-Operation Cancellation
 
@@ -420,10 +400,9 @@ read_header(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
 */
 template<
@@ -482,14 +461,12 @@ async_read_header(
 
     @param parser The parser to use.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
     @throws system_error Thrown on failure.
 
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer. The implementation will call
-    @ref basic_parser::eager with the value `true` on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `true` on the parser passed in.
 */
 template<
     class SyncReadStream,
@@ -541,12 +518,10 @@ read(
 
     @param ec Set to the error, if any occurred.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer. The implementation will call
-    @ref basic_parser::eager with the value `true` on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `true` on the parser passed in.
 */
 template<
     class SyncReadStream,
@@ -609,7 +584,7 @@ read(
     @code
     void handler(
         error_code const& error,        // result of operation
-        std::size_t bytes_transferred   // the total number of bytes transferred from the stream
+        std::size_t bytes_transferred   // the number of bytes consumed by the parser
     );
     @endcode
     If the handler has an associated immediate executor,
@@ -618,11 +593,8 @@ read(
     this function. Invocation of the handler will be performed in a
     manner equivalent to using `net::post`.
 
-    @note The completion handler will receive as a parameter the total number
-    of bytes transferred from the stream. This may be zero for the case where
-    there is sufficient pre-existing message data in the dynamic buffer. The
-    implementation will call @ref basic_parser::eager with the value `true`
-    on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `true` on the parser passed in.
 
     @par Per-Operation Cancellation
 
@@ -631,10 +603,9 @@ read(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
 */
 template<
@@ -696,14 +667,12 @@ async_read(
     is undefined. The type must be meet the <em>MoveAssignable</em> and
     <em>MoveConstructible</em> requirements.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
     @throws system_error Thrown on failure.
 
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer. The implementation will call
-    @ref basic_parser::eager with the value `true` on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `true` on the parser passed in.
 */
 template<
     class SyncReadStream,
@@ -758,12 +727,10 @@ read(
 
     @param ec Set to the error, if any occurred.
 
-    @return The number of bytes transferred from the stream.
+    @return The number of bytes consumed by the parser.
 
-    @note The function returns the total number of bytes transferred from the
-    stream. This may be zero for the case where there is sufficient pre-existing
-    message data in the dynamic buffer. The implementation will call
-    @ref basic_parser::eager with the value `true` on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `true` on the parser passed in.
 */
 template<
     class SyncReadStream,
@@ -829,7 +796,7 @@ read(
     @code
     void handler(
         error_code const& error,        // result of operation
-        std::size_t bytes_transferred   // the total number of bytes transferred from the stream
+        std::size_t bytes_transferred   // the number of bytes consumed by the parser
     );
     @endcode
     If the handler has an associated immediate executor,
@@ -838,11 +805,8 @@ read(
     this function. Invocation of the handler will be performed in a
     manner equivalent to using `net::post`.
 
-    @note The completion handler will receive as a parameter the total number
-    of bytes transferred from the stream. This may be zero for the case where
-    there is sufficient pre-existing message data in the dynamic buffer. The
-    implementation will call @ref basic_parser::eager with the value `true`
-    on the parser passed in.
+    @note The implementation will call @ref basic_parser::eager with the value
+    `true` on the parser passed in.
 
     @par Per-Operation Cancellation
 
@@ -851,10 +815,9 @@ read(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
 */
 template<
diff --git a/inst/include/boost/beast/http/serializer.hpp b/inst/include/boost/beast/http/serializer.hpp
index c12bc172a..1813fa58e 100644
--- a/inst/include/boost/beast/http/serializer.hpp
+++ b/inst/include/boost/beast/http/serializer.hpp
@@ -10,14 +10,16 @@
 #ifndef BOOST_BEAST_HTTP_SERIALIZER_HPP
 #define BOOST_BEAST_HTTP_SERIALIZER_HPP
 
-#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/serializer_fwd.hpp>
+
 #include <boost/beast/core/buffers_cat.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/core/buffers_suffix.hpp>
-#include <boost/beast/core/string.hpp>
+#include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/detail/variant.hpp>
-#include <boost/beast/http/message.hpp>
+#include <boost/beast/core/string.hpp>
 #include <boost/beast/http/chunk_encode.hpp>
+#include <boost/beast/http/message.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/optional.hpp>
 
@@ -43,16 +45,25 @@ namespace http {
     the chunk buffer sequence types @ref chunk_body, @ref chunk_crlf,
     @ref chunk_header, and @ref chunk_last.
 
+    @note
+
+    Moving or copying the serializer after the first call to
+    @ref serializer::next results in undefined behavior. Try to heap-allocate
+    the serializer object if you need to move the serializer between multiple
+    async operations (for example, between a call to `async_write_header` and
+    `async_write`).
+
     @tparam isRequest `true` if the message is a request.
 
     @tparam Body The body type of the message.
 
     @tparam Fields The type of fields in the message.
 */
-template<
-    bool isRequest,
-    class Body,
-    class Fields = fields>
+#if BOOST_BEAST_DOXYGEN
+template<bool isRequest, class Body, class Fields = fields>
+#else
+template<bool isRequest, class Body, class Fields>
+#endif
 class serializer
 {
 public:
@@ -189,10 +200,26 @@ class serializer
     bool more_ = false;
 
 public:
-    /// Constructor
+    /** Move Constructor
+        @note
+
+        Moving or copying the serializer after the first call to
+        @ref serializer::next results in undefined behavior. Try to heap-allocate
+        the serializer object if you need to move the serializer between multiple
+        async operations (for example, between a call to `async_write_header` and
+        `async_write`).
+    */
     serializer(serializer&&) = default;
 
-    /// Constructor
+    /** Copy Constructor
+        @note
+
+        Moving or copying the serializer after the first call to
+        @ref serializer::next results in undefined behavior. Try to heap-allocate
+        the serializer object if you need to move the serializer between multiple
+        async operations (for example, between a call to `async_write_header` and
+        `async_write`).
+    */
     serializer(serializer const&) = default;
 
     /// Assignment
@@ -353,6 +380,7 @@ class serializer
     }
 };
 
+#if BOOST_BEAST_DOXYGEN
 /// A serializer for HTTP/1 requests
 template<class Body, class Fields = fields>
 using request_serializer = serializer<true, Body, Fields>;
@@ -360,6 +388,7 @@ using request_serializer = serializer<true, Body, Fields>;
 /// A serializer for HTTP/1 responses
 template<class Body, class Fields = fields>
 using response_serializer = serializer<false, Body, Fields>;
+#endif
 
 } // http
 } // beast
diff --git a/inst/include/boost/beast/http/serializer_fwd.hpp b/inst/include/boost/beast/http/serializer_fwd.hpp
new file mode 100644
index 000000000..3abb04ee5
--- /dev/null
+++ b/inst/include/boost/beast/http/serializer_fwd.hpp
@@ -0,0 +1,34 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_SERIALIZER_FWD_HPP
+#define BOOST_BEAST_HTTP_SERIALIZER_FWD_HPP
+
+#include <boost/beast/http/fields_fwd.hpp>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+#ifndef BOOST_BEAST_DOXYGEN
+template<bool isRequest, class Body, class Fields = fields>
+class serializer;
+
+template<class Body, class Fields = fields>
+using request_serializer = serializer<true, Body, Fields>;
+
+template<class Body, class Fields = fields>
+using response_serializer = serializer<false, Body, Fields>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/span_body.hpp b/inst/include/boost/beast/http/span_body.hpp
index 344d8d850..98cda9826 100644
--- a/inst/include/boost/beast/http/span_body.hpp
+++ b/inst/include/boost/beast/http/span_body.hpp
@@ -10,8 +10,10 @@
 #ifndef BOOST_BEAST_HTTP_SPAN_BODY_HPP
 #define BOOST_BEAST_HTTP_SPAN_BODY_HPP
 
-#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/span_body_fwd.hpp>
+
 #include <boost/beast/core/buffer_traits.hpp>
+#include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/core/span.hpp>
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
diff --git a/inst/include/boost/beast/http/span_body_fwd.hpp b/inst/include/boost/beast/http/span_body_fwd.hpp
new file mode 100644
index 000000000..e04b9c1e4
--- /dev/null
+++ b/inst/include/boost/beast/http/span_body_fwd.hpp
@@ -0,0 +1,24 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_SPAN_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_SPAN_BODY_FWD_HPP
+
+namespace boost {
+namespace beast {
+namespace http {
+
+template<class T>
+struct span_body;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/status.hpp b/inst/include/boost/beast/http/status.hpp
index 2e9b7da76..377ade6a0 100644
--- a/inst/include/boost/beast/http/status.hpp
+++ b/inst/include/boost/beast/http/status.hpp
@@ -39,8 +39,8 @@ enum class status : unsigned
         code.
     */
     switching_protocols                 = 101,
-
     processing                          = 102,
+    early_hints                         = 103,
 
     ok                                  = 200,
     created                             = 201,
@@ -80,17 +80,17 @@ enum class status : unsigned
     unsupported_media_type              = 415,
     range_not_satisfiable               = 416,
     expectation_failed                  = 417,
+    i_am_a_teapot                       = 418,
     misdirected_request                 = 421,
     unprocessable_entity                = 422,
     locked                              = 423,
     failed_dependency                   = 424,
+    too_early                           = 425,
     upgrade_required                    = 426,
     precondition_required               = 428,
     too_many_requests                   = 429,
     request_header_fields_too_large     = 431,
-    connection_closed_without_response  = 444,
     unavailable_for_legal_reasons       = 451,
-    client_closed_request               = 499,
 
     internal_server_error               = 500,
     not_implemented                     = 501,
@@ -102,8 +102,7 @@ enum class status : unsigned
     insufficient_storage                = 507,
     loop_detected                       = 508,
     not_extended                        = 510,
-    network_authentication_required     = 511,
-    network_connect_timeout_error       = 599
+    network_authentication_required     = 511
 };
 
 /** Represents the class of a status-code.
diff --git a/inst/include/boost/beast/http/string_body.hpp b/inst/include/boost/beast/http/string_body.hpp
index b30631221..a2545a427 100644
--- a/inst/include/boost/beast/http/string_body.hpp
+++ b/inst/include/boost/beast/http/string_body.hpp
@@ -10,18 +10,17 @@
 #ifndef BOOST_BEAST_HTTP_STRING_BODY_HPP
 #define BOOST_BEAST_HTTP_STRING_BODY_HPP
 
-#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/string_body_fwd.hpp>
+
 #include <boost/beast/core/buffer_traits.hpp>
-#include <boost/beast/http/error.hpp>
-#include <boost/beast/http/message.hpp>
 #include <boost/beast/core/buffers_range.hpp>
 #include <boost/beast/core/detail/clamp.hpp>
+#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/error.hpp>
+#include <boost/beast/http/message.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
-#include <limits>
-#include <memory>
-#include <stdexcept>
 #include <string>
 #include <utility>
 
@@ -35,10 +34,17 @@ namespace http {
     for holding message payloads. Messages using this body type
     may be serialized and parsed.
 */
+#if BOOST_BEAST_DOXYGEN
 template<
     class CharT,
     class Traits = std::char_traits<CharT>,
     class Allocator = std::allocator<CharT>>
+#else
+template<
+    class CharT,
+    class Traits,
+    class Allocator>
+#endif
 struct basic_string_body
 {
 private:
@@ -176,8 +182,10 @@ struct basic_string_body
 #endif
 };
 
+#if BOOST_BEAST_DOXYGEN
 /// A <em>Body</em> using `std::string`
 using string_body = basic_string_body<char>;
+#endif
 
 } // http
 } // beast
diff --git a/inst/include/boost/beast/http/string_body_fwd.hpp b/inst/include/boost/beast/http/string_body_fwd.hpp
new file mode 100644
index 000000000..9a39fa4a7
--- /dev/null
+++ b/inst/include/boost/beast/http/string_body_fwd.hpp
@@ -0,0 +1,34 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_STRING_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_STRING_BODY_FWD_HPP
+
+#include <memory>
+#include <string>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+#ifndef BOOST_BEAST_DOXYGEN
+template<
+    class CharT,
+    class Traits = std::char_traits<CharT>,
+    class Allocator = std::allocator<CharT>>
+struct basic_string_body;
+
+using string_body = basic_string_body<char>;
+#endif
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/type_traits.hpp b/inst/include/boost/beast/http/type_traits.hpp
index 843e9a91b..3afd76f62 100644
--- a/inst/include/boost/beast/http/type_traits.hpp
+++ b/inst/include/boost/beast/http/type_traits.hpp
@@ -24,9 +24,6 @@ namespace boost {
 namespace beast {
 namespace http {
 
-template<bool, class, class>
-class message;
-
 /** Determine if a type meets the <em>Body</em> named requirements.
 
     This alias template is `std::true_type` if `T` meets
diff --git a/inst/include/boost/beast/http/vector_body.hpp b/inst/include/boost/beast/http/vector_body.hpp
index 4665b00bd..e685f64c3 100644
--- a/inst/include/boost/beast/http/vector_body.hpp
+++ b/inst/include/boost/beast/http/vector_body.hpp
@@ -10,19 +10,18 @@
 #ifndef BOOST_BEAST_HTTP_VECTOR_BODY_HPP
 #define BOOST_BEAST_HTTP_VECTOR_BODY_HPP
 
-#include <boost/beast/core/detail/config.hpp>
+#include <boost/beast/http/vector_body_fwd.hpp>
+
 #include <boost/beast/core/buffer_traits.hpp>
+#include <boost/beast/core/detail/clamp.hpp>
+#include <boost/beast/core/detail/config.hpp>
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
-#include <boost/beast/core/detail/clamp.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/optional.hpp>
 #include <cstdint>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <string>
 #include <utility>
+#include <vector>
 
 namespace boost {
 namespace beast {
@@ -34,7 +33,11 @@ namespace http {
     for holding message payloads. Messages using this body type
     may be serialized and parsed.
 */
+#if BOOST_BEAST_DOXYGEN
 template<class T, class Allocator = std::allocator<T>>
+#else
+template<class T, class Allocator>
+#endif
 struct vector_body
 {
 private:
diff --git a/inst/include/boost/beast/http/vector_body_fwd.hpp b/inst/include/boost/beast/http/vector_body_fwd.hpp
new file mode 100644
index 000000000..081796ef7
--- /dev/null
+++ b/inst/include/boost/beast/http/vector_body_fwd.hpp
@@ -0,0 +1,26 @@
+//
+// Copyright (c) 2024 Mohammad Nejati
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HTTP_VECTOR_BODY_FWD_HPP
+#define BOOST_BEAST_HTTP_VECTOR_BODY_FWD_HPP
+
+#include <memory>
+
+namespace boost {
+namespace beast {
+namespace http {
+
+template<class T, class Allocator = std::allocator<T>>
+struct vector_body;
+
+} // http
+} // beast
+} // boost
+
+#endif
diff --git a/inst/include/boost/beast/http/write.hpp b/inst/include/boost/beast/http/write.hpp
index 92050d27b..fd82a667e 100644
--- a/inst/include/boost/beast/http/write.hpp
+++ b/inst/include/boost/beast/http/write.hpp
@@ -169,10 +169,9 @@ write_some(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
     @see serializer
 */
@@ -312,10 +311,9 @@ write_header(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
     @see serializer
 */
@@ -446,10 +444,9 @@ write(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
     @see serializer
 */
@@ -684,10 +681,9 @@ write(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
     @see message
 */
@@ -759,10 +755,9 @@ async_write(
 
     @li @c net::cancellation_type::terminal
 
-    if the `stream` also supports terminal cancellation.
-
-    `terminal` cancellation leaves the stream in an undefined state,
-    so that only closing it is guaranteed to succeed.
+    if the `stream` also supports terminal cancellation, `terminal`
+    cancellation leaves the stream in an undefined state, so that only
+    closing it is guaranteed to succeed.
 
     @see message
 */
diff --git a/inst/include/boost/beast/ssl/ssl_stream.hpp b/inst/include/boost/beast/ssl/ssl_stream.hpp
index ec7fea19b..87885a233 100644
--- a/inst/include/boost/beast/ssl/ssl_stream.hpp
+++ b/inst/include/boost/beast/ssl/ssl_stream.hpp
@@ -15,672 +15,21 @@
 // This include is necessary to work with `ssl::stream` and `boost::beast::websocket::stream`
 #include <boost/beast/websocket/ssl.hpp>
 
-#include <boost/beast/core/flat_stream.hpp>
-
 // VFALCO We include this because anyone who uses ssl will
 //        very likely need to check for ssl::error::stream_truncated
 #include <boost/asio/ssl/error.hpp>
 
 #include <boost/asio/ssl/stream.hpp>
-#include <cstddef>
-#include <memory>
-#include <type_traits>
-#include <utility>
 
 namespace boost {
 namespace beast {
 
-/** Provides stream-oriented functionality using OpenSSL
-
-    The stream class template provides asynchronous and blocking
-    stream-oriented functionality using SSL.
-
-    @par Thread Safety
-    @e Distinct @e objects: Safe.@n
-    @e Shared @e objects: Unsafe. The application must also ensure that all
-    asynchronous operations are performed within the same implicit or explicit
-    strand.
-
-    @par Example
-    To use this template with a @ref tcp_stream, you would write:
-    @code
-        net::io_context ioc;
-        net::ssl::context ctx{net::ssl::context::tlsv12};
-        beast::ssl_stream<beast::tcp_stream> sock{ioc, ctx};
-    @endcode
-
-    In addition to providing an interface identical to `net::ssl::stream`,
-    the wrapper has the following additional properties:
-
-    @li Satisfies @b MoveConstructible
-
-    @li Satisfies @b MoveAssignable
-
-    @li Constructible from a moved socket.
-
-    @li Uses @ref flat_stream internally, as a performance work-around for a
-        limitation of `net::ssl::stream` when writing buffer sequences
-        having length greater than one.
-
-    @par Concepts:
-        @li AsyncReadStream
-        @li AsyncWriteStream
-        @li Stream
-        @li SyncReadStream
-        @li SyncWriteStream
+/** (Deprecated: Use asio::ssl::stream instead.) Provides stream-oriented functionality using OpenSSL
 */
 template<class NextLayer>
-class ssl_stream
-    : public net::ssl::stream_base
+struct ssl_stream : net::ssl::stream<NextLayer>
 {
-    using ssl_stream_type = net::ssl::stream<NextLayer>;
-    using stream_type = boost::beast::flat_stream<ssl_stream_type>;
-
-    std::unique_ptr<stream_type> p_;
-
-public:
-    /// The native handle type of the SSL stream.
-    using native_handle_type =
-        typename ssl_stream_type::native_handle_type;
-
-    /// Structure for use with deprecated impl_type.
-    using impl_struct = typename ssl_stream_type::impl_struct;
-
-    /// The type of the next layer.
-    using next_layer_type = typename ssl_stream_type::next_layer_type;
-
-    /// The type of the executor associated with the object.
-    using executor_type = typename stream_type::executor_type;
-
-    /// Rebinds the stream type to another executor.
-    template<class Executor1>
-    struct rebind_executor
-    {
-        /// The stream type when rebound to the specified executor.
-        using other = ssl_stream<
-                typename stream_type::template rebind_executor<Executor1>::other
-                >;
-    };
-
-
-    /** Construct a stream.
-
-        This constructor creates a stream and initialises the underlying stream
-        object.
-
-        @param arg The argument to be passed to initialise the underlying stream.
-
-        @param ctx The SSL context to be used for the stream.
-    */
-    template<class Arg>
-    ssl_stream(
-        Arg&& arg,
-        net::ssl::context& ctx)
-        : p_(new stream_type{
-            std::forward<Arg>(arg), ctx})
-    {
-    }
-
-    /** Get the executor associated with the object.
-
-        This function may be used to obtain the executor object that the stream
-        uses to dispatch handlers for asynchronous operations.
-
-        @return A copy of the executor that stream will use to dispatch handlers.
-    */
-    executor_type
-    get_executor() noexcept
-    {
-        return p_->get_executor();
-    }
-
-    /** Get the underlying implementation in the native type.
-
-        This function may be used to obtain the underlying implementation of the
-        context. This is intended to allow access to context functionality that is
-        not otherwise provided.
-
-        @par Example
-        The native_handle() function returns a pointer of type @c SSL* that is
-        suitable for passing to functions such as @c SSL_get_verify_result and
-        @c SSL_get_peer_certificate:
-        @code
-        boost::beast::ssl_stream<net::ip::tcp::socket> ss{ioc, ctx};
-
-        // ... establish connection and perform handshake ...
-
-        if (X509* cert = SSL_get_peer_certificate(ss.native_handle()))
-        {
-          if (SSL_get_verify_result(ss.native_handle()) == X509_V_OK)
-          {
-            // ...
-          }
-        }
-        @endcode
-    */
-    native_handle_type
-    native_handle() noexcept
-    {
-        return p_->next_layer().native_handle();
-    }
-
-    /** Get a reference to the next layer.
-
-        This function returns a reference to the next layer in a stack of stream
-        layers.
-
-        @note The next layer is the wrapped stream and not the @ref flat_stream
-        used in the implementation.
-
-        @return A reference to the next layer in the stack of stream layers.
-        Ownership is not transferred to the caller.
-    */
-    next_layer_type const&
-    next_layer() const noexcept
-    {
-        return p_->next_layer().next_layer();
-    }
-
-    /** Get a reference to the next layer.
-
-        This function returns a reference to the next layer in a stack of stream
-        layers.
-
-        @note The next layer is the wrapped stream and not the @ref flat_stream
-        used in the implementation.
-
-        @return A reference to the next layer in the stack of stream layers.
-        Ownership is not transferred to the caller.
-    */
-    next_layer_type&
-    next_layer() noexcept
-    {
-        return p_->next_layer().next_layer();
-    }
-
-    /** Set the peer verification mode.
-
-        This function may be used to configure the peer verification mode used by
-        the stream. The new mode will override the mode inherited from the context.
-
-        @param v A bitmask of peer verification modes.
-
-        @throws boost::system::system_error Thrown on failure.
-
-        @note Calls @c SSL_set_verify.
-    */
-    void
-    set_verify_mode(net::ssl::verify_mode v)
-    {
-        p_->next_layer().set_verify_mode(v);
-    }
-
-    /** Set the peer verification mode.
-
-        This function may be used to configure the peer verification mode used by
-        the stream. The new mode will override the mode inherited from the context.
-
-        @param v A bitmask of peer verification modes. See `verify_mode` for
-        available values.
-
-        @param ec Set to indicate what error occurred, if any.
-
-        @note Calls @c SSL_set_verify.
-    */
-    void
-    set_verify_mode(net::ssl::verify_mode v,
-        boost::system::error_code& ec)
-    {
-        p_->next_layer().set_verify_mode(v, ec);
-    }
-
-    /** Set the peer verification depth.
-
-        This function may be used to configure the maximum verification depth
-        allowed by the stream.
-
-        @param depth Maximum depth for the certificate chain verification that
-        shall be allowed.
-
-        @throws boost::system::system_error Thrown on failure.
-
-        @note Calls @c SSL_set_verify_depth.
-    */
-    void
-    set_verify_depth(int depth)
-    {
-        p_->next_layer().set_verify_depth(depth);
-    }
-
-    /** Set the peer verification depth.
-
-        This function may be used to configure the maximum verification depth
-        allowed by the stream.
-
-        @param depth Maximum depth for the certificate chain verification that
-        shall be allowed.
-
-        @param ec Set to indicate what error occurred, if any.
-
-        @note Calls @c SSL_set_verify_depth.
-    */
-    void
-    set_verify_depth(
-        int depth, boost::system::error_code& ec)
-    {
-        p_->next_layer().set_verify_depth(depth, ec);
-    }
-
-    /** Set the callback used to verify peer certificates.
-
-        This function is used to specify a callback function that will be called
-        by the implementation when it needs to verify a peer certificate.
-
-        @param callback The function object to be used for verifying a certificate.
-        The function signature of the handler must be:
-        @code bool verify_callback(
-          bool preverified, // True if the certificate passed pre-verification.
-          verify_context& ctx // The peer certificate and other context.
-        ); @endcode
-        The return value of the callback is true if the certificate has passed
-        verification, false otherwise.
-
-        @throws boost::system::system_error Thrown on failure.
-
-        @note Calls @c SSL_set_verify.
-    */
-    template<class VerifyCallback>
-    void
-    set_verify_callback(VerifyCallback callback)
-    {
-        p_->next_layer().set_verify_callback(callback);
-    }
-
-    /** Set the callback used to verify peer certificates.
-
-        This function is used to specify a callback function that will be called
-        by the implementation when it needs to verify a peer certificate.
-
-        @param callback The function object to be used for verifying a certificate.
-        The function signature of the handler must be:
-        @code bool verify_callback(
-          bool preverified, // True if the certificate passed pre-verification.
-          net::verify_context& ctx // The peer certificate and other context.
-        ); @endcode
-        The return value of the callback is true if the certificate has passed
-        verification, false otherwise.
-
-        @param ec Set to indicate what error occurred, if any.
-
-        @note Calls @c SSL_set_verify.
-    */
-    template<class VerifyCallback>
-    void
-    set_verify_callback(VerifyCallback callback,
-        boost::system::error_code& ec)
-    {
-        p_->next_layer().set_verify_callback(callback, ec);
-    }
-
-    /** Perform SSL handshaking.
-
-        This function is used to perform SSL handshaking on the stream. The
-        function call will block until handshaking is complete or an error occurs.
-
-        @param type The type of handshaking to be performed, i.e. as a client or as
-        a server.
-
-        @throws boost::system::system_error Thrown on failure.
-    */
-    void
-    handshake(handshake_type type)
-    {
-        p_->next_layer().handshake(type);
-    }
-
-    /** Perform SSL handshaking.
-
-        This function is used to perform SSL handshaking on the stream. The
-        function call will block until handshaking is complete or an error occurs.
-
-        @param type The type of handshaking to be performed, i.e. as a client or as
-        a server.
-
-        @param ec Set to indicate what error occurred, if any.
-    */
-    void
-    handshake(handshake_type type,
-        boost::system::error_code& ec)
-    {
-        p_->next_layer().handshake(type, ec);
-    }
-
-    /** Perform SSL handshaking.
-
-        This function is used to perform SSL handshaking on the stream. The
-        function call will block until handshaking is complete or an error occurs.
-
-        @param type The type of handshaking to be performed, i.e. as a client or as
-        a server.
-
-        @param buffers The buffered data to be reused for the handshake.
-
-        @throws boost::system::system_error Thrown on failure.
-    */
-    template<class ConstBufferSequence>
-    void
-    handshake(
-        handshake_type type, ConstBufferSequence const& buffers)
-    {
-        p_->next_layer().handshake(type, buffers);
-    }
-
-    /** Perform SSL handshaking.
-
-        This function is used to perform SSL handshaking on the stream. The
-        function call will block until handshaking is complete or an error occurs.
-
-        @param type The type of handshaking to be performed, i.e. as a client or as
-        a server.
-
-        @param buffers The buffered data to be reused for the handshake.
-
-        @param ec Set to indicate what error occurred, if any.
-    */
-    template<class ConstBufferSequence>
-    void
-    handshake(handshake_type type,
-        ConstBufferSequence const& buffers,
-            boost::system::error_code& ec)
-    {
-        p_->next_layer().handshake(type, buffers, ec);
-    }
-
-    /** Start an asynchronous SSL handshake.
-
-        This function is used to asynchronously perform an SSL handshake on the
-        stream. This function call always returns immediately.
-
-        @param type The type of handshaking to be performed, i.e. as a client or as
-        a server.
-
-        @param handler The handler to be called when the handshake operation
-        completes. Copies will be made of the handler as required. The equivalent
-        function signature of the handler must be:
-        @code void handler(
-          const boost::system::error_code& error // Result of operation.
-        ); @endcode
-    */
-    template<BOOST_BEAST_ASYNC_TPARAM1 HandshakeHandler = net::default_completion_token_t<executor_type>>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(HandshakeHandler, void(boost::system::error_code))
-    async_handshake(handshake_type type,
-        BOOST_ASIO_MOVE_ARG(HandshakeHandler) handler = net::default_completion_token_t<executor_type>{})
-    {
-        return p_->next_layer().async_handshake(type,
-            BOOST_ASIO_MOVE_CAST(HandshakeHandler)(handler));
-    }
-
-    /** Start an asynchronous SSL handshake.
-
-        This function is used to asynchronously perform an SSL handshake on the
-        stream. This function call always returns immediately.
-
-        @param type The type of handshaking to be performed, i.e. as a client or as
-        a server.
-
-        @param buffers The buffered data to be reused for the handshake. Although
-        the buffers object may be copied as necessary, ownership of the underlying
-        buffers is retained by the caller, which must guarantee that they remain
-        valid until the handler is called.
-
-        @param handler The handler to be called when the handshake operation
-        completes. Copies will be made of the handler as required. The equivalent
-        function signature of the handler must be:
-        @code void handler(
-          const boost::system::error_code& error, // Result of operation.
-          std::size_t bytes_transferred // Amount of buffers used in handshake.
-        ); @endcode
-    */
-    template<class ConstBufferSequence,
-             BOOST_BEAST_ASYNC_TPARAM2 BufferedHandshakeHandler = net::default_completion_token_t<executor_type>>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(BufferedHandshakeHandler, void(boost::system::error_code, std::size_t))
-    async_handshake(handshake_type type, ConstBufferSequence const& buffers,
-        BOOST_ASIO_MOVE_ARG(BufferedHandshakeHandler) handler
-            = net::default_completion_token_t<executor_type>{})
-    {
-        return p_->next_layer().async_handshake(type, buffers,
-            BOOST_ASIO_MOVE_CAST(BufferedHandshakeHandler)(handler));
-    }
-
-    /** Shut down SSL on the stream.
-
-        This function is used to shut down SSL on the stream. The function call
-        will block until SSL has been shut down or an error occurs.
-
-        @throws boost::system::system_error Thrown on failure.
-    */
-    void
-    shutdown()
-    {
-        p_->next_layer().shutdown();
-    }
-
-    /** Shut down SSL on the stream.
-
-        This function is used to shut down SSL on the stream. The function call
-        will block until SSL has been shut down or an error occurs.
-
-        @param ec Set to indicate what error occurred, if any.
-    */
-    void
-    shutdown(boost::system::error_code& ec)
-    {
-        p_->next_layer().shutdown(ec);
-    }
-
-    /** Asynchronously shut down SSL on the stream.
-
-        This function is used to asynchronously shut down SSL on the stream. This
-        function call always returns immediately.
-
-        @param handler The handler to be called when the handshake operation
-        completes. Copies will be made of the handler as required. The equivalent
-        function signature of the handler must be:
-        @code void handler(
-          const boost::system::error_code& error // Result of operation.
-        ); @endcode
-    */
-    template<BOOST_BEAST_ASYNC_TPARAM1 ShutdownHandler = net::default_completion_token_t<executor_type>>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(ShutdownHandler, void(boost::system::error_code))
-    async_shutdown(BOOST_ASIO_MOVE_ARG(ShutdownHandler) handler = net::default_completion_token_t<executor_type>{})
-    {
-        return p_->next_layer().async_shutdown(
-            BOOST_ASIO_MOVE_CAST(ShutdownHandler)(handler));
-    }
-
-    /** Write some data to the stream.
-
-        This function is used to write data on the stream. The function call will
-        block until one or more bytes of data has been written successfully, or
-        until an error occurs.
-
-        @param buffers The data to be written.
-
-        @returns The number of bytes written.
-
-        @throws boost::system::system_error Thrown on failure.
-
-        @note The `write_some` operation may not transmit all of the data to the
-        peer. Consider using the `net::write` function if you need to
-        ensure that all data is written before the blocking operation completes.
-    */
-    template<class ConstBufferSequence>
-    std::size_t
-    write_some(ConstBufferSequence const& buffers)
-    {
-        return p_->write_some(buffers);
-    }
-
-    /** Write some data to the stream.
-
-        This function is used to write data on the stream. The function call will
-        block until one or more bytes of data has been written successfully, or
-        until an error occurs.
-
-        @param buffers The data to be written to the stream.
-
-        @param ec Set to indicate what error occurred, if any.
-
-        @returns The number of bytes written. Returns 0 if an error occurred.
-
-        @note The `write_some` operation may not transmit all of the data to the
-        peer. Consider using the `net::write` function if you need to
-        ensure that all data is written before the blocking operation completes.
-    */
-    template<class ConstBufferSequence>
-    std::size_t
-    write_some(ConstBufferSequence const& buffers,
-        boost::system::error_code& ec)
-    {
-        return p_->write_some(buffers, ec);
-    }
-
-    /** Start an asynchronous write.
-
-        This function is used to asynchronously write one or more bytes of data to
-        the stream. The function call always returns immediately.
-
-        @param buffers The data to be written to the stream. Although the buffers
-        object may be copied as necessary, ownership of the underlying buffers is
-        retained by the caller, which must guarantee that they remain valid until
-        the handler is called.
-
-        @param handler The handler to be called when the write operation completes.
-        Copies will be made of the handler as required. The equivalent function
-        signature of the handler must be:
-        @code void handler(
-          const boost::system::error_code& error, // Result of operation.
-          std::size_t bytes_transferred           // Number of bytes written.
-        ); @endcode
-
-        @note The `async_write_some` operation may not transmit all of the data to
-        the peer. Consider using the `net::async_write` function if you
-        need to ensure that all data is written before the asynchronous operation
-        completes.
-    */
-    template<class ConstBufferSequence,
-             BOOST_BEAST_ASYNC_TPARAM2 WriteHandler = net::default_completion_token_t<executor_type>>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(WriteHandler, void(boost::system::error_code, std::size_t))
-    async_write_some(ConstBufferSequence const& buffers,
-        BOOST_ASIO_MOVE_ARG(WriteHandler) handler= net::default_completion_token_t<executor_type>{})
-    {
-        return p_->async_write_some(buffers,
-            BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
-    }
-
-    /** Read some data from the stream.
-
-        This function is used to read data from the stream. The function call will
-        block until one or more bytes of data has been read successfully, or until
-        an error occurs.
-
-        @param buffers The buffers into which the data will be read.
-
-        @returns The number of bytes read.
-
-        @throws boost::system::system_error Thrown on failure.
-
-        @note The `read_some` operation may not read all of the requested number of
-        bytes. Consider using the `net::read` function if you need to ensure
-        that the requested amount of data is read before the blocking operation
-        completes.
-    */
-    template<class MutableBufferSequence>
-    std::size_t
-    read_some(MutableBufferSequence const& buffers)
-    {
-        return p_->read_some(buffers);
-    }
-
-    /** Read some data from the stream.
-
-        This function is used to read data from the stream. The function call will
-        block until one or more bytes of data has been read successfully, or until
-        an error occurs.
-
-        @param buffers The buffers into which the data will be read.
-
-        @param ec Set to indicate what error occurred, if any.
-
-        @returns The number of bytes read. Returns 0 if an error occurred.
-
-        @note The `read_some` operation may not read all of the requested number of
-        bytes. Consider using the `net::read` function if you need to ensure
-        that the requested amount of data is read before the blocking operation
-        completes.
-    */
-    template<class MutableBufferSequence>
-    std::size_t
-    read_some(MutableBufferSequence const& buffers,
-        boost::system::error_code& ec)
-    {
-        return p_->read_some(buffers, ec);
-    }
-
-    /** Start an asynchronous read.
-
-        This function is used to asynchronously read one or more bytes of data from
-        the stream. The function call always returns immediately.
-
-        @param buffers The buffers into which the data will be read. Although the
-        buffers object may be copied as necessary, ownership of the underlying
-        buffers is retained by the caller, which must guarantee that they remain
-        valid until the handler is called.
-
-        @param handler The handler to be called when the read operation completes.
-        Copies will be made of the handler as required. The equivalent function
-        signature of the handler must be:
-        @code void handler(
-          const boost::system::error_code& error, // Result of operation.
-          std::size_t bytes_transferred           // Number of bytes read.
-        ); @endcode
-
-        @note The `async_read_some` operation may not read all of the requested
-        number of bytes. Consider using the `net::async_read` function
-        if you need to ensure that the requested amount of data is read before
-        the asynchronous operation completes.
-    */
-    template<class MutableBufferSequence,
-             BOOST_BEAST_ASYNC_TPARAM2 ReadHandler = net::default_completion_token_t<executor_type>>
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(ReadHandler, void(boost::system::error_code, std::size_t))
-    async_read_some(MutableBufferSequence const& buffers,
-        BOOST_ASIO_MOVE_ARG(ReadHandler) handler
-            = net::default_completion_token_t<executor_type>{})
-    {
-        return p_->async_read_some(buffers,
-            BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
-    }
-
-    // These hooks are used to inform boost::beast::websocket::stream on
-    // how to tear down the connection as part of the WebSocket
-    // protocol specifications
-    #if ! BOOST_BEAST_DOXYGEN
-    template<class SyncStream>
-    friend
-    void
-    teardown(
-        boost::beast::role_type role,
-        ssl_stream<SyncStream>& stream,
-        boost::system::error_code& ec);
-
-    template<class AsyncStream, typename TeardownHandler>
-    friend
-    void
-    async_teardown(
-        boost::beast::role_type role,
-        ssl_stream<AsyncStream>& stream,
-        TeardownHandler&& handler);
-    #endif
+    using net::ssl::stream<NextLayer>::stream;
 };
 
 #if ! BOOST_BEAST_DOXYGEN
@@ -693,7 +42,7 @@ teardown(
 {
     // Just forward it to the underlying ssl::stream
     using boost::beast::websocket::teardown;
-    teardown(role, *stream.p_, ec);
+    teardown(role, static_cast<net::ssl::stream<SyncStream>&>(stream), ec);
 }
 
 template<class AsyncStream,
@@ -706,7 +55,7 @@ async_teardown(
 {
     // Just forward it to the underlying ssl::stream
     using boost::beast::websocket::async_teardown;
-    async_teardown(role, *stream.p_,
+    async_teardown(role, static_cast<net::ssl::stream<AsyncStream>&>(stream),
         std::forward<TeardownHandler>(handler));
 }
 #endif
diff --git a/inst/include/boost/beast/version.hpp b/inst/include/boost/beast/version.hpp
index 782c338ae..b047fbd90 100644
--- a/inst/include/boost/beast/version.hpp
+++ b/inst/include/boost/beast/version.hpp
@@ -20,7 +20,7 @@
    This is a simple integer that is incremented by one every
    time a set of code changes is merged to the develop branch.
 */
-#define BOOST_BEAST_VERSION 351
+#define BOOST_BEAST_VERSION 356
 
 // A string describing BOOST_BEAST_VERSION, that can be used in http headers.
 #define BOOST_BEAST_VERSION_STRING "Boost.Beast/" BOOST_STRINGIZE(BOOST_BEAST_VERSION)
diff --git a/inst/include/boost/beast/websocket/detail/impl_base.hpp b/inst/include/boost/beast/websocket/detail/impl_base.hpp
index 705ce72de..667dfb126 100644
--- a/inst/include/boost/beast/websocket/detail/impl_base.hpp
+++ b/inst/include/boost/beast/websocket/detail/impl_base.hpp
@@ -311,8 +311,9 @@ struct impl_base<true>
     read_size_hint_pmd(
         std::size_t initial_size,
         bool rd_done,
+        std::size_t rd_msg_max,
         std::uint64_t rd_remain,
-        detail::frame_header const& rd_fh) const
+        frame_header const& rd_fh) const
     {
         using beast::detail::clamp;
         std::size_t result;
@@ -339,8 +340,17 @@ struct impl_base<true>
             initial_size, clamp(rd_remain));
     done:
         BOOST_ASSERT(result != 0);
+        // Ensure offered size does not exceed rd_msg_max
+        if(rd_msg_max)
+            result = clamp(result, rd_msg_max);
         return result;
     }
+
+    void
+    get_config_pmd(detail::pmd_offer &pmd)
+    {
+        pmd = pmd_config_;
+    }
 };
 
 //------------------------------------------------------------------------------
@@ -461,6 +471,7 @@ struct impl_base<false>
     read_size_hint_pmd(
         std::size_t initial_size,
         bool rd_done,
+        std::size_t rd_msg_max,
         std::uint64_t rd_remain,
         frame_header const& rd_fh) const
     {
@@ -485,8 +496,17 @@ struct impl_base<false>
                 initial_size, clamp(rd_remain));
         }
         BOOST_ASSERT(result != 0);
+        // Ensure offered size does not exceed rd_msg_max
+        if(rd_msg_max)
+            result = clamp(result, rd_msg_max);
         return result;
     }
+
+    void
+    get_config_pmd(detail::pmd_offer &pmd)
+    {
+        pmd = {};
+    }
 };
 
 } // detail
diff --git a/inst/include/boost/beast/websocket/impl/accept.hpp b/inst/include/boost/beast/websocket/impl/accept.hpp
index 6cc4c88b1..0fab245d2 100644
--- a/inst/include/boost/beast/websocket/impl/accept.hpp
+++ b/inst/include/boost/beast/websocket/impl/accept.hpp
@@ -296,6 +296,7 @@ class stream<NextLayer, deflateSupported>::accept_op
         , d_(decorator)
     {
         auto& impl = *sp;
+        impl.reset();
         error_code ec;
         auto const mb =
             beast::detail::dynamic_buffer_prepare(
@@ -368,6 +369,16 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_response_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<
         class AcceptHandler,
         class Body, class Allocator,
@@ -375,7 +386,6 @@ struct stream<NextLayer, deflateSupported>::
     void
     operator()(
         AcceptHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         http::request<Body,
             http::basic_fields<Allocator>> const* m,
         Decorator const& d)
@@ -391,7 +401,7 @@ struct stream<NextLayer, deflateSupported>::
 
         response_op<
             typename std::decay<AcceptHandler>::type>(
-                std::forward<AcceptHandler>(h), sp, *m, d);
+                std::forward<AcceptHandler>(h), self, *m, d);
     }
 };
 
@@ -399,6 +409,16 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_accept_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<
         class AcceptHandler,
         class Decorator,
@@ -406,7 +426,6 @@ struct stream<NextLayer, deflateSupported>::
     void
     operator()(
         AcceptHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         Decorator const& d,
         Buffers const& b)
     {
@@ -423,7 +442,7 @@ struct stream<NextLayer, deflateSupported>::
             typename std::decay<AcceptHandler>::type,
             Decorator>(
                 std::forward<AcceptHandler>(h),
-                sp,
+                self,
                 d,
                 b);
     }
@@ -603,17 +622,19 @@ template<
 BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
 stream<NextLayer, deflateSupported>::
 async_accept(
-    AcceptHandler&& handler)
+    AcceptHandler&& handler,
+    typename std::enable_if<
+        ! net::is_const_buffer_sequence<
+        AcceptHandler>::value>::type*
+)
 {
     static_assert(is_async_stream<next_layer_type>::value,
         "AsyncStream type requirements not met");
-    impl_->reset();
     return net::async_initiate<
         AcceptHandler,
         void(error_code)>(
-            run_accept_op{},
+            run_accept_op{impl_},
             handler,
-            impl_,
             &default_decorate_res,
             net::const_buffer{});
 }
@@ -627,6 +648,9 @@ stream<NextLayer, deflateSupported>::
 async_accept(
     ConstBufferSequence const& buffers,
     AcceptHandler&& handler,
+    typename std::enable_if<
+        net::is_const_buffer_sequence<
+        ConstBufferSequence>::value>::type*,
     typename std::enable_if<
         ! http::detail::is_header<
         ConstBufferSequence>::value>::type*
@@ -637,13 +661,11 @@ async_accept(
     static_assert(net::is_const_buffer_sequence<
         ConstBufferSequence>::value,
             "ConstBufferSequence type requirements not met");
-    impl_->reset();
     return net::async_initiate<
         AcceptHandler,
         void(error_code)>(
-            run_accept_op{},
+            run_accept_op{impl_},
             handler,
-            impl_,
             &default_decorate_res,
             buffers);
 }
@@ -660,13 +682,11 @@ async_accept(
 {
     static_assert(is_async_stream<next_layer_type>::value,
         "AsyncStream type requirements not met");
-    impl_->reset();
     return net::async_initiate<
         AcceptHandler,
         void(error_code)>(
-            run_response_op{},
+            run_response_op{impl_},
             handler,
-            impl_,
             &req,
             &default_decorate_res);
 }
diff --git a/inst/include/boost/beast/websocket/impl/close.hpp b/inst/include/boost/beast/websocket/impl/close.hpp
index 85882186d..0e6549d65 100644
--- a/inst/include/boost/beast/websocket/impl/close.hpp
+++ b/inst/include/boost/beast/websocket/impl/close.hpp
@@ -302,11 +302,20 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_close_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<class CloseHandler>
     void
     operator()(
         CloseHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         close_reason const& cr)
     {
         // If you get an error on the following line it means
@@ -321,7 +330,7 @@ struct stream<NextLayer, deflateSupported>::
         close_op<
             typename std::decay<CloseHandler>::type>(
                 std::forward<CloseHandler>(h),
-                sp,
+                self,
                 cr);
     }
 };
@@ -458,9 +467,8 @@ async_close(close_reason const& cr, CloseHandler&& handler)
     return net::async_initiate<
         CloseHandler,
         void(error_code)>(
-            run_close_op{},
+            run_close_op{impl_},
             handler,
-            impl_,
             cr);
 }
 
diff --git a/inst/include/boost/beast/websocket/impl/error.ipp b/inst/include/boost/beast/websocket/impl/error.ipp
index 7256a464c..bb2bf318f 100644
--- a/inst/include/boost/beast/websocket/impl/error.ipp
+++ b/inst/include/boost/beast/websocket/impl/error.ipp
@@ -29,8 +29,9 @@ public:
         return "boost.beast.websocket";
     }
 
-    std::string
-    message(int ev) const override
+    BOOST_BEAST_DECL
+    char const*
+    message(int ev, char*, std::size_t) const noexcept override
     {
         switch(static_cast<error>(ev))
         {
@@ -71,6 +72,12 @@ public:
         }
     }
 
+    std::string
+    message(int ev) const override
+    {
+        return message(ev, nullptr, 0);
+    }
+
     error_condition
     default_error_condition(int ev) const noexcept override
     {
@@ -128,9 +135,9 @@ public:
 
     error_conditions() : error_category(0x7a8de5d61799ce9eu)  {}
 
-
-    std::string
-    message(int cv) const override
+    BOOST_BEAST_DECL
+    char const*
+    message(int cv, char*, std::size_t) const noexcept override
     {
         switch(static_cast<condition>(cv))
         {
@@ -139,6 +146,12 @@ public:
         case condition::protocol_violation: return "A WebSocket protocol violation occurred";
         }
     }
+
+    std::string
+    message(int cv) const override
+    {
+        return message(cv, nullptr, 0);
+    }
 };
 
 } // detail
diff --git a/inst/include/boost/beast/websocket/impl/handshake.hpp b/inst/include/boost/beast/websocket/impl/handshake.hpp
index c7f7bee90..f5bfb6c44 100644
--- a/inst/include/boost/beast/websocket/impl/handshake.hpp
+++ b/inst/include/boost/beast/websocket/impl/handshake.hpp
@@ -80,6 +80,8 @@ class stream<NextLayer, deflateSupported>::handshake_op
             *this, std::move(req)))
     {
         sp->reset(); // VFALCO I don't like this
+        if(res_p)
+            res_p->result(http::status::internal_server_error);
         (*this)({}, 0, false);
     }
 
@@ -188,10 +190,19 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_handshake_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<class HandshakeHandler>
     void operator()(
         HandshakeHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         request_type&& req,
         detail::sec_ws_key_type key,
         response_type* res_p)
@@ -208,7 +219,7 @@ struct stream<NextLayer, deflateSupported>::
         handshake_op<
             typename std::decay<HandshakeHandler>::type>(
                 std::forward<HandshakeHandler>(h),
-                    sp, std::move(req), key, res_p);
+                    self, std::move(req), key, res_p);
     }
 };
 
@@ -311,9 +322,8 @@ async_handshake(
     return net::async_initiate<
         HandshakeHandler,
         void(error_code)>(
-            run_handshake_op{},
+            run_handshake_op{impl_},
             handler,
-            impl_,
             std::move(req),
             key,
             nullptr);
@@ -334,13 +344,11 @@ async_handshake(
     detail::sec_ws_key_type key;
     auto req = impl_->build_request(
         key, host, target, &default_decorate_req);
-    res.result(http::status::internal_server_error);
     return net::async_initiate<
         HandshakeHandler,
         void(error_code)>(
-            run_handshake_op{},
+            run_handshake_op{impl_},
             handler,
-            impl_,
             std::move(req),
             key,
             &res);
diff --git a/inst/include/boost/beast/websocket/impl/ping.hpp b/inst/include/boost/beast/websocket/impl/ping.hpp
index 67d6cd3bb..89ebea7d2 100644
--- a/inst/include/boost/beast/websocket/impl/ping.hpp
+++ b/inst/include/boost/beast/websocket/impl/ping.hpp
@@ -11,7 +11,6 @@
 #define BOOST_BEAST_WEBSOCKET_IMPL_PING_HPP
 
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/bind_continuation.hpp>
 #include <boost/beast/websocket/detail/frame.hpp>
@@ -246,11 +245,20 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_ping_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<class WriteHandler>
     void
     operator()(
         WriteHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         detail::opcode op,
         ping_data const& p)
     {
@@ -266,7 +274,7 @@ struct stream<NextLayer, deflateSupported>::
         ping_op<
             typename std::decay<WriteHandler>::type>(
                 std::forward<WriteHandler>(h),
-                sp,
+                self,
                 op,
                 p);
     }
@@ -337,9 +345,8 @@ async_ping(ping_data const& payload, PingHandler&& handler)
     return net::async_initiate<
         PingHandler,
         void(error_code)>(
-            run_ping_op{},
+            run_ping_op{impl_},
             handler,
-            impl_,
             detail::opcode::ping,
             payload);
 }
@@ -355,9 +362,8 @@ async_pong(ping_data const& payload, PongHandler&& handler)
     return net::async_initiate<
         PongHandler,
         void(error_code)>(
-            run_ping_op{},
+            run_ping_op{impl_},
             handler,
-            impl_,
             detail::opcode::pong,
             payload);
 }
diff --git a/inst/include/boost/beast/websocket/impl/read.hpp b/inst/include/boost/beast/websocket/impl/read.hpp
index e34a09bc0..037ad609c 100644
--- a/inst/include/boost/beast/websocket/impl/read.hpp
+++ b/inst/include/boost/beast/websocket/impl/read.hpp
@@ -15,7 +15,6 @@
 #include <boost/beast/websocket/detail/mask.hpp>
 #include <boost/beast/websocket/impl/stream_impl.hpp>
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
 #include <boost/beast/core/buffers_suffix.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
@@ -820,13 +819,22 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_read_some_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<
         class ReadHandler,
         class MutableBufferSequence>
     void
     operator()(
         ReadHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         MutableBufferSequence const& b)
     {
         // If you get an error on the following line it means
@@ -842,7 +850,7 @@ struct stream<NextLayer, deflateSupported>::
             typename std::decay<ReadHandler>::type,
             MutableBufferSequence>(
                 std::forward<ReadHandler>(h),
-                sp,
+                self,
                 b);
     }
 };
@@ -851,13 +859,22 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_read_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<
         class ReadHandler,
         class DynamicBuffer>
     void
     operator()(
         ReadHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         DynamicBuffer* b,
         std::size_t limit,
         bool some)
@@ -875,7 +892,7 @@ struct stream<NextLayer, deflateSupported>::
             typename std::decay<ReadHandler>::type,
             DynamicBuffer>(
                 std::forward<ReadHandler>(h),
-                sp,
+                self,
                 *b,
                 limit,
                 some);
@@ -938,9 +955,8 @@ async_read(DynamicBuffer& buffer, ReadHandler&& handler)
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            run_read_op{},
+            run_read_op{impl_},
             handler,
-            impl_,
             &buffer,
             0,
             false);
@@ -987,7 +1003,7 @@ read_some(
     if(! limit)
         limit = (std::numeric_limits<std::size_t>::max)();
     auto const size =
-        clamp(read_size_hint(buffer), limit);
+        clamp(impl_->read_size_hint_db(buffer), limit);
     BOOST_ASSERT(size > 0);
     auto mb = beast::detail::dynamic_buffer_prepare(
         buffer, size, ec, error::buffer_overflow);
@@ -1015,9 +1031,8 @@ async_read_some(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            run_read_op{},
+            run_read_op{impl_},
             handler,
-            impl_,
             &buffer,
             limit,
             true);
@@ -1396,9 +1411,8 @@ async_read_some(
     return net::async_initiate<
         ReadHandler,
         void(error_code, std::size_t)>(
-            run_read_some_op{},
+            run_read_some_op{impl_},
             handler,
-            impl_,
             buffers);
 }
 
diff --git a/inst/include/boost/beast/websocket/impl/stream.hpp b/inst/include/boost/beast/websocket/impl/stream.hpp
index 52c23d318..2c044ebdf 100644
--- a/inst/include/boost/beast/websocket/impl/stream.hpp
+++ b/inst/include/boost/beast/websocket/impl/stream.hpp
@@ -133,7 +133,7 @@ read_size_hint(
     std::size_t initial_size) const
 {
     return impl_->read_size_hint_pmd(
-        initial_size, impl_->rd_done,
+        initial_size, impl_->rd_done, impl_->rd_msg_max,
         impl_->rd_remain, impl_->rd_fh);
 }
 
@@ -175,6 +175,18 @@ get_option(timeout& opt)
     opt = impl_->timeout_opt;
 }
 
+template <class NextLayer, bool deflateSupported>
+void
+stream<NextLayer, deflateSupported>::
+get_status(permessage_deflate_status &status) const noexcept
+{
+    detail::pmd_offer pmd;
+    impl_->get_config_pmd(pmd);
+    status.active               = pmd.accept;
+    status.client_window_bits   = pmd.client_max_window_bits;
+    status.server_window_bits   = pmd.server_max_window_bits;
+}
+
 template<class NextLayer, bool deflateSupported>
 void
 stream<NextLayer, deflateSupported>::
diff --git a/inst/include/boost/beast/websocket/impl/stream_impl.hpp b/inst/include/boost/beast/websocket/impl/stream_impl.hpp
index 615b4beb1..5113be912 100644
--- a/inst/include/boost/beast/websocket/impl/stream_impl.hpp
+++ b/inst/include/boost/beast/websocket/impl/stream_impl.hpp
@@ -300,7 +300,7 @@ struct stream<NextLayer, deflateSupported>::impl_type
         if(initial_size == 0)
             return 1; // buffer is full
         return this->read_size_hint_pmd(
-            initial_size, rd_done, rd_remain, rd_fh);
+            initial_size, rd_done, rd_msg_max, rd_remain, rd_fh);
     }
 
     template<class DynamicBuffer>
@@ -886,6 +886,9 @@ parse_fh(
                 return false;
             }
         }
+        // The final size of a deflated frame is unknown. In certain cases,
+        // post-inflation, it might shrink and become <= rd_msg_max.
+        // Therefore, we will verify the size during the inflation process.
         if(! this->rd_deflated())
         {
             if(rd_msg_max && beast::detail::sum_exceeds(
diff --git a/inst/include/boost/beast/websocket/impl/teardown.hpp b/inst/include/boost/beast/websocket/impl/teardown.hpp
index f04be03b6..dc06a0fce 100644
--- a/inst/include/boost/beast/websocket/impl/teardown.hpp
+++ b/inst/include/boost/beast/websocket/impl/teardown.hpp
@@ -11,10 +11,10 @@
 #define BOOST_BEAST_WEBSOCKET_IMPL_TEARDOWN_HPP
 
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/core/detail/bind_continuation.hpp>
 #include <boost/beast/core/detail/is_invocable.hpp>
+#include <boost/asio/append.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/dispatch.hpp>
 #include <memory>
@@ -58,8 +58,8 @@ class teardown_tcp_op
         , role_(role)
         , nb_(false)
     {
-        (*this)({}, 0, false);
         this->set_allowed_cancellation(net::cancellation_type::all);
+        (*this)({}, 0, false);
     }
 
     void
@@ -129,8 +129,7 @@ class teardown_tcp_op
                         ));
 
                     const auto ex = this->get_immediate_executor();
-                    net::dispatch(ex, bind_front_handler(
-                        std::move(*this), ec));
+                    net::dispatch(ex, net::append(std::move(*this), ec));
                 }
             }
             {
diff --git a/inst/include/boost/beast/websocket/impl/write.hpp b/inst/include/boost/beast/websocket/impl/write.hpp
index a70cb1a09..78ae29135 100644
--- a/inst/include/boost/beast/websocket/impl/write.hpp
+++ b/inst/include/boost/beast/websocket/impl/write.hpp
@@ -12,7 +12,6 @@
 
 #include <boost/beast/websocket/detail/mask.hpp>
 #include <boost/beast/core/async_base.hpp>
-#include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/buffer_traits.hpp>
 #include <boost/beast/core/buffers_cat.hpp>
 #include <boost/beast/core/buffers_prefix.hpp>
@@ -347,8 +346,8 @@ operator()(
                         beast::detail::bind_continuation(std::move(*this)));
             }
             // VFALCO What about consuming the buffer on error?
-            bytes_transferred_ +=
-                bytes_transferred - impl.wr_fb.size();
+            if(bytes_transferred > impl.wr_fb.size())
+                bytes_transferred_ += bytes_transferred - impl.wr_fb.size();
             if(impl.check_stop_now(ec))
                 goto upcall;
             while(remain_ > 0)
@@ -432,7 +431,10 @@ operator()(
                             ),
                             beast::detail::bind_continuation(std::move(*this)));
                 }
-                n = bytes_transferred - impl.wr_fb.size();
+                if(bytes_transferred > impl.wr_fb.size())
+                    n = bytes_transferred - impl.wr_fb.size();
+                else
+                    n = 0;
                 bytes_transferred_ += n;
                 if(impl.check_stop_now(ec))
                     goto upcall;
@@ -557,13 +559,22 @@ template<class NextLayer, bool deflateSupported>
 struct stream<NextLayer, deflateSupported>::
     run_write_some_op
 {
+    boost::shared_ptr<impl_type> const& self;
+
+    using executor_type = typename stream::executor_type;
+
+    executor_type
+    get_executor() const noexcept
+    {
+        return self->stream().get_executor();
+    }
+
     template<
         class WriteHandler,
         class ConstBufferSequence>
     void
     operator()(
         WriteHandler&& h,
-        boost::shared_ptr<impl_type> const& sp,
         bool fin,
         ConstBufferSequence const& b)
     {
@@ -580,7 +591,7 @@ struct stream<NextLayer, deflateSupported>::
             typename std::decay<WriteHandler>::type,
             ConstBufferSequence>(
                 std::forward<WriteHandler>(h),
-                sp,
+                self,
                 fin,
                 b);
     }
@@ -834,9 +845,8 @@ async_write_some(bool fin,
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            run_write_some_op{},
+            run_write_some_op{impl_},
             handler,
-            impl_,
             fin,
             bs);
 }
@@ -890,9 +900,8 @@ async_write(
     return net::async_initiate<
         WriteHandler,
         void(error_code, std::size_t)>(
-            run_write_some_op{},
+            run_write_some_op{impl_},
             handler,
-            impl_,
             true,
             bs);
 }
diff --git a/inst/include/boost/beast/websocket/option.hpp b/inst/include/boost/beast/websocket/option.hpp
index 817bf9110..4c4e4ee68 100644
--- a/inst/include/boost/beast/websocket/option.hpp
+++ b/inst/include/boost/beast/websocket/option.hpp
@@ -21,8 +21,13 @@ namespace websocket {
     These settings control the permessage-deflate extension,
     which allows messages to be compressed.
 
-    @note Objects of this type are used with
-          @ref beast::websocket::stream::set_option.
+    @note
+
+    These settings should be configured before performing the WebSocket
+    handshake.
+
+    Objects of this type are used with
+    @ref beast::websocket::stream::set_option.
 */
 struct permessage_deflate
 {
diff --git a/inst/include/boost/beast/websocket/ssl.hpp b/inst/include/boost/beast/websocket/ssl.hpp
index 7f2a9cabe..21198754d 100644
--- a/inst/include/boost/beast/websocket/ssl.hpp
+++ b/inst/include/boost/beast/websocket/ssl.hpp
@@ -27,6 +27,11 @@ namespace beast {
     `net::ssl::stream`, callers are responsible for
     providing a suitable overload of this function.
 
+    @note
+
+    This function serves as a customization point and is not intended
+    to be called directly.
+
     @param role The role of the local endpoint
 
     @param stream The stream to tear down.
@@ -50,6 +55,11 @@ teardown(
     callers are responsible for providing a suitable overload
     of this function.
 
+    @note
+
+    This function serves as a customization point and is not intended
+    to be called directly.
+
     @param role The role of the local endpoint
 
     @param stream The stream to tear down.
diff --git a/inst/include/boost/beast/websocket/stream.hpp b/inst/include/boost/beast/websocket/stream.hpp
index 0595851f2..7dd307d71 100644
--- a/inst/include/boost/beast/websocket/stream.hpp
+++ b/inst/include/boost/beast/websocket/stream.hpp
@@ -38,6 +38,25 @@
 namespace boost {
 namespace beast {
 namespace websocket {
+/** permessage-deflate extension status.
+
+    These settings indicate the status of the permessage-deflate
+    extension, showing if it is active and the window bits in use.
+
+    Objects of this type are used with
+    @ref beast::websocket::stream::get_status.
+*/
+struct permessage_deflate_status
+{
+    /// `true` if the permessage-deflate extension is active
+    bool active = false;
+
+    /// The number of window bits used by the client
+    int client_window_bits = 0;
+
+    /// The number of window bits used by the server
+    int server_window_bits = 0;
+};
 
 /** The type of received control frame.
 
@@ -398,6 +417,11 @@ class stream
 
         @throws invalid_argument if `deflateSupported == false`, and either
         `client_enable` or `server_enable` is `true`.
+
+        @note
+
+        These settings should be configured before performing the WebSocket
+        handshake.
     */
     void
     set_option(permessage_deflate const& o);
@@ -406,6 +430,24 @@ class stream
     void
     get_option(permessage_deflate& o);
 
+    /** Get the status of the permessage-deflate extension.
+
+        Used to check the status of the permessage-deflate extension after
+        the WebSocket handshake.
+
+        @param status A reference to a `permessage_deflate_status` object
+        where the status will be stored.
+
+        @par Example
+        Checking the status of the permessage-deflate extension:
+        @code
+            permessage_deflate_status status;
+            ws.get_status(status);
+        @endcode
+    */
+    void
+    get_status(permessage_deflate_status &status) const noexcept;
+
     /** Set the automatic fragmentation option.
 
         Determines if outgoing message payloads are broken up into
@@ -1376,7 +1418,13 @@ class stream
     async_accept(
         AcceptHandler&& handler =
             net::default_completion_token_t<
-                executor_type>{});
+                executor_type>{}
+#ifndef BOOST_BEAST_DOXYGEN
+        , typename std::enable_if<
+            ! net::is_const_buffer_sequence<
+            AcceptHandler>::value>::type* = nullptr
+#endif
+    );
 
     /** Perform the WebSocket handshake asynchronously in the server role.
 
@@ -1449,6 +1497,9 @@ class stream
             net::default_completion_token_t<
                 executor_type>{}
 #ifndef BOOST_BEAST_DOXYGEN
+        , typename std::enable_if<
+            net::is_const_buffer_sequence<
+            ConstBufferSequence>::value>::type* = 0
         , typename std::enable_if<
             ! http::detail::is_header<
             ConstBufferSequence>::value>::type* = 0
@@ -1639,7 +1690,8 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
-         @par Per-Operation Cancellation
+
+        @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
         net::cancellation_type values:
@@ -1649,6 +1701,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         @note `terminal` cancellation will may close the underlying socket.
@@ -1760,6 +1813,7 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
+
         @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
@@ -1770,6 +1824,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -1885,6 +1940,7 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
+
         @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
@@ -1895,6 +1951,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -2063,6 +2120,7 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
+
         @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
@@ -2073,6 +2131,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -2259,6 +2318,7 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
+
         @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
@@ -2269,6 +2329,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -2388,6 +2449,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -2477,6 +2539,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -2607,6 +2670,7 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
+
         @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
@@ -2617,6 +2681,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
@@ -2756,6 +2821,7 @@ class stream
         by dispatching to the immediate executor. If no
         immediate executor is specified, this is equivalent
         to using `net::post`.
+
         @par Per-Operation Cancellation
 
         This asynchronous operation supports cancellation for the following
@@ -2766,6 +2832,7 @@ class stream
 
         `total` cancellation succeeds if the operation is suspended due to ongoing
         control operations such as a ping/pong.
+
         `terminal` cancellation succeeds when supported by the underlying stream.
 
         `terminal` cancellation leaves the stream in an undefined state,
diff --git a/inst/include/boost/beast/websocket/teardown.hpp b/inst/include/boost/beast/websocket/teardown.hpp
index ab5321e47..9c92a9130 100644
--- a/inst/include/boost/beast/websocket/teardown.hpp
+++ b/inst/include/boost/beast/websocket/teardown.hpp
@@ -29,6 +29,11 @@ namespace websocket {
     `net::ssl::stream`, callers are responsible for
     providing a suitable overload of this function.
 
+    @note
+
+    This function serves as a customization point and is not intended
+    to be called directly.
+
     @param role The role of the local endpoint
 
     @param socket The socket to tear down.
@@ -65,6 +70,11 @@ teardown(
     callers are responsible for providing a suitable overload
     of this function.
 
+    @note
+
+    This function serves as a customization point and is not intended
+    to be called directly.
+
     @param role The role of the local endpoint
 
     @param socket The socket to tear down.
@@ -122,6 +132,11 @@ namespace websocket {
     `net::ssl::stream`, callers are responsible for
     providing a suitable overload of this function.
 
+    @note
+
+    This function serves as a customization point and is not intended
+    to be called directly.
+
     @param role The role of the local endpoint
 
     @param socket The socket to tear down.
@@ -146,6 +161,11 @@ teardown(
     callers are responsible for providing a suitable overload
     of this function.
 
+    @note
+
+    This function serves as a customization point and is not intended
+    to be called directly.
+
     @param role The role of the local endpoint
 
     @param socket The socket to tear down.
diff --git a/inst/include/boost/beast/zlib/deflate_stream.hpp b/inst/include/boost/beast/zlib/deflate_stream.hpp
index c1ca78fa9..14bc97b1b 100644
--- a/inst/include/boost/beast/zlib/deflate_stream.hpp
+++ b/inst/include/boost/beast/zlib/deflate_stream.hpp
@@ -79,7 +79,7 @@ class deflate_stream
     */
     deflate_stream()
     {
-        reset(6, 15, DEF_MEM_LEVEL, Strategy::normal);
+        reset(6, 15, def_mem_level, Strategy::normal);
     }
 
     /** Reset the stream and compression settings.
diff --git a/inst/include/boost/beast/zlib/detail/deflate_stream.hpp b/inst/include/boost/beast/zlib/detail/deflate_stream.hpp
index 8bf3c1a4f..93ef57890 100644
--- a/inst/include/boost/beast/zlib/detail/deflate_stream.hpp
+++ b/inst/include/boost/beast/zlib/detail/deflate_stream.hpp
@@ -90,27 +90,27 @@ class deflate_stream
     BOOST_STATIC_ASSERT(minMatch == 3);
 
     // end of block literal code
-    static std::uint16_t constexpr END_BLOCK = 256;
+    static std::uint16_t constexpr end_block = 256;
 
     // repeat previous bit length 3-6 times (2 bits of repeat count)
-    static std::uint8_t constexpr REP_3_6 = 16;
+    static std::uint8_t constexpr rep_3_6 = 16;
 
     // repeat a zero length 3-10 times  (3 bits of repeat count)
-    static std::uint8_t constexpr REPZ_3_10 = 17;
+    static std::uint8_t constexpr repz_3_10 = 17;
 
     // repeat a zero length 11-138 times  (7 bits of repeat count)
-    static std::uint8_t constexpr REPZ_11_138 = 18;
+    static std::uint8_t constexpr repz_11_138 = 18;
 
     // The three kinds of block type
-    static std::uint8_t constexpr STORED_BLOCK = 0;
-    static std::uint8_t constexpr STATIC_TREES = 1;
-    static std::uint8_t constexpr DYN_TREES    = 2;
+    static std::uint8_t constexpr stored_block = 0;
+    static std::uint8_t constexpr static_trees = 1;
+    static std::uint8_t constexpr dyn_trees    = 2;
 
     // Maximum value for memLevel in deflateInit2
     static std::uint8_t constexpr max_mem_level = 9;
 
     // Default memLevel
-    static std::uint8_t constexpr DEF_MEM_LEVEL = max_mem_level;
+    static std::uint8_t constexpr def_mem_level = max_mem_level;
 
     /*  Note: the deflate() code requires max_lazy >= minMatch and max_chain >= 4
         For deflate_fast() (levels <= 3) good is ignored and lazy has a different
@@ -118,7 +118,7 @@ class deflate_stream
     */
 
     // maximum heap size
-    static std::uint16_t constexpr HEAP_SIZE = 2 * lCodes + 1;
+    static std::uint16_t constexpr heap_size = 2 * lCodes + 1;
 
     // size of bit buffer in bi_buf
     static std::uint8_t constexpr Buf_size = 16;
@@ -229,12 +229,12 @@ class deflate_stream
     // VFALCO This might not be needed, e.g. for zip/gzip
     enum StreamStatus
     {
-        EXTRA_STATE = 69,
-        NAME_STATE = 73,
-        COMMENT_STATE = 91,
-        HCRC_STATE = 103,
-        BUSY_STATE = 113,
-        FINISH_STATE = 666
+        extra_state = 69,
+        name_state = 73,
+        comment_state = 91,
+        hcrc_state = 103,
+        busy_state = 113,
+        finish_state = 666
     };
 
     /* A std::uint16_t is an index in the character window. We use short instead of int to
@@ -343,7 +343,7 @@ class deflate_stream
     int nice_match_;                // Stop searching when current match exceeds this
 
     ct_data dyn_ltree_[
-        HEAP_SIZE];                 // literal and length tree
+        heap_size];                 // literal and length tree
     ct_data dyn_dtree_[
         2*dCodes+1];                // distance tree
     ct_data bl_tree_[
diff --git a/inst/include/boost/beast/zlib/detail/deflate_stream.ipp b/inst/include/boost/beast/zlib/detail/deflate_stream.ipp
index 53ac6c0af..cc789acea 100644
--- a/inst/include/boost/beast/zlib/detail/deflate_stream.ipp
+++ b/inst/include/boost/beast/zlib/detail/deflate_stream.ipp
@@ -364,7 +364,7 @@ doWrite(z_params& zs, boost::optional<Flush> flush, error_code& ec)
         BOOST_THROW_EXCEPTION(std::invalid_argument{"invalid input"});
 
     if(zs.next_out == nullptr ||
-        (status_ == FINISH_STATE && flush != Flush::finish))
+        (status_ == finish_state && flush != Flush::finish))
     {
         BOOST_BEAST_ASSIGN_EC(ec, error::stream_error);
         return;
@@ -411,7 +411,7 @@ doWrite(z_params& zs, boost::optional<Flush> flush, error_code& ec)
     }
 
     // User must not provide more input after the first FINISH:
-    if(status_ == FINISH_STATE && zs.avail_in != 0)
+    if(status_ == finish_state && zs.avail_in != 0)
     {
         BOOST_BEAST_ASSIGN_EC(ec, error::need_buffers);
         return;
@@ -420,7 +420,7 @@ doWrite(z_params& zs, boost::optional<Flush> flush, error_code& ec)
     /* Start a new block or continue the current one.
      */
     if(zs.avail_in != 0 || lookahead_ != 0 ||
-        (flush != Flush::none && status_ != FINISH_STATE))
+        (flush != Flush::none && status_ != finish_state))
     {
         block_state bstate;
 
@@ -441,7 +441,7 @@ doWrite(z_params& zs, boost::optional<Flush> flush, error_code& ec)
 
         if(bstate == finish_started || bstate == finish_done)
         {
-            status_ = FINISH_STATE;
+            status_ = finish_state;
         }
         if(bstate == need_more || bstate == finish_started)
         {
@@ -681,7 +681,7 @@ init()
     pending_ = 0;
     pending_out_ = pending_buf_;
 
-    status_ = BUSY_STATE;
+    status_ = busy_state;
     last_flush_ = Flush::none;
 
     tr_init();
@@ -729,7 +729,7 @@ init_block()
         dyn_dtree_[n].fc = 0;
     for(int n = 0; n < blCodes; n++)
         bl_tree_[n].fc = 0;
-    dyn_ltree_[END_BLOCK].fc = 1;
+    dyn_ltree_[end_block].fc = 1;
     opt_len_ = 0L;
     static_len_ = 0L;
     sym_next_ = 0;
@@ -815,7 +815,7 @@ gen_bitlen(tree_desc *desc)
      */
     tree[heap_[heap_max_]].dl = 0; // root of the heap
 
-    for(h = heap_max_+1; h < HEAP_SIZE; h++) {
+    for(h = heap_max_+1; h < heap_size; h++) {
         n = heap_[h];
         bits = tree[tree[n].dl].dl + 1;
         if(bits > max_length) bits = max_length, overflow++;
@@ -899,7 +899,7 @@ build_tree(tree_desc *desc)
      * heap[0] is not used.
      */
     heap_len_ = 0;
-    heap_max_ = HEAP_SIZE;
+    heap_max_ = heap_size;
 
     for(n = 0; n < elems; n++)
     {
@@ -1010,15 +1010,15 @@ scan_tree(
         else if(curlen != 0)
         {
             if(curlen != prevlen) bl_tree_[curlen].fc++;
-                bl_tree_[REP_3_6].fc++;
+                bl_tree_[rep_3_6].fc++;
         }
         else if(count <= 10)
         {
-            bl_tree_[REPZ_3_10].fc++;
+            bl_tree_[repz_3_10].fc++;
         }
         else
         {
-            bl_tree_[REPZ_11_138].fc++;
+            bl_tree_[repz_11_138].fc++;
         }
         count = 0;
         prevlen = curlen;
@@ -1088,17 +1088,17 @@ send_tree(
                 count--;
             }
             BOOST_ASSERT(count >= 3 && count <= 6);
-            send_code(REP_3_6, bl_tree_);
+            send_code(rep_3_6, bl_tree_);
             send_bits(count-3, 2);
         }
         else if(count <= 10)
         {
-            send_code(REPZ_3_10, bl_tree_);
+            send_code(repz_3_10, bl_tree_);
             send_bits(count-3, 3);
         }
         else
         {
-            send_code(REPZ_11_138, bl_tree_);
+            send_code(repz_11_138, bl_tree_);
             send_bits(count-11, 7);
         }
         count = 0;
@@ -1234,7 +1234,7 @@ compress_block(
         while(sx < sym_next_);
     }
 
-    send_code(END_BLOCK, ltree);
+    send_code(end_block, ltree);
 }
 
 /*  Check if the data type is TEXT or BINARY, using the following algorithm:
@@ -1366,8 +1366,8 @@ void
 deflate_stream::
 tr_align()
 {
-    send_bits(STATIC_TREES<<1, 3);
-    send_code(END_BLOCK, lut_.ltree);
+    send_bits(static_trees<<1, 3);
+    send_code(end_block, lut_.ltree);
     bi_flush();
 }
 
@@ -1389,7 +1389,7 @@ tr_stored_block(
     std::uint32_t stored_len,   // length of input block
     int last)                   // one if this is the last block for a file
 {
-    send_bits((STORED_BLOCK<<1)+last, 3);       // send block type
+    send_bits((stored_block<<1)+last, 3);       // send block type
     copy_block(buf, (unsigned)stored_len, 1);   // with header
 }
 
@@ -1497,12 +1497,12 @@ tr_flush_block(
     else if(strategy_ == Strategy::fixed || static_lenb == opt_lenb)
     {
 #endif
-        send_bits((STATIC_TREES<<1)+last, 3);
+        send_bits((static_trees<<1)+last, 3);
         compress_block(lut_.ltree, lut_.dtree);
     }
     else
     {
-        send_bits((DYN_TREES<<1)+last, 3);
+        send_bits((dyn_trees<<1)+last, 3);
         send_all_trees(l_desc_.max_code+1, d_desc_.max_code+1,
                        max_blindex+1);
         compress_block((const ct_data *)dyn_ltree_,
diff --git a/inst/include/boost/beast/zlib/detail/inflate_stream.ipp b/inst/include/boost/beast/zlib/detail/inflate_stream.ipp
index b9da36836..3fb7ee554 100644
--- a/inst/include/boost/beast/zlib/detail/inflate_stream.ipp
+++ b/inst/include/boost/beast/zlib/detail/inflate_stream.ipp
@@ -138,7 +138,7 @@ doWrite(z_params& zs, Flush flush, error_code& ec)
         case TYPE:
             if(flush == Flush::block || flush == Flush::trees)
                 return done();
-            // fall through
+            BOOST_FALLTHROUGH;
 
         case TYPEDO:
         {
diff --git a/inst/include/boost/beast/zlib/impl/error.ipp b/inst/include/boost/beast/zlib/impl/error.ipp
index f6b023169..f112c34af 100644
--- a/inst/include/boost/beast/zlib/impl/error.ipp
+++ b/inst/include/boost/beast/zlib/impl/error.ipp
@@ -55,8 +55,9 @@ public:
         return "boost.beast.zlib";
     }
 
-    std::string
-    message(int ev) const override
+    BOOST_BEAST_DECL
+    char const*
+    message(int ev, char*, std::size_t) const noexcept override
     {
         switch(static_cast<error>(ev))
         {
@@ -84,6 +85,12 @@ public:
         }
     }
 
+    std::string
+    message(int ev) const override
+    {
+        return message(ev, nullptr, 0);
+    }
+
     error_condition
     default_error_condition(int ev) const noexcept override
     {
diff --git a/inst/include/boost/bimap/container_adaptor/detail/identity_converters.hpp b/inst/include/boost/bimap/container_adaptor/detail/identity_converters.hpp
index 4f79cfc16..f99d4a879 100644
--- a/inst/include/boost/bimap/container_adaptor/detail/identity_converters.hpp
+++ b/inst/include/boost/bimap/container_adaptor/detail/identity_converters.hpp
@@ -1,6 +1,7 @@
 // Boost.Bimap
 //
 // Copyright (c) 2006-2007 Matias Capeletto
+// Copyright (c) 2024 Joaquin M Lopez Munoz
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -166,7 +167,7 @@ struct key_to_base_identity
 #ifndef BOOST_BIMAP_DOXYGEN_WILL_NOT_PROCESS_THE_FOLLOWING_LINES
 
 template< class Key >
-struct key_to_base_identity< Key, Key >
+struct key_to_base_identity< Key, const Key >
 {
     // As default accept any type as key in order to allow container
     // adaptors to work with compatible key types
diff --git a/inst/include/boost/bimap/relation/mutant_relation.hpp b/inst/include/boost/bimap/relation/mutant_relation.hpp
index 1681a9d04..eda9a8c91 100644
--- a/inst/include/boost/bimap/relation/mutant_relation.hpp
+++ b/inst/include/boost/bimap/relation/mutant_relation.hpp
@@ -289,8 +289,14 @@ class mutant_relation : public
 
     // Operators
 
-    template< bool FM >
-    mutant_relation& operator=(const mutant_relation<TA,TB,Info,FM> & rel)
+    mutant_relation& operator=(const mutant_relation & rel)
+    {
+        base_::change_to(rel);
+        return *this;
+    }
+
+    mutant_relation& operator=(const mutant_relation<TA,TB,Info,
+                                                     !force_mutable> & rel)
     {
         base_::change_to(rel);
         return *this;
diff --git a/inst/include/boost/bind/apply.hpp b/inst/include/boost/bind/apply.hpp
index 0520fd0a0..a7eecace7 100644
--- a/inst/include/boost/bind/apply.hpp
+++ b/inst/include/boost/bind/apply.hpp
@@ -2,18 +2,15 @@
 #define BOOST_BIND_APPLY_HPP_INCLUDED
 
 //
-//  apply.hpp
+// apply.hpp
 //
-//  Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
+// Copyright 2002, 2003, 2024 Peter Dimov
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
-
 namespace boost
 {
 
@@ -21,66 +18,10 @@ template<class R> struct apply
 {
     typedef R result_type;
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-
     template<class F, class... A> result_type operator()( F&& f, A&&... a ) const
     {
         return static_cast<F&&>( f )( static_cast<A&&>( a )... );
     }
-
-#else
-
-    template<class F> result_type operator()(F & f) const
-    {
-        return f();
-    }
-
-    template<class F, class A1> result_type operator()(F & f, A1 & a1) const
-    {
-        return f(a1);
-    }
-
-    template<class F, class A1, class A2> result_type operator()(F & f, A1 & a1, A2 & a2) const
-    {
-        return f(a1, a2);
-    }
-
-    template<class F, class A1, class A2, class A3> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3) const
-    {
-        return f(a1, a2, a3);
-    }
-
-    template<class F, class A1, class A2, class A3, class A4> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4) const
-    {
-        return f(a1, a2, a3, a4);
-    }
-
-    template<class F, class A1, class A2, class A3, class A4, class A5> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5) const
-    {
-        return f(a1, a2, a3, a4, a5);
-    }
-
-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6) const
-    {
-        return f(a1, a2, a3, a4, a5, a6);
-    }
-
-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7) const
-    {
-        return f(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8) const
-    {
-        return f(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(F & f, A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9) const
-    {
-        return f(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-    }
-
-#endif
 };
 
 } // namespace boost
diff --git a/inst/include/boost/bind/bind.hpp b/inst/include/boost/bind/bind.hpp
index fd0ee144f..5ec792309 100644
--- a/inst/include/boost/bind/bind.hpp
+++ b/inst/include/boost/bind/bind.hpp
@@ -8,46 +8,33 @@
 #endif
 
 //
-//  bind.hpp - binds function objects to arguments
+// bind.hpp - binds function objects to arguments
 //
-//  Copyright (c) 2001-2004 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2001 David Abrahams
-//  Copyright (c) 2005 Peter Dimov
+// Copyright 2001-2005, 2024 Peter Dimov
+// Copyright 2001 David Abrahams
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
+//  See http://www.boost.org/libs/bind for documentation.
 //
 
-#include <boost/bind/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
 #include <boost/bind/mem_fn.hpp>
-#include <boost/type.hpp>
-#include <boost/is_placeholder.hpp>
 #include <boost/bind/arg.hpp>
-#include <boost/bind/detail/result_traits.hpp>
 #include <boost/bind/std_placeholders.hpp>
-#include <boost/config/workaround.hpp>
+#include <boost/bind/detail/result_traits.hpp>
+#include <boost/bind/detail/tuple_for_each.hpp>
+#include <boost/bind/detail/integer_sequence.hpp>
 #include <boost/visit_each.hpp>
+#include <boost/is_placeholder.hpp>
+#include <boost/type.hpp>
 #include <boost/core/ref.hpp>
-#include <boost/core/enable_if.hpp>
-#include <boost/bind/detail/is_same.hpp>
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-#include <utility> // std::forward
-#endif
-
-// Borland-specific bug, visit_each() silently fails to produce code
-
-#if defined(BOOST_BORLANDC)
-#  define BOOST_BIND_VISIT_EACH boost::visit_each
-#else
-#  define BOOST_BIND_VISIT_EACH visit_each
-#endif
-
-#include <boost/bind/storage.hpp>
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
+#include <utility>
+#include <type_traits>
+#include <tuple>
 
 #ifdef BOOST_MSVC
 # pragma warning(push)
@@ -64,22 +51,22 @@ namespace _bi // implementation details
 
 // ref_compare
 
-template<class T> bool ref_compare( T const & a, T const & b, long )
+template<class T> bool ref_compare( T const & a, T const & b )
 {
     return a == b;
 }
 
-template<int I> bool ref_compare( arg<I> const &, arg<I> const &, int )
+template<int I> bool ref_compare( arg<I> const &, arg<I> const & )
 {
     return true;
 }
 
-template<int I> bool ref_compare( arg<I> (*) (), arg<I> (*) (), int )
+template<int I> bool ref_compare( arg<I> (*) (), arg<I> (*) () )
 {
     return true;
 }
 
-template<class T> bool ref_compare( reference_wrapper<T> const & a, reference_wrapper<T> const & b, int )
+template<class T> bool ref_compare( reference_wrapper<T> const & a, reference_wrapper<T> const & b )
 {
     return a.get_pointer() == b.get_pointer();
 }
@@ -88,7 +75,7 @@ template<class T> bool ref_compare( reference_wrapper<T> const & a, reference_wr
 
 template<class R, class F, class L> class bind_t;
 
-template<class R, class F, class L> bool ref_compare( bind_t<R, F, L> const & a, bind_t<R, F, L> const & b, int )
+template<class R, class F, class L> bool ref_compare( bind_t<R, F, L> const & a, bind_t<R, F, L> const & b )
 {
     return a.compare( b );
 }
@@ -116,7 +103,7 @@ template<class T> class value
 
 // ref_compare for weak_ptr
 
-template<class T> bool ref_compare( value< weak_ptr<T> > const & a, value< weak_ptr<T> > const & b, int )
+template<class T> bool ref_compare( value< weak_ptr<T> > const & a, value< weak_ptr<T> > const & b )
 {
     return !(a.get() < b.get()) && !(b.get() < a.get());
 }
@@ -145,1409 +132,235 @@ template<class F> struct unwrapper
     }
 };
 
-// listN
+// list
 
-class list0
+template<class V> struct accept_lambda
 {
-public:
-
-    list0() {}
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A &, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)();
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A &, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)();
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A &, int)
-    {
-        unwrapper<F>::unwrap(f, 0)();
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A &, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)();
-    }
+    V& v_;
 
-    template<class V> void accept(V &) const
-    {
-    }
+    explicit accept_lambda( V& v ): v_( v ) {}
 
-    bool operator==(list0 const &) const
+    template<class A> void operator()( A& a ) const
     {
-        return true;
+        visit_each( v_, a, 0 );
     }
 };
 
-#ifdef BOOST_MSVC
-// MSVC is bright enough to realise that the parameter rhs 
-// in operator==may be unused for some template argument types:
-#pragma warning(push)
-#pragma warning(disable:4100)
-#endif
-
-template< class A1 > class list1: private storage1< A1 >
+struct equal_lambda
 {
-private:
-
-    typedef storage1< A1 > base_type;
-
-public:
-
-    explicit list1( A1 a1 ): base_type( a1 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_]);
-    }
+    bool result;
 
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_]);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
+    equal_lambda(): result( true ) {}
 
-    bool operator==(list1 const & rhs) const
+    template<class A1, class A2> void operator()( A1& a1, A2& a2 )
     {
-        return ref_compare(base_type::a1_, rhs.a1_, 0);
+        result = result && ref_compare( a1, a2 );
     }
 };
 
 struct logical_and;
 struct logical_or;
 
-template< class A1, class A2 > class list2: private storage2< A1, A2 >
-{
-private:
-
-    typedef storage2< A1, A2 > base_type;
-
-public:
-
-    list2( A1 a1, A2 a2 ): base_type( a1, a2 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_]);
-    }
-
-    template<class A> bool operator()( type<bool>, logical_and & /*f*/, A & a, int )
-    {
-        return a[ base_type::a1_ ] && a[ base_type::a2_ ];
-    }
-
-    template<class A> bool operator()( type<bool>, logical_and const & /*f*/, A & a, int ) const
-    {
-        return a[ base_type::a1_ ] && a[ base_type::a2_ ];
-    }
-
-    template<class A> bool operator()( type<bool>, logical_or & /*f*/, A & a, int )
-    {
-        return a[ base_type::a1_ ] || a[ base_type::a2_ ];
-    }
-
-    template<class A> bool operator()( type<bool>, logical_or const & /*f*/, A & a, int ) const
-    {
-        return a[ base_type::a1_ ] || a[ base_type::a2_ ];
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
-
-    bool operator==(list2 const & rhs) const
-    {
-        return ref_compare(base_type::a1_, rhs.a1_, 0) && ref_compare(base_type::a2_, rhs.a2_, 0);
-    }
-};
-
-template< class A1, class A2, class A3 > class list3: private storage3< A1, A2, A3 >
-{
-private:
-
-    typedef storage3< A1, A2, A3 > base_type;
-
-public:
-
-    list3( A1 a1, A2 a2, A3 a3 ): base_type( a1, a2, a3 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_]);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
-
-    bool operator==(list3 const & rhs) const
-    {
-        return
-            
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 );
-    }
-};
-
-template< class A1, class A2, class A3, class A4 > class list4: private storage4< A1, A2, A3, A4 >
-{
-private:
-
-    typedef storage4< A1, A2, A3, A4 > base_type;
-
-public:
-
-    list4( A1 a1, A2 a2, A3 a3, A4 a4 ): base_type( a1, a2, a3, a4 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4>) const { return base_type::a4_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_]);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
-
-    bool operator==(list4 const & rhs) const
-    {
-        return
-
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 ) &&
-            ref_compare( base_type::a4_, rhs.a4_, 0 );
-    }
-};
-
-template< class A1, class A2, class A3, class A4, class A5 > class list5: private storage5< A1, A2, A3, A4, A5 >
-{
-private:
-
-    typedef storage5< A1, A2, A3, A4, A5 > base_type;
-
-public:
-
-    list5( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5 ): base_type( a1, a2, a3, a4, a5 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4>) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5>) const { return base_type::a5_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5> (*) ()) const { return base_type::a5_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_]);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
-
-    bool operator==(list5 const & rhs) const
-    {
-        return
-
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 ) &&
-            ref_compare( base_type::a4_, rhs.a4_, 0 ) &&
-            ref_compare( base_type::a5_, rhs.a5_, 0 );
-    }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6> class list6: private storage6< A1, A2, A3, A4, A5, A6 >
+template<class... A> class list
 {
 private:
 
-    typedef storage6< A1, A2, A3, A4, A5, A6 > base_type;
+    typedef std::tuple<A...> data_type;
+    data_type data_;
 
 public:
 
-    list6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6 ): base_type( a1, a2, a3, a4, a5, a6 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4>) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5>) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6>) const { return base_type::a6_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5> (*) ()) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6> (*) ()) const { return base_type::a6_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_]);
-    }
+    list( A... a ): data_( a... ) {}
 
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_]);
-    }
+#if defined(BOOST_MSVC)
+# pragma warning( push )
+# pragma warning( disable: 4100 ) // unreferenced formal parameter 'a2'
+#endif
 
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
+    template<class R, class F, class A2, std::size_t... I> R call_impl( type<R>, F & f, A2 & a2, _bi::index_sequence<I...> )
     {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_]);
+        return unwrapper<F>::unwrap( f, 0 )( a2[ std::get<I>( data_ ) ]... );
     }
 
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
+    template<class R, class F, class A2, std::size_t... I> R call_impl( type<R>, F & f, A2 & a2, _bi::index_sequence<I...> ) const
     {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_]);
+        return unwrapper<F>::unwrap( f, 0 )( a2[ std::get<I>( data_ ) ]... );
     }
 
-    template<class V> void accept(V & v) const
+    template<class F, class A2, std::size_t... I> void call_impl( type<void>, F & f, A2 & a2, _bi::index_sequence<I...> )
     {
-        base_type::accept(v);
+        unwrapper<F>::unwrap( f, 0 )( a2[ std::get<I>( data_ ) ]... );
     }
 
-    bool operator==(list6 const & rhs) const
+    template<class F, class A2, std::size_t... I> void call_impl( type<void>, F & f, A2 & a2, _bi::index_sequence<I...> ) const
     {
-        return
-
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 ) &&
-            ref_compare( base_type::a4_, rhs.a4_, 0 ) &&
-            ref_compare( base_type::a5_, rhs.a5_, 0 ) &&
-            ref_compare( base_type::a6_, rhs.a6_, 0 );
+        unwrapper<F>::unwrap( f, 0 )( a2[ std::get<I>( data_ ) ]... );
     }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> class list7: private storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-private:
-
-    typedef storage7< A1, A2, A3, A4, A5, A6, A7 > base_type;
-
-public:
-
-    list7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7 ): base_type( a1, a2, a3, a4, a5, a6, a7 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4>) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5>) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6>) const { return base_type::a6_; }
-    A7 operator[] (boost::arg<7>) const { return base_type::a7_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5> (*) ()) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6> (*) ()) const { return base_type::a6_; }
-    A7 operator[] (boost::arg<7> (*) ()) const { return base_type::a7_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
 
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
+#if defined(BOOST_MSVC)
+# pragma warning( pop )
+#endif
 
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
+    //
 
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
+    template<class R, class F, class A2> R operator()( type<R>, F & f, A2 & a2 )
     {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_]);
+        return call_impl( type<R>(), f, a2, _bi::index_sequence_for<A...>() );
     }
 
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
+    template<class R, class F, class A2> R operator()( type<R>, F & f, A2 & a2 ) const
     {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_]);
+        return call_impl( type<R>(), f, a2, _bi::index_sequence_for<A...>() );
     }
 
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_]);
-    }
+    //
 
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
+    template<class A2> bool operator()( type<bool>, logical_and & /*f*/, A2 & a2 )
     {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_]);
+        static_assert( sizeof...(A) == 2, "operator&& must have two arguments" );
+        return a2[ std::get<0>( data_ ) ] && a2[ std::get<1>( data_ ) ];
     }
 
-    template<class V> void accept(V & v) const
+    template<class A2> bool operator()( type<bool>, logical_and const & /*f*/, A2 & a2 ) const
     {
-        base_type::accept(v);
+        static_assert( sizeof...(A) == 2, "operator&& must have two arguments" );
+        return a2[ std::get<0>( data_ ) ] && a2[ std::get<1>( data_ ) ];
     }
 
-    bool operator==(list7 const & rhs) const
+    template<class A2> bool operator()( type<bool>, logical_or & /*f*/, A2 & a2 )
     {
-        return
-
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 ) &&
-            ref_compare( base_type::a4_, rhs.a4_, 0 ) &&
-            ref_compare( base_type::a5_, rhs.a5_, 0 ) &&
-            ref_compare( base_type::a6_, rhs.a6_, 0 ) &&
-            ref_compare( base_type::a7_, rhs.a7_, 0 );
+        static_assert( sizeof...(A) == 2, "operator|| must have two arguments" );
+        return a2[ std::get<0>( data_ ) ] || a2[ std::get<1>( data_ ) ];
     }
-};
-
-template< class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > class list8: private storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-private:
-
-    typedef storage8< A1, A2, A3, A4, A5, A6, A7, A8 > base_type;
-
-public:
-
-    list8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8 ): base_type( a1, a2, a3, a4, a5, a6, a7, a8 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4>) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5>) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6>) const { return base_type::a6_; }
-    A7 operator[] (boost::arg<7>) const { return base_type::a7_; }
-    A8 operator[] (boost::arg<8>) const { return base_type::a8_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5> (*) ()) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6> (*) ()) const { return base_type::a6_; }
-    A7 operator[] (boost::arg<7> (*) ()) const { return base_type::a7_; }
-    A8 operator[] (boost::arg<8> (*) ()) const { return base_type::a8_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_]);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
-
-    bool operator==(list8 const & rhs) const
-    {
-        return
-            
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 ) &&
-            ref_compare( base_type::a4_, rhs.a4_, 0 ) &&
-            ref_compare( base_type::a5_, rhs.a5_, 0 ) &&
-            ref_compare( base_type::a6_, rhs.a6_, 0 ) &&
-            ref_compare( base_type::a7_, rhs.a7_, 0 ) &&
-            ref_compare( base_type::a8_, rhs.a8_, 0 );
-    }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> class list9: private storage9< A1, A2, A3, A4, A5, A6, A7, A8, A9 >
-{
-private:
-
-    typedef storage9< A1, A2, A3, A4, A5, A6, A7, A8, A9 > base_type;
-
-public:
-
-    list9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9 ): base_type( a1, a2, a3, a4, a5, a6, a7, a8, a9 ) {}
-
-    A1 operator[] (boost::arg<1>) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2>) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3>) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4>) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5>) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6>) const { return base_type::a6_; }
-    A7 operator[] (boost::arg<7>) const { return base_type::a7_; }
-    A8 operator[] (boost::arg<8>) const { return base_type::a8_; }
-    A9 operator[] (boost::arg<9>) const { return base_type::a9_; }
-
-    A1 operator[] (boost::arg<1> (*) ()) const { return base_type::a1_; }
-    A2 operator[] (boost::arg<2> (*) ()) const { return base_type::a2_; }
-    A3 operator[] (boost::arg<3> (*) ()) const { return base_type::a3_; }
-    A4 operator[] (boost::arg<4> (*) ()) const { return base_type::a4_; }
-    A5 operator[] (boost::arg<5> (*) ()) const { return base_type::a5_; }
-    A6 operator[] (boost::arg<6> (*) ()) const { return base_type::a6_; }
-    A7 operator[] (boost::arg<7> (*) ()) const { return base_type::a7_; }
-    A8 operator[] (boost::arg<8> (*) ()) const { return base_type::a8_; }
-    A9 operator[] (boost::arg<9> (*) ()) const { return base_type::a9_; }
-
-    template<class T> T & operator[] (_bi::value<T> & v) const { return v.get(); }
-
-    template<class T> T const & operator[] (_bi::value<T> const & v) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const { return b.eval(*this); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const { return b.eval(*this); }
-
-    template<class R, class F, class A> R operator()(type<R>, F & f, A & a, long)
-    {
-        return unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_], a[base_type::a9_]);
-    }
-
-    template<class R, class F, class A> R operator()(type<R>, F const & f, A & a, long) const
-    {
-        return unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_], a[base_type::a9_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F & f, A & a, int)
-    {
-        unwrapper<F>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_], a[base_type::a9_]);
-    }
-
-    template<class F, class A> void operator()(type<void>, F const & f, A & a, int) const
-    {
-        unwrapper<F const>::unwrap(f, 0)(a[base_type::a1_], a[base_type::a2_], a[base_type::a3_], a[base_type::a4_], a[base_type::a5_], a[base_type::a6_], a[base_type::a7_], a[base_type::a8_], a[base_type::a9_]);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-        base_type::accept(v);
-    }
-
-    bool operator==(list9 const & rhs) const
-    {
-        return
-
-            ref_compare( base_type::a1_, rhs.a1_, 0 ) &&
-            ref_compare( base_type::a2_, rhs.a2_, 0 ) &&
-            ref_compare( base_type::a3_, rhs.a3_, 0 ) &&
-            ref_compare( base_type::a4_, rhs.a4_, 0 ) &&
-            ref_compare( base_type::a5_, rhs.a5_, 0 ) &&
-            ref_compare( base_type::a6_, rhs.a6_, 0 ) &&
-            ref_compare( base_type::a7_, rhs.a7_, 0 ) &&
-            ref_compare( base_type::a8_, rhs.a8_, 0 ) &&
-            ref_compare( base_type::a9_, rhs.a9_, 0 );
-    }
-};
-
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
-// bind_t
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !(defined(BOOST_GCC) && BOOST_GCC < 40600)
-
-template< class A1 > class rrlist1
-{
-private:
-
-    A1 & a1_; // not A1&& because of msvc-10.0
-
-public:
-
-    explicit rrlist1( A1 & a1 ): a1_( a1 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); } // not static_cast because of g++ 4.9
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist1<A1&> a( a1_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist1<A1&> a( a1_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2 > class rrlist2
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-
-public:
-
-    rrlist2( A1 & a1, A2 & a2 ): a1_( a1 ), a2_( a2 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist2<A1&, A2&> a( a1_, a2_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist2<A1&, A2&> a( a1_, a2_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3 > class rrlist3
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-
-public:
-
-    rrlist3( A1 & a1, A2 & a2, A3 & a3 ): a1_( a1 ), a2_( a2 ), a3_( a3 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist3<A1&, A2&, A3&> a( a1_, a2_, a3_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist3<A1&, A2&, A3&> a( a1_, a2_, a3_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3, class A4 > class rrlist4
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-    A4 & a4_;
-
-public:
-
-    rrlist4( A1 & a1, A2 & a2, A3 & a3, A4 & a4 ): a1_( a1 ), a2_( a2 ), a3_( a3 ), a4_( a4 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4>) const { return std::forward<A4>( a4_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4> (*) ()) const { return std::forward<A4>( a4_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist4<A1&, A2&, A3&, A4&> a( a1_, a2_, a3_, a4_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist4<A1&, A2&, A3&, A4&> a( a1_, a2_, a3_, a4_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3, class A4, class A5 > class rrlist5
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-    A4 & a4_;
-    A5 & a5_;
-
-public:
-
-    rrlist5( A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5 ): a1_( a1 ), a2_( a2 ), a3_( a3 ), a4_( a4 ), a5_( a5 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4>) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5>) const { return std::forward<A5>( a5_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4> (*) ()) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5> (*) ()) const { return std::forward<A5>( a5_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist5<A1&, A2&, A3&, A4&, A5&> a( a1_, a2_, a3_, a4_, a5_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist5<A1&, A2&, A3&, A4&, A5&> a( a1_, a2_, a3_, a4_, a5_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3, class A4, class A5, class A6 > class rrlist6
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-    A4 & a4_;
-    A5 & a5_;
-    A6 & a6_;
-
-public:
-
-    rrlist6( A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6 ): a1_( a1 ), a2_( a2 ), a3_( a3 ), a4_( a4 ), a5_( a5 ), a6_( a6 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4>) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5>) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6>) const { return std::forward<A6>( a6_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4> (*) ()) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5> (*) ()) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6> (*) ()) const { return std::forward<A6>( a6_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist6<A1&, A2&, A3&, A4&, A5&, A6&> a( a1_, a2_, a3_, a4_, a5_, a6_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist6<A1&, A2&, A3&, A4&, A5&, A6&> a( a1_, a2_, a3_, a4_, a5_, a6_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3, class A4, class A5, class A6, class A7 > class rrlist7
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-    A4 & a4_;
-    A5 & a5_;
-    A6 & a6_;
-    A7 & a7_;
-
-public:
-
-    rrlist7( A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7 ): a1_( a1 ), a2_( a2 ), a3_( a3 ), a4_( a4 ), a5_( a5 ), a6_( a6 ), a7_( a7 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4>) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5>) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6>) const { return std::forward<A6>( a6_ ); }
-    A7 && operator[] (boost::arg<7>) const { return std::forward<A7>( a7_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4> (*) ()) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5> (*) ()) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6> (*) ()) const { return std::forward<A6>( a6_ ); }
-    A7 && operator[] (boost::arg<7> (*) ()) const { return std::forward<A7>( a7_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist7<A1&, A2&, A3&, A4&, A5&, A6&, A7&> a( a1_, a2_, a3_, a4_, a5_, a6_, a7_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist7<A1&, A2&, A3&, A4&, A5&, A6&, A7&> a( a1_, a2_, a3_, a4_, a5_, a6_, a7_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > class rrlist8
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-    A4 & a4_;
-    A5 & a5_;
-    A6 & a6_;
-    A7 & a7_;
-    A8 & a8_;
-
-public:
-
-    rrlist8( A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8 ): a1_( a1 ), a2_( a2 ), a3_( a3 ), a4_( a4 ), a5_( a5 ), a6_( a6 ), a7_( a7 ), a8_( a8 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4>) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5>) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6>) const { return std::forward<A6>( a6_ ); }
-    A7 && operator[] (boost::arg<7>) const { return std::forward<A7>( a7_ ); }
-    A8 && operator[] (boost::arg<8>) const { return std::forward<A8>( a8_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4> (*) ()) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5> (*) ()) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6> (*) ()) const { return std::forward<A6>( a6_ ); }
-    A7 && operator[] (boost::arg<7> (*) ()) const { return std::forward<A7>( a7_ ); }
-    A8 && operator[] (boost::arg<8> (*) ()) const { return std::forward<A8>( a8_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist8<A1&, A2&, A3&, A4&, A5&, A6&, A7&, A8&> a( a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist8<A1&, A2&, A3&, A4&, A5&, A6&, A7&, A8&> a( a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_ );
-        return b.eval( a );
-    }
-};
-
-template< class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > class rrlist9
-{
-private:
-
-    A1 & a1_;
-    A2 & a2_;
-    A3 & a3_;
-    A4 & a4_;
-    A5 & a5_;
-    A6 & a6_;
-    A7 & a7_;
-    A8 & a8_;
-    A9 & a9_;
-
-public:
-
-    rrlist9( A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9 ): a1_( a1 ), a2_( a2 ), a3_( a3 ), a4_( a4 ), a5_( a5 ), a6_( a6 ), a7_( a7 ), a8_( a8 ), a9_( a9 ) {}
-
-    A1 && operator[] (boost::arg<1>) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2>) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3>) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4>) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5>) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6>) const { return std::forward<A6>( a6_ ); }
-    A7 && operator[] (boost::arg<7>) const { return std::forward<A7>( a7_ ); }
-    A8 && operator[] (boost::arg<8>) const { return std::forward<A8>( a8_ ); }
-    A9 && operator[] (boost::arg<9>) const { return std::forward<A9>( a9_ ); }
-
-    A1 && operator[] (boost::arg<1> (*) ()) const { return std::forward<A1>( a1_ ); }
-    A2 && operator[] (boost::arg<2> (*) ()) const { return std::forward<A2>( a2_ ); }
-    A3 && operator[] (boost::arg<3> (*) ()) const { return std::forward<A3>( a3_ ); }
-    A4 && operator[] (boost::arg<4> (*) ()) const { return std::forward<A4>( a4_ ); }
-    A5 && operator[] (boost::arg<5> (*) ()) const { return std::forward<A5>( a5_ ); }
-    A6 && operator[] (boost::arg<6> (*) ()) const { return std::forward<A6>( a6_ ); }
-    A7 && operator[] (boost::arg<7> (*) ()) const { return std::forward<A7>( a7_ ); }
-    A8 && operator[] (boost::arg<8> (*) ()) const { return std::forward<A8>( a8_ ); }
-    A9 && operator[] (boost::arg<9> (*) ()) const { return std::forward<A9>( a9_ ); }
-
-    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
-
-    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
-
-    template<class T> T & operator[] (reference_wrapper<T> const & v) const { return v.get(); }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> & b) const
-    {
-        rrlist9<A1&, A2&, A3&, A4&, A5&, A6&, A7&, A8&, A9&> a( a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_ );
-        return b.eval( a );
-    }
-
-    template<class R, class F, class L> typename result_traits<R, F>::type operator[] (bind_t<R, F, L> const & b) const
-    {
-        rrlist9<A1&, A2&, A3&, A4&, A5&, A6&, A7&, A8&, A9&> a( a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_ );
-        return b.eval( a );
-    }
-};
-
-template<class R, class F, class L> class bind_t
-{
-private:
-
-    F f_;
-    L l_;
-
-public:
-
-    typedef typename result_traits<R, F>::type result_type;
-    typedef bind_t this_type;
-
-    bind_t( F f, L const & l ): f_( f ), l_( l ) {}
-
-    //
-
-    result_type operator()()
-    {
-        list0 a;
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    result_type operator()() const
-    {
-        list0 a;
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1> result_type operator()( A1 && a1 )
-    {
-        rrlist1< A1 > a( a1 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1> result_type operator()( A1 && a1 ) const
-    {
-        rrlist1< A1 > a( a1 );
-        return l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()( A1 && a1, A2 && a2 )
-    {
-        rrlist2< A1, A2 > a( a1, a2 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2> result_type operator()( A1 && a1, A2 && a2 ) const
-    {
-        rrlist2< A1, A2 > a( a1, a2 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3> result_type operator()( A1 && a1, A2 && a2, A3 && a3 )
-    {
-        rrlist3< A1, A2, A3 > a( a1, a2, a3 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3> result_type operator()( A1 && a1, A2 && a2, A3 && a3 ) const
-    {
-        rrlist3< A1, A2, A3 > a( a1, a2, a3 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4 )
-    {
-        rrlist4< A1, A2, A3, A4 > a( a1, a2, a3, a4 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4 ) const
-    {
-        rrlist4< A1, A2, A3, A4 > a( a1, a2, a3, a4 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5 )
-    {
-        rrlist5< A1, A2, A3, A4, A5 > a( a1, a2, a3, a4, a5 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5 ) const
-    {
-        rrlist5< A1, A2, A3, A4, A5 > a( a1, a2, a3, a4, a5 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6 )
-    {
-        rrlist6< A1, A2, A3, A4, A5, A6 > a( a1, a2, a3, a4, a5, a6 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6 ) const
-    {
-        rrlist6< A1, A2, A3, A4, A5, A6 > a( a1, a2, a3, a4, a5, a6 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7 )
-    {
-        rrlist7< A1, A2, A3, A4, A5, A6, A7 > a( a1, a2, a3, a4, a5, a6, a7 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7 ) const
-    {
-        rrlist7< A1, A2, A3, A4, A5, A6, A7 > a( a1, a2, a3, a4, a5, a6, a7 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8 )
-    {
-        rrlist8< A1, A2, A3, A4, A5, A6, A7, A8 > a( a1, a2, a3, a4, a5, a6, a7, a8 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8 ) const
-    {
-        rrlist8< A1, A2, A3, A4, A5, A6, A7, A8 > a( a1, a2, a3, a4, a5, a6, a7, a8 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8, A9 && a9 )
-    {
-        rrlist9< A1, A2, A3, A4, A5, A6, A7, A8, A9 > a( a1, a2, a3, a4, a5, a6, a7, a8, a9 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()( A1 && a1, A2 && a2, A3 && a3, A4 && a4, A5 && a5, A6 && a6, A7 && a7, A8 && a8, A9 && a9 ) const
-    {
-        rrlist9< A1, A2, A3, A4, A5, A6, A7, A8, A9 > a( a1, a2, a3, a4, a5, a6, a7, a8, a9 );
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    //
-
-    template<class A> result_type eval( A & a )
-    {
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class A> result_type eval( A & a ) const
-    {
-        return l_( type<result_type>(), f_, a, 0 );
-    }
-
-    template<class V> void accept( V & v ) const
-    {
-#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( BOOST_BORLANDC )
-        using boost::visit_each;
-#endif
-
-        BOOST_BIND_VISIT_EACH( v, f_, 0 );
-        l_.accept( v );
-    }
-
-    bool compare( this_type const & rhs ) const
-    {
-        return ref_compare( f_, rhs.f_, 0 ) && l_ == rhs.l_;
-    }
-};
-
-#elif !defined( BOOST_NO_VOID_RETURNS )
-
-template<class R, class F, class L> class bind_t
-{
-public:
-
-    typedef bind_t this_type;
-
-    bind_t(F f, L const & l): f_(f), l_(l) {}
-
-#define BOOST_BIND_RETURN return
-#include <boost/bind/bind_template.hpp>
-#undef BOOST_BIND_RETURN
-
-};
-
-#else // no void returns
-
-template<class R> struct bind_t_generator
-{
-
-template<class F, class L> class implementation
-{
-public:
-
-    typedef implementation this_type;
 
-    implementation(F f, L const & l): f_(f), l_(l) {}
+    template<class A2> bool operator()( type<bool>, logical_or const & /*f*/, A2 & a2 ) const
+    {
+        static_assert( sizeof...(A) == 2, "operator|| must have two arguments" );
+        return a2[ std::get<0>( data_ ) ] || a2[ std::get<1>( data_ ) ];
+    }
 
-#define BOOST_BIND_RETURN return
-#include <boost/bind/bind_template.hpp>
-#undef BOOST_BIND_RETURN
+    //
 
-};
+    template<class V> void accept( V & v ) const
+    {
+        _bi::tuple_for_each( accept_lambda<V>( v ), data_ );
+    }
 
+    bool operator==( list const & rhs ) const
+    {
+        return _bi::tuple_for_each( equal_lambda(), data_, rhs.data_ ).result;
+    }
 };
 
-template<> struct bind_t_generator<void>
-{
+// bind_t
 
-template<class F, class L> class implementation
+template<class... A> class rrlist
 {
 private:
 
-    typedef void R;
+    using args_type = std::tuple<A...>;
+
+    using data_type = std::tuple<A&...>;
+    data_type data_;
+
+    template<class...> friend class rrlist;
 
 public:
 
-    typedef implementation this_type;
+    explicit rrlist( A&... a ): data_( a... ) {}
+    template<class... B> explicit rrlist( rrlist<B...> const& r ): data_( r.data_ ) {}
 
-    implementation(F f, L const & l): f_(f), l_(l) {}
+    template<int I> typename std::tuple_element<I-1, args_type>::type&& operator[] ( boost::arg<I> ) const
+    {
+        return std::forward<typename std::tuple_element<I-1, args_type>::type>( std::get<I-1>( data_ ) );
+    }
 
-#define BOOST_BIND_RETURN
-#include <boost/bind/bind_template.hpp>
-#undef BOOST_BIND_RETURN
+    template<int I> typename std::tuple_element<I-1, args_type>::type&& operator[] ( boost::arg<I>(*)() ) const
+    {
+        return std::forward<typename std::tuple_element<I-1, args_type>::type>( std::get<I-1>( data_ ) );
+    }
 
-};
+    template<class T> T & operator[] ( _bi::value<T> & v ) const { return v.get(); }
 
-};
+    template<class T> T const & operator[] ( _bi::value<T> const & v ) const { return v.get(); }
 
-template<class R2, class F, class L> class bind_t: public bind_t_generator<R2>::BOOST_NESTED_TEMPLATE implementation<F, L>
-{
-public:
+    template<class T> T & operator[] ( reference_wrapper<T> const & v ) const { return v.get(); }
 
-    bind_t(F f, L const & l): bind_t_generator<R2>::BOOST_NESTED_TEMPLATE implementation<F, L>(f, l) {}
+    template<class R, class F, class L> typename result_traits<R, F>::type operator[] ( bind_t<R, F, L> & b ) const
+    {
+        rrlist<A&...> a2( *this );
+        return b.eval( a2 );
+    }
 
+    template<class R, class F, class L> typename result_traits<R, F>::type operator[] ( bind_t<R, F, L> const & b ) const
+    {
+        rrlist<A&...> a2( *this );
+        return b.eval( a2 );
+    }
 };
 
-#endif
-
-// function_equal
+template<class R, class F, class L> class bind_t
+{
+private:
 
-#ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+    F f_;
+    L l_;
 
-// put overloads in _bi, rely on ADL
+public:
 
-# ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+    typedef typename result_traits<R, F>::type result_type;
+    typedef bind_t this_type;
 
-template<class R, class F, class L> bool function_equal( bind_t<R, F, L> const & a, bind_t<R, F, L> const & b )
-{
-    return a.compare(b);
-}
+    bind_t( F f, L const & l ): f_( std::move(f) ), l_( l ) {}
 
-# else
+    //
 
-template<class R, class F, class L> bool function_equal_impl( bind_t<R, F, L> const & a, bind_t<R, F, L> const & b, int )
-{
-    return a.compare(b);
-}
+    template<class... A> result_type operator()( A&&... a )
+    {
+        rrlist<A...> a2( a... );
+        return l_( type<result_type>(), f_, a2 );
+    }
 
-# endif // #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+    template<class... A> result_type operator()( A&&... a ) const
+    {
+        rrlist<A...> a2( a... );
+        return l_( type<result_type>(), f_, a2 );
+    }
 
-#else // BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+    //
 
-// put overloads in boost
+    template<class A> result_type eval( A & a )
+    {
+        return l_( type<result_type>(), f_, a );
+    }
 
-} // namespace _bi
+    template<class A> result_type eval( A & a ) const
+    {
+        return l_( type<result_type>(), f_, a );
+    }
 
-# ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+    template<class V> void accept( V & v ) const
+    {
+        using boost::visit_each;
+        visit_each( v, f_, 0 );
+        l_.accept( v );
+    }
 
-template<class R, class F, class L> bool function_equal( _bi::bind_t<R, F, L> const & a, _bi::bind_t<R, F, L> const & b )
-{
-    return a.compare(b);
-}
+    bool compare( this_type const & rhs ) const
+    {
+        return ref_compare( f_, rhs.f_ ) && l_ == rhs.l_;
+    }
+};
 
-# else
+// function_equal
 
-template<class R, class F, class L> bool function_equal_impl( _bi::bind_t<R, F, L> const & a, _bi::bind_t<R, F, L> const & b, int )
+template<class R, class F, class L> bool function_equal( bind_t<R, F, L> const & a, bind_t<R, F, L> const & b )
 {
     return a.compare(b);
 }
 
-# endif // #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-
-namespace _bi
-{
-
-#endif // BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-
 // add_value
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || (__SUNPRO_CC >= 0x530)
-
-#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x582) )
-
-template<class T> struct add_value
-{
-    typedef _bi::value<T> type;
-};
-
-#else
-
 template< class T, int I > struct add_value_2
 {
     typedef boost::arg<I> type;
@@ -1563,8 +376,6 @@ template<class T> struct add_value
     typedef typename add_value_2< T, boost::is_placeholder< T >::value >::type type;
 };
 
-#endif
-
 template<class T> struct add_value< value<T> >
 {
     typedef _bi::value<T> type;
@@ -1590,135 +401,11 @@ template<class R, class F, class L> struct add_value< bind_t<R, F, L> >
     typedef bind_t<R, F, L> type;
 };
 
-#else
-
-template<int I> struct _avt_0;
-
-template<> struct _avt_0<1>
-{
-    template<class T> struct inner
-    {
-        typedef T type;
-    };
-};
-
-template<> struct _avt_0<2>
-{
-    template<class T> struct inner
-    {
-        typedef value<T> type;
-    };
-};
-
-typedef char (&_avt_r1) [1];
-typedef char (&_avt_r2) [2];
-
-template<class T> _avt_r1 _avt_f(value<T>);
-template<class T> _avt_r1 _avt_f(reference_wrapper<T>);
-template<int I> _avt_r1 _avt_f(arg<I>);
-template<int I> _avt_r1 _avt_f(arg<I> (*) ());
-template<class R, class F, class L> _avt_r1 _avt_f(bind_t<R, F, L>);
-
-_avt_r2 _avt_f(...);
-
-template<class T> struct add_value
-{
-    static T t();
-    typedef typename _avt_0<sizeof(_avt_f(t()))>::template inner<T>::type type;
-};
-
-#endif
-
-// list_av_N
-
-template<class A1> struct list_av_1
-{
-    typedef typename add_value<A1>::type B1;
-    typedef list1<B1> type;
-};
-
-template<class A1, class A2> struct list_av_2
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef list2<B1, B2> type;
-};
-
-template<class A1, class A2, class A3> struct list_av_3
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef list3<B1, B2, B3> type;
-};
-
-template<class A1, class A2, class A3, class A4> struct list_av_4
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef typename add_value<A4>::type B4;
-    typedef list4<B1, B2, B3, B4> type;
-};
-
-template<class A1, class A2, class A3, class A4, class A5> struct list_av_5
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef typename add_value<A4>::type B4;
-    typedef typename add_value<A5>::type B5;
-    typedef list5<B1, B2, B3, B4, B5> type;
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6> struct list_av_6
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef typename add_value<A4>::type B4;
-    typedef typename add_value<A5>::type B5;
-    typedef typename add_value<A6>::type B6;
-    typedef list6<B1, B2, B3, B4, B5, B6> type;
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> struct list_av_7
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef typename add_value<A4>::type B4;
-    typedef typename add_value<A5>::type B5;
-    typedef typename add_value<A6>::type B6;
-    typedef typename add_value<A7>::type B7;
-    typedef list7<B1, B2, B3, B4, B5, B6, B7> type;
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> struct list_av_8
-{
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef typename add_value<A4>::type B4;
-    typedef typename add_value<A5>::type B5;
-    typedef typename add_value<A6>::type B6;
-    typedef typename add_value<A7>::type B7;
-    typedef typename add_value<A8>::type B8;
-    typedef list8<B1, B2, B3, B4, B5, B6, B7, B8> type;
-};
+// list_av
 
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> struct list_av_9
+template<class... A> struct list_av
 {
-    typedef typename add_value<A1>::type B1;
-    typedef typename add_value<A2>::type B2;
-    typedef typename add_value<A3>::type B3;
-    typedef typename add_value<A4>::type B4;
-    typedef typename add_value<A5>::type B5;
-    typedef typename add_value<A6>::type B6;
-    typedef typename add_value<A7>::type B7;
-    typedef typename add_value<A8>::type B8;
-    typedef typename add_value<A9>::type B9;
-    typedef list9<B1, B2, B3, B4, B5, B6, B7, B8, B9> type;
+    typedef list< typename add_value<A>::type... > type;
 };
 
 // operator!
@@ -1729,10 +416,10 @@ struct logical_not
 };
 
 template<class R, class F, class L>
-    bind_t< bool, logical_not, list1< bind_t<R, F, L> > >
+    bind_t< bool, logical_not, list< bind_t<R, F, L> > >
     operator! (bind_t<R, F, L> const & f)
 {
-    typedef list1< bind_t<R, F, L> > list_type;
+    typedef list< bind_t<R, F, L> > list_type;
     return bind_t<bool, logical_not, list_type> ( logical_not(), list_type(f) );
 }
 
@@ -1746,11 +433,11 @@ struct name \
 }; \
  \
 template<class R, class F, class L, class A2> \
-    bind_t< bool, name, list2< bind_t<R, F, L>, typename add_value<A2>::type > > \
+    bind_t< bool, name, list< bind_t<R, F, L>, typename add_value<A2>::type > > \
     operator op (bind_t<R, F, L> const & f, A2 a2) \
 { \
     typedef typename add_value<A2>::type B2; \
-    typedef list2< bind_t<R, F, L>, B2> list_type; \
+    typedef list< bind_t<R, F, L>, B2> list_type; \
     return bind_t<bool, name, list_type> ( name(), list_type(f, a2) ); \
 }
 
@@ -1768,36 +455,12 @@ BOOST_BIND_OPERATOR( ||, logical_or )
 
 #undef BOOST_BIND_OPERATOR
 
-#if defined(__GNUC__) && BOOST_WORKAROUND(__GNUC__, < 3)
-
-// resolve ambiguity with rel_ops
-
-#define BOOST_BIND_OPERATOR( op, name ) \
-\
-template<class R, class F, class L> \
-    bind_t< bool, name, list2< bind_t<R, F, L>, bind_t<R, F, L> > > \
-    operator op (bind_t<R, F, L> const & f, bind_t<R, F, L> const & g) \
-{ \
-    typedef list2< bind_t<R, F, L>, bind_t<R, F, L> > list_type; \
-    return bind_t<bool, name, list_type> ( name(), list_type(f, g) ); \
-}
-
-BOOST_BIND_OPERATOR( !=, not_equal )
-BOOST_BIND_OPERATOR( <=, less_equal )
-BOOST_BIND_OPERATOR( >, greater )
-BOOST_BIND_OPERATOR( >=, greater_equal )
-
-#endif
-
-// visit_each, ADL
-
-#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( BOOST_BORLANDC ) \
-   && !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
+// visit_each
 
 template<class V, class T> void visit_each( V & v, value<T> const & t, int )
 {
     using boost::visit_each;
-    BOOST_BIND_VISIT_EACH( v, t.get(), 0 );
+    visit_each( v, t.get(), 0 );
 }
 
 template<class V, class R, class F, class L> void visit_each( V & v, bind_t<R, F, L> const & t, int )
@@ -1805,27 +468,8 @@ template<class V, class R, class F, class L> void visit_each( V & v, bind_t<R, F
     t.accept( v );
 }
 
-#endif
-
 } // namespace _bi
 
-// visit_each, no ADL
-
-#if defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) || defined( BOOST_BORLANDC ) \
-  || (defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
-
-template<class V, class T> void visit_each( V & v, _bi::value<T> const & t, int )
-{
-    BOOST_BIND_VISIT_EACH( v, t.get(), 0 );
-}
-
-template<class V, class R, class F, class L> void visit_each( V & v, _bi::bind_t<R, F, L> const & t, int )
-{
-    t.accept( v );
-}
-
-#endif
-
 // is_bind_expression
 
 template< class T > struct is_bind_expression
@@ -1833,15 +477,11 @@ template< class T > struct is_bind_expression
     enum _vt { value = 0 };
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class R, class F, class L > struct is_bind_expression< _bi::bind_t< R, F, L > >
 {
     enum _vt { value = 1 };
 };
 
-#endif
-
 // bind
 
 #ifndef BOOST_BIND
@@ -1850,266 +490,135 @@ template< class R, class F, class L > struct is_bind_expression< _bi::bind_t< R,
 
 // generic function objects
 
-template<class R, class F>
-    _bi::bind_t<R, F, _bi::list0>
-    BOOST_BIND(F f)
-{
-    typedef _bi::list0 list_type;
-    return _bi::bind_t<R, F, list_type> (f, list_type());
-}
-
-template<class R, class F, class A1>
-    _bi::bind_t<R, F, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(F f, A1 a1)
-{
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R, F, list_type> (f, list_type(a1));
-}
-
-template<class R, class F, class A1, class A2>
-    _bi::bind_t<R, F, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2)
-{
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<R, F, list_type> (f, list_type(a1, a2));
-}
-
-template<class R, class F, class A1, class A2, class A3>
-    _bi::bind_t<R, F, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3)
-{
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3));
-}
-
-template<class R, class F, class A1, class A2, class A3, class A4>
-    _bi::bind_t<R, F, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4));
-}
-
-template<class R, class F, class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<R, F, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5));
-}
-
-template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<R, F, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6));
-}
-
-template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<R, F, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7));
-}
+#if !BOOST_WORKAROUND(__GNUC__, < 6)
 
-template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<R, F, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+template<class R, class F, class... A>
+    _bi::bind_t<R, F, typename _bi::list_av<A...>::type>
+    BOOST_BIND( F f, A... a )
 {
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8));
+    typedef typename _bi::list_av<A...>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a... ) );
 }
 
-template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<R, F, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
+#else
 
-// generic function objects, alternative syntax
+// g++ 4.x (and some 5.x) consider boost::bind<void>( &X::f )
+// ambiguous if the variadic form above is used
 
 template<class R, class F>
-    _bi::bind_t<R, F, _bi::list0>
-    BOOST_BIND(boost::type<R>, F f)
+    _bi::bind_t<R, F, typename _bi::list_av<>::type>
+    BOOST_BIND( F f )
 {
-    typedef _bi::list0 list_type;
-    return _bi::bind_t<R, F, list_type> (f, list_type());
+    typedef typename _bi::list_av<>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type() );
 }
 
 template<class R, class F, class A1>
-    _bi::bind_t<R, F, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1)
+    _bi::bind_t<R, F, typename _bi::list_av<A1>::type>
+    BOOST_BIND( F f, A1 a1 )
 {
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R, F, list_type> (f, list_type(a1));
+    typedef typename _bi::list_av<A1>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1 ) );
 }
 
 template<class R, class F, class A1, class A2>
-    _bi::bind_t<R, F, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2 )
 {
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<R, F, list_type> (f, list_type(a1, a2));
+    typedef typename _bi::list_av<A1, A2>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3>
-    _bi::bind_t<R, F, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3 )
 {
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3));
+    typedef typename _bi::list_av<A1, A2, A3>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3, class A4>
-    _bi::bind_t<R, F, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3, A4 a4)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3, A4>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3, A4 a4 )
 {
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4));
+    typedef typename _bi::list_av<A1, A2, A3, A4>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3, a4 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<R, F, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3, A4, A5>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5 )
 {
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5));
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3, a4, a5 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<R, F, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3, A4, A5, A6>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6 )
 {
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6));
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3, a4, a5, a6 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<R, F, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7 )
 {
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7));
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3, a4, a5, a6, a7 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<R, F, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8 )
 {
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8));
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3, a4, a5, a6, a7, a8 ) );
 }
 
 template<class R, class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<R, F, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(boost::type<R>, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
-
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-
-// adaptable function objects
-
-template<class F>
-    _bi::bind_t<_bi::unspecified, F, _bi::list0>
-    BOOST_BIND(F f)
-{
-    typedef _bi::list0 list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type> (f, list_type());
-}
-
-template<class F, class A1>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(F f, A1 a1)
-{
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type> (f, list_type(a1));
-}
-
-template<class F, class A1, class A2>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2)
-{
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type> (f, list_type(a1, a2));
-}
-
-template<class F, class A1, class A2, class A3>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3)
-{
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3));
-}
-
-template<class F, class A1, class A2, class A3, class A4>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4)
+    _bi::bind_t<R, F, typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
+    BOOST_BIND( F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9 )
 {
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4));
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a1, a2, a3, a4, a5, a6, a7, a8, a9 ) );
 }
 
-template<class F, class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5));
-}
+#endif
 
-template<class F, class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6));
-}
+// generic function objects, alternative syntax
 
-template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+template<class R, class F, class... A>
+    _bi::bind_t<R, F, typename _bi::list_av<A...>::type>
+    BOOST_BIND( boost::type<R>, F f, A... a )
 {
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7));
+    typedef typename _bi::list_av<A...>::type list_type;
+    return _bi::bind_t<R, F, list_type>( std::move(f), list_type( a... ) );
 }
 
-template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
+// adaptable function objects
 
-template<class F, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+template<class F, class... A>
+    _bi::bind_t<_bi::unspecified, F, typename _bi::list_av<A...>::type>
+    BOOST_BIND( F f, A... a )
 {
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
+    typedef typename _bi::list_av<A...>::type list_type;
+    return _bi::bind_t<_bi::unspecified, F, list_type>( std::move(f), list_type( a... ) );
 }
 
-#endif // !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-
 // function pointers
 
 #define BOOST_BIND_CC
 #define BOOST_BIND_ST
 #define BOOST_BIND_NOEXCEPT
 
-#include <boost/bind/bind_cc.hpp>
+#include <boost/bind/detail/bind_cc.hpp>
 
 # if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
 #   undef BOOST_BIND_NOEXCEPT
 #   define BOOST_BIND_NOEXCEPT noexcept
-#   include <boost/bind/bind_cc.hpp>
+#   include <boost/bind/detail/bind_cc.hpp>
 # endif
 
 #undef BOOST_BIND_CC
@@ -2122,7 +631,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_ST
 #define BOOST_BIND_NOEXCEPT
 
-#include <boost/bind/bind_cc.hpp>
+#include <boost/bind/detail/bind_cc.hpp>
 
 #undef BOOST_BIND_CC
 #undef BOOST_BIND_ST
@@ -2136,7 +645,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_ST
 #define BOOST_BIND_NOEXCEPT
 
-#include <boost/bind/bind_cc.hpp>
+#include <boost/bind/detail/bind_cc.hpp>
 
 #undef BOOST_BIND_CC
 #undef BOOST_BIND_ST
@@ -2150,7 +659,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_CC
 #define BOOST_BIND_NOEXCEPT
 
-#include <boost/bind/bind_cc.hpp>
+#include <boost/bind/detail/bind_cc.hpp>
 
 #undef BOOST_BIND_ST
 #undef BOOST_BIND_CC
@@ -2164,14 +673,14 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_MF_CC
 #define BOOST_BIND_MF_NOEXCEPT
 
-#include <boost/bind/bind_mf_cc.hpp>
-#include <boost/bind/bind_mf2_cc.hpp>
+#include <boost/bind/detail/bind_mf_cc.hpp>
+#include <boost/bind/detail/bind_mf2_cc.hpp>
 
 # if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
 #   undef BOOST_BIND_MF_NOEXCEPT
 #   define BOOST_BIND_MF_NOEXCEPT noexcept
-#   include <boost/bind/bind_mf_cc.hpp>
-#   include <boost/bind/bind_mf2_cc.hpp>
+#   include <boost/bind/detail/bind_mf_cc.hpp>
+#   include <boost/bind/detail/bind_mf2_cc.hpp>
 # endif
 
 #undef BOOST_BIND_MF_NAME
@@ -2184,8 +693,8 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_MF_CC __cdecl
 #define BOOST_BIND_MF_NOEXCEPT
 
-#include <boost/bind/bind_mf_cc.hpp>
-#include <boost/bind/bind_mf2_cc.hpp>
+#include <boost/bind/detail/bind_mf_cc.hpp>
+#include <boost/bind/detail/bind_mf2_cc.hpp>
 
 #undef BOOST_BIND_MF_NAME
 #undef BOOST_BIND_MF_CC
@@ -2199,8 +708,8 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_MF_CC __stdcall
 #define BOOST_BIND_MF_NOEXCEPT
 
-#include <boost/bind/bind_mf_cc.hpp>
-#include <boost/bind/bind_mf2_cc.hpp>
+#include <boost/bind/detail/bind_mf_cc.hpp>
+#include <boost/bind/detail/bind_mf2_cc.hpp>
 
 #undef BOOST_BIND_MF_NAME
 #undef BOOST_BIND_MF_CC
@@ -2214,8 +723,8 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #define BOOST_BIND_MF_CC __fastcall
 #define BOOST_BIND_MF_NOEXCEPT
 
-#include <boost/bind/bind_mf_cc.hpp>
-#include <boost/bind/bind_mf2_cc.hpp>
+#include <boost/bind/detail/bind_mf_cc.hpp>
+#include <boost/bind/detail/bind_mf2_cc.hpp>
 
 #undef BOOST_BIND_MF_NAME
 #undef BOOST_BIND_MF_CC
@@ -2225,65 +734,21 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 
 // data member pointers
 
-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
-    || ( defined(BOOST_BORLANDC) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) ) )
-
-template<class R, class T, class A1>
-_bi::bind_t< R, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >
-    BOOST_BIND(R T::*f, A1 a1)
-{
-    typedef _mfi::dm<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R, F, list_type>( F(f), list_type(a1) );
-}
-
-#else
-
 namespace _bi
 {
 
-template< class Pm, int I > struct add_cref;
+template<class M, int I> struct add_cref;
 
-template< class M, class T > struct add_cref< M T::*, 0 >
+template<class M> struct add_cref<M, 0>
 {
     typedef M type;
 };
 
-template< class M, class T > struct add_cref< M T::*, 1 >
-{
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable:4180)
-#endif
-    typedef M const & type;
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-};
-
-template< class R, class T > struct add_cref< R (T::*) (), 1 >
-{
-    typedef void type;
-};
-
-#if !defined(__IBMCPP__) || __IBMCPP_FUNC_CV_TMPL_ARG_DEDUCTION
-
-template< class R, class T > struct add_cref< R (T::*) () const, 1 >
-{
-    typedef void type;
-};
-
-#if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
-
-template< class R, class T > struct add_cref< R (T::*) () const noexcept, 1 >
+template<class M> struct add_cref<M, 1>
 {
-    typedef void type;
+    typedef M const& type;
 };
 
-#endif // __cpp_noexcept_function_type
-
-#endif // __IBMCPP__
-
 template<class R> struct isref
 {
     enum value_type { value = 0 };
@@ -2299,37 +764,39 @@ template<class R> struct isref< R* >
     enum value_type { value = 1 };
 };
 
-template<class Pm, class A1> struct dm_result
+template<class M, class A1, bool fn = std::is_function<M>::value> struct dm_result
+{
+};
+
+template<class M, class A1> struct dm_result<M, A1, false>
 {
-    typedef typename add_cref< Pm, 1 >::type type;
+    typedef typename add_cref< M, 1 >::type type;
 };
 
-template<class Pm, class R, class F, class L> struct dm_result< Pm, bind_t<R, F, L> >
+template<class M, class R, class F, class L> struct dm_result<M, bind_t<R, F, L>, false>
 {
     typedef typename bind_t<R, F, L>::result_type result_type;
-    typedef typename add_cref< Pm, isref< result_type >::value >::type type;
+    typedef typename add_cref< M, isref< result_type >::value >::type type;
 };
 
 } // namespace _bi
 
-template< class A1, class M, class T >
+template<class A1, class M, class T>
 
 _bi::bind_t<
-    typename _bi::dm_result< M T::*, A1 >::type,
+    typename _bi::dm_result<M, A1>::type,
     _mfi::dm<M, T>,
-    typename _bi::list_av_1<A1>::type
+    typename _bi::list_av<A1>::type
 >
 
 BOOST_BIND( M T::*f, A1 a1 )
 {
-    typedef typename _bi::dm_result< M T::*, A1 >::type result_type;
+    typedef typename _bi::dm_result<M, A1>::type result_type;
     typedef _mfi::dm<M, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
+    typedef typename _bi::list_av<A1>::type list_type;
     return _bi::bind_t< result_type, F, list_type >( F( f ), list_type( a1 ) );
 }
 
-#endif
-
 } // namespace boost
 
 #ifndef BOOST_BIND_NO_PLACEHOLDERS
diff --git a/inst/include/boost/bind/bind_mf2_cc.hpp b/inst/include/boost/bind/bind_mf2_cc.hpp
deleted file mode 100644
index be20b1d90..000000000
--- a/inst/include/boost/bind/bind_mf2_cc.hpp
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-//  bind/bind_mf2_cc.hpp - member functions, type<> syntax
-//
-//  Do not include this header directly.
-//
-//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2008 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-//
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
-//
-
-// 0
-
-template<class Rt2, class R, class T,
-    class A1>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf0)<R, T>, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) () BOOST_BIND_MF_NOEXCEPT, A1 a1)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf0)<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1));
-}
-
-template<class Rt2, class R, class T,
-    class A1>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf0)<R, T>, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) () const BOOST_BIND_MF_NOEXCEPT, A1 a1)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf0)<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1));
-}
-
-// 1
-
-template<class Rt2, class R, class T,
-    class B1,
-    class A1, class A2>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf1)<R, T, B1>, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf1)<R, T, B1> F;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2));
-}
-
-template<class Rt2, class R, class T,
-    class B1,
-    class A1, class A2>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf1)<R, T, B1>, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf1)<R, T, B1> F;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2));
-}
-
-// 2
-
-template<class Rt2, class R, class T,
-    class B1, class B2,
-    class A1, class A2, class A3>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf2)<R, T, B1, B2>, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf2)<R, T, B1, B2> F;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2,
-    class A1, class A2, class A3>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf2)<R, T, B1, B2>, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf2)<R, T, B1, B2> F;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3));
-}
-
-// 3
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3,
-    class A1, class A2, class A3, class A4>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf3)<R, T, B1, B2, B3>, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf3)<R, T, B1, B2, B3> F;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3,
-    class A1, class A2, class A3, class A4>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf3)<R, T, B1, B2, B3>, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf3)<R, T, B1, B2, B3> F;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4));
-}
-
-// 4
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4,
-    class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf4)<R, T, B1, B2, B3, B4>, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf4)<R, T, B1, B2, B3, B4> F;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4,
-    class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf4)<R, T, B1, B2, B3, B4>, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf4)<R, T, B1, B2, B3, B4> F;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5));
-}
-
-// 5
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5,
-    class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf5)<R, T, B1, B2, B3, B4, B5>, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf5)<R, T, B1, B2, B3, B4, B5> F;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5,
-    class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf5)<R, T, B1, B2, B3, B4, B5>, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf5)<R, T, B1, B2, B3, B4, B5> F;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6));
-}
-
-// 6
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf6)<R, T, B1, B2, B3, B4, B5, B6>, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf6)<R, T, B1, B2, B3, B4, B5, B6> F;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf6)<R, T, B1, B2, B3, B4, B5, B6>, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf6)<R, T, B1, B2, B3, B4, B5, B6> F;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7));
-}
-
-// 7
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf7)<R, T, B1, B2, B3, B4, B5, B6, B7>, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf7)<R, T, B1, B2, B3, B4, B5, B6, B7> F;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf7)<R, T, B1, B2, B3, B4, B5, B6, B7>, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf7)<R, T, B1, B2, B3, B4, B5, B6, B7> F;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
-// 8
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8>, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8> F;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8>, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8> F;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
diff --git a/inst/include/boost/bind/bind_mf_cc.hpp b/inst/include/boost/bind/bind_mf_cc.hpp
deleted file mode 100644
index 5a1610b42..000000000
--- a/inst/include/boost/bind/bind_mf_cc.hpp
+++ /dev/null
@@ -1,441 +0,0 @@
-//
-//  bind/bind_mf_cc.hpp - support for different calling conventions
-//
-//  Do not include this header directly.
-//
-//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
-//
-
-// 0
-
-template<class R, class T,
-    class A1>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf0)<R, T>, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () BOOST_BIND_MF_NOEXCEPT, A1 a1)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf0)<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1));
-}
-
-template<class R, class T,
-    class A1>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf0)<R, T>, typename _bi::list_av_1<A1>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () const BOOST_BIND_MF_NOEXCEPT, A1 a1)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf0)<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1));
-}
-
-template<class Rt2, class R, class T,
-    class A1>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf0)<R, T>, typename _bi::list_av_1<A1>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () BOOST_BIND_MF_NOEXCEPT, A1 a1)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf0)<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1));
-}
-
-template<class Rt2, class R, class T,
-    class A1>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf0)<R, T>, typename _bi::list_av_1<A1>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () const BOOST_BIND_MF_NOEXCEPT, A1 a1)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf0)<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1));
-}
-
-// 1
-
-template<class R, class T,
-    class B1,
-    class A1, class A2>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf1)<R, T, B1>, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf1)<R, T, B1> F;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2));
-}
-
-template<class R, class T,
-    class B1,
-    class A1, class A2>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf1)<R, T, B1>, typename _bi::list_av_2<A1, A2>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf1)<R, T, B1> F;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2));
-}
-
-template<class Rt2, class R, class T,
-    class B1,
-    class A1, class A2>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf1)<R, T, B1>, typename _bi::list_av_2<A1, A2>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf1)<R, T, B1> F;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2));
-}
-
-template<class Rt2, class R, class T,
-    class B1,
-    class A1, class A2>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf1)<R, T, B1>, typename _bi::list_av_2<A1, A2>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf1)<R, T, B1> F;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2));
-}
-
-// 2
-
-template<class R, class T,
-    class B1, class B2,
-    class A1, class A2, class A3>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf2)<R, T, B1, B2>, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf2)<R, T, B1, B2> F;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3));
-}
-
-template<class R, class T,
-    class B1, class B2,
-    class A1, class A2, class A3>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf2)<R, T, B1, B2>, typename _bi::list_av_3<A1, A2, A3>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf2)<R, T, B1, B2> F;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2,
-    class A1, class A2, class A3>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf2)<R, T, B1, B2>, typename _bi::list_av_3<A1, A2, A3>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf2)<R, T, B1, B2> F;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2,
-    class A1, class A2, class A3>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf2)<R, T, B1, B2>, typename _bi::list_av_3<A1, A2, A3>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf2)<R, T, B1, B2> F;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3));
-}
-
-// 3
-
-template<class R, class T,
-    class B1, class B2, class B3,
-    class A1, class A2, class A3, class A4>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf3)<R, T, B1, B2, B3>, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf3)<R, T, B1, B2, B3> F;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4));
-}
-
-template<class R, class T,
-    class B1, class B2, class B3,
-    class A1, class A2, class A3, class A4>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf3)<R, T, B1, B2, B3>, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf3)<R, T, B1, B2, B3> F;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3,
-    class A1, class A2, class A3, class A4>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf3)<R, T, B1, B2, B3>, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf3)<R, T, B1, B2, B3> F;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3,
-    class A1, class A2, class A3, class A4>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf3)<R, T, B1, B2, B3>, typename _bi::list_av_4<A1, A2, A3, A4>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf3)<R, T, B1, B2, B3> F;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4));
-}
-
-// 4
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4,
-    class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf4)<R, T, B1, B2, B3, B4>, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf4)<R, T, B1, B2, B3, B4> F;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5));
-}
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4,
-    class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf4)<R, T, B1, B2, B3, B4>, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf4)<R, T, B1, B2, B3, B4> F;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4,
-    class A1, class A2, class A3, class A4, class A5>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf4)<R, T, B1, B2, B3, B4>, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf4)<R, T, B1, B2, B3, B4> F;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4,
-    class A1, class A2, class A3, class A4, class A5>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf4)<R, T, B1, B2, B3, B4>, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf4)<R, T, B1, B2, B3, B4> F;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5));
-}
-
-// 5
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5,
-    class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf5)<R, T, B1, B2, B3, B4, B5>, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf5)<R, T, B1, B2, B3, B4, B5> F;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6));
-}
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5,
-    class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf5)<R, T, B1, B2, B3, B4, B5>, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf5)<R, T, B1, B2, B3, B4, B5> F;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5,
-    class A1, class A2, class A3, class A4, class A5, class A6>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf5)<R, T, B1, B2, B3, B4, B5>, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf5)<R, T, B1, B2, B3, B4, B5> F;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5,
-    class A1, class A2, class A3, class A4, class A5, class A6>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf5)<R, T, B1, B2, B3, B4, B5>, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf5)<R, T, B1, B2, B3, B4, B5> F;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6));
-}
-
-// 6
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf6)<R, T, B1, B2, B3, B4, B5, B6>, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf6)<R, T, B1, B2, B3, B4, B5, B6> F;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7));
-}
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf6)<R, T, B1, B2, B3, B4, B5, B6>, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf6)<R, T, B1, B2, B3, B4, B5, B6> F;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf6)<R, T, B1, B2, B3, B4, B5, B6>, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf6)<R, T, B1, B2, B3, B4, B5, B6> F;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf6)<R, T, B1, B2, B3, B4, B5, B6>, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf6)<R, T, B1, B2, B3, B4, B5, B6> F;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7));
-}
-
-// 7
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf7)<R, T, B1, B2, B3, B4, B5, B6, B7>, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf7)<R, T, B1, B2, B3, B4, B5, B6, B7> F;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf7)<R, T, B1, B2, B3, B4, B5, B6, B7>, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf7)<R, T, B1, B2, B3, B4, B5, B6, B7> F;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf7)<R, T, B1, B2, B3, B4, B5, B6, B7>, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf7)<R, T, B1, B2, B3, B4, B5, B6, B7> F;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf7)<R, T, B1, B2, B3, B4, B5, B6, B7>, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf7)<R, T, B1, B2, B3, B4, B5, B6, B7> F;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8));
-}
-
-// 8
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(mf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8>, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8> F;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
-
-template<class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<R, _mfi::BOOST_BIND_MF_NAME(cmf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8>, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8> F;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<R, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(mf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8>, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(mf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8> F;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
-
-template<class Rt2, class R, class T,
-    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
-    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    typename boost::enable_if_c<!_bi::is_same<Rt2, R>::value,
-    _bi::bind_t<Rt2, _mfi::BOOST_BIND_MF_NAME(cmf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8>, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
-    >::type BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
-{
-    typedef _mfi::BOOST_BIND_MF_NAME(cmf8)<R, T, B1, B2, B3, B4, B5, B6, B7, B8> F;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
-    return _bi::bind_t<Rt2, F, list_type>(F(f), list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
-}
diff --git a/inst/include/boost/bind/bind_template.hpp b/inst/include/boost/bind/bind_template.hpp
deleted file mode 100644
index 212ced7fa..000000000
--- a/inst/include/boost/bind/bind_template.hpp
+++ /dev/null
@@ -1,345 +0,0 @@
-//
-//  bind/bind_template.hpp
-//
-//  Do not include this header directly.
-//
-//  Copyright (c) 2001-2004 Peter Dimov and Multi Media Ltd.
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
-//
-
-    typedef typename result_traits<R, F>::type result_type;
-
-    result_type operator()()
-    {
-        list0 a;
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    result_type operator()() const
-    {
-        list0 a;
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1> result_type operator()(A1 & a1)
-    {
-        list1<A1 &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1> result_type operator()(A1 & a1) const
-    {
-        list1<A1 &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1> result_type operator()(A1 const & a1)
-    {
-        list1<A1 const &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1> result_type operator()(A1 const & a1) const
-    {
-        list1<A1 const &> a(a1);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 & a2)
-    {
-        list2<A1 &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 & a2) const
-    {
-        list2<A1 &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 & a2)
-    {
-        list2<A1 const &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 & a2) const
-    {
-        list2<A1 const &, A2 &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 const & a2)
-    {
-        list2<A1 &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 const & a2) const
-    {
-        list2<A1 &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 const & a2)
-    {
-        list2<A1 const &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 const & a2) const
-    {
-        list2<A1 const &, A2 const &> a(a1, a2);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3> result_type operator()(A1 & a1, A2 & a2, A3 & a3)
-    {
-        list3<A1 &, A2 &, A3 &> a(a1, a2, a3);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3> result_type operator()(A1 & a1, A2 & a2, A3 & a3) const
-    {
-        list3<A1 &, A2 &, A3 &> a(a1, a2, a3);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3)
-    {
-        list3<A1 const &, A2 const &, A3 const &> a(a1, a2, a3);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3) const
-    {
-        list3<A1 const &, A2 const &, A3 const &> a(a1, a2, a3);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4)
-    {
-        list4<A1 &, A2 &, A3 &, A4 &> a(a1, a2, a3, a4);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4) const
-    {
-        list4<A1 &, A2 &, A3 &, A4 &> a(a1, a2, a3, a4);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4)
-    {
-        list4<A1 const &, A2 const &, A3 const &, A4 const &> a(a1, a2, a3, a4);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4) const
-    {
-        list4<A1 const &, A2 const &, A3 const &, A4 const &> a(a1, a2, a3, a4);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5)
-    {
-        list5<A1 &, A2 &, A3 &, A4 &, A5 &> a(a1, a2, a3, a4, a5);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5) const
-    {
-        list5<A1 &, A2 &, A3 &, A4 &, A5 &> a(a1, a2, a3, a4, a5);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5)
-    {
-        list5<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &> a(a1, a2, a3, a4, a5);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5) const
-    {
-        list5<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &> a(a1, a2, a3, a4, a5);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6)
-    {
-        list6<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &> a(a1, a2, a3, a4, a5, a6);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6) const
-    {
-        list6<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &> a(a1, a2, a3, a4, a5, a6);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6)
-    {
-        list6<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &> a(a1, a2, a3, a4, a5, a6);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6) const
-    {
-        list6<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &> a(a1, a2, a3, a4, a5, a6);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7)
-    {
-        list7<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &> a(a1, a2, a3, a4, a5, a6, a7);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7) const
-    {
-        list7<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &> a(a1, a2, a3, a4, a5, a6, a7);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7)
-    {
-        list7<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &, A7 const &> a(a1, a2, a3, a4, a5, a6, a7);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7) const
-    {
-        list7<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &, A7 const &> a(a1, a2, a3, a4, a5, a6, a7);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8)
-    {
-        list8<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &> a(a1, a2, a3, a4, a5, a6, a7, a8);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8) const
-    {
-        list8<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &> a(a1, a2, a3, a4, a5, a6, a7, a8);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8)
-    {
-        list8<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &, A7 const &, A8 const &> a(a1, a2, a3, a4, a5, a6, a7, a8);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8) const
-    {
-        list8<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &, A7 const &, A8 const &> a(a1, a2, a3, a4, a5, a6, a7, a8);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9)
-    {
-        list9<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &, A9 &> a(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9) const
-    {
-        list9<A1 &, A2 &, A3 &, A4 &, A5 &, A6 &, A7 &, A8 &, A9 &> a(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9)
-    {
-        list9<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &, A7 const &, A8 const &, A9 const &> a(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9) const
-    {
-        list9<A1 const &, A2 const &, A3 const &, A4 const &, A5 const &, A6 const &, A7 const &, A8 const &, A9 const &> a(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-#endif
-
-    template<class A> result_type eval(A & a)
-    {
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class A> result_type eval(A & a) const
-    {
-        BOOST_BIND_RETURN l_(type<result_type>(), f_, a, 0);
-    }
-
-    template<class V> void accept(V & v) const
-    {
-#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( BOOST_BORLANDC )
-
-        using boost::visit_each;
-
-#endif
-        BOOST_BIND_VISIT_EACH(v, f_, 0);
-        l_.accept(v);
-    }
-
-    bool compare(this_type const & rhs) const
-    {
-        return ref_compare(f_, rhs.f_, 0) && l_ == rhs.l_;
-    }
-
-private:
-
-    F f_;
-    L l_;
diff --git a/inst/include/boost/bind/bind_cc.hpp b/inst/include/boost/bind/detail/bind_cc.hpp
similarity index 78%
rename from inst/include/boost/bind/bind_cc.hpp
rename to inst/include/boost/bind/detail/bind_cc.hpp
index 278aa9a2a..fec86d4e0 100644
--- a/inst/include/boost/bind/bind_cc.hpp
+++ b/inst/include/boost/bind/detail/bind_cc.hpp
@@ -13,105 +13,105 @@
 //
 
 template<class R>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) () BOOST_BIND_NOEXCEPT, _bi::list0>
+_bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) () BOOST_BIND_NOEXCEPT, typename _bi::list_av<>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) () BOOST_BIND_NOEXCEPT)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) () BOOST_BIND_NOEXCEPT;
-    typedef _bi::list0 list_type;
+    typedef typename _bi::list_av<>::type list_type;
     return _bi::bind_t<R, F, list_type> (f, list_type());
 }
 
 template<class R, class B1, class A1>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1) BOOST_BIND_NOEXCEPT, typename _bi::list_av_1<A1>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1) BOOST_BIND_NOEXCEPT, A1 a1)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_1<A1>::type list_type;
+    typedef typename _bi::list_av<A1>::type list_type;
     return _bi::bind_t<R, F, list_type> (f, list_type(a1));
 }
 
 template<class R, class B1, class B2, class A1, class A2>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2) BOOST_BIND_NOEXCEPT, typename _bi::list_av_2<A1, A2>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_2<A1, A2>::type list_type;
+    typedef typename _bi::list_av<A1, A2>::type list_type;
     return _bi::bind_t<R, F, list_type> (f, list_type(a1, a2));
 }
 
 template<class R,
     class B1, class B2, class B3,
     class A1, class A2, class A3>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3) BOOST_BIND_NOEXCEPT, typename _bi::list_av_3<A1, A2, A3>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_3<A1, A2, A3>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3));
 }
 
 template<class R,
     class B1, class B2, class B3, class B4,
     class A1, class A2, class A3, class A4>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4) BOOST_BIND_NOEXCEPT, typename _bi::list_av_4<A1, A2, A3, A4>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3, A4>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3, B4) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3, B4) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_4<A1, A2, A3, A4>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3, A4>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4));
 }
 
 template<class R,
     class B1, class B2, class B3, class B4, class B5,
     class A1, class A2, class A3, class A4, class A5>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5) BOOST_BIND_NOEXCEPT, typename _bi::list_av_5<A1, A2, A3, A4, A5>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3, A4, A5>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3, B4, B5) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3, B4, B5) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_5<A1, A2, A3, A4, A5>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5));
 }
 
 template<class R,
     class B1, class B2, class B3, class B4, class B5, class B6,
     class A1, class A2, class A3, class A4, class A5, class A6>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6) BOOST_BIND_NOEXCEPT, typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3, A4, A5, A6>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3, B4, B5, B6) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_6<A1, A2, A3, A4, A5, A6>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6));
 }
 
 template<class R,
     class B1, class B2, class B3, class B4, class B5, class B6, class B7,
     class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_NOEXCEPT, typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_7<A1, A2, A3, A4, A5, A6, A7>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7));
 }
 
 template<class R,
     class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
     class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_NOEXCEPT, typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_8<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8));
 }
 
 template<class R,
     class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8, class B9,
     class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6, B7, B8, B9) BOOST_BIND_NOEXCEPT, typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
+    _bi::bind_t<R, BOOST_BIND_ST R (BOOST_BIND_CC *) (B1, B2, B3, B4, B5, B6, B7, B8, B9) BOOST_BIND_NOEXCEPT, typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type>
     BOOST_BIND(BOOST_BIND_ST R (BOOST_BIND_CC *f) (B1, B2, B3, B4, B5, B6, B7, B8, B9) BOOST_BIND_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
 {
     typedef BOOST_BIND_ST R (BOOST_BIND_CC *F) (B1, B2, B3, B4, B5, B6, B7, B8, B9) BOOST_BIND_NOEXCEPT;
-    typedef typename _bi::list_av_9<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
+    typedef typename _bi::list_av<A1, A2, A3, A4, A5, A6, A7, A8, A9>::type list_type;
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
 }
diff --git a/inst/include/boost/bind/detail/bind_mf2_cc.hpp b/inst/include/boost/bind/detail/bind_mf2_cc.hpp
new file mode 100644
index 000000000..284f24172
--- /dev/null
+++ b/inst/include/boost/bind/detail/bind_mf2_cc.hpp
@@ -0,0 +1,210 @@
+//
+//  bind/bind_mf2_cc.hpp - member functions, type<> syntax
+//
+//  Do not include this header directly.
+//
+//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
+//  Copyright (c) 2008 Peter Dimov
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//  See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt
+//
+//  See http://www.boost.org/libs/bind/bind.html for documentation.
+//
+
+// 0
+
+template<class Rt2, class R, class T,
+    class A1>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) () BOOST_BIND_MF_NOEXCEPT, A1 a1)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1 );
+}
+
+template<class Rt2, class R, class T,
+    class A1>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) () const BOOST_BIND_MF_NOEXCEPT, A1 a1)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1 );
+}
+
+// 1
+
+template<class Rt2, class R, class T,
+    class B1,
+    class A1, class A2>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2 );
+}
+
+template<class Rt2, class R, class T,
+    class B1,
+    class A1, class A2>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2 );
+}
+
+// 2
+
+template<class Rt2, class R, class T,
+    class B1, class B2,
+    class A1, class A2, class A3>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2,
+    class A1, class A2, class A3>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3 );
+}
+
+// 3
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3,
+    class A1, class A2, class A3, class A4>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3,
+    class A1, class A2, class A3, class A4>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4 );
+}
+
+// 4
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4,
+    class A1, class A2, class A3, class A4, class A5>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4,
+    class A1, class A2, class A3, class A4, class A5>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5 );
+}
+
+// 5
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5,
+    class A1, class A2, class A3, class A4, class A5, class A6>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5,
+    class A1, class A2, class A3, class A4, class A5, class A6>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 );
+}
+
+// 6
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 );
+}
+
+// 7
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 );
+}
+
+// 8
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+    auto
+    BOOST_BIND(boost::type<Rt2>, R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+    -> decltype( boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 ) )
+{
+    return boost::BOOST_BIND( boost::type<Rt2>(), boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 );
+}
diff --git a/inst/include/boost/bind/detail/bind_mf_cc.hpp b/inst/include/boost/bind/detail/bind_mf_cc.hpp
new file mode 100644
index 000000000..2336ca204
--- /dev/null
+++ b/inst/include/boost/bind/detail/bind_mf_cc.hpp
@@ -0,0 +1,405 @@
+//
+//  bind/bind_mf_cc.hpp - support for different calling conventions
+//
+//  Do not include this header directly.
+//
+//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+//  See http://www.boost.org/libs/bind/bind.html for documentation.
+//
+
+// 0
+
+template<class R, class T,
+    class A1>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () BOOST_BIND_MF_NOEXCEPT, A1 a1)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1 );
+}
+
+template<class R, class T,
+    class A1>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () const BOOST_BIND_MF_NOEXCEPT, A1 a1)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1 );
+}
+
+template<class Rt2, class R, class T,
+    class A1,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () BOOST_BIND_MF_NOEXCEPT, A1 a1)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1 );
+}
+
+template<class Rt2, class R, class T,
+    class A1,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) () const BOOST_BIND_MF_NOEXCEPT, A1 a1)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1 );
+}
+
+// 1
+
+template<class R, class T,
+    class B1,
+    class A1, class A2>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2 );
+}
+
+template<class R, class T,
+    class B1,
+    class A1, class A2>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2 );
+}
+
+template<class Rt2, class R, class T,
+    class B1,
+    class A1, class A2,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2 );
+}
+
+template<class Rt2, class R, class T,
+    class B1,
+    class A1, class A2,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2 );
+}
+
+// 2
+
+template<class R, class T,
+    class B1, class B2,
+    class A1, class A2, class A3>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3 );
+}
+
+template<class R, class T,
+    class B1, class B2,
+    class A1, class A2, class A3>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2,
+    class A1, class A2, class A3,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2,
+    class A1, class A2, class A3,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3 );
+}
+
+// 3
+
+template<class R, class T,
+    class B1, class B2, class B3,
+    class A1, class A2, class A3, class A4>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4 );
+}
+
+template<class R, class T,
+    class B1, class B2, class B3,
+    class A1, class A2, class A3, class A4>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3,
+    class A1, class A2, class A3, class A4,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3,
+    class A1, class A2, class A3, class A4,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4 );
+}
+
+// 4
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4,
+    class A1, class A2, class A3, class A4, class A5>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5 );
+}
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4,
+    class A1, class A2, class A3, class A4, class A5>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4,
+    class A1, class A2, class A3, class A4, class A5,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4,
+    class A1, class A2, class A3, class A4, class A5,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5 );
+}
+
+// 5
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5,
+    class A1, class A2, class A3, class A4, class A5, class A6>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 );
+}
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5,
+    class A1, class A2, class A3, class A4, class A5, class A6>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5,
+    class A1, class A2, class A3, class A4, class A5, class A6,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5,
+    class A1, class A2, class A3, class A4, class A5, class A6,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6 );
+}
+
+// 6
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 );
+}
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7 );
+}
+
+// 7
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 );
+}
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8 );
+}
+
+// 8
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 );
+}
+
+template<class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+    -> decltype( boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 ) )
+{
+    return boost::BOOST_BIND( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 );
+}
+
+template<class Rt2, class R, class T,
+    class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8,
+    class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9,
+    class En = typename std::enable_if< !std::is_same<Rt2, R>::value >::type>
+    auto
+    BOOST_BIND(R (BOOST_BIND_MF_CC T::*f) (B1, B2, B3, B4, B5, B6, B7, B8) const BOOST_BIND_MF_NOEXCEPT, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9)
+    -> decltype( boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 ) )
+{
+    return boost::BOOST_BIND<Rt2>( boost::mem_fn( f ), a1, a2, a3, a4, a5, a6, a7, a8, a9 );
+}
diff --git a/inst/include/boost/bind/detail/integer_sequence.hpp b/inst/include/boost/bind/detail/integer_sequence.hpp
new file mode 100644
index 000000000..ce2c2b016
--- /dev/null
+++ b/inst/include/boost/bind/detail/integer_sequence.hpp
@@ -0,0 +1,111 @@
+#ifndef BOOST_BIND_DETAIL_INTEGER_SEQUENCE_HPP_INCLUDED
+#define BOOST_BIND_DETAIL_INTEGER_SEQUENCE_HPP_INCLUDED
+
+// Copyright 2015, 2017, 2019 Peter Dimov.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <cstddef>
+
+#if defined(__has_builtin)
+# if __has_builtin(__make_integer_seq)
+#  define BOOST_BIND_DETAIL_HAS_MAKE_INTEGER_SEQ
+# endif
+#endif
+
+namespace boost
+{
+namespace _bi
+{
+
+// integer_sequence
+template<class T, T... I> struct integer_sequence
+{
+};
+
+#if defined(BOOST_BIND_DETAIL_HAS_MAKE_INTEGER_SEQ)
+
+template<class T, T N> using make_integer_sequence = __make_integer_seq<integer_sequence, T, N>;
+
+#else
+
+// detail::make_integer_sequence_impl
+namespace detail
+{
+
+// iseq_if_c
+template<bool C, class T, class E> struct iseq_if_c_impl;
+
+template<class T, class E> struct iseq_if_c_impl<true, T, E>
+{
+    using type = T;
+};
+
+template<class T, class E> struct iseq_if_c_impl<false, T, E>
+{
+    using type = E;
+};
+
+template<bool C, class T, class E> using iseq_if_c = typename iseq_if_c_impl<C, T, E>::type;
+
+// iseq_identity
+template<class T> struct iseq_identity
+{
+    using type = T;
+};
+
+template<class S1, class S2> struct append_integer_sequence;
+
+template<class T, T... I, T... J> struct append_integer_sequence<integer_sequence<T, I...>, integer_sequence<T, J...>>
+{
+    using type = integer_sequence< T, I..., ( J + sizeof...(I) )... >;
+};
+
+template<class T, T N> struct make_integer_sequence_impl;
+
+template<class T, T N> struct make_integer_sequence_impl_
+{
+private:
+
+    static_assert( N >= 0, "make_integer_sequence<T, N>: N must not be negative" );
+
+    static T const M = N / 2;
+    static T const R = N % 2;
+
+    using S1 = typename make_integer_sequence_impl<T, M>::type;
+    using S2 = typename append_integer_sequence<S1, S1>::type;
+    using S3 = typename make_integer_sequence_impl<T, R>::type;
+    using S4 = typename append_integer_sequence<S2, S3>::type;
+
+public:
+
+    using type = S4;
+};
+
+template<class T, T N> struct make_integer_sequence_impl: iseq_if_c<N == 0, iseq_identity<integer_sequence<T>>, iseq_if_c<N == 1, iseq_identity<integer_sequence<T, 0>>, make_integer_sequence_impl_<T, N> > >
+{
+};
+
+} // namespace detail
+
+// make_integer_sequence
+template<class T, T N> using make_integer_sequence = typename detail::make_integer_sequence_impl<T, N>::type;
+
+#endif // defined(BOOST_BIND_DETAIL_HAS_MAKE_INTEGER_SEQ)
+
+// index_sequence
+template<std::size_t... I> using index_sequence = integer_sequence<std::size_t, I...>;
+
+// make_index_sequence
+template<std::size_t N> using make_index_sequence = make_integer_sequence<std::size_t, N>;
+
+// index_sequence_for
+template<class... T> using index_sequence_for = make_integer_sequence<std::size_t, sizeof...(T)>;
+
+} // namespace _bi
+} // namespace boost
+
+#endif // #ifndef BOOST_BIND_DETAIL_INTEGER_SEQUENCE_HPP_INCLUDED
diff --git a/inst/include/boost/bind/detail/is_same.hpp b/inst/include/boost/bind/detail/is_same.hpp
deleted file mode 100644
index 995b39f4e..000000000
--- a/inst/include/boost/bind/detail/is_same.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef BOOST_BIND_DETAIL_IS_SAME_HPP_INCLUDED
-#define BOOST_BIND_DETAIL_IS_SAME_HPP_INCLUDED
-
-// is_same<T1,T2>::value is true when T1 == T2
-//
-// Copyright 2014 Peter Dimov
-//
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/config.hpp>
-
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-# pragma once
-#endif
-
-namespace boost
-{
-namespace _bi
-{
-
-template< class T1, class T2 > struct is_same
-{
-    BOOST_STATIC_CONSTANT( bool, value = false );
-};
-
-template< class T > struct is_same< T, T >
-{
-    BOOST_STATIC_CONSTANT( bool, value = true );
-};
-
-} // namespace _bi
-} // namespace boost
-
-#endif // #ifndef BOOST_BIND_DETAIL_IS_SAME_HPP_INCLUDED
diff --git a/inst/include/boost/bind/detail/requires_cxx11.hpp b/inst/include/boost/bind/detail/requires_cxx11.hpp
deleted file mode 100644
index 600f58ff1..000000000
--- a/inst/include/boost/bind/detail/requires_cxx11.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef BOOST_BIND_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-#define BOOST_BIND_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-
-// Copyright 2023 Peter Dimov
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/config.hpp>
-#include <boost/config/pragma_message.hpp>
-
-#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || \
-    defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
-    defined(BOOST_NO_CXX11_DECLTYPE) || \
-    defined(BOOST_NO_CXX11_CONSTEXPR) || \
-    defined(BOOST_NO_CXX11_NOEXCEPT) || \
-    defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
-BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.Bind 1.82 and will be removed in Boost.Bind 1.85.")
-
-#endif
-
-#endif // #ifndef BOOST_BIND_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
diff --git a/inst/include/boost/bind/detail/tuple_for_each.hpp b/inst/include/boost/bind/detail/tuple_for_each.hpp
new file mode 100644
index 000000000..d1eabff87
--- /dev/null
+++ b/inst/include/boost/bind/detail/tuple_for_each.hpp
@@ -0,0 +1,64 @@
+#ifndef BOOST_BIND_DETAIL_TUPLE_FOR_EACH_HPP_INCLUDED
+#define BOOST_BIND_DETAIL_TUPLE_FOR_EACH_HPP_INCLUDED
+
+//  Copyright 2015-2020, 2024 Peter Dimov.
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//
+//  See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/bind/detail/integer_sequence.hpp>
+#include <boost/config.hpp>
+#include <utility>
+#include <type_traits>
+#include <cstddef>
+
+#if defined(BOOST_MSVC)
+# pragma warning( push )
+# pragma warning( disable: 4100 ) // unreferenced formal parameter 'tp'
+#endif
+
+namespace boost
+{
+namespace _bi
+{
+
+// tuple_for_each( f, tp )
+
+template<class F, class Tp, std::size_t... J> F tuple_for_each_impl( F&& f, Tp&& tp, integer_sequence<std::size_t, J...> )
+{
+    using A = int[ 1 + sizeof...(J) ];
+    using std::get;
+    return (void)A{ 0, ((void)f(get<J>(std::forward<Tp>(tp))), 0)... }, std::forward<F>(f);
+}
+
+template<class F, class Tp> F tuple_for_each( F&& f, Tp&& tp )
+{
+    using seq = make_index_sequence<std::tuple_size<typename std::remove_reference<Tp>::type>::value>;
+    return _bi::tuple_for_each_impl( std::forward<F>(f), std::forward<Tp>(tp), seq() );
+}
+
+// tuple_for_each( f, tp1, tp2 )
+
+template<class F, class Tp1, class Tp2, std::size_t... J> F tuple_for_each_impl( F&& f, Tp1&& tp1, Tp2&& tp2, integer_sequence<std::size_t, J...> )
+{
+    using A = int[ 1 + sizeof...(J) ];
+    using std::get;
+    return (void)A{ 0, ((void)f( get<J>(std::forward<Tp1>(tp1)), get<J>(std::forward<Tp2>(tp2)) ), 0)... }, std::forward<F>(f);
+}
+
+template<class F, class Tp1, class Tp2> F tuple_for_each( F&& f, Tp1&& tp1, Tp2&& tp2 )
+{
+    using seq = make_index_sequence<std::tuple_size<typename std::remove_reference<Tp1>::type>::value>;
+    return _bi::tuple_for_each_impl( std::forward<F>(f), std::forward<Tp1>(tp1), std::forward<Tp2>(tp2), seq() );
+}
+
+} // namespace _bi
+} // namespace boost
+
+#if defined(BOOST_MSVC)
+# pragma warning( pop )
+#endif
+
+#endif // #ifndef BOOST_BIND_DETAIL_TUPLE_FOR_EACH_HPP_INCLUDED
diff --git a/inst/include/boost/bind/mem_fn.hpp b/inst/include/boost/bind/mem_fn.hpp
index 1078e7c5a..5cfbb99e6 100644
--- a/inst/include/boost/bind/mem_fn.hpp
+++ b/inst/include/boost/bind/mem_fn.hpp
@@ -8,318 +8,162 @@
 #endif
 
 //
-//  mem_fn.hpp - a generalization of std::mem_fun[_ref]
+// mem_fn.hpp - a generalization of std::mem_fun[_ref]
 //
-//  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2001 David Abrahams
-//  Copyright (c) 2003-2005 Peter Dimov
+// Copyright 2001-2005, 2024 Peter Dimov
+// Copyright 2001 David Abrahams
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-//  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
+// See http://www.boost.org/libs/bind/mem_fn.html for documentation.
 //
 
-#include <boost/bind/detail/requires_cxx11.hpp>
 #include <boost/get_pointer.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
+#include <type_traits>
 
 namespace boost
 {
 
-#if defined(BOOST_NO_VOID_RETURNS)
-
-#define BOOST_MEM_FN_CLASS_F , class F
-#define BOOST_MEM_FN_TYPEDEF(X)
-
-namespace _mfi // mem_fun_impl
+namespace _mfi
 {
 
-template<class V> struct mf
+template<class T> struct remove_cvref: std::remove_cv< typename std::remove_reference<T>::type >
 {
+};
 
-#define BOOST_MEM_FN_RETURN return
-
-#define BOOST_MEM_FN_NAME(X) inner_##X
-#define BOOST_MEM_FN_CC
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
-#define BOOST_MEM_FN_CC __stdcall
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_fastcall
-#define BOOST_MEM_FN_CC __fastcall
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#undef BOOST_MEM_FN_RETURN
-
-}; // struct mf<V>
-
-template<> struct mf<void>
+template<class Pm, class R, class T, class... A> class mf
 {
+public:
 
-#define BOOST_MEM_FN_RETURN
-
-#define BOOST_MEM_FN_NAME(X) inner_##X
-#define BOOST_MEM_FN_CC
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#ifdef BOOST_MEM_FN_ENABLE_STDCALL
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
-#define BOOST_MEM_FN_CC __stdcall
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
-
-#define BOOST_MEM_FN_NAME(X) inner_##X##_fastcall
-#define BOOST_MEM_FN_CC __fastcall
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#undef BOOST_MEM_FN_RETURN
-
-}; // struct mf<void>
-
-#undef BOOST_MEM_FN_CLASS_F
-#undef BOOST_MEM_FN_TYPEDEF_F
-
-#define BOOST_MEM_FN_NAME(X) X
-#define BOOST_MEM_FN_NAME2(X) inner_##X
-#define BOOST_MEM_FN_CC
-
-#include <boost/bind/mem_fn_vw.hpp>
-
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_NAME2
-#undef BOOST_MEM_FN_CC
-
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) X##_cdecl
-#define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_vw.hpp>
-
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_NAME2
-#undef BOOST_MEM_FN_CC
-
-#endif
+    typedef R result_type;
 
-#ifdef BOOST_MEM_FN_ENABLE_STDCALL
+private:
 
-#define BOOST_MEM_FN_NAME(X) X##_stdcall
-#define BOOST_MEM_FN_NAME2(X) inner_##X##_stdcall
-#define BOOST_MEM_FN_CC __stdcall
+    Pm pm_;
 
-#include <boost/bind/mem_fn_vw.hpp>
+public:
 
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_NAME2
-#undef BOOST_MEM_FN_CC
+    mf( Pm pm ): pm_( pm ) {}
 
-#endif
+    template<class U,
+        class Ud = typename _mfi::remove_cvref<U>::type,
+        class En = typename std::enable_if<
+            std::is_same<T, Ud>::value || std::is_base_of<T, Ud>::value
+        >::type
+    >
 
-#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
+    R operator()( U&& u, A... a ) const
+    {
+        return (std::forward<U>( u ).*pm_)( std::forward<A>( a )... );
+    }
 
-#define BOOST_MEM_FN_NAME(X) X##_fastcall
-#define BOOST_MEM_FN_NAME2(X) inner_##X##_fastcall
-#define BOOST_MEM_FN_CC __fastcall
+    template<class U,
+        class Ud = typename _mfi::remove_cvref<U>::type,
+        class E1 = void,
+        class En = typename std::enable_if<
+            !(std::is_same<T, Ud>::value || std::is_base_of<T, Ud>::value)
+        >::type
+    >
 
-#include <boost/bind/mem_fn_vw.hpp>
+    R operator()( U&& u, A... a ) const
+    {
+        return (get_pointer( std::forward<U>( u ) )->*pm_)( std::forward<A>( a )... );
+    }
 
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_NAME2
-#undef BOOST_MEM_FN_CC
+    bool operator==( mf const & rhs ) const
+    {
+        return pm_ == rhs.pm_;
+    }
 
-#endif
+    bool operator!=( mf const & rhs ) const
+    {
+        return pm_ != rhs.pm_;
+    }
+};
 
 } // namespace _mfi
 
-#else // #ifdef BOOST_NO_VOID_RETURNS
-
-#define BOOST_MEM_FN_CLASS_F
-#define BOOST_MEM_FN_TYPEDEF(X) typedef X;
+//
 
-namespace _mfi
+template<class R, class T, class... A>
+auto mem_fn( R (T::*pmf) (A...) ) -> _mfi::mf<decltype(pmf), R, T, A...>
 {
+    return pmf;
+}
 
-#define BOOST_MEM_FN_RETURN return
-
-#define BOOST_MEM_FN_NAME(X) X
-#define BOOST_MEM_FN_CC
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) X##_stdcall
-#define BOOST_MEM_FN_CC __stdcall
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
-
-#define BOOST_MEM_FN_NAME(X) X##_fastcall
-#define BOOST_MEM_FN_CC __fastcall
-
-#include <boost/bind/mem_fn_template.hpp>
-
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NAME
-
-#endif
-
-#undef BOOST_MEM_FN_RETURN
-
-} // namespace _mfi
-
-#undef BOOST_MEM_FN_CLASS_F
-#undef BOOST_MEM_FN_TYPEDEF
-
-#endif // #ifdef BOOST_NO_VOID_RETURNS
+template<class R, class T, class... A>
+auto mem_fn( R (T::*pmf) (A...) const ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#define BOOST_MEM_FN_NAME(X) X
-#define BOOST_MEM_FN_CC
-#define BOOST_MEM_FN_NOEXCEPT
+#if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
 
-#include <boost/bind/mem_fn_cc.hpp>
+template<class R, class T, class... A>
+auto mem_fn( R (T::*pmf) (A...) noexcept ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
-#  undef BOOST_MEM_FN_NOEXCEPT
-#  define BOOST_MEM_FN_NOEXCEPT noexcept
-#  include <boost/bind/mem_fn_cc.hpp>
-#endif
+template<class R, class T, class... A>
+auto mem_fn( R (T::*pmf) (A...) const noexcept ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NOEXCEPT
+#endif // #if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
 
 #if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
 
-#define BOOST_MEM_FN_NAME(X) X##_cdecl
-#define BOOST_MEM_FN_CC __cdecl
-#define BOOST_MEM_FN_NOEXCEPT
+template<class R, class T, class... A>
+auto mem_fn( R (__cdecl T::*pmf) (A...) ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#include <boost/bind/mem_fn_cc.hpp>
+template<class R, class T, class... A>
+auto mem_fn( R (__cdecl T::*pmf) (A...) const ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NOEXCEPT
-
-#endif
+#endif // #if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
 
 #if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
 
-#define BOOST_MEM_FN_NAME(X) X##_stdcall
-#define BOOST_MEM_FN_CC __stdcall
-#define BOOST_MEM_FN_NOEXCEPT
-
-#include <boost/bind/mem_fn_cc.hpp>
+template<class R, class T, class... A>
+auto mem_fn( R (__stdcall T::*pmf) (A...) ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NOEXCEPT
+template<class R, class T, class... A>
+auto mem_fn( R (__stdcall T::*pmf) (A...) const ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#endif
+#endif // #if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
 
 #if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
 
-#define BOOST_MEM_FN_NAME(X) X##_fastcall
-#define BOOST_MEM_FN_CC __fastcall
-#define BOOST_MEM_FN_NOEXCEPT
-
-#include <boost/bind/mem_fn_cc.hpp>
+template<class R, class T, class... A>
+auto mem_fn( R (__fastcall T::*pmf) (A...) ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#undef BOOST_MEM_FN_NAME
-#undef BOOST_MEM_FN_CC
-#undef BOOST_MEM_FN_NOEXCEPT
+template<class R, class T, class... A>
+auto mem_fn( R (__fastcall T::*pmf) (A...) const ) -> _mfi::mf<decltype(pmf), R, T, A...>
+{
+    return pmf;
+}
 
-#endif
+#endif // #if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
 
 // data member support
 
@@ -334,69 +178,74 @@ template<class R, class T> class dm
     typedef T const * argument_type;
 
 private:
-    
-    typedef R (T::*F);
-    F f_;
 
-    template<class U> R const & call(U & u, T const *) const
-    {
-        return (u.*f_);
-    }
-
-    template<class U> R const & call(U & u, void const *) const
-    {
-        return (get_pointer(u)->*f_);
-    }
+    typedef R (T::*Pm);
+    Pm pm_;
 
 public:
-    
-    explicit dm(F f): f_(f) {}
 
-    R & operator()(T * p) const
-    {
-        return (p->*f_);
-    }
+    dm( Pm pm ): pm_( pm ) {}
 
-    R const & operator()(T const * p) const
+    template<class U,
+        class Ud = typename _mfi::remove_cvref<U>::type,
+        class En = typename std::enable_if<
+            std::is_same<T, Ud>::value || std::is_base_of<T, Ud>::value
+        >::type
+    >
+
+    auto operator()( U&& u ) const -> decltype( std::forward<U>( u ).*pm_ )
     {
-        return (p->*f_);
+        return std::forward<U>( u ).*pm_;
     }
 
-    template<class U> R const & operator()(U const & u) const
+    template<class U,
+        class Ud = typename _mfi::remove_cvref<U>::type,
+        class E1 = void,
+        class En = typename std::enable_if<
+            !(std::is_same<T, Ud>::value || std::is_base_of<T, Ud>::value)
+        >::type
+    >
+
+    auto operator()( U&& u ) const -> decltype( get_pointer( std::forward<U>( u ) )->*pm_ )
     {
-        return call(u, &u);
+        return get_pointer( std::forward<U>( u ) )->*pm_;
     }
 
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && !BOOST_WORKAROUND(__MWERKS__, < 0x3200)
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
 
-    R & operator()(T & t) const
+    template<class U>
+    R& operator()( U* u ) const
     {
-        return (t.*f_);
+        return u->*pm_;
     }
 
-    R const & operator()(T const & t) const
+    template<class U>
+    R const& operator()( U const* u ) const
     {
-        return (t.*f_);
+        return u->*pm_;
     }
 
 #endif
 
-    bool operator==(dm const & rhs) const
+    bool operator==( dm const & rhs ) const
     {
-        return f_ == rhs.f_;
+        return pm_ == rhs.pm_;
     }
 
-    bool operator!=(dm const & rhs) const
+    bool operator!=( dm const & rhs ) const
     {
-        return f_ != rhs.f_;
+        return pm_ != rhs.pm_;
     }
 };
 
 } // namespace _mfi
 
-template<class R, class T> _mfi::dm<R, T> mem_fn(R T::*f)
+template<class R, class T,
+    class E = typename std::enable_if< !std::is_function<R>::value >::type
+>
+_mfi::dm<R, T> mem_fn( R T::*pm )
 {
-    return _mfi::dm<R, T>(f);
+    return pm;
 }
 
 } // namespace boost
diff --git a/inst/include/boost/bind/mem_fn_cc.hpp b/inst/include/boost/bind/mem_fn_cc.hpp
deleted file mode 100644
index 03e38300a..000000000
--- a/inst/include/boost/bind/mem_fn_cc.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//  bind/mem_fn_cc.hpp - support for different calling conventions
-//
-//  Do not include this header directly.
-//
-//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-//  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
-//
-
-template<class R, class T> _mfi::BOOST_MEM_FN_NAME(mf0)<R, T> mem_fn(R (BOOST_MEM_FN_CC T::*f) () BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf0)<R, T>(f);
-}
-
-template<class R, class T> _mfi::BOOST_MEM_FN_NAME(cmf0)<R, T> mem_fn(R (BOOST_MEM_FN_CC T::*f) () const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf0)<R, T>(f);
-}
-
-template<class R, class T, class A1> _mfi::BOOST_MEM_FN_NAME(mf1)<R, T, A1> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf1)<R, T, A1>(f);
-}
-
-template<class R, class T, class A1> _mfi::BOOST_MEM_FN_NAME(cmf1)<R, T, A1> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf1)<R, T, A1>(f);
-}
-
-template<class R, class T, class A1, class A2> _mfi::BOOST_MEM_FN_NAME(mf2)<R, T, A1, A2> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf2)<R, T, A1, A2>(f);
-}
-
-template<class R, class T, class A1, class A2> _mfi::BOOST_MEM_FN_NAME(cmf2)<R, T, A1, A2> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf2)<R, T, A1, A2>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3> _mfi::BOOST_MEM_FN_NAME(mf3)<R, T, A1, A2, A3> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf3)<R, T, A1, A2, A3>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3> _mfi::BOOST_MEM_FN_NAME(cmf3)<R, T, A1, A2, A3> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf3)<R, T, A1, A2, A3>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4> _mfi::BOOST_MEM_FN_NAME(mf4)<R, T, A1, A2, A3, A4> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf4)<R, T, A1, A2, A3, A4>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4> _mfi::BOOST_MEM_FN_NAME(cmf4)<R, T, A1, A2, A3, A4> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf4)<R, T, A1, A2, A3, A4>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5> _mfi::BOOST_MEM_FN_NAME(mf5)<R, T, A1, A2, A3, A4, A5> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf5)<R, T, A1, A2, A3, A4, A5>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5> _mfi::BOOST_MEM_FN_NAME(cmf5)<R, T, A1, A2, A3, A4, A5> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf5)<R, T, A1, A2, A3, A4, A5>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6> _mfi::BOOST_MEM_FN_NAME(mf6)<R, T, A1, A2, A3, A4, A5, A6> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5, A6) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf6)<R, T, A1, A2, A3, A4, A5, A6>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6> _mfi::BOOST_MEM_FN_NAME(cmf6)<R, T, A1, A2, A3, A4, A5, A6> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5, A6) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf6)<R, T, A1, A2, A3, A4, A5, A6>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7> _mfi::BOOST_MEM_FN_NAME(mf7)<R, T, A1, A2, A3, A4, A5, A6, A7> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5, A6, A7) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf7)<R, T, A1, A2, A3, A4, A5, A6, A7>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7> _mfi::BOOST_MEM_FN_NAME(cmf7)<R, T, A1, A2, A3, A4, A5, A6, A7> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5, A6, A7) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf7)<R, T, A1, A2, A3, A4, A5, A6, A7>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> _mfi::BOOST_MEM_FN_NAME(mf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5, A6, A7, A8) BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(mf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8>(f);
-}
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> _mfi::BOOST_MEM_FN_NAME(cmf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8> mem_fn(R (BOOST_MEM_FN_CC T::*f) (A1, A2, A3, A4, A5, A6, A7, A8) const BOOST_MEM_FN_NOEXCEPT)
-{
-    return _mfi::BOOST_MEM_FN_NAME(cmf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8>(f);
-}
diff --git a/inst/include/boost/bind/mem_fn_template.hpp b/inst/include/boost/bind/mem_fn_template.hpp
deleted file mode 100644
index b26d585db..000000000
--- a/inst/include/boost/bind/mem_fn_template.hpp
+++ /dev/null
@@ -1,1047 +0,0 @@
-//
-//  bind/mem_fn_template.hpp
-//
-//  Do not include this header directly
-//
-//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-//  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
-//
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-# define BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-#endif
-
-// mf0
-
-template<class R, class T BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf0)
-{
-public:
-
-    typedef R result_type;
-    typedef T * argument_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) ())
-    F f_;
-
-    template<class U> R call(U & u, T const *) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)();
-    }
-
-    template<class U> R call(U & u, void const *) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)();
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf0)(F f): f_(f) {}
-
-    R operator()(T * p) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)();
-    }
-
-    template<class U> R operator()(U & u) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p);
-    }
-
-#endif
-
-    R operator()(T & t) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)();
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf0) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf0) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf0
-
-template<class R, class T BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf0)
-{
-public:
-
-    typedef R result_type;
-    typedef T const * argument_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) () const)
-    F f_;
-
-    template<class U> R call(U & u, T const *) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)();
-    }
-
-    template<class U> R call(U & u, void const *) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)();
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf0)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p);
-    }
-
-    R operator()(T const & t) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)();
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf0) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf0) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf1
-
-template<class R, class T, class A1 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf1)
-{
-public:
-
-    typedef R result_type;
-    typedef T * first_argument_type;
-    typedef A1 second_argument_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1))
-    F f_;
-
-    template<class U, class B1> R call(U & u, T const *, B1 & b1) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1);
-    }
-
-    template<class U, class B1> R call(U & u, void const *, B1 & b1) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf1)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1);
-    }
-
-    template<class U> R operator()(U & u, A1 a1) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf1) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf1) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf1
-
-template<class R, class T, class A1 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf1)
-{
-public:
-
-    typedef R result_type;
-    typedef T const * first_argument_type;
-    typedef A1 second_argument_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1) const)
-    F f_;
-
-    template<class U, class B1> R call(U & u, T const *, B1 & b1) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1);
-    }
-
-    template<class U, class B1> R call(U & u, void const *, B1 & b1) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf1)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1);
-    }
-
-    R operator()(T const & t, A1 a1) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf1) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf1) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf2
-
-template<class R, class T, class A1, class A2 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf2)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2))
-    F f_;
-
-    template<class U, class B1, class B2> R call(U & u, T const *, B1 & b1, B2 & b2) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2);
-    }
-
-    template<class U, class B1, class B2> R call(U & u, void const *, B1 & b1, B2 & b2) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf2)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf2) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf2) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf2
-
-template<class R, class T, class A1, class A2 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf2)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2) const)
-    F f_;
-
-    template<class U, class B1, class B2> R call(U & u, T const *, B1 & b1, B2 & b2) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2);
-    }
-
-    template<class U, class B1, class B2> R call(U & u, void const *, B1 & b1, B2 & b2) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf2)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf2) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf2) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf3
-
-template<class R, class T, class A1, class A2, class A3 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf3)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3))
-    F f_;
-
-    template<class U, class B1, class B2, class B3> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3);
-    }
-
-    template<class U, class B1, class B2, class B3> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf3)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2, A3 a3) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2, A3 a3) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2, A3 a3) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf3) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf3) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf3
-
-template<class R, class T, class A1, class A2, class A3 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf3)
-{
-public:
-
-    typedef R result_type;
-
-private:
-
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3) const)
-    F f_;
-
-    template<class U, class B1, class B2, class B3> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3);
-    }
-
-    template<class U, class B1, class B2, class B3> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3);
-    }
-
-public:
-
-    explicit BOOST_MEM_FN_NAME(cmf3)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2, A3 a3) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf3) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf3) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf4
-
-template<class R, class T, class A1, class A2, class A3, class A4 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf4)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4))
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf4)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3, a4);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf4) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf4) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf4
-
-template<class R, class T, class A1, class A2, class A3, class A4 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf4)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4) const)
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf4)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2, A3 a3, A4 a4) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf4) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf4) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf5
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf5)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5))
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf5)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3, a4, a5);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf5) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf5) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf5
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf5)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5) const)
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf5)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf5) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf5) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf6
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf6)
-{
-public:
-
-    typedef R result_type;
-
-private:
-
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6))
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5, b6);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5, b6);
-    }
-
-public:
-
-    explicit BOOST_MEM_FN_NAME(mf6)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3, a4, a5, a6);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf6) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf6) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf6
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf6)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6) const)
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5, b6);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5, b6);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf6)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf6) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf6) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf7
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf7)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7))
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5, b6, b7);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5, b6, b7);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf7)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6, a7);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6, a7);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf7) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf7) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf7
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf7)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7) const)
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5, b6, b7);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5, b6, b7);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf7)(F f): f_(f) {}
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf7) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf7) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// mf8
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(mf8)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7, A8))
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7, B8 & b8) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5, b6, b7, b8);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7, B8 & b8) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5, b6, b7, b8);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(mf8)(F f): f_(f) {}
-
-    R operator()(T * p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    template<class U> R operator()(U & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-#ifdef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-#endif
-
-    R operator()(T & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(mf8) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(mf8) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-// cmf8
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 BOOST_MEM_FN_CLASS_F> class BOOST_MEM_FN_NAME(cmf8)
-{
-public:
-
-    typedef R result_type;
-
-private:
-    
-    BOOST_MEM_FN_TYPEDEF(R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7, A8) const)
-    F f_;
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8> R call(U & u, T const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7, B8 & b8) const
-    {
-        BOOST_MEM_FN_RETURN (u.*f_)(b1, b2, b3, b4, b5, b6, b7, b8);
-    }
-
-    template<class U, class B1, class B2, class B3, class B4, class B5, class B6, class B7, class B8> R call(U & u, void const *, B1 & b1, B2 & b2, B3 & b3, B4 & b4, B5 & b5, B6 & b6, B7 & b7, B8 & b8) const
-    {
-        BOOST_MEM_FN_RETURN (get_pointer(u)->*f_)(b1, b2, b3, b4, b5, b6, b7, b8);
-    }
-
-public:
-    
-    explicit BOOST_MEM_FN_NAME(cmf8)(F f): f_(f) {}
-
-    R operator()(T const * p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        BOOST_MEM_FN_RETURN (p->*f_)(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    template<class U> R operator()(U const & u, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        U const * p = 0;
-        BOOST_MEM_FN_RETURN call(u, p, a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    R operator()(T const & t, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
-    {
-        BOOST_MEM_FN_RETURN (t.*f_)(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    bool operator==(BOOST_MEM_FN_NAME(cmf8) const & rhs) const
-    {
-        return f_ == rhs.f_;
-    }
-
-    bool operator!=(BOOST_MEM_FN_NAME(cmf8) const & rhs) const
-    {
-        return f_ != rhs.f_;
-    }
-};
-
-#undef BOOST_MEM_FN_ENABLE_CONST_OVERLOADS
diff --git a/inst/include/boost/bind/mem_fn_vw.hpp b/inst/include/boost/bind/mem_fn_vw.hpp
deleted file mode 100644
index f3fc58db0..000000000
--- a/inst/include/boost/bind/mem_fn_vw.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-//  bind/mem_fn_vw.hpp - void return helper wrappers
-//
-//  Do not include this header directly
-//
-//  Copyright (c) 2001 Peter Dimov and Multi Media Ltd.
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-//  See http://www.boost.org/libs/bind/mem_fn.html for documentation.
-//
-
-template<class R, class T> struct BOOST_MEM_FN_NAME(mf0): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf0)<R, T, R (BOOST_MEM_FN_CC T::*) ()>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) ();
-    explicit BOOST_MEM_FN_NAME(mf0)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf0)<R, T, F>(f) {}
-};
-
-template<class R, class T> struct BOOST_MEM_FN_NAME(cmf0): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf0)<R, T, R (BOOST_MEM_FN_CC T::*) () const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) () const;
-    explicit BOOST_MEM_FN_NAME(cmf0)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf0)<R, T, F>(f) {}
-};
-
-
-template<class R, class T, class A1> struct BOOST_MEM_FN_NAME(mf1): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf1)<R, T, A1, R (BOOST_MEM_FN_CC T::*) (A1)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1);
-    explicit BOOST_MEM_FN_NAME(mf1)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf1)<R, T, A1, F>(f) {}
-};
-
-template<class R, class T, class A1> struct BOOST_MEM_FN_NAME(cmf1): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf1)<R, T, A1, R (BOOST_MEM_FN_CC T::*) (A1) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1) const;
-    explicit BOOST_MEM_FN_NAME(cmf1)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf1)<R, T, A1, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2> struct BOOST_MEM_FN_NAME(mf2): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf2)<R, T, A1, A2, R (BOOST_MEM_FN_CC T::*) (A1, A2)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2);
-    explicit BOOST_MEM_FN_NAME(mf2)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf2)<R, T, A1, A2, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2> struct BOOST_MEM_FN_NAME(cmf2): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf2)<R, T, A1, A2, R (BOOST_MEM_FN_CC T::*) (A1, A2) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2) const;
-    explicit BOOST_MEM_FN_NAME(cmf2)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf2)<R, T, A1, A2, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2, class A3> struct BOOST_MEM_FN_NAME(mf3): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf3)<R, T, A1, A2, A3, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3);
-    explicit BOOST_MEM_FN_NAME(mf3)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf3)<R, T, A1, A2, A3, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2, class A3> struct BOOST_MEM_FN_NAME(cmf3): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf3)<R, T, A1, A2, A3, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3) const;
-    explicit BOOST_MEM_FN_NAME(cmf3)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf3)<R, T, A1, A2, A3, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2, class A3, class A4> struct BOOST_MEM_FN_NAME(mf4): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf4)<R, T, A1, A2, A3, A4, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4);
-    explicit BOOST_MEM_FN_NAME(mf4)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf4)<R, T, A1, A2, A3, A4, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2, class A3, class A4> struct BOOST_MEM_FN_NAME(cmf4): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf4)<R, T, A1, A2, A3, A4, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4) const;
-    explicit BOOST_MEM_FN_NAME(cmf4)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf4)<R, T, A1, A2, A3, A4, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5> struct BOOST_MEM_FN_NAME(mf5): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf5)<R, T, A1, A2, A3, A4, A5, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5);
-    explicit BOOST_MEM_FN_NAME(mf5)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf5)<R, T, A1, A2, A3, A4, A5, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5> struct BOOST_MEM_FN_NAME(cmf5): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf5)<R, T, A1, A2, A3, A4, A5, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5) const;
-    explicit BOOST_MEM_FN_NAME(cmf5)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf5)<R, T, A1, A2, A3, A4, A5, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6> struct BOOST_MEM_FN_NAME(mf6): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf6)<R, T, A1, A2, A3, A4, A5, A6, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5, A6)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6);
-    explicit BOOST_MEM_FN_NAME(mf6)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf6)<R, T, A1, A2, A3, A4, A5, A6, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6> struct BOOST_MEM_FN_NAME(cmf6): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf6)<R, T, A1, A2, A3, A4, A5, A6, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5, A6) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6) const;
-    explicit BOOST_MEM_FN_NAME(cmf6)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf6)<R, T, A1, A2, A3, A4, A5, A6, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7> struct BOOST_MEM_FN_NAME(mf7): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf7)<R, T, A1, A2, A3, A4, A5, A6, A7, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5, A6, A7)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7);
-    explicit BOOST_MEM_FN_NAME(mf7)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf7)<R, T, A1, A2, A3, A4, A5, A6, A7, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7> struct BOOST_MEM_FN_NAME(cmf7): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf7)<R, T, A1, A2, A3, A4, A5, A6, A7, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5, A6, A7) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7) const;
-    explicit BOOST_MEM_FN_NAME(cmf7)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf7)<R, T, A1, A2, A3, A4, A5, A6, A7, F>(f) {}
-};
-
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> struct BOOST_MEM_FN_NAME(mf8): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5, A6, A7, A8)>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7, A8);
-    explicit BOOST_MEM_FN_NAME(mf8)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(mf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8, F>(f) {}
-};
-
-template<class R, class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> struct BOOST_MEM_FN_NAME(cmf8): public mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8, R (BOOST_MEM_FN_CC T::*) (A1, A2, A3, A4, A5, A6, A7, A8) const>
-{
-    typedef R (BOOST_MEM_FN_CC T::*F) (A1, A2, A3, A4, A5, A6, A7, A8) const;
-    explicit BOOST_MEM_FN_NAME(cmf8)(F f): mf<R>::BOOST_NESTED_TEMPLATE BOOST_MEM_FN_NAME2(cmf8)<R, T, A1, A2, A3, A4, A5, A6, A7, A8, F>(f) {}
-};
-
diff --git a/inst/include/boost/bind/placeholders.hpp b/inst/include/boost/bind/placeholders.hpp
index 5e4b96d8d..2daba9e94 100644
--- a/inst/include/boost/bind/placeholders.hpp
+++ b/inst/include/boost/bind/placeholders.hpp
@@ -10,14 +10,13 @@
 //
 //  bind/placeholders.hpp - _N definitions
 //
-//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright 2015 Peter Dimov
+//  Copyright 2002, 2015, 2024 Peter Dimov
 //
 //  Distributed under the Boost Software License, Version 1.0.
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 //
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
+//  See http://www.boost.org/libs/bind for documentation.
 //
 
 #include <boost/bind/arg.hpp>
@@ -29,19 +28,7 @@ namespace boost
 namespace placeholders
 {
 
-#if defined(BOOST_BORLANDC) || defined(__GNUC__) && (__GNUC__ < 4)
-
-inline boost::arg<1> _1() { return boost::arg<1>(); }
-inline boost::arg<2> _2() { return boost::arg<2>(); }
-inline boost::arg<3> _3() { return boost::arg<3>(); }
-inline boost::arg<4> _4() { return boost::arg<4>(); }
-inline boost::arg<5> _5() { return boost::arg<5>(); }
-inline boost::arg<6> _6() { return boost::arg<6>(); }
-inline boost::arg<7> _7() { return boost::arg<7>(); }
-inline boost::arg<8> _8() { return boost::arg<8>(); }
-inline boost::arg<9> _9() { return boost::arg<9>(); }
-
-#elif !defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+#if !defined(BOOST_NO_CXX17_INLINE_VARIABLES)
 
 BOOST_INLINE_CONSTEXPR boost::arg<1> _1;
 BOOST_INLINE_CONSTEXPR boost::arg<2> _2;
diff --git a/inst/include/boost/bind/protect.hpp b/inst/include/boost/bind/protect.hpp
index 9c7c120aa..f6914594a 100644
--- a/inst/include/boost/bind/protect.hpp
+++ b/inst/include/boost/bind/protect.hpp
@@ -12,9 +12,6 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
-#include <boost/config/workaround.hpp>
 #include <utility>
 
 namespace boost
@@ -23,8 +20,6 @@ namespace boost
 namespace _bi
 {
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !(defined(BOOST_GCC) && BOOST_GCC < 40600)
-
 template<class T> struct protect_make_void
 {
     typedef void type;
@@ -62,281 +57,6 @@ template<class F> class protected_bind_t: public protect_result_type<F>
     }
 };
 
-#else
-
-template<class F> class protected_bind_t
-{
-private:
-
-    F f_;
-
-public:
-
-    typedef typename F::result_type result_type;
-
-    explicit protected_bind_t(F f): f_(f)
-    {
-    }
-
-    result_type operator()()
-    {
-        return f_();
-    }
-
-    result_type operator()() const
-    {
-        return f_();
-    }
-
-    template<class A1> result_type operator()(A1 & a1)
-    {
-        return f_(a1);
-    }
-
-    template<class A1> result_type operator()(A1 & a1) const
-    {
-        return f_(a1);
-    }
-
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1> result_type operator()(const A1 & a1)
-    {
-        return f_(a1);
-    }
-
-    template<class A1> result_type operator()(const A1 & a1) const
-    {
-        return f_(a1);
-    }
-
-#endif
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 & a2)
-    {
-        return f_(a1, a2);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 & a2) const
-    {
-        return f_(a1, a2);
-    }
-
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 & a2)
-    {
-        return f_(a1, a2);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 & a2) const
-    {
-        return f_(a1, a2);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 const & a2)
-    {
-        return f_(a1, a2);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 & a1, A2 const & a2) const
-    {
-        return f_(a1, a2);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 const & a2)
-    {
-        return f_(a1, a2);
-    }
-
-    template<class A1, class A2> result_type operator()(A1 const & a1, A2 const & a2) const
-    {
-        return f_(a1, a2);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3> result_type operator()(A1 & a1, A2 & a2, A3 & a3)
-    {
-        return f_(a1, a2, a3);
-    }
-
-    template<class A1, class A2, class A3> result_type operator()(A1 & a1, A2 & a2, A3 & a3) const
-    {
-        return f_(a1, a2, a3);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3)
-    {
-        return f_(a1, a2, a3);
-    }
-
-    template<class A1, class A2, class A3> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3) const
-    {
-        return f_(a1, a2, a3);
-    }
-    
-#endif
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4)
-    {
-        return f_(a1, a2, a3, a4);
-    }
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4) const
-    {
-        return f_(a1, a2, a3, a4);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4)
-    {
-        return f_(a1, a2, a3, a4);
-    }
-
-    template<class A1, class A2, class A3, class A4> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4) const
-    {
-        return f_(a1, a2, a3, a4);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5)
-    {
-        return f_(a1, a2, a3, a4, a5);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5) const
-    {
-        return f_(a1, a2, a3, a4, a5);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5)
-    {
-        return f_(a1, a2, a3, a4, a5);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5) const
-    {
-        return f_(a1, a2, a3, a4, a5);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6)
-    {
-        return f_(a1, a2, a3, a4, a5, a6);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6)
-    {
-        return f_(a1, a2, a3, a4, a5, a6);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7)
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7)
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8)
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8)
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8);
-    }
-
-#endif
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9)
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 & a1, A2 & a2, A3 & a3, A4 & a4, A5 & a5, A6 & a6, A7 & a7, A8 & a8, A9 & a9) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-    }
-    
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
- && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9)
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-    }
-
-    template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> result_type operator()(A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9) const
-    {
-        return f_(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-    }
-
-#endif
-};
-
-#endif
-
 } // namespace _bi
 
 template<class F> _bi::protected_bind_t<F> protect(F f)
diff --git a/inst/include/boost/bind/std_placeholders.hpp b/inst/include/boost/bind/std_placeholders.hpp
index 125ff2405..36cfed687 100644
--- a/inst/include/boost/bind/std_placeholders.hpp
+++ b/inst/include/boost/bind/std_placeholders.hpp
@@ -11,12 +11,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/bind/detail/requires_cxx11.hpp>
 #include <boost/is_placeholder.hpp>
-#include <boost/config.hpp>
-
-#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) && !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
-
 #include <functional>
 #include <type_traits>
 
@@ -35,6 +30,4 @@ template<> struct is_placeholder< typename std::decay<decltype(std::placeholders
 
 } // namespace boost
 
-#endif
-
 #endif // #ifndef BOOST_BIND_STD_PLACEHOLDERS_HPP_INCLUDED
diff --git a/inst/include/boost/bind/storage.hpp b/inst/include/boost/bind/storage.hpp
deleted file mode 100644
index 2ab0db185..000000000
--- a/inst/include/boost/bind/storage.hpp
+++ /dev/null
@@ -1,476 +0,0 @@
-#ifndef BOOST_BIND_STORAGE_HPP_INCLUDED
-#define BOOST_BIND_STORAGE_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//
-//  bind/storage.hpp
-//
-//  boost/bind.hpp support header, optimized storage
-//
-//  Copyright (c) 2006 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-//
-//  See http://www.boost.org/libs/bind/bind.html for documentation.
-//
-
-#include <boost/bind/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
-#include <boost/bind/arg.hpp>
-
-#ifdef BOOST_MSVC
-# pragma warning(push)
-# pragma warning(disable: 4512) // assignment operator could not be generated
-#endif
-
-namespace boost
-{
-
-namespace _bi
-{
-
-// 1
-
-template<class A1> struct storage1
-{
-    explicit storage1( A1 a1 ): a1_( a1 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        BOOST_BIND_VISIT_EACH(v, a1_, 0);
-    }
-
-    A1 a1_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_BORLANDC )
-
-template<int I> struct storage1< boost::arg<I> >
-{
-    explicit storage1( boost::arg<I> ) {}
-
-    template<class V> void accept(V &) const { }
-
-    static boost::arg<I> a1_() { return boost::arg<I>(); }
-};
-
-template<int I> struct storage1< boost::arg<I> (*) () >
-{
-    explicit storage1( boost::arg<I> (*) () ) {}
-
-    template<class V> void accept(V &) const { }
-
-    static boost::arg<I> a1_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 2
-
-template<class A1, class A2> struct storage2: public storage1<A1>
-{
-    typedef storage1<A1> inherited;
-
-    storage2( A1 a1, A2 a2 ): storage1<A1>( a1 ), a2_( a2 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a2_, 0);
-    }
-
-    A2 a2_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, int I> struct storage2< A1, boost::arg<I> >: public storage1<A1>
-{
-    typedef storage1<A1> inherited;
-
-    storage2( A1 a1, boost::arg<I> ): storage1<A1>( a1 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a2_() { return boost::arg<I>(); }
-};
-
-template<class A1, int I> struct storage2< A1, boost::arg<I> (*) () >: public storage1<A1>
-{
-    typedef storage1<A1> inherited;
-
-    storage2( A1 a1, boost::arg<I> (*) () ): storage1<A1>( a1 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a2_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 3
-
-template<class A1, class A2, class A3> struct storage3: public storage2< A1, A2 >
-{
-    typedef storage2<A1, A2> inherited;
-
-    storage3( A1 a1, A2 a2, A3 a3 ): storage2<A1, A2>( a1, a2 ), a3_( a3 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a3_, 0);
-    }
-
-    A3 a3_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, int I> struct storage3< A1, A2, boost::arg<I> >: public storage2< A1, A2 >
-{
-    typedef storage2<A1, A2> inherited;
-
-    storage3( A1 a1, A2 a2, boost::arg<I> ): storage2<A1, A2>( a1, a2 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a3_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, int I> struct storage3< A1, A2, boost::arg<I> (*) () >: public storage2< A1, A2 >
-{
-    typedef storage2<A1, A2> inherited;
-
-    storage3( A1 a1, A2 a2, boost::arg<I> (*) () ): storage2<A1, A2>( a1, a2 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a3_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 4
-
-template<class A1, class A2, class A3, class A4> struct storage4: public storage3< A1, A2, A3 >
-{
-    typedef storage3<A1, A2, A3> inherited;
-
-    storage4( A1 a1, A2 a2, A3 a3, A4 a4 ): storage3<A1, A2, A3>( a1, a2, a3 ), a4_( a4 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a4_, 0);
-    }
-
-    A4 a4_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, int I> struct storage4< A1, A2, A3, boost::arg<I> >: public storage3< A1, A2, A3 >
-{
-    typedef storage3<A1, A2, A3> inherited;
-
-    storage4( A1 a1, A2 a2, A3 a3, boost::arg<I> ): storage3<A1, A2, A3>( a1, a2, a3 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a4_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, int I> struct storage4< A1, A2, A3, boost::arg<I> (*) () >: public storage3< A1, A2, A3 >
-{
-    typedef storage3<A1, A2, A3> inherited;
-
-    storage4( A1 a1, A2 a2, A3 a3, boost::arg<I> (*) () ): storage3<A1, A2, A3>( a1, a2, a3 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a4_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 5
-
-template<class A1, class A2, class A3, class A4, class A5> struct storage5: public storage4< A1, A2, A3, A4 >
-{
-    typedef storage4<A1, A2, A3, A4> inherited;
-
-    storage5( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5 ): storage4<A1, A2, A3, A4>( a1, a2, a3, a4 ), a5_( a5 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a5_, 0);
-    }
-
-    A5 a5_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, int I> struct storage5< A1, A2, A3, A4, boost::arg<I> >: public storage4< A1, A2, A3, A4 >
-{
-    typedef storage4<A1, A2, A3, A4> inherited;
-
-    storage5( A1 a1, A2 a2, A3 a3, A4 a4, boost::arg<I> ): storage4<A1, A2, A3, A4>( a1, a2, a3, a4 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a5_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, int I> struct storage5< A1, A2, A3, A4, boost::arg<I> (*) () >: public storage4< A1, A2, A3, A4 >
-{
-    typedef storage4<A1, A2, A3, A4> inherited;
-
-    storage5( A1 a1, A2 a2, A3 a3, A4 a4, boost::arg<I> (*) () ): storage4<A1, A2, A3, A4>( a1, a2, a3, a4 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a5_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 6
-
-template<class A1, class A2, class A3, class A4, class A5, class A6> struct storage6: public storage5< A1, A2, A3, A4, A5 >
-{
-    typedef storage5<A1, A2, A3, A4, A5> inherited;
-
-    storage6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6 ): storage5<A1, A2, A3, A4, A5>( a1, a2, a3, a4, a5 ), a6_( a6 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a6_, 0);
-    }
-
-    A6 a6_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, int I> struct storage6< A1, A2, A3, A4, A5, boost::arg<I> >: public storage5< A1, A2, A3, A4, A5 >
-{
-    typedef storage5<A1, A2, A3, A4, A5> inherited;
-
-    storage6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, boost::arg<I> ): storage5<A1, A2, A3, A4, A5>( a1, a2, a3, a4, a5 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a6_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, int I> struct storage6< A1, A2, A3, A4, A5, boost::arg<I> (*) () >: public storage5< A1, A2, A3, A4, A5 >
-{
-    typedef storage5<A1, A2, A3, A4, A5> inherited;
-
-    storage6( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, boost::arg<I> (*) () ): storage5<A1, A2, A3, A4, A5>( a1, a2, a3, a4, a5 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a6_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 7
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7> struct storage7: public storage6< A1, A2, A3, A4, A5, A6 >
-{
-    typedef storage6<A1, A2, A3, A4, A5, A6> inherited;
-
-    storage7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7 ): storage6<A1, A2, A3, A4, A5, A6>( a1, a2, a3, a4, a5, a6 ), a7_( a7 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a7_, 0);
-    }
-
-    A7 a7_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, int I> struct storage7< A1, A2, A3, A4, A5, A6, boost::arg<I> >: public storage6< A1, A2, A3, A4, A5, A6 >
-{
-    typedef storage6<A1, A2, A3, A4, A5, A6> inherited;
-
-    storage7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, boost::arg<I> ): storage6<A1, A2, A3, A4, A5, A6>( a1, a2, a3, a4, a5, a6 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a7_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, int I> struct storage7< A1, A2, A3, A4, A5, A6, boost::arg<I> (*) () >: public storage6< A1, A2, A3, A4, A5, A6 >
-{
-    typedef storage6<A1, A2, A3, A4, A5, A6> inherited;
-
-    storage7( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, boost::arg<I> (*) () ): storage6<A1, A2, A3, A4, A5, A6>( a1, a2, a3, a4, a5, a6 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a7_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 8
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> struct storage8: public storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-    typedef storage7<A1, A2, A3, A4, A5, A6, A7> inherited;
-
-    storage8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8 ): storage7<A1, A2, A3, A4, A5, A6, A7>( a1, a2, a3, a4, a5, a6, a7 ), a8_( a8 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a8_, 0);
-    }
-
-    A8 a8_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, int I> struct storage8< A1, A2, A3, A4, A5, A6, A7, boost::arg<I> >: public storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-    typedef storage7<A1, A2, A3, A4, A5, A6, A7> inherited;
-
-    storage8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, boost::arg<I> ): storage7<A1, A2, A3, A4, A5, A6, A7>( a1, a2, a3, a4, a5, a6, a7 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a8_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, int I> struct storage8< A1, A2, A3, A4, A5, A6, A7, boost::arg<I> (*) () >: public storage7< A1, A2, A3, A4, A5, A6, A7 >
-{
-    typedef storage7<A1, A2, A3, A4, A5, A6, A7> inherited;
-
-    storage8( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, boost::arg<I> (*) () ): storage7<A1, A2, A3, A4, A5, A6, A7>( a1, a2, a3, a4, a5, a6, a7 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a8_() { return boost::arg<I>(); }
-};
-
-#endif
-
-// 9
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> struct storage9: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-    typedef storage8<A1, A2, A3, A4, A5, A6, A7, A8> inherited;
-
-    storage9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9 ): storage8<A1, A2, A3, A4, A5, A6, A7, A8>( a1, a2, a3, a4, a5, a6, a7, a8 ), a9_( a9 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-        BOOST_BIND_VISIT_EACH(v, a9_, 0);
-    }
-
-    A9 a9_;
-};
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, int I> struct storage9< A1, A2, A3, A4, A5, A6, A7, A8, boost::arg<I> >: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-    typedef storage8<A1, A2, A3, A4, A5, A6, A7, A8> inherited;
-
-    storage9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, boost::arg<I> ): storage8<A1, A2, A3, A4, A5, A6, A7, A8>( a1, a2, a3, a4, a5, a6, a7, a8 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a9_() { return boost::arg<I>(); }
-};
-
-template<class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, int I> struct storage9< A1, A2, A3, A4, A5, A6, A7, A8, boost::arg<I> (*) () >: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 >
-{
-    typedef storage8<A1, A2, A3, A4, A5, A6, A7, A8> inherited;
-
-    storage9( A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, boost::arg<I> (*) () ): storage8<A1, A2, A3, A4, A5, A6, A7, A8>( a1, a2, a3, a4, a5, a6, a7, a8 ) {}
-
-    template<class V> void accept(V & v) const
-    {
-        inherited::accept(v);
-    }
-
-    static boost::arg<I> a9_() { return boost::arg<I>(); }
-};
-
-#endif
-
-} // namespace _bi
-
-} // namespace boost
-
-#ifdef BOOST_MSVC
-# pragma warning(default: 4512) // assignment operator could not be generated
-# pragma warning(pop)
-#endif
-
-#endif // #ifndef BOOST_BIND_STORAGE_HPP_INCLUDED
diff --git a/inst/include/boost/compute/context.hpp b/inst/include/boost/compute/context.hpp
index 13154a968..3c2bd3147 100644
--- a/inst/include/boost/compute/context.hpp
+++ b/inst/include/boost/compute/context.hpp
@@ -18,6 +18,7 @@
 #include <boost/compute/config.hpp>
 #include <boost/compute/device.hpp>
 #include <boost/compute/exception/opencl_error.hpp>
+#include <boost/compute/exception/set_default_queue_error.hpp>
 #include <boost/compute/detail/assert_cl_success.hpp>
 
 namespace boost {
diff --git a/inst/include/boost/compute/detail/sha1.hpp b/inst/include/boost/compute/detail/sha1.hpp
index 5afe5f9c4..249735ece 100644
--- a/inst/include/boost/compute/detail/sha1.hpp
+++ b/inst/include/boost/compute/detail/sha1.hpp
@@ -37,13 +37,22 @@ class sha1 {
         }
 
         operator std::string() {
+            #if BOOST_VERSION >= 108600
+            boost::uuids::detail::sha1::digest_type digest;
+            #else
             unsigned int digest[5];
+            #endif
+
             h.get_digest(digest);
 
             std::ostringstream buf;
+            #if BOOST_VERSION >= 108600
+            for(int i = 0; i < 20; ++i)
+                buf << std::hex << std::setfill('0') << std::setw(2) << +digest[i];
+            #else
             for(int i = 0; i < 5; ++i)
                 buf << std::hex << std::setfill('0') << std::setw(8) << digest[i];
-
+            #endif
             return buf.str();
         }
     private:
diff --git a/inst/include/boost/compute/exception/set_default_queue_error.hpp b/inst/include/boost/compute/exception/set_default_queue_error.hpp
new file mode 100644
index 000000000..7bab3c0ad
--- /dev/null
+++ b/inst/include/boost/compute/exception/set_default_queue_error.hpp
@@ -0,0 +1,47 @@
+//---------------------------------------------------------------------------//
+// Copyright (c) 2019 Anthony Chang <ac.chang@outlook.com>
+//
+// Distributed under the Boost Software License, Version 1.0
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+// See http://boostorg.github.com/compute for more information.
+//---------------------------------------------------------------------------//
+
+#ifndef BOOST_COMPUTE_EXCEPTION_SET_DEFAULT_QUEUE_ERROR_HPP
+#define BOOST_COMPUTE_EXCEPTION_SET_DEFAULT_QUEUE_ERROR_HPP
+
+#include <exception>
+
+namespace boost {
+namespace compute {
+
+/// \class set_default_queue_error
+/// \brief Exception thrown when failure to set default command queue 
+///
+/// This exception is thrown when Boost.Compute fails to set up user-provided 
+/// default command queue for the system. 
+class set_default_queue_error : public std::exception
+{
+public:
+    /// Creates a new set_default_queue_error exception object.
+    set_default_queue_error() throw()
+    {
+    }
+
+    /// Destroys the set_default_queue_error object.
+    ~set_default_queue_error() throw()
+    {
+    }
+
+    /// Returns a string with a description of the error.
+    const char* what() const throw()
+    {
+        return "User command queue mismatches default device and/or context";
+    }
+};
+
+} // end compute namespace
+} // end boost namespace
+
+#endif // BOOST_COMPUTE_EXCEPTION_SET_DEFAULT_QUEUE_ERROR_HPP
diff --git a/inst/include/boost/compute/kernel.hpp b/inst/include/boost/compute/kernel.hpp
index 48aecca92..9f163b0df 100644
--- a/inst/include/boost/compute/kernel.hpp
+++ b/inst/include/boost/compute/kernel.hpp
@@ -363,6 +363,11 @@ class kernel
     /// // set argument to a local buffer with storage for 32 float's
     /// kernel.set_arg(0, local_buffer<float>(32));
     /// \endcode
+    ///
+    /// For setting NULL to global and constant memory arguments (C++11):
+    /// \code
+    /// kernel.set_arg(0, nullptr);
+    /// \endcode
     template<class T>
     void set_arg(size_t index, const T &value)
     {
@@ -371,6 +376,14 @@ class kernel
         detail::set_kernel_arg<T>()(*this, index, value);
     }
 
+    #ifndef BOOST_NO_CXX11_NULLPTR
+    /// \overload
+    void set_arg(size_t index, std::nullptr_t nul)
+    {
+        set_arg(index, sizeof(cl_mem), NULL);
+    }
+    #endif // BOOST_NO_CXX11_NULLPTR
+
     /// \internal_
     void set_arg(size_t index, const cl_mem mem)
     {
diff --git a/inst/include/boost/compute/memory/local_buffer.hpp b/inst/include/boost/compute/memory/local_buffer.hpp
index aaf631317..76ecf56a6 100644
--- a/inst/include/boost/compute/memory/local_buffer.hpp
+++ b/inst/include/boost/compute/memory/local_buffer.hpp
@@ -88,4 +88,4 @@ struct set_kernel_arg<local_buffer<T> >
 } // end compute namespace
 } // end boost namespace
 
-#endif // BOOST_COMPUTE_MEMORY_SVM_PTR_HPP
+#endif // BOOST_COMPUTE_MEMORY_LOCAL_BUFFER_HPP
diff --git a/inst/include/boost/compute/system.hpp b/inst/include/boost/compute/system.hpp
index 5f29893b9..beb0e8035 100644
--- a/inst/include/boost/compute/system.hpp
+++ b/inst/include/boost/compute/system.hpp
@@ -17,6 +17,18 @@
 
 #include <boost/throw_exception.hpp>
 
+#if defined(BOOST_COMPUTE_THREAD_SAFE) 
+#  if defined(BOOST_COMPUTE_USE_CPP11)
+#    include <mutex>
+#    include <thread>
+#    include <atomic>
+#  else
+#    include <boost/thread/mutex.hpp>
+#    include <boost/thread/lock_guard.hpp>
+#    include <boost/atomic.hpp>
+#  endif
+#endif 
+
 #include <boost/compute/cl.hpp>
 #include <boost/compute/device.hpp>
 #include <boost/compute/context.hpp>
@@ -24,6 +36,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/detail/getenv.hpp>
 #include <boost/compute/exception/no_device_found.hpp>
+#include <boost/compute/exception/context_error.hpp>
 
 namespace boost {
 namespace compute {
@@ -78,9 +91,7 @@ class system
     /// \endcode
     static device default_device()
     {
-        static device default_device = find_default_device();
-
-        return default_device;
+        return init_default_device();
     }
 
     /// Returns the device with \p name.
@@ -149,17 +160,27 @@ class system
     /// same context object being returned.
     static context default_context()
     {
-        static context default_context(default_device());
-
-        return default_context;
+        return init_default_context();
     }
 
     /// Returns the default command queue for the system.
-    static command_queue& default_queue()
+    ///
+    /// If user-provided command queue is given, the system-wide default context
+    /// and default device will be set up appropriately so that the default queue
+    /// matches the default context and device.
+    ///
+    /// If the OpenCL context and device associated with user-provided command queue 
+    /// does not match the default context and device that have already been set,
+    /// a set_default_queue_error exception is thrown. For example:
+    ///
+    /// \snippet test/test_attach_user_queue_error.cpp queue_mismatch
+    ///
+    /// The default queue is created once on the first time this function is
+    /// called. Calling this function multiple times will always result in the
+    /// same command queue object being returned.
+    static command_queue& default_queue(const command_queue &user_queue = command_queue())
     {
-        static command_queue queue(default_context(), default_device());
-
-        return queue;
+        return init_default_queue(user_queue);
     }
 
     /// Blocks until all outstanding computations on the default
@@ -280,6 +301,144 @@ class system
     {
         return str.find(pattern) != std::string::npos;
     }
+
+    /// \internal_
+    static device init_default_device(const device &user_device = device())
+    {
+        static device default_device;
+
+#ifdef BOOST_COMPUTE_THREAD_SAFE
+    #ifdef BOOST_COMPUTE_USE_CPP11
+        using namespace std;
+    #else 
+        using namespace boost;
+    #endif 
+        static atomic<bool> is_init;
+        static mutex init_mutex;
+
+        bool is_init_value = is_init.load(memory_order_consume);
+        if (!is_init_value)
+        {
+            lock_guard<mutex> lock(init_mutex);
+            is_init_value = is_init.load(memory_order_consume);
+            if (!is_init_value)
+            {
+                default_device = user_device.get() ? 
+                    user_device : find_default_device();
+
+                is_init.store(true, memory_order_release);
+            }
+        }
+#else // BOOST_COMPUTE_THREAD_SAFE
+        if (!default_device.get())
+        {
+            default_device = user_device.get() ? 
+                user_device : find_default_device();
+        }
+#endif // BOOST_COMPUTE_THREAD_SAFE   
+        return default_device;
+    }
+
+    /// \internal_
+    static context init_default_context(const context &user_context = context())
+    {
+        static context default_context;
+
+#ifdef BOOST_COMPUTE_THREAD_SAFE
+    #ifdef BOOST_COMPUTE_USE_CPP11
+        using namespace std;
+    #else 
+        using namespace boost;
+    #endif 
+        static atomic<bool> is_init;
+        static mutex init_mutex;
+
+        bool is_init_value = is_init.load(memory_order_consume);
+        if (!is_init_value)
+        {
+            lock_guard<mutex> lock(init_mutex);
+            is_init_value = is_init.load(memory_order_consume);
+            if (!is_init_value)
+            {
+                default_context = user_context.get() ? 
+                    user_context : context(default_device());
+
+                is_init.store(true, memory_order_release);
+            }
+        }
+#else // BOOST_COMPUTE_THREAD_SAFE
+        if (!default_context.get())
+        {
+            default_context = user_context.get() ?
+                user_context : context(default_device());
+        }
+#endif // BOOST_COMPUTE_THREAD_SAFE
+        return default_context;
+    }
+
+    /// \internal_
+    static void init_default_device_and_context(const command_queue &user_queue)
+    {
+        device user_device = user_queue.get_device();
+        context user_context = user_queue.get_context();
+
+        if ( (user_device != init_default_device(user_device)) ||
+             (user_context != init_default_context(user_context)) )
+        {
+            // Try invoking default_queue() before anything else
+            BOOST_THROW_EXCEPTION(set_default_queue_error());  
+        }
+    }
+    
+    /// \internal_
+    static command_queue& init_default_queue(const command_queue &user_queue = command_queue())
+    {
+        static command_queue default_queue;
+
+#ifdef BOOST_COMPUTE_THREAD_SAFE
+    #ifdef BOOST_COMPUTE_USE_CPP11
+        using namespace std;
+    #else 
+        using namespace boost;
+    #endif 
+        static atomic<bool> is_init;
+        static mutex init_mutex;
+
+        bool is_init_value = is_init.load(memory_order_consume);
+        if (!is_init_value)
+        {
+            lock_guard<mutex> lock(init_mutex);
+            is_init_value = is_init.load(memory_order_consume);
+            if (!is_init_value)
+            {
+                if (user_queue.get())
+                    init_default_device_and_context(user_queue);
+
+                default_queue = user_queue.get() ? 
+                    user_queue : 
+                    command_queue(default_context(), default_device());
+
+                is_init.store(true, memory_order_release);
+            }
+        }
+#else // BOOST_COMPUTE_THREAD_SAFE
+        if (!default_queue.get())
+        {
+            if (user_queue.get())
+                init_default_device_and_context(user_queue);
+
+            default_queue = user_queue.get() ? 
+                user_queue :
+                command_queue(default_context(), default_device());
+        }
+#endif // BOOST_COMPUTE_THREAD_SAFE
+        else
+        {
+            BOOST_ASSERT_MSG(user_queue.get() == 0, 
+                "Default command queue has already been set.");
+        }
+        return default_queue;
+    }
 };
 
 } // end compute namespace
diff --git a/inst/include/boost/compute/types/fundamental.hpp b/inst/include/boost/compute/types/fundamental.hpp
index f1b2e031d..2687d8a84 100644
--- a/inst/include/boost/compute/types/fundamental.hpp
+++ b/inst/include/boost/compute/types/fundamental.hpp
@@ -14,6 +14,8 @@
 #include <cstring>
 #include <ostream>
 
+#include <boost/static_assert.hpp>
+
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/comma.hpp>
 #include <boost/preprocessor/repetition.hpp>
diff --git a/inst/include/boost/config/assert_cxx17.hpp b/inst/include/boost/config/assert_cxx17.hpp
index ffa1ae918..e2402515f 100644
--- a/inst/include/boost/config/assert_cxx17.hpp
+++ b/inst/include/boost/config/assert_cxx17.hpp
@@ -12,6 +12,9 @@
 #include <boost/config.hpp>
 #include <boost/config/assert_cxx14.hpp>
 
+#ifdef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#  error "Your compiler appears not to be fully C++17 compliant.  Detected via defect macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS."
+#endif
 #ifdef BOOST_NO_CXX17_DEDUCTION_GUIDES
 #  error "Your compiler appears not to be fully C++17 compliant.  Detected via defect macro BOOST_NO_CXX17_DEDUCTION_GUIDES."
 #endif
diff --git a/inst/include/boost/config/compiler/borland.hpp b/inst/include/boost/config/compiler/borland.hpp
index 567636c5b..51d518869 100644
--- a/inst/include/boost/config/compiler/borland.hpp
+++ b/inst/include/boost/config/compiler/borland.hpp
@@ -245,6 +245,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #if __BORLANDC__ >= 0x590
 #  define BOOST_HAS_TR1_HASH
diff --git a/inst/include/boost/config/compiler/clang.hpp b/inst/include/boost/config/compiler/clang.hpp
index 1eeed315d..f9a5050b4 100644
--- a/inst/include/boost/config/compiler/clang.hpp
+++ b/inst/include/boost/config/compiler/clang.hpp
@@ -321,6 +321,10 @@
 #  define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
 
+#if (__clang_major__ < 4) || (__cplusplus < 201406L) /* non-standard value that is greater than 201402, which is reported by clang 4.0.0 for C++1z */
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 #if __cplusplus < 201103L
 #define BOOST_NO_CXX11_SFINAE_EXPR
 #endif
diff --git a/inst/include/boost/config/compiler/codegear.hpp b/inst/include/boost/config/compiler/codegear.hpp
index 4d3f42aef..49f934c02 100644
--- a/inst/include/boost/config/compiler/codegear.hpp
+++ b/inst/include/boost/config/compiler/codegear.hpp
@@ -316,6 +316,10 @@
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 //
 // TR1 macros:
 //
diff --git a/inst/include/boost/config/compiler/common_edg.hpp b/inst/include/boost/config/compiler/common_edg.hpp
index dc049893c..0d59ae0e6 100644
--- a/inst/include/boost/config/compiler/common_edg.hpp
+++ b/inst/include/boost/config/compiler/common_edg.hpp
@@ -171,10 +171,12 @@
 #if !defined(__cpp_fold_expressions) || (__cpp_fold_expressions < 201603)
 #  define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
-
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #ifdef c_plusplus
 // EDG has "long long" in non-strict mode
diff --git a/inst/include/boost/config/compiler/digitalmars.hpp b/inst/include/boost/config/compiler/digitalmars.hpp
index bb56ff6c0..4fa347ab8 100644
--- a/inst/include/boost/config/compiler/digitalmars.hpp
+++ b/inst/include/boost/config/compiler/digitalmars.hpp
@@ -130,6 +130,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #if (__DMC__ <= 0x840)
 #error "Compiler not supported or configured - please reconfigure"
diff --git a/inst/include/boost/config/compiler/gcc.hpp b/inst/include/boost/config/compiler/gcc.hpp
index 2f1fe5508..fc05a9186 100644
--- a/inst/include/boost/config/compiler/gcc.hpp
+++ b/inst/include/boost/config/compiler/gcc.hpp
@@ -319,6 +319,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if (__GNUC__ < 7) || (__cplusplus < 201703L)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #if __GNUC__ >= 7
 #  define BOOST_FALLTHROUGH __attribute__((fallthrough))
diff --git a/inst/include/boost/config/compiler/gcc_xml.hpp b/inst/include/boost/config/compiler/gcc_xml.hpp
index 75cac44e9..e23b14d0f 100644
--- a/inst/include/boost/config/compiler/gcc_xml.hpp
+++ b/inst/include/boost/config/compiler/gcc_xml.hpp
@@ -108,7 +108,8 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #define BOOST_COMPILER "GCC-XML C++ version " __GCCXML__
-
-
diff --git a/inst/include/boost/config/compiler/hp_acc.hpp b/inst/include/boost/config/compiler/hp_acc.hpp
index 25636324b..42e35e553 100644
--- a/inst/include/boost/config/compiler/hp_acc.hpp
+++ b/inst/include/boost/config/compiler/hp_acc.hpp
@@ -137,6 +137,10 @@
   #define BOOST_NO_CXX11_VARIADIC_MACROS
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 #endif
 
 //
diff --git a/inst/include/boost/config/compiler/metrowerks.hpp b/inst/include/boost/config/compiler/metrowerks.hpp
index 448ab67bc..c38efb321 100644
--- a/inst/include/boost/config/compiler/metrowerks.hpp
+++ b/inst/include/boost/config/compiler/metrowerks.hpp
@@ -173,6 +173,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 #define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
 
diff --git a/inst/include/boost/config/compiler/mpw.hpp b/inst/include/boost/config/compiler/mpw.hpp
index 8433f3719..3adb61221 100644
--- a/inst/include/boost/config/compiler/mpw.hpp
+++ b/inst/include/boost/config/compiler/mpw.hpp
@@ -122,6 +122,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 //
 // versions check:
diff --git a/inst/include/boost/config/compiler/nvcc.hpp b/inst/include/boost/config/compiler/nvcc.hpp
index 419dd724a..147f75dbf 100644
--- a/inst/include/boost/config/compiler/nvcc.hpp
+++ b/inst/include/boost/config/compiler/nvcc.hpp
@@ -57,5 +57,8 @@
 #  define BOOST_NO_CXX11_NOEXCEPT
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
 #endif
 
+#endif
diff --git a/inst/include/boost/config/compiler/pathscale.hpp b/inst/include/boost/config/compiler/pathscale.hpp
index 5348cf7f7..59ab9b007 100644
--- a/inst/include/boost/config/compiler/pathscale.hpp
+++ b/inst/include/boost/config/compiler/pathscale.hpp
@@ -135,4 +135,7 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 #endif
diff --git a/inst/include/boost/config/compiler/sunpro_cc.hpp b/inst/include/boost/config/compiler/sunpro_cc.hpp
index 490dc76dc..334b604bb 100644
--- a/inst/include/boost/config/compiler/sunpro_cc.hpp
+++ b/inst/include/boost/config/compiler/sunpro_cc.hpp
@@ -194,6 +194,9 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 // Turn on threading support for Solaris 12.
 // Ticket #11972
diff --git a/inst/include/boost/config/compiler/vacpp.hpp b/inst/include/boost/config/compiler/vacpp.hpp
index 9cfa1adf8..3794d3601 100644
--- a/inst/include/boost/config/compiler/vacpp.hpp
+++ b/inst/include/boost/config/compiler/vacpp.hpp
@@ -184,3 +184,6 @@
 #if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
 #  define BOOST_NO_CXX17_IF_CONSTEXPR
 #endif
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
diff --git a/inst/include/boost/config/compiler/visualc.hpp b/inst/include/boost/config/compiler/visualc.hpp
index c0ada098a..ce0fc15e3 100644
--- a/inst/include/boost/config/compiler/visualc.hpp
+++ b/inst/include/boost/config/compiler/visualc.hpp
@@ -263,6 +263,9 @@
 #define BOOST_NO_CXX17_INLINE_VARIABLES
 #define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
+#if (_MSC_VER < 1914) || (_MSVC_LANG < 201703)
+#define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
 
 //
 // Things that don't work in clr mode:
diff --git a/inst/include/boost/config/compiler/xlcpp.hpp b/inst/include/boost/config/compiler/xlcpp.hpp
index 99b8b2455..4a4477d9d 100644
--- a/inst/include/boost/config/compiler/xlcpp.hpp
+++ b/inst/include/boost/config/compiler/xlcpp.hpp
@@ -265,6 +265,10 @@
 #  define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #endif
 
+#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
+#  define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
+#endif
+
 #if !__has_feature(cxx_thread_local)
 #  define BOOST_NO_CXX11_THREAD_LOCAL
 #endif
diff --git a/inst/include/boost/config/compiler/xlcpp_zos.hpp b/inst/include/boost/config/compiler/xlcpp_zos.hpp
index 9a177f1bb..0b288a880 100644
--- a/inst/include/boost/config/compiler/xlcpp_zos.hpp
+++ b/inst/include/boost/config/compiler/xlcpp_zos.hpp
@@ -157,6 +157,7 @@
 #define BOOST_NO_CXX17_INLINE_VARIABLES
 #define BOOST_NO_CXX17_FOLD_EXPRESSIONS
 #define BOOST_NO_CXX17_IF_CONSTEXPR
+#define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
 
 // -------------------------------------
 
diff --git a/inst/include/boost/config/detail/cxx_composite.hpp b/inst/include/boost/config/detail/cxx_composite.hpp
index 9c2c01ead..acd8e8496 100644
--- a/inst/include/boost/config/detail/cxx_composite.hpp
+++ b/inst/include/boost/config/detail/cxx_composite.hpp
@@ -164,6 +164,7 @@
 #endif
 
 #if defined(BOOST_NO_CXX14)\
+   || defined(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS)\
    || defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)\
    || defined(BOOST_NO_CXX17_FOLD_EXPRESSIONS)\
    || defined(BOOST_NO_CXX17_HDR_ANY)\
diff --git a/inst/include/boost/container/adaptive_pool.hpp b/inst/include/boost/container/adaptive_pool.hpp
index fb0e24b0b..a6a89fa59 100644
--- a/inst/include/boost/container/adaptive_pool.hpp
+++ b/inst/include/boost/container/adaptive_pool.hpp
@@ -34,7 +34,6 @@
 #include <boost/move/detail/force_ptr.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/move/utility_core.hpp>
 #include <cstddef>
 
@@ -72,12 +71,12 @@ class adaptive_pool
          BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I Version)
          >   self_t;
 
-   static const std::size_t nodes_per_block        = NodesPerBlock;
-   static const std::size_t max_free_blocks        = MaxFreeBlocks;
-   static const std::size_t overhead_percent       = OverheadPercent;
-   static const std::size_t real_nodes_per_block   = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t nodes_per_block        = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t max_free_blocks        = MaxFreeBlocks;
+   BOOST_STATIC_CONSTEXPR std::size_t overhead_percent       = OverheadPercent;
+   BOOST_STATIC_CONSTEXPR std::size_t real_nodes_per_block   = NodesPerBlock;
 
-   BOOST_CONTAINER_DOCIGN(BOOST_STATIC_ASSERT((Version <=2)));
+   BOOST_CONTAINER_DOCIGN(BOOST_CONTAINER_STATIC_ASSERT((Version <=2)));
 
    public:
    //-------
@@ -254,7 +253,7 @@ class adaptive_pool
    //!Elements must be individually deallocated with deallocate()
    void allocate_many(size_type elem_size, std::size_t n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));/*
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));/*
       dlmalloc_memchain ch;
       BOOST_CONTAINER_MEMCHAIN_INIT(&ch);
       if(BOOST_UNLIKELY(!dlmalloc_multialloc_nodes(n_elements, elem_size*sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS, &ch))){
@@ -275,7 +274,7 @@ class adaptive_pool
    //!Elements must be individually deallocated with deallocate()
    void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));/*
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));/*
       dlmalloc_memchain ch;
       BOOST_CONTAINER_MEMCHAIN_INIT(&ch);
       if(BOOST_UNLIKELY(!dlmalloc_multialloc_arrays(n_elements, elem_sizes, sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS, &ch))){
@@ -385,12 +384,12 @@ class private_adaptive_pool
          BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I Version)
          >   self_t;
 
-   static const std::size_t nodes_per_block        = NodesPerBlock;
-   static const std::size_t max_free_blocks        = MaxFreeBlocks;
-   static const std::size_t overhead_percent       = OverheadPercent;
-   static const std::size_t real_nodes_per_block   = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t nodes_per_block        = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t max_free_blocks        = MaxFreeBlocks;
+   BOOST_STATIC_CONSTEXPR std::size_t overhead_percent       = OverheadPercent;
+   BOOST_STATIC_CONSTEXPR std::size_t real_nodes_per_block   = NodesPerBlock;
 
-   BOOST_CONTAINER_DOCIGN(BOOST_STATIC_ASSERT((Version <=2)));
+   BOOST_CONTAINER_DOCIGN(BOOST_CONTAINER_STATIC_ASSERT((Version <=2)));
 
    typedef dtl::private_adaptive_node_pool
       <sizeof(T), NodesPerBlock, MaxFreeBlocks, OverheadPercent> pool_t;
@@ -546,7 +545,7 @@ class private_adaptive_pool
    //!Elements must be individually deallocated with deallocate()
    void allocate_many(size_type elem_size, std::size_t n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       if(BOOST_UNLIKELY(!dlmalloc_multialloc_nodes
             ( n_elements, elem_size*sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS
             , move_detail::force_ptr<dlmalloc_memchain *>(&chain)))){
@@ -558,7 +557,7 @@ class private_adaptive_pool
    //!Elements must be individually deallocated with deallocate()
    void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       if(BOOST_UNLIKELY(!dlmalloc_multialloc_arrays
          (n_elements, elem_sizes, sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS
          , move_detail::force_ptr<dlmalloc_memchain *>(&chain)))){
diff --git a/inst/include/boost/container/allocator.hpp b/inst/include/boost/container/allocator.hpp
index b245c6f40..3d82f71d6 100644
--- a/inst/include/boost/container/allocator.hpp
+++ b/inst/include/boost/container/allocator.hpp
@@ -26,7 +26,6 @@
 #include <boost/container/throw_exception.hpp>
 #include <boost/container/detail/dlmalloc.hpp>
 #include <boost/container/detail/multiallocation_chain.hpp>
-#include <boost/static_assert.hpp>
 
 #include <boost/move/detail/force_ptr.hpp>
 
@@ -116,14 +115,14 @@ class allocator
    template<class T2, unsigned int Version2, unsigned int AllocationDisableMask2>
    allocator& operator=(const allocator<T2, Version2, AllocationDisableMask2>&);
 
-   static const unsigned int ForbiddenMask =
+   BOOST_STATIC_CONSTEXPR unsigned int ForbiddenMask =
       BOOST_CONTAINER_ALLOCATE_NEW | BOOST_CONTAINER_EXPAND_BWD | BOOST_CONTAINER_EXPAND_FWD ;
 
    //The mask can't disable all the allocation types
-   BOOST_STATIC_ASSERT((  (AllocationDisableMask & ForbiddenMask) != ForbiddenMask  ));
+   BOOST_CONTAINER_STATIC_ASSERT((  (AllocationDisableMask & ForbiddenMask) != ForbiddenMask  ));
 
    //The mask is only valid for version 2 allocators
-   BOOST_STATIC_ASSERT((  Version != 1 || (AllocationDisableMask == 0)  ));
+   BOOST_CONTAINER_STATIC_ASSERT((  Version != 1 || (AllocationDisableMask == 0)  ));
 
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
@@ -193,17 +192,17 @@ class allocator
 
    //!Deallocates previously allocated memory.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE void deallocate(pointer ptr, size_type) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void deallocate(pointer ptr, size_type) BOOST_NOEXCEPT_OR_NOTHROW
    {  dlmalloc_free(ptr);  }
 
    //!Returns the maximum number of elements that could be allocated.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return size_type(-1)/(2u*sizeof(T));   }
 
    //!Swaps two allocators, does nothing
    //!because this allocator is stateless
-   BOOST_CONTAINER_FORCEINLINE friend void swap(self_t &, self_t &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend void swap(self_t &, self_t &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!An allocator always compares to true, as memory allocated with one
@@ -214,7 +213,7 @@ class allocator
 
    //!An allocator always compares to false, as memory allocated with one
    //!instance can be deallocated by another instance
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const allocator &, const allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return false;   }
 
@@ -227,7 +226,7 @@ class allocator
                          size_type &prefer_in_recvd_out_size,
                          pointer &reuse)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       const allocation_type mask(AllocationDisableMask);
       command &= ~mask;
       pointer ret = this->priv_allocation_command(command, limit_size, prefer_in_recvd_out_size, reuse);
@@ -243,7 +242,7 @@ class allocator
    //!This function is available only with Version == 2
    BOOST_CONTAINER_ATTRIBUTE_NODISCARD size_type size(pointer p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       return dlmalloc_size(p);
    }
 
@@ -251,18 +250,18 @@ class allocator
    //!must be deallocated only with deallocate_one().
    //!Throws bad_alloc if there is no enough memory
    //!This function is available only with Version == 2
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE pointer allocate_one()
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline pointer allocate_one()
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       return this->allocate(1);
    }
 
    //!Allocates many elements of size == 1.
    //!Elements must be individually deallocated with deallocate_one()
    //!This function is available only with Version == 2
-   BOOST_CONTAINER_FORCEINLINE void allocate_individual(std::size_t num_elements, multiallocation_chain &chain)
+   inline void allocate_individual(std::size_t num_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       this->allocate_many(1, num_elements, chain);
    }
 
@@ -272,16 +271,16 @@ class allocator
    //Never throws
    void deallocate_one(pointer p) BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       return this->deallocate(p, 1);
    }
 
    //!Deallocates memory allocated with allocate_one() or allocate_individual().
    //!This function is available only with Version == 2
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       void deallocate_individual(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       return this->deallocate_many(chain);
    }
 
@@ -290,7 +289,7 @@ class allocator
    //!This function is available only with Version == 2
    void allocate_many(size_type elem_size, std::size_t n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       dlmalloc_memchain ch;
       BOOST_CONTAINER_MEMCHAIN_INIT(&ch);
       if(!dlmalloc_multialloc_nodes(n_elements, elem_size*sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS, &ch)){
@@ -312,7 +311,7 @@ class allocator
    //!This function is available only with Version == 2
    void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       dlmalloc_memchain ch;
       BOOST_CONTAINER_MEMCHAIN_INIT(&ch);
       if(!dlmalloc_multialloc_arrays(n_elements, elem_sizes, sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS, &ch)){
@@ -334,11 +333,11 @@ class allocator
    //!This function is available only with Version == 2
    void deallocate_many(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       dlmalloc_memchain ch;
       void *beg(&*chain.begin()), *last(&*chain.last());
-      size_t size(chain.size());
-      BOOST_CONTAINER_MEMCHAIN_INIT_FROM(&ch, beg, last, size);
+      size_t sz(chain.size());
+      BOOST_CONTAINER_MEMCHAIN_INIT_FROM(&ch, beg, last, sz);
       dlmalloc_multidealloc(&ch);
       //dlmalloc_multidealloc(move_detail::force_ptr<dlmalloc_memchain *>(&chain));
    }
diff --git a/inst/include/boost/container/allocator_traits.hpp b/inst/include/boost/container/allocator_traits.hpp
index 5e11142b0..4f554fba2 100644
--- a/inst/include/boost/container/allocator_traits.hpp
+++ b/inst/include/boost/container/allocator_traits.hpp
@@ -32,6 +32,8 @@
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/type_traits.hpp>  //is_empty
 #include <boost/container/detail/placement_new.hpp>
+#include <boost/container/detail/is_pair.hpp>
+#include <boost/container/detail/addressof.hpp>
 #ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP
 #include <boost/container/detail/std_fwd.hpp>
 #endif
@@ -44,14 +46,13 @@
 #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 #include <boost/move/detail/fwd_macros.hpp>
 #endif
-// other boost
-#include <boost/static_assert.hpp>
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED)
 #pragma GCC diagnostic push
 //#pragma GCC diagnostic ignored "-Wunused-result"
+//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME allocate
@@ -75,7 +76,7 @@
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 9
 #include <boost/intrusive/detail/has_member_function_callable_with.hpp>
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED)
 #pragma GCC diagnostic pop
 #endif
 
@@ -83,6 +84,144 @@
 
 namespace boost {
 namespace container {
+namespace dtl {
+
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+template<class T, class ...Args>
+BOOST_CONTAINER_FORCEINLINE void construct_type(T *p, BOOST_FWD_REF(Args) ...args)
+{
+   ::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...);
+}
+
+template < class Pair, class KeyType, class ... Args>
+typename dtl::enable_if< dtl::is_pair<Pair>, void >::type
+construct_type
+   (Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k, BOOST_FWD_REF(Args) ...args)
+{
+   construct_type(dtl::addressof(p->first), ::boost::forward<KeyType>(k));
+   BOOST_CONTAINER_TRY{
+      construct_type(dtl::addressof(p->second), ::boost::forward<Args>(args)...);
+   }
+   BOOST_CONTAINER_CATCH(...) {
+      typedef typename Pair::first_type first_type;
+      dtl::addressof(p->first)->~first_type();
+      BOOST_CONTAINER_RETHROW
+   }
+   BOOST_CONTAINER_CATCH_END
+}
+
+#else
+
+#define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ(N) \
+template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\
+BOOST_CONTAINER_FORCEINLINE \
+   typename dtl::disable_if_c<dtl::is_pair<T>::value, void >::type \
+construct_type(T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+{\
+   ::new((void*)p, boost_container_new_t()) T( BOOST_MOVE_FWD##N );\
+}\
+//
+BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ)
+#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ
+
+#define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE(N) \
+template < class Pair, class KeyType BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\
+typename dtl::enable_if< dtl::is_pair<Pair>, void >::type construct_type\
+   (Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+{\
+   construct_type(dtl::addressof(p->first), ::boost::forward<KeyType>(k));\
+   BOOST_CONTAINER_TRY{\
+      construct_type(dtl::addressof(p->second) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
+   }\
+   BOOST_CONTAINER_CATCH(...) {\
+      typedef typename Pair::first_type first_type;\
+      dtl::addressof(p->first)->~first_type();\
+      BOOST_CONTAINER_RETHROW\
+   }\
+   BOOST_CONTAINER_CATCH_END\
+}\
+//
+BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE)
+#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE
+
+#endif
+
+template<class T>
+inline
+typename dtl::enable_if<dtl::is_pair<T>, void >::type
+construct_type(T* p)
+{
+   dtl::construct_type(dtl::addressof(p->first));
+   BOOST_CONTAINER_TRY{
+      dtl::construct_type(dtl::addressof(p->second));
+   }
+   BOOST_CONTAINER_CATCH(...) {
+      typedef typename T::first_type first_type;
+      dtl::addressof(p->first)->~first_type();
+      BOOST_CONTAINER_RETHROW
+   }
+   BOOST_CONTAINER_CATCH_END
+}
+
+
+template<class T, class U>
+inline
+typename dtl::enable_if_c
+   <  dtl::is_pair<T>::value
+   , void >::type
+construct_type(T* p, U &u)
+{
+   dtl::construct_type(dtl::addressof(p->first), u.first);
+   BOOST_CONTAINER_TRY{
+      dtl::construct_type(dtl::addressof(p->second), u.second);
+   }
+   BOOST_CONTAINER_CATCH(...) {
+      typedef typename T::first_type first_type;
+      dtl::addressof(p->first)->~first_type();
+      BOOST_CONTAINER_RETHROW
+   }
+   BOOST_CONTAINER_CATCH_END
+}
+
+template<class T, class U>
+inline
+typename dtl::enable_if_c
+   <  dtl::is_pair<typename dtl::remove_reference<T>::type>::value &&
+      !boost::move_detail::is_reference<U>::value  //This is needed for MSVC10 and ambiguous overloads
+   , void >::type
+construct_type(T* p, BOOST_RV_REF(U) u)
+{
+   dtl::construct_type(dtl::addressof(p->first), ::boost::move(u.first));
+   BOOST_CONTAINER_TRY{
+      dtl::construct_type(dtl::addressof(p->second), ::boost::move(u.second));
+   }
+   BOOST_CONTAINER_CATCH(...) {
+      typedef typename T::first_type first_type;
+      dtl::addressof(p->first)->~first_type();
+      BOOST_CONTAINER_RETHROW
+   }
+   BOOST_CONTAINER_CATCH_END
+}
+
+template<class T, class U, class V>
+inline
+typename dtl::enable_if<dtl::is_pair<T>, void >::type
+construct_type(T* p, BOOST_FWD_REF(U) x, BOOST_FWD_REF(V) y)
+{
+   dtl::construct_type(dtl::addressof(p->first), ::boost::forward<U>(x));
+   BOOST_CONTAINER_TRY{
+      dtl::construct_type(dtl::addressof(p->second), ::boost::forward<V>(y));
+   }
+   BOOST_CONTAINER_CATCH(...) {
+      typedef typename T::first_type first_type;
+      dtl::addressof(p->first)->~first_type();
+      BOOST_CONTAINER_RETHROW
+   }
+   BOOST_CONTAINER_CATCH_END
+}
+
+}  //namespace dtl
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
@@ -102,19 +241,19 @@ namespace dtl {
 //supporting rvalue references
 template<class Allocator>
 struct is_std_allocator
-{  static const bool value = false; };
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
 
 template<class T>
 struct is_std_allocator< std::allocator<T> >
-{  static const bool value = true; };
+{  BOOST_STATIC_CONSTEXPR bool value = true; };
 
 template<class T, class Options>
 struct is_std_allocator< small_vector_allocator<T, std::allocator<T>, Options > >
-{  static const bool value = true; };
+{  BOOST_STATIC_CONSTEXPR bool value = true; };
 
 template<class Allocator>
 struct is_not_std_allocator
-{  static const bool value = !is_std_allocator<Allocator>::value; };
+{  BOOST_STATIC_CONSTEXPR bool value = !is_std_allocator<Allocator>::value; };
 
 BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(pointer)
 BOOST_INTRUSIVE_INSTANTIATE_EVAL_DEFAULT_TYPE_TMPLT(const_pointer)
@@ -298,18 +437,18 @@ struct allocator_traits
 
    //! <b>Returns</b>: <code>a.allocate(n)</code>
    //!
-   BOOST_CONTAINER_FORCEINLINE static pointer allocate(Allocator &a, size_type n)
+   inline static pointer allocate(Allocator &a, size_type n)
    {  return a.allocate(n);  }
 
    //! <b>Returns</b>: <code>a.deallocate(p, n)</code>
    //!
    //! <b>Throws</b>: Nothing
-   BOOST_CONTAINER_FORCEINLINE static void deallocate(Allocator &a, pointer p, size_type n)
+   inline static void deallocate(Allocator &a, pointer p, size_type n)
    {  a.deallocate(p, n);  }
 
    //! <b>Effects</b>: calls <code>a.allocate(n, p)</code> if that call is well-formed;
    //! otherwise, invokes <code>a.allocate(n)</code>
-   BOOST_CONTAINER_FORCEINLINE static pointer allocate(Allocator &a, size_type n, const_void_pointer p)
+   inline static pointer allocate(Allocator &a, size_type n, const_void_pointer p)
    {
       const bool value = boost::container::dtl::
          has_member_function_callable_with_allocate
@@ -321,7 +460,7 @@ struct allocator_traits
    //! <b>Effects</b>: calls <code>a.destroy(p)</code> if that call is well-formed;
    //! otherwise, invokes <code>p->~T()</code>.
    template<class T>
-   BOOST_CONTAINER_FORCEINLINE static void destroy(Allocator &a, T*p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static void destroy(Allocator &a, T*p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       typedef T* destroy_pointer;
       const bool value = boost::container::dtl::
@@ -333,7 +472,7 @@ struct allocator_traits
 
    //! <b>Returns</b>: <code>a.max_size()</code> if that expression is well-formed; otherwise,
    //! <code>numeric_limits<size_type>::max()</code>.
-   BOOST_CONTAINER_FORCEINLINE static size_type max_size(const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static size_type max_size(const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW
    {
       const bool value = allocator_traits_detail::has_max_size<Allocator, size_type (Allocator::*)() const>::value;
       dtl::bool_<value> flag;
@@ -342,7 +481,7 @@ struct allocator_traits
 
    //! <b>Returns</b>: <code>a.select_on_container_copy_construction()</code> if that expression is well-formed;
    //! otherwise, a.
-   BOOST_CONTAINER_FORCEINLINE static BOOST_CONTAINER_DOC1ST(Allocator,
+   inline static BOOST_CONTAINER_DOC1ST(Allocator,
       typename dtl::if_c
          < allocator_traits_detail::has_select_on_container_copy_construction<Allocator BOOST_MOVE_I Allocator (Allocator::*)() const>::value
          BOOST_MOVE_I Allocator BOOST_MOVE_I const Allocator & >::type)
@@ -358,9 +497,9 @@ struct allocator_traits
       //! <b>Effects</b>: calls <code>a.construct(p, std::forward<Args>(args)...)</code> if that call is well-formed;
       //! otherwise, invokes <code>`placement new` (static_cast<void*>(p)) T(std::forward<Args>(args)...)</code>
       template <class T, class ...Args>
-      BOOST_CONTAINER_FORCEINLINE static void construct(Allocator & a, T* p, BOOST_FWD_REF(Args)... args)
+      inline static void construct(Allocator & a, T* p, BOOST_FWD_REF(Args)... args)
       {
-         static const bool value = ::boost::move_detail::and_
+         BOOST_STATIC_CONSTEXPR bool value = ::boost::move_detail::and_
             < dtl::is_not_std_allocator<Allocator>
             , boost::container::dtl::has_member_function_callable_with_construct
                   < Allocator, T*, Args... >
@@ -372,7 +511,7 @@ struct allocator_traits
 
    //! <b>Returns</b>: <code>a.storage_is_unpropagable(p)</code> if is_partially_propagable::value is true; otherwise,
    //! <code>false</code>.
-   BOOST_CONTAINER_FORCEINLINE static bool storage_is_unpropagable(const Allocator &a, pointer p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static bool storage_is_unpropagable(const Allocator &a, pointer p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       dtl::bool_<is_partially_propagable::value> flag;
       return allocator_traits::priv_storage_is_unpropagable(flag, a, p);
@@ -380,7 +519,7 @@ struct allocator_traits
 
    //! <b>Returns</b>: <code>true</code> if <code>is_always_equal::value == true</code>, otherwise,
    //! <code>a == b</code>.
-   BOOST_CONTAINER_FORCEINLINE static bool equal(const Allocator &a, const Allocator &b) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static bool equal(const Allocator &a, const Allocator &b) BOOST_NOEXCEPT_OR_NOTHROW
    {
       dtl::bool_<is_always_equal::value> flag;
       return allocator_traits::priv_equal(flag, a, b);
@@ -388,48 +527,48 @@ struct allocator_traits
 
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    private:
-   BOOST_CONTAINER_FORCEINLINE static pointer priv_allocate(dtl::true_type, Allocator &a, size_type n, const_void_pointer p)
+   inline static pointer priv_allocate(dtl::true_type, Allocator &a, size_type n, const_void_pointer p)
    {  return a.allocate(n, p);  }
 
-   BOOST_CONTAINER_FORCEINLINE static pointer priv_allocate(dtl::false_type, Allocator &a, size_type n, const_void_pointer)
+   inline static pointer priv_allocate(dtl::false_type, Allocator &a, size_type n, const_void_pointer)
    {  return a.allocate(n);  }
 
    template<class T>
-   BOOST_CONTAINER_FORCEINLINE static void priv_destroy(dtl::true_type, Allocator &a, T* p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static void priv_destroy(dtl::true_type, Allocator &a, T* p) BOOST_NOEXCEPT_OR_NOTHROW
    {  a.destroy(p);  }
 
    template<class T>
-   BOOST_CONTAINER_FORCEINLINE static void priv_destroy(dtl::false_type, Allocator &, T* p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static void priv_destroy(dtl::false_type, Allocator &, T* p) BOOST_NOEXCEPT_OR_NOTHROW
    {  p->~T(); (void)p;  }
 
-   BOOST_CONTAINER_FORCEINLINE static size_type priv_max_size(dtl::true_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static size_type priv_max_size(dtl::true_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW
    {  return a.max_size();  }
 
-   BOOST_CONTAINER_FORCEINLINE static size_type priv_max_size(dtl::false_type, const Allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static size_type priv_max_size(dtl::false_type, const Allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return size_type(-1)/sizeof(value_type);  }
 
-   BOOST_CONTAINER_FORCEINLINE static Allocator priv_select_on_container_copy_construction(dtl::true_type, const Allocator &a)
+   inline static Allocator priv_select_on_container_copy_construction(dtl::true_type, const Allocator &a)
    {  return a.select_on_container_copy_construction();  }
 
-   BOOST_CONTAINER_FORCEINLINE static const Allocator &priv_select_on_container_copy_construction(dtl::false_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static const Allocator &priv_select_on_container_copy_construction(dtl::false_type, const Allocator &a) BOOST_NOEXCEPT_OR_NOTHROW
    {  return a;  }
 
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
       template<class T, class ...Args>
-      BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::true_type, Allocator &a, T *p, BOOST_FWD_REF(Args) ...args)
+      inline static void priv_construct(dtl::true_type, Allocator &a, T *p, BOOST_FWD_REF(Args) ...args)
       {  a.construct( p, ::boost::forward<Args>(args)...);  }
 
       template<class T, class ...Args>
-      BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::false_type, Allocator &, T *p, BOOST_FWD_REF(Args) ...args)
-      {  ::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...); }
+      inline static void priv_construct(dtl::false_type, Allocator &, T *p, BOOST_FWD_REF(Args) ...args)
+      {  dtl::construct_type(p, ::boost::forward<Args>(args)...); }
    #else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
       public:
 
       #define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_IMPL(N) \
       template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
-      BOOST_CONTAINER_FORCEINLINE static void construct(Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+      inline static void construct(Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
       {\
-         static const bool value = ::boost::move_detail::and_ \
+         BOOST_STATIC_CONSTEXPR bool value = ::boost::move_detail::and_ \
             < dtl::is_not_std_allocator<Allocator> \
             , boost::container::dtl::has_member_function_callable_with_construct \
                   < Allocator, T* BOOST_MOVE_I##N BOOST_MOVE_FWD_T##N > \
@@ -447,12 +586,12 @@ struct allocator_traits
       /////////////////////////////////
       #define BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL(N) \
       template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
-      BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::true_type, Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+      inline static void priv_construct(dtl::true_type, Allocator &a, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
       {  a.construct( p BOOST_MOVE_I##N BOOST_MOVE_FWD##N );  }\
       \
       template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
-      BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::false_type, Allocator &, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
-      {  ::new((void*)p, boost_container_new_t()) T(BOOST_MOVE_FWD##N); }\
+      inline static void priv_construct(dtl::false_type, Allocator &, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+      {  dtl::construct_type(p BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
       //
       BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL)
       #undef BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL
@@ -460,19 +599,19 @@ struct allocator_traits
    #endif   // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    template<class T>
-   BOOST_CONTAINER_FORCEINLINE static void priv_construct(dtl::false_type, Allocator &, T *p, const ::boost::container::default_init_t&)
+   inline static void priv_construct(dtl::false_type, Allocator &, T *p, const ::boost::container::default_init_t&)
    {  ::new((void*)p, boost_container_new_t()) T; }
 
-   BOOST_CONTAINER_FORCEINLINE static bool priv_storage_is_unpropagable(dtl::true_type, const Allocator &a, pointer p)
+   inline static bool priv_storage_is_unpropagable(dtl::true_type, const Allocator &a, pointer p)
    {  return a.storage_is_unpropagable(p);  }
 
-   BOOST_CONTAINER_FORCEINLINE static bool priv_storage_is_unpropagable(dtl::false_type, const Allocator &, pointer)
+   inline static bool priv_storage_is_unpropagable(dtl::false_type, const Allocator &, pointer)
    {  return false;  }
 
-   BOOST_CONTAINER_FORCEINLINE static bool priv_equal(dtl::true_type,  const Allocator &, const Allocator &)
+   inline static bool priv_equal(dtl::true_type,  const Allocator &, const Allocator &)
    {  return true;  }
 
-   BOOST_CONTAINER_FORCEINLINE static bool priv_equal(dtl::false_type, const Allocator &a, const Allocator &b)
+   inline static bool priv_equal(dtl::false_type, const Allocator &a, const Allocator &b)
    {  return a == b;  }
 
    #endif   //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
diff --git a/inst/include/boost/container/container_fwd.hpp b/inst/include/boost/container/container_fwd.hpp
index 9e82fdef6..2525b7d28 100644
--- a/inst/include/boost/container/container_fwd.hpp
+++ b/inst/include/boost/container/container_fwd.hpp
@@ -15,6 +15,8 @@
 #  include <boost/config.hpp>
 #endif
 
+#include <boost/container/detail/workaround.hpp>
+
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
@@ -277,10 +279,10 @@ class basic_string;
 typedef basic_string <char>   string;
 typedef basic_string<wchar_t> wstring;
 
-static const std::size_t ADP_nodes_per_block    = 256u;
-static const std::size_t ADP_max_free_blocks    = 2u;
-static const std::size_t ADP_overhead_percent   = 1u;
-static const std::size_t ADP_only_alignment     = 0u;
+BOOST_STATIC_CONSTEXPR std::size_t ADP_nodes_per_block    = 256u;
+BOOST_STATIC_CONSTEXPR std::size_t ADP_max_free_blocks    = 2u;
+BOOST_STATIC_CONSTEXPR std::size_t ADP_overhead_percent   = 1u;
+BOOST_STATIC_CONSTEXPR std::size_t ADP_only_alignment     = 0u;
 
 template < class T
          , std::size_t NodesPerBlock   = ADP_nodes_per_block
@@ -295,7 +297,7 @@ template < class T
          , unsigned int AllocationDisableMask = 0>
 class allocator;
 
-static const std::size_t NodeAlloc_nodes_per_block = 256u;
+BOOST_STATIC_CONSTEXPR std::size_t NodeAlloc_nodes_per_block = 256u;
 
 template
    < class T
@@ -332,7 +334,7 @@ struct ordered_range_t
 
 //! Value used to tag that the input range is
 //! guaranteed to be ordered
-static const ordered_range_t ordered_range = ordered_range_t();
+BOOST_CONTAINER_CONSTANT_VAR ordered_range_t ordered_range = ordered_range_t();
 
 //! Type used to tag that the input range is
 //! guaranteed to be ordered and unique
@@ -342,7 +344,7 @@ struct ordered_unique_range_t
 
 //! Value used to tag that the input range is
 //! guaranteed to be ordered and unique
-static const ordered_unique_range_t ordered_unique_range = ordered_unique_range_t();
+BOOST_CONTAINER_CONSTANT_VAR ordered_unique_range_t ordered_unique_range = ordered_unique_range_t();
 
 //! Type used to tag that the inserted values
 //! should be default initialized
@@ -351,7 +353,7 @@ struct default_init_t
 
 //! Value used to tag that the inserted values
 //! should be default initialized
-static const default_init_t default_init = default_init_t();
+BOOST_CONTAINER_CONSTANT_VAR default_init_t default_init = default_init_t();
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //! Type used to tag that the inserted values
@@ -361,7 +363,7 @@ struct value_init_t
 
 //! Value used to tag that the inserted values
 //! should be value initialized
-static const value_init_t value_init = value_init_t();
+BOOST_CONTAINER_CONSTANT_VAR value_init_t value_init = value_init_t();
 
 namespace container_detail_really_deep_namespace {
 
diff --git a/inst/include/boost/container/deque.hpp b/inst/include/boost/container/deque.hpp
index dafcaa0c2..c1cb4c42d 100644
--- a/inst/include/boost/container/deque.hpp
+++ b/inst/include/boost/container/deque.hpp
@@ -68,16 +68,16 @@ template <class T>
 struct deque_value_traits
 {
    typedef T value_type;
-   static const bool trivial_dctr = dtl::is_trivially_destructible<value_type>::value;
-   static const bool trivial_dctr_after_move = ::boost::has_trivial_destructor_after_move<value_type>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr = dtl::is_trivially_destructible<value_type>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr_after_move = ::boost::has_trivial_destructor_after_move<value_type>::value;
 };
 
 template<class T, std::size_t BlockBytes, std::size_t BlockSize>
 struct deque_block_size
 {
-   BOOST_STATIC_ASSERT_MSG(!(BlockBytes && BlockSize), "BlockBytes and BlockSize can't be specified at the same time");
-   static const std::size_t block_bytes = BlockBytes ? BlockBytes : 512u;
-   static const std::size_t value       = BlockSize ? BlockSize : (sizeof(T) < block_bytes ? (block_bytes/sizeof(T)) : std::size_t(1));
+   BOOST_CONTAINER_STATIC_ASSERT_MSG(!(BlockBytes && BlockSize), "BlockBytes and BlockSize can't be specified at the same time");
+   BOOST_STATIC_CONSTEXPR std::size_t block_bytes = BlockBytes ? BlockBytes : 512u;
+   BOOST_STATIC_CONSTEXPR std::size_t value       = BlockSize ? BlockSize : (sizeof(T) < block_bytes ? (block_bytes/sizeof(T)) : std::size_t(1));
 };
 
 namespace dtl {
@@ -106,6 +106,10 @@ namespace dtl {
 //    [map, map + map_size).
 //  A pointer in the range [map, map + map_size) points to an allocated node
 //    if and only if the pointer is in the range [start.node, finish.node].
+
+#define BOOST_CONTAINER_DEQUE_LIGHTER_ITERATOR_LEVEL 0
+
+#if BOOST_CONTAINER_DEQUE_LIGHTER_ITERATOR_LEVEL == 0
 template<class Pointer, bool IsConst>
 class deque_iterator
 {
@@ -142,47 +146,47 @@ class deque_iterator
 
    public:
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE Pointer get_cur()          const  {  return m_cur;  }
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE Pointer get_first()        const  {  return m_first;  }
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE Pointer get_last()         const  {  return m_last;  }
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE index_pointer get_node()   const  {  return m_node;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_cur()          const  {  return m_cur;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_first()        const  {  return m_first;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_last()         const  {  return m_last;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline index_pointer get_node()   const  {  return m_node;  }
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator(val_alloc_ptr x, index_pointer y, difference_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator(val_alloc_ptr x, index_pointer y, difference_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
       : m_cur(x), m_first(*y), m_last(*y + block_size), m_node(y)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator(val_alloc_ptr x, index_pointer y, size_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator(val_alloc_ptr x, index_pointer y, size_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
       : m_cur(x), m_first(*y), m_last(*y + difference_type(block_size)), m_node(y)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator() BOOST_NOEXCEPT_OR_NOTHROW
       : m_cur(), m_first(), m_last(), m_node()  //Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
       : m_cur(x.get_cur()), m_first(x.get_first()), m_last(x.get_last()), m_node(x.get_node())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator(const nonconst_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator(const nonconst_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
       : m_cur(x.get_cur()), m_first(x.get_first()), m_last(x.get_last()), m_node(x.get_node())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator(Pointer cur, Pointer first, Pointer last, index_pointer node) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator(Pointer cur, Pointer first, Pointer last, index_pointer node) BOOST_NOEXCEPT_OR_NOTHROW
       : m_cur(cur), m_first(first), m_last(last), m_node(node)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator& operator=(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator& operator=(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
    {  m_cur = x.get_cur(); m_first = x.get_first(); m_last = x.get_last(); m_node = x.get_node(); return *this; }
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator<Pointer, false> unconst() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator<Pointer, false> unconst() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       return deque_iterator<Pointer, false>(this->get_cur(), this->get_first(), this->get_last(), this->get_node());
    }
 
-   BOOST_CONTAINER_FORCEINLINE reference operator*() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline reference operator*() const BOOST_NOEXCEPT_OR_NOTHROW
       { return *this->m_cur; }
 
-   BOOST_CONTAINER_FORCEINLINE pointer operator->() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline pointer operator->() const BOOST_NOEXCEPT_OR_NOTHROW
       { return this->m_cur; }
 
    BOOST_CONTAINER_ATTRIBUTE_NODISCARD difference_type operator-(const deque_iterator& x) const BOOST_NOEXCEPT_OR_NOTHROW
@@ -209,7 +213,7 @@ class deque_iterator
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
    {
       deque_iterator tmp(*this);
       ++*this;
@@ -229,7 +233,7 @@ class deque_iterator
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE deque_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
    {
       deque_iterator tmp(*this);
       --*this;
@@ -241,15 +245,15 @@ class deque_iterator
       if (!n)
          return *this;
       BOOST_ASSERT(!!m_cur);
-      difference_type offset = n + (this->m_cur - this->m_first);
+      const difference_type offset = n + (this->m_cur - this->m_first);
       const difference_type block_size = m_last - m_first;
       BOOST_ASSERT(block_size);
       if (offset >= 0 && offset < block_size)
          this->m_cur += difference_type(n);
       else {
-         difference_type node_offset =
-         offset > 0 ? (offset / block_size)
-                    : (-difference_type((-offset - 1) / block_size) - 1);
+         const difference_type node_offset =
+            offset > 0 ? (offset / block_size)
+                       : (-difference_type((-offset - 1) / block_size) - 1);
          this->priv_set_node(this->m_node + node_offset, size_type(block_size));
          this->m_cur = this->m_first +
          (offset - node_offset * block_size);
@@ -257,55 +261,55 @@ class deque_iterator
       return *this;
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       deque_iterator operator+(difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
       {  deque_iterator tmp(*this); return tmp += n;  }
 
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       deque_iterator& operator-=(difference_type n) BOOST_NOEXCEPT_OR_NOTHROW
       { return *this += -n; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       deque_iterator operator-(difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
       {  deque_iterator tmp(*this); return tmp -= n;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator[](difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
       { return *(*this + n); }
 
    //Comparisons
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
       { return l.m_cur == r.m_cur; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
       { return l.m_cur != r.m_cur; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
       {  return (l.m_node == r.m_node) ? (l.m_cur < r.m_cur) : (l.m_node < r.m_node);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
       { return r < l; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
       { return !(r < l); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
       { return !(l < r); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend deque_iterator operator+(difference_type n, deque_iterator x) BOOST_NOEXCEPT_OR_NOTHROW
       {  return x += n;  }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_set_node(index_pointer new_node, size_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void priv_set_node(index_pointer new_node, size_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->priv_set_node(new_node, difference_type(block_size)); }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_set_node(index_pointer new_node, difference_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void priv_set_node(index_pointer new_node, difference_type block_size) BOOST_NOEXCEPT_OR_NOTHROW
    {
       this->m_node = new_node;
       this->m_first = *new_node;
@@ -313,6 +317,447 @@ class deque_iterator
    }
 };
 
+#elif BOOST_CONTAINER_DEQUE_LIGHTER_ITERATOR_LEVEL == 1
+
+template<class Pointer, bool IsConst, unsigned BlockBytes, unsigned BlockSize>
+class deque_iterator
+{
+   public:
+   typedef std::random_access_iterator_tag                                          iterator_category;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::element_type         value_type;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::difference_type      difference_type;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::size_type            size_type;
+   typedef typename if_c
+      < IsConst
+      , typename boost::intrusive::pointer_traits<Pointer>::template
+                                 rebind_pointer<const value_type>::type
+      , Pointer
+      >::type                                                                       pointer;
+   typedef typename if_c
+      < IsConst
+      , const value_type&
+      , value_type&
+      >::type                                                                       reference;
+
+   BOOST_CONSTEXPR inline static size_type get_block_size() BOOST_NOEXCEPT_OR_NOTHROW
+      { return deque_block_size<value_type, BlockBytes, BlockSize>::value; }
+
+   BOOST_CONSTEXPR inline static difference_type get_block_ssize() BOOST_NOEXCEPT_OR_NOTHROW
+      { return difference_type((get_block_size())); }
+
+   class nat;
+   typedef typename dtl::if_c< IsConst
+                             , deque_iterator<Pointer, false, BlockBytes, BlockSize>
+                             , nat>::type                                           nonconst_iterator;
+
+   typedef Pointer                                                                  val_alloc_ptr;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::
+      template rebind_pointer<Pointer>::type                                        index_pointer;
+
+   Pointer m_cur;
+   Pointer m_first;
+   index_pointer  m_node;
+
+   public:
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_cur()          const  {  return m_cur;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_first()        const  {  return m_first;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_last()         const  { return m_first + get_block_ssize(); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline index_pointer get_node()   const  {  return m_node;  }
+
+   inline deque_iterator(val_alloc_ptr x, index_pointer y, difference_type ) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x), m_first(*y), m_node(y)
+   {}
+
+   inline deque_iterator(val_alloc_ptr x, index_pointer y, size_type ) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x), m_first(*y), m_node(y)
+   {}
+
+   inline deque_iterator() BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(), m_first(), m_node()  //Value initialization to achieve "null iterators" (N3644)
+   {}
+
+   inline deque_iterator(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x.get_cur()), m_first(x.get_first()), m_node(x.get_node())
+   {}
+
+   inline deque_iterator(const nonconst_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x.get_cur()), m_first(x.get_first()), m_node(x.get_node())
+   {}
+
+   inline deque_iterator(Pointer cur, Pointer first, index_pointer node) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(cur), m_first(first), m_node(node)
+   {}
+
+   inline deque_iterator& operator=(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+   {  m_cur = x.get_cur(); m_first = x.get_first(); m_node = x.get_node(); return *this; }
+
+   inline nonconst_iterator unconst() const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      return nonconst_iterator(this->get_cur(), this->get_first(), this->get_node());
+   }
+
+   inline reference operator*() const BOOST_NOEXCEPT_OR_NOTHROW
+      { return *this->m_cur; }
+
+   inline pointer operator->() const BOOST_NOEXCEPT_OR_NOTHROW
+      { return this->m_cur; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD difference_type operator-(const deque_iterator& x) const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      if(!this->m_cur && !x.m_cur){
+         return 0;
+      }
+      const difference_type block_size = get_block_ssize();
+      BOOST_ASSERT(block_size);
+      return block_size * (this->m_node - x.m_node - 1) +
+         (this->m_cur - this->m_first) + ((x.m_first+block_size) - x.m_cur);
+   }
+
+   deque_iterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(!!m_cur);
+      ++this->m_cur;
+      const difference_type block_size = get_block_ssize();
+      if (this->m_cur == (this->m_first+block_size)) {
+
+         BOOST_ASSERT(block_size);
+         ++this->m_node;
+         this->m_first = *this->m_node;
+         this->m_cur = this->m_first;
+      }
+      return *this;
+   }
+
+   inline deque_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      deque_iterator tmp(*this);
+      ++*this;
+      return tmp;
+   }
+
+   deque_iterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(!!m_cur);
+      if (this->m_cur == this->m_first) {
+         --this->m_node;
+         this->m_first = *this->m_node;
+         this->m_cur = this->m_first + get_block_ssize();
+      }
+      --this->m_cur;
+      return *this;
+   }
+
+   inline deque_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      deque_iterator tmp(*this);
+      --*this;
+      return tmp;
+   }
+
+   deque_iterator& operator+=(difference_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      if (!n)
+         return *this;
+      BOOST_ASSERT(!!m_cur);
+      const difference_type offset = n + (this->m_cur - this->m_first);
+      const difference_type block_size = get_block_ssize();
+      BOOST_ASSERT(block_size);
+      if (offset >= 0 && offset < block_size)
+         this->m_cur += difference_type(n);
+      else {
+         const difference_type node_offset =
+            offset > 0 ? (offset / block_size)
+                       : (-difference_type((-offset - 1) / block_size) - 1);
+         this->m_node += node_offset;
+         this->m_first = *this->m_node;
+         this->m_cur = this->m_first + (offset - node_offset * block_size);
+      }
+      return *this;
+   }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      deque_iterator operator+(difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+      {  deque_iterator tmp(*this); return tmp += n;  }
+
+   inline
+      deque_iterator& operator-=(difference_type n) BOOST_NOEXCEPT_OR_NOTHROW
+      { return *this += -n; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      deque_iterator operator-(difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+      {  deque_iterator tmp(*this); return tmp -= n;  }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reference operator[](difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+      { return *(*this + n); }
+
+   //Comparisons
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator==(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return l.m_cur == r.m_cur; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator!=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return l.m_cur != r.m_cur; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator<(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      {  return (l.m_node == r.m_node) ? (l.m_cur < r.m_cur) : (l.m_node < r.m_node);  }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator>(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return r < l; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator<=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return !(r < l); }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator>=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return !(l < r); }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend deque_iterator operator+(difference_type n, deque_iterator x) BOOST_NOEXCEPT_OR_NOTHROW
+      {  return x += n;  }
+
+   inline void priv_set_node(index_pointer new_node, size_type ) BOOST_NOEXCEPT_OR_NOTHROW
+   {  return this->priv_set_node(new_node, difference_type()); }
+
+   inline void priv_set_node(index_pointer new_node, difference_type) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      this->m_node = new_node;
+      this->m_first = *new_node;
+   }
+};
+
+#elif BOOST_CONTAINER_DEQUE_LIGHTER_ITERATOR_LEVEL == 2
+
+template<class Pointer, bool IsConst, unsigned BlockBytes, unsigned BlockSize>
+class deque_iterator
+{
+   public:
+   typedef std::random_access_iterator_tag                                          iterator_category;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::element_type         value_type;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::difference_type      difference_type;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::size_type            size_type;
+   typedef typename if_c
+      < IsConst
+      , typename boost::intrusive::pointer_traits<Pointer>::template
+                                 rebind_pointer<const value_type>::type
+      , Pointer
+      >::type                                                                       pointer;
+   typedef typename if_c
+      < IsConst
+      , const value_type&
+      , value_type&
+      >::type                                                                       reference;
+
+   BOOST_CONSTEXPR inline static size_type get_block_size() BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_CONTAINER_STATIC_ASSERT((deque_block_size<value_type, BlockBytes, BlockSize>::value));
+      return deque_block_size<value_type, BlockBytes, BlockSize>::value;
+   }
+
+   BOOST_CONSTEXPR inline static difference_type get_block_ssize() BOOST_NOEXCEPT_OR_NOTHROW
+      { return difference_type((get_block_size())); }
+
+   class nat;
+   typedef typename dtl::if_c< IsConst
+                             , deque_iterator<Pointer, false, BlockBytes, BlockSize>
+                             , nat>::type                                           nonconst_iterator;
+
+   typedef Pointer                                                                  val_alloc_ptr;
+   typedef typename boost::intrusive::pointer_traits<Pointer>::
+      template rebind_pointer<Pointer>::type                                        index_pointer;
+
+   Pointer m_cur;
+   index_pointer  m_node;
+
+   public:
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_cur()          const  {  return m_cur;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_first()        const  {  return *m_node;  }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline Pointer get_last()         const  { return *m_node + get_block_ssize(); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline index_pointer get_node()   const  {  return m_node;  }
+
+   inline deque_iterator(val_alloc_ptr x, index_pointer y, difference_type ) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x), m_node(y)
+   {}
+
+   inline deque_iterator(val_alloc_ptr x, index_pointer y, size_type ) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x), m_node(y)
+   {}
+
+   inline deque_iterator() BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(), m_node()  //Value initialization to achieve "null iterators" (N3644)
+   {}
+
+   inline deque_iterator(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x.get_cur()), m_node(x.get_node())
+   {}
+
+   inline deque_iterator(const nonconst_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(x.get_cur()), m_node(x.get_node())
+   {}
+
+   inline deque_iterator(Pointer cur, index_pointer node) BOOST_NOEXCEPT_OR_NOTHROW
+      : m_cur(cur), m_node(node)
+   {}
+
+   inline deque_iterator& operator=(const deque_iterator& x) BOOST_NOEXCEPT_OR_NOTHROW
+   {  m_cur = x.get_cur(); m_node = x.get_node(); return *this; }
+
+   inline nonconst_iterator unconst() const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      return nonconst_iterator(this->get_cur(), this->get_node());
+   }
+
+   inline reference operator*() const BOOST_NOEXCEPT_OR_NOTHROW
+      { return *this->m_cur; }
+
+   inline pointer operator->() const BOOST_NOEXCEPT_OR_NOTHROW
+      { return this->m_cur; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD difference_type operator-(const deque_iterator& x) const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      if(!this->m_cur && !x.m_cur){
+         return 0;
+      }
+      const difference_type block_size = get_block_ssize();
+      BOOST_ASSERT(block_size);
+      return block_size * (this->m_node - x.m_node - 1) +
+         (this->m_cur - this->get_first()) + (x.get_last() - x.m_cur);
+   }
+
+   deque_iterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(!!m_cur);
+      ++this->m_cur;
+      if (this->m_cur == (this->get_last())) {
+
+         ++this->m_node;
+         this->m_cur = *this->m_node;
+      }
+      return *this;
+   }
+
+   inline deque_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      deque_iterator tmp(*this);
+      ++*this;
+      return tmp;
+   }
+
+   deque_iterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(!!m_cur);
+      if (this->m_cur == this->get_first()) {
+         --this->m_node;
+         this->m_cur = this->get_last();
+      }
+      --this->m_cur;
+      return *this;
+   }
+
+   inline deque_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      deque_iterator tmp(*this);
+      --*this;
+      return tmp;
+   }
+
+   deque_iterator& operator+=(difference_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      if (!n)
+         return *this;
+      BOOST_ASSERT(!!m_cur);
+      const difference_type offset = n + (this->m_cur - this->get_first());
+      const difference_type block_size = get_block_ssize();
+      BOOST_ASSERT(block_size);
+      if (offset >= 0 && offset < block_size)
+         this->m_cur += difference_type(n);
+      else {
+         const difference_type node_offset =
+            offset > 0 ? (offset / block_size)
+                       : (-difference_type((-offset - 1) / block_size) - 1);
+         this->m_node += node_offset;
+         this->m_cur = this->get_first() + (offset - node_offset * block_size);
+      }
+      return *this;
+   }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      deque_iterator operator+(difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+      {  deque_iterator tmp(*this); return tmp += n;  }
+
+   inline
+      deque_iterator& operator-=(difference_type n) BOOST_NOEXCEPT_OR_NOTHROW
+      { return *this += -n; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      deque_iterator operator-(difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+      {  deque_iterator tmp(*this); return tmp -= n;  }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reference operator[](difference_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(!!m_cur);
+      const difference_type offset = n + (this->m_cur - this->get_first());
+      const difference_type block_size = get_block_ssize();
+      if (offset >= 0 && offset < block_size)
+         return this->m_cur[difference_type(n)];
+      else {
+         const difference_type node_offset = offset > 0
+            ? (offset / block_size)
+            : (-difference_type((-offset - 1) / block_size) - 1);
+         return (this->m_node[node_offset]) [offset - node_offset * block_size];
+      }
+   }
+
+   //Comparisons
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator==(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return l.m_cur == r.m_cur; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator!=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return l.m_cur != r.m_cur; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator<(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      {  return (l.m_node == r.m_node) ? (l.m_cur < r.m_cur) : (l.m_node < r.m_node);  }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator>(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return r < l; }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator<=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return !(r < l); }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend bool operator>=(const deque_iterator& l, const deque_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+      { return !(l < r); }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      friend deque_iterator operator+(difference_type n, deque_iterator x) BOOST_NOEXCEPT_OR_NOTHROW
+      {  return x += n;  }
+
+   inline void priv_set_node(index_pointer new_node, size_type ) BOOST_NOEXCEPT_OR_NOTHROW
+   {  return this->priv_set_node(new_node, difference_type()); }
+
+   inline void priv_set_node(index_pointer new_node, difference_type) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      this->m_node = new_node;
+   }
+};
+
+#else
+
+#error "Invalid BOOST_CONTAINER_DEQUE_LIGHTER_ITERATOR_LEVEL"
+
+#endif
 }  //namespace dtl {
 
 template<class Options>
@@ -360,43 +805,48 @@ class deque_base
    typedef typename get_deque_opt<Options>::type                  options_type;
 
    protected:
+   #if BOOST_CONTAINER_DEQUE_LIGHTER_ITERATOR_LEVEL == 0
    typedef dtl::deque_iterator<val_alloc_ptr, false> iterator;
-   typedef dtl::deque_iterator<val_alloc_ptr, true > const_iterator;
+   typedef dtl::deque_iterator<val_alloc_ptr, true> const_iterator;
+   #else
+   typedef dtl::deque_iterator<val_alloc_ptr, false, options_type::block_bytes, options_type::block_size> iterator;
+   typedef dtl::deque_iterator<val_alloc_ptr, true, options_type::block_bytes, options_type::block_size> const_iterator;
+   #endif
 
-   BOOST_CONSTEXPR BOOST_CONTAINER_FORCEINLINE static size_type get_block_size() BOOST_NOEXCEPT_OR_NOTHROW
-      { return deque_block_size<val_alloc_val, options_type::block_bytes, options_type::block_size>::value; }
+   BOOST_CONSTEXPR inline static val_alloc_diff get_block_ssize() BOOST_NOEXCEPT_OR_NOTHROW
+      { return val_alloc_diff((get_block_size())); }
 
-   BOOST_CONSTEXPR BOOST_CONTAINER_FORCEINLINE static val_alloc_diff get_block_ssize() BOOST_NOEXCEPT_OR_NOTHROW
-      { return val_alloc_diff((get_block_size)()); }
+   BOOST_CONSTEXPR inline static size_type get_block_size() BOOST_NOEXCEPT_OR_NOTHROW
+      { return deque_block_size<val_alloc_val, options_type::block_bytes, options_type::block_size>::value; }
 
    typedef deque_value_traits<val_alloc_val>             traits_t;
    typedef ptr_alloc_t                                   map_allocator_type;
 
-   BOOST_CONTAINER_FORCEINLINE val_alloc_ptr priv_allocate_node()
+   inline val_alloc_ptr priv_allocate_node()
       {  return this->alloc().allocate(get_block_size());  }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_deallocate_node(val_alloc_ptr p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void priv_deallocate_node(val_alloc_ptr p) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->alloc().deallocate(p, get_block_size());  }
 
-   BOOST_CONTAINER_FORCEINLINE ptr_alloc_ptr priv_allocate_map(size_type n)
+   inline ptr_alloc_ptr priv_allocate_map(size_type n)
       { return this->ptr_alloc().allocate(n); }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_deallocate_map(ptr_alloc_ptr p, size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void priv_deallocate_map(ptr_alloc_ptr p, size_type n) BOOST_NOEXCEPT_OR_NOTHROW
       { this->ptr_alloc().deallocate(p, n); }
 
-   BOOST_CONTAINER_FORCEINLINE deque_base(size_type num_elements, const allocator_type& a)
+   inline deque_base(size_type num_elements, const allocator_type& a)
       :  members_(a)
    { this->priv_initialize_map(num_elements); }
 
-   BOOST_CONTAINER_FORCEINLINE explicit deque_base(const allocator_type& a)
+   inline explicit deque_base(const allocator_type& a)
       :  members_(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE deque_base()
+   inline deque_base()
       :  members_()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit deque_base(BOOST_RV_REF(deque_base) x)
+   inline explicit deque_base(BOOST_RV_REF(deque_base) x)
       :  members_( boost::move(x.ptr_alloc())
                  , boost::move(x.alloc()) )
    {}
@@ -446,8 +896,8 @@ class deque_base
 
          this->members_.m_start.priv_set_node(nstart, get_block_size());
          this->members_.m_finish.priv_set_node(nfinish - 1, get_block_size());
-         this->members_.m_start.m_cur = this->members_.m_start.m_first;
-         this->members_.m_finish.m_cur = this->members_.m_finish.m_first + difference_type(num_elements % get_block_size());
+         this->members_.m_start.m_cur = this->members_.m_start.get_first();
+         this->members_.m_finish.m_cur = this->members_.m_finish.get_first() + difference_type(num_elements % get_block_size());
 //      }
    }
 
@@ -516,16 +966,16 @@ class deque_base
       iterator        m_finish;
    } members_;
 
-   BOOST_CONTAINER_FORCEINLINE ptr_alloc_t &ptr_alloc() BOOST_NOEXCEPT_OR_NOTHROW
+   inline ptr_alloc_t &ptr_alloc() BOOST_NOEXCEPT_OR_NOTHROW
    {  return members_;  }
 
-   BOOST_CONTAINER_FORCEINLINE const ptr_alloc_t &ptr_alloc() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline const ptr_alloc_t &ptr_alloc() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return members_;  }
 
-   BOOST_CONTAINER_FORCEINLINE allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
+   inline allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
    {  return members_;  }
 
-   BOOST_CONTAINER_FORCEINLINE const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return members_;  }
 };
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -576,6 +1026,11 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    private:                      // Internal typedefs
+
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits<ValAllocator>::value_type>::value));
+
    BOOST_COPYABLE_AND_MOVABLE(deque)
    typedef typename Base::ptr_alloc_ptr index_pointer;
    typedef allocator_traits<ValAllocator>                  allocator_traits_type;
@@ -600,7 +1055,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: If allocator_type's default constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE deque()
+   inline deque()
       BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<ValAllocator>::value)
       : Base()
    {}
@@ -610,7 +1065,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit deque(const allocator_type& a) BOOST_NOEXCEPT_OR_NOTHROW
+   inline explicit deque(const allocator_type& a) BOOST_NOEXCEPT_OR_NOTHROW
       : Base(a)
    {}
 
@@ -621,7 +1076,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   throws or T's value initialization throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE explicit deque(size_type n)
+   inline explicit deque(size_type n)
       : Base(n, allocator_type())
    {
       dtl::insert_value_initialized_n_proxy<ValAllocator> proxy;
@@ -638,7 +1093,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Linear to n.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_FORCEINLINE deque(size_type n, default_init_t)
+   inline deque(size_type n, default_init_t)
       : Base(n, allocator_type())
    {
       dtl::insert_default_initialized_n_proxy<ValAllocator> proxy;
@@ -653,7 +1108,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   throws or T's value initialization throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE explicit deque(size_type n, const allocator_type &a)
+   inline explicit deque(size_type n, const allocator_type &a)
       : Base(n, a)
    {
       dtl::insert_value_initialized_n_proxy<ValAllocator> proxy;
@@ -670,7 +1125,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Linear to n.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_FORCEINLINE deque(size_type n, default_init_t, const allocator_type &a)
+   inline deque(size_type n, default_init_t, const allocator_type &a)
       : Base(n, a)
    {
       dtl::insert_default_initialized_n_proxy<ValAllocator> proxy;
@@ -685,7 +1140,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE deque(size_type n, const value_type& value)
+   inline deque(size_type n, const value_type& value)
       : Base(n, allocator_type())
    { this->priv_fill_initialize(value); }
 
@@ -696,7 +1151,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE deque(size_type n, const value_type& value, const allocator_type& a)
+   inline deque(size_type n, const value_type& value, const allocator_type& a)
       : Base(n, a)
    { this->priv_fill_initialize(value); }
 
@@ -708,7 +1163,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!
    //! <b>Complexity</b>: Linear to the range [first, last).
    template <class InIt>
-   BOOST_CONTAINER_FORCEINLINE deque(InIt first, InIt last
+   inline deque(InIt first, InIt last
       #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
       , typename dtl::disable_if_convertible
          <InIt, size_type>::type * = 0
@@ -727,7 +1182,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!
    //! <b>Complexity</b>: Linear to the range [first, last).
    template <class InIt>
-   BOOST_CONTAINER_FORCEINLINE deque(InIt first, InIt last, const allocator_type& a
+   inline deque(InIt first, InIt last, const allocator_type& a
       #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
       , typename dtl::disable_if_convertible
          <InIt, size_type>::type * = 0
@@ -746,7 +1201,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   throws or T's constructor taking a dereferenced std::initializer_list iterator throws.
    //!
    //! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
-   BOOST_CONTAINER_FORCEINLINE deque(std::initializer_list<value_type> il, const allocator_type& a = allocator_type())
+   inline deque(std::initializer_list<value_type> il, const allocator_type& a = allocator_type())
       : Base(a)
    {
       this->priv_range_initialize(il.begin(), il.end());
@@ -758,7 +1213,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Postcondition</b>: x == *this.
    //!
    //! <b>Complexity</b>: Linear to the elements x contains.
-   BOOST_CONTAINER_FORCEINLINE deque(const deque& x)
+   inline deque(const deque& x)
       :  Base(allocator_traits_type::select_on_container_copy_construction(x.alloc()))
    {
       if(x.size()){
@@ -773,7 +1228,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: If allocator_type's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE deque(BOOST_RV_REF(deque) x) BOOST_NOEXCEPT_OR_NOTHROW
+   inline deque(BOOST_RV_REF(deque) x) BOOST_NOEXCEPT_OR_NOTHROW
       :  Base(BOOST_MOVE_BASE(Base, x))
    {  this->swap_members(x);   }
 
@@ -824,7 +1279,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Linear to the number of elements.
-   BOOST_CONTAINER_FORCEINLINE ~deque() BOOST_NOEXCEPT_OR_NOTHROW
+   inline ~deque() BOOST_NOEXCEPT_OR_NOTHROW
    {
       this->priv_destroy_range(this->members_.m_start, this->members_.m_finish);
    }
@@ -868,28 +1323,13 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
                                   || allocator_traits_type::is_always_equal::value)
    {
       if (BOOST_LIKELY(this != &x)) {
-         allocator_type &this_alloc = this->alloc();
-         allocator_type &x_alloc    = x.alloc();
-         const bool propagate_alloc = allocator_traits_type::
-               propagate_on_container_move_assignment::value;
-         dtl::bool_<propagate_alloc> flag;
-         const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-         //Resources can be transferred if both allocators are
-         //going to be equal after this function (either propagated or already equal)
-         if(propagate_alloc || allocators_equal){
-            //Destroy objects but retain memory in case x reuses it in the future
-            this->clear();
-            //Move allocator if needed
-            dtl::move_alloc(this_alloc, x_alloc, flag);
-            dtl::move_alloc(this->ptr_alloc(), x.ptr_alloc(), flag);
-            //Nothrow swap
-            this->swap_members(x);
-         }
-         //Else do a one by one move
-         else{
-            this->assign( boost::make_move_iterator(x.begin())
-                        , boost::make_move_iterator(x.end()));
-         }
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
@@ -903,7 +1343,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to the number of elements in il.
-   BOOST_CONTAINER_FORCEINLINE deque& operator=(std::initializer_list<value_type> il)
+   inline deque& operator=(std::initializer_list<value_type> il)
    {
       this->assign(il.begin(), il.end());
       return *this;
@@ -915,7 +1355,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE void assign(size_type n, const T& val)
+   inline void assign(size_type n, const T& val)
    {
       this->assign(c_it(val, n), c_it());
    }
@@ -979,7 +1419,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   T's constructor from dereferencing std::initializer_list iterator throws.
    //!
    //! <b>Complexity</b>: Linear to il.size().
-   BOOST_CONTAINER_FORCEINLINE void assign(std::initializer_list<value_type> il)
+   inline void assign(std::initializer_list<value_type> il)
    {   this->assign(il.begin(), il.end());   }
 #endif
 
@@ -988,7 +1428,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    { return Base::alloc(); }
 
@@ -999,7 +1439,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return Base::alloc(); }
 
@@ -1016,7 +1456,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return Base::alloc(); }
 
@@ -1025,7 +1465,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
       { return this->members_.m_start; }
 
@@ -1034,7 +1474,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return this->members_.m_start; }
 
@@ -1043,7 +1483,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end() BOOST_NOEXCEPT_OR_NOTHROW
       { return this->members_.m_finish; }
 
@@ -1052,7 +1492,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
       { return this->members_.m_finish; }
 
@@ -1062,7 +1502,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
       { return reverse_iterator(this->members_.m_finish); }
 
@@ -1072,7 +1512,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return const_reverse_iterator(this->members_.m_finish); }
 
@@ -1082,7 +1522,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
       { return reverse_iterator(this->members_.m_start); }
 
@@ -1092,7 +1532,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return const_reverse_iterator(this->members_.m_start); }
 
@@ -1101,7 +1541,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return this->members_.m_start; }
 
@@ -1110,7 +1550,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return this->members_.m_finish; }
 
@@ -1120,7 +1560,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return const_reverse_iterator(this->members_.m_finish); }
 
@@ -1130,7 +1570,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return const_reverse_iterator(this->members_.m_start); }
 
@@ -1145,7 +1585,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->members_.m_finish == this->members_.m_start; }
 
@@ -1154,7 +1594,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
       { return size_type(this->members_.m_finish - this->members_.m_start); }
 
@@ -1163,7 +1603,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
       { return allocator_traits_type::max_size(this->alloc()); }
 
@@ -1251,7 +1691,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1266,7 +1706,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1281,7 +1721,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1296,7 +1736,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference back() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1311,7 +1751,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
@@ -1326,7 +1766,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
@@ -1344,7 +1784,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() >= n);
@@ -1362,7 +1802,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() >= n);
@@ -1379,7 +1819,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       //Range checked priv_index_of
@@ -1396,7 +1836,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       //Range checked priv_index_of
@@ -1411,7 +1851,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference at(size_type n)
    {
       this->priv_throw_if_out_of_range(n);
@@ -1426,7 +1866,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference at(size_type n) const
    {
       this->priv_throw_if_out_of_range(n);
@@ -1659,7 +2099,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator pos, size_type n, const value_type& x)
+   inline iterator insert(const_iterator pos, size_type n, const value_type& x)
    {
       //Range check of p is done by insert()
       return this->insert(pos, c_it(x, n), c_it());
@@ -1708,7 +2148,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //!   dereferenced std::initializer_list throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to distance [il.begin(), il.end()).
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator pos, std::initializer_list<value_type> il)
+   inline iterator insert(const_iterator pos, std::initializer_list<value_type> il)
    {
       //Range check os pos is done in insert()
       return insert(pos, il.begin(), il.end());
@@ -1717,7 +2157,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
 
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <class FwdIt>
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, FwdIt first, FwdIt last
+   inline iterator insert(const_iterator p, FwdIt first, FwdIt last
       #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
       , typename dtl::disable_if_or
          < void
@@ -1741,7 +2181,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    void pop_front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
-      if (this->members_.m_start.m_cur != this->members_.m_start.m_last - 1) {
+      if (this->members_.m_start.m_cur != this->members_.m_start.get_last() - 1) {
          allocator_traits_type::destroy
             ( this->alloc()
             , boost::movelib::to_raw_pointer(this->members_.m_start.m_cur)
@@ -1760,7 +2200,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
-      if (this->members_.m_finish.m_cur != this->members_.m_finish.m_first) {
+      if (this->members_.m_finish.m_cur != this->members_.m_finish.get_first()) {
          --this->members_.m_finish.m_cur;
          allocator_traits_type::destroy
             ( this->alloc()
@@ -1838,7 +2278,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE void swap(deque &x)
+   inline void swap(deque &x)
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_swap::value
                                || allocator_traits_type::is_always_equal::value)
    {
@@ -1865,9 +2305,9 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
          }
 
          if (this->members_.m_start.m_node != this->members_.m_finish.m_node) {
-            this->priv_destroy_range(this->members_.m_start.m_cur, this->members_.m_start.m_last);
-            this->priv_destroy_range(this->members_.m_finish.m_first, this->members_.m_finish.m_cur);
-            this->priv_deallocate_node(this->members_.m_finish.m_first);
+            this->priv_destroy_range(this->members_.m_start.m_cur, this->members_.m_start.get_last());
+            this->priv_destroy_range(this->members_.m_finish.get_first(), this->members_.m_finish.m_cur);
+            this->priv_deallocate_node(this->members_.m_finish.get_first());
          }
          else
             this->priv_destroy_range(this->members_.m_start.m_cur, this->members_.m_finish.m_cur);
@@ -1879,56 +2319,80 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const deque& x, const deque& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const deque& x, const deque& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const deque& x, const deque& y)
    {  return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const deque& x, const deque& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const deque& x, const deque& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const deque& x, const deque& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE friend void swap(deque& x, deque& y)
+   inline friend void swap(deque& x, deque& y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_index_of(const_iterator p) const
+   void priv_move_assign(BOOST_RV_REF(deque) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      dtl::bool_<allocator_traits_type::propagate_on_container_move_assignment::value> flag;
+      dtl::move_alloc(this->alloc(), x.alloc(), flag);
+      dtl::move_alloc(this->ptr_alloc(), x.ptr_alloc(), flag);
+      //Nothrow swap
+      this->swap_members(x);
+   }
+
+   void priv_move_assign(BOOST_RV_REF(deque) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->alloc() == x.alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         this->assign(boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
+      }
+   }
+
+   inline size_type priv_index_of(const_iterator p) const
    {
       BOOST_ASSERT(this->cbegin() <= p);
       BOOST_ASSERT(p <= this->cend());
@@ -1954,12 +2418,12 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
          throw_out_of_range("deque::at out of range");
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_in_range(const_iterator pos) const
+   inline bool priv_in_range(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos < this->end());
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_in_range_or_end(const_iterator pos) const
+   inline bool priv_in_range_or_end(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos <= this->end());
    }
@@ -2013,37 +2477,38 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_push_back_simple_available() const
+   inline bool priv_push_back_simple_available() const
    {
       return this->members_.m_map &&
-         (this->members_.m_finish.m_cur != (this->members_.m_finish.m_last - 1));
+         (this->members_.m_finish.m_cur != (this->members_.m_finish.get_last() - 1));
    }
 
-   BOOST_CONTAINER_FORCEINLINE T *priv_push_back_simple_pos() const
+   inline T *priv_push_back_simple_pos() const
    {
       return boost::movelib::to_raw_pointer(this->members_.m_finish.m_cur);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_push_back_simple_commit()
+   inline void priv_push_back_simple_commit()
    {
       ++this->members_.m_finish.m_cur;
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_push_front_simple_available() const
+   inline bool priv_push_front_simple_available() const
    {
       return this->members_.m_map &&
-         (this->members_.m_start.m_cur != this->members_.m_start.m_first);
+         (this->members_.m_start.m_cur != this->members_.m_start.get_first());
    }
 
-   BOOST_CONTAINER_FORCEINLINE T *priv_push_front_simple_pos() const
+   inline T *priv_push_front_simple_pos() const
    {  return boost::movelib::to_raw_pointer(this->members_.m_start.m_cur) - 1;  }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_push_front_simple_commit()
+   inline void priv_push_front_simple_commit()
    {  --this->members_.m_start.m_cur;   }
 
    void priv_destroy_range(iterator p, iterator p2)
    {
-      if(!Base::traits_t::trivial_dctr){
+      (void)p; (void)p2;
+      BOOST_IF_CONSTEXPR(!Base::traits_t::trivial_dctr){
          for(;p != p2; ++p){
             allocator_traits_type::destroy(this->alloc(), boost::movelib::iterator_to_raw_pointer(p));
          }
@@ -2052,7 +2517,8 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
 
    void priv_destroy_range(pointer p, pointer p2)
    {
-      if(!Base::traits_t::trivial_dctr){
+      (void)p; (void)p2;
+      BOOST_IF_CONSTEXPR(!Base::traits_t::trivial_dctr){
          for(;p != p2; ++p){
             allocator_traits_type::destroy(this->alloc(), boost::movelib::iterator_to_raw_pointer(p));
          }
@@ -2060,84 +2526,117 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    }
 
    template<class InsertProxy>
-   iterator priv_insert_aux_impl(const_iterator p, size_type n, InsertProxy proxy)
+   iterator priv_insert_middle_aux_impl(const_iterator p, const size_type elemsbefore, const size_type length, const size_type n, InsertProxy proxy)
    {
-      iterator pos(p.unconst());
-      const size_type pos_n = size_type(p - this->cbegin());
-      if(!this->members_.m_map){
+      if (!this->members_.m_map) {
          this->priv_initialize_map(0);
-         pos = this->begin();
+         p = this->cbegin();
       }
 
-      const size_type elemsbefore = static_cast<size_type>(pos - this->members_.m_start);
-      const size_type length = this->size();
+      iterator pos(p.unconst());
+      const size_type pos_n = size_type(p - this->cbegin());
+
       if (elemsbefore < length / 2) {
          const iterator new_start = this->priv_reserve_elements_at_front(n);
          const iterator old_start = this->members_.m_start;
-         if(!elemsbefore){
-            proxy.uninitialized_copy_n_and_update(this->alloc(), new_start, n);
-            this->members_.m_start = new_start;
-         }
-         else{
-            pos = this->members_.m_start + difference_type(elemsbefore);
-            if (elemsbefore >= n) {
-               const iterator start_n = this->members_.m_start + difference_type(n);
+         pos = this->members_.m_start + difference_type(elemsbefore);
+         if (elemsbefore >= n) {
+            const iterator start_n = this->members_.m_start + difference_type(n);
+            BOOST_CONTAINER_TRY {
                ::boost::container::uninitialized_move_alloc
                   (this->alloc(), this->members_.m_start, start_n, new_start);
-               this->members_.m_start = new_start;
-               boost::container::move(start_n, pos, old_start);
-               proxy.copy_n_and_update(this->alloc(), pos - difference_type(n), n);
             }
-            else {
-               const size_type mid_count = n - elemsbefore;
-               const iterator mid_start = old_start - difference_type(mid_count);
+            BOOST_CONTAINER_CATCH(...) {
+               this->priv_destroy_nodes(new_start.m_node, this->members_.m_start.m_node);
+               BOOST_CONTAINER_RETHROW
+            }
+            BOOST_CONTAINER_CATCH_END
+            this->members_.m_start = new_start;
+            boost::container::move(start_n, pos, old_start);
+            proxy.copy_n_and_update(this->alloc(), pos - difference_type(n), n);
+         }
+         else {
+            const size_type mid_count = n - elemsbefore;
+            const iterator mid_start = old_start - difference_type(mid_count);
+            BOOST_CONTAINER_TRY {
                proxy.uninitialized_copy_n_and_update(this->alloc(), mid_start, mid_count);
                this->members_.m_start = mid_start;
-               ::boost::container::uninitialized_move_alloc
-                  (this->alloc(), old_start, pos, new_start);
-               this->members_.m_start = new_start;
-               proxy.copy_n_and_update(this->alloc(), old_start, elemsbefore);
+               ::boost::container::uninitialized_move_alloc(this->alloc(), old_start, pos, new_start);
+            }
+            BOOST_CONTAINER_CATCH(...) {
+               this->priv_destroy_nodes(new_start.m_node, this->members_.m_start.m_node);
+               BOOST_CONTAINER_RETHROW
             }
+            BOOST_CONTAINER_CATCH_END
+            this->members_.m_start = new_start;
+            proxy.copy_n_and_update(this->alloc(), old_start, elemsbefore);
          }
       }
       else {
          const iterator new_finish = this->priv_reserve_elements_at_back(n);
          const iterator old_finish = this->members_.m_finish;
          const size_type elemsafter = length - elemsbefore;
-         if(!elemsafter){
-            proxy.uninitialized_copy_n_and_update(this->alloc(), old_finish, n);
+
+         pos = old_finish - difference_type(elemsafter);
+         if (elemsafter >= n) {
+            iterator finish_n = old_finish - difference_type(n);
+            BOOST_CONTAINER_TRY {
+               ::boost::container::uninitialized_move_alloc(this->alloc(), finish_n, old_finish, old_finish);
+            }
+            BOOST_CONTAINER_CATCH(...) {
+               this->priv_destroy_nodes(this->members_.m_finish.m_node + 1, new_finish.m_node + 1);
+               BOOST_CONTAINER_RETHROW
+            }
+            BOOST_CONTAINER_CATCH_END
+
             this->members_.m_finish = new_finish;
+            boost::container::move_backward(pos, finish_n, old_finish);
+            proxy.copy_n_and_update(this->alloc(), pos, n);
          }
-         else{
-            pos = old_finish - difference_type(elemsafter);
-            if (elemsafter >= n) {
-               iterator finish_n = old_finish - difference_type(n);
-               ::boost::container::uninitialized_move_alloc
-                  (this->alloc(), finish_n, old_finish, old_finish);
-               this->members_.m_finish = new_finish;
-               boost::container::move_backward(pos, finish_n, old_finish);
-               proxy.copy_n_and_update(this->alloc(), pos, n);
-            }
-            else {
-               const size_type raw_gap = n - elemsafter;
+         else {
+            const size_type raw_gap = n - elemsafter;
+            BOOST_CONTAINER_TRY{
                ::boost::container::uninitialized_move_alloc
                   (this->alloc(), pos, old_finish, old_finish + difference_type(raw_gap));
                BOOST_CONTAINER_TRY{
                   proxy.copy_n_and_update(this->alloc(), pos, elemsafter);
                   proxy.uninitialized_copy_n_and_update(this->alloc(), old_finish, raw_gap);
                }
-               BOOST_CONTAINER_CATCH(...){
+               BOOST_CONTAINER_CATCH(...) {
                   this->priv_destroy_range(old_finish, old_finish + difference_type(elemsafter));
                   BOOST_CONTAINER_RETHROW
                }
                BOOST_CONTAINER_CATCH_END
-               this->members_.m_finish = new_finish;
             }
+            BOOST_CONTAINER_CATCH(...) {
+               this->priv_destroy_nodes(this->members_.m_finish.m_node + 1, new_finish.m_node + 1);
+               BOOST_CONTAINER_RETHROW
+            }
+            BOOST_CONTAINER_CATCH_END
+            this->members_.m_finish = new_finish;
          }
       }
       return this->begin() + difference_type(pos_n);
    }
 
+   template<class InsertProxy>
+   iterator priv_insert_aux_impl(const_iterator p, size_type n, InsertProxy proxy)
+   {
+      iterator pos(p.unconst());
+      const size_type elemsbefore = static_cast<size_type>(pos - this->members_.m_start);
+      const size_type length = this->size();
+
+      if (!elemsbefore) {
+         return this->priv_insert_front_aux_impl(n, proxy);
+      }
+      else if (elemsbefore == length) {
+         return this->priv_insert_back_aux_impl(n, proxy);
+      }
+      else {
+         return this->priv_insert_middle_aux_impl(p, elemsbefore, length, n, proxy);
+      }
+   }
+
    template <class InsertProxy>
    iterator priv_insert_back_aux_impl(size_type n, InsertProxy proxy)
    {
@@ -2146,8 +2645,14 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
       }
 
       iterator new_finish = this->priv_reserve_elements_at_back(n);
-      iterator old_finish = this->members_.m_finish;
-      proxy.uninitialized_copy_n_and_update(this->alloc(), old_finish, n);
+      BOOST_CONTAINER_TRY{
+         proxy.uninitialized_copy_n_and_update(this->alloc(), this->members_.m_finish, n);
+      }
+      BOOST_CONTAINER_CATCH(...) {
+         this->priv_destroy_nodes(this->members_.m_finish.m_node + 1, new_finish.m_node + 1);
+         BOOST_CONTAINER_RETHROW
+      }
+      BOOST_CONTAINER_CATCH_END
       this->members_.m_finish = new_finish;
       return iterator(this->members_.m_finish - difference_type(n));
    }
@@ -2160,12 +2665,20 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
       }
 
       iterator new_start = this->priv_reserve_elements_at_front(n);
-      proxy.uninitialized_copy_n_and_update(this->alloc(), new_start, n);
+      BOOST_CONTAINER_TRY{
+         proxy.uninitialized_copy_n_and_update(this->alloc(), new_start, n);
+      }
+      BOOST_CONTAINER_CATCH(...) {
+         this->priv_destroy_nodes(new_start.m_node, this->members_.m_start.m_node);
+         BOOST_CONTAINER_RETHROW
+      }
+      BOOST_CONTAINER_CATCH_END
+
       this->members_.m_start = new_start;
       return new_start;
    }
 
-   BOOST_CONTAINER_FORCEINLINE iterator priv_fill_insert(const_iterator pos, size_type n, const value_type& x)
+   inline iterator priv_fill_insert(const_iterator pos, size_type n, const value_type& x)
    {
       return this->insert(pos, c_it(x, n), c_it());
    }
@@ -2181,7 +2694,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
                (this->alloc(), *cur, *cur + get_block_ssize(), value);
          }
          boost::container::uninitialized_fill_alloc
-            (this->alloc(), this->members_.m_finish.m_first, this->members_.m_finish.m_cur, value);
+            (this->alloc(), this->members_.m_finish.get_first(), this->members_.m_finish.m_cur, value);
       }
       BOOST_CONTAINER_CATCH(...){
          this->priv_destroy_range(this->members_.m_start, iterator(*cur, cur, get_block_size()));
@@ -2220,7 +2733,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
             ::boost::container::uninitialized_copy_alloc(this->alloc(), first, mid, *cur_node);
             first = mid;
          }
-         ::boost::container::uninitialized_copy_alloc(this->alloc(), first, last, this->members_.m_finish.m_first);
+         ::boost::container::uninitialized_copy_alloc(this->alloc(), first, last, this->members_.m_finish.get_first());
       }
       BOOST_CONTAINER_CATCH(...){
          this->priv_destroy_range(this->members_.m_start, iterator(*cur_node, cur_node, get_block_size()));
@@ -2229,21 +2742,21 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
       BOOST_CONTAINER_CATCH_END
    }
 
-   // Called only if this->members_.m_finish.m_cur == this->members_.m_finish.m_first.
+   // Called only if this->members_.m_finish.m_cur == this->members_.m_finish.get_first().
    void priv_pop_back_aux() BOOST_NOEXCEPT_OR_NOTHROW
    {
-      this->priv_deallocate_node(this->members_.m_finish.m_first);
+      this->priv_deallocate_node(this->members_.m_finish.get_first());
       this->members_.m_finish.priv_set_node(this->members_.m_finish.m_node - 1, get_block_size());
-      this->members_.m_finish.m_cur = this->members_.m_finish.m_last - 1;
+      this->members_.m_finish.m_cur = this->members_.m_finish.get_last() - 1;
       allocator_traits_type::destroy
          ( this->alloc()
          , boost::movelib::to_raw_pointer(this->members_.m_finish.m_cur)
          );
    }
 
-   // Called only if this->members_.m_start.m_cur == this->members_.m_start.m_last - 1.  Note that
+   // Called only if this->members_.m_start.m_cur == this->members_.m_start.get_last() - 1.  Note that
    // if the deque has at least one element (a precondition for this member
-   // function), and if this->members_.m_start.m_cur == this->members_.m_start.m_last, then the deque
+   // function), and if this->members_.m_start.m_cur == this->members_.m_start.get_last(), then the deque
    // must have at least two nodes.
    void priv_pop_front_aux() BOOST_NOEXCEPT_OR_NOTHROW
    {
@@ -2251,14 +2764,14 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
          ( this->alloc()
          , boost::movelib::to_raw_pointer(this->members_.m_start.m_cur)
          );
-      this->priv_deallocate_node(this->members_.m_start.m_first);
+      this->priv_deallocate_node(this->members_.m_start.get_first());
       this->members_.m_start.priv_set_node(this->members_.m_start.m_node + 1, get_block_size());
-      this->members_.m_start.m_cur = this->members_.m_start.m_first;
+      this->members_.m_start.m_cur = this->members_.m_start.get_first();
    }
 
    iterator priv_reserve_elements_at_front(size_type n)
    {
-      size_type vacancies = size_type(this->members_.m_start.m_cur - this->members_.m_start.m_first);
+      size_type vacancies = size_type(this->members_.m_start.m_cur - this->members_.m_start.get_first());
       if (n > vacancies){
          size_type new_elems = n-vacancies;
          size_type new_nodes = (new_elems + get_block_size() - 1u) / get_block_size();
@@ -2283,7 +2796,7 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
 
    iterator priv_reserve_elements_at_back(size_type n)
    {
-      size_type vacancies = size_type(this->members_.m_finish.m_last - this->members_.m_finish.m_cur - 1);
+      size_type vacancies = size_type(this->members_.m_finish.get_last() - this->members_.m_finish.m_cur - 1);
       if (n > vacancies){
          size_type new_elems = size_type(n - vacancies);
          size_type new_nodes = size_type(new_elems + get_block_size() - 1u)/get_block_size();
@@ -2348,7 +2861,8 @@ template <typename InputIterator, typename Allocator>
 deque(InputIterator, InputIterator, Allocator const&) -> deque<typename iterator_traits<InputIterator>::value_type, Allocator>;
 #endif
 
-}}
+}  //namespace container
+}  //namespace boost
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
@@ -2361,7 +2875,7 @@ struct has_trivial_destructor_after_move<boost::container::deque<T, Allocator, O
 {
    typedef typename boost::container::deque<T, Allocator, Options>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
                              ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
diff --git a/inst/include/boost/container/detail/adaptive_node_pool.hpp b/inst/include/boost/container/detail/adaptive_node_pool.hpp
index 9dd89b133..816b95d1c 100644
--- a/inst/include/boost/container/detail/adaptive_node_pool.hpp
+++ b/inst/include/boost/container/detail/adaptive_node_pool.hpp
@@ -76,7 +76,7 @@ class private_adaptive_node_pool
    private_adaptive_node_pool &operator=(const private_adaptive_node_pool &);
 
    public:
-   static const std::size_t nodes_per_block = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t nodes_per_block = NodesPerBlock;
 
    //!Constructor. Never throws
    private_adaptive_node_pool()
diff --git a/inst/include/boost/container/detail/adaptive_node_pool_impl.hpp b/inst/include/boost/container/detail/adaptive_node_pool_impl.hpp
index e3400977d..119b5b615 100644
--- a/inst/include/boost/container/detail/adaptive_node_pool_impl.hpp
+++ b/inst/include/boost/container/detail/adaptive_node_pool_impl.hpp
@@ -49,10 +49,10 @@ namespace container {
 
 namespace adaptive_pool_flag {
 
-static const unsigned int none            = 0u;
-static const unsigned int align_only      = 1u << 0u;
-static const unsigned int size_ordered    = 1u << 1u;
-static const unsigned int address_ordered = 1u << 2u;
+BOOST_CONTAINER_CONSTANT_VAR unsigned int none            = 0u;
+BOOST_CONTAINER_CONSTANT_VAR unsigned int align_only      = 1u << 0u;
+BOOST_CONTAINER_CONSTANT_VAR unsigned int size_ordered    = 1u << 1u;
+BOOST_CONTAINER_CONSTANT_VAR unsigned int address_ordered = 1u << 2u;
 
 }  //namespace adaptive_pool_flag{
 
@@ -213,11 +213,11 @@ template<class MultiallocationChain, class VoidPointer, class SizeType, unsigned
 struct adaptive_pool_types
 {
    typedef VoidPointer void_pointer;
-   static const unsigned ordered = (Flags & (adaptive_pool_flag::size_ordered | adaptive_pool_flag::address_ordered));
+   BOOST_STATIC_CONSTEXPR unsigned ordered = (Flags & (adaptive_pool_flag::size_ordered | adaptive_pool_flag::address_ordered));
    typedef block_container_traits<VoidPointer, SizeType, ordered> block_container_traits_t;
    typedef typename block_container_traits_t::hook_t hook_t;
    typedef hdr_offset_holder_t<SizeType> hdr_offset_holder;
-   static const unsigned int order_flags = Flags & (adaptive_pool_flag::size_ordered | adaptive_pool_flag::address_ordered);
+   BOOST_STATIC_CONSTEXPR unsigned int order_flags = Flags & (adaptive_pool_flag::size_ordered | adaptive_pool_flag::address_ordered);
    typedef MultiallocationChain free_nodes_t;
 
    struct block_info_t
@@ -253,11 +253,11 @@ template< std::size_t alignment
         , std::size_t overhead_percent>
 struct candidate_power_of_2_ct_helper
 {
-   static const std::size_t hdr_subblock_elements_alone = (alignment - hdr_size - payload_per_allocation)/real_node_size;
-   static const std::size_t hdr_subblock_elements_first = (alignment - hdr_size - payload_per_allocation)/real_node_size;
-   static const std::size_t elements_per_b_subblock_mid = (alignment - hdr_offset_size)/real_node_size;
-   static const std::size_t elements_per_b_subblock_end = (alignment - hdr_offset_size - payload_per_allocation)/real_node_size;
-   static const std::size_t num_b_subblock =
+   BOOST_STATIC_CONSTEXPR std::size_t hdr_subblock_elements_alone = (alignment - hdr_size - payload_per_allocation)/real_node_size;
+   BOOST_STATIC_CONSTEXPR std::size_t hdr_subblock_elements_first = (alignment - hdr_size - payload_per_allocation)/real_node_size;
+   BOOST_STATIC_CONSTEXPR std::size_t elements_per_b_subblock_mid = (alignment - hdr_offset_size)/real_node_size;
+   BOOST_STATIC_CONSTEXPR std::size_t elements_per_b_subblock_end = (alignment - hdr_offset_size - payload_per_allocation)/real_node_size;
+   BOOST_STATIC_CONSTEXPR std::size_t num_b_subblock =
       hdr_subblock_elements_alone >= min_elements_per_block
          ? 0
          : (   ((hdr_subblock_elements_first + elements_per_b_subblock_end) >= min_elements_per_block)
@@ -266,18 +266,18 @@ struct candidate_power_of_2_ct_helper
             )
          ;
 
-   static const std::size_t num_b_subblock_mid = (num_b_subblock > 1) ? (num_b_subblock - 1) : 0;
+   BOOST_STATIC_CONSTEXPR std::size_t num_b_subblock_mid = (num_b_subblock > 1) ? (num_b_subblock - 1) : 0;
 
-   static const std::size_t total_nodes = (num_b_subblock == 0)
+   BOOST_STATIC_CONSTEXPR std::size_t total_nodes = (num_b_subblock == 0)
                                          ? hdr_subblock_elements_alone
                                          : ( (num_b_subblock == 1)
                                            ? (hdr_subblock_elements_first + elements_per_b_subblock_end)
                                            : (hdr_subblock_elements_first + num_b_subblock_mid*elements_per_b_subblock_mid + elements_per_b_subblock_end)
                                            )
                                          ;
-   static const std::size_t total_data = total_nodes*real_node_size;
-   static const std::size_t total_size = alignment*(num_b_subblock+1);
-   static const bool overhead_satisfied = (total_size - total_data)*100/total_size < overhead_percent;
+   BOOST_STATIC_CONSTEXPR std::size_t total_data = total_nodes*real_node_size;
+   BOOST_STATIC_CONSTEXPR std::size_t total_size = alignment*(num_b_subblock+1);
+   BOOST_STATIC_CONSTEXPR bool overhead_satisfied = (total_size - total_data)*100/total_size < overhead_percent;
 };
 
 template< std::size_t initial_alignment
@@ -299,7 +299,7 @@ struct candidate_power_of_2_ct
         , hdr_offset_size
         , overhead_percent> helper_t;
 
-   static const std::size_t candidate_power_of_2 = initial_alignment << std::size_t(!helper_t::overhead_satisfied);
+   BOOST_STATIC_CONSTEXPR std::size_t candidate_power_of_2 = initial_alignment << std::size_t(!helper_t::overhead_satisfied);
 
    typedef typename candidate_power_of_2_ct
       < candidate_power_of_2
@@ -312,9 +312,9 @@ struct candidate_power_of_2_ct
       , !helper_t::overhead_satisfied
       >::type type;
 
-   static const std::size_t alignment     = type::alignment;
-   static const std::size_t num_subblocks = type::num_subblocks;
-   static const std::size_t real_num_node = type::real_num_node;
+   BOOST_STATIC_CONSTEXPR std::size_t alignment     = type::alignment;
+   BOOST_STATIC_CONSTEXPR std::size_t num_subblocks = type::num_subblocks;
+   BOOST_STATIC_CONSTEXPR std::size_t real_num_node = type::real_num_node;
 };
 
 template< std::size_t initial_alignment
@@ -354,9 +354,9 @@ struct candidate_power_of_2_ct
         , hdr_offset_size
         , overhead_percent> helper_t;
 
-   static const std::size_t alignment = initial_alignment;
-   static const std::size_t num_subblocks = helper_t::num_b_subblock+1;
-   static const std::size_t real_num_node = helper_t::total_nodes;
+   BOOST_STATIC_CONSTEXPR std::size_t alignment = initial_alignment;
+   BOOST_STATIC_CONSTEXPR std::size_t num_subblocks = helper_t::num_b_subblock+1;
+   BOOST_STATIC_CONSTEXPR std::size_t real_num_node = helper_t::total_nodes;
 };
 
 /////////////////////////////////////////////
@@ -429,13 +429,13 @@ class private_adaptive_node_pool_impl_common
    typedef typename SegmentManagerBase::size_type                    size_type;
    //Flags
    //align_only
-   static const bool AlignOnly      = (Flags & adaptive_pool_flag::align_only) != 0;
+   BOOST_STATIC_CONSTEXPR bool AlignOnly      = (Flags & adaptive_pool_flag::align_only) != 0;
    typedef bool_<AlignOnly>            IsAlignOnly;
    typedef true_                       AlignOnlyTrue;
    typedef false_                      AlignOnlyFalse;
 
    typedef typename SegmentManagerBase::void_pointer void_pointer;
-   static const typename SegmentManagerBase::
+   BOOST_STATIC_CONSTEXPR typename SegmentManagerBase::
       size_type PayloadPerAllocation = SegmentManagerBase::PayloadPerAllocation;
 
    typedef typename boost::intrusive::pointer_traits
@@ -453,9 +453,9 @@ class private_adaptive_node_pool_impl_common
    typedef typename adaptive_pool_types_t::hdr_offset_holder         hdr_offset_holder;
    typedef private_adaptive_node_pool_impl_common                    this_type;
 
-   static const size_type MaxAlign = alignment_of<void_pointer>::value;
-   static const size_type HdrSize  = ((sizeof(block_info_t)-1)/MaxAlign+1)*MaxAlign;
-   static const size_type HdrOffsetSize = ((sizeof(hdr_offset_holder)-1)/MaxAlign+1)*MaxAlign;
+   BOOST_STATIC_CONSTEXPR size_type MaxAlign = alignment_of<void_pointer>::value;
+   BOOST_STATIC_CONSTEXPR size_type HdrSize  = ((sizeof(block_info_t)-1)/MaxAlign+1)*MaxAlign;
+   BOOST_STATIC_CONSTEXPR size_type HdrOffsetSize = ((sizeof(hdr_offset_holder)-1)/MaxAlign+1)*MaxAlign;
 
    segment_mngr_base_ptr_t             mp_segment_mngr_base;   //Segment manager
    block_container_t                   m_block_container;      //Intrusive block list
@@ -981,9 +981,9 @@ template< class SizeType
         , bool AlignOnly>
 struct calculate_alignment_ct
 {
-   static const std::size_t alignment     = upper_power_of_2_ct<SizeType, HdrSize + RealNodeSize*NodesPerBlock>::value;
-   static const std::size_t num_subblocks = 0;
-   static const std::size_t real_num_node = (alignment - PayloadPerAllocation - HdrSize)/RealNodeSize;
+   BOOST_STATIC_CONSTEXPR std::size_t alignment     = upper_power_of_2_ct<SizeType, HdrSize + RealNodeSize*NodesPerBlock>::value;
+   BOOST_STATIC_CONSTEXPR std::size_t num_subblocks = 0;
+   BOOST_STATIC_CONSTEXPR std::size_t real_num_node = (alignment - PayloadPerAllocation - HdrSize)/RealNodeSize;
 };
 
 template< class SizeType
@@ -1013,9 +1013,9 @@ struct calculate_alignment_ct
       , OverheadPercent
       >::type type;
 
-   static const std::size_t alignment     = type::alignment;
-   static const std::size_t num_subblocks = type::num_subblocks;
-   static const std::size_t real_num_node = type::real_num_node;
+   BOOST_STATIC_CONSTEXPR std::size_t alignment     = type::alignment;
+   BOOST_STATIC_CONSTEXPR std::size_t num_subblocks = type::num_subblocks;
+   BOOST_STATIC_CONSTEXPR std::size_t real_num_node = type::real_num_node;
 };
 
 
@@ -1046,17 +1046,17 @@ class private_adaptive_node_pool_impl_ct
    typedef typename base_t::multiallocation_chain     multiallocation_chain;
    typedef typename base_t::segment_manager_base_type segment_manager_base_type;
 
-   static const typename base_t::size_type PayloadPerAllocation = base_t::PayloadPerAllocation;
+   BOOST_STATIC_CONSTEXPR typename base_t::size_type PayloadPerAllocation = base_t::PayloadPerAllocation;
 
    //align_only
-   static const bool AlignOnly      = base_t::AlignOnly;
+   BOOST_STATIC_CONSTEXPR bool AlignOnly      = base_t::AlignOnly;
 
    private:
-   static const size_type MaxAlign = base_t::MaxAlign;
-   static const size_type HdrSize  = base_t::HdrSize;
-   static const size_type HdrOffsetSize = base_t::HdrOffsetSize;
+   BOOST_STATIC_CONSTEXPR size_type MaxAlign = base_t::MaxAlign;
+   BOOST_STATIC_CONSTEXPR size_type HdrSize  = base_t::HdrSize;
+   BOOST_STATIC_CONSTEXPR size_type HdrOffsetSize = base_t::HdrOffsetSize;
 
-   static const size_type RealNodeSize = lcm_ct<NodeSize, alignment_of<void_pointer>::value>::value;
+   BOOST_STATIC_CONSTEXPR size_type RealNodeSize = lcm_ct<NodeSize, alignment_of<void_pointer>::value>::value;
 
    typedef calculate_alignment_ct
       < size_type, HdrSize, PayloadPerAllocation
@@ -1065,9 +1065,9 @@ class private_adaptive_node_pool_impl_ct
    //Round the size to a power of two value.
    //This is the total memory size (including payload) that we want to
    //allocate from the general-purpose allocator
-   static const size_type NumSubBlocks       = data_t::num_subblocks;
-   static const size_type RealNumNode        = data_t::real_num_node;
-   static const size_type RealBlockAlignment = data_t::alignment;
+   BOOST_STATIC_CONSTEXPR size_type NumSubBlocks       = data_t::num_subblocks;
+   BOOST_STATIC_CONSTEXPR size_type RealNumNode        = data_t::real_num_node;
+   BOOST_STATIC_CONSTEXPR size_type RealBlockAlignment = data_t::alignment;
 
    public:
 
@@ -1165,14 +1165,14 @@ class private_adaptive_node_pool_impl_rt
    typedef typename impl_t::size_type              size_type;
    typedef typename impl_t::multiallocation_chain  multiallocation_chain;
 
-   static const typename impl_t::size_type PayloadPerAllocation = impl_t::PayloadPerAllocation;
+   BOOST_STATIC_CONSTEXPR typename impl_t::size_type PayloadPerAllocation = impl_t::PayloadPerAllocation;
 
    //Flags
    //align_only
-   static const bool AlignOnly      = impl_t::AlignOnly;
+   BOOST_STATIC_CONSTEXPR bool AlignOnly      = impl_t::AlignOnly;
 
-   static const size_type HdrSize  = impl_t::HdrSize;
-   static const size_type HdrOffsetSize = impl_t::HdrOffsetSize;
+   BOOST_STATIC_CONSTEXPR size_type HdrSize  = impl_t::HdrSize;
+   BOOST_STATIC_CONSTEXPR size_type HdrOffsetSize = impl_t::HdrOffsetSize;
 
    public:
 
diff --git a/inst/include/boost/container/detail/advanced_insert_int.hpp b/inst/include/boost/container/detail/advanced_insert_int.hpp
index 0238805db..e16082a74 100644
--- a/inst/include/boost/container/detail/advanced_insert_int.hpp
+++ b/inst/include/boost/container/detail/advanced_insert_int.hpp
@@ -39,6 +39,7 @@
 
 #include <boost/move/utility_core.hpp>
 #include <boost/move/detail/force_ptr.hpp>
+#include <boost/move/detail/launder.hpp>
 // other
 #include <boost/assert.hpp>
 
@@ -49,19 +50,19 @@ struct move_insert_range_proxy
 {
    typedef typename allocator_traits<Allocator>::value_type value_type;
 
-   BOOST_CONTAINER_FORCEINLINE explicit move_insert_range_proxy(FwdIt first)
+   inline explicit move_insert_range_proxy(FwdIt first)
       :  first_(first)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
    {
       this->first_ = ::boost::container::uninitialized_move_alloc_n_source
          (a, this->first_, n, p);
    }
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &, Iterator p, std::size_t n)
+   inline void copy_n_and_update(Allocator &, Iterator p, std::size_t n)
    {
       this->first_ = ::boost::container::move_n_source(this->first_, n, p);
    }
@@ -75,18 +76,18 @@ struct insert_range_proxy
 {
    typedef typename allocator_traits<Allocator>::value_type value_type;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_range_proxy(FwdIt first)
+   inline explicit insert_range_proxy(FwdIt first)
       :  first_(first)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
    {
       this->first_ = ::boost::container::uninitialized_copy_alloc_n_source(a, this->first_, n, p);
    }
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &, Iterator p, std::size_t n)
+   inline void copy_n_and_update(Allocator &, Iterator p, std::size_t n)
    {
       this->first_ = ::boost::container::copy_n_source(this->first_, n, p);
    }
@@ -100,16 +101,16 @@ struct insert_n_copies_proxy
 {
    typedef typename allocator_traits<Allocator>::value_type value_type;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_n_copies_proxy(const value_type &v)
+   inline explicit insert_n_copies_proxy(const value_type &v)
       :  v_(v)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
    {  boost::container::uninitialized_fill_alloc_n(a, v_, n, p);  }
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &, Iterator p, std::size_t n) const
+   inline void copy_n_and_update(Allocator &, Iterator p, std::size_t n) const
    {
       while (n){
          --n;
@@ -129,7 +130,7 @@ struct insert_value_initialized_n_proxy
    typedef typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type storage_t;
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
    {  boost::container::uninitialized_value_init_alloc_n(a, n, p);  }
 
    template<class Iterator>
@@ -138,8 +139,8 @@ struct insert_value_initialized_n_proxy
       while (n){
          --n;
          storage_t v;
-         alloc_traits::construct(a, move_detail::force_ptr<value_type *>(&v));
-         value_type *vp = move_detail::force_ptr<value_type *>(&v);
+         alloc_traits::construct(a, (value_type*)&v);
+         value_type *vp = move_detail::launder_cast<value_type *>(&v);
          value_destructor<Allocator> on_exit(a, *vp); (void)on_exit;
          *p = ::boost::move(*vp);
          ++p;
@@ -155,7 +156,7 @@ struct insert_default_initialized_n_proxy
    typedef typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type storage_t;
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
    {  boost::container::uninitialized_default_init_alloc_n(a, n, p);  }
 
    template<class Iterator>
@@ -165,8 +166,8 @@ struct insert_default_initialized_n_proxy
          while (n){
             --n;
             typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;
-            alloc_traits::construct(a, move_detail::force_ptr<value_type *>(&v), default_init);
-            value_type *vp = move_detail::force_ptr<value_type *>(&v);
+            alloc_traits::construct(a, (value_type*)&v, default_init);
+            value_type *vp = move_detail::launder_cast<value_type *>(&v);
             value_destructor<Allocator> on_exit(a, *vp); (void)on_exit;
             *p = ::boost::move(*vp);
             ++p;
@@ -181,21 +182,21 @@ struct insert_copy_proxy
    typedef boost::container::allocator_traits<Allocator> alloc_traits;
    typedef typename alloc_traits::value_type value_type;
 
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_copy_proxy(const value_type &v)
+   inline explicit insert_copy_proxy(const value_type &v)
       :  v_(v)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
    {
       BOOST_ASSERT(n == 1);  (void)n;
       alloc_traits::construct( a, boost::movelib::iterator_to_raw_pointer(p), v_);
    }
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &, Iterator p, std::size_t n) const
+   inline void copy_n_and_update(Allocator &, Iterator p, std::size_t n) const
    {
       BOOST_ASSERT(n == 1);  (void)n;
       *p = v_;
@@ -211,21 +212,21 @@ struct insert_move_proxy
    typedef boost::container::allocator_traits<Allocator> alloc_traits;
    typedef typename alloc_traits::value_type value_type;
 
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_move_proxy(value_type &v)
+   inline explicit insert_move_proxy(value_type &v)
       :  v_(v)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n) const
    {
       BOOST_ASSERT(n == 1);  (void)n;
       alloc_traits::construct( a, boost::movelib::iterator_to_raw_pointer(p), ::boost::move(v_) );
    }
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &, Iterator p, std::size_t n) const
+   inline void copy_n_and_update(Allocator &, Iterator p, std::size_t n) const
    {
       BOOST_ASSERT(n == 1);  (void)n;
       *p = ::boost::move(v_);
@@ -235,13 +236,13 @@ struct insert_move_proxy
 };
 
 template<class It, class Allocator>
-BOOST_CONTAINER_FORCEINLINE insert_move_proxy<Allocator> get_insert_value_proxy(BOOST_RV_REF(typename boost::container::iterator_traits<It>::value_type) v)
+inline insert_move_proxy<Allocator> get_insert_value_proxy(BOOST_RV_REF(typename boost::container::iterator_traits<It>::value_type) v)
 {
    return insert_move_proxy<Allocator>(v);
 }
 
 template<class It, class Allocator>
-BOOST_CONTAINER_FORCEINLINE insert_copy_proxy<Allocator> get_insert_value_proxy(const typename boost::container::iterator_traits<It>::value_type &v)
+inline insert_copy_proxy<Allocator> get_insert_value_proxy(const typename boost::container::iterator_traits<It>::value_type &v)
 {
    return insert_copy_proxy<Allocator>(v);
 }
@@ -264,19 +265,19 @@ struct insert_nonmovable_emplace_proxy
    typedef typename alloc_traits::value_type       value_type;
    typedef typename build_number_seq<sizeof...(Args)>::type index_tuple_t;
 
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_nonmovable_emplace_proxy(BOOST_FWD_REF(Args)... args)
+   inline explicit insert_nonmovable_emplace_proxy(BOOST_FWD_REF(Args)... args)
       : args_(args...)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
    {  this->priv_uninitialized_copy_some_and_update(a, index_tuple_t(), p, n);  }
 
    private:
    template<std::size_t ...IdxPack, class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void priv_uninitialized_copy_some_and_update(Allocator &a, const index_tuple<IdxPack...>&, Iterator p, std::size_t n)
+   inline void priv_uninitialized_copy_some_and_update(Allocator &a, const index_tuple<IdxPack...>&, Iterator p, std::size_t n)
    {
       BOOST_ASSERT(n == 1); (void)n;
       alloc_traits::construct( a, boost::movelib::iterator_to_raw_pointer(p), ::boost::forward<Args>(get<IdxPack>(this->args_))... );
@@ -295,25 +296,25 @@ struct insert_emplace_proxy
    typedef typename base_t::value_type             value_type;
    typedef typename base_t::index_tuple_t          index_tuple_t;
 
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy(BOOST_FWD_REF(Args)... args)
+   inline explicit insert_emplace_proxy(BOOST_FWD_REF(Args)... args)
       : base_t(::boost::forward<Args>(args)...)
    {}
 
    template<class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
+   inline void copy_n_and_update(Allocator &a, Iterator p, std::size_t n)
    {  this->priv_copy_some_and_update(a, index_tuple_t(), p, n);  }
 
    private:
 
    template<std::size_t ...IdxPack, class Iterator>
-   BOOST_CONTAINER_FORCEINLINE void priv_copy_some_and_update(Allocator &a, const index_tuple<IdxPack...>&, Iterator p, std::size_t n)
+   inline void priv_copy_some_and_update(Allocator &a, const index_tuple<IdxPack...>&, Iterator p, std::size_t n)
    {
       BOOST_ASSERT(n ==1); (void)n;
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;
-      alloc_traits::construct(a, move_detail::force_ptr<value_type *>(&v), ::boost::forward<Args>(get<IdxPack>(this->args_))...);
-      value_type *vp = move_detail::force_ptr<value_type *>(&v);
+      alloc_traits::construct(a, (value_type*)&v, ::boost::forward<Args>(get<IdxPack>(this->args_))...);
+      value_type *vp = move_detail::launder_cast<value_type *>(&v);
       BOOST_CONTAINER_TRY{
          *p = ::boost::move(*vp);
       }
@@ -331,9 +332,9 @@ template<class Allocator>
 struct insert_emplace_proxy<Allocator, typename boost::container::allocator_traits<Allocator>::value_type>
    : public insert_move_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy(typename boost::container::allocator_traits<Allocator>::value_type &&v)
+   inline explicit insert_emplace_proxy(typename boost::container::allocator_traits<Allocator>::value_type &&v)
    : insert_move_proxy<Allocator>(v)
    {}
 };
@@ -348,9 +349,9 @@ struct insert_emplace_proxy<Allocator
    : public insert_copy_proxy<Allocator>
 {
 
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
@@ -359,9 +360,9 @@ template<class Allocator>
 struct insert_emplace_proxy<Allocator, typename boost::container::allocator_traits<Allocator>::value_type &>
    : public insert_copy_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
@@ -372,9 +373,9 @@ struct insert_emplace_proxy<Allocator
    >
    : public insert_copy_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
@@ -396,20 +397,20 @@ struct insert_nonmovable_emplace_proxy##N\
    typedef boost::container::allocator_traits<Allocator> alloc_traits;\
    typedef typename alloc_traits::value_type value_type;\
    \
-   static const bool single_value = true;\
+   BOOST_STATIC_CONSTEXPR bool single_value = true;\
    \
-   BOOST_CONTAINER_FORCEINLINE explicit insert_nonmovable_emplace_proxy##N(BOOST_MOVE_UREF##N)\
+   inline explicit insert_nonmovable_emplace_proxy##N(BOOST_MOVE_UREF##N)\
       BOOST_MOVE_COLON##N BOOST_MOVE_FWD_INIT##N {}\
    \
    template<class Iterator>\
-   BOOST_CONTAINER_FORCEINLINE void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)\
+   inline void uninitialized_copy_n_and_update(Allocator &a, Iterator p, std::size_t n)\
    {\
       BOOST_ASSERT(n == 1); (void)n;\
       alloc_traits::construct(a, boost::movelib::iterator_to_raw_pointer(p) BOOST_MOVE_I##N BOOST_MOVE_MFWD##N);\
    }\
    \
    template<class Iterator>\
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &, Iterator, std::size_t)\
+   inline void copy_n_and_update(Allocator &, Iterator, std::size_t)\
    {  BOOST_ASSERT(false);   }\
    \
    protected:\
@@ -425,18 +426,18 @@ struct insert_emplace_proxy_arg##N\
    typedef typename base_t::value_type value_type;\
    typedef boost::container::allocator_traits<Allocator> alloc_traits;\
    \
-   static const bool single_value = true;\
+   BOOST_STATIC_CONSTEXPR bool single_value = true;\
    \
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg##N(BOOST_MOVE_UREF##N)\
+   inline explicit insert_emplace_proxy_arg##N(BOOST_MOVE_UREF##N)\
       : base_t(BOOST_MOVE_FWD##N){}\
    \
    template<class Iterator>\
-   BOOST_CONTAINER_FORCEINLINE void copy_n_and_update(Allocator &a, Iterator p, std::size_t n)\
+   inline void copy_n_and_update(Allocator &a, Iterator p, std::size_t n)\
    {\
       BOOST_ASSERT(n == 1); (void)n;\
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;\
-      alloc_traits::construct(a, move_detail::force_ptr<value_type *>(&v) BOOST_MOVE_I##N BOOST_MOVE_MFWD##N);\
-      value_type *vp = move_detail::force_ptr<value_type *>(&v);\
+      alloc_traits::construct(a, (value_type*)&v BOOST_MOVE_I##N BOOST_MOVE_MFWD##N);\
+      value_type *vp = move_detail::launder_cast<value_type *>(&v);\
       BOOST_CONTAINER_TRY{\
          *p = ::boost::move(*vp);\
       }\
@@ -459,9 +460,9 @@ template<class Allocator>
 struct insert_emplace_proxy_arg1<Allocator, ::boost::rv<typename boost::container::allocator_traits<Allocator>::value_type> >
    : public insert_move_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg1(typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy_arg1(typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_move_proxy<Allocator>(v)
    {}
 };
@@ -470,9 +471,9 @@ template<class Allocator>
 struct insert_emplace_proxy_arg1<Allocator, typename boost::container::allocator_traits<Allocator>::value_type>
    : public insert_copy_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
@@ -484,9 +485,9 @@ template<class Allocator>
 struct insert_emplace_proxy_arg1<Allocator, typename boost::container::allocator_traits<Allocator>::value_type>
    : public insert_move_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg1(typename boost::container::allocator_traits<Allocator>::value_type &&v)
+   inline explicit insert_emplace_proxy_arg1(typename boost::container::allocator_traits<Allocator>::value_type &&v)
    : insert_move_proxy<Allocator>(v)
    {}
 };
@@ -500,9 +501,9 @@ struct insert_emplace_proxy_arg1<Allocator
    >
    : public insert_copy_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
@@ -511,9 +512,9 @@ template<class Allocator>
 struct insert_emplace_proxy_arg1<Allocator, typename boost::container::allocator_traits<Allocator>::value_type &>
    : public insert_copy_proxy<Allocator>
 {
-   static const bool single_value = true;
+   BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
@@ -524,9 +525,9 @@ struct insert_emplace_proxy_arg1<Allocator
    >
    : public insert_copy_proxy<Allocator>
 {
-   static const bool single_value = true;
+  BOOST_STATIC_CONSTEXPR bool single_value = true;
 
-   BOOST_CONTAINER_FORCEINLINE explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
+   inline explicit insert_emplace_proxy_arg1(const typename boost::container::allocator_traits<Allocator>::value_type &v)
    : insert_copy_proxy<Allocator>(v)
    {}
 };
diff --git a/inst/include/boost/container/detail/alloc_helpers.hpp b/inst/include/boost/container/detail/alloc_helpers.hpp
index 5ca2ca727..57c59e46c 100644
--- a/inst/include/boost/container/detail/alloc_helpers.hpp
+++ b/inst/include/boost/container/detail/alloc_helpers.hpp
@@ -27,30 +27,30 @@ namespace container {
 namespace dtl {
 
 template<class AllocatorType>
-BOOST_CONTAINER_FORCEINLINE void swap_alloc(AllocatorType &, AllocatorType &, dtl::false_type)
+inline void swap_alloc(AllocatorType &, AllocatorType &, dtl::false_type)
    BOOST_NOEXCEPT_OR_NOTHROW
 {}
 
 template<class AllocatorType>
-BOOST_CONTAINER_FORCEINLINE void swap_alloc(AllocatorType &l, AllocatorType &r, dtl::true_type)
+inline void swap_alloc(AllocatorType &l, AllocatorType &r, dtl::true_type)
 {  boost::adl_move_swap(l, r);   }
 
 template<class AllocatorType>
-BOOST_CONTAINER_FORCEINLINE void assign_alloc(AllocatorType &, const AllocatorType &, dtl::false_type)
+inline void assign_alloc(AllocatorType &, const AllocatorType &, dtl::false_type)
    BOOST_NOEXCEPT_OR_NOTHROW
 {}
 
 template<class AllocatorType>
-BOOST_CONTAINER_FORCEINLINE void assign_alloc(AllocatorType &l, const AllocatorType &r, dtl::true_type)
+inline void assign_alloc(AllocatorType &l, const AllocatorType &r, dtl::true_type)
 {  l = r;   }
 
 template<class AllocatorType>
-BOOST_CONTAINER_FORCEINLINE void move_alloc(AllocatorType &, AllocatorType &, dtl::false_type)
+inline void move_alloc(AllocatorType &, AllocatorType &, dtl::false_type)
    BOOST_NOEXCEPT_OR_NOTHROW
 {}
 
 template<class AllocatorType>
-BOOST_CONTAINER_FORCEINLINE void move_alloc(AllocatorType &l, AllocatorType &r, dtl::true_type)
+inline void move_alloc(AllocatorType &l, AllocatorType &r, dtl::true_type)
 {  l = ::boost::move(r);   }
 
 }  //namespace dtl {
diff --git a/inst/include/boost/container/detail/allocation_type.hpp b/inst/include/boost/container/detail/allocation_type.hpp
index 1e8aa6731..5f0d4b62b 100644
--- a/inst/include/boost/container/detail/allocation_type.hpp
+++ b/inst/include/boost/container/detail/allocation_type.hpp
@@ -42,13 +42,13 @@ enum allocation_type_v
 
 typedef unsigned int allocation_type;
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
-static const allocation_type allocate_new       = (allocation_type)allocate_new_v;
-static const allocation_type expand_fwd         = (allocation_type)expand_fwd_v;
-static const allocation_type expand_bwd         = (allocation_type)expand_bwd_v;
-static const allocation_type shrink_in_place    = (allocation_type)shrink_in_place_v;
-static const allocation_type try_shrink_in_place= (allocation_type)try_shrink_in_place_v;
-static const allocation_type nothrow_allocation = (allocation_type)nothrow_allocation_v;
-static const allocation_type zero_memory        = (allocation_type)zero_memory_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type allocate_new       = (allocation_type)allocate_new_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type expand_fwd         = (allocation_type)expand_fwd_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type expand_bwd         = (allocation_type)expand_bwd_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type shrink_in_place    = (allocation_type)shrink_in_place_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type try_shrink_in_place= (allocation_type)try_shrink_in_place_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type nothrow_allocation = (allocation_type)nothrow_allocation_v;
+BOOST_CONTAINER_CONSTANT_VAR allocation_type zero_memory        = (allocation_type)zero_memory_v;
 
 }  //namespace container {
 }  //namespace boost {
diff --git a/inst/include/boost/container/detail/allocator_version_traits.hpp b/inst/include/boost/container/detail/allocator_version_traits.hpp
index 391f4666c..4e83d213b 100644
--- a/inst/include/boost/container/detail/allocator_version_traits.hpp
+++ b/inst/include/boost/container/detail/allocator_version_traits.hpp
@@ -46,19 +46,19 @@ struct allocator_version_traits
    typedef typename boost::container::allocator_traits<Allocator>::size_type  size_type;
 
    //Node allocation interface
-   BOOST_CONTAINER_FORCEINLINE static pointer allocate_one(Allocator &a)
+   inline static pointer allocate_one(Allocator &a)
    {  return a.allocate_one();   }
 
-   BOOST_CONTAINER_FORCEINLINE static void deallocate_one(Allocator &a, const pointer &p)
+   inline static void deallocate_one(Allocator &a, const pointer &p)
    {  a.deallocate_one(p);   }
 
-   BOOST_CONTAINER_FORCEINLINE static void allocate_individual(Allocator &a, size_type n, multiallocation_chain &m)
+   inline static void allocate_individual(Allocator &a, size_type n, multiallocation_chain &m)
    {  return a.allocate_individual(n, m);   }
 
-   BOOST_CONTAINER_FORCEINLINE static void deallocate_individual(Allocator &a, multiallocation_chain &holder)
+   inline static void deallocate_individual(Allocator &a, multiallocation_chain &holder)
    {  a.deallocate_individual(holder);   }
 
-   BOOST_CONTAINER_FORCEINLINE static pointer allocation_command(Allocator &a, allocation_type command,
+   inline static pointer allocation_command(Allocator &a, allocation_type command,
                          size_type limit_size, size_type &prefer_in_recvd_out_size, pointer &reuse)
    {  return a.allocation_command(command, limit_size, prefer_in_recvd_out_size, reuse);  }
 };
@@ -82,10 +82,10 @@ struct allocator_version_traits<Allocator, 1>
          < multialloc_cached_counted, value_type>           multiallocation_chain;
 
    //Node allocation interface
-   BOOST_CONTAINER_FORCEINLINE static pointer allocate_one(Allocator &a)
+   inline static pointer allocate_one(Allocator &a)
    {  return a.allocate(1);   }
 
-   BOOST_CONTAINER_FORCEINLINE static void deallocate_one(Allocator &a, const pointer &p)
+   inline static void deallocate_one(Allocator &a, const pointer &p)
    {  a.deallocate(p, 1);   }
 
    static void deallocate_individual(Allocator &a, multiallocation_chain &holder)
@@ -102,17 +102,17 @@ struct allocator_version_traits<Allocator, 1>
 
    struct allocate_individual_rollback
    {
-      BOOST_CONTAINER_FORCEINLINE allocate_individual_rollback(Allocator &a, multiallocation_chain &chain)
+      inline allocate_individual_rollback(Allocator &a, multiallocation_chain &chain)
          : mr_a(a), mp_chain(&chain)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE ~allocate_individual_rollback()
+      inline ~allocate_individual_rollback()
       {
          if(mp_chain)
             allocator_version_traits::deallocate_individual(mr_a, *mp_chain);
       }
 
-      BOOST_CONTAINER_FORCEINLINE void release()
+      inline void release()
       {
          mp_chain = 0;
       }
diff --git a/inst/include/boost/container/detail/block_list.hpp b/inst/include/boost/container/detail/block_list.hpp
index 0ed0e2279..485232678 100644
--- a/inst/include/boost/container/detail/block_list.hpp
+++ b/inst/include/boost/container/detail/block_list.hpp
@@ -74,11 +74,11 @@ class block_list_base
 {
    list_node m_list;
 
-   static const std::size_t MaxAlignMinus1 = memory_resource::max_align-1u;
+   BOOST_STATIC_CONSTEXPR std::size_t MaxAlignMinus1 = memory_resource::max_align-1u;
 
    public:
 
-   static const std::size_t header_size = std::size_t(sizeof(DerivedFromBlockListHeader) + MaxAlignMinus1) & std::size_t(~MaxAlignMinus1);
+   BOOST_STATIC_CONSTEXPR std::size_t header_size = std::size_t(sizeof(DerivedFromBlockListHeader) + MaxAlignMinus1) & std::size_t(~MaxAlignMinus1);
 
    explicit block_list_base()
    {  list_algo::init_header(&m_list);  }
diff --git a/inst/include/boost/container/detail/block_slist.hpp b/inst/include/boost/container/detail/block_slist.hpp
index 890e72588..b265ba44c 100644
--- a/inst/include/boost/container/detail/block_slist.hpp
+++ b/inst/include/boost/container/detail/block_slist.hpp
@@ -68,11 +68,11 @@ class block_slist_base
 {
    slist_node m_slist;
 
-   static const std::size_t MaxAlignMinus1 = memory_resource::max_align-1u;
+   BOOST_STATIC_CONSTEXPR std::size_t MaxAlignMinus1 = memory_resource::max_align-1u;
 
    public:
 
-   static const std::size_t header_size = std::size_t(sizeof(DerivedFromBlockSlistHeader) + MaxAlignMinus1) & std::size_t(~MaxAlignMinus1);
+   BOOST_STATIC_CONSTEXPR std::size_t header_size = std::size_t(sizeof(DerivedFromBlockSlistHeader) + MaxAlignMinus1) & std::size_t(~MaxAlignMinus1);
 
    explicit block_slist_base()
    {  slist_algo::init_header(&m_slist);  }
diff --git a/inst/include/boost/container/detail/compare_functors.hpp b/inst/include/boost/container/detail/compare_functors.hpp
index ae4ffcea9..9a3527402 100644
--- a/inst/include/boost/container/detail/compare_functors.hpp
+++ b/inst/include/boost/container/detail/compare_functors.hpp
@@ -32,11 +32,11 @@ class equal_to_value
    const value_type &t_;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit equal_to_value(const value_type &t)
+   inline explicit equal_to_value(const value_type &t)
       :  t_(t)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE bool operator()(const value_type &t)const
+   inline bool operator()(const value_type &t)const
    {  return t_ == t;   }
 };
 
@@ -47,39 +47,39 @@ struct value_to_node_compare
    typedef Pred predicate_type;
    typedef Node node_type;
 
-   BOOST_CONTAINER_FORCEINLINE value_to_node_compare()
+   inline value_to_node_compare()
       : Pred()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit value_to_node_compare(Pred pred)
+   inline explicit value_to_node_compare(Pred pred)
       :  Pred(pred)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a, const Node &b) const
+   inline Ret operator()(const Node &a, const Node &b) const
    {  return static_cast<const Pred&>(*this)(a.get_data(), b.get_data());  }
 
-   BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a) const
+   inline Ret operator()(const Node &a) const
    {  return static_cast<const Pred&>(*this)(a.get_data());  }
 
-   BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a, const Node &b)
+   inline Ret operator()(const Node &a, const Node &b)
    {  return static_cast<Pred&>(*this)(a.get_data(), b.get_data());  }
 
-   BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a)
+   inline Ret operator()(const Node &a)
    {  return static_cast<Pred&>(*this)(a.get_data());  }
 
-   BOOST_CONTAINER_FORCEINLINE predicate_type &       predicate()        { return static_cast<predicate_type&>(*this); }
-   BOOST_CONTAINER_FORCEINLINE const predicate_type & predicate()  const { return static_cast<predicate_type&>(*this); }
+   inline predicate_type &       predicate()        { return static_cast<predicate_type&>(*this); }
+   inline const predicate_type & predicate()  const { return static_cast<predicate_type&>(*this); }
 };
 
 template<class KeyPred, class KeyOfValue, class Node, class Ret = bool>
 struct key_node_pred
    :  public boost::intrusive::detail::ebo_functor_holder<KeyPred>
 {
-   BOOST_CONTAINER_FORCEINLINE explicit key_node_pred(const KeyPred &comp)
+   inline explicit key_node_pred(const KeyPred &comp)
       :  base_t(comp)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit key_node_pred()
+   inline explicit key_node_pred()
    {}
 
    typedef boost::intrusive::detail::ebo_functor_holder<KeyPred> base_t;
@@ -88,42 +88,42 @@ struct key_node_pred
    typedef typename KeyOfValue::type   key_type;
 
 
-   BOOST_CONTAINER_FORCEINLINE static const key_type &key_from(const Node &n)
+   inline static const key_type &key_from(const Node &n)
    {
       return key_of_value()(n.get_data());
    }
 
    template <class T>
-   BOOST_CONTAINER_FORCEINLINE static const T &
+   inline static const T &
       key_from(const T &t)
    {  return t;  }
 
-   BOOST_CONTAINER_FORCEINLINE const key_predicate &key_pred() const
+   inline const key_predicate &key_pred() const
    {  return static_cast<const key_predicate &>(*this);  }
 
-   BOOST_CONTAINER_FORCEINLINE key_predicate &key_pred()
+   inline key_predicate &key_pred()
    {  return static_cast<key_predicate &>(*this);  }
 
-   BOOST_CONTAINER_FORCEINLINE Ret operator()(const key_type &key) const
+   inline Ret operator()(const key_type &key) const
    {  return this->key_pred()(key);  }
 
    template<class U>
-   BOOST_CONTAINER_FORCEINLINE Ret operator()(const U &nonkey) const
+   inline Ret operator()(const U &nonkey) const
    {  return this->key_pred()(this->key_from(nonkey));  }
 
-   BOOST_CONTAINER_FORCEINLINE bool operator()(const key_type &key1, const key_type &key2) const
+   inline bool operator()(const key_type &key1, const key_type &key2) const
    {  return this->key_pred()(key1, key2);  }
 
    template<class U>
-   BOOST_CONTAINER_FORCEINLINE bool operator()(const key_type &key1, const U &nonkey2) const
+   inline bool operator()(const key_type &key1, const U &nonkey2) const
    {  return this->key_pred()(key1, this->key_from(nonkey2));  }
 
    template<class U>
-   BOOST_CONTAINER_FORCEINLINE bool operator()(const U &nonkey1, const key_type &key2) const
+   inline bool operator()(const U &nonkey1, const key_type &key2) const
    {  return this->key_pred()(this->key_from(nonkey1), key2);  }
 
    template<class U, class V>
-   BOOST_CONTAINER_FORCEINLINE bool operator()(const U &nonkey1, const V &nonkey2) const
+   inline bool operator()(const U &nonkey1, const V &nonkey2) const
    {  return this->key_pred()(this->key_from(nonkey1), this->key_from(nonkey2));  }
 };
 
diff --git a/inst/include/boost/container/detail/config_begin.hpp b/inst/include/boost/container/detail/config_begin.hpp
index 96fc1b779..55661109b 100644
--- a/inst/include/boost/container/detail/config_begin.hpp
+++ b/inst/include/boost/container/detail/config_begin.hpp
@@ -41,6 +41,7 @@
    #pragma warning (disable : 4671) //  the copy constructor is inaccessible
    #pragma warning (disable : 4673) //  throwing '' the following types will not be considered at the catch site
    #pragma warning (disable : 4675) // "method" should be declared "static" and have exactly one parameter
+   #pragma warning (disable : 4702) // unreachable code
    #pragma warning (disable : 4706) // assignment within conditional expression
    #pragma warning (disable : 4710) // function not inlined
    #pragma warning (disable : 4714) // "function": marked as __forceinline not inlined
diff --git a/inst/include/boost/container/detail/construct_in_place.hpp b/inst/include/boost/container/detail/construct_in_place.hpp
index d824d814a..bfdf05c2e 100644
--- a/inst/include/boost/container/detail/construct_in_place.hpp
+++ b/inst/include/boost/container/detail/construct_in_place.hpp
@@ -24,6 +24,7 @@
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/iterators.hpp>
 #include <boost/container/detail/value_init.hpp>
+#include <boost/container/detail/is_pair.hpp>
 
 namespace boost {
 namespace container {
@@ -62,9 +63,42 @@ BOOST_CONTAINER_FORCEINLINE void construct_in_place(Allocator &a, T *dest, empla
 
 //Assignment
 
+template<class T, class U>
+BOOST_CONTAINER_FORCEINLINE
+   typename dtl::disable_if_c
+      <  dtl::is_pair<typename dtl::remove_reference<T>::type>::value
+      && dtl::is_pair<typename dtl::remove_reference<U>::type>::value
+      , void>::type
+assign_in_place_ref(T &t, BOOST_FWD_REF(U) u)
+{  t = ::boost::forward<U>(u);  }
+
+template<class T, class U>
+BOOST_CONTAINER_FORCEINLINE
+   typename dtl::enable_if_c
+      <  dtl::is_pair<typename dtl::remove_reference<T>::type>::value
+      && dtl::is_pair<typename dtl::remove_reference<U>::type>::value
+      , void>::type
+assign_in_place_ref(T &t, const U &u)
+{
+   assign_in_place_ref(t.first, u.first);
+   assign_in_place_ref(t.second, u.second);
+}
+
+template<class T, class U>
+BOOST_CONTAINER_FORCEINLINE
+   typename dtl::enable_if_c
+      <  dtl::is_pair<typename dtl::remove_reference<T>::type>::value
+      && dtl::is_pair<typename dtl::remove_reference<U>::type>::value
+      , void>::type
+assign_in_place_ref(T &t, BOOST_RV_REF(U) u)
+{
+   assign_in_place_ref(t.first,  ::boost::move(u.first));
+   assign_in_place_ref(t.second, ::boost::move(u.second));
+}
+
 template<class DstIt, class InpIt>
 BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, InpIt source)
-{  *dest = *source;  }
+{  assign_in_place_ref(*dest, *source);  }
 
 template<class DstIt, class U>
 BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, value_init_construct_iterator<U>)
diff --git a/inst/include/boost/container/detail/container_or_allocator_rebind.hpp b/inst/include/boost/container/detail/container_or_allocator_rebind.hpp
index 1525e41d9..e6f27b252 100644
--- a/inst/include/boost/container/detail/container_or_allocator_rebind.hpp
+++ b/inst/include/boost/container/detail/container_or_allocator_rebind.hpp
@@ -38,8 +38,7 @@ struct container_or_allocator_rebind_impl<AllocatorOrContainer, ToType, false>
 
 template<class ToType>
 struct container_or_allocator_rebind_impl<void, ToType, false>
-   : real_allocator<ToType, void>
-{};
+{  typedef void type;  };
 
 template<class AllocatorOrContainer, class ToType>
 struct container_or_allocator_rebind
diff --git a/inst/include/boost/container/detail/container_rebind.hpp b/inst/include/boost/container/detail/container_rebind.hpp
index 854291ae7..4c34209f9 100644
--- a/inst/include/boost/container/detail/container_rebind.hpp
+++ b/inst/include/boost/container/detail/container_rebind.hpp
@@ -26,6 +26,16 @@ namespace boost {
 namespace container {
 namespace dtl {
 
+   template<class V, class A, class U>
+   struct void_or_portable_rebind_alloc
+   {
+      typedef typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type type;
+   };
+
+   template<class V, class U>
+   struct void_or_portable_rebind_alloc<V, void, U>
+   {  typedef void type;  };
+
    template <class Cont, class U>
    struct container_rebind;
 
@@ -34,14 +44,14 @@ namespace dtl {
    template <template <class, class, class...> class Cont, typename V, typename A, class... An, class U>
    struct container_rebind<Cont<V, A, An...>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, An...> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, An...> type;
    };
 
    //Needed for non-conforming compilers like GCC 4.3
    template <template <class, class> class Cont, typename V, typename A, class U>
    struct container_rebind<Cont<V, A>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type> type;
    };
 
    template <template <class> class Cont, typename V, class U>
@@ -65,7 +75,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type> type;
    };
 
    template <template <class, class, class> class Cont  //1arg
@@ -73,7 +83,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0> type;
    };
 
    template <template <class, class, class, class> class Cont  //2arg
@@ -81,7 +91,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1> type;
    };
 
    template <template <class, class, class, class, class> class Cont  //3arg
@@ -89,7 +99,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2> type;
    };
 
    template <template <class, class, class, class, class, class> class Cont  //4arg
@@ -97,7 +107,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3> type;
    };
 
    template <template <class, class, class, class, class, class, class> class Cont  //5arg
@@ -105,7 +115,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4> type;
    };
 
    template <template <class, class, class, class, class, class, class, class> class Cont  //6arg
@@ -113,7 +123,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5> type;
    };
 
    template <template <class, class, class, class, class, class, class, class, class> class Cont  //7arg
@@ -121,7 +131,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5, P6>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5, P6> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5, P6> type;
    };
 
    template <template <class, class, class, class, class, class, class, class, class, class> class Cont  //8arg
@@ -129,7 +139,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5, P6, P7>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5, P6, P7> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5, P6, P7> type;
    };
 
    template <template <class, class, class, class, class, class, class, class, class, class, class> class Cont  //9arg
@@ -137,7 +147,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5, P6, P7, P8>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5, P6, P7, P8> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5, P6, P7, P8> type;
    };
 
 #endif   //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
@@ -147,7 +157,7 @@ namespace dtl {
    template <typename V, std::size_t N, typename A, typename O, class U>
    struct container_rebind<small_vector<V, N, A, O>, U>
    {
-      typedef small_vector<U, N, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, O> type;
+      typedef small_vector<U, N, typename void_or_portable_rebind_alloc<V, A, U>::type, O> type;
    };
 
    template <typename V, std::size_t N, typename O, class U>
diff --git a/inst/include/boost/container/detail/copy_move_algo.hpp b/inst/include/boost/container/detail/copy_move_algo.hpp
index b7a5b8c64..e2b6f7bd6 100644
--- a/inst/include/boost/container/detail/copy_move_algo.hpp
+++ b/inst/include/boost/container/detail/copy_move_algo.hpp
@@ -46,7 +46,12 @@
 #  endif
 //GCC 8 seems a bit confused about array access error with static_vector
 //when out of bound exceptions are being thrown.
-#  if defined(BOOST_GCC) && (BOOST_GCC >= 80000) && (BOOST_GCC < 80200)
+#  if defined(BOOST_GCC) && ((BOOST_GCC >= 80000) && (BOOST_GCC < 80200))
+//#     pragma GCC diagnostic ignored "-Wstringop-overflow"
+#  endif
+//GCC 12 seems a bit confused about array access error with small_vector
+#  if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+//#     pragma GCC diagnostic ignored "-Wstringop-overread"
 //#     pragma GCC diagnostic ignored "-Wstringop-overflow"
 #  endif
 //#  pragma GCC diagnostic ignored "-Warray-bounds"
@@ -59,7 +64,7 @@ namespace dtl {
 template<class I>
 struct are_elements_contiguous
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 /////////////////////////
@@ -69,7 +74,7 @@ struct are_elements_contiguous
 template<class T>
 struct are_elements_contiguous<T*>
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 /////////////////////////
@@ -110,7 +115,7 @@ namespace dtl {
 template <class Pointer, bool IsConst>
 struct are_elements_contiguous<boost::container::vec_iterator<Pointer, IsConst> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 
@@ -121,7 +126,7 @@ struct are_elements_contiguous<boost::container::vec_iterator<Pointer, IsConst>
 template <class PointedType, class DifferenceType, class OffsetType, std::size_t OffsetAlignment>
 struct are_elements_contiguous< ::boost::interprocess::offset_ptr<PointedType, DifferenceType, OffsetType, OffsetAlignment> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template <typename I, typename O>
@@ -180,20 +185,20 @@ struct has_single_value
    template <class U> static two test(int, ...);
    template <class U> static char test(int, const wrapper<U::single_value>*);
 public:
-   static const bool value = sizeof(test<T>(0, 0)) == 1;
+   BOOST_STATIC_CONSTEXPR bool value = sizeof(test<T>(0, 0)) == 1;
    void dummy() {}
 };
 
 template<class InsertionProxy, bool = has_single_value<InsertionProxy>::value>
 struct is_single_value_proxy_impl
 {
-   static const bool value = InsertionProxy::single_value;
+   BOOST_STATIC_CONSTEXPR bool value = InsertionProxy::single_value;
 };
 
 template<class InsertionProxy>
 struct is_single_value_proxy_impl<InsertionProxy, false>
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class InsertionProxy>
@@ -214,7 +219,7 @@ struct disable_if_single_value_proxy
 template
    <typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE F memmove(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
+inline F memmove(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {
    typedef typename boost::container::iter_value<I>::type      value_type;
    typedef typename boost::container::iterator_traits<F>::difference_type r_difference_type;
@@ -232,7 +237,7 @@ BOOST_CONTAINER_FORCEINLINE F memmove(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
 template
    <typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE F memmove_n(I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
+inline F memmove_n(I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {
    typedef typename boost::container::iter_value<I>::type value_type;
    typedef typename boost::container::iterator_traits<F>::difference_type r_difference_type;
@@ -250,7 +255,7 @@ BOOST_CONTAINER_FORCEINLINE F memmove_n(I f, std::size_t n, F r) BOOST_NOEXCEPT_
 template
    <typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE I memmove_n_source(I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
+inline I memmove_n_source(I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {
    if(BOOST_LIKELY(n != 0)){
       typedef typename boost::container::iter_value<I>::type value_type;
@@ -267,7 +272,7 @@ BOOST_CONTAINER_FORCEINLINE I memmove_n_source(I f, std::size_t n, F r) BOOST_NO
 template
    <typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE I memmove_n_source_dest(I f, std::size_t n, F &r) BOOST_NOEXCEPT_OR_NOTHROW
+inline I memmove_n_source_dest(I f, std::size_t n, F &r) BOOST_NOEXCEPT_OR_NOTHROW
 {
    typedef typename boost::container::iter_value<I>::type value_type;
    typedef typename boost::container::iterator_traits<F>::difference_type i_difference_type;
@@ -288,7 +293,7 @@ template <typename O>
 struct is_memzero_initializable
 {
    typedef typename ::boost::container::iterator_traits<O>::value_type value_type;
-   static const bool value = are_elements_contiguous<O>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = are_elements_contiguous<O>::value &&
       (  dtl::is_integral<value_type>::value || dtl::is_enum<value_type>::value
       #if defined(BOOST_CONTAINER_MEMZEROED_POINTER_IS_NULL)
       || dtl::is_pointer<value_type>::value
@@ -367,7 +372,7 @@ template
    <typename Allocator,
     typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
    uninitialized_move_alloc(Allocator &, I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove(f, l, r); }
 
@@ -413,7 +418,7 @@ template
    <typename Allocator,
     typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
    uninitialized_move_alloc_n(Allocator &, I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n(f, n, r); }
 
@@ -459,7 +464,7 @@ template
    <typename Allocator,
     typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_constructible<I, F, I>::type
+inline typename dtl::enable_if_memtransfer_copy_constructible<I, F, I>::type
    uninitialized_move_alloc_n_source(Allocator &, I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n_source(f, n, r); }
 
@@ -504,7 +509,7 @@ template
    <typename Allocator,
     typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
    uninitialized_copy_alloc(Allocator &, I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove(f, l, r); }
 
@@ -550,7 +555,7 @@ template
    <typename Allocator,
     typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_constructible<I, F, F>::type
    uninitialized_copy_alloc_n(Allocator &, I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n(f, n, r); }
 
@@ -595,7 +600,7 @@ template
    <typename Allocator,
     typename I, // I models InputIterator
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_constructible<I, F, I>::type
+inline typename dtl::enable_if_memtransfer_copy_constructible<I, F, I>::type
    uninitialized_copy_alloc_n_source(Allocator &, I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n_source(f, n, r); }
 
@@ -639,7 +644,7 @@ inline typename dtl::disable_if_memzero_initializable<F, F>::type
 template
    <typename Allocator,
     typename F> // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memzero_initializable<F, F>::type
+inline typename dtl::enable_if_memzero_initializable<F, F>::type
    uninitialized_value_init_alloc_n(Allocator &, std::size_t n, F r)
 {
    typedef typename boost::container::iterator_traits<F>::value_type value_type;
@@ -812,7 +817,7 @@ template
 <typename I,   // I models InputIterator
 typename U,   // U models unsigned integral constant
 typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
    copy_n(I f, U n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n(f, n, r); }
 
@@ -840,7 +845,7 @@ inline typename dtl::disable_if_memtransfer_copy_assignable<I, F, I>::type
 template
 <typename I,   // I models InputIterator
 typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
    copy_n_source(I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n_source(f, n, r); }
 
@@ -867,7 +872,7 @@ inline typename dtl::disable_if_memtransfer_copy_assignable<I, F, I>::type
 template
 <typename I,   // I models InputIterator
 typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
    copy_n_source_dest(I f, std::size_t n, F &r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n_source_dest(f, n, r);  }
 
@@ -922,7 +927,7 @@ template
 <typename I,   // I models InputIterator
 typename U,   // U models unsigned integral constant
 typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
    move_n(I f, U n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n(f, n, r); }
 
@@ -949,7 +954,7 @@ inline typename dtl::disable_if_memtransfer_copy_assignable<I, F, F>::type
 template
 <typename I,   // I models InputIterator
 typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
    move_backward(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {
    typedef typename boost::container::iter_value<I>::type value_type;
@@ -985,7 +990,7 @@ inline typename dtl::disable_if_memtransfer_copy_assignable<I, F, I>::type
 template
 <typename I    // I models InputIterator
 ,typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
    move_n_source_dest(I f, std::size_t n, F &r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n_source_dest(f, n, r); }
 
@@ -1013,18 +1018,18 @@ inline typename dtl::disable_if_memtransfer_copy_assignable<I, F, I>::type
 template
 <typename I    // I models InputIterator
 ,typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
+inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, I>::type
    move_n_source(I f, std::size_t n, F r) BOOST_NOEXCEPT_OR_NOTHROW
 {  return dtl::memmove_n_source(f, n, r); }
 
 template<typename F>   // F models ForwardIterator
-BOOST_CONTAINER_FORCEINLINE F move_forward_overlapping(F f, F l, F r)
+inline F move_forward_overlapping(F f, F l, F r)
 {
    return (f != r) ? (move)(f, l, r) : l;
 }
 
 template<typename B>   // B models BidirIterator
-BOOST_CONTAINER_FORCEINLINE B move_backward_overlapping(B f, B l, B rl)
+inline B move_backward_overlapping(B f, B l, B rl)
 {
    return (l != rl) ? (move_backward)(f, l, rl) : f;
 }
@@ -1054,7 +1059,7 @@ template
    <typename Allocator
    ,typename I   // I models InputIterator
    ,typename U>  // U models unsigned integral constant
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_trivially_destructible<I, void>::type
+inline typename dtl::enable_if_trivially_destructible<I, void>::type
    destroy_alloc_n(Allocator &, I, U)
 {}
 
@@ -1079,7 +1084,7 @@ inline typename dtl::disable_if_trivially_destructible<I, void>::type
 template
    <typename Allocator
    ,typename I >  // I models InputIterator
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_trivially_destructible<I, void>::type
+inline typename dtl::enable_if_trivially_destructible<I, void>::type
    destroy_alloc(Allocator &, I, I)
 {}
 
@@ -1106,7 +1111,7 @@ inline typename dtl::disable_if_memtransfer_copy_assignable<F, G, void>::type
    boost::container::destroy_alloc_n(a, large_range_f, std::size_t(n_j - n_i));
 }
 
-static const std::size_t DeepSwapAllocNMaxStorage = std::size_t(1) << std::size_t(11); //2K bytes
+BOOST_CONTAINER_CONSTANT_VAR std::size_t DeepSwapAllocNMaxStorage = std::size_t(1) << std::size_t(11); //2K bytes
 
 template
    <std::size_t MaxTmpBytes
@@ -1458,7 +1463,7 @@ template
    , typename F // F models ForwardIterator
    , typename InsertionProxy
 >
-BOOST_CONTAINER_FORCEINLINE void expand_forward_and_insert_alloc
+inline void expand_forward_and_insert_alloc
    ( Allocator& a
    , F pos
    , F last
@@ -1491,8 +1496,8 @@ void expand_backward_forward_and_insert_alloc_move_backward
 {
    typedef std::size_t size_type;
    typedef typename allocator_traits<Allocator>::value_type value_type;
-   static const bool trivial_dctr_after_move = has_trivial_destructor_after_move<value_type>::value;
-   static const bool trivial_dctr = dtl::is_trivially_destructible<value_type>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr_after_move = has_trivial_destructor_after_move<value_type>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr = dtl::is_trivially_destructible<value_type>::value;
 
    typedef typename dtl::if_c
       <trivial_dctr
@@ -1780,7 +1785,7 @@ template
    , typename B // B models BidirIterator
    , typename InsertionProxy
 >
-BOOST_CONTAINER_FORCEINLINE void expand_backward_forward_and_insert_alloc_move_forward
+inline void expand_backward_forward_and_insert_alloc_move_forward
    ( B const old_start
    , std::size_t const old_size
    , B const new_start
@@ -1791,8 +1796,8 @@ BOOST_CONTAINER_FORCEINLINE void expand_backward_forward_and_insert_alloc_move_f
 {
    typedef std::size_t size_type;
    typedef typename allocator_traits<Allocator>::value_type value_type;
-   static const bool trivial_dctr_after_move = has_trivial_destructor_after_move<value_type>::value;
-   static const bool trivial_dctr = dtl::is_trivially_destructible<value_type>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr_after_move = has_trivial_destructor_after_move<value_type>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr = dtl::is_trivially_destructible<value_type>::value;
 
    typedef typename dtl::if_c
       <trivial_dctr
diff --git a/inst/include/boost/container/detail/destroyers.hpp b/inst/include/boost/container/detail/destroyers.hpp
index f00ac6d6e..38ff87434 100644
--- a/inst/include/boost/container/detail/destroyers.hpp
+++ b/inst/include/boost/container/detail/destroyers.hpp
@@ -180,23 +180,23 @@ struct scoped_destructor_n
    typedef Ptr    pointer;
    typedef typename AllocTraits::value_type value_type;
 
-   BOOST_CONTAINER_FORCEINLINE scoped_destructor_n(Ptr p, Allocator& a, std::size_t n)
+   inline scoped_destructor_n(Ptr p, Allocator& a, std::size_t n)
       : m_p(p), m_n(n), m_a(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {  m_p = Ptr(); m_n = 0; }
 
-   BOOST_CONTAINER_FORCEINLINE void increment_size(std::size_t inc)
+   inline void increment_size(std::size_t inc)
    {  m_n += inc;   }
 
-   BOOST_CONTAINER_FORCEINLINE void increment_size_backwards(std::size_t inc)
+   inline void increment_size_backwards(std::size_t inc)
    {  m_n += inc;   m_p -= std::ptrdiff_t(inc);  }
 
-   BOOST_CONTAINER_FORCEINLINE void shrink_forward(std::size_t inc)
+   inline void shrink_forward(std::size_t inc)
    {  m_n -= inc;   m_p += std::ptrdiff_t(inc);  }
 
-   BOOST_CONTAINER_FORCEINLINE void set_size(std::size_t sz)
+   inline void set_size(std::size_t sz)
    {  m_n = sz;   }
 
    ~scoped_destructor_n()
@@ -225,22 +225,22 @@ struct null_scoped_destructor_n
    typedef boost::container::allocator_traits<Allocator> AllocTraits;
    typedef Ptr pointer;
 
-   BOOST_CONTAINER_FORCEINLINE null_scoped_destructor_n(Ptr, Allocator&, std::size_t)
+   inline null_scoped_destructor_n(Ptr, Allocator&, std::size_t)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void increment_size(std::size_t)
+   inline void increment_size(std::size_t)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void increment_size_backwards(std::size_t)
+   inline void increment_size_backwards(std::size_t)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void set_size(std::size_t )
+   inline void set_size(std::size_t )
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void shrink_forward(std::size_t)
+   inline void shrink_forward(std::size_t)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {}
 };
 
@@ -254,20 +254,20 @@ struct scoped_destructor_range
    typedef typename AllocTraits::pointer    pointer;
    typedef typename AllocTraits::value_type value_type;
    
-   BOOST_CONTAINER_FORCEINLINE scoped_destructor_range(pointer p, pointer e, Allocator& a)
+   inline scoped_destructor_range(pointer p, pointer e, Allocator& a)
       : m_p(p), m_e(e), m_a(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {  m_p = pointer(); m_e = pointer(); }
 
-   BOOST_CONTAINER_FORCEINLINE void set_end(pointer e)
+   inline void set_end(pointer e)
    {  m_e = e;   }
 
-   BOOST_CONTAINER_FORCEINLINE void set_begin(pointer b)
+   inline void set_begin(pointer b)
    {  m_p = b;  }
 
-   BOOST_CONTAINER_FORCEINLINE void set_range(pointer b, pointer e)
+   inline void set_range(pointer b, pointer e)
    {  m_p = b; m_e = e;   }
 
    ~scoped_destructor_range()
@@ -293,19 +293,19 @@ struct null_scoped_destructor_range
    typedef boost::container::allocator_traits<Allocator> AllocTraits;
    typedef typename AllocTraits::pointer pointer;
 
-   BOOST_CONTAINER_FORCEINLINE null_scoped_destructor_range(pointer, pointer, Allocator&)
+   inline null_scoped_destructor_range(pointer, pointer, Allocator&)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void set_end(pointer)
+   inline void set_end(pointer)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void set_begin(pointer)
+   inline void set_begin(pointer)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void set_range(pointer, pointer)
+   inline void set_range(pointer, pointer)
    {}
 };
 
@@ -316,24 +316,24 @@ class scoped_destructor
    typedef boost::container::allocator_traits<Allocator> AllocTraits;
    public:
    typedef typename Allocator::value_type value_type;
-   BOOST_CONTAINER_FORCEINLINE scoped_destructor(Allocator &a, value_type *pv)
+   inline scoped_destructor(Allocator &a, value_type *pv)
       : pv_(pv), a_(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE ~scoped_destructor()
+   inline ~scoped_destructor()
    {
       if(pv_){
          AllocTraits::destroy(a_, pv_);
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {  pv_ = 0; }
 
 
-   BOOST_CONTAINER_FORCEINLINE void set(value_type *ptr) { pv_ = ptr; }
+   inline void set(value_type *ptr) { pv_ = ptr; }
 
-   BOOST_CONTAINER_FORCEINLINE value_type *get() const { return pv_; }
+   inline value_type *get() const { return pv_; }
 
    private:
    value_type *pv_;
@@ -346,18 +346,18 @@ class null_scoped_destructor
    typedef boost::container::allocator_traits<Allocator> AllocTraits;
    public:
    typedef typename Allocator::value_type value_type;
-   BOOST_CONTAINER_FORCEINLINE null_scoped_destructor(Allocator &, value_type *)
+   inline null_scoped_destructor(Allocator &, value_type *)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE ~null_scoped_destructor()
+   inline ~null_scoped_destructor()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void set(value_type *) { }
+   inline void set(value_type *) { }
 
-   BOOST_CONTAINER_FORCEINLINE value_type *get() const { return 0; }
+   inline value_type *get() const { return 0; }
 };
 
 
@@ -368,11 +368,11 @@ class value_destructor
    typedef boost::container::allocator_traits<Allocator> AllocTraits;
    public:
    typedef Value value_type;
-   BOOST_CONTAINER_FORCEINLINE value_destructor(Allocator &a, value_type &rv)
+   inline value_destructor(Allocator &a, value_type &rv)
       : rv_(rv), a_(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE ~value_destructor()
+   inline ~value_destructor()
    {
       AllocTraits::destroy(a_, &rv_);
    }
@@ -396,18 +396,18 @@ class allocator_node_destroyer
    Allocator & a_;
 
    private:
-   BOOST_CONTAINER_FORCEINLINE void priv_deallocate(const pointer &p, version_1)
+   inline void priv_deallocate(const pointer &p, version_1)
    {  AllocTraits::deallocate(a_,p, 1); }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_deallocate(const pointer &p, version_2)
+   inline void priv_deallocate(const pointer &p, version_2)
    {  a_.deallocate_one(p); }
 
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit allocator_node_destroyer(Allocator &a)
+   inline explicit allocator_node_destroyer(Allocator &a)
       : a_(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void operator()(const pointer &p)
+   inline void operator()(const pointer &p)
    {
       boost::movelib::to_raw_pointer(p)->destructor(a_);
       this->priv_deallocate(p, alloc_version());
@@ -420,24 +420,24 @@ class scoped_node_destructor
    typedef boost::container::allocator_traits<Allocator> AllocTraits;
    public:
    typedef typename Allocator::value_type value_type;
-   BOOST_CONTAINER_FORCEINLINE scoped_node_destructor(Allocator &a, value_type *pv)
+   inline scoped_node_destructor(Allocator &a, value_type *pv)
       : pv_(pv), a_(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE ~scoped_node_destructor()
+   inline ~scoped_node_destructor()
    {
       if(pv_){
          pv_->destructor(a_);
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {  pv_ = 0; }
 
 
-   BOOST_CONTAINER_FORCEINLINE void set(value_type *ptr) { pv_ = ptr; }
+   inline void set(value_type *ptr) { pv_ = ptr; }
 
-   BOOST_CONTAINER_FORCEINLINE value_type *get() const { return pv_; }
+   inline value_type *get() const { return pv_; }
 
    private:
    value_type *pv_;
@@ -457,11 +457,11 @@ class allocator_node_destroyer_and_chain_builder
    multiallocation_chain &c_;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE allocator_node_destroyer_and_chain_builder(Allocator &a, multiallocation_chain &c)
+   inline allocator_node_destroyer_and_chain_builder(Allocator &a, multiallocation_chain &c)
       :  a_(a), c_(c)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void operator()(const typename Allocator::pointer &p)
+   inline void operator()(const typename Allocator::pointer &p)
    {
       boost::movelib::to_raw_pointer(p)->destructor(a_);
       c_.push_back(p);
@@ -480,14 +480,14 @@ class allocator_multialloc_chain_node_deallocator
    multiallocation_chain c_;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE allocator_multialloc_chain_node_deallocator(Allocator &a)
+   inline allocator_multialloc_chain_node_deallocator(Allocator &a)
       :  a_(a), c_()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE chain_builder get_chain_builder()
+   inline chain_builder get_chain_builder()
    {  return chain_builder(a_, c_);  }
 
-   BOOST_CONTAINER_FORCEINLINE ~allocator_multialloc_chain_node_deallocator()
+   inline ~allocator_multialloc_chain_node_deallocator()
    {
       a_.deallocate_individual(c_);
    }
diff --git a/inst/include/boost/container/detail/dispatch_uses_allocator.hpp b/inst/include/boost/container/detail/dispatch_uses_allocator.hpp
index 42fd4f4fd..343c512c7 100644
--- a/inst/include/boost/container/detail/dispatch_uses_allocator.hpp
+++ b/inst/include/boost/container/detail/dispatch_uses_allocator.hpp
@@ -62,7 +62,7 @@ namespace dtl {
       template<class X>
       static no_type test(...);
 
-      static const bool value = sizeof(test<T>(0)) == sizeof(yes_type);
+      BOOST_STATIC_CONSTEXPR bool value = sizeof(test<T>(0)) == sizeof(yes_type);
    };
 
    template <class T, class InnerAlloc, class ...Args>
@@ -110,7 +110,7 @@ template < typename ConstructAlloc
          , typename T
          , class ...Args
          >
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
+inline typename dtl::enable_if_and
    < void
    , dtl::is_not_pair<T>
    , dtl::not_< uses_allocator<T, typename remove_cvref<ArgAlloc>::type > >
@@ -127,7 +127,7 @@ template < typename ConstructAlloc
          , typename T
          , class ...Args
          >
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
+inline typename dtl::enable_if_and
    < void
    , dtl::is_not_pair<T>
    , uses_allocator<T, typename remove_cvref<ArgAlloc>::type>
@@ -146,7 +146,7 @@ template < typename ConstructAlloc
          , typename T
          , class ...Args
          >
-BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
+inline typename dtl::enable_if_and
    < void
    , dtl::is_not_pair<T>
    , uses_allocator<T, typename remove_cvref<ArgAlloc>::type>
@@ -162,7 +162,7 @@ BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
 
 #define BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR_CODE(N) \
    template <typename ConstructAlloc, typename ArgAlloc, typename T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
-   BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and\
+   inline typename dtl::enable_if_and\
       < void\
       , dtl::is_not_pair<T>\
       , dtl::not_<uses_allocator<T, typename remove_cvref<ArgAlloc>::type> >\
@@ -179,7 +179,7 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR
 
 #define BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR_CODE(N) \
    template < typename ConstructAlloc, typename ArgAlloc, typename T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
-   BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and\
+   inline typename dtl::enable_if_and\
       < void\
       , dtl::is_not_pair<T>\
       , uses_allocator<T, typename remove_cvref<ArgAlloc>::type>\
@@ -197,7 +197,7 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR
 
 #define BOOST_CONTAINER_SCOPED_ALLOCATOR_DISPATCH_USES_ALLOCATOR_CODE(N) \
    template < typename ConstructAlloc, typename ArgAlloc, typename T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
-   BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and\
+   inline typename dtl::enable_if_and\
       < void\
       , dtl::is_not_pair<T>\
       , uses_allocator<T, typename remove_cvref<ArgAlloc>::type>\
diff --git a/inst/include/boost/container/detail/flat_tree.hpp b/inst/include/boost/container/detail/flat_tree.hpp
index ef5176c48..b17e4f7de 100644
--- a/inst/include/boost/container/detail/flat_tree.hpp
+++ b/inst/include/boost/container/detail/flat_tree.hpp
@@ -26,7 +26,6 @@
 
 #include <boost/move/utility_core.hpp>
 
-#include <boost/container/detail/pair.hpp>
 #include <boost/container/vector.hpp>
 #include <boost/container/allocator_traits.hpp>
 
@@ -43,11 +42,12 @@
 
 #include <boost/intrusive/detail/minimal_pair_header.hpp>      //pair
 
-#include <boost/move/make_unique.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/adl_move_swap.hpp>
 #include <boost/move/detail/iterator_to_raw_pointer.hpp>
+#include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/move/detail/force_ptr.hpp>
+#include <boost/move/detail/launder.hpp>
 #include <boost/move/algo/adaptive_sort.hpp>
 #include <boost/move/algo/detail/pdqsort.hpp>
 
@@ -121,6 +121,7 @@ namespace boost {
 namespace container {
 namespace dtl {
 
+
 ///////////////////////////////////////
 //
 // Helper functions to merge elements
@@ -135,21 +136,26 @@ BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(stored_allocator_type)
 //
 ///////////////////////////////////////
 template<class SequenceContainer, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_container_inplace_merge //is_contiguous_container == true
+inline void flat_tree_container_inplace_merge //is_contiguous_container == true
    (SequenceContainer& dest, typename SequenceContainer::iterator it, Compare comp , dtl::true_)
 {
-   typedef typename SequenceContainer::value_type  value_type;
+   typedef typename SequenceContainer::value_type value_type;
+   typedef typename SequenceContainer::size_type  size_type;
+
    value_type *const braw = boost::movelib::to_raw_pointer(dest.data());
    value_type *const iraw = boost::movelib::iterator_to_raw_pointer(it);
    //Don't use iterator_to_raw_pointer for end as debug iterators can assert when
    //"operator ->" is used with the end iterator
    value_type *const eraw = braw + dest.size();
+   size_type dest_unused_storage_size = 0;
+   value_type *const dest_unused_storage_addr =
+      unused_storage<SequenceContainer>::get(dest, dest_unused_storage_size);
    boost::movelib::adaptive_merge
-      (braw, iraw, eraw, comp, eraw, back_free_capacity<SequenceContainer>::get(dest));
+      (braw, iraw, eraw, comp, dest_unused_storage_addr, dest_unused_storage_size);
 }
 
 template<class SequenceContainer, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_container_inplace_merge //is_contiguous_container == false
+inline void flat_tree_container_inplace_merge //is_contiguous_container == false
    (SequenceContainer& dest, typename SequenceContainer::iterator it, Compare comp, dtl::false_)
 {
    boost::movelib::adaptive_merge(dest.begin(), it, dest.end(), comp);
@@ -161,22 +167,26 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_container_inplace_merge //is_contiguo
 //
 ///////////////////////////////////////
 template<class SequenceContainer, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_container_inplace_sort_ending //is_contiguous_container == true
+inline void flat_tree_container_inplace_sort_ending //is_contiguous_container == true
    (SequenceContainer& dest, typename SequenceContainer::iterator it, Compare comp, dtl::true_)
 {
-   typedef typename SequenceContainer::value_type  value_type;
+   typedef typename SequenceContainer::value_type value_type;
+   typedef typename SequenceContainer::size_type  size_type;
+
    value_type *const iraw = boost::movelib::iterator_to_raw_pointer(it);
    //Don't use iterator_to_raw_pointer for end as debug iterators can assert when
    //"operator ->" is used with the end iterator
    value_type* const eraw = boost::movelib::to_raw_pointer(dest.data()) + dest.size();
 
-
+   size_type dest_unused_storage_size;
+   value_type* const dest_unused_storage_addr =
+      unused_storage<SequenceContainer>::get(dest, dest_unused_storage_size);
    boost::movelib::adaptive_sort
-      (iraw, eraw, comp, eraw, back_free_capacity<SequenceContainer>::get(dest));
+      (iraw, eraw, comp, dest_unused_storage_addr, dest_unused_storage_size);
 }
 
 template<class SequenceContainer, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_container_inplace_sort_ending //is_contiguous_container == false
+inline void flat_tree_container_inplace_sort_ending //is_contiguous_container == false
    (SequenceContainer& dest, typename SequenceContainer::iterator it, Compare comp , dtl::false_)
 {
    boost::movelib::adaptive_sort(it, dest.end(), comp);
@@ -188,19 +198,20 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_container_inplace_sort_ending //is_co
 //
 ///////////////////////////////////////
 template<class SequenceContainer, class Iterator, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal
+inline void flat_tree_merge_equal
    (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::true_)
 {
    dest.merge(first, last, comp);
 }
 
 template<class SequenceContainer, class Iterator, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal   //has_merge_unique == false
+inline void flat_tree_merge_equal   //has_merge_unique == false
    (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::false_)
 {
    if(first != last) {
       typedef typename SequenceContainer::iterator    iterator;
-      iterator const it = dest.insert( dest.end(), first, last );
+      iterator const it = dest.insert( dest.end(), first, last);
+      BOOST_ASSERT((is_sorted)(it, dest.end(), comp));
       dtl::bool_<is_contiguous_container<SequenceContainer>::value> contiguous_tag;
       (flat_tree_container_inplace_merge)(dest, it, comp, contiguous_tag);
    }
@@ -212,14 +223,14 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_equal   //has_merge_unique == f
 //
 ///////////////////////////////////////
 template<class SequenceContainer, class Iterator, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique  //has_merge_unique == true
+inline void flat_tree_merge_unique  //has_merge_unique == true
    (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::true_)
 {
    dest.merge_unique(first, last, comp);
 }
 
 template<class SequenceContainer, class Iterator, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique  //has_merge_unique == false
+inline void flat_tree_merge_unique  //has_merge_unique == false
    (SequenceContainer& dest, Iterator first, Iterator last, Compare comp, dtl::false_)
 {
    if (first != last) {
@@ -228,7 +239,9 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique  //has_merge_unique == f
       typedef typename SequenceContainer::difference_type   difference_type;
 
       size_type const old_sz = dest.size();
-      iterator const first_new = dest.insert(dest.cend(), first, last );
+      iterator const first_new = dest.insert(dest.cend(), first, last);
+      //We can't assert "is_sorted_and_unique" because the sequence can come from a multiset
+      BOOST_ASSERT((is_sorted)(first_new, dest.end(), comp));
       iterator e = boost::movelib::inplace_set_unique_difference(first_new, dest.end(), dest.begin(), first_new, comp);
       dest.erase(e, dest.end());
       dtl::bool_<is_contiguous_container<SequenceContainer>::value> contiguous_tag;
@@ -242,7 +255,7 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_merge_unique  //has_merge_unique == f
 //
 ///////////////////////////////////////
 template<class SequenceContainer, class Iterator>
-BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type
+inline typename SequenceContainer::size_type
    flat_tree_index_of   // has_index_of == true
       (SequenceContainer& cont, Iterator p, dtl::true_)
 {
@@ -250,7 +263,7 @@ BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type
 }
 
 template<class SequenceContainer, class Iterator>
-BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type
+inline typename SequenceContainer::size_type
    flat_tree_index_of   // has_index_of == false
       (SequenceContainer& cont, Iterator p, dtl::false_)
 {
@@ -264,7 +277,7 @@ BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type
 //
 ///////////////////////////////////////
 template<class Iterator, class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE Iterator
+inline Iterator
    flat_tree_nth  // has_nth == true
       (SequenceContainer& cont, typename SequenceContainer::size_type n, dtl::true_)
 {
@@ -272,7 +285,7 @@ BOOST_CONTAINER_FORCEINLINE Iterator
 }
 
 template<class Iterator, class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE Iterator
+inline Iterator
    flat_tree_nth  // has_nth == false
       (SequenceContainer& cont, typename SequenceContainer::size_type n, dtl::false_)
 {
@@ -285,7 +298,7 @@ BOOST_CONTAINER_FORCEINLINE Iterator
 //
 ///////////////////////////////////////
 template<class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::stored_allocator_type &
+inline typename SequenceContainer::stored_allocator_type &
    flat_tree_get_stored_allocator   // has_get_stored_allocator == true
       (SequenceContainer& cont, dtl::true_)
 {
@@ -293,7 +306,7 @@ BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::stored_allocator_type &
 }
 
 template<class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE const typename SequenceContainer::stored_allocator_type &
+inline const typename SequenceContainer::stored_allocator_type &
    flat_tree_get_stored_allocator   // has_get_stored_allocator == true
       (const SequenceContainer& cont, dtl::true_)
 {
@@ -301,7 +314,7 @@ BOOST_CONTAINER_FORCEINLINE const typename SequenceContainer::stored_allocator_t
 }
 
 template<class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::allocator_type
+inline typename SequenceContainer::allocator_type
    flat_tree_get_stored_allocator   // has_get_stored_allocator == false
       (SequenceContainer& cont, dtl::false_)
 {
@@ -317,27 +330,30 @@ template<class SequenceContainer, class Compare>
 void flat_tree_sort_contiguous_to_adopt // is_contiguous_container == true
    (SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp)
 {
-   if(tseq.capacity() >= (seq.capacity() - seq.size())) {
-      tseq.clear();
-      boost::movelib::adaptive_sort
-      (boost::movelib::iterator_to_raw_pointer(seq.begin())
-         , boost::movelib::iterator_to_raw_pointer(seq.end())
-         , comp
-         , boost::movelib::iterator_to_raw_pointer(tseq.begin())
-         , tseq.capacity());
-   }
-   else{
-      boost::movelib::adaptive_sort
-      (boost::movelib::iterator_to_raw_pointer(seq.begin())
-         , boost::movelib::iterator_to_raw_pointer(seq.end())
-         , comp
-         , boost::movelib::iterator_to_raw_pointer(seq.end())
-         , seq.capacity() - seq.size());
-   }
+   typedef typename SequenceContainer::value_type value_type;
+   typedef typename SequenceContainer::size_type  size_type;
+
+   size_type tseq_unused_storage_size, seq_unused_storage_size;
+   value_type* const tseq_unused_storage_addr =
+      unused_storage<SequenceContainer>::get(tseq, tseq_unused_storage_size);
+   value_type* const seq_unused_storage_addr  =
+      unused_storage<SequenceContainer>::get(seq,  seq_unused_storage_size);
+
+   tseq.clear();
+   const bool use_tseq_storage = tseq_unused_storage_size > seq_unused_storage_size;
+
+   value_type * const seq_beg = boost::movelib::iterator_to_raw_pointer(seq.data());
+
+   boost::movelib::adaptive_sort
+      ( seq_beg
+      , seq_beg + seq.size()
+      , comp
+      , use_tseq_storage ? tseq_unused_storage_addr : seq_unused_storage_addr
+      , use_tseq_storage ? tseq_unused_storage_size : seq_unused_storage_size);
 }
 
 template<class SequenceContainer, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_adopt_sequence_equal // is_contiguous_container == true
+inline void flat_tree_adopt_sequence_equal // is_contiguous_container == true
    (SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::true_)
 {
    flat_tree_sort_contiguous_to_adopt(tseq, boost::move(seq), comp);
@@ -345,7 +361,7 @@ BOOST_CONTAINER_FORCEINLINE void flat_tree_adopt_sequence_equal // is_contiguous
 }
 
 template<class SequenceContainer, class Compare>
-BOOST_CONTAINER_FORCEINLINE void flat_tree_adopt_sequence_equal // is_contiguous_container == false
+inline void flat_tree_adopt_sequence_equal // is_contiguous_container == false
    (SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::false_)
 {
    boost::movelib::adaptive_sort(seq.begin(), seq.end(), comp);
@@ -361,9 +377,11 @@ template<class SequenceContainer, class Compare>
 void flat_tree_adopt_sequence_unique// is_contiguous_container == true
    (SequenceContainer &tseq, BOOST_RV_REF(SequenceContainer) seq, Compare comp, dtl::true_)
 {
+   typedef typename SequenceContainer::value_type value_type;
+   value_type * const seq_beg = boost::movelib::iterator_to_raw_pointer(seq.data());
    boost::movelib::pdqsort
-      ( boost::movelib::iterator_to_raw_pointer(seq.begin())
-      , boost::movelib::iterator_to_raw_pointer(seq.end())
+      ( seq_beg
+      , seq_beg + seq.size()
       , comp);
    seq.erase(boost::movelib::unique
       (seq.begin(), seq.end(), boost::movelib::negate<Compare>(comp)), seq.cend());
@@ -386,14 +404,14 @@ void flat_tree_adopt_sequence_unique// is_contiguous_container == false
 //
 ///////////////////////////////////////
 template<class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE void // has_reserve == true
+inline void // has_reserve == true
    flat_tree_reserve(SequenceContainer &tseq, typename SequenceContainer::size_type cap, dtl::true_)
 {
    tseq.reserve(cap);
 }
 
 template<class SequenceContainer>
-BOOST_CONTAINER_FORCEINLINE void // has_reserve == false
+inline void // has_reserve == false
    flat_tree_reserve(SequenceContainer &, typename SequenceContainer::size_type, dtl::false_)
 {
 }
@@ -404,14 +422,14 @@ BOOST_CONTAINER_FORCEINLINE void // has_reserve == false
 //
 ///////////////////////////////////////
 template<class SequenceContainer>   // has_capacity == true
-BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type
+inline typename SequenceContainer::size_type
    flat_tree_capacity(const SequenceContainer &tseq, dtl::true_)
 {
    return tseq.capacity();
 }
 
 template<class SequenceContainer>   // has_capacity == false
-BOOST_CONTAINER_FORCEINLINE typename SequenceContainer::size_type
+inline typename SequenceContainer::size_type
    flat_tree_capacity(const SequenceContainer &tseq, dtl::false_)
 {
    return tseq.size();
@@ -431,45 +449,45 @@ class flat_tree_value_compare
    typedef Value              second_argument_type;
    typedef bool               return_type;
    public:
-   BOOST_CONTAINER_FORCEINLINE flat_tree_value_compare()
+   inline flat_tree_value_compare()
       : Compare()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree_value_compare(const Compare &pred)
+   inline flat_tree_value_compare(const Compare &pred)
       : Compare(pred)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE bool operator()(const Value& lhs, const Value& rhs) const
+   inline bool operator()(const Value& lhs, const Value& rhs) const
    {
       KeyOfValue key_extract;
       return Compare::operator()(key_extract(lhs), key_extract(rhs));
    }
 
-   BOOST_CONTAINER_FORCEINLINE const Compare &get_comp() const
+   inline const Compare &get_comp() const
       {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE Compare &get_comp()
+   inline Compare &get_comp()
       {  return *this;  }
 };
 
 
 ///////////////////////////////////////
 //
-//       select_container_type
+//       select_flat_tree_container_type
 //
 ///////////////////////////////////////
 template < class Value, class AllocatorOrContainer
          , bool = boost::container::dtl::is_container<AllocatorOrContainer>::value
          >
-struct select_container_type
+struct select_flat_tree_container_type
 {
    typedef AllocatorOrContainer type;
 };
 
-template <class Value, class AllocatorOrContainer>
-struct select_container_type<Value, AllocatorOrContainer, false>
+template <class Value, class AllocatorOrVoid>
+struct select_flat_tree_container_type<Value, AllocatorOrVoid, false>
 {
-   typedef boost::container::vector<Value, typename real_allocator<Value, AllocatorOrContainer>::type> type;
+   typedef boost::container::vector<Value, AllocatorOrVoid> type;
 };
 
 
@@ -483,7 +501,7 @@ template <class Value, class KeyOfValue,
 class flat_tree
 {
    public:
-   typedef typename select_container_type<Value, AllocatorOrContainer>::type container_type;
+   typedef typename select_flat_tree_container_type<Value, AllocatorOrContainer>::type container_type;
    typedef container_type sequence_type;  //For backwards compatibility
 
    private:
@@ -502,35 +520,35 @@ class flat_tree
       BOOST_COPYABLE_AND_MOVABLE(Data)
 
       public:
-      BOOST_CONTAINER_FORCEINLINE Data()
+      inline Data()
          : value_compare(), m_seq()
       {}
 
-      BOOST_CONTAINER_FORCEINLINE explicit Data(const allocator_t &alloc)
+      inline explicit Data(const allocator_t &alloc)
          : value_compare(), m_seq(alloc)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE explicit Data(const Compare &comp)
+      inline explicit Data(const Compare &comp)
          : value_compare(comp), m_seq()
       {}
 
-      BOOST_CONTAINER_FORCEINLINE Data(const Compare &comp, const allocator_t &alloc)
+      inline Data(const Compare &comp, const allocator_t &alloc)
          : value_compare(comp), m_seq(alloc)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE explicit Data(const Data &d)
+      inline explicit Data(const Data &d)
          : value_compare(static_cast<const value_compare&>(d)), m_seq(d.m_seq)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE Data(BOOST_RV_REF(Data) d)
+      inline Data(BOOST_RV_REF(Data) d)
          : value_compare(boost::move(static_cast<value_compare&>(d))), m_seq(boost::move(d.m_seq))
       {}
 
-      BOOST_CONTAINER_FORCEINLINE Data(const Data &d, const allocator_t &a)
+      inline Data(const Data &d, const allocator_t &a)
          : value_compare(static_cast<const value_compare&>(d)), m_seq(d.m_seq, a)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE Data(BOOST_RV_REF(Data) d, const allocator_t &a)
+      inline Data(BOOST_RV_REF(Data) d, const allocator_t &a)
          : value_compare(boost::move(static_cast<value_compare&>(d))), m_seq(boost::move(d.m_seq), a)
       {}
 
@@ -563,27 +581,31 @@ class flat_tree
 
    public:
 
-   typedef typename container_type::value_type               value_type;
-   typedef typename container_type::pointer                  pointer;
-   typedef typename container_type::const_pointer            const_pointer;
-   typedef typename container_type::reference                reference;
-   typedef typename container_type::const_reference          const_reference;
+   typedef typename container_type::value_type              value_type;
+   typedef typename container_type::pointer                 pointer;
+   typedef typename container_type::const_pointer           const_pointer;
+   typedef typename container_type::reference               reference;
+   typedef typename container_type::const_reference         const_reference;
    typedef typename KeyOfValue::type                        key_type;
    typedef Compare                                          key_compare;
-   typedef typename container_type::allocator_type           allocator_type;
-   typedef typename container_type::size_type                size_type;
-   typedef typename container_type::difference_type          difference_type;
-   typedef typename container_type::iterator                 iterator;
-   typedef typename container_type::const_iterator           const_iterator;
-   typedef typename container_type::reverse_iterator         reverse_iterator;
-   typedef typename container_type::const_reverse_iterator   const_reverse_iterator;
+   typedef typename container_type::allocator_type          allocator_type;
+   typedef typename container_type::size_type               size_type;
+   typedef typename container_type::difference_type         difference_type;
+   typedef typename container_type::iterator                iterator;
+   typedef typename container_type::const_iterator          const_iterator;
+   typedef typename container_type::reverse_iterator        reverse_iterator;
+   typedef typename container_type::const_reverse_iterator  const_reverse_iterator;
+
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((is_same<value_type, typename allocator_traits_type::value_type>::value));
 
    //!Standard extension
    typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT
       (boost::container::dtl::, container_type
       ,stored_allocator_type, allocator_type)               stored_allocator_type;
 
-   static const bool has_stored_allocator_type =
+   BOOST_STATIC_CONSTEXPR bool has_stored_allocator_type =
       BOOST_INTRUSIVE_HAS_TYPE(boost::container::dtl::, container_type, stored_allocator_type);
 
    private:
@@ -596,41 +618,41 @@ class flat_tree
    typedef typename dtl::if_c
       <has_stored_allocator_type, stored_allocator_type &, allocator_type>::type get_stored_allocator_noconst_return_t;
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree()
+   inline flat_tree()
       : m_data()
    { }
 
-   BOOST_CONTAINER_FORCEINLINE explicit flat_tree(const Compare& comp)
+   inline explicit flat_tree(const Compare& comp)
       : m_data(comp)
    { }
 
-   BOOST_CONTAINER_FORCEINLINE explicit flat_tree(const allocator_type& a)
+   inline explicit flat_tree(const allocator_type& a)
       : m_data(a)
    { }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree(const Compare& comp, const allocator_type& a)
+   inline flat_tree(const Compare& comp, const allocator_type& a)
       : m_data(comp, a)
    { }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree(const flat_tree& x)
+   inline flat_tree(const flat_tree& x)
       :  m_data(x.m_data)
    { }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree(BOOST_RV_REF(flat_tree) x)
+   inline flat_tree(BOOST_RV_REF(flat_tree) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       :  m_data(boost::move(x.m_data))
    { }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree(const flat_tree& x, const allocator_type &a)
+   inline flat_tree(const flat_tree& x, const allocator_type &a)
       :  m_data(x.m_data, a)
    { }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree(BOOST_RV_REF(flat_tree) x, const allocator_type &a)
+   inline flat_tree(BOOST_RV_REF(flat_tree) x, const allocator_type &a)
       :  m_data(boost::move(x.m_data), a)
    { }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( ordered_range_t, InputIterator first, InputIterator last)
       : m_data()
    {
@@ -639,7 +661,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : m_data(comp)
    {
@@ -648,7 +670,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( ordered_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : m_data(comp, a)
    {
@@ -657,7 +679,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( ordered_unique_range_t, InputIterator first, InputIterator last)
       : m_data()
    {
@@ -666,7 +688,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : m_data(comp)
    {
@@ -675,7 +697,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : m_data(comp, a)
    {
@@ -684,7 +706,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( bool unique_insertion, InputIterator first, InputIterator last)
       : m_data()
    {
@@ -692,7 +714,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( bool unique_insertion, InputIterator first, InputIterator last
             , const Compare& comp)
       : m_data(comp)
@@ -701,7 +723,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( bool unique_insertion, InputIterator first, InputIterator last
             , const allocator_type& a)
       : m_data(a)
@@ -710,7 +732,7 @@ class flat_tree
    }
 
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_tree( bool unique_insertion, InputIterator first, InputIterator last
             , const Compare& comp, const allocator_type& a)
       : m_data(comp, a)
@@ -718,28 +740,29 @@ class flat_tree
       this->priv_range_insertion_construct(unique_insertion, first, last);
    }
 
-   BOOST_CONTAINER_FORCEINLINE ~flat_tree()
-   {}
+   inline ~flat_tree()
+   {
+   }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree&  operator=(BOOST_COPY_ASSIGN_REF(flat_tree) x)
+   inline flat_tree&  operator=(BOOST_COPY_ASSIGN_REF(flat_tree) x)
    {  m_data = x.m_data;   return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE flat_tree&  operator=(BOOST_RV_REF(flat_tree) x)
+   inline flat_tree&  operator=(BOOST_RV_REF(flat_tree) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
    {  m_data = boost::move(x.m_data); return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE const value_compare &priv_value_comp() const
+   inline const value_compare &priv_value_comp() const
    { return static_cast<const value_compare &>(this->m_data); }
 
-   BOOST_CONTAINER_FORCEINLINE value_compare &priv_value_comp()
+   inline value_compare &priv_value_comp()
    { return static_cast<value_compare &>(this->m_data); }
 
-   BOOST_CONTAINER_FORCEINLINE const key_compare &priv_key_comp() const
+   inline const key_compare &priv_key_comp() const
    { return this->priv_value_comp().get_comp(); }
 
-   BOOST_CONTAINER_FORCEINLINE key_compare &priv_key_comp()
+   inline key_compare &priv_key_comp()
    { return this->priv_value_comp().get_comp(); }
 
    struct insert_commit_data
@@ -749,91 +772,91 @@ class flat_tree
 
    public:
    // accessors:
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       Compare key_comp() const
    { return this->m_data.get_comp(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       value_compare value_comp() const
    { return this->m_data; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const
    { return this->m_data.m_seq.get_allocator(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       get_stored_allocator_const_return_t get_stored_allocator() const
    {
       return flat_tree_get_stored_allocator(this->m_data.m_seq, dtl::bool_<has_stored_allocator_type>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       get_stored_allocator_noconst_return_t get_stored_allocator()
    {
       return flat_tree_get_stored_allocator(this->m_data.m_seq, dtl::bool_<has_stored_allocator_type>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin()
    { return this->m_data.m_seq.begin(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const
    { return this->cbegin(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const
    { return this->m_data.m_seq.begin(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end()
    { return this->m_data.m_seq.end(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const
    { return this->cend(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const
    { return this->m_data.m_seq.end(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin()
    { return reverse_iterator(this->end()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const
    {  return this->crbegin();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const
    {  return const_reverse_iterator(this->cend());  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend()
    { return reverse_iterator(this->begin()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const
    { return this->crend(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend() const
    { return const_reverse_iterator(this->cbegin()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const
    { return this->m_data.m_seq.empty(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const
    { return this->m_data.m_seq.size(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const
    { return this->m_data.m_seq.max_size(); }
 
-   BOOST_CONTAINER_FORCEINLINE void swap(flat_tree& other)
+   inline void swap(flat_tree& other)
       BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
                                  && boost::container::dtl::is_nothrow_swappable<Compare>::value )
    {  this->m_data.swap(other.m_data);  }
@@ -929,9 +952,10 @@ class flat_tree
       typename container_type::iterator const e = boost::movelib::inplace_set_unique_difference
          (it, seq.end(), seq.begin(), it, val_cmp);
 
+      //it might be invalidated by erasing [e, seq.end) if e == it, so check it before
+      const bool remaining = e != it;
       seq.erase(e, seq.cend());
-      //it might be invalidated by erasing [e, seq.end) if e == it
-      if (it != e)
+      if (remaining)
       {
          //Step 4: merge both ranges
          (flat_tree_container_inplace_merge)(seq, it, this->priv_value_comp(), contiguous_tag);
@@ -975,8 +999,8 @@ class flat_tree
    {
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v), ::boost::forward<Args>(args)... );
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);
+      stored_allocator_traits::construct(a, (value_type *)(&v), ::boost::forward<Args>(args)... );
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);
       value_destructor<stored_allocator_type, value_type> d(a, *pval);
       return this->insert_unique(::boost::move(*pval));
    }
@@ -987,8 +1011,8 @@ class flat_tree
       //hint checked in insert_unique
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v), ::boost::forward<Args>(args)... );
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);
+      stored_allocator_traits::construct(a, (value_type*)(&v), ::boost::forward<Args>(args)... );
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);
       value_destructor<stored_allocator_type, value_type> d(a, *pval);
       return this->insert_unique(hint, ::boost::move(*pval));
    }
@@ -998,8 +1022,8 @@ class flat_tree
    {
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v), ::boost::forward<Args>(args)... );
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);
+      stored_allocator_traits::construct(a, (value_type*)(&v), ::boost::forward<Args>(args)... );
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);
       value_destructor<stored_allocator_type, value_type> d(a, *pval);
       return this->insert_equal(::boost::move(*pval));
    }
@@ -1010,14 +1034,14 @@ class flat_tree
       //hint checked in insert_equal
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v), ::boost::forward<Args>(args)... );
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);
+      stored_allocator_traits::construct(a, (value_type*)(&v), ::boost::forward<Args>(args)... );
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);
       value_destructor<stored_allocator_type, value_type> d(a, *pval);
       return this->insert_equal(hint, ::boost::move(*pval));
    }
 
    template <class KeyType, class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace
+   inline std::pair<iterator, bool> try_emplace
       (const_iterator hint, BOOST_FWD_REF(KeyType) key, BOOST_FWD_REF(Args)... args)
    {
       std::pair<iterator,bool> ret;
@@ -1044,8 +1068,8 @@ class flat_tree
    {\
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;\
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();\
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);\
+      stored_allocator_traits::construct(a, (value_type *)(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);\
       value_destructor<stored_allocator_type, value_type> d(a, *pval);\
       return this->insert_unique(::boost::move(*pval));\
    }\
@@ -1055,8 +1079,8 @@ class flat_tree
    {\
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;\
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();\
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);\
+      stored_allocator_traits::construct(a, (value_type *)(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);\
       value_destructor<stored_allocator_type, value_type> d(a, *pval);\
       return this->insert_unique(hint, ::boost::move(*pval));\
    }\
@@ -1066,8 +1090,8 @@ class flat_tree
    {\
       typename dtl::aligned_storage<sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;\
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();\
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);\
+      stored_allocator_traits::construct(a, (value_type *)(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);\
       value_destructor<stored_allocator_type, value_type> d(a, *pval);\
       return this->insert_equal(::boost::move(*pval));\
    }\
@@ -1077,13 +1101,13 @@ class flat_tree
    {\
       typename dtl::aligned_storage <sizeof(value_type), dtl::alignment_of<value_type>::value>::type v;\
       get_stored_allocator_noconst_return_t a = this->get_stored_allocator();\
-      stored_allocator_traits::construct(a, move_detail::force_ptr<value_type *>(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
-      value_type *pval = move_detail::force_ptr<value_type *>(&v);\
+      stored_allocator_traits::construct(a, (value_type *)(&v) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
+      value_type *pval = move_detail::launder_cast<value_type *>(&v);\
       value_destructor<stored_allocator_type, value_type> d(a, *pval);\
       return this->insert_equal(hint, ::boost::move(*pval));\
    }\
    template <class KeyType BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool>\
+   inline std::pair<iterator, bool>\
       try_emplace(const_iterator hint, BOOST_FWD_REF(KeyType) key BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       std::pair<iterator,bool> ret;\
@@ -1126,9 +1150,6 @@ class flat_tree
       return ret;
    }
 
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator position)
-   {  return this->m_data.m_seq.erase(position);  }
-
    size_type erase(const key_type& k)
    {
       std::pair<iterator,iterator > itp = this->equal_range(k);
@@ -1148,10 +1169,44 @@ class flat_tree
       return ret;
    }
 
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator first, const_iterator last)
+   template <class K>
+   inline typename dtl::enable_if_c<
+      dtl::is_transparent<key_compare>::value &&      //transparent
+      !dtl::is_convertible<K, iterator>::value &&     //not convertible to iterator
+      !dtl::is_convertible<K, const_iterator>::value  //not convertible to const_iterator
+      , size_type>::type
+      erase(const K& k)
+   {
+      std::pair<iterator, iterator > itp = this->equal_range(k);
+      size_type ret = static_cast<size_type>(itp.second - itp.first);
+      if (ret) {
+         this->m_data.m_seq.erase(itp.first, itp.second);
+      }
+      return ret;
+   }
+
+   template <class K>
+   inline typename dtl::enable_if_c<
+      dtl::is_transparent<key_compare>::value &&      //transparent
+      !dtl::is_convertible<K, iterator>::value &&     //not convertible to iterator
+      !dtl::is_convertible<K, const_iterator>::value  //not convertible to const_iterator
+      , size_type>::type
+      erase_unique(const K& k)
+   {
+      const_iterator i = static_cast<const flat_tree&>(*this).find(k);
+      size_type ret = static_cast<size_type>(i != this->cend());
+      if (ret)
+         this->erase(i);
+      return ret;
+   }
+
+   inline iterator erase(const_iterator position)
+   {  return this->m_data.m_seq.erase(position);  }
+
+   inline iterator erase(const_iterator first, const_iterator last)
    {  return this->m_data.m_seq.erase(first, last);  }
 
-   BOOST_CONTAINER_FORCEINLINE void clear()
+   inline void clear()
    {  this->m_data.m_seq.clear();  }
 
    //! <b>Effects</b>: Tries to deallocate the excess of memory created
@@ -1160,17 +1215,17 @@ class flat_tree
    //! <b>Throws</b>: If memory allocation throws, or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to size().
-   BOOST_CONTAINER_FORCEINLINE void shrink_to_fit()
+   inline void shrink_to_fit()
    {  this->m_data.m_seq.shrink_to_fit();  }
 
-   BOOST_CONTAINER_FORCEINLINE iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       const bool value = boost::container::dtl::
          has_member_function_callable_with_nth<container_type, size_type>::value;
       return flat_tree_nth<iterator>(this->m_data.m_seq, n, dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       const bool value = boost::container::dtl::
@@ -1178,7 +1233,7 @@ class flat_tree
       return flat_tree_nth<const_iterator>(this->m_data.m_seq, n, dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       const bool value = boost::container::dtl::
@@ -1186,7 +1241,7 @@ class flat_tree
       return flat_tree_index_of(this->m_data.m_seq, p, dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       const bool value = boost::container::dtl::
@@ -1263,30 +1318,30 @@ class flat_tree
       return n;
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE bool contains(const key_type& x) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline bool contains(const key_type& x) const
    {  return this->find(x) != this->cend();  }
 
    template<typename K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, bool>::type
          contains(const K& x) const
    {  return this->find(x) != this->cend();  }
 
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
+   inline void merge_unique(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
    {
       this->insert_unique( boost::make_move_iterator(source.begin())
                          , boost::make_move_iterator(source.end()));
    }
 
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
+   inline void merge_equal(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
    {
       this->insert_equal( boost::make_move_iterator(source.begin())
                         , boost::make_move_iterator(source.end()));
    }
 
-   BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree& source)
+   inline void merge_unique(flat_tree& source)
    {
       const bool value = boost::container::dtl::
          has_member_function_callable_with_merge_unique<container_type, iterator, iterator, value_compare>::value;
@@ -1298,7 +1353,7 @@ class flat_tree
          , dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree& source)
+   inline void merge_equal(flat_tree& source)
    {
       const bool value = boost::container::dtl::
          has_member_function_callable_with_merge<container_type, iterator, iterator, value_compare>::value;
@@ -1310,88 +1365,88 @@ class flat_tree
          , dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator lower_bound(const key_type& k)
    {  return this->priv_lower_bound(this->begin(), this->end(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator lower_bound(const key_type& k) const
    {  return this->priv_lower_bound(this->cbegin(), this->cend(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE 
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline 
       typename dtl::enable_if_transparent<key_compare, K, iterator>::type
          lower_bound(const K& k)
    {  return this->priv_lower_bound(this->begin(), this->end(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE 
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline 
       typename dtl::enable_if_transparent<key_compare, K, const_iterator>::type
          lower_bound(const K& k) const
    {  return this->priv_lower_bound(this->cbegin(), this->cend(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator upper_bound(const key_type& k)
    {  return this->priv_upper_bound(this->begin(), this->end(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE 
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline 
       const_iterator upper_bound(const key_type& k) const
    {  return this->priv_upper_bound(this->cbegin(), this->cend(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K,iterator>::type
    upper_bound(const K& k)
    {  return this->priv_upper_bound(this->begin(), this->end(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K,const_iterator>::type
          upper_bound(const K& k) const
    {  return this->priv_upper_bound(this->cbegin(), this->cend(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> equal_range(const key_type& k)
    {  return this->priv_equal_range(this->begin(), this->end(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> equal_range(const key_type& k) const
    {  return this->priv_equal_range(this->cbegin(), this->cend(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, std::pair<iterator,iterator> >::type
          equal_range(const K& k)
    {  return this->priv_equal_range(this->begin(), this->end(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K,std::pair<const_iterator,const_iterator> >::type
          equal_range(const K& k) const
    {  return this->priv_equal_range(this->cbegin(), this->cend(), k);  }
 
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator, iterator> lower_bound_range(const key_type& k)
    {  return this->priv_lower_bound_range(this->begin(), this->end(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> lower_bound_range(const key_type& k) const
    {  return this->priv_lower_bound_range(this->cbegin(), this->cend(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K,std::pair<iterator,iterator> >::type
          lower_bound_range(const K& k)
    {  return this->priv_lower_bound_range(this->begin(), this->end(), k);  }
 
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K,std::pair<const_iterator,const_iterator> >::type
          lower_bound_range(const K& k) const
    {  return this->priv_lower_bound_range(this->cbegin(), this->cend(), k);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type capacity() const
    {
       const bool value = boost::container::dtl::
@@ -1399,7 +1454,7 @@ class flat_tree
       return (flat_tree_capacity)(this->m_data.m_seq, dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       void reserve(size_type cnt)
    {
       const bool value = boost::container::dtl::
@@ -1407,25 +1462,25 @@ class flat_tree
       (flat_tree_reserve)(this->m_data.m_seq, cnt, dtl::bool_<value>());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       container_type extract_sequence()
    {  return boost::move(m_data.m_seq);   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       container_type &get_sequence_ref()
    {  return m_data.m_seq; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const container_type &get_sequence_cref() const
    {  return m_data.m_seq; }
 
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence_equal(BOOST_RV_REF(container_type) seq)
+   inline void adopt_sequence_equal(BOOST_RV_REF(container_type) seq)
    {
       (flat_tree_adopt_sequence_equal)( m_data.m_seq, boost::move(seq), this->priv_value_comp()
          , dtl::bool_<is_contiguous_container<container_type>::value>());
    }
 
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence_unique(BOOST_RV_REF(container_type) seq)
+   inline void adopt_sequence_unique(BOOST_RV_REF(container_type) seq)
    {
       (flat_tree_adopt_sequence_unique)(m_data.m_seq, boost::move(seq), this->priv_value_comp()
          , dtl::bool_<is_contiguous_container<container_type>::value>());
@@ -1443,35 +1498,35 @@ class flat_tree
       m_data.m_seq = boost::move(seq);
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const flat_tree& x, const flat_tree& y)
    {
       return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const flat_tree& x, const flat_tree& y)
    {
       return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const flat_tree& x, const flat_tree& y)
       {  return !(x == y); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const flat_tree& x, const flat_tree& y)
       {  return y < x;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const flat_tree& x, const flat_tree& y)
       {  return !(y < x);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const flat_tree& x, const flat_tree& y)
       {  return !(x < y);  }
 
-   BOOST_CONTAINER_FORCEINLINE friend void swap(flat_tree& x, flat_tree& y)
+   inline friend void swap(flat_tree& x, flat_tree& y)
           BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
       {  x.swap(y);  }
 
@@ -1492,7 +1547,7 @@ class flat_tree
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_in_range_or_end(const_iterator pos) const
+   inline bool priv_in_range_or_end(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos <= this->end());
    }
@@ -1535,7 +1590,7 @@ class flat_tree
       return commit_data.position == e || key_cmp(k, KeyOfValue()(*commit_data.position));
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_insert_unique_prepare
+   inline bool priv_insert_unique_prepare
       (const key_type& k, insert_commit_data &commit_data)
    {  return this->priv_insert_unique_prepare(this->cbegin(), this->cend(), k, commit_data);   }
 
@@ -1583,7 +1638,7 @@ class flat_tree
    }
 
    template<class Convertible>
-   BOOST_CONTAINER_FORCEINLINE iterator priv_insert_commit
+   inline iterator priv_insert_commit
       (insert_commit_data &commit_data, BOOST_FWD_REF(Convertible) convertible)
    {
       return this->m_data.m_seq.insert
@@ -1700,7 +1755,7 @@ struct has_trivial_destructor_after_move<boost::container::dtl::flat_tree<T, Key
    typedef boost::container::dtl::flat_tree<T, KeyOfValue, Compare, AllocatorOrContainer> flat_tree;
    typedef typename flat_tree::container_type container_type;
    typedef typename flat_tree::key_compare key_compare;
-   static const bool value = ::boost::has_trivial_destructor_after_move<container_type>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<container_type>::value &&
                              ::boost::has_trivial_destructor_after_move<key_compare>::value;
 };
 
diff --git a/inst/include/boost/container/detail/function_detector.hpp b/inst/include/boost/container/detail/function_detector.hpp
index 00caced5b..6e432637e 100644
--- a/inst/include/boost/container/detail/function_detector.hpp
+++ b/inst/include/boost/container/detail/function_detector.hpp
@@ -80,7 +80,7 @@ namespace function_detector {
       template <class U> \
       static NotFoundType Test( ... ); \
    public : \
-      static const int check = NotFound + (sizeof(Test<T>(0, 0)) - sizeof(NotFoundType));\
+      BOOST_STATIC_CONSTEXPR int check = NotFound + int(sizeof(Test<T>(0, 0)) - sizeof(NotFoundType));\
    };\
 }}} //namespace boost::container::function_detector {
 
diff --git a/inst/include/boost/container/detail/is_container.hpp b/inst/include/boost/container/detail/is_container.hpp
index 96c9f69c8..ccf9119de 100644
--- a/inst/include/boost/container/detail/is_container.hpp
+++ b/inst/include/boost/container/detail/is_container.hpp
@@ -51,7 +51,7 @@ namespace dtl {
 template <class Container>
 struct is_container
 {
-   static const bool value =
+   BOOST_STATIC_CONSTEXPR bool value =
       boost::container::is_container_detail::
          has_member_function_callable_with_size <const Container>::value &&
       boost::container::is_container_detail::
@@ -61,7 +61,7 @@ struct is_container
 template <>
 struct is_container<void>
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 
diff --git a/inst/include/boost/container/detail/is_contiguous_container.hpp b/inst/include/boost/container/detail/is_contiguous_container.hpp
index 1504f5c37..97245f1c4 100644
--- a/inst/include/boost/container/detail/is_contiguous_container.hpp
+++ b/inst/include/boost/container/detail/is_contiguous_container.hpp
@@ -31,9 +31,9 @@
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 0
 #include <boost/intrusive/detail/has_member_function_callable_with.hpp>
 
-//back_free_capacity
-#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME back_free_capacity
-#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace back_free_capacity_detail {
+//free_storage
+#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME unused_storage
+#define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_BEG namespace boost { namespace container { namespace unused_storage_detail {
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_NS_END   }}}
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MIN 0
 #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_MAX 0
@@ -51,7 +51,7 @@ namespace dtl {
 template <class Container>
 struct is_contiguous_container
 {
-   static const bool value =
+   BOOST_STATIC_CONSTEXPR bool value =
       boost::container::is_contiguous_container_detail::
          has_member_function_callable_with_data<Container>::value && 
       boost::container::is_contiguous_container_detail::
@@ -60,19 +60,23 @@ struct is_contiguous_container
 
 
 template < class Container
-         , bool = boost::container::back_free_capacity_detail::
-                     has_member_function_callable_with_back_free_capacity<const Container>::value>
-struct back_free_capacity
+         , bool = boost::container::unused_storage_detail::
+                     has_member_function_callable_with_unused_storage<const Container>::value>
+struct unused_storage
 {
-   static typename Container::size_type get(const Container &c)
-   {  return c.back_free_capacity();  }
+   static typename Container::value_type* get(Container &c, typename Container::size_type &s)
+   {  return c.unused_storage(s);  }
 };
 
+
 template < class Container>
-struct back_free_capacity<Container, false>
+struct unused_storage<Container, false>
 {
-   static typename Container::size_type get(const Container &c)
-   {  return c.capacity() - c.size();  }
+   static typename Container::value_type* get(Container&, typename Container::size_type &s)
+   {
+      s = 0;
+      return 0;
+   }
 };
 
 }  //namespace dtl {
diff --git a/inst/include/boost/container/detail/is_pair.hpp b/inst/include/boost/container/detail/is_pair.hpp
index 239e36e11..ddb63b68f 100644
--- a/inst/include/boost/container/detail/is_pair.hpp
+++ b/inst/include/boost/container/detail/is_pair.hpp
@@ -61,25 +61,25 @@ struct pair;
 template <class T>
 struct is_pair
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template <class T1, class T2>
 struct is_pair< pair<T1, T2> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template <class T1, class T2>
 struct is_pair< std::pair<T1, T2> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template <class T>
 struct is_not_pair
 {
-   static const bool value = !is_pair<T>::value;
+   BOOST_STATIC_CONSTEXPR bool value = !is_pair<T>::value;
 };
 
 }  //namespace dtl {
diff --git a/inst/include/boost/container/detail/iterators.hpp b/inst/include/boost/container/detail/iterators.hpp
index c503916a9..82daac467 100644
--- a/inst/include/boost/container/detail/iterators.hpp
+++ b/inst/include/boost/container/detail/iterators.hpp
@@ -27,7 +27,6 @@
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <boost/container/detail/value_init.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/move/utility_core.hpp>
 #include <boost/intrusive/detail/reverse_iterator.hpp>
 
@@ -49,125 +48,125 @@ class constant_iterator
    typedef  constant_iterator<T> this_type;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit constant_iterator(const T &ref, std::size_t range_size)
+   inline explicit constant_iterator(const T &ref, std::size_t range_size)
       :  m_ptr(&ref), m_num(range_size){}
 
    //Constructors
-   BOOST_CONTAINER_FORCEINLINE constant_iterator()
+   inline constant_iterator()
       :  m_ptr(0), m_num(0){}
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator& operator++()
+   inline constant_iterator& operator++()
    { increment();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator operator++(int)
+   inline constant_iterator operator++(int)
    {
       constant_iterator result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator& operator--()
+   inline constant_iterator& operator--()
    { decrement();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator operator--(int)
+   inline constant_iterator operator--(int)
    {
       constant_iterator result (*this);
       decrement();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const constant_iterator& i, const constant_iterator& i2)
+   inline friend bool operator== (const constant_iterator& i, const constant_iterator& i2)
    { return i.equal(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const constant_iterator& i, const constant_iterator& i2)
+   inline friend bool operator!= (const constant_iterator& i, const constant_iterator& i2)
    { return !(i == i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator< (const constant_iterator& i, const constant_iterator& i2)
+   inline friend bool operator< (const constant_iterator& i, const constant_iterator& i2)
    { return i.less(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator> (const constant_iterator& i, const constant_iterator& i2)
+   inline friend bool operator> (const constant_iterator& i, const constant_iterator& i2)
    { return i2 < i; }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<= (const constant_iterator& i, const constant_iterator& i2)
+   inline friend bool operator<= (const constant_iterator& i, const constant_iterator& i2)
    { return !(i > i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>= (const constant_iterator& i, const constant_iterator& i2)
+   inline friend bool operator>= (const constant_iterator& i, const constant_iterator& i2)
    { return !(i < i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend std::ptrdiff_t operator- (const constant_iterator& i, const constant_iterator& i2)
+   inline friend std::ptrdiff_t operator- (const constant_iterator& i, const constant_iterator& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic signed
-   BOOST_CONTAINER_FORCEINLINE constant_iterator& operator+=(std::ptrdiff_t off)
+   inline constant_iterator& operator+=(std::ptrdiff_t off)
    {  this->advance(off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator operator+(std::ptrdiff_t off) const
+   inline constant_iterator operator+(std::ptrdiff_t off) const
    {
       constant_iterator other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend constant_iterator operator+(std::ptrdiff_t off, const constant_iterator& right)
+   inline friend constant_iterator operator+(std::ptrdiff_t off, const constant_iterator& right)
    {  return right + off; }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator& operator-=(std::ptrdiff_t off)
+   inline constant_iterator& operator-=(std::ptrdiff_t off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator operator-(std::ptrdiff_t off) const
+   inline constant_iterator operator-(std::ptrdiff_t off) const
    {  return *this + (-off);  }
 
-   BOOST_CONTAINER_FORCEINLINE const T& operator[] (std::ptrdiff_t ) const
+   inline const T& operator[] (std::ptrdiff_t ) const
    { return dereference(); }
 
-   BOOST_CONTAINER_FORCEINLINE const T& operator*() const
+   inline const T& operator*() const
    { return dereference(); }
 
-   BOOST_CONTAINER_FORCEINLINE const T* operator->() const
+   inline const T* operator->() const
    { return &(dereference()); }
 
    //Arithmetic unsigned
-   BOOST_CONTAINER_FORCEINLINE constant_iterator& operator+=(std::size_t off)
+   inline constant_iterator& operator+=(std::size_t off)
    {  return *this += std::ptrdiff_t(off);  }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator operator+(std::size_t off) const
+   inline constant_iterator operator+(std::size_t off) const
    {  return *this + std::ptrdiff_t(off);  }
 
-   BOOST_CONTAINER_FORCEINLINE friend constant_iterator operator+(std::size_t off, const constant_iterator& right)
+   inline friend constant_iterator operator+(std::size_t off, const constant_iterator& right)
    {  return std::ptrdiff_t(off) + right;  }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator& operator-=(std::size_t off)
+   inline constant_iterator& operator-=(std::size_t off)
    {  return *this -= std::ptrdiff_t(off);  }
 
-   BOOST_CONTAINER_FORCEINLINE constant_iterator operator-(std::size_t off) const
+   inline constant_iterator operator-(std::size_t off) const
    {  return *this - std::ptrdiff_t(off);  }
 
-   BOOST_CONTAINER_FORCEINLINE const T& operator[] (std::size_t off) const
+   inline const T& operator[] (std::size_t off) const
    { return (*this)[std::ptrdiff_t(off)]; }
 
    private:
    const T *   m_ptr;
    std::size_t m_num;
 
-   BOOST_CONTAINER_FORCEINLINE void increment()
+   inline void increment()
    { --m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE void decrement()
+   inline void decrement()
    { ++m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE bool equal(const this_type &other) const
+   inline bool equal(const this_type &other) const
    {  return m_num == other.m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE bool less(const this_type &other) const
+   inline bool less(const this_type &other) const
    {  return other.m_num < m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE const T & dereference() const
+   inline const T & dereference() const
    { return *m_ptr; }
 
-   BOOST_CONTAINER_FORCEINLINE void advance(std::ptrdiff_t n)
+   inline void advance(std::ptrdiff_t n)
    {  m_num = std::size_t(std::ptrdiff_t(m_num) - n); }
 
-   BOOST_CONTAINER_FORCEINLINE std::ptrdiff_t distance_to(const this_type &other)const
+   inline std::ptrdiff_t distance_to(const this_type &other)const
    {  return std::ptrdiff_t(m_num - other.m_num);   }
 };
 
@@ -179,72 +178,72 @@ class value_init_construct_iterator
    typedef  value_init_construct_iterator<T> this_type;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit value_init_construct_iterator(std::size_t range_size)
+   inline explicit value_init_construct_iterator(std::size_t range_size)
       :  m_num(range_size){}
 
    //Constructors
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator()
+   inline value_init_construct_iterator()
       :  m_num(0){}
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator& operator++()
+   inline value_init_construct_iterator& operator++()
    { increment();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator operator++(int)
+   inline value_init_construct_iterator operator++(int)
    {
       value_init_construct_iterator result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator& operator--()
+   inline value_init_construct_iterator& operator--()
    { decrement();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator operator--(int)
+   inline value_init_construct_iterator operator--(int)
    {
       value_init_construct_iterator result (*this);
       decrement();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend bool operator== (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return i.equal(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend bool operator!= (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return !(i == i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator< (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend bool operator< (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return i.less(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator> (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend bool operator> (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return i2 < i; }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<= (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend bool operator<= (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return !(i > i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>= (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend bool operator>= (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return !(i < i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend std::ptrdiff_t operator- (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
+   inline friend std::ptrdiff_t operator- (const value_init_construct_iterator& i, const value_init_construct_iterator& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator& operator+=(std::ptrdiff_t off)
+   inline value_init_construct_iterator& operator+=(std::ptrdiff_t off)
    {  this->advance(off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator operator+(std::ptrdiff_t off) const
+   inline value_init_construct_iterator operator+(std::ptrdiff_t off) const
    {
       value_init_construct_iterator other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend value_init_construct_iterator operator+(std::ptrdiff_t off, const value_init_construct_iterator& right)
+   inline friend value_init_construct_iterator operator+(std::ptrdiff_t off, const value_init_construct_iterator& right)
    {  return right + off; }
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator& operator-=(std::ptrdiff_t off)
+   inline value_init_construct_iterator& operator-=(std::ptrdiff_t off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE value_init_construct_iterator operator-(std::ptrdiff_t off) const
+   inline value_init_construct_iterator operator-(std::ptrdiff_t off) const
    {  return *this + (-off);  }
 
    //This pseudo-iterator's dereference operations have no sense since value is not
@@ -257,28 +256,28 @@ class value_init_construct_iterator
    private:
    std::size_t  m_num;
 
-   BOOST_CONTAINER_FORCEINLINE void increment()
+   inline void increment()
    { --m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE void decrement()
+   inline void decrement()
    { ++m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE bool equal(const this_type &other) const
+   inline bool equal(const this_type &other) const
    {  return m_num == other.m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE bool less(const this_type &other) const
+   inline bool less(const this_type &other) const
    {  return other.m_num < m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE const T & dereference() const
+   inline const T & dereference() const
    {
       static T dummy;
       return dummy;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void advance(std::ptrdiff_t n)
+   inline void advance(std::ptrdiff_t n)
    {  m_num = std::size_t(std::ptrdiff_t(m_num) - n); }
 
-   BOOST_CONTAINER_FORCEINLINE std::ptrdiff_t distance_to(const this_type &other)const
+   inline std::ptrdiff_t distance_to(const this_type &other)const
    {  return std::ptrdiff_t(m_num - other.m_num);   }
 };
 
@@ -290,72 +289,72 @@ class default_init_construct_iterator
    typedef  default_init_construct_iterator<T> this_type;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit default_init_construct_iterator(std::size_t range_size)
+   inline explicit default_init_construct_iterator(std::size_t range_size)
       :  m_num(range_size){}
 
    //Constructors
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator()
+   inline default_init_construct_iterator()
       :  m_num(0){}
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator& operator++()
+   inline default_init_construct_iterator& operator++()
    { increment();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator operator++(int)
+   inline default_init_construct_iterator operator++(int)
    {
       default_init_construct_iterator result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator& operator--()
+   inline default_init_construct_iterator& operator--()
    { decrement();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator operator--(int)
+   inline default_init_construct_iterator operator--(int)
    {
       default_init_construct_iterator result (*this);
       decrement();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend bool operator== (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return i.equal(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend bool operator!= (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return !(i == i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator< (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend bool operator< (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return i.less(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator> (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend bool operator> (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return i2 < i; }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<= (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend bool operator<= (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return !(i > i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>= (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend bool operator>= (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return !(i < i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend std::ptrdiff_t operator- (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
+   inline friend std::ptrdiff_t operator- (const default_init_construct_iterator& i, const default_init_construct_iterator& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator& operator+=(std::ptrdiff_t off)
+   inline default_init_construct_iterator& operator+=(std::ptrdiff_t off)
    {  this->advance(off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator operator+(std::ptrdiff_t off) const
+   inline default_init_construct_iterator operator+(std::ptrdiff_t off) const
    {
       default_init_construct_iterator other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend default_init_construct_iterator operator+(std::ptrdiff_t off, const default_init_construct_iterator& right)
+   inline friend default_init_construct_iterator operator+(std::ptrdiff_t off, const default_init_construct_iterator& right)
    {  return right + off; }
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator& operator-=(std::ptrdiff_t off)
+   inline default_init_construct_iterator& operator-=(std::ptrdiff_t off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE default_init_construct_iterator operator-(std::ptrdiff_t off) const
+   inline default_init_construct_iterator operator-(std::ptrdiff_t off) const
    {  return *this + (-off);  }
 
    //This pseudo-iterator's dereference operations have no sense since value is not
@@ -368,28 +367,28 @@ class default_init_construct_iterator
    private:
    std::size_t  m_num;
 
-   BOOST_CONTAINER_FORCEINLINE void increment()
+   inline void increment()
    { --m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE void decrement()
+   inline void decrement()
    { ++m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE bool equal(const this_type &other) const
+   inline bool equal(const this_type &other) const
    {  return m_num == other.m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE bool less(const this_type &other) const
+   inline bool less(const this_type &other) const
    {  return other.m_num < m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE const T & dereference() const
+   inline const T & dereference() const
    {
       static T dummy;
       return dummy;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void advance(std::ptrdiff_t n)
+   inline void advance(std::ptrdiff_t n)
    {  m_num = std::size_t(std::ptrdiff_t(m_num) - n); }
 
-   BOOST_CONTAINER_FORCEINLINE std::ptrdiff_t distance_to(const this_type &other) const
+   inline std::ptrdiff_t distance_to(const this_type &other) const
    {  return std::ptrdiff_t(m_num - other.m_num);   }
 };
 
@@ -401,106 +400,106 @@ class repeat_iterator
 {
    typedef repeat_iterator<T> this_type;
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit repeat_iterator(T &ref, std::size_t range_size)
+   inline explicit repeat_iterator(T &ref, std::size_t range_size)
       :  m_ptr(&ref), m_num(range_size){}
 
    //Constructors
-   BOOST_CONTAINER_FORCEINLINE repeat_iterator()
+   inline repeat_iterator()
       :  m_ptr(0), m_num(0){}
 
-   BOOST_CONTAINER_FORCEINLINE this_type& operator++()
+   inline this_type& operator++()
    { increment();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator++(int)
+   inline this_type operator++(int)
    {
       this_type result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE this_type& operator--()
+   inline this_type& operator--()
    { increment();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator--(int)
+   inline this_type operator--(int)
    {
       this_type result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const this_type& i, const this_type& i2)
+   inline friend bool operator== (const this_type& i, const this_type& i2)
    { return i.equal(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const this_type& i, const this_type& i2)
+   inline friend bool operator!= (const this_type& i, const this_type& i2)
    { return !(i == i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator< (const this_type& i, const this_type& i2)
+   inline friend bool operator< (const this_type& i, const this_type& i2)
    { return i.less(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator> (const this_type& i, const this_type& i2)
+   inline friend bool operator> (const this_type& i, const this_type& i2)
    { return i2 < i; }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<= (const this_type& i, const this_type& i2)
+   inline friend bool operator<= (const this_type& i, const this_type& i2)
    { return !(i > i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>= (const this_type& i, const this_type& i2)
+   inline friend bool operator>= (const this_type& i, const this_type& i2)
    { return !(i < i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend std::ptrdiff_t operator- (const this_type& i, const this_type& i2)
+   inline friend std::ptrdiff_t operator- (const this_type& i, const this_type& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE this_type& operator+=(std::ptrdiff_t off)
+   inline this_type& operator+=(std::ptrdiff_t off)
    {  this->advance(off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator+(std::ptrdiff_t off) const
+   inline this_type operator+(std::ptrdiff_t off) const
    {
       this_type other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend this_type operator+(std::ptrdiff_t off, const this_type& right)
+   inline friend this_type operator+(std::ptrdiff_t off, const this_type& right)
    {  return right + off; }
 
-   BOOST_CONTAINER_FORCEINLINE this_type& operator-=(std::ptrdiff_t off)
+   inline this_type& operator-=(std::ptrdiff_t off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator-(std::ptrdiff_t off) const
+   inline this_type operator-(std::ptrdiff_t off) const
    {  return *this + (-off);  }
 
-   BOOST_CONTAINER_FORCEINLINE T& operator*() const
+   inline T& operator*() const
    { return dereference(); }
 
-   BOOST_CONTAINER_FORCEINLINE T& operator[] (std::ptrdiff_t ) const
+   inline T& operator[] (std::ptrdiff_t ) const
    { return dereference(); }
 
-   BOOST_CONTAINER_FORCEINLINE T *operator->() const
+   inline T *operator->() const
    { return &(dereference()); }
 
    private:
    T *         m_ptr;
    std::size_t m_num;
 
-   BOOST_CONTAINER_FORCEINLINE void increment()
+   inline void increment()
    { --m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE void decrement()
+   inline void decrement()
    { ++m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE bool equal(const this_type &other) const
+   inline bool equal(const this_type &other) const
    {  return m_num == other.m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE bool less(const this_type &other) const
+   inline bool less(const this_type &other) const
    {  return other.m_num < m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE T & dereference() const
+   inline T & dereference() const
    { return *m_ptr; }
 
-   BOOST_CONTAINER_FORCEINLINE void advance(std::ptrdiff_t n)
+   inline void advance(std::ptrdiff_t n)
    {  m_num = std::size_t(std::ptrdiff_t(m_num - n)); }
 
-   BOOST_CONTAINER_FORCEINLINE std::ptrdiff_t distance_to(const this_type &other)const
+   inline std::ptrdiff_t distance_to(const this_type &other)const
    {  return std::ptrdiff_t(m_num - other.m_num);   }
 };
 
@@ -513,71 +512,71 @@ class emplace_iterator
 
    public:
    typedef std::ptrdiff_t difference_type;
-   BOOST_CONTAINER_FORCEINLINE explicit emplace_iterator(EmplaceFunctor&e)
+   inline explicit emplace_iterator(EmplaceFunctor&e)
       :  m_num(1), m_pe(&e){}
 
-   BOOST_CONTAINER_FORCEINLINE emplace_iterator()
+   inline emplace_iterator()
       :  m_num(0), m_pe(0){}
 
-   BOOST_CONTAINER_FORCEINLINE this_type& operator++()
+   inline this_type& operator++()
    { increment();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator++(int)
+   inline this_type operator++(int)
    {
       this_type result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE this_type& operator--()
+   inline this_type& operator--()
    { decrement();   return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator--(int)
+   inline this_type operator--(int)
    {
       this_type result (*this);
       decrement();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const this_type& i, const this_type& i2)
+   inline friend bool operator== (const this_type& i, const this_type& i2)
    { return i.equal(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const this_type& i, const this_type& i2)
+   inline friend bool operator!= (const this_type& i, const this_type& i2)
    { return !(i == i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator< (const this_type& i, const this_type& i2)
+   inline friend bool operator< (const this_type& i, const this_type& i2)
    { return i.less(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator> (const this_type& i, const this_type& i2)
+   inline friend bool operator> (const this_type& i, const this_type& i2)
    { return i2 < i; }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<= (const this_type& i, const this_type& i2)
+   inline friend bool operator<= (const this_type& i, const this_type& i2)
    { return !(i > i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>= (const this_type& i, const this_type& i2)
+   inline friend bool operator>= (const this_type& i, const this_type& i2)
    { return !(i < i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend difference_type operator- (const this_type& i, const this_type& i2)
+   inline friend difference_type operator- (const this_type& i, const this_type& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE this_type& operator+=(difference_type off)
+   inline this_type& operator+=(difference_type off)
    {  this->advance(off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator+(difference_type off) const
+   inline this_type operator+(difference_type off) const
    {
       this_type other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend this_type operator+(difference_type off, const this_type& right)
+   inline friend this_type operator+(difference_type off, const this_type& right)
    {  return right + off; }
 
-   BOOST_CONTAINER_FORCEINLINE this_type& operator-=(difference_type off)
+   inline this_type& operator-=(difference_type off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE this_type operator-(difference_type off) const
+   inline this_type operator-(difference_type off) const
    {  return *this + (-off);  }
 
    private:
@@ -590,39 +589,39 @@ class emplace_iterator
 
    public:
    template<class Allocator>
-   BOOST_CONTAINER_FORCEINLINE void construct_in_place(Allocator &a, T* ptr)
+   inline void construct_in_place(Allocator &a, T* ptr)
    {  (*m_pe)(a, ptr);  }
 
    template<class DestIt>
-   BOOST_CONTAINER_FORCEINLINE void assign_in_place(DestIt dest)
+   inline void assign_in_place(DestIt dest)
    {  (*m_pe)(dest);  }
 
    private:
    std::size_t m_num;
    EmplaceFunctor *            m_pe;
 
-   BOOST_CONTAINER_FORCEINLINE void increment()
+   inline void increment()
    { --m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE void decrement()
+   inline void decrement()
    { ++m_num; }
 
-   BOOST_CONTAINER_FORCEINLINE bool equal(const this_type &other) const
+   inline bool equal(const this_type &other) const
    {  return m_num == other.m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE bool less(const this_type &other) const
+   inline bool less(const this_type &other) const
    {  return other.m_num < m_num;   }
 
-   BOOST_CONTAINER_FORCEINLINE const T & dereference() const
+   inline const T & dereference() const
    {
       static T dummy;
       return dummy;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void advance(difference_type n)
+   inline void advance(difference_type n)
    {  m_num -= n; }
 
-   BOOST_CONTAINER_FORCEINLINE difference_type distance_to(const this_type &other)const
+   inline difference_type distance_to(const this_type &other)const
    {  return difference_type(m_num - other.m_num);   }
 };
 
@@ -633,28 +632,28 @@ struct emplace_functor
 {
    typedef typename dtl::build_number_seq<sizeof...(Args)>::type index_tuple_t;
 
-   BOOST_CONTAINER_FORCEINLINE emplace_functor(BOOST_FWD_REF(Args)... args)
+   inline emplace_functor(BOOST_FWD_REF(Args)... args)
       : args_(args...)
    {}
 
    template<class Allocator, class T>
-   BOOST_CONTAINER_FORCEINLINE void operator()(Allocator &a, T *ptr)
+   inline void operator()(Allocator &a, T *ptr)
    {  emplace_functor::inplace_impl(a, ptr, index_tuple_t());  }
 
    template<class DestIt>
-   BOOST_CONTAINER_FORCEINLINE void operator()(DestIt dest)
+   inline void operator()(DestIt dest)
    {  emplace_functor::inplace_impl(dest, index_tuple_t());  }
 
    private:
    template<class Allocator, class T, std::size_t ...IdxPack>
-   BOOST_CONTAINER_FORCEINLINE void inplace_impl(Allocator &a, T* ptr, const dtl::index_tuple<IdxPack...>&)
+   inline void inplace_impl(Allocator &a, T* ptr, const dtl::index_tuple<IdxPack...>&)
    {
       allocator_traits<Allocator>::construct
          (a, ptr, ::boost::forward<Args>(dtl::get<IdxPack>(args_))...);
    }
 
    template<class DestIt, std::size_t ...IdxPack>
-   BOOST_CONTAINER_FORCEINLINE void inplace_impl(DestIt dest, const dtl::index_tuple<IdxPack...>&)
+   inline void inplace_impl(DestIt dest, const dtl::index_tuple<IdxPack...>&)
    {
       typedef typename boost::container::iterator_traits<DestIt>::value_type value_type;
       value_type && tmp= value_type(::boost::forward<Args>(dtl::get<IdxPack>(args_))...);
@@ -680,15 +679,15 @@ struct emplace_functor_type;
 BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
 struct emplace_functor##N\
 {\
-   BOOST_CONTAINER_FORCEINLINE explicit emplace_functor##N( BOOST_MOVE_UREF##N )\
+   inline explicit emplace_functor##N( BOOST_MOVE_UREF##N )\
       BOOST_MOVE_COLON##N BOOST_MOVE_FWD_INIT##N{}\
    \
    template<class Allocator, class T>\
-   BOOST_CONTAINER_FORCEINLINE void operator()(Allocator &a, T *ptr)\
+   inline void operator()(Allocator &a, T *ptr)\
    {  allocator_traits<Allocator>::construct(a, ptr BOOST_MOVE_I##N BOOST_MOVE_MFWD##N);  }\
    \
    template<class DestIt>\
-   BOOST_CONTAINER_FORCEINLINE void operator()(DestIt dest)\
+   inline void operator()(DestIt dest)\
    {\
       typedef typename boost::container::iterator_traits<DestIt>::value_type value_type;\
       BOOST_MOVE_IF(N, value_type tmp(BOOST_MOVE_MFWD##N), dtl::value_init<value_type> tmp) ;\
@@ -724,50 +723,50 @@ struct has_iterator_category
    template <typename X>
    static two test(int, ...);
 
-   static const bool value = (1 == sizeof(test<T>(0, 0)));
+   BOOST_STATIC_CONSTEXPR bool value = (1 == sizeof(test<T>(0, 0)));
 };
 
 
 template<class T, bool = has_iterator_category<T>::value >
 struct is_input_iterator
 {
-   static const bool value = is_same<typename T::iterator_category, std::input_iterator_tag>::value;
+   BOOST_STATIC_CONSTEXPR bool value = is_same<typename T::iterator_category, std::input_iterator_tag>::value;
 };
 
 template<class T>
 struct is_input_iterator<T, false>
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class T>
 struct is_not_input_iterator
 {
-   static const bool value = !is_input_iterator<T>::value;
+   BOOST_STATIC_CONSTEXPR bool value = !is_input_iterator<T>::value;
 };
 
 template<class T, bool = has_iterator_category<T>::value >
 struct is_forward_iterator
 {
-   static const bool value = is_same<typename T::iterator_category, std::forward_iterator_tag>::value;
+   BOOST_STATIC_CONSTEXPR bool value = is_same<typename T::iterator_category, std::forward_iterator_tag>::value;
 };
 
 template<class T>
 struct is_forward_iterator<T, false>
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class T, bool = has_iterator_category<T>::value >
 struct is_bidirectional_iterator
 {
-   static const bool value = is_same<typename T::iterator_category, std::bidirectional_iterator_tag>::value;
+   BOOST_STATIC_CONSTEXPR bool value = is_same<typename T::iterator_category, std::bidirectional_iterator_tag>::value;
 };
 
 template<class T>
 struct is_bidirectional_iterator<T, false>
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class IINodeType>
@@ -836,62 +835,62 @@ class iterator_from_iiterator
    typedef typename types_t::iterator_category   iterator_category;
    typedef typename types_t::value_type          value_type;
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator()
+   inline iterator_from_iiterator()
       : m_iit()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit iterator_from_iiterator(IIterator iit) BOOST_NOEXCEPT_OR_NOTHROW
+   inline explicit iterator_from_iiterator(IIterator iit) BOOST_NOEXCEPT_OR_NOTHROW
       : m_iit(iit)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator(const iterator_from_iiterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator(const iterator_from_iiterator& other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_iit(other.get())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator(const nonconst_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator(const nonconst_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_iit(other.get())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator& operator=(const iterator_from_iiterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator& operator=(const iterator_from_iiterator& other) BOOST_NOEXCEPT_OR_NOTHROW
    {  m_iit = other.get(); return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
    {  ++this->m_iit;   return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
    {
       iterator_from_iiterator result (*this);
       ++this->m_iit;
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
    {
       //If the iterator_from_iiterator is not a bidirectional iterator, operator-- should not exist
-      BOOST_STATIC_ASSERT((is_bidirectional_iterator<iterator_from_iiterator>::value));
+      BOOST_CONTAINER_STATIC_ASSERT((is_bidirectional_iterator<iterator_from_iiterator>::value));
       --this->m_iit;   return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE iterator_from_iiterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator_from_iiterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
    {
       iterator_from_iiterator result (*this);
       --this->m_iit;
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const iterator_from_iiterator& l, const iterator_from_iiterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator== (const iterator_from_iiterator& l, const iterator_from_iiterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_iit == r.m_iit;   }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const iterator_from_iiterator& l, const iterator_from_iiterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator!= (const iterator_from_iiterator& l, const iterator_from_iiterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_iit != r.m_iit;   }
 
-   BOOST_CONTAINER_FORCEINLINE reference operator*()  const BOOST_NOEXCEPT_OR_NOTHROW
+   inline reference operator*()  const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->m_iit->get_data();  }
 
-   BOOST_CONTAINER_FORCEINLINE pointer   operator->() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline pointer   operator->() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return ::boost::intrusive::pointer_traits<pointer>::pointer_to(this->operator*());  }
 
-   BOOST_CONTAINER_FORCEINLINE const IIterator &get() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline const IIterator &get() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->m_iit;   }
 
    private:
diff --git a/inst/include/boost/container/detail/math_functions.hpp b/inst/include/boost/container/detail/math_functions.hpp
index 8d350a141..e9a916524 100644
--- a/inst/include/boost/container/detail/math_functions.hpp
+++ b/inst/include/boost/container/detail/math_functions.hpp
@@ -28,7 +28,6 @@
 #include <boost/container/detail/workaround.hpp>
 
 #include <climits>
-#include <boost/static_assert.hpp>
 
 namespace boost {
 namespace container {
@@ -101,7 +100,7 @@ struct upper_power_of_2_loop_ct
    template <Integer I, Integer P>
    struct apply
    {
-      static const Integer value =
+      BOOST_STATIC_CONSTEXPR Integer value =
          upper_power_of_2_loop_ct<Integer, (I > P*2)>::template apply<I, P*2>::value;
    };
 };
@@ -112,14 +111,14 @@ struct upper_power_of_2_loop_ct<Integer, false>
    template <Integer I, Integer P>
    struct apply
    {
-      static const Integer value = P;
+      BOOST_STATIC_CONSTEXPR Integer value = P;
    };
 };
 
 template <typename Integer, Integer I>
 struct upper_power_of_2_ct
 {
-   static const Integer value = upper_power_of_2_loop_ct<Integer, (I > 1)>::template apply<I, 2>::value;
+   BOOST_STATIC_CONSTEXPR Integer value = upper_power_of_2_loop_ct<Integer, (I > 1)>::template apply<I, 2>::value;
 };
 
 //This function uses binary search to discover the
@@ -128,7 +127,7 @@ inline std::size_t floor_log2 (std::size_t x)
 {
    const std::size_t Bits = sizeof(std::size_t)*CHAR_BIT;
    const bool Size_t_Bits_Power_2= !(Bits & (Bits-1));
-   BOOST_STATIC_ASSERT(((Size_t_Bits_Power_2)== true));
+   BOOST_CONTAINER_STATIC_ASSERT(((Size_t_Bits_Power_2)== true));
 
    std::size_t n = x;
    std::size_t log2 = 0;
@@ -145,27 +144,27 @@ inline std::size_t floor_log2 (std::size_t x)
 template<std::size_t I1, std::size_t I2>
 struct gcd_ct
 {
-   static const std::size_t Max = I1 > I2 ? I1 : I2;
-   static const std::size_t Min = I1 < I2 ? I1 : I2;
-   static const std::size_t value = gcd_ct<Min, Max % Min>::value;
+   BOOST_STATIC_CONSTEXPR std::size_t Max = I1 > I2 ? I1 : I2;
+   BOOST_STATIC_CONSTEXPR std::size_t Min = I1 < I2 ? I1 : I2;
+   BOOST_STATIC_CONSTEXPR std::size_t value = gcd_ct<Min, Max % Min>::value;
 };
 
 template<std::size_t I1>
 struct gcd_ct<I1, 0>
 {
-   static const std::size_t value = I1;
+   BOOST_STATIC_CONSTEXPR std::size_t value = I1;
 };
 
 template<std::size_t I1>
 struct gcd_ct<0, I1>
 {
-   static const std::size_t value = I1;
+   BOOST_STATIC_CONSTEXPR std::size_t value = I1;
 };
 
 template<std::size_t I1, std::size_t I2>
 struct lcm_ct
 {
-   static const std::size_t value = I1 * I2 / gcd_ct<I1, I2>::value;
+   BOOST_STATIC_CONSTEXPR std::size_t value = I1 * I2 / gcd_ct<I1, I2>::value;
 };
 
 } // namespace dtl
diff --git a/inst/include/boost/container/detail/mpl.hpp b/inst/include/boost/container/detail/mpl.hpp
index ffae180c8..7662e4cc6 100644
--- a/inst/include/boost/container/detail/mpl.hpp
+++ b/inst/include/boost/container/detail/mpl.hpp
@@ -84,13 +84,13 @@ struct void_t { typedef void type; };
 template <class T, class=void>
 struct is_transparent_base
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template <class T>
 struct is_transparent_base<T, typename void_t<typename T::is_transparent>::type>
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template <class T>
@@ -112,7 +112,7 @@ template<typename...> using variadic_void_t = void;
 template<typename Allocator, typename = void>
 struct is_allocator
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template <typename T>
@@ -123,7 +123,7 @@ struct is_allocator < Allocator,
    variadic_void_t< typename Allocator::value_type
                   , decltype(ctad_declval<Allocator&>().allocate(size_t{})) >>
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template<class T>
diff --git a/inst/include/boost/container/detail/multiallocation_chain.hpp b/inst/include/boost/container/detail/multiallocation_chain.hpp
index 749ef5a0a..fa58a00bb 100644
--- a/inst/include/boost/container/detail/multiallocation_chain.hpp
+++ b/inst/include/boost/container/detail/multiallocation_chain.hpp
@@ -25,15 +25,17 @@
 #include <boost/container/container_fwd.hpp>
 // container/detail
 #include <boost/move/detail/to_raw_pointer.hpp>
-#include <boost/container/detail/transform_iterator.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <boost/container/detail/placement_new.hpp>
+#include <boost/container/detail/iterator.hpp>
 // intrusive
 #include <boost/intrusive/slist.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include <boost/intrusive/detail/twin.hpp>
 // move
 #include <boost/move/utility_core.hpp>
+#include <boost/move/detail/iterator_to_raw_pointer.hpp>
+
 
 namespace boost {
 namespace container {
@@ -187,15 +189,100 @@ class basic_multiallocation_chain
    }
 };
 
-template<class T>
-struct cast_functor
+template <class Iterator, class T>
+class multialloc_iterator
+   : public boost::container::iterator
+      < typename Iterator::iterator_category
+      , T
+      , typename Iterator::difference_type
+      , T*
+      , T&
+      >
 {
-   typedef typename dtl::add_reference<T>::type result_type;
-   template<class U>
-   result_type operator()(U &ptr) const
-   {  return *static_cast<T*>(static_cast<void*>(&ptr));  }
+   public:
+   inline explicit multialloc_iterator(const Iterator &it)
+      :  m_it(it)
+   {}
+
+   inline explicit multialloc_iterator()
+      :  m_it()
+   {}
+
+   //Constructors
+   inline multialloc_iterator& operator++()
+   { increment();   return *this;   }
+
+      inline multialloc_iterator operator++(int)
+   {
+      multialloc_iterator result (*this);
+      increment();
+      return result;
+   }
+
+   inline friend bool operator== (const multialloc_iterator& i, const multialloc_iterator& i2)
+   { return i.equal(i2); }
+
+   inline friend bool operator!= (const multialloc_iterator& i, const multialloc_iterator& i2)
+   { return !(i == i2); }
+
+   inline friend typename Iterator::difference_type operator- (const multialloc_iterator& i, const multialloc_iterator& i2)
+   { return i2.distance_to(i); }
+
+   //Arithmetic
+   inline multialloc_iterator& operator+=(typename Iterator::difference_type off)
+   {  this->advance(off); return *this;   }
+
+   inline multialloc_iterator operator+(typename Iterator::difference_type off) const
+   {
+      multialloc_iterator other(*this);
+      other.advance(off);
+      return other;
+   }
+
+   inline friend multialloc_iterator operator+(typename Iterator::difference_type off, const multialloc_iterator& right)
+   {  return right + off; }
+
+   inline multialloc_iterator& operator-=(typename Iterator::difference_type off)
+   {  this->advance(-off); return *this;   }
+
+   inline multialloc_iterator operator-(typename Iterator::difference_type off) const
+   {  return *this + (-off);  }
+
+   inline T& operator*() const
+   { return *this->operator->(); }
+
+   inline T* operator->() const
+   {  return static_cast<T*>(static_cast<void*>(boost::movelib::iterator_to_raw_pointer(m_it)));   }
+
+   inline Iterator & base()
+   {  return m_it;   }
+
+   inline const Iterator & base() const
+   {  return m_it;   }
+
+   private:
+   Iterator m_it;
+
+   inline void increment()
+   { ++m_it; }
+
+   inline void decrement()
+   { --m_it; }
+
+   inline bool equal(const multialloc_iterator &other) const
+   {  return m_it == other.m_it;   }
+
+   inline bool less(const multialloc_iterator &other) const
+   {  return other.m_it < m_it;   }
+
+   inline void advance(typename Iterator::difference_type n)
+   {  boost::container::iterator_advance(m_it, n); }
+
+   inline typename Iterator::difference_type distance_to(const multialloc_iterator &other)const
+   {  return boost::container::iterator_distance(other.m_it, m_it); }
 };
 
+
 template<class MultiallocationChain, class T>
 class transform_multiallocation_chain
    : public MultiallocationChain
@@ -217,9 +304,8 @@ class transform_multiallocation_chain
    {  return pointer_traits::static_cast_from(p);  }
 
    public:
-   typedef transform_iterator
-      < typename MultiallocationChain::iterator
-      , dtl::cast_functor <T> >                          iterator;
+   typedef multialloc_iterator
+      <typename MultiallocationChain::iterator, T>       iterator;
    typedef typename MultiallocationChain::size_type      size_type;
    typedef boost::intrusive::twin<pointer>               pointer_pair;
 
diff --git a/inst/include/boost/container/detail/next_capacity.hpp b/inst/include/boost/container/detail/next_capacity.hpp
index 9777b1473..76bf0a0e7 100644
--- a/inst/include/boost/container/detail/next_capacity.hpp
+++ b/inst/include/boost/container/detail/next_capacity.hpp
@@ -26,8 +26,6 @@
 // container/detail
 #include <boost/container/detail/min_max.hpp>
 
-#include <boost/static_assert.hpp>
-
 namespace boost {
 namespace container {
 namespace dtl {
@@ -35,10 +33,10 @@ namespace dtl {
 template<unsigned Minimum, unsigned Numerator, unsigned Denominator>
 struct grow_factor_ratio
 {
-   BOOST_STATIC_ASSERT(Numerator > Denominator);
-   BOOST_STATIC_ASSERT(Numerator   < 100);
-   BOOST_STATIC_ASSERT(Denominator < 100);
-   BOOST_STATIC_ASSERT(Denominator == 1 || (0 != Numerator % Denominator));
+   BOOST_CONTAINER_STATIC_ASSERT(Numerator > Denominator);
+   BOOST_CONTAINER_STATIC_ASSERT(Numerator   < 100);
+   BOOST_CONTAINER_STATIC_ASSERT(Denominator < 100);
+   BOOST_CONTAINER_STATIC_ASSERT(Denominator == 1 || (0 != Numerator % Denominator));
 
    template<class SizeType>
    SizeType operator()(const SizeType cur_cap, const SizeType add_min_cap, const SizeType max_cap) const
@@ -80,11 +78,11 @@ struct growth_factor_100
 {};
 
 template<class SizeType>
-BOOST_CONTAINER_FORCEINLINE void clamp_by_stored_size_type(SizeType &, SizeType)
+inline void clamp_by_stored_size_type(SizeType &, SizeType)
 {}
 
 template<class SizeType, class SomeStoredSizeType>
-BOOST_CONTAINER_FORCEINLINE void clamp_by_stored_size_type(SizeType &s, SomeStoredSizeType)
+inline void clamp_by_stored_size_type(SizeType &s, SomeStoredSizeType)
 {
    if (s >= SomeStoredSizeType(-1) ) 
       s = SomeStoredSizeType(-1);
diff --git a/inst/include/boost/container/detail/node_alloc_holder.hpp b/inst/include/boost/container/detail/node_alloc_holder.hpp
index b8d421fc5..31e3f9b48 100644
--- a/inst/include/boost/container/detail/node_alloc_holder.hpp
+++ b/inst/include/boost/container/detail/node_alloc_holder.hpp
@@ -31,12 +31,14 @@
 #include <boost/container/detail/construct_in_place.hpp>
 #include <boost/container/detail/destroyers.hpp>
 #include <boost/move/detail/iterator_to_raw_pointer.hpp>
+#include <boost/move/detail/launder.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/placement_new.hpp>
 #include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <boost/container/detail/version_type.hpp>
 #include <boost/container/detail/is_pair.hpp>
+#include <boost/container/detail/pair.hpp>
 // intrusive
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/options.hpp>
@@ -118,17 +120,17 @@ struct base_node
       ::boost::container::construct_in_place(a, &this->get_real_data(), it);
    }
 
-   BOOST_CONTAINER_FORCEINLINE T &get_data()
-   {  return *move_detail::force_ptr<T*>(this->m_storage.data);   }
+   inline T &get_data()
+   {  return *move_detail::force_ptr<T*>(&this->m_storage);   }
 
-   BOOST_CONTAINER_FORCEINLINE const T &get_data() const
-   {  return *move_detail::force_ptr<const T*>(this->m_storage.data);  }
+   inline const T &get_data() const
+   {  return *move_detail::launder_cast<const T*>(&this->m_storage);  }
 
-   BOOST_CONTAINER_FORCEINLINE internal_type &get_real_data()
-   {  return *move_detail::force_ptr<internal_type*>(this->m_storage.data);   }
+   inline internal_type &get_real_data()
+   {  return *move_detail::launder_cast<internal_type*>(&this->m_storage);   }
 
-   BOOST_CONTAINER_FORCEINLINE const internal_type &get_real_data() const
-   {  return *move_detail::force_ptr<const internal_type*>(this->m_storage.data);  }
+   inline const internal_type &get_real_data() const
+   {  return *move_detail::launder_cast<const internal_type*>(&this->m_storage);  }
 
    #if defined(BOOST_CONTAINER_DISABLE_ALIASING_WARNING)
       #pragma GCC diagnostic pop
@@ -136,7 +138,7 @@ struct base_node
    #  endif
 
    template<class Alloc>
-   BOOST_CONTAINER_FORCEINLINE void destructor(Alloc &a) BOOST_NOEXCEPT
+   inline void destructor(Alloc &a) BOOST_NOEXCEPT
    {
       allocator_traits<Alloc>::destroy
          (a, &this->get_real_data());
@@ -144,7 +146,7 @@ struct base_node
    }
 
    template<class Pair>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    typename dtl::enable_if< dtl::is_pair<Pair>, void >::type
       do_assign(const Pair &p)
    {
@@ -154,13 +156,13 @@ struct base_node
    }
 
    template<class V>
-   BOOST_CONTAINER_FORCEINLINE 
+   inline 
    typename dtl::disable_if< dtl::is_pair<V>, void >::type
       do_assign(const V &v)
    {  this->get_real_data() = v; }
 
    template<class Pair>
-   BOOST_CONTAINER_FORCEINLINE 
+   inline 
    typename dtl::enable_if< dtl::is_pair<Pair>, void >::type
       do_move_assign(Pair &p)
    {
@@ -170,7 +172,7 @@ struct base_node
    }
 
    template<class V>
-   BOOST_CONTAINER_FORCEINLINE 
+   inline 
    typename dtl::disable_if< dtl::is_pair<V>, void >::type
       do_move_assign(V &v)
    {  this->get_real_data() = ::boost::move(v); }
@@ -178,7 +180,7 @@ struct base_node
    private:
    base_node();
 
-   BOOST_CONTAINER_FORCEINLINE ~base_node()
+   inline ~base_node()
    { }
 };
 
@@ -256,7 +258,7 @@ struct node_alloc_holder
    public:
 
    //Constructors for sequence containers
-   BOOST_CONTAINER_FORCEINLINE node_alloc_holder()
+   inline node_alloc_holder()
    {}
 
    explicit node_alloc_holder(const intrusive_bucket_traits& bt)
@@ -339,30 +341,30 @@ struct node_alloc_holder
                , typename ICont::key_equal(eql))
    {  this->icont().swap(BOOST_MOVE_TO_LV(x).icont());   }
 
-   BOOST_CONTAINER_FORCEINLINE void copy_assign_alloc(const node_alloc_holder &x)
+   inline void copy_assign_alloc(const node_alloc_holder &x)
    {
       dtl::bool_<allocator_traits_type::propagate_on_container_copy_assignment::value> flag;
       dtl::assign_alloc( static_cast<NodeAlloc &>(*this)
                        , static_cast<const NodeAlloc &>(x), flag);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void move_assign_alloc( node_alloc_holder &x)
+   inline void move_assign_alloc( node_alloc_holder &x)
    {
       dtl::bool_<allocator_traits_type::propagate_on_container_move_assignment::value> flag;
       dtl::move_alloc( static_cast<NodeAlloc &>(*this)
                      , static_cast<NodeAlloc &>(x), flag);
    }
 
-   BOOST_CONTAINER_FORCEINLINE ~node_alloc_holder()
+   inline ~node_alloc_holder()
    {  this->clear(alloc_version()); }
 
-   BOOST_CONTAINER_FORCEINLINE size_type max_size() const
+   inline size_type max_size() const
    {  return allocator_traits_type::max_size(this->node_alloc());  }
 
-   BOOST_CONTAINER_FORCEINLINE NodePtr allocate_one()
+   inline NodePtr allocate_one()
    {  return AllocVersionTraits::allocate_one(this->node_alloc());   }
 
-   BOOST_CONTAINER_FORCEINLINE void deallocate_one(const NodePtr &p)
+   inline void deallocate_one(const NodePtr &p)
    {  AllocVersionTraits::deallocate_one(this->node_alloc(), p);  }
 
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
@@ -497,7 +499,7 @@ struct node_alloc_holder
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void clear(version_1)
+   inline void clear(version_1)
    {  this->icont().clear_and_dispose(Destroyer(this->node_alloc()));   }
 
    void clear(version_2)
@@ -505,7 +507,7 @@ struct node_alloc_holder
       typename NodeAlloc::multiallocation_chain chain;
       allocator_node_destroyer_and_chain_builder<NodeAlloc> builder(this->node_alloc(), chain);
       this->icont().clear_and_dispose(builder);
-      //BOOST_STATIC_ASSERT((::boost::has_move_emulation_enabled<typename NodeAlloc::multiallocation_chain>::value == true));
+      //BOOST_CONTAINER_STATIC_ASSERT((::boost::has_move_emulation_enabled<typename NodeAlloc::multiallocation_chain>::value == true));
       if(!chain.empty())
          this->node_alloc().deallocate_individual(chain);
    }
@@ -524,24 +526,37 @@ struct node_alloc_holder
    }
 
    template<class Key>
-   BOOST_CONTAINER_FORCEINLINE size_type erase_key(const Key& k, version_1)
+   inline size_type erase_key(const Key& k, version_1)
    {  return this->icont().erase_and_dispose(k, Destroyer(this->node_alloc())); }
 
    template<class Key>
-   BOOST_CONTAINER_FORCEINLINE size_type erase_key(const Key& k, version_2)
+   inline size_type erase_key(const Key& k, version_2)
    {
       allocator_multialloc_chain_node_deallocator<NodeAlloc> chain_holder(this->node_alloc());
       return this->icont().erase_and_dispose(k, chain_holder.get_chain_builder());
    }
 
+   template<class Key, class KeyCompare>
+   inline size_type erase_key(const Key& k, KeyCompare cmp, version_1)
+   {
+      return this->icont().erase_and_dispose(k, cmp, Destroyer(this->node_alloc()));
+   }
+
+   template<class Key, class KeyCompare>
+   inline size_type erase_key(const Key& k, KeyCompare cmp, version_2)
+   {
+      allocator_multialloc_chain_node_deallocator<NodeAlloc> chain_holder(this->node_alloc());
+      return this->icont().erase_and_dispose(k, cmp, chain_holder.get_chain_builder());
+   }
+
    protected:
    struct cloner
    {
-      BOOST_CONTAINER_FORCEINLINE explicit cloner(node_alloc_holder &holder)
+      inline explicit cloner(node_alloc_holder &holder)
          :  m_holder(holder)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE NodePtr operator()(const Node &other) const
+      inline NodePtr operator()(const Node &other) const
       {  return m_holder.create_node(other.get_real_data());  }
 
       node_alloc_holder &m_holder;
@@ -549,11 +564,11 @@ struct node_alloc_holder
 
    struct move_cloner
    {
-      BOOST_CONTAINER_FORCEINLINE move_cloner(node_alloc_holder &holder)
+      inline move_cloner(node_alloc_holder &holder)
          :  m_holder(holder)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE NodePtr operator()(Node &other)
+      inline NodePtr operator()(Node &other)
       {  //Use get_real_data() instead of get_real_data to allow moving const key in [multi]map
          return m_holder.create_node(::boost::move(other.get_real_data()));
       }
@@ -561,20 +576,20 @@ struct node_alloc_holder
       node_alloc_holder &m_holder;
    };
 
-   BOOST_CONTAINER_FORCEINLINE ICont &non_const_icont() const
+   inline ICont &non_const_icont() const
    {  return const_cast<ICont&>(this->m_icont);   }
 
-   BOOST_CONTAINER_FORCEINLINE NodeAlloc &node_alloc()
+   inline NodeAlloc &node_alloc()
    {  return static_cast<NodeAlloc &>(*this);   }
 
-   BOOST_CONTAINER_FORCEINLINE const NodeAlloc &node_alloc() const
+   inline const NodeAlloc &node_alloc() const
    {  return static_cast<const NodeAlloc &>(*this);   }
 
    public:
-   BOOST_CONTAINER_FORCEINLINE ICont &icont()
+   inline ICont &icont()
    {  return this->m_icont;   }
 
-   BOOST_CONTAINER_FORCEINLINE const ICont &icont() const
+   inline const ICont &icont() const
    {  return this->m_icont;   }
 
    protected:
@@ -587,10 +602,10 @@ struct key_of_node : KeyOfValue
 {
    typedef typename KeyOfValue::type type;
 
-   BOOST_CONTAINER_FORCEINLINE key_of_node()
+   inline key_of_node()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE const type& operator()(const Node& x) const
+   inline const type& operator()(const Node& x) const
    {  return this->KeyOfValue::operator()(x.get_data());  }
 };
 
diff --git a/inst/include/boost/container/detail/node_pool.hpp b/inst/include/boost/container/detail/node_pool.hpp
index 649077276..f0e123533 100644
--- a/inst/include/boost/container/detail/node_pool.hpp
+++ b/inst/include/boost/container/detail/node_pool.hpp
@@ -52,7 +52,7 @@ class private_node_pool
 
    public:
    typedef typename base_t::multiallocation_chain multiallocation_chain;
-   static const std::size_t nodes_per_block = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t nodes_per_block = NodesPerBlock;
 
    //!Constructor from a segment manager. Never throws
    private_node_pool()
diff --git a/inst/include/boost/container/detail/node_pool_impl.hpp b/inst/include/boost/container/detail/node_pool_impl.hpp
index d619656e1..75612239a 100644
--- a/inst/include/boost/container/detail/node_pool_impl.hpp
+++ b/inst/include/boost/container/detail/node_pool_impl.hpp
@@ -84,21 +84,21 @@ class private_node_pool_impl
    {}
 
    //!Destructor. Deallocates all allocated blocks. Never throws
-   BOOST_CONTAINER_FORCEINLINE ~private_node_pool_impl()
+   inline ~private_node_pool_impl()
    {  this->purge_blocks();  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type get_real_num_node() const
+   inline size_type get_real_num_node() const
    {  return m_nodes_per_block; }
 
    //!Returns the segment manager. Never throws
-   BOOST_CONTAINER_FORCEINLINE segment_manager_base_type* get_segment_manager_base()const
+   inline segment_manager_base_type* get_segment_manager_base()const
    {  return boost::movelib::to_raw_pointer(mp_segment_mngr_base);  }
 
-   BOOST_CONTAINER_FORCEINLINE void *allocate_node()
+   inline void *allocate_node()
    {  return this->priv_alloc_node();  }
 
    //!Deallocates an array pointed by ptr. Never throws
-   BOOST_CONTAINER_FORCEINLINE void deallocate_node(void *ptr)
+   inline void deallocate_node(void *ptr)
    {  this->priv_dealloc_node(ptr); }
 
    //!Allocates a singly linked list of n nodes ending in null pointer.
@@ -205,7 +205,7 @@ class private_node_pool_impl
          , backup_list.size());
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type num_free_nodes()
+   inline size_type num_free_nodes()
    {  return m_freelist.size();  }
 
    //!Deallocates all used memory. Precondition: all nodes allocated from this pool should
diff --git a/inst/include/boost/container/detail/pair.hpp b/inst/include/boost/container/detail/pair.hpp
index 56b2fb831..0e84ffbf4 100644
--- a/inst/include/boost/container/detail/pair.hpp
+++ b/inst/include/boost/container/detail/pair.hpp
@@ -25,12 +25,11 @@
 #include <boost/container/container_fwd.hpp>
 #include <boost/container/detail/workaround.hpp>
 
-#include <boost/static_assert.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/std_fwd.hpp>
-#include <boost/container/detail/is_pair.hpp>
+#include <boost/container/detail/is_pair.hpp>   //Forward declares boost::tuples::tuple
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 #  include <boost/container/detail/variadic_templates_tools.hpp>
 #endif
@@ -47,7 +46,7 @@ namespace pair_impl {
 template <class TupleClass>
 struct is_boost_tuple
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template <
@@ -57,7 +56,7 @@ template <
   class T9>
 struct is_boost_tuple< boost::tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template<class Tuple>
@@ -68,13 +67,13 @@ struct disable_if_boost_tuple
 template<class T>
 struct is_tuple_null
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<>
 struct is_tuple_null<boost::tuples::null_type>
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 }  //namespace detail {
@@ -166,35 +165,35 @@ struct pair
    pair()
       : first(), second()
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    //pair copy assignment
    pair(const pair& x)
       : first(x.first), second(x.second)
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    //pair move constructor
    pair(BOOST_RV_REF(pair) p)
       : first(::boost::move(BOOST_MOVE_TO_LV(p).first)), second(::boost::move(BOOST_MOVE_TO_LV(p).second))
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    template <class D, class S>
    pair(const pair<D, S> &p)
       : first(p.first), second(p.second)
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    template <class D, class S>
    pair(BOOST_RV_REF_BEG pair<D, S> BOOST_RV_REF_END p)
       : first(::boost::move(BOOST_MOVE_TO_LV(p).first)), second(::boost::move(BOOST_MOVE_TO_LV(p).second))
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    //pair from two values
@@ -202,7 +201,7 @@ struct pair
       : first(t1)
       , second(t2)
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    template<class U, class V>
@@ -210,34 +209,34 @@ struct pair
       : first(::boost::forward<U>(u))
       , second(::boost::forward<V>(v))
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    //And now compatibility with std::pair
    pair(const std::pair<T1, T2>& x)
       : first(x.first), second(x.second)
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    template <class D, class S>
    pair(const std::pair<D, S>& p)
       : first(p.first), second(p.second)
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    pair(BOOST_RV_REF_BEG std::pair<T1, T2> BOOST_RV_REF_END p)
       : first(::boost::move(BOOST_MOVE_TO_LV(p).first)), second(::boost::move(BOOST_MOVE_TO_LV(p).second))
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    template <class D, class S>
    pair(BOOST_RV_REF_BEG std::pair<D, S> BOOST_RV_REF_END p)
       : first(::boost::move(BOOST_MOVE_TO_LV(p).first)), second(::boost::move(BOOST_MOVE_TO_LV(p).second))
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
 
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
@@ -245,7 +244,7 @@ struct pair
    pair(try_emplace_t, BOOST_FWD_REF(KeyType) k, Args && ...args)
       : first(boost::forward<KeyType>(k)), second(::boost::forward<Args>(args)...)\
    {
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
    }
    #else
 
@@ -255,7 +254,7 @@ struct pair
    pair( try_emplace_t, BOOST_FWD_REF(KeyType) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N )\
       : first(boost::forward<KeyType>(k)), second(BOOST_MOVE_FWD##N)\
    {\
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
    }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_PAIR_TRY_EMPLACE_CONSTRUCT_CODE)
@@ -277,7 +276,7 @@ struct pair
        )\
       : first(BOOST_MOVE_TMPL_GET##N), second(BOOST_MOVE_TMPL_GETQ##M)\
    { (void)p; (void)q;\
-      BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
    }\
    //
    BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_PAIR_PIECEWISE_CONSTRUCT_BOOST_TUPLE_CODE)
@@ -299,7 +298,7 @@ struct pair
       pair(piecewise_construct_t, Tuple<Args1...> t1, Tuple<Args2...> t2)
          : pair(t1, t2, typename build_number_seq<sizeof...(Args1)>::type(), typename build_number_seq<sizeof...(Args2)>::type())
       {
-         BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+         BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
       }
    #  else
       //piecewise construction from variadic tuple (suboptimal, without delegating constructors)
@@ -319,7 +318,7 @@ struct pair
          : first  (build_from_args<first_type> (::boost::move(t1)))
          , second (build_from_args<second_type>(::boost::move(t2)))
       {
-         BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
+         BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));
       }
    #  endif   //BOOST_NO_CXX11_VARIADIC_TEMPLATES
    #elif defined(BOOST_MSVC) && (_CPPLIB_VER == 520)
@@ -332,7 +331,7 @@ struct pair
           , StdTuple<BOOST_MOVE_TARGQ##M BOOST_MOVE_I##M BOOST_MOVE_REPEAT(BOOST_MOVE_SUB(10,M),::std::tr1::_Nil)> q)\
          : first(BOOST_MOVE_GET_IDX##N), second(BOOST_MOVE_GET_IDXQ##M)\
       { (void)p; (void)q;\
-         BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
+         BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
       }\
       //
       BOOST_MOVE_ITER2D_0TOMAX(9, BOOST_PAIR_PIECEWISE_CONSTRUCT_MSVC2010_TUPLE_CODE)
@@ -353,7 +352,7 @@ struct pair
           , StdTuple<BOOST_MOVE_TARGQ##M BOOST_MOVE_I##M BOOST_MOVE_REPEAT(BOOST_MOVE_SUB(BOOST_MOVE_ADD(_VARIADIC_MAX, 3),M),::std::_Nil) > q)\
          : first(BOOST_MOVE_GET_IDX##N), second(BOOST_MOVE_GET_IDXQ##M)\
       { (void)p; (void)q;\
-         BOOST_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
+         BOOST_CONTAINER_STATIC_ASSERT((sizeof(std::pair<T1, T2>) == sizeof(pair<T1, T2>)));\
       }\
       //
       BOOST_MOVE_ITER2D_0TOMAX(BOOST_PAIR_PIECEWISE_CONSTRUCT_MSVC2012_TUPLE_MAX_IT, BOOST_PAIR_PIECEWISE_CONSTRUCT_MSVC2012_TUPLE_CODE)
@@ -483,7 +482,7 @@ inline void swap(pair<T1, T2>& x, pair<T1, T2>& y)
 template<class T1, class T2>
 struct has_move_emulation_enabled< ::boost::container::dtl::pair<T1, T2> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 #endif
@@ -498,7 +497,7 @@ struct is_class_or_union< ::boost::container::dtl::pair<T1, T2> >
 //This specialization is needed to avoid instantiation of pair in
 //is_class, and allow recursive maps.
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template <class T1, class T2>
@@ -506,7 +505,7 @@ struct is_class_or_union< std::pair<T1, T2> >
 //This specialization is needed to avoid instantiation of pair in
 //is_class, and allow recursive maps.
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template<class T>
@@ -517,7 +516,7 @@ struct is_union< ::boost::container::dtl::pair<T1, T2> >
 //This specialization is needed to avoid instantiation of pair in
 //is_class, and allow recursive maps.
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template <class T1, class T2>
@@ -525,7 +524,7 @@ struct is_union< std::pair<T1, T2> >
 //This specialization is needed to avoid instantiation of pair in
 //is_class, and allow recursive maps.
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class T>
@@ -536,7 +535,7 @@ struct is_class< ::boost::container::dtl::pair<T1, T2> >
 //This specialization is needed to avoid instantiation of pair in
 //is_class, and allow recursive maps.
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 template <class T1, class T2>
@@ -544,7 +543,7 @@ struct is_class< std::pair<T1, T2> >
 //This specialization is needed to avoid instantiation of pair in
 //is_class, and allow recursive maps.
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 
@@ -556,7 +555,7 @@ template<class A, class B>
 struct is_trivially_copy_assignable
    <boost::container::dtl::pair<A,B> >
 {
-   static const bool value = false ;
+   BOOST_STATIC_CONSTEXPR bool value = false ;
 };
 
 template<class T>
@@ -566,7 +565,7 @@ template<class A, class B>
 struct is_trivially_move_assignable
    <boost::container::dtl::pair<A,B> >
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class T>
@@ -575,7 +574,7 @@ struct is_trivially_copy_assignable;
 template<class A, class B>
 struct is_trivially_copy_constructible<boost::container::dtl::pair<A,B> >
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class T>
@@ -584,7 +583,7 @@ struct is_trivially_move_assignable;
 template<class A, class B>
 struct is_trivially_move_constructible<boost::container::dtl::pair<A,B> >
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class T>
@@ -593,7 +592,7 @@ struct is_trivially_destructible;
 template<class A, class B>
 struct is_trivially_destructible<boost::container::dtl::pair<A,B> >
 {
-   static const bool value = boost::move_detail::is_trivially_destructible<A>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_destructible<A>::value &&
                              boost::move_detail::is_trivially_destructible<B>::value ;
 };
 
diff --git a/inst/include/boost/container/detail/pool_common.hpp b/inst/include/boost/container/detail/pool_common.hpp
index f42c1dd4d..8a570328f 100644
--- a/inst/include/boost/container/detail/pool_common.hpp
+++ b/inst/include/boost/container/detail/pool_common.hpp
@@ -45,7 +45,7 @@ struct node_slist
 template<class T>
 struct is_stateless_segment_manager
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 }  //namespace dtl {
diff --git a/inst/include/boost/container/detail/pool_common_alloc.hpp b/inst/include/boost/container/detail/pool_common_alloc.hpp
index f58c5e7a0..bc5cd7b72 100644
--- a/inst/include/boost/container/detail/pool_common_alloc.hpp
+++ b/inst/include/boost/container/detail/pool_common_alloc.hpp
@@ -39,7 +39,7 @@ struct node_slist_helper
 struct fake_segment_manager
 {
    typedef void * void_pointer;
-   static const std::size_t PayloadPerAllocation = BOOST_CONTAINER_ALLOCATION_PAYLOAD;
+   BOOST_STATIC_CONSTEXPR std::size_t PayloadPerAllocation = BOOST_CONTAINER_ALLOCATION_PAYLOAD;
 
    typedef boost::container::dtl::
       basic_multiallocation_chain<void*>              multiallocation_chain;
@@ -90,7 +90,7 @@ template<>
 struct is_stateless_segment_manager
    <boost::container::dtl::fake_segment_manager>
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 }  //namespace dtl {
diff --git a/inst/include/boost/container/detail/pool_resource.hpp b/inst/include/boost/container/detail/pool_resource.hpp
index 87eecacce..a98dc70b6 100644
--- a/inst/include/boost/container/detail/pool_resource.hpp
+++ b/inst/include/boost/container/detail/pool_resource.hpp
@@ -31,11 +31,11 @@ namespace pmr {
 
 class pool_data_t;
 
-static const std::size_t pool_options_minimum_max_blocks_per_chunk = 1u;
-static const std::size_t pool_options_default_max_blocks_per_chunk = 32u;
-static const std::size_t pool_options_minimum_largest_required_pool_block =
+BOOST_CONTAINER_CONSTANT_VAR std::size_t pool_options_minimum_max_blocks_per_chunk = 1u;
+BOOST_CONTAINER_CONSTANT_VAR std::size_t pool_options_default_max_blocks_per_chunk = 32u;
+BOOST_CONTAINER_CONSTANT_VAR std::size_t pool_options_minimum_largest_required_pool_block =
    memory_resource::max_align > 2*sizeof(void*) ? memory_resource::max_align : 2*sizeof(void*);
-static const std::size_t pool_options_default_largest_required_pool_block =
+BOOST_CONTAINER_CONSTANT_VAR std::size_t pool_options_default_largest_required_pool_block =
    pool_options_minimum_largest_required_pool_block > 4096u
       ? pool_options_minimum_largest_required_pool_block : 4096u;
 
diff --git a/inst/include/boost/container/detail/transform_iterator.hpp b/inst/include/boost/container/detail/transform_iterator.hpp
index 5c7bbf2dd..35b64b85f 100644
--- a/inst/include/boost/container/detail/transform_iterator.hpp
+++ b/inst/include/boost/container/detail/transform_iterator.hpp
@@ -33,13 +33,13 @@ namespace container {
 template <class PseudoReference>
 struct operator_arrow_proxy
 {
-   BOOST_CONTAINER_FORCEINLINE operator_arrow_proxy(const PseudoReference &px)
+   inline operator_arrow_proxy(const PseudoReference &px)
       :  m_value(px)
    {}
 
    typedef PseudoReference element_type;
 
-   BOOST_CONTAINER_FORCEINLINE PseudoReference* operator->() const { return &m_value; }
+   inline PseudoReference* operator->() const { return &m_value; }
 
    mutable PseudoReference m_value;
 };
@@ -47,13 +47,13 @@ struct operator_arrow_proxy
 template <class T>
 struct operator_arrow_proxy<T&>
 {
-   BOOST_CONTAINER_FORCEINLINE operator_arrow_proxy(T &px)
+   inline operator_arrow_proxy(T &px)
       :  m_value(px)
    {}
 
    typedef T element_type;
 
-   BOOST_CONTAINER_FORCEINLINE T* operator->() const { return const_cast<T*>(&m_value); }
+   inline T* operator->() const { return const_cast<T*>(&m_value); }
 
    T &m_value;
 };
@@ -69,29 +69,29 @@ class transform_iterator
       , typename UnaryFunction::result_type>
 {
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit transform_iterator(const Iterator &it, const UnaryFunction &f = UnaryFunction())
+   inline explicit transform_iterator(const Iterator &it, const UnaryFunction &f = UnaryFunction())
       :  UnaryFunction(f), m_it(it)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit transform_iterator()
+   inline explicit transform_iterator()
       :  UnaryFunction(), m_it()
    {}
 
    //Constructors
-   BOOST_CONTAINER_FORCEINLINE transform_iterator& operator++()
+   inline transform_iterator& operator++()
    { increment();   return *this;   }
 
-      BOOST_CONTAINER_FORCEINLINE transform_iterator operator++(int)
+      inline transform_iterator operator++(int)
    {
       transform_iterator result (*this);
       increment();
       return result;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator== (const transform_iterator& i, const transform_iterator& i2)
+   inline friend bool operator== (const transform_iterator& i, const transform_iterator& i2)
    { return i.equal(i2); }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!= (const transform_iterator& i, const transform_iterator& i2)
+   inline friend bool operator!= (const transform_iterator& i, const transform_iterator& i2)
    { return !(i == i2); }
 
 /*
@@ -104,69 +104,69 @@ class transform_iterator
    friend bool operator>= (const transform_iterator& i, const transform_iterator& i2)
    { return !(i < i2); }
 */
-   BOOST_CONTAINER_FORCEINLINE friend typename Iterator::difference_type operator- (const transform_iterator& i, const transform_iterator& i2)
+   inline friend typename Iterator::difference_type operator- (const transform_iterator& i, const transform_iterator& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE transform_iterator& operator+=(typename Iterator::difference_type off)
+   inline transform_iterator& operator+=(typename Iterator::difference_type off)
    {  this->advance(off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE transform_iterator operator+(typename Iterator::difference_type off) const
+   inline transform_iterator operator+(typename Iterator::difference_type off) const
    {
       transform_iterator other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend transform_iterator operator+(typename Iterator::difference_type off, const transform_iterator& right)
+   inline friend transform_iterator operator+(typename Iterator::difference_type off, const transform_iterator& right)
    {  return right + off; }
 
-   BOOST_CONTAINER_FORCEINLINE transform_iterator& operator-=(typename Iterator::difference_type off)
+   inline transform_iterator& operator-=(typename Iterator::difference_type off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE transform_iterator operator-(typename Iterator::difference_type off) const
+   inline transform_iterator operator-(typename Iterator::difference_type off) const
    {  return *this + (-off);  }
 
-   BOOST_CONTAINER_FORCEINLINE typename UnaryFunction::result_type operator*() const
+   inline typename UnaryFunction::result_type operator*() const
    { return dereference(); }
 
-   BOOST_CONTAINER_FORCEINLINE operator_arrow_proxy<typename UnaryFunction::result_type>
+   inline operator_arrow_proxy<typename UnaryFunction::result_type>
       operator->() const
    { return operator_arrow_proxy<typename UnaryFunction::result_type>(dereference());  }
 
-   BOOST_CONTAINER_FORCEINLINE Iterator & base()
+   inline Iterator & base()
    {  return m_it;   }
 
-   BOOST_CONTAINER_FORCEINLINE const Iterator & base() const
+   inline const Iterator & base() const
    {  return m_it;   }
 
    private:
    Iterator m_it;
 
-   BOOST_CONTAINER_FORCEINLINE void increment()
+   inline void increment()
    { ++m_it; }
 
-   BOOST_CONTAINER_FORCEINLINE void decrement()
+   inline void decrement()
    { --m_it; }
 
-   BOOST_CONTAINER_FORCEINLINE bool equal(const transform_iterator &other) const
+   inline bool equal(const transform_iterator &other) const
    {  return m_it == other.m_it;   }
 
-   BOOST_CONTAINER_FORCEINLINE bool less(const transform_iterator &other) const
+   inline bool less(const transform_iterator &other) const
    {  return other.m_it < m_it;   }
 
-   BOOST_CONTAINER_FORCEINLINE typename UnaryFunction::result_type dereference() const
+   inline typename UnaryFunction::result_type dereference() const
    { return UnaryFunction::operator()(*m_it); }
 
-   BOOST_CONTAINER_FORCEINLINE void advance(typename Iterator::difference_type n)
+   inline void advance(typename Iterator::difference_type n)
    {  boost::container::iterator_advance(m_it, n); }
 
-   BOOST_CONTAINER_FORCEINLINE typename Iterator::difference_type distance_to(const transform_iterator &other)const
+   inline typename Iterator::difference_type distance_to(const transform_iterator &other)const
    {  return boost::container::iterator_distance(other.m_it, m_it); }
 };
 
 template <class Iterator, class UnaryFunc>
-BOOST_CONTAINER_FORCEINLINE transform_iterator<Iterator, UnaryFunc>
+inline transform_iterator<Iterator, UnaryFunc>
 make_transform_iterator(Iterator it, UnaryFunc fun)
 {
    return transform_iterator<Iterator, UnaryFunc>(it, fun);
diff --git a/inst/include/boost/container/detail/tree.hpp b/inst/include/boost/container/detail/tree.hpp
index 843ad3cb7..433792472 100644
--- a/inst/include/boost/container/detail/tree.hpp
+++ b/inst/include/boost/container/detail/tree.hpp
@@ -52,7 +52,6 @@
 #include <boost/move/detail/fwd_macros.hpp>
 #endif
 #include <boost/move/detail/move_helpers.hpp>
-#include <boost/move/detail/force_ptr.hpp>
 
 
 
@@ -131,11 +130,11 @@ class insert_equal_end_hint_functor
    Icont &icont_;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE insert_equal_end_hint_functor(Icont &icont)
+   inline insert_equal_end_hint_functor(Icont &icont)
       :  icont_(icont)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void operator()(Node &n)
+   inline void operator()(Node &n)
    {  this->icont_.insert_equal(this->icont_.cend(), n); }
 };
 
@@ -145,11 +144,11 @@ class push_back_functor
    Icont &icont_;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE push_back_functor(Icont &icont)
+   inline push_back_functor(Icont &icont)
       :  icont_(icont)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void operator()(Node &n)
+   inline void operator()(Node &n)
    {  this->icont_.push_back(n); }
 };
 
@@ -252,13 +251,13 @@ struct intrusive_tree_type
 //Trait to detect manually rebalanceable tree types
 template<boost::container::tree_type_enum tree_type_value>
 struct is_manually_balanceable
-{  static const bool value = true;  };
+{  BOOST_STATIC_CONSTEXPR bool value = true;  };
 
 template<>  struct is_manually_balanceable<red_black_tree>
-{  static const bool value = false; };
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
 
 template<>  struct is_manually_balanceable<avl_tree>
-{  static const bool value = false; };
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
 
 //Proxy traits to implement different operations depending on the
 //is_manually_balanceable<>::value
@@ -267,14 +266,14 @@ template< boost::container::tree_type_enum tree_type_value
 struct intrusive_tree_proxy
 {
    template<class Icont>
-   BOOST_CONTAINER_FORCEINLINE static void rebalance(Icont &)   {}
+   inline static void rebalance(Icont &)   {}
 };
 
 template<boost::container::tree_type_enum tree_type_value>
 struct intrusive_tree_proxy<tree_type_value, true>
 {
    template<class Icont>
-   BOOST_CONTAINER_FORCEINLINE static void rebalance(Icont &c)
+   inline static void rebalance(Icont &c)
    {  c.rebalance(); }
 };
 
@@ -298,10 +297,10 @@ class RecyclingCloner
       :  m_holder(holder), m_icont(itree)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type p, node_t &other, bool_<true>)
+   inline static void do_assign(node_ptr_type p, node_t &other, bool_<true>)
    {  p->do_move_assign(other.get_real_data());   }
 
-   BOOST_CONTAINER_FORCEINLINE static void do_assign(node_ptr_type p, const node_t &other, bool_<false>)
+   inline static void do_assign(node_ptr_type p, const node_t &other, bool_<false>)
    {  p->do_assign(other.get_real_data());   }
 
    node_ptr_type operator()
@@ -457,23 +456,27 @@ class tree
 
    private:
 
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits<allocator_type>::value_type>::value));
+
    typedef key_node_pred<key_compare, key_of_value_t, Node>  KeyNodeCompare;
 
    public:
 
-   BOOST_CONTAINER_FORCEINLINE tree()
+   inline tree()
       : AllocHolder()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit tree(const key_compare& comp)
+   inline explicit tree(const key_compare& comp)
       : AllocHolder(ValComp(comp))
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit tree(const key_compare& comp, const allocator_type& a)
+   inline explicit tree(const key_compare& comp, const allocator_type& a)
       : AllocHolder(ValComp(comp), a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit tree(const allocator_type& a)
+   inline explicit tree(const allocator_type& a)
       : AllocHolder(a)
    {}
 
@@ -616,19 +619,19 @@ class tree
 
    public:
 
-   BOOST_CONTAINER_FORCEINLINE tree(const tree& x)
+   inline tree(const tree& x)
       :  AllocHolder(x, x.value_comp())
    {
       this->icont().clone_from
          (x.icont(), typename AllocHolder::cloner(*this), Destroyer(this->node_alloc()));
    }
 
-   BOOST_CONTAINER_FORCEINLINE tree(BOOST_RV_REF(tree) x)
+   inline tree(BOOST_RV_REF(tree) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       :  AllocHolder(BOOST_MOVE_BASE(AllocHolder, x), x.value_comp())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE tree(const tree& x, const allocator_type &a)
+   inline tree(const tree& x, const allocator_type &a)
       :  AllocHolder(x.value_comp(), a)
    {
       this->icont().clone_from
@@ -649,7 +652,7 @@ class tree
       //AllocHolder clears in case of exception
    }
 
-   BOOST_CONTAINER_FORCEINLINE ~tree()
+   inline ~tree()
    {} //AllocHolder clears the tree
 
    tree& operator=(BOOST_COPY_ASSIGN_REF(tree) x)
@@ -689,96 +692,69 @@ class tree
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
    {
       if (BOOST_LIKELY(this != &x)) {
-         NodeAlloc &this_alloc = this->node_alloc();
-         NodeAlloc &x_alloc    = x.node_alloc();
-         const bool propagate_alloc = allocator_traits<NodeAlloc>::
-               propagate_on_container_move_assignment::value;
-         const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-         //Resources can be transferred if both allocators are
-         //going to be equal after this function (either propagated or already equal)
-         if(propagate_alloc || allocators_equal){
-            //Destroy
-            this->clear();
-            //Move allocator if needed
-            this->AllocHolder::move_assign_alloc(x);
-            //Obtain resources
-            this->icont() = boost::move(x.icont());
-         }
-         //Else do a one by one move
-         else{
-            //Transfer all the nodes to a temporary tree
-            //If anything goes wrong, all the nodes will be destroyed
-            //automatically
-            Icont other_tree(::boost::move(this->icont()));
-
-            //Now recreate the source tree reusing nodes stored by other_tree
-            this->icont().clone_from
-               (::boost::move(x.icont())
-               , RecyclingCloner<AllocHolder, true>(*this, other_tree)
-               , Destroyer(this->node_alloc()));
-
-            //If there are remaining nodes, destroy them
-            NodePtr p;
-            while((p = other_tree.unlink_leftmost_without_rebalance())){
-               AllocHolder::destroy_node(p);
-            }
-         }
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
 
    public:
    // accessors:
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       value_compare value_comp() const
    {  return value_compare(this->key_comp()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       key_compare key_comp() const
    {  return this->icont().key_comp(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const
    {  return allocator_type(this->node_alloc()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const
    {  return this->node_alloc(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       stored_allocator_type &get_stored_allocator()
    {  return this->node_alloc(); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin()
    { return iterator(this->icont().begin()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const
    {  return this->cbegin();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end()
    {  return iterator(this->icont().end());  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const
    {  return this->cend();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin()
    {  return reverse_iterator(end());  }
 
    
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const
    {  return this->crbegin();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend()
    {  return reverse_iterator(begin());   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const
    {  return this->crend();   }
 
@@ -787,7 +763,7 @@ class tree
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const
    { return const_iterator(this->non_const_icont().begin()); }
 
@@ -796,7 +772,7 @@ class tree
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const
    { return const_iterator(this->non_const_icont().end()); }
 
@@ -806,7 +782,7 @@ class tree
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const
    { return const_reverse_iterator(cend()); }
 
@@ -816,23 +792,23 @@ class tree
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend() const
    { return const_reverse_iterator(cbegin()); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const
    {  return !this->size();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const
    {  return this->icont().size();   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const
    {  return AllocHolder::max_size();  }
 
-   BOOST_CONTAINER_FORCEINLINE void swap(ThisType& x)
+   inline void swap(ThisType& x)
       BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
                                  && boost::container::dtl::is_nothrow_swappable<Compare>::value )
    {  AllocHolder::swap(x);   }
@@ -896,6 +872,42 @@ class tree
 
 
    private:
+   void priv_move_assign(BOOST_RV_REF(tree) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      this->AllocHolder::move_assign_alloc(x);
+      //Obtain resources
+      this->icont() = boost::move(x.icont());
+   }
+
+   void priv_move_assign(BOOST_RV_REF(tree) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->node_alloc() == x.node_alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         //Transfer all the nodes to a temporary tree
+         //If anything goes wrong, all the nodes will be destroyed
+         //automatically
+         Icont other_tree(::boost::move(this->icont()));
+
+         //Now recreate the source tree reusing nodes stored by other_tree
+         this->icont().clone_from
+         (::boost::move(x.icont())
+            , RecyclingCloner<AllocHolder, true>(*this, other_tree)
+            , Destroyer(this->node_alloc()));
+
+         //If there are remaining nodes, destroy them
+         NodePtr p;
+         while ((p = other_tree.unlink_leftmost_without_rebalance())) {
+            AllocHolder::destroy_node(p);
+         }
+      }
+   }
 
    template<class KeyConvertible, class M>
    iiterator priv_insert_or_assign_commit
@@ -962,11 +974,11 @@ class tree
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> emplace_unique(BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator, bool> emplace_unique(BOOST_FWD_REF(Args)... args)
    {  return this->emplace_unique_node(AllocHolder::create_node(boost::forward<Args>(args)...));   }
 
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint_unique(const_iterator hint, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint_unique(const_iterator hint, BOOST_FWD_REF(Args)... args)
    {  return this->emplace_hint_unique_node(hint, AllocHolder::create_node(boost::forward<Args>(args)...));   }
 
    template <class... Args>
@@ -991,7 +1003,7 @@ class tree
    }
 
    template <class KeyType, class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace
+   inline std::pair<iterator, bool> try_emplace
       (const_iterator hint, BOOST_FWD_REF(KeyType) key, BOOST_FWD_REF(Args)... args)
    {
       insert_commit_data data;
@@ -1039,7 +1051,7 @@ class tree
    }\
    \
    template <class KeyType BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool>\
+   inline std::pair<iterator, bool>\
       try_emplace(const_iterator hint, BOOST_FWD_REF(KeyType) key BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       insert_commit_data data;\
@@ -1122,7 +1134,7 @@ class tree
       return iterator(this->icont().erase_and_dispose(position.get(), Destroyer(this->node_alloc())));
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type erase(const key_type& k)
+   inline size_type erase(const key_type& k)
    {  return AllocHolder::erase_key(k, alloc_version()); }
 
    size_type erase_unique(const key_type& k)
@@ -1134,6 +1146,31 @@ class tree
       return ret;
    }
 
+   template <class K>
+   inline typename dtl::enable_if_c<
+      dtl::is_transparent<key_compare>::value &&      //transparent
+      !dtl::is_convertible<K, iterator>::value &&     //not convertible to iterator
+      !dtl::is_convertible<K, const_iterator>::value  //not convertible to const_iterator
+      , size_type>::type
+      erase(const K& k)
+   {  return AllocHolder::erase_key(k, KeyNodeCompare(key_comp()), alloc_version()); }
+
+   template <class K>
+   inline typename dtl::enable_if_c<
+      dtl::is_transparent<key_compare>::value &&      //transparent
+      !dtl::is_convertible<K, iterator>::value &&     //not convertible to iterator
+      !dtl::is_convertible<K, const_iterator>::value  //not convertible to const_iterator
+      , size_type>::type
+      erase_unique(const K& k)
+   {
+      iterator i = this->find(k);
+      size_type ret = static_cast<size_type>(i != this->end());
+
+      if (ret)
+         this->erase(i);
+      return ret;
+   }
+
    iterator erase(const_iterator first, const_iterator last)
    {
       BOOST_ASSERT(first == last || (first != this->cend() && (priv_is_linked)(first)));
@@ -1209,105 +1246,105 @@ class tree
    }
 
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge_unique(tree<T, KeyOfValue, C2, Allocator, Options>& source)
+   inline void merge_unique(tree<T, KeyOfValue, C2, Allocator, Options>& source)
    {  return this->icont().merge_unique(source.icont()); }
 
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge_equal(tree<T, KeyOfValue, C2, Allocator, Options>& source)
+   inline void merge_equal(tree<T, KeyOfValue, C2, Allocator, Options>& source)
    {  return this->icont().merge_equal(source.icont());  }
-   BOOST_CONTAINER_FORCEINLINE void clear()
+   inline void clear()
    {  AllocHolder::clear(alloc_version());  }
 
    // search operations. Const and non-const overloads even if no iterator is returned
    // so splay implementations can to their rebalancing when searching in non-const versions
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator find(const key_type& k)
    {  return iterator(this->icont().find(k));  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator find(const key_type& k) const
    {  return const_iterator(this->non_const_icont().find(k));  }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, iterator>::type
          find(const K& k)
-   {  return iterator(this->icont().find(k, KeyNodeCompare()));  }
+   {  return iterator(this->icont().find(k, KeyNodeCompare(key_comp())));  }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, const_iterator>::type
          find(const K& k) const
-   {  return const_iterator(this->non_const_icont().find(k, KeyNodeCompare()));  }
+   {  return const_iterator(this->non_const_icont().find(k, KeyNodeCompare(key_comp())));  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const key_type& k) const
    {  return size_type(this->icont().count(k)); }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, size_type>::type
          count(const K& k) const
-   {  return size_type(this->icont().count(k, KeyNodeCompare())); }
+   {  return size_type(this->icont().count(k, KeyNodeCompare(key_comp()))); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool contains(const key_type& x) const
    {  return this->find(x) != this->cend();  }
 
    template<typename K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, bool>::type
          contains(const K& x) const
    {  return this->find(x) != this->cend();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator lower_bound(const key_type& k)
    {  return iterator(this->icont().lower_bound(k));  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator lower_bound(const key_type& k) const
    {  return const_iterator(this->non_const_icont().lower_bound(k));  }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, iterator>::type
          lower_bound(const K& k)
-   {  return iterator(this->icont().lower_bound(k, KeyNodeCompare()));  }
+   {  return iterator(this->icont().lower_bound(k, KeyNodeCompare(key_comp())));  }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, const_iterator>::type
          lower_bound(const K& k) const
-   {  return const_iterator(this->non_const_icont().lower_bound(k, KeyNodeCompare()));  }
+   {  return const_iterator(this->non_const_icont().lower_bound(k, KeyNodeCompare(key_comp())));  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator upper_bound(const key_type& k)
    {  return iterator(this->icont().upper_bound(k));   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator upper_bound(const key_type& k) const
    {  return const_iterator(this->non_const_icont().upper_bound(k));  }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, iterator>::type
          upper_bound(const K& k)
-   {  return iterator(this->icont().upper_bound(k, KeyNodeCompare()));   }
+   {  return iterator(this->icont().upper_bound(k, KeyNodeCompare(key_comp())));   }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, const_iterator>::type
          upper_bound(const K& k) const
-   {  return const_iterator(this->non_const_icont().upper_bound(k, KeyNodeCompare()));  }
+   {  return const_iterator(this->non_const_icont().upper_bound(k, KeyNodeCompare(key_comp())));  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> equal_range(const key_type& k)
    {
       std::pair<iiterator, iiterator> ret = this->icont().equal_range(k);
       return std::pair<iterator,iterator>(iterator(ret.first), iterator(ret.second));
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> equal_range(const key_type& k) const
    {
       std::pair<iiterator, iiterator> ret =
@@ -1317,27 +1354,27 @@ class tree
    }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, std::pair<iterator,iterator> >::type
          equal_range(const K& k)
    {
       std::pair<iiterator, iiterator> ret =
-         this->icont().equal_range(k, KeyNodeCompare());
+         this->icont().equal_range(k, KeyNodeCompare(key_comp()));
       return std::pair<iterator,iterator>(iterator(ret.first), iterator(ret.second));
    }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, std::pair<const_iterator, const_iterator> >::type
          equal_range(const K& k) const
    {
       std::pair<iiterator, iiterator> ret =
-         this->non_const_icont().equal_range(k, KeyNodeCompare());
+         this->non_const_icont().equal_range(k, KeyNodeCompare(key_comp()));
       return std::pair<const_iterator,const_iterator>
          (const_iterator(ret.first), const_iterator(ret.second));
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> lower_bound_range(const key_type& k)
    {
       std::pair<iiterator, iiterator> ret =
@@ -1345,7 +1382,7 @@ class tree
       return std::pair<iterator,iterator>(iterator(ret.first), iterator(ret.second));
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> lower_bound_range(const key_type& k) const
    {
       std::pair<iiterator, iiterator> ret =
@@ -1355,54 +1392,54 @@ class tree
    }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, std::pair<iterator,iterator> >::type
          lower_bound_range(const K& k)
    {
       std::pair<iiterator, iiterator> ret =
-         this->icont().lower_bound_range(k, KeyNodeCompare());
+         this->icont().lower_bound_range(k, KeyNodeCompare(key_comp()));
       return std::pair<iterator,iterator>(iterator(ret.first), iterator(ret.second));
    }
 
    template <class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       typename dtl::enable_if_transparent<key_compare, K, std::pair<const_iterator, const_iterator> >::type
          lower_bound_range(const K& k) const
    {
       std::pair<iiterator, iiterator> ret =
-         this->non_const_icont().lower_bound_range(k, KeyNodeCompare());
+         this->non_const_icont().lower_bound_range(k, KeyNodeCompare(key_comp()));
       return std::pair<const_iterator,const_iterator>
          (const_iterator(ret.first), const_iterator(ret.second));
    }
 
-   BOOST_CONTAINER_FORCEINLINE void rebalance()
+   inline void rebalance()
    {  intrusive_tree_proxy_t::rebalance(this->icont());   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const tree& x, const tree& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const tree& x, const tree& y)
    {  return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const tree& x, const tree& y)
    {  return !(x == y);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const tree& x, const tree& y)
    {  return y < x;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const tree& x, const tree& y)
    {  return !(y < x);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const tree& x, const tree& y)
    {  return !(x < y);  }
 
-   BOOST_CONTAINER_FORCEINLINE friend void swap(tree& x, tree& y)
+   inline friend void swap(tree& x, tree& y)
       BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
                                  && boost::container::dtl::is_nothrow_swappable<Compare>::value )
    {  x.swap(y);  }
@@ -1425,9 +1462,10 @@ struct has_trivial_destructor_after_move
 {
    typedef typename ::boost::container::dtl::tree<T, KeyOfValue, Compare, Allocator, Options>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
-                             ::boost::has_trivial_destructor_after_move<pointer>::value &&
-                             ::boost::has_trivial_destructor_after_move<Compare>::value;
+   BOOST_STATIC_CONSTEXPR bool value =
+      ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+      ::boost::has_trivial_destructor_after_move<pointer>::value &&
+      ::boost::has_trivial_destructor_after_move<Compare>::value;
 };
 
 } //namespace boost  {
diff --git a/inst/include/boost/container/detail/value_init.hpp b/inst/include/boost/container/detail/value_init.hpp
index 35b0aa11d..08a1f8412 100644
--- a/inst/include/boost/container/detail/value_init.hpp
+++ b/inst/include/boost/container/detail/value_init.hpp
@@ -31,13 +31,13 @@ namespace dtl {
 template<class T>
 struct value_init
 {
-   value_init()
+   BOOST_CONTAINER_FORCEINLINE value_init()
       : m_t()
    {}
 
-   operator T &() { return m_t; }
+   BOOST_CONTAINER_FORCEINLINE operator T &() { return m_t; }
 
-   T &get() { return m_t; }
+   BOOST_CONTAINER_FORCEINLINE T &get() { return m_t; }
 
    T m_t;
 };
diff --git a/inst/include/boost/container/detail/version_type.hpp b/inst/include/boost/container/detail/version_type.hpp
index 389606a56..e02244ac8 100644
--- a/inst/include/boost/container/detail/version_type.hpp
+++ b/inst/include/boost/container/detail/version_type.hpp
@@ -57,20 +57,20 @@ struct has_version
    template <class U> static two test(...);
    template <class U> static char test(const typename U::version*);
    public:
-   static const bool value = sizeof(test<T>(0)) == 1;
+   BOOST_STATIC_CONSTEXPR bool value = sizeof(test<T>(0)) == 1;
    void dummy(){}
 };
 
 template <class T, bool = has_version<T>::value>
 struct version
 {
-   static const unsigned value = 1;
+   BOOST_STATIC_CONSTEXPR unsigned value = 1;
 };
 
 template <class T>
 struct version<T, true>
 {
-   static const unsigned value = extract_version<T>::type::value;
+   BOOST_STATIC_CONSTEXPR unsigned value = extract_version<T>::type::value;
 };
 
 }  //namespace impl
@@ -83,7 +83,7 @@ struct version
 template<class T, unsigned N>
 struct is_version
 {
-   static const bool value =
+   BOOST_STATIC_CONSTEXPR bool value =
       is_same< typename version<T>::type, integral_constant<unsigned, N> >::value;
 };
 
diff --git a/inst/include/boost/container/detail/workaround.hpp b/inst/include/boost/container/detail/workaround.hpp
index 64daa0c1d..055cf24d3 100644
--- a/inst/include/boost/container/detail/workaround.hpp
+++ b/inst/include/boost/container/detail/workaround.hpp
@@ -101,8 +101,11 @@
 #elif defined(BOOST_MSVC) && (_MSC_VER <= 1900 || defined(_DEBUG))
    //"__forceinline" and MSVC seems to have some bugs in old versions and in debug mode
    #define BOOST_CONTAINER_FORCEINLINE inline
-#elif defined(BOOST_GCC) && ((__GNUC__ <= 5) || defined(__MINGW32__))
+#elif defined(BOOST_CLANG) || (defined(BOOST_GCC) && ((__GNUC__ <= 5) || defined(__MINGW32__)))
    //Older GCCs and MinGw have problems with forceinline
+   //Clang can have code bloat issues with forceinline, see
+   //https://lists.boost.org/boost-users/2023/04/91445.php and
+   //https://github.com/llvm/llvm-project/issues/62202
    #define BOOST_CONTAINER_FORCEINLINE inline
 #else
    #define BOOST_CONTAINER_FORCEINLINE BOOST_FORCEINLINE
@@ -187,4 +190,56 @@ BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore(T1 const&)
 #    define BOOST_CONTAINER_CATCH_END }
 #endif
 
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
+#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
+#     define BOOST_CONTAINER_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__)
+#  else
+#     define BOOST_CONTAINER_STATIC_ASSERT( B ) static_assert(B, #B)
+#  endif
+#else
+namespace boost {
+   namespace container {
+      namespace dtl {
+
+         template<bool B>
+         struct STATIC_ASSERTION_FAILURE;
+
+         template<>
+         struct STATIC_ASSERTION_FAILURE<true> {};
+
+         template<unsigned> struct static_assert_test {};
+
+      }
+   }
+}
+
+#define BOOST_CONTAINER_STATIC_ASSERT(B) \
+         typedef ::boost::container::dtl::static_assert_test<\
+            (unsigned)sizeof(::boost::container::dtl::STATIC_ASSERTION_FAILURE<bool(B)>)>\
+               BOOST_JOIN(boost_container_static_assert_typedef_, __LINE__) BOOST_ATTRIBUTE_UNUSED
+
+#endif
+
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
+#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
+#     define BOOST_CONTAINER_STATIC_ASSERT_MSG( ... ) static_assert(__VA_ARGS__)
+#  else
+#     define BOOST_CONTAINER_STATIC_ASSERT_MSG( B, Msg ) static_assert( B, Msg )
+#  endif
+#else
+#     define BOOST_CONTAINER_STATIC_ASSERT_MSG( B, Msg ) BOOST_CONTAINER_STATIC_ASSERT( B )
+#endif
+
+#if !defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+#  define BOOST_CONTAINER_CONSTANT_VAR BOOST_INLINE_CONSTEXPR
+#else
+#  define BOOST_CONTAINER_CONSTANT_VAR static BOOST_CONSTEXPR_OR_CONST
+#endif
+
+#if defined(__GNUC__) && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40600)
+#define BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED
+#elif defined(__clang__)
+#define BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED
+#endif
+
 #endif   //#ifndef BOOST_CONTAINER_DETAIL_WORKAROUND_HPP
diff --git a/inst/include/boost/container/devector.hpp b/inst/include/boost/container/devector.hpp
index eac5b7995..59581a3ea 100644
--- a/inst/include/boost/container/devector.hpp
+++ b/inst/include/boost/container/devector.hpp
@@ -46,7 +46,6 @@
 #include <boost/move/utility_core.hpp>
 #include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/move/algo/detail/merge.hpp>
-#include <boost/move/detail/force_ptr.hpp>
 
 //std
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -148,7 +147,7 @@ class devector
    typedef typename get_devector_opt<Options, alloc_size_type>::type             options_type;
    typedef typename options_type::growth_factor_type                             growth_factor_type;
    typedef typename options_type::stored_size_type                               stored_size_type;
-   static const std::size_t devector_min_free_fraction =
+   BOOST_STATIC_CONSTEXPR std::size_t devector_min_free_fraction =
       options_type::free_fraction;
 
    #endif // ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -174,6 +173,11 @@ class devector
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
+
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits<allocator_type>::value_type>::value));
+
    BOOST_COPYABLE_AND_MOVABLE(devector)
 
    // Guard to deallocate buffer on exception
@@ -508,25 +512,26 @@ class devector
    * [propagate_on_container_copy_assignment]: http://en.cppreference.com/w/cpp/memory/allocator_traits
    */
 
-   BOOST_CONTAINER_FORCEINLINE devector& operator=(BOOST_COPY_ASSIGN_REF(devector) rhs)
+   inline devector& operator=(BOOST_COPY_ASSIGN_REF(devector) rhs)
    {
       const devector &x = rhs;
       if (this == &x) { return *this; } // skip self
 
-      BOOST_IF_CONSTEXPR(allocator_traits_type::propagate_on_container_copy_assignment::value)
+      const bool do_propagate = allocator_traits_type::propagate_on_container_copy_assignment::value;
+      BOOST_IF_CONSTEXPR(do_propagate)
       {
-            allocator_type &this_alloc = this->get_allocator_ref();
-            const allocator_type &other_alloc = x.get_allocator_ref();
-            if (this_alloc != other_alloc)
-            {
-               // new allocator cannot free existing storage
-               this->clear();
-               this->deallocate_buffer();
-               m_.capacity = 0u;
-               m_.buffer = pointer();
-            }
-
-            this_alloc = other_alloc;
+         allocator_type &this_alloc = this->get_allocator_ref();
+         const allocator_type &other_alloc = x.get_allocator_ref();
+         if (this_alloc != other_alloc)
+         {
+            // new allocator cannot free existing storage
+            this->clear();
+            this->deallocate_buffer();
+            m_.capacity = 0u;
+            m_.buffer = pointer();
+         }
+         dtl::bool_<do_propagate> flag;
+         dtl::assign_alloc(this_alloc, other_alloc, flag);
       }
 
       size_type n = x.size();
@@ -566,53 +571,16 @@ class devector
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_move_assignment::value
                                  || allocator_traits_type::is_always_equal::value)
    {
-      BOOST_CONSTEXPR_OR_CONST bool copy_alloc = allocator_traits_type::propagate_on_container_move_assignment::value;
-
-      BOOST_IF_CONSTEXPR (copy_alloc || get_allocator_ref() == x.get_allocator_ref())
-      {
-         this->clear();
-         this->deallocate_buffer();
-
-         if (copy_alloc)
-         {
-            this->get_allocator_ref() = boost::move(x.get_allocator_ref());
-         }
-
-         m_.capacity = x.m_.capacity;
-         m_.buffer = x.m_.buffer;
-         m_.front_idx = x.m_.front_idx;
-         m_.back_idx = x.m_.back_idx;
-
-         // leave x in valid state
-         x.m_.capacity = 0u;
-         x.m_.buffer = pointer();
-         x.m_.back_idx = x.m_.front_idx = 0;
+      if (BOOST_LIKELY(this != &x)) {
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            = allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
-      else
-      {
-         // if the allocator shouldn't be copied and they do not compare equal
-         // we can't steal memory.
-
-         move_iterator<iterator> xbegin = boost::make_move_iterator(x.begin());
-         move_iterator<iterator> xend = boost::make_move_iterator(x.end());
-
-         if (copy_alloc)
-         {
-            get_allocator_ref() = boost::move(x.get_allocator_ref());
-         }
-
-         if (m_.capacity >= x.size())
-         {
-            overwrite_buffer(xbegin, xend);
-         }
-         else
-         {
-            allocate_and_copy_range(xbegin, xend);
-         }
-      }
-
       BOOST_ASSERT(invariants_ok());
-
       return *this;
    }
 
@@ -636,7 +604,7 @@ class devector
    * [CopyInsertable]: http://en.cppreference.com/w/cpp/concept/CopyInsertable
    * [CopyAssignable]: http://en.cppreference.com/w/cpp/concept/CopyAssignable
    */
-   BOOST_CONTAINER_FORCEINLINE devector& operator=(std::initializer_list<T> il)
+   inline devector& operator=(std::initializer_list<T> il)
    {
       this->assign(il.begin(), il.end());
       return *this;
@@ -733,7 +701,7 @@ class devector
     * [CopyInsertable]: http://en.cppreference.com/w/cpp/concept/CopyInsertable
     * [CopyAssignable]: http://en.cppreference.com/w/cpp/concept/CopyAssignable
     */
-   BOOST_CONTAINER_FORCEINLINE void assign(size_type n, const T& u)
+   inline void assign(size_type n, const T& u)
    {
       cvalue_iterator first(u, n);
       cvalue_iterator last;
@@ -742,7 +710,7 @@ class devector
 
     #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
     /** **Equivalent to**: `assign(il.begin(), il.end())`. */
-   BOOST_CONTAINER_FORCEINLINE void assign(std::initializer_list<T> il)
+   inline void assign(std::initializer_list<T> il)
     {
          this->assign(il.begin(), il.end());
     }
@@ -753,19 +721,19 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     allocator_type get_allocator() const BOOST_NOEXCEPT
    {
       return static_cast<const allocator_type&>(m_);
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const allocator_type &get_stored_allocator() const BOOST_NOEXCEPT
    {
       return static_cast<const allocator_type&>(m_);
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
          allocator_type &get_stored_allocator() BOOST_NOEXCEPT
    {
       return static_cast<allocator_type&>(m_);
@@ -779,7 +747,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
          iterator begin() BOOST_NOEXCEPT
    {
       return m_.buffer + m_.front_idx;
@@ -791,7 +759,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_iterator begin() const BOOST_NOEXCEPT
    {
       return m_.buffer + m_.front_idx;
@@ -802,7 +770,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
          iterator end() BOOST_NOEXCEPT
    {
       return m_.buffer + m_.back_idx;
@@ -813,7 +781,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_iterator end() const BOOST_NOEXCEPT
    {
       return m_.buffer + m_.back_idx;
@@ -825,7 +793,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     reverse_iterator rbegin() BOOST_NOEXCEPT
    {
       return reverse_iterator(m_.buffer + m_.back_idx);
@@ -838,7 +806,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_reverse_iterator rbegin() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.back_idx);
@@ -850,7 +818,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     reverse_iterator rend() BOOST_NOEXCEPT
    {
       return reverse_iterator(m_.buffer + m_.front_idx);
@@ -862,7 +830,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_reverse_iterator rend() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.front_idx);
@@ -874,7 +842,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_iterator cbegin() const BOOST_NOEXCEPT
    {
       return m_.buffer + m_.front_idx;
@@ -897,7 +865,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_reverse_iterator crbegin() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.back_idx);
@@ -909,7 +877,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     const_reverse_iterator crend() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.front_idx);
@@ -922,7 +890,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     bool empty() const BOOST_NOEXCEPT
    {
       return m_.front_idx == m_.back_idx;
@@ -933,7 +901,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     size_type size() const BOOST_NOEXCEPT
    {
       return size_type(m_.back_idx - m_.front_idx);
@@ -944,7 +912,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     size_type max_size() const BOOST_NOEXCEPT
    {
       size_type alloc_max = allocator_traits_type::max_size(get_allocator_ref());
@@ -961,7 +929,7 @@ class devector
    * 
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type capacity() const BOOST_NOEXCEPT
    {
       size_type const cap_reserve = m_.capacity/devector_min_free_fraction;
@@ -974,7 +942,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type front_free_capacity() const BOOST_NOEXCEPT
    {
       return m_.front_idx;
@@ -986,7 +954,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
     size_type back_free_capacity() const BOOST_NOEXCEPT
    {
       return size_type(m_.capacity - m_.back_idx);
@@ -1009,7 +977,7 @@ class devector
    * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
    * [DefaultConstructible]: http://en.cppreference.com/w/cpp/concept/DefaultConstructible
    */
-   BOOST_CONTAINER_FORCEINLINE void resize(size_type sz)
+   inline void resize(size_type sz)
    {
       this->resize_back(sz);
    }
@@ -1018,7 +986,7 @@ class devector
     * **Effects**: Same as resize(sz) but creates default-initialized
     * value-initialized.
     */
-   BOOST_CONTAINER_FORCEINLINE void resize(size_type sz, default_init_t)
+   inline void resize(size_type sz, default_init_t)
    {
       this->resize_back(sz, default_init);
    }
@@ -1039,7 +1007,7 @@ class devector
    *
    * **Complexity**: Linear in the size of `*this` and `sz`.
    */
-   BOOST_CONTAINER_FORCEINLINE void resize(size_type sz, const T& c)
+   inline void resize(size_type sz, const T& c)
    {
       this->resize_back(sz, c);
    }
@@ -1062,7 +1030,7 @@ class devector
     * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
     * [DefaultConstructible]: http://en.cppreference.com/w/cpp/concept/DefaultConstructible
     */
-   BOOST_CONTAINER_FORCEINLINE void resize_front(size_type sz)
+   inline void resize_front(size_type sz)
    {
       resize_front_impl(sz);
       BOOST_ASSERT(invariants_ok());
@@ -1085,7 +1053,7 @@ class devector
     *
     * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
     */
-   BOOST_CONTAINER_FORCEINLINE void resize_front(size_type sz, default_init_t)
+   inline void resize_front(size_type sz, default_init_t)
    {
       resize_front_impl(sz, default_init);
       BOOST_ASSERT(invariants_ok());
@@ -1108,7 +1076,7 @@ class devector
     *
     * **Complexity**: Linear in the size of `*this` and `sz`.
     */
-   BOOST_CONTAINER_FORCEINLINE void resize_front(size_type sz, const T& c)
+   inline void resize_front(size_type sz, const T& c)
    {
       resize_front_impl(sz, c);
       BOOST_ASSERT(invariants_ok());
@@ -1132,7 +1100,7 @@ class devector
     * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
     * [DefaultConstructible]: http://en.cppreference.com/w/cpp/concept/DefaultConstructible
     */
-   BOOST_CONTAINER_FORCEINLINE void resize_back(size_type sz)
+   inline void resize_back(size_type sz)
    {
       resize_back_impl(sz);
       BOOST_ASSERT(invariants_ok());
@@ -1155,7 +1123,7 @@ class devector
     *
     * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
     */
-   BOOST_CONTAINER_FORCEINLINE void resize_back(size_type sz, default_init_t)
+   inline void resize_back(size_type sz, default_init_t)
    {
       resize_back_impl(sz, default_init);
       BOOST_ASSERT(invariants_ok());
@@ -1177,7 +1145,7 @@ class devector
     *
     * **Complexity**: Linear in the size of `*this` and `sz`.
     */
-   BOOST_CONTAINER_FORCEINLINE void resize_back(size_type sz, const T& c)
+   inline void resize_back(size_type sz, const T& c)
    {
       resize_back_impl(sz, c);
       BOOST_ASSERT(invariants_ok());
@@ -1199,7 +1167,7 @@ class devector
     *
     * **Throws**: length_error if `new_capacity > max_size()`.
     */
-   BOOST_CONTAINER_FORCEINLINE void reserve(size_type new_capacity)
+   inline void reserve(size_type new_capacity)
    {
       if (this->capacity() < new_capacity) {
          const size_type rounder = devector_min_free_fraction - 2u;
@@ -1228,7 +1196,7 @@ class devector
     *
     * **Throws**: `length_error` if `new_capacity > max_size()`.
     */
-   BOOST_CONTAINER_FORCEINLINE void reserve_front(size_type new_capacity)
+   inline void reserve_front(size_type new_capacity)
    {
       if (front_capacity() >= new_capacity) { return; }
 
@@ -1253,7 +1221,7 @@ class devector
     *
     * **Throws**: length_error if `new_capacity > max_size()`.
     */
-   BOOST_CONTAINER_FORCEINLINE void reserve_back(size_type new_capacity)
+   inline void reserve_back(size_type new_capacity)
    {
       if (back_capacity() >= new_capacity) { return; }
 
@@ -1274,7 +1242,7 @@ class devector
     *
     * **Complexity**: Linear in the size of *this.
     */
-   BOOST_CONTAINER_FORCEINLINE void shrink_to_fit()
+   inline void shrink_to_fit()
    {
       if(this->front_capacity() || this->back_capacity())
             this->reallocate_at(size(), 0);
@@ -1289,7 +1257,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    reference operator[](size_type n) BOOST_NOEXCEPT
    {
       BOOST_ASSERT(n < size());
@@ -1303,13 +1271,85 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_reference operator[](size_type n) const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(n < size());
       return m_.buffer[m_.front_idx + n];
    }
 
+   //! <b>Requires</b>: size() >= n.
+   //!
+   //! <b>Effects</b>: Returns an iterator to the nth element
+   //!   from the beginning of the container. Returns end()
+   //!   if n == size().
+   //!
+   //! <b>Throws</b>: Nothing.
+   //!
+   //! <b>Complexity</b>: Constant.
+   //!
+   //! <b>Note</b>: Non-standard extension
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(n <= size());
+      return iterator(m_.buffer + (m_.front_idx + n));
+   }
+
+   //! <b>Requires</b>: size() >= n.
+   //!
+   //! <b>Effects</b>: Returns a const_iterator to the nth element
+   //!   from the beginning of the container. Returns end()
+   //!   if n == size().
+   //!
+   //! <b>Throws</b>: Nothing.
+   //!
+   //! <b>Complexity</b>: Constant.
+   //!
+   //! <b>Note</b>: Non-standard extension
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(n <= size());
+      return const_iterator(m_.buffer + (m_.front_idx + n));
+   }
+
+   //! <b>Requires</b>: begin() <= p <= end().
+   //!
+   //! <b>Effects</b>: Returns the index of the element pointed by p
+   //!   and size() if p == end().
+   //!
+   //! <b>Throws</b>: Nothing.
+   //!
+   //! <b>Complexity</b>: Constant.
+   //!
+   //! <b>Note</b>: Non-standard extension
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(p >= begin());
+      BOOST_ASSERT(p <= end());
+      return static_cast<size_type>(p - this->begin());
+   }
+
+   //! <b>Requires</b>: begin() <= p <= end().
+   //!
+   //! <b>Effects</b>: Returns the index of the element pointed by p
+   //!   and size() if p == end().
+   //!
+   //! <b>Throws</b>: Nothing.
+   //!
+   //! <b>Complexity</b>: Constant.
+   //!
+   //! <b>Note</b>: Non-standard extension
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
+   {
+      BOOST_ASSERT(p >= cbegin());
+      BOOST_ASSERT(p <= cend());
+      return static_cast<size_type>(p - this->cbegin());
+   }
+
    /**
    * **Returns**: A reference to the `n`th element in the devector.
    *
@@ -1317,7 +1357,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference at(size_type n)
    {
       if (size() <= n)
@@ -1332,7 +1372,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference at(size_type n) const
    {
       if (size() <= n)
@@ -1347,7 +1387,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference front() BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1362,7 +1402,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference front() const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1377,7 +1417,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference back() BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1392,7 +1432,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference back() const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1407,7 +1447,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       T* data() BOOST_NOEXCEPT
    {
       return boost::movelib::to_raw_pointer(m_.buffer) + m_.front_idx;
@@ -1420,7 +1460,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const T* data() const BOOST_NOEXCEPT
    {
       return boost::movelib::to_raw_pointer(m_.buffer) + m_.front_idx;
@@ -1467,7 +1507,7 @@ class devector
 
    #define BOOST_CONTAINER_DEVECTOR_EMPLACE_FRONT(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE reference emplace_front(BOOST_MOVE_UREF##N)\
+   inline reference emplace_front(BOOST_MOVE_UREF##N)\
    {\
       if (front_free_capacity())\
       {\
@@ -1562,7 +1602,7 @@ class devector
    */
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE reference emplace_back(Args&&... args)
+   inline reference emplace_back(Args&&... args)
    {
       if (BOOST_LIKELY(this->back_free_capacity() != 0)){
          pointer const p = m_.buffer + m_.back_idx;
@@ -1581,7 +1621,7 @@ class devector
 
    #define BOOST_CONTAINER_DEVECTOR_EMPLACE_BACK(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE reference emplace_back(BOOST_MOVE_UREF##N)\
+   inline reference emplace_back(BOOST_MOVE_UREF##N)\
    {\
       if (this->back_free_capacity()){\
          pointer const p = m_.buffer + m_.back_idx;\
@@ -1855,7 +1895,7 @@ class devector
    * [CopyInsertable]: http://en.cppreference.com/w/cpp/concept/CopyInsertable
    * [CopyAssignable]: http://en.cppreference.com/w/cpp/concept/CopyAssignable
    */
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator position, size_type n, const T& x)
+   inline iterator insert(const_iterator position, size_type n, const T& x)
    {
       cvalue_iterator first(x, n);
       cvalue_iterator last = first + n;
@@ -1928,7 +1968,7 @@ class devector
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    template <class ForwardIterator>
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator position, ForwardIterator first, ForwardIterator last
+   inline iterator insert(const_iterator position, ForwardIterator first, ForwardIterator last
       //Other iterators
       BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_or
             < void
@@ -1944,7 +1984,7 @@ class devector
 
    #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    /** **Equivalent to**: `insert(position, il.begin(), il.end())` */
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator position, std::initializer_list<T> il)
+   inline iterator insert(const_iterator position, std::initializer_list<T> il)
    {
       return this->insert(position, il.begin(), il.end());
    }
@@ -2106,117 +2146,186 @@ class devector
       m_.front_idx = m_.back_idx = 0;
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const devector& x, const devector& y)
    {   return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const devector& x, const devector& y)
    {   return !(x == y); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator< (const devector& x, const devector& y)
    {   return boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const devector& x, const devector& y)
    {   return y < x;   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const devector& x, const devector& y)
    {   return !(y < x);   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const devector& x, const devector& y)
    {   return !(x < y);   }
 
-   BOOST_CONTAINER_FORCEINLINE friend void swap(devector& x, devector& y)
+   inline friend void swap(devector& x, devector& y)
       BOOST_NOEXCEPT_IF( allocator_traits_type::propagate_on_container_swap::value
                                  || allocator_traits_type::is_always_equal::value)
    {   x.swap(y);   }
 
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+
+   //Functions for optimizations, not for users
+   T *unused_storage(size_type &sz)
+   {
+      T *const storage_addr = boost::movelib::to_raw_pointer(m_.buffer);
+      if(this->empty()){
+         sz = m_.capacity;
+         return storage_addr;
+      }
+      else if(this->back_free_capacity() > this->front_free_capacity()){
+         sz = this->back_free_capacity();
+         return storage_addr + m_.back_idx;
+      }
+      else{
+         sz = this->front_free_capacity();
+         return storage_addr;
+      }
+   }
+
+   #endif
+
    private:
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   void priv_move_assign(BOOST_RV_REF(devector) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      this->clear();
+      this->deallocate_buffer();
+
+      //Move allocator if needed
+      dtl::bool_<allocator_traits_type::
+         propagate_on_container_move_assignment::value> flag;
+      dtl::move_alloc(this->get_allocator_ref(), x.get_allocator_ref(), flag);
+
+      m_.capacity = x.m_.capacity;
+      m_.buffer = x.m_.buffer;
+      m_.front_idx = x.m_.front_idx;
+      m_.back_idx = x.m_.back_idx;
+
+      // leave x in valid state
+      x.m_.capacity = 0u;
+      x.m_.buffer = pointer();
+      x.m_.back_idx = x.m_.front_idx = 0;
+   }
+
+   void priv_move_assign(BOOST_RV_REF(devector) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (get_allocator_ref() == x.get_allocator_ref()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         // We can't steal memory.
+         move_iterator<iterator> xbegin = boost::make_move_iterator(x.begin());
+         move_iterator<iterator> xend = boost::make_move_iterator(x.end());
+
+         //Move allocator if needed
+         dtl::bool_<allocator_traits_type::
+            propagate_on_container_move_assignment::value> flag;
+         dtl::move_alloc(this->get_allocator_ref(), x.get_allocator_ref(), flag);
+
+         if (m_.capacity >= x.size()) {
+            overwrite_buffer(xbegin, xend);
+         }
+         else {
+            allocate_and_copy_range(xbegin, xend);
+         }
+      }
+   }
+
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type pos_to_index(const_iterator i) const 
    {
       return static_cast<size_type>(i - cbegin());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    bool should_move_back(const_iterator i) const 
    {
       return static_cast<size_type>(this->pos_to_index(i)) >= this->size()/2u;
    }
 
-   BOOST_CONTAINER_FORCEINLINE static iterator unconst_iterator(const_iterator i)
+   inline static iterator unconst_iterator(const_iterator i)
    {
       return boost::intrusive::pointer_traits<pointer>::const_cast_from(i);
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type front_capacity() const
+   inline size_type front_capacity() const
    {
       return m_.back_idx;
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type back_capacity() const
+   inline size_type back_capacity() const
    {
       return size_type(m_.capacity - m_.front_idx);
    }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
-   BOOST_CONTAINER_FORCEINLINE T* priv_raw_begin() BOOST_NOEXCEPT
+   inline T* priv_raw_begin() BOOST_NOEXCEPT
    {   return boost::movelib::to_raw_pointer(m_.buffer) + m_.front_idx;   }
 
-   BOOST_CONTAINER_FORCEINLINE T* priv_raw_end() BOOST_NOEXCEPT
+   inline T* priv_raw_end() BOOST_NOEXCEPT
    {   return boost::movelib::to_raw_pointer(m_.buffer) + m_.back_idx;    }
 
 
    template <class U>
-   BOOST_CONTAINER_FORCEINLINE void priv_push_front(BOOST_FWD_REF(U) u)
+   inline void priv_push_front(BOOST_FWD_REF(U) u)
    {
       this->emplace_front(boost::forward<U>(u));
    }
 
    template <class U>
-   BOOST_CONTAINER_FORCEINLINE void priv_push_back(BOOST_FWD_REF(U) u)
+   inline void priv_push_back(BOOST_FWD_REF(U) u)
    {
       this->emplace_back(boost::forward<U>(u));
    }
 
    template <class U>
-   BOOST_CONTAINER_FORCEINLINE iterator priv_insert(const_iterator pos, BOOST_FWD_REF(U) u)
+   inline iterator priv_insert(const_iterator pos, BOOST_FWD_REF(U) u)
    {
       return this->emplace(pos, boost::forward<U>(u));
    }
 
    // allocator_type wrappers
 
-   BOOST_CONTAINER_FORCEINLINE allocator_type& get_allocator_ref() BOOST_NOEXCEPT
+   inline allocator_type& get_allocator_ref() BOOST_NOEXCEPT
    {
       return static_cast<allocator_type&>(m_);
    }
 
-   BOOST_CONTAINER_FORCEINLINE const allocator_type& get_allocator_ref() const BOOST_NOEXCEPT
+   inline const allocator_type& get_allocator_ref() const BOOST_NOEXCEPT
    {
       return static_cast<const allocator_type&>(m_);
    }
 
-   pointer allocate(size_type capacity)
+   pointer allocate(size_type cap)
    {
-      pointer const p = impl::do_allocate(get_allocator_ref(), capacity);
+      pointer const p = impl::do_allocate(get_allocator_ref(), cap);
       #ifdef BOOST_CONTAINER_DEVECTOR_ALLOC_STATS
       ++m_.capacity_alloc_count;
       #endif // BOOST_CONTAINER_DEVECTOR_ALLOC_STATS
       return p;
    }
 
-   void destroy_elements(pointer begin, pointer end)
+   void destroy_elements(pointer b, pointer e)
    {
-      for (; begin != end; ++begin)
+      for (; b != e; ++b)
       {
-         allocator_traits_type::destroy(get_allocator_ref(), boost::movelib::to_raw_pointer(begin));
+         allocator_traits_type::destroy(get_allocator_ref(), boost::movelib::to_raw_pointer(b));
       }
    }
 
@@ -2230,7 +2339,7 @@ class devector
 
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <typename... Args>
-   BOOST_CONTAINER_FORCEINLINE void alloc_construct(pointer dst, Args&&... args)
+   inline void alloc_construct(pointer dst, Args&&... args)
    {
       allocator_traits_type::construct(
             get_allocator_ref(),
@@ -2260,7 +2369,7 @@ class devector
 
    #define BOOST_CONTAINER_DEVECTOR_ALLOC_CONSTRUCT(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE void alloc_construct(pointer dst BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline void alloc_construct(pointer dst BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       allocator_traits_type::construct(\
             get_allocator_ref(), boost::movelib::to_raw_pointer(dst) BOOST_MOVE_I##N BOOST_MOVE_FWD##N );\
@@ -2318,10 +2427,10 @@ class devector
    }
 
    template <typename Guard>
-   void opt_move_or_copy(pointer begin, pointer end, pointer dst, Guard& guard)
+   void opt_move_or_copy(pointer b, pointer e, pointer dst, Guard& guard)
    {
       // if trivial copy and default allocator, memcpy
-      boost::container::uninitialized_move_alloc(get_allocator_ref(), begin, end, dst);
+      boost::container::uninitialized_move_alloc(get_allocator_ref(), b, e, dst);
       guard.extend();
    }
 
@@ -2653,10 +2762,7 @@ class devector
       size_type const cap = m_.capacity;
       //Test if enough free memory would be left
       if (free_cap >= n && (free_cap - n) >= cap/devector_min_free_fraction) {
-         //Make sure relocation is happening because there was no enough space
          size_type const old_size = this->size();
-         BOOST_ASSERT(should_move_back(p) ? (back_free_cap < n) : (front_free_cap < n));
-
          T* const raw_pos = const_cast<T*>(boost::movelib::to_raw_pointer(p));
          size_type const new_size = old_size + n;
          size_type const new_front_idx = (cap - new_size) / 2u;
@@ -2703,10 +2809,10 @@ class devector
 
 
    template <typename Iterator>
-   void construct_from_range(Iterator begin, Iterator end)
+   void construct_from_range(Iterator b, Iterator e)
    {
       allocation_guard buffer_guard(m_.buffer, m_.capacity, get_allocator_ref());
-      boost::container::uninitialized_copy_alloc(get_allocator_ref(), begin, end, m_.buffer);
+      boost::container::uninitialized_copy_alloc(get_allocator_ref(), b, e, m_.buffer);
       buffer_guard.release();
    }
 
@@ -2783,7 +2889,7 @@ class devector
    }
 
    template <typename ForwardIterator>
-   BOOST_CONTAINER_FORCEINLINE void overwrite_buffer(ForwardIterator first, ForwardIterator last)
+   inline void overwrite_buffer(ForwardIterator first, ForwardIterator last)
    {
       this->overwrite_buffer_impl(first, last, 
             dtl::bool_<dtl::is_trivially_destructible<T>::value>());
@@ -2894,17 +3000,17 @@ class devector
          i.back_idx = 0;
       }
 
-      BOOST_CONTAINER_FORCEINLINE void set_back_idx(size_type bi)
+      inline void set_back_idx(size_type bi)
       {
          back_idx = static_cast<stored_size_type>(bi);
       }
 
-      BOOST_CONTAINER_FORCEINLINE void set_front_idx(size_type fi)
+      inline void set_front_idx(size_type fi)
       {
          front_idx = static_cast<stored_size_type>(fi);
       }
 
-      BOOST_CONTAINER_FORCEINLINE void set_capacity(size_type c)
+      inline void set_capacity(size_type c)
       {
          capacity = static_cast<stored_size_type>(c);
       }
@@ -2948,8 +3054,9 @@ struct has_trivial_destructor_after_move<boost::container::devector<T, Allocator
 {
     typedef typename boost::container::devector<T, Allocator, Options>::allocator_type allocator_type;
     typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-    static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
-                                           ::boost::has_trivial_destructor_after_move<pointer>::value;
+    BOOST_STATIC_CONSTEXPR bool value =
+      ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+      ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
 }
diff --git a/inst/include/boost/container/flat_map.hpp b/inst/include/boost/container/flat_map.hpp
index cd86255f5..8ec402c63 100644
--- a/inst/include/boost/container/flat_map.hpp
+++ b/inst/include/boost/container/flat_map.hpp
@@ -31,6 +31,7 @@
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/algorithm.hpp> //equal()
 #include <boost/container/detail/container_or_allocator_rebind.hpp>
+#include <boost/container/detail/pair.hpp>
 // move
 #include <boost/move/utility_core.hpp>
 #include <boost/move/traits.hpp>
@@ -44,10 +45,22 @@
 #include <boost/intrusive/detail/minimal_pair_header.hpp>      //pair
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>//less, equal
 
+
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
 #endif
 
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#define BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+#endif
+
+//for C++03 compilers, were type-puning is the only option for std::pair
+//disable strict aliasing to reduce problems.
+#if defined(BOOST_GCC) && (BOOST_GCC >= 100000) && !defined(BOOST_CONTAINER_STD_PAIR_IS_MOVABLE)
+#pragma GCC push_options
+#pragma GCC optimize("no-strict-aliasing")
+#endif
+
 namespace boost {
 namespace container {
 
@@ -58,21 +71,37 @@ class flat_multimap;
 
 namespace dtl{
 
+#if defined(BOOST_CONTAINER_STD_PAIR_IS_MOVABLE)
+template<class D, class S>
+BOOST_CONTAINER_FORCEINLINE static D &force(S &s)
+{  return s; }
+
+template<class D, class S>
+BOOST_CONTAINER_FORCEINLINE static const D &force(const S &s)
+{  return s; }
+
+template<class D>
+BOOST_CONTAINER_FORCEINLINE static D force_copy(D s)
+{  return s; }
+
+#else //!BOOST_CONTAINER_DOXYGEN_INVOKED
+
 template<class D, class S>
 BOOST_CONTAINER_FORCEINLINE static D &force(S &s)
-{  return *move_detail::force_ptr<D*>(&s); }
+{  return *move_detail::launder_cast<D*>(&s); }
 
 template<class D, class S>
 BOOST_CONTAINER_FORCEINLINE static const D &force(const S &s)
-{  return *move_detail::force_ptr<const D*>(&s); }
+{  return *move_detail::launder_cast<const D*>(&s); }
 
 template<class D, class S>
 BOOST_CONTAINER_FORCEINLINE static D force_copy(const S &s)
 {
-   const D *const vp = move_detail::force_ptr<const D *>(&s);
+   const D *const vp = move_detail::launder_cast<const D *>(&s);
    D ret_val(*vp);
    return ret_val;
 }
+#endif   //BOOST_CONTAINER_DOXYGEN_INVOKED
 
 }  //namespace dtl{
 
@@ -118,18 +147,30 @@ class flat_map
    private:
    BOOST_COPYABLE_AND_MOVABLE(flat_map)
    //This is the tree that we should store if pair was movable
+   typedef std::pair<Key, T> std_pair_t;
    typedef dtl::flat_tree<
-                           std::pair<Key, T>,
+                           std_pair_t,
                            dtl::select1st<Key>,
                            Compare,
                            AllocatorOrContainer> tree_t;
 
    //This is the real tree stored here. It's based on a movable pair
-   typedef dtl::flat_tree<
-                           dtl::pair<Key, T>,
+   typedef dtl::pair<Key, T> dtl_pair_t;
+
+   #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+   typedef std_pair_t impl_pair_t;
+   #else
+   typedef dtl_pair_t impl_pair_t;
+   #endif
+
+   typedef dtl::flat_tree< impl_pair_t,
                            dtl::select1st<Key>,
                            Compare,
-                           typename dtl::container_or_allocator_rebind<AllocatorOrContainer, dtl::pair<Key, T> >::type
+                           #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+                           AllocatorOrContainer
+                           #else
+                           typename dtl::container_or_allocator_rebind<AllocatorOrContainer, impl_pair_t >::type
+                           #endif
                            > impl_tree_t;
    impl_tree_t m_flat_tree;  // flat tree representing flat_map
 
@@ -154,10 +195,10 @@ class flat_map
    typedef typename impl_tree_t::stored_allocator_type   impl_stored_allocator_type;
    typedef typename impl_tree_t::sequence_type           impl_sequence_type;
 
-   BOOST_CONTAINER_FORCEINLINE impl_tree_t &tree()
+   inline impl_tree_t &tree()
    {  return m_flat_tree;  }
 
-   BOOST_CONTAINER_FORCEINLINE const impl_tree_t &tree() const
+   inline const impl_tree_t &tree() const
    {  return m_flat_tree;  }
 
    private:
@@ -198,7 +239,7 @@ class flat_map
    typedef BOOST_CONTAINER_IMPDEF(impl_value_type)                                  movable_value_type;
 
    //AllocatorOrContainer::value_type must be std::pair<Key, T>
-   BOOST_STATIC_ASSERT((dtl::is_same<std::pair<Key, T>, value_type>::value));
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<std::pair<Key, T>, value_type>::value));
 
    //////////////////////////////////////////////
    //
@@ -209,7 +250,7 @@ class flat_map
    //! <b>Effects</b>: Default constructs an empty flat_map.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE flat_map() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<AllocatorOrContainer>::value &&
+   inline flat_map() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<AllocatorOrContainer>::value &&
                                                             dtl::is_nothrow_default_constructible<Compare>::value)
       : m_flat_tree()
    {}
@@ -217,7 +258,7 @@ class flat_map
    //! <b>Effects</b>: Constructs an empty flat_map using the specified allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit flat_map(const allocator_type& a)
+   inline explicit flat_map(const allocator_type& a)
       : m_flat_tree(dtl::force<const impl_allocator_type>(a))
    {}
 
@@ -225,7 +266,7 @@ class flat_map
    //! comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit flat_map(const Compare& comp)
+   inline explicit flat_map(const Compare& comp)
       : m_flat_tree(comp)
    {}
 
@@ -233,7 +274,7 @@ class flat_map
    //! comparison object and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE flat_map(const Compare& comp, const allocator_type& a)
+   inline flat_map(const Compare& comp, const allocator_type& a)
       : m_flat_tree(comp, dtl::force<const impl_allocator_type>(a))
    {}
 
@@ -243,7 +284,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_map(InputIterator first, InputIterator last)
+   inline flat_map(InputIterator first, InputIterator last)
       : m_flat_tree(true, first, last)
    {}
 
@@ -253,7 +294,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_map(InputIterator first, InputIterator last, const allocator_type& a)
+   inline flat_map(InputIterator first, InputIterator last, const allocator_type& a)
       : m_flat_tree(true, first, last, dtl::force<const impl_allocator_type>(a))
    {}
 
@@ -263,7 +304,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_map(InputIterator first, InputIterator last, const Compare& comp)
+   inline flat_map(InputIterator first, InputIterator last, const Compare& comp)
       : m_flat_tree(true, first, last, comp)
    {}
 
@@ -273,7 +314,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_map(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline flat_map(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : m_flat_tree(true, first, last, comp, dtl::force<const impl_allocator_type>(a))
    {}
 
@@ -287,7 +328,7 @@ class flat_map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_map(ordered_unique_range_t, InputIterator first, InputIterator last)
       : m_flat_tree(ordered_range, first, last)
    {}
@@ -302,7 +343,7 @@ class flat_map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_map(ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : m_flat_tree(ordered_range, first, last, comp)
    {}
@@ -317,7 +358,7 @@ class flat_map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_map(ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : m_flat_tree(ordered_range, first, last, comp, dtl::force<const impl_allocator_type>(a))
    {}
@@ -332,7 +373,7 @@ class flat_map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       flat_map(ordered_unique_range_t, InputIterator first, InputIterator last, const allocator_type& a)
       : m_flat_tree(ordered_range, first, last, Compare(), a)
    {}
@@ -343,7 +384,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list<value_type> il)
+   inline flat_map(std::initializer_list<value_type> il)
      : m_flat_tree( true
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end())
@@ -354,7 +395,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list<value_type> il, const allocator_type& a)
+   inline flat_map(std::initializer_list<value_type> il, const allocator_type& a)
      : m_flat_tree( true
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end()
@@ -366,7 +407,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list<value_type> il, const Compare& comp)
+   inline flat_map(std::initializer_list<value_type> il, const Compare& comp)
      : m_flat_tree(true
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end()
@@ -378,7 +419,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE flat_map(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline flat_map(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
      : m_flat_tree(true
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end()
@@ -396,7 +437,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, std::initializer_list<value_type> il)
+   inline flat_map(ordered_unique_range_t, std::initializer_list<value_type> il)
      : m_flat_tree(ordered_unique_range
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end())
@@ -412,7 +453,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline flat_map(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
      : m_flat_tree(ordered_unique_range
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end()
@@ -429,7 +470,7 @@ class flat_map
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_map(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline flat_map(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
      : m_flat_tree( ordered_unique_range
                   , dtl::force<impl_initializer_list>(il).begin()
                   , dtl::force<impl_initializer_list>(il).end()
@@ -441,7 +482,7 @@ class flat_map
    //! <b>Effects</b>: Copy constructs a flat_map.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE flat_map(const flat_map& x)
+   inline flat_map(const flat_map& x)
       : m_flat_tree(x.m_flat_tree)
    {}
 
@@ -451,7 +492,7 @@ class flat_map
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE flat_map(BOOST_RV_REF(flat_map) x)
+   inline flat_map(BOOST_RV_REF(flat_map) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : m_flat_tree(boost::move(x.m_flat_tree))
    {}
@@ -459,7 +500,7 @@ class flat_map
    //! <b>Effects</b>: Copy constructs a flat_map using the specified allocator.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE flat_map(const flat_map& x, const allocator_type &a)
+   inline flat_map(const flat_map& x, const allocator_type &a)
       : m_flat_tree(x.m_flat_tree, dtl::force<const impl_allocator_type>(a))
    {}
 
@@ -467,14 +508,14 @@ class flat_map
    //!   Constructs *this using x's resources.
    //!
    //! <b>Complexity</b>: Constant if x.get_allocator() == a, linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE flat_map(BOOST_RV_REF(flat_map) x, const allocator_type &a)
+   inline flat_map(BOOST_RV_REF(flat_map) x, const allocator_type &a)
       : m_flat_tree(boost::move(x.m_flat_tree), dtl::force<const impl_allocator_type>(a))
    {}
 
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE flat_map& operator=(BOOST_COPY_ASSIGN_REF(flat_map) x)
+   inline flat_map& operator=(BOOST_COPY_ASSIGN_REF(flat_map) x)
    {  m_flat_tree = x.m_flat_tree;   return *this;  }
 
    //! <b>Effects</b>: Move constructs a flat_map.
@@ -486,7 +527,7 @@ class flat_map
    //! <b>Complexity</b>: Constant if allocator_traits_type::
    //!   propagate_on_container_move_assignment is true or
    //!   this->get>allocator() == x.get_allocator(). Linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE flat_map& operator=(BOOST_RV_REF(flat_map) x)
+   inline flat_map& operator=(BOOST_RV_REF(flat_map) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -506,7 +547,7 @@ class flat_map
    //!   was passed to the object's constructor.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<allocator_type>(m_flat_tree.get_allocator()); }
 
@@ -517,7 +558,7 @@ class flat_map
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       get_stored_allocator_noconst_return_t get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {
       impl_get_stored_allocator_noconst_return_t r = m_flat_tree.get_stored_allocator();
@@ -531,7 +572,7 @@ class flat_map
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       get_stored_allocator_const_return_t get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       impl_get_stored_allocator_const_return_t r = m_flat_tree.get_stored_allocator();
@@ -549,7 +590,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<iterator>(m_flat_tree.begin()); }
 
@@ -558,7 +599,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.begin()); }
 
@@ -567,7 +608,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<iterator>(m_flat_tree.end()); }
 
@@ -576,7 +617,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.end()); }
 
@@ -586,7 +627,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<reverse_iterator>(m_flat_tree.rbegin()); }
 
@@ -596,7 +637,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.rbegin()); }
 
@@ -606,7 +647,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<reverse_iterator>(m_flat_tree.rend()); }
 
@@ -616,7 +657,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.rend()); }
 
@@ -625,7 +666,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.cbegin()); }
 
@@ -634,7 +675,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.cend()); }
 
@@ -644,7 +685,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.crbegin()); }
 
@@ -654,7 +695,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.crend()); }
 
@@ -669,7 +710,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.empty(); }
 
@@ -678,7 +719,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.size(); }
 
@@ -687,7 +728,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.max_size(); }
 
@@ -697,7 +738,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.capacity(); }
 
@@ -711,7 +752,7 @@ class flat_map
    //!
    //! <b>Note</b>: If capacity() is less than "cnt", iterators and references to
    //!   to values might be invalidated.
-   BOOST_CONTAINER_FORCEINLINE void reserve(size_type cnt)
+   inline void reserve(size_type cnt)
       { m_flat_tree.reserve(cnt);   }
 
    //! <b>Effects</b>: Tries to deallocate the excess of memory created
@@ -720,7 +761,7 @@ class flat_map
    //! <b>Throws</b>: If memory allocation throws, or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to size().
-   BOOST_CONTAINER_FORCEINLINE void shrink_to_fit()
+   inline void shrink_to_fit()
       { m_flat_tree.shrink_to_fit(); }
 
    //////////////////////////////////////////////
@@ -747,8 +788,8 @@ class flat_map
    mapped_type &operator[](key_type &&k);
    #elif defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
       //in compilers like GCC 3.4, we can't catch temporaries
-      BOOST_CONTAINER_FORCEINLINE mapped_type& operator[](const key_type &k)         {  return this->priv_subscript(k);  }
-      BOOST_CONTAINER_FORCEINLINE mapped_type& operator[](BOOST_RV_REF(key_type) k)  {  return this->priv_subscript(::boost::move(k));  }
+      inline mapped_type& operator[](const key_type &k)         {  return this->priv_subscript(k);  }
+      inline mapped_type& operator[](BOOST_RV_REF(key_type) k)  {  return this->priv_subscript(::boost::move(k));  }
    #else
       BOOST_MOVE_CONVERSION_AWARE_CATCH( operator[] , key_type, mapped_type&, this->priv_subscript)
    #endif
@@ -766,7 +807,7 @@ class flat_map
    //!
    //! Complexity: Logarithmic search time plus linear insertion time in case no equivalent key is present.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> insert_or_assign(const key_type& k, BOOST_FWD_REF(M) obj)
+   inline std::pair<iterator, bool> insert_or_assign(const key_type& k, BOOST_FWD_REF(M) obj)
    {
       return dtl::force_copy< std::pair<iterator, bool> >
          (this->m_flat_tree.insert_or_assign
@@ -787,7 +828,7 @@ class flat_map
    //!
    //! Complexity: Logarithmic in the size of the container.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> insert_or_assign(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
+   inline std::pair<iterator, bool> insert_or_assign(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
    {
       return dtl::force_copy< std::pair<iterator, bool> >
          (this->m_flat_tree.insert_or_assign
@@ -810,7 +851,7 @@ class flat_map
    //! Complexity: Logarithmic in the size of the container in general, but amortized constant if
    //! the new element is inserted just before hint.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE iterator insert_or_assign(const_iterator hint, const key_type& k, BOOST_FWD_REF(M) obj)
+   inline iterator insert_or_assign(const_iterator hint, const key_type& k, BOOST_FWD_REF(M) obj)
    {
       return dtl::force_copy<iterator>
          (this->m_flat_tree.insert_or_assign
@@ -834,7 +875,7 @@ class flat_map
    //! Complexity: Logarithmic in the size of the container in general, but amortized constant if
    //! the new element is inserted just before hint.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE iterator insert_or_assign(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
+   inline iterator insert_or_assign(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
    {
       return dtl::force_copy<iterator>
          (this->m_flat_tree.insert_or_assign
@@ -844,22 +885,22 @@ class flat_map
    }
 
    //! @copydoc ::boost::container::flat_set::nth(size_type)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {  return dtl::force_copy<iterator>(m_flat_tree.nth(n));  }
 
    //! @copydoc ::boost::container::flat_set::nth(size_type) const
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
-   {  return dtl::force_copy<iterator>(m_flat_tree.nth(n));  }
+   {  return dtl::force_copy<const_iterator>(m_flat_tree.nth(n));  }
 
    //! @copydoc ::boost::container::flat_set::index_of(iterator)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {  return m_flat_tree.index_of(dtl::force_copy<impl_iterator>(p));  }
 
    //! @copydoc ::boost::container::flat_set::index_of(const_iterator) const
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {  return m_flat_tree.index_of(dtl::force_copy<impl_const_iterator>(p));  }
 
@@ -912,7 +953,7 @@ class flat_map
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
    {  return dtl::force_copy< std::pair<iterator, bool> >(m_flat_tree.emplace_unique(boost::forward<Args>(args)...)); }
 
    //! <b>Effects</b>: Inserts an object of type T constructed with
@@ -928,7 +969,7 @@ class flat_map
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator hint, BOOST_FWD_REF(Args)... args)
    {
       return dtl::force_copy<iterator>
          (m_flat_tree.emplace_hint_unique( dtl::force_copy<impl_const_iterator>(hint)
@@ -947,7 +988,7 @@ class flat_map
    //! 
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(const key_type& k, BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator, bool> try_emplace(const key_type& k, BOOST_FWD_REF(Args)... args)
    {
       return dtl::force_copy< std::pair<iterator, bool> >(
          m_flat_tree.try_emplace(impl_const_iterator(), k, boost::forward<Args>(args)...));
@@ -965,7 +1006,7 @@ class flat_map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if value
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, const key_type &k, BOOST_FWD_REF(Args)... args)
+   inline iterator try_emplace(const_iterator hint, const key_type &k, BOOST_FWD_REF(Args)... args)
    {
       return dtl::force_copy<iterator>(m_flat_tree.try_emplace
          (dtl::force_copy<impl_const_iterator>(hint), k, boost::forward<Args>(args)...).first);
@@ -983,7 +1024,7 @@ class flat_map
    //! 
    //! <b>Complexity</b>: Logarithmic search time plus linear insertion time in case the key is not present.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
    {
       return dtl::force_copy< std::pair<iterator, bool> >
          (m_flat_tree.try_emplace(impl_const_iterator(), boost::move(k), boost::forward<Args>(args)...));
@@ -1001,7 +1042,7 @@ class flat_map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if value
    //!   is inserted right before p. Linear insertion time in case no equivalent key is present.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
+   inline iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
    {
       return dtl::force_copy<iterator>
          (m_flat_tree.try_emplace(dtl::force_copy
@@ -1012,39 +1053,39 @@ class flat_map
 
    #define BOOST_CONTAINER_FLAT_MAP_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
    {\
       return dtl::force_copy< std::pair<iterator, bool> >\
          (m_flat_tree.emplace_unique(BOOST_MOVE_FWD##N));\
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       return dtl::force_copy<iterator>(m_flat_tree.emplace_hint_unique\
          (dtl::force_copy<impl_const_iterator>(hint) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\
    }\
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(const key_type& k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator, bool> try_emplace(const key_type& k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       return dtl::force_copy< std::pair<iterator, bool> >\
          (m_flat_tree.try_emplace(impl_const_iterator(), k BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, const key_type &k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator try_emplace(const_iterator hint, const key_type &k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return dtl::force_copy<iterator>(m_flat_tree.try_emplace\
          (dtl::force_copy<impl_const_iterator>(hint), k BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first); }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       return dtl::force_copy< std::pair<iterator, bool> >\
          (m_flat_tree.try_emplace(impl_const_iterator(), boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return dtl::force_copy<iterator>(m_flat_tree.try_emplace\
       (dtl::force_copy<impl_const_iterator>(hint), boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first); }\
    //
@@ -1064,7 +1105,7 @@ class flat_map
    //!   to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> insert(const value_type& x)
+   inline std::pair<iterator,bool> insert(const value_type& x)
    {  return dtl::force_copy<std::pair<iterator,bool> >(
          m_flat_tree.insert_unique(dtl::force<const impl_value_type>(x))); }
 
@@ -1079,7 +1120,7 @@ class flat_map
    //!   to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> insert(BOOST_RV_REF(value_type) x)
+   inline std::pair<iterator,bool> insert(BOOST_RV_REF(value_type) x)
    {
       return dtl::force_copy<std::pair<iterator,bool> >(
          m_flat_tree.insert_unique(boost::move(dtl::force<impl_value_type>(x))));
@@ -1097,9 +1138,9 @@ class flat_map
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( std::pair<iterator BOOST_MOVE_I bool>
-         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
             BOOST_MOVE_I std::pair<iterator BOOST_MOVE_I bool> >::type)
       insert(BOOST_FWD_REF(Pair) x)
    {
@@ -1118,7 +1159,7 @@ class flat_map
    //!   right before p) plus insertion linear to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const value_type& x)
+   inline iterator insert(const_iterator p, const value_type& x)
    {
       return dtl::force_copy<iterator>(
          m_flat_tree.insert_unique( dtl::force_copy<impl_const_iterator>(p)
@@ -1134,7 +1175,7 @@ class flat_map
    //!   right before p) plus insertion linear to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(value_type) x)
+   inline iterator insert(const_iterator p, BOOST_RV_REF(value_type) x)
    {
       return dtl::force_copy<iterator>
          (m_flat_tree.insert_unique( dtl::force_copy<impl_const_iterator>(p)
@@ -1151,9 +1192,9 @@ class flat_map
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( iterator
-         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
             BOOST_MOVE_I iterator>::type)
       insert(const_iterator p, BOOST_FWD_REF(Pair) x)
    {
@@ -1170,7 +1211,7 @@ class flat_map
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
    {  m_flat_tree.insert_unique(first, last);  }
 
    //! <b>Requires</b>: first, last are not iterators into *this.
@@ -1188,7 +1229,7 @@ class flat_map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_unique_range_t, InputIterator first, InputIterator last)
+   inline void insert(ordered_unique_range_t, InputIterator first, InputIterator last)
       {  m_flat_tree.insert_unique(ordered_unique_range, first, last); }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -1198,7 +1239,7 @@ class flat_map
    //! <b>Complexity</b>: N log(N).
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {
       m_flat_tree.insert_unique( dtl::force<impl_initializer_list>(il).begin()
                                , dtl::force<impl_initializer_list>(il).end());
@@ -1216,7 +1257,7 @@ class flat_map
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_unique_range_t, std::initializer_list<value_type> il)
+   inline void insert(ordered_unique_range_t, std::initializer_list<value_type> il)
    {
       m_flat_tree.insert_unique(ordered_unique_range
                                , dtl::force<impl_initializer_list>(il).begin()
@@ -1234,22 +1275,22 @@ class flat_map
    //!
    //! <b>Note</b>: Invalidates all iterators and references.
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_map<Key, T, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_map<Key, T, C2, AllocatorOrContainer>& source)
    {  m_flat_tree.merge_unique(source.tree());   }
 
    //! @copydoc ::boost::container::flat_map::merge(flat_map<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_map<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_map<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_map<Key, T, C2, AllocatorOrContainer>&>(source)); }
 
    //! @copydoc ::boost::container::flat_map::merge(flat_map<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_multimap<Key, T, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_multimap<Key, T, C2, AllocatorOrContainer>& source)
    {  m_flat_tree.merge_unique(source.tree());   }
 
    //! @copydoc ::boost::container::flat_map::merge(flat_map<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_multimap<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_multimap<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_multimap<Key, T, C2, AllocatorOrContainer>&>(source));  }
 
    //! <b>Effects</b>: Erases the element pointed to by p.
@@ -1262,7 +1303,7 @@ class flat_map
    //!
    //! <b>Note</b>: Invalidates elements with keys
    //!   not less than the erased element.
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator p)
+   inline iterator erase(const_iterator p)
    {
       return dtl::force_copy<iterator>
          (m_flat_tree.erase(dtl::force_copy<impl_const_iterator>(p)));
@@ -1274,9 +1315,26 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //!   linear to the elements with bigger keys.
-   BOOST_CONTAINER_FORCEINLINE size_type erase(const key_type& x)
+   inline size_type erase(const key_type& x)
       { return m_flat_tree.erase_unique(x); }
 
+   //! <b>Requires</b>: This overload is available only if
+   //! key_compare::is_transparent exists.
+   //!
+   //! <b>Effects</b>: If present, erases the element in the container with key equivalent to x.
+   //!
+   //! <b>Returns</b>: Returns the number of erased elements (0/1).
+   template <class K>
+   inline BOOST_CONTAINER_DOC1ST
+   (size_type
+      , typename dtl::enable_if_c<
+      dtl::is_transparent<key_compare>::value &&                  //transparent
+      !dtl::is_convertible<K BOOST_MOVE_I iterator>::value &&     //not convertible to iterator
+      !dtl::is_convertible<K BOOST_MOVE_I const_iterator>::value  //not convertible to const_iterator
+      BOOST_MOVE_I size_type>::type)
+      erase(const K& x)
+   {  return m_flat_tree.erase_unique(x); }
+
    //! <b>Effects</b>: Erases all the elements in the range [first, last).
    //!
    //! <b>Returns</b>: Returns last.
@@ -1285,7 +1343,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //!   linear to the elements with bigger keys.
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator first, const_iterator last)
+   inline iterator erase(const_iterator first, const_iterator last)
    {
       return dtl::force_copy<iterator>(
          m_flat_tree.erase( dtl::force_copy<impl_const_iterator>(first)
@@ -1297,7 +1355,7 @@ class flat_map
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE void swap(flat_map& x)
+   inline void swap(flat_map& x)
       BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
                                  && boost::container::dtl::is_nothrow_swappable<Compare>::value )
    { m_flat_tree.swap(x.m_flat_tree); }
@@ -1307,7 +1365,7 @@ class flat_map
    //! <b>Postcondition</b>: size() == 0.
    //!
    //! <b>Complexity</b>: linear in size().
-   BOOST_CONTAINER_FORCEINLINE void clear() BOOST_NOEXCEPT_OR_NOTHROW
+   inline void clear() BOOST_NOEXCEPT_OR_NOTHROW
       { m_flat_tree.clear(); }
 
    //////////////////////////////////////////////
@@ -1320,7 +1378,7 @@ class flat_map
    //!   of which a was constructed.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       key_compare key_comp() const
       { return dtl::force_copy<key_compare>(m_flat_tree.key_comp()); }
 
@@ -1328,7 +1386,7 @@ class flat_map
    //!   of the comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       value_compare value_comp() const
       { return value_compare(dtl::force_copy<key_compare>(m_flat_tree.key_comp())); }
 
@@ -1342,7 +1400,7 @@ class flat_map
    //!   equivalent to x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator find(const key_type& x)
       { return dtl::force_copy<iterator>(m_flat_tree.find(x)); }
 
@@ -1350,7 +1408,7 @@ class flat_map
    //!   equivalent to x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator find(const key_type& x) const
       { return dtl::force_copy<const_iterator>(m_flat_tree.find(x)); }
 
@@ -1362,7 +1420,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator find(const K& x)
       { return dtl::force_copy<iterator>(m_flat_tree.find(x)); }
 
@@ -1374,14 +1432,14 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator find(const K& x) const
       { return dtl::force_copy<const_iterator>(m_flat_tree.find(x)); }
 
    //! <b>Returns</b>: The number of elements with key equivalent to x.
    //!
    //! <b>Complexity</b>: log(size())+count(k)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const key_type& x) const
       {  return static_cast<size_type>(m_flat_tree.find(x) != m_flat_tree.end());  }
 
@@ -1392,7 +1450,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: log(size())+count(k)
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const K& x) const
       //Don't use find() != end optimization here as transparent comparators with key K might
       //return a different range than key_type (which can only return a single element range)
@@ -1402,7 +1460,7 @@ class flat_map
    //!   equivalent to key in the container, otherwise false.
    //!
    //! <b>Complexity</b>: log(size()).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool contains(const key_type& x) const
       {  return m_flat_tree.find(x) != m_flat_tree.end();  }
 
@@ -1414,7 +1472,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: log(size()).
    template<typename K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool contains(const K& x) const
       {  return m_flat_tree.find(x) != m_flat_tree.end();  }
 
@@ -1422,7 +1480,7 @@ class flat_map
    //!   than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator lower_bound(const key_type& x)
       {  return dtl::force_copy<iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -1430,7 +1488,7 @@ class flat_map
    //!   less than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator lower_bound(const key_type& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -1442,7 +1500,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator lower_bound(const K& x)
       {  return dtl::force_copy<iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -1454,7 +1512,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator lower_bound(const K& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -1462,7 +1520,7 @@ class flat_map
    //!   than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator upper_bound(const key_type& x)
       {  return dtl::force_copy<iterator>(m_flat_tree.upper_bound(x)); }
 
@@ -1470,7 +1528,7 @@ class flat_map
    //!   greater than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator upper_bound(const key_type& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.upper_bound(x)); }
 
@@ -1482,7 +1540,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator upper_bound(const K& x)
       {  return dtl::force_copy<iterator>(m_flat_tree.upper_bound(x)); }
 
@@ -1494,21 +1552,21 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator upper_bound(const K& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.upper_bound(x)); }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> equal_range(const key_type& x)
       {  return dtl::force_copy<std::pair<iterator,iterator> >(m_flat_tree.lower_bound_range(x)); }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
       {  return dtl::force_copy<std::pair<const_iterator,const_iterator> >(m_flat_tree.lower_bound_range(x)); }
 
@@ -1519,7 +1577,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> equal_range(const K& x)
       //Don't use lower_bound_range optimization here as transparent comparators with key K might
       //return a different range than key_type (which can only return a single element range)
@@ -1532,7 +1590,7 @@ class flat_map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> equal_range(const K& x) const
       //Don't use lower_bound_range optimization here as transparent comparators with key K might
       //return a different range than key_type (which can only return a single element range)
@@ -1545,7 +1603,7 @@ class flat_map
    //! <b>Postcondition</b>: this->empty()
    //!
    //! <b>Throws</b>: If secuence_type's move constructor throws 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE sequence_type extract_sequence()
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline sequence_type extract_sequence()
    {
       return boost::move(dtl::force<sequence_type>(m_flat_tree.get_sequence_ref()));
    }
@@ -1556,7 +1614,7 @@ class flat_map
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(NlogN) with N = seq.size()
    //!
    //! <b>Throws</b>: If the comparison or the move constructor throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
    {  this->m_flat_tree.adopt_sequence_unique(boost::move(dtl::force<impl_sequence_type>(seq)));  }
 
    //! <b>Requires</b>: seq shall be ordered according to this->compare()
@@ -1568,7 +1626,7 @@ class flat_map
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(1)
    //!
    //! <b>Throws</b>: If the move assignment throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(ordered_unique_range_t, BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(ordered_unique_range_t, BOOST_RV_REF(sequence_type) seq)
    {  this->m_flat_tree.adopt_sequence_unique(ordered_unique_range_t(), boost::move(dtl::force<impl_sequence_type>(seq)));  }
 
    //! <b>Effects</b>: Returns a const view of the underlying sequence.
@@ -1576,55 +1634,55 @@ class flat_map
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing
-   BOOST_CONTAINER_FORCEINLINE const sequence_type & sequence() const BOOST_NOEXCEPT
+   inline const sequence_type & sequence() const BOOST_NOEXCEPT
    {  return dtl::force<sequence_type>(m_flat_tree.get_sequence_cref());  }
 
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const flat_map& x, const flat_map& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const flat_map& x, const flat_map& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const flat_map& x, const flat_map& y)
    {  return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const flat_map& x, const flat_map& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const flat_map& x, const flat_map& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const flat_map& x, const flat_map& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE friend void swap(flat_map& x, flat_map& y)
+   inline friend void swap(flat_map& x, flat_map& y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 
@@ -1637,7 +1695,7 @@ class flat_map
       if (i == end() || key_comp()(k, (*i).first)){
          dtl::value_init<mapped_type> m;
          impl_value_type v(k, ::boost::move(m.m_t));
-         i = this->insert(i, ::boost::move(v));
+         i = dtl::force_copy<iterator>(this->m_flat_tree.insert_equal(::boost::move(v)));
       }
       return (*i).second;
    }
@@ -1646,10 +1704,10 @@ class flat_map
       key_type &k = mk;
       iterator i = this->lower_bound(k);
       // i->first is greater than or equivalent to k.
-      if (i == end() || key_comp()(k, (*i).first)){
+      if (i == end() || key_comp()(k, (*i).first)) {
          dtl::value_init<mapped_type> m;
          impl_value_type v(::boost::move(k), ::boost::move(m.m_t));
-         i = this->insert(i, ::boost::move(v));
+         i = dtl::force_copy<iterator>(this->m_flat_tree.insert_equal(::boost::move(v)));
       }
       return (*i).second;
    }
@@ -1729,10 +1787,10 @@ flat_map(ordered_unique_range_t, InputIterator, InputIterator, Compare const&, A
 template <class Key, class T, class Compare, class AllocatorOrContainer>
 struct has_trivial_destructor_after_move<boost::container::flat_map<Key, T, Compare, AllocatorOrContainer> >
 {
-   typedef ::boost::container::dtl::pair<Key, T> value_t;
+   typedef typename boost::container::flat_map<Key, T, Compare, AllocatorOrContainer>::value_type value_t;
    typedef typename ::boost::container::dtl::container_or_allocator_rebind<AllocatorOrContainer, value_t>::type alloc_or_cont_t;
    typedef ::boost::container::dtl::flat_tree<value_t,::boost::container::dtl::select1st<Key>, Compare, alloc_or_cont_t> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
@@ -1777,17 +1835,28 @@ class flat_multimap
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
    BOOST_COPYABLE_AND_MOVABLE(flat_multimap)
+   typedef std::pair<Key, T> std_pair_t;
    typedef dtl::flat_tree<
-                           std::pair<Key, T>,
+                           std_pair_t,
                            dtl::select1st<Key>,
                            Compare,
                            AllocatorOrContainer> tree_t;
    //This is the real tree stored here. It's based on a movable pair
+   typedef dtl::pair<Key, T> dtl_pair_t;
+   #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+   typedef std_pair_t impl_pair_t;
+   #else
+   typedef dtl_pair_t impl_pair_t;
+   #endif
    typedef dtl::flat_tree<
-                           dtl::pair<Key, T>,
+                           impl_pair_t,
                            dtl::select1st<Key>,
                            Compare,
-                           typename dtl::container_or_allocator_rebind<AllocatorOrContainer, dtl::pair<Key, T> >::type
+                           #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+                           AllocatorOrContainer
+                           #else
+                           typename dtl::container_or_allocator_rebind<AllocatorOrContainer, impl_pair_t >::type
+                           #endif
                            > impl_tree_t;
    impl_tree_t m_flat_tree;  // flat tree representing flat_map
 
@@ -1812,10 +1881,10 @@ class flat_multimap
    typedef typename impl_tree_t::stored_allocator_type      impl_stored_allocator_type;
    typedef typename impl_tree_t::sequence_type              impl_sequence_type;
 
-   BOOST_CONTAINER_FORCEINLINE impl_tree_t &tree()
+   inline impl_tree_t &tree()
    {  return m_flat_tree;  }
 
-   BOOST_CONTAINER_FORCEINLINE const impl_tree_t &tree() const
+   inline const impl_tree_t &tree() const
    {  return m_flat_tree;  }
 
    private:
@@ -1851,7 +1920,7 @@ class flat_multimap
    typedef BOOST_CONTAINER_IMPDEF(impl_value_type)                                  movable_value_type;
 
    //AllocatorOrContainer::value_type must be std::pair<Key, T>
-   BOOST_STATIC_ASSERT((dtl::is_same<std::pair<Key, T>, value_type>::value));
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<std::pair<Key, T>, value_type>::value));
 
    //////////////////////////////////////////////
    //
@@ -1862,7 +1931,7 @@ class flat_multimap
    //! <b>Effects</b>: Default constructs an empty flat_map.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE flat_multimap()
+   inline flat_multimap()
       BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<AllocatorOrContainer>::value &&
                         dtl::is_nothrow_default_constructible<Compare>::value)
       : m_flat_tree()
@@ -1871,7 +1940,7 @@ class flat_multimap
    //! <b>Effects</b>: Constructs an empty flat_multimap using the specified allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit flat_multimap(const allocator_type& a)
+   inline explicit flat_multimap(const allocator_type& a)
       : m_flat_tree(dtl::force<const impl_allocator_type>(a))
    {}
 
@@ -1879,7 +1948,7 @@ class flat_multimap
    //!   object .
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit flat_multimap(const Compare& comp)
+   inline explicit flat_multimap(const Compare& comp)
       : m_flat_tree(comp)
    {}
 
@@ -1887,7 +1956,7 @@ class flat_multimap
    //!   object and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(const Compare& comp, const allocator_type& a)
       : m_flat_tree(comp, dtl::force<const impl_allocator_type>(a))
    {}
@@ -1898,7 +1967,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(InputIterator first, InputIterator last)
       : m_flat_tree(false, first, last)
    {}
@@ -1909,7 +1978,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(InputIterator first, InputIterator last, const allocator_type& a)
       : m_flat_tree(false, first, last, dtl::force<const impl_allocator_type>(a))
    {}
@@ -1920,7 +1989,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(InputIterator first, InputIterator last, const Compare& comp)
       : m_flat_tree(false, first, last, comp)
    {}
@@ -1931,7 +2000,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : m_flat_tree(false, first, last, comp, dtl::force<const impl_allocator_type>(a))
    {}
@@ -1946,7 +2015,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(ordered_range_t, InputIterator first, InputIterator last)
       : m_flat_tree(ordered_range, first, last)
    {}
@@ -1961,7 +2030,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : m_flat_tree(ordered_range, first, last, comp)
    {}
@@ -1976,7 +2045,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : m_flat_tree(ordered_range, first, last, comp, a)
    {}
@@ -1991,7 +2060,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       flat_multimap(ordered_range_t, InputIterator first, InputIterator last, const allocator_type &a)
       : m_flat_tree(ordered_range, first, last, Compare(), a)
    {}
@@ -2002,7 +2071,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(std::initializer_list<value_type> il)
       : m_flat_tree( false
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2014,7 +2083,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(std::initializer_list<value_type> il, const allocator_type& a)
       : m_flat_tree(false
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2027,7 +2096,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(std::initializer_list<value_type> il, const Compare& comp)
       : m_flat_tree(false
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2039,7 +2108,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : m_flat_tree( false
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2056,7 +2125,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(ordered_range_t, std::initializer_list<value_type> il)
       : m_flat_tree( ordered_range
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2072,7 +2141,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : m_flat_tree( ordered_range
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2088,7 +2157,7 @@ class flat_multimap
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : m_flat_tree( ordered_range
                    , dtl::force<impl_initializer_list>(il).begin()
@@ -2100,7 +2169,7 @@ class flat_multimap
    //! <b>Effects</b>: Copy constructs a flat_multimap.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(const flat_multimap& x)
       : m_flat_tree(x.m_flat_tree)
    {}
@@ -2110,7 +2179,7 @@ class flat_multimap
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(BOOST_RV_REF(flat_multimap) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : m_flat_tree(boost::move(x.m_flat_tree))
@@ -2119,7 +2188,7 @@ class flat_multimap
    //! <b>Effects</b>: Copy constructs a flat_multimap using the specified allocator.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(const flat_multimap& x, const allocator_type &a)
       : m_flat_tree(x.m_flat_tree, dtl::force<const impl_allocator_type>(a))
    {}
@@ -2128,7 +2197,7 @@ class flat_multimap
    //!                 Constructs *this using x's resources.
    //!
    //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap(BOOST_RV_REF(flat_multimap) x, const allocator_type &a)
       : m_flat_tree(boost::move(x.m_flat_tree), dtl::force<const impl_allocator_type>(a))
    {}
@@ -2136,14 +2205,14 @@ class flat_multimap
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap& operator=(BOOST_COPY_ASSIGN_REF(flat_multimap) x)
       {  m_flat_tree = x.m_flat_tree;   return *this;  }
 
    //! <b>Effects</b>: this->swap(x.get()).
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap& operator=(BOOST_RV_REF(flat_multimap) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
@@ -2154,7 +2223,7 @@ class flat_multimap
    //! <b>Effects</b>: Assign content of il to *this
    //!
    //! <b>Complexity</b>: Linear in il.size().
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_multimap& operator=(std::initializer_list<value_type> il)
    {
       this->clear();
@@ -2167,7 +2236,7 @@ class flat_multimap
    //!   was passed to the object's constructor.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<allocator_type>(m_flat_tree.get_allocator()); }
 
@@ -2178,7 +2247,7 @@ class flat_multimap
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force<stored_allocator_type>(m_flat_tree.get_stored_allocator()); }
 
@@ -2189,7 +2258,7 @@ class flat_multimap
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force<const stored_allocator_type>(m_flat_tree.get_stored_allocator()); }
 
@@ -2204,7 +2273,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<iterator>(m_flat_tree.begin()); }
 
@@ -2213,7 +2282,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.begin()); }
 
@@ -2222,7 +2291,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    iterator end() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<iterator>(m_flat_tree.end()); }
 
@@ -2231,7 +2300,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.end()); }
 
@@ -2241,7 +2310,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<reverse_iterator>(m_flat_tree.rbegin()); }
 
@@ -2251,7 +2320,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.rbegin()); }
 
@@ -2261,7 +2330,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<reverse_iterator>(m_flat_tree.rend()); }
 
@@ -2271,7 +2340,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.rend()); }
 
@@ -2280,7 +2349,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.cbegin()); }
 
@@ -2289,7 +2358,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_iterator>(m_flat_tree.cend()); }
 
@@ -2299,7 +2368,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.crbegin()); }
 
@@ -2309,7 +2378,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
       { return dtl::force_copy<const_reverse_iterator>(m_flat_tree.crend()); }
 
@@ -2324,7 +2393,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.empty(); }
 
@@ -2333,7 +2402,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.size(); }
 
@@ -2342,7 +2411,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.max_size(); }
 
@@ -2352,7 +2421,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_flat_tree.capacity(); }
 
@@ -2366,7 +2435,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: If capacity() is less than "cnt", iterators and references to
    //!   to values might be invalidated.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    void reserve(size_type cnt)
       { m_flat_tree.reserve(cnt);   }
 
@@ -2376,27 +2445,27 @@ class flat_multimap
    //! <b>Throws</b>: If memory allocation throws, or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to size().
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    void shrink_to_fit()
       { m_flat_tree.shrink_to_fit(); }
 
    //! @copydoc ::boost::container::flat_set::nth(size_type)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {  return dtl::force_copy<iterator>(m_flat_tree.nth(n));  }
 
    //! @copydoc ::boost::container::flat_set::nth(size_type) const
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
-   {  return dtl::force_copy<iterator>(m_flat_tree.nth(n));  }
+   {  return dtl::force_copy<const_iterator>(m_flat_tree.nth(n));  }
 
    //! @copydoc ::boost::container::flat_set::index_of(iterator)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {  return m_flat_tree.index_of(dtl::force_copy<impl_iterator>(p));  }
 
    //! @copydoc ::boost::container::flat_set::index_of(const_iterator) const
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
    size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {  return m_flat_tree.index_of(dtl::force_copy<impl_const_iterator>(p));  }
 
@@ -2411,7 +2480,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    iterator emplace(BOOST_FWD_REF(Args)... args)
    {  return dtl::force_copy<iterator>(m_flat_tree.emplace_equal(boost::forward<Args>(args)...)); }
 
@@ -2428,7 +2497,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    iterator emplace_hint(const_iterator hint, BOOST_FWD_REF(Args)... args)
    {
       return dtl::force_copy<iterator>(m_flat_tree.emplace_hint_equal
@@ -2439,11 +2508,11 @@ class flat_multimap
 
    #define BOOST_CONTAINER_FLAT_MULTIMAP_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_MOVE_UREF##N)\
+   inline iterator emplace(BOOST_MOVE_UREF##N)\
    {  return dtl::force_copy<iterator>(m_flat_tree.emplace_equal(BOOST_MOVE_FWD##N));  }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       return dtl::force_copy<iterator>(m_flat_tree.emplace_hint_equal\
          (dtl::force_copy<impl_const_iterator>(hint) BOOST_MOVE_I##N BOOST_MOVE_FWD##N));\
@@ -2461,7 +2530,7 @@ class flat_multimap
    //!   to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const value_type& x)
+   inline iterator insert(const value_type& x)
    {
       return dtl::force_copy<iterator>(
          m_flat_tree.insert_equal(dtl::force<const impl_value_type>(x)));
@@ -2475,9 +2544,9 @@ class flat_multimap
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template<class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( iterator
-         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
             BOOST_MOVE_I iterator >::type)
       insert(BOOST_FWD_REF(Pair) x)
    { return dtl::force_copy<iterator>(m_flat_tree.emplace_equal(boost::forward<Pair>(x))); }
@@ -2493,7 +2562,7 @@ class flat_multimap
    //!   to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const value_type& x)
+   inline iterator insert(const_iterator p, const value_type& x)
    {
       return dtl::force_copy<iterator>
          (m_flat_tree.insert_equal( dtl::force_copy<impl_const_iterator>(p)
@@ -2512,9 +2581,9 @@ class flat_multimap
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template<class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( iterator
-         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+         , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
             BOOST_MOVE_I iterator>::type)
       insert(const_iterator p, BOOST_FWD_REF(Pair) x)
    {
@@ -2530,7 +2599,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
       {  m_flat_tree.insert_equal(first, last); }
 
    //! <b>Requires</b>: first, last are not iterators into *this.
@@ -2547,7 +2616,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_range_t, InputIterator first, InputIterator last)
+   inline void insert(ordered_range_t, InputIterator first, InputIterator last)
       {  m_flat_tree.insert_equal(ordered_range, first, last); }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -2556,7 +2625,7 @@ class flat_multimap
    //! <b>Complexity</b>: N log(N).
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {
       m_flat_tree.insert_equal( dtl::force<impl_initializer_list>(il).begin()
                               , dtl::force<impl_initializer_list>(il).end());
@@ -2573,7 +2642,7 @@ class flat_multimap
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_range_t, std::initializer_list<value_type> il)
+   inline void insert(ordered_range_t, std::initializer_list<value_type> il)
    {
       m_flat_tree.insert_equal( ordered_range
                               , dtl::force<impl_initializer_list>(il).begin()
@@ -2590,22 +2659,22 @@ class flat_multimap
    //!
    //! <b>Note</b>: Invalidates all iterators and references.
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_multimap<Key, T, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_multimap<Key, T, C2, AllocatorOrContainer>& source)
    {  m_flat_tree.merge_equal(source.tree());   }
 
    //! @copydoc ::boost::container::flat_multimap::merge(flat_multimap<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_multimap<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_multimap<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_multimap<Key, T, C2, AllocatorOrContainer>&>(source)); }
 
    //! @copydoc ::boost::container::flat_multimap::merge(flat_multimap<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_map<Key, T, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_map<Key, T, C2, AllocatorOrContainer>& source)
    {  m_flat_tree.merge_equal(source.tree());   }
 
    //! @copydoc ::boost::container::flat_multimap::merge(flat_map<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_map<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_map<Key, T, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_map<Key, T, C2, AllocatorOrContainer>&>(source)); }
 
    //! <b>Effects</b>: Erases the element pointed to by p.
@@ -2618,7 +2687,7 @@ class flat_multimap
    //!
    //! <b>Note</b>: Invalidates elements with keys
    //!   not less than the erased element.
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator p)
+   inline iterator erase(const_iterator p)
    {
       return dtl::force_copy<iterator>(
          m_flat_tree.erase(dtl::force_copy<impl_const_iterator>(p)));
@@ -2630,7 +2699,24 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //!   linear to the elements with bigger keys.
-   BOOST_CONTAINER_FORCEINLINE size_type erase(const key_type& x)
+   inline size_type erase(const key_type& x)
+      { return m_flat_tree.erase(x); }
+
+   //! <b>Requires</b>: This overload is available only if
+   //! key_compare::is_transparent exists.
+   //!
+   //! <b>Effects</b>: Erases all elements in the container with key equivalent to x.
+   //!
+   //! <b>Returns</b>: Returns the number of erased elements.
+   template <class K>
+   inline BOOST_CONTAINER_DOC1ST
+   (size_type
+      , typename dtl::enable_if_c<
+      dtl::is_transparent<key_compare>::value &&                  //transparent
+      !dtl::is_convertible<K BOOST_MOVE_I iterator>::value &&     //not convertible to iterator
+      !dtl::is_convertible<K BOOST_MOVE_I const_iterator>::value  //not convertible to const_iterator
+      BOOST_MOVE_I size_type>::type)
+      erase(const K& x)
       { return m_flat_tree.erase(x); }
 
    //! <b>Effects</b>: Erases all the elements in the range [first, last).
@@ -2641,7 +2727,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //!   linear to the elements with bigger keys.
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator first, const_iterator last)
+   inline iterator erase(const_iterator first, const_iterator last)
    {
       return dtl::force_copy<iterator>
          (m_flat_tree.erase( dtl::force_copy<impl_const_iterator>(first)
@@ -2653,7 +2739,7 @@ class flat_multimap
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE void swap(flat_multimap& x)
+   inline void swap(flat_multimap& x)
       BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
                                  && boost::container::dtl::is_nothrow_swappable<Compare>::value )
    { m_flat_tree.swap(x.m_flat_tree); }
@@ -2663,7 +2749,7 @@ class flat_multimap
    //! <b>Postcondition</b>: size() == 0.
    //!
    //! <b>Complexity</b>: linear in size().
-   BOOST_CONTAINER_FORCEINLINE void clear() BOOST_NOEXCEPT_OR_NOTHROW
+   inline void clear() BOOST_NOEXCEPT_OR_NOTHROW
       { m_flat_tree.clear(); }
 
    //////////////////////////////////////////////
@@ -2676,7 +2762,7 @@ class flat_multimap
    //!   of which a was constructed.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       key_compare key_comp() const
       { return dtl::force_copy<key_compare>(m_flat_tree.key_comp()); }
 
@@ -2684,7 +2770,7 @@ class flat_multimap
    //!   of the comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       value_compare value_comp() const
       { return value_compare(dtl::force_copy<key_compare>(m_flat_tree.key_comp())); }
 
@@ -2698,7 +2784,7 @@ class flat_multimap
    //!   equivalent to x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator find(const key_type& x)
       { return dtl::force_copy<iterator>(m_flat_tree.find(x)); }
 
@@ -2706,7 +2792,7 @@ class flat_multimap
    //!   equivalent to x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator find(const key_type& x) const
       { return dtl::force_copy<const_iterator>(m_flat_tree.find(x)); }
 
@@ -2718,7 +2804,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator find(const K& x)
       { return dtl::force_copy<iterator>(m_flat_tree.find(x)); }
 
@@ -2730,14 +2816,14 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator find(const K& x) const
       { return dtl::force_copy<const_iterator>(m_flat_tree.find(x)); }
 
    //! <b>Returns</b>: The number of elements with key equivalent to x.
    //!
    //! <b>Complexity</b>: log(size())+count(k)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const key_type& x) const
       { return m_flat_tree.count(x); }
 
@@ -2748,7 +2834,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: log(size())+count(k)
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const K& x) const
       { return m_flat_tree.count(x); }
 
@@ -2756,7 +2842,7 @@ class flat_multimap
    //!   equivalent to key in the container, otherwise false.
    //!
    //! <b>Complexity</b>: log(size()).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD  BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD  inline
       bool contains(const key_type& x) const
       {  return m_flat_tree.find(x) != m_flat_tree.end();  }
 
@@ -2768,7 +2854,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: log(size()).
    template<typename K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool contains(const K& x) const
       {  return m_flat_tree.find(x) != m_flat_tree.end();  }
 
@@ -2776,7 +2862,7 @@ class flat_multimap
    //!   than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator lower_bound(const key_type& x)
       {  return dtl::force_copy<iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -2784,7 +2870,7 @@ class flat_multimap
    //!   than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator lower_bound(const key_type& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -2796,7 +2882,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator lower_bound(const K& x)
       {  return dtl::force_copy<iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -2808,7 +2894,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator lower_bound(const K& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.lower_bound(x)); }
 
@@ -2816,7 +2902,7 @@ class flat_multimap
    //!   than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator upper_bound(const key_type& x)
       {return dtl::force_copy<iterator>(m_flat_tree.upper_bound(x)); }
 
@@ -2824,7 +2910,7 @@ class flat_multimap
    //!   greater than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator upper_bound(const key_type& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.upper_bound(x)); }
 
@@ -2836,7 +2922,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator upper_bound(const K& x)
       {return dtl::force_copy<iterator>(m_flat_tree.upper_bound(x)); }
 
@@ -2848,21 +2934,21 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator upper_bound(const K& x) const
       {  return dtl::force_copy<const_iterator>(m_flat_tree.upper_bound(x)); }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> equal_range(const key_type& x)
       {  return dtl::force_copy<std::pair<iterator,iterator> >(m_flat_tree.equal_range(x));   }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
       {  return dtl::force_copy<std::pair<const_iterator,const_iterator> >(m_flat_tree.equal_range(x));   }
 
@@ -2873,7 +2959,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<iterator,iterator> equal_range(const K& x)
       {  return dtl::force_copy<std::pair<iterator,iterator> >(m_flat_tree.equal_range(x));   }
 
@@ -2884,7 +2970,7 @@ class flat_multimap
    //!
    //! <b>Complexity</b>: Logarithmic
    template<class K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       std::pair<const_iterator, const_iterator> equal_range(const K& x) const
       {  return dtl::force_copy<std::pair<const_iterator,const_iterator> >(m_flat_tree.equal_range(x));   }
 
@@ -2895,7 +2981,7 @@ class flat_multimap
    //! <b>Postcondition</b>: this->empty()
    //!
    //! <b>Throws</b>: If secuence_type's move constructor throws 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       sequence_type extract_sequence()
    {  return boost::move(dtl::force<sequence_type>(m_flat_tree.get_sequence_ref()));   }
 
@@ -2905,7 +2991,7 @@ class flat_multimap
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(NlogN) with N = seq.size()
    //!
    //! <b>Throws</b>: If the comparison or the move constructor throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
    {  this->m_flat_tree.adopt_sequence_equal(boost::move(dtl::force<impl_sequence_type>(seq)));  }
 
    //! <b>Requires</b>: seq shall be ordered according to this->compare().
@@ -2916,7 +3002,7 @@ class flat_multimap
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(1)
    //!
    //! <b>Throws</b>: If the move assignment throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(ordered_range_t, BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(ordered_range_t, BOOST_RV_REF(sequence_type) seq)
    {  this->m_flat_tree.adopt_sequence_equal(ordered_range_t(), boost::move(dtl::force<impl_sequence_type>(seq)));  }
 
    //! <b>Effects</b>: Returns a const view of the underlying sequence.
@@ -2924,59 +3010,63 @@ class flat_multimap
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing
-   BOOST_CONTAINER_FORCEINLINE const sequence_type & sequence() const BOOST_NOEXCEPT
+   inline const sequence_type & sequence() const BOOST_NOEXCEPT
    {  return dtl::force<sequence_type>(m_flat_tree.get_sequence_cref());  }
 
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const flat_multimap& x, const flat_multimap& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const flat_multimap& x, const flat_multimap& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const flat_multimap& x, const flat_multimap& y)
    {  return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const flat_multimap& x, const flat_multimap& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const flat_multimap& x, const flat_multimap& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const flat_multimap& x, const flat_multimap& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE friend void swap(flat_multimap& x, flat_multimap& y)
+   inline friend void swap(flat_multimap& x, flat_multimap& y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 };
 
+#if defined(BOOST_GCC) && (BOOST_GCC >= 100000) && !defined(BOOST_CONTAINER_STD_PAIR_IS_MOVABLE)
+#pragma GCC pop_options
+#endif
+
 #ifndef BOOST_CONTAINER_NO_CXX17_CTAD
 
 template <typename InputIterator>
@@ -3052,10 +3142,10 @@ namespace boost {
 template <class Key, class T, class Compare, class AllocatorOrContainer>
 struct has_trivial_destructor_after_move< boost::container::flat_multimap<Key, T, Compare, AllocatorOrContainer> >
 {
-   typedef ::boost::container::dtl::pair<Key, T> value_t;
+   typedef typename boost::container::flat_multimap<Key, T, Compare, AllocatorOrContainer>::value_type value_t;
    typedef typename ::boost::container::dtl::container_or_allocator_rebind<AllocatorOrContainer, value_t>::type alloc_or_cont_t;
    typedef ::boost::container::dtl::flat_tree<value_t,::boost::container::dtl::select1st<Key>, Compare, alloc_or_cont_t> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 }  //namespace boost {
diff --git a/inst/include/boost/container/flat_set.hpp b/inst/include/boost/container/flat_set.hpp
index 7a4ed489d..caffd163d 100644
--- a/inst/include/boost/container/flat_set.hpp
+++ b/inst/include/boost/container/flat_set.hpp
@@ -133,7 +133,7 @@ class flat_set
    //! <b>Effects</b>: Default constructs an empty container.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<AllocatorOrContainer>::value &&
                                 dtl::is_nothrow_default_constructible<Compare>::value)
       : tree_t()
@@ -143,7 +143,7 @@ class flat_set
    //! comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    explicit flat_set(const Compare& comp)
       : tree_t(comp)
    {}
@@ -151,7 +151,7 @@ class flat_set
    //! <b>Effects</b>: Constructs an empty container using the specified allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    explicit flat_set(const allocator_type& a)
       : tree_t(a)
    {}
@@ -160,7 +160,7 @@ class flat_set
    //! comparison object and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(const Compare& comp, const allocator_type& a)
       : tree_t(comp, a)
    {}
@@ -171,7 +171,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! comp and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(InputIterator first, InputIterator last)
       : tree_t(true, first, last)
    {}
@@ -182,7 +182,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! comp and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(InputIterator first, InputIterator last, const allocator_type& a)
       : tree_t(true, first, last, a)
    {}
@@ -193,7 +193,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! comp and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(InputIterator first, InputIterator last, const Compare& comp)
       : tree_t(true, first, last, comp)
    {}
@@ -204,7 +204,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! comp and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : tree_t(true, first, last, comp, a)
    {}
@@ -220,7 +220,7 @@ class flat_set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(ordered_unique_range_t, InputIterator first, InputIterator last)
       : tree_t(ordered_unique_range, first, last)
    {}
@@ -236,7 +236,7 @@ class flat_set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : tree_t(ordered_unique_range, first, last, comp)
    {}
@@ -252,7 +252,7 @@ class flat_set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    flat_set(ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : tree_t(ordered_unique_range, first, last, comp, a)
    {}
@@ -268,7 +268,7 @@ class flat_set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       flat_set(ordered_unique_range_t, InputIterator first, InputIterator last, const allocator_type& a)
       : tree_t(ordered_unique_range, first, last, Compare(), a)
    {}
@@ -279,7 +279,7 @@ class flat_set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! comp and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE flat_set(std::initializer_list<value_type> il)
+   inline flat_set(std::initializer_list<value_type> il)
       : tree_t(true, il.begin(), il.end())
    {}
 
@@ -288,7 +288,7 @@ class flat_set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! comp and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE flat_set(std::initializer_list<value_type> il, const allocator_type& a)
+   inline flat_set(std::initializer_list<value_type> il, const allocator_type& a)
       : tree_t(true, il.begin(), il.end(), a)
    {}
 
@@ -297,7 +297,7 @@ class flat_set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! comp and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE flat_set(std::initializer_list<value_type> il, const Compare& comp)
+   inline flat_set(std::initializer_list<value_type> il, const Compare& comp)
       : tree_t(true, il.begin(), il.end(), comp)
    {}
 
@@ -306,7 +306,7 @@ class flat_set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! comp and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE flat_set(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline flat_set(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : tree_t(true, il.begin(), il.end(), comp, a)
    {}
 
@@ -320,7 +320,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_set(ordered_unique_range_t, std::initializer_list<value_type> il)
+   inline flat_set(ordered_unique_range_t, std::initializer_list<value_type> il)
       : tree_t(ordered_unique_range, il.begin(), il.end())
    {}
 
@@ -334,7 +334,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_set(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline flat_set(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : tree_t(ordered_unique_range, il.begin(), il.end(), comp)
    {}
 
@@ -348,7 +348,7 @@ class flat_set
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_set(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline flat_set(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : tree_t(ordered_unique_range, il.begin(), il.end(), comp, a)
    {}
 #endif
@@ -356,7 +356,7 @@ class flat_set
    //! <b>Effects</b>: Copy constructs the container.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE flat_set(const flat_set& x)
+   inline flat_set(const flat_set& x)
       : tree_t(static_cast<const tree_t&>(x))
    {}
 
@@ -365,7 +365,7 @@ class flat_set
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE flat_set(BOOST_RV_REF(flat_set) x)
+   inline flat_set(BOOST_RV_REF(flat_set) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : tree_t(BOOST_MOVE_BASE(tree_t, x))
    {}
@@ -373,7 +373,7 @@ class flat_set
    //! <b>Effects</b>: Copy constructs a container using the specified allocator.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE flat_set(const flat_set& x, const allocator_type &a)
+   inline flat_set(const flat_set& x, const allocator_type &a)
       : tree_t(static_cast<const tree_t&>(x), a)
    {}
 
@@ -381,14 +381,14 @@ class flat_set
    //!                 Constructs *this using x's resources.
    //!
    //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise
-   BOOST_CONTAINER_FORCEINLINE flat_set(BOOST_RV_REF(flat_set) x, const allocator_type &a)
+   inline flat_set(BOOST_RV_REF(flat_set) x, const allocator_type &a)
       : tree_t(BOOST_MOVE_BASE(tree_t, x), a)
    {}
 
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE flat_set& operator=(BOOST_COPY_ASSIGN_REF(flat_set) x)
+   inline flat_set& operator=(BOOST_COPY_ASSIGN_REF(flat_set) x)
    {  return static_cast<flat_set&>(this->tree_t::operator=(static_cast<const tree_t&>(x)));  }
 
    //! <b>Throws</b>: If allocator_traits_type::propagate_on_container_move_assignment
@@ -397,7 +397,7 @@ class flat_set
    //! <b>Complexity</b>: Constant if allocator_traits_type::
    //!   propagate_on_container_move_assignment is true or
    //!   this->get>allocator() == x.get_allocator(). Linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE flat_set& operator=(BOOST_RV_REF(flat_set) x)
+   inline flat_set& operator=(BOOST_RV_REF(flat_set) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -602,7 +602,7 @@ class flat_set
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
    {  return this->tree_t::emplace_unique(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>: Inserts an object of type Key constructed with
@@ -618,18 +618,18 @@ class flat_set
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
    {  return this->tree_t::emplace_hint_unique(p, boost::forward<Args>(args)...); }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_FLAT_SET_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
    {  return this->tree_t::emplace_unique(BOOST_MOVE_FWD##N);  }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->tree_t::emplace_hint_unique(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_FLAT_SET_EMPLACE_CODE)
@@ -707,7 +707,7 @@ class flat_set
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
       {  this->tree_t::insert_unique(first, last);  }
 
    //! <b>Requires</b>: first, last are not iterators into *this and
@@ -721,7 +721,7 @@ class flat_set
    //!
    //! <b>Note</b>: Non-standard extension. If an element is inserted it might invalidate elements.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_unique_range_t, InputIterator first, InputIterator last)
+   inline void insert(ordered_unique_range_t, InputIterator first, InputIterator last)
       {  this->tree_t::insert_unique(ordered_unique_range, first, last);  }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -731,7 +731,7 @@ class flat_set
    //! <b>Complexity</b>: N log(N).
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {  this->tree_t::insert_unique(il.begin(), il.end()); }
 
    //! <b>Requires</b>: Range [il.begin(), il.end()) must be ordered according to the predicate
@@ -743,28 +743,28 @@ class flat_set
    //! <b>Complexity</b>: Linear.
    //!
    //! <b>Note</b>: Non-standard extension. If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_unique_range_t, std::initializer_list<value_type> il)
+   inline void insert(ordered_unique_range_t, std::initializer_list<value_type> il)
    {  this->tree_t::insert_unique(ordered_unique_range, il.begin(), il.end()); }
 #endif
 
    //! @copydoc ::boost::container::flat_map::merge(flat_map<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_set<Key, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_set<Key, C2, AllocatorOrContainer>& source)
    {  this->tree_t::merge_unique(source.tree());   }
 
    //! @copydoc ::boost::container::flat_set::merge(flat_set<Key, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_set<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_set<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_set<Key, C2, AllocatorOrContainer>&>(source));   }
 
    //! @copydoc ::boost::container::flat_map::merge(flat_multimap<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_multiset<Key, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_multiset<Key, C2, AllocatorOrContainer>& source)
    {  this->tree_t::merge_unique(source.tree());   }
 
    //! @copydoc ::boost::container::flat_set::merge(flat_multiset<Key, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_multiset<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_multiset<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_multiset<Key, C2, AllocatorOrContainer>&>(source));   }
 
    //! <b>Effects</b>: If present, erases the element in the container with key equivalent to x.
@@ -773,7 +773,7 @@ class flat_set
    //!
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //!   linear to the elements with bigger keys.
-   BOOST_CONTAINER_FORCEINLINE size_type erase(const key_type& x)
+   inline size_type erase(const key_type& x)
    {  return this->tree_t::erase_unique(x);   }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -917,7 +917,7 @@ class flat_set
    //! <b>Returns</b>: The number of elements with key equivalent to x.
    //!
    //! <b>Complexity</b>: log(size())+count(k)
-   BOOST_CONTAINER_FORCEINLINE size_type count(const key_type& x) const
+   inline size_type count(const key_type& x) const
    {  return static_cast<size_type>(this->tree_t::find(x) != this->tree_t::cend());  }
 
    //! <b>Requires</b>: This overload is available only if
@@ -927,7 +927,7 @@ class flat_set
    //!
    //! <b>Complexity</b>: log(size())+count(k)
    template<typename K>
-   BOOST_CONTAINER_FORCEINLINE size_type count(const K& x) const
+   inline size_type count(const K& x) const
       //Don't use find() != end optimization here as transparent comparators with key K might
       //return a different range than key_type (which can only return a single element range)
    {  return this->tree_t::count(x);  }
@@ -1019,13 +1019,13 @@ class flat_set
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_FORCEINLINE std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
+   inline std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
    {  return this->tree_t::lower_bound_range(x);  }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,iterator> equal_range(const key_type& x)
+   inline std::pair<iterator,iterator> equal_range(const key_type& x)
    {  return this->tree_t::lower_bound_range(x);  }
 
    //! <b>Requires</b>: This overload is available only if
@@ -1108,7 +1108,7 @@ class flat_set
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(NlogN) with N = seq.size()
    //!
    //! <b>Throws</b>: If the comparison or the move constructor throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
    {  this->tree_t::adopt_sequence_unique(boost::move(seq));  }
 
    //! <b>Requires</b>: seq shall be ordered according to this->compare()
@@ -1120,7 +1120,7 @@ class flat_set
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(1)
    //!
    //! <b>Throws</b>: If the move assignment throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(ordered_unique_range_t, BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(ordered_unique_range_t, BOOST_RV_REF(sequence_type) seq)
    {  this->tree_t::adopt_sequence_unique(ordered_unique_range_t(), boost::move(seq));  }
 
    //! <b>Effects</b>: Returns a const view of the underlying sequence.
@@ -1128,7 +1128,7 @@ class flat_set
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing
-   BOOST_CONTAINER_FORCEINLINE const sequence_type & sequence() const BOOST_NOEXCEPT
+   inline const sequence_type & sequence() const BOOST_NOEXCEPT
    {  return this->get_sequence_cref();  }
 };
 
@@ -1201,7 +1201,7 @@ template <class Key, class Compare, class AllocatorOrContainer>
 struct has_trivial_destructor_after_move<boost::container::flat_set<Key, Compare, AllocatorOrContainer> >
 {
    typedef ::boost::container::dtl::flat_tree<Key, ::boost::container::dtl::identity<Key>, Compare, AllocatorOrContainer> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
@@ -1279,47 +1279,47 @@ class flat_multiset
    typedef typename sequence_type::const_reverse_iterator                           const_reverse_iterator;
 
    //! @copydoc ::boost::container::flat_set::flat_set()
-   BOOST_CONTAINER_FORCEINLINE flat_multiset() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<AllocatorOrContainer>::value &&
+   inline flat_multiset() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<AllocatorOrContainer>::value &&
                                                                  dtl::is_nothrow_default_constructible<Compare>::value)
       : tree_t()
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(const Compare&)
-   BOOST_CONTAINER_FORCEINLINE explicit flat_multiset(const Compare& comp)
+   inline explicit flat_multiset(const Compare& comp)
       : tree_t(comp)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE explicit flat_multiset(const allocator_type& a)
+   inline explicit flat_multiset(const allocator_type& a)
       : tree_t(a)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(const Compare&, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(const Compare& comp, const allocator_type& a)
+   inline flat_multiset(const Compare& comp, const allocator_type& a)
       : tree_t(comp, a)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(InputIterator, InputIterator)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(InputIterator first, InputIterator last)
+   inline flat_multiset(InputIterator first, InputIterator last)
       : tree_t(false, first, last)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(InputIterator, InputIterator, const allocator_type&)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(InputIterator first, InputIterator last, const allocator_type& a)
+   inline flat_multiset(InputIterator first, InputIterator last, const allocator_type& a)
       : tree_t(false, first, last, a)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(InputIterator, InputIterator, const Compare& comp)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(InputIterator first, InputIterator last, const Compare& comp)
+   inline flat_multiset(InputIterator first, InputIterator last, const Compare& comp)
       : tree_t(false, first, last, comp)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(InputIterator, InputIterator, const Compare& comp, const allocator_type&)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline flat_multiset(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : tree_t(false, first, last, comp, a)
    {}
 
@@ -1333,7 +1333,7 @@ class flat_multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, InputIterator first, InputIterator last)
+   inline flat_multiset(ordered_range_t, InputIterator first, InputIterator last)
       : tree_t(ordered_range, first, last)
    {}
 
@@ -1347,7 +1347,7 @@ class flat_multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
+   inline flat_multiset(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : tree_t(ordered_range, first, last, comp)
    {}
 
@@ -1361,7 +1361,7 @@ class flat_multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline flat_multiset(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : tree_t(ordered_range, first, last, comp, a)
    {}
 
@@ -1375,28 +1375,28 @@ class flat_multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, InputIterator first, InputIterator last, const allocator_type &a)
+   inline flat_multiset(ordered_range_t, InputIterator first, InputIterator last, const allocator_type &a)
       : tree_t(ordered_range, first, last, Compare(), a)
    {}
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! @copydoc ::boost::container::flat_set::flat_set(std::initializer_list<value_type)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(std::initializer_list<value_type> il)
+   inline flat_multiset(std::initializer_list<value_type> il)
       : tree_t(false, il.begin(), il.end())
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(std::initializer_list<value_type>, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(std::initializer_list<value_type> il, const allocator_type& a)
+   inline flat_multiset(std::initializer_list<value_type> il, const allocator_type& a)
       : tree_t(false, il.begin(), il.end(), a)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(std::initializer_list<value_type>, const Compare& comp)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(std::initializer_list<value_type> il, const Compare& comp)
+   inline flat_multiset(std::initializer_list<value_type> il, const Compare& comp)
       : tree_t(false, il.begin(), il.end(), comp)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(std::initializer_list<value_type>, const Compare& comp, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline flat_multiset(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : tree_t(false, il.begin(), il.end(), comp, a)
    {}
 
@@ -1409,7 +1409,7 @@ class flat_multiset
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, std::initializer_list<value_type> il)
+   inline flat_multiset(ordered_range_t, std::initializer_list<value_type> il)
       : tree_t(ordered_range, il.begin(), il.end())
    {}
 
@@ -1422,7 +1422,7 @@ class flat_multiset
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline flat_multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : tree_t(ordered_range, il.begin(), il.end(), comp)
    {}
 
@@ -1435,38 +1435,38 @@ class flat_multiset
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline flat_multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : tree_t(ordered_range, il.begin(), il.end(), comp, a)
    {}
 #endif
 
    //! @copydoc ::boost::container::flat_set::flat_set(const flat_set &)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(const flat_multiset& x)
+   inline flat_multiset(const flat_multiset& x)
       : tree_t(static_cast<const tree_t&>(x))
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(flat_set &&)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(BOOST_RV_REF(flat_multiset) x)
+   inline flat_multiset(BOOST_RV_REF(flat_multiset) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : tree_t(boost::move(static_cast<tree_t&>(x)))
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(const flat_set &, const allocator_type &)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(const flat_multiset& x, const allocator_type &a)
+   inline flat_multiset(const flat_multiset& x, const allocator_type &a)
       : tree_t(static_cast<const tree_t&>(x), a)
    {}
 
    //! @copydoc ::boost::container::flat_set::flat_set(flat_set &&, const allocator_type &)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset(BOOST_RV_REF(flat_multiset) x, const allocator_type &a)
+   inline flat_multiset(BOOST_RV_REF(flat_multiset) x, const allocator_type &a)
       : tree_t(BOOST_MOVE_BASE(tree_t, x), a)
    {}
 
    //! @copydoc ::boost::container::flat_set::operator=(const flat_set &)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset& operator=(BOOST_COPY_ASSIGN_REF(flat_multiset) x)
+   inline flat_multiset& operator=(BOOST_COPY_ASSIGN_REF(flat_multiset) x)
    {  return static_cast<flat_multiset&>(this->tree_t::operator=(static_cast<const tree_t&>(x)));  }
 
    //! @copydoc ::boost::container::flat_set::operator=(flat_set &&)
-   BOOST_CONTAINER_FORCEINLINE flat_multiset& operator=(BOOST_RV_REF(flat_multiset) x)
+   inline flat_multiset& operator=(BOOST_RV_REF(flat_multiset) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -1566,7 +1566,7 @@ class flat_multiset
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_FWD_REF(Args)... args)
+   inline iterator emplace(BOOST_FWD_REF(Args)... args)
    {  return this->tree_t::emplace_equal(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>: Inserts an object of type Key constructed with
@@ -1581,18 +1581,18 @@ class flat_multiset
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
    {  return this->tree_t::emplace_hint_equal(p, boost::forward<Args>(args)...); }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_FLAT_MULTISET_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_MOVE_UREF##N)\
+   inline iterator emplace(BOOST_MOVE_UREF##N)\
    {  return this->tree_t::emplace_equal(BOOST_MOVE_FWD##N);  }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->tree_t::emplace_hint_equal(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_FLAT_MULTISET_EMPLACE_CODE)
@@ -1658,7 +1658,7 @@ class flat_multiset
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
       {  this->tree_t::insert_equal(first, last);  }
 
    //! <b>Requires</b>: first, last are not iterators into *this and
@@ -1671,7 +1671,7 @@ class flat_multiset
    //!
    //! <b>Note</b>: Non-standard extension. If an element is inserted it might invalidate elements.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_range_t, InputIterator first, InputIterator last)
+   inline void insert(ordered_range_t, InputIterator first, InputIterator last)
       {  this->tree_t::insert_equal(ordered_range, first, last);  }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -1680,7 +1680,7 @@ class flat_multiset
    //! <b>Complexity</b>: N log(N).
    //!
    //! <b>Note</b>: If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {  this->tree_t::insert_equal(il.begin(), il.end()); }
 
    //! <b>Requires</b>: Range [il.begin(), il.end()) must be ordered according to the predicate.
@@ -1691,28 +1691,28 @@ class flat_multiset
    //! <b>Complexity</b>: Linear.
    //!
    //! <b>Note</b>: Non-standard extension. If an element is inserted it might invalidate elements.
-   BOOST_CONTAINER_FORCEINLINE void insert(ordered_range_t, std::initializer_list<value_type> il)
+   inline void insert(ordered_range_t, std::initializer_list<value_type> il)
    {  this->tree_t::insert_equal(ordered_range, il.begin(), il.end()); }
 #endif
 
    //! @copydoc ::boost::container::flat_multimap::merge(flat_multimap<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_multiset<Key, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_multiset<Key, C2, AllocatorOrContainer>& source)
    {  this->tree_t::merge_equal(source.tree());   }
 
    //! @copydoc ::boost::container::flat_multiset::merge(flat_multiset<Key, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_multiset<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_multiset<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_multiset<Key, C2, AllocatorOrContainer>&>(source));   }
 
    //! @copydoc ::boost::container::flat_multimap::merge(flat_map<Key, T, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(flat_set<Key, C2, AllocatorOrContainer>& source)
+   inline void merge(flat_set<Key, C2, AllocatorOrContainer>& source)
    {  this->tree_t::merge_equal(source.tree());   }
 
    //! @copydoc ::boost::container::flat_multiset::merge(flat_set<Key, C2, AllocatorOrContainer>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_set<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG flat_set<Key, C2, AllocatorOrContainer> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_set<Key, C2, AllocatorOrContainer>&>(source));   }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1840,7 +1840,7 @@ class flat_multiset
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(NlogN) with N = seq.size()
    //!
    //! <b>Throws</b>: If the comparison or the move constructor throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(BOOST_RV_REF(sequence_type) seq)
    {  this->tree_t::adopt_sequence_equal(boost::move(seq));  }
 
    //! <b>Requires</b>: seq shall be ordered according to this->compare()
@@ -1851,7 +1851,7 @@ class flat_multiset
    //! <b>Complexity</b>: Assuming O(1) move assignment, O(1)
    //!
    //! <b>Throws</b>: If the move assignment throws
-   BOOST_CONTAINER_FORCEINLINE void adopt_sequence(ordered_range_t, BOOST_RV_REF(sequence_type) seq)
+   inline void adopt_sequence(ordered_range_t, BOOST_RV_REF(sequence_type) seq)
    {  this->tree_t::adopt_sequence_equal(ordered_range_t(), boost::move(seq));  }
 
    //! <b>Effects</b>: Returns a const view of the underlying sequence.
@@ -1859,7 +1859,7 @@ class flat_multiset
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing
-   BOOST_CONTAINER_FORCEINLINE const sequence_type & sequence() const BOOST_NOEXCEPT
+   inline const sequence_type & sequence() const BOOST_NOEXCEPT
    {  return this->get_sequence_cref();  }
 };
 
@@ -1932,7 +1932,7 @@ template <class Key, class Compare, class AllocatorOrContainer>
 struct has_trivial_destructor_after_move<boost::container::flat_multiset<Key, Compare, AllocatorOrContainer> >
 {
    typedef ::boost::container::dtl::flat_tree<Key, ::boost::container::dtl::identity<Key>, Compare, AllocatorOrContainer> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
diff --git a/inst/include/boost/container/list.hpp b/inst/include/boost/container/list.hpp
index 88fa4c381..1061446fc 100644
--- a/inst/include/boost/container/list.hpp
+++ b/inst/include/boost/container/list.hpp
@@ -43,7 +43,6 @@
 #  include <boost/move/detail/fwd_macros.hpp>
 #endif
 #include <boost/move/detail/move_helpers.hpp>
-#include <boost/move/detail/force_ptr.hpp>
 
 // intrusive
 #include <boost/intrusive/pointer_traits.hpp>
@@ -301,7 +300,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Linear to the number of elements.
-   BOOST_CONTAINER_FORCEINLINE ~list() BOOST_NOEXCEPT_OR_NOTHROW
+   inline ~list() BOOST_NOEXCEPT_OR_NOTHROW
    {} //AllocHolder clears the list
 
    //! <b>Effects</b>: Makes *this contain the same elements as x.
@@ -344,26 +343,13 @@ class list
                                   || allocator_traits_type::is_always_equal::value)
    {
       if (BOOST_LIKELY(this != &x)) {
-         NodeAlloc &this_alloc = this->node_alloc();
-         NodeAlloc &x_alloc    = x.node_alloc();
-         const bool propagate_alloc = allocator_traits_type::
-               propagate_on_container_move_assignment::value;
-         const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-         //Resources can be transferred if both allocators are
-         //going to be equal after this function (either propagated or already equal)
-         if(propagate_alloc || allocators_equal){
-            //Destroy
-            this->clear();
-            //Move allocator if needed
-            this->AllocHolder::move_assign_alloc(x);
-            //Obtain resources
-            this->icont() = boost::move(x.icont());
-         }
-         //Else do a one by one move
-         else{
-            this->assign( boost::make_move_iterator(x.begin())
-                        , boost::make_move_iterator(x.end()));
-         }
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
@@ -377,7 +363,7 @@ class list
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to the number of elements in x.
-   BOOST_CONTAINER_FORCEINLINE list& operator=(std::initializer_list<value_type> il)
+   inline list& operator=(std::initializer_list<value_type> il)
    {
       this->assign(il.begin(), il.end());
       return *this;
@@ -389,7 +375,7 @@ class list
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE void assign(size_type n, const T& val)
+   inline void assign(size_type n, const T& val)
    {
       typedef constant_iterator<value_type> cvalue_iterator;
       return this->assign(cvalue_iterator(val, n), cvalue_iterator());
@@ -426,7 +412,7 @@ class list
    //!   T's constructor from dereferencing std::initializer_list iterator throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE void assign(std::initializer_list<value_type> il)
+   inline void assign(std::initializer_list<value_type> il)
    { this->assign(il.begin(), il.end()); }
 #endif
 
@@ -435,7 +421,7 @@ class list
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return allocator_type(this->node_alloc()); }
 
@@ -446,7 +432,7 @@ class list
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->node_alloc(); }
 
@@ -457,7 +443,7 @@ class list
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->node_alloc(); }
 
@@ -472,7 +458,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    { return iterator(this->icont().begin()); }
 
@@ -481,7 +467,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->cbegin();   }
 
@@ -490,7 +476,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    {  return iterator(this->icont().end());  }
 
@@ -499,7 +485,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->cend();  }
 
@@ -509,7 +495,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
    {  return reverse_iterator(end());  }
 
@@ -519,7 +505,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->crbegin();  }
 
@@ -529,7 +515,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
    {  return reverse_iterator(begin());   }
 
@@ -539,7 +525,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->crend();   }
 
@@ -548,7 +534,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_iterator(this->non_const_icont().begin());   }
 
@@ -557,7 +543,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_iterator(this->non_const_icont().end());  }
 
@@ -567,7 +553,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_reverse_iterator(this->cend());  }
 
@@ -577,7 +563,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_reverse_iterator(this->cbegin());   }
 
@@ -592,7 +578,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return !this->size();  }
 
@@ -601,7 +587,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
    {   return this->icont().size();   }
 
@@ -610,7 +596,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return AllocHolder::max_size();  }
 
@@ -655,7 +641,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -670,7 +656,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -685,7 +671,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -700,7 +686,7 @@ class list
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference back() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1343,55 +1329,81 @@ class list
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const list& x, const list& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const list& x, const list& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const list& x, const list& y)
    {  return boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const list& x, const list& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const list& x, const list& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const list& x, const list& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE friend void swap(list& x, list& y)
+   inline friend void swap(list& x, list& y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
 
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits_type::value_type>::value));
+
+   void priv_move_assign(BOOST_RV_REF(list) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      this->AllocHolder::move_assign_alloc(x);
+      //Obtain resources
+      this->icont() = boost::move(x.icont());
+   }
+
+   void priv_move_assign(BOOST_RV_REF(list) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->node_alloc() == x.node_alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         this->assign(boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
+      }
+   }
+
    static bool priv_is_linked(const_iterator const position)
    {
       const_iterator cur(position);
@@ -1496,7 +1508,7 @@ struct has_trivial_destructor_after_move<boost::container::list<T, Allocator> >
 {
    typedef typename boost::container::list<T, Allocator>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
                              ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
diff --git a/inst/include/boost/container/map.hpp b/inst/include/boost/container/map.hpp
index 4669b27b3..cb13c03fd 100644
--- a/inst/include/boost/container/map.hpp
+++ b/inst/include/boost/container/map.hpp
@@ -44,8 +44,6 @@
 // intrusive/detail
 #include <boost/intrusive/detail/minimal_pair_header.hpp>      //pair
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>//less, equal
-// other
-#include <boost/static_assert.hpp>
 // std
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
@@ -130,7 +128,7 @@ class map
       (insert_return_type_base<iterator BOOST_MOVE_I node_type>)                    insert_return_type;
 
    //allocator_type::value_type type must be std::pair<CONST Key, T>
-   BOOST_STATIC_ASSERT((dtl::is_same<typename allocator_type::value_type, std::pair<const Key, T> >::value));
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<typename allocator_type::value_type, std::pair<const Key, T> >::value));
 
    //////////////////////////////////////////////
    //
@@ -141,7 +139,7 @@ class map
    //! <b>Effects</b>: Default constructs an empty map.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE 
+   inline 
    map() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value &&
                            dtl::is_nothrow_default_constructible<Compare>::value)
       : base_t()
@@ -151,21 +149,21 @@ class map
    //! and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE map(const Compare& comp, const allocator_type& a)
+   inline map(const Compare& comp, const allocator_type& a)
       : base_t(comp, a)
    {}
 
    //! <b>Effects</b>: Constructs an empty map using the specified comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit map(const Compare& comp)
+   inline explicit map(const Compare& comp)
       : base_t(comp)
    {}
 
    //! <b>Effects</b>: Constructs an empty map using the specified allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit map(const allocator_type& a)
+   inline explicit map(const allocator_type& a)
       : base_t(a)
    {}
 
@@ -175,7 +173,7 @@ class map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map(InputIterator first, InputIterator last)
+   inline map(InputIterator first, InputIterator last)
       : base_t(true, first, last)
    {}
 
@@ -185,7 +183,7 @@ class map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map(InputIterator first, InputIterator last, const allocator_type& a)
+   inline map(InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(true, first, last, Compare(), a)
    {}
 
@@ -195,7 +193,7 @@ class map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map(InputIterator first, InputIterator last, const Compare& comp)
+   inline map(InputIterator first, InputIterator last, const Compare& comp)
       : base_t(true, first, last, comp)
    {}
 
@@ -205,7 +203,7 @@ class map
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline map(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : base_t(true, first, last, comp, a)
    {}
 
@@ -220,7 +218,7 @@ class map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map( ordered_unique_range_t, InputIterator first, InputIterator last)
+   inline map( ordered_unique_range_t, InputIterator first, InputIterator last)
       : base_t(ordered_range, first, last)
    {}
 
@@ -235,7 +233,7 @@ class map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map( ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp)
+   inline map( ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : base_t(ordered_range, first, last, comp)
    {}
 
@@ -250,7 +248,7 @@ class map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map( ordered_unique_range_t, InputIterator first, InputIterator last
+   inline map( ordered_unique_range_t, InputIterator first, InputIterator last
       , const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, first, last, comp, a)
    {}
@@ -266,7 +264,7 @@ class map
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE map(ordered_unique_range_t, InputIterator first, InputIterator last, const allocator_type& a)
+   inline map(ordered_unique_range_t, InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(ordered_range, first, last, Compare(), a)
    {}
 
@@ -277,7 +275,7 @@ class map
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted according
    //! to the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE map(std::initializer_list<value_type> il)
+   inline map(std::initializer_list<value_type> il)
       : base_t(true, il.begin(), il.end())
    {}
 
@@ -286,7 +284,7 @@ class map
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE map(std::initializer_list<value_type> il, const Compare& comp)
+   inline map(std::initializer_list<value_type> il, const Compare& comp)
       : base_t(true, il.begin(), il.end(), comp)
    {}
 
@@ -295,7 +293,7 @@ class map
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE map(std::initializer_list<value_type> il, const allocator_type& a)
+   inline map(std::initializer_list<value_type> il, const allocator_type& a)
       : base_t(true, il.begin(), il.end(), Compare(), a)
    {}
 
@@ -304,7 +302,7 @@ class map
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE map(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline map(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(true, il.begin(), il.end(), comp, a)
    {}
 
@@ -317,7 +315,7 @@ class map
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE map(ordered_unique_range_t, std::initializer_list<value_type> il)
+   inline map(ordered_unique_range_t, std::initializer_list<value_type> il)
       : base_t(ordered_range, il.begin(), il.end())
    {}
 
@@ -331,7 +329,7 @@ class map
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE map(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline map(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : base_t(ordered_range, il.begin(), il.end(), comp)
    {}
 
@@ -345,7 +343,7 @@ class map
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE map( ordered_unique_range_t, std::initializer_list<value_type> il
+   inline map( ordered_unique_range_t, std::initializer_list<value_type> il
                                   , const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, il.begin(), il.end(), comp, a)
    {} 
@@ -355,7 +353,7 @@ class map
    //! <b>Effects</b>: Copy constructs a map.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE map(const map& x)
+   inline map(const map& x)
       : base_t(static_cast<const base_t&>(x))
    {}
 
@@ -364,7 +362,7 @@ class map
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE map(BOOST_RV_REF(map) x)
+   inline map(BOOST_RV_REF(map) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : base_t(BOOST_MOVE_BASE(base_t, x))
    {}
@@ -372,7 +370,7 @@ class map
    //! <b>Effects</b>: Copy constructs a map using the specified allocator.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE map(const map& x, const allocator_type &a)
+   inline map(const map& x, const allocator_type &a)
       : base_t(static_cast<const base_t&>(x), a)
    {}
 
@@ -382,14 +380,14 @@ class map
    //! <b>Complexity</b>: Constant if x == x.get_allocator(), linear otherwise.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE map(BOOST_RV_REF(map) x, const allocator_type &a)
+   inline map(BOOST_RV_REF(map) x, const allocator_type &a)
       : base_t(BOOST_MOVE_BASE(base_t, x), a)
    {}
 
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE map& operator=(BOOST_COPY_ASSIGN_REF(map) x)
+   inline map& operator=(BOOST_COPY_ASSIGN_REF(map) x)
    {  return static_cast<map&>(this->base_t::operator=(static_cast<const base_t&>(x)));  }
 
    //! <b>Effects</b>: this->swap(x.get()).
@@ -400,7 +398,7 @@ class map
    //! <b>Complexity</b>: Constant if allocator_traits_type::
    //!   propagate_on_container_move_assignment is true or
    //!   this->get>allocator() == x.get_allocator(). Linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE map& operator=(BOOST_RV_REF(map) x)
+   inline map& operator=(BOOST_RV_REF(map) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -409,7 +407,7 @@ class map
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! <b>Effects</b>: Assign content of il to *this.
    //!
-   BOOST_CONTAINER_FORCEINLINE map& operator=(std::initializer_list<value_type> il)
+   inline map& operator=(std::initializer_list<value_type> il)
    {
        this->clear();
        insert(il.begin(), il.end());
@@ -574,8 +572,8 @@ class map
    mapped_type& operator[](key_type &&k);
    #elif defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
       //in compilers like GCC 3.4, we can't catch temporaries
-      BOOST_CONTAINER_FORCEINLINE mapped_type& operator[](const key_type &k)         {  return this->priv_subscript(k);  }
-      BOOST_CONTAINER_FORCEINLINE mapped_type& operator[](BOOST_RV_REF(key_type) k)  {  return this->priv_subscript(::boost::move(k));  }
+      inline mapped_type& operator[](const key_type &k)         {  return this->priv_subscript(k);  }
+      inline mapped_type& operator[](BOOST_RV_REF(key_type) k)  {  return this->priv_subscript(::boost::move(k));  }
    #else
       BOOST_MOVE_CONVERSION_AWARE_CATCH( operator[] , key_type, mapped_type&, this->priv_subscript)
    #endif
@@ -593,7 +591,7 @@ class map
    //!
    //! <b>Complexity</b>: Logarithmic in the size of the container.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> insert_or_assign(const key_type& k, BOOST_FWD_REF(M) obj)
+   inline std::pair<iterator, bool> insert_or_assign(const key_type& k, BOOST_FWD_REF(M) obj)
    {  return this->base_t::insert_or_assign(const_iterator(), k, ::boost::forward<M>(obj));  }
 
    //! <b>Effects</b>: If a key equivalent to k already exists in the container, assigns forward<M>(obj)
@@ -609,7 +607,7 @@ class map
    //!
    //! <b>Complexity</b>: Logarithmic in the size of the container.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> insert_or_assign(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
+   inline std::pair<iterator, bool> insert_or_assign(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
    {  return this->base_t::insert_or_assign(const_iterator(), ::boost::move(k), ::boost::forward<M>(obj));  }
 
    //! <b>Effects</b>: If a key equivalent to k already exists in the container, assigns forward<M>(obj)
@@ -627,7 +625,7 @@ class map
    //! <b>Complexity</b>: Logarithmic in the size of the container in general, but amortized constant if
    //! the new element is inserted just before hint.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE iterator insert_or_assign(const_iterator hint, const key_type& k, BOOST_FWD_REF(M) obj)
+   inline iterator insert_or_assign(const_iterator hint, const key_type& k, BOOST_FWD_REF(M) obj)
    {  return this->base_t::insert_or_assign(hint, k, ::boost::forward<M>(obj)).first;  }
 
    //! <b>Effects</b>: If a key equivalent to k already exists in the container, assigns forward<M>(obj)
@@ -645,7 +643,7 @@ class map
    //! <b>Complexity</b>: Logarithmic in the size of the container in general, but amortized constant if
    //! the new element is inserted just before hint.
    template <class M>
-   BOOST_CONTAINER_FORCEINLINE iterator insert_or_assign(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
+   inline iterator insert_or_assign(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(M) obj)
    {  return this->base_t::insert_or_assign(hint, ::boost::move(k), ::boost::forward<M>(obj)).first;  }
 
    //! <b>Returns</b>: A reference to the element whose key is equivalent to x.
@@ -686,7 +684,7 @@ class map
    //!   points to the element with key equivalent to the key of x.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> insert(const value_type& x)
+   inline std::pair<iterator,bool> insert(const value_type& x)
    { return this->base_t::insert_unique_convertible(x); }
 
    //! <b>Effects</b>: Move constructs a new value from x if and only if there is
@@ -697,7 +695,7 @@ class map
    //!   points to the element with key equivalent to the key of x.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> insert(BOOST_RV_REF(value_type) x)
+   inline std::pair<iterator,bool> insert(BOOST_RV_REF(value_type) x)
    { return this->base_t::insert_unique_convertible(boost::move(x)); }
 
    //! <b>Effects</b>: Inserts a new value_type created from the pair if and only if
@@ -709,7 +707,7 @@ class map
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( std::pair<iterator BOOST_MOVE_I bool>
          , typename dtl::enable_if_c<
                dtl::is_convertible<Pair BOOST_MOVE_I value_type>::value ||
@@ -718,7 +716,7 @@ class map
       insert(BOOST_FWD_REF(Pair) x)
    {  return this->base_t::emplace_unique(boost::forward<Pair>(x)); }
 
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const value_type& x)
+   inline iterator insert(const_iterator p, const value_type& x)
    { return this->base_t::insert_unique_hint_convertible(p, x); }
 
    //! <b>Effects</b>: Inserts a copy of x in the container if and only if there is
@@ -730,7 +728,7 @@ class map
    //!
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(value_type) x)
+   inline iterator insert(const_iterator p, BOOST_RV_REF(value_type) x)
    { return this->base_t::insert_unique_hint_convertible(p, boost::move(x)); }
 
    //! <b>Effects</b>: Inserts a copy of x in the container if and only if there is
@@ -743,7 +741,7 @@ class map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( iterator
          , typename dtl::enable_if_c<
             dtl::is_convertible<Pair BOOST_MOVE_I value_type>::value  ||
@@ -763,7 +761,7 @@ class map
    //!
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(nonconst_value_type) x)
+   inline iterator insert(const_iterator p, BOOST_RV_REF(nonconst_value_type) x)
    { return this->try_emplace(p, boost::move(x.first), boost::move(x.second)); }
 
    //! <b>Effects</b>: Move constructs a new value from x if and only if there is
@@ -775,7 +773,7 @@ class map
    //!
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(movable_value_type) x)
+   inline iterator insert(const_iterator p, BOOST_RV_REF(movable_value_type) x)
    { return this->try_emplace(p, boost::move(x.first), boost::move(x.second)); }
 
    //! <b>Effects</b>: Inserts a copy of x in the container.
@@ -784,7 +782,7 @@ class map
    //! <b>Returns</b>: An iterator pointing to the element with key equivalent to the key of x.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const nonconst_value_type& x)
+   inline iterator insert(const_iterator p, const nonconst_value_type& x)
    { return this->try_emplace(p, x.first, x.second); }
 
 
@@ -796,7 +794,7 @@ class map
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from first to last)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
    {  this->base_t::insert_unique_range(first, last);  }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -804,7 +802,7 @@ class map
    //!   if there is no element with key equivalent to the key of that element.
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from il.begin() to il.end())
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {  this->base_t::insert_unique_range(il.begin(), il.end()); }
 #endif
 
@@ -854,7 +852,7 @@ class map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_unique(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>: Inserts an object of type T constructed with
@@ -868,7 +866,7 @@ class map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_hint_unique(p, boost::forward<Args>(args)...); }
 
    //! <b>Requires</b>: value_type shall be EmplaceConstructible into map from piecewise_construct, 
@@ -883,7 +881,7 @@ class map
    //! 
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(const key_type& k, BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator, bool> try_emplace(const key_type& k, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::try_emplace(const_iterator(), k, boost::forward<Args>(args)...); }
 
    //! <b>Requires</b>: value_type shall be EmplaceConstructible into map from piecewise_construct, 
@@ -898,7 +896,7 @@ class map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if value
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, const key_type &k, BOOST_FWD_REF(Args)... args)
+   inline iterator try_emplace(const_iterator hint, const key_type &k, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::try_emplace(hint, k, boost::forward<Args>(args)...).first; }
 
    //! <b>Requires</b>: value_type shall be EmplaceConstructible into map from piecewise_construct, 
@@ -913,7 +911,7 @@ class map
    //! 
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::try_emplace(const_iterator(), boost::move(k), boost::forward<Args>(args)...); }
 
    //! <b>Requires</b>: value_type shall be EmplaceConstructible into map from piecewise_construct, 
@@ -928,34 +926,34 @@ class map
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if value
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
+   inline iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::try_emplace(hint, boost::move(k), boost::forward<Args>(args)...).first; }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_MAP_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_unique(BOOST_MOVE_FWD##N);   }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_hint_unique(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N);  }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(const key_type& k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator, bool> try_emplace(const key_type& k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::try_emplace(const_iterator(), k BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, const key_type &k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator try_emplace(const_iterator hint, const key_type &k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::try_emplace(hint, k BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first; }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator, bool> try_emplace(BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::try_emplace(const_iterator(), boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator try_emplace(const_iterator hint, BOOST_RV_REF(key_type) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::try_emplace(hint, boost::move(k) BOOST_MOVE_I##N BOOST_MOVE_FWD##N).first; }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_MAP_EMPLACE_CODE)
@@ -968,7 +966,24 @@ class map
    //! <b>Returns</b>: Returns the number of erased elements (0/1).
    //!
    //! <b>Complexity</b>: log(size()) + count(k)
-   BOOST_CONTAINER_FORCEINLINE size_type erase(const key_type& x)
+   inline size_type erase(const key_type& x)
+      { return this->base_t::erase_unique(x); }
+
+   //! <b>Requires</b>: This overload is available only if
+   //! key_compare::is_transparent exists.
+   //!
+   //! <b>Effects</b>: If present, erases the element in the container with key equivalent to x.
+   //!
+   //! <b>Returns</b>: Returns the number of erased elements (0/1).
+   template <class K>
+   inline BOOST_CONTAINER_DOC1ST
+         (size_type
+         , typename dtl::enable_if_c<
+            dtl::is_transparent<key_compare>::value &&                  //transparent
+            !dtl::is_convertible<K BOOST_MOVE_I iterator>::value &&     //not convertible to iterator
+            !dtl::is_convertible<K BOOST_MOVE_I const_iterator>::value  //not convertible to const_iterator
+            BOOST_MOVE_I size_type>::type)
+      erase(const K& x)
       { return this->base_t::erase_unique(x); }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1032,7 +1047,7 @@ class map
    //!
    //! <b>Complexity</b>: N log(size() + N) (N has the value source.size())
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(map<Key, T, C2, Allocator, Options>& source)
+   inline void merge(map<Key, T, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <value_type_impl, select_1st_t, C2, Allocator, Options> base2_t;
@@ -1041,12 +1056,12 @@ class map
 
    //! @copydoc ::boost::container::map::merge(map<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG map<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG map<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<map<Key, T, C2, Allocator, Options>&>(source)); }
 
    //! @copydoc ::boost::container::map::merge(map<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(multimap<Key, T, C2, Allocator, Options>& source)
+   inline void merge(multimap<Key, T, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <value_type_impl, select_1st_t, C2, Allocator, Options> base2_t;
@@ -1055,7 +1070,7 @@ class map
 
    //! @copydoc ::boost::container::map::merge(map<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG multimap<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG multimap<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<multimap<Key, T, C2, Allocator, Options>&>(source)); }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1124,7 +1139,7 @@ class map
    //! <b>Returns</b>: The number of elements with key equivalent to x.
    //!
    //! <b>Complexity</b>: log(size())+count(k)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const key_type& x) const
    {  return static_cast<size_type>(this->find(x) != this->cend());  }
 
@@ -1135,7 +1150,7 @@ class map
    //!
    //! <b>Complexity</b>: log(size())+count(k)
    template<typename K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const K& x) const
    {  return static_cast<size_type>(this->find(x) != this->cend());  }
 
@@ -1296,7 +1311,7 @@ class map
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
    template<class KeyConvertible>
-   BOOST_CONTAINER_FORCEINLINE mapped_type& priv_subscript(BOOST_FWD_REF(KeyConvertible) k)
+   inline mapped_type& priv_subscript(BOOST_FWD_REF(KeyConvertible) k)
    {
       return this->try_emplace(boost::forward<KeyConvertible>(k)).first->second;
    }
@@ -1378,7 +1393,7 @@ template <class Key, class T, class Compare, class Allocator, class Options>
 struct has_trivial_destructor_after_move<boost::container::map<Key, T, Compare, Allocator, Options> >
 {
    typedef ::boost::container::dtl::tree<std::pair<const Key, T>, int, Compare, Allocator, Options> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
@@ -1460,7 +1475,7 @@ class multimap
          <key_type BOOST_MOVE_I mapped_type> >)                                     node_type;
 
    //allocator_type::value_type type must be std::pair<CONST Key, T>
-   BOOST_STATIC_ASSERT((dtl::is_same<typename allocator_type::value_type, std::pair<const Key, T> >::value));
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<typename allocator_type::value_type, std::pair<const Key, T> >::value));
 
    //////////////////////////////////////////////
    //
@@ -1471,7 +1486,7 @@ class multimap
    //! <b>Effects</b>: Default constructs an empty multimap.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE multimap()
+   inline multimap()
       BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value &&
                         dtl::is_nothrow_default_constructible<Compare>::value)
       : base_t()
@@ -1481,21 +1496,21 @@ class multimap
    //!   object and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit multimap(const allocator_type& a)
+   inline explicit multimap(const allocator_type& a)
       : base_t(a)
    {}
 
    //! <b>Effects</b>: Constructs an empty multimap using the specified comparison.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit multimap(const Compare& comp)
+   inline explicit multimap(const Compare& comp)
       : base_t(comp)
    {}
 
    //! <b>Effects</b>: Constructs an empty multimap using the specified comparison and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE multimap(const Compare& comp, const allocator_type& a)
+   inline multimap(const Compare& comp, const allocator_type& a)
       : base_t(comp, a)
    {}
 
@@ -1505,7 +1520,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(InputIterator first, InputIterator last)
+   inline multimap(InputIterator first, InputIterator last)
       : base_t(false, first, last)
    {}
 
@@ -1515,7 +1530,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(InputIterator first, InputIterator last, const allocator_type& a)
+   inline multimap(InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(false, first, last, Compare(), a)
    {}
 
@@ -1525,7 +1540,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(InputIterator first, InputIterator last, const Compare& comp)
+   inline multimap(InputIterator first, InputIterator last, const Compare& comp)
       : base_t(false, first, last, comp)
    {}
 
@@ -1535,7 +1550,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(InputIterator first, InputIterator last,
+   inline multimap(InputIterator first, InputIterator last,
             const Compare& comp, const allocator_type& a)
       : base_t(false, first, last, comp, a)
    {}
@@ -1550,7 +1565,7 @@ class multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, InputIterator first, InputIterator last)
+   inline multimap(ordered_range_t, InputIterator first, InputIterator last)
       : base_t(ordered_range, first, last)
    {}
 
@@ -1564,7 +1579,7 @@ class multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
+   inline multimap(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : base_t(ordered_range, first, last, comp)
    {}
 
@@ -1578,7 +1593,7 @@ class multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp,
+   inline multimap(ordered_range_t, InputIterator first, InputIterator last, const Compare& comp,
          const allocator_type& a)
       : base_t(ordered_range, first, last, comp, a)
    {}
@@ -1593,7 +1608,7 @@ class multimap
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, InputIterator first, InputIterator last, const allocator_type& a)
+   inline multimap(ordered_range_t, InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(ordered_range, first, last, Compare(), a)
    {}
 
@@ -1603,7 +1618,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE multimap(std::initializer_list<value_type> il)
+   inline multimap(std::initializer_list<value_type> il)
       : base_t(false, il.begin(), il.end())
    {}
 
@@ -1612,7 +1627,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE multimap(std::initializer_list<value_type> il, const allocator_type& a)
+   inline multimap(std::initializer_list<value_type> il, const allocator_type& a)
       : base_t(false, il.begin(), il.end(), Compare(), a)
    {}
 
@@ -1621,7 +1636,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE multimap(std::initializer_list<value_type> il, const Compare& comp)
+   inline multimap(std::initializer_list<value_type> il, const Compare& comp)
       : base_t(false, il.begin(), il.end(), comp)
    {}
 
@@ -1630,7 +1645,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is il.first() - il.end().
-   BOOST_CONTAINER_FORCEINLINE multimap(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline multimap(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(false, il.begin(), il.end(), comp, a)
    {}
 
@@ -1644,7 +1659,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, std::initializer_list<value_type> il)
+   inline multimap(ordered_range_t, std::initializer_list<value_type> il)
       : base_t(ordered_range, il.begin(), il.end())
    {}
 
@@ -1657,7 +1672,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline multimap(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : base_t(ordered_range, il.begin(), il.end(), comp)
    {}
 
@@ -1670,7 +1685,7 @@ class multimap
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE multimap(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline multimap(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, il.begin(), il.end(), comp, a)
    {}
 
@@ -1679,7 +1694,7 @@ class multimap
    //! <b>Effects</b>: Copy constructs a multimap.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE multimap(const multimap& x)
+   inline multimap(const multimap& x)
       : base_t(static_cast<const base_t&>(x))
    {}
 
@@ -1688,7 +1703,7 @@ class multimap
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE multimap(BOOST_RV_REF(multimap) x)
+   inline multimap(BOOST_RV_REF(multimap) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : base_t(BOOST_MOVE_BASE(base_t, x))
    {}
@@ -1696,7 +1711,7 @@ class multimap
    //! <b>Effects</b>: Copy constructs a multimap.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE multimap(const multimap& x, const allocator_type &a)
+   inline multimap(const multimap& x, const allocator_type &a)
       : base_t(static_cast<const base_t&>(x), a)
    {}
 
@@ -1705,20 +1720,20 @@ class multimap
    //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE multimap(BOOST_RV_REF(multimap) x, const allocator_type &a)
+   inline multimap(BOOST_RV_REF(multimap) x, const allocator_type &a)
       : base_t(BOOST_MOVE_BASE(base_t, x), a)
    {}
 
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE multimap& operator=(BOOST_COPY_ASSIGN_REF(multimap) x)
+   inline multimap& operator=(BOOST_COPY_ASSIGN_REF(multimap) x)
    {  return static_cast<multimap&>(this->base_t::operator=(static_cast<const base_t&>(x)));  }
 
    //! <b>Effects</b>: this->swap(x.get()).
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE multimap& operator=(BOOST_RV_REF(multimap) x)
+   inline multimap& operator=(BOOST_RV_REF(multimap) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -1727,7 +1742,7 @@ class multimap
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! <b>Effects</b>: Assign content of il to *this.
    //!
-   BOOST_CONTAINER_FORCEINLINE multimap& operator=(std::initializer_list<value_type> il)
+   inline multimap& operator=(std::initializer_list<value_type> il)
    {
        this->clear();
        insert(il.begin(), il.end());
@@ -1805,7 +1820,7 @@ class multimap
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_FWD_REF(Args)... args)
+   inline iterator emplace(BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_equal(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>: Inserts an object of type T constructed with
@@ -1818,18 +1833,18 @@ class multimap
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_hint_equal(p, boost::forward<Args>(args)...); }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_MULTIMAP_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_MOVE_UREF##N)\
+   inline iterator emplace(BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_equal(BOOST_MOVE_FWD##N);   }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_hint_equal(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N);  }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_MULTIMAP_EMPLACE_CODE)
@@ -1841,14 +1856,14 @@ class multimap
    //!   newly inserted element.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const value_type& x)
+   inline iterator insert(const value_type& x)
    { return this->base_t::insert_equal_convertible(x); }
 
    //! <b>Effects</b>: Inserts a new value move-constructed from x and returns
    //!   the iterator pointing to the newly inserted element.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(BOOST_RV_REF(value_type) x)
+   inline iterator insert(BOOST_RV_REF(value_type) x)
    { return this->base_t::insert_equal_convertible(boost::move(x)); }
 
    //! <b>Effects</b>: Inserts a new value constructed from x and returns
@@ -1856,7 +1871,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Logarithmic.
    template<class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( iterator
          , typename dtl::enable_if_c<
             dtl::is_convertible<Pair BOOST_MOVE_I value_type>::value  ||
@@ -1873,7 +1888,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, const value_type& x)
+   inline iterator insert(const_iterator p, const value_type& x)
    { return this->base_t::insert_equal_hint_convertible(p, x); }
 
    //! <b>Effects</b>: Inserts a new value move constructed from x in the container.
@@ -1884,7 +1899,7 @@ class multimap
    //!
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, BOOST_RV_REF(movable_value_type) x)
+   inline iterator insert(const_iterator p, BOOST_RV_REF(movable_value_type) x)
    { return this->base_t::insert_equal_hint_convertible(p, boost::move(x)); }
 
    //! <b>Effects</b>: Inserts a new value constructed from x in the container.
@@ -1896,7 +1911,7 @@ class multimap
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template<class Pair>
-   BOOST_CONTAINER_FORCEINLINE BOOST_CONTAINER_DOC1ST
+   inline BOOST_CONTAINER_DOC1ST
          ( iterator
          , typename dtl::enable_if_c<
             dtl::is_convertible<Pair BOOST_MOVE_I value_type>::value  ||
@@ -1911,14 +1926,14 @@ class multimap
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from first to last)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
    {  this->base_t::insert_equal_range(first, last); }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! <b>Effects</b>: inserts each element from the range [il.begin(), il.end().
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from il.begin() to il.end())
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {  this->base_t::insert_equal_range(il.begin(), il.end()); }
 #endif
 
@@ -1987,7 +2002,7 @@ class multimap
    //!
    //! <b>Complexity</b>: N log(size() + N) (N has the value source.size())
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(multimap<Key, T, C2, Allocator, Options>& source)
+   inline void merge(multimap<Key, T, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <value_type_impl, select_1st_t, C2, Allocator, Options> base2_t;
@@ -1996,12 +2011,12 @@ class multimap
 
    //! @copydoc ::boost::container::multimap::merge(multimap<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG multimap<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG multimap<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<multimap<Key, T, C2, Allocator, Options>&>(source)); }
 
    //! @copydoc ::boost::container::multimap::merge(multimap<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(map<Key, T, C2, Allocator, Options>& source)
+   inline void merge(map<Key, T, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <value_type_impl, select_1st_t, C2, Allocator, Options> base2_t;
@@ -2010,7 +2025,7 @@ class multimap
 
    //! @copydoc ::boost::container::multimap::merge(multimap<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG map<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG map<Key, T, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<map<Key, T, C2, Allocator, Options>&>(source)); }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -2300,7 +2315,7 @@ template <class Key, class T, class Compare, class Allocator, class Options>
 struct has_trivial_destructor_after_move<boost::container::multimap<Key, T, Compare, Allocator, Options> >
 {
    typedef ::boost::container::dtl::tree<std::pair<const Key, T>, int, Compare, Allocator, Options> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
diff --git a/inst/include/boost/container/new_allocator.hpp b/inst/include/boost/container/new_allocator.hpp
index 82c42a957..1dadb2b7a 100644
--- a/inst/include/boost/container/new_allocator.hpp
+++ b/inst/include/boost/container/new_allocator.hpp
@@ -33,7 +33,7 @@ namespace container {
 
 template<bool Value>
 struct new_allocator_bool
-{  static const bool value = Value;  };
+{  BOOST_STATIC_CONSTEXPR bool value = Value;  };
 
 template<class T>
 class new_allocator;
@@ -129,25 +129,23 @@ class new_allocator
 
    //!Default constructor
    //!Never throws
-   new_allocator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline new_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!Constructor from other new_allocator.
    //!Never throws
-   new_allocator(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline new_allocator(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!Copy assignment operator from other new_allocator.
    //!Never throws
-   new_allocator& operator=(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
-   {
-       return *this;
-   }
+   inline new_allocator& operator=(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   {  return *this;  }
 
    //!Constructor from related new_allocator.
    //!Never throws
    template<class T2>
-   new_allocator(const new_allocator<T2> &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline new_allocator(const new_allocator<T2> &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!Allocates memory for an array of count elements.
@@ -174,22 +172,22 @@ class new_allocator
 
    //!Returns the maximum number of elements that could be allocated.
    //!Never throws
-   size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return std::size_t(-1)/(2*sizeof(T));   }
 
    //!Swaps two allocators, does nothing
    //!because this new_allocator is stateless
-   friend void swap(new_allocator &, new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend void swap(new_allocator &, new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!An new_allocator always compares to true, as memory allocated with one
    //!instance can be deallocated by another instance
-   friend bool operator==(const new_allocator &, const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator==(const new_allocator &, const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return true;   }
 
    //!An new_allocator always compares to false, as memory allocated with one
    //!instance can be deallocated by another instance
-   friend bool operator!=(const new_allocator &, const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator!=(const new_allocator &, const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return false;   }
 };
 
diff --git a/inst/include/boost/container/node_allocator.hpp b/inst/include/boost/container/node_allocator.hpp
index 5f22cf252..14c375417 100644
--- a/inst/include/boost/container/node_allocator.hpp
+++ b/inst/include/boost/container/node_allocator.hpp
@@ -8,8 +8,8 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef BOOST_CONTAINER_POOLED_NODE_ALLOCATOR_HPP
-#define BOOST_CONTAINER_POOLED_NODE_ALLOCATOR_HPP
+#ifndef BOOST_CONTAINER_NODE_ALLOCATOR_HPP
+#define BOOST_CONTAINER_NODE_ALLOCATOR_HPP
 
 #ifndef BOOST_CONFIG_HPP
 #  include <boost/config.hpp>
@@ -26,11 +26,11 @@
 #include <boost/container/detail/node_pool.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/multiallocation_chain.hpp>
+#include <boost/move/detail/iterator_to_raw_pointer.hpp>
 #include <boost/container/detail/dlmalloc.hpp>
 #include <boost/container/detail/singleton.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <cstddef>
 
 namespace boost {
@@ -63,9 +63,9 @@ class node_allocator
    typedef unsigned int allocation_type;
    typedef node_allocator<T, NodesPerBlock, Version>   self_t;
 
-   static const std::size_t nodes_per_block = NodesPerBlock;
+   BOOST_STATIC_CONSTEXPR std::size_t nodes_per_block = NodesPerBlock;
 
-   BOOST_STATIC_ASSERT((Version <=2));
+   BOOST_CONTAINER_STATIC_ASSERT((Version <=2));
    #endif
 
    public:
@@ -189,7 +189,7 @@ class node_allocator
    pointer allocation_command
       (allocation_type command, size_type limit_size, size_type &prefer_in_recvd_out_size, pointer &reuse)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       pointer ret = this->priv_allocation_command(command, limit_size, prefer_in_recvd_out_size, reuse);
       if(BOOST_UNLIKELY(!ret && !(command & BOOST_CONTAINER_NOTHROW_ALLOCATION)))
          boost::container::throw_bad_alloc();
@@ -200,7 +200,7 @@ class node_allocator
    //!pointed by p can hold.
    size_type size(pointer p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       return dlmalloc_size(p);
    }
 
@@ -209,7 +209,7 @@ class node_allocator
    //!Throws bad_alloc if there is no enough memory
    pointer allocate_one()
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       typedef dtl::shared_node_pool
          <sizeof(T), NodesPerBlock> shared_pool_t;
       typedef dtl::singleton_default<shared_pool_t> singleton_t;
@@ -220,13 +220,16 @@ class node_allocator
    //!Elements must be individually deallocated with deallocate_one()
    void allocate_individual(std::size_t num_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       typedef dtl::shared_node_pool
          <sizeof(T), NodesPerBlock> shared_pool_t;
       typedef dtl::singleton_default<shared_pool_t> singleton_t;
       typename shared_pool_t::multiallocation_chain ch;
       singleton_t::instance().allocate_nodes(num_elements, ch);
-      chain.incorporate_after(chain.before_begin(), (T*)&*ch.begin(), (T*)&*ch.last(), ch.size());
+      chain.incorporate_after(chain.before_begin()
+                             , (T*)boost::movelib::iterator_to_raw_pointer(ch.begin())
+                             , (T*)boost::movelib::iterator_to_raw_pointer(ch.last())
+                             , ch.size());
    }
 
    //!Deallocates memory previously allocated with allocate_one().
@@ -234,7 +237,7 @@ class node_allocator
    //!with other functions different from allocate_one(). Never throws
    void deallocate_one(pointer p) BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       typedef dtl::shared_node_pool
          <sizeof(T), NodesPerBlock> shared_pool_t;
       typedef dtl::singleton_default<shared_pool_t> singleton_t;
@@ -243,11 +246,14 @@ class node_allocator
 
    void deallocate_individual(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       typedef dtl::shared_node_pool
          <sizeof(T), NodesPerBlock> shared_pool_t;
       typedef dtl::singleton_default<shared_pool_t> singleton_t;
-      typename shared_pool_t::multiallocation_chain ch(&*chain.begin(), &*chain.last(), chain.size());
+      typename shared_pool_t::multiallocation_chain ch
+         ( boost::movelib::iterator_to_raw_pointer(chain.begin())
+         , boost::movelib::iterator_to_raw_pointer(chain.last())
+         , chain.size());
       singleton_t::instance().deallocate_nodes(ch);
    }
 
@@ -255,7 +261,7 @@ class node_allocator
    //!Elements must be individually deallocated with deallocate()
    void allocate_many(size_type elem_size, std::size_t n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       dlmalloc_memchain ch;
       BOOST_CONTAINER_MEMCHAIN_INIT(&ch);
       if(BOOST_UNLIKELY(!dlmalloc_multialloc_nodes(n_elements, elem_size*sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS, &ch))){
@@ -271,7 +277,7 @@ class node_allocator
    //!Elements must be individually deallocated with deallocate()
    void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain)
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       dlmalloc_memchain ch;
       dlmalloc_multialloc_arrays(n_elements, elem_sizes, sizeof(T), BOOST_CONTAINER_DL_MULTIALLOC_DEFAULT_CONTIGUOUS, &ch);
       if(BOOST_UNLIKELY(BOOST_CONTAINER_MEMCHAIN_EMPTY(&ch))){
@@ -285,9 +291,9 @@ class node_allocator
 
    void deallocate_many(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW
    {
-      BOOST_STATIC_ASSERT(( Version > 1 ));
-      void *first = &*chain.begin();
-      void *last  = &*chain.last();
+      BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
+      void *first = boost::movelib::iterator_to_raw_pointer(chain.begin());
+      void *last  = boost::movelib::iterator_to_raw_pointer(chain.last());
       size_t num  = chain.size();
       dlmalloc_memchain ch;
       BOOST_CONTAINER_MEMCHAIN_INIT_FROM(&ch, first, last, num);
@@ -338,4 +344,4 @@ class node_allocator
 
 #include <boost/container/detail/config_end.hpp>
 
-#endif   //#ifndef BOOST_CONTAINER_POOLED_NODE_ALLOCATOR_HPP
+#endif   //#ifndef BOOST_CONTAINER_NODE_ALLOCATOR_HPP
diff --git a/inst/include/boost/container/node_handle.hpp b/inst/include/boost/container/node_handle.hpp
index 323b79c34..3ec8f7ee0 100644
--- a/inst/include/boost/container/node_handle.hpp
+++ b/inst/include/boost/container/node_handle.hpp
@@ -21,9 +21,9 @@
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/container/detail/placement_new.hpp>
 #include <boost/move/detail/to_raw_pointer.hpp>
+#include <boost/move/detail/launder.hpp>
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/mpl.hpp>
 
@@ -33,6 +33,12 @@
 #include <boost/container/detail/mpl.hpp>
 #include <boost/assert.hpp>
 
+//GCC 12 is confused about maybe uninitialized allocators
+#if defined(BOOST_GCC) && (BOOST_GCC >= 120000) && (BOOST_GCC < 130000)
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
 
 //!\file
 
@@ -60,11 +66,11 @@ class node_handle_friend
    public:
 
    template<class NH>
-   BOOST_CONTAINER_FORCEINLINE static void destroy_alloc(NH &nh) BOOST_NOEXCEPT
+   inline static void destroy_alloc(NH &nh) BOOST_NOEXCEPT
    {  nh.destroy_alloc();  }
 
    template<class NH>
-   BOOST_CONTAINER_FORCEINLINE static typename NH::node_pointer &get_node_pointer(NH &nh) BOOST_NOEXCEPT
+   inline static typename NH::node_pointer &get_node_pointer(NH &nh) BOOST_NOEXCEPT
    {  return nh.get_node_pointer();  }
 };
 
@@ -141,7 +147,7 @@ class node_handle
    }
 
    void destroy_alloc() BOOST_NOEXCEPT
-   {  static_cast<nallocator_type*>((void*)m_nalloc_storage.data)->~nallocator_type();  }
+   {  move_detail::launder_cast<nallocator_type*>(&m_nalloc_storage)->~nallocator_type();  }
 
    node_pointer &get_node_pointer() BOOST_NOEXCEPT
    {  return m_ptr;  }
@@ -226,7 +232,7 @@ class node_handle
       if(was_nh_non_null){
          if(was_this_non_null){
             this->destroy_deallocate_node();
-            if(nator_traits::propagate_on_container_move_assignment::value){
+            BOOST_IF_CONSTEXPR(nator_traits::propagate_on_container_move_assignment::value){
                this->node_alloc() = ::boost::move(nh.node_alloc());
             }
          }
@@ -252,7 +258,7 @@ class node_handle
    //! <b>Throws</b>: Nothing.
    value_type& value() const BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((dtl::is_same<KeyMapped, void>::value));
+      BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<KeyMapped, void>::value));
       BOOST_ASSERT(!empty());
       return m_ptr->get_data();
    }
@@ -267,7 +273,7 @@ class node_handle
    //! <b>Requires</b>: Modifying the key through the returned reference is permitted.
    key_type& key() const BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!dtl::is_same<KeyMapped, void>::value));
+      BOOST_CONTAINER_STATIC_ASSERT((!dtl::is_same<KeyMapped, void>::value));
       BOOST_ASSERT(!empty());
       return const_cast<key_type &>(KeyMapped().key_of_value(m_ptr->get_data()));
    }
@@ -280,7 +286,7 @@ class node_handle
    //! <b>Throws</b>: Nothing.
    mapped_type& mapped() const BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!dtl::is_same<KeyMapped, void>::value));
+      BOOST_CONTAINER_STATIC_ASSERT((!dtl::is_same<KeyMapped, void>::value));
       BOOST_ASSERT(!empty());
       return KeyMapped().mapped_of_value(m_ptr->get_data());
    }
@@ -299,10 +305,10 @@ class node_handle
    //! <b>Returns</b>: m_ptr != nullptr.
    //!
    #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-   BOOST_CONTAINER_FORCEINLINE explicit operator bool
+   inline explicit operator bool
    #else
    private: struct bool_conversion {int for_bool; int for_arg(); }; typedef int bool_conversion::* explicit_bool_arg;
-   public: BOOST_CONTAINER_FORCEINLINE operator explicit_bool_arg
+   public: inline operator explicit_bool_arg
    #endif
       ()const BOOST_NOEXCEPT
    {  return m_ptr ? &bool_conversion::for_bool  : explicit_bool_arg(0);  }
@@ -330,7 +336,7 @@ class node_handle
 
       if(was_nh_non_null){
          if(was_this_non_null){
-            if(nator_traits::propagate_on_container_swap::value){
+            BOOST_IF_CONSTEXPR(nator_traits::propagate_on_container_swap::value){
                ::boost::adl_move_swap(this->node_alloc(), nh.node_alloc());
             }
          }
@@ -343,6 +349,7 @@ class node_handle
          nh.move_construct_alloc(this->node_alloc());
          this->destroy_alloc();
       }
+
       ::boost::adl_move_swap(m_ptr, nh.m_ptr);
    }
 
@@ -375,7 +382,7 @@ class node_handle
    nallocator_type &node_alloc() BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
-      return *static_cast<nallocator_type*>((void*)m_nalloc_storage.data);
+      return *move_detail::launder_cast<nallocator_type*>(&m_nalloc_storage);
    }
 
 
@@ -385,7 +392,7 @@ class node_handle
    const nallocator_type &node_alloc() const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
-      return *static_cast<const nallocator_type*>((const void*)m_nalloc_storage.data);
+      return *move_detail::launder_cast<const nallocator_type*>(&m_nalloc_storage);
    }
 
    //! <b>Effects</b>: x.swap(y).
@@ -440,6 +447,10 @@ struct insert_return_type_base
 }  //namespace container {
 }  //namespace boost {
 
+#if defined(BOOST_GCC) && (BOOST_GCC >= 120000) && (BOOST_GCC < 130000)
+#pragma GCC diagnostic pop
+#endif
+
 #include <boost/container/detail/config_end.hpp>
 
 #endif   //BOOST_CONTAINER_NODE_HANDLE_HPP
diff --git a/inst/include/boost/container/options.hpp b/inst/include/boost/container/options.hpp
index c58ff82a2..13b168f1a 100644
--- a/inst/include/boost/container/options.hpp
+++ b/inst/include/boost/container/options.hpp
@@ -23,8 +23,8 @@
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/container_fwd.hpp>
+#include <boost/container/detail/workaround.hpp>
 #include <boost/intrusive/pack_options.hpp>
-#include <boost/static_assert.hpp>
 
 namespace boost {
 namespace container {
@@ -52,8 +52,8 @@ enum tree_type_enum
 template<tree_type_enum TreeType, bool OptimizeSize>
 struct tree_opt
 {
-   static const boost::container::tree_type_enum tree_type = TreeType;
-   static const bool optimize_size = OptimizeSize;
+   BOOST_STATIC_CONSTEXPR boost::container::tree_type_enum tree_type = TreeType;
+   BOOST_STATIC_CONSTEXPR bool optimize_size = OptimizeSize;
 };
 
 typedef tree_opt<red_black_tree, true> tree_assoc_defaults;
@@ -116,10 +116,10 @@ using tree_assoc_options_t = typename boost::container::tree_assoc_options<Optio
 template<bool StoreHash, bool CacheBegin, bool LinearBuckets, bool FastmodBuckets>
 struct hash_opt
 {
-   static const bool store_hash  = StoreHash;
-   static const bool cache_begin = CacheBegin;
-   static const bool linear_buckets = LinearBuckets;
-   static const bool fastmod_buckets = FastmodBuckets;
+   BOOST_STATIC_CONSTEXPR bool store_hash  = StoreHash;
+   BOOST_STATIC_CONSTEXPR bool cache_begin = CacheBegin;
+   BOOST_STATIC_CONSTEXPR bool linear_buckets = LinearBuckets;
+   BOOST_STATIC_CONSTEXPR bool fastmod_buckets = FastmodBuckets;
 };
 
 typedef hash_opt<false, false, false, false> hash_assoc_defaults;
@@ -203,13 +203,13 @@ struct default_if_void<void, Default>
 template<std::size_t N, std::size_t DefaultN>
 struct default_if_zero
 {
-   static const std::size_t value = N;
+   BOOST_STATIC_CONSTEXPR std::size_t value = N;
 };
 
 template<std::size_t DefaultN>
 struct default_if_zero<0u, DefaultN>
 {
-   static const std::size_t value = DefaultN;
+   BOOST_STATIC_CONSTEXPR std::size_t value = DefaultN;
 };
 
 
@@ -289,8 +289,8 @@ BOOST_INTRUSIVE_OPTION_TYPE(growth_factor, GrowthFactor, GrowthFactor, growth_fa
 //!
 //!If the maximum capacity() to be used is limited, a user can try to use 8-bit, 16-bit 
 //!(e.g. in 32-bit machines), or 32-bit size types (e.g. in a 64 bit machine) to see if some
-//!memory can be saved for empty vectors. This could potentially performance benefits due to better
-//!cache usage.
+//!memory can be saved, specially for empty containers. This could potentially improve performance
+//!due to better cache usage.
 //!
 //!Note that alignment requirements can disallow theoretical space savings. Example:
 //!\c vector holds a pointer and two size types (for size and capacity), in a 32 bit machine
@@ -301,7 +301,7 @@ BOOST_INTRUSIVE_OPTION_TYPE(growth_factor, GrowthFactor, GrowthFactor, growth_fa
 //!Measure the size of the resulting container and do not assume a smaller \c stored_size
 //!will always lead to a smaller sizeof(container).
 //!
-//!If a user tries to insert more elements than representable by \c stored_size, vector
+//!If a user tries to insert more elements than representable by \c stored_size, the container
 //!will throw a length_error.
 //!
 //!If this option is not specified, `allocator_traits<A>::size_type` (usually std::size_t) will
@@ -337,7 +337,6 @@ struct vector_options
 
 //! Helper alias metafunction to combine options into a single type to be used
 //! by \c boost::container::vector.
-//! Supported options are: \c boost::container::growth_factor and \c boost::container::stored_size
 template<class ...Options>
 using vector_options_t = typename boost::container::vector_options<Options...>::type;
 
@@ -360,20 +359,23 @@ BOOST_INTRUSIVE_OPTION_CONSTANT(inplace_alignment, std::size_t, Alignment, inpla
 
 #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-template<class GrowthType, std::size_t InplaceAlignment>
+template<class GrowthType, std::size_t InplaceAlignment, class StoredSizeType>
 struct small_vector_opt
 {
-   typedef GrowthType      growth_factor_type;
-   static const std::size_t inplace_alignment = InplaceAlignment;
+   typedef GrowthType     growth_factor_type;
+   BOOST_STATIC_CONSTEXPR std::size_t inplace_alignment = InplaceAlignment;
+   typedef StoredSizeType stored_size_type;
 };
 
-typedef small_vector_opt<void, 0u> small_vector_null_opt;
+typedef small_vector_opt<void, 0u, void> small_vector_null_opt;
 
 #endif    //!defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
 //! Helper metafunction to combine options into a single type to be used
 //! by \c boost::container::small_vector.
-//! Supported options are: \c boost::container::growth_factor and \c boost::container::inplace_alignment
+//! Supported options are: \c boost::container::growth_factor,
+//! \c boost::container::inplace_alignment and
+//! \c boost::container::stored_size.
 #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || defined(BOOST_CONTAINER_VARIADIC_TEMPLATES)
 template<class ...Options>
 #else
@@ -391,7 +393,9 @@ struct small_vector_options
       #endif
       >::type packed_options;
    typedef small_vector_opt< typename packed_options::growth_factor_type
-                           , packed_options::inplace_alignment> implementation_defined;
+                           , packed_options::inplace_alignment
+                           , typename packed_options::stored_size_type
+                           > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
 };
@@ -400,7 +404,6 @@ struct small_vector_options
 
 //! Helper alias metafunction to combine options into a single type to be used
 //! by \c boost::container::small_vector.
-//! Supported options are: \c boost::container::growth_factor and \c boost::container::stored_size
 template<class ...Options>
 using small_vector_options_t = typename boost::container::small_vector_options<Options...>::type;
 
@@ -427,20 +430,22 @@ BOOST_INTRUSIVE_OPTION_CONSTANT(throw_on_overflow, bool, ThrowOnOverflow, throw_
 
 #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-template<bool ThrowOnOverflow, std::size_t InplaceAlignment>
+template<bool ThrowOnOverflow, std::size_t InplaceAlignment, class StoredSizeType>
 struct static_vector_opt
 {
-   static const bool throw_on_overflow = ThrowOnOverflow;
-   static const std::size_t inplace_alignment = InplaceAlignment;
+   BOOST_STATIC_CONSTEXPR bool throw_on_overflow = ThrowOnOverflow;
+   BOOST_STATIC_CONSTEXPR std::size_t inplace_alignment = InplaceAlignment;
+   typedef StoredSizeType stored_size_type;
 };
 
-typedef static_vector_opt<true, 0u> static_vector_null_opt;
+typedef static_vector_opt<true, 0u, void> static_vector_null_opt;
 
 #endif    //!defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
 //! Helper metafunction to combine options into a single type to be used
 //! by \c boost::container::static_vector.
-//! Supported options are: \c boost::container::throw_on_overflow and \c boost::container::inplace_alignment
+//! Supported options are: \c boost::container::throw_on_overflow, \c boost::container::inplace_alignment
+//! and \c boost::container::stored_size.
 #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || defined(BOOST_CONTAINER_VARIADIC_TEMPLATES)
 template<class ...Options>
 #else
@@ -458,7 +463,9 @@ struct static_vector_options
       #endif
       >::type packed_options;
    typedef static_vector_opt< packed_options::throw_on_overflow
-                            , packed_options::inplace_alignment> implementation_defined;
+                            , packed_options::inplace_alignment
+                            , typename packed_options::stored_size_type
+                            > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
 };
@@ -467,7 +474,6 @@ struct static_vector_options
 
 //! Helper alias metafunction to combine options into a single type to be used
 //! by \c boost::container::static_vector.
-//! Supported options are: \c boost::container::growth_factor and \c boost::container::stored_size
 template<class ...Options>
 using static_vector_options_t = typename boost::container::static_vector_options<Options...>::type;
 
@@ -515,7 +521,7 @@ template<class GrowthType, class StoredSizeType, std::size_t FreeFraction>
 struct devector_opt
    : vector_opt<GrowthType, StoredSizeType>
 {
-   static const std::size_t free_fraction = FreeFraction;
+   BOOST_STATIC_CONSTEXPR std::size_t free_fraction = FreeFraction;
 };
 
 typedef devector_opt<void, void, 0u> devector_null_opt;
@@ -587,7 +593,6 @@ struct devector_options
 
 //! Helper alias metafunction to combine options into a single type to be used
 //! by \c boost::container::devector.
-//! Supported options are: \c boost::container::growth_factor and \c boost::container::stored_size
 template<class ...Options>
 using devector_options_t = typename boost::container::devector_options<Options...>::type;
 
@@ -606,9 +611,9 @@ using devector_options_t = typename boost::container::devector_options<Options..
 template<std::size_t BlockBytes, std::size_t BlockSize>
 struct deque_opt
 {
-   static const std::size_t block_bytes = BlockBytes;
-   static const std::size_t block_size  = BlockSize;
-   BOOST_STATIC_ASSERT_MSG(!(block_bytes && block_size), "block_bytes and block_size can't be specified at the same time");
+   BOOST_STATIC_CONSTEXPR std::size_t block_bytes = BlockBytes;
+   BOOST_STATIC_CONSTEXPR std::size_t block_size  = BlockSize;
+   BOOST_CONTAINER_STATIC_ASSERT_MSG(!(block_bytes && block_size), "block_bytes and block_size can't be specified at the same time");
 };
 
 typedef deque_opt<0u, 0u> deque_null_opt;
@@ -617,7 +622,7 @@ typedef deque_opt<0u, 0u> deque_null_opt;
 
 //! Helper metafunction to combine options into a single type to be used
 //! by \c boost::container::deque.
-//! Supported options are: \c boost::container::block_bytes
+//! Supported options are: \c boost::container::block_bytes and \c boost::container::block_size
 #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || defined(BOOST_CONTAINER_VARIADIC_TEMPLATES)
 template<class ...Options>
 #else
@@ -643,7 +648,6 @@ struct deque_options
 
 //! Helper alias metafunction to combine options into a single type to be used
 //! by \c boost::container::deque.
-//! Supported options are: \c boost::container::block_bytes
 template<class ...Options>
 using deque_options_t = typename boost::container::deque_options<Options...>::type;
 
diff --git a/inst/include/boost/container/pmr/memory_resource.hpp b/inst/include/boost/container/pmr/memory_resource.hpp
index 4187f05f3..b54e75f2d 100644
--- a/inst/include/boost/container/pmr/memory_resource.hpp
+++ b/inst/include/boost/container/pmr/memory_resource.hpp
@@ -32,7 +32,7 @@ class memory_resource
 {
    public:
    // For exposition only
-   static BOOST_CONSTEXPR_OR_CONST std::size_t max_align =
+   BOOST_STATIC_CONSTEXPR std::size_t max_align =
       boost::move_detail::alignment_of<boost::move_detail::max_align_t>::value;
 
    //! <b>Effects</b>: Destroys
diff --git a/inst/include/boost/container/pmr/monotonic_buffer_resource.hpp b/inst/include/boost/container/pmr/monotonic_buffer_resource.hpp
index 6799f4f27..a52bbf888 100644
--- a/inst/include/boost/container/pmr/monotonic_buffer_resource.hpp
+++ b/inst/include/boost/container/pmr/monotonic_buffer_resource.hpp
@@ -70,7 +70,7 @@ class BOOST_CONTAINER_DECL monotonic_buffer_resource
    //! to the upstream allocator
    //!
    //! <b>Note</b>: Non-standard extension.
-   static const std::size_t initial_next_buffer_size = 32u*sizeof(void*);
+   BOOST_STATIC_CONSTEXPR std::size_t initial_next_buffer_size = 32u*sizeof(void*);
 
    //! <b>Requires</b>: `upstream` shall be the address of a valid memory resource or `nullptr`
    //!
diff --git a/inst/include/boost/container/pmr/resource_adaptor.hpp b/inst/include/boost/container/pmr/resource_adaptor.hpp
index 3a7278625..e53a72097 100644
--- a/inst/include/boost/container/pmr/resource_adaptor.hpp
+++ b/inst/include/boost/container/pmr/resource_adaptor.hpp
@@ -36,19 +36,19 @@ namespace pmr_dtl {
 template<class T>
 struct max_allocator_alignment
 {
-   static const std::size_t value = 1;
+   BOOST_STATIC_CONSTEXPR std::size_t value = 1;
 };
 
 template<class T>
 struct max_allocator_alignment< ::boost::container::new_allocator<T> >
 {
-   static const std::size_t value = boost::move_detail::alignment_of<boost::move_detail::max_align_t>::value;
+   BOOST_STATIC_CONSTEXPR std::size_t value = boost::move_detail::alignment_of<boost::move_detail::max_align_t>::value;
 };
 
 template<class T>
 struct max_allocator_alignment< std::allocator<T> >
 {
-   static const std::size_t value = boost::move_detail::alignment_of<boost::move_detail::max_align_t>::value;
+   BOOST_STATIC_CONSTEXPR std::size_t value = boost::move_detail::alignment_of<boost::move_detail::max_align_t>::value;
 };
 
 }  //namespace pmr_dtl
@@ -87,7 +87,7 @@ class resource_adaptor_imp
    void static_assert_if_not_char_allocator() const
    {
       //This class can only be used with allocators type char
-      BOOST_STATIC_ASSERT((boost::container::dtl::is_same<typename Allocator::value_type, char>::value));
+      BOOST_CONTAINER_STATIC_ASSERT((boost::container::dtl::is_same<typename Allocator::value_type, char>::value));
    }
    #endif
 
diff --git a/inst/include/boost/container/scoped_allocator.hpp b/inst/include/boost/container/scoped_allocator.hpp
index 3e9c6847a..90e340622 100644
--- a/inst/include/boost/container/scoped_allocator.hpp
+++ b/inst/include/boost/container/scoped_allocator.hpp
@@ -56,7 +56,7 @@ struct is_scoped_allocator_imp
    template <typename T>
    static int test(...);
 
-   static const bool value = (sizeof(yes_type) == sizeof(test<Allocator>(0)));
+   BOOST_STATIC_CONSTEXPR bool value = (sizeof(yes_type) == sizeof(test<Allocator>(0)));
 };
 
 template<class MaybeScopedAlloc, bool = is_scoped_allocator_imp<MaybeScopedAlloc>::value >
@@ -77,10 +77,10 @@ struct outermost_allocator_imp
 {
    typedef MaybeScopedAlloc type;
 
-   BOOST_CONTAINER_FORCEINLINE static type &get(MaybeScopedAlloc &a)
+   inline static type &get(MaybeScopedAlloc &a)
    {  return a;  }
 
-   BOOST_CONTAINER_FORCEINLINE static const type &get(const MaybeScopedAlloc &a)
+   inline static const type &get(const MaybeScopedAlloc &a)
    {  return a;  }
 };
 
@@ -90,10 +90,10 @@ struct outermost_allocator_imp<MaybeScopedAlloc, true>
    typedef typename MaybeScopedAlloc::outer_allocator_type outer_type;
    typedef typename outermost_allocator_type_impl<outer_type>::type type;
 
-   BOOST_CONTAINER_FORCEINLINE static type &get(MaybeScopedAlloc &a)
+   inline static type &get(MaybeScopedAlloc &a)
    {  return outermost_allocator_imp<outer_type>::get(a.outer_allocator());  }
 
-   BOOST_CONTAINER_FORCEINLINE static const type &get(const MaybeScopedAlloc &a)
+   inline static const type &get(const MaybeScopedAlloc &a)
    {  return outermost_allocator_imp<outer_type>::get(a.outer_allocator());  }
 };
 
@@ -110,12 +110,12 @@ struct outermost_allocator
 {};
 
 template <typename Allocator>
-BOOST_CONTAINER_FORCEINLINE typename outermost_allocator<Allocator>::type &
+inline typename outermost_allocator<Allocator>::type &
    get_outermost_allocator(Allocator &a)
 {  return outermost_allocator<Allocator>::get(a);   }
 
 template <typename Allocator>
-BOOST_CONTAINER_FORCEINLINE const typename outermost_allocator<Allocator>::type &
+inline const typename outermost_allocator<Allocator>::type &
    get_outermost_allocator(const Allocator &a)
 {  return outermost_allocator<Allocator>::get(a);   }
 
@@ -159,34 +159,34 @@ class scoped_allocator_adaptor_base
       inner_allocator_type::is_always_equal::value
       > is_always_equal;
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base()
+   inline scoped_allocator_adaptor_base()
       {}
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc, const InnerAllocs &...args)
+   inline scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc, const InnerAllocs &...args)
       : outer_allocator_type(::boost::forward<OuterA2>(outerAlloc))
       , m_inner(args...)
       {}
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)
+   inline scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)
       : outer_allocator_type(other.outer_allocator())
       , m_inner(other.inner_allocator())
       {}
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
+   inline scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
       : outer_allocator_type(::boost::move(other.outer_allocator()))
       , m_inner(::boost::move(other.inner_allocator()))
       {}
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base
+   inline scoped_allocator_adaptor_base
       (const scoped_allocator_adaptor_base<OuterA2, InnerAllocs...>& other)
       : outer_allocator_type(other.outer_allocator())
       , m_inner(other.inner_allocator())
       {}
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base
+   inline scoped_allocator_adaptor_base
       (BOOST_RV_REF_BEG scoped_allocator_adaptor_base
          <OuterA2, InnerAllocs...> BOOST_RV_REF_END other)
       : outer_allocator_type(other.outer_allocator())
@@ -197,7 +197,7 @@ class scoped_allocator_adaptor_base
    struct internal_type_t{};
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base
+   inline scoped_allocator_adaptor_base
       ( internal_type_t
       , BOOST_FWD_REF(OuterA2) outerAlloc
       , const inner_allocator_type &inner)
@@ -207,7 +207,7 @@ class scoped_allocator_adaptor_base
 
    public:
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base &operator=
+   inline scoped_allocator_adaptor_base &operator=
       (BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor_base) other)
    {
       outer_allocator_type::operator=(other.outer_allocator());
@@ -215,35 +215,35 @@ class scoped_allocator_adaptor_base
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
+   inline scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
    {
       outer_allocator_type::operator=(boost::move(other.outer_allocator()));
       m_inner = ::boost::move(other.inner_allocator());
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void swap(scoped_allocator_adaptor_base &r)
+   inline void swap(scoped_allocator_adaptor_base &r)
    {
       boost::adl_move_swap(this->outer_allocator(), r.outer_allocator());
       boost::adl_move_swap(this->m_inner, r.inner_allocator());
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend void swap(scoped_allocator_adaptor_base &l, scoped_allocator_adaptor_base &r)
+   inline friend void swap(scoped_allocator_adaptor_base &l, scoped_allocator_adaptor_base &r)
    {  l.swap(r);  }
 
-   BOOST_CONTAINER_FORCEINLINE inner_allocator_type&       inner_allocator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline inner_allocator_type&       inner_allocator() BOOST_NOEXCEPT_OR_NOTHROW
       { return m_inner; }
 
-   BOOST_CONTAINER_FORCEINLINE inner_allocator_type const& inner_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline inner_allocator_type const& inner_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
       { return m_inner; }
 
-   BOOST_CONTAINER_FORCEINLINE outer_allocator_type      & outer_allocator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline outer_allocator_type      & outer_allocator() BOOST_NOEXCEPT_OR_NOTHROW
       { return static_cast<outer_allocator_type&>(*this); }
 
-   BOOST_CONTAINER_FORCEINLINE const outer_allocator_type &outer_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline const outer_allocator_type &outer_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
       { return static_cast<const outer_allocator_type&>(*this); }
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_type select_on_container_copy_construction() const
+   inline scoped_allocator_type select_on_container_copy_construction() const
    {
       return scoped_allocator_type
          (internal_type_t()
@@ -302,33 +302,33 @@ class scoped_allocator_adaptor_base<OuterAlloc, true, BOOST_MOVE_TARG##N>\
       inner_allocator_type::is_always_equal::value\
       > is_always_equal;\
    \
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(){}\
+   inline scoped_allocator_adaptor_base(){}\
    \
    template <class OuterA2>\
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc, BOOST_MOVE_CREF##N)\
+   inline scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc, BOOST_MOVE_CREF##N)\
       : outer_allocator_type(::boost::forward<OuterA2>(outerAlloc))\
       , m_inner(BOOST_MOVE_ARG##N)\
       {}\
    \
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)\
+   inline scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)\
       : outer_allocator_type(other.outer_allocator())\
       , m_inner(other.inner_allocator())\
       {}\
    \
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)\
+   inline scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)\
       : outer_allocator_type(::boost::move(other.outer_allocator()))\
       , m_inner(::boost::move(other.inner_allocator()))\
       {}\
    \
    template <class OuterA2>\
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base\
+   inline scoped_allocator_adaptor_base\
       (const scoped_allocator_adaptor_base<OuterA2, true, BOOST_MOVE_TARG##N>& other)\
       : outer_allocator_type(other.outer_allocator())\
       , m_inner(other.inner_allocator())\
       {}\
    \
    template <class OuterA2>\
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base\
+   inline scoped_allocator_adaptor_base\
       (BOOST_RV_REF_BEG scoped_allocator_adaptor_base<OuterA2, true, BOOST_MOVE_TARG##N> BOOST_RV_REF_END other)\
       : outer_allocator_type(other.outer_allocator())\
       , m_inner(other.inner_allocator())\
@@ -338,14 +338,14 @@ class scoped_allocator_adaptor_base<OuterAlloc, true, BOOST_MOVE_TARG##N>\
    struct internal_type_t{};\
    \
    template <class OuterA2>\
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base\
+   inline scoped_allocator_adaptor_base\
       ( internal_type_t, BOOST_FWD_REF(OuterA2) outerAlloc, const inner_allocator_type &inner)\
       : outer_allocator_type(::boost::forward<OuterA2>(outerAlloc))\
       , m_inner(inner)\
    {}\
    \
    public:\
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base &operator=\
+   inline scoped_allocator_adaptor_base &operator=\
       (BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor_base) other)\
    {\
       outer_allocator_type::operator=(other.outer_allocator());\
@@ -353,35 +353,35 @@ class scoped_allocator_adaptor_base<OuterAlloc, true, BOOST_MOVE_TARG##N>\
       return *this;\
    }\
    \
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)\
+   inline scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)\
    {\
       outer_allocator_type::operator=(boost::move(other.outer_allocator()));\
       m_inner = ::boost::move(other.inner_allocator());\
       return *this;\
    }\
    \
-   BOOST_CONTAINER_FORCEINLINE void swap(scoped_allocator_adaptor_base &r)\
+   inline void swap(scoped_allocator_adaptor_base &r)\
    {\
       boost::adl_move_swap(this->outer_allocator(), r.outer_allocator());\
       boost::adl_move_swap(this->m_inner, r.inner_allocator());\
    }\
    \
-   BOOST_CONTAINER_FORCEINLINE friend void swap(scoped_allocator_adaptor_base &l, scoped_allocator_adaptor_base &r)\
+   inline friend void swap(scoped_allocator_adaptor_base &l, scoped_allocator_adaptor_base &r)\
    {  l.swap(r);  }\
    \
-   BOOST_CONTAINER_FORCEINLINE inner_allocator_type&       inner_allocator()\
+   inline inner_allocator_type&       inner_allocator()\
       { return m_inner; }\
    \
-   BOOST_CONTAINER_FORCEINLINE inner_allocator_type const& inner_allocator() const\
+   inline inner_allocator_type const& inner_allocator() const\
       { return m_inner; }\
    \
-   BOOST_CONTAINER_FORCEINLINE outer_allocator_type      & outer_allocator()\
+   inline outer_allocator_type      & outer_allocator()\
       { return static_cast<outer_allocator_type&>(*this); }\
    \
-   BOOST_CONTAINER_FORCEINLINE const outer_allocator_type &outer_allocator() const\
+   inline const outer_allocator_type &outer_allocator() const\
       { return static_cast<const outer_allocator_type&>(*this); }\
    \
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_type select_on_container_copy_construction() const\
+   inline scoped_allocator_type select_on_container_copy_construction() const\
    {\
       return scoped_allocator_type\
          (internal_type_t()\
@@ -438,30 +438,30 @@ class scoped_allocator_adaptor_base< OuterAlloc BOOST_CONTAINER_SCOPEDALLOC_DUMM
    typedef typename outer_traits_type::
       is_always_equal                           is_always_equal;
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base()
+   inline scoped_allocator_adaptor_base()
       {}
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc)
+   inline scoped_allocator_adaptor_base(BOOST_FWD_REF(OuterA2) outerAlloc)
       : outer_allocator_type(::boost::forward<OuterA2>(outerAlloc))
       {}
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)
+   inline scoped_allocator_adaptor_base(const scoped_allocator_adaptor_base& other)
       : outer_allocator_type(other.outer_allocator())
       {}
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
+   inline scoped_allocator_adaptor_base(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
       : outer_allocator_type(::boost::move(other.outer_allocator()))
       {}
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base
+   inline scoped_allocator_adaptor_base
       (const scoped_allocator_adaptor_base<OuterA2 BOOST_CONTAINER_SCOPEDALLOC_DUMMYTRUE>& other)
       : outer_allocator_type(other.outer_allocator())
       {}
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base
+   inline scoped_allocator_adaptor_base
       (BOOST_RV_REF_BEG scoped_allocator_adaptor_base<OuterA2 BOOST_CONTAINER_SCOPEDALLOC_DUMMYTRUE> BOOST_RV_REF_END other)
       : outer_allocator_type(other.outer_allocator())
       {}
@@ -470,44 +470,44 @@ class scoped_allocator_adaptor_base< OuterAlloc BOOST_CONTAINER_SCOPEDALLOC_DUMM
    struct internal_type_t{};
 
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base(internal_type_t, BOOST_FWD_REF(OuterA2) outerAlloc, const inner_allocator_type &)
+   inline scoped_allocator_adaptor_base(internal_type_t, BOOST_FWD_REF(OuterA2) outerAlloc, const inner_allocator_type &)
       : outer_allocator_type(::boost::forward<OuterA2>(outerAlloc))
       {}
 
    public:
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base &operator=(BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor_base) other)
+   inline scoped_allocator_adaptor_base &operator=(BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor_base) other)
    {
       outer_allocator_type::operator=(other.outer_allocator());
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
+   inline scoped_allocator_adaptor_base &operator=(BOOST_RV_REF(scoped_allocator_adaptor_base) other)
    {
       outer_allocator_type::operator=(boost::move(other.outer_allocator()));
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void swap(scoped_allocator_adaptor_base &r)
+   inline void swap(scoped_allocator_adaptor_base &r)
    {
       boost::adl_move_swap(this->outer_allocator(), r.outer_allocator());
    }
 
-   BOOST_CONTAINER_FORCEINLINE friend void swap(scoped_allocator_adaptor_base &l, scoped_allocator_adaptor_base &r)
+   inline friend void swap(scoped_allocator_adaptor_base &l, scoped_allocator_adaptor_base &r)
    {  l.swap(r);  }
 
-   BOOST_CONTAINER_FORCEINLINE inner_allocator_type&       inner_allocator()
+   inline inner_allocator_type&       inner_allocator()
       { return static_cast<inner_allocator_type&>(*this); }
 
-   BOOST_CONTAINER_FORCEINLINE inner_allocator_type const& inner_allocator() const
+   inline inner_allocator_type const& inner_allocator() const
       { return static_cast<const inner_allocator_type&>(*this); }
 
-   BOOST_CONTAINER_FORCEINLINE outer_allocator_type      & outer_allocator()
+   inline outer_allocator_type      & outer_allocator()
       { return static_cast<outer_allocator_type&>(*this); }
 
-   BOOST_CONTAINER_FORCEINLINE const outer_allocator_type &outer_allocator() const
+   inline const outer_allocator_type &outer_allocator() const
       { return static_cast<const outer_allocator_type&>(*this); }
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_type select_on_container_copy_construction() const
+   inline scoped_allocator_type select_on_container_copy_construction() const
    {
       return scoped_allocator_type
          (internal_type_t()
@@ -639,21 +639,21 @@ class scoped_allocator_adaptor
 
    //! <b>Effects</b>: value-initializes the OuterAlloc base class
    //! and the inner allocator object.
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor()
+   inline scoped_allocator_adaptor()
       {}
 
-   BOOST_CONTAINER_FORCEINLINE ~scoped_allocator_adaptor()
+   inline ~scoped_allocator_adaptor()
       {}
 
    //! <b>Effects</b>: initializes each allocator within the adaptor with
    //! the corresponding allocator from other.
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(const scoped_allocator_adaptor& other)
+   inline scoped_allocator_adaptor(const scoped_allocator_adaptor& other)
       : base_type(other.base())
       {}
 
    //! <b>Effects</b>: move constructs each allocator within the adaptor with
    //! the corresponding allocator from other.
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(BOOST_RV_REF(scoped_allocator_adaptor) other)
+   inline scoped_allocator_adaptor(BOOST_RV_REF(scoped_allocator_adaptor) other)
       : base_type(::boost::move(other.base()))
       {}
 
@@ -665,14 +665,14 @@ class scoped_allocator_adaptor
    //! with innerAllocs...(hence recursively initializing each allocator within the adaptor with the
    //! corresponding allocator from the argument list).
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(BOOST_FWD_REF(OuterA2) outerAlloc, const InnerAllocs & ...innerAllocs)
+   inline scoped_allocator_adaptor(BOOST_FWD_REF(OuterA2) outerAlloc, const InnerAllocs & ...innerAllocs)
       : base_type(::boost::forward<OuterA2>(outerAlloc), innerAllocs...)
       {}
    #else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    #define BOOST_CONTAINER_SCOPED_ALLOCATOR_ADAPTOR_RELATED_ALLOCATOR_CONSTRUCTOR_CODE(N)\
    template <class OuterA2>\
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(BOOST_FWD_REF(OuterA2) outerAlloc BOOST_MOVE_I##N BOOST_MOVE_CREF##N)\
+   inline scoped_allocator_adaptor(BOOST_FWD_REF(OuterA2) outerAlloc BOOST_MOVE_I##N BOOST_MOVE_CREF##N)\
       : base_type(::boost::forward<OuterA2>(outerAlloc) BOOST_MOVE_I##N BOOST_MOVE_ARG##N)\
       {}\
    //
@@ -685,7 +685,7 @@ class scoped_allocator_adaptor
    //!
    //! <b>Effects</b>: initializes each allocator within the adaptor with the corresponding allocator from other.
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER> &other)
+   inline scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER> &other)
       : base_type(other.base())
       {}
 
@@ -694,15 +694,15 @@ class scoped_allocator_adaptor
    //! <b>Effects</b>: initializes each allocator within the adaptor with the corresponding allocator
    //! rvalue from other.
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(BOOST_RV_REF_BEG scoped_allocator_adaptor
+   inline scoped_allocator_adaptor(BOOST_RV_REF_BEG scoped_allocator_adaptor
       <OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER> BOOST_RV_REF_END other)
       : base_type(::boost::move(other.base()))
       {}
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor &operator=(BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor) other)
+   inline scoped_allocator_adaptor &operator=(BOOST_COPY_ASSIGN_REF(scoped_allocator_adaptor) other)
    {  return static_cast<scoped_allocator_adaptor&>(base_type::operator=(static_cast<const base_type &>(other))); }
 
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor &operator=(BOOST_RV_REF(scoped_allocator_adaptor) other)
+   inline scoped_allocator_adaptor &operator=(BOOST_RV_REF(scoped_allocator_adaptor) other)
    {  return static_cast<scoped_allocator_adaptor&>(base_type::operator=(boost::move(other.base()))); }
 
    #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -734,13 +734,13 @@ class scoped_allocator_adaptor
 
    //! <b>Returns</b>:
    //!   <code>allocator_traits<OuterAlloc>:: max_size(outer_allocator())</code>.
-   BOOST_CONTAINER_FORCEINLINE size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return outer_traits_type::max_size(this->outer_allocator());   }
 
    //! <b>Effects</b>:
    //!   calls <code>OUTERMOST_ALLOC_TRAITS(*this):: destroy(OUTERMOST(*this), p)</code>.
    template <class T>
-   BOOST_CONTAINER_FORCEINLINE void destroy(T* p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void destroy(T* p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       allocator_traits<typename outermost_allocator<OuterAlloc>::type>
          ::destroy(get_outermost_allocator(this->outer_allocator()), p);
@@ -748,17 +748,17 @@ class scoped_allocator_adaptor
 
    //! <b>Returns</b>:
    //! <code>allocator_traits<OuterAlloc>::allocate(outer_allocator(), n)</code>.
-   BOOST_CONTAINER_FORCEINLINE pointer allocate(size_type n)
+   inline pointer allocate(size_type n)
    {  return outer_traits_type::allocate(this->outer_allocator(), n);   }
 
    //! <b>Returns</b>:
    //! <code>allocator_traits<OuterAlloc>::allocate(outer_allocator(), n, hint)</code>.
-   BOOST_CONTAINER_FORCEINLINE pointer allocate(size_type n, const_void_pointer hint)
+   inline pointer allocate(size_type n, const_void_pointer hint)
    {  return outer_traits_type::allocate(this->outer_allocator(), n, hint);   }
 
    //! <b>Effects</b>:
    //! <code>allocator_traits<OuterAlloc>::deallocate(outer_allocator(), p, n)</code>.
-   BOOST_CONTAINER_FORCEINLINE void deallocate(pointer p, size_type n)
+   inline void deallocate(pointer p, size_type n)
    {  outer_traits_type::deallocate(this->outer_allocator(), p, n);  }
 
    #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -770,9 +770,9 @@ class scoped_allocator_adaptor
    #endif   //BOOST_CONTAINER_DOXYGEN_INVOKED
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
-   BOOST_CONTAINER_FORCEINLINE base_type &base()             { return *this; }
+   inline base_type &base()             { return *this; }
 
-   BOOST_CONTAINER_FORCEINLINE const base_type &base() const { return *this; }
+   inline const base_type &base() const { return *this; }
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -806,7 +806,7 @@ class scoped_allocator_adaptor
    //! to true but the specific constructor does not take an allocator. This definition prevents a silent
    //! failure to pass an inner allocator to a contained element. -end note]
    template < typename T, class ...Args>
-   BOOST_CONTAINER_FORCEINLINE void construct(T* p, BOOST_FWD_REF(Args)...args)
+   inline void construct(T* p, BOOST_FWD_REF(Args)...args)
    {
       dtl::dispatch_uses_allocator
          ( (get_outermost_allocator)(this->outer_allocator())
@@ -819,7 +819,7 @@ class scoped_allocator_adaptor
    //overload selection problems when the first parameter is a pair.
    #define BOOST_CONTAINER_SCOPED_ALLOCATOR_CONSTRUCT_CODE(N) \
    template < typename T BOOST_MOVE_I##N BOOST_MOVE_CLASSQ##N >\
-   BOOST_CONTAINER_FORCEINLINE void construct(T* p BOOST_MOVE_I##N BOOST_MOVE_UREFQ##N)\
+   inline void construct(T* p BOOST_MOVE_I##N BOOST_MOVE_UREFQ##N)\
    {\
       dtl::dispatch_uses_allocator\
          ( (get_outermost_allocator)(this->outer_allocator())\
@@ -836,7 +836,7 @@ class scoped_allocator_adaptor
    public:
    //Internal function
    template <class OuterA2>
-   BOOST_CONTAINER_FORCEINLINE scoped_allocator_adaptor(internal_type_t, BOOST_FWD_REF(OuterA2) outer, const inner_allocator_type& inner)
+   inline scoped_allocator_adaptor(internal_type_t, BOOST_FWD_REF(OuterA2) outer, const inner_allocator_type& inner)
       : base_type(internal_type_t(), ::boost::forward<OuterA2>(outer), inner)
    {}
 
@@ -851,17 +851,17 @@ struct scoped_allocator_operator_equal
    //Optimize equal outer allocator types with 
    //allocator_traits::equal which uses is_always_equal
    template<class IA>
-   BOOST_CONTAINER_FORCEINLINE static bool equal_outer(const IA &l, const IA &r)
+   inline static bool equal_outer(const IA &l, const IA &r)
    {  return allocator_traits<IA>::equal(l, r);  }
 
    //Otherwise compare it normally
    template<class IA1, class IA2>
-   BOOST_CONTAINER_FORCEINLINE static bool equal_outer(const IA1 &l, const IA2 &r)
+   inline static bool equal_outer(const IA1 &l, const IA2 &r)
    {  return l == r;  }
 
    //Otherwise compare it normally
    template<class IA>
-   BOOST_CONTAINER_FORCEINLINE static bool equal_inner(const IA &l, const IA &r)
+   inline static bool equal_inner(const IA &l, const IA &r)
    {  return allocator_traits<IA>::equal(l, r);  }
 };
 
@@ -873,14 +873,14 @@ struct scoped_allocator_operator_equal<true>
    //inner_allocator_type is the same as outer_allocator_type
    //so both types can be different in operator==
    template<class IA1, class IA2>
-   BOOST_CONTAINER_FORCEINLINE static bool equal_inner(const IA1 &, const IA2 &)
+   inline static bool equal_inner(const IA1 &, const IA2 &)
    {  return true;  }
 };
 
 /// @endcond
 
 template <typename OuterA1, typename OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNERCLASS>
-BOOST_CONTAINER_FORCEINLINE bool operator==(const scoped_allocator_adaptor<OuterA1, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER>& a
+inline bool operator==(const scoped_allocator_adaptor<OuterA1, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER>& a
                       ,const scoped_allocator_adaptor<OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER>& b)
 {
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -894,7 +894,7 @@ BOOST_CONTAINER_FORCEINLINE bool operator==(const scoped_allocator_adaptor<Outer
 }
 
 template <typename OuterA1, typename OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNERCLASS>
-BOOST_CONTAINER_FORCEINLINE bool operator!=(const scoped_allocator_adaptor<OuterA1, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER>& a
+inline bool operator!=(const scoped_allocator_adaptor<OuterA1, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER>& a
                       ,const scoped_allocator_adaptor<OuterA2, BOOST_CONTAINER_SCOPEDALLOC_ALLINNER>& b)
 {  return !(a == b);   }
 
diff --git a/inst/include/boost/container/set.hpp b/inst/include/boost/container/set.hpp
index f8a2efad2..e71a1ece3 100644
--- a/inst/include/boost/container/set.hpp
+++ b/inst/include/boost/container/set.hpp
@@ -113,7 +113,7 @@ class set
    //!
    //! <b>Complexity</b>: Constant.
    
-   BOOST_CONTAINER_FORCEINLINE set()
+   inline set()
       BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value &&
                         dtl::is_nothrow_default_constructible<Compare>::value)
       : base_t()
@@ -122,14 +122,14 @@ class set
    //! <b>Effects</b>: Constructs an empty set using the specified allocator object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit set(const allocator_type& a)
+   inline explicit set(const allocator_type& a)
       : base_t(a)
    {}
 
    //! <b>Effects</b>: Constructs an empty set using the specified comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit set(const Compare& comp)
+   inline explicit set(const Compare& comp)
       : base_t(comp)
    {}
 
@@ -137,7 +137,7 @@ class set
    //! and allocator.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE set(const Compare& comp, const allocator_type& a)
+   inline set(const Compare& comp, const allocator_type& a)
       : base_t(comp, a)
    {}
 
@@ -147,7 +147,7 @@ class set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set(InputIterator first, InputIterator last)
+   inline set(InputIterator first, InputIterator last)
       : base_t(true, first, last)
    {}
 
@@ -157,7 +157,7 @@ class set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set(InputIterator first, InputIterator last, const allocator_type& a)
+   inline set(InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(true, first, last, key_compare(), a)
    {}
 
@@ -167,7 +167,7 @@ class set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set(InputIterator first, InputIterator last, const Compare& comp)
+   inline set(InputIterator first, InputIterator last, const Compare& comp)
       : base_t(true, first, last, comp)
    {}
 
@@ -177,7 +177,7 @@ class set
    //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
    //! the predicate and otherwise N logN, where N is last - first.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline set(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : base_t(true, first, last, comp, a)
    {}
 
@@ -192,7 +192,7 @@ class set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set( ordered_unique_range_t, InputIterator first, InputIterator last)
+   inline set( ordered_unique_range_t, InputIterator first, InputIterator last)
       : base_t(ordered_range, first, last)
    {}
 
@@ -207,7 +207,7 @@ class set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set( ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp )
+   inline set( ordered_unique_range_t, InputIterator first, InputIterator last, const Compare& comp )
       : base_t(ordered_range, first, last, comp)
    {}
 
@@ -222,7 +222,7 @@ class set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set( ordered_unique_range_t, InputIterator first, InputIterator last
+   inline set( ordered_unique_range_t, InputIterator first, InputIterator last
       , const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, first, last, comp, a)
    {}
@@ -238,7 +238,7 @@ class set
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE set(ordered_unique_range_t, InputIterator first, InputIterator last, const allocator_type& a)
+   inline set(ordered_unique_range_t, InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(ordered_range, first, last, Compare(), a)
    {}
 
@@ -248,7 +248,7 @@ class set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE set(std::initializer_list<value_type> il)
+   inline set(std::initializer_list<value_type> il)
       : base_t(true, il.begin(), il.end())
    {}
 
@@ -257,7 +257,7 @@ class set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE set(std::initializer_list<value_type> il, const allocator_type& a)
+   inline set(std::initializer_list<value_type> il, const allocator_type& a)
       : base_t(true, il.begin(), il.end(), Compare(), a)
    {}
 
@@ -266,7 +266,7 @@ class set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE set(std::initializer_list<value_type> il, const Compare& comp )
+   inline set(std::initializer_list<value_type> il, const Compare& comp )
       : base_t(true, il.begin(), il.end(), comp)
    {}
 
@@ -275,7 +275,7 @@ class set
    //!
    //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
    //! the predicate and otherwise N logN, where N is il.begin() - il.end().
-   BOOST_CONTAINER_FORCEINLINE set(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline set(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(true, il.begin(), il.end(), comp, a)
    {}
 
@@ -289,7 +289,7 @@ class set
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE set( ordered_unique_range_t, std::initializer_list<value_type> il)
+   inline set( ordered_unique_range_t, std::initializer_list<value_type> il)
       : base_t(ordered_range, il.begin(), il.end())
    {}
 
@@ -303,7 +303,7 @@ class set
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE set( ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline set( ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : base_t(ordered_range, il.begin(), il.end(), comp)
    {}
 
@@ -317,7 +317,7 @@ class set
    //! <b>Complexity</b>: Linear in N.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE set( ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline set( ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, il.begin(), il.end(), comp, a)
    {}
 #endif
@@ -325,7 +325,7 @@ class set
    //! <b>Effects</b>: Copy constructs a set.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE set(const set& x)
+   inline set(const set& x)
       : base_t(static_cast<const base_t&>(x))
    {}
 
@@ -334,7 +334,7 @@ class set
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Postcondition</b>: x is emptied.
-   BOOST_CONTAINER_FORCEINLINE set(BOOST_RV_REF(set) x)
+   inline set(BOOST_RV_REF(set) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : base_t(BOOST_MOVE_BASE(base_t, x))
    {}
@@ -342,7 +342,7 @@ class set
    //! <b>Effects</b>: Copy constructs a set using the specified allocator.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE set(const set& x, const allocator_type &a)
+   inline set(const set& x, const allocator_type &a)
       : base_t(static_cast<const base_t&>(x), a)
    {}
 
@@ -350,14 +350,14 @@ class set
    //!                 Constructs *this using x's resources.
    //!
    //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE set(BOOST_RV_REF(set) x, const allocator_type &a)
+   inline set(BOOST_RV_REF(set) x, const allocator_type &a)
       : base_t(BOOST_MOVE_BASE(base_t, x), a)
    {}
 
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
-   BOOST_CONTAINER_FORCEINLINE set& operator=(BOOST_COPY_ASSIGN_REF(set) x)
+   inline set& operator=(BOOST_COPY_ASSIGN_REF(set) x)
    {  return static_cast<set&>(this->base_t::operator=(static_cast<const base_t&>(x)));  }
 
    //! <b>Effects</b>: this->swap(x.get()).
@@ -368,7 +368,7 @@ class set
    //! <b>Complexity</b>: Constant if allocator_traits_type::
    //!   propagate_on_container_move_assignment is true or
    //!   this->get>allocator() == x.get_allocator(). Linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE set& operator=(BOOST_RV_REF(set) x)
+   inline set& operator=(BOOST_RV_REF(set) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -541,7 +541,7 @@ class set
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
+   inline std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_unique(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>:  Inserts an object of type Key constructed with
@@ -554,18 +554,18 @@ class set
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_hint_unique(p, boost::forward<Args>(args)...); }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_SET_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
+   inline std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_unique(BOOST_MOVE_FWD##N);  }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_hint_unique(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_SET_EMPLACE_CODE)
@@ -632,7 +632,7 @@ class set
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from first to last)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
    {  this->base_t::insert_unique_range(first, last);  }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -640,21 +640,21 @@ class set
    //!   if there is no element with key equivalent to the key of that element.
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from il.begin() to il.end())
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {  this->base_t::insert_unique_range(il.begin(), il.end()); }
 #endif
 
    //! @copydoc ::boost::container::map::insert(node_type&&)
-   BOOST_CONTAINER_FORCEINLINE insert_return_type insert(BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
+   inline insert_return_type insert(BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
    {  return this->base_t::insert_unique_node(boost::move(nh));  }
 
    //! @copydoc ::boost::container::map::insert(const_iterator, node_type&&)
-   BOOST_CONTAINER_FORCEINLINE insert_return_type insert(const_iterator hint, BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
+   inline insert_return_type insert(const_iterator hint, BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
    {  return this->base_t::insert_unique_node(hint, boost::move(nh));  }
 
    //! @copydoc ::boost::container::map::merge(map<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(set<Key, C2, Allocator, Options>& source)
+   inline void merge(set<Key, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <Key, void, C2, Allocator, Options> base2_t;
@@ -663,12 +663,12 @@ class set
 
    //! @copydoc ::boost::container::set::merge(set<Key, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG set<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG set<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<set<Key, C2, Allocator, Options>&>(source));   }
 
    //! @copydoc ::boost::container::map::merge(multimap<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(multiset<Key, C2, Allocator, Options>& source)
+   inline void merge(multiset<Key, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <Key, void, C2, Allocator, Options> base2_t;
@@ -677,7 +677,7 @@ class set
 
    //! @copydoc ::boost::container::set::merge(multiset<Key, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG multiset<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG multiset<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<multiset<Key, C2, Allocator, Options>&>(source));   }
 
    //! <b>Effects</b>: If present, erases the element in the container with key equivalent to x.
@@ -685,7 +685,7 @@ class set
    //! <b>Returns</b>: Returns the number of erased elements (0/1).
    //!
    //! <b>Complexity</b>: log(size()) + count(k)
-   BOOST_CONTAINER_FORCEINLINE size_type erase(const key_type& x)
+   inline size_type erase(const key_type& x)
    {  return this->base_t::erase_unique(x);   }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -779,7 +779,7 @@ class set
    //! <b>Returns</b>: The number of elements with key equivalent to x.
    //!
    //! <b>Complexity</b>: log(size())+count(k)
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const key_type& x) const
    {  return static_cast<size_type>(this->base_t::find(x) != this->base_t::cend());  }
 
@@ -790,7 +790,7 @@ class set
    //!
    //! <b>Complexity</b>: log(size())+count(k)
    template<typename K>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type count(const K& x) const
    {  return static_cast<size_type>(this->find(x) != this->cend());  }
 
@@ -881,13 +881,13 @@ class set
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,iterator> equal_range(const key_type& x)
+   inline std::pair<iterator,iterator> equal_range(const key_type& x)
    {  return this->base_t::lower_bound_range(x);  }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
-   BOOST_CONTAINER_FORCEINLINE std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
+   inline std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
    {  return this->base_t::lower_bound_range(x);  }
 
    //! <b>Requires</b>: This overload is available only if
@@ -897,7 +897,7 @@ class set
    //!
    //! <b>Complexity</b>: Logarithmic
    template<typename K>
-   BOOST_CONTAINER_FORCEINLINE std::pair<iterator,iterator> equal_range(const K& x)
+   inline std::pair<iterator,iterator> equal_range(const K& x)
    {  return this->base_t::lower_bound_range(x);  }
 
    //! <b>Requires</b>: This overload is available only if
@@ -907,7 +907,7 @@ class set
    //!
    //! <b>Complexity</b>: Logarithmic
    template<typename K>
-   BOOST_CONTAINER_FORCEINLINE std::pair<const_iterator,const_iterator> equal_range(const K& x) const
+   inline std::pair<const_iterator,const_iterator> equal_range(const K& x) const
    {  return this->base_t::lower_bound_range(x);  }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1026,7 +1026,7 @@ template <class Key, class Compare, class Allocator, class Options>
 struct has_trivial_destructor_after_move<boost::container::set<Key, Compare, Allocator, Options> >
 {
    typedef ::boost::container::dtl::tree<Key, void, Compare, Allocator, Options> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
@@ -1097,48 +1097,48 @@ class multiset
    //////////////////////////////////////////////
 
    //! @copydoc ::boost::container::set::set()
-   BOOST_CONTAINER_FORCEINLINE multiset()
+   inline multiset()
       BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value &&
                         dtl::is_nothrow_default_constructible<Compare>::value)
       : base_t()
    {}
 
    //! @copydoc ::boost::container::set::set(const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE explicit multiset(const allocator_type& a)
+   inline explicit multiset(const allocator_type& a)
       : base_t(a)
    {}
 
    //! @copydoc ::boost::container::set::set(const Compare&)
-   BOOST_CONTAINER_FORCEINLINE explicit multiset(const Compare& comp)
+   inline explicit multiset(const Compare& comp)
       : base_t(comp)
    {}
 
    //! @copydoc ::boost::container::set::set(const Compare&, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE multiset(const Compare& comp, const allocator_type& a)
+   inline multiset(const Compare& comp, const allocator_type& a)
       : base_t(comp, a)
    {}
 
    //! @copydoc ::boost::container::set::set(InputIterator, InputIterator)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset(InputIterator first, InputIterator last)
+   inline multiset(InputIterator first, InputIterator last)
       : base_t(false, first, last)
    {}
 
    //! @copydoc ::boost::container::set::set(InputIterator, InputIterator, const allocator_type&)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset(InputIterator first, InputIterator last, const allocator_type& a)
+   inline multiset(InputIterator first, InputIterator last, const allocator_type& a)
       : base_t(false, first, last, key_compare(), a)
    {}
 
    //! @copydoc ::boost::container::set::set(InputIterator, InputIterator, const Compare&)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset(InputIterator first, InputIterator last, const Compare& comp)
+   inline multiset(InputIterator first, InputIterator last, const Compare& comp)
       : base_t(false, first, last, comp)
    {}
 
    //! @copydoc ::boost::container::set::set(InputIterator, InputIterator, const Compare&, const allocator_type&)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline multiset(InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : base_t(false, first, last, comp, a)
    {}
 
@@ -1152,7 +1152,7 @@ class multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset( ordered_range_t, InputIterator first, InputIterator last )
+   inline multiset( ordered_range_t, InputIterator first, InputIterator last )
       : base_t(ordered_range, first, last)
    {}
 
@@ -1166,7 +1166,7 @@ class multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset( ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
+   inline multiset( ordered_range_t, InputIterator first, InputIterator last, const Compare& comp)
       : base_t(ordered_range, first, last, comp)
    {}
 
@@ -1180,7 +1180,7 @@ class multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset( ordered_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
+   inline multiset( ordered_range_t, InputIterator first, InputIterator last, const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, first, last, comp, a)
    {}
 
@@ -1194,74 +1194,74 @@ class multiset
    //!
    //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE multiset(ordered_range_t, InputIterator first, InputIterator last, const allocator_type &a)
+   inline multiset(ordered_range_t, InputIterator first, InputIterator last, const allocator_type &a)
       : base_t(ordered_range, first, last, Compare(), a)
    {}
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! @copydoc ::boost::container::set::set(std::initializer_list<value_type>)
-   BOOST_CONTAINER_FORCEINLINE multiset(std::initializer_list<value_type> il)
+   inline multiset(std::initializer_list<value_type> il)
       : base_t(false, il.begin(), il.end())
    {}
 
    //! @copydoc ::boost::container::set::set(std::initializer_list<value_type>, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE multiset(std::initializer_list<value_type> il, const allocator_type& a)
+   inline multiset(std::initializer_list<value_type> il, const allocator_type& a)
       : base_t(false, il.begin(), il.end(), Compare(), a)
    {}
 
    //! @copydoc ::boost::container::set::set(std::initializer_list<value_type>, const Compare&)
-   BOOST_CONTAINER_FORCEINLINE multiset(std::initializer_list<value_type> il, const Compare& comp)
+   inline multiset(std::initializer_list<value_type> il, const Compare& comp)
       : base_t(false, il.begin(), il.end(), comp)
    {}
 
    //! @copydoc ::boost::container::set::set(std::initializer_list<value_type>, const Compare&, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE multiset(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline multiset(std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(false, il.begin(), il.end(), comp, a)
    {}
 
    //! @copydoc ::boost::container::set::set(ordered_unique_range_t, std::initializer_list<value_type>)
-   BOOST_CONTAINER_FORCEINLINE multiset(ordered_range_t, std::initializer_list<value_type> il)
+   inline multiset(ordered_range_t, std::initializer_list<value_type> il)
       : base_t(ordered_range, il.begin(), il.end())
    {}
 
    //! @copydoc ::boost::container::set::set(ordered_unique_range_t, std::initializer_list<value_type>, const Compare&)
-   BOOST_CONTAINER_FORCEINLINE multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
+   inline multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp)
       : base_t(ordered_range, il.begin(), il.end(), comp)
    {}
 
    //! @copydoc ::boost::container::set::set(ordered_unique_range_t, std::initializer_list<value_type>, const Compare&, const allocator_type&)
-   BOOST_CONTAINER_FORCEINLINE multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
+   inline multiset(ordered_range_t, std::initializer_list<value_type> il, const Compare& comp, const allocator_type& a)
       : base_t(ordered_range, il.begin(), il.end(), comp, a)
    {}
 #endif
 
    //! @copydoc ::boost::container::set::set(const set &)
-   BOOST_CONTAINER_FORCEINLINE multiset(const multiset& x)
+   inline multiset(const multiset& x)
       : base_t(static_cast<const base_t&>(x))
    {}
 
    //! @copydoc ::boost::container::set::set(set &&)
-   BOOST_CONTAINER_FORCEINLINE multiset(BOOST_RV_REF(multiset) x)
+   inline multiset(BOOST_RV_REF(multiset) x)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<Compare>::value)
       : base_t(BOOST_MOVE_BASE(base_t, x))
    {}
 
    //! @copydoc ::boost::container::set::set(const set &, const allocator_type &)
-   BOOST_CONTAINER_FORCEINLINE multiset(const multiset& x, const allocator_type &a)
+   inline multiset(const multiset& x, const allocator_type &a)
       : base_t(static_cast<const base_t&>(x), a)
    {}
 
    //! @copydoc ::boost::container::set::set(set &&, const allocator_type &)
-   BOOST_CONTAINER_FORCEINLINE multiset(BOOST_RV_REF(multiset) x, const allocator_type &a)
+   inline multiset(BOOST_RV_REF(multiset) x, const allocator_type &a)
       : base_t(BOOST_MOVE_BASE(base_t, x), a)
    {}
 
    //! @copydoc ::boost::container::set::operator=(const set &)
-   BOOST_CONTAINER_FORCEINLINE multiset& operator=(BOOST_COPY_ASSIGN_REF(multiset) x)
+   inline multiset& operator=(BOOST_COPY_ASSIGN_REF(multiset) x)
    {  return static_cast<multiset&>(this->base_t::operator=(static_cast<const base_t&>(x)));  }
 
    //! @copydoc ::boost::container::set::operator=(set &&)
-   BOOST_CONTAINER_FORCEINLINE multiset& operator=(BOOST_RV_REF(multiset) x)
+   inline multiset& operator=(BOOST_RV_REF(multiset) x)
       BOOST_NOEXCEPT_IF( (allocator_traits_type::propagate_on_container_move_assignment::value ||
                           allocator_traits_type::is_always_equal::value) &&
                            boost::container::dtl::is_nothrow_move_assignable<Compare>::value)
@@ -1342,7 +1342,7 @@ class multiset
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_FWD_REF(Args)... args)
+   inline iterator emplace(BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_equal(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>: Inserts an object of type Key constructed with
@@ -1354,18 +1354,18 @@ class multiset
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class... Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   inline iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
    {  return this->base_t::emplace_hint_equal(p, boost::forward<Args>(args)...); }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_MULTISET_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(BOOST_MOVE_UREF##N)\
+   inline iterator emplace(BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_equal(BOOST_MOVE_FWD##N);  }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {  return this->base_t::emplace_hint_equal(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_MULTISET_EMPLACE_CODE)
@@ -1423,26 +1423,26 @@ class multiset
    //!
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from first to last)
    template <class InputIterator>
-   BOOST_CONTAINER_FORCEINLINE void insert(InputIterator first, InputIterator last)
+   inline void insert(InputIterator first, InputIterator last)
    {  this->base_t::insert_equal_range(first, last);  }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! @copydoc ::boost::container::set::insert(std::initializer_list<value_type>)
-   BOOST_CONTAINER_FORCEINLINE void insert(std::initializer_list<value_type> il)
+   inline void insert(std::initializer_list<value_type> il)
    {  this->base_t::insert_equal_range(il.begin(), il.end());  }
 #endif
 
    //! @copydoc ::boost::container::multimap::insert(node_type&&)
-   BOOST_CONTAINER_FORCEINLINE iterator insert(BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
+   inline iterator insert(BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
    {  return this->base_t::insert_equal_node(boost::move(nh));  }
 
    //! @copydoc ::boost::container::multimap::insert(const_iterator, node_type&&)
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator hint, BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
+   inline iterator insert(const_iterator hint, BOOST_RV_REF_BEG_IF_CXX11 node_type BOOST_RV_REF_END_IF_CXX11 nh)
    {  return this->base_t::insert_equal_node(hint, boost::move(nh));  }
 
    //! @copydoc ::boost::container::multimap::merge(multimap<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(multiset<Key, C2, Allocator, Options>& source)
+   inline void merge(multiset<Key, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <Key, void, C2, Allocator, Options> base2_t;
@@ -1451,12 +1451,12 @@ class multiset
 
    //! @copydoc ::boost::container::multiset::merge(multiset<Key, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG multiset<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG multiset<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<multiset<Key, C2, Allocator, Options>&>(source));   }
 
    //! @copydoc ::boost::container::multimap::merge(map<Key, T, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(set<Key, C2, Allocator, Options>& source)
+   inline void merge(set<Key, C2, Allocator, Options>& source)
    {
       typedef dtl::tree
          <Key, void, C2, Allocator, Options> base2_t;
@@ -1465,7 +1465,7 @@ class multiset
 
    //! @copydoc ::boost::container::multiset::merge(set<Key, C2, Allocator, Options>&)
    template<class C2>
-   BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG set<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
+   inline void merge(BOOST_RV_REF_BEG set<Key, C2, Allocator, Options> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<set<Key, C2, Allocator, Options>&>(source));   }
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1681,7 +1681,7 @@ template <class Key, class Compare, class Allocator, class Options>
 struct has_trivial_destructor_after_move<boost::container::multiset<Key, Compare, Allocator, Options> >
 {
    typedef ::boost::container::dtl::tree<Key, void, Compare, Allocator, Options> tree;
-   static const bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<tree>::value;
 };
 
 namespace container {
diff --git a/inst/include/boost/container/slist.hpp b/inst/include/boost/container/slist.hpp
index b66017265..54ef5bde2 100644
--- a/inst/include/boost/container/slist.hpp
+++ b/inst/include/boost/container/slist.hpp
@@ -47,7 +47,7 @@
 #include <boost/move/detail/fwd_macros.hpp>
 #endif
 #include <boost/move/detail/move_helpers.hpp>
-#include <boost/move/detail/force_ptr.hpp>
+
 // std
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
@@ -368,28 +368,14 @@ class slist
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_move_assignment::value
                                   || allocator_traits_type::is_always_equal::value)
    {
-      slist & sr = x;
-      if (BOOST_LIKELY(this != &sr)) {
-         NodeAlloc &this_alloc = this->node_alloc();
-         NodeAlloc &x_alloc    = sr.node_alloc();
-         const bool propagate_alloc = allocator_traits_type::
-               propagate_on_container_move_assignment::value;
-         const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-         //Resources can be transferred if both allocators are
-         //going to be equal after this function (either propagated or already equal)
-         if(propagate_alloc || allocators_equal){
-            //Destroy
-            this->clear();
-            //Move allocator if needed
-            this->AllocHolder::move_assign_alloc(sr);
-            //Obtain resources
-            this->icont() = boost::move(sr.icont());
-         }
-         //Else do a one by one move
-         else{
-            this->assign( boost::make_move_iterator(sr.begin())
-                        , boost::make_move_iterator(sr.end()));
-         }
+      if (BOOST_LIKELY(this != &x)) {
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
@@ -466,7 +452,7 @@ class slist
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return allocator_type(this->node_alloc()); }
 
@@ -477,7 +463,7 @@ class slist
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->node_alloc(); }
 
@@ -488,7 +474,7 @@ class slist
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->node_alloc(); }
 
@@ -505,7 +491,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator before_begin() BOOST_NOEXCEPT_OR_NOTHROW
    {  return iterator(end());  }
 
@@ -516,7 +502,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator before_begin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->cbefore_begin();  }
 
@@ -525,7 +511,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    { return iterator(this->icont().begin()); }
 
@@ -534,7 +520,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->cbegin();   }
 
@@ -543,7 +529,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    { return iterator(this->icont().end()); }
 
@@ -552,7 +538,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->cend();   }
 
@@ -563,7 +549,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbefore_begin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_iterator(end());  }
 
@@ -572,7 +558,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_iterator(this->non_const_icont().begin());   }
 
@@ -581,7 +567,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_iterator(this->non_const_icont().end());   }
 
@@ -594,7 +580,7 @@ class slist
    //! <b>Complexity</b>: Linear to the number of elements before i.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator previous(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {  return iterator(this->icont().previous(p.get())); }
 
@@ -607,7 +593,7 @@ class slist
    //! <b>Complexity</b>: Linear to the number of elements before i.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator previous(const_iterator p)
    {  return const_iterator(this->icont().previous(p.get())); }
 
@@ -622,7 +608,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const
    {  return !this->size();   }
 
@@ -631,7 +617,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const
    {  return this->icont().size(); }
 
@@ -640,7 +626,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const
    {  return AllocHolder::max_size();  }
 
@@ -687,7 +673,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference front()
    {
       BOOST_ASSERT(!this->empty());
@@ -702,7 +688,7 @@ class slist
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference front() const
    {
       BOOST_ASSERT(!this->empty());
@@ -1538,35 +1524,35 @@ class slist
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const slist& x, const slist& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const slist& x, const slist& y)
    {  return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const slist& x, const slist& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const slist& x, const slist& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const slist& x, const slist& y)
    {  return !(x < y);  }
 
@@ -1580,6 +1566,32 @@ class slist
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
 
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits_type::value_type>::value));
+
+   void priv_move_assign(BOOST_RV_REF(slist) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      this->AllocHolder::move_assign_alloc(x);
+      //Obtain resources
+      this->icont() = boost::move(x.icont());
+   }
+
+   void priv_move_assign(BOOST_RV_REF(slist) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->node_alloc() == x.node_alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         this->assign(boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
+      }
+   }
+
    template<class U>
    void priv_push_front(BOOST_FWD_REF(U) x)
    {  this->icont().push_front(*this->create_node(::boost::forward<U>(x))); }
@@ -1666,7 +1678,7 @@ struct has_trivial_destructor_after_move<boost::container::slist<T, Allocator> >
 {
    typedef typename boost::container::slist<T, Allocator>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
                              ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
diff --git a/inst/include/boost/container/small_vector.hpp b/inst/include/boost/container/small_vector.hpp
index f965ff66b..3d95ad6c4 100644
--- a/inst/include/boost/container/small_vector.hpp
+++ b/inst/include/boost/container/small_vector.hpp
@@ -39,13 +39,14 @@
 #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 #include <boost/move/detail/fwd_macros.hpp>
 #endif
-#include <boost/move/detail/force_ptr.hpp>
 
 //std
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>   //for std::initializer_list
 #endif
 
+#include <cstddef> //offsetof
+
 namespace boost {
 namespace container {
 
@@ -68,7 +69,9 @@ struct get_vopt_from_svopt
    : get_small_vector_opt<Options>::type
 {
    typedef typename get_small_vector_opt<Options>::type options_t;
-   typedef vector_opt< typename options_t::growth_factor_type, void> type;
+   typedef vector_opt< typename options_t::growth_factor_type
+                     , typename options_t::stored_size_type
+                     > type;
 };
 
 template<>
@@ -130,10 +133,10 @@ class small_vector_allocator
 
    BOOST_COPYABLE_AND_MOVABLE(small_vector_allocator)
 
-   BOOST_CONTAINER_FORCEINLINE const allocator_type &as_base() const BOOST_NOEXCEPT
+   inline const allocator_type &as_base() const BOOST_NOEXCEPT
    {  return static_cast<const allocator_type&>(*this);  }
 
-   BOOST_CONTAINER_FORCEINLINE allocator_type &as_base() BOOST_NOEXCEPT
+   inline allocator_type &as_base() BOOST_NOEXCEPT
    {  return static_cast<allocator_type&>(*this);  }
 
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -171,19 +174,19 @@ class small_vector_allocator
       typedef typename allocator_traits<allocator_type>::template portable_rebind_alloc<T2>::type other;
    };
 
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
+   inline small_vector_allocator() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
    {}
 
    //!Constructor from other small_vector_allocator.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator
+   inline small_vector_allocator
       (const small_vector_allocator &other) BOOST_NOEXCEPT_OR_NOTHROW
       : allocator_type(other.as_base())
    {}
 
    //!Move constructor from small_vector_allocator.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator
+   inline small_vector_allocator
       (BOOST_RV_REF(small_vector_allocator) other) BOOST_NOEXCEPT_OR_NOTHROW
       : allocator_type(::boost::move(other.as_base()))
    {}
@@ -191,7 +194,7 @@ class small_vector_allocator
    //!Constructor from related small_vector_allocator.
    //!Never throws
    template<class U, class OtherVoidAllocator, class OtherOptions>
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator
+   inline small_vector_allocator
       (const small_vector_allocator<U, OtherVoidAllocator, OtherOptions> &other) BOOST_NOEXCEPT_OR_NOTHROW
       : allocator_type(other.as_base())
    {}
@@ -199,52 +202,52 @@ class small_vector_allocator
    //!Move constructor from related small_vector_allocator.
    //!Never throws
    template<class U, class OtherVoidAllocator, class OtherOptions>
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator
+   inline small_vector_allocator
       (BOOST_RV_REF(small_vector_allocator<U BOOST_MOVE_I OtherVoidAllocator BOOST_MOVE_I OtherOptions>) other) BOOST_NOEXCEPT_OR_NOTHROW
       : allocator_type(::boost::move(other.as_base()))
    {}
 
    //!Constructor from allocator_type.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector_allocator
+   inline explicit small_vector_allocator
       (const allocator_type &other) BOOST_NOEXCEPT_OR_NOTHROW
       : allocator_type(other)
    {}
 
    //!Assignment from other small_vector_allocator.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator &
+   inline small_vector_allocator &
       operator=(BOOST_COPY_ASSIGN_REF(small_vector_allocator) other) BOOST_NOEXCEPT_OR_NOTHROW
    {  return static_cast<small_vector_allocator&>(this->allocator_type::operator=(other.as_base()));  }
 
    //!Move assignment from other small_vector_allocator.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator &
+   inline small_vector_allocator &
       operator=(BOOST_RV_REF(small_vector_allocator) other) BOOST_NOEXCEPT_OR_NOTHROW
    {  return static_cast<small_vector_allocator&>(this->allocator_type::operator=(::boost::move(other.as_base())));  }
 
    //!Assignment from related small_vector_allocator.
    //!Never throws
    template<class U, class OtherVoidAllocator>
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator &
+   inline small_vector_allocator &
       operator=(BOOST_COPY_ASSIGN_REF(small_vector_allocator<U BOOST_MOVE_I OtherVoidAllocator BOOST_MOVE_I Options>) other) BOOST_NOEXCEPT_OR_NOTHROW
    {  return static_cast<small_vector_allocator&>(this->allocator_type::operator=(other.as_base()));  }
 
    //!Move assignment from related small_vector_allocator.
    //!Never throws
    template<class U, class OtherVoidAllocator>
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator &
+   inline small_vector_allocator &
       operator=(BOOST_RV_REF(small_vector_allocator<U BOOST_MOVE_I OtherVoidAllocator BOOST_MOVE_I Options>) other) BOOST_NOEXCEPT_OR_NOTHROW
    {  return static_cast<small_vector_allocator&>(this->allocator_type::operator=(::boost::move(other.as_base())));  }
 
    //!Move assignment from allocator_type.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE small_vector_allocator &
+   inline small_vector_allocator &
       operator=(const allocator_type &other) BOOST_NOEXCEPT_OR_NOTHROW
    {  return static_cast<small_vector_allocator&>(this->allocator_type::operator=(other));  }
 
    //!Allocates storage from the standard-conforming allocator
-   BOOST_CONTAINER_FORCEINLINE pointer allocate(size_type count, const_void_pointer hint = const_void_pointer())
+   inline pointer allocate(size_type count, const_void_pointer hint = const_void_pointer())
    {  return allocator_traits_type::allocate(this->as_base(), count, hint);  }
 
    //!Deallocates previously allocated memory.
@@ -257,7 +260,7 @@ class small_vector_allocator
 
    //!Returns the maximum number of elements that could be allocated.
    //!Never throws
-   BOOST_CONTAINER_FORCEINLINE size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return allocator_traits_type::max_size(this->as_base());   }
 
    small_vector_allocator select_on_container_copy_construction() const
@@ -268,32 +271,32 @@ class small_vector_allocator
 
    //!Swaps two allocators, does nothing
    //!because this small_vector_allocator is stateless
-   BOOST_CONTAINER_FORCEINLINE friend void swap(small_vector_allocator &l, small_vector_allocator &r) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend void swap(small_vector_allocator &l, small_vector_allocator &r) BOOST_NOEXCEPT_OR_NOTHROW
    {  boost::adl_move_swap(l.as_base(), r.as_base());  }
 
    //!An small_vector_allocator always compares to true, as memory allocated with one
    //!instance can be deallocated by another instance (except for unpropagable storage)
-   BOOST_CONTAINER_FORCEINLINE friend bool operator==(const small_vector_allocator &l, const small_vector_allocator &r) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator==(const small_vector_allocator &l, const small_vector_allocator &r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return allocator_traits_type::equal(l.as_base(), r.as_base());  }
 
    //!An small_vector_allocator always compares to false, as memory allocated with one
    //!instance can be deallocated by another instance
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!=(const small_vector_allocator &l, const small_vector_allocator &r) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator!=(const small_vector_allocator &l, const small_vector_allocator &r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return !(l == r);   }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
-   private:
+   public:
 
    typedef small_vector_base<value_type, allocator_type, Options>    derived_type;
    typedef typename dtl::vector_for_small_vector
       <value_type, allocator_type, Options>::type                    vector_type;
 
-   BOOST_CONTAINER_FORCEINLINE bool is_internal_storage(const_pointer p) const
+   inline bool is_internal_storage(const_pointer p) const
    {  return this->internal_storage() == p;  }
 
    public:
-   BOOST_CONTAINER_FORCEINLINE const_pointer internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW;
-   BOOST_CONTAINER_FORCEINLINE pointer       internal_storage()       BOOST_NOEXCEPT_OR_NOTHROW;
+   inline const_pointer internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW;
+   inline pointer       internal_storage()       BOOST_NOEXCEPT_OR_NOTHROW;
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 };
 
@@ -303,13 +306,13 @@ struct small_vector_storage
    typedef typename dtl::aligned_storage
       <sizeof(T)*N, Alignment>::type storage_type;
    storage_type m_storage;
-   static const std::size_t sms_size = sizeof(storage_type)/sizeof(T);
+   BOOST_STATIC_CONSTEXPR std::size_t sms_size = sizeof(storage_type)/sizeof(T);
 };
 
 template<class T, std::size_t Alignment>
 struct small_vector_storage<T, 0u, Alignment>
 {
-   static const std::size_t sms_size = 0u;
+   BOOST_STATIC_CONSTEXPR std::size_t sms_size = 0u;
 };
 
 //! This class consists of common code from all small_vector<T, N> types that don't depend on the
@@ -339,34 +342,38 @@ struct small_vector_storage<T, 0u, Alignment>
 //!
 template <class T, class SecAlloc, class Options>
 class small_vector_base
+#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    : public dtl::vector_for_small_vector<T, SecAlloc, Options>::type
+#endif
 {
-   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKEDVECTOR
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    public:
    //Make it public as it will be inherited by small_vector and container
    //must have this public member
-   typedef typename real_allocator<T, SecAlloc>::type                            secondary_allocator_t;
-   typedef typename allocator_traits<secondary_allocator_t>::
-      template portable_rebind_alloc<void>::type                                 void_allocator_t;
-   typedef typename dtl::get_small_vector_opt<Options>::type                     options_t;
+   typedef typename real_allocator<T, SecAlloc>::type                     underlying_allocator_t;
+   typedef typename allocator_traits<underlying_allocator_t>::
+      template portable_rebind_alloc<void>::type                          void_underlying_allocator_t;
+   typedef small_vector_allocator<T, void_underlying_allocator_t, Options>allocator_type;
+   typedef typename dtl::get_small_vector_opt<Options>::type              options_t;
    typedef typename dtl::vector_for_small_vector
-      <T, SecAlloc, Options>::type                                               base_type;
-   typedef typename allocator_traits<secondary_allocator_t>::pointer             pointer;
-   typedef typename allocator_traits<secondary_allocator_t>::const_pointer       const_pointer;
-   typedef typename allocator_traits<secondary_allocator_t>::void_pointer        void_pointer;
-   typedef typename allocator_traits<secondary_allocator_t>::const_void_pointer  const_void_pointer;
-   typedef small_vector_allocator<T, void_allocator_t, Options>                  allocator_type;
+      <T, SecAlloc, Options>::type                                        base_type;
+   typedef typename allocator_traits<allocator_type>::pointer             pointer;
+   typedef typename allocator_traits<allocator_type>::const_pointer       const_pointer;
+   typedef typename allocator_traits<allocator_type>::void_pointer        void_pointer;
+   typedef typename allocator_traits<allocator_type>::const_void_pointer  const_void_pointer;
+   typedef typename base_type::size_type                                  size_type;
+
 
    private: 
    BOOST_COPYABLE_AND_MOVABLE(small_vector_base)
 
-   friend class small_vector_allocator<T, void_allocator_t, Options>;
+   friend class small_vector_allocator<T, void_underlying_allocator_t, Options>;
 
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    const_pointer internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->base_type::get_stored_allocator().internal_storage();   }
 
-   BOOST_CONTAINER_FORCEINLINE
+   inline
    pointer internal_storage() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->base_type::get_stored_allocator().internal_storage();   }
 
@@ -376,18 +383,26 @@ class small_vector_base
 
    public:
 
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD bool is_small() const
+   {  return this->internal_storage() == this->data();   }
+
    protected:
 
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector_base(initial_capacity_t, std::size_t initial_capacity)
+   inline explicit small_vector_base(initial_capacity_t, size_type initial_capacity)
       : base_type(initial_capacity_t(), this->internal_storage(), initial_capacity)
    {}
 
    template<class AllocFwd>
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector_base(initial_capacity_t, std::size_t capacity, BOOST_FWD_REF(AllocFwd) a)
-      : base_type(initial_capacity_t(), this->internal_storage(), capacity, ::boost::forward<AllocFwd>(a))
+   inline explicit small_vector_base(initial_capacity_t, size_type initial_capacity, BOOST_FWD_REF(AllocFwd) a)
+      : base_type(initial_capacity_t(), this->internal_storage(), initial_capacity, ::boost::forward<AllocFwd>(a))
+   {}
+
+   template<class AllocFwd>
+   inline explicit small_vector_base(initial_capacity_t, size_type initial_capacity, BOOST_FWD_REF(AllocFwd) a, small_vector_base &x)
+      : base_type(initial_capacity_t(), this->internal_storage(), initial_capacity, ::boost::forward<AllocFwd>(a), x)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector_base(maybe_initial_capacity_t, std::size_t initial_capacity, std::size_t initial_size)
+   inline explicit small_vector_base(maybe_initial_capacity_t, size_type initial_capacity, size_type initial_size)
       : base_type( maybe_initial_capacity_t()
                  , (initial_capacity >= initial_size) ? this->internal_storage() : pointer()
                  , (initial_capacity >= initial_size) ? initial_capacity : initial_size
@@ -395,7 +410,7 @@ class small_vector_base
    {}
 
    template<class AllocFwd>
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector_base(maybe_initial_capacity_t, std::size_t initial_capacity, std::size_t initial_size, BOOST_FWD_REF(AllocFwd) a)
+   inline explicit small_vector_base(maybe_initial_capacity_t, size_type initial_capacity, size_type initial_size, BOOST_FWD_REF(AllocFwd) a)
       : base_type(maybe_initial_capacity_t()
                  , (initial_capacity >= initial_size) ? this->internal_storage() : pointer()
                  , (initial_capacity >= initial_size) ? initial_capacity : initial_size
@@ -403,37 +418,27 @@ class small_vector_base
       )
    {}
 
+   void prot_shrink_to_fit_small(const size_type small_capacity)
+   {  this->base_type::prot_shrink_to_fit_small(this->internal_storage(), small_capacity);  }
+
    using base_type::protected_set_size;
 
    //~small_vector_base(){}
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
+   inline void prot_swap(small_vector_base& other, size_type internal_capacity_value)
+   {  this->base_type::prot_swap_small(other, internal_capacity_value);  }
+
    public:
-   BOOST_CONTAINER_FORCEINLINE small_vector_base& operator=(BOOST_COPY_ASSIGN_REF(small_vector_base) other)
+   inline small_vector_base& operator=(BOOST_COPY_ASSIGN_REF(small_vector_base) other)
    {  return static_cast<small_vector_base&>(this->base_type::operator=(static_cast<base_type const&>(other)));  }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector_base& operator=(BOOST_RV_REF(small_vector_base) other)
+   inline small_vector_base& operator=(BOOST_RV_REF(small_vector_base) other)
    {  return static_cast<small_vector_base&>(this->base_type::operator=(BOOST_MOVE_BASE(base_type, other))); }
 
-   BOOST_CONTAINER_FORCEINLINE void swap(small_vector_base &other)
-   {  return this->base_type::swap(other);  }
+   inline void swap(small_vector_base &other)
+   {  return this->base_type::prot_swap_small(other, 0u);  }
 
-   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
-   protected:
-   void move_construct_impl(base_type &x, const allocator_type &a)
-   {
-      if(base_type::is_propagable_from(x.get_stored_allocator(), x.data(), a, true)){
-         this->steal_resources(x);
-      }
-      else{
-         const typename base_type::size_type sz = x.size();
-         ::boost::container::uninitialized_move_alloc_n_source
-            (this->base_type::get_stored_allocator(), x.begin(), sz, this->begin());
-         this->protected_set_size(sz);
-         x.clear();
-      }
-   }
-   #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 };
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -447,66 +452,70 @@ template<class T, std::size_t N, class Options>
 struct small_vector_storage_definer
 {
    typedef typename dtl::get_small_vector_opt<Options>::type options_t;
-   static const std::size_t final_alignment =
+   BOOST_STATIC_CONSTEXPR std::size_t final_alignment =
       options_t::inplace_alignment ? options_t::inplace_alignment : dtl::alignment_of<T>::value;
    typedef small_vector_storage<T, N, final_alignment> type;
 };
 
+
+/// Figure out the offset of the first element. Idea taken from LLVM's SmallVector
 template <class T, class SecAlloc, class Options>
-struct small_vector_storage_strawman
-   : public small_vector_base<T, SecAlloc, Options>
-   , public small_vector_storage_definer<T, 1, Options>::type
+struct small_vector_storage_offset
 {
-   typedef typename small_vector_storage_definer<T, 1, Options>::type sm_storage_t;
+   typedef small_vector_base<T, SecAlloc, Options>                    base_type;
+   typedef typename small_vector_storage_definer<T, 1, Options>::type storage_type;
+   typename dtl::aligned_storage
+      < sizeof(base_type), dtl::alignment_of<base_type>::value
+      >::type base;
+
+   typename dtl::aligned_storage
+      < sizeof(storage_type), dtl::alignment_of<storage_type>::value
+      > ::type storage;
 };
 
+template <class T, class SecAlloc, class Options>
+inline std::size_t get_small_vector_storage_offset()
+{
+   typedef small_vector_storage_offset<T, SecAlloc, Options> struct_type;
+   return offsetof(struct_type, storage);
+}
+
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wcast-align"
+//#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
 //Internal storage hack
 template<class T, class VoidAlloc, class Options>
-BOOST_CONTAINER_FORCEINLINE typename small_vector_allocator<T, VoidAlloc, Options>::const_pointer
+inline typename small_vector_allocator<T, VoidAlloc, Options>::const_pointer
    small_vector_allocator<T, VoidAlloc, Options>::internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW
 {
-   typedef small_vector_storage_strawman<T, allocator_type, Options> strawman_t;
-   typedef typename strawman_t::sm_storage_t sm_storage_t;
-
-   //These warnings are false positives, as we know the alignment is correct
-   //and aligned storage is allowed to hold any type
-   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
-   #pragma GCC diagnostic push
-   //   #pragma GCC diagnostic ignored "-Wcast-align"
-   //   #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-   #endif
-   const vector_type& v = reinterpret_cast<const vector_type&>(*this);
-   BOOST_ASSERT((std::size_t(this) % dtl::alignment_of<strawman_t>::value) == 0);
-   const strawman_t &straw   = static_cast<const strawman_t&>(v);
-   const sm_storage_t& stor = static_cast<const sm_storage_t&>(straw);
-   return boost::intrusive::pointer_traits<const_pointer>::pointer_to(*((const T*)stor.m_storage.data));
-   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
-   #pragma GCC diagnostic pop
-   #endif
+   const vector_type& v = *static_cast<const vector_type*>(static_cast<const void *>(this));
+   BOOST_ASSERT((std::size_t(this) % dtl::alignment_of< small_vector_storage_offset<T, allocator_type, Options> >::value) == 0);
+   const char *addr = reinterpret_cast<const char*>(&v);
+   typedef typename boost::intrusive::pointer_traits<pointer>::template rebind_pointer<const char>::type const_char_pointer;
+   const_void_pointer vptr = boost::intrusive::pointer_traits<const_char_pointer>::pointer_to(*addr)
+      + get_small_vector_storage_offset<T, allocator_type, Options>();
+   return boost::intrusive::pointer_traits<const_pointer>::static_cast_from(vptr);
 }
 
 template <class T, class VoidAlloc, class Options>
-BOOST_CONTAINER_FORCEINLINE typename small_vector_allocator<T, VoidAlloc, Options>::pointer
+inline typename small_vector_allocator<T, VoidAlloc, Options>::pointer
    small_vector_allocator<T, VoidAlloc, Options>::internal_storage() BOOST_NOEXCEPT_OR_NOTHROW
 {
-   typedef small_vector_storage_strawman<T, allocator_type, Options> strawman_t;
-   typedef typename strawman_t::sm_storage_t sm_storage_t;
-
-   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
-   #pragma GCC diagnostic push
-   //   #pragma GCC diagnostic ignored "-Wcast-align"
-   //   #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-   #endif
-   vector_type& v = reinterpret_cast<vector_type&>(*this);
-   BOOST_ASSERT((std::size_t(this) % dtl::alignment_of<strawman_t>::value) == 0);
-   strawman_t &straw   = static_cast<strawman_t&>(v);
-   sm_storage_t& stor = static_cast<sm_storage_t&>(straw);
-   return boost::intrusive::pointer_traits<pointer>::pointer_to(*((T*)stor.m_storage.data));
-   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
-   #pragma GCC diagnostic pop
-   #endif
+   vector_type& v = *static_cast<vector_type*>(static_cast<void*>(this));
+   BOOST_ASSERT((std::size_t(this) % dtl::alignment_of< small_vector_storage_offset<T, allocator_type, Options> >::value) == 0);
+   char* addr = reinterpret_cast<char*>(&v);
+   typedef typename boost::intrusive::pointer_traits<pointer>::template rebind_pointer<char>::type char_pointer;
+   void_pointer vptr = boost::intrusive::pointer_traits<char_pointer>::pointer_to(*addr)
+                     + get_small_vector_storage_offset<T, allocator_type, Options>();
+   return boost::intrusive::pointer_traits<pointer>::static_cast_from(vptr);
 }
 
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#pragma GCC diagnostic pop
+#endif
 
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
@@ -540,11 +549,11 @@ class small_vector
 
    public:
    typedef small_vector_base<T, Allocator, Options>   base_type;
-   typedef typename base_type::allocator_type   allocator_type;
-   typedef typename base_type::size_type        size_type;
-   typedef typename base_type::value_type       value_type;
+   typedef typename base_type::allocator_type         allocator_type;
+   typedef typename base_type::size_type              size_type;
+   typedef typename base_type::value_type             value_type;
 
-   BOOST_CONTAINER_FORCEINLINE static std::size_t internal_capacity()
+   inline static size_type internal_capacity()
    {  return static_capacity;  }
 
    typedef allocator_traits<typename base_type::allocator_type> allocator_traits_type;
@@ -552,44 +561,44 @@ class small_vector
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    //! @brief The capacity/max size of the container
-   static const size_type static_capacity = small_vector_storage_definer<T, N, Options>::type::sms_size;
+   BOOST_STATIC_CONSTEXPR size_type static_capacity = small_vector_storage_definer<T, N, Options>::type::sms_size;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE small_vector()
+   inline small_vector()
       BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
       : base_type(initial_capacity_t(), internal_capacity())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector(const allocator_type &a)
+   inline explicit small_vector(const allocator_type &a)
       : base_type(initial_capacity_t(), internal_capacity(), a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector(size_type n)
+   inline explicit small_vector(size_type n)
       : base_type(maybe_initial_capacity_t(), internal_capacity(), n)
    {  this->protected_init_n(n, value_init); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(size_type n, const allocator_type &a)
+   inline small_vector(size_type n, const allocator_type &a)
       : base_type(maybe_initial_capacity_t(), internal_capacity(), n, a)
    {  this->protected_init_n(n, value_init); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(size_type n, default_init_t)
+   inline small_vector(size_type n, default_init_t)
       : base_type(maybe_initial_capacity_t(), internal_capacity(), n)
    {  this->protected_init_n(n, default_init_t()); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(size_type n, default_init_t, const allocator_type &a)
+   inline small_vector(size_type n, default_init_t, const allocator_type &a)
       : base_type(maybe_initial_capacity_t(), internal_capacity(), n, a)
    {  this->protected_init_n(n, default_init_t()); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(size_type n, const value_type &v)
+   inline small_vector(size_type n, const value_type &v)
       : base_type(maybe_initial_capacity_t(), internal_capacity(), n)
    {  this->protected_init_n(n, v); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(size_type n, const value_type &v, const allocator_type &a)
+   inline small_vector(size_type n, const value_type &v, const allocator_type &a)
       : base_type(maybe_initial_capacity_t(), internal_capacity(), n, a)
    {  this->protected_init_n(n, v); }
 
    template <class InIt>
-   BOOST_CONTAINER_FORCEINLINE small_vector(InIt first, InIt last
+   inline small_vector(InIt first, InIt last
       BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c
          < dtl::is_convertible<InIt BOOST_MOVE_I size_type>::value
          BOOST_MOVE_I dtl::nat >::type * = 0)
@@ -598,7 +607,7 @@ class small_vector
    {  this->assign(first, last); }
 
    template <class InIt>
-   BOOST_CONTAINER_FORCEINLINE small_vector(InIt first, InIt last, const allocator_type& a
+   inline small_vector(InIt first, InIt last, const allocator_type& a
       BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c
          < dtl::is_convertible<InIt BOOST_MOVE_I size_type>::value
          BOOST_MOVE_I dtl::nat >::type * = 0)
@@ -606,58 +615,61 @@ class small_vector
       : base_type(initial_capacity_t(), internal_capacity(), a)
    {  this->assign(first, last); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(const small_vector &other)
+   inline small_vector(const small_vector &other)
       : base_type( initial_capacity_t(), internal_capacity()
                  , allocator_traits_type::select_on_container_copy_construction(other.get_stored_allocator()))
    {  this->assign(other.cbegin(), other.cend());  }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(const small_vector &other, const allocator_type &a)
+   inline small_vector(const small_vector &other, const allocator_type &a)
       : base_type(initial_capacity_t(), internal_capacity(), a)
    {  this->assign(other.cbegin(), other.cend());  }
 
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector(const base_type &other)
+   inline explicit small_vector(const base_type &other)
       : base_type( initial_capacity_t(), internal_capacity()
                  , allocator_traits_type::select_on_container_copy_construction(other.get_stored_allocator()))
    {  this->assign(other.cbegin(), other.cend());  }
 
-   BOOST_CONTAINER_FORCEINLINE explicit small_vector(BOOST_RV_REF(base_type) other)
-      : base_type(initial_capacity_t(), internal_capacity(), ::boost::move(other.get_stored_allocator()))
-   {  this->move_construct_impl(other, other.get_stored_allocator());   }
+   inline explicit small_vector(BOOST_RV_REF(base_type) other)
+      : base_type(initial_capacity_t(), internal_capacity(), ::boost::move(other.get_stored_allocator()), other)
+   {}
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(BOOST_RV_REF(small_vector) other)
+   inline small_vector(BOOST_RV_REF(small_vector) other)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<value_type>::value)
-      : base_type(initial_capacity_t(), internal_capacity(), ::boost::move(other.get_stored_allocator()))
-   {  this->move_construct_impl(other, other.get_stored_allocator());   }
+      : base_type(initial_capacity_t(), internal_capacity(), ::boost::move(other.get_stored_allocator()), other)
+   {}
 
-   BOOST_CONTAINER_FORCEINLINE small_vector(BOOST_RV_REF(small_vector) other, const allocator_type &a)
-      : base_type(initial_capacity_t(), internal_capacity(), a)
-   {  this->move_construct_impl(other, a);   }
+   inline small_vector(BOOST_RV_REF(small_vector) other, const allocator_type &a)
+      : base_type(initial_capacity_t(), internal_capacity(), a, other)
+   {}
 
    #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
-   BOOST_CONTAINER_FORCEINLINE small_vector(std::initializer_list<value_type> il, const allocator_type& a = allocator_type())
+   inline small_vector(std::initializer_list<value_type> il, const allocator_type& a = allocator_type())
       : base_type(initial_capacity_t(), internal_capacity(), a)
    {
       this->assign(il.begin(), il.end());
    }
    #endif
 
-   BOOST_CONTAINER_FORCEINLINE small_vector& operator=(BOOST_COPY_ASSIGN_REF(small_vector) other)
+   inline small_vector& operator=(BOOST_COPY_ASSIGN_REF(small_vector) other)
    {  return static_cast<small_vector&>(this->base_type::operator=(static_cast<base_type const&>(other)));  }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector& operator=(BOOST_RV_REF(small_vector) other)
+   inline small_vector& operator=(BOOST_RV_REF(small_vector) other)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_assignable<value_type>::value
          && (allocator_traits_type::propagate_on_container_move_assignment::value
              || allocator_traits_type::is_always_equal::value))
    {  return static_cast<small_vector&>(this->base_type::operator=(BOOST_MOVE_BASE(base_type, other))); }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector& operator=(const base_type &other)
+   inline small_vector& operator=(const base_type &other)
    {  return static_cast<small_vector&>(this->base_type::operator=(other));  }
 
-   BOOST_CONTAINER_FORCEINLINE small_vector& operator=(BOOST_RV_REF(base_type) other)
+   inline small_vector& operator=(BOOST_RV_REF(base_type) other)
    {  return static_cast<small_vector&>(this->base_type::operator=(boost::move(other))); }
 
-   BOOST_CONTAINER_FORCEINLINE void swap(small_vector &other)
-   {  return this->base_type::swap(other);  }
+   inline void swap(small_vector &other)
+   {  return this->base_type::prot_swap(other, static_capacity);  }
+
+   inline void shrink_to_fit()
+   {  this->base_type::prot_shrink_to_fit_small(this->internal_capacity());   }
 };
 
 }}
@@ -672,7 +684,7 @@ template <class T, class Allocator>
 struct has_trivial_destructor_after_move<boost::container::vector<T, Allocator> >
 {
    typedef typename ::boost::container::allocator_traits<Allocator>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<Allocator>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<Allocator>::value &&
                              ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
diff --git a/inst/include/boost/container/stable_vector.hpp b/inst/include/boost/container/stable_vector.hpp
index 061dc53bc..af9abfa52 100644
--- a/inst/include/boost/container/stable_vector.hpp
+++ b/inst/include/boost/container/stable_vector.hpp
@@ -54,7 +54,7 @@
 #include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/adl_move_swap.hpp>
-#include <boost/move/detail/force_ptr.hpp>
+#include <boost/move/detail/launder.hpp>
 // move/detail
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/detail/iterator_to_raw_pointer.hpp>
@@ -81,14 +81,14 @@ template <class C>
 class clear_on_destroy
 {
    public:
-   BOOST_CONTAINER_FORCEINLINE clear_on_destroy(C &c)
+   inline clear_on_destroy(C &c)
       :  c_(c), do_clear_(true)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE void release()
+   inline void release()
    {  do_clear_ = false; }
 
-   BOOST_CONTAINER_FORCEINLINE ~clear_on_destroy()
+   inline ~clear_on_destroy()
    {
       if(do_clear_){
          c_.clear();
@@ -122,11 +122,11 @@ struct node_base
          <node_base_ptr>::type                  node_base_ptr_ptr;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE explicit node_base(const node_base_ptr_ptr &n)
+   inline explicit node_base(const node_base_ptr_ptr &n)
       : up(n)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE node_base()
+   inline node_base()
       : up()
    {}
 
@@ -152,11 +152,11 @@ struct node
       <sizeof(T), boost::container::dtl::alignment_of<T>::value>::type storage_t;
    storage_t m_storage;
 
-   BOOST_CONTAINER_FORCEINLINE explicit node(const typename hook_type::node_base_ptr_ptr &n)
+   inline explicit node(const typename hook_type::node_base_ptr_ptr &n)
       : hook_type(n)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE node()
+   inline node()
    {}
 
    #if defined(BOOST_GCC) && (BOOST_GCC >= 40600) && (BOOST_GCC < 80000)
@@ -165,27 +165,27 @@ struct node
       #define BOOST_CONTAINER_DISABLE_ALIASING_WARNING
    #  endif
 
-   BOOST_CONTAINER_FORCEINLINE T &get_data()
-   {  return *boost::move_detail::force_ptr<T*>(this->m_storage.data);   }
+   inline T &get_data()
+   {  return *boost::move_detail::launder_cast<T*>(&this->m_storage);   }
 
-   BOOST_CONTAINER_FORCEINLINE const T &get_data() const
-   {  return *boost::move_detail::force_ptr<const T*>(this->m_storage.data);  }
+   inline const T &get_data() const
+   {  return *boost::move_detail::launder_cast<const T*>(&this->m_storage);  }
 
-   BOOST_CONTAINER_FORCEINLINE T *get_data_ptr()
-   {  return boost::move_detail::force_ptr<T*>(this->m_storage.data);  }
+   inline T *get_data_ptr()
+   {  return boost::move_detail::launder_cast<T*>(&this->m_storage);  }
 
-   BOOST_CONTAINER_FORCEINLINE const T *get_data_ptr() const
-   {  return boost::move_detail::force_ptr<const T*>(this->m_storage.data);  }
+   inline const T *get_data_ptr() const
+   {  return boost::move_detail::launder_cast<const T*>(&this->m_storage);  }
 
-   BOOST_CONTAINER_FORCEINLINE ~node()
-   {  boost::move_detail::force_ptr<T*>(this->m_storage.data)->~T();   }
+   inline ~node()
+   {  boost::move_detail::launder_cast<T*>(&this->m_storage)->~T();   }
 
    #if defined(BOOST_CONTAINER_DISABLE_ALIASING_WARNING)
       #pragma GCC diagnostic pop
       #undef BOOST_CONTAINER_DISABLE_ALIASING_WARNING
    #  endif
 
-   BOOST_CONTAINER_FORCEINLINE void destroy_header()
+   inline void destroy_header()
    {  static_cast<hook_type*>(this)->~hook_type();  }
 };
 
@@ -214,14 +214,14 @@ struct index_traits
    typedef typename index_type::const_iterator        const_index_iterator;
    typedef typename index_type::size_type             size_type;
 
-   static const size_type ExtraPointers = 3;
+   BOOST_STATIC_CONSTEXPR size_type ExtraPointers = 3;
    //Stable vector stores metadata at the end of the index (node_base_ptr vector) with additional 3 pointers:
    //    back() is this->index.back() - ExtraPointers;
    //    end node index is    *(this->index.end() - 3)
    //    Node cache first is  *(this->index.end() - 2);
    //    Node cache last is   this->index.back();
 
-   BOOST_CONTAINER_FORCEINLINE static node_base_ptr_ptr ptr_to_node_base_ptr(node_base_ptr &n)
+   inline static node_base_ptr_ptr ptr_to_node_base_ptr(node_base_ptr &n)
    {  return node_base_ptr_ptr_traits::pointer_to(n);   }
 
    static void fix_up_pointers(index_iterator first, index_iterator last)
@@ -234,10 +234,10 @@ struct index_traits
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE static index_iterator get_fix_up_end(index_type &index)
+   inline static index_iterator get_fix_up_end(index_type &index)
    {  return index.end() - (ExtraPointers - 1); }
 
-   BOOST_CONTAINER_FORCEINLINE static void fix_up_pointers_from(index_type & index, index_iterator first)
+   inline static void fix_up_pointers_from(index_type & index, index_iterator first)
    {  index_traits::fix_up_pointers(first, index_traits::get_fix_up_end(index));   }
 
    static void readjust_end_node(index_type &index, node_base_type &end_node)
@@ -327,72 +327,72 @@ class stable_vector_iterator
 
    public:
 
-   BOOST_CONTAINER_FORCEINLINE explicit stable_vector_iterator(node_base_ptr p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline explicit stable_vector_iterator(node_base_ptr p) BOOST_NOEXCEPT_OR_NOTHROW
       : m_pn(p)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator() BOOST_NOEXCEPT_OR_NOTHROW
       : m_pn() //Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator(const stable_vector_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator(const stable_vector_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_pn(other.node_pointer())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator(const nonconst_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator(const nonconst_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_pn(other.node_pointer())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator & operator=(const stable_vector_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator & operator=(const stable_vector_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
    {  m_pn = other.node_pointer(); return *this;   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       node_ptr node_pointer() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return node_ptr_traits::static_cast_from(m_pn);  }
 
    public:
    //Pointer like operators
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator*()  const BOOST_NOEXCEPT_OR_NOTHROW
    {  return  node_pointer()->get_data();  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       pointer operator->() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return ptr_traits::pointer_to(this->operator*());  }
 
    //Increment / Decrement
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
    {
       node_base_ptr_ptr p(this->m_pn->up);
       this->m_pn = *(++p);
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
    {  stable_vector_iterator tmp(*this);  ++*this; return stable_vector_iterator(tmp); }
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
    {
       node_base_ptr_ptr p(this->m_pn->up);
       this->m_pn = *(--p);
       return *this;
    }
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
    {  stable_vector_iterator tmp(*this);  --*this; return stable_vector_iterator(tmp);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator[](difference_type off) const BOOST_NOEXCEPT_OR_NOTHROW
    {  return node_ptr_traits::static_cast_from(this->m_pn->up[off])->get_data();  }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator& operator+=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator& operator+=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {
       if(off) this->m_pn = this->m_pn->up[off];
       return *this;
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend stable_vector_iterator operator+(const stable_vector_iterator &left, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {
       stable_vector_iterator tmp(left);
@@ -400,7 +400,7 @@ class stable_vector_iterator
       return tmp;
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend stable_vector_iterator operator+(difference_type off, const stable_vector_iterator& right) BOOST_NOEXCEPT_OR_NOTHROW
    {
       stable_vector_iterator tmp(right);
@@ -408,10 +408,10 @@ class stable_vector_iterator
       return tmp;
    }
 
-   BOOST_CONTAINER_FORCEINLINE stable_vector_iterator& operator-=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector_iterator& operator-=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  *this += -off; return *this;   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend stable_vector_iterator operator-(const stable_vector_iterator &left, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {
       stable_vector_iterator tmp(left);
@@ -420,32 +420,32 @@ class stable_vector_iterator
    }
 
    //Difference
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend difference_type operator-(const stable_vector_iterator &left, const stable_vector_iterator &right) BOOST_NOEXCEPT_OR_NOTHROW
    {  return left.m_pn->up - right.m_pn->up;  }
 
    //Comparison operators
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==   (const stable_vector_iterator& l, const stable_vector_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_pn == r.m_pn;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=   (const stable_vector_iterator& l, const stable_vector_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_pn != r.m_pn;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<    (const stable_vector_iterator& l, const stable_vector_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_pn->up < r.m_pn->up;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=   (const stable_vector_iterator& l, const stable_vector_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_pn->up <= r.m_pn->up;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>    (const stable_vector_iterator& l, const stable_vector_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_pn->up > r.m_pn->up;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=   (const stable_vector_iterator& l, const stable_vector_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_pn->up >= r.m_pn->up;  }
 };
@@ -554,16 +554,16 @@ class stable_vector
       allocator_version_traits<node_allocator_type>                    allocator_version_traits_t;
    typedef typename allocator_version_traits_t::multiallocation_chain  multiallocation_chain;
 
-   BOOST_CONTAINER_FORCEINLINE node_ptr allocate_one()
+   inline node_ptr allocate_one()
    {  return allocator_version_traits_t::allocate_one(this->priv_node_alloc());   }
 
-   BOOST_CONTAINER_FORCEINLINE void deallocate_one(const node_ptr &p)
+   inline void deallocate_one(const node_ptr &p)
    {  allocator_version_traits_t::deallocate_one(this->priv_node_alloc(), p);   }
 
-   BOOST_CONTAINER_FORCEINLINE void allocate_individual(typename allocator_traits_type::size_type n, multiallocation_chain &m)
+   inline void allocate_individual(typename allocator_traits_type::size_type n, multiallocation_chain &m)
    {  allocator_version_traits_t::allocate_individual(this->priv_node_alloc(), n, m);   }
 
-   BOOST_CONTAINER_FORCEINLINE void deallocate_individual(multiallocation_chain &holder)
+   inline void deallocate_individual(multiallocation_chain &holder)
    {  allocator_version_traits_t::deallocate_individual(this->priv_node_alloc(), holder);   }
 
    friend class stable_vector_detail::clear_on_destroy<stable_vector>;
@@ -597,8 +597,13 @@ class stable_vector
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
+
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits<allocator_type>::value_type>::value));
+
    BOOST_COPYABLE_AND_MOVABLE(stable_vector)
-   static const size_type ExtraPointers = index_traits_type::ExtraPointers;
+   BOOST_STATIC_CONSTEXPR size_type ExtraPointers = index_traits_type::ExtraPointers;
 
    class insert_rollback;
    friend class insert_rollback;
@@ -619,7 +624,7 @@ class stable_vector
    //! <b>Throws</b>: If allocator_type's default constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE stable_vector() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<ValueAllocator>::value)
+   inline stable_vector() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<ValueAllocator>::value)
       : internal_data(), index()
    {
       BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT;
@@ -630,7 +635,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE explicit stable_vector(const allocator_type& al) BOOST_NOEXCEPT_OR_NOTHROW
+   inline explicit stable_vector(const allocator_type& al) BOOST_NOEXCEPT_OR_NOTHROW
       : internal_data(al), index(al)
    {
       BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT;
@@ -777,7 +782,7 @@ class stable_vector
    //! <b>Throws</b>: If allocator_type's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE stable_vector(BOOST_RV_REF(stable_vector) x) BOOST_NOEXCEPT_OR_NOTHROW
+   inline stable_vector(BOOST_RV_REF(stable_vector) x) BOOST_NOEXCEPT_OR_NOTHROW
       : internal_data(boost::move(x.priv_node_alloc())), index(boost::move(x.index))
    {
       this->priv_swap_members(x);
@@ -872,31 +877,14 @@ class stable_vector
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_move_assignment::value
                                   || allocator_traits_type::is_always_equal::value)
    {
-      //for move constructor, no aliasing (&x != this) is assumed.
       if (BOOST_LIKELY(this != &x)) {
-         node_allocator_type &this_alloc = this->priv_node_alloc();
-         node_allocator_type &x_alloc    = x.priv_node_alloc();
-         const bool propagate_alloc = allocator_traits_type::
-               propagate_on_container_move_assignment::value;
-         dtl::bool_<propagate_alloc> flag;
-         const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-         //Resources can be transferred if both allocators are
-         //going to be equal after this function (either propagated or already equal)
-         if(propagate_alloc || allocators_equal){
-            BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT
-            //Destroy objects but retain memory in case x reuses it in the future
-            this->clear();
-            //Move allocator if needed
-            dtl::move_alloc(this_alloc, x_alloc, flag);
-            //Take resources
-            this->index.swap(x.index);
-            this->priv_swap_members(x);
-         }
-         //Else do a one by one move
-         else{
-            this->assign( boost::make_move_iterator(x.begin())
-                        , boost::make_move_iterator(x.end()));
-         }
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
@@ -918,7 +906,7 @@ class stable_vector
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE void assign(size_type n, const T& t)
+   inline void assign(size_type n, const T& t)
    {
       typedef constant_iterator<value_type> cvalue_iterator;
       this->assign(cvalue_iterator(t, n), cvalue_iterator());
@@ -957,7 +945,7 @@ class stable_vector
    //! <b>Throws</b>: If memory allocation throws or
    //!   T's constructor from dereferencing initializer_list iterator throws.
    //!
-   BOOST_CONTAINER_FORCEINLINE void assign(std::initializer_list<value_type> il)
+   inline void assign(std::initializer_list<value_type> il)
    {
       BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT;
       assign(il.begin(), il.end());
@@ -969,7 +957,7 @@ class stable_vector
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const
    {  return this->priv_node_alloc();  }
 
@@ -980,7 +968,7 @@ class stable_vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->priv_node_alloc(); }
 
@@ -991,7 +979,7 @@ class stable_vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->priv_node_alloc(); }
 
@@ -1006,7 +994,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    {   return (this->index.empty()) ? this->end(): iterator(node_ptr_traits::static_cast_from(this->index.front())); }
 
@@ -1015,7 +1003,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    {   return (this->index.empty()) ? this->cend() : const_iterator(node_ptr_traits::static_cast_from(this->index.front())) ;   }
 
@@ -1024,7 +1012,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    {  return iterator(this->priv_get_end_node());  }
 
@@ -1033,7 +1021,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_iterator(this->priv_get_end_node());  }
 
@@ -1043,7 +1031,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
    {  return reverse_iterator(this->end());  }
 
@@ -1053,7 +1041,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_reverse_iterator(this->end());  }
 
@@ -1063,7 +1051,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
    {  return reverse_iterator(this->begin());   }
 
@@ -1073,7 +1061,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return const_reverse_iterator(this->begin());   }
 
@@ -1082,7 +1070,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->begin();   }
 
@@ -1091,7 +1079,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->end();  }
 
@@ -1101,7 +1089,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->rbegin();  }
 
@@ -1111,7 +1099,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend()const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->rend(); }
 
@@ -1126,7 +1114,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->index.size() <= ExtraPointers;  }
 
@@ -1135,7 +1123,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       const size_type index_size = this->index.size();
@@ -1147,7 +1135,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->index.max_size() - ExtraPointers;  }
 
@@ -1207,7 +1195,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       const size_type index_size             = this->index.size();
@@ -1295,7 +1283,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1310,7 +1298,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1325,7 +1313,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1340,7 +1328,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference back() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1355,7 +1343,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
@@ -1370,7 +1358,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
@@ -1388,7 +1376,7 @@ class stable_vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() >= n);
@@ -1406,7 +1394,7 @@ class stable_vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() >= n);
@@ -1423,7 +1411,7 @@ class stable_vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->priv_index_of(p.node_pointer());  }
 
@@ -1437,7 +1425,7 @@ class stable_vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->priv_index_of(p.node_pointer());  }
 
@@ -1449,7 +1437,7 @@ class stable_vector
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference at(size_type n)
    {
       if(n >= this->size()){
@@ -1466,7 +1454,7 @@ class stable_vector
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference at(size_type n)const
    {
       if(n >= this->size()){
@@ -1626,7 +1614,7 @@ class stable_vector
    //! <b>Returns</b>: an iterator to the first inserted element or p if first == last.
    //!
    //! <b>Complexity</b>: Linear to distance [il.begin(), il.end()).
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, std::initializer_list<value_type> il)
+   inline iterator insert(const_iterator p, std::initializer_list<value_type> il)
    {
       //Position checks done by insert()
       BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT;
@@ -1713,7 +1701,7 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant time.
-   BOOST_CONTAINER_FORCEINLINE void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
+   inline void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       this->erase(--this->cend());
@@ -1725,7 +1713,7 @@ class stable_vector
    //!
    //! <b>Complexity</b>: Linear to the elements between p and the
    //!   last element. Constant if p is the last element.
-   BOOST_CONTAINER_FORCEINLINE iterator erase(const_iterator p) BOOST_NOEXCEPT_OR_NOTHROW
+   inline iterator erase(const_iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->priv_in_range(p));
       BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT;
@@ -1797,72 +1785,101 @@ class stable_vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the stable_vector.
-   BOOST_CONTAINER_FORCEINLINE void clear() BOOST_NOEXCEPT_OR_NOTHROW
+   inline void clear() BOOST_NOEXCEPT_OR_NOTHROW
    {   this->erase(this->cbegin(),this->cend()); }
 
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==(const stable_vector& x, const stable_vector& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=(const stable_vector& x, const stable_vector& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<(const stable_vector& x, const stable_vector& y)
    {  return ::boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>(const stable_vector& x, const stable_vector& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=(const stable_vector& x, const stable_vector& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=(const stable_vector& x, const stable_vector& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE friend void swap(stable_vector& x, stable_vector& y)
+   inline friend void swap(stable_vector& x, stable_vector& y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
 
+   void priv_move_assign(BOOST_RV_REF(stable_vector) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Resources can be transferred if both allocators are
+      //going to be equal after this function (either propagated or already equal)
+      BOOST_CONTAINER_STABLE_VECTOR_CHECK_INVARIANT
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      dtl::bool_<allocator_traits_type::
+                 propagate_on_container_move_assignment::value> flag;
+      dtl::move_alloc(this->priv_node_alloc(), x.priv_node_alloc(), flag);
+
+      //Take resources
+      this->index = boost::move(x.index); //this also moves the vector's allocator if needed
+      this->priv_swap_members(x);
+   }
+
+   void priv_move_assign(BOOST_RV_REF(stable_vector) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->priv_node_alloc() == x.priv_node_alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         this->assign(boost::make_move_iterator(x.begin()), boost::make_move_iterator(x.end()));
+      }
+   }
+
    bool priv_in_range(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos < this->end());
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_in_range_or_end(const_iterator pos) const
+   inline bool priv_in_range_or_end(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos <= this->end());
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_index_of(node_ptr p) const
+   inline size_type priv_index_of(node_ptr p) const
    {
       //Check range
       BOOST_ASSERT(this->index.empty() || (this->index.data() <= p->up));
@@ -1896,18 +1913,18 @@ class stable_vector
    class push_back_rollback
    {
       public:
-      BOOST_CONTAINER_FORCEINLINE push_back_rollback(stable_vector &sv, const node_ptr &p)
+      inline push_back_rollback(stable_vector &sv, const node_ptr &p)
          : m_sv(sv), m_p(p)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE ~push_back_rollback()
+      inline ~push_back_rollback()
       {
          if(m_p){
             m_sv.priv_put_in_pool(m_p);
          }
       }
 
-      BOOST_CONTAINER_FORCEINLINE void release()
+      inline void release()
       {  m_p = node_ptr();  }
 
       private:
@@ -1937,7 +1954,7 @@ class stable_vector
       return index_beg + (difference_type)idx;
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_capacity_bigger_than_size() const
+   inline bool priv_capacity_bigger_than_size() const
    {
       return this->index.capacity() > this->index.size() &&
              this->internal_data.pool_size > 0;
@@ -2070,16 +2087,16 @@ class stable_vector
       return ret;
    }
 
-   BOOST_CONTAINER_FORCEINLINE node_base_ptr priv_get_end_node() const
+   inline node_base_ptr priv_get_end_node() const
    {  return node_base_ptr_traits::pointer_to(const_cast<node_base_type&>(this->internal_data.end_node));  }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_destroy_node(const node_type &n)
+   inline void priv_destroy_node(const node_type &n)
    {
       allocator_traits<node_allocator_type>::
          destroy(this->priv_node_alloc(), &n);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_delete_node(const node_ptr &n)
+   inline void priv_delete_node(const node_ptr &n)
    {
       this->priv_destroy_node(*n);
       this->priv_put_in_pool(n);
@@ -2165,11 +2182,11 @@ class stable_vector
                               , node_ptr_traits::static_cast_from(pool_first_ref)
                               , node_ptr_traits::static_cast_from(pool_last_ref)
                               , internal_data.pool_size);
-      typename multiallocation_chain::iterator beg(holder.begin()), end(holder.end());
+      typename multiallocation_chain::iterator b(holder.begin()), e(holder.end());
       size_type num_pool = 0;
-      while(beg != end){
+      while(b != e){
          ++num_pool;
-         ++beg;
+         ++b;
       }
       return n >= num_pool && num_pool == internal_data.pool_size;
    }
@@ -2243,7 +2260,7 @@ struct has_trivial_destructor_after_move<boost::container::stable_vector<T, Allo
 {
    typedef typename boost::container::stable_vector<T, Allocator>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
                              ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
diff --git a/inst/include/boost/container/static_vector.hpp b/inst/include/boost/container/static_vector.hpp
index ddc12d43b..403991208 100644
--- a/inst/include/boost/container/static_vector.hpp
+++ b/inst/include/boost/container/static_vector.hpp
@@ -22,6 +22,7 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/detail/type_traits.hpp>
+#include <boost/move/detail/launder.hpp>
 #include <boost/container/vector.hpp>
 
 #include <cstddef>
@@ -40,12 +41,12 @@ class static_storage_allocator
 {
    typedef bool_<ThrowOnOverflow> throw_on_overflow_t;
 
-   static BOOST_NORETURN BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow(true_type)
+   static BOOST_NORETURN inline void on_capacity_overflow(true_type)
    {
       (throw_bad_alloc)();
    }
 
-   static BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow(false_type)
+   static inline void on_capacity_overflow(false_type)
    {
       BOOST_ASSERT_MSG(false, "ERROR: static vector capacity overflow");
    }
@@ -53,42 +54,39 @@ class static_storage_allocator
    public:
    typedef T value_type;
 
-   BOOST_CONTAINER_FORCEINLINE static_storage_allocator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline static_storage_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
-   BOOST_CONTAINER_FORCEINLINE static_storage_allocator(const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static_storage_allocator(const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
-   BOOST_CONTAINER_FORCEINLINE static_storage_allocator & operator=(const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline static_storage_allocator & operator=(const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE T* internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW
-   {  return const_cast<T*>(static_cast<const T*>(static_cast<const void*>(storage.data)));  }
+   inline T* internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW
+   {  return move_detail::launder_cast<T*>(&storage);  }
 
-   BOOST_CONTAINER_FORCEINLINE T* internal_storage() BOOST_NOEXCEPT_OR_NOTHROW
-   {  return static_cast<T*>(static_cast<void*>(storage.data));  }
-
-   static const std::size_t internal_capacity = N;
+   BOOST_STATIC_CONSTEXPR std::size_t internal_capacity = N;
 
    std::size_t max_size() const
    {  return N;   }
 
-   static BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow()
+   static inline void on_capacity_overflow()
    {
       (on_capacity_overflow)(throw_on_overflow_t());
    }
 
    typedef boost::container::dtl::version_type<static_storage_allocator, 0>   version;
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator==(const static_storage_allocator &, const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator==(const static_storage_allocator &, const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return false;  }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!=(const static_storage_allocator &, const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline friend bool operator!=(const static_storage_allocator &, const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return true;  }
 
    private:
-   BOOST_STATIC_ASSERT_MSG(!InplaceAlignment || (InplaceAlignment & (InplaceAlignment-1)) == 0, "Alignment option must be zero or power of two");
-   static const std::size_t final_alignment = InplaceAlignment ? InplaceAlignment : dtl::alignment_of<T>::value;
+   BOOST_CONTAINER_STATIC_ASSERT_MSG(!InplaceAlignment || (InplaceAlignment & (InplaceAlignment-1)) == 0, "Alignment option must be zero or power of two");
+   BOOST_STATIC_CONSTEXPR std::size_t final_alignment = InplaceAlignment ? InplaceAlignment : dtl::alignment_of<T>::value;
    typename dtl::aligned_storage<sizeof(T)*N, final_alignment>::type storage;
 };
 
@@ -104,6 +102,19 @@ struct get_static_vector_opt<void>
    typedef static_vector_null_opt type;
 };
 
+template<class Options>
+struct get_vector_opt_from_static_vector_opt
+{
+   typedef typename get_static_vector_opt<Options>::type options_t;
+   typedef vector_opt<void, typename options_t::stored_size_type> type;
+};
+
+template<>
+struct get_vector_opt_from_static_vector_opt<void>
+{
+   typedef void type;
+};
+
 template <typename T, std::size_t Capacity, class Options>
 struct get_static_vector_allocator
 {
@@ -116,7 +127,6 @@ struct get_static_vector_allocator
       > type;
 };
 
-
 }  //namespace dtl {
 
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -150,12 +160,18 @@ struct get_static_vector_allocator
 //! is specified, by default throw_on_overflow<true> option is set.
 template <typename T, std::size_t Capacity, class Options BOOST_CONTAINER_DOCONLY(= void) >
 class static_vector
-    : public vector<T, typename dtl::get_static_vector_allocator< T, Capacity, Options>::type>
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+    : public vector< T
+                   , typename dtl::get_static_vector_allocator< T, Capacity, Options>::type
+                   , typename dtl::get_vector_opt_from_static_vector_opt<Options>::type
+                   >
+   #endif
 {
    public:
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    typedef typename dtl::get_static_vector_allocator< T, Capacity, Options>::type allocator_type;
-   typedef vector<T, allocator_type > base_t;
+   typedef typename dtl::get_vector_opt_from_static_vector_opt<Options>::type options_type;
+   typedef vector<T, allocator_type, options_type> base_t;
 
    BOOST_COPYABLE_AND_MOVABLE(static_vector)
 
@@ -190,7 +206,7 @@ class static_vector
     typedef typename base_t::const_reverse_iterator const_reverse_iterator;
 
     //! @brief The capacity/max size of the container
-    static const size_type static_capacity = Capacity;
+    BOOST_STATIC_CONSTEXPR size_type static_capacity = Capacity;
 
     //! @brief Constructs an empty static_vector.
     //!
@@ -199,7 +215,7 @@ class static_vector
     //!
     //! @par Complexity
     //!   Constant O(1).
-    BOOST_CONTAINER_FORCEINLINE static_vector() BOOST_NOEXCEPT_OR_NOTHROW
+    inline static_vector() BOOST_NOEXCEPT_OR_NOTHROW
         : base_t()
     {}
 
@@ -215,7 +231,7 @@ class static_vector
     //!
     //! @par Complexity
     //!   Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE explicit static_vector(size_type count)
+    inline explicit static_vector(size_type count)
         : base_t(count)
     {}
 
@@ -234,7 +250,7 @@ class static_vector
     //!
     //! @par Note
     //!   Non-standard extension
-    BOOST_CONTAINER_FORCEINLINE static_vector(size_type count, default_init_t)
+    inline static_vector(size_type count, default_init_t)
         : base_t(count, default_init_t())
     {}
 
@@ -251,7 +267,7 @@ class static_vector
     //!
     //! @par Complexity
     //!   Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector(size_type count, value_type const& value)
+    inline static_vector(size_type count, value_type const& value)
         : base_t(count, value)
     {}
 
@@ -271,7 +287,7 @@ class static_vector
     //! @par Complexity
     //!   Linear O(N).
     template <typename Iterator>
-    BOOST_CONTAINER_FORCEINLINE static_vector(Iterator first, Iterator last)
+    inline static_vector(Iterator first, Iterator last)
         : base_t(first, last)
     {}
 
@@ -289,7 +305,7 @@ class static_vector
     //!
     //! @par Complexity
     //!   Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector(std::initializer_list<value_type> il)
+    inline static_vector(std::initializer_list<value_type> il)
         : base_t(il)
     {}
 #endif
@@ -303,20 +319,20 @@ class static_vector
     //!
     //! @par Complexity
     //!   Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector(static_vector const& other)
+    inline static_vector(static_vector const& other)
         : base_t(other)
     {}
 
-    BOOST_CONTAINER_FORCEINLINE static_vector(static_vector const& other, const allocator_type &)
+    inline static_vector(static_vector const& other, const allocator_type &)
        : base_t(other)
     {}
 
-    BOOST_CONTAINER_FORCEINLINE static_vector(BOOST_RV_REF(static_vector) other,  const allocator_type &)
+    inline static_vector(BOOST_RV_REF(static_vector) other,  const allocator_type &)
        BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<value_type>::value)
        : base_t(BOOST_MOVE_BASE(base_t, other))
     {}
 
-    BOOST_CONTAINER_FORCEINLINE explicit static_vector(const allocator_type &)
+    inline explicit static_vector(const allocator_type &)
        : base_t()
     {}
 
@@ -333,7 +349,7 @@ class static_vector
     //! @par Complexity
     //!   Linear O(N).
     template <std::size_t C, class O>
-    BOOST_CONTAINER_FORCEINLINE static_vector(static_vector<T, C, O> const& other)
+    inline static_vector(static_vector<T, C, O> const& other)
         : base_t(other)
     {}
 
@@ -347,7 +363,7 @@ class static_vector
     //!
     //! @par Complexity
     //!   Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector(BOOST_RV_REF(static_vector) other)
+    inline static_vector(BOOST_RV_REF(static_vector) other)
       BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_constructible<value_type>::value)
         : base_t(BOOST_MOVE_BASE(base_t, other))
     {}
@@ -366,7 +382,7 @@ class static_vector
     //! @par Complexity
     //!   Linear O(N).
     template <std::size_t C, class O>
-    BOOST_CONTAINER_FORCEINLINE static_vector(BOOST_RV_REF_BEG static_vector<T, C, O> BOOST_RV_REF_END other)
+    inline static_vector(BOOST_RV_REF_BEG static_vector<T, C, O> BOOST_RV_REF_END other)
         : base_t(BOOST_MOVE_BASE(typename static_vector<T BOOST_MOVE_I C>::base_t, other))
     {}
 
@@ -379,7 +395,7 @@ class static_vector
     //!
     //! @par Complexity
     //! Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector & operator=(BOOST_COPY_ASSIGN_REF(static_vector) other)
+    inline static_vector & operator=(BOOST_COPY_ASSIGN_REF(static_vector) other)
     {
         return static_cast<static_vector&>(base_t::operator=(static_cast<base_t const&>(other)));
     }
@@ -395,7 +411,7 @@ class static_vector
     //!
     //! @par Complexity
     //! Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector & operator=(std::initializer_list<value_type> il)
+    inline static_vector & operator=(std::initializer_list<value_type> il)
     { return static_cast<static_vector&>(base_t::operator=(il));  }
 #endif
 
@@ -412,7 +428,7 @@ class static_vector
     //! @par Complexity
     //!   Linear O(N).
     template <std::size_t C, class O>
-    BOOST_CONTAINER_FORCEINLINE static_vector & operator=(static_vector<T, C, O> const& other)
+    inline static_vector & operator=(static_vector<T, C, O> const& other)
     {
         return static_cast<static_vector&>(base_t::operator=
             (static_cast<typename static_vector<T, C, O>::base_t const&>(other)));
@@ -428,7 +444,7 @@ class static_vector
     //!
     //! @par Complexity
     //!   Linear O(N).
-    BOOST_CONTAINER_FORCEINLINE static_vector & operator=(BOOST_RV_REF(static_vector) other)
+    inline static_vector & operator=(BOOST_RV_REF(static_vector) other)
        BOOST_NOEXCEPT_IF(boost::container::dtl::is_nothrow_move_assignable<value_type>::value)
     {
         return static_cast<static_vector&>(base_t::operator=(BOOST_MOVE_BASE(base_t, other)));
@@ -448,7 +464,7 @@ class static_vector
     //! @par Complexity
     //!   Linear O(N).
     template <std::size_t C, class O>
-    BOOST_CONTAINER_FORCEINLINE static_vector & operator=(BOOST_RV_REF_BEG static_vector<T, C, O> BOOST_RV_REF_END other)
+    inline static_vector & operator=(BOOST_RV_REF_BEG static_vector<T, C, O> BOOST_RV_REF_END other)
     {
         return static_cast<static_vector&>(base_t::operator=
          (BOOST_MOVE_BASE(typename static_vector<T BOOST_MOVE_I C>::base_t, other)));
@@ -1155,7 +1171,7 @@ class static_vector
    //!
    //! @par Complexity
    //!   Constant O(1).
-   BOOST_CONTAINER_FORCEINLINE static size_type capacity() BOOST_NOEXCEPT_OR_NOTHROW
+   inline static size_type capacity() BOOST_NOEXCEPT_OR_NOTHROW
    { return static_capacity; }
 
    //! @brief Returns container's capacity.
@@ -1167,7 +1183,7 @@ class static_vector
    //!
    //! @par Complexity
    //!   Constant O(1).
-   BOOST_CONTAINER_FORCEINLINE static size_type max_size() BOOST_NOEXCEPT_OR_NOTHROW
+   inline static size_type max_size() BOOST_NOEXCEPT_OR_NOTHROW
    { return static_capacity; }
 
    #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -1196,7 +1212,7 @@ class static_vector
     bool empty() const BOOST_NOEXCEPT_OR_NOTHROW;
 #else
 
-   BOOST_CONTAINER_FORCEINLINE friend void swap(static_vector &x, static_vector &y)
+   inline friend void swap(static_vector &x, static_vector &y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {
       x.swap(y);
diff --git a/inst/include/boost/container/string.hpp b/inst/include/boost/container/string.hpp
index 78e5aea15..59a6bac2d 100644
--- a/inst/include/boost/container/string.hpp
+++ b/inst/include/boost/container/string.hpp
@@ -43,14 +43,12 @@
 //intrusive
 #include <boost/intrusive/pointer_traits.hpp>
 #include <boost/intrusive/detail/hash_combine.hpp>
-#include <boost/move/detail/force_ptr.hpp>
+#include <boost/move/detail/launder.hpp>
 //move
 #include <boost/move/utility_core.hpp>
 #include <boost/move/adl_move_swap.hpp>
 #include <boost/move/traits.hpp>
 
-#include <boost/static_assert.hpp>
-
 #include <iosfwd> 
 #include <istream>   //
 #include <ostream>
@@ -103,31 +101,31 @@ class basic_string_base
 
    typedef ::boost::intrusive::pointer_traits<pointer> pointer_traits;
 
-   BOOST_CONTAINER_FORCEINLINE basic_string_base()
+   inline basic_string_base()
       : members_()
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit basic_string_base(const allocator_type& a)
+   inline explicit basic_string_base(const allocator_type& a)
       : members_(a)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE explicit basic_string_base(BOOST_RV_REF(allocator_type) a)
+   inline explicit basic_string_base(BOOST_RV_REF(allocator_type) a)
       :  members_(boost::move(a))
    {}
 
-   BOOST_CONTAINER_FORCEINLINE basic_string_base(const allocator_type& a, size_type n)
+   inline basic_string_base(const allocator_type& a, size_type n)
       : members_(a)
    {
       this->allocate_initial_block(n);
    }
 
-   BOOST_CONTAINER_FORCEINLINE explicit basic_string_base(size_type n)
+   inline explicit basic_string_base(size_type n)
       : members_()
    {
       this->allocate_initial_block(n);
    }
 
-   BOOST_CONTAINER_FORCEINLINE ~basic_string_base()
+   inline ~basic_string_base()
    {
       if(!this->is_short()){
          this->deallocate(this->priv_long_addr(), this->priv_long_storage());
@@ -149,15 +147,15 @@ class basic_string_base
       size_type      storage;
       pointer        start;
 
-      BOOST_CONTAINER_FORCEINLINE long_t()
+      inline long_t()
          : is_short(0)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE long_t(size_type len, size_type stor, pointer ptr)
+      inline long_t(size_type len, size_type stor, pointer ptr)
          : is_short(0), length(len), storage(stor), start(ptr)
       {}
 
-      BOOST_CONTAINER_FORCEINLINE long_t(const long_t &other)
+      inline long_t(const long_t &other)
       {
          this->is_short = false;
          length   = other.length;
@@ -165,7 +163,7 @@ class basic_string_base
          start    = other.start;
       }
 
-      BOOST_CONTAINER_FORCEINLINE long_t &operator= (const long_t &other)
+      inline long_t &operator= (const long_t &other)
       {
          length   = other.length;
          storage  = other.storage;
@@ -194,13 +192,13 @@ class basic_string_base
       <sizeof(long_t), dtl::alignment_of<long_t>::value>::type   long_raw_t;
 
    protected:
-   static const size_type  MinInternalBufferChars = 8;
-   static const size_type  AlignmentOfValueType =
+   BOOST_STATIC_CONSTEXPR size_type  MinInternalBufferChars = 8;
+   BOOST_STATIC_CONSTEXPR size_type  AlignmentOfValueType =
       alignment_of<value_type>::value;
-   static const size_type  ShortDataOffset = ((sizeof(short_header)-1)/AlignmentOfValueType+1)*AlignmentOfValueType;
-   static const size_type  ZeroCostInternalBufferChars =
+   BOOST_STATIC_CONSTEXPR size_type  ShortDataOffset = ((sizeof(short_header)-1)/AlignmentOfValueType+1)*AlignmentOfValueType;
+   BOOST_STATIC_CONSTEXPR size_type  ZeroCostInternalBufferChars =
       (sizeof(long_t) - ShortDataOffset)/sizeof(value_type);
-   static const size_type  UnalignedFinalInternalBufferChars =
+   BOOST_STATIC_CONSTEXPR size_type  UnalignedFinalInternalBufferChars =
       (ZeroCostInternalBufferChars > MinInternalBufferChars) ?
                 ZeroCostInternalBufferChars : MinInternalBufferChars;
 
@@ -226,68 +224,68 @@ class basic_string_base
    struct members_holder
       :  public allocator_type
    {
-      BOOST_CONTAINER_FORCEINLINE void init()
+      inline void init()
       {
-         short_t &s = *::new(this->m_repr.data) short_t;
+         short_t &s = *::new(&this->m_repr) short_t;
          s.h.is_short = 1;
          s.h.length = 0;
       }
 
-      BOOST_CONTAINER_FORCEINLINE members_holder()
+      inline members_holder()
          : allocator_type()
       { this->init(); }
 
       template<class AllocatorConvertible>
-      BOOST_CONTAINER_FORCEINLINE explicit members_holder(BOOST_FWD_REF(AllocatorConvertible) a)
+      inline explicit members_holder(BOOST_FWD_REF(AllocatorConvertible) a)
          :  allocator_type(boost::forward<AllocatorConvertible>(a))
       { this->init(); }
 
-      BOOST_CONTAINER_FORCEINLINE const short_t *pshort_repr() const
-      {  return move_detail::force_ptr<const short_t*>(m_repr.data);  }
+      inline const short_t *pshort_repr() const
+      {  return move_detail::launder_cast<const short_t*>(&m_repr);  }
 
-      BOOST_CONTAINER_FORCEINLINE const long_t *plong_repr() const
-      {  return move_detail::force_ptr<const long_t*>(m_repr.data);  }
+      inline const long_t *plong_repr() const
+      {  return move_detail::launder_cast<const long_t*>(&m_repr);  }
 
-      BOOST_CONTAINER_FORCEINLINE short_t *pshort_repr()
-      {  return move_detail::force_ptr<short_t*>(m_repr.data);  }
+      inline short_t *pshort_repr()
+      {  return move_detail::launder_cast<short_t*>(&m_repr);  }
 
-      BOOST_CONTAINER_FORCEINLINE long_t *plong_repr()
-      {  return move_detail::force_ptr<long_t*>(m_repr.data);  }
+      inline long_t *plong_repr()
+      {  return move_detail::launder_cast<long_t*>(&m_repr);  }
 
       repr_t m_repr;
    } members_;
 
-   BOOST_CONTAINER_FORCEINLINE const allocator_type &alloc() const
+   inline const allocator_type &alloc() const
    {  return members_;  }
 
-   BOOST_CONTAINER_FORCEINLINE allocator_type &alloc()
+   inline allocator_type &alloc()
    {  return members_;  }
 
-   static const size_type InternalBufferChars = (sizeof(repr_t) - ShortDataOffset)/sizeof(value_type);
+   BOOST_STATIC_CONSTEXPR size_type InternalBufferChars = (sizeof(repr_t) - ShortDataOffset)/sizeof(value_type);
 
    private:
 
-   static const size_type MinAllocation = InternalBufferChars*2;
+   BOOST_STATIC_CONSTEXPR size_type MinAllocation = InternalBufferChars*2;
 
    protected:
-   BOOST_CONTAINER_FORCEINLINE bool is_short() const
+   inline bool is_short() const
    {
       //Access and copy (to avoid UB) the first byte of the union to know if the
       //active representation is short or long
       short_header hdr;
-      BOOST_STATIC_ASSERT((sizeof(short_header) == 1));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(short_header) == 1));
       *(unsigned char*)&hdr = *(unsigned char*)&this->members_.m_repr;
       return hdr.is_short != 0;
    }
 
-   BOOST_CONTAINER_FORCEINLINE short_t *construct_short()
+   inline short_t *construct_short()
    {
-      short_t *ps = ::new(this->members_.m_repr.data) short_t;
+      short_t *ps = ::new(&this->members_.m_repr) short_t;
       ps->h.is_short = 1;
       return ps;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void destroy_short()
+   inline void destroy_short()
    {
       BOOST_ASSERT(this->is_short());
       this->members_.pshort_repr()->~short_t();
@@ -302,14 +300,14 @@ class basic_string_base
       return this->members_.pshort_repr();
    }
 
-   BOOST_CONTAINER_FORCEINLINE long_t *construct_long()
+   inline long_t *construct_long()
    {
-      long_t *pl = ::new(this->members_.m_repr.data) long_t;
+      long_t *pl = ::new(&this->members_.m_repr) long_t;
       //is_short flag is written in the constructor
       return pl;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void destroy_long()
+   inline void destroy_long()
    {
       BOOST_ASSERT(!this->is_short());
       this->members_.plong_repr()->~long_t();
@@ -355,15 +353,6 @@ class basic_string_base
          this->alloc().deallocate(p, n);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void construct(pointer p, const value_type &value = value_type())
-   {
-      allocator_traits_type::construct
-         ( this->alloc()
-         , boost::movelib::to_raw_pointer(p)
-         , value
-         );
-   }
-
    void destroy(pointer p, size_type n)
    {
       value_type *raw_p = boost::movelib::to_raw_pointer(p);
@@ -372,7 +361,7 @@ class basic_string_base
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void destroy(pointer p)
+   inline void destroy(pointer p)
    {
       allocator_traits_type::destroy
          ( this->alloc()
@@ -399,17 +388,17 @@ class basic_string_base
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void deallocate_block()
+   inline void deallocate_block()
    {  this->deallocate(this->priv_addr(), this->priv_storage());  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type max_size() const
+   inline size_type max_size() const
    {  return allocator_traits_type::max_size(this->alloc()) - 1; }
 
    protected:
-   BOOST_CONTAINER_FORCEINLINE size_type priv_capacity() const
+   inline size_type priv_capacity() const
    { return this->priv_storage() - 1; }
 
-   BOOST_CONTAINER_FORCEINLINE pointer priv_short_addr() const
+   inline pointer priv_short_addr() const
    {  return pointer_traits::pointer_to(const_cast<value_type&>(this->members_.pshort_repr()->data[0]));  }
 
    //GCC seems a bit confused about uninitialized accesses
@@ -418,10 +407,10 @@ class basic_string_base
   //   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
    #endif
 
-   BOOST_CONTAINER_FORCEINLINE pointer priv_long_addr() const
+   inline pointer priv_long_addr() const
    {  return this->members_.plong_repr()->start;  }
 
-   BOOST_CONTAINER_FORCEINLINE pointer priv_addr() const
+   inline pointer priv_addr() const
    {
       return this->is_short()
          ? priv_short_addr()
@@ -429,7 +418,7 @@ class basic_string_base
          ;
    }
 
-   BOOST_CONTAINER_FORCEINLINE pointer priv_end_addr() const
+   inline pointer priv_end_addr() const
    {
       return this->is_short()
          ? this->priv_short_addr() + difference_type(this->priv_short_size())
@@ -437,39 +426,39 @@ class basic_string_base
          ;
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_long_addr(pointer addr)
+   inline void priv_long_addr(pointer addr)
    {  this->members_.plong_repr()->start = addr;  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_storage() const
+   inline size_type priv_storage() const
    {  return this->is_short() ? priv_short_storage() : priv_long_storage();  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_short_storage() const
+   inline size_type priv_short_storage() const
    {  return InternalBufferChars;  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_long_storage() const
+   inline size_type priv_long_storage() const
    {  return this->members_.plong_repr()->storage;  }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_storage(size_type storage)
+   inline void priv_storage(size_type storage)
    {
       if(!this->is_short())
          this->priv_long_storage(storage);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_long_storage(size_type storage)
+   inline void priv_long_storage(size_type storage)
    {
       this->members_.plong_repr()->storage = storage;
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_size() const
+   inline size_type priv_size() const
    {  return this->is_short() ? this->priv_short_size() : this->priv_long_size();  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_short_size() const
+   inline size_type priv_short_size() const
    {  return this->members_.pshort_repr()->h.length;  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_long_size() const
+   inline size_type priv_long_size() const
    {  return this->members_.plong_repr()->length;  }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_size(size_type sz)
+   inline void priv_size(size_type sz)
    {
       if(this->is_short())
          this->priv_short_size(sz);
@@ -477,18 +466,18 @@ class basic_string_base
          this->priv_long_size(sz);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_short_size(size_type sz)
+   inline void priv_short_size(size_type sz)
    {
       typedef unsigned char uchar_type;
-      static const uchar_type mask = uchar_type(uchar_type(-1) >> 1U);
+      BOOST_STATIC_CONSTEXPR uchar_type mask = uchar_type(uchar_type(-1) >> 1U);
       BOOST_ASSERT( sz <= mask );
       //Make -Wconversion happy
       this->members_.pshort_repr()->h.length = uchar_type(uchar_type(sz) & mask);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_long_size(size_type sz)
+   inline void priv_long_size(size_type sz)
    {
-      static const size_type mask = size_type(-1) >> 1U;
+      BOOST_STATIC_CONSTEXPR size_type mask = size_type(-1) >> 1U;
       BOOST_ASSERT( sz <= mask );
       //Make -Wconversion happy
       this->members_.plong_repr()->length = sz & mask;
@@ -577,7 +566,7 @@ class basic_string
    BOOST_COPYABLE_AND_MOVABLE(basic_string)
    typedef dtl::basic_string_base<typename real_allocator<CharT, Allocator>::type> base_t;
    typedef typename base_t::allocator_traits_type allocator_traits_type;
-   static const typename base_t::size_type InternalBufferChars = base_t::InternalBufferChars;
+   BOOST_STATIC_CONSTEXPR typename base_t::size_type InternalBufferChars = base_t::InternalBufferChars;
 
    protected:
    // Allocator helper class to use a char_traits as a function object.
@@ -635,10 +624,15 @@ class basic_string
    typedef BOOST_CONTAINER_IMPDEF(const_pointer)                                       const_iterator;
    typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<iterator>)        reverse_iterator;
    typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<const_iterator>)  const_reverse_iterator;
-   static const size_type npos = size_type(-1);
+   BOOST_STATIC_CONSTEXPR size_type npos = size_type(-1);
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
+
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits<allocator_type>::value_type>::value));
+
    typedef constant_iterator<CharT> cvalue_iterator;
    typedef typename base_t::alloc_version  alloc_version;
    typedef ::boost::intrusive::pointer_traits<pointer> pointer_traits;
@@ -924,26 +918,13 @@ class basic_string
                                   || allocator_traits_type::is_always_equal::value)
    {
       if (BOOST_LIKELY(this != &x)) {
-         allocator_type &this_alloc = this->alloc();
-         allocator_type &x_alloc    = x.alloc();
-         const bool propagate_alloc = allocator_traits_type::
-               propagate_on_container_move_assignment::value;
-         dtl::bool_<propagate_alloc> flag;
-         const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-         //Resources can be transferred if both allocators are
-         //going to be equal after this function (either propagated or already equal)
-         if(propagate_alloc || allocators_equal){
-            //Destroy objects but retain memory in case x reuses it in the future
-            this->clear();
-            //Move allocator if needed
-            dtl::move_alloc(this_alloc, x_alloc, flag);
-            //Nothrow swap
-            this->swap_data(x);
-         }
-         //Else do a one by one move
-         else{
-            this->assign( x.begin(), x.end());
-         }
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
@@ -978,7 +959,7 @@ class basic_string
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->alloc(); }
 
@@ -989,7 +970,7 @@ class basic_string
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->alloc(); }
 
@@ -1000,7 +981,7 @@ class basic_string
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->alloc(); }
 
@@ -1015,7 +996,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_addr(); }
 
@@ -1024,7 +1005,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_addr(); }
 
@@ -1033,7 +1014,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_end_addr(); }
 
@@ -1042,7 +1023,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_end_addr(); }
 
@@ -1052,7 +1033,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rbegin()  BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->priv_end_addr()); }
 
@@ -1062,7 +1043,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crbegin(); }
 
@@ -1072,7 +1053,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reverse_iterator rend()  BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->priv_addr()); }
 
@@ -1082,7 +1063,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crend(); }
 
@@ -1091,7 +1072,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_addr(); }
 
@@ -1100,7 +1081,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_end_addr(); }
 
@@ -1110,7 +1091,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->priv_end_addr()); }
 
@@ -1120,7 +1101,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->priv_addr()); }
 
@@ -1135,7 +1116,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    { return !this->priv_size(); }
 
@@ -1144,7 +1125,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type size() const    BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_size(); }
 
@@ -1153,7 +1134,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type length() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->size(); }
 
@@ -1162,7 +1143,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    { return base_t::max_size(); }
 
@@ -1202,7 +1183,7 @@ class basic_string
       if (n <= this->size())
          this->erase(this->begin() + difference_type(n), this->end());
       else{
-         this->priv_reserve(n, false);
+         this->priv_reserve_no_null_end(n);
          this->priv_size(n);
          this->priv_terminate_string();
       }
@@ -1214,7 +1195,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_capacity(); }
 
@@ -1274,7 +1255,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference         front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1289,7 +1270,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference   front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1304,7 +1285,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference         back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1319,7 +1300,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference   back()  const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
@@ -1334,7 +1315,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
@@ -1349,7 +1330,7 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
@@ -1364,7 +1345,7 @@ class basic_string
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference at(size_type n)
    {
       if (n >= this->size())
@@ -1380,7 +1361,7 @@ class basic_string
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference at(size_type n) const {
       if (n >= this->size())
          throw_out_of_range("basic_string::at invalid subscript");
@@ -1900,7 +1881,7 @@ class basic_string
    //!
    //! <b>Returns</b>: An iterator which refers to the copy of the first inserted
    //!   character, or p if i1 is empty.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, std::initializer_list<CharT> il)
+   inline iterator insert(const_iterator p, std::initializer_list<CharT> il)
    {
       return this->insert(p, il.begin(), il.end());
    }
@@ -2019,7 +2000,7 @@ class basic_string
    //! <b>Effects</b>: Calls `return replace(pos1, n1, sv.data(), sv.size());`.
    //!
    template<template<class, class> class BasicStringView>
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(size_type pos1, size_type n1, BasicStringView<CharT, Traits> sv)
+   inline basic_string& replace(size_type pos1, size_type n1, BasicStringView<CharT, Traits> sv)
    {
       return this->replace(pos1, n1, sv.data(), sv.size());
    }
@@ -2096,7 +2077,7 @@ class basic_string
    //!   if the length of the resulting string would exceed max_size()
    //!
    //! <b>Returns</b>: *this
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(size_type pos, size_type n1, const CharT* s)
+   inline basic_string& replace(size_type pos, size_type n1, const CharT* s)
    {
       return this->replace(pos, n1, s, Traits::length(s));
    }
@@ -2127,7 +2108,7 @@ class basic_string
    //! <b>Throws</b>: if memory allocation throws
    //!
    //! <b>Returns</b>: *this
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(const_iterator i1, const_iterator i2, const basic_string& str)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, const basic_string& str)
    { return this->replace(i1, i2, str.data(), str.data()+str.size()); }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges and
@@ -2138,7 +2119,7 @@ class basic_string
    //! <b>Throws</b>: if memory allocation throws
    //!
    //! <b>Returns</b>: *this
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s, size_type n)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s, size_type n)
    { return this->replace(i1, i2, s, s + difference_type(n)); }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges and s points to an
@@ -2149,7 +2130,7 @@ class basic_string
    //! <b>Throws</b>: if memory allocation throws
    //!
    //! <b>Returns</b>: *this
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s)
    {  return this->replace(i1, i2, s, s + Traits::length(s));   }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges.
@@ -2234,7 +2215,7 @@ class basic_string
    //!
    //! <b>Returns</b>: *this.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(const_iterator i1, const_iterator i2, BasicStringView<CharT, Traits> sv)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, BasicStringView<CharT, Traits> sv)
    {
       return this->replace( static_cast<size_type>(i1 - this->cbegin())
                           , static_cast<size_type>(i2 - i1), sv);
@@ -2246,7 +2227,7 @@ class basic_string
    //! <b>Effects</b>: Calls replace(i1 - begin(), i2 - i1, il.begin(), il.size()).
    //!
    //! <b>Returns</b>: *this.
-   BOOST_CONTAINER_FORCEINLINE basic_string& replace(const_iterator i1, const_iterator i2, std::initializer_list<CharT> il)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, std::initializer_list<CharT> il)
    {
       return this->replace( static_cast<size_type>(i1 - this->cbegin())
                           , static_cast<size_type>(i2 - i1)
@@ -2298,7 +2279,7 @@ class basic_string
    //! <b>Returns</b>: A pointer p such that p + i == &operator[](i) for each i in [0,size()].
    //!
    //! <b>Complexity</b>: constant time.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const CharT* c_str() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return boost::movelib::to_raw_pointer(this->priv_addr()); }
 
@@ -2307,14 +2288,14 @@ class basic_string
    //! <b>Returns</b>: A pointer p such that p + i == &operator[](i) for each i in [0,size()].
    //!
    //! <b>Complexity</b>: constant time.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const CharT* data()  const BOOST_NOEXCEPT_OR_NOTHROW
    {  return boost::movelib::to_raw_pointer(this->priv_addr()); }
 
    //! <b>Returns</b>: A pointer p such that p + i == &operator[](i) for each i in [0,size()].
    //!
    //! <b>Complexity</b>: constant time.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       CharT* data()  BOOST_NOEXCEPT_OR_NOTHROW
    {  return boost::movelib::to_raw_pointer(this->priv_addr()); }
 
@@ -2323,7 +2304,7 @@ class basic_string
    //!
    //! <b>Complexity</b>: constant time.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_FORCEINLINE operator BasicStringView<CharT, Traits>() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline operator BasicStringView<CharT, Traits>() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->to_view< BasicStringView<CharT, Traits> >(); }
    #endif
 
@@ -2334,7 +2315,7 @@ class basic_string
    //! <b>Note</b>: This function is available to write portable code for compilers
    //!   that don't support templated conversion operators.
    template<class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       BasicStringView to_view() const BOOST_NOEXCEPT_OR_NOTHROW
    { return BasicStringView(this->data(), this->size()); }
 
@@ -2352,7 +2333,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find(const basic_string& s, size_type pos = 0) const
    { return find(s.c_str(), pos, s.size()); }
 
@@ -2365,7 +2346,7 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
    { return this->find(sv.data(), pos, sv.size()); }
 
@@ -2374,7 +2355,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find(basic_string<CharT,traits,allocator_type>(s,n),pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find(const CharT* s, size_type pos, size_type n) const
    {
       if (pos + n > this->size())
@@ -2395,14 +2376,14 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find(basic_string(s), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find(const CharT* s, size_type pos = 0) const
    { return this->find(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find(basic_string<CharT,traits,allocator_type>(1,c), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find(CharT c, size_type pos = 0) const
    {
       const size_type sz = this->size();
@@ -2426,7 +2407,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type rfind(const basic_string& str, size_type pos = npos) const
       { return this->rfind(str.c_str(), pos, str.size()); }
 
@@ -2439,7 +2420,7 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type rfind(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
       { return this->rfind(sv.data(), pos, sv.size()); }
 
@@ -2448,7 +2429,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: rfind(basic_string(s, n), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type rfind(const CharT* s, size_type pos, size_type n) const
    {
       const size_type len = this->size();
@@ -2458,7 +2439,7 @@ class basic_string
       else if (n == 0)
          return dtl::min_value(len, pos);
       else {
-         const const_iterator last = begin() + difference_type(dtl::min_value(len - n, pos + n));
+         const const_iterator last = begin() + difference_type(dtl::min_value(len - n, pos) + n);
          const const_iterator result = boost::container::find_end
             (begin(), last, s, s + difference_type(n), Eq_traits<Traits>());
          return result != last ? size_type(result - begin()) : npos;
@@ -2471,14 +2452,14 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: rfind(basic_string(s), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type rfind(const CharT* s, size_type pos = npos) const
       { return this->rfind(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: rfind(basic_string<CharT,traits,allocator_type>(1,c),pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type rfind(CharT c, size_type pos = npos) const
    {
       const size_type len = this->size();
@@ -2501,7 +2482,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_of(const basic_string& str, size_type pos = 0) const
       { return this->find_first_of(str.c_str(), pos, str.size()); }
 
@@ -2513,7 +2494,7 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_of(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
       { return this->find_first_of(sv.data(), pos, sv.size()); }
 
@@ -2522,7 +2503,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_of(basic_string(s, n), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_of(const CharT* s, size_type pos, size_type n) const
    {
       const size_type sz = this->size();
@@ -2542,7 +2523,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_of(basic_string(s), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_of(const CharT* s, size_type pos = 0) const
       { return this->find_first_of(s, pos, Traits::length(s)); }
 
@@ -2551,7 +2532,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_of(basic_string<CharT,traits,allocator_type>(1,c), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_of(CharT c, size_type pos = 0) const
     { return this->find(c, pos); }
 
@@ -2562,7 +2543,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_of(const basic_string& str, size_type pos = npos) const
       { return this->find_last_of(str.c_str(), pos, str.size()); }
 
@@ -2574,7 +2555,7 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_of(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
       { return this->find_last_of(sv.data(), pos, sv.size()); }
 
@@ -2583,7 +2564,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_of(basic_string(s, n), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_of(const CharT* s, size_type pos, size_type n) const
    {
       const size_type len = this->size();
@@ -2605,14 +2586,14 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_of(basic_string<CharT,traits,allocator_type>(1,c),pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_of(const CharT* s, size_type pos = npos) const
       { return this->find_last_of(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_of(basic_string(s), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_of(CharT c, size_type pos = npos) const
       {  return this->rfind(c, pos);   }
 
@@ -2624,7 +2605,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_not_of(const basic_string& str, size_type pos = 0) const
       { return this->find_first_not_of(str.c_str(), pos, str.size()); }
 
@@ -2637,7 +2618,7 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_not_of(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
       { return this->find_first_not_of(sv.data(), pos, sv.size()); }
 
@@ -2646,7 +2627,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_not_of(basic_string(s, n), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_not_of(const CharT* s, size_type pos, size_type n) const
    {
       if (pos > this->size())
@@ -2665,14 +2646,14 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_not_of(basic_string(s), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_not_of(const CharT* s, size_type pos = 0) const
       { return this->find_first_not_of(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_not_of(basic_string(1, c), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_first_not_of(CharT c, size_type pos = 0) const
    {
       if (pos > this->size())
@@ -2694,7 +2675,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_not_of(const basic_string& str, size_type pos = npos) const
       { return this->find_last_not_of(str.c_str(), pos, str.size()); }
 
@@ -2706,7 +2687,7 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_not_of(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
       { return this->find_last_not_of(sv.data(), pos, sv.size()); }
 
@@ -2715,7 +2696,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_not_of(basic_string(s, n), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_not_of(const CharT* s, size_type pos, size_type n) const
    {
       const size_type len = this->size();
@@ -2736,14 +2717,14 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_not_of(basic_string(s), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_not_of(const CharT* s, size_type pos = npos) const
       { return this->find_last_not_of(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_not_of(basic_string(1, c), pos).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type find_last_not_of(CharT c, size_type pos = npos) const
    {
       const size_type len = this->size();
@@ -2767,7 +2748,7 @@ class basic_string
    //! <b>Throws</b>: If memory allocation throws or out_of_range if pos > size().
    //!
    //! <b>Returns</b>: basic_string<CharT,traits,allocator_type>(data()+pos,rlen).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       basic_string substr(size_type pos = 0, size_type n = npos) const
    {
       if (pos > this->size())
@@ -2786,7 +2767,7 @@ class basic_string
    //! <b>Returns</b>: The nonzero result if the result of the comparison is nonzero.
    //!   Otherwise, returns a value < 0 if size() < str.size(), a 0 value if size() == str.size(),
    //!   and value > 0 if size() > str.size()
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(const basic_string& str) const
    {
       const pointer addr     = this->priv_addr();
@@ -2798,7 +2779,7 @@ class basic_string
    //!
    //! <b>Returns</b>: compare(basic_string(sv)).
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(BasicStringView<CharT,Traits> sv) const
    {
       const pointer addr = this->priv_addr();
@@ -2814,7 +2795,7 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size()
    //!
    //! <b>Returns</b>:basic_string(*this,pos1,n1).compare(str).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(size_type pos1, size_type n1, const basic_string& str) const
    {
       if (pos1 > this->size())
@@ -2832,7 +2813,7 @@ class basic_string
    //!
    //! <b>Returns</b>:basic_string(*this,pos1,n1).compare(sv).
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(size_type pos1, size_type n1, BasicStringView<CharT,Traits> sv) const
    {
       if (pos1 > this->size())
@@ -2851,7 +2832,7 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size() or pos2 > str.size()
    //!
    //! <b>Returns</b>: basic_string(*this, pos1, n1).compare(basic_string(str, pos2, n2)).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(size_type pos1, size_type n1, const basic_string& str, size_type pos2, size_type n2 = npos) const
    {
       if (pos1 > this->size() || pos2 > str.size())
@@ -2871,7 +2852,7 @@ class basic_string
    //!
    //! <b>Returns</b>: basic_string(*this, pos1, n1).compare(BasicStringView<CharT, Traits>(sv, pos2, n2)).
    template<template <class, class> class BasicStringView>
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(size_type pos1, size_type n1, BasicStringView<CharT,Traits> sv, size_type pos2, size_type n2) const
    {
       if (pos1 > this->size() || pos2 > sv.size())
@@ -2885,7 +2866,7 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: compare(basic_string(s)).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(const CharT* s) const
    {
       const pointer addr = this->priv_addr();
@@ -2897,7 +2878,7 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size()
    //!
    //! <b>Returns</b>: basic_string(*this, pos, n1).compare(basic_string(s, n2)).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(size_type pos1, size_type n1, const CharT* s, size_type n2) const
    {
       if (pos1 > this->size())
@@ -2913,37 +2894,66 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size()
    //!
    //! <b>Returns</b>: basic_string(*this, pos, n1).compare(basic_string(s, n2)).
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       int compare(size_type pos1, size_type n1, const CharT* s) const
    {  return this->compare(pos1, n1, s, Traits::length(s)); }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
-   void priv_reserve(size_type res_arg, const bool null_terminate = true)
+   void priv_move_assign(BOOST_RV_REF(basic_string) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      dtl::bool_<allocator_traits_type::
+         propagate_on_container_move_assignment::value> flag;
+      dtl::move_alloc(this->alloc(), x.alloc(), flag);
+      //Nothrow swap
+      this->swap_data(x);
+   }
+
+   void priv_move_assign(BOOST_RV_REF(basic_string) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->alloc() == x.alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         this->assign(x.begin(), x.end());
+      }
+   }
+
+   bool priv_reserve_no_null_end(size_type res_arg)
    {
       if (res_arg > this->max_size()){
          throw_length_error("basic_string::reserve max_size() exceeded");
       }
 
-      if (this->capacity() < res_arg){
-         size_type n = dtl::max_value(res_arg, this->size()) + 1;
+      const bool do_alloc = this->capacity() < res_arg;
+      if (do_alloc){
+         //size_type n = dtl::max_value(res_arg, this->size()) + 1;
+         size_type n = res_arg + 1;
          size_type new_cap = this->next_capacity(n);
          pointer reuse = 0;
          pointer new_start = this->allocation_command(allocate_new, n, new_cap, reuse);
-         size_type new_length = 0;
 
          const pointer addr = this->priv_addr();
-         new_length += priv_uninitialized_copy
+         size_type new_length = priv_uninitialized_copy
             (addr, addr + difference_type(this->priv_size()), new_start);
-         if(null_terminate){
-            this->priv_construct_null(new_start + difference_type(new_length));
-         }
          this->deallocate_block();
          this->assure_long();
          this->priv_long_addr(new_start);
          this->priv_long_size(new_length);
          this->priv_storage(new_cap);
       }
+      return do_alloc;
+   }
+
+   void priv_reserve(size_type res_arg)
+   {
+      if(this->priv_reserve_no_null_end(res_arg))
+         this->priv_terminate_string();
    }
 
    template<class It1, class It2>
@@ -3000,58 +3010,24 @@ class basic_string
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_construct_null(pointer p)
-   {  this->construct(p, CharT(0));  }
+   inline void priv_construct_null(pointer p)
+   {  traits_type::assign(*p, CharT());  }
 
    // Helper functions used by constructors.  It is a severe error for
    // any of them to be called anywhere except from within constructors.
-   BOOST_CONTAINER_FORCEINLINE void priv_terminate_string()
+   inline void priv_terminate_string()
    {  this->priv_construct_null(this->priv_end_addr());  }
 
-   template<class FwdIt, class Count> inline
-   void priv_uninitialized_fill_n(FwdIt first, Count count, const CharT val)
-   {
-      //Save initial position
-      FwdIt init = first;
-
-      BOOST_CONTAINER_TRY{
-         //Construct objects
-         for (; count--; ++first){
-            this->construct(first, val);
-         }
-      }
-      BOOST_CONTAINER_CATCH(...){
-         //Call destructors
-         for (; init != first; ++init){
-            this->destroy(init);
-         }
-         BOOST_CONTAINER_RETHROW
-      }
-      BOOST_CONTAINER_CATCH_END
-   }
-
    template<class InpIt, class FwdIt> inline
    size_type priv_uninitialized_copy(InpIt first, InpIt last, FwdIt dest)
    {
       //Save initial destination position
-      FwdIt dest_init = dest;
       size_type constructed = 0;
 
-      BOOST_CONTAINER_TRY{
-         //Try to build objects
-         for (; first != last; ++dest, ++first, ++constructed){
-            this->construct(dest, *first);
-         }
+      for (; first != last; ++dest, ++first, ++constructed){
+         traits_type::assign(*dest, *first);
       }
-      BOOST_CONTAINER_CATCH(...){
-         //Call destructors
-         for (; constructed--; ++dest_init){
-            this->destroy(dest_init);
-         }
-         BOOST_CONTAINER_RETHROW
-      }
-      BOOST_CONTAINER_CATCH_END
-      return (constructed);
+      return constructed;
    }
 
    template <class InputIterator, class OutIterator>
@@ -3061,17 +3037,17 @@ class basic_string
          Traits::assign(*result, *first);
    }
 
-   static BOOST_CONTAINER_FORCEINLINE void priv_copy(const CharT* first, const CharT* last, CharT* result)
+   static inline void priv_copy(const CharT* first, const CharT* last, CharT* result)
    {  Traits::copy(result, first, std::size_t(last - first));  }
 
    template <class Integer>
-   BOOST_CONTAINER_FORCEINLINE basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
+   inline basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
                                        Integer n, Integer x,
                                        dtl::true_)
    {  return this->replace(first, last, (size_type) n, (CharT) x);   }
 
    template <class InputIter>
-   BOOST_CONTAINER_FORCEINLINE basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
+   inline basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
                                        InputIter f, InputIter l,
                                        dtl::false_)
    {
@@ -3114,20 +3090,16 @@ wstring;
 
 #else
 
-template <class CharT, class Traits, class Allocator>
-const typename basic_string<CharT,Traits,Allocator>::size_type
-   basic_string<CharT,Traits,Allocator>::npos;
-
 template<class S>
 struct is_string
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class C, class T, class A>
 struct is_string< basic_string<C, T, A> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 #endif
@@ -3578,21 +3550,6 @@ getline(std::basic_istream<CharT, Traits>& is, basic_string<CharT,Traits,Allocat
    return getline(is, s, '\n');
 }
 
-template <class Ch, class Allocator>
-inline std::size_t hash_value(basic_string<Ch, std::char_traits<Ch>, Allocator> const& v)
-{
-   std::size_t seed = 0;
-   const Ch *first = v.data();
-
-   for(std::size_t i = 0, i_max = v.size(); i != i_max; ++i)
-   {
-      boost::intrusive::detail::hash_combine_size_t(seed, static_cast<std::size_t>(*first));
-      ++first;
-   }
-
-   return seed;
-}
-
 }}
 
 //GCC 12 has a regression for array-bounds warnings
@@ -3612,8 +3569,9 @@ struct has_trivial_destructor_after_move<boost::container::basic_string<C, T, Al
 {
    typedef typename boost::container::basic_string<C, T, Allocator>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
-                             ::boost::has_trivial_destructor_after_move<pointer>::value;
+   BOOST_STATIC_CONSTEXPR bool value =
+      ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+      ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
 }
diff --git a/inst/include/boost/container/uses_allocator.hpp b/inst/include/boost/container/uses_allocator.hpp
index e0e351808..11915e645 100644
--- a/inst/include/boost/container/uses_allocator.hpp
+++ b/inst/include/boost/container/uses_allocator.hpp
@@ -58,7 +58,7 @@ namespace container {
 //! to detect if a type should be constructed with suffix or prefix allocator arguments.
 template <class T>
 struct constructible_with_allocator_suffix
-{  static const bool value = false; };
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
 
 //! <b>Remark</b>: if a specialization constructible_with_allocator_prefix<X>::value is true, indicates that T may be constructed
 //! with allocator_arg and T::allocator_type as its first two constructor arguments.
@@ -108,7 +108,7 @@ struct constructible_with_allocator_suffix
 //! to detect if a type should be constructed with suffix or prefix allocator arguments.
 template <class T>
 struct constructible_with_allocator_prefix
-{  static const bool value = false; };
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
@@ -142,7 +142,7 @@ struct uses_allocator_imp
    static Allocator alloc;  // Declared but not defined
 
    public:
-   static const bool value = sizeof(test<T>(alloc)) == sizeof(yes_type);
+   BOOST_STATIC_CONSTEXPR bool value = sizeof(test<T>(alloc)) == sizeof(yes_type);
 };
 
 }  //namespace dtl {
diff --git a/inst/include/boost/container/vector.hpp b/inst/include/boost/container/vector.hpp
index d5d2f1eac..aecb7dd2b 100644
--- a/inst/include/boost/container/vector.hpp
+++ b/inst/include/boost/container/vector.hpp
@@ -51,6 +51,7 @@
 #include <boost/move/iterator.hpp>
 #include <boost/move/traits.hpp>
 #include <boost/move/utility_core.hpp>
+#include <boost/move/detail/launder.hpp>
 // move/detail
 #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 #include <boost/move/detail/fwd_macros.hpp>
@@ -120,15 +121,15 @@ class vec_iterator
                              , nat>::type                                           nonconst_iterator;
 
    public:
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       const Pointer &get_ptr() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return   m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE
+   inline
       Pointer &get_ptr() BOOST_NOEXCEPT_OR_NOTHROW
    {  return   m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE explicit vec_iterator(Pointer ptr) BOOST_NOEXCEPT_OR_NOTHROW
+   inline explicit vec_iterator(Pointer ptr) BOOST_NOEXCEPT_OR_NOTHROW
       : m_ptr(ptr)
    {}
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -136,93 +137,93 @@ class vec_iterator
    public:
 
    //Constructors
-   BOOST_CONTAINER_FORCEINLINE vec_iterator() BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator() BOOST_NOEXCEPT_OR_NOTHROW
       : m_ptr()   //Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator(const vec_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator(const vec_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_ptr(other.get_ptr())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator(const nonconst_iterator &other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator(const nonconst_iterator &other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_ptr(other.get_ptr())
    {}
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator & operator=(const vec_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator & operator=(const vec_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
    {  m_ptr = other.get_ptr();   return *this;  }
 
    //Pointer like operators
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator*()   const BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr);  return *m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       pointer operator->()  const BOOST_NOEXCEPT_OR_NOTHROW
    {  return m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       reference operator[](difference_type off) const BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr);  return m_ptr[off];  }
 
    //Increment / Decrement
-   BOOST_CONTAINER_FORCEINLINE vec_iterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator& operator++() BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr); ++m_ptr;  return *this; }
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator operator++(int) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr); return vec_iterator(m_ptr++); }
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator& operator--() BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr); --m_ptr; return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator operator--(int) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr); return vec_iterator(m_ptr--); }
 
    //Arithmetic
-   BOOST_CONTAINER_FORCEINLINE vec_iterator& operator+=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator& operator+=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(m_ptr || !off); m_ptr += off; return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator& operator-=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
+   inline vec_iterator& operator-=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(m_ptr || !off); m_ptr -= off; return *this;   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend vec_iterator operator+(const vec_iterator &x, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(x.m_ptr || !off); return vec_iterator(x.m_ptr+off);  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend vec_iterator operator+(difference_type off, vec_iterator right) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(right.m_ptr || !off); right.m_ptr += off;  return right; }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend vec_iterator operator-(vec_iterator left, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(left.m_ptr || !off); left.m_ptr -= off;  return left; }
 
    //Difference
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend difference_type operator-(const vec_iterator &left, const vec_iterator& right) BOOST_NOEXCEPT_OR_NOTHROW
    {  return left.m_ptr - right.m_ptr;   }
 
    //Comparison operators
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator==   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr == r.m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator!=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr != r.m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<    (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr < r.m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator<=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr <= r.m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>    (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr > r.m_ptr;  }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       friend bool operator>=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr >= r.m_ptr;  }
 };
@@ -233,7 +234,7 @@ struct vector_insert_ordered_cursor
    typedef typename iterator_traits<BiDirPosConstIt>::value_type  size_type;
    typedef typename iterator_traits<BiDirValueIt>::reference      reference;
 
-   BOOST_CONTAINER_FORCEINLINE vector_insert_ordered_cursor(BiDirPosConstIt posit, BiDirValueIt valueit)
+   inline vector_insert_ordered_cursor(BiDirPosConstIt posit, BiDirValueIt valueit)
       : last_position_it(posit), last_value_it(valueit)
    {}
 
@@ -247,10 +248,10 @@ struct vector_insert_ordered_cursor
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE size_type get_pos() const
+   inline size_type get_pos() const
    {  return *last_position_it;  }
 
-   BOOST_CONTAINER_FORCEINLINE reference get_val()
+   inline reference get_val()
    {  return *last_value_it;  }
 
    BiDirPosConstIt last_position_it;
@@ -258,25 +259,25 @@ struct vector_insert_ordered_cursor
 };
 
 template<class Pointer, bool IsConst>
-BOOST_CONTAINER_FORCEINLINE const Pointer &vector_iterator_get_ptr(const vec_iterator<Pointer, IsConst> &it) BOOST_NOEXCEPT_OR_NOTHROW
+inline const Pointer &vector_iterator_get_ptr(const vec_iterator<Pointer, IsConst> &it) BOOST_NOEXCEPT_OR_NOTHROW
 {  return   it.get_ptr();  }
 
 template<class Pointer, bool IsConst>
-BOOST_CONTAINER_FORCEINLINE Pointer &get_ptr(vec_iterator<Pointer, IsConst> &it) BOOST_NOEXCEPT_OR_NOTHROW
+inline Pointer &get_ptr(vec_iterator<Pointer, IsConst> &it) BOOST_NOEXCEPT_OR_NOTHROW
 {  return  it.get_ptr();  }
 
 struct initial_capacity_t {};
 
 struct vector_uninitialized_size_t {};
-static const vector_uninitialized_size_t vector_uninitialized_size = vector_uninitialized_size_t();
+BOOST_CONTAINER_CONSTANT_VAR vector_uninitialized_size_t vector_uninitialized_size = vector_uninitialized_size_t();
 
 struct maybe_initial_capacity_t {};
 
 template <class T>
 struct vector_value_traits_base
 {
-   static const bool trivial_dctr = dtl::is_trivially_destructible<T>::value;
-   static const bool trivial_dctr_after_move = has_trivial_destructor_after_move<T>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr = dtl::is_trivially_destructible<T>::value;
+   BOOST_STATIC_CONSTEXPR bool trivial_dctr_after_move = has_trivial_destructor_after_move<T>::value;
 };
 
 template <class Allocator>
@@ -351,23 +352,23 @@ struct vector_alloc_holder
 
    public:
 
-   BOOST_CONTAINER_FORCEINLINE
-      static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc, bool const propagate_allocator)
+   template <bool PropagateAllocator>
+   inline static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc)
    {
-      (void)propagate_allocator; (void)p; (void)to_alloc; (void)from_alloc;
+      (void)p; (void)to_alloc; (void)from_alloc;
       const bool all_storage_propagable = !allocator_traits_type::is_partially_propagable::value ||
                                           !allocator_traits_type::storage_is_unpropagable(from_alloc, p);
       return all_storage_propagable &&
-         (propagate_allocator || allocator_traits_type::is_always_equal::value || allocator_traits_type::equal(from_alloc, to_alloc));
+         (PropagateAllocator || allocator_traits_type::is_always_equal::value || allocator_traits_type::equal(from_alloc, to_alloc));
    }
 
-   BOOST_CONTAINER_FORCEINLINE
-      static bool are_swap_propagable(const allocator_type &l_a, pointer l_p, const allocator_type &r_a, pointer r_p, bool const propagate_allocator)
+   template <bool PropagateAllocator>
+   inline static bool are_swap_propagable(const allocator_type &l_a, pointer l_p, const allocator_type &r_a, pointer r_p)
    {
-      (void)propagate_allocator; (void)l_p; (void)r_p; (void)l_a; (void)r_a;
+      (void)l_p; (void)r_p; (void)l_a; (void)r_a;
       const bool all_storage_propagable = !allocator_traits_type::is_partially_propagable::value || 
               !(allocator_traits_type::storage_is_unpropagable(l_a, l_p) || allocator_traits_type::storage_is_unpropagable(r_a, r_p));
-      return all_storage_propagable && (propagate_allocator || allocator_traits_type::equal(l_a, r_a));
+      return all_storage_propagable && (PropagateAllocator || allocator_traits_type::is_always_equal::value || allocator_traits_type::equal(l_a, r_a));
    }
 
    //Constructor, does not throw
@@ -446,33 +447,33 @@ struct vector_alloc_holder
       holder.m_size = holder.m_capacity = 0;
    }
 
-   BOOST_CONTAINER_FORCEINLINE ~vector_alloc_holder() BOOST_NOEXCEPT_OR_NOTHROW
+   inline ~vector_alloc_holder() BOOST_NOEXCEPT_OR_NOTHROW
    {
       if(this->m_capacity){
          this->deallocate(this->m_start, this->m_capacity);
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void set_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void set_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_size = static_cast<stored_size_type>(s);   }
 
-   BOOST_CONTAINER_FORCEINLINE void dec_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void dec_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_size = static_cast<stored_size_type>(this->m_size - s);   }
 
-   BOOST_CONTAINER_FORCEINLINE void inc_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void inc_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_size = static_cast<stored_size_type>(this->m_size + s);   }
 
-   BOOST_CONTAINER_FORCEINLINE void set_stored_capacity(size_type c) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void set_stored_capacity(size_type c) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_capacity = static_cast<stored_size_type>(c);  }
 
-   BOOST_CONTAINER_FORCEINLINE pointer allocation_command(boost::container::allocation_type command,
+   inline pointer allocation_command(boost::container::allocation_type command,
                                  size_type limit_size, size_type &prefer_in_recvd_out_size, pointer &reuse)
    {
       typedef typename dtl::version<allocator_type>::type alloc_version;
       return this->priv_allocation_command(alloc_version(), command, limit_size, prefer_in_recvd_out_size, reuse);
    }
 
-   BOOST_CONTAINER_FORCEINLINE pointer allocate(size_type n)
+   inline pointer allocate(size_type n)
    {
       const size_type max_alloc = allocator_traits_type::max_size(this->alloc());
       const size_type max = max_alloc <= stored_size_type(-1) ? max_alloc : stored_size_type(-1);
@@ -482,7 +483,7 @@ struct vector_alloc_holder
       return allocator_traits_type::allocate(this->alloc(), n);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void deallocate(const pointer &p, size_type n)
+   inline void deallocate(const pointer &p, size_type n)
    {
       allocator_traits_type::deallocate(this->alloc(), p, n);
    }
@@ -539,22 +540,22 @@ struct vector_alloc_holder
       x.m_size = x.m_capacity = 0;
    }
 
-   BOOST_CONTAINER_FORCEINLINE allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
+   inline allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE const pointer   &start() const     BOOST_NOEXCEPT_OR_NOTHROW
+   inline pointer   start() const     BOOST_NOEXCEPT_OR_NOTHROW
       {  return m_start;  }
-   BOOST_CONTAINER_FORCEINLINE       size_type capacity() const     BOOST_NOEXCEPT_OR_NOTHROW
+   inline       size_type capacity() const     BOOST_NOEXCEPT_OR_NOTHROW
       {  return m_capacity;  }
-   BOOST_CONTAINER_FORCEINLINE void start(const pointer &p)       BOOST_NOEXCEPT_OR_NOTHROW
+   inline void start(const pointer &p)       BOOST_NOEXCEPT_OR_NOTHROW
       {  m_start = p;  }
-   BOOST_CONTAINER_FORCEINLINE void capacity(const size_type &c)  BOOST_NOEXCEPT_OR_NOTHROW
+   inline void capacity(const size_type &c)  BOOST_NOEXCEPT_OR_NOTHROW
       {  BOOST_ASSERT( c <= stored_size_type(-1)); this->set_stored_capacity(c);  }
 
-   static BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow()
+   static inline void on_capacity_overflow()
    { }
 
    private:
@@ -642,7 +643,7 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
    template<class AllocConvertible>
    vector_alloc_holder(vector_uninitialized_size_t, BOOST_FWD_REF(AllocConvertible) a, size_type initial_size)
       : allocator_type(boost::forward<AllocConvertible>(a))
-      , m_size(initial_size)  //Size is initialized here...
+      , m_size(static_cast<stored_size_type>(initial_size))  //Size is initialized here...
    {
       //... and capacity here, so vector, must call uninitialized_xxx in the derived constructor
       this->priv_first_allocation(initial_size);
@@ -651,7 +652,7 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
    //Constructor, does not throw
    vector_alloc_holder(vector_uninitialized_size_t, size_type initial_size)
       : allocator_type()
-      , m_size(initial_size)  //Size is initialized here...
+      , m_size(static_cast<stored_size_type>(initial_size))  //Size is initialized here...
    {
       //... and capacity here, so vector, must call uninitialized_xxx in the derived constructor
       this->priv_first_allocation(initial_size);
@@ -680,26 +681,26 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
          (this->alloc(), boost::movelib::to_raw_pointer(holder.start()), n, boost::movelib::to_raw_pointer(this->start()));
    }
 
-   static BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow()
+   static inline void on_capacity_overflow()
    {  allocator_type::on_capacity_overflow();  }
 
-   BOOST_CONTAINER_FORCEINLINE void set_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void set_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_size = static_cast<stored_size_type>(s);   }
 
-   BOOST_CONTAINER_FORCEINLINE void dec_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void dec_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_size = static_cast<stored_size_type>(this->m_size - s);   }
 
-   BOOST_CONTAINER_FORCEINLINE void inc_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void inc_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
       {  this->m_size = static_cast<stored_size_type>(this->m_size + s);   }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_first_allocation(size_type cap)
+   inline void priv_first_allocation(size_type cap)
    {
       if(cap > allocator_type::internal_capacity){
          on_capacity_overflow();
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE void deep_swap(vector_alloc_holder &x)
+   inline void deep_swap(vector_alloc_holder &x)
       {  this->priv_deep_swap(x);   }
 
    template<class OtherAllocator, class OtherStoredSizeType, class OtherAllocatorVersion>
@@ -712,29 +713,29 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
       this->priv_deep_swap(x);
    }
 
-   BOOST_CONTAINER_FORCEINLINE void swap_resources(vector_alloc_holder &) BOOST_NOEXCEPT_OR_NOTHROW
+   inline void swap_resources(vector_alloc_holder &) BOOST_NOEXCEPT_OR_NOTHROW
    {  //Containers with version 0 allocators can't be moved without moving elements one by one
       on_capacity_overflow();
    }
 
-   BOOST_CONTAINER_FORCEINLINE void steal_resources(vector_alloc_holder &)
+   inline void steal_resources(vector_alloc_holder &)
    {  //Containers with version 0 allocators can't be moved without moving elements one by one
       on_capacity_overflow();
    }
 
-   BOOST_CONTAINER_FORCEINLINE allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
+   inline allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE bool try_expand_fwd(size_type at_least)
+   inline bool try_expand_fwd(size_type at_least)
    {  return !at_least;  }
 
-   BOOST_CONTAINER_FORCEINLINE pointer start() const       BOOST_NOEXCEPT_OR_NOTHROW
+   inline pointer start() const       BOOST_NOEXCEPT_OR_NOTHROW
    {  return allocator_type::internal_storage();  }
    
-   BOOST_CONTAINER_FORCEINLINE size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return allocator_type::internal_capacity;  }
    
    stored_size_type m_size;
@@ -812,8 +813,11 @@ class vector
    typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<const_iterator>)  const_reverse_iterator;
 
 private:
-
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits_t::value_type>::value));
+
    typedef typename boost::container::
       allocator_traits<allocator_type>::size_type                             alloc_size_type;
    typedef typename get_vector_opt<Options, alloc_size_type>::type            options_type;
@@ -822,7 +826,7 @@ class vector
    typedef value_less<T>                                                      value_less_t;
 
    //If provided the stored_size option must specify a type that is equal or a type that is smaller.
-   BOOST_STATIC_ASSERT( (sizeof(stored_size_type) < sizeof(alloc_size_type) ||
+   BOOST_CONTAINER_STATIC_ASSERT( (sizeof(stored_size_type) < sizeof(alloc_size_type) ||
                         dtl::is_same<stored_size_type, alloc_size_type>::value) );
 
    typedef typename dtl::version<allocator_type>::type alloc_version;
@@ -837,14 +841,14 @@ class vector
 
 
    protected:
-   BOOST_CONTAINER_FORCEINLINE
-      static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc, bool const propagate_allocator)
-   {  return alloc_holder_t::is_propagable_from(from_alloc, p, to_alloc, propagate_allocator);  }
+   template <bool PropagateAllocator>
+   inline static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc)
+   {  return alloc_holder_t::template is_propagable_from<PropagateAllocator>(from_alloc, p, to_alloc);  }
 
-   BOOST_CONTAINER_FORCEINLINE
-      static bool are_swap_propagable( const allocator_type &l_a, pointer l_p
-                                     , const allocator_type &r_a, pointer r_p, bool const propagate_allocator)
-   {  return alloc_holder_t::are_swap_propagable(l_a, l_p, r_a, r_p, propagate_allocator);  }
+   template <bool PropagateAllocator>
+   inline static bool are_swap_propagable( const allocator_type &l_a, pointer l_p
+                                         , const allocator_type &r_a, pointer r_p)
+   {  return alloc_holder_t::template are_swap_propagable<PropagateAllocator>(l_a, l_p, r_a, r_p);  }
 
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -855,23 +859,42 @@ class vector
 
    protected:
 
-   BOOST_CONTAINER_FORCEINLINE void steal_resources(vector &x)
+   inline void steal_resources(vector &x)
    {  return this->m_holder.steal_resources(x.m_holder);   }
 
-   BOOST_CONTAINER_FORCEINLINE void protected_set_size(size_type n)
+   inline void protected_set_size(size_type n)
    {  this->m_holder.m_size = static_cast<stored_size_type>(n);   }
 
    template<class AllocFwd>
-   BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type cap, BOOST_FWD_REF(AllocFwd) a)
+   inline vector(initial_capacity_t, pointer initial_memory, size_type cap, BOOST_FWD_REF(AllocFwd) a)
       : m_holder(initial_capacity_t(), initial_memory, cap, ::boost::forward<AllocFwd>(a))
    {}
 
-   BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type cap)
+   template<class AllocFwd>
+   inline vector(initial_capacity_t, pointer initial_memory, size_type cap, BOOST_FWD_REF(AllocFwd) a, vector &x)
+      : m_holder(initial_capacity_t(), initial_memory, cap, ::boost::forward<AllocFwd>(a))
+   {
+      allocator_type &this_al = this->get_stored_allocator();
+      if (this->template is_propagable_from<true>(x.get_stored_allocator(), x.data(), this_al)) {
+         this->steal_resources(x);
+      }
+      else {
+         const size_type sz = x.size();
+         ::boost::container::uninitialized_move_alloc_n_source
+            ( this_al, x.priv_raw_begin(), sz
+            //Use launder to stop false positives from -Warray-bounds
+            , boost::move_detail::launder(this->priv_raw_begin()));
+         this->protected_set_size(sz);
+         x.clear();
+      }
+   }
+
+   inline vector(initial_capacity_t, pointer initial_memory, size_type cap)
       : m_holder(initial_capacity_t(), initial_memory, cap)
    {}
 
    template<class SizeType, class AllocFwd>
-   BOOST_CONTAINER_FORCEINLINE vector(maybe_initial_capacity_t, pointer p, SizeType initial_capacity, BOOST_FWD_REF(AllocFwd) a)
+   inline vector(maybe_initial_capacity_t, pointer p, SizeType initial_capacity, BOOST_FWD_REF(AllocFwd) a)
       : m_holder(maybe_initial_capacity_t(), p, initial_capacity, ::boost::forward<AllocFwd>(a))
    {
       #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
@@ -880,7 +903,7 @@ class vector
    }
 
    template<class SizeType>
-   BOOST_CONTAINER_FORCEINLINE vector(maybe_initial_capacity_t, pointer p, SizeType initial_capacity)
+   inline vector(maybe_initial_capacity_t, pointer p, SizeType initial_capacity)
       : m_holder(maybe_initial_capacity_t(), p, initial_capacity)
    {
       #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
@@ -1094,7 +1117,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    vector(BOOST_RV_REF(vector) x) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_holder(boost::move(x.m_holder))
-   {  BOOST_STATIC_ASSERT((!allocator_traits_type::is_partially_propagable::value));  }
+   {  BOOST_CONTAINER_STATIC_ASSERT((!allocator_traits_type::is_partially_propagable::value));  }
 
    #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
    //! <b>Effects</b>: Constructs a vector that will use a copy of allocator a
@@ -1163,11 +1186,11 @@ class vector
    vector(BOOST_RV_REF(vector) x, const allocator_type &a)
       :  m_holder( vector_uninitialized_size, a
                  //In this allocator move constructor the allocator won't be propagated --v
-                 , is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, false) ? 0 : x.size()
+                 , is_propagable_from<false>(x.get_stored_allocator(), x.m_holder.start(), a) ? 0 : x.size()
                  )
    {
       //In this allocator move constructor the allocator won't be propagated ---v
-      if(is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, false)){
+      if(is_propagable_from<false>(x.get_stored_allocator(), x.m_holder.start(), a)){
          this->m_holder.steal_resources(x.m_holder);
       }
       else{
@@ -1202,7 +1225,7 @@ class vector
    //! <b>Throws</b>: If memory allocation throws or T's copy/move constructor/assignment throws.
    //!
    //! <b>Complexity</b>: Linear to the number of elements in x.
-   BOOST_CONTAINER_FORCEINLINE vector& operator=(BOOST_COPY_ASSIGN_REF(vector) x)
+   inline vector& operator=(BOOST_COPY_ASSIGN_REF(vector) x)
    {
       if (BOOST_LIKELY(&x != this)){
          this->priv_copy_assign(x);
@@ -1214,7 +1237,7 @@ class vector
    //! <b>Effects</b>: Make *this container contains elements from il.
    //!
    //! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
-   BOOST_CONTAINER_FORCEINLINE vector& operator=(std::initializer_list<value_type> il)
+   inline vector& operator=(std::initializer_list<value_type> il)
    {
       this->assign(il.begin(), il.end());
       return *this;
@@ -1232,7 +1255,7 @@ class vector
    //! <b>Complexity</b>: Constant if allocator_traits_type::
    //!   propagate_on_container_move_assignment is true or
    //!   this->get>allocator() == x.get_allocator(). Linear otherwise.
-   BOOST_CONTAINER_FORCEINLINE vector& operator=(BOOST_RV_REF(vector) x)
+   inline vector& operator=(BOOST_RV_REF(vector) x)
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_move_assignment::value
                         || allocator_traits_type::is_always_equal::value)
    {
@@ -1255,7 +1278,7 @@ class vector
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
    template<class OtherA>
-   BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
+   inline typename dtl::enable_if_and
                            < vector&
                            , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
                            , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
@@ -1277,7 +1300,7 @@ class vector
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
    template<class OtherA>
-   BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
+   inline typename dtl::enable_if_and
                            < vector&
                            , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
                            , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
@@ -1334,7 +1357,7 @@ class vector
    //! <b>Throws</b>: If memory allocation throws or
    //!   T's constructor from dereferencing iniializer_list iterator throws.
    //!
-   BOOST_CONTAINER_FORCEINLINE void assign(std::initializer_list<T> il)
+   inline void assign(std::initializer_list<T> il)
    {
       this->assign(il.begin(), il.end());
    }
@@ -1405,7 +1428,7 @@ class vector
    //!   T's copy/move constructor/assignment throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE void assign(size_type n, const value_type& val)
+   inline void assign(size_type n, const value_type& val)
    {  this->assign(cvalue_iterator(val, n), cvalue_iterator());   }
 
    //! <b>Effects</b>: Returns a copy of the internal allocator.
@@ -1413,7 +1436,7 @@ class vector
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->m_holder.alloc();  }
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
@@ -1423,7 +1446,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE 
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline 
       stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->m_holder.alloc(); }
 
@@ -1434,7 +1457,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->m_holder.alloc(); }
 
@@ -1449,7 +1472,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    { return iterator(this->m_holder.start()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the vector.
@@ -1457,7 +1480,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_iterator(this->m_holder.start()); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the vector.
@@ -1465,7 +1488,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE iterator end() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    {
       iterator it (this->m_holder.start());
       it += difference_type(this->m_holder.m_size);
@@ -1477,7 +1500,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->cend(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
@@ -1486,7 +1509,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->end());      }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
@@ -1495,7 +1518,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crbegin(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
@@ -1504,7 +1527,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->begin());       }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -1513,7 +1536,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crend(); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the vector.
@@ -1521,7 +1544,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_iterator(this->m_holder.start()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the vector.
@@ -1529,7 +1552,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       const_iterator it (this->m_holder.start());
       it += difference_type(this->m_holder.m_size);
@@ -1542,7 +1565,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->end());}
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -1551,7 +1574,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->begin()); }
 
    //////////////////////////////////////////////
@@ -1565,7 +1588,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    { return !this->m_holder.m_size; }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the vector.
@@ -1573,7 +1596,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->m_holder.m_size; }
 
    //! <b>Effects</b>: Returns the largest possible size of the vector.
@@ -1581,7 +1604,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    { return allocator_traits_type::max_size(this->m_holder.alloc()); }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -1590,7 +1613,7 @@ class vector
    //! <b>Throws</b>: If memory allocation throws, or T's copy/move or value initialization throws.
    //!
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
-   BOOST_CONTAINER_FORCEINLINE void resize(size_type new_size)
+   inline void resize(size_type new_size)
    {  this->priv_resize(new_size, value_init, alloc_version());  }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -1601,7 +1624,7 @@ class vector
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_FORCEINLINE void resize(size_type new_size, default_init_t)
+   inline void resize(size_type new_size, default_init_t)
    {  this->priv_resize(new_size, default_init, alloc_version());  }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -1610,7 +1633,7 @@ class vector
    //! <b>Throws</b>: If memory allocation throws, or T's copy/move constructor throws.
    //!
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
-   BOOST_CONTAINER_FORCEINLINE void resize(size_type new_size, const T& x)
+   inline void resize(size_type new_size, const T& x)
    {  this->priv_resize(new_size, x, alloc_version());  }
 
    //! <b>Effects</b>: Number of elements for which memory has been allocated.
@@ -1619,7 +1642,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->m_holder.capacity(); }
 
    //! <b>Effects</b>: If n is less than or equal to capacity(), this call has no
@@ -1628,7 +1651,7 @@ class vector
    //!   n; otherwise, capacity() is unchanged. In either case, size() is unchanged.
    //!
    //! <b>Throws</b>: If memory allocation allocation throws or T's copy/move constructor throws.
-   BOOST_CONTAINER_FORCEINLINE void reserve(size_type new_cap)
+   inline void reserve(size_type new_cap)
    {
       if (this->capacity() < new_cap){
          this->priv_move_to_new_buffer(new_cap, alloc_version());
@@ -1641,7 +1664,7 @@ class vector
    //! <b>Throws</b>: If memory allocation throws, or T's copy/move constructor throws.
    //!
    //! <b>Complexity</b>: Linear to size().
-   BOOST_CONTAINER_FORCEINLINE void shrink_to_fit()
+   inline void shrink_to_fit()
    {  this->priv_shrink_to_fit(alloc_version());   }
 
    //////////////////////////////////////////////
@@ -1658,7 +1681,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference front() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline reference front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *this->m_holder.start();
@@ -1672,7 +1695,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reference front() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reference front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *this->m_holder.start();
@@ -1686,7 +1709,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference back() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline reference back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return this->m_holder.start()[difference_type(this->m_holder.m_size - 1u)];
@@ -1700,7 +1723,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reference back()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reference back()  const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return this->m_holder.start()[this->m_holder.m_size - 1];
@@ -1714,7 +1737,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size > n);
       return this->m_holder.start()[difference_type(n)];
@@ -1728,7 +1751,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size > n);
@@ -1746,7 +1769,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size >= n);
@@ -1764,7 +1787,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size >= n);
@@ -1781,7 +1804,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       //Range check assert done in priv_index_of
@@ -1798,7 +1821,7 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
       size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       //Range check assert done in priv_index_of
@@ -1813,7 +1836,7 @@ class vector
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference at(size_type n)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline reference at(size_type n)
    {
       this->priv_throw_if_out_of_range(n);
       return this->m_holder.start()[difference_type(n)];
@@ -1827,7 +1850,7 @@ class vector
    //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reference at(size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const_reference at(size_type n) const
    {
       this->priv_throw_if_out_of_range(n);
       return this->m_holder.start()[n];
@@ -1845,7 +1868,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE T* data() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline T* data() BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_raw_begin(); }
 
    //! <b>Returns</b>: A pointer such that [data(),data() + size()) is a valid range.
@@ -1854,7 +1877,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const T * data()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline const T * data()  const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_raw_begin(); }
 
    //////////////////////////////////////////////
@@ -1874,7 +1897,7 @@ class vector
    //!
    //! <b>Complexity</b>: Amortized constant time.
    template<class ...Args>
-   BOOST_CONTAINER_FORCEINLINE reference emplace_back(BOOST_FWD_REF(Args)...args)
+   inline reference emplace_back(BOOST_FWD_REF(Args)...args)
    {
       T* const p = this->priv_raw_end();
       if (BOOST_LIKELY(this->room_enough())){
@@ -1899,7 +1922,7 @@ class vector
    //!
    //! <b>Note</b>: Non-standard extension.
    template<class ...Args>
-   BOOST_CONTAINER_FORCEINLINE bool stable_emplace_back(BOOST_FWD_REF(Args)...args)
+   inline bool stable_emplace_back(BOOST_FWD_REF(Args)...args)
    {
       const bool is_room_enough = this->room_enough() || (alloc_version::value == 2 && this->m_holder.try_expand_fwd(1u));
       if (BOOST_LIKELY(is_room_enough)){
@@ -1921,7 +1944,7 @@ class vector
    //! <b>Complexity</b>: If position is end(), amortized constant time
    //!   Linear time otherwise.
    template<class ...Args>
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(const_iterator position, BOOST_FWD_REF(Args) ...args)
+   inline iterator emplace(const_iterator position, BOOST_FWD_REF(Args) ...args)
    {
       BOOST_ASSERT(this->priv_in_range_or_end(position));
       //Just call more general insert(pos, size, value) and return iterator
@@ -1934,7 +1957,7 @@ class vector
 
    #define BOOST_CONTAINER_VECTOR_EMPLACE_CODE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE reference emplace_back(BOOST_MOVE_UREF##N)\
+   inline reference emplace_back(BOOST_MOVE_UREF##N)\
    {\
       T* const p = this->priv_raw_end();\
       if (BOOST_LIKELY(this->room_enough())){\
@@ -1951,7 +1974,7 @@ class vector
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE bool stable_emplace_back(BOOST_MOVE_UREF##N)\
+   inline bool stable_emplace_back(BOOST_MOVE_UREF##N)\
    {\
       const bool is_room_enough = this->room_enough() || (alloc_version::value == 2 && this->m_holder.try_expand_fwd(1u));\
       if (BOOST_LIKELY(is_room_enough)){\
@@ -1963,7 +1986,7 @@ class vector
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   BOOST_CONTAINER_FORCEINLINE iterator emplace(const_iterator pos BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   inline iterator emplace(const_iterator pos BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       BOOST_ASSERT(this->priv_in_range_or_end(pos));\
       typedef dtl::insert_emplace_proxy_arg##N<allocator_type BOOST_MOVE_I##N BOOST_MOVE_TARG##N> proxy_t;\
@@ -2029,7 +2052,7 @@ class vector
    //! <b>Throws</b>: If memory allocation throws or T's copy/move constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, size_type n, const T& x)
+   inline iterator insert(const_iterator p, size_type n, const T& x)
    {
       BOOST_ASSERT(this->priv_in_range_or_end(p));
       dtl::insert_n_copies_proxy<allocator_type> proxy(x);
@@ -2069,7 +2092,7 @@ class vector
 
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <class FwdIt>
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator pos, FwdIt first, FwdIt last
+   inline iterator insert(const_iterator pos, FwdIt first, FwdIt last
       , typename dtl::disable_if_or
          < void
          , dtl::is_convertible<FwdIt, size_type>
@@ -2106,7 +2129,7 @@ class vector
    //!   a non-standard extension.
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <class InIt>
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator pos, size_type num, InIt first, InIt last)
+   inline iterator insert(const_iterator pos, size_type num, InIt first, InIt last)
    {
       BOOST_ASSERT(this->priv_in_range_or_end(pos));
       BOOST_ASSERT(dtl::is_input_iterator<InIt>::value ||
@@ -2125,7 +2148,7 @@ class vector
    //! <b>Returns</b>: an iterator to the first inserted element or position if first == last.
    //!
    //! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
-   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator position, std::initializer_list<value_type> il)
+   inline iterator insert(const_iterator position, std::initializer_list<value_type> il)
    {
       //Assertion done in insert()
       return this->insert(position, il.begin(), il.end());
@@ -2137,7 +2160,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant time.
-   BOOST_CONTAINER_FORCEINLINE void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
+   inline void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       //Destroy last element
@@ -2199,7 +2222,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE void swap(vector& x)
+   inline void swap(vector& x)
       BOOST_NOEXCEPT_IF( ((allocator_traits_type::propagate_on_container_swap::value
                                     || allocator_traits_type::is_always_equal::value) &&
                                     !dtl::is_version<allocator_type, 0>::value))
@@ -2217,7 +2240,7 @@ class vector
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
    template<class OtherA>
-   BOOST_CONTAINER_FORCEINLINE void swap(vector<T, OtherA, Options> & x
+   inline void swap(vector<T, OtherA, Options> & x
             , typename dtl::enable_if_and
                      < void
                      , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
@@ -2228,24 +2251,24 @@ class vector
 
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
-   //! <b>Effects</b>: Erases all the elements of the vector.
+   //! <b>Effects</b>: Erases all the elements of the vector. Leaves the capacity() of the vector unchanged.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_FORCEINLINE void clear() BOOST_NOEXCEPT_OR_NOTHROW
+   inline void clear() BOOST_NOEXCEPT_OR_NOTHROW
    {  this->priv_destroy_all();  }
 
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator==(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline friend bool operator==(const vector& x, const vector& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator!=(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline friend bool operator!=(const vector& x, const vector& y)
    {  return !(x == y); }
 
    //! <b>Effects</b>: Returns true if x is less than y
@@ -2257,25 +2280,25 @@ class vector
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator>(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline friend bool operator>(const vector& x, const vector& y)
    {  return y < x;  }
 
    //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator<=(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline friend bool operator<=(const vector& x, const vector& y)
    {  return !(y < x);  }
 
    //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator>=(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline friend bool operator>=(const vector& x, const vector& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE friend void swap(vector& x, vector& y)
+   inline friend void swap(vector& x, vector& y)
        BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 
@@ -2295,45 +2318,62 @@ class vector
       return cp >= new_cap || (alloc_version::value == 2 && this->m_holder.try_expand_fwd(size_type(new_cap - cp)));
    }
 
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    //Absolutely experimental. This function might change, disappear or simply crash!
    template<class BiDirPosConstIt, class BiDirValueIt>
-   BOOST_CONTAINER_FORCEINLINE void insert_ordered_at(const size_type element_count, BiDirPosConstIt last_position_it, BiDirValueIt last_value_it)
+   inline void insert_ordered_at(const size_type element_count, BiDirPosConstIt last_position_it, BiDirValueIt last_value_it)
    {
       typedef vector_insert_ordered_cursor<BiDirPosConstIt, BiDirValueIt> inserter_t;
       return this->priv_insert_ordered_at(element_count, inserter_t(last_position_it, last_value_it));
    }
 
    template<class InputIt>
-   BOOST_CONTAINER_FORCEINLINE void merge(InputIt first, InputIt last)
+   inline void merge(InputIt first, InputIt last)
    {  this->merge(first, last, value_less_t());  }
 
    template<class InputIt, class Compare>
-   BOOST_CONTAINER_FORCEINLINE void merge(InputIt first, InputIt last, Compare comp)
+   inline 
+      typename dtl::enable_if_c
+         < !dtl::is_input_iterator<InputIt>::value &&
+           dtl::is_same<value_type, typename iterator_traits<InputIt>::value_type>::value
+         , void>::type
+      merge(InputIt first, InputIt last, Compare comp)
    {
       size_type const s = this->size();
       size_type const c = this->capacity();
       size_type n = 0;
       size_type const free_cap = c - s;
       //If not input iterator and new elements don't fit in the remaining capacity, merge in new buffer
-      if(!dtl::is_input_iterator<InputIt>::value &&
-         free_cap < (n = boost::container::iterator_udistance(first, last))){
+      if(free_cap < (n = boost::container::iterator_udistance(first, last))){
          this->priv_merge_in_new_buffer(first, n, comp, alloc_version());
       }
       else{
-         this->insert(this->cend(), first, last);
-         T *const raw_beg = this->priv_raw_begin();
-         T *const raw_end = this->priv_raw_end();
-         T *const raw_pos = raw_beg + s;
-         boost::movelib::adaptive_merge(raw_beg, raw_pos, raw_end, comp, raw_end, free_cap - n);
+         this->priv_merge_generic(first, last, comp);
       }
    }
 
+   template<class InputIt, class Compare>
+   inline 
+      typename dtl::enable_if_c
+         < dtl::is_input_iterator<InputIt>::value ||
+           !dtl::is_same<value_type, typename iterator_traits<InputIt>::value_type>::value
+         , void>::type
+      merge(InputIt first, InputIt last, Compare comp)
+   {
+      this->priv_merge_generic(first, last, comp);
+   }
+
    template<class InputIt>
-   BOOST_CONTAINER_FORCEINLINE void merge_unique(InputIt first, InputIt last)
+   inline void merge_unique(InputIt first, InputIt last)
    {  this->merge_unique(first, last, value_less_t());  }
 
    template<class InputIt, class Compare>
-   BOOST_CONTAINER_FORCEINLINE void merge_unique(InputIt first, InputIt last, Compare comp)
+   inline 
+      typename dtl::enable_if_c
+         < !dtl::is_input_iterator<InputIt>::value &&
+           dtl::is_same<value_type, typename iterator_traits<InputIt>::value_type>::value
+         , void>::type
+      merge_unique(InputIt first, InputIt last, Compare comp)
    {
       size_type const old_size = this->size();
       this->priv_set_difference_back(first, last, comp);
@@ -2343,7 +2383,42 @@ class vector
       boost::movelib::adaptive_merge(raw_beg, raw_pos, raw_end, comp, raw_end, this->capacity() - this->size());
    }
 
+   template<class InputIt, class Compare>
+   inline 
+      typename dtl::enable_if_c
+         < dtl::is_input_iterator<InputIt>::value ||
+           !dtl::is_same<value_type, typename iterator_traits<InputIt>::value_type>::value
+         , void>::type
+      merge_unique(InputIt first, InputIt last, Compare comp)
+   {
+      iterator pos = this->insert(this->end(), first, last);
+      const iterator e = boost::movelib::inplace_set_unique_difference(pos, this->end(), this->begin(), pos, comp);
+      this->erase(e, this->end());
+      boost::movelib::adaptive_merge( this->begin(), pos, e, comp
+                                    , this->priv_raw_end(), this->capacity() - this->size());
+   }
+
+   //Function for optimizations, not for users
+   T *unused_storage(size_type &sz)
+   {
+      sz = static_cast<size_type>(this->capacity() - this->size());
+      return this->priv_raw_end();
+   }
+  
+   #endif
+
    private:
+   template<class InputIt, class Compare>
+   inline void priv_merge_generic(InputIt first, InputIt last, Compare comp)
+   {
+      size_type const old_s = this->size();
+      this->insert(this->cend(), first, last);
+      T* const raw_beg = this->priv_raw_begin();
+      T* const raw_end = this->priv_raw_end();
+      T* const raw_pos = raw_beg + old_s;
+      boost::movelib::adaptive_merge(raw_beg, raw_pos, raw_end, comp, raw_end, this->capacity() - this->size());
+   }
+
    template<class PositionValue>
    void priv_insert_ordered_at(const size_type element_count, PositionValue position_value)
    {
@@ -2436,7 +2511,7 @@ class vector
    }
 
    template<class FwdIt, class Compare>
-   BOOST_CONTAINER_FORCEINLINE void priv_merge_in_new_buffer(FwdIt, size_type, Compare, version_0)
+   inline void priv_merge_in_new_buffer(FwdIt, size_type, Compare, version_0)
    {
       alloc_holder_t::on_capacity_overflow();
    }
@@ -2498,13 +2573,13 @@ class vector
       new_values_destroyer.release();
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool room_enough() const
+   inline bool room_enough() const
    {  return this->m_holder.m_size != this->m_holder.capacity();   }
 
-   BOOST_CONTAINER_FORCEINLINE pointer back_ptr() const
+   inline pointer back_ptr() const
    {  return this->m_holder.start() + difference_type(this->m_holder.m_size);  }
 
-   BOOST_CONTAINER_FORCEINLINE size_type priv_index_of(pointer p) const
+   inline size_type priv_index_of(pointer p) const
    {
       BOOST_ASSERT(this->m_holder.start() <= p);
       BOOST_ASSERT(p <= (this->m_holder.start()+difference_type(this->size())));
@@ -2531,6 +2606,38 @@ class vector
       x.clear();
    }
 
+   template<class OtherA>
+   void priv_move_assign_steal_or_assign(BOOST_RV_REF_BEG vector<T, OtherA, Options> BOOST_RV_REF_END x, dtl::true_type /*data_can_be_always_stolen*/)
+   {
+      this->clear();
+      if (BOOST_LIKELY(!!this->m_holder.m_start))
+         this->m_holder.deallocate(this->m_holder.m_start, this->m_holder.m_capacity);
+      this->m_holder.steal_resources(x.m_holder);
+   }
+
+   template<class OtherA>
+   void priv_move_assign_steal_or_assign(BOOST_RV_REF_BEG vector<T, OtherA, Options> BOOST_RV_REF_END x, dtl::false_type /*data_can_be_always_stolen*/)
+   {
+      const bool propagate_alloc = allocator_traits_type::propagate_on_container_move_assignment::value;
+      allocator_type& this_alloc = this->m_holder.alloc();
+      allocator_type& x_alloc = x.m_holder.alloc();
+
+      //In this allocator move constructor the allocator might will be propagated, but to support small_vector-like
+      //types, we need to check the currently owned buffers to know if they are propagable.
+      const bool is_buffer_propagable_from_x = is_propagable_from<propagate_alloc>(x_alloc, x.m_holder.start(), this_alloc);
+
+      if (is_buffer_propagable_from_x) {
+         this->priv_move_assign_steal_or_assign(boost::move(x), dtl::true_type());
+      }
+      //Else do a one by one move. Also, clear the source as users find confusing
+      //elements are still alive in the source container.
+      else {
+         this->assign( boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.begin()))
+                     , boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.end()))   );
+         x.clear();
+      }
+   }
+
    template<class OtherA>
    void priv_move_assign(BOOST_RV_REF_BEG vector<T, OtherA, Options> BOOST_RV_REF_END x
       , typename dtl::disable_if_or
@@ -2542,30 +2649,16 @@ class vector
       //for move assignment, no aliasing (&x != this) is assumed.
       //x.size() == 0 is allowed for buggy std libraries.
       BOOST_ASSERT(this != &x || x.size() == 0);
-      allocator_type &this_alloc = this->m_holder.alloc();
-      allocator_type &x_alloc    = x.m_holder.alloc();
+      const bool alloc_is_always_equal = allocator_traits_type::is_always_equal::value;
       const bool propagate_alloc = allocator_traits_type::propagate_on_container_move_assignment::value;
+      const bool partially_propagable_alloc = allocator_traits_type::is_partially_propagable::value;
+      const bool data_can_be_always_be_stolen = alloc_is_always_equal || (propagate_alloc && !partially_propagable_alloc);
 
-      //In this allocator move constructor the allocator maybe will be propagated -----------------------v
-      const bool is_propagable_from_x = is_propagable_from(x_alloc, x.m_holder.start(), this_alloc, propagate_alloc);
+      this->priv_move_assign_steal_or_assign(boost::move(x), dtl::bool_<data_can_be_always_be_stolen>());
 
-      //Resources can be transferred if both allocators are
-      //going to be equal after this function (either propagated or already equal)
-      if(is_propagable_from_x){
-         this->clear();
-         if(BOOST_LIKELY(!!this->m_holder.m_start))
-            this->m_holder.deallocate(this->m_holder.m_start, this->m_holder.m_capacity);
-         this->m_holder.steal_resources(x.m_holder);
-      }
-      //Else do a one by one move. Also, clear the source as users find confusing
-      //elements are still alive in the source container.
-      else{
-         this->assign( boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.begin()))
-                     , boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.end()  ))
-                     );
-         x.clear();
-      }
       //Move allocator if needed
+      allocator_type& this_alloc = this->m_holder.alloc();
+      allocator_type& x_alloc    = x.m_holder.alloc();
       dtl::move_alloc(this_alloc, x_alloc, dtl::bool_<propagate_alloc>());
    }
 
@@ -2607,62 +2700,131 @@ class vector
    }
 
    template<class Vector>  //Template it to avoid it in explicit instantiations
-   BOOST_CONTAINER_FORCEINLINE void priv_swap(Vector &x, dtl::true_type)   //version_0
+   inline void priv_swap(Vector &x, dtl::true_type)   //version_0
    {  this->m_holder.deep_swap(x.m_holder);  }
 
    template<class Vector>  //Template it to avoid it in explicit instantiations
    void priv_swap(Vector &x, dtl::false_type)  //version_N
    {
-      const bool propagate_alloc = allocator_traits_type::propagate_on_container_swap::value;
+      BOOST_ASSERT(allocator_traits_type::propagate_on_container_swap::value ||
+                   allocator_traits_type::is_always_equal::value ||
+                   this->get_stored_allocator() == x.get_stored_allocator());
+
+      if (BOOST_UNLIKELY(&x == this)) {
+         return;
+      }
+
+      //Just swap internals
+      this->m_holder.swap_resources(x.m_holder);
+      //And now swap the allocator
+      dtl::bool_<allocator_traits_type::propagate_on_container_swap::value> flag;
+      dtl::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), flag);
+   }
+
+   protected:
+   template<class Vector>  //Template it to avoid it in explicit instantiations
+   void prot_swap_small(Vector &x, std::size_t internal_capacity)  //version_N
+   {
       if (BOOST_UNLIKELY(&x == this)){
          return;
       }
-      else if(are_swap_propagable( this->get_stored_allocator(), this->m_holder.start()
-                                 , x.get_stored_allocator(), x.m_holder.start(), propagate_alloc)){
-         //Just swap internals
-         this->m_holder.swap_resources(x.m_holder);
+
+      const bool propagate_alloc = allocator_traits_type::propagate_on_container_swap::value;
+      if(are_swap_propagable<propagate_alloc>
+         ( this->get_stored_allocator(), this->m_holder.start(), x.get_stored_allocator(), x.m_holder.start())){
+         this->priv_swap(x, dtl::false_());
+         return;
       }
-      else{
-         //Else swap element by element...
+
+      allocator_type &th_al = this->get_stored_allocator();
+      allocator_type &ot_al = x.get_stored_allocator();
+
+      const bool is_this_data_propagable = is_propagable_from<propagate_alloc>(th_al, this->data(), ot_al);
+      const bool is_that_data_propagable = is_propagable_from<propagate_alloc>(ot_al, x.data(), th_al);
+
+      if(internal_capacity && (is_this_data_propagable || is_that_data_propagable)) {
+         //steal memory from src to dst, but move elements from dst to src
+         vector& extmem = is_this_data_propagable ? *this : x;
+         vector& intmem = is_this_data_propagable ? x : *this;
+
+         //Reset extmem to the internal storage and backup data
+         pointer const orig_extdata = extmem.data();
+         const size_type orig_extmem_size = extmem.size();
+         const size_type orig_extmem_cap = extmem.capacity();
+
+         //New safe state for extmem -> empty, internal storage
+         extmem.m_holder.m_start = extmem.get_stored_allocator().internal_storage();
+         extmem.m_holder.set_stored_size(0u);
+         extmem.m_holder.set_stored_capacity(internal_capacity);
+
+         {
+            //Deallocate on exception
+            typename value_traits::ArrayDeallocator new_buffer_deallocator(orig_extdata, extmem.get_stored_allocator(), orig_extmem_cap);
+            typename value_traits::ArrayDestructor  new_values_destroyer(orig_extdata, extmem.get_stored_allocator(), orig_extmem_size);
+
+            //Move internal memory data to the internal memory data of the target, this can throw
+            BOOST_ASSERT(extmem.capacity() >= intmem.size());
+            ::boost::container::uninitialized_move_alloc_n
+               (intmem.get_stored_allocator(), intmem.priv_raw_begin(), intmem.size(), extmem.priv_raw_begin());
+
+            //Exception not thrown, commit new state
+            extmem.m_holder.set_stored_size(intmem.size());
+            //Throwing part passed, disable rollback
+            new_buffer_deallocator.release();
+            new_values_destroyer.release();
+         }
+
+         //Destroy moved elements from intmem
+         boost::container::destroy_alloc_n
+            ( intmem.get_stored_allocator(), intmem.priv_raw_begin()
+            , intmem.size());
+
+         //Adopt dynamic buffer
+         intmem.m_holder.m_start = orig_extdata;
+         intmem.m_holder.set_stored_size(orig_extmem_size);
+         intmem.m_holder.set_stored_capacity(orig_extmem_cap);
+
+         //And now swap the allocator
+         dtl::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), dtl::bool_<propagate_alloc>());
+      }
+      else {   //swap element by element and insert rest
          bool const t_smaller = this->size() < x.size();
          vector &sml = t_smaller ? *this : x;
          vector &big = t_smaller ? x : *this;
 
-         //For empty containers, maybe storage can be moved from the other (just like in the move constructor)         
-         if(sml.empty() && is_propagable_from(big.get_stored_allocator(), big.data(), sml.get_allocator(), propagate_alloc)){
-            if(BOOST_LIKELY(0u != sml.capacity()))
-               sml.m_holder.deallocate(sml.m_holder.m_start, sml.m_holder.m_capacity);
-            sml.steal_resources(big);
-         }
-         else {
-            //Else swap element by element...
-            size_type const common_elements = sml.size();
-            for(size_type i = 0; i != common_elements; ++i){
-               boost::adl_move_swap(sml[i], big[i]);
-            }
-            //... and move-insert the remaining range
-            sml.insert( sml.cend()
-                      , boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(big.nth(common_elements)))
-                      , boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(big.end()))
-                      );
-            //Destroy remaining elements
-            big.erase(big.nth(common_elements), big.cend());
+         //swap element by element until common size
+         size_type const common_elements = sml.size();
+         for(size_type i = 0; i != common_elements; ++i){
+            boost::adl_move_swap(sml[i], big[i]);
          }
+
+         //And now swap the allocator to be able to construct new elements in sml with the proper allocator
+         dtl::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), dtl::bool_<propagate_alloc>());
+
+         //move-insert the remaining range
+         T *const raw_big_nth = boost::movelib::iterator_to_raw_pointer(big.nth(common_elements));
+         sml.insert(sml.cend()
+            , boost::make_move_iterator(raw_big_nth)
+            , boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(big.end())));
+
+         //Destroy remaining, moved, elements with their original allocator
+         boost::container::destroy_alloc_n
+            ( sml.get_stored_allocator(), raw_big_nth
+            , std::size_t(big.m_holder.m_size - common_elements));
+         big.m_holder.set_stored_size(common_elements);
       }
-      //And now swap the allocator
-      dtl::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), dtl::bool_<propagate_alloc>());
    }
-
-   BOOST_CONTAINER_FORCEINLINE void priv_move_to_new_buffer(size_type, version_0)
+   private:
+   inline void priv_move_to_new_buffer(size_type, version_0)
    {  alloc_holder_t::on_capacity_overflow();  }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_range_proxy<allocator_type, boost::move_iterator<T*> > priv_dummy_empty_proxy()
+   inline dtl::insert_range_proxy<allocator_type, boost::move_iterator<T*> > priv_dummy_empty_proxy()
    {
       return dtl::insert_range_proxy<allocator_type, boost::move_iterator<T*> >
          (::boost::make_move_iterator((T *)0));
    }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_move_to_new_buffer(size_type new_cap, version_1)
+   inline void priv_move_to_new_buffer(size_type new_cap, version_1)
    {
       //There is not enough memory, allocate a new buffer
       //Pass the hint so that allocators can take advantage of this.
@@ -2735,34 +2897,69 @@ class vector
    }
 
    template<class U>
-   BOOST_CONTAINER_FORCEINLINE iterator priv_insert(const const_iterator &p, BOOST_FWD_REF(U) u)
+   inline iterator priv_insert(const const_iterator &p, BOOST_FWD_REF(U) u)
    {
       return this->emplace(p, ::boost::forward<U>(u));
    }
 
    template <class U>
-   BOOST_CONTAINER_FORCEINLINE void priv_push_back(BOOST_FWD_REF(U) u)
+   inline void priv_push_back(BOOST_FWD_REF(U) u)
    {
       this->emplace_back(::boost::forward<U>(u));
    }
 
    //Overload to support compiler errors that instantiate too much
-   BOOST_CONTAINER_FORCEINLINE void priv_push_back(::boost::move_detail::nat)
+   inline void priv_push_back(::boost::move_detail::nat)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE iterator priv_insert(const_iterator, ::boost::move_detail::nat)
+   inline iterator priv_insert(const_iterator, ::boost::move_detail::nat)
    {  return iterator();  }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_n_copies_proxy<allocator_type> priv_resize_proxy(const T &x)
+   inline dtl::insert_n_copies_proxy<allocator_type> priv_resize_proxy(const T &x)
    {  return dtl::insert_n_copies_proxy<allocator_type>(x);   }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_default_initialized_n_proxy<allocator_type> priv_resize_proxy(default_init_t)
+   inline dtl::insert_default_initialized_n_proxy<allocator_type> priv_resize_proxy(default_init_t)
    {  return dtl::insert_default_initialized_n_proxy<allocator_type>();  }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_value_initialized_n_proxy<allocator_type> priv_resize_proxy(value_init_t)
+   inline dtl::insert_value_initialized_n_proxy<allocator_type> priv_resize_proxy(value_init_t)
    {  return dtl::insert_value_initialized_n_proxy<allocator_type>(); }
 
-   BOOST_CONTAINER_FORCEINLINE void priv_shrink_to_fit(version_0) BOOST_NOEXCEPT_OR_NOTHROW
+   protected:
+   void prot_shrink_to_fit_small(pointer const small_buffer, const size_type small_capacity)
+   {
+      const size_type cp = this->m_holder.capacity();
+      if (cp && this->m_holder.m_start != small_buffer) {   //Do something only if a dynamic buffer is used
+         const size_type sz = this->size();
+         if (!sz) {
+            if (BOOST_LIKELY(!!this->m_holder.m_start))
+               this->m_holder.deallocate(this->m_holder.m_start, cp);
+            this->m_holder.m_start = small_buffer;
+            this->m_holder.set_stored_capacity(small_capacity);
+         }
+         else if(sz <= small_capacity) {
+            T *const oldbuf = boost::movelib::to_raw_pointer(this->m_holder.m_start);
+            ::boost::container::uninitialized_move_alloc_n
+               ( this->get_stored_allocator()
+               , oldbuf
+               , sz
+               , boost::movelib::to_raw_pointer(small_buffer)
+               );
+            boost::container::destroy_alloc_n(this->get_stored_allocator(), oldbuf, sz);
+
+            if (BOOST_LIKELY(!!this->m_holder.m_start))
+               this->m_holder.deallocate(this->m_holder.m_start, cp);
+
+            this->m_holder.m_start = small_buffer;
+            this->m_holder.set_stored_capacity(small_capacity);
+         }
+         else if (sz < cp) {
+            this->priv_move_to_new_buffer(sz, alloc_version());
+         }
+      }
+   }
+
+   private:
+   inline void priv_shrink_to_fit(version_0) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    void priv_shrink_to_fit(version_1)
@@ -2807,12 +3004,19 @@ class vector
       }
    }
 
+   #ifdef _MSC_VER
+   #pragma warning (push)
+   #pragma warning(disable: 4702)   //Disable unreachable code warning
+   #endif
    template <class InsertionProxy>
-   BOOST_CONTAINER_FORCEINLINE iterator priv_insert_forward_range_no_capacity
+   inline iterator priv_insert_forward_range_no_capacity
       (T * const, const size_type, const InsertionProxy , version_0)
    {
       return alloc_holder_t::on_capacity_overflow(), iterator();
    }
+   #ifdef _MSC_VER
+   #pragma warning (pop)
+   #endif
 
    template <class InsertionProxy>
    BOOST_CONTAINER_NOINLINE iterator priv_insert_forward_range_no_capacity
@@ -2879,7 +3083,7 @@ class vector
    }
 
    template <class InsertionProxy>
-   BOOST_CONTAINER_FORCEINLINE iterator priv_insert_forward_range
+   inline iterator priv_insert_forward_range
       (const pointer &pos, const size_type n, const InsertionProxy insert_range_proxy)
    {
       BOOST_ASSERT(this->m_holder.capacity() >= this->m_holder.m_size);
@@ -3017,14 +3221,14 @@ class vector
    }
 
    private:
-   BOOST_CONTAINER_FORCEINLINE T *priv_raw_begin() const
+   inline T *priv_raw_begin() const
    {  return boost::movelib::to_raw_pointer(m_holder.start());  }
 
-   BOOST_CONTAINER_FORCEINLINE T* priv_raw_end() const
+   inline T* priv_raw_end() const
    {  return this->priv_raw_begin() + this->m_holder.m_size;  }
 
    template <class InsertionProxy>  //inline single-element version as it is significantly smaller
-   BOOST_CONTAINER_FORCEINLINE void priv_insert_forward_range_expand_forward
+   inline void priv_insert_forward_range_expand_forward
       (T* const raw_pos, const size_type, InsertionProxy insert_range_proxy, dtl::true_type)
    {
       BOOST_ASSERT(this->room_enough());
@@ -3051,7 +3255,7 @@ class vector
    }
 
    template <class InsertionProxy>
-   BOOST_CONTAINER_FORCEINLINE void priv_insert_forward_range_expand_forward
+   inline void priv_insert_forward_range_expand_forward
       (T* const raw_pos, const size_type n, InsertionProxy insert_range_proxy, dtl::false_type)
    {
       //There is enough memory
@@ -3113,12 +3317,12 @@ class vector
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_in_range(const_iterator pos) const
+   inline bool priv_in_range(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos < this->end());
    }
 
-   BOOST_CONTAINER_FORCEINLINE bool priv_in_range_or_end(const_iterator pos) const
+   inline bool priv_in_range_or_end(const_iterator pos) const
    {
       return (this->begin() <= pos) && (pos <= this->end());
    }
@@ -3161,8 +3365,8 @@ struct has_trivial_destructor_after_move<boost::container::vector<T, Allocator,
 {
    typedef typename boost::container::vector<T, Allocator, Options>::allocator_type allocator_type;
    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
-                             ::boost::has_trivial_destructor_after_move<pointer>::value;
+   BOOST_STATIC_CONSTEXPR bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
+                                                ::boost::has_trivial_destructor_after_move<pointer>::value;
 };
 
 }
@@ -3170,6 +3374,8 @@ struct has_trivial_destructor_after_move<boost::container::vector<T, Allocator,
 //See comments on vec_iterator::element_type to know why is this needed
 #ifdef BOOST_GNU_STDLIB
 
+#include <boost/move/detail/std_ns_begin.hpp>
+
 BOOST_MOVE_STD_NS_BEG
 
 template <class Pointer, bool IsConst>
@@ -3179,6 +3385,8 @@ struct pointer_traits< boost::container::vec_iterator<Pointer, IsConst> >
 
 BOOST_MOVE_STD_NS_END
 
+#include <boost/move/detail/std_ns_end.hpp>
+
 #endif   //BOOST_GNU_STDLIB
 
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
diff --git a/inst/include/boost/container_hash/is_range.hpp b/inst/include/boost/container_hash/is_range.hpp
index f0b067ff8..e6adbce56 100644
--- a/inst/include/boost/container_hash/is_range.hpp
+++ b/inst/include/boost/container_hash/is_range.hpp
@@ -14,8 +14,12 @@ namespace boost
 namespace hash_detail
 {
 
+template<class T> struct iterator_traits: std::iterator_traits<T> {};
+template<> struct iterator_traits< void* > {};
+template<> struct iterator_traits< void const* > {};
+
 template<class T, class It>
-    std::integral_constant< bool, !std::is_same<typename std::remove_cv<T>::type, typename std::iterator_traits<It>::value_type>::value >
+    std::integral_constant< bool, !std::is_same<typename std::remove_cv<T>::type, typename iterator_traits<It>::value_type>::value >
         is_range_check( It first, It last );
 
 template<class T> decltype( is_range_check<T>( std::declval<T const&>().begin(), std::declval<T const&>().end() ) ) is_range_( int );
diff --git a/inst/include/boost/container_hash/is_tuple_like.hpp b/inst/include/boost/container_hash/is_tuple_like.hpp
index 48728cd90..bd34ee8c7 100644
--- a/inst/include/boost/container_hash/is_tuple_like.hpp
+++ b/inst/include/boost/container_hash/is_tuple_like.hpp
@@ -26,7 +26,7 @@ template<class T> struct is_tuple_like_<T, std::integral_constant<bool, std::tup
 namespace container_hash
 {
 
-template<class T> struct is_tuple_like: hash_detail::is_tuple_like_<T>
+template<class T> struct is_tuple_like: hash_detail::is_tuple_like_< typename std::remove_cv<T>::type >
 {
 };
 
diff --git a/inst/include/boost/context/detail/fcontext.hpp b/inst/include/boost/context/detail/fcontext.hpp
index 00cb24d94..52be6083a 100644
--- a/inst/include/boost/context/detail/fcontext.hpp
+++ b/inst/include/boost/context/detail/fcontext.hpp
@@ -27,14 +27,11 @@ struct transfer_t {
     void    *   data;
 };
 
-extern "C" BOOST_CONTEXT_DECL
-transfer_t BOOST_CONTEXT_CALLDECL jump_fcontext( fcontext_t const to, void * vp);
-extern "C" BOOST_CONTEXT_DECL
-fcontext_t BOOST_CONTEXT_CALLDECL make_fcontext( void * sp, std::size_t size, void (* fn)( transfer_t) );
+BOOST_CONTEXT_DECL transfer_t jump_fcontext( fcontext_t const to, void * vp);
+BOOST_CONTEXT_DECL fcontext_t make_fcontext( void * sp, std::size_t size, void (* fn)( transfer_t) );
 
 // based on an idea of Giovanni Derreta
-extern "C" BOOST_CONTEXT_DECL
-transfer_t BOOST_CONTEXT_CALLDECL ontop_fcontext( fcontext_t const to, void * vp, transfer_t (* fn)( transfer_t) );
+BOOST_CONTEXT_DECL transfer_t ontop_fcontext( fcontext_t const to, void * vp, transfer_t (* fn)( transfer_t) );
 
 }}}
 
diff --git a/inst/include/boost/core/allocator_access.hpp b/inst/include/boost/core/allocator_access.hpp
index 8e33ebb04..88084a811 100644
--- a/inst/include/boost/core/allocator_access.hpp
+++ b/inst/include/boost/core/allocator_access.hpp
@@ -43,9 +43,17 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 #if defined(_STL_DISABLE_DEPRECATED_WARNING)
 _STL_DISABLE_DEPRECATED_WARNING
 #endif
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4996)
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning("-Wdeprecated-declarations")
+#  pragma clang diagnostic push
+//#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
+# endif
+#elif defined(_MSC_VER)
+# pragma warning(push)
+# pragma warning(disable: 4996)
+#elif defined(BOOST_GCC) && BOOST_GCC >= 40600
+# pragma GCC diagnostic push
+//# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 namespace boost {
@@ -807,9 +815,15 @@ using allocator_rebind_t = typename allocator_rebind<A, T>::type;
 
 } /* boost */
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
+#if defined(__clang__) && defined(__has_warning)
+# if __has_warning("-Wdeprecated-declarations")
+#  pragma clang diagnostic pop
+# endif
+#elif defined(_MSC_VER)
+# pragma warning(pop)
+#elif defined(BOOST_GCC) && BOOST_GCC >= 40600
+# pragma GCC diagnostic pop
+#endif  
 #if defined(_STL_RESTORE_DEPRECATED_WARNING)
 _STL_RESTORE_DEPRECATED_WARNING
 #endif
diff --git a/inst/include/boost/core/bit.hpp b/inst/include/boost/core/bit.hpp
index a6147e4d4..cebc87877 100644
--- a/inst/include/boost/core/bit.hpp
+++ b/inst/include/boost/core/bit.hpp
@@ -47,12 +47,19 @@
 # if __has_builtin(__builtin_bit_cast)
 #  define BOOST_CORE_HAS_BUILTIN_BIT_CAST
 # endif
+# if __has_builtin(__builtin_bswap16)
+#  define BOOST_CORE_HAS_BUILTIN_BSWAP16
+# endif
 #endif
 
-#if defined(BOOST_MSVC) && BOOST_MSVC >= 1926
+#if !defined(BOOST_CORE_HAS_BUILTIN_BIT_CAST) && (defined(BOOST_MSVC) && BOOST_MSVC >= 1926)
 #  define BOOST_CORE_HAS_BUILTIN_BIT_CAST
 #endif
 
+#if !defined(BOOST_CORE_HAS_BUILTIN_BSWAP16) && (defined(BOOST_GCC) && BOOST_GCC >= 40800)
+#  define BOOST_CORE_HAS_BUILTIN_BSWAP16
+#endif
+
 namespace boost
 {
 namespace core
@@ -825,11 +832,22 @@ BOOST_CONSTEXPR inline boost::uint8_t byteswap_impl( boost::uint8_t x ) BOOST_NO
     return x;
 }
 
+#if defined(BOOST_CORE_HAS_BUILTIN_BSWAP16)
+
+BOOST_CONSTEXPR inline boost::uint16_t byteswap_impl( boost::uint16_t x ) BOOST_NOEXCEPT
+{
+    return __builtin_bswap16( x );
+}
+
+#else
+
 BOOST_CONSTEXPR inline boost::uint16_t byteswap_impl( boost::uint16_t x ) BOOST_NOEXCEPT
 {
     return static_cast<boost::uint16_t>( x << 8 | x >> 8 );
 }
 
+#endif
+
 #if defined(__GNUC__) || defined(__clang__)
 
 BOOST_CXX14_CONSTEXPR inline boost::uint32_t byteswap_impl( boost::uint32_t x ) BOOST_NOEXCEPT
diff --git a/inst/include/boost/core/checked_delete.hpp b/inst/include/boost/core/checked_delete.hpp
index b74a43afa..67f3c7428 100644
--- a/inst/include/boost/core/checked_delete.hpp
+++ b/inst/include/boost/core/checked_delete.hpp
@@ -60,6 +60,10 @@ template<class T> inline void checked_array_delete(T * x) BOOST_NOEXCEPT
     delete [] x;
 }
 
+// Block unintended ADL
+namespace checked_deleters
+{
+
 template<class T> struct checked_deleter
 {
     typedef void result_type;
@@ -83,6 +87,11 @@ template<class T> struct checked_array_deleter
     }
 };
 
+} // namespace checked_deleters
+
+using checked_deleters::checked_deleter;
+using checked_deleters::checked_array_deleter;
+
 } // namespace boost
 
 #endif  // #ifndef BOOST_CORE_CHECKED_DELETE_HPP
diff --git a/inst/include/boost/core/detail/lwt_unattended.hpp b/inst/include/boost/core/detail/lwt_unattended.hpp
index 96fc5fc5a..0d98f2e65 100644
--- a/inst/include/boost/core/detail/lwt_unattended.hpp
+++ b/inst/include/boost/core/detail/lwt_unattended.hpp
@@ -32,7 +32,7 @@ inline void lwt_unattended()
 
 # if defined(__clang__)
 #  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
+//#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
 # endif
 
 #if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == 100 /*WINAPI_FAMILY_DESKTOP_APP*/
diff --git a/inst/include/boost/core/detail/minstd_rand.hpp b/inst/include/boost/core/detail/minstd_rand.hpp
new file mode 100644
index 000000000..bedafb288
--- /dev/null
+++ b/inst/include/boost/core/detail/minstd_rand.hpp
@@ -0,0 +1,58 @@
+#ifndef BOOST_CORE_DETAIL_MINSTD_RAND_HPP_INCLUDED
+#define BOOST_CORE_DETAIL_MINSTD_RAND_HPP_INCLUDED
+
+// Copyright 2017 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+// An implementation of minstd_rand that does not require
+// the Random library
+
+#include <boost/cstdint.hpp>
+
+namespace boost
+{
+namespace detail
+{
+
+class minstd_rand
+{
+private:
+
+    boost::uint_least32_t x_;
+
+    enum { a = 48271, m = 2147483647 };
+
+public:
+
+    minstd_rand(): x_( 1 )
+    {
+    }
+
+    explicit minstd_rand( boost::uint_least32_t x ): x_( x % m )
+    {
+        if( x_ == 0 )
+        {
+            x_ = 1;
+        }
+    }
+
+    boost::uint_least32_t operator()()
+    {
+        boost::uint_least64_t y = x_;
+
+        y = ( a * y ) % m;
+
+        x_ = static_cast<boost::uint_least32_t>( y );
+
+        return x_;
+    }
+};
+
+} // namespace detail
+} // namespace boost
+
+#endif // #ifndef BOOST_CORE_DETAIL_MINSTD_RAND_HPP_INCLUDED
diff --git a/inst/include/boost/core/detail/string_view.hpp b/inst/include/boost/core/detail/string_view.hpp
index 454eecfe6..83a3d45ab 100644
--- a/inst/include/boost/core/detail/string_view.hpp
+++ b/inst/include/boost/core/detail/string_view.hpp
@@ -74,7 +74,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_first_of( Ch const* p_
 
     for( std::size_t j = 0; j < n; ++j )
     {
-        UCh ch = s[ j ];
+        UCh ch = static_cast<UCh>( s[ j ] );
 
         if( ch >= 0 && ch < 256 )
         {
@@ -91,7 +91,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_first_of( Ch const* p_
     {
         for( std::size_t i = pos; i < n_; ++i )
         {
-            UCh ch = p_[ i ];
+            UCh ch = static_cast<UCh>( p_[ i ] );
             if( ch >= 0 && ch < 256 && table[ ch ] ) return i;
         }
     }
@@ -129,7 +129,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_last_of( Ch const* p_,
 
     for( std::size_t j = 0; j < n; ++j )
     {
-        UCh ch = s[ j ];
+        UCh ch = static_cast<UCh>( s[ j ] );
 
         if( ch >= 0 && ch < 256 )
         {
@@ -150,7 +150,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_last_of( Ch const* p_,
     {
         do
         {
-            UCh ch = p_[ i ];
+            UCh ch = static_cast<UCh>( p_[ i ] );
 
             if( ch >= 0 && ch < 256 && table[ ch ] ) return i;
 
@@ -199,7 +199,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_first_not_of( Ch const
 
     for( std::size_t j = 0; j < n; ++j )
     {
-        UCh ch = s[ j ];
+        UCh ch = static_cast<UCh>( s[ j ] );
 
         if( ch >= 0 && ch < 256 )
         {
@@ -216,7 +216,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_first_not_of( Ch const
     {
         for( std::size_t i = pos; i < n_; ++i )
         {
-            UCh ch = p_[ i ];
+            UCh ch = static_cast<UCh>( p_[ i ] );
             if( !( ch >= 0 && ch < 256 && table[ ch ] ) ) return i;
         }
     }
@@ -262,7 +262,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_last_not_of( Ch const*
 
     for( std::size_t j = 0; j < n; ++j )
     {
-        UCh ch = s[ j ];
+        UCh ch = static_cast<UCh>( s[ j ] );
 
         if( ch >= 0 && ch < 256 )
         {
@@ -283,7 +283,7 @@ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_last_not_of( Ch const*
     {
         do
         {
-            UCh ch = p_[ i ];
+            UCh ch = static_cast<UCh>( p_[ i ] );
 
             if( !( ch >= 0 && ch < 256 && table[ ch ] ) ) return i;
 
@@ -381,7 +381,7 @@ template<class Ch> class basic_string_view
     }
 
     template<class End> BOOST_CXX14_CONSTEXPR basic_string_view( Ch const* first, End last,
-        typename boost::enable_if<boost::core::detail::is_same<End, Ch const*> >::type* = 0 ) BOOST_NOEXCEPT: p_( first ), n_( last - first )
+        typename boost::enable_if<boost::core::detail::is_same<End, Ch const*> >::type* = 0 ) BOOST_NOEXCEPT: p_( first ), n_( static_cast<size_type>( last - first ) )
     {
         BOOST_ASSERT( last - first >= 0 );
     }
@@ -392,7 +392,7 @@ template<class Ch> class basic_string_view
 
 #if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
 
-    basic_string_view( std::basic_string_view<Ch, std::char_traits<Ch> > const& str ) BOOST_NOEXCEPT: p_( str.data() ), n_( str.size() )
+    BOOST_CONSTEXPR basic_string_view( std::basic_string_view<Ch, std::char_traits<Ch> > const& str ) BOOST_NOEXCEPT: p_( str.data() ), n_( str.size() )
     {
     }
 
@@ -681,7 +681,7 @@ template<class Ch> class basic_string_view
 
         Ch const* r = traits_type::find( data() + pos, size() - pos, c );
 
-        return r? r - data(): npos;
+        return r? static_cast<size_type>( r - data() ): npos;
     }
 
     BOOST_CXX14_CONSTEXPR size_type find( Ch const* s, size_type pos, size_type n ) const BOOST_NOEXCEPT
@@ -696,11 +696,11 @@ template<class Ch> class basic_string_view
 
         for( ;; )
         {
-            p = traits_type::find( p, last - p, s[0] );
+            p = traits_type::find( p, static_cast<size_type>( last - p ), s[0] );
 
             if( p == 0 ) break;
 
-            if( traits_type::compare( p + 1, s + 1, n - 1 ) == 0 ) return p - data();
+            if( traits_type::compare( p + 1, s + 1, n - 1 ) == 0 ) return static_cast<size_type>( p - data() );
 
             ++p;
         }
@@ -1193,7 +1193,7 @@ template<class Ch> class basic_string_view
 template<class Ch> std::basic_ostream<Ch>& operator<<( std::basic_ostream<Ch>& os, basic_string_view<Ch> str )
 {
     Ch const* p = str.data();
-    std::streamsize n = str.size();
+    std::streamsize n = static_cast<std::streamsize>( str.size() );
 
     std::streamsize m = os.width();
 
diff --git a/inst/include/boost/core/empty_value.hpp b/inst/include/boost/core/empty_value.hpp
index d8ffa30b4..5eeee51f9 100644
--- a/inst/include/boost/core/empty_value.hpp
+++ b/inst/include/boost/core/empty_value.hpp
@@ -95,9 +95,57 @@ class empty_value {
 };
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+#if defined(BOOST_MSVC)
+/*
+This is a workaround to an MSVC bug when T is a nested class:
+https://developercommunity.visualstudio.com/t/Compiler-bug:-Incorrect-C2247-and-C2248/10690025
+*/
+namespace detail {
+
+template<class T>
+class empty_value_base
+    : public T {
+public:
+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+    empty_value_base() = default;
+#else
+    BOOST_CONSTEXPR empty_value_base() { }
+#endif
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+    template<class U, class... Args>
+    BOOST_CONSTEXPR empty_value_base(U&& value, Args&&... args)
+        : T(std::forward<U>(value), std::forward<Args>(args)...) { }
+#else
+    template<class U>
+    BOOST_CONSTEXPR empty_value_base(U&& value)
+        : T(std::forward<U>(value)) { }
+#endif
+#else
+    template<class U>
+    BOOST_CONSTEXPR empty_value_base(const U& value)
+        : T(value) { }
+
+    template<class U>
+    BOOST_CONSTEXPR empty_value_base(U& value)
+        : T(value) { }
+#endif
+};
+
+} /* detail */
+#endif
+
 template<class T, unsigned N>
 class empty_value<T, N, true>
+#if defined(BOOST_MSVC)
+    : detail::empty_value_base<T> {
+    typedef detail::empty_value_base<T> empty_base_;
+#else
     : T {
+    typedef T empty_base_;
+#endif
+
 public:
     typedef T type;
 
@@ -108,26 +156,26 @@ class empty_value<T, N, true>
 #endif
 
     BOOST_CONSTEXPR empty_value(boost::empty_init_t)
-        : T() { }
+        : empty_base_() { }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     template<class U, class... Args>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value, Args&&... args)
-        : T(std::forward<U>(value), std::forward<Args>(args)...) { }
+        : empty_base_(std::forward<U>(value), std::forward<Args>(args)...) { }
 #else
     template<class U>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, U&& value)
-        : T(std::forward<U>(value)) { }
+        : empty_base_(std::forward<U>(value)) { }
 #endif
 #else
     template<class U>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, const U& value)
-        : T(value) { }
+        : empty_base_(value) { }
 
     template<class U>
     BOOST_CONSTEXPR empty_value(boost::empty_init_t, U& value)
-        : T(value) { }
+        : empty_base_(value) { }
 #endif
 
     BOOST_CONSTEXPR const T& get() const BOOST_NOEXCEPT {
diff --git a/inst/include/boost/core/launder.hpp b/inst/include/boost/core/launder.hpp
new file mode 100644
index 000000000..9ec5e7ee9
--- /dev/null
+++ b/inst/include/boost/core/launder.hpp
@@ -0,0 +1,69 @@
+#ifndef BOOST_CORE_LAUNDER_HPP_INCLUDED
+#define BOOST_CORE_LAUNDER_HPP_INCLUDED
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+//  Copyright 2023 Peter Dimov
+//  Distributed under the Boost Software License, Version 1.0.
+//  https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+
+#if defined(__has_builtin)
+# if __has_builtin(__builtin_launder)
+#  define BOOST_CORE_HAS_BUILTIN_LAUNDER
+# endif
+#endif
+
+#if defined(BOOST_MSVC) && BOOST_MSVC < 1920
+
+// msvc-14.1 suffers from internal compiler errors when using std::launder
+// https://github.com/boostorg/core/issues/160
+// https://github.com/boostorg/optional/issues/122
+
+#elif (BOOST_CXX_VERSION >= 201703L) && !defined(BOOST_CORE_HAS_BUILTIN_LAUNDER)
+
+#include <new>
+
+#if defined(__cpp_lib_launder)
+# define BOOST_CORE_HAS_STD_LAUNDER
+#endif
+
+#endif
+
+namespace boost
+{
+namespace core
+{
+
+#if defined(BOOST_CORE_HAS_BUILTIN_LAUNDER)
+
+template<class T> T* launder( T* p )
+{
+    return __builtin_launder( p );
+}
+
+#elif defined(BOOST_CORE_HAS_STD_LAUNDER)
+
+template<class T> T* launder( T* p )
+{
+    return std::launder( p );
+}
+
+#else
+
+template<class T> T* launder( T* p )
+{
+    return p;
+}
+
+#endif
+
+} // namespace core
+} // namespace boost
+
+#endif  // #ifndef BOOST_CORE_LAUNDER_HPP_INCLUDED
diff --git a/inst/include/boost/core/lightweight_test.hpp b/inst/include/boost/core/lightweight_test.hpp
index 7d9a34d40..aa32efbf9 100644
--- a/inst/include/boost/core/lightweight_test.hpp
+++ b/inst/include/boost/core/lightweight_test.hpp
@@ -145,14 +145,15 @@ inline void no_throw_failed_impl(const char* expr, const char* what, const char*
 #if defined(__clang__) && defined(__has_warning)
 # if __has_warning("-Wsign-compare")
 #  pragma clang diagnostic push
-  //#  pragma clang diagnostic ignored "-Wsign-compare"
+//#  pragma clang diagnostic ignored "-Wsign-compare"
 # endif
 #elif defined(_MSC_VER)
 # pragma warning(push)
 # pragma warning(disable: 4389)
 #elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
 # pragma GCC diagnostic push
-  //# pragma GCC diagnostic ignored "-Wsign-compare"
+//# pragma GCC diagnostic ignored "-Wsign-compare"
+//# pragma GCC diagnostic ignored "-Wsign-conversion"
 #endif
 
 // specialize test output for char pointers to avoid printing as cstring
diff --git a/inst/include/boost/core/make_span.hpp b/inst/include/boost/core/make_span.hpp
new file mode 100644
index 000000000..5f5df5631
--- /dev/null
+++ b/inst/include/boost/core/make_span.hpp
@@ -0,0 +1,59 @@
+/*
+Copyright 2023 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_CORE_MAKE_SPAN_HPP
+#define BOOST_CORE_MAKE_SPAN_HPP
+
+#include <boost/core/span.hpp>
+
+namespace boost {
+
+template<class I>
+inline constexpr span<I>
+make_span(I* f, std::size_t c) noexcept
+{
+    return span<I>(f, c);
+}
+
+template<class I>
+inline constexpr span<I>
+make_span(I* f, I* l) noexcept
+{
+    return span<I>(f, l);
+}
+
+template<class T, std::size_t N>
+inline constexpr span<T, N>
+make_span(T(&a)[N]) noexcept
+{
+    return span<T, N>(a);
+}
+
+template<class T, std::size_t N>
+inline constexpr span<T, N>
+make_span(std::array<T, N>& a) noexcept
+{
+    return span<T, N>(a);
+}
+
+template<class T, std::size_t N>
+inline constexpr span<const T, N>
+make_span(const std::array<T, N>& a) noexcept
+{
+    return span<const T, N>(a);
+}
+
+template<class R>
+inline span<typename detail::span_data<R>::type>
+make_span(R&& r)
+{
+    return span<typename detail::span_data<R>::type>(std::forward<R>(r));
+}
+
+} /* boost */
+
+#endif
diff --git a/inst/include/boost/core/span.hpp b/inst/include/boost/core/span.hpp
index 99a2dd7f0..2e64262dc 100644
--- a/inst/include/boost/core/span.hpp
+++ b/inst/include/boost/core/span.hpp
@@ -351,8 +351,10 @@ class span {
     detail::span_store<T, E> s_;
 };
 
+#if defined(BOOST_NO_CXX17_INLINE_VARIABLES)
 template<class T, std::size_t E>
 constexpr std::size_t span<T, E>::extent;
+#endif
 
 #ifdef __cpp_deduction_guides
 template<class I, class L>
diff --git a/inst/include/boost/core/type_name.hpp b/inst/include/boost/core/type_name.hpp
index 773b5f681..81e00c203 100644
--- a/inst/include/boost/core/type_name.hpp
+++ b/inst/include/boost/core/type_name.hpp
@@ -103,7 +103,8 @@ inline std::string fix_typeid_name( char const* n )
 }
 
 // class types can be incomplete
-template<class T> std::string typeid_name_impl( int T::* )
+// but also abstract (T[1] doesn't form)
+template<class T> std::string typeid_name_impl( int T::*, T(*)[1] )
 {
     std::string r = fix_typeid_name( typeid(T[1]).name() );
     return r.substr( 0, r.size() - 4 ); // remove ' [1]' suffix
@@ -116,7 +117,7 @@ template<class T> std::string typeid_name_impl( ... )
 
 template<class T> std::string typeid_name()
 {
-    return typeid_name_impl<T>( 0 );
+    return typeid_name_impl<T>( 0, 0 );
 }
 
 // template names
@@ -345,6 +346,8 @@ template<> struct tn_holder<boost::uint128_type>
 
 #endif
 
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+
 template<> struct tn_holder<wchar_t>
 {
     static std::string type_name( std::string const& suffix )
@@ -353,6 +356,8 @@ template<> struct tn_holder<wchar_t>
     }
 };
 
+#endif
+
 #if !defined(BOOST_NO_CXX11_CHAR16_T)
 
 template<> struct tn_holder<char16_t>
diff --git a/inst/include/boost/coroutine/all.hpp b/inst/include/boost/coroutine/all.hpp
deleted file mode 100644
index 42f63a0a7..000000000
--- a/inst/include/boost/coroutine/all.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_ALL_H
-#define BOOST_COROUTINES_ALL_H
-
-#include <boost/coroutine/attributes.hpp>
-#include <boost/coroutine/coroutine.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/flags.hpp>
-#include <boost/coroutine/protected_stack_allocator.hpp>
-#include <boost/coroutine/segmented_stack_allocator.hpp>
-#include <boost/coroutine/stack_allocator.hpp>
-#include <boost/coroutine/stack_context.hpp>
-#include <boost/coroutine/stack_traits.hpp>
-#include <boost/coroutine/standard_stack_allocator.hpp>
-
-#endif // BOOST_COROUTINES_ALL_H
diff --git a/inst/include/boost/coroutine/asymmetric_coroutine.hpp b/inst/include/boost/coroutine/asymmetric_coroutine.hpp
deleted file mode 100644
index 6ad28c727..000000000
--- a/inst/include/boost/coroutine/asymmetric_coroutine.hpp
+++ /dev/null
@@ -1,2414 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_ASYMMETRIC_COROUTINE_H
-#define BOOST_COROUTINES_ASYMMETRIC_COROUTINE_H
-
-#include <cstddef>
-#include <iterator>
-#include <memory>
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/move/move.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/utility/explicit_operator_bool.hpp>
-
-#include <boost/coroutine/attributes.hpp>
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/parameters.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/stack_allocator.hpp>
-#include <boost/coroutine/detail/pull_coroutine_impl.hpp>
-#include <boost/coroutine/detail/pull_coroutine_object.hpp>
-#include <boost/coroutine/detail/pull_coroutine_synthesized.hpp>
-#include <boost/coroutine/detail/push_coroutine_impl.hpp>
-#include <boost/coroutine/detail/push_coroutine_object.hpp>
-#include <boost/coroutine/detail/push_coroutine_synthesized.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-template< typename R >
-class pull_coroutine;
-
-template< typename Arg >
-class push_coroutine
-{
-private:
-    template< typename V, typename X, typename Y, typename Z >
-    friend class detail::pull_coroutine_object;
-
-    typedef detail::push_coroutine_impl< Arg >          impl_type;
-    typedef detail::push_coroutine_synthesized< Arg >   synth_type;
-    typedef detail::parameters< Arg >                   param_type;
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( push_coroutine)
-
-    explicit push_coroutine( detail::synthesized_t::flag_t, impl_type & impl) :
-        impl_( & impl)
-    { BOOST_ASSERT( impl_); }
-
-public:
-    push_coroutine() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( pull_coroutine< Arg > &);
-
-    explicit push_coroutine( coroutine_fn,
-                             attributes const& = attributes() );
-
-    template< typename StackAllocator >
-    explicit push_coroutine( coroutine_fn,
-                             attributes const&,
-                             StackAllocator);
-# endif
-    template< typename Fn >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const&,
-                             StackAllocator);
-#else
-    template< typename Fn >
-    explicit push_coroutine( Fn fn,
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( Fn fn,
-                             attributes const&,
-                             StackAllocator);
-
-    template< typename Fn >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const&,
-                             StackAllocator);
-#endif
-
-    ~push_coroutine()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    push_coroutine( BOOST_RV_REF( push_coroutine) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    push_coroutine & operator=( BOOST_RV_REF( push_coroutine) other) BOOST_NOEXCEPT
-    {
-        push_coroutine tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete(); }
-
-    void swap( push_coroutine & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    push_coroutine & operator()( Arg arg)
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->push( arg);
-        return * this;
-    }
-
-    class iterator
-    {
-    private:
-       push_coroutine< Arg >    *   c_;
-
-    public:
-        typedef std::output_iterator_tag iterator_category;
-        typedef void value_type;
-        typedef void difference_type;
-        typedef void pointer;
-        typedef void reference;
-
-        iterator() :
-           c_( 0)
-        {}
-
-        explicit iterator( push_coroutine< Arg > * c) :
-            c_( c)
-        {}
-
-        iterator & operator=( Arg a)
-        {
-            BOOST_ASSERT( c_);
-            if ( ! ( * c_)( a) ) c_ = 0;
-            return * this;
-        }
-
-        bool operator==( iterator const& other) const
-        { return other.c_ == c_; }
-
-        bool operator!=( iterator const& other) const
-        { return other.c_ != c_; }
-
-        iterator & operator*()
-        { return * this; }
-
-        iterator & operator++()
-        { return * this; }
-    };
-
-    struct const_iterator;
-};
-
-template< typename Arg >
-class push_coroutine< Arg & >
-{
-private:
-    template< typename V, typename X, typename Y, typename Z >
-    friend class detail::pull_coroutine_object;
-
-    typedef detail::push_coroutine_impl< Arg & >          impl_type;
-    typedef detail::push_coroutine_synthesized< Arg & >   synth_type;
-    typedef detail::parameters< Arg & >                   param_type;
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( push_coroutine)
-
-    explicit push_coroutine( detail::synthesized_t::flag_t, impl_type & impl) :
-        impl_( & impl)
-    { BOOST_ASSERT( impl_); }
-
-public:
-    push_coroutine() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( pull_coroutine< Arg & > &);
-
-    explicit push_coroutine( coroutine_fn,
-                             attributes const& = attributes() );
-
-    template< typename StackAllocator >
-    explicit push_coroutine( coroutine_fn,
-                             attributes const&,
-                             StackAllocator);
-# endif
-    template< typename Fn >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const&,
-                             StackAllocator);
-#else
-    template< typename Fn >
-    explicit push_coroutine( Fn,
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( Fn,
-                             attributes const&,
-                             StackAllocator);
-
-    template< typename Fn >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const&,
-                             StackAllocator);
-#endif
-
-    ~push_coroutine()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    push_coroutine( BOOST_RV_REF( push_coroutine) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    push_coroutine & operator=( BOOST_RV_REF( push_coroutine) other) BOOST_NOEXCEPT
-    {
-        push_coroutine tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete(); }
-
-    void swap( push_coroutine & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    push_coroutine & operator()( Arg & arg)
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->push( arg);
-        return * this;
-    }
-
-    class iterator
-    {
-    private:
-       push_coroutine< Arg & >  *   c_;
-
-    public:
-        typedef std::output_iterator_tag iterator_category;
-        typedef void value_type;
-        typedef void difference_type;
-        typedef void pointer;
-        typedef void reference;
-
-        iterator() :
-           c_( 0)
-        {}
-
-        explicit iterator( push_coroutine< Arg & > * c) :
-            c_( c)
-        {}
-
-        iterator & operator=( Arg & a)
-        {
-            BOOST_ASSERT( c_);
-            if ( ! ( * c_)( a) ) c_ = 0;
-            return * this;
-        }
-
-        bool operator==( iterator const& other) const
-        { return other.c_ == c_; }
-
-        bool operator!=( iterator const& other) const
-        { return other.c_ != c_; }
-
-        iterator & operator*()
-        { return * this; }
-
-        iterator & operator++()
-        { return * this; }
-    };
-
-    struct const_iterator;
-};
-
-template<>
-class push_coroutine< void >
-{
-private:
-    template< typename V, typename X, typename Y, typename Z >
-    friend class detail::pull_coroutine_object;
-
-    typedef detail::push_coroutine_impl< void >          impl_type;
-    typedef detail::push_coroutine_synthesized< void >   synth_type;
-    typedef detail::parameters< void >                   param_type;
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( push_coroutine)
-
-    explicit push_coroutine( detail::synthesized_t::flag_t, impl_type & impl) :
-        impl_( & impl)
-    { BOOST_ASSERT( impl_); }
-
-public:
-    push_coroutine() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( pull_coroutine< void > &);
-
-    explicit push_coroutine( coroutine_fn,
-                             attributes const& = attributes() );
-
-    template< typename StackAllocator >
-    explicit push_coroutine( coroutine_fn,
-                             attributes const&,
-                             StackAllocator);
-# endif
-    template< typename Fn >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const&,
-                             StackAllocator);
-#else
-    template< typename Fn >
-    explicit push_coroutine( Fn,
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( Fn,
-                             attributes const&,
-                             StackAllocator);
-
-    template< typename Fn >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const& = attributes() );
-
-    template< typename Fn, typename StackAllocator >
-    explicit push_coroutine( BOOST_RV_REF( Fn),
-                             attributes const&,
-                             StackAllocator);
-#endif
-
-    ~push_coroutine()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    inline push_coroutine( BOOST_RV_REF( push_coroutine) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    inline push_coroutine & operator=( BOOST_RV_REF( push_coroutine) other) BOOST_NOEXCEPT
-    {
-        push_coroutine tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    inline bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete(); }
-
-    inline void swap( push_coroutine & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    inline push_coroutine & operator()()
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->push();
-        return * this;
-    }
-
-    struct iterator;
-    struct const_iterator;
-};
-
-
-
-template< typename R >
-class pull_coroutine
-{
-private:
-    template< typename V, typename X, typename Y, typename Z >
-    friend class detail::push_coroutine_object;
-
-    typedef detail::pull_coroutine_impl< R >            impl_type;
-    typedef detail::pull_coroutine_synthesized< R >     synth_type;
-    typedef detail::parameters< R >                     param_type;
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( pull_coroutine)
-
-    explicit pull_coroutine( detail::synthesized_t::flag_t, impl_type & impl) :
-        impl_( & impl)
-    { BOOST_ASSERT( impl_); }
-
-public:
-    pull_coroutine() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( push_coroutine< R > &);
-
-    explicit pull_coroutine( coroutine_fn fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, coroutine_fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename StackAllocator >
-    explicit pull_coroutine( coroutine_fn fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, coroutine_fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-# endif
-    template< typename Fn >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, Fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, Fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-#else
-    template< typename Fn >
-    explicit pull_coroutine( Fn fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, Fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( Fn fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, Fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, Fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R >, R, Fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-#endif
-
-    ~pull_coroutine()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    pull_coroutine( BOOST_RV_REF( pull_coroutine) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    pull_coroutine & operator=( BOOST_RV_REF( pull_coroutine) other) BOOST_NOEXCEPT
-    {
-        pull_coroutine tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete(); }
-
-    void swap( pull_coroutine & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    pull_coroutine & operator()()
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->pull();
-        return * this;
-    }
-
-    R get() const
-    {
-        BOOST_ASSERT( 0 != impl_);
-
-        return impl_->get();
-    }
-
-    class iterator
-    {
-    private:
-        pull_coroutine< R > *   c_;
-        R                   *   val_;
-
-        void fetch_()
-        {
-            BOOST_ASSERT( c_);
-
-            if ( ! ( * c_) )
-            {
-                c_ = 0;
-                val_ = 0;
-                return;
-            }
-            val_ = c_->impl_->get_pointer();
-        }
-
-        void increment_()
-        {
-            BOOST_ASSERT( c_);
-            BOOST_ASSERT( * c_);
-
-            ( * c_)();
-            fetch_();
-        }
-
-    public:
-        typedef std::input_iterator_tag iterator_category;
-        typedef typename remove_reference< R >::type value_type;
-        typedef std::ptrdiff_t difference_type;
-        typedef value_type * pointer;
-        typedef value_type & reference;
-
-        typedef pointer   pointer_t;
-        typedef reference reference_t;
-
-        iterator() :
-            c_( 0), val_( 0)
-        {}
-
-        explicit iterator( pull_coroutine< R > * c) :
-            c_( c), val_( 0)
-        { fetch_(); }
-
-        iterator( iterator const& other) :
-            c_( other.c_), val_( other.val_)
-        {}
-
-        iterator & operator=( iterator const& other)
-        {
-            if ( this == & other) return * this;
-            c_ = other.c_;
-            val_ = other.val_;
-            return * this;
-        }
-
-        bool operator==( iterator const& other) const
-        { return other.c_ == c_ && other.val_ == val_; }
-
-        bool operator!=( iterator const& other) const
-        { return other.c_ != c_ || other.val_ != val_; }
-
-        iterator & operator++()
-        {
-            increment_();
-            return * this;
-        }
-
-        iterator operator++( int);
-
-        reference_t operator*() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return * val_;
-        }
-
-        pointer_t operator->() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return val_;
-        }
-    };
-
-    class const_iterator
-    {
-    private:
-        pull_coroutine< R > *   c_;
-        R                   *   val_;
-
-        void fetch_()
-        {
-            BOOST_ASSERT( c_);
-
-            if ( ! ( * c_) )
-            {
-                c_ = 0;
-                val_ = 0;
-                return;
-            }
-            val_ = c_->impl_->get_pointer();
-        }
-
-        void increment_()
-        {
-            BOOST_ASSERT( c_);
-            BOOST_ASSERT( * c_);
-
-            ( * c_)();
-            fetch_();
-        }
-
-    public:
-        typedef std::input_iterator_tag iterator_category;
-        typedef const typename remove_reference< R >::type value_type;
-        typedef std::ptrdiff_t difference_type;
-        typedef value_type * pointer;
-        typedef value_type & reference;
-
-        typedef pointer   pointer_t;
-        typedef reference reference_t;
-
-        const_iterator() :
-            c_( 0), val_( 0)
-        {}
-
-        explicit const_iterator( pull_coroutine< R > const* c) :
-            c_( const_cast< pull_coroutine< R > * >( c) ),
-            val_( 0)
-        { fetch_(); }
-
-        const_iterator( const_iterator const& other) :
-            c_( other.c_), val_( other.val_)
-        {}
-
-        const_iterator & operator=( const_iterator const& other)
-        {
-            if ( this == & other) return * this;
-            c_ = other.c_;
-            val_ = other.val_;
-            return * this;
-        }
-
-        bool operator==( const_iterator const& other) const
-        { return other.c_ == c_ && other.val_ == val_; }
-
-        bool operator!=( const_iterator const& other) const
-        { return other.c_ != c_ || other.val_ != val_; }
-
-        const_iterator & operator++()
-        {
-            increment_();
-            return * this;
-        }
-
-        const_iterator operator++( int);
-
-        reference_t operator*() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return * val_;
-        }
-
-        pointer_t operator->() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return val_;
-        }
-    };
-
-    friend class iterator;
-    friend class const_iterator;
-};
-
-template< typename R >
-class pull_coroutine< R & >
-{
-private:
-    template< typename V, typename X, typename Y, typename Z >
-    friend class detail::push_coroutine_object;
-
-    typedef detail::pull_coroutine_impl< R & >            impl_type;
-    typedef detail::pull_coroutine_synthesized< R & >     synth_type;
-    typedef detail::parameters< R & >                     param_type;
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( pull_coroutine)
-
-    explicit pull_coroutine( detail::synthesized_t::flag_t, impl_type & impl) :
-        impl_( & impl)
-    { BOOST_ASSERT( impl_); }
-
-public:
-    pull_coroutine() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( push_coroutine< R & > &);
-
-    explicit pull_coroutine( coroutine_fn fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, coroutine_fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename StackAllocator >
-    explicit pull_coroutine( coroutine_fn fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, coroutine_fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-# endif
-    template< typename Fn >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, Fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, Fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-#else
-    template< typename Fn >
-    explicit pull_coroutine( Fn fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, Fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( Fn fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, Fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, Fn, stack_allocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< R & >, R &, Fn, StackAllocator
-        >                                                        object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-#endif
-
-    ~pull_coroutine()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    pull_coroutine( BOOST_RV_REF( pull_coroutine) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    pull_coroutine & operator=( BOOST_RV_REF( pull_coroutine) other) BOOST_NOEXCEPT
-    {
-        pull_coroutine tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete(); }
-
-    void swap( pull_coroutine & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    pull_coroutine & operator()()
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->pull();
-        return * this;
-    }
-
-    R & get() const
-    { return impl_->get(); }
-
-    class iterator
-    {
-    private:
-        pull_coroutine< R & >   *   c_;
-        R                       *   val_;
-
-        void fetch_()
-        {
-            BOOST_ASSERT( c_);
-
-            if ( ! ( * c_) )
-            {
-                c_ = 0;
-                val_ = 0;
-                return;
-            }
-            val_ = c_->impl_->get_pointer();
-        }
-
-        void increment_()
-        {
-            BOOST_ASSERT( c_);
-            BOOST_ASSERT( * c_);
-
-            ( * c_)();
-            fetch_();
-        }
-
-    public:
-        typedef std::input_iterator_tag iterator_category;
-        typedef typename remove_reference< R >::type value_type;
-        typedef std::ptrdiff_t difference_type;
-        typedef value_type * pointer;
-        typedef value_type & reference;
-
-        typedef pointer   pointer_t;
-        typedef reference reference_t;
-
-        iterator() :
-            c_( 0), val_( 0)
-        {}
-
-        explicit iterator( pull_coroutine< R & > * c) :
-            c_( c), val_( 0)
-        { fetch_(); }
-
-        iterator( iterator const& other) :
-            c_( other.c_), val_( other.val_)
-        {}
-
-        iterator & operator=( iterator const& other)
-        {
-            if ( this == & other) return * this;
-            c_ = other.c_;
-            val_ = other.val_;
-            return * this;
-        }
-
-        bool operator==( iterator const& other) const
-        { return other.c_ == c_ && other.val_ == val_; }
-
-        bool operator!=( iterator const& other) const
-        { return other.c_ != c_ || other.val_ != val_; }
-
-        iterator & operator++()
-        {
-            increment_();
-            return * this;
-        }
-
-        iterator operator++( int);
-
-        reference_t operator*() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return * val_;
-        }
-
-        pointer_t operator->() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return val_;
-        }
-    };
-
-    class const_iterator
-    {
-    private:
-        pull_coroutine< R & >   *   c_;
-        R                       *   val_;
-
-        void fetch_()
-        {
-            BOOST_ASSERT( c_);
-
-            if ( ! ( * c_) )
-            {
-                c_ = 0;
-                val_ = 0;
-                return;
-            }
-            val_ = c_->impl_->get_pointer();
-        }
-
-        void increment_()
-        {
-            BOOST_ASSERT( c_);
-            BOOST_ASSERT( * c_);
-
-            ( * c_)();
-            fetch_();
-        }
-
-    public:
-        typedef std::input_iterator_tag iterator_category;
-        typedef const typename remove_reference< R >::type value_type;
-        typedef std::ptrdiff_t difference_type;
-        typedef value_type * pointer;
-        typedef value_type & reference;
-
-        typedef pointer   pointer_t;
-        typedef reference reference_t;
-
-        const_iterator() :
-            c_( 0), val_( 0)
-        {}
-
-        explicit const_iterator( pull_coroutine< R & > const* c) :
-            c_( const_cast< pull_coroutine< R & > * >( c) ),
-            val_( 0)
-        { fetch_(); }
-
-        const_iterator( const_iterator const& other) :
-            c_( other.c_), val_( other.val_)
-        {}
-
-        const_iterator & operator=( const_iterator const& other)
-        {
-            if ( this == & other) return * this;
-            c_ = other.c_;
-            val_ = other.val_;
-            return * this;
-        }
-
-        bool operator==( const_iterator const& other) const
-        { return other.c_ == c_ && other.val_ == val_; }
-
-        bool operator!=( const_iterator const& other) const
-        { return other.c_ != c_ || other.val_ != val_; }
-
-        const_iterator & operator++()
-        {
-            increment_();
-            return * this;
-        }
-
-        const_iterator operator++( int);
-
-        reference_t operator*() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return * val_;
-        }
-
-        pointer_t operator->() const
-        {
-            if ( ! val_)
-                boost::throw_exception(
-                    invalid_result() );
-            return val_;
-        }
-    };
-
-    friend class iterator;
-    friend class const_iterator;
-};
-
-template<>
-class pull_coroutine< void >
-{
-private:
-    template< typename V, typename X, typename Y, typename Z >
-    friend class detail::push_coroutine_object;
-
-    typedef detail::pull_coroutine_impl< void >            impl_type;
-    typedef detail::pull_coroutine_synthesized< void >     synth_type;
-    typedef detail::parameters< void >                     param_type;
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( pull_coroutine)
-
-    explicit pull_coroutine( detail::synthesized_t::flag_t, impl_type & impl) :
-        impl_( & impl)
-    { BOOST_ASSERT( impl_); }
-
-public:
-    pull_coroutine() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( push_coroutine< void > &);
-
-    explicit pull_coroutine( coroutine_fn fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, coroutine_fn, stack_allocator
-        >                                       object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename StackAllocator >
-    explicit pull_coroutine( coroutine_fn fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, coroutine_fn, StackAllocator
-        >                                                                   object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-# endif
-    template< typename Fn >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, Fn, stack_allocator
-        >                                                       object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, Fn, StackAllocator
-        >                                                       object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-#else
-    template< typename Fn >
-    explicit pull_coroutine( Fn fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, Fn, stack_allocator
-        >                                                       object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( Fn fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, Fn, StackAllocator
-        >                                                       object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs = attributes() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        stack_allocator stack_alloc;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, Fn, stack_allocator
-        >                                           object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit pull_coroutine( BOOST_RV_REF( Fn) fn,
-                             attributes const& attrs,
-                             StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef detail::pull_coroutine_object<
-            push_coroutine< void >, void, Fn, StackAllocator
-        >                                           object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-        impl_->pull();
-    }
-#endif
-
-    ~pull_coroutine()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    inline pull_coroutine( BOOST_RV_REF( pull_coroutine) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    inline pull_coroutine & operator=( BOOST_RV_REF( pull_coroutine) other) BOOST_NOEXCEPT
-    {
-        pull_coroutine tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    inline bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete(); }
-
-    inline void swap( pull_coroutine & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    inline pull_coroutine & operator()()
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->pull();
-        return * this;
-    }
-
-    struct iterator;
-    struct const_iterator;
-};
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-template< typename Arg >
-push_coroutine< Arg >::push_coroutine( coroutine_fn fn,
-                                       attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, coroutine_fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename StackAllocator >
-push_coroutine< Arg >::push_coroutine( coroutine_fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, coroutine_fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-push_coroutine< Arg & >::push_coroutine( coroutine_fn fn,
-                                         attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, coroutine_fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename StackAllocator >
-push_coroutine< Arg & >::push_coroutine( coroutine_fn fn,
-                                         attributes const& attrs,
-                                         StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, coroutine_fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-inline push_coroutine< void >::push_coroutine( coroutine_fn fn,
-                                               attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, coroutine_fn, stack_allocator
-    >                                                               object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename StackAllocator >
-push_coroutine< void >::push_coroutine( coroutine_fn fn,
-                                        attributes const& attrs,
-                                        StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, coroutine_fn, StackAllocator
-    >                                                               object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< coroutine_fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-# endif
-template< typename Arg >
-template< typename Fn >
-push_coroutine< Arg >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, Fn, stack_allocator
-    >                                                    object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn, typename StackAllocator >
-push_coroutine< Arg >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, Fn, StackAllocator
-    >                                                    object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn >
-push_coroutine< Arg & >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                         attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, Fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn, typename StackAllocator >
-push_coroutine< Arg & >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                         attributes const& attrs,
-                                         StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, Fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Fn >
-push_coroutine< void >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                        attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, Fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Fn, typename StackAllocator >
-push_coroutine< void >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                        attributes const& attrs,
-                                        StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, Fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            boost::forward< Fn >( fn), attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-#else
-template< typename Arg >
-template< typename Fn >
-push_coroutine< Arg >::push_coroutine( Fn fn,
-                                       attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, Fn, stack_allocator
-    >                                                    object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn, typename StackAllocator >
-push_coroutine< Arg >::push_coroutine( Fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, Fn, StackAllocator
-    >                                                    object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn >
-push_coroutine< Arg & >::push_coroutine( Fn fn,
-                                         attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, Fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn, typename StackAllocator >
-push_coroutine< Arg & >::push_coroutine( Fn fn,
-                                         attributes const& attrs,
-                                         StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, Fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Fn >
-push_coroutine< void >::push_coroutine( Fn fn,
-                                        attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, Fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Fn, typename StackAllocator >
-push_coroutine< void >::push_coroutine( Fn fn,
-                                        attributes const& attrs,
-                                        StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, Fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn >
-push_coroutine< Arg >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, Fn, stack_allocator
-    >                                                    object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn, typename StackAllocator >
-push_coroutine< Arg >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg >, Arg, Fn, StackAllocator
-    >                                                    object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn >
-push_coroutine< Arg & >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                         attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, Fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Arg >
-template< typename Fn, typename StackAllocator >
-push_coroutine< Arg & >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                         attributes const& attrs,
-                                         StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< Arg & >, Arg &, Fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Fn >
-push_coroutine< void >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                        attributes const& attrs) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    stack_allocator stack_alloc;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, Fn, stack_allocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-
-template< typename Fn, typename StackAllocator >
-push_coroutine< void >::push_coroutine( BOOST_RV_REF( Fn) fn,
-                                        attributes const& attrs,
-                                        StackAllocator stack_alloc) :
-    impl_( 0)
-{
-    // create a stack-context
-    stack_context stack_ctx;
-    // allocate the coroutine-stack
-    stack_alloc.allocate( stack_ctx, attrs.size);
-    BOOST_ASSERT( 0 != stack_ctx.sp);
-    // typedef of internal coroutine-type
-    typedef detail::push_coroutine_object<
-        pull_coroutine< void >, void, Fn, StackAllocator
-    >                                                            object_t;
-    // reserve space on top of coroutine-stack for internal coroutine-type
-    std::size_t size = stack_ctx.size - sizeof( object_t);
-    BOOST_ASSERT( 0 != size);
-    void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-    BOOST_ASSERT( 0 != sp);
-    // placement new for internal coroutine
-    impl_ = new ( sp) object_t(
-            fn, attrs, detail::preallocated( sp, size, stack_ctx), stack_alloc); 
-    BOOST_ASSERT( impl_);
-}
-#endif
-
-template< typename R >
-void swap( pull_coroutine< R > & l, pull_coroutine< R > & r) BOOST_NOEXCEPT
-{ l.swap( r); }
-
-template< typename Arg >
-void swap( push_coroutine< Arg > & l, push_coroutine< Arg > & r) BOOST_NOEXCEPT
-{ l.swap( r); }
-
-template< typename R >
-typename pull_coroutine< R >::iterator
-range_begin( pull_coroutine< R > & c)
-{ return typename pull_coroutine< R >::iterator( & c); }
-
-template< typename R >
-typename pull_coroutine< R >::const_iterator
-range_begin( pull_coroutine< R > const& c)
-{ return typename pull_coroutine< R >::const_iterator( & c); }
-
-template< typename R >
-typename pull_coroutine< R >::iterator
-range_end( pull_coroutine< R > &)
-{ return typename pull_coroutine< R >::iterator(); }
-
-template< typename R >
-typename pull_coroutine< R >::const_iterator
-range_end( pull_coroutine< R > const&)
-{ return typename pull_coroutine< R >::const_iterator(); }
-
-template< typename Arg >
-typename push_coroutine< Arg >::iterator
-range_begin( push_coroutine< Arg > & c)
-{ return typename push_coroutine< Arg >::iterator( & c); }
-
-template< typename Arg >
-typename push_coroutine< Arg >::iterator
-range_end( push_coroutine< Arg > &)
-{ return typename push_coroutine< Arg >::iterator(); }
-
-template< typename T >
-struct asymmetric_coroutine
-{
-    typedef push_coroutine< T > push_type;
-    typedef pull_coroutine< T > pull_type;
-};
-
-// deprecated
-template< typename T >
-struct coroutine
-{
-    typedef push_coroutine< T > push_type;
-    typedef pull_coroutine< T > pull_type;
-};
-
-template< typename R >
-typename pull_coroutine< R >::iterator
-begin( pull_coroutine< R > & c)
-{ return coroutines::range_begin( c); }
-
-template< typename R >
-typename pull_coroutine< R >::const_iterator
-begin( pull_coroutine< R > const& c)
-{ return coroutines::range_begin( c); }
-
-template< typename R >
-typename pull_coroutine< R >::iterator
-end( pull_coroutine< R > & c)
-{ return coroutines::range_end( c); }
-
-template< typename R >
-typename pull_coroutine< R >::const_iterator
-end( pull_coroutine< R > const& c)
-{ return coroutines::range_end( c); }
-
-template< typename R >
-typename push_coroutine< R >::iterator
-begin( push_coroutine< R > & c)
-{ return coroutines::range_begin( c); }
-
-template< typename R >
-typename push_coroutine< R >::iterator
-end( push_coroutine< R > & c)
-{ return coroutines::range_end( c); }
-
-}
-
-// forward declaration of Boost.Range traits to break dependency on it
-template<typename C, typename Enabler>
-struct range_mutable_iterator;
-
-template<typename C, typename Enabler>
-struct range_const_iterator;
-
-template< typename Arg >
-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
-{ typedef typename coroutines::push_coroutine< Arg >::iterator type; };
-
-template< typename R >
-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
-{ typedef typename coroutines::pull_coroutine< R >::iterator type; };
-
-}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_ASYMMETRIC_COROUTINE_H
diff --git a/inst/include/boost/coroutine/attributes.hpp b/inst/include/boost/coroutine/attributes.hpp
deleted file mode 100644
index ca712ee68..000000000
--- a/inst/include/boost/coroutine/attributes.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_ATTRIBUTES_H
-#define BOOST_COROUTINES_ATTRIBUTES_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/flags.hpp>
-#include <boost/coroutine/stack_allocator.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-struct attributes
-{
-    std::size_t     size;
-    flag_unwind_t   do_unwind;
-
-    attributes() BOOST_NOEXCEPT :
-        size( stack_allocator::traits_type::default_size() ),
-        do_unwind( stack_unwind)
-    {}
-
-    explicit attributes( std::size_t size_) BOOST_NOEXCEPT :
-        size( size_),
-        do_unwind( stack_unwind)
-    {}
-
-    explicit attributes( flag_unwind_t do_unwind_) BOOST_NOEXCEPT :
-        size( stack_allocator::traits_type::default_size() ),
-        do_unwind( do_unwind_)
-    {}
-
-    explicit attributes(
-            std::size_t size_,
-            flag_unwind_t do_unwind_) BOOST_NOEXCEPT :
-        size( size_),
-        do_unwind( do_unwind_)
-    {}
-};
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_ATTRIBUTES_H
diff --git a/inst/include/boost/coroutine/coroutine.hpp b/inst/include/boost/coroutine/coroutine.hpp
deleted file mode 100644
index 076ffd26e..000000000
--- a/inst/include/boost/coroutine/coroutine.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_COROUTINE_H
-#define BOOST_COROUTINES_COROUTINE_H
-
-#include <boost/coroutine/asymmetric_coroutine.hpp>
-#include <boost/coroutine/symmetric_coroutine.hpp>
-
-#endif // BOOST_COROUTINES_COROUTINE_H
diff --git a/inst/include/boost/coroutine/detail/config.hpp b/inst/include/boost/coroutine/detail/config.hpp
deleted file mode 100644
index 13fcfb5cd..000000000
--- a/inst/include/boost/coroutine/detail/config.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_CONFIG_H
-#define BOOST_COROUTINES_DETAIL_CONFIG_H
-
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
-#ifdef BOOST_COROUTINES_DECL
-# undef BOOST_COROUTINES_DECL
-#endif
-
-#if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_COROUTINES_DYN_LINK) ) && ! defined(BOOST_COROUTINES_STATIC_LINK)
-# if defined(BOOST_COROUTINES_SOURCE)
-#  define BOOST_COROUTINES_DECL BOOST_SYMBOL_EXPORT
-#  define BOOST_COROUTINES_BUILD_DLL
-# else
-#  define BOOST_COROUTINES_DECL BOOST_SYMBOL_IMPORT
-# endif
-#endif
-
-#if ! defined(BOOST_COROUTINES_DECL)
-# define BOOST_COROUTINES_DECL
-#endif
-
-#if ! defined(BOOST_COROUTINES_SOURCE) && ! defined(BOOST_ALL_NO_LIB) && ! defined(BOOST_COROUTINES_NO_LIB)
-# define BOOST_LIB_NAME boost_coroutine
-# if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_COROUTINES_DYN_LINK)
-#  define BOOST_DYN_LINK
-# endif
-# include <boost/config/auto_link.hpp>
-#endif
-
-#define BOOST_COROUTINES_UNIDIRECT
-#define BOOST_COROUTINES_SYMMETRIC
-
-#if defined(__OpenBSD__)
-// stacks need mmap(2) with MAP_STACK
-# define BOOST_COROUTINES_USE_MAP_STACK
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_CONFIG_H
diff --git a/inst/include/boost/coroutine/detail/coroutine_context.hpp b/inst/include/boost/coroutine/detail/coroutine_context.hpp
deleted file mode 100644
index 2d2b60ace..000000000
--- a/inst/include/boost/coroutine/detail/coroutine_context.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_COROUTINE_CONTEXT_H
-#define BOOST_COROUTINES_DETAIL_COROUTINE_CONTEXT_H
-
-#include <cstddef>
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/context/detail/fcontext.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/preallocated.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-// class hold stack-context and coroutines execution-context
-class BOOST_COROUTINES_DECL coroutine_context
-{
-private:
-    template< typename Coro >
-    friend void trampoline( context::detail::transfer_t);
-    template< typename Coro >
-    friend void trampoline_void( context::detail::transfer_t);
-    template< typename Coro >
-    friend void trampoline_pull( context::detail::transfer_t);
-    template< typename Coro >
-    friend void trampoline_push( context::detail::transfer_t);
-    template< typename Coro >
-    friend void trampoline_push_void( context::detail::transfer_t);
-
-    preallocated            palloc_;
-    context::detail::fcontext_t     ctx_;
-
-public:
-    typedef void( * ctx_fn)( context::detail::transfer_t);
-
-    // default ctor represents the current execution-context
-    coroutine_context();
-
-    // ctor creates a new execution-context running coroutine-fn `fn`
-    // `ctx_` will be allocated on top of the stack managed by parameter
-    // `stack_ctx`
-    coroutine_context( ctx_fn fn, preallocated const& palloc);
-
-    coroutine_context( coroutine_context const&);
-
-    coroutine_context& operator=( coroutine_context const&);
-
-    void * jump( coroutine_context &, void * = 0);
-
-    stack_context & stack_ctx()
-    { return palloc_.sctx; }
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_COROUTINE_CONTEXT_H
diff --git a/inst/include/boost/coroutine/detail/data.hpp b/inst/include/boost/coroutine/detail/data.hpp
deleted file mode 100644
index 7c008fe83..000000000
--- a/inst/include/boost/coroutine/detail/data.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_DATA_H
-#define BOOST_COROUTINES_DETAIL_DATA_H
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/coroutine_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-struct data_t
-{
-    coroutine_context   *   from;
-    void                *   data;
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_DATA_H
diff --git a/inst/include/boost/coroutine/detail/flags.hpp b/inst/include/boost/coroutine/detail/flags.hpp
deleted file mode 100644
index 2078b6236..000000000
--- a/inst/include/boost/coroutine/detail/flags.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_FLAGS_H
-#define BOOST_COROUTINES_DETAIL_FLAGS_H
-
-#include <boost/config.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-enum flag_t
-{
-    flag_started        = 1 << 1,
-    flag_running        = 1 << 2,
-    flag_complete       = 1 << 3,
-    flag_unwind_stack   = 1 << 4,
-    flag_force_unwind   = 1 << 5
-};
-
-struct unwind_t
-{
-    enum flag_t
-    { force_unwind = 1 };
-};
-
-struct synthesized_t
-{
-    enum flag_t
-    { syntesized = 1 };
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_FLAGS_H
diff --git a/inst/include/boost/coroutine/detail/parameters.hpp b/inst/include/boost/coroutine/detail/parameters.hpp
deleted file mode 100644
index 8bad3910a..000000000
--- a/inst/include/boost/coroutine/detail/parameters.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PARAMETERS_H
-#define BOOST_COROUTINES_DETAIL_PARAMETERS_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/flags.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename Data >
-struct parameters
-{
-    Data                *   data;
-    bool                    do_unwind;
-    void                *   coro;
-
-    parameters() :
-        data( 0), do_unwind( false), coro( 0)
-    {}
-
-    explicit parameters( void * coro_) :
-        data( 0), do_unwind( false), coro( coro_)
-    { BOOST_ASSERT( 0 != coro); }
-
-    explicit parameters( Data * data_, void * coro_) :
-        data( data_), do_unwind( false), coro( coro_)
-    {
-        BOOST_ASSERT( 0 != data);
-        BOOST_ASSERT( 0 != coro);
-    }
-
-    explicit parameters( unwind_t::flag_t) :
-        data( 0), do_unwind( true)
-    {}
-};
-
-template< typename Data >
-struct parameters< Data & >
-{
-    Data                *   data;
-    bool                    do_unwind;
-    void                *   coro;
-
-    parameters() :
-        data( 0), do_unwind( false), coro( 0)
-    {}
-
-    explicit parameters( void * coro_) :
-        data( 0), do_unwind( false), coro( coro_)
-    { BOOST_ASSERT( 0 != coro); }
-
-    explicit parameters( Data * data_, void * coro_) :
-        data( data_), do_unwind( false), coro( coro_)
-    {
-        BOOST_ASSERT( 0 != data);
-        BOOST_ASSERT( 0 != coro);
-    }
-
-    explicit parameters( unwind_t::flag_t) :
-        data( 0), do_unwind( true), coro( 0)
-    {}
-};
-
-template<>
-struct parameters< void >
-{
-    bool                    do_unwind;
-    void                *   coro;
-
-    parameters() :
-        do_unwind( false), coro(0)
-    {}
-
-    parameters( void * coro_) :
-        do_unwind( false), coro( coro_)
-    { BOOST_ASSERT( 0 != coro); }
-
-    explicit parameters( unwind_t::flag_t) :
-        do_unwind( true), coro( 0)
-    {}
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PARAMETERS_H
diff --git a/inst/include/boost/coroutine/detail/preallocated.hpp b/inst/include/boost/coroutine/detail/preallocated.hpp
deleted file mode 100644
index a18acd374..000000000
--- a/inst/include/boost/coroutine/detail/preallocated.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-
-//          Copyright Oliver Kowalke 2015.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PREALLOCATED_H
-#define BOOST_COROUTINES_DETAIL_PREALLOCATED_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-struct BOOST_COROUTINES_DECL preallocated {
-    void        *   sp;
-    std::size_t     size;
-    stack_context   sctx;
-
-    preallocated() BOOST_NOEXCEPT :
-        sp( 0), size( 0), sctx() {
-    }
-
-    preallocated( void * sp_, std::size_t size_, stack_context sctx_) BOOST_NOEXCEPT :
-        sp( sp_), size( size_), sctx( sctx_) {
-    }
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PREALLOCATED_H
diff --git a/inst/include/boost/coroutine/detail/pull_coroutine_impl.hpp b/inst/include/boost/coroutine/detail/pull_coroutine_impl.hpp
deleted file mode 100644
index e35b7894e..000000000
--- a/inst/include/boost/coroutine/detail/pull_coroutine_impl.hpp
+++ /dev/null
@@ -1,335 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PULL_COROUTINE_IMPL_H
-#define BOOST_COROUTINES_DETAIL_PULL_COROUTINE_IMPL_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/exception_ptr.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/utility.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/parameters.hpp>
-#include <boost/coroutine/detail/trampoline_pull.hpp>
-#include <boost/coroutine/exceptions.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-struct stack_context;
-
-namespace detail {
-
-template< typename R >
-class pull_coroutine_impl : private noncopyable
-{
-protected:
-    int                     flags_;
-    exception_ptr           except_;
-    coroutine_context   *   caller_;
-    coroutine_context   *   callee_;
-    R                   *   result_;
-
-public:
-    typedef parameters< R >                           param_type;
-
-    pull_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee),
-        result_( 0)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    pull_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind,
-                         R * result) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee),
-        result_( result)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~pull_coroutine_impl() {}
-
-    bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            param_type to( unwind_t::force_unwind);
-            caller_->jump(
-                * callee_,
-                & to);
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    void pull()
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        result_ = from->data;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    bool has_result() const
-    { return 0 != result_; }
-
-    R get() const
-    {
-        if ( ! has_result() )
-            boost::throw_exception(
-                invalid_result() );
-        return * result_;
-    }
-
-    R * get_pointer() const
-    {
-        if ( ! has_result() )
-            boost::throw_exception(
-                invalid_result() );
-        return result_;
-    }
-
-    virtual void destroy() = 0;
-};
-
-template< typename R >
-class pull_coroutine_impl< R & > : private noncopyable
-{
-protected:
-    int                     flags_;
-    exception_ptr           except_;
-    coroutine_context   *   caller_;
-    coroutine_context   *   callee_;
-    R                   *   result_;
-
-public:
-    typedef parameters< R & >                           param_type;
-
-    pull_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee),
-        result_( 0)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    pull_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind,
-                         R * result) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee),
-        result_( result)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~pull_coroutine_impl() {}
-
-    bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            param_type to( unwind_t::force_unwind);
-            caller_->jump(
-                * callee_,
-                & to);
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    void pull()
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        result_ = from->data;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    bool has_result() const
-    { return 0 != result_; }
-
-    R & get() const
-    {
-        if ( ! has_result() )
-            boost::throw_exception(
-                invalid_result() );
-        return * result_;
-    }
-
-    R * get_pointer() const
-    {
-        if ( ! has_result() )
-            boost::throw_exception(
-                invalid_result() );
-        return result_;
-    }
-
-    virtual void destroy() = 0;
-};
-
-template<>
-class pull_coroutine_impl< void > : private noncopyable
-{
-protected:
-    int                     flags_;
-    exception_ptr           except_;
-    coroutine_context   *   caller_;
-    coroutine_context   *   callee_;
-
-public:
-    typedef parameters< void >      param_type;
-
-    pull_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~pull_coroutine_impl() {}
-
-    inline bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    inline bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    inline bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    inline bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    inline bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    inline void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            param_type to( unwind_t::force_unwind);
-            caller_->jump(
-                * callee_,
-                & to);
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    inline void pull()
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    virtual void destroy() = 0;
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PULL_COROUTINE_IMPL_H
diff --git a/inst/include/boost/coroutine/detail/pull_coroutine_object.hpp b/inst/include/boost/coroutine/detail/pull_coroutine_object.hpp
deleted file mode 100644
index c4bb2c45b..000000000
--- a/inst/include/boost/coroutine/detail/pull_coroutine_object.hpp
+++ /dev/null
@@ -1,323 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PULL_COROUTINE_OBJECT_H
-#define BOOST_COROUTINES_DETAIL_PULL_COROUTINE_OBJECT_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/context/detail/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/exception_ptr.hpp>
-#include <boost/move/move.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/preallocated.hpp>
-#include <boost/coroutine/detail/pull_coroutine_impl.hpp>
-#include <boost/coroutine/detail/trampoline_pull.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/flags.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-#if defined(BOOST_MSVC)
-# pragma warning(push)
-# pragma warning(disable:4355)
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-struct pull_coroutine_context
-{
-    coroutine_context   caller;
-    coroutine_context   callee;
-
-    template< typename Coro >
-    pull_coroutine_context( preallocated const& palloc, Coro *) :
-        caller(),
-        callee( trampoline_pull< Coro >, palloc)
-    {}
-};
-
-template< typename PushCoro, typename R, typename Fn, typename StackAllocator >
-class pull_coroutine_object : private pull_coroutine_context,
-                              public pull_coroutine_impl< R >
-{
-private:
-    typedef pull_coroutine_context                                      ctx_t;
-    typedef pull_coroutine_impl< R >                                    base_t;
-    typedef pull_coroutine_object< PushCoro, R, Fn, StackAllocator >    obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    pull_coroutine_object( Fn fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    pull_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run()
-    {
-        BOOST_ASSERT( ! base_t::unwind_requested() );
-
-        base_t::flags_ |= flag_started;
-        base_t::flags_ |= flag_running;
-
-        // create push_coroutine
-        typename PushCoro::synth_type b( & this->callee, & this->caller, false);
-        PushCoro push_coro( synthesized_t::syntesized, b);
-        try
-        { fn_( push_coro); }
-        catch ( forced_unwind const&)
-        {}
-#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
-        catch ( abi::__forced_unwind const&)
-        { throw; }
-#endif
-        catch (...)
-        { base_t::except_ = current_exception(); }
-
-        base_t::flags_ |= flag_complete;
-        base_t::flags_ &= ~flag_running;
-        typename base_t::param_type to;
-        this->callee.jump(
-            this->caller,
-            & to);
-        BOOST_ASSERT_MSG( false, "pull_coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-template< typename PushCoro, typename R, typename Fn, typename StackAllocator >
-class pull_coroutine_object< PushCoro, R &, Fn, StackAllocator > : private pull_coroutine_context,
-                                                                   public pull_coroutine_impl< R & >
-{
-private:
-    typedef pull_coroutine_context                                      ctx_t;
-    typedef pull_coroutine_impl< R & >                                  base_t;
-    typedef pull_coroutine_object< PushCoro, R &, Fn, StackAllocator >  obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    pull_coroutine_object( Fn fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    pull_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run()
-    {
-        BOOST_ASSERT( ! base_t::unwind_requested() );
-
-        base_t::flags_ |= flag_started;
-        base_t::flags_ |= flag_running;
-
-        // create push_coroutine
-        typename PushCoro::synth_type b( & this->callee, & this->caller, false);
-        PushCoro push_coro( synthesized_t::syntesized, b);
-        try
-        { fn_( push_coro); }
-        catch ( forced_unwind const&)
-        {}
-#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
-        catch ( abi::__forced_unwind const&)
-        { throw; }
-#endif
-        catch (...)
-        { base_t::except_ = current_exception(); }
-
-        base_t::flags_ |= flag_complete;
-        base_t::flags_ &= ~flag_running;
-        typename base_t::param_type to;
-        this->callee.jump(
-            this->caller,
-            & to);
-        BOOST_ASSERT_MSG( false, "pull_coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-template< typename PushCoro, typename Fn, typename StackAllocator >
-class pull_coroutine_object< PushCoro, void, Fn, StackAllocator > : private pull_coroutine_context,
-                                                                    public pull_coroutine_impl< void >
-{
-private:
-    typedef pull_coroutine_context                                      ctx_t;
-    typedef pull_coroutine_impl< void >                                 base_t;
-    typedef pull_coroutine_object< PushCoro, void, Fn, StackAllocator > obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    pull_coroutine_object( Fn fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    pull_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run()
-    {
-        BOOST_ASSERT( ! base_t::unwind_requested() );
-
-        base_t::flags_ |= flag_started;
-        base_t::flags_ |= flag_running;
-
-        // create push_coroutine
-        typename PushCoro::synth_type b( & this->callee, & this->caller, false);
-        PushCoro push_coro( synthesized_t::syntesized, b);
-        try
-        { fn_( push_coro); }
-        catch ( forced_unwind const&)
-        {}
-#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
-        catch ( abi::__forced_unwind const&)
-        { throw; }
-#endif
-        catch (...)
-        { base_t::except_ = current_exception(); }
-
-        base_t::flags_ |= flag_complete;
-        base_t::flags_ &= ~flag_running;
-        typename base_t::param_type to;
-        this->callee.jump(
-            this->caller,
-            & to);
-        BOOST_ASSERT_MSG( false, "pull_coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-}}}
-
-#if defined(BOOST_MSVC)
-# pragma warning(pop)
-#endif
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PULL_COROUTINE_OBJECT_H
diff --git a/inst/include/boost/coroutine/detail/pull_coroutine_synthesized.hpp b/inst/include/boost/coroutine/detail/pull_coroutine_synthesized.hpp
deleted file mode 100644
index 313de3c2d..000000000
--- a/inst/include/boost/coroutine/detail/pull_coroutine_synthesized.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PULL_COROUTINE_SYNTHESIZED_H
-#define BOOST_COROUTINES_DETAIL_PULL_COROUTINE_SYNTHESIZED_H
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/pull_coroutine_impl.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename R >
-class pull_coroutine_synthesized : public pull_coroutine_impl< R >
-{
-private:
-    typedef pull_coroutine_impl< R >                                    impl_t;
-
-public:
-    pull_coroutine_synthesized( coroutine_context * caller,
-                                coroutine_context * callee,
-                                bool unwind,
-                                R * result) :
-        impl_t( caller, callee, unwind, result)
-    {}
-
-    void destroy() {}
-};
-
-template< typename R >
-class pull_coroutine_synthesized< R & > : public pull_coroutine_impl< R & >
-{
-private:
-    typedef pull_coroutine_impl< R & >                                    impl_t;
-
-public:
-    pull_coroutine_synthesized( coroutine_context * caller,
-                                coroutine_context * callee,
-                                bool unwind,
-                                R * result) :
-        impl_t( caller, callee, unwind, result)
-    {}
-
-    void destroy() {}
-};
-
-template<>
-class pull_coroutine_synthesized< void > : public pull_coroutine_impl< void >
-{
-private:
-    typedef pull_coroutine_impl< void >                                    impl_t;
-
-public:
-    pull_coroutine_synthesized( coroutine_context * caller,
-                                coroutine_context * callee,
-                                bool unwind) :
-        impl_t( caller, callee, unwind)
-    {}
-
-    inline void destroy() {}
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PULL_COROUTINE_SYNTHESIZED_H
diff --git a/inst/include/boost/coroutine/detail/push_coroutine_impl.hpp b/inst/include/boost/coroutine/detail/push_coroutine_impl.hpp
deleted file mode 100644
index 21c1df469..000000000
--- a/inst/include/boost/coroutine/detail/push_coroutine_impl.hpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_IMPL_H
-#define BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_IMPL_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/exception_ptr.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/utility.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/parameters.hpp>
-#include <boost/coroutine/detail/trampoline_push.hpp>
-#include <boost/coroutine/exceptions.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-struct stack_context;
-
-namespace detail {
-
-template< typename Arg >
-class push_coroutine_impl : private noncopyable
-{
-protected:
-    int                     flags_;
-    exception_ptr           except_;
-    coroutine_context   *   caller_;
-    coroutine_context   *   callee_;
-
-public:
-    typedef parameters< Arg >                           param_type;
-
-    push_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~push_coroutine_impl() {}
-
-    bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            param_type to( unwind_t::force_unwind);
-            caller_->jump(
-                * callee_,
-                & to);
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    void push( Arg const& arg)
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( const_cast< Arg * >( & arg), this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    void push( BOOST_RV_REF( Arg) arg)
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( const_cast< Arg * >( & arg), this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    virtual void destroy() = 0;
-};
-
-template< typename Arg >
-class push_coroutine_impl< Arg & > : private noncopyable
-{
-protected:
-    int                     flags_;
-    exception_ptr           except_;
-    coroutine_context   *   caller_;
-    coroutine_context   *   callee_;
-
-public:
-    typedef parameters< Arg & >                         param_type;
-
-    push_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~push_coroutine_impl() {}
-
-    bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            param_type to( unwind_t::force_unwind);
-            caller_->jump(
-                * callee_,
-                & to);
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    void push( Arg & arg)
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( & arg, this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    virtual void destroy() = 0;
-};
-
-template<>
-class push_coroutine_impl< void > : private noncopyable
-{
-protected:
-    int                     flags_;
-    exception_ptr           except_;
-    coroutine_context   *   caller_;
-    coroutine_context   *   callee_;
-
-public:
-    typedef parameters< void >                          param_type;
-
-    push_coroutine_impl( coroutine_context * caller,
-                         coroutine_context * callee,
-                         bool unwind) :
-        flags_( 0),
-        except_(),
-        caller_( caller),
-        callee_( callee)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~push_coroutine_impl() {}
-
-    inline bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    inline bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    inline bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    inline bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    inline bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    inline void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            param_type to( unwind_t::force_unwind);
-            caller_->jump(
-                * callee_,
-                & to);
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    inline void push()
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        param_type to( this);
-        param_type * from(
-            static_cast< param_type * >(
-                caller_->jump(
-                    * callee_,
-                    & to) ) );
-        flags_ &= ~flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        if ( except_) rethrow_exception( except_);
-    }
-
-    virtual void destroy() = 0;
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_IMPL_H
diff --git a/inst/include/boost/coroutine/detail/push_coroutine_object.hpp b/inst/include/boost/coroutine/detail/push_coroutine_object.hpp
deleted file mode 100644
index d06202292..000000000
--- a/inst/include/boost/coroutine/detail/push_coroutine_object.hpp
+++ /dev/null
@@ -1,335 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_OBJECT_H
-#define BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_OBJECT_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/context/detail/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/exception_ptr.hpp>
-#include <boost/move/move.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/preallocated.hpp>
-#include <boost/coroutine/detail/push_coroutine_impl.hpp>
-#include <boost/coroutine/detail/trampoline_push.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/flags.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-#if defined(BOOST_MSVC)
-# pragma warning(push)
-# pragma warning(disable:4355)
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-struct push_coroutine_context
-{
-    coroutine_context   caller;
-    coroutine_context   callee;
-
-    template< typename Coro >
-    push_coroutine_context( preallocated const& palloc, Coro *) :
-        caller(),
-        callee( trampoline_push< Coro >, palloc)
-    {}
-};
-
-struct push_coroutine_context_void
-{
-    coroutine_context   caller;
-    coroutine_context   callee;
-
-    template< typename Coro >
-    push_coroutine_context_void( preallocated const& palloc, Coro *) :
-        caller(),
-        callee( trampoline_push_void< Coro >, palloc)
-    {}
-};
-
-template< typename PullCoro, typename R, typename Fn, typename StackAllocator >
-class push_coroutine_object : private push_coroutine_context,
-                              public push_coroutine_impl< R >
-{
-private:
-    typedef push_coroutine_context                                      ctx_t;
-    typedef push_coroutine_impl< R >                                    base_t;
-    typedef push_coroutine_object< PullCoro, R, Fn, StackAllocator >    obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    push_coroutine_object( Fn fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    push_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run( R * result)
-    {
-        BOOST_ASSERT( ! base_t::unwind_requested() );
-
-        base_t::flags_ |= flag_started;
-        base_t::flags_ |= flag_running;
-
-        // create push_coroutine
-        typename PullCoro::synth_type b( & this->callee, & this->caller, false, result);
-        PullCoro pull_coro( synthesized_t::syntesized, b);
-        try
-        { fn_( pull_coro); }
-        catch ( forced_unwind const&)
-        {}
-#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
-        catch ( abi::__forced_unwind const&)
-        { throw; }
-#endif
-        catch (...)
-        { base_t::except_ = current_exception(); }
-
-        base_t::flags_ |= flag_complete;
-        base_t::flags_ &= ~flag_running;
-        typename base_t::param_type to;
-        this->callee.jump(
-            this->caller,
-            & to);
-        BOOST_ASSERT_MSG( false, "pull_coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-template< typename PullCoro, typename R, typename Fn, typename StackAllocator >
-class push_coroutine_object< PullCoro, R &, Fn, StackAllocator > : private push_coroutine_context,
-                                                                   public push_coroutine_impl< R & >
-{
-private:
-    typedef push_coroutine_context                                          ctx_t;
-    typedef push_coroutine_impl< R & >                                      base_t;
-    typedef push_coroutine_object< PullCoro, R &, Fn, StackAllocator >      obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    push_coroutine_object( Fn fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    push_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run( R * result)
-    {
-        BOOST_ASSERT( ! base_t::unwind_requested() );
-
-        base_t::flags_ |= flag_started;
-        base_t::flags_ |= flag_running;
-
-        // create push_coroutine
-        typename PullCoro::synth_type b( & this->callee, & this->caller, false, result);
-        PullCoro push_coro( synthesized_t::syntesized, b);
-        try
-        { fn_( push_coro); }
-        catch ( forced_unwind const&)
-        {}
-#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
-        catch ( abi::__forced_unwind const&)
-        { throw; }
-#endif
-        catch (...)
-        { base_t::except_ = current_exception(); }
-
-        base_t::flags_ |= flag_complete;
-        base_t::flags_ &= ~flag_running;
-        typename base_t::param_type to;
-        this->callee.jump(
-            this->caller,
-            & to);
-        BOOST_ASSERT_MSG( false, "pull_coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-template< typename PullCoro, typename Fn, typename StackAllocator >
-class push_coroutine_object< PullCoro, void, Fn, StackAllocator > : private push_coroutine_context_void,
-                                                                    public push_coroutine_impl< void >
-{
-private:
-    typedef push_coroutine_context_void                                     ctx_t;
-    typedef push_coroutine_impl< void >                                     base_t;
-    typedef push_coroutine_object< PullCoro, void, Fn, StackAllocator >     obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    push_coroutine_object( Fn fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    push_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                           preallocated const& palloc,
-                           StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        ctx_t( palloc, this),
-        base_t( & this->caller,
-                & this->callee,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run()
-    {
-        BOOST_ASSERT( ! base_t::unwind_requested() );
-
-        base_t::flags_ |= flag_started;
-        base_t::flags_ |= flag_running;
-
-        // create push_coroutine
-        typename PullCoro::synth_type b( & this->callee, & this->caller, false);
-        PullCoro push_coro( synthesized_t::syntesized, b);
-        try
-        { fn_( push_coro); }
-        catch ( forced_unwind const&)
-        {}
-#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
-        catch ( abi::__forced_unwind const&)
-        { throw; }
-#endif
-        catch (...)
-        { base_t::except_ = current_exception(); }
-
-        base_t::flags_ |= flag_complete;
-        base_t::flags_ &= ~flag_running;
-        typename base_t::param_type to;
-        this->callee.jump(
-            this->caller,
-            & to);
-        BOOST_ASSERT_MSG( false, "pull_coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-}}}
-
-#if defined(BOOST_MSVC)
-# pragma warning(pop)
-#endif
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_OBJECT_H
diff --git a/inst/include/boost/coroutine/detail/push_coroutine_synthesized.hpp b/inst/include/boost/coroutine/detail/push_coroutine_synthesized.hpp
deleted file mode 100644
index c10a468b9..000000000
--- a/inst/include/boost/coroutine/detail/push_coroutine_synthesized.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_SYNTHESIZED_H
-#define BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_SYNTHESIZED_H
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/push_coroutine_impl.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename R >
-class push_coroutine_synthesized : public push_coroutine_impl< R >
-{
-private:
-    typedef push_coroutine_impl< R >                                    impl_t;
-
-public:
-    push_coroutine_synthesized( coroutine_context * caller,
-                                coroutine_context * callee,
-                                bool unwind) :
-        impl_t( caller, callee, unwind)
-    {}
-
-    void destroy() {}
-};
-
-template< typename R >
-class push_coroutine_synthesized< R & > : public push_coroutine_impl< R & >
-{
-private:
-    typedef push_coroutine_impl< R & >                                    impl_t;
-
-public:
-    push_coroutine_synthesized( coroutine_context * caller,
-                                coroutine_context * callee,
-                                bool unwind) :
-        impl_t( caller, callee, unwind)
-    {}
-
-    void destroy() {}
-};
-
-template<>
-class push_coroutine_synthesized< void > : public push_coroutine_impl< void >
-{
-private:
-    typedef push_coroutine_impl< void >                                    impl_t;
-
-public:
-    push_coroutine_synthesized( coroutine_context * caller,
-                                coroutine_context * callee,
-                                bool unwind) :
-        impl_t( caller, callee, unwind)
-    {}
-
-    inline void destroy() {}
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_PUSH_COROUTINE_SYNTHESIZED_H
diff --git a/inst/include/boost/coroutine/detail/setup.hpp b/inst/include/boost/coroutine/detail/setup.hpp
deleted file mode 100644
index 35f601a77..000000000
--- a/inst/include/boost/coroutine/detail/setup.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_SETUP_H
-#define BOOST_COROUTINES_DETAIL_SETUP_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/move/move.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/coroutine/attributes.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename Fn >
-struct setup
-{
-    struct dummy {};
-
-    Fn                      fn;
-    coroutine_context   *   caller;
-    coroutine_context   *   callee;
-    attributes              attr;
-
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    setup( Fn fn_,
-           coroutine_context * caller_,
-           coroutine_context * callee_,
-           attributes const& attr_) :
-        fn( boost::forward< Fn >( fn_) ),
-        caller( caller_),
-        callee( callee_),
-        attr( attr_)
-    {}
-#endif
-    setup( BOOST_RV_REF( Fn) fn_,
-           coroutine_context * caller_,
-           coroutine_context * callee_,
-           attributes const& attr_,
-           typename disable_if<
-               is_same< typename decay< Fn >::type, setup >,
-               dummy*
-           >::type = 0) :
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn( fn_),
-#else
-        fn( boost::forward< Fn >( fn_) ),
-#endif
-        caller( caller_),
-        callee( callee_),
-        attr( attr_)
-    {}
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_SETUP_H
diff --git a/inst/include/boost/coroutine/detail/symmetric_coroutine_call.hpp b/inst/include/boost/coroutine/detail/symmetric_coroutine_call.hpp
deleted file mode 100644
index 3a9e4e6f9..000000000
--- a/inst/include/boost/coroutine/detail/symmetric_coroutine_call.hpp
+++ /dev/null
@@ -1,811 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_CALL_H
-#define BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_CALL_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/move/move.hpp>
-#include <boost/utility/explicit_operator_bool.hpp>
-
-#include <boost/coroutine/attributes.hpp>
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/preallocated.hpp>
-#include <boost/coroutine/detail/symmetric_coroutine_impl.hpp>
-#include <boost/coroutine/detail/symmetric_coroutine_object.hpp>
-#include <boost/coroutine/detail/symmetric_coroutine_yield.hpp>
-#include <boost/coroutine/stack_allocator.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename Arg >
-class symmetric_coroutine_call
-{
-private:
-    template< typename X >
-    friend class symmetric_coroutine_yield;
-
-    typedef symmetric_coroutine_impl< Arg >   impl_type;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( symmetric_coroutine_call)
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-public:
-    typedef Arg                                value_type;
-    typedef symmetric_coroutine_yield< Arg >   yield_type;
-
-    symmetric_coroutine_call() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( yield_type &);
-
-    explicit symmetric_coroutine_call( coroutine_fn fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, coroutine_fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< coroutine_fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename StackAllocator >
-    explicit symmetric_coroutine_call( coroutine_fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, coroutine_fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< coroutine_fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-# endif
-    template< typename Fn >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< Fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< Fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-#else
-    template< typename Fn >
-    explicit symmetric_coroutine_call( Fn fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( Fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-#endif
-
-    ~symmetric_coroutine_call()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    symmetric_coroutine_call( BOOST_RV_REF( symmetric_coroutine_call) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    symmetric_coroutine_call & operator=( BOOST_RV_REF( symmetric_coroutine_call) other) BOOST_NOEXCEPT
-    {
-        symmetric_coroutine_call tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete() || impl_->is_running(); }
-
-    void swap( symmetric_coroutine_call & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    symmetric_coroutine_call & operator()( Arg arg) BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->resume( arg);
-        return * this;
-    }
-};
-
-template< typename Arg >
-class symmetric_coroutine_call< Arg & >
-{
-private:
-    template< typename X >
-    friend class symmetric_coroutine_yield;
-
-    typedef symmetric_coroutine_impl< Arg & >     impl_type;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( symmetric_coroutine_call)
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-public:
-    typedef Arg                                    value_type;
-    typedef symmetric_coroutine_yield< Arg & >     yield_type;
-
-    symmetric_coroutine_call() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( yield_type &);
-
-    explicit symmetric_coroutine_call( coroutine_fn fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, coroutine_fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< coroutine_fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename StackAllocator >
-    explicit symmetric_coroutine_call( coroutine_fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, coroutine_fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< coroutine_fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-# endif
-    template< typename Fn >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< Fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< Fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-#else
-    template< typename Fn >
-    explicit symmetric_coroutine_call( Fn fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( Fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< Arg &, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-#endif
-
-    ~symmetric_coroutine_call()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    symmetric_coroutine_call( BOOST_RV_REF( symmetric_coroutine_call) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    symmetric_coroutine_call & operator=( BOOST_RV_REF( symmetric_coroutine_call) other) BOOST_NOEXCEPT
-    {
-        symmetric_coroutine_call tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete() || impl_->is_running(); }
-
-    void swap( symmetric_coroutine_call & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    symmetric_coroutine_call & operator()( Arg & arg) BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->resume( arg);
-        return * this;
-    }
-};
-
-template<>
-class symmetric_coroutine_call< void >
-{
-private:
-    template< typename X >
-    friend class symmetric_coroutine_yield;
-
-    typedef symmetric_coroutine_impl< void >        impl_type;
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( symmetric_coroutine_call)
-
-    struct dummy {};
-
-    impl_type       *   impl_;
-
-public:
-    typedef void                                     value_type;
-    typedef symmetric_coroutine_yield< void >        yield_type;
-
-    symmetric_coroutine_call() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-# ifdef BOOST_MSVC
-    typedef void ( * coroutine_fn)( yield_type &);
-
-    explicit symmetric_coroutine_call( coroutine_fn fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, coroutine_fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< coroutine_fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename StackAllocator >
-    explicit symmetric_coroutine_call( coroutine_fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, coroutine_fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< coroutine_fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-# endif
-    template< typename Fn >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< Fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    boost::forward< Fn >( fn), attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-#else
-    template< typename Fn >
-    explicit symmetric_coroutine_call( Fn fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( Fn fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs = attributes(),
-                                       stack_allocator stack_alloc = stack_allocator() ) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, Fn, stack_allocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-
-    template< typename Fn, typename StackAllocator >
-    explicit symmetric_coroutine_call( BOOST_RV_REF( Fn) fn,
-                                       attributes const& attrs,
-                                       StackAllocator stack_alloc) :
-        impl_( 0)
-    {
-        // create a stack-context
-        stack_context stack_ctx;
-        // allocate the coroutine-stack
-        stack_alloc.allocate( stack_ctx, attrs.size);
-        BOOST_ASSERT( 0 != stack_ctx.sp);
-        // typedef of internal coroutine-type
-        typedef symmetric_coroutine_object< void, Fn, StackAllocator > object_t;
-        // reserve space on top of coroutine-stack for internal coroutine-type
-        std::size_t size = stack_ctx.size - sizeof( object_t);
-        BOOST_ASSERT( 0 != size);
-        void * sp = static_cast< char * >( stack_ctx.sp) - sizeof( object_t);
-        BOOST_ASSERT( 0 != sp);
-        // placement new for internal coroutine
-        impl_ = new ( sp) object_t(
-                    fn, attrs, preallocated( sp, size, stack_ctx), stack_alloc); 
-        BOOST_ASSERT( impl_);
-    }
-#endif
-
-    ~symmetric_coroutine_call()
-    {
-        if ( 0 != impl_)
-        {
-            impl_->destroy();
-            impl_ = 0;
-        }
-    }
-
-    inline symmetric_coroutine_call( BOOST_RV_REF( symmetric_coroutine_call) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    inline symmetric_coroutine_call & operator=( BOOST_RV_REF( symmetric_coroutine_call) other) BOOST_NOEXCEPT
-    {
-        symmetric_coroutine_call tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    inline bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_ || impl_->is_complete() || impl_->is_running(); }
-
-    inline void swap( symmetric_coroutine_call & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    inline symmetric_coroutine_call & operator()() BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( * this);
-
-        impl_->resume();
-        return * this;
-    }
-};
-
-template< typename Arg >
-void swap( symmetric_coroutine_call< Arg > & l,
-           symmetric_coroutine_call< Arg > & r)
-{ l.swap( r); }
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_CALL_H
diff --git a/inst/include/boost/coroutine/detail/symmetric_coroutine_impl.hpp b/inst/include/boost/coroutine/detail/symmetric_coroutine_impl.hpp
deleted file mode 100644
index b4066d8f7..000000000
--- a/inst/include/boost/coroutine/detail/symmetric_coroutine_impl.hpp
+++ /dev/null
@@ -1,449 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_IMPL_H
-#define BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_IMPL_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/utility.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/coroutine_context.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/parameters.hpp>
-#include <boost/coroutine/detail/preallocated.hpp>
-#include <boost/coroutine/detail/trampoline.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename R >
-class symmetric_coroutine_impl : private noncopyable
-{
-public:
-    typedef parameters< R >                           param_type;
-
-    symmetric_coroutine_impl( preallocated const& palloc,
-                              bool unwind) BOOST_NOEXCEPT :
-        flags_( 0),
-        caller_(),
-        callee_( trampoline< symmetric_coroutine_impl< R > >, palloc)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~symmetric_coroutine_impl() {}
-
-    bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            flags_ |= flag_running;
-            param_type to( unwind_t::force_unwind);
-            caller_.jump(
-                callee_,
-                & to);
-            flags_ &= ~flag_running;
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    void resume( R r) BOOST_NOEXCEPT
-    {
-        param_type to( const_cast< R * >( & r), this);
-        resume_( & to);
-    }
-
-    R * yield()
-    {
-        BOOST_ASSERT( is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ &= ~flag_running;
-        param_type to;
-        param_type * from(
-            static_cast< param_type * >(
-                callee_.jump(
-                    caller_,
-                    & to) ) );
-        flags_ |= flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        BOOST_ASSERT( from->data);
-        return from->data;
-    }
-
-    template< typename X >
-    R * yield_to( symmetric_coroutine_impl< X > * other, X x)
-    {
-        typename symmetric_coroutine_impl< X >::param_type to( & x, other);
-        return yield_to_( other, & to);
-    }
-
-    template< typename X >
-    R * yield_to( symmetric_coroutine_impl< X & > * other, X & x)
-    {
-        typename symmetric_coroutine_impl< X & >::param_type to( & x, other);
-        return yield_to_( other, & to);
-    }
-
-    template< typename X >
-    R * yield_to( symmetric_coroutine_impl< X > * other)
-    {
-        typename symmetric_coroutine_impl< X >::param_type to( other);
-        return yield_to_( other, & to);
-    }
-
-    virtual void run( R *) BOOST_NOEXCEPT = 0;
-
-    virtual void destroy() = 0;
-
-protected:
-    template< typename X >
-    friend class symmetric_coroutine_impl;
-
-    int                 flags_;
-    coroutine_context   caller_;
-    coroutine_context   callee_;
-
-    void resume_( param_type * to) BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        caller_.jump(
-            callee_,
-            to);
-        flags_ &= ~flag_running;
-    }
-
-    template< typename Other >
-    R * yield_to_( Other * other, typename Other::param_type * to)
-    {
-        BOOST_ASSERT( is_running() );
-        BOOST_ASSERT( ! is_complete() );
-        BOOST_ASSERT( ! other->is_running() );
-        BOOST_ASSERT( ! other->is_complete() );
-
-        other->caller_ = caller_;
-        flags_ &= ~flag_running;
-        param_type * from(
-            static_cast< param_type * >(
-                callee_.jump(
-                    other->callee_,
-                    to) ) );
-        flags_ |= flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        BOOST_ASSERT( from->data);
-        return from->data;
-    }
-};
-
-template< typename R >
-class symmetric_coroutine_impl< R & > : private noncopyable
-{
-public:
-    typedef parameters< R & >                         param_type;
-
-    symmetric_coroutine_impl( preallocated const& palloc,
-                              bool unwind) BOOST_NOEXCEPT :
-        flags_( 0),
-        caller_(),
-        callee_( trampoline< symmetric_coroutine_impl< R > >, palloc)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~symmetric_coroutine_impl() {}
-
-    bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            flags_ |= flag_running;
-            param_type to( unwind_t::force_unwind);
-            caller_.jump(
-                callee_,
-                & to);
-            flags_ &= ~flag_running;
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    void resume( R & arg) BOOST_NOEXCEPT
-    {
-        param_type to( & arg, this);
-        resume_( & to);
-    }
-
-    R * yield()
-    {
-        BOOST_ASSERT( is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ &= ~flag_running;
-        param_type to;
-        param_type * from(
-            static_cast< param_type * >(
-                callee_.jump(
-                    caller_,
-                    & to) ) );
-        flags_ |= flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        BOOST_ASSERT( from->data);
-        return from->data;
-    }
-
-    template< typename X >
-    R * yield_to( symmetric_coroutine_impl< X > * other, X x)
-    {
-        typename symmetric_coroutine_impl< X >::param_type to( & x, other);
-        return yield_to_( other, & to);
-    }
-
-    template< typename X >
-    R * yield_to( symmetric_coroutine_impl< X & > * other, X & x)
-    {
-        typename symmetric_coroutine_impl< X & >::param_type to( & x, other);
-        return yield_to_( other, & to);
-    }
-
-    template< typename X >
-    R * yield_to( symmetric_coroutine_impl< X > * other)
-    {
-        typename symmetric_coroutine_impl< X >::param_type to( other);
-        return yield_to_( other, & to);
-    }
-
-    virtual void run( R *) BOOST_NOEXCEPT = 0;
-
-    virtual void destroy() = 0;
-
-protected:
-    template< typename X >
-    friend class symmetric_coroutine_impl;
-
-    int                 flags_;
-    coroutine_context   caller_;
-    coroutine_context   callee_;
-
-    void resume_( param_type * to) BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ |= flag_running;
-        caller_.jump(
-            callee_,
-            to);
-        flags_ &= ~flag_running;
-    }
-
-    template< typename Other >
-    R * yield_to_( Other * other, typename Other::param_type * to)
-    {
-        BOOST_ASSERT( is_running() );
-        BOOST_ASSERT( ! is_complete() );
-        BOOST_ASSERT( ! other->is_running() );
-        BOOST_ASSERT( ! other->is_complete() );
-
-        other->caller_ = caller_;
-        flags_ &= ~flag_running;
-        param_type * from(
-            static_cast< param_type * >(
-                callee_.jump(
-                    other->callee_,
-                    to) ) );
-        flags_ |= flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-        BOOST_ASSERT( from->data);
-        return from->data;
-    }
-};
-
-template<>
-class symmetric_coroutine_impl< void > : private noncopyable
-{
-public:
-    typedef parameters< void >                          param_type;
-
-    symmetric_coroutine_impl( preallocated const& palloc,
-                              bool unwind) BOOST_NOEXCEPT :
-        flags_( 0),
-        caller_(),
-        callee_( trampoline_void< symmetric_coroutine_impl< void > >, palloc)
-    {
-        if ( unwind) flags_ |= flag_force_unwind;
-    }
-
-    virtual ~symmetric_coroutine_impl() {}
-
-    inline bool force_unwind() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_force_unwind); }
-
-    inline bool unwind_requested() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_unwind_stack); }
-
-    inline bool is_started() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_started); }
-
-    inline bool is_running() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_running); }
-
-    inline bool is_complete() const BOOST_NOEXCEPT
-    { return 0 != ( flags_ & flag_complete); }
-
-    inline void unwind_stack() BOOST_NOEXCEPT
-    {
-        if ( is_started() && ! is_complete() && force_unwind() )
-        {
-            flags_ |= flag_unwind_stack;
-            flags_ |= flag_running;
-            param_type to( unwind_t::force_unwind);
-            caller_.jump(
-                callee_,
-                & to);
-            flags_ &= ~flag_running;
-            flags_ &= ~flag_unwind_stack;
-
-            BOOST_ASSERT( is_complete() );
-        }
-    }
-
-    inline void resume() BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( ! is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        param_type to( this);
-        flags_ |= flag_running;
-        caller_.jump(
-            callee_,
-            & to);
-        flags_ &= ~flag_running;
-    }
-
-    inline void yield()
-    {
-        BOOST_ASSERT( is_running() );
-        BOOST_ASSERT( ! is_complete() );
-
-        flags_ &= ~flag_running;
-        param_type to;
-        param_type * from(
-            static_cast< param_type * >(
-                callee_.jump(
-                     caller_,
-                    & to) ) );
-        flags_ |= flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-    }
-
-    template< typename X >
-    void yield_to( symmetric_coroutine_impl< X > * other, X x)
-    {
-        typename symmetric_coroutine_impl< X >::param_type to( & x, other);
-        yield_to_( other, & to);
-    }
-
-    template< typename X >
-    void yield_to( symmetric_coroutine_impl< X & > * other, X & x)
-    {
-        typename symmetric_coroutine_impl< X & >::param_type to( & x, other);
-        yield_to_( other, & to);
-    }
-
-    template< typename X >
-    void yield_to( symmetric_coroutine_impl< X > * other)
-    {
-        typename symmetric_coroutine_impl< X >::param_type to( other);
-        yield_to_( other, & to);
-    }
-
-    virtual void run() BOOST_NOEXCEPT = 0;
-
-    virtual void destroy() = 0;
-
-protected:
-    template< typename X >
-    friend class symmetric_coroutine_impl;
-
-    int                 flags_;
-    coroutine_context   caller_;
-    coroutine_context   callee_;
-
-    template< typename Other >
-    void yield_to_( Other * other, typename Other::param_type * to)
-    {
-        BOOST_ASSERT( is_running() );
-        BOOST_ASSERT( ! is_complete() );
-        BOOST_ASSERT( ! other->is_running() );
-        BOOST_ASSERT( ! other->is_complete() );
-
-        other->caller_ = caller_;
-        flags_ &= ~flag_running;
-        param_type * from(
-            static_cast< param_type * >(
-                callee_.jump(
-                    other->callee_,
-                    to) ) );
-        flags_ |= flag_running;
-        if ( from->do_unwind) throw forced_unwind();
-    }
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_IMPL_H
diff --git a/inst/include/boost/coroutine/detail/symmetric_coroutine_object.hpp b/inst/include/boost/coroutine/detail/symmetric_coroutine_object.hpp
deleted file mode 100644
index a19cd9223..000000000
--- a/inst/include/boost/coroutine/detail/symmetric_coroutine_object.hpp
+++ /dev/null
@@ -1,267 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_OBJECT_H
-#define BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_OBJECT_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/move/move.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/preallocated.hpp>
-#include <boost/coroutine/detail/symmetric_coroutine_impl.hpp>
-#include <boost/coroutine/detail/symmetric_coroutine_yield.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/stack_context.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-struct stack_context;
-
-namespace detail {
-
-template< typename R, typename Fn, typename StackAllocator >
-class symmetric_coroutine_object : public symmetric_coroutine_impl< R >
-{
-private:
-    typedef symmetric_coroutine_impl< R >                       impl_t;
-    typedef symmetric_coroutine_object< R, Fn, StackAllocator > obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    symmetric_coroutine_object( Fn fn, attributes const& attrs,
-                                preallocated const& palloc,
-                                StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        impl_t( palloc,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    symmetric_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                                preallocated const& palloc,
-                                StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        impl_t( palloc,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run( R * r) BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( ! impl_t::unwind_requested() );
-
-        impl_t::flags_ |= flag_started;
-        impl_t::flags_ |= flag_running;
-        try
-        {
-            symmetric_coroutine_yield< R > yc( this, r);
-            fn_( yc);
-        }
-        catch ( forced_unwind const&)
-        {}
-        catch (...)
-        { std::terminate(); }
-
-        impl_t::flags_ |= flag_complete;
-        impl_t::flags_ &= ~flag_running;
-        typename impl_t::param_type to;
-        impl_t::callee_.jump(
-            impl_t::caller_, 
-            & to);
-        BOOST_ASSERT_MSG( false, "coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-template< typename R, typename Fn, typename StackAllocator >
-class symmetric_coroutine_object< R &, Fn, StackAllocator > : public symmetric_coroutine_impl< R & >
-{
-private:
-    typedef symmetric_coroutine_impl< R & >                         impl_t;
-    typedef symmetric_coroutine_object< R &, Fn, StackAllocator >   obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    symmetric_coroutine_object( Fn fn, attributes const& attrs,
-                                preallocated const& palloc,
-                                StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        impl_t( palloc,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    symmetric_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                                preallocated const& palloc,
-                                StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        impl_t( palloc,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run( R * r) BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( ! impl_t::unwind_requested() );
-
-        impl_t::flags_ |= flag_started;
-        impl_t::flags_ |= flag_running;
-        try
-        {
-            symmetric_coroutine_yield< R & > yc( this, r);
-            fn_( yc);
-        }
-        catch ( forced_unwind const&)
-        {}
-        catch (...)
-        { std::terminate(); }
-
-        impl_t::flags_ |= flag_complete;
-        impl_t::flags_ &= ~flag_running;
-        typename impl_t::param_type to;
-        impl_t::callee_.jump(
-            impl_t::caller_, 
-            & to);
-        BOOST_ASSERT_MSG( false, "coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-template< typename Fn, typename StackAllocator >
-class symmetric_coroutine_object< void, Fn, StackAllocator > : public symmetric_coroutine_impl< void >
-{
-private:
-    typedef symmetric_coroutine_impl< void >                        impl_t;
-    typedef symmetric_coroutine_object< void, Fn, StackAllocator >  obj_t;
-
-    Fn                  fn_;
-    stack_context       stack_ctx_;
-    StackAllocator      stack_alloc_;
-
-    static void deallocate_( obj_t * obj)
-    {
-        stack_context stack_ctx( obj->stack_ctx_);
-        StackAllocator stack_alloc( obj->stack_alloc_);
-        obj->unwind_stack();
-        obj->~obj_t();
-        stack_alloc.deallocate( stack_ctx);
-    }
-
-public:
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-    symmetric_coroutine_object( Fn fn, attributes const& attrs,
-                                preallocated const& palloc,
-                                StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        impl_t( palloc,
-                stack_unwind == attrs.do_unwind),
-        fn_( fn),
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-#endif
-
-    symmetric_coroutine_object( BOOST_RV_REF( Fn) fn, attributes const& attrs,
-                                preallocated const& palloc,
-                                StackAllocator const& stack_alloc) BOOST_NOEXCEPT :
-        impl_t( palloc,
-                stack_unwind == attrs.do_unwind),
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-        fn_( fn),
-#else
-        fn_( boost::forward< Fn >( fn) ),
-#endif
-        stack_ctx_( palloc.sctx),
-        stack_alloc_( stack_alloc)
-    {}
-
-    void run() BOOST_NOEXCEPT
-    {
-        BOOST_ASSERT( ! impl_t::unwind_requested() );
-
-        impl_t::flags_ |= flag_started;
-        impl_t::flags_ |= flag_running;
-        try
-        {
-            symmetric_coroutine_yield< void > yc( this);
-            fn_( yc);
-        }
-        catch ( forced_unwind const&)
-        {}
-        catch (...)
-        { std::terminate(); }
-
-        impl_t::flags_ |= flag_complete;
-        impl_t::flags_ &= ~flag_running;
-        typename impl_t::param_type to;
-        impl_t::callee_.jump(
-            impl_t::caller_, 
-            & to);
-        BOOST_ASSERT_MSG( false, "coroutine is complete");
-    }
-
-    void destroy()
-    { deallocate_( this); }
-};
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_OBJECT_H
diff --git a/inst/include/boost/coroutine/detail/symmetric_coroutine_yield.hpp b/inst/include/boost/coroutine/detail/symmetric_coroutine_yield.hpp
deleted file mode 100644
index 296676b6f..000000000
--- a/inst/include/boost/coroutine/detail/symmetric_coroutine_yield.hpp
+++ /dev/null
@@ -1,307 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_YIELD_H
-#define BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_YIELD_H
-
-#include <algorithm>
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/move/move.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/utility/explicit_operator_bool.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/exceptions.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename R >
-class symmetric_coroutine_yield
-{
-private:
-    template< typename X, typename Y, typename Z >
-    friend class symmetric_coroutine_object;
-
-    typedef symmetric_coroutine_impl< R >       impl_type;
-
-    struct dummy {};
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( symmetric_coroutine_yield)
-
-    impl_type   *   impl_;
-    R           *   result_;
-
-    symmetric_coroutine_yield( impl_type * impl, R * result) BOOST_NOEXCEPT :
-        impl_( impl),
-        result_( result)
-    {
-        BOOST_ASSERT( 0 != impl_);
-        BOOST_ASSERT( 0 != result_);
-    }
-
-public:
-    symmetric_coroutine_yield() BOOST_NOEXCEPT :
-        impl_( 0),
-        result_( 0)
-    {}
-
-    symmetric_coroutine_yield( BOOST_RV_REF( symmetric_coroutine_yield) other) BOOST_NOEXCEPT :
-        impl_( 0),
-        result_( 0)
-    { swap( other); }
-
-    symmetric_coroutine_yield & operator=( BOOST_RV_REF( symmetric_coroutine_yield) other) BOOST_NOEXCEPT
-    {
-        symmetric_coroutine_yield tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_; }
-
-    void swap( symmetric_coroutine_yield & other) BOOST_NOEXCEPT
-    {
-        std::swap( impl_, other.impl_);
-        std::swap( result_, other.result_);
-    }
-
-    symmetric_coroutine_yield & operator()()
-    {
-        result_ = impl_->yield();
-        return * this;
-    }
-
-    template< typename Coro >
-    symmetric_coroutine_yield & operator()( Coro & other, typename Coro::value_type x,
-                                            typename disable_if<
-                                                is_same< typename Coro::value_type, void >,
-                                                dummy*
-                                            >::type = 0)
-    {
-        BOOST_ASSERT( other);
-
-        result_ = impl_->yield_to( other.impl_, x);
-        return * this;
-    }
-
-    template< typename Coro >
-    symmetric_coroutine_yield & operator()( Coro & other,
-                                            typename enable_if<
-                                                is_same< typename Coro::value_type, void >,
-                                                dummy*
-                                            >::type = 0)
-    {
-        BOOST_ASSERT( other);
-
-        result_ = impl_->yield_to( other.impl_);
-        return * this;
-    }
-
-    R get() const
-    {
-        if ( 0 == result_)
-            boost::throw_exception(
-                invalid_result() );
-
-        return * result_; 
-    }
-};
-
-template< typename R >
-class symmetric_coroutine_yield< R & >
-{
-private:
-    template< typename X, typename Y, typename Z >
-    friend class symmetric_coroutine_object;
-
-    typedef symmetric_coroutine_impl< R & >     impl_type;
-
-    struct dummy {};
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( symmetric_coroutine_yield)
-
-    impl_type   *   impl_;
-    R           *   result_;
-
-    symmetric_coroutine_yield( impl_type * impl, R * result) BOOST_NOEXCEPT :
-        impl_( impl),
-        result_( result)
-    {
-        BOOST_ASSERT( 0 != impl_);
-        BOOST_ASSERT( 0 != result_);
-    }
-
-public:
-    symmetric_coroutine_yield() BOOST_NOEXCEPT :
-        impl_( 0),
-        result_( 0)
-    {}
-
-    symmetric_coroutine_yield( BOOST_RV_REF( symmetric_coroutine_yield) other) BOOST_NOEXCEPT :
-        impl_( 0),
-        result_( 0)
-    { swap( other); }
-
-    symmetric_coroutine_yield & operator=( BOOST_RV_REF( symmetric_coroutine_yield) other) BOOST_NOEXCEPT
-    {
-        symmetric_coroutine_yield tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_; }
-
-    void swap( symmetric_coroutine_yield & other) BOOST_NOEXCEPT
-    {
-        std::swap( impl_, other.impl_);
-        std::swap( result_, other.result_);
-    }
-
-    symmetric_coroutine_yield & operator()()
-    {
-        result_ = impl_->yield();
-        return * this;
-    }
-
-    template< typename Coro >
-    symmetric_coroutine_yield & operator()( Coro & other, typename Coro::value_type & x,
-                                            typename disable_if<
-                                                is_same< typename Coro::value_type, void >,
-                                                dummy*
-                                            >::type = 0)
-    {
-        BOOST_ASSERT( other);
-
-        result_ = impl_->yield_to( other.impl_, x);
-        return * this;
-    }
-
-    template< typename Coro >
-    symmetric_coroutine_yield & operator()( Coro & other,
-                                            typename enable_if<
-                                                is_same< typename Coro::value_type, void >,
-                                                dummy*
-                                            >::type = 0)
-    {
-        BOOST_ASSERT( other);
-
-        result_ = impl_->yield_to( other.impl_);
-        return * this;
-    }
-
-    R & get() const
-    {
-        if ( 0 == result_)
-            boost::throw_exception(
-                invalid_result() );
-
-        return * result_; 
-    }
-};
-
-template<>
-class symmetric_coroutine_yield< void >
-{
-private:
-    template< typename X, typename Y, typename Z >
-    friend class symmetric_coroutine_object;
-
-    typedef symmetric_coroutine_impl< void >    impl_type;
-
-    struct dummy {};
-
-    BOOST_MOVABLE_BUT_NOT_COPYABLE( symmetric_coroutine_yield)
-
-    impl_type   *   impl_;
-
-    symmetric_coroutine_yield( impl_type * impl) BOOST_NOEXCEPT :
-        impl_( impl)
-    { BOOST_ASSERT( 0 != impl_); }
-
-public:
-    symmetric_coroutine_yield() BOOST_NOEXCEPT :
-        impl_( 0)
-    {}
-
-    symmetric_coroutine_yield( BOOST_RV_REF( symmetric_coroutine_yield) other) BOOST_NOEXCEPT :
-        impl_( 0)
-    { swap( other); }
-
-    symmetric_coroutine_yield & operator=( BOOST_RV_REF( symmetric_coroutine_yield) other) BOOST_NOEXCEPT
-    {
-        symmetric_coroutine_yield tmp( boost::move( other) );
-        swap( tmp);
-        return * this;
-    }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL();
-
-    inline bool operator!() const BOOST_NOEXCEPT
-    { return 0 == impl_; }
-
-    inline void swap( symmetric_coroutine_yield & other) BOOST_NOEXCEPT
-    { std::swap( impl_, other.impl_); }
-
-    inline symmetric_coroutine_yield & operator()()
-    {
-        impl_->yield();
-        return * this;
-    }
-
-    template< typename Coro >
-    symmetric_coroutine_yield & operator()( Coro & other, typename Coro::value_type & x,
-                                            typename disable_if<
-                                                is_same< typename Coro::value_type, void >,
-                                                dummy*
-                                            >::type = 0)
-    {
-        BOOST_ASSERT( other);
-
-        impl_->yield_to( other.impl_, x);
-        return * this;
-    }
-
-    template< typename Coro >
-    symmetric_coroutine_yield & operator()( Coro & other,
-                                            typename enable_if<
-                                                is_same< typename Coro::value_type, void >,
-                                                dummy*
-                                            >::type = 0)
-    {
-        BOOST_ASSERT( other);
-
-        impl_->yield_to( other.impl_);
-        return * this;
-    }
-};
-
-template< typename R >
-void swap( symmetric_coroutine_yield< R > & l, symmetric_coroutine_yield< R > & r)
-{ l.swap( r); }
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_SYMMETRIC_COROUTINE_YIELD_H
diff --git a/inst/include/boost/coroutine/detail/trampoline.hpp b/inst/include/boost/coroutine/detail/trampoline.hpp
deleted file mode 100644
index eb0c6c237..000000000
--- a/inst/include/boost/coroutine/detail/trampoline.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_TRAMPOLINE_H
-#define BOOST_COROUTINES_DETAIL_TRAMPOLINE_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/context/detail/fcontext.hpp>
-#include <boost/cstdint.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/data.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename Coro >
-void trampoline( context::detail::transfer_t t)
-{
-    typedef typename Coro::param_type   param_type;
-
-    data_t * data = static_cast< data_t * >( t.data);
-    data->from->ctx_ = t.fctx;
-    param_type * param(
-        static_cast< param_type * >( data->data) );
-    BOOST_ASSERT( 0 != param);
-    BOOST_ASSERT( 0 != param->data);
-
-    Coro * coro(
-        static_cast< Coro * >( param->coro) );
-    BOOST_ASSERT( 0 != coro);
-
-    coro->run( param->data);
-}
-
-template< typename Coro >
-void trampoline_void( context::detail::transfer_t t)
-{
-    typedef typename Coro::param_type   param_type;
-
-    data_t * data = static_cast< data_t * >( t.data);
-    data->from->ctx_ = t.fctx;
-    param_type * param(
-        static_cast< param_type * >( data->data) );
-    BOOST_ASSERT( 0 != param);
-
-    Coro * coro(
-        static_cast< Coro * >( param->coro) );
-    BOOST_ASSERT( 0 != coro);
-    
-    coro->run();
-}
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_TRAMPOLINE_H
diff --git a/inst/include/boost/coroutine/detail/trampoline_pull.hpp b/inst/include/boost/coroutine/detail/trampoline_pull.hpp
deleted file mode 100644
index 1daa76db3..000000000
--- a/inst/include/boost/coroutine/detail/trampoline_pull.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_TRAMPOLINE_PULL_H
-#define BOOST_COROUTINES_DETAIL_TRAMPOLINE_PULL_H
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/context/detail/fcontext.hpp>
-#include <boost/cstdint.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/data.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename Coro >
-void trampoline_pull( context::detail::transfer_t t)
-{
-    typedef typename Coro::param_type   param_type;
-
-    data_t * data = static_cast< data_t * >( t.data);
-    data->from->ctx_ = t.fctx;
-    param_type * param(
-        static_cast< param_type * >( data->data) );
-    BOOST_ASSERT( 0 != param);
-
-    Coro * coro(
-        static_cast< Coro * >( param->coro) );
-    BOOST_ASSERT( 0 != coro);
-
-    coro->run();
-}
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_TRAMPOLINE_PULL_H
diff --git a/inst/include/boost/coroutine/detail/trampoline_push.hpp b/inst/include/boost/coroutine/detail/trampoline_push.hpp
deleted file mode 100644
index 80f90d051..000000000
--- a/inst/include/boost/coroutine/detail/trampoline_push.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_DETAIL_TRAMPOLINE_PUSH_H
-#define BOOST_COROUTINES_DETAIL_TRAMPOLINE_PUSH_H
-
-#include <cstddef>
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/context/detail/fcontext.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/exception_ptr.hpp>
-#include <boost/move/move.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/detail/data.hpp>
-#include <boost/coroutine/detail/flags.hpp>
-#include <boost/coroutine/detail/parameters.hpp>
-#include <boost/coroutine/detail/setup.hpp>
-#include <boost/coroutine/detail/setup.hpp>
-#include <boost/coroutine/exceptions.hpp>
-#include <boost/coroutine/flags.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-template< typename Coro >
-void trampoline_push( context::detail::transfer_t t)
-{
-    typedef typename Coro::param_type   param_type;
-
-    data_t * data = static_cast< data_t * >( t.data);
-    data->from->ctx_ = t.fctx;
-    param_type * param(
-        static_cast< param_type * >( data->data) );
-    BOOST_ASSERT( 0 != param);
-    BOOST_ASSERT( 0 != param->data);
-
-    Coro * coro(
-        static_cast< Coro * >( param->coro) );
-    BOOST_ASSERT( 0 != coro);
-
-    coro->run( param->data);
-}
-
-template< typename Coro >
-void trampoline_push_void( context::detail::transfer_t t)
-{
-    typedef typename Coro::param_type   param_type;
-
-    data_t * data = static_cast< data_t * >( t.data);
-    data->from->ctx_ = t.fctx;
-    param_type * param(
-        static_cast< param_type * >( data->data) );
-    BOOST_ASSERT( 0 != param);
-
-    Coro * coro(
-        static_cast< Coro * >( param->coro) );
-    BOOST_ASSERT( 0 != coro);
-
-    coro->run();
-}
-
-}}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_DETAIL_TRAMPOLINE_PUSH_H
diff --git a/inst/include/boost/coroutine/exceptions.hpp b/inst/include/boost/coroutine/exceptions.hpp
deleted file mode 100644
index c6cbd01d8..000000000
--- a/inst/include/boost/coroutine/exceptions.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_EXCEPTIONS_H
-#define BOOST_COROUTINES_EXCEPTIONS_H
-
-#include <stdexcept>
-#include <string>
-
-#include <boost/config.hpp>
-#include <boost/core/scoped_enum.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/system/system_error.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-namespace detail {
-
-struct forced_unwind {};
-
-}
-
-BOOST_SCOPED_ENUM_DECLARE_BEGIN(coroutine_errc)
-{
-  no_data = 1
-}
-BOOST_SCOPED_ENUM_DECLARE_END(coroutine_errc)
-
-BOOST_COROUTINES_DECL
-system::error_category const& coroutine_category() BOOST_NOEXCEPT;
-
-}
-
-namespace system {
-
-template<>
-struct is_error_code_enum< coroutines::coroutine_errc > : public true_type
-{};
-
-#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
-template<>
-struct is_error_code_enum< coroutines::coroutine_errc::enum_type > : public true_type
-{};
-#endif
-
-inline
-error_code make_error_code( coroutines::coroutine_errc e) //BOOST_NOEXCEPT
-{
-    return error_code( underlying_cast< int >( e), coroutines::coroutine_category() );
-}
-
-inline
-error_condition make_error_condition( coroutines::coroutine_errc e) //BOOST_NOEXCEPT
-{
-    return error_condition( underlying_cast< int >( e), coroutines::coroutine_category() );
-}
-
-}
-
-namespace coroutines {
-
-class coroutine_error : public std::logic_error
-{
-private:
-    system::error_code  ec_;
-
-public:
-    coroutine_error( system::error_code ec) :
-        logic_error( ec.message() ),
-        ec_( ec)
-    {}
-
-    system::error_code const& code() const BOOST_NOEXCEPT
-    { return ec_; }
-};
-
-class invalid_result : public coroutine_error
-{
-public:
-    invalid_result() :
-        coroutine_error(
-            system::make_error_code(
-                coroutine_errc::no_data) )
-    {}
-};
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_EXCEPTIONS_H
diff --git a/inst/include/boost/coroutine/flags.hpp b/inst/include/boost/coroutine/flags.hpp
deleted file mode 100644
index 81940f30e..000000000
--- a/inst/include/boost/coroutine/flags.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_FLAGS_H
-#define BOOST_COROUTINES_FLAGS_H
-
-namespace boost {
-namespace coroutines {
-
-enum flag_unwind_t
-{
-    stack_unwind = 0,
-    no_stack_unwind
-};
-
-}}
-
-#endif // BOOST_COROUTINES_FLAGS_H
diff --git a/inst/include/boost/coroutine/posix/protected_stack_allocator.hpp b/inst/include/boost/coroutine/posix/protected_stack_allocator.hpp
deleted file mode 100644
index 649248b57..000000000
--- a/inst/include/boost/coroutine/posix/protected_stack_allocator.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_PROTECTED_STACK_ALLOCATOR_H
-#define BOOST_COROUTINES_PROTECTED_STACK_ALLOCATOR_H
-
-extern "C" {
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
-}
-
-#if defined(BOOST_USE_VALGRIND)
-#include <valgrind/valgrind.h>
-#endif
-
-#include <cmath>
-#include <cstddef>
-#include <new>
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/stack_context.hpp>
-#include <boost/coroutine/stack_traits.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-template< typename traitsT >
-struct basic_protected_stack_allocator
-{
-    typedef traitsT traits_type;
-
-    void allocate( stack_context & ctx, std::size_t size = traits_type::minimum_size() )
-    {
-        BOOST_ASSERT( traits_type::minimum_size() <= size);
-        BOOST_ASSERT( traits_type::is_unbounded() || ( traits_type::maximum_size() >= size) );
-
-        // page at bottom will be used as guard-page
-        const std::size_t pages(
-            static_cast< std::size_t >( 
-                std::floor(
-                    static_cast< float >( size) / traits_type::page_size() ) ) );
-        BOOST_ASSERT_MSG( 2 <= pages, "at least two pages must fit into stack (one page is guard-page)");
-        const std::size_t size_( pages * traits_type::page_size() );
-        BOOST_ASSERT( 0 != size && 0 != size_);
-        BOOST_ASSERT( size_ <= size);
-
-        // conform to POSIX.4 (POSIX.1b-1993, _POSIX_C_SOURCE=199309L)
-#if defined(MAP_ANON)
-        void * limit = ::mmap( 0, size_, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-#else
-        void * limit = ::mmap( 0, size_, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-#endif
-        if ( MAP_FAILED == limit) throw std::bad_alloc();
-
-        // conforming to POSIX.1-2001
-#if defined(BOOST_DISABLE_ASSERTS)
-        ::mprotect( limit, traits_type::page_size(), PROT_NONE);
-#else
-        const int result( ::mprotect( limit, traits_type::page_size(), PROT_NONE) );
-        BOOST_ASSERT( 0 == result);
-#endif
-
-        ctx.size = size_;
-        ctx.sp = static_cast< char * >( limit) + ctx.size;
-#if defined(BOOST_USE_VALGRIND)
-        ctx.valgrind_stack_id = VALGRIND_STACK_REGISTER( ctx.sp, limit);
-#endif
-    }
-
-    void deallocate( stack_context & ctx)
-    {
-        BOOST_ASSERT( ctx.sp);
-        BOOST_ASSERT( traits_type::minimum_size() <= ctx.size);
-        BOOST_ASSERT( traits_type::is_unbounded() || ( traits_type::maximum_size() >= ctx.size) );
-
-#if defined(BOOST_USE_VALGRIND)
-        VALGRIND_STACK_DEREGISTER( ctx.valgrind_stack_id);
-#endif
-        void * limit = static_cast< char * >( ctx.sp) - ctx.size;
-        // conform to POSIX.4 (POSIX.1b-1993, _POSIX_C_SOURCE=199309L)
-        ::munmap( limit, ctx.size);
-    }
-};
-
-typedef basic_protected_stack_allocator< stack_traits > protected_stack_allocator;
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_PROTECTED_STACK_ALLOCATOR_H
diff --git a/inst/include/boost/coroutine/posix/segmented_stack_allocator.hpp b/inst/include/boost/coroutine/posix/segmented_stack_allocator.hpp
deleted file mode 100644
index 49cee28cd..000000000
--- a/inst/include/boost/coroutine/posix/segmented_stack_allocator.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_SEGMENTED_STACK_ALLOCATOR_H
-#define BOOST_COROUTINES_SEGMENTED_STACK_ALLOCATOR_H
-
-#include <cstddef>
-#include <new>
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/stack_context.hpp>
-#include <boost/coroutine/stack_traits.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-// forward declaration for splitstack-functions defined in libgcc
-extern "C" {
-void *__splitstack_makecontext( std::size_t,
-                                void * [BOOST_CONTEXT_SEGMENTS],
-                                std::size_t *);
-
-void __splitstack_releasecontext( void * [BOOST_CONTEXT_SEGMENTS]);
-
-void __splitstack_resetcontext( void * [BOOST_CONTEXT_SEGMENTS]);
-
-void __splitstack_block_signals_context( void * [BOOST_CONTEXT_SEGMENTS],
-                                         int * new_value, int * old_value);
-}
-
-namespace boost {
-namespace coroutines {
-
-template< typename traitsT >
-struct basic_segmented_stack_allocator
-{
-    typedef traitsT traits_type;
-
-    void allocate( stack_context & ctx, std::size_t size = traits_type::minimum_size() )
-    {
-        void * limit = __splitstack_makecontext( size, ctx.segments_ctx, & ctx.size);
-        if ( ! limit) throw std::bad_alloc();
-
-        // ctx.size is already filled by __splitstack_makecontext
-        ctx.sp = static_cast< char * >( limit) + ctx.size;
-
-        int off = 0;
-        __splitstack_block_signals_context( ctx.segments_ctx, & off, 0);
-    }
-
-    void deallocate( stack_context & ctx)
-    { __splitstack_releasecontext( ctx.segments_ctx); }
-};
-
-typedef basic_segmented_stack_allocator< stack_traits > segmented_stack_allocator;
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_SEGMENTED_STACK_ALLOCATOR_H
diff --git a/inst/include/boost/coroutine/protected_stack_allocator.hpp b/inst/include/boost/coroutine/protected_stack_allocator.hpp
deleted file mode 100644
index 268786fec..000000000
--- a/inst/include/boost/coroutine/protected_stack_allocator.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-
-#if defined(BOOST_WINDOWS)
-# include <boost/coroutine/windows/protected_stack_allocator.hpp>
-#else
-# include <boost/coroutine/posix/protected_stack_allocator.hpp>
-#endif
diff --git a/inst/include/boost/coroutine/segmented_stack_allocator.hpp b/inst/include/boost/coroutine/segmented_stack_allocator.hpp
deleted file mode 100644
index f9525a1a5..000000000
--- a/inst/include/boost/coroutine/segmented_stack_allocator.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-
-#if defined(BOOST_USE_SEGMENTED_STACKS)
-# if defined(BOOST_WINDOWS)
-#  error "segmented stacks are not supported by Windows"
-# else
-#  include <boost/coroutine/posix/segmented_stack_allocator.hpp>
-# endif
-#endif
diff --git a/inst/include/boost/coroutine/stack_allocator.hpp b/inst/include/boost/coroutine/stack_allocator.hpp
deleted file mode 100644
index 662533efe..000000000
--- a/inst/include/boost/coroutine/stack_allocator.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_STACK_ALLOCATOR_H
-#define BOOST_COROUTINES_STACK_ALLOCATOR_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/context/detail/config.hpp>
-#include <boost/coroutine/segmented_stack_allocator.hpp>
-#include <boost/coroutine/standard_stack_allocator.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-#if defined(BOOST_USE_SEGMENTED_STACKS)
-typedef segmented_stack_allocator   stack_allocator;
-#else
-typedef standard_stack_allocator    stack_allocator;
-#endif
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_STACK_ALLOCATOR_H
diff --git a/inst/include/boost/coroutine/stack_context.hpp b/inst/include/boost/coroutine/stack_context.hpp
deleted file mode 100644
index 3f57b2527..000000000
--- a/inst/include/boost/coroutine/stack_context.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_STACK_CONTEXT_H
-#define BOOST_COROUTINES_STACK_CONTEXT_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-#if defined(BOOST_USE_SEGMENTED_STACKS)
-struct BOOST_COROUTINES_DECL stack_context
-{
-    typedef void *  segments_context[BOOST_CONTEXT_SEGMENTS];
-
-    std::size_t             size;
-    void                *   sp;
-    segments_context        segments_ctx;
-#if defined(BOOST_USE_VALGRIND)
-    unsigned                valgrind_stack_id;
-#endif
-
-    stack_context() :
-        size( 0), sp( 0), segments_ctx()
-#if defined(BOOST_USE_VALGRIND)
-        , valgrind_stack_id( 0)
-#endif
-    {}
-};
-#else
-struct BOOST_COROUTINES_DECL stack_context
-{
-    std::size_t             size;
-    void                *   sp;
-#if defined(BOOST_USE_VALGRIND)
-    unsigned                valgrind_stack_id;
-#endif
-
-    stack_context() :
-        size( 0), sp( 0)
-#if defined(BOOST_USE_VALGRIND)
-        , valgrind_stack_id( 0)
-#endif
-    {}
-};
-#endif
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_STACK_CONTEXT_H
diff --git a/inst/include/boost/coroutine/stack_traits.hpp b/inst/include/boost/coroutine/stack_traits.hpp
deleted file mode 100644
index 0e8f25182..000000000
--- a/inst/include/boost/coroutine/stack_traits.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_STACK_TRAITS_H
-#define BOOST_COROUTINES_STACK_TRAITS_H
-
-#include <cstddef>
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-struct BOOST_COROUTINES_DECL stack_traits
-{
-    static bool is_unbounded() BOOST_NOEXCEPT;
-
-    static std::size_t page_size() BOOST_NOEXCEPT;
-
-    static std::size_t default_size() BOOST_NOEXCEPT;
-
-    static std::size_t minimum_size() BOOST_NOEXCEPT;
-
-    static std::size_t maximum_size() BOOST_NOEXCEPT;
-};
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_STACK_TRAITS_H
diff --git a/inst/include/boost/coroutine/standard_stack_allocator.hpp b/inst/include/boost/coroutine/standard_stack_allocator.hpp
deleted file mode 100644
index 134a4a47b..000000000
--- a/inst/include/boost/coroutine/standard_stack_allocator.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_STANDARD_STACK_ALLOCATOR_H
-#define BOOST_COROUTINES_STANDARD_STACK_ALLOCATOR_H
-
-#if defined(BOOST_USE_VALGRIND)
-#include <valgrind/valgrind.h>
-#endif
-
-#include <cstddef>
-#include <cstdlib>
-#include <new>
-
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/stack_context.hpp>
-#include <boost/coroutine/stack_traits.hpp>
-
-#if defined(BOOST_COROUTINES_USE_MAP_STACK)
-extern "C" {
-#include <sys/mman.h>
-}
-#endif
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-template< typename traitsT >
-struct basic_standard_stack_allocator
-{
-    typedef traitsT traits_type;
-
-    void allocate( stack_context & ctx, std::size_t size = traits_type::minimum_size() )
-    {
-        BOOST_ASSERT( traits_type::minimum_size() <= size);
-        BOOST_ASSERT( traits_type::is_unbounded() || ( traits_type::maximum_size() >= size) );
-
-#if defined(BOOST_COROUTINES_USE_MAP_STACK)
-        void * limit = ::mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | MAP_STACK, -1, 0);
-        if ( limit == MAP_FAILED ) throw std::bad_alloc();
-#else
-        void * limit = std::malloc( size);
-        if ( ! limit) throw std::bad_alloc();
-#endif
-
-        ctx.size = size;
-        ctx.sp = static_cast< char * >( limit) + ctx.size;
-#if defined(BOOST_USE_VALGRIND)
-        ctx.valgrind_stack_id = VALGRIND_STACK_REGISTER( ctx.sp, limit);
-#endif
-    }
-
-    void deallocate( stack_context & ctx)
-    {
-        BOOST_ASSERT( ctx.sp);
-        BOOST_ASSERT( traits_type::minimum_size() <= ctx.size);
-        BOOST_ASSERT( traits_type::is_unbounded() || ( traits_type::maximum_size() >= ctx.size) );
-
-#if defined(BOOST_USE_VALGRIND)
-        VALGRIND_STACK_DEREGISTER( ctx.valgrind_stack_id);
-#endif
-
-        void * limit = static_cast< char * >( ctx.sp) - ctx.size;
-#if defined(BOOST_COROUTINES_USE_MAP_STACK)
-        munmap(limit, ctx.size);
-#else
-        std::free( limit);
-#endif
-    }
-};
-
-typedef basic_standard_stack_allocator< stack_traits >  standard_stack_allocator;
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_STANDARD_STACK_ALLOCATOR_H
diff --git a/inst/include/boost/coroutine/symmetric_coroutine.hpp b/inst/include/boost/coroutine/symmetric_coroutine.hpp
deleted file mode 100644
index 543cae0a3..000000000
--- a/inst/include/boost/coroutine/symmetric_coroutine.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_SYMMETRIC_COROUTINE_H
-#define BOOST_COROUTINES_SYMMETRIC_COROUTINE_H
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/symmetric_coroutine_call.hpp>
-#include <boost/coroutine/detail/symmetric_coroutine_yield.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-template< typename T >
-struct symmetric_coroutine
-{
-    typedef detail::symmetric_coroutine_call< T >   call_type;
-    typedef detail::symmetric_coroutine_yield< T >  yield_type;
-};
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_SYMMETRIC_COROUTINE_H
diff --git a/inst/include/boost/coroutine/windows/protected_stack_allocator.hpp b/inst/include/boost/coroutine/windows/protected_stack_allocator.hpp
deleted file mode 100644
index 29e19babb..000000000
--- a/inst/include/boost/coroutine/windows/protected_stack_allocator.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_COROUTINES_PROTECTED_STACK_ALLOCATOR_H
-#define BOOST_COROUTINES_PROTECTED_STACK_ALLOCATOR_H
-
-extern "C" {
-#include <windows.h>
-}
-
-#include <cmath>
-#include <cstddef>
-#include <new>
-
-#include <boost/config.hpp>
-
-#include <boost/coroutine/detail/config.hpp>
-#include <boost/coroutine/stack_traits.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace coroutines {
-
-struct stack_context;
-
-template< typename traitsT >
-struct basic_protected_stack_allocator
-{
-    typedef traitsT traits_type;
-
-    void allocate( stack_context & ctx, std::size_t size)
-    {
-        BOOST_ASSERT( traits_type::minimum_size() <= size);
-        BOOST_ASSERT( traits_type::is_unbounded() || ( traits_type::maximum_size() >= size) );
-
-        // page at bottom will be used as guard-page
-        const std::size_t pages(
-            static_cast< std::size_t >( 
-                std::floor(
-                    static_cast< float >( size) / traits_type::page_size() ) ) );
-        BOOST_ASSERT_MSG( 2 <= pages, "at least two pages must fit into stack (one page is guard-page)");
-        const std::size_t size_ = pages * traits_type::page_size();
-        BOOST_ASSERT( 0 != size && 0 != size_);
-
-        void * limit = ::VirtualAlloc( 0, size_, MEM_COMMIT, PAGE_READWRITE);
-        if ( ! limit) throw std::bad_alloc();
-
-        DWORD old_options;
-#if defined(BOOST_DISABLE_ASSERTS)
-        ::VirtualProtect(
-            limit, traits_type::page_size(), PAGE_READWRITE | PAGE_GUARD /*PAGE_NOACCESS*/, & old_options);
-#else
-        const BOOL result = ::VirtualProtect(
-            limit, traits_type::page_size(), PAGE_READWRITE | PAGE_GUARD /*PAGE_NOACCESS*/, & old_options);
-        BOOST_ASSERT( FALSE != result);
-#endif
-
-        ctx.size = size_;
-        ctx.sp = static_cast< char * >( limit) + ctx.size;
-    }
-
-    void deallocate( stack_context & ctx)
-    {
-        BOOST_ASSERT( ctx.sp);
-        BOOST_ASSERT( traits_type::minimum_size() <= ctx.size);
-        BOOST_ASSERT( traits_type::is_unbounded() || ( traits_type::maximum_size() >= ctx.size) );
-
-        void * limit = static_cast< char * >( ctx.sp) - ctx.size;
-        ::VirtualFree( limit, 0, MEM_RELEASE);
-    }
-};
-
-typedef basic_protected_stack_allocator< stack_traits > protected_stack_allocator;
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-#endif // BOOST_COROUTINES_PROTECTED_STACK_ALLOCATOR_H
diff --git a/inst/include/boost/crc.hpp b/inst/include/boost/crc.hpp
index 83ee8992e..5495456ea 100644
--- a/inst/include/boost/crc.hpp
+++ b/inst/include/boost/crc.hpp
@@ -36,35 +36,72 @@
 #ifndef BOOST_CRC_HPP
 #define BOOST_CRC_HPP
 
-#include <boost/array.hpp>           // for boost::array
-#include <boost/config.hpp>          // for BOOST_STATIC_CONSTANT, etc.
-#include <boost/cstdint.hpp>         // for UINTMAX_C, boost::uintmax_t
-#include <boost/integer.hpp>         // for boost::uint_t
-#include <boost/type_traits/conditional.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/config/pragma_message.hpp>
+#include <array>        // for std::array
+#include <climits>      // for CHAR_BIT, etc.
+#include <cstddef>      // for std::size_t
+#include <cstdint>      // for UINTMAX_C, std::uintmax_t
+#include <limits>       // for std::numeric_limits
+#include <type_traits>  // for std::conditional, std::integral_constant
 
-#include <climits>  // for CHAR_BIT, etc.
-#include <cstddef>  // for std::size_t
+// Local reimplementation of boost::uint_t, to avoid dependency on Integer
 
-#include <boost/limits.hpp>  // for std::numeric_limits
+namespace boost {
+namespace crc_detail {
 
-#if defined(BOOST_NO_CXX11_HDR_ARRAY) || \
-    defined(BOOST_NO_CXX11_NOEXCEPT) // BOOST_NO_CXX11_HDR_TYPE_TRAITS is set for GCC 4.8
+struct uint_t_8
+{
+    typedef std::uint_least8_t fast; // matches boost::uint_t<8>::fast
+};
+
+struct uint_t_16
+{
+    typedef std::uint_least16_t fast; // matches boost::uint_t<16>::fast
+};
+
+struct uint_t_32
+{
+    typedef std::uint_least32_t fast; // matches boost::uint_t<32>::fast
+};
+
+template<class T> struct remap_long_long
+{
+    typedef T type;
+};
+
+#if ULONG_MAX == ULLONG_MAX
 
-BOOST_PRAGMA_MESSAGE("C++03 support is deprecated in Boost.CRC 1.84 and will be removed in Boost.CRC 1.86.")
+template<> struct remap_long_long<unsigned long long>
+{
+    typedef unsigned long type;
+};
 
 #endif
 
+struct uint_t_64
+{
+    typedef remap_long_long<std::uint_least64_t>::type fast; // matches boost::uint_t<64>::fast
+};
+
+struct uint_t_none
+{
+};
+
+template<int Bits> struct uint_t:
+    std::conditional< (Bits <=  8), uint_t_8,
+    typename std::conditional< (Bits <= 16), uint_t_16,
+    typename std::conditional< (Bits <= 32), uint_t_32,
+    typename std::conditional< (Bits <= 64), uint_t_64,
+    uint_t_none>::type>::type>::type>::type
+{
+};
+
+} // namespace crc_detail
+} // namespace boost
+
 // The type of CRC parameters that can go in a template should be related
 // on the CRC's bit count.  This macro expresses that type in a compact
-// form, but also allows an alternate type for compilers that don't support
-// dependent types (in template value-parameters).
-#if !(defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS))
-#define BOOST_CRC_PARM_TYPE  typename ::boost::uint_t<Bits>::fast
-#else
-#define BOOST_CRC_PARM_TYPE  unsigned long
-#endif
+// form.
+#define BOOST_CRC_PARM_TYPE  typename ::boost::crc_detail::uint_t<Bits>::fast
 
 namespace boost
 {
@@ -87,14 +124,14 @@ template < std::size_t Bits, BOOST_CRC_PARM_TYPE TruncPoly = 0u,
 template < std::size_t Bits, BOOST_CRC_PARM_TYPE TruncPoly,
            BOOST_CRC_PARM_TYPE InitRem, BOOST_CRC_PARM_TYPE FinalXor,
            bool ReflectIn, bool ReflectRem >
-    typename uint_t<Bits>::fast  crc( void const *buffer,
+    typename crc_detail::uint_t<Bits>::fast  crc( void const *buffer,
      std::size_t byte_count);
 
 //! Compute the CRC of a memory block, with any augmentation provided by user
 template < std::size_t Bits, BOOST_CRC_PARM_TYPE TruncPoly >
-    typename uint_t<Bits>::fast  augmented_crc( void const *buffer,
+    typename crc_detail::uint_t<Bits>::fast  augmented_crc( void const *buffer,
      std::size_t byte_count,
-     typename uint_t<Bits>::fast initial_remainder = 0u);
+     typename crc_detail::uint_t<Bits>::fast initial_remainder = 0u);
 
 //! Computation type for ARC|CRC-16|CRC-IBM|CRC-16/ARC|CRC-16/LHA standard
 typedef crc_optimal<16, 0x8005, 0, 0, true, true>         crc_16_type;
@@ -127,7 +164,7 @@ namespace detail
         class possible_reflector;
 
     //! Mix-in class for byte-fed, table-driven CRC algorithms
-    template < int Order, boost::uintmax_t TruncatedPolynomial, bool Reflect,
+    template < int Order, std::uintmax_t TruncatedPolynomial, bool Reflect,
      int Id = 0 >
     class crc_driver;
 
@@ -159,11 +196,11 @@ class crc_basic
         checksums and returned or submitted remainders, (truncated) divisors, or
         XOR masks.  It is a built-in unsigned integer type.
      */
-    typedef typename boost::uint_t<Bits>::fast  value_type;
+    typedef typename boost::crc_detail::uint_t<Bits>::fast  value_type;
 
     // Constant for the template parameter
     //! A copy of \a Bits provided for meta-programming purposes
-    BOOST_STATIC_CONSTANT( std::size_t, bit_count = Bits );
+    static const std::size_t bit_count = Bits;
 
     // Constructor (use the automatic copy-ctr, move-ctr, and dtr)
     //! Create a computer, separately listing each needed parameter
@@ -253,21 +290,21 @@ class crc_optimal
 public:
     // Type
     //! \copydoc  boost::crc_basic::value_type
-    typedef typename boost::uint_t<Bits>::fast  value_type;
+    typedef typename boost::crc_detail::uint_t<Bits>::fast  value_type;
 
     // Constants for the template parameters
     //! \copydoc  boost::crc_basic::bit_count
-    BOOST_STATIC_CONSTANT( std::size_t, bit_count = Bits );
+    static const std::size_t bit_count = Bits;
     //! A copy of \a TruncPoly provided for meta-programming purposes
-    BOOST_STATIC_CONSTANT( value_type, truncated_polynominal = TruncPoly );
+    static const value_type truncated_polynominal = TruncPoly;
     //! A copy of \a InitRem provided for meta-programming purposes
-    BOOST_STATIC_CONSTANT( value_type, initial_remainder = InitRem );
+    static const value_type initial_remainder = InitRem;
     //! A copy of \a FinalXor provided for meta-programming purposes
-    BOOST_STATIC_CONSTANT( value_type, final_xor_value = FinalXor );
+    static const value_type final_xor_value = FinalXor;
     //! A copy of \a ReflectIn provided for meta-programming purposes
-    BOOST_STATIC_CONSTANT( bool, reflect_input = ReflectIn );
+    static const bool reflect_input = ReflectIn;
     //! A copy of \a ReflectRem provided for meta-programming purposes
-    BOOST_STATIC_CONSTANT( bool, reflect_remainder = ReflectRem );
+    static const bool reflect_remainder = ReflectRem;
 
     // Constructor (use the automatic copy-ctr, move-ctr, and dtr)
     //! Create a computer, giving an initial remainder if desired
@@ -342,7 +379,7 @@ namespace detail
      */
     template < int BitIndex >
     struct high_bit_mask_c
-        : boost::integral_constant<typename boost::uint_t< BitIndex + 1 >::fast,
+        : std::integral_constant<typename boost::crc_detail::uint_t< BitIndex + 1 >::fast,
            ( UINTMAX_C(1) << BitIndex )>
     {};
 
@@ -361,7 +398,7 @@ namespace detail
      */
     template < int BitCount >
     struct low_bits_mask_c
-        : boost::integral_constant<typename boost::uint_t< BitCount >::fast, (
+        : std::integral_constant<typename boost::crc_detail::uint_t< BitCount >::fast, (
            BitCount ? (( (( UINTMAX_C(1) << (BitCount - 1) ) - 1u) << 1 ) |
            UINTMAX_C( 1 )) : 0u )>
     {};
@@ -412,10 +449,10 @@ namespace detail
           <var>i</var>, <code><var>a</var>[ <var>i</var> ]</code> resolves to
           the reflected value of <var>i</var>.
      */
-    boost::array< unsigned char, (UINTMAX_C( 1 ) << CHAR_BIT) >
+    std::array< unsigned char, (UINTMAX_C( 1 ) << CHAR_BIT) >
     inline make_byte_reflection_table()
     {
-        boost::array<unsigned char, ( UINTMAX_C(1) << CHAR_BIT )>  result;
+        std::array<unsigned char, ( UINTMAX_C(1) << CHAR_BIT )>  result;
         unsigned char                                              i = 0u;
 
         do
@@ -441,7 +478,7 @@ namespace detail
      */
     inline unsigned char  reflect_byte( unsigned char x )
     {
-        static  boost::array<unsigned char, ( UINTMAX_C(1) << CHAR_BIT )> const
+        static  std::array<unsigned char, ( UINTMAX_C(1) << CHAR_BIT )> const
           table = make_byte_reflection_table();
 
         return table[ x ];
@@ -582,7 +619,7 @@ namespace detail
         }
 
         // Clear overflowed bits
-        remainder &= std::numeric_limits<Register>::max() >> (std::numeric_limits<Register>::digits - register_length);
+        remainder &= (std::numeric_limits<Register>::max)() >> (std::numeric_limits<Register>::digits - register_length);
     }
 
     /** \brief  Update a CRC remainder by a single bit, assuming a non-augmented
@@ -762,19 +799,19 @@ namespace detail
             This is a Boost integral constant indicating that this class
             does not reflect its input values.
          */
-        typedef boost::false_type                 is_reflecting_type;
+        typedef std::false_type                 is_reflecting_type;
         /** \brief  The type to check for register bit length
 
             This is a Boost integral constant indicating how many
             significant bits won't actually be reflected.
          */
-        typedef boost::integral_constant< int, BitLength >      width_c;
+        typedef std::integral_constant< int, BitLength >      width_c;
         /** \brief  The type of (not-)reflected values
 
             This type is the input and output type for the (possible-)
             reflection function, which does nothing here.
          */
-        typedef typename boost::uint_t< BitLength >::fast  value_type;
+        typedef typename boost::crc_detail::uint_t< BitLength >::fast  value_type;
 
         /** \brief  Does nothing
 
@@ -809,18 +846,18 @@ namespace detail
             This is a Boost integral constant indicating that this class
             does reflect its input values.
          */
-        typedef boost::true_type                  is_reflecting_type;
+        typedef std::true_type                  is_reflecting_type;
         /** \brief  The type to check for register bit length
 
             This is a Boost integral constant indicating how many
             significant bits will be reflected.
          */
-        typedef boost::integral_constant< int, BitLength >      width_c;
+        typedef std::integral_constant< int, BitLength >      width_c;
         /** \brief  The type of reflected values
 
             This is both the input and output type for the reflection function.
          */
-        typedef typename boost::uint_t< BitLength >::fast  value_type;
+        typedef typename boost::crc_detail::uint_t< BitLength >::fast  value_type;
 
         /** \brief  Reflect (part of) the given value
 
@@ -858,13 +895,13 @@ namespace detail
             This is a Boost integral constant indicating that this class
             does reflect its input values.
          */
-        typedef boost::true_type              is_reflecting_type;
+        typedef std::true_type              is_reflecting_type;
         /** \brief  The type to check for register bit length
 
             This is a Boost integral constant indicating how many
             significant bits will be reflected.
          */
-        typedef boost::integral_constant< int, BitLength >  width_c;
+        typedef std::integral_constant< int, BitLength >  width_c;
         /** \brief  The type of reflected values
 
             This is both the input and output type for the reflection function.
@@ -900,7 +937,7 @@ namespace detail
      */
     template < int BitLength >
     class reflector
-        : public boost::conditional< (BitLength > CHAR_BIT),
+        : public std::conditional< (BitLength > CHAR_BIT),
           super_byte_reflector<BitLength>, sub_type_reflector<BitLength> >::type
     { };
 
@@ -919,7 +956,7 @@ namespace detail
      */
     template < int BitLength, bool DoIt, int Id >
     class possible_reflector
-        : public boost::conditional< DoIt, reflector<BitLength>,
+        : public std::conditional< DoIt, reflector<BitLength>,
           non_reflector<BitLength> >::type
     {
     public:
@@ -928,7 +965,7 @@ namespace detail
             This is a Boost integral constant indicating what ID number this
             instantiation used.
          */
-        typedef boost::integral_constant<int, Id>  id_type;
+        typedef std::integral_constant<int, Id>  id_type;
     };
 
     /** \brief  Find the composite remainder update effect from a fixed bit
@@ -974,14 +1011,14 @@ namespace detail
           same composite mask table as using augmented-CRC routines.
      */
     template < int SubOrder, typename Register >
-    boost::array< Register, (UINTMAX_C( 1 ) << SubOrder) >
+    std::array< Register, (UINTMAX_C( 1 ) << SubOrder) >
     make_partial_xor_products_table( int register_length, Register
      truncated_divisor, bool reflect )
     {
-        boost::array<Register, ( UINTMAX_C(1) << SubOrder )>  result = { 0 };
+        std::array<Register, ( UINTMAX_C(1) << SubOrder )>  result = { 0 };
 
         // Loop over every possible dividend value
-        for ( typename boost::uint_t<SubOrder + 1>::fast  dividend = 0u;
+        for ( typename boost::crc_detail::uint_t<SubOrder + 1>::fast  dividend = 0u;
          dividend < result.size() ; ++dividend )
         {
             Register  remainder = 0u;
@@ -1014,7 +1051,7 @@ namespace detail
           bit from a new dividend's bits and go down, as normal.  Otherwise,
           proceed from the lowest-order bit and go up.
      */
-    template < int Order, int SubOrder, boost::uintmax_t TruncatedPolynomial,
+    template < int Order, int SubOrder, std::uintmax_t TruncatedPolynomial,
      bool Reflect >
     class crc_table_t
     {
@@ -1024,31 +1061,31 @@ namespace detail
             This is a Boost integral constant indicating how many
             significant bits are in the remainder and (truncated) divisor.
          */
-        typedef boost::integral_constant< int, Order >              width_c;
+        typedef std::integral_constant< int, Order >              width_c;
         /** \brief  The type to check for index-unit bit length
 
             This is a Boost integral constant indicating how many
             significant bits are in the trial new dividends.
          */
-        typedef boost::integral_constant< int, SubOrder >      unit_width_c;
+        typedef std::integral_constant< int, SubOrder >      unit_width_c;
         /** \brief  The type of registers
 
             This is the output type for the partial-product map.
          */
-        typedef typename boost::uint_t< Order >::fast          value_type;
+        typedef typename boost::crc_detail::uint_t< Order >::fast          value_type;
         /** \brief  The type to check the divisor
 
             This is a Boost integral constant representing the (truncated)
             divisor.
          */
-        typedef boost::integral_constant< value_type, TruncatedPolynomial >
+        typedef std::integral_constant< value_type, TruncatedPolynomial >
           poly_c;
         /** \brief  The type to check for reflection
 
             This is a Boost integral constant representing whether input
             units should be read in reverse order.
          */
-        typedef boost::integral_constant< bool, Reflect >           refin_c;
+        typedef std::integral_constant< bool, Reflect >           refin_c;
         /** \brief  The type to check for map size
 
             This is a Boost integral constant representing the number of
@@ -1060,7 +1097,7 @@ namespace detail
             This is the array type that takes units as the index and said unit's
             composite partial-product mask as the element.
          */
-        typedef boost::array<value_type, table_size_c::value>  array_type;
+        typedef std::array<value_type, table_size_c::value>  array_type;
         /** \brief  Create a global array for the mapping table
 
             Creates an instance of a partial-product array with this class's
@@ -1095,7 +1132,7 @@ namespace detail
           polynomial.  The highest-order coefficient is omitted and always
           assumed to be 1.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial >
+    template < int Order, std::uintmax_t TruncatedPolynomial >
     class direct_byte_table_driven_crcs
         : public crc_table_t<Order, CHAR_BIT, TruncatedPolynomial, false>
     {
@@ -1131,7 +1168,7 @@ namespace detail
                 // Complete the multi-bit modulo-2 polynomial division
                 remainder <<= CHAR_BIT;
                 remainder |= *new_dividend_bytes++;
-                remainder ^= table.elems[ index ];
+                remainder ^= table[ index ];
             }
 
             return remainder;
@@ -1162,7 +1199,7 @@ namespace detail
 
                 // Complete the multi-bit altered modulo-2 polynomial division
                 remainder <<= CHAR_BIT;
-                remainder ^= table.elems[ index ];
+                remainder ^= table[ index ];
             }
 
             return remainder;
@@ -1185,7 +1222,7 @@ namespace detail
           polynomial.  The highest-order coefficient is omitted and always
           assumed to be 1.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial >
+    template < int Order, std::uintmax_t TruncatedPolynomial >
     class reflected_byte_table_driven_crcs
         : public crc_table_t<Order, CHAR_BIT, TruncatedPolynomial, true>
     {
@@ -1223,7 +1260,7 @@ namespace detail
                 remainder >>= CHAR_BIT;
                 remainder |= static_cast<value_type>( *new_dividend_bytes++ )
                  << ( Order - CHAR_BIT );
-                remainder ^= table.elems[ index ];
+                remainder ^= table[ index ];
             }
 
             return remainder;
@@ -1256,7 +1293,7 @@ namespace detail
                 // Complete the multi-bit reflected altered modulo-2 polynomial
                 // division
                 remainder >>= CHAR_BIT;
-                remainder ^= table.elems[ index ];
+                remainder ^= table[ index ];
             }
 
             return remainder;
@@ -1282,9 +1319,9 @@ namespace detail
           input byte and go down, as normal.  Otherwise, proceed from the
           lowest-order bit and go up.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial, bool Reflect >
+    template < int Order, std::uintmax_t TruncatedPolynomial, bool Reflect >
     class byte_table_driven_crcs
-        : public boost::conditional< Reflect,
+        : public std::conditional< Reflect,
           reflected_byte_table_driven_crcs<Order, TruncatedPolynomial>,
           direct_byte_table_driven_crcs<Order, TruncatedPolynomial> >::type
     { };
@@ -1304,7 +1341,7 @@ namespace detail
           polynomial.  The highest-order coefficient is omitted and always
           assumed to be 1.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial >
+    template < int Order, std::uintmax_t TruncatedPolynomial >
     class direct_sub_byte_crcs
         : public crc_table_t<Order, Order, TruncatedPolynomial, false>
     {
@@ -1387,7 +1424,7 @@ namespace detail
           polynomial.  The highest-order coefficient is omitted and always
           assumed to be 1.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial >
+    template < int Order, std::uintmax_t TruncatedPolynomial >
     class reflected_sub_byte_crcs
         : public crc_table_t<Order, Order, TruncatedPolynomial, true>
     {
@@ -1479,9 +1516,9 @@ namespace detail
           input byte and go down, as normal.  Otherwise, proceed from the
           lowest-order bit and go up.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial, bool Reflect >
+    template < int Order, std::uintmax_t TruncatedPolynomial, bool Reflect >
     class sub_byte_crcs
-        : public boost::conditional< Reflect,
+        : public std::conditional< Reflect,
           reflected_sub_byte_crcs<Order, TruncatedPolynomial>,
           direct_sub_byte_crcs<Order, TruncatedPolynomial> >::type
     { };
@@ -1503,10 +1540,10 @@ namespace detail
         \tparam Id  An extra differentiator if multiple copies of this class
           template are mixed-in as base classes.  Defaults to 0 if omitted.
      */
-    template < int Order, boost::uintmax_t TruncatedPolynomial, bool Reflect,
+    template < int Order, std::uintmax_t TruncatedPolynomial, bool Reflect,
      int Id >
     class crc_driver
-        : public boost::conditional< (Order < CHAR_BIT), sub_byte_crcs<Order,
+        : public std::conditional< (Order < CHAR_BIT), sub_byte_crcs<Order,
           TruncatedPolynomial, Reflect>, byte_table_driven_crcs<Order,
           TruncatedPolynomial, Reflect> >::type
     {
@@ -1516,7 +1553,7 @@ namespace detail
             This is a Boost integral constant indicating what ID number this
             instantiation used.
          */
-        typedef boost::integral_constant<int, Id>  id_type;
+        typedef std::integral_constant<int, Id>  id_type;
     };
 
 
@@ -2227,7 +2264,7 @@ template < std::size_t Bits, BOOST_CRC_PARM_TYPE TruncPoly,
            BOOST_CRC_PARM_TYPE InitRem, BOOST_CRC_PARM_TYPE FinalXor,
            bool ReflectIn, bool ReflectRem >
 inline
-typename uint_t<Bits>::fast
+typename crc_detail::uint_t<Bits>::fast
 crc
 (
     void const *  buffer,
@@ -2289,12 +2326,12 @@ crc
       be used only if \c CHAR_BIT divides \a Bits evenly!
  */
 template < std::size_t Bits, BOOST_CRC_PARM_TYPE TruncPoly >
-typename uint_t<Bits>::fast
+typename crc_detail::uint_t<Bits>::fast
 augmented_crc
 (
     void const *                 buffer,
     std::size_t                  byte_count,
-    typename uint_t<Bits>::fast  initial_remainder  // = 0u
+    typename crc_detail::uint_t<Bits>::fast  initial_remainder  // = 0u
 )
 {
     return detail::low_bits_mask_c<Bits>::value &
diff --git a/inst/include/boost/detail/atomic_count.hpp b/inst/include/boost/detail/atomic_count.hpp
index 5411c7ae9..ba9018350 100644
--- a/inst/include/boost/detail/atomic_count.hpp
+++ b/inst/include/boost/detail/atomic_count.hpp
@@ -1,20 +1,13 @@
 #ifndef BOOST_DETAIL_ATOMIC_COUNT_HPP_INCLUDED
 #define BOOST_DETAIL_ATOMIC_COUNT_HPP_INCLUDED
 
-// MS compatible compilers support #pragma once
+// Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
+#include <boost/config/header_deprecated.hpp>
 
-//
-//  boost/detail/atomic_count.hpp - thread/SMP safe reference counter
-//
-//  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
+BOOST_HEADER_DEPRECATED("<boost/smart_ptr/detail/atomic_count.hpp>")
 
 #include <boost/smart_ptr/detail/atomic_count.hpp>
 
diff --git a/inst/include/boost/detail/basic_pointerbuf.hpp b/inst/include/boost/detail/basic_pointerbuf.hpp
index 424dcaccb..07ea44f3c 100644
--- a/inst/include/boost/detail/basic_pointerbuf.hpp
+++ b/inst/include/boost/detail/basic_pointerbuf.hpp
@@ -18,7 +18,8 @@
 # pragma once
 #endif
 
-#include "boost/config.hpp"
+#include <boost/config.hpp>
+
 #include <streambuf>
 
 namespace boost { namespace detail {
@@ -71,7 +72,7 @@ template<class charT, class BufferT>
 typename basic_pointerbuf<charT, BufferT>::pos_type
 basic_pointerbuf<charT, BufferT>::seekoff(off_type off, ::std::ios_base::seekdir way, ::std::ios_base::openmode which)
 {
-   typedef typename boost::int_t<sizeof(way) * CHAR_BIT>::least cast_type;
+   typedef ::std::ios_base::seekdir cast_type;
 
    if(which & ::std::ios_base::out)
       return pos_type(off_type(-1));
diff --git a/inst/include/boost/detail/lcast_precision.hpp b/inst/include/boost/detail/lcast_precision.hpp
index dadf9c9e2..e55514140 100644
--- a/inst/include/boost/detail/lcast_precision.hpp
+++ b/inst/include/boost/detail/lcast_precision.hpp
@@ -13,61 +13,43 @@
 #include <limits>
 
 #include <boost/config.hpp>
-#include <boost/integer_traits.hpp>
-
-#ifndef BOOST_NO_IS_ABSTRACT
-// Fix for SF:1358600 - lexical_cast & pure virtual functions & VC 8 STL
-#include <boost/type_traits/conditional.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#endif
 
 namespace boost { namespace detail {
 
-class lcast_abstract_stub {};
-
 // Calculate an argument to pass to std::ios_base::precision from
-// lexical_cast. See alternative implementation for broken standard
-// libraries in lcast_get_precision below. Keep them in sync, please.
+// lexical_cast.
 template<class T>
 struct lcast_precision
 {
-#ifdef BOOST_NO_IS_ABSTRACT
-    typedef std::numeric_limits<T> limits; // No fix for SF:1358600.
-#else
-    typedef typename boost::conditional<
-        boost::is_abstract<T>::value
-      , std::numeric_limits<lcast_abstract_stub>
-      , std::numeric_limits<T>
-      >::type limits;
-#endif
-
-    BOOST_STATIC_CONSTANT(bool, use_default_precision =
+    using limits = std::numeric_limits<T>;
+
+    static constexpr bool use_default_precision =
             !limits::is_specialized || limits::is_exact
-        );
+        ;
 
-    BOOST_STATIC_CONSTANT(bool, is_specialized_bin =
+    static constexpr bool is_specialized_bin =
             !use_default_precision &&
             limits::radix == 2 && limits::digits > 0
-        );
+        ;
 
-    BOOST_STATIC_CONSTANT(bool, is_specialized_dec =
+    static constexpr bool is_specialized_dec =
             !use_default_precision &&
             limits::radix == 10 && limits::digits10 > 0
-        );
+        ;
 
-    BOOST_STATIC_CONSTANT(std::streamsize, streamsize_max =
-            boost::integer_traits<std::streamsize>::const_max
-        );
+    static constexpr std::streamsize streamsize_max =
+            (std::numeric_limits<std::streamsize>::max)()
+        ;
 
-    BOOST_STATIC_CONSTANT(unsigned int, precision_dec = limits::digits10 + 1U);
+    static constexpr unsigned int precision_dec = limits::digits10 + 1U;
 
     static_assert(!is_specialized_dec ||
             precision_dec <= streamsize_max + 0UL
         , "");
 
-    BOOST_STATIC_CONSTANT(unsigned long, precision_bin =
+    static constexpr unsigned long precision_bin =
             2UL + limits::digits * 30103UL / 100000UL
-        );
+        ;
 
     static_assert(!is_specialized_bin ||
             (limits::digits + 0UL < ULONG_MAX / 30103UL &&
@@ -75,30 +57,23 @@ struct lcast_precision
             precision_bin <= streamsize_max + 0UL)
         , "");
 
-    BOOST_STATIC_CONSTANT(std::streamsize, value =
+    static constexpr std::streamsize value =
             is_specialized_bin ? precision_bin
                                : is_specialized_dec ? precision_dec : 6
-        );
+        ;
 };
 
-
-template<class T>
-inline std::streamsize lcast_get_precision(T* = 0)
-{
-    return lcast_precision<T>::value;
-}
-
 template<class T>
 inline void lcast_set_precision(std::ios_base& stream, T*)
 {
-    stream.precision(lcast_get_precision<T>());
+    stream.precision(lcast_precision<T>::value);
 }
 
 template<class Source, class Target>
 inline void lcast_set_precision(std::ios_base& stream, Source*, Target*)
 {
-    std::streamsize const s = lcast_get_precision(static_cast<Source*>(0));
-    std::streamsize const t = lcast_get_precision(static_cast<Target*>(0));
+    std::streamsize const s = lcast_precision<Source>::value;
+    std::streamsize const t = lcast_precision<Target*>::value;
     stream.precision(s > t ? s : t);
 }
 
diff --git a/inst/include/boost/detail/lightweight_mutex.hpp b/inst/include/boost/detail/lightweight_mutex.hpp
index b7a7f6dd4..c681e1911 100644
--- a/inst/include/boost/detail/lightweight_mutex.hpp
+++ b/inst/include/boost/detail/lightweight_mutex.hpp
@@ -1,21 +1,13 @@
 #ifndef BOOST_DETAIL_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
 #define BOOST_DETAIL_LIGHTWEIGHT_MUTEX_HPP_INCLUDED
 
-// MS compatible compilers support #pragma once
+// Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
+#include <boost/config/header_deprecated.hpp>
 
-//
-//  boost/detail/lightweight_mutex.hpp - lightweight mutex
-//
-//  Copyright (c) 2002, 2003 Peter Dimov and Multi Media Ltd.
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-//
+BOOST_HEADER_DEPRECATED("<boost/smart_ptr/detail/lightweight_mutex.hpp>")
 
 #include <boost/smart_ptr/detail/lightweight_mutex.hpp>
 
diff --git a/inst/include/boost/detail/lightweight_test_report.hpp b/inst/include/boost/detail/lightweight_test_report.hpp
index 1511ba9d1..5717d7cd3 100644
--- a/inst/include/boost/detail/lightweight_test_report.hpp
+++ b/inst/include/boost/detail/lightweight_test_report.hpp
@@ -53,4 +53,4 @@ int cpp_main(int argc, char* argv[])
   std::cout << std::endl;
 
   return test_main(argc, argv);
-}
\ No newline at end of file
+}
diff --git a/inst/include/boost/detail/lightweight_thread.hpp b/inst/include/boost/detail/lightweight_thread.hpp
index bf94538a5..2d7ba8f0b 100644
--- a/inst/include/boost/detail/lightweight_thread.hpp
+++ b/inst/include/boost/detail/lightweight_thread.hpp
@@ -1,25 +1,14 @@
 #ifndef BOOST_DETAIL_LIGHTWEIGHT_THREAD_HPP_INCLUDED
 #define BOOST_DETAIL_LIGHTWEIGHT_THREAD_HPP_INCLUDED
 
-// MS compatible compilers support #pragma once
+// Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+// Copyright (c) 2008, 2018 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
+#include <boost/config/header_deprecated.hpp>
 
-//  boost/detail/lightweight_thread.hpp
-//
-//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2008, 2018 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-//
-//
-//  typedef /*...*/ lw_thread_t; // as pthread_t
-//  template<class F> int lw_thread_create( lw_thread_t & th, F f );
-//  void lw_thread_join( lw_thread_t th );
+BOOST_HEADER_DEPRECATED("<boost/smart_ptr/detail/lightweight_thread.hpp>")
 
 #include <boost/smart_ptr/detail/lightweight_thread.hpp>
 
diff --git a/inst/include/boost/detail/quick_allocator.hpp b/inst/include/boost/detail/quick_allocator.hpp
index d54b3a792..e56142c40 100644
--- a/inst/include/boost/detail/quick_allocator.hpp
+++ b/inst/include/boost/detail/quick_allocator.hpp
@@ -1,22 +1,14 @@
 #ifndef BOOST_DETAIL_QUICK_ALLOCATOR_HPP_INCLUDED
 #define BOOST_DETAIL_QUICK_ALLOCATOR_HPP_INCLUDED
 
-// MS compatible compilers support #pragma once
+// Copyright (c) 2003 David Abrahams
+// Copyright (c) 2003 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
+#include <boost/config/header_deprecated.hpp>
 
-//
-//  detail/quick_allocator.hpp
-//
-//  Copyright (c) 2003 David Abrahams
-//  Copyright (c) 2003 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-//
+BOOST_HEADER_DEPRECATED("<boost/smart_ptr/detail/quick_allocator.hpp>")
 
 #include <boost/smart_ptr/detail/quick_allocator.hpp>
 
diff --git a/inst/include/boost/exception/current_exception_cast.hpp b/inst/include/boost/exception/current_exception_cast.hpp
index 950eeff17..ddcfd27ef 100644
--- a/inst/include/boost/exception/current_exception_cast.hpp
+++ b/inst/include/boost/exception/current_exception_cast.hpp
@@ -7,7 +7,7 @@
 #define BOOST_EXCEPTION_7E83C166200811DE885E826156D89593
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/detail/clone_current_exception.hpp b/inst/include/boost/exception/detail/clone_current_exception.hpp
index 5c953c1a1..d560f1cb8 100644
--- a/inst/include/boost/exception/detail/clone_current_exception.hpp
+++ b/inst/include/boost/exception/detail/clone_current_exception.hpp
@@ -7,7 +7,7 @@
 #define BOOST_EXCEPTION_81522C0EB56511DFAB613DB0DFD72085
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/detail/error_info_impl.hpp b/inst/include/boost/exception/detail/error_info_impl.hpp
index 30ccffd14..d97c6f351 100644
--- a/inst/include/boost/exception/detail/error_info_impl.hpp
+++ b/inst/include/boost/exception/detail/error_info_impl.hpp
@@ -14,7 +14,7 @@
 #include <string>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/detail/exception_ptr.hpp b/inst/include/boost/exception/detail/exception_ptr.hpp
index cdfc3bed3..ebacd363c 100644
--- a/inst/include/boost/exception/detail/exception_ptr.hpp
+++ b/inst/include/boost/exception/detail/exception_ptr.hpp
@@ -7,7 +7,7 @@
 #ifndef BOOST_EXCEPTION_618474C2DE1511DEB74A388C56D89593
 #define BOOST_EXCEPTION_618474C2DE1511DEB74A388C56D89593
 
-#include <boost/config.hpp>
+#include <boost/exception/detail/requires_cxx11.hpp>
 #include <boost/exception/exception.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/exception/diagnostic_information.hpp>
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/detail/is_output_streamable.hpp b/inst/include/boost/exception/detail/is_output_streamable.hpp
index a61f986bc..980cddc09 100644
--- a/inst/include/boost/exception/detail/is_output_streamable.hpp
+++ b/inst/include/boost/exception/detail/is_output_streamable.hpp
@@ -9,7 +9,7 @@
 #include <ostream>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/detail/object_hex_dump.hpp b/inst/include/boost/exception/detail/object_hex_dump.hpp
index c195de50d..42d517b81 100644
--- a/inst/include/boost/exception/detail/object_hex_dump.hpp
+++ b/inst/include/boost/exception/detail/object_hex_dump.hpp
@@ -14,7 +14,7 @@
 #include <cstdlib>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/smart_ptr/detail/requires_cxx11.hpp b/inst/include/boost/exception/detail/requires_cxx11.hpp
similarity index 63%
rename from inst/include/boost/smart_ptr/detail/requires_cxx11.hpp
rename to inst/include/boost/exception/detail/requires_cxx11.hpp
index fd719c877..85ab2a376 100644
--- a/inst/include/boost/smart_ptr/detail/requires_cxx11.hpp
+++ b/inst/include/boost/exception/detail/requires_cxx11.hpp
@@ -1,7 +1,8 @@
-#ifndef BOOST_SMART_PTR_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-#define BOOST_SMART_PTR_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+#ifndef BOOST_EXCEPTION_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+#define BOOST_EXCEPTION_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
 
 // Copyright 2023 Peter Dimov
+// Copyright 2024 Emil Dotchevski
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
@@ -16,8 +17,8 @@
     defined(BOOST_NO_CXX11_NULLPTR) || \
     defined(BOOST_NO_CXX11_SMART_PTR)
 
-BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.SmartPtr 1.82 and will be removed in Boost.SmartPtr 1.85.")
+BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.Exception 1.85 and will be removed in Boost.Exception 1.87.")
 
 #endif
 
-#endif // #ifndef BOOST_SMART_PTR_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+#endif
\ No newline at end of file
diff --git a/inst/include/boost/exception/detail/type_info.hpp b/inst/include/boost/exception/detail/type_info.hpp
index 0d46fd6e8..72716b52b 100644
--- a/inst/include/boost/exception/detail/type_info.hpp
+++ b/inst/include/boost/exception/detail/type_info.hpp
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/diagnostic_information.hpp b/inst/include/boost/exception/diagnostic_information.hpp
index 145fbe5b0..b26c502db 100644
--- a/inst/include/boost/exception/diagnostic_information.hpp
+++ b/inst/include/boost/exception/diagnostic_information.hpp
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/errinfo_errno.hpp b/inst/include/boost/exception/errinfo_errno.hpp
index 31cd78265..08d1a7333 100644
--- a/inst/include/boost/exception/errinfo_errno.hpp
+++ b/inst/include/boost/exception/errinfo_errno.hpp
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/exception.hpp b/inst/include/boost/exception/exception.hpp
index ca8d83359..4ec18d7d3 100644
--- a/inst/include/boost/exception/exception.hpp
+++ b/inst/include/boost/exception/exception.hpp
@@ -19,7 +19,7 @@ namespace boost { namespace exception_detail { using boost::shared_ptr; } }
 #endif
 
 #if !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/get_error_info.hpp b/inst/include/boost/exception/get_error_info.hpp
index 09a224aa5..efe093eed 100644
--- a/inst/include/boost/exception/get_error_info.hpp
+++ b/inst/include/boost/exception/get_error_info.hpp
@@ -14,7 +14,7 @@
 #include <boost/assert.hpp>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/info.hpp b/inst/include/boost/exception/info.hpp
index 3fd6681f5..f6a350f63 100644
--- a/inst/include/boost/exception/info.hpp
+++ b/inst/include/boost/exception/info.hpp
@@ -14,7 +14,7 @@
 #include <map>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/info_tuple.hpp b/inst/include/boost/exception/info_tuple.hpp
index 74d7e8734..8dc6a4c31 100644
--- a/inst/include/boost/exception/info_tuple.hpp
+++ b/inst/include/boost/exception/info_tuple.hpp
@@ -10,7 +10,7 @@
 #include <boost/tuple/tuple.hpp>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/to_string.hpp b/inst/include/boost/exception/to_string.hpp
index 49f1b18d0..513c87471 100644
--- a/inst/include/boost/exception/to_string.hpp
+++ b/inst/include/boost/exception/to_string.hpp
@@ -11,7 +11,7 @@
 #include <sstream>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/exception/to_string_stub.hpp b/inst/include/boost/exception/to_string_stub.hpp
index 5fbfba7ec..151b38e5d 100644
--- a/inst/include/boost/exception/to_string_stub.hpp
+++ b/inst/include/boost/exception/to_string_stub.hpp
@@ -11,7 +11,7 @@
 #include <boost/assert.hpp>
 
 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
diff --git a/inst/include/boost/filesystem.hpp b/inst/include/boost/filesystem.hpp
index 8b1480024..ee22fbcac 100644
--- a/inst/include/boost/filesystem.hpp
+++ b/inst/include/boost/filesystem.hpp
@@ -18,6 +18,5 @@
 #include <boost/filesystem/directory.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/file_status.hpp>
-#include <boost/filesystem/convenience.hpp>
 
 #endif // BOOST_FILESYSTEM_FILESYSTEM_HPP
diff --git a/inst/include/boost/filesystem/config.hpp b/inst/include/boost/filesystem/config.hpp
index cf7584a79..795a0fe2c 100644
--- a/inst/include/boost/filesystem/config.hpp
+++ b/inst/include/boost/filesystem/config.hpp
@@ -32,6 +32,7 @@
 #endif
 
 #define BOOST_FILESYSTEM_VERSIONED_SYM(sym) BOOST_JOIN(sym, BOOST_JOIN(_v, BOOST_FILESYSTEM_VERSION))
+#define BOOST_FILESYSTEM_VERSION_NAMESPACE BOOST_JOIN(v, BOOST_FILESYSTEM_VERSION)
 
 #if BOOST_FILESYSTEM_VERSION == 4
 #undef BOOST_FILESYSTEM_DEPRECATED
diff --git a/inst/include/boost/filesystem/convenience.hpp b/inst/include/boost/filesystem/convenience.hpp
deleted file mode 100644
index d66add2de..000000000
--- a/inst/include/boost/filesystem/convenience.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//  boost/filesystem/convenience.hpp  ----------------------------------------//
-
-//  Copyright Beman Dawes, 2002-2005
-//  Copyright Vladimir Prus, 2002
-
-//  Use, modification, and distribution is subject to the Boost Software
-//  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-//  See library home page at http://www.boost.org/libs/filesystem
-
-//----------------------------------------------------------------------------//
-
-#ifndef BOOST_FILESYSTEM_CONVENIENCE_HPP
-#define BOOST_FILESYSTEM_CONVENIENCE_HPP
-
-#include <boost/filesystem/config.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/system/error_code.hpp>
-
-#include <boost/filesystem/detail/header.hpp> // must be the last #include
-
-namespace boost {
-namespace filesystem {
-
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::extension() instead")
-inline std::string extension(const path& p)
-{
-    return p.extension().string();
-}
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::stem() instead")
-inline std::string basename(const path& p)
-{
-    return p.stem().string();
-}
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::replace_extension() instead")
-inline path change_extension(const path& p, const path& new_extension)
-{
-    path new_p(p);
-    new_p.replace_extension(new_extension);
-    return new_p;
-}
-
-#endif
-
-} // namespace filesystem
-} // namespace boost
-
-#include <boost/filesystem/detail/footer.hpp>
-
-#endif // BOOST_FILESYSTEM_CONVENIENCE_HPP
diff --git a/inst/include/boost/filesystem/detail/path_traits.hpp b/inst/include/boost/filesystem/detail/path_traits.hpp
index e639b021f..4cd81a2e7 100644
--- a/inst/include/boost/filesystem/detail/path_traits.hpp
+++ b/inst/include/boost/filesystem/detail/path_traits.hpp
@@ -1,7 +1,7 @@
 //  filesystem path_traits.hpp  --------------------------------------------------------//
 
 //  Copyright Beman Dawes 2009
-//  Copyright Andrey Semashev 2022
+//  Copyright Andrey Semashev 2022-2024
 
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
@@ -18,21 +18,19 @@
 #include <locale>
 #include <string>
 #include <iterator>
+#include <type_traits>
 #if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
 #include <string_view>
 #endif
 #include <boost/assert.hpp>
 #include <boost/system/error_category.hpp>
 #include <boost/iterator/is_iterator.hpp>
-#include <boost/type_traits/declval.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/type_traits/conjunction.hpp>
+#include <boost/filesystem/detail/type_traits/negation.hpp>
+#include <boost/filesystem/detail/type_traits/conjunction.hpp>
 #if defined(BOOST_FILESYSTEM_DETAIL_CXX23_STRING_VIEW_HAS_IMPLICIT_RANGE_CTOR)
-#include <boost/type_traits/disjunction.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/filesystem/detail/type_traits/disjunction.hpp>
 #endif
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
+#if defined(BOOST_FILESYSTEM_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
 #include <vector>
 #include <list>
 #endif
@@ -49,8 +47,9 @@ template< typename, typename, typename > class basic_string;
 
 namespace filesystem {
 
-BOOST_FILESYSTEM_DECL system::error_category const& codecvt_error_category() BOOST_NOEXCEPT;
+BOOST_FILESYSTEM_DECL system::error_category const& codecvt_error_category() noexcept;
 
+class path;
 class directory_entry;
 
 namespace detail {
@@ -256,7 +255,7 @@ struct path_source_traits< boost::basic_string_view< wchar_t, std::char_traits<
     static BOOST_CONSTEXPR_OR_CONST bool is_native = false;
 };
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
+#if defined(BOOST_FILESYSTEM_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
 template< >
 struct
 BOOST_FILESYSTEM_DETAIL_DEPRECATED("Boost.Filesystem path construction/assignment/appending from containers is deprecated, use strings or iterators instead.")
@@ -298,7 +297,7 @@ path_source_traits< std::list< wchar_t > >
     typedef wchar_t char_type;
     static BOOST_CONSTEXPR_OR_CONST bool is_native = false;
 };
-#endif // !defined(BOOST_FILESYSTEM_NO_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
+#endif // defined(BOOST_FILESYSTEM_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
 
 template< >
 struct path_source_traits< directory_entry >
@@ -315,13 +314,13 @@ struct path_source_traits< directory_entry >
 //! The trait tests if the type is a known path Source tag
 template< typename Tag >
 struct is_known_path_source_tag :
-    public boost::true_type
+    public std::true_type
 {
 };
 
 template< >
 struct is_known_path_source_tag< unknown_type_tag > :
-    public boost::false_type
+    public std::false_type
 {
 };
 
@@ -336,7 +335,7 @@ struct is_path_source :
 //! The trait indicates whether the type is a path Source that is natively supported by path::string_type as the source for construction/assignment/appending
 template< typename T >
 struct is_native_path_source :
-    public boost::integral_constant< bool, path_source_traits< T >::is_native >
+    public std::integral_constant< bool, path_source_traits< T >::is_native >
 {
 };
 
@@ -344,19 +343,19 @@ struct is_native_path_source :
 //! The trait indicates whether the type is one of the supported path character types
 template< typename T >
 struct is_path_char_type :
-    public boost::false_type
+    public std::false_type
 {
 };
 
 template< >
 struct is_path_char_type< char > :
-    public boost::true_type
+    public std::true_type
 {
 };
 
 template< >
 struct is_path_char_type< wchar_t > :
-    public boost::true_type
+    public std::true_type
 {
 };
 
@@ -370,10 +369,13 @@ struct is_iterator_to_path_chars :
 //! The trait indicates whether the type is an iterator over a sequence of path characters
 template< typename Iterator >
 struct is_path_source_iterator :
-    public boost::conjunction<
-        boost::iterators::is_iterator< Iterator >,
-        is_iterator_to_path_chars< Iterator >
-    >::type
+    public std::integral_constant<
+        bool,
+        detail::conjunction<
+            boost::iterators::is_iterator< Iterator >,
+            is_iterator_to_path_chars< Iterator >
+        >::value
+    >
 {
 };
 
@@ -381,36 +383,36 @@ struct is_path_source_iterator :
 //! The trait indicates whether the type is a pointer to a sequence of native path characters
 template< typename T >
 struct is_native_char_ptr :
-    public boost::false_type
+    public std::false_type
 {
 };
 
 template< >
 struct is_native_char_ptr< path_native_char_type* > :
-    public boost::true_type
+    public std::true_type
 {
 };
 
 template< >
 struct is_native_char_ptr< const path_native_char_type* > :
-    public boost::true_type
+    public std::true_type
 {
 };
 
 
-//! Converts character encoding using the supplied codecvt facet. If \a cvt is \c NULL then \c path::codecvt() will be used.
+//! Converts character encoding using the supplied codecvt facet. If \a cvt is \c nullptr then \c path::codecvt() will be used.
 BOOST_FILESYSTEM_DECL
-void convert(const char* from, const char* from_end, std::wstring& to, const codecvt_type* cvt = NULL);
+void convert(const char* from, const char* from_end, std::wstring& to, const codecvt_type* cvt = nullptr);
 
 //! \overload convert
 BOOST_FILESYSTEM_DECL
-void convert(const wchar_t* from, const wchar_t* from_end, std::string& to, const codecvt_type* cvt = NULL);
+void convert(const wchar_t* from, const wchar_t* from_end, std::string& to, const codecvt_type* cvt = nullptr);
 
 
 //  Source dispatch  -----------------------------------------------------------------//
 
 template< typename Source, typename Callback >
-typename Callback::result_type dispatch(Source const& source, Callback cb, const codecvt_type* cvt = NULL);
+typename Callback::result_type dispatch(Source const& source, Callback cb, const codecvt_type* cvt = nullptr);
 
 template< typename Callback >
 BOOST_FORCEINLINE typename Callback::result_type dispatch(const char* source, Callback cb, const codecvt_type* cvt, ntcts_type_tag)
@@ -437,12 +439,12 @@ BOOST_FORCEINLINE typename Callback::result_type dispatch(Source const& source,
     return cb(src.data(), src.data() + src.size(), cvt);
 }
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
+#if defined(BOOST_FILESYSTEM_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
 
 template< typename Callback >
 BOOST_FORCEINLINE typename Callback::result_type dispatch(std::vector< char > const& source, Callback cb, const codecvt_type* cvt, range_type_tag)
 {
-    const char* data = NULL, *data_end = NULL;
+    const char* data = nullptr, *data_end = nullptr;
     if (!source.empty())
     {
         data = &source[0];
@@ -454,7 +456,7 @@ BOOST_FORCEINLINE typename Callback::result_type dispatch(std::vector< char > co
 template< typename Callback >
 BOOST_FORCEINLINE typename Callback::result_type dispatch(std::vector< wchar_t > const& source, Callback cb, const codecvt_type* cvt, range_type_tag)
 {
-    const wchar_t* data = NULL, *data_end = NULL;
+    const wchar_t* data = nullptr, *data_end = nullptr;
     if (!source.empty())
     {
         data = &source[0];
@@ -463,7 +465,7 @@ BOOST_FORCEINLINE typename Callback::result_type dispatch(std::vector< wchar_t >
     return cb(data, data_end, cvt);
 }
 
-#endif // !defined(BOOST_FILESYSTEM_NO_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
+#endif // defined(BOOST_FILESYSTEM_DEPRECATED) && BOOST_FILESYSTEM_VERSION < 4
 
 // Defined in directory.hpp to avoid circular header dependencies
 template< typename Callback >
@@ -473,7 +475,7 @@ template< typename Source, typename Callback >
 BOOST_FORCEINLINE typename Callback::result_type dispatch(Source const& source, Callback cb, const codecvt_type* cvt)
 {
     return path_traits::dispatch(source, cb, cvt,
-        typename path_traits::path_source_traits< typename boost::remove_cv< Source >::type >::tag_type());
+        typename path_traits::path_source_traits< typename std::remove_cv< Source >::type >::tag_type());
 }
 
 
@@ -496,19 +498,35 @@ yes_type check_convertible(std::wstring_view const&);
 #endif
 yes_type check_convertible(boost::basic_string_view< char, std::char_traits< char > > const&);
 yes_type check_convertible(boost::basic_string_view< wchar_t, std::char_traits< wchar_t > > const&);
-#if !defined(BOOST_NO_CXX11_NULLPTR)
 no_type check_convertible(std::nullptr_t);
-#endif
 no_type check_convertible(...);
 
 } // namespace is_convertible_to_path_source_impl
 
-//! The type trait indicates whether the type has a conversion path to one of the path source types
+template< typename T >
+struct check_is_convertible_to_path_source :
+    public std::integral_constant<
+        bool,
+        sizeof(is_convertible_to_path_source_impl::check_convertible(std::declval< T const& >())) == sizeof(yes_type)
+    >
+{
+};
+
+/*!
+ * \brief The type trait indicates whether the type has a conversion path to one of the path source types.
+ *
+ * \note The type trait returns `false` if the type is convertible to `path`. This prevents testing other
+ *       conversion paths and forces the conversion to `path` to be chosen instead, to invoke a non-template
+ *       member of `path` accepting a `path` argument.
+ */
 template< typename T >
 struct is_convertible_to_path_source :
-    public boost::integral_constant<
+    public std::integral_constant<
         bool,
-        sizeof(is_convertible_to_path_source_impl::check_convertible(boost::declval< T const& >())) == sizeof(yes_type)
+        detail::conjunction<
+            detail::negation< std::is_convertible< T, path > >,
+            check_is_convertible_to_path_source< T >
+        >::value
     >
 {
 };
@@ -525,18 +543,16 @@ namespace is_convertible_to_std_string_view_impl {
 
 yes_type check_convertible(std::string_view const&);
 yes_type check_convertible(std::wstring_view const&);
-#if !defined(BOOST_NO_CXX11_NULLPTR)
 no_type check_convertible(std::nullptr_t);
-#endif
 no_type check_convertible(...);
 
 } // namespace is_convertible_to_std_string_view_impl
 
 template< typename T >
-struct is_convertible_to_std_string_view :
-    public boost::integral_constant<
+struct check_is_convertible_to_std_string_view :
+    public std::integral_constant<
         bool,
-        sizeof(is_convertible_to_std_string_view_impl::check_convertible(boost::declval< T const& >())) == sizeof(yes_type)
+        sizeof(is_convertible_to_std_string_view_impl::check_convertible(std::declval< T const& >())) == sizeof(yes_type)
     >
 {
 };
@@ -551,29 +567,39 @@ yes_type check_convertible(boost::container::basic_string< char, std::char_trait
 yes_type check_convertible(boost::container::basic_string< wchar_t, std::char_traits< wchar_t >, void > const&);
 yes_type check_convertible(boost::basic_string_view< char, std::char_traits< char > > const&);
 yes_type check_convertible(boost::basic_string_view< wchar_t, std::char_traits< wchar_t > > const&);
-#if !defined(BOOST_NO_CXX11_NULLPTR)
 no_type check_convertible(std::nullptr_t);
-#endif
 no_type check_convertible(...);
 
 } // namespace is_convertible_to_path_source_non_std_string_view_impl
 
 template< typename T >
-struct is_convertible_to_path_source_non_std_string_view :
-    public boost::integral_constant<
+struct check_is_convertible_to_path_source_non_std_string_view :
+    public std::integral_constant<
         bool,
-        sizeof(is_convertible_to_path_source_non_std_string_view_impl::check_convertible(boost::declval< T const& >())) == sizeof(yes_type)
+        sizeof(is_convertible_to_path_source_non_std_string_view_impl::check_convertible(std::declval< T const& >())) == sizeof(yes_type)
     >
 {
 };
 
-//! The type trait indicates whether the type has a conversion path to one of the path source types
+/*!
+ * \brief The type trait indicates whether the type has a conversion path to one of the path source types.
+ *
+ * \note The type trait returns `false` if the type is convertible to `path`. This prevents testing other
+ *       conversion paths and forces the conversion to `path` to be chosen instead, to invoke a non-template
+ *       member of `path` accepting a `path` argument.
+ */
 template< typename T >
 struct is_convertible_to_path_source :
-    public boost::disjunction<
-        is_convertible_to_std_string_view< T >,
-        is_convertible_to_path_source_non_std_string_view< T >
-    >::type
+    public std::integral_constant<
+        bool,
+        detail::conjunction<
+            detail::negation< std::is_convertible< T, path > >,
+            detail::disjunction<
+                check_is_convertible_to_std_string_view< T >,
+                check_is_convertible_to_path_source_non_std_string_view< T >
+            >
+        >::value
+    >
 {
 };
 
@@ -683,9 +709,9 @@ BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible_impl(std::
 #endif // !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
 
 template< typename Source, typename Callback >
-BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible(Source const& source, Callback cb, const codecvt_type* cvt = NULL)
+BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible(Source const& source, Callback cb, const codecvt_type* cvt = nullptr)
 {
-    typedef typename boost::remove_cv< Source >::type source_t;
+    typedef typename std::remove_cv< Source >::type source_t;
     return path_traits::dispatch_convertible_impl< source_t >(source, cb, cvt);
 }
 
@@ -706,22 +732,22 @@ BOOST_FORCEINLINE typename Callback::result_type dispatch_convertible_sv_impl(st
 }
 
 template< typename Source, typename Callback >
-BOOST_FORCEINLINE typename boost::disable_if_c<
-    is_convertible_to_std_string_view< typename boost::remove_cv< Source >::type >::value,
+BOOST_FORCEINLINE typename std::enable_if<
+    !check_is_convertible_to_std_string_view< typename std::remove_cv< Source >::type >::value,
     typename Callback::result_type
->::type dispatch_convertible(Source const& source, Callback cb, const codecvt_type* cvt = NULL)
+>::type dispatch_convertible(Source const& source, Callback cb, const codecvt_type* cvt = nullptr)
 {
-    typedef typename boost::remove_cv< Source >::type source_t;
+    typedef typename std::remove_cv< Source >::type source_t;
     return path_traits::dispatch_convertible_impl< source_t >(source, cb, cvt);
 }
 
 template< typename Source, typename Callback >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    is_convertible_to_std_string_view< typename boost::remove_cv< Source >::type >::value,
+BOOST_FORCEINLINE typename std::enable_if<
+    check_is_convertible_to_std_string_view< typename std::remove_cv< Source >::type >::value,
     typename Callback::result_type
->::type dispatch_convertible(Source const& source, Callback cb, const codecvt_type* cvt = NULL)
+>::type dispatch_convertible(Source const& source, Callback cb, const codecvt_type* cvt = nullptr)
 {
-    typedef typename boost::remove_cv< Source >::type source_t;
+    typedef typename std::remove_cv< Source >::type source_t;
     return path_traits::dispatch_convertible_sv_impl< source_t >(source, cb, cvt);
 }
 
diff --git a/inst/include/boost/filesystem/detail/type_traits/conjunction.hpp b/inst/include/boost/filesystem/detail/type_traits/conjunction.hpp
new file mode 100644
index 000000000..9d7cd830c
--- /dev/null
+++ b/inst/include/boost/filesystem/detail/type_traits/conjunction.hpp
@@ -0,0 +1,49 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2024 Andrey Semashev
+ */
+/*!
+ * \file filesystem/detail/type_traits/conjunction.hpp
+ *
+ * This header contains definition of \c conjunction type trait.
+ */
+
+#ifndef BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_CONJUNCTION_HPP_INCLUDED_
+#define BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_CONJUNCTION_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/filesystem/config.hpp>
+
+#if (defined(__cpp_lib_logical_traits) && (__cpp_lib_logical_traits >= 201510l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190023918) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+using std::conjunction;
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/conjunction.hpp>
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+using boost::conjunction;
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#endif
+
+#endif // BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_CONJUNCTION_HPP_INCLUDED_
diff --git a/inst/include/boost/filesystem/detail/type_traits/disjunction.hpp b/inst/include/boost/filesystem/detail/type_traits/disjunction.hpp
new file mode 100644
index 000000000..e9adc9d3e
--- /dev/null
+++ b/inst/include/boost/filesystem/detail/type_traits/disjunction.hpp
@@ -0,0 +1,49 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2024 Andrey Semashev
+ */
+/*!
+ * \file filesystem/detail/type_traits/disjunction.hpp
+ *
+ * This header contains definition of \c disjunction type trait.
+ */
+
+#ifndef BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_DISJUNCTION_HPP_INCLUDED_
+#define BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_DISJUNCTION_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/filesystem/config.hpp>
+
+#if (defined(__cpp_lib_logical_traits) && (__cpp_lib_logical_traits >= 201510l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190023918) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+using std::disjunction;
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/disjunction.hpp>
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+using boost::disjunction;
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#endif
+
+#endif // BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_DISJUNCTION_HPP_INCLUDED_
diff --git a/inst/include/boost/filesystem/detail/type_traits/negation.hpp b/inst/include/boost/filesystem/detail/type_traits/negation.hpp
new file mode 100644
index 000000000..a0c86b401
--- /dev/null
+++ b/inst/include/boost/filesystem/detail/type_traits/negation.hpp
@@ -0,0 +1,49 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2024 Andrey Semashev
+ */
+/*!
+ * \file filesystem/detail/type_traits/negation.hpp
+ *
+ * This header contains definition of \c negation type trait.
+ */
+
+#ifndef BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_NEGATION_HPP_INCLUDED_
+#define BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_NEGATION_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/filesystem/config.hpp>
+
+#if (defined(__cpp_lib_logical_traits) && (__cpp_lib_logical_traits >= 201510l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190023918) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+using std::negation;
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/negation.hpp>
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+using boost::negation;
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#endif
+
+#endif // BOOST_FILESYSTEM_DETAIL_TYPE_TRAITS_NEGATION_HPP_INCLUDED_
diff --git a/inst/include/boost/filesystem/directory.hpp b/inst/include/boost/filesystem/directory.hpp
index 6a6c90378..821b1a97b 100644
--- a/inst/include/boost/filesystem/directory.hpp
+++ b/inst/include/boost/filesystem/directory.hpp
@@ -26,7 +26,6 @@
 #include <vector>
 
 #include <boost/assert.hpp>
-#include <boost/core/scoped_enum.hpp>
 #include <boost/detail/bitmask.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
@@ -41,15 +40,36 @@
 namespace boost {
 namespace filesystem {
 
+enum class directory_options : unsigned int
+{
+    none = 0u,
+    skip_permission_denied = 1u,         // if a directory cannot be opened because of insufficient permissions, pretend that the directory is empty
+    follow_directory_symlink = 1u << 1u, // recursive_directory_iterator: follow directory symlinks
+    skip_dangling_symlinks = 1u << 2u,   // non-standard extension for recursive_directory_iterator: don't follow dangling directory symlinks,
+    pop_on_error = 1u << 3u,             // non-standard extension for recursive_directory_iterator: instead of producing an end iterator on errors,
+                                         // repeatedly invoke pop() until it succeeds or the iterator becomes equal to end iterator
+    _detail_no_follow = 1u << 4u,        // internal use only
+    _detail_no_push = 1u << 5u           // internal use only
+};
+
+BOOST_BITMASK(directory_options)
+
 class directory_iterator;
+class recursive_directory_iterator;
 
 namespace detail {
 
 struct directory_iterator_params;
 
-BOOST_FILESYSTEM_DECL void directory_iterator_construct(directory_iterator& it, path const& p, unsigned int opts, directory_iterator_params* params, system::error_code* ec);
+BOOST_FILESYSTEM_DECL void directory_iterator_construct(directory_iterator& it, path const& p, directory_options opts, directory_iterator_params* params, system::error_code* ec);
 BOOST_FILESYSTEM_DECL void directory_iterator_increment(directory_iterator& it, system::error_code* ec);
 
+struct recur_dir_itr_imp;
+
+BOOST_FILESYSTEM_DECL void recursive_directory_iterator_construct(recursive_directory_iterator& it, path const& dir_path, directory_options opts, system::error_code* ec);
+BOOST_FILESYSTEM_DECL void recursive_directory_iterator_increment(recursive_directory_iterator& it, system::error_code* ec);
+BOOST_FILESYSTEM_DECL void recursive_directory_iterator_pop(recursive_directory_iterator& it, system::error_code* ec);
+
 } // namespace detail
 
 //--------------------------------------------------------------------------------------//
@@ -64,13 +84,15 @@ BOOST_FILESYSTEM_DECL void directory_iterator_increment(directory_iterator& it,
 
 class directory_entry
 {
-    friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_construct(directory_iterator& it, path const& p, unsigned int opts, detail::directory_iterator_params* params, system::error_code* ec);
+    friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_construct(directory_iterator& it, path const& p, directory_options opts, detail::directory_iterator_params* params, system::error_code* ec);
     friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_increment(directory_iterator& it, system::error_code* ec);
 
+    friend BOOST_FILESYSTEM_DECL void detail::recursive_directory_iterator_increment(recursive_directory_iterator& it, system::error_code* ec);
+
 public:
     typedef boost::filesystem::path::value_type value_type; // enables class path ctor taking directory_entry
 
-    directory_entry() BOOST_NOEXCEPT {}
+    directory_entry() noexcept {}
 
     explicit directory_entry(boost::filesystem::path const& p);
 
@@ -102,19 +124,14 @@ class directory_entry
         return *this;
     }
 
-    //  As of October 2015 the interaction between noexcept and =default is so troublesome
-    //  for VC++, GCC, and probably other compilers, that =default is not used with noexcept
-    //  functions. GCC is not even consistent for the same release on different platforms.
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    directory_entry(directory_entry&& rhs) BOOST_NOEXCEPT :
+    directory_entry(directory_entry&& rhs) noexcept :
         m_path(static_cast< boost::filesystem::path&& >(rhs.m_path)),
         m_status(static_cast< file_status&& >(rhs.m_status)),
         m_symlink_status(static_cast< file_status&& >(rhs.m_symlink_status))
     {
     }
 
-    directory_entry& operator=(directory_entry&& rhs) BOOST_NOEXCEPT
+    directory_entry& operator=(directory_entry&& rhs) noexcept
     {
         m_path = static_cast< boost::filesystem::path&& >(rhs.m_path);
         m_status = static_cast< file_status&& >(rhs.m_status);
@@ -136,7 +153,6 @@ class directory_entry
         assign_with_status(static_cast< boost::filesystem::path&& >(p), st, symlink_st);
     }
 #endif
-#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
     void assign(boost::filesystem::path const& p);
 
@@ -174,11 +190,11 @@ class directory_entry
     }
 #endif
 
-    boost::filesystem::path const& path() const BOOST_NOEXCEPT { return m_path; }
-    operator boost::filesystem::path const&() const BOOST_NOEXCEPT { return m_path; }
+    boost::filesystem::path const& path() const noexcept { return m_path; }
+    operator boost::filesystem::path const&() const noexcept { return m_path; }
 
     void refresh() { refresh_impl(); }
-    void refresh(system::error_code& ec) BOOST_NOEXCEPT { refresh_impl(&ec); }
+    void refresh(system::error_code& ec) noexcept { refresh_impl(&ec); }
 
     file_status status() const
     {
@@ -187,7 +203,7 @@ class directory_entry
         return m_status;
     }
 
-    file_status status(system::error_code& ec) const BOOST_NOEXCEPT
+    file_status status(system::error_code& ec) const noexcept
     {
         ec.clear();
 
@@ -203,7 +219,7 @@ class directory_entry
         return m_symlink_status;
     }
 
-    file_status symlink_status(system::error_code& ec) const BOOST_NOEXCEPT
+    file_status symlink_status(system::error_code& ec) const noexcept
     {
         ec.clear();
 
@@ -219,7 +235,7 @@ class directory_entry
         return m_status.type();
     }
 
-    filesystem::file_type file_type(system::error_code& ec) const BOOST_NOEXCEPT
+    filesystem::file_type file_type(system::error_code& ec) const noexcept
     {
         ec.clear();
 
@@ -235,7 +251,7 @@ class directory_entry
         return m_symlink_status.type();
     }
 
-    filesystem::file_type symlink_file_type(system::error_code& ec) const BOOST_NOEXCEPT
+    filesystem::file_type symlink_file_type(system::error_code& ec) const noexcept
     {
         ec.clear();
 
@@ -250,7 +266,7 @@ class directory_entry
         return ft != filesystem::status_error && ft != filesystem::file_not_found;
     }
 
-    bool exists(system::error_code& ec) const BOOST_NOEXCEPT
+    bool exists(system::error_code& ec) const noexcept
     {
         filesystem::file_type ft = this->file_type(ec);
         return ft != filesystem::status_error && ft != filesystem::file_not_found;
@@ -261,7 +277,7 @@ class directory_entry
         return this->file_type() == filesystem::regular_file;
     }
 
-    bool is_regular_file(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_regular_file(system::error_code& ec) const noexcept
     {
         return this->file_type(ec) == filesystem::regular_file;
     }
@@ -271,7 +287,7 @@ class directory_entry
         return this->file_type() == filesystem::directory_file;
     }
 
-    bool is_directory(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_directory(system::error_code& ec) const noexcept
     {
         return this->file_type(ec) == filesystem::directory_file;
     }
@@ -281,7 +297,7 @@ class directory_entry
         return this->symlink_file_type() == filesystem::symlink_file;
     }
 
-    bool is_symlink(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_symlink(system::error_code& ec) const noexcept
     {
         return this->symlink_file_type(ec) == filesystem::symlink_file;
     }
@@ -291,7 +307,7 @@ class directory_entry
         return this->file_type() == filesystem::block_file;
     }
 
-    bool is_block_file(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_block_file(system::error_code& ec) const noexcept
     {
         return this->file_type(ec) == filesystem::block_file;
     }
@@ -301,7 +317,7 @@ class directory_entry
         return this->file_type() == filesystem::character_file;
     }
 
-    bool is_character_file(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_character_file(system::error_code& ec) const noexcept
     {
         return this->file_type(ec) == filesystem::character_file;
     }
@@ -311,7 +327,7 @@ class directory_entry
         return this->file_type() == filesystem::fifo_file;
     }
 
-    bool is_fifo(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_fifo(system::error_code& ec) const noexcept
     {
         return this->file_type(ec) == filesystem::fifo_file;
     }
@@ -321,7 +337,7 @@ class directory_entry
         return this->file_type() == filesystem::socket_file;
     }
 
-    bool is_socket(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_socket(system::error_code& ec) const noexcept
     {
         return this->file_type(ec) == filesystem::socket_file;
     }
@@ -331,7 +347,7 @@ class directory_entry
         return this->symlink_file_type() == filesystem::reparse_file;
     }
 
-    bool is_reparse_file(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_reparse_file(system::error_code& ec) const noexcept
     {
         return this->symlink_file_type(ec) == filesystem::reparse_file;
     }
@@ -343,7 +359,7 @@ class directory_entry
             ft != filesystem::regular_file && ft != filesystem::directory_file;
     }
 
-    bool is_other(system::error_code& ec) const BOOST_NOEXCEPT
+    bool is_other(system::error_code& ec) const noexcept
     {
         filesystem::file_type ft = this->file_type(ec);
         return ft != filesystem::status_error && ft != filesystem::file_not_found &&
@@ -358,39 +374,27 @@ class directory_entry
     bool operator>=(directory_entry const& rhs) const { return m_path >= rhs.m_path; }
 
 private:
-    BOOST_FILESYSTEM_DECL void refresh_impl(system::error_code* ec = NULL) const;
+    BOOST_FILESYSTEM_DECL void refresh_impl(system::error_code* ec = nullptr) const;
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     void assign_with_status(boost::filesystem::path&& p, file_status st, file_status symlink_st)
     {
         m_path = static_cast< boost::filesystem::path&& >(p);
         m_status = static_cast< file_status&& >(st);
         m_symlink_status = static_cast< file_status&& >(symlink_st);
     }
-#endif
 
     void assign_with_status(boost::filesystem::path const& p, file_status st, file_status symlink_st)
     {
         m_path = p;
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         m_status = static_cast< file_status&& >(st);
         m_symlink_status = static_cast< file_status&& >(symlink_st);
-#else
-        m_status = st;
-        m_symlink_status = symlink_st;
-#endif
     }
 
     void replace_filename_with_status(boost::filesystem::path const& p, file_status st, file_status symlink_st)
     {
         m_path.replace_filename(p);
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         m_status = static_cast< file_status&& >(st);
         m_symlink_status = static_cast< file_status&& >(symlink_st);
-#else
-        m_status = st;
-        m_symlink_status = symlink_st;
-#endif
     }
 
 private:
@@ -409,7 +413,6 @@ inline directory_entry::directory_entry(boost::filesystem::path const& p) :
 #endif
 }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 inline void directory_entry::assign(boost::filesystem::path&& p)
 {
     m_path = static_cast< boost::filesystem::path&& >(p);
@@ -420,7 +423,6 @@ inline void directory_entry::assign(boost::filesystem::path&& p)
     m_symlink_status = file_status();
 #endif
 }
-#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
 inline void directory_entry::assign(boost::filesystem::path const& p)
 {
@@ -477,7 +479,7 @@ inline file_status status(directory_entry const& e)
     return e.status();
 }
 
-inline file_status status(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline file_status status(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.status(ec);
 }
@@ -487,7 +489,7 @@ inline file_status symlink_status(directory_entry const& e)
     return e.symlink_status();
 }
 
-inline file_status symlink_status(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline file_status symlink_status(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.symlink_status(ec);
 }
@@ -497,7 +499,7 @@ inline bool type_present(directory_entry const& e)
     return e.file_type() != filesystem::status_error;
 }
 
-inline bool type_present(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool type_present(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.file_type(ec) != filesystem::status_error;
 }
@@ -507,7 +509,7 @@ inline bool status_known(directory_entry const& e)
     return filesystem::status_known(e.status());
 }
 
-inline bool status_known(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool status_known(directory_entry const& e, system::error_code& ec) noexcept
 {
     return filesystem::status_known(e.status(ec));
 }
@@ -517,7 +519,7 @@ inline bool exists(directory_entry const& e)
     return e.exists();
 }
 
-inline bool exists(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool exists(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.exists(ec);
 }
@@ -527,7 +529,7 @@ inline bool is_regular_file(directory_entry const& e)
     return e.is_regular_file();
 }
 
-inline bool is_regular_file(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_regular_file(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_regular_file(ec);
 }
@@ -537,7 +539,7 @@ inline bool is_directory(directory_entry const& e)
     return e.is_directory();
 }
 
-inline bool is_directory(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_directory(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_directory(ec);
 }
@@ -547,7 +549,7 @@ inline bool is_symlink(directory_entry const& e)
     return e.is_symlink();
 }
 
-inline bool is_symlink(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_symlink(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_symlink(ec);
 }
@@ -557,7 +559,7 @@ inline bool is_block_file(directory_entry const& e)
     return e.is_block_file();
 }
 
-inline bool is_block_file(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_block_file(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_block_file(ec);
 }
@@ -567,7 +569,7 @@ inline bool is_character_file(directory_entry const& e)
     return e.is_character_file();
 }
 
-inline bool is_character_file(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_character_file(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_character_file(ec);
 }
@@ -577,7 +579,7 @@ inline bool is_fifo(directory_entry const& e)
     return e.is_fifo();
 }
 
-inline bool is_fifo(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_fifo(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_fifo(ec);
 }
@@ -587,7 +589,7 @@ inline bool is_socket(directory_entry const& e)
     return e.is_socket();
 }
 
-inline bool is_socket(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_socket(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_socket(ec);
 }
@@ -597,7 +599,7 @@ inline bool is_reparse_file(directory_entry const& e)
     return e.is_reparse_file();
 }
 
-inline bool is_reparse_file(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_reparse_file(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_reparse_file(ec);
 }
@@ -607,40 +609,17 @@ inline bool is_other(directory_entry const& e)
     return e.is_other();
 }
 
-inline bool is_other(directory_entry const& e, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_other(directory_entry const& e, system::error_code& ec) noexcept
 {
     return e.is_other(ec);
 }
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use is_regular_file() instead")
-inline bool is_regular(directory_entry const& e)
-{
-    return filesystem::is_regular_file(e);
-}
-#endif
-
 //--------------------------------------------------------------------------------------//
 //                                                                                      //
 //                            directory_iterator helpers                                //
 //                                                                                      //
 //--------------------------------------------------------------------------------------//
 
-BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(directory_options, unsigned int)
-{
-    none = 0u,
-    skip_permission_denied = 1u,         // if a directory cannot be opened because of insufficient permissions, pretend that the directory is empty
-    follow_directory_symlink = 1u << 1u, // recursive_directory_iterator: follow directory symlinks
-    skip_dangling_symlinks = 1u << 2u,   // non-standard extension for recursive_directory_iterator: don't follow dangling directory symlinks,
-    pop_on_error = 1u << 3u,             // non-standard extension for recursive_directory_iterator: instead of producing an end iterator on errors,
-                                         // repeatedly invoke pop() until it succeeds or the iterator becomes equal to end iterator
-    _detail_no_follow = 1u << 4u,        // internal use only
-    _detail_no_push = 1u << 5u           // internal use only
-}
-BOOST_SCOPED_ENUM_DECLARE_END(directory_options)
-
-BOOST_BITMASK(BOOST_SCOPED_ENUM_NATIVE(directory_options))
-
 namespace detail {
 
 struct dir_itr_imp :
@@ -654,20 +633,20 @@ struct dir_itr_imp :
     directory_entry dir_entry;
     void* handle;
 
-    dir_itr_imp() BOOST_NOEXCEPT :
+    dir_itr_imp() noexcept :
 #ifdef BOOST_WINDOWS_API
         close_handle(false),
         extra_data_format(0u),
         current_offset(0u),
 #endif
-        handle(NULL)
+        handle(nullptr)
     {
     }
-    BOOST_FILESYSTEM_DECL ~dir_itr_imp() BOOST_NOEXCEPT;
+    BOOST_FILESYSTEM_DECL ~dir_itr_imp() noexcept;
 
-    BOOST_FILESYSTEM_DECL static void* operator new(std::size_t class_size, std::size_t extra_size) BOOST_NOEXCEPT;
-    BOOST_FILESYSTEM_DECL static void operator delete(void* p, std::size_t extra_size) BOOST_NOEXCEPT;
-    BOOST_FILESYSTEM_DECL static void operator delete(void* p) BOOST_NOEXCEPT;
+    BOOST_FILESYSTEM_DECL static void* operator new(std::size_t class_size, std::size_t extra_size) noexcept;
+    BOOST_FILESYSTEM_DECL static void operator delete(void* p, std::size_t extra_size) noexcept;
+    BOOST_FILESYSTEM_DECL static void operator delete(void* p) noexcept;
 };
 
 } // namespace detail
@@ -687,46 +666,46 @@ class directory_iterator :
 {
     friend class boost::iterator_core_access;
 
-    friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_construct(directory_iterator& it, path const& p, unsigned int opts, detail::directory_iterator_params* params, system::error_code* ec);
+    friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_construct(directory_iterator& it, path const& p, directory_options opts, detail::directory_iterator_params* params, system::error_code* ec);
     friend BOOST_FILESYSTEM_DECL void detail::directory_iterator_increment(directory_iterator& it, system::error_code* ec);
 
+    friend BOOST_FILESYSTEM_DECL void detail::recursive_directory_iterator_increment(recursive_directory_iterator& it, system::error_code* ec);
+
 public:
-    directory_iterator() BOOST_NOEXCEPT {} // creates the "end" iterator
+    directory_iterator() noexcept {} // creates the "end" iterator
 
     // iterator_facade derived classes don't seem to like implementations in
     // separate translation unit dll's, so forward to detail functions
-    explicit directory_iterator(path const& p, BOOST_SCOPED_ENUM_NATIVE(directory_options) opts = directory_options::none)
+    explicit directory_iterator(path const& p, directory_options opts = directory_options::none)
     {
-        detail::directory_iterator_construct(*this, p, static_cast< unsigned int >(opts), NULL, NULL);
+        detail::directory_iterator_construct(*this, p, opts, nullptr, nullptr);
     }
 
-    directory_iterator(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+    directory_iterator(path const& p, system::error_code& ec) noexcept
     {
-        detail::directory_iterator_construct(*this, p, static_cast< unsigned int >(directory_options::none), NULL, &ec);
+        detail::directory_iterator_construct(*this, p, directory_options::none, nullptr, &ec);
     }
 
-    directory_iterator(path const& p, BOOST_SCOPED_ENUM_NATIVE(directory_options) opts, system::error_code& ec) BOOST_NOEXCEPT
+    directory_iterator(path const& p, directory_options opts, system::error_code& ec) noexcept
     {
-        detail::directory_iterator_construct(*this, p, static_cast< unsigned int >(opts), NULL, &ec);
+        detail::directory_iterator_construct(*this, p, opts, nullptr, &ec);
     }
 
-    BOOST_DEFAULTED_FUNCTION(directory_iterator(directory_iterator const& that), : m_imp(that.m_imp) {})
-    BOOST_DEFAULTED_FUNCTION(directory_iterator& operator=(directory_iterator const& that), { m_imp = that.m_imp; return *this; })
+    directory_iterator(directory_iterator const&) = default;
+    directory_iterator& operator=(directory_iterator const&) = default;
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    directory_iterator(directory_iterator&& that) BOOST_NOEXCEPT :
+    directory_iterator(directory_iterator&& that) noexcept :
         m_imp(static_cast< boost::intrusive_ptr< detail::dir_itr_imp >&& >(that.m_imp))
     {
     }
 
-    directory_iterator& operator=(directory_iterator&& that) BOOST_NOEXCEPT
+    directory_iterator& operator=(directory_iterator&& that) noexcept
     {
         m_imp = static_cast< boost::intrusive_ptr< detail::dir_itr_imp >&& >(that.m_imp);
         return *this;
     }
-#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
-    directory_iterator& increment(system::error_code& ec) BOOST_NOEXCEPT
+    directory_iterator& increment(system::error_code& ec) noexcept
     {
         detail::directory_iterator_increment(*this, &ec);
         return *this;
@@ -743,14 +722,14 @@ class directory_iterator :
         return m_imp->dir_entry;
     }
 
-    void increment() { detail::directory_iterator_increment(*this, NULL); }
+    void increment() { detail::directory_iterator_increment(*this, nullptr); }
 
-    bool equal(directory_iterator const& rhs) const BOOST_NOEXCEPT
+    bool equal(directory_iterator const& rhs) const noexcept
     {
         return m_imp == rhs.m_imp || (is_end() && rhs.is_end());
     }
 
-    bool is_end() const BOOST_NOEXCEPT
+    bool is_end() const noexcept
     {
         // Note: The check for handle is needed because the iterator can be copied and the copy
         // can be incremented to end while the original iterator still refers to the same dir_itr_imp.
@@ -768,45 +747,45 @@ class directory_iterator :
 // begin() and end() are only used by a range-based for statement in the context of
 // auto - thus the top-level const is stripped - so returning const is harmless and
 // emphasizes begin() is just a pass through.
-inline directory_iterator const& begin(directory_iterator const& iter) BOOST_NOEXCEPT
+inline directory_iterator const& begin(directory_iterator const& iter) noexcept
 {
     return iter;
 }
 
-inline directory_iterator end(directory_iterator const&) BOOST_NOEXCEPT
+inline directory_iterator end(directory_iterator const&) noexcept
 {
     return directory_iterator();
 }
 
 // enable C++14 generic accessors for range const iterators
-inline directory_iterator const& cbegin(directory_iterator const& iter) BOOST_NOEXCEPT
+inline directory_iterator const& cbegin(directory_iterator const& iter) noexcept
 {
     return iter;
 }
 
-inline directory_iterator cend(directory_iterator const&) BOOST_NOEXCEPT
+inline directory_iterator cend(directory_iterator const&) noexcept
 {
     return directory_iterator();
 }
 
 //  enable directory_iterator BOOST_FOREACH  -----------------------------------------//
 
-inline directory_iterator& range_begin(directory_iterator& iter) BOOST_NOEXCEPT
+inline directory_iterator& range_begin(directory_iterator& iter) noexcept
 {
     return iter;
 }
 
-inline directory_iterator range_begin(directory_iterator const& iter) BOOST_NOEXCEPT
+inline directory_iterator range_begin(directory_iterator const& iter) noexcept
 {
     return iter;
 }
 
-inline directory_iterator range_end(directory_iterator&) BOOST_NOEXCEPT
+inline directory_iterator range_end(directory_iterator&) noexcept
 {
     return directory_iterator();
 }
 
-inline directory_iterator range_end(directory_iterator const&) BOOST_NOEXCEPT
+inline directory_iterator range_end(directory_iterator const&) noexcept
 {
     return directory_iterator();
 }
@@ -840,22 +819,6 @@ namespace filesystem {
 //                                                                                      //
 //--------------------------------------------------------------------------------------//
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-// Deprecated enum, use directory_options instead
-BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(symlink_option, unsigned int)
-{
-    none = static_cast< unsigned int >(directory_options::none),
-    no_recurse = none,                                                                  // don't follow directory symlinks (default behavior)
-    recurse = static_cast< unsigned int >(directory_options::follow_directory_symlink), // follow directory symlinks
-    _detail_no_push = static_cast< unsigned int >(directory_options::_detail_no_push)   // internal use only
-}
-BOOST_SCOPED_ENUM_DECLARE_END(symlink_option)
-
-BOOST_BITMASK(BOOST_SCOPED_ENUM_NATIVE(symlink_option))
-#endif // BOOST_FILESYSTEM_NO_DEPRECATED
-
-class recursive_directory_iterator;
-
 namespace detail {
 
 struct recur_dir_itr_imp :
@@ -863,16 +826,11 @@ struct recur_dir_itr_imp :
 {
     typedef directory_iterator element_type;
     std::vector< element_type > m_stack;
-    // directory_options values, declared as unsigned int for ABI compatibility
-    unsigned int m_options;
+    directory_options m_options;
 
-    explicit recur_dir_itr_imp(unsigned int opts) BOOST_NOEXCEPT : m_options(opts) {}
+    explicit recur_dir_itr_imp(directory_options opts) noexcept : m_options(opts) {}
 };
 
-BOOST_FILESYSTEM_DECL void recursive_directory_iterator_construct(recursive_directory_iterator& it, path const& dir_path, unsigned int opts, system::error_code* ec);
-BOOST_FILESYSTEM_DECL void recursive_directory_iterator_increment(recursive_directory_iterator& it, system::error_code* ec);
-BOOST_FILESYSTEM_DECL void recursive_directory_iterator_pop(recursive_directory_iterator& it, system::error_code* ec);
-
 } // namespace detail
 
 //--------------------------------------------------------------------------------------//
@@ -890,118 +848,83 @@ class recursive_directory_iterator :
 {
     friend class boost::iterator_core_access;
 
-    friend BOOST_FILESYSTEM_DECL void detail::recursive_directory_iterator_construct(recursive_directory_iterator& it, path const& dir_path, unsigned int opts, system::error_code* ec);
+    friend BOOST_FILESYSTEM_DECL void detail::recursive_directory_iterator_construct(recursive_directory_iterator& it, path const& dir_path, directory_options opts, system::error_code* ec);
     friend BOOST_FILESYSTEM_DECL void detail::recursive_directory_iterator_increment(recursive_directory_iterator& it, system::error_code* ec);
     friend BOOST_FILESYSTEM_DECL void detail::recursive_directory_iterator_pop(recursive_directory_iterator& it, system::error_code* ec);
 
 public:
-    recursive_directory_iterator() BOOST_NOEXCEPT {} // creates the "end" iterator
+    recursive_directory_iterator() noexcept {} // creates the "end" iterator
 
     explicit recursive_directory_iterator(path const& dir_path)
     {
-        detail::recursive_directory_iterator_construct(*this, dir_path, static_cast< unsigned int >(directory_options::none), NULL);
+        detail::recursive_directory_iterator_construct(*this, dir_path, directory_options::none, nullptr);
     }
 
     recursive_directory_iterator(path const& dir_path, system::error_code& ec)
     {
-        detail::recursive_directory_iterator_construct(*this, dir_path, static_cast< unsigned int >(directory_options::none), &ec);
+        detail::recursive_directory_iterator_construct(*this, dir_path, directory_options::none, &ec);
     }
 
-    recursive_directory_iterator(path const& dir_path, BOOST_SCOPED_ENUM_NATIVE(directory_options) opts)
+    recursive_directory_iterator(path const& dir_path, directory_options opts)
     {
-        detail::recursive_directory_iterator_construct(*this, dir_path, static_cast< unsigned int >(opts), NULL);
+        detail::recursive_directory_iterator_construct(*this, dir_path, opts, nullptr);
     }
 
-    recursive_directory_iterator(path const& dir_path, BOOST_SCOPED_ENUM_NATIVE(directory_options) opts, system::error_code& ec)
+    recursive_directory_iterator(path const& dir_path, directory_options opts, system::error_code& ec)
     {
-        detail::recursive_directory_iterator_construct(*this, dir_path, static_cast< unsigned int >(opts), &ec);
+        detail::recursive_directory_iterator_construct(*this, dir_path, opts, &ec);
     }
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-    // Deprecated constructors
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use directory_options instead of symlink_option")
-    recursive_directory_iterator(path const& dir_path, BOOST_SCOPED_ENUM_NATIVE(symlink_option) opts)
-    {
-        detail::recursive_directory_iterator_construct(*this, dir_path, static_cast< unsigned int >(opts), NULL);
-    }
+    recursive_directory_iterator(recursive_directory_iterator const&) = default;
+    recursive_directory_iterator& operator=(recursive_directory_iterator const&) = default;
 
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use directory_options instead of symlink_option")
-    recursive_directory_iterator(path const& dir_path, BOOST_SCOPED_ENUM_NATIVE(symlink_option) opts, system::error_code& ec) BOOST_NOEXCEPT
-    {
-        detail::recursive_directory_iterator_construct(*this, dir_path, static_cast< unsigned int >(opts), &ec);
-    }
-#endif // BOOST_FILESYSTEM_NO_DEPRECATED
-
-    BOOST_DEFAULTED_FUNCTION(recursive_directory_iterator(recursive_directory_iterator const& that), : m_imp(that.m_imp) {})
-    BOOST_DEFAULTED_FUNCTION(recursive_directory_iterator& operator=(recursive_directory_iterator const& that), { m_imp = that.m_imp; return *this; })
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    recursive_directory_iterator(recursive_directory_iterator&& that) BOOST_NOEXCEPT :
+    recursive_directory_iterator(recursive_directory_iterator&& that) noexcept :
         m_imp(static_cast< boost::intrusive_ptr< detail::recur_dir_itr_imp >&& >(that.m_imp))
     {
     }
 
-    recursive_directory_iterator& operator=(recursive_directory_iterator&& that) BOOST_NOEXCEPT
+    recursive_directory_iterator& operator=(recursive_directory_iterator&& that) noexcept
     {
         m_imp = static_cast< boost::intrusive_ptr< detail::recur_dir_itr_imp >&& >(that.m_imp);
         return *this;
     }
-#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
-    recursive_directory_iterator& increment(system::error_code& ec) BOOST_NOEXCEPT
+    recursive_directory_iterator& increment(system::error_code& ec) noexcept
     {
         detail::recursive_directory_iterator_increment(*this, &ec);
         return *this;
     }
 
-    int depth() const BOOST_NOEXCEPT
+    int depth() const noexcept
     {
         BOOST_ASSERT_MSG(!is_end(), "depth() on end recursive_directory_iterator");
         return static_cast< int >(m_imp->m_stack.size() - 1u);
     }
 
-    bool recursion_pending() const BOOST_NOEXCEPT
+    bool recursion_pending() const noexcept
     {
         BOOST_ASSERT_MSG(!is_end(), "recursion_pending() on end recursive_directory_iterator");
-        return (m_imp->m_options & static_cast< unsigned int >(directory_options::_detail_no_push)) == 0u;
+        return (m_imp->m_options & directory_options::_detail_no_push) == directory_options::none;
     }
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use recursive_directory_iterator::depth() instead")
-    int level() const BOOST_NOEXCEPT
-    {
-        return depth();
-    }
-    bool no_push_pending() const BOOST_NOEXCEPT { return !recursion_pending(); }
-    bool no_push_request() const BOOST_NOEXCEPT { return !recursion_pending(); }
-#endif
-
     void pop()
     {
-        detail::recursive_directory_iterator_pop(*this, NULL);
+        detail::recursive_directory_iterator_pop(*this, nullptr);
     }
 
-    void pop(system::error_code& ec) BOOST_NOEXCEPT
+    void pop(system::error_code& ec) noexcept
     {
         detail::recursive_directory_iterator_pop(*this, &ec);
     }
 
-    void disable_recursion_pending(bool value = true) BOOST_NOEXCEPT
+    void disable_recursion_pending(bool value = true) noexcept
     {
         BOOST_ASSERT_MSG(!is_end(), "disable_recursion_pending() on end recursive_directory_iterator");
         if (value)
-            m_imp->m_options |= static_cast< unsigned int >(directory_options::_detail_no_push);
+            m_imp->m_options |= directory_options::_detail_no_push;
         else
-            m_imp->m_options &= ~static_cast< unsigned int >(directory_options::_detail_no_push);
-    }
-
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use recursive_directory_iterator::disable_recursion_pending() instead")
-    void no_push(bool value = true) BOOST_NOEXCEPT
-    {
-        disable_recursion_pending(value);
+            m_imp->m_options &= ~directory_options::_detail_no_push;
     }
-#endif
 
     file_status status() const
     {
@@ -1026,14 +949,14 @@ class recursive_directory_iterator :
         return *m_imp->m_stack.back();
     }
 
-    void increment() { detail::recursive_directory_iterator_increment(*this, NULL); }
+    void increment() { detail::recursive_directory_iterator_increment(*this, nullptr); }
 
-    bool equal(recursive_directory_iterator const& rhs) const BOOST_NOEXCEPT
+    bool equal(recursive_directory_iterator const& rhs) const noexcept
     {
         return m_imp == rhs.m_imp || (is_end() && rhs.is_end());
     }
 
-    bool is_end() const BOOST_NOEXCEPT
+    bool is_end() const noexcept
     {
         // Note: The check for m_stack.empty() is needed because the iterator can be copied and the copy
         // can be incremented to end while the original iterator still refers to the same recur_dir_itr_imp.
@@ -1046,55 +969,50 @@ class recursive_directory_iterator :
     boost::intrusive_ptr< detail::recur_dir_itr_imp > m_imp;
 };
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use recursive_directory_iterator instead")
-typedef recursive_directory_iterator wrecursive_directory_iterator;
-#endif
-
 //  enable recursive directory iterator C++11 range-base for statement use  ----------//
 
 // begin() and end() are only used by a range-based for statement in the context of
 // auto - thus the top-level const is stripped - so returning const is harmless and
 // emphasizes begin() is just a pass through.
-inline recursive_directory_iterator const& begin(recursive_directory_iterator const& iter) BOOST_NOEXCEPT
+inline recursive_directory_iterator const& begin(recursive_directory_iterator const& iter) noexcept
 {
     return iter;
 }
 
-inline recursive_directory_iterator end(recursive_directory_iterator const&) BOOST_NOEXCEPT
+inline recursive_directory_iterator end(recursive_directory_iterator const&) noexcept
 {
     return recursive_directory_iterator();
 }
 
 // enable C++14 generic accessors for range const iterators
-inline recursive_directory_iterator const& cbegin(recursive_directory_iterator const& iter) BOOST_NOEXCEPT
+inline recursive_directory_iterator const& cbegin(recursive_directory_iterator const& iter) noexcept
 {
     return iter;
 }
 
-inline recursive_directory_iterator cend(recursive_directory_iterator const&) BOOST_NOEXCEPT
+inline recursive_directory_iterator cend(recursive_directory_iterator const&) noexcept
 {
     return recursive_directory_iterator();
 }
 
 //  enable recursive directory iterator BOOST_FOREACH  -------------------------------//
 
-inline recursive_directory_iterator& range_begin(recursive_directory_iterator& iter) BOOST_NOEXCEPT
+inline recursive_directory_iterator& range_begin(recursive_directory_iterator& iter) noexcept
 {
     return iter;
 }
 
-inline recursive_directory_iterator range_begin(recursive_directory_iterator const& iter) BOOST_NOEXCEPT
+inline recursive_directory_iterator range_begin(recursive_directory_iterator const& iter) noexcept
 {
     return iter;
 }
 
-inline recursive_directory_iterator range_end(recursive_directory_iterator&) BOOST_NOEXCEPT
+inline recursive_directory_iterator range_end(recursive_directory_iterator&) noexcept
 {
     return recursive_directory_iterator();
 }
 
-inline recursive_directory_iterator range_end(recursive_directory_iterator const&) BOOST_NOEXCEPT
+inline recursive_directory_iterator range_end(recursive_directory_iterator const&) noexcept
 {
     return recursive_directory_iterator();
 }
diff --git a/inst/include/boost/filesystem/exception.hpp b/inst/include/boost/filesystem/exception.hpp
index 59807762e..033f52020 100644
--- a/inst/include/boost/filesystem/exception.hpp
+++ b/inst/include/boost/filesystem/exception.hpp
@@ -47,21 +47,21 @@ class BOOST_SYMBOL_VISIBLE filesystem_error :
     BOOST_FILESYSTEM_DECL filesystem_error(filesystem_error const& that);
     BOOST_FILESYSTEM_DECL filesystem_error& operator=(filesystem_error const& that);
 
-    BOOST_FILESYSTEM_DECL ~filesystem_error() BOOST_NOEXCEPT_OR_NOTHROW;
+    BOOST_FILESYSTEM_DECL ~filesystem_error() noexcept;
 
-    path const& path1() const BOOST_NOEXCEPT
+    path const& path1() const noexcept
     {
         return m_imp_ptr.get() ? m_imp_ptr->m_path1 : get_empty_path();
     }
-    path const& path2() const BOOST_NOEXCEPT
+    path const& path2() const noexcept
     {
         return m_imp_ptr.get() ? m_imp_ptr->m_path2 : get_empty_path();
     }
 
-    BOOST_FILESYSTEM_DECL const char* what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE;
+    BOOST_FILESYSTEM_DECL const char* what() const noexcept override;
 
 private:
-    BOOST_FILESYSTEM_DECL static path const& get_empty_path() BOOST_NOEXCEPT;
+    BOOST_FILESYSTEM_DECL static path const& get_empty_path() noexcept;
 
 private:
     struct impl :
@@ -71,7 +71,7 @@ class BOOST_SYMBOL_VISIBLE filesystem_error :
         path m_path2;       // may be empty()
         std::string m_what; // not built until needed
 
-        BOOST_DEFAULTED_FUNCTION(impl(), {})
+        impl() = default;
         explicit impl(path const& path1) :
             m_path1(path1)
         {
diff --git a/inst/include/boost/filesystem/file_status.hpp b/inst/include/boost/filesystem/file_status.hpp
index fb3624012..c435c7775 100644
--- a/inst/include/boost/filesystem/file_status.hpp
+++ b/inst/include/boost/filesystem/file_status.hpp
@@ -33,9 +33,6 @@ namespace filesystem {
 enum file_type
 {
     status_error,
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-    status_unknown = status_error,
-#endif
     file_not_found,
     regular_file,
     directory_file,
@@ -119,66 +116,60 @@ BOOST_BITMASK(perms)
 class file_status
 {
 public:
-    BOOST_CONSTEXPR file_status() BOOST_NOEXCEPT :
+    BOOST_CONSTEXPR file_status() noexcept :
         m_value(status_error),
         m_perms(perms_not_known)
     {
     }
-    explicit BOOST_CONSTEXPR file_status(file_type v) BOOST_NOEXCEPT :
+    explicit BOOST_CONSTEXPR file_status(file_type v) noexcept :
         m_value(v),
         m_perms(perms_not_known)
     {
     }
-    BOOST_CONSTEXPR file_status(file_type v, perms prms) BOOST_NOEXCEPT :
+    BOOST_CONSTEXPR file_status(file_type v, perms prms) noexcept :
         m_value(v),
         m_perms(prms)
     {
     }
 
-    //  As of October 2015 the interaction between noexcept and =default is so troublesome
-    //  for VC++, GCC, and probably other compilers, that =default is not used with noexcept
-    //  functions. GCC is not even consistent for the same release on different platforms.
-
-    BOOST_CONSTEXPR file_status(file_status const& rhs) BOOST_NOEXCEPT :
+    BOOST_CONSTEXPR file_status(file_status const& rhs) noexcept :
         m_value(rhs.m_value),
         m_perms(rhs.m_perms)
     {
     }
-    BOOST_CXX14_CONSTEXPR file_status& operator=(file_status const& rhs) BOOST_NOEXCEPT
+    BOOST_CXX14_CONSTEXPR file_status& operator=(file_status const& rhs) noexcept
     {
         m_value = rhs.m_value;
         m_perms = rhs.m_perms;
         return *this;
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     // Note: std::move is not constexpr in C++11, that's why we're not using it here
-    BOOST_CONSTEXPR file_status(file_status&& rhs) BOOST_NOEXCEPT :
+    BOOST_CONSTEXPR file_status(file_status&& rhs) noexcept :
         m_value(static_cast< file_type&& >(rhs.m_value)),
         m_perms(static_cast< perms&& >(rhs.m_perms))
     {
     }
-    BOOST_CXX14_CONSTEXPR file_status& operator=(file_status&& rhs) BOOST_NOEXCEPT
+    BOOST_CXX14_CONSTEXPR file_status& operator=(file_status&& rhs) noexcept
     {
         m_value = static_cast< file_type&& >(rhs.m_value);
         m_perms = static_cast< perms&& >(rhs.m_perms);
         return *this;
     }
-#endif
 
     // observers
-    BOOST_CONSTEXPR file_type type() const BOOST_NOEXCEPT { return m_value; }
-    BOOST_CONSTEXPR perms permissions() const BOOST_NOEXCEPT { return m_perms; }
+    BOOST_CONSTEXPR file_type type() const noexcept { return m_value; }
+    BOOST_CONSTEXPR perms permissions() const noexcept { return m_perms; }
 
     // modifiers
-    BOOST_CXX14_CONSTEXPR void type(file_type v) BOOST_NOEXCEPT { m_value = v; }
-    BOOST_CXX14_CONSTEXPR void permissions(perms prms) BOOST_NOEXCEPT { m_perms = prms; }
+    BOOST_CXX14_CONSTEXPR void type(file_type v) noexcept { m_value = v; }
+    BOOST_CXX14_CONSTEXPR void permissions(perms prms) noexcept { m_perms = prms; }
 
-    BOOST_CONSTEXPR bool operator==(file_status const& rhs) const BOOST_NOEXCEPT
+    BOOST_CONSTEXPR bool operator==(file_status const& rhs) const noexcept
     {
         return type() == rhs.type() && permissions() == rhs.permissions();
     }
-    BOOST_CONSTEXPR bool operator!=(file_status const& rhs) const BOOST_NOEXCEPT
+    BOOST_CONSTEXPR bool operator!=(file_status const& rhs) const noexcept
     {
         return !(*this == rhs);
     }
@@ -188,79 +179,71 @@ class file_status
     perms m_perms;
 };
 
-inline BOOST_CONSTEXPR bool type_present(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool type_present(file_status f) noexcept
 {
     return f.type() != filesystem::status_error;
 }
 
-inline BOOST_CONSTEXPR bool permissions_present(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool permissions_present(file_status f) noexcept
 {
     return f.permissions() != filesystem::perms_not_known;
 }
 
-inline BOOST_CONSTEXPR bool status_known(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool status_known(file_status f) noexcept
 {
     return filesystem::type_present(f) && filesystem::permissions_present(f);
 }
 
-inline BOOST_CONSTEXPR bool exists(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool exists(file_status f) noexcept
 {
     return f.type() != filesystem::status_error && f.type() != filesystem::file_not_found;
 }
 
-inline BOOST_CONSTEXPR bool is_regular_file(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_regular_file(file_status f) noexcept
 {
     return f.type() == filesystem::regular_file;
 }
 
-inline BOOST_CONSTEXPR bool is_directory(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_directory(file_status f) noexcept
 {
     return f.type() == filesystem::directory_file;
 }
 
-inline BOOST_CONSTEXPR bool is_symlink(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_symlink(file_status f) noexcept
 {
     return f.type() == filesystem::symlink_file;
 }
 
-inline BOOST_CONSTEXPR bool is_block_file(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_block_file(file_status f) noexcept
 {
     return f.type() == filesystem::block_file;
 }
 
-inline BOOST_CONSTEXPR bool is_character_file(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_character_file(file_status f) noexcept
 {
     return f.type() == filesystem::character_file;
 }
 
-inline BOOST_CONSTEXPR bool is_fifo(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_fifo(file_status f) noexcept
 {
     return f.type() == filesystem::fifo_file;
 }
 
-inline BOOST_CONSTEXPR bool is_socket(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_socket(file_status f) noexcept
 {
     return f.type() == filesystem::socket_file;
 }
 
-inline BOOST_CONSTEXPR bool is_reparse_file(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_reparse_file(file_status f) noexcept
 {
     return f.type() == filesystem::reparse_file;
 }
 
-inline BOOST_CONSTEXPR bool is_other(file_status f) BOOST_NOEXCEPT
+inline BOOST_CONSTEXPR bool is_other(file_status f) noexcept
 {
     return filesystem::exists(f) && !filesystem::is_regular_file(f) && !filesystem::is_directory(f) && !filesystem::is_symlink(f);
 }
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use is_regular_file() instead")
-inline bool is_regular(file_status f) BOOST_NOEXCEPT
-{
-    return filesystem::is_regular_file(f);
-}
-#endif
-
 } // namespace filesystem
 } // namespace boost
 
diff --git a/inst/include/boost/filesystem/fstream.hpp b/inst/include/boost/filesystem/fstream.hpp
index 334365144..452f76426 100644
--- a/inst/include/boost/filesystem/fstream.hpp
+++ b/inst/include/boost/filesystem/fstream.hpp
@@ -15,7 +15,6 @@
 
 #include <boost/filesystem/config.hpp>
 #include <boost/filesystem/path.hpp>
-#include <cstddef>
 #include <iosfwd>
 #include <fstream>
 
@@ -68,31 +67,20 @@ class basic_filebuf :
     typedef std::basic_filebuf< Char, Traits > base_type;
 
 public:
-    BOOST_DEFAULTED_FUNCTION(basic_filebuf(), {})
+    basic_filebuf() = default;
 
 #if !defined(BOOST_FILESYSTEM_DETAIL_NO_CXX11_MOVABLE_FSTREAMS)
-#if !defined(BOOST_NO_CXX11_DEFAULTED_MOVES)
     basic_filebuf(basic_filebuf&&) = default;
     basic_filebuf& operator= (basic_filebuf&&) = default;
-#else
-    basic_filebuf(basic_filebuf&& that) :
-        base_type(static_cast< base_type&& >(that)) {}
-
-    basic_filebuf& operator= (basic_filebuf&& that)
-    {
-        *static_cast< base_type* >(this) = static_cast< base_type&& >(that);
-        return *this;
-    }
-#endif
 #endif // !defined(BOOST_FILESYSTEM_DETAIL_NO_CXX11_MOVABLE_FSTREAMS)
 
-    BOOST_DELETED_FUNCTION(basic_filebuf(basic_filebuf const&))
-    BOOST_DELETED_FUNCTION(basic_filebuf const& operator= (basic_filebuf const&))
+    basic_filebuf(basic_filebuf const&) = delete;
+    basic_filebuf const& operator= (basic_filebuf const&) = delete;
 
 public:
     basic_filebuf* open(path const& p, std::ios_base::openmode mode)
     {
-        return base_type::open(BOOST_FILESYSTEM_C_STR(p), mode) ? this : NULL;
+        return base_type::open(BOOST_FILESYSTEM_C_STR(p), mode) ? this : nullptr;
     }
 };
 
@@ -108,7 +96,7 @@ class basic_ifstream :
     typedef std::basic_ifstream< Char, Traits > base_type;
 
 public:
-    BOOST_DEFAULTED_FUNCTION(basic_ifstream(), {})
+    basic_ifstream() = default;
 
     // use two signatures, rather than one signature with default second
     // argument, to workaround VC++ 7.1 bug (ID VSWhidbey 38416)
@@ -130,8 +118,8 @@ class basic_ifstream :
     }
 #endif
 
-    BOOST_DELETED_FUNCTION(basic_ifstream(basic_ifstream const&))
-    BOOST_DELETED_FUNCTION(basic_ifstream const& operator= (basic_ifstream const&))
+    basic_ifstream(basic_ifstream const&) = delete;
+    basic_ifstream const& operator= (basic_ifstream const&) = delete;
 
 public:
     void open(path const& p)
@@ -157,7 +145,7 @@ class basic_ofstream :
     typedef std::basic_ofstream< Char, Traits > base_type;
 
 public:
-    BOOST_DEFAULTED_FUNCTION(basic_ofstream(), {})
+    basic_ofstream() = default;
 
     // use two signatures, rather than one signature with default second
     // argument, to workaround VC++ 7.1 bug (ID VSWhidbey 38416)
@@ -179,8 +167,8 @@ class basic_ofstream :
     }
 #endif
 
-    BOOST_DELETED_FUNCTION(basic_ofstream(basic_ofstream const&))
-    BOOST_DELETED_FUNCTION(basic_ofstream const& operator= (basic_ofstream const&))
+    basic_ofstream(basic_ofstream const&) = delete;
+    basic_ofstream const& operator= (basic_ofstream const&) = delete;
 
 public:
     void open(path const& p)
@@ -206,7 +194,7 @@ class basic_fstream :
     typedef std::basic_fstream< Char, Traits > base_type;
 
 public:
-    BOOST_DEFAULTED_FUNCTION(basic_fstream(), {})
+    basic_fstream() = default;
 
     // use two signatures, rather than one signature with default second
     // argument, to workaround VC++ 7.1 bug (ID VSWhidbey 38416)
@@ -228,8 +216,8 @@ class basic_fstream :
     }
 #endif
 
-    BOOST_DELETED_FUNCTION(basic_fstream(basic_fstream const&))
-    BOOST_DELETED_FUNCTION(basic_fstream const& operator= (basic_fstream const&))
+    basic_fstream(basic_fstream const&) = delete;
+    basic_fstream const& operator= (basic_fstream const&) = delete;
 
 public:
     void open(path const& p)
diff --git a/inst/include/boost/filesystem/operations.hpp b/inst/include/boost/filesystem/operations.hpp
index 0b7f73687..5cd40a30f 100644
--- a/inst/include/boost/filesystem/operations.hpp
+++ b/inst/include/boost/filesystem/operations.hpp
@@ -4,7 +4,7 @@
 //  Copyright Jan Langer 2002
 //  Copyright Dietmar Kuehl 2001
 //  Copyright Vladimir Prus 2002
-//  Copyright Andrey Semashev 2020-2021
+//  Copyright Andrey Semashev 2020-2024
 
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
@@ -20,17 +20,9 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/file_status.hpp>
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-// These includes are left for backward compatibility and should be included directly by users, as needed
-#include <boost/filesystem/exception.hpp>
-#include <boost/filesystem/directory.hpp>
-#endif
-
 #include <boost/detail/bitmask.hpp>
-#include <boost/core/scoped_enum.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/cstdint.hpp>
-#include <cstddef>
 #include <ctime>
 #include <string>
 
@@ -49,39 +41,29 @@ struct space_info
     boost::uintmax_t available; // <= free
 };
 
-BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(copy_options, unsigned int)
+enum class copy_options : unsigned int
 {
     none = 0u, // Default. For copy_file: error if the target file exists. For copy: do not recurse, follow symlinks, copy file contents.
 
     // copy_file options:
-    skip_existing = 1u,           // Don't overwrite the existing target file, don't report an error
-    overwrite_existing = 1u << 1, // Overwrite existing file
-    update_existing = 1u << 2,    // Overwrite existing file if its last write time is older than the replacement file
-    synchronize_data = 1u << 3,   // Flush all buffered data written to the target file to permanent storage
-    synchronize = 1u << 4,        // Flush all buffered data and attributes written to the target file to permanent storage
+    skip_existing = 1u,                 // Don't overwrite the existing target file, don't report an error
+    overwrite_existing = 1u << 1u,      // Overwrite existing file
+    update_existing = 1u << 2u,         // Overwrite existing file if its last write time is older than the replacement file
+    synchronize_data = 1u << 3u,        // Flush all buffered data written to the target file to permanent storage
+    synchronize = 1u << 4u,             // Flush all buffered data and attributes written to the target file to permanent storage
+    ignore_attribute_errors = 1u << 5u, // Ignore errors of copying file attributes
 
     // copy options:
-    recursive = 1u << 8,          // Recurse into sub-directories
-    copy_symlinks = 1u << 9,      // Copy symlinks as symlinks instead of copying the referenced file
-    skip_symlinks = 1u << 10,     // Don't copy symlinks
-    directories_only = 1u << 11,  // Only copy directory structure, do not copy non-directory files
-    create_symlinks = 1u << 12,   // Create symlinks instead of copying files
-    create_hard_links = 1u << 13, // Create hard links instead of copying files
-    _detail_recursing = 1u << 14  // Internal use only, do not use
-}
-BOOST_SCOPED_ENUM_DECLARE_END(copy_options)
-
-BOOST_BITMASK(BOOST_SCOPED_ENUM_NATIVE(copy_options))
+    recursive = 1u << 8u,               // Recurse into sub-directories
+    copy_symlinks = 1u << 9u,           // Copy symlinks as symlinks instead of copying the referenced file
+    skip_symlinks = 1u << 10u,          // Don't copy symlinks
+    directories_only = 1u << 11u,       // Only copy directory structure, do not copy non-directory files
+    create_symlinks = 1u << 12u,        // Create symlinks instead of copying files
+    create_hard_links = 1u << 13u,      // Create hard links instead of copying files
+    _detail_recursing = 1u << 14u       // Internal use only, do not use
+};
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-BOOST_SCOPED_ENUM_DECLARE_BEGIN(copy_option)
-{
-    none = static_cast< unsigned int >(copy_options::none),
-    fail_if_exists = none,
-    overwrite_if_exists = static_cast< unsigned int >(copy_options::overwrite_existing)
-}
-BOOST_SCOPED_ENUM_DECLARE_END(copy_option)
-#endif
+BOOST_BITMASK(copy_options)
 
 //--------------------------------------------------------------------------------------//
 //                             implementation details                                   //
@@ -90,78 +72,81 @@ BOOST_SCOPED_ENUM_DECLARE_END(copy_option)
 namespace detail {
 
 BOOST_FILESYSTEM_DECL
-path absolute(path const& p, path const& base, system::error_code* ec = NULL);
+path absolute_v3(path const& p, path const& base, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-file_status status(path const& p, system::error_code* ec = NULL);
+path absolute_v4(path const& p, path const& base, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-file_status symlink_status(path const& p, system::error_code* ec = NULL);
+file_status status(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-bool is_empty(path const& p, system::error_code* ec = NULL);
+file_status symlink_status(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path initial_path(system::error_code* ec = NULL);
+bool is_empty(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path canonical(path const& p, path const& base, system::error_code* ec = NULL);
+path initial_path(system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void copy(path const& from, path const& to, unsigned int options, system::error_code* ec = NULL);
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
+path canonical_v3(path const& p, path const& base, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void copy_directory(path const& from, path const& to, system::error_code* ec = NULL);
-#endif
+path canonical_v4(path const& p, path const& base, system::error_code* ec = nullptr);
+BOOST_FILESYSTEM_DECL
+void copy(path const& from, path const& to, copy_options options, system::error_code* ec = nullptr);
+BOOST_FILESYSTEM_DECL
+bool copy_file(path const& from, path const& to, copy_options options, system::error_code* ec = nullptr);
+BOOST_FILESYSTEM_DECL
+void copy_symlink(path const& existing_symlink, path const& new_symlink, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-bool copy_file(path const& from, path const& to,                     // See ticket #2925
-               unsigned int options, system::error_code* ec = NULL); // see copy_options for options
+bool create_directories(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void copy_symlink(path const& existing_symlink, path const& new_symlink, system::error_code* ec = NULL);
+bool create_directory(path const& p, const path* existing, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-bool create_directories(path const& p, system::error_code* ec = NULL);
+void create_directory_symlink(path const& to, path const& from, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-bool create_directory(path const& p, const path* existing, system::error_code* ec = NULL);
+void create_hard_link(path const& to, path const& from, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void create_directory_symlink(path const& to, path const& from, system::error_code* ec = NULL);
+void create_symlink(path const& to, path const& from, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void create_hard_link(path const& to, path const& from, system::error_code* ec = NULL);
+path current_path(system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void create_symlink(path const& to, path const& from, system::error_code* ec = NULL);
+void current_path(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path current_path(system::error_code* ec = NULL);
+bool equivalent_v3(path const& p1, path const& p2, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void current_path(path const& p, system::error_code* ec = NULL);
+bool equivalent_v4(path const& p1, path const& p2, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-bool equivalent(path const& p1, path const& p2, system::error_code* ec = NULL);
+boost::uintmax_t file_size(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-boost::uintmax_t file_size(path const& p, system::error_code* ec = NULL);
+boost::uintmax_t hard_link_count(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-boost::uintmax_t hard_link_count(path const& p, system::error_code* ec = NULL);
+std::time_t creation_time(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-std::time_t creation_time(path const& p, system::error_code* ec = NULL);
+std::time_t last_write_time(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-std::time_t last_write_time(path const& p, system::error_code* ec = NULL);
+void last_write_time(path const& p, const std::time_t new_time, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void last_write_time(path const& p, const std::time_t new_time, system::error_code* ec = NULL);
+void permissions(path const& p, perms prms, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void permissions(path const& p, perms prms, system::error_code* ec = NULL);
+path read_symlink(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path read_symlink(path const& p, system::error_code* ec = NULL);
+path relative(path const& p, path const& base, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path relative(path const& p, path const& base, system::error_code* ec = NULL);
+bool remove(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-bool remove(path const& p, system::error_code* ec = NULL);
+boost::uintmax_t remove_all(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-boost::uintmax_t remove_all(path const& p, system::error_code* ec = NULL);
+void rename(path const& old_p, path const& new_p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void rename(path const& old_p, path const& new_p, system::error_code* ec = NULL);
+void resize_file(path const& p, uintmax_t size, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-void resize_file(path const& p, uintmax_t size, system::error_code* ec = NULL);
+space_info space(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-space_info space(path const& p, system::error_code* ec = NULL);
+path system_complete(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path system_complete(path const& p, system::error_code* ec = NULL);
+path temp_directory_path(system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path temp_directory_path(system::error_code* ec = NULL);
+path unique_path(path const& p, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path unique_path(path const& p, system::error_code* ec = NULL);
+path weakly_canonical_v3(path const& p, path const& base, system::error_code* ec = nullptr);
 BOOST_FILESYSTEM_DECL
-path weakly_canonical(path const& p, path const& base, system::error_code* ec = NULL);
+path weakly_canonical_v4(path const& p, path const& base, system::error_code* ec = nullptr);
 
 } // namespace detail
 
@@ -176,7 +161,7 @@ inline file_status status(path const& p)
     return detail::status(p);
 }
 
-inline file_status status(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline file_status status(path const& p, system::error_code& ec) noexcept
 {
     return detail::status(p, &ec);
 }
@@ -186,7 +171,7 @@ inline file_status symlink_status(path const& p)
     return detail::symlink_status(p);
 }
 
-inline file_status symlink_status(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline file_status symlink_status(path const& p, system::error_code& ec) noexcept
 {
     return detail::symlink_status(p, &ec);
 }
@@ -196,7 +181,7 @@ inline bool exists(path const& p)
     return filesystem::exists(detail::status(p));
 }
 
-inline bool exists(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool exists(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::exists(detail::status(p, &ec));
 }
@@ -206,7 +191,7 @@ inline bool is_regular_file(path const& p)
     return filesystem::is_regular_file(detail::status(p));
 }
 
-inline bool is_regular_file(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_regular_file(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_regular_file(detail::status(p, &ec));
 }
@@ -216,7 +201,7 @@ inline bool is_directory(path const& p)
     return filesystem::is_directory(detail::status(p));
 }
 
-inline bool is_directory(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_directory(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_directory(detail::status(p, &ec));
 }
@@ -226,7 +211,7 @@ inline bool is_symlink(path const& p)
     return filesystem::is_symlink(detail::symlink_status(p));
 }
 
-inline bool is_symlink(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_symlink(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_symlink(detail::symlink_status(p, &ec));
 }
@@ -236,7 +221,7 @@ inline bool is_block_file(path const& p)
     return filesystem::is_block_file(detail::status(p));
 }
 
-inline bool is_block_file(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_block_file(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_block_file(detail::status(p, &ec));
 }
@@ -246,7 +231,7 @@ inline bool is_character_file(path const& p)
     return filesystem::is_character_file(detail::status(p));
 }
 
-inline bool is_character_file(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_character_file(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_character_file(detail::status(p, &ec));
 }
@@ -256,7 +241,7 @@ inline bool is_fifo(path const& p)
     return filesystem::is_fifo(detail::status(p));
 }
 
-inline bool is_fifo(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_fifo(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_fifo(detail::status(p, &ec));
 }
@@ -266,7 +251,7 @@ inline bool is_socket(path const& p)
     return filesystem::is_socket(detail::status(p));
 }
 
-inline bool is_socket(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_socket(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_socket(detail::status(p, &ec));
 }
@@ -276,7 +261,7 @@ inline bool is_reparse_file(path const& p)
     return filesystem::is_reparse_file(detail::symlink_status(p));
 }
 
-inline bool is_reparse_file(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_reparse_file(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_reparse_file(detail::symlink_status(p, &ec));
 }
@@ -286,25 +271,11 @@ inline bool is_other(path const& p)
     return filesystem::is_other(detail::status(p));
 }
 
-inline bool is_other(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool is_other(path const& p, system::error_code& ec) noexcept
 {
     return filesystem::is_other(detail::status(p, &ec));
 }
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use is_regular_file() instead")
-inline bool is_regular(path const& p)
-{
-    return filesystem::is_regular_file(p);
-}
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use is_regular_file() instead")
-inline bool is_regular(path const& p, system::error_code& ec) BOOST_NOEXCEPT
-{
-    return filesystem::is_regular_file(p, ec);
-}
-#endif
-
 inline bool is_empty(path const& p)
 {
     return detail::is_empty(p);
@@ -357,139 +328,57 @@ inline void current_path(path const& p)
     detail::current_path(p);
 }
 
-inline void current_path(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline void current_path(path const& p, system::error_code& ec) noexcept
 {
     detail::current_path(p, &ec);
 }
 
-inline path absolute(path const& p, path const& base = current_path())
-{
-    return detail::absolute(p, base);
-}
-
-inline path absolute(path const& p, system::error_code& ec)
-{
-    path base = current_path(ec);
-    if (ec)
-        return path();
-    return detail::absolute(p, base, &ec);
-}
-
-inline path absolute(path const& p, path const& base, system::error_code& ec)
-{
-    return detail::absolute(p, base, &ec);
-}
-
-inline path canonical(path const& p, path const& base = current_path())
-{
-    return detail::canonical(p, base);
-}
-
-inline path canonical(path const& p, system::error_code& ec)
-{
-    path base = current_path(ec);
-    if (ec)
-        return path();
-    return detail::canonical(p, base, &ec);
-}
-
-inline path canonical(path const& p, path const& base, system::error_code& ec)
-{
-    return detail::canonical(p, base, &ec);
-}
-
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use absolute() instead")
-inline path complete(path const& p)
-{
-    return absolute(p, initial_path());
-}
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use absolute() instead")
-inline path complete(path const& p, path const& base)
-{
-    return absolute(p, base);
-}
-#endif
-
 inline void copy(path const& from, path const& to)
 {
-    detail::copy(from, to, static_cast< unsigned int >(copy_options::none));
+    detail::copy(from, to, copy_options::none);
 }
 
-inline void copy(path const& from, path const& to, system::error_code& ec) BOOST_NOEXCEPT
+inline void copy(path const& from, path const& to, system::error_code& ec) noexcept
 {
-    detail::copy(from, to, static_cast< unsigned int >(copy_options::none), &ec);
+    detail::copy(from, to, copy_options::none, &ec);
 }
 
-inline void copy(path const& from, path const& to, BOOST_SCOPED_ENUM_NATIVE(copy_options) options)
+inline void copy(path const& from, path const& to, copy_options options)
 {
-    detail::copy(from, to, static_cast< unsigned int >(options));
+    detail::copy(from, to, options);
 }
 
-inline void copy(path const& from, path const& to, BOOST_SCOPED_ENUM_NATIVE(copy_options) options, system::error_code& ec) BOOST_NOEXCEPT
+inline void copy(path const& from, path const& to, copy_options options, system::error_code& ec) noexcept
 {
-    detail::copy(from, to, static_cast< unsigned int >(options), &ec);
+    detail::copy(from, to, options, &ec);
 }
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use create_directory() instead")
-inline void copy_directory(path const& from, path const& to)
-{
-    detail::copy_directory(from, to);
-}
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use create_directory() instead")
-inline void copy_directory(path const& from, path const& to, system::error_code& ec) BOOST_NOEXCEPT
-{
-    detail::copy_directory(from, to, &ec);
-}
-#endif
-
 inline bool copy_file(path const& from, path const& to)
 {
-    return detail::copy_file(from, to, static_cast< unsigned int >(copy_options::none));
+    return detail::copy_file(from, to, copy_options::none);
 }
 
-inline bool copy_file(path const& from, path const& to, system::error_code& ec) BOOST_NOEXCEPT
+inline bool copy_file(path const& from, path const& to, system::error_code& ec) noexcept
 {
-    return detail::copy_file(from, to, static_cast< unsigned int >(copy_options::none), &ec);
+    return detail::copy_file(from, to, copy_options::none, &ec);
 }
 
-inline bool copy_file(path const& from, path const& to, // See ticket #2925
-                      BOOST_SCOPED_ENUM_NATIVE(copy_options) options)
+inline bool copy_file(path const& from, path const& to, copy_options options)
 {
-    return detail::copy_file(from, to, static_cast< unsigned int >(options));
+    return detail::copy_file(from, to, options);
 }
 
-inline bool copy_file(path const& from, path const& to, // See ticket #2925
-                      BOOST_SCOPED_ENUM_NATIVE(copy_options) options, system::error_code& ec) BOOST_NOEXCEPT
+inline bool copy_file(path const& from, path const& to, copy_options options, system::error_code& ec) noexcept
 {
-    return detail::copy_file(from, to, static_cast< unsigned int >(options), &ec);
+    return detail::copy_file(from, to, options, &ec);
 }
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use copy_options instead of copy_option")
-inline bool copy_file(path const& from, path const& to, // See ticket #2925
-                      BOOST_SCOPED_ENUM_NATIVE(copy_option) options)
-{
-    return detail::copy_file(from, to, static_cast< unsigned int >(options));
-}
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use copy_options instead of copy_option")
-inline bool copy_file(path const& from, path const& to, // See ticket #2925
-                      BOOST_SCOPED_ENUM_NATIVE(copy_option) options, system::error_code& ec) BOOST_NOEXCEPT
-{
-    return detail::copy_file(from, to, static_cast< unsigned int >(options), &ec);
-}
-#endif // !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-
 inline void copy_symlink(path const& existing_symlink, path const& new_symlink)
 {
     detail::copy_symlink(existing_symlink, new_symlink);
 }
 
-inline void copy_symlink(path const& existing_symlink, path const& new_symlink, system::error_code& ec) BOOST_NOEXCEPT
+inline void copy_symlink(path const& existing_symlink, path const& new_symlink, system::error_code& ec) noexcept
 {
     detail::copy_symlink(existing_symlink, new_symlink, &ec);
 }
@@ -499,19 +388,19 @@ inline bool create_directories(path const& p)
     return detail::create_directories(p);
 }
 
-inline bool create_directories(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool create_directories(path const& p, system::error_code& ec) noexcept
 {
     return detail::create_directories(p, &ec);
 }
 
 inline bool create_directory(path const& p)
 {
-    return detail::create_directory(p, NULL);
+    return detail::create_directory(p, nullptr);
 }
 
-inline bool create_directory(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool create_directory(path const& p, system::error_code& ec) noexcept
 {
-    return detail::create_directory(p, NULL, &ec);
+    return detail::create_directory(p, nullptr, &ec);
 }
 
 inline bool create_directory(path const& p, path const& existing)
@@ -519,7 +408,7 @@ inline bool create_directory(path const& p, path const& existing)
     return detail::create_directory(p, &existing);
 }
 
-inline bool create_directory(path const& p, path const& existing, system::error_code& ec) BOOST_NOEXCEPT
+inline bool create_directory(path const& p, path const& existing, system::error_code& ec) noexcept
 {
     return detail::create_directory(p, &existing, &ec);
 }
@@ -529,7 +418,7 @@ inline void create_directory_symlink(path const& to, path const& from)
     detail::create_directory_symlink(to, from);
 }
 
-inline void create_directory_symlink(path const& to, path const& from, system::error_code& ec) BOOST_NOEXCEPT
+inline void create_directory_symlink(path const& to, path const& from, system::error_code& ec) noexcept
 {
     detail::create_directory_symlink(to, from, &ec);
 }
@@ -539,7 +428,7 @@ inline void create_hard_link(path const& to, path const& new_hard_link)
     detail::create_hard_link(to, new_hard_link);
 }
 
-inline void create_hard_link(path const& to, path const& new_hard_link, system::error_code& ec) BOOST_NOEXCEPT
+inline void create_hard_link(path const& to, path const& new_hard_link, system::error_code& ec) noexcept
 {
     detail::create_hard_link(to, new_hard_link, &ec);
 }
@@ -549,27 +438,17 @@ inline void create_symlink(path const& to, path const& new_symlink)
     detail::create_symlink(to, new_symlink);
 }
 
-inline void create_symlink(path const& to, path const& new_symlink, system::error_code& ec) BOOST_NOEXCEPT
+inline void create_symlink(path const& to, path const& new_symlink, system::error_code& ec) noexcept
 {
     detail::create_symlink(to, new_symlink, &ec);
 }
 
-inline bool equivalent(path const& p1, path const& p2)
-{
-    return detail::equivalent(p1, p2);
-}
-
-inline bool equivalent(path const& p1, path const& p2, system::error_code& ec) BOOST_NOEXCEPT
-{
-    return detail::equivalent(p1, p2, &ec);
-}
-
 inline boost::uintmax_t file_size(path const& p)
 {
     return detail::file_size(p);
 }
 
-inline boost::uintmax_t file_size(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline boost::uintmax_t file_size(path const& p, system::error_code& ec) noexcept
 {
     return detail::file_size(p, &ec);
 }
@@ -579,7 +458,7 @@ inline boost::uintmax_t hard_link_count(path const& p)
     return detail::hard_link_count(p);
 }
 
-inline boost::uintmax_t hard_link_count(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline boost::uintmax_t hard_link_count(path const& p, system::error_code& ec) noexcept
 {
     return detail::hard_link_count(p, &ec);
 }
@@ -589,7 +468,7 @@ inline std::time_t creation_time(path const& p)
     return detail::creation_time(p);
 }
 
-inline std::time_t creation_time(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline std::time_t creation_time(path const& p, system::error_code& ec) noexcept
 {
     return detail::creation_time(p, &ec);
 }
@@ -599,7 +478,7 @@ inline std::time_t last_write_time(path const& p)
     return detail::last_write_time(p);
 }
 
-inline std::time_t last_write_time(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline std::time_t last_write_time(path const& p, system::error_code& ec) noexcept
 {
     return detail::last_write_time(p, &ec);
 }
@@ -609,7 +488,7 @@ inline void last_write_time(path const& p, const std::time_t new_time)
     detail::last_write_time(p, new_time);
 }
 
-inline void last_write_time(path const& p, const std::time_t new_time, system::error_code& ec) BOOST_NOEXCEPT
+inline void last_write_time(path const& p, const std::time_t new_time, system::error_code& ec) noexcept
 {
     detail::last_write_time(p, new_time, &ec);
 }
@@ -619,7 +498,7 @@ inline void permissions(path const& p, perms prms)
     detail::permissions(p, prms);
 }
 
-inline void permissions(path const& p, perms prms, system::error_code& ec) BOOST_NOEXCEPT
+inline void permissions(path const& p, perms prms, system::error_code& ec) noexcept
 {
     detail::permissions(p, prms, &ec);
 }
@@ -639,7 +518,7 @@ inline bool remove(path const& p)
     return detail::remove(p);
 }
 
-inline bool remove(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline bool remove(path const& p, system::error_code& ec) noexcept
 {
     return detail::remove(p, &ec);
 }
@@ -649,7 +528,7 @@ inline boost::uintmax_t remove_all(path const& p)
     return detail::remove_all(p);
 }
 
-inline boost::uintmax_t remove_all(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline boost::uintmax_t remove_all(path const& p, system::error_code& ec) noexcept
 {
     return detail::remove_all(p, &ec);
 }
@@ -659,7 +538,7 @@ inline void rename(path const& old_p, path const& new_p)
     detail::rename(old_p, new_p);
 }
 
-inline void rename(path const& old_p, path const& new_p, system::error_code& ec) BOOST_NOEXCEPT
+inline void rename(path const& old_p, path const& new_p, system::error_code& ec) noexcept
 {
     detail::rename(old_p, new_p, &ec);
 }
@@ -670,7 +549,7 @@ inline void resize_file(path const& p, uintmax_t size)
     detail::resize_file(p, size);
 }
 
-inline void resize_file(path const& p, uintmax_t size, system::error_code& ec) BOOST_NOEXCEPT
+inline void resize_file(path const& p, uintmax_t size, system::error_code& ec) noexcept
 {
     detail::resize_file(p, size, &ec);
 }
@@ -698,19 +577,11 @@ inline space_info space(path const& p)
     return detail::space(p);
 }
 
-inline space_info space(path const& p, system::error_code& ec) BOOST_NOEXCEPT
+inline space_info space(path const& p, system::error_code& ec) noexcept
 {
     return detail::space(p, &ec);
 }
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use is_symlink(symlink_status(path)) instead")
-inline bool symbolic_link_exists(path const& p)
-{
-    return is_symlink(filesystem::symlink_status(p));
-}
-#endif
-
 inline path system_complete(path const& p)
 {
     return detail::system_complete(p);
@@ -731,19 +602,86 @@ inline path temp_directory_path(system::error_code& ec)
     return detail::temp_directory_path(&ec);
 }
 
-inline path unique_path(path const& p = "%%%%-%%%%-%%%%-%%%%")
+inline path unique_path(path const& p =
+#if defined(BOOST_WINDOWS_API)
+    L"%%%%-%%%%-%%%%-%%%%"
+#else
+    "%%%%-%%%%-%%%%-%%%%"
+#endif
+)
 {
     return detail::unique_path(p);
 }
 
+inline path unique_path(system::error_code& ec)
+{
+    return detail::unique_path
+    (
+#if defined(BOOST_WINDOWS_API)
+        L"%%%%-%%%%-%%%%-%%%%",
+#else
+        "%%%%-%%%%-%%%%-%%%%",
+#endif
+        &ec
+    );
+}
+
 inline path unique_path(path const& p, system::error_code& ec)
 {
     return detail::unique_path(p, &ec);
 }
 
+namespace BOOST_FILESYSTEM_VERSION_NAMESPACE {
+
+inline path absolute(path const& p, path const& base = current_path())
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::absolute)(p, base);
+}
+
+inline path absolute(path const& p, system::error_code& ec)
+{
+    path base = current_path(ec);
+    if (ec)
+        return path();
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::absolute)(p, base, &ec);
+}
+
+inline path absolute(path const& p, path const& base, system::error_code& ec)
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::absolute)(p, base, &ec);
+}
+
+inline path canonical(path const& p, path const& base = current_path())
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::canonical)(p, base);
+}
+
+inline path canonical(path const& p, system::error_code& ec)
+{
+    path base = current_path(ec);
+    if (ec)
+        return path();
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::canonical)(p, base, &ec);
+}
+
+inline path canonical(path const& p, path const& base, system::error_code& ec)
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::canonical)(p, base, &ec);
+}
+
+inline bool equivalent(path const& p1, path const& p2)
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::equivalent)(p1, p2);
+}
+
+inline bool equivalent(path const& p1, path const& p2, system::error_code& ec) noexcept
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::equivalent)(p1, p2, &ec);
+}
+
 inline path weakly_canonical(path const& p, path const& base = current_path())
 {
-    return detail::weakly_canonical(p, base);
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::weakly_canonical)(p, base);
 }
 
 inline path weakly_canonical(path const& p, system::error_code& ec)
@@ -751,14 +689,21 @@ inline path weakly_canonical(path const& p, system::error_code& ec)
     path base = current_path(ec);
     if (ec)
         return path();
-    return detail::weakly_canonical(p, base, &ec);
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::weakly_canonical)(p, base, &ec);
 }
 
 inline path weakly_canonical(path const& p, path const& base, system::error_code& ec)
 {
-    return detail::weakly_canonical(p, base, &ec);
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::weakly_canonical)(p, base, &ec);
 }
 
+} // namespace BOOST_FILESYSTEM_VERSION_NAMESPACE
+
+using BOOST_FILESYSTEM_VERSION_NAMESPACE::absolute;
+using BOOST_FILESYSTEM_VERSION_NAMESPACE::canonical;
+using BOOST_FILESYSTEM_VERSION_NAMESPACE::equivalent;
+using BOOST_FILESYSTEM_VERSION_NAMESPACE::weakly_canonical;
+
 //  test helper  -----------------------------------------------------------------------//
 
 //  Not part of the documented interface since false positives are possible;
diff --git a/inst/include/boost/filesystem/path.hpp b/inst/include/boost/filesystem/path.hpp
index 5172d29f1..f6e38f4b2 100644
--- a/inst/include/boost/filesystem/path.hpp
+++ b/inst/include/boost/filesystem/path.hpp
@@ -2,7 +2,7 @@
 
 //  Copyright Vladimir Prus 2002
 //  Copyright Beman Dawes 2002-2005, 2009
-//  Copyright Andrey Semashev 2021-2023
+//  Copyright Andrey Semashev 2021-2024
 
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
@@ -16,27 +16,25 @@
 #ifndef BOOST_FILESYSTEM_PATH_HPP
 #define BOOST_FILESYSTEM_PATH_HPP
 
-#include <boost/assert.hpp>
 #include <boost/filesystem/config.hpp>
-#include <boost/filesystem/detail/path_traits.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/iterator_categories.hpp>
-#include <boost/core/enable_if.hpp>
-#include <boost/io/quoted.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/type_traits/negation.hpp>
-#include <boost/type_traits/conjunction.hpp>
-#include <boost/type_traits/disjunction.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
 #include <cstddef>
 #include <iosfwd>
 #include <locale>
 #include <string>
 #include <iterator>
+#include <type_traits>
 #if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
 #include <string_view>
 #endif
+#include <boost/assert.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_categories.hpp>
+#include <boost/io/quoted.hpp>
+#include <boost/functional/hash_fwd.hpp>
+#include <boost/filesystem/detail/path_traits.hpp>
+#include <boost/filesystem/detail/type_traits/negation.hpp>
+#include <boost/filesystem/detail/type_traits/conjunction.hpp>
+#include <boost/filesystem/detail/type_traits/disjunction.hpp>
 
 #include <boost/filesystem/detail/header.hpp> // must be the last #include
 
@@ -107,6 +105,14 @@ struct path_algorithms
     BOOST_FILESYSTEM_DECL static path lexically_normal_v3(path const& p);
     BOOST_FILESYSTEM_DECL static path lexically_normal_v4(path const& p);
 
+    BOOST_FILESYSTEM_DECL static path generic_path_v3(path const& p);
+    BOOST_FILESYSTEM_DECL static path generic_path_v4(path const& p);
+
+#if defined(BOOST_WINDOWS_API)
+    BOOST_FILESYSTEM_DECL static void make_preferred_v3(path& p);
+    BOOST_FILESYSTEM_DECL static void make_preferred_v4(path& p);
+#endif
+
     BOOST_FILESYSTEM_DECL static int compare_v3(path const& left, path const& right);
     BOOST_FILESYSTEM_DECL static int compare_v4(path const& left, path const& right);
 
@@ -238,15 +244,15 @@ class path :
     public:
         typedef void result_type;
 
-        explicit assign_op(path& self) BOOST_NOEXCEPT : m_self(self) {}
+        explicit assign_op(path& self) noexcept : m_self(self) {}
 
-        result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = NULL) const
+        result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = nullptr) const
         {
             m_self.m_pathname.assign(source, source_end);
         }
 
         template< typename OtherChar >
-        result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = NULL) const
+        result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = nullptr) const
         {
             m_self.m_pathname.clear();
             detail::path_traits::convert(source, source_end, m_self.m_pathname, cvt);
@@ -262,15 +268,15 @@ class path :
     public:
         typedef void result_type;
 
-        explicit concat_op(path& self) BOOST_NOEXCEPT : m_self(self) {}
+        explicit concat_op(path& self) noexcept : m_self(self) {}
 
-        result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = NULL) const
+        result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = nullptr) const
         {
             m_self.m_pathname.append(source, source_end);
         }
 
         template< typename OtherChar >
-        result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = NULL) const
+        result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = nullptr) const
         {
             detail::path_traits::convert(source, source_end, m_self.m_pathname, cvt);
         }
@@ -285,15 +291,15 @@ class path :
     public:
         typedef void result_type;
 
-        explicit append_op(path& self) BOOST_NOEXCEPT : m_self(self) {}
+        explicit append_op(path& self) noexcept : m_self(self) {}
 
-        BOOST_FORCEINLINE result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = NULL) const
+        BOOST_FORCEINLINE result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = nullptr) const
         {
             m_self.append(source, source_end);
         }
 
         template< typename OtherChar >
-        BOOST_FORCEINLINE result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = NULL) const
+        BOOST_FORCEINLINE result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = nullptr) const
         {
             string_type src;
             detail::path_traits::convert(source, source_end, src, cvt);
@@ -310,12 +316,12 @@ class path :
     public:
         typedef int result_type;
 
-        explicit compare_op(path const& self) BOOST_NOEXCEPT : m_self(self) {}
+        explicit compare_op(path const& self) noexcept : m_self(self) {}
 
-        result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = NULL) const;
+        result_type operator() (const value_type* source, const value_type* source_end, const codecvt_type* = nullptr) const;
 
         template< typename OtherChar >
-        result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = NULL) const;
+        result_type operator() (const OtherChar* source, const OtherChar* source_end, const codecvt_type* cvt = nullptr) const;
     };
 
 public:
@@ -327,7 +333,7 @@ class path :
 public:
     //  -----  constructors  -----
 
-    path() BOOST_NOEXCEPT {}
+    path() noexcept {}
     path(path const& p) : m_pathname(p.m_pathname) {}
     path(path const& p, codecvt_type const&) : m_pathname(p.m_pathname) {}
 
@@ -340,177 +346,121 @@ class path :
     path(std::basic_string_view< value_type > const& s, codecvt_type const&) : m_pathname(s) {}
 #endif
 
-#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
     template<
         typename Source,
-        typename = typename boost::enable_if_c<
-            boost::conjunction<
-                detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >,
-                boost::negation< detail::path_traits::is_native_path_source< typename boost::remove_cv< Source >::type > >
+        typename = typename std::enable_if<
+            detail::conjunction<
+                detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >,
+                detail::negation< detail::path_traits::is_native_path_source< typename std::remove_cv< Source >::type > >
             >::value
         >::type
     >
     path(Source const& source)
-#else
-    template< typename Source >
-    path(Source const& source, typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_native_path_source< typename boost::remove_cv< Source >::type > >
-        >::value
-    >::type* = NULL)
-#endif
     {
         assign(source);
     }
 
-#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
     template<
         typename Source,
-        typename = typename boost::enable_if_c<
-            boost::conjunction<
-                detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >,
-                boost::negation< detail::path_traits::is_native_path_source< typename boost::remove_cv< Source >::type > >
+        typename = typename std::enable_if<
+            detail::conjunction<
+                detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >,
+                detail::negation< detail::path_traits::is_native_path_source< typename std::remove_cv< Source >::type > >
             >::value
         >::type
     >
     explicit path(Source const& source, codecvt_type const& cvt)
-#else
-    template< typename Source >
-    explicit path(Source const& source, codecvt_type const& cvt, typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_native_path_source< typename boost::remove_cv< Source >::type > >
-        >::value
-    >::type* = NULL)
-#endif
     {
         assign(source, cvt);
     }
 
-    //  As of October 2015 the interaction between noexcept and =default is so troublesome
-    //  for VC++, GCC, and probably other compilers, that =default is not used with noexcept
-    //  functions. GCC is not even consistent for the same release on different platforms.
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    path(path&& p) BOOST_NOEXCEPT : m_pathname(static_cast< string_type&& >(p.m_pathname))
+    path(path&& p) noexcept : m_pathname(static_cast< string_type&& >(p.m_pathname))
     {
     }
-    path(path&& p, codecvt_type const&) BOOST_NOEXCEPT : m_pathname(static_cast< string_type&& >(p.m_pathname))
+    path(path&& p, codecvt_type const&) noexcept : m_pathname(static_cast< string_type&& >(p.m_pathname))
     {
     }
-    path& operator=(path&& p) BOOST_NOEXCEPT
+    path& operator=(path&& p) noexcept
     {
         m_pathname = static_cast< string_type&& >(p.m_pathname);
         return *this;
     }
-    path& assign(path&& p) BOOST_NOEXCEPT
+    path& assign(path&& p) noexcept
     {
         m_pathname = static_cast< string_type&& >(p.m_pathname);
         return *this;
     }
-    path& assign(path&& p, codecvt_type const&) BOOST_NOEXCEPT
+    path& assign(path&& p, codecvt_type const&) noexcept
     {
         m_pathname = static_cast< string_type&& >(p.m_pathname);
         return *this;
     }
 
-    path(string_type&& s) BOOST_NOEXCEPT : m_pathname(static_cast< string_type&& >(s))
+    path(string_type&& s) noexcept : m_pathname(static_cast< string_type&& >(s))
     {
     }
-    path(string_type&& s, codecvt_type const&) BOOST_NOEXCEPT : m_pathname(static_cast< string_type&& >(s))
+    path(string_type&& s, codecvt_type const&) noexcept : m_pathname(static_cast< string_type&& >(s))
     {
     }
-    path& operator=(string_type&& p) BOOST_NOEXCEPT
+    path& operator=(string_type&& p) noexcept
     {
         m_pathname = static_cast< string_type&& >(p);
         return *this;
     }
-    path& assign(string_type&& p) BOOST_NOEXCEPT
+    path& assign(string_type&& p) noexcept
     {
         m_pathname = static_cast< string_type&& >(p);
         return *this;
     }
-    path& assign(string_type&& p, codecvt_type const&) BOOST_NOEXCEPT
+    path& assign(string_type&& p, codecvt_type const&) noexcept
     {
         m_pathname = static_cast< string_type&& >(p);
         return *this;
     }
-#endif
 
     path(const value_type* begin, const value_type* end) : m_pathname(begin, end) {}
     path(const value_type* begin, const value_type* end, codecvt_type const&) : m_pathname(begin, end) {}
 
-#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
     template<
         typename InputIterator,
-        typename = typename boost::enable_if_c<
-            boost::conjunction<
+        typename = typename std::enable_if<
+            detail::conjunction<
                 detail::path_traits::is_path_source_iterator< InputIterator >,
-                boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+                detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
             >::value
         >::type
     >
     path(InputIterator begin, InputIterator end)
-#else
-    template< typename InputIterator >
-    path(InputIterator begin, InputIterator end, typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
-        >::value
-    >::type* = NULL)
-#endif
     {
         if (begin != end)
         {
             typedef std::basic_string< typename std::iterator_traits< InputIterator >::value_type > source_t;
             source_t source(begin, end);
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             assign(static_cast< source_t&& >(source));
-#else
-            assign(source);
-#endif
         }
     }
 
-#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
     template<
         typename InputIterator,
-        typename = typename boost::enable_if_c<
-            boost::conjunction<
+        typename = typename std::enable_if<
+            detail::conjunction<
                 detail::path_traits::is_path_source_iterator< InputIterator >,
-                boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+                detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
             >::value
         >::type
     >
     path(InputIterator begin, InputIterator end, codecvt_type const& cvt)
-#else
-    template< typename InputIterator >
-    path(InputIterator begin, InputIterator end, codecvt_type const& cvt, typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
-        >::value
-    >::type* = NULL)
-#endif
     {
         if (begin != end)
         {
             typedef std::basic_string< typename std::iterator_traits< InputIterator >::value_type > source_t;
             source_t source(begin, end);
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             assign(static_cast< source_t&& >(source), cvt);
-#else
-            assign(source, cvt);
-#endif
         }
     }
 
-#if !defined(BOOST_NO_CXX11_NULLPTR)
-    BOOST_DELETED_FUNCTION(path(std::nullptr_t))
-    BOOST_DELETED_FUNCTION(path& operator= (std::nullptr_t))
-#endif
+    path(std::nullptr_t) = delete;
+    path& operator= (std::nullptr_t) = delete;
 
 public:
     //  -----  assignments  -----
@@ -519,10 +469,10 @@ class path :
     path& operator=(path const& p);
 
     template< typename Source >
-    typename boost::enable_if_c<
-        boost::disjunction<
-            detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >,
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+    typename std::enable_if<
+        detail::disjunction<
+            detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >,
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
         >::value,
         path&
     >::type operator=(Source const& source)
@@ -537,8 +487,8 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type assign(Source const& source)
     {
@@ -547,10 +497,10 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         path&
     >::type assign(Source const& source)
@@ -566,8 +516,8 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type assign(Source const& source, codecvt_type const& cvt)
     {
@@ -576,10 +526,10 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         path&
     >::type assign(Source const& source, codecvt_type const& cvt)
@@ -595,10 +545,10 @@ class path :
     }
 
     template< typename InputIterator >
-    typename boost::enable_if_c<
-        boost::conjunction<
+    typename std::enable_if<
+        detail::conjunction<
             detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+            detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
         >::value,
         path&
     >::type assign(InputIterator begin, InputIterator end)
@@ -608,11 +558,7 @@ class path :
         {
             typedef std::basic_string< typename std::iterator_traits< InputIterator >::value_type > source_t;
             source_t source(begin, end);
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             assign(static_cast< source_t&& >(source));
-#else
-            assign(source);
-#endif
         }
         return *this;
     }
@@ -624,10 +570,10 @@ class path :
     }
 
     template< typename InputIterator >
-    typename boost::enable_if_c<
-        boost::conjunction<
+    typename std::enable_if<
+        detail::conjunction<
             detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+            detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
         >::value,
         path&
     >::type assign(InputIterator begin, InputIterator end, codecvt_type const& cvt)
@@ -637,11 +583,7 @@ class path :
         {
             typedef std::basic_string< typename std::iterator_traits< InputIterator >::value_type > source_t;
             source_t source(begin, end);
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             assign(static_cast< source_t&& >(source), cvt);
-#else
-            assign(source, cvt);
-#endif
         }
         return *this;
     }
@@ -651,8 +593,8 @@ class path :
     path& operator+=(path const& p);
 
     template< typename Source >
-    typename boost::enable_if_c<
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
+    typename std::enable_if<
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type operator+=(Source const& source)
     {
@@ -666,7 +608,7 @@ class path :
     }
 
     template< typename CharT >
-    typename boost::enable_if_c<
+    typename std::enable_if<
         detail::path_traits::is_path_char_type< CharT >::value,
         path&
     >::type operator+=(CharT c)
@@ -685,8 +627,8 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type concat(Source const& source)
     {
@@ -695,10 +637,10 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         path&
     >::type concat(Source const& source)
@@ -714,8 +656,8 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type concat(Source const& source, codecvt_type const& cvt)
     {
@@ -724,10 +666,10 @@ class path :
     }
 
     template< typename Source >
-    typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         path&
     >::type concat(Source const& source, codecvt_type const& cvt)
@@ -743,10 +685,10 @@ class path :
     }
 
     template< typename InputIterator >
-    typename boost::enable_if_c<
-        boost::conjunction<
+    typename std::enable_if<
+        detail::conjunction<
             detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+            detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
         >::value,
         path&
     >::type concat(InputIterator begin, InputIterator end)
@@ -766,10 +708,10 @@ class path :
     }
 
     template< typename InputIterator >
-    typename boost::enable_if_c<
-        boost::conjunction<
+    typename std::enable_if<
+        detail::conjunction<
             detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+            detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
         >::value,
         path&
     >::type concat(InputIterator begin, InputIterator end, codecvt_type const& cvt)
@@ -790,8 +732,8 @@ class path :
     path& operator/=(path const& p);
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type operator/=(Source const& source)
     {
@@ -801,8 +743,8 @@ class path :
     path& append(path const& p);
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type append(Source const& source)
     {
@@ -811,10 +753,10 @@ class path :
     }
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         path&
     >::type append(Source const& source)
@@ -826,8 +768,8 @@ class path :
     path& append(path const& p, codecvt_type const&);
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         path&
     >::type append(Source const& source, codecvt_type const& cvt)
     {
@@ -836,10 +778,10 @@ class path :
     }
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         path&
     >::type append(Source const& source, codecvt_type const& cvt)
@@ -851,10 +793,10 @@ class path :
     path& append(const value_type* begin, const value_type* end);
 
     template< typename InputIterator >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        boost::conjunction<
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::conjunction<
             detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+            detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
         >::value,
         path&
     >::type append(InputIterator begin, InputIterator end)
@@ -867,10 +809,10 @@ class path :
     path& append(const value_type* begin, const value_type* end, codecvt_type const&);
 
     template< typename InputIterator >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        boost::conjunction<
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::conjunction<
             detail::path_traits::is_path_source_iterator< InputIterator >,
-            boost::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
+            detail::negation< detail::path_traits::is_native_char_ptr< InputIterator > >
         >::value,
         path&
     >::type append(InputIterator begin, InputIterator end, const codecvt_type& cvt)
@@ -882,23 +824,15 @@ class path :
 
     //  -----  modifiers  -----
 
-    void clear() BOOST_NOEXCEPT { m_pathname.clear(); }
-#ifdef BOOST_POSIX_API
-    path& make_preferred()
-    {
-        // No effect on POSIX
-        return *this;
-    }
-#else // BOOST_WINDOWS_API
-    BOOST_FILESYSTEM_DECL path& make_preferred(); // change slashes to backslashes
-#endif
+    void clear() noexcept { m_pathname.clear(); }
+    path& make_preferred();
     path& remove_filename();
     BOOST_FILESYSTEM_DECL path& remove_filename_and_trailing_separators();
     BOOST_FILESYSTEM_DECL path& remove_trailing_separator();
     BOOST_FILESYSTEM_DECL path& replace_filename(path const& replacement);
     path& replace_extension(path const& new_extension = path());
 
-    void swap(path& rhs) BOOST_NOEXCEPT { m_pathname.swap(rhs.m_pathname); }
+    void swap(path& rhs) noexcept { m_pathname.swap(rhs.m_pathname); }
 
     //  -----  observers  -----
 
@@ -921,9 +855,9 @@ class path :
 
     //  -----  native format observers  -----
 
-    string_type const& native() const BOOST_NOEXCEPT { return m_pathname; }
-    const value_type* c_str() const BOOST_NOEXCEPT { return m_pathname.c_str(); }
-    string_type::size_type size() const BOOST_NOEXCEPT { return m_pathname.size(); }
+    string_type const& native() const noexcept { return m_pathname; }
+    const value_type* c_str() const noexcept { return m_pathname.c_str(); }
+    string_type::size_type size() const noexcept { return m_pathname.size(); }
 
     template< typename String >
     String string() const;
@@ -976,11 +910,7 @@ class path :
     //  Experimental generic function returning generic formatted path (i.e. separators
     //  are forward slashes). Motivation: simpler than a family of generic_*string
     //  functions.
-#ifdef BOOST_WINDOWS_API
-    BOOST_FILESYSTEM_DECL path generic_path() const;
-#else
     path generic_path() const;
-#endif
 
     template< typename String >
     String generic_string() const;
@@ -988,26 +918,18 @@ class path :
     template< typename String >
     String generic_string(codecvt_type const& cvt) const;
 
-#ifdef BOOST_WINDOWS_API
     std::string generic_string() const { return generic_path().string(); }
     std::string generic_string(codecvt_type const& cvt) const { return generic_path().string(cvt); }
     std::wstring generic_wstring() const { return generic_path().wstring(); }
-    std::wstring generic_wstring(codecvt_type const&) const { return generic_wstring(); }
-#else // BOOST_POSIX_API
-    //  On POSIX-like systems, the generic format is the same as the native format
-    std::string const& generic_string() const { return m_pathname; }
-    std::string const& generic_string(codecvt_type const&) const { return m_pathname; }
-    std::wstring generic_wstring() const { return this->wstring(); }
-    std::wstring generic_wstring(codecvt_type const& cvt) const { return this->wstring(cvt); }
-#endif
+    std::wstring generic_wstring(codecvt_type const& cvt) const { return generic_path().wstring(cvt); }
 
     //  -----  compare  -----
 
     int compare(path const& p) const; // generic, lexicographical
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         int
     >::type compare(Source const& source) const
     {
@@ -1015,10 +937,10 @@ class path :
     }
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         int
     >::type compare(Source const& source) const
@@ -1027,8 +949,8 @@ class path :
     }
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type >::value,
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::path_traits::is_path_source< typename std::remove_cv< Source >::type >::value,
         int
     >::type compare(Source const& source, codecvt_type const& cvt) const
     {
@@ -1036,10 +958,10 @@ class path :
     }
 
     template< typename Source >
-    BOOST_FORCEINLINE typename boost::enable_if_c<
-        boost::conjunction<
-            detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >,
-            boost::negation< detail::path_traits::is_path_source< typename boost::remove_cv< Source >::type > >
+    BOOST_FORCEINLINE typename std::enable_if<
+        detail::conjunction<
+            detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >,
+            detail::negation< detail::path_traits::is_path_source< typename std::remove_cv< Source >::type > >
         >::value,
         int
     >::type compare(Source const& source, codecvt_type const& cvt) const
@@ -1076,7 +998,7 @@ class path :
 
     //  -----  query  -----
 
-    bool empty() const BOOST_NOEXCEPT { return m_pathname.empty(); }
+    bool empty() const noexcept { return m_pathname.empty(); }
     bool filename_is_dot() const;
     bool filename_is_dot_dot() const;
     bool has_root_path() const { return detail::path_algorithms::find_root_path_size(*this) > 0; }
@@ -1115,44 +1037,6 @@ class path :
     static BOOST_FILESYSTEM_DECL std::locale imbue(std::locale const& loc);
     static BOOST_FILESYSTEM_DECL codecvt_type const& codecvt();
 
-    //  -----  deprecated functions  -----
-
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-    //  recently deprecated functions supplied by default
-    path& normalize();
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::remove_filename() instead")
-    path& remove_leaf() { return remove_filename(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::filename() instead")
-    path leaf() const { return filename(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::parent_path() instead")
-    path branch_path() const { return parent_path(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::generic_path() instead")
-    path generic() const { return generic_path(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use !path::empty() instead")
-    bool has_leaf() const { return !m_pathname.empty(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::has_parent_path() instead")
-    bool has_branch_path() const { return has_parent_path(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::is_absolute() instead")
-    bool is_complete() const { return is_absolute(); }
-#endif
-
-#if defined(BOOST_FILESYSTEM_DEPRECATED)
-    //  deprecated functions with enough signature or semantic changes that they are
-    //  not supplied by default
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::string() instead")
-    std::string file_string() const { return string(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::string() instead")
-    std::string directory_string() const { return string(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::string() instead")
-    std::string native_file_string() const { return string(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::string() instead")
-    std::string native_directory_string() const { return string(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::native() instead")
-    string_type external_file_string() const { return native(); }
-    BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::native() instead")
-    string_type external_directory_string() const { return native(); }
-#endif
-
     //--------------------------------------------------------------------------------------//
     //                            class path private members                                //
     //--------------------------------------------------------------------------------------//
@@ -1174,10 +1058,6 @@ BOOST_FILESYSTEM_DECL path const& dot_path();
 BOOST_FILESYSTEM_DECL path const& dot_dot_path();
 } // namespace detail
 
-#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-typedef path wpath;
-#endif
-
 namespace path_detail {
 
 //------------------------------------------------------------------------------------//
@@ -1199,7 +1079,7 @@ class path_iterator :
 
     path const& dereference() const { return m_element; }
 
-    bool equal(path_iterator const& rhs) const BOOST_NOEXCEPT
+    bool equal(path_iterator const& rhs) const noexcept
     {
         return m_path_ptr == rhs.m_path_ptr && m_pos == rhs.m_pos;
     }
@@ -1244,7 +1124,7 @@ class path_reverse_iterator :
     friend class boost::filesystem::path;
 
     path const& dereference() const { return m_element; }
-    bool equal(path_reverse_iterator const& rhs) const BOOST_NOEXCEPT { return m_itr == rhs.m_itr; }
+    bool equal(path_reverse_iterator const& rhs) const noexcept { return m_itr == rhs.m_itr; }
 
     void increment()
     {
@@ -1287,10 +1167,10 @@ BOOST_FORCEINLINE bool operator==(path const& lhs, path const& rhs)
 }
 
 template< typename Path, typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator==(Path const& lhs, Source const& rhs)
@@ -1299,10 +1179,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 }
 
 template< typename Source, typename Path >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator==(Source const& lhs, Path const& rhs)
@@ -1316,10 +1196,10 @@ BOOST_FORCEINLINE bool operator!=(path const& lhs, path const& rhs)
 }
 
 template< typename Path, typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator!=(Path const& lhs, Source const& rhs)
@@ -1328,10 +1208,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 }
 
 template< typename Source, typename Path >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator!=(Source const& lhs, Path const& rhs)
@@ -1345,10 +1225,10 @@ BOOST_FORCEINLINE bool operator<(path const& lhs, path const& rhs)
 }
 
 template< typename Path, typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator<(Path const& lhs, Source const& rhs)
@@ -1357,10 +1237,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 }
 
 template< typename Source, typename Path >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator<(Source const& lhs, Path const& rhs)
@@ -1374,10 +1254,10 @@ BOOST_FORCEINLINE bool operator<=(path const& lhs, path const& rhs)
 }
 
 template< typename Path, typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator<=(Path const& lhs, Source const& rhs)
@@ -1386,10 +1266,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 }
 
 template< typename Source, typename Path >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator<=(Source const& lhs, Path const& rhs)
@@ -1403,10 +1283,10 @@ BOOST_FORCEINLINE bool operator>(path const& lhs, path const& rhs)
 }
 
 template< typename Path, typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator>(Path const& lhs, Source const& rhs)
@@ -1415,10 +1295,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 }
 
 template< typename Source, typename Path >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator>(Source const& lhs, Path const& rhs)
@@ -1432,10 +1312,10 @@ BOOST_FORCEINLINE bool operator>=(path const& lhs, path const& rhs)
 }
 
 template< typename Path, typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator>=(Path const& lhs, Source const& rhs)
@@ -1444,10 +1324,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 }
 
 template< typename Source, typename Path >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    boost::conjunction<
-        boost::is_same< Path, path >,
-        detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::conjunction<
+        std::is_same< Path, path >,
+        detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >
     >::value,
     bool
 >::type operator>=(Source const& lhs, Path const& rhs)
@@ -1458,10 +1338,10 @@ BOOST_FORCEINLINE typename boost::enable_if_c<
 
 // Note: Declared as a template to delay binding to Boost.ContainerHash functions and make the dependency optional
 template< typename Path >
-inline typename boost::enable_if_c<
-    boost::is_same< Path, path >::value,
+inline typename std::enable_if<
+    std::is_same< Path, path >::value,
     std::size_t
->::type hash_value(Path const& p) BOOST_NOEXCEPT
+>::type hash_value(Path const& p) noexcept
 {
 #ifdef BOOST_WINDOWS_API
     std::size_t seed = 0u;
@@ -1473,7 +1353,7 @@ inline typename boost::enable_if_c<
 #endif
 }
 
-inline void swap(path& lhs, path& rhs) BOOST_NOEXCEPT
+inline void swap(path& lhs, path& rhs) noexcept
 {
     lhs.swap(rhs);
 }
@@ -1485,8 +1365,8 @@ BOOST_FORCEINLINE path operator/(path lhs, path const& rhs)
 }
 
 template< typename Source >
-BOOST_FORCEINLINE typename boost::enable_if_c<
-    detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
+BOOST_FORCEINLINE typename std::enable_if<
+    detail::path_traits::is_convertible_to_path_source< typename std::remove_cv< Source >::type >::value,
     path
 >::type operator/(path lhs, Source const& rhs)
 {
@@ -1533,7 +1413,7 @@ namespace detail {
 //  a forward slash is the only valid directory separator and also the only valid
 //  element separator. For Windows, forward slash and back slash are the possible
 //  directory separators, but colon (example: "c:foo") is also an element separator.
-inline bool is_directory_separator(path::value_type c) BOOST_NOEXCEPT
+inline bool is_directory_separator(path::value_type c) noexcept
 {
     return c == path::separator
 #ifdef BOOST_WINDOWS_API
@@ -1542,7 +1422,7 @@ inline bool is_directory_separator(path::value_type c) BOOST_NOEXCEPT
         ;
 }
 
-inline bool is_element_separator(path::value_type c) BOOST_NOEXCEPT
+inline bool is_element_separator(path::value_type c) noexcept
 {
     return c == path::separator
 #ifdef BOOST_WINDOWS_API
@@ -1629,13 +1509,6 @@ BOOST_FORCEINLINE path& path::operator/=(path const& p)
     return append(p);
 }
 
-#if !defined(BOOST_WINDOWS_API)
-inline path path::generic_path() const
-{
-    return path(*this);
-}
-#endif
-
 inline path path::lexically_proximate(path const& base) const
 {
     path tmp(lexically_relative(base));
@@ -1667,18 +1540,6 @@ inline bool path::filename_is_dot_dot() const
     // to deal with "c:.." edge case on Windows when ':' acts as a separator
 }
 
-#if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-
-BOOST_FILESYSTEM_DETAIL_DEPRECATED("Use path::lexically_normal() instead")
-BOOST_FORCEINLINE path& path::normalize()
-{
-    path tmp(lexically_normal());
-    m_pathname.swap(tmp.m_pathname);
-    return *this;
-}
-
-#endif // !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
-
 // The following functions are defined differently, depending on Boost.Filesystem version in use.
 // To avoid ODR violation, these functions are not defined when the library itself is built.
 // This makes sure they are not compiled when the library is built, and the only version there is
@@ -1752,6 +1613,20 @@ BOOST_FORCEINLINE path path::lexically_normal() const
     return BOOST_FILESYSTEM_VERSIONED_SYM(detail::path_algorithms::lexically_normal)(*this);
 }
 
+BOOST_FORCEINLINE path path::generic_path() const
+{
+    return BOOST_FILESYSTEM_VERSIONED_SYM(detail::path_algorithms::generic_path)(*this);
+}
+
+BOOST_FORCEINLINE path& path::make_preferred()
+{
+    // No effect on POSIX
+#if defined(BOOST_WINDOWS_API)
+    BOOST_FILESYSTEM_VERSIONED_SYM(detail::path_algorithms::make_preferred)(*this);
+#endif
+    return *this;
+}
+
 namespace path_detail {
 
 BOOST_FORCEINLINE void path_iterator::increment()
diff --git a/inst/include/boost/flyweight/concurrent_factory.hpp b/inst/include/boost/flyweight/concurrent_factory.hpp
new file mode 100644
index 000000000..decd1dbaf
--- /dev/null
+++ b/inst/include/boost/flyweight/concurrent_factory.hpp
@@ -0,0 +1,248 @@
+/* Copyright 2024 Joaquin M Lopez Munoz.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See http://www.boost.org/libs/flyweight for library home page.
+ */
+
+#ifndef BOOST_FLYWEIGHT_CONCURRENT_FACTORY_HPP
+#define BOOST_FLYWEIGHT_CONCURRENT_FACTORY_HPP
+
+#if defined(_MSC_VER)
+#pragma once
+#endif
+
+#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
+#include <atomic>
+#include <boost/assert.hpp>
+#include <boost/core/allocator_access.hpp> 
+#include <boost/core/invoke_swap.hpp>
+#include <boost/flyweight/concurrent_factory_fwd.hpp>
+#include <boost/flyweight/factory_tag.hpp>
+#include <boost/flyweight/detail/is_placeholder_expr.hpp>
+#include <boost/unordered/concurrent_node_set.hpp>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+#include <type_traits>
+#include <utility>
+
+/* flyweight factory based on boost::concurent_node_set */
+
+namespace boost{
+
+namespace flyweights{
+
+namespace concurrent_factory_detail{
+
+template<typename Entry>
+struct refcounted_entry:Entry
+{
+  explicit refcounted_entry(Entry&& x):Entry{std::move(x)}{}
+  refcounted_entry(refcounted_entry&& x):
+    Entry{std::move(static_cast<Entry&>(x))}{}
+
+  long count()const{return ref;}
+  void add_ref()const{++ref;}
+  void release()const{--ref;} 
+  
+private:  
+  mutable std::atomic_long ref{0};
+};
+
+template<typename RefcountedEntry>
+class refcounted_handle
+{
+public:
+  refcounted_handle(const refcounted_handle& x):p{x.p}{p->add_ref();}
+  ~refcounted_handle(){p->release();}
+
+  refcounted_handle& operator=(refcounted_handle x)
+  {
+    boost::core::invoke_swap(p,x.p);
+    return *this;
+  }
+
+  const RefcountedEntry& get()const{return *p;}
+
+private:
+  template<typename,typename,typename,typename,typename>
+  friend class concurrent_factory_class_impl;
+
+  refcounted_handle(const RefcountedEntry* p_):p{p_}
+  {
+    /* Doesn't add ref, refcount already incremented by
+     * concurrent_factory_class_impl before calling this ctor.
+     */
+    BOOST_ASSERT(p!=nullptr);
+    BOOST_ASSERT(p->count()>0);
+  }
+
+  const RefcountedEntry* p;
+};
+
+template<
+  typename Entry,typename Key,
+  typename Hash,typename Pred,typename Allocator
+>
+class concurrent_factory_class_impl:public factory_marker
+{
+  using entry_type=refcounted_entry<Entry>;
+  using unrebound_allocator_type=typename std::conditional<
+    mpl::is_na<Allocator>::value,
+    std::allocator<entry_type>,
+    Allocator
+  >::type;
+  using container_type=boost::concurrent_node_set<
+    entry_type,
+    typename std::conditional<
+      mpl::is_na<Hash>::value,
+      boost::hash<Key>,
+      Hash
+    >::type,
+    typename std::conditional<
+      mpl::is_na<Pred>::value,
+      std::equal_to<Key>,
+      Pred
+    >::type,
+    boost::allocator_rebind_t<unrebound_allocator_type,entry_type>
+  >;
+
+public:
+  using handle_type=refcounted_handle<entry_type>;
+  
+  concurrent_factory_class_impl():gc{[this]{
+    /* Garbage collector. Traverses the container every gc_time and lockedly
+     * erases entries without any external reference.
+     */
+
+    constexpr auto gc_time=std::chrono::seconds(1);
+
+    for(;;){
+      {
+        std::unique_lock<std::mutex> lk{m};
+        if(cv.wait_for(lk,gc_time,[&]{return stop;}))return;
+      }
+      cont.erase_if([&](const entry_type& x){return !x.count();});
+    }
+  }}
+  {}
+
+  ~concurrent_factory_class_impl()
+  {
+    /* shut the garbage collector down */
+
+    {
+      std::unique_lock<std::mutex> lk{m};
+      stop=true;
+    }
+    cv.notify_one();
+    gc.join();
+  }
+
+  /* Instead of insert, concurrent_factory provides the undocumented extension
+   * insert_and_visit, accessible through ADL (see global insert_and_visit
+   * below). This ensures that visitation happens in a locked environment
+   * even if no external locking is specified.
+   */
+
+  template<typename F>
+  handle_type insert_and_visit(Entry&& x,F f)
+  {
+    const entry_type* p=nullptr;
+    auto              g=[&p,&f](const entry_type& x){
+      f(static_cast<const Entry&>(x));
+      x.add_ref();
+      p=std::addressof(x);
+    };
+
+    cont.insert_and_visit(entry_type{std::move(x)},g,g);
+    return {p};
+  }
+
+  void erase(handle_type)
+  {
+    /* unused entries taken care of by garbage collector */
+  }
+
+  static const Entry& entry(handle_type h){return h.get();}
+
+private:  
+  container_type          cont;
+  std::mutex              m;
+  std::condition_variable cv;
+  bool                    stop=false;
+  std::thread             gc;
+};
+
+struct concurrent_factory_class_empty_base:factory_marker{};
+
+template<
+  typename Entry,typename Key,
+  typename Hash,typename Pred,typename Allocator
+>
+struct check_concurrent_factory_class_params{};
+
+} /* namespace concurrent_factory_detail */
+
+template<
+  typename Entry,typename Key,
+  typename Hash,typename Pred,typename Allocator
+>
+class concurrent_factory_class:
+  /* boost::mpl::apply may instantiate concurrent_factory_class<...> even when
+   * the type is a lambda expression, so we need to guard against the
+   * implementation defining nonsensical typedefs based on placeholder params.
+   */
+
+  public std::conditional<
+    boost::flyweights::detail::is_placeholder_expression<
+      concurrent_factory_detail::check_concurrent_factory_class_params<
+        Entry,Key,Hash,Pred,Allocator
+      >
+    >::value,
+    concurrent_factory_detail::concurrent_factory_class_empty_base,
+    concurrent_factory_detail::concurrent_factory_class_impl<
+      Entry,Key,Hash,Pred,Allocator
+    >
+  >::type
+{};
+
+template<
+  typename Entry,typename Key,
+  typename Hash,typename Pred,typename Allocator,
+  typename F
+>
+typename concurrent_factory_class<Entry,Key,Hash,Pred,Allocator>::handle_type
+insert_and_visit(
+  concurrent_factory_class<Entry,Key,Hash,Pred,Allocator>& fac,Entry&& x,F f)
+{
+  return fac.insert_and_visit(std::move(x),f);
+}
+
+/* concurrent_factory_class specifier */
+
+template<
+  typename Hash,typename Pred,typename Allocator
+  BOOST_FLYWEIGHT_NOT_A_PLACEHOLDER_EXPRESSION_DEF
+>
+struct concurrent_factory:factory_marker
+{
+  template<typename Entry,typename Key>
+  struct apply:
+    mpl::apply2<
+      concurrent_factory_class<
+        boost::mpl::_1,boost::mpl::_2,Hash,Pred,Allocator
+      >,
+      Entry,Key
+    >
+  {};
+};
+
+} /* namespace flyweights */
+
+} /* namespace boost */
+
+#endif
diff --git a/inst/include/boost/flyweight/concurrent_factory_fwd.hpp b/inst/include/boost/flyweight/concurrent_factory_fwd.hpp
new file mode 100644
index 000000000..56153b8c3
--- /dev/null
+++ b/inst/include/boost/flyweight/concurrent_factory_fwd.hpp
@@ -0,0 +1,40 @@
+/* Copyright 2024 Joaquin M Lopez Munoz.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See http://www.boost.org/libs/flyweight for library home page.
+ */
+
+#ifndef BOOST_FLYWEIGHT_CONCURRENT_FACTORY_FWD_HPP
+#define BOOST_FLYWEIGHT_CONCURRENT_FACTORY_FWD_HPP
+
+#if defined(_MSC_VER)
+#pragma once
+#endif
+
+#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
+#include <boost/flyweight/detail/not_placeholder_expr.hpp>
+#include <boost/mpl/aux_/na.hpp>
+
+namespace boost{
+
+namespace flyweights{
+
+template<
+  typename Entry,typename Key,
+  typename Hash=mpl::na,typename Pred=mpl::na,typename Allocator=mpl::na
+>
+class concurrent_factory_class;
+
+template<
+  typename Hash=mpl::na,typename Pred=mpl::na,typename Allocator=mpl::na
+  BOOST_FLYWEIGHT_NOT_A_PLACEHOLDER_EXPRESSION
+>
+struct concurrent_factory;
+
+} /* namespace flyweights */
+
+} /* namespace boost */
+
+#endif
diff --git a/inst/include/boost/flyweight/detail/default_value_policy.hpp b/inst/include/boost/flyweight/detail/default_value_policy.hpp
index e0d9b668b..ffc027434 100644
--- a/inst/include/boost/flyweight/detail/default_value_policy.hpp
+++ b/inst/include/boost/flyweight/detail/default_value_policy.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2019 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -14,7 +14,7 @@
 #endif
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/flyweight/detail/perfect_fwd.hpp>
 #include <boost/flyweight/detail/value_tag.hpp>
 
@@ -62,16 +62,16 @@ struct default_value_policy:value_marker
     rep_type(rep_type&& r):x(std::move(r.x)){}
 #endif
 
-    operator const value_type&()const{return x;}
+    operator const value_type&()const BOOST_NOEXCEPT{return x;}
 
     value_type x;
   };
 
-  static void construct_value(const rep_type&){}
-  static void copy_value(const rep_type&){}
+  static void key_construct_value(const rep_type&){}
+  static void copy_construct_value(const rep_type&,const value_type&){}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-  static void move_value(const rep_type&){}
+  static void move_construct_value(const rep_type&,value_type&&){}
 #endif
 };
 
diff --git a/inst/include/boost/flyweight/detail/flyweight_core.hpp b/inst/include/boost/flyweight/detail/flyweight_core.hpp
index 553d2f072..738ae653f 100644
--- a/inst/include/boost/flyweight/detail/flyweight_core.hpp
+++ b/inst/include/boost/flyweight/detail/flyweight_core.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2020 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -15,9 +15,11 @@
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <boost/core/no_exceptions_support.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/flyweight/detail/perfect_fwd.hpp>
 #include <boost/mpl/apply.hpp>
+#include <boost/type_traits/declval.hpp>
+#include <utility>
 
 #if BOOST_WORKAROUND(BOOST_MSVC,BOOST_TESTED_AT(1400))
 #pragma warning(push)
@@ -72,6 +74,49 @@ struct flyweight_core_tracking_helper
   }
 };
 
+/* ADL-based customization point for factories providing the undocumented
+ * insert_and_visit facility rather than regular insert. Default behavior is
+ * to erase the entry if visitation throws.
+ */
+
+template<typename Factory,typename Entry,typename F>
+typename Factory::handle_type
+insert_and_visit(Factory& fac,const Entry& x,F f)
+{
+  typedef typename Factory::handle_type handle_type;
+
+  handle_type h(fac.insert(x));
+  BOOST_TRY{
+    f(fac.entry(h));
+  }
+  BOOST_CATCH(...){
+    fac().erase(h);
+    BOOST_RETHROW;
+  }
+  BOOST_CATCH_END
+  return h;
+}
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+template<typename Factory,typename Entry,typename F>
+typename Factory::handle_type
+insert_and_visit(Factory& fac,Entry&& x,F f)
+{
+  typedef typename Factory::handle_type handle_type;
+
+  handle_type h(fac.insert(std::forward<Entry>(x)));
+  BOOST_TRY{
+    f(fac.entry(h));
+  }
+  BOOST_CATCH(...){
+    fac.erase(h);
+    BOOST_RETHROW;
+  }
+  BOOST_CATCH_END
+  return h;
+}
+#endif
+
 template<
   typename ValuePolicy,typename Tag,typename TrackingPolicy,
   typename FactorySpecifier,typename LockingPolicy,typename HolderSpecifier
@@ -149,6 +194,8 @@ class flyweight_core
   }
 
   static const key_type& key(const handle_type& h)
+  BOOST_NOEXCEPT_IF(noexcept(
+    static_cast<const rep_type&>(boost::declval<const entry_type&>())))
   {
     return static_cast<const rep_type&>(entry(h));
   }
@@ -174,27 +221,56 @@ class flyweight_core
     holder_arg
   >::type                             holder_type;
 
+  /* [key|copy|move]_construct_value: poor-man's pre-C++11 lambdas */
+
+  struct key_construct_value
+  {
+    void operator()(const entry_type& e)const
+    {
+      ValuePolicy::key_construct_value(static_cast<const rep_type&>(e));
+    }
+  };
+
+  struct copy_construct_value
+  {
+    copy_construct_value(const value_type& x_):x(x_){}
+
+    void operator()(const entry_type& e)const
+    {
+      ValuePolicy::copy_construct_value(static_cast<const rep_type&>(e),x);
+    }
+
+    const value_type& x;
+  };
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+  struct move_construct_value
+  {
+    move_construct_value(value_type&& x_):x(x_){}
+
+    void operator()(const entry_type& e)const
+    {
+      ValuePolicy::move_construct_value(
+        static_cast<const rep_type&>(e),std::move(x));
+    }
+
+    value_type& x;
+  };
+#endif
+
   static handle_type insert_rep(const rep_type& x)
   {
     init();
     entry_type       e(x);
     lock_type        lock(mutex());(void)lock;
+
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    base_handle_type h(factory().insert(std::move(e)));
+    return static_cast<handle_type>(
+      insert_and_visit(factory(),std::move(e),key_construct_value()));
 #else
-    base_handle_type h(factory().insert(e));
+    return static_cast<handle_type>(
+      insert_and_visit(factory(),e,key_construct_value()));
 #endif
-
-    BOOST_TRY{
-      ValuePolicy::construct_value(
-        static_cast<const rep_type&>(entry(h)));
-    }
-    BOOST_CATCH(...){
-      factory().erase(h);
-      BOOST_RETHROW;
-    }
-    BOOST_CATCH_END
-    return static_cast<handle_type>(h);
   }
 
   static handle_type insert_value(const value_type& x)
@@ -204,21 +280,12 @@ class flyweight_core
     lock_type        lock(mutex());(void)lock;
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    base_handle_type h(factory().insert(std::move(e)));
+    return static_cast<handle_type>(
+      insert_and_visit(factory(),std::move(e),copy_construct_value(x)));
 #else
-    base_handle_type h(factory().insert(e));
+    return static_cast<handle_type>(
+      insert_and_visit(factory(),e,copy_construct_value(x)));
 #endif
-
-    BOOST_TRY{
-      ValuePolicy::copy_value(
-        static_cast<const rep_type&>(entry(h)));
-    }
-    BOOST_CATCH(...){
-      factory().erase(h);
-      BOOST_RETHROW;
-    }
-    BOOST_CATCH_END
-    return static_cast<handle_type>(h);
   }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
@@ -227,18 +294,9 @@ class flyweight_core
     init();
     entry_type       e(std::move(x));
     lock_type        lock(mutex());(void)lock;
-    base_handle_type h(factory().insert(std::move(e)));
 
-    BOOST_TRY{
-      ValuePolicy::construct_value(
-        static_cast<const rep_type&>(entry(h)));
-    }
-    BOOST_CATCH(...){
-      factory().erase(h);
-      BOOST_RETHROW;
-    }
-    BOOST_CATCH_END
-    return static_cast<handle_type>(h);
+    return static_cast<handle_type>(
+      insert_and_visit(factory(),std::move(e),key_construct_value()));
   }
 
   static handle_type insert_value(value_type&& x)
@@ -246,17 +304,10 @@ class flyweight_core
     init();
     entry_type       e(rep_type(std::move(x)));
     lock_type        lock(mutex());(void)lock;
-    base_handle_type h(factory().insert(std::move(e)));
-    BOOST_TRY{
-      ValuePolicy::move_value(
-        static_cast<const rep_type&>(entry(h)));
-    }
-    BOOST_CATCH(...){
-      factory().erase(h);
-      BOOST_RETHROW;
-    }
-    BOOST_CATCH_END
-    return static_cast<handle_type>(h);
+
+    return static_cast<handle_type>(
+      insert_and_visit(
+        factory(),std::move(e),move_construct_value(std::move(x))));
   }
 #endif
 
diff --git a/inst/include/boost/flyweight/detail/not_placeholder_expr.hpp b/inst/include/boost/flyweight/detail/not_placeholder_expr.hpp
index ce5f8fbde..53271f7a8 100644
--- a/inst/include/boost/flyweight/detail/not_placeholder_expr.hpp
+++ b/inst/include/boost/flyweight/detail/not_placeholder_expr.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2018 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -27,7 +27,7 @@
  */
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #if BOOST_WORKAROUND(__GNUC__, <4)||\
     BOOST_WORKAROUND(__GNUC__,==4)&&(__GNUC_MINOR__<2)||\
diff --git a/inst/include/boost/flyweight/detail/recursive_lw_mutex.hpp b/inst/include/boost/flyweight/detail/recursive_lw_mutex.hpp
index 941c06880..d98bf8104 100644
--- a/inst/include/boost/flyweight/detail/recursive_lw_mutex.hpp
+++ b/inst/include/boost/flyweight/detail/recursive_lw_mutex.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2023 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -60,7 +60,7 @@ struct recursive_lightweight_mutex:noncopyable
 
 } /* namespace boost */
 #elif defined(BOOST_HAS_PTHREADS)
-/* code shamelessly ripped from <boost/detail/lwm_pthreads.hpp> */
+/* code shamelessly ripped from <boost/smart_ptr/detail/lwm_pthreads.hpp> */
 
 #include <boost/assert.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/inst/include/boost/flyweight/flyweight.hpp b/inst/include/boost/flyweight/flyweight.hpp
index cf4dc0a1c..22630b9b9 100644
--- a/inst/include/boost/flyweight/flyweight.hpp
+++ b/inst/include/boost/flyweight/flyweight.hpp
@@ -1,6 +1,6 @@
 /* Flyweight class. 
  *
- * Copyright 2006-2023 Joaquin M Lopez Munoz.
+ * Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -17,9 +17,9 @@
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <algorithm>
+#include <boost/config/workaround.hpp>
 #include <boost/core/addressof.hpp>
 #include <boost/core/invoke_swap.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/flyweight/detail/default_value_policy.hpp>
 #include <boost/flyweight/detail/flyweight_core.hpp>
 #include <boost/flyweight/detail/perfect_fwd.hpp>
@@ -210,12 +210,12 @@ class flyweight
     h(core::insert(list)){} 
 #endif
 
-  flyweight(const flyweight& x):h(x.h){}
-  flyweight(flyweight& x):h(x.h){}
+  flyweight(const flyweight& x)BOOST_NOEXCEPT:h(x.h){}
+  flyweight(flyweight& x)BOOST_NOEXCEPT:h(x.h){}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-  flyweight(const flyweight&& x):h(x.h){}
-  flyweight(flyweight&& x):h(x.h){}
+  flyweight(const flyweight&& x)BOOST_NOEXCEPT:h(x.h){}
+  flyweight(flyweight&& x)BOOST_NOEXCEPT:h(x.h){}
 #endif
 
 #if !defined(BOOST_NO_SFINAE)&&!defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -228,7 +228,7 @@ class flyweight
   }
 #endif
 
-  flyweight& operator=(const flyweight& x){h=x.h;return *this;}
+  flyweight& operator=(const flyweight& x)BOOST_NOEXCEPT{h=x.h;return *this;}
   flyweight& operator=(const value_type& x){return operator=(flyweight(x));}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
@@ -240,22 +240,42 @@ class flyweight
 
   /* convertibility to underlying type */
   
-  const key_type&   get_key()const{return core::key(h);}
-  const value_type& get()const{return core::value(h);}
-  const value_type& operator*()const{return get();}
-  operator const    value_type&()const{return get();}
-  const value_type* operator->()const{return boost::addressof(get());}
+  const key_type& get_key()const
+  BOOST_NOEXCEPT_IF(noexcept(core::key(boost::declval<const handle_type&>())))
+  {
+    return core::key(h);
+  }
+
+  const value_type& get()const BOOST_NOEXCEPT{return core::value(h);}
+  const value_type& operator*()const BOOST_NOEXCEPT{return get();}
+  operator const    value_type&()const BOOST_NOEXCEPT{return get();}
+  const value_type* operator->()const BOOST_NOEXCEPT
+    {return boost::addressof(get());}
   
   /* exact type equality  */
     
-  friend bool operator==(const flyweight& x,const flyweight& y)
+  friend bool operator==(const flyweight& x,const flyweight& y)BOOST_NOEXCEPT
+  {
+#if BOOST_WORKAROUND(BOOST_MSVC,<1930)
+    /* msvc 14.0 has spurious codegen bugs seemingly related to flyweight::get
+     * being noexcept.
+     */
+
+    return 
+      boost::addressof(core::value(x.h))==boost::addressof(core::value(y.h));
+#else
+    return boost::addressof(x.get())==boost::addressof(y.get());
+#endif
+  }
+
+  friend bool operator!=(const flyweight& x,const flyweight& y)BOOST_NOEXCEPT
   {
-    return &x.get()==&y.get();
+    return !(x==y);
   }
 
   /* modifiers */
 
-  void swap(flyweight& x){boost::core::invoke_swap(h,x.h);}
+  void swap(flyweight& x)BOOST_NOEXCEPT{boost::core::invoke_swap(h,x.h);}
   
 private:
   handle_type h;
@@ -399,7 +419,7 @@ BOOST_FLYWEIGHT_COMPLETE_COMP_OPS(
 template<typename T,BOOST_FLYWEIGHT_TYPENAME_TEMPL_ARGS(_)>
 void swap(
   flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& x,
-  flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& y)
+  flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& y)BOOST_NOEXCEPT
 {
   x.swap(y);
 }
@@ -456,12 +476,12 @@ hash<boost::flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)> >
   typedef boost::flyweight<
     T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)> argument_type;
 
-  result_type operator()(const argument_type& x)const
+  result_type operator()(const argument_type& x)const BOOST_NOEXCEPT
   {
     typedef typename argument_type::value_type value_type;
 
     std::hash<const value_type*> h;
-    return h(&x.get());
+    return h(boost::addressof(x.get()));
   }
 };
 
@@ -474,14 +494,15 @@ namespace flyweights{
 #endif
 
 template<typename T,BOOST_FLYWEIGHT_TYPENAME_TEMPL_ARGS(_)>
-std::size_t hash_value(const flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& x)
+std::size_t
+hash_value(const flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& x)BOOST_NOEXCEPT
 {
   typedef typename flyweight<
     T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)
   >::value_type                     value_type;
 
   boost::hash<const value_type*> h;
-  return h(&x.get());
+  return h(boost::addressof(x.get()));
 }
 
 #if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
diff --git a/inst/include/boost/flyweight/flyweight_fwd.hpp b/inst/include/boost/flyweight/flyweight_fwd.hpp
index 73fbf678c..0deaa0c16 100644
--- a/inst/include/boost/flyweight/flyweight_fwd.hpp
+++ b/inst/include/boost/flyweight/flyweight_fwd.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2015 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -14,8 +14,8 @@
 #endif
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
+#include <boost/config/workaround.hpp>
 #include <boost/detail/templated_streams.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/parameter/parameters.hpp>
 #include <boost/preprocessor/punctuation/comma.hpp>
 #include <iosfwd>
@@ -139,7 +139,7 @@ BOOST_FLYWEIGHT_COMPLETE_COMP_OPS_DECL(
 template<typename T,BOOST_FLYWEIGHT_TYPENAME_TEMPL_ARGS(_)>
 inline void swap(
   flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& x,
-  flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& y);
+  flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& y)BOOST_NOEXCEPT;
 
 template<
   BOOST_TEMPLATED_STREAM_ARGS(ElemType,Traits)
@@ -199,8 +199,8 @@ namespace flyweights{
 #endif
 
 template<typename T,BOOST_FLYWEIGHT_TYPENAME_TEMPL_ARGS(_)>
-inline std::size_t hash_value(
-  const flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& x);
+inline std::size_t
+hash_value(const flyweight<T,BOOST_FLYWEIGHT_TEMPL_ARGS(_)>& x)BOOST_NOEXCEPT;
 
 #if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
 } /* namespace flyweights */
diff --git a/inst/include/boost/flyweight/key_value.hpp b/inst/include/boost/flyweight/key_value.hpp
index 6a95ae0b0..830bac079 100644
--- a/inst/include/boost/flyweight/key_value.hpp
+++ b/inst/include/boost/flyweight/key_value.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2018 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -14,13 +14,15 @@
 #endif
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
-#include <boost/detail/workaround.hpp>
+#include <boost/assert.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/flyweight/detail/perfect_fwd.hpp>
 #include <boost/flyweight/detail/value_tag.hpp>
 #include <boost/flyweight/key_value_fwd.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/aligned_storage.hpp>
 #include <boost/type_traits/alignment_of.hpp> 
+#include <boost/type_traits/declval.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <new>
 
@@ -46,7 +48,7 @@ namespace flyweights{
 namespace detail{
 
 template<typename Key,typename Value,typename KeyFromValue>
-struct optimized_key_value:value_marker
+struct variant_key_value:value_marker
 {
   typedef Key   key_type;
   typedef Value value_type;
@@ -57,9 +59,9 @@ struct optimized_key_value:value_marker
     /* template ctors */
 
 #define BOOST_FLYWEIGHT_PERFECT_FWD_CTR_BODY(args)       \
-  :value_ptr(0)                                          \
+  :value_cted(false)                                     \
 {                                                        \
-  new(spc_ptr())key_type(BOOST_FLYWEIGHT_FORWARD(args)); \
+  new(key_ptr())key_type(BOOST_FLYWEIGHT_FORWARD(args)); \
 }
 
   BOOST_FLYWEIGHT_PERFECT_FWD(
@@ -68,53 +70,61 @@ struct optimized_key_value:value_marker
 
 #undef BOOST_FLYWEIGHT_PERFECT_FWD_CTR_BODY
 
-    rep_type(const rep_type& x):value_ptr(x.value_ptr)
+    rep_type(const rep_type& x):value_cted(false)
     {
-      if(!x.value_ptr)new(key_ptr())key_type(*x.key_ptr());
+      if(!x.value_cted)new(key_ptr())key_type(*x.key_ptr());
+      else            new(key_ptr())key_type(key_from_value(*x.value_ptr()));
     }
 
-    rep_type(const value_type& x):value_ptr(&x){}
+    rep_type(const value_type& x):value_cted(false)
+    {
+      new(key_ptr())key_type(key_from_value(x));
+    }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    rep_type(rep_type&& x):value_ptr(x.value_ptr)
+    rep_type(rep_type&& x):value_cted(false)
     {
-      if(!x.value_ptr)new(key_ptr())key_type(std::move(*x.key_ptr()));
+      if(!x.value_cted)new(key_ptr())key_type(std::move(*x.key_ptr()));
+      else             new(key_ptr())key_type(key_from_value(*x.value_ptr()));
     }
 
-    rep_type(value_type&& x):value_ptr(&x){}
+    rep_type(value_type&& x):value_cted(false)
+    {
+      new(key_ptr())key_type(key_from_value(x));
+    }
 #endif
 
     ~rep_type()
     {
-      if(!value_ptr)       key_ptr()->~key_type();
-      else if(value_cted())value_ptr->~value_type();
+      if(value_cted)value_ptr()->~value_type();
+      else          key_ptr()->~key_type();
     }
 
     operator const key_type&()const
+    BOOST_NOEXCEPT_IF(noexcept(
+      boost::declval<KeyFromValue>()(boost::declval<const value_type&>())))
     {
-      if(value_ptr)return key_from_value(*value_ptr);
-      else         return *key_ptr();
+      if(value_cted)return key_from_value(*value_ptr());
+      else          return *key_ptr();
     }
 
     operator const value_type&()const
     {
-      /* This is always called after construct_value() or copy_value(),
-       * so we access spc directly rather than through value_ptr to
-       * save us an indirection.
-       */
-
-      return *static_cast<value_type*>(spc_ptr());
+      BOOST_ASSERT(value_cted);
+      return *value_ptr();
     }
 
   private:
-    friend struct optimized_key_value;
-
-    void* spc_ptr()const{return static_cast<void*>(&spc);}
-    bool  value_cted()const{return value_ptr==spc_ptr();}
+    friend struct variant_key_value;
 
     key_type* key_ptr()const
     {
-      return static_cast<key_type*>(static_cast<void*>(&spc));
+      return static_cast<key_type*>(static_cast<void*>(&key_spc));
+    }
+
+    value_type* value_ptr()const
+    {
+      return static_cast<value_type*>(static_cast<void*>(&value_spc));
     }
 
     static const key_type& key_from_value(const value_type& x)
@@ -123,68 +133,66 @@ struct optimized_key_value:value_marker
       return k(x);
     }
 
-    void construct_value()const
+    void key_construct_value()const
     {
-      if(!value_cted()){
-        /* value_ptr must be ==0, oherwise copy_value would have been called */
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        key_type k(std::move(*key_ptr()));
-#else
-        key_type k(*key_ptr());
-#endif
-
+      if(!value_cted){
+        new(value_ptr())value_type(*key_ptr());
         key_ptr()->~key_type();
-        value_ptr= /* guarantees key won't be re-dted at ~rep_type if the */
-          static_cast<value_type*>(spc_ptr())+1; /* next statement throws */
-        value_ptr=new(spc_ptr())value_type(k);
+        value_cted=true;
       }
     }
 
-    void copy_value()const
+    void copy_construct_value(const value_type& x)const
     {
-      if(!value_cted())value_ptr=new(spc_ptr())value_type(*value_ptr);
+      if(!value_cted){
+        new(value_ptr())value_type(x);
+        key_ptr()->~key_type();
+        value_cted=true;
+      }
     }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    void move_value()const
+    void move_construct_value(value_type&& x)const
     {
-      if(!value_cted())value_ptr=
-        new(spc_ptr())value_type(std::move(const_cast<value_type&>(*value_ptr)));
+      if(!value_cted){
+        new(value_ptr())value_type(std::move(x));
+        key_ptr()->~key_type();
+        value_cted=true;
+      }
     }
 #endif
 
     mutable typename boost::aligned_storage<
-      (sizeof(key_type)>sizeof(value_type))?
-        sizeof(key_type):sizeof(value_type),
-      (boost::alignment_of<key_type>::value >
-       boost::alignment_of<value_type>::value)?
-        boost::alignment_of<key_type>::value:
-        boost::alignment_of<value_type>::value
-    >::type                                    spc;
-    mutable const value_type*                  value_ptr;
+      sizeof(key_type),
+      boost::alignment_of<key_type>::value
+    >::type                                    key_spc;
+    mutable typename boost::aligned_storage<
+      sizeof(value_type),
+      boost::alignment_of<value_type>::value
+    >::type                                    value_spc;
+    mutable bool                               value_cted;
   };
 
-  static void construct_value(const rep_type& r)
+  static void key_construct_value(const rep_type& r)
   {
-    r.construct_value();
+    r.key_construct_value();
   }
 
-  static void copy_value(const rep_type& r)
+  static void copy_construct_value(const rep_type& r,const value_type& x)
   {
-    r.copy_value();
+    r.copy_construct_value(x);
   }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-  static void move_value(const rep_type& r)
+  static void move_construct_value(const rep_type& r,value_type&& x)
   {
-    r.move_value();
+    r.move_construct_value(std::move(x));
   }
 #endif
 };
 
 template<typename Key,typename Value>
-struct regular_key_value:value_marker
+struct product_key_value:value_marker
 {
   typedef Key   key_type;
   typedef Value value_type;
@@ -202,11 +210,11 @@ struct regular_key_value:value_marker
  * variadic temmplate ctor below fails to value-initialize key.
  */
 
-    rep_type():key(),value_ptr(0){}
+    rep_type():key(),value_cted(false){}
 #endif
 
 #define BOOST_FLYWEIGHT_PERFECT_FWD_CTR_BODY(args) \
-  :key(BOOST_FLYWEIGHT_FORWARD(args)),value_ptr(0){}
+  :key(BOOST_FLYWEIGHT_FORWARD(args)),value_cted(false){}
 
   BOOST_FLYWEIGHT_PERFECT_FWD(
     explicit rep_type,
@@ -214,34 +222,34 @@ struct regular_key_value:value_marker
 
 #undef BOOST_FLYWEIGHT_PERFECT_FWD_CTR_BODY
 
-    rep_type(const rep_type& x):key(x.key),value_ptr(0){}
+    rep_type(const rep_type& x):key(x.key),value_cted(false){}
     rep_type(const value_type&):key(no_key_from_value_failure()){}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-    rep_type(rep_type&& x):key(std::move(x.key)),value_ptr(0){}
+    rep_type(rep_type&& x):key(std::move(x.key)),value_cted(false){}
     rep_type(value_type&&):key(no_key_from_value_failure()){}
 #endif
 
     ~rep_type()
     {
-      if(value_ptr)value_ptr->~value_type();
+      if(value_cted)value_ptr()->~value_type();
     }
 
-    operator const key_type&()const{return key;}
+    operator const key_type&()const BOOST_NOEXCEPT{return key;}
 
     operator const value_type&()const
     {
-      /* This is always called after construct_value(),so we access spc
-       * directly rather than through value_ptr to save us an indirection.
-       */
-
-      return *static_cast<value_type*>(spc_ptr());
+      BOOST_ASSERT(value_cted);
+      return *value_ptr();
     }
 
   private:
-    friend struct regular_key_value;
+    friend struct product_key_value;
 
-    void* spc_ptr()const{return static_cast<void*>(&spc);}
+    value_type* value_ptr()const
+    {
+      return static_cast<value_type*>(static_cast<void*>(&value_spc));
+    }
 
     struct no_key_from_value_failure
     {
@@ -253,33 +261,36 @@ struct regular_key_value:value_marker
       operator const key_type&()const;
     };
 
-    void construct_value()const
+    void key_construct_value()const
     {
-      if(!value_ptr)value_ptr=new(spc_ptr())value_type(key);
+      if(!value_cted){
+        new(value_ptr())value_type(key);
+        value_cted=true;
+      }
     }
 
     key_type                                 key;
     mutable typename boost::aligned_storage<
       sizeof(value_type),
       boost::alignment_of<value_type>::value
-    >::type                                  spc;
-    mutable const value_type*                value_ptr;
+    >::type                                  value_spc;
+    mutable bool                             value_cted;
   };
 
-  static void construct_value(const rep_type& r)
+  static void key_construct_value(const rep_type& r)
   {
-    r.construct_value();
+    r.key_construct_value();
   }
 
-  /* copy_value() and move_value() can't really ever be called, provided to avoid
-   * compile errors (it is the no_key_from_value_failure compile error we want to
-   * appear in these cases).
+  /* [copy|move]_construct_value() can't really ever be called, provided to
+   * avoid compile errors (it is the no_key_from_value_failure compile error
+   * we want to appear in these cases).
    */
 
-  static void copy_value(const rep_type&){}
+  static void copy_construct_value(const rep_type&,const value_type&){}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-  static void move_value(const rep_type&){}
+  static void move_construct_value(const rep_type&,value_type&&){}
 #endif
 };
 
@@ -289,8 +300,8 @@ template<typename Key,typename Value,typename KeyFromValue>
 struct key_value:
   mpl::if_<
     is_same<KeyFromValue,no_key_from_value>,
-    detail::regular_key_value<Key,Value>,
-    detail::optimized_key_value<Key,Value,KeyFromValue>
+    detail::product_key_value<Key,Value>,
+    detail::variant_key_value<Key,Value,KeyFromValue>
   >::type
 {};
 
diff --git a/inst/include/boost/flyweight/refcounted.hpp b/inst/include/boost/flyweight/refcounted.hpp
index 8386380e4..dd9ee9f56 100644
--- a/inst/include/boost/flyweight/refcounted.hpp
+++ b/inst/include/boost/flyweight/refcounted.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2022 Joaquin M Lopez Munoz.
+/* Copyright 2006-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -15,11 +15,11 @@
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <algorithm>
+#include <boost/config/workaround.hpp>
 #include <boost/core/invoke_swap.hpp>
-#include <boost/detail/atomic_count.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/flyweight/refcounted_fwd.hpp>
 #include <boost/flyweight/tracking_tag.hpp>
+#include <boost/smart_ptr/detail/atomic_count.hpp>
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #include <utility>
diff --git a/inst/include/boost/format/group.hpp b/inst/include/boost/format/group.hpp
index c586b2a61..47b10a5d2 100644
--- a/inst/include/boost/format/group.hpp
+++ b/inst/include/boost/format/group.hpp
@@ -55,8 +55,8 @@ struct group1
     group1(T1 a1)
       : a1_(a1)
       {}
-private:
-   group1& operator=(const group1&);
+    group1(const group1&) = default;
+    group1& operator=(const group1&) = delete;
 };
 
 template <class Ch, class Tr, class T1>
@@ -80,8 +80,8 @@ struct group2
     group2(T1 a1,T2 a2)
       : a1_(a1),a2_(a2)
       {}
-private:
-   group2& operator=(const group2&);
+    group2(const group2&) = default;
+    group2& operator=(const group2&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2>
@@ -103,8 +103,8 @@ struct group3
     group3(T1 a1,T2 a2,T3 a3)
       : a1_(a1),a2_(a2),a3_(a3)
       {}
-private:
-   group3& operator=(const group3&);
+    group3(const group3&) = default;
+    group3& operator=(const group3&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3>
@@ -127,8 +127,8 @@ struct group4
     group4(T1 a1,T2 a2,T3 a3,T4 a4)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4)
       {}
-private:
-   group4& operator=(const group4&);
+    group4(const group4&) = default;
+    group4& operator=(const group4&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4>
@@ -152,6 +152,8 @@ struct group5
     group5(T1 a1,T2 a2,T3 a3,T4 a4,T5 a5)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4),a5_(a5)
       {}
+    group5(const group5&) = default;
+    group5& operator=(const group5&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4,class T5>
@@ -176,6 +178,8 @@ struct group6
     group6(T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4),a5_(a5),a6_(a6)
       {}
+    group6(const group6&) = default;
+    group6& operator=(const group6&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4,class T5,class T6>
@@ -201,6 +205,8 @@ struct group7
     group7(T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4),a5_(a5),a6_(a6),a7_(a7)
       {}
+    group7(const group7&) = default;
+    group7& operator=(const group7&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4,class T5,class T6,class T7>
@@ -227,6 +233,8 @@ struct group8
     group8(T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4),a5_(a5),a6_(a6),a7_(a7),a8_(a8)
       {}
+    group8(const group8&) = default;
+    group8& operator=(const group8&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8>
@@ -254,6 +262,8 @@ struct group9
     group9(T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8,T9 a9)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4),a5_(a5),a6_(a6),a7_(a7),a8_(a8),a9_(a9)
       {}
+    group9(const group9&) = default;
+    group9& operator=(const group9&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9>
@@ -282,6 +292,8 @@ struct group10
     group10(T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8,T9 a9,T10 a10)
       : a1_(a1),a2_(a2),a3_(a3),a4_(a4),a5_(a5),a6_(a6),a7_(a7),a8_(a8),a9_(a9),a10_(a10)
       {}
+    group10(const group10&) = default;
+    group10& operator=(const group10&) = delete;
 };
 
 template <class Ch, class Tr, class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10>
diff --git a/inst/include/boost/function.hpp b/inst/include/boost/function.hpp
index f6ee8820a..6fd7388bd 100644
--- a/inst/include/boost/function.hpp
+++ b/inst/include/boost/function.hpp
@@ -1,3 +1,6 @@
+#ifndef BOOST_FUNCTION_HPP_INCLUDED
+#define BOOST_FUNCTION_HPP_INCLUDED
+
 // Boost.Function library
 
 //  Copyright Douglas Gregor 2001-2003. Use, modification and
@@ -10,67 +13,6 @@
 // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
 // design of this library.
 
-#ifndef BOOST_FUNCTION_MAX_ARGS
-#  define BOOST_FUNCTION_MAX_ARGS 10
-#endif // BOOST_FUNCTION_MAX_ARGS
-
-#if !defined(BOOST_FUNCTION_MAX_ARGS_DEFINED) || (BOOST_FUNCTION_MAX_ARGS_DEFINED != BOOST_FUNCTION_MAX_ARGS)
-
-#if !defined(BOOST_FUNCTION_MAX_ARGS_DEFINED)
-#define BOOST_FUNCTION_MAX_ARGS_DEFINED 0
-#endif
-
-#include <functional> // unary_function, binary_function
-
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/config/workaround.hpp>
-
-// Include the prologue here so that the use of file-level iteration
-// in anything that may be included by function_template.hpp doesn't break
-#include <boost/function/detail/prologue.hpp>
-
-// Older Visual Age C++ version do not handle the file iteration well
-#if BOOST_WORKAROUND(__IBMCPP__, >= 500) && BOOST_WORKAROUND(__IBMCPP__, < 800)
-#  if BOOST_FUNCTION_MAX_ARGS >= 0
-#    include <boost/function/function0.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 1
-#    include <boost/function/function1.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 2
-#    include <boost/function/function2.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 3
-#    include <boost/function/function3.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 4
-#    include <boost/function/function4.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 5
-#    include <boost/function/function5.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 6
-#    include <boost/function/function6.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 7
-#    include <boost/function/function7.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 8
-#    include <boost/function/function8.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 9
-#    include <boost/function/function9.hpp>
-#  endif
-#  if BOOST_FUNCTION_MAX_ARGS >= 10
-#    include <boost/function/function10.hpp>
-#  endif
-#else
-// What is the '3' for?
-#  define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_FUNCTION_MAX_ARGS,<boost/function/detail/function_iterate.hpp>))
-#  include BOOST_PP_ITERATE()
-#  undef BOOST_PP_ITERATION_PARAMS_1
-#endif
-
-#include <boost/function/detail/epilogue.hpp>
+#include <boost/function/function_template.hpp>
 
-#endif // !defined(BOOST_FUNCTION_MAX_ARGS_DEFINED) || (BOOST_FUNCTION_MAX_ARGS_DEFINED != BOOST_FUNCTION_MAX_ARGS)
+#endif // #ifndef BOOST_FUNCTION_HPP_INCLUDED
diff --git a/inst/include/boost/function/detail/epilogue.hpp b/inst/include/boost/function/detail/epilogue.hpp
deleted file mode 100644
index 908788bcd..000000000
--- a/inst/include/boost/function/detail/epilogue.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Boost.Function library
-
-#ifndef BOOST_FUNCTION_EPILOGUE_HPP
-#define BOOST_FUNCTION_EPILOGUE_HPP
-
-// Copyright 2023 Peter Dimov
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-// Resolve C++20 issue with fn == bind(...)
-// https://github.com/boostorg/function/issues/45
-
-#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
-
-namespace boost
-{
-
-namespace _bi
-{
-
-template<class R, class F, class L> class bind_t;
-
-} // namespace _bi
-
-template<class S, class R, class F, class L> bool operator==( function<S> const& f, _bi::bind_t<R, F, L> const& b )
-{
-    return f.contains( b );
-}
-
-template<class S, class R, class F, class L> bool operator!=( function<S> const& f, _bi::bind_t<R, F, L> const& b )
-{
-    return !f.contains( b );
-}
-
-} // namespace boost
-
-#endif // #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
-
-#endif // #ifndef BOOST_FUNCTION_EPILOGUE_HPP
diff --git a/inst/include/boost/function/detail/function_iterate.hpp b/inst/include/boost/function/detail/function_iterate.hpp
deleted file mode 100644
index 5370b36aa..000000000
--- a/inst/include/boost/function/detail/function_iterate.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-#if !defined(BOOST_PP_IS_ITERATING)
-# error Boost.Function - do not include this file!
-#endif
-
-#define BOOST_FUNCTION_NUM_ARGS BOOST_PP_ITERATION()
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
-
diff --git a/inst/include/boost/function/detail/gen_maybe_include.pl b/inst/include/boost/function/detail/gen_maybe_include.pl
deleted file mode 100644
index bc409840b..000000000
--- a/inst/include/boost/function/detail/gen_maybe_include.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Boost.Function library
-#
-# Copyright (C) 2001-2003 Douglas Gregor (gregod@cs.rpi.edu)
-#
-# Permission to copy, use, sell and distribute this software is granted
-# provided this copyright notice appears in all copies.
-# Permission to modify the code and to distribute modified code is granted
-# provided this copyright notice appears in all copies, and a notice
-# that the code was modified is included with the copyright notice.
-#
-# This software is provided "as is" without express or implied warranty,
-# and with no claim as to its suitability for any purpose.
-#
-# For more information, see http://www.boost.org
-use English;
-
-$max_args = $ARGV[0];
-
-open (OUT, ">maybe_include.hpp") or die("Cannot write to maybe_include.hpp");
-for($on_arg = 0; $on_arg <= $max_args; ++$on_arg) {
-    if ($on_arg == 0) {
-	print OUT "#if";
-    }
-    else {
-	print OUT "#elif";
-    }
-    print OUT " BOOST_FUNCTION_NUM_ARGS == $on_arg\n";
-    print OUT "#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED\n";
-    print OUT "#  define BOOST_FUNCTION_MAX_ARGS_DEFINED $on_arg\n";
-    print OUT "#  ifndef BOOST_FUNCTION_$on_arg\n";
-    print OUT "#    define BOOST_FUNCTION_$on_arg\n";
-    print OUT "#    include <boost/function/function_template.hpp>\n";
-    print OUT "#  endif\n";
-}
-print OUT "#else\n";
-print OUT "#  error Cannot handle Boost.Function objects that accept more than $max_args arguments!\n";
-print OUT "#endif\n";
diff --git a/inst/include/boost/function/detail/maybe_include.hpp b/inst/include/boost/function/detail/maybe_include.hpp
deleted file mode 100644
index ec88905dc..000000000
--- a/inst/include/boost/function/detail/maybe_include.hpp
+++ /dev/null
@@ -1,369 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#if BOOST_FUNCTION_NUM_ARGS == 0
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 0
-#  ifndef BOOST_FUNCTION_0
-#    define BOOST_FUNCTION_0
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 1
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 1
-#  ifndef BOOST_FUNCTION_1
-#    define BOOST_FUNCTION_1
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 2
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 2
-#  ifndef BOOST_FUNCTION_2
-#    define BOOST_FUNCTION_2
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 3
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 3
-#  ifndef BOOST_FUNCTION_3
-#    define BOOST_FUNCTION_3
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 4
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 4
-#  ifndef BOOST_FUNCTION_4
-#    define BOOST_FUNCTION_4
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 5
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 5
-#  ifndef BOOST_FUNCTION_5
-#    define BOOST_FUNCTION_5
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 6
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 6
-#  ifndef BOOST_FUNCTION_6
-#    define BOOST_FUNCTION_6
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 7
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 7
-#  ifndef BOOST_FUNCTION_7
-#    define BOOST_FUNCTION_7
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 8
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 8
-#  ifndef BOOST_FUNCTION_8
-#    define BOOST_FUNCTION_8
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 9
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 9
-#  ifndef BOOST_FUNCTION_9
-#    define BOOST_FUNCTION_9
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 10
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 10
-#  ifndef BOOST_FUNCTION_10
-#    define BOOST_FUNCTION_10
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 11
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 11
-#  ifndef BOOST_FUNCTION_11
-#    define BOOST_FUNCTION_11
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 12
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 12
-#  ifndef BOOST_FUNCTION_12
-#    define BOOST_FUNCTION_12
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 13
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 13
-#  ifndef BOOST_FUNCTION_13
-#    define BOOST_FUNCTION_13
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 14
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 14
-#  ifndef BOOST_FUNCTION_14
-#    define BOOST_FUNCTION_14
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 15
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 15
-#  ifndef BOOST_FUNCTION_15
-#    define BOOST_FUNCTION_15
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 16
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 16
-#  ifndef BOOST_FUNCTION_16
-#    define BOOST_FUNCTION_16
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 17
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 17
-#  ifndef BOOST_FUNCTION_17
-#    define BOOST_FUNCTION_17
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 18
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 18
-#  ifndef BOOST_FUNCTION_18
-#    define BOOST_FUNCTION_18
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 19
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 19
-#  ifndef BOOST_FUNCTION_19
-#    define BOOST_FUNCTION_19
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 20
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 20
-#  ifndef BOOST_FUNCTION_20
-#    define BOOST_FUNCTION_20
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 21
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 21
-#  ifndef BOOST_FUNCTION_21
-#    define BOOST_FUNCTION_21
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 22
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 22
-#  ifndef BOOST_FUNCTION_22
-#    define BOOST_FUNCTION_22
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 23
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 23
-#  ifndef BOOST_FUNCTION_23
-#    define BOOST_FUNCTION_23
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 24
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 24
-#  ifndef BOOST_FUNCTION_24
-#    define BOOST_FUNCTION_24
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 25
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 25
-#  ifndef BOOST_FUNCTION_25
-#    define BOOST_FUNCTION_25
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 26
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 26
-#  ifndef BOOST_FUNCTION_26
-#    define BOOST_FUNCTION_26
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 27
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 27
-#  ifndef BOOST_FUNCTION_27
-#    define BOOST_FUNCTION_27
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 28
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 28
-#  ifndef BOOST_FUNCTION_28
-#    define BOOST_FUNCTION_28
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 29
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 29
-#  ifndef BOOST_FUNCTION_29
-#    define BOOST_FUNCTION_29
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 30
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 30
-#  ifndef BOOST_FUNCTION_30
-#    define BOOST_FUNCTION_30
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 31
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 31
-#  ifndef BOOST_FUNCTION_31
-#    define BOOST_FUNCTION_31
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 32
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 32
-#  ifndef BOOST_FUNCTION_32
-#    define BOOST_FUNCTION_32
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 33
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 33
-#  ifndef BOOST_FUNCTION_33
-#    define BOOST_FUNCTION_33
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 34
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 34
-#  ifndef BOOST_FUNCTION_34
-#    define BOOST_FUNCTION_34
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 35
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 35
-#  ifndef BOOST_FUNCTION_35
-#    define BOOST_FUNCTION_35
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 36
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 36
-#  ifndef BOOST_FUNCTION_36
-#    define BOOST_FUNCTION_36
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 37
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 37
-#  ifndef BOOST_FUNCTION_37
-#    define BOOST_FUNCTION_37
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 38
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 38
-#  ifndef BOOST_FUNCTION_38
-#    define BOOST_FUNCTION_38
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 39
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 39
-#  ifndef BOOST_FUNCTION_39
-#    define BOOST_FUNCTION_39
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 40
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 40
-#  ifndef BOOST_FUNCTION_40
-#    define BOOST_FUNCTION_40
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 41
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 41
-#  ifndef BOOST_FUNCTION_41
-#    define BOOST_FUNCTION_41
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 42
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 42
-#  ifndef BOOST_FUNCTION_42
-#    define BOOST_FUNCTION_42
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 43
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 43
-#  ifndef BOOST_FUNCTION_43
-#    define BOOST_FUNCTION_43
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 44
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 44
-#  ifndef BOOST_FUNCTION_44
-#    define BOOST_FUNCTION_44
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 45
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 45
-#  ifndef BOOST_FUNCTION_45
-#    define BOOST_FUNCTION_45
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 46
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 46
-#  ifndef BOOST_FUNCTION_46
-#    define BOOST_FUNCTION_46
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 47
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 47
-#  ifndef BOOST_FUNCTION_47
-#    define BOOST_FUNCTION_47
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 48
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 48
-#  ifndef BOOST_FUNCTION_48
-#    define BOOST_FUNCTION_48
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 49
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 49
-#  ifndef BOOST_FUNCTION_49
-#    define BOOST_FUNCTION_49
-#    include <boost/function/function_template.hpp>
-#  endif
-#elif BOOST_FUNCTION_NUM_ARGS == 50
-#  undef BOOST_FUNCTION_MAX_ARGS_DEFINED
-#  define BOOST_FUNCTION_MAX_ARGS_DEFINED 50
-#  ifndef BOOST_FUNCTION_50
-#    define BOOST_FUNCTION_50
-#    include <boost/function/function_template.hpp>
-#  endif
-#else
-#  error Cannot handle Boost.Function objects that accept more than 50 arguments!
-#endif
diff --git a/inst/include/boost/function/detail/prologue.hpp b/inst/include/boost/function/detail/prologue.hpp
deleted file mode 100644
index 2edebe061..000000000
--- a/inst/include/boost/function/detail/prologue.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#ifndef BOOST_FUNCTION_PROLOGUE_HPP
-#define BOOST_FUNCTION_PROLOGUE_HPP
-#  include <boost/function/detail/requires_cxx11.hpp>
-#  include <cassert>
-#  include <algorithm>
-#  include <boost/config/no_tr1/functional.hpp> // unary_function, binary_function
-#  include <boost/throw_exception.hpp>
-#  include <boost/config.hpp>
-#  include <boost/function/function_base.hpp>
-#  include <boost/mem_fn.hpp>
-#  include <boost/type_traits/is_integral.hpp>
-#  include <boost/preprocessor/enum.hpp>
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/cat.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/inc.hpp>
-#  include <boost/type_traits/is_void.hpp>
-#endif // BOOST_FUNCTION_PROLOGUE_HPP
diff --git a/inst/include/boost/function/detail/requires_cxx11.hpp b/inst/include/boost/function/detail/requires_cxx11.hpp
deleted file mode 100644
index 8ed947c95..000000000
--- a/inst/include/boost/function/detail/requires_cxx11.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef BOOST_FUNCTION_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-#define BOOST_FUNCTION_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-
-// Copyright 2023 Peter Dimov
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/config.hpp>
-#include <boost/config/pragma_message.hpp>
-
-#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || \
-    defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
-    defined(BOOST_NO_CXX11_DECLTYPE) || \
-    defined(BOOST_NO_CXX11_CONSTEXPR) || \
-    defined(BOOST_NO_CXX11_NOEXCEPT) || \
-    defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
-BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.Function 1.82 and will be removed in Boost.Function 1.85.")
-
-#endif
-
-#endif // #ifndef BOOST_FUNCTION_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
diff --git a/inst/include/boost/function/function0.hpp b/inst/include/boost/function/function0.hpp
index 65a02e5fa..b0275b26c 100644
--- a/inst/include/boost/function/function0.hpp
+++ b/inst/include/boost/function/function0.hpp
@@ -7,6 +7,4 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_FUNCTION_NUM_ARGS 0
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
+#include <boost/function/function_template.hpp>
diff --git a/inst/include/boost/function/function1.hpp b/inst/include/boost/function/function1.hpp
index 908971515..b0275b26c 100644
--- a/inst/include/boost/function/function1.hpp
+++ b/inst/include/boost/function/function1.hpp
@@ -7,6 +7,4 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_FUNCTION_NUM_ARGS 1
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
+#include <boost/function/function_template.hpp>
diff --git a/inst/include/boost/function/function10.hpp b/inst/include/boost/function/function10.hpp
deleted file mode 100644
index 656272484..000000000
--- a/inst/include/boost/function/function10.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 10
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function2.hpp b/inst/include/boost/function/function2.hpp
index dc8bf9752..b0275b26c 100644
--- a/inst/include/boost/function/function2.hpp
+++ b/inst/include/boost/function/function2.hpp
@@ -7,6 +7,4 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_FUNCTION_NUM_ARGS 2
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
+#include <boost/function/function_template.hpp>
diff --git a/inst/include/boost/function/function3.hpp b/inst/include/boost/function/function3.hpp
index 19d1a49dd..b0275b26c 100644
--- a/inst/include/boost/function/function3.hpp
+++ b/inst/include/boost/function/function3.hpp
@@ -7,6 +7,4 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_FUNCTION_NUM_ARGS 3
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
+#include <boost/function/function_template.hpp>
diff --git a/inst/include/boost/function/function4.hpp b/inst/include/boost/function/function4.hpp
deleted file mode 100644
index f3349e2dc..000000000
--- a/inst/include/boost/function/function4.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 4
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function5.hpp b/inst/include/boost/function/function5.hpp
deleted file mode 100644
index a1305eb5c..000000000
--- a/inst/include/boost/function/function5.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 5
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function6.hpp b/inst/include/boost/function/function6.hpp
deleted file mode 100644
index 1f6091491..000000000
--- a/inst/include/boost/function/function6.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 6
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function7.hpp b/inst/include/boost/function/function7.hpp
deleted file mode 100644
index 68542ed46..000000000
--- a/inst/include/boost/function/function7.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 7
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function8.hpp b/inst/include/boost/function/function8.hpp
deleted file mode 100644
index cf2c37661..000000000
--- a/inst/include/boost/function/function8.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 8
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function9.hpp b/inst/include/boost/function/function9.hpp
deleted file mode 100644
index 590e0883d..000000000
--- a/inst/include/boost/function/function9.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Boost.Function library
-
-//  Copyright Douglas Gregor 2002-2003. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// For more information, see http://www.boost.org
-
-#define BOOST_FUNCTION_NUM_ARGS 9
-#include <boost/function/detail/maybe_include.hpp>
-#undef BOOST_FUNCTION_NUM_ARGS
diff --git a/inst/include/boost/function/function_base.hpp b/inst/include/boost/function/function_base.hpp
index fbadee3aa..73186251d 100644
--- a/inst/include/boost/function/function_base.hpp
+++ b/inst/include/boost/function/function_base.hpp
@@ -15,17 +15,6 @@
 #include <boost/function_equal.hpp>
 #include <boost/core/typeinfo.hpp>
 #include <boost/core/ref.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/type_traits/is_volatile.hpp>
-#include <boost/type_traits/composite_traits.hpp>
-#include <boost/type_traits/conditional.hpp>
-#include <boost/type_traits/alignment_of.hpp>
-#include <boost/type_traits/enable_if.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/type_traits/is_function.hpp>
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
@@ -33,6 +22,7 @@
 #include <string>
 #include <memory>
 #include <new>
+#include <type_traits>
 
 #if defined(BOOST_MSVC)
 #   pragma warning( push )
@@ -40,16 +30,11 @@
 #   pragma warning( disable : 4127 ) // "conditional expression is constant"
 #endif
 
-#if defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG)
-#  define BOOST_FUNCTION_TARGET_FIX(x) x
-#else
-#  define BOOST_FUNCTION_TARGET_FIX(x)
-#endif // __ICL etc
+// retained because used in a test
+#define BOOST_FUNCTION_TARGET_FIX(x)
 
-#  define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)              \
-      typename ::boost::enable_if_<          \
-                           !(::boost::is_integral<Functor>::value), \
-                           Type>::type
+#define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
+  typename std::enable_if< !std::is_integral<Functor>::value, Type>::type
 
 namespace boost {
   namespace detail {
@@ -116,30 +101,6 @@ namespace boost {
         mutable char data[sizeof(function_buffer_members)];
       };
 
-      /**
-       * The unusable class is a placeholder for unused function arguments
-       * It is also completely unusable except that it constructable from
-       * anything. This helps compilers without partial specialization to
-       * handle Boost.Function objects returning void.
-       */
-      struct unusable
-      {
-        unusable() {}
-        template<typename T> unusable(const T&) {}
-      };
-
-      /* Determine the return type. This supports compilers that do not support
-       * void returns or partial specialization by silently changing the return
-       * type to "unusable".
-       */
-      template<typename T> struct function_return_type { typedef T type; };
-
-      template<>
-      struct function_return_type<void>
-      {
-        typedef unusable type;
-      };
-
       // The operation type to perform on the given functor/function pointer
       enum functor_manager_operation_type {
         clone_functor_tag,
@@ -158,15 +119,15 @@ namespace boost {
       template<typename F>
       class get_function_tag
       {
-        typedef typename conditional<(is_pointer<F>::value),
+        typedef typename std::conditional<std::is_pointer<F>::value,
                                    function_ptr_tag,
                                    function_obj_tag>::type ptr_or_obj_tag;
 
-        typedef typename conditional<(is_member_pointer<F>::value),
+        typedef typename std::conditional<std::is_member_pointer<F>::value,
                                    member_ptr_tag,
                                    ptr_or_obj_tag>::type ptr_or_obj_or_mem_tag;
 
-        typedef typename conditional<(is_reference_wrapper<F>::value),
+        typedef typename std::conditional<is_reference_wrapper<F>::value,
                                    function_obj_ref_tag,
                                    ptr_or_obj_or_mem_tag>::type or_ref_tag;
 
@@ -231,8 +192,8 @@ namespace boost {
         BOOST_STATIC_CONSTANT
           (bool,
            value = ((sizeof(F) <= sizeof(function_buffer) &&
-                     (alignment_of<function_buffer>::value
-                      % alignment_of<F>::value == 0))));
+                     (std::alignment_of<function_buffer>::value
+                      % std::alignment_of<F>::value == 0))));
       };
 
       template <typename F,typename A>
@@ -289,16 +250,15 @@ namespace boost {
         manage_small(const function_buffer& in_buffer, function_buffer& out_buffer,
                 functor_manager_operation_type op)
         {
-          if (op == clone_functor_tag || op == move_functor_tag) {
+          if (op == clone_functor_tag) {
             const functor_type* in_functor =
               reinterpret_cast<const functor_type*>(in_buffer.data);
             new (reinterpret_cast<void*>(out_buffer.data)) functor_type(*in_functor);
 
-            if (op == move_functor_tag) {
+          } else if (op == move_functor_tag) {
               functor_type* f = reinterpret_cast<functor_type*>(in_buffer.data);
-              (void)f; // suppress warning about the value of f not being used (MSVC)
+              new (reinterpret_cast<void*>(out_buffer.data)) functor_type(std::move(*f));
               f->~Functor();
-            }
           } else if (op == destroy_functor_tag) {
             // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
              functor_type* f = reinterpret_cast<functor_type*>(out_buffer.data);
@@ -334,7 +294,7 @@ namespace boost {
         // Function objects that fit in the small-object buffer.
         static inline void
         manager(const function_buffer& in_buffer, function_buffer& out_buffer,
-                functor_manager_operation_type op, true_type)
+                functor_manager_operation_type op, std::true_type)
         {
           functor_manager_common<Functor>::manage_small(in_buffer,out_buffer,op);
         }
@@ -342,7 +302,7 @@ namespace boost {
         // Function objects that require heap allocation
         static inline void
         manager(const function_buffer& in_buffer, function_buffer& out_buffer,
-                functor_manager_operation_type op, false_type)
+                functor_manager_operation_type op, std::false_type)
         {
           if (op == clone_functor_tag) {
             // Clone the functor
@@ -383,7 +343,7 @@ namespace boost {
                 functor_manager_operation_type op, function_obj_tag)
         {
           manager(in_buffer, out_buffer, op,
-                  integral_constant<bool, (function_allows_small_object_optimization<functor_type>::value)>());
+                  std::integral_constant<bool, (function_allows_small_object_optimization<functor_type>::value)>());
         }
 
         // For member pointers, we use the small-object optimization buffer.
@@ -391,7 +351,7 @@ namespace boost {
         manager(const function_buffer& in_buffer, function_buffer& out_buffer,
                 functor_manager_operation_type op, member_ptr_tag)
         {
-          manager(in_buffer, out_buffer, op, true_type());
+          manager(in_buffer, out_buffer, op, std::true_type());
         }
 
       public:
@@ -429,7 +389,7 @@ namespace boost {
         // Function objects that fit in the small-object buffer.
         static inline void
         manager(const function_buffer& in_buffer, function_buffer& out_buffer,
-                functor_manager_operation_type op, true_type)
+                functor_manager_operation_type op, std::true_type)
         {
           functor_manager_common<Functor>::manage_small(in_buffer,out_buffer,op);
         }
@@ -437,17 +397,12 @@ namespace boost {
         // Function objects that require heap allocation
         static inline void
         manager(const function_buffer& in_buffer, function_buffer& out_buffer,
-                functor_manager_operation_type op, false_type)
+                functor_manager_operation_type op, std::false_type)
         {
           typedef functor_wrapper<Functor,Allocator> functor_wrapper_type;
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-          typedef typename Allocator::template rebind<functor_wrapper_type>::other
-            wrapper_allocator_type;
-          typedef typename wrapper_allocator_type::pointer wrapper_allocator_pointer_type;
-#else
+
           using wrapper_allocator_type = typename std::allocator_traits<Allocator>::template rebind_alloc<functor_wrapper_type>;
           using wrapper_allocator_pointer_type = typename std::allocator_traits<wrapper_allocator_type>::pointer;
-#endif
 
           if (op == clone_functor_tag) {
             // Clone the functor
@@ -457,11 +412,7 @@ namespace boost {
               static_cast<const functor_wrapper_type*>(in_buffer.members.obj_ptr);
             wrapper_allocator_type wrapper_allocator(static_cast<Allocator const &>(*f));
             wrapper_allocator_pointer_type copy = wrapper_allocator.allocate(1);
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-            wrapper_allocator.construct(copy, *f);
-#else
             std::allocator_traits<wrapper_allocator_type>::construct(wrapper_allocator, copy, *f);
-#endif
 
             // Get back to the original pointer type
             functor_wrapper_type* new_f = static_cast<functor_wrapper_type*>(copy);
@@ -474,11 +425,7 @@ namespace boost {
             functor_wrapper_type* victim =
               static_cast<functor_wrapper_type*>(in_buffer.members.obj_ptr);
             wrapper_allocator_type wrapper_allocator(static_cast<Allocator const &>(*victim));
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-            wrapper_allocator.destroy(victim);
-#else
             std::allocator_traits<wrapper_allocator_type>::destroy(wrapper_allocator, victim);
-#endif
             wrapper_allocator.deallocate(victim,1);
             out_buffer.members.obj_ptr = 0;
           } else if (op == check_functor_type_tag) {
@@ -501,7 +448,7 @@ namespace boost {
                 functor_manager_operation_type op, function_obj_tag)
         {
           manager(in_buffer, out_buffer, op,
-                  integral_constant<bool, (function_allows_small_object_optimization<functor_type>::value)>());
+                  std::integral_constant<bool, (function_allows_small_object_optimization<functor_type>::value)>());
         }
 
       public:
@@ -525,65 +472,6 @@ namespace boost {
       // A type that is only used for comparisons against zero
       struct useless_clear_type {};
 
-#ifdef BOOST_NO_SFINAE
-      // These routines perform comparisons between a Boost.Function
-      // object and an arbitrary function object (when the last
-      // parameter is false_type) or against zero (when the
-      // last parameter is true_type). They are only necessary
-      // for compilers that don't support SFINAE.
-      template<typename Function, typename Functor>
-        bool
-        compare_equal(const Function& f, const Functor&, int, true_type)
-        { return f.empty(); }
-
-      template<typename Function, typename Functor>
-        bool
-        compare_not_equal(const Function& f, const Functor&, int,
-                          true_type)
-        { return !f.empty(); }
-
-      template<typename Function, typename Functor>
-        bool
-        compare_equal(const Function& f, const Functor& g, long,
-                      false_type)
-        {
-          if (const Functor* fp = f.template target<Functor>())
-            return function_equal(*fp, g);
-          else return false;
-        }
-
-      template<typename Function, typename Functor>
-        bool
-        compare_equal(const Function& f, const reference_wrapper<Functor>& g,
-                      int, false_type)
-        {
-          if (const Functor* fp = f.template target<Functor>())
-            return fp == g.get_pointer();
-          else return false;
-        }
-
-      template<typename Function, typename Functor>
-        bool
-        compare_not_equal(const Function& f, const Functor& g, long,
-                          false_type)
-        {
-          if (const Functor* fp = f.template target<Functor>())
-            return !function_equal(*fp, g);
-          else return true;
-        }
-
-      template<typename Function, typename Functor>
-        bool
-        compare_not_equal(const Function& f,
-                          const reference_wrapper<Functor>& g, int,
-                          false_type)
-        {
-          if (const Functor* fp = f.template target<Functor>())
-            return fp != g.get_pointer();
-          else return true;
-        }
-#endif // BOOST_NO_SFINAE
-
       /**
        * Stores the "manager" portion of the vtable for a
        * boost::function object.
@@ -629,8 +517,8 @@ class function_base
 
       detail::function::function_buffer type_result;
       type_result.members.type.type = &BOOST_CORE_TYPEID(Functor);
-      type_result.members.type.const_qualified = is_const<Functor>::value;
-      type_result.members.type.volatile_qualified = is_volatile<Functor>::value;
+      type_result.members.type.const_qualified = std::is_const<Functor>::value;
+      type_result.members.type.volatile_qualified = std::is_volatile<Functor>::value;
       get_vtable()->manager(functor, type_result,
                       detail::function::check_functor_type_tag);
       return static_cast<Functor*>(type_result.members.obj_ptr);
@@ -644,7 +532,7 @@ class function_base
       detail::function::function_buffer type_result;
       type_result.members.type.type = &BOOST_CORE_TYPEID(Functor);
       type_result.members.type.const_qualified = true;
-      type_result.members.type.volatile_qualified = is_volatile<Functor>::value;
+      type_result.members.type.volatile_qualified = std::is_volatile<Functor>::value;
       get_vtable()->manager(functor, type_result,
                       detail::function::check_functor_type_tag);
       // GCC 2.95.3 gets the CV qualifiers wrong here, so we
@@ -653,8 +541,8 @@ class function_base
     }
 
   template<typename F>
-    typename boost::enable_if_< !boost::is_function<F>::value, bool >::type
-	contains(const F& f) const
+    typename std::enable_if< !std::is_function<F>::value, bool >::type
+    contains(const F& f) const
     {
       if (const F* fp = this->template target<F>())
       {
@@ -665,8 +553,8 @@ class function_base
     }
 
   template<typename Fn>
-    typename boost::enable_if_< boost::is_function<Fn>::value, bool >::type
-	contains(Fn& f) const
+    typename std::enable_if< std::is_function<Fn>::value, bool >::type
+    contains(Fn& f) const
     {
       typedef Fn* F;
       if (const F* fp = this->template target<F>())
@@ -677,29 +565,6 @@ class function_base
       }
     }
 
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3
-  // GCC 3.3 and newer cannot copy with the global operator==, due to
-  // problems with instantiation of function return types before it
-  // has been verified that the argument types match up.
-  template<typename Functor>
-    BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-    operator==(Functor g) const
-    {
-      if (const Functor* fp = target<Functor>())
-        return function_equal(*fp, g);
-      else return false;
-    }
-
-  template<typename Functor>
-    BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
-    operator!=(Functor g) const
-    {
-      if (const Functor* fp = target<Functor>())
-        return !function_equal(*fp, g);
-      else return true;
-    }
-#endif
-
 public: // should be protected, but GCC 2.95.3 will fail to allow access
   detail::function::vtable_base* get_vtable() const {
     return reinterpret_cast<detail::function::vtable_base*>(
@@ -731,7 +596,6 @@ class BOOST_SYMBOL_VISIBLE bad_function_call : public std::runtime_error
 #   pragma clang diagnostic pop
 #endif
 
-#ifndef BOOST_NO_SFINAE
 inline bool operator==(const function_base& f,
                        detail::function::useless_clear_type*)
 {
@@ -755,43 +619,10 @@ inline bool operator!=(detail::function::useless_clear_type*,
 {
   return !f.empty();
 }
-#endif
-
-#ifdef BOOST_NO_SFINAE
-// Comparisons between boost::function objects and arbitrary function objects
-template<typename Functor>
-  inline bool operator==(const function_base& f, Functor g)
-  {
-    typedef integral_constant<bool, (is_integral<Functor>::value)> integral;
-    return detail::function::compare_equal(f, g, 0, integral());
-  }
 
-template<typename Functor>
-  inline bool operator==(Functor g, const function_base& f)
-  {
-    typedef integral_constant<bool, (is_integral<Functor>::value)> integral;
-    return detail::function::compare_equal(f, g, 0, integral());
-  }
-
-template<typename Functor>
-  inline bool operator!=(const function_base& f, Functor g)
-  {
-    typedef integral_constant<bool, (is_integral<Functor>::value)> integral;
-    return detail::function::compare_not_equal(f, g, 0, integral());
-  }
-
-template<typename Functor>
-  inline bool operator!=(Functor g, const function_base& f)
-  {
-    typedef integral_constant<bool, (is_integral<Functor>::value)> integral;
-    return detail::function::compare_not_equal(f, g, 0, integral());
-  }
-#else
-
-#  if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
 // Comparisons between boost::function objects and arbitrary function
-// objects. GCC 3.3 and before has an obnoxious bug that prevents this
-// from working.
+// objects.
+
 template<typename Functor>
   BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
   operator==(const function_base& f, Functor g)
@@ -827,7 +658,6 @@ template<typename Functor>
       return !function_equal(g, *fp);
     else return true;
   }
-#  endif
 
 template<typename Functor>
   BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor, bool)
@@ -865,8 +695,6 @@ template<typename Functor>
     else return true;
   }
 
-#endif // Compiler supporting SFINAE
-
 namespace detail {
   namespace function {
     inline bool has_empty_target(const function_base* f)
diff --git a/inst/include/boost/function/function_fwd.hpp b/inst/include/boost/function/function_fwd.hpp
index e79b50489..fccfecc29 100644
--- a/inst/include/boost/function/function_fwd.hpp
+++ b/inst/include/boost/function/function_fwd.hpp
@@ -10,24 +10,9 @@
 #define BOOST_FUNCTION_FWD_HPP
 #include <boost/config.hpp>
 
-#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
-// Work around a compiler bug.
-// boost::python::objects::function has to be seen by the compiler before the
-// boost::function class template.
-namespace boost { namespace python { namespace objects {
-  class function;
-}}}
-#endif
-
-#if defined(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG)                         \
- || !(defined(BOOST_STRICT_CONFIG) || !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540)
-#  define BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX
-#endif
-
 namespace boost {
   class bad_function_call;
 
-#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
   // Preferred syntax
   template<typename Signature> class function;
 
@@ -36,34 +21,44 @@ namespace boost {
   {
     f1.swap(f2);
   }
-#endif // have partial specialization
 
   // Portable syntax
-  template<typename R> class function0;
-  template<typename R, typename T1> class function1;
-  template<typename R, typename T1, typename T2> class function2;
-  template<typename R, typename T1, typename T2, typename T3> class function3;
-  template<typename R, typename T1, typename T2, typename T3, typename T4> 
-    class function4;
-  template<typename R, typename T1, typename T2, typename T3, typename T4,
-           typename T5> 
-    class function5;
-  template<typename R, typename T1, typename T2, typename T3, typename T4,
-           typename T5, typename T6> 
-    class function6;
-  template<typename R, typename T1, typename T2, typename T3, typename T4,
-           typename T5, typename T6, typename T7> 
-    class function7;
-  template<typename R, typename T1, typename T2, typename T3, typename T4,
-           typename T5, typename T6, typename T7, typename T8> 
-    class function8;
-  template<typename R, typename T1, typename T2, typename T3, typename T4,
-           typename T5, typename T6, typename T7, typename T8, typename T9> 
-    class function9;
-  template<typename R, typename T1, typename T2, typename T3, typename T4,
-           typename T5, typename T6, typename T7, typename T8, typename T9,
-           typename T10> 
-    class function10;
+  template<typename R, typename... T> class function_n;
+
+  template<typename R, typename... T> using function0 = function_n<R, T...>;
+  template<typename R, typename... T> using function1 = function_n<R, T...>;
+  template<typename R, typename... T> using function2 = function_n<R, T...>;
+  template<typename R, typename... T> using function3 = function_n<R, T...>;
+  template<typename R, typename... T> using function4 = function_n<R, T...>;
+  template<typename R, typename... T> using function5 = function_n<R, T...>;
+  template<typename R, typename... T> using function6 = function_n<R, T...>;
+  template<typename R, typename... T> using function7 = function_n<R, T...>;
+  template<typename R, typename... T> using function8 = function_n<R, T...>;
+  template<typename R, typename... T> using function9 = function_n<R, T...>;
+
+  template<typename R, typename... T> using function10 = function_n<R, T...>;
+  template<typename R, typename... T> using function11 = function_n<R, T...>;
+  template<typename R, typename... T> using function12 = function_n<R, T...>;
+  template<typename R, typename... T> using function13 = function_n<R, T...>;
+  template<typename R, typename... T> using function14 = function_n<R, T...>;
+  template<typename R, typename... T> using function15 = function_n<R, T...>;
+  template<typename R, typename... T> using function16 = function_n<R, T...>;
+  template<typename R, typename... T> using function17 = function_n<R, T...>;
+  template<typename R, typename... T> using function18 = function_n<R, T...>;
+  template<typename R, typename... T> using function19 = function_n<R, T...>;
+
+  template<typename R, typename... T> using function20 = function_n<R, T...>;
+  template<typename R, typename... T> using function21 = function_n<R, T...>;
+  template<typename R, typename... T> using function22 = function_n<R, T...>;
+  template<typename R, typename... T> using function23 = function_n<R, T...>;
+  template<typename R, typename... T> using function24 = function_n<R, T...>;
+  template<typename R, typename... T> using function25 = function_n<R, T...>;
+  template<typename R, typename... T> using function26 = function_n<R, T...>;
+  template<typename R, typename... T> using function27 = function_n<R, T...>;
+  template<typename R, typename... T> using function28 = function_n<R, T...>;
+  template<typename R, typename... T> using function29 = function_n<R, T...>;
+
+  template<typename R, typename... T> using function30 = function_n<R, T...>;
 }
 
 #endif
diff --git a/inst/include/boost/function/function_template.hpp b/inst/include/boost/function/function_template.hpp
index 617cd3a50..777feca01 100644
--- a/inst/include/boost/function/function_template.hpp
+++ b/inst/include/boost/function/function_template.hpp
@@ -1,3 +1,6 @@
+#ifndef BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP_INCLUDED
+#define BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP_INCLUDED
+
 // Boost.Function library
 
 //  Copyright Douglas Gregor 2001-2006
@@ -8,125 +11,64 @@
 
 // For more information, see http://www.boost.org
 
-// Note: this header is a header template and must NOT have multiple-inclusion
-// protection.
-#include <boost/function/detail/prologue.hpp>
+#include <boost/function/function_base.hpp>
 #include <boost/core/no_exceptions_support.hpp>
+#include <boost/mem_fn.hpp>
+#include <boost/throw_exception.hpp>
+#include <boost/config.hpp>
+#include <algorithm>
+#include <cassert>
+#include <type_traits>
 
 #if defined(BOOST_MSVC)
 #   pragma warning( push )
 #   pragma warning( disable : 4127 ) // "conditional expression is constant"
 #endif
 
-#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
-
-#define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T)
-
-#define BOOST_FUNCTION_PARM(J,I,D) BOOST_PP_CAT(T,I) BOOST_PP_CAT(a,I)
-
-#define BOOST_FUNCTION_PARMS BOOST_PP_ENUM(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_PARM,BOOST_PP_EMPTY)
-
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-#   define BOOST_FUNCTION_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, a)
-#else
-#   define BOOST_FUNCTION_ARG(J,I,D) static_cast<BOOST_PP_CAT(T,I)&&>(BOOST_PP_CAT(a,I))
-#   define BOOST_FUNCTION_ARGS BOOST_PP_ENUM(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_ARG,BOOST_PP_EMPTY)
-#endif
-
-#define BOOST_FUNCTION_ARG_TYPE(J,I,D) \
-  typedef BOOST_PP_CAT(T,I) BOOST_PP_CAT(BOOST_PP_CAT(arg, BOOST_PP_INC(I)),_type);
-
-#define BOOST_FUNCTION_ARG_TYPES BOOST_PP_REPEAT(BOOST_FUNCTION_NUM_ARGS,BOOST_FUNCTION_ARG_TYPE,BOOST_PP_EMPTY)
-
-// Comma if nonzero number of arguments
-#if BOOST_FUNCTION_NUM_ARGS == 0
-#  define BOOST_FUNCTION_COMMA
-#else
-#  define BOOST_FUNCTION_COMMA ,
-#endif // BOOST_FUNCTION_NUM_ARGS > 0
-
-// Class names used in this version of the code
-#define BOOST_FUNCTION_FUNCTION BOOST_JOIN(function,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_FUNCTION_INVOKER \
-  BOOST_JOIN(function_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_VOID_FUNCTION_INVOKER \
-  BOOST_JOIN(void_function_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_FUNCTION_OBJ_INVOKER \
-  BOOST_JOIN(function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER \
-  BOOST_JOIN(void_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_FUNCTION_REF_INVOKER \
-  BOOST_JOIN(function_ref_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER \
-  BOOST_JOIN(void_function_ref_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_MEMBER_INVOKER \
-  BOOST_JOIN(function_mem_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_VOID_MEMBER_INVOKER \
-  BOOST_JOIN(function_void_mem_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER \
-  BOOST_JOIN(get_function_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER \
-  BOOST_JOIN(get_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER \
-  BOOST_JOIN(get_function_ref_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_GET_MEMBER_INVOKER \
-  BOOST_JOIN(get_member_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_GET_INVOKER \
-  BOOST_JOIN(get_invoker,BOOST_FUNCTION_NUM_ARGS)
-#define BOOST_FUNCTION_VTABLE BOOST_JOIN(basic_vtable,BOOST_FUNCTION_NUM_ARGS)
-
-#ifndef BOOST_NO_VOID_RETURNS
-#  define BOOST_FUNCTION_VOID_RETURN_TYPE void
-#  define BOOST_FUNCTION_RETURN(X) X
-#else
-#  define BOOST_FUNCTION_VOID_RETURN_TYPE boost::detail::function::unusable
-#  define BOOST_FUNCTION_RETURN(X) X; return BOOST_FUNCTION_VOID_RETURN_TYPE ()
-#endif
-
 namespace boost {
   namespace detail {
     namespace function {
       template<
         typename FunctionPtr,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
         >
-      struct BOOST_FUNCTION_FUNCTION_INVOKER
+      struct function_invoker
       {
-        static R invoke(function_buffer& function_ptr BOOST_FUNCTION_COMMA
-                        BOOST_FUNCTION_PARMS)
+        static R invoke(function_buffer& function_ptr,
+                        T... a)
         {
           FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.members.func_ptr);
-          return f(BOOST_FUNCTION_ARGS);
+          return f(static_cast<T&&>(a)...);
         }
       };
 
       template<
         typename FunctionPtr,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
         >
-      struct BOOST_FUNCTION_VOID_FUNCTION_INVOKER
+      struct void_function_invoker
       {
-        static BOOST_FUNCTION_VOID_RETURN_TYPE
-        invoke(function_buffer& function_ptr BOOST_FUNCTION_COMMA
-               BOOST_FUNCTION_PARMS)
+        static void
+        invoke(function_buffer& function_ptr,
+               T... a)
 
         {
           FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.members.func_ptr);
-          BOOST_FUNCTION_RETURN(f(BOOST_FUNCTION_ARGS));
+          f(static_cast<T&&>(a)...);
         }
       };
 
       template<
         typename FunctionObj,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
+      struct function_obj_invoker
       {
-        static R invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
-                        BOOST_FUNCTION_PARMS)
+        static R invoke(function_buffer& function_obj_ptr,
+                        T... a)
 
         {
           FunctionObj* f;
@@ -134,20 +76,20 @@ namespace boost {
             f = reinterpret_cast<FunctionObj*>(function_obj_ptr.data);
           else
             f = reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr);
-          return (*f)(BOOST_FUNCTION_ARGS);
+          return (*f)(static_cast<T&&>(a)...);
         }
       };
 
       template<
         typename FunctionObj,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
+      struct void_function_obj_invoker
       {
-        static BOOST_FUNCTION_VOID_RETURN_TYPE
-        invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
-               BOOST_FUNCTION_PARMS)
+        static void
+        invoke(function_buffer& function_obj_ptr,
+               T... a)
 
         {
           FunctionObj* f;
@@ -155,194 +97,190 @@ namespace boost {
             f = reinterpret_cast<FunctionObj*>(function_obj_ptr.data);
           else
             f = reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr);
-          BOOST_FUNCTION_RETURN((*f)(BOOST_FUNCTION_ARGS));
+          (*f)(static_cast<T&&>(a)...);
         }
       };
 
       template<
         typename FunctionObj,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_FUNCTION_REF_INVOKER
+      struct function_ref_invoker
       {
-        static R invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
-                        BOOST_FUNCTION_PARMS)
+        static R invoke(function_buffer& function_obj_ptr,
+                        T... a)
 
         {
           FunctionObj* f =
             reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr);
-          return (*f)(BOOST_FUNCTION_ARGS);
+          return (*f)(static_cast<T&&>(a)...);
         }
       };
 
       template<
         typename FunctionObj,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER
+      struct void_function_ref_invoker
       {
-        static BOOST_FUNCTION_VOID_RETURN_TYPE
-        invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
-               BOOST_FUNCTION_PARMS)
+        static void
+        invoke(function_buffer& function_obj_ptr,
+               T... a)
 
         {
           FunctionObj* f =
             reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr);
-          BOOST_FUNCTION_RETURN((*f)(BOOST_FUNCTION_ARGS));
+          (*f)(static_cast<T&&>(a)...);
         }
       };
 
-#if BOOST_FUNCTION_NUM_ARGS > 0
       /* Handle invocation of member pointers. */
       template<
         typename MemberPtr,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_MEMBER_INVOKER
+      struct member_invoker
       {
-        static R invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
-                        BOOST_FUNCTION_PARMS)
+        static R invoke(function_buffer& function_obj_ptr,
+                        T... a)
 
         {
           MemberPtr* f =
             reinterpret_cast<MemberPtr*>(function_obj_ptr.data);
-          return boost::mem_fn(*f)(BOOST_FUNCTION_ARGS);
+          return boost::mem_fn(*f)(static_cast<T&&>(a)...);
         }
       };
 
       template<
         typename MemberPtr,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_VOID_MEMBER_INVOKER
+      struct void_member_invoker
       {
-        static BOOST_FUNCTION_VOID_RETURN_TYPE
-        invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
-               BOOST_FUNCTION_PARMS)
+        static void
+        invoke(function_buffer& function_obj_ptr,
+               T... a)
 
         {
           MemberPtr* f =
             reinterpret_cast<MemberPtr*>(function_obj_ptr.data);
-          BOOST_FUNCTION_RETURN(boost::mem_fn(*f)(BOOST_FUNCTION_ARGS));
+          boost::mem_fn(*f)(static_cast<T&&>(a)...);
         }
       };
-#endif
 
       template<
         typename FunctionPtr,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
       >
-      struct BOOST_FUNCTION_GET_FUNCTION_INVOKER
+      struct get_function_invoker
       {
-        typedef typename conditional<(is_void<R>::value),
-                            BOOST_FUNCTION_VOID_FUNCTION_INVOKER<
+        typedef typename std::conditional<std::is_void<R>::value,
+                            void_function_invoker<
                             FunctionPtr,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >,
-                          BOOST_FUNCTION_FUNCTION_INVOKER<
+                          function_invoker<
                             FunctionPtr,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >
                        >::type type;
       };
 
       template<
         typename FunctionObj,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
        >
-      struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
+      struct get_function_obj_invoker
       {
-        typedef typename conditional<(is_void<R>::value),
-                            BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER<
+        typedef typename std::conditional<std::is_void<R>::value,
+                            void_function_obj_invoker<
                             FunctionObj,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >,
-                          BOOST_FUNCTION_FUNCTION_OBJ_INVOKER<
+                          function_obj_invoker<
                             FunctionObj,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >
                        >::type type;
       };
 
       template<
         typename FunctionObj,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
        >
-      struct BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER
+      struct get_function_ref_invoker
       {
-        typedef typename conditional<(is_void<R>::value),
-                            BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER<
+        typedef typename std::conditional<std::is_void<R>::value,
+                            void_function_ref_invoker<
                             FunctionObj,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >,
-                          BOOST_FUNCTION_FUNCTION_REF_INVOKER<
+                          function_ref_invoker<
                             FunctionObj,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >
                        >::type type;
       };
 
-#if BOOST_FUNCTION_NUM_ARGS > 0
       /* Retrieve the appropriate invoker for a member pointer.  */
       template<
         typename MemberPtr,
-        typename R BOOST_FUNCTION_COMMA
-        BOOST_FUNCTION_TEMPLATE_PARMS
+        typename R,
+        typename... T
        >
-      struct BOOST_FUNCTION_GET_MEMBER_INVOKER
+      struct get_member_invoker
       {
-        typedef typename conditional<(is_void<R>::value),
-                            BOOST_FUNCTION_VOID_MEMBER_INVOKER<
+        typedef typename std::conditional<std::is_void<R>::value,
+                            void_member_invoker<
                             MemberPtr,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >,
-                          BOOST_FUNCTION_MEMBER_INVOKER<
+                          member_invoker<
                             MemberPtr,
-                            R BOOST_FUNCTION_COMMA
-                            BOOST_FUNCTION_TEMPLATE_ARGS
+                            R,
+                            T...
                           >
                        >::type type;
       };
-#endif
 
       /* Given the tag returned by get_function_tag, retrieve the
          actual invoker that will be used for the given function
          object.
 
-         Each specialization contains an "apply" nested class template
+         Each specialization contains an "apply_" nested class template
          that accepts the function object, return type, function
-         argument types, and allocator. The resulting "apply" class
+         argument types, and allocator. The resulting "apply_" class
          contains two typedefs, "invoker_type" and "manager_type",
          which correspond to the invoker and manager types. */
       template<typename Tag>
-      struct BOOST_FUNCTION_GET_INVOKER { };
+      struct get_invoker { };
 
       /* Retrieve the invoker for a function pointer. */
       template<>
-      struct BOOST_FUNCTION_GET_INVOKER<function_ptr_tag>
+      struct get_invoker<function_ptr_tag>
       {
         template<typename FunctionPtr,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-        struct apply
+                 typename R, typename... T>
+        struct apply_
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
+          typedef typename get_function_invoker<
                              FunctionPtr,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -350,13 +288,13 @@ namespace boost {
         };
 
         template<typename FunctionPtr, typename Allocator,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+                 typename R, typename... T>
         struct apply_a
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
+          typedef typename get_function_invoker<
                              FunctionPtr,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -364,19 +302,18 @@ namespace boost {
         };
       };
 
-#if BOOST_FUNCTION_NUM_ARGS > 0
       /* Retrieve the invoker for a member pointer. */
       template<>
-      struct BOOST_FUNCTION_GET_INVOKER<member_ptr_tag>
+      struct get_invoker<member_ptr_tag>
       {
         template<typename MemberPtr,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-        struct apply
+                 typename R, typename... T>
+        struct apply_
         {
-          typedef typename BOOST_FUNCTION_GET_MEMBER_INVOKER<
+          typedef typename get_member_invoker<
                              MemberPtr,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -384,33 +321,32 @@ namespace boost {
         };
 
         template<typename MemberPtr, typename Allocator,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+                 typename R, typename... T>
         struct apply_a
         {
-          typedef typename BOOST_FUNCTION_GET_MEMBER_INVOKER<
+          typedef typename get_member_invoker<
                              MemberPtr,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
           typedef functor_manager<MemberPtr> manager_type;
         };
       };
-#endif
 
       /* Retrieve the invoker for a function object. */
       template<>
-      struct BOOST_FUNCTION_GET_INVOKER<function_obj_tag>
+      struct get_invoker<function_obj_tag>
       {
         template<typename FunctionObj,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-        struct apply
+                 typename R, typename... T>
+        struct apply_
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
+          typedef typename get_function_obj_invoker<
                              FunctionObj,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -418,13 +354,13 @@ namespace boost {
         };
 
         template<typename FunctionObj, typename Allocator,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+                 typename R, typename... T>
         struct apply_a
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
+          typedef typename get_function_obj_invoker<
                              FunctionObj,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -434,16 +370,16 @@ namespace boost {
 
       /* Retrieve the invoker for a reference to a function object. */
       template<>
-      struct BOOST_FUNCTION_GET_INVOKER<function_obj_ref_tag>
+      struct get_invoker<function_obj_ref_tag>
       {
         template<typename RefWrapper,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-        struct apply
+                 typename R, typename... T>
+        struct apply_
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER<
+          typedef typename get_function_ref_invoker<
                              typename RefWrapper::type,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -451,13 +387,13 @@ namespace boost {
         };
 
         template<typename RefWrapper, typename Allocator,
-                 typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+                 typename R, typename... T>
         struct apply_a
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER<
+          typedef typename get_function_ref_invoker<
                              typename RefWrapper::type,
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
+                             R,
+                             T...
                            >::type
             invoker_type;
 
@@ -473,30 +409,26 @@ namespace boost {
        * members. It therefore cannot have any constructors,
        * destructors, base classes, etc.
        */
-      template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-      struct BOOST_FUNCTION_VTABLE
+      template<typename R, typename... T>
+      struct basic_vtable
       {
-#ifndef BOOST_NO_VOID_RETURNS
         typedef R         result_type;
-#else
-        typedef typename function_return_type<R>::type result_type;
-#endif // BOOST_NO_VOID_RETURNS
 
         typedef result_type (*invoker_type)(function_buffer&
-                                            BOOST_FUNCTION_COMMA
-                                            BOOST_FUNCTION_TEMPLATE_ARGS);
+                                           ,
+                                            T...);
 
         template<typename F>
         bool assign_to(F f, function_buffer& functor) const
         {
           typedef typename get_function_tag<F>::type tag;
-          return assign_to(f, functor, tag());
+          return assign_to(std::move(f), functor, tag());
         }
         template<typename F,typename Allocator>
         bool assign_to_a(F f, function_buffer& functor, Allocator a) const
         {
           typedef typename get_function_tag<F>::type tag;
-          return assign_to_a(f, functor, a, tag());
+          return assign_to_a(std::move(f), functor, a, tag());
         }
 
         void clear(function_buffer& functor) const
@@ -504,7 +436,7 @@ namespace boost {
 #if defined(BOOST_GCC) && (__GNUC__ >= 11)
 # pragma GCC diagnostic push
 // False positive in GCC 11/12 for empty function objects
-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
           if (base.manager)
             base.manager(functor, functor, destroy_functor_tag);
@@ -521,8 +453,6 @@ namespace boost {
         {
           this->clear(functor);
           if (f) {
-            // should be a reinterpret cast, but some compilers insist
-            // on giving cv-qualifiers to free functions
             functor.members.func_ptr = reinterpret_cast<void (*)()>(f);
             return true;
           } else {
@@ -533,11 +463,10 @@ namespace boost {
         bool
         assign_to_a(FunctionPtr f, function_buffer& functor, Allocator, function_ptr_tag) const
         {
-          return assign_to(f,functor,function_ptr_tag());
+          return assign_to(std::move(f),functor,function_ptr_tag());
         }
 
         // Member pointers
-#if BOOST_FUNCTION_NUM_ARGS > 0
         template<typename MemberPtr>
         bool assign_to(MemberPtr f, function_buffer& functor, member_ptr_tag) const
         {
@@ -564,50 +493,42 @@ namespace boost {
             return false;
           }
         }
-#endif // BOOST_FUNCTION_NUM_ARGS > 0
 
         // Function objects
         // Assign to a function object using the small object optimization
         template<typename FunctionObj>
         void
-        assign_functor(FunctionObj f, function_buffer& functor, true_type) const
+        assign_functor(FunctionObj f, function_buffer& functor, std::true_type) const
         {
-          new (reinterpret_cast<void*>(functor.data)) FunctionObj(f);
+          new (reinterpret_cast<void*>(functor.data)) FunctionObj(std::move(f));
         }
         template<typename FunctionObj,typename Allocator>
         void
-        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator, true_type) const
+        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator, std::true_type) const
         {
-          assign_functor(f,functor,true_type());
+          assign_functor(std::move(f),functor,std::true_type());
         }
 
         // Assign to a function object allocated on the heap.
         template<typename FunctionObj>
         void
-        assign_functor(FunctionObj f, function_buffer& functor, false_type) const
+        assign_functor(FunctionObj f, function_buffer& functor, std::false_type) const
         {
-          functor.members.obj_ptr = new FunctionObj(f);
+          functor.members.obj_ptr = new FunctionObj(std::move(f));
         }
         template<typename FunctionObj,typename Allocator>
         void
-        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator a, false_type) const
+        assign_functor_a(FunctionObj f, function_buffer& functor, Allocator a, std::false_type) const
         {
           typedef functor_wrapper<FunctionObj,Allocator> functor_wrapper_type;
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-          typedef typename Allocator::template rebind<functor_wrapper_type>::other
-            wrapper_allocator_type;
-          typedef typename wrapper_allocator_type::pointer wrapper_allocator_pointer_type;
-#else
+
           using wrapper_allocator_type = typename std::allocator_traits<Allocator>::template rebind_alloc<functor_wrapper_type>;
           using wrapper_allocator_pointer_type = typename std::allocator_traits<wrapper_allocator_type>::pointer;
-#endif
+
           wrapper_allocator_type wrapper_allocator(a);
           wrapper_allocator_pointer_type copy = wrapper_allocator.allocate(1);
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-          wrapper_allocator.construct(copy, functor_wrapper_type(f,a));
-#else
           std::allocator_traits<wrapper_allocator_type>::construct(wrapper_allocator, copy, functor_wrapper_type(f,a));
-#endif
+
           functor_wrapper_type* new_f = static_cast<functor_wrapper_type*>(copy);
           functor.members.obj_ptr = new_f;
         }
@@ -617,8 +538,8 @@ namespace boost {
         assign_to(FunctionObj f, function_buffer& functor, function_obj_tag) const
         {
           if (!boost::detail::function::has_empty_target(boost::addressof(f))) {
-            assign_functor(f, functor,
-                           integral_constant<bool, (function_allows_small_object_optimization<FunctionObj>::value)>());
+            assign_functor(std::move(f), functor,
+                           std::integral_constant<bool, (function_allows_small_object_optimization<FunctionObj>::value)>());
             return true;
           } else {
             return false;
@@ -629,8 +550,8 @@ namespace boost {
         assign_to_a(FunctionObj f, function_buffer& functor, Allocator a, function_obj_tag) const
         {
           if (!boost::detail::function::has_empty_target(boost::addressof(f))) {
-            assign_functor_a(f, functor, a,
-                           integral_constant<bool, (function_allows_small_object_optimization<FunctionObj>::value)>());
+            assign_functor_a(std::move(f), functor, a,
+                           std::integral_constant<bool, (function_allows_small_object_optimization<FunctionObj>::value)>());
             return true;
           } else {
             return false;
@@ -644,8 +565,8 @@ namespace boost {
                   function_buffer& functor, function_obj_ref_tag) const
         {
           functor.members.obj_ref.obj_ptr = (void *)(f.get_pointer());
-          functor.members.obj_ref.is_const_qualified = is_const<FunctionObj>::value;
-          functor.members.obj_ref.is_volatile_qualified = is_volatile<FunctionObj>::value;
+          functor.members.obj_ref.is_const_qualified = std::is_const<FunctionObj>::value;
+          functor.members.obj_ref.is_volatile_qualified = std::is_volatile<FunctionObj>::value;
           return true;
         }
         template<typename FunctionObj,typename Allocator>
@@ -660,26 +581,146 @@ namespace boost {
         vtable_base base;
         invoker_type invoker;
       };
+
+      template <typename... T>
+      struct variadic_function_base
+      {};
+
+      template <typename T1>
+      struct variadic_function_base<T1>
+      {
+        typedef T1 argument_type;
+        typedef T1 arg1_type;
+      };
+
+      template <typename T1, typename T2>
+      struct variadic_function_base<T1, T2>
+      {
+        typedef T1 first_argument_type;
+        typedef T2 second_argument_type;
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+      };
+
+      template <typename T1, typename T2, typename T3>
+      struct variadic_function_base<T1, T2, T3>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4>
+      struct variadic_function_base<T1, T2, T3, T4>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5>
+      struct variadic_function_base<T1, T2, T3, T4, T5>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+        typedef T5 arg5_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
+      struct variadic_function_base<T1, T2, T3, T4, T5, T6>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+        typedef T5 arg5_type;
+        typedef T6 arg6_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
+      struct variadic_function_base<T1, T2, T3, T4, T5, T6, T7>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+        typedef T5 arg5_type;
+        typedef T6 arg6_type;
+        typedef T7 arg7_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
+      struct variadic_function_base<T1, T2, T3, T4, T5, T6, T7, T8>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+        typedef T5 arg5_type;
+        typedef T6 arg6_type;
+        typedef T7 arg7_type;
+        typedef T8 arg8_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+      struct variadic_function_base<T1, T2, T3, T4, T5, T6, T7, T8, T9>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+        typedef T5 arg5_type;
+        typedef T6 arg6_type;
+        typedef T7 arg7_type;
+        typedef T8 arg8_type;
+        typedef T9 arg9_type;
+      };
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
+      struct variadic_function_base<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+      {
+        typedef T1 arg1_type;
+        typedef T2 arg2_type;
+        typedef T3 arg3_type;
+        typedef T4 arg4_type;
+        typedef T5 arg5_type;
+        typedef T6 arg6_type;
+        typedef T7 arg7_type;
+        typedef T8 arg8_type;
+        typedef T9 arg9_type;
+        typedef T10 arg10_type;
+      };
+
+#if defined( BOOST_LIBSTDCXX_VERSION ) && BOOST_LIBSTDCXX_VERSION < 50000
+
+      template<class T> struct is_trivially_copyable: std::integral_constant<bool,
+        __has_trivial_copy(T) && __has_trivial_assign(T) && __has_trivial_destructor(T)> {};
+
+#else
+
+      using std::is_trivially_copyable;
+
+#endif
+
     } // end namespace function
   } // end namespace detail
 
   template<
-    typename R BOOST_FUNCTION_COMMA
-    BOOST_FUNCTION_TEMPLATE_PARMS
+    typename R,
+    typename... T
   >
-  class BOOST_FUNCTION_FUNCTION : public function_base
+  class function_n : public function_base
+                                , public detail::function::variadic_function_base<T...>
   {
   public:
-#ifndef BOOST_NO_VOID_RETURNS
     typedef R         result_type;
-#else
-    typedef  typename boost::detail::function::function_return_type<R>::type
-      result_type;
-#endif // BOOST_NO_VOID_RETURNS
 
   private:
-    typedef boost::detail::function::BOOST_FUNCTION_VTABLE<
-              R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS>
+    typedef boost::detail::function::basic_vtable<
+              R, T...>
       vtable_type;
 
     vtable_type* get_vtable() const {
@@ -690,8 +731,6 @@ namespace boost {
     struct clear_type {};
 
   public:
-    BOOST_STATIC_CONSTANT(int, args = BOOST_FUNCTION_NUM_ARGS);
-
     // add signature for boost::lambda
     template<typename Args>
     struct sig
@@ -699,93 +738,68 @@ namespace boost {
       typedef result_type type;
     };
 
-#if BOOST_FUNCTION_NUM_ARGS == 1
-    typedef T0 argument_type;
-#elif BOOST_FUNCTION_NUM_ARGS == 2
-    typedef T0 first_argument_type;
-    typedef T1 second_argument_type;
-#endif
+    BOOST_STATIC_CONSTANT(int, arity = sizeof...(T));
 
-    BOOST_STATIC_CONSTANT(int, arity = BOOST_FUNCTION_NUM_ARGS);
-    BOOST_FUNCTION_ARG_TYPES
+    typedef function_n self_type;
 
-    typedef BOOST_FUNCTION_FUNCTION self_type;
-
-    BOOST_DEFAULTED_FUNCTION(BOOST_FUNCTION_FUNCTION(), : function_base() {})
+    BOOST_DEFAULTED_FUNCTION(function_n(), : function_base() {})
 
     // MSVC chokes if the following two constructors are collapsed into
     // one with a default parameter.
     template<typename Functor>
-    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
-#ifndef BOOST_NO_SFINAE
-                            ,typename boost::enable_if_<
-                             !(is_integral<Functor>::value),
+    function_n(Functor f
+                            ,typename std::enable_if<
+                             !std::is_integral<Functor>::value,
                                         int>::type = 0
-#endif // BOOST_NO_SFINAE
                             ) :
       function_base()
     {
-      this->assign_to(f);
+      this->assign_to(std::move(f));
     }
     template<typename Functor,typename Allocator>
-    BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a
-#ifndef BOOST_NO_SFINAE
-                            ,typename boost::enable_if_<
-                              !(is_integral<Functor>::value),
+    function_n(Functor f, Allocator a
+                            ,typename std::enable_if<
+                              !std::is_integral<Functor>::value,
                                         int>::type = 0
-#endif // BOOST_NO_SFINAE
                             ) :
       function_base()
     {
-      this->assign_to_a(f,a);
+      this->assign_to_a(std::move(f),a);
     }
 
-#ifndef BOOST_NO_SFINAE
-    BOOST_FUNCTION_FUNCTION(clear_type*) : function_base() { }
-#else
-    BOOST_FUNCTION_FUNCTION(int zero) : function_base()
-    {
-      BOOST_ASSERT(zero == 0);
-    }
-#endif
+    function_n(clear_type*) : function_base() { }
 
-    BOOST_FUNCTION_FUNCTION(const BOOST_FUNCTION_FUNCTION& f) : function_base()
+    function_n(const function_n& f) : function_base()
     {
       this->assign_to_own(f);
     }
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    BOOST_FUNCTION_FUNCTION(BOOST_FUNCTION_FUNCTION&& f) : function_base()
+    function_n(function_n&& f) : function_base()
     {
       this->move_assign(f);
     }
-#endif
 
-    ~BOOST_FUNCTION_FUNCTION() { clear(); }
+    ~function_n() { clear(); }
 
-    result_type operator()(BOOST_FUNCTION_PARMS) const
+    result_type operator()(T... a) const
     {
       if (this->empty())
         boost::throw_exception(bad_function_call());
 
       return get_vtable()->invoker
-               (this->functor BOOST_FUNCTION_COMMA BOOST_FUNCTION_ARGS);
+               (this->functor, static_cast<T&&>(a)...);
     }
 
-    // The distinction between when to use BOOST_FUNCTION_FUNCTION and
+    // The distinction between when to use function_n and
     // when to use self_type is obnoxious. MSVC cannot handle self_type as
     // the return type of these assignment operators, but Borland C++ cannot
-    // handle BOOST_FUNCTION_FUNCTION as the type of the temporary to
+    // handle function_n as the type of the temporary to
     // construct.
     template<typename Functor>
-#ifndef BOOST_NO_SFINAE
-    typename boost::enable_if_<
-                  !(is_integral<Functor>::value),
-               BOOST_FUNCTION_FUNCTION&>::type
-#else
-    BOOST_FUNCTION_FUNCTION&
-#endif
-    operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
+    typename std::enable_if<
+                  !std::is_integral<Functor>::value,
+               function_n&>::type
+    operator=(Functor f)
     {
       this->clear();
       BOOST_TRY  {
@@ -798,7 +812,7 @@ namespace boost {
       return *this;
     }
     template<typename Functor,typename Allocator>
-    void assign(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a)
+    void assign(Functor f, Allocator a)
     {
       this->clear();
       BOOST_TRY{
@@ -810,23 +824,14 @@ namespace boost {
       BOOST_CATCH_END
     }
 
-#ifndef BOOST_NO_SFINAE
-    BOOST_FUNCTION_FUNCTION& operator=(clear_type*)
-    {
-      this->clear();
-      return *this;
-    }
-#else
-    BOOST_FUNCTION_FUNCTION& operator=(int zero)
+    function_n& operator=(clear_type*)
     {
-      BOOST_ASSERT(zero == 0);
       this->clear();
       return *this;
     }
-#endif
 
-    // Assignment from another BOOST_FUNCTION_FUNCTION
-    BOOST_FUNCTION_FUNCTION& operator=(const BOOST_FUNCTION_FUNCTION& f)
+    // Assignment from another function_n
+    function_n& operator=(const function_n& f)
     {
       if (&f == this)
         return *this;
@@ -842,9 +847,8 @@ namespace boost {
       return *this;
     }
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    // Move assignment from another BOOST_FUNCTION_FUNCTION
-    BOOST_FUNCTION_FUNCTION& operator=(BOOST_FUNCTION_FUNCTION&& f)
+    // Move assignment from another function_n
+    function_n& operator=(function_n&& f)
     {
       if (&f == this)
         return *this;
@@ -859,14 +863,13 @@ namespace boost {
       BOOST_CATCH_END
       return *this;
     }
-#endif
 
-    void swap(BOOST_FUNCTION_FUNCTION& other)
+    void swap(function_n& other)
     {
       if (&other == this)
         return;
 
-      BOOST_FUNCTION_FUNCTION tmp;
+      function_n tmp;
       tmp.move_assign(*this);
       this->move_assign(other);
       other.move_assign(tmp);
@@ -882,27 +885,10 @@ namespace boost {
       }
     }
 
-#if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
-    // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
-    operator bool () const { return !this->empty(); }
-#else
-  private:
-    struct dummy {
-      void nonnull() {}
-    };
-
-    typedef void (dummy::*safe_bool)();
-
-  public:
-    operator safe_bool () const
-      { return (this->empty())? 0 : &dummy::nonnull; }
-
-    bool operator!() const
-      { return this->empty(); }
-#endif
+    explicit operator bool () const { return !this->empty(); }
 
   private:
-    void assign_to_own(const BOOST_FUNCTION_FUNCTION& f)
+    void assign_to_own(const function_n& f)
     {
       if (!f.empty()) {
         this->vtable = f.vtable;
@@ -913,10 +899,10 @@ namespace boost {
 #           pragma GCC diagnostic push
             // This warning is technically correct, but we don't want to pay the price for initializing
             // just to silence a warning: https://github.com/boostorg/function/issues/27
-#           pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+//#           pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #           if (BOOST_GCC >= 110000)
               // GCC 11.3, 12 emit a different warning: https://github.com/boostorg/function/issues/42
-#             pragma GCC diagnostic ignored "-Wuninitialized"
+//#             pragma GCC diagnostic ignored "-Wuninitialized"
 #           endif
 #         endif
           std::memcpy(this->functor.data, f.functor.data, sizeof(boost::detail::function::function_buffer));
@@ -935,10 +921,10 @@ namespace boost {
       using boost::detail::function::vtable_base;
 
       typedef typename boost::detail::function::get_function_tag<Functor>::type tag;
-      typedef boost::detail::function::BOOST_FUNCTION_GET_INVOKER<tag> get_invoker;
+      typedef boost::detail::function::get_invoker<tag> get_invoker;
       typedef typename get_invoker::
-                         template apply<Functor, R BOOST_FUNCTION_COMMA
-                        BOOST_FUNCTION_TEMPLATE_ARGS>
+                         template apply_<Functor, R,
+                        T...>
         handler_type;
 
       typedef typename handler_type::invoker_type invoker_type;
@@ -951,11 +937,10 @@ namespace boost {
       static const vtable_type stored_vtable =
         { { &manager_type::manage }, &invoker_type::invoke };
 
-      if (stored_vtable.assign_to(f, functor)) {
+      if (stored_vtable.assign_to(std::move(f), functor)) {
         std::size_t value = reinterpret_cast<std::size_t>(&stored_vtable.base);
         // coverity[pointless_expression]: suppress coverity warnings on apparant if(const).
-        if (boost::has_trivial_copy_constructor<Functor>::value &&
-            boost::has_trivial_destructor<Functor>::value &&
+        if (boost::detail::function::is_trivially_copyable<Functor>::value &&
             boost::detail::function::function_allows_small_object_optimization<Functor>::value)
           value |= static_cast<std::size_t>(0x01);
         vtable = reinterpret_cast<boost::detail::function::vtable_base *>(value);
@@ -969,10 +954,10 @@ namespace boost {
       using boost::detail::function::vtable_base;
 
       typedef typename boost::detail::function::get_function_tag<Functor>::type tag;
-      typedef boost::detail::function::BOOST_FUNCTION_GET_INVOKER<tag> get_invoker;
+      typedef boost::detail::function::get_invoker<tag> get_invoker;
       typedef typename get_invoker::
-                         template apply_a<Functor, Allocator, R BOOST_FUNCTION_COMMA
-                         BOOST_FUNCTION_TEMPLATE_ARGS>
+                         template apply_a<Functor, Allocator, R,
+                         T...>
         handler_type;
 
       typedef typename handler_type::invoker_type invoker_type;
@@ -985,11 +970,10 @@ namespace boost {
       static const vtable_type stored_vtable =
         { { &manager_type::manage }, &invoker_type::invoke };
 
-      if (stored_vtable.assign_to_a(f, functor, a)) {
+      if (stored_vtable.assign_to_a(std::move(f), functor, a)) {
         std::size_t value = reinterpret_cast<std::size_t>(&stored_vtable.base);
         // coverity[pointless_expression]: suppress coverity warnings on apparant if(const).
-        if (boost::has_trivial_copy_constructor<Functor>::value &&
-            boost::has_trivial_destructor<Functor>::value &&
+        if (boost::detail::function::is_trivially_copyable<Functor>::value &&
             boost::detail::function::function_allows_small_object_optimization<Functor>::value)
           value |= static_cast<std::size_t>(0x01);
         vtable = reinterpret_cast<boost::detail::function::vtable_base *>(value);
@@ -1000,7 +984,7 @@ namespace boost {
     // Moves the value from the specified argument to *this. If the argument
     // has its function object allocated on the heap, move_assign will pass
     // its buffer to *this, and set the argument's buffer pointer to NULL.
-    void move_assign(BOOST_FUNCTION_FUNCTION& f)
+    void move_assign(function_n& f)
     {
       if (&f == this)
         return;
@@ -1048,49 +1032,41 @@ namespace boost {
     }
   };
 
-  template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-  inline void swap(BOOST_FUNCTION_FUNCTION<
-                     R BOOST_FUNCTION_COMMA
-                     BOOST_FUNCTION_TEMPLATE_ARGS
+  template<typename R, typename... T>
+  inline void swap(function_n<
+                     R,
+                     T...
                    >& f1,
-                   BOOST_FUNCTION_FUNCTION<
-                     R BOOST_FUNCTION_COMMA
-                     BOOST_FUNCTION_TEMPLATE_ARGS
+                   function_n<
+                     R,
+                     T...
                    >& f2)
   {
     f1.swap(f2);
   }
 
 // Poison comparisons between boost::function objects of the same type.
-template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-  void operator==(const BOOST_FUNCTION_FUNCTION<
-                          R BOOST_FUNCTION_COMMA
-                          BOOST_FUNCTION_TEMPLATE_ARGS>&,
-                  const BOOST_FUNCTION_FUNCTION<
-                          R BOOST_FUNCTION_COMMA
-                          BOOST_FUNCTION_TEMPLATE_ARGS>&);
-template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
-  void operator!=(const BOOST_FUNCTION_FUNCTION<
-                          R BOOST_FUNCTION_COMMA
-                          BOOST_FUNCTION_TEMPLATE_ARGS>&,
-                  const BOOST_FUNCTION_FUNCTION<
-                          R BOOST_FUNCTION_COMMA
-                          BOOST_FUNCTION_TEMPLATE_ARGS>& );
-
-#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
-
-#if BOOST_FUNCTION_NUM_ARGS == 0
-#define BOOST_FUNCTION_PARTIAL_SPEC R (void)
-#else
-#define BOOST_FUNCTION_PARTIAL_SPEC R (BOOST_FUNCTION_TEMPLATE_ARGS)
-#endif
-
-template<typename R BOOST_FUNCTION_COMMA
-         BOOST_FUNCTION_TEMPLATE_PARMS>
-class function<BOOST_FUNCTION_PARTIAL_SPEC>
-  : public BOOST_FUNCTION_FUNCTION<R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS>
+template<typename R, typename... T>
+  void operator==(const function_n<
+                          R,
+                          T...>&,
+                  const function_n<
+                          R,
+                          T...>&);
+template<typename R, typename... T>
+  void operator!=(const function_n<
+                          R,
+                          T...>&,
+                  const function_n<
+                          R,
+                          T...>& );
+
+template<typename R,
+         typename... T>
+class function<R (T...)>
+  : public function_n<R, T...>
 {
-  typedef BOOST_FUNCTION_FUNCTION<R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS> base_type;
+  typedef function_n<R, T...> base_type;
   typedef function self_type;
 
   struct clear_type {};
@@ -1101,40 +1077,32 @@ class function<BOOST_FUNCTION_PARTIAL_SPEC>
 
   template<typename Functor>
   function(Functor f
-#ifndef BOOST_NO_SFINAE
-           ,typename boost::enable_if_<
-                          !(is_integral<Functor>::value),
+           ,typename std::enable_if<
+                          !std::is_integral<Functor>::value,
                        int>::type = 0
-#endif
            ) :
-    base_type(f)
+    base_type(std::move(f))
   {
   }
   template<typename Functor,typename Allocator>
   function(Functor f, Allocator a
-#ifndef BOOST_NO_SFINAE
-           ,typename boost::enable_if_<
-                           !(is_integral<Functor>::value),
+           ,typename std::enable_if<
+                           !std::is_integral<Functor>::value,
                        int>::type = 0
-#endif
            ) :
-    base_type(f,a)
+    base_type(std::move(f),a)
   {
   }
 
-#ifndef BOOST_NO_SFINAE
   function(clear_type*) : base_type() {}
-#endif
 
   function(const self_type& f) : base_type(static_cast<const base_type&>(f)){}
 
   function(const base_type& f) : base_type(static_cast<const base_type&>(f)){}
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   // Move constructors
   function(self_type&& f): base_type(static_cast<base_type&&>(f)){}
   function(base_type&& f): base_type(static_cast<base_type&&>(f)){}
-#endif
 
   self_type& operator=(const self_type& f)
   {
@@ -1142,35 +1110,27 @@ class function<BOOST_FUNCTION_PARTIAL_SPEC>
     return *this;
   }
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   self_type& operator=(self_type&& f)
   {
     self_type(static_cast<self_type&&>(f)).swap(*this);
     return *this;
   }
-#endif
 
   template<typename Functor>
-#ifndef BOOST_NO_SFINAE
-  typename boost::enable_if_<
-                         !(is_integral<Functor>::value),
+  typename std::enable_if<
+                         !std::is_integral<Functor>::value,
                       self_type&>::type
-#else
-  self_type&
-#endif
   operator=(Functor f)
   {
     self_type(f).swap(*this);
     return *this;
   }
 
-#ifndef BOOST_NO_SFINAE
   self_type& operator=(clear_type*)
   {
     this->clear();
     return *this;
   }
-#endif
 
   self_type& operator=(const base_type& f)
   {
@@ -1178,50 +1138,42 @@ class function<BOOST_FUNCTION_PARTIAL_SPEC>
     return *this;
   }
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   self_type& operator=(base_type&& f)
   {
     self_type(static_cast<base_type&&>(f)).swap(*this);
     return *this;
   }
-#endif
 };
 
-#undef BOOST_FUNCTION_PARTIAL_SPEC
-#endif // have partial specialization
-
 } // end namespace boost
 
-// Cleanup after ourselves...
-#undef BOOST_FUNCTION_VTABLE
-#undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_FUNCTION
-#undef BOOST_FUNCTION_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_FUNCTION_REF_INVOKER
-#undef BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER
-#undef BOOST_FUNCTION_MEMBER_INVOKER
-#undef BOOST_FUNCTION_VOID_MEMBER_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
-#undef BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER
-#undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER
-#undef BOOST_FUNCTION_GET_INVOKER
-#undef BOOST_FUNCTION_TEMPLATE_PARMS
-#undef BOOST_FUNCTION_TEMPLATE_ARGS
-#undef BOOST_FUNCTION_PARMS
-#undef BOOST_FUNCTION_PARM
-#ifdef BOOST_FUNCTION_ARG
-#   undef BOOST_FUNCTION_ARG
-#endif
-#undef BOOST_FUNCTION_ARGS
-#undef BOOST_FUNCTION_ARG_TYPE
-#undef BOOST_FUNCTION_ARG_TYPES
-#undef BOOST_FUNCTION_VOID_RETURN_TYPE
-#undef BOOST_FUNCTION_RETURN
-
 #if defined(BOOST_MSVC)
 #   pragma warning( pop )
 #endif
+
+// Resolve C++20 issue with fn == bind(...)
+// https://github.com/boostorg/function/issues/45
+
+namespace boost
+{
+
+namespace _bi
+{
+
+template<class R, class F, class L> class bind_t;
+
+} // namespace _bi
+
+template<class S, class R, class F, class L> bool operator==( function<S> const& f, _bi::bind_t<R, F, L> const& b )
+{
+    return f.contains( b );
+}
+
+template<class S, class R, class F, class L> bool operator!=( function<S> const& f, _bi::bind_t<R, F, L> const& b )
+{
+    return !f.contains( b );
+}
+
+} // namespace boost
+
+#endif // #ifndef BOOST_FUNCTION_FUNCTION_TEMPLATE_HPP_INCLUDED
diff --git a/inst/include/boost/fusion/include/adapt_assoc_adt.hpp b/inst/include/boost/fusion/include/adapt_assoc_adt.hpp
index 775057c07..ca379a9a8 100644
--- a/inst/include/boost/fusion/include/adapt_assoc_adt.hpp
+++ b/inst/include/boost/fusion/include/adapt_assoc_adt.hpp
@@ -6,7 +6,7 @@
 ==============================================================================*/
 
 #ifndef BOOST_FUSION_INCLUDE_ADAPT_ASSOC_ADT_HPP
-#define BOOST_FUSION_INCLUDE_ADAPT_ASSOC_ADR_HPP
+#define BOOST_FUSION_INCLUDE_ADAPT_ASSOC_ADT_HPP
 
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/adt/adapt_assoc_adt.hpp>
diff --git a/inst/include/boost/geometry/algorithms/append.hpp b/inst/include/boost/geometry/algorithms/append.hpp
index 4bb25fcb1..cd61be017 100644
--- a/inst/include/boost/geometry/algorithms/append.hpp
+++ b/inst/include/boost/geometry/algorithms/append.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2023.
 // Modifications copyright (c) 2014-2023, Oracle and/or its affiliates.
@@ -60,7 +61,7 @@ struct to_range_point
     static inline void apply(Geometry& geometry, Point const& point,
                              signed_size_type = -1, signed_size_type = 0)
     {
-        typename geometry::point_type<Geometry>::type copy;
+        geometry::point_type_t<Geometry> copy;
         geometry::detail::conversion::convert_point_to_point(point, copy);
         traits::push_back<Geometry>::apply(geometry, copy);
     }
@@ -90,7 +91,7 @@ struct to_polygon_point
     static inline void apply(Polygon& polygon, Point const& point,
                              signed_size_type ring_index, signed_size_type = 0)
     {
-        using ring_type = typename ring_type<Polygon>::type;
+        using ring_type = ring_type_t<Polygon>;
 
         if (ring_index == -1)
         {
@@ -112,18 +113,16 @@ struct to_polygon_range
     static inline void apply(Polygon& polygon, Range const& range,
                              signed_size_type ring_index, signed_size_type = 0)
     {
-        using ring_type = typename ring_type<Polygon>::type;
-        using exterior_ring_type = typename ring_return_type<Polygon>::type;
-        using interior_ring_range_type = typename interior_return_type<Polygon>::type;
-
+        using ring_type = ring_type_t<Polygon>;
+        
         if (ring_index == -1)
         {
-            exterior_ring_type ext_ring = exterior_ring(polygon);
+            auto&& ext_ring = exterior_ring(polygon);
             to_range_range::apply<ring_type, Range>(ext_ring, range);
         }
         else if (ring_index < signed_size_type(num_interior_rings(polygon)))
         {
-            interior_ring_range_type int_rings = interior_rings(polygon);
+            auto&& int_rings = interior_rings(polygon);
             to_range_range::apply<ring_type, Range>(range::at(int_rings, ring_index), range);
         }
     }
@@ -159,8 +158,8 @@ template
 <
     typename Geometry,
     typename RangeOrPoint,
-    typename Tag = typename geometry::tag<Geometry>::type,
-    typename OtherTag = typename geometry::tag<RangeOrPoint>::type
+    typename Tag = geometry::tag_t<Geometry>,
+    typename OtherTag = geometry::tag_t<RangeOrPoint>
 >
 struct append
     : detail::append::append_no_action
diff --git a/inst/include/boost/geometry/algorithms/area.hpp b/inst/include/boost/geometry/algorithms/area.hpp
index 9b5af61e1..50f48d729 100644
--- a/inst/include/boost/geometry/algorithms/area.hpp
+++ b/inst/include/boost/geometry/algorithms/area.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-// Copyright (c) 2017-2022 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2017-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2017-2023.
 // Modifications copyright (c) 2017-2023 Oracle and/or its affiliates.
@@ -131,13 +131,12 @@ namespace dispatch
 template
 <
     typename Geometry,
-    typename Tag = typename tag<Geometry>::type
+    typename Tag = tag_t<Geometry>
 >
 struct area : detail::calculate_null
 {
     template <typename Strategy>
-    static inline typename area_result<Geometry, Strategy>::type
-        apply(Geometry const& geometry, Strategy const& strategy)
+    static inline auto apply(Geometry const& geometry, Strategy const& strategy)
     {
         return calculate_null::apply
             <
@@ -162,8 +161,7 @@ template <typename Polygon>
 struct area<Polygon, polygon_tag> : detail::calculate_polygon_sum
 {
     template <typename Strategy>
-    static inline typename area_result<Polygon, Strategy>::type
-        apply(Polygon const& polygon, Strategy const& strategy)
+    static inline auto apply(Polygon const& polygon, Strategy const& strategy)
     {
         return calculate_polygon_sum::apply
             <
@@ -178,8 +176,7 @@ template <typename MultiGeometry>
 struct area<MultiGeometry, multi_polygon_tag> : detail::multi_sum
 {
     template <typename Strategy>
-    static inline typename area_result<MultiGeometry, Strategy>::type
-    apply(MultiGeometry const& multi, Strategy const& strategy)
+    static inline auto apply(MultiGeometry const& multi, Strategy const& strategy)
     {
         return multi_sum::apply
                <
@@ -205,8 +202,7 @@ template
 struct area
 {
     template <typename Geometry>
-    static inline typename area_result<Geometry, Strategy>::type
-    apply(Geometry const& geometry, Strategy const& strategy)
+    static inline auto apply(Geometry const& geometry, Strategy const& strategy)
     {
         return dispatch::area<Geometry>::apply(geometry, strategy);
     }
@@ -230,8 +226,7 @@ template <>
 struct area<default_strategy, false>
 {
     template <typename Geometry>
-    static inline typename area_result<Geometry>::type
-    apply(Geometry const& geometry, default_strategy)
+    static inline auto apply(Geometry const& geometry, default_strategy)
     {
         typedef typename strategies::area::services::default_strategy
             <
@@ -249,12 +244,11 @@ struct area<default_strategy, false>
 namespace resolve_dynamic
 {
 
-template <typename Geometry, typename Tag = typename geometry::tag<Geometry>::type>
+template <typename Geometry, typename Tag = geometry::tag_t<Geometry>>
 struct area
 {
     template <typename Strategy>
-    static inline typename area_result<Geometry, Strategy>::type
-        apply(Geometry const& geometry, Strategy const& strategy)
+    static inline auto apply(Geometry const& geometry, Strategy const& strategy)
     {
         return resolve_strategy::area<Strategy>::apply(geometry, strategy);
     }
@@ -264,8 +258,7 @@ template <typename Geometry>
 struct area<Geometry, dynamic_geometry_tag>
 {
     template <typename Strategy>
-    static inline typename area_result<Geometry, Strategy>::type
-        apply(Geometry const& geometry, Strategy const& strategy)
+    static inline auto apply(Geometry const& geometry, Strategy const& strategy)
     {
         typename area_result<Geometry, Strategy>::type result = 0;
         traits::visit<Geometry>::apply([&](auto const& g)
@@ -280,8 +273,7 @@ template <typename Geometry>
 struct area<Geometry, geometry_collection_tag>
 {
     template <typename Strategy>
-    static inline typename area_result<Geometry, Strategy>::type
-        apply(Geometry const& geometry, Strategy const& strategy)
+    static inline auto apply(Geometry const& geometry, Strategy const& strategy)
     {
         typename area_result<Geometry, Strategy>::type result = 0;
         detail::visit_breadth_first([&](auto const& g)
@@ -318,8 +310,7 @@ and Geographic as well.
 \qbk{[area] [area_output]}
 */
 template <typename Geometry>
-inline typename area_result<Geometry>::type
-area(Geometry const& geometry)
+inline auto area(Geometry const& geometry)
 {
     concepts::check<Geometry const>();
 
@@ -354,8 +345,7 @@ area(Geometry const& geometry)
 }
  */
 template <typename Geometry, typename Strategy>
-inline typename area_result<Geometry, Strategy>::type
-area(Geometry const& geometry, Strategy const& strategy)
+inline auto area(Geometry const& geometry, Strategy const& strategy)
 {
     concepts::check<Geometry const>();
 
diff --git a/inst/include/boost/geometry/algorithms/assign.hpp b/inst/include/boost/geometry/algorithms/assign.hpp
index 5386ac649..27e168f80 100644
--- a/inst/include/boost/geometry/algorithms/assign.hpp
+++ b/inst/include/boost/geometry/algorithms/assign.hpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 // Copyright (c) 2014 Samuel Debionne, Grenoble, France.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020-2023.
 // Modifications copyright (c) 2020-2023 Oracle and/or its affiliates.
@@ -91,7 +92,7 @@ inline void assign_inverse(Geometry& geometry)
 
     dispatch::assign_inverse
         <
-            typename tag<Geometry>::type,
+            tag_t<Geometry>,
             Geometry
         >::apply(geometry);
 }
@@ -111,7 +112,7 @@ inline void assign_zero(Geometry& geometry)
 
     dispatch::assign_zero
         <
-            typename tag<Geometry>::type,
+            tag_t<Geometry>,
             Geometry
         >::apply(geometry);
 }
@@ -141,9 +142,9 @@ inline void assign_values(Geometry& geometry, Type const& c1, Type const& c2)
 
     dispatch::assign
         <
-            typename tag<Geometry>::type,
+            tag_t<Geometry>,
             Geometry,
-            geometry::dimension<Geometry>::type::value
+            geometry::dimension<Geometry>::value
         >::apply(geometry, c1, c2);
 }
 
@@ -174,9 +175,9 @@ inline void assign_values(Geometry& geometry,
 
     dispatch::assign
         <
-            typename tag<Geometry>::type,
+            tag_t<Geometry>,
             Geometry,
-            geometry::dimension<Geometry>::type::value
+            geometry::dimension<Geometry>::value
         >::apply(geometry, c1, c2, c3);
 }
 
@@ -201,9 +202,9 @@ inline void assign_values(Geometry& geometry,
 
     dispatch::assign
         <
-            typename tag<Geometry>::type,
+            tag_t<Geometry>,
             Geometry,
-            geometry::dimension<Geometry>::type::value
+            geometry::dimension<Geometry>::value
         >::apply(geometry, c1, c2, c3, c4);
 }
 
diff --git a/inst/include/boost/geometry/algorithms/centroid.hpp b/inst/include/boost/geometry/algorithms/centroid.hpp
index 43ac999e5..1817d8add 100644
--- a/inst/include/boost/geometry/algorithms/centroid.hpp
+++ b/inst/include/boost/geometry/algorithms/centroid.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
-// Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2014-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2023.
 // Modifications copyright (c) 2014-2023 Oracle and/or its affiliates.
@@ -184,7 +184,7 @@ struct centroid_range_state
                 typename PointTransformer::result_type
                     pt = transformer.apply(*it);
 
-                using point_type = typename geometry::point_type<Ring const>::type;
+                using point_type = geometry::point_type_t<Ring const>;
                 strategy.apply(static_cast<point_type const&>(previous_pt),
                                static_cast<point_type const&>(pt),
                                state);
@@ -208,7 +208,7 @@ struct centroid_range
 
             typename Strategy::template state_type
                 <
-                    typename geometry::point_type<Range>::type,
+                    geometry::point_type_t<Range>,
                     Point
                 >::type state;
 
@@ -265,7 +265,7 @@ struct centroid_polygon
 
             typename Strategy::template state_type
                 <
-                    typename geometry::point_type<Polygon>::type,
+                    geometry::point_type_t<Polygon>,
                     Point
                 >::type state;
 
@@ -333,7 +333,7 @@ struct centroid_multi
 
         typename Strategy::template state_type
             <
-                typename geometry::point_type<Multi>::type,
+                geometry::point_type_t<Multi>,
                 Point
             >::type state;
 
@@ -393,7 +393,7 @@ namespace dispatch
 template
 <
     typename Geometry,
-    typename Tag = typename tag<Geometry>::type
+    typename Tag = tag_t<Geometry>
 >
 struct centroid: not_implemented<Tag>
 {};
@@ -511,10 +511,10 @@ struct centroid<default_strategy, false>
     template <typename Geometry, typename Point>
     static inline void apply(Geometry const& geometry, Point& out, default_strategy)
     {
-        typedef typename strategies::centroid::services::default_strategy
+        using strategies_type = typename strategies::centroid::services::default_strategy
             <
                 Geometry
-            >::type strategies_type;
+            >::type;
 
         dispatch::centroid<Geometry>::apply(geometry, out, strategies_type());
     }
@@ -525,7 +525,7 @@ struct centroid<default_strategy, false>
 
 namespace resolve_dynamic {
 
-template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+template <typename Geometry, typename Tag = tag_t<Geometry>>
 struct centroid
 {
     template <typename Point, typename Strategy>
diff --git a/inst/include/boost/geometry/algorithms/clear.hpp b/inst/include/boost/geometry/algorithms/clear.hpp
index df3acc8bd..efaa93d18 100644
--- a/inst/include/boost/geometry/algorithms/clear.hpp
+++ b/inst/include/boost/geometry/algorithms/clear.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020-2023.
 // Modifications copyright (c) 2020-2023, Oracle and/or its affiliates.
@@ -56,17 +57,17 @@ struct polygon_clear
     {
         traits::clear
             <
-                typename std::remove_reference
+                std::remove_reference_t
                     <
                         typename traits::interior_mutable_type<Polygon>::type
-                    >::type
+                    >
             >::apply(interior_rings(polygon));
         traits::clear
             <
-                typename std::remove_reference
+                std::remove_reference_t
                     <
                         typename traits::ring_mutable_type<Polygon>::type
-                    >::type
+                    >
             >::apply(exterior_ring(polygon));
     }
 };
@@ -90,7 +91,7 @@ namespace dispatch
 template
 <
     typename Geometry,
-    typename Tag = typename tag_cast<typename tag<Geometry>::type, multi_tag>::type
+    typename Tag = tag_cast_t<tag_t<Geometry>, multi_tag>
 >
 struct clear: not_implemented<Tag>
 {};
diff --git a/inst/include/boost/geometry/algorithms/convert.hpp b/inst/include/boost/geometry/algorithms/convert.hpp
index 2d07ce2b7..26335ec3d 100644
--- a/inst/include/boost/geometry/algorithms/convert.hpp
+++ b/inst/include/boost/geometry/algorithms/convert.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2014-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2017-2023.
 // Modifications copyright (c) 2017-2023, Oracle and/or its affiliates.
@@ -24,7 +24,6 @@
 #include <cstddef>
 #include <type_traits>
 
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/size.hpp>
@@ -41,10 +40,12 @@
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/range.hpp>
 
 #include <boost/geometry/views/detail/closed_clockwise_view.hpp>
@@ -77,10 +78,8 @@ struct point_to_box
 {
     static inline void apply(Point const& point, Box& box)
     {
-        typedef typename coordinate_type<Box>::type coordinate_type;
-
         set<Index, Dimension>(box,
-                boost::numeric_cast<coordinate_type>(get<Dimension>(point)));
+                util::numeric_cast<coordinate_type_t<Box>>(get<Dimension>(point)));
         point_to_box
             <
                 Point, Box,
@@ -171,8 +170,7 @@ struct range_to_range
         // point for open output.
         view_type const view(source);
 
-        typedef typename boost::range_size<Range1>::type size_type;
-        size_type n = boost::size(view);
+        auto n = boost::size(view);
         if (geometry::closure<Range2>::value == geometry::open)
         {
             n--;
@@ -181,7 +179,7 @@ struct range_to_range
         // If size == 0 && geometry::open <=> n = numeric_limits<size_type>::max()
         // but ok, sice below it == end()
 
-        size_type i = 0;
+        decltype(n) i = 0;
         for (auto it = boost::begin(view);
             it != boost::end(view) && i < n;
             ++it, ++i)
@@ -198,13 +196,12 @@ struct range_to_range
 template <typename Polygon1, typename Polygon2>
 struct polygon_to_polygon
 {
-    typedef range_to_range
+    using per_ring = range_to_range
         <
-            typename geometry::ring_type<Polygon1>::type,
-            typename geometry::ring_type<Polygon2>::type,
-            geometry::point_order<Polygon1>::value
-                != geometry::point_order<Polygon2>::value
-        > per_ring;
+            geometry::ring_type_t<Polygon1>,
+            geometry::ring_type_t<Polygon2>,
+            geometry::point_order<Polygon1>::value != geometry::point_order<Polygon2>::value
+        >;
 
     static inline void apply(Polygon1 const& source, Polygon2& destination)
     {
@@ -216,10 +213,10 @@ struct polygon_to_polygon
         // Container should be resizeable
         traits::resize
             <
-                typename std::remove_reference
-                <
-                    typename traits::interior_mutable_type<Polygon2>::type
-                >::type
+                std::remove_reference_t
+                    <
+                        typename traits::interior_mutable_type<Polygon2>::type
+                    >
             >::apply(interior_rings(destination), num_interior_rings(source));
 
         auto const& rings_source = interior_rings(source);
@@ -280,9 +277,9 @@ namespace dispatch
 template
 <
     typename Geometry1, typename Geometry2,
-    typename Tag1 = typename tag_cast<typename tag<Geometry1>::type, multi_tag>::type,
-    typename Tag2 = typename tag_cast<typename tag<Geometry2>::type, multi_tag>::type,
-    std::size_t DimensionCount = dimension<Geometry1>::type::value,
+    typename Tag1 = tag_cast_t<tag_t<Geometry1>, multi_tag>,
+    typename Tag2 = tag_cast_t<tag_t<Geometry2>, multi_tag>,
+    std::size_t DimensionCount = dimension<Geometry1>::value,
     bool UseAssignment = std::is_same<Geometry1, Geometry2>::value
                          && !std::is_array<Geometry1>::value
 >
@@ -353,8 +350,7 @@ struct convert<Ring1, Ring2, ring_tag, ring_tag, DimensionCount, false>
         <
             Ring1,
             Ring2,
-            geometry::point_order<Ring1>::value
-                != geometry::point_order<Ring2>::value
+            geometry::point_order<Ring1>::value != geometry::point_order<Ring2>::value
         >
 {};
 
@@ -461,14 +457,8 @@ struct convert<Multi1, Multi2, multi_tag, multi_tag, DimensionCount, false>
                 <
                     typename boost::range_value<Multi1>::type,
                     typename boost::range_value<Multi2>::type,
-                    typename single_tag_of
-                                <
-                                    typename tag<Multi1>::type
-                                >::type,
-                    typename single_tag_of
-                                <
-                                    typename tag<Multi2>::type
-                                >::type,
+                    single_tag_of_t<tag_t<Multi1>>,
+                    single_tag_of_t<tag_t<Multi2>>,
                     DimensionCount
                 >
         >
@@ -485,11 +475,8 @@ struct convert<Single, Multi, SingleTag, multi_tag, DimensionCount, false>
                 <
                     Single,
                     typename boost::range_value<Multi>::type,
-                    typename tag<Single>::type,
-                    typename single_tag_of
-                                <
-                                    typename tag<Multi>::type
-                                >::type,
+                    tag_t<Single>,
+                    single_tag_of_t<tag_t<Multi>>,
                     DimensionCount,
                     false
                 >
diff --git a/inst/include/boost/geometry/algorithms/correct.hpp b/inst/include/boost/geometry/algorithms/correct.hpp
index 20a94de85..92b9d9c20 100644
--- a/inst/include/boost/geometry/algorithms/correct.hpp
+++ b/inst/include/boost/geometry/algorithms/correct.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-// Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2014-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2017-2023.
 // Modifications copyright (c) 2017-2023 Oracle and/or its affiliates.
@@ -75,8 +75,6 @@ struct correct_box
     template <typename Box, typename Strategy>
     static inline void apply(Box& box, Strategy const& )
     {
-        using coordinate_type = typename geometry::coordinate_type<Box>::type;
-
         // Currently only for Cartesian coordinates
         // (or spherical without crossing dateline)
         // Future version: adapt using strategies
@@ -85,8 +83,8 @@ struct correct_box
             if (get<min_corner, dimension>(box) > get<max_corner, dimension>(box))
             {
                 // Swap the coordinates
-                coordinate_type max_value = get<min_corner, dimension>(box);
-                coordinate_type min_value = get<max_corner, dimension>(box);
+                auto max_value = get<min_corner, dimension>(box);
+                auto min_value = get<max_corner, dimension>(box);
                 set<min_corner, dimension>(box, min_value);
                 set<max_corner, dimension>(box, max_value);
             }
@@ -144,7 +142,7 @@ struct correct_polygon
 namespace dispatch
 {
 
-template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+template <typename Geometry, typename Tag = tag_t<Geometry>>
 struct correct: not_implemented<Tag>
 {};
 
@@ -252,7 +250,7 @@ struct correct<default_strategy, false>
 namespace resolve_dynamic
 {
 
-template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+template <typename Geometry, typename Tag = tag_t<Geometry>>
 struct correct
 {
     template <typename Strategy>
diff --git a/inst/include/boost/geometry/algorithms/correct_closure.hpp b/inst/include/boost/geometry/algorithms/correct_closure.hpp
index 0521c38b8..3ea35c4d6 100644
--- a/inst/include/boost/geometry/algorithms/correct_closure.hpp
+++ b/inst/include/boost/geometry/algorithms/correct_closure.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry
 
 // Copyright (c) 2017 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020-2023.
 // Modifications copyright (c) 2020-2023 Oracle and/or its affiliates.
@@ -102,7 +103,7 @@ struct close_or_open_polygon
 namespace dispatch
 {
 
-template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+template <typename Geometry, typename Tag = tag_t<Geometry>>
 struct correct_closure: not_implemented<Tag>
 {};
 
@@ -166,7 +167,7 @@ struct correct_closure<Geometry, multi_polygon_tag>
 namespace resolve_variant
 {
 
-template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+template <typename Geometry, typename Tag = tag_t<Geometry>>
 struct correct_closure
 {
     static inline void apply(Geometry& geometry)
diff --git a/inst/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp b/inst/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
index 560dc67f3..9ae46768e 100644
--- a/inst/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
@@ -21,12 +21,11 @@
 
 #include <cstddef>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/util/algorithm.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -60,7 +59,7 @@ inline void assign_point_to_index(Point const& point, Geometry& geometry)
     detail::for_each_dimension<Geometry>([&](auto dimension)
     {
         geometry::set<Index, dimension>(geometry,
-            boost::numeric_cast
+            util::numeric_cast
                 <
                     typename coordinate_type<Geometry>::type
                 >(geometry::get<dimension>(point)));
@@ -92,7 +91,7 @@ inline void assign_point_from_index(Geometry const& geometry, Point& point)
     detail::for_each_dimension<Geometry>([&](auto dimension)
     {
         geometry::set<dimension>(point,
-            boost::numeric_cast
+            util::numeric_cast
                 <
                     typename coordinate_type<Point>::type
                 >(geometry::get<Index, dimension>(geometry)));
diff --git a/inst/include/boost/geometry/algorithms/detail/assign_values.hpp b/inst/include/boost/geometry/algorithms/detail/assign_values.hpp
index f20a2041e..fe72bc568 100644
--- a/inst/include/boost/geometry/algorithms/detail/assign_values.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/assign_values.hpp
@@ -26,8 +26,6 @@
 
 #include <boost/concept/requires.hpp>
 #include <boost/concept_check.hpp>
-#include <boost/numeric/conversion/bounds.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/algorithms/append.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
@@ -39,7 +37,8 @@
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/util/algorithm.hpp>
-#include <boost/geometry/util/is_inverse_spheroidal_coordinates.hpp>
+#include <boost/geometry/util/bounds.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -74,8 +73,8 @@ struct assign_inverse_box_or_segment
     {
         typedef typename coordinate_type<BoxOrSegment>::type coordinate_type;
 
-        coordinate_type const highest = geometry::bounds<coordinate_type>::highest();
-        coordinate_type const lowest = geometry::bounds<coordinate_type>::lowest();
+        coordinate_type const highest = util::bounds<coordinate_type>::highest();
+        coordinate_type const lowest = util::bounds<coordinate_type>::lowest();
         detail::for_each_dimension<BoxOrSegment>([&](auto dimension)
         {
             set<0, dimension>(geometry, highest);
@@ -117,8 +116,8 @@ inline void assign_box_2d_corner(Box const& box, Point& point)
     // Copy coordinates
     typedef typename coordinate_type<Point>::type coordinate_type;
 
-    geometry::set<0>(point, boost::numeric_cast<coordinate_type>(get<Corner1, 0>(box)));
-    geometry::set<1>(point, boost::numeric_cast<coordinate_type>(get<Corner2, 1>(box)));
+    geometry::set<0>(point, util::numeric_cast<coordinate_type>(get<Corner1, 0>(box)));
+    geometry::set<1>(point, util::numeric_cast<coordinate_type>(get<Corner2, 1>(box)));
 }
 
 
@@ -136,10 +135,10 @@ struct assign_2d_box_or_segment
     static inline void apply(Geometry& geometry,
                 Type const& x1, Type const& y1, Type const& x2, Type const& y2)
     {
-        geometry::set<0, 0>(geometry, boost::numeric_cast<coordinate_type>(x1));
-        geometry::set<0, 1>(geometry, boost::numeric_cast<coordinate_type>(y1));
-        geometry::set<1, 0>(geometry, boost::numeric_cast<coordinate_type>(x2));
-        geometry::set<1, 1>(geometry, boost::numeric_cast<coordinate_type>(y2));
+        geometry::set<0, 0>(geometry, util::numeric_cast<coordinate_type>(x1));
+        geometry::set<0, 1>(geometry, util::numeric_cast<coordinate_type>(y1));
+        geometry::set<1, 0>(geometry, util::numeric_cast<coordinate_type>(x2));
+        geometry::set<1, 1>(geometry, util::numeric_cast<coordinate_type>(y2));
     }
 };
 
@@ -167,8 +166,8 @@ struct assign<point_tag, Point, 2>
     template <typename T>
     static inline void apply(Point& point, T const& c1, T const& c2)
     {
-        set<0>(point, boost::numeric_cast<coordinate_type>(c1));
-        set<1>(point, boost::numeric_cast<coordinate_type>(c2));
+        set<0>(point, util::numeric_cast<coordinate_type>(c1));
+        set<1>(point, util::numeric_cast<coordinate_type>(c2));
     }
 };
 
@@ -180,9 +179,9 @@ struct assign<point_tag, Point, 3>
     template <typename T>
     static inline void apply(Point& point, T const& c1, T const& c2, T const& c3)
     {
-        set<0>(point, boost::numeric_cast<coordinate_type>(c1));
-        set<1>(point, boost::numeric_cast<coordinate_type>(c2));
-        set<2>(point, boost::numeric_cast<coordinate_type>(c3));
+        set<0>(point, util::numeric_cast<coordinate_type>(c1));
+        set<1>(point, util::numeric_cast<coordinate_type>(c2));
+        set<2>(point, util::numeric_cast<coordinate_type>(c3));
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp b/inst/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
index 5e8635c3d..1e6b798cd 100644
--- a/inst/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2012-2020 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2022-2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017-2022.
-// Modifications copyright (c) 2017-2022 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -18,7 +19,6 @@
 #include <iterator>
 
 #include <boost/core/ignore_unused.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/rbegin.hpp>
@@ -37,6 +37,7 @@
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/ring.hpp>
@@ -85,8 +86,8 @@ inline void simplify_input(RangeIn const& range,
 template <typename RingOutput>
 struct buffer_range
 {
-    typedef typename point_type<RingOutput>::type output_point_type;
-    typedef typename coordinate_type<RingOutput>::type coordinate_type;
+    using output_point_type = point_type_t<RingOutput>;
+    using coordinate_type = coordinate_type_t<RingOutput>;
 
     template
     <
@@ -96,7 +97,6 @@ struct buffer_range
         typename SegmentStrategy,
         typename JoinStrategy,
         typename EndStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline
@@ -113,7 +113,6 @@ struct buffer_range
             SegmentStrategy const& segment_strategy,
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
-            RobustPolicy const& ,
             Strategies const& strategies)
     {
         geometry::strategy::buffer::join_selector const join
@@ -179,8 +178,7 @@ struct buffer_range
             output_point_type const& p1,
             output_point_type const& p2)
     {
-        typedef typename cs_tag<output_point_type>::type cs_tag;
-        return direction_code<cs_tag>(p0, p1, p2) == 1;
+        return direction_code<cs_tag_t<output_point_type>>(p0, p1, p2) == 1;
     }
 
     template <typename Strategies>
@@ -205,7 +203,6 @@ struct buffer_range
         typename SegmentStrategy,
         typename JoinStrategy,
         typename EndStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline geometry::strategy::buffer::result_code iterate(Collection& collection,
@@ -215,7 +212,6 @@ struct buffer_range
                 SegmentStrategy const& segment_strategy,
                 JoinStrategy const& join_strategy,
                 EndStrategy const& end_strategy,
-                RobustPolicy const& robust_policy,
                 Strategies const& strategies,
                 bool linear,
                 output_point_type& first_p1,
@@ -292,7 +288,7 @@ struct buffer_range
                         *it, generated_side.front(), generated_side.back(),
                         side,
                         distance_strategy, segment_strategy, join_strategy, end_strategy,
-                        robust_policy, strategies);
+                        strategies);
             }
 
             collection.add_side_piece(*prev, *it, generated_side, first, distance_strategy.empty(side));
@@ -341,7 +337,6 @@ struct buffer_multi
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline void apply(Multi const& multi,
@@ -351,7 +346,6 @@ struct buffer_multi
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies)
     {
         for (auto it = boost::begin(multi); it != boost::end(multi); ++it)
@@ -359,7 +353,7 @@ struct buffer_multi
             Policy::apply(*it, collection,
                 distance_strategy, segment_strategy,
                 join_strategy, end_strategy, point_strategy,
-                robust_policy, strategies);
+                strategies);
         }
     }
 };
@@ -426,7 +420,6 @@ struct buffer_inserter<point_tag, Point, RingOutput>
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline void apply(Point const& point, Collection& collection,
@@ -435,12 +428,11 @@ struct buffer_inserter<point_tag, Point, RingOutput>
             JoinStrategy const& ,
             EndStrategy const& ,
             PointStrategy const& point_strategy,
-            RobustPolicy const& ,
             Strategies const& )
     {
         detail::buffer::buffer_point
         <
-            typename point_type<RingOutput>::type
+            point_type_t<RingOutput>
         >(point, collection, distance_strategy, point_strategy);
     }
 };
@@ -454,7 +446,7 @@ template
 >
 struct buffer_inserter_ring
 {
-    using output_point_type = typename point_type<RingOutput>::type;
+    using output_point_type = point_type_t<RingOutput>;
 
     template
     <
@@ -464,7 +456,6 @@ struct buffer_inserter_ring
         typename SegmentStrategy,
         typename JoinStrategy,
         typename EndStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline geometry::strategy::buffer::result_code iterate(Collection& collection,
@@ -474,7 +465,6 @@ struct buffer_inserter_ring
                 SegmentStrategy const& segment_strategy,
                 JoinStrategy const& join_strategy,
                 EndStrategy const& end_strategy,
-                RobustPolicy const& robust_policy,
                 Strategies const& strategies)
     {
         output_point_type first_p1, first_p2, last_p1, last_p2;
@@ -485,7 +475,7 @@ struct buffer_inserter_ring
             = buffer_range::iterate(collection, begin, end,
                 side,
                 distance_strategy, segment_strategy, join_strategy, end_strategy,
-                robust_policy, strategies,
+                strategies,
                 false, first_p1, first_p2, last_p1, last_p2);
 
         // Generate closing join
@@ -497,7 +487,7 @@ struct buffer_inserter_ring
                 *(begin + 1), first_p1, first_p2,
                 side,
                 distance_strategy, segment_strategy, join_strategy, end_strategy,
-                robust_policy, strategies);
+                strategies);
         }
 
         // Buffer is closed automatically by last closing corner
@@ -512,7 +502,6 @@ struct buffer_inserter_ring
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline geometry::strategy::buffer::result_code apply(RingInput const& ring,
@@ -522,7 +511,6 @@ struct buffer_inserter_ring
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies)
     {
         // Use helper geometry to support non-mutable input Rings
@@ -552,14 +540,14 @@ struct buffer_inserter_ring
                 code = iterate(collection, boost::rbegin(view), boost::rend(view),
                         geometry::strategy::buffer::buffer_side_right,
                         distance, segment_strategy, join_strategy, end_strategy,
-                        robust_policy, strategies);
+                        strategies);
             }
             else
             {
                 code = iterate(collection, boost::begin(view), boost::end(view),
                         geometry::strategy::buffer::buffer_side_left,
                         distance, segment_strategy, join_strategy, end_strategy,
-                        robust_policy, strategies);
+                        strategies);
             }
         }
 
@@ -592,7 +580,6 @@ struct buffer_inserter<ring_tag, RingInput, RingOutput>
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline geometry::strategy::buffer::result_code apply(RingInput const& ring,
@@ -602,7 +589,6 @@ struct buffer_inserter<ring_tag, RingInput, RingOutput>
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies)
     {
         collection.start_new_ring(distance.negative());
@@ -610,7 +596,7 @@ struct buffer_inserter<ring_tag, RingInput, RingOutput>
             = buffer_inserter_ring<RingInput, RingOutput>::apply(ring,
                 collection, distance,
                 segment_strategy, join_strategy, end_strategy, point_strategy,
-                robust_policy, strategies);
+                strategies);
         collection.finish_ring(code, ring, false, false);
         return code;
     }
@@ -623,8 +609,8 @@ template
 >
 struct buffer_inserter<linestring_tag, Linestring, Polygon>
 {
-    using output_ring_type = typename ring_type<Polygon>::type;
-    using output_point_type = typename point_type<output_ring_type>::type;
+    using output_ring_type = ring_type_t<Polygon>;
+    using output_point_type = point_type_t<output_ring_type>;
 
     template
     <
@@ -634,7 +620,6 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
         typename SegmentStrategy,
         typename JoinStrategy,
         typename EndStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline geometry::strategy::buffer::result_code iterate(Collection& collection,
@@ -644,7 +629,6 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
                 SegmentStrategy const& segment_strategy,
                 JoinStrategy const& join_strategy,
                 EndStrategy const& end_strategy,
-                RobustPolicy const& robust_policy,
                 Strategies const& strategies,
                 output_point_type& first_p1)
     {
@@ -681,7 +665,7 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
             = detail::buffer::buffer_range<output_ring_type>::iterate(collection,
                 begin, end, side,
                 distance_strategy, segment_strategy, join_strategy, end_strategy,
-                robust_policy, strategies,
+                strategies,
                 true, first_p1, first_p2, last_p1, last_p2);
 
         if (result == geometry::strategy::buffer::result_normal)
@@ -702,7 +686,6 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline geometry::strategy::buffer::result_code apply(Linestring const& linestring,
@@ -712,7 +695,6 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies)
     {
         // Use helper geometry to support non-mutable input Linestrings
@@ -729,7 +711,7 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
                     boost::begin(simplified), boost::end(simplified),
                     geometry::strategy::buffer::buffer_side_left,
                     distance, segment_strategy, join_strategy, end_strategy,
-                    robust_policy, strategies,
+                    strategies,
                     first_p1);
 
             if (code == geometry::strategy::buffer::result_normal)
@@ -738,7 +720,7 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
                         boost::rbegin(simplified), boost::rend(simplified),
                         geometry::strategy::buffer::buffer_side_right,
                         distance, segment_strategy, join_strategy, end_strategy,
-                        robust_policy, strategies,
+                        strategies,
                         first_p1);
             }
             collection.finish_ring(code);
@@ -780,7 +762,6 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline
@@ -791,7 +772,6 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies,
             bool is_interior)
     {
@@ -807,7 +787,7 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
             geometry::strategy::buffer::result_code const code
                     = policy::apply(*it, collection, distance, segment_strategy,
                     join_strategy, end_strategy, point_strategy,
-                    robust_policy, strategies);
+                    strategies);
 
             collection.finish_ring(code, *it, is_interior, false);
         }
@@ -822,7 +802,6 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline
@@ -833,13 +812,12 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies)
     {
         iterate(boost::begin(interior_rings), boost::end(interior_rings),
             collection, distance, segment_strategy,
             join_strategy, end_strategy, point_strategy,
-            robust_policy, strategies, true);
+            strategies, true);
     }
 
 public:
@@ -851,7 +829,6 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
         typename JoinStrategy,
         typename EndStrategy,
         typename PointStrategy,
-        typename RobustPolicy,
         typename Strategies
     >
     static inline void apply(PolygonInput const& polygon,
@@ -861,7 +838,6 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
             JoinStrategy const& join_strategy,
             EndStrategy const& end_strategy,
             PointStrategy const& point_strategy,
-            RobustPolicy const& robust_policy,
             Strategies const& strategies)
     {
         {
@@ -871,7 +847,7 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
                 = policy::apply(exterior_ring(polygon), collection,
                     distance, segment_strategy,
                     join_strategy, end_strategy, point_strategy,
-                    robust_policy, strategies);
+                    strategies);
 
             collection.finish_ring(code, exterior_ring(polygon), false,
                     geometry::num_interior_rings(polygon) > 0u);
@@ -880,7 +856,7 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
         apply_interior_rings(interior_rings(polygon),
                 collection, distance, segment_strategy,
                 join_strategy, end_strategy, point_strategy,
-                robust_policy, strategies);
+                strategies);
     }
 };
 
@@ -926,7 +902,6 @@ template
     typename EndStrategy,
     typename PointStrategy,
     typename Strategies,
-    typename RobustPolicy,
     typename VisitPiecesPolicy
 >
 inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator out,
@@ -936,7 +911,6 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
         EndStrategy const& end_strategy,
         PointStrategy const& point_strategy,
         Strategies const& strategies,
-        RobustPolicy const& robust_policy,
         VisitPiecesPolicy& visit_pieces_policy
     )
 {
@@ -946,35 +920,31 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
         <
             typename geometry::ring_type<GeometryOutput>::type,
             Strategies,
-            DistanceStrategy,
-            RobustPolicy
+            DistanceStrategy
         >;
-    collection_type collection(strategies, distance_strategy, robust_policy);
+    collection_type collection(strategies, distance_strategy);
     collection_type const& const_collection = collection;
 
     static constexpr bool areal = util::is_areal<GeometryInput>::value;
 
     dispatch::buffer_inserter
         <
-            typename tag_cast
-                <
-                    typename tag<GeometryInput>::type,
-                    multi_tag
-                >::type,
+            tag_cast_t<tag_t<GeometryInput>, multi_tag>,
             GeometryInput,
             GeometryOutput
         >::apply(geometry_input, collection,
                  distance_strategy, segment_strategy, join_strategy,
                  end_strategy, point_strategy,
-                 robust_policy, strategies);
+                 strategies);
 
     collection.get_turns();
     if BOOST_GEOMETRY_CONSTEXPR (areal)
     {
         collection.check_turn_in_original();
     }
-
-    collection.verify_turns();
+    collection.handle_colocations();
+    collection.check_turn_in_pieces();
+    collection.make_traversable_consistent_per_cluster();
 
     // Visit the piece collection. This does nothing (by default), but
     // optionally a debugging tool can be attached (e.g. console or svg),
@@ -1035,8 +1005,7 @@ template
     typename JoinStrategy,
     typename EndStrategy,
     typename PointStrategy,
-    typename Strategies,
-    typename RobustPolicy
+    typename Strategies
 >
 inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator out,
         DistanceStrategy const& distance_strategy,
@@ -1044,14 +1013,13 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
         JoinStrategy const& join_strategy,
         EndStrategy const& end_strategy,
         PointStrategy const& point_strategy,
-        Strategies const& strategies,
-        RobustPolicy const& robust_policy)
+        Strategies const& strategies)
 {
     detail::buffer::visit_pieces_default_policy visitor;
     buffer_inserter<GeometryOutput>(geometry_input, out,
         distance_strategy, segment_strategy, join_strategy,
         end_strategy, point_strategy,
-        strategies, robust_policy, visitor);
+        strategies, visitor);
 }
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/inst/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp b/inst/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
index e75532c3f..e843b27d9 100644
--- a/inst/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2012-2014 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -47,7 +48,6 @@ public :
             typename Turns,
             typename Geometry,
             typename Strategy,
-            typename RobustPolicy,
             typename Visitor
         >
     static inline void apply(std::size_t size_at_start,
@@ -59,7 +59,6 @@ public :
                 Geometry const& ,
                 Geometry const& ,
                 Strategy const& ,
-                RobustPolicy const& ,
                 state_type& state,
                 Visitor& /*visitor*/
                 )
@@ -131,11 +130,11 @@ struct buffer_turn_operation
     : public detail::overlay::traversal_turn_operation<Point, SegmentRatio>
 {
     signed_size_type piece_index;
-    signed_size_type index_in_robust_ring;
+    signed_size_type index_in_ring;
 
     inline buffer_turn_operation()
         : piece_index(-1)
-        , index_in_robust_ring(-1)
+        , index_in_ring(-1)
     {}
 };
 
@@ -281,16 +280,6 @@ struct turn_overlaps_box
     Strategy const& m_strategy;
 };
 
-struct enriched_map_buffer_include_policy
-{
-    template <typename Operation>
-    static inline bool include(Operation const& op)
-    {
-        return op != detail::overlay::operation_intersection
-            && op != detail::overlay::operation_blocked;
-    }
-};
-
 }} // namespace detail::buffer
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/inst/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp b/inst/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
index 66943b303..3f20813b4 100644
--- a/inst/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2012-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2016-2022.
-// Modifications copyright (c) 2016-2022 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2024.
+// Modifications copyright (c) 2016-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -59,7 +60,7 @@
 #include <boost/geometry/algorithms/detail/sections/section_box_policies.hpp>
 
 #include <boost/geometry/views/detail/closed_clockwise_view.hpp>
-#include <boost/geometry/util/for_each_with_index.hpp>
+#include <boost/geometry/views/enumerate_view.hpp>
 #include <boost/geometry/util/range.hpp>
 
 
@@ -100,7 +101,7 @@ namespace detail { namespace buffer
  *    form together the offsetted ring (marked with o below)
  *  The 8 pieces are part of the piece collection and use for inside-checks
  *  The inner parts form (using 1 or 2 points per piece, often co-located)
- *    form together the robust_polygons (marked with r below)
+ *    form together the polygons (marked with r below)
  *  The remaining piece-segments are helper-segments (marked with h)
  *
  *     ooooooooooooooooo
@@ -119,8 +120,7 @@ template
 <
     typename Ring,
     typename Strategy,
-    typename DistanceStrategy,
-    typename RobustPolicy
+    typename DistanceStrategy
 >
 struct buffered_piece_collection
 {
@@ -135,13 +135,13 @@ struct buffered_piece_collection
     typedef buffer_turn_info
     <
         point_type,
-        typename segment_ratio_type<point_type, RobustPolicy>::type
+        typename segment_ratio_type<point_type>::type
     > buffer_turn_info_type;
 
     typedef buffer_turn_operation
     <
         point_type,
-        typename segment_ratio_type<point_type, RobustPolicy>::type
+        typename segment_ratio_type<point_type>::type
     > buffer_turn_operation_type;
 
     typedef std::vector<buffer_turn_info_type> turn_vector_type;
@@ -158,7 +158,7 @@ struct buffered_piece_collection
 
         // The next two members (1, 2) form together a complete clockwise ring
         // for each piece (with one dupped point)
-        // The complete clockwise ring is also included as a robust ring (3)
+        // The complete clockwise ring is also included as a ring (3)
 
         // 1: half, part of offsetted_rings
 
@@ -228,7 +228,7 @@ struct buffered_piece_collection
             geometry::sectionalize
                 <
                     false, dimensions
-                >(m_ring, detail::no_rescale_policy(), m_sections, strategy);
+                >(m_ring, m_sections, strategy);
         }
 
         clockwise_ring_type m_ring;
@@ -249,7 +249,8 @@ struct buffered_piece_collection
 
     // Offsetted rings, and representations of original ring(s)
     // both indexed by multi_index
-    buffered_ring_collection<buffered_ring<Ring> > offsetted_rings;
+    using ring_collection_t = buffered_ring_collection<buffered_ring<Ring>>;
+    ring_collection_t offsetted_rings;
     std::vector<original_ring> original_rings;
     std::vector<point_type> m_linear_end_points;
 
@@ -257,14 +258,8 @@ struct buffered_piece_collection
     segment_identifier current_segment_id;
 
     // Monotonic sections (used for offsetted rings around points)
-    // are still using a robust type, to be comparable with turn calculations,
-    // which is using rescaling.
-    typedef geometry::model::box
-    <
-        typename geometry::robust_point_type<point_type, RobustPolicy>::type
-    > robust_box_type;
-    typedef geometry::sections <robust_box_type, 2> robust_sections_type;
-    robust_sections_type monotonic_sections;
+    typedef geometry::sections<box_type, 2> sections_type;
+    sections_type monotonic_sections;
 
     // Define the clusters, mapping cluster_id -> turns
     typedef std::map
@@ -277,17 +272,14 @@ struct buffered_piece_collection
 
     Strategy m_strategy;
     DistanceStrategy m_distance_strategy;
-    RobustPolicy const& m_robust_policy;
 
     buffered_piece_collection(Strategy const& strategy,
-                              DistanceStrategy const& distance_strategy,
-                              RobustPolicy const& robust_policy)
+                              DistanceStrategy const& distance_strategy)
         : m_first_piece_index(-1)
         , m_deflate(false)
         , m_has_deflated(false)
         , m_strategy(strategy)
         , m_distance_strategy(distance_strategy)
-        , m_robust_policy(robust_policy)
     {}
 
     inline void check_linear_endpoints(buffer_turn_info_type& turn) const
@@ -305,29 +297,6 @@ struct buffered_piece_collection
         }
     }
 
-    inline void verify_turns()
-    {
-        typedef detail::overlay::indexed_turn_operation
-            <
-                buffer_turn_operation_type
-            > indexed_turn_operation;
-        typedef std::map
-            <
-                ring_identifier,
-                std::vector<indexed_turn_operation>
-            > mapped_vector_type;
-        mapped_vector_type mapped_vector;
-
-        detail::overlay::create_map(m_turns, mapped_vector,
-                                    enriched_map_buffer_include_policy());
-
-        // Sort turns over offsetted ring(s)
-        for (auto& pair : mapped_vector)
-        {
-            std::sort(pair.second.begin(), pair.second.end(), buffer_less());
-        }
-    }
-
     inline void deflate_check_turns()
     {
         if (! m_has_deflated)
@@ -398,16 +367,18 @@ struct buffered_piece_collection
 
     inline void update_turn_administration()
     {
-        for_each_with_index(m_turns, [this](std::size_t index, auto& turn)
+        for (auto const& enumerated : util::enumerate(m_turns))
         {
-            turn.turn_index = index;
+            // enumerated is const, but its value is a non-const reference
+            auto& turn = enumerated.value;
+            turn.turn_index = enumerated.index;
 
             // Verify if a turn is a linear endpoint
             if (! turn.is_linear_end_point)
             {
                 this->check_linear_endpoints(turn);
             }
-        });
+        }
     }
 
     // Calculate properties of piece borders which are not influenced
@@ -454,40 +425,40 @@ struct buffered_piece_collection
                     piece_vector_type,
                     buffered_ring_collection<buffered_ring<Ring> >,
                     turn_vector_type,
-                    Strategy,
-                    RobustPolicy
+                    Strategy
                 > visitor(m_pieces, offsetted_rings, m_turns,
-                          m_strategy, m_robust_policy);
+                          m_strategy);
 
             detail::sectionalize::enlarge_sections(monotonic_sections, m_strategy);
 
             geometry::partition
                 <
-                    robust_box_type
+                    box_type
                 >::apply(monotonic_sections, visitor,
                          detail::section::get_section_box<Strategy>(m_strategy),
                          detail::section::overlaps_section_box<Strategy>(m_strategy));
         }
 
         update_turn_administration();
+    }
 
-        {
-            // Check if turns are inside pieces
-            turn_in_piece_visitor
-                <
-                    typename geometry::cs_tag<point_type>::type,
-                    turn_vector_type, piece_vector_type, DistanceStrategy, Strategy
-                > visitor(m_turns, m_pieces, m_distance_strategy, m_strategy);
+    inline void check_turn_in_pieces()
+    {
+        // Check if turns are inside pieces
+        turn_in_piece_visitor
+            <
+                typename geometry::cs_tag<point_type>::type,
+                turn_vector_type, piece_vector_type, DistanceStrategy, Strategy
+            > visitor(m_turns, m_pieces, m_distance_strategy, m_strategy);
 
-            geometry::partition
-                <
-                    box_type
-                >::apply(m_turns, m_pieces, visitor,
-                         turn_get_box<Strategy>(m_strategy),
-                         turn_overlaps_box<Strategy>(m_strategy),
-                         piece_get_box<Strategy>(m_strategy),
-                         piece_overlaps_box<Strategy>(m_strategy));
-        }
+        geometry::partition
+            <
+                box_type
+            >::apply(m_turns, m_pieces, visitor,
+                        turn_get_box<Strategy>(m_strategy),
+                        turn_overlaps_box<Strategy>(m_strategy),
+                        piece_get_box<Strategy>(m_strategy),
+                        piece_overlaps_box<Strategy>(m_strategy));
     }
 
     inline void start_new_ring(bool deflate)
@@ -612,8 +583,7 @@ struct buffered_piece_collection
         if (! boost::empty(input_ring))
         {
             // Assign the ring to the original_ring collection
-            // For rescaling, it is recalculated. Without rescaling, it
-            // is just assigning (note that this Ring type is the
+            // (note that this Ring type is the
             // GeometryOut type, which might differ from the input ring type)
             clockwise_ring_type clockwise_ring;
 
@@ -725,7 +695,6 @@ struct buffered_piece_collection
         sectionalizer::apply(monotonic_sections,
             boost::begin(ring) + pc.first_seg_id.segment_index,
             boost::begin(ring) + pc.beyond_last_segment_index,
-            m_robust_policy,
             m_strategy,
             ring_id, 10);
     }
@@ -898,11 +867,65 @@ struct buffered_piece_collection
 
     //-------------------------------------------------------------------------
 
+    inline void handle_colocations()
+    {
+        if (! detail::overlay::handle_colocations
+                <
+                    false, false, overlay_buffer,
+                    ring_collection_t, ring_collection_t
+                >(m_turns, m_clusters))
+        {
+            return;
+        }
+
+        detail::overlay::gather_cluster_properties
+            <
+                false, false, overlay_buffer
+            >(m_clusters, m_turns, detail::overlay::operation_union,
+            offsetted_rings, offsetted_rings, m_strategy);
+
+        for (auto const& cluster : m_clusters)
+        {
+            if (cluster.second.open_count == 0 && cluster.second.spike_count == 0)
+            {
+                // If the cluster is completely closed, mark it as not traversable.
+                for (auto const& index : cluster.second.turn_indices)
+                {
+                    m_turns[index].is_turn_traversable = false;
+                }
+            }
+        }
+    }
+
+    inline void make_traversable_consistent_per_cluster()
+    {
+        for (auto const& cluster : m_clusters)
+        {
+            bool is_traversable = false;
+            for (auto const& index : cluster.second.turn_indices)
+            {
+                if (m_turns[index].is_turn_traversable)
+                {
+                    // If there is one turn traversable in the cluster,
+                    // then all turns should be traversable.
+                    is_traversable = true;
+                    break;
+                }
+            }
+            if (is_traversable)
+            {
+                for (auto const& index : cluster.second.turn_indices)
+                {
+                    m_turns[index].is_turn_traversable = true;
+                }
+            }
+        }
+    }
+
     inline void enrich()
     {
         enrich_intersection_points<false, false, overlay_buffer>(m_turns,
             m_clusters, offsetted_rings, offsetted_rings,
-            m_robust_policy,
             m_strategy);
     }
 
@@ -929,8 +952,8 @@ struct buffered_piece_collection
     {
         signed_size_type count_in_original = 0;
 
-        // Check of the robust point of this outputted ring is in
-        // any of the robust original rings
+        // Check of the point of this outputted ring is in
+        // any of the original rings
         // This can go quadratic if the input has many rings, and there
         // are many untouched deflated rings around
         for (auto const& original : original_rings)
@@ -1018,7 +1041,7 @@ struct buffered_piece_collection
         traversed_rings.clear();
         buffer_overlay_visitor visitor;
         traverser::apply(offsetted_rings, offsetted_rings,
-                        m_strategy, m_robust_policy,
+                        m_strategy,
                         m_turns, traversed_rings,
                         turn_info_per_ring,
                         m_clusters, visitor);
@@ -1057,30 +1080,32 @@ struct buffered_piece_collection
         // Inner rings, for deflate, which do not have intersections, and
         // which are outside originals, are skipped
         // (other ones should be traversed)
-        for_each_with_index(offsetted_rings, [&](std::size_t index, auto const& ring)
+        for (auto const& enumerated : util::enumerate(offsetted_rings))
+        {
+            auto const& ring = enumerated.value;
+            if (! ring.has_intersections()
+                && ! ring.is_untouched_outside_original)
             {
-                if (! ring.has_intersections()
-                    && ! ring.is_untouched_outside_original)
+                properties const p = properties(ring, m_strategy);
+                if (p.valid)
                 {
-                    properties p = properties(ring, m_strategy);
-                    if (p.valid)
-                    {
-                        ring_identifier id(0, index, -1);
-                        selected[id] = p;
-                    }
+                    ring_identifier id(0, enumerated.index, -1);
+                    selected[id] = p;
                 }
-            });
+            }
+        }
 
         // Select all created rings
-        for_each_with_index(traversed_rings, [&](std::size_t index, auto const& ring)
+        for (auto const& enumerated : util::enumerate(traversed_rings))
+        {
+            auto const& ring = enumerated.value;
+            properties p = properties(ring, m_strategy);
+            if (p.valid)
             {
-                properties p = properties(ring, m_strategy);
-                if (p.valid)
-                {
-                    ring_identifier id(2, index, -1);
-                    selected[id] = p;
-                }
-            });
+                ring_identifier id(2, enumerated.index, -1);
+                selected[id] = p;
+            }
+        }
 
         detail::overlay::assign_parents<overlay_buffer>(offsetted_rings, traversed_rings,
                 selected, m_strategy);
diff --git a/inst/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp b/inst/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
index c5b0aedc7..3775e604e 100644
--- a/inst/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2012-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -117,8 +118,7 @@ template
     typename Pieces,
     typename Rings,
     typename Turns,
-    typename Strategy,
-    typename RobustPolicy
+    typename Strategy
 >
 class piece_turn_visitor
 {
@@ -126,7 +126,6 @@ class piece_turn_visitor
     Rings const& m_rings;
     Turns& m_turns;
     Strategy const& m_strategy;
-    RobustPolicy const& m_robust_policy;
 
     template <typename Piece>
     inline bool is_adjacent(Piece const& piece1, Piece const& piece2) const
@@ -161,8 +160,7 @@ class piece_turn_visitor
                 && it_begin + 1 != it_beyond
                 && detail::section::preceding<Dimension>(dir, *(it_begin + 1),
                                                          this_bounding_box,
-                                                         other_bounding_box,
-                                                         m_robust_policy);
+                                                         other_bounding_box);
             ++it_begin, index++)
         {}
     }
@@ -177,7 +175,7 @@ class piece_turn_visitor
             && it_beyond - 2 != it_begin)
         {
             if (detail::section::exceeding<Dimension>(dir, *(it_beyond - 2),
-                        this_bounding_box, other_bounding_box, m_robust_policy))
+                        this_bounding_box, other_bounding_box))
             {
                 --it_beyond;
             }
@@ -271,7 +269,6 @@ class piece_turn_visitor
                 turn_policy::apply(unique_sub_range1, unique_sub_range2,
                                    the_model,
                                    m_strategy,
-                                   m_robust_policy,
                                    std::back_inserter(m_turns));
             }
         }
@@ -282,13 +279,11 @@ class piece_turn_visitor
     piece_turn_visitor(Pieces const& pieces,
             Rings const& ring_collection,
             Turns& turns,
-            Strategy const& strategy,
-            RobustPolicy const& robust_policy)
+            Strategy const& strategy)
         : m_pieces(pieces)
         , m_rings(ring_collection)
         , m_turns(turns)
         , m_strategy(strategy)
-        , m_robust_policy(robust_policy)
     {}
 
     template <typename Section>
diff --git a/inst/include/boost/geometry/algorithms/detail/buffer/implementation.hpp b/inst/include/boost/geometry/algorithms/detail/buffer/implementation.hpp
index 8b820e8f7..a9608a440 100644
--- a/inst/include/boost/geometry/algorithms/detail/buffer/implementation.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/buffer/implementation.hpp
@@ -4,8 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2017-2022.
-// Modifications copyright (c) 2017-2022 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -77,27 +78,16 @@ struct buffer_all<Input, Output, TagIn, multi_polygon_tag>
     {
         typedef typename boost::range_value<Output>::type polygon_type;
 
-        typedef typename point_type<Input>::type point_type;
-        typedef typename rescale_policy_type
-            <
-                point_type,
-                typename geometry::cs_tag<point_type>::type
-            >::type rescale_policy_type;
-
         if (geometry::is_empty(geometry_in))
         {
             // Then output geometry is kept empty as well
             return;
         }
 
-        model::box<point_type> box;
+        model::box<point_type_t<Input>> box;
         geometry::envelope(geometry_in, box);
         geometry::buffer(box, box, distance_strategy.max_distance(join_strategy, end_strategy));
 
-        rescale_policy_type rescale_policy
-                = boost::geometry::get_rescale_policy<rescale_policy_type>(
-                    box, strategies);
-
         detail::buffer::buffer_inserter<polygon_type>(geometry_in,
                     range::back_inserter(geometry_out),
                     distance_strategy,
@@ -105,8 +95,7 @@ struct buffer_all<Input, Output, TagIn, multi_polygon_tag>
                     join_strategy,
                     end_strategy,
                     point_strategy,
-                    strategies,
-                    rescale_policy);
+                    strategies);
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp b/inst/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp
index 042891e6e..6baf19078 100644
--- a/inst/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp
@@ -45,13 +45,12 @@ namespace detail { namespace centroid
 // cartesian. But if it was needed then one should translate using
 // CS-specific technique, e.g. in spherical/geographic a translation
 // vector should contain coordinates being multiplies of 2PI or 360 deg.
-template <typename Geometry,
-          typename CastedTag = typename tag_cast
-                                <
-                                    typename tag<Geometry>::type,
-                                    areal_tag
-                                >::type,
-    typename CSTag = typename cs_tag<Geometry>::type>
+template
+<
+    typename Geometry,
+    typename CastedTag = tag_cast_t<tag_t<Geometry>, areal_tag>,
+    typename CSTag = cs_tag_t<Geometry>
+>
 struct translating_transformer
 {
     typedef typename geometry::point_type<Geometry>::type point_type;
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp b/inst/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp
index c5d331aaf..d5f53f203 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp
@@ -120,14 +120,8 @@ class geometry_to_range
         typename strategy::distance::services::return_type
             <
                 Strategy,
-                typename point_type<Geometry>::type,
-                typename point_type
-                    <
-                        typename std::iterator_traits
-                            <
-                                RangeIterator
-                            >::value_type
-                    >::type
+                point_type_t<Geometry>,
+                point_type_t<typename std::iterator_traits<RangeIterator>::value_type>
             >::type dist_min;
 
         return apply(geometry, first, last, strategy, dist_min);
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp b/inst/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp
index be1729a86..f26af3f26 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp
@@ -177,14 +177,14 @@ class range_to_range_rtree
         typename strategy::distance::services::return_type
             <
                 Strategy,
-                typename point_type<rtree_value_type>::type,
-                typename point_type
+                point_type_t<rtree_value_type>,
+                point_type_t
                     <
                         typename std::iterator_traits
                             <
                                 QueryRangeIterator
                             >::value_type
-                    >::type
+                    >
             >::type dist_min;
 
         return apply(rtree_first, rtree_last, queries_first, queries_last,
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_points/linear_or_areal_to_areal.hpp b/inst/include/boost/geometry/algorithms/detail/closest_points/linear_or_areal_to_areal.hpp
index 6d643e1ac..d856927f3 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_points/linear_or_areal_to_areal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_points/linear_or_areal_to_areal.hpp
@@ -39,8 +39,8 @@ struct linear_to_areal
         using point_type = typename std::conditional
             <
                 std::is_same<typename coordinate_type<Linear>::type, most_precise_type>::value,
-                typename point_type<Linear>::type,
-                typename point_type<Areal>::type
+                point_type_t<Linear>,
+                point_type_t<Areal>
             >::type;
 
         using linestring_type = geometry::model::linestring<point_type>;
@@ -108,7 +108,7 @@ struct segment_to_areal
                              Strategies const& strategies,
                              bool = false)
     {
-        using linestring_type = geometry::model::linestring<typename point_type<Segment>::type>;
+        using linestring_type = geometry::model::linestring<point_type_t<Segment>>;
         linestring_type linestring;
         convert(segment, linestring);
         linear_to_areal::apply(linestring, areal, shortest_seg, strategies);
@@ -142,8 +142,8 @@ struct areal_to_areal
         using point_type = typename std::conditional
             <
                 std::is_same<typename coordinate_type<Areal1>::type, most_precise_type>::value,
-                typename point_type<Areal1>::type,
-                typename point_type<Areal2>::type
+                point_type_t<Areal1>,
+                point_type_t<Areal2>
             >::type;
 
         using linestring_type = geometry::model::linestring<point_type>;
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_points/linear_to_linear.hpp b/inst/include/boost/geometry/algorithms/detail/closest_points/linear_to_linear.hpp
index d2927a6d3..2ad332ba0 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_points/linear_to_linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_points/linear_to_linear.hpp
@@ -43,7 +43,7 @@ struct linear_to_linear
         {
             dispatch::closest_points
                 <
-                    typename point_type<Linear1>::type,
+                    point_type_t<Linear1>,
                     Linear2
                 >::apply(*points_begin(linear1), linear2, shortest_seg, strategies);
             return;
@@ -53,7 +53,7 @@ struct linear_to_linear
         {
             dispatch::closest_points
                 <
-                    typename point_type<Linear2>::type,
+                    point_type_t<Linear2>,
                     Linear1
                 >::apply(*points_begin(linear2), linear1, shortest_seg, strategies);
             detail::closest_points::swap_segment_points::apply(shortest_seg);
@@ -91,7 +91,7 @@ struct segment_to_linear
                              bool = false)
     {
         using linestring_type = geometry::model::linestring
-            <typename point_type<Segment>::type>;
+            <point_type_t<Segment>>;
         linestring_type linestring;
         convert(segment, linestring);
         linear_to_linear::apply(linestring, linear, shortest_seg, strategies);
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_points/multipoint_to_geometry.hpp b/inst/include/boost/geometry/algorithms/detail/closest_points/multipoint_to_geometry.hpp
index 2c0f22d5b..3a38a3341 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_points/multipoint_to_geometry.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_points/multipoint_to_geometry.hpp
@@ -125,7 +125,7 @@ struct segment_to_multipoint
     {
         using linestring_type = geometry::model::linestring
             <
-                typename point_type<Segment>::type
+                point_type_t<Segment>
             >;
         linestring_type linestring;
         convert(segment, linestring);
@@ -150,7 +150,7 @@ struct multipoint_to_segment
     {
         using linestring_type = geometry::model::linestring
             <
-                typename point_type<Segment>::type
+                point_type_t<Segment>
             >;
         linestring_type linestring;
         convert(segment, linestring);
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp b/inst/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp
index 577185851..484fe683b 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp
@@ -68,7 +68,7 @@ struct point_to_segment
     static inline void apply(Point const& point, Segment const& segment,
                              OutputSegment& shortest_seg, Strategies const& strategies)
     {
-        typename point_type<Segment>::type p[2];
+        point_type_t<Segment> p[2];
         geometry::detail::assign_point_from_index<0>(segment, p[0]);
         geometry::detail::assign_point_from_index<1>(segment, p[1]);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp b/inst/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp
index 15d28cd69..7e5419e75 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_points/segment_to_segment.hpp
@@ -54,7 +54,7 @@ class segment_to_segment
     {
         using intersection_return_type = segment_intersection_points
             <
-                typename point_type<Segment1>::type
+                point_type_t<Segment1>
             >;
 
         using intersection_policy = policies::relate::segments_intersection_points
@@ -74,11 +74,11 @@ class segment_to_segment
             return;
         }
 
-        typename point_type<Segment1>::type p[2];
+        point_type_t<Segment1> p[2];
         detail::assign_point_from_index<0>(segment1, p[0]);
         detail::assign_point_from_index<1>(segment1, p[1]);
 
-        typename point_type<Segment2>::type q[2];
+        point_type_t<Segment2> q[2];
         detail::assign_point_from_index<0>(segment2, q[0]);
         detail::assign_point_from_index<1>(segment2, q[1]);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp b/inst/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp
index 858c86efb..9aaa4dd80 100644
--- a/inst/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/closest_points/utilities.hpp
@@ -57,8 +57,8 @@ using creturn_t = typename strategy::distance::services::return_type
             <
                 distance_strategy_t<Geometry1, Geometry2, Strategies>
             >::type,
-        typename point_type<Geometry1>::type,
-        typename point_type<Geometry2>::type
+        point_type_t<Geometry1>,
+        point_type_t<Geometry2>
     >::type;
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp b/inst/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
index fccdf4bb1..607fdae00 100644
--- a/inst/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
@@ -17,10 +17,10 @@
 
 #include <cstddef>
 
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -45,10 +45,10 @@ struct indexed_to_indexed
         typedef typename coordinate_type<Destination>::type coordinate_type;
 
         geometry::set<min_corner, Dimension>(destination,
-            boost::numeric_cast<coordinate_type>(
+            util::numeric_cast<coordinate_type>(
                 geometry::get<min_corner, Dimension>(source)));
         geometry::set<max_corner, Dimension>(destination,
-            boost::numeric_cast<coordinate_type>(
+            util::numeric_cast<coordinate_type>(
                 geometry::get<max_corner, Dimension>(source)));
 
         indexed_to_indexed
diff --git a/inst/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp b/inst/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp
index 8762cd668..a29ca3fcf 100644
--- a/inst/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/convert_point_to_point.hpp
@@ -18,10 +18,10 @@
 
 #include <cstddef>
 
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -45,7 +45,7 @@ struct point_to_point
     {
         typedef typename coordinate_type<Destination>::type coordinate_type;
 
-        set<Dimension>(destination, boost::numeric_cast<coordinate_type>(get<Dimension>(source)));
+        set<Dimension>(destination, util::numeric_cast<coordinate_type>(get<Dimension>(source)));
         point_to_point<Source, Destination, Dimension + 1, DimensionCount>::apply(source, destination);
     }
 };
diff --git a/inst/include/boost/geometry/algorithms/detail/convex_hull/interface.hpp b/inst/include/boost/geometry/algorithms/detail/convex_hull/interface.hpp
index 884a9278b..ff8c1703b 100644
--- a/inst/include/boost/geometry/algorithms/detail/convex_hull/interface.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/convex_hull/interface.hpp
@@ -53,7 +53,7 @@
 #include <boost/geometry/strategies/convex_hull/spherical.hpp>
 #include <boost/geometry/strategies/default_strategy.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/range.hpp>
 #include <boost/geometry/util/sequence.hpp>
 #include <boost/geometry/util/type_traits.hpp>
@@ -213,7 +213,7 @@ struct convex_hull
         detail::convex_hull::input_geometry_proxy<Geometry> in_proxy(geometry);
         detail::convex_hull::graham_andrew
             <
-                typename point_type<Geometry>::type
+                point_type_t<Geometry>
             >::apply(in_proxy, out, strategy);
     }
 };
@@ -234,13 +234,13 @@ struct convex_hull<Box, box_tag>
         static bool const Reverse
             = geometry::point_order<OutputGeometry>::value == counterclockwise;
 
-        std::array<typename point_type<OutputGeometry>::type, 4> arr;
+        std::array<point_type_t<OutputGeometry>, 4> arr;
         // TODO: This assigns only 2d cooridnates!
         //       And it is also used in box_view<>!
         geometry::detail::assign_box_corners_oriented<Reverse>(box, arr);
 
         std::move(arr.begin(), arr.end(), range::back_inserter(out));
-        if (BOOST_GEOMETRY_CONDITION(Close))
+        if BOOST_GEOMETRY_CONSTEXPR (Close)
         {
             range::push_back(out, range::front(out));
         }
diff --git a/inst/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp b/inst/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp
index 13626871a..33ba1796a 100644
--- a/inst/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/covered_by/implementation.hpp
@@ -65,7 +65,7 @@ struct geometry_covered_by_box
     template <typename Geometry, typename Box, typename Strategy>
     static inline bool apply(Geometry const& geometry, Box const& box, Strategy const& strategy)
     {
-        using point_type = typename point_type<Geometry>::type;
+        using point_type = point_type_t<Geometry>;
         using mutable_point_type = typename helper_geometry<point_type>::type;
         using box_type = model::box<mutable_point_type>;
 
diff --git a/inst/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp b/inst/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
index 8d71dd2e3..b8648eb77 100644
--- a/inst/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
@@ -61,8 +61,8 @@ namespace detail { namespace disjoint
 {
 
 template <typename Geometry1, typename Geometry2,
-          typename Tag1 = typename tag<Geometry1>::type,
-          typename Tag1OrMulti = typename tag_cast<Tag1, multi_tag>::type>
+          typename Tag1 = tag_t<Geometry1>,
+          typename Tag1OrMulti = tag_cast_t<Tag1, multi_tag>>
 struct disjoint_no_intersections_policy
 {
     /*!
@@ -71,8 +71,7 @@ struct disjoint_no_intersections_policy
     template <typename Strategy>
     static inline bool apply(Geometry1 const& g1, Geometry2 const& g2, Strategy const& strategy)
     {
-        using point_type = typename point_type<Geometry1>::type;
-        typename helper_geometry<point_type>::type p;
+        typename helper_geometry<point_type_t<Geometry1>>::type p;
         geometry::point_on_border(p, g1);
 
         return ! geometry::covered_by(p, g2, strategy);
@@ -183,7 +182,7 @@ class disjoint_segment_areal<Segment, Polygon, polygon_tag>
             return false;
         }
 
-        typename point_type<Segment>::type p;
+        point_type_t<Segment> p;
         detail::assign_point_from_index<0>(segment, p);
 
         return ! geometry::covered_by(p, polygon, strategy);
@@ -219,7 +218,7 @@ struct disjoint_segment_areal<Segment, Ring, ring_tag>
             return false;
         }
 
-        typename point_type<Segment>::type p;
+        point_type_t<Segment> p;
         detail::assign_point_from_index<0>(segment, p);
 
         return ! geometry::covered_by(p, ring, strategy);
diff --git a/inst/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp b/inst/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
index 00a6bff82..dbe23010d 100644
--- a/inst/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
@@ -5,11 +5,11 @@
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020, Oracle and/or its affiliates.
-
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -36,7 +36,6 @@
 #include <boost/geometry/geometries/helper_geometry.hpp>
 
 #include <boost/geometry/policies/disjoint_interrupt_policy.hpp>
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
 
 #include <boost/geometry/algorithms/dispatch/disjoint.hpp>
 
@@ -56,14 +55,12 @@ struct disjoint_segment
     static inline bool apply(Segment1 const& segment1, Segment2 const& segment2,
                              Strategy const& strategy)
     {
-        typedef typename point_type<Segment1>::type point_type;
-
-        typedef segment_intersection_points<point_type> intersection_return_type;
-
-        typedef policies::relate::segments_intersection_points
+        using point_type = point_type_t<Segment1>;
+        using intersection_return_type = segment_intersection_points<point_type>;
+        using intersection_policy = policies::relate::segments_intersection_points
             <
                 intersection_return_type
-            > intersection_policy;
+            >;
 
         detail::segment_as_subrange<Segment1> sub_range1(segment1);
         detail::segment_as_subrange<Segment2> sub_range2(segment2);
@@ -128,7 +125,7 @@ struct disjoint_linear
                         Geometry1, Geometry2, assign_disjoint_policy
                     >
             >::apply(0, geometry1, 1, geometry2,
-                     strategy, detail::no_rescale_policy(), turns, interrupt_policy);
+                     strategy, turns, interrupt_policy);
 
         return !interrupt_policy.has_intersections;
     }
diff --git a/inst/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp b/inst/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
index 1361811da..25b91d3fe 100644
--- a/inst/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
@@ -86,7 +86,7 @@ struct disjoint_range_segment_or_box
                              SegmentOrBox const& segment_or_box,
                              Strategy const& strategy)
     {
-        using point_type = typename point_type<Range>::type;
+        using point_type = point_type_t<Range>;
         using range_segment = typename geometry::model::referring_segment<point_type const>;
 
         detail::closed_view<Range const> const view(range);
diff --git a/inst/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp b/inst/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp
index 535c9006b..8fa9f8a0c 100644
--- a/inst/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/disjoint/multipoint_geometry.hpp
@@ -254,7 +254,7 @@ class multipoint_linear
         // should be passed, where envelope would be lazily calculated when needed the first time
         geometry::partition
             <
-                geometry::model::box<typename point_type<MultiPoint>::type>
+                geometry::model::box<point_type_t<MultiPoint>>
             >::apply(multipoint, segment_range(linear), visitor,
                      expand_box_point<Strategy>(strategy),
                      overlaps_box_point<Strategy>(strategy),
@@ -282,9 +282,9 @@ class multi_point_single_geometry
                              SingleGeometry const& single_geometry,
                              Strategy const& strategy)
     {
-        typedef typename point_type<MultiPoint>::type point1_type;
-        typedef typename point_type<SingleGeometry>::type point2_type;
-        typedef model::box<point2_type> box2_type;
+        using point1_type = point_type_t<MultiPoint>;
+        using point2_type = point_type_t<SingleGeometry>;
+        using box2_type = model::box<point2_type>;
 
         box2_type box2;
         geometry::envelope(single_geometry, box2, strategy);
@@ -424,11 +424,11 @@ class multi_point_multi_geometry
     template <typename Strategy>
     static inline bool apply(MultiPoint const& multi_point, MultiGeometry const& multi_geometry, Strategy const& strategy)
     {
-        typedef typename point_type<MultiPoint>::type point1_type;
-        typedef typename point_type<MultiGeometry>::type point2_type;
-        typedef model::box<point1_type> box1_type;
-        typedef model::box<point2_type> box2_type;
-        typedef std::pair<box2_type, std::size_t> box_pair_type;
+        using point1_type = point_type_t<MultiPoint>;
+        using point2_type = point_type_t<MultiGeometry>;
+        using box1_type = model::box<point1_type>;
+        using box2_type = model::box<point2_type>;
+        using box_pair_type = std::pair<box2_type, std::size_t>;
 
         std::size_t count2 = boost::size(multi_geometry);
         std::vector<box_pair_type> boxes(count2);
diff --git a/inst/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp b/inst/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
index 1f2d669e5..d959619c0 100644
--- a/inst/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
@@ -84,8 +84,7 @@ struct disjoint_segment_box_sphere_or_spheroid
                              DisjointPointBoxStrategy const& disjoint_point_box_strategy,
                              DisjointBoxBoxStrategy const& disjoint_box_box_strategy)
     {
-        typedef typename point_type<Segment>::type segment_point;
-        segment_point vertex;
+        point_type_t<Segment> vertex;
         return apply(segment, box, vertex,
                      azimuth_strategy,
                      normalize_strategy,
@@ -112,13 +111,13 @@ struct disjoint_segment_box_sphere_or_spheroid
     {
         assert_dimension_equal<Segment, Box>();
 
-        typedef typename point_type<Segment>::type segment_point_type;
+        using segment_point_type = point_type_t<Segment>;
 
         segment_point_type p0, p1;
         geometry::detail::assign_point_from_index<0>(segment, p0);
         geometry::detail::assign_point_from_index<1>(segment, p1);
 
-        //vertex not computed here
+        // Vertex is not computed here
         disjoint_info disjoint_return_value = disjoint_info::disjoint_no_vertex;
 
         // Simplest cases first
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp b/inst/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp
index 5af854f90..a01275717 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2021, Oracle and/or its affiliates.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2014-2021, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -35,7 +36,7 @@
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/tags.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 
 namespace boost { namespace geometry
@@ -80,20 +81,16 @@ template
 class geometry_to_segment_or_box
 {
 private:
-    typedef typename point_type<SegmentOrBox>::type segment_or_box_point;
-
-    typedef distance::strategy_t<Geometry, SegmentOrBox, Strategies> strategy_type;
-
-    typedef detail::closest_feature::point_to_point_range
+    using segment_or_box_point = point_type_t<SegmentOrBox>;
+    using strategy_type = distance::strategy_t<Geometry, SegmentOrBox, Strategies>;
+    using point_to_point_range = detail::closest_feature::point_to_point_range
         <
-            typename point_type<Geometry>::type,
+            point_type_t<Geometry>,
             std::vector<segment_or_box_point>,
             segment_or_box_point_range_closure<SegmentOrBox>::value
-        > point_to_point_range;
-
-    typedef detail::closest_feature::geometry_to_range geometry_to_range;
-
-    typedef distance::creturn_t<Geometry, SegmentOrBox, Strategies> comparable_return_type;
+        >;
+    using geometry_to_range = detail::closest_feature::geometry_to_range;
+    using comparable_return_type = distance::creturn_t<Geometry, SegmentOrBox, Strategies>;
 
     // assign the new minimum value for an iterator of the point range
     // of a segment or a box
@@ -247,26 +244,28 @@ class geometry_to_segment_or_box
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(is_comparable<strategy_type>::value))
+        if BOOST_GEOMETRY_CONSTEXPR (is_comparable<strategy_type>::value)
         {
             return (std::min)(cd_min1, cd_min2);
         }
-
-        if (cd_min1 < cd_min2)
-        {
-            return strategy.apply(*pit_min, *it_min1, *it_min2);
-        }
-        else
+        else // else prevents unreachable code warning
         {
-            return dispatch::distance
-                <
-                    segment_or_box_point,
-                    typename std::iterator_traits
-                        <
-                            segment_iterator_type
-                        >::value_type,
-                    Strategies
-                >::apply(*it_min, *sit_min, strategies);
+            if (cd_min1 < cd_min2)
+            {
+                return strategy.apply(*pit_min, *it_min1, *it_min2);
+            }
+            else
+            {
+                return dispatch::distance
+                    <
+                        segment_or_box_point,
+                        typename std::iterator_traits
+                            <
+                                segment_iterator_type
+                            >::value_type,
+                        Strategies
+                    >::apply(*it_min, *sit_min, strategies);
+            }
         }
     }
 
@@ -317,7 +316,7 @@ class geometry_to_segment_or_box
             :
             dispatch::distance
                 <
-                    typename point_type<MultiPoint>::type,
+                    point_type_t<MultiPoint>,
                     SegmentOrBox,
                     Strategies
                 >::apply(*it_min, segment_or_box, strategies);
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/interface.hpp b/inst/include/boost/geometry/algorithms/detail/distance/interface.hpp
index 5fdb66bea..f903c5cee 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/interface.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/interface.hpp
@@ -297,7 +297,7 @@ struct distance<DynamicGeometry1, DynamicGeometry2, dynamic_geometry_tag, dynami
 \* [link geometry.reference.strategies.strategy_distance_haversine Haversine (spherical)]
 \* [link geometry.reference.strategies.strategy_distance_cross_track Cross track (spherical\, point-to-segment)]
 \* [link geometry.reference.strategies.strategy_distance_projected_point Projected point (cartesian\, point-to-segment)]
-\* more (currently extensions): Vincenty\, Andoyer (geographic)
+\* One of the geographic point to point strategies
 }
  */
 
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp b/inst/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp
index 0c3e68051..194ae76bc 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp
@@ -47,7 +47,7 @@ struct linear_to_linear
         {
             return dispatch::distance
                 <
-                    typename point_type<Linear1>::type,
+                    point_type_t<Linear1>,
                     Linear2,
                     Strategies
                 >::apply(*points_begin(linear1), linear2, strategies);
@@ -57,7 +57,7 @@ struct linear_to_linear
         {
             return dispatch::distance
                 <
-                    typename point_type<Linear2>::type,
+                    point_type_t<Linear2>,
                     Linear1,
                     Strategies
                 >::apply(*points_begin(linear2), linear1, strategies);
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp b/inst/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
index df28acef5..08c8f7059 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
@@ -100,7 +100,7 @@ struct point_to_segment
     static inline auto apply(Point const& point, Segment const& segment,
                              Strategies const& strategies)
     {
-        typename point_type<Segment>::type p[2];
+        point_type_t<Segment> p[2];
         geometry::detail::assign_point_from_index<0>(segment, p[0]);
         geometry::detail::assign_point_from_index<1>(segment, p[1]);
 
@@ -117,7 +117,7 @@ struct point_to_segment<Point, Segment, Strategy, false>
     static inline auto apply(Point const& point, Segment const& segment,
                              Strategy const& strategy)
     {
-        typename point_type<Segment>::type p[2];
+        point_type_t<Segment> p[2];
         geometry::detail::assign_point_from_index<0>(segment, p[0]);
         geometry::detail::assign_point_from_index<1>(segment, p[1]);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp b/inst/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
index 09f3cc4f6..70fefae32 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
@@ -1,5 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
+// Copyright (c) 2023-2024 Adam Wulkiewicz, Lodz, Poland.
+
 // Copyright (c) 2014-2023 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
@@ -18,7 +20,6 @@
 #include <vector>
 
 #include <boost/core/ignore_unused.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
@@ -41,9 +42,10 @@
 #include <boost/geometry/policies/compare.hpp>
 
 #include <boost/geometry/util/calculation_type.hpp>
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/has_nan_coordinate.hpp>
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 #include <boost/geometry/strategies/disjoint.hpp>
 #include <boost/geometry/strategies/distance.hpp>
@@ -80,17 +82,16 @@ template
 class segment_to_box_2D_generic
 {
 private:
-    typedef typename point_type<Segment>::type segment_point;
-    typedef typename point_type<Box>::type box_point;
-
-    typedef distance::strategy_t<box_point, Segment, Strategies> ps_strategy_type;
+    using segment_point = point_type_t<Segment>;
+    using box_point = point_type_t<Box>;
+    using ps_strategy_type = distance::strategy_t<box_point, Segment, Strategies>;
 
-    typedef detail::closest_feature::point_to_point_range
+    using point_to_point_range = detail::closest_feature::point_to_point_range
         <
             segment_point,
             std::vector<box_point>,
             open
-        > point_to_point_range;
+        >;
 
 public:
     // TODO: Or should the return type be defined by sb_strategy_type?
@@ -154,21 +155,23 @@ class segment_to_box_2D_generic
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(is_comparable<ps_strategy_type>::value))
+        if BOOST_GEOMETRY_CONSTEXPR (is_comparable<ps_strategy_type>::value)
         {
             return cd[imin];
         }
-
-        if (imin < 4)
-        {
-            return strategy.apply(box_points[imin], p[0], p[1]);
-        }
-        else
+        else // else prevents unreachable code warning
         {
-            unsigned int bimin = imin - 4;
-            return strategy.apply(p[bimin],
-                                  *bit_min[bimin].first,
-                                  *bit_min[bimin].second);
+            if (imin < 4)
+            {
+                return strategy.apply(box_points[imin], p[0], p[1]);
+            }
+            else
+            {
+                unsigned int bimin = imin - 4;
+                return strategy.apply(p[bimin],
+                                      *bit_min[bimin].first,
+                                      *bit_min[bimin].second);
+            }
         }
     }
 };
@@ -183,15 +186,15 @@ template
 class segment_to_box_2D_generic<Segment, Box, Strategies, true> // Use both PointSegment and PointBox strategies
 {
 private:
-    typedef typename point_type<Segment>::type segment_point;
-    typedef typename point_type<Box>::type box_point;
+    using segment_point = point_type_t<Segment>;
+    using box_point = point_type_t<Box>;
 
-    typedef distance::strategy_t<box_point, Segment, Strategies> ps_strategy_type;
-    typedef distance::strategy_t<segment_point, Box, Strategies> pb_strategy_type;
+    using ps_strategy_type = distance::strategy_t<box_point, Segment, Strategies>;
+    using pb_strategy_type = distance::strategy_t<segment_point, Box, Strategies>;
 
 public:
     // TODO: Or should the return type be defined by sb_strategy_type?
-    typedef distance::return_t<box_point, Segment, Strategies> return_type;
+    using return_type = distance::return_t<box_point, Segment, Strategies>;
 
     static inline return_type apply(Segment const& segment,
                                     Box const& box,
@@ -285,7 +288,7 @@ class segment_to_box_2D
         template <typename T>
         static inline Result apply(T const& t)
         {
-            return boost::numeric_cast<Result>(t);
+            return util::numeric_cast<Result>(t);
         }
     };
 
@@ -728,8 +731,8 @@ class segment_to_box<Segment, Box, 2, Strategies>
                                     Box const& box,
                                     Strategies const& strategies)
     {
-        typedef typename point_type<Segment>::type segment_point;
-        typedef typename point_type<Box>::type box_point;
+        using segment_point = point_type_t<Segment>;
+        using box_point = point_type_t<Box>;
 
         segment_point p[2];
         detail::assign_point_from_index<0>(segment, p[0]);
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp b/inst/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
index 9cbececdb..21933bdd6 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2021, Oracle and/or its affiliates.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2014-2021, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -28,7 +29,7 @@
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/tags.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 
 namespace boost { namespace geometry
@@ -58,11 +59,11 @@ class segment_to_segment
             return 0;
         }
 
-        typename point_type<Segment1>::type p[2];
+        point_type_t<Segment1> p[2];
         detail::assign_point_from_index<0>(segment1, p[0]);
         detail::assign_point_from_index<1>(segment1, p[1]);
 
-        typename point_type<Segment2>::type q[2];
+        point_type_t<Segment2> q[2];
         detail::assign_point_from_index<0>(segment2, q[0]);
         detail::assign_point_from_index<1>(segment2, q[1]);
 
@@ -82,21 +83,23 @@ class segment_to_segment
         std::size_t imin = std::distance(boost::addressof(d[0]),
                                          std::min_element(d, d + 4));
 
-        if (BOOST_GEOMETRY_CONDITION(is_comparable<strategy_type>::value))
+        if BOOST_GEOMETRY_CONSTEXPR (is_comparable<strategy_type>::value)
         {
             return d[imin];
         }
-
-        switch (imin)
+        else // else prevents unreachable code warning
         {
-        case 0:
-            return strategy.apply(q[0], p[0], p[1]);
-        case 1:
-            return strategy.apply(q[1], p[0], p[1]);
-        case 2:
-            return strategy.apply(p[0], q[0], q[1]);
-        default:
-            return strategy.apply(p[1], q[0], q[1]);
+            switch (imin)
+            {
+            case 0:
+                return strategy.apply(q[0], p[0], p[1]);
+            case 1:
+                return strategy.apply(q[1], p[0], p[1]);
+            case 2:
+                return strategy.apply(p[0], q[0], q[1]);
+            default:
+                return strategy.apply(p[1], q[0], q[1]);
+            }
         }
     }
 };
diff --git a/inst/include/boost/geometry/algorithms/detail/distance/strategy_utils.hpp b/inst/include/boost/geometry/algorithms/detail/distance/strategy_utils.hpp
index 8002846eb..965cb9113 100644
--- a/inst/include/boost/geometry/algorithms/detail/distance/strategy_utils.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/distance/strategy_utils.hpp
@@ -35,8 +35,8 @@ template <typename Geometry1, typename Geometry2, typename Strategies>
 using return_t = typename strategy::distance::services::return_type
     <
         strategy_t<Geometry1, Geometry2, Strategies>,
-        typename point_type<Geometry1>::type,
-        typename point_type<Geometry2>::type
+        point_type_t<Geometry1>,
+        point_type_t<Geometry2>
     >::type;
 
 
@@ -51,8 +51,8 @@ template <typename Geometry1, typename Geometry2, typename Strategies>
 using creturn_t = typename strategy::distance::services::return_type
     <
         cstrategy_t<Geometry1, Geometry2, Strategies>,
-        typename point_type<Geometry1>::type,
-        typename point_type<Geometry2>::type
+        point_type_t<Geometry1>,
+        point_type_t<Geometry2>
     >::type;
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/envelope/initialize.hpp b/inst/include/boost/geometry/algorithms/detail/envelope/initialize.hpp
index d8e252b53..8d8342661 100644
--- a/inst/include/boost/geometry/algorithms/detail/envelope/initialize.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/envelope/initialize.hpp
@@ -13,11 +13,10 @@
 
 #include <cstddef>
 
-#include <boost/numeric/conversion/bounds.hpp>
-
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/util/bounds.hpp>
 
 
 namespace boost { namespace geometry
@@ -67,9 +66,9 @@ struct initialize
 
     static inline void apply(Box& box,
         coordinate_type min_value
-            = boost::numeric::bounds<coordinate_type>::highest(),
+            = util::bounds<coordinate_type>::highest(),
         coordinate_type max_value
-            = boost::numeric::bounds<coordinate_type>::lowest())
+            = util::bounds<coordinate_type>::lowest())
     {
         initialize_loop
             <
diff --git a/inst/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp b/inst/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
index 04032c623..2fa922705 100644
--- a/inst/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
@@ -32,8 +32,8 @@
 #include <boost/geometry/core/coordinate_system.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
 
+#include <boost/geometry/util/is_inverse_spheroidal_coordinates.hpp>
 #include <boost/geometry/util/math.hpp>
-#include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
 #include <boost/geometry/util/range.hpp>
 
 #include <boost/geometry/views/detail/indexed_point_view.hpp>
@@ -235,7 +235,7 @@ struct envelope_range_of_boxes
 
         static const bool is_equatorial = ! std::is_same
                                             <
-                                                typename cs_tag<box_type>::type,
+                                                cs_tag_t<box_type>,
                                                 spherical_polar_tag
                                             >::value;
 
diff --git a/inst/include/boost/geometry/algorithms/detail/envelope/segment.hpp b/inst/include/boost/geometry/algorithms/detail/envelope/segment.hpp
index 458e8488e..7bfcfd964 100644
--- a/inst/include/boost/geometry/algorithms/detail/envelope/segment.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/envelope/segment.hpp
@@ -70,7 +70,7 @@ struct envelope_segment
     static inline void apply(Segment const& segment, Box& mbr,
                              Strategy const& strategy)
     {
-        typename point_type<Segment>::type p[2];
+        point_type_t<Segment> p[2];
         detail::assign_point_from_index<0>(segment, p[0]);
         detail::assign_point_from_index<1>(segment, p[1]);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp b/inst/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
index 40ea1e424..952bf2215 100644
--- a/inst/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
@@ -20,7 +20,6 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_EQUALS_COLLECT_VECTORS_HPP
 
 
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/range/size.hpp>
 
 #include <boost/geometry/algorithms/detail/normalize.hpp>
@@ -35,6 +34,7 @@
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/range.hpp>
 
 #include <boost/geometry/views/detail/closed_clockwise_view.hpp>
@@ -77,7 +77,7 @@ struct collected_vector_cartesian
 
     bool normalize()
     {
-        T magnitude = math::sqrt(boost::numeric_cast<T>(dx * dx + dy * dy));
+        T magnitude = math::sqrt(util::numeric_cast<T>(dx * dx + dy * dy));
 
         // NOTE: shouldn't here math::equals() be called?
         if (magnitude > 0)
@@ -334,7 +334,7 @@ struct range_collect_vectors
 
 
 // Default version (cartesian)
-template <typename Box, typename Collection, typename CSTag = typename cs_tag<Box>::type>
+template <typename Box, typename Collection, typename CSTag = cs_tag_t<Box>>
 struct box_collect_vectors
 {
     // Calculate on coordinate type, but if it is integer,
@@ -344,7 +344,7 @@ struct box_collect_vectors
 
     static inline void apply(Collection& collection, Box const& box)
     {
-        typename point_type<Box>::type lower_left, lower_right,
+        point_type_t<Box> lower_left, lower_right,
             upper_left, upper_right;
         geometry::detail::assign_box_corners(box, lower_left, lower_right,
             upper_left, upper_right);
@@ -365,7 +365,7 @@ struct box_collect_vectors<Box, Collection, spherical_equatorial_tag>
 {
     static inline void apply(Collection& collection, Box const& box)
     {
-        typename point_type<Box>::type lower_left, lower_right,
+        point_type_t<Box> lower_left, lower_right,
                 upper_left, upper_right;
         geometry::detail::assign_box_corners(box, lower_left, lower_right,
                 upper_left, upper_right);
diff --git a/inst/include/boost/geometry/algorithms/detail/equals/interface.hpp b/inst/include/boost/geometry/algorithms/detail/equals/interface.hpp
index f0c443843..5590a8d88 100644
--- a/inst/include/boost/geometry/algorithms/detail/equals/interface.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/equals/interface.hpp
@@ -49,10 +49,10 @@ template
 <
     typename Geometry1,
     typename Geometry2,
-    typename Tag1 = typename tag<Geometry1>::type,
-    typename Tag2 = typename tag<Geometry2>::type,
-    typename CastedTag1 = typename tag_cast<Tag1, pointlike_tag, linear_tag, areal_tag>::type,
-    typename CastedTag2 = typename tag_cast<Tag2, pointlike_tag, linear_tag, areal_tag>::type,
+    typename Tag1 = tag_t<Geometry1>,
+    typename Tag2 = tag_t<Geometry2>,
+    typename CastedTag1 = tag_cast_t<Tag1, pointlike_tag, linear_tag, areal_tag>,
+    typename CastedTag2 = tag_cast_t<Tag2, pointlike_tag, linear_tag, areal_tag>,
     std::size_t DimensionCount = dimension<Geometry1>::type::value,
     bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
 >
diff --git a/inst/include/boost/geometry/algorithms/detail/extreme_points.hpp b/inst/include/boost/geometry/algorithms/detail/extreme_points.hpp
index 2ac13fc1e..f3845c920 100644
--- a/inst/include/boost/geometry/algorithms/detail/extreme_points.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/extreme_points.hpp
@@ -546,10 +546,10 @@ inline bool extreme_points(Geometry const& geometry,
                            Extremes& extremes,
                            Intruders& intruders)
 {
-    typedef typename strategy::side::services::default_strategy
+    using strategy_type = typename strategy::side::services::default_strategy
             <
-                typename cs_tag<Geometry>::type
-            >::type strategy_type;
+                cs_tag_t<Geometry>
+            >::type;
 
     return geometry::extreme_points<Edge>(geometry,extremes, intruders, strategy_type());
 }
diff --git a/inst/include/boost/geometry/algorithms/detail/for_each_range.hpp b/inst/include/boost/geometry/algorithms/detail/for_each_range.hpp
index 069170004..30b209dc6 100644
--- a/inst/include/boost/geometry/algorithms/detail/for_each_range.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/for_each_range.hpp
@@ -29,7 +29,6 @@
 
 #include <boost/geometry/core/static_assert.hpp>
 #include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/util/type_traits.hpp>
diff --git a/inst/include/boost/geometry/algorithms/detail/has_self_intersections.hpp b/inst/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
index 4074f0d4f..61cb1dee9 100644
--- a/inst/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -26,9 +27,6 @@
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
 #include <boost/geometry/policies/disjoint_interrupt_policy.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
-#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
 #  include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
@@ -67,18 +65,17 @@ namespace detail { namespace overlay
 {
 
 
-template <typename Geometry, typename Strategy, typename RobustPolicy>
+template <typename Geometry, typename Strategy>
 inline bool has_self_intersections(Geometry const& geometry,
         Strategy const& strategy,
-        RobustPolicy const& robust_policy,
         bool throw_on_self_intersection = true)
 {
-    typedef typename point_type<Geometry>::type point_type;
-    typedef turn_info
+    using point_type = point_type_t<Geometry>;
+    using turn_info = turn_info
     <
         point_type,
-        typename segment_ratio_type<point_type, RobustPolicy>::type
-    > turn_info;
+        typename segment_ratio_type<point_type>::type
+    >;
     std::deque<turn_info> turns;
     detail::disjoint::disjoint_interrupt_policy policy;
 
@@ -86,7 +83,7 @@ inline bool has_self_intersections(Geometry const& geometry,
         <
             false,
             detail::overlay::assign_null_policy
-        >(geometry, strategy, robust_policy, turns, policy, 0, false);
+        >(geometry, strategy, turns, policy, 0, false);
 
 #ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
     bool first = true;
diff --git a/inst/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp b/inst/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
index e657f825f..3f5d43886 100644
--- a/inst/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/intersection/areal_areal.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry
 
-// Copyright (c) 2020-2021, Oracle and/or its affiliates.
+// Copyright (c) 2020-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -40,12 +41,10 @@ struct intersection_areal_areal_
     <
         typename Areal1,
         typename Areal2,
-        typename RobustPolicy,
         typename Strategy
     >
     static inline void apply(Areal1 const& areal1,
                              Areal2 const& areal2,
-                             RobustPolicy const& robust_policy,
                              GeometryOut& geometry_out,
                              Strategy const& strategy)
     {
@@ -54,7 +53,7 @@ struct intersection_areal_areal_
                 Areal1, Areal2,
                 typename boost::range_value<GeometryOut>::type,
                 overlay_intersection
-            >::apply(areal1, areal2, robust_policy,
+            >::apply(areal1, areal2,
                      geometry::range::back_inserter(geometry_out),
                      strategy);
     }
@@ -69,12 +68,10 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
     <
         typename Areal1,
         typename Areal2,
-        typename RobustPolicy,
         typename Strategy
     >
     static inline void apply(Areal1 const& areal1,
                              Areal2 const& areal2,
-                             RobustPolicy const& robust_policy,
                              TupledOut& geometry_out,
                              Strategy const& strategy)
     {
@@ -105,16 +102,8 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
                 single_out, point_tag, point_tag
             > pointlike;
 
-        typedef typename geometry::tuples::element
-            <
-                areal::index, TupledOut
-            >::type areal_out_type;
-
-        // NOTE: The same robust_policy is used in each call of
-        //   intersection_insert. Is that correct?
-
         // A * A -> A
-        call_intersection(areal1, areal2, robust_policy,
+        call_intersection(areal1, areal2,
                           areal::get(geometry_out),
                           strategy);
 
@@ -124,7 +113,6 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
         // L * L -> (L, P)
         call_intersection(geometry::detail::boundary_view<Areal1 const>(areal1),
                           geometry::detail::boundary_view<Areal2 const>(areal2),
-                          robust_policy,
                           ! is_areal_empty
                             ? temp_out
                             : geometry_out,
@@ -134,6 +122,13 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
         {
             // NOTE: the original areal geometry could be used instead of boundary here
             //   however this results in static assert failure related to rescale policy
+            // After the removing of rescaling replacing boundary with areal geometry results in
+            // some tests failing.
+            typedef typename geometry::tuples::element
+            <
+                areal::index, TupledOut
+            >::type areal_out_type;
+
             typedef geometry::detail::boundary_view
                 <
                     areal_out_type const
@@ -144,14 +139,12 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
             // L - L -> L
             call_difference(linear::get(temp_out),
                             areal_out_boundary,
-                            robust_policy,
                             linear::get(geometry_out),
                             strategy);
 
             // P - L -> P
             call_difference(pointlike::get(temp_out),
                             areal_out_boundary,
-                            robust_policy,
                             pointlike::get(geometry_out),
                             strategy);
         }
@@ -164,13 +157,11 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
     <
         typename Geometry1,
         typename Geometry2,
-        typename RobustPolicy,
         typename GeometryOut,
         typename Strategy
     >
     static inline void call_intersection(Geometry1 const& geometry1,
                                          Geometry2 const& geometry2,
-                                         RobustPolicy const& robust_policy,
                                          GeometryOut& geometry_out,
                                          Strategy const& strategy)
     {
@@ -185,7 +176,6 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
                 overlay_intersection
             >::apply(geometry1,
                      geometry2,
-                     robust_policy,
                      geometry::detail::output_geometry_back_inserter(geometry_out),
                      strategy);
     }
@@ -194,13 +184,11 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
     <
         typename Geometry1,
         typename Geometry2,
-        typename RobustPolicy,
         typename GeometryOut,
         typename Strategy
     >
     static inline void call_difference(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        GeometryOut& geometry_out,
                                        Strategy const& strategy)
     {
@@ -212,7 +200,6 @@ struct intersection_areal_areal_<TupledOut, tupled_output_tag>
                 overlay_difference
             >::apply(geometry1,
                      geometry2,
-                     robust_policy,
                      geometry::range::back_inserter(geometry_out),
                      strategy);
     }
@@ -225,20 +212,18 @@ struct intersection_areal_areal
     <
         typename Areal1,
         typename Areal2,
-        typename RobustPolicy,
         typename GeometryOut,
         typename Strategy
     >
     static inline bool apply(Areal1 const& areal1,
                              Areal2 const& areal2,
-                             RobustPolicy const& robust_policy,
                              GeometryOut& geometry_out,
                              Strategy const& strategy)
     {
         intersection_areal_areal_
             <
                 GeometryOut
-            >::apply(areal1, areal2, robust_policy, geometry_out, strategy);
+            >::apply(areal1, areal2, geometry_out, strategy);
 
         return true;
     }
diff --git a/inst/include/boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp b/inst/include/boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp
index 86478226c..fdfe6678e 100644
--- a/inst/include/boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -31,13 +31,11 @@ struct intersection_box_box
     template
     <
         typename Box1, typename Box2,
-        typename RobustPolicy,
         typename BoxOut,
         typename Strategy
     >
     static inline bool apply(Box1 const& box1,
             Box2 const& box2,
-            RobustPolicy const& robust_policy,
             BoxOut& box_out,
             Strategy const& strategy)
     {
@@ -62,7 +60,7 @@ struct intersection_box_box
         set<max_corner, Dimension>(box_out, max1 > max2 ? max2 : max1);
 
         return intersection_box_box<Dimension + 1, DimensionCount>
-               ::apply(box1, box2, robust_policy, box_out, strategy);
+               ::apply(box1, box2, box_out, strategy);
     }
 };
 
@@ -72,12 +70,10 @@ struct intersection_box_box<DimensionCount, DimensionCount>
     template
     <
         typename Box1, typename Box2,
-        typename RobustPolicy,
         typename BoxOut,
         typename Strategy
     >
-    static inline bool apply(Box1 const&, Box2 const&,
-            RobustPolicy const&, BoxOut&, Strategy const&)
+    static inline bool apply(Box1 const&, Box2 const&, BoxOut&, Strategy const&)
     {
         return true;
     }
diff --git a/inst/include/boost/geometry/algorithms/detail/intersection/gc.hpp b/inst/include/boost/geometry/algorithms/detail/intersection/gc.hpp
index 38a10ba32..d47d4c05b 100644
--- a/inst/include/boost/geometry/algorithms/detail/intersection/gc.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/intersection/gc.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry
 
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -216,22 +217,12 @@ struct intersection
     template <typename Out, typename Strategy, std::enable_if_t<! util::is_pointlike<Out>::value, int> = 0>
     static void merge_two(Out const& g1, Out const& g2, Out& out, Strategy const& strategy)
     {
-        using rescale_policy_type = typename geometry::rescale_overlay_policy_type
-            <
-                Out, Out, typename Strategy::cs_tag
-            >::type;
-
-        rescale_policy_type robust_policy
-            = geometry::get_rescale_policy<rescale_policy_type>(
-                    g1, g2, strategy);
-
         geometry::dispatch::intersection_insert
             <
                 Out, Out, typename boost::range_value<Out>::type,
                 overlay_union
             >::apply(g1,
                      g2,
-                     robust_policy,
                      geometry::range::back_inserter(out),
                      strategy);
     }
@@ -244,7 +235,6 @@ struct intersection
                 Out, Out, typename boost::range_value<Out>::type
             >::apply(g1,
                      g2,
-                     0, // dummy robust policy
                      geometry::range::back_inserter(out),
                      strategy);
     }
diff --git a/inst/include/boost/geometry/algorithms/detail/intersection/interface.hpp b/inst/include/boost/geometry/algorithms/detail/intersection/interface.hpp
index 84a9a57cc..8c4a00876 100644
--- a/inst/include/boost/geometry/algorithms/detail/intersection/interface.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/intersection/interface.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2014-2022.
-// Modifications copyright (c) 2014-2022, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -17,7 +18,6 @@
 #include <boost/geometry/algorithms/detail/overlay/intersection_insert.hpp>
 #include <boost/geometry/algorithms/detail/tupled_output.hpp>
 #include <boost/geometry/geometries/adapted/boost_variant.hpp>
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 #include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/relate/services.hpp>
@@ -43,10 +43,9 @@ template
 >
 struct intersection
 {
-    template <typename RobustPolicy, typename GeometryOut, typename Strategy>
+    template <typename GeometryOut, typename Strategy>
     static inline bool apply(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
-            RobustPolicy const& robust_policy,
             GeometryOut& geometry_out,
             Strategy const& strategy)
     {
@@ -59,7 +58,7 @@ struct intersection
             <
                 Geometry1, Geometry2, SingleOut,
                 overlay_intersection
-            >::apply(geometry1, geometry2, robust_policy,
+            >::apply(geometry1, geometry2,
                      geometry::detail::output_geometry_back_inserter(geometry_out),
                      strategy);
 
@@ -83,11 +82,10 @@ struct intersection
 >
     : intersection<Geometry2, Geometry1, Tag2, Tag1, false>
 {
-    template <typename RobustPolicy, typename GeometryOut, typename Strategy>
+    template <typename GeometryOut, typename Strategy>
     static inline bool apply(
         Geometry1 const& g1,
         Geometry2 const& g2,
-        RobustPolicy const& robust_policy,
         GeometryOut& out,
         Strategy const& strategy)
     {
@@ -96,7 +94,7 @@ struct intersection
                 Geometry2, Geometry1,
                 Tag2, Tag1,
                 false
-            >::apply(g2, g1, robust_policy, out, strategy);
+            >::apply(g2, g1, out, strategy);
     }
 };
 
@@ -121,22 +119,11 @@ struct intersection
     static bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2,
                       GeometryOut & geometry_out, Strategy const& strategy)
     {
-        typedef typename geometry::rescale_overlay_policy_type
-            <
-                Geometry1,
-                Geometry2,
-                typename Strategy::cs_tag
-            >::type rescale_policy_type;
-
-        rescale_policy_type robust_policy
-            = geometry::get_rescale_policy<rescale_policy_type>(
-                    geometry1, geometry2, strategy);
-
         return dispatch::intersection
             <
                 Geometry1,
                 Geometry2
-            >::apply(geometry1, geometry2, robust_policy, geometry_out,
+            >::apply(geometry1, geometry2, geometry_out,
                      strategy);
     }
 };
diff --git a/inst/include/boost/geometry/algorithms/detail/intersection/multi.hpp b/inst/include/boost/geometry/algorithms/detail/intersection/multi.hpp
index 7810abab5..7a90fd7b6 100644
--- a/inst/include/boost/geometry/algorithms/detail/intersection/multi.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/intersection/multi.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2014-2022.
-// Modifications copyright (c) 2014-2022, Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -53,12 +53,10 @@ struct intersection_multi_linestring_multi_linestring_point
     template
     <
         typename MultiLinestring1, typename MultiLinestring2,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(MultiLinestring1 const& ml1,
             MultiLinestring2 const& ml2,
-            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
@@ -69,7 +67,7 @@ struct intersection_multi_linestring_multi_linestring_point
             for (auto it2 = boost::begin(ml2); it2 != boost::end(ml2); ++it2)
             {
                 out = intersection_linestring_linestring_point<PointOut>
-                      ::apply(*it1, *it2, robust_policy, out, strategy);
+                      ::apply(*it1, *it2, out, strategy);
             }
         }
 
@@ -84,19 +82,17 @@ struct intersection_linestring_multi_linestring_point
     template
     <
         typename Linestring, typename MultiLinestring,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Linestring const& linestring,
             MultiLinestring const& ml,
-            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
         for (auto it = boost::begin(ml); it != boost::end(ml); ++it)
         {
             out = intersection_linestring_linestring_point<PointOut>
-                  ::apply(linestring, *it, robust_policy, out, strategy);
+                  ::apply(linestring, *it, out, strategy);
         }
 
         return out;
@@ -118,11 +114,9 @@ struct intersection_of_multi_linestring_with_areal
     template
     <
         typename MultiLinestring, typename Areal,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(MultiLinestring const& ml, Areal const& areal,
-            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
@@ -131,7 +125,7 @@ struct intersection_of_multi_linestring_with_areal
             out = intersection_of_linestring_with_areal
                 <
                     ReverseAreal, LineStringOut, OverlayType, FollowIsolatedPoints
-                >::apply(*it, areal, robust_policy, out, strategy);
+                >::apply(*it, areal, out, strategy);
         }
 
         return out;
@@ -152,18 +146,16 @@ struct intersection_of_areal_with_multi_linestring
     template
     <
         typename Areal, typename MultiLinestring,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Areal const& areal, MultiLinestring const& ml,
-            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
         return intersection_of_multi_linestring_with_areal
             <
                 ReverseAreal, LineStringOut, OverlayType, FollowIsolatedPoints
-            >::apply(ml, areal, robust_policy, out, strategy);
+            >::apply(ml, areal, out, strategy);
     }
 };
 
@@ -175,20 +167,17 @@ struct clip_multi_linestring
     template
     <
         typename MultiLinestring, typename Box,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(MultiLinestring const& multi_linestring,
             Box const& box,
-            RobustPolicy const& robust_policy,
             OutputIterator out, Strategy const& )
     {
-        typedef typename point_type<LinestringOut>::type point_type;
-        strategy::intersection::liang_barsky<Box, point_type> lb_strategy;
+        strategy::intersection::liang_barsky<Box, point_type_t<LinestringOut>> lb_strategy;
         for (auto it = boost::begin(multi_linestring); it != boost::end(multi_linestring); ++it)
         {
             out = detail::intersection::clip_range_with_box
-                <LinestringOut>(box, *it, robust_policy, out, lb_strategy);
+                <LinestringOut>(box, *it, out, lb_strategy);
         }
         return out;
     }
diff --git a/inst/include/boost/geometry/algorithms/detail/intersects/implementation.hpp b/inst/include/boost/geometry/algorithms/detail/intersects/implementation.hpp
index 76493f9d4..36f57fe6a 100644
--- a/inst/include/boost/geometry/algorithms/detail/intersects/implementation.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/intersects/implementation.hpp
@@ -4,9 +4,9 @@
 // Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020, Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -28,7 +28,6 @@
 
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 #include <boost/geometry/policies/disjoint_interrupt_policy.hpp>
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
 
 #include <boost/geometry/strategies/relate/services.hpp>
 
@@ -69,7 +68,7 @@ struct self_intersects
         detail::self_get_turn_points::get_turns
             <
                 false, turn_policy
-            >::apply(geometry, strategy, detail::no_rescale_policy(), turns, policy, 0, true);
+            >::apply(geometry, strategy, turns, policy, 0, true);
         return policy.has_intersections;
     }
 };
diff --git a/inst/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp b/inst/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp
index 7136e5167..720f5b651 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp
@@ -65,10 +65,7 @@ struct debug_boundary_points_printer<MultiLinestring, multi_linestring_tag>
 {
     static inline void apply(MultiLinestring const& multilinestring)
     {
-        typedef typename point_type<MultiLinestring>::type point_type;
-        typedef std::vector<point_type> point_vector;
-
-        point_vector boundary_points;
+        std::vector<point_type_t<MultiLinestring>> boundary_points;
         for (auto it = boost::begin(multilinestring); it != boost::end(multilinestring); ++it)
         {
             if ( boost::size(*it) > 1
diff --git a/inst/include/boost/geometry/algorithms/detail/is_simple/linear.hpp b/inst/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
index e2ac77ad5..8c91e0c9f 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2021, Oracle and/or its affiliates.
+// Copyright (c) 2014-2024, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -31,7 +31,6 @@
 #include <boost/geometry/util/range.hpp>
 
 #include <boost/geometry/policies/predicate_based_interrupt_policy.hpp>
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
 #include <boost/geometry/policies/robustness/segment_ratio.hpp>
 
 #include <boost/geometry/algorithms/intersects.hpp>
@@ -69,12 +68,11 @@ template <typename Turn>
 inline bool check_segment_indices(Turn const& turn,
                                   signed_size_type last_index)
 {
-    return
-        (turn.operations[0].seg_id.segment_index == 0
+    return (turn.operations[0].seg_id.segment_index == 0
          && turn.operations[1].seg_id.segment_index == last_index)
         ||
-        (turn.operations[0].seg_id.segment_index == 0
-         && turn.operations[1].seg_id.segment_index == last_index);
+        (turn.operations[1].seg_id.segment_index == 0
+         && turn.operations[0].seg_id.segment_index == last_index);
 }
 
 
@@ -189,22 +187,19 @@ class is_acceptable_turn<MultiLinestring, Strategy, multi_linestring_tag>
 template <typename Linear, typename Strategy>
 inline bool has_self_intersections(Linear const& linear, Strategy const& strategy)
 {
-    typedef typename point_type<Linear>::type point_type;
-
-    // compute self turns
-    typedef detail::overlay::turn_info<point_type> turn_info;
-
-    std::deque<turn_info> turns;
-
-    typedef detail::overlay::get_turn_info
+    using point_type = point_type_t<Linear>;
+    using turn_info = detail::overlay::turn_info<point_type>;
+    using turn_policy = detail::overlay::get_turn_info
         <
             detail::disjoint::assign_disjoint_policy
-        > turn_policy;
-
-    typedef is_acceptable_turn
+        >;
+    using is_acceptable_turn_type = is_acceptable_turn
         <
             Linear, Strategy
-        > is_acceptable_turn_type;
+        >;
+
+    // Compute self turns
+    std::deque<turn_info> turns;
 
     is_acceptable_turn_type predicate(linear, strategy);
     detail::overlay::predicate_based_interrupt_policy
@@ -218,7 +213,6 @@ inline bool has_self_intersections(Linear const& linear, Strategy const& strateg
             false, turn_policy
         >::apply(linear,
                  strategy,
-                 detail::no_rescale_policy(),
                  turns,
                  interrupt_policy, 0, true);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp b/inst/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
index 2eba68f97..25d513f82 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
@@ -47,7 +47,7 @@ struct is_simple_multipoint
     {
         typedef geometry::less
             <
-                typename point_type<MultiPoint>::type,
+                point_type_t<MultiPoint>,
                 -1,
                 Strategy
             > less_type;
diff --git a/inst/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp b/inst/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp
index b12c42c8e..9798694c6 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2021, Oracle and/or its affiliates.
-
+// Copyright (c) 2014-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -26,8 +26,6 @@
 #include <boost/geometry/core/point_type.hpp>
 
 #include <boost/geometry/policies/predicate_based_interrupt_policy.hpp>
-#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 namespace boost { namespace geometry
 {
@@ -46,24 +44,14 @@ template
 class has_valid_self_turns
 {
 private:
-    typedef typename point_type<Geometry>::type point_type;
-
-    typedef typename geometry::rescale_policy_type
-        <
-            point_type,
-            CSTag
-        >::type rescale_policy_type;
+    using point_type = point_type_t<Geometry>;
 
 public:
-    typedef detail::overlay::turn_info
+    using turn_type = detail::overlay::turn_info
         <
             point_type,
-            typename segment_ratio_type
-                <
-                    point_type,
-                    rescale_policy_type
-                >::type
-        > turn_type;
+            typename segment_ratio_type<point_type>::type
+        >;
 
     // returns true if all turns are valid
     template <typename Turns, typename VisitPolicy, typename Strategy>
@@ -74,9 +62,6 @@ class has_valid_self_turns
     {
         boost::ignore_unused(visitor);
 
-        rescale_policy_type robust_policy
-            = geometry::get_rescale_policy<rescale_policy_type>(geometry, strategy);
-
         detail::overlay::stateless_predicate_based_interrupt_policy
             <
                 is_acceptable_turn<Geometry>
@@ -86,7 +71,7 @@ class has_valid_self_turns
         detail::self_get_turn_points::self_turns
             <
                 false, detail::overlay::assign_null_policy
-            >(geometry, strategy, robust_policy, turns, interrupt_policy,
+            >(geometry, strategy, turns, interrupt_policy,
               0, true);
 
         if (interrupt_policy.has_intersections)
diff --git a/inst/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp b/inst/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
index 8b55ee85d..5bf5e7334 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
@@ -103,8 +103,8 @@ class is_valid_multipolygon
             }
         }
 
-        typedef geometry::model::box<typename point_type<MultiPolygon>::type> box_type;
-        typedef typename base::template partition_item<PolygonIterator, box_type> item_type;
+        using box_type = geometry::model::box<point_type_t<MultiPolygon>>;
+        using item_type = typename base::template partition_item<PolygonIterator, box_type>;
 
         // put polygon iterators without turns in a vector
         std::vector<item_type> polygon_iterators;
@@ -123,7 +123,7 @@ class is_valid_multipolygon
 
         geometry::partition
             <
-                geometry::model::box<typename point_type<MultiPolygon>::type>
+                geometry::model::box<point_type_t<MultiPolygon>>
             >::apply(polygon_iterators, item_visitor,
                      typename base::template expand_box<Strategy>(strategy),
                      typename base::template overlaps_box<Strategy>(strategy));
diff --git a/inst/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp b/inst/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
index c0cf239c2..f4523454a 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2020, Oracle and/or its affiliates.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -20,7 +21,7 @@
 #include <boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp>
 #include <boost/geometry/algorithms/dispatch/is_valid.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 
 namespace boost { namespace geometry
@@ -63,21 +64,21 @@ struct is_valid<MultiPoint, multi_point_tag, AllowEmptyMultiGeometries>
     {
         boost::ignore_unused(multipoint, visitor);
 
-        if (BOOST_GEOMETRY_CONDITION(
-                AllowEmptyMultiGeometries || !boost::empty(multipoint)))
-        {
-            // we allow empty multi-geometries, so an empty multipoint
-            // is considered valid
-            return ! detail::is_valid::has_invalid_coordinate
-                <
-                    MultiPoint
-                >::apply(multipoint, visitor);
-        }
-        else
+        if BOOST_GEOMETRY_CONSTEXPR (! AllowEmptyMultiGeometries)
         {
-            // we do not allow an empty multipoint
-            return visitor.template apply<failure_few_points>();
+            if (boost::empty(multipoint))
+            {
+                // we do not allow an empty multipoint
+                return visitor.template apply<failure_few_points>();
+            }
         }
+
+        // if we allow empty multi-geometries, an empty multipoint
+        // is considered valid
+        return ! detail::is_valid::has_invalid_coordinate
+            <
+                MultiPoint
+            >::apply(multipoint, visitor);
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp b/inst/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
index 39512ad15..a02ce3193 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
@@ -305,8 +305,8 @@ class is_valid_polygon
             ring_indices.insert(tit->operations[1].seg_id.ring_index);
         }
 
-        typedef geometry::model::box<typename point_type<Polygon>::type> box_type;
-        typedef partition_item<RingIterator, box_type> item_type;
+        using box_type = geometry::model::box<point_type_t<Polygon>>;
+        using item_type = partition_item<RingIterator, box_type>;
 
         // put iterators for interior rings without turns in a vector
         std::vector<item_type> ring_iterators;
@@ -450,42 +450,44 @@ class is_valid_polygon
         {
             return true;
         }
+        else // else prevents unreachable code warning
+        {
+            // compute turns and check if all are acceptable
+            typedef debug_validity_phase<Polygon> debug_phase;
+            debug_phase::apply(3);
 
-        // compute turns and check if all are acceptable
-        typedef debug_validity_phase<Polygon> debug_phase;
-        debug_phase::apply(3);
-
-        typedef has_valid_self_turns<Polygon, typename Strategy::cs_tag> has_valid_turns;
+            typedef has_valid_self_turns<Polygon, typename Strategy::cs_tag> has_valid_turns;
 
-        std::deque<typename has_valid_turns::turn_type> turns;
-        bool has_invalid_turns
-            = ! has_valid_turns::apply(polygon, turns, visitor, strategy);
-        debug_print_turns(turns.begin(), turns.end());
+            std::deque<typename has_valid_turns::turn_type> turns;
+            bool has_invalid_turns
+                = ! has_valid_turns::apply(polygon, turns, visitor, strategy);
+            debug_print_turns(turns.begin(), turns.end());
 
-        if (has_invalid_turns)
-        {
-            return false;
-        }
+            if (has_invalid_turns)
+            {
+                return false;
+            }
 
-        // check if all interior rings are inside the exterior ring
-        debug_phase::apply(4);
+            // check if all interior rings are inside the exterior ring
+            debug_phase::apply(4);
 
-        if (! has_holes_inside::apply(polygon,
-                                      turns.begin(), turns.end(),
-                                      visitor,
-                                      strategy))
-        {
-            return false;
-        }
+            if (! has_holes_inside::apply(polygon,
+                                          turns.begin(), turns.end(),
+                                          visitor,
+                                          strategy))
+            {
+                return false;
+            }
 
-        // check whether the interior of the polygon is a connected set
-        debug_phase::apply(5);
+            // check whether the interior of the polygon is a connected set
+            debug_phase::apply(5);
 
-        return has_connected_interior::apply(polygon,
-                                             turns.begin(),
-                                             turns.end(),
-                                             visitor,
-                                             strategy);
+            return has_connected_interior::apply(polygon,
+                                                 turns.begin(),
+                                                 turns.end(),
+                                                 visitor,
+                                                 strategy);
+        }
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/is_valid/segment.hpp b/inst/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
index b1d27dafd..a2a6f061f 100644
--- a/inst/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
@@ -49,7 +49,7 @@ struct is_valid<Segment, segment_tag>
     {
         boost::ignore_unused(visitor);
 
-        typename point_type<Segment>::type p[2];
+        point_type_t<Segment> p[2];
         detail::assign_point_from_index<0>(segment, p[0]);
         detail::assign_point_from_index<1>(segment, p[1]);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
index c52266c19..03b481342 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
@@ -1,10 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2020.
-// Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -29,7 +30,7 @@
 
 #include <boost/geometry/core/closure.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/range.hpp>
 
 
@@ -42,48 +43,22 @@ namespace detail { namespace overlay
 {
 
 // TODO: move this / rename this
-template <typename Point1, typename Point2, typename Strategy, typename RobustPolicy>
+template <typename Point1, typename Point2, typename Strategy>
 inline bool points_equal_or_close(Point1 const& point1,
                                   Point2 const& point2,
-                                  Strategy const& strategy,
-                                  RobustPolicy const& robust_policy)
+                                  Strategy const& strategy)
 {
     if (detail::equals::equals_point_point(point1, point2, strategy))
     {
         return true;
     }
-
-    if (BOOST_GEOMETRY_CONDITION(! RobustPolicy::enabled))
-    {
-        return false;
-    }
-
-    // Try using specified robust policy
-    typedef typename geometry::robust_point_type
-    <
-        Point1,
-        RobustPolicy
-    >::type robust_point_type;
-
-    robust_point_type point1_rob, point2_rob;
-    geometry::recalculate(point1_rob, point1, robust_policy);
-    geometry::recalculate(point2_rob, point2, robust_policy);
-
-    // Only if this is the case the same strategy can be used.
-    BOOST_STATIC_ASSERT((std::is_same
-                            <
-                                typename geometry::cs_tag<Point1>::type,
-                                typename geometry::cs_tag<robust_point_type>::type
-                            >::value));
-
-    return detail::equals::equals_point_point(point1_rob, point2_rob, strategy);
+    return false;
 }
 
 
-template <typename Range, typename Point, typename Strategy, typename RobustPolicy>
+template <typename Range, typename Point, typename Strategy>
 inline void append_no_dups_or_spikes(Range& range, Point const& point,
-                                     Strategy const& strategy,
-                                     RobustPolicy const& robust_policy)
+                                     Strategy const& strategy)
 {
 #ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
     std::cout << "  add: ("
@@ -94,8 +69,7 @@ inline void append_no_dups_or_spikes(Range& range, Point const& point,
     // for geometries >= 3 points.
     // So we have to check the first potential duplicate differently
     if ( boost::size(range) == 1
-      && points_equal_or_close(*(boost::begin(range)), point, strategy,
-                               robust_policy) )
+      && points_equal_or_close(*(boost::begin(range)), point, strategy) )
     {
         return;
     }
@@ -120,8 +94,8 @@ inline void append_no_dups_or_spikes(Range& range, Point const& point,
             && point_is_spike_or_equal(point,
                 *(boost::end(range) - 3),
                 *(boost::end(range) - 2),
-                strategy.side(), // TODO: Pass strategy?
-                robust_policy))
+                strategy.side() // TODO: Pass strategy?
+                ))
     {
         // Use the Concept/traits, so resize and append again
         traits::resize<Range>::apply(range, boost::size(range) - 2);
@@ -129,10 +103,9 @@ inline void append_no_dups_or_spikes(Range& range, Point const& point,
     }
 }
 
-template <typename Range, typename Point, typename Strategy, typename RobustPolicy>
+template <typename Range, typename Point, typename Strategy>
 inline void append_no_collinear(Range& range, Point const& point,
-                                Strategy const& strategy,
-                                RobustPolicy const& robust_policy)
+                                Strategy const& strategy)
 {
     // Stricter version, not allowing any point in a linear row
     // (spike, continuation or same point)
@@ -142,8 +115,7 @@ inline void append_no_collinear(Range& range, Point const& point,
     // So we have to check the first potential duplicate differently
     if ( boost::size(range) == 1
       && points_equal_or_close(*(boost::begin(range)), point,
-                               strategy,
-                               robust_policy) )
+                               strategy) )
     {
         return;
     }
@@ -159,8 +131,8 @@ inline void append_no_collinear(Range& range, Point const& point,
             && point_is_collinear(point,
                 *(boost::end(range) - 3),
                 *(boost::end(range) - 2),
-                strategy.side(), // TODO: Pass strategy?
-                robust_policy))
+                strategy.side() // TODO: Pass strategy?
+                ))
     {
         // Use the Concept/traits, so resize and append again
         traits::resize<Range>::apply(range, boost::size(range) - 2);
@@ -169,9 +141,8 @@ inline void append_no_collinear(Range& range, Point const& point,
 }
 
 // Should only be called internally, from traverse.
-template <typename Ring, typename Strategy, typename RobustPolicy>
-inline void remove_spikes_at_closure(Ring& ring, Strategy const& strategy,
-                                     RobustPolicy const& robust_policy)
+template <typename Ring, typename Strategy>
+inline void remove_spikes_at_closure(Ring& ring, Strategy const& strategy)
 {
     // It assumes a closed ring (whatever the closure value)
     constexpr std::size_t min_size
@@ -197,8 +168,8 @@ inline void remove_spikes_at_closure(Ring& ring, Strategy const& strategy,
         // Check if closing point is a spike (this is so if the second point is
         // considered as collinear w.r.t. the last segment)
         if (point_is_collinear(*second, *penultimate, *first,
-                               strategy.side(), // TODO: Pass strategy?
-                               robust_policy))
+                               strategy.side() // TODO: Pass strategy?
+                               ))
         {
             // Remove first point and last point
             range::erase(ring, first);
@@ -214,7 +185,7 @@ inline void remove_spikes_at_closure(Ring& ring, Strategy const& strategy,
 template <typename Ring, typename Strategy>
 inline void fix_closure(Ring& ring, Strategy const& strategy)
 {
-    if (BOOST_GEOMETRY_CONDITION(geometry::closure<Ring>::value == geometry::open))
+    if BOOST_GEOMETRY_CONSTEXPR (geometry::closure<Ring>::value == geometry::open)
     {
         if (! boost::empty(ring)
             && detail::equals::equals_point_point(range::front(ring), range::back(ring), strategy))
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
index 578ba090c..73e3bdb28 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
@@ -27,10 +27,10 @@
 #include <boost/geometry/algorithms/detail/partition.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
 #include <boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp>
+#include <boost/geometry/views/enumerate_view.hpp>
 
 #include <boost/geometry/geometries/box.hpp>
 
-#include <boost/geometry/util/for_each_with_index.hpp>
 
 namespace boost { namespace geometry
 {
@@ -271,25 +271,28 @@ inline void assign_parents(Geometry1 const& geometry1,
         std::size_t index_positive = 0; // only used if count_positive>0
 
         // Copy to vector (this might be obsolete, using the map directly)
+        // The index in the map is also the index in the vector.
         using helper = ring_info_helper<point_type, area_result_type>;
         std::vector<helper> vector(count_total);
 
-        for_each_with_index(ring_map, [&](std::size_t index, auto const& pair)
+        for (auto const& enumerated : util::enumerate(ring_map))
         {
-            vector[index] = helper(pair.first, pair.second.get_area());
-            helper& item = vector[index];
-            switch(pair.first.source_index)
+            auto const& ring_id = enumerated.value.first;
+            auto const& info = enumerated.value.second;
+            vector[enumerated.index] = helper(ring_id, info.get_area());
+            helper& item = vector[enumerated.index];
+            switch(ring_id.source_index)
             {
                 case 0 :
-                    geometry::envelope(get_ring<tag1>::apply(pair.first, geometry1),
+                    geometry::envelope(get_ring<tag1>::apply(ring_id, geometry1),
                                        item.envelope, strategy);
                     break;
                 case 1 :
-                    geometry::envelope(get_ring<tag2>::apply(pair.first, geometry2),
+                    geometry::envelope(get_ring<tag2>::apply(ring_id, geometry2),
                                        item.envelope, strategy);
                     break;
                 case 2 :
-                    geometry::envelope(get_ring<void>::apply(pair.first, collection),
+                    geometry::envelope(get_ring<void>::apply(ring_id, collection),
                                        item.envelope, strategy);
                     break;
             }
@@ -300,9 +303,9 @@ inline void assign_parents(Geometry1 const& geometry1,
             if (item.real_area > 0)
             {
                 count_positive++;
-                index_positive = index;
+                index_positive = enumerated.index;
             }
-        });
+        }
 
         if (! check_for_orientation)
         {
@@ -323,15 +326,16 @@ inline void assign_parents(Geometry1 const& geometry1,
                 // located outside the outer ring, this cannot be done
                 ring_identifier id_of_positive = vector[index_positive].id;
                 ring_info_type& outer = ring_map[id_of_positive];
-                for_each_with_index(vector, [&](std::size_t index, auto const& item)
+                for (auto const& item : util::enumerate(vector))
                 {
-                    if (index != index_positive)
+                    if (item.index != index_positive)
                     {
-                        ring_info_type& inner = ring_map[item.id];
+                        auto const id = item.value.id;
+                        ring_info_type& inner = ring_map[id];
                         inner.parent = id_of_positive;
-                        outer.children.push_back(item.id);
+                        outer.children.push_back(id);
                     }
-                });
+                }
                 return;
             }
         }
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
index 39d107e01..2f8e6314a 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -106,7 +107,6 @@ public :
         typename Operation,
         typename Rings, typename Ring, typename Turns,
         typename Strategy,
-        typename RobustPolicy,
         typename Visitor
     >
     static inline void apply(std::size_t size_at_start,
@@ -119,7 +119,6 @@ public :
                              Geometry1 const& geometry1,
                              Geometry2 const& geometry2,
                              Strategy const& strategy,
-                             RobustPolicy const& robust_policy,
                              state_type& state,
                              Visitor& visitor)
     {
@@ -131,8 +130,8 @@ public :
         if (! state.m_checked)
         {
             state.m_checked = true;
-            has_self_intersections(geometry1, strategy, robust_policy);
-            has_self_intersections(geometry2, strategy, robust_policy);
+            has_self_intersections(geometry1, strategy);
+            has_self_intersections(geometry2, strategy);
         }
 
         // Make bad output clean
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp
index ad3bd6bda..219549418 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/check_enrich.hpp
@@ -26,6 +26,7 @@
 #include <boost/range/value_type.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
+#include <boost/geometry/views/enumerate_view.hpp>
 
 
 namespace boost { namespace geometry
@@ -122,17 +123,17 @@ inline void check_detailed(MetaTurns& meta_turns, MetaTurn const& meta_turn,
 
 
 template <typename TurnPoints>
-inline bool check_graph(TurnPoints& turn_points, operation_type for_operation)
+inline bool check_graph(TurnPoints const& turn_points, operation_type for_operation)
 {
-    typedef typename boost::range_value<TurnPoints>::type turn_point_type;
+    using turn_point_type = typename boost::range_value<TurnPoints>::type;
 
     bool error = false;
 
     std::vector<meta_turn<turn_point_type> > meta_turns;
-    for_each_with_index(turn_points, [&](std::size_t index, auto const& point)
+    for (auto const& item : util::enumerate(turn_points))
     {
-        meta_turns.push_back(meta_turn<turn_point_type>(index, point));
-    });
+        meta_turns.push_back(meta_turn<turn_point_type>(item.index, item.value));
+    }
 
     int cycle = 0;
     for (auto& meta_turn : meta_turns)
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
index 2eb70aa7d..e598dcfef 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2015-2020.
-// Modifications copyright (c) 2015-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -180,20 +180,18 @@ template
     typename OutputLinestring,
     typename OutputIterator,
     typename Range,
-    typename RobustPolicy,
     typename Box,
     typename Strategy
 >
 OutputIterator clip_range_with_box(Box const& b, Range const& range,
-            RobustPolicy const&,
-            OutputIterator out, Strategy const& strategy)
+                                   OutputIterator out, Strategy const& strategy)
 {
     if (boost::begin(range) == boost::end(range))
     {
         return out;
     }
 
-    typedef typename point_type<OutputLinestring>::type point_type;
+    using point_type = point_type_t<OutputLinestring>;
 
     OutputLinestring line_out;
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp
deleted file mode 100644
index b1c7de217..000000000
--- a/inst/include/boost/geometry/algorithms/detail/overlay/cluster_exits.hpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2020 Barend Gehrels, Amsterdam, the Netherlands.
-
-// This file was modified by Oracle on 2020-2023.
-// Modifications copyright (c) 2020-2023 Oracle and/or its affiliates.
-// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_CLUSTER_EXITS_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_CLUSTER_EXITS_HPP
-
-#include <cstddef>
-#include <set>
-#include <vector>
-
-#include <boost/range/value_type.hpp>
-
-#include <boost/geometry/core/assert.hpp>
-#include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
-#include <boost/geometry/algorithms/detail/overlay/sort_by_side.hpp>
-#include <boost/geometry/algorithms/detail/signed_size_type.hpp>
-#include <boost/geometry/util/condition.hpp>
-
-#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) \
-    || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT) \
-    || defined(BOOST_GEOMETRY_DEBUG_TRAVERSE)
-#  include <string>
-#  include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
-#  include <boost/geometry/io/wkt/wkt.hpp>
-#endif
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay
-{
-
-// Structure to check relatively simple cluster cases
-template <overlay_type OverlayType,
-          typename Turns,
-          typename Sbs>
-struct cluster_exits
-{
-private :
-    static const operation_type target_operation = operation_from_overlay<OverlayType>::value;
-    typedef typename boost::range_value<Turns>::type turn_type;
-    typedef typename turn_type::turn_operation_type turn_operation_type;
-
-    struct linked_turn_op_info
-    {
-        explicit linked_turn_op_info(signed_size_type ti = -1, int oi = -1,
-                    signed_size_type nti = -1)
-            : turn_index(ti)
-            , op_index(oi)
-            , next_turn_index(nti)
-            , rank_index(-1)
-        {}
-
-        signed_size_type turn_index;
-        int op_index;
-        signed_size_type next_turn_index;
-        signed_size_type rank_index;
-    };
-
-    inline signed_size_type get_rank(Sbs const& sbs,
-            linked_turn_op_info const& info) const
-    {
-        for (auto const& rp : sbs.m_ranked_points)
-        {
-            if (rp.turn_index == info.turn_index
-                    && rp.operation_index == info.op_index
-                    && rp.direction == sort_by_side::dir_to)
-            {
-                return rp.rank;
-            }
-        }
-        return -1;
-    }
-
-    std::set<signed_size_type> const& m_ids;
-    std::vector<linked_turn_op_info> possibilities;
-    std::vector<linked_turn_op_info> blocked;
-
-    bool m_valid;
-
-    bool collect(Turns const& turns)
-    {
-        for (auto cluster_turn_index : m_ids)
-        {
-            turn_type const& cluster_turn = turns[cluster_turn_index];
-            if (cluster_turn.discarded)
-            {
-                continue;
-            }
-            if (cluster_turn.both(target_operation))
-            {
-                // Not (yet) supported, can be cluster of u/u turns
-                return false;
-            }
-            for (int i = 0; i < 2; i++)
-            {
-                turn_operation_type const& op = cluster_turn.operations[i];
-                turn_operation_type const& other_op = cluster_turn.operations[1 - i];
-                signed_size_type const ni = op.enriched.get_next_turn_index();
-
-                if (op.operation == target_operation
-                    || op.operation == operation_continue)
-                {
-                    if (ni == cluster_turn_index)
-                    {
-                        // Not (yet) supported, traveling to itself, can be
-                        // hole
-                        return false;
-                    }
-                    possibilities.push_back(
-                        linked_turn_op_info(cluster_turn_index, i, ni));
-                }
-                else if (op.operation == operation_blocked
-                         && ! (ni == other_op.enriched.get_next_turn_index())
-                         && m_ids.count(ni) == 0)
-                {
-                    // Points to turn, not part of this cluster,
-                    // and that way is blocked. But if the other operation
-                    // points at the same turn, it is still fine.
-                    blocked.push_back(
-                        linked_turn_op_info(cluster_turn_index, i, ni));
-                }
-            }
-        }
-        return true;
-    }
-
-    bool check_blocked(Sbs const& sbs)
-    {
-        if (blocked.empty())
-        {
-            return true;
-        }
-
-        for (auto& info : possibilities)
-        {
-            info.rank_index = get_rank(sbs, info);
-        }
-        for (auto& info : blocked)
-        {
-            info.rank_index = get_rank(sbs, info);
-        }
-
-        for (auto const& lti : possibilities)
-        {
-            for (auto const& blti : blocked)
-            {
-                if (blti.next_turn_index == lti.next_turn_index
-                        && blti.rank_index == lti.rank_index)
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-public :
-    cluster_exits(Turns const& turns,
-                  std::set<signed_size_type> const& ids,
-                  Sbs const& sbs)
-        : m_ids(ids)
-        , m_valid(collect(turns) && check_blocked(sbs))
-    {
-    }
-
-    inline bool apply(signed_size_type& turn_index,
-            int& op_index,
-            bool first_run = true) const
-    {
-        if (! m_valid)
-        {
-            return false;
-        }
-
-        // Traversal can either enter the cluster in the first turn,
-        // or it can start halfway.
-        // If there is one (and only one) possibility pointing outside
-        // the cluster, take that one.
-        linked_turn_op_info target;
-        for (auto const& lti : possibilities)
-        {
-            if (m_ids.count(lti.next_turn_index) == 0)
-            {
-                if (target.turn_index >= 0
-                    && target.next_turn_index != lti.next_turn_index)
-                {
-                    // Points to different target
-                    return false;
-                }
-                if (first_run
-                    && BOOST_GEOMETRY_CONDITION(OverlayType == overlay_buffer)
-                    && target.turn_index >= 0)
-                {
-                    // Target already assigned, so there are more targets
-                    // or more ways to the same target
-                    return false;
-                }
-
-                target = lti;
-            }
-        }
-        if (target.turn_index < 0)
-        {
-            return false;
-        }
-
-        turn_index = target.turn_index;
-        op_index = target.op_index;
-
-        return true;
-    }
-};
-
-}} // namespace detail::overlay
-#endif // DOXYGEN_NO_DETAIL
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_CLUSTER_EXITS_HPP
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp
index 19343488f..dae519c18 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/cluster_info.hpp
@@ -27,11 +27,11 @@ struct cluster_info
     std::set<signed_size_type> turn_indices;
 
     //! Number of open spaces (e.g. 2 for touch)
-    std::size_t open_count;
+    std::size_t open_count{0};
 
-    inline cluster_info()
-        : open_count(0)
-    {}
+    //! Number of spikes, where a segment goes to the cluster point
+    //! and leaves immediately in the opposite direction.
+    std::size_t spike_count{0};
 };
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
index 8280a2501..ad5d2f5cd 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
@@ -115,7 +115,7 @@ struct copy_segment_point_box
             SegmentIdentifier const& seg_id, signed_size_type offset,
             PointOut& point)
     {
-        std::array<typename point_type<Box>::type, 4> bp;
+        std::array<point_type_t<Box>, 4> bp;
         assign_box_corners_oriented<Reverse>(box, bp);
 
         signed_size_type const target = circular_offset(4, seg_id.segment_index, offset);
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
index 545bdc031..f6a70648a 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2021.
-// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -62,14 +63,12 @@ struct copy_segments_ring
         typename Ring,
         typename SegmentIdentifier,
         typename Strategy,
-        typename RobustPolicy,
         typename RangeOut
     >
     static inline void apply(Ring const& ring,
             SegmentIdentifier const& seg_id,
             signed_size_type to_index,
             Strategy const& strategy,
-            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         using view_type = detail::closed_clockwise_view
@@ -108,7 +107,7 @@ struct copy_segments_ring
 
         for (signed_size_type i = 0; i < count; ++i, ++it)
         {
-            detail::overlay::append_no_dups_or_spikes(current_output, *it, strategy, robust_policy);
+            detail::overlay::append_no_dups_or_spikes(current_output, *it, strategy);
         }
     }
 };
@@ -118,24 +117,21 @@ class copy_segments_linestring
 {
 private:
     // remove spikes
-    template <typename RangeOut, typename Point, typename Strategy, typename RobustPolicy>
+    template <typename RangeOut, typename Point, typename Strategy>
     static inline void append_to_output(RangeOut& current_output,
                                         Point const& point,
                                         Strategy const& strategy,
-                                        RobustPolicy const& robust_policy,
                                         std::true_type const&)
     {
         detail::overlay::append_no_dups_or_spikes(current_output, point,
-                                                  strategy,
-                                                  robust_policy);
+                                                  strategy);
     }
 
     // keep spikes
-    template <typename RangeOut, typename Point, typename Strategy, typename RobustPolicy>
+    template <typename RangeOut, typename Point, typename Strategy>
     static inline void append_to_output(RangeOut& current_output,
                                         Point const& point,
                                         Strategy const& strategy,
-                                        RobustPolicy const&,
                                         std::false_type const&)
     {
         detail::overlay::append_no_duplicates(current_output, point, strategy);
@@ -147,14 +143,12 @@ class copy_segments_linestring
         typename LineString,
         typename SegmentIdentifier,
         typename SideStrategy,
-        typename RobustPolicy,
         typename RangeOut
     >
     static inline void apply(LineString const& ls,
             SegmentIdentifier const& seg_id,
             signed_size_type to_index,
             SideStrategy const& strategy,
-            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         signed_size_type const from_index = seg_id.segment_index + 1;
@@ -171,7 +165,7 @@ class copy_segments_linestring
         auto it = boost::begin(ls) + from_index;
         for (signed_size_type i = 0; i < count; ++i, ++it)
         {
-            append_to_output(current_output, *it, strategy, robust_policy,
+            append_to_output(current_output, *it, strategy,
                              std::integral_constant<bool, RemoveSpikes>());
         }
     }
@@ -185,14 +179,12 @@ struct copy_segments_polygon
         typename Polygon,
         typename SegmentIdentifier,
         typename SideStrategy,
-        typename RobustPolicy,
         typename RangeOut
     >
     static inline void apply(Polygon const& polygon,
             SegmentIdentifier const& seg_id,
             signed_size_type to_index,
             SideStrategy const& strategy,
-            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         // Call ring-version with the right ring
@@ -203,7 +195,6 @@ struct copy_segments_polygon
                     : range::at(geometry::interior_rings(polygon), seg_id.ring_index),
                 seg_id, to_index,
                 strategy,
-                robust_policy,
                 current_output
             );
     }
@@ -218,14 +209,12 @@ struct copy_segments_box
         typename Box,
         typename SegmentIdentifier,
         typename SideStrategy,
-        typename RobustPolicy,
         typename RangeOut
     >
     static inline void apply(Box const& box,
             SegmentIdentifier const& seg_id,
             signed_size_type to_index,
             SideStrategy const& strategy,
-            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         signed_size_type index = seg_id.segment_index + 1;
@@ -236,7 +225,7 @@ struct copy_segments_box
             : 5 - index + to_index + 1;
 
         // Create array of points, the fifth one closes it
-        std::array<typename point_type<Box>::type, 5> bp;
+        std::array<point_type_t<Box>, 5> bp;
         assign_box_corners_oriented<Reverse>(box, bp);
         bp[4] = bp[0];
 
@@ -245,7 +234,7 @@ struct copy_segments_box
         for (signed_size_type i = 0; i < count; i++, index++)
         {
             detail::overlay::append_no_dups_or_spikes(current_output,
-                bp[index % 5], strategy, robust_policy);
+                bp[index % 5], strategy);
 
         }
     }
@@ -260,14 +249,12 @@ struct copy_segments_multi
         typename MultiGeometry,
         typename SegmentIdentifier,
         typename SideStrategy,
-        typename RobustPolicy,
         typename RangeOut
     >
     static inline void apply(MultiGeometry const& multi_geometry,
             SegmentIdentifier const& seg_id,
             signed_size_type to_index,
             SideStrategy const& strategy,
-            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
 
@@ -281,7 +268,6 @@ struct copy_segments_multi
         Policy::apply(range::at(multi_geometry, seg_id.multi_index),
                       seg_id, to_index,
                       strategy,
-                      robust_policy,
                       current_output);
     }
 };
@@ -351,14 +337,12 @@ template
     typename Geometry,
     typename SegmentIdentifier,
     typename SideStrategy,
-    typename RobustPolicy,
     typename RangeOut
 >
 inline void copy_segments(Geometry const& geometry,
             SegmentIdentifier const& seg_id,
             signed_size_type to_index,
             SideStrategy const& strategy,
-            RobustPolicy const& robust_policy,
             RangeOut& range_out)
 {
     concepts::check<Geometry const>();
@@ -367,7 +351,7 @@ inline void copy_segments(Geometry const& geometry,
         <
             typename tag<Geometry>::type,
             Reverse
-        >::apply(geometry, seg_id, to_index, strategy, robust_policy, range_out);
+        >::apply(geometry, seg_id, to_index, strategy, range_out);
 }
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp
index ca537e081..3c1ef5f34 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp
@@ -14,9 +14,11 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DISCARD_DUPLICATE_TURNS_HPP
 
 #include <map>
+#include <set>
 
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
+#include <boost/geometry/views/enumerate_view.hpp>
 
 namespace boost { namespace geometry
 {
@@ -88,10 +90,109 @@ inline bool corresponding_turn(Turn const& turn, Turn const& start_turn,
     return count == 2;
 }
 
+//  Verify turns (other than start, and cross) if they are present in the map, and if so,
+//  if they have the other turns as corresponding, discard the start turn.
+template <typename Turns, typename TurnBySegmentMap, typename Geometry0, typename Geometry1>
+void discard_duplicate_start_turns(Turns& turns,
+                                   TurnBySegmentMap const& start_turns_by_segment,
+                                   Geometry0 const& geometry0,
+                                   Geometry1 const& geometry1)
+{
+    using multi_and_ring_id_type = std::pair<signed_size_type, signed_size_type>;
+    auto adapt_id = [](segment_identifier const& seg_id)
+    {
+        return multi_and_ring_id_type{seg_id.multi_index, seg_id.ring_index};
+    };
+
+    for (auto& turn : turns)
+    {
+        // Any turn which "crosses" does not have a corresponding turn.
+        // Also avoid comparing "start" with itself
+        if (turn.method == method_crosses || turn.method == method_start)
+        {
+            continue;
+        }
+        bool const is_touch = turn.method == method_touch;
+        for (auto const& op : turn.operations)
+        {
+            auto it = start_turns_by_segment.find(adapt_id(op.seg_id));
+            if (it == start_turns_by_segment.end())
+            {
+                continue;
+            }
+            for (std::size_t const& i : it->second)
+            {
+                auto& start_turn = turns[i];
+                if (start_turn.cluster_id == turn.cluster_id
+                    && corresponding_turn(turn, start_turn, geometry0, geometry1))
+                {
+                    // Discard the start turn, unless there is a touch before.
+                    // In that case the start is used and the touch is discarded.
+                    (is_touch ? turn : start_turn).discarded = true;
+                }
+            }
+        }
+    }
+}
+
+//  Discard turns for the following (rare) case:
+//  - they are consecutive
+//  - the first has a touch, the second a touch_interior
+// And then one of the segments touches the others next in the middle.
+// This is geometrically not possible, and caused by floating point precision.
+// Discard the second (touch interior)
+template <typename Turns, typename Geometry0, typename Geometry1>
+void discard_touch_touch_interior_turns(Turns& turns,
+                                        Geometry0 const& geometry0,
+                                        Geometry1 const& geometry1)
+{
+    for (auto& current_turn : turns)
+    {
+        if (current_turn.method != method_touch_interior)
+        {
+            // Because touch_interior is a rarer case, it is more efficient to start with that
+            continue;
+        }
+        for (auto const& previous_turn : turns)
+        {
+            if (previous_turn.method != method_touch)
+            {
+                continue;
+            }
+
+            // Compare 0 with 0 and 1 with 1
+            // Note that 0 has always source 0 and 1 has always source 1
+            // (not in buffer). Therefore this comparison is OK.
+            // MAYBE we need to check for buffer.
+            bool const common0 = current_turn.operations[0].seg_id == previous_turn.operations[0].seg_id;
+            bool const common1 = current_turn.operations[1].seg_id == previous_turn.operations[1].seg_id;
+
+            // If one of the operations is common, and the other is not, then there is one comment segment.
+            bool const has_common_segment = common0 != common1;
+
+            if (! has_common_segment)
+            {
+                continue;
+            }
+
+            // If the second index (1) is common, we need to check consecutivity of the first index (0)
+            // and vice versa.
+            bool const consecutive =
+                common1 ? is_consecutive(previous_turn.operations[0].seg_id, current_turn.operations[0].seg_id, geometry0, geometry1)
+                : is_consecutive(previous_turn.operations[1].seg_id, current_turn.operations[1].seg_id, geometry0, geometry1);
+
+            if (consecutive)
+            {
+                current_turn.discarded = true;
+            }
+        }
+    }
+}
+
 template <typename Turns, typename Geometry0, typename Geometry1>
-inline void discard_duplicate_start_turns(Turns& turns,
-                                          Geometry0 const& geometry0,
-                                          Geometry1 const& geometry1)
+void discard_duplicate_turns(Turns& turns,
+                             Geometry0 const& geometry0,
+                             Geometry1 const& geometry1)
 {
     // Start turns are generated, in case the previous turn is missed.
     // But often it is not missed, and then it should be deleted.
@@ -99,54 +200,49 @@ inline void discard_duplicate_start_turns(Turns& turns,
     // (in float, collinear, points far apart due to floating point precision)
     //   [m, i s:0, v:6 1/1 (1) // u s:1, v:5  pnt (2.54044, 3.12623)]
     //   [s, i s:0, v:7 0/1 (0) // u s:1, v:5  pnt (2.70711, 3.29289)]
+    //
+    // Also, if two turns are consecutive, and one is touch and the other touch_interior,
+    // the touch_interior is discarded.
 
     using multi_and_ring_id_type = std::pair<signed_size_type, signed_size_type>;
 
-    auto adapt_id = [](segment_identifier const& seg_id)
+    auto add_to_map = [](auto const& turn, auto& map, std::size_t index)
     {
-        return multi_and_ring_id_type{seg_id.multi_index, seg_id.ring_index};
+        auto adapt_id = [](segment_identifier const& seg_id)
+        {
+            return multi_and_ring_id_type{seg_id.multi_index, seg_id.ring_index};
+        };
+        for (auto const& op : turn.operations)
+        {
+            map[adapt_id(op.seg_id)].insert(index);
+        }
     };
 
-    // 1 Build map of start turns (multi/ring-id -> turn indices)
-    std::map<multi_and_ring_id_type, std::vector<std::size_t>> start_turns_per_segment;
-    std::size_t index = 0;
-    for (auto const& turn : turns)
+    // Build map of start turns (multi/ring-id -> turn indices)
+    // and count touch and touch_interior turns (to verify if later checks are needed)
+    std::map<multi_and_ring_id_type, std::set<std::size_t>> start_turns_by_segment;
+    std::size_t touch_count = 0;
+    std::size_t touch_interior_count = 0;
+    for (auto const& item : util::enumerate(turns))
     {
-        if (turn.method == method_start)
+        auto const& turn = item.value;
+        switch(turn.method)
         {
-            for (auto const& op : turn.operations)
-            {
-                start_turns_per_segment[adapt_id(op.seg_id)].push_back(index);
-            }
+            case method_start: add_to_map(turn, start_turns_by_segment, item.index); break;
+            case method_touch: touch_count++; break;
+            case method_touch_interior: touch_interior_count++; break;
+            default: break;
         }
-        index++;
     }
 
-    // 2: Verify all other turns if they are present in the map, and if so,
-    //    if they have the other turns as corresponding
-    for (auto const& turn : turns)
+    if (!start_turns_by_segment.empty())
     {
-        // Any turn which "crosses" does not have a corresponding turn.
-        // Also avoid comparing "start" with itself.
-        if (turn.method != method_crosses && turn.method != method_start)
-        {
-            for (auto const& op : turn.operations)
-            {
-                auto it = start_turns_per_segment.find(adapt_id(op.seg_id));
-                if (it != start_turns_per_segment.end())
-                {
-                    for (std::size_t const& i : it->second)
-                    {
-                        if (corresponding_turn(turn, turns[i],
-                                               geometry0, geometry1))
-                        {
-                            turns[i].discarded = true;
-                        }
-                    }
-                }
-            }
-        }
-        index++;
+        discard_duplicate_start_turns(turns, start_turns_by_segment, geometry0, geometry1);
+    }
+
+    if (touch_count > 0 && touch_interior_count > 0)
+    {
+       discard_touch_touch_interior_turns(turns, geometry0, geometry1);
     }
 }
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
index 962c68be6..215a53298 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017-2021.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -34,18 +35,16 @@
 #include <boost/range/value_type.hpp>
 
 #include <boost/geometry/algorithms/detail/ring_identifier.hpp>
+#include <boost/geometry/algorithms/detail/overlay/check_enrich.hpp>
 #include <boost/geometry/algorithms/detail/overlay/discard_duplicate_turns.hpp>
 #include <boost/geometry/algorithms/detail/overlay/handle_colocations.hpp>
 #include <boost/geometry/algorithms/detail/overlay/handle_self_turns.hpp>
 #include <boost/geometry/algorithms/detail/overlay/is_self_turn.hpp>
 #include <boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp>
 #include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
-#include <boost/geometry/policies/robustness/robust_type.hpp>
-#include <boost/geometry/util/for_each_with_index.hpp>
+#include <boost/geometry/util/constexpr.hpp>
+#include <boost/geometry/views/enumerate_view.hpp>
 
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
-#  include <boost/geometry/algorithms/detail/overlay/check_enrich.hpp>
-#endif
 
 
 namespace boost { namespace geometry
@@ -82,14 +81,12 @@ template
     typename Operations,
     typename Turns,
     typename Geometry1, typename Geometry2,
-    typename RobustPolicy,
     typename Strategy
 >
 inline void enrich_sort(Operations& operations,
             Turns const& turns,
             Geometry1 const& geometry1,
             Geometry2 const& geometry2,
-            RobustPolicy const& robust_policy,
             Strategy const& strategy)
 {
     std::sort(std::begin(operations),
@@ -99,76 +96,94 @@ inline void enrich_sort(Operations& operations,
                     Turns,
                     typename boost::range_value<Operations>::type,
                     Geometry1, Geometry2,
-                    RobustPolicy,
                     Strategy,
                     Reverse1, Reverse2
-                >(turns, geometry1, geometry2, robust_policy, strategy));
+                >(turns, geometry1, geometry2, strategy));
 }
 
 
+// Assign travel-to-vertex/ip index for each turn.
 template <typename Operations, typename Turns>
 inline void enrich_assign(Operations& operations, Turns& turns,
-                          bool check_turns)
+                          bool check_consecutive_turns)
 {
-    if (operations.empty())
-    {
-        return;
-    }
-
-    // Assign travel-to-vertex/ip index for each turning point.
-    // Iterator "next" is circular
-
-    geometry::ever_circling_range_iterator<Operations const> next(operations);
-    ++next;
-
-    for (auto const& indexed : operations)
+    for (auto const& item : util::enumerate(operations))
     {
+        auto const& index = item.index;
+        auto const& indexed = item.value;
         auto& turn = turns[indexed.turn_index];
         auto& op = turn.operations[indexed.operation_index];
 
-        if (check_turns && indexed.turn_index == next->turn_index)
+        std::size_t next_index = index + 1 < operations.size() ? index + 1 : 0;
+        auto advance = [&operations](auto index)
+        {
+            std::size_t const result = index + 1;
+            return result >= operations.size() ? 0 : result;
+        };
+
+        auto next_turn = [&operations, &turns, &next_index]()
+        {
+            return turns[operations[next_index].turn_index];
+        };
+        auto next_operation = [&operations, &turns, &next_index]()
         {
-            // Normal behaviour: next points at next turn, increase next.
-            // For dissolve this should not be done, turn_index is often
-            // the same for two consecutive operations
-            ++next;
+            auto const& next_turn = turns[operations[next_index].turn_index];
+            return next_turn.operations[operations[next_index].operation_index];
+        };
+
+        if (check_consecutive_turns
+            && indexed.turn_index == operations[next_index].turn_index
+            && op.seg_id == next_operation().seg_id)
+        {
+            // If the two operations on the same turn are ordered consecutively,
+            // and they are on the same segment, then the turn where to travel to should
+            // be considered one further. Therefore next is increased.
+            //
+            // It often happens in buffer, in these configurations:
+            // +---->--+
+            // |       |
+            // |   +->-*---->
+            // |   |   |
+            // ^   +-<-+
+            // If the next index is not corrected, the small rectangle
+            // will be kept in the output.
+
+            // This is a normal situation and occurs, for example, in every concave bend.
+            // In general it should always travel from turn to next turn.
+            // Only in some circumstances traveling to the same turn is necessary, for example
+            // if there is only one turn in the outer ring.
+            //
+            // (For dissolve this is not done, turn_index is often
+            // the same for two consecutive operations - but the conditions are changed
+            // and this should be verified again)
+            next_index = advance(next_index);
         }
 
         // Cluster behaviour: next should point after cluster, unless
         // their seg_ids are not the same
         // (For dissolve, this is still to be examined - TODO)
         while (turn.is_clustered()
-                && indexed.turn_index != next->turn_index
-                && turn.cluster_id == turns[next->turn_index].cluster_id
-                && op.seg_id == turns[next->turn_index].operations[next->operation_index].seg_id)
+                && turn.cluster_id == next_turn().cluster_id
+                && op.seg_id == next_operation().seg_id
+                && indexed.turn_index != operations[next_index].turn_index)
         {
-            ++next;
+            next_index = advance(next_index);
         }
 
-        auto const& next_turn = turns[next->turn_index];
-        auto const& next_op = next_turn.operations[next->operation_index];
-
         op.enriched.travels_to_ip_index
-                = static_cast<signed_size_type>(next->turn_index);
+                = static_cast<signed_size_type>(operations[next_index].turn_index);
         op.enriched.travels_to_vertex_index
-                = next->subject->seg_id.segment_index;
+                = operations[next_index].subject->seg_id.segment_index;
 
+        auto const& next_op = next_operation();
         if (op.seg_id.segment_index == next_op.seg_id.segment_index
-                && op.fraction < next_op.fraction)
-        {
-            // Next turn is located further on same segment
-            // assign next_ip_index
-            // (this is one not circular therefore fraction is considered)
-            op.enriched.next_ip_index = static_cast<signed_size_type>(next->turn_index);
-        }
-
-        if (! check_turns)
+            && op.fraction < next_op.fraction)
         {
-            ++next;
+            // Next turn is located further on same segment: assign next_ip_index
+            op.enriched.next_ip_index = static_cast<signed_size_type>(operations[next_index].turn_index);
         }
     }
 
-    // DEBUG
 #ifdef BOOST_GEOMETRY_DEBUG_ENRICH
     for (auto const& indexed_op : operations)
     {
@@ -190,8 +205,6 @@ inline void enrich_assign(Operations& operations, Turns& turns,
             << std::endl;
     }
 #endif
-    // END DEBUG
-
 }
 
 template <typename Operations, typename Turns>
@@ -207,8 +220,10 @@ inline void enrich_adapt(Operations& operations, Turns& turns)
     bool next_phase = false;
     std::size_t previous_index = operations.size() - 1;
 
-    for_each_with_index(operations, [&](std::size_t index, auto const& indexed)
+    for (auto const& item : util::enumerate(operations))
     {
+        auto const& index = item.index;
+        auto const& indexed = item.value;
         auto& turn = turns[indexed.turn_index];
         auto& op = turn.operations[indexed.operation_index];
 
@@ -227,7 +242,7 @@ inline void enrich_adapt(Operations& operations, Turns& turns)
             }
         }
         previous_index = index;
-    });
+    }
 
     if (! next_phase)
     {
@@ -274,12 +289,16 @@ template <typename Turns, typename MappedVector, typename IncludePolicy>
 inline void create_map(Turns const& turns, MappedVector& mapped_vector,
                        IncludePolicy const& include_policy)
 {
-    for_each_with_index(turns, [&](std::size_t index, auto const& turn)
+    for (auto const& turn_item : util::enumerate(turns))
     {
+        auto const& index = turn_item.index;
+        auto const& turn = turn_item.value;
         if (! turn.discarded)
         {
-            for_each_with_index(turn.operations, [&](std::size_t op_index, auto const& op)
+            for (auto const& op_item : util::enumerate(turn.operations))
             {
+                auto const& op_index = op_item.index;
+                auto const& op = op_item.value;
                 if (include_policy.include(op.operation))
                 {
                     ring_identifier const ring_id
@@ -293,9 +312,9 @@ inline void create_map(Turns const& turns, MappedVector& mapped_vector,
                             index, op_index, op, turn.operations[1 - op_index].seg_id
                         );
                 }
-            });
+            }
         }
-    });
+    }
 }
 
 template <typename Point1, typename Point2>
@@ -357,7 +376,6 @@ inline void calculate_remaining_distance(Turns& turns)
 \param clusters container containing clusters
 \param geometry1 \param_geometry
 \param geometry2 \param_geometry
-\param robust_policy policy to handle robustness issues
 \param strategy point in geometry strategy
  */
 template
@@ -367,13 +385,11 @@ template
     typename Turns,
     typename Clusters,
     typename Geometry1, typename Geometry2,
-    typename RobustPolicy,
     typename IntersectionStrategy
 >
 inline void enrich_intersection_points(Turns& turns,
     Clusters& clusters,
     Geometry1 const& geometry1, Geometry2 const& geometry2,
-    RobustPolicy const& robust_policy,
     IntersectionStrategy const& strategy)
 {
     constexpr detail::overlay::operation_type target_operation
@@ -383,6 +399,7 @@ inline void enrich_intersection_points(Turns& turns,
             ? detail::overlay::operation_intersection
             : detail::overlay::operation_union;
     constexpr bool is_dissolve = OverlayType == overlay_dissolve;
+    constexpr bool is_buffer = OverlayType == overlay_buffer;
 
     using turn_type = typename boost::range_value<Turns>::type;
     using indexed_turn_operation = detail::overlay::indexed_turn_operation
@@ -396,16 +413,36 @@ inline void enrich_intersection_points(Turns& turns,
             std::vector<indexed_turn_operation>
         >;
 
-    // From here on, turn indexes are used (in clusters, next_index, etc)
-    // and turns may not be DELETED - they may only be flagged as discarded
-    discard_duplicate_start_turns(turns, geometry1, geometry2);
+    // Turns are often used by index (in clusters, next_index, etc)
+    // and turns may therefore NOT be DELETED - they may only be flagged as discarded
 
     bool has_cc = false;
-    bool const has_colocations
-        = detail::overlay::handle_colocations
+    bool has_colocations = false;
+
+    if BOOST_GEOMETRY_CONSTEXPR (! is_buffer)
+    {
+        // Handle colocations, gathering clusters and (below) their properties.
+        has_colocations = detail::overlay::handle_colocations
+                    <
+                        Reverse1, Reverse2, OverlayType, Geometry1, Geometry2
+                    >(turns, clusters);
+        // Gather cluster properties (using even clusters with
+        // discarded turns - for open turns)
+        detail::overlay::gather_cluster_properties
             <
-                Reverse1, Reverse2, OverlayType, Geometry1, Geometry2
-            >(turns, clusters, robust_policy);
+                Reverse1,
+                Reverse2,
+                OverlayType
+            >(clusters, turns, target_operation,
+            geometry1, geometry2, strategy);
+    }
+    else
+    {
+        // For buffer, this was already done before calling enrich_intersection_points.
+        has_colocations = ! clusters.empty();
+    }
+
+    discard_duplicate_turns(turns, geometry1, geometry2);
 
     // Discard turns not part of target overlay
     for (auto& turn : turns)
@@ -467,29 +504,13 @@ inline void enrich_intersection_points(Turns& turns,
         detail::overlay::enrich_sort<Reverse1, Reverse2>(
                     pair.second, turns,
                     geometry1, geometry2,
-                    robust_policy, strategy);
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
-        std::cout << "ENRICH-sort Ring " << pair.first << std::endl;
-        for (auto const& op : pair.second)
-        {
-            std::cout << op.turn_index << " " << op.operation_index << std::endl;
-        }
-#endif
+                    strategy);
     }
 
     if (has_colocations)
     {
-        // First gather cluster properties (using even clusters with
-        // discarded turns - for open turns), then clean up clusters
-        detail::overlay::gather_cluster_properties
-            <
-                Reverse1,
-                Reverse2,
-                OverlayType
-            >(clusters, turns, target_operation,
-              geometry1, geometry2, strategy.side()); // TODO: pass strategy
-
         detail::overlay::cleanup_clusters(turns, clusters);
+        detail::overlay::colocate_clusters(clusters, turns);
     }
 
     // After cleaning up clusters assign the next turns
@@ -513,9 +534,15 @@ inline void enrich_intersection_points(Turns& turns,
     }
 
 #ifdef BOOST_GEOMETRY_DEBUG_ENRICH
-    //detail::overlay::check_graph(turns, for_operation);
+    constexpr bool do_check_graph = true;
+#else
+    constexpr bool do_check_graph = false;
 #endif
 
+    if BOOST_GEOMETRY_CONSTEXPR (do_check_graph)
+    {
+        detail::overlay::check_graph(turns, target_operation);
+    }
 }
 
 }} // namespace boost::geometry
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/follow.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/follow.hpp
index d94560541..133f1c93f 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/follow.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/follow.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2022.
-// Modifications copyright (c) 2014-2022 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -220,8 +221,7 @@ struct action_selector<overlay_intersection, RemoveSpikes>
         typename LineString,
         typename Point,
         typename Operation,
-        typename Strategy,
-        typename RobustPolicy
+        typename Strategy
     >
     static inline void enter(LineStringOut& current_piece,
                 LineString const& ,
@@ -229,7 +229,6 @@ struct action_selector<overlay_intersection, RemoveSpikes>
                 signed_size_type , Point const& point,
                 Operation const& operation,
                 Strategy const& strategy,
-                RobustPolicy const& ,
                 OutputIterator& )
     {
         // On enter, append the intersection point and remember starting point
@@ -245,8 +244,7 @@ struct action_selector<overlay_intersection, RemoveSpikes>
         typename LineString,
         typename Point,
         typename Operation,
-        typename Strategy,
-        typename RobustPolicy
+        typename Strategy
     >
     static inline void leave(LineStringOut& current_piece,
                 LineString const& linestring,
@@ -254,7 +252,6 @@ struct action_selector<overlay_intersection, RemoveSpikes>
                 signed_size_type index, Point const& point,
                 Operation const& ,
                 Strategy const& strategy,
-                RobustPolicy const& robust_policy,
                 OutputIterator& out)
     {
         // On leave, copy all segments from starting point, append the intersection point
@@ -262,7 +259,7 @@ struct action_selector<overlay_intersection, RemoveSpikes>
         detail::copy_segments::copy_segments_linestring
             <
                 false, RemoveSpikes
-            >::apply(linestring, segment_id, index, strategy, robust_policy, current_piece);
+            >::apply(linestring, segment_id, index, strategy, current_piece);
         detail::overlay::append_no_duplicates(current_piece, point, strategy);
         if (::boost::size(current_piece) > 1)
         {
@@ -309,8 +306,7 @@ struct action_selector<overlay_difference, RemoveSpikes>
         typename LineString,
         typename Point,
         typename Operation,
-        typename Strategy,
-        typename RobustPolicy
+        typename Strategy
     >
     static inline void enter(LineStringOut& current_piece,
                 LineString const& linestring,
@@ -318,11 +314,10 @@ struct action_selector<overlay_difference, RemoveSpikes>
                 signed_size_type index, Point const& point,
                 Operation const& operation,
                 Strategy const& strategy,
-                RobustPolicy const& robust_policy,
                 OutputIterator& out)
     {
         normal_action::leave(current_piece, linestring, segment_id, index,
-                    point, operation, strategy, robust_policy, out);
+                    point, operation, strategy, out);
     }
 
     template
@@ -332,8 +327,7 @@ struct action_selector<overlay_difference, RemoveSpikes>
         typename LineString,
         typename Point,
         typename Operation,
-        typename Strategy,
-        typename RobustPolicy
+        typename Strategy
     >
     static inline void leave(LineStringOut& current_piece,
                 LineString const& linestring,
@@ -341,11 +335,10 @@ struct action_selector<overlay_difference, RemoveSpikes>
                 signed_size_type index, Point const& point,
                 Operation const& operation,
                 Strategy const& strategy,
-                RobustPolicy const& robust_policy,
                 OutputIterator& out)
     {
         normal_action::enter(current_piece, linestring, segment_id, index,
-                    point, operation, strategy, robust_policy, out);
+                    point, operation, strategy, out);
     }
 
     template
@@ -412,13 +405,11 @@ public :
     <
         typename Turns,
         typename OutputIterator,
-        typename RobustPolicy,
         typename Strategy
     >
     static inline OutputIterator apply(LineString const& linestring, Polygon const& polygon,
                 detail::overlay::operation_type ,  // TODO: this parameter might be redundant
                 Turns& turns,
-                RobustPolicy const& robust_policy,
                 OutputIterator out,
                 Strategy const& strategy)
     {
@@ -464,7 +455,7 @@ public :
                 entered = true;
                 action::enter(current_piece, linestring, current_segment_id,
                     op.seg_id.segment_index, turn.point, op,
-                    strategy, robust_policy,
+                    strategy,
                     linear::get(out));
             }
             else if (following::is_leaving(turn, op, entered, first, linestring, polygon, strategy))
@@ -474,7 +465,7 @@ public :
                 entered = false;
                 action::leave(current_piece, linestring, current_segment_id,
                     op.seg_id.segment_index, turn.point, op,
-                    strategy, robust_policy,
+                    strategy,
                     linear::get(out));
             }
             else if (BOOST_GEOMETRY_CONDITION(FollowIsolatedPoints)
@@ -499,7 +490,7 @@ public :
                 >::apply(linestring,
                          current_segment_id,
                          static_cast<signed_size_type>(boost::size(linestring) - 1),
-                         strategy, robust_policy,
+                         strategy,
                          current_piece);
         }
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
index 5d1577c48..1a6cd2800 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// Copyright (c) 2014-2020, Oracle and/or its affiliates.
-
+// Copyright (c) 2014-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -212,9 +212,6 @@ class follow_linestring_linear
                  OutputIterator oit,
                  SideStrategy const& strategy)
     {
-        // We don't rescale linear/linear
-        detail::no_rescale_policy robust_policy;
-
         if ( is_entering(*it, *op_it) )
         {
             detail::turns::debug_turn(*it, *op_it, "-> Entering");
@@ -226,7 +223,7 @@ class follow_linestring_linear
                               linestring,
                               current_segment_id,
                               op_it->seg_id.segment_index,
-                              it->point, *op_it, strategy, robust_policy,
+                              it->point, *op_it, strategy,
                               linear::get(oit));
             }
             ++enter_count;
@@ -243,7 +240,7 @@ class follow_linestring_linear
                               linestring,
                               current_segment_id,
                               op_it->seg_id.segment_index,
-                              it->point, *op_it, strategy, robust_policy,
+                              it->point, *op_it, strategy,
                               linear::get(oit));
             }
         }
@@ -284,9 +281,6 @@ class follow_linestring_linear
     {
         if ( action::is_entered(entered) )
         {
-            // We don't rescale linear/linear
-            detail::no_rescale_policy robust_policy;
-
             detail::copy_segments::copy_segments_linestring
                 <
                     false, false // do not reverse; do not remove spikes
@@ -294,7 +288,6 @@ class follow_linestring_linear
                          current_segment_id,
                          static_cast<signed_size_type>(boost::size(linestring) - 1),
                          strategy,
-                         robust_policy,
                          current_piece);
         }
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_clusters.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_clusters.hpp
index 5d6badfd5..783acc847 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_clusters.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_clusters.hpp
@@ -2,6 +2,10 @@
 
 // Copyright (c) 2021 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2024.
+// Modifications copyright (c) 2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -17,14 +21,9 @@
 #include <boost/geometry/algorithms/detail/overlay/approximately_equals.hpp>
 #include <boost/geometry/algorithms/detail/overlay/cluster_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
-#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/geometry/util/math.hpp>
 
-#define BOOST_GEOMETRY_USE_RESCALING_IN_GET_CLUSTERS
-
-
 namespace boost { namespace geometry
 {
 
@@ -32,7 +31,7 @@ namespace boost { namespace geometry
 namespace detail { namespace overlay
 {
 
-template <typename Tag = no_rescale_policy_tag, bool Integral = false>
+template <bool Integral = false>
 struct sweep_equal_policy
 {
 
@@ -58,7 +57,7 @@ struct sweep_equal_policy
 };
 
 template <>
-struct sweep_equal_policy<no_rescale_policy_tag, true>
+struct sweep_equal_policy<true>
 {
     template <typename P>
     static inline bool equals(P const& p1, P const& p2)
@@ -74,26 +73,6 @@ struct sweep_equal_policy<no_rescale_policy_tag, true>
     }
 };
 
-#ifdef BOOST_GEOMETRY_USE_RESCALING_IN_GET_CLUSTERS
-template <>
-struct sweep_equal_policy<rescale_policy_tag, true>
-{
-    template <typename P>
-    static inline bool equals(P const& p1, P const& p2)
-    {
-        // Neighbouring cells in the "integer grid" are considered as equal
-        return math::abs(geometry::get<0>(p1) - geometry::get<0>(p2)) <= 1
-            && math::abs(geometry::get<1>(p1) - geometry::get<1>(p2)) <= 1;
-    }
-
-    template <typename T>
-    static inline bool exceeds(T value)
-    {
-        return value > 1;
-    }
-};
-#endif
-
 template <typename Point>
 struct turn_with_point
 {
@@ -112,29 +91,16 @@ struct cluster_with_point
 template
 <
     typename Turns,
-    typename Clusters,
-    typename RobustPolicy
+    typename Clusters
 >
-inline void get_clusters(Turns& turns, Clusters& clusters,
-                         RobustPolicy const& robust_policy)
+inline void get_clusters(Turns& turns, Clusters& clusters)
 {
     using turn_type = typename boost::range_value<Turns>::type;
     using cluster_type = typename Clusters::mapped_type;
-
-#ifdef BOOST_GEOMETRY_USE_RESCALING_IN_GET_CLUSTERS
-    // For now still use robust points for rescaled, otherwise points do not match
-    using point_type = typename geometry::robust_point_type
-    <
-        typename turn_type::point_type,
-        RobustPolicy
-    >::type;
-#else
     using point_type = typename turn_type::point_type;
-#endif
 
     sweep_equal_policy
         <
-            typename rescale_policy_type<RobustPolicy>::type,
             std::is_integral<typename coordinate_type<point_type>::type>::value
         > equal_policy;
 
@@ -144,13 +110,7 @@ inline void get_clusters(Turns& turns, Clusters& clusters,
     {
         if (! turn.discarded)
         {
-#ifdef BOOST_GEOMETRY_USE_RESCALING_IN_GET_CLUSTERS
-            point_type pnt;
-            geometry::recalculate(pnt, turn.point, robust_policy);
-            points.push_back({turn_index, pnt});
-#else
             points.push_back({turn_index, turn.point});
-#endif
         }
         turn_index++;
     }
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
index f0e3dbced..9085387c1 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -22,7 +22,6 @@
 
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
 
 #include <boost/geometry/geometries/segment.hpp>
 
@@ -48,23 +47,14 @@ struct get_turn_without_info
         typename UniqueSubRange1,
         typename UniqueSubRange2,
         typename Strategy,
-        typename RobustPolicy,
         typename OutputIterator
     >
     static inline OutputIterator apply(UniqueSubRange1 const& range_p,
                 UniqueSubRange2 const& range_q,
                 TurnInfo const& ,
                 Strategy const& strategy,
-                RobustPolicy const& ,
                 OutputIterator out)
     {
-        // Make sure this is only called with no rescaling
-        BOOST_STATIC_ASSERT((std::is_same
-           <
-               no_rescale_policy_tag,
-               typename rescale_policy_type<RobustPolicy>::type
-           >::value));
-
         typedef typename TurnInfo::point_type turn_point_type;
 
         typedef policies::relate::segments_intersection_points
@@ -96,13 +86,11 @@ template
 <
     typename Geometry1,
     typename Geometry2,
-    typename RobustPolicy,
     typename Turns,
     typename Strategy
 >
 inline void get_intersection_points(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
-            RobustPolicy const& robust_policy,
             Turns& turns,
             Strategy const& strategy)
 {
@@ -110,8 +98,8 @@ inline void get_intersection_points(Geometry1 const& geometry1,
 
     typedef detail::get_intersection_points::get_turn_without_info
                         <
-                            typename point_type<Geometry1>::type,
-                            typename point_type<Geometry2>::type,
+                            point_type_t<Geometry1>,
+                            point_type_t<Geometry2>,
                             typename boost::range_value<Turns>::type
                         > TurnPolicy;
 
@@ -139,7 +127,6 @@ inline void get_intersection_points(Geometry1 const& geometry1,
         >::apply(0, geometry1,
                  1, geometry2,
                  strategy,
-                 robust_policy,
                  turns, interrupt_policy);
 }
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
index 0fa6bdbd1..e61ad7286 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
@@ -1,10 +1,11 @@
 // Boost.Geometry
 
 // Copyright (c) 2007-2023 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2015-2022.
-// Modifications copyright (c) 2015-2022 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -27,7 +28,7 @@
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 
 namespace boost { namespace geometry
@@ -76,17 +77,10 @@ struct policy_verify_all
     static bool const use_handle_imperfect_touch = true;
 };
 
-
-#if defined(BOOST_GEOMETRY_USE_RESCALING)
-using verify_policy_aa = policy_verify_nothing;
-#else
 using verify_policy_aa = policy_verify_all;
-#endif
-
 using verify_policy_ll = policy_verify_nothing;
 using verify_policy_la = policy_verify_nothing;
 
-
 struct base_turn_handler
 {
     // Returns true if both sides are opposite
@@ -138,8 +132,8 @@ struct base_turn_handler
         BOOST_GEOMETRY_ASSERT(index < info.count);
 
         geometry::convert(info.intersections[index], ti.point);
-        ti.operations[0].fraction = info.fractions[index].robust_ra;
-        ti.operations[1].fraction = info.fractions[index].robust_rb;
+        ti.operations[0].fraction = info.fractions[index].ra;
+        ti.operations[1].fraction = info.fractions[index].rb;
     }
 
     template <typename TurnInfo, typename IntersectionInfo, typename DirInfo>
@@ -170,8 +164,8 @@ struct base_turn_handler
             }
             else
             {
-                ti.operations[i].fraction = i == 0 ? info.fractions[index].robust_ra
-                                                   : info.fractions[index].robust_rb;
+                ti.operations[i].fraction = i == 0 ? info.fractions[index].ra
+                                                   : info.fractions[index].rb;
             }
         }
     }
@@ -179,7 +173,7 @@ struct base_turn_handler
     template <typename IntersectionInfo>
     static inline unsigned int non_opposite_to_index(IntersectionInfo const& info)
     {
-        return info.fractions[0].robust_rb < info.fractions[1].robust_rb
+        return info.fractions[0].rb < info.fractions[1].rb
             ? 1 : 0;
     }
 
@@ -286,7 +280,7 @@ struct turn_info_verification_functions
             std::size_t index_p, std::size_t index_q,
             TurnInfo& ti)
     {
-        if (BOOST_GEOMETRY_CONDITION(VerifyPolicy::use_side_verification))
+        if BOOST_GEOMETRY_CONSTEXPR (VerifyPolicy::use_side_verification)
         {
             set_both_verified<IndexP, IndexQ>(range_p, range_q, umbrella_strategy,
                                               index_p, index_q, ti);
@@ -309,29 +303,29 @@ struct turn_info_verification_functions
                                     UmbrellaStrategy const& umbrella_strategy,
                                     int index_p, int index_q)
     {
-        if (side == 0
-            && BOOST_GEOMETRY_CONDITION(VerifyPolicy::use_side_verification))
+        if BOOST_GEOMETRY_CONSTEXPR (VerifyPolicy::use_side_verification)
         {
-            if (index_p >= 1 && range_p.is_last_segment())
+            if (side == 0)
             {
-                return 0;
-            }
-            if (index_q >= 2 && range_q.is_last_segment())
-            {
-                return 0;
-            }
+                if (index_p >= 1 && range_p.is_last_segment())
+                {
+                    return 0;
+                }
+                if (index_q >= 2 && range_q.is_last_segment())
+                {
+                    return 0;
+                }
 
-            auto const dm = get_distance_measure(range_p.at(index_p),
-                                                 range_p.at(index_p + 1),
-                                                 range_q.at(index_q),
-                                                 umbrella_strategy);
-            static decltype(dm.measure) const zero = 0;
-            return dm.measure == zero ? 0 : dm.measure > zero ? 1 : -1;
-        }
-        else
-        {
-            return side;
+                auto const dm = get_distance_measure(range_p.at(index_p),
+                                                     range_p.at(index_p + 1),
+                                                     range_q.at(index_q),
+                                                     umbrella_strategy);
+                static decltype(dm.measure) const zero = 0;
+                return dm.measure == zero ? 0 : dm.measure > zero ? 1 : -1;
+            }
         }
+
+        return side;
     }
 
 };
@@ -349,50 +343,70 @@ struct touch_interior : public base_turn_handler
     template
     <
         typename IntersectionInfo,
-        typename UniqueSubRange
+        typename SideCalculator,
+        typename UniqueSubRange1,
+        typename UniqueSubRange2
     >
     static bool handle_as_touch(IntersectionInfo const& info,
-                                UniqueSubRange const& non_touching_range)
+                                SideCalculator const& side,
+                                UniqueSubRange1 const& non_touching_range,
+                                UniqueSubRange2 const& other_range)
     {
-        if (! BOOST_GEOMETRY_CONDITION(VerifyPolicy::use_handle_as_touch))
+        if BOOST_GEOMETRY_CONSTEXPR (! VerifyPolicy::use_handle_as_touch)
         {
             return false;
         }
+        else // else prevents unreachable code warning
+        {
+            bool const has_k = ! non_touching_range.is_last_segment()
+                && ! other_range.is_last_segment();
+            if (has_k
+                && (same(side.pj_wrt_q1(), side.qj_wrt_p2())
+                 || same(side.pj_wrt_q2(), side.qj_wrt_p1())))
+            {
+                // At a touch, the touching points (pj and qj) should be collinear
+                // with both other segments.
+                // If that is not the case (both left or both right), it should not be handled as a touch,
+                // (though the intersection point might be close to the end),
+                // because segments might cross each other or touch the other in the middle.
+                return false;
+            }
+
+            //
+            //
+            //                         ^  Q(i)                ^ P(i)
+            //                          \                    /
+            //                           \                  /
+            //                            \                /
+            //                             \              /
+            //                              \            /
+            //                               \          /
+            //                                \        /
+            //                                 \      /
+            //                                  \    /
+            //                                   \  / it is about buffer_rt_r
+            //                  P(k)              v/  they touch here "in the middle", but at the intersection...
+            //                  <---------------->v   there is no follow up IP
+            //                                   /
+            //                                  /
+            //                                 /
+            //                                /
+            //                               /
+            //                              /
+            //                             v Q(k)
+            //
 
-        //
-        //
-        //                         ^  Q(i)                ^ P(i)
-        //                          \                    /
-        //                           \                  /
-        //                            \                /
-        //                             \              /
-        //                              \            /
-        //                               \          /
-        //                                \        /
-        //                                 \      /
-        //                                  \    /
-        //                                   \  / it is about buffer_rt_r
-        //                  P(k)              v/  they touch here "in the middle", but at the intersection...
-        //                  <---------------->v   there is no follow up IP
-        //                                   /
-        //                                  /
-        //                                 /
-        //                                /
-        //                               /
-        //                              /
-        //                             v Q(k)
-        //
-
-        // Measure where the IP is located. If it is really close to the end,
-        // then there is no space for the next IP (on P(1)/Q(2). A "from"
-        // intersection will be generated, but those are never handled.
-        // Therefore handle it as a normal touch (two segments arrive at the
-        // intersection point). It currently checks for zero, but even a
-        // distance a little bit larger would do.
-        auto const dm = fun::distance_measure(info.intersections[0], non_touching_range.at(1));
-        decltype(dm) const zero = 0;
-        bool const result = math::equals(dm, zero);
-        return result;
+            // Measure where the IP is located. If it is really close to the end,
+            // then there is no space for the next IP (on P(1)/Q(2). A "from"
+            // intersection will be generated, but those are never handled.
+            // Therefore handle it as a normal touch (two segments arrive at the
+            // intersection point). It currently checks for zero, but even a
+            // distance a little bit larger would do.
+            auto const dm = fun::distance_measure(info.intersections[0], non_touching_range.at(1));
+            decltype(dm) const zero = 0;
+            bool const result = math::equals(dm, zero);
+            return result;
+        }
     }
 
     // Index: 0, P is the interior, Q is touching and vice versa
@@ -561,65 +575,75 @@ struct touch : public base_turn_handler
                                               UmbrellaStrategy const& umbrella_strategy,
                                               TurnInfo& ti)
     {
-        if (! BOOST_GEOMETRY_CONDITION(VerifyPolicy::use_handle_imperfect_touch))
+        if BOOST_GEOMETRY_CONSTEXPR (! VerifyPolicy::use_handle_imperfect_touch)
         {
             return false;
         }
-
-        //  Q
-        //  ^
-        // ||
-        // ||
-        // |^----
-        // >----->P
-        // *            * they touch here (P/Q are (nearly) on top)
-        //
-        // Q continues from where P comes.
-        // P continues from where Q comes
-        // This is often a blocking situation,
-        // unless there are FP issues: there might be a distance
-        // between Pj and Qj, in that case handle it as a union.
-        //
-        // Exaggerated:
-        //  Q
-        //  ^           Q is nearly vertical
-        //   \          but not completely - and still ends above P
-        // |  \qj       In this case it should block P and
-        // |  ^------   set Q to Union
-        // >----->P     qj is LEFT of P1 and pi is LEFT of Q2
-        //              (the other way round is also possible)
-
-        auto has_distance = [&](auto const& r1, auto const& r2) -> bool
+        else // else prevents unreachable code warning
         {
-            auto const d1 = get_distance_measure(r1.at(0), r1.at(1), r2.at(1), umbrella_strategy);
-            auto const d2 = get_distance_measure(r2.at(1), r2.at(2), r1.at(0), umbrella_strategy);
-            return d1.measure > 0 && d2.measure > 0;
-        };
+            //  Q
+            //  ^
+            // ||
+            // ||
+            // |^----
+            // >----->P
+            // *            * they touch here (P/Q are (nearly) on top of each other)
+            //
+            // Q continues from where P comes.
+            // P continues from where Q comes
+            // This is often a blocking situation,
+            // unless there are FP issues: there might be a distance
+            // between Pj and Qj, in that case handle it as a union.
+            //
+            // Exaggerated:
+            //  Q
+            //  ^           Q is nearly vertical
+            //   \          but not completely - and still ends above P
+            // |  \qj       In this case it should block P and
+            // |  ^------   set Q to Union
+            // >----->P     qj is LEFT of P1 and pi is LEFT of Q2
+            //              (the other way round is also possible)
+
+            // There are also cases like this:
+            //      P
+            //      ^
+            //      ||
+            //      ||
+            // P----^-----<Q
+            // This code is not for these cases because of the condition opposite(side.pi_wrt_q1(), side.qk_wrt_p2())
+
+            auto has_distance = [&](auto const& r1, auto const& r2) -> bool
+            {
+                auto const d1 = get_distance_measure(r1.at(0), r1.at(1), r2.at(1), umbrella_strategy);
+                auto const d2 = get_distance_measure(r2.at(1), r2.at(2), r1.at(0), umbrella_strategy);
+                return d1.measure > 0 && d2.measure > 0;
+            };
 
-        if (side_pk_q2 == -1 && has_distance(range_p, range_q))
-        {
-            // Even though there is a touch, Q(j) is left of P1
-            // and P(i) is still left from Q2.
-            // Q continues to the right.
-            // It can continue.
-            ti.operations[0].operation = operation_blocked;
-            // Q turns right -> union (both independent),
-            // Q turns left -> intersection
-            ti.operations[1].operation = operation_union;
-            ti.touch_only = true;
-            return true;
-        }
+            if (side_pk_q2 == -1 && has_distance(range_p, range_q))
+            {
+                // Even though there is a touch, Q(j) is left of P1
+                // and P(i) is still left from Q2.
+                // Q continues to the right.
+                // It can continue.
+                ti.operations[0].operation = operation_blocked;
+                // Q turns right -> union (both independent),
+                // Q turns left -> intersection
+                ti.operations[1].operation = operation_union;
+                ti.touch_only = true;
+                return true;
+            }
 
-        if (side_pk_q2 == 1 && has_distance(range_q, range_p))
-        {
-            // Similarly, but the other way round.
-            // Q continues to the left.
-            ti.operations[0].operation = operation_union;
-            ti.operations[1].operation = operation_blocked;
-            ti.touch_only = true;
-            return true;
+            if (side_pk_q2 == 1 && has_distance(range_q, range_p))
+            {
+                // Similarly, but the other way round.
+                // Q continues to the left.
+                ti.operations[0].operation = operation_union;
+                ti.operations[1].operation = operation_blocked;
+                ti.touch_only = true;
+                return true;
+            }
+            return false;
         }
-        return false;
     }
 
     template
@@ -676,6 +700,7 @@ struct touch : public base_turn_handler
             {
                 if (side_qk_p1 == 0 && side_pk_q1 == 0
                     && has_pk && has_qk
+                    && opposite(side.pi_wrt_q1(), side.qk_wrt_p2())
                     && handle_imperfect_touch(range_p, range_q, side_pk_q2, umbrella_strategy, ti))
                 {
                     // If q continues collinearly (opposite) with p, it should be blocked
@@ -915,39 +940,40 @@ struct start : public base_turn_handler
                 SideCalculator const& side,
                 UmbrellaStrategy const& )
     {
-        if (! BOOST_GEOMETRY_CONDITION(VerifyPolicy::use_start_turn))
+        if BOOST_GEOMETRY_CONSTEXPR (! VerifyPolicy::use_start_turn)
         {
             return false;
         }
+        else // else prevents unreachable code warning
+        {
+            // Start turns have either how_a = -1, or how_b = -1 (either p leaves or q leaves)
+            BOOST_GEOMETRY_ASSERT(dir_info.how_a != dir_info.how_b);
+            BOOST_GEOMETRY_ASSERT(dir_info.how_a == -1 || dir_info.how_b == -1);
+            BOOST_GEOMETRY_ASSERT(dir_info.how_a == 0 || dir_info.how_b == 0);
 
-        // Start turns have either how_a = -1, or how_b = -1 (either p leaves or q leaves)
-        BOOST_GEOMETRY_ASSERT(dir_info.how_a != dir_info.how_b);
-        BOOST_GEOMETRY_ASSERT(dir_info.how_a == -1 || dir_info.how_b == -1);
-        BOOST_GEOMETRY_ASSERT(dir_info.how_a == 0 || dir_info.how_b == 0);
+            if (dir_info.how_b == -1)
+            {
+                // p --------------->
+                //             |
+                //             | q         q leaves
+                //             v
+                //
 
-        if (dir_info.how_b == -1)
-        {
-            // p --------------->
-            //             |
-            //             | q         q leaves
-            //             v
-            //
+                int const side_qj_p1 = side.qj_wrt_p1();
+                ui_else_iu(side_qj_p1 == -1, ti);
+            }
+            else if (dir_info.how_a == -1)
+            {
+                // p leaves
+                int const side_pj_q1 = side.pj_wrt_q1();
+                ui_else_iu(side_pj_q1 == 1, ti);
+            }
 
-            int const side_qj_p1 = side.qj_wrt_p1();
-            ui_else_iu(side_qj_p1 == -1, ti);
-        }
-        else if (dir_info.how_a == -1)
-        {
-            // p leaves
-            int const side_pj_q1 = side.pj_wrt_q1();
-            ui_else_iu(side_pj_q1 == 1, ti);
+            // Copy intersection point
+            assign_point_and_correct(ti, method_start, info, dir_info);
+            return true;
         }
-
-        // Copy intersection point
-        assign_point_and_correct(ti, method_start, info, dir_info);
-        return true;
     }
-
 };
 
 
@@ -973,7 +999,7 @@ struct equal_opposite : public base_turn_handler
                 IntersectionInfo const& intersection_info)
     {
         // For equal-opposite segments, normally don't do anything.
-        if (BOOST_GEOMETRY_CONDITION(AssignPolicy::include_opposite))
+        if BOOST_GEOMETRY_CONSTEXPR (AssignPolicy::include_opposite)
         {
             tp.method = method_equal;
             for (unsigned int i = 0; i < 2; i++)
@@ -1010,24 +1036,26 @@ struct collinear : public base_turn_handler
                                 UniqueSubRange2 const& range_q,
                                 DirInfo const& dir_info)
     {
-        if (! BOOST_GEOMETRY_CONDITION(VerifyPolicy::use_handle_as_equal))
+        if BOOST_GEOMETRY_CONSTEXPR (! VerifyPolicy::use_handle_as_equal)
         {
             return false;
         }
-
-        int const arrival_p = dir_info.arrival[0];
-        int const arrival_q = dir_info.arrival[1];
-        if (arrival_p * arrival_q != -1 || info.count != 2)
+        else // else prevents unreachable code warning
         {
-            // Code below assumes that either p or q arrives in the other segment
-            return false;
-        }
+            int const arrival_p = dir_info.arrival[0];
+            int const arrival_q = dir_info.arrival[1];
+            if (arrival_p * arrival_q != -1 || info.count != 2)
+            {
+                // Code below assumes that either p or q arrives in the other segment
+                return false;
+            }
 
-       auto const dm = arrival_p == 1
-              ? fun::distance_measure(info.intersections[1], range_q.at(1))
-              : fun::distance_measure(info.intersections[1], range_p.at(1));
-        decltype(dm) const zero = 0;
-        return math::equals(dm, zero);
+            auto const dm = arrival_p == 1
+                          ? fun::distance_measure(info.intersections[1], range_q.at(1))
+                          : fun::distance_measure(info.intersections[1], range_p.at(1));
+            decltype(dm) const zero = 0;
+            return math::equals(dm, zero);
+        }
     }
 
     /*
@@ -1191,7 +1219,7 @@ private :
                 // two operations blocked, so the whole point does not need
                 // to be generated.
                 // So return false to indicate nothing is to be done.
-                if (BOOST_GEOMETRY_CONDITION(AssignPolicy::include_opposite))
+                if BOOST_GEOMETRY_CONSTEXPR (AssignPolicy::include_opposite)
                 {
                     tp.operations[Index].operation = operation_opposite;
                     blocked = operation_opposite;
@@ -1285,7 +1313,7 @@ private :
             *out++ = tp;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(AssignPolicy::include_opposite))
+        if BOOST_GEOMETRY_CONSTEXPR (AssignPolicy::include_opposite)
         {
             // Handle cases not yet handled above
             if ((arrival_q == -1 && arrival_p == 0)
@@ -1387,7 +1415,6 @@ struct get_turn_info
         typename UniqueSubRange2,
         typename TurnInfo,
         typename UmbrellaStrategy,
-        typename RobustPolicy,
         typename OutputIterator
     >
     static inline OutputIterator apply(
@@ -1395,18 +1422,16 @@ struct get_turn_info
                 UniqueSubRange2 const& range_q,
                 TurnInfo const& tp_model,
                 UmbrellaStrategy const& umbrella_strategy,
-                RobustPolicy const& robust_policy,
                 OutputIterator out)
     {
         typedef intersection_info
             <
                 UniqueSubRange1, UniqueSubRange2,
                 typename TurnInfo::point_type,
-                UmbrellaStrategy,
-                RobustPolicy
+                UmbrellaStrategy
             > inters_info;
 
-        inters_info inters(range_p, range_q, umbrella_strategy, robust_policy);
+        inters_info inters(range_p, range_q, umbrella_strategy);
 
         char const method = inters.d_info().how;
 
@@ -1454,7 +1479,7 @@ struct get_turn_info
             if ( inters.d_info().arrival[1] == 1 )
             {
                 // Q arrives
-                if (handler::handle_as_touch(inters.i_info(), range_p))
+                if (handler::handle_as_touch(inters.i_info(), inters.sides(), range_p, range_q))
                 {
                     handle_as_touch = true;
                 }
@@ -1468,7 +1493,7 @@ struct get_turn_info
             else
             {
                 // P arrives, swap p/q
-                if (handler::handle_as_touch(inters.i_info(), range_q))
+                if (handler::handle_as_touch(inters.i_info(), inters.swapped_sides(), range_q, range_p))
                 {
                     handle_as_touch = true;
                 }
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
index 007ada0f2..229277abe 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -19,7 +19,6 @@
 #include <boost/geometry/algorithms/detail/equals/point_point.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
 #include <boost/geometry/core/assert.hpp>
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
 
 namespace boost { namespace geometry {
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
index 00a6004f2..12db5ac8e 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -16,10 +16,8 @@
 
 #include <boost/geometry/algorithms/detail/direction_code.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 #include <boost/geometry/core/assert.hpp>
 #include <boost/geometry/policies/relate/intersection_policy.hpp>
-#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
 #include <boost/geometry/strategies/intersection_result.hpp>
 
 namespace boost { namespace geometry {
@@ -60,6 +58,13 @@ struct side_calculator
         , m_range_q(range_q)
     {}
 
+    inline int pi_wrt_q1() const { return m_side_strategy.apply(get_qi(), get_qj(), get_pi()); }
+
+    inline int pj_wrt_q1() const { return m_side_strategy.apply(get_qi(), get_qj(), get_pj()); }
+    inline int pj_wrt_q2() const { return m_side_strategy.apply(get_qj(), get_qk(), get_pj()); }
+    inline int qj_wrt_p1() const { return m_side_strategy.apply(get_pi(), get_pj(), get_qj()); }
+    inline int qj_wrt_p2() const { return m_side_strategy.apply(get_pj(), get_pk(), get_qj()); }
+
     inline int pk_wrt_p1() const { return m_side_strategy.apply(get_pi(), get_pj(), get_pk()); }
     inline int pk_wrt_q1() const { return m_side_strategy.apply(get_qi(), get_qj(), get_pk()); }
     inline int qk_wrt_p1() const { return m_side_strategy.apply(get_pi(), get_pj(), get_qk()); }
@@ -68,12 +73,6 @@ struct side_calculator
     inline int pk_wrt_q2() const { return m_side_strategy.apply(get_qj(), get_qk(), get_pk()); }
     inline int qk_wrt_p2() const { return m_side_strategy.apply(get_pj(), get_pk(), get_qk()); }
 
-    // Necessary when rescaling turns off:
-    inline int qj_wrt_p1() const { return m_side_strategy.apply(get_pi(), get_pj(), get_qj()); }
-    inline int qj_wrt_p2() const { return m_side_strategy.apply(get_pj(), get_pk(), get_qj()); }
-    inline int pj_wrt_q1() const { return m_side_strategy.apply(get_qi(), get_qj(), get_pj()); }
-    inline int pj_wrt_q2() const { return m_side_strategy.apply(get_qj(), get_qk(), get_pj()); }
-
     inline auto const& get_pi() const { return m_range_p.at(0); }
     inline auto const& get_pj() const { return m_range_p.at(1); }
     inline auto const& get_pk() const { return m_range_p.at(2); }
@@ -85,246 +84,17 @@ struct side_calculator
     // Used side-strategy, owned by the calculator
     side_strategy_type m_side_strategy;
 
-    // Used ranges - owned by get_turns or (for robust points) by intersection_info_base
+    // Used ranges - owned by get_turns or (for points) by intersection_info_base
     UniqueSubRange1 const& m_range_p;
     UniqueSubRange2 const& m_range_q;
 };
 
-template<typename Point, typename UniqueSubRange, typename RobustPolicy>
-struct robust_subrange_adapter
-{
-    typedef Point point_type;
-
-    robust_subrange_adapter(UniqueSubRange const& unique_sub_range,
-                     Point const& robust_point_i, Point const& robust_point_j,
-                     RobustPolicy const& robust_policy)
-
-        : m_unique_sub_range(unique_sub_range)
-        , m_robust_policy(robust_policy)
-        , m_robust_point_i(robust_point_i)
-        , m_robust_point_j(robust_point_j)
-        , m_k_retrieved(false)
-    {}
-
-    std::size_t size() const { return m_unique_sub_range.size(); }
-
-    //! Get precalculated point
-    Point const& at(std::size_t index) const
-    {
-        BOOST_GEOMETRY_ASSERT(index < size());
-        switch (index)
-        {
-            case 0 : return m_robust_point_i;
-            case 1 : return m_robust_point_j;
-            case 2 : return get_point_k();
-            default : return m_robust_point_i;
-        }
-    }
-
-private :
-    Point const& get_point_k() const
-    {
-        if (! m_k_retrieved)
-        {
-            geometry::recalculate(m_robust_point_k, m_unique_sub_range.at(2), m_robust_policy);
-            m_k_retrieved = true;
-        }
-        return m_robust_point_k;
-    }
-
-    UniqueSubRange const& m_unique_sub_range;
-    RobustPolicy const& m_robust_policy;
-
-    Point const& m_robust_point_i;
-    Point const& m_robust_point_j;
-    mutable Point m_robust_point_k;
-
-    mutable bool m_k_retrieved;
-};
-
-template
-<
-    typename UniqueSubRange1, typename UniqueSubRange2,
-    typename RobustPolicy
->
-struct robust_point_calculator
-{
-    typedef typename geometry::robust_point_type
-        <
-            typename UniqueSubRange1::point_type, RobustPolicy
-        >::type robust_point1_type;
-    typedef typename geometry::robust_point_type
-        <
-            typename UniqueSubRange2::point_type, RobustPolicy
-        >::type robust_point2_type;
-
-    inline robust_point_calculator(UniqueSubRange1 const& range_p,
-                                   UniqueSubRange2 const& range_q,
-                                   RobustPolicy const& robust_policy)
-        : m_robust_policy(robust_policy)
-        , m_range_p(range_p)
-        , m_range_q(range_q)
-        , m_pk_retrieved(false)
-        , m_qk_retrieved(false)
-    {
-        // Calculate pi,pj and qi,qj which are almost always necessary
-        // But don't calculate pk/qk yet, which is retrieved (taking
-        // more time) and not always necessary.
-        geometry::recalculate(m_rpi, range_p.at(0), robust_policy);
-        geometry::recalculate(m_rpj, range_p.at(1), robust_policy);
-        geometry::recalculate(m_rqi, range_q.at(0), robust_policy);
-        geometry::recalculate(m_rqj, range_q.at(1), robust_policy);
-    }
-
-    inline robust_point1_type const& get_rpk() const
-    {
-        if (! m_pk_retrieved)
-        {
-            geometry::recalculate(m_rpk, m_range_p.at(2), m_robust_policy);
-            m_pk_retrieved = true;
-        }
-        return m_rpk;
-    }
-    inline robust_point2_type const& get_rqk() const
-    {
-        if (! m_qk_retrieved)
-        {
-            geometry::recalculate(m_rqk, m_range_q.at(2), m_robust_policy);
-            m_qk_retrieved = true;
-        }
-        return m_rqk;
-    }
-
-    robust_point1_type m_rpi, m_rpj;
-    robust_point2_type m_rqi, m_rqj;
-
-private :
-    RobustPolicy const& m_robust_policy;
-    UniqueSubRange1 const& m_range_p;
-    UniqueSubRange2 const& m_range_q;
-
-    // On retrieval
-    mutable robust_point1_type m_rpk;
-    mutable robust_point2_type m_rqk;
-    mutable bool m_pk_retrieved;
-    mutable bool m_qk_retrieved;
-};
-
-// Default version (empty - specialized below)
-template
-<
-    typename UniqueSubRange1, typename UniqueSubRange2,
-    typename TurnPoint, typename UmbrellaStrategy,
-    typename RobustPolicy,
-    typename Tag = typename rescale_policy_type<RobustPolicy>::type
->
-class intersection_info_base {};
-
-// Version with rescaling, having robust points
-template
-<
-    typename UniqueSubRange1, typename UniqueSubRange2,
-    typename TurnPoint, typename UmbrellaStrategy,
-    typename RobustPolicy
->
-class intersection_info_base<UniqueSubRange1, UniqueSubRange2,
-        TurnPoint, UmbrellaStrategy, RobustPolicy, rescale_policy_tag>
-{
-    typedef robust_point_calculator
-    <
-        UniqueSubRange1, UniqueSubRange2,
-        RobustPolicy
-    >
-    robust_calc_type;
-
-public:
-    typedef segment_intersection_points
-    <
-        TurnPoint,
-        geometry::segment_ratio<boost::long_long_type>
-    > intersection_point_type;
-    typedef policies::relate::segments_intersection_policy
-        <
-            intersection_point_type
-        > intersection_policy_type;
-
-    typedef typename intersection_policy_type::return_type result_type;
-
-    typedef typename robust_calc_type::robust_point1_type robust_point1_type;
-    typedef typename robust_calc_type::robust_point2_type robust_point2_type;
-
-    typedef robust_subrange_adapter<robust_point1_type, UniqueSubRange1, RobustPolicy> robust_subrange1;
-    typedef robust_subrange_adapter<robust_point2_type, UniqueSubRange2, RobustPolicy> robust_subrange2;
-
-    typedef side_calculator
-        <
-            robust_subrange1, robust_subrange2, UmbrellaStrategy
-        > side_calculator_type;
-
-    typedef side_calculator
-        <
-            robust_subrange2, robust_subrange1, UmbrellaStrategy
-        > robust_swapped_side_calculator_type;
-
-    intersection_info_base(UniqueSubRange1 const& range_p,
-                           UniqueSubRange2 const& range_q,
-                           UmbrellaStrategy const& umbrella_strategy,
-                           RobustPolicy const& robust_policy)
-        : m_range_p(range_p)
-        , m_range_q(range_q)
-        , m_robust_calc(range_p, range_q, robust_policy)
-        , m_robust_range_p(range_p, m_robust_calc.m_rpi, m_robust_calc.m_rpj, robust_policy)
-        , m_robust_range_q(range_q, m_robust_calc.m_rqi, m_robust_calc.m_rqj, robust_policy)
-        , m_side_calc(m_robust_range_p, m_robust_range_q, umbrella_strategy)
-        , m_swapped_side_calc(m_robust_range_q, m_robust_range_p, umbrella_strategy)
-        , m_result(umbrella_strategy.relate().apply(range_p, range_q,
-                       intersection_policy_type(),
-                       m_robust_range_p, m_robust_range_q))
-    {}
-
-    inline bool p_is_last_segment() const { return m_range_p.is_last_segment(); }
-    inline bool q_is_last_segment() const { return m_range_q.is_last_segment(); }
-
-    inline robust_point1_type const& rpi() const { return m_robust_calc.m_rpi; }
-    inline robust_point1_type const& rpj() const { return m_robust_calc.m_rpj; }
-    inline robust_point1_type const& rpk() const { return m_robust_calc.get_rpk(); }
-
-    inline robust_point2_type const& rqi() const { return m_robust_calc.m_rqi; }
-    inline robust_point2_type const& rqj() const { return m_robust_calc.m_rqj; }
-    inline robust_point2_type const& rqk() const { return m_robust_calc.get_rqk(); }
-
-    inline side_calculator_type const& sides() const { return m_side_calc; }
-    inline robust_swapped_side_calculator_type const& swapped_sides() const
-    {
-        return m_swapped_side_calc;
-    }
-
-private :
-
-    // Owned by get_turns
-    UniqueSubRange1 const& m_range_p;
-    UniqueSubRange2 const& m_range_q;
-
-    // Owned by this class
-    robust_calc_type m_robust_calc;
-    robust_subrange1 m_robust_range_p;
-    robust_subrange2 m_robust_range_q;
-    side_calculator_type m_side_calc;
-    robust_swapped_side_calculator_type m_swapped_side_calc;
-
-protected :
-    result_type m_result;
-};
-
-// Version without rescaling
 template
 <
     typename UniqueSubRange1, typename UniqueSubRange2,
-    typename TurnPoint, typename UmbrellaStrategy,
-    typename RobustPolicy
+    typename TurnPoint, typename UmbrellaStrategy
 >
-class intersection_info_base<UniqueSubRange1, UniqueSubRange2,
-        TurnPoint, UmbrellaStrategy, RobustPolicy, no_rescale_policy_tag>
+class intersection_info_base
 {
 public:
 
@@ -348,8 +118,7 @@ class intersection_info_base<UniqueSubRange1, UniqueSubRange2,
 
     intersection_info_base(UniqueSubRange1 const& range_p,
                            UniqueSubRange2 const& range_q,
-                           UmbrellaStrategy const& umbrella_strategy,
-                           no_rescale_policy const& )
+                           UmbrellaStrategy const& umbrella_strategy)
         : m_range_p(range_p)
         , m_range_q(range_q)
         , m_side_calc(range_p, range_q, umbrella_strategy)
@@ -393,15 +162,14 @@ template
 <
     typename UniqueSubRange1, typename UniqueSubRange2,
     typename TurnPoint,
-    typename UmbrellaStrategy,
-    typename RobustPolicy
+    typename UmbrellaStrategy
 >
 class intersection_info
     : public intersection_info_base<UniqueSubRange1, UniqueSubRange2,
-        TurnPoint, UmbrellaStrategy, RobustPolicy>
+        TurnPoint, UmbrellaStrategy>
 {
     typedef intersection_info_base<UniqueSubRange1, UniqueSubRange2,
-        TurnPoint, UmbrellaStrategy, RobustPolicy> base;
+        TurnPoint, UmbrellaStrategy> base;
 
 public:
 
@@ -415,11 +183,9 @@ class intersection_info
 
     intersection_info(UniqueSubRange1 const& range_p,
                       UniqueSubRange2 const& range_q,
-                      UmbrellaStrategy const& umbrella_strategy,
-                      RobustPolicy const& robust_policy)
-        : base(range_p, range_q, umbrella_strategy, robust_policy)
+                      UmbrellaStrategy const& umbrella_strategy)
+        : base(range_p, range_q, umbrella_strategy)
         , m_umbrella_strategy(umbrella_strategy)
-        , m_robust_policy(robust_policy)
     {}
 
     inline result_type const& result() const { return base::m_result; }
@@ -530,7 +296,6 @@ class intersection_info
     }
 
     UmbrellaStrategy const& m_umbrella_strategy;
-    RobustPolicy const& m_robust_policy;
 };
 
 }} // namespace detail::overlay
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
index 90e4d0d06..95e6ed669 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
@@ -1,11 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2013-2020.
-// Modifications copyright (c) 2013-2020 Oracle and/or its affiliates.
+// Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -19,7 +19,7 @@
 
 #include <boost/geometry/core/assert.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp>
@@ -45,7 +45,6 @@ struct get_turn_info_linear_areal
         typename UniqueSubRange2,
         typename TurnInfo,
         typename UmbrellaStrategy,
-        typename RobustPolicy,
         typename OutputIterator
     >
     static inline OutputIterator apply(
@@ -53,18 +52,16 @@ struct get_turn_info_linear_areal
                 UniqueSubRange2 const& range_q,
                 TurnInfo const& tp_model,
                 UmbrellaStrategy const& umbrella_strategy,
-                RobustPolicy const& robust_policy,
                 OutputIterator out)
     {
         typedef intersection_info
             <
                 UniqueSubRange1, UniqueSubRange2,
                 typename TurnInfo::point_type,
-                UmbrellaStrategy,
-                RobustPolicy
+                UmbrellaStrategy
             > inters_info;
 
-        inters_info inters(range_p, range_q, umbrella_strategy, robust_policy);
+        inters_info inters(range_p, range_q, umbrella_strategy);
 
         char const method = inters.d_info().how;
 
@@ -216,15 +213,17 @@ struct get_turn_info_linear_areal
                                                      tp.operations[0].operation,
                                                      tp.operations[1].operation);
 
-                    bool ignore_spike
-                        = calculate_spike_operation(tp.operations[0].operation,
-                                                    inters,
-                                                    umbrella_strategy);
+                    bool const ignore_spike = calculate_spike_operation(tp.operations[0].operation,
+                                                                        inters,
+                                                                        umbrella_strategy);
 
-                    if ( ! BOOST_GEOMETRY_CONDITION(handle_spikes)
-                      || ignore_spike
-                      || ! append_opposite_spikes<append_touches>( // for 'i' or 'c' i???
-                                tp, inters, out) )
+                    if BOOST_GEOMETRY_CONSTEXPR (! handle_spikes)
+                    {
+                        *out++ = tp;
+                    }
+                    else if (ignore_spike
+                             // for 'i' or 'c' i???
+                          || ! append_opposite_spikes<append_touches>(tp, inters, out))
                     {
                         *out++ = tp;
                     }
@@ -256,9 +255,12 @@ struct get_turn_info_linear_areal
                         transformer(tp);
 
                         // conditionally handle spikes
-                        if ( ! BOOST_GEOMETRY_CONDITION(handle_spikes)
-                          || ! append_collinear_spikes(tp, inters,
-                                                       method_touch, append_equal, out) )
+                        if BOOST_GEOMETRY_CONSTEXPR (! handle_spikes)
+                        {
+                            *out++ = tp;
+                        }
+                        else if (! append_collinear_spikes(tp, inters, method_touch,
+                                                           append_equal, out))
                         {
                             *out++ = tp; // no spikes
                         }
@@ -319,9 +321,12 @@ struct get_turn_info_linear_areal
                         transformer(tp);
 
                         // conditionally handle spikes
-                        if ( ! BOOST_GEOMETRY_CONDITION(handle_spikes)
-                          || ! append_collinear_spikes(tp, inters,
-                                                       method_replace, version, out) )
+                        if BOOST_GEOMETRY_CONSTEXPR (! handle_spikes)
+                        {
+                            *out++ = tp;
+                        }
+                        else if (! append_collinear_spikes(tp, inters, method_replace,
+                                                           version, out))
                         {
                             // no spikes
                             *out++ = tp;
@@ -333,10 +338,9 @@ struct get_turn_info_linear_areal
                         turn_transformer_ec<false> transformer(method_touch_interior);
 
                         // conditionally handle spikes
-                        if ( BOOST_GEOMETRY_CONDITION(handle_spikes) )
+                        if BOOST_GEOMETRY_CONSTEXPR (handle_spikes)
                         {
-                            append_opposite_spikes<append_collinear_opposite>(
-                                    tp, inters, out);
+                            append_opposite_spikes<append_collinear_opposite>(tp, inters, out);
                         }
 
                         // TODO: ignore for spikes?
@@ -357,7 +361,7 @@ struct get_turn_info_linear_areal
             case '0' :
             {
                 // degenerate points
-                if ( BOOST_GEOMETRY_CONDITION(AssignPolicy::include_degenerate) )
+                if BOOST_GEOMETRY_CONSTEXPR (AssignPolicy::include_degenerate)
                 {
                     only_convert::apply(tp, inters.i_info());
 
@@ -381,9 +385,6 @@ struct get_turn_info_linear_areal
             break;
             default :
             {
-#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
-                std::cout << "TURN: Unknown method: " << method << std::endl;
-#endif
 #if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
                 BOOST_THROW_EXCEPTION(turn_info_exception(method));
 #endif
@@ -542,26 +543,30 @@ struct get_turn_info_linear_areal
             return false;
         }
         else*/
-        if ( is_p_spike )
+        if (is_p_spike)
         {
-            if ( BOOST_GEOMETRY_CONDITION(is_version_touches)
-              || inters.d_info().arrival[0] == 1 )
+            bool output_spike = false;
+            if BOOST_GEOMETRY_CONSTEXPR (is_version_touches)
             {
-                if ( BOOST_GEOMETRY_CONDITION(is_version_touches) )
-                {
-                    tp.operations[0].is_collinear = true;
-                    //tp.operations[1].is_collinear = false;
-                    tp.method = method_touch;
-                }
-                else
-                {
-                    tp.operations[0].is_collinear = true;
-                    //tp.operations[1].is_collinear = false;
+                tp.operations[0].is_collinear = true;
+                //tp.operations[1].is_collinear = false;
+                tp.method = method_touch;
 
-                    BOOST_GEOMETRY_ASSERT(inters.i_info().count > 1);
-                    base_turn_handler::assign_point(tp, method_touch_interior, inters.i_info(), 1);
-                }
+                output_spike = true;
+            }
+            else if (inters.d_info().arrival[0] == 1)
+            {
+                tp.operations[0].is_collinear = true;
+                //tp.operations[1].is_collinear = false;
+
+                BOOST_GEOMETRY_ASSERT(inters.i_info().count > 1);
+                base_turn_handler::assign_point(tp, method_touch_interior, inters.i_info(), 1);
+
+                output_spike = true;
+            }
 
+            if (output_spike)
+            {
                 tp.operations[0].operation = operation_blocked;
                 tp.operations[1].operation = operation_continue; // boundary
                 *out++ = tp;
@@ -636,9 +641,12 @@ struct get_turn_info_linear_areal
             operation_type & op1 = turn.operations[1].operation;
 
             // NOTE: probably only if methods are WRT IPs, not segments!
-            if ( BOOST_GEOMETRY_CONDITION(IsFront)
-              || op0 == operation_intersection || op0 == operation_union
-              || op1 == operation_intersection || op1 == operation_union )
+            if BOOST_GEOMETRY_CONSTEXPR (IsFront)
+            {
+                turn.method = m_method;
+            }
+            else if (op0 == operation_intersection || op0 == operation_union
+                  || op1 == operation_intersection || op1 == operation_union)
             {
                 turn.method = m_method;
             }
@@ -724,145 +732,151 @@ struct get_turn_info_linear_areal
 
         // IP on the first point of Linear Geometry
         bool was_first_point_handled = false;
-        if ( BOOST_GEOMETRY_CONDITION(EnableFirst)
-          && range_p.is_first_segment() && ip0.is_pi && !ip0.is_qi ) // !q0i prevents duplication
+        if BOOST_GEOMETRY_CONSTEXPR (EnableFirst)
         {
-            TurnInfo tp = tp_model;
-            tp.operations[0].position = position_front;
-            tp.operations[1].position = position_middle;
-
-            if ( opposite ) // opposite -> collinear
-            {
-                tp.operations[0].operation = operation_continue;
-                tp.operations[1].operation = operation_union;
-                tp.method = ip0.is_qj ? method_touch : method_touch_interior;
-            }
-            else
+            if (range_p.is_first_segment() && ip0.is_pi && ! ip0.is_qi ) // !q0i prevents duplication
             {
-                auto const sides = strategy.side();
-
-                // pi is the intersection point at qj or in the middle of q1
-                // so consider segments
-                // 1. pi at qj: qi-qj-pj and qi-qj-qk
-                //    x: qi-qj, y: qj-qk, qz: qk
-                // 2. pi in the middle of q1: qi-pi-pj and qi-pi-qj
-                //    x: qi-pi, y: pi-qj, qz: qj
-                //    qi-pi, side the same as WRT q1
-                //    pi-qj, side the same as WRT q1
-                //    qj WRT q1 is 0
-                method_type replaced_method = method_none;
-                int side_pj_y = 0, side_pj_x = 0, side_qz_x = 0;
-                // 1. ip0 or pi at qj
-                if ( ip0.is_qj )
+                TurnInfo tp = tp_model;
+                tp.operations[0].position = position_front;
+                tp.operations[1].position = position_middle;
+
+                if ( opposite ) // opposite -> collinear
                 {
-                    replaced_method = method_touch;
-                    side_pj_y = sides.apply(range_q.at(1), range_q.at(2), range_p.at(1)); // pj wrt q2
-                    side_pj_x = sides.apply(range_q.at(0), range_q.at(1), range_p.at(1)); // pj wrt q1
-                    side_qz_x = sides.apply(range_q.at(0), range_q.at(1), range_q.at(2)); // qk wrt q1
+                    tp.operations[0].operation = operation_continue;
+                    tp.operations[1].operation = operation_union;
+                    tp.method = ip0.is_qj ? method_touch : method_touch_interior;
                 }
-                // 2. ip0 or pi in the middle of q1
                 else
                 {
-                    replaced_method = method_touch_interior;
-                    side_pj_y = sides.apply(range_q.at(0), range_q.at(1), range_p.at(1)); // pj wrt q1
-                    side_pj_x = side_pj_y; // pj wrt q1
-                    side_qz_x = 0; // qj wrt q1
-                }
+                    auto const sides = strategy.side();
+
+                    // pi is the intersection point at qj or in the middle of q1
+                    // so consider segments
+                    // 1. pi at qj: qi-qj-pj and qi-qj-qk
+                    //    x: qi-qj, y: qj-qk, qz: qk
+                    // 2. pi in the middle of q1: qi-pi-pj and qi-pi-qj
+                    //    x: qi-pi, y: pi-qj, qz: qj
+                    //    qi-pi, side the same as WRT q1
+                    //    pi-qj, side the same as WRT q1
+                    //    qj WRT q1 is 0
+                    method_type replaced_method = method_none;
+                    int side_pj_y = 0, side_pj_x = 0, side_qz_x = 0;
+                    // 1. ip0 or pi at qj
+                    if ( ip0.is_qj )
+                    {
+                        replaced_method = method_touch;
+                        side_pj_y = sides.apply(range_q.at(1), range_q.at(2), range_p.at(1)); // pj wrt q2
+                        side_pj_x = sides.apply(range_q.at(0), range_q.at(1), range_p.at(1)); // pj wrt q1
+                        side_qz_x = sides.apply(range_q.at(0), range_q.at(1), range_q.at(2)); // qk wrt q1
+                    }
+                    // 2. ip0 or pi in the middle of q1
+                    else
+                    {
+                        replaced_method = method_touch_interior;
+                        side_pj_y = sides.apply(range_q.at(0), range_q.at(1), range_p.at(1)); // pj wrt q1
+                        side_pj_x = side_pj_y; // pj wrt q1
+                        side_qz_x = 0; // qj wrt q1
+                    }
 
-                std::pair<operation_type, operation_type> operations
-                    = get_info_e::operations_of_equal(side_pj_y, side_pj_x, side_qz_x);
+                    std::pair<operation_type, operation_type> operations
+                        = get_info_e::operations_of_equal(side_pj_y, side_pj_x, side_qz_x);
 
-                tp.operations[0].operation = operations.first;
-                tp.operations[1].operation = operations.second;
+                    tp.operations[0].operation = operations.first;
+                    tp.operations[1].operation = operations.second;
 
-                turn_transformer_ec<true> transformer(replaced_method);
-                transformer(tp);
-            }
+                    turn_transformer_ec<true> transformer(replaced_method);
+                    transformer(tp);
+                }
 
-            // equals<> or collinear<> will assign the second point,
-            // we'd like to assign the first one
-            base_turn_handler::assign_point(tp, tp.method, inters.i_info(), 0);
+                // equals<> or collinear<> will assign the second point,
+                // we'd like to assign the first one
+                base_turn_handler::assign_point(tp, tp.method, inters.i_info(), 0);
 
-            // NOTE: is_collinear is not set for the first endpoint of L
-            // for which there is no preceding segment
-            // here is_p_first_ip == true
-            tp.operations[0].is_collinear = false;
+                // NOTE: is_collinear is not set for the first endpoint of L
+                // for which there is no preceding segment
+                // here is_p_first_ip == true
+                tp.operations[0].is_collinear = false;
 
-            *out++ = tp;
+                *out++ = tp;
 
-            was_first_point_handled = true;
+                was_first_point_handled = true;
+            }
         }
 
         // ANALYSE AND ASSIGN LAST
 
         // IP on the last point of Linear Geometry
-        if ( BOOST_GEOMETRY_CONDITION(EnableLast)
-          && range_p.is_last_segment()
-          && ( ip_count > 1 ? (ip1.is_pj && !ip1.is_qi) : (ip0.is_pj && !ip0.is_qi) ) ) // prevents duplication
+        if BOOST_GEOMETRY_CONSTEXPR (EnableLast)
         {
-            TurnInfo tp = tp_model;
-
-            if ( inters.i_info().count > 1 )
-            {
-                //BOOST_GEOMETRY_ASSERT( result.template get<1>().dir_a == 0 && result.template get<1>().dir_b == 0 );
-                tp.operations[0].is_collinear = true;
-                tp.operations[1].operation = opposite ? operation_continue : operation_union;
-            }
-            else //if ( result.template get<0>().count == 1 )
+            if (range_p.is_last_segment()
+                && (ip_count > 1
+                    ? (ip1.is_pj && ! ip1.is_qi)
+                    : (ip0.is_pj && ! ip0.is_qi))) // prevents duplication
             {
-                auto const sides = strategy.side();
-
-                // pj is the intersection point at qj or in the middle of q1
-                // so consider segments
-                // 1. pj at qj: qi-qj-pi and qi-qj-qk
-                //    x: qi-qj, y: qj-qk, qz: qk
-                // 2. pj in the middle of q1: qi-pj-pi and qi-pj-qj
-                //    x: qi-pj, y: pj-qj, qz: qj
-                //    qi-pj, the side is the same as WRT q1
-                //    pj-qj, the side is the same as WRT q1
-                //    side of qj WRT q1 is 0
-                int side_pi_y = 0, side_pi_x = 0, side_qz_x = 0;
-                // 1. ip0 or pj at qj
-                if ( ip0.is_qj )
+                TurnInfo tp = tp_model;
+
+                if ( inters.i_info().count > 1 )
                 {
-                    side_pi_y = sides.apply(range_q.at(1), range_q.at(2), range_p.at(0)); // pi wrt q2
-                    side_pi_x = sides.apply(range_q.at(0), range_q.at(1), range_p.at(0)); // pi wrt q1
-                    side_qz_x = sides.apply(range_q.at(0), range_q.at(1), range_q.at(2)); // qk wrt q1
+                    //BOOST_GEOMETRY_ASSERT( result.template get<1>().dir_a == 0 && result.template get<1>().dir_b == 0 );
+                    tp.operations[0].is_collinear = true;
+                    tp.operations[1].operation = opposite ? operation_continue : operation_union;
                 }
-                // 2. ip0 or pj in the middle of q1
-                else
+                else //if ( result.template get<0>().count == 1 )
                 {
-                    side_pi_y = sides.apply(range_q.at(0), range_q.at(1), range_p.at(0)); // pi wrt q1
-                    side_pi_x = side_pi_y; // pi wrt q1
-                    side_qz_x = 0; // qj wrt q1
-                }
+                    auto const sides = strategy.side();
+
+                    // pj is the intersection point at qj or in the middle of q1
+                    // so consider segments
+                    // 1. pj at qj: qi-qj-pi and qi-qj-qk
+                    //    x: qi-qj, y: qj-qk, qz: qk
+                    // 2. pj in the middle of q1: qi-pj-pi and qi-pj-qj
+                    //    x: qi-pj, y: pj-qj, qz: qj
+                    //    qi-pj, the side is the same as WRT q1
+                    //    pj-qj, the side is the same as WRT q1
+                    //    side of qj WRT q1 is 0
+                    int side_pi_y = 0, side_pi_x = 0, side_qz_x = 0;
+                    // 1. ip0 or pj at qj
+                    if ( ip0.is_qj )
+                    {
+                        side_pi_y = sides.apply(range_q.at(1), range_q.at(2), range_p.at(0)); // pi wrt q2
+                        side_pi_x = sides.apply(range_q.at(0), range_q.at(1), range_p.at(0)); // pi wrt q1
+                        side_qz_x = sides.apply(range_q.at(0), range_q.at(1), range_q.at(2)); // qk wrt q1
+                    }
+                    // 2. ip0 or pj in the middle of q1
+                    else
+                    {
+                        side_pi_y = sides.apply(range_q.at(0), range_q.at(1), range_p.at(0)); // pi wrt q1
+                        side_pi_x = side_pi_y; // pi wrt q1
+                        side_qz_x = 0; // qj wrt q1
+                    }
 
-                std::pair<operation_type, operation_type> operations
-                    = get_info_e::operations_of_equal(side_pi_y, side_pi_x, side_qz_x);
+                    std::pair<operation_type, operation_type> operations
+                        = get_info_e::operations_of_equal(side_pi_y, side_pi_x, side_qz_x);
 
-                tp.operations[0].operation = operations.first;
-                tp.operations[1].operation = operations.second;
+                    tp.operations[0].operation = operations.first;
+                    tp.operations[1].operation = operations.second;
 
-                turn_transformer_ec<false> transformer(method_none);
-                transformer(tp);
+                    turn_transformer_ec<false> transformer(method_none);
+                    transformer(tp);
 
-                tp.operations[0].is_collinear = tp.both(operation_continue);
-            }
+                    tp.operations[0].is_collinear = tp.both(operation_continue);
+                }
 
-            tp.method = ( ip_count > 1 ? ip1.is_qj : ip0.is_qj ) ? method_touch : method_touch_interior;
-            tp.operations[0].operation = operation_blocked;
-            tp.operations[0].position = position_back;
-            tp.operations[1].position = position_middle;
+                tp.method = ( ip_count > 1 ? ip1.is_qj : ip0.is_qj ) ? method_touch : method_touch_interior;
+                tp.operations[0].operation = operation_blocked;
+                tp.operations[0].position = position_back;
+                tp.operations[1].position = position_middle;
 
-            // equals<> or collinear<> will assign the second point,
-            // we'd like to assign the first one
-            unsigned int ip_index = ip_count > 1 ? 1 : 0;
-            base_turn_handler::assign_point(tp, tp.method, inters.i_info(), ip_index);
+                // equals<> or collinear<> will assign the second point,
+                // we'd like to assign the first one
+                unsigned int ip_index = ip_count > 1 ? 1 : 0;
+                base_turn_handler::assign_point(tp, tp.method, inters.i_info(), ip_index);
 
-            *out++ = tp;
+                *out++ = tp;
 
-            // don't ignore the first IP if the segment is opposite
-            return !( opposite && ip_count > 1 ) || was_first_point_handled;
+                // don't ignore the first IP if the segment is opposite
+                return !( opposite && ip_count > 1 ) || was_first_point_handled;
+            }
         }
 
         // don't ignore anything for now
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
index 6dbd6d682..00349f29c 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
@@ -1,11 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2013, 2014, 2015, 2017, 2018.
-// Modifications copyright (c) 2013-2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -22,7 +22,7 @@
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 namespace boost { namespace geometry {
 
@@ -40,7 +40,6 @@ struct get_turn_info_linear_linear
         typename UniqueSubRange2,
         typename TurnInfo,
         typename UmbrellaStrategy,
-        typename RobustPolicy,
         typename OutputIterator
     >
     static inline OutputIterator apply(
@@ -48,18 +47,16 @@ struct get_turn_info_linear_linear
                 UniqueSubRange2 const& range_q,
                 TurnInfo const& tp_model,
                 UmbrellaStrategy const& umbrella_strategy,
-                RobustPolicy const& robust_policy,
                 OutputIterator out)
     {
         typedef intersection_info
             <
                 UniqueSubRange1, UniqueSubRange2,
                 typename TurnInfo::point_type,
-                UmbrellaStrategy,
-                RobustPolicy
+                UmbrellaStrategy
             > inters_info;
 
-        inters_info inters(range_p, range_q, umbrella_strategy, robust_policy);
+        inters_info inters(range_p, range_q, umbrella_strategy);
 
         char const method = inters.d_info().how;
 
@@ -264,8 +261,11 @@ struct get_turn_info_linear_linear
                                                      tp.operations[0].operation,
                                                      tp.operations[1].operation);
 
-                    if ( ! BOOST_GEOMETRY_CONDITION(handle_spikes)
-                      || ! append_opposite_spikes<append_touches>(tp, inters, out) )
+                    if BOOST_GEOMETRY_CONSTEXPR (! handle_spikes)
+                    {
+                        *out++ = tp;
+                    }
+                    else if (! append_opposite_spikes<append_touches>(tp, inters, out))
                     {
                         *out++ = tp;
                     }
@@ -307,10 +307,12 @@ struct get_turn_info_linear_linear
                         transformer(tp);
 
                         // conditionally handle spikes
-                        if ( ! BOOST_GEOMETRY_CONDITION(handle_spikes)
-                          || ! append_collinear_spikes(tp, inters,
-                                                       method_touch, spike_op,
-                                                       out) )
+                        if BOOST_GEOMETRY_CONSTEXPR (! handle_spikes)
+                        {
+                            *out++ = tp;
+                        }
+                        else if (! append_collinear_spikes(tp, inters, method_touch,
+                                                           spike_op, out))
                         {
                             *out++ = tp; // no spikes
                         }
@@ -381,10 +383,12 @@ struct get_turn_info_linear_linear
                         transformer(tp);
 
                         // conditionally handle spikes
-                        if ( ! BOOST_GEOMETRY_CONDITION(handle_spikes)
-                          || ! append_collinear_spikes(tp, inters,
-                                                       method_replace, spike_op,
-                                                       out) )
+                        if BOOST_GEOMETRY_CONSTEXPR (! handle_spikes)
+                        {
+                            *out++ = tp;
+                        }
+                        else if (! append_collinear_spikes(tp, inters, method_replace,
+                                                           spike_op, out))
                         {
                             // no spikes
                             *out++ = tp;
@@ -396,7 +400,7 @@ struct get_turn_info_linear_linear
                         turn_transformer_ec transformer(method_touch_interior);
 
                         // conditionally handle spikes
-                        if ( BOOST_GEOMETRY_CONDITION(handle_spikes) )
+                        if BOOST_GEOMETRY_CONSTEXPR (handle_spikes)
                         {
                             append_opposite_spikes<append_collinear_opposite>(tp, inters, out);
                         }
@@ -419,7 +423,7 @@ struct get_turn_info_linear_linear
             case '0' :
             {
                 // degenerate points
-                if ( BOOST_GEOMETRY_CONDITION(AssignPolicy::include_degenerate) )
+                if BOOST_GEOMETRY_CONSTEXPR (AssignPolicy::include_degenerate)
                 {
                     only_convert::apply(tp, inters.i_info());
 
@@ -451,9 +455,6 @@ struct get_turn_info_linear_linear
             break;
             default :
             {
-#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
-                std::cout << "TURN: Unknown method: " << method << std::endl;
-#endif
 #if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
                 BOOST_THROW_EXCEPTION(turn_info_exception(method));
 #endif
@@ -553,65 +554,75 @@ struct get_turn_info_linear_linear
 
         bool res = false;
 
-        if ( is_p_spike
-          && ( BOOST_GEOMETRY_CONDITION(is_version_touches)
-            || inters.d_info().arrival[0] == 1 ) )
+        if (is_p_spike)
         {
-            if ( BOOST_GEOMETRY_CONDITION(is_version_touches) )
+            bool output_spike = false;
+            if BOOST_GEOMETRY_CONSTEXPR (is_version_touches)
             {
                 tp.operations[0].is_collinear = true;
                 tp.operations[1].is_collinear = false;
                 tp.method = method_touch;
+
+                output_spike = true;
             }
-            else // Version == append_collinear_opposite
+            else if (inters.d_info().arrival[0] == 1) // Version == append_collinear_opposite
             {
                 tp.operations[0].is_collinear = true;
                 tp.operations[1].is_collinear = false;
 
                 BOOST_GEOMETRY_ASSERT(inters.i_info().count > 1);
-
                 base_turn_handler::assign_point(tp, method_touch_interior,
                                                 inters.i_info(), 1);
+
+                output_spike = true;
             }
 
-            tp.operations[0].operation = operation_blocked;
-            tp.operations[1].operation = operation_intersection;
-            *out++ = tp;
-            tp.operations[0].operation = operation_intersection;
-            //tp.operations[1].operation = operation_intersection;
-            *out++ = tp;
+            if (output_spike)
+            {
+                tp.operations[0].operation = operation_blocked;
+                tp.operations[1].operation = operation_intersection;
+                *out++ = tp;
+                tp.operations[0].operation = operation_intersection;
+                //tp.operations[1].operation = operation_intersection;
+                *out++ = tp;
 
-            res = true;
+                res = true;
+            }
         }
 
-        if ( is_q_spike
-          && ( BOOST_GEOMETRY_CONDITION(is_version_touches)
-            || inters.d_info().arrival[1] == 1 ) )
+        if (is_q_spike)
         {
-            if ( BOOST_GEOMETRY_CONDITION(is_version_touches) )
+            bool output_spike = false;
+            if BOOST_GEOMETRY_CONSTEXPR (is_version_touches)
             {
                 tp.operations[0].is_collinear = false;
                 tp.operations[1].is_collinear = true;
                 tp.method = method_touch;
+
+                output_spike = true;
             }
-            else // Version == append_collinear_opposite
+            else if (inters.d_info().arrival[1] == 1) // Version == append_collinear_opposite
             {
                 tp.operations[0].is_collinear = false;
                 tp.operations[1].is_collinear = true;
 
                 BOOST_GEOMETRY_ASSERT(inters.i_info().count > 0);
-
                 base_turn_handler::assign_point(tp, method_touch_interior, inters.i_info(), 0);
+
+                output_spike = true;
             }
 
-            tp.operations[0].operation = operation_intersection;
-            tp.operations[1].operation = operation_blocked;
-            *out++ = tp;
-            //tp.operations[0].operation = operation_intersection;
-            tp.operations[1].operation = operation_intersection;
-            *out++ = tp;
+            if (output_spike)
+            {
+                tp.operations[0].operation = operation_intersection;
+                tp.operations[1].operation = operation_blocked;
+                *out++ = tp;
+                //tp.operations[0].operation = operation_intersection;
+                tp.operations[1].operation = operation_intersection;
+                *out++ = tp;
 
-            res = true;
+                res = true;
+            }
         }
 
         return res;
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
index b6f8983e3..b8cb1ea01 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2014-2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2021.
-// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -33,7 +34,6 @@
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp>
 #include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
 #include <boost/geometry/algorithms/detail/partition.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 #include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
 #include <boost/geometry/algorithms/detail/sections/section_box_policies.hpp>
 #include <boost/geometry/algorithms/detail/sections/section_functions.hpp>
@@ -45,6 +45,7 @@
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/box.hpp>
@@ -103,8 +104,7 @@ template
     typename Section,
     typename Point,
     typename CircularIterator,
-    typename Strategy,
-    typename RobustPolicy
+    typename Strategy
 >
 struct unique_sub_range_from_section
 {
@@ -113,8 +113,7 @@ struct unique_sub_range_from_section
     unique_sub_range_from_section(Section const& section, signed_size_type index,
                           CircularIterator circular_iterator,
                           Point const& previous, Point const& current,
-                          Strategy const& strategy,
-                          RobustPolicy const& robust_policy)
+                          Strategy const& strategy)
         : m_section(section)
         , m_index(index)
         , m_previous_point(previous)
@@ -122,7 +121,6 @@ struct unique_sub_range_from_section
         , m_circular_iterator(circular_iterator)
         , m_next_point_retrieved(false)
         , m_strategy(strategy)
-        , m_robust_policy(robust_policy)
     {}
 
     inline bool is_first_segment() const
@@ -165,13 +163,6 @@ private :
 
     inline void advance_to_non_duplicate_next(Point const& current, CircularIterator& circular_iterator) const
     {
-        using box_point_type = typename geometry::point_type<typename Section::box_type>::type;
-        using robust_point_type = typename robust_point_type<box_point_type, RobustPolicy>::type;
-        robust_point_type current_robust_point;
-        robust_point_type next_robust_point;
-        geometry::recalculate(current_robust_point, current, m_robust_policy);
-        geometry::recalculate(next_robust_point, *circular_iterator, m_robust_policy);
-
         // To see where the next segments bend to, in case of touch/intersections
         // on end points, we need (in case of degenerate/duplicate points) an extra
         // iterator which moves to the REAL next point, so non duplicate.
@@ -182,12 +173,10 @@ private :
         // So advance to the "non duplicate next"
         // (the check is defensive, to avoid endless loops)
         std::size_t check = 0;
-        while (! detail::disjoint::disjoint_point_point(
-                    current_robust_point, next_robust_point, m_strategy)
+        while (! detail::disjoint::disjoint_point_point(current, *circular_iterator, m_strategy)
                && check++ < m_section.range_count)
         {
             circular_iterator++;
-            geometry::recalculate(next_robust_point, *circular_iterator, m_robust_policy);
         }
     }
 
@@ -198,7 +187,6 @@ private :
     mutable CircularIterator m_circular_iterator;
     mutable bool m_next_point_retrieved;
     Strategy m_strategy;
-    RobustPolicy m_robust_policy;
 };
 
 template
@@ -252,13 +240,12 @@ class get_turns_in_sections
 
 public :
     // Returns true if terminated, false if interrupted
-    template <typename Strategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename Strategy, typename Turns, typename InterruptPolicy>
     static inline bool apply(
             int source_id1, Geometry1 const& geometry1, Section1 const& sec1,
             int source_id2, Geometry2 const& geometry2, Section2 const& sec2,
             bool skip_larger, bool skip_adjacent,
             Strategy const& strategy,
-            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy)
     {
@@ -294,7 +281,7 @@ public :
         range1_iterator prev1, it1, end1;
 
         get_start_point_iterator(sec1, view1, prev1, it1, end1,
-                    index1, ndi1, dir1, sec2.bounding_box, robust_policy);
+                    index1, ndi1, dir1, sec2.bounding_box);
 
         // We need a circular iterator because it might run through the closing point.
         // One circle is actually enough but this one is just convenient.
@@ -305,17 +292,17 @@ public :
         // section 2:    [--------------]
         // section 1: |----|---|---|---|---|
         for (prev1 = it1++, next1++;
-            it1 != end1 && ! detail::section::exceeding<0>(dir1, *prev1, sec1.bounding_box, sec2.bounding_box, robust_policy);
+            it1 != end1 && ! detail::section::exceeding<0>(dir1, *prev1, sec1.bounding_box, sec2.bounding_box);
             ++prev1, ++it1, ++index1, ++next1, ++ndi1)
         {
             unique_sub_range_from_section
                 <
                     areal1, Section1, point1_type, circular1_iterator,
-                    Strategy, RobustPolicy
+                    Strategy
                 > unique_sub_range1(sec1, index1,
                                     circular1_iterator(begin_range_1, end_range_1, next1, true),
                                     *prev1, *it1,
-                                    strategy, robust_policy);
+                                    strategy);
 
             signed_size_type index2 = sec2.begin_index;
             signed_size_type ndi2 = sec2.non_duplicate_index;
@@ -323,12 +310,12 @@ public :
             range2_iterator prev2, it2, end2;
 
             get_start_point_iterator(sec2, view2, prev2, it2, end2,
-                        index2, ndi2, dir2, sec1.bounding_box, robust_policy);
+                        index2, ndi2, dir2, sec1.bounding_box);
             circular2_iterator next2(begin_range_2, end_range_2, it2, true);
             next2++;
 
             for (prev2 = it2++, next2++;
-                it2 != end2 && ! detail::section::exceeding<0>(dir2, *prev2, sec2.bounding_box, sec1.bounding_box, robust_policy);
+                it2 != end2 && ! detail::section::exceeding<0>(dir2, *prev2, sec2.bounding_box, sec1.bounding_box);
                 ++prev2, ++it2, ++index2, ++next2, ++ndi2)
             {
                 bool skip = false;
@@ -364,11 +351,11 @@ public :
                     unique_sub_range_from_section
                         <
                             areal2, Section2, point2_type, circular2_iterator,
-                            Strategy, RobustPolicy
+                            Strategy
                         > unique_sub_range2(sec2, index2,
                                             circular2_iterator(begin_range_2, end_range_2, next2),
                                             *prev2, *it2,
-                                            strategy, robust_policy);
+                                            strategy);
 
                     typedef typename boost::range_value<Turns>::type turn_info;
 
@@ -383,7 +370,7 @@ public :
                     std::size_t const size_before = boost::size(turns);
 
                     TurnPolicy::apply(unique_sub_range1, unique_sub_range2,
-                                      ti, strategy, robust_policy,
+                                      ti, strategy,
                                       std::back_inserter(turns));
 
                     if (InterruptPolicy::enabled)
@@ -410,14 +397,14 @@ private :
     // because of the logistics of "index" (the section-iterator automatically
     // skips to the begin-point, we loose the index or have to recalculate it)
     // So we mimic it here
-    template <typename Range, typename Section, typename Box, typename RobustPolicy>
+    template <typename Range, typename Section, typename Box>
     static inline void get_start_point_iterator(Section const& section,
             Range const& range,
             typename boost::range_iterator<Range const>::type& it,
             typename boost::range_iterator<Range const>::type& prev,
             typename boost::range_iterator<Range const>::type& end,
             signed_size_type& index, signed_size_type& ndi,
-            int dir, Box const& other_bounding_box, RobustPolicy const& robust_policy)
+            int dir, Box const& other_bounding_box)
     {
         it = boost::begin(range) + section.begin_index;
         end = boost::begin(range) + section.end_index + 1;
@@ -425,7 +412,7 @@ private :
         // Mimic section-iterator:
         // Skip to point such that section interects other box
         prev = it++;
-        for(; it != end && detail::section::preceding<0>(dir, *it, section.bounding_box, other_bounding_box, robust_policy);
+        for(; it != end && detail::section::preceding<0>(dir, *it, section.bounding_box, other_bounding_box);
             prev = it++, index++, ndi++)
         {}
         // Go back one step because we want to start completely preceding
@@ -439,7 +426,6 @@ template
     bool Reverse1, bool Reverse2,
     typename TurnPolicy,
     typename Strategy,
-    typename RobustPolicy,
     typename Turns,
     typename InterruptPolicy
 >
@@ -450,20 +436,17 @@ struct section_visitor
     int m_source_id2;
     Geometry2 const& m_geometry2;
     Strategy const& m_strategy;
-    RobustPolicy const& m_rescale_policy;
     Turns& m_turns;
     InterruptPolicy& m_interrupt_policy;
 
     section_visitor(int id1, Geometry1 const& g1,
                     int id2, Geometry2 const& g2,
                     Strategy const& strategy,
-                    RobustPolicy const& robust_policy,
                     Turns& turns,
                     InterruptPolicy& ip)
         : m_source_id1(id1), m_geometry1(g1)
         , m_source_id2(id2), m_geometry2(g2)
         , m_strategy(strategy)
-        , m_rescale_policy(robust_policy)
         , m_turns(turns)
         , m_interrupt_policy(ip)
     {}
@@ -487,7 +470,6 @@ struct section_visitor
                              m_source_id2, m_geometry2, sec2,
                              false, false,
                              m_strategy,
-                             m_rescale_policy,
                              m_turns, m_interrupt_policy);
         }
         return true;
@@ -505,12 +487,11 @@ class get_turns_generic
 {
 
 public:
-    template <typename Strategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename Strategy, typename Turns, typename InterruptPolicy>
     static inline void apply(
             int source_id1, Geometry1 const& geometry1,
             int source_id2, Geometry2 const& geometry2,
             Strategy const& strategy,
-            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy)
     {
@@ -518,21 +499,15 @@ class get_turns_generic
         typedef typename boost::range_value<Turns>::type ip_type;
         typedef typename ip_type::point_type point_type;
 
-        typedef model::box
-            <
-                typename geometry::robust_point_type
-                <
-                    point_type, RobustPolicy
-                >::type
-            > box_type;
+        typedef model::box<point_type> box_type;
         typedef geometry::sections<box_type, 2> sections_type;
 
         sections_type sec1, sec2;
         typedef std::integer_sequence<std::size_t, 0, 1> dimensions;
 
-        geometry::sectionalize<Reverse1, dimensions>(geometry1, robust_policy,
+        geometry::sectionalize<Reverse1, dimensions>(geometry1,
                                                      sec1, strategy, 0);
-        geometry::sectionalize<Reverse2, dimensions>(geometry2, robust_policy,
+        geometry::sectionalize<Reverse2, dimensions>(geometry2,
                                                      sec2, strategy, 1);
 
         // ... and then partition them, intersecting overlapping sections in visitor method
@@ -541,10 +516,10 @@ class get_turns_generic
                 Geometry1, Geometry2,
                 Reverse1, Reverse2,
                 TurnPolicy,
-                Strategy, RobustPolicy,
+                Strategy,
                 Turns, InterruptPolicy
             > visitor(source_id1, geometry1, source_id2, geometry2,
-                      strategy, robust_policy, turns, interrupt_policy);
+                      strategy, turns, interrupt_policy);
 
         geometry::partition
             <
@@ -643,12 +618,11 @@ struct get_turns_cs
         ever_circling_iterator<iterator_type> m_circular_iterator;
     };
 
-    template <typename IntersectionStrategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename IntersectionStrategy, typename Turns, typename InterruptPolicy>
     static inline void apply(
                 int source_id1, Range const& range,
                 int source_id2, Box const& box,
                 IntersectionStrategy const& intersection_strategy,
-                RobustPolicy const& robust_policy,
                 Turns& turns,
                 InterruptPolicy& interrupt_policy,
                 signed_size_type multi_index = -1,
@@ -683,7 +657,6 @@ struct get_turns_cs
                     view_unique_sub_range,
                     box_points,
                     intersection_strategy,
-                    robust_policy,
                     turns,
                     interrupt_policy);
             // Future performance enhancement:
@@ -697,14 +670,12 @@ struct get_turns_cs
     <
         typename IntersectionStrategy,
         typename Turns,
-        typename InterruptPolicy,
-        typename RobustPolicy
+        typename InterruptPolicy
     >
     static inline void get_turns_with_box(segment_identifier const& seg_id, int source_id2,
             unique_sub_range_from_view_policy const& range_unique_sub_range,
             box_array const& box,
             IntersectionStrategy const& intersection_strategy,
-            RobustPolicy const& robust_policy,
             // Output
             Turns& turns,
             InterruptPolicy& interrupt_policy)
@@ -721,25 +692,25 @@ struct get_turns_cs
         unique_sub_range_from_box_policy box_unique_sub_range(box);
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 0);
         TurnPolicy::apply(range_unique_sub_range, box_unique_sub_range,
-                          ti, intersection_strategy, robust_policy,
+                          ti, intersection_strategy,
                           std::back_inserter(turns));
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 1);
         box_unique_sub_range.next();
         TurnPolicy::apply(range_unique_sub_range, box_unique_sub_range,
-                          ti, intersection_strategy, robust_policy,
+                          ti, intersection_strategy,
                           std::back_inserter(turns));
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 2);
         box_unique_sub_range.next();
         TurnPolicy::apply(range_unique_sub_range, box_unique_sub_range,
-                          ti, intersection_strategy, robust_policy,
+                          ti, intersection_strategy,
                           std::back_inserter(turns));
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 3);
         box_unique_sub_range.next();
         TurnPolicy::apply(range_unique_sub_range, box_unique_sub_range,
-                          ti, intersection_strategy, robust_policy,
+                          ti, intersection_strategy,
                           std::back_inserter(turns));
 
         if (InterruptPolicy::enabled)
@@ -760,12 +731,11 @@ template
 >
 struct get_turns_polygon_cs
 {
-    template <typename IntersectionStrategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename IntersectionStrategy, typename Turns, typename InterruptPolicy>
     static inline void apply(
             int source_id1, Polygon const& polygon,
             int source_id2, Box const& box,
             IntersectionStrategy const& intersection_strategy,
-            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy,
             signed_size_type multi_index = -1)
@@ -783,7 +753,6 @@ struct get_turns_polygon_cs
                 source_id1, geometry::exterior_ring(polygon),
                 source_id2, box,
                 intersection_strategy,
-                robust_policy,
                 turns,
                 interrupt_policy,
                 multi_index, -1);
@@ -797,7 +766,6 @@ struct get_turns_polygon_cs
                     source_id1, *it,
                     source_id2, box,
                     intersection_strategy,
-                    robust_policy,
                     turns, interrupt_policy,
                     multi_index, i);
         }
@@ -814,12 +782,11 @@ template
 >
 struct get_turns_multi_polygon_cs
 {
-    template <typename IntersectionStrategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename IntersectionStrategy, typename Turns, typename InterruptPolicy>
     static inline void apply(
             int source_id1, Multi const& multi,
             int source_id2, Box const& box,
             IntersectionStrategy const& intersection_strategy,
-            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy)
     {
@@ -833,7 +800,7 @@ struct get_turns_multi_polygon_cs
                     Reverse, ReverseBox,
                     TurnPolicy
                 >::apply(source_id1, *it, source_id2, box,
-                         intersection_strategy, robust_policy,
+                         intersection_strategy,
                          turns, interrupt_policy, i);
         }
     }
@@ -845,7 +812,7 @@ struct get_turns_multi_polygon_cs
 template <typename Geometry>
 struct topological_tag_base
 {
-    typedef typename tag_cast<typename tag<Geometry>::type, pointlike_tag, linear_tag, areal_tag>::type type;
+    using type = tag_cast_t<tag_t<Geometry>, pointlike_tag, linear_tag, areal_tag>;
 };
 
 template <typename Geometry1, typename Geometry2, typename AssignPolicy,
@@ -986,11 +953,10 @@ template
 >
 struct get_turns_reversed
 {
-    template <typename Strategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename Strategy, typename Turns, typename InterruptPolicy>
     static inline void apply(int source_id1, Geometry1 const& g1,
                              int source_id2, Geometry2 const& g2,
                              Strategy const& strategy,
-                             RobustPolicy const& robust_policy,
                              Turns& turns,
                              InterruptPolicy& interrupt_policy)
     {
@@ -1001,7 +967,7 @@ struct get_turns_reversed
                 Reverse2, Reverse1,
                 TurnPolicy
             >::apply(source_id2, g2, source_id1, g1,
-                     strategy, robust_policy,
+                     strategy,
                      turns, interrupt_policy);
     }
 };
@@ -1020,8 +986,7 @@ struct get_turns_reversed
 \tparam Turns type of turn-container (e.g. vector of "intersection/turn point"'s)
 \param geometry1 \param_geometry
 \param geometry2 \param_geometry
-\param intersection_strategy segments intersection strategy
-\param robust_policy policy to handle robustness issues
+\param strategy segments intersection strategy
 \param turns container which will contain turn points
 \param interrupt_policy policy determining if process is stopped
     when intersection is found
@@ -1033,14 +998,12 @@ template
     typename Geometry1,
     typename Geometry2,
     typename Strategy,
-    typename RobustPolicy,
     typename Turns,
     typename InterruptPolicy
 >
 inline void get_turns(Geometry1 const& geometry1,
                       Geometry2 const& geometry2,
                       Strategy const& strategy,
-                      RobustPolicy const& robust_policy,
                       Turns& turns,
                       InterruptPolicy& interrupt_policy)
 {
@@ -1071,7 +1034,6 @@ inline void get_turns(Geometry1 const& geometry1,
         >::apply(0, geometry1,
                  1, geometry2,
                  strategy,
-                 robust_policy,
                  turns, interrupt_policy);
 }
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
index b41697477..fa5f52c59 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
@@ -1,11 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -37,7 +37,7 @@
 #include <boost/geometry/algorithms/detail/overlay/sort_by_side.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 #if defined(BOOST_GEOMETRY_DEBUG_HANDLE_COLOCATIONS)
 #  include <iostream>
@@ -97,7 +97,6 @@ inline void cleanup_clusters(Turns& turns, Clusters& clusters)
     }
 
     remove_clusters(turns, clusters);
-    colocate_clusters(clusters, turns);
 }
 
 template <typename Turn, typename IndexSet>
@@ -317,16 +316,14 @@ template
     typename Geometry0,
     typename Geometry1,
     typename Turns,
-    typename Clusters,
-    typename RobustPolicy
+    typename Clusters
 >
-inline bool handle_colocations(Turns& turns, Clusters& clusters,
-                               RobustPolicy const& robust_policy)
+inline bool handle_colocations(Turns& turns, Clusters& clusters)
 {
     static const detail::overlay::operation_type target_operation
             = detail::overlay::operation_from_overlay<OverlayType>::value;
 
-    get_clusters(turns, clusters, robust_policy);
+    get_clusters(turns, clusters);
 
     if (clusters.empty())
     {
@@ -339,7 +336,7 @@ inline bool handle_colocations(Turns& turns, Clusters& clusters,
     // on turns which are discarded afterwards
     set_colocation<OverlayType>(turns, clusters);
 
-    if (BOOST_GEOMETRY_CONDITION(target_operation == operation_intersection))
+    if BOOST_GEOMETRY_CONSTEXPR (target_operation == operation_intersection)
     {
         discard_interior_exterior_turns
             <
@@ -427,12 +424,12 @@ template
     typename Clusters,
     typename Geometry1,
     typename Geometry2,
-    typename SideStrategy
+    typename Strategy
 >
 inline void gather_cluster_properties(Clusters& clusters, Turns& turns,
         operation_type for_operation,
         Geometry1 const& geometry1, Geometry2 const& geometry2,
-        SideStrategy const& strategy)
+        Strategy const& strategy)
 {
     typedef typename boost::range_value<Turns>::type turn_type;
     typedef typename turn_type::point_type point_type;
@@ -442,7 +439,7 @@ inline void gather_cluster_properties(Clusters& clusters, Turns& turns,
     // right side
     typedef sort_by_side::side_sorter
         <
-            Reverse1, Reverse2, OverlayType, point_type, SideStrategy, std::less<int>
+            Reverse1, Reverse2, OverlayType, point_type, Strategy, std::less<int>
         > sbs_type;
 
     for (auto& pair : clusters)
@@ -463,6 +460,21 @@ inline void gather_cluster_properties(Clusters& clusters, Turns& turns,
 
         cinfo.open_count = sbs.open_count(for_operation);
 
+        // Determine spikes
+        cinfo.spike_count = 0;
+        for (std::size_t i = 0; i + 1 < sbs.m_ranked_points.size(); i++)
+        {
+            auto const& current = sbs.m_ranked_points[i];
+            auto const& next = sbs.m_ranked_points[i + 1];
+            if (current.rank == next.rank
+                && current.direction == detail::overlay::sort_by_side::dir_from
+                && next.direction == detail::overlay::sort_by_side::dir_to)
+            {
+                // It leaves, from cluster point, and immediately returns.
+                cinfo.spike_count += 1;
+            }
+        }
+
         bool const set_startable = OverlayType != overlay_dissolve;
 
         // Unset the startable flag for all 'closed' zones. This does not
@@ -475,7 +487,8 @@ inline void gather_cluster_properties(Clusters& clusters, Turns& turns,
             turn_operation_type& op = turn.operations[ranked.operation_index];
 
             if (set_startable
-                    && for_operation == operation_union && cinfo.open_count == 0)
+                && for_operation == operation_union
+                && cinfo.open_count == 0)
             {
                 op.enriched.startable = false;
             }
@@ -495,11 +508,13 @@ inline void gather_cluster_properties(Clusters& clusters, Turns& turns,
                 continue;
             }
 
-            if (BOOST_GEOMETRY_CONDITION(OverlayType == overlay_difference)
-                    && is_self_turn<OverlayType>(turn))
+            if BOOST_GEOMETRY_CONSTEXPR (OverlayType == overlay_difference)
             {
-                // TODO: investigate
-                continue;
+                if (is_self_turn<OverlayType>(turn))
+                {
+                    // TODO: investigate
+                    continue;
+                }
             }
 
             if ((for_operation == operation_union
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
index df3b70a45..1dbd717ae 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2014-2021.
-// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -42,13 +42,10 @@
 #include <boost/geometry/core/point_order.hpp>
 #include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/static_assert.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
-#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
-
 #include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/relate/services.hpp>
@@ -59,7 +56,7 @@
 #if defined(BOOST_GEOMETRY_DEBUG_FOLLOW)
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/util/for_each_with_index.hpp>
+#include <boost/geometry/views/enumerate_view.hpp>
 #endif
 
 namespace boost { namespace geometry
@@ -75,32 +72,21 @@ struct intersection_segment_segment_point
     template
     <
         typename Segment1, typename Segment2,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Segment1 const& segment1,
             Segment2 const& segment2,
-            RobustPolicy const& ,
             OutputIterator out,
             Strategy const& strategy)
     {
-        // Make sure this is only called with no rescaling
-        BOOST_STATIC_ASSERT((std::is_same
-           <
-               no_rescale_policy_tag,
-               typename rescale_policy_type<RobustPolicy>::type
-           >::value));
-
-        typedef typename point_type<PointOut>::type point_type;
-
-        // Get the intersection point (or two points)
-        typedef segment_intersection_points<point_type> intersection_return_type;
-
-        typedef policies::relate::segments_intersection_points
+        using point_type = point_type_t<PointOut>;
+        using intersection_return_type = segment_intersection_points<point_type>;
+        using policy_type = policies::relate::segments_intersection_points
             <
                 intersection_return_type
-            > policy_type;
+            >;
 
+        // Get the intersection point (or two points)
         detail::segment_as_subrange<Segment1> sub_range1(segment1);
         detail::segment_as_subrange<Segment2> sub_range2(segment2);
 
@@ -123,28 +109,19 @@ struct intersection_linestring_linestring_point
     template
     <
         typename Linestring1, typename Linestring2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Linestring1 const& linestring1,
             Linestring2 const& linestring2,
-            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
-        // Make sure this is only called with no rescaling
-        BOOST_STATIC_ASSERT((std::is_same
-           <
-               no_rescale_policy_tag,
-               typename rescale_policy_type<RobustPolicy>::type
-           >::value));
-
         typedef detail::overlay::turn_info<PointOut> turn_info;
         std::deque<turn_info> turns;
 
         geometry::get_intersection_points(linestring1, linestring2,
-                                          robust_policy, turns, strategy);
+                                          turns, strategy);
 
         for (auto const& turn : turns)
         {
@@ -281,21 +258,12 @@ struct intersection_of_linestring_with_areal
     template
     <
         typename LineString, typename Areal,
-        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(LineString const& linestring, Areal const& areal,
-            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
-        // Make sure this is only called with no rescaling
-        BOOST_STATIC_ASSERT((std::is_same
-           <
-               no_rescale_policy_tag,
-               typename rescale_policy_type<RobustPolicy>::type
-           >::value));
-
         if (boost::size(linestring) == 0)
         {
             return out;
@@ -316,10 +284,7 @@ struct intersection_of_linestring_with_areal
                 GeometryOut, linestring_tag, linestring_tag
             > linear;
 
-        typedef typename point_type
-            <
-                typename linear::type
-            >::type point_type;
+        using point_type = point_type_t<typename linear::type>;
 
         typedef geometry::segment_ratio
             <
@@ -356,7 +321,7 @@ struct intersection_of_linestring_with_areal
                 (OverlayType == overlay_intersection ? ReverseAreal : !ReverseAreal),
                 turn_policy
             >::apply(0, linestring, 1, areal,
-                     strategy, robust_policy,
+                     strategy,
                      turns, policy);
 
         int inside_value = 0;
@@ -379,17 +344,18 @@ struct intersection_of_linestring_with_areal
         }
 
 #if defined(BOOST_GEOMETRY_DEBUG_FOLLOW)
-        for_each_with_index(turns, [](auto index, auto const& turn)
+        for (auto const& item : util::enumerate(turns))
         {
-            debug_follow(turn, turn.operations[0], index);
-        });
+            auto const& turn = item.value;
+            debug_follow(turn, turn.operations[0], item.index);
+        }
 #endif
 
         return follower::apply
                 (
                     linestring, areal,
                     geometry::detail::overlay::operation_intersection,
-                    turns, robust_policy, out, strategy
+                    turns, out, strategy
                 );
     }
 };
@@ -413,20 +379,18 @@ struct intersection_areal_areal_point
     template
     <
         typename Geometry1, typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         typedef detail::overlay::turn_info
             <
                 PointOut,
-                typename segment_ratio_type<PointOut, RobustPolicy>::type
+                typename segment_ratio_type<PointOut>::type
             > turn_info;
         std::vector<turn_info> turns;
 
@@ -435,7 +399,7 @@ struct intersection_areal_areal_point
         geometry::get_turns
             <
                 false, false, detail::overlay::assign_null_policy
-            >(geometry1, geometry2, strategy, robust_policy, turns, policy);
+            >(geometry1, geometry2, strategy, turns, policy);
 
         return intersection_output_turn_points(turns, out);
     }
@@ -447,23 +411,14 @@ struct intersection_linear_areal_point
     template
     <
         typename Geometry1, typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
-        // Make sure this is only called with no rescaling
-        BOOST_STATIC_ASSERT((std::is_same
-           <
-               no_rescale_policy_tag,
-               typename rescale_policy_type<RobustPolicy>::type
-           >::value));
-
         typedef geometry::segment_ratio<typename geometry::coordinate_type<PointOut>::type> ratio_type;
 
         typedef detail::overlay::turn_info
@@ -496,7 +451,7 @@ struct intersection_linear_areal_point
                 false,
                 turn_policy
             >::apply(0, geometry1, 1, geometry2,
-                     strategy, robust_policy,
+                     strategy,
                      turns, interrupt_policy);
 
         return intersection_output_turn_points(turns, out);
@@ -509,20 +464,18 @@ struct intersection_areal_linear_point
     template
     <
         typename Geometry1, typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         return intersection_linear_areal_point
             <
                 PointOut
-            >::apply(geometry2, geometry1, robust_policy, out, strategy);
+            >::apply(geometry2, geometry1, out, strategy);
     }
 };
 
@@ -547,13 +500,13 @@ template
     bool Reverse1 = detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
     bool Reverse2 = detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
     // tag dispatching:
-    typename TagIn1 = typename geometry::tag<Geometry1>::type,
-    typename TagIn2 = typename geometry::tag<Geometry2>::type,
+    typename TagIn1 = tag_t<Geometry1>,
+    typename TagIn2 = tag_t<Geometry2>,
     typename TagOut = typename detail::setop_insert_output_tag<GeometryOut>::type,
     // metafunction finetuning helpers:
-    typename CastedTagIn1 = typename geometry::tag_cast<TagIn1, areal_tag, linear_tag, pointlike_tag>::type,
-    typename CastedTagIn2 = typename geometry::tag_cast<TagIn2, areal_tag, linear_tag, pointlike_tag>::type,
-    typename CastedTagOut = typename geometry::tag_cast<TagOut, areal_tag, linear_tag, pointlike_tag>::type
+    typename CastedTagIn1 = tag_cast_t<TagIn1, areal_tag, linear_tag, pointlike_tag>,
+    typename CastedTagIn2 = tag_cast_t<TagIn2, areal_tag, linear_tag, pointlike_tag>,
+    typename CastedTagOut = tag_cast_t<TagOut, areal_tag, linear_tag, pointlike_tag>
 >
 struct intersection_insert
 {
@@ -669,16 +622,14 @@ struct intersection_insert
         linear_tag, areal_tag, linear_tag
     >
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Linestring const& linestring,
             Box const& box,
-            RobustPolicy const& robust_policy,
             OutputIterator out, Strategy const& )
     {
-        typedef typename point_type<GeometryOut>::type point_type;
-        strategy::intersection::liang_barsky<Box, point_type> lb_strategy;
+        strategy::intersection::liang_barsky<Box, point_type_t<GeometryOut>> lb_strategy;
         return detail::intersection::clip_range_with_box
-            <GeometryOut>(box, linestring, robust_policy, out, lb_strategy);
+            <GeometryOut>(box, linestring, out, lb_strategy);
     }
 };
 
@@ -749,18 +700,16 @@ struct intersection_insert
         linear_tag, areal_tag, linear_tag
     >
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Segment const& segment,
             Box const& box,
-            RobustPolicy const& robust_policy,
             OutputIterator out, Strategy const& )
     {
         geometry::segment_view<Segment> range(segment);
 
-        typedef typename point_type<GeometryOut>::type point_type;
-        strategy::intersection::liang_barsky<Box, point_type> lb_strategy;
+        strategy::intersection::liang_barsky<Box, point_type_t<GeometryOut>> lb_strategy;
         return detail::intersection::clip_range_with_box
-            <GeometryOut>(box, range, robust_policy, out, lb_strategy);
+            <GeometryOut>(box, range, out, lb_strategy);
     }
 };
 
@@ -841,10 +790,9 @@ template
 >
 struct intersection_insert_reversed
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
                 Geometry2 const& g2,
-                RobustPolicy const& robust_policy,
                 OutputIterator out,
                 Strategy const& strategy)
     {
@@ -853,7 +801,7 @@ struct intersection_insert_reversed
                 Geometry2, Geometry1, GeometryOut,
                 OverlayType,
                 Reverse2, Reverse1
-            >::apply(g2, g1, robust_policy, out, strategy);
+            >::apply(g2, g1, out, strategy);
     }
 };
 
@@ -878,11 +826,10 @@ struct intersection_insert
 {
     template
     <
-        typename RobustPolicy, typename OutputIterator, typename Strategy
+        typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -895,7 +842,7 @@ struct intersection_insert
                 detail::boundary_view<Geometry2 const>,
                 LinestringOut,
                 overlay_intersection
-            >::apply(view1, view2, robust_policy, oit, strategy);
+            >::apply(view1, view2, oit, strategy);
     }
 };
 
@@ -950,18 +897,17 @@ struct intersection_insert
     // iterators in OutputIterators tuple/pair.
     template
     <
-        typename RobustPolicy, typename OutputIterators, typename Strategy
+        typename OutputIterators, typename Strategy
     >
     static inline OutputIterators apply(Linear1 const& linear1,
                                         Linear2 const& linear2,
-                                        RobustPolicy const& robust_policy,
                                         OutputIterators oit,
                                         Strategy const& strategy)
     {
         return detail::overlay::linear_linear_linestring
             <
                 Linear1, Linear2, TupledOut, OverlayType
-            >::apply(linear1, linear2, robust_policy, oit, strategy);
+            >::apply(linear1, linear2, oit, strategy);
     }
 };
 
@@ -1064,11 +1010,10 @@ struct intersection_insert
     // of iterators in OutputIterators tuple/pair.
     template
     <
-        typename RobustPolicy, typename OutputIterators, typename Strategy
+        typename OutputIterators, typename Strategy
     >
     static inline OutputIterators apply(PointLike1 const& pointlike1,
                                         PointLike2 const& pointlike2,
-                                        RobustPolicy const& robust_policy,
                                         OutputIterators oits,
                                         Strategy const& strategy)
     {
@@ -1087,7 +1032,7 @@ struct intersection_insert
                         out_point_index, TupledOut
                     >::type,
                 OverlayType
-            >::apply(pointlike1, pointlike2, robust_policy,
+            >::apply(pointlike1, pointlike2,
                      bgt::get<out_point_index>(oits),
                      strategy);
 
@@ -1113,7 +1058,7 @@ struct intersection_insert
     > : detail_dispatch::overlay::pointlike_linear_point
         <
             Point, Linear, PointOut, OverlayType,
-            point_tag, typename tag_cast<Tag, segment_tag, linear_tag>::type
+            point_tag, tag_cast_t<Tag, segment_tag, linear_tag>
         >
 {};
 
@@ -1135,7 +1080,7 @@ struct intersection_insert
         <
             MultiPoint, Linear, PointOut, OverlayType,
             multi_point_tag,
-            typename tag_cast<Tag, segment_tag, linear_tag>::type
+            tag_cast_t<Tag, segment_tag, linear_tag>
         >
 {};
 
@@ -1155,10 +1100,9 @@ struct intersection_insert
         linear_tag, pointlike_tag, pointlike_tag
     >
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Linestring const& linestring,
                                        MultiPoint const& multipoint,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -1166,7 +1110,7 @@ struct intersection_insert
             <
                 MultiPoint, Linestring, PointOut, overlay_intersection,
                 multi_point_tag, linear_tag
-            >::apply(multipoint, linestring, robust_policy, out, strategy);
+            >::apply(multipoint, linestring, out, strategy);
     }
 };
 
@@ -1211,17 +1155,16 @@ struct intersection_insert
         linear_tag, pointlike_tag, detail::tupled_output_tag
     >
 {
-    template <typename RobustPolicy, typename OutputIterators, typename Strategy>
+    template <typename OutputIterators, typename Strategy>
     static inline OutputIterators apply(Linestring const& linestring,
                                         MultiPoint const& multipoint,
-                                        RobustPolicy const& robust_policy,
                                         OutputIterators out,
                                         Strategy const& strategy)
     {
         return intersection_insert
             <
                 MultiPoint, Linestring, TupledOut, overlay_intersection
-            >::apply(multipoint, linestring, robust_policy, out, strategy);
+            >::apply(multipoint, linestring, out, strategy);
     }
 };
 
@@ -1283,10 +1226,9 @@ struct intersection_insert
         areal_tag, pointlike_tag, pointlike_tag
     >
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Areal const& areal,
                                        MultiPoint const& multipoint,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -1294,7 +1236,7 @@ struct intersection_insert
             <
                 MultiPoint, Areal, PointOut, overlay_intersection,
                 multi_point_tag, ArealTag
-            >::apply(multipoint, areal, robust_policy, out, strategy);
+            >::apply(multipoint, areal, out, strategy);
     }
 };
 
@@ -1340,17 +1282,16 @@ struct intersection_insert
         areal_tag, pointlike_tag, detail::tupled_output_tag
     >
 {
-    template <typename RobustPolicy, typename OutputIterators, typename Strategy>
+    template <typename OutputIterators, typename Strategy>
     static inline OutputIterators apply(Areal const& areal,
                                         MultiPoint const& multipoint,
-                                        RobustPolicy const& robust_policy,
                                         OutputIterators out,
                                         Strategy const& strategy)
     {
         return intersection_insert
             <
                 MultiPoint, Areal, TupledOut, overlay_intersection
-            >::apply(multipoint, areal, robust_policy, out, strategy);
+            >::apply(multipoint, areal, out, strategy);
     }
 };
 
@@ -1419,13 +1360,11 @@ template
     bool ReverseSecond,
     overlay_type OverlayType,
     typename Geometry1, typename Geometry2,
-    typename RobustPolicy,
     typename OutputIterator,
     typename Strategy
 >
 inline OutputIterator insert(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
-            RobustPolicy robust_policy,
             OutputIterator out,
             Strategy const& strategy)
 {
@@ -1448,7 +1387,7 @@ inline OutputIterator insert(Geometry1 const& geometry1,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, ReverseSecond>::value
             >
-        >::apply(geometry1, geometry2, robust_policy, out, strategy);
+        >::apply(geometry1, geometry2, out, strategy);
 }
 
 
@@ -1487,21 +1426,10 @@ inline OutputIterator intersection_insert(Geometry1 const& geometry1,
     concepts::check<Geometry1 const>();
     concepts::check<Geometry2 const>();
 
-    typedef typename geometry::rescale_overlay_policy_type
-        <
-            Geometry1,
-            Geometry2,
-            typename Strategy::cs_tag
-        >::type rescale_policy_type;
-
-    rescale_policy_type robust_policy
-            = geometry::get_rescale_policy<rescale_policy_type>(
-                geometry1, geometry2, strategy);
-
     return detail::intersection::insert
         <
             GeometryOut, false, overlay_intersection
-        >(geometry1, geometry2, robust_policy, out, strategy);
+        >(geometry1, geometry2, out, strategy);
 }
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp
index 1ce97d261..140c6aaf0 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/less_by_segment_ratio.hpp
@@ -2,9 +2,9 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -65,7 +65,6 @@ template
     typename Turns,
     typename Indexed,
     typename Geometry1, typename Geometry2,
-    typename RobustPolicy,
     typename Strategy,
     bool Reverse1, bool Reverse2
 >
@@ -74,12 +73,10 @@ struct less_by_segment_ratio
     inline less_by_segment_ratio(Turns const& turns
             , Geometry1 const& geometry1
             , Geometry2 const& geometry2
-            , RobustPolicy const& robust_policy
             , Strategy const& strategy)
         : m_turns(turns)
         , m_geometry1(geometry1)
         , m_geometry2(geometry2)
-        , m_robust_policy(robust_policy)
         , m_strategy(strategy)
     {
     }
@@ -89,7 +86,6 @@ private :
     Turns const& m_turns;
     Geometry1 const& m_geometry1;
     Geometry2 const& m_geometry2;
-    RobustPolicy const& m_robust_policy;
     Strategy const& m_strategy;
 
     typedef typename geometry::point_type<Geometry1>::type point_type;
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
index f67a06b0b..75ff47432 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2022, Oracle and/or its affiliates.
+// Copyright (c) 2014-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -145,14 +146,12 @@ class linear_linear_linestring
         typename Turns,
         typename LinearGeometry1,
         typename LinearGeometry2,
-        typename Strategy,
-        typename RobustPolicy
+        typename Strategy
     >
     static inline void compute_turns(Turns& turns,
                                      LinearGeometry1 const& linear1,
                                      LinearGeometry2 const& linear2,
-                                     Strategy const& strategy,
-                                     RobustPolicy const& robust_policy)
+                                     Strategy const& strategy)
     {
         turns.clear();
 
@@ -168,7 +167,7 @@ class linear_linear_linestring
                     LinearGeometry2,
                     assign_policy
                 >
-            >::apply(turns, linear1, linear2, interrupt_policy, strategy, robust_policy);
+            >::apply(turns, linear1, linear2, interrupt_policy, strategy);
     }
 
 
@@ -221,11 +220,10 @@ class linear_linear_linestring
 public:
     template
     <
-        typename RobustPolicy, typename OutputIterator, typename Strategy
+        typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Linear1 const& linear1,
                                        Linear2 const& linear2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -239,12 +237,12 @@ class linear_linear_linestring
                         Linear2,
                         assign_policy
                     >
-            >::template turn_info_type<Strategy, RobustPolicy>::type turn_info;
+            >::template turn_info_type<Strategy>::type turn_info;
 
         typedef std::vector<turn_info> turns_container;
 
         turns_container turns;
-        compute_turns(turns, linear1, linear2, strategy, robust_policy);
+        compute_turns(turns, linear1, linear2, strategy);
 
         if ( turns.empty() )
         {
@@ -289,11 +287,10 @@ struct linear_linear_linestring
 {
     template
     <
-        typename RobustPolicy, typename OutputIterator, typename Strategy
+        typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Linear1 const& linear1,
                                        Linear2 const& linear2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -310,7 +307,7 @@ struct linear_linear_linestring
                 Linear2, Linear1, LinestringOut, overlay_difference,
                 EnableFilterContinueTurns, EnableRemoveDuplicateTurns,
                 EnableDegenerateTurns, EnableFollowIsolatedPoints
-            >::apply(linear2, linear1, robust_policy, oit, strategy);
+            >::apply(linear2, linear1, oit, strategy);
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/overlay.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
index e0451f9dd..6ce28be73 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2013-2017 Adam Wulkiewicz, Lodz, Poland
 
-// This file was modified by Oracle on 2015-2020.
-// Modifications copyright (c) 2015-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -35,8 +36,6 @@
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
-
 #include <boost/geometry/algorithms/is_empty.hpp>
 #include <boost/geometry/algorithms/reverse.hpp>
 
@@ -46,14 +45,8 @@
 #include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
 #include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
 
-#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
-
 #include <boost/geometry/util/condition.hpp>
 
-#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
-#  include <boost/geometry/io/dsv/write.hpp>
-#endif
-
 
 namespace boost { namespace geometry
 {
@@ -109,38 +102,42 @@ inline void get_ring_turn_info(TurnInfoMap& turn_info_map, Turns const& turns, C
             = target_operation == operation_union
             ? operation_intersection
             : operation_union;
+    static const bool is_union = target_operation == operation_union;
 
     for (auto const& turn : turns)
     {
         bool cluster_checked = false;
         bool has_blocked = false;
 
-        if (is_self_turn<OverlayType>(turn) && turn.discarded)
+        if (turn.discarded && (turn.method == method_start || is_self_turn<OverlayType>(turn)))
         {
-            // Discarded self-turns don't count as traversed
+            // Discarded self-turns or start turns don't need to block the ring
             continue;
         }
 
-        for (auto const& op : turn.operations)
+        for (int i = 0; i < 2; i++)
         {
+            auto const& op = turn.operations[i];
+            auto const& other_op = turn.operations[1 - i];
             ring_identifier const ring_id = ring_id_by_seg_id(op.seg_id);
 
-            if (! is_self_turn<OverlayType>(turn)
-                && (
-                    (BOOST_GEOMETRY_CONDITION(target_operation == operation_union)
-                      && op.enriched.count_left > 0)
-                  || (BOOST_GEOMETRY_CONDITION(target_operation == operation_intersection)
-                      && op.enriched.count_right <= 2)))
+            // If the turn (one of its operations) is used during traversal,
+            // and it is an intersection or difference, it cannot be set to blocked.
+            // This is a rare case, related to floating point precision,
+            // and can happen if there is, for example, only one start turn which is
+            // used to traverse through one of the rings (the other should be marked
+            // as not traversed, but neither blocked).
+            bool const can_block
+                = is_union
+                || ! (op.visited.finalized() || other_op.visited.finalized());
+
+            if (! is_self_turn<OverlayType>(turn) && can_block)
             {
-                // Avoid including untraversed rings which have polygons on
-                // their left side (union) or not two on their right side (int)
-                // This can only be done for non-self-turns because of count
-                // information
                 turn_info_map[ring_id].has_blocked_turn = true;
                 continue;
             }
 
-            if (turn.any_blocked())
+            if (is_union && turn.any_blocked())
             {
                 turn_info_map[ring_id].has_blocked_turn = true;
             }
@@ -164,6 +161,7 @@ inline void get_ring_turn_info(TurnInfoMap& turn_info_map, Turns const& turns, C
             //             don't block (for union) i/u if there is an self-ii too
             if (has_blocked
                 || (op.operation == opposite_operation
+                    && can_block
                     && ! turn.has_colocated_both
                     && ! (turn.both(opposite_operation)
                           && is_self_turn<OverlayType>(turn))))
@@ -232,10 +230,9 @@ template
 >
 struct overlay
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy, typename Visitor>
+    template <typename OutputIterator, typename Strategy, typename Visitor>
     static inline OutputIterator apply(
                 Geometry1 const& geometry1, Geometry2 const& geometry2,
-                RobustPolicy const& robust_policy,
                 OutputIterator out,
                 Strategy const& strategy,
                 Visitor& visitor)
@@ -260,7 +257,7 @@ struct overlay
         typedef detail::overlay::traversal_turn_info
         <
             point_type,
-            typename segment_ratio_type<point_type, RobustPolicy>::type
+            typename segment_ratio_type<point_type>::type
         > turn_info;
         typedef std::deque<turn_info> turn_container_type;
 
@@ -276,15 +273,12 @@ struct overlay
 
         turn_container_type turns;
 
-#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
-std::cout << "get turns" << std::endl;
-#endif
         detail::get_turns::no_interrupt_policy policy;
         geometry::get_turns
             <
                 Reverse1, Reverse2,
                 assign_policy_only_start_turns
-            >(geometry1, geometry2, strategy, robust_policy, turns, policy);
+            >(geometry1, geometry2, strategy, turns, policy);
 
         visitor.visit_turns(1, turns);
 
@@ -296,34 +290,26 @@ std::cout << "get turns" << std::endl;
             if (needs_self_turns<Geometry1>::apply(geometry1))
             {
                 self_get_turn_points::self_turns<Reverse1, assign_policy_only_start_turns>(geometry1,
-                    strategy, robust_policy, turns, policy, 0);
+                    strategy, turns, policy, 0);
             }
             if (needs_self_turns<Geometry2>::apply(geometry2))
             {
                 self_get_turn_points::self_turns<Reverse2, assign_policy_only_start_turns>(geometry2,
-                    strategy, robust_policy, turns, policy, 1);
+                    strategy, turns, policy, 1);
             }
         }
 #endif
 
-
-#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
-std::cout << "enrich" << std::endl;
-#endif
-
         cluster_type clusters;
         std::map<ring_identifier, ring_turn_info> turn_info_per_ring;
 
         geometry::enrich_intersection_points<Reverse1, Reverse2, OverlayType>(
-            turns, clusters, geometry1, geometry2, robust_policy, strategy);
+            turns, clusters, geometry1, geometry2, strategy);
 
         visitor.visit_turns(2, turns);
 
         visitor.visit_clusters(clusters, turns);
 
-#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
-std::cout << "traverse" << std::endl;
-#endif
         // Traverse through intersection/turn points and create rings of them.
         // These rings are always in clockwise order.
         // In CCW polygons they are marked as "to be reversed" below.
@@ -332,7 +318,6 @@ std::cout << "traverse" << std::endl;
                 (
                     geometry1, geometry2,
                     strategy,
-                    robust_policy,
                     turns, rings,
                     turn_info_per_ring,
                     clusters,
@@ -390,15 +375,14 @@ std::cout << "traverse" << std::endl;
                                       );
     }
 
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(
                 Geometry1 const& geometry1, Geometry2 const& geometry2,
-                RobustPolicy const& robust_policy,
                 OutputIterator out,
                 Strategy const& strategy)
     {
         overlay_null_visitor visitor;
-        return apply(geometry1, geometry2, robust_policy, out, strategy, visitor);
+        return apply(geometry1, geometry2, out, strategy, visitor);
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
index 503d65647..5cfbae09b 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2020, Oracle and/or its affiliates.
-
+// Copyright (c) 2020-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -211,10 +211,9 @@ class multipoint_multipolygon_point
     }
 
 public:
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(MultiPoint const& multipoint,
                                        MultiPolygon const& multipolygon,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -233,7 +232,7 @@ class multipoint_multipolygon_point
         return multipoint_multipoint_point
             <
                 MultiPoint, point_vector_type, PointOut, OverlayType
-            >::apply(multipoint, common_points, robust_policy, oit, strategy);
+            >::apply(multipoint, common_points, oit, strategy);
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
index 19045b250..bfb4880a1 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_linear.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// Copyright (c) 2015-2020, Oracle and/or its affiliates.
-
+// Copyright (c) 2015-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -65,10 +65,9 @@ template
 >
 struct point_single_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Point const& point,
                                        Geometry const& geometry,
-                                       RobustPolicy const&,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -91,10 +90,9 @@ template
 >
 struct multipoint_single_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(MultiPoint const& multipoint,
                                        Geometry const& geometry,
-                                       RobustPolicy const&,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -269,10 +267,9 @@ class multipoint_linear_point
     }
 
 public:
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(MultiPoint const& multipoint,
                                        Linear const& linear,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -291,7 +288,7 @@ class multipoint_linear_point
         return multipoint_multipoint_point
             <
                 MultiPoint, point_vector_type, PointOut, OverlayType
-            >::apply(multipoint, common_points, robust_policy, oit, strategy);
+            >::apply(multipoint, common_points, oit, strategy);
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
index 4ad311277..1745bcf43 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
@@ -2,7 +2,7 @@
 
 // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
-// Copyright (c) 2014-2023, Oracle and/or its affiliates.
+// Copyright (c) 2014-2024, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -36,7 +36,7 @@
 
 #include <boost/geometry/policies/compare.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 
 namespace boost { namespace geometry
@@ -149,10 +149,9 @@ template
 >
 struct point_point_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Point1 const& point1,
                                        Point2 const& point2,
-                                       RobustPolicy const& ,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -183,10 +182,9 @@ template
 >
 struct multipoint_point_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(MultiPoint const& multipoint,
                                        Point const& point,
-                                       RobustPolicy const& ,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -217,10 +215,9 @@ template
 >
 struct point_multipoint_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Point const& point,
                                        MultiPoint const& multipoint,
-                                       RobustPolicy const& ,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -252,22 +249,23 @@ template
 >
 struct multipoint_multipoint_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(MultiPoint1 const& multipoint1,
                                        MultiPoint2 const& multipoint2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
         typedef geometry::less<void, -1, Strategy> less_type;
 
-        if (BOOST_GEOMETRY_CONDITION(OverlayType != overlay_difference)
-            && boost::size(multipoint1) > boost::size(multipoint2))
+        if BOOST_GEOMETRY_CONSTEXPR (OverlayType != overlay_difference)
         {
-            return multipoint_multipoint_point
-                <
-                    MultiPoint2, MultiPoint1, PointOut, OverlayType
-                >::apply(multipoint2, multipoint1, robust_policy, oit, strategy);
+            if (boost::size(multipoint1) > boost::size(multipoint2))
+            {
+                return multipoint_multipoint_point
+                    <
+                        MultiPoint2, MultiPoint1, PointOut, OverlayType
+                    >::apply(multipoint2, multipoint1, oit, strategy);
+            }
         }
 
         typedef typename boost::range_value<MultiPoint2>::type point2_type;
@@ -412,10 +410,9 @@ template
 >
 struct union_pointlike_pointlike_point
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(PointLike1 const& pointlike1,
                                        PointLike2 const& pointlike2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
@@ -426,7 +423,7 @@ struct union_pointlike_pointlike_point
                 PointLike2, PointLike1, PointOut, overlay_difference,
                 typename tag<PointLike2>::type,
                 typename tag<PointLike1>::type
-            >::apply(pointlike2, pointlike1, robust_policy, oit, strategy);
+            >::apply(pointlike2, pointlike1, oit, strategy);
     }
 
 };
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
index 1883e1df2..49c4357c2 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017-2021.
-// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -36,7 +37,6 @@
 
 #include <boost/geometry/util/condition.hpp>
 
-
 namespace boost { namespace geometry
 {
 
@@ -65,14 +65,12 @@ template
     typename Turns,
     typename TurnPolicy,
     typename Strategy,
-    typename RobustPolicy,
     typename InterruptPolicy
 >
 struct self_section_visitor
 {
     Geometry const& m_geometry;
     Strategy const& m_strategy;
-    RobustPolicy const& m_rescale_policy;
     Turns& m_turns;
     InterruptPolicy& m_interrupt_policy;
     int m_source_index;
@@ -80,14 +78,12 @@ struct self_section_visitor
 
     inline self_section_visitor(Geometry const& g,
                                 Strategy const& s,
-                                RobustPolicy const& rp,
                                 Turns& turns,
                                 InterruptPolicy& ip,
                                 int source_index,
                                 bool skip_adjacent)
         : m_geometry(g)
         , m_strategy(s)
-        , m_rescale_policy(rp)
         , m_turns(turns)
         , m_interrupt_policy(ip)
         , m_source_index(source_index)
@@ -114,7 +110,6 @@ struct self_section_visitor
                              m_source_index, m_geometry, sec2,
                              false, m_skip_adjacent,
                              m_strategy,
-                             m_rescale_policy,
                              m_turns, m_interrupt_policy);
         }
 
@@ -128,23 +123,15 @@ struct self_section_visitor
 template <bool Reverse, typename TurnPolicy>
 struct get_turns
 {
-    template <typename Geometry, typename Strategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename Geometry, typename Strategy, typename Turns, typename InterruptPolicy>
     static inline bool apply(
             Geometry const& geometry,
             Strategy const& strategy,
-            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy,
             int source_index, bool skip_adjacent)
     {
-        typedef model::box
-            <
-                typename geometry::robust_point_type
-                <
-                    typename geometry::point_type<Geometry>::type,
-                    RobustPolicy
-                >::type
-            > box_type;
+        typedef model::box<typename geometry::point_type<Geometry>::type> box_type;
 
         // sectionalize in two dimensions to detect
         // all potential spikes correctly
@@ -153,14 +140,14 @@ struct get_turns
         typedef std::integer_sequence<std::size_t, 0, 1> dimensions;
 
         sections_type sec;
-        geometry::sectionalize<Reverse, dimensions>(geometry, robust_policy,
+        geometry::sectionalize<Reverse, dimensions>(geometry,
                                                     sec, strategy);
 
         self_section_visitor
             <
                 Reverse, Geometry,
-                Turns, TurnPolicy, Strategy, RobustPolicy, InterruptPolicy
-            > visitor(geometry, strategy, robust_policy, turns, interrupt_policy,
+                Turns, TurnPolicy, Strategy, InterruptPolicy
+            > visitor(geometry, strategy, turns, interrupt_policy,
                       source_index, skip_adjacent);
 
         // false if interrupted
@@ -223,11 +210,10 @@ struct self_get_turn_points
         TurnPolicy
     >
 {
-    template <typename Strategy, typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    template <typename Strategy, typename Turns, typename InterruptPolicy>
     static inline bool apply(
             Box const& ,
             Strategy const& ,
-            RobustPolicy const& ,
             Turns& ,
             InterruptPolicy& ,
             int /*source_index*/,
@@ -287,13 +273,11 @@ struct self_get_turn_points
     template
     <
         typename Geometry,
-        typename RobustPolicy,
         typename Turns,
         typename InterruptPolicy
     >
     static inline void apply(Geometry const& geometry,
                              Strategies const& strategies,
-                             RobustPolicy const& robust_policy,
                              Turns& turns,
                              InterruptPolicy& interrupt_policy,
                              int source_index,
@@ -307,7 +291,7 @@ struct self_get_turn_points
                     typename tag<Geometry>::type,
                     Geometry,
                     turn_policy
-                >::apply(geometry, strategies, robust_policy, turns, interrupt_policy,
+                >::apply(geometry, strategies, turns, interrupt_policy,
                          source_index, skip_adjacent);
     }
 };
@@ -318,13 +302,11 @@ struct self_get_turn_points<Reverse, AssignPolicy, Strategy, false>
     template
     <
         typename Geometry,
-        typename RobustPolicy,
         typename Turns,
         typename InterruptPolicy
     >
     static inline void apply(Geometry const& geometry,
                              Strategy const& strategy,
-                             RobustPolicy const& robust_policy,
                              Turns& turns,
                              InterruptPolicy& interrupt_policy,
                              int source_index,
@@ -339,7 +321,6 @@ struct self_get_turn_points<Reverse, AssignPolicy, Strategy, false>
                 decltype(strategy_converter<Strategy>::get(strategy))
             >::apply(geometry,
                      strategy_converter<Strategy>::get(strategy),
-                     robust_policy,
                      turns,
                      interrupt_policy,
                      source_index,
@@ -363,13 +344,11 @@ template
     typename AssignPolicy,
     typename Geometry,
     typename Strategy,
-    typename RobustPolicy,
     typename Turns,
     typename InterruptPolicy
 >
 inline void self_turns(Geometry const& geometry,
                        Strategy const& strategy,
-                       RobustPolicy const& robust_policy,
                        Turns& turns,
                        InterruptPolicy& interrupt_policy,
                        int source_index = 0,
@@ -380,7 +359,7 @@ inline void self_turns(Geometry const& geometry,
     resolve_strategy::self_get_turn_points
             <
                 Reverse, AssignPolicy, Strategy
-            >::apply(geometry, strategy, robust_policy, turns, interrupt_policy,
+            >::apply(geometry, strategy, turns, interrupt_policy,
                      source_index, skip_adjacent);
 }
 
@@ -395,7 +374,6 @@ inline void self_turns(Geometry const& geometry,
                 (e.g. vector of "intersection/turn point"'s)
     \param geometry geometry
     \param strategy strategy to be used
-    \param robust_policy policy to handle robustness issues
     \param turns container which will contain intersection points
     \param interrupt_policy policy determining if process is stopped
         when intersection is found
@@ -407,13 +385,11 @@ template
     typename AssignPolicy,
     typename Geometry,
     typename Strategy,
-    typename RobustPolicy,
     typename Turns,
     typename InterruptPolicy
 >
 inline void self_turns(Geometry const& geometry,
                        Strategy const& strategy,
-                       RobustPolicy const& robust_policy,
                        Turns& turns,
                        InterruptPolicy& interrupt_policy,
                        int source_index = 0,
@@ -429,7 +405,7 @@ inline void self_turns(Geometry const& geometry,
     resolve_strategy::self_get_turn_points
             <
                 reverse, AssignPolicy, Strategy
-            >::apply(geometry, strategy, robust_policy, turns, interrupt_policy,
+            >::apply(geometry, strategy, turns, interrupt_policy,
                      source_index, skip_adjacent);
 }
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
index 7e31a9fa9..14f32beed 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2017-2023.
 // Modifications copyright (c) 2017-2023 Oracle and/or its affiliates.
@@ -27,7 +27,7 @@
 #include <boost/geometry/algorithms/detail/direction_code.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/select_coordinate_type.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
@@ -39,35 +39,22 @@ namespace boost { namespace geometry
 namespace detail { namespace overlay { namespace sort_by_side
 {
 
+// From means: from intersecting-segment-begin-point to cluster
+// To means: from cluster to intersecting-segment-end-point
 enum direction_type { dir_unknown = -1, dir_from = 0, dir_to = 1 };
 
-typedef signed_size_type rank_type;
-
+using rank_type = signed_size_type;
 
 // Point-wrapper, adding some properties
 template <typename Point>
 struct ranked_point
 {
-    ranked_point()
-        : rank(0)
-        , turn_index(-1)
-        , operation_index(-1)
-        , direction(dir_unknown)
-        , count_left(0)
-        , count_right(0)
-        , operation(operation_none)
-    {}
-
     ranked_point(Point const& p, signed_size_type ti, int oi,
                  direction_type d, operation_type op, segment_identifier const& si)
         : point(p)
-        , rank(0)
-        , zone(-1)
         , turn_index(ti)
         , operation_index(oi)
         , direction(d)
-        , count_left(0)
-        , count_right(0)
         , operation(op)
         , seg_id(si)
     {}
@@ -75,14 +62,19 @@ struct ranked_point
     using point_type = Point;
 
     Point point;
-    rank_type rank;
-    signed_size_type zone; // index of closed zone, in uu turn there would be 2 zones
-    signed_size_type turn_index;
-    int operation_index; // 0,1
-    direction_type direction;
-    std::size_t count_left;
-    std::size_t count_right;
-    operation_type operation;
+    rank_type rank{0};
+    signed_size_type zone{-1}; // index of closed zone, in uu turn there would be 2 zones
+    signed_size_type turn_index{-1};
+    int operation_index{-1}; // 0,1
+    direction_type direction{dir_unknown};
+
+    // The number of polygons on the left side
+    std::size_t count_left{0};
+
+    // The number of polygons on the right side
+    std::size_t count_right{0};
+
+    operation_type operation{operation_none};
     segment_identifier seg_id;
 };
 
@@ -91,10 +83,8 @@ struct less_by_turn_index
     template <typename T>
     inline bool operator()(T const& first, T const& second) const
     {
-        return first.turn_index == second.turn_index
-            ? first.index < second.index
-            : first.turn_index < second.turn_index
-            ;
+        return std::tie(first.turn_index, first.index)
+             < std::tie(second.turn_index, second.index);
     }
 };
 
@@ -103,20 +93,13 @@ struct less_by_index
     template <typename T>
     inline bool operator()(T const& first, T const& second) const
     {
-        // Length might be considered too
-        // First order by from/to
-        if (first.direction != second.direction)
-        {
-            return first.direction < second.direction;
-        }
+        // First order by direction (from/to)
         // Then by turn index
-        if (first.turn_index != second.turn_index)
-        {
-            return first.turn_index < second.turn_index;
-        }
         // This can also be the same (for example in buffer), but seg_id is
         // never the same
-        return first.seg_id < second.seg_id;
+        // (Length might be considered too)
+        return std::tie(first.direction, first.turn_index, first.seg_id)
+             < std::tie(second.direction, second.turn_index, second.seg_id);
     }
 };
 
@@ -129,10 +112,10 @@ struct less_false
     }
 };
 
-template <typename PointOrigin, typename PointTurn, typename SideStrategy, typename LessOnSame, typename Compare>
+template <typename PointOrigin, typename PointTurn, typename Strategy, typename LessOnSame, typename Compare>
 struct less_by_side
 {
-    less_by_side(PointOrigin const& p1, PointTurn const& p2, SideStrategy const& strategy)
+    less_by_side(PointOrigin const& p1, PointTurn const& p2, Strategy const& strategy)
         : m_origin(p1)
         , m_turn_point(p2)
         , m_strategy(strategy)
@@ -141,13 +124,14 @@ struct less_by_side
     template <typename T>
     inline bool operator()(T const& first, T const& second) const
     {
-        typedef typename SideStrategy::cs_tag cs_tag;
+        using cs_tag = typename Strategy::cs_tag;
 
         LessOnSame on_same;
         Compare compare;
 
-        int const side_first = m_strategy.apply(m_origin, m_turn_point, first.point);
-        int const side_second = m_strategy.apply(m_origin, m_turn_point, second.point);
+        auto const side_strategy = m_strategy.side();
+        int const side_first = side_strategy.apply(m_origin, m_turn_point, first.point);
+        int const side_second = side_strategy.apply(m_origin, m_turn_point, second.point);
 
         if (side_first == 0 && side_second == 0)
         {
@@ -187,14 +171,14 @@ struct less_by_side
 
         // They are both left, both right, and/or both collinear (with each other and/or with p1,p2)
         // Check mutual side
-        int const side_second_wrt_first = m_strategy.apply(m_turn_point, first.point, second.point);
+        int const side_second_wrt_first = side_strategy.apply(m_turn_point, first.point, second.point);
 
         if (side_second_wrt_first == 0)
         {
             return on_same(first, second);
         }
 
-        int const side_first_wrt_second = m_strategy.apply(m_turn_point, second.point, first.point);
+        int const side_first_wrt_second = side_strategy.apply(m_turn_point, second.point, first.point);
         if (side_second_wrt_first != -side_first_wrt_second)
         {
             // (FP) accuracy error in side calculation, the sides are not opposite.
@@ -213,22 +197,28 @@ struct less_by_side
 private :
     PointOrigin const& m_origin;
     PointTurn const& m_turn_point;
-    SideStrategy const& m_strategy;
+
+    // Umbrella strategy containing side strategy
+    Strategy const& m_strategy;
 };
 
 // Sorts vectors in counter clockwise order (by default)
+// Purposes:
+// - from one entry vector, find the next exit vector
+// - find the open counts
+// - find zones
 template
 <
     bool Reverse1,
     bool Reverse2,
     overlay_type OverlayType,
     typename Point,
-    typename SideStrategy,
+    typename Strategy,
     typename Compare
 >
 struct side_sorter
 {
-    typedef ranked_point<Point> rp;
+    using rp = ranked_point<Point>;
 
 private :
     struct include_union
@@ -254,7 +244,7 @@ private :
     };
 
 public :
-    side_sorter(SideStrategy const& strategy)
+    side_sorter(Strategy const& strategy)
         : m_origin_count(0)
         , m_origin_segment_distance(0)
         , m_strategy(strategy)
@@ -289,6 +279,17 @@ public :
             Point const& point_from, Point const& point_to,
             Operation const& op, bool is_origin)
     {
+        // The segment is added in two parts (sub-segment).
+        // In picture:
+        //
+        // from -----> * -----> to
+        //
+        // where * means: cluster point (intersection point)
+        // from means: start point of original segment
+        // to means: end point of original segment
+        // So from/to is from the perspective of the segment.
+        // From the perspective of the cluster, it is the other way round
+        // (from means: from-segment-to-cluster, to means: from-cluster-to-segment)
         add_segment_from(turn_index, op_index, point_from, op, is_origin);
         add_segment_to(turn_index, op_index, point_to, op);
     }
@@ -356,7 +357,7 @@ public :
             Geometry2 const& geometry2,
             bool is_departure)
     {
-        Point potential_origin = add(turn, op, turn_index, op_index, geometry1, geometry2, false);
+        auto const potential_origin = add(turn, op, turn_index, op_index, geometry1, geometry2, false);
 
         if (is_departure)
         {
@@ -392,8 +393,8 @@ public :
         //    to give colinear points
 
         // Sort by side and assign rank
-        less_by_side<Point, PointTurn, SideStrategy, less_by_index, Compare> less_unique(m_origin, turn_point, m_strategy);
-        less_by_side<Point, PointTurn, SideStrategy, less_false, Compare> less_non_unique(m_origin, turn_point, m_strategy);
+        less_by_side<Point, PointTurn, Strategy, less_by_index, Compare> less_unique(m_origin, turn_point, m_strategy);
+        less_by_side<Point, PointTurn, Strategy, less_false, Compare> less_non_unique(m_origin, turn_point, m_strategy);
 
         std::sort(m_ranked_points.begin(), m_ranked_points.end(), less_unique);
 
@@ -458,7 +459,7 @@ public :
 
     void find_open()
     {
-        if (BOOST_GEOMETRY_CONDITION(OverlayType == overlay_buffer))
+        if BOOST_GEOMETRY_CONSTEXPR (OverlayType == overlay_buffer)
         {
             find_open_by_piece_index();
         }
@@ -512,12 +513,14 @@ public :
 
 //private :
 
-    typedef std::vector<rp> container_type;
+    using container_type = std::vector<rp>;
     container_type m_ranked_points;
     Point m_origin;
     std::size_t m_origin_count;
     signed_size_type m_origin_segment_distance;
-    SideStrategy m_strategy;
+
+    // Umbrella strategy containing side strategy
+    Strategy m_strategy;
 
 private :
 
@@ -724,13 +727,13 @@ struct side_compare {};
 template <>
 struct side_compare<operation_union>
 {
-    typedef std::greater<int> type;
+    using type = std::greater<int>;
 };
 
 template <>
 struct side_compare<operation_intersection>
 {
-    typedef std::less<int> type;
+    using type = std::less<int>;
 };
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/traversal.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/traversal.hpp
index 82cfb86a8..e30668882 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/traversal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/traversal.hpp
@@ -1,10 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// Copyright (c) 2007-2024 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2023-2024 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -22,12 +23,11 @@
 #include <boost/range/value_type.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/cluster_info.hpp>
-#include <boost/geometry/algorithms/detail/overlay/cluster_exits.hpp>
 #include <boost/geometry/algorithms/detail/overlay/is_self_turn.hpp>
 #include <boost/geometry/algorithms/detail/overlay/sort_by_side.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/core/assert.hpp>
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 #if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) \
     || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT) \
@@ -83,8 +83,7 @@ template
     typename Geometry2,
     typename Turns,
     typename Clusters,
-    typename RobustPolicy,
-    typename SideStrategy,
+    typename Strategy,
     typename Visitor
 >
 struct traversal
@@ -101,19 +100,18 @@ private :
     typedef sort_by_side::side_sorter
         <
             Reverse1, Reverse2, OverlayType,
-            point_type, SideStrategy, side_compare_type
+            point_type, Strategy, side_compare_type
         > sbs_type;
 
 public :
     inline traversal(Geometry1 const& geometry1, Geometry2 const& geometry2,
             Turns& turns, Clusters const& clusters,
-            RobustPolicy const& robust_policy, SideStrategy const& strategy,
+            Strategy const& strategy,
             Visitor& visitor)
         : m_geometry1(geometry1)
         , m_geometry2(geometry2)
         , m_turns(turns)
         , m_clusters(clusters)
-        , m_robust_policy(robust_policy)
         , m_strategy(strategy)
         , m_visitor(visitor)
     {
@@ -232,24 +230,12 @@ public :
                               segment_identifier const& previous_seg_id) const
     {
         // For uu/ii, only switch sources if indicated
-
-        if (BOOST_GEOMETRY_CONDITION(OverlayType == overlay_buffer))
-        {
-            // Buffer does not use source_index (always 0).
-            return select_source_generic<&segment_identifier::multi_index>(
-                        turn, candidate_seg_id, previous_seg_id);
-        }
-
-        if (is_self_turn<OverlayType>(turn))
-        {
-            // Also, if it is a self-turn, stay on same ring (multi/ring)
-            return select_source_generic<&segment_identifier::multi_index>(
+        // Buffer and self-turns do not use source_index (always 0).
+        return OverlayType == overlay_buffer || is_self_turn<OverlayType>(turn)
+            ? select_source_generic<&segment_identifier::multi_index>(
+                        turn, candidate_seg_id, previous_seg_id)
+            : select_source_generic<&segment_identifier::source_index>(
                         turn, candidate_seg_id, previous_seg_id);
-        }
-
-        // Use source_index
-        return select_source_generic<&segment_identifier::source_index>(
-                    turn, candidate_seg_id, previous_seg_id);
     }
 
     inline bool traverse_possible(signed_size_type turn_index) const
@@ -342,25 +328,27 @@ public :
             return true;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(OverlayType == overlay_buffer)
-            && possible[0] && possible[1])
+        if BOOST_GEOMETRY_CONSTEXPR (OverlayType == overlay_buffer)
         {
-            // Buffers sometimes have multiple overlapping pieces, where remaining
-            // distance could lead to the wrong choice. Take the matching operation.
-
-            bool is_target[2] = {0};
-            for (int i = 0; i < 2; i++)
+            if (possible[0] && possible[1])
             {
-                turn_operation_type const& next_op = m_turns[next[i]].operations[i];
-                is_target[i] = next_op.operation == target_operation;
-            }
+                // Buffers sometimes have multiple overlapping pieces, where remaining
+                // distance could lead to the wrong choice. Take the matching operation.
 
-            if (is_target[0] != is_target[1])
-            {
-                // Take the matching operation
-                selected_op_index = is_target[0] ? 0 : 1;
-                debug_traverse(turn, turn.operations[selected_op_index], "Candidate cc target");
-                return true;
+                bool is_target[2] = {0};
+                for (int i = 0; i < 2; i++)
+                {
+                    turn_operation_type const& next_op = m_turns[next[i]].operations[i];
+                    is_target[i] = next_op.operation == target_operation;
+                }
+
+                if (is_target[0] != is_target[1])
+                {
+                    // Take the matching operation
+                    selected_op_index = is_target[0] ? 0 : 1;
+                    debug_traverse(turn, turn.operations[selected_op_index], "Candidate cc target");
+                    return true;
+                }
             }
         }
 
@@ -517,7 +505,7 @@ public :
             result = select_cc_operation(turn, start_turn_index,
                                          selected_op_index);
         }
-        else if (BOOST_GEOMETRY_CONDITION(OverlayType == overlay_dissolve))
+        else if BOOST_GEOMETRY_CONSTEXPR (OverlayType == overlay_dissolve)
         {
             result = select_preferred_operation(turn, turn_index,
                 start_turn_index, selected_op_index);
@@ -559,16 +547,18 @@ public :
         return true;
     }
 
-    inline int priority_of_turn_in_cluster_union(sort_by_side::rank_type selected_rank,
+    // Returns a priority, the one with the highst priority will be selected
+    //   0: not OK
+    //   1: OK following spike out
+    //   2: OK but next turn is in same cluster
+    //   3: OK
+    //   4: OK and start turn matches
+    //   5: OK and start turn and start operation both match, this is the best
+    inline int priority_of_turn_in_cluster(sort_by_side::rank_type selected_rank,
             typename sbs_type::rp const& ranked_point,
-            std::set<signed_size_type> const& cluster_indices,
+            cluster_info const& cinfo,
             signed_size_type start_turn_index, int start_op_index) const
     {
-        // Returns 0: not OK
-        // Returns 1: OK but next turn is in same cluster
-        // Returns 2: OK
-        // Returns 3: OK and start turn matches
-        // Returns 4: OK and start turn and start op both match
         if (ranked_point.rank != selected_rank
             || ranked_point.direction != sort_by_side::dir_to)
         {
@@ -584,24 +574,30 @@ public :
             return 0;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(OverlayType != overlay_dissolve)
-            && (op.enriched.count_left != 0 || op.enriched.count_right == 0))
+        if BOOST_GEOMETRY_CONSTEXPR (OverlayType != overlay_dissolve)
         {
-            // Check counts: in some cases interior rings might be generated with
-            // polygons on both sides. For dissolve it can be anything.
-            return 0;
+            if ((op.enriched.count_left != 0 || op.enriched.count_right == 0) && cinfo.spike_count > 0)
+            {
+                // Check counts: in some cases interior rings might be generated with
+                // polygons on both sides. For dissolve it can be anything.
+
+                // If this forms a spike, going to/from the cluster point in the same
+                // (opposite) direction, it can still be used.
+                return 1;
+            }
         }
 
         bool const to_start = ranked_point.turn_index == start_turn_index;
         bool const to_start_index = ranked_point.operation_index == start_op_index;
 
         bool const next_in_same_cluster
-                = cluster_indices.count(op.enriched.get_next_turn_index()) > 0;
+                = cinfo.turn_indices.count(op.enriched.get_next_turn_index()) > 0;
 
-        return to_start && to_start_index ? 4
-            : to_start ? 3
-            : next_in_same_cluster ? 1
-            : 2
+        // Return the priority as described above
+        return to_start && to_start_index ? 5
+            : to_start ? 4
+            : next_in_same_cluster ? 2
+            : 3
             ;
     }
 
@@ -646,9 +642,8 @@ public :
         return -1;
     }
 
-    inline bool select_from_cluster_union(signed_size_type& turn_index,
-        std::set<signed_size_type> const& cluster_indices,
-        int& op_index, sbs_type const& sbs,
+    inline bool select_from_cluster(signed_size_type& turn_index, int& op_index,
+        cluster_info const& cinfo, sbs_type const& sbs,
         signed_size_type start_turn_index, int start_op_index) const
     {
         sort_by_side::rank_type const selected_rank = select_rank(sbs);
@@ -656,15 +651,15 @@ public :
         int current_priority = 0;
         for (std::size_t i = 1; i < sbs.m_ranked_points.size(); i++)
         {
-            typename sbs_type::rp const& ranked_point = sbs.m_ranked_points[i];
+            auto const& ranked_point = sbs.m_ranked_points[i];
 
             if (ranked_point.rank > selected_rank)
             {
                 break;
             }
 
-            int const priority = priority_of_turn_in_cluster_union(selected_rank,
-                ranked_point, cluster_indices, start_turn_index, start_op_index);
+            int const priority = priority_of_turn_in_cluster(selected_rank,
+                ranked_point, cinfo, start_turn_index, start_op_index);
 
             if (priority > current_priority)
             {
@@ -676,7 +671,9 @@ public :
         return current_priority > 0;
     }
 
-    inline bool analyze_cluster_intersection(signed_size_type& turn_index,
+    // Analyzes a clustered intersection, as if it is clustered.
+    // This is used for II intersections
+    inline bool analyze_ii_cluster(signed_size_type& turn_index,
                 int& op_index, sbs_type const& sbs) const
     {
         // Select the rank based on regions and isolation
@@ -791,34 +788,34 @@ public :
             return false;
         }
 
-        cluster_exits<OverlayType, Turns, sbs_type> exits(m_turns, cinfo.turn_indices, sbs);
-
-        if (exits.apply(turn_index, op_index))
-        {
-            return true;
-        }
-
-        bool result = false;
-
-        if (is_union)
+        if BOOST_GEOMETRY_CONSTEXPR (is_union)
         {
-            result = select_from_cluster_union(turn_index, cinfo.turn_indices,
-                                               op_index, sbs,
-                                               start_turn_index, start_op_index);
-            if (! result)
+            if (cinfo.open_count == 0 && cinfo.spike_count > 0)
             {
-               // There no way out found, try second pass in collected cluster exits
-               result = exits.apply(turn_index, op_index, false);
+                // Leave the cluster from the spike.
+                for (std::size_t i = 0; i + 1 < sbs.m_ranked_points.size(); i++)
+                {
+                    auto const& current = sbs.m_ranked_points[i];
+                    auto const& next = sbs.m_ranked_points[i + 1];
+                    if (current.rank == next.rank
+                        && current.direction == detail::overlay::sort_by_side::dir_from
+                        && next.direction == detail::overlay::sort_by_side::dir_to)
+                    {
+                        turn_index = next.turn_index;
+                        op_index = next.operation_index;
+                        return true;
+                    }
+                }
             }
         }
-        else
-        {
-            result = analyze_cluster_intersection(turn_index, op_index, sbs);
-        }
-        return result;
+
+        return select_from_cluster(turn_index, op_index, cinfo, sbs, start_turn_index, start_op_index);
     }
 
     // Analyzes a non-clustered "ii" intersection, as if it is clustered.
+    // TODO: it, since select_from_cluster is generalized (July 2024),
+    // uses a specific function used only for "ii" intersections.
+    // Therefore the sort-by-side solution should not be necessary and can be refactored.
     inline bool analyze_ii_intersection(signed_size_type& turn_index, int& op_index,
                     turn_type const& current_turn,
                     segment_identifier const& previous_seg_id)
@@ -842,9 +839,7 @@ public :
 
         sbs.apply(current_turn.point);
 
-        bool result = analyze_cluster_intersection(turn_index, op_index, sbs);
-
-        return result;
+        return analyze_ii_cluster(turn_index, op_index, sbs);
     }
 
     inline void change_index_for_self_turn(signed_size_type& to_vertex_index,
@@ -852,56 +847,58 @@ public :
                 turn_operation_type const& start_op,
                 int start_op_index) const
     {
-        if (BOOST_GEOMETRY_CONDITION(OverlayType != overlay_buffer
-                                     && OverlayType != overlay_dissolve))
+        if BOOST_GEOMETRY_CONSTEXPR (OverlayType != overlay_buffer
+                                  && OverlayType != overlay_dissolve)
         {
             return;
         }
-
-        const bool allow_uu = OverlayType != overlay_buffer;
-
-        // It travels to itself, can happen. If this is a buffer, it can
-        // sometimes travel to itself in the following configuration:
-        //
-        // +---->--+
-        // |       |
-        // |   +---*----+ *: one turn, with segment index 2/7
-        // |   |   |    |
-        // |   +---C    | C: closing point (start/end)
-        // |            |
-        // +------------+
-        //
-        // If it starts on segment 2 and travels to itself on segment 2, that
-        // should be corrected to 7 because that is the shortest path
-        //
-        // Also a uu turn (touching with another buffered ring) might have this
-        // apparent configuration, but there it should
-        // always travel the whole ring
-
-        turn_operation_type const& other_op
-                = start_turn.operations[1 - start_op_index];
-
-        bool const correct
-                = (allow_uu || ! start_turn.both(operation_union))
-                  && start_op.seg_id.source_index == other_op.seg_id.source_index
-                  && start_op.seg_id.multi_index == other_op.seg_id.multi_index
-                  && start_op.seg_id.ring_index == other_op.seg_id.ring_index
-                  && start_op.seg_id.segment_index == to_vertex_index;
+        else // else prevents unreachable code warning
+        {
+            const bool allow_uu = OverlayType != overlay_buffer;
+
+            // It travels to itself, can happen. If this is a buffer, it can
+            // sometimes travel to itself in the following configuration:
+            //
+            // +---->--+
+            // |       |
+            // |   +---*----+ *: one turn, with segment index 2/7
+            // |   |   |    |
+            // |   +---C    | C: closing point (start/end)
+            // |            |
+            // +------------+
+            //
+            // If it starts on segment 2 and travels to itself on segment 2, that
+            // should be corrected to 7 because that is the shortest path
+            //
+            // Also a uu turn (touching with another buffered ring) might have this
+            // apparent configuration, but there it should
+            // always travel the whole ring
+
+            turn_operation_type const& other_op
+                    = start_turn.operations[1 - start_op_index];
+
+            bool const correct
+                    = (allow_uu || ! start_turn.both(operation_union))
+                      && start_op.seg_id.source_index == other_op.seg_id.source_index
+                      && start_op.seg_id.multi_index == other_op.seg_id.multi_index
+                      && start_op.seg_id.ring_index == other_op.seg_id.ring_index
+                      && start_op.seg_id.segment_index == to_vertex_index;
 
 #if defined(BOOST_GEOMETRY_DEBUG_TRAVERSE)
-        std::cout << " WARNING: self-buffer "
-                  << " correct=" << correct
-                  << " turn=" << operation_char(start_turn.operations[0].operation)
-                  << operation_char(start_turn.operations[1].operation)
-                  << " start=" << start_op.seg_id.segment_index
-                  << " from=" << to_vertex_index
-                  << " to=" << other_op.enriched.travels_to_vertex_index
-                  << std::endl;
+            std::cout << " WARNING: self-buffer "
+                      << " correct=" << correct
+                      << " turn=" << operation_char(start_turn.operations[0].operation)
+                      << operation_char(start_turn.operations[1].operation)
+                      << " start=" << start_op.seg_id.segment_index
+                      << " from=" << to_vertex_index
+                      << " to=" << other_op.enriched.travels_to_vertex_index
+                      << std::endl;
 #endif
 
-        if (correct)
-        {
-            to_vertex_index = other_op.enriched.travels_to_vertex_index;
+            if (correct)
+            {
+                to_vertex_index = other_op.enriched.travels_to_vertex_index;
+            }
         }
     }
 
@@ -960,7 +957,7 @@ public :
                 = has_points
                 && current_turn.is_clustered()
                 && m_turns[start_turn_index].cluster_id == current_turn.cluster_id;
-        if (BOOST_GEOMETRY_CONDITION(target_operation == operation_intersection))
+        if BOOST_GEOMETRY_CONSTEXPR (target_operation == operation_intersection)
         {
             // Intersection or difference
 
@@ -1036,13 +1033,11 @@ private :
     Geometry2 const& m_geometry2;
     Turns& m_turns;
     Clusters const& m_clusters;
-    RobustPolicy const& m_robust_policy;
-    SideStrategy m_strategy;
+    Strategy m_strategy;
     Visitor& m_visitor;
 };
 
 
-
 }} // namespace detail::overlay
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
index 692de7345..89d44b5b2 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -45,7 +46,6 @@ template
     typename TurnInfoMap,
     typename Clusters,
     typename Strategy,
-    typename RobustPolicy,
     typename Visitor,
     typename Backtrack
 >
@@ -55,8 +55,7 @@ struct traversal_ring_creator
             <
                 Reverse1, Reverse2, OverlayType,
                 Geometry1, Geometry2, Turns, Clusters,
-                RobustPolicy,
-                decltype(std::declval<Strategy>().side()),
+                Strategy,
                 Visitor
             > traversal_type;
 
@@ -70,16 +69,15 @@ struct traversal_ring_creator
             Turns& turns, TurnInfoMap& turn_info_map,
             Clusters const& clusters,
             Strategy const& strategy,
-            RobustPolicy const& robust_policy, Visitor& visitor)
+            Visitor& visitor)
         : m_trav(geometry1, geometry2, turns, clusters,
-                 robust_policy, strategy.side(), visitor)
+                 strategy, visitor)
         , m_geometry1(geometry1)
         , m_geometry2(geometry2)
         , m_turns(turns)
         , m_turn_info_map(turn_info_map)
         , m_clusters(clusters)
         , m_strategy(strategy)
-        , m_robust_policy(robust_policy)
         , m_visitor(visitor)
     {
     }
@@ -113,13 +111,13 @@ struct traversal_ring_creator
             {
                 geometry::copy_segments<Reverse1>(m_geometry1,
                         previous_op.seg_id, to_vertex_index,
-                        m_strategy, m_robust_policy, current_ring);
+                        m_strategy, current_ring);
             }
             else
             {
                 geometry::copy_segments<Reverse2>(m_geometry2,
                         previous_op.seg_id, to_vertex_index,
-                        m_strategy, m_robust_policy, current_ring);
+                        m_strategy, current_ring);
             }
         }
 
@@ -162,7 +160,7 @@ struct traversal_ring_creator
         turn_type& current_turn = m_turns[turn_index];
         turn_operation_type& op = current_turn.operations[op_index];
         detail::overlay::append_no_collinear(current_ring, current_turn.point,
-                                             m_strategy, m_robust_policy);
+                                             m_strategy);
 
         // Register the visit
         m_trav.set_visited(current_turn, op);
@@ -179,7 +177,7 @@ struct traversal_ring_creator
         turn_operation_type& start_op = m_turns[start_turn_index].operations[start_op_index];
 
         detail::overlay::append_no_collinear(ring, start_turn.point,
-                                             m_strategy, m_robust_policy);
+                                             m_strategy);
 
         signed_size_type current_turn_index = start_turn_index;
         int current_op_index = start_op_index;
@@ -274,7 +272,7 @@ struct traversal_ring_creator
 
         if (traverse_error == traverse_error_none)
         {
-            remove_spikes_at_closure(ring, m_strategy, m_robust_policy);
+            remove_spikes_at_closure(ring, m_strategy);
             fix_closure(ring, m_strategy);
 
             std::size_t const min_num_points
@@ -298,7 +296,7 @@ struct traversal_ring_creator
                              m_turns[turn_index].operations[op_index],
                              traverse_error,
                              m_geometry1, m_geometry2,
-                             m_strategy, m_robust_policy,
+                             m_strategy,
                              state, m_visitor);
         }
     }
@@ -324,31 +322,40 @@ struct traversal_ring_creator
     void iterate(Rings& rings, std::size_t& finalized_ring_size,
                  typename Backtrack::state_type& state)
     {
-        for (std::size_t turn_index = 0; turn_index < m_turns.size(); ++turn_index)
+        auto do_iterate = [&](int phase)
         {
-            turn_type const& turn = m_turns[turn_index];
-
-            if (turn.discarded || turn.blocked())
+            for (std::size_t turn_index = 0; turn_index < m_turns.size(); ++turn_index)
             {
-                // Skip discarded and blocked turns
-                continue;
-            }
+                turn_type const& turn = m_turns[turn_index];
 
-            if (turn.both(operation_continue))
-            {
-                traverse_with_operation(turn, turn_index,
-                        get_operation_index(turn),
-                        rings, finalized_ring_size, state);
-            }
-            else
-            {
-                for (int op_index = 0; op_index < 2; op_index++)
+                if (turn.discarded || turn.blocked() || (phase == 0 && turn.is_clustered()))
                 {
-                    traverse_with_operation(turn, turn_index, op_index,
+                    // Skip discarded and blocked turns
+                    continue;
+                }
+
+                if (turn.both(operation_continue))
+                {
+                    traverse_with_operation(turn, turn_index,
+                            get_operation_index(turn),
                             rings, finalized_ring_size, state);
                 }
+                else
+                {
+                    for (int op_index = 0; op_index < 2; op_index++)
+                    {
+                        traverse_with_operation(turn, turn_index, op_index,
+                                rings, finalized_ring_size, state);
+                    }
+                }
             }
-        }
+        };
+
+        // Traverse all turns, first starting with the non-clustered ones.
+        do_iterate(0);
+
+        // Traverse remaining clustered turns, if any.
+        do_iterate(1);
     }
 
     template <typename Rings>
@@ -409,7 +416,6 @@ struct traversal_ring_creator
     TurnInfoMap& m_turn_info_map; // contains turn-info information per ring
     Clusters const& m_clusters;
     Strategy const& m_strategy;
-    RobustPolicy const& m_robust_policy;
     Visitor& m_visitor;
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
index 1858c9ec2..0756034af 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
@@ -1,10 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2015-2016 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2018-2020.
-// Modifications copyright (c) 2018-2020 Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2018-2024.
+// Modifications copyright (c) 2018-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -26,7 +27,7 @@
 #include <boost/geometry/core/access.hpp>
 #endif
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 #include <cstddef>
 #include <map>
@@ -83,7 +84,6 @@ template
     typename Geometry2,
     typename Turns,
     typename Clusters,
-    typename RobustPolicy,
     typename Visitor
 >
 struct traversal_switch_detector
@@ -138,12 +138,11 @@ struct traversal_switch_detector
     inline traversal_switch_detector(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
             Turns& turns, Clusters const& clusters,
-            RobustPolicy const& robust_policy, Visitor& visitor)
+            Visitor& visitor)
         : m_geometry1(geometry1)
         , m_geometry2(geometry2)
         , m_turns(turns)
         , m_clusters(clusters)
-        , m_robust_policy(robust_policy)
         , m_visitor(visitor)
     {
     }
@@ -391,11 +390,19 @@ struct traversal_switch_detector
     {
         for (turn_type& turn : m_turns)
         {
+            constexpr auto order1 = geometry::point_order<Geometry1>::value;
+            constexpr bool reverse1 = (order1 == boost::geometry::counterclockwise)
+                ? ! Reverse1 : Reverse1;
+
+            constexpr auto order2 = geometry::point_order<Geometry2>::value;
+            constexpr bool reverse2 = (order2 == boost::geometry::counterclockwise)
+                ? ! Reverse2 : Reverse2;
+
             // For difference, for the input walked through in reverse,
             // the meaning is reversed: what is isolated is actually not,
             // and vice versa.
             bool const reverseMeaningInTurn
-                    = (Reverse1 || Reverse2)
+                    = (reverse1 || reverse2)
                       && ! turn.is_self()
                       && ! turn.is_clustered()
                       && uu_or_ii(turn)
@@ -409,8 +416,8 @@ struct traversal_switch_detector
                 {
                     bool const reverseMeaningInOp
                         = reverseMeaningInTurn
-                          && ((op.seg_id.source_index == 0 && Reverse1)
-                               || (op.seg_id.source_index == 1 && Reverse2));
+                          && ((op.seg_id.source_index == 0 && reverse1)
+                               || (op.seg_id.source_index == 1 && reverse2));
 
                     // It is assigned to isolated if it's property is "Yes",
                     // (one connected interior, or chained).
@@ -525,19 +532,21 @@ struct traversal_switch_detector
             return ! uu_or_ii(turn);
         }
 
-        if (BOOST_GEOMETRY_CONDITION(target_operation == operation_union))
+        if BOOST_GEOMETRY_CONSTEXPR (target_operation == operation_union)
         {
             // It is a cluster, check zones
             // (assigned by sort_by_side/handle colocations) of both operations
             return turn.operations[0].enriched.zone
                     == turn.operations[1].enriched.zone;
         }
-
-        // For an intersection, two regions connect if they are not ii
-        // (ii-regions are isolated) or, in some cases, not iu (for example
-        // when a multi-polygon is inside an interior ring and connecting it)
-        return ! (turn.both(operation_intersection)
-                  || turn.combination(operation_intersection, operation_union));
+        else // else prevents unreachable code warning
+        {
+            // For an intersection, two regions connect if they are not ii
+            // (ii-regions are isolated) or, in some cases, not iu (for example
+            // when a multi-polygon is inside an interior ring and connecting it)
+            return ! (turn.both(operation_intersection)
+                      || turn.combination(operation_intersection, operation_union));
+        }
     }
 
     void create_region(signed_size_type& new_region_id, ring_identifier const& ring_id,
@@ -682,11 +691,13 @@ struct traversal_switch_detector
         {
             turn_type const& turn = m_turns[turn_index];
 
-            if (turn.discarded
-                && BOOST_GEOMETRY_CONDITION(target_operation == operation_intersection))
+            if BOOST_GEOMETRY_CONSTEXPR (target_operation == operation_intersection)
             {
-                // Discarded turn (union currently still needs it to determine regions)
-                continue;
+                if (turn.discarded)
+                {
+                    // Discarded turn (union currently still needs it to determine regions)
+                    continue;
+                }
             }
 
             for (auto const& op : turn.operations)
@@ -724,7 +735,6 @@ struct traversal_switch_detector
     Clusters const& m_clusters;
     merge_map m_turns_per_ring;
     region_connection_map m_connected_regions;
-    RobustPolicy const& m_robust_policy;
     Visitor& m_visitor;
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/overlay/traverse.hpp b/inst/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
index d56b6b1b2..6c0b4488e 100644
--- a/inst/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
@@ -2,6 +2,10 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2024.
+// Modifications copyright (c) 2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -58,7 +62,6 @@ public :
     template
     <
         typename IntersectionStrategy,
-        typename RobustPolicy,
         typename Turns,
         typename Rings,
         typename TurnInfoMap,
@@ -68,7 +71,6 @@ public :
     static inline void apply(Geometry1 const& geometry1,
                 Geometry2 const& geometry2,
                 IntersectionStrategy const& intersection_strategy,
-                RobustPolicy const& robust_policy,
                 Turns& turns, Rings& rings,
                 TurnInfoMap& turn_info_map,
                 Clusters& clusters,
@@ -79,9 +81,9 @@ public :
                 Reverse1, Reverse2, OverlayType,
                 Geometry1, Geometry2,
                 Turns, Clusters,
-                RobustPolicy, Visitor
+                Visitor
             > switch_detector(geometry1, geometry2, turns, clusters,
-                   robust_policy, visitor);
+                   visitor);
 
         switch_detector.iterate();
         reset_visits(turns);
@@ -92,10 +94,10 @@ public :
                 Geometry1, Geometry2,
                 Turns, TurnInfoMap, Clusters,
                 IntersectionStrategy,
-                RobustPolicy, Visitor,
+                Visitor,
                 Backtrack
             > trav(geometry1, geometry2, turns, turn_info_map, clusters,
-                   intersection_strategy, robust_policy, visitor);
+                   intersection_strategy, visitor);
 
         std::size_t finalized_ring_size = boost::size(rings);
 
diff --git a/inst/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp b/inst/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
index e5ba6e30d..2b86d3c6b 100644
--- a/inst/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
@@ -3,11 +3,11 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
-// Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2015, 2017, 2019.
-// Modifications copyright (c) 2015-2019 Oracle and/or its affiliates.
+// Copyright (c) 2013-2023 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -19,11 +19,9 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_POINT_IS_EQUAL_OR_SPIKE_HPP
 
 #include <boost/geometry/algorithms/detail/direction_code.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 #include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
 #include <boost/geometry/strategies/side.hpp>
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 
 
@@ -71,87 +69,19 @@ template
     typename Point1,
     typename Point2,
     typename Point3,
-    typename SideStrategy,
-    typename RobustPolicy
->
-inline bool point_is_spike_or_equal(Point1 const& last_point,
-            Point2 const& segment_a,
-            Point3 const& segment_b,
-            SideStrategy const& strategy,
-            RobustPolicy const& robust_policy)
-{
-    if (point_is_spike_or_equal(last_point, segment_a, segment_b, strategy))
-    {
-        return true;
-    }
-
-    if (BOOST_GEOMETRY_CONDITION(! RobustPolicy::enabled))
-    {
-        return false;
-    }
-
-    // Try using specified robust policy
-    typedef typename geometry::robust_point_type
-    <
-        Point1,
-        RobustPolicy
-    >::type robust_point_type;
-
-    robust_point_type last_point_rob, segment_a_rob, segment_b_rob;
-    geometry::recalculate(last_point_rob, last_point, robust_policy);
-    geometry::recalculate(segment_a_rob, segment_a, robust_policy);
-    geometry::recalculate(segment_b_rob, segment_b, robust_policy);
-
-    return point_is_spike_or_equal
-        (
-            last_point_rob,
-            segment_a_rob,
-            segment_b_rob,
-            strategy
-        );
-}
-
-template
-<
-    typename Point1,
-    typename Point2,
-    typename Point3,
-    typename SideStrategy,
-    typename RobustPolicy
+    typename SideStrategy
 >
 inline bool point_is_collinear(Point1 const& last_point,
             Point2 const& segment_a,
             Point3 const& segment_b,
-            SideStrategy const& strategy,
-            RobustPolicy const& robust_policy)
+            SideStrategy const& strategy)
 {
     int const side = strategy.apply(segment_a, segment_b, last_point);
     if (side == 0)
     {
         return true;
     }
-
-    // This part (or whole method, because it is then trivial)
-    // will be removed after rescaling
-    if (BOOST_GEOMETRY_CONDITION(! RobustPolicy::enabled))
-    {
-        return false;
-    }
-
-    // Redo, using specified robust policy
-    typedef typename geometry::robust_point_type
-    <
-        Point1,
-        RobustPolicy
-    >::type robust_point_type;
-
-    robust_point_type last_point_rob, segment_a_rob, segment_b_rob;
-    geometry::recalculate(last_point_rob, last_point, robust_policy);
-    geometry::recalculate(segment_a_rob, segment_a, robust_policy);
-    geometry::recalculate(segment_b_rob, segment_b, robust_policy);
-
-    int const side_rob = strategy.apply(segment_a_rob, segment_b_rob, last_point_rob);
-    return side_rob == 0;
+    return false;
 }
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/recalculate.hpp b/inst/include/boost/geometry/algorithms/detail/recalculate.hpp
deleted file mode 100644
index eb633c9c2..000000000
--- a/inst/include/boost/geometry/algorithms/detail/recalculate.hpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2013 Bruno Lalande, Paris, France.
-// Copyright (c) 2013 Mateusz Loskot, London, UK.
-// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2020.
-// Modifications copyright (c) 2020 Oracle and/or its affiliates.
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RECALCULATE_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RECALCULATE_HPP
-
-
-#include <cstddef>
-
-#include <boost/concept/requires.hpp>
-#include <boost/concept_check.hpp>
-#include <boost/numeric/conversion/bounds.hpp>
-#include <boost/numeric/conversion/cast.hpp>
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/range/size.hpp>
-
-#include <boost/geometry/arithmetic/arithmetic.hpp>
-#include <boost/geometry/algorithms/append.hpp>
-#include <boost/geometry/algorithms/clear.hpp>
-#include <boost/geometry/core/access.hpp>
-#include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/core/exterior_ring.hpp>
-#include <boost/geometry/core/tags.hpp>
-
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace recalculate
-{
-
-template <std::size_t Dimension>
-struct recalculate_point
-{
-    template <typename Point1, typename Point2, typename Strategy>
-    static inline void apply(Point1& point1, Point2 const& point2, Strategy const& strategy)
-    {
-        std::size_t const dim = Dimension - 1;
-        geometry::set<dim>(point1, strategy.template apply<dim>(geometry::get<dim>(point2)));
-        recalculate_point<dim>::apply(point1, point2, strategy);
-    }
-};
-
-template <>
-struct recalculate_point<0>
-{
-    template <typename Point1, typename Point2, typename Strategy>
-    static inline void apply(Point1&, Point2 const&, Strategy const&)
-    {
-    }
-};
-
-
-template <std::size_t Dimension>
-struct recalculate_indexed
-{
-    template <typename Geometry1, typename Geometry2, typename Strategy>
-    static inline void apply(Geometry1& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        // Do it for both indices in one dimension
-        static std::size_t const dim = Dimension - 1;
-        geometry::set<0, dim>(geometry1, strategy.template apply<dim>(geometry::get<0, dim>(geometry2)));
-        geometry::set<1, dim>(geometry1, strategy.template apply<dim>(geometry::get<1, dim>(geometry2)));
-        recalculate_indexed<dim>::apply(geometry1, geometry2, strategy);
-    }
-};
-
-template <>
-struct recalculate_indexed<0>
-{
-
-    template <typename Geometry1, typename Geometry2, typename Strategy>
-    static inline void apply(Geometry1& , Geometry2 const& , Strategy const& )
-    {
-    }
-};
-
-struct range_to_range
-{
-    template
-    <
-        typename Range1,
-        typename Range2,
-        typename Strategy
-    >
-    static inline void apply(Range1& destination, Range2 const& source,
-            Strategy const& strategy)
-    {
-        typedef typename geometry::point_type<Range2>::type point_type;
-        typedef recalculate_point<geometry::dimension<point_type>::value> per_point;
-        geometry::clear(destination);
-
-        for (auto const& source_point : source)
-        {
-            point_type p;
-            per_point::apply(p, source_point, strategy);
-            geometry::append(destination, p);
-        }
-    }
-};
-
-struct polygon_to_polygon
-{
-private:
-    template
-    <
-        typename IteratorIn,
-        typename IteratorOut,
-        typename Strategy
-    >
-    static inline void iterate(IteratorIn begin, IteratorIn end,
-                    IteratorOut it_out,
-                    Strategy const& strategy)
-    {
-        for (IteratorIn it_in = begin; it_in != end;  ++it_in, ++it_out)
-        {
-            range_to_range::apply(*it_out, *it_in, strategy);
-        }
-    }
-
-    template
-    <
-        typename InteriorRingsOut,
-        typename InteriorRingsIn,
-        typename Strategy
-    >
-    static inline void apply_interior_rings(
-                    InteriorRingsOut& interior_rings_out,
-                    InteriorRingsIn const& interior_rings_in,
-                    Strategy const& strategy)
-    {
-        traits::resize<InteriorRingsOut>::apply(interior_rings_out,
-            boost::size(interior_rings_in));
-
-        iterate(
-            boost::begin(interior_rings_in), boost::end(interior_rings_in),
-            boost::begin(interior_rings_out),
-            strategy);
-    }
-
-public:
-    template
-    <
-        typename Polygon1,
-        typename Polygon2,
-        typename Strategy
-    >
-    static inline void apply(Polygon1& destination, Polygon2 const& source,
-            Strategy const& strategy)
-    {
-        range_to_range::apply(geometry::exterior_ring(destination),
-            geometry::exterior_ring(source), strategy);
-
-        apply_interior_rings(geometry::interior_rings(destination),
-            geometry::interior_rings(source), strategy);
-    }
-};
-
-}} // namespace detail::recalculate
-#endif // DOXYGEN_NO_DETAIL
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template
-<
-    typename Geometry1,
-    typename Geometry2,
-    typename Tag1 = typename geometry::tag<Geometry1>::type,
-    typename Tag2 = typename geometry::tag<Geometry2>::type
->
-struct recalculate : not_implemented<Tag1, Tag2>
-{};
-
-template <typename Point1, typename Point2>
-struct recalculate<Point1, Point2, point_tag, point_tag>
-    : detail::recalculate::recalculate_point<geometry::dimension<Point1>::value>
-{};
-
-template <typename Box1, typename Box2>
-struct recalculate<Box1, Box2, box_tag, box_tag>
-    : detail::recalculate::recalculate_indexed<geometry::dimension<Box1>::value>
-{};
-
-template <typename Segment1, typename Segment2>
-struct recalculate<Segment1, Segment2, segment_tag, segment_tag>
-    : detail::recalculate::recalculate_indexed<geometry::dimension<Segment1>::value>
-{};
-
-template <typename Polygon1, typename Polygon2>
-struct recalculate<Polygon1, Polygon2, polygon_tag, polygon_tag>
-    : detail::recalculate::polygon_to_polygon
-{};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-
-template <typename Geometry1, typename Geometry2, typename Strategy>
-inline void recalculate(Geometry1& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-{
-    concepts::check<Geometry1>();
-    concepts::check<Geometry2 const>();
-
-    // static assert dimensions (/types) are the same
-
-    dispatch::recalculate<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
-}
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RECALCULATE_HPP
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp b/inst/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
index 41366e316..3a2b30785 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
@@ -31,6 +31,8 @@
 
 #include <boost/geometry/geometries/helper_geometry.hpp>
 
+#include <boost/geometry/util/numeric_cast.hpp>
+
 namespace boost { namespace geometry
 {
 
@@ -836,7 +838,7 @@ struct areal_areal
             segment_identifier const& seg_id = turn.operations[OpId].seg_id;
 
             signed_size_type
-                count = boost::numeric_cast<signed_size_type>(
+                count = util::numeric_cast<signed_size_type>(
                             geometry::num_interior_rings(
                                 detail::single_geometry(analyser.geometry, seg_id)));
 
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp b/inst/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
index 91f4dac5b..d513ec319 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
@@ -150,7 +150,7 @@ inline void copy_boundary_points_of_mls(MultiLinestring const& mls, Strategy con
 template <typename Geometry, typename Strategy>
 class boundary_checker<Geometry, Strategy, multi_linestring_tag>
 {
-    using point_type = typename point_type<Geometry>::type;
+    using point_type = point_type_t<Geometry>;
     using mutable_point_type = typename helper_geometry<point_type>::type;
 
 public:
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp b/inst/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
index 39d27da01..7bea32274 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
@@ -30,6 +30,7 @@
 
 #include <boost/geometry/util/condition.hpp>
 #include <boost/geometry/util/range.hpp>
+#include <boost/geometry/util/type_traits.hpp>
 
 #include <type_traits>
 
@@ -42,10 +43,12 @@ namespace detail { namespace relate {
 // NOTE: This iterates through single geometries for which turns were not generated.
 //       It doesn't mean that the geometry is disjoint, only that no turns were detected.
 
-template <std::size_t OpId,
-          typename Geometry,
-          typename Tag = typename geometry::tag<Geometry>::type,
-          bool IsMulti = std::is_base_of<multi_tag, Tag>::value
+template
+<
+    std::size_t OpId,
+    typename Geometry,
+    typename Tag = typename geometry::tag<Geometry>::type,
+    bool IsMulti = util::is_multi<Geometry>::value
 >
 struct for_each_disjoint_geometry_if
     : public not_implemented<Tag>
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp b/inst/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
index 1e35e64fc..1dfea7490 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
@@ -17,25 +17,20 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/range/size.hpp>
 
-#include <boost/geometry/core/assert.hpp>
-#include <boost/geometry/core/topological_dimension.hpp>
-
-#include <boost/geometry/util/condition.hpp>
-#include <boost/geometry/util/range.hpp>
-#include <boost/geometry/util/type_traits.hpp>
-
-#include <boost/geometry/algorithms/num_interior_rings.hpp>
 #include <boost/geometry/algorithms/detail/point_on_border.hpp>
-#include <boost/geometry/algorithms/detail/sub_range.hpp>
-#include <boost/geometry/algorithms/detail/single_geometry.hpp>
-
-#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
-#include <boost/geometry/algorithms/detail/relate/turns.hpp>
 #include <boost/geometry/algorithms/detail/relate/boundary_checker.hpp>
 #include <boost/geometry/algorithms/detail/relate/follow_helpers.hpp>
-
+#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+#include <boost/geometry/algorithms/detail/single_geometry.hpp>
+#include <boost/geometry/algorithms/detail/sub_range.hpp>
+#include <boost/geometry/algorithms/num_interior_rings.hpp>
+#include <boost/geometry/core/assert.hpp>
+#include <boost/geometry/core/topological_dimension.hpp>
 #include <boost/geometry/geometries/helper_geometry.hpp>
-
+#include <boost/geometry/util/constexpr.hpp>
+#include <boost/geometry/util/range.hpp>
+#include <boost/geometry/util/type_traits.hpp>
 #include <boost/geometry/views/detail/closed_clockwise_view.hpp>
 
 namespace boost { namespace geometry
@@ -854,30 +849,30 @@ struct linear_areal
                 m_exit_watcher.reset_detected_exit();
             }
 
-            if ( BOOST_GEOMETRY_CONDITION( util::is_multi<OtherGeometry>::value )
-              && m_first_from_unknown )
+            if BOOST_GEOMETRY_CONSTEXPR (util::is_multi<OtherGeometry>::value)
             {
-                // For MultiPolygon many x/u operations may be generated as a first IP
-                // if for all turns x/u was generated and any of the Polygons doesn't contain the LineString
-                // then we know that the LineString is outside
-                // Similar with the u/u turns, if it was the first one it doesn't mean that the
-                // Linestring came from the exterior
-                if ( ( m_previous_operation == overlay::operation_blocked
-                    && ( op != overlay::operation_blocked // operation different than block
-                        || seg_id.multi_index != m_previous_turn_ptr->operations[op_id].seg_id.multi_index ) ) // or the next single-geometry
-                  || ( m_previous_operation == overlay::operation_union
-                    && ! turn_on_the_same_ip<op_id>(*m_previous_turn_ptr, *it,
-                                                    strategy) )
-                   )
+                if (m_first_from_unknown)
                 {
-                    update<interior, exterior, '1', TransposeResult>(res);
-                    if ( m_first_from_unknown_boundary_detected )
+                    // For MultiPolygon many x/u operations may be generated as a first IP
+                    // if for all turns x/u was generated and any of the Polygons doesn't contain the LineString
+                    // then we know that the LineString is outside
+                    // Similar with the u/u turns, if it was the first one it doesn't mean that the
+                    // Linestring came from the exterior
+                    if ((m_previous_operation == overlay::operation_blocked
+                        && (op != overlay::operation_blocked // operation different than block
+                            || seg_id.multi_index != m_previous_turn_ptr->operations[op_id].seg_id.multi_index)) // or the next single-geometry
+                     || (m_previous_operation == overlay::operation_union
+                        && ! turn_on_the_same_ip<op_id>(*m_previous_turn_ptr, *it, strategy)))
                     {
-                        update<boundary, exterior, '0', TransposeResult>(res);
-                    }
+                        update<interior, exterior, '1', TransposeResult>(res);
+                        if ( m_first_from_unknown_boundary_detected )
+                        {
+                            update<boundary, exterior, '0', TransposeResult>(res);
+                        }
 
-                    m_first_from_unknown = false;
-                    m_first_from_unknown_boundary_detected = false;
+                        m_first_from_unknown = false;
+                        m_first_from_unknown_boundary_detected = false;
+                    }
                 }
             }
 
@@ -1037,7 +1032,7 @@ struct linear_areal
                     }
                 }
 
-                if ( BOOST_GEOMETRY_CONDITION( util::is_multi<OtherGeometry>::value ) )
+                if BOOST_GEOMETRY_CONSTEXPR (util::is_multi<OtherGeometry>::value)
                 {
                     m_first_from_unknown = false;
                     m_first_from_unknown_boundary_detected = false;
@@ -1123,9 +1118,9 @@ struct linear_areal
                         }
                         else
                         {
-                            if ( BOOST_GEOMETRY_CONDITION( util::is_multi<OtherGeometry>::value )
+                            if BOOST_GEOMETRY_CONSTEXPR (util::is_multi<OtherGeometry>::value)
                               /*&& ( op == overlay::operation_blocked
-                                || op == overlay::operation_union )*/ ) // if we're here it's u or x
+                                || op == overlay::operation_union )*/ // if we're here it's u or x
                             {
                                 m_first_from_unknown = true;
                             }
@@ -1150,9 +1145,9 @@ struct linear_areal
                                 }
                                 else
                                 {
-                                    if ( BOOST_GEOMETRY_CONDITION( util::is_multi<OtherGeometry>::value )
+                                    if BOOST_GEOMETRY_CONSTEXPR (util::is_multi<OtherGeometry>::value)
                                       /*&& ( op == overlay::operation_blocked
-                                        || op == overlay::operation_union )*/ ) // if we're here it's u or x
+                                        || op == overlay::operation_union )*/ // if we're here it's u or x
                                     {
                                         BOOST_GEOMETRY_ASSERT(m_first_from_unknown);
                                         m_first_from_unknown_boundary_detected = true;
@@ -1200,18 +1195,20 @@ struct linear_areal
             // For MultiPolygon many x/u operations may be generated as a first IP
             // if for all turns x/u was generated and any of the Polygons doesn't contain the LineString
             // then we know that the LineString is outside
-            if ( BOOST_GEOMETRY_CONDITION( util::is_multi<OtherGeometry>::value )
-              && m_first_from_unknown )
+            if BOOST_GEOMETRY_CONSTEXPR (util::is_multi<OtherGeometry>::value)
             {
-                update<interior, exterior, '1', TransposeResult>(res);
-                if ( m_first_from_unknown_boundary_detected )
+                if (m_first_from_unknown)
                 {
-                    update<boundary, exterior, '0', TransposeResult>(res);
-                }
+                    update<interior, exterior, '1', TransposeResult>(res);
+                    if ( m_first_from_unknown_boundary_detected )
+                    {
+                        update<boundary, exterior, '0', TransposeResult>(res);
+                    }
 
-                // done below
-                //m_first_from_unknown = false;
-                //m_first_from_unknown_boundary_detected = false;
+                    // done below
+                    //m_first_from_unknown = false;
+                    //m_first_from_unknown_boundary_detected = false;
+                }
             }
 
             // here, the possible exit is the real one
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp b/inst/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp
index 204a4fe22..8d6fe39a5 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/multi_point_geometry.hpp
@@ -182,8 +182,7 @@ struct multi_point_single_geometry
                              Result & result,
                              Strategy const& strategy)
     {
-        typedef typename point_type<SingleGeometry>::type point2_type;
-        typedef model::box<point2_type> box2_type;
+        using box2_type = model::box<point_type_t<SingleGeometry>> ;
 
         box2_type box2;
         geometry::envelope(single_geometry, box2, strategy);
@@ -402,11 +401,9 @@ class multi_point_multi_geometry_ii_ib
     };
 
 public:
-    typedef typename point_type<MultiPoint>::type point1_type;
-    typedef typename point_type<MultiGeometry>::type point2_type;
-    typedef model::box<point1_type> box1_type;
-    typedef model::box<point2_type> box2_type;
-    typedef std::pair<box2_type, std::size_t> box_pair_type;
+    using box1_type = model::box<point_type_t<MultiPoint>>;
+    using box2_type = model::box<point_type_t<MultiGeometry>>;
+    using box_pair_type = std::pair<box2_type, std::size_t>;
 
     template <typename Result, typename Strategy>
     static inline void apply(MultiPoint const& multi_point,
@@ -439,12 +436,10 @@ class multi_point_multi_geometry_ii_ib
 template <typename MultiPoint, typename MultiGeometry, bool Transpose>
 struct multi_point_multi_geometry_ii_ib_ie
 {
-    typedef typename point_type<MultiPoint>::type point1_type;
-    typedef typename point_type<MultiGeometry>::type point2_type;
-    typedef model::box<point1_type> box1_type;
-    typedef model::box<point2_type> box2_type;
-    typedef std::pair<box2_type, std::size_t> box_pair_type;
-    typedef std::vector<box_pair_type> boxes_type;
+    using box1_type = model::box<point_type_t<MultiPoint>>;
+    using box2_type = model::box<point_type_t<MultiGeometry>>;
+    using box_pair_type = std::pair<box2_type, std::size_t>;
+    using boxes_type = std::vector<box_pair_type>;
 
     template <typename Result, typename Strategy>
     static inline void apply(MultiPoint const& multi_point,
@@ -532,9 +527,7 @@ struct multi_point_multi_geometry
                              Result & result,
                              Strategy const& strategy)
     {
-        typedef typename point_type<MultiGeometry>::type point2_type;
-        typedef model::box<point2_type> box2_type;
-        typedef std::pair<box2_type, std::size_t> box_pair_type;
+        using box_pair_type = std::pair<model::box<point_type_t<MultiGeometry>>, std::size_t>;
 
         std::size_t count2 = boost::size(multi_geometry);
         std::vector<box_pair_type> boxes(count2);
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/point_point.hpp b/inst/include/boost/geometry/algorithms/detail/relate/point_point.hpp
index 9e8ccaca2..1348c0dc6 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/point_point.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/point_point.hpp
@@ -1,10 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2023-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2013-2022.
 // Modifications copyright (c) 2013-2023, Oracle and/or its affiliates.
-
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -197,10 +197,12 @@ struct multipoint_multipoint
           || relate::may_update<exterior, interior, '0'>(result) )
         {
             // NlogN + MlogN
-            bool is_disjoint = search<Transpose, Strategy>(first_sorted_mpt, first_iterated_mpt, result);
+            bool const is_disjoint = search<Transpose, Strategy>(first_sorted_mpt, first_iterated_mpt, result);
 
-            if ( BOOST_GEOMETRY_CONDITION(is_disjoint || result.interrupt) )
+            if (is_disjoint || BOOST_GEOMETRY_CONDITION(result.interrupt) )
+            {
                 return;
+            }
         }
 
         if ( relate::may_update<interior, interior, '0'>(result)
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/result.hpp b/inst/include/boost/geometry/algorithms/detail/relate/result.hpp
index 84c342e63..de982c37a 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/result.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/result.hpp
@@ -27,7 +27,7 @@
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/exception.hpp>
 #include <boost/geometry/core/static_assert.hpp>
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/sequence.hpp>
 
 namespace boost { namespace geometry {
@@ -292,15 +292,18 @@ struct interrupt_dispatch<Mask, true>
     template <char V>
     static inline bool check_element(char m)
     {
-        if ( BOOST_GEOMETRY_CONDITION(V >= '0' && V <= '9') )
+        if BOOST_GEOMETRY_CONSTEXPR (V >= '0' && V <= '9')
         {
             return m == 'F' || ( m < V && m >= '0' && m <= '9' );
         }
-        else if ( BOOST_GEOMETRY_CONDITION(V == 'T') )
+        else if BOOST_GEOMETRY_CONSTEXPR (V == 'T')
         {
             return m == 'F';
         }
-        return false;
+        else
+        {
+            return false;
+        }
     }
 };
 
diff --git a/inst/include/boost/geometry/algorithms/detail/relate/turns.hpp b/inst/include/boost/geometry/algorithms/detail/relate/turns.hpp
index d98794e78..48661261a 100644
--- a/inst/include/boost/geometry/algorithms/detail/relate/turns.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/relate/turns.hpp
@@ -2,11 +2,11 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2013-2022.
-// Modifications copyright (c) 2013-2022 Oracle and/or its affiliates.
-
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -22,9 +22,6 @@
 
 #include <boost/geometry/geometries/helper_geometry.hpp>
 
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
-#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
-
 #include <boost/geometry/strategies/cartesian/point_in_point.hpp>
 #include <boost/geometry/strategies/spherical/point_in_point.hpp>
 #include <boost/geometry/strategies/distance.hpp>
@@ -60,24 +57,13 @@ struct get_turns
             typename geometry::point_type<Geometry1>::type
         >::type;
 
-    template <typename Strategy>
-    struct robust_policy_type
-        : geometry::rescale_overlay_policy_type
-            <
-                Geometry1,
-                Geometry2,
-                typename Strategy::cs_tag
-            >
-    {};
-
     template
     <
-        typename Strategy,
-        typename RobustPolicy = typename robust_policy_type<Strategy>::type
+        typename Strategy
     >
     struct turn_info_type
     {
-        using ratio_type = typename segment_ratio_type<turn_point_type, RobustPolicy>::type;
+        using ratio_type = typename segment_ratio_type<turn_point_type>::type;
         using type = overlay::turn_info
             <
                 turn_point_type,
@@ -95,23 +81,6 @@ struct get_turns
                              Geometry2 const& geometry2,
                              InterruptPolicy & interrupt_policy,
                              Strategy const& strategy)
-    {
-        typedef typename robust_policy_type<Strategy>::type robust_policy_t;
-
-        robust_policy_t robust_policy
-                = geometry::get_rescale_policy<robust_policy_t>(
-                    geometry1, geometry2, strategy);
-
-        apply(turns, geometry1, geometry2, interrupt_policy, strategy, robust_policy);
-    }
-
-    template <typename Turns, typename InterruptPolicy, typename Strategy, typename RobustPolicy>
-    static inline void apply(Turns & turns,
-                             Geometry1 const& geometry1,
-                             Geometry2 const& geometry2,
-                             InterruptPolicy & interrupt_policy,
-                             Strategy const& strategy,
-                             RobustPolicy const& robust_policy)
     {
         static const bool reverse1 = detail::overlay::do_reverse
             <
@@ -133,7 +102,7 @@ struct get_turns
                 reverse2,
                 GetTurnPolicy
             >::apply(0, geometry1, 1, geometry2,
-                     strategy, robust_policy,
+                     strategy,
                      turns, interrupt_policy);
     }
 };
diff --git a/inst/include/boost/geometry/algorithms/detail/sections/section_functions.hpp b/inst/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
index df4f31025..d91ce7633 100644
--- a/inst/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2015-2021.
-// Modifications copyright (c) 2015-2021, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -15,8 +16,7 @@
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 
 // For spherical/geographic longitudes covered_by point/box
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp>
@@ -37,11 +37,7 @@ template
 <
     std::size_t Dimension,
     typename Geometry,
-    typename CastedCSTag = typename tag_cast
-                            <
-                                typename cs_tag<Geometry>::type,
-                                spherical_tag
-                            >::type
+    typename CastedCSTag = tag_cast_t<cs_tag_t<Geometry>, spherical_tag>
 >
 struct preceding_check
 {
@@ -121,41 +117,28 @@ template
 <
     std::size_t Dimension,
     typename Point,
-    typename Box,
-    typename RobustPolicy
+    typename Box
 >
 inline bool preceding(int dir,
                       Point const& point,
                       Box const& point_box,
-                      Box const& other_box,
-                      RobustPolicy const& robust_policy)
+                      Box const& other_box)
 {
-    using box_point_type = typename geometry::point_type<Box>::type;
-    typename geometry::robust_point_type<box_point_type, RobustPolicy>::type robust_point;
-    geometry::recalculate(robust_point, point, robust_policy);
-
-    // After recalculate() to prevent warning: 'robust_point' may be used uninitialized
-    assert_coordinate_type_equal(robust_point, point_box);
-
-    return preceding_check<Dimension, Box>::apply(dir, robust_point,
-                                                    point_box,
-                                                    other_box);
+    return preceding_check<Dimension, Box>::apply(dir, point, point_box, other_box);
 }
 
 template
 <
     std::size_t Dimension,
     typename Point,
-    typename Box,
-    typename RobustPolicy
+    typename Box
 >
 inline bool exceeding(int dir,
                       Point const& point,
                       Box const& point_box,
-                      Box const& other_box,
-                      RobustPolicy const& robust_policy)
+                      Box const& other_box)
 {
-    return preceding<Dimension>(-dir, point, point_box, other_box, robust_policy);
+    return preceding<Dimension>(-dir, point, point_box, other_box);
 }
 
 
diff --git a/inst/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp b/inst/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
index 3317ff70a..872f54668 100644
--- a/inst/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
@@ -5,11 +5,11 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 // Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2021.
-// Modifications copyright (c) 2013-2021 Oracle and/or its affiliates.
-
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -38,7 +38,6 @@
 #include <boost/geometry/algorithms/envelope.hpp>
 #include <boost/geometry/algorithms/expand.hpp>
 #include <boost/geometry/algorithms/detail/expand_by_epsilon.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 #include <boost/geometry/algorithms/detail/ring_identifier.hpp>
 #include <boost/geometry/algorithms/detail/signed_size_type.hpp>
 
@@ -47,13 +46,12 @@
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/point_order.hpp>
 #include <boost/geometry/core/static_assert.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
 #include <boost/geometry/util/sequence.hpp>
@@ -151,11 +149,7 @@ template
     typename DimensionVector,
     std::size_t Index,
     std::size_t Count,
-    typename CastedCSTag = typename tag_cast
-                            <
-                                typename cs_tag<Point>::type,
-                                spherical_tag
-                            >::type
+    typename CastedCSTag = tag_cast_t<cs_tag_t<Point>, spherical_tag>
 >
 struct get_direction_loop
 {
@@ -386,19 +380,15 @@ struct sectionalize_part
     template
     <
         typename Iterator,
-        typename RobustPolicy,
         typename Sections,
         typename Strategy
     >
     static inline void apply(Sections& sections,
                              Iterator begin, Iterator end,
-                             RobustPolicy const& robust_policy,
                              Strategy const& strategy,
                              ring_identifier ring_id,
                              std::size_t max_count)
     {
-        boost::ignore_unused(robust_policy);
-
         using section_type = typename boost::range_value<Sections>::type;
         using box_type = typename section_type::box_type;
         using point_type = typename geometry::point_type<box_type>::type;
@@ -409,12 +399,6 @@ struct sectionalize_part
                  == util::sequence_size<DimensionVector>::value
             );
 
-        using robust_point_type = typename geometry::robust_point_type
-            <
-                point_type,
-                RobustPolicy
-            >::type;
-
         std::size_t const count = std::distance(begin, end);
         if (count == 0)
         {
@@ -429,23 +413,20 @@ struct sectionalize_part
         std::size_t last_non_duplicate_index = sections.size();
 
         Iterator it = begin;
-        robust_point_type previous_robust_point;
-        geometry::recalculate(previous_robust_point, *it, robust_policy);
+        point_type previous_point;
+        geometry::detail::conversion::convert_point_to_point(*it, previous_point);
 
-        for(Iterator previous = it++;
-            it != end;
-            ++previous, ++it, index++)
+        for (Iterator previous = it++; it != end; ++previous, ++it, index++)
         {
-            robust_point_type current_robust_point;
-            geometry::recalculate(current_robust_point, *it, robust_policy);
-            model::referring_segment<robust_point_type> robust_segment(
-                    previous_robust_point, current_robust_point);
+            point_type current_point;
+            geometry::detail::conversion::convert_point_to_point(*it, current_point);
+            model::referring_segment<point_type> segment(previous_point, current_point);
 
             int direction_classes[dimension_count] = {0};
             get_direction_loop
             <
                 point_type, DimensionVector, 0, dimension_count
-            >::apply(robust_segment, direction_classes);
+            >::apply(segment, direction_classes);
 
             // if "dir" == 0 for all point-dimensions, it is duplicate.
             // Those sections might be omitted, if wished, lateron
@@ -459,7 +440,7 @@ struct sectionalize_part
                 if (check_duplicate_loop
                     <
                         0, geometry::dimension<point_type>::type::value
-                    >::apply(robust_segment)
+                    >::apply(segment)
                     )
                 {
                     duplicate = true;
@@ -513,15 +494,15 @@ struct sectionalize_part
 
                 // In cartesian this is envelope of previous point expanded with current point
                 // in non-cartesian this is envelope of a segment
-                box_first_in_section<typename cs_tag<robust_point_type>::type>
-                    ::apply(section.bounding_box, previous_robust_point, current_robust_point, strategy);
+                box_first_in_section<cs_tag_t<point_type>>
+                    ::apply(section.bounding_box, previous_point, current_point, strategy);
             }
             else
             {
                 // In cartesian this is expand with current point
                 // in non-cartesian this is expand with a segment
-                box_next_in_section<typename cs_tag<robust_point_type>::type>
-                    ::apply(section.bounding_box, previous_robust_point, current_robust_point, strategy);
+                box_next_in_section<cs_tag_t<point_type>>
+                    ::apply(section.bounding_box, previous_point, current_point, strategy);
             }
 
             section.end_index = index + 1;
@@ -530,7 +511,7 @@ struct sectionalize_part
             {
                 ndi++;
             }
-            previous_robust_point = current_robust_point;
+            previous_point = current_point;
         }
 
         // Add last section if applicable
@@ -564,12 +545,10 @@ struct sectionalize_range
     template
     <
         typename Range,
-        typename RobustPolicy,
         typename Sections,
         typename Strategy
     >
     static inline void apply(Range const& range,
-                             RobustPolicy const& robust_policy,
                              Sections& sections,
                              Strategy const& strategy,
                              ring_identifier ring_id,
@@ -597,7 +576,7 @@ struct sectionalize_range
 
         sectionalize_part<DimensionVector>::apply(sections,
             boost::begin(view), boost::end(view),
-            robust_policy, strategy,
+            strategy,
             ring_id, max_count);
     }
 };
@@ -612,12 +591,10 @@ struct sectionalize_polygon
     template
     <
         typename Polygon,
-        typename RobustPolicy,
         typename Sections,
         typename Strategy
     >
     static inline void apply(Polygon const& poly,
-                RobustPolicy const& robust_policy,
                 Sections& sections,
                 Strategy const& strategy,
                 ring_identifier ring_id,
@@ -629,7 +606,7 @@ struct sectionalize_polygon
             >;
 
         ring_id.ring_index = -1;
-        sectionalizer::apply(exterior_ring(poly), robust_policy, sections,
+        sectionalizer::apply(exterior_ring(poly), sections,
                          strategy, ring_id, max_count);
 
         ring_id.ring_index++;
@@ -637,7 +614,7 @@ struct sectionalize_polygon
         for (auto it = boost::begin(rings); it != boost::end(rings);
              ++it, ++ring_id.ring_index)
         {
-            sectionalizer::apply(*it, robust_policy, sections,
+            sectionalizer::apply(*it, sections,
                              strategy, ring_id, max_count);
         }
     }
@@ -649,17 +626,15 @@ struct sectionalize_box
     template
     <
         typename Box,
-        typename RobustPolicy,
         typename Sections,
         typename Strategy
     >
     static inline void apply(Box const& box,
-                RobustPolicy const& robust_policy,
                 Sections& sections,
                 Strategy const& strategy,
                 ring_identifier const& ring_id, std::size_t max_count)
     {
-        using point_type = typename point_type<Box>::type;
+        using point_type = point_type_t<Box>;
 
         assert_dimension<Box, 2>();
 
@@ -686,7 +661,7 @@ struct sectionalize_box
         sectionalize_range
             <
                 closed, false, DimensionVector
-            >::apply(points, robust_policy, sections,
+            >::apply(points, sections,
                      strategy, ring_id, max_count);
     }
 };
@@ -697,12 +672,10 @@ struct sectionalize_multi
     template
     <
         typename MultiGeometry,
-        typename RobustPolicy,
         typename Sections,
         typename Strategy
     >
     static inline void apply(MultiGeometry const& multi,
-                RobustPolicy const& robust_policy,
                 Sections& sections,
                 Strategy const& strategy,
                 ring_identifier ring_id,
@@ -711,7 +684,7 @@ struct sectionalize_multi
         ring_id.multi_index = 0;
         for (auto it = boost::begin(multi); it != boost::end(multi); ++it, ++ring_id.multi_index)
         {
-            Policy::apply(*it, robust_policy, sections,
+            Policy::apply(*it, sections,
                           strategy,
                           ring_id, max_count);
         }
@@ -721,24 +694,31 @@ struct sectionalize_multi
 template <typename Sections, typename Strategy>
 inline void enlarge_sections(Sections& sections, Strategy const&)
 {
-    // Expand the box to avoid missing any intersection. The amount is
-    // should be larger than epsilon. About the value itself: the smaller
-    // it is, the higher the risk to miss intersections. The larger it is,
-    // the more comparisons are made, which is not harmful for the result
-    // (but it might be for the performance).
-    // So it should be on the high side.
-
-    // Use a compilable and workable epsilon for all types, for example:
+    // Expand the box to avoid missing any intersection.
+    // About the value itself: the smaller it is,
+    // the higher the risk to miss intersections.
+    // The larger it is, the more comparisons are made,
+    // which is not harmful for the result,
+    // but it might be for the performance.
+    // So it should be on the higher side.
+    //
+    // The current value:
     // - for double :~ 2.22e-13
     // - for float  :~ 1e-4
     // - for Boost.Multiprecision (50) :~ 5.35e-48
     // - for Boost.Rational : 0/1
 
+    // WARNING: don't use decltype here.
+    // Earlier code used decltype(section.bonding_box) below,
+    // but that somehow is not accepted by the NVCC (CUDA 12.4) compiler.
+    using section_t = typename boost::range_value<Sections>::type;
+    using box_t = typename section_t::box_type;
+    using coor_t = typename geometry::coordinate_type<box_t>::type;
+
+    static auto const eps = math::scaled_epsilon<coor_t>(1000);
+
     for (auto& section : sections)
     {
-        using gt = decltype(section.bounding_box);
-        using ct = typename geometry::coordinate_type<gt>::type;
-        static ct const eps = math::scaled_epsilon<ct>(1000);
         expand_by_epsilon(section.bounding_box, eps);
     }
 }
@@ -862,10 +842,8 @@ struct sectionalize<multi_linestring_tag, MultiLinestring, Reverse, DimensionVec
     \tparam Geometry type of geometry to check
     \tparam Sections type of sections to create
     \param geometry geometry to create sections from
-    \param robust_policy policy to handle robustness issues
     \param sections structure with sections
     \param strategy strategy for envelope calculation
-    \param expand_strategy strategy for partitions
     \param source_index index to assign to the ring_identifiers
     \param max_count maximal number of points per section
         (defaults to 10, this seems to give the fastest results)
@@ -877,11 +855,9 @@ template
     typename DimensionVector,
     typename Geometry,
     typename Sections,
-    typename RobustPolicy,
     typename Strategy
 >
 inline void sectionalize(Geometry const& geometry,
-                RobustPolicy const& robust_policy,
                 Sections& sections,
                 Strategy const& strategy,
                 int source_index = 0,
@@ -900,7 +876,7 @@ inline void sectionalize(Geometry const& geometry,
             Geometry,
             Reverse,
             DimensionVector
-        >::apply(geometry, robust_policy, sections,
+        >::apply(geometry, sections,
                  strategy,
                  ring_id, max_count);
 
@@ -913,11 +889,9 @@ template
     bool Reverse,
     typename DimensionVector,
     typename Geometry,
-    typename Sections,
-    typename RobustPolicy
+    typename Sections
 >
 inline void sectionalize(Geometry const& geometry,
-                         RobustPolicy const& robust_policy,
                          Sections& sections,
                          int source_index = 0,
                          std::size_t max_count = 10)
@@ -932,7 +906,7 @@ inline void sectionalize(Geometry const& geometry,
     boost::geometry::sectionalize
         <
             Reverse, DimensionVector
-        >(geometry, robust_policy, sections,
+        >(geometry, sections,
           strategy_type(),
           source_index, max_count);
 }
diff --git a/inst/include/boost/geometry/algorithms/detail/single_geometry.hpp b/inst/include/boost/geometry/algorithms/detail/single_geometry.hpp
index c7d2192fb..054771feb 100644
--- a/inst/include/boost/geometry/algorithms/detail/single_geometry.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/single_geometry.hpp
@@ -18,6 +18,7 @@
 #include <boost/geometry/core/assert.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/util/range.hpp>
+#include <boost/geometry/util/type_traits.hpp>
 
 namespace boost { namespace geometry {
 
@@ -29,11 +30,7 @@ namespace detail_dispatch {
 template
 <
     typename Geometry,
-    bool IsMulti = std::is_base_of
-                    <
-                        multi_tag,
-                        typename geometry::tag<Geometry>::type
-                    >::value
+    bool IsMulti = util::is_multi<Geometry>::value
 >
 struct single_geometry
 {
diff --git a/inst/include/boost/geometry/algorithms/detail/sub_range.hpp b/inst/include/boost/geometry/algorithms/detail/sub_range.hpp
index d0ac6fba6..c1ae9fefb 100644
--- a/inst/include/boost/geometry/algorithms/detail/sub_range.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/sub_range.hpp
@@ -25,6 +25,7 @@
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/util/range.hpp>
+#include <boost/geometry/util/type_traits.hpp>
 
 namespace boost { namespace geometry {
 
@@ -33,9 +34,12 @@ namespace boost { namespace geometry {
 #ifndef DOXYGEN_NO_DISPATCH
 namespace detail_dispatch {
 
-template <typename Geometry,
-          typename Tag = typename geometry::tag<Geometry>::type,
-          bool IsMulti = std::is_base_of<multi_tag, Tag>::value>
+template
+<
+    typename Geometry,
+    typename Tag = typename geometry::tag<Geometry>::type,
+    bool IsMulti = util::is_multi<Geometry>::value
+>
 struct sub_range : not_implemented<Tag>
 {};
 
diff --git a/inst/include/boost/geometry/algorithms/detail/touches/implementation.hpp b/inst/include/boost/geometry/algorithms/detail/touches/implementation.hpp
index 15a899e70..515f827dd 100644
--- a/inst/include/boost/geometry/algorithms/detail/touches/implementation.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/touches/implementation.hpp
@@ -5,9 +5,9 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2022 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2022.
-// Modifications copyright (c) 2013-2022, Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -39,8 +39,6 @@
 
 #include <boost/geometry/geometries/helper_geometry.hpp>
 
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
-
 #include <boost/geometry/strategies/relate/cartesian.hpp>
 #include <boost/geometry/strategies/relate/geographic.hpp>
 #include <boost/geometry/strategies/relate/spherical.hpp>
@@ -255,7 +253,7 @@ struct areal_areal
                 detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
                 detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
                 detail::overlay::assign_null_policy
-            >(geometry1, geometry2, strategy, detail::no_rescale_policy(), turns, policy);
+            >(geometry1, geometry2, strategy, turns, policy);
 
         return policy.result()
             && ! geometry::detail::touches::rings_containing(geometry1, geometry2, strategy)
@@ -526,7 +524,7 @@ struct self_touches
         detail::self_get_turn_points::get_turns
             <
                 false, policy_type
-            >::apply(geometry, strategy, detail::no_rescale_policy(),
+            >::apply(geometry, strategy,
                      turns, policy, 0, true);
 
         return policy.result();
diff --git a/inst/include/boost/geometry/algorithms/detail/touches/interface.hpp b/inst/include/boost/geometry/algorithms/detail/touches/interface.hpp
index 271697c5d..b7f6f10b1 100644
--- a/inst/include/boost/geometry/algorithms/detail/touches/interface.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/touches/interface.hpp
@@ -49,10 +49,10 @@ template
 <
     typename Geometry1,
     typename Geometry2,
-    typename Tag1 = typename tag<Geometry1>::type,
-    typename Tag2 = typename tag<Geometry2>::type,
-    typename CastedTag1 = typename tag_cast<Tag1, pointlike_tag, linear_tag, areal_tag>::type,
-    typename CastedTag2 = typename tag_cast<Tag2, pointlike_tag, linear_tag, areal_tag>::type,
+    typename Tag1 = tag_t<Geometry1>,
+    typename Tag2 = tag_t<Geometry2>,
+    typename CastedTag1 = tag_cast_t<Tag1, pointlike_tag, linear_tag, areal_tag>,
+    typename CastedTag2 = tag_cast_t<Tag2, pointlike_tag, linear_tag, areal_tag>,
     bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
 >
 struct touches
diff --git a/inst/include/boost/geometry/algorithms/detail/tupled_output.hpp b/inst/include/boost/geometry/algorithms/detail/tupled_output.hpp
index 8d9652683..d13793e73 100644
--- a/inst/include/boost/geometry/algorithms/detail/tupled_output.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/tupled_output.hpp
@@ -520,10 +520,10 @@ struct expect_output_assert
                     TupledOut,
                     is_tag_same_as_pred<Tag>::template pred
                 >::value,
-            typename geometry::tag_cast
+            tag_cast_t
                 <
                     Tag, pointlike_tag, linear_tag, areal_tag
-                >::type
+                >
         >
 {};
 
@@ -540,29 +540,6 @@ struct expect_output
     : expect_output_assert<Geometry1, Geometry2, TupledOut, Tags>...
 {};
 
-
-template <typename CastedTag>
-struct single_tag_from_base_tag;
-
-template <>
-struct single_tag_from_base_tag<pointlike_tag>
-{
-    typedef point_tag type;
-};
-
-template <>
-struct single_tag_from_base_tag<linear_tag>
-{
-    typedef linestring_tag type;
-};
-
-template <>
-struct single_tag_from_base_tag<areal_tag>
-{
-    typedef polygon_tag type;
-};
-
-
 template
 <
     typename Geometry,
diff --git a/inst/include/boost/geometry/algorithms/detail/within/multi_point.hpp b/inst/include/boost/geometry/algorithms/detail/within/multi_point.hpp
index be984e936..8ba07e091 100644
--- a/inst/include/boost/geometry/algorithms/detail/within/multi_point.hpp
+++ b/inst/include/boost/geometry/algorithms/detail/within/multi_point.hpp
@@ -30,7 +30,6 @@
 #include <boost/geometry/algorithms/envelope.hpp>
 #include <boost/geometry/algorithms/detail/partition.hpp>
 #include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/box.hpp>
@@ -42,7 +41,7 @@
 #include <boost/geometry/strategies/covered_by.hpp>
 #include <boost/geometry/strategies/disjoint.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/type_traits.hpp>
 
 
@@ -123,12 +122,8 @@ struct multi_point_single_geometry
                              LinearOrAreal const& linear_or_areal,
                              Strategy const& strategy)
     {
-        //typedef typename boost::range_value<MultiPoint>::type point1_type;
-        typedef typename point_type<LinearOrAreal>::type point2_type;
-        typedef model::box<point2_type> box2_type;
-
         // Create envelope of geometry
-        box2_type box;
+        model::box<point_type_t<LinearOrAreal>> box;
         geometry::envelope(linear_or_areal, box, strategy);
         geometry::detail::expand_by_epsilon(box);
 
@@ -171,16 +166,17 @@ struct multi_point_multi_geometry
                              LinearOrAreal const& linear_or_areal,
                              Strategy const& strategy)
     {
-        typedef typename point_type<LinearOrAreal>::type point2_type;
-        typedef model::box<point2_type> box2_type;
+        using point2_type = point_type_t<LinearOrAreal>;
+        using box2_type = model::box<point2_type>;
+        using box_pair_type = std::pair<box2_type, std::size_t>;
+        using box_pair_vector = std::vector<box_pair_type>;
+
         static const bool is_linear = util::is_linear<LinearOrAreal>::value;
 
         // TODO: box pairs could be constructed on the fly, inside the rtree
 
         // Prepare range of envelopes and ids
         std::size_t count2 = boost::size(linear_or_areal);
-        typedef std::pair<box2_type, std::size_t> box_pair_type;
-        typedef std::vector<box_pair_type> box_pair_vector;
         box_pair_vector boxes(count2);
         for (std::size_t i = 0 ; i < count2 ; ++i)
         {
@@ -238,9 +234,16 @@ struct multi_point_multi_geometry
 
             if (boundaries > 0)
             {
-                if (BOOST_GEOMETRY_CONDITION(is_linear) && boundaries % 2 == 0)
+                if BOOST_GEOMETRY_CONSTEXPR (is_linear)
                 {
-                    found_interior = true;
+                    if (boundaries % 2 == 0)
+                    {
+                        found_interior = true;
+                    }
+                    else
+                    {
+                        found_boundary = true;
+                    }
                 }
                 else
                 {
diff --git a/inst/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp b/inst/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
deleted file mode 100644
index d6d0417c3..000000000
--- a/inst/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
+++ /dev/null
@@ -1,228 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-
-// This file was modified by Oracle on 2013-2023.
-// Modifications copyright (c) 2013-2023, Oracle and/or its affiliates.
-// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_WITHIN_NO_TURNS_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_WITHIN_NO_TURNS_HPP
-
-#include <boost/geometry/algorithms/detail/point_on_border.hpp>
-#include <boost/geometry/algorithms/detail/within/point_in_geometry.hpp>
-
-namespace boost { namespace geometry {
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail_dispatch { namespace within {
-
-// returns true if G1 is within G2
-// this function should be called only if there are no intersection points
-// otherwise it may return invalid result
-// e.g. when non-first point of G1 is outside G2 or when some rings of G1 are the same as rings of G2
-
-template <typename Geometry1,
-          typename Geometry2,
-          typename Tag1 = typename geometry::tag<Geometry1>::type,
-          typename Tag2 = typename geometry::tag<Geometry2>::type>
-struct within_no_turns
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        typedef typename geometry::point_type<Geometry1>::type point1_type;
-        point1_type p;
-        if (! geometry::point_on_border(p, geometry1))
-        {
-            return false;
-        }
-
-        return detail::within::point_in_geometry(p, geometry2, strategy) >= 0;
-    }
-};
-
-template <typename Geometry1, typename Geometry2>
-struct within_no_turns<Geometry1, Geometry2, ring_tag, polygon_tag>
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        typedef typename geometry::point_type<Geometry1>::type point1_type;
-        typedef typename geometry::point_type<Geometry2>::type point2_type;
-        point1_type p;
-        if (! geometry::point_on_border(p, geometry1))
-        {
-            return false;
-        }
-        // check if one of ring points is outside the polygon
-        if (detail::within::point_in_geometry(p, geometry2, strategy) < 0)
-        {
-            return false;
-        }
-        // Now check if holes of G2 aren't inside G1
-        auto const& rings2 = geometry::interior_rings(geometry2);
-        for (auto it = boost::begin(rings2); it != boost::end(rings2); ++it)
-        {
-            point2_type p;
-            if (! geometry::point_on_border(p, *it))
-            {
-                return false;
-            }
-            if (detail::within::point_in_geometry(p, geometry1, strategy) > 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-};
-
-template <typename Geometry1, typename Geometry2>
-struct within_no_turns<Geometry1, Geometry2, polygon_tag, polygon_tag>
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        typedef typename geometry::point_type<Geometry1>::type point1_type;
-        typedef typename geometry::point_type<Geometry2>::type point2_type;
-        point1_type p;
-        if (! geometry::point_on_border(p, geometry1))
-        {
-            return false;
-        }
-        // check if one of ring points is outside the polygon
-        if (detail::within::point_in_geometry(p, geometry2, strategy) < 0)
-        {
-            return false;
-        }
-        // Now check if holes of G2 aren't inside G1
-        auto const& rings2 = geometry::interior_rings(geometry2);
-        for (auto it2 = boost::begin(rings2); it2 != boost::end(rings2); ++it2)
-        {
-            point2_type p2;
-            if (! geometry::point_on_border(p2, *it2))
-            {
-                return false;
-            }
-            // if the hole of G2 is inside G1
-            if (detail::within::point_in_geometry(p2, geometry1, strategy) > 0)
-            {
-                // if it's also inside one of the G1 holes, it's ok
-                bool ok = false;
-                auto const& rings1 = geometry::interior_rings(geometry1);
-                for (auto it1 = boost::begin(rings1); it1 != boost::end(rings1); ++it1)
-                {
-                    if (detail::within::point_in_geometry(p2, *it1, strategy) < 0)
-                    {
-                        ok = true;
-                        break;
-                    }
-                }
-                if (! ok)
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-};
-
-template <typename Geometry1,
-          typename Geometry2,
-          typename Tag1 = typename geometry::tag<Geometry1>::type,
-          typename Tag2 = typename geometry::tag<Geometry2>::type,
-          bool IsMulti1 = boost::is_base_of<geometry::multi_tag, Tag1>::value,
-          bool IsMulti2 = boost::is_base_of<geometry::multi_tag, Tag2>::value>
-struct within_no_turns_multi
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        return within_no_turns<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
-    }
-};
-
-template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
-struct within_no_turns_multi<Geometry1, Geometry2, Tag1, Tag2, true, false>
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        // All values of G1 must be inside G2
-        typedef typename boost::range_value<Geometry1>::type subgeometry1;
-        for (auto it = boost::begin(geometry1) ; it != boost::end(geometry1) ; ++it )
-        {
-            if (! within_no_turns<subgeometry1, Geometry2>::apply(*it, geometry2, strategy))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-};
-
-template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
-struct within_no_turns_multi<Geometry1, Geometry2, Tag1, Tag2, false, true>
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        // G1 must be within at least one value of G2
-        typedef typename boost::range_value<Geometry2>::type subgeometry2;
-        for (auto it = boost::begin(geometry2); it != boost::end(geometry2); ++it)
-        {
-            if (within_no_turns<Geometry1, subgeometry2>::apply(geometry1, *it, strategy))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-};
-
-template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
-struct within_no_turns_multi<Geometry1, Geometry2, Tag1, Tag2, true, true>
-{
-    template <typename Strategy> static inline
-    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-    {
-        // each value of G1 must be inside at least one value of G2
-        typedef typename boost::range_value<Geometry1>::type subgeometry1;
-        for (auto it = boost::begin(geometry1) ; it != boost::end(geometry1) ; ++it)
-        {
-            if (! within_no_turns_multi<subgeometry1, Geometry2>::apply(*it, geometry2, strategy))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-};
-
-}} // namespace detail_dispatch::within
-
-namespace detail { namespace within {
-
-template <typename Geometry1, typename Geometry2, typename Strategy>
-inline bool within_no_turns(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
-{
-    return detail_dispatch::within::within_no_turns_multi<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
-}
-
-}} // namespace detail::within
-#endif // DOXYGEN_NO_DETAIL
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_WITHIN_NO_TURNS_HPP
diff --git a/inst/include/boost/geometry/algorithms/difference.hpp b/inst/include/boost/geometry/algorithms/difference.hpp
index ec6e4ea73..2d18b3142 100644
--- a/inst/include/boost/geometry/algorithms/difference.hpp
+++ b/inst/include/boost/geometry/algorithms/difference.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017-2023.
-// Modifications copyright (c) 2017-2023, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024, Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -21,8 +21,9 @@
 #include <boost/geometry/algorithms/detail/overlay/intersection_insert.hpp>
 #include <boost/geometry/algorithms/detail/visit.hpp>
 #include <boost/geometry/core/geometry_types.hpp>
+#include <boost/geometry/core/primary_single_tag.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/geometries/adapted/boost_variant.hpp> // For backward compatibility
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 #include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/relate/cartesian.hpp>
@@ -62,12 +63,10 @@ struct call_intersection_insert
     template
     <
         typename OutputIterator,
-        typename RobustPolicy,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -78,7 +77,7 @@ struct call_intersection_insert
                 overlay_difference,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, true>::value
-            >::apply(geometry1, geometry2, robust_policy, out, strategy);
+            >::apply(geometry1, geometry2, out, strategy);
     }
 };
 
@@ -86,10 +85,9 @@ struct call_intersection_insert
 template <typename Geometry1, typename Geometry2, typename SingleOut, typename OutTag>
 struct call_intersection_insert<Geometry1, Geometry2, SingleOut, OutTag, true>
 {
-    template <typename OutputIterator, typename RobustPolicy, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& ,
-                                       RobustPolicy const& ,
                                        OutputIterator out,
                                        Strategy const& )
     {
@@ -110,14 +108,10 @@ template
 >
 struct call_intersection_insert_tupled_base
 {
-    typedef typename geometry::detail::single_tag_from_base_tag
+    using single_tag = primary_single_tag_t
         <
-            typename geometry::tag_cast
-                <
-                    typename geometry::tag<Geometry1>::type,
-                    pointlike_tag, linear_tag, areal_tag
-                >::type
-        >::type single_tag;
+            tag_cast_t<tag_t<Geometry1>, pointlike_tag, linear_tag, areal_tag>
+        >;
 
     typedef detail::expect_output
         <
@@ -149,12 +143,10 @@ struct call_intersection_insert
     template
     <
         typename OutputIterator,
-        typename RobustPolicy,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -162,7 +154,7 @@ struct call_intersection_insert
             <
                 Geometry1, Geometry2,
                 typename base_t::access::type
-            >::apply(geometry1, geometry2, robust_policy,
+            >::apply(geometry1, geometry2,
                      base_t::access::get(out), strategy);
 
         return out;
@@ -188,12 +180,10 @@ struct call_intersection_insert
     template
     <
         typename OutputIterator,
-        typename RobustPolicy,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& ,
-                                       RobustPolicy const& ,
                                        OutputIterator out,
                                        Strategy const& )
     {
@@ -244,21 +234,10 @@ inline OutputIterator difference_insert(Geometry1 const& geometry1,
     //concepts::check<GeometryOut>();
     geometry::detail::output_geometry_concept_check<GeometryOut>::apply();
 
-    typedef typename geometry::rescale_overlay_policy_type
-        <
-            Geometry1,
-            Geometry2,
-            typename Strategy::cs_tag
-        >::type rescale_policy_type;
-
-    rescale_policy_type robust_policy
-        = geometry::get_rescale_policy<rescale_policy_type>(
-            geometry1, geometry2, strategy);
-
     return geometry::detail::difference::call_intersection_insert
         <
             Geometry1, Geometry2, GeometryOut
-        >::apply(geometry1, geometry2, robust_policy, out, strategy);
+        >::apply(geometry1, geometry2, out, strategy);
 }
 
 /*!
@@ -302,11 +281,7 @@ inline OutputIterator difference_insert(Geometry1 const& geometry1,
 template
 <
     typename Geometry, typename Collection,
-    typename CastedTag = typename geometry::tag_cast
-        <
-            typename geometry::tag<Geometry>::type,
-            pointlike_tag, linear_tag, areal_tag
-        >::type
+    typename CastedTag = tag_cast_t<tag_t<Geometry>, pointlike_tag, linear_tag, areal_tag>
 >
 struct multi_output_type
 {
diff --git a/inst/include/boost/geometry/algorithms/discrete_frechet_distance.hpp b/inst/include/boost/geometry/algorithms/discrete_frechet_distance.hpp
index c84ec99b4..aff351550 100644
--- a/inst/include/boost/geometry/algorithms/discrete_frechet_distance.hpp
+++ b/inst/include/boost/geometry/algorithms/discrete_frechet_distance.hpp
@@ -76,8 +76,8 @@ struct linestring_linestring
     {
         typedef typename distance_result
             <
-                typename point_type<Linestring1>::type,
-                typename point_type<Linestring2>::type,
+                point_type_t<Linestring1>,
+                point_type_t<Linestring2>,
                 Strategies
             >::type result_type;
         typedef typename boost::range_size<Linestring1>::type size_type1;
@@ -225,15 +225,15 @@ struct discrete_frechet_distance<default_strategy, false>
 
 
 /*!
-\brief Calculate discrete Frechet distance between two geometries (currently
-       works for LineString-LineString) using specified strategy.
+\brief \brief_calc2{discrete Frechet distance, between} \brief_strategy
+\details \details_free_function{discrete_frechet_distance, discrete Frechet distance, between}.
 \ingroup discrete_frechet_distance
 \tparam Geometry1 \tparam_geometry
 \tparam Geometry2 \tparam_geometry
-\tparam Strategy A type fulfilling a DistanceStrategy concept
-\param geometry1 Input geometry
-\param geometry2 Input geometry
-\param strategy Distance strategy to be used to calculate Pt-Pt distance
+\tparam Strategy \tparam_strategy{Distance}
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\param strategy \param_strategy{point to point distance}
 
 \qbk{distinguish,with strategy}
 \qbk{[include reference/algorithms/discrete_frechet_distance.qbk]}
@@ -242,7 +242,8 @@ struct discrete_frechet_distance<default_strategy, false>
 [heading Available Strategies]
 \* [link geometry.reference.strategies.strategy_distance_pythagoras Pythagoras (cartesian)]
 \* [link geometry.reference.strategies.strategy_distance_haversine Haversine (spherical)]
-[/ \* more (currently extensions): Vincenty\, Andoyer (geographic) ]
+\* One of the geographic point to point strategies
+
 
 [heading Example]
 [discrete_frechet_distance_strategy]
@@ -263,13 +264,13 @@ inline auto discrete_frechet_distance(Geometry1 const& geometry1,
 // Algorithm overload using default Pt-Pt distance strategy
 
 /*!
-\brief Calculate discrete Frechet distance between two geometries (currently
-       work for LineString-LineString).
+\brief \brief_calc2{discrete Frechet distance, between}
+\details \details_free_function{discrete_frechet_distance, discrete Frechet distance, between}.
 \ingroup discrete_frechet_distance
 \tparam Geometry1 \tparam_geometry
 \tparam Geometry2 \tparam_geometry
-\param geometry1 Input geometry
-\param geometry2 Input geometry
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
 
 \qbk{[include reference/algorithms/discrete_frechet_distance.qbk]}
 
diff --git a/inst/include/boost/geometry/algorithms/discrete_hausdorff_distance.hpp b/inst/include/boost/geometry/algorithms/discrete_hausdorff_distance.hpp
index 9e08c761a..88c5bb3a0 100644
--- a/inst/include/boost/geometry/algorithms/discrete_hausdorff_distance.hpp
+++ b/inst/include/boost/geometry/algorithms/discrete_hausdorff_distance.hpp
@@ -59,29 +59,29 @@ namespace detail { namespace discrete_hausdorff_distance
 struct point_range
 {
     template <typename Point, typename Range, typename Strategies>
-    static inline auto apply(Point const& pnt, Range const& rng,
+    static inline auto apply(Point const& pnt, Range const& range,
                              Strategies const& strategies)
     {
         typedef typename distance_result
             <
                 Point,
-                typename point_type<Range>::type,
+                point_type_t<Range>,
                 Strategies
             >::type result_type;
 
         typedef typename boost::range_size<Range>::type size_type;
 
-        boost::geometry::detail::throw_on_empty_input(rng);
+        boost::geometry::detail::throw_on_empty_input(range);
 
         auto const strategy = strategies.distance(dummy_point(), dummy_point());
 
-        size_type const n = boost::size(rng);
+        size_type const n = boost::size(range);
         result_type dis_min = 0;
         bool is_dis_min_set = false;
 
         for (size_type i = 0 ; i < n ; i++)
         {
-            result_type dis_temp = strategy.apply(pnt, range::at(rng, i));
+            result_type dis_temp = strategy.apply(pnt, range::at(range, i));
             if (! is_dis_min_set || dis_temp < dis_min)
             {
                 dis_min = dis_temp;
@@ -100,8 +100,8 @@ struct range_range
     {
         typedef typename distance_result
             <
-                typename point_type<Range1>::type,
-                typename point_type<Range2>::type,
+                point_type_t<Range1>,
+                point_type_t<Range2>,
                 Strategies
             >::type result_type;
 
@@ -115,8 +115,8 @@ struct range_range
 
 #ifdef BOOST_GEOMETRY_ENABLE_SIMILARITY_RTREE
         namespace bgi = boost::geometry::index;
-        typedef typename point_type<Range1>::type point_t;
-        typedef bgi::rtree<point_t, bgi::linear<4> > rtree_type;
+        using point_t = point_type_t<Range1>;
+        using rtree_type = bgi::rtree<point_t, bgi::linear<4> >;
         rtree_type rtree(boost::begin(r2), boost::end(r2));
         point_t res;
 #endif
@@ -141,27 +141,27 @@ struct range_range
 
 struct range_multi_range
 {
-    template <typename Range, typename Multi_range, typename Strategies>
-    static inline auto apply(Range const& rng, Multi_range const& mrng,
+    template <typename Range, typename MultiRange, typename Strategies>
+    static inline auto apply(Range const& range, MultiRange const& multi_range,
                              Strategies const& strategies)
     {
         typedef typename distance_result
             <
-                typename point_type<Range>::type,
-                typename point_type<Multi_range>::type,
+                point_type_t<Range>,
+                point_type_t<MultiRange>,
                 Strategies
             >::type result_type;
-        typedef typename boost::range_size<Multi_range>::type size_type;
+        typedef typename boost::range_size<MultiRange>::type size_type;
 
-        boost::geometry::detail::throw_on_empty_input(rng);
-        boost::geometry::detail::throw_on_empty_input(mrng);
+        boost::geometry::detail::throw_on_empty_input(range);
+        boost::geometry::detail::throw_on_empty_input(multi_range);
 
-        size_type b = boost::size(mrng);
+        size_type b = boost::size(multi_range);
         result_type haus_dis = 0;
 
         for (size_type j = 0 ; j < b ; j++)
         {
-            result_type dis_max = range_range::apply(rng, range::at(mrng, j), strategies);
+            result_type dis_max = range_range::apply(range, range::at(multi_range, j), strategies);
             if (dis_max > haus_dis)
             {
                 haus_dis = dis_max;
@@ -175,27 +175,27 @@ struct range_multi_range
 
 struct multi_range_multi_range
 {
-    template <typename Multi_Range1, typename Multi_range2, typename Strategies>
-    static inline auto apply(Multi_Range1 const& mrng1, Multi_range2 const& mrng2,
+    template <typename MultiRange1, typename MultiRange2, typename Strategies>
+    static inline auto apply(MultiRange1 const& multi_range1, MultiRange2 const& multi_range2,
                              Strategies const& strategies)
     {
         typedef typename distance_result
             <
-                typename point_type<Multi_Range1>::type,
-                typename point_type<Multi_range2>::type,
+                point_type_t<MultiRange1>,
+                point_type_t<MultiRange2>,
                 Strategies
             >::type result_type;
-        typedef typename boost::range_size<Multi_Range1>::type size_type;
+        typedef typename boost::range_size<MultiRange1>::type size_type;
 
-        boost::geometry::detail::throw_on_empty_input(mrng1);
-        boost::geometry::detail::throw_on_empty_input(mrng2);
+        boost::geometry::detail::throw_on_empty_input(multi_range1);
+        boost::geometry::detail::throw_on_empty_input(multi_range2);
 
-        size_type n = boost::size(mrng1);
+        size_type n = boost::size(multi_range1);
         result_type haus_dis = 0;
 
         for (size_type i = 0 ; i < n ; i++)
         {
-            result_type dis_max = range_multi_range::apply(range::at(mrng1, i), mrng2, strategies);
+            result_type dis_max = range_multi_range::apply(range::at(multi_range1, i), multi_range2, strategies);
             if (dis_max > haus_dis)
             {
                 haus_dis = dis_max;
@@ -314,16 +314,15 @@ struct discrete_hausdorff_distance<default_strategy, false>
 
 
 /*!
-\brief Calculate discrete Hausdorff distance between two geometries (currently
-    works for LineString-LineString, MultiPoint-MultiPoint, Point-MultiPoint,
-    MultiLineString-MultiLineString) using specified strategy.
+\brief \brief_calc2{discrete Hausdorff distance, between} \brief_strategy
+\details \details_free_function{discrete_hausdorff_distance, discrete Hausdorff distance, between}.
 \ingroup discrete_hausdorff_distance
 \tparam Geometry1 \tparam_geometry
 \tparam Geometry2 \tparam_geometry
-\tparam Strategy A type fulfilling a DistanceStrategy concept
-\param geometry1 Input geometry
-\param geometry2 Input geometry
-\param strategy Distance strategy to be used to calculate Pt-Pt distance
+\tparam Strategy \tparam_strategy{Distance}
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\param strategy \param_strategy{point to point distance}
 
 \qbk{distinguish,with strategy}
 \qbk{[include reference/algorithms/discrete_hausdorff_distance.qbk]}
@@ -332,7 +331,7 @@ struct discrete_hausdorff_distance<default_strategy, false>
 [heading Available Strategies]
 \* [link geometry.reference.strategies.strategy_distance_pythagoras Pythagoras (cartesian)]
 \* [link geometry.reference.strategies.strategy_distance_haversine Haversine (spherical)]
-[/ \* more (currently extensions): Vincenty\, Andoyer (geographic) ]
+\* One of the geographic point to point strategies
 
 [heading Example]
 [discrete_hausdorff_distance_strategy]
@@ -351,14 +350,13 @@ inline auto discrete_hausdorff_distance(Geometry1 const& geometry1,
 }
 
 /*!
-\brief Calculate discrete Hausdorff distance between two geometries (currently
-    works for LineString-LineString, MultiPoint-MultiPoint, Point-MultiPoint,
-    MultiLineString-MultiLineString).
+\brief \brief_calc2{discrete Hausdorff distance, between}
+\details \details_free_function{discrete_hausdorff_distance, discrete Hausdorff distance, between}.
 \ingroup discrete_hausdorff_distance
 \tparam Geometry1 \tparam_geometry
 \tparam Geometry2 \tparam_geometry
-\param geometry1 Input geometry
-\param geometry2 Input geometry
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
 
 \qbk{[include reference/algorithms/discrete_hausdorff_distance.qbk]}
 
diff --git a/inst/include/boost/geometry/algorithms/dispatch/closest_points.hpp b/inst/include/boost/geometry/algorithms/dispatch/closest_points.hpp
index e4f72de66..c803316dd 100644
--- a/inst/include/boost/geometry/algorithms/dispatch/closest_points.hpp
+++ b/inst/include/boost/geometry/algorithms/dispatch/closest_points.hpp
@@ -34,22 +34,22 @@ namespace dispatch
 template
 <
     typename Geometry1, typename Geometry2,
-    typename Tag1 = typename tag_cast
+    typename Tag1 = tag_cast_t
         <
-            typename tag<Geometry1>::type,
+            tag_t<Geometry1>,
             segment_tag,
             box_tag,
             linear_tag,
             areal_tag
-        >::type,
-    typename Tag2 = typename tag_cast
+        >,
+    typename Tag2 = tag_cast_t
         <
-            typename tag<Geometry2>::type,
+            tag_t<Geometry2>,
             segment_tag,
             box_tag,
             linear_tag,
             areal_tag
-        >::type,
+        >,
     bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
 >
 struct closest_points : not_implemented<Tag1, Tag2>
diff --git a/inst/include/boost/geometry/algorithms/dispatch/disjoint.hpp b/inst/include/boost/geometry/algorithms/dispatch/disjoint.hpp
index ef7499188..897ef9918 100644
--- a/inst/include/boost/geometry/algorithms/dispatch/disjoint.hpp
+++ b/inst/include/boost/geometry/algorithms/dispatch/disjoint.hpp
@@ -45,16 +45,16 @@ template
 <
     typename Geometry1, typename Geometry2,
     std::size_t DimensionCount = dimension<Geometry1>::type::value,
-    typename Tag1 = typename tag_cast
+    typename Tag1 = tag_cast_t
         <
-            typename tag<Geometry1>::type,
+            tag_t<Geometry1>,
             segment_tag, box_tag, linear_tag, areal_tag
-        >::type,
-    typename Tag2 = typename tag_cast
+        >,
+    typename Tag2 = tag_cast_t
         <
-            typename tag<Geometry2>::type,
+            tag_t<Geometry2>,
             segment_tag, box_tag, linear_tag, areal_tag
-        >::type,
+        >,
     bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
 >
 struct disjoint
diff --git a/inst/include/boost/geometry/algorithms/dispatch/distance.hpp b/inst/include/boost/geometry/algorithms/dispatch/distance.hpp
index eb9cd92f6..9272fd496 100644
--- a/inst/include/boost/geometry/algorithms/dispatch/distance.hpp
+++ b/inst/include/boost/geometry/algorithms/dispatch/distance.hpp
@@ -98,22 +98,22 @@ template
         <
             Geometry1, Geometry2
         >::type,
-    typename Tag1 = typename tag_cast
+    typename Tag1 = tag_cast_t
         <
-            typename tag<Geometry1>::type,
+            tag_t<Geometry1>,
             segment_tag,
             box_tag,
             linear_tag,
             areal_tag
-        >::type,
-    typename Tag2 = typename tag_cast
+        >,
+    typename Tag2 = tag_cast_t
         <
-            typename tag<Geometry2>::type,
+            tag_t<Geometry2>,
             segment_tag,
             box_tag,
             linear_tag,
             areal_tag
-        >::type,
+        >,
     typename StrategyTag = typename distance_strategy_tag
         <
             Geometry1, Geometry2, Strategy
diff --git a/inst/include/boost/geometry/algorithms/for_each.hpp b/inst/include/boost/geometry/algorithms/for_each.hpp
index d03643ab1..a1fd0a6cc 100644
--- a/inst/include/boost/geometry/algorithms/for_each.hpp
+++ b/inst/include/boost/geometry/algorithms/for_each.hpp
@@ -117,7 +117,7 @@ struct fe_point_type
     typedef util::transcribe_const_t
         <
             Range,
-            typename point_type<Range>::type
+            point_type_t<Range>
         > type;
 };
 
@@ -369,7 +369,7 @@ namespace dispatch
 template
 <
     typename Geometry,
-    typename Tag = typename tag_cast<typename tag<Geometry>::type, multi_tag>::type
+    typename Tag = tag_cast_t<tag_t<Geometry>, multi_tag>
 >
 struct for_each_point: not_implemented<Tag>
 {};
diff --git a/inst/include/boost/geometry/algorithms/length.hpp b/inst/include/boost/geometry/algorithms/length.hpp
index 6e4533896..a79e78dd7 100644
--- a/inst/include/boost/geometry/algorithms/length.hpp
+++ b/inst/include/boost/geometry/algorithms/length.hpp
@@ -64,8 +64,7 @@ struct segment_length
     static inline typename default_length_result<Segment>::type
     apply(Segment const& segment, Strategies const& strategies)
     {
-        typedef typename point_type<Segment>::type point_type;
-        point_type p1, p2;
+        point_type_t<Segment> p1, p2;
         geometry::detail::assign_point_from_index<0>(segment, p1);
         geometry::detail::assign_point_from_index<1>(segment, p2);
         return strategies.distance(p1, p2).apply(p1, p2);
diff --git a/inst/include/boost/geometry/algorithms/line_interpolate.hpp b/inst/include/boost/geometry/algorithms/line_interpolate.hpp
index 5739c444e..9afbe5092 100644
--- a/inst/include/boost/geometry/algorithms/line_interpolate.hpp
+++ b/inst/include/boost/geometry/algorithms/line_interpolate.hpp
@@ -1,5 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
+// Copyright (c) 2023-2024 Adam Wulkiewicz, Lodz, Poland.
+
 // Copyright (c) 2018-2023 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -35,7 +37,7 @@
 #include <boost/geometry/strategies/line_interpolate/geographic.hpp>
 #include <boost/geometry/strategies/line_interpolate/spherical.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/range.hpp>
 #include <boost/geometry/util/type_traits.hpp>
 
@@ -133,13 +135,16 @@ struct interpolate_range
                                p,
                                diff_distance);
                 Policy::apply(p, pointlike);
-                if ( BOOST_GEOMETRY_CONDITION(util::is_point<PointLike>::value) )
+                if BOOST_GEOMETRY_CONSTEXPR (util::is_point<PointLike>::value)
                 {
                     return;
                 }
-                start_p = p;
-                prev_distance = repeated_distance;
-                repeated_distance += max_distance;
+                else // else prevents unreachable code warning
+                {
+                    start_p = p;
+                    prev_distance = repeated_distance;
+                    repeated_distance += max_distance;
+                }
             }
             prev_distance = current_distance;
             prev = it;
diff --git a/inst/include/boost/geometry/algorithms/num_geometries.hpp b/inst/include/boost/geometry/algorithms/num_geometries.hpp
index 2fc24428c..1609dee1d 100644
--- a/inst/include/boost/geometry/algorithms/num_geometries.hpp
+++ b/inst/include/boost/geometry/algorithms/num_geometries.hpp
@@ -51,12 +51,7 @@ namespace dispatch
 template
 <
     typename Geometry,
-    typename Tag = typename tag_cast
-                            <
-                                typename tag<Geometry>::type,
-                                single_tag,
-                                multi_tag
-                            >::type
+    typename Tag = tag_cast_t<tag_t<Geometry>, single_tag, multi_tag>
 >
 struct num_geometries: not_implemented<Tag>
 {};
diff --git a/inst/include/boost/geometry/algorithms/num_points.hpp b/inst/include/boost/geometry/algorithms/num_points.hpp
index ee1609dc7..6a59c2bb5 100644
--- a/inst/include/boost/geometry/algorithms/num_points.hpp
+++ b/inst/include/boost/geometry/algorithms/num_points.hpp
@@ -86,10 +86,7 @@ template
 <
     typename Geometry,
     bool AddForOpen,
-    typename Tag = typename tag_cast
-        <
-            typename tag<Geometry>::type, multi_tag
-        >::type
+    typename Tag = tag_cast_t<tag_t<Geometry>, multi_tag>
 >
 struct num_points: not_implemented<Tag>
 {};
diff --git a/inst/include/boost/geometry/algorithms/point_on_surface.hpp b/inst/include/boost/geometry/algorithms/point_on_surface.hpp
index 5b90db472..88077bcc2 100644
--- a/inst/include/boost/geometry/algorithms/point_on_surface.hpp
+++ b/inst/include/boost/geometry/algorithms/point_on_surface.hpp
@@ -310,10 +310,10 @@ inline void point_on_surface(Geometry const& geometry, Point & point,
 template <typename Geometry, typename Point>
 inline void point_on_surface(Geometry const& geometry, Point & point)
 {
-    typedef typename strategy::side::services::default_strategy
+    using strategy_type = typename strategy::side::services::default_strategy
         <
-            typename cs_tag<Geometry>::type
-        >::type strategy_type;
+            cs_tag_t<Geometry>
+        >::type;
 
     point_on_surface(geometry, point, strategy_type());
 }
diff --git a/inst/include/boost/geometry/algorithms/remove_spikes.hpp b/inst/include/boost/geometry/algorithms/remove_spikes.hpp
index 7a144db15..48880a503 100644
--- a/inst/include/boost/geometry/algorithms/remove_spikes.hpp
+++ b/inst/include/boost/geometry/algorithms/remove_spikes.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
-// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2013-2023 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2017-2023.
 // Modifications copyright (c) 2017-2023 Oracle and/or its affiliates.
@@ -37,7 +37,7 @@
 
 #include <boost/geometry/strategies/default_strategy.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/range.hpp>
 
 
@@ -68,9 +68,7 @@ struct range_remove_spikes
     template <typename Range, typename SideStrategy>
     static inline void apply(Range& range, SideStrategy const& strategy)
     {
-        typedef typename point_type<Range>::type point_type;
-
-        std::size_t n = boost::size(range);
+        std::size_t const n = boost::size(range);
         std::size_t const min_num_points = core_detail::closure::minimum_ring_size
             <
                 geometry::closure<Range>::value
@@ -80,7 +78,7 @@ struct range_remove_spikes
             return;
         }
 
-        std::vector<point_type> cleaned;
+        std::vector<point_type_t<Range>> cleaned;
         cleaned.reserve(n);
 
         for (auto const& p : range)
@@ -104,7 +102,7 @@ struct range_remove_spikes
         std::size_t cleaned_count = cleaned.size();
 
         // For a closed-polygon, remove closing point, this makes checking first point(s) easier and consistent
-        if ( BOOST_GEOMETRY_CONDITION(geometry::closure<Range>::value == geometry::closed) )
+        if BOOST_GEOMETRY_CONSTEXPR (geometry::closure<Range>::value == geometry::closed)
         {
             --cleaned_e;
             --cleaned_count;
@@ -148,7 +146,7 @@ struct range_remove_spikes
         }
 
         // Close if necessary
-        if ( BOOST_GEOMETRY_CONDITION(geometry::closure<Range>::value == geometry::closed) )
+        if BOOST_GEOMETRY_CONSTEXPR (geometry::closure<Range>::value == geometry::closed)
         {
             BOOST_GEOMETRY_ASSERT(cleaned_e != cleaned.end());
             *cleaned_e = *cleaned_b;
@@ -258,10 +256,10 @@ struct remove_spikes
 
     static void apply(Geometry& geometry, geometry::default_strategy const&)
     {
-        typedef typename strategy::side::services::default_strategy
+        using side_strategy = typename strategy::side::services::default_strategy
             <
-                typename cs_tag<Geometry>::type
-            >::type side_strategy;
+                cs_tag_t<Geometry>
+            >::type;
 
         apply(geometry, side_strategy());
     }
diff --git a/inst/include/boost/geometry/algorithms/simplify.hpp b/inst/include/boost/geometry/algorithms/simplify.hpp
index 40c66e91a..28a3a5582 100644
--- a/inst/include/boost/geometry/algorithms/simplify.hpp
+++ b/inst/include/boost/geometry/algorithms/simplify.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
-// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2023-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2018-2023.
 // Modifications copyright (c) 2018-2023 Oracle and/or its affiliates.
@@ -61,6 +61,7 @@
 #include <boost/geometry/strategies/simplify/geographic.hpp>
 #include <boost/geometry/strategies/simplify/spherical.hpp>
 
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/type_traits_std.hpp>
 
 #ifdef BOOST_GEOMETRY_DEBUG_DOUGLAS_PEUCKER
@@ -429,10 +430,10 @@ public :
             return;
         }
 
-        bool const is_closed_in = geometry::closure<RingIn>::value == closed;
-        bool const is_closed_out = geometry::closure<RingOut>::value == closed;
-        bool const is_clockwise_in = geometry::point_order<RingIn>::value == clockwise;
-        bool const is_clockwise_out = geometry::point_order<RingOut>::value == clockwise;
+        constexpr bool is_closed_in = geometry::closure<RingIn>::value == closed;
+        constexpr bool is_closed_out = geometry::closure<RingOut>::value == closed;
+        constexpr bool is_clockwise_in = geometry::point_order<RingIn>::value == clockwise;
+        constexpr bool is_clockwise_out = geometry::point_order<RingOut>::value == clockwise;
 
         // TODO: instead of area() use calculate_point_order() ?
 
@@ -482,10 +483,13 @@ public :
             // Do not duplicate the closing point
             auto rot_end = boost::end(ring);
             std::size_t rot_index = index;
-            if (BOOST_GEOMETRY_CONDITION(is_closed_in) && size > 1)
+            if BOOST_GEOMETRY_CONSTEXPR (is_closed_in)
             {
-                --rot_end;
-                if (rot_index == size - 1) { rot_index = 0; }
+                if (size > 1)
+                {
+                    --rot_end;
+                    if (rot_index == size - 1) { rot_index = 0; }
+                }
             }
 
             std::rotate_copy(boost::begin(ring), range::pos(ring, rot_index),
@@ -497,9 +501,12 @@ public :
             simplify_range<0>::apply(rotated, out, max_distance, impl, strategies);
 
             // Open output if needed
-            if (BOOST_GEOMETRY_CONDITION(! is_closed_out) && boost::size(out) > 1)
+            if BOOST_GEOMETRY_CONSTEXPR (! is_closed_out)
             {
-                range::pop_back(out);
+                if (boost::size(out) > 1)
+                {
+                    range::pop_back(out);
+                }
             }
 
             // TODO: instead of area() use calculate_point_order() ?
@@ -532,7 +539,7 @@ public :
             rotated.clear();
         }
 
-        if (BOOST_GEOMETRY_CONDITION(is_clockwise_in != is_clockwise_out))
+        if BOOST_GEOMETRY_CONSTEXPR (is_clockwise_in != is_clockwise_out)
         {
             std::reverse(boost::begin(out), boost::end(out));
         }
@@ -976,7 +983,6 @@ struct simplify<GeometryIn, GeometryOut, geometry_collection_tag, geometry_colle
 \tparam GeometryOut The output geometry
 \tparam Distance A numerical distance measure
 \tparam Strategy A type fulfilling a SimplifyStrategy concept
-\param strategy A strategy to calculate simplification
 \param geometry input geometry, to be simplified
 \param out output geometry, simplified version of the input geometry
 \param max_distance distance (in units of input coordinates) of a vertex
@@ -1072,7 +1078,7 @@ inline void simplify_insert(Geometry const& geometry, OutputIterator out,
 {
     // Concept: output point type = point type of input geometry
     concepts::check<Geometry const>();
-    concepts::check<typename point_type<Geometry>::type>();
+    concepts::check<point_type_t<Geometry>>();
 
     simplify_insert(geometry, out, max_distance, default_strategy());
 }
diff --git a/inst/include/boost/geometry/algorithms/sym_difference.hpp b/inst/include/boost/geometry/algorithms/sym_difference.hpp
index 894e88c7c..b55075006 100644
--- a/inst/include/boost/geometry/algorithms/sym_difference.hpp
+++ b/inst/include/boost/geometry/algorithms/sym_difference.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2015-2023.
-// Modifications copyright (c) 2015-2023 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -18,11 +18,12 @@
 
 #include <iterator>
 
+#include <boost/geometry/core/primary_single_tag.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/algorithms/difference.hpp>
 #include <boost/geometry/algorithms/union.hpp>
 #include <boost/geometry/geometries/adapted/boost_variant.hpp>
 #include <boost/geometry/geometries/multi_polygon.hpp>
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 #include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/relate/cartesian.hpp>
@@ -45,13 +46,11 @@ struct compute_difference
     <
         typename Geometry1,
         typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -69,7 +68,7 @@ struct compute_difference
                     <
                         geometry::point_order<Geometry2>::value, true
                     >::value
-            >::apply(geometry1, geometry2, robust_policy, out, strategy);
+            >::apply(geometry1, geometry2, out, strategy);
     }
 };
 
@@ -80,25 +79,23 @@ struct sym_difference_generic
 {
     template
     <
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         out = compute_difference
             <
                 GeometryOut
-            >::apply(geometry1, geometry2, robust_policy, out, strategy);
+            >::apply(geometry1, geometry2, out, strategy);
 
         return compute_difference
             <
                 GeometryOut
-            >::apply(geometry2, geometry1, robust_policy, out, strategy);
+            >::apply(geometry2, geometry1, out, strategy);
     }
 };
 
@@ -108,13 +105,11 @@ struct sym_difference_areal_areal
 {
     template
     <
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Areal1 const& areal1,
                                        Areal2 const& areal2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -131,19 +126,19 @@ struct sym_difference_areal_areal
         compute_difference
             <
                 GeometryOut
-            >::apply(areal1, areal2, robust_policy, oit12, strategy);
+            >::apply(areal1, areal2, oit12, strategy);
 
         compute_difference
             <
                 GeometryOut
-            >::apply(areal2, areal1, robust_policy, oit21, strategy);
+            >::apply(areal2, areal1, oit21, strategy);
 
         return geometry::dispatch::union_insert
             <
                 helper_geometry_type,
                 helper_geometry_type,
                 GeometryOut
-            >::apply(diff12, diff21, robust_policy, out, strategy);
+            >::apply(diff12, diff21, out, strategy);
     }
 };
 
@@ -160,13 +155,11 @@ struct sym_difference_same_inputs_tupled_output
     <
         typename Geometry1,
         typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -178,7 +171,7 @@ struct sym_difference_same_inputs_tupled_output
         access::get(out) = Algorithm
             <
                 typename access::type, Geometry1, Geometry2
-            >::apply(geometry1, geometry2, robust_policy, access::get(out), strategy);
+            >::apply(geometry1, geometry2, access::get(out), strategy);
 
         return out;
     }
@@ -199,20 +192,18 @@ struct sym_difference_different_inputs_tupled_output
     <
         typename Geometry1,
         typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         return sym_difference_different_inputs_tupled_output
             <
                 GeometryOut, SingleTag2, SingleTag1
-            >::apply(geometry2, geometry1, robust_policy, out, strategy);
+            >::apply(geometry2, geometry1, out, strategy);
     }
 };
 
@@ -231,13 +222,11 @@ struct sym_difference_different_inputs_tupled_output
     <
         typename Geometry1,
         typename Geometry2,
-        typename RobustPolicy,
         typename OutputIterator,
         typename Strategy
     >
     static inline OutputIterator apply(Geometry1 const& geometry1,
                                        Geometry2 const& geometry2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -253,7 +242,7 @@ struct sym_difference_different_inputs_tupled_output
         access1::get(out) = compute_difference
             <
                 typename access1::type
-            >::apply(geometry1, geometry2, robust_policy, access1::get(out), strategy);
+            >::apply(geometry1, geometry2, access1::get(out), strategy);
 
         access2::get(out) = geometry::detail::convert_to_output
             <
@@ -281,14 +270,14 @@ template
     typename Geometry1,
     typename Geometry2,
     typename GeometryOut,
-    typename TagIn1 = typename geometry::tag_cast
+    typename TagIn1 = tag_cast_t
         <
-            typename tag<Geometry1>::type, pointlike_tag, linear_tag, areal_tag
-        >::type,
-    typename TagIn2 = typename geometry::tag_cast
+            tag_t<Geometry1>, pointlike_tag, linear_tag, areal_tag
+        >,
+    typename TagIn2 = tag_cast_t
         <
-            typename tag<Geometry2>::type, pointlike_tag, linear_tag, areal_tag
-        >::type,
+            tag_t<Geometry2>, pointlike_tag, linear_tag, areal_tag
+        >,
     typename TagOut = typename detail::setop_insert_output_tag<GeometryOut>::type
 >
 struct sym_difference_insert
@@ -393,15 +382,11 @@ struct sym_difference_insert
     >
     : detail::expect_output
         <
-            Geometry1, Geometry2, GeometryOut,
-            typename detail::single_tag_from_base_tag<TagIn1>::type,
-            typename detail::single_tag_from_base_tag<TagIn2>::type
+            Geometry1, Geometry2, GeometryOut, primary_single_tag_t<TagIn1>, primary_single_tag_t<TagIn2>
         >
     , detail::sym_difference::sym_difference_different_inputs_tupled_output
         <
-            GeometryOut,
-            typename detail::single_tag_from_base_tag<TagIn1>::type,
-            typename detail::single_tag_from_base_tag<TagIn2>::type
+            GeometryOut, primary_single_tag_t<TagIn1>, primary_single_tag_t<TagIn2>
         >
 {};
 
@@ -452,21 +437,10 @@ inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
     //concepts::check<GeometryOut>();
     geometry::detail::output_geometry_concept_check<GeometryOut>::apply();
 
-    typedef typename geometry::rescale_overlay_policy_type
-        <
-            Geometry1,
-            Geometry2,
-            typename Strategy::cs_tag
-        >::type rescale_policy_type;
-
-    rescale_policy_type robust_policy
-            = geometry::get_rescale_policy<rescale_policy_type>(
-                geometry1, geometry2, strategy);
-
     return dispatch::sym_difference_insert
         <
             Geometry1, Geometry2, GeometryOut
-        >::apply(geometry1, geometry2, robust_policy, out, strategy);
+        >::apply(geometry1, geometry2, out, strategy);
 }
 
 
diff --git a/inst/include/boost/geometry/algorithms/transform.hpp b/inst/include/boost/geometry/algorithms/transform.hpp
index 66d56d714..8b7e814ec 100644
--- a/inst/include/boost/geometry/algorithms/transform.hpp
+++ b/inst/include/boost/geometry/algorithms/transform.hpp
@@ -70,8 +70,8 @@ struct transform_box
     static inline bool apply(Box1 const& b1, Box2& b2,
                 Strategy const& strategy)
     {
-        typedef typename point_type<Box1>::type point_type1;
-        typedef typename point_type<Box2>::type point_type2;
+        using point_type1 = point_type_t<Box1>;
+        using point_type2 = point_type_t<Box2>;
 
         point_type1 lower_left, upper_right;
         geometry::detail::assign::assign_box_2d_corner<min_corner, min_corner>(
@@ -83,7 +83,7 @@ struct transform_box
         if (strategy.apply(lower_left, p1) && strategy.apply(upper_right, p2))
         {
             // Create a valid box and therefore swap if necessary
-            typedef typename coordinate_type<point_type2>::type coordinate_type;
+            using coordinate_type = coordinate_type_t<point_type2>;
             coordinate_type x1 = geometry::get<0>(p1)
                     , y1  = geometry::get<1>(p1)
                     , x2  = geometry::get<0>(p2)
@@ -109,14 +109,11 @@ struct transform_box_or_segment
     static inline bool apply(Geometry1 const& source, Geometry2& target,
                 Strategy const& strategy)
     {
-        typedef typename point_type<Geometry1>::type point_type1;
-        typedef typename point_type<Geometry2>::type point_type2;
-
-        point_type1 source_point[2];
+        point_type_t<Geometry1> source_point[2];
         geometry::detail::assign_point_from_index<0>(source, source_point[0]);
         geometry::detail::assign_point_from_index<1>(source, source_point[1]);
 
-        point_type2 target_point[2];
+        point_type_t<Geometry2> target_point[2];
         if (strategy.apply(source_point[0], target_point[0])
             && strategy.apply(source_point[1], target_point[1]))
         {
@@ -158,7 +155,7 @@ struct transform_polygon
     static inline bool apply(Polygon1 const& poly1, Polygon2& poly2,
                 Strategy const& strategy)
     {
-        typedef typename point_type<Polygon2>::type point2_type;
+        using point2_type = point_type_t<Polygon2>;
 
         geometry::clear(poly2);
 
@@ -198,20 +195,20 @@ struct transform_polygon
 };
 
 
-template <typename Point1, typename Point2>
+template <typename Geometry1, typename Geometry2>
 struct select_strategy
 {
-    typedef typename strategy::transform::services::default_strategy
+    using type = typename strategy::transform::services::default_strategy
         <
-            typename cs_tag<Point1>::type,
-            typename cs_tag<Point2>::type,
-            typename coordinate_system<Point1>::type,
-            typename coordinate_system<Point2>::type,
-            dimension<Point1>::type::value,
-            dimension<Point2>::type::value,
-            typename point_type<Point1>::type,
-            typename point_type<Point2>::type
-        >::type type;
+            cs_tag_t<Geometry1>,
+            cs_tag_t<Geometry2>,
+            coordinate_system_t<Geometry1>,
+            coordinate_system_t<Geometry2>,
+            dimension<Geometry1>::value,
+            dimension<Geometry2>::value,
+            point_type_t<Geometry1>,
+            point_type_t<Geometry2>
+        >::type;
 };
 
 struct transform_range
@@ -220,11 +217,9 @@ struct transform_range
     static inline bool apply(Range1 const& range1,
             Range2& range2, Strategy const& strategy)
     {
-        typedef typename point_type<Range2>::type point_type;
-
-        // Should NOT be done here!
+        // "clear" should NOT be done here!
         // geometry::clear(range2);
-        return transform_range_out<point_type>(range1,
+        return transform_range_out<point_type_t<Range2>>(range1,
                 range::back_inserter(range2), strategy);
     }
 };
@@ -268,8 +263,8 @@ namespace dispatch
 template
 <
     typename Geometry1, typename Geometry2,
-    typename Tag1 = typename tag_cast<typename tag<Geometry1>::type, multi_tag>::type,
-    typename Tag2 = typename tag_cast<typename tag<Geometry2>::type, multi_tag>::type
+    typename Tag1 = tag_cast_t<tag_t<Geometry1>, multi_tag>,
+    typename Tag2 = tag_cast_t<tag_t<Geometry2>, multi_tag>
 >
 struct transform {};
 
diff --git a/inst/include/boost/geometry/algorithms/union.hpp b/inst/include/boost/geometry/algorithms/union.hpp
index 3d88cc141..3deced91d 100644
--- a/inst/include/boost/geometry/algorithms/union.hpp
+++ b/inst/include/boost/geometry/algorithms/union.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2014-2023.
-// Modifications copyright (c) 2014-2023 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -24,10 +24,11 @@
 #include <boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/primary_single_tag.hpp>
 #include <boost/geometry/core/reverse_dispatch.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/geometries/adapted/boost_variant.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 #include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/relate/cartesian.hpp>
@@ -48,12 +49,12 @@ namespace dispatch
 template
 <
     typename Geometry1, typename Geometry2, typename GeometryOut,
-    typename TagIn1 = typename tag<Geometry1>::type,
-    typename TagIn2 = typename tag<Geometry2>::type,
+    typename TagIn1 = tag_t<Geometry1>,
+    typename TagIn2 = tag_t<Geometry2>,
     typename TagOut = typename detail::setop_insert_output_tag<GeometryOut>::type,
-    typename CastedTagIn1 = typename geometry::tag_cast<TagIn1, areal_tag, linear_tag, pointlike_tag>::type,
-    typename CastedTagIn2 = typename geometry::tag_cast<TagIn2, areal_tag, linear_tag, pointlike_tag>::type,
-    typename CastedTagOut = typename geometry::tag_cast<TagOut, areal_tag, linear_tag, pointlike_tag>::type,
+    typename CastedTagIn1 = tag_cast_t<TagIn1, areal_tag, linear_tag, pointlike_tag>,
+    typename CastedTagIn2 = tag_cast_t<TagIn2, areal_tag, linear_tag, pointlike_tag>,
+    typename CastedTagOut = tag_cast_t<TagOut, areal_tag, linear_tag, pointlike_tag>,
     bool Reverse = geometry::reverse_dispatch<Geometry1, Geometry2>::type::value
 >
 struct union_insert: not_implemented<TagIn1, TagIn2, TagOut>
@@ -76,17 +77,16 @@ struct union_insert
         true
     >
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
                                        Geometry2 const& g2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         return union_insert
             <
                 Geometry2, Geometry1, GeometryOut
-            >::apply(g2, g1, robust_policy, out, strategy);
+            >::apply(g2, g1, out, strategy);
     }
 };
 
@@ -166,10 +166,7 @@ struct union_insert
         false
     >
 {
-    using single_tag = typename geometry::detail::single_tag_from_base_tag
-        <
-            CastedTagIn
-        >::type;
+    using single_tag = primary_single_tag_t<CastedTagIn>;
 
     using expect_check = detail::expect_output
         <
@@ -181,17 +178,16 @@ struct union_insert
             SingleTupledOut, single_tag, single_tag
         >;
 
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
                                        Geometry2 const& g2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         access::get(out) = union_insert
             <
                 Geometry2, Geometry1, typename access::type
-            >::apply(g2, g1, robust_policy, access::get(out), strategy);
+            >::apply(g2, g1, access::get(out), strategy);
 
         return out;
     }
@@ -217,10 +213,9 @@ struct union_insert_tupled_different
             SingleTupledOut, SingleTag2, SingleTag2
         >;
 
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
                                        Geometry2 const& g2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
@@ -231,7 +226,7 @@ struct union_insert_tupled_different
                 overlay_difference,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, true>::value
-            >::apply(g1, g2, robust_policy, access1::get(out), strategy);
+            >::apply(g1, g2, access1::get(out), strategy);
 
         access2::get(out) = geometry::detail::convert_to_output
             <
@@ -254,17 +249,16 @@ struct union_insert_tupled_different
         Geometry1, Geometry2, SingleTupledOut, SingleTag1, SingleTag2, false
     >
 {
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
                                        Geometry2 const& g2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         return union_insert_tupled_different
             <
                 Geometry2, Geometry1, SingleTupledOut, SingleTag2, SingleTag1, true
-            >::apply(g2, g1, robust_policy, out, strategy);
+            >::apply(g2, g1, out, strategy);
     }
 };
 
@@ -283,37 +277,30 @@ struct union_insert
         false
     >
 {
-    using single_tag1 = typename geometry::detail::single_tag_from_base_tag
-        <
-            CastedTagIn1
-        >::type;
+    using single_tag1 = primary_single_tag_t<CastedTagIn1>;
 
     using expect_check1 = detail::expect_output
         <
             Geometry1, Geometry2, SingleTupledOut, single_tag1
         >;
 
-    using single_tag2 = typename geometry::detail::single_tag_from_base_tag
-        <
-            CastedTagIn2
-        >::type;
+    using single_tag2 = primary_single_tag_t<CastedTagIn2>;
 
     using expect_check2 = detail::expect_output
         <
             Geometry1, Geometry2, SingleTupledOut, single_tag2
         >;
 
-    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    template <typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
                                        Geometry2 const& g2,
-                                       RobustPolicy const& robust_policy,
                                        OutputIterator out,
                                        Strategy const& strategy)
     {
         return union_insert_tupled_different
             <
                 Geometry1, Geometry2, SingleTupledOut, single_tag1, single_tag2
-            >::apply(g1, g2, robust_policy, out, strategy);
+            >::apply(g1, g2, out, strategy);
     }
 };
 
@@ -359,20 +346,10 @@ inline OutputIterator union_insert(Geometry1 const& geometry1,
             Geometry1, Geometry2
         >::type strategy;
 
-    using rescale_policy_type = typename geometry::rescale_overlay_policy_type
-        <
-            Geometry1,
-            Geometry2
-        >::type;
-
-    rescale_policy_type robust_policy
-            = geometry::get_rescale_policy<rescale_policy_type>(
-                geometry1, geometry2, strategy);
-
     return dispatch::union_insert
            <
                Geometry1, Geometry2, GeometryOut
-           >::apply(geometry1, geometry2, robust_policy, out, strategy);
+           >::apply(geometry1, geometry2, out, strategy);
 }
 
 
@@ -401,21 +378,10 @@ struct union_
                 GeometryOut
             >::type;
 
-        using rescale_policy_type = typename geometry::rescale_overlay_policy_type
-            <
-                Geometry1,
-                Geometry2,
-                typename Strategy::cs_tag
-            >::type;
-
-        rescale_policy_type robust_policy
-                = geometry::get_rescale_policy<rescale_policy_type>(
-                    geometry1, geometry2, strategy);
-
         dispatch::union_insert
            <
                Geometry1, Geometry2, single_out
-           >::apply(geometry1, geometry2, robust_policy,
+           >::apply(geometry1, geometry2,
                     geometry::detail::output_geometry_back_inserter(geometry_out),
                     strategy);
     }
@@ -594,15 +560,6 @@ struct union_
     template <typename Multi1, typename Multi2, typename Strategy>
     static inline void subtract_greater_topodim(Multi1 const& multi1, Multi2 const& multi2, Multi1& multi_out, Strategy const& strategy)
     {
-        using rescale_policy_type = typename geometry::rescale_overlay_policy_type
-            <
-                Multi1, Multi2
-            >::type;
-
-        rescale_policy_type robust_policy
-                = geometry::get_rescale_policy<rescale_policy_type>(
-                    multi1, multi2, strategy);
-
         geometry::dispatch::intersection_insert
             <
                 Multi1, Multi2,
@@ -610,7 +567,7 @@ struct union_
                 overlay_difference,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Multi1>::value>::value,
                 geometry::detail::overlay::do_reverse<geometry::point_order<Multi2>::value, true>::value
-            >::apply(multi1, multi2, robust_policy, range::back_inserter(multi_out), strategy);
+            >::apply(multi1, multi2, range::back_inserter(multi_out), strategy);
     }
     */
 };
diff --git a/inst/include/boost/geometry/arithmetic/determinant.hpp b/inst/include/boost/geometry/arithmetic/determinant.hpp
index 59c596b12..63974a9ea 100644
--- a/inst/include/boost/geometry/arithmetic/determinant.hpp
+++ b/inst/include/boost/geometry/arithmetic/determinant.hpp
@@ -16,9 +16,9 @@
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_coordinate_type.hpp>
 
-#include <boost/numeric/conversion/cast.hpp>
 
 namespace boost { namespace geometry
 {
@@ -33,7 +33,7 @@ class calculate_determinant
     template <typename T>
     static inline ReturnType rt(T const& v)
     {
-        return boost::numeric_cast<ReturnType>(v);
+        return util::numeric_cast<ReturnType>(v);
     }
 
 public :
diff --git a/inst/include/boost/geometry/core/access.hpp b/inst/include/boost/geometry/core/access.hpp
index c59ff12c5..f863d5cbe 100644
--- a/inst/include/boost/geometry/core/access.hpp
+++ b/inst/include/boost/geometry/core/access.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -75,7 +76,12 @@ struct access
 \ingroup traits
 */
 template <typename Geometry, std::size_t Index, std::size_t Dimension>
-struct indexed_access {};
+struct indexed_access
+{
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry type.",
+        Geometry);
+};
 
 
 } // namespace traits
@@ -87,17 +93,16 @@ namespace detail
 template
 <
     typename Geometry,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension
 >
 struct indexed_access_non_pointer
 {
-    static constexpr CoordinateType get(Geometry const& geometry)
+    static constexpr coordinate_type_t<Geometry> get(Geometry const& geometry)
     {
         return traits::indexed_access<Geometry, Index, Dimension>::get(geometry);
     }
-    static void set(Geometry& b, CoordinateType const& value)
+    static void set(Geometry& b, coordinate_type_t<Geometry> const& value)
     {
         traits::indexed_access<Geometry, Index, Dimension>::set(b, value);
     }
@@ -106,19 +111,18 @@ struct indexed_access_non_pointer
 template
 <
     typename Geometry,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension
 >
 struct indexed_access_pointer
 {
-    static constexpr CoordinateType get(Geometry const* geometry)
+    static constexpr coordinate_type_t<Geometry> get(Geometry const* geometry)
     {
-        return traits::indexed_access<typename std::remove_pointer<Geometry>::type, Index, Dimension>::get(*geometry);
+        return traits::indexed_access<std::remove_pointer_t<Geometry>, Index, Dimension>::get(*geometry);
     }
-    static void set(Geometry* geometry, CoordinateType const& value)
+    static void set(Geometry* geometry, coordinate_type_t<Geometry> const& value)
     {
-        traits::indexed_access<typename std::remove_pointer<Geometry>::type, Index, Dimension>::set(*geometry, value);
+        traits::indexed_access<std::remove_pointer_t<Geometry>, Index, Dimension>::set(*geometry, value);
     }
 };
 
@@ -135,13 +139,14 @@ template
 <
     typename Tag,
     typename Geometry,
-    typename
-    CoordinateType,
     std::size_t Dimension,
-    typename IsPointer
+    bool IsPointer
 >
 struct access
 {
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry Tag type.",
+        Geometry, Tag);
     //static inline T get(G const&) {}
     //static inline void set(G& g, T const& value) {}
 };
@@ -150,40 +155,42 @@ template
 <
     typename Tag,
     typename Geometry,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension,
-    typename IsPointer
+    bool IsPointer
 >
 struct indexed_access
 {
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry Tag type.",
+        Geometry, Tag);
     //static inline T get(G const&) {}
     //static inline void set(G& g, T const& value) {}
 };
 
-template <typename Point, typename CoordinateType, std::size_t Dimension>
-struct access<point_tag, Point, CoordinateType, Dimension, std::false_type>
+template <typename Point, std::size_t Dimension>
+struct access<point_tag, Point, Dimension, false>
 {
-    static constexpr CoordinateType get(Point const& point)
+    static constexpr coordinate_type_t<Point> get(Point const& point)
     {
         return traits::access<Point, Dimension>::get(point);
     }
-    static void set(Point& p, CoordinateType const& value)
+    static void set(Point& p, coordinate_type_t<Point> const& value)
     {
         traits::access<Point, Dimension>::set(p, value);
     }
 };
 
-template <typename Point, typename CoordinateType, std::size_t Dimension>
-struct access<point_tag, Point, CoordinateType, Dimension, std::true_type>
+template <typename Point, std::size_t Dimension>
+struct access<point_tag, Point, Dimension, true>
 {
-    static constexpr CoordinateType get(Point const* point)
+    static constexpr coordinate_type_t<Point> get(Point const* point)
     {
-        return traits::access<typename std::remove_pointer<Point>::type, Dimension>::get(*point);
+        return traits::access<std::remove_pointer_t<Point>, Dimension>::get(*point);
     }
-    static void set(Point* p, CoordinateType const& value)
+    static void set(Point* p, coordinate_type_t<Point> const& value)
     {
-        traits::access<typename std::remove_pointer<Point>::type, Dimension>::set(*p, value);
+        traits::access<std::remove_pointer_t<Point>, Dimension>::set(*p, value);
     }
 };
 
@@ -191,47 +198,43 @@ struct access<point_tag, Point, CoordinateType, Dimension, std::true_type>
 template
 <
     typename Box,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension
 >
-struct indexed_access<box_tag, Box, CoordinateType, Index, Dimension, std::false_type>
-    : detail::indexed_access_non_pointer<Box, CoordinateType, Index, Dimension>
+struct indexed_access<box_tag, Box, Index, Dimension, false>
+    : detail::indexed_access_non_pointer<Box, Index, Dimension>
 {};
 
 template
 <
     typename Box,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension
 >
-struct indexed_access<box_tag, Box, CoordinateType, Index, Dimension, std::true_type>
-    : detail::indexed_access_pointer<Box, CoordinateType, Index, Dimension>
+struct indexed_access<box_tag, Box, Index, Dimension, true>
+    : detail::indexed_access_pointer<Box, Index, Dimension>
 {};
 
 
 template
 <
     typename Segment,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension
 >
-struct indexed_access<segment_tag, Segment, CoordinateType, Index, Dimension, std::false_type>
-    : detail::indexed_access_non_pointer<Segment, CoordinateType, Index, Dimension>
+struct indexed_access<segment_tag, Segment, Index, Dimension, false>
+    : detail::indexed_access_non_pointer<Segment, Index, Dimension>
 {};
 
 
 template
 <
     typename Segment,
-    typename CoordinateType,
     std::size_t Index,
     std::size_t Dimension
 >
-struct indexed_access<segment_tag, Segment, CoordinateType, Index, Dimension, std::true_type>
-    : detail::indexed_access_pointer<Segment, CoordinateType, Index, Dimension>
+struct indexed_access<segment_tag, Segment, Index, Dimension, true>
+    : detail::indexed_access_pointer<Segment, Index, Dimension>
 {};
 
 } // namespace core_dispatch
@@ -265,22 +268,19 @@ struct signature_getset_index_dimension {};
 \qbk{[include reference/core/get_point.qbk]}
 */
 template <std::size_t Dimension, typename Geometry>
-constexpr inline typename coordinate_type<Geometry>::type get(Geometry const& geometry
+constexpr inline coordinate_type_t<Geometry> get(Geometry const& geometry
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         , detail::signature_getset_dimension* = 0
 #endif
         )
 {
-    typedef core_dispatch::access
+    return core_dispatch::access
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type,
-            typename coordinate_type<Geometry>::type,
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>,
             Dimension,
-            typename std::is_pointer<Geometry>::type
-        > coord_access_type;
-
-    return coord_access_type::get(geometry);
+            std::is_pointer<Geometry>::value
+        >::get(geometry);
 }
 
 
@@ -289,8 +289,7 @@ constexpr inline typename coordinate_type<Geometry>::type get(Geometry const& ge
 \details \details_get_set
 \tparam Dimension \tparam_dimension_required
 \tparam Geometry \tparam_geometry (usually a Point Concept)
-\param geometry geometry to assign coordinate to
-\param geometry \param_geometry (usually a point)
+\param geometry \param_geometry
 \param value The coordinate value to set
 \ingroup set
 
@@ -298,22 +297,19 @@ constexpr inline typename coordinate_type<Geometry>::type get(Geometry const& ge
 */
 template <std::size_t Dimension, typename Geometry>
 inline void set(Geometry& geometry
-        , typename coordinate_type<Geometry>::type const& value
+        , coordinate_type_t<Geometry> const& value
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         , detail::signature_getset_dimension* = 0
 #endif
         )
 {
-    typedef core_dispatch::access
+    core_dispatch::access
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type,
-            typename coordinate_type<Geometry>::type,
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>,
             Dimension,
-            typename std::is_pointer<Geometry>::type
-        > coord_access_type;
-
-    coord_access_type::set(geometry, value);
+            std::is_pointer<Geometry>::value
+        >::set(geometry, value);
 }
 
 
@@ -331,23 +327,20 @@ inline void set(Geometry& geometry
 \qbk{[include reference/core/get_box.qbk]}
 */
 template <std::size_t Index, std::size_t Dimension, typename Geometry>
-constexpr inline typename coordinate_type<Geometry>::type get(Geometry const& geometry
+constexpr inline coordinate_type_t<Geometry> get(Geometry const& geometry
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         , detail::signature_getset_index_dimension* = 0
 #endif
         )
 {
-    typedef core_dispatch::indexed_access
+    return core_dispatch::indexed_access
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type,
-            typename coordinate_type<Geometry>::type,
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>,
             Index,
             Dimension,
-            typename std::is_pointer<Geometry>::type
-        > coord_access_type;
-
-    return coord_access_type::get(geometry);
+            std::is_pointer<Geometry>::value
+        >::get(geometry);
 }
 
 /*!
@@ -356,7 +349,6 @@ constexpr inline typename coordinate_type<Geometry>::type get(Geometry const& ge
 \tparam Index \tparam_index_required
 \tparam Dimension \tparam_dimension_required
 \tparam Geometry \tparam_box_or_segment
-\param geometry geometry to assign coordinate to
 \param geometry \param_geometry
 \param value The coordinate value to set
 \ingroup set
@@ -366,23 +358,20 @@ constexpr inline typename coordinate_type<Geometry>::type get(Geometry const& ge
 */
 template <std::size_t Index, std::size_t Dimension, typename Geometry>
 inline void set(Geometry& geometry
-        , typename coordinate_type<Geometry>::type const& value
+        , coordinate_type_t<Geometry> const& value
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         , detail::signature_getset_index_dimension* = 0
 #endif
         )
 {
-    typedef core_dispatch::indexed_access
+    core_dispatch::indexed_access
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type,
-            typename coordinate_type<Geometry>::type,
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>,
             Index,
             Dimension,
-            typename std::is_pointer<Geometry>::type
-        > coord_access_type;
-
-    coord_access_type::set(geometry, value);
+            std::is_pointer<Geometry>::value
+        >::set(geometry, value);
 }
 
 }} // namespace boost::geometry
diff --git a/inst/include/boost/geometry/core/closure.hpp b/inst/include/boost/geometry/core/closure.hpp
index 46c3d7934..09abb8e10 100644
--- a/inst/include/boost/geometry/core/closure.hpp
+++ b/inst/include/boost/geometry/core/closure.hpp
@@ -3,7 +3,8 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
+// 
 // This file was modified by Oracle on 2014-2021.
 // Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -187,25 +188,33 @@ struct closure<multi_polygon_tag, MultiPolygon>
 */
 template <typename Geometry>
 struct closure
-{
-    static const closure_selector value = core_dispatch::closure
+    : std::integral_constant
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type
-        >::value;
-};
+            closure_selector,
+            core_dispatch::closure
+                <
+                    tag_t<Geometry>,
+                    util::remove_cptrref_t<Geometry>
+                >::value
+        >
+{};
+
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename Geometry>
+inline constexpr closure_selector closure_v = closure<Geometry>::value;
+#endif
 
 
 #ifndef DOXYGEN_NO_DETAIL
 namespace detail
 {
 
-template
-<
-    typename Geometry,
-    closure_selector Closure = geometry::closure<Geometry>::value
->
-using minimum_ring_size = core_detail::closure::minimum_ring_size<Closure>;
+template <typename Geometry>
+using minimum_ring_size = core_detail::closure::minimum_ring_size
+                            <
+                                geometry::closure<Geometry>::value
+                            >;
+
 
 } // namespace detail
 #endif // DOXYGEN_NO_DETAIL
diff --git a/inst/include/boost/geometry/core/config.hpp b/inst/include/boost/geometry/core/config.hpp
index f5ab449fb..a96c47c93 100644
--- a/inst/include/boost/geometry/core/config.hpp
+++ b/inst/include/boost/geometry/core/config.hpp
@@ -2,7 +2,7 @@
 
 // Copyright (c) 2019-2021 Barend Gehrels, Amsterdam, the Netherlands.
 
-// Copyright (c) 2018-2023 Oracle and/or its affiliates.
+// Copyright (c) 2018-2024 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -14,25 +14,5 @@
 #define BOOST_GEOMETRY_CORE_CONFIG_HPP
 
 #include <boost/config.hpp>
-#include <boost/config/pragma_message.hpp>
-
-// If no define is specified, it uses BOOST_GEOMETRY_NO_ROBUSTNESS, which means: no rescaling.
-// (Rescaling was an earlier approach to fix robustness issues.)
-// However, if BOOST_GEOMETRY_ROBUSTNESS_ALTERNATIVE is specified, it flips the default.
-#if !defined(BOOST_GEOMETRY_NO_ROBUSTNESS) && !defined(BOOST_GEOMETRY_USE_RESCALING)
-  #if defined(BOOST_GEOMETRY_ROBUSTNESS_ALTERNATIVE)
-    #define BOOST_GEOMETRY_USE_RESCALING
-  #else
-    #define BOOST_GEOMETRY_NO_ROBUSTNESS
-  #endif
-#endif
-
-#if defined(BOOST_GEOMETRY_USE_RESCALING) && ! defined(BOOST_GEOMETRY_ROBUSTNESS_ALTERNATIVE)
-    BOOST_PRAGMA_MESSAGE("Rescaling is deprecated and its functionality will be removed in Boost 1.84")
-#endif
-
-#if defined(BOOST_GEOMETRY_USE_RESCALING) && defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
-    #error "Define either BOOST_GEOMETRY_NO_ROBUSTNESS (default) or BOOST_GEOMETRY_USE_RESCALING"
-#endif
 
 #endif // BOOST_GEOMETRY_CORE_CONFIG_HPP
diff --git a/inst/include/boost/geometry/core/coordinate_dimension.hpp b/inst/include/boost/geometry/core/coordinate_dimension.hpp
index 3a87dabf5..7f2e94ac0 100644
--- a/inst/include/boost/geometry/core/coordinate_dimension.hpp
+++ b/inst/include/boost/geometry/core/coordinate_dimension.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -88,11 +89,18 @@ template <typename Geometry>
 struct dimension
     : core_dispatch::dimension
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>
         >
 {};
 
+
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename Geometry>
+inline constexpr std::size_t dimension_v = dimension<Geometry>::value;
+#endif
+
+
 /*!
 \brief assert_dimension, enables compile-time checking if coordinate dimensions are as expected
 \ingroup utility
diff --git a/inst/include/boost/geometry/core/coordinate_system.hpp b/inst/include/boost/geometry/core/coordinate_system.hpp
index a9dae31ed..cebdbc2e6 100644
--- a/inst/include/boost/geometry/core/coordinate_system.hpp
+++ b/inst/include/boost/geometry/core/coordinate_system.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -88,14 +89,18 @@ namespace core_dispatch
 template <typename Geometry>
 struct coordinate_system
 {
-    typedef typename core_dispatch::coordinate_system
+    using type = typename core_dispatch::coordinate_system
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type
-        >::type type;
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>
+        >::type;
 };
 
 
+template <typename Geometry>
+using coordinate_system_t = typename coordinate_system<Geometry>::type;
+
+
 }} // namespace boost::geometry
 
 
diff --git a/inst/include/boost/geometry/core/coordinate_type.hpp b/inst/include/boost/geometry/core/coordinate_type.hpp
index 760b122ad..ab86b09c6 100644
--- a/inst/include/boost/geometry/core/coordinate_type.hpp
+++ b/inst/include/boost/geometry/core/coordinate_type.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -56,19 +57,21 @@ namespace core_dispatch
 template <typename GeometryTag, typename Geometry>
 struct coordinate_type
 {
-    typedef typename point_type<GeometryTag, Geometry>::type point_type;
-
     // Call its own specialization on point-tag
-    typedef typename coordinate_type<point_tag, point_type>::type type;
+    using type = typename coordinate_type
+        <
+            point_tag,
+            typename point_type<GeometryTag, Geometry>::type
+        >::type;
 };
 
 template <typename Point>
 struct coordinate_type<point_tag, Point>
 {
-    typedef typename traits::coordinate_type
+    using type = typename traits::coordinate_type
         <
-            typename util::remove_cptrref<Point>::type
-        >::type type;
+            util::remove_cptrref_t<Point>
+        >::type;
 };
 
 
@@ -86,13 +89,18 @@ struct coordinate_type<point_tag, Point>
 template <typename Geometry>
 struct coordinate_type
 {
-    typedef typename core_dispatch::coordinate_type
+    using type = typename core_dispatch::coordinate_type
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type
-        >::type type;
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>
+        >::type;
 };
 
+
+template <typename Geometry>
+using coordinate_type_t = typename coordinate_type<Geometry>::type;
+
+
 /*!
 \brief assert_coordinate_type_equal, a compile-time check for equality of two coordinate types
 \ingroup utility
@@ -100,11 +108,8 @@ struct coordinate_type
 template <typename Geometry1, typename Geometry2>
 constexpr inline void assert_coordinate_type_equal(Geometry1 const& , Geometry2 const& )
 {
-  static_assert(std::is_same
-      <
-          typename coordinate_type<Geometry1>::type,
-          typename coordinate_type<Geometry2>::type
-      >::value, "Coordinate types in geometries should be the same");
+  static_assert(std::is_same<coordinate_type_t<Geometry1>, coordinate_type_t<Geometry2>>::value,
+                "Coordinate types in geometries should be the same");
 }
 
 }} // namespace boost::geometry
diff --git a/inst/include/boost/geometry/core/cs.hpp b/inst/include/boost/geometry/core/cs.hpp
index 0e2f4c5c1..e6bc4e34f 100644
--- a/inst/include/boost/geometry/core/cs.hpp
+++ b/inst/include/boost/geometry/core/cs.hpp
@@ -3,10 +3,10 @@
 // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2020.
 // Modifications copyright (c) 2014-2020, Oracle and/or its affiliates.
-
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -237,13 +237,17 @@ struct cs_tag<cs::undefined>
 template <typename Geometry>
 struct cs_tag
 {
-    typedef typename traits::cs_tag
+    using type = typename traits::cs_tag
         <
-            typename geometry::coordinate_system<Geometry>::type
-        >::type type;
+            geometry::coordinate_system_t<Geometry>
+        >::type;
 };
 
 
+template <typename Geometry>
+using cs_tag_t = typename cs_tag<Geometry>::type;
+
+
 namespace traits
 {
 
@@ -287,13 +291,17 @@ namespace detail
 template <typename Geometry>
 struct cs_angular_units
 {
-    typedef typename traits::cs_angular_units
+    using type = typename traits::cs_angular_units
         <
-            typename geometry::coordinate_system<Geometry>::type
-        >::type type;
+            geometry::coordinate_system_t<Geometry>
+        >::type;
 };
 
 
+template <typename Geometry>
+using cs_angular_units_t = typename cs_angular_units<Geometry>::type;
+
+
 template <typename Units, typename CsTag>
 struct cs_tag_to_coordinate_system
 {
@@ -332,6 +340,11 @@ struct cs_tag_to_coordinate_system<Units, geographic_tag>
     typedef cs::geographic<Units> type;
 };
 
+
+template <typename Units, typename CsTag>
+using cs_tag_to_coordinate_system_t = typename cs_tag_to_coordinate_system<Units, CsTag>::type;
+
+
 } // namespace detail
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/inst/include/boost/geometry/core/geometry_id.hpp b/inst/include/boost/geometry/core/geometry_id.hpp
index 2c68cedcd..ed2a238c6 100644
--- a/inst/include/boost/geometry/core/geometry_id.hpp
+++ b/inst/include/boost/geometry/core/geometry_id.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020 Oracle and/or its affiliates.
@@ -103,6 +104,12 @@ struct geometry_id : core_dispatch::geometry_id<typename tag<Geometry>::type>
 {};
 
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename GeometryTag>
+inline constexpr int geometry_id_v = geometry_id<GeometryTag>::value;
+#endif
+
+
 }} // namespace boost::geometry
 
 
diff --git a/inst/include/boost/geometry/core/point_order.hpp b/inst/include/boost/geometry/core/point_order.hpp
index 2fedae599..8f8cddd6c 100644
--- a/inst/include/boost/geometry/core/point_order.hpp
+++ b/inst/include/boost/geometry/core/point_order.hpp
@@ -3,10 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2020.
 // Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
-
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -172,13 +172,23 @@ struct point_order<multi_polygon_tag, MultiPolygon>
 */
 template <typename Geometry>
 struct point_order
-{
-    static const order_selector value = core_dispatch::point_order
+    : std::integral_constant
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type
-        >::value;
-};
+            order_selector,
+            core_dispatch::point_order
+                <
+                    tag_t<Geometry>,
+                    util::remove_cptrref_t<Geometry>
+                >::value
+        >
+{};
+
+
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename Geometry>
+inline constexpr order_selector point_order_v = point_order<Geometry>::value;
+#endif
+
 
 }} // namespace boost::geometry
 
diff --git a/inst/include/boost/geometry/core/point_type.hpp b/inst/include/boost/geometry/core/point_type.hpp
index f5d282372..ccb259c16 100644
--- a/inst/include/boost/geometry/core/point_type.hpp
+++ b/inst/include/boost/geometry/core/point_type.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020-2021.
 // Modifications copyright (c) 2020-2021 Oracle and/or its affiliates.
@@ -183,14 +184,18 @@ struct point_type<geometry_collection_tag, GeometryCollection>
 template <typename Geometry>
 struct point_type
 {
-    typedef typename core_dispatch::point_type
+    using type = typename core_dispatch::point_type
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type
-        >::type type;
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>
+        >::type;
 };
 
 
+template <typename Geometry>
+using point_type_t = typename point_type<Geometry>::type;
+
+
 }} // namespace boost::geometry
 
 
diff --git a/inst/include/boost/geometry/core/primary_single_tag.hpp b/inst/include/boost/geometry/core/primary_single_tag.hpp
new file mode 100644
index 000000000..4fc23c6bf
--- /dev/null
+++ b/inst/include/boost/geometry/core/primary_single_tag.hpp
@@ -0,0 +1,55 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2024-2024 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_PRIMARY_SINGLE_TAG_HPP
+#define BOOST_GEOMETRY_PRIMARY_SINGLE_TAG_HPP
+
+#include <boost/geometry/core/tags.hpp>
+
+namespace boost { namespace geometry
+{
+
+/*!
+\brief Metafunction defining a type being the primary tag
+    (point, linestring, polygon) of the tag related to its topological dimension.
+\details pointlike_tag will be casted to point_tag, linear_tag to linestring_tag,
+    areal_tag to polygon_tag.
+\ingroup core
+\tparam Tag The tag to get the canonical tag from
+*/
+template <typename Tag>
+struct primary_single_tag
+{
+
+};
+
+template <>
+struct primary_single_tag<pointlike_tag>
+{
+    using type = point_tag;
+};
+
+template <>
+struct primary_single_tag<linear_tag>
+{
+    using type = linestring_tag;
+};
+
+template <>
+struct primary_single_tag<areal_tag>
+{
+    using type = polygon_tag;
+};
+
+template <typename Tag>
+using primary_single_tag_t = typename primary_single_tag<Tag>::type;
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_PRIMARY_SINGLE_TAG_HPP
diff --git a/inst/include/boost/geometry/core/radian_access.hpp b/inst/include/boost/geometry/core/radian_access.hpp
index c2f00552d..ef87701ba 100644
--- a/inst/include/boost/geometry/core/radian_access.hpp
+++ b/inst/include/boost/geometry/core/radian_access.hpp
@@ -23,13 +23,12 @@
 
 #include <cstddef>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/coordinate_promotion.hpp>
 
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 
@@ -48,7 +47,7 @@ struct degree_radian_converter
 
     static inline coordinate_type get(Geometry const& geometry)
     {
-        return boost::numeric_cast
+        return util::numeric_cast
             <
                 coordinate_type
             >(geometry::get<Dimension>(geometry)
@@ -57,7 +56,7 @@ struct degree_radian_converter
 
     static inline void set(Geometry& geometry, coordinate_type const& radians)
     {
-        geometry::set<Dimension>(geometry, boost::numeric_cast
+        geometry::set<Dimension>(geometry, util::numeric_cast
             <
                 coordinate_type
             >(radians * math::r2d<coordinate_type>()));
@@ -113,7 +112,7 @@ struct degree_radian_converter_box_segment
 
     static inline coordinate_type get(Geometry const& geometry)
     {
-        return boost::numeric_cast
+        return util::numeric_cast
             <
                 coordinate_type
             >(geometry::get<Index, Dimension>(geometry)
@@ -122,7 +121,7 @@ struct degree_radian_converter_box_segment
 
     static inline void set(Geometry& geometry, coordinate_type const& radians)
     {
-        geometry::set<Index, Dimension>(geometry, boost::numeric_cast
+        geometry::set<Index, Dimension>(geometry, util::numeric_cast
             <
                 coordinate_type
             >(radians * math::r2d<coordinate_type>()));
diff --git a/inst/include/boost/geometry/core/radius.hpp b/inst/include/boost/geometry/core/radius.hpp
index 0033c3d4a..984f61a9e 100644
--- a/inst/include/boost/geometry/core/radius.hpp
+++ b/inst/include/boost/geometry/core/radius.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2020.
 // Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
@@ -23,8 +24,7 @@
 
 #include <cstddef>
 
-#include <boost/static_assert.hpp>
-
+#include <boost/geometry/core/static_assert.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/util/type_traits_std.hpp>
@@ -79,18 +79,27 @@ namespace core_dispatch
 template <typename Tag, typename Geometry>
 struct radius_type
 {
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry Tag type.",
+        Geometry, Tag);
     //typedef core_dispatch_specialization_required type;
 };
 
 /*!
     \brief radius access meta-functions, used by concept n-sphere and upcoming ellipse.
 */
-template <typename Tag,
-          typename Geometry,
-          std::size_t Dimension,
-          typename IsPointer>
+template
+<
+    typename Tag,
+    typename Geometry,
+    std::size_t Dimension,
+    bool IsPointer
+>
 struct radius_access
 {
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry Tag type.",
+        Geometry, Tag);
     //static inline CoordinateType get(Geometry const& ) {}
     //static inline void set(Geometry& g, CoordinateType const& value) {}
 };
@@ -107,13 +116,18 @@ struct radius_access
 template <typename Geometry>
 struct radius_type
 {
-    typedef typename core_dispatch::radius_type
-                        <
-                            typename tag<Geometry>::type,
-                            typename util::remove_cptrref<Geometry>::type
-                        >::type type;
+    using type = typename core_dispatch::radius_type
+        <
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>
+        >::type;
 };
 
+
+template <typename Geometry>
+using radius_type_t = typename radius_type<Geometry>::type;
+
+
 /*!
     \brief Function to get radius of a circle / sphere / ellipse / etc.
     \return radius The radius for a given axis
@@ -122,15 +136,15 @@ struct radius_type
     \tparam I index of the axis
 */
 template <std::size_t I, typename Geometry>
-inline typename radius_type<Geometry>::type get_radius(Geometry const& geometry)
+inline radius_type_t<Geometry> get_radius(Geometry const& geometry)
 {
     return core_dispatch::radius_access
-            <
-                typename tag<Geometry>::type,
-                typename util::remove_cptrref<Geometry>::type,
-                I,
-                typename std::is_pointer<Geometry>::type
-            >::get(geometry);
+        <
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>,
+            I,
+            std::is_pointer<Geometry>::value
+        >::get(geometry);
 }
 
 /*!
@@ -142,14 +156,14 @@ inline typename radius_type<Geometry>::type get_radius(Geometry const& geometry)
 */
 template <std::size_t I, typename Geometry>
 inline void set_radius(Geometry& geometry,
-                       typename radius_type<Geometry>::type const& radius)
+                       radius_type_t<Geometry> const& radius)
 {
     core_dispatch::radius_access
         <
-            typename tag<Geometry>::type,
-            typename util::remove_cptrref<Geometry>::type,
+            tag_t<Geometry>,
+            util::remove_cptrref_t<Geometry>,
             I,
-            typename std::is_pointer<Geometry>::type
+            std::is_pointer<Geometry>::value
         >::set(geometry, radius);
 }
 
@@ -162,12 +176,12 @@ namespace detail
 template <typename Tag, typename Geometry, std::size_t Dimension>
 struct radius_access
 {
-    static inline typename radius_type<Geometry>::type get(Geometry const& geometry)
+    static inline radius_type_t<Geometry> get(Geometry const& geometry)
     {
         return traits::radius_access<Geometry, Dimension>::get(geometry);
     }
     static inline void set(Geometry& geometry,
-                           typename radius_type<Geometry>::type const& value)
+                           radius_type_t<Geometry> const& value)
     {
         traits::radius_access<Geometry, Dimension>::set(geometry, value);
     }
@@ -181,33 +195,34 @@ struct radius_access
 namespace core_dispatch
 {
 
-template <typename Tag,
-          typename Geometry,
-          std::size_t Dimension>
-struct radius_access<Tag, Geometry, Dimension, std::true_type>
+template
+<
+    typename Tag,
+    typename Geometry,
+    std::size_t Dimension
+>
+struct radius_access<Tag, Geometry, Dimension, true>
 {
-    typedef typename geometry::radius_type<Geometry>::type radius_type;
-
-    static inline radius_type get(const Geometry * geometry)
+    static inline radius_type_t<Geometry> get(const Geometry * geometry)
     {
         return radius_access
-                <
-                    Tag,
-                    Geometry,
-                    Dimension,
-                    typename std::is_pointer<Geometry>::type
-                >::get(*geometry);
+            <
+                Tag,
+                Geometry,
+                Dimension,
+                std::is_pointer<Geometry>::value
+            >::get(*geometry);
     }
 
-    static inline void set(Geometry * geometry, radius_type const& value)
+    static inline void set(Geometry * geometry, radius_type_t<Geometry> const& value)
     {
         return radius_access
-                <
-                    Tag,
-                    Geometry,
-                    Dimension,
-                    typename std::is_pointer<Geometry>::type
-                >::set(*geometry, value);
+            <
+                Tag,
+                Geometry,
+                Dimension,
+                std::is_pointer<Geometry>::value
+            >::set(*geometry, value);
     }
 };
 
@@ -215,11 +230,11 @@ struct radius_access<Tag, Geometry, Dimension, std::true_type>
 template <typename Geometry>
 struct radius_type<srs_sphere_tag, Geometry>
 {
-    typedef typename traits::radius_type<Geometry>::type type;
+    using type = typename traits::radius_type<Geometry>::type;
 };
 
 template <typename Geometry, std::size_t Dimension>
-struct radius_access<srs_sphere_tag, Geometry, Dimension, std::false_type>
+struct radius_access<srs_sphere_tag, Geometry, Dimension, false>
     : detail::radius_access<srs_sphere_tag, Geometry, Dimension>
 {
     //BOOST_STATIC_ASSERT(Dimension == 0);
@@ -229,11 +244,11 @@ struct radius_access<srs_sphere_tag, Geometry, Dimension, std::false_type>
 template <typename Geometry>
 struct radius_type<srs_spheroid_tag, Geometry>
 {
-    typedef typename traits::radius_type<Geometry>::type type;
+    using type = typename traits::radius_type<Geometry>::type;
 };
 
 template <typename Geometry, std::size_t Dimension>
-struct radius_access<srs_spheroid_tag, Geometry, Dimension, std::false_type>
+struct radius_access<srs_spheroid_tag, Geometry, Dimension, false>
     : detail::radius_access<srs_spheroid_tag, Geometry, Dimension>
 {
     //BOOST_STATIC_ASSERT(Dimension == 0 || Dimension == 2);
diff --git a/inst/include/boost/geometry/core/reverse_dispatch.hpp b/inst/include/boost/geometry/core/reverse_dispatch.hpp
index 8d43f2fb4..8d27b43a0 100644
--- a/inst/include/boost/geometry/core/reverse_dispatch.hpp
+++ b/inst/include/boost/geometry/core/reverse_dispatch.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -57,8 +58,8 @@ struct reverse_dispatch<GeometryId, GeometryId> : std::false_type {};
 template <typename Geometry1, typename Geometry2>
 struct reverse_dispatch : detail::reverse_dispatch
     <
-        geometry_id<Geometry1>::type::value,
-        geometry_id<Geometry2>::type::value
+        geometry_id<Geometry1>::value,
+        geometry_id<Geometry2>::value
     >
 {};
 
diff --git a/inst/include/boost/geometry/core/ring_type.hpp b/inst/include/boost/geometry/core/ring_type.hpp
index 4aca0719c..eea52ec3f 100644
--- a/inst/include/boost/geometry/core/ring_type.hpp
+++ b/inst/include/boost/geometry/core/ring_type.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2015-2021.
 // Modifications copyright (c) 2015-2021, Oracle and/or its affiliates.
@@ -201,24 +202,30 @@ struct ring_type<multi_polygon_tag, MultiPolygon>
 template <typename Geometry>
 struct ring_type
 {
-    typedef typename core_dispatch::ring_type
+    using type = typename core_dispatch::ring_type
         <
             typename tag<Geometry>::type,
             Geometry
-        >::type type;
+        >::type;
 };
 
+template <typename Geometry>
+using ring_type_t = typename ring_type<Geometry>::type;
+
 
 template <typename Geometry>
 struct ring_return_type
 {
-    typedef typename core_dispatch::ring_return_type
+    using type = typename core_dispatch::ring_return_type
         <
             typename tag<Geometry>::type,
             Geometry
-        >::type type;
+        >::type;
 };
 
+template <typename Geometry>
+using ring_return_type_t = typename ring_return_type<Geometry>::type;
+
 
 }} // namespace boost::geometry
 
diff --git a/inst/include/boost/geometry/core/tag.hpp b/inst/include/boost/geometry/core/tag.hpp
index a33856e9a..196741562 100644
--- a/inst/include/boost/geometry/core/tag.hpp
+++ b/inst/include/boost/geometry/core/tag.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020 Oracle and/or its affiliates.
@@ -62,12 +63,17 @@ struct tag
 template <typename Geometry>
 struct tag
 {
-    typedef typename traits::tag
+    using type = typename traits::tag
         <
-            typename util::remove_cptrref<Geometry>::type
-        >::type type;
+            util::remove_cptrref_t<Geometry>
+        >::type;
 };
 
+
+template <typename Geometry>
+using tag_t = typename tag<Geometry>::type;
+
+
 }} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_CORE_TAG_HPP
diff --git a/inst/include/boost/geometry/core/tag_cast.hpp b/inst/include/boost/geometry/core/tag_cast.hpp
index 18c403b5f..2a1eb19a2 100644
--- a/inst/include/boost/geometry/core/tag_cast.hpp
+++ b/inst/include/boost/geometry/core/tag_cast.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -41,15 +42,14 @@ namespace boost { namespace geometry
 template <typename Tag, typename ...BaseTags>
 struct tag_cast
 {
-    typedef Tag type;
+    using type = Tag;
 };
 
 #ifndef DOXYGEN_NO_SPECIALIZATIONS
 
 template <typename Tag, typename BaseTag, typename ...BaseTags>
 struct tag_cast<Tag, BaseTag, BaseTags...>
-{
-    typedef std::conditional_t
+    : std::conditional
         <
           std::is_base_of<BaseTag, Tag>::value,
           BaseTag,
@@ -57,12 +57,15 @@ struct tag_cast<Tag, BaseTag, BaseTags...>
             <
                 Tag, BaseTags...
             >::type
-        > type;
-};
+        >
+{};
 
 #endif // DOXYGEN_NO_SPECIALIZATIONS
 
 
+template <typename Tag, typename ...BaseTags>
+using tag_cast_t = typename tag_cast<Tag, BaseTags...>::type;
+
 }} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_CORE_TAG_CAST_HPP
diff --git a/inst/include/boost/geometry/core/tags.hpp b/inst/include/boost/geometry/core/tags.hpp
index 6220f8f17..f0d62783b 100644
--- a/inst/include/boost/geometry/core/tags.hpp
+++ b/inst/include/boost/geometry/core/tags.hpp
@@ -152,6 +152,9 @@ struct single_tag_of<multi_polygon_tag>
 
 #endif
 
+template <typename Tag>
+using single_tag_of_t = typename single_tag_of<Tag>::type;
+
 
 }} // namespace boost::geometry
 
diff --git a/inst/include/boost/geometry/core/topological_dimension.hpp b/inst/include/boost/geometry/core/topological_dimension.hpp
index a4bc16eb4..c1c750246 100644
--- a/inst/include/boost/geometry/core/topological_dimension.hpp
+++ b/inst/include/boost/geometry/core/topological_dimension.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020-2022.
 // Modifications copyright (c) 2020-2022, Oracle and/or its affiliates.
@@ -102,6 +103,12 @@ struct topological_dimension
     : core_dispatch::top_dim<typename tag<Geometry>::type> {};
 
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename Geometry>
+inline constexpr int topological_dimension_v = topological_dimension<Geometry>::value;
+#endif
+
+
 }} // namespace boost::geometry
 
 
diff --git a/inst/include/boost/geometry/formulas/andoyer_inverse.hpp b/inst/include/boost/geometry/formulas/andoyer_inverse.hpp
index 98f5dcd79..708a57439 100644
--- a/inst/include/boost/geometry/formulas/andoyer_inverse.hpp
+++ b/inst/include/boost/geometry/formulas/andoyer_inverse.hpp
@@ -1,9 +1,8 @@
 // Boost.Geometry
 
-// Copyright (c) 2018 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2018-2023 Adam Wulkiewicz, Lodz, Poland.
 
 // Copyright (c) 2015-2020 Oracle and/or its affiliates.
-
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -18,7 +17,7 @@
 
 #include <boost/geometry/core/radius.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 
 #include <boost/geometry/formulas/differential_quantities.hpp>
@@ -98,7 +97,7 @@ class andoyer_inverse
         CT const d = acos(cos_d); // [0, pi]
         CT const sin_d = sin(d);  // [-1, 1]
 
-        if ( BOOST_GEOMETRY_CONDITION(EnableDistance) )
+        if BOOST_GEOMETRY_CONSTEXPR (EnableDistance)
         {
             CT const K = math::sqr(sin_lat1-sin_lat2);
             CT const L = math::sqr(sin_lat1+sin_lat2);
@@ -123,7 +122,7 @@ class andoyer_inverse
             result.distance = a * (d + dd);
         }
 
-        if ( BOOST_GEOMETRY_CONDITION(CalcAzimuths) )
+        if BOOST_GEOMETRY_CONSTEXPR (CalcAzimuths)
         {
             // sin_d = 0 <=> antipodal points (incl. poles) or very close
             if (math::equals(sin_d, c0))
@@ -210,14 +209,14 @@ class andoyer_inverse
                 // therefore dA and dB may be great and the resulting azimuths
                 // may be some more or less arbitrary angles
 
-                if (BOOST_GEOMETRY_CONDITION(CalcFwdAzimuth))
+                if BOOST_GEOMETRY_CONSTEXPR (CalcFwdAzimuth)
                 {
                     CT const dA = V*T - U;
                     result.azimuth = A - dA;
                     normalize_azimuth(result.azimuth, A, dA);
                 }
 
-                if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+                if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
                 {
                     CT const dB = -U*T + V;
                     if (B >= 0)
@@ -229,7 +228,7 @@ class andoyer_inverse
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             CT const b = CT(get_radius<2>(spheroid));
 
diff --git a/inst/include/boost/geometry/formulas/area_formulas.hpp b/inst/include/boost/geometry/formulas/area_formulas.hpp
index b8da8a672..c45cd94f1 100644
--- a/inst/include/boost/geometry/formulas/area_formulas.hpp
+++ b/inst/include/boost/geometry/formulas/area_formulas.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry
 
-// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2023-2024 Adam Wulkiewicz, Lodz, Poland.
 
 // Copyright (c) 2015-2022 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
@@ -17,6 +17,7 @@
 #include <boost/geometry/formulas/flattening.hpp>
 #include <boost/geometry/formulas/mean_radius.hpp>
 #include <boost/geometry/formulas/karney_inverse.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
@@ -381,26 +382,33 @@ class area_formulas
             return pi;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(LongSegment) && lat1r != lat2r) // not for segments parallel to equator
+        if BOOST_GEOMETRY_CONSTEXPR (LongSegment)
         {
-            CT const cbet1 = cos(lat1r);
-            CT const sbet1 = sin(lat1r);
-            CT const cbet2 = cos(lat2r);
-            CT const sbet2 = sin(lat2r);
-
-            CT const omg12 = lon2r - lon1r;
-            CT const comg12 = cos(omg12);
-            CT const somg12 = sin(omg12);
-
-            CT const cbet1_sbet2 = cbet1 * sbet2;
-            CT const sbet1_cbet2 = sbet1 * cbet2;
-            CT const alp1 = atan2(cbet1_sbet2 - sbet1_cbet2 * comg12, cbet2 * somg12);
-            CT const alp2 = atan2(cbet1_sbet2 * comg12 - sbet1_cbet2, cbet1 * somg12);
+            if (lat1r != lat2r) // not for segments parallel to equator
+            {
+                CT const cbet1 = cos(lat1r);
+                CT const sbet1 = sin(lat1r);
+                CT const cbet2 = cos(lat2r);
+                CT const sbet2 = sin(lat2r);
 
-            excess = alp2 - alp1;
+                CT const omg12 = lon2r - lon1r;
+                CT const comg12 = cos(omg12);
+                CT const somg12 = sin(omg12);
 
-        } else {
+                CT const cbet1_sbet2 = cbet1 * sbet2;
+                CT const sbet1_cbet2 = sbet1 * cbet2;
+                CT const alp1 = atan2(cbet1_sbet2 - sbet1_cbet2 * comg12, cbet2 * somg12);
+                CT const alp2 = atan2(cbet1_sbet2 * comg12 - sbet1_cbet2, cbet1 * somg12);
 
+                excess = alp2 - alp1;
+            }
+            else
+            {
+                excess = trapezoidal_formula(lat1r, lat2r, lon12r);
+            }
+        }
+        else
+        {
             excess = trapezoidal_formula(lat1r, lat2r, lon12r);
         }
 
diff --git a/inst/include/boost/geometry/formulas/differential_quantities.hpp b/inst/include/boost/geometry/formulas/differential_quantities.hpp
index 1df9adb8e..140a73867 100644
--- a/inst/include/boost/geometry/formulas/differential_quantities.hpp
+++ b/inst/include/boost/geometry/formulas/differential_quantities.hpp
@@ -14,7 +14,7 @@
 
 #include <boost/geometry/core/assert.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 
 
@@ -73,7 +73,7 @@ class differential_quantities
         if (math::equals(sin_bet1, c0) && math::equals(sin_bet2, c0))
         {
             CT const sig_12 = dlon / one_minus_f;
-            if (BOOST_GEOMETRY_CONDITION(EnableReducedLength))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength)
             {
                 BOOST_GEOMETRY_ASSERT((-math::pi<CT>() <= azimuth && azimuth <= math::pi<CT>()));
 
@@ -82,7 +82,7 @@ class differential_quantities
                 reduced_length = m12;
             }
 
-            if (BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableGeodesicScale)
             {
                 CT M12 = cos(sig_12);
                 geodesic_scale = M12;
@@ -123,7 +123,7 @@ class differential_quantities
             CT const dn1 = math::sqrt(c1 + ep2 * math::sqr(sin_bet1));
             CT const dn2 = math::sqrt(c1 + ep2 * math::sqr(sin_bet2));
 
-            if (BOOST_GEOMETRY_CONDITION(EnableReducedLength))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength)
             {
                 CT const m12_b = dn2 * (cos_sig1 * sin_sig2)
                                - dn1 * (sin_sig1 * cos_sig2)
@@ -133,7 +133,7 @@ class differential_quantities
                 reduced_length = m12;
             }
 
-            if (BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableGeodesicScale)
             {
                 CT const cos_sig12 = cos_sig1 * cos_sig2 + sin_sig1 * sin_sig2;
                 CT const t = ep2 * (cos_bet1 - cos_bet2) * (cos_bet1 + cos_bet2) / (dn1 + dn2);
diff --git a/inst/include/boost/geometry/formulas/karney_direct.hpp b/inst/include/boost/geometry/formulas/karney_direct.hpp
index bfe35ddc4..ed365c8f1 100644
--- a/inst/include/boost/geometry/formulas/karney_direct.hpp
+++ b/inst/include/boost/geometry/formulas/karney_direct.hpp
@@ -38,7 +38,7 @@
 #include <boost/geometry/formulas/flattening.hpp>
 #include <boost/geometry/formulas/result_direct.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
 #include <boost/geometry/util/series_expansion.hpp>
@@ -162,7 +162,7 @@ class karney_direct
         CT const sin_sigma2 = sin_sigma1 * cos_sigma12 + cos_sigma1 * sin_sigma12;
         CT const cos_sigma2 = cos_sigma1 * cos_sigma12 - sin_sigma1 * sin_sigma12;
 
-        if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
         {
             CT const sin_alpha2 = sin_alpha0;
             CT const cos_alpha2 = cos_alpha0 * cos_sigma2;
@@ -170,7 +170,7 @@ class karney_direct
             result.reverse_azimuth = atan2(sin_alpha2, cos_alpha2);
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcCoordinates))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcCoordinates)
         {
             // Find the latitude at the second point.
             CT const sin_beta2 = cos_alpha0 * sin_sigma2;
@@ -217,7 +217,7 @@ class karney_direct
             result.lon2 *= math::d2r<CT>();
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             // Evaluate the coefficients for C2.
             // Index zero element of coeffs_C2 is unused.
diff --git a/inst/include/boost/geometry/formulas/karney_inverse.hpp b/inst/include/boost/geometry/formulas/karney_inverse.hpp
index 12dd2b259..320984d36 100644
--- a/inst/include/boost/geometry/formulas/karney_inverse.hpp
+++ b/inst/include/boost/geometry/formulas/karney_inverse.hpp
@@ -36,7 +36,7 @@
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/precise_math.hpp>
 #include <boost/geometry/util/series_expansion.hpp>
@@ -309,7 +309,7 @@ class karney_inverse
             sigma12 = omega12 = lam12 / one_minus_f;
             m12x = b * sin(sigma12);
 
-            if (BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableGeodesicScale)
             {
                 result.geodesic_scale = cos(sigma12);
             }
@@ -335,7 +335,7 @@ class karney_inverse
                 // Short lines case (newton_start sets sin_alpha2, cos_alpha2, dnm).
                 s12x = sigma12 * b * dnm;
                 m12x = math::sqr(dnm) * b * sin(sigma12 / dnm);
-                if (BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+                if BOOST_GEOMETRY_CONSTEXPR (EnableGeodesicScale)
                 {
                     result.geodesic_scale = cos(sigma12 / dnm);
                 }
@@ -371,7 +371,6 @@ class karney_inverse
                                     sin_sigma1, cos_sigma1,
                                     sin_sigma2, cos_sigma2,
                                     eps, diff_omega12,
-                                    iteration < max_iterations,
                                     dv, f, n, ep2, tiny, coeffs_C1);
 
                     // Reversed test to allow escape with NaNs.
@@ -392,7 +391,7 @@ class karney_inverse
                         cos_alpha1a = cos_alpha1;
                     }
 
-                    if (iteration < max_iterations && dv > c0)
+                    if (dv > c0)
                     {
                         CT diff_alpha1 = -v / dv;
 
@@ -460,25 +459,25 @@ class karney_inverse
         sin_alpha2 *= swap_point * lon12_sign;
         cos_alpha2 *= swap_point * lat_sign;
 
-        if (BOOST_GEOMETRY_CONDITION(EnableReducedLength))
+        if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength)
         {
             result.reduced_length = m12x;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcAzimuths))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcAzimuths)
         {
-            if (BOOST_GEOMETRY_CONDITION(CalcFwdAzimuth))
+            if BOOST_GEOMETRY_CONSTEXPR (CalcFwdAzimuth)
             {
                 result.azimuth = atan2(sin_alpha1, cos_alpha1);
             }
 
-            if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+            if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
             {
                 result.reverse_azimuth = atan2(sin_alpha2, cos_alpha2);
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(EnableDistance))
+        if BOOST_GEOMETRY_CONSTEXPR (EnableDistance)
         {
             result.distance = s12x;
         }
@@ -503,16 +502,13 @@ class karney_inverse
         // Evaluate the coefficients for C2.
         se::coeffs_C2<SeriesOrder, CT> coeffs_C2(epsilon);
 
-        if (BOOST_GEOMETRY_CONDITION(EnableDistance) ||
-            BOOST_GEOMETRY_CONDITION(EnableReducedLength) ||
-            BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+        if BOOST_GEOMETRY_CONSTEXPR (EnableDistance || EnableReducedLength || EnableGeodesicScale)
         {
             // Find the coefficients for A1 by computing the
             // series expansion using Horner scehme.
             expansion_A1 = se::evaluate_A1<SeriesOrder>(epsilon);
 
-            if (BOOST_GEOMETRY_CONDITION(EnableReducedLength) ||
-                BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength || EnableGeodesicScale)
             {
                 // Find the coefficients for A2 by computing the
                 // series expansion using Horner scehme.
@@ -524,15 +520,14 @@ class karney_inverse
             expansion_A1 += c1;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(EnableDistance))
+        if BOOST_GEOMETRY_CONSTEXPR (EnableDistance)
         {
             CT B1 = se::sin_cos_series(sin_sigma2, cos_sigma2, coeffs_C1)
                   - se::sin_cos_series(sin_sigma1, cos_sigma1, coeffs_C1);
 
             s12x = expansion_A1 * (sigma12 + B1);
 
-            if (BOOST_GEOMETRY_CONDITION(EnableReducedLength) ||
-                BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+            if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength || EnableGeodesicScale)
             {
                 CT B2 = se::sin_cos_series(sin_sigma2, cos_sigma2, coeffs_C2)
                       - se::sin_cos_series(sin_sigma1, cos_sigma1, coeffs_C2);
@@ -540,8 +535,7 @@ class karney_inverse
                 J12 = A12x * sigma12 + (expansion_A1 * B1 - expansion_A2 * B2);
             }
         }
-        else if (BOOST_GEOMETRY_CONDITION(EnableReducedLength) ||
-                 BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+        else if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength || EnableGeodesicScale)
         {
             for (size_t i = 1; i <= SeriesOrder; ++i)
             {
@@ -554,7 +548,7 @@ class karney_inverse
                   - se::sin_cos_series(sin_sigma1, cos_sigma1, coeffs_C2));
         }
 
-        if (BOOST_GEOMETRY_CONDITION(EnableReducedLength))
+        if BOOST_GEOMETRY_CONSTEXPR (EnableReducedLength)
         {
             m0 = A12x;
 
@@ -563,7 +557,7 @@ class karney_inverse
                    cos_sigma1 * cos_sigma2 * J12;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(EnableGeodesicScale))
+        if BOOST_GEOMETRY_CONSTEXPR (EnableGeodesicScale)
         {
             CT cos_sigma12 = cos_sigma1 * cos_sigma2 + sin_sigma1 * sin_sigma2;
             CT t = ep2 * (cos_beta1 - cos_beta2) *
@@ -848,7 +842,7 @@ class karney_inverse
                               CT& sin_sigma1, CT& cos_sigma1,
                               CT& sin_sigma2, CT& cos_sigma2,
                               CT& eps, CT& diff_omega12,
-                              bool diffp, CT& diff_lam12,
+                              CT& diff_lam12,
                               CT const& f, CT const& n, CT const& ep2, CT const& tiny,
                               CoeffsC1 const& coeffs_C1)
     {
@@ -934,24 +928,22 @@ class karney_inverse
         diff_omega12 = -f * A3 * sin_alpha0 * (sigma12 + B312);
         lam12 = eta + diff_omega12;
 
-        if (diffp)
+        if (cos_alpha2 == c0)
         {
-            if (cos_alpha2 == c0)
-            {
-                diff_lam12 = - c2 * one_minus_f * dn1 / sin_beta1;
-            }
-            else
-            {
-                CT dummy;
-                meridian_length(eps, ep2, sigma12, sin_sigma1, cos_sigma1, dn1,
-                                                   sin_sigma2, cos_sigma2, dn2,
-                                                   cos_beta1, cos_beta2, dummy,
-                                                   diff_lam12, dummy, dummy,
-                                                   dummy, coeffs_C1);
+            diff_lam12 = - c2 * one_minus_f * dn1 / sin_beta1;
+        }
+        else
+        {
+            CT dummy;
+            meridian_length(eps, ep2, sigma12, sin_sigma1, cos_sigma1, dn1,
+                                                sin_sigma2, cos_sigma2, dn2,
+                                                cos_beta1, cos_beta2, dummy,
+                                                diff_lam12, dummy, dummy,
+                                                dummy, coeffs_C1);
 
-                diff_lam12 *= one_minus_f / (cos_alpha2 * cos_beta2);
-            }
+            diff_lam12 *= one_minus_f / (cos_alpha2 * cos_beta2);
         }
+
         return lam12;
     }
 
diff --git a/inst/include/boost/geometry/formulas/meridian_direct.hpp b/inst/include/boost/geometry/formulas/meridian_direct.hpp
index 3699e4c7c..bbcb314fa 100644
--- a/inst/include/boost/geometry/formulas/meridian_direct.hpp
+++ b/inst/include/boost/geometry/formulas/meridian_direct.hpp
@@ -23,7 +23,7 @@
 #include <boost/geometry/formulas/quarter_meridian.hpp>
 #include <boost/geometry/formulas/result_direct.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 
 namespace boost { namespace geometry { namespace formula
@@ -66,7 +66,7 @@ class meridian_direct
 
         CT azimuth = north ? c0 : pi;
 
-        if (BOOST_GEOMETRY_CONDITION(CalcCoordinates))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcCoordinates)
         {
             CT s0 = meridian_inverse<CT, Order>::apply(la1, spheroid);
             int signed_distance = north ? distance : -distance;
@@ -74,7 +74,7 @@ class meridian_direct
             result.lat2 = apply(s0 + signed_distance, spheroid);
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
         {
             result.reverse_azimuth = azimuth;
 
@@ -92,7 +92,7 @@ class meridian_direct
 
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             CT const b = CT(get_radius<2>(spheroid));
             CT const f = formula::flattening<CT>(spheroid);
diff --git a/inst/include/boost/geometry/formulas/thomas_direct.hpp b/inst/include/boost/geometry/formulas/thomas_direct.hpp
index 588905667..c39c3751e 100644
--- a/inst/include/boost/geometry/formulas/thomas_direct.hpp
+++ b/inst/include/boost/geometry/formulas/thomas_direct.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry
 
-// Copyright (c) 2016-2020 Oracle and/or its affiliates.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2016-2020 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -18,7 +19,7 @@
 #include <boost/geometry/core/assert.hpp>
 #include <boost/geometry/core/radius.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
 
@@ -108,7 +109,7 @@ class thomas_direct
         CT const C2 = f * (c1 - math::sqr(M)) / c4; // lower-case c2 in the technical report
         CT D = 0;
         CT P = 0;
-        if ( BOOST_GEOMETRY_CONDITION(SecondOrder) )
+        if BOOST_GEOMETRY_CONSTEXPR (SecondOrder)
         {
             D = (c1 - C2) * (c1 - C2 - C1 * M);
             P = C2 * (c1 + C1 * M / c2) / D;
@@ -142,7 +143,7 @@ class thomas_direct
         CT const Y = c2 * P * V * W * sin_d;
         CT X = 0;
         CT d_sigma = d - Y;
-        if ( BOOST_GEOMETRY_CONDITION(SecondOrder) )
+        if BOOST_GEOMETRY_CONSTEXPR (SecondOrder)
         {
             X = math::sqr(C2) * sin_d * cos_d * (2 * math::sqr(V) - c1);
             d_sigma += X;
@@ -150,7 +151,7 @@ class thomas_direct
         CT const sin_d_sigma = sin(d_sigma);
         CT const cos_d_sigma = cos(d_sigma);
 
-        if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
         {
             result.reverse_azimuth = atan2(M, N * cos_d_sigma - sin_theta1 * sin_d_sigma);
 
@@ -160,12 +161,12 @@ class thomas_direct
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcCoordinates))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcCoordinates)
         {
             CT const S_sigma = c2 * sigma1 - d_sigma;
             CT cos_S_sigma = 0;
             CT H = C1 * d_sigma;
-            if ( BOOST_GEOMETRY_CONDITION(SecondOrder) )
+            if BOOST_GEOMETRY_CONSTEXPR (SecondOrder)
             {
                 cos_S_sigma = cos(S_sigma);
                 H = H * (c1 - C2) - C1 * C2 * sin_d_sigma * cos_S_sigma;
@@ -196,7 +197,7 @@ class thomas_direct
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             typedef differential_quantities<CT, EnableReducedLength, EnableGeodesicScale, 2> quantities;
             quantities::apply(lon1, lat1, result.lon2, result.lat2,
@@ -205,7 +206,7 @@ class thomas_direct
                               result.reduced_length, result.geodesic_scale);
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcCoordinates))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcCoordinates)
         {
             // For longitudes close to the antimeridian the result can be out
             // of range. Therefore normalize.
diff --git a/inst/include/boost/geometry/formulas/thomas_inverse.hpp b/inst/include/boost/geometry/formulas/thomas_inverse.hpp
index c93aaf838..5a6236d5d 100644
--- a/inst/include/boost/geometry/formulas/thomas_inverse.hpp
+++ b/inst/include/boost/geometry/formulas/thomas_inverse.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry
 
-// Copyright (c) 2015-2018 Oracle and/or its affiliates.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2015-2018 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -17,7 +18,7 @@
 
 #include <boost/geometry/core/radius.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 
 #include <boost/geometry/formulas/differential_quantities.hpp>
@@ -137,7 +138,7 @@ class thomas_inverse
         CT const f_sqr = math::sqr(f);
         CT const f_sqr_per_64 = f_sqr / CT(64);
 
-        if ( BOOST_GEOMETRY_CONDITION(EnableDistance) )
+        if BOOST_GEOMETRY_CONSTEXPR (EnableDistance)
         {
             CT const n1 = X * (A + C*X);
             CT const n2 = Y * (B + E*Y);
@@ -152,7 +153,7 @@ class thomas_inverse
             result.distance = a * sin_d * (T - delta1d + delta2d);
         }
 
-        if ( BOOST_GEOMETRY_CONDITION(CalcAzimuths) )
+        if BOOST_GEOMETRY_CONSTEXPR (CalcAzimuths)
         {
             // NOTE: if both cos_latX == 0 then below we'd have 0 * INF
             // it's a situation when the endpoints are on the poles +-90 deg
@@ -178,7 +179,7 @@ class thomas_inverse
 
             CT const pi = math::pi<CT>();
 
-            if (BOOST_GEOMETRY_CONDITION(CalcFwdAzimuth))
+            if BOOST_GEOMETRY_CONSTEXPR (CalcFwdAzimuth)
             {
                 CT alpha1 = v + u;
                 if (alpha1 > pi)
@@ -189,7 +190,7 @@ class thomas_inverse
                 result.azimuth = alpha1;
             }
 
-            if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+            if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
             {
                 CT alpha2 = pi - (v - u);
                 if (alpha2 > pi)
@@ -201,7 +202,7 @@ class thomas_inverse
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             typedef differential_quantities<CT, EnableReducedLength, EnableGeodesicScale, 2> quantities;
             quantities::apply(lon1, lat1, lon2, lat2,
diff --git a/inst/include/boost/geometry/formulas/vincenty_direct.hpp b/inst/include/boost/geometry/formulas/vincenty_direct.hpp
index 274af3f2f..2692266a6 100644
--- a/inst/include/boost/geometry/formulas/vincenty_direct.hpp
+++ b/inst/include/boost/geometry/formulas/vincenty_direct.hpp
@@ -1,10 +1,10 @@
 // Boost.Geometry
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2020.
 // Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
-
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -19,7 +19,7 @@
 
 #include <boost/geometry/core/radius.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
 
@@ -136,7 +136,7 @@ class vincenty_direct
                //&& geometry::math::abs(sigma) < pi
                && counter < BOOST_GEOMETRY_DETAIL_VINCENTY_MAX_STEPS ); // robustness
 
-        if (BOOST_GEOMETRY_CONDITION(CalcCoordinates))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcCoordinates)
         {
             result.lat2
                 = atan2( sin_U1 * cos_sigma + cos_U1 * sin_sigma * cos_azimuth12,
@@ -151,13 +151,13 @@ class vincenty_direct
             result.lon2 = lon1 + L;
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
         {
             result.reverse_azimuth
                 = atan2(sin_alpha, -sin_U1 * sin_sigma + cos_U1 * cos_sigma * cos_azimuth12); // (12)
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             typedef differential_quantities<CT, EnableReducedLength, EnableGeodesicScale, 2> quantities;
             quantities::apply(lon1, lat1, result.lon2, result.lat2,
@@ -166,7 +166,7 @@ class vincenty_direct
                               result.reduced_length, result.geodesic_scale);
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcCoordinates))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcCoordinates)
         {
             // For longitudes close to the antimeridian the result can be out
             // of range. Therefore normalize.
diff --git a/inst/include/boost/geometry/formulas/vincenty_inverse.hpp b/inst/include/boost/geometry/formulas/vincenty_inverse.hpp
index 24f285d9b..7789e17e9 100644
--- a/inst/include/boost/geometry/formulas/vincenty_inverse.hpp
+++ b/inst/include/boost/geometry/formulas/vincenty_inverse.hpp
@@ -1,11 +1,10 @@
 // Boost.Geometry
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2018 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2018-2023 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014, 2016, 2017.
 // Modifications copyright (c) 2014-2017 Oracle and/or its affiliates.
-
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -20,7 +19,7 @@
 
 #include <boost/geometry/core/radius.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 #include <boost/geometry/util/math.hpp>
 
 #include <boost/geometry/formulas/differential_quantities.hpp>
@@ -160,7 +159,7 @@ struct vincenty_inverse
                && geometry::math::abs(lambda) < pi
                && counter < BOOST_GEOMETRY_DETAIL_VINCENTY_MAX_STEPS ); // robustness
 
-        if ( BOOST_GEOMETRY_CONDITION(EnableDistance) )
+        if BOOST_GEOMETRY_CONSTEXPR (EnableDistance)
         {
             // Some types cannot divide by doubles
             CT const c6 = 6;
@@ -188,20 +187,20 @@ struct vincenty_inverse
             result.distance = radius_b * A * (sigma - delta_sigma); // (19)
         }
 
-        if ( BOOST_GEOMETRY_CONDITION(CalcAzimuths) )
+        if BOOST_GEOMETRY_CONSTEXPR (CalcAzimuths)
         {
-            if (BOOST_GEOMETRY_CONDITION(CalcFwdAzimuth))
+            if BOOST_GEOMETRY_CONSTEXPR (CalcFwdAzimuth)
             {
                 result.azimuth = atan2(cos_U2 * sin_lambda, cos_U1 * sin_U2 - sin_U1 * cos_U2 * cos_lambda); // (20)
             }
 
-            if (BOOST_GEOMETRY_CONDITION(CalcRevAzimuth))
+            if BOOST_GEOMETRY_CONSTEXPR (CalcRevAzimuth)
             {
                 result.reverse_azimuth = atan2(cos_U1 * sin_lambda, -sin_U1 * cos_U2 + cos_U1 * sin_U2 * cos_lambda); // (21)
             }
         }
 
-        if (BOOST_GEOMETRY_CONDITION(CalcQuantities))
+        if BOOST_GEOMETRY_CONSTEXPR (CalcQuantities)
         {
             typedef differential_quantities<CT, EnableReducedLength, EnableGeodesicScale, 2> quantities;
             quantities::apply(lon1, lat1, lon2, lat2,
diff --git a/inst/include/boost/geometry/geometries/concepts/box_concept.hpp b/inst/include/boost/geometry/geometries/concepts/box_concept.hpp
index c96d39f6a..491446a22 100644
--- a/inst/include/boost/geometry/geometries/concepts/box_concept.hpp
+++ b/inst/include/boost/geometry/geometries/concepts/box_concept.hpp
@@ -34,8 +34,7 @@ template <typename Geometry>
 class Box
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
-
+    using point_type = point_type_t<Geometry>;
 
     template
     <
@@ -80,8 +79,8 @@ template <typename Geometry>
 class ConstBox
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
-    typedef typename coordinate_type<Geometry>::type coordinate_type;
+    using point_type = point_type_t<Geometry>;
+    using coordinate_type = coordinate_type_t<Geometry>;
 
     template
     <
diff --git a/inst/include/boost/geometry/geometries/concepts/linestring_concept.hpp b/inst/include/boost/geometry/geometries/concepts/linestring_concept.hpp
index 49dc8b221..7a322aa53 100644
--- a/inst/include/boost/geometry/geometries/concepts/linestring_concept.hpp
+++ b/inst/include/boost/geometry/geometries/concepts/linestring_concept.hpp
@@ -39,7 +39,7 @@ template <typename Geometry>
 class Linestring
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
+    using point_type = point_type_t<Geometry>;
 
     BOOST_CONCEPT_ASSERT( (concepts::Point<point_type>) );
     BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
@@ -68,7 +68,7 @@ template <typename Geometry>
 class ConstLinestring
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
+    using point_type = point_type_t<Geometry>;
 
     BOOST_CONCEPT_ASSERT( (concepts::ConstPoint<point_type>) );
     //BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
diff --git a/inst/include/boost/geometry/geometries/concepts/polygon_concept.hpp b/inst/include/boost/geometry/geometries/concepts/polygon_concept.hpp
index 7488ab3de..17eeae89a 100644
--- a/inst/include/boost/geometry/geometries/concepts/polygon_concept.hpp
+++ b/inst/include/boost/geometry/geometries/concepts/polygon_concept.hpp
@@ -53,8 +53,8 @@ class Polygon
     typedef typename traits::interior_const_type<polygon_type>::type interior_const_type;
     typedef typename traits::interior_mutable_type<polygon_type>::type interior_mutable_type;
 
-    typedef typename point_type<PolygonType>::type point_type;
-    typedef typename ring_type<PolygonType>::type ring_type;
+    using point_type = point_type_t<PolygonType>;
+    using ring_type = ring_type_t<PolygonType>;
 
     BOOST_CONCEPT_ASSERT( (concepts::Point<point_type>) );
     BOOST_CONCEPT_ASSERT( (concepts::Ring<ring_type>) );
@@ -102,8 +102,8 @@ class ConstPolygon
     typedef typename traits::ring_const_type<const_polygon_type>::type ring_const_type;
     typedef typename traits::interior_const_type<const_polygon_type>::type interior_const_type;
 
-    typedef typename point_type<const_polygon_type>::type point_type;
-    typedef typename ring_type<const_polygon_type>::type ring_type;
+    using point_type = point_type_t<const_polygon_type>;
+    using ring_type = ring_type_t<const_polygon_type>;
 
     BOOST_CONCEPT_ASSERT( (concepts::ConstPoint<point_type>) );
     BOOST_CONCEPT_ASSERT( (concepts::ConstRing<ring_type>) );
diff --git a/inst/include/boost/geometry/geometries/concepts/ring_concept.hpp b/inst/include/boost/geometry/geometries/concepts/ring_concept.hpp
index b4cf961ad..ba2cc4ea6 100644
--- a/inst/include/boost/geometry/geometries/concepts/ring_concept.hpp
+++ b/inst/include/boost/geometry/geometries/concepts/ring_concept.hpp
@@ -38,7 +38,7 @@ template <typename Geometry>
 class Ring
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
+    using point_type = point_type_t<Geometry>;
 
     BOOST_CONCEPT_ASSERT( (concepts::Point<point_type>) );
     BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
@@ -67,7 +67,7 @@ template <typename Geometry>
 class ConstRing
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
+    using point_type = point_type_t<Geometry>;
 
     BOOST_CONCEPT_ASSERT( (concepts::ConstPoint<point_type>) );
     BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
diff --git a/inst/include/boost/geometry/geometries/concepts/segment_concept.hpp b/inst/include/boost/geometry/geometries/concepts/segment_concept.hpp
index 7dac9e3ed..c2bc332fd 100644
--- a/inst/include/boost/geometry/geometries/concepts/segment_concept.hpp
+++ b/inst/include/boost/geometry/geometries/concepts/segment_concept.hpp
@@ -36,7 +36,7 @@ template <typename Geometry>
 class Segment
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
+    using point_type = point_type_t<Geometry>;
 
     BOOST_CONCEPT_ASSERT( (concepts::Point<point_type>) );
 
@@ -80,8 +80,8 @@ template <typename Geometry>
 class ConstSegment
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename point_type<Geometry>::type point_type;
-    typedef typename coordinate_type<Geometry>::type coordinate_type;
+    using point_type = point_type_t<Geometry>;
+    using coordinate_type = coordinate_type_t<Geometry>;
 
     BOOST_CONCEPT_ASSERT( (concepts::ConstPoint<point_type>) );
 
diff --git a/inst/include/boost/geometry/geometries/helper_geometry.hpp b/inst/include/boost/geometry/geometries/helper_geometry.hpp
index 881f143dd..6cade9723 100644
--- a/inst/include/boost/geometry/geometries/helper_geometry.hpp
+++ b/inst/include/boost/geometry/geometries/helper_geometry.hpp
@@ -40,7 +40,7 @@ template
     typename Point,
     typename NewCoordinateType,
     typename NewUnits,
-    typename CS_Tag = typename cs_tag<Point>::type
+    typename CS_Tag = cs_tag_t<Point>
 >
 struct helper_point
 {
@@ -87,7 +87,7 @@ struct helper_geometry<Box, NewCoordinateType, NewUnits, box_tag>
         <
             typename helper_geometry
                 <
-                    typename point_type<Box>::type, NewCoordinateType, NewUnits
+                    point_type_t<Box>, NewCoordinateType, NewUnits
                 >::type
         >;
 };
@@ -100,7 +100,7 @@ struct helper_geometry<Linestring, NewCoordinateType, NewUnits, linestring_tag>
         <
             typename helper_geometry
                 <
-                    typename point_type<Linestring>::type, NewCoordinateType, NewUnits
+                    point_type_t<Linestring>, NewCoordinateType, NewUnits
                 >::type
         >;
 };
@@ -112,7 +112,7 @@ struct helper_geometry<Ring, NewCoordinateType, NewUnits, ring_tag>
         <
             typename helper_geometry
                 <
-                    typename point_type<Ring>::type, NewCoordinateType, NewUnits
+                    point_type_t<Ring>, NewCoordinateType, NewUnits
                 >::type,
             point_order<Ring>::value != counterclockwise,
             closure<Ring>::value != open
diff --git a/inst/include/boost/geometry/geometries/register/point.hpp b/inst/include/boost/geometry/geometries/register/point.hpp
index 47da20fb6..95a8d521d 100644
--- a/inst/include/boost/geometry/geometries/register/point.hpp
+++ b/inst/include/boost/geometry/geometries/register/point.hpp
@@ -69,11 +69,12 @@
 \brief \brief_macro{2D point type}
 \ingroup register
 \details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_2D, two-dimensional point type}
+    \details_macro_lola
 \param Point \param_macro_type{Point}
 \param CoordinateType \param_macro_coortype{point}
 \param CoordinateSystem \param_macro_coorsystem
-\param Field0 \param_macro_member{\macro_x}
-\param Field1 \param_macro_member{\macro_y}
+\param Field0 \param_macro_member{\macro_x_lon}
+\param Field1 \param_macro_member{\macro_y_lat}
 
 \qbk{[include reference/geometries/register/point.qbk]}
 */
@@ -106,12 +107,14 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{2D point type} \brief_macro_const
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_2D_CONST, two-dimensional point type}. \details_macro_const
+\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_2D_CONST, two-dimensional point type}
+    \details_macro_const
+    \details_macro_lola
 \param Point \param_macro_type{Point}
 \param CoordinateType \param_macro_coortype{point}
 \param CoordinateSystem \param_macro_coorsystem
-\param Field0 \param_macro_member{\macro_x}
-\param Field1 \param_macro_member{\macro_y}
+\param Field0 \param_macro_member{\macro_x_lon}
+\param Field1 \param_macro_member{\macro_y_lat}
 */
 #define BOOST_GEOMETRY_REGISTER_POINT_2D_CONST(Point, CoordinateType, CoordinateSystem, Field0, Field1) \
 namespace boost { namespace geometry { namespace traits {  \
@@ -123,7 +126,7 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{3D point type} \brief_macro_const
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_3D_CONST, three-dimensional point type}. \details_macro_const
+\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_3D_CONST, three-dimensional point type} \details_macro_const
 \param Point \param_macro_type{Point}
 \param CoordinateType \param_macro_coortype{point}
 \param CoordinateSystem \param_macro_coorsystem
@@ -142,14 +145,16 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{2D point type} \brief_macro_getset
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_2D_GET_SET, two-dimensional point type}. \details_macro_getset
+\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_2D_GET_SET, two-dimensional point type}
+    \details_macro_getset
+    \details_macro_lola
 \param Point \param_macro_type{Point}
 \param CoordinateType \param_macro_coortype{point}
 \param CoordinateSystem \param_macro_coorsystem
-\param Get0 \param_macro_getset{get, \macro_x}
-\param Get1 \param_macro_getset{get, \macro_y}
-\param Set0 \param_macro_getset{set, \macro_x}
-\param Set1 \param_macro_getset{set, \macro_y}
+\param Get0 \param_macro_getset{get, \macro_x_lon}
+\param Get1 \param_macro_getset{get, \macro_y_lat}
+\param Set0 \param_macro_getset{set, \macro_x_lon}
+\param Set1 \param_macro_getset{set, \macro_y_lat}
 */
 #define BOOST_GEOMETRY_REGISTER_POINT_2D_GET_SET(Point, CoordinateType, CoordinateSystem, Get0, Get1, Set0, Set1) \
 namespace boost { namespace geometry { namespace traits {  \
@@ -161,7 +166,8 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{3D point type} \brief_macro_getset
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_3D_GET_SET, three-dimensional point type}. \details_macro_getset
+\details \details_macro{BOOST_GEOMETRY_REGISTER_POINT_3D_GET_SET, three-dimensional point type}
+    \details_macro_getset
 \param Point \param_macro_type{Point}
 \param CoordinateType \param_macro_coortype{point}
 \param CoordinateSystem \param_macro_coorsystem
diff --git a/inst/include/boost/geometry/index/detail/algorithms/bounds.hpp b/inst/include/boost/geometry/index/detail/algorithms/bounds.hpp
index 999246d9c..616504458 100644
--- a/inst/include/boost/geometry/index/detail/algorithms/bounds.hpp
+++ b/inst/include/boost/geometry/index/detail/algorithms/bounds.hpp
@@ -186,9 +186,9 @@ struct covered_by_bounds<Geometry, Bounds, segment_tag, box_tag>
 {
     static inline bool apply(Geometry const& g, Bounds & b)
     {
-        typedef typename point_type<Geometry>::type point_type;
-        typedef geometry::model::box<point_type> bounds_type;
-        typedef index::detail::bounded_view<Geometry, bounds_type, default_strategy> view_type;
+        using point_type = point_type_t<Geometry>;
+        using bounds_type = geometry::model::box<point_type>;
+        using view_type = index::detail::bounded_view<Geometry, bounds_type, default_strategy>;
 
         return geometry::covered_by(view_type(g, default_strategy()), b);
     }
@@ -196,9 +196,9 @@ struct covered_by_bounds<Geometry, Bounds, segment_tag, box_tag>
     template <typename Strategy>
     static inline bool apply(Geometry const& g, Bounds & b, Strategy const& strategy)
     {
-        typedef typename point_type<Geometry>::type point_type;
-        typedef geometry::model::box<point_type> bounds_type;
-        typedef index::detail::bounded_view<Geometry, bounds_type, Strategy> view_type;
+        using point_type = point_type_t<Geometry>;
+        using bounds_type = geometry::model::box<point_type>;
+        using view_type = index::detail::bounded_view<Geometry, bounds_type, Strategy>;
 
         return geometry::covered_by(view_type(g, strategy), b, strategy);
     }
diff --git a/inst/include/boost/geometry/index/detail/algorithms/intersection_content.hpp b/inst/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
index 260af9eca..45e22f4bf 100644
--- a/inst/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
+++ b/inst/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
@@ -4,8 +4,9 @@
 //
 // Copyright (c) 2011-2018 Adam Wulkiewicz, Lodz, Poland.
 //
-// This file was modified by Oracle on 2019-2021.
-// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2019-2024.
+// Modifications copyright (c) 2019-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 //
 // Use, modification and distribution is subject to the Boost Software License,
@@ -57,7 +58,7 @@ inline typename default_content_result<Box>::type intersection_content(Box const
         bool const ok = geometry::detail::intersection::intersection_box_box
                             <
                                 0, geometry::dimension<Box>::value
-                            >::apply(box1, box2, 0, box_intersection, 0);
+                            >::apply(box1, box2, box_intersection, 0);
         if ( ok )
         {
             return index::detail::content(box_intersection);
diff --git a/inst/include/boost/geometry/index/detail/algorithms/path_intersection.hpp b/inst/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
index afa203e1e..5cf936694 100644
--- a/inst/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
+++ b/inst/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
@@ -52,12 +52,11 @@ struct path_intersection
 template <typename Indexable, typename Segment>
 struct path_intersection<Indexable, Segment, box_tag, segment_tag>
 {
-    typedef typename default_distance_result<typename point_type<Segment>::type>::type comparable_distance_type;
+    using comparable_distance_type = typename default_distance_result<point_type_t<Segment>>::type;
 
     static inline bool apply(Indexable const& b, Segment const& segment, comparable_distance_type & comparable_distance)
     {
-        typedef typename point_type<Segment>::type point_type;
-        point_type p1, p2;
+        point_type_t<Segment> p1, p2;
         geometry::detail::assign_point_from_index<0>(segment, p1);
         geometry::detail::assign_point_from_index<1>(segment, p2);
         return index::detail::segment_intersection(b, p1, p2, comparable_distance);
@@ -67,7 +66,7 @@ struct path_intersection<Indexable, Segment, box_tag, segment_tag>
 template <typename Indexable, typename Linestring>
 struct path_intersection<Indexable, Linestring, box_tag, linestring_tag>
 {
-    typedef typename default_length_result<Linestring>::type comparable_distance_type;
+    using comparable_distance_type = typename default_length_result<Linestring>::type;
 
     static inline bool apply(Indexable const& b, Linestring const& path, comparable_distance_type & comparable_distance)
     {
diff --git a/inst/include/boost/geometry/index/detail/bounded_view.hpp b/inst/include/boost/geometry/index/detail/bounded_view.hpp
index b3776416b..1ba9f37f5 100644
--- a/inst/include/boost/geometry/index/detail/bounded_view.hpp
+++ b/inst/include/boost/geometry/index/detail/bounded_view.hpp
@@ -241,7 +241,7 @@ struct tag< index::detail::bounded_view<Geometry, Box, Strategy, Tag, box_tag> >
 template <typename Geometry, typename Box, typename Strategy, typename Tag>
 struct point_type< index::detail::bounded_view<Geometry, Box, Strategy, Tag, box_tag> >
 {
-    typedef typename point_type<Box>::type type;
+    using type = point_type_t<Box>;
 };
 
 template <typename Geometry, typename Box, typename Strategy, typename Tag, std::size_t Dimension>
diff --git a/inst/include/boost/geometry/index/detail/rtree/node/node.hpp b/inst/include/boost/geometry/index/detail/rtree/node/node.hpp
index fba76efb1..621b602c1 100644
--- a/inst/include/boost/geometry/index/detail/rtree/node/node.hpp
+++ b/inst/include/boost/geometry/index/detail/rtree/node/node.hpp
@@ -21,6 +21,8 @@
 
 #include <boost/geometry/core/static_assert.hpp>
 
+#include <boost/geometry/algorithms/expand.hpp>
+
 #include <boost/geometry/index/detail/varray.hpp>
 
 #include <boost/geometry/index/detail/rtree/node/concept.hpp>
@@ -36,14 +38,14 @@
 #include <boost/geometry/index/detail/rtree/node/variant_dynamic.hpp>
 #include <boost/geometry/index/detail/rtree/node/variant_static.hpp>
 
-#include <boost/geometry/algorithms/expand.hpp>
-
 #include <boost/geometry/index/detail/rtree/visitors/destroy.hpp>
 #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
 
 #include <boost/geometry/index/detail/algorithms/bounds.hpp>
 #include <boost/geometry/index/detail/is_bounding_geometry.hpp>
 
+#include <boost/geometry/util/constexpr.hpp>
+
 namespace boost { namespace geometry { namespace index {
 
 namespace detail { namespace rtree {
@@ -92,11 +94,10 @@ inline Box values_box(FwdIter first, FwdIter last, Translator const& tr,
     Box result = elements_box<Box>(first, last, tr, strategy);
 
 #ifdef BOOST_GEOMETRY_INDEX_EXPERIMENTAL_ENLARGE_BY_EPSILON
-    if (BOOST_GEOMETRY_CONDITION((
-        ! is_bounding_geometry
-            <
-                typename indexable_type<Translator>::type
-            >::value)))
+    if BOOST_GEOMETRY_CONSTEXPR (! index::detail::is_bounding_geometry
+                                    <
+                                        typename indexable_type<Translator>::type
+                                    >::value)
     {
         geometry::detail::expand_by_epsilon(result);
     }
diff --git a/inst/include/boost/geometry/index/detail/rtree/pack_create.hpp b/inst/include/boost/geometry/index/detail/rtree/pack_create.hpp
index 33600a4c9..dab7cfdbd 100644
--- a/inst/include/boost/geometry/index/detail/rtree/pack_create.hpp
+++ b/inst/include/boost/geometry/index/detail/rtree/pack_create.hpp
@@ -31,6 +31,8 @@
 #include <boost/geometry/index/detail/rtree/node/subtree_destroyer.hpp>
 #include <boost/geometry/index/parameters.hpp>
 
+#include <boost/geometry/util/constexpr.hpp>
+
 namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree {
 
 namespace pack_utils {
@@ -343,11 +345,10 @@ class pack
             // NOTE: this is done only if the Indexable is a different kind of Geometry
             //   than the bounds (only Box for now). Spatial predicates are checked
             //   the same way for Geometry of the same kind.
-            if ( BOOST_GEOMETRY_CONDITION((
-                    ! index::detail::is_bounding_geometry
-                        <
-                            typename indexable_type<translator_type>::type
-                        >::value )) )
+            if BOOST_GEOMETRY_CONSTEXPR (! index::detail::is_bounding_geometry
+                                            <
+                                                typename indexable_type<translator_type>::type
+                                            >::value)
             {
                 elements_box.expand_by_epsilon();
             }
diff --git a/inst/include/boost/geometry/index/detail/rtree/visitors/insert.hpp b/inst/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
index 2d87e21a1..27e62584d 100644
--- a/inst/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
+++ b/inst/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
@@ -30,7 +30,7 @@
 #include <boost/geometry/index/detail/rtree/node/subtree_destroyer.hpp>
 #include <boost/geometry/index/detail/rtree/options.hpp>
 
-#include <boost/geometry/util/condition.hpp>
+#include <boost/geometry/util/constexpr.hpp>
 
 namespace boost { namespace geometry { namespace index {
 
@@ -328,12 +328,11 @@ class insert
         // Enlarge it in case if it's not bounding geometry type.
         // It's because Points and Segments are compared WRT machine epsilon
         // This ensures that leafs bounds correspond to the stored elements
-        if (BOOST_GEOMETRY_CONDITION((
-                std::is_same<Element, value_type>::value
-             && ! index::detail::is_bounding_geometry
-                    <
-                        typename indexable_type<translator_type>::type
-                    >::value )) )
+        if BOOST_GEOMETRY_CONSTEXPR ((std::is_same<Element, value_type>::value)
+                                    && ! index::detail::is_bounding_geometry
+                                            <
+                                                typename indexable_type<translator_type>::type
+                                            >::value)
         {
             geometry::detail::expand_by_epsilon(m_element_bounds);
         }
@@ -425,16 +424,16 @@ class insert
         // Enlarge bounds of a leaf node.
         // It's because Points and Segments are compared WRT machine epsilon
         // This ensures that leafs' bounds correspond to the stored elements.
-        if (BOOST_GEOMETRY_CONDITION((
-                std::is_same<Node, leaf>::value
-             && ! index::detail::is_bounding_geometry
-                    <
-                        typename indexable_type<translator_type>::type
-                    >::value )))
+        if BOOST_GEOMETRY_CONSTEXPR ((std::is_same<Node, leaf>::value)
+                                     && ! index::detail::is_bounding_geometry
+                                            <
+                                                typename indexable_type<translator_type>::type
+                                            >::value)
         {
             geometry::detail::expand_by_epsilon(n_box);
             geometry::detail::expand_by_epsilon(additional_nodes[0].first);
         }
+
 #endif
 
         // node is not the root - just add the new node
diff --git a/inst/include/boost/geometry/index/equal_to.hpp b/inst/include/boost/geometry/index/equal_to.hpp
index 0a360ba38..85fa7e5ad 100644
--- a/inst/include/boost/geometry/index/equal_to.hpp
+++ b/inst/include/boost/geometry/index/equal_to.hpp
@@ -159,6 +159,7 @@ struct equal_to
 
     \param l First value.
     \param r Second value.
+    \param strategy Strategy to be used.
     \return true if values are equal.
     */
     template <typename Strategy>
@@ -188,6 +189,7 @@ struct equal_to<std::pair<T1, T2>, false>
 
     \param l First value.
     \param r Second value.
+    \param strategy Strategy to be used.
     \return true if values are equal.
     */
     template <typename Strategy>
@@ -219,6 +221,7 @@ struct equal_to<boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>, false>
 
     \param l First value.
     \param r Second value.
+    \param strategy Strategy to be used.
     \return true if values are equal.
     */
     template <typename Strategy>
@@ -278,6 +281,7 @@ struct equal_to<std::tuple<Args...>, false>
 
     \param l First value.
     \param r Second value.
+    \param strategy Strategy to be used.
     \return true if values are equal.
     */
     template <typename Strategy>
diff --git a/inst/include/boost/geometry/io/dsv/write.hpp b/inst/include/boost/geometry/io/dsv/write.hpp
index e8b257a93..e73cdfb81 100644
--- a/inst/include/boost/geometry/io/dsv/write.hpp
+++ b/inst/include/boost/geometry/io/dsv/write.hpp
@@ -226,7 +226,7 @@ struct dsv_poly
 template <typename Geometry, std::size_t Index>
 struct dsv_per_index
 {
-    typedef typename point_type<Geometry>::type point_type;
+    using type = point_type_t<Geometry>;
 
     template <typename Char, typename Traits>
     static inline void apply(std::basic_ostream<Char, Traits>& os,
@@ -245,7 +245,7 @@ struct dsv_per_index
 template <typename Geometry>
 struct dsv_indexed
 {
-    typedef typename point_type<Geometry>::type point_type;
+    using type = point_type_t<Geometry>;
 
     template <typename Char, typename Traits>
     static inline void apply(std::basic_ostream<Char, Traits>& os,
@@ -326,11 +326,11 @@ class dsv_manipulator
     {
         dispatch::dsv
             <
-                typename tag_cast
+                tag_cast_t
                     <
-                        typename tag<Geometry>::type,
+                        tag_t<Geometry>,
                         multi_tag
-                    >::type,
+                    >,
                 Geometry
             >::apply(os, m.m_geometry, m.m_settings);
         os.flush();
diff --git a/inst/include/boost/geometry/io/svg/svg_mapper.hpp b/inst/include/boost/geometry/io/svg/svg_mapper.hpp
index 06ac64c3c..a81e874e5 100644
--- a/inst/include/boost/geometry/io/svg/svg_mapper.hpp
+++ b/inst/include/boost/geometry/io/svg/svg_mapper.hpp
@@ -186,11 +186,7 @@ struct devarianted_svg_map
     {
         svg_map
             <
-                typename tag_cast
-                    <
-                        typename tag<Geometry>::type,
-                        multi_tag
-                    >::type,
+                tag_cast_t<tag_t<Geometry>, multi_tag>,
                 typename std::remove_const<Geometry>::type,
                 SvgPoint
             >::apply(stream, style, size, geometry, strategy);
diff --git a/inst/include/boost/geometry/io/wkt/detail/wkt_multi.hpp b/inst/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
deleted file mode 100644
index f33275216..000000000
--- a/inst/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_IO_WKT_MULTI_HPP
-#define BOOST_GEOMETRY_IO_WKT_MULTI_HPP
-
-#include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
-
-#endif // BOOST_GEOMETRY_IO_WKT_MULTI_HPP
diff --git a/inst/include/boost/geometry/io/wkt/read.hpp b/inst/include/boost/geometry/io/wkt/read.hpp
index 5bbfd235c..1cc294ac2 100644
--- a/inst/include/boost/geometry/io/wkt/read.hpp
+++ b/inst/include/boost/geometry/io/wkt/read.hpp
@@ -786,7 +786,7 @@ struct box_parser
             BOOST_THROW_EXCEPTION(read_wkt_exception("Should start with 'POLYGON' or 'BOX'", wkt));
         }
 
-        using point_type = typename point_type<Box>::type;
+        using point_type = point_type_t<Box>;
         std::vector<point_type> points;
         container_inserter<point_type>::apply(it, end, wkt, std::back_inserter(points));
 
@@ -855,7 +855,7 @@ struct segment_parser
             BOOST_THROW_EXCEPTION(read_wkt_exception("Should start with 'LINESTRING' or 'SEGMENT'", wkt));
         }
 
-        using point_type = typename point_type<Segment>::type;
+        using point_type = point_type_t<Segment>;
         std::vector<point_type> points;
         container_inserter<point_type>::apply(it, end, wkt, std::back_inserter(points));
 
@@ -1188,10 +1188,10 @@ struct read_wkt<Geometry, geometry_collection_tag>
 #endif // DOXYGEN_NO_DISPATCH
 
 /*!
-\brief Parses OGC Well-Known Text (\ref WKT) into a geometry (any geometry)
+\brief Parses OGC \well_known_text (\wkt) into a geometry (any geometry)
 \ingroup wkt
 \tparam Geometry \tparam_geometry
-\param wkt string containing \ref WKT
+\param wkt string containing \wkt
 \param geometry \param_geometry output geometry
 \ingroup wkt
 \qbk{[include reference/io/read_wkt.qbk]}
@@ -1204,10 +1204,10 @@ inline void read_wkt(std::string const& wkt, Geometry& geometry)
 }
 
 /*!
-\brief Parses OGC Well-Known Text (\ref WKT) into a geometry (any geometry) and returns it
+\brief Parses OGC \well_known_text (\wkt) into a geometry (any geometry) and returns it
 \ingroup wkt
 \tparam Geometry \tparam_geometry
-\param wkt string containing \ref WKT
+\param wkt string containing \wkt
 \ingroup wkt
 \qbk{[include reference/io/from_wkt.qbk]}
 */
diff --git a/inst/include/boost/geometry/io/wkt/write.hpp b/inst/include/boost/geometry/io/wkt/write.hpp
index 90f69a54a..4b776e02d 100644
--- a/inst/include/boost/geometry/io/wkt/write.hpp
+++ b/inst/include/boost/geometry/io/wkt/write.hpp
@@ -87,7 +87,7 @@ struct stream_coordinate<P, Count, Count>
 };
 
 /*!
-\brief Stream points as \ref WKT
+\brief Stream points as \wkt
 */
 template <typename Point, typename Policy>
 struct wkt_point
@@ -254,7 +254,7 @@ struct wkt_multi
 template <typename Box>
 struct wkt_box
 {
-    using point_type = typename point_type<Box>::type;
+    using point_type = point_type_t<Box>;
 
     template <typename Char, typename Traits>
     static inline void apply(std::basic_ostream<Char, Traits>& os,
@@ -298,7 +298,7 @@ struct wkt_box
 template <typename Segment>
 struct wkt_segment
 {
-    using point_type = typename point_type<Segment>::type;
+    using point_type = point_type_t<Segment>;
 
     template <typename Char, typename Traits>
     static inline void apply(std::basic_ostream<Char, Traits>& os,
@@ -510,7 +510,7 @@ struct wkt<Geometry, geometry_collection_tag>
 /*!
 \brief Generic geometry template manipulator class, takes corresponding output class from traits class
 \ingroup wkt
-\details Stream manipulator, streams geometry classes as \ref WKT streams
+\details Stream manipulator, streams geometry classes as \wkt streams
 \par Example:
 Small example showing how to use the wkt class
 \dontinclude doxygen_1.cpp
@@ -567,7 +567,6 @@ inline wkt_manipulator<Geometry> wkt(Geometry const& geometry)
 \brief WKT-string formulating function
 \tparam Geometry \tparam_geometry
 \param geometry \param_geometry
-\param significant_digits Specifies the no of significant digits to use in the output wkt
 \ingroup wkt
 \qbk{[include reference/io/to_wkt.qbk]}
 */
@@ -579,6 +578,14 @@ inline std::string to_wkt(Geometry const& geometry)
     return ss.str();
 }
 
+/*!
+\brief WKT-string formulating function (with significant digits)
+\tparam Geometry \tparam_geometry
+\param geometry \param_geometry
+\param significant_digits Specifies the number of significant digits to use in the output wkt
+\ingroup wkt
+\qbk{distinguish, with significant digits}
+*/
 template <typename Geometry>
 inline std::string to_wkt(Geometry const& geometry, int significant_digits)
 {
diff --git a/inst/include/boost/geometry/multi/algorithms/append.hpp b/inst/include/boost/geometry/multi/algorithms/append.hpp
index d1589aca8..e3c94efcb 100644
--- a/inst/include/boost/geometry/multi/algorithms/append.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/append.hpp
@@ -20,6 +20,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_APPEND_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_APPEND_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/append.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/area.hpp b/inst/include/boost/geometry/multi/algorithms/area.hpp
index 0e25ffc64..a9397d82e 100644
--- a/inst/include/boost/geometry/multi/algorithms/area.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/area.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_AREA_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_AREA_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/area.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/centroid.hpp b/inst/include/boost/geometry/multi/algorithms/centroid.hpp
index 1c9902f2b..d9606ffd6 100644
--- a/inst/include/boost/geometry/multi/algorithms/centroid.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/centroid.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_CENTROID_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CENTROID_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/centroid.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/clear.hpp b/inst/include/boost/geometry/multi/algorithms/clear.hpp
index 6d9e284d0..f1e9bc401 100644
--- a/inst/include/boost/geometry/multi/algorithms/clear.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/clear.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_CLEAR_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CLEAR_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/clear.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/convert.hpp b/inst/include/boost/geometry/multi/algorithms/convert.hpp
index 0e7b2946d..54a1a3294 100644
--- a/inst/include/boost/geometry/multi/algorithms/convert.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/convert.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_CONVERT_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CONVERT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/convert.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/correct.hpp b/inst/include/boost/geometry/multi/algorithms/correct.hpp
index 83d26ca60..32a229604 100644
--- a/inst/include/boost/geometry/multi/algorithms/correct.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/correct.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_CORRECT_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CORRECT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/correct.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/covered_by.hpp b/inst/include/boost/geometry/multi/algorithms/covered_by.hpp
index 706bc7847..04e40e721 100644
--- a/inst/include/boost/geometry/multi/algorithms/covered_by.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/covered_by.hpp
@@ -20,6 +20,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_COVERED_BY_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_COVERED_BY_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/covered_by.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp b/inst/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
index da2ac5e9f..9b84730ff 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
@@ -12,6 +12,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/extreme_points.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp b/inst/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
index 2fe475ed5..fb6633c0d 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/for_each_range.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/modify.hpp b/inst/include/boost/geometry/multi/algorithms/detail/modify.hpp
index ae52e002f..8a52b4298 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/modify.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/modify.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/multi_modify.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp b/inst/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
index 1a82a6714..0be682835 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_WITH_PREDICATE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_WITH_PREDICATE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp b/inst/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
index b91970a16..ca10adc8f 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MULTI_SUM_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MULTI_SUM_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/multi_sum.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp b/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
index 5e23cf4ba..69cff5fdc 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
@@ -12,6 +12,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENT_POINT_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENT_POINT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp b/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
index 54114bfae..76f239df0 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
@@ -9,6 +9,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp b/inst/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
index a83fb7739..fbc2e85a0 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
@@ -9,6 +9,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp b/inst/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
index 39bfea2fb..f2dae9efe 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
@@ -9,6 +9,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp b/inst/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
index 2ee789c5d..56fa25063 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
@@ -17,6 +17,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/point_on_border.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp b/inst/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
index 5604d9d74..b507d51cc 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
@@ -19,6 +19,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp b/inst/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
index ef9802123..4e7aa9c31 100644
--- a/inst/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
@@ -17,6 +17,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/disjoint.hpp b/inst/include/boost/geometry/multi/algorithms/disjoint.hpp
index 55f0f01cd..8e732558d 100644
--- a/inst/include/boost/geometry/multi/algorithms/disjoint.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/disjoint.hpp
@@ -16,6 +16,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DISJOINT_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISJOINT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 #include <boost/geometry/algorithms/disjoint.hpp>
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DISJOINT_HPP
diff --git a/inst/include/boost/geometry/multi/algorithms/distance.hpp b/inst/include/boost/geometry/multi/algorithms/distance.hpp
index 4946b6f3e..35ebcb5fb 100644
--- a/inst/include/boost/geometry/multi/algorithms/distance.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/distance.hpp
@@ -19,8 +19,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
 
-// this file is intentionally empty (with the exception of the #include below)
-// it is used for backward compatinility and may be removed in the future
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/distance.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/envelope.hpp b/inst/include/boost/geometry/multi/algorithms/envelope.hpp
index 457dfaf3b..1b99bebcf 100644
--- a/inst/include/boost/geometry/multi/algorithms/envelope.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/envelope.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_ENVELOPE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_ENVELOPE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/envelope.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/equals.hpp b/inst/include/boost/geometry/multi/algorithms/equals.hpp
index 0f045fff9..3aea16e94 100644
--- a/inst/include/boost/geometry/multi/algorithms/equals.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/equals.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_EQUALS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_EQUALS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/equals.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/for_each.hpp b/inst/include/boost/geometry/multi/algorithms/for_each.hpp
index d8b3af1ff..dc0b29c8b 100644
--- a/inst/include/boost/geometry/multi/algorithms/for_each.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/for_each.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_FOR_EACH_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_FOR_EACH_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/for_each.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/intersection.hpp b/inst/include/boost/geometry/multi/algorithms/intersection.hpp
index f43446325..117b084e6 100644
--- a/inst/include/boost/geometry/multi/algorithms/intersection.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/intersection.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/intersection.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/length.hpp b/inst/include/boost/geometry/multi/algorithms/length.hpp
index 168e6a732..12d0efc08 100644
--- a/inst/include/boost/geometry/multi/algorithms/length.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/length.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_LENGTH_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_LENGTH_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/length.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/num_geometries.hpp b/inst/include/boost/geometry/multi/algorithms/num_geometries.hpp
index 3a85f4e4b..6dcd44aac 100644
--- a/inst/include/boost/geometry/multi/algorithms/num_geometries.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/num_geometries.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_GEOMETRIES_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_GEOMETRIES_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/num_geometries.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/num_interior_rings.hpp b/inst/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
index fbaa113af..62f74fc1f 100644
--- a/inst/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
@@ -19,6 +19,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_INTERIOR_RINGS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_INTERIOR_RINGS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/num_interior_rings.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/num_points.hpp b/inst/include/boost/geometry/multi/algorithms/num_points.hpp
index a736f4254..9b56ce241 100644
--- a/inst/include/boost/geometry/multi/algorithms/num_points.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/num_points.hpp
@@ -20,6 +20,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_POINTS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_POINTS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/num_points.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/perimeter.hpp b/inst/include/boost/geometry/multi/algorithms/perimeter.hpp
index 4820111f1..844bb526b 100644
--- a/inst/include/boost/geometry/multi/algorithms/perimeter.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/perimeter.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_PERIMETER_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_PERIMETER_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/perimeter.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/remove_spikes.hpp b/inst/include/boost/geometry/multi/algorithms/remove_spikes.hpp
index af224ec47..5660cf6a9 100644
--- a/inst/include/boost/geometry/multi/algorithms/remove_spikes.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/remove_spikes.hpp
@@ -12,6 +12,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_REMOVE_SPIKES_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_REMOVE_SPIKES_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/remove_spikes.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/reverse.hpp b/inst/include/boost/geometry/multi/algorithms/reverse.hpp
index a7872bdd2..cea453e7c 100644
--- a/inst/include/boost/geometry/multi/algorithms/reverse.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/reverse.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_REVERSE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_REVERSE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/reverse.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/simplify.hpp b/inst/include/boost/geometry/multi/algorithms/simplify.hpp
index 8648d366d..f4d7222a7 100644
--- a/inst/include/boost/geometry/multi/algorithms/simplify.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/simplify.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/simplify.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/transform.hpp b/inst/include/boost/geometry/multi/algorithms/transform.hpp
index 7aa691ec4..e384dbed6 100644
--- a/inst/include/boost/geometry/multi/algorithms/transform.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/transform.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/transform.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/unique.hpp b/inst/include/boost/geometry/multi/algorithms/unique.hpp
index fa063a312..bb0a04e99 100644
--- a/inst/include/boost/geometry/multi/algorithms/unique.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/unique.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_UNIQUE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_UNIQUE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/algorithms/unique.hpp>
 
diff --git a/inst/include/boost/geometry/multi/algorithms/within.hpp b/inst/include/boost/geometry/multi/algorithms/within.hpp
index 9fdc5dd39..7127775fd 100644
--- a/inst/include/boost/geometry/multi/algorithms/within.hpp
+++ b/inst/include/boost/geometry/multi/algorithms/within.hpp
@@ -20,6 +20,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 #include <boost/geometry/algorithms/within.hpp>
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
diff --git a/inst/include/boost/geometry/multi/core/closure.hpp b/inst/include/boost/geometry/multi/core/closure.hpp
index 9e7cf3c24..65eb5b80f 100644
--- a/inst/include/boost/geometry/multi/core/closure.hpp
+++ b/inst/include/boost/geometry/multi/core/closure.hpp
@@ -14,6 +14,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 #include <boost/geometry/core/closure.hpp>
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
diff --git a/inst/include/boost/geometry/multi/core/geometry_id.hpp b/inst/include/boost/geometry/multi/core/geometry_id.hpp
index 7d5e888ba..f929ab5ae 100644
--- a/inst/include/boost/geometry/multi/core/geometry_id.hpp
+++ b/inst/include/boost/geometry/multi/core/geometry_id.hpp
@@ -15,6 +15,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 #include <boost/geometry/core/geometry_id.hpp>
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
diff --git a/inst/include/boost/geometry/multi/core/interior_rings.hpp b/inst/include/boost/geometry/multi/core/interior_rings.hpp
index deeeff81d..472bcacfb 100644
--- a/inst/include/boost/geometry/multi/core/interior_rings.hpp
+++ b/inst/include/boost/geometry/multi/core/interior_rings.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/interior_rings.hpp>
 
diff --git a/inst/include/boost/geometry/multi/core/is_areal.hpp b/inst/include/boost/geometry/multi/core/is_areal.hpp
index 30f98527a..1c8e0d345 100644
--- a/inst/include/boost/geometry/multi/core/is_areal.hpp
+++ b/inst/include/boost/geometry/multi/core/is_areal.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_IS_AREAL_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_IS_AREAL_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/is_areal.hpp>
 
diff --git a/inst/include/boost/geometry/multi/core/point_order.hpp b/inst/include/boost/geometry/multi/core/point_order.hpp
index 119e55c3b..79aa84b3a 100644
--- a/inst/include/boost/geometry/multi/core/point_order.hpp
+++ b/inst/include/boost/geometry/multi/core/point_order.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_POINT_ORDER_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_POINT_ORDER_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/point_order.hpp>
 
diff --git a/inst/include/boost/geometry/multi/core/point_type.hpp b/inst/include/boost/geometry/multi/core/point_type.hpp
index a7277d09a..5871b9ba7 100644
--- a/inst/include/boost/geometry/multi/core/point_type.hpp
+++ b/inst/include/boost/geometry/multi/core/point_type.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/point_type.hpp>
 
diff --git a/inst/include/boost/geometry/multi/core/ring_type.hpp b/inst/include/boost/geometry/multi/core/ring_type.hpp
index b27b5527c..85ece1f61 100644
--- a/inst/include/boost/geometry/multi/core/ring_type.hpp
+++ b/inst/include/boost/geometry/multi/core/ring_type.hpp
@@ -18,6 +18,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_RING_TYPE_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_RING_TYPE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/ring_type.hpp>
 
diff --git a/inst/include/boost/geometry/multi/core/tags.hpp b/inst/include/boost/geometry/multi/core/tags.hpp
index fb0758d95..cd69701f2 100644
--- a/inst/include/boost/geometry/multi/core/tags.hpp
+++ b/inst/include/boost/geometry/multi/core/tags.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/tags.hpp>
 
diff --git a/inst/include/boost/geometry/multi/core/topological_dimension.hpp b/inst/include/boost/geometry/multi/core/topological_dimension.hpp
index b4f1e89ae..1347285fe 100644
--- a/inst/include/boost/geometry/multi/core/topological_dimension.hpp
+++ b/inst/include/boost/geometry/multi/core/topological_dimension.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_TOPOLOGICAL_DIMENSION_HPP
 #define BOOST_GEOMETRY_MULTI_TOPOLOGICAL_DIMENSION_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/core/topological_dimension.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/concepts/check.hpp b/inst/include/boost/geometry/multi/geometries/concepts/check.hpp
index c741afd79..4626084ea 100644
--- a/inst/include/boost/geometry/multi/geometries/concepts/check.hpp
+++ b/inst/include/boost/geometry/multi/geometries/concepts/check.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_CHECK_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_CHECK_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp b/inst/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
index 9a9438efc..2080aff2f 100644
--- a/inst/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
+++ b/inst/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/concepts/multi_linestring_concept.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp b/inst/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
index 14c1d25e5..0fd0bb78d 100644
--- a/inst/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
+++ b/inst/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/concepts/multi_point_concept.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp b/inst/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
index 5e46fb753..3f0c1f72d 100644
--- a/inst/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
+++ b/inst/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/concepts/multi_polygon_concept.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/multi_geometries.hpp b/inst/include/boost/geometry/multi/geometries/multi_geometries.hpp
index 53042091b..f94b6526e 100644
--- a/inst/include/boost/geometry/multi/geometries/multi_geometries.hpp
+++ b/inst/include/boost/geometry/multi/geometries/multi_geometries.hpp
@@ -14,6 +14,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_GEOMETRIES_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_GEOMETRIES_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 #include <boost/geometry/geometries/multi_point.hpp>
 #include <boost/geometry/geometries/multi_linestring.hpp>
 #include <boost/geometry/geometries/multi_polygon.hpp>
diff --git a/inst/include/boost/geometry/multi/geometries/multi_linestring.hpp b/inst/include/boost/geometry/multi/geometries/multi_linestring.hpp
index 696d907dc..758e45e4c 100644
--- a/inst/include/boost/geometry/multi/geometries/multi_linestring.hpp
+++ b/inst/include/boost/geometry/multi/geometries/multi_linestring.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_LINESTRING_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_LINESTRING_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/multi_linestring.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/multi_point.hpp b/inst/include/boost/geometry/multi/geometries/multi_point.hpp
index 750ad7802..e547c8e9c 100644
--- a/inst/include/boost/geometry/multi/geometries/multi_point.hpp
+++ b/inst/include/boost/geometry/multi/geometries/multi_point.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POINT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POINT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/multi_point.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/multi_polygon.hpp b/inst/include/boost/geometry/multi/geometries/multi_polygon.hpp
index 06fefc785..71cb38cb8 100644
--- a/inst/include/boost/geometry/multi/geometries/multi_polygon.hpp
+++ b/inst/include/boost/geometry/multi/geometries/multi_polygon.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POLYGON_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POLYGON_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/multi_polygon.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/register/multi_linestring.hpp b/inst/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
index 2783a8455..005b910e7 100644
--- a/inst/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
+++ b/inst/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/register/multi_linestring.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/register/multi_point.hpp b/inst/include/boost/geometry/multi/geometries/register/multi_point.hpp
index 6063492c2..2560fa02e 100644
--- a/inst/include/boost/geometry/multi/geometries/register/multi_point.hpp
+++ b/inst/include/boost/geometry/multi/geometries/register/multi_point.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POINT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POINT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/register/multi_point.hpp>
 
diff --git a/inst/include/boost/geometry/multi/geometries/register/multi_polygon.hpp b/inst/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
index 6a3e47e3d..2549333b3 100644
--- a/inst/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
+++ b/inst/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/geometries/register/multi_polygon.hpp>
 
diff --git a/inst/include/boost/geometry/multi/io/dsv/write.hpp b/inst/include/boost/geometry/multi/io/dsv/write.hpp
index 092869f56..cd4a96d0f 100644
--- a/inst/include/boost/geometry/multi/io/dsv/write.hpp
+++ b/inst/include/boost/geometry/multi/io/dsv/write.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_DSV_WRITE_HPP
 #define BOOST_GEOMETRY_MULTI_IO_DSV_WRITE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/io/dsv/write.hpp>
 
diff --git a/inst/include/boost/geometry/multi/io/wkt/detail/prefix.hpp b/inst/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
deleted file mode 100644
index ee6b37e59..000000000
--- a/inst/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_PREFIX_HPP
-#define BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_PREFIX_HPP
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
-
-#endif // BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_PREFIX_HPP
diff --git a/inst/include/boost/geometry/multi/io/wkt/read.hpp b/inst/include/boost/geometry/multi/io/wkt/read.hpp
index 37e5f9e72..9fe026cca 100644
--- a/inst/include/boost/geometry/multi/io/wkt/read.hpp
+++ b/inst/include/boost/geometry/multi/io/wkt/read.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_READ_MULTI_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_READ_MULTI_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/io/wkt/read.hpp>
 
diff --git a/inst/include/boost/geometry/multi/io/wkt/wkt.hpp b/inst/include/boost/geometry/multi/io/wkt/wkt.hpp
index a6159e140..5d4fcc8e0 100644
--- a/inst/include/boost/geometry/multi/io/wkt/wkt.hpp
+++ b/inst/include/boost/geometry/multi/io/wkt/wkt.hpp
@@ -14,6 +14,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_WKT_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_WKT_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 #include <boost/geometry/io/wkt/read.hpp>
 #include <boost/geometry/io/wkt/write.hpp>
 
diff --git a/inst/include/boost/geometry/multi/io/wkt/write.hpp b/inst/include/boost/geometry/multi/io/wkt/write.hpp
index 2c26d3d2e..c83e337b3 100644
--- a/inst/include/boost/geometry/multi/io/wkt/write.hpp
+++ b/inst/include/boost/geometry/multi/io/wkt/write.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_WRITE_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_WRITE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/io/wkt/write.hpp>
 
diff --git a/inst/include/boost/geometry/multi/multi.hpp b/inst/include/boost/geometry/multi/multi.hpp
index 85d763ee6..d9f15bd28 100644
--- a/inst/include/boost/geometry/multi/multi.hpp
+++ b/inst/include/boost/geometry/multi/multi.hpp
@@ -17,6 +17,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_HPP
 #define BOOST_GEOMETRY_MULTI_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
+
 // keep this file for now, for backward compatibility
 // functionality-wise, make it equivalent to boost/geometry/geometry.hpp
 #include <boost/geometry/geometry.hpp>
diff --git a/inst/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp b/inst/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
index ce614e2e7..1d7476b68 100644
--- a/inst/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
+++ b/inst/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
@@ -14,6 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
 #define BOOST_GEOMETRY_MULTI_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 #include <boost/geometry/strategies/cartesian/centroid_average.hpp>
 
diff --git a/inst/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp b/inst/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
index 701e72c2d..89292a47f 100644
--- a/inst/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
+++ b/inst/include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
@@ -181,12 +181,11 @@ class failing_reason_policy
         static inline void apply(std::ostringstream& oss,
                                  Point const& point)
         {
-            if BOOST_GEOMETRY_CONSTEXPR (AllowDuplicates)
+            if BOOST_GEOMETRY_CONSTEXPR (! AllowDuplicates)
             {
-                return;
+                oss << ". Duplicate points were found near point "
+                    << geometry::dsv(point);
             }
-            oss << ". Duplicate points were found near point "
-                << geometry::dsv(point);
         }
     };
 
diff --git a/inst/include/boost/geometry/policies/relate/direction.hpp b/inst/include/boost/geometry/policies/relate/direction.hpp
index 2c903bd79..11c18d6e4 100644
--- a/inst/include/boost/geometry/policies/relate/direction.hpp
+++ b/inst/include/boost/geometry/policies/relate/direction.hpp
@@ -163,6 +163,14 @@ struct segments_direction
             ;
     }
 
+    template <typename SegmentIntersectionInfo, typename Point>
+    static inline return_type segments_share_common_point(side_info const& sides,
+                                                          SegmentIntersectionInfo const& ,
+                                                          Point const&)
+    {
+        return segments_crosses(sides, sides, sides, sides);
+    }
+
     template <typename Ratio>
     static inline int arrival_value(Ratio const& r_from, Ratio const& r_to)
     {
diff --git a/inst/include/boost/geometry/policies/relate/intersection_points.hpp b/inst/include/boost/geometry/policies/relate/intersection_points.hpp
index 1d7671ddf..1b11c59f4 100644
--- a/inst/include/boost/geometry/policies/relate/intersection_points.hpp
+++ b/inst/include/boost/geometry/policies/relate/intersection_points.hpp
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <string>
 
+#include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/assert.hpp>
@@ -61,6 +62,21 @@ struct segments_intersection_points
         return result;
     }
 
+    template<typename SegmentIntersectionInfo, typename Point>
+    static inline return_type
+    segments_share_common_point(side_info const&, SegmentIntersectionInfo const& sinfo,
+                                Point const& p)
+    {
+        return_type result;
+        result.count = 1;
+        boost::geometry::assign(result.intersections[0], p);
+
+        // Temporary - this should go later
+        result.fractions[0].assign(sinfo);
+
+        return result;
+    }
+
     template <typename Segment1, typename Segment2, typename Ratio>
     static inline return_type segments_collinear(
         Segment1 const& a, Segment2 const& b, bool /*opposite*/,
diff --git a/inst/include/boost/geometry/policies/relate/intersection_policy.hpp b/inst/include/boost/geometry/policies/relate/intersection_policy.hpp
index 6afffc20c..6a573f9f2 100644
--- a/inst/include/boost/geometry/policies/relate/intersection_policy.hpp
+++ b/inst/include/boost/geometry/policies/relate/intersection_policy.hpp
@@ -67,6 +67,19 @@ struct segments_intersection_policy
             );
     }
 
+    template <typename SegmentIntersectionInfo, typename Point>
+    static inline return_type
+    segments_share_common_point(side_info const& sides,
+                                SegmentIntersectionInfo const& sinfo,
+                                Point const& p)
+    {
+        return return_type
+            (
+                pts_policy::segments_share_common_point(sides, sinfo, p),
+                dir_policy::segments_share_common_point(sides, sinfo, p)
+            );
+    }
+
     template <typename Segment1, typename Segment2, typename Ratio>
     static inline return_type segments_collinear(
                                         Segment1 const& segment1,
diff --git a/inst/include/boost/geometry/policies/relate/intersection_ratios.hpp b/inst/include/boost/geometry/policies/relate/intersection_ratios.hpp
index 81ecba0b5..0d4f4f141 100644
--- a/inst/include/boost/geometry/policies/relate/intersection_ratios.hpp
+++ b/inst/include/boost/geometry/policies/relate/intersection_ratios.hpp
@@ -14,7 +14,6 @@
 #include <string>
 
 #include <boost/concept_check.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/core/access.hpp>
@@ -55,6 +54,16 @@ struct segments_intersection_ratios
         return result;
     }
 
+    template<typename SegmentIntersectionInfo, typename Point>
+    static inline return_type
+    segments_share_common_point(side_info const&, SegmentIntersectionInfo const& sinfo,
+                                Point const& p)
+    {
+        return_type result;
+        result.assign(sinfo);
+        return result;
+    }
+
     template <typename Segment1, typename Segment2, typename Ratio>
     static inline return_type segments_collinear(
         Segment1 const& , Segment2 const& ,
diff --git a/inst/include/boost/geometry/policies/robustness/get_rescale_policy.hpp b/inst/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
deleted file mode 100644
index 5e1dd5e4d..000000000
--- a/inst/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
+++ /dev/null
@@ -1,415 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2014-2015 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2014-2015 Bruno Lalande, Paris, France.
-// Copyright (c) 2014-2015 Mateusz Loskot, London, UK.
-// Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2015-2020.
-// Modifications copyright (c) 2015-2020, Oracle and/or its affiliates.
-
-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_GET_RESCALE_POLICY_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_GET_RESCALE_POLICY_HPP
-
-
-#include <cstddef>
-#include <type_traits>
-
-#include <boost/geometry/core/assert.hpp>
-#include <boost/geometry/core/config.hpp>
-#include <boost/geometry/core/coordinate_promotion.hpp>
-#include <boost/geometry/core/tag_cast.hpp>
-
-#include <boost/geometry/algorithms/envelope.hpp>
-#include <boost/geometry/algorithms/expand.hpp>
-#include <boost/geometry/algorithms/is_empty.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
-#include <boost/geometry/algorithms/detail/get_max_size.hpp>
-#include <boost/geometry/core/static_assert.hpp>
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
-#include <boost/geometry/policies/robustness/rescale_policy.hpp>
-#include <boost/geometry/policies/robustness/robust_type.hpp>
-#include <boost/geometry/util/type_traits.hpp>
-
-// TEMP
-#include <boost/geometry/strategies/envelope/cartesian.hpp>
-#include <boost/geometry/strategies/envelope/geographic.hpp>
-#include <boost/geometry/strategies/envelope/spherical.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace get_rescale_policy
-{
-
-template
-<
-    typename Box,
-    typename Point,
-    typename RobustPoint,
-    typename Factor
->
-inline void scale_box_to_integer_range(Box const& box,
-                                       Point& min_point,
-                                       RobustPoint& min_robust_point,
-                                       Factor& factor)
-{
-    // Scale box to integer-range
-    typedef typename promote_floating_point
-        <
-            typename geometry::coordinate_type<Point>::type
-        >::type num_type;
-    num_type const diff = boost::numeric_cast<num_type>(detail::get_max_size(box));
-    num_type const range = 10000000.0; // Define a large range to get precise integer coordinates
-    num_type const half = 0.5;
-    if (math::equals(diff, num_type())
-        || diff >= range
-        || ! boost::math::isfinite(diff))
-    {
-        factor = 1;
-    }
-    else
-    {
-        factor = boost::numeric_cast<num_type>(
-            boost::numeric_cast<boost::long_long_type>(half + range / diff));
-        BOOST_GEOMETRY_ASSERT(factor >= 1);
-    }
-
-    // Assign input/output minimal points
-    detail::assign_point_from_index<0>(box, min_point);
-    num_type const two = 2;
-    boost::long_long_type const min_coordinate
-        = boost::numeric_cast<boost::long_long_type>(-range / two);
-    assign_values(min_robust_point, min_coordinate, min_coordinate);
-}
-
-template
-<
-    typename Point, typename RobustPoint, typename Geometry,
-    typename Factor, typename Strategy
->
-static inline void init_rescale_policy(Geometry const& geometry,
-        Point& min_point,
-        RobustPoint& min_robust_point,
-        Factor& factor,
-        Strategy const& strategy)
-{
-    if (geometry::is_empty(geometry))
-    {
-        return;
-    }
-
-    // Get bounding box
-    model::box<Point> env = geometry::return_envelope
-                                <
-                                    model::box<Point>
-                                >(geometry, strategy);
-
-    scale_box_to_integer_range(env, min_point, min_robust_point, factor);
-}
-
-// NOTE: Actually it should take 2 separate strategies, one for each geometry
-// in case one of them was e.g. a Box
-template
-<
-    typename Point, typename RobustPoint, typename Geometry1, typename Geometry2,
-    typename Factor, typename Strategy1, typename Strategy2
->
-static inline void init_rescale_policy(Geometry1 const& geometry1,
-        Geometry2 const& geometry2,
-        Point& min_point,
-        RobustPoint& min_robust_point,
-        Factor& factor,
-        Strategy1 const& strategy1,
-        Strategy2 const& strategy2)
-{
-    // Get bounding boxes (when at least one of the geometries is not empty)
-    bool const is_empty1 = geometry::is_empty(geometry1);
-    bool const is_empty2 = geometry::is_empty(geometry2);
-    if (is_empty1 && is_empty2)
-    {
-        return;
-    }
-
-    model::box<Point> env;
-    if (is_empty1)
-    {
-        geometry::envelope(geometry2, env, strategy2);
-    }
-    else if (is_empty2)
-    {
-        geometry::envelope(geometry1, env, strategy1);
-    }
-    else
-    {
-        // The following approach (envelope + expand) may not give the
-        // optimal MBR when then two geometries are in the spherical
-        // equatorial or geographic coordinate systems.
-        // TODO: implement envelope for two (or possibly more geometries)
-        geometry::envelope(geometry1, env, strategy1);
-        model::box<Point> env2 = geometry::return_envelope
-            <
-                model::box<Point>
-            >(geometry2, strategy2);
-        geometry::expand(env, env2, strategy1);
-    }
-
-    scale_box_to_integer_range(env, min_point, min_robust_point, factor);
-}
-
-
-template
-<
-    typename Point,
-    bool IsFloatingPoint
->
-struct rescale_policy_type
-{
-    typedef no_rescale_policy type;
-};
-
-// We rescale only all FP types
-template
-<
-    typename Point
->
-struct rescale_policy_type<Point, true>
-{
-    typedef typename geometry::coordinate_type<Point>::type coordinate_type;
-    typedef model::point
-    <
-        typename detail::robust_type<coordinate_type>::type,
-        geometry::dimension<Point>::value,
-        typename geometry::coordinate_system<Point>::type
-    > robust_point_type;
-    typedef typename promote_floating_point<coordinate_type>::type factor_type;
-    typedef detail::robust_policy<Point, robust_point_type, factor_type> type;
-};
-
-template <typename Policy>
-struct get_rescale_policy
-{
-    template <typename Geometry, typename Strategy>
-    static inline Policy apply(Geometry const& geometry,
-                               Strategy const& strategy)
-    {
-        typedef typename point_type<Geometry>::type point_type;
-        typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
-        typedef typename promote_floating_point<coordinate_type>::type factor_type;
-        typedef model::point
-        <
-            typename detail::robust_type<coordinate_type>::type,
-            geometry::dimension<point_type>::value,
-            typename geometry::coordinate_system<point_type>::type
-        > robust_point_type;
-
-        point_type min_point;
-        robust_point_type min_robust_point;
-        factor_type factor;
-        init_rescale_policy(geometry, min_point, min_robust_point,
-                            factor, strategy);
-
-        return Policy(min_point, min_robust_point, factor);
-    }
-
-    template <typename Geometry1, typename Geometry2, typename Strategy1, typename Strategy2>
-    static inline Policy apply(Geometry1 const& geometry1, Geometry2 const& geometry2,
-                               Strategy1 const& strategy1,
-                               Strategy2 const& strategy2)
-    {
-        typedef typename point_type<Geometry1>::type point_type;
-        typedef typename geometry::coordinate_type<Geometry1>::type coordinate_type;
-        typedef typename promote_floating_point<coordinate_type>::type factor_type;
-        typedef model::point
-        <
-            typename detail::robust_type<coordinate_type>::type,
-            geometry::dimension<point_type>::value,
-            typename geometry::coordinate_system<point_type>::type
-        > robust_point_type;
-
-        point_type min_point;
-        robust_point_type min_robust_point;
-        factor_type factor;
-        init_rescale_policy(geometry1, geometry2, min_point, min_robust_point,
-                            factor, strategy1, strategy2);
-
-        return Policy(min_point, min_robust_point, factor);
-    }
-};
-
-// Specialization for no-rescaling
-template <>
-struct get_rescale_policy<no_rescale_policy>
-{
-    template <typename Geometry, typename EnvelopeStrategy>
-    static inline no_rescale_policy apply(Geometry const& , EnvelopeStrategy const&)
-    {
-        return no_rescale_policy();
-    }
-
-    template <typename Geometry1, typename Geometry2, typename EnvelopeStrategy1, typename EnvelopeStrategy2>
-    static inline no_rescale_policy apply(Geometry1 const& , Geometry2 const& ,
-                                          EnvelopeStrategy1 const& , EnvelopeStrategy2 const& )
-    {
-        return no_rescale_policy();
-    }
-};
-
-
-}} // namespace detail::get_rescale_policy
-#endif // DOXYGEN_NO_DETAIL
-
-template
-<
-    typename Point,
-    typename CSTag = typename geometry::cs_tag<Point>::type
->
-struct rescale_policy_type
-    : public detail::get_rescale_policy::rescale_policy_type
-    <
-        Point,
-#if defined(BOOST_GEOMETRY_USE_RESCALING)
-        std::is_floating_point
-            <
-                typename geometry::coordinate_type<Point>::type
-            >::type::value
-        &&
-        std::is_same
-            <
-                CSTag,
-                geometry::cartesian_tag
-            >::value
-#else
-        false
-#endif
-    >
-{
-    BOOST_GEOMETRY_STATIC_ASSERT(
-        (util::is_point<Point>::value),
-        "Point type expected.",
-        Point);
-};
-
-
-template
-<
-    typename Geometry1,
-    typename Geometry2,
-    typename CSTag = typename geometry::cs_tag<Geometry1>::type,
-    typename Tag1 = typename tag_cast
-    <
-        typename tag<Geometry1>::type,
-        box_tag,
-        pointlike_tag,
-        linear_tag,
-        areal_tag
-    >::type,
-    typename Tag2 = typename tag_cast
-    <
-        typename tag<Geometry2>::type,
-        box_tag,
-        pointlike_tag,
-        linear_tag,
-        areal_tag
-    >::type
->
-struct rescale_overlay_policy_type
-    // Default: no rescaling
-    : public detail::get_rescale_policy::rescale_policy_type
-        <
-            typename geometry::point_type<Geometry1>::type,
-            false
-        >
-{};
-
-// Areal/areal: get rescale policy based on coordinate type
-template
-<
-    typename Geometry1,
-    typename Geometry2,
-    typename CSTag
->
-struct rescale_overlay_policy_type<Geometry1, Geometry2, CSTag, areal_tag, areal_tag>
-    : public rescale_policy_type
-        <
-            typename geometry::point_type<Geometry1>::type,
-            CSTag
-        >
-{};
-
-
-template <typename Policy, typename Geometry>
-inline Policy get_rescale_policy(Geometry const& geometry)
-{
-    typename geometry::strategies::envelope::services::default_strategy
-        <
-            Geometry,
-            model::box<typename point_type<Geometry>::type>
-        >::type strategy;
-
-    return detail::get_rescale_policy::get_rescale_policy<Policy>::apply(geometry, strategy);
-}
-
-template
-<
-    typename Policy, typename Geometry, typename Strategy,
-    std::enable_if_t<std::is_void<typename geometry::tag<Strategy>::type>::value, int> = 0
->
-inline Policy get_rescale_policy(Geometry const& geometry, Strategy const& strategy)
-{
-    return detail::get_rescale_policy::get_rescale_policy
-        <
-            Policy
-        >::apply(geometry, strategy);
-}
-
-template
-<
-    typename Policy, typename Geometry1, typename Geometry2,
-    std::enable_if_t<! std::is_void<typename geometry::tag<Geometry2>::type>::value, int> = 0
->
-inline Policy get_rescale_policy(Geometry1 const& geometry1, Geometry2 const& geometry2)
-{
-    typename geometry::strategies::envelope::services::default_strategy
-        <
-            Geometry1,
-            model::box<typename point_type<Geometry1>::type>
-        >::type strategy1;
-    typename geometry::strategies::envelope::services::default_strategy
-        <
-            Geometry2,
-            model::box<typename point_type<Geometry2>::type>
-        >::type strategy2;
-
-    return detail::get_rescale_policy::get_rescale_policy
-        <
-            Policy
-        >::apply(geometry1, geometry2, strategy1, strategy2);
-}
-
-template <typename Policy, typename Geometry1, typename Geometry2, typename Strategy>
-inline Policy get_rescale_policy(Geometry1 const& geometry1, Geometry2 const& geometry2,
-                                 Strategy const& strategy)
-{
-    return detail::get_rescale_policy::get_rescale_policy
-            <
-                Policy
-            >::apply(geometry1, geometry2, strategy, strategy);
-}
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_GET_RESCALE_POLICY_HPP
diff --git a/inst/include/boost/geometry/policies/robustness/no_rescale_policy.hpp b/inst/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
deleted file mode 100644
index 211c45a1b..000000000
--- a/inst/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2013 Bruno Lalande, Paris, France.
-// Copyright (c) 2013 Mateusz Loskot, London, UK.
-// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_NO_RESCALE_POLICY_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_NO_RESCALE_POLICY_HPP
-
-#include <stddef.h>
-
-#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
-#include <boost/geometry/policies/robustness/segment_ratio.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-// Redudant later.
-struct no_rescale_policy
-{
-    static bool const enabled = false;
-
-    // We don't rescale but return the reference of the input
-    template <std::size_t Dimension, typename Value>
-    inline Value const& apply(Value const& value) const
-    {
-        return value;
-    }
-};
-
-} // namespace detail
-#endif
-
-
-// Implement meta-functions for this policy
-template <typename Point>
-struct robust_point_type<Point, detail::no_rescale_policy>
-{
-    // The point itself
-    typedef Point type;
-};
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_NO_RESCALE_POLICY_HPP
diff --git a/inst/include/boost/geometry/policies/robustness/rescale_policy.hpp b/inst/include/boost/geometry/policies/robustness/rescale_policy.hpp
deleted file mode 100644
index 7d6ad7e9f..000000000
--- a/inst/include/boost/geometry/policies/robustness/rescale_policy.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2014-2015 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2014-2015 Bruno Lalande, Paris, France.
-// Copyright (c) 2014-2015 Mateusz Loskot, London, UK.
-// Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2015, 2023.
-// Modifications copyright (c) 2015-2023, Oracle and/or its affiliates.
-
-// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_HPP
-
-#include <cstddef>
-
-#include <boost/geometry/core/access.hpp>
-#include <boost/geometry/core/coordinate_type.hpp>
-
-#include <boost/geometry/policies/robustness/segment_ratio.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
-
-#include <boost/geometry/util/math.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-template <typename FpPoint, typename IntPoint, typename CalculationType>
-struct robust_policy
-{
-    static bool const enabled = true;
-
-    typedef typename geometry::coordinate_type<IntPoint>::type output_ct;
-
-    robust_policy(FpPoint const& fp_min, IntPoint const& int_min, CalculationType const& the_factor)
-        : m_fp_min(fp_min)
-        , m_int_min(int_min)
-        , m_multiplier(the_factor)
-    {
-    }
-
-    template <std::size_t Dimension, typename Value>
-    inline output_ct apply(Value const& value) const
-    {
-        // a + (v-b)*f
-        CalculationType const a = static_cast<CalculationType>(get<Dimension>(m_int_min));
-        CalculationType const b = static_cast<CalculationType>(get<Dimension>(m_fp_min));
-        CalculationType const result = a + (value - b) * m_multiplier;
-
-        return geometry::math::rounding_cast<output_ct>(result);
-    }
-
-    FpPoint m_fp_min;
-    IntPoint m_int_min;
-    CalculationType m_multiplier;
-};
-
-} // namespace detail
-#endif
-
-
-// Implement meta-functions for this policy
-
-// Define the IntPoint as a robust-point type
-template <typename Point, typename FpPoint, typename IntPoint, typename CalculationType>
-struct robust_point_type<Point, detail::robust_policy<FpPoint, IntPoint, CalculationType> >
-{
-    typedef IntPoint type;
-};
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_HPP
diff --git a/inst/include/boost/geometry/policies/robustness/rescale_policy_tags.hpp b/inst/include/boost/geometry/policies/robustness/rescale_policy_tags.hpp
deleted file mode 100644
index 03f90760e..000000000
--- a/inst/include/boost/geometry/policies/robustness/rescale_policy_tags.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Boost.Geometry
-
-// Copyright (c) 2019-2019 Barend Gehrels, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_TYPE_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_TYPE_HPP
-
-#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-struct no_rescale_policy_tag {};
-struct rescale_policy_tag {};
-
-template <typename RobustPolicy>
-struct rescale_policy_type
-{
-    typedef rescale_policy_tag type;
-};
-
-// Specialization
-template <>
-struct rescale_policy_type<no_rescale_policy>
-{
-    typedef no_rescale_policy_tag type;
-};
-
-} // namespace detail
-#endif
-
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_TYPE_HPP
diff --git a/inst/include/boost/geometry/policies/robustness/robust_point_type.hpp b/inst/include/boost/geometry/policies/robustness/robust_point_type.hpp
deleted file mode 100644
index 25639227f..000000000
--- a/inst/include/boost/geometry/policies/robustness/robust_point_type.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2013 Bruno Lalande, Paris, France.
-// Copyright (c) 2013 Mateusz Loskot, London, UK.
-// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_POINT_TYPE_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_POINT_TYPE_HPP
-
-namespace boost { namespace geometry
-{
-
-// Meta-function to typedef a robust point type for a policy
-template <typename Point, typename Policy>
-struct robust_point_type
-{
-    // By default, the point itself is the robust type
-    typedef Point type;
-};
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_POINT_TYPE_HPP
diff --git a/inst/include/boost/geometry/policies/robustness/robust_type.hpp b/inst/include/boost/geometry/policies/robustness/robust_type.hpp
deleted file mode 100644
index c2a65ac50..000000000
--- a/inst/include/boost/geometry/policies/robustness/robust_type.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2014 Bruno Lalande, Paris, France.
-// Copyright (c) 2014 Mateusz Loskot, London, UK.
-// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2020.
-// Modifications copyright (c) 2020, Oracle and/or its affiliates.
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_TYPE_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_TYPE_HPP
-
-
-#include <type_traits>
-
-#include <boost/config.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-
-namespace detail_dispatch
-{
-
-template <typename CoordinateType, typename IsFloatingPoint>
-struct robust_type
-{
-};
-
-template <typename CoordinateType>
-struct robust_type<CoordinateType, std::false_type>
-{
-    typedef CoordinateType type;
-};
-
-template <typename CoordinateType>
-struct robust_type<CoordinateType, std::true_type>
-{
-    typedef boost::long_long_type type;
-};
-
-} // namespace detail_dispatch
-
-namespace detail
-{
-
-template <typename CoordinateType>
-struct robust_type
-{
-    typedef typename detail_dispatch::robust_type
-        <
-            CoordinateType,
-            typename std::is_floating_point<CoordinateType>::type
-        >::type type;
-};
-
-} // namespace detail
-#endif // DOXYGEN_NO_DETAIL
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_TYPE_HPP
diff --git a/inst/include/boost/geometry/policies/robustness/segment_ratio.hpp b/inst/include/boost/geometry/policies/robustness/segment_ratio.hpp
index 5a75fad01..47851a62c 100644
--- a/inst/include/boost/geometry/policies/robustness/segment_ratio.hpp
+++ b/inst/include/boost/geometry/policies/robustness/segment_ratio.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2016-2021.
-// Modifications copyright (c) 2016-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2024.
+// Modifications copyright (c) 2016-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -21,6 +22,8 @@
 #include <boost/geometry/core/assert.hpp>
 #include <boost/geometry/core/coordinate_promotion.hpp>
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
+
 
 namespace boost { namespace geometry
 {
@@ -227,8 +230,8 @@ class segment_ratio
         m_approximation =
             m_denominator == zero_instance() ? floating_point_type{0}
             : (
-                boost::numeric_cast<floating_point_type>(m_numerator) * scale()
-                / boost::numeric_cast<floating_point_type>(m_denominator)
+                util::numeric_cast<floating_point_type>(m_numerator) * scale()
+                / util::numeric_cast<floating_point_type>(m_denominator)
             );
     }
 
@@ -345,6 +348,11 @@ private :
     }
 };
 
+template <typename Point>
+struct segment_ratio_type
+{
+    using type = segment_ratio<typename geometry::coordinate_type<Point>::type>;
+};
 
 }} // namespace boost::geometry
 
diff --git a/inst/include/boost/geometry/policies/robustness/segment_ratio_type.hpp b/inst/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
deleted file mode 100644
index 8f4d0096c..000000000
--- a/inst/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2013 Bruno Lalande, Paris, France.
-// Copyright (c) 2013 Mateusz Loskot, London, UK.
-// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2020.
-// Modifications copyright (c) 2020 Oracle and/or its affiliates.
-// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_TYPE_HPP
-#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_TYPE_HPP
-
-#include <type_traits>
-
-#include <boost/config.hpp>
-
-#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
-
-namespace boost { namespace geometry { namespace detail
-{
-
-// Temporary meta-function to access segment-ratio for a policy
-template <typename Point, typename Policy>
-struct segment_ratio_type
-{
-    // Type in segment ratio is either the coordinate type, or for
-    // deprecated robust point types it is a long_long type
-    typedef std::conditional_t
-        <
-            std::is_same
-                <
-                    typename rescale_policy_type<Policy>::type,
-                    no_rescale_policy_tag
-                >::value,
-            typename geometry::coordinate_type<Point>::type,
-            boost::long_long_type
-        > coordinate_type;
-
-    // Define segment ratio based on the coordinate type
-    typedef geometry::segment_ratio<coordinate_type> type;
-};
-
-
-}}} // namespace boost::geometry::deatil
-
-
-#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_TYPE_HPP
diff --git a/inst/include/boost/geometry/srs/projections/impl/pj_transform.hpp b/inst/include/boost/geometry/srs/projections/impl/pj_transform.hpp
index b4f14c80b..9f16c0e6f 100644
--- a/inst/include/boost/geometry/srs/projections/impl/pj_transform.hpp
+++ b/inst/include/boost/geometry/srs/projections/impl/pj_transform.hpp
@@ -252,7 +252,7 @@ inline bool pj_transform(SrcPrj const& srcprj, Par const& srcdefn,
 /* -------------------------------------------------------------------- */
 /*      Transform Z to meters if it isn't already.                      */
 /* -------------------------------------------------------------------- */
-    if( BOOST_GEOMETRY_CONDITION(srcdefn.vto_meter != 1.0 && dimension > 2) )
+    if( srcdefn.vto_meter != 1.0 && BOOST_GEOMETRY_CONDITION(dimension > 2) )
     {
         for( std::size_t i = 0; i < point_count; i++ )
         {
@@ -589,7 +589,7 @@ inline bool pj_transform(SrcPrj const& srcprj, Par const& srcdefn,
 /* -------------------------------------------------------------------- */
 /*      Transform Z from meters if needed.                              */
 /* -------------------------------------------------------------------- */
-    if( dstdefn.vto_meter != 1.0 && dimension > 2 )
+    if( dstdefn.vto_meter != 1.0 && BOOST_GEOMETRY_CONDITION(dimension > 2) )
     {
         for( std::size_t i = 0; i < point_count; i++ )
         {
diff --git a/inst/include/boost/geometry/srs/projections/proj/ob_tran.hpp b/inst/include/boost/geometry/srs/projections/proj/ob_tran.hpp
index c3b5b70de..edcea4fb6 100644
--- a/inst/include/boost/geometry/srs/projections/proj/ob_tran.hpp
+++ b/inst/include/boost/geometry/srs/projections/proj/ob_tran.hpp
@@ -3,8 +3,9 @@
 // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2024.
+// Modifications copyright (c) 2017-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Visarion Fysikopoulos, on behalf of Oracle.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle.
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -199,8 +200,9 @@ namespace projections
                 }
 
                 std::shared_ptr<dynamic_wrapper_b<T, Parameters> > link;
-                T lamp;
-                T cphip, sphip;
+                T lamp = 0;
+                T cphip = 0;
+                T sphip = 0;
             };
 
             template <typename StaticParameters, typename T, typename Parameters>
@@ -244,8 +246,9 @@ namespace projections
                 }
 
                 projection_type link;
-                T lamp;
-                T cphip, sphip;
+                T lamp = 0;
+                T cphip = 0;
+                T sphip = 0;
             };
 
             template <typename T, typename Par>
diff --git a/inst/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp b/inst/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
index 619963482..0cfb0425c 100644
--- a/inst/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
+++ b/inst/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
@@ -85,7 +85,7 @@ inline bool point_in_box_by_side(Point const& point, Box const& box,
     // Create (counterclockwise) array of points, the fifth one closes it
     // Every point should be on the LEFT side (=1), or ON the border (=0),
     // So >= 1 or >= 0
-    std::array<typename point_type<Box>::type, 5> bp;
+    std::array<point_type_t<Box>, 5> bp;
     geometry::detail::assign_box_corners_oriented<true>(box, bp);
     bp[4] = bp[0];
 
diff --git a/inst/include/boost/geometry/strategies/agnostic/point_in_point.hpp b/inst/include/boost/geometry/strategies/agnostic/point_in_point.hpp
index 051b87f40..84cde06ab 100644
--- a/inst/include/boost/geometry/strategies/agnostic/point_in_point.hpp
+++ b/inst/include/boost/geometry/strategies/agnostic/point_in_point.hpp
@@ -29,7 +29,7 @@ namespace strategy { namespace within
 template
 <
     typename Point1, typename Point2,
-    typename CSTag = typename cs_tag<Point1>::type
+    typename CSTag = cs_tag_t<Point1>
 >
 struct point_in_point
     : strategy::within::cartesian_point_point
diff --git a/inst/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp b/inst/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp
index 02e72cf05..90321dac5 100644
--- a/inst/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp
+++ b/inst/include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp
@@ -65,10 +65,10 @@ class oriented_winding
         >::type calculation_type;
 
 
-    typedef typename strategy::side::services::default_strategy
+    using strategy_side_type = typename strategy::side::services::default_strategy
         <
-            typename cs_tag<Point>::type
-        >::type strategy_side_type;
+            cs_tag_t<Point>
+        >::type;
 
 
     /*! subclass to keep state */
diff --git a/inst/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp b/inst/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
index 07342ae10..b7400d852 100644
--- a/inst/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
+++ b/inst/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
@@ -45,11 +45,7 @@ template
     typename Point,
     typename PointOfSegment,
     typename CalculationType,
-    typename CSTag = typename tag_cast
-                        <
-                            typename cs_tag<Point>::type,
-                            spherical_tag
-                        >::type
+    typename CSTag = tag_cast_t<cs_tag_t<Point>, spherical_tag>
 >
 struct winding_base_type
 {
@@ -65,7 +61,7 @@ struct winding_base_type<Point, PointOfSegment, CalculationType, cartesian_tag>
         <
             typename strategy::side::services::default_strategy
                 <
-                    typename cs_tag<Point>::type
+                    cs_tag_t<Point>
                 >::type,
             CalculationType
         >;
@@ -76,10 +72,7 @@ struct winding_base_type<Point, PointOfSegment, CalculationType, spherical_tag>
 {
     using type = within::detail::spherical_winding_base
         <
-            typename strategy::side::services::default_strategy
-                <
-                    typename cs_tag<Point>::type
-                >::type,
+            typename strategy::side::services::default_strategy<cs_tag_t<Point>>::type,
             CalculationType
         >;
 };
diff --git a/inst/include/boost/geometry/strategies/area.hpp b/inst/include/boost/geometry/strategies/area.hpp
index 9e0cd01b4..b2c7a440a 100644
--- a/inst/include/boost/geometry/strategies/area.hpp
+++ b/inst/include/boost/geometry/strategies/area.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/area.hpp>
diff --git a/inst/include/boost/geometry/strategies/area_result.hpp b/inst/include/boost/geometry/strategies/area_result.hpp
index e15a116ae..7b6f915d2 100644
--- a/inst/include/boost/geometry/strategies/area_result.hpp
+++ b/inst/include/boost/geometry/strategies/area_result.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/algorithms/area_result.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/area.hpp b/inst/include/boost/geometry/strategies/cartesian/area.hpp
index a19738c0a..6dee57d6c 100644
--- a/inst/include/boost/geometry/strategies/cartesian/area.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/area.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/area.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/area_surveyor.hpp b/inst/include/boost/geometry/strategies/cartesian/area_surveyor.hpp
index 181d66f73..d10e945dc 100644
--- a/inst/include/boost/geometry/strategies/cartesian/area_surveyor.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/area_surveyor.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/area.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp b/inst/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
index 47ecb22e7..fd52eb259 100644
--- a/inst/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
@@ -165,7 +165,7 @@ public :
         return distance;
     }
 
-    //! Returns the piece_type (flat end)
+    //! Returns the piece_type (round end)
     static inline piece_type get_piece_type()
     {
         return buffered_round_end;
diff --git a/inst/include/boost/geometry/strategies/cartesian/centroid_average.hpp b/inst/include/boost/geometry/strategies/cartesian/centroid_average.hpp
index a382a2fbd..5b642a7f4 100644
--- a/inst/include/boost/geometry/strategies/cartesian/centroid_average.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/centroid_average.hpp
@@ -118,7 +118,7 @@ struct default_strategy
     typedef average
         <
             Point,
-            typename point_type<Geometry>::type
+            point_type_t<Geometry>
         > type;
 };
 
diff --git a/inst/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp b/inst/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
index d4713da92..8e4c014a4 100644
--- a/inst/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
@@ -22,13 +22,13 @@
 #include <cstddef>
 
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/arithmetic/determinant.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/strategies/centroid.hpp>
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
 
@@ -48,8 +48,6 @@ namespace strategy { namespace centroid
 \ingroup strategies
 \details Calculates centroid using triangulation method published by
     Bashein / Detmer
-\tparam Point point type of centroid to calculate
-\tparam PointOfSegment point type of segments, defaults to Point
 \tparam CalculationType \tparam_calculation
 
 \author Adapted from  "Centroid of a Polygon" by
@@ -190,10 +188,10 @@ public :
         typedef typename calculation_type<GeometryPoint, ResultPoint>::type calc_type;
 
         // Get coordinates and promote them to calculation_type
-        calc_type const x1 = boost::numeric_cast<calc_type>(get<0>(p1));
-        calc_type const y1 = boost::numeric_cast<calc_type>(get<1>(p1));
-        calc_type const x2 = boost::numeric_cast<calc_type>(get<0>(p2));
-        calc_type const y2 = boost::numeric_cast<calc_type>(get<1>(p2));
+        calc_type const x1 = util::numeric_cast<calc_type>(get<0>(p1));
+        calc_type const y1 = util::numeric_cast<calc_type>(get<1>(p1));
+        calc_type const x2 = util::numeric_cast<calc_type>(get<0>(p2));
+        calc_type const y2 = util::numeric_cast<calc_type>(get<1>(p2));
         calc_type const ai = geometry::detail::determinant<calc_type>(p1, p2);
         state.count++;
         state.sum_a2 += ai;
@@ -225,9 +223,9 @@ public :
                 // which means that the centroid can still be filled with INF
                 // if e.g. calculation_type is double and centroid contains floats
                 set<0>(centroid,
-                    boost::numeric_cast<coordinate_type>(state.sum_x / a3));
+                    util::numeric_cast<coordinate_type>(state.sum_x / a3));
                 set<1>(centroid,
-                    boost::numeric_cast<coordinate_type>(state.sum_y / a3));
+                    util::numeric_cast<coordinate_type>(state.sum_y / a3));
                 return true;
             }
         }
@@ -249,7 +247,7 @@ struct default_strategy<cartesian_tag, areal_tag, 2, Point, Geometry>
     typedef bashein_detmer
         <
             Point,
-            typename point_type<Geometry>::type
+            point_type_t<Geometry>
         > type;
 };
 
diff --git a/inst/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp b/inst/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
index 477d68b89..6e8595881 100644
--- a/inst/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
@@ -19,7 +19,6 @@
 #define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP
 
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 
@@ -32,6 +31,7 @@
 #include <boost/geometry/strategies/centroid.hpp>
 
 #include <boost/geometry/util/algorithm.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
 
@@ -132,7 +132,7 @@ public :
                 typedef typename geometry::coordinate_type<ResultPoint>::type coordinate_type;
                 geometry::set<dimension>(
                     centroid,
-                    boost::numeric_cast<coordinate_type>(
+                    util::numeric_cast<coordinate_type>(
                         geometry::get<dimension>(state.average_sum) / state.length
                     )
                 );
@@ -165,7 +165,7 @@ struct default_strategy
     typedef weighted_length
         <
             Point,
-            typename point_type<Geometry>::type
+            point_type_t<Geometry>
         > type;
 };
 
diff --git a/inst/include/boost/geometry/strategies/cartesian/densify.hpp b/inst/include/boost/geometry/strategies/cartesian/densify.hpp
index a6bc0a793..4d18e1f0c 100644
--- a/inst/include/boost/geometry/strategies/cartesian/densify.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/densify.hpp
@@ -22,6 +22,7 @@
 #include <boost/geometry/strategies/densify.hpp>
 #include <boost/geometry/util/algorithm.hpp>
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
 
@@ -68,8 +69,8 @@ class cartesian
         // dir01 = p1 - p0
         geometry::detail::for_each_dimension<calc_point_t>([&](auto index)
         {
-            calc_t const coord0 = boost::numeric_cast<calc_t>(get<index>(p0));
-            calc_t const coord1 = boost::numeric_cast<calc_t>(get<index>(p1));
+            calc_t const coord0 = util::numeric_cast<calc_t>(get<index>(p0));
+            calc_t const coord1 = util::numeric_cast<calc_t>(get<index>(p1));
             set<index>(cp0, coord0);
             set<index>(dir01, coord1 - coord0);
         });
@@ -96,7 +97,7 @@ class cartesian
                 // out = p0 + d * dir01
                 calc_t const coord = get<index>(cp0) + get<index>(dir01) * num / den;
 
-                set<index>(out, boost::numeric_cast<out_coord_t>(coord));
+                set<index>(out, util::numeric_cast<out_coord_t>(coord));
             });
 
             policy.apply(out);
diff --git a/inst/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp b/inst/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
index d903f2100..39ebe395c 100644
--- a/inst/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
@@ -23,11 +23,6 @@
 #include <cstddef>
 #include <utility>
 
-#include <boost/numeric/conversion/cast.hpp>
-
-#include <boost/geometry/util/math.hpp>
-#include <boost/geometry/util/calculation_type.hpp>
-
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
@@ -38,6 +33,9 @@
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp>
 #include <boost/geometry/strategies/disjoint.hpp>
 
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
+#include <boost/geometry/util/calculation_type.hpp>
 
 namespace boost { namespace geometry { namespace strategy { namespace disjoint
 {
@@ -62,22 +60,22 @@ struct compute_tmin_tmax_per_dim
                 SegmentPoint
             >::type point_coordinate_type;
 
-        RelativeDistance c_p0 = boost::numeric_cast
+        RelativeDistance c_p0 = util::numeric_cast
             <
                 point_coordinate_type
             >( geometry::get<I>(p0) );
 
-        RelativeDistance c_p1 = boost::numeric_cast
+        RelativeDistance c_p1 = util::numeric_cast
             <
                 point_coordinate_type
             >( geometry::get<I>(p1) );
 
-        RelativeDistance c_b_min = boost::numeric_cast
+        RelativeDistance c_b_min = util::numeric_cast
             <
                 box_coordinate_type
             >( geometry::get<geometry::min_corner, I>(box) );
 
-        RelativeDistance c_b_max = boost::numeric_cast
+        RelativeDistance c_b_max = util::numeric_cast
             <
                 box_coordinate_type
             >( geometry::get<geometry::max_corner, I>(box) );
@@ -259,12 +257,12 @@ struct segment_box
     {
         assert_dimension_equal<Segment, Box>();
 
-        typedef typename util::calculation_type::geometric::binary
+        using relative_distance_type = typename util::calculation_type::geometric::binary
             <
                 Segment, Box, void
-            >::type relative_distance_type;
+            >::type;
 
-        typedef typename point_type<Segment>::type segment_point_type;
+        using segment_point_type = point_type_t<Segment>;
         segment_point_type p0, p1;
         geometry::detail::assign_point_from_index<0>(segment, p0);
         geometry::detail::assign_point_from_index<1>(segment, p1);
diff --git a/inst/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp b/inst/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
index d6ad0e0d6..0128669f1 100644
--- a/inst/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
@@ -20,6 +20,8 @@
 #ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PROJECTED_POINT_AX_HPP
 #define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PROJECTED_POINT_AX_HPP
 
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.88")
 
 #include <algorithm>
 
@@ -311,5 +313,4 @@ public :
 
 }} // namespace boost::geometry
 
-
 #endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PROJECTED_POINT_AX_HPP
diff --git a/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp b/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
index 8d8b95436..c7e77bb1d 100644
--- a/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
@@ -26,8 +26,9 @@
 
 #include <boost/geometry/strategies/distance.hpp>
 
-#include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/calculation_type.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -46,8 +47,8 @@ struct compute_pythagoras
     template <typename Point1, typename Point2>
     static inline T apply(Point1 const& p1, Point2 const& p2)
     {
-        T const c1 = boost::numeric_cast<T>(get<I-1>(p1));
-        T const c2 = boost::numeric_cast<T>(get<I-1>(p2));
+        T const c1 = util::numeric_cast<T>(get<I-1>(p1));
+        T const c2 = util::numeric_cast<T>(get<I-1>(p2));
         T const d = c1 - c2;
         return d * d + compute_pythagoras<I-1, T>::apply(p1, p2);
     }
@@ -59,7 +60,7 @@ struct compute_pythagoras<0, T>
     template <typename Point1, typename Point2>
     static inline T apply(Point1 const&, Point2 const&)
     {
-        return boost::numeric_cast<T>(0);
+        return util::numeric_cast<T>(0);
     }
 };
 
@@ -163,7 +164,7 @@ public :
         // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
         return math::sqrt
             (
-                 boost::numeric_cast<typename calculation_type<P1, P2>::type>
+                 util::numeric_cast<typename calculation_type<P1, P2>::type>
                     (
                         comparable::pythagoras<CalculationType>::apply(p1, p2)
                     )
diff --git a/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp b/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
index 96a4ef027..ea8f8d6b0 100644
--- a/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
@@ -28,9 +28,9 @@
 
 #include <boost/geometry/strategies/distance.hpp>
 
-#include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/calculation_type.hpp>
-
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -50,14 +50,14 @@ struct compute_pythagoras_box_box
     static inline void apply(Box1 const& box1, Box2 const& box2, T& result)
     {
         T const b1_min_coord =
-            boost::numeric_cast<T>(geometry::get<min_corner, I-1>(box1));
+            util::numeric_cast<T>(geometry::get<min_corner, I-1>(box1));
         T const b1_max_coord =
-            boost::numeric_cast<T>(geometry::get<max_corner, I-1>(box1));
+            util::numeric_cast<T>(geometry::get<max_corner, I-1>(box1));
 
         T const b2_min_coord =
-            boost::numeric_cast<T>(geometry::get<min_corner, I-1>(box2));
+            util::numeric_cast<T>(geometry::get<min_corner, I-1>(box2));
         T const b2_max_coord =
-            boost::numeric_cast<T>(geometry::get<max_corner, I-1>(box2));
+            util::numeric_cast<T>(geometry::get<max_corner, I-1>(box2));
 
         if ( b1_max_coord < b2_min_coord )
         {
@@ -118,9 +118,9 @@ public :
     apply(Box1 const& box1, Box2 const& box2)
     {
         BOOST_CONCEPT_ASSERT
-            ( (concepts::ConstPoint<typename point_type<Box1>::type>) );
+            ( (concepts::ConstPoint<point_type_t<Box1>>) );
         BOOST_CONCEPT_ASSERT
-            ( (concepts::ConstPoint<typename point_type<Box2>::type>) );
+            ( (concepts::ConstPoint<point_type_t<Box2>>) );
 
         // Calculate distance using Pythagoras
         // (Leave comment above for Doxygen)
@@ -187,7 +187,7 @@ public :
         // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
         return math::sqrt
             (
-                 boost::numeric_cast<typename calculation_type
+                 util::numeric_cast<typename calculation_type
                      <
                          Box1, Box2
                      >::type>
diff --git a/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp b/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
index 719569d55..9d1b0949f 100644
--- a/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
@@ -28,9 +28,9 @@
 
 #include <boost/geometry/strategies/distance.hpp>
 
-#include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/calculation_type.hpp>
-
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 
 namespace boost { namespace geometry
@@ -49,11 +49,11 @@ struct compute_pythagoras_point_box
     template <typename Point, typename Box, typename T>
     static inline void apply(Point const& point, Box const& box, T& result)
     {
-        T const p_coord = boost::numeric_cast<T>(geometry::get<I-1>(point));
+        T const p_coord = util::numeric_cast<T>(geometry::get<I-1>(point));
         T const b_min_coord =
-            boost::numeric_cast<T>(geometry::get<min_corner, I-1>(box));
+            util::numeric_cast<T>(geometry::get<min_corner, I-1>(box));
         T const b_max_coord =
-            boost::numeric_cast<T>(geometry::get<max_corner, I-1>(box));
+            util::numeric_cast<T>(geometry::get<max_corner, I-1>(box));
 
         if ( p_coord < b_min_coord )
         {
@@ -115,7 +115,7 @@ public :
     {
         BOOST_CONCEPT_ASSERT( (concepts::ConstPoint<Point>) );
         BOOST_CONCEPT_ASSERT
-            ( (concepts::ConstPoint<typename point_type<Box>::type>) );
+            ( (concepts::ConstPoint<point_type_t<Box>>) );
 
         // Calculate distance using Pythagoras
         // (Leave comment above for Doxygen)
@@ -182,7 +182,7 @@ public :
         // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
         return math::sqrt
             (
-                 boost::numeric_cast<typename calculation_type
+                 util::numeric_cast<typename calculation_type
                      <
                          Point, Box
                      >::type>
diff --git a/inst/include/boost/geometry/strategies/cartesian/envelope.hpp b/inst/include/boost/geometry/strategies/cartesian/envelope.hpp
index 0e07e8425..0b3cad7a6 100644
--- a/inst/include/boost/geometry/strategies/cartesian/envelope.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/envelope.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/envelope.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/envelope_box.hpp b/inst/include/boost/geometry/strategies/cartesian/envelope_box.hpp
index de7d186f6..daf96f59f 100644
--- a/inst/include/boost/geometry/strategies/cartesian/envelope_box.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/envelope_box.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/envelope_box.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/envelope_multipoint.hpp b/inst/include/boost/geometry/strategies/cartesian/envelope_multipoint.hpp
index 835bb56c5..2722a4132 100644
--- a/inst/include/boost/geometry/strategies/cartesian/envelope_multipoint.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/envelope_multipoint.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/envelope_multipoint.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/envelope_point.hpp b/inst/include/boost/geometry/strategies/cartesian/envelope_point.hpp
index 1abd00282..26b157786 100644
--- a/inst/include/boost/geometry/strategies/cartesian/envelope_point.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/envelope_point.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/envelope_point.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/envelope_segment.hpp b/inst/include/boost/geometry/strategies/cartesian/envelope_segment.hpp
index b2951a5fa..0d709f7f9 100644
--- a/inst/include/boost/geometry/strategies/cartesian/envelope_segment.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/envelope_segment.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/envelope_segment.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/expand_box.hpp b/inst/include/boost/geometry/strategies/cartesian/expand_box.hpp
index 2e9cf2df9..14218f777 100644
--- a/inst/include/boost/geometry/strategies/cartesian/expand_box.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/expand_box.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/expand_box.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/expand_point.hpp b/inst/include/boost/geometry/strategies/cartesian/expand_point.hpp
index 1f067d27b..dc46cf058 100644
--- a/inst/include/boost/geometry/strategies/cartesian/expand_point.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/expand_point.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/expand_point.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/expand_segment.hpp b/inst/include/boost/geometry/strategies/cartesian/expand_segment.hpp
index b65877976..427d3a21e 100644
--- a/inst/include/boost/geometry/strategies/cartesian/expand_segment.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/expand_segment.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/expand_segment.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/intersection.hpp b/inst/include/boost/geometry/strategies/cartesian/intersection.hpp
index 94d33401c..d6fc5c9bb 100644
--- a/inst/include/boost/geometry/strategies/cartesian/intersection.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/intersection.hpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2013-2023 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014-2021.
-// Modifications copyright (c) 2014-2021, Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2014-2024.
+// Modifications copyright (c) 2014-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -28,9 +28,9 @@
 #include <boost/geometry/algorithms/detail/assign_values.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/equals/point_point.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/promote_integral.hpp>
 #include <boost/geometry/util/select_calculation_type.hpp>
 
@@ -51,15 +51,6 @@
 #include <boost/geometry/strategies/side_info.hpp>
 #include <boost/geometry/strategies/within.hpp>
 
-#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
-
-
-#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
-#  include <boost/geometry/io/wkt/write.hpp>
-#endif
-
-
 namespace boost { namespace geometry
 {
 
@@ -156,12 +147,12 @@ struct cartesian_segments
         template <typename Point, typename Segment1, typename Segment2>
         void assign_a(Point& point, Segment1 const& a, Segment2 const& ) const
         {
-            assign(point, a, dx_a, dy_a, robust_ra);
+            assign(point, a, dx_a, dy_a, ra);
         }
         template <typename Point, typename Segment1, typename Segment2>
         void assign_b(Point& point, Segment1 const& , Segment2 const& b) const
         {
-            assign(point, b, dx_b, dy_b, robust_rb);
+            assign(point, b, dx_b, dy_b, rb);
         }
 
         template <typename Point, typename Segment>
@@ -177,17 +168,17 @@ struct cartesian_segments
             typedef typename promote_integral<CoordinateType>::type calc_type;
 
             calc_type const numerator
-                = boost::numeric_cast<calc_type>(ratio.numerator());
+                = util::numeric_cast<calc_type>(ratio.numerator());
             calc_type const denominator
-                = boost::numeric_cast<calc_type>(ratio.denominator());
-            calc_type const dx_calc = boost::numeric_cast<calc_type>(dx);
-            calc_type const dy_calc = boost::numeric_cast<calc_type>(dy);
+                = util::numeric_cast<calc_type>(ratio.denominator());
+            calc_type const dx_calc = util::numeric_cast<calc_type>(dx);
+            calc_type const dy_calc = util::numeric_cast<calc_type>(dy);
 
             set<0>(point, get<0, 0>(segment)
-                   + boost::numeric_cast<CoordinateType>(
+                   + util::numeric_cast<CoordinateType>(
                          math::divide<calc_type>(numerator * dx_calc, denominator)));
             set<1>(point, get<0, 1>(segment)
-                   + boost::numeric_cast<CoordinateType>(
+                   + util::numeric_cast<CoordinateType>(
                          math::divide<calc_type>(numerator * dy_calc, denominator)));
         }
 
@@ -238,7 +229,7 @@ struct cartesian_segments
                      <
                          std::is_arithmetic<CoordinateType>::value
                      >::apply(comparable_length_a(), comparable_length_b(),
-                         robust_ra.edge_value(), robust_rb.edge_value());
+                         ra.edge_value(), rb.edge_value());
 
             if (use_a)
             {
@@ -248,13 +239,10 @@ struct cartesian_segments
             {
                 assign_b(point, a, b);
             }
-
-#ifndef BOOST_GEOMETRY_USE_RESCALING
             // Verify nearly collinear cases (the threshold is arbitrary
             // but influences performance). If the intersection is located
             // outside the segments, then it should be moved.
-            if (robust_ra.possibly_collinear(1.0e-3)
-                && robust_rb.possibly_collinear(1.0e-3))
+            if (ra.possibly_collinear(1.0e-3) && rb.possibly_collinear(1.0e-3))
             {
                 // The segments are nearly collinear and because of the calculation
                 // method with very small denominator, the IP appears outside the
@@ -264,13 +252,12 @@ struct cartesian_segments
                 assign_if_exceeds(point, a);
                 assign_if_exceeds(point, b);
             }
-#endif
         }
 
         CoordinateType dx_a, dy_a;
         CoordinateType dx_b, dy_b;
-        SegmentRatio robust_ra;
-        SegmentRatio robust_rb;
+        SegmentRatio ra;
+        SegmentRatio rb;
     };
 
     template <typename D, typename W, typename ResultType>
@@ -287,38 +274,15 @@ struct cartesian_segments
         // IntersectionPoint = (x1 + r * dx_a, y1 + r * dy_a)
     }
 
-    // Version for non-rescaled policies
     template
     <
         typename UniqueSubRange1,
         typename UniqueSubRange2,
         typename Policy
     >
-    static inline typename Policy::return_type
-        apply(UniqueSubRange1 const& range_p,
-              UniqueSubRange2 const& range_q,
-              Policy const& policy)
-    {
-        // Pass the same ranges both as normal ranges and as modelled ranges
-        return apply(range_p, range_q, policy, range_p, range_q);
-    }
-
-    // Version for non rescaled versions.
-    // The "modelled" parameter might be rescaled (will be removed later)
-    template
-    <
-        typename UniqueSubRange1,
-        typename UniqueSubRange2,
-        typename Policy,
-        typename ModelledUniqueSubRange1,
-        typename ModelledUniqueSubRange2
-    >
-    static inline typename Policy::return_type
-        apply(UniqueSubRange1 const& range_p,
-              UniqueSubRange2 const& range_q,
-              Policy const& policy,
-              ModelledUniqueSubRange1 const& modelled_range_p,
-              ModelledUniqueSubRange2 const& modelled_range_q)
+    static inline typename Policy::return_type apply(UniqueSubRange1 const& range_p,
+                                                     UniqueSubRange2 const& range_q,
+                                                     Policy const& policy)
     {
         typedef typename UniqueSubRange1::point_type point1_type;
         typedef typename UniqueSubRange2::point_type point2_type;
@@ -331,18 +295,13 @@ struct cartesian_segments
         point2_type const& q1 = range_q.at(0);
         point2_type const& q2 = range_q.at(1);
 
-        // Declare segments, currently necessary for the policies
-        // (segment_crosses, segment_colinear, degenerate, one_degenerate, etc)
-        model::referring_segment<point1_type const> const p(p1, p2);
-        model::referring_segment<point2_type const> const q(q1, q2);
-
         typedef typename select_most_precise
             <
-                typename geometry::coordinate_type<typename ModelledUniqueSubRange1::point_type>::type,
-                typename geometry::coordinate_type<typename ModelledUniqueSubRange1::point_type>::type
-            >::type modelled_coordinate_type;
+                typename geometry::coordinate_type<point1_type>::type,
+                typename geometry::coordinate_type<point2_type>::type
+            >::type coordinate_type;
 
-        typedef segment_ratio<modelled_coordinate_type> ratio_type;
+        typedef segment_ratio<coordinate_type> ratio_type;
         segment_intersection_info
             <
                 typename select_calculation_type<point1_type, point2_type, CalculationType>::type,
@@ -354,7 +313,7 @@ struct cartesian_segments
         sinfo.dy_a = get<1>(p2) - get<1>(p1); // distance in y-dir
         sinfo.dy_b = get<1>(q2) - get<1>(q1);
 
-        return unified<ratio_type>(sinfo, p, q, policy, modelled_range_p, modelled_range_q);
+        return unified<ratio_type>(sinfo, range_p, range_q, policy);
     }
 
     //! Returns true if two segments do not overlap.
@@ -388,30 +347,22 @@ struct cartesian_segments
         return math::smaller(maxp, minq) || math::smaller(maxq, minp);
     }
 
-    // Implementation for either rescaled or non rescaled versions.
     template
     <
         typename RatioType,
         typename SegmentInfo,
-        typename Segment1,
-        typename Segment2,
-        typename Policy,
         typename UniqueSubRange1,
-        typename UniqueSubRange2
+        typename UniqueSubRange2,
+        typename Policy
     >
     static inline typename Policy::return_type
         unified(SegmentInfo& sinfo,
-                Segment1 const& p, Segment2 const& q, Policy const&,
                 UniqueSubRange1 const& range_p,
-                UniqueSubRange2 const& range_q)
+                UniqueSubRange2 const& range_q,
+                Policy const&)
     {
         typedef typename UniqueSubRange1::point_type point1_type;
         typedef typename UniqueSubRange2::point_type point2_type;
-        typedef typename select_most_precise
-            <
-                typename geometry::coordinate_type<point1_type>::type,
-                typename geometry::coordinate_type<point2_type>::type
-            >::type coordinate_type;
 
         point1_type const& p1 = range_p.at(0);
         point1_type const& p2 = range_p.at(1);
@@ -421,6 +372,11 @@ struct cartesian_segments
         bool const p_is_point = equals_point_point(p1, p2);
         bool const q_is_point = equals_point_point(q1, q2);
 
+        // Declare segments, currently necessary for the policies
+        // (segment_crosses, segment_colinear, degenerate, one_degenerate, etc)
+        model::referring_segment<point1_type const> const p(p1, p2);
+        model::referring_segment<point2_type const> const q(q1, q2);
+
         if (p_is_point && q_is_point)
         {
             return equals_point_point(p1, q2)
@@ -459,38 +415,38 @@ struct cartesian_segments
 
         bool collinear = sides.collinear();
 
-        // Calculate the differences again
-        // (for rescaled version, this is different from dx_p etc)
-        coordinate_type const dx_p = get<0>(p2) - get<0>(p1);
-        coordinate_type const dx_q = get<0>(q2) - get<0>(q1);
-        coordinate_type const dy_p = get<1>(p2) - get<1>(p1);
-        coordinate_type const dy_q = get<1>(q2) - get<1>(q1);
-
         // r: ratio 0-1 where intersection divides A/B
         // (only calculated for non-collinear segments)
         if (! collinear)
         {
-            coordinate_type denominator_a, nominator_a;
-            coordinate_type denominator_b, nominator_b;
-
-            cramers_rule(dx_p, dy_p, dx_q, dy_q,
+            typedef typename select_most_precise
+                <
+                    typename geometry::coordinate_type<point1_type>::type,
+                    typename geometry::coordinate_type<point2_type>::type
+                >::type coordinate_type;
+
+            coordinate_type denominator_a;
+            coordinate_type nominator_a;
+            coordinate_type denominator_b;
+            coordinate_type nominator_b;
+
+            cramers_rule(sinfo.dx_a, sinfo.dy_a, sinfo.dx_b, sinfo.dy_b,
                 get<0>(p1) - get<0>(q1),
                 get<1>(p1) - get<1>(q1),
                 nominator_a, denominator_a);
 
-            cramers_rule(dx_q, dy_q, dx_p, dy_p,
+            cramers_rule(sinfo.dx_b, sinfo.dy_b, sinfo.dx_a, sinfo.dy_a,
                 get<0>(q1) - get<0>(p1),
                 get<1>(q1) - get<1>(p1),
                 nominator_b, denominator_b);
 
             math::detail::equals_factor_policy<coordinate_type>
-                policy(dx_p, dy_p, dx_q, dy_q);
+                policy(sinfo.dx_a, sinfo.dy_a, sinfo.dx_b, sinfo.dy_b);
 
             coordinate_type const zero = 0;
             if (math::detail::equals_by_policy(denominator_a, zero, policy)
              || math::detail::equals_by_policy(denominator_b, zero, policy))
             {
-                // If this is the case, no rescaling is done for FP precision.
                 // We set it to collinear, but it indicates a robustness issue.
                 sides.set<0>(0, 0);
                 sides.set<1>(0, 0);
@@ -498,18 +454,18 @@ struct cartesian_segments
             }
             else
             {
-                sinfo.robust_ra.assign(nominator_a, denominator_a);
-                sinfo.robust_rb.assign(nominator_b, denominator_b);
+                sinfo.ra.assign(nominator_a, denominator_a);
+                sinfo.rb.assign(nominator_b, denominator_b);
             }
         }
 
         if (collinear)
         {
             std::pair<bool, bool> const collinear_use_first
-                    = is_x_more_significant(geometry::math::abs(dx_p),
-                                            geometry::math::abs(dy_p),
-                                            geometry::math::abs(dx_q),
-                                            geometry::math::abs(dy_q),
+                    = is_x_more_significant(geometry::math::abs(sinfo.dx_a),
+                                            geometry::math::abs(sinfo.dy_a),
+                                            geometry::math::abs(sinfo.dx_b),
+                                            geometry::math::abs(sinfo.dy_b),
                                             p_is_point, q_is_point);
 
             if (collinear_use_first.second)
@@ -533,6 +489,16 @@ struct cartesian_segments
             }
         }
 
+        if (equals_point_point(p1, q1) || equals_point_point(p1, q2))
+        {
+            return Policy::segments_share_common_point(sides, sinfo, p1);
+        }
+
+        if (equals_point_point(p2, q1) || equals_point_point(p2, q2))
+        {
+            return Policy::segments_share_common_point(sides, sinfo, p2);
+        }
+
         return Policy::segments_crosses(sides, sinfo, p, q);
     }
 
@@ -578,35 +544,35 @@ struct cartesian_segments
         typename RatioType,
         typename Segment1,
         typename Segment2,
-        typename RobustPoint1,
-        typename RobustPoint2
+        typename Point1,
+        typename Point2
     >
     static inline typename Policy::return_type
         relate_collinear(Segment1 const& a,
                          Segment2 const& b,
-                         RobustPoint1 const& robust_a1, RobustPoint1 const& robust_a2,
-                         RobustPoint2 const& robust_b1, RobustPoint2 const& robust_b2,
+                         Point1 const& a1, Point1 const& a2,
+                         Point2 const& b1, Point2 const& b2,
                          bool a_is_point, bool b_is_point)
     {
         if (a_is_point)
         {
             return relate_one_degenerate<Policy, RatioType>(a,
-                get<Dimension>(robust_a1),
-                get<Dimension>(robust_b1), get<Dimension>(robust_b2),
+                get<Dimension>(a1),
+                get<Dimension>(b1), get<Dimension>(b2),
                 true);
         }
         if (b_is_point)
         {
             return relate_one_degenerate<Policy, RatioType>(b,
-                get<Dimension>(robust_b1),
-                get<Dimension>(robust_a1), get<Dimension>(robust_a2),
+                get<Dimension>(b1),
+                get<Dimension>(a1), get<Dimension>(a2),
                 false);
         }
         return relate_collinear<Policy, RatioType>(a, b,
-                                get<Dimension>(robust_a1),
-                                get<Dimension>(robust_a2),
-                                get<Dimension>(robust_b1),
-                                get<Dimension>(robust_b2));
+                                get<Dimension>(a1),
+                                get<Dimension>(a2),
+                                get<Dimension>(b1),
+                                get<Dimension>(b2));
     }
 
     /// Relate segments known collinear
diff --git a/inst/include/boost/geometry/strategies/cartesian/line_interpolate.hpp b/inst/include/boost/geometry/strategies/cartesian/line_interpolate.hpp
index bc55da8fa..a63cb8548 100644
--- a/inst/include/boost/geometry/strategies/cartesian/line_interpolate.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/line_interpolate.hpp
@@ -17,6 +17,7 @@
 #include <boost/geometry/strategies/line_interpolate.hpp>
 #include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
 #include <boost/geometry/util/algorithm.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_calculation_type.hpp>
 
 
@@ -67,10 +68,10 @@ class cartesian
             // NOTE: numeric_cast is a leftover from convert, it could probably be ommited.
             // NOTE: the order of points is different than in the formula above
             //       this is also a leftover from the previous implementation
-            calc_t coord0 = boost::numeric_cast<calc_t>(get<dimension>(p0));
-            calc_t coord1 = boost::numeric_cast<calc_t>(get<dimension>(p1));
+            calc_t coord0 = util::numeric_cast<calc_t>(get<dimension>(p0));
+            calc_t coord1 = util::numeric_cast<calc_t>(get<dimension>(p1));
             calc_t result = calc_t(coord1 * fraction) + calc_t(coord0 * one_minus_fraction);
-            set<dimension>(p, boost::numeric_cast<coord_t>(result));
+            set<dimension>(p, util::numeric_cast<coord_t>(result));
         });
     }
 };
diff --git a/inst/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp b/inst/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
index e8864df29..dda6dc0ad 100644
--- a/inst/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
@@ -34,8 +34,6 @@ namespace strategy { namespace within
 /*!
 \brief Within detection using cross counting,
 \ingroup strategies
-\tparam Point \tparam_point
-\tparam PointOfSegment \tparam_segment_point
 \tparam CalculationType \tparam_calculation
 \see http://tog.acm.org/resources/GraphicsGems/gemsiv/ptpoly_haines/ptinpoly.c
 \note Does NOT work correctly for point ON border
diff --git a/inst/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp b/inst/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
index 2afa7f130..3ca8d241d 100644
--- a/inst/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
@@ -34,8 +34,6 @@ namespace strategy { namespace within
 /*!
 \brief Within detection using cross counting
 \ingroup strategies
-\tparam Point \tparam_point
-\tparam PointOfSegment \tparam_segment_point
 \tparam CalculationType \tparam_calculation
 \author adapted from Randolph Franklin algorithm
 \author Barend and Maarten, 1995
diff --git a/inst/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp b/inst/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
index 848570fd9..423a194a0 100644
--- a/inst/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/cartesian/side_by_triangle.hpp>
diff --git a/inst/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp b/inst/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp
index fcbc03bca..ea06756d9 100644
--- a/inst/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp
+++ b/inst/include/boost/geometry/strategies/cartesian/turn_in_ring_winding.hpp
@@ -77,9 +77,6 @@ class turn_in_ring_winding
         int count_on_edge{0};
 
         CalculationType edge_min_fraction{(std::numeric_limits<CalculationType>::max)()};
-#if defined(BOOST_GEOMETRY_USE_RESCALING)
-        CalculationType inside_min_measure{(std::numeric_limits<CalculationType>::max)()};
-#endif
 
         inline bool is_inside() const
         {
@@ -91,9 +88,6 @@ class turn_in_ring_winding
             return count_on_origin == 0
                 && (count_on_offsetted > 0
                 || (count_on_edge > 0 && edge_min_fraction < 1.0e-3)
-#if defined(BOOST_GEOMETRY_USE_RESCALING)
-                || (count < 0 && inside_min_measure < 1.0e-5)
-#endif
                 );
         }
 
@@ -186,15 +180,6 @@ class turn_in_ring_winding
             {
                 apply_on_boundary(point, s1, s2, place_on_ring, the_state);
             }
-#if defined(BOOST_GEOMETRY_USE_RESCALING)
-            else if (side == -1)
-            {
-                auto const line = detail::make::make_infinite_line<CalculationType>(s1, s2);
-                auto const value = -arithmetic::side_value(line, point);
-                if (value > 0 && value < the_state.inside_min_measure) { the_state.inside_min_measure = value; }
-
-            }
-#endif
         }
 
         if (in_horizontal_range)
diff --git a/inst/include/boost/geometry/strategies/comparable_distance_result.hpp b/inst/include/boost/geometry/strategies/comparable_distance_result.hpp
index 42a6b211a..46c9550c2 100644
--- a/inst/include/boost/geometry/strategies/comparable_distance_result.hpp
+++ b/inst/include/boost/geometry/strategies/comparable_distance_result.hpp
@@ -78,8 +78,8 @@ struct comparable_distance_result
     : strategy::distance::services::return_type
         <
             typename comparable_distance_strategy_type<Geometry1, Geometry2, Strategy>::type,
-            typename point_type<Geometry1>::type,
-            typename point_type<Geometry2>::type
+            point_type_t<Geometry1>,
+            point_type_t<Geometry2>
         >
 {};
 
diff --git a/inst/include/boost/geometry/strategies/compare.hpp b/inst/include/boost/geometry/strategies/compare.hpp
index 83de81773..ecfafc434 100644
--- a/inst/include/boost/geometry/strategies/compare.hpp
+++ b/inst/include/boost/geometry/strategies/compare.hpp
@@ -216,8 +216,8 @@ template
     typename Point1,
     typename Point2 = Point1,
     int Dimension = -1,
-    typename CSTag1 = typename cs_tag<Point1>::type,
-    typename CSTag2 = typename cs_tag<Point2>::type
+    typename CSTag1 = cs_tag_t<Point1>,
+    typename CSTag2 = cs_tag_t<Point2>
 >
 struct default_strategy
 {
diff --git a/inst/include/boost/geometry/strategies/concepts/within_concept.hpp b/inst/include/boost/geometry/strategies/concepts/within_concept.hpp
index 8775613ec..d296fc513 100644
--- a/inst/include/boost/geometry/strategies/concepts/within_concept.hpp
+++ b/inst/include/boost/geometry/strategies/concepts/within_concept.hpp
@@ -369,9 +369,9 @@ inline void check()
         <
             Geometry1,
             Geometry2,
-            typename tag<Geometry1>::type,
-            typename tag<Geometry2>::type,
-            typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
+            tag_t<Geometry1>,
+            tag_t<Geometry2>,
+            tag_cast_t<tag_t<Geometry2>, areal_tag>,
             Strategy
         > c;
     boost::ignore_unused(c);
diff --git a/inst/include/boost/geometry/strategies/convex_hull.hpp b/inst/include/boost/geometry/strategies/convex_hull.hpp
index 8208a4eb9..ff1a9ed34 100644
--- a/inst/include/boost/geometry/strategies/convex_hull.hpp
+++ b/inst/include/boost/geometry/strategies/convex_hull.hpp
@@ -40,7 +40,7 @@ template
 <
     typename Geometry1,
     typename Point,
-    typename CsTag = typename cs_tag<Point>::type
+    typename CsTag = cs_tag_t<Point>
 >
 struct strategy_convex_hull
 {
diff --git a/inst/include/boost/geometry/strategies/convex_hull/cartesian.hpp b/inst/include/boost/geometry/strategies/convex_hull/cartesian.hpp
index 5bf46f211..62d7a93cf 100644
--- a/inst/include/boost/geometry/strategies/convex_hull/cartesian.hpp
+++ b/inst/include/boost/geometry/strategies/convex_hull/cartesian.hpp
@@ -46,7 +46,7 @@ class cartesian : public strategies::detail::cartesian_base
     static auto side()
     {
         using side_strategy_type
-            = strategy::side::side_robust<CalculationType>;
+            = strategy::side::side_robust<CalculationType, strategy::side::fp_equals_policy>;
         return side_strategy_type();
     }
 
diff --git a/inst/include/boost/geometry/strategies/covered_by.hpp b/inst/include/boost/geometry/strategies/covered_by.hpp
index 3c9a0caa8..34efeb411 100644
--- a/inst/include/boost/geometry/strategies/covered_by.hpp
+++ b/inst/include/boost/geometry/strategies/covered_by.hpp
@@ -54,26 +54,26 @@ template
     typename GeometryContaining,
     typename TagContained = typename tag<GeometryContained>::type,
     typename TagContaining = typename tag<GeometryContaining>::type,
-    typename CastedTagContained = typename tag_cast
+    typename CastedTagContained = tag_cast_t
                                     <
-                                        typename tag<GeometryContained>::type,
+                                        tag_t<GeometryContained>,
                                         pointlike_tag, linear_tag, polygonal_tag, areal_tag
-                                    >::type,
-    typename CastedTagContaining = typename tag_cast
+                                    >,
+    typename CastedTagContaining = tag_cast_t
                                     <
-                                        typename tag<GeometryContaining>::type,
+                                        tag_t<GeometryContaining>,
                                         pointlike_tag, linear_tag, polygonal_tag, areal_tag
-                                    >::type,
-    typename CsTagContained = typename tag_cast
+                                    >,
+    typename CsTagContained = tag_cast_t
                                 <
-                                    typename cs_tag<typename point_type<GeometryContained>::type>::type,
+                                    cs_tag_t<point_type_t<GeometryContained>>,
                                     spherical_tag
-                                >::type,
-    typename CsTagContaining = typename tag_cast
+                                >,
+    typename CsTagContaining = tag_cast_t
                                 <
-                                    typename cs_tag<typename point_type<GeometryContaining>::type>::type,
+                                    cs_tag_t<point_type_t<GeometryContaining>>,
                                     spherical_tag
-                                >::type
+                                >
 >
 struct default_strategy
 {
diff --git a/inst/include/boost/geometry/strategies/default_area_result.hpp b/inst/include/boost/geometry/strategies/default_area_result.hpp
index 21561f326..fbf6bbdd6 100644
--- a/inst/include/boost/geometry/strategies/default_area_result.hpp
+++ b/inst/include/boost/geometry/strategies/default_area_result.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/algorithms/default_area_result.hpp>
diff --git a/inst/include/boost/geometry/strategies/disjoint.hpp b/inst/include/boost/geometry/strategies/disjoint.hpp
index 9a52f5bc2..06869a513 100644
--- a/inst/include/boost/geometry/strategies/disjoint.hpp
+++ b/inst/include/boost/geometry/strategies/disjoint.hpp
@@ -33,12 +33,12 @@ template
 <
     typename Geometry1,
     typename Geometry2,
-    typename Tag1 = typename geometry::tag<Geometry1>::type,
-    typename Tag2 = typename geometry::tag<Geometry2>::type,
+    typename Tag1 = tag_t<Geometry1>,
+    typename Tag2 = tag_t<Geometry2>,
     int TopDim1 = geometry::topological_dimension<Geometry1>::value,
     int TopDim2 = geometry::topological_dimension<Geometry2>::value,
-    typename CsTag1 = typename cs_tag<Geometry1>::type,
-    typename CsTag2 = typename cs_tag<Geometry2>::type
+    typename CsTag1 = cs_tag_t<Geometry1>,
+    typename CsTag2 = cs_tag_t<Geometry2>
 >
 struct default_strategy
     : relate::services::default_strategy
@@ -61,7 +61,7 @@ template <typename MultiPoint, typename Box>
 struct default_strategy<MultiPoint, Box, multi_point_tag, box_tag, 0, 2>
     : strategy::covered_by::services::default_strategy
         <
-            typename point_type<MultiPoint>::type,
+            point_type_t<MultiPoint>,
             Box
         >
 {};
@@ -70,7 +70,7 @@ template <typename Box, typename MultiPoint>
 struct default_strategy<Box, MultiPoint, box_tag, multi_point_tag, 2, 0>
     : strategy::covered_by::services::default_strategy
         <
-            typename point_type<MultiPoint>::type,
+            point_type_t<MultiPoint>,
             Box
         >
 {};
diff --git a/inst/include/boost/geometry/strategies/distance.hpp b/inst/include/boost/geometry/strategies/distance.hpp
index 9a886376d..53b6e29c8 100644
--- a/inst/include/boost/geometry/strategies/distance.hpp
+++ b/inst/include/boost/geometry/strategies/distance.hpp
@@ -94,8 +94,8 @@ template
     typename GeometryTag2,
     typename Point1,
     typename Point2 = Point1,
-    typename CsTag1 = typename cs_tag<Point1>::type,
-    typename CsTag2 = typename cs_tag<Point2>::type,
+    typename CsTag1 = cs_tag_t<Point1>,
+    typename CsTag2 = cs_tag_t<Point2>,
     typename UnderlyingStrategy = void
 >
 struct default_strategy
diff --git a/inst/include/boost/geometry/strategies/distance_result.hpp b/inst/include/boost/geometry/strategies/distance_result.hpp
index 6d6520a27..0e07b28d7 100644
--- a/inst/include/boost/geometry/strategies/distance_result.hpp
+++ b/inst/include/boost/geometry/strategies/distance_result.hpp
@@ -83,8 +83,8 @@ struct distance_result
     : strategy::distance::services::return_type
         <
             typename distance_result_strategy_type<Geometry1, Geometry2, Strategy>::type,
-            typename point_type<Geometry1>::type,
-            typename point_type<Geometry2>::type
+            point_type_t<Geometry1>,
+            point_type_t<Geometry2>
         >
 {};
 
diff --git a/inst/include/boost/geometry/strategies/envelope.hpp b/inst/include/boost/geometry/strategies/envelope.hpp
index 5cbc80361..884db6443 100644
--- a/inst/include/boost/geometry/strategies/envelope.hpp
+++ b/inst/include/boost/geometry/strategies/envelope.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/envelope.hpp>
diff --git a/inst/include/boost/geometry/strategies/expand.hpp b/inst/include/boost/geometry/strategies/expand.hpp
index 0a5b21125..5c94d9180 100644
--- a/inst/include/boost/geometry/strategies/expand.hpp
+++ b/inst/include/boost/geometry/strategies/expand.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/expand.hpp>
diff --git a/inst/include/boost/geometry/strategies/geographic/area.hpp b/inst/include/boost/geometry/strategies/geographic/area.hpp
index 600c73945..7edf86820 100644
--- a/inst/include/boost/geometry/strategies/geographic/area.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/area.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/geographic/area.hpp>
diff --git a/inst/include/boost/geometry/strategies/geographic/buffer_end_round.hpp b/inst/include/boost/geometry/strategies/geographic/buffer_end_round.hpp
index 1d6c8d197..2191e96e1 100644
--- a/inst/include/boost/geometry/strategies/geographic/buffer_end_round.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/buffer_end_round.hpp
@@ -134,7 +134,7 @@ public :
         return distance;
     }
 
-    //! Returns the piece_type (flat end)
+    //! Returns the piece_type (round end)
     static inline piece_type get_piece_type()
     {
         return buffered_round_end;
diff --git a/inst/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp b/inst/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp
index d7ea122a3..e62e5a3d7 100644
--- a/inst/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp
@@ -16,8 +16,6 @@
 #include <cstddef>
 #include <utility>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/calculation_type.hpp>
 
diff --git a/inst/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp b/inst/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp
index 7844cddeb..fed9a670a 100644
--- a/inst/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp
@@ -83,8 +83,8 @@ class geographic_cross_track_box_box
     struct return_type : services::return_type
             <
                 typename distance_ps_strategy::type,
-                typename point_type<Box1>::type,
-                typename point_type<Box2>::type
+                point_type_t<Box1>,
+                point_type_t<Box2>
             >
     {};
 
@@ -105,8 +105,8 @@ class geographic_cross_track_box_box
                 (concepts::PointSegmentDistanceStrategy
                     <
                         Strategy,
-                        typename point_type<Box1>::type,
-                        typename point_type<Box2>::type
+                        point_type_t<Box1>,
+                        point_type_t<Box2>
                     >)
             );
 #endif
@@ -208,8 +208,8 @@ struct result_from_distance
         result_from_distance
             <
                 Strategy,
-                typename point_type<Box1>::type,
-                typename point_type<Box2>::type
+                point_type_t<Box1>,
+                point_type_t<Box2>
             >::apply(strategy, distance);
     }
 };
diff --git a/inst/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp b/inst/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp
index 4709b0190..e4dea3477 100644
--- a/inst/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp
@@ -69,7 +69,7 @@ class geographic_cross_track_point_box
     template <typename Point, typename Box>
     struct return_type
         : services::return_type<typename distance_ps_strategy::type,
-                                Point, typename point_type<Box>::type>
+                                Point, point_type_t<Box>>
     {};
 
     //constructor
@@ -88,7 +88,7 @@ class geographic_cross_track_point_box
             (
                 (concepts::PointSegmentDistanceStrategy
                     <
-                        Strategy, Point, typename point_type<Box>::type
+                        Strategy, Point, point_type_t<Box>
                     >)
             );
 #endif
@@ -190,7 +190,7 @@ struct result_from_distance
     {
         result_from_distance
             <
-                Strategy, P, typename point_type<Box>::type
+                Strategy, P, point_type_t<Box>
             >::apply(strategy, distance);
     }
 };
diff --git a/inst/include/boost/geometry/strategies/geographic/envelope.hpp b/inst/include/boost/geometry/strategies/geographic/envelope.hpp
index b6dc642de..67ea6be9f 100644
--- a/inst/include/boost/geometry/strategies/geographic/envelope.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/envelope.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/geographic/envelope.hpp>
diff --git a/inst/include/boost/geometry/strategies/geographic/envelope_segment.hpp b/inst/include/boost/geometry/strategies/geographic/envelope_segment.hpp
index 8afe6959e..d9139ffa0 100644
--- a/inst/include/boost/geometry/strategies/geographic/envelope_segment.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/envelope_segment.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/geographic/envelope_segment.hpp>
diff --git a/inst/include/boost/geometry/strategies/geographic/expand_segment.hpp b/inst/include/boost/geometry/strategies/geographic/expand_segment.hpp
index 20c327602..3e573c47b 100644
--- a/inst/include/boost/geometry/strategies/geographic/expand_segment.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/expand_segment.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/geographic/expand_segment.hpp>
diff --git a/inst/include/boost/geometry/strategies/geographic/intersection.hpp b/inst/include/boost/geometry/strategies/geographic/intersection.hpp
index e6a94a15e..3f10ce092 100644
--- a/inst/include/boost/geometry/strategies/geographic/intersection.hpp
+++ b/inst/include/boost/geometry/strategies/geographic/intersection.hpp
@@ -2,7 +2,8 @@
 
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// Copyright (c) 2016-2021, Oracle and/or its affiliates.
+// Copyright (c) 2016-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -23,7 +24,6 @@
 #include <boost/geometry/algorithms/detail/assign_values.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/equals/point_point.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
 #include <boost/geometry/formulas/andoyer_inverse.hpp>
 #include <boost/geometry/formulas/sjoberg_intersection.hpp>
@@ -114,8 +114,8 @@ struct geographic_segments
 
         CoordinateType lon;
         CoordinateType lat;
-        SegmentRatio robust_ra;
-        SegmentRatio robust_rb;
+        SegmentRatio ra;
+        SegmentRatio rb;
         intersection_point_flag ip_flag;
     };
 
@@ -489,8 +489,8 @@ struct geographic_segments
 
                 sinfo.lon = lon;
                 sinfo.lat = lat;
-                sinfo.robust_ra.assign(dist_a1_i1, dist_a1_a2);
-                sinfo.robust_rb.assign(dist_b1_i1, dist_b1_b2);
+                sinfo.ra.assign(dist_a1_i1, dist_a1_a2);
+                sinfo.rb.assign(dist_b1_i1, dist_b1_b2);
                 sinfo.ip_flag = ip_flag;
 
                 return Policy::segments_crosses(sides, sinfo, a, b);
diff --git a/inst/include/boost/geometry/strategies/intersection_result.hpp b/inst/include/boost/geometry/strategies/intersection_result.hpp
index 94aae51d8..971dc9f2b 100644
--- a/inst/include/boost/geometry/strategies/intersection_result.hpp
+++ b/inst/include/boost/geometry/strategies/intersection_result.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2015-2021.
-// Modifications copyright (c) 2015-2021 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2024.
+// Modifications copyright (c) 2015-2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -24,8 +25,8 @@ namespace boost { namespace geometry
 template <typename SegmentRatio>
 struct fraction_type
 {
-    SegmentRatio robust_ra; // TODO this can be renamed now to "ra"
-    SegmentRatio robust_rb;
+    SegmentRatio ra;
+    SegmentRatio rb;
 
     bool initialized;
     inline fraction_type()
@@ -36,15 +37,15 @@ struct fraction_type
     inline void assign(Info const& info)
     {
         initialized = true;
-        robust_ra = info.robust_ra;
-        robust_rb = info.robust_rb;
+        ra = info.ra;
+        rb = info.rb;
     }
 
     inline void assign(SegmentRatio const& a, SegmentRatio const& b)
     {
         initialized = true;
-        robust_ra = a;
-        robust_rb = b;
+        ra = a;
+        rb = b;
     }
 
 };
diff --git a/inst/include/boost/geometry/strategies/intersection_strategies.hpp b/inst/include/boost/geometry/strategies/intersection_strategies.hpp
index e9a17305a..781b3984d 100644
--- a/inst/include/boost/geometry/strategies/intersection_strategies.hpp
+++ b/inst/include/boost/geometry/strategies/intersection_strategies.hpp
@@ -2,8 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2016-2020.
-// Modifications copyright (c) 2016-2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2024.
+// Modifications copyright (c) 2016-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -17,7 +18,6 @@
 //#include <type_traits>
 
 #include <boost/geometry/policies/relate/intersection_policy.hpp>
-#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
 
 #include <boost/geometry/strategies/intersection.hpp>
 #include <boost/geometry/strategies/intersection_result.hpp>
@@ -41,21 +41,15 @@ template
     typename Geometry1,
     typename Geometry2,
     typename IntersectionPoint,
-    typename RobustPolicy,
     typename CalculationType = void
 >
 struct intersection_strategies
 {
 private :
-    // for development BOOST_STATIC_ASSERT((! std::is_same<RobustPolicy, void>::type::value));
-
     typedef segment_intersection_points
     <
         IntersectionPoint,
-        typename detail::segment_ratio_type
-        <
-            IntersectionPoint, RobustPolicy
-        >::type
+        typename segment_ratio_type<IntersectionPoint>::type
     > ip_type;
 
 public:
@@ -69,14 +63,6 @@ private :
                 Tag,
                 CalculationType
             >::type segment_intersection_strategy_type;
-
-    typedef typename strategy::side::services::default_strategy
-        <
-            Tag,
-            CalculationType
-        >::type side_strategy_type;
-
-    typedef RobustPolicy rescale_policy_type;
 };
 
 
diff --git a/inst/include/boost/geometry/strategies/normalize.hpp b/inst/include/boost/geometry/strategies/normalize.hpp
index a722b1fe0..8cfaf9522 100644
--- a/inst/include/boost/geometry/strategies/normalize.hpp
+++ b/inst/include/boost/geometry/strategies/normalize.hpp
@@ -14,8 +14,6 @@
 #include <cstddef>
 #include <type_traits>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_system.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
@@ -25,6 +23,7 @@
 
 #include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
 #include <boost/geometry/util/normalize_spheroidal_box_coordinates.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 #include <boost/geometry/views/detail/indexed_point_view.hpp>
 
@@ -57,7 +56,7 @@ struct assign_loop
                              PointIn const& point_in,
                              PointOut& point_out)
     {
-        geometry::set<Dimension>(point_out, boost::numeric_cast
+        geometry::set<Dimension>(point_out, util::numeric_cast
             <
                 typename coordinate_type<PointOut>::type
             >(geometry::get<Dimension>(point_in)));
@@ -90,7 +89,7 @@ struct assign_loop<0, DimensionCount>
                              PointIn const& point_in,
                              PointOut& point_out)
     {
-        geometry::set<0>(point_out, boost::numeric_cast
+        geometry::set<0>(point_out, util::numeric_cast
             <
                 typename coordinate_type<PointOut>::type
             >(longitude));
@@ -111,7 +110,7 @@ struct assign_loop<1, DimensionCount>
                              PointIn const& point_in,
                              PointOut& point_out)
     {
-        geometry::set<1>(point_out, boost::numeric_cast
+        geometry::set<1>(point_out, util::numeric_cast
             <
                 typename coordinate_type<PointOut>::type
             >(latitude));
@@ -230,11 +229,7 @@ struct spherical_point
         detail::normalize_point
             <
                 PointIn, PointOut,
-                (! std::is_same
-                    <
-                        typename cs_tag<PointIn>::type,
-                        spherical_polar_tag
-                    >::value)
+                (! std::is_same<cs_tag_t<PointIn>, spherical_polar_tag>::value)
             >::apply(point_in, point_out);
     }
 };
@@ -247,11 +242,7 @@ struct spherical_box
         detail::normalize_box
             <
                 BoxIn, BoxOut,
-                (! std::is_same
-                    <
-                        typename cs_tag<BoxIn>::type,
-                        spherical_polar_tag
-                    >::value)
+                (! std::is_same<cs_tag_t<BoxIn>, spherical_polar_tag>::value)
             >::apply(box_in, box_out);
     }
 };
diff --git a/inst/include/boost/geometry/strategies/relate.hpp b/inst/include/boost/geometry/strategies/relate.hpp
index 7d388eb51..de1a58b8d 100644
--- a/inst/include/boost/geometry/strategies/relate.hpp
+++ b/inst/include/boost/geometry/strategies/relate.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/relate.hpp>
diff --git a/inst/include/boost/geometry/strategies/side_info.hpp b/inst/include/boost/geometry/strategies/side_info.hpp
index d113eaa8f..bd257ed93 100644
--- a/inst/include/boost/geometry/strategies/side_info.hpp
+++ b/inst/include/boost/geometry/strategies/side_info.hpp
@@ -4,6 +4,10 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2024.
+// Modifications copyright (c) 2024 Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -17,7 +21,7 @@
 #include <cmath>
 #include <utility>
 
-#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION)
 #  include <iostream>
 #endif
 
@@ -146,7 +150,7 @@ public :
         return sides[Which].first == 0 ? 0 : 1;
     }
 
-#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION)
     inline void debug() const
     {
         std::cout << sides[0].first << " "
diff --git a/inst/include/boost/geometry/strategies/spherical/area.hpp b/inst/include/boost/geometry/strategies/spherical/area.hpp
index e726d2392..981c8fec3 100644
--- a/inst/include/boost/geometry/strategies/spherical/area.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/area.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/area.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp b/inst/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
index aff36314d..5790ead7a 100644
--- a/inst/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
@@ -1,5 +1,7 @@
 // Boost.Geometry
 
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
+
 // Copyright (c) 2021, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
@@ -16,6 +18,8 @@
 #include <boost/config.hpp>
 #include <boost/concept_check.hpp>
 
+#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
+
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_promotion.hpp>
@@ -85,13 +89,21 @@ class cross_track
     {
         using CT = typename calculation_type<Point, PointOfSegment>::type;
 
+        model::point
+            <
+                CT,
+                dimension<PointOfSegment>::value,
+                typename coordinate_system<PointOfSegment>::type
+            > result;
+
         // http://williams.best.vwh.net/avform.htm#XTE
         CT d3 = m_strategy.apply(sp1, sp2);
 
         if (geometry::math::equals(d3, 0.0))
         {
             // "Degenerate" segment, return either d1 or d2
-            return sp1;
+            geometry::detail::conversion::convert_point_to_point(sp1, result);
+            return result;
         }
 
         CT d1 = m_strategy.apply(sp1, p);
@@ -159,24 +171,18 @@ class cross_track
                     false
                 >(lon1, lat1, s14_sph, a12, srs::sphere<CT>(earth_radius));
 
-            model::point
-                <
-                    CT,
-                    dimension<PointOfSegment>::value,
-                    typename coordinate_system<PointOfSegment>::type
-                > cp;
-
-            geometry::set_from_radian<0>(cp, res_direct.lon2);
-            geometry::set_from_radian<1>(cp, res_direct.lat2);
+            geometry::set_from_radian<0>(result, res_direct.lon2);
+            geometry::set_from_radian<1>(result, res_direct.lat2);
 
-            return cp;
+            return result;
         }
         else
         {
 #ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
             std::cout << "Projection OUTSIDE the segment" << std::endl;
 #endif
-            return d1 < d2 ? sp1 : sp2;
+            geometry::detail::conversion::convert_point_to_point(d1 < d2 ? sp1 : sp2, result);
+            return result;
         }
     }
 
diff --git a/inst/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp b/inst/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp
index 29b6bdaf5..ac4235f14 100644
--- a/inst/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp
@@ -16,11 +16,6 @@
 #include <cstddef>
 #include <utility>
 
-#include <boost/numeric/conversion/cast.hpp>
-
-#include <boost/geometry/util/math.hpp>
-#include <boost/geometry/util/calculation_type.hpp>
-
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
@@ -36,6 +31,9 @@
 #include <boost/geometry/strategies/spherical/azimuth.hpp>
 #include <boost/geometry/strategies/spherical/disjoint_box_box.hpp>
 
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/calculation_type.hpp>
+
 
 namespace boost { namespace geometry { namespace strategy { namespace disjoint
 {
@@ -56,9 +54,7 @@ struct segment_box_spherical
     template <typename Segment, typename Box>
     static inline bool apply(Segment const& segment, Box const& box)
     {
-        typedef typename point_type<Segment>::type segment_point_type;
-        typedef typename coordinate_type<segment_point_type>::type CT;
-        geometry::strategy::azimuth::spherical<CT> azimuth_strategy;
+        geometry::strategy::azimuth::spherical<coordinate_type_t<point_type_t<Segment>>> azimuth_strategy;
 
         return geometry::detail::disjoint::disjoint_segment_box_sphere_or_spheroid
                 <
diff --git a/inst/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp b/inst/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp
index 9b778a7fe..f021cf99e 100644
--- a/inst/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp
@@ -87,8 +87,8 @@ public :
         // this method assumes that the coordinates of the point and
         // the box are normalized
 
-        typedef typename point_type<Box1>::type box_point_type1;
-        typedef typename point_type<Box2>::type box_point_type2;
+        using box_point_type1 = point_type_t<Box1>;
+        using box_point_type2 = point_type_t<Box2>;
 
         box_point_type1 bottom_left1, bottom_right1, top_left1, top_right1;
         geometry::detail::assign_box_corners(box1,
@@ -277,8 +277,8 @@ class cross_track_box_box
     template <typename Box1, typename Box2>
     struct return_type
         : services::return_type<Strategy,
-                                typename point_type<Box1>::type,
-                                typename point_type<Box2>::type>
+                                point_type_t<Box1>,
+                                point_type_t<Box2>>
     {};
 
     typedef typename Strategy::radius_type radius_type;
@@ -338,8 +338,8 @@ class cross_track_box_box
                 (concepts::PointDistanceStrategy
                     <
                         Strategy,
-                        typename point_type<Box1>::type,
-                        typename point_type<Box2>::type
+                        point_type_t<Box1>,
+                        point_type_t<Box2>
                     >)
             );
 #endif
@@ -429,8 +429,8 @@ struct result_from_distance
         return result_from_distance
             <
                 Strategy,
-                typename point_type<Box1>::type,
-                typename point_type<Box2>::type
+                point_type_t<Box1>,
+                point_type_t<Box2>
             >::apply(s, distance);
     }
 };
@@ -455,7 +455,7 @@ struct default_strategy
                     typename default_strategy
                         <
                             point_tag, point_tag,
-                            typename point_type<Box1>::type, typename point_type<Box2>::type,
+                            point_type_t<Box1>, point_type_t<Box2>,
                             spherical_equatorial_tag, spherical_equatorial_tag
                         >::type,
                     Strategy
diff --git a/inst/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp b/inst/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp
index 8b5178ca4..c4c7fa79e 100644
--- a/inst/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp
@@ -65,7 +65,7 @@ public :
         // this method assumes that the coordinates of the point and
         // the box are normalized
 
-        typedef typename point_type<Box>::type box_point_type;
+        using box_point_type = point_type_t<Box>;
 
         box_point_type bottom_left, bottom_right, top_left, top_right;
         geometry::detail::assign_box_corners(box,
@@ -83,7 +83,7 @@ public :
         ReturnType const pi = math::pi<ReturnType>();
         ReturnType const two_pi = math::two_pi<ReturnType>();
 
-        typedef typename point_type<Box>::type box_point_type;
+        using box_point_type = point_type_t<Box>;
 
         // First check if the point is within the band defined by the
         // minimum and maximum longitude of the box; if yes, determine
@@ -205,7 +205,7 @@ class cross_track_point_box
 public:
     template <typename Point, typename Box>
     struct return_type
-        : services::return_type<Strategy, Point, typename point_type<Box>::type>
+        : services::return_type<Strategy, Point, point_type_t<Box>>
     {};
 
     typedef typename Strategy::radius_type radius_type;
@@ -266,7 +266,7 @@ class cross_track_point_box
             (
                 (concepts::PointDistanceStrategy
                     <
-                        Strategy, Point, typename point_type<Box>::type
+                        Strategy, Point, point_type_t<Box>
                     >)
             );
 #endif
@@ -354,7 +354,7 @@ struct result_from_distance
 
         return result_from_distance
             <
-                Strategy, P, typename point_type<Box>::type
+                Strategy, P, point_type_t<Box>
             >::apply(s, distance);
     }
 };
@@ -379,7 +379,7 @@ struct default_strategy
                     typename default_strategy
                         <
                             point_tag, point_tag,
-                            Point, typename point_type<Box>::type,
+                            Point, point_type_t<Box>,
                             spherical_equatorial_tag, spherical_equatorial_tag
                         >::type,
                     Strategy
diff --git a/inst/include/boost/geometry/strategies/spherical/distance_haversine.hpp b/inst/include/boost/geometry/strategies/spherical/distance_haversine.hpp
index 389277259..dc62c60ed 100644
--- a/inst/include/boost/geometry/strategies/spherical/distance_haversine.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/distance_haversine.hpp
@@ -41,6 +41,15 @@ namespace strategy { namespace distance
 namespace comparable
 {
 
+// Haversine:
+// (from Wiki:) The great circle distance d between two
+// points with coordinates {lat1,lon1} and {lat2,lon2} is given by:
+//     d=acos(sin(lat1)*sin(lat2)+cos(lat1)*cos(lat2)*cos(lon1-lon2))
+// A mathematically equivalent formula, which is less subject
+//     to rounding error for short distances is:
+// d = 2 * asin(sqrt((sin((lat1-lat2) / 2))^2
+//                   + cos(lat1)*cos(lat2)*(sin((lon1-lon2) / 2))^2))
+//
 // Comparable haversine.
 // To compare distances, we can avoid:
 // - multiplication with radius and 2.0
@@ -124,13 +133,6 @@ on a perfect sphere using haversine
 \tparam CalculationType \tparam_calculation
 \author Adapted from: http://williams.best.vwh.net/avform.htm
 \see http://en.wikipedia.org/wiki/Great-circle_distance
-\note (from Wiki:) The great circle distance d between two
-points with coordinates {lat1,lon1} and {lat2,lon2} is given by:
-    d=acos(sin(lat1)*sin(lat2)+cos(lat1)*cos(lat2)*cos(lon1-lon2))
-A mathematically equivalent formula, which is less subject
-    to rounding error for short distances is:
-    d=2*asin(sqrt((sin((lat1-lat2) / 2))^2
-    + cos(lat1)*cos(lat2)*(sin((lon1-lon2) / 2))^2))
 \qbk{
 [heading See also]
 [link geometry.reference.algorithms.distance.distance_3_with_strategy distance (with strategy)]
diff --git a/inst/include/boost/geometry/strategies/spherical/distance_segment_box.hpp b/inst/include/boost/geometry/strategies/spherical/distance_segment_box.hpp
index c48377d77..32ce3bcaa 100644
--- a/inst/include/boost/geometry/strategies/spherical/distance_segment_box.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/distance_segment_box.hpp
@@ -25,6 +25,9 @@
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp> // spherical
 #include <boost/geometry/strategies/spherical/ssf.hpp>
 
+#include <boost/geometry/util/numeric_cast.hpp>
+
+
 namespace boost { namespace geometry
 {
 
@@ -148,7 +151,7 @@ struct generic_segment_box
         if (less_equal(geometry::get_as_radian<0>(bottom_left),
                        geometry::get_as_radian<0>(p_max)))
         {
-            result = boost::numeric_cast<ReturnType>(
+            result = util::numeric_cast<ReturnType>(
                 strategies.distance(bottom_left, seg).apply(bottom_left, p0, p1));
         }
         else
diff --git a/inst/include/boost/geometry/strategies/spherical/envelope.hpp b/inst/include/boost/geometry/strategies/spherical/envelope.hpp
index 7cc069b90..510ec8a4a 100644
--- a/inst/include/boost/geometry/strategies/spherical/envelope.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/envelope.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/envelope.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/envelope_box.hpp b/inst/include/boost/geometry/strategies/spherical/envelope_box.hpp
index ba3f84850..4ea840ed9 100644
--- a/inst/include/boost/geometry/strategies/spherical/envelope_box.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/envelope_box.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/envelope_box.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/envelope_multipoint.hpp b/inst/include/boost/geometry/strategies/spherical/envelope_multipoint.hpp
index f057566ae..6fd64a567 100644
--- a/inst/include/boost/geometry/strategies/spherical/envelope_multipoint.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/envelope_multipoint.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/envelope_multipoint.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/envelope_point.hpp b/inst/include/boost/geometry/strategies/spherical/envelope_point.hpp
index cb6e2453b..05101073f 100644
--- a/inst/include/boost/geometry/strategies/spherical/envelope_point.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/envelope_point.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/envelope_point.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/envelope_segment.hpp b/inst/include/boost/geometry/strategies/spherical/envelope_segment.hpp
index 8e9a099bb..2eae6976a 100644
--- a/inst/include/boost/geometry/strategies/spherical/envelope_segment.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/envelope_segment.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/envelope_segment.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/expand_box.hpp b/inst/include/boost/geometry/strategies/spherical/expand_box.hpp
index 123542244..10f8caa1e 100644
--- a/inst/include/boost/geometry/strategies/spherical/expand_box.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/expand_box.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/expand_box.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/expand_point.hpp b/inst/include/boost/geometry/strategies/spherical/expand_point.hpp
index b56d9fd18..e784f15ff 100644
--- a/inst/include/boost/geometry/strategies/spherical/expand_point.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/expand_point.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/expand_point.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/expand_segment.hpp b/inst/include/boost/geometry/strategies/spherical/expand_segment.hpp
index 19211e5df..e87bec450 100644
--- a/inst/include/boost/geometry/strategies/spherical/expand_segment.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/expand_segment.hpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in the future.")
+BOOST_PRAGMA_MESSAGE("This include file is deprecated and will be removed in Boost 1.86")
 
 
 #include <boost/geometry/strategy/spherical/expand_segment.hpp>
diff --git a/inst/include/boost/geometry/strategies/spherical/intersection.hpp b/inst/include/boost/geometry/strategies/spherical/intersection.hpp
index fdd44c5d1..804efd766 100644
--- a/inst/include/boost/geometry/strategies/spherical/intersection.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/intersection.hpp
@@ -2,7 +2,8 @@
 
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// Copyright (c) 2016-2021, Oracle and/or its affiliates.
+// Copyright (c) 2016-2024, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -23,7 +24,6 @@
 #include <boost/geometry/algorithms/detail/assign_values.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/equals/point_point.hpp>
-#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/arithmetic/cross_product.hpp>
@@ -133,8 +133,8 @@ struct ecef_segments
         }
 
         Vector3d intersection_point;
-        SegmentRatio robust_ra;
-        SegmentRatio robust_rb;
+        SegmentRatio ra;
+        SegmentRatio rb;
         intersection_point_flag ip_flag;
 
         CalcPolicy const& calc_policy;
@@ -424,8 +424,8 @@ struct ecef_segments
                         vec3d_t
                     > sinfo(calc_policy);
 
-                sinfo.robust_ra.assign(dist_a1_i1, dist_a1_a2);
-                sinfo.robust_rb.assign(dist_b1_i1, dist_b1_b2);
+                sinfo.ra.assign(dist_a1_i1, dist_a1_a2);
+                sinfo.rb.assign(dist_b1_i1, dist_b1_b2);
                 sinfo.intersection_point = i1;
                 sinfo.ip_flag = ip_flag;
 
diff --git a/inst/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp b/inst/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp
index ca61e4fcb..a11c3c705 100644
--- a/inst/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp
@@ -3,8 +3,8 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2013-2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2023.
-// Modifications copyright (c) 2013-2023 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2024.
+// Modifications copyright (c) 2013-2024 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -395,8 +395,13 @@ class spherical_winding_base
         }
 
         calc_t const p = get<0>(point);
-        calc_t const s1 = get<0>(seg1);
-        calc_t const s2 = get<0>(seg2);
+        calc_t s1 = get<0>(seg1);
+        calc_t s2 = get<0>(seg2);
+
+        // In case of a segment that contains a pole endpoint we need an arbitrary but consistent
+        // longitude for that endpoint different than p's longitude
+        if (s1_is_pole) s1 = (p != 0) ? 0 : 1;
+        if (s2_is_pole) s2 = (p != 0) ? 0 : 1;
 
         calc_t const s1_p = math::longitude_distance_signed<units_t>(s1, p);
 
diff --git a/inst/include/boost/geometry/strategies/spherical/point_order.hpp b/inst/include/boost/geometry/strategies/spherical/point_order.hpp
index 52450dc63..3f9eb8ce4 100644
--- a/inst/include/boost/geometry/strategies/spherical/point_order.hpp
+++ b/inst/include/boost/geometry/strategies/spherical/point_order.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry
 
-// Copyright (c) 2019-2020, Oracle and/or its affiliates.
+// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2019-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -100,7 +101,7 @@ namespace strategy { namespace point_order
 //                spherical_polar_tag
 //            >::value;
 //
-//        if (BOOST_GEOMETRY_CONDITION(is_polar))
+//        if BOOST_GEOMETRY_CONSTEXPR (is_polar)
 //        {
 //            CalcT pi_half = math::half_pi<CalcT>();
 //            lat1 = pi_half - lat1;
diff --git a/inst/include/boost/geometry/strategies/strategies.hpp b/inst/include/boost/geometry/strategies/strategies.hpp
index d219d0053..3c1e3984c 100644
--- a/inst/include/boost/geometry/strategies/strategies.hpp
+++ b/inst/include/boost/geometry/strategies/strategies.hpp
@@ -58,7 +58,6 @@
 #include <boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp>
 #include <boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp>
 #include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
-#include <boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp>
 #include <boost/geometry/strategies/cartesian/distance_segment_box.hpp>
 #include <boost/geometry/strategies/cartesian/intersection.hpp>
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp>
diff --git a/inst/include/boost/geometry/strategies/strategy_transform.hpp b/inst/include/boost/geometry/strategies/strategy_transform.hpp
index ee2216ac7..d095a374d 100644
--- a/inst/include/boost/geometry/strategies/strategy_transform.hpp
+++ b/inst/include/boost/geometry/strategies/strategy_transform.hpp
@@ -23,8 +23,6 @@
 #include <cmath>
 #include <functional>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/core/access.hpp>
@@ -34,6 +32,7 @@
 #include <boost/geometry/strategies/transform.hpp>
 
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_coordinate_type.hpp>
 
 namespace boost { namespace geometry
@@ -60,7 +59,7 @@ struct transform_coordinates
         typedef typename select_coordinate_type<Src, Dst>::type coordinate_type;
 
         F<coordinate_type> function;
-        set<D>(dest, boost::numeric_cast<coordinate_type>(function(get<D>(source), value)));
+        set<D>(dest, util::numeric_cast<coordinate_type>(function(get<D>(source), value)));
         transform_coordinates<Src, Dst, D + 1, N, F>::transform(source, dest, value);
     }
 };
diff --git a/inst/include/boost/geometry/strategies/transform/map_transformer.hpp b/inst/include/boost/geometry/strategies/transform/map_transformer.hpp
index 01ea6168c..101be83f2 100644
--- a/inst/include/boost/geometry/strategies/transform/map_transformer.hpp
+++ b/inst/include/boost/geometry/strategies/transform/map_transformer.hpp
@@ -18,6 +18,8 @@
 #include <cstddef>
 
 #include <boost/geometry/strategies/transform/matrix_transformers.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
+
 
 namespace boost { namespace geometry
 {
@@ -117,8 +119,8 @@ private :
         // Scale is in PIXELS/MAPUNITS (meters)
         W wdx = wx2 - wx1;
         W wdy = wy2 - wy1;
-        type sx = (px2 - px1) / boost::numeric_cast<type>(wdx);
-        type sy = (py2 - py1) / boost::numeric_cast<type>(wdy);
+        type sx = (px2 - px1) / util::numeric_cast<type>(wdx);
+        type sy = (py2 - py1) / util::numeric_cast<type>(wdy);
 
         if (SameScale)
         {
diff --git a/inst/include/boost/geometry/strategies/transform/matrix_transformers.hpp b/inst/include/boost/geometry/strategies/transform/matrix_transformers.hpp
index 70f11b889..937cc1489 100644
--- a/inst/include/boost/geometry/strategies/transform/matrix_transformers.hpp
+++ b/inst/include/boost/geometry/strategies/transform/matrix_transformers.hpp
@@ -36,6 +36,7 @@
 #include <boost/geometry/core/coordinate_promotion.hpp>
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_coordinate_type.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
@@ -61,7 +62,7 @@ struct set_point_from_vec
     static inline void apply(Point & p, Vector const& v)
     {
         typedef typename geometry::coordinate_type<Point>::type coord_t;
-        set<Dimension>(p, boost::numeric_cast<coord_t>(qvm::A<Dimension>(v)));
+        set<Dimension>(p, util::numeric_cast<coord_t>(qvm::A<Dimension>(v)));
         set_point_from_vec<Point, Dimension + 1, DimensionCount>::apply(p, v);
     }
 };
@@ -197,8 +198,8 @@ public :
         ct const& c2 = get<1>(p1);
 
         typedef typename geometry::coordinate_type<P2>::type ct2;
-        set<0>(p2, boost::numeric_cast<ct2>(c1 * qvm::A<0,0>(this->m_matrix) + c2 * qvm::A<0,1>(this->m_matrix) + qvm::A<0,2>(this->m_matrix)));
-        set<1>(p2, boost::numeric_cast<ct2>(c1 * qvm::A<1,0>(this->m_matrix) + c2 * qvm::A<1,1>(this->m_matrix) + qvm::A<1,2>(this->m_matrix)));
+        set<0>(p2, util::numeric_cast<ct2>(c1 * qvm::A<0,0>(this->m_matrix) + c2 * qvm::A<0,1>(this->m_matrix) + qvm::A<0,2>(this->m_matrix)));
+        set<1>(p2, util::numeric_cast<ct2>(c1 * qvm::A<1,0>(this->m_matrix) + c2 * qvm::A<1,1>(this->m_matrix) + qvm::A<1,2>(this->m_matrix)));
 
         return true;
     }
@@ -241,9 +242,9 @@ public :
 
         typedef typename geometry::coordinate_type<P2>::type ct2;
 
-        set<0>(p2, boost::numeric_cast<ct2>(
+        set<0>(p2, util::numeric_cast<ct2>(
             c1 * qvm::A<0,0>(this->m_matrix) + c2 * qvm::A<0,1>(this->m_matrix) + c3 * qvm::A<0,2>(this->m_matrix) + qvm::A<0,3>(this->m_matrix)));
-        set<1>(p2, boost::numeric_cast<ct2>(
+        set<1>(p2, util::numeric_cast<ct2>(
             c1 * qvm::A<1,0>(this->m_matrix) + c2 * qvm::A<1,1>(this->m_matrix) + c3 * qvm::A<1,2>(this->m_matrix) + qvm::A<1,3>(this->m_matrix)));
 
         return true;
@@ -290,11 +291,11 @@ public :
 
         typedef typename geometry::coordinate_type<P2>::type ct2;
 
-        set<0>(p2, boost::numeric_cast<ct2>(
+        set<0>(p2, util::numeric_cast<ct2>(
             c1 * qvm::A<0,0>(this->m_matrix) + c2 * qvm::A<0,1>(this->m_matrix) + c3 * qvm::A<0,2>(this->m_matrix) + qvm::A<0,3>(this->m_matrix)));
-        set<1>(p2, boost::numeric_cast<ct2>(
+        set<1>(p2, util::numeric_cast<ct2>(
             c1 * qvm::A<1,0>(this->m_matrix) + c2 * qvm::A<1,1>(this->m_matrix) + c3 * qvm::A<1,2>(this->m_matrix) + qvm::A<1,3>(this->m_matrix)));
-        set<2>(p2, boost::numeric_cast<ct2>(
+        set<2>(p2, util::numeric_cast<ct2>(
             c1 * qvm::A<2,0>(this->m_matrix) + c2 * qvm::A<2,1>(this->m_matrix) + c3 * qvm::A<2,2>(this->m_matrix) + qvm::A<2,3>(this->m_matrix)));
 
         return true;
diff --git a/inst/include/boost/geometry/strategies/within.hpp b/inst/include/boost/geometry/strategies/within.hpp
index 954ceefe0..a63ccafcf 100644
--- a/inst/include/boost/geometry/strategies/within.hpp
+++ b/inst/include/boost/geometry/strategies/within.hpp
@@ -52,28 +52,28 @@ template
 <
     typename GeometryContained,
     typename GeometryContaining,
-    typename TagContained = typename tag<GeometryContained>::type,
-    typename TagContaining = typename tag<GeometryContaining>::type,
-    typename CastedTagContained = typename tag_cast
+    typename TagContained = tag_t<GeometryContained>,
+    typename TagContaining = tag_t<GeometryContaining>,
+    typename CastedTagContained = tag_cast_t
                                     <
-                                        typename tag<GeometryContained>::type,
+                                        tag_t<GeometryContained>,
                                         pointlike_tag, linear_tag, polygonal_tag, areal_tag
-                                    >::type,
-    typename CastedTagContaining = typename tag_cast
+                                    >,
+    typename CastedTagContaining = tag_cast_t
                                     <
-                                        typename tag<GeometryContaining>::type,
+                                        tag_t<GeometryContaining>,
                                         pointlike_tag, linear_tag, polygonal_tag, areal_tag
-                                    >::type,
-    typename CsTagContained = typename tag_cast
+                                    >,
+    typename CsTagContained = tag_cast_t
                                 <
-                                    typename cs_tag<typename point_type<GeometryContained>::type>::type,
+                                    cs_tag_t<point_type_t<GeometryContained>>,
                                     spherical_tag
-                                >::type,
-    typename CsTagContaining = typename tag_cast
+                                >,
+    typename CsTagContaining = tag_cast_t
                                 <
-                                    typename cs_tag<typename point_type<GeometryContaining>::type>::type,
+                                    cs_tag_t<point_type_t<GeometryContaining>>,
                                     spherical_tag
-                                >::type
+                                >
 >
 struct default_strategy
 {
diff --git a/inst/include/boost/geometry/strategy/relate.hpp b/inst/include/boost/geometry/strategy/relate.hpp
index fa523d846..507d5ad05 100644
--- a/inst/include/boost/geometry/strategy/relate.hpp
+++ b/inst/include/boost/geometry/strategy/relate.hpp
@@ -90,19 +90,12 @@ namespace detail
 
 template <typename Geometry>
 struct default_intersection_strategy
-    : strategy::intersection::services::default_strategy
-        <
-            typename cs_tag<Geometry>::type
-        >
+    : strategy::intersection::services::default_strategy<cs_tag_t<Geometry>>
 {};
 
 template <typename PointLike, typename Geometry>
 struct default_point_in_geometry_strategy
-    : point_in_geometry::services::default_strategy
-        <
-            typename point_type<PointLike>::type,
-            Geometry
-        >
+    : point_in_geometry::services::default_strategy<point_type_t<PointLike>, Geometry>
 {};
 
 } // namespace detail
diff --git a/inst/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp b/inst/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp
index 7302c41be..049360892 100644
--- a/inst/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp
+++ b/inst/include/boost/geometry/strategy/spherical/envelope_multipoint.hpp
@@ -210,8 +210,8 @@ class spherical_multipoint
     template <typename MultiPoint, typename Box>
     static inline void apply(MultiPoint const& multipoint, Box& mbr)
     {
-        typedef typename point_type<MultiPoint>::type point_type;
-        typedef typename coordinate_type<MultiPoint>::type coordinate_type;
+        using point_type = point_type_t<MultiPoint>;
+        using coordinate_type = coordinate_type_t<MultiPoint>;
         typedef math::detail::constants_on_spheroid
             <
                 coordinate_type,
diff --git a/inst/include/boost/geometry/strategy/spherical/envelope_point.hpp b/inst/include/boost/geometry/strategy/spherical/envelope_point.hpp
index d11b38b21..9a52d9176 100644
--- a/inst/include/boost/geometry/strategy/spherical/envelope_point.hpp
+++ b/inst/include/boost/geometry/strategy/spherical/envelope_point.hpp
@@ -52,7 +52,7 @@ struct spherical_point
         Point normalized_point;
         strategy::normalize::spherical_point::apply(point, normalized_point);
 
-        typename point_type<Box>::type box_point;
+        point_type_t<Box> box_point;
 
         // transform units of input point to units of a box point
         geometry::detail::envelope::transform_units(normalized_point, box_point);
diff --git a/inst/include/boost/geometry/strategy/spherical/envelope_segment.hpp b/inst/include/boost/geometry/strategy/spherical/envelope_segment.hpp
index 428f0f71a..75db51a76 100644
--- a/inst/include/boost/geometry/strategy/spherical/envelope_segment.hpp
+++ b/inst/include/boost/geometry/strategy/spherical/envelope_segment.hpp
@@ -16,7 +16,6 @@
 #include <utility>
 
 #include <boost/core/ignore_unused.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/algorithms/detail/envelope/transform_units.hpp>
 
@@ -40,6 +39,7 @@
 #include <boost/geometry/strategy/spherical/expand_box.hpp>
 
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 
 namespace boost { namespace geometry { namespace strategy { namespace envelope
 {
@@ -288,22 +288,22 @@ class envelope_segment_impl
         geometry::set
             <
                 min_corner, 0
-            >(helper_mbr, boost::numeric_cast<box_coordinate_type>(lon1));
+            >(helper_mbr, util::numeric_cast<box_coordinate_type>(lon1));
 
         geometry::set
             <
                 min_corner, 1
-            >(helper_mbr, boost::numeric_cast<box_coordinate_type>(lat1));
+            >(helper_mbr, util::numeric_cast<box_coordinate_type>(lat1));
 
         geometry::set
             <
                 max_corner, 0
-            >(helper_mbr, boost::numeric_cast<box_coordinate_type>(lon2));
+            >(helper_mbr, util::numeric_cast<box_coordinate_type>(lon2));
 
         geometry::set
             <
                 max_corner, 1
-            >(helper_mbr, boost::numeric_cast<box_coordinate_type>(lat2));
+            >(helper_mbr, util::numeric_cast<box_coordinate_type>(lat2));
 
         geometry::detail::envelope::transform_units(helper_mbr, mbr);
     }
@@ -343,7 +343,7 @@ class envelope_segment_impl
                              Box& mbr,
                              Strategy const& strategy)
     {
-        typedef envelope_segment_convert_polar<Units, typename cs_tag<Box>::type> convert_polar;
+        typedef envelope_segment_convert_polar<Units, cs_tag_t<Box>> convert_polar;
 
         convert_polar::pre(lat1, lat2);
 
diff --git a/inst/include/boost/geometry/strategy/spherical/expand_box.hpp b/inst/include/boost/geometry/strategy/spherical/expand_box.hpp
index 9400f0cc4..3e775d309 100644
--- a/inst/include/boost/geometry/strategy/spherical/expand_box.hpp
+++ b/inst/include/boost/geometry/strategy/spherical/expand_box.hpp
@@ -38,6 +38,8 @@
 
 #include <boost/geometry/strategy/expand.hpp>
 
+#include <boost/geometry/util/is_inverse_spheroidal_coordinates.hpp>
+
 #include <boost/geometry/views/detail/indexed_point_view.hpp>
 
 namespace boost { namespace geometry
diff --git a/inst/include/boost/geometry/strategy/spherical/expand_point.hpp b/inst/include/boost/geometry/strategy/spherical/expand_point.hpp
index 354a4c8cf..e3a879356 100644
--- a/inst/include/boost/geometry/strategy/spherical/expand_point.hpp
+++ b/inst/include/boost/geometry/strategy/spherical/expand_point.hpp
@@ -61,15 +61,14 @@ struct point_loop_on_spheroid
     template <typename Box, typename Point>
     static inline void apply(Box& box, Point const& point)
     {
-        typedef typename point_type<Box>::type box_point_type;
-        typedef typename coordinate_type<Box>::type box_coordinate_type;
-        typedef typename geometry::detail::cs_angular_units<Box>::type units_type;
-
-        typedef math::detail::constants_on_spheroid
+        using box_point_type = point_type_t<Box>;
+        using box_coordinate_type = coordinate_type_t<Box>;
+        using units_type = typename geometry::detail::cs_angular_units<Box>::type;
+        using constants = math::detail::constants_on_spheroid
             <
                 box_coordinate_type,
                 units_type
-            > constants;
+            >;
 
         // normalize input point and input box
         Point p_normalized;
@@ -189,7 +188,7 @@ struct spherical_point
         expand::detail::point_loop_on_spheroid
             <
                 dimension<Point>::value,
-                ! std::is_same<typename cs_tag<Point>::type, spherical_polar_tag>::value
+                ! std::is_same<cs_tag_t<Point>, spherical_polar_tag>::value
             >::apply(box, point);
     }
 };
diff --git a/inst/include/boost/geometry/util/bounds.hpp b/inst/include/boost/geometry/util/bounds.hpp
new file mode 100644
index 000000000..dbd3920ff
--- /dev/null
+++ b/inst/include/boost/geometry/util/bounds.hpp
@@ -0,0 +1,28 @@
+// Boost.Geometry
+
+// Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_UTIL_BOUNDS_HPP
+#define BOOST_GEOMETRY_UTIL_BOUNDS_HPP
+
+#include <boost/numeric/conversion/bounds.hpp>
+
+namespace boost { namespace geometry { namespace util
+{
+
+// Define a boost::geometry::util::bounds
+// It might be specialized for other numeric types, for example Boost.Rational
+template<class CT>
+struct bounds
+{
+  static CT lowest  () { return boost::numeric::bounds<CT>::lowest(); }
+  static CT highest () { return boost::numeric::bounds<CT>::highest(); }
+};
+
+}}} // namespace boost::geometry::util
+
+#endif // BOOST_GEOMETRY_UTIL_BOUNDS_HPP
diff --git a/inst/include/boost/geometry/util/for_each_with_index.hpp b/inst/include/boost/geometry/util/for_each_with_index.hpp
deleted file mode 100644
index 425f2a497..000000000
--- a/inst/include/boost/geometry/util/for_each_with_index.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Boost.Geometry
-
-// Copyright (c) 2023 Barend Gehrels, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_UTIL_FOR_EACH_WITH_INDEX_HPP
-#define BOOST_GEOMETRY_UTIL_FOR_EACH_WITH_INDEX_HPP
-
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/range/size_type.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-// Utility function to implement a Kotlin like range based for loop
-template <typename Container, typename Function>
-inline void for_each_with_index(Container const& container, Function func)
-{
-    typename boost::range_size<Container>::type index = 0;
-    for (auto it = boost::begin(container); it != boost::end(container); ++it, ++index)
-    {
-        func(index, *it);
-    }
-}
-
-template <typename Container, typename Function>
-inline void for_each_with_index(Container& container, Function func)
-{
-    typename boost::range_size<Container>::type index = 0;
-    for (auto it = boost::begin(container); it != boost::end(container); ++it, ++index)
-    {
-        func(index, *it);
-    }
-}
-
-} // namespace detail
-#endif // DOXYGEN_NO_DETAIL
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_UTIL_FOR_EACH_WITH_INDEX_HPP
diff --git a/inst/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp b/inst/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp
index 59746653a..3e9e7bd00 100644
--- a/inst/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp
+++ b/inst/include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp
@@ -16,26 +16,20 @@
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/core/point_type.hpp>
 
+#include <boost/geometry/util/bounds.hpp>
 #include <boost/geometry/util/math.hpp>
 
 namespace boost { namespace geometry
 {
 
-template<class CT>
-struct bounds
-{
-  static CT lowest  () { return boost::numeric::bounds<CT>::lowest(); }
-  static CT highest () { return boost::numeric::bounds<CT>::highest(); }
-};
-
 template <typename Box>
 bool is_inverse_spheroidal_coordinates(Box const& box)
 {
-    typedef typename point_type<Box>::type point_type;
-    typedef typename coordinate_type<point_type>::type bound_type;
+    using point_type = point_type_t<Box>;
+    using bound_type = coordinate_type_t<point_type>;
 
-    bound_type high = bounds<bound_type>::highest();
-    bound_type low = bounds<bound_type>::lowest();
+    bound_type const high = util::bounds<bound_type>::highest();
+    bound_type const low = util::bounds<bound_type>::lowest();
 
     return (geometry::get<0, 0>(box) == high) &&
            (geometry::get<0, 1>(box) == high) &&
diff --git a/inst/include/boost/geometry/util/math.hpp b/inst/include/boost/geometry/util/math.hpp
index edd0f412c..ed011da72 100644
--- a/inst/include/boost/geometry/util/math.hpp
+++ b/inst/include/boost/geometry/util/math.hpp
@@ -31,10 +31,10 @@
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 //#include <boost/math/special_functions/round.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
 namespace boost { namespace geometry
@@ -351,7 +351,7 @@ struct square_root<T, true>
         return square_root_for_fundamental_fp
             <
                 double
-            >::apply(boost::numeric_cast<double>(value));
+            >::apply(util::numeric_cast<double>(value));
     }
 };
 
@@ -499,7 +499,7 @@ struct rounding_cast
 {
     static inline Result apply(Source const& v)
     {
-        return boost::numeric_cast<Result>(v);
+        return util::numeric_cast<Result>(v);
     }
 };
 
@@ -519,7 +519,7 @@ struct rounding_cast<Result, Source, true, false>
 {
     static inline Result apply(Source const& v)
     {
-        return boost::numeric_cast<Result>(v < Source(0) ?
+        return util::numeric_cast<Result>(v < Source(0) ?
                                             v - Source(0.5) :
                                             v + Source(0.5));
     }
diff --git a/inst/include/boost/geometry/util/numeric_cast.hpp b/inst/include/boost/geometry/util/numeric_cast.hpp
new file mode 100644
index 000000000..3809ebae7
--- /dev/null
+++ b/inst/include/boost/geometry/util/numeric_cast.hpp
@@ -0,0 +1,45 @@
+// Boost.Geometry
+
+// Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_UTIL_NUMERIC_CAST_HPP
+#define BOOST_GEOMETRY_UTIL_NUMERIC_CAST_HPP
+
+#include <boost/numeric/conversion/cast.hpp>
+
+namespace boost { namespace geometry { namespace util
+
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+/// brief calls numeric cast
+template <typename Target, typename Source>
+struct numeric_caster
+{
+    static inline Target apply(Source const& source)
+    {
+        return boost::numeric_cast<Target>(source);
+    }
+};
+
+} // namespace detail
+#endif
+
+// Calls either boost::numeric_cast, or functionality specific for Boost.Geometry
+// (such as rational_cast for Boost.Rational)
+template <typename Target, typename Source>
+inline Target numeric_cast(Source const& source)
+{
+    return detail::numeric_caster<Target, Source>::apply(source);
+}
+
+}}} // namespace boost::geometry::util
+
+#endif // BOOST_GEOMETRY_UTIL_NUMERIC_CAST_HPP
diff --git a/inst/include/boost/geometry/util/precise_math.hpp b/inst/include/boost/geometry/util/precise_math.hpp
index fb1b07845..2d367e552 100644
--- a/inst/include/boost/geometry/util/precise_math.hpp
+++ b/inst/include/boost/geometry/util/precise_math.hpp
@@ -328,7 +328,7 @@ inline RealNumber orient2dtail(vec2d<RealNumber> const& p1,
         * std::numeric_limits<RealNumber>::epsilon();
     absolute_bound = C_relative_bound * magnitude + sub_bound * std::abs(det);
     det += (t1[0] * t2[1] + t2[0] * t1[1]) - (t3[0] * t4[1] + t4[0] * t3[1]);
-    if (Robustness == 2 || std::abs(det) >= absolute_bound)
+    if (BOOST_GEOMETRY_CONDITION(Robustness == 2) || std::abs(det) >= absolute_bound)
     {
         return det; //C estimate
     }
@@ -457,7 +457,10 @@ RealNumber incircle(std::array<RealNumber, 2> const& p1,
     RealNumber det = A_13 * (A_21_x_A_32[0] - A_31_x_A_22[0])
       + A_23 * (A_31_x_A_12[0] - A_11_x_A_32[0])
       + A_33 * (A_11_x_A_22[0] - A_21_x_A_12[0]);
-    if(Robustness == 0) return det;
+    if (BOOST_GEOMETRY_CONDITION(Robustness == 0))
+    {
+        return det;
+    }
 
     RealNumber magnitude =
           (std::abs(A_21_x_A_32[0]) + std::abs(A_31_x_A_22[0])) * A_13
@@ -585,7 +588,10 @@ RealNumber incircle(std::array<RealNumber, 2> const& p1,
     det = std::accumulate(det_expansion.begin(),
                           det_expansion.begin() + det_expansion_nz,
                           static_cast<RealNumber>(0));
-    if(Robustness == 1) return det;
+    if (BOOST_GEOMETRY_CONDITION(Robustness == 1))
+    {
+        return det;
+    }
     RealNumber B_relative_bound =
           (2 + 12 * std::numeric_limits<RealNumber>::epsilon())
         * std::numeric_limits<RealNumber>::epsilon();
diff --git a/inst/include/boost/geometry/util/rational.hpp b/inst/include/boost/geometry/util/rational.hpp
index 2e8b751ad..bfe6161e7 100644
--- a/inst/include/boost/geometry/util/rational.hpp
+++ b/inst/include/boost/geometry/util/rational.hpp
@@ -14,10 +14,13 @@
 #ifndef BOOST_GEOMETRY_UTIL_RATIONAL_HPP
 #define BOOST_GEOMETRY_UTIL_RATIONAL_HPP
 
+// Contains specializations for Boost.Rational
+
 #include <boost/rational.hpp>
-#include <boost/numeric/conversion/bounds.hpp>
 
+#include <boost/geometry/util/bounds.hpp>
 #include <boost/geometry/util/coordinate_cast.hpp>
+#include <boost/geometry/util/numeric_cast.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
 
@@ -110,70 +113,46 @@ struct select_most_precise<boost::rational<T>, double>
     typedef typename boost::rational<T> type;
 };
 
+namespace util
+{
 
-}} // namespace boost::geometry
-
-
-// Specializes boost::rational to boost::numeric::bounds
-namespace boost { namespace numeric
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
 {
 
-template<class T>
-struct bounds<rational<T> >
+// Specialize numeric_caster, needed for geomery::util::numeric_cast, for Boost.Rational
+// Without it, code using Boost.Rational does not compile
+template <typename Target, typename T>
+struct numeric_caster<Target, rational<T>>
 {
-    static inline rational<T> lowest()
+   static inline Target apply(rational<T> const& source)
     {
-        return rational<T>(bounds<T>::lowest(), 1);
-    }
-    static inline rational<T> highest()
-    {
-        return rational<T>(bounds<T>::highest(), 1);
+        return boost::rational_cast<Target>(source);
     }
 };
 
-}} // namespace boost::numeric
-
+} // namespace detail
+#endif
 
-// Support for boost::numeric_cast to int and to double (necessary for SVG-mapper)
-namespace boost { namespace numeric
-{
 
-template
-<
-    typename T,
-    typename Traits,
-    typename OverflowHandler,
-    typename Float2IntRounder,
-    typename RawConverter,
-    typename UserRangeChecker
->
-struct converter<int, rational<T>, Traits, OverflowHandler, Float2IntRounder, RawConverter, UserRangeChecker>
+// Specializes geometry::util::bounds for Boost.Rational
+// Without it, bounds contains (0,1) by default for Boost.Rational
+template<class T>
+struct bounds<rational<T> >
 {
-    static inline int convert(rational<T> const& arg)
+    static inline rational<T> lowest()
     {
-        return int(rational_cast<double>(arg));
+        return rational<T>(bounds<T>::lowest(), 1);
     }
-};
-
-template
-<
-    typename T,
-    typename Traits,
-    typename OverflowHandler,
-    typename Float2IntRounder,
-    typename RawConverter,
-    typename UserRangeChecker
->
-struct converter<double, rational<T>, Traits, OverflowHandler, Float2IntRounder, RawConverter, UserRangeChecker>
-{
-    static inline double convert(rational<T> const& arg)
+    static inline rational<T> highest()
     {
-        return rational_cast<double>(arg);
+        return rational<T>(bounds<T>::highest(), 1);
     }
 };
 
+} // namespace util
 
-}}
+}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_UTIL_RATIONAL_HPP
diff --git a/inst/include/boost/geometry/util/type_traits.hpp b/inst/include/boost/geometry/util/type_traits.hpp
index c58b5bad0..ef9d1979f 100644
--- a/inst/include/boost/geometry/util/type_traits.hpp
+++ b/inst/include/boost/geometry/util/type_traits.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry
 
-// Copyright (c) 2020-2021, Oracle and/or its affiliates.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2020-2021, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -26,86 +27,130 @@ namespace util
 
 template <typename T>
 struct is_geometry
-    : bool_constant<! std::is_void<typename tag<T>::type>::value>
+    : bool_constant<! std::is_void<tag_t<T>>::value>
 {};
 
 template <typename T>
 struct is_not_geometry
-    : std::is_void<typename tag<T>::type>
+    : std::is_void<tag_t<T>>
 {};
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename T>
+inline constexpr bool is_geometry_v = is_geometry<T>::value;
+template <typename T>
+inline constexpr bool is_not_geometry_v = is_not_geometry<T>::value;
+#endif
+
 template <typename T>
 struct is_point
-    : std::is_same<point_tag, typename tag<T>::type>
+    : std::is_same<point_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_multi_point
-    : std::is_same<multi_point_tag, typename tag<T>::type>
+    : std::is_same<multi_point_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_pointlike
-    : std::is_base_of<pointlike_tag, typename tag<T>::type>
+    : std::is_base_of<pointlike_tag, tag_t<T>>
 {};
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename T>
+inline constexpr bool is_point_v = is_point<T>::value;
+template <typename T>
+inline constexpr bool is_multi_point_v = is_multi_point<T>::value;
+template <typename T>
+inline constexpr bool is_pointlike_v = is_pointlike<T>::value;
+#endif
+
 
 template <typename T>
 struct is_segment
-    : std::is_same<segment_tag, typename tag<T>::type>
+    : std::is_same<segment_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_linestring
-    : std::is_same<linestring_tag, typename tag<T>::type>
+    : std::is_same<linestring_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_multi_linestring
-    : std::is_same<multi_linestring_tag, typename tag<T>::type>
+    : std::is_same<multi_linestring_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_polylinear
-    : std::is_base_of<polylinear_tag, typename tag<T>::type>
+    : std::is_base_of<polylinear_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_linear
-    : std::is_base_of<linear_tag, typename tag<T>::type>
+    : std::is_base_of<linear_tag, tag_t<T>>
 {};
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename T>
+inline constexpr bool is_segment_v = is_segment<T>::value;
+template <typename T>
+inline constexpr bool is_linestring_v = is_linestring<T>::value;
+template <typename T>
+inline constexpr bool is_multi_linestring_v = is_multi_linestring<T>::value;
+template <typename T>
+inline constexpr bool is_polylinear_v = is_polylinear<T>::value;
+template <typename T>
+inline constexpr bool is_linear_v = is_linear<T>::value;
+#endif
+
 
 template <typename T>
 struct is_box
-    : std::is_same<box_tag, typename tag<T>::type>
+    : std::is_same<box_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_ring
-    : std::is_same<ring_tag, typename tag<T>::type>
+    : std::is_same<ring_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_polygon
-    : std::is_same<polygon_tag, typename tag<T>::type>
+    : std::is_same<polygon_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_multi_polygon
-    : std::is_same<multi_polygon_tag, typename tag<T>::type>
+    : std::is_same<multi_polygon_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_polygonal
-    : std::is_base_of<polygonal_tag, typename tag<T>::type>
+    : std::is_base_of<polygonal_tag, tag_t<T>>
 {};
 
 template <typename T>
 struct is_areal
-    : std::is_base_of<areal_tag, typename tag<T>::type>
+    : std::is_base_of<areal_tag, tag_t<T>>
 {};
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename T>
+inline constexpr bool is_box_v = is_box<T>::value;
+template <typename T>
+inline constexpr bool is_ring_v = is_ring<T>::value;
+template <typename T>
+inline constexpr bool is_polygon_v = is_polygon<T>::value;
+template <typename T>
+inline constexpr bool is_multi_polygon_v = is_multi_polygon<T>::value;
+template <typename T>
+inline constexpr bool is_polygonal_v = is_polygonal<T>::value;
+template <typename T>
+inline constexpr bool is_areal_v = is_areal<T>::value;
+#endif
+
 
 template <typename T>
 struct is_segmental
@@ -117,36 +162,48 @@ struct is_polysegmental
     : bool_constant<is_polylinear<T>::value || is_polygonal<T>::value>
 {};
 
-
 template <typename T>
 struct is_multi
-    : std::is_base_of<multi_tag, typename tag<T>::type>
+    : std::is_base_of<multi_tag, tag_t<T>>
 {};
 
-
 template <typename T>
 struct is_multi_element
     : bool_constant<is_point<T>::value || is_linestring<T>::value || is_polygon<T>::value>
 {};
 
-
 template <typename T>
 struct is_single
-    : std::is_base_of<single_tag, typename tag<T>::type>
+    : std::is_base_of<single_tag, tag_t<T>>
 {};
 
-
 template <typename T>
 struct is_geometry_collection
-    : std::is_same<geometry_collection_tag, typename tag<T>::type>
+    : std::is_same<geometry_collection_tag, tag_t<T>>
 {};
 
-
 template <typename T>
 struct is_dynamic_geometry
-    : std::is_same<dynamic_geometry_tag, typename tag<T>::type>
+    : std::is_same<dynamic_geometry_tag, tag_t<T>>
 {};
 
+#ifndef BOOST_NO_CXX17_INLINE_VARIABLES
+template <typename T>
+inline constexpr bool is_segmental_v = is_segmental<T>::value;
+template <typename T>
+inline constexpr bool is_polysegmental_v = is_polysegmental<T>::value;
+template <typename T>
+inline constexpr bool is_multi_v = is_multi<T>::value;
+template <typename T>
+inline constexpr bool is_multi_element_v = is_multi_element<T>::value;
+template <typename T>
+inline constexpr bool is_single_v = is_single<T>::value;
+template <typename T>
+inline constexpr bool is_geometry_collection_v = is_geometry_collection<T>::value;
+template <typename T>
+inline constexpr bool is_dynamic_geometry_v = is_dynamic_geometry<T>::value;
+#endif
+
 
 template <typename Geometry, typename T = void>
 struct enable_if_point
@@ -307,7 +364,8 @@ using enable_if_geometry_collection_t = typename enable_if_geometry_collection<G
     \note Also a "ring" has areal properties within Boost.Geometry
     \ingroup core
 */
-using util::is_areal;
+template <typename T>
+using is_areal [[deprecated("Use util::is_areal<> instead.")]] = util::is_areal<T>;
 
 
 }} // namespace boost::geometry
diff --git a/inst/include/boost/geometry/util/type_traits_std.hpp b/inst/include/boost/geometry/util/type_traits_std.hpp
index ebff13b3e..3773feac3 100644
--- a/inst/include/boost/geometry/util/type_traits_std.hpp
+++ b/inst/include/boost/geometry/util/type_traits_std.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry
 
-// Copyright (c) 2020, Oracle and/or its affiliates.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
+// Copyright (c) 2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
@@ -54,6 +55,7 @@ struct conjunction<Trait, Traits...>
     : std::conditional_t<Trait::value, conjunction<Traits...>, Trait>
 {};
 
+
 // C++17
 template <typename ...>
 struct disjunction
@@ -68,6 +70,7 @@ struct disjunction<Trait, Traits...>
     : std::conditional_t<Trait::value, Trait, disjunction<Traits...>>
 {};
 
+
 // C++17
 template <typename Trait>
 struct negation
@@ -195,22 +198,21 @@ using transcribe_cref_t = typename transcribe_cref<From, To>::type;
     \endcode
 */
 template <bool IsConst, typename Type>
-struct add_const_if_c
-{
-    typedef std::conditional_t
+struct [[deprecated("Use util::transcribe_const<> instead.")]] add_const_if_c
+    : std::conditional
         <
             IsConst,
             Type const,
             Type
-        > type;
-};
+        >
+{};
 
 
 namespace util
 {
 
 template <typename T>
-using bare_type = remove_cptrref<T>;
+using bare_type [[deprecated("Use util::remove_cptrref<> instead.")]] = remove_cptrref<T>;
 
 } // namespace util
 
diff --git a/inst/include/boost/geometry/views/enumerate_view.hpp b/inst/include/boost/geometry/views/enumerate_view.hpp
new file mode 100644
index 000000000..65f3beed9
--- /dev/null
+++ b/inst/include/boost/geometry/views/enumerate_view.hpp
@@ -0,0 +1,159 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_VIEWS_ENUMERATE_VIEW_HPP
+#define BOOST_GEOMETRY_VIEWS_ENUMERATE_VIEW_HPP
+
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_categories.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/difference_type.hpp>
+#include <boost/range/reference.hpp>
+#include <boost/range/value_type.hpp>
+
+#include <boost/geometry/util/type_traits_std.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace util
+{
+
+// This view is a range of values, each with an index
+// It is used to iterate over a range, and to get the index of the value
+// It is used in the enumerate function
+// The typename Range can either be const or non-const
+template <typename Range>
+struct enumerated_view
+{
+    // The return value of the iterator
+    struct value_with_index
+    {
+        using type = util::transcribe_const_t
+            <
+                Range,
+                typename boost::range_value<Range>::type
+            >;
+
+        // Member variable index contains the zero-based index of the value in the range
+        std::size_t const index;
+
+        // Member variable value contains a const or non-const reference to the value itself
+        type& value;  
+    };
+
+private:
+    // Iterator implementation, not exposed.
+    struct enumerating_iterator
+        : public boost::iterator_facade
+        <
+            enumerating_iterator,
+            value_with_index const,
+            boost::random_access_traversal_tag,
+            value_with_index const,
+            typename boost::range_difference<Range>::type
+        >
+    {
+        using reference = value_with_index;
+        using difference_type = typename boost::range_difference<Range>::type;
+
+        // Constructor with the range it handles
+        explicit inline enumerating_iterator(Range& range)
+            : m_begin(boost::begin(range))
+            , m_end(boost::end(range))
+            , m_iterator(boost::begin(range))
+        {}
+
+        // Constructor to indicate the end of a range
+        explicit inline enumerating_iterator(Range& range, bool)
+            : m_begin(boost::begin(range))
+            , m_end(boost::end(range))
+            , m_iterator(boost::end(range))
+        {}
+
+        // There is no default constructor
+        enumerating_iterator() = delete;
+
+        inline reference dereference() const
+        {
+            constexpr difference_type zero = 0;
+            const std::size_t index = (std::max)(zero, std::distance(m_begin, m_iterator));
+            const value_with_index result{index, *m_iterator};
+            return result;
+        }
+
+        inline difference_type distance_to(enumerating_iterator const& other) const
+        {
+            return std::distance(other.m_iterator, m_iterator);
+        }
+
+        inline bool equal(enumerating_iterator const& other) const
+        {
+            return
+                m_begin == other.m_begin 
+                && m_end == other.m_end 
+                && m_iterator == other.m_iterator;
+        }
+
+        inline void increment()
+        {
+            ++m_iterator;
+        }
+
+        inline void decrement()
+        {
+            --m_iterator;
+        }
+
+        inline void advance(difference_type n)
+        {
+            std::advance(m_iterator, n);
+        }
+
+        const typename boost::range_iterator<Range>::type m_begin;
+        const typename boost::range_iterator<Range>::type m_end;
+
+        typename boost::range_iterator<Range>::type m_iterator;
+    };
+
+public:
+    using iterator = enumerating_iterator;
+    using const_iterator = enumerating_iterator;
+
+    explicit inline enumerated_view(Range& range)
+        : m_begin(range)
+        , m_end(range, true)
+    {}
+
+    inline iterator begin() const { return m_begin; }
+    inline iterator end() const { return m_end; }
+
+private:
+    const iterator m_begin;
+    const iterator m_end;
+};
+
+// Helper function to create the enumerated view, for a const range
+template <typename Range>
+inline auto enumerate(Range const& range)
+{
+    return util::enumerated_view<Range const>(range);    
+}
+
+// Helper function to create the enumerated view, for a non-const range
+template <typename Range>
+inline auto enumerate(Range& range)
+{
+    return util::enumerated_view<Range>(range);    
+}
+
+}}} // boost::geometry::util
+
+
+#endif // BOOST_GEOMETRY_VIEWS_ENUMERATE_VIEW_HPP
diff --git a/inst/include/boost/graph/bandwidth.hpp b/inst/include/boost/graph/bandwidth.hpp
index 9d08ea54c..e3f99adf5 100644
--- a/inst/include/boost/graph/bandwidth.hpp
+++ b/inst/include/boost/graph/bandwidth.hpp
@@ -10,6 +10,7 @@
 #include <algorithm> // for std::min and std::max
 #include <boost/config.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/detail/numeric_traits.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/chrobak_payne_drawing.hpp b/inst/include/boost/graph/chrobak_payne_drawing.hpp
index fc3ca40d3..68106267c 100644
--- a/inst/include/boost/graph/chrobak_payne_drawing.hpp
+++ b/inst/include/boost/graph/chrobak_payne_drawing.hpp
@@ -14,6 +14,7 @@
 #include <stack>
 #include <boost/config.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/property_map/property_map.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/circle_layout.hpp b/inst/include/boost/graph/circle_layout.hpp
index f30ee65be..f295bd20b 100644
--- a/inst/include/boost/graph/circle_layout.hpp
+++ b/inst/include/boost/graph/circle_layout.hpp
@@ -14,6 +14,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/topology.hpp>
+#include <boost/property_map/property_map.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/detail/adjacency_list.hpp b/inst/include/boost/graph/detail/adjacency_list.hpp
index 7fb2c4936..ed5a1d483 100644
--- a/inst/include/boost/graph/detail/adjacency_list.hpp
+++ b/inst/include/boost/graph/detail/adjacency_list.hpp
@@ -2189,8 +2189,12 @@ class vec_adj_list_impl : public adj_list_helper< Config, Base >
         }
         // Copy the edges by adding each edge and copying its
         // property object.
+#ifdef BOOST_NO_CXX17_STRUCTURED_BINDINGS
         edge_iterator ei, ei_end;
         for (boost::tie(ei, ei_end) = edges(x); ei != ei_end; ++ei)
+#else // Silences -Wmaybe-uninitialized in adj_list_edge_iterator::operator++().
+        for (auto [ei, ei_end] = edges(x); ei != ei_end; ++ei)
+#endif
         {
             edge_descriptor e;
             bool inserted;
diff --git a/inst/include/boost/graph/detail/index.hpp b/inst/include/boost/graph/detail/index.hpp
index 1565c57c8..7ffc843fc 100644
--- a/inst/include/boost/graph/detail/index.hpp
+++ b/inst/include/boost/graph/detail/index.hpp
@@ -8,6 +8,7 @@
 #define BOOST_GRAPH_DETAIL_INDEX_HPP
 
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 
 // The structures in this module are responsible for selecting and defining
 // types for accessing a builting index map. Note that the selection of these
diff --git a/inst/include/boost/graph/detail/read_graphviz_spirit.hpp b/inst/include/boost/graph/detail/read_graphviz_spirit.hpp
index b39ad7d63..165007766 100644
--- a/inst/include/boost/graph/detail/read_graphviz_spirit.hpp
+++ b/inst/include/boost/graph/detail/read_graphviz_spirit.hpp
@@ -171,7 +171,7 @@ namespace detail
                         = construct_< std::string >(arg1, arg2)];
 
                     a_list = list_p(
-                        ID[(a_list.key = arg1), (a_list.value = "true")] >> !(
+                        ID[((a_list.key = arg1), (a_list.value = "true"))] >> !(
                             ch_p('=') >> ID[a_list.value = arg1])[phoenix::bind(
                             &definition::call_prop_actor)(
                             var(*this), a_list.key, a_list.value)],
@@ -213,8 +213,8 @@ namespace detail
                     // (directed/undirected)
                     edgeop = ch_p('-') >> ch_p(boost::ref(edge_head));
 
-                    edgeRHS = +(edgeop[(data_stmt.sources = data_stmt.dests),
-                                    (data_stmt.dests = construct_< nodes_t >())]
+                    edgeRHS = +(edgeop[((data_stmt.sources = data_stmt.dests),
+                                    (data_stmt.dests = construct_< nodes_t >()))]
                         >> (subgraph[data_stmt.dests = arg1]
                             | node_id[phoenix::bind(&definition::insert_node)(
                                 var(*this), data_stmt.dests, arg1)])
@@ -225,10 +225,10 @@ namespace detail
                     // To avoid backtracking, edge, node, and subgraph
                     // statements are processed as one nonterminal.
                     data_stmt
-                        = (subgraph[(data_stmt.dests
+                        = (subgraph[((data_stmt.dests
                                         = arg1), // will get moved in rhs
-                               (data_stmt.saw_node = false)]
-                              | node_id[(phoenix::bind(
+                               (data_stmt.saw_node = false))]
+                              | node_id[((phoenix::bind(
                                             &definition::insert_node)(
                                             var(*this), data_stmt.dests, arg1)),
                                   (data_stmt.saw_node = true),
@@ -236,7 +236,7 @@ namespace detail
                                   (std::cout << val("AcTive Node: ") << arg1
                                              << "\n"),
 #endif // BOOST_GRAPH_DEBUG
-                                  (data_stmt.active_node = arg1)])
+                                  (data_stmt.active_node = arg1))])
                         >> if_p(edgeRHS)[!attr_list(actor_t(phoenix::bind(
                                              &definition::edge_prop)(
                                              var(*this), arg1, arg2)))]
@@ -252,11 +252,11 @@ namespace detail
                     stmt_list = *(stmt >> !ch_p(';'));
 
                     subgraph = !(as_lower_d[keyword_p("subgraph")]
-                                   >> (!ID[(subgraph.name = arg1),
+                                   >> (!ID[((subgraph.name = arg1),
                                        (subgraph.nodes
                                            = (var(subgraph_nodes))[arg1]),
                                        (subgraph.edges
-                                           = (var(subgraph_edges))[arg1])]))
+                                           = (var(subgraph_edges))[arg1]))]))
                             >> ch_p('{')[++var(subgraph_depth)] >> stmt_list
                             >> ch_p('}')[--var(subgraph_depth)]
                                         [(var(subgraph_nodes))[subgraph.name]
@@ -265,19 +265,19 @@ namespace detail
                                             = subgraph.edges]
 
                         | as_lower_d[keyword_p("subgraph")]
-                            >> ID[(subgraph.nodes
+                            >> ID[((subgraph.nodes
                                       = (var(subgraph_nodes))[arg1]),
-                                (subgraph.edges = (var(subgraph_edges))[arg1])];
+                                (subgraph.edges = (var(subgraph_edges))[arg1]))];
 
                     the_grammar = (!as_lower_d[keyword_p("strict")])
                         >> (as_lower_d[keyword_p(
-                                "graph")][(var(edge_head) = '-'),
+                                "graph")][((var(edge_head) = '-'),
                                 (phoenix::bind(&definition::check_undirected)(
-                                    var(*this)))]
+                                    var(*this))))]
                             | as_lower_d[keyword_p(
-                                "digraph")][(var(edge_head) = '>'),
+                                "digraph")][((var(edge_head) = '>'),
                                 (phoenix::bind(&definition::check_directed)(
-                                    var(*this)))])
+                                    var(*this))))])
                         >> (!ID) >> ch_p('{') >> stmt_list >> ch_p('}');
 
                 } // definition()
diff --git a/inst/include/boost/graph/dimacs.hpp b/inst/include/boost/graph/dimacs.hpp
index 584e3056b..d6171d243 100644
--- a/inst/include/boost/graph/dimacs.hpp
+++ b/inst/include/boost/graph/dimacs.hpp
@@ -18,6 +18,7 @@
 #include <vector>
 #include <queue>
 #include <boost/assert.hpp>
+#include <boost/throw_exception.hpp>
 
 namespace boost
 {
diff --git a/inst/include/boost/graph/edge_connectivity.hpp b/inst/include/boost/graph/edge_connectivity.hpp
index 975d329f5..25e7d85a5 100644
--- a/inst/include/boost/graph/edge_connectivity.hpp
+++ b/inst/include/boost/graph/edge_connectivity.hpp
@@ -16,6 +16,7 @@
 #include <vector>
 #include <set>
 #include <algorithm>
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/edmonds_karp_max_flow.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/exception.hpp b/inst/include/boost/graph/exception.hpp
index 81323a361..76f1fa380 100644
--- a/inst/include/boost/graph/exception.hpp
+++ b/inst/include/boost/graph/exception.hpp
@@ -13,6 +13,8 @@
 #include <stdexcept>
 #include <string>
 
+#include <boost/config.hpp>
+
 namespace boost
 {
 
@@ -51,6 +53,53 @@ struct BOOST_SYMBOL_VISIBLE not_complete : public bad_graph
     not_complete() : bad_graph("The graph must be complete.") {}
 };
 
+struct BOOST_SYMBOL_VISIBLE graph_exception : public std::exception
+{
+    ~graph_exception() throw() BOOST_OVERRIDE {}
+    const char* what() const throw() BOOST_OVERRIDE = 0;
+};
+
+struct BOOST_SYMBOL_VISIBLE bad_parallel_edge : public graph_exception
+{
+    std::string from;
+    std::string to;
+    mutable std::string statement;
+    bad_parallel_edge(const std::string& i, const std::string& j)
+    : from(i), to(j)
+    {
+    }
+
+    ~bad_parallel_edge() throw() BOOST_OVERRIDE {}
+    const char* what() const throw() BOOST_OVERRIDE
+    {
+        if (statement.empty())
+            statement = std::string("Failed to add parallel edge: (") + from
+                + "," + to + ")\n";
+
+        return statement.c_str();
+    }
+};
+
+struct BOOST_SYMBOL_VISIBLE directed_graph_error : public graph_exception
+{
+    ~directed_graph_error() throw() BOOST_OVERRIDE {}
+    const char* what() const throw() BOOST_OVERRIDE
+    {
+        return "read_graphviz: "
+               "Tried to read a directed graph into an undirected graph.";
+    }
+};
+
+struct BOOST_SYMBOL_VISIBLE undirected_graph_error : public graph_exception
+{
+    ~undirected_graph_error() throw() BOOST_OVERRIDE {}
+    const char* what() const throw() BOOST_OVERRIDE
+    {
+        return "read_graphviz: "
+               "Tried to read an undirected graph into a directed graph.";
+    }
+};
+
 } // namespace boost
 
 #endif // BOOST_GRAPH_EXCEPTION_HPP
diff --git a/inst/include/boost/graph/graph_mutability_traits.hpp b/inst/include/boost/graph/graph_mutability_traits.hpp
index 333a026d2..064f32ff3 100644
--- a/inst/include/boost/graph/graph_mutability_traits.hpp
+++ b/inst/include/boost/graph/graph_mutability_traits.hpp
@@ -11,6 +11,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/bool.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/graph_stats.hpp b/inst/include/boost/graph/graph_stats.hpp
index 00c84dd86..aff1f3550 100644
--- a/inst/include/boost/graph/graph_stats.hpp
+++ b/inst/include/boost/graph/graph_stats.hpp
@@ -11,7 +11,9 @@
 
 #include <map>
 #include <list>
+#include <boost/graph/graph_traits.hpp>
 #include <boost/graph/iteration_macros.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/assert.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/graph_utility.hpp b/inst/include/boost/graph/graph_utility.hpp
index 4082dbf98..4e5ef141a 100644
--- a/inst/include/boost/graph/graph_utility.hpp
+++ b/inst/include/boost/graph/graph_utility.hpp
@@ -19,6 +19,7 @@
 #include <boost/tuple/tuple.hpp>
 
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/pending/container_traits.hpp>
 #include <boost/graph/depth_first_search.hpp>
@@ -448,8 +449,6 @@ namespace graph
 
 } // namespace graph
 
-#include <boost/graph/iteration_macros.hpp>
-
 template < class PropertyIn, class PropertyOut, class Graph >
 void copy_vertex_property(PropertyIn p_in, PropertyOut p_out, Graph& g)
 {
diff --git a/inst/include/boost/graph/graphml.hpp b/inst/include/boost/graph/graphml.hpp
index 43d79ff97..8c57e1da1 100644
--- a/inst/include/boost/graph/graphml.hpp
+++ b/inst/include/boost/graph/graphml.hpp
@@ -16,12 +16,16 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/any.hpp>
 #include <boost/type_traits/is_convertible.hpp>
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dll_import_export.hpp>
-#include <boost/graph/graphviz.hpp> // for exceptions
+#include <boost/graph/exception.hpp>
+#include <boost/graph/graph_traits.hpp>
+
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/for_each.hpp>
+#include <boost/property_map/dynamic_property_map.hpp>
 #include <boost/property_tree/detail/xml_parser_utils.hpp>
 #include <boost/throw_exception.hpp>
 #include <exception>
diff --git a/inst/include/boost/graph/graphviz.hpp b/inst/include/boost/graph/graphviz.hpp
index 9674d55bc..4b7bd00c5 100644
--- a/inst/include/boost/graph/graphviz.hpp
+++ b/inst/include/boost/graph/graphviz.hpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <boost/property_map/property_map.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/graph/exception.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/graph/subgraph.hpp>
@@ -649,53 +650,6 @@ void write_graphviz_dp(std::ostream& out, const Graph& g,
 /////////////////////////////////////////////////////////////////////////////
 // Graph reader exceptions
 /////////////////////////////////////////////////////////////////////////////
-struct BOOST_SYMBOL_VISIBLE graph_exception : public std::exception
-{
-    ~graph_exception() throw() BOOST_OVERRIDE {}
-    const char* what() const throw() BOOST_OVERRIDE = 0;
-};
-
-struct BOOST_SYMBOL_VISIBLE bad_parallel_edge : public graph_exception
-{
-    std::string from;
-    std::string to;
-    mutable std::string statement;
-    bad_parallel_edge(const std::string& i, const std::string& j)
-    : from(i), to(j)
-    {
-    }
-
-    ~bad_parallel_edge() throw() BOOST_OVERRIDE {}
-    const char* what() const throw() BOOST_OVERRIDE
-    {
-        if (statement.empty())
-            statement = std::string("Failed to add parallel edge: (") + from
-                + "," + to + ")\n";
-
-        return statement.c_str();
-    }
-};
-
-struct BOOST_SYMBOL_VISIBLE directed_graph_error : public graph_exception
-{
-    ~directed_graph_error() throw() BOOST_OVERRIDE {}
-    const char* what() const throw() BOOST_OVERRIDE
-    {
-        return "read_graphviz: "
-               "Tried to read a directed graph into an undirected graph.";
-    }
-};
-
-struct BOOST_SYMBOL_VISIBLE undirected_graph_error : public graph_exception
-{
-    ~undirected_graph_error() throw() BOOST_OVERRIDE {}
-    const char* what() const throw() BOOST_OVERRIDE
-    {
-        return "read_graphviz: "
-               "Tried to read an undirected graph into a directed graph.";
-    }
-};
-
 struct BOOST_SYMBOL_VISIBLE bad_graphviz_syntax : public graph_exception
 {
     std::string errmsg;
diff --git a/inst/include/boost/graph/hawick_circuits.hpp b/inst/include/boost/graph/hawick_circuits.hpp
index ba4065492..cefd6a13a 100644
--- a/inst/include/boost/graph/hawick_circuits.hpp
+++ b/inst/include/boost/graph/hawick_circuits.hpp
@@ -153,13 +153,14 @@ namespace hawick_circuits_detail
     public:
         hawick_circuits_from(Graph const& graph, Visitor& visitor,
             VertexIndexMap const& vim, Stack& stack, ClosedMatrix& closed,
-            VerticesSize n_vertices)
+            VerticesSize n_vertices, unsigned int max_length)
         : graph_(graph)
         , visitor_(visitor)
         , vim_(vim)
         , stack_(stack)
         , closed_(closed)
         , blocked_(n_vertices, vim_)
+        , max_length_(max_length)
         {
             BOOST_ASSERT(blocked_map_starts_all_unblocked());
 
@@ -224,6 +225,10 @@ namespace hawick_circuits_detail
             stack_.push_back(v);
             block(v);
 
+            // Truncate the search if any circuits would exceed max_length_.
+            bool const truncate_search =
+                (max_length_ > 0 && stack_.size() >= max_length_);
+
             // Cache some values that are used more than once in the function.
             VertexIndex const index_of_start = index_of(start);
             AdjacentVertices const adj_vertices
@@ -249,13 +254,19 @@ namespace hawick_circuits_detail
                     found_circuit = true;
                 }
 
+                // If required, truncate the search before the subsequent
+                // recursive call to circuit().
+                else if (truncate_search)
+                    continue;
+
                 // If `w` is not blocked, we continue searching further down the
                 // same path for a cycle with `w` in it.
                 else if (!is_blocked(w) && circuit(start, w))
                     found_circuit = true;
             }
 
-            if (found_circuit)
+            bool const finish_circuit = (found_circuit || truncate_search);
+            if (finish_circuit)
                 unblock(v);
             else
                 for (AdjacencyIterator w_it = boost::begin(adj_vertices);
@@ -274,7 +285,7 @@ namespace hawick_circuits_detail
 
             BOOST_ASSERT(v == stack_.back());
             stack_.pop_back();
-            return found_circuit;
+            return finish_circuit;
         }
 
     public:
@@ -287,12 +298,14 @@ namespace hawick_circuits_detail
         Stack& stack_;
         ClosedMatrix& closed_;
         BlockedMap blocked_;
+        unsigned int max_length_;
     };
 
     template < typename GetAdjacentVertices, typename Graph, typename Visitor,
         typename VertexIndexMap >
     void call_hawick_circuits(Graph const& graph,
-        Visitor /* by value */ visitor, VertexIndexMap const& vertex_index_map)
+        Visitor /* by value */ visitor, VertexIndexMap const& vertex_index_map,
+        unsigned int max_length)
     {
         typedef graph_traits< Graph > Traits;
         typedef typename Traits::vertex_descriptor Vertex;
@@ -322,7 +335,8 @@ namespace hawick_circuits_detail
             // construction. It would be strictly equivalent to have these as
             // member variables of the sub algorithm.
             SubAlgorithm sub_algo(
-                graph, visitor, vertex_index_map, stack, closed, n_vertices);
+                graph, visitor, vertex_index_map, stack, closed, n_vertices,
+                max_length);
             sub_algo(*start);
             stack.clear();
             typename ClosedMatrix::iterator row, last_row = closed.end();
@@ -333,30 +347,35 @@ namespace hawick_circuits_detail
 
     template < typename GetAdjacentVertices, typename Graph, typename Visitor >
     void call_hawick_circuits(
-        Graph const& graph, BOOST_FWD_REF(Visitor) visitor)
+        Graph const& graph, BOOST_FWD_REF(Visitor) visitor,
+        unsigned int max_length)
     {
         call_hawick_circuits< GetAdjacentVertices >(graph,
-            boost::forward< Visitor >(visitor), get(vertex_index, graph));
+            boost::forward< Visitor >(visitor), get(vertex_index, graph),
+            max_length);
     }
 } // end namespace hawick_circuits_detail
 
 //! Enumerate all the elementary circuits in a directed multigraph.
 template < typename Graph, typename Visitor, typename VertexIndexMap >
 void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
-    BOOST_FWD_REF(VertexIndexMap) vertex_index_map)
+    BOOST_FWD_REF(VertexIndexMap) vertex_index_map,
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_all_adjacent_vertices >(
         boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
-        boost::forward< VertexIndexMap >(vertex_index_map));
+        boost::forward< VertexIndexMap >(vertex_index_map), max_length);
 }
 
 template < typename Graph, typename Visitor >
-void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor)
+void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_all_adjacent_vertices >(
-        boost::forward< Graph >(graph), boost::forward< Visitor >(visitor));
+        boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
+        max_length);
 }
 
 /*!
@@ -366,21 +385,24 @@ void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor)
 template < typename Graph, typename Visitor, typename VertexIndexMap >
 void hawick_unique_circuits(BOOST_FWD_REF(Graph) graph,
     BOOST_FWD_REF(Visitor) visitor,
-    BOOST_FWD_REF(VertexIndexMap) vertex_index_map)
+    BOOST_FWD_REF(VertexIndexMap) vertex_index_map,
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_unique_adjacent_vertices >(
         boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
-        boost::forward< VertexIndexMap >(vertex_index_map));
+        boost::forward< VertexIndexMap >(vertex_index_map), max_length);
 }
 
 template < typename Graph, typename Visitor >
 void hawick_unique_circuits(
-    BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor)
+    BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
+    unsigned int max_length = 0)
 {
     hawick_circuits_detail::call_hawick_circuits<
         hawick_circuits_detail::get_unique_adjacent_vertices >(
-        boost::forward< Graph >(graph), boost::forward< Visitor >(visitor));
+        boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
+        max_length);
 }
 } // end namespace boost
 
diff --git a/inst/include/boost/graph/isomorphism.hpp b/inst/include/boost/graph/isomorphism.hpp
index 0deb6e080..5a7d31ddc 100644
--- a/inst/include/boost/graph/isomorphism.hpp
+++ b/inst/include/boost/graph/isomorphism.hpp
@@ -15,6 +15,8 @@
 #include <boost/smart_ptr.hpp>
 #include <boost/graph/depth_first_search.hpp>
 #include <boost/detail/algorithm.hpp>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered/unordered_flat_map.hpp>
 #include <boost/pending/indirect_cmp.hpp> // for make_indirect_pmap
 #include <boost/concept/assert.hpp>
 
@@ -31,22 +33,20 @@ namespace detail
 
     template < typename Graph1, typename Graph2, typename IsoMapping,
         typename Invariant1, typename Invariant2, typename IndexMap1,
-        typename IndexMap2 >
+        typename IndexMap2, typename InvariantCountMap = boost::unordered_flat_map<typename Invariant1::result_type, typename graph_traits< Graph1 >::vertices_size_type > >
     class isomorphism_algo
     {
         typedef typename graph_traits< Graph1 >::vertex_descriptor vertex1_t;
         typedef typename graph_traits< Graph2 >::vertex_descriptor vertex2_t;
         typedef typename graph_traits< Graph1 >::edge_descriptor edge1_t;
         typedef typename graph_traits< Graph1 >::vertices_size_type size_type;
-        typedef typename Invariant1::result_type invar1_value;
-        typedef typename Invariant2::result_type invar2_value;
+        typedef typename Invariant1::result_type invariant_t;
 
         const Graph1& G1;
         const Graph2& G2;
         IsoMapping f;
         Invariant1 invariant1;
         Invariant2 invariant2;
-        std::size_t max_invariant;
         IndexMap1 index_map1;
         IndexMap2 index_map2;
 
@@ -81,17 +81,20 @@ namespace detail
         friend struct compare_multiplicity;
         struct compare_multiplicity
         {
-            compare_multiplicity(Invariant1 invariant1, size_type* multiplicity)
-            : invariant1(invariant1), multiplicity(multiplicity)
+            compare_multiplicity(Invariant1 invariant1, const InvariantCountMap& multiplicity)
+            : invariant1(invariant1), multiplicity(&multiplicity)
             {
             }
             bool operator()(const vertex1_t& x, const vertex1_t& y) const
             {
-                return multiplicity[invariant1(x)]
-                    < multiplicity[invariant1(y)];
+                auto x_multiplicity_iter = multiplicity->find(invariant1(x));
+                assert(x_multiplicity_iter != multiplicity->end());
+                auto y_multiplicity_iter = multiplicity->find(invariant1(y));
+                assert(y_multiplicity_iter != multiplicity->end());
+                return *x_multiplicity_iter < *y_multiplicity_iter;
             }
             Invariant1 invariant1;
-            size_type* multiplicity;
+            const InvariantCountMap* multiplicity;
         };
 
         struct record_dfs_order : default_dfs_visitor
@@ -138,14 +141,13 @@ namespace detail
     public:
         isomorphism_algo(const Graph1& G1, const Graph2& G2, IsoMapping f,
             Invariant1 invariant1, Invariant2 invariant2,
-            std::size_t max_invariant, IndexMap1 index_map1,
+            std::size_t /* max_invariant */, IndexMap1 index_map1,
             IndexMap2 index_map2)
         : G1(G1)
         , G2(G2)
         , f(f)
         , invariant1(invariant1)
         , invariant2(invariant2)
-        , max_invariant(max_invariant)
         , index_map1(index_map1)
         , index_map2(index_map2)
         {
@@ -159,36 +161,63 @@ namespace detail
             );
         }
 
+        // Generates map of invariant multiplicity from sorted invariants
+        template<typename ForwardIterator>
+        InvariantCountMap multiplicities(ForwardIterator first, const ForwardIterator last) 
+        {
+            typedef typename InvariantCountMap::iterator invar_map_iter;
+
+            assert(std::is_sorted(first, last));
+            InvariantCountMap invar_multiplicity;
+
+            if(first == last) 
+                return invar_multiplicity;
+
+            invariant_t invar = *first;
+            invar_map_iter inserted = invar_multiplicity.emplace(invar, 1).first;
+            ++first;
+            for(; first != last; ++first)
+            {
+                if(*first == invar)
+                {
+                    inserted->second += 1;
+                }
+                else
+                {
+                    invar = *first;
+                    inserted = invar_multiplicity.emplace(invar, 1).first;
+                }
+            }
+
+            return invar_multiplicity;
+        }
+
         bool test_isomorphism()
         {
             // reset isomapping
             BGL_FORALL_VERTICES_T(v, G1, Graph1)
             f[v] = graph_traits< Graph2 >::null_vertex();
 
-            {
-                std::vector< invar1_value > invar1_array;
-                BGL_FORALL_VERTICES_T(v, G1, Graph1)
-                invar1_array.push_back(invariant1(v));
-                sort(invar1_array);
-
-                std::vector< invar2_value > invar2_array;
-                BGL_FORALL_VERTICES_T(v, G2, Graph2)
-                invar2_array.push_back(invariant2(v));
-                sort(invar2_array);
-                if (!equal(invar1_array, invar2_array))
-                    return false;
-            }
-
+            // Calculate all invariants of G1 and G2, sort and compare
+            std::vector< invariant_t > invar1_array;
+            invar1_array.reserve(num_vertices(G1));
+            BGL_FORALL_VERTICES_T(v, G1, Graph1)
+            invar1_array.push_back(invariant1(v));
+            sort(invar1_array);
+
+            std::vector< invariant_t > invar2_array;
+            invar2_array.reserve(num_vertices(G2));
+            BGL_FORALL_VERTICES_T(v, G2, Graph2)
+            invar2_array.push_back(invariant2(v));
+            sort(invar2_array);
+            if (!equal(invar1_array, invar2_array))
+                return false;
+
+            // Sort vertices by the multiplicity of their invariants
             std::vector< vertex1_t > V_mult;
             BGL_FORALL_VERTICES_T(v, G1, Graph1)
             V_mult.push_back(v);
-            {
-                std::vector< size_type > multiplicity(max_invariant, 0);
-                BGL_FORALL_VERTICES_T(v, G1, Graph1)
-                ++multiplicity.at(invariant1(v));
-                sort(
-                    V_mult, compare_multiplicity(invariant1, &multiplicity[0]));
-            }
+            sort(V_mult, compare_multiplicity(invariant1, multiplicities(invar1_array.begin(), invar1_array.end())));
 
             std::vector< default_color_type > color_vec(num_vertices(G1));
             safe_iterator_property_map<
@@ -366,6 +395,9 @@ namespace detail
 
             {
             return_point_true:
+                // At this point, there may still be null vertices in the 
+                // mapping for disconnected vertices
+                map_disconnected_vertices();
                 return true;
 
             return_point_false:
@@ -413,6 +445,42 @@ namespace detail
                 }
             }
         }
+
+        void map_disconnected_vertices()
+        {
+            std::vector< vertex1_t > unmatched_g1_vertices;
+            BGL_FORALL_VERTICES_T(v, G1, Graph1)
+            {
+                if(f[v] == graph_traits< Graph2 >::null_vertex()) {
+                    unmatched_g1_vertices.push_back(v);
+                }
+            }
+
+            if(!unmatched_g1_vertices.empty()) 
+            {
+                typedef unordered_multimap< invariant_t, vertex2_t > g2_invariant_vertex_multimap;
+                typedef typename g2_invariant_vertex_multimap::iterator multimap_iter;
+                g2_invariant_vertex_multimap unmatched_invariants;
+                BGL_FORALL_VERTICES_T(v, G2, Graph2)
+                {
+                    if(!in_S[v]) 
+                    {
+                        unmatched_invariants.emplace(invariant2(v), v);
+                    }
+                }
+
+                typedef typename std::vector< vertex1_t >::iterator v1_iter;
+                const v1_iter end = unmatched_g1_vertices.end();
+                for(v1_iter iter = unmatched_g1_vertices.begin(); iter != end; ++iter)
+                {
+                    invariant_t unmatched_g1_vertex_invariant = invariant1(*iter);
+                    multimap_iter matching_invariant = unmatched_invariants.find(unmatched_g1_vertex_invariant);
+                    BOOST_ASSERT(matching_invariant != unmatched_invariants.end());
+                    f[*iter] = matching_invariant->second;
+                    unmatched_invariants.erase(matching_invariant);
+                }
+            }
+        }
     };
 
     template < typename Graph, typename InDegreeMap >
@@ -486,7 +554,7 @@ template < typename Graph1, typename Graph2, typename IsoMapping,
     typename Invariant1, typename Invariant2, typename IndexMap1,
     typename IndexMap2 >
 bool isomorphism(const Graph1& G1, const Graph2& G2, IsoMapping f,
-    Invariant1 invariant1, Invariant2 invariant2, std::size_t max_invariant,
+    Invariant1 invariant1, Invariant2 invariant2, std::size_t /* max_invariant */,
     IndexMap1 index_map1, IndexMap2 index_map2)
 
 {
@@ -500,11 +568,16 @@ bool isomorphism(const Graph1& G1, const Graph2& G2, IsoMapping f,
     typedef typename graph_traits< Graph2 >::vertex_descriptor vertex2_t;
     typedef typename graph_traits< Graph1 >::vertices_size_type size_type;
 
+    typedef typename Invariant1::result_type invariant1_t;
+    typedef typename Invariant2::result_type invariant2_t;
+
+    BOOST_STATIC_ASSERT(is_same<invariant1_t, invariant2_t>::value);
+
     // Vertex invariant requirement
     BOOST_CONCEPT_ASSERT(
-        (AdaptableUnaryFunctionConcept< Invariant1, size_type, vertex1_t >));
+        (AdaptableUnaryFunctionConcept< Invariant1, invariant1_t, vertex1_t >));
     BOOST_CONCEPT_ASSERT(
-        (AdaptableUnaryFunctionConcept< Invariant2, size_type, vertex2_t >));
+        (AdaptableUnaryFunctionConcept< Invariant2, invariant2_t, vertex2_t >));
 
     // Property map requirements
     BOOST_CONCEPT_ASSERT(
@@ -527,7 +600,7 @@ bool isomorphism(const Graph1& G1, const Graph2& G2, IsoMapping f,
 
     detail::isomorphism_algo< Graph1, Graph2, IsoMapping, Invariant1,
         Invariant2, IndexMap1, IndexMap2 >
-        algo(G1, G2, f, invariant1, invariant2, max_invariant, index_map1,
+        algo(G1, G2, f, invariant1, invariant2, 0, index_map1,
             index_map2);
     return algo.test_isomorphism();
 }
@@ -574,8 +647,7 @@ namespace detail
         return isomorphism(G1, G2, f,
             choose_param(get_param(params, vertex_invariant1_t()), invariant1),
             choose_param(get_param(params, vertex_invariant2_t()), invariant2),
-            choose_param(get_param(params, vertex_max_invariant_t()),
-                (invariant2.max)()),
+            0,
             index_map1, index_map2);
     }
 
@@ -654,7 +726,7 @@ namespace graph
                         make_shared_array_property_map(
                             num_vertices(g1), vertex2_t(), index1_map)),
                     invariant1, invariant2,
-                    arg_pack[_vertex_max_invariant | (invariant2.max)()],
+                    0,
                     index1_map, index2_map);
             }
         };
diff --git a/inst/include/boost/graph/labeled_graph.hpp b/inst/include/boost/graph/labeled_graph.hpp
index ec88436aa..1c7706e10 100644
--- a/inst/include/boost/graph/labeled_graph.hpp
+++ b/inst/include/boost/graph/labeled_graph.hpp
@@ -18,7 +18,9 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_unsigned.hpp>
 #include <boost/pending/container_traits.hpp>
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/property_map/property_map.hpp>
 
 // This file implements a utility for creating mappings from arbitrary
 // identifiers to the vertices of a graph.
@@ -260,6 +262,54 @@ namespace graph_detail
     }
     //@}
 
+    /** @name Remove Labeled Vertex */
+    //@{
+    // Tag dispatch on random access containers (i.e., vectors)
+    template <typename Container, typename Label, typename Graph>
+    void remove_labeled_vertex(Container& c, Graph& g, Label const& l,
+        random_access_container_tag)
+    {
+        if (l < c.size())
+        {
+            boost::remove_vertex(c[l], g);
+            c.erase(c.begin() + l);
+        }
+    }
+
+    // Tag dispatch on multi associative containers (i.e. multimaps).
+    template <typename Container, typename Label, typename Graph>
+    void remove_labeled_vertex(Container& c, Graph& g, Label const& l,
+        multiple_associative_container_tag)
+    {
+        typename Container::iterator c_it = c.find(l);
+        if (c_it != c.end())
+        {
+            boost::remove_vertex(c_it->second, g);
+            c.erase(c_it);
+        }
+    }
+
+    // Tag dispatch on unique associative containers (i.e. maps).
+    template <typename Container, typename Label, typename Graph>
+    void remove_labeled_vertex(Container& c, Graph& g, Label const& l,
+        unique_associative_container_tag)
+    {
+        typename Container::iterator c_it = c.find(l);
+        if (c_it != c.end())
+        {
+            boost::remove_vertex(c_it->second, g);
+            c.erase(c_it);
+        }
+    }
+
+    // Dispatcher
+    template <typename Container, typename Label, typename Graph>
+    void remove_labeled_vertex(Container& c, Graph& g, Label const& l)
+    {
+        remove_labeled_vertex(c, g, l, container_category(c));
+    }
+    //@}
+
 } // namespace detail
 
 struct labeled_graph_class_tag
@@ -451,7 +501,7 @@ class labeled_graph : protected labeled_graph_types< Graph, Label, Selector >
     /** Remove the vertex with the given label. */
     void remove_vertex(Label const& l)
     {
-        return boost::remove_vertex(vertex(l), _graph);
+        return graph_detail::remove_labeled_vertex(_map, _graph, l);
     }
 
     /** Return a descriptor for the given label. */
@@ -734,7 +784,7 @@ inline typename LABELED_GRAPH::degree_size_type degree(
 template < LABELED_GRAPH_PARAMS >
 inline std::pair< typename LABELED_GRAPH::adjacency_iterator,
     typename LABELED_GRAPH::adjacency_iterator >
-adjacenct_vertices(
+adjacent_vertices(
     typename LABELED_GRAPH::vertex_descriptor v, LABELED_GRAPH const& g)
 {
     return adjacent_vertices(v, g.graph());
diff --git a/inst/include/boost/graph/metis.hpp b/inst/include/boost/graph/metis.hpp
index e6d4c4626..e6567c999 100644
--- a/inst/include/boost/graph/metis.hpp
+++ b/inst/include/boost/graph/metis.hpp
@@ -24,6 +24,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <boost/throw_exception.hpp>
+
 namespace boost
 {
 namespace graph
diff --git a/inst/include/boost/graph/planar_canonical_ordering.hpp b/inst/include/boost/graph/planar_canonical_ordering.hpp
index f1bf7b773..61f2797a1 100644
--- a/inst/include/boost/graph/planar_canonical_ordering.hpp
+++ b/inst/include/boost/graph/planar_canonical_ordering.hpp
@@ -14,6 +14,7 @@
 #include <boost/config.hpp>
 #include <boost/next_prior.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/property_map/property_map.hpp>
 
 namespace boost
diff --git a/inst/include/boost/graph/point_traits.hpp b/inst/include/boost/graph/point_traits.hpp
index 310515f6f..c81b9ed6f 100644
--- a/inst/include/boost/graph/point_traits.hpp
+++ b/inst/include/boost/graph/point_traits.hpp
@@ -9,6 +9,8 @@
 #ifndef BOOST_GRAPH_POINT_TRAITS_HPP
 #define BOOST_GRAPH_POINT_TRAITS_HPP
 
+#include <cstddef>
+
 namespace boost
 {
 namespace graph
diff --git a/inst/include/boost/graph/r_c_shortest_paths.hpp b/inst/include/boost/graph/r_c_shortest_paths.hpp
index 03aa09063..12edb43dc 100644
--- a/inst/include/boost/graph/r_c_shortest_paths.hpp
+++ b/inst/include/boost/graph/r_c_shortest_paths.hpp
@@ -431,6 +431,10 @@ namespace detail
             }
         }
         std::list< Splabel > dsplabels = get(vec_vertex_labels, t);
+        if(!b_all_pareto_optimal_solutions)
+        {
+            dsplabels.sort();
+        }
         typename std::list< Splabel >::const_iterator csi = dsplabels.begin();
         typename std::list< Splabel >::const_iterator csi_end = dsplabels.end();
         // if d could be reached from o
diff --git a/inst/include/boost/graph/small_world_generator.hpp b/inst/include/boost/graph/small_world_generator.hpp
index 9c73b5474..f2d0d084a 100644
--- a/inst/include/boost/graph/small_world_generator.hpp
+++ b/inst/include/boost/graph/small_world_generator.hpp
@@ -11,6 +11,7 @@
 
 #include <iterator>
 #include <utility>
+#include <boost/graph/graph_traits.hpp>
 #include <boost/random/uniform_01.hpp>
 #include <boost/random/uniform_int.hpp>
 
diff --git a/inst/include/boost/graph/ssca_graph_generator.hpp b/inst/include/boost/graph/ssca_graph_generator.hpp
index 5fb6e3566..a2281236c 100644
--- a/inst/include/boost/graph/ssca_graph_generator.hpp
+++ b/inst/include/boost/graph/ssca_graph_generator.hpp
@@ -15,6 +15,7 @@
 #include <queue>
 #include <boost/config.hpp>
 #include <boost/random/uniform_int.hpp>
+#include <boost/random/uniform_01.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/type_traits/is_same.hpp>
diff --git a/inst/include/boost/graph/topology.hpp b/inst/include/boost/graph/topology.hpp
index 8136ba965..73dc3d944 100644
--- a/inst/include/boost/graph/topology.hpp
+++ b/inst/include/boost/graph/topology.hpp
@@ -10,14 +10,16 @@
 #ifndef BOOST_GRAPH_TOPOLOGY_HPP
 #define BOOST_GRAPH_TOPOLOGY_HPP
 
-#include <boost/config/no_tr1/cmath.hpp>
-#include <cmath>
-#include <boost/random/uniform_01.hpp>
-#include <boost/random/linear_congruential.hpp>
-#include <boost/math/constants/constants.hpp> // For root_two
 #include <boost/algorithm/minmax.hpp>
 #include <boost/config.hpp> // For BOOST_STATIC_CONSTANT
+#include <boost/config/no_tr1/cmath.hpp>
+#include <boost/math/constants/constants.hpp> // For root_two
 #include <boost/math/special_functions/hypot.hpp>
+#include <boost/random/uniform_01.hpp>
+#include <boost/random/linear_congruential.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <cmath>
 
 // Classes and concepts to represent points in a space, with distance and move
 // operations (used for Gurson-Atun layout), plus other things like bounding
diff --git a/inst/include/boost/graph/write_dimacs.hpp b/inst/include/boost/graph/write_dimacs.hpp
index ec0e2c532..36ab7f81e 100644
--- a/inst/include/boost/graph/write_dimacs.hpp
+++ b/inst/include/boost/graph/write_dimacs.hpp
@@ -41,6 +41,8 @@
 #include <string>
 #include <ostream>
 
+#include <boost/graph/graph_traits.hpp>
+
 namespace boost
 {
 
diff --git a/inst/include/boost/heap/binomial_heap.hpp b/inst/include/boost/heap/binomial_heap.hpp
index 76b1d9221..2f3a83efa 100644
--- a/inst/include/boost/heap/binomial_heap.hpp
+++ b/inst/include/boost/heap/binomial_heap.hpp
@@ -22,79 +22,79 @@
 #include <boost/type_traits/integral_constant.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 #ifndef BOOST_DOXYGEN_INVOKED
-#ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
-#else
-#define BOOST_HEAP_ASSERT(expression)
-#endif
+#    ifdef BOOST_HEAP_SANITYCHECKS
+#        define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    else
+#        define BOOST_HEAP_ASSERT( expression )
+#    endif
 #endif
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
-typedef parameter::parameters<boost::parameter::optional<tag::allocator>,
-                              boost::parameter::optional<tag::compare>,
-                              boost::parameter::optional<tag::stable>,
-                              boost::parameter::optional<tag::constant_time_size>,
-                              boost::parameter::optional<tag::stability_counter_type>
-                             > binomial_heap_signature;
+typedef parameter::parameters< boost::parameter::optional< tag::allocator >,
+                               boost::parameter::optional< tag::compare >,
+                               boost::parameter::optional< tag::stable >,
+                               boost::parameter::optional< tag::constant_time_size >,
+                               boost::parameter::optional< tag::stability_counter_type > >
+    binomial_heap_signature;
 
-template <typename T, typename Parspec>
+template < typename T, typename Parspec >
 struct make_binomial_heap_base
 {
-    static const bool constant_time_size = parameter::binding<Parspec,
-                                                              tag::constant_time_size,
-                                                              boost::true_type
-                                                             >::type::value;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::type base_type;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::allocator_argument allocator_argument;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::compare_argument compare_argument;
+    static const bool constant_time_size
+        = parameter::binding< Parspec, tag::constant_time_size, boost::true_type >::type::value;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::type               base_type;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::allocator_argument allocator_argument;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::compare_argument   compare_argument;
 
-    typedef parent_pointing_heap_node<typename base_type::internal_type> node_type;
+    typedef parent_pointing_heap_node< typename base_type::internal_type > node_type;
 
-    typedef typename boost::allocator_rebind<allocator_argument, node_type>::type allocator_type;
+    typedef typename boost::allocator_rebind< allocator_argument, node_type >::type allocator_type;
 
-    struct type:
-        base_type,
-        allocator_type
+    struct type : base_type, allocator_type
     {
-        type(compare_argument const & arg):
-            base_type(arg)
+        type( compare_argument const& arg ) :
+            base_type( arg )
+        {}
+
+        type( allocator_type const& alloc ) :
+            allocator_type( alloc )
         {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        type(type const & rhs):
-            base_type(rhs), allocator_type(rhs)
+        type( type const& rhs ) :
+            base_type( rhs ),
+            allocator_type( rhs )
         {}
 
-        type(type && rhs):
-            base_type(std::move(static_cast<base_type&>(rhs))),
-            allocator_type(std::move(static_cast<allocator_type&>(rhs)))
+        type( type&& rhs ) :
+            base_type( std::move( static_cast< base_type& >( rhs ) ) ),
+            allocator_type( std::move( static_cast< allocator_type& >( rhs ) ) )
         {}
 
-        type & operator=(type && rhs)
+        type& operator=( type&& rhs )
         {
-            base_type::operator=(std::move(static_cast<base_type&>(rhs)));
-            allocator_type::operator=(std::move(static_cast<allocator_type&>(rhs)));
+            base_type::operator=( std::move( static_cast< base_type& >( rhs ) ) );
+            allocator_type::operator=( std::move( static_cast< allocator_type& >( rhs ) ) );
             return *this;
         }
 
-        type & operator=(type const & rhs)
+        type& operator=( type const& rhs )
         {
-            base_type::operator=(static_cast<base_type const &>(rhs));
-            allocator_type::operator=(static_cast<allocator_type const &>(rhs));
+            base_type::operator=( static_cast< base_type const& >( rhs ) );
+            allocator_type::operator=( static_cast< allocator_type const& >( rhs ) );
             return *this;
         }
 #endif
     };
 };
 
-}
+} // namespace detail
 
 /**
  * \class binomial_heap
@@ -112,174 +112,178 @@ struct make_binomial_heap_base
  *
  */
 #ifdef BOOST_DOXYGEN_INVOKED
-template<class T, class ...Options>
+template < class T, class... Options >
 #else
-template <typename T,
-          class A0 = boost::parameter::void_,
-          class A1 = boost::parameter::void_,
-          class A2 = boost::parameter::void_,
-          class A3 = boost::parameter::void_
-         >
+template < typename T,
+           class A0 = boost::parameter::void_,
+           class A1 = boost::parameter::void_,
+           class A2 = boost::parameter::void_,
+           class A3 = boost::parameter::void_ >
 #endif
-class binomial_heap:
-    private detail::make_binomial_heap_base<T,
-                                            typename detail::binomial_heap_signature::bind<A0, A1, A2, A3>::type
-                                           >::type
+class binomial_heap :
+    private detail::make_binomial_heap_base< T, typename detail::binomial_heap_signature::bind< A0, A1, A2, A3 >::type >::type
 {
-    typedef typename detail::binomial_heap_signature::bind<A0, A1, A2, A3>::type bound_args;
-    typedef detail::make_binomial_heap_base<T, bound_args> base_maker;
-    typedef typename base_maker::type super_t;
+    typedef typename detail::binomial_heap_signature::bind< A0, A1, A2, A3 >::type bound_args;
+    typedef detail::make_binomial_heap_base< T, bound_args >                       base_maker;
+    typedef typename base_maker::type                                              super_t;
 
-    typedef typename super_t::internal_type internal_type;
-    typedef typename super_t::size_holder_type size_holder;
+    typedef typename super_t::internal_type          internal_type;
+    typedef typename super_t::size_holder_type       size_holder;
     typedef typename super_t::stability_counter_type stability_counter_type;
-    typedef typename base_maker::allocator_argument allocator_argument;
+    typedef typename base_maker::allocator_argument  allocator_argument;
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
 public:
-    static const bool constant_time_size = super_t::constant_time_size;
+    static const bool constant_time_size    = super_t::constant_time_size;
     static const bool has_ordered_iterators = true;
-    static const bool is_mergable = true;
-    static const bool is_stable = detail::extract_stable<bound_args>::value;
-    static const bool has_reserve = false;
+    static const bool is_mergable           = true;
+    static const bool is_stable             = detail::extract_stable< bound_args >::value;
+    static const bool has_reserve           = false;
 
 private:
 #ifndef BOOST_DOXYGEN_INVOKED
-    struct implementation_defined:
-        detail::extract_allocator_types<typename base_maker::allocator_argument>
+    struct implementation_defined : detail::extract_allocator_types< typename base_maker::allocator_argument >
     {
         typedef T value_type;
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::size_type size_type;
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::reference reference;
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::size_type size_type;
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::reference reference;
 
         typedef typename base_maker::compare_argument value_compare;
-        typedef typename base_maker::allocator_type allocator_type;
-        typedef typename base_maker::node_type node;
+        typedef typename base_maker::allocator_type   allocator_type;
+        typedef typename base_maker::node_type        node;
 
-        typedef typename boost::allocator_pointer<allocator_type>::type node_pointer;
-        typedef typename boost::allocator_const_pointer<allocator_type>::type const_node_pointer;
+        typedef typename boost::allocator_pointer< allocator_type >::type       node_pointer;
+        typedef typename boost::allocator_const_pointer< allocator_type >::type const_node_pointer;
 
-        typedef detail::node_handle<node_pointer, super_t, reference> handle_type;
+        typedef detail::node_handle< node_pointer, super_t, reference > handle_type;
 
         typedef typename base_maker::node_type node_type;
 
-        typedef boost::intrusive::list<detail::heap_node_base<false>,
-                                       boost::intrusive::constant_time_size<true>
-                                       > node_list_type;
+        typedef boost::intrusive::list< detail::heap_node_base< false >, boost::intrusive::constant_time_size< true > >
+            node_list_type;
 
-        typedef typename node_list_type::iterator node_list_iterator;
-        typedef typename node_list_type::const_iterator node_list_const_iterator;
-        typedef detail::value_extractor<value_type, internal_type, super_t> value_extractor;
+        typedef typename node_list_type::iterator                             node_list_iterator;
+        typedef typename node_list_type::const_iterator                       node_list_const_iterator;
+        typedef detail::value_extractor< value_type, internal_type, super_t > value_extractor;
 
-        typedef detail::recursive_tree_iterator<node_type,
-                                        node_list_const_iterator,
-                                        const value_type,
-                                        value_extractor,
-                                        detail::list_iterator_converter<node_type, node_list_type>
-                                        > iterator;
+        typedef detail::recursive_tree_iterator< node_type,
+                                                 node_list_const_iterator,
+                                                 const value_type,
+                                                 value_extractor,
+                                                 detail::list_iterator_converter< node_type, node_list_type > >
+                         iterator;
         typedef iterator const_iterator;
 
-        typedef detail::tree_iterator<node_type,
-                                     const value_type,
-                                     allocator_type,
-                                     value_extractor,
-                                     detail::list_iterator_converter<node_type, node_list_type>,
-                                     true,
-                                     true,
-                                     value_compare
-                                    > ordered_iterator;
+        typedef detail::tree_iterator< node_type,
+                                       const value_type,
+                                       allocator_type,
+                                       value_extractor,
+                                       detail::list_iterator_converter< node_type, node_list_type >,
+                                       true,
+                                       true,
+                                       value_compare >
+            ordered_iterator;
     };
 #endif
 
 public:
     typedef T value_type;
 
-    typedef typename implementation_defined::size_type size_type;
-    typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
-    typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
+    typedef typename implementation_defined::size_type        size_type;
+    typedef typename implementation_defined::difference_type  difference_type;
+    typedef typename implementation_defined::value_compare    value_compare;
+    typedef typename implementation_defined::allocator_type   allocator_type;
+    typedef typename implementation_defined::reference        reference;
+    typedef typename implementation_defined::const_reference  const_reference;
+    typedef typename implementation_defined::pointer          pointer;
+    typedef typename implementation_defined::const_pointer    const_pointer;
     /// \copydoc boost::heap::priority_queue::iterator
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::iterator         iterator;
+    typedef typename implementation_defined::const_iterator   const_iterator;
     typedef typename implementation_defined::ordered_iterator ordered_iterator;
 
     typedef typename implementation_defined::handle_type handle_type;
 
 private:
-    typedef typename implementation_defined::node_type node_type;
-    typedef typename implementation_defined::node_list_type node_list_type;
-    typedef typename implementation_defined::node_pointer node_pointer;
-    typedef typename implementation_defined::const_node_pointer const_node_pointer;
-    typedef typename implementation_defined::node_list_iterator node_list_iterator;
+    typedef typename implementation_defined::node_type                node_type;
+    typedef typename implementation_defined::node_list_type           node_list_type;
+    typedef typename implementation_defined::node_pointer             node_pointer;
+    typedef typename implementation_defined::const_node_pointer       const_node_pointer;
+    typedef typename implementation_defined::node_list_iterator       node_list_iterator;
     typedef typename implementation_defined::node_list_const_iterator node_list_const_iterator;
 
     typedef typename super_t::internal_compare internal_compare;
 
 public:
     /// \copydoc boost::heap::priority_queue::priority_queue(value_compare const &)
-    explicit binomial_heap(value_compare const & cmp = value_compare()):
-        super_t(cmp), top_element(0)
+    explicit binomial_heap( value_compare const& cmp = value_compare() ) :
+        super_t( cmp ),
+        top_element( 0 )
+    {}
+
+    /// \copydoc boost::heap::priority_queue::priority_queue(allocator_type const &)
+    explicit binomial_heap( allocator_type const& alloc ) :
+        super_t( alloc ),
+        top_element( 0 )
     {}
 
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue const &)
-    binomial_heap(binomial_heap const & rhs):
-        super_t(rhs), top_element(0)
+    binomial_heap( binomial_heap const& rhs ) :
+        super_t( rhs ),
+        top_element( 0 )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        clone_forest(rhs);
-        size_holder::set_size(rhs.get_size());
+        clone_forest( rhs );
+        size_holder::set_size( rhs.get_size() );
     }
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue const &)
-    binomial_heap & operator=(binomial_heap const & rhs)
+    binomial_heap& operator=( binomial_heap const& rhs )
     {
         clear();
-        size_holder::set_size(rhs.get_size());
-        static_cast<super_t&>(*this) = rhs;
+        size_holder::set_size( rhs.get_size() );
+        static_cast< super_t& >( *this ) = rhs;
 
-        if (rhs.empty())
+        if ( rhs.empty() )
             top_element = NULL;
         else
-            clone_forest(rhs);
+            clone_forest( rhs );
         return *this;
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
-    binomial_heap(binomial_heap && rhs):
-        super_t(std::move(rhs)), top_element(rhs.top_element)
+    binomial_heap( binomial_heap&& rhs ) :
+        super_t( std::move( rhs ) ),
+        top_element( rhs.top_element )
     {
-        trees.splice(trees.begin(), rhs.trees);
+        trees.splice( trees.begin(), rhs.trees );
         rhs.top_element = NULL;
     }
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue &&)
-    binomial_heap & operator=(binomial_heap && rhs)
+    binomial_heap& operator=( binomial_heap&& rhs )
     {
         clear();
-        super_t::operator=(std::move(rhs));
-        trees.splice(trees.begin(), rhs.trees);
-        top_element = rhs.top_element;
+        super_t::operator=( std::move( rhs ) );
+        trees.splice( trees.begin(), rhs.trees );
+        top_element     = rhs.top_element;
         rhs.top_element = NULL;
         return *this;
     }
 #endif
 
-    ~binomial_heap(void)
+    ~binomial_heap( void )
     {
         clear();
     }
 
     /// \copydoc boost::heap::priority_queue::empty
-    bool empty(void) const
+    bool empty( void ) const
     {
         return top_element == NULL;
     }
@@ -290,54 +294,54 @@ class binomial_heap:
      * \b Complexity: Constant, if configured with constant_time_size<true>, otherwise linear.
      *
      * */
-    size_type size(void) const
+    size_type size( void ) const
     {
-        if (constant_time_size)
+        if ( constant_time_size )
             return size_holder::get_size();
 
-        if (empty())
+        if ( empty() )
             return 0;
         else
-            return detail::count_list_nodes<node_type, node_list_type>(trees);
+            return detail::count_list_nodes< node_type, node_list_type >( trees );
     }
 
     /// \copydoc boost::heap::priority_queue::max_size
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         const allocator_type& alloc = *this;
-        return boost::allocator_max_size(alloc);
+        return boost::allocator_max_size( alloc );
     }
 
     /// \copydoc boost::heap::priority_queue::clear
-    void clear(void)
+    void clear( void )
     {
-        typedef detail::node_disposer<node_type, typename node_list_type::value_type, allocator_type> disposer;
-        trees.clear_and_dispose(disposer(*this));
+        typedef detail::node_disposer< node_type, typename node_list_type::value_type, allocator_type > disposer;
+        trees.clear_and_dispose( disposer( *this ) );
 
-        size_holder::set_size(0);
+        size_holder::set_size( 0 );
         top_element = NULL;
     }
 
     /// \copydoc boost::heap::priority_queue::get_allocator
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return *this;
     }
 
     /// \copydoc boost::heap::priority_queue::swap
-    void swap(binomial_heap & rhs)
+    void swap( binomial_heap& rhs )
     {
-        super_t::swap(rhs);
-        std::swap(top_element, rhs.top_element);
-        trees.swap(rhs.trees);
+        super_t::swap( rhs );
+        std::swap( top_element, rhs.top_element );
+        trees.swap( rhs.trees );
     }
 
     /// \copydoc boost::heap::priority_queue::top
-    const_reference top(void) const
+    const_reference top( void ) const
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
-        return super_t::get_value(top_element->value);
+        return super_t::get_value( top_element->value );
     }
 
     /**
@@ -346,42 +350,43 @@ class binomial_heap:
      * \b Complexity: Logarithmic.
      *
      * */
-    handle_type push(value_type const & v)
+    handle_type push( value_type const& v )
     {
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node_type(super_t::make_node(v));
-        insert_node(trees.begin(), n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node_type( super_t::make_node( v ) );
+        insert_node( trees.begin(), n );
 
-        if (!top_element || super_t::operator()(top_element->value, n->value))
+        if ( !top_element || super_t::operator()( top_element->value, n->value ) )
             top_element = n;
 
         size_holder::increment();
         sanity_check();
-        return handle_type(n);
+        return handle_type( n );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
     /**
-     * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. Returns handle to element.
+     * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. Returns
+     * handle to element.
      *
      * \b Complexity: Logarithmic.
      *
      * */
-    template <class... Args>
-    handle_type emplace(Args&&... args)
+    template < class... Args >
+    handle_type emplace( Args&&... args )
     {
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node_type(super_t::make_node(std::forward<Args>(args)...));
-        insert_node(trees.begin(), n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node_type( super_t::make_node( std::forward< Args >( args )... ) );
+        insert_node( trees.begin(), n );
 
-        if (!top_element || super_t::operator()(top_element->value, n->value))
+        if ( !top_element || super_t::operator()( top_element->value, n->value ) )
             top_element = n;
 
         size_holder::increment();
         sanity_check();
-        return handle_type(n);
+        return handle_type( n );
     }
 #endif
 
@@ -391,41 +396,39 @@ class binomial_heap:
      * \b Complexity: Logarithmic.
      *
      * */
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
         node_pointer element = top_element;
 
-        trees.erase(node_list_type::s_iterator_to(*element));
+        trees.erase( node_list_type::s_iterator_to( *element ) );
         size_holder::decrement();
 
-        if (element->child_count()) {
-            size_type sz = (1 << element->child_count()) - 1;
+        if ( element->child_count() ) {
+            size_type sz = ( 1 << element->child_count() ) - 1;
 
-            binomial_heap children(value_comp(), element->children, sz);
-            if (trees.empty()) {
+            binomial_heap children( value_comp(), element->children, sz );
+            if ( trees.empty() ) {
                 stability_counter_type stability_count = super_t::get_stability_count();
-                size_t size = constant_time_size ? size_holder::get_size()
-                                                 : 0;
-                swap(children);
-                super_t::set_stability_count(stability_count);
+                size_t                 size            = constant_time_size ? size_holder::get_size() : 0;
+                swap( children );
+                super_t::set_stability_count( stability_count );
 
-                if (constant_time_size)
+                if ( constant_time_size )
                     size_holder::set_size( size );
             } else
-                merge_and_clear_nodes(children);
-
+                merge_and_clear_nodes( children );
         }
 
-        if (trees.empty())
+        if ( trees.empty() )
             top_element = NULL;
         else
             update_top_element();
 
         element->~node_type();
         allocator_type& alloc = *this;
-        alloc.deallocate(element, 1);
+        alloc.deallocate( element, 1 );
         sanity_check();
     }
 
@@ -435,12 +438,12 @@ class binomial_heap:
      * \b Complexity: Logarithmic.
      *
      * */
-    void update (handle_type handle, const_reference v)
+    void update( handle_type handle, const_reference v )
     {
-        if (super_t::operator()(super_t::get_value(handle.node_->value), v))
-            increase(handle, v);
+        if ( super_t::operator()( super_t::get_value( handle.node_->value ), v ) )
+            increase( handle, v );
         else
-            decrease(handle, v);
+            decrease( handle, v );
     }
 
     /**
@@ -450,18 +453,18 @@ class binomial_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void update (handle_type handle)
+    void update( handle_type handle )
     {
         node_pointer this_node = handle.node_;
 
-        if (this_node->parent) {
-            if (super_t::operator()(super_t::get_value(this_node->parent->value), super_t::get_value(this_node->value)))
-                increase(handle);
+        if ( this_node->parent ) {
+            if ( super_t::operator()( super_t::get_value( this_node->parent->value ),
+                                      super_t::get_value( this_node->value ) ) )
+                increase( handle );
             else
-                decrease(handle);
-        }
-        else
-            decrease(handle);
+                decrease( handle );
+        } else
+            decrease( handle );
     }
 
     /**
@@ -471,10 +474,10 @@ class binomial_heap:
      *
      * \b Note: The new value is expected to be greater than the current one
      * */
-    void increase (handle_type handle, const_reference v)
+    void increase( handle_type handle, const_reference v )
     {
-        handle.node_->value = super_t::make_node(v);
-        increase(handle);
+        handle.node_->value = super_t::make_node( v );
+        increase( handle );
     }
 
     /**
@@ -484,10 +487,10 @@ class binomial_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void increase (handle_type handle)
+    void increase( handle_type handle )
     {
         node_pointer n = handle.node_;
-        siftup(n, *this);
+        siftup( n, *this );
 
         update_top_element();
         sanity_check();
@@ -500,10 +503,10 @@ class binomial_heap:
      *
      * \b Note: The new value is expected to be less than the current one
      * */
-    void decrease (handle_type handle, const_reference v)
+    void decrease( handle_type handle, const_reference v )
     {
-        handle.node_->value = super_t::make_node(v);
-        decrease(handle);
+        handle.node_->value = super_t::make_node( v );
+        decrease( handle );
     }
 
     /**
@@ -511,13 +514,14 @@ class binomial_heap:
      *
      * \b Complexity: Logarithmic.
      *
-     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      * */
-    void decrease (handle_type handle)
+    void decrease( handle_type handle )
     {
         node_pointer n = handle.node_;
 
-        siftdown(n);
+        siftdown( n );
 
         update_top_element();
     }
@@ -528,51 +532,50 @@ class binomial_heap:
      * \b Complexity: Logarithmic.
      *
      * */
-    void merge(binomial_heap & rhs)
+    void merge( binomial_heap& rhs )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        if (empty()) {
-            swap(rhs);
+        if ( empty() ) {
+            swap( rhs );
             return;
         }
 
         size_type new_size = size_holder::get_size() + rhs.get_size();
-        merge_and_clear_nodes(rhs);
+        merge_and_clear_nodes( rhs );
 
-        size_holder::set_size(new_size);
-        rhs.set_size(0);
+        size_holder::set_size( new_size );
+        rhs.set_size( 0 );
         rhs.top_element = NULL;
 
-        super_t::set_stability_count((std::max)(super_t::get_stability_count(),
-                                     rhs.get_stability_count()));
-        rhs.set_stability_count(0);
+        super_t::set_stability_count( ( std::max )( super_t::get_stability_count(), rhs.get_stability_count() ) );
+        rhs.set_stability_count( 0 );
     }
 
 public:
     /// \copydoc boost::heap::priority_queue::begin
-    iterator begin(void) const
+    iterator begin( void ) const
     {
-        return iterator(trees.begin());
+        return iterator( trees.begin() );
     }
 
     /// \copydoc boost::heap::priority_queue::end
-    iterator end(void) const
+    iterator end( void ) const
     {
-        return iterator(trees.end());
+        return iterator( trees.end() );
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_begin
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
-        return ordered_iterator(trees.begin(), trees.end(), top_element, super_t::value_comp());
+        return ordered_iterator( trees.begin(), trees.end(), top_element, super_t::value_comp() );
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_end
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
-        return ordered_iterator(NULL, super_t::value_comp());
+        return ordered_iterator( NULL, super_t::value_comp() );
     }
 
     /**
@@ -580,357 +583,363 @@ class binomial_heap:
      *
      * \b Complexity: Logarithmic.
      * */
-    void erase(handle_type handle)
+    void erase( handle_type handle )
     {
         node_pointer n = handle.node_;
-        siftup(n, force_inf());
+        siftup( n, force_inf() );
         top_element = n;
         pop();
     }
 
     /// \copydoc boost::heap::d_ary_heap_mutable::s_handle_from_iterator
-    static handle_type s_handle_from_iterator(iterator const & it)
+    static handle_type s_handle_from_iterator( iterator const& it )
     {
-        node_type * ptr = const_cast<node_type *>(it.get_node());
-        return handle_type(ptr);
+        node_type* ptr = const_cast< node_type* >( it.get_node() );
+        return handle_type( ptr );
     }
 
     /// \copydoc boost::heap::priority_queue::value_comp
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
 
     /// \copydoc boost::heap::priority_queue::operator<(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<( HeapType const& rhs ) const
     {
-        return detail::heap_compare(*this, rhs);
+        return detail::heap_compare( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>( HeapType const& rhs ) const
     {
-        return detail::heap_compare(rhs, *this);
+        return detail::heap_compare( rhs, *this );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>=( HeapType const& rhs ) const
     {
-        return !operator<(rhs);
+        return !operator<( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator<=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<=( HeapType const& rhs ) const
     {
-        return !operator>(rhs);
+        return !operator>( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator==(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator==(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator==( HeapType const& rhs ) const
     {
-        return detail::heap_equality(*this, rhs);
+        return detail::heap_equality( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator!=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator!=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator!=( HeapType const& rhs ) const
     {
-        return !(*this == rhs);
+        return !( *this == rhs );
     }
 
 private:
-#if !defined(BOOST_DOXYGEN_INVOKED)
-    void merge_and_clear_nodes(binomial_heap & rhs)
+#if !defined( BOOST_DOXYGEN_INVOKED )
+    void merge_and_clear_nodes( binomial_heap& rhs )
     {
-        BOOST_HEAP_ASSERT (!empty());
-        BOOST_HEAP_ASSERT (!rhs.empty());
+        BOOST_HEAP_ASSERT( !empty() );
+        BOOST_HEAP_ASSERT( !rhs.empty() );
 
         node_list_iterator this_iterator = trees.begin();
-        node_pointer carry_node = NULL;
+        node_pointer       carry_node    = NULL;
 
-        while (!rhs.trees.empty()) {
-            node_pointer rhs_node = static_cast<node_pointer>(&rhs.trees.front());
-            size_type rhs_degree = rhs_node->child_count();
+        while ( !rhs.trees.empty() ) {
+            node_pointer rhs_node   = static_cast< node_pointer >( &rhs.trees.front() );
+            size_type    rhs_degree = rhs_node->child_count();
 
-            if (super_t::operator()(top_element->value, rhs_node->value))
+            if ( super_t::operator()( top_element->value, rhs_node->value ) )
                 top_element = rhs_node;
 
-        try_again:
-            node_pointer this_node = static_cast<node_pointer>(&*this_iterator);
-            size_type this_degree = this_node->child_count();
+try_again:
+            node_pointer this_node   = static_cast< node_pointer >( &*this_iterator );
+            size_type    this_degree = this_node->child_count();
             sorted_by_degree();
             rhs.sorted_by_degree();
 
-            if (this_degree == rhs_degree) {
-                if (carry_node) {
-                    if (carry_node->child_count() < this_degree) {
-                        trees.insert(this_iterator, *carry_node);
+            if ( this_degree == rhs_degree ) {
+                if ( carry_node ) {
+                    if ( carry_node->child_count() < this_degree ) {
+                        trees.insert( this_iterator, *carry_node );
                         carry_node = NULL;
                     } else {
                         rhs.trees.pop_front();
-                        carry_node = merge_trees(carry_node, rhs_node);
+                        carry_node = merge_trees( carry_node, rhs_node );
                     }
                     ++this_iterator;
                 } else {
-                    this_iterator = trees.erase(this_iterator);
+                    this_iterator = trees.erase( this_iterator );
                     rhs.trees.pop_front();
-                    carry_node = merge_trees(this_node, rhs_node);
+                    carry_node = merge_trees( this_node, rhs_node );
                 }
 
-                if (this_iterator == trees.end())
+                if ( this_iterator == trees.end() )
                     break;
                 else
                     continue;
             }
 
-            if (this_degree < rhs_degree) {
-                if (carry_node) {
-                    if (carry_node->child_count() < this_degree) {
-                        trees.insert(this_iterator, *carry_node);
+            if ( this_degree < rhs_degree ) {
+                if ( carry_node ) {
+                    if ( carry_node->child_count() < this_degree ) {
+                        trees.insert( this_iterator, *carry_node );
                         carry_node = NULL;
                         ++this_iterator;
-                    } else if (carry_node->child_count() == rhs_degree) {
+                    } else if ( carry_node->child_count() == rhs_degree ) {
                         rhs.trees.pop_front();
-                        carry_node = merge_trees(carry_node, rhs_node);
+                        carry_node = merge_trees( carry_node, rhs_node );
                         continue;
                     } else {
-                        this_iterator = trees.erase(this_iterator);
-                        carry_node = merge_trees(this_node, carry_node);
+                        this_iterator = trees.erase( this_iterator );
+                        carry_node    = merge_trees( this_node, carry_node );
                     }
                     goto try_again;
                 } else {
                     ++this_iterator;
-                    if (this_iterator == trees.end())
+                    if ( this_iterator == trees.end() )
                         break;
                     goto try_again;
                 }
 
-                if (this_iterator == trees.end())
+                if ( this_iterator == trees.end() )
                     break;
                 else
                     continue;
             }
 
-            if (this_degree > rhs_degree) {
+            if ( this_degree > rhs_degree ) {
                 rhs.trees.pop_front();
-                if (carry_node) {
-                    if (carry_node->child_count() < rhs_degree) {
-                        trees.insert(this_iterator, *carry_node);
-                        trees.insert(this_iterator, *rhs_node);
+                if ( carry_node ) {
+                    if ( carry_node->child_count() < rhs_degree ) {
+                        trees.insert( this_iterator, *carry_node );
+                        trees.insert( this_iterator, *rhs_node );
                         carry_node = NULL;
                     } else
-                        carry_node = merge_trees(rhs_node, carry_node);
+                        carry_node = merge_trees( rhs_node, carry_node );
                 } else
-                    trees.insert(this_iterator, *rhs_node);
+                    trees.insert( this_iterator, *rhs_node );
             }
         }
 
-        if (!rhs.trees.empty()) {
-            if (carry_node) {
+        if ( !rhs.trees.empty() ) {
+            if ( carry_node ) {
                 node_list_iterator rhs_it = rhs.trees.begin();
-                while (static_cast<node_pointer>(&*rhs_it)->child_count() < carry_node->child_count())
+                while ( static_cast< node_pointer >( &*rhs_it )->child_count() < carry_node->child_count() )
                     ++rhs_it;
-                rhs.insert_node(rhs_it, carry_node);
+                rhs.insert_node( rhs_it, carry_node );
                 rhs.increment();
                 sorted_by_degree();
                 rhs.sorted_by_degree();
-                if (trees.empty()) {
-                    trees.splice(trees.end(), rhs.trees, rhs.trees.begin(), rhs.trees.end());
+                if ( trees.empty() ) {
+                    trees.splice( trees.end(), rhs.trees, rhs.trees.begin(), rhs.trees.end() );
                     update_top_element();
                 } else
-                    merge_and_clear_nodes(rhs);
+                    merge_and_clear_nodes( rhs );
             } else
-                trees.splice(trees.end(), rhs.trees, rhs.trees.begin(), rhs.trees.end());
+                trees.splice( trees.end(), rhs.trees, rhs.trees.begin(), rhs.trees.end() );
             return;
         }
 
-        if (carry_node)
-            insert_node(this_iterator, carry_node);
+        if ( carry_node )
+            insert_node( this_iterator, carry_node );
     }
 
-    void clone_forest(binomial_heap const & rhs)
+    void clone_forest( binomial_heap const& rhs )
     {
-        BOOST_HEAP_ASSERT(trees.empty());
-        typedef typename node_type::template node_cloner<allocator_type> node_cloner;
-        trees.clone_from(rhs.trees, node_cloner(*this, NULL), detail::nop_disposer());
+        BOOST_HEAP_ASSERT( trees.empty() );
+        typedef typename node_type::template node_cloner< allocator_type > node_cloner;
+        trees.clone_from( rhs.trees, node_cloner( *this, NULL ), detail::nop_disposer() );
 
         update_top_element();
     }
 
     struct force_inf
     {
-        template <typename X>
-        bool operator()(X const &, X const &) const
+        template < typename X >
+        bool operator()( X const&, X const& ) const
         {
             return false;
         }
     };
 
-    template <typename Compare>
-    void siftup(node_pointer n, Compare const & cmp)
+    template < typename Compare >
+    void siftup( node_pointer n, Compare const& cmp )
     {
-        while (n->parent) {
-            node_pointer parent = n->parent;
+        while ( n->parent ) {
+            node_pointer parent       = n->parent;
             node_pointer grand_parent = parent->parent;
-            if (cmp(n->value, parent->value))
+            if ( cmp( n->value, parent->value ) )
                 return;
 
             n->remove_from_parent();
 
-            n->swap_children(parent);
+            n->swap_children( parent );
             n->update_children();
             parent->update_children();
 
-            if (grand_parent) {
+            if ( grand_parent ) {
                 parent->remove_from_parent();
-                grand_parent->add_child(n);
+                grand_parent->add_child( n );
             } else {
-                node_list_iterator it = trees.erase(node_list_type::s_iterator_to(*parent));
-                trees.insert(it, *n);
+                node_list_iterator it = trees.erase( node_list_type::s_iterator_to( *parent ) );
+                trees.insert( it, *n );
             }
-            n->add_child(parent);
+            n->add_child( parent );
         }
     }
 
-    void siftdown(node_pointer n)
+    void siftdown( node_pointer n )
     {
-        while (n->child_count()) {
-            node_pointer max_child = detail::find_max_child<node_list_type, node_type, internal_compare>(n->children, super_t::get_internal_cmp());
+        while ( n->child_count() ) {
+            node_pointer max_child
+                = detail::find_max_child< node_list_type, node_type, internal_compare >( n->children,
+                                                                                         super_t::get_internal_cmp() );
 
-            if (super_t::operator()(max_child->value, n->value))
+            if ( super_t::operator()( max_child->value, n->value ) )
                 return;
 
             max_child->remove_from_parent();
 
-            n->swap_children(max_child);
+            n->swap_children( max_child );
             n->update_children();
             max_child->update_children();
 
             node_pointer parent = n->parent;
-            if (parent) {
+            if ( parent ) {
                 n->remove_from_parent();
-                max_child->add_child(n);
-                parent->add_child(max_child);
+                max_child->add_child( n );
+                parent->add_child( max_child );
             } else {
-                node_list_iterator position = trees.erase(node_list_type::s_iterator_to(*n));
-                max_child->add_child(n);
-                trees.insert(position, *max_child);
+                node_list_iterator position = trees.erase( node_list_type::s_iterator_to( *n ) );
+                max_child->add_child( n );
+                trees.insert( position, *max_child );
             }
         }
     }
 
-    void insert_node(node_list_iterator it, node_pointer n)
+    void insert_node( node_list_iterator it, node_pointer n )
     {
-        if (it != trees.end())
-            BOOST_HEAP_ASSERT(static_cast<node_pointer>(&*it)->child_count() >= n->child_count());
+        if ( it != trees.end() )
+            BOOST_HEAP_ASSERT( static_cast< node_pointer >( &*it )->child_count() >= n->child_count() );
 
-        while(true) {
-            BOOST_HEAP_ASSERT(!n->is_linked());
-            if (it == trees.end())
+        while ( true ) {
+            BOOST_HEAP_ASSERT( !n->is_linked() );
+            if ( it == trees.end() )
                 break;
 
-            node_pointer this_node = static_cast<node_pointer>(&*it);
-            size_type this_degree = this_node->child_count();
-            size_type n_degree = n->child_count();
-            if (this_degree == n_degree) {
-                BOOST_HEAP_ASSERT(it->is_linked());
-                it = trees.erase(it);
+            node_pointer this_node   = static_cast< node_pointer >( &*it );
+            size_type    this_degree = this_node->child_count();
+            size_type    n_degree    = n->child_count();
+            if ( this_degree == n_degree ) {
+                BOOST_HEAP_ASSERT( it->is_linked() );
+                it = trees.erase( it );
 
-                n = merge_trees(n, this_node);
+                n = merge_trees( n, this_node );
             } else
                 break;
         }
-        trees.insert(it, *n);
+        trees.insert( it, *n );
     }
 
     // private constructor, just used in pop()
-    explicit binomial_heap(value_compare const & cmp, node_list_type & child_list, size_type size):
-        super_t(cmp)
+    explicit binomial_heap( value_compare const& cmp, node_list_type& child_list, size_type size ) :
+        super_t( cmp )
     {
-        size_holder::set_size(size);
-        if (size)
-            top_element = static_cast<node_pointer>(&*child_list.begin()); // not correct, but we will reset it later
+        size_holder::set_size( size );
+        if ( size )
+            top_element = static_cast< node_pointer >( &*child_list.begin() ); // not correct, but we will reset it later
         else
             top_element = NULL;
 
-        for (node_list_iterator it = child_list.begin(); it != child_list.end(); ++it) {
-            node_pointer n = static_cast<node_pointer>(&*it);
-            n->parent = NULL;
+        for ( node_list_iterator it = child_list.begin(); it != child_list.end(); ++it ) {
+            node_pointer n = static_cast< node_pointer >( &*it );
+            n->parent      = NULL;
         }
 
-        trees.splice(trees.end(), child_list, child_list.begin(), child_list.end());
+        trees.splice( trees.end(), child_list, child_list.begin(), child_list.end() );
 
-        trees.sort(detail::cmp_by_degree<node_type>());
+        trees.sort( detail::cmp_by_degree< node_type >() );
     }
 
-    node_pointer merge_trees (node_pointer node1, node_pointer node2)
+    node_pointer merge_trees( node_pointer node1, node_pointer node2 )
     {
-        BOOST_HEAP_ASSERT(node1->child_count() == node2->child_count());
+        BOOST_HEAP_ASSERT( node1->child_count() == node2->child_count() );
 
-        if (super_t::operator()(node1->value, node2->value))
-            std::swap(node1, node2);
+        if ( super_t::operator()( node1->value, node2->value ) )
+            std::swap( node1, node2 );
 
-        if (node2->parent)
+        if ( node2->parent )
             node2->remove_from_parent();
 
-        node1->add_child(node2);
+        node1->add_child( node2 );
         return node1;
     }
 
-    void update_top_element(void)
+    void update_top_element( void )
     {
-        top_element = detail::find_max_child<node_list_type, node_type, internal_compare>(trees, super_t::get_internal_cmp());
+        top_element
+            = detail::find_max_child< node_list_type, node_type, internal_compare >( trees,
+                                                                                     super_t::get_internal_cmp() );
     }
 
-    void sorted_by_degree(void) const
+    void sorted_by_degree( void ) const
     {
-#ifdef BOOST_HEAP_SANITYCHECKS
+#    ifdef BOOST_HEAP_SANITYCHECKS
         int degree = -1;
 
-        for (node_list_const_iterator it = trees.begin(); it != trees.end(); ++it) {
-            const_node_pointer n = static_cast<const_node_pointer>(&*it);
-            BOOST_HEAP_ASSERT(int(n->child_count()) > degree);
+        for ( node_list_const_iterator it = trees.begin(); it != trees.end(); ++it ) {
+            const_node_pointer n = static_cast< const_node_pointer >( &*it );
+            BOOST_HEAP_ASSERT( int( n->child_count() ) > degree );
             degree = n->child_count();
 
-            BOOST_HEAP_ASSERT((detail::is_heap<node_type, super_t>(n, *this)));
+            BOOST_HEAP_ASSERT( ( detail::is_heap< node_type, super_t >( n, *this ) ) );
 
-            size_type child_nodes = detail::count_nodes<node_type>(n);
-            BOOST_HEAP_ASSERT(child_nodes == size_type(1 << static_cast<const_node_pointer>(&*it)->child_count()));
+            size_type child_nodes = detail::count_nodes< node_type >( n );
+            BOOST_HEAP_ASSERT( child_nodes
+                               == size_type( 1 << static_cast< const_node_pointer >( &*it )->child_count() ) );
         }
-#endif
+#    endif
     }
 
-    void sanity_check(void)
+    void sanity_check( void )
     {
-#ifdef BOOST_HEAP_SANITYCHECKS
+#    ifdef BOOST_HEAP_SANITYCHECKS
         sorted_by_degree();
 
-        if (!empty()) {
-            node_pointer found_top = detail::find_max_child<node_list_type, node_type, internal_compare>(trees, super_t::get_internal_cmp());
-            BOOST_HEAP_ASSERT(top_element == found_top);
+        if ( !empty() ) {
+            node_pointer found_top
+                = detail::find_max_child< node_list_type, node_type, internal_compare >( trees,
+                                                                                         super_t::get_internal_cmp() );
+            BOOST_HEAP_ASSERT( top_element == found_top );
         }
 
-        if (constant_time_size) {
-            size_t counted = detail::count_list_nodes<node_type, node_list_type>(trees);
-            size_t stored = size_holder::get_size();
-            BOOST_HEAP_ASSERT(counted == stored);
+        if ( constant_time_size ) {
+            size_t counted = detail::count_list_nodes< node_type, node_list_type >( trees );
+            size_t stored  = size_holder::get_size();
+            BOOST_HEAP_ASSERT( counted == stored );
         }
-#endif
+#    endif
     }
 
-    node_pointer top_element;
+    node_pointer   top_element;
     node_list_type trees;
 #endif // BOOST_DOXYGEN_INVOKED
 };
 
 
-} /* namespace heap */
-} /* namespace boost */
+}} // namespace boost::heap
 
 #undef BOOST_HEAP_ASSERT
 
diff --git a/inst/include/boost/heap/d_ary_heap.hpp b/inst/include/boost/heap/d_ary_heap.hpp
index 6e54c8cd6..1b4262757 100644
--- a/inst/include/boost/heap/d_ary_heap.hpp
+++ b/inst/include/boost/heap/d_ary_heap.hpp
@@ -15,121 +15,116 @@
 
 #include <boost/assert.hpp>
 
-#include <boost/mem_fn.hpp>
 #include <boost/heap/detail/heap_comparison.hpp>
+#include <boost/heap/detail/mutable_heap.hpp>
 #include <boost/heap/detail/ordered_adaptor_iterator.hpp>
 #include <boost/heap/detail/stable_heap.hpp>
-#include <boost/heap/detail/mutable_heap.hpp>
+#include <boost/mem_fn.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 
 #ifndef BOOST_DOXYGEN_INVOKED
-#ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
-#else
-#define BOOST_HEAP_ASSERT(expression)
-#endif
+#    ifdef BOOST_HEAP_SANITYCHECKS
+#        define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    else
+#        define BOOST_HEAP_ASSERT( expression )
+#    endif
 #endif
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
 struct nop_index_updater
 {
-    template <typename T>
-    static void run(T &, std::size_t)
+    template < typename T >
+    static void run( T&, std::size_t )
     {}
 };
 
-typedef parameter::parameters<boost::parameter::required<tag::arity>,
-                              boost::parameter::optional<tag::allocator>,
-                              boost::parameter::optional<tag::compare>,
-                              boost::parameter::optional<tag::stable>,
-                              boost::parameter::optional<tag::stability_counter_type>,
-                              boost::parameter::optional<tag::constant_time_size>
-                             > d_ary_heap_signature;
+typedef parameter::parameters< boost::parameter::required< tag::arity >,
+                               boost::parameter::optional< tag::allocator >,
+                               boost::parameter::optional< tag::compare >,
+                               boost::parameter::optional< tag::stable >,
+                               boost::parameter::optional< tag::stability_counter_type >,
+                               boost::parameter::optional< tag::constant_time_size > >
+    d_ary_heap_signature;
 
 
 /* base class for d-ary heap */
-template <typename T,
-          class BoundArgs,
-          class IndexUpdater>
-class d_ary_heap:
-    private make_heap_base<T, BoundArgs, false>::type
+template < typename T, class BoundArgs, class IndexUpdater >
+class d_ary_heap : private make_heap_base< T, BoundArgs, false >::type
 {
-    typedef make_heap_base<T, BoundArgs, false> heap_base_maker;
+    typedef make_heap_base< T, BoundArgs, false > heap_base_maker;
 
-    typedef typename heap_base_maker::type super_t;
+    typedef typename heap_base_maker::type  super_t;
     typedef typename super_t::internal_type internal_type;
 
-    typedef typename boost::allocator_rebind<typename heap_base_maker::allocator_argument, internal_type>::type internal_type_allocator;
-    typedef std::vector<internal_type, internal_type_allocator> container_type;
-    typedef typename container_type::const_iterator container_iterator;
+    typedef typename boost::allocator_rebind< typename heap_base_maker::allocator_argument, internal_type >::type
+                                                                  internal_type_allocator;
+    typedef std::vector< internal_type, internal_type_allocator > container_type;
+    typedef typename container_type::const_iterator               container_iterator;
 
     typedef IndexUpdater index_updater;
 
     container_type q_;
 
-    static const unsigned int D = parameter::binding<BoundArgs, tag::arity>::type::value;
+    static const unsigned int D = parameter::binding< BoundArgs, tag::arity >::type::value;
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
-    struct implementation_defined:
-        extract_allocator_types<typename heap_base_maker::allocator_argument>
+    struct implementation_defined : extract_allocator_types< typename heap_base_maker::allocator_argument >
     {
         typedef T value_type;
-        typedef typename detail::extract_allocator_types<typename heap_base_maker::allocator_argument>::size_type size_type;
+        typedef
+            typename detail::extract_allocator_types< typename heap_base_maker::allocator_argument >::size_type size_type;
 
-        typedef typename heap_base_maker::compare_argument value_compare;
+        typedef typename heap_base_maker::compare_argument   value_compare;
         typedef typename heap_base_maker::allocator_argument allocator_type;
 
         struct ordered_iterator_dispatcher
         {
-            static size_type max_index(const d_ary_heap * heap)
+            static size_type max_index( const d_ary_heap* heap )
             {
                 return heap->q_.size() - 1;
             }
 
-            static bool is_leaf(const d_ary_heap * heap, size_type index)
+            static bool is_leaf( const d_ary_heap* heap, size_type index )
             {
-                return !heap->not_leaf(index);
+                return !heap->not_leaf( index );
             }
 
-            static std::pair<size_type, size_type> get_child_nodes(const d_ary_heap * heap, size_type index)
+            static std::pair< size_type, size_type > get_child_nodes( const d_ary_heap* heap, size_type index )
             {
-                BOOST_HEAP_ASSERT(!is_leaf(heap, index));
-                return std::make_pair(d_ary_heap::first_child_index(index),
-                                    heap->last_child_index(index));
+                BOOST_HEAP_ASSERT( !is_leaf( heap, index ) );
+                return std::make_pair( d_ary_heap::first_child_index( index ), heap->last_child_index( index ) );
             }
 
-            static internal_type const & get_internal_value(const d_ary_heap * heap, size_type index)
+            static internal_type const& get_internal_value( const d_ary_heap* heap, size_type index )
             {
-                return heap->q_[index];
+                return heap->q_[ index ];
             }
 
-            static value_type const & get_value(internal_type const & arg)
+            static value_type const& get_value( internal_type const& arg )
             {
-                return super_t::get_value(arg);
+                return super_t::get_value( arg );
             }
         };
 
-        typedef detail::ordered_adaptor_iterator<const value_type,
-                                                 internal_type,
-                                                 d_ary_heap,
-                                                 allocator_type,
-                                                 typename super_t::internal_compare,
-                                                 ordered_iterator_dispatcher
-                                                > ordered_iterator;
-
-        typedef detail::stable_heap_iterator<const value_type, container_iterator, super_t> iterator;
-        typedef iterator const_iterator;
-        typedef void * handle_type;
-
+        typedef detail::ordered_adaptor_iterator< const value_type,
+                                                  internal_type,
+                                                  d_ary_heap,
+                                                  allocator_type,
+                                                  typename super_t::internal_compare,
+                                                  ordered_iterator_dispatcher >
+            ordered_iterator;
+
+        typedef detail::stable_heap_iterator< const value_type, container_iterator, super_t > iterator;
+        typedef iterator                                                                      const_iterator;
+        typedef void*                                                                         handle_type;
     };
 
     typedef typename implementation_defined::ordered_iterator_dispatcher ordered_iterator_dispatcher;
@@ -137,300 +132,297 @@ class d_ary_heap:
 public:
     typedef T value_type;
 
-    typedef typename implementation_defined::size_type size_type;
-    typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
-    typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::size_type        size_type;
+    typedef typename implementation_defined::difference_type  difference_type;
+    typedef typename implementation_defined::value_compare    value_compare;
+    typedef typename implementation_defined::allocator_type   allocator_type;
+    typedef typename implementation_defined::reference        reference;
+    typedef typename implementation_defined::const_reference  const_reference;
+    typedef typename implementation_defined::pointer          pointer;
+    typedef typename implementation_defined::const_pointer    const_pointer;
+    typedef typename implementation_defined::iterator         iterator;
+    typedef typename implementation_defined::const_iterator   const_iterator;
     typedef typename implementation_defined::ordered_iterator ordered_iterator;
-    typedef typename implementation_defined::handle_type handle_type;
+    typedef typename implementation_defined::handle_type      handle_type;
 
-    static const bool is_stable = extract_stable<BoundArgs>::value;
+    static const bool is_stable = extract_stable< BoundArgs >::value;
 
-    explicit d_ary_heap(value_compare const & cmp = value_compare()):
-        super_t(cmp)
+    explicit d_ary_heap( value_compare const& cmp = value_compare() ) :
+        super_t( cmp )
     {}
 
-    d_ary_heap(d_ary_heap const & rhs):
-        super_t(rhs), q_(rhs.q_)
+    d_ary_heap( d_ary_heap const& rhs ) :
+        super_t( rhs ),
+        q_( rhs.q_ )
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    d_ary_heap(d_ary_heap && rhs):
-        super_t(std::move(rhs)), q_(std::move(rhs.q_))
+    d_ary_heap( d_ary_heap&& rhs ) :
+        super_t( std::move( rhs ) ),
+        q_( std::move( rhs.q_ ) )
     {}
 
-    d_ary_heap & operator=(d_ary_heap && rhs)
+    d_ary_heap& operator=( d_ary_heap&& rhs )
     {
-        super_t::operator=(std::move(rhs));
-        q_ = std::move(rhs.q_);
+        super_t::operator=( std::move( rhs ) );
+        q_ = std::move( rhs.q_ );
         return *this;
     }
 #endif
 
-    d_ary_heap & operator=(d_ary_heap const & rhs)
+    d_ary_heap& operator=( d_ary_heap const& rhs )
     {
-        static_cast<super_t&>(*this) = static_cast<super_t const &>(rhs);
-        q_ = rhs.q_;
+        static_cast< super_t& >( *this ) = static_cast< super_t const& >( rhs );
+        q_                               = rhs.q_;
         return *this;
     }
 
-    bool empty(void) const
+    bool empty( void ) const
     {
         return q_.empty();
     }
 
-    size_type size(void) const
+    size_type size( void ) const
     {
         return q_.size();
     }
 
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         return q_.max_size();
     }
 
-    void clear(void)
+    void clear( void )
     {
         q_.clear();
     }
 
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return q_.get_allocator();
     }
 
-    value_type const & top(void) const
+    value_type const& top( void ) const
     {
-        BOOST_ASSERT(!empty());
-        return super_t::get_value(q_.front());
+        BOOST_ASSERT( !empty() );
+        return super_t::get_value( q_.front() );
     }
 
-    void push(value_type const & v)
+    void push( value_type const& v )
     {
-        q_.push_back(super_t::make_node(v));
-        reset_index(size() - 1, size() - 1);
-        siftup(q_.size() - 1);
+        q_.push_back( super_t::make_node( v ) );
+        reset_index( size() - 1, size() - 1 );
+        siftup( q_.size() - 1 );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    void emplace(Args&&... args)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    void emplace( Args&&... args )
     {
-        q_.emplace_back(super_t::make_node(std::forward<Args>(args)...));
-        reset_index(size() - 1, size() - 1);
-        siftup(q_.size() - 1);
+        q_.emplace_back( super_t::make_node( std::forward< Args >( args )... ) );
+        reset_index( size() - 1, size() - 1 );
+        siftup( q_.size() - 1 );
     }
 #endif
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
-        std::swap(q_.front(), q_.back());
+        BOOST_ASSERT( !empty() );
+        std::swap( q_.front(), q_.back() );
         q_.pop_back();
 
-        if (q_.empty())
+        if ( q_.empty() )
             return;
 
-        reset_index(0, 0);
-        siftdown(0);
+        reset_index( 0, 0 );
+        siftdown( 0 );
     }
 
-    void swap(d_ary_heap & rhs)
+    void swap( d_ary_heap& rhs )
     {
-        super_t::swap(rhs);
-        q_.swap(rhs.q_);
+        super_t::swap( rhs );
+        q_.swap( rhs.q_ );
     }
 
-    iterator begin(void) const
+    iterator begin( void ) const
     {
-        return iterator(q_.begin());
+        return iterator( q_.begin() );
     }
 
-    iterator end(void) const
+    iterator end( void ) const
     {
-        return iterator(q_.end());
+        return iterator( q_.end() );
     }
 
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
-        return ordered_iterator(0, this, super_t::get_internal_cmp());
+        return ordered_iterator( 0, this, super_t::get_internal_cmp() );
     }
 
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
-        return ordered_iterator(size(), this, super_t::get_internal_cmp());
+        return ordered_iterator( size(), this, super_t::get_internal_cmp() );
     }
 
-    void reserve (size_type element_count)
+    void reserve( size_type element_count )
     {
-        q_.reserve(element_count);
+        q_.reserve( element_count );
     }
 
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
 
 private:
-    void reset_index(size_type index, size_type new_index)
+    void reset_index( size_type index, size_type new_index )
     {
-        BOOST_HEAP_ASSERT(index < q_.size());
-        index_updater::run(q_[index], new_index);
+        BOOST_HEAP_ASSERT( index < q_.size() );
+        index_updater::run( q_[ index ], new_index );
     }
 
-    void siftdown(size_type index)
+    void siftdown( size_type index )
     {
-        while (not_leaf(index)) {
-            size_type max_child_index = top_child_index(index);
-            if (!super_t::operator()(q_[max_child_index], q_[index])) {
-                reset_index(index, max_child_index);
-                reset_index(max_child_index, index);
-                std::swap(q_[max_child_index], q_[index]);
+        while ( not_leaf( index ) ) {
+            size_type max_child_index = top_child_index( index );
+            if ( !super_t::operator()( q_[ max_child_index ], q_[ index ] ) ) {
+                reset_index( index, max_child_index );
+                reset_index( max_child_index, index );
+                std::swap( q_[ max_child_index ], q_[ index ] );
                 index = max_child_index;
-            }
-            else
+            } else
                 return;
         }
     }
 
     /* returns new index */
-    void siftup(size_type index)
+    void siftup( size_type index )
     {
-        while (index != 0) {
-            size_type parent = parent_index(index);
+        while ( index != 0 ) {
+            size_type parent = parent_index( index );
 
-            if (super_t::operator()(q_[parent], q_[index])) {
-                reset_index(index, parent);
-                reset_index(parent, index);
-                std::swap(q_[parent], q_[index]);
+            if ( super_t::operator()( q_[ parent ], q_[ index ] ) ) {
+                reset_index( index, parent );
+                reset_index( parent, index );
+                std::swap( q_[ parent ], q_[ index ] );
                 index = parent;
-            }
-            else
+            } else
                 return;
         }
     }
 
-    bool not_leaf(size_type index) const
+    bool not_leaf( size_type index ) const
     {
-        const size_t first_child = first_child_index(index);
+        const size_t first_child = first_child_index( index );
         return first_child < q_.size();
     }
 
-    size_type top_child_index(size_type index) const
+    size_type top_child_index( size_type index ) const
     {
         // invariant: index is not a leaf, so the iterator range is not empty
 
-        const size_t first_index = first_child_index(index);
+        const size_t                                    first_index = first_child_index( index );
         typedef typename container_type::const_iterator container_iterator;
 
         const container_iterator first_child = q_.begin() + first_index;
-        const container_iterator end = q_.end();
+        const container_iterator end         = q_.end();
 
-        const size_type max_elements = std::distance(first_child, end);
+        const size_type max_elements = std::distance( first_child, end );
 
-        const container_iterator last_child = (max_elements > D) ? first_child + D
-                                                                 : end;
+        const container_iterator last_child = ( max_elements > D ) ? first_child + D : end;
 
-        const container_iterator min_element = std::max_element(first_child, last_child, static_cast<super_t const &>(*this));
+        const container_iterator min_element
+            = std::max_element( first_child, last_child, static_cast< super_t const& >( *this ) );
 
         return min_element - q_.begin();
     }
 
-    static size_type parent_index(size_type index)
+    static size_type parent_index( size_type index )
     {
-        return (index - 1) / D;
+        return ( index - 1 ) / D;
     }
 
-    static size_type first_child_index(size_type index)
+    static size_type first_child_index( size_type index )
     {
         return index * D + 1;
     }
 
-    size_type last_child_index(size_type index) const
+    size_type last_child_index( size_type index ) const
     {
-        const size_t first_index = first_child_index(index);
-        const size_type last_index = (std::min)(first_index + D - 1, size() - 1);
+        const size_t    first_index = first_child_index( index );
+        const size_type last_index  = ( std::min )( first_index + D - 1, size() - 1 );
 
         return last_index;
     }
 
-    template<typename U,
-             typename V,
-             typename W,
-             typename X>
-    struct rebind {
-        typedef d_ary_heap<U, typename d_ary_heap_signature::bind<boost::heap::stable<heap_base_maker::is_stable>,
-                                                                  boost::heap::stability_counter_type<typename heap_base_maker::stability_counter_type>,
-                                                                  boost::heap::arity<D>,
-                                                                  boost::heap::compare<V>,
-                                                                  boost::heap::allocator<W>
-                                                                    >::type,
-                           X
-                          > other;
+    template < typename U, typename V, typename W, typename X >
+    struct rebind
+    {
+        typedef d_ary_heap< U,
+                            typename d_ary_heap_signature::bind<
+                                boost::heap::stable< heap_base_maker::is_stable >,
+                                boost::heap::stability_counter_type< typename heap_base_maker::stability_counter_type >,
+                                boost::heap::arity< D >,
+                                boost::heap::compare< V >,
+                                boost::heap::allocator< W > >::type,
+                            X >
+            other;
     };
 
-    template <class U> friend class priority_queue_mutable_wrapper;
+    template < class U >
+    friend class priority_queue_mutable_wrapper;
 
-    void update(size_type index)
+    void update( size_type index )
     {
-        if (index == 0) {
-            siftdown(index);
+        if ( index == 0 ) {
+            siftdown( index );
             return;
         }
-        size_type parent = parent_index(index);
+        size_type parent = parent_index( index );
 
-        if (super_t::operator()(q_[parent], q_[index]))
-            siftup(index);
+        if ( super_t::operator()( q_[ parent ], q_[ index ] ) )
+            siftup( index );
         else
-            siftdown(index);
+            siftdown( index );
     }
 
-    void erase(size_type index)
+    void erase( size_type index )
     {
-        while (index != 0)
-        {
-            size_type parent = parent_index(index);
+        while ( index != 0 ) {
+            size_type parent = parent_index( index );
 
-            reset_index(index, parent);
-            reset_index(parent, index);
-            std::swap(q_[parent], q_[index]);
+            reset_index( index, parent );
+            reset_index( parent, index );
+            std::swap( q_[ parent ], q_[ index ] );
             index = parent;
         }
         pop();
     }
 
-    void increase(size_type index)
+    void increase( size_type index )
     {
-        siftup(index);
+        siftup( index );
     }
 
-    void decrease(size_type index)
+    void decrease( size_type index )
     {
-        siftdown(index);
+        siftdown( index );
     }
 };
 
 
-template <typename T, typename BoundArgs>
+template < typename T, typename BoundArgs >
 struct select_dary_heap
 {
-    static const bool is_mutable = extract_mutable<BoundArgs>::value;
+    static const bool is_mutable = extract_mutable< BoundArgs >::value;
 
     typedef typename boost::conditional< is_mutable,
-                                priority_queue_mutable_wrapper<d_ary_heap<T, BoundArgs, nop_index_updater > >,
-                                d_ary_heap<T, BoundArgs, nop_index_updater >
-                              >::type type;
+                                         priority_queue_mutable_wrapper< d_ary_heap< T, BoundArgs, nop_index_updater > >,
+                                         d_ary_heap< T, BoundArgs, nop_index_updater > >::type type;
 };
 
 } /* namespace detail */
 
 
-
 /**
  * \class d_ary_heap
  * \brief d-ary heap class
@@ -451,194 +443,192 @@ struct select_dary_heap
  *
  */
 #ifdef BOOST_DOXYGEN_INVOKED
-template<class T, class ...Options>
+template < class T, class... Options >
 #else
-template <typename T,
-          class A0 = boost::parameter::void_,
-          class A1 = boost::parameter::void_,
-          class A2 = boost::parameter::void_,
-          class A3 = boost::parameter::void_,
-          class A4 = boost::parameter::void_,
-          class A5 = boost::parameter::void_
-         >
+template < typename T,
+           class A0 = boost::parameter::void_,
+           class A1 = boost::parameter::void_,
+           class A2 = boost::parameter::void_,
+           class A3 = boost::parameter::void_,
+           class A4 = boost::parameter::void_,
+           class A5 = boost::parameter::void_ >
 #endif
-class d_ary_heap:
-    public detail::select_dary_heap<T, typename detail::d_ary_heap_signature::bind<A0, A1, A2, A3, A4, A5>::type>::type
+class d_ary_heap :
+    public detail::select_dary_heap< T, typename detail::d_ary_heap_signature::bind< A0, A1, A2, A3, A4, A5 >::type >::type
 {
-    typedef typename detail::d_ary_heap_signature::bind<A0, A1, A2, A3, A4, A5>::type bound_args;
-    typedef typename detail::select_dary_heap<T, bound_args>::type super_t;
+    typedef typename detail::d_ary_heap_signature::bind< A0, A1, A2, A3, A4, A5 >::type bound_args;
+    typedef typename detail::select_dary_heap< T, bound_args >::type                    super_t;
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
 #ifndef BOOST_DOXYGEN_INVOKED
-    static const bool is_mutable = detail::extract_mutable<bound_args>::value;
+    static const bool is_mutable = detail::extract_mutable< bound_args >::value;
 
-#define BOOST_HEAP_TYPEDEF_FROM_SUPER_T(NAME)   \
-    typedef typename super_t::NAME NAME;
+#    define BOOST_HEAP_TYPEDEF_FROM_SUPER_T( NAME ) typedef typename super_t::NAME NAME;
 
     struct implementation_defined
     {
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(size_type)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(difference_type)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(value_compare)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(allocator_type)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(reference)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(const_reference)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(pointer)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(const_pointer)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(iterator)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(const_iterator)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(ordered_iterator)
-        BOOST_HEAP_TYPEDEF_FROM_SUPER_T(handle_type)
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( size_type )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( difference_type )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( value_compare )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( allocator_type )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( reference )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( const_reference )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( pointer )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( const_pointer )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( iterator )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( const_iterator )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( ordered_iterator )
+        BOOST_HEAP_TYPEDEF_FROM_SUPER_T( handle_type )
     };
-#undef BOOST_HEAP_TYPEDEF_FROM_SUPER_T
+#    undef BOOST_HEAP_TYPEDEF_FROM_SUPER_T
 
 #endif
 public:
-    static const bool constant_time_size = true;
+    static const bool constant_time_size    = true;
     static const bool has_ordered_iterators = true;
-    static const bool is_mergable = false;
-    static const bool has_reserve = true;
-    static const bool is_stable = super_t::is_stable;
-
-    typedef T value_type;
-    typedef typename implementation_defined::size_type size_type;
-    typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
-    typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
+    static const bool is_mergable           = false;
+    static const bool has_reserve           = true;
+    static const bool is_stable             = super_t::is_stable;
+
+    typedef T                                                 value_type;
+    typedef typename implementation_defined::size_type        size_type;
+    typedef typename implementation_defined::difference_type  difference_type;
+    typedef typename implementation_defined::value_compare    value_compare;
+    typedef typename implementation_defined::allocator_type   allocator_type;
+    typedef typename implementation_defined::reference        reference;
+    typedef typename implementation_defined::const_reference  const_reference;
+    typedef typename implementation_defined::pointer          pointer;
+    typedef typename implementation_defined::const_pointer    const_pointer;
     /// \copydoc boost::heap::priority_queue::iterator
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::iterator         iterator;
+    typedef typename implementation_defined::const_iterator   const_iterator;
     typedef typename implementation_defined::ordered_iterator ordered_iterator;
-    typedef typename implementation_defined::handle_type handle_type;
+    typedef typename implementation_defined::handle_type      handle_type;
 
     /// \copydoc boost::heap::priority_queue::priority_queue(value_compare const &)
-    explicit d_ary_heap(value_compare const & cmp = value_compare()):
-        super_t(cmp)
+    explicit d_ary_heap( value_compare const& cmp = value_compare() ) :
+        super_t( cmp )
     {}
 
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue const &)
-    d_ary_heap(d_ary_heap const & rhs):
-        super_t(rhs)
+    d_ary_heap( d_ary_heap const& rhs ) :
+        super_t( rhs )
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
-    d_ary_heap(d_ary_heap && rhs):
-        super_t(std::move(rhs))
+    d_ary_heap( d_ary_heap&& rhs ) :
+        super_t( std::move( rhs ) )
     {}
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue &&)
-    d_ary_heap & operator=(d_ary_heap && rhs)
+    d_ary_heap& operator=( d_ary_heap&& rhs )
     {
-        super_t::operator=(std::move(rhs));
+        super_t::operator=( std::move( rhs ) );
         return *this;
     }
 #endif
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue const &)
-    d_ary_heap & operator=(d_ary_heap const & rhs)
+    d_ary_heap& operator=( d_ary_heap const& rhs )
     {
-        super_t::operator=(rhs);
+        super_t::operator=( rhs );
         return *this;
     }
 
     /// \copydoc boost::heap::priority_queue::empty
-    bool empty(void) const
+    bool empty( void ) const
     {
         return super_t::empty();
     }
 
     /// \copydoc boost::heap::priority_queue::size
-    size_type size(void) const
+    size_type size( void ) const
     {
         return super_t::size();
     }
 
     /// \copydoc boost::heap::priority_queue::max_size
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         return super_t::max_size();
     }
 
     /// \copydoc boost::heap::priority_queue::clear
-    void clear(void)
+    void clear( void )
     {
         super_t::clear();
     }
 
     /// \copydoc boost::heap::priority_queue::get_allocator
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return super_t::get_allocator();
     }
 
     /// \copydoc boost::heap::priority_queue::top
-    value_type const & top(void) const
+    value_type const& top( void ) const
     {
         return super_t::top();
     }
 
     /// \copydoc boost::heap::priority_queue::push
-    typename boost::conditional<is_mutable, handle_type, void>::type push(value_type const & v)
+    typename boost::conditional< is_mutable, handle_type, void >::type push( value_type const& v )
     {
-        return super_t::push(v);
+        return super_t::push( v );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
     /// \copydoc boost::heap::priority_queue::emplace
-    template <class... Args>
-    typename boost::conditional<is_mutable, handle_type, void>::type emplace(Args&&... args)
+    template < class... Args >
+    typename boost::conditional< is_mutable, handle_type, void >::type emplace( Args&&... args )
     {
-        return super_t::emplace(std::forward<Args>(args)...);
+        return super_t::emplace( std::forward< Args >( args )... );
     }
 #endif
 
     /// \copydoc boost::heap::priority_queue::operator<(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<( HeapType const& rhs ) const
     {
-        return detail::heap_compare(*this, rhs);
+        return detail::heap_compare( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>( HeapType const& rhs ) const
     {
-        return detail::heap_compare(rhs, *this);
+        return detail::heap_compare( rhs, *this );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>=( HeapType const& rhs ) const
     {
-        return !operator<(rhs);
+        return !operator<( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator<=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<=( HeapType const& rhs ) const
     {
-        return !operator>(rhs);
+        return !operator>( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator==(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator==(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator==( HeapType const& rhs ) const
     {
-        return detail::heap_equality(*this, rhs);
+        return detail::heap_equality( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator!=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator!=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator!=( HeapType const& rhs ) const
     {
-        return !(*this == rhs);
+        return !( *this == rhs );
     }
 
     /**
@@ -648,10 +638,10 @@ class d_ary_heap:
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void update(handle_type handle, const_reference v)
+    void update( handle_type handle, const_reference v )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::update(handle, v);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::update( handle, v );
     }
 
     /**
@@ -663,13 +653,13 @@ class d_ary_heap:
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void update(handle_type handle)
+    void update( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::update(handle);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::update( handle );
     }
 
-     /**
+    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \b Complexity: Logarithmic.
@@ -678,10 +668,10 @@ class d_ary_heap:
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void increase(handle_type handle, const_reference v)
+    void increase( handle_type handle, const_reference v )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::increase(handle, v);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::increase( handle, v );
     }
 
     /**
@@ -689,17 +679,18 @@ class d_ary_heap:
      *
      * \b Complexity: Logarithmic.
      *
-     * \b Note: The new value is expected to be greater than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be greater than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void increase(handle_type handle)
+    void increase( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::increase(handle);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::increase( handle );
     }
 
-     /**
+    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \b Complexity: Logarithmic.
@@ -708,10 +699,10 @@ class d_ary_heap:
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void decrease(handle_type handle, const_reference v)
+    void decrease( handle_type handle, const_reference v )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::decrease(handle, v);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::decrease( handle, v );
     }
 
     /**
@@ -719,14 +710,15 @@ class d_ary_heap:
      *
      * \b Complexity: Logarithmic.
      *
-     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void decrease(handle_type handle)
+    void decrease( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::decrease(handle);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::decrease( handle );
     }
 
     /**
@@ -736,10 +728,10 @@ class d_ary_heap:
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    void erase(handle_type handle)
+    void erase( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        super_t::erase(handle);
+        BOOST_STATIC_ASSERT( is_mutable );
+        super_t::erase( handle );
     }
 
     /**
@@ -749,75 +741,74 @@ class d_ary_heap:
      *
      * \b Requirement: data structure must be configured as mutable
      * */
-    static handle_type s_handle_from_iterator(iterator const & it)
+    static handle_type s_handle_from_iterator( iterator const& it )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        return super_t::s_handle_from_iterator(it);
+        BOOST_STATIC_ASSERT( is_mutable );
+        return super_t::s_handle_from_iterator( it );
     }
 
     /// \copydoc boost::heap::priority_queue::pop
-    void pop(void)
+    void pop( void )
     {
         super_t::pop();
     }
 
     /// \copydoc boost::heap::priority_queue::swap
-    void swap(d_ary_heap & rhs)
+    void swap( d_ary_heap& rhs )
     {
-        super_t::swap(rhs);
+        super_t::swap( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::begin
-    const_iterator begin(void) const
+    const_iterator begin( void ) const
     {
         return super_t::begin();
     }
 
     /// \copydoc boost::heap::priority_queue::begin
-    iterator begin(void)
+    iterator begin( void )
     {
         return super_t::begin();
     }
 
     /// \copydoc boost::heap::priority_queue::end
-    iterator end(void)
+    iterator end( void )
     {
         return super_t::end();
     }
 
     /// \copydoc boost::heap::priority_queue::end
-    const_iterator end(void) const
+    const_iterator end( void ) const
     {
         return super_t::end();
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_begin
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
         return super_t::ordered_begin();
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_end
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
         return super_t::ordered_end();
     }
 
     /// \copydoc boost::heap::priority_queue::reserve
-    void reserve (size_type element_count)
+    void reserve( size_type element_count )
     {
-        super_t::reserve(element_count);
+        super_t::reserve( element_count );
     }
 
     /// \copydoc boost::heap::priority_queue::value_comp
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
 };
 
-} /* namespace heap */
-} /* namespace boost */
+}} // namespace boost::heap
 
 #undef BOOST_HEAP_ASSERT
 
diff --git a/inst/include/boost/heap/detail/heap_comparison.hpp b/inst/include/boost/heap/detail/heap_comparison.hpp
index 69d98145e..a2fa54d0e 100644
--- a/inst/include/boost/heap/detail/heap_comparison.hpp
+++ b/inst/include/boost/heap/detail/heap_comparison.hpp
@@ -10,81 +10,77 @@
 #define BOOST_HEAP_DETAIL_HEAP_COMPARISON_HPP
 
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/concept/assert.hpp>
 #include <boost/heap/heap_concepts.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/type_traits/conditional.hpp>
 
 #ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    define BOOST_HEAP_ASSERT BOOST_ASSERT
 #else
-#define BOOST_HEAP_ASSERT(expression)
+#    define BOOST_HEAP_ASSERT( expression )
 #endif
 
-namespace boost  {
-namespace heap   {
-namespace detail {
+namespace boost { namespace heap { namespace detail {
 
-template <typename Heap1, typename Heap2>
-bool value_equality(Heap1 const & lhs, Heap2 const & rhs,
-                    typename Heap1::value_type lval, typename Heap2::value_type rval)
+template < typename Heap1, typename Heap2 >
+bool value_equality( Heap1 const& lhs, Heap2 const& rhs, typename Heap1::value_type lval, typename Heap2::value_type rval )
 {
-    typename Heap1::value_compare const & cmp = lhs.value_comp();
-    bool ret = !(cmp(lval, rval)) && !(cmp(rval, lval));
+    typename Heap1::value_compare const& cmp = lhs.value_comp();
+    bool                                 ret = !( cmp( lval, rval ) ) && !( cmp( rval, lval ) );
 
     // if this assertion is triggered, the value_compare objects of lhs and rhs return different values
-    BOOST_ASSERT((ret == (!(rhs.value_comp()(lval, rval)) && !(rhs.value_comp()(rval, lval)))));
+    BOOST_ASSERT( ( ret == ( !( rhs.value_comp()( lval, rval ) ) && !( rhs.value_comp()( rval, lval ) ) ) ) );
 
     return ret;
 }
 
-template <typename Heap1, typename Heap2>
-bool value_compare(Heap1 const & lhs, Heap2 const & rhs,
-                    typename Heap1::value_type lval, typename Heap2::value_type rval)
+template < typename Heap1, typename Heap2 >
+bool value_compare( Heap1 const& lhs, Heap2 const& rhs, typename Heap1::value_type lval, typename Heap2::value_type rval )
 {
-    typename Heap1::value_compare const & cmp = lhs.value_comp();
-    bool ret = cmp(lval, rval);
+    typename Heap1::value_compare const& cmp = lhs.value_comp();
+    bool                                 ret = cmp( lval, rval );
 
     // if this assertion is triggered, the value_compare objects of lhs and rhs return different values
-    BOOST_ASSERT((ret == rhs.value_comp()(lval, rval)));
+    BOOST_ASSERT( ( ret == rhs.value_comp()( lval, rval ) ) );
     return ret;
 }
 
 struct heap_equivalence_copy
 {
-    template <typename Heap1, typename Heap2>
-    bool operator()(Heap1 const & lhs, Heap2 const & rhs)
+    template < typename Heap1, typename Heap2 >
+    bool operator()( Heap1 const& lhs, Heap2 const& rhs )
     {
-        BOOST_CONCEPT_ASSERT((boost::heap::PriorityQueue<Heap1>));
-        BOOST_CONCEPT_ASSERT((boost::heap::PriorityQueue<Heap2>));
+        BOOST_CONCEPT_ASSERT( (boost::heap::PriorityQueue< Heap1 >));
+        BOOST_CONCEPT_ASSERT( (boost::heap::PriorityQueue< Heap2 >));
 
         // if this assertion is triggered, the value_compare types are incompatible
-        BOOST_STATIC_ASSERT((boost::is_same<typename Heap1::value_compare, typename Heap2::value_compare>::value));
+        BOOST_STATIC_ASSERT( ( boost::is_same< typename Heap1::value_compare, typename Heap2::value_compare >::value ) );
 
-        if (Heap1::constant_time_size && Heap2::constant_time_size)
-            if (lhs.size() != rhs.size())
+        if ( Heap1::constant_time_size && Heap2::constant_time_size )
+            if ( lhs.size() != rhs.size() )
                 return false;
 
-        if (lhs.empty() && rhs.empty())
+        if ( lhs.empty() && rhs.empty() )
             return true;
 
-        Heap1 lhs_copy(lhs);
-        Heap2 rhs_copy(rhs);
+        Heap1 lhs_copy( lhs );
+        Heap2 rhs_copy( rhs );
 
-        while (true) {
-            if (!value_equality(lhs_copy, rhs_copy, lhs_copy.top(), rhs_copy.top()))
+        while ( true ) {
+            if ( !value_equality( lhs_copy, rhs_copy, lhs_copy.top(), rhs_copy.top() ) )
                 return false;
 
             lhs_copy.pop();
             rhs_copy.pop();
 
-            if (lhs_copy.empty() && rhs_copy.empty())
+            if ( lhs_copy.empty() && rhs_copy.empty() )
                 return true;
 
-            if (lhs_copy.empty())
+            if ( lhs_copy.empty() )
                 return false;
 
-            if (rhs_copy.empty())
+            if ( rhs_copy.empty() )
                 return false;
         }
     }
@@ -93,93 +89,87 @@ struct heap_equivalence_copy
 
 struct heap_equivalence_iteration
 {
-    template <typename Heap1, typename Heap2>
-    bool operator()(Heap1 const & lhs, Heap2 const & rhs)
+    template < typename Heap1, typename Heap2 >
+    bool operator()( Heap1 const& lhs, Heap2 const& rhs )
     {
-        BOOST_CONCEPT_ASSERT((boost::heap::PriorityQueue<Heap1>));
-        BOOST_CONCEPT_ASSERT((boost::heap::PriorityQueue<Heap2>));
+        BOOST_CONCEPT_ASSERT( (boost::heap::PriorityQueue< Heap1 >));
+        BOOST_CONCEPT_ASSERT( (boost::heap::PriorityQueue< Heap2 >));
 
         // if this assertion is triggered, the value_compare types are incompatible
-        BOOST_STATIC_ASSERT((boost::is_same<typename Heap1::value_compare, typename Heap2::value_compare>::value));
+        BOOST_STATIC_ASSERT( ( boost::is_same< typename Heap1::value_compare, typename Heap2::value_compare >::value ) );
 
-        if (Heap1::constant_time_size && Heap2::constant_time_size)
-            if (lhs.size() != rhs.size())
+        if ( Heap1::constant_time_size && Heap2::constant_time_size )
+            if ( lhs.size() != rhs.size() )
                 return false;
 
-        if (lhs.empty() && rhs.empty())
+        if ( lhs.empty() && rhs.empty() )
             return true;
 
-        typename Heap1::ordered_iterator it1 = lhs.ordered_begin();
+        typename Heap1::ordered_iterator it1     = lhs.ordered_begin();
         typename Heap1::ordered_iterator it1_end = lhs.ordered_end();
-        typename Heap1::ordered_iterator it2 = rhs.ordered_begin();
+        typename Heap1::ordered_iterator it2     = rhs.ordered_begin();
         typename Heap1::ordered_iterator it2_end = rhs.ordered_end();
-        while (true) {
-            if (!value_equality(lhs, rhs, *it1, *it2))
+        while ( true ) {
+            if ( !value_equality( lhs, rhs, *it1, *it2 ) )
                 return false;
 
             ++it1;
             ++it2;
 
-            if (it1 == it1_end && it2 == it2_end)
+            if ( it1 == it1_end && it2 == it2_end )
                 return true;
 
-            if (it1 == it1_end || it2 == it2_end)
+            if ( it1 == it1_end || it2 == it2_end )
                 return false;
         }
     }
 };
 
 
-template <typename Heap1,
-          typename Heap2
-         >
-bool heap_equality(Heap1 const & lhs, Heap2 const & rhs)
+template < typename Heap1, typename Heap2 >
+bool heap_equality( Heap1 const& lhs, Heap2 const& rhs )
 {
     const bool use_ordered_iterators = Heap1::has_ordered_iterators && Heap2::has_ordered_iterators;
 
-    typedef typename boost::conditional<use_ordered_iterators,
-                                      heap_equivalence_iteration,
-                                      heap_equivalence_copy
-                                     >::type equivalence_check;
+    typedef typename boost::conditional< use_ordered_iterators, heap_equivalence_iteration, heap_equivalence_copy >::type
+        equivalence_check;
 
     equivalence_check eq_check;
-    return eq_check(lhs, rhs);
+    return eq_check( lhs, rhs );
 }
 
 
 struct heap_compare_iteration
 {
-    template <typename Heap1,
-              typename Heap2
-             >
-    bool operator()(Heap1 const & lhs, Heap2 const & rhs)
+    template < typename Heap1, typename Heap2 >
+    bool operator()( Heap1 const& lhs, Heap2 const& rhs )
     {
-        typename Heap1::size_type left_size = lhs.size();
+        typename Heap1::size_type left_size  = lhs.size();
         typename Heap2::size_type right_size = rhs.size();
-        if (left_size < right_size)
+        if ( left_size < right_size )
             return true;
 
-        if (left_size > right_size)
+        if ( left_size > right_size )
             return false;
 
-        typename Heap1::ordered_iterator it1 = lhs.ordered_begin();
+        typename Heap1::ordered_iterator it1     = lhs.ordered_begin();
         typename Heap1::ordered_iterator it1_end = lhs.ordered_end();
-        typename Heap1::ordered_iterator it2 = rhs.ordered_begin();
+        typename Heap1::ordered_iterator it2     = rhs.ordered_begin();
         typename Heap1::ordered_iterator it2_end = rhs.ordered_end();
-        while (true) {
-            if (value_compare(lhs, rhs, *it1, *it2))
+        while ( true ) {
+            if ( value_compare( lhs, rhs, *it1, *it2 ) )
                 return true;
 
-            if (value_compare(lhs, rhs, *it2, *it1))
+            if ( value_compare( lhs, rhs, *it2, *it1 ) )
                 return false;
 
             ++it1;
             ++it2;
 
-            if (it1 == it1_end && it2 == it2_end)
+            if ( it1 == it1_end && it2 == it2_end )
                 return true;
 
-            if (it1 == it1_end || it2 == it2_end)
+            if ( it1 == it1_end || it2 == it2_end )
                 return false;
         }
     }
@@ -187,58 +177,50 @@ struct heap_compare_iteration
 
 struct heap_compare_copy
 {
-    template <typename Heap1,
-              typename Heap2
-             >
-    bool operator()(Heap1 const & lhs, Heap2 const & rhs)
+    template < typename Heap1, typename Heap2 >
+    bool operator()( Heap1 const& lhs, Heap2 const& rhs )
     {
-        typename Heap1::size_type left_size = lhs.size();
+        typename Heap1::size_type left_size  = lhs.size();
         typename Heap2::size_type right_size = rhs.size();
-        if (left_size < right_size)
+        if ( left_size < right_size )
             return true;
 
-        if (left_size > right_size)
+        if ( left_size > right_size )
             return false;
 
-        Heap1 lhs_copy(lhs);
-        Heap2 rhs_copy(rhs);
+        Heap1 lhs_copy( lhs );
+        Heap2 rhs_copy( rhs );
 
-        while (true) {
-            if (value_compare(lhs_copy, rhs_copy, lhs_copy.top(), rhs_copy.top()))
+        while ( true ) {
+            if ( value_compare( lhs_copy, rhs_copy, lhs_copy.top(), rhs_copy.top() ) )
                 return true;
 
-            if (value_compare(lhs_copy, rhs_copy, rhs_copy.top(), lhs_copy.top()))
+            if ( value_compare( lhs_copy, rhs_copy, rhs_copy.top(), lhs_copy.top() ) )
                 return false;
 
             lhs_copy.pop();
             rhs_copy.pop();
 
-            if (lhs_copy.empty() && rhs_copy.empty())
+            if ( lhs_copy.empty() && rhs_copy.empty() )
                 return false;
         }
     }
 };
 
-template <typename Heap1,
-          typename Heap2
-         >
-bool heap_compare(Heap1 const & lhs, Heap2 const & rhs)
+template < typename Heap1, typename Heap2 >
+bool heap_compare( Heap1 const& lhs, Heap2 const& rhs )
 {
     const bool use_ordered_iterators = Heap1::has_ordered_iterators && Heap2::has_ordered_iterators;
 
-    typedef typename boost::conditional<use_ordered_iterators,
-                                      heap_compare_iteration,
-                                      heap_compare_copy
-                                     >::type compare_check;
+    typedef
+        typename boost::conditional< use_ordered_iterators, heap_compare_iteration, heap_compare_copy >::type compare_check;
 
     compare_check check_object;
-    return check_object(lhs, rhs);
+    return check_object( lhs, rhs );
 }
 
 
-} /* namespace detail */
-} /* namespace heap */
-} /* namespace boost */
+}}} // namespace boost::heap::detail
 
 
 #undef BOOST_HEAP_ASSERT
diff --git a/inst/include/boost/heap/detail/heap_node.hpp b/inst/include/boost/heap/detail/heap_node.hpp
index 755eac3f0..92ca3d4a4 100644
--- a/inst/include/boost/heap/detail/heap_node.hpp
+++ b/inst/include/boost/heap/detail/heap_node.hpp
@@ -10,81 +10,76 @@
 #define BOOST_HEAP_DETAIL_HEAP_NODE_HPP
 
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/core/allocator_access.hpp>
 #include <boost/intrusive/list.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/type_traits/conditional.hpp>
 
 #ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    define BOOST_HEAP_ASSERT BOOST_ASSERT
 #else
-#define BOOST_HEAP_ASSERT(expression)
+#    define BOOST_HEAP_ASSERT( expression )
 #endif
 
 
-namespace boost  {
-namespace heap   {
-namespace detail {
+namespace boost { namespace heap { namespace detail {
 
 namespace bi = boost::intrusive;
 
-template <bool auto_unlink = false>
-struct heap_node_base:
-    bi::list_base_hook<typename boost::conditional<auto_unlink,
-                                          bi::link_mode<bi::auto_unlink>,
-                                          bi::link_mode<bi::safe_link>
-                                         >::type
-                      >
+template < bool auto_unlink = false >
+struct heap_node_base :
+    bi::list_base_hook<
+        typename boost::conditional< auto_unlink, bi::link_mode< bi::auto_unlink >, bi::link_mode< bi::safe_link > >::type >
 {};
 
-typedef bi::list<heap_node_base<false> > heap_node_list;
+typedef bi::list< heap_node_base< false > > heap_node_list;
 
 struct nop_disposer
 {
-    template <typename T>
-    void operator()(T * n)
+    template < typename T >
+    void operator()( T* n )
     {
-        BOOST_HEAP_ASSERT(false);
+        BOOST_HEAP_ASSERT( false );
     }
 };
 
-template <typename Node, typename HeapBase>
-bool is_heap(const Node * n, typename HeapBase::value_compare const & cmp)
+template < typename Node, typename HeapBase >
+bool is_heap( const Node* n, typename HeapBase::value_compare const& cmp )
 {
-    for (typename Node::const_child_iterator it = n->children.begin(); it != n->children.end(); ++it) {
-        Node const & this_node = static_cast<Node const &>(*it);
-        const Node * child = static_cast<const Node*>(&this_node);
+    for ( typename Node::const_child_iterator it = n->children.begin(); it != n->children.end(); ++it ) {
+        Node const& this_node = static_cast< Node const& >( *it );
+        const Node* child     = static_cast< const Node* >( &this_node );
 
-        if (cmp(HeapBase::get_value(n->value), HeapBase::get_value(child->value)) ||
-            !is_heap<Node, HeapBase>(child, cmp))
+        if ( cmp( HeapBase::get_value( n->value ), HeapBase::get_value( child->value ) )
+             || !is_heap< Node, HeapBase >( child, cmp ) )
             return false;
     }
     return true;
 }
 
-template <typename Node>
-std::size_t count_nodes(const Node * n);
+template < typename Node >
+std::size_t count_nodes( const Node* n );
 
-template <typename Node, typename List>
-std::size_t count_list_nodes(List const & node_list)
+template < typename Node, typename List >
+std::size_t count_list_nodes( List const& node_list )
 {
     std::size_t ret = 0;
 
-    for (typename List::const_iterator it = node_list.begin(); it != node_list.end(); ++it) {
-        const Node * child = static_cast<const Node*>(&*it);
-        ret += count_nodes<Node>(child);
+    for ( typename List::const_iterator it = node_list.begin(); it != node_list.end(); ++it ) {
+        const Node* child = static_cast< const Node* >( &*it );
+        ret += count_nodes< Node >( child );
     }
     return ret;
 }
 
-template <typename Node>
-std::size_t count_nodes(const Node * n)
+template < typename Node >
+std::size_t count_nodes( const Node* n )
 {
-    return 1 + count_list_nodes<Node, typename Node::child_list>(n->children);
+    return 1 + count_list_nodes< Node, typename Node::child_list >( n->children );
 }
 
-template<class Node>
-void destroy_node(Node& node)
+template < class Node >
+void destroy_node( Node& node )
 {
     node.~Node();
 }
@@ -100,31 +95,29 @@ void destroy_node(Node& node)
  * Node::Node(Node const &, Alloc &, Node * parent)
  *
  * */
-template <typename Node,
-          typename NodeBase,
-          typename Alloc>
+template < typename Node, typename NodeBase, typename Alloc >
 struct node_cloner
 {
-    node_cloner(Alloc & allocator):
-        allocator(allocator)
+    node_cloner( Alloc& allocator ) :
+        allocator( allocator )
     {}
 
-    Node * operator() (NodeBase const & node)
+    Node* operator()( NodeBase const& node )
     {
-        Node * ret = allocator.allocate(1);
-        new (ret) Node(static_cast<Node const &>(node), allocator);
+        Node* ret = allocator.allocate( 1 );
+        new ( ret ) Node( static_cast< Node const& >( node ), allocator );
         return ret;
     }
 
-    Node * operator() (NodeBase const & node, Node * parent)
+    Node* operator()( NodeBase const& node, Node* parent )
     {
-        Node * ret = allocator.allocate(1);
-        new (ret) Node(static_cast<Node const &>(node), allocator, parent);
+        Node* ret = allocator.allocate( 1 );
+        new ( ret ) Node( static_cast< Node const& >( node ), allocator, parent );
         return ret;
     }
 
 private:
-    Alloc & allocator;
+    Alloc& allocator;
 };
 
 /* node disposer
@@ -133,241 +126,238 @@ struct node_cloner
  * Node::clear_subtree(Alloc &) clears the subtree via allocator
  *
  * */
-template <typename Node,
-          typename NodeBase,
-          typename Alloc>
+template < typename Node, typename NodeBase, typename Alloc >
 struct node_disposer
 {
-    typedef typename boost::allocator_pointer<Alloc>::type node_pointer;
+    typedef typename boost::allocator_pointer< Alloc >::type node_pointer;
 
-    node_disposer(Alloc & alloc):
-        alloc_(alloc)
+    node_disposer( Alloc& alloc ) :
+        alloc_( alloc )
     {}
 
-    void operator()(NodeBase * base)
+    void operator()( NodeBase* base )
     {
-        node_pointer n = static_cast<node_pointer>(base);
-        n->clear_subtree(alloc_);
-        boost::heap::detail::destroy_node(*n);
-        alloc_.deallocate(n, 1);
+        node_pointer n = static_cast< node_pointer >( base );
+        n->clear_subtree( alloc_ );
+        boost::heap::detail::destroy_node( *n );
+        alloc_.deallocate( n, 1 );
     }
 
-    Alloc & alloc_;
+    Alloc& alloc_;
 };
 
 
-template <typename ValueType,
-          bool constant_time_child_size = true
-         >
-struct heap_node:
-    heap_node_base<!constant_time_child_size>
+template < typename ValueType, bool constant_time_child_size = true >
+struct heap_node : heap_node_base< !constant_time_child_size >
 {
-    typedef heap_node_base<!constant_time_child_size> node_base;
+    typedef heap_node_base< !constant_time_child_size > node_base;
 
 public:
     typedef ValueType value_type;
 
-    typedef bi::list<node_base,
-                     bi::constant_time_size<constant_time_child_size> > child_list;
+    typedef bi::list< node_base, bi::constant_time_size< constant_time_child_size > > child_list;
 
-    typedef typename child_list::iterator child_iterator;
+    typedef typename child_list::iterator       child_iterator;
     typedef typename child_list::const_iterator const_child_iterator;
-    typedef typename child_list::size_type size_type;
+    typedef typename child_list::size_type      size_type;
 
-    heap_node(ValueType const & v):
-        value(v)
+    heap_node( ValueType const& v ) :
+        value( v )
     {}
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    heap_node(Args&&... args):
-        value(std::forward<Args>(args)...)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    heap_node( Args&&... args ) :
+        value( std::forward< Args >( args )... )
     {}
 #endif
 
-/* protected:                      */
-    heap_node(heap_node const & rhs):
-        value(rhs.value)
+    /* protected:                      */
+    heap_node( heap_node const& rhs ) :
+        value( rhs.value )
     {
         /* we don't copy the child list, but clone it later */
     }
 
 public:
-
-    template <typename Alloc>
-    heap_node (heap_node const & rhs, Alloc & allocator):
-        value(rhs.value)
+    template < typename Alloc >
+    heap_node( heap_node const& rhs, Alloc& allocator ) :
+        value( rhs.value )
     {
-        children.clone_from(rhs.children, node_cloner<heap_node, node_base, Alloc>(allocator), nop_disposer());
+        children.clone_from( rhs.children, node_cloner< heap_node, node_base, Alloc >( allocator ), nop_disposer() );
     }
 
-    size_type child_count(void) const
+    size_type child_count( void ) const
     {
-        BOOST_STATIC_ASSERT(constant_time_child_size);
+        BOOST_STATIC_ASSERT( constant_time_child_size );
         return children.size();
     }
 
-    void add_child(heap_node * n)
+    void add_child( heap_node* n )
     {
-        children.push_back(*n);
+        children.push_back( *n );
     }
 
-    template <typename Alloc>
-    void clear_subtree(Alloc & alloc)
+    template < typename Alloc >
+    void clear_subtree( Alloc& alloc )
     {
-        children.clear_and_dispose(node_disposer<heap_node, node_base, Alloc>(alloc));
+        children.clear_and_dispose( node_disposer< heap_node, node_base, Alloc >( alloc ) );
     }
 
-    void swap_children(heap_node * rhs)
+    void swap_children( heap_node* rhs )
     {
-        children.swap(rhs->children);
+        children.swap( rhs->children );
     }
 
-    ValueType value;
+    ValueType  value;
     child_list children;
 };
 
-template <typename value_type>
-struct parent_pointing_heap_node:
-    heap_node<value_type>
+template < typename value_type >
+struct parent_pointing_heap_node : heap_node< value_type >
 {
-    typedef heap_node<value_type> super_t;
+    typedef heap_node< value_type > super_t;
 
-    parent_pointing_heap_node(value_type const & v):
-        super_t(v), parent(NULL)
+    parent_pointing_heap_node( value_type const& v ) :
+        super_t( v ),
+        parent( NULL )
     {}
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    parent_pointing_heap_node(Args&&... args):
-        super_t(std::forward<Args>(args)...), parent(NULL)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    parent_pointing_heap_node( Args&&... args ) :
+        super_t( std::forward< Args >( args )... ),
+        parent( NULL )
     {}
 #endif
 
-    template <typename Alloc>
+    template < typename Alloc >
     struct node_cloner
     {
-        node_cloner(Alloc & allocator, parent_pointing_heap_node * parent):
-            allocator(allocator), parent_(parent)
+        node_cloner( Alloc& allocator, parent_pointing_heap_node* parent ) :
+            allocator( allocator ),
+            parent_( parent )
         {}
 
-        parent_pointing_heap_node * operator() (typename super_t::node_base const & node)
+        parent_pointing_heap_node* operator()( typename super_t::node_base const& node )
         {
-            parent_pointing_heap_node * ret = allocator.allocate(1);
-            new (ret) parent_pointing_heap_node(static_cast<parent_pointing_heap_node const &>(node), allocator, parent_);
+            parent_pointing_heap_node* ret = allocator.allocate( 1 );
+            new ( ret )
+                parent_pointing_heap_node( static_cast< parent_pointing_heap_node const& >( node ), allocator, parent_ );
             return ret;
         }
 
     private:
-        Alloc & allocator;
-        parent_pointing_heap_node * parent_;
+        Alloc&                     allocator;
+        parent_pointing_heap_node* parent_;
     };
 
-    template <typename Alloc>
-    parent_pointing_heap_node (parent_pointing_heap_node const & rhs, Alloc & allocator, parent_pointing_heap_node * parent):
-        super_t(static_cast<super_t const &>(rhs)), parent(parent)
+    template < typename Alloc >
+    parent_pointing_heap_node( parent_pointing_heap_node const& rhs,
+                               Alloc&                           allocator,
+                               parent_pointing_heap_node*       parent ) :
+        super_t( static_cast< super_t const& >( rhs ) ),
+        parent( parent )
     {
-        super_t::children.clone_from(rhs.children, node_cloner<Alloc>(allocator, this), nop_disposer());
+        super_t::children.clone_from( rhs.children, node_cloner< Alloc >( allocator, this ), nop_disposer() );
     }
 
-    void update_children(void)
+    void update_children( void )
     {
         typedef heap_node_list::iterator node_list_iterator;
-        for (node_list_iterator it = super_t::children.begin(); it != super_t::children.end(); ++it) {
-            parent_pointing_heap_node * child = static_cast<parent_pointing_heap_node*>(&*it);
-            child->parent = this;
+        for ( node_list_iterator it = super_t::children.begin(); it != super_t::children.end(); ++it ) {
+            parent_pointing_heap_node* child = static_cast< parent_pointing_heap_node* >( &*it );
+            child->parent                    = this;
         }
     }
 
-    void remove_from_parent(void)
+    void remove_from_parent( void )
     {
-        BOOST_HEAP_ASSERT(parent);
-        parent->children.erase(heap_node_list::s_iterator_to(*this));
+        BOOST_HEAP_ASSERT( parent );
+        parent->children.erase( heap_node_list::s_iterator_to( *this ) );
         parent = NULL;
     }
 
-    void add_child(parent_pointing_heap_node * n)
+    void add_child( parent_pointing_heap_node* n )
     {
-        BOOST_HEAP_ASSERT(n->parent == NULL);
+        BOOST_HEAP_ASSERT( n->parent == NULL );
         n->parent = this;
-        super_t::add_child(n);
+        super_t::add_child( n );
     }
 
-    parent_pointing_heap_node * get_parent(void)
+    parent_pointing_heap_node* get_parent( void )
     {
         return parent;
     }
 
-    const parent_pointing_heap_node * get_parent(void) const
+    const parent_pointing_heap_node* get_parent( void ) const
     {
         return parent;
     }
 
-    parent_pointing_heap_node * parent;
+    parent_pointing_heap_node* parent;
 };
 
 
-template <typename value_type>
-struct marked_heap_node:
-    parent_pointing_heap_node<value_type>
+template < typename value_type >
+struct marked_heap_node : parent_pointing_heap_node< value_type >
 {
-    typedef parent_pointing_heap_node<value_type> super_t;
+    typedef parent_pointing_heap_node< value_type > super_t;
 
-    marked_heap_node(value_type const & v):
-        super_t(v), mark(false)
+    marked_heap_node( value_type const& v ) :
+        super_t( v ),
+        mark( false )
     {}
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    marked_heap_node(Args&&... args):
-        super_t(std::forward<Args>(args)...), mark(false)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    marked_heap_node( Args&&... args ) :
+        super_t( std::forward< Args >( args )... ),
+        mark( false )
     {}
 #endif
 
-    marked_heap_node * get_parent(void)
+    marked_heap_node* get_parent( void )
     {
-        return static_cast<marked_heap_node*>(super_t::parent);
+        return static_cast< marked_heap_node* >( super_t::parent );
     }
 
-    const marked_heap_node * get_parent(void) const
+    const marked_heap_node* get_parent( void ) const
     {
-        return static_cast<marked_heap_node*>(super_t::parent);
+        return static_cast< marked_heap_node* >( super_t::parent );
     }
 
     bool mark;
 };
 
 
-template <typename Node>
+template < typename Node >
 struct cmp_by_degree
 {
-    template <typename NodeBase>
-    bool operator()(NodeBase const & left,
-                    NodeBase const & right)
+    template < typename NodeBase >
+    bool operator()( NodeBase const& left, NodeBase const& right )
     {
-        return static_cast<const Node*>(&left)->child_count() < static_cast<const Node*>(&right)->child_count();
+        return static_cast< const Node* >( &left )->child_count() < static_cast< const Node* >( &right )->child_count();
     }
 };
 
-template <typename List, typename Node, typename Cmp>
-Node * find_max_child(List const & list, Cmp const & cmp)
+template < typename List, typename Node, typename Cmp >
+Node* find_max_child( List const& list, Cmp const& cmp )
 {
-    BOOST_HEAP_ASSERT(!list.empty());
+    BOOST_HEAP_ASSERT( !list.empty() );
 
-    const Node * ret = static_cast<const Node *> (&list.front());
-    for (typename List::const_iterator it = list.begin(); it != list.end(); ++it) {
-        const Node * current = static_cast<const Node *> (&*it);
+    const Node* ret = static_cast< const Node* >( &list.front() );
+    for ( typename List::const_iterator it = list.begin(); it != list.end(); ++it ) {
+        const Node* current = static_cast< const Node* >( &*it );
 
-        if (cmp(ret->value, current->value))
+        if ( cmp( ret->value, current->value ) )
             ret = current;
     }
 
-    return const_cast<Node*>(ret);
+    return const_cast< Node* >( ret );
 }
 
-} /* namespace detail */
-} /* namespace heap */
-} /* namespace boost */
+}}} // namespace boost::heap::detail
 
 #undef BOOST_HEAP_ASSERT
 #endif /* BOOST_HEAP_DETAIL_HEAP_NODE_HPP */
diff --git a/inst/include/boost/heap/detail/ilog2.hpp b/inst/include/boost/heap/detail/ilog2.hpp
index c6b65c66c..63ebb64ee 100644
--- a/inst/include/boost/heap/detail/ilog2.hpp
+++ b/inst/include/boost/heap/detail/ilog2.hpp
@@ -11,38 +11,37 @@
 
 #include <string> // std::size_t
 
-namespace boost {
-namespace heap {
+namespace boost { namespace heap {
 namespace detail {
 
-template <typename IntType>
+template < typename IntType >
 struct log2
 {
-    IntType operator()(IntType value)
+    IntType operator()( IntType value )
     {
         IntType l = 0;
-        while( (value >> l) > 1 )
+        while ( ( value >> l ) > 1 )
             ++l;
         return l;
     }
 };
 
 #ifdef __GNUC__
-template<>
-struct log2<unsigned int>
+template <>
+struct log2< unsigned int >
 {
-    unsigned int operator()(unsigned int value)
+    unsigned int operator()( unsigned int value )
     {
-        return sizeof(unsigned int)*8 - __builtin_clz(value - 1);
+        return sizeof( unsigned int ) * 8 - __builtin_clz( value - 1 );
     }
 };
 
-template<>
-struct log2<unsigned long>
+template <>
+struct log2< unsigned long >
 {
-    unsigned long operator()(unsigned long value)
+    unsigned long operator()( unsigned long value )
     {
-        return sizeof(unsigned long)*8 - __builtin_clzl(value - 1);
+        return sizeof( unsigned long ) * 8 - __builtin_clzl( value - 1 );
     }
 };
 
@@ -51,14 +50,13 @@ struct log2<unsigned long>
 } /* namespace detail */
 
 
-template <typename IntType>
-IntType log2(IntType value)
+template < typename IntType >
+IntType log2( IntType value )
 {
-    detail::log2<IntType> fn;
-    return fn(value);
+    detail::log2< IntType > fn;
+    return fn( value );
 }
 
-} /* namespace heap */
-} /* namespace boost */
+}}     // namespace boost::heap
 
 #endif /* BOOST_HEAP_DETAIL_ILOG2_HPP */
diff --git a/inst/include/boost/heap/detail/mutable_heap.hpp b/inst/include/boost/heap/detail/mutable_heap.hpp
index 0fc0c5c78..bb098e00c 100644
--- a/inst/include/boost/heap/detail/mutable_heap.hpp
+++ b/inst/include/boost/heap/detail/mutable_heap.hpp
@@ -16,12 +16,10 @@
 #include <list>
 #include <utility>
 
-#include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/heap/detail/ordered_adaptor_iterator.hpp>
+#include <boost/iterator/iterator_adaptor.hpp>
 
-namespace boost  {
-namespace heap   {
-namespace detail {
+namespace boost { namespace heap { namespace detail {
 
 /* wrapper for a mutable heap container adaptors
  *
@@ -29,81 +27,81 @@ namespace detail {
  * but instead from std::list iterators. this way, the mutability is achieved
  *
  */
-template <typename PriorityQueueType>
+template < typename PriorityQueueType >
 class priority_queue_mutable_wrapper
 {
 public:
-    typedef typename PriorityQueueType::value_type value_type;
-    typedef typename PriorityQueueType::size_type size_type;
-    typedef typename PriorityQueueType::value_compare value_compare;
+    typedef typename PriorityQueueType::value_type     value_type;
+    typedef typename PriorityQueueType::size_type      size_type;
+    typedef typename PriorityQueueType::value_compare  value_compare;
     typedef typename PriorityQueueType::allocator_type allocator_type;
 
-    typedef typename PriorityQueueType::reference reference;
+    typedef typename PriorityQueueType::reference       reference;
     typedef typename PriorityQueueType::const_reference const_reference;
-    typedef typename PriorityQueueType::pointer pointer;
-    typedef typename PriorityQueueType::const_pointer const_pointer;
-    static const bool is_stable = PriorityQueueType::is_stable;
+    typedef typename PriorityQueueType::pointer         pointer;
+    typedef typename PriorityQueueType::const_pointer   const_pointer;
+    static const bool                                   is_stable = PriorityQueueType::is_stable;
 
 private:
-    typedef std::pair<value_type, size_type> node_type;
+    typedef std::pair< value_type, size_type > node_type;
 
-    typedef std::list<node_type, typename boost::allocator_rebind<allocator_type, node_type>::type> object_list;
+    typedef std::list< node_type, typename boost::allocator_rebind< allocator_type, node_type >::type > object_list;
 
-    typedef typename object_list::iterator list_iterator;
+    typedef typename object_list::iterator       list_iterator;
     typedef typename object_list::const_iterator const_list_iterator;
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
     typedef typename PriorityQueueType::super_t::stability_counter_type stability_counter_type;
 
-    stability_counter_type get_stability_count(void) const
+    stability_counter_type get_stability_count( void ) const
     {
         return q_.get_stability_count();
     }
 
-    void set_stability_count(stability_counter_type new_count)
+    void set_stability_count( stability_counter_type new_count )
     {
-        q_.set_stability_count(new_count);
+        q_.set_stability_count( new_count );
     }
 
     struct index_updater
     {
-        template <typename It>
-        static void run(It & it, size_type new_index)
+        template < typename It >
+        static void run( It& it, size_type new_index )
         {
-            q_type::get_value(it)->second = new_index;
+            q_type::get_value( it )->second = new_index;
         }
     };
 
 public:
     struct handle_type
     {
-        value_type & operator*() const
+        value_type& operator*() const
         {
             return iterator->first;
         }
 
-        handle_type (void)
+        handle_type( void )
         {}
 
-        handle_type(handle_type const & rhs):
-            iterator(rhs.iterator)
+        handle_type( handle_type const& rhs ) :
+            iterator( rhs.iterator )
         {}
 
-        bool operator==(handle_type const & rhs) const
+        bool operator==( handle_type const& rhs ) const
         {
             return iterator == rhs.iterator;
         }
 
-        bool operator!=(handle_type const & rhs) const
+        bool operator!=( handle_type const& rhs ) const
         {
             return iterator != rhs.iterator;
         }
 
     private:
-        explicit handle_type(list_iterator const & it):
-            iterator(it)
+        explicit handle_type( list_iterator const& it ) :
+            iterator( it )
         {}
 
         list_iterator iterator;
@@ -112,93 +110,94 @@ class priority_queue_mutable_wrapper
     };
 
 private:
-    struct indirect_cmp:
-        public value_compare
+    struct indirect_cmp : public value_compare
     {
-        indirect_cmp(value_compare const & cmp = value_compare()):
-            value_compare(cmp)
+        indirect_cmp( value_compare const& cmp = value_compare() ) :
+            value_compare( cmp )
         {}
 
-        bool operator()(const_list_iterator const & lhs, const_list_iterator const & rhs) const
+        bool operator()( const_list_iterator const& lhs, const_list_iterator const& rhs ) const
         {
-            return value_compare::operator()(lhs->first, rhs->first);
+            return value_compare::operator()( lhs->first, rhs->first );
         }
     };
 
-    typedef typename PriorityQueueType::template rebind<list_iterator,
-                                                        indirect_cmp,
-                                                        allocator_type, index_updater >::other q_type;
+    typedef
+        typename PriorityQueueType::template rebind< list_iterator, indirect_cmp, allocator_type, index_updater >::other
+            q_type;
 
 protected:
-    q_type q_;
+    q_type      q_;
     object_list objects;
 
 protected:
-    priority_queue_mutable_wrapper(value_compare const & cmp = value_compare()):
-        q_(cmp)
+    priority_queue_mutable_wrapper( value_compare const& cmp = value_compare() ) :
+        q_( cmp )
     {}
 
-    priority_queue_mutable_wrapper(priority_queue_mutable_wrapper const & rhs):
-        q_(rhs.q_), objects(rhs.objects)
+    priority_queue_mutable_wrapper( priority_queue_mutable_wrapper const& rhs ) :
+        q_( rhs.q_ ),
+        objects( rhs.objects )
     {
-        for (typename object_list::iterator it = objects.begin(); it != objects.end(); ++it)
-            q_.push(it);
+        for ( typename object_list::iterator it = objects.begin(); it != objects.end(); ++it )
+            q_.push( it );
     }
 
-    priority_queue_mutable_wrapper & operator=(priority_queue_mutable_wrapper const & rhs)
+    priority_queue_mutable_wrapper& operator=( priority_queue_mutable_wrapper const& rhs )
     {
-        q_ = rhs.q_;
+        q_      = rhs.q_;
         objects = rhs.objects;
         q_.clear();
-        for (typename object_list::iterator it = objects.begin(); it != objects.end(); ++it)
-            q_.push(it);
+        for ( typename object_list::iterator it = objects.begin(); it != objects.end(); ++it )
+            q_.push( it );
         return *this;
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    priority_queue_mutable_wrapper (priority_queue_mutable_wrapper && rhs):
-        q_(std::move(rhs.q_))
+    priority_queue_mutable_wrapper( priority_queue_mutable_wrapper&& rhs ) :
+        q_( std::move( rhs.q_ ) )
     {
         /// FIXME: msvc seems to invalidate iterators when moving std::list
-        std::swap(objects, rhs.objects);
+        std::swap( objects, rhs.objects );
     }
 
-    priority_queue_mutable_wrapper & operator=(priority_queue_mutable_wrapper && rhs)
+    priority_queue_mutable_wrapper& operator=( priority_queue_mutable_wrapper&& rhs )
     {
-        q_ = std::move(rhs.q_);
+        q_ = std::move( rhs.q_ );
         objects.clear();
-        std::swap(objects, rhs.objects);
+        std::swap( objects, rhs.objects );
         return *this;
     }
 #endif
 
 
 public:
-    template <typename iterator_type>
-    class iterator_base:
-        public boost::iterator_adaptor<iterator_base<iterator_type>,
-                                       iterator_type,
-                                       value_type const,
-                                       boost::bidirectional_traversal_tag>
-    {
-        typedef boost::iterator_adaptor<iterator_base<iterator_type>,
-                                       iterator_type,
-                                       value_type const,
-                                       boost::bidirectional_traversal_tag> super_t;
+    template < typename iterator_type >
+    class iterator_base :
+        public boost::iterator_adaptor< iterator_base< iterator_type >,
+                                        iterator_type,
+                                        value_type const,
+                                        boost::bidirectional_traversal_tag >
+    {
+        typedef boost::iterator_adaptor< iterator_base< iterator_type >,
+                                         iterator_type,
+                                         value_type const,
+                                         boost::bidirectional_traversal_tag >
+            super_t;
 
         friend class boost::iterator_core_access;
         friend class priority_queue_mutable_wrapper;
 
-        iterator_base(void):
-            super_t(0)
+        iterator_base( void ) :
+            super_t( 0 )
         {}
 
-        template <typename T>
-        explicit iterator_base(T const & it):
-            super_t(it)
+        template < typename T >
+        explicit iterator_base( T const& it ) :
+            super_t( it )
         {}
 
-        value_type const & dereference() const
+        value_type const& dereference() const
         {
             return super_t::base()->first;
         }
@@ -209,162 +208,163 @@ class priority_queue_mutable_wrapper
         }
     };
 
-    typedef iterator_base<list_iterator> iterator;
-    typedef iterator_base<const_list_iterator> const_iterator;
+    typedef iterator_base< list_iterator >       iterator;
+    typedef iterator_base< const_list_iterator > const_iterator;
 
     typedef typename object_list::difference_type difference_type;
 
-    class ordered_iterator:
-        public boost::iterator_adaptor<ordered_iterator,
-                                       const_list_iterator,
-                                       value_type const,
-                                       boost::forward_traversal_tag
-                                      >,
+    class ordered_iterator :
+        public boost::iterator_adaptor< ordered_iterator, const_list_iterator, value_type const, boost::forward_traversal_tag >,
         q_type::ordered_iterator_dispatcher
     {
-        typedef boost::iterator_adaptor<ordered_iterator,
-                                        const_list_iterator,
-                                        value_type const,
-                                        boost::forward_traversal_tag
-                                      > adaptor_type;
+        typedef boost::iterator_adaptor< ordered_iterator, const_list_iterator, value_type const, boost::forward_traversal_tag >
+            adaptor_type;
 
-        typedef const_list_iterator iterator;
+        typedef const_list_iterator                          iterator;
         typedef typename q_type::ordered_iterator_dispatcher ordered_iterator_dispatcher;
 
         friend class boost::iterator_core_access;
 
     public:
-        ordered_iterator(void):
-            adaptor_type(0), unvisited_nodes(indirect_cmp()), q_(NULL)
+        ordered_iterator( void ) :
+            adaptor_type( 0 ),
+            unvisited_nodes( indirect_cmp() ),
+            q_( NULL )
         {}
 
-        ordered_iterator(const priority_queue_mutable_wrapper * q, indirect_cmp const & cmp):
-            adaptor_type(0), unvisited_nodes(cmp), q_(q)
+        ordered_iterator( const priority_queue_mutable_wrapper* q, indirect_cmp const& cmp ) :
+            adaptor_type( 0 ),
+            unvisited_nodes( cmp ),
+            q_( q )
         {}
 
-        ordered_iterator(const_list_iterator it, const priority_queue_mutable_wrapper * q, indirect_cmp const & cmp):
-            adaptor_type(it), unvisited_nodes(cmp), q_(q)
+        ordered_iterator( const_list_iterator it, const priority_queue_mutable_wrapper* q, indirect_cmp const& cmp ) :
+            adaptor_type( it ),
+            unvisited_nodes( cmp ),
+            q_( q )
         {
-            if (it != q->objects.end())
-                discover_nodes(it);
+            if ( it != q->objects.end() )
+                discover_nodes( it );
         }
 
-        bool operator!=(ordered_iterator const & rhs) const
+        bool operator!=( ordered_iterator const& rhs ) const
         {
             return adaptor_type::base() != rhs.base();
         }
 
-        bool operator==(ordered_iterator const & rhs) const
+        bool operator==( ordered_iterator const& rhs ) const
         {
-            return !operator!=(rhs);
+            return !operator!=( rhs );
         }
 
     private:
-        void increment(void)
+        void increment( void )
         {
-            if (unvisited_nodes.empty())
+            if ( unvisited_nodes.empty() )
                 adaptor_type::base_reference() = q_->objects.end();
             else {
                 iterator next = unvisited_nodes.top();
                 unvisited_nodes.pop();
-                discover_nodes(next);
+                discover_nodes( next );
                 adaptor_type::base_reference() = next;
             }
         }
 
-        value_type const & dereference() const
+        value_type const& dereference() const
         {
             return adaptor_type::base()->first;
         }
 
-        void discover_nodes(iterator current)
+        void discover_nodes( iterator current )
         {
-            size_type current_index = current->second;
-            const q_type * q = &(q_->q_);
+            size_type     current_index = current->second;
+            const q_type* q             = &( q_->q_ );
 
-            if (ordered_iterator_dispatcher::is_leaf(q, current_index))
+            if ( ordered_iterator_dispatcher::is_leaf( q, current_index ) )
                 return;
 
-            std::pair<size_type, size_type> child_range = ordered_iterator_dispatcher::get_child_nodes(q, current_index);
+            std::pair< size_type, size_type > child_range
+                = ordered_iterator_dispatcher::get_child_nodes( q, current_index );
 
-            for (size_type i = child_range.first; i <= child_range.second; ++i) {
-                typename q_type::internal_type const & internal_value_at_index = ordered_iterator_dispatcher::get_internal_value(q, i);
-                typename q_type::value_type const & value_at_index = q_->q_.get_value(internal_value_at_index);
+            for ( size_type i = child_range.first; i <= child_range.second; ++i ) {
+                typename q_type::internal_type const& internal_value_at_index
+                    = ordered_iterator_dispatcher::get_internal_value( q, i );
+                typename q_type::value_type const& value_at_index = q_->q_.get_value( internal_value_at_index );
 
-                unvisited_nodes.push(value_at_index);
+                unvisited_nodes.push( value_at_index );
             }
         }
 
-        std::priority_queue<iterator,
-                            std::vector<iterator, typename boost::allocator_rebind<allocator_type, iterator>::type>,
-                            indirect_cmp
-                           > unvisited_nodes;
-        const priority_queue_mutable_wrapper * q_;
+        std::priority_queue< iterator,
+                             std::vector< iterator, typename boost::allocator_rebind< allocator_type, iterator >::type >,
+                             indirect_cmp >
+                                              unvisited_nodes;
+        const priority_queue_mutable_wrapper* q_;
     };
 
-    bool empty(void) const
+    bool empty( void ) const
     {
         return q_.empty();
     }
 
-    size_type size(void) const
+    size_type size( void ) const
     {
         return q_.size();
     }
 
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         return objects.max_size();
     }
 
-    void clear(void)
+    void clear( void )
     {
         q_.clear();
         objects.clear();
     }
 
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return q_.get_allocator();
     }
 
-    void swap(priority_queue_mutable_wrapper & rhs)
+    void swap( priority_queue_mutable_wrapper& rhs )
     {
-        objects.swap(rhs.objects);
-        q_.swap(rhs.q_);
+        objects.swap( rhs.objects );
+        q_.swap( rhs.q_ );
     }
 
-    const_reference top(void) const
+    const_reference top( void ) const
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
         return q_.top()->first;
     }
 
-    handle_type push(value_type const & v)
+    handle_type push( value_type const& v )
     {
-        objects.push_front(std::make_pair(v, 0));
+        objects.push_front( std::make_pair( v, 0 ) );
         list_iterator ret = objects.begin();
-        q_.push(ret);
-        return handle_type(ret);
+        q_.push( ret );
+        return handle_type( ret );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    handle_type emplace(Args&&... args)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    handle_type emplace( Args&&... args )
     {
-        objects.push_front(std::make_pair(std::forward<Args>(args)..., 0));
+        objects.push_front( std::make_pair( std::forward< Args >( args )..., 0 ) );
         list_iterator ret = objects.begin();
-        q_.push(ret);
-        return handle_type(ret);
+        q_.push( ret );
+        return handle_type( ret );
     }
 #endif
 
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
         list_iterator q_top = q_.top();
         q_.pop();
-        objects.erase(q_top);
+        objects.erase( q_top );
     }
 
     /**
@@ -373,15 +373,15 @@ class priority_queue_mutable_wrapper
      * \b Complexity: Logarithmic.
      *
      * */
-    void update(handle_type handle, const_reference v)
+    void update( handle_type handle, const_reference v )
     {
-        list_iterator it = handle.iterator;
-        value_type const & current_value = it->first;
-        value_compare const & cmp = q_.value_comp();
-        if (cmp(v, current_value))
-            decrease(handle, v);
+        list_iterator        it            = handle.iterator;
+        value_type const&    current_value = it->first;
+        value_compare const& cmp           = q_.value_comp();
+        if ( cmp( v, current_value ) )
+            decrease( handle, v );
         else
-            increase(handle, v);
+            increase( handle, v );
     }
 
     /**
@@ -391,25 +391,25 @@ class priority_queue_mutable_wrapper
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void update(handle_type handle)
+    void update( handle_type handle )
     {
-        list_iterator it = handle.iterator;
-        size_type index = it->second;
-        q_.update(index);
+        list_iterator it    = handle.iterator;
+        size_type     index = it->second;
+        q_.update( index );
     }
 
-     /**
+    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \b Complexity: Logarithmic.
      *
      * \b Note: The new value is expected to be greater than the current one
      * */
-    void increase(handle_type handle, const_reference v)
+    void increase( handle_type handle, const_reference v )
     {
-        BOOST_ASSERT(!value_compare()(v, handle.iterator->first));
+        BOOST_ASSERT( !value_compare()( v, handle.iterator->first ) );
         handle.iterator->first = v;
-        increase(handle);
+        increase( handle );
     }
 
     /**
@@ -417,27 +417,28 @@ class priority_queue_mutable_wrapper
      *
      * \b Complexity: Logarithmic.
      *
-     * \b Note: The new value is expected to be greater than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be greater than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      * */
-    void increase(handle_type handle)
+    void increase( handle_type handle )
     {
-        list_iterator it = handle.iterator;
-        size_type index = it->second;
-        q_.increase(index);
+        list_iterator it    = handle.iterator;
+        size_type     index = it->second;
+        q_.increase( index );
     }
 
-     /**
+    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \b Complexity: Logarithmic.
      *
      * \b Note: The new value is expected to be less than the current one
      * */
-    void decrease(handle_type handle, const_reference v)
+    void decrease( handle_type handle, const_reference v )
     {
-        BOOST_ASSERT(!value_compare()(handle.iterator->first, v));
+        BOOST_ASSERT( !value_compare()( handle.iterator->first, v ) );
         handle.iterator->first = v;
-        decrease(handle);
+        decrease( handle );
     }
 
     /**
@@ -445,13 +446,14 @@ class priority_queue_mutable_wrapper
      *
      * \b Complexity: Logarithmic.
      *
-     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      * */
-    void decrease(handle_type handle)
+    void decrease( handle_type handle )
     {
-        list_iterator it = handle.iterator;
-        size_type index = it->second;
-        q_.decrease(index);
+        list_iterator it    = handle.iterator;
+        size_type     index = it->second;
+        q_.decrease( index );
     }
 
     /**
@@ -459,66 +461,64 @@ class priority_queue_mutable_wrapper
      *
      * \b Complexity: Logarithmic.
      * */
-    void erase(handle_type handle)
+    void erase( handle_type handle )
     {
-        list_iterator it = handle.iterator;
-        size_type index = it->second;
-        q_.erase(index);
-        objects.erase(it);
+        list_iterator it    = handle.iterator;
+        size_type     index = it->second;
+        q_.erase( index );
+        objects.erase( it );
     }
 
-    const_iterator begin(void) const
+    const_iterator begin( void ) const
     {
-        return const_iterator(objects.begin());
+        return const_iterator( objects.begin() );
     }
 
-    const_iterator end(void) const
+    const_iterator end( void ) const
     {
-        return const_iterator(objects.end());
+        return const_iterator( objects.end() );
     }
 
-    iterator begin(void)
+    iterator begin( void )
     {
-        return iterator(objects.begin());
+        return iterator( objects.begin() );
     }
 
-    iterator end(void)
+    iterator end( void )
     {
-        return iterator(objects.end());
+        return iterator( objects.end() );
     }
 
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
-        if (!empty())
-            return ordered_iterator(q_.top(), this, indirect_cmp(q_.value_comp()));
+        if ( !empty() )
+            return ordered_iterator( q_.top(), this, indirect_cmp( q_.value_comp() ) );
         else
             return ordered_end();
     }
 
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
-        return ordered_iterator(objects.end(), this, indirect_cmp(q_.value_comp()));
+        return ordered_iterator( objects.end(), this, indirect_cmp( q_.value_comp() ) );
     }
 
-    static handle_type s_handle_from_iterator(iterator const & it)
+    static handle_type s_handle_from_iterator( iterator const& it )
     {
-        return handle_type(it.get_list_iterator());
+        return handle_type( it.get_list_iterator() );
     }
 
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return q_.value_comp();
     }
 
-    void reserve (size_type element_count)
+    void reserve( size_type element_count )
     {
-        q_.reserve(element_count);
+        q_.reserve( element_count );
     }
 };
 
 
-} /* namespace detail */
-} /* namespace heap */
-} /* namespace boost */
+}}}    // namespace boost::heap::detail
 
 #endif /* BOOST_HEAP_DETAIL_MUTABLE_HEAP_HPP */
diff --git a/inst/include/boost/heap/detail/ordered_adaptor_iterator.hpp b/inst/include/boost/heap/detail/ordered_adaptor_iterator.hpp
index 54b8c3808..ebc39b9f8 100644
--- a/inst/include/boost/heap/detail/ordered_adaptor_iterator.hpp
+++ b/inst/include/boost/heap/detail/ordered_adaptor_iterator.hpp
@@ -9,17 +9,15 @@
 #ifndef BOOST_HEAP_DETAIL_ORDERED_ADAPTOR_ITERATOR_HPP
 #define BOOST_HEAP_DETAIL_ORDERED_ADAPTOR_ITERATOR_HPP
 
-#include <cassert>
 #include <limits>
 
 #include <boost/assert.hpp>
+#include <boost/concept_check.hpp>
 #include <boost/heap/detail/tree_iterator.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/concept_check.hpp>
+#include <boost/iterator/iterator_facade.hpp>
 
-namespace boost  {
-namespace heap   {
-namespace detail {
+namespace boost { namespace heap { namespace detail {
 
 /* ordered iterator helper classes for container adaptors
  *
@@ -27,120 +25,112 @@ namespace detail {
  *
  * * static size_type max_index(const ContainerType * heap); // return maximum index
  * * static bool is_leaf(const ContainerType * heap, size_type index); // return if index denotes a leaf
- * * static std::pair<size_type, size_type> get_child_nodes(const ContainerType * heap, size_type index); // get index range of child nodes
- * * static internal_type const & get_internal_value(const ContainerType * heap, size_type index); // get internal value at index
+ * * static std::pair<size_type, size_type> get_child_nodes(const ContainerType * heap, size_type index); // get index
+ * range of child nodes
+ * * static internal_type const & get_internal_value(const ContainerType * heap, size_type index); // get internal value
+ * at index
  * * static value_type const & get_value(internal_type const & arg) const; // get value_type from internal_type
  *
  * */
-template <typename ValueType,
-          typename InternalType,
-          typename ContainerType,
-          typename Alloc,
-          typename ValueCompare,
-          typename Dispatcher
-         >
-class ordered_adaptor_iterator:
-    public boost::iterator_facade<ordered_adaptor_iterator<ValueType,
-                                                           InternalType,
-                                                           ContainerType,
-                                                           Alloc,
-                                                           ValueCompare,
-                                                           Dispatcher>,
-                                  ValueType,
-                                  boost::forward_traversal_tag
-                                 >,
+template < typename ValueType, typename InternalType, typename ContainerType, typename Alloc, typename ValueCompare, typename Dispatcher >
+class ordered_adaptor_iterator :
+    public boost::iterator_facade<
+        ordered_adaptor_iterator< ValueType, InternalType, ContainerType, Alloc, ValueCompare, Dispatcher >,
+        ValueType,
+        boost::forward_traversal_tag >,
     Dispatcher
 {
     friend class boost::iterator_core_access;
 
-    struct compare_by_heap_value:
-        ValueCompare
+    struct compare_by_heap_value : ValueCompare
     {
-        const ContainerType * container;
+        const ContainerType* container;
 
-        compare_by_heap_value (const ContainerType * container, ValueCompare const & cmp):
-            ValueCompare(cmp), container(container)
+        compare_by_heap_value( const ContainerType* container, ValueCompare const& cmp ) :
+            ValueCompare( cmp ),
+            container( container )
         {}
 
-        bool operator()(size_t lhs, size_t rhs)
+        bool operator()( size_t lhs, size_t rhs )
         {
-            BOOST_ASSERT(lhs <= Dispatcher::max_index(container));
-            BOOST_ASSERT(rhs <= Dispatcher::max_index(container));
-            return ValueCompare::operator()(Dispatcher::get_internal_value(container, lhs),
-                                            Dispatcher::get_internal_value(container, rhs));
+            BOOST_ASSERT( lhs <= Dispatcher::max_index( container ) );
+            BOOST_ASSERT( rhs <= Dispatcher::max_index( container ) );
+            return ValueCompare::operator()( Dispatcher::get_internal_value( container, lhs ),
+                                             Dispatcher::get_internal_value( container, rhs ) );
         }
     };
 
-    const ContainerType * container;
-    size_t current_index; // current index: special value -1 denotes `end' iterator
+    const ContainerType* container;
+    size_t               current_index; // current index: special value -1 denotes `end' iterator
 
 public:
-    ordered_adaptor_iterator(void):
-        container(NULL), current_index((std::numeric_limits<size_t>::max)()),
-        unvisited_nodes(compare_by_heap_value(NULL, ValueCompare()))
+    ordered_adaptor_iterator( void ) :
+        container( NULL ),
+        current_index( ( std::numeric_limits< size_t >::max )() ),
+        unvisited_nodes( compare_by_heap_value( NULL, ValueCompare() ) )
     {}
 
-    ordered_adaptor_iterator(const ContainerType * container, ValueCompare const & cmp):
-        container(container), current_index(container->size()),
-        unvisited_nodes(compare_by_heap_value(container, ValueCompare()))
+    ordered_adaptor_iterator( const ContainerType* container, ValueCompare const& cmp ) :
+        container( container ),
+        current_index( container->size() ),
+        unvisited_nodes( compare_by_heap_value( container, ValueCompare() ) )
     {}
 
-    ordered_adaptor_iterator(size_t initial_index, const ContainerType * container, ValueCompare const & cmp):
-        container(container), current_index(initial_index),
-        unvisited_nodes(compare_by_heap_value(container, cmp))
+    ordered_adaptor_iterator( size_t initial_index, const ContainerType* container, ValueCompare const& cmp ) :
+        container( container ),
+        current_index( initial_index ),
+        unvisited_nodes( compare_by_heap_value( container, cmp ) )
     {
-        discover_nodes(initial_index);
+        discover_nodes( initial_index );
     }
 
 private:
-    bool equal (ordered_adaptor_iterator const & rhs) const
+    bool equal( ordered_adaptor_iterator const& rhs ) const
     {
-        if (current_index != rhs.current_index)
+        if ( current_index != rhs.current_index )
             return false;
 
-        if (container != rhs.container) // less likely than first check
+        if ( container != rhs.container ) // less likely than first check
             return false;
 
         return true;
     }
 
-    void increment(void)
+    void increment( void )
     {
-        if (unvisited_nodes.empty())
-            current_index = Dispatcher::max_index(container) + 1;
+        if ( unvisited_nodes.empty() )
+            current_index = Dispatcher::max_index( container ) + 1;
         else {
             current_index = unvisited_nodes.top();
             unvisited_nodes.pop();
-            discover_nodes(current_index);
+            discover_nodes( current_index );
         }
     }
 
-    ValueType const & dereference() const
+    ValueType const& dereference() const
     {
-        BOOST_ASSERT(current_index <= Dispatcher::max_index(container));
-        return Dispatcher::get_value(Dispatcher::get_internal_value(container, current_index));
+        BOOST_ASSERT( current_index <= Dispatcher::max_index( container ) );
+        return Dispatcher::get_value( Dispatcher::get_internal_value( container, current_index ) );
     }
 
-    void discover_nodes(size_t index)
+    void discover_nodes( size_t index )
     {
-        if (Dispatcher::is_leaf(container, index))
+        if ( Dispatcher::is_leaf( container, index ) )
             return;
 
-        std::pair<size_t, size_t> child_range = Dispatcher::get_child_nodes(container, index);
+        std::pair< size_t, size_t > child_range = Dispatcher::get_child_nodes( container, index );
 
-        for (size_t i = child_range.first; i <= child_range.second; ++i)
-            unvisited_nodes.push(i);
+        for ( size_t i = child_range.first; i <= child_range.second; ++i )
+            unvisited_nodes.push( i );
     }
 
-    std::priority_queue<size_t,
-                        std::vector<size_t, typename boost::allocator_rebind<Alloc, size_t>::type>,
-                        compare_by_heap_value
-                       > unvisited_nodes;
+    std::priority_queue< size_t,
+                         std::vector< size_t, typename boost::allocator_rebind< Alloc, size_t >::type >,
+                         compare_by_heap_value >
+        unvisited_nodes;
 };
 
 
-} /* namespace detail */
-} /* namespace heap */
-} /* namespace boost */
+}}}    // namespace boost::heap::detail
 
 #endif /* BOOST_HEAP_DETAIL_ORDERED_ADAPTOR_ITERATOR_HPP */
diff --git a/inst/include/boost/heap/detail/stable_heap.hpp b/inst/include/boost/heap/detail/stable_heap.hpp
index bfec26d63..2bc0a986d 100644
--- a/inst/include/boost/heap/detail/stable_heap.hpp
+++ b/inst/include/boost/heap/detail/stable_heap.hpp
@@ -13,50 +13,45 @@
 #include <stdexcept>
 #include <utility>
 
-#include <boost/cstdint.hpp>
-#include <boost/throw_exception.hpp>
 #include <boost/core/allocator_access.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/throw_exception.hpp>
 
-#include <boost/heap/policies.hpp>
 #include <boost/heap/heap_merge.hpp>
+#include <boost/heap/policies.hpp>
 
-#include <boost/type_traits/is_nothrow_move_constructible.hpp>
 #include <boost/type_traits/is_nothrow_move_assignable.hpp>
+#include <boost/type_traits/is_nothrow_move_constructible.hpp>
 
-namespace boost  {
-namespace heap   {
-namespace detail {
+namespace boost { namespace heap { namespace detail {
 
-template<bool ConstantSize, class SizeType>
+template < bool ConstantSize, class SizeType >
 struct size_holder
 {
     static const bool constant_time_size = ConstantSize;
     typedef SizeType  size_type;
 
-    size_holder(void) BOOST_NOEXCEPT:
-        size_(0)
+    size_holder( void ) BOOST_NOEXCEPT : size_( 0 )
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    size_holder(size_holder && rhs) BOOST_NOEXCEPT:
-        size_(rhs.size_)
+    size_holder( size_holder&& rhs ) BOOST_NOEXCEPT : size_( rhs.size_ )
     {
         rhs.size_ = 0;
     }
 
-    size_holder(size_holder const & rhs) BOOST_NOEXCEPT:
-        size_(rhs.size_)
+    size_holder( size_holder const& rhs ) BOOST_NOEXCEPT : size_( rhs.size_ )
     {}
 
-    size_holder & operator=(size_holder && rhs) BOOST_NOEXCEPT
+    size_holder& operator=( size_holder&& rhs ) BOOST_NOEXCEPT
     {
-        size_ = rhs.size_;
+        size_     = rhs.size_;
         rhs.size_ = 0;
         return *this;
     }
 
-    size_holder & operator=(size_holder const & rhs) BOOST_NOEXCEPT
+    size_holder& operator=( size_holder const& rhs ) BOOST_NOEXCEPT
     {
         size_ = rhs.size_;
         return *this;
@@ -64,60 +59,76 @@ struct size_holder
 #endif
 
     SizeType get_size() const BOOST_NOEXCEPT
-    {  return size_;  }
+    {
+        return size_;
+    }
 
-    void set_size(SizeType size) BOOST_NOEXCEPT
-    {  size_ = size; }
+    void set_size( SizeType size ) BOOST_NOEXCEPT
+    {
+        size_ = size;
+    }
 
     void decrement() BOOST_NOEXCEPT
-    {  --size_; }
+    {
+        --size_;
+    }
 
     void increment() BOOST_NOEXCEPT
-    {  ++size_; }
+    {
+        ++size_;
+    }
 
-    void add(SizeType value) BOOST_NOEXCEPT
-    {  size_ += value; }
+    void add( SizeType value ) BOOST_NOEXCEPT
+    {
+        size_ += value;
+    }
 
-    void sub(SizeType value) BOOST_NOEXCEPT
-    {  size_ -= value; }
+    void sub( SizeType value ) BOOST_NOEXCEPT
+    {
+        size_ -= value;
+    }
 
-    void swap(size_holder & rhs) BOOST_NOEXCEPT
-    {  std::swap(size_, rhs.size_); }
+    void swap( size_holder& rhs ) BOOST_NOEXCEPT
+    {
+        std::swap( size_, rhs.size_ );
+    }
 
     SizeType size_;
 };
 
-template<class SizeType>
-struct size_holder<false, SizeType>
+template < class SizeType >
+struct size_holder< false, SizeType >
 {
     static const bool constant_time_size = false;
     typedef SizeType  size_type;
 
-    size_holder(void) BOOST_NOEXCEPT
+    size_holder( void ) BOOST_NOEXCEPT
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    size_holder(size_holder && rhs) BOOST_NOEXCEPT
+    size_holder( size_holder&& rhs ) BOOST_NOEXCEPT
     {}
 
-    size_holder(size_holder const & rhs) BOOST_NOEXCEPT
+    size_holder( size_holder const& rhs ) BOOST_NOEXCEPT
     {}
 
-    size_holder & operator=(size_holder && rhs) BOOST_NOEXCEPT
+    size_holder& operator=( size_holder&& rhs ) BOOST_NOEXCEPT
     {
         return *this;
     }
 
-    size_holder & operator=(size_holder const & rhs) BOOST_NOEXCEPT
+    size_holder& operator=( size_holder const& rhs ) BOOST_NOEXCEPT
     {
         return *this;
     }
 #endif
 
     size_type get_size() const BOOST_NOEXCEPT
-    {  return 0;  }
+    {
+        return 0;
+    }
 
-    void set_size(size_type) BOOST_NOEXCEPT
+    void set_size( size_type ) BOOST_NOEXCEPT
     {}
 
     void decrement() BOOST_NOEXCEPT
@@ -126,122 +137,119 @@ struct size_holder<false, SizeType>
     void increment() BOOST_NOEXCEPT
     {}
 
-    void add(SizeType /*value*/) BOOST_NOEXCEPT
+    void add( SizeType /*value*/ ) BOOST_NOEXCEPT
     {}
 
-    void sub(SizeType /*value*/) BOOST_NOEXCEPT
+    void sub( SizeType /*value*/ ) BOOST_NOEXCEPT
     {}
 
-    void swap(size_holder & /*rhs*/) BOOST_NOEXCEPT
+    void swap( size_holder& /*rhs*/ ) BOOST_NOEXCEPT
     {}
 };
 
 // note: MSVC does not implement lookup correctly, we therefore have to place the Cmp object as member inside the
 //       struct. of course, this prevents EBO and significantly reduces the readability of this code
-template <typename T,
-          typename Cmp,
-          bool constant_time_size,
-          typename StabilityCounterType = boost::uintmax_t,
-          bool stable = false
-         >
-struct heap_base:
+template < typename T, typename Cmp, bool constant_time_size, typename StabilityCounterType = boost::uintmax_t, bool stable = false >
+struct heap_base :
 #ifndef BOOST_MSVC
     Cmp,
 #endif
-    size_holder<constant_time_size, size_t>
+    size_holder< constant_time_size, size_t >
 {
-    typedef StabilityCounterType stability_counter_type;
-    typedef T value_type;
-    typedef T internal_type;
-    typedef size_holder<constant_time_size, size_t> size_holder_type;
-    typedef Cmp value_compare;
-    typedef Cmp internal_compare;
-    static const bool is_stable = stable;
+    typedef StabilityCounterType                      stability_counter_type;
+    typedef T                                         value_type;
+    typedef T                                         internal_type;
+    typedef size_holder< constant_time_size, size_t > size_holder_type;
+    typedef Cmp                                       value_compare;
+    typedef Cmp                                       internal_compare;
+    static const bool                                 is_stable = stable;
 
 #ifdef BOOST_MSVC
     Cmp cmp_;
 #endif
 
-    heap_base (Cmp const & cmp = Cmp()):
+    heap_base( Cmp const& cmp = Cmp() ) :
 #ifndef BOOST_MSVC
-        Cmp(cmp)
+        Cmp( cmp )
 #else
-        cmp_(cmp)
+        cmp_( cmp )
 #endif
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    heap_base(heap_base && rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_constructible<Cmp>::value):
-#ifndef BOOST_MSVC
-        Cmp(std::move(static_cast<Cmp&>(rhs))),
-#endif
-        size_holder_type(std::move(static_cast<size_holder_type&>(rhs)))
-#ifdef BOOST_MSVC
-        , cmp_(std::move(rhs.cmp_))
-#endif
+    heap_base( heap_base&& rhs ) BOOST_NOEXCEPT_IF( boost::is_nothrow_move_constructible< Cmp >::value ) :
+#    ifndef BOOST_MSVC
+        Cmp( std::move( static_cast< Cmp& >( rhs ) ) ),
+#    endif
+        size_holder_type( std::move( static_cast< size_holder_type& >( rhs ) ) )
+#    ifdef BOOST_MSVC
+        ,
+        cmp_( std::move( rhs.cmp_ ) )
+#    endif
     {}
 
-    heap_base(heap_base const & rhs):
-#ifndef BOOST_MSVC
-        Cmp(static_cast<Cmp const &>(rhs)),
-#endif
-        size_holder_type(static_cast<size_holder_type const &>(rhs))
-#ifdef BOOST_MSVC
-        , cmp_(rhs.value_comp())
-#endif
+    heap_base( heap_base const& rhs ) :
+#    ifndef BOOST_MSVC
+        Cmp( static_cast< Cmp const& >( rhs ) ),
+#    endif
+        size_holder_type( static_cast< size_holder_type const& >( rhs ) )
+#    ifdef BOOST_MSVC
+        ,
+        cmp_( rhs.value_comp() )
+#    endif
     {}
 
-    heap_base & operator=(heap_base && rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_assignable<Cmp>::value)
+    heap_base& operator=( heap_base&& rhs ) BOOST_NOEXCEPT_IF( boost::is_nothrow_move_assignable< Cmp >::value )
     {
-        value_comp_ref().operator=(std::move(rhs.value_comp_ref()));
-        size_holder_type::operator=(std::move(static_cast<size_holder_type&>(rhs)));
+        value_comp_ref().operator=( std::move( rhs.value_comp_ref() ) );
+        size_holder_type::operator=( std::move( static_cast< size_holder_type& >( rhs ) ) );
         return *this;
     }
 
-    heap_base & operator=(heap_base const & rhs)
+    heap_base& operator=( heap_base const& rhs )
     {
-        value_comp_ref().operator=(rhs.value_comp());
-        size_holder_type::operator=(static_cast<size_holder_type const &>(rhs));
+        value_comp_ref().operator=( rhs.value_comp() );
+        size_holder_type::operator=( static_cast< size_holder_type const& >( rhs ) );
         return *this;
     }
 #endif
 
-    bool operator()(internal_type const & lhs, internal_type const & rhs) const
+    bool operator()( internal_type const& lhs, internal_type const& rhs ) const
     {
-        return value_comp().operator()(lhs, rhs);
+        return value_comp().operator()( lhs, rhs );
     }
 
-    internal_type make_node(T const & val)
+    internal_type make_node( T const& val )
     {
         return val;
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    T && make_node(T && val)
+    T&& make_node( T&& val )
     {
-        return std::forward<T>(val);
+        return std::forward< T >( val );
     }
 #endif
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    internal_type make_node(Args && ... val)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    internal_type make_node( Args&&... val )
     {
-        return internal_type(std::forward<Args>(val)...);
+        return internal_type( std::forward< Args >( val )... );
     }
 #endif
 
-    static T & get_value(internal_type & val) BOOST_NOEXCEPT
+    static T& get_value( internal_type& val ) BOOST_NOEXCEPT
     {
         return val;
     }
 
-    static T const & get_value(internal_type const & val) BOOST_NOEXCEPT
+    static T const& get_value( internal_type const& val ) BOOST_NOEXCEPT
     {
         return val;
     }
 
-    Cmp const & value_comp(void) const BOOST_NOEXCEPT
+    Cmp const& value_comp( void ) const BOOST_NOEXCEPT
     {
 #ifndef BOOST_MSVC
         return *this;
@@ -250,30 +258,31 @@ struct heap_base:
 #endif
     }
 
-    Cmp const & get_internal_cmp(void) const BOOST_NOEXCEPT
+    Cmp const& get_internal_cmp( void ) const BOOST_NOEXCEPT
     {
         return value_comp();
     }
 
-    void swap(heap_base & rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_constructible<Cmp>::value && boost::is_nothrow_move_assignable<Cmp>::value)
+    void swap( heap_base& rhs ) BOOST_NOEXCEPT_IF(
+        boost::is_nothrow_move_constructible< Cmp >::value&& boost::is_nothrow_move_assignable< Cmp >::value )
     {
-        std::swap(value_comp_ref(), rhs.value_comp_ref());
-        size_holder<constant_time_size, size_t>::swap(rhs);
+        std::swap( value_comp_ref(), rhs.value_comp_ref() );
+        size_holder< constant_time_size, size_t >::swap( rhs );
     }
 
-    stability_counter_type get_stability_count(void) const BOOST_NOEXCEPT
+    stability_counter_type get_stability_count( void ) const BOOST_NOEXCEPT
     {
         return 0;
     }
 
-    void set_stability_count(stability_counter_type) BOOST_NOEXCEPT
+    void set_stability_count( stability_counter_type ) BOOST_NOEXCEPT
     {}
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
 private:
-    Cmp & value_comp_ref(void)
+    Cmp& value_comp_ref( void )
     {
 #ifndef BOOST_MSVC
         return *this;
@@ -284,134 +293,134 @@ struct heap_base:
 };
 
 
-template <typename T,
-          typename Cmp,
-          bool constant_time_size,
-          typename StabilityCounterType
-         >
-struct heap_base<T, Cmp, constant_time_size, StabilityCounterType, true>:
+template < typename T, typename Cmp, bool constant_time_size, typename StabilityCounterType >
+struct heap_base< T, Cmp, constant_time_size, StabilityCounterType, true > :
 #ifndef BOOST_MSVC
     Cmp,
 #endif
-    size_holder<constant_time_size, size_t>
+    size_holder< constant_time_size, size_t >
 {
     typedef StabilityCounterType stability_counter_type;
-    typedef T value_type;
+    typedef T                    value_type;
 
     struct internal_type
     {
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-        template <class ...Args>
-        internal_type(stability_counter_type cnt, Args && ... args):
-            first(std::forward<Args>(args)...), second(cnt)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+        template < class... Args >
+        internal_type( stability_counter_type cnt, Args&&... args ) :
+            first( std::forward< Args >( args )... ),
+            second( cnt )
         {}
 #endif
 
-        internal_type(stability_counter_type const & cnt, T const & value):
-            first(value), second(cnt)
+        internal_type( stability_counter_type const& cnt, T const& value ) :
+            first( value ),
+            second( cnt )
         {}
 
-        T first;
+        T                      first;
         stability_counter_type second;
     };
 
-    typedef size_holder<constant_time_size, size_t> size_holder_type;
-    typedef Cmp value_compare;
+    typedef size_holder< constant_time_size, size_t > size_holder_type;
+    typedef Cmp                                       value_compare;
 
 #ifdef BOOST_MSVC
     Cmp cmp_;
 #endif
 
-    heap_base (Cmp const & cmp = Cmp()):
+    heap_base( Cmp const& cmp = Cmp() ) :
 #ifndef BOOST_MSVC
-        Cmp(cmp),
+        Cmp( cmp ),
 #else
-        cmp_(cmp),
+        cmp_( cmp ),
 #endif
-        counter_(0)
+        counter_( 0 )
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    heap_base(heap_base && rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_constructible<Cmp>::value):
-#ifndef BOOST_MSVC
-        Cmp(std::move(static_cast<Cmp&>(rhs))),
-#else
-        cmp_(std::move(rhs.cmp_)),
-#endif
-        size_holder_type(std::move(static_cast<size_holder_type&>(rhs))), counter_(rhs.counter_)
+    heap_base( heap_base&& rhs ) BOOST_NOEXCEPT_IF( boost::is_nothrow_move_constructible< Cmp >::value ) :
+#    ifndef BOOST_MSVC
+        Cmp( std::move( static_cast< Cmp& >( rhs ) ) ),
+#    else
+        cmp_( std::move( rhs.cmp_ ) ),
+#    endif
+        size_holder_type( std::move( static_cast< size_holder_type& >( rhs ) ) ),
+        counter_( rhs.counter_ )
     {
         rhs.counter_ = 0;
     }
 
-    heap_base(heap_base const & rhs):
-#ifndef BOOST_MSVC
-        Cmp(static_cast<Cmp const&>(rhs)),
-#else
-        cmp_(rhs.value_comp()),
-#endif
-        size_holder_type(static_cast<size_holder_type const &>(rhs)), counter_(rhs.counter_)
+    heap_base( heap_base const& rhs ) :
+#    ifndef BOOST_MSVC
+        Cmp( static_cast< Cmp const& >( rhs ) ),
+#    else
+        cmp_( rhs.value_comp() ),
+#    endif
+        size_holder_type( static_cast< size_holder_type const& >( rhs ) ),
+        counter_( rhs.counter_ )
     {}
 
-    heap_base & operator=(heap_base && rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_assignable<Cmp>::value)
+    heap_base& operator=( heap_base&& rhs ) BOOST_NOEXCEPT_IF( boost::is_nothrow_move_assignable< Cmp >::value )
     {
-        value_comp_ref().operator=(std::move(rhs.value_comp_ref()));
-        size_holder_type::operator=(std::move(static_cast<size_holder_type&>(rhs)));
+        value_comp_ref().operator=( std::move( rhs.value_comp_ref() ) );
+        size_holder_type::operator=( std::move( static_cast< size_holder_type& >( rhs ) ) );
 
-        counter_ = rhs.counter_;
+        counter_     = rhs.counter_;
         rhs.counter_ = 0;
         return *this;
     }
 
-    heap_base & operator=(heap_base const & rhs)
+    heap_base& operator=( heap_base const& rhs )
     {
-        value_comp_ref().operator=(rhs.value_comp());
-        size_holder_type::operator=(static_cast<size_holder_type const &>(rhs));
+        value_comp_ref().operator=( rhs.value_comp() );
+        size_holder_type::operator=( static_cast< size_holder_type const& >( rhs ) );
 
         counter_ = rhs.counter_;
         return *this;
     }
 #endif
 
-    bool operator()(internal_type const & lhs, internal_type const & rhs) const
+    bool operator()( internal_type const& lhs, internal_type const& rhs ) const
     {
-        return get_internal_cmp()(lhs, rhs);
+        return get_internal_cmp()( lhs, rhs );
     }
 
-    bool operator()(T const & lhs, T const & rhs) const
+    bool operator()( T const& lhs, T const& rhs ) const
     {
-        return value_comp()(lhs, rhs);
+        return value_comp()( lhs, rhs );
     }
 
-    internal_type make_node(T const & val)
+    internal_type make_node( T const& val )
     {
         stability_counter_type count = ++counter_;
-        if (counter_ == (std::numeric_limits<stability_counter_type>::max)())
-            BOOST_THROW_EXCEPTION(std::runtime_error("boost::heap counter overflow"));
-        return internal_type(count, val);
+        if ( counter_ == ( std::numeric_limits< stability_counter_type >::max )() )
+            BOOST_THROW_EXCEPTION( std::runtime_error( "boost::heap counter overflow" ) );
+        return internal_type( count, val );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    internal_type make_node(Args&&... args)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    internal_type make_node( Args&&... args )
     {
         stability_counter_type count = ++counter_;
-        if (counter_ == (std::numeric_limits<stability_counter_type>::max)())
-            BOOST_THROW_EXCEPTION(std::runtime_error("boost::heap counter overflow"));
-        return internal_type (count, std::forward<Args>(args)...);
+        if ( counter_ == ( std::numeric_limits< stability_counter_type >::max )() )
+            BOOST_THROW_EXCEPTION( std::runtime_error( "boost::heap counter overflow" ) );
+        return internal_type( count, std::forward< Args >( args )... );
     }
 #endif
 
-    static T & get_value(internal_type & val) BOOST_NOEXCEPT
+    static T& get_value( internal_type& val ) BOOST_NOEXCEPT
     {
         return val.first;
     }
 
-    static T const & get_value(internal_type const & val) BOOST_NOEXCEPT
+    static T const& get_value( internal_type const& val ) BOOST_NOEXCEPT
     {
         return val.first;
     }
 
-    Cmp const & value_comp(void) const BOOST_NOEXCEPT
+    Cmp const& value_comp( void ) const BOOST_NOEXCEPT
     {
 #ifndef BOOST_MSVC
         return *this;
@@ -420,56 +429,56 @@ struct heap_base<T, Cmp, constant_time_size, StabilityCounterType, true>:
 #endif
     }
 
-    struct internal_compare:
-        Cmp
+    struct internal_compare : Cmp
     {
-        internal_compare(Cmp const & cmp = Cmp()):
-            Cmp(cmp)
+        internal_compare( Cmp const& cmp = Cmp() ) :
+            Cmp( cmp )
         {}
 
-        bool operator()(internal_type const & lhs, internal_type const & rhs) const
+        bool operator()( internal_type const& lhs, internal_type const& rhs ) const
         {
-            if (Cmp::operator()(lhs.first, rhs.first))
+            if ( Cmp::operator()( lhs.first, rhs.first ) )
                 return true;
 
-            if (Cmp::operator()(rhs.first, lhs.first))
+            if ( Cmp::operator()( rhs.first, lhs.first ) )
                 return false;
 
             return lhs.second > rhs.second;
         }
     };
 
-    internal_compare get_internal_cmp(void) const
+    internal_compare get_internal_cmp( void ) const
     {
-        return internal_compare(value_comp());
+        return internal_compare( value_comp() );
     }
 
-    void swap(heap_base & rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_constructible<Cmp>::value && boost::is_nothrow_move_assignable<Cmp>::value)
+    void swap( heap_base& rhs ) BOOST_NOEXCEPT_IF(
+        boost::is_nothrow_move_constructible< Cmp >::value&& boost::is_nothrow_move_assignable< Cmp >::value )
     {
 #ifndef BOOST_MSVC
-        std::swap(static_cast<Cmp&>(*this), static_cast<Cmp&>(rhs));
+        std::swap( static_cast< Cmp& >( *this ), static_cast< Cmp& >( rhs ) );
 #else
-        std::swap(cmp_, rhs.cmp_);
+        std::swap( cmp_, rhs.cmp_ );
 #endif
-        std::swap(counter_, rhs.counter_);
-        size_holder<constant_time_size, size_t>::swap(rhs);
+        std::swap( counter_, rhs.counter_ );
+        size_holder< constant_time_size, size_t >::swap( rhs );
     }
 
-    stability_counter_type get_stability_count(void) const
+    stability_counter_type get_stability_count( void ) const
     {
         return counter_;
     }
 
-    void set_stability_count(stability_counter_type new_count)
+    void set_stability_count( stability_counter_type new_count )
     {
         counter_ = new_count;
     }
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
 private:
-    Cmp & value_comp_ref(void) BOOST_NOEXCEPT
+    Cmp& value_comp_ref( void ) BOOST_NOEXCEPT
     {
 #ifndef BOOST_MSVC
         return *this;
@@ -481,27 +490,24 @@ struct heap_base<T, Cmp, constant_time_size, StabilityCounterType, true>:
     stability_counter_type counter_;
 };
 
-template <typename node_pointer,
-          typename extractor,
-          typename reference
-         >
+template < typename node_pointer, typename extractor, typename reference >
 struct node_handle
 {
-    explicit node_handle(node_pointer n = 0):
-        node_(n)
+    explicit node_handle( node_pointer n = 0 ) :
+        node_( n )
     {}
 
     reference operator*() const
     {
-        return extractor::get_value(node_->value);
+        return extractor::get_value( node_->value );
     }
 
-    bool operator==(node_handle const & rhs) const
+    bool operator==( node_handle const& rhs ) const
     {
         return node_ == rhs.node_;
     }
 
-    bool operator!=(node_handle const & rhs) const
+    bool operator!=( node_handle const& rhs ) const
     {
         return node_ != rhs.node_;
     }
@@ -509,77 +515,69 @@ struct node_handle
     node_pointer node_;
 };
 
-template <typename value_type,
-          typename internal_type,
-          typename extractor
-         >
+template < typename value_type, typename internal_type, typename extractor >
 struct value_extractor
 {
-    value_type const & operator()(internal_type const & data) const
+    value_type const& operator()( internal_type const& data ) const
     {
-        return extractor::get_value(data);
+        return extractor::get_value( data );
     }
 };
 
-template <typename T,
-          typename ContainerIterator,
-          typename Extractor>
-class stable_heap_iterator:
-    public boost::iterator_adaptor<stable_heap_iterator<T, ContainerIterator, Extractor>,
-                                   ContainerIterator,
-                                   T const,
-                                   boost::random_access_traversal_tag>
-{
-    typedef boost::iterator_adaptor<stable_heap_iterator,
+template < typename T, typename ContainerIterator, typename Extractor >
+class stable_heap_iterator :
+    public boost::iterator_adaptor< stable_heap_iterator< T, ContainerIterator, Extractor >,
                                     ContainerIterator,
                                     T const,
-                                    boost::random_access_traversal_tag> super_t;
+                                    boost::random_access_traversal_tag >
+{
+    typedef boost::iterator_adaptor< stable_heap_iterator, ContainerIterator, T const, boost::random_access_traversal_tag >
+        super_t;
 
 public:
-    stable_heap_iterator(void):
-        super_t(0)
+    stable_heap_iterator( void ) :
+        super_t( 0 )
     {}
 
-    explicit stable_heap_iterator(ContainerIterator const & it):
-        super_t(it)
+    explicit stable_heap_iterator( ContainerIterator const& it ) :
+        super_t( it )
     {}
 
 private:
     friend class boost::iterator_core_access;
 
-    T const & dereference() const
+    T const& dereference() const
     {
-        return Extractor::get_value(*super_t::base());
+        return Extractor::get_value( *super_t::base() );
     }
 };
 
-template <typename T, typename Parspec, bool constant_time_size>
+template < typename T, typename Parspec, bool constant_time_size >
 struct make_heap_base
 {
-    typedef typename parameter::binding<Parspec, tag::compare, std::less<T> >::type compare_argument;
-    typedef typename parameter::binding<Parspec, tag::allocator, std::allocator<T> >::type allocator_argument;
-    typedef typename parameter::binding<Parspec, tag::stability_counter_type, boost::uintmax_t >::type stability_counter_type;
+    typedef typename parameter::binding< Parspec, tag::compare, std::less< T > >::type        compare_argument;
+    typedef typename parameter::binding< Parspec, tag::allocator, std::allocator< T > >::type allocator_argument;
+    typedef
+        typename parameter::binding< Parspec, tag::stability_counter_type, boost::uintmax_t >::type stability_counter_type;
 
-    static const bool is_stable = extract_stable<Parspec>::value;
+    static const bool is_stable = extract_stable< Parspec >::value;
 
-    typedef heap_base<T, compare_argument, constant_time_size, stability_counter_type, is_stable> type;
+    typedef heap_base< T, compare_argument, constant_time_size, stability_counter_type, is_stable > type;
 };
 
 
-template <typename Alloc>
+template < typename Alloc >
 struct extract_allocator_types
 {
-    typedef typename boost::allocator_size_type<Alloc>::type size_type;
-    typedef typename boost::allocator_difference_type<Alloc>::type difference_type;
-    typedef typename Alloc::value_type& reference;
-    typedef typename Alloc::value_type const& const_reference;
-    typedef typename boost::allocator_pointer<Alloc>::type pointer;
-    typedef typename boost::allocator_const_pointer<Alloc>::type const_pointer;
+    typedef typename boost::allocator_size_type< Alloc >::type       size_type;
+    typedef typename boost::allocator_difference_type< Alloc >::type difference_type;
+    typedef typename Alloc::value_type&                              reference;
+    typedef typename Alloc::value_type const&                        const_reference;
+    typedef typename boost::allocator_pointer< Alloc >::type         pointer;
+    typedef typename boost::allocator_const_pointer< Alloc >::type   const_pointer;
 };
 
 
-} /* namespace detail */
-} /* namespace heap */
-} /* namespace boost */
+}}}    // namespace boost::heap::detail
 
 #endif /* BOOST_HEAP_DETAIL_STABLE_HEAP_HPP */
diff --git a/inst/include/boost/heap/detail/tree_iterator.hpp b/inst/include/boost/heap/detail/tree_iterator.hpp
index 459b62129..9c028cc16 100644
--- a/inst/include/boost/heap/detail/tree_iterator.hpp
+++ b/inst/include/boost/heap/detail/tree_iterator.hpp
@@ -17,126 +17,118 @@
 #include <boost/type_traits/conditional.hpp>
 #include <queue>
 
-namespace boost  {
-namespace heap   {
-namespace detail {
+namespace boost { namespace heap { namespace detail {
 
 
-template<typename type>
+template < typename type >
 struct identity
 {
-    type& operator()(type& x) const BOOST_NOEXCEPT
-    { return x; }
+    type& operator()( type& x ) const BOOST_NOEXCEPT
+    {
+        return x;
+    }
 
-    const type& operator()(const type& x) const BOOST_NOEXCEPT
-    { return x; }
+    const type& operator()( const type& x ) const BOOST_NOEXCEPT
+    {
+        return x;
+    }
 };
 
-template<typename Node>
+template < typename Node >
 struct dereferencer
 {
-    template <typename Iterator>
-    Node * operator()(Iterator const & it)
+    template < typename Iterator >
+    Node* operator()( Iterator const& it )
     {
-        return static_cast<Node *>(*it);
+        return static_cast< Node* >( *it );
     }
 };
 
-template<typename Node>
+template < typename Node >
 struct pointer_to_reference
 {
-    template <typename Iterator>
-    const Node * operator()(Iterator const & it)
+    template < typename Iterator >
+    const Node* operator()( Iterator const& it )
     {
-        return static_cast<const Node *>(&*it);
+        return static_cast< const Node* >( &*it );
     }
 };
 
 
-template <typename HandleType,
-          typename Alloc,
-          typename ValueCompare
-         >
+template < typename HandleType, typename Alloc, typename ValueCompare >
 struct unordered_tree_iterator_storage
 {
-    unordered_tree_iterator_storage(ValueCompare const & cmp)
+    unordered_tree_iterator_storage( ValueCompare const& cmp )
     {}
 
-    void push(HandleType h)
+    void push( HandleType h )
     {
-        data_.push_back(h);
+        data_.push_back( h );
     }
 
-    HandleType const & top(void)
+    HandleType const& top( void )
     {
         return data_.back();
     }
 
-    void pop(void)
+    void pop( void )
     {
         data_.pop_back();
     }
 
-    bool empty(void) const
+    bool empty( void ) const
     {
         return data_.empty();
     }
 
-    std::vector<HandleType, typename boost::allocator_rebind<Alloc, HandleType>::type> data_;
+    std::vector< HandleType, typename boost::allocator_rebind< Alloc, HandleType >::type > data_;
 };
 
-template <typename ValueType,
-          typename HandleType,
-          typename Alloc,
-          typename ValueCompare,
-          typename ValueExtractor
-         >
-struct ordered_tree_iterator_storage:
-    ValueExtractor
+template < typename ValueType, typename HandleType, typename Alloc, typename ValueCompare, typename ValueExtractor >
+struct ordered_tree_iterator_storage : ValueExtractor
 {
-    struct compare_values_by_handle:
-        ValueExtractor,
-        ValueCompare
+    struct compare_values_by_handle : ValueExtractor, ValueCompare
     {
-        compare_values_by_handle(ValueCompare const & cmp):
-            ValueCompare(cmp)
+        compare_values_by_handle( ValueCompare const& cmp ) :
+            ValueCompare( cmp )
         {}
 
-        bool operator()(HandleType const & lhs, HandleType const & rhs) const
+        bool operator()( HandleType const& lhs, HandleType const& rhs ) const
         {
-            ValueType const & lhs_value = ValueExtractor::operator()(lhs->value);
-            ValueType const & rhs_value = ValueExtractor::operator()(rhs->value);
-            return ValueCompare::operator()(lhs_value, rhs_value);
+            ValueType const& lhs_value = ValueExtractor::operator()( lhs->value );
+            ValueType const& rhs_value = ValueExtractor::operator()( rhs->value );
+            return ValueCompare::operator()( lhs_value, rhs_value );
         }
     };
 
-    ordered_tree_iterator_storage(ValueCompare const & cmp):
-        data_(compare_values_by_handle(cmp))
+    ordered_tree_iterator_storage( ValueCompare const& cmp ) :
+        data_( compare_values_by_handle( cmp ) )
     {}
 
-    void push(HandleType h)
+    void push( HandleType h )
     {
-        data_.push(h);
+        data_.push( h );
     }
 
-    void pop(void)
+    void pop( void )
     {
         data_.pop();
     }
 
-    HandleType const & top(void)
+    HandleType const& top( void )
     {
         return data_.top();
     }
 
-    bool empty(void) const BOOST_NOEXCEPT
+    bool empty( void ) const BOOST_NOEXCEPT
     {
         return data_.empty();
     }
 
-    std::priority_queue<HandleType,
-                        std::vector<HandleType, typename boost::allocator_rebind<Alloc, HandleType>::type>,
-                        compare_values_by_handle> data_;
+    std::priority_queue< HandleType,
+                         std::vector< HandleType, typename boost::allocator_rebind< Alloc, HandleType >::type >,
+                         compare_values_by_handle >
+        data_;
 };
 
 
@@ -147,205 +139,184 @@ struct ordered_tree_iterator_storage:
  * ValueExtractor can convert Node->value to ValueType
  *
  * */
-template <typename Node,
-          typename ValueType,
-          typename Alloc = std::allocator<Node>,
-          typename ValueExtractor = identity<typename Node::value_type>,
-          typename PointerExtractor = dereferencer<Node>,
-          bool check_null_pointer = false,
-          bool ordered_iterator = false,
-          typename ValueCompare = std::less<ValueType>
-         >
-class tree_iterator:
-    public boost::iterator_adaptor<tree_iterator<Node,
-                                                 ValueType,
-                                                 Alloc,
-                                                 ValueExtractor,
-                                                 PointerExtractor,
-                                                 check_null_pointer,
-                                                 ordered_iterator,
-                                                 ValueCompare
-                                                >,
-                                   const Node *,
-                                   ValueType,
-                                   boost::forward_traversal_tag
-                                  >,
+template < typename Node,
+           typename ValueType,
+           typename Alloc            = std::allocator< Node >,
+           typename ValueExtractor   = identity< typename Node::value_type >,
+           typename PointerExtractor = dereferencer< Node >,
+           bool check_null_pointer   = false,
+           bool ordered_iterator     = false,
+           typename ValueCompare     = std::less< ValueType > >
+class tree_iterator :
+    public boost::iterator_adaptor<
+        tree_iterator< Node, ValueType, Alloc, ValueExtractor, PointerExtractor, check_null_pointer, ordered_iterator, ValueCompare >,
+        const Node*,
+        ValueType,
+        boost::forward_traversal_tag >,
     ValueExtractor,
     PointerExtractor
 {
-    typedef boost::iterator_adaptor<tree_iterator<Node,
-                                                  ValueType,
-                                                  Alloc,
-                                                  ValueExtractor,
-                                                  PointerExtractor,
-                                                  check_null_pointer,
-                                                  ordered_iterator,
-                                                  ValueCompare
-                                                 >,
-                                    const Node *,
-                                    ValueType,
-                                    boost::forward_traversal_tag
-                                   > adaptor_type;
+    typedef boost::iterator_adaptor<
+        tree_iterator< Node, ValueType, Alloc, ValueExtractor, PointerExtractor, check_null_pointer, ordered_iterator, ValueCompare >,
+        const Node*,
+        ValueType,
+        boost::forward_traversal_tag >
+        adaptor_type;
 
     friend class boost::iterator_core_access;
 
-    typedef typename boost::conditional< ordered_iterator,
-                                       ordered_tree_iterator_storage<ValueType, const Node*, Alloc, ValueCompare, ValueExtractor>,
-                                       unordered_tree_iterator_storage<const Node*, Alloc, ValueCompare>
-                                     >::type
-        unvisited_node_container;
+    typedef typename boost::conditional<
+        ordered_iterator,
+        ordered_tree_iterator_storage< ValueType, const Node*, Alloc, ValueCompare, ValueExtractor >,
+        unordered_tree_iterator_storage< const Node*, Alloc, ValueCompare > >::type unvisited_node_container;
 
 public:
-    tree_iterator(void):
-        adaptor_type(0), unvisited_nodes(ValueCompare())
+    tree_iterator( void ) :
+        adaptor_type( 0 ),
+        unvisited_nodes( ValueCompare() )
     {}
 
-    tree_iterator(ValueCompare const & cmp):
-        adaptor_type(0), unvisited_nodes(cmp)
+    tree_iterator( ValueCompare const& cmp ) :
+        adaptor_type( 0 ),
+        unvisited_nodes( cmp )
     {}
 
-    tree_iterator(const Node * it, ValueCompare const & cmp):
-        adaptor_type(it), unvisited_nodes(cmp)
+    tree_iterator( const Node* it, ValueCompare const& cmp ) :
+        adaptor_type( it ),
+        unvisited_nodes( cmp )
     {
-        if (it)
-            discover_nodes(it);
+        if ( it )
+            discover_nodes( it );
     }
 
     /* fills the iterator from a list of possible top nodes */
-    template <typename NodePointerIterator>
-    tree_iterator(NodePointerIterator begin, NodePointerIterator end, const Node * top_node, ValueCompare const & cmp):
-        adaptor_type(0), unvisited_nodes(cmp)
+    template < typename NodePointerIterator >
+    tree_iterator( NodePointerIterator begin, NodePointerIterator end, const Node* top_node, ValueCompare const& cmp ) :
+        adaptor_type( 0 ),
+        unvisited_nodes( cmp )
     {
-        BOOST_STATIC_ASSERT(ordered_iterator);
-        if (begin == end)
+        BOOST_STATIC_ASSERT( ordered_iterator );
+        if ( begin == end )
             return;
 
         adaptor_type::base_reference() = top_node;
-        discover_nodes(top_node);
+        discover_nodes( top_node );
 
-        for (NodePointerIterator it = begin; it != end; ++it) {
-            const Node * current_node = static_cast<const Node*>(&*it);
-            if (current_node != top_node)
-                unvisited_nodes.push(current_node);
+        for ( NodePointerIterator it = begin; it != end; ++it ) {
+            const Node* current_node = static_cast< const Node* >( &*it );
+            if ( current_node != top_node )
+                unvisited_nodes.push( current_node );
         }
     }
 
-    bool operator!=(tree_iterator const & rhs) const
+    bool operator!=( tree_iterator const& rhs ) const
     {
         return adaptor_type::base() != rhs.base();
     }
 
-    bool operator==(tree_iterator const & rhs) const
+    bool operator==( tree_iterator const& rhs ) const
     {
-        return !operator!=(rhs);
+        return !operator!=( rhs );
     }
 
-    const Node * get_node() const
+    const Node* get_node() const
     {
         return adaptor_type::base_reference();
     }
 
 private:
-    void increment(void)
+    void increment( void )
     {
-        if (unvisited_nodes.empty())
+        if ( unvisited_nodes.empty() )
             adaptor_type::base_reference() = 0;
         else {
-            const Node * next = unvisited_nodes.top();
+            const Node* next = unvisited_nodes.top();
             unvisited_nodes.pop();
-            discover_nodes(next);
+            discover_nodes( next );
             adaptor_type::base_reference() = next;
         }
     }
 
-    ValueType const & dereference() const
+    ValueType const& dereference() const
     {
-        return ValueExtractor::operator()(adaptor_type::base_reference()->value);
+        return ValueExtractor::operator()( adaptor_type::base_reference()->value );
     }
 
-    void discover_nodes(const Node * n)
+    void discover_nodes( const Node* n )
     {
-        for (typename Node::const_child_iterator it = n->children.begin(); it != n->children.end(); ++it) {
-            const Node * n = PointerExtractor::operator()(it);
-            if (check_null_pointer && n == NULL)
+        for ( typename Node::const_child_iterator it = n->children.begin(); it != n->children.end(); ++it ) {
+            const Node* n = PointerExtractor::operator()( it );
+            if ( check_null_pointer && n == NULL )
                 continue;
-            unvisited_nodes.push(n);
+            unvisited_nodes.push( n );
         }
     }
 
     unvisited_node_container unvisited_nodes;
 };
 
-template <typename Node, typename NodeList>
+template < typename Node, typename NodeList >
 struct list_iterator_converter
 {
-    typename NodeList::const_iterator operator()(const Node * node)
+    typename NodeList::const_iterator operator()( const Node* node )
     {
-        return NodeList::s_iterator_to(*node);
+        return NodeList::s_iterator_to( *node );
     }
 
-    Node * operator()(typename NodeList::const_iterator it)
+    Node* operator()( typename NodeList::const_iterator it )
     {
-        return const_cast<Node*>(static_cast<const Node*>(&*it));
+        return const_cast< Node* >( static_cast< const Node* >( &*it ) );
     }
 };
 
-template <typename Node,
-          typename NodeIterator,
-          typename ValueType,
-          typename ValueExtractor = identity<typename Node::value_type>,
-          typename IteratorCoverter = identity<NodeIterator>
-         >
-class recursive_tree_iterator:
-    public boost::iterator_adaptor<recursive_tree_iterator<Node,
-                                                           NodeIterator,
-                                                           ValueType,
-                                                           ValueExtractor,
-                                                           IteratorCoverter
-                                                          >,
+template < typename Node,
+           typename NodeIterator,
+           typename ValueType,
+           typename ValueExtractor   = identity< typename Node::value_type >,
+           typename IteratorCoverter = identity< NodeIterator > >
+class recursive_tree_iterator :
+    public boost::iterator_adaptor< recursive_tree_iterator< Node, NodeIterator, ValueType, ValueExtractor, IteratorCoverter >,
                                     NodeIterator,
                                     ValueType const,
-                                    boost::bidirectional_traversal_tag>,
-    ValueExtractor, IteratorCoverter
+                                    boost::bidirectional_traversal_tag >,
+    ValueExtractor,
+    IteratorCoverter
 {
-    typedef boost::iterator_adaptor<recursive_tree_iterator<Node,
-                                                            NodeIterator,
-                                                            ValueType,
-                                                            ValueExtractor,
-                                                            IteratorCoverter
-                                                           >,
-                                    NodeIterator,
-                                    ValueType const,
-                                    boost::bidirectional_traversal_tag> adaptor_type;
+    typedef boost::iterator_adaptor<
+        recursive_tree_iterator< Node, NodeIterator, ValueType, ValueExtractor, IteratorCoverter >,
+        NodeIterator,
+        ValueType const,
+        boost::bidirectional_traversal_tag >
+        adaptor_type;
 
     friend class boost::iterator_core_access;
 
 
 public:
-    recursive_tree_iterator(void):
-        adaptor_type(0)
+    recursive_tree_iterator( void ) :
+        adaptor_type( 0 )
     {}
 
-    explicit recursive_tree_iterator(NodeIterator const & it):
-        adaptor_type(it)
+    explicit recursive_tree_iterator( NodeIterator const& it ) :
+        adaptor_type( it )
     {}
 
-    void increment(void)
+    void increment( void )
     {
         NodeIterator next = adaptor_type::base_reference();
 
-        const Node * n = get_node(next);
-        if (n->children.empty()) {
-            const Node * parent = get_node(next)->get_parent();
+        const Node* n = get_node( next );
+        if ( n->children.empty() ) {
+            const Node* parent = get_node( next )->get_parent();
 
             ++next;
 
-            while (true) {
-                if (parent == NULL || next != parent->children.end())
+            while ( true ) {
+                if ( parent == NULL || next != parent->children.end() )
                     break;
 
-                next = IteratorCoverter::operator()(parent);
-                parent = get_node(next)->get_parent();
+                next   = IteratorCoverter::operator()( parent );
+                parent = get_node( next )->get_parent();
                 ++next;
             }
         } else
@@ -355,25 +326,23 @@ class recursive_tree_iterator:
         return;
     }
 
-    ValueType const & dereference() const
+    ValueType const& dereference() const
     {
-        return ValueExtractor::operator()(get_node(adaptor_type::base_reference())->value);
+        return ValueExtractor::operator()( get_node( adaptor_type::base_reference() )->value );
     }
 
-    static const Node * get_node(NodeIterator const & it)
+    static const Node* get_node( NodeIterator const& it )
     {
-        return static_cast<const Node *>(&*it);
+        return static_cast< const Node* >( &*it );
     }
 
-    const Node * get_node() const
+    const Node* get_node() const
     {
-        return get_node(adaptor_type::base_reference());
+        return get_node( adaptor_type::base_reference() );
     }
 };
 
 
-} /* namespace detail */
-} /* namespace heap */
-} /* namespace boost */
+}}}    // namespace boost::heap::detail
 
 #endif /* BOOST_HEAP_DETAIL_TREE_ITERATOR_HPP */
diff --git a/inst/include/boost/heap/fibonacci_heap.hpp b/inst/include/boost/heap/fibonacci_heap.hpp
index 59e87955b..0047613d6 100644
--- a/inst/include/boost/heap/fibonacci_heap.hpp
+++ b/inst/include/boost/heap/fibonacci_heap.hpp
@@ -23,82 +23,80 @@
 #include <boost/type_traits/integral_constant.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 
 #ifndef BOOST_DOXYGEN_INVOKED
-#ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
-#else
-#define BOOST_HEAP_ASSERT(expression)
-#endif
+#    ifdef BOOST_HEAP_SANITYCHECKS
+#        define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    else
+#        define BOOST_HEAP_ASSERT( expression )
+#    endif
 #endif
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
-typedef parameter::parameters<boost::parameter::optional<tag::allocator>,
-                              boost::parameter::optional<tag::compare>,
-                              boost::parameter::optional<tag::stable>,
-                              boost::parameter::optional<tag::constant_time_size>,
-                              boost::parameter::optional<tag::stability_counter_type>
-                             > fibonacci_heap_signature;
+typedef parameter::parameters< boost::parameter::optional< tag::allocator >,
+                               boost::parameter::optional< tag::compare >,
+                               boost::parameter::optional< tag::stable >,
+                               boost::parameter::optional< tag::constant_time_size >,
+                               boost::parameter::optional< tag::stability_counter_type > >
+    fibonacci_heap_signature;
 
-template <typename T, typename Parspec>
+template < typename T, typename Parspec >
 struct make_fibonacci_heap_base
 {
-    static const bool constant_time_size = parameter::binding<Parspec,
-                                                              tag::constant_time_size,
-                                                              boost::true_type
-                                                             >::type::value;
+    static const bool constant_time_size
+        = parameter::binding< Parspec, tag::constant_time_size, boost::true_type >::type::value;
 
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::type base_type;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::allocator_argument allocator_argument;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::compare_argument compare_argument;
-    typedef marked_heap_node<typename base_type::internal_type> node_type;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::type               base_type;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::allocator_argument allocator_argument;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::compare_argument   compare_argument;
+    typedef marked_heap_node< typename base_type::internal_type >                                 node_type;
 
-    typedef typename boost::allocator_rebind<allocator_argument, node_type>::type allocator_type;
+    typedef typename boost::allocator_rebind< allocator_argument, node_type >::type allocator_type;
 
-    struct type:
-        base_type,
-        allocator_type
+    struct type : base_type, allocator_type
     {
-        type(compare_argument const & arg):
-            base_type(arg)
+        type( compare_argument const& arg ) :
+            base_type( arg )
+        {}
+
+        type( allocator_type const& arg ) :
+            allocator_type( arg )
         {}
 
-        type(type const & rhs):
-            base_type(static_cast<base_type const &>(rhs)),
-            allocator_type(static_cast<allocator_type const &>(rhs))
+        type( type const& rhs ) :
+            base_type( static_cast< base_type const& >( rhs ) ),
+            allocator_type( static_cast< allocator_type const& >( rhs ) )
         {}
 
-        type & operator=(type const & rhs)
+        type& operator=( type const& rhs )
         {
-            base_type::operator=(static_cast<base_type const &>(rhs));
-            allocator_type::operator=(static_cast<allocator_type const &>(rhs));
+            base_type::operator=( static_cast< base_type const& >( rhs ) );
+            allocator_type::operator=( static_cast< allocator_type const& >( rhs ) );
             return *this;
         }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        type(type && rhs):
-            base_type(std::move(static_cast<base_type&>(rhs))),
-            allocator_type(std::move(static_cast<allocator_type&>(rhs)))
+        type( type&& rhs ) :
+            base_type( std::move( static_cast< base_type& >( rhs ) ) ),
+            allocator_type( std::move( static_cast< allocator_type& >( rhs ) ) )
         {}
 
-        type & operator=(type && rhs)
+        type& operator=( type&& rhs )
         {
-            base_type::operator=(std::move(static_cast<base_type&>(rhs)));
-            allocator_type::operator=(std::move(static_cast<allocator_type&>(rhs)));
+            base_type::operator=( std::move( static_cast< base_type& >( rhs ) ) );
+            allocator_type::operator=( std::move( static_cast< allocator_type& >( rhs ) ) );
             return *this;
         }
 #endif
     };
 };
 
-}
-
+} // namespace detail
 
 
 /**
@@ -117,224 +115,230 @@ struct make_fibonacci_heap_base
  *
  */
 #ifdef BOOST_DOXYGEN_INVOKED
-template<class T, class ...Options>
+template < class T, class... Options >
 #else
-template <typename T,
-          class A0 = boost::parameter::void_,
-          class A1 = boost::parameter::void_,
-          class A2 = boost::parameter::void_,
-          class A3 = boost::parameter::void_,
-          class A4 = boost::parameter::void_
-         >
+template < typename T,
+           class A0 = boost::parameter::void_,
+           class A1 = boost::parameter::void_,
+           class A2 = boost::parameter::void_,
+           class A3 = boost::parameter::void_,
+           class A4 = boost::parameter::void_ >
 #endif
-class fibonacci_heap:
-    private detail::make_fibonacci_heap_base<T,
-                                             typename detail::fibonacci_heap_signature::bind<A0, A1, A2, A3, A4>::type
-                                            >::type
+class fibonacci_heap :
+    private detail::
+        make_fibonacci_heap_base< T, typename detail::fibonacci_heap_signature::bind< A0, A1, A2, A3, A4 >::type >::type
 {
-    typedef typename detail::fibonacci_heap_signature::bind<A0, A1, A2, A3, A4>::type bound_args;
-    typedef detail::make_fibonacci_heap_base<T, bound_args> base_maker;
-    typedef typename base_maker::type super_t;
+    typedef typename detail::fibonacci_heap_signature::bind< A0, A1, A2, A3, A4 >::type bound_args;
+    typedef detail::make_fibonacci_heap_base< T, bound_args >                           base_maker;
+    typedef typename base_maker::type                                                   super_t;
 
-    typedef typename super_t::size_holder_type size_holder;
-    typedef typename super_t::internal_type internal_type;
+    typedef typename super_t::size_holder_type      size_holder;
+    typedef typename super_t::internal_type         internal_type;
     typedef typename base_maker::allocator_argument allocator_argument;
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
 private:
 #ifndef BOOST_DOXYGEN_INVOKED
-    struct implementation_defined:
-        detail::extract_allocator_types<typename base_maker::allocator_argument>
+    struct implementation_defined : detail::extract_allocator_types< typename base_maker::allocator_argument >
     {
         typedef T value_type;
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::size_type size_type;
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::reference reference;
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::size_type size_type;
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::reference reference;
 
         typedef typename base_maker::compare_argument value_compare;
-        typedef typename base_maker::allocator_type allocator_type;
+        typedef typename base_maker::allocator_type   allocator_type;
 
-        typedef typename boost::allocator_pointer<allocator_type>::type node_pointer;
-        typedef typename boost::allocator_const_pointer<allocator_type>::type const_node_pointer;
+        typedef typename boost::allocator_pointer< allocator_type >::type       node_pointer;
+        typedef typename boost::allocator_const_pointer< allocator_type >::type const_node_pointer;
 
-        typedef detail::heap_node_list node_list_type;
-        typedef typename node_list_type::iterator node_list_iterator;
+        typedef detail::heap_node_list                  node_list_type;
+        typedef typename node_list_type::iterator       node_list_iterator;
         typedef typename node_list_type::const_iterator node_list_const_iterator;
 
         typedef typename base_maker::node_type node;
 
-        typedef detail::value_extractor<value_type, internal_type, super_t> value_extractor;
-        typedef typename super_t::internal_compare internal_compare;
-        typedef detail::node_handle<node_pointer, super_t, reference> handle_type;
+        typedef detail::value_extractor< value_type, internal_type, super_t > value_extractor;
+        typedef typename super_t::internal_compare                            internal_compare;
+        typedef detail::node_handle< node_pointer, super_t, reference >       handle_type;
 
-        typedef detail::recursive_tree_iterator<node,
-                                                node_list_const_iterator,
-                                                const value_type,
-                                                value_extractor,
-                                                detail::list_iterator_converter<node, node_list_type>
-                                               > iterator;
+        typedef detail::recursive_tree_iterator< node,
+                                                 node_list_const_iterator,
+                                                 const value_type,
+                                                 value_extractor,
+                                                 detail::list_iterator_converter< node, node_list_type > >
+                         iterator;
         typedef iterator const_iterator;
 
-        typedef detail::tree_iterator<node,
-                                      const value_type,
-                                      allocator_type,
-                                      value_extractor,
-                                      detail::list_iterator_converter<node, node_list_type>,
-                                      true,
-                                      true,
-                                      value_compare
-                                    > ordered_iterator;
+        typedef detail::tree_iterator< node,
+                                       const value_type,
+                                       allocator_type,
+                                       value_extractor,
+                                       detail::list_iterator_converter< node, node_list_type >,
+                                       true,
+                                       true,
+                                       value_compare >
+            ordered_iterator;
     };
 
-    typedef typename implementation_defined::node node;
-    typedef typename implementation_defined::node_pointer node_pointer;
-    typedef typename implementation_defined::node_list_type node_list_type;
-    typedef typename implementation_defined::node_list_iterator node_list_iterator;
+    typedef typename implementation_defined::node                     node;
+    typedef typename implementation_defined::node_pointer             node_pointer;
+    typedef typename implementation_defined::node_list_type           node_list_type;
+    typedef typename implementation_defined::node_list_iterator       node_list_iterator;
     typedef typename implementation_defined::node_list_const_iterator node_list_const_iterator;
-    typedef typename implementation_defined::internal_compare internal_compare;
+    typedef typename implementation_defined::internal_compare         internal_compare;
 #endif
 
 public:
     typedef T value_type;
 
-    typedef typename implementation_defined::size_type size_type;
-    typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
-    typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
+    typedef typename implementation_defined::size_type        size_type;
+    typedef typename implementation_defined::difference_type  difference_type;
+    typedef typename implementation_defined::value_compare    value_compare;
+    typedef typename implementation_defined::allocator_type   allocator_type;
+    typedef typename implementation_defined::reference        reference;
+    typedef typename implementation_defined::const_reference  const_reference;
+    typedef typename implementation_defined::pointer          pointer;
+    typedef typename implementation_defined::const_pointer    const_pointer;
     /// \copydoc boost::heap::priority_queue::iterator
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::iterator         iterator;
+    typedef typename implementation_defined::const_iterator   const_iterator;
     typedef typename implementation_defined::ordered_iterator ordered_iterator;
 
     typedef typename implementation_defined::handle_type handle_type;
 
-    static const bool constant_time_size = base_maker::constant_time_size;
+    static const bool constant_time_size    = base_maker::constant_time_size;
     static const bool has_ordered_iterators = true;
-    static const bool is_mergable = true;
-    static const bool is_stable = detail::extract_stable<bound_args>::value;
-    static const bool has_reserve = false;
+    static const bool is_mergable           = true;
+    static const bool is_stable             = detail::extract_stable< bound_args >::value;
+    static const bool has_reserve           = false;
 
     /// \copydoc boost::heap::priority_queue::priority_queue(value_compare const &)
-    explicit fibonacci_heap(value_compare const & cmp = value_compare()):
-        super_t(cmp), top_element(0)
+    explicit fibonacci_heap( value_compare const& cmp = value_compare() ) :
+        super_t( cmp ),
+        top_element( 0 )
+    {}
+
+    /// \copydoc boost::heap::priority_queue::priority_queue(allocator_type const &)
+    explicit fibonacci_heap( allocator_type const& alloc ) :
+        super_t( alloc ),
+        top_element( 0 )
     {}
 
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue const &)
-    fibonacci_heap(fibonacci_heap const & rhs):
-        super_t(rhs), top_element(0)
+    fibonacci_heap( fibonacci_heap const& rhs ) :
+        super_t( rhs ),
+        top_element( 0 )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        clone_forest(rhs);
-        size_holder::set_size(rhs.size());
+        clone_forest( rhs );
+        size_holder::set_size( rhs.size() );
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
-    fibonacci_heap(fibonacci_heap && rhs):
-        super_t(std::move(rhs)), top_element(rhs.top_element)
+    fibonacci_heap( fibonacci_heap&& rhs ) :
+        super_t( std::move( rhs ) ),
+        top_element( rhs.top_element )
     {
-        roots.splice(roots.begin(), rhs.roots);
+        roots.splice( roots.begin(), rhs.roots );
         rhs.top_element = NULL;
     }
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue &&)
-    fibonacci_heap & operator=(fibonacci_heap && rhs)
+    fibonacci_heap& operator=( fibonacci_heap&& rhs )
     {
         clear();
 
-        super_t::operator=(std::move(rhs));
-        roots.splice(roots.begin(), rhs.roots);
-        top_element = rhs.top_element;
+        super_t::operator=( std::move( rhs ) );
+        roots.splice( roots.begin(), rhs.roots );
+        top_element     = rhs.top_element;
         rhs.top_element = NULL;
         return *this;
     }
 #endif
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue const &)
-    fibonacci_heap & operator=(fibonacci_heap const & rhs)
+    fibonacci_heap& operator=( fibonacci_heap const& rhs )
     {
         clear();
-        size_holder::set_size(rhs.size());
-        static_cast<super_t&>(*this) = rhs;
+        size_holder::set_size( rhs.size() );
+        static_cast< super_t& >( *this ) = rhs;
 
-        if (rhs.empty())
+        if ( rhs.empty() )
             top_element = NULL;
         else
-            clone_forest(rhs);
+            clone_forest( rhs );
         return *this;
     }
 
-    ~fibonacci_heap(void)
+    ~fibonacci_heap( void )
     {
         clear();
     }
 
     /// \copydoc boost::heap::priority_queue::empty
-    bool empty(void) const
+    bool empty( void ) const
     {
-        if (constant_time_size)
+        if ( constant_time_size )
             return size() == 0;
         else
             return roots.empty();
     }
 
     /// \copydoc boost::heap::priority_queue::size
-    size_type size(void) const
+    size_type size( void ) const
     {
-        if (constant_time_size)
+        if ( constant_time_size )
             return size_holder::get_size();
 
-        if (empty())
+        if ( empty() )
             return 0;
         else
-            return detail::count_list_nodes<node, node_list_type>(roots);
+            return detail::count_list_nodes< node, node_list_type >( roots );
     }
 
     /// \copydoc boost::heap::priority_queue::max_size
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         const allocator_type& alloc = *this;
-        return boost::allocator_max_size(alloc);
+        return boost::allocator_max_size( alloc );
     }
 
     /// \copydoc boost::heap::priority_queue::clear
-    void clear(void)
+    void clear( void )
     {
-        typedef detail::node_disposer<node, typename node_list_type::value_type, allocator_type> disposer;
-        roots.clear_and_dispose(disposer(*this));
+        typedef detail::node_disposer< node, typename node_list_type::value_type, allocator_type > disposer;
+        roots.clear_and_dispose( disposer( *this ) );
 
-        size_holder::set_size(0);
+        size_holder::set_size( 0 );
         top_element = NULL;
     }
 
     /// \copydoc boost::heap::priority_queue::get_allocator
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return *this;
     }
 
     /// \copydoc boost::heap::priority_queue::swap
-    void swap(fibonacci_heap & rhs)
+    void swap( fibonacci_heap& rhs )
     {
-        super_t::swap(rhs);
-        std::swap(top_element, rhs.top_element);
-        roots.swap(rhs.roots);
+        super_t::swap( rhs );
+        std::swap( top_element, rhs.top_element );
+        roots.swap( rhs.roots );
     }
 
 
     /// \copydoc boost::heap::priority_queue::top
-    value_type const & top(void) const
+    value_type const& top( void ) const
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
-        return super_t::get_value(top_element->value);
+        return super_t::get_value( top_element->value );
     }
 
     /**
@@ -345,42 +349,43 @@ class fibonacci_heap:
      * \b Note: Does not invalidate iterators.
      *
      * */
-    handle_type push(value_type const & v)
+    handle_type push( value_type const& v )
     {
         size_holder::increment();
 
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node(super_t::make_node(v));
-        roots.push_front(*n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node( super_t::make_node( v ) );
+        roots.push_front( *n );
 
-        if (!top_element || super_t::operator()(top_element->value, n->value))
+        if ( !top_element || super_t::operator()( top_element->value, n->value ) )
             top_element = n;
-        return handle_type(n);
+        return handle_type( n );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
     /**
-     * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. Returns handle to element.
+     * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. Returns
+     * handle to element.
      *
      * \b Complexity: Constant.
      *
      * \b Note: Does not invalidate iterators.
      *
      * */
-    template <class... Args>
-    handle_type emplace(Args&&... args)
+    template < class... Args >
+    handle_type emplace( Args&&... args )
     {
         size_holder::increment();
 
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node(super_t::make_node(std::forward<Args>(args)...));
-        roots.push_front(*n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node( super_t::make_node( std::forward< Args >( args )... ) );
+        roots.push_front( *n );
 
-        if (!top_element || super_t::operator()(top_element->value, n->value))
+        if ( !top_element || super_t::operator()( top_element->value, n->value ) )
             top_element = n;
-        return handle_type(n);
+        return handle_type( n );
     }
 #endif
 
@@ -390,14 +395,14 @@ class fibonacci_heap:
      * \b Complexity: Logarithmic (amortized). Linear (worst case).
      *
      * */
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
         node_pointer element = top_element;
-        roots.erase(node_list_type::s_iterator_to(*element));
+        roots.erase( node_list_type::s_iterator_to( *element ) );
 
-        finish_erase_or_pop(element);
+        finish_erase_or_pop( element );
     }
 
     /**
@@ -406,12 +411,12 @@ class fibonacci_heap:
      * \b Complexity: Logarithmic if current value < v, Constant otherwise.
      *
      * */
-    void update (handle_type handle, const_reference v)
+    void update( handle_type handle, const_reference v )
     {
-        if (super_t::operator()(super_t::get_value(handle.node_->value), v))
-            increase(handle, v);
+        if ( super_t::operator()( super_t::get_value( handle.node_->value ), v ) )
+            increase( handle, v );
         else
-            decrease(handle, v);
+            decrease( handle, v );
     }
 
     /** \copydoc boost::heap::fibonacci_heap::update(handle_type, const_reference)
@@ -419,10 +424,10 @@ class fibonacci_heap:
      * \b Rationale: The lazy update function is a modification of the traditional update, that just invalidates
      *               the iterator to the object referred to by the handle.
      * */
-    void update_lazy(handle_type handle, const_reference v)
+    void update_lazy( handle_type handle, const_reference v )
     {
-        handle.node_->value = super_t::make_node(v);
-        update_lazy(handle);
+        handle.node_->value = super_t::make_node( v );
+        update_lazy( handle );
     }
 
     /**
@@ -432,9 +437,9 @@ class fibonacci_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void update (handle_type handle)
+    void update( handle_type handle )
     {
-        update_lazy(handle);
+        update_lazy( handle );
         consolidate();
     }
 
@@ -443,33 +448,33 @@ class fibonacci_heap:
      * \b Rationale: The lazy update function is a modification of the traditional update, that just invalidates
      *               the iterator to the object referred to by the handle.
      * */
-    void update_lazy (handle_type handle)
+    void update_lazy( handle_type handle )
     {
-        node_pointer n = handle.node_;
+        node_pointer n      = handle.node_;
         node_pointer parent = n->get_parent();
 
-        if (parent) {
+        if ( parent ) {
             n->parent = NULL;
-            roots.splice(roots.begin(), parent->children, node_list_type::s_iterator_to(*n));
+            roots.splice( roots.begin(), parent->children, node_list_type::s_iterator_to( *n ) );
         }
-        add_children_to_root(n);
+        add_children_to_root( n );
 
-        if (super_t::operator()(top_element->value, n->value))
+        if ( super_t::operator()( top_element->value, n->value ) )
             top_element = n;
     }
 
 
-     /**
+    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \b Complexity: Constant.
      *
      * \b Note: The new value is expected to be greater than the current one
      * */
-    void increase (handle_type handle, const_reference v)
+    void increase( handle_type handle, const_reference v )
     {
-        handle.node_->value = super_t::make_node(v);
-        increase(handle);
+        handle.node_->value = super_t::make_node( v );
+        increase( handle );
     }
 
     /**
@@ -479,19 +484,19 @@ class fibonacci_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void increase (handle_type handle)
+    void increase( handle_type handle )
     {
         node_pointer n = handle.node_;
 
-        if (n->parent) {
-            if (super_t::operator()(n->get_parent()->value, n->value)) {
+        if ( n->parent ) {
+            if ( super_t::operator()( n->get_parent()->value, n->value ) ) {
                 node_pointer parent = n->get_parent();
-                cut(n);
-                cascading_cut(parent);
+                cut( n );
+                cascading_cut( parent );
             }
         }
 
-        if (super_t::operator()(top_element->value, n->value)) {
+        if ( super_t::operator()( top_element->value, n->value ) ) {
             top_element = n;
             return;
         }
@@ -504,10 +509,10 @@ class fibonacci_heap:
      *
      * \b Note: The new value is expected to be less than the current one
      * */
-    void decrease (handle_type handle, const_reference v)
+    void decrease( handle_type handle, const_reference v )
     {
-        handle.node_->value = super_t::make_node(v);
-        decrease(handle);
+        handle.node_->value = super_t::make_node( v );
+        decrease( handle );
     }
 
     /**
@@ -515,11 +520,12 @@ class fibonacci_heap:
      *
      * \b Complexity: Logarithmic.
      *
-     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      * */
-    void decrease (handle_type handle)
+    void decrease( handle_type handle )
     {
-        update(handle);
+        update( handle );
     }
 
     /**
@@ -527,29 +533,29 @@ class fibonacci_heap:
      *
      * \b Complexity: Logarithmic.
      * */
-    void erase(handle_type const & handle)
+    void erase( handle_type const& handle )
     {
         node_pointer element = handle.node_;
-        node_pointer parent = element->get_parent();
+        node_pointer parent  = element->get_parent();
 
-        if (parent)
-            parent->children.erase(node_list_type::s_iterator_to(*element));
+        if ( parent )
+            parent->children.erase( node_list_type::s_iterator_to( *element ) );
         else
-            roots.erase(node_list_type::s_iterator_to(*element));
+            roots.erase( node_list_type::s_iterator_to( *element ) );
 
-        finish_erase_or_pop(element);
+        finish_erase_or_pop( element );
     }
 
     /// \copydoc boost::heap::priority_queue::begin
-    iterator begin(void) const
+    iterator begin( void ) const
     {
-        return iterator(roots.begin());
+        return iterator( roots.begin() );
     }
 
     /// \copydoc boost::heap::priority_queue::end
-    iterator end(void) const
+    iterator end( void ) const
     {
-        return iterator(roots.end());
+        return iterator( roots.end() );
     }
 
 
@@ -558,9 +564,9 @@ class fibonacci_heap:
      *
      * \b Note: Ordered iterators traverse the priority queue in heap order.
      * */
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
-        return ordered_iterator(roots.begin(), roots.end(), top_element, super_t::value_comp());
+        return ordered_iterator( roots.begin(), roots.end(), top_element, super_t::value_comp() );
     }
 
     /**
@@ -568,9 +574,9 @@ class fibonacci_heap:
      *
      * \b Note: Ordered iterators traverse the priority queue in heap order.
      * */
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
-        return ordered_iterator(NULL, super_t::value_comp());
+        return ordered_iterator( NULL, super_t::value_comp() );
     }
 
     /**
@@ -579,188 +585,187 @@ class fibonacci_heap:
      * \b Complexity: Constant.
      *
      * */
-    void merge(fibonacci_heap & rhs)
+    void merge( fibonacci_heap& rhs )
     {
-        size_holder::add(rhs.get_size());
+        size_holder::add( rhs.get_size() );
 
-        if (!top_element ||
-            (rhs.top_element && super_t::operator()(top_element->value, rhs.top_element->value)))
+        if ( !top_element || ( rhs.top_element && super_t::operator()( top_element->value, rhs.top_element->value ) ) )
             top_element = rhs.top_element;
 
-        roots.splice(roots.end(), rhs.roots);
+        roots.splice( roots.end(), rhs.roots );
 
         rhs.top_element = NULL;
-        rhs.set_size(0);
+        rhs.set_size( 0 );
 
-        super_t::set_stability_count((std::max)(super_t::get_stability_count(),
-                                     rhs.get_stability_count()));
-        rhs.set_stability_count(0);
+        super_t::set_stability_count( ( std::max )( super_t::get_stability_count(), rhs.get_stability_count() ) );
+        rhs.set_stability_count( 0 );
     }
 
     /// \copydoc boost::heap::d_ary_heap_mutable::s_handle_from_iterator
-    static handle_type s_handle_from_iterator(iterator const & it)
+    static handle_type s_handle_from_iterator( iterator const& it )
     {
-        node * ptr = const_cast<node *>(it.get_node());
-        return handle_type(ptr);
+        node* ptr = const_cast< node* >( it.get_node() );
+        return handle_type( ptr );
     }
 
     /// \copydoc boost::heap::priority_queue::value_comp
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
 
     /// \copydoc boost::heap::priority_queue::operator<(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<( HeapType const& rhs ) const
     {
-        return detail::heap_compare(*this, rhs);
+        return detail::heap_compare( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>( HeapType const& rhs ) const
     {
-        return detail::heap_compare(rhs, *this);
+        return detail::heap_compare( rhs, *this );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>=( HeapType const& rhs ) const
     {
-        return !operator<(rhs);
+        return !operator<( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator<=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<=( HeapType const& rhs ) const
     {
-        return !operator>(rhs);
+        return !operator>( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator==(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator==(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator==( HeapType const& rhs ) const
     {
-        return detail::heap_equality(*this, rhs);
+        return detail::heap_equality( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator!=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator!=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator!=( HeapType const& rhs ) const
     {
-        return !(*this == rhs);
+        return !( *this == rhs );
     }
 
 private:
-#if !defined(BOOST_DOXYGEN_INVOKED)
-    void clone_forest(fibonacci_heap const & rhs)
+#if !defined( BOOST_DOXYGEN_INVOKED )
+    void clone_forest( fibonacci_heap const& rhs )
     {
-        BOOST_HEAP_ASSERT(roots.empty());
-        typedef typename node::template node_cloner<allocator_type> node_cloner;
-        roots.clone_from(rhs.roots, node_cloner(*this, NULL), detail::nop_disposer());
+        BOOST_HEAP_ASSERT( roots.empty() );
+        typedef typename node::template node_cloner< allocator_type > node_cloner;
+        roots.clone_from( rhs.roots, node_cloner( *this, NULL ), detail::nop_disposer() );
 
-        top_element = detail::find_max_child<node_list_type, node, internal_compare>(roots, super_t::get_internal_cmp());
+        top_element
+            = detail::find_max_child< node_list_type, node, internal_compare >( roots, super_t::get_internal_cmp() );
     }
 
-    void cut(node_pointer n)
+    void cut( node_pointer n )
     {
         node_pointer parent = n->get_parent();
-        roots.splice(roots.begin(), parent->children, node_list_type::s_iterator_to(*n));
+        roots.splice( roots.begin(), parent->children, node_list_type::s_iterator_to( *n ) );
         n->parent = 0;
-        n->mark = false;
+        n->mark   = false;
     }
 
-    void cascading_cut(node_pointer n)
+    void cascading_cut( node_pointer n )
     {
         node_pointer parent = n->get_parent();
 
-        if (parent) {
-            if (!parent->mark)
+        if ( parent ) {
+            if ( !parent->mark )
                 parent->mark = true;
             else {
-                cut(n);
-                cascading_cut(parent);
+                cut( n );
+                cascading_cut( parent );
             }
         }
     }
 
-    void add_children_to_root(node_pointer n)
+    void add_children_to_root( node_pointer n )
     {
-        for (node_list_iterator it = n->children.begin(); it != n->children.end(); ++it) {
-            node_pointer child = static_cast<node_pointer>(&*it);
-            child->parent = 0;
+        for ( node_list_iterator it = n->children.begin(); it != n->children.end(); ++it ) {
+            node_pointer child = static_cast< node_pointer >( &*it );
+            child->parent      = 0;
         }
 
-        roots.splice(roots.end(), n->children);
+        roots.splice( roots.end(), n->children );
     }
 
-    void consolidate(void)
+    void consolidate( void )
     {
-        if (roots.empty())
+        if ( roots.empty() )
             return;
 
-        static const size_type max_log2 = sizeof(size_type) * 8;
-        boost::array<node_pointer, max_log2> aux;
-        aux.assign(NULL);
+        static const size_type                 max_log2 = sizeof( size_type ) * 8;
+        boost::array< node_pointer, max_log2 > aux;
+        aux.assign( NULL );
 
         node_list_iterator it = roots.begin();
-        top_element = static_cast<node_pointer>(&*it);
+        top_element           = static_cast< node_pointer >( &*it );
 
         do {
-            node_pointer n = static_cast<node_pointer>(&*it);
+            node_pointer n = static_cast< node_pointer >( &*it );
             ++it;
             size_type node_rank = n->child_count();
 
-            if (aux[node_rank] == NULL)
-                aux[node_rank] = n;
+            if ( aux[ node_rank ] == NULL )
+                aux[ node_rank ] = n;
             else {
                 do {
-                    node_pointer other = aux[node_rank];
-                    if (super_t::operator()(n->value, other->value))
-                        std::swap(n, other);
-
-                    if (other->parent)
-                        n->children.splice(n->children.end(), other->parent->children, node_list_type::s_iterator_to(*other));
+                    node_pointer other = aux[ node_rank ];
+                    if ( super_t::operator()( n->value, other->value ) )
+                        std::swap( n, other );
+
+                    if ( other->parent )
+                        n->children.splice( n->children.end(),
+                                            other->parent->children,
+                                            node_list_type::s_iterator_to( *other ) );
                     else
-                        n->children.splice(n->children.end(), roots, node_list_type::s_iterator_to(*other));
+                        n->children.splice( n->children.end(), roots, node_list_type::s_iterator_to( *other ) );
 
                     other->parent = n;
 
-                    aux[node_rank] = NULL;
-                    node_rank = n->child_count();
-                } while (aux[node_rank] != NULL);
-                aux[node_rank] = n;
+                    aux[ node_rank ] = NULL;
+                    node_rank        = n->child_count();
+                } while ( aux[ node_rank ] != NULL );
+                aux[ node_rank ] = n;
             }
 
-            if (!super_t::operator()(n->value, top_element->value))
+            if ( !super_t::operator()( n->value, top_element->value ) )
                 top_element = n;
-        }
-        while (it != roots.end());
+        } while ( it != roots.end() );
     }
 
-    void finish_erase_or_pop(node_pointer erased_node)
+    void finish_erase_or_pop( node_pointer erased_node )
     {
-        add_children_to_root(erased_node);
+        add_children_to_root( erased_node );
 
         erased_node->~node();
         allocator_type& alloc = *this;
-        alloc.deallocate(erased_node, 1);
+        alloc.deallocate( erased_node, 1 );
 
         size_holder::decrement();
-        if (!empty())
+        if ( !empty() )
             consolidate();
         else
             top_element = NULL;
     }
 
     mutable node_pointer top_element;
-    node_list_type roots;
+    node_list_type       roots;
 #endif
 };
 
-} /* namespace heap */
-} /* namespace boost */
+}} // namespace boost::heap
 
 #undef BOOST_HEAP_ASSERT
 
diff --git a/inst/include/boost/heap/heap_concepts.hpp b/inst/include/boost/heap/heap_concepts.hpp
index 62c16049d..d088074f2 100644
--- a/inst/include/boost/heap/heap_concepts.hpp
+++ b/inst/include/boost/heap/heap_concepts.hpp
@@ -11,37 +11,35 @@
 
 #include <boost/concept_check.hpp>
 
-namespace boost {
-namespace heap  {
+namespace boost { namespace heap {
 
 
-template <class C>
-struct PriorityQueue:
-    boost::ForwardContainer<C>
+template < class C >
+struct PriorityQueue : boost::ForwardContainer< C >
 {
-    typedef typename C::iterator iterator;
-    typedef typename C::const_iterator const_iterator;
-    typedef typename C::allocator_type allocator_type;
-    typedef typename C::value_compare value_compare;
-    typedef typename C::value_type value_type;
+    typedef typename C::iterator        iterator;
+    typedef typename C::const_iterator  const_iterator;
+    typedef typename C::allocator_type  allocator_type;
+    typedef typename C::value_compare   value_compare;
+    typedef typename C::value_type      value_type;
     typedef typename C::const_reference const_reference;
 
 
-    BOOST_CONCEPT_USAGE(PriorityQueue)
+    BOOST_CONCEPT_USAGE( PriorityQueue )
     {
-        BOOST_CONCEPT_ASSERT((boost::Assignable<value_type>));
-        BOOST_CONCEPT_ASSERT((boost::Container<C>));
-        BOOST_CONCEPT_ASSERT((boost::EqualityComparable<C>));
-        BOOST_CONCEPT_ASSERT((boost::Comparable<C>));
+        BOOST_CONCEPT_ASSERT( (boost::Assignable< value_type >));
+        BOOST_CONCEPT_ASSERT( (boost::Container< C >));
+        BOOST_CONCEPT_ASSERT( (boost::EqualityComparable< C >));
+        BOOST_CONCEPT_ASSERT( (boost::Comparable< C >));
 
-        BOOST_CONCEPT_ASSERT((boost::Const_BinaryPredicate<value_compare, value_type, value_type>));
+        BOOST_CONCEPT_ASSERT( (boost::Const_BinaryPredicate< value_compare, value_type, value_type >));
 
-        c.swap(c2);
+        c.swap( c2 );
         c.clear();
         a = c.get_allocator();
 
         typename PriorityQueue::value_type v;
-        c.push(v);
+        c.push( v );
 
         v = c.top();
         c.pop();
@@ -50,61 +48,59 @@ struct PriorityQueue:
 
         // verify tags
         has_ordered_iterators = C::has_ordered_iterators;
-        is_mergable = C::is_mergable;
-        is_stable   = C::is_stable;
+        is_mergable           = C::is_mergable;
+        is_stable             = C::is_stable;
     }
 
 private:
-    C c, c2;
-    allocator_type a;
+    C                      c, c2;
+    allocator_type         a;
     typename C::value_type v;
-    value_compare cmp;
-    bool has_ordered_iterators, is_mergable, is_stable;
+    value_compare          cmp;
+    bool                   has_ordered_iterators, is_mergable, is_stable;
 };
 
-template <class C>
-struct MergablePriorityQueue:
-    PriorityQueue<C>
+template < class C >
+struct MergablePriorityQueue : PriorityQueue< C >
 {
-    BOOST_CONCEPT_USAGE(MergablePriorityQueue)
+    BOOST_CONCEPT_USAGE( MergablePriorityQueue )
     {
         C c, c2;
-        c.merge(c2);
+        c.merge( c2 );
     }
 };
 
 
-template <class C>
-struct MutablePriorityQueue:
-    PriorityQueue<C>
+template < class C >
+struct MutablePriorityQueue : PriorityQueue< C >
 {
     typedef typename C::handle_type handle_type;
 
-    BOOST_CONCEPT_USAGE(MutablePriorityQueue)
+    BOOST_CONCEPT_USAGE( MutablePriorityQueue )
     {
-        BOOST_CONCEPT_ASSERT((boost::Assignable<typename MutablePriorityQueue::handle_type>));
+        BOOST_CONCEPT_ASSERT( (boost::Assignable< typename MutablePriorityQueue::handle_type >));
 
-        typename MutablePriorityQueue::value_type v;
-        typename MutablePriorityQueue::handle_type h  = c.push(v);
-        typename MutablePriorityQueue::handle_type h2 = c.push(v);
-        c.update(h, v);
-        c.increase(h, v);
-        c.decrease(h, v);
+        typename MutablePriorityQueue::value_type  v;
+        typename MutablePriorityQueue::handle_type h  = c.push( v );
+        typename MutablePriorityQueue::handle_type h2 = c.push( v );
+        c.update( h, v );
+        c.increase( h, v );
+        c.decrease( h, v );
 
-        c.update(h);
-        c.increase(h);
-        c.decrease(h);
+        c.update( h );
+        c.increase( h );
+        c.decrease( h );
 
-        equal = (h == h2);
-        not_equal = (h != h2);
+        equal     = ( h == h2 );
+        not_equal = ( h != h2 );
 
         h2 = h;
     }
 
-    C c;
+    C    c;
     bool equal, not_equal;
 };
 
-}}
+}}     // namespace boost::heap
 
 #endif /* BOOST_HEAP_CONCEPTS_HPP */
diff --git a/inst/include/boost/heap/heap_merge.hpp b/inst/include/boost/heap/heap_merge.hpp
index 3aaa4cf58..7ca5615b0 100644
--- a/inst/include/boost/heap/heap_merge.hpp
+++ b/inst/include/boost/heap/heap_merge.hpp
@@ -17,83 +17,78 @@
 #include <boost/type_traits/is_same.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
-template <typename Heap1, typename Heap2>
+template < typename Heap1, typename Heap2 >
 struct heap_merge_emulate
 {
     struct dummy_reserver
     {
-        static void reserve (Heap1 & lhs, std::size_t required_size)
+        static void reserve( Heap1& lhs, std::size_t required_size )
         {}
     };
 
     struct reserver
     {
-        static void reserve (Heap1 & lhs, std::size_t required_size)
+        static void reserve( Heap1& lhs, std::size_t required_size )
         {
-            lhs.reserve(required_size);
+            lhs.reserve( required_size );
         }
     };
 
-    typedef typename boost::conditional<Heap1::has_reserve,
-                                      reserver,
-                                      dummy_reserver>::type space_reserver;
+    typedef typename boost::conditional< Heap1::has_reserve, reserver, dummy_reserver >::type space_reserver;
 
-    static void merge(Heap1 & lhs, Heap2 & rhs)
+    static void merge( Heap1& lhs, Heap2& rhs )
     {
-        if (Heap1::constant_time_size && Heap2::constant_time_size) {
-            if (Heap1::has_reserve) {
+        if ( Heap1::constant_time_size && Heap2::constant_time_size ) {
+            if ( Heap1::has_reserve ) {
                 std::size_t required_size = lhs.size() + rhs.size();
-                space_reserver::reserve(lhs, required_size);
+                space_reserver::reserve( lhs, required_size );
             }
         }
 
         // FIXME: container adaptors could benefit from first appending all elements and then restoring the heap order
-        // FIXME: optimize: if we have ordered iterators and we can efficiently insert keys with a below the lowest key in the heap
+        // FIXME: optimize: if we have ordered iterators and we can efficiently insert keys with a below the lowest key
+        // in the heap
         //                  d-ary, b and fibonacci heaps fall into this category
 
-        while (!rhs.empty()) {
-            lhs.push(rhs.top());
+        while ( !rhs.empty() ) {
+            lhs.push( rhs.top() );
             rhs.pop();
         }
 
-        lhs.set_stability_count((std::max)(lhs.get_stability_count(),
-                                           rhs.get_stability_count()));
-        rhs.set_stability_count(0);
+        lhs.set_stability_count( ( std::max )( lhs.get_stability_count(), rhs.get_stability_count() ) );
+        rhs.set_stability_count( 0 );
     }
-
 };
 
 
-template <typename Heap>
+template < typename Heap >
 struct heap_merge_same_mergable
 {
-    static void merge(Heap & lhs, Heap & rhs)
+    static void merge( Heap& lhs, Heap& rhs )
     {
-        lhs.merge(rhs);
+        lhs.merge( rhs );
     }
 };
 
 
-template <typename Heap>
+template < typename Heap >
 struct heap_merge_same
 {
     static const bool is_mergable = Heap::is_mergable;
-    typedef typename boost::conditional<is_mergable,
-                                      heap_merge_same_mergable<Heap>,
-                                      heap_merge_emulate<Heap, Heap>
-                                     >::type heap_merger;
+    typedef
+        typename boost::conditional< is_mergable, heap_merge_same_mergable< Heap >, heap_merge_emulate< Heap, Heap > >::type
+            heap_merger;
 
-    static void merge(Heap & lhs, Heap & rhs)
+    static void merge( Heap& lhs, Heap& rhs )
     {
-        heap_merger::merge(lhs, rhs);
+        heap_merger::merge( lhs, rhs );
     }
 };
 
@@ -105,29 +100,25 @@ struct heap_merge_same
  *  \b Effect: lhs contains all elements that have been part of rhs, rhs is empty.
  *
  * */
-template <typename Heap1,
-          typename Heap2
-         >
-void heap_merge(Heap1 & lhs, Heap2 & rhs)
+template < typename Heap1, typename Heap2 >
+void heap_merge( Heap1& lhs, Heap2& rhs )
 {
-    BOOST_CONCEPT_ASSERT((boost::heap::PriorityQueue<Heap1>));
-    BOOST_CONCEPT_ASSERT((boost::heap::PriorityQueue<Heap2>));
+    BOOST_CONCEPT_ASSERT( (boost::heap::PriorityQueue< Heap1 >));
+    BOOST_CONCEPT_ASSERT( (boost::heap::PriorityQueue< Heap2 >));
 
     // if this assertion is triggered, the value_compare types are incompatible
-    BOOST_STATIC_ASSERT((boost::is_same<typename Heap1::value_compare, typename Heap2::value_compare>::value));
+    BOOST_STATIC_ASSERT( ( boost::is_same< typename Heap1::value_compare, typename Heap2::value_compare >::value ) );
 
-    const bool same_heaps = boost::is_same<Heap1, Heap2>::value;
+    const bool same_heaps = boost::is_same< Heap1, Heap2 >::value;
 
-    typedef typename boost::conditional<same_heaps,
-                                      detail::heap_merge_same<Heap1>,
-                                      detail::heap_merge_emulate<Heap1, Heap2>
-                                     >::type heap_merger;
+    typedef typename boost::conditional< same_heaps,
+                                         detail::heap_merge_same< Heap1 >,
+                                         detail::heap_merge_emulate< Heap1, Heap2 > >::type heap_merger;
 
-    heap_merger::merge(lhs, rhs);
+    heap_merger::merge( lhs, rhs );
 }
 
 
-} /* namespace heap */
-} /* namespace boost */
+}}     // namespace boost::heap
 
 #endif /* BOOST_HEAP_MERGE_HPP */
diff --git a/inst/include/boost/heap/pairing_heap.hpp b/inst/include/boost/heap/pairing_heap.hpp
index c591cc9e8..53a0075be 100644
--- a/inst/include/boost/heap/pairing_heap.hpp
+++ b/inst/include/boost/heap/pairing_heap.hpp
@@ -11,92 +11,91 @@
 
 #include <algorithm>
 #include <utility>
-#include <vector>
 
 #include <boost/assert.hpp>
 
 #include <boost/heap/detail/heap_comparison.hpp>
 #include <boost/heap/detail/heap_node.hpp>
-#include <boost/heap/policies.hpp>
 #include <boost/heap/detail/stable_heap.hpp>
 #include <boost/heap/detail/tree_iterator.hpp>
+#include <boost/heap/policies.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 
 #ifndef BOOST_DOXYGEN_INVOKED
-#ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
-#else
-#define BOOST_HEAP_ASSERT(expression)
-#endif
+#    ifdef BOOST_HEAP_SANITYCHECKS
+#        define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    else
+#        define BOOST_HEAP_ASSERT( expression )
+#    endif
 #endif
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
-typedef parameter::parameters<boost::parameter::optional<tag::allocator>,
-                              boost::parameter::optional<tag::compare>,
-                              boost::parameter::optional<tag::stable>,
-                              boost::parameter::optional<tag::constant_time_size>,
-                              boost::parameter::optional<tag::stability_counter_type>
-                             > pairing_heap_signature;
+typedef parameter::parameters< boost::parameter::optional< tag::allocator >,
+                               boost::parameter::optional< tag::compare >,
+                               boost::parameter::optional< tag::stable >,
+                               boost::parameter::optional< tag::constant_time_size >,
+                               boost::parameter::optional< tag::stability_counter_type > >
+    pairing_heap_signature;
 
-template <typename T, typename Parspec>
+template < typename T, typename Parspec >
 struct make_pairing_heap_base
 {
-    static const bool constant_time_size = parameter::binding<Parspec,
-                                                              tag::constant_time_size,
-                                                              boost::true_type
-                                                             >::type::value;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::type base_type;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::allocator_argument allocator_argument;
-    typedef typename detail::make_heap_base<T, Parspec, constant_time_size>::compare_argument compare_argument;
+    static const bool constant_time_size
+        = parameter::binding< Parspec, tag::constant_time_size, boost::true_type >::type::value;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::type               base_type;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::allocator_argument allocator_argument;
+    typedef typename detail::make_heap_base< T, Parspec, constant_time_size >::compare_argument   compare_argument;
 
-    typedef heap_node<typename base_type::internal_type, false> node_type;
+    typedef heap_node< typename base_type::internal_type, false > node_type;
 
-    typedef typename boost::allocator_rebind<allocator_argument, node_type>::type allocator_type;
+    typedef typename boost::allocator_rebind< allocator_argument, node_type >::type allocator_type;
 
-    struct type:
-        base_type,
-        allocator_type
+    struct type : base_type, allocator_type
     {
-        type(compare_argument const & arg):
-            base_type(arg)
+        type( compare_argument const& arg ) :
+            base_type( arg )
+        {}
+
+        type( allocator_type const& arg ) :
+            allocator_type( arg )
         {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        type(type const & rhs):
-            base_type(rhs), allocator_type(rhs)
+        type( type const& rhs ) :
+            base_type( rhs ),
+            allocator_type( rhs )
         {}
 
-        type(type && rhs):
-            base_type(std::move(static_cast<base_type&>(rhs))),
-            allocator_type(std::move(static_cast<allocator_type&>(rhs)))
+        type( type&& rhs ) :
+            base_type( std::move( static_cast< base_type& >( rhs ) ) ),
+            allocator_type( std::move( static_cast< allocator_type& >( rhs ) ) )
         {}
 
-        type & operator=(type && rhs)
+        type& operator=( type&& rhs )
         {
-            base_type::operator=(std::move(static_cast<base_type&>(rhs)));
-            allocator_type::operator=(std::move(static_cast<allocator_type&>(rhs)));
+            base_type::operator=( std::move( static_cast< base_type& >( rhs ) ) );
+            allocator_type::operator=( std::move( static_cast< allocator_type& >( rhs ) ) );
             return *this;
         }
 
-        type & operator=(type const & rhs)
+        type& operator=( type const& rhs )
         {
-            base_type::operator=(static_cast<base_type const &>(rhs));
-            allocator_type::operator=(static_cast<const allocator_type&>(rhs));
+            base_type::operator=( static_cast< base_type const& >( rhs ) );
+            allocator_type::operator=( static_cast< const allocator_type& >( rhs ) );
             return *this;
         }
 #endif
     };
 };
 
-}
+} // namespace detail
 
 /**
  * \class pairing_heap
@@ -121,226 +120,230 @@ struct make_pairing_heap_base
  *
  */
 #ifdef BOOST_DOXYGEN_INVOKED
-template<class T, class ...Options>
+template < class T, class... Options >
 #else
-template <typename T,
-          class A0 = boost::parameter::void_,
-          class A1 = boost::parameter::void_,
-          class A2 = boost::parameter::void_,
-          class A3 = boost::parameter::void_,
-          class A4 = boost::parameter::void_
-         >
+template < typename T,
+           class A0 = boost::parameter::void_,
+           class A1 = boost::parameter::void_,
+           class A2 = boost::parameter::void_,
+           class A3 = boost::parameter::void_,
+           class A4 = boost::parameter::void_ >
 #endif
-class pairing_heap:
-    private detail::make_pairing_heap_base<T,
-                                           typename detail::pairing_heap_signature::bind<A0, A1, A2, A3, A4>::type
-                                          >::type
+class pairing_heap :
+    private detail::make_pairing_heap_base< T, typename detail::pairing_heap_signature::bind< A0, A1, A2, A3, A4 >::type >::type
 {
-    typedef typename detail::pairing_heap_signature::bind<A0, A1, A2, A3, A4>::type bound_args;
-    typedef detail::make_pairing_heap_base<T, bound_args> base_maker;
-    typedef typename base_maker::type super_t;
+    typedef typename detail::pairing_heap_signature::bind< A0, A1, A2, A3, A4 >::type bound_args;
+    typedef detail::make_pairing_heap_base< T, bound_args >                           base_maker;
+    typedef typename base_maker::type                                                 super_t;
 
-    typedef typename super_t::internal_type internal_type;
-    typedef typename super_t::size_holder_type size_holder;
+    typedef typename super_t::internal_type         internal_type;
+    typedef typename super_t::size_holder_type      size_holder;
     typedef typename base_maker::allocator_argument allocator_argument;
 
 private:
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
 #ifndef BOOST_DOXYGEN_INVOKED
-    struct implementation_defined:
-        detail::extract_allocator_types<typename base_maker::allocator_argument>
+    struct implementation_defined : detail::extract_allocator_types< typename base_maker::allocator_argument >
     {
         typedef T value_type;
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::size_type size_type;
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::reference reference;
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::size_type size_type;
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::reference reference;
 
         typedef typename base_maker::compare_argument value_compare;
-        typedef typename base_maker::allocator_type allocator_type;
+        typedef typename base_maker::allocator_type   allocator_type;
 
-        typedef typename boost::allocator_pointer<allocator_type>::type node_pointer;
-        typedef typename boost::allocator_const_pointer<allocator_type>::type const_node_pointer;
+        typedef typename boost::allocator_pointer< allocator_type >::type       node_pointer;
+        typedef typename boost::allocator_const_pointer< allocator_type >::type const_node_pointer;
 
-        typedef detail::heap_node_list node_list_type;
-        typedef typename node_list_type::iterator node_list_iterator;
+        typedef detail::heap_node_list                  node_list_type;
+        typedef typename node_list_type::iterator       node_list_iterator;
         typedef typename node_list_type::const_iterator node_list_const_iterator;
 
         typedef typename base_maker::node_type node;
 
-        typedef detail::value_extractor<value_type, internal_type, super_t> value_extractor;
-        typedef typename super_t::internal_compare internal_compare;
-        typedef detail::node_handle<node_pointer, super_t, reference> handle_type;
+        typedef detail::value_extractor< value_type, internal_type, super_t > value_extractor;
+        typedef typename super_t::internal_compare                            internal_compare;
+        typedef detail::node_handle< node_pointer, super_t, reference >       handle_type;
 
-        typedef detail::tree_iterator<node,
-                                      const value_type,
-                                      allocator_type,
-                                      value_extractor,
-                                      detail::pointer_to_reference<node>,
-                                      false,
-                                      false,
-                                      value_compare
-                                     > iterator;
+        typedef detail::tree_iterator< node,
+                                       const value_type,
+                                       allocator_type,
+                                       value_extractor,
+                                       detail::pointer_to_reference< node >,
+                                       false,
+                                       false,
+                                       value_compare >
+            iterator;
 
         typedef iterator const_iterator;
 
-        typedef detail::tree_iterator<node,
-                                      const value_type,
-                                      allocator_type,
-                                      value_extractor,
-                                      detail::pointer_to_reference<node>,
-                                      false,
-                                      true,
-                                      value_compare
-                                     > ordered_iterator;
+        typedef detail::tree_iterator< node,
+                                       const value_type,
+                                       allocator_type,
+                                       value_extractor,
+                                       detail::pointer_to_reference< node >,
+                                       false,
+                                       true,
+                                       value_compare >
+            ordered_iterator;
     };
 
-    typedef typename implementation_defined::node node;
-    typedef typename implementation_defined::node_pointer node_pointer;
-    typedef typename implementation_defined::node_list_type node_list_type;
-    typedef typename implementation_defined::node_list_iterator node_list_iterator;
+    typedef typename implementation_defined::node                     node;
+    typedef typename implementation_defined::node_pointer             node_pointer;
+    typedef typename implementation_defined::node_list_type           node_list_type;
+    typedef typename implementation_defined::node_list_iterator       node_list_iterator;
     typedef typename implementation_defined::node_list_const_iterator node_list_const_iterator;
-    typedef typename implementation_defined::internal_compare internal_compare;
+    typedef typename implementation_defined::internal_compare         internal_compare;
 
-    typedef boost::intrusive::list<detail::heap_node_base<true>,
-                                   boost::intrusive::constant_time_size<false>
-                                  > node_child_list;
+    typedef boost::intrusive::list< detail::heap_node_base< true >, boost::intrusive::constant_time_size< false > >
+        node_child_list;
 #endif
 
 public:
     typedef T value_type;
 
-    typedef typename implementation_defined::size_type size_type;
-    typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
-    typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
+    typedef typename implementation_defined::size_type        size_type;
+    typedef typename implementation_defined::difference_type  difference_type;
+    typedef typename implementation_defined::value_compare    value_compare;
+    typedef typename implementation_defined::allocator_type   allocator_type;
+    typedef typename implementation_defined::reference        reference;
+    typedef typename implementation_defined::const_reference  const_reference;
+    typedef typename implementation_defined::pointer          pointer;
+    typedef typename implementation_defined::const_pointer    const_pointer;
     /// \copydoc boost::heap::priority_queue::iterator
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::iterator         iterator;
+    typedef typename implementation_defined::const_iterator   const_iterator;
     typedef typename implementation_defined::ordered_iterator ordered_iterator;
 
     typedef typename implementation_defined::handle_type handle_type;
 
-    static const bool constant_time_size = super_t::constant_time_size;
+    static const bool constant_time_size    = super_t::constant_time_size;
     static const bool has_ordered_iterators = true;
-    static const bool is_mergable = true;
-    static const bool is_stable = detail::extract_stable<bound_args>::value;
-    static const bool has_reserve = false;
+    static const bool is_mergable           = true;
+    static const bool is_stable             = detail::extract_stable< bound_args >::value;
+    static const bool has_reserve           = false;
 
     /// \copydoc boost::heap::priority_queue::priority_queue(value_compare const &)
-    explicit pairing_heap(value_compare const & cmp = value_compare()):
-        super_t(cmp), root(NULL)
+    explicit pairing_heap( value_compare const& cmp = value_compare() ) :
+        super_t( cmp ),
+        root( NULL )
+    {}
+
+    /// \copydoc boost::heap::priority_queue::priority_queue(allocator_type const &)
+    explicit pairing_heap( allocator_type const& alloc ) :
+        super_t( alloc ),
+        root( NULL )
     {}
 
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue const &)
-    pairing_heap(pairing_heap const & rhs):
-        super_t(rhs), root(NULL)
+    pairing_heap( pairing_heap const& rhs ) :
+        super_t( rhs ),
+        root( NULL )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        clone_tree(rhs);
-        size_holder::set_size(rhs.get_size());
+        clone_tree( rhs );
+        size_holder::set_size( rhs.get_size() );
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
-    pairing_heap(pairing_heap && rhs):
-        super_t(std::move(rhs)), root(rhs.root)
+    pairing_heap( pairing_heap&& rhs ) :
+        super_t( std::move( rhs ) ),
+        root( rhs.root )
     {
         rhs.root = NULL;
     }
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue &&)
-    pairing_heap & operator=(pairing_heap && rhs)
+    pairing_heap& operator=( pairing_heap&& rhs )
     {
-        super_t::operator=(std::move(rhs));
-        root = rhs.root;
+        super_t::operator=( std::move( rhs ) );
+        root     = rhs.root;
         rhs.root = NULL;
         return *this;
     }
 #endif
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue const & rhs)
-    pairing_heap & operator=(pairing_heap const & rhs)
+    pairing_heap& operator=( pairing_heap const& rhs )
     {
         clear();
-        size_holder::set_size(rhs.get_size());
-        static_cast<super_t&>(*this) = rhs;
+        size_holder::set_size( rhs.get_size() );
+        static_cast< super_t& >( *this ) = rhs;
 
-        clone_tree(rhs);
+        clone_tree( rhs );
         return *this;
     }
 
-    ~pairing_heap(void)
+    ~pairing_heap( void )
     {
-        while (!empty())
+        while ( !empty() )
             pop();
     }
 
     /// \copydoc boost::heap::priority_queue::empty
-    bool empty(void) const
+    bool empty( void ) const
     {
         return root == NULL;
     }
 
     /// \copydoc boost::heap::binomial_heap::size
-    size_type size(void) const
+    size_type size( void ) const
     {
-        if (constant_time_size)
+        if ( constant_time_size )
             return size_holder::get_size();
 
-        if (root == NULL)
+        if ( root == NULL )
             return 0;
         else
-            return detail::count_nodes(root);
+            return detail::count_nodes( root );
     }
 
     /// \copydoc boost::heap::priority_queue::max_size
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         const allocator_type& alloc = *this;
-        return boost::allocator_max_size(alloc);
+        return boost::allocator_max_size( alloc );
     }
 
     /// \copydoc boost::heap::priority_queue::clear
-    void clear(void)
+    void clear( void )
     {
-        if (empty())
+        if ( empty() )
             return;
 
-        root->template clear_subtree<allocator_type>(*this);
+        root->template clear_subtree< allocator_type >( *this );
         root->~node();
         allocator_type& alloc = *this;
-        alloc.deallocate(root, 1);
+        alloc.deallocate( root, 1 );
         root = NULL;
-        size_holder::set_size(0);
+        size_holder::set_size( 0 );
     }
 
     /// \copydoc boost::heap::priority_queue::get_allocator
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return *this;
     }
 
     /// \copydoc boost::heap::priority_queue::swap
-    void swap(pairing_heap & rhs)
+    void swap( pairing_heap& rhs )
     {
-        super_t::swap(rhs);
-        std::swap(root, rhs.root);
+        super_t::swap( rhs );
+        std::swap( root, rhs.root );
     }
 
 
     /// \copydoc boost::heap::priority_queue::top
-    const_reference top(void) const
+    const_reference top( void ) const
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
-        return super_t::get_value(root->value);
+        return super_t::get_value( root->value );
     }
 
     /**
@@ -353,20 +356,21 @@ class pairing_heap:
      * \b Complexity: 2**2*log(log(N)) (amortized).
      *
      * */
-    handle_type push(value_type const & v)
+    handle_type push( value_type const& v )
     {
         size_holder::increment();
 
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node(super_t::make_node(v));
-        merge_node(n);
-        return handle_type(n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node( super_t::make_node( v ) );
+        merge_node( n );
+        return handle_type( n );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
     /**
-     * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. Returns handle to element.
+     * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. Returns
+     * handle to element.
      *
      * \cond
      * \b Complexity: \f$2^2log(log(N))\f$ (amortized).
@@ -375,16 +379,16 @@ class pairing_heap:
      * \b Complexity: 2**2*log(log(N)) (amortized).
      *
      * */
-    template <class... Args>
-    handle_type emplace(Args&&... args)
+    template < class... Args >
+    handle_type emplace( Args&&... args )
     {
         size_holder::increment();
 
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node(super_t::make_node(std::forward<Args>(args)...));
-        merge_node(n);
-        return handle_type(n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node( super_t::make_node( std::forward< Args >( args )... ) );
+        merge_node( n );
+        return handle_type( n );
     }
 #endif
 
@@ -394,11 +398,11 @@ class pairing_heap:
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
-        erase(handle_type(root));
+        erase( handle_type( root ) );
     }
 
     /**
@@ -411,10 +415,10 @@ class pairing_heap:
      * \b Complexity: 2**2*log(log(N)) (amortized).
      *
      * */
-    void update (handle_type handle, const_reference v)
+    void update( handle_type handle, const_reference v )
     {
-        handle.node_->value = super_t::make_node(v);
-        update(handle);
+        handle.node_->value = super_t::make_node( v );
+        update( handle );
     }
 
     /**
@@ -428,19 +432,19 @@ class pairing_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void update (handle_type handle)
+    void update( handle_type handle )
     {
         node_pointer n = handle.node_;
 
         n->unlink();
-        if (!n->children.empty())
-            n = merge_nodes(n, merge_node_list(n->children));
+        if ( !n->children.empty() )
+            n = merge_nodes( n, merge_node_list( n->children ) );
 
-        if (n != root)
-            merge_node(n);
+        if ( n != root )
+            merge_node( n );
     }
 
-     /**
+    /**
      * \b Effects: Assigns \c v to the element handled by \c handle & updates the priority queue.
      *
      * \cond
@@ -451,9 +455,9 @@ class pairing_heap:
      *
      * \b Note: The new value is expected to be greater than the current one
      * */
-    void increase (handle_type handle, const_reference v)
+    void increase( handle_type handle, const_reference v )
     {
-        update(handle, v);
+        update( handle, v );
     }
 
     /**
@@ -467,9 +471,9 @@ class pairing_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void increase (handle_type handle)
+    void increase( handle_type handle )
     {
-        update(handle);
+        update( handle );
     }
 
     /**
@@ -483,9 +487,9 @@ class pairing_heap:
      *
      * \b Note: The new value is expected to be less than the current one
      * */
-    void decrease (handle_type handle, const_reference v)
+    void decrease( handle_type handle, const_reference v )
     {
-        update(handle, v);
+        update( handle, v );
     }
 
     /**
@@ -497,11 +501,12 @@ class pairing_heap:
      *
      * \b Complexity: 2**2*log(log(N)) (amortized).
      *
-     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      * */
-    void decrease (handle_type handle)
+    void decrease( handle_type handle )
     {
-        update(handle);
+        update( handle );
     }
 
     /**
@@ -513,16 +518,16 @@ class pairing_heap:
      *
      * \b Complexity: 2**2*log(log(N)) (amortized).
      * */
-    void erase(handle_type handle)
+    void erase( handle_type handle )
     {
         node_pointer n = handle.node_;
-        if (n != root) {
+        if ( n != root ) {
             n->unlink();
-            if (!n->children.empty())
-                merge_node(merge_node_list(n->children));
+            if ( !n->children.empty() )
+                merge_node( merge_node_list( n->children ) );
         } else {
-            if (!n->children.empty())
-                root = merge_node_list(n->children);
+            if ( !n->children.empty() )
+                root = merge_node_list( n->children );
             else
                 root = NULL;
         }
@@ -530,39 +535,39 @@ class pairing_heap:
         size_holder::decrement();
         n->~node();
         allocator_type& alloc = *this;
-        alloc.deallocate(n, 1);
+        alloc.deallocate( n, 1 );
     }
 
     /// \copydoc boost::heap::priority_queue::begin
-    iterator begin(void) const
+    iterator begin( void ) const
     {
-        return iterator(root, super_t::value_comp());
+        return iterator( root, super_t::value_comp() );
     }
 
     /// \copydoc boost::heap::priority_queue::end
-    iterator end(void) const
+    iterator end( void ) const
     {
-        return iterator(super_t::value_comp());
+        return iterator( super_t::value_comp() );
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_begin
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
-        return ordered_iterator(root, super_t::value_comp());
+        return ordered_iterator( root, super_t::value_comp() );
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_begin
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
-        return ordered_iterator(NULL, super_t::value_comp());
+        return ordered_iterator( NULL, super_t::value_comp() );
     }
 
 
     /// \copydoc boost::heap::d_ary_heap_mutable::s_handle_from_iterator
-    static handle_type s_handle_from_iterator(iterator const & it)
+    static handle_type s_handle_from_iterator( iterator const& it )
     {
-        node * ptr = const_cast<node *>(it.get_node());
-        return handle_type(ptr);
+        node* ptr = const_cast< node* >( it.get_node() );
+        return handle_type( ptr );
     }
 
     /**
@@ -575,131 +580,130 @@ class pairing_heap:
      * \b Complexity: 2**2*log(log(N)) (amortized).
      *
      * */
-    void merge(pairing_heap & rhs)
+    void merge( pairing_heap& rhs )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        merge_node(rhs.root);
+        merge_node( rhs.root );
 
-        size_holder::add(rhs.get_size());
-        rhs.set_size(0);
+        size_holder::add( rhs.get_size() );
+        rhs.set_size( 0 );
         rhs.root = NULL;
 
-        super_t::set_stability_count((std::max)(super_t::get_stability_count(),
-                                     rhs.get_stability_count()));
-        rhs.set_stability_count(0);
+        super_t::set_stability_count( ( std::max )( super_t::get_stability_count(), rhs.get_stability_count() ) );
+        rhs.set_stability_count( 0 );
     }
 
     /// \copydoc boost::heap::priority_queue::value_comp
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
 
     /// \copydoc boost::heap::priority_queue::operator<(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<( HeapType const& rhs ) const
     {
-        return detail::heap_compare(*this, rhs);
+        return detail::heap_compare( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>( HeapType const& rhs ) const
     {
-        return detail::heap_compare(rhs, *this);
+        return detail::heap_compare( rhs, *this );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>=( HeapType const& rhs ) const
     {
-        return !operator<(rhs);
+        return !operator<( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator<=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<=( HeapType const& rhs ) const
     {
-        return !operator>(rhs);
+        return !operator>( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator==(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator==(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator==( HeapType const& rhs ) const
     {
-        return detail::heap_equality(*this, rhs);
+        return detail::heap_equality( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator!=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator!=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator!=( HeapType const& rhs ) const
     {
-        return !(*this == rhs);
+        return !( *this == rhs );
     }
 
 private:
-#if !defined(BOOST_DOXYGEN_INVOKED)
-    void clone_tree(pairing_heap const & rhs)
+#if !defined( BOOST_DOXYGEN_INVOKED )
+    void clone_tree( pairing_heap const& rhs )
     {
-        BOOST_HEAP_ASSERT(root == NULL);
-        if (rhs.empty())
+        BOOST_HEAP_ASSERT( root == NULL );
+        if ( rhs.empty() )
             return;
 
-        root = allocator_type::allocate(1);
+        root = allocator_type::allocate( 1 );
 
-        new(root) node(static_cast<node const &>(*rhs.root), static_cast<allocator_type&>(*this));
+        new ( root ) node( static_cast< node const& >( *rhs.root ), static_cast< allocator_type& >( *this ) );
     }
 
-    void merge_node(node_pointer other)
+    void merge_node( node_pointer other )
     {
-        BOOST_HEAP_ASSERT(other);
-        if (root != NULL)
-            root = merge_nodes(root, other);
+        BOOST_HEAP_ASSERT( other );
+        if ( root != NULL )
+            root = merge_nodes( root, other );
         else
             root = other;
     }
 
-    node_pointer merge_node_list(node_child_list & children)
+    node_pointer merge_node_list( node_child_list& children )
     {
-        BOOST_HEAP_ASSERT(!children.empty());
-        node_pointer merged = merge_first_pair(children);
-        if (children.empty())
+        BOOST_HEAP_ASSERT( !children.empty() );
+        node_pointer merged = merge_first_pair( children );
+        if ( children.empty() )
             return merged;
 
         node_child_list node_list;
-        node_list.push_back(*merged);
+        node_list.push_back( *merged );
 
         do {
-            node_pointer next_merged = merge_first_pair(children);
-            node_list.push_back(*next_merged);
-        } while (!children.empty());
+            node_pointer next_merged = merge_first_pair( children );
+            node_list.push_back( *next_merged );
+        } while ( !children.empty() );
 
-        return merge_node_list(node_list);
+        return merge_node_list( node_list );
     }
 
-    node_pointer merge_first_pair(node_child_list & children)
+    node_pointer merge_first_pair( node_child_list& children )
     {
-        BOOST_HEAP_ASSERT(!children.empty());
-        node_pointer first_child = static_cast<node_pointer>(&children.front());
+        BOOST_HEAP_ASSERT( !children.empty() );
+        node_pointer first_child = static_cast< node_pointer >( &children.front() );
         children.pop_front();
-        if (children.empty())
+        if ( children.empty() )
             return first_child;
 
-        node_pointer second_child = static_cast<node_pointer>(&children.front());
+        node_pointer second_child = static_cast< node_pointer >( &children.front() );
         children.pop_front();
 
-        return merge_nodes(first_child, second_child);
+        return merge_nodes( first_child, second_child );
     }
 
-    node_pointer merge_nodes(node_pointer node1, node_pointer node2)
+    node_pointer merge_nodes( node_pointer node1, node_pointer node2 )
     {
-        if (super_t::operator()(node1->value, node2->value))
-            std::swap(node1, node2);
+        if ( super_t::operator()( node1->value, node2->value ) )
+            std::swap( node1, node2 );
 
         node2->unlink();
-        node1->children.push_front(*node2);
+        node1->children.push_front( *node2 );
         return node1;
     }
 
@@ -708,8 +712,7 @@ class pairing_heap:
 };
 
 
-} /* namespace heap */
-} /* namespace boost */
+}} // namespace boost::heap
 
 #undef BOOST_HEAP_ASSERT
 #endif /* BOOST_HEAP_PAIRING_HEAP_HPP */
diff --git a/inst/include/boost/heap/policies.hpp b/inst/include/boost/heap/policies.hpp
index 6a251a9fa..21d3efdb9 100644
--- a/inst/include/boost/heap/policies.hpp
+++ b/inst/include/boost/heap/policies.hpp
@@ -10,165 +10,177 @@
 #define BOOST_HEAP_POLICIES_HPP
 
 #include <boost/concept_check.hpp>
-#include <boost/parameter/name.hpp>
-#include <boost/parameter/template_keyword.hpp>
 #include <boost/parameter/aux_/void.hpp>
 #include <boost/parameter/binding.hpp>
+#include <boost/parameter/name.hpp>
 #include <boost/parameter/parameters.hpp>
+#include <boost/parameter/template_keyword.hpp>
 #include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/type_traits/is_void.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
-namespace boost {
-namespace heap {
+namespace boost { namespace heap {
 
 #ifndef BOOST_DOXYGEN_INVOKED
-BOOST_PARAMETER_TEMPLATE_KEYWORD(allocator)
-BOOST_PARAMETER_TEMPLATE_KEYWORD(compare)
+BOOST_PARAMETER_TEMPLATE_KEYWORD( allocator )
+BOOST_PARAMETER_TEMPLATE_KEYWORD( compare )
 
-namespace tag { struct stable; }
+namespace tag {
+struct stable;
+} // namespace tag
 
-template <bool T>
-struct stable:
-    boost::parameter::template_keyword<tag::stable, boost::integral_constant<bool, T> >
+template < bool T >
+struct stable : boost::parameter::template_keyword< tag::stable, boost::integral_constant< bool, T > >
 {};
 
-namespace tag { struct mutable_; }
+namespace tag {
+struct mutable_;
+} // namespace tag
 
-template <bool T>
-struct mutable_:
-    boost::parameter::template_keyword<tag::mutable_, boost::integral_constant<bool, T> >
+template < bool T >
+struct mutable_ : boost::parameter::template_keyword< tag::mutable_, boost::integral_constant< bool, T > >
 {};
 
 
-namespace tag { struct constant_time_size; }
+namespace tag {
+struct constant_time_size;
+} // namespace tag
 
-template <bool T>
-struct constant_time_size:
-    boost::parameter::template_keyword<tag::constant_time_size, boost::integral_constant<bool, T> >
+template < bool T >
+struct constant_time_size :
+    boost::parameter::template_keyword< tag::constant_time_size, boost::integral_constant< bool, T > >
 {};
 
-namespace tag { struct store_parent_pointer; }
+namespace tag {
+struct store_parent_pointer;
+} // namespace tag
 
-template <bool T>
-struct store_parent_pointer:
-    boost::parameter::template_keyword<tag::store_parent_pointer, boost::integral_constant<bool, T> >
+template < bool T >
+struct store_parent_pointer :
+    boost::parameter::template_keyword< tag::store_parent_pointer, boost::integral_constant< bool, T > >
 {};
 
-namespace tag { struct arity; }
+namespace tag {
+struct arity;
+} // namespace tag
 
-template <unsigned int T>
-struct arity:
-    boost::parameter::template_keyword<tag::arity, boost::integral_constant<int, T> >
+template < unsigned int T >
+struct arity : boost::parameter::template_keyword< tag::arity, boost::integral_constant< int, T > >
 {};
 
-namespace tag { struct objects_per_page; }
+namespace tag {
+struct objects_per_page;
+} // namespace tag
 
-template <unsigned int T>
-struct objects_per_page:
-    boost::parameter::template_keyword<tag::objects_per_page, boost::integral_constant<int, T> >
+template < unsigned int T >
+struct objects_per_page : boost::parameter::template_keyword< tag::objects_per_page, boost::integral_constant< int, T > >
 {};
 
-BOOST_PARAMETER_TEMPLATE_KEYWORD(stability_counter_type)
+BOOST_PARAMETER_TEMPLATE_KEYWORD( stability_counter_type )
 
 namespace detail {
 
-template <typename bound_args, typename tag_type>
+template < typename bound_args, typename tag_type >
 struct has_arg
 {
-    typedef typename boost::parameter::binding<bound_args, tag_type, void>::type type;
-    static const bool value = !boost::is_void<type>::value;
+    typedef typename boost::parameter::binding< bound_args, tag_type, void >::type type;
+    static const bool value = !boost::is_void< type >::value;
 };
 
-template <typename bound_args>
+template < typename bound_args >
 struct extract_stable
 {
-    static const bool has_stable = has_arg<bound_args, tag::stable>::value;
+    static const bool has_stable = has_arg< bound_args, tag::stable >::value;
 
-    typedef typename boost::conditional<has_stable,
-                               typename has_arg<bound_args, tag::stable>::type,
-                               boost::false_type
-                              >::type stable_t;
+    typedef
+        typename boost::conditional< has_stable, typename has_arg< bound_args, tag::stable >::type, boost::false_type >::type
+            stable_t;
 
     static const bool value = stable_t::value;
 };
 
-template <typename bound_args>
+template < typename bound_args >
 struct extract_mutable
 {
-    static const bool has_mutable = has_arg<bound_args, tag::mutable_>::value;
+    static const bool has_mutable = has_arg< bound_args, tag::mutable_ >::value;
 
-    typedef typename boost::conditional<has_mutable,
-                               typename has_arg<bound_args, tag::mutable_>::type,
-                               boost::false_type
-                              >::type mutable_t;
+    typedef typename boost::conditional< has_mutable,
+                                         typename has_arg< bound_args, tag::mutable_ >::type,
+                                         boost::false_type >::type mutable_t;
 
     static const bool value = mutable_t::value;
 };
 
-}
+} // namespace detail
 
 #else
 
 /** \brief Specifies the predicate for the heap order
  */
-template <typename T>
-struct compare{};
+template < typename T >
+struct compare
+{};
 
 /** \brief Configure heap as mutable
  *
  *  Certain heaps need to be configured specifically do be mutable.
  *
  * */
-template <bool T>
-struct mutable_{};
+template < bool T >
+struct mutable_
+{};
 
 /** \brief Specifies allocator for the internal memory management
  */
-template <typename T>
-struct allocator{};
+template < typename T >
+struct allocator
+{};
 
 /** \brief Configure a heap as \b stable
  *
  * A priority queue is stable, if elements with the same priority are popped from the heap, in the same order as
  * they are inserted.
  * */
-template <bool T>
-struct stable{};
+template < bool T >
+struct stable
+{};
 
 /** \brief Specifies the type for stability counter
  *
  * */
-template <typename IntType>
-struct stability_counter_type{};
+template < typename IntType >
+struct stability_counter_type
+{};
 
 /** \brief Configures complexity of <tt> size() </tt>
  *
  * Specifies, whether size() should have linear or constant complexity.
  * */
-template <bool T>
-struct constant_time_size{};
+template < bool T >
+struct constant_time_size
+{};
 
 /** \brief Store parent pointer in heap node.
  *
  * Maintaining a parent pointer adds some maintenance and size overhead, but iterating a heap is more efficient.
  * */
-template <bool T>
-struct store_parent_pointer{};
+template < bool T >
+struct store_parent_pointer
+{};
 
 /** \brief Specify arity.
  *
  * Specifies the arity of a D-ary heap
  * */
-template <unsigned int T>
-struct arity{};
+template < unsigned int T >
+struct arity
+{};
 #endif
 
-} /* namespace heap */
-} /* namespace boost */
+}}     // namespace boost::heap
 
 #endif /* BOOST_HEAP_POLICIES_HPP */
diff --git a/inst/include/boost/heap/priority_queue.hpp b/inst/include/boost/heap/priority_queue.hpp
index ca0f06d96..46539d85c 100644
--- a/inst/include/boost/heap/priority_queue.hpp
+++ b/inst/include/boost/heap/priority_queue.hpp
@@ -10,7 +10,6 @@
 #define BOOST_HEAP_PRIORITY_QUEUE_HPP
 
 #include <algorithm>
-#include <queue>
 #include <utility>
 #include <vector>
 
@@ -20,20 +19,19 @@
 #include <boost/heap/detail/stable_heap.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
-typedef parameter::parameters<boost::parameter::optional<tag::allocator>,
-                              boost::parameter::optional<tag::compare>,
-                              boost::parameter::optional<tag::stable>,
-                              boost::parameter::optional<tag::stability_counter_type>
-                             > priority_queue_signature;
-}
+typedef parameter::parameters< boost::parameter::optional< tag::allocator >,
+                               boost::parameter::optional< tag::compare >,
+                               boost::parameter::optional< tag::stable >,
+                               boost::parameter::optional< tag::stability_counter_type > >
+    priority_queue_signature;
+} // namespace detail
 
 /**
  * \class priority_queue
@@ -51,62 +49,62 @@ typedef parameter::parameters<boost::parameter::optional<tag::allocator>,
  *
  */
 #ifdef BOOST_DOXYGEN_INVOKED
-template<class T, class ...Options>
+template < class T, class... Options >
 #else
-template <typename T,
-          class A0 = boost::parameter::void_,
-          class A1 = boost::parameter::void_,
-          class A2 = boost::parameter::void_,
-          class A3 = boost::parameter::void_
-         >
+template < typename T,
+           class A0 = boost::parameter::void_,
+           class A1 = boost::parameter::void_,
+           class A2 = boost::parameter::void_,
+           class A3 = boost::parameter::void_ >
 #endif
-class priority_queue:
-    private detail::make_heap_base<T, typename detail::priority_queue_signature::bind<A0, A1, A2, A3>::type, false>::type
+class priority_queue :
+    private detail::make_heap_base< T, typename detail::priority_queue_signature::bind< A0, A1, A2, A3 >::type, false >::type
 {
-    typedef detail::make_heap_base<T, typename detail::priority_queue_signature::bind<A0, A1, A2, A3>::type, false> heap_base_maker;
+    typedef detail::make_heap_base< T, typename detail::priority_queue_signature::bind< A0, A1, A2, A3 >::type, false >
+        heap_base_maker;
 
-    typedef typename heap_base_maker::type super_t;
+    typedef typename heap_base_maker::type  super_t;
     typedef typename super_t::internal_type internal_type;
-    typedef typename boost::allocator_rebind<typename heap_base_maker::allocator_argument, internal_type>::type internal_type_allocator;
-    typedef std::vector<internal_type, internal_type_allocator> container_type;
+    typedef typename boost::allocator_rebind< typename heap_base_maker::allocator_argument, internal_type >::type
+                                                                  internal_type_allocator;
+    typedef std::vector< internal_type, internal_type_allocator > container_type;
 
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct detail::heap_merge_emulate;
 
     container_type q_;
 
 #ifndef BOOST_DOXYGEN_INVOKED
-    struct implementation_defined:
-        detail::extract_allocator_types<typename heap_base_maker::allocator_argument>
+    struct implementation_defined : detail::extract_allocator_types< typename heap_base_maker::allocator_argument >
     {
-        typedef typename heap_base_maker::compare_argument value_compare;
-        typedef detail::stable_heap_iterator<T, typename container_type::const_iterator, super_t> iterator;
-        typedef iterator const_iterator;
-        typedef typename container_type::allocator_type allocator_type;
+        typedef typename heap_base_maker::compare_argument                                          value_compare;
+        typedef detail::stable_heap_iterator< T, typename container_type::const_iterator, super_t > iterator;
+        typedef iterator                                                                            const_iterator;
+        typedef typename container_type::allocator_type                                             allocator_type;
     };
 #endif
 
 public:
-    typedef T value_type;
-    typedef typename implementation_defined::size_type size_type;
+    typedef T                                                value_type;
+    typedef typename implementation_defined::size_type       size_type;
     typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
+    typedef typename implementation_defined::value_compare   value_compare;
+    typedef typename implementation_defined::allocator_type  allocator_type;
+    typedef typename implementation_defined::reference       reference;
     typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
+    typedef typename implementation_defined::pointer         pointer;
+    typedef typename implementation_defined::const_pointer   const_pointer;
     /**
      * \b Note: The iterator does not traverse the priority queue in order of the priorities.
      * */
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::iterator        iterator;
+    typedef typename implementation_defined::const_iterator  const_iterator;
 
-    static const bool constant_time_size = true;
+    static const bool constant_time_size    = true;
     static const bool has_ordered_iterators = false;
-    static const bool is_mergable = false;
-    static const bool is_stable = heap_base_maker::is_stable;
-    static const bool has_reserve = true;
+    static const bool is_mergable           = false;
+    static const bool is_stable             = heap_base_maker::is_stable;
+    static const bool has_reserve           = true;
 
     /**
      * \b Effects: constructs an empty priority queue.
@@ -114,8 +112,18 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    explicit priority_queue(value_compare const & cmp = value_compare()):
-        super_t(cmp)
+    explicit priority_queue( value_compare const& cmp = value_compare() ) :
+        super_t( cmp )
+    {}
+
+    /**
+     * \b Effects: constructs an empty priority queue.
+     *
+     * \b Complexity: Constant.
+     *
+     * */
+    explicit priority_queue( allocator_type const& alloc ) :
+        q_( alloc )
     {}
 
     /**
@@ -124,8 +132,9 @@ class priority_queue:
      * \b Complexity: Linear.
      *
      * */
-    priority_queue (priority_queue const & rhs):
-        super_t(rhs), q_(rhs.q_)
+    priority_queue( priority_queue const& rhs ) :
+        super_t( rhs ),
+        q_( rhs.q_ )
     {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
@@ -136,8 +145,9 @@ class priority_queue:
      *
      * \b Note: Only available, if BOOST_NO_CXX11_RVALUE_REFERENCES is not defined
      * */
-    priority_queue(priority_queue && rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_constructible<super_t>::value):
-        super_t(std::move(rhs)), q_(std::move(rhs.q_))
+    priority_queue( priority_queue&& rhs ) BOOST_NOEXCEPT_IF( boost::is_nothrow_move_constructible< super_t >::value ) :
+        super_t( std::move( rhs ) ),
+        q_( std::move( rhs.q_ ) )
     {}
 
     /**
@@ -147,10 +157,11 @@ class priority_queue:
      *
      * \b Note: Only available, if BOOST_NO_CXX11_RVALUE_REFERENCES is not defined
      * */
-    priority_queue & operator=(priority_queue && rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_assignable<super_t>::value)
+    priority_queue& operator=( priority_queue&& rhs )
+        BOOST_NOEXCEPT_IF( boost::is_nothrow_move_assignable< super_t >::value )
     {
-        super_t::operator=(std::move(rhs));
-        q_ = std::move(rhs.q_);
+        super_t::operator=( std::move( rhs ) );
+        q_ = std::move( rhs.q_ );
         return *this;
     }
 #endif
@@ -161,10 +172,10 @@ class priority_queue:
      * \b Complexity: Linear.
      *
      * */
-    priority_queue & operator=(priority_queue const & rhs)
+    priority_queue& operator=( priority_queue const& rhs )
     {
-        static_cast<super_t&>(*this) = static_cast<super_t const &>(rhs);
-        q_ = rhs.q_;
+        static_cast< super_t& >( *this ) = static_cast< super_t const& >( rhs );
+        q_                               = rhs.q_;
         return *this;
     }
 
@@ -174,7 +185,7 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    bool empty(void) const BOOST_NOEXCEPT
+    bool empty( void ) const BOOST_NOEXCEPT
     {
         return q_.empty();
     }
@@ -185,7 +196,7 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    size_type size(void) const BOOST_NOEXCEPT
+    size_type size( void ) const BOOST_NOEXCEPT
     {
         return q_.size();
     }
@@ -196,7 +207,7 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    size_type max_size(void) const BOOST_NOEXCEPT
+    size_type max_size( void ) const BOOST_NOEXCEPT
     {
         return q_.max_size();
     }
@@ -207,7 +218,7 @@ class priority_queue:
      * \b Complexity: Linear.
      *
      * */
-    void clear(void) BOOST_NOEXCEPT
+    void clear( void ) BOOST_NOEXCEPT
     {
         q_.clear();
     }
@@ -218,7 +229,7 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return q_.get_allocator();
     }
@@ -229,10 +240,10 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    const_reference top(void) const
+    const_reference top( void ) const
     {
-        BOOST_ASSERT(!empty());
-        return super_t::get_value(q_.front());
+        BOOST_ASSERT( !empty() );
+        return super_t::get_value( q_.front() );
     }
 
     /**
@@ -241,24 +252,24 @@ class priority_queue:
      * \b Complexity: Logarithmic (amortized). Linear (worst case).
      *
      * */
-    void push(value_type const & v)
+    void push( value_type const& v )
     {
-        q_.push_back(super_t::make_node(v));
-        std::push_heap(q_.begin(), q_.end(), static_cast<super_t const &>(*this));
+        q_.push_back( super_t::make_node( v ) );
+        std::push_heap( q_.begin(), q_.end(), static_cast< super_t const& >( *this ) );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
     /**
      * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place.
      *
      * \b Complexity: Logarithmic (amortized). Linear (worst case).
      *
      * */
-    template <class... Args>
-    void emplace(Args&&... args)
+    template < class... Args >
+    void emplace( Args&&... args )
     {
-        q_.emplace_back(super_t::make_node(std::forward<Args>(args)...));
-        std::push_heap(q_.begin(), q_.end(), static_cast<super_t const &>(*this));
+        q_.emplace_back( super_t::make_node( std::forward< Args >( args )... ) );
+        std::push_heap( q_.begin(), q_.end(), static_cast< super_t const& >( *this ) );
     }
 #endif
 
@@ -268,10 +279,10 @@ class priority_queue:
      * \b Complexity: Logarithmic (amortized). Linear (worst case).
      *
      * */
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
-        std::pop_heap(q_.begin(), q_.end(), static_cast<super_t const &>(*this));
+        BOOST_ASSERT( !empty() );
+        std::pop_heap( q_.begin(), q_.end(), static_cast< super_t const& >( *this ) );
         q_.pop_back();
     }
 
@@ -281,10 +292,11 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    void swap(priority_queue & rhs) BOOST_NOEXCEPT_IF(boost::is_nothrow_move_constructible<super_t>::value && boost::is_nothrow_move_assignable<super_t>::value)
+    void swap( priority_queue& rhs ) BOOST_NOEXCEPT_IF(
+        boost::is_nothrow_move_constructible< super_t >::value&& boost::is_nothrow_move_assignable< super_t >::value )
     {
-        super_t::swap(rhs);
-        q_.swap(rhs.q_);
+        super_t::swap( rhs );
+        q_.swap( rhs.q_ );
     }
 
     /**
@@ -293,9 +305,9 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    iterator begin(void) const BOOST_NOEXCEPT
+    iterator begin( void ) const BOOST_NOEXCEPT
     {
-        return iterator(q_.begin());
+        return iterator( q_.begin() );
     }
 
     /**
@@ -304,9 +316,9 @@ class priority_queue:
      * \b Complexity: Constant.
      *
      * */
-    iterator end(void) const BOOST_NOEXCEPT
+    iterator end( void ) const BOOST_NOEXCEPT
     {
-        return iterator(q_.end());
+        return iterator( q_.end() );
     }
 
     /**
@@ -317,16 +329,16 @@ class priority_queue:
      * \b Node: Invalidates iterators
      *
      * */
-    void reserve(size_type element_count)
+    void reserve( size_type element_count )
     {
-        q_.reserve(element_count);
+        q_.reserve( element_count );
     }
 
     /**
      * \b Effect: Returns the value_compare object used by the priority queue
      *
      * */
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
@@ -337,10 +349,10 @@ class priority_queue:
      * \b Requirement: the \c value_compare object of both heaps must match.
      *
      * */
-    template <typename HeapType>
-    bool operator<(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<( HeapType const& rhs ) const
     {
-        return detail::heap_compare(*this, rhs);
+        return detail::heap_compare( *this, rhs );
     }
 
     /**
@@ -349,10 +361,10 @@ class priority_queue:
      * \b Requirement: the \c value_compare object of both heaps must match.
      *
      * */
-    template <typename HeapType>
-    bool operator>(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>( HeapType const& rhs ) const
     {
-        return detail::heap_compare(rhs, *this);
+        return detail::heap_compare( rhs, *this );
     }
 
     /**
@@ -361,10 +373,10 @@ class priority_queue:
      * \b Requirement: the \c value_compare object of both heaps must match.
      *
      * */
-    template <typename HeapType>
-    bool operator>=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>=( HeapType const& rhs ) const
     {
-        return !operator<(rhs);
+        return !operator<( rhs );
     }
 
     /**
@@ -373,10 +385,10 @@ class priority_queue:
      * \b Requirement: the \c value_compare object of both heaps must match.
      *
      * */
-    template <typename HeapType>
-    bool operator<=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<=( HeapType const& rhs ) const
     {
-        return !operator>(rhs);
+        return !operator>( rhs );
     }
 
     /** \brief Equivalent comparison
@@ -385,10 +397,10 @@ class priority_queue:
      * \b Requirement: the \c value_compare object of both heaps must match.
      *
      * */
-    template <typename HeapType>
-    bool operator==(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator==( HeapType const& rhs ) const
     {
-        return detail::heap_equality(*this, rhs);
+        return detail::heap_equality( *this, rhs );
     }
 
     /** \brief Equivalent comparison
@@ -397,14 +409,13 @@ class priority_queue:
      * \b Requirement: the \c value_compare object of both heaps must match.
      *
      * */
-    template <typename HeapType>
-    bool operator!=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator!=( HeapType const& rhs ) const
     {
-        return !(*this == rhs);
+        return !( *this == rhs );
     }
 };
 
-} /* namespace heap */
-} /* namespace boost */
+}}     // namespace boost::heap
 
 #endif /* BOOST_HEAP_PRIORITY_QUEUE_HPP */
diff --git a/inst/include/boost/heap/skew_heap.hpp b/inst/include/boost/heap/skew_heap.hpp
index cbb18adaa..9e4937754 100644
--- a/inst/include/boost/heap/skew_heap.hpp
+++ b/inst/include/boost/heap/skew_heap.hpp
@@ -11,10 +11,9 @@
 
 #include <algorithm>
 #include <utility>
-#include <vector>
 
-#include <boost/assert.hpp>
 #include <boost/array.hpp>
+#include <boost/assert.hpp>
 
 #include <boost/heap/detail/heap_comparison.hpp>
 #include <boost/heap/detail/heap_node.hpp>
@@ -23,35 +22,34 @@
 #include <boost/type_traits/integral_constant.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#    pragma once
 #endif
 
 #ifndef BOOST_DOXYGEN_INVOKED
-#ifdef BOOST_HEAP_SANITYCHECKS
-#define BOOST_HEAP_ASSERT BOOST_ASSERT
-#else
-#define BOOST_HEAP_ASSERT(expression)
-#endif
+#    ifdef BOOST_HEAP_SANITYCHECKS
+#        define BOOST_HEAP_ASSERT BOOST_ASSERT
+#    else
+#        define BOOST_HEAP_ASSERT( expression )
+#    endif
 #endif
 
-namespace boost  {
-namespace heap   {
+namespace boost { namespace heap {
 namespace detail {
 
-template <typename node_pointer, bool store_parent_pointer>
+template < typename node_pointer, bool store_parent_pointer >
 struct parent_holder
 {
-    parent_holder(void):
-        parent_(NULL)
+    parent_holder( void ) :
+        parent_( NULL )
     {}
 
-    void set_parent(node_pointer parent)
+    void set_parent( node_pointer parent )
     {
-        BOOST_HEAP_ASSERT(static_cast<node_pointer>(this) != parent);
+        BOOST_HEAP_ASSERT( static_cast< node_pointer >( this ) != parent );
         parent_ = parent;
     }
 
-    node_pointer get_parent(void) const
+    node_pointer get_parent( void ) const
     {
         return parent_;
     }
@@ -59,172 +57,170 @@ struct parent_holder
     node_pointer parent_;
 };
 
-template <typename node_pointer>
-struct parent_holder<node_pointer, false>
+template < typename node_pointer >
+struct parent_holder< node_pointer, false >
 {
-    void set_parent(node_pointer parent)
+    void set_parent( node_pointer parent )
     {}
 
-    node_pointer get_parent(void) const
+    node_pointer get_parent( void ) const
     {
         return NULL;
     }
 };
 
 
-template <typename value_type, bool store_parent_pointer>
-struct skew_heap_node:
-    parent_holder<skew_heap_node<value_type, store_parent_pointer>*, store_parent_pointer>
+template < typename value_type, bool store_parent_pointer >
+struct skew_heap_node : parent_holder< skew_heap_node< value_type, store_parent_pointer >*, store_parent_pointer >
 {
-    typedef parent_holder<skew_heap_node<value_type, store_parent_pointer>*, store_parent_pointer> super_t;
+    typedef parent_holder< skew_heap_node< value_type, store_parent_pointer >*, store_parent_pointer > super_t;
 
-    typedef boost::array<skew_heap_node*, 2> child_list_type;
-    typedef typename child_list_type::iterator child_iterator;
+    typedef boost::array< skew_heap_node*, 2 >       child_list_type;
+    typedef typename child_list_type::iterator       child_iterator;
     typedef typename child_list_type::const_iterator const_child_iterator;
 
-    skew_heap_node(value_type const & v):
-        value(v)
+    skew_heap_node( value_type const& v ) :
+        value( v )
     {
-        children.assign(0);
+        children.assign( 0 );
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    skew_heap_node(value_type && v):
-        value(v)
+    skew_heap_node( value_type&& v ) :
+        value( v )
     {
-        children.assign(0);
+        children.assign( 0 );
     }
 #endif
 
-    template <typename Alloc>
-    skew_heap_node (skew_heap_node const & rhs, Alloc & allocator, skew_heap_node * parent):
-        value(rhs.value)
+    template < typename Alloc >
+    skew_heap_node( skew_heap_node const& rhs, Alloc& allocator, skew_heap_node* parent ) :
+        value( rhs.value )
     {
-        super_t::set_parent(parent);
-        node_cloner<skew_heap_node, skew_heap_node, Alloc> cloner(allocator);
-        clone_child(0, rhs, cloner);
-        clone_child(1, rhs, cloner);
+        super_t::set_parent( parent );
+        node_cloner< skew_heap_node, skew_heap_node, Alloc > cloner( allocator );
+        clone_child( 0, rhs, cloner );
+        clone_child( 1, rhs, cloner );
     }
 
-    template <typename Cloner>
-    void clone_child(int index, skew_heap_node const & rhs, Cloner & cloner)
+    template < typename Cloner >
+    void clone_child( int index, skew_heap_node const& rhs, Cloner& cloner )
     {
-        if (rhs.children[index])
-            children[index] = cloner(*rhs.children[index], this);
+        if ( rhs.children[ index ] )
+            children[ index ] = cloner( *rhs.children[ index ], this );
         else
-            children[index] = NULL;
+            children[ index ] = NULL;
     }
 
-    template <typename Alloc>
-    void clear_subtree(Alloc & alloc)
+    template < typename Alloc >
+    void clear_subtree( Alloc& alloc )
     {
-        node_disposer<skew_heap_node, skew_heap_node, Alloc> disposer(alloc);
-        dispose_child(children[0], disposer);
-        dispose_child(children[1], disposer);
+        node_disposer< skew_heap_node, skew_heap_node, Alloc > disposer( alloc );
+        dispose_child( children[ 0 ], disposer );
+        dispose_child( children[ 1 ], disposer );
     }
 
-    template <typename Disposer>
-    void dispose_child(skew_heap_node * node, Disposer & disposer)
+    template < typename Disposer >
+    void dispose_child( skew_heap_node* node, Disposer& disposer )
     {
-        if (node)
-            disposer(node);
+        if ( node )
+            disposer( node );
     }
 
-    std::size_t count_children(void) const
+    std::size_t count_children( void ) const
     {
         size_t ret = 1;
-        if (children[0])
-            ret += children[0]->count_children();
-        if (children[1])
-            ret += children[1]->count_children();
+        if ( children[ 0 ] )
+            ret += children[ 0 ]->count_children();
+        if ( children[ 1 ] )
+            ret += children[ 1 ]->count_children();
 
         return ret;
     }
 
-    template <typename HeapBase>
-    bool is_heap(typename HeapBase::value_compare const & cmp) const
+    template < typename HeapBase >
+    bool is_heap( typename HeapBase::value_compare const& cmp ) const
     {
-        for (const_child_iterator it = children.begin(); it != children.end(); ++it) {
-            const skew_heap_node * child = *it;
+        for ( const_child_iterator it = children.begin(); it != children.end(); ++it ) {
+            const skew_heap_node* child = *it;
 
-            if (child == NULL)
+            if ( child == NULL )
                 continue;
 
-            if (store_parent_pointer)
-                BOOST_HEAP_ASSERT(child->get_parent() == this);
+            if ( store_parent_pointer )
+                BOOST_HEAP_ASSERT( child->get_parent() == this );
 
-            if (cmp(HeapBase::get_value(value), HeapBase::get_value(child->value)) ||
-                !child->is_heap<HeapBase>(cmp))
+            if ( cmp( HeapBase::get_value( value ), HeapBase::get_value( child->value ) )
+                 || !child->is_heap< HeapBase >( cmp ) )
                 return false;
         }
         return true;
     }
 
-    value_type value;
-    boost::array<skew_heap_node*, 2> children;
+    value_type                         value;
+    boost::array< skew_heap_node*, 2 > children;
 };
 
 
-typedef parameter::parameters<boost::parameter::optional<tag::allocator>,
-                              boost::parameter::optional<tag::compare>,
-                              boost::parameter::optional<tag::stable>,
-                              boost::parameter::optional<tag::store_parent_pointer>,
-                              boost::parameter::optional<tag::stability_counter_type>,
-                              boost::parameter::optional<tag::constant_time_size>,
-                              boost::parameter::optional<tag::mutable_>
-                             > skew_heap_signature;
+typedef parameter::parameters< boost::parameter::optional< tag::allocator >,
+                               boost::parameter::optional< tag::compare >,
+                               boost::parameter::optional< tag::stable >,
+                               boost::parameter::optional< tag::store_parent_pointer >,
+                               boost::parameter::optional< tag::stability_counter_type >,
+                               boost::parameter::optional< tag::constant_time_size >,
+                               boost::parameter::optional< tag::mutable_ > >
+    skew_heap_signature;
 
-template <typename T, typename BoundArgs>
+template < typename T, typename BoundArgs >
 struct make_skew_heap_base
 {
-    static const bool constant_time_size = parameter::binding<BoundArgs,
-                                                              tag::constant_time_size,
-                                                              boost::true_type
-                                                             >::type::value;
+    static const bool constant_time_size
+        = parameter::binding< BoundArgs, tag::constant_time_size, boost::true_type >::type::value;
 
-    typedef typename make_heap_base<T, BoundArgs, constant_time_size>::type base_type;
-    typedef typename make_heap_base<T, BoundArgs, constant_time_size>::allocator_argument allocator_argument;
-    typedef typename make_heap_base<T, BoundArgs, constant_time_size>::compare_argument compare_argument;
+    typedef typename make_heap_base< T, BoundArgs, constant_time_size >::type               base_type;
+    typedef typename make_heap_base< T, BoundArgs, constant_time_size >::allocator_argument allocator_argument;
+    typedef typename make_heap_base< T, BoundArgs, constant_time_size >::compare_argument   compare_argument;
 
-    static const bool is_mutable = extract_mutable<BoundArgs>::value;
-    static const bool store_parent_pointer = parameter::binding<BoundArgs,
-                                                              tag::store_parent_pointer,
-                                                              boost::false_type>::type::value || is_mutable;
+    static const bool is_mutable = extract_mutable< BoundArgs >::value;
+    static const bool store_parent_pointer
+        = parameter::binding< BoundArgs, tag::store_parent_pointer, boost::false_type >::type::value || is_mutable;
 
-    typedef skew_heap_node<typename base_type::internal_type, store_parent_pointer> node_type;
+    typedef skew_heap_node< typename base_type::internal_type, store_parent_pointer > node_type;
 
-    typedef typename boost::allocator_rebind<allocator_argument, node_type>::type allocator_type;
+    typedef typename boost::allocator_rebind< allocator_argument, node_type >::type allocator_type;
 
-    struct type:
-        base_type,
-        allocator_type
+    struct type : base_type, allocator_type
     {
-        type(compare_argument const & arg):
-            base_type(arg)
+        type( compare_argument const& arg ) :
+            base_type( arg )
+        {}
+
+        type( allocator_type const& arg ) :
+            allocator_type( arg )
         {}
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        type(type && rhs):
-            base_type(std::move(static_cast<base_type&>(rhs))),
-            allocator_type(std::move(static_cast<allocator_type&>(rhs)))
+        type( type&& rhs ) :
+            base_type( std::move( static_cast< base_type& >( rhs ) ) ),
+            allocator_type( std::move( static_cast< allocator_type& >( rhs ) ) )
         {}
 
-        type(type const & rhs):
-            base_type(rhs),
-            allocator_type(rhs)
+        type( type const& rhs ) :
+            base_type( rhs ),
+            allocator_type( rhs )
         {}
 
-        type & operator=(type && rhs)
+        type& operator=( type&& rhs )
         {
-            base_type::operator=(std::move(static_cast<base_type&>(rhs)));
-            allocator_type::operator=(std::move(static_cast<allocator_type&>(rhs)));
+            base_type::operator=( std::move( static_cast< base_type& >( rhs ) ) );
+            allocator_type::operator=( std::move( static_cast< allocator_type& >( rhs ) ) );
             return *this;
         }
 
-        type & operator=(type const & rhs)
+        type& operator=( type const& rhs )
         {
-            base_type::operator=(static_cast<base_type const &>(rhs));
-            allocator_type::operator=(static_cast<allocator_type const &>(rhs));
+            base_type::operator=( static_cast< base_type const& >( rhs ) );
+            allocator_type::operator=( static_cast< allocator_type const& >( rhs ) );
             return *this;
         }
 #endif
@@ -247,170 +243,166 @@ struct make_skew_heap_base
  * - \c boost::heap::stability_counter_type<>, defaults to \c stability_counter_type<boost::uintmax_t>
  * - \c boost::heap::allocator<>, defaults to \c allocator<std::allocator<T> >
  * - \c boost::heap::constant_time_size<>, defaults to \c constant_time_size<true>
- * - \c boost::heap::store_parent_pointer<>, defaults to \c store_parent_pointer<true>. Maintaining a parent pointer adds some
- *   maintenance and size overhead, but iterating a heap is more efficient.
+ * - \c boost::heap::store_parent_pointer<>, defaults to \c store_parent_pointer<true>. Maintaining a parent pointer
+ * adds some maintenance and size overhead, but iterating a heap is more efficient.
  * - \c boost::heap::mutable<>, defaults to \c mutable<false>.
  *
  */
 #ifdef BOOST_DOXYGEN_INVOKED
-template<class T, class ...Options>
+template < class T, class... Options >
 #else
-template <typename T,
-          class A0 = boost::parameter::void_,
-          class A1 = boost::parameter::void_,
-          class A2 = boost::parameter::void_,
-          class A3 = boost::parameter::void_,
-          class A4 = boost::parameter::void_,
-          class A5 = boost::parameter::void_,
-          class A6 = boost::parameter::void_
-         >
+template < typename T,
+           class A0 = boost::parameter::void_,
+           class A1 = boost::parameter::void_,
+           class A2 = boost::parameter::void_,
+           class A3 = boost::parameter::void_,
+           class A4 = boost::parameter::void_,
+           class A5 = boost::parameter::void_,
+           class A6 = boost::parameter::void_ >
 #endif
-class skew_heap:
-    private detail::make_skew_heap_base<T,
-                                          typename detail::skew_heap_signature::bind<A0, A1, A2, A3, A4, A5, A6>::type
-                                         >::type
+class skew_heap :
+    private detail::make_skew_heap_base< T, typename detail::skew_heap_signature::bind< A0, A1, A2, A3, A4, A5, A6 >::type >::type
 {
-    typedef typename detail::skew_heap_signature::bind<A0, A1, A2, A3, A4, A5, A6>::type bound_args;
-    typedef detail::make_skew_heap_base<T, bound_args> base_maker;
-    typedef typename base_maker::type super_t;
+    typedef typename detail::skew_heap_signature::bind< A0, A1, A2, A3, A4, A5, A6 >::type bound_args;
+    typedef detail::make_skew_heap_base< T, bound_args >                                   base_maker;
+    typedef typename base_maker::type                                                      super_t;
 
-    typedef typename super_t::internal_type internal_type;
-    typedef typename super_t::size_holder_type size_holder;
+    typedef typename super_t::internal_type         internal_type;
+    typedef typename super_t::size_holder_type      size_holder;
     typedef typename base_maker::allocator_argument allocator_argument;
 
     static const bool store_parent_pointer = base_maker::store_parent_pointer;
-    template <typename Heap1, typename Heap2>
+    template < typename Heap1, typename Heap2 >
     friend struct heap_merge_emulate;
 
-    struct implementation_defined:
-        detail::extract_allocator_types<typename base_maker::allocator_argument>
+    struct implementation_defined : detail::extract_allocator_types< typename base_maker::allocator_argument >
     {
         typedef T value_type;
 
         typedef typename base_maker::compare_argument value_compare;
-        typedef typename base_maker::allocator_type allocator_type;
+        typedef typename base_maker::allocator_type   allocator_type;
 
-        typedef typename base_maker::node_type node;
-        typedef typename boost::allocator_pointer<allocator_type>::type node_pointer;
-        typedef typename boost::allocator_const_pointer<allocator_type>::type const_node_pointer;
+        typedef typename base_maker::node_type                                  node;
+        typedef typename boost::allocator_pointer< allocator_type >::type       node_pointer;
+        typedef typename boost::allocator_const_pointer< allocator_type >::type const_node_pointer;
 
-        typedef detail::value_extractor<value_type, internal_type, super_t> value_extractor;
+        typedef detail::value_extractor< value_type, internal_type, super_t > value_extractor;
 
-        typedef boost::array<node_pointer, 2> child_list_type;
+        typedef boost::array< node_pointer, 2 >    child_list_type;
         typedef typename child_list_type::iterator child_list_iterator;
 
-        typedef typename boost::conditional<false,
-                                        detail::recursive_tree_iterator<node,
-                                                                        child_list_iterator,
-                                                                        const value_type,
-                                                                        value_extractor,
-                                                                        detail::list_iterator_converter<node,
-                                                                                                        child_list_type
-                                                                                                       >
-                                                                       >,
-                                        detail::tree_iterator<node,
-                                                              const value_type,
-                                                              allocator_type,
-                                                              value_extractor,
-                                                              detail::dereferencer<node>,
-                                                              true,
-                                                              false,
-                                                              value_compare
-                                                    >
-                                        >::type iterator;
+        typedef typename boost::conditional<
+            false,
+            detail::recursive_tree_iterator< node,
+                                             child_list_iterator,
+                                             const value_type,
+                                             value_extractor,
+                                             detail::list_iterator_converter< node, child_list_type > >,
+            detail::tree_iterator< node,
+                                   const value_type,
+                                   allocator_type,
+                                   value_extractor,
+                                   detail::dereferencer< node >,
+                                   true,
+                                   false,
+                                   value_compare > >::type iterator;
 
         typedef iterator const_iterator;
 
-        typedef detail::tree_iterator<node,
-                                      const value_type,
-                                      allocator_type,
-                                      value_extractor,
-                                      detail::dereferencer<node>,
-                                      true,
-                                      true,
-                                      value_compare
-                                     > ordered_iterator;
-
-        typedef typename detail::extract_allocator_types<typename base_maker::allocator_argument>::reference reference;
-        typedef detail::node_handle<node_pointer, super_t, reference> handle_type;
+        typedef detail::
+            tree_iterator< node, const value_type, allocator_type, value_extractor, detail::dereferencer< node >, true, true, value_compare >
+                ordered_iterator;
+
+        typedef typename detail::extract_allocator_types< typename base_maker::allocator_argument >::reference reference;
+        typedef detail::node_handle< node_pointer, super_t, reference > handle_type;
     };
 
     typedef typename implementation_defined::value_extractor value_extractor;
-    typedef typename implementation_defined::node node;
-    typedef typename implementation_defined::node_pointer node_pointer;
+    typedef typename implementation_defined::node            node;
+    typedef typename implementation_defined::node_pointer    node_pointer;
 
 public:
     typedef T value_type;
 
-    typedef typename implementation_defined::size_type size_type;
+    typedef typename implementation_defined::size_type       size_type;
     typedef typename implementation_defined::difference_type difference_type;
-    typedef typename implementation_defined::value_compare value_compare;
-    typedef typename implementation_defined::allocator_type allocator_type;
-    typedef typename implementation_defined::reference reference;
+    typedef typename implementation_defined::value_compare   value_compare;
+    typedef typename implementation_defined::allocator_type  allocator_type;
+    typedef typename implementation_defined::reference       reference;
     typedef typename implementation_defined::const_reference const_reference;
-    typedef typename implementation_defined::pointer pointer;
-    typedef typename implementation_defined::const_pointer const_pointer;
+    typedef typename implementation_defined::pointer         pointer;
+    typedef typename implementation_defined::const_pointer   const_pointer;
 
     /// \copydoc boost::heap::priority_queue::iterator
-    typedef typename implementation_defined::iterator iterator;
-    typedef typename implementation_defined::const_iterator const_iterator;
+    typedef typename implementation_defined::iterator         iterator;
+    typedef typename implementation_defined::const_iterator   const_iterator;
     typedef typename implementation_defined::ordered_iterator ordered_iterator;
 
-    static const bool constant_time_size = super_t::constant_time_size;
+    static const bool constant_time_size    = super_t::constant_time_size;
     static const bool has_ordered_iterators = true;
-    static const bool is_mergable = true;
-    static const bool is_stable = detail::extract_stable<bound_args>::value;
-    static const bool has_reserve = false;
-    static const bool is_mutable = detail::extract_mutable<bound_args>::value;
+    static const bool is_mergable           = true;
+    static const bool is_stable             = detail::extract_stable< bound_args >::value;
+    static const bool has_reserve           = false;
+    static const bool is_mutable            = detail::extract_mutable< bound_args >::value;
 
-    typedef typename boost::conditional<is_mutable, typename implementation_defined::handle_type, void*>::type handle_type;
+    typedef
+        typename boost::conditional< is_mutable, typename implementation_defined::handle_type, void* >::type handle_type;
 
     /// \copydoc boost::heap::priority_queue::priority_queue(value_compare const &)
-    explicit skew_heap(value_compare const & cmp = value_compare()):
-        super_t(cmp), root(NULL)
+    explicit skew_heap( value_compare const& cmp = value_compare() ) :
+        super_t( cmp ),
+        root( NULL )
+    {}
+
+    /// \copydoc boost::heap::priority_queue::priority_queue(allocator_type const &)
+    explicit skew_heap( allocator_type const& alloc ) :
+        super_t( alloc ),
+        root( 0 )
     {}
 
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue const &)
-    skew_heap(skew_heap const & rhs):
-        super_t(rhs), root(0)
+    skew_heap( skew_heap const& rhs ) :
+        super_t( rhs ),
+        root( 0 )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        clone_tree(rhs);
-        size_holder::set_size(rhs.get_size());
+        clone_tree( rhs );
+        size_holder::set_size( rhs.get_size() );
     }
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue const & rhs)
-    skew_heap & operator=(skew_heap const & rhs)
+    skew_heap& operator=( skew_heap const& rhs )
     {
         clear();
-        size_holder::set_size(rhs.get_size());
-        static_cast<super_t&>(*this) = rhs;
+        size_holder::set_size( rhs.get_size() );
+        static_cast< super_t& >( *this ) = rhs;
 
-        clone_tree(rhs);
+        clone_tree( rhs );
         return *this;
     }
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     /// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
-    skew_heap(skew_heap && rhs):
-        super_t(std::move(rhs)), root(rhs.root)
+    skew_heap( skew_heap&& rhs ) :
+        super_t( std::move( rhs ) ),
+        root( rhs.root )
     {
         rhs.root = NULL;
     }
 
     /// \copydoc boost::heap::priority_queue::operator=(priority_queue &&)
-    skew_heap & operator=(skew_heap && rhs)
+    skew_heap& operator=( skew_heap&& rhs )
     {
-        super_t::operator=(std::move(rhs));
-        root = rhs.root;
+        super_t::operator=( std::move( rhs ) );
+        root     = rhs.root;
         rhs.root = NULL;
         return *this;
     }
 #endif
 
-    ~skew_heap(void)
+    ~skew_heap( void )
     {
         clear();
     }
@@ -421,85 +413,85 @@ class skew_heap:
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    typename boost::conditional<is_mutable, handle_type, void>::type push(value_type const & v)
+    typename boost::conditional< is_mutable, handle_type, void >::type push( value_type const& v )
     {
-        typedef typename boost::conditional<is_mutable, push_handle, push_void>::type push_helper;
-        return push_helper::push(this, v);
+        typedef typename boost::conditional< is_mutable, push_handle, push_void >::type push_helper;
+        return push_helper::push( this, v );
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
     /**
      * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place.
      *
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    template <typename... Args>
-    typename boost::conditional<is_mutable, handle_type, void>::type emplace(Args&&... args)
+    template < typename... Args >
+    typename boost::conditional< is_mutable, handle_type, void >::type emplace( Args&&... args )
     {
-        typedef typename boost::conditional<is_mutable, push_handle, push_void>::type push_helper;
-        return push_helper::emplace(this, std::forward<Args>(args)...);
+        typedef typename boost::conditional< is_mutable, push_handle, push_void >::type push_helper;
+        return push_helper::emplace( this, std::forward< Args >( args )... );
     }
 #endif
 
     /// \copydoc boost::heap::priority_queue::empty
-    bool empty(void) const
+    bool empty( void ) const
     {
         return root == NULL;
     }
 
     /// \copydoc boost::heap::binomial_heap::size
-    size_type size(void) const
+    size_type size( void ) const
     {
-        if (constant_time_size)
+        if ( constant_time_size )
             return size_holder::get_size();
 
-        if (root == NULL)
+        if ( root == NULL )
             return 0;
         else
             return root->count_children();
     }
 
     /// \copydoc boost::heap::priority_queue::max_size
-    size_type max_size(void) const
+    size_type max_size( void ) const
     {
         const allocator_type& alloc = *this;
-        return boost::allocator_max_size(alloc);
+        return boost::allocator_max_size( alloc );
     }
 
     /// \copydoc boost::heap::priority_queue::clear
-    void clear(void)
+    void clear( void )
     {
-        if (empty())
+        if ( empty() )
             return;
 
-        root->template clear_subtree<allocator_type>(*this);
+        root->template clear_subtree< allocator_type >( *this );
         root->~node();
         allocator_type& alloc = *this;
-        alloc.deallocate(root, 1);
+        alloc.deallocate( root, 1 );
         root = NULL;
-        size_holder::set_size(0);
+        size_holder::set_size( 0 );
     }
 
     /// \copydoc boost::heap::priority_queue::get_allocator
-    allocator_type get_allocator(void) const
+    allocator_type get_allocator( void ) const
     {
         return *this;
     }
 
     /// \copydoc boost::heap::priority_queue::swap
-    void swap(skew_heap & rhs)
+    void swap( skew_heap& rhs )
     {
-        super_t::swap(rhs);
-        std::swap(root, rhs.root);
+        super_t::swap( rhs );
+        std::swap( root, rhs.root );
     }
 
     /// \copydoc boost::heap::priority_queue::top
-    const_reference top(void) const
+    const_reference top( void ) const
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
-        return super_t::get_value(root->value);
+        return super_t::get_value( root->value );
     }
 
     /**
@@ -508,48 +500,48 @@ class skew_heap:
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    void pop(void)
+    void pop( void )
     {
-        BOOST_ASSERT(!empty());
+        BOOST_ASSERT( !empty() );
 
         node_pointer top = root;
 
-        root = merge_children(root);
+        root = merge_children( root );
         size_holder::decrement();
 
-        if (root)
-            BOOST_HEAP_ASSERT(root->get_parent() == NULL);
+        if ( root )
+            BOOST_HEAP_ASSERT( root->get_parent() == NULL );
         else
-            BOOST_HEAP_ASSERT(size_holder::get_size() == 0);
+            BOOST_HEAP_ASSERT( size_holder::get_size() == 0 );
 
         top->~node();
         allocator_type& alloc = *this;
-        alloc.deallocate(top, 1);
+        alloc.deallocate( top, 1 );
         sanity_check();
     }
 
     /// \copydoc boost::heap::priority_queue::begin
-    iterator begin(void) const
+    iterator begin( void ) const
     {
-        return iterator(root, super_t::value_comp());
+        return iterator( root, super_t::value_comp() );
     }
 
     /// \copydoc boost::heap::priority_queue::end
-    iterator end(void) const
+    iterator end( void ) const
     {
         return iterator();
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_begin
-    ordered_iterator ordered_begin(void) const
+    ordered_iterator ordered_begin( void ) const
     {
-        return ordered_iterator(root, super_t::value_comp());
+        return ordered_iterator( root, super_t::value_comp() );
     }
 
     /// \copydoc boost::heap::fibonacci_heap::ordered_begin
-    ordered_iterator ordered_end(void) const
+    ordered_iterator ordered_end( void ) const
     {
-        return ordered_iterator(0, super_t::value_comp());
+        return ordered_iterator( 0, super_t::value_comp() );
     }
 
     /**
@@ -558,77 +550,76 @@ class skew_heap:
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    void merge(skew_heap & rhs)
+    void merge( skew_heap& rhs )
     {
-        if (rhs.empty())
+        if ( rhs.empty() )
             return;
 
-        merge_node(rhs.root);
+        merge_node( rhs.root );
 
-        size_holder::add(rhs.get_size());
-        rhs.set_size(0);
+        size_holder::add( rhs.get_size() );
+        rhs.set_size( 0 );
         rhs.root = NULL;
         sanity_check();
 
-        super_t::set_stability_count((std::max)(super_t::get_stability_count(),
-                                     rhs.get_stability_count()));
-        rhs.set_stability_count(0);
+        super_t::set_stability_count( ( std::max )( super_t::get_stability_count(), rhs.get_stability_count() ) );
+        rhs.set_stability_count( 0 );
     }
 
     /// \copydoc boost::heap::priority_queue::value_comp
-    value_compare const & value_comp(void) const
+    value_compare const& value_comp( void ) const
     {
         return super_t::value_comp();
     }
 
     /// \copydoc boost::heap::priority_queue::operator<(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<( HeapType const& rhs ) const
     {
-        return detail::heap_compare(*this, rhs);
+        return detail::heap_compare( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>( HeapType const& rhs ) const
     {
-        return detail::heap_compare(rhs, *this);
+        return detail::heap_compare( rhs, *this );
     }
 
     /// \copydoc boost::heap::priority_queue::operator>=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator>=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator>=( HeapType const& rhs ) const
     {
-        return !operator<(rhs);
+        return !operator<( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator<=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator<=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator<=( HeapType const& rhs ) const
     {
-        return !operator>(rhs);
+        return !operator>( rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator==(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator==(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator==( HeapType const& rhs ) const
     {
-        return detail::heap_equality(*this, rhs);
+        return detail::heap_equality( *this, rhs );
     }
 
     /// \copydoc boost::heap::priority_queue::operator!=(HeapType const & rhs) const
-    template <typename HeapType>
-    bool operator!=(HeapType const & rhs) const
+    template < typename HeapType >
+    bool operator!=( HeapType const& rhs ) const
     {
-        return !(*this == rhs);
+        return !( *this == rhs );
     }
 
 
     /// \copydoc boost::heap::d_ary_heap::s_handle_from_iterator
-    static handle_type s_handle_from_iterator(iterator const & it)
+    static handle_type s_handle_from_iterator( iterator const& it )
     {
-        node * ptr = const_cast<node *>(it.get_node());
-        return handle_type(ptr);
+        node* ptr = const_cast< node* >( it.get_node() );
+        return handle_type( ptr );
     }
 
     /**
@@ -636,18 +627,18 @@ class skew_heap:
      *
      * \b Complexity: Logarithmic (amortized).
      * */
-    void erase (handle_type object)
+    void erase( handle_type object )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
+        BOOST_STATIC_ASSERT( is_mutable );
         node_pointer this_node = object.node_;
 
-        unlink_node(this_node);
+        unlink_node( this_node );
         size_holder::decrement();
 
         sanity_check();
         this_node->~node();
         allocator_type& alloc = *this;
-        alloc.deallocate(this_node, 1);
+        alloc.deallocate( this_node, 1 );
     }
 
     /**
@@ -656,13 +647,13 @@ class skew_heap:
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    void update (handle_type handle, const_reference v)
+    void update( handle_type handle, const_reference v )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        if (super_t::operator()(super_t::get_value(handle.node_->value), v))
-            increase(handle, v);
+        BOOST_STATIC_ASSERT( is_mutable );
+        if ( super_t::operator()( super_t::get_value( handle.node_->value ), v ) )
+            increase( handle, v );
         else
-            decrease(handle, v);
+            decrease( handle, v );
     }
 
     /**
@@ -672,20 +663,19 @@ class skew_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void update (handle_type handle)
+    void update( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
+        BOOST_STATIC_ASSERT( is_mutable );
         node_pointer this_node = handle.node_;
 
-        if (this_node->get_parent()) {
-            if (super_t::operator()(super_t::get_value(this_node->get_parent()->value),
-                                    super_t::get_value(this_node->value)))
-                increase(handle);
+        if ( this_node->get_parent() ) {
+            if ( super_t::operator()( super_t::get_value( this_node->get_parent()->value ),
+                                      super_t::get_value( this_node->value ) ) )
+                increase( handle );
             else
-                decrease(handle);
-        }
-        else
-            decrease(handle);
+                decrease( handle );
+        } else
+            decrease( handle );
     }
 
     /**
@@ -695,11 +685,11 @@ class skew_heap:
      *
      * \b Note: The new value is expected to be greater than the current one
      * */
-    void increase (handle_type handle, const_reference v)
+    void increase( handle_type handle, const_reference v )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        handle.node_->value = super_t::make_node(v);
-        increase(handle);
+        BOOST_STATIC_ASSERT( is_mutable );
+        handle.node_->value = super_t::make_node( v );
+        increase( handle );
     }
 
     /**
@@ -709,23 +699,23 @@ class skew_heap:
      *
      * \b Note: If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
      * */
-    void increase (handle_type handle)
+    void increase( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
+        BOOST_STATIC_ASSERT( is_mutable );
         node_pointer this_node = handle.node_;
 
-        if (this_node == root)
+        if ( this_node == root )
             return;
 
         node_pointer parent = this_node->get_parent();
 
-        if (this_node == parent->children[0])
-            parent->children[0] = NULL;
+        if ( this_node == parent->children[ 0 ] )
+            parent->children[ 0 ] = NULL;
         else
-            parent->children[1] = NULL;
+            parent->children[ 1 ] = NULL;
 
-        this_node->set_parent(NULL);
-        merge_node(this_node);
+        this_node->set_parent( NULL );
+        merge_node( this_node );
     }
 
     /**
@@ -735,11 +725,11 @@ class skew_heap:
      *
      * \b Note: The new value is expected to be less than the current one
      * */
-    void decrease (handle_type handle, const_reference v)
+    void decrease( handle_type handle, const_reference v )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
-        handle.node_->value = super_t::make_node(v);
-        decrease(handle);
+        BOOST_STATIC_ASSERT( is_mutable );
+        handle.node_->value = super_t::make_node( v );
+        decrease( handle );
     }
 
     /**
@@ -747,186 +737,185 @@ class skew_heap:
      *
      * \b Complexity: Logarithmic (amortized).
      *
-     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has been updated, the behavior of the data structure is undefined!
+     * \b Note: The new value is expected to be less than the current one. If this is not called, after a handle has
+     * been updated, the behavior of the data structure is undefined!
      * */
-    void decrease (handle_type handle)
+    void decrease( handle_type handle )
     {
-        BOOST_STATIC_ASSERT(is_mutable);
+        BOOST_STATIC_ASSERT( is_mutable );
         node_pointer this_node = handle.node_;
 
-        unlink_node(this_node);
-        this_node->children.assign(0);
-        this_node->set_parent(NULL);
-        merge_node(this_node);
+        unlink_node( this_node );
+        this_node->children.assign( 0 );
+        this_node->set_parent( NULL );
+        merge_node( this_node );
     }
 
 private:
-#if !defined(BOOST_DOXYGEN_INVOKED)
+#if !defined( BOOST_DOXYGEN_INVOKED )
     struct push_void
     {
-        static void push(skew_heap * self, const_reference v)
+        static void push( skew_heap* self, const_reference v )
         {
-            self->push_internal(v);
+            self->push_internal( v );
         }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-        template <class... Args>
-        static void emplace(skew_heap * self, Args&&... args)
+#    if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+        template < class... Args >
+        static void emplace( skew_heap* self, Args&&... args )
         {
-            self->emplace_internal(std::forward<Args>(args)...);
+            self->emplace_internal( std::forward< Args >( args )... );
         }
-#endif
+#    endif
     };
 
     struct push_handle
     {
-        static handle_type push(skew_heap * self, const_reference v)
+        static handle_type push( skew_heap* self, const_reference v )
         {
-            return handle_type(self->push_internal(v));
+            return handle_type( self->push_internal( v ) );
         }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-        template <class... Args>
-        static handle_type emplace(skew_heap * self, Args&&... args)
+#    if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+        template < class... Args >
+        static handle_type emplace( skew_heap* self, Args&&... args )
         {
-            return handle_type(self->emplace_internal(std::forward<Args>(args)...));
+            return handle_type( self->emplace_internal( std::forward< Args >( args )... ) );
         }
-#endif
+#    endif
     };
 
-    node_pointer push_internal(const_reference v)
+    node_pointer push_internal( const_reference v )
     {
         size_holder::increment();
 
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node(super_t::make_node(v));
-        merge_node(n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node( super_t::make_node( v ) );
+        merge_node( n );
         return n;
     }
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template <class... Args>
-    node_pointer emplace_internal(Args&&... args)
+#    if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES ) && !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES )
+    template < class... Args >
+    node_pointer emplace_internal( Args&&... args )
     {
         size_holder::increment();
 
         allocator_type& alloc = *this;
-        node_pointer n = alloc.allocate(1);
-        new(n) node(super_t::make_node(std::forward<Args>(args)...));
-        merge_node(n);
+        node_pointer    n     = alloc.allocate( 1 );
+        new ( n ) node( super_t::make_node( std::forward< Args >( args )... ) );
+        merge_node( n );
         return n;
     }
-#endif
+#    endif
 
-    void unlink_node(node_pointer node)
+    void unlink_node( node_pointer node )
     {
-        node_pointer parent = node->get_parent();
-        node_pointer merged_children = merge_children(node);
+        node_pointer parent          = node->get_parent();
+        node_pointer merged_children = merge_children( node );
 
-        if (parent) {
-            if (node == parent->children[0])
-                parent->children[0] = merged_children;
+        if ( parent ) {
+            if ( node == parent->children[ 0 ] )
+                parent->children[ 0 ] = merged_children;
             else
-                parent->children[1] = merged_children;
-        }
-        else
+                parent->children[ 1 ] = merged_children;
+        } else
             root = merged_children;
     }
 
-    void clone_tree(skew_heap const & rhs)
+    void clone_tree( skew_heap const& rhs )
     {
-        BOOST_HEAP_ASSERT(root == NULL);
-        if (rhs.empty())
+        BOOST_HEAP_ASSERT( root == NULL );
+        if ( rhs.empty() )
             return;
 
         allocator_type& alloc = *this;
-        root = alloc.allocate(1);
-        new(root) node(*rhs.root, alloc, NULL);
+        root                  = alloc.allocate( 1 );
+        new ( root ) node( *rhs.root, alloc, NULL );
     }
 
-    void merge_node(node_pointer other)
+    void merge_node( node_pointer other )
     {
-        BOOST_HEAP_ASSERT(other);
-        if (root != NULL)
-            root = merge_nodes(root, other, NULL);
+        BOOST_HEAP_ASSERT( other );
+        if ( root != NULL )
+            root = merge_nodes( root, other, NULL );
         else
             root = other;
     }
 
-    node_pointer merge_nodes(node_pointer node1, node_pointer node2, node_pointer new_parent)
+    node_pointer merge_nodes( node_pointer node1, node_pointer node2, node_pointer new_parent )
     {
-        if (node1 == NULL) {
-            if (node2)
-                node2->set_parent(new_parent);
+        if ( node1 == NULL ) {
+            if ( node2 )
+                node2->set_parent( new_parent );
             return node2;
         }
-        if (node2 == NULL) {
-            node1->set_parent(new_parent);
+        if ( node2 == NULL ) {
+            node1->set_parent( new_parent );
             return node1;
         }
 
-        node_pointer merged = merge_nodes_recursive(node1, node2, new_parent);
+        node_pointer merged = merge_nodes_recursive( node1, node2, new_parent );
         return merged;
     }
 
-    node_pointer merge_children(node_pointer node)
+    node_pointer merge_children( node_pointer node )
     {
-        node_pointer parent = node->get_parent();
-        node_pointer merged_children = merge_nodes(node->children[0], node->children[1], parent);
+        node_pointer parent          = node->get_parent();
+        node_pointer merged_children = merge_nodes( node->children[ 0 ], node->children[ 1 ], parent );
 
         return merged_children;
     }
 
-    node_pointer merge_nodes_recursive(node_pointer node1, node_pointer node2, node_pointer new_parent)
+    node_pointer merge_nodes_recursive( node_pointer node1, node_pointer node2, node_pointer new_parent )
     {
-        if (super_t::operator()(node1->value, node2->value))
-            std::swap(node1, node2);
+        if ( super_t::operator()( node1->value, node2->value ) )
+            std::swap( node1, node2 );
 
-        node * parent = node1;
-        node * child = node2;
+        node* parent = node1;
+        node* child  = node2;
 
-        if (parent->children[1]) {
-            node * merged = merge_nodes(parent->children[1], child, parent);
-            parent->children[1] = merged;
-            merged->set_parent(parent);
+        if ( parent->children[ 1 ] ) {
+            node* merged          = merge_nodes( parent->children[ 1 ], child, parent );
+            parent->children[ 1 ] = merged;
+            merged->set_parent( parent );
         } else {
-            parent->children[1] = child;
-            child->set_parent(parent);
+            parent->children[ 1 ] = child;
+            child->set_parent( parent );
         }
 
 
-        std::swap(parent->children[0], parent->children[1]);
-        parent->set_parent(new_parent);
+        std::swap( parent->children[ 0 ], parent->children[ 1 ] );
+        parent->set_parent( new_parent );
         return parent;
     }
 
-    void sanity_check(void)
+    void sanity_check( void )
     {
-#ifdef BOOST_HEAP_SANITYCHECKS
-        if (root)
-            BOOST_HEAP_ASSERT( root->template is_heap<super_t>(super_t::value_comp()) );
+#    ifdef BOOST_HEAP_SANITYCHECKS
+        if ( root )
+            BOOST_HEAP_ASSERT( root->template is_heap< super_t >( super_t::value_comp() ) );
 
-        if (constant_time_size) {
+        if ( constant_time_size ) {
             size_type stored_size = size_holder::get_size();
 
             size_type counted_size;
-            if (root == NULL)
+            if ( root == NULL )
                 counted_size = 0;
             else
                 counted_size = root->count_children();
 
-            BOOST_HEAP_ASSERT(counted_size == stored_size);
+            BOOST_HEAP_ASSERT( counted_size == stored_size );
         }
-#endif
+#    endif
     }
 
     node_pointer root;
 #endif
 };
 
-} /* namespace heap */
-} /* namespace boost */
+}} // namespace boost::heap
 
 #undef BOOST_HEAP_ASSERT
 #endif /* BOOST_HEAP_SKEW_HEAP_HPP */
diff --git a/inst/include/boost/integer/common_factor_rt.hpp b/inst/include/boost/integer/common_factor_rt.hpp
index b8339c7db..817682f25 100644
--- a/inst/include/boost/integer/common_factor_rt.hpp
+++ b/inst/include/boost/integer/common_factor_rt.hpp
@@ -51,19 +51,20 @@ namespace boost {
          //
          // some helper functions which really should be constexpr already, but sadly aren't:
          //
-#ifndef BOOST_NO_CXX14_CONSTEXPR
          template <class T>
-         inline constexpr T constexpr_min(T const& a, T const& b) BOOST_GCD_NOEXCEPT(T)
+         inline BOOST_CONSTEXPR T constexpr_min(T const& a, T const& b) BOOST_GCD_NOEXCEPT(T)
          {
             return a < b ? a : b;
          }
+
+#ifndef BOOST_NO_CXX14_CONSTEXPR
          template <class T>
-         inline constexpr auto constexpr_swap(T&a, T& b) BOOST_GCD_NOEXCEPT(T) -> decltype(a.swap(b))
+         inline constexpr auto constexpr_swap(T& a, T& b) BOOST_GCD_NOEXCEPT(T) -> decltype(a.swap(b))
          {
             return a.swap(b);
          }
          template <class T, class U>
-         inline constexpr void constexpr_swap(T&a, U& b...) BOOST_GCD_NOEXCEPT(T)
+         inline constexpr void constexpr_swap(T& a, U& b, ...) BOOST_GCD_NOEXCEPT(T)
          {
             T t(static_cast<T&&>(a));
             a = static_cast<T&&>(b);
@@ -71,12 +72,7 @@ namespace boost {
          }
 #else
          template <class T>
-         inline T constexpr_min(T const& a, T const& b) BOOST_GCD_NOEXCEPT(T)
-         {
-            return a < b ? a : b;
-         }
-         template <class T>
-         inline void constexpr_swap(T&a, T& b) BOOST_GCD_NOEXCEPT(T)
+         inline void constexpr_swap(T& a, T& b) BOOST_GCD_NOEXCEPT(T)
          {
             using std::swap;
             swap(a, b);
diff --git a/inst/include/boost/interprocess/allocators/adaptive_pool.hpp b/inst/include/boost/interprocess/allocators/adaptive_pool.hpp
index 83b9e8d6d..7de25bf94 100644
--- a/inst/include/boost/interprocess/allocators/adaptive_pool.hpp
+++ b/inst/include/boost/interprocess/allocators/adaptive_pool.hpp
@@ -26,8 +26,7 @@
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/container/detail/addressof.hpp>
 #include <boost/interprocess/detail/utilities.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/allocators/detail/adaptive_node_pool.hpp>
@@ -84,7 +83,7 @@ class adaptive_pool_base
    };
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
-   BOOST_STATIC_ASSERT((Version <=2));
+   BOOST_INTERPROCESS_STATIC_ASSERT((Version <=2));
 
    public:
    //-------
diff --git a/inst/include/boost/interprocess/allocators/allocator.hpp b/inst/include/boost/interprocess/allocators/allocator.hpp
index 9a5bf3263..0219442fe 100644
--- a/inst/include/boost/interprocess/allocators/allocator.hpp
+++ b/inst/include/boost/interprocess/allocators/allocator.hpp
@@ -32,7 +32,7 @@
 #include <boost/interprocess/containers/version_type.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/assert.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/container/detail/addressof.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/container/detail/placement_new.hpp>
 
@@ -249,25 +249,12 @@ class allocator
    //!Returns address of mutable object.
    //!Never throws
    pointer address(reference value) const
-   {  return pointer(boost::addressof(value));  }
+   {  return pointer(boost::container::dtl::addressof(value));  }
 
    //!Returns address of non mutable object.
    //!Never throws
    const_pointer address(const_reference value) const
-   {  return const_pointer(boost::addressof(value));  }
-
-   //!Constructs an object
-   //!Throws if T's constructor throws
-   //!For backwards compatibility with libraries using C++03 allocators
-   template<class P>
-   void construct(const pointer &ptr, BOOST_FWD_REF(P) p)
-   {  ::new((void*)ipcdetail::to_raw_pointer(ptr), boost_container_new_t()) value_type(::boost::forward<P>(p));  }
-
-   //!Destroys object. Throws if object's
-   //!destructor throws
-   void destroy(const pointer &ptr)
-   {  BOOST_ASSERT(ptr != 0); (*ptr).~value_type();  }
-
+   {  return const_pointer(boost::container::dtl::addressof(value));  }
 };
 
 //!Equality test for same type
diff --git a/inst/include/boost/interprocess/allocators/detail/allocator_common.hpp b/inst/include/boost/interprocess/allocators/detail/allocator_common.hpp
index bb301ebfb..4aab1d19f 100644
--- a/inst/include/boost/interprocess/allocators/detail/allocator_common.hpp
+++ b/inst/include/boost/interprocess/allocators/detail/allocator_common.hpp
@@ -26,7 +26,7 @@
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/interprocess/detail/utilities.hpp> //to_raw_pointer
-#include <boost/utility/addressof.hpp> //boost::addressof
+#include <boost/container/detail/addressof.hpp> //boost::container::dtl:addressof
 #include <boost/assert.hpp>   //BOOST_ASSERT
 #include <boost/interprocess/exceptions.hpp> //bad_alloc
 #include <boost/interprocess/sync/scoped_lock.hpp> //scoped_lock
@@ -205,7 +205,7 @@ class cache_impl
    void cached_allocation(size_type n, multiallocation_chain &chain)
    {
       size_type count = n, allocated(0);
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          //If don't have any cached node, we have to get a new list of free nodes from the pool
          while(!m_cached_nodes.empty() && count--){
             void *ret = ipcdetail::to_raw_pointer(m_cached_nodes.pop_front());
@@ -217,10 +217,10 @@ class cache_impl
             mp_node_pool->allocate_nodes(n - allocated, chain);
          }
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          this->cached_deallocation(chain);
-         BOOST_RETHROW
-      } BOOST_CATCH_END
+         BOOST_INTERPROCESS_RETHROW
+      } BOOST_INTERPROCESS_CATCH_END
    }
 
    void cached_deallocation(void *ptr)
@@ -389,12 +389,12 @@ class array_allocation_impl
    //!Returns address of mutable object.
    //!Never throws
    pointer address(reference value) const
-   {  return pointer(boost::addressof(value));  }
+   {  return pointer(boost::container::dtl::addressof(value));  }
 
    //!Returns address of non mutable object.
    //!Never throws
    const_pointer address(const_reference value) const
-   {  return const_pointer(boost::addressof(value));  }
+   {  return const_pointer(boost::container::dtl::addressof(value));  }
 
    //!Constructs an object
    //!Throws if T's constructor throws
diff --git a/inst/include/boost/interprocess/allocators/node_allocator.hpp b/inst/include/boost/interprocess/allocators/node_allocator.hpp
index 34af80c71..10d4705c1 100644
--- a/inst/include/boost/interprocess/allocators/node_allocator.hpp
+++ b/inst/include/boost/interprocess/allocators/node_allocator.hpp
@@ -26,8 +26,7 @@
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/container/detail/addressof.hpp>
 #include <boost/interprocess/detail/utilities.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/allocators/detail/node_pool.hpp>
@@ -81,7 +80,7 @@ class node_allocator_base
    };
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
-   BOOST_STATIC_ASSERT((Version <=2));
+   BOOST_INTERPROCESS_STATIC_ASSERT((Version <=2));
 
    public:
    //-------
diff --git a/inst/include/boost/interprocess/allocators/private_adaptive_pool.hpp b/inst/include/boost/interprocess/allocators/private_adaptive_pool.hpp
index a6da71e58..cd998627a 100644
--- a/inst/include/boost/interprocess/allocators/private_adaptive_pool.hpp
+++ b/inst/include/boost/interprocess/allocators/private_adaptive_pool.hpp
@@ -26,8 +26,7 @@
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/container/detail/addressof.hpp>
 #include <boost/interprocess/allocators/detail/adaptive_node_pool.hpp>
 #include <boost/interprocess/containers/version_type.hpp>
 #include <boost/container/detail/multiallocation_chain.hpp>
@@ -81,7 +80,7 @@ class private_adaptive_pool_base
       , OverheadPercent
       > node_pool_t;
 
-   BOOST_STATIC_ASSERT((Version <=2));
+   BOOST_INTERPROCESS_STATIC_ASSERT((Version <=2));
 
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
diff --git a/inst/include/boost/interprocess/allocators/private_node_allocator.hpp b/inst/include/boost/interprocess/allocators/private_node_allocator.hpp
index 703e0d74e..b3489f49c 100644
--- a/inst/include/boost/interprocess/allocators/private_node_allocator.hpp
+++ b/inst/include/boost/interprocess/allocators/private_node_allocator.hpp
@@ -26,8 +26,7 @@
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/container/detail/addressof.hpp>
 #include <boost/interprocess/allocators/detail/node_pool.hpp>
 #include <boost/interprocess/containers/version_type.hpp>
 #include <boost/container/detail/multiallocation_chain.hpp>
@@ -75,7 +74,7 @@ class private_node_allocator_base
       , NodesPerBlock
       > node_pool_t;
 
-   BOOST_STATIC_ASSERT((Version <=2));
+   BOOST_INTERPROCESS_STATIC_ASSERT((Version <=2));
 
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
diff --git a/inst/include/boost/interprocess/anonymous_shared_memory.hpp b/inst/include/boost/interprocess/anonymous_shared_memory.hpp
index dec68450d..4e0ec61b1 100644
--- a/inst/include/boost/interprocess/anonymous_shared_memory.hpp
+++ b/inst/include/boost/interprocess/anonymous_shared_memory.hpp
@@ -69,7 +69,7 @@ namespace ipcdetail{
 //!The function returns a mapped_region holding that segment or throws
 //!interprocess_exception if the function fails.
 //static mapped_region
-static mapped_region
+inline mapped_region
 anonymous_shared_memory(std::size_t size, void *address = 0)
 #if (!defined(BOOST_INTERPROCESS_WINDOWS))
 {
diff --git a/inst/include/boost/interprocess/detail/char_wchar_holder.hpp b/inst/include/boost/interprocess/detail/char_wchar_holder.hpp
index 8831aa202..0c0787157 100644
--- a/inst/include/boost/interprocess/detail/char_wchar_holder.hpp
+++ b/inst/include/boost/interprocess/detail/char_wchar_holder.hpp
@@ -57,6 +57,7 @@ class char_wchar_holder
       this->delete_mem();
       m_str.n = tmp;
       std::strcpy(m_str.n, nstr);
+      m_is_wide = false;
       return *this;
    }
 
@@ -66,15 +67,16 @@ class char_wchar_holder
       this->delete_mem();
       m_str.w = tmp;
       std::wcscpy(m_str.w, wstr);
+      m_is_wide = true;
       return *this;
    }
 
    char_wchar_holder& operator=(const char_wchar_holder &other)
    {
       if (other.m_is_wide)
-         *this = other.getn();
-      else
          *this = other.getw();
+      else
+         *this = other.getn();
       return *this;
    }
 
diff --git a/inst/include/boost/interprocess/detail/config_begin.hpp b/inst/include/boost/interprocess/detail/config_begin.hpp
index 023954c42..bd03a4f59 100644
--- a/inst/include/boost/interprocess/detail/config_begin.hpp
+++ b/inst/include/boost/interprocess/detail/config_begin.hpp
@@ -44,7 +44,7 @@
    #pragma warning (disable : 4250) //  inherits 'x' via dominance
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if (defined(BOOST_GCC) && (BOOST_GCC >= 40600)) || (defined(BOOST_CLANG) && defined(_MSC_VER))
 #pragma GCC diagnostic push
 //#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
diff --git a/inst/include/boost/interprocess/detail/config_end.hpp b/inst/include/boost/interprocess/detail/config_end.hpp
index 55bccd1bf..30e725607 100644
--- a/inst/include/boost/interprocess/detail/config_end.hpp
+++ b/inst/include/boost/interprocess/detail/config_end.hpp
@@ -11,6 +11,6 @@
    #pragma warning (pop)
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if (defined(BOOST_GCC) && (BOOST_GCC >= 40600)) || (defined(BOOST_CLANG) && defined(_MSC_VER))
 #pragma GCC diagnostic pop
 #endif
diff --git a/inst/include/boost/interprocess/detail/in_place_interface.hpp b/inst/include/boost/interprocess/detail/in_place_interface.hpp
deleted file mode 100644
index 6ba6229bf..000000000
--- a/inst/include/boost/interprocess/detail/in_place_interface.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Ion Gaztanaga 2005-2012. Distributed under the Boost
-// Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/interprocess for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef BOOST_INTERPROCESS_IN_PLACE_INTERFACE_HPP
-#define BOOST_INTERPROCESS_IN_PLACE_INTERFACE_HPP
-
-#ifndef BOOST_CONFIG_HPP
-#  include <boost/config.hpp>
-#endif
-#
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-#  pragma once
-#endif
-
-#include <boost/interprocess/detail/config_begin.hpp>
-#include <boost/interprocess/detail/workaround.hpp>
-#include <boost/interprocess/detail/type_traits.hpp>
-#include <boost/container/detail/type_traits.hpp>  //alignment_of, aligned_storage
-#include <typeinfo>  //typeid
-
-//!\file
-//!Describes an abstract interface for placement construction and destruction.
-
-namespace boost {
-namespace interprocess {
-namespace ipcdetail {
-
-struct in_place_interface
-{
-   in_place_interface(std::size_t alignm, std::size_t sz, const char *tname)
-   :  alignment(alignm), size(sz), type_name(tname)
-   {}
-
-   std::size_t alignment;
-   std::size_t size;
-   const char *type_name;
-
-   virtual void construct_n(void *mem, std::size_t num, std::size_t &constructed) = 0;
-   virtual void destroy_n(void *mem, std::size_t num, std::size_t &destroyed) = 0;
-   virtual ~in_place_interface(){}
-};
-
-template<class T>
-struct placement_destroy :  public in_place_interface
-{
-   placement_destroy()
-      :  in_place_interface(::boost::container::dtl::alignment_of<T>::value, sizeof(T), typeid(T).name())
-   {}
-
-   virtual void destroy_n(void *mem, std::size_t num, std::size_t &destroyed) BOOST_OVERRIDE
-   {
-      T* memory = static_cast<T*>(mem);
-      for(destroyed = 0; destroyed < num; ++destroyed)
-         (memory++)->~T();
-   }
-
-   virtual void construct_n(void *, std::size_t, std::size_t &) BOOST_OVERRIDE {}
-
-   private:
-   void destroy(void *mem)
-   {  static_cast<T*>(mem)->~T();   }
-};
-
-}
-}
-}   //namespace boost { namespace interprocess { namespace ipcdetail {
-
-#include <boost/interprocess/detail/config_end.hpp>
-
-#endif //#ifndef BOOST_INTERPROCESS_IN_PLACE_INTERFACE_HPP
diff --git a/inst/include/boost/interprocess/detail/intermodule_singleton_common.hpp b/inst/include/boost/interprocess/detail/intermodule_singleton_common.hpp
index 2218cd9b9..1bb4f01b6 100644
--- a/inst/include/boost/interprocess/detail/intermodule_singleton_common.hpp
+++ b/inst/include/boost/interprocess/detail/intermodule_singleton_common.hpp
@@ -47,8 +47,10 @@ inline void get_pid_creation_time_str(std::string &s)
 {
    std::stringstream stream;
    stream << get_current_process_id() << '_';
-   stream.precision(6);
-   stream << std::fixed << get_current_process_creation_time();
+   const unsigned long long total_microsecs = get_current_process_creation_time();
+   const unsigned long secs  = static_cast<unsigned long>(total_microsecs/1000000ul);
+   const unsigned long usecs = static_cast<unsigned long>(total_microsecs%1000000ul);
+   stream << secs << '.' << usecs;
    s = stream.str();
 }
 
@@ -121,7 +123,7 @@ class intermodule_singleton_common
             }
          }
          if(previous_module_singleton_initialized == Uninitialized){
-            BOOST_TRY{
+            BOOST_INTERPROCESS_TRY{
                //Now initialize the global map, this function must solve concurrency
                //issues between threads of several modules
                initialize_global_map_handle();
@@ -143,11 +145,11 @@ class intermodule_singleton_common
                //before this one. Now marked as initialized
                atomic_write32(&this_module_singleton_initialized, Initialized);
             }
-            BOOST_CATCH(...){
+            BOOST_INTERPROCESS_CATCH(...){
                //Mark singleton failed to initialize
                atomic_write32(&this_module_singleton_initialized, Broken);
-               BOOST_RETHROW
-            } BOOST_CATCH_END
+               BOOST_INTERPROCESS_RETHROW
+            } BOOST_INTERPROCESS_CATCH_END
          }
          //If previous state was initializing, this means that another winner thread is
          //trying to initialize the singleton. Just wait until completes its work.
@@ -232,7 +234,7 @@ class intermodule_singleton_common
          }
          else{ //(tmp == Uninitialized)
             //If not initialized try it again?
-            BOOST_TRY{
+            BOOST_INTERPROCESS_TRY{
                //Remove old global map from the system
                intermodule_singleton_helpers::thread_safe_global_map_dependant<ThreadSafeGlobalMap>::remove_old_gmem();
                //in-place construction of the global map class
@@ -255,10 +257,10 @@ class intermodule_singleton_common
                   break;
                }
             }
-            BOOST_CATCH(...){
+            BOOST_INTERPROCESS_CATCH(...){
                //
-               BOOST_RETHROW
-            } BOOST_CATCH_END
+               BOOST_INTERPROCESS_RETHROW
+            } BOOST_INTERPROCESS_CATCH_END
          }
       }
    }
@@ -406,17 +408,17 @@ class intermodule_singleton_impl
             <ThreadSafeGlobalMap>::find(m_map, typeid(C).name());
          if(!rcount){
             C *p = new C;
-            BOOST_TRY{
+            BOOST_INTERPROCESS_TRY{
                ref_count_ptr val(p, 0u);
                rcount = intermodule_singleton_helpers::thread_safe_global_map_dependant
                            <ThreadSafeGlobalMap>::insert(m_map, typeid(C).name(), val);
             }
-            BOOST_CATCH(...){
+            BOOST_INTERPROCESS_CATCH(...){
                intermodule_singleton_helpers::thread_safe_global_map_dependant
                            <ThreadSafeGlobalMap>::erase(m_map, typeid(C).name());
                delete p;
-               BOOST_RETHROW
-            } BOOST_CATCH_END
+               BOOST_INTERPROCESS_RETHROW
+            } BOOST_INTERPROCESS_CATCH_END
          }
          //if(Phoenix){
             std::atexit(&atexit_work);
diff --git a/inst/include/boost/interprocess/detail/managed_memory_impl.hpp b/inst/include/boost/interprocess/detail/managed_memory_impl.hpp
index 72e242d50..9ee8d4d26 100644
--- a/inst/include/boost/interprocess/detail/managed_memory_impl.hpp
+++ b/inst/include/boost/interprocess/detail/managed_memory_impl.hpp
@@ -32,7 +32,6 @@
 #include <boost/interprocess/detail/nothrow.hpp>
 #include <boost/interprocess/detail/simple_swap.hpp>
 //
-#include <boost/core/no_exceptions_support.hpp>
 //
 #include <boost/intrusive/detail/minimal_pair_header.hpp>
 #include <boost/assert.hpp>
@@ -115,7 +114,7 @@ class basic_managed_memory_impl
    {
       typedef typename ManagedMemory::device_type device_type;
       //Increase file size
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          offset_t old_size;
          {
             device_type f(open_or_create, filename, read_write);
@@ -127,9 +126,9 @@ class basic_managed_memory_impl
          //Grow always works
          managed_memory.self_t::grow(extra_bytes);
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          return false;
-      } BOOST_CATCH_END
+      } BOOST_INTERPROCESS_CATCH_END
       return true;
    }
 
@@ -138,15 +137,15 @@ class basic_managed_memory_impl
    {
       typedef typename ManagedMemory::device_type device_type;
       size_type new_size;
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          ManagedMemory managed_memory(open_only, filename);
          managed_memory.get_size();
          managed_memory.self_t::shrink_to_fit();
          new_size = managed_memory.get_size();
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          return false;
-      } BOOST_CATCH_END
+      } BOOST_INTERPROCESS_CATCH_END
 
       //Decrease file size
       {
@@ -175,14 +174,14 @@ class basic_managed_memory_impl
 
       //This function should not throw. The index construction can
       //throw if constructor allocates memory. So we must catch it.
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          //Let's construct the allocator in memory
          BOOST_ASSERT((0 == (std::size_t)addr % boost::move_detail::alignment_of<segment_manager>::value));
          mp_header       = ::new(addr, boost_container_new_t()) segment_manager(size);
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          return false;
-      } BOOST_CATCH_END
+      } BOOST_INTERPROCESS_CATCH_END
       return true;
    }
 
diff --git a/inst/include/boost/interprocess/detail/managed_open_or_create_impl.hpp b/inst/include/boost/interprocess/detail/managed_open_or_create_impl.hpp
index 84a89ad91..d5dc0db0b 100644
--- a/inst/include/boost/interprocess/detail/managed_open_or_create_impl.hpp
+++ b/inst/include/boost/interprocess/detail/managed_open_or_create_impl.hpp
@@ -28,12 +28,13 @@
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/interprocess/detail/interprocess_tester.hpp>
+#include <boost/interprocess/anonymous_shared_memory.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/interprocess/permissions.hpp>
 #include <boost/container/detail/type_traits.hpp>  //alignment_of, aligned_storage
 #include <boost/interprocess/sync/spin/wait.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/move/move.hpp>
 #include <boost/cstdint.hpp>
 
@@ -205,6 +206,15 @@ class managed_open_or_create_impl
          , construct_func);
    }
 
+   template <class ConstructFunc>
+   managed_open_or_create_impl(std::size_t size, void *addr, const ConstructFunc &construct_func)
+   {
+      priv_map_anonymous
+         ( size
+         , addr
+         , construct_func);
+   }
+
    managed_open_or_create_impl(BOOST_RV_REF(managed_open_or_create_impl) moved)
    {  this->swap(moved);   }
 
@@ -297,14 +307,14 @@ class managed_open_or_create_impl
       spin_wait swait;
       unsigned tries = 0;
       while(1){
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             create_device<FileBased>(dev, id, size, perm, file_like_t());
             return true;
          }
-         BOOST_CATCH(interprocess_exception &ex){
+         BOOST_INTERPROCESS_CATCH(interprocess_exception &ex){
             #ifndef BOOST_NO_EXCEPTIONS
             if(ex.get_error_code() != already_exists_error){
-               BOOST_RETHROW
+               BOOST_INTERPROCESS_RETHROW
             }
             else if (++tries == MaxCreateOrOpenTries) {
                //File existing when trying to create, but non-existing when
@@ -313,25 +323,25 @@ class managed_open_or_create_impl
                throw interprocess_exception(error_info(corrupted_error));
             }
             else{
-               BOOST_TRY{
+               BOOST_INTERPROCESS_TRY{
                   DeviceAbstraction tmp(open_only, id, read_write);
                   dev.swap(tmp);
                   return false;
                }
-               BOOST_CATCH(interprocess_exception &e){
+               BOOST_INTERPROCESS_CATCH(interprocess_exception &e){
                   if(e.get_error_code() != not_found_error){
-                     BOOST_RETHROW
+                     BOOST_INTERPROCESS_RETHROW
                   }
                }
-               BOOST_CATCH(...){
-                  BOOST_RETHROW
-               } BOOST_CATCH_END
+               BOOST_INTERPROCESS_CATCH(...){
+                  BOOST_INTERPROCESS_RETHROW
+               } BOOST_INTERPROCESS_CATCH_END
             }
             #endif   //#ifndef BOOST_NO_EXCEPTIONS
          }
-         BOOST_CATCH(...){
-            BOOST_RETHROW
-         } BOOST_CATCH_END
+         BOOST_INTERPROCESS_CATCH(...){
+            BOOST_INTERPROCESS_RETHROW
+         } BOOST_INTERPROCESS_CATCH_END
          swait.yield();
       }
       return false;
@@ -342,7 +352,7 @@ class managed_open_or_create_impl
       (DeviceAbstraction &dev, mapped_region &final_region,
        std::size_t size, const void *addr, ConstructFunc construct_func)
    {
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          //If this throws, we are lost
          truncate_device<FileBased>(dev, static_cast<offset_t>(size), file_like_t());
 
@@ -353,16 +363,16 @@ class managed_open_or_create_impl
          boost::uint32_t previous = atomic_cas32(patomic_word, InitializingSegment, UninitializedSegment);
 
          if(previous == UninitializedSegment){
-            BOOST_TRY{
+            BOOST_INTERPROCESS_TRY{
                construct_func( static_cast<char*>(region.get_address()) + ManagedOpenOrCreateUserOffset
                               , size - ManagedOpenOrCreateUserOffset, true);
                //All ok, just move resources to the external mapped region
                final_region.swap(region);
             }
-            BOOST_CATCH(...){
+            BOOST_INTERPROCESS_CATCH(...){
                atomic_write32(patomic_word, CorruptedSegment);
-               BOOST_RETHROW
-            } BOOST_CATCH_END
+               BOOST_INTERPROCESS_RETHROW
+            } BOOST_INTERPROCESS_CATCH_END
             atomic_write32(patomic_word, InitializedSegment);
          }
          else{
@@ -370,16 +380,16 @@ class managed_open_or_create_impl
             throw interprocess_exception(error_info(corrupted_error));
          }
       }
-      BOOST_CATCH(...){
-         BOOST_TRY{
+      BOOST_INTERPROCESS_CATCH(...){
+         BOOST_INTERPROCESS_TRY{
             truncate_device<FileBased>(dev, 1u, file_like_t());
          }
-         BOOST_CATCH(...){
+         BOOST_INTERPROCESS_CATCH(...){
          }
-         BOOST_CATCH_END
-         BOOST_RETHROW
+         BOOST_INTERPROCESS_CATCH_END
+         BOOST_INTERPROCESS_RETHROW
       }
-      BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH_END
    }
 
    template <class ConstructFunc>
@@ -388,7 +398,7 @@ class managed_open_or_create_impl
       , const void *addr, ConstructFunc construct_func
       , bool ronly, bool cow)
    {
-      const usduration TimeoutSec(usduration_seconds(MaxInitializeTimeSec));
+      const usduration TimeoutSec(usduration_from_seconds(MaxInitializeTimeSec));
 
       if(FileBased){
          offset_t filesize = 0;
@@ -510,6 +520,37 @@ class managed_open_or_create_impl
       }
    }
 
+   template <class ConstructFunc> inline
+   void priv_map_anonymous
+      (std::size_t size,
+       void *addr,
+       ConstructFunc construct_func)
+   {
+      mapped_region region = anonymous_shared_memory(size, addr);
+
+      boost::uint32_t *patomic_word = 0;  //avoid gcc warning
+      patomic_word = static_cast<boost::uint32_t*>(region.get_address());
+      boost::uint32_t previous = atomic_cas32(patomic_word, InitializingSegment, UninitializedSegment);
+
+      if(previous == UninitializedSegment){
+         BOOST_INTERPROCESS_TRY{
+            construct_func( static_cast<char*>(region.get_address()) + ManagedOpenOrCreateUserOffset
+                           , size - ManagedOpenOrCreateUserOffset, true);
+            //All ok, just move resources to the external mapped region
+            m_mapped_region.swap(region);
+         }
+         BOOST_INTERPROCESS_CATCH(...){
+            atomic_write32(patomic_word, CorruptedSegment);
+            BOOST_INTERPROCESS_RETHROW
+         } BOOST_INTERPROCESS_CATCH_END
+         atomic_write32(patomic_word, InitializedSegment);
+      }
+      else{
+         atomic_write32(patomic_word, CorruptedSegment);
+         throw interprocess_exception(error_info(corrupted_error));
+      }
+   }
+
    friend void swap(managed_open_or_create_impl &left, managed_open_or_create_impl &right)
    {
       left.swap(right);
diff --git a/inst/include/boost/interprocess/detail/math_functions.hpp b/inst/include/boost/interprocess/detail/math_functions.hpp
index a19efac1a..48624cbe7 100644
--- a/inst/include/boost/interprocess/detail/math_functions.hpp
+++ b/inst/include/boost/interprocess/detail/math_functions.hpp
@@ -25,7 +25,7 @@
 #endif
 
 #include <climits>
-#include <boost/static_assert.hpp>
+#include <boost/interprocess/detail/workaround.hpp>
 
 namespace boost {
 namespace interprocess {
@@ -97,7 +97,7 @@ inline std::size_t floor_log2 (std::size_t x)
 {
    const std::size_t Bits = sizeof(std::size_t)*CHAR_BIT;
    const bool Size_t_Bits_Power_2= !(Bits & (Bits-1));
-   BOOST_STATIC_ASSERT(((Size_t_Bits_Power_2)== true));
+   BOOST_INTERPROCESS_STATIC_ASSERT(((Size_t_Bits_Power_2)== true));
 
    std::size_t n = x;
    std::size_t log2 = 0;
diff --git a/inst/include/boost/interprocess/detail/named_proxy.hpp b/inst/include/boost/interprocess/detail/named_proxy.hpp
index 57a908f23..7422058ba 100644
--- a/inst/include/boost/interprocess/detail/named_proxy.hpp
+++ b/inst/include/boost/interprocess/detail/named_proxy.hpp
@@ -23,7 +23,6 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 // interprocess/detail
-#include <boost/interprocess/detail/in_place_interface.hpp>
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/move/utility_core.hpp>
 #ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
@@ -43,11 +42,21 @@ namespace boost {
 namespace interprocess {
 namespace ipcdetail {
 
+template<class T>
+inline void named_construct_placement_destroy(void *mem, std::size_t num)
+{
+   T* memory = static_cast<T*>(mem); \
+   for(std::size_t destroyed = 0; destroyed < num; ++destroyed)
+      (memory++)->~T();
+}
+
+
 #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
 template<class T, bool is_iterator, class ...Args>
-struct CtorArgN : public placement_destroy<T>
+struct CtorArgN
 {
+   typedef T object_type;
    typedef bool_<is_iterator> IsIterator;
    typedef CtorArgN<T, is_iterator, Args...> self_t;
    typedef typename build_number_seq<sizeof...(Args)>::type index_tuple_t;
@@ -64,30 +73,35 @@ struct CtorArgN : public placement_destroy<T>
       :  args_(args...)
    {}
 
-   virtual void construct_n(void *mem
-                     , std::size_t num
-                     , std::size_t &constructed) BOOST_OVERRIDE
+   virtual void construct_n(void *mem, std::size_t num)
    {
-      T* memory      = static_cast<T*>(mem);
-      for(constructed = 0; constructed < num; ++constructed){
-         this->construct(memory++, IsIterator(), index_tuple_t());
-         this->do_increment(IsIterator(), index_tuple_t());
+      std::size_t constructed = 0;
+      BOOST_INTERPROCESS_TRY{
+         T* memory      = static_cast<T*>(mem);
+         for(constructed = 0; constructed < num; ++constructed){
+            this->construct(memory++, IsIterator(), index_tuple_t());
+            this->do_increment(IsIterator(), index_tuple_t());
+         }
       }
+      BOOST_INTERPROCESS_CATCH(...) {
+         named_construct_placement_destroy<T>(mem, constructed);
+         BOOST_INTERPROCESS_RETHROW
+      } BOOST_INTERPROCESS_CATCH_END
    }
 
    private:
    template<std::size_t ...IdxPack>
    void construct(void *mem, true_, const index_tuple<IdxPack...>&)
-   {  ::new((void*)mem, boost_container_new_t())T(*boost::forward<Args>(get<IdxPack>(args_))...); }
+   {  ::new((void*)mem, boost_container_new_t())T(*boost::forward<Args>((get<IdxPack>)(args_))...); }
 
    template<std::size_t ...IdxPack>
    void construct(void *mem, false_, const index_tuple<IdxPack...>&)
-   {  ::new((void*)mem, boost_container_new_t())T(boost::forward<Args>(get<IdxPack>(args_))...); }
+   {  ::new((void*)mem, boost_container_new_t())T(boost::forward<Args>((get<IdxPack>)(args_))...); }
 
    template<std::size_t ...IdxPack>
    void do_increment(true_, const index_tuple<IdxPack...>&)
    {
-      this->expansion_helper(++get<IdxPack>(args_)...);
+      this->expansion_helper(++(get<IdxPack>)(args_)...);
    }
 
    template<class ...ExpansionArgs>
@@ -128,8 +142,7 @@ class named_proxy
    {
       CtorArgN<T, is_iterator, Args...> &&ctor_obj = CtorArgN<T, is_iterator, Args...>
          (boost::forward<Args>(args)...);
-      return mp_mngr->template
-         generic_construct<T>(mp_name, m_num, m_find, m_dothrow, ctor_obj);
+      return mp_mngr->generic_construct(ctor_obj, mp_name, m_num, m_find, m_dothrow);
    }
 
    //This operator allows --> named_new("Name")[3]; <-- syntax
@@ -139,73 +152,30 @@ class named_proxy
 
 #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
-////////////////////////////////////////////////////////////////
-//    What the macro should generate (n == 2):
-//
-//    template<class T, bool is_iterator, class P1, class P2>
-//    struct Ctor2Arg
-//      :  public placement_destroy<T>
-//    {
-//       typedef bool_<is_iterator> IsIterator;
-//       typedef Ctor2Arg self_t;
-//
-//       void do_increment(false_)
-//       { ++m_p1; ++m_p2;  }
-//
-//       void do_increment(true_){}
-//
-//       self_t& operator++()
-//       {
-//          this->do_increment(IsIterator());
-//          return *this;
-//       }
-//
-//       self_t  operator++(int) {  return ++*this;   *this;  }
-//
-//       Ctor2Arg(const P1 &p1, const P2 &p2)
-//          : p1((P1 &)p_1), p2((P2 &)p_2) {}
-//
-//       void construct(void *mem)
-//       {  new((void*)object)T(m_p1, m_p2); }
-//
-//       virtual void construct_n(void *mem
-//                                , std::size_t num
-//                                , std::size_t &constructed)
-//       {
-//          T* memory      = static_cast<T*>(mem);
-//          for(constructed = 0; constructed < num; ++constructed){
-//             this->construct(memory++, IsIterator());
-//             this->do_increment(IsIterator());
-//          }
-//       }
-//
-//       private:
-//       void construct(void *mem, true_)
-//       {  new((void*)mem)T(*m_p1, *m_p2); }
-//
-//       void construct(void *mem, false_)
-//       {  new((void*)mem)T(m_p1, m_p2); }
-//
-//       P1 &m_p1; P2 &m_p2;
-//    };
-////////////////////////////////////////////////////////////////
-
 #define BOOST_INTERPROCESS_NAMED_PROXY_CTORARGN(N)\
 \
 template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >  \
-struct CtorArg##N : placement_destroy<T>\
+struct CtorArg##N\
 {\
+   typedef T object_type;\
    typedef CtorArg##N self_t;\
    \
    CtorArg##N ( BOOST_MOVE_UREF##N  )\
       BOOST_MOVE_COLON##N BOOST_MOVE_FWD_INIT##N{}\
    \
-   virtual void construct_n(void *mem, std::size_t num, std::size_t &constructed) BOOST_OVERRIDE\
+   virtual void construct_n(void *mem, std::size_t num)\
    {\
-      T* memory      = static_cast<T*>(mem);\
-      for(constructed = 0; constructed < num; ++constructed){\
-         ::new((void*)memory++) T ( BOOST_MOVE_MFWD##N );\
+      std::size_t constructed = 0;\
+      BOOST_INTERPROCESS_TRY{\
+         T* memory = static_cast<T*>(mem);\
+         for (constructed = 0; constructed < num; ++constructed) {\
+            ::new((void*)memory++) T ( BOOST_MOVE_MFWD##N );\
+         }\
       }\
+      BOOST_INTERPROCESS_CATCH(...) {\
+         named_construct_placement_destroy<T>(mem, constructed);\
+         BOOST_INTERPROCESS_RETHROW\
+      } BOOST_INTERPROCESS_CATCH_END\
    }\
    \
    private:\
@@ -218,8 +188,9 @@ BOOST_MOVE_ITERATE_0TO9(BOOST_INTERPROCESS_NAMED_PROXY_CTORARGN)
 #define BOOST_INTERPROCESS_NAMED_PROXY_CTORITN(N)\
 \
 template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N > \
-struct CtorIt##N : public placement_destroy<T>\
+struct CtorIt##N\
 {\
+   typedef T object_type;\
    typedef CtorIt##N self_t;\
    \
    self_t& operator++()\
@@ -230,13 +201,20 @@ struct CtorIt##N : public placement_destroy<T>\
    CtorIt##N ( BOOST_MOVE_VAL##N  )\
       BOOST_MOVE_COLON##N BOOST_MOVE_VAL_INIT##N{}\
    \
-   virtual void construct_n(void *mem, std::size_t num, std::size_t &constructed) BOOST_OVERRIDE\
+   virtual void construct_n(void *mem, std::size_t num)\
    {\
-      T* memory      = static_cast<T*>(mem);\
-      for(constructed = 0; constructed < num; ++constructed){\
-         ::new((void*)memory++) T( BOOST_MOVE_MITFWD##N );\
-         ++(*this);\
+      std::size_t constructed = 0;\
+      BOOST_INTERPROCESS_TRY{\
+         T* memory      = static_cast<T*>(mem);\
+         for(constructed = 0; constructed < num; ++constructed){\
+            ::new((void*)memory++) T( BOOST_MOVE_MITFWD##N );\
+            ++(*this);\
+         }\
       }\
+      BOOST_INTERPROCESS_CATCH(...) {\
+         named_construct_placement_destroy<T>(mem, constructed);\
+         BOOST_INTERPROCESS_RETHROW\
+      } BOOST_INTERPROCESS_CATCH_END\
    }\
    \
    private:\
@@ -255,6 +233,7 @@ template
    >
 class named_proxy
 {
+   typedef T         object_type;
    typedef typename SegmentManager::char_type char_type;
    const char_type *    mp_name;
    SegmentManager *     mp_mngr;
@@ -278,7 +257,7 @@ class named_proxy
          , CtorArg##N<T BOOST_MOVE_I##N BOOST_MOVE_TARG##N> \
          >::type ctor_obj_t;\
       ctor_obj_t ctor_obj = ctor_obj_t( BOOST_MOVE_FWD##N );\
-      return mp_mngr->template generic_construct<T>(mp_name, m_num, m_find, m_dothrow, ctor_obj);\
+      return mp_mngr->generic_construct(ctor_obj, mp_name, m_num, m_find, m_dothrow);\
    }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_INTERPROCESS_NAMED_PROXY_CALL_OPERATOR)
@@ -296,8 +275,7 @@ class named_proxy
    //       ctor_obj_t;
    //    ctor_obj_t ctor_obj(p1, p2);
    //
-   //    return mp_mngr->template generic_construct<T>
-   //       (mp_name, m_num, m_find, m_dothrow, ctor_obj);
+   //    return mp_mngr->(ctor_obj, mp_name, m_num, m_find, m_dothrow);
    // }
    //
    //////////////////////////////////////////////////////////////////////////
diff --git a/inst/include/boost/interprocess/detail/os_file_functions.hpp b/inst/include/boost/interprocess/detail/os_file_functions.hpp
index 0a2b7d578..137409da4 100644
--- a/inst/include/boost/interprocess/detail/os_file_functions.hpp
+++ b/inst/include/boost/interprocess/detail/os_file_functions.hpp
@@ -23,7 +23,6 @@
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/errors.hpp>
 #include <boost/interprocess/permissions.hpp>
-#include <boost/static_assert.hpp>
 
 #include <climits>
 #include <string>
@@ -127,11 +126,11 @@ inline bool get_temporary_path(char *buffer, std::size_t buf_len, std::size_t &r
    required_len = 0;
    //std::size_t is always bigger or equal than unsigned long in Windows systems
    //In case std::size_t is bigger than unsigned long
-   unsigned long buf = buf_len;
-   if(buf_len != buf){   //maybe overflowed
+   unsigned long ulbuflen = static_cast<unsigned long>(buf_len); //Potentially losing convertion in 64 bits
+   if(buf_len != ulbuflen){   //maybe overflowed
       return false;
    }
-   required_len = winapi::get_temp_path(buf_len, buffer);
+   required_len = winapi::get_temp_path(ulbuflen, buffer);
    const bool ret = required_len && (buf_len > required_len);
    if(ret && buffer[required_len-1] == '\\'){
       buffer[required_len-1] = '\0';
@@ -144,11 +143,11 @@ inline bool get_temporary_path(wchar_t *buffer, std::size_t buf_len, std::size_t
    required_len = 0;
    //std::size_t is always bigger or equal than unsigned long in Windows systems
    //In case std::size_t is bigger than unsigned long
-   unsigned long buf = buf_len;
-   if(buf_len != buf){   //maybe overflowed
+   unsigned long ulbuflen = static_cast<unsigned long>(buf_len); //Potentially losing convertion in 64 bits
+   if(buf_len != ulbuflen){   //maybe overflowed
       return false;
    }
-   required_len = winapi::get_temp_path(buf_len, buffer);
+   required_len = winapi::get_temp_path(ulbuflen, buffer);
    const bool ret = !(buf_len < required_len);
    if(ret && buffer[required_len-1] == L'\\'){
       buffer[required_len-1] = L'\0';
@@ -226,7 +225,7 @@ inline bool truncate_file (file_handle_t hnd, std::size_t size)
       }
    }
    else{
-      if(!winapi::set_file_pointer(hnd, size, 0, winapi::file_begin)){
+      if(!winapi::set_file_pointer(hnd, static_cast<unsigned long>(size), 0, winapi::file_begin)){
          return false;
       }
       if(!winapi::set_end_of_file(hnd)){
@@ -510,24 +509,27 @@ inline file_handle_t file_handle_from_mapping_handle(mapping_handle_t hnd)
 inline bool create_directory(const char *path)
 {
    ::mode_t m = ::mode_t(0777);
-   return ::mkdir(path, m) == 0;
+   int r = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::mkdir(path, m));
+   return  r == 0;
 }
 
 inline bool open_or_create_directory(const char *path)
 {
    ::mode_t m = ::mode_t(0777);
-   return ::mkdir(path, m) == 0 || (errno == EEXIST);
+   int r = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::mkdir(path, m));
+   return r == 0 || (errno == EEXIST);
 }
 
 inline bool open_or_create_shared_directory(const char *path)
 {
    const ::mode_t m = ::mode_t(01777);
-   const bool created = ::mkdir(path, m) == 0;
+   int rc = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::mkdir(path, m));
+   const bool created = rc == 0;
    const bool created_or_exists = created || (errno == EEXIST);
    //Try to maximize the chance that the sticky bit is set in shared dirs
    //created with old versions that did not set it (for security reasons)
-   const bool chmoded = ::chmod(path, m) == 0;
-   return created ? chmoded : created_or_exists;
+   rc = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::chmod(path, m));
+   return created ? (rc == 0) : created_or_exists;
 }
 
 inline bool remove_directory(const char *path)
@@ -548,9 +550,10 @@ inline file_handle_t create_new_file
    (const char *name, mode_t mode, const permissions & perm = permissions(), bool temporary = false)
 {
    (void)temporary;
-   int ret = ::open(name, ((int)mode) | O_EXCL | O_CREAT, perm.get_permissions());
+   int ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::open(name, ((int)mode) | O_EXCL | O_CREAT, perm.get_permissions()));
    if(ret >= 0){
-      ::fchmod(ret, perm.get_permissions());
+      int rc = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fchmod(ret, perm.get_permissions()));
+      (void)rc;
    }
    return ret;
 }
@@ -563,13 +566,14 @@ inline file_handle_t create_or_open_file
    //We need a loop to change permissions correctly using fchmod, since
    //with "O_CREAT only" ::open we don't know if we've created or opened the file.
    while(true){
-      ret = ::open(name, ((int)mode) | O_EXCL | O_CREAT, perm.get_permissions());
+      ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::open(name, ((int)mode) | O_EXCL | O_CREAT, perm.get_permissions()));
       if(ret >= 0){
-         ::fchmod(ret, perm.get_permissions());
+         int rc = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fchmod(ret, perm.get_permissions()));
+         (void)rc;
          break;
       }
       else if(errno == EEXIST){
-         if((ret = ::open(name, (int)mode)) >= 0 || errno != ENOENT){
+         if((ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::open(name, (int)mode))) >= 0 || errno != ENOENT){
             break;
          }
       }
@@ -584,27 +588,27 @@ inline file_handle_t open_existing_file
    (const char *name, mode_t mode, bool temporary = false)
 {
    (void)temporary;
-   return ::open(name, (int)mode);
+   return BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::open(name, (int)mode));
 }
 
 inline bool delete_file(const char *name)
-{  return ::unlink(name) == 0;   }
+{  return BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::unlink(name)) == 0;   }
 
 inline bool truncate_file (file_handle_t hnd, std::size_t size)
 {
    typedef boost::move_detail::make_unsigned<off_t>::type uoff_t;
-   BOOST_STATIC_ASSERT(( sizeof(uoff_t) >= sizeof(std::size_t) ));
+   BOOST_INTERPROCESS_STATIC_ASSERT(( sizeof(uoff_t) >= sizeof(std::size_t) ));
    if( uoff_t(-1)/2u < uoff_t(size) ){
       errno = EINVAL;
       return false;
    }
-   return 0 == ::ftruncate(hnd, off_t(size));
+   return 0 == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::ftruncate(hnd, off_t(size)));
 }
 
 inline bool get_file_size(file_handle_t hnd, offset_t &size)
 {
    struct stat data;
-   bool ret = 0 == ::fstat(hnd, &data);
+   bool ret = 0 == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fstat(hnd, &data));
    if(ret){
       size = data.st_size;
    }
@@ -612,16 +616,16 @@ inline bool get_file_size(file_handle_t hnd, offset_t &size)
 }
 
 inline bool set_file_pointer(file_handle_t hnd, offset_t off, file_pos_t pos)
-{  return ((off_t)(-1)) != ::lseek(hnd, off, (int)pos); }
+{  return ((off_t)(-1)) != BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::lseek(hnd, off, (int)pos)); }
 
 inline bool get_file_pointer(file_handle_t hnd, offset_t &off)
 {
-   off = ::lseek(hnd, 0, SEEK_CUR);
+   off = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::lseek(hnd, 0, SEEK_CUR));
    return off != ((off_t)-1);
 }
 
 inline bool write_file(file_handle_t hnd, const void *data, std::size_t numdata)
-{  return (ssize_t(numdata)) == ::write(hnd, data, numdata);  }
+{  return (ssize_t(numdata)) == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::write(hnd, data, numdata));  }
 
 inline file_handle_t invalid_file()
 {  return -1;  }
@@ -636,7 +640,7 @@ inline bool acquire_file_lock(file_handle_t hnd)
    lock.l_whence  = SEEK_SET;
    lock.l_start   = 0;
    lock.l_len     = 0;
-   return -1 != ::fcntl(hnd, F_SETLKW, &lock);
+   return -1 != BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fcntl(hnd, F_SETLKW, &lock));
 }
 
 inline bool try_acquire_file_lock(file_handle_t hnd, bool &acquired)
@@ -646,7 +650,7 @@ inline bool try_acquire_file_lock(file_handle_t hnd, bool &acquired)
    lock.l_whence  = SEEK_SET;
    lock.l_start   = 0;
    lock.l_len     = 0;
-   int ret = ::fcntl(hnd, F_SETLK, &lock);
+   int ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fcntl(hnd, F_SETLK, &lock));
    if(ret == -1){
       return (errno == EAGAIN || errno == EACCES) ?
                (acquired = false, true) : false;
@@ -661,7 +665,7 @@ inline bool release_file_lock(file_handle_t hnd)
    lock.l_whence  = SEEK_SET;
    lock.l_start   = 0;
    lock.l_len     = 0;
-   return -1 != ::fcntl(hnd, F_SETLK, &lock);
+   return -1 != BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fcntl(hnd, F_SETLK, &lock));
 }
 
 inline bool acquire_file_lock_sharable(file_handle_t hnd)
@@ -671,7 +675,7 @@ inline bool acquire_file_lock_sharable(file_handle_t hnd)
    lock.l_whence  = SEEK_SET;
    lock.l_start   = 0;
    lock.l_len     = 0;
-   return -1 != ::fcntl(hnd, F_SETLKW, &lock);
+   return -1 != BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fcntl(hnd, F_SETLKW, &lock));
 }
 
 inline bool try_acquire_file_lock_sharable(file_handle_t hnd, bool &acquired)
@@ -681,7 +685,7 @@ inline bool try_acquire_file_lock_sharable(file_handle_t hnd, bool &acquired)
    lock.l_whence  = SEEK_SET;
    lock.l_start   = 0;
    lock.l_len     = 0;
-   int ret = ::fcntl(hnd, F_SETLK, &lock);
+   int ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::fcntl(hnd, F_SETLK, &lock));
    if(ret == -1){
       return (errno == EAGAIN || errno == EACCES) ?
                (acquired = false, true) : false;
@@ -694,30 +698,30 @@ inline bool release_file_lock_sharable(file_handle_t hnd)
 
 #if 0
 inline bool acquire_file_lock(file_handle_t hnd)
-{  return 0 == ::flock(hnd, LOCK_EX); }
+{  return 0 == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::flock(hnd, LOCK_EX)); }
 
 inline bool try_acquire_file_lock(file_handle_t hnd, bool &acquired)
 {
-   int ret = ::flock(hnd, LOCK_EX | LOCK_NB);
+   int ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::flock(hnd, LOCK_EX | LOCK_NB));
    acquired = ret == 0;
    return (acquired || errno == EWOULDBLOCK);
 }
 
 inline bool release_file_lock(file_handle_t hnd)
-{  return 0 == ::flock(hnd, LOCK_UN); }
+{  return 0 == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::flock(hnd, LOCK_UN)); }
 
 inline bool acquire_file_lock_sharable(file_handle_t hnd)
-{  return 0 == ::flock(hnd, LOCK_SH); }
+{  return 0 == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::flock(hnd, LOCK_SH)); }
 
 inline bool try_acquire_file_lock_sharable(file_handle_t hnd, bool &acquired)
 {
-   int ret = ::flock(hnd, LOCK_SH | LOCK_NB);
+   int ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::flock(hnd, LOCK_SH | LOCK_NB));
    acquired = ret == 0;
    return (acquired || errno == EWOULDBLOCK);
 }
 
 inline bool release_file_lock_sharable(file_handle_t hnd)
-{  return 0 == ::flock(hnd, LOCK_UN); }
+{  return 0 == BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::flock(hnd, LOCK_UN)); }
 #endif
 
 inline bool delete_subdirectories_recursive
@@ -731,7 +735,7 @@ inline bool delete_subdirectories_recursive
    struct dir_close
    {
       DIR *d_;
-      dir_close(DIR *d) : d_(d) {}
+      dir_close(DIR *dirp) : d_(dirp) {}
       ~dir_close() { ::closedir(d_); }
    } dc(d); (void)dc;
 
@@ -780,7 +784,7 @@ inline bool for_each_file_in_dir(const char *dir, Function f)
    struct dir_close
    {
       DIR *d_;
-      dir_close(DIR *d) : d_(d) {}
+      dir_close(DIR *dirp) : d_(dirp) {}
       ~dir_close() { ::closedir(d_); }
    } dc(d); (void)dc;
 
diff --git a/inst/include/boost/interprocess/detail/os_thread_functions.hpp b/inst/include/boost/interprocess/detail/os_thread_functions.hpp
index 624321fc6..cb0b59a4a 100644
--- a/inst/include/boost/interprocess/detail/os_thread_functions.hpp
+++ b/inst/include/boost/interprocess/detail/os_thread_functions.hpp
@@ -34,7 +34,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <cstddef>
-#include <ostream>
+#include <cassert>
 
 #if defined(BOOST_INTERPROCESS_WINDOWS)
 #  include <boost/interprocess/detail/win32_api.hpp>
@@ -44,6 +44,7 @@
 #  include <unistd.h>
 #  include <sched.h>
 #  include <time.h>
+#  include <errno.h>
 #  ifdef BOOST_INTERPROCESS_BSD_DERIVATIVE
       //Some *BSD systems (OpenBSD & NetBSD) need sys/param.h before sys/sysctl.h, whereas
       //others (FreeBSD & Darwin) need sys/types.h
@@ -160,6 +161,12 @@ inline OS_highres_count_t get_current_system_highres_count()
    return (OS_highres_count_t)count;
 }
 
+inline unsigned get_current_system_highres_rand()
+{
+   unsigned __int64 count = (unsigned __int64) get_current_system_highres_count();
+   return static_cast<unsigned>(count + (count >> 32u));
+}
+
 inline void zero_highres_count(OS_highres_count_t &count)
 {  count = 0;  }
 
@@ -188,7 +195,7 @@ inline void thread_sleep_tick()
 inline void thread_yield()
 {  winapi::sched_yield();  }
 
-inline void thread_sleep(unsigned int ms)
+inline void thread_sleep_ms(unsigned int ms)
 {  winapi::sleep(ms);  }
 
 //systemwide thread
@@ -213,17 +220,18 @@ inline OS_systemwide_thread_id_t get_invalid_systemwide_thread_id()
    return get_invalid_thread_id();
 }
 
-inline long double get_current_process_creation_time()
+inline unsigned long long get_current_process_creation_time()
 {
    winapi::interprocess_filetime CreationTime, ExitTime, KernelTime, UserTime;
 
    winapi::get_process_times
       ( winapi::get_current_process(), &CreationTime, &ExitTime, &KernelTime, &UserTime);
 
-   typedef long double ldouble_t;
-   const ldouble_t resolution = (100.0l/1000000000.0l);
-   return CreationTime.dwHighDateTime*(ldouble_t(1u<<31u)*2.0l*resolution) +
-              CreationTime.dwLowDateTime*resolution;
+   unsigned long long microsecs = CreationTime.dwHighDateTime;
+   microsecs <<= 32u;
+   microsecs |= CreationTime.dwLowDateTime;
+   microsecs /= 10u;
+   return microsecs;
 }
 
 inline unsigned int get_num_cores()
@@ -353,6 +361,16 @@ inline OS_highres_count_t get_current_system_highres_count()
    #endif
 }
 
+inline unsigned get_current_system_highres_rand()
+{
+   OS_highres_count_t count = get_current_system_highres_count();
+   #if defined(BOOST_INTERPROCESS_CLOCK_MONOTONIC)
+      return static_cast<unsigned>(count.tv_sec + count.tv_nsec);
+   #elif defined(BOOST_INTERPROCESS_MATCH_ABSOLUTE_TIME)
+      return static_cast<unsigned>(count);
+   #endif
+}
+
 #ifndef BOOST_INTERPROCESS_MATCH_ABSOLUTE_TIME
 
 inline void zero_highres_count(OS_highres_count_t &count)
@@ -422,15 +440,25 @@ inline void thread_sleep_tick()
    //Sleep for the half of the tick time
    rqt.tv_sec  = 0;
    rqt.tv_nsec = (long)get_system_tick_ns()/2;
-   ::nanosleep(&rqt, 0);
+
+   struct timespec rmn;
+   while (0 != BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::nanosleep(&rqt, &rmn)) && errno == EINTR) {
+      rqt.tv_sec = rmn.tv_sec;
+      rqt.tv_nsec = rmn.tv_nsec;
+   }
 }
 
-inline void thread_sleep(unsigned int ms)
+inline void thread_sleep_ms(unsigned int ms)
 {
    struct timespec rqt;
-   rqt.tv_sec = ms/1000u;
-   rqt.tv_nsec = (ms%1000u)*1000000u;
-   ::nanosleep(&rqt, 0);
+   rqt.tv_sec = static_cast<time_t>(ms/1000u);
+   rqt.tv_nsec = static_cast<long int>((ms%1000u)*1000000u);
+
+   struct timespec rmn;
+   while (0 != BOOST_INTERPROCESS_EINTR_RETRY(int, -1, ::nanosleep(&rqt, &rmn)) && errno == EINTR) {
+      rqt.tv_sec  = rmn.tv_sec;
+      rqt.tv_nsec = rmn.tv_nsec;
+   }
 }
 
 //systemwide thread
@@ -449,8 +477,8 @@ inline OS_systemwide_thread_id_t get_invalid_systemwide_thread_id()
    return OS_systemwide_thread_id_t(get_invalid_process_id(), get_invalid_thread_id());
 }
 
-inline long double get_current_process_creation_time()
-{ return 0.0L; }
+inline unsigned long long get_current_process_creation_time()
+{ return 0u; }
 
 inline unsigned int get_num_cores()
 {
@@ -501,7 +529,11 @@ inline int thread_create(OS_thread_t * thread, void *(*start_routine)(void*), vo
 {  return pthread_create(thread, 0, start_routine, arg); }
 
 inline void thread_join(OS_thread_t thread)
-{  (void)pthread_join(thread, 0);  }
+{
+   int ret = pthread_join(thread, 0);
+   (void)ret;
+   assert(0 == ret);
+}
 
 #endif   //#if defined (BOOST_INTERPROCESS_WINDOWS)
 
@@ -533,8 +565,16 @@ inline int thread_create( OS_thread_t * thread, boost::ipwinapiext::LPTHREAD_STA
 
 inline void thread_join( OS_thread_t thread)
 {
-   winapi::wait_for_single_object( thread.handle(), winapi::infinite_time );
-   winapi::close_handle( thread.handle() );
+   {
+      unsigned long ret = winapi::wait_for_single_object( thread.handle(), winapi::infinite_time );
+      assert(0 == ret);
+      (void)ret;
+   }
+   {
+      bool ret = winapi::close_handle(thread.handle());
+      assert(true == ret);
+      (void)ret;
+   }
 }
 
 #endif
diff --git a/inst/include/boost/interprocess/detail/portable_intermodule_singleton.hpp b/inst/include/boost/interprocess/detail/portable_intermodule_singleton.hpp
index 32e196a6f..2673f9e14 100644
--- a/inst/include/boost/interprocess/detail/portable_intermodule_singleton.hpp
+++ b/inst/include/boost/interprocess/detail/portable_intermodule_singleton.hpp
@@ -152,7 +152,7 @@ struct thread_safe_global_map_dependant<managed_global_memory>
    static void apply_gmem_erase_logic(const char *filepath, const char *filename)
    {
       int fd = GMemMarkToBeRemoved;
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          std::string str;
          //If the filename is current process lock file, then avoid it
          if(check_if_filename_complies_with_pid
@@ -167,21 +167,21 @@ struct thread_safe_global_map_dependant<managed_global_memory>
          //If done, then the process is dead so take global shared memory name
          //(the name is based on the lock file name) and try to apply erasure logic
          str.insert(0, get_map_base_name());
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             managed_global_memory shm(open_only, str.c_str());
             gmem_erase_func func(str.c_str(), filepath, shm);
             shm.try_atomic_func(func);
          }
-         BOOST_CATCH(interprocess_exception &e){
+         BOOST_INTERPROCESS_CATCH(interprocess_exception &e){
             //If shared memory is not found erase the lock file
             if(e.get_error_code() == not_found_error){
                delete_file(filepath);
             }
-         } BOOST_CATCH_END
+         } BOOST_INTERPROCESS_CATCH_END
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
 
-      } BOOST_CATCH_END
+      } BOOST_INTERPROCESS_CATCH_END
       if(fd >= 0){
          close_lock_file(fd);
       }
diff --git a/inst/include/boost/interprocess/detail/segment_manager_helper.hpp b/inst/include/boost/interprocess/detail/segment_manager_helper.hpp
index 036dab5cc..6d47e4aae 100644
--- a/inst/include/boost/interprocess/detail/segment_manager_helper.hpp
+++ b/inst/include/boost/interprocess/detail/segment_manager_helper.hpp
@@ -27,10 +27,10 @@
 // interprocess/detail
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/detail/utilities.hpp>
-#include <boost/interprocess/detail/in_place_interface.hpp>
 // container/detail
 #include <boost/container/detail/type_traits.hpp> //alignment_of
 #include <boost/container/detail/minimal_char_traits_header.hpp>
+#include <boost/container/detail/placement_new.hpp>
 // intrusive
 #include <boost/intrusive/pointer_traits.hpp>
 // move/detail
@@ -38,13 +38,9 @@
 #include <boost/move/detail/force_ptr.hpp>
 // other boost
 #include <boost/assert.hpp>   //BOOST_ASSERT
-#include <boost/core/no_exceptions_support.hpp>
 // std
 #include <cstddef>   //std::size_t
 
-//!\file
-//!Describes the object placed in a memory segment that provides
-//!named object allocation capabilities.
 
 namespace boost{
 namespace interprocess{
@@ -76,13 +72,23 @@ class mem_algo_deallocator
    {  if(m_ptr) m_algo.deallocate(m_ptr);  }
 };
 
+#if !defined(BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI)
+#define BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI 2
+#endif   //#if !defined(BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI)
+
+#if (BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI == 1)
+
 template<class size_type>
 struct block_header
 {
-   size_type      m_value_bytes;
-   unsigned short m_num_char;
-   unsigned char  m_value_alignment;
-   unsigned char  m_alloc_type_sizeof_char;
+   private:
+   const size_type      m_value_bytes;
+   const unsigned short m_num_char;
+   const unsigned char  m_value_alignment;
+   const unsigned char  m_alloc_type_sizeof_char;
+
+   public:
+   typedef std::size_t name_len_t;
 
    block_header(size_type val_bytes
                ,size_type val_alignment
@@ -95,33 +101,34 @@ struct block_header
       ,  m_value_alignment((unsigned char)val_alignment)
       ,  m_alloc_type_sizeof_char( (unsigned char)((al_type << 5u) | ((unsigned char)szof_char & 0x1F)) )
    {};
-
-   template<class T>
-   block_header &operator= (const T& )
-   {  return *this;  }
-
-   size_type total_size() const
+   
+   template<std::size_t>
+   size_type total_anonymous_size() const
    {
-      if(alloc_type() != anonymous_type){
-         return name_offset() + (m_num_char+1u)*sizeof_char();
-      }
-      else{
-         return this->value_offset() + m_value_bytes;
-      }
+      return this->value_offset() + m_value_bytes;
    }
 
-   size_type value_bytes() const
-   {  return m_value_bytes;   }
+   template<std::size_t, class>
+   size_type total_named_size(std::size_t namelen) const
+   {
+      (void)namelen;
+      BOOST_ASSERT(namelen == m_num_char);
+      return name_offset() + (m_num_char+1u)*sizeof_char();
+   }
 
-   template<class Header>
-   size_type total_size_with_header() const
+   template<std::size_t, class, class Header>
+   size_type total_named_size_with_header(std::size_t namelen) const
    {
+      BOOST_ASSERT(namelen == m_num_char);
       return get_rounded_size
                ( size_type(sizeof(Header))
             , size_type(::boost::container::dtl::alignment_of<block_header<size_type> >::value))
-           + total_size();
+           + this->template total_named_size<0, char>(namelen);
    }
 
+   size_type value_bytes() const
+   {  return m_value_bytes;   }
+
    unsigned char alloc_type() const
    {  return (m_alloc_type_sizeof_char >> 5u)&(unsigned char)0x7;  }
 
@@ -138,101 +145,284 @@ struct block_header
    unsigned short name_length() const
    {  return m_num_char;   }
 
+   void *value() const
+   {
+      return const_cast<char*>((reinterpret_cast<const char*>(this) + this->value_offset()));
+   }
+
+   template<class T>
+   static block_header *block_header_from_value(T *value)
+   {
+      //      BOOST_ASSERT(is_ptr_aligned(value, algn));
+      const std::size_t algn = ::boost::container::dtl::alignment_of<T>::value;
+      block_header* hdr =
+         const_cast<block_header*>
+         (move_detail::force_ptr<const block_header*>(reinterpret_cast<const char*>(value) -
+            get_rounded_size(sizeof(block_header), algn)));
+
+      //Some sanity checks
+      BOOST_ASSERT(hdr->m_value_alignment == algn);
+      BOOST_ASSERT(hdr->m_value_bytes % sizeof(T) == 0);
+      return hdr;
+   }
+
+   template<class Header>
+   static block_header *from_first_header(Header *header)
+   {
+      block_header * hdr =
+         move_detail::force_ptr<block_header*>(reinterpret_cast<char*>(header) +
+       get_rounded_size( size_type(sizeof(Header))
+                       , size_type(::boost::container::dtl::alignment_of<block_header >::value)));
+      //Some sanity checks
+      return hdr;
+   }
+
+   template<class Header>
+   static const block_header *from_first_header(const Header *header)
+   {  return from_first_header(const_cast<Header*>(header));   }
+
+   template<class Header>
+   static Header *to_first_header(block_header *bheader)
+   {
+      Header * hdr =
+         move_detail::force_ptr<Header*>(reinterpret_cast<char*>(bheader) -
+       get_rounded_size( size_type(sizeof(Header))
+                       , size_type(::boost::container::dtl::alignment_of<block_header >::value)));
+      //Some sanity checks
+      return hdr;
+   }
+
+   template<std::size_t>
+   static size_type front_space_without_header()
+   {  return 0u;  }
+
+   template<std::size_t, class>
+   static size_type front_space_with_header()
+   {  return 0u;  }
+
+   void store_name_length(std::size_t)
+   {}
+
+   private:
+   size_type value_offset() const
+   {
+      return get_rounded_size(size_type(sizeof(block_header)), size_type(m_value_alignment));
+   }
+
    size_type name_offset() const
    {
       return this->value_offset() + get_rounded_size(size_type(m_value_bytes), size_type(sizeof_char()));
    }
+};
 
-   void *value() const
+#elif (BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI == 2)
+
+template <class BlockHeader, class Header>
+struct sm_between_headers
+{
+   BOOST_STATIC_CONSTEXPR std::size_t value
+      = sizeof(Header)
+      + ct_rounded_size< sizeof(BlockHeader), boost::move_detail::alignment_of<Header>::value>::value
+      - sizeof(BlockHeader);
+};
+
+template <std::size_t TypeAlignment, class BlockHeader, class Header>
+struct sg_offsets_with_header
+{
+   private:
+   BOOST_STATIC_CONSTEXPR std::size_t between_headers = sm_between_headers<BlockHeader, Header>::value;
+   BOOST_STATIC_CONSTEXPR std::size_t both_headers = between_headers + sizeof(BlockHeader);
+   BOOST_STATIC_CONSTEXPR std::size_t total_prefix = ct_rounded_size<both_headers, TypeAlignment>::value;
+
+   public:
+   BOOST_STATIC_CONSTEXPR std::size_t block_header_prefix = total_prefix - sizeof(BlockHeader);
+   BOOST_STATIC_CONSTEXPR std::size_t front_space = total_prefix - both_headers;
+
+   BOOST_INTERPROCESS_STATIC_ASSERT((total_prefix % TypeAlignment) == 0);
+   BOOST_INTERPROCESS_STATIC_ASSERT((front_space % boost::move_detail::alignment_of<Header>::value) == 0);
+   BOOST_INTERPROCESS_STATIC_ASSERT((block_header_prefix % boost::move_detail::alignment_of<BlockHeader>::value) == 0);
+   BOOST_INTERPROCESS_STATIC_ASSERT(total_prefix == (sizeof(BlockHeader) + sizeof(Header) + front_space + (between_headers - sizeof(Header))));
+};
+
+template <std::size_t TypeAlignment, class BlockHeader>
+struct sg_offsets_without_header
+{
+   BOOST_STATIC_CONSTEXPR std::size_t total_prefix = ct_rounded_size<sizeof(BlockHeader), TypeAlignment>::value;
+
+   public:
+   BOOST_STATIC_CONSTEXPR std::size_t block_header_prefix = total_prefix - sizeof(BlockHeader);
+   BOOST_STATIC_CONSTEXPR std::size_t front_space = block_header_prefix;
+};
+
+template<class size_type>
+struct block_header
+{
+   private:
+   const size_type  m_alloc_type  : 2;
+   const size_type  m_value_bytes : sizeof(size_type)*CHAR_BIT - 2u;
+
+   public:
+   typedef unsigned short name_len_t;
+
+   block_header(size_type val_bytes
+               ,size_type 
+               ,unsigned char al_type
+               ,std::size_t
+               ,std::size_t
+               )
+      : m_alloc_type(al_type & 3u)
+      , m_value_bytes(val_bytes & (~size_type(0) >> 2u))
+   {};
+
+   template<std::size_t TypeAlignment>
+   size_type total_anonymous_size() const
    {
-      return const_cast<char*>((reinterpret_cast<const char*>(this) + this->value_offset()));
+      BOOST_CONSTEXPR_OR_CONST std::size_t block_header_prefix =
+         sg_offsets_without_header<TypeAlignment, block_header>::block_header_prefix;
+      return block_header_prefix + this->value_offset() + m_value_bytes;
    }
 
-   size_type value_offset() const
+   template<std::size_t TypeAlignment, class CharType>
+   size_type total_named_size(std::size_t namelen) const
    {
-      return get_rounded_size(size_type(sizeof(block_header<size_type>)), size_type(m_value_alignment));
+      BOOST_CONSTEXPR_OR_CONST std::size_t block_header_prefix =
+         sg_offsets_without_header<TypeAlignment, block_header>::block_header_prefix;
+      return block_header_prefix
+         + name_offset< ::boost::move_detail::alignment_of<CharType>::value>()
+         + (namelen + 1u) * sizeof(CharType);
    }
 
-   template<class CharType>
-   bool less_comp(const block_header<size_type> &b) const
+   template<std::size_t TypeAlignment, class CharType, class Header>
+   size_type total_named_size_with_header(std::size_t namelen) const
    {
-      return m_num_char < b.m_num_char ||
-             (m_num_char < b.m_num_char &&
-              std::char_traits<CharType>::compare(name<CharType>(), b.name<CharType>(), m_num_char) < 0);
+      typedef sg_offsets_with_header<TypeAlignment, block_header, Header> offsets_t;
+      return offsets_t::block_header_prefix
+         + name_offset< ::boost::move_detail::alignment_of<CharType>::value>()
+         + (namelen + 1u) * sizeof(CharType);
    }
 
+   size_type value_bytes() const
+   {  return m_value_bytes;   }
+
+   unsigned char alloc_type() const
+   {  return m_alloc_type;  }
+
    template<class CharType>
-   bool equal_comp(const block_header<size_type> &b) const
+   CharType *name() const
    {
-      return m_num_char == b.m_num_char &&
-             std::char_traits<CharType>::compare(name<CharType>(), b.name<CharType>(), m_num_char) == 0;
+      return const_cast<CharType*>(move_detail::force_ptr<const CharType*>
+         (reinterpret_cast<const char*>(this) +
+          this->template name_offset< ::boost::move_detail::alignment_of<CharType>::value>()));
    }
 
-   template<class T>
-   static block_header<size_type> *block_header_from_value(T *value)
-   {  return block_header_from_value(value, sizeof(T), ::boost::container::dtl::alignment_of<T>::value);  }
+   name_len_t name_length() const
+   {
+      if(m_alloc_type == anonymous_type)
+         return 0;
+      return *(move_detail::force_ptr<const name_len_t*>
+         (reinterpret_cast<const char*>(this) + this->name_length_offset()));
+   }
 
-   static block_header<size_type> *block_header_from_value(const void *value, std::size_t sz, std::size_t algn)
+   void *value() const
+   {  return const_cast<char*>((reinterpret_cast<const char*>(this) + this->value_offset()));  }
+
+   template<class T>
+   static block_header *block_header_from_value(T *value)
    {
-      block_header * hdr =
+      BOOST_ASSERT(is_ptr_aligned(value, ::boost::container::dtl::alignment_of<T>::value));
+      block_header* hdr =
          const_cast<block_header*>
-            (move_detail::force_ptr<const block_header*>(reinterpret_cast<const char*>(value) -
-               get_rounded_size(sizeof(block_header), algn)));
-      (void)sz;
+            (move_detail::force_ptr<const block_header*>
+               (reinterpret_cast<const char*>(value) - value_offset()));
+
       //Some sanity checks
-      BOOST_ASSERT(hdr->m_value_alignment == algn);
-      BOOST_ASSERT(hdr->m_value_bytes % sz == 0);
+      BOOST_ASSERT(hdr->m_value_bytes % sizeof(T) == 0);
       return hdr;
    }
 
    template<class Header>
-   static block_header<size_type> *from_first_header(Header *header)
+   static block_header *from_first_header(Header *header)
    {
-      block_header<size_type> * hdr =
-         move_detail::force_ptr<block_header<size_type>*>(reinterpret_cast<char*>(header) +
-       get_rounded_size( size_type(sizeof(Header))
-                       , size_type(::boost::container::dtl::alignment_of<block_header<size_type> >::value)));
+      BOOST_ASSERT(is_ptr_aligned(header));
+      block_header * const hdr = move_detail::force_ptr<block_header*>(
+            reinterpret_cast<char*>(header) + sm_between_headers<block_header, Header>::value);
       //Some sanity checks
+      BOOST_ASSERT(is_ptr_aligned(hdr));
       return hdr;
    }
 
    template<class Header>
-   static Header *to_first_header(block_header<size_type> *bheader)
+   static const block_header *from_first_header(const Header *header)
+   {  return from_first_header(const_cast<Header*>(header));   }
+
+   template<class Header>
+   static Header *to_first_header(block_header *bheader)
    {
-      Header * hdr =
-         move_detail::force_ptr<Header*>(reinterpret_cast<char*>(bheader) -
-       get_rounded_size( size_type(sizeof(Header))
-                       , size_type(::boost::container::dtl::alignment_of<block_header<size_type> >::value)));
+      BOOST_ASSERT(is_ptr_aligned(bheader));
+      Header * hdr = move_detail::force_ptr<Header*>(
+         reinterpret_cast<char*>(bheader) - sm_between_headers<block_header, Header>::value);
       //Some sanity checks
+      BOOST_ASSERT(is_ptr_aligned(hdr));
       return hdr;
    }
-};
 
-inline void array_construct(void *mem, std::size_t num, in_place_interface &table)
-{
-   //Try constructors
-   std::size_t constructed = 0;
-   BOOST_TRY{
-      table.construct_n(mem, num, constructed);
+   template<std::size_t TypeAlignment, class Header>
+   static size_type front_space_with_header()
+   {  return sg_offsets_with_header<TypeAlignment, block_header, Header>::front_space; }
+
+   template<std::size_t TypeAlignment>
+   static size_type front_space_without_header()
+   {  return sg_offsets_without_header<TypeAlignment, block_header>::front_space; }
+
+   void store_name_length(name_len_t namelen)
+   {
+      ::new( reinterpret_cast<char*>(this) + this->name_length_offset()
+           , boost_container_new_t()
+           ) name_len_t(namelen);
    }
-   //If there is an exception call destructors and erase index node
-   BOOST_CATCH(...){
-      std::size_t destroyed = 0;
-      table.destroy_n(mem, constructed, destroyed);
-      BOOST_RETHROW
-   } BOOST_CATCH_END
-}
+
+   private:
+
+   static size_type value_offset()
+   {  return size_type(sizeof(block_header));   }
+
+   template<std::size_t CharAlign>
+   size_type name_offset() const
+   {  return get_rounded_size(this->name_length_offset()+sizeof(name_len_t), CharAlign);  }
+
+   size_type name_length_offset() const
+   {
+      return this->value_offset() + get_rounded_size(m_value_bytes, ::boost::move_detail::alignment_of<name_len_t>::value);
+   }
+};
+
+
+#else //(BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI == )
+
+#error "Incorrect BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI value!"
+
+#endif
 
 template<class CharT>
 struct intrusive_compare_key
 {
    typedef CharT char_type;
 
-   intrusive_compare_key(const CharT *str, std::size_t len)
-      :  mp_str(str), m_len(len)
+   intrusive_compare_key(const CharT* str_, std::size_t len_)
+      : mp_str(str_), m_len(len_)
    {}
 
-   const CharT *  mp_str;
+   const CharT* str() const
+   {
+      return mp_str;
+   }
+
+   std::size_t len() const
+   {
+      return m_len;
+   }
+
+   const CharT* mp_str;
    std::size_t    m_len;
 };
 
@@ -272,30 +462,10 @@ struct intrusive_value_type_impl
    public:
    typedef CharType char_type;
    typedef SizeType size_type;
+   typedef block_header<size_type> block_header_t;
 
    intrusive_value_type_impl(){}
 
-   enum  {  BlockHdrAlignment = ::boost::container::dtl::alignment_of<block_header<size_type> >::value  };
-
-   block_header<size_type> *get_block_header() const
-   {
-      return const_cast<block_header<size_type>*>
-         (move_detail::force_ptr<const block_header<size_type> *>(reinterpret_cast<const char*>(this) +
-            get_rounded_size(size_type(sizeof(*this)), size_type(BlockHdrAlignment))));
-   }
-
-   bool operator <(const intrusive_value_type_impl<Hook, CharType, SizeType> & other) const
-   {  return (this->get_block_header())->template less_comp<CharType>(*other.get_block_header());  }
-
-   bool operator ==(const intrusive_value_type_impl<Hook, CharType, SizeType> & other) const
-   {  return (this->get_block_header())->template equal_comp<CharType>(*other.get_block_header());  }
-
-   static intrusive_value_type_impl *get_intrusive_value_type(block_header<size_type> *hdr)
-   {
-      return move_detail::force_ptr<intrusive_value_type_impl*>(reinterpret_cast<char*>(hdr) -
-         get_rounded_size(size_type(sizeof(intrusive_value_type_impl)), size_type(BlockHdrAlignment)));
-   }
-
    CharType *name() const
    {  return get_block_header()->template name<CharType>(); }
 
@@ -304,6 +474,10 @@ struct intrusive_value_type_impl
 
    void *value() const
    {  return get_block_header()->value(); }
+
+   private:
+   const block_header_t *get_block_header() const
+   {  return block_header_t::from_first_header(this); }
 };
 
 template<class CharType>
@@ -414,16 +588,22 @@ struct index_config
 {
    typedef typename MemoryAlgorithm::void_pointer        void_pointer;
    typedef CharT                                         char_type;
-   typedef index_key<CharT, void_pointer>        key_type;
-   typedef index_data<void_pointer>              mapped_type;
+   typedef index_key<CharT, void_pointer>                key_type;
+   typedef index_data<void_pointer>                      mapped_type;
    typedef typename segment_manager_base_type
       <MemoryAlgorithm>::type                            segment_manager_base;
 
    template<class HeaderBase>
    struct intrusive_value_type
-   {  typedef intrusive_value_type_impl<HeaderBase, CharT, typename segment_manager_base::size_type>  type; };
-
-   typedef intrusive_compare_key<CharT>            intrusive_compare_key_type;
+   {
+      typedef intrusive_value_type_impl
+         < HeaderBase
+         , CharT
+         , typename segment_manager_base::size_type
+         >  type;
+   };
+
+   typedef intrusive_compare_key<CharT>                  compare_key_type;
 };
 
 template<class Iterator, bool intrusive>
@@ -488,6 +668,23 @@ struct segment_manager_iterator_transform
    {  return result_type(arg); }
 };
 
+
+template<class T>
+inline T* null_or_bad_alloc(bool dothrow)
+{
+   if (dothrow)
+      throw bad_alloc();
+   return 0;
+}
+
+template<class T>
+inline T* null_or_already_exists(bool dothrow)
+{
+   if (dothrow)
+      throw interprocess_exception(already_exists_error);
+   return 0;
+}
+
 }  //namespace ipcdetail {
 
 //These pointers are the ones the user will use to
diff --git a/inst/include/boost/interprocess/detail/timed_utils.hpp b/inst/include/boost/interprocess/detail/timed_utils.hpp
index eb76d3a5d..b56567f26 100644
--- a/inst/include/boost/interprocess/detail/timed_utils.hpp
+++ b/inst/include/boost/interprocess/detail/timed_utils.hpp
@@ -42,6 +42,10 @@
 
 namespace boost {
 namespace interprocess {
+
+class ustime;
+class usduration;
+
 namespace ipcdetail {
 
 BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(time_duration_type)
@@ -74,6 +78,16 @@ struct enable_if_duration
    : enable_if_c< BOOST_INTRUSIVE_HAS_TYPE(boost::interprocess::ipcdetail::, T, rep) >
 {};
 
+template<class T>
+struct enable_if_ustime
+   : enable_if_c< is_same<T, ustime>::value >
+{};
+
+template<class T>
+struct enable_if_usduration
+   : enable_if_c< is_same<T, usduration>::value >
+{};
+
 #if defined(BOOST_INTERPROCESS_HAS_REENTRANT_STD_FUNCTIONS)
 
    inline std::tm* interprocess_gmtime(const std::time_t* t, std::tm* result)
@@ -135,82 +149,24 @@ inline boost::uint64_t file_time_to_microseconds(const boost::winapi::FILETIME_
 }
 #endif
 
-class ustime;
-
-class usduration
-{
-   public:
-   friend class ustime;
-
-   explicit usduration(boost::uint64_t microsecs)
-      : m_microsecs(microsecs)
-   {}
-
-   boost::uint64_t get_microsecs() const
-   {  return m_microsecs;  }
-
-   bool operator < (const usduration &other) const
-   {  return m_microsecs < other.m_microsecs; }
-
-   bool operator > (const usduration &other) const
-   {  return m_microsecs > other.m_microsecs; }
-
-   bool operator <= (const usduration &other) const
-   {  return m_microsecs <= other.m_microsecs; }
-
-   bool operator >= (const usduration &other) const
-   {  return m_microsecs >= other.m_microsecs; }
-
-   private:
-   boost::uint64_t m_microsecs;
-};
-
-class ustime
+inline boost::uint64_t universal_time_u64_us()
 {
-   public:
-   explicit ustime(boost::uint64_t microsecs)
-      : m_microsecs(microsecs)
-   {}
-
-   ustime &operator += (const usduration &other)
-   {  m_microsecs += other.m_microsecs; return *this; }
-
-   ustime operator + (const usduration &other)
-   {  ustime r(*this); r += other; return r; }
-
-   ustime &operator -= (const usduration &other)
-   {  m_microsecs -= other.m_microsecs; return *this; }
-
-   ustime operator - (const usduration &other)
-   {  ustime r(*this); r -= other; return r; }
-
-   friend usduration operator - (const ustime &l, const ustime &r)
-   {  return usduration(l.m_microsecs - r.m_microsecs); }
-
-   bool operator < (const ustime &other) const
-   {  return m_microsecs < other.m_microsecs; }
-
-   bool operator > (const ustime &other) const
-   {  return m_microsecs > other.m_microsecs; }
-
-   bool operator <= (const ustime &other) const
-   {  return m_microsecs <= other.m_microsecs; }
-
-   bool operator >= (const ustime &other) const
-   {  return m_microsecs >= other.m_microsecs; }
-
-   boost::uint64_t get_microsecs() const
-   {  return m_microsecs;  }
-
-   private:
-   boost::uint64_t m_microsecs;
-};
-
-inline usduration usduration_milliseconds(boost::uint64_t millisec)
-{  return usduration(millisec*1000u);   }
+   #ifdef BOOST_HAS_GETTIMEOFDAY
+      timeval tv;
+      gettimeofday(&tv, 0); //gettimeofday does not support TZ adjust on Linux.
+      boost::uint64_t micros = boost::uint64_t(tv.tv_sec)*1000000u;
+      micros += (boost::uint64_t)tv.tv_usec;
+   #elif defined(BOOST_HAS_FTIME)
+      boost::winapi::FILETIME_ ft;
+      boost::winapi::GetSystemTimeAsFileTime(&ft);
+      boost::uint64_t micros = file_time_to_microseconds(ft); // it will not wrap, since ft is the current time
+                                                               // and cannot be before 1970-Jan-01
+   #else
+      #error "Unsupported date-time error: neither gettimeofday nor FILETIME support is detected"
+   #endif
+   return micros;
+}
 
-inline usduration usduration_seconds(boost::uint64_t sec)
-{  return usduration(sec*uint64_t(1000000u));   }
 
 template<class TimeType, class Enable = void>
 class microsec_clock;
@@ -222,9 +178,11 @@ class microsec_clock<TimeType, typename enable_if_ptime<TimeType>::type>
    typedef typename TimeType::date_type date_type;
    typedef typename TimeType::time_duration_type time_duration_type;
    typedef typename time_duration_type::rep_type resolution_traits_type;
+
    public:
+   typedef TimeType time_point;
 
-   static TimeType universal_time()
+   static time_point universal_time()
    {
       #ifdef BOOST_HAS_GETTIMEOFDAY
          timeval tv;
@@ -260,30 +218,7 @@ class microsec_clock<TimeType, typename enable_if_ptime<TimeType>::type>
                               static_cast< typename time_duration_type::sec_type >(curr_ptr->tm_sec),
                               static_cast< typename time_duration_type::fractional_seconds_type >(sub_sec * adjust)
                            );
-      return TimeType(d,td);
-   }
-};
-
-template<>
-class microsec_clock<ustime>
-{
-   public:
-   static ustime universal_time()
-   {
-      #ifdef BOOST_HAS_GETTIMEOFDAY
-         timeval tv;
-         gettimeofday(&tv, 0); //gettimeofday does not support TZ adjust on Linux.
-         boost::uint64_t micros = boost::uint64_t(tv.tv_sec)*1000000;
-         micros += (boost::uint64_t)tv.tv_usec;
-      #elif defined(BOOST_HAS_FTIME)
-         boost::winapi::FILETIME_ ft;
-         boost::winapi::GetSystemTimeAsFileTime(&ft);
-         boost::uint64_t micros = file_time_to_microseconds(ft); // it will not wrap, since ft is the current time
-                                                                  // and cannot be before 1970-Jan-01
-      #else
-         #error "Unsupported date-time error: neither gettimeofday nor FILETIME support is detected"
-      #endif
-      return ustime(micros);
+      return time_point(d,td);
    }
 };
 
@@ -291,23 +226,13 @@ template<class TimePoint>
 class microsec_clock<TimePoint, typename enable_if_time_point<TimePoint>::type>
 {
    public:
-   static TimePoint universal_time()
+   typedef typename TimePoint::clock::time_point time_point;
+
+   static time_point universal_time()
    {  return TimePoint::clock::now();  }
 };
 
 
-template<class TimePoint>
-inline TimePoint delay_ms(unsigned msecs, typename enable_if_ptime<TimePoint>::type* = 0)
-{
-   typedef typename TimePoint::time_duration_type time_duration_type;
-   typedef typename time_duration_type::rep_type resolution_traits_type;
-
-   time_duration_type td(msecs*1000*resolution_traits_type::res_adjust());
-
-   TimePoint tp(microsec_clock<TimePoint>::universal_time());
-   return (tp += td);
-}
-
 template<class TimePoint>
 inline bool is_pos_infinity(const TimePoint &abs_time, typename enable_if_ptime<TimePoint>::type* = 0)
 {
@@ -320,20 +245,6 @@ inline bool is_pos_infinity(const TimePoint &, typename disable_if_ptime<TimePoi
    return false;
 }
 
-/*
-template<class Duration>
-inline ustime duration_to_timepoint(const Duration &dur, typename enable_if_ptime<Duration>::type* = 0)
-{
-   return dur.is_pos_infinity();
-}
-
-template<class Duration>
-inline bool duration_to_timepoint(const Duration &, typename disable_if_ptime<Duration>::type* = 0)
-{
-   return false;
-}
-*/
-
 // duration_to_milliseconds
 
 template<class Duration>
@@ -349,35 +260,12 @@ inline boost::uint64_t duration_to_milliseconds(const Duration &d, typename enab
    return static_cast<boost::uint64_t>(double(d.count())*factor);
 }
 
-inline boost::uint64_t duration_to_milliseconds(const usduration &d)
-{
-   return d.get_microsecs()/1000;
-}
-
-// duration_to_usduration
-
-template<class Duration>
-inline usduration duration_to_usduration(const Duration &d, typename enable_if_ptime_duration<Duration>::type* = 0)
-{
-   return usduration(static_cast<boost::uint64_t>(d.total_microseconds()));
-}
-
 template<class Duration>
-inline usduration duration_to_usduration(const Duration &d, typename enable_if_duration<Duration>::type* = 0)
+inline boost::uint64_t duration_to_milliseconds(const Duration&d, typename enable_if_usduration<Duration>::type* = 0)
 {
-   const double factor = double(Duration::period::num)*1000000.0/double(Duration::period::den);
-   return usduration(static_cast<boost::uint64_t>(double(d.count())*factor));
+   return d.get_microsecs()/1000u;
 }
 
-// duration_to_ustime
-
-template<class Duration>
-inline ustime duration_to_ustime(const Duration &d)
-{
-   return microsec_clock<ustime>::universal_time() + (duration_to_usduration)(d);
-}
-
-
 }  //namespace ipcdetail {
 }  //namespace interprocess {
 }  //namespace boost {
diff --git a/inst/include/boost/interprocess/detail/utilities.hpp b/inst/include/boost/interprocess/detail/utilities.hpp
index 247dff1e8..2d858ac00 100644
--- a/inst/include/boost/interprocess/detail/utilities.hpp
+++ b/inst/include/boost/interprocess/detail/utilities.hpp
@@ -30,9 +30,9 @@
 #include <boost/interprocess/detail/min_max.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/detail/mpl.hpp>
+#include <boost/container/detail/type_traits.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/cstdint.hpp>
 #include <climits>
 
@@ -80,9 +80,9 @@ inline SizeType get_truncated_size_po2(SizeType orig_size, SizeType multiple)
 template <std::size_t OrigSize, std::size_t RoundTo>
 struct ct_rounded_size
 {
-   BOOST_STATIC_ASSERT((RoundTo != 0));
+   BOOST_INTERPROCESS_STATIC_ASSERT((RoundTo != 0));
    static const std::size_t intermediate_value = (OrigSize-1)/RoundTo+1;
-   BOOST_STATIC_ASSERT(intermediate_value <= std::size_t(-1)/RoundTo);
+   BOOST_INTERPROCESS_STATIC_ASSERT(intermediate_value <= std::size_t(-1)/RoundTo);
    static const std::size_t value = intermediate_value*RoundTo;
 };
 
@@ -151,7 +151,7 @@ template<std::size_t SztSizeOfType, class SizeType>
 BOOST_INTERPROCESS_FORCEINLINE bool size_overflows(SizeType count)
 {
    //Compile time-check
-   BOOST_STATIC_ASSERT(SztSizeOfType <= SizeType(-1));
+   BOOST_INTERPROCESS_STATIC_ASSERT(SztSizeOfType <= SizeType(-1));
    //Runtime check
    return multiplication_overflows(SizeType(SztSizeOfType), count);
 }
@@ -204,6 +204,17 @@ class value_eraser
    bool                    m_erase;
 };
 
+template<class T>
+inline bool is_ptr_aligned(T* ptr)
+{
+   return (((std::size_t)ptr) % ::boost::container::dtl::alignment_of<T>::value) == 0;
+}
+
+inline bool is_ptr_aligned(const volatile void* ptr, std::size_t align)
+{
+   return (((std::size_t)ptr) % align) == 0;
+}
+
 }  //namespace interprocess {
 }  //namespace boost {
 
diff --git a/inst/include/boost/interprocess/detail/win32_api.hpp b/inst/include/boost/interprocess/detail/win32_api.hpp
index a8a1ad7e8..0ddbe0ac1 100644
--- a/inst/include/boost/interprocess/detail/win32_api.hpp
+++ b/inst/include/boost/interprocess/detail/win32_api.hpp
@@ -1243,8 +1243,8 @@ class nt_query_mem_deleter
       (SystemTimeOfDayInfoLength + sizeof(unsigned long) + sizeof(boost::winapi::DWORD_))*2;
 
    public:
-   explicit nt_query_mem_deleter(std::size_t object_name_info_size)
-      : m_size(object_name_info_size + rename_offset + rename_suffix)
+   explicit nt_query_mem_deleter(unsigned long object_name_info_size)
+      : m_size(static_cast<unsigned long>(object_name_info_size + rename_offset + rename_suffix))
       , m_buf(new char [m_size])
    {}
 
@@ -1270,7 +1270,7 @@ class nt_query_mem_deleter
       return static_cast<unsigned long>(m_size - rename_offset - SystemTimeOfDayInfoLength*2);
    }
 
-   std::size_t file_rename_information_size() const
+   unsigned long file_rename_information_size() const
    {  return static_cast<unsigned long>(m_size);  }
 
    private:
@@ -1324,7 +1324,7 @@ inline bool unlink_file(const CharT *filename)
    //- Close the handle. If there are no file users, it will be deleted.
    //  Otherwise it will be used by already connected handles but the
    //  file name can't be used to open this file again
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       NtSetInformationFile_t pNtSetInformationFile =
          reinterpret_cast<NtSetInformationFile_t>(dll_func::get(dll_func::NtSetInformationFile));
 
@@ -1418,9 +1418,9 @@ inline bool unlink_file(const CharT *filename)
          return true;
       }
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
    return true;
 }
 
@@ -1444,7 +1444,7 @@ inline bool get_registry_value_buffer(hkey key_type, const CharT *subkey_name, c
       reg_closer key_closer(key);
 
       //Obtain the value
-      unsigned long size = buflen;
+      unsigned long size = static_cast<unsigned long>(buflen);
       unsigned long type;
       buflen = 0;
       bret = 0 == reg_query_value_ex( key, value_name, 0, &type, (unsigned char*)buf, &size);
diff --git a/inst/include/boost/interprocess/detail/windows_intermodule_singleton.hpp b/inst/include/boost/interprocess/detail/windows_intermodule_singleton.hpp
index 67ce199b8..5439dc917 100644
--- a/inst/include/boost/interprocess/detail/windows_intermodule_singleton.hpp
+++ b/inst/include/boost/interprocess/detail/windows_intermodule_singleton.hpp
@@ -115,7 +115,7 @@ class windows_semaphore_based_map
          caster.addr = m;
          BOOST_ASSERT((caster.addr_uint64 & boost::uint64_t(3)) == 0);
          max_count = boost::uint32_t(caster.addr_uint64 >> 32);
-         initial_count = boost::uint32_t(caster.addr_uint64);
+         initial_count = boost::uint32_t(caster.addr_uint64 & boost::uint64_t(0x00000000FFFFFFFF));
          initial_count = initial_count/4;
          //Make sure top two bits are zero
          BOOST_ASSERT((max_count & boost::uint32_t(0xC0000000)) == 0);
diff --git a/inst/include/boost/interprocess/detail/workaround.hpp b/inst/include/boost/interprocess/detail/workaround.hpp
index 01b6c6eb0..f2aa7c9cc 100644
--- a/inst/include/boost/interprocess/detail/workaround.hpp
+++ b/inst/include/boost/interprocess/detail/workaround.hpp
@@ -34,10 +34,14 @@
 #else
    #include <unistd.h>
 
+   #if defined (__CYGWIN__) && (!defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE < 200112L))
+   #error "Error: Compiling on Cygwin without POSIX is not supported. Please define _XOPEN_SOURCE >= 600 or _POSIX_C_SOURCE >= 200112 when compiling"
+   #endif
+
    //////////////////////////////////////////////////////
    //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
    //////////////////////////////////////////////////////
-   #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(__VXWORKS__)
+   #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(__VXWORKS__) && !(__EMSCRIPTEN__)
       #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
    #endif
 
@@ -226,8 +230,11 @@
 #elif defined(BOOST_MSVC) && (_MSC_VER < 1900 || defined(_DEBUG))
    //"__forceinline" and MSVC seems to have some bugs in old versions and in debug mode
    #define BOOST_INTERPROCESS_FORCEINLINE inline
-#elif defined(BOOST_GCC) && (__GNUC__ <= 5)
+#elif defined(BOOST_CLANG) || (defined(BOOST_GCC) && ((__GNUC__ <= 5) || defined(__MINGW32__)))
    //Older GCCs have problems with forceinline
+   //Clang can have code bloat issues with forceinline, see
+   //https://lists.boost.org/boost-users/2023/04/91445.php and
+   //https://github.com/llvm/llvm-project/issues/62202
    #define BOOST_INTERPROCESS_FORCEINLINE inline
 #else
    #define BOOST_INTERPROCESS_FORCEINLINE BOOST_FORCEINLINE
@@ -239,7 +246,7 @@
 
 #ifdef __clang__
    #define BOOST_INTERPROCESS_DISABLE_DEPRECATED_WARNING _Pragma("clang diagnostic push") \
-                                                         _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+//                                                         _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
    #define BOOST_INTERPROCESS_RESTORE_WARNING            _Pragma("clang diagnostic pop")
 #else // __clang__
    #define BOOST_INTERPROCESS_DISABLE_DEPRECATED_WARNING __pragma(warning(push)) \
@@ -257,6 +264,115 @@
 #  endif
 #endif
 
-#include <boost/core/no_exceptions_support.hpp>
+namespace boost {
+namespace interprocess {
+
+template <typename T1>
+BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore(T1 const&)
+{}
+
+}} //namespace boost::interprocess {
+
+#if !(defined BOOST_NO_EXCEPTIONS)
+#    define BOOST_INTERPROCESS_TRY { try
+#    define BOOST_INTERPROCESS_CATCH(x) catch(x)
+#    define BOOST_INTERPROCESS_RETHROW throw;
+#    define BOOST_INTERPROCESS_CATCH_END }
+#else
+#    if !defined(BOOST_MSVC) || BOOST_MSVC >= 1900
+#        define BOOST_INTERPROCESS_TRY { if (true)
+#        define BOOST_INTERPROCESS_CATCH(x) else if (false)
+#    else
+// warning C4127: conditional expression is constant
+#        define BOOST_INTERPROCESS_TRY { \
+             __pragma(warning(push)) \
+             __pragma(warning(disable: 4127)) \
+             if (true) \
+             __pragma(warning(pop))
+#        define BOOST_INTERPROCESS_CATCH(x) else \
+             __pragma(warning(push)) \
+             __pragma(warning(disable: 4127)) \
+             if (false) \
+             __pragma(warning(pop))
+#    endif
+#    define BOOST_INTERPROCESS_RETHROW
+#    define BOOST_INTERPROCESS_CATCH_END }
+#endif
+
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
+#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
+#     define BOOST_INTERPROCESS_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__)
+#  else
+#     define BOOST_INTERPROCESS_STATIC_ASSERT( B ) static_assert(B, #B)
+#  endif
+#else
+namespace boost {
+   namespace interprocess {
+      namespace dtl {
+
+         template<bool B>
+         struct STATIC_ASSERTION_FAILURE;
+
+         template<>
+         struct STATIC_ASSERTION_FAILURE<true> {};
+
+         template<unsigned> struct static_assert_test {};
+
+      }
+   }
+}
+
+#define BOOST_INTERPROCESS_STATIC_ASSERT(B) \
+         typedef ::boost::interprocess::dtl::static_assert_test<\
+            (unsigned)sizeof(::boost::interprocess::dtl::STATIC_ASSERTION_FAILURE<bool(B)>)>\
+               BOOST_JOIN(boost_container_static_assert_typedef_, __LINE__) BOOST_ATTRIBUTE_UNUSED
+
+#endif
+
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
+#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
+#     define BOOST_INTERPROCESS_STATIC_ASSERT_MSG( ... ) static_assert(__VA_ARGS__)
+#  else
+#     define BOOST_INTERPROCESS_STATIC_ASSERT_MSG( B, Msg ) static_assert( B, Msg )
+#  endif
+#else
+#     define BOOST_INTERPROCESS_STATIC_ASSERT_MSG( B, Msg ) BOOST_INTERPROCESS_STATIC_ASSERT( B )
+#endif
+
+#if !defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+#  define BOOST_INTERPROCESS_CONSTANT_VAR BOOST_INLINE_CONSTEXPR
+#else
+#  define BOOST_INTERPROCESS_CONSTANT_VAR static BOOST_CONSTEXPR_OR_CONST
+#endif
+
+#if defined(__GNUC__) && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40600)
+#define BOOST_INTERPROCESS_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED
+#elif defined(__clang__)
+#define BOOST_INTERPROCESS_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED
+#endif
+
+
+////////////////////////////////////////////
+//
+//    BOOST_INTERPROCESS_EINTR_RETRY
+//
+////////////////////////////////////////////
+
+//#define DISABLE_BOOST_INTERPROCESS_EINTR_RETRY
+#if !defined(DISABLE_BOOST_INTERPROCESS_EINTR_RETRY) && defined(__GNUC__)
+
+/* taken from glibc unistd.h and fixes musl */
+#define BOOST_INTERPROCESS_EINTR_RETRY(RESULTTYPE, FAILUREVALUE, EXPRESSION) \
+  (__extension__                                   \
+    ({ RESULTTYPE __result;                        \
+       do __result = (RESULTTYPE) (EXPRESSION);    \
+       while (__result == FAILUREVALUE && errno == EINTR);  \
+       __result; }))
+
+#else    //!defined(DISABLE_BOOST_INTERPROCESS_EINTR_RETRY) && defined(__GNUC__)
+
+#define BOOST_INTERPROCESS_EINTR_RETRY(RESULTTYPE, FAILUREVALUE, EXPRESSION) ((RESULTTYPE)(EXPRESSION))
+
+#endif   //!defined(DISABLE_BOOST_INTERPROCESS_EINTR_RETRY) && defined(__GNUC__)
 
 #endif   //#ifndef BOOST_INTERPROCESS_DETAIL_WORKAROUND_HPP
diff --git a/inst/include/boost/interprocess/exceptions.hpp b/inst/include/boost/interprocess/exceptions.hpp
index 3eeb9f6e0..31e88b8df 100644
--- a/inst/include/boost/interprocess/exceptions.hpp
+++ b/inst/include/boost/interprocess/exceptions.hpp
@@ -39,14 +39,14 @@ class BOOST_SYMBOL_VISIBLE interprocess_exception : public std::exception
    interprocess_exception(const char *err) BOOST_NOEXCEPT
       :  m_err(other_error)
    {
-      BOOST_TRY   {  m_str = err; }
-      BOOST_CATCH(...) {} BOOST_CATCH_END
+      BOOST_INTERPROCESS_TRY   {  m_str = err; }
+      BOOST_INTERPROCESS_CATCH(...) {} BOOST_INTERPROCESS_CATCH_END
    }
 
    interprocess_exception(const error_info &err_info, const char *str = 0)
       :  m_err(err_info)
    {
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          if(m_err.get_native_error() != 0){
             fill_system_message(m_err.get_native_error(), m_str);
          }
@@ -57,7 +57,7 @@ class BOOST_SYMBOL_VISIBLE interprocess_exception : public std::exception
             m_str = "boost::interprocess_exception::library_error";
          }
       }
-      BOOST_CATCH(...){} BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH(...){} BOOST_INTERPROCESS_CATCH_END
    }
 
    ~interprocess_exception() BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {}
diff --git a/inst/include/boost/interprocess/indexes/flat_map_index.hpp b/inst/include/boost/interprocess/indexes/flat_map_index.hpp
index 027b75be4..5e2ea7cf1 100644
--- a/inst/include/boost/interprocess/indexes/flat_map_index.hpp
+++ b/inst/include/boost/interprocess/indexes/flat_map_index.hpp
@@ -22,7 +22,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 // interprocess
-#include <boost/interprocess/containers/flat_map.hpp>
+#include <boost/container/flat_map.hpp>
 #include <boost/interprocess/allocators/allocator.hpp>
 // intrusive/detail
 #include <boost/intrusive/detail/minimal_pair_header.hpp>         //std::pair
@@ -50,8 +50,8 @@ struct flat_map_index_aux
    typedef std::pair<key_type, mapped_type>        value_type;
    typedef allocator<value_type
                     ,segment_manager_base>   allocator_type;
-   typedef flat_map<key_type,  mapped_type,
-                    key_less, allocator_type>      index_t;
+   typedef boost::container::flat_map<key_type,  mapped_type,
+                                      key_less, allocator_type>      index_t;
 };
 
 #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
@@ -61,29 +61,55 @@ struct flat_map_index_aux
 template <class MapConfig>
 class flat_map_index
    //Derive class from flat_map specialization
-   : public flat_map_index_aux<MapConfig>::index_t
+   : private flat_map_index_aux<MapConfig>::index_t
 {
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
    typedef flat_map_index_aux<MapConfig>  index_aux;
    typedef typename index_aux::index_t    base_type;
    typedef typename index_aux::
-      segment_manager_base          segment_manager_base;
+      segment_manager_base                   segment_manager_base;
+   typedef typename base_type::key_type      key_type;
+   typedef typename base_type::mapped_type   mapped_type;
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
    public:
+   using base_type::begin;
+   using base_type::end;
+   using base_type::size;
+   using base_type::erase;
+   using base_type::shrink_to_fit;
+   using base_type::reserve;
+   typedef typename base_type::iterator         iterator;
+   typedef typename base_type::const_iterator   const_iterator;
+   typedef typename base_type::value_type       value_type;
+   typedef typename MapConfig::compare_key_type compare_key_type;
+   typedef iterator                             insert_commit_data;
+   typedef iterator                             index_data_t;
+
    //!Constructor. Takes a pointer to the segment manager. Can throw
    flat_map_index(segment_manager_base *segment_mngr)
       : base_type(typename index_aux::key_less(),
                   typename index_aux::allocator_type(segment_mngr))
    {}
 
-   //!This reserves memory to optimize the insertion of n elements in the index
-   void reserve(typename segment_manager_base::size_type n)
-   {  base_type::reserve(n);  }
+   std::pair<iterator, bool> insert_check
+      (const compare_key_type& key, insert_commit_data&)
+   {
+      std::pair<iterator, bool> r;
+      r.first = this->base_type::find(key_type(key.str(), key.len()));
+      r.second = r.first == this->base_type::end();
+      return r;
+   }
+
+   iterator insert_commit
+      (const compare_key_type &k, void *context, index_data_t&, insert_commit_data& )
+   {
+      //Now commit the insertion using previous context data
+      return this->base_type::insert(value_type(key_type(k.str(), k.len()), mapped_type(context))).first;
+   }
 
-   //!This frees all unnecessary memory
-   void shrink_to_fit()
-   {  base_type::shrink_to_fit();   }
+   iterator find(const compare_key_type& k)
+   {  return this->base_type::find(key_type(k.str(), k.len()));   }
 };
 
 }}   //namespace boost { namespace interprocess
diff --git a/inst/include/boost/interprocess/indexes/iset_index.hpp b/inst/include/boost/interprocess/indexes/iset_index.hpp
index ffaa24fa7..01e682887 100644
--- a/inst/include/boost/interprocess/indexes/iset_index.hpp
+++ b/inst/include/boost/interprocess/indexes/iset_index.hpp
@@ -51,13 +51,48 @@ struct iset_index_aux
       < bi::void_pointer<void_pointer>
       , bi::optimize_size<true>
       >::type                                                  derivation_hook;
-
+   typedef typename MapConfig::char_type                       char_type;
    typedef typename MapConfig::template
       intrusive_value_type<derivation_hook>::type              value_type;
+
+   typedef typename MapConfig::compare_key_type                compare_key_type;
+
+   struct less_function
+   {
+      bool operator()(const compare_key_type&i, const value_type &b) const
+      {
+         std::size_t blen = b.name_length();
+         return (i.m_len < blen) ||
+                  (i.m_len == blen &&
+                  std::char_traits<char_type>::compare
+                     (i.mp_str, b.name(), i.m_len) < 0);
+      }
+
+      bool operator()(const value_type &b, const compare_key_type&i) const
+      {
+         std::size_t blen = b.name_length();
+         return (blen < i.m_len) ||
+                  (blen == i.m_len &&
+                  std::char_traits<char_type>::compare
+                     (b.name(), i.mp_str, i.m_len) < 0);
+      }
+
+      bool operator()(const value_type& a, const value_type& b) const
+      {
+         std::size_t alen = a.name_length();
+         std::size_t blen = b.name_length();
+         return (alen < blen) ||
+            (alen == blen &&
+               std::char_traits<char_type>::compare
+               (a.name(), b.name(), alen) < 0);
+      }
+   };
+
    typedef std::less<value_type>                               value_compare;
    typedef typename bi::make_set
       < value_type
       , bi::base_hook<derivation_hook>
+      , bi::compare<less_function>
       >::type                                                  index_t;
 };
 #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
@@ -68,14 +103,13 @@ struct iset_index_aux
 template <class MapConfig>
 class iset_index
    //Derive class from map specialization
-   :  public iset_index_aux<MapConfig>::index_t
+   :  private iset_index_aux<MapConfig>::index_t
 {
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
    typedef iset_index_aux<MapConfig>                     index_aux;
    typedef typename index_aux::index_t                   index_type;
-   typedef typename MapConfig::
-      intrusive_compare_key_type                         intrusive_compare_key_type;
    typedef typename MapConfig::char_type                 char_type;
+   typedef typename index_aux::less_function             less_function;
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
    public:
@@ -83,35 +117,16 @@ class iset_index
    typedef typename index_type::const_iterator           const_iterator;
    typedef typename index_type::insert_commit_data       insert_commit_data;
    typedef typename index_type::value_type               value_type;
-
-   #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
-   private:
-
-   struct intrusive_key_value_less
-   {
-      bool operator()(const intrusive_compare_key_type &i, const value_type &b) const
-      {
-         std::size_t blen = b.name_length();
-         return (i.m_len < blen) ||
-                  (i.m_len == blen &&
-                  std::char_traits<char_type>::compare
-                     (i.mp_str, b.name(), i.m_len) < 0);
-      }
-
-      bool operator()(const value_type &b, const intrusive_compare_key_type &i) const
-      {
-         std::size_t blen = b.name_length();
-         return (blen < i.m_len) ||
-                  (blen == i.m_len &&
-                  std::char_traits<char_type>::compare
-                     (b.name(), i.mp_str, i.m_len) < 0);
-      }
-   };
-
-   #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+   typedef typename MapConfig::compare_key_type          compare_key_type;
+   typedef value_type                                    index_data_t;
 
    public:
 
+   using index_type::begin;
+   using index_type::end;
+   using index_type::size;
+   using index_type::erase;
+
    //!Constructor. Takes a pointer to the
    //!segment manager. Can throw
    iset_index(typename MapConfig::segment_manager_base *)
@@ -127,15 +142,19 @@ class iset_index
    void shrink_to_fit()
    {  /*Does nothing, this intrusive index does not allocate memory;*/   }
 
-   iterator find(const intrusive_compare_key_type &key)
-   {  return index_type::find(key, intrusive_key_value_less());  }
+   iterator find(const compare_key_type&key)
+   {  return index_type::find(key, less_function());  }
 
-   const_iterator find(const intrusive_compare_key_type &key) const
-   {  return index_type::find(key, intrusive_key_value_less());  }
+   const_iterator find(const compare_key_type&key) const
+   {  return index_type::find(key, less_function());  }
 
    std::pair<iterator, bool>insert_check
-      (const intrusive_compare_key_type &key, insert_commit_data &commit_data)
-   {  return index_type::insert_check(key, intrusive_key_value_less(), commit_data); }
+      (const compare_key_type &key, insert_commit_data &commit_data)
+   {  return index_type::insert_check(key, less_function(), commit_data); }
+
+   iterator insert_commit
+      (const compare_key_type &, void*, index_data_t&v, insert_commit_data& commit_data)
+   {  return index_type::insert_commit(v, commit_data);  }
 };
 
 #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
diff --git a/inst/include/boost/interprocess/indexes/iunordered_set_index.hpp b/inst/include/boost/interprocess/indexes/iunordered_set_index.hpp
index eb4fb970e..fd830d183 100644
--- a/inst/include/boost/interprocess/indexes/iunordered_set_index.hpp
+++ b/inst/include/boost/interprocess/indexes/iunordered_set_index.hpp
@@ -24,12 +24,13 @@
 
 #include <boost/interprocess/detail/utilities.hpp>
 #include <boost/interprocess/allocators/allocator.hpp>
-#include <boost/interprocess/containers/vector.hpp>
+#include <boost/container/vector.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <boost/intrusive/detail/minimal_pair_header.hpp>
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>   //std::less
 #include <boost/container/detail/minimal_char_traits_header.hpp>  //std::char_traits
 #include <boost/container/detail/placement_new.hpp>
+#include <boost/intrusive/detail/hash.hpp>
 
 //!\file
 //!Describes index adaptor of boost::intrusive::unordered_set container, to use it
@@ -57,8 +58,7 @@ struct iunordered_set_index_aux
    typedef typename MapConfig::template
       intrusive_value_type<derivation_hook>::type     value_type;
 
-   typedef typename MapConfig::
-      intrusive_compare_key_type                      intrusive_compare_key_type;
+   typedef typename MapConfig::compare_key_type       compare_key_type;
 
    typedef std::equal_to<value_type>                  value_equal;
 
@@ -66,14 +66,14 @@ struct iunordered_set_index_aux
 
    struct equal_function
    {
-      bool operator()(const intrusive_compare_key_type &i, const value_type &b) const
+      bool operator()(const compare_key_type&i, const value_type &b) const
       {
          return (i.m_len == b.name_length()) &&
                   (std::char_traits<char_type>::compare
                      (i.mp_str, b.name(), i.m_len) == 0);
       }
 
-      bool operator()(const value_type &b, const intrusive_compare_key_type &i) const
+      bool operator()(const value_type &b, const compare_key_type&i) const
       {
          return (i.m_len == b.name_length()) &&
                   (std::char_traits<char_type>::compare
@@ -88,25 +88,35 @@ struct iunordered_set_index_aux
       }
    };
 
-    struct hash_function
-    {
-        typedef value_type argument_type;
-        typedef std::size_t result_type;
-
-        std::size_t operator()(const value_type &val) const
-        {
-            const char_type *beg = ipcdetail::to_raw_pointer(val.name()),
-                            *end = beg + val.name_length();
-            return boost::hash_range(beg, end);
-        }
-
-        std::size_t operator()(const intrusive_compare_key_type &i) const
-        {
-            const char_type *beg = i.mp_str,
-                            *end = beg + i.m_len;
-            return boost::hash_range(beg, end);
-        }
-    };
+   struct hash_function
+   {
+      typedef value_type argument_type;
+      typedef std::size_t result_type;
+
+      std::size_t hash_char_range(const char_type* beg, const char_type* end) const
+      {
+         std::size_t seed = 0;
+         while (beg != end) {
+            boost::intrusive::detail::hash_combine_size_t(seed, boost::intrusive::detail::internal_hash_functor<char_type>()(*beg));
+            ++beg;
+         }
+         return seed;
+      }
+
+      std::size_t operator()(const value_type &val) const
+      {
+         const char_type* beg = ipcdetail::to_raw_pointer(val.name()),
+                        * end = beg + val.name_length();
+         return hash_char_range(beg, end);
+      }
+
+      std::size_t operator()(const compare_key_type&i) const
+      {
+         const char_type *beg = i.mp_str,
+                         *end = beg + i.m_len;
+         return hash_char_range(beg, end);
+      }
+   };
 
    typedef typename bi::make_unordered_set
       < value_type
@@ -136,13 +146,11 @@ template <class MapConfig>
 class iunordered_set_index
       //Derive class from map specialization
    :  private iunordered_set_index_aux<MapConfig>::allocator_holder
-   ,  public iunordered_set_index_aux<MapConfig>::index_t
+   ,  private iunordered_set_index_aux<MapConfig>::index_t
 {
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
    typedef iunordered_set_index_aux<MapConfig>           index_aux;
    typedef typename index_aux::index_t                   index_type;
-   typedef typename MapConfig::
-      intrusive_compare_key_type                         intrusive_compare_key_type;
    typedef typename index_aux::equal_function            equal_function;
    typedef typename index_aux::hash_function             hash_function;
    typedef typename MapConfig::char_type                 char_type;
@@ -150,6 +158,8 @@ class iunordered_set_index
       iunordered_set_index_aux<MapConfig>::allocator_type      allocator_type;
    typedef typename
       iunordered_set_index_aux<MapConfig>::allocator_holder    allocator_holder;
+   public:
+   typedef typename MapConfig::compare_key_type          compare_key_type;
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
    public:
@@ -162,6 +172,7 @@ class iunordered_set_index
    typedef typename index_type::bucket_traits            bucket_traits;
    typedef typename index_type::size_type                size_type;
    typedef typename index_type::difference_type          difference_type;
+   typedef value_type                                    index_data_t;
 
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
    private:
@@ -250,6 +261,11 @@ class iunordered_set_index
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
    public:
+   using index_type::begin;
+   using index_type::end;
+   using index_type::size;
+   using index_type::erase;
+
    //!Constructor. Takes a pointer to the
    //!segment manager. Can throw
    iunordered_set_index(segment_manager_base *mngr)
@@ -277,15 +293,15 @@ class iunordered_set_index
       new_n = index_type::suggested_upper_bucket_count(new_n);
       bucket_ptr new_p;
       //This can throw
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          if(old_p != bucket_ptr(&this->init_bucket))
             new_p = expand_or_create_buckets(old_p, old_n, this->alloc, new_n);
          else
             new_p = create_buckets(this->alloc, new_n);
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          return;
-      } BOOST_CATCH_END
+      } BOOST_INTERPROCESS_CATCH_END
       //Rehashing does not throw, since neither the hash nor the
       //comparison function can throw
       this->rehash(bucket_traits(new_p, new_n));
@@ -313,12 +329,12 @@ class iunordered_set_index
          if(sug_count >= cur_count)
             return;
 
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             shrink_buckets(old_p, cur_count, this->alloc, sug_count);
          }
-         BOOST_CATCH(...){
+         BOOST_INTERPROCESS_CATCH(...){
             return;
-         } BOOST_CATCH_END
+         } BOOST_INTERPROCESS_CATCH_END
 
          //Rehashing does not throw, since neither the hash nor the
          //comparison function can throw
@@ -326,25 +342,26 @@ class iunordered_set_index
       }
    }
 
-   iterator find(const intrusive_compare_key_type &key)
+   iterator find(const compare_key_type&key)
    {  return index_type::find(key, hash_function(), equal_function());  }
 
-   const_iterator find(const intrusive_compare_key_type &key) const
+   const_iterator find(const compare_key_type&key) const
    {  return index_type::find(key, hash_function(), equal_function());  }
 
    std::pair<iterator, bool>insert_check
-      (const intrusive_compare_key_type &key, insert_commit_data &commit_data)
+      (const compare_key_type&key, insert_commit_data &commit_data)
    {  return index_type::insert_check(key, hash_function(), equal_function(), commit_data); }
 
-   iterator insert_commit(value_type &val, insert_commit_data &commit_data)
+   iterator insert_commit
+      (const compare_key_type &, void *, index_data_t &val, insert_commit_data& commit_data)
    {
       iterator it = index_type::insert_commit(val, commit_data);
       size_type cur_size      = this->size();
       if(cur_size > this->bucket_count()){
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             this->reserve(cur_size);
          }
-         BOOST_CATCH(...){
+         BOOST_INTERPROCESS_CATCH(...){
             //Strong guarantee: if something goes wrong
             //we should remove the insertion.
             //
@@ -353,8 +370,8 @@ class iunordered_set_index
             //throw only because of the memory allocation:
             //the iterator has not been invalidated.
             index_type::erase(it);
-            BOOST_RETHROW
-         } BOOST_CATCH_END
+            BOOST_INTERPROCESS_RETHROW
+         } BOOST_INTERPROCESS_CATCH_END
       }
       return it;
    }
diff --git a/inst/include/boost/interprocess/indexes/map_index.hpp b/inst/include/boost/interprocess/indexes/map_index.hpp
index c7c3c865d..7a82457d6 100644
--- a/inst/include/boost/interprocess/indexes/map_index.hpp
+++ b/inst/include/boost/interprocess/indexes/map_index.hpp
@@ -23,7 +23,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 #include <boost/intrusive/detail/minimal_pair_header.hpp>
-#include <boost/interprocess/containers/map.hpp>
+#include <boost/container/map.hpp>
 #include <boost/interprocess/allocators/private_adaptive_pool.hpp>
 #include <boost/intrusive/detail/minimal_pair_header.hpp>         //std::pair
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>   //std::less
@@ -50,7 +50,7 @@ struct map_index_aux
                typename MapConfig::
          segment_manager_base>                     allocator_type;
 
-   typedef boost::interprocess::map
+   typedef boost::container::map
       <key_type,  mapped_type,
        key_less, allocator_type>                   index_t;
 };
@@ -62,16 +62,30 @@ struct map_index_aux
 template <class MapConfig>
 class map_index
    //Derive class from map specialization
-   : public ipcdetail::map_index_aux<MapConfig>::index_t
+   : private ipcdetail::map_index_aux<MapConfig>::index_t
 {
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
-   typedef ipcdetail::map_index_aux<MapConfig>  index_aux;
-   typedef typename index_aux::index_t       base_type;
+   typedef ipcdetail::map_index_aux<MapConfig>     index_aux;
+   typedef typename index_aux::index_t             base_type;
    typedef typename MapConfig::
-      segment_manager_base          segment_manager_base;
+      segment_manager_base                         segment_manager_base;
+   typedef typename base_type::key_type            key_type;
+   typedef typename base_type::mapped_type         mapped_type;
+
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
    public:
+   using base_type::begin;
+   using base_type::end;
+   using base_type::size;
+   using base_type::erase;
+   typedef typename base_type::iterator         iterator;
+   typedef typename base_type::const_iterator   const_iterator;
+   typedef typename base_type::value_type       value_type;
+   typedef typename MapConfig::compare_key_type compare_key_type;
+   typedef iterator                             insert_commit_data;
+   typedef iterator                             index_data_t;
+
    //!Constructor. Takes a pointer to the
    //!segment manager. Can throw
    map_index(segment_manager_base *segment_mngr)
@@ -87,6 +101,26 @@ class map_index
    //!unused memory.
    void shrink_to_fit()
    {  base_type::get_stored_allocator().deallocate_free_blocks(); }
+
+   std::pair<iterator, bool> insert_check
+      (const compare_key_type& key, insert_commit_data& )
+   {
+      std::pair<iterator, bool> r;
+      r.first = this->base_type::find(key_type(key.str(), key.len()));
+      r.second = r.first == this->base_type::end();
+      return r;
+   }
+
+   iterator insert_commit
+      (const compare_key_type &k, void *context, index_data_t &index_data, insert_commit_data& )
+   {
+      //Now commit the insertion using previous context data
+      iterator it = this->base_type::insert(value_type(key_type(k.str(), k.len()), mapped_type(context))).first;
+      return (index_data = it);
+   }
+
+   iterator find(const compare_key_type& k)
+   {  return this->base_type::find(key_type(k.str(), k.len()));   }
 };
 
 #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
diff --git a/inst/include/boost/interprocess/indexes/unordered_map_index.hpp b/inst/include/boost/interprocess/indexes/unordered_map_index.hpp
deleted file mode 100644
index ac009f0ad..000000000
--- a/inst/include/boost/interprocess/indexes/unordered_map_index.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Ion Gaztanaga 2005-2012. Distributed under the Boost
-// Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/interprocess for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef BOOST_INTERPROCESS_UNORDERED_MAP_INDEX_HPP
-#define BOOST_INTERPROCESS_UNORDERED_MAP_INDEX_HPP
-
-#ifndef BOOST_CONFIG_HPP
-#  include <boost/config.hpp>
-#endif
-#
-#if defined(BOOST_HAS_PRAGMA_ONCE)
-#  pragma once
-#endif
-
-#include <boost/interprocess/detail/config_begin.hpp>
-#include <boost/interprocess/detail/workaround.hpp>
-
-#include <boost/intrusive/detail/minimal_pair_header.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/interprocess/detail/utilities.hpp>
-#include <boost/interprocess/allocators/private_adaptive_pool.hpp>
-
-#include <boost/intrusive/detail/minimal_pair_header.hpp>         //std::pair
-#include <boost/intrusive/detail/minimal_less_equal_header.hpp>   //std::less
-
-//!\file
-//!Describes index adaptor of boost::unordered_map container, to use it
-//!as name/shared memory index
-
-namespace boost {
-namespace interprocess {
-
-#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
-
-//!Helper class to define typedefs from
-//!IndexTraits
-template <class MapConfig>
-struct unordered_map_index_aux
-{
-   typedef typename MapConfig::key_type            key_type;
-   typedef typename MapConfig::mapped_type         mapped_type;
-   typedef std::equal_to<key_type>                 key_equal;
-   typedef std::pair<const key_type, mapped_type>  value_type;
-   typedef private_adaptive_pool
-            <value_type,
-               typename MapConfig::
-                  segment_manager_base>      allocator_type;
-    struct hasher
-    {
-        typedef key_type argument_type;
-        typedef std::size_t result_type;
-
-        std::size_t operator()(const key_type &val) const
-        {
-            typedef typename key_type::char_type    char_type;
-            const char_type *beg = ipcdetail::to_raw_pointer(val.mp_str),
-                            *end = beg + val.m_len;
-            return boost::hash_range(beg, end);
-        }
-    };
-   typedef unordered_map<key_type,  mapped_type, hasher,
-                         key_equal, allocator_type>      index_t;
-};
-
-#endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
-
-//!Index type based in unordered_map. Just derives from unordered_map and
-//!defines the interface needed by managed memory segments
-template <class MapConfig>
-class unordered_map_index
-   //Derive class from unordered_map specialization
-   : public unordered_map_index_aux<MapConfig>::index_t
-{
-   #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
-   typedef unordered_map_index_aux<MapConfig>   index_aux;
-   typedef typename index_aux::index_t          base_type;
-   typedef typename
-      MapConfig::segment_manager_base     segment_manager_base;
-   #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
-
-   public:
-   //!Constructor. Takes a pointer to the
-   //!segment manager. Can throw
-   unordered_map_index(segment_manager_base *segment_mngr)
-      : base_type(0,
-                  typename index_aux::hasher(),
-                  typename index_aux::key_equal(),
-                  segment_mngr){}
-
-   //!This reserves memory to optimize the insertion of n
-   //!elements in the index
-   void reserve(typename segment_manager_base::size_type n)
-   {  base_type::rehash(n);  }
-
-   //!This tries to free previously allocate
-   //!unused memory.
-   void shrink_to_fit()
-   {  base_type::rehash(base_type::size()); }
-};
-
-#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
-
-//!Trait class to detect if an index is a node
-//!index. This allows more efficient operations
-//!when deallocating named objects.
-template<class MapConfig>
-struct is_node_index
-   <boost::interprocess::unordered_map_index<MapConfig> >
-{
-   static const bool value = true;
-};
-#endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
-
-}}   //namespace boost { namespace interprocess {
-
-#include <boost/interprocess/detail/config_end.hpp>
-
-#endif   //#ifndef BOOST_INTERPROCESS_UNORDERED_MAP_INDEX_HPP
diff --git a/inst/include/boost/interprocess/interprocess_printers.hpp b/inst/include/boost/interprocess/interprocess_printers.hpp
new file mode 100644
index 000000000..112bc14b5
--- /dev/null
+++ b/inst/include/boost/interprocess/interprocess_printers.hpp
@@ -0,0 +1,66 @@
+// Copyright 2024 Braden Ganetsky
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+// Generated on 2024-08-16T22:13:13
+
+#ifndef BOOST_INTERPROCESS_INTERPROCESS_PRINTERS_HPP
+#define BOOST_INTERPROCESS_INTERPROCESS_PRINTERS_HPP
+
+#ifndef BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS
+#if defined(__ELF__)
+#ifdef __clang__
+#pragma clang diagnostic push
+//#pragma clang diagnostic ignored "-Woverlength-strings"
+#endif
+__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+        ".ascii \"\\4gdb.inlined-script.BOOST_INTERPROCESS_INTERPROCESS_PRINTERS_HPP\\n\"\n"
+        ".ascii \"import gdb.printing\\n\"\n"
+
+        ".ascii \"class BoostInterprocessOffsetPtrPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = val\\n\"\n"
+
+        ".ascii \"    def to_string(self):\\n\"\n"
+        ".ascii \"        return f\\\"{BoostInterprocessOffsetPtrPrinter.get(self.val)}\\\"\\n\"\n"
+
+        ".ascii \"    # This is a simplified and inlined version of `offset_ptr::get()`\\n\"\n"
+        ".ascii \"    def get(offset_ptr):\\n\"\n"
+        ".ascii \"        offset = offset_ptr[\\\"internal\\\"][\\\"m_offset\\\"]\\n\"\n"
+        ".ascii \"        pointer = offset_ptr.type.template_argument(0).pointer()\\n\"\n"
+        ".ascii \"        if offset == 1:\\n\"\n"
+        ".ascii \"            return gdb.Value(0).cast(pointer) # nullptr\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            unsigned_char_pointer = gdb.lookup_type(\\\"unsigned char\\\").pointer()\\n\"\n"
+        ".ascii \"            this = offset_ptr.address\\n\"\n"
+        ".ascii \"            return (this.cast(unsigned_char_pointer) + offset).cast(pointer)\\n\"\n"
+
+        ".ascii \"    def boost_to_address(offset_ptr):\\n\"\n"
+        ".ascii \"        return BoostInterprocessOffsetPtrPrinter.get(offset_ptr)\\n\"\n"
+
+        ".ascii \"    # This is a simplified and inlined version of `offset_ptr::operator+=()`\\n\"\n"
+        ".ascii \"    def boost_next(raw_ptr, offset):\\n\"\n"
+        ".ascii \"        unsigned_char_pointer = gdb.lookup_type(\\\"unsigned char\\\").pointer()\\n\"\n"
+        ".ascii \"        pointer = raw_ptr.type\\n\"\n"
+        ".ascii \"        aa = raw_ptr.cast(unsigned_char_pointer)\\n\"\n"
+        ".ascii \"        bb = offset * pointer.target().sizeof\\n\"\n"
+        ".ascii \"        return (aa + bb).cast(pointer)\\n\"\n"
+
+        ".ascii \"def boost_interprocess_build_pretty_printer():\\n\"\n"
+        ".ascii \"    pp = gdb.printing.RegexpCollectionPrettyPrinter(\\\"boost_interprocess\\\")\\n\"\n"
+
+        ".ascii \"    pp.add_printer(\\\"boost::interprocess::offset_ptr\\\", \\\"^boost::interprocess::offset_ptr<.*>$\\\", BoostInterprocessOffsetPtrPrinter)\\n\"\n"
+
+        ".ascii \"    return pp\\n\"\n"
+
+        ".ascii \"gdb.printing.register_pretty_printer(gdb.current_objfile(), boost_interprocess_build_pretty_printer())\\n\"\n"
+
+        ".byte 0\n"
+        ".popsection\n");
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+#endif // defined(__ELF__)
+#endif // !defined(BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS)
+
+#endif // !defined(BOOST_INTERPROCESS_INTERPROCESS_PRINTERS_HPP)
diff --git a/inst/include/boost/interprocess/ipc/message_queue.hpp b/inst/include/boost/interprocess/ipc/message_queue.hpp
index 4ef267824..8a57037c6 100644
--- a/inst/include/boost/interprocess/ipc/message_queue.hpp
+++ b/inst/include/boost/interprocess/ipc/message_queue.hpp
@@ -28,12 +28,11 @@
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 #include <boost/interprocess/detail/utilities.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/offset_ptr.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/permissions.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include <boost/move/detail/type_traits.hpp> //make_unsigned, alignment_of
@@ -143,6 +142,12 @@ class message_queue_t
 
    #endif //defined(BOOST_INTERPROCESS_WCHAR_NAMED_RESOURCES) || defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
 
+   //!Creates a process shared message queue in anonymous memory. For this message queue,
+   //!the maximum number of messages will be "max_num_msg" and the maximum message size
+   //!will be "max_msg_size". Throws on error.
+   message_queue_t(size_type max_num_msg,
+                 size_type max_msg_size);
+
    //!Destroys *this and indicates that the calling process is finished using
    //!the resource. All opened message queues are still
    //!valid after destruction. The destructor function will deallocate
@@ -679,12 +684,12 @@ class msg_queue_initialization_func_t
       if(created){
          mptr     = reinterpret_cast<char*>(address);
          //Construct the message queue header at the beginning
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             new (mptr) mq_hdr_t<VoidPointer>(m_maxmsg, m_maxmsgsize);
          }
-         BOOST_CATCH(...){
+         BOOST_INTERPROCESS_CATCH(...){
             return false;
-         } BOOST_CATCH_END
+         } BOOST_INTERPROCESS_CATCH_END
       }
       return true;
    }
@@ -804,6 +809,15 @@ inline message_queue_t<VoidPointer>::message_queue_t(open_only_t, const wchar_t
 
 #endif //defined(BOOST_INTERPROCESS_WCHAR_NAMED_RESOURCES) || defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
 
+template <class VoidPointer>
+inline message_queue_t<VoidPointer>::message_queue_t(size_type max_num_msg,
+                                    size_type max_msg_size)
+   :  m_shmem(get_mem_size(max_msg_size, max_num_msg),
+            static_cast<void*>(0),
+            //Prepare initialization functor
+            ipcdetail::msg_queue_initialization_func_t<VoidPointer> (max_num_msg, max_msg_size))
+{}
+
 template<class VoidPointer>
 inline void message_queue_t<VoidPointer>::send
    (const void *buffer, size_type buffer_size, unsigned int priority)
@@ -848,7 +862,7 @@ inline bool message_queue_t<VoidPointer>::do_send(
    {
       //If the queue is full execute blocking logic
       if (p_hdr->is_full()) {
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             #ifdef BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX
             ++p_hdr->m_blocked_senders;
             #endif
@@ -888,12 +902,12 @@ inline bool message_queue_t<VoidPointer>::do_send(
             --p_hdr->m_blocked_senders;
             #endif
          }
-         BOOST_CATCH(...){
+         BOOST_INTERPROCESS_CATCH(...){
             #ifdef BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX
             --p_hdr->m_blocked_senders;
             #endif
-            BOOST_RETHROW;
-         } BOOST_CATCH_END
+            BOOST_INTERPROCESS_RETHROW;
+         } BOOST_INTERPROCESS_CATCH_END
       }
 
       #if defined(BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX)
@@ -976,7 +990,7 @@ inline bool
    {
       //If there are no messages execute blocking logic
       if (p_hdr->is_empty()) {
-         BOOST_TRY{
+         BOOST_INTERPROCESS_TRY{
             #if defined(BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX)
             ++p_hdr->m_blocked_receivers;
             #endif
@@ -1018,12 +1032,12 @@ inline bool
             --p_hdr->m_blocked_receivers;
             #endif
          }
-         BOOST_CATCH(...){
+         BOOST_INTERPROCESS_CATCH(...){
             #if defined(BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX)
             --p_hdr->m_blocked_receivers;
             #endif
-            BOOST_RETHROW;
-         } BOOST_CATCH_END
+            BOOST_INTERPROCESS_RETHROW;
+         } BOOST_INTERPROCESS_CATCH_END
       }
 
       #ifdef BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX
diff --git a/inst/include/boost/interprocess/managed_external_buffer.hpp b/inst/include/boost/interprocess/managed_external_buffer.hpp
index 0cf2d4d2b..9bff3fb7e 100644
--- a/inst/include/boost/interprocess/managed_external_buffer.hpp
+++ b/inst/include/boost/interprocess/managed_external_buffer.hpp
@@ -105,6 +105,8 @@ class basic_managed_external_buffer
       return *this;
    }
 
+   //!Tries to resize internal heap memory so that
+   //!we have room for more objects.
    void grow(size_type extra_bytes)
    {  base_t::grow(extra_bytes);   }
 
diff --git a/inst/include/boost/interprocess/managed_heap_memory.hpp b/inst/include/boost/interprocess/managed_heap_memory.hpp
index 52b917acb..4f26cc59a 100644
--- a/inst/include/boost/interprocess/managed_heap_memory.hpp
+++ b/inst/include/boost/interprocess/managed_heap_memory.hpp
@@ -25,7 +25,6 @@
 #include <boost/move/utility_core.hpp>
 #include <vector>
 #include <boost/interprocess/detail/managed_memory_impl.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 //These includes needed to fulfill default template parameters of
 //predeclarations in interprocess_fwd.hpp
 #include <boost/interprocess/mem_algo/rbtree_best_fit.hpp>
@@ -107,13 +106,13 @@ class basic_managed_heap_memory
    {
       //If memory is reallocated, data will
       //be automatically copied
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
         m_heapmem.resize(m_heapmem.size()+extra_bytes);
       }
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          return false;
       }
-      BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH_END
 
       //Grow always works
       base_t::close_impl();
diff --git a/inst/include/boost/interprocess/managed_mapped_file.hpp b/inst/include/boost/interprocess/managed_mapped_file.hpp
index daca6adaa..3c4570c83 100644
--- a/inst/include/boost/interprocess/managed_mapped_file.hpp
+++ b/inst/include/boost/interprocess/managed_mapped_file.hpp
@@ -273,6 +273,9 @@ class basic_managed_mapped_file
    //!
    //!This function is not synchronized so no other thread or process should
    //!be reading or writing the file
+   //!
+   //!Since the memory will be remapped after the underlying file
+   //!is grown, it can't work with segments using raw pointers.
    static bool grow(const char *filename, size_type extra_bytes)
    {
       return base_t::template grow
diff --git a/inst/include/boost/interprocess/managed_shared_memory.hpp b/inst/include/boost/interprocess/managed_shared_memory.hpp
index 4e77c2a01..284deccd2 100644
--- a/inst/include/boost/interprocess/managed_shared_memory.hpp
+++ b/inst/include/boost/interprocess/managed_shared_memory.hpp
@@ -276,6 +276,9 @@ class basic_managed_shared_memory
    //!
    //!This function is not synchronized so no other thread or process should
    //!be reading or writing the file
+   //!
+   //!Since the memory will be remapped after the underlying shared memory
+   //!is grown, it can't work with segments using raw pointers.
    static bool grow(const char *shmname, size_type extra_bytes)
    {
       return base_t::template grow
diff --git a/inst/include/boost/interprocess/mapped_region.hpp b/inst/include/boost/interprocess/mapped_region.hpp
index 1ef284522..a76e0c43f 100644
--- a/inst/include/boost/interprocess/mapped_region.hpp
+++ b/inst/include/boost/interprocess/mapped_region.hpp
@@ -477,7 +477,7 @@ inline mapped_region::mapped_region
                                  (native_mapping_handle,
                                  map_access,
                                  ::boost::ulong_long_type(offset - page_offset),
-                                 static_cast<std::size_t>(page_offset + size),
+                                 static_cast<std::size_t>(page_offset) + size,
                                  const_cast<void*>(address));
       //Check error
       if(!base){
@@ -807,10 +807,19 @@ inline bool mapped_region::advise(advice_types advice)
       default:
       return false;
    }
+   int ret = -1;
    switch(mode){
       #if defined(POSIX_MADV_NORMAL)
          case mode_padv:
-         return 0 == posix_madvise(this->priv_map_address(), this->priv_map_size(), unix_advice);
+         {
+         ret = posix_madvise(this->priv_map_address(), this->priv_map_size(), unix_advice);
+         #ifdef __CYGWIN__
+         //Cygwin returns EINVAL in some valid use cases due to DiscardVirtualMemory limitations
+         if (ret == EINVAL)
+            ret = 0;
+         #endif
+         return 0 == ret;
+         }
       #endif
       #if defined(MADV_NORMAL)
          case mode_madv:
@@ -822,7 +831,6 @@ inline bool mapped_region::advise(advice_types advice)
       #endif
       default:
       return false;
-
    }
 }
 
diff --git a/inst/include/boost/interprocess/mem_algo/detail/mem_algo_common.hpp b/inst/include/boost/interprocess/mem_algo/detail/mem_algo_common.hpp
index c036ce949..d9289263e 100644
--- a/inst/include/boost/interprocess/mem_algo/detail/mem_algo_common.hpp
+++ b/inst/include/boost/interprocess/mem_algo/detail/mem_algo_common.hpp
@@ -38,7 +38,6 @@
 // move/detail
 #include <boost/move/detail/force_ptr.hpp>
 // other boost
-#include <boost/static_assert.hpp>
 #include <boost/assert.hpp>
 
 //!\file
@@ -78,7 +77,6 @@ class basic_multiallocation_chain
    }
 };
 
-
 //!This class implements several allocation functions shared by different algorithms
 //!(aligned allocation, multiple allocation...).
 template<class MemoryAlgorithm>
@@ -92,7 +90,6 @@ class memory_algorithm_common
    typedef typename MemoryAlgorithm::size_type                 size_type;
 
    static const size_type Alignment              = MemoryAlgorithm::Alignment;
-   static const size_type MinBlockUnits          = MemoryAlgorithm::MinBlockUnits;
    static const size_type AllocatedCtrlBytes     = MemoryAlgorithm::AllocatedCtrlBytes;
    static const size_type AllocatedCtrlUnits     = MemoryAlgorithm::AllocatedCtrlUnits;
    static const size_type BlockCtrlBytes         = MemoryAlgorithm::BlockCtrlBytes;
@@ -117,6 +114,13 @@ class memory_algorithm_common
    static size_type floor_units(size_type size)
    {  return size/Alignment;  }
 
+   static size_type user_buffer_ceil_units(size_type size)
+   {
+      if(size <= UsableByPreviousChunk)
+         return 0;
+      return ceil_units(size - UsableByPreviousChunk);
+   }
+
    static size_type multiple_of_units(size_type size)
    {  return get_rounded_size(size, Alignment);  }
 
@@ -237,133 +241,153 @@ class memory_algorithm_common
    }
 
    static void* allocate_aligned
-      (MemoryAlgorithm *memory_algo, size_type nbytes, size_type alignment)
+      (MemoryAlgorithm * const memory_algo, const size_type nbytes, const size_type alignment)
    {
 
       //Ensure power of 2
-      if ((alignment & (alignment - size_type(1u))) != 0){
+      const bool alignment_ok = (alignment & (alignment - 1u)) == 0;
+      if (!alignment_ok){
          //Alignment is not power of two
-         BOOST_ASSERT((alignment & (alignment - size_type(1u))) == 0);
+         BOOST_ASSERT(alignment_ok);
          return 0;
       }
 
-      size_type real_size = nbytes;
       if(alignment <= Alignment){
+         size_type real_size = nbytes;
          void *ignore_reuse = 0;
          return memory_algo->priv_allocate
             (boost::interprocess::allocate_new, nbytes, real_size, ignore_reuse);
       }
 
-      if(nbytes > UsableByPreviousChunk)
-         nbytes -= UsableByPreviousChunk;
-
-      //We can find a aligned portion if we allocate a block that has alignment
-      //nbytes + alignment bytes or more.
-      size_type minimum_allocation = max_value
-         (nbytes + alignment, size_type(MinBlockUnits*Alignment));
-      //Since we will split that block, we must request a bit more memory
-      //if the alignment is near the beginning of the buffer, because otherwise,
-      //there is no space for a new block before the alignment.
-      //
-      //            ____ Aligned here
-      //           |
-      //  -----------------------------------------------------
-      // | MBU |
-      //  -----------------------------------------------------
-      size_type request =
-         minimum_allocation + (2*MinBlockUnits*Alignment - AllocatedCtrlBytes
-         //prevsize - UsableByPreviousChunk
-         );
+      //To fulfill user's request we need at least min_user_units
+      size_type needed_units = user_buffer_ceil_units(nbytes);
+      //However, there is a minimum allocation unit count (BlockCtrlUnits) to be able to deallocate the buffer,
+      //The allocation will give us a part of it (AllocatedCtrlUnits) so (BlockCtrlUnits - AllocatedCtrlUnits)
+      //is the minimum ammount of blocks we need to allocate.
+      needed_units += max_value(needed_units, BlockCtrlUnits - AllocatedCtrlUnits);
+      //If we need to align, we need to at least move enough to create a new block at the beginning
+      //that can be marked as free, so we need BlockCtrlUnits units for that
+      needed_units += BlockCtrlUnits;
+      //Finally, we need to add extra space to be sure we will find an aligned address
+      needed_units += (alignment - Alignment)/Alignment;
+
+      //Transform units to bytes
+      const size_type request = needed_units*Alignment + UsableByPreviousChunk;
 
       //Now allocate the buffer
-      real_size = request;
+      size_type real_size = request;
       void *ignore_reuse = 0;
-      void *buffer = memory_algo->priv_allocate(boost::interprocess::allocate_new, request, real_size, ignore_reuse);
+      void *const buffer = memory_algo->priv_allocate(boost::interprocess::allocate_new, request, real_size, ignore_reuse);
       if(!buffer){
          return 0;
       }
-      else if ((((std::size_t)(buffer)) % alignment) == 0){
+      else if ((((std::size_t)(buffer)) & (alignment-1)) == 0){
          //If we are lucky and the buffer is aligned, just split it and
          //return the high part
-         block_ctrl *first  = memory_algo->priv_get_block(buffer);
-         size_type old_size = first->m_size;
+         block_ctrl *const first  = memory_algo->priv_get_block(buffer);
+         const size_type orig_first_units = first->m_size;
          const size_type first_min_units =
-            max_value(ceil_units(nbytes) + AllocatedCtrlUnits, size_type(MinBlockUnits));
+            max_value(user_buffer_ceil_units(nbytes) + AllocatedCtrlUnits, size_type(BlockCtrlUnits));
          //We can create a new block in the end of the segment
-         if(old_size >= (first_min_units + MinBlockUnits)){
+         if(orig_first_units >= (first_min_units + BlockCtrlUnits)){
             block_ctrl *second =  move_detail::force_ptr<block_ctrl*>
                (reinterpret_cast<char*>(first) + Alignment*first_min_units);
+            //Update first size
             first->m_size  = first_min_units & block_ctrl::size_mask;
-            second->m_size = (old_size - first->m_size) & block_ctrl::size_mask;
-            BOOST_ASSERT(second->m_size >= MinBlockUnits);
             memory_algo->priv_mark_new_allocated_block(first);
+
+            //Deallocate the remaining memory
+            second->m_size = (orig_first_units - first_min_units) & block_ctrl::size_mask;
             memory_algo->priv_mark_new_allocated_block(second);
             memory_algo->priv_deallocate(memory_algo->priv_get_user_buffer(second));
          }
          return buffer;
       }
 
-      //Buffer not aligned, find the aligned part.
+      //Now obtain the address of the allocated block
+      block_ctrl* const first = memory_algo->priv_get_block(buffer);
+      //The block must be marked as allocated
+      BOOST_ASSERT(memory_algo->priv_is_allocated_block(first));
+      //Assert allocated block has at least the desired size
+      BOOST_ASSERT(first->m_size >= (needed_units + AllocatedCtrlUnits));
+      //Assert allocated block can be splitted in the two blocks
+      BOOST_ASSERT(first->m_size >= 2 * BlockCtrlUnits);
+
+      //Buffer is not overaligned, so find the aligned part
+
+      // BCB: BlockControlBytes
+      // ACB: AllocatedControlBytes (<= BlockControlBytes)
       //
-      //                    ____ Aligned here
-      //                   |
+      //  __________> Block control ("first")
+      // |           _________> Block control ("second")
+      // |          |      ___> usr_buf, overaligned
+      // |          |     |
       //  -----------------------------------------------------
-      // | MBU +more | ACB |
+      // | BCB+more | ACB |
       //  -----------------------------------------------------
-      char *pos = reinterpret_cast<char*>
-         (reinterpret_cast<std::size_t>(static_cast<char*>(buffer) +
-            //This is the minimum size of (2)
-            (MinBlockUnits*Alignment - AllocatedCtrlBytes) +
-            //This is the next MBU for the aligned memory
-            AllocatedCtrlBytes +
-            //This is the alignment trick
-            alignment - 1) & -alignment);
-
-      //Now obtain the address of the blocks
-      block_ctrl *first  = memory_algo->priv_get_block(buffer);
-      block_ctrl *second = memory_algo->priv_get_block(pos);
-      BOOST_ASSERT(pos <= (reinterpret_cast<char*>(first) + first->m_size*Alignment));
-      BOOST_ASSERT(first->m_size >= 2*MinBlockUnits);
-      BOOST_ASSERT((pos + MinBlockUnits*Alignment - AllocatedCtrlBytes + nbytes*Alignment/Alignment) <=
-             (reinterpret_cast<char*>(first) + first->m_size*Alignment));
-      //Set the new size of the first block
-      size_type old_size = first->m_size;
-      first->m_size = size_type(size_type(reinterpret_cast<char*>(second) - reinterpret_cast<char*>(first))/Alignment
-                        & block_ctrl::size_mask);
-      memory_algo->priv_mark_new_allocated_block(first);
+      char *const usr_buf = reinterpret_cast<char*>
+         (reinterpret_cast<std::size_t>(static_cast<char*>(buffer)
+            + BlockCtrlBytes                 //Minimum to create a free block at the beginning
+            + alignment - 1) & -alignment);  //This is the alignment trick
+
+      //Assert the user buffer is inside the allocated range
+      BOOST_ASSERT(usr_buf <= (reinterpret_cast<char*>(first) + first->m_size*Alignment));
+      //Assert all user data is inside the allocated range
+      BOOST_ASSERT((usr_buf + nbytes) <= (reinterpret_cast<char*>(first) + first->m_size*Alignment + UsableByPreviousChunk));
+
+      //Set the new size of the secone block
+      const size_type orig_first_units = first->m_size;
+
+      block_ctrl* const second = memory_algo->priv_get_block(usr_buf);
+
+      //Update first block size until second block starts and deallocate it
+      const size_type final_first_units =
+         size_type(reinterpret_cast<char*>(second) - reinterpret_cast<char*>(first))/Alignment & block_ctrl::size_mask;
 
       //Now check if we can create a new buffer in the end
       //
-      //              __"second" block
-      //             |      __Aligned here
-      //             |     |      __"third" block
-      //  -----------|-----|-----|------------------------------
-      // | MBU +more | ACB | (3) | BCU |
+      //  _______________________> "first" (free block)
+      // |           ____________> "second" block
+      // |          |      ______> user data aligned here (usr_buf)
+      // |          |     |            ____> optional "third" (free block)
+      //  ----------|-----|-----------|------------------------------
+      // | BCB+more | ACB | user_data | BCB |
       //  -----------------------------------------------------
       //This size will be the minimum size to be able to create a
       //new block in the end.
-      const size_type second_min_units = max_value(size_type(MinBlockUnits),
-                        ceil_units(nbytes) + AllocatedCtrlUnits );
+      const size_type orig_second_units = orig_first_units - final_first_units;
+      const size_type second_min_units = max_value( size_type(BlockCtrlUnits)
+                                                  , user_buffer_ceil_units(nbytes) + AllocatedCtrlUnits );
 
-      //Check if we can create a new block (of size MinBlockUnits) in the end of the segment
-      if((old_size - first->m_size) >= (second_min_units + MinBlockUnits)){
+      //Check if we can create a new free block (of size BlockCtrlUnits) at the end of the segment
+      if(orig_second_units >= (second_min_units + BlockCtrlUnits)){
          //Now obtain the address of the end block
-         block_ctrl *third = new (reinterpret_cast<char*>(second) + Alignment*second_min_units)block_ctrl;
+         block_ctrl *const third = ::new (reinterpret_cast<char*>(second) + Alignment*second_min_units, boost_container_new_t()) block_ctrl;
          second->m_size = second_min_units & block_ctrl::size_mask;
-         third->m_size  = (old_size - first->m_size - second->m_size) & block_ctrl::size_mask;
-         BOOST_ASSERT(third->m_size >= MinBlockUnits);
+         third->m_size  = (orig_second_units - second->m_size) & block_ctrl::size_mask;
+         BOOST_ASSERT(third->m_size >= BlockCtrlUnits);
          memory_algo->priv_mark_new_allocated_block(second);
          memory_algo->priv_mark_new_allocated_block(third);
+         //We can deallocate third block because the previous "second" is properly set
          memory_algo->priv_deallocate(memory_algo->priv_get_user_buffer(third));
       }
       else{
-         second->m_size = (old_size - first->m_size) & block_ctrl::size_mask;
-         BOOST_ASSERT(second->m_size >= MinBlockUnits);
+         second->m_size = orig_second_units & block_ctrl::size_mask;
+         BOOST_ASSERT(second->m_size >= BlockCtrlUnits);
          memory_algo->priv_mark_new_allocated_block(second);
       }
 
+      //We can deallocate first block because the next "second" is properly set
+      first->m_size = final_first_units & block_ctrl::size_mask;
+      //Now mark second's previous allocated flag as allocated
+      memory_algo->priv_mark_new_allocated_block(first);
       memory_algo->priv_deallocate(memory_algo->priv_get_user_buffer(first));
-      return memory_algo->priv_get_user_buffer(second);
+
+      //Make sure all user data fits
+      BOOST_ASSERT((reinterpret_cast<char*>(usr_buf) + nbytes) <= (reinterpret_cast<char*>(second) + second->m_size*Alignment + UsableByPreviousChunk));
+      //Make sure user data is properly aligned
+      BOOST_ASSERT(0 == ((std::size_t)usr_buf & (alignment-1u)));
+      return usr_buf;
    }
 
    static bool try_shrink
diff --git a/inst/include/boost/interprocess/mem_algo/detail/simple_seq_fit_impl.hpp b/inst/include/boost/interprocess/mem_algo/detail/simple_seq_fit_impl.hpp
index 2c909acfe..0fa58611e 100644
--- a/inst/include/boost/interprocess/mem_algo/detail/simple_seq_fit_impl.hpp
+++ b/inst/include/boost/interprocess/mem_algo/detail/simple_seq_fit_impl.hpp
@@ -146,7 +146,15 @@ class simple_seq_fit_impl
 
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
 
+   template<class T>
+   T *allocation_command  (boost::interprocess::allocation_type command,   size_type limit_size,
+                           size_type &prefer_in_recvd_out_size, T *&reuse);
+
+   void * raw_allocation_command  (boost::interprocess::allocation_type command,   size_type limit_size,
+                               size_type &prefer_in_recvd_out_size, void *&reuse_ptr, size_type sizeof_object = 1);
+
    //!Multiple element allocation, same size
+   //!Experimental. Dont' use
    void allocate_many(size_type elem_bytes, size_type num_elements, multiallocation_chain &chain)
    {
       //-----------------------
@@ -156,6 +164,7 @@ class simple_seq_fit_impl
    }
 
    //!Multiple element allocation, different size
+   //!Experimental. Dont' use
    void allocate_many(const size_type *elem_sizes, size_type n_elements, size_type sizeof_element, multiallocation_chain &chain)
    {
       //-----------------------
@@ -165,6 +174,7 @@ class simple_seq_fit_impl
    }
 
    //!Multiple element deallocation
+   //!Experimental. Dont' use
    void deallocate_many(multiallocation_chain &chain);
 
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
@@ -194,13 +204,6 @@ class simple_seq_fit_impl
    //!This function is normally used for security reasons.
    void zero_free_memory();
 
-   template<class T>
-   T *allocation_command  (boost::interprocess::allocation_type command,   size_type limit_size,
-                           size_type &prefer_in_recvd_out_size, T *&reuse);
-
-   void * raw_allocation_command  (boost::interprocess::allocation_type command,   size_type limit_size,
-                               size_type &prefer_in_recvd_out_size, void *&reuse_ptr, size_type sizeof_object = 1);
-
    //!Returns the size of the buffer previously allocated pointed by ptr
    size_type size(const void *ptr) const;
 
@@ -277,8 +280,6 @@ class simple_seq_fit_impl
    private:
    static const size_type BlockCtrlBytes = ipcdetail::ct_rounded_size<sizeof(block_ctrl), Alignment>::value;
    static const size_type BlockCtrlUnits = BlockCtrlBytes/Alignment;
-   static const size_type MinBlockUnits  = BlockCtrlUnits;
-   static const size_type MinBlockSize   = MinBlockUnits*Alignment;
    static const size_type AllocatedCtrlBytes = BlockCtrlBytes;
    static const size_type AllocatedCtrlUnits = BlockCtrlUnits;
    static const size_type UsableByPreviousChunk = 0;
@@ -356,7 +357,7 @@ inline void simple_seq_fit_impl<MutexFamily, VoidPointer>::grow(size_type extra_
    m_header.m_size += extra_size;
 
    //We need at least MinBlockSize blocks to create a new block
-   if((m_header.m_size - old_end) < MinBlockSize){
+   if((m_header.m_size - old_end) < BlockCtrlBytes){
       return;
    }
 
@@ -457,8 +458,8 @@ inline void simple_seq_fit_impl<MutexFamily, VoidPointer>::priv_add_segment(void
 {
    algo_impl_t::assert_alignment(addr);
    //Check size
-   BOOST_ASSERT(!(segment_size < MinBlockSize));
-   if(segment_size < MinBlockSize)
+   BOOST_ASSERT(!(segment_size < BlockCtrlBytes));
+   if(segment_size < BlockCtrlBytes)
       return;
    //Construct big block using the new segment
    block_ctrl *new_block   = static_cast<block_ctrl *>(addr);
@@ -490,7 +491,7 @@ simple_seq_fit_impl<MutexFamily, VoidPointer>::
 {
    return ipcdetail::get_rounded_size((size_type)sizeof(simple_seq_fit_impl),Alignment) +
           ipcdetail::get_rounded_size(extra_hdr_bytes,Alignment)
-          + MinBlockSize;
+          + BlockCtrlBytes;
 }
 
 template<class MutexFamily, class VoidPointer>
diff --git a/inst/include/boost/interprocess/mem_algo/rbtree_best_fit.hpp b/inst/include/boost/interprocess/mem_algo/rbtree_best_fit.hpp
index d1dd9d12f..2adca4e7a 100644
--- a/inst/include/boost/interprocess/mem_algo/rbtree_best_fit.hpp
+++ b/inst/include/boost/interprocess/mem_algo/rbtree_best_fit.hpp
@@ -46,7 +46,6 @@
 #include <boost/intrusive/set.hpp>
 // other boost
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 // std
 #include <climits>
 #include <cstring>
@@ -109,9 +108,12 @@ class rbtree_best_fit
    struct SizeHolder
    {
       static const size_type size_mask = size_type(-1) >> 2;
+      //!Previous block's memory size (including block_ctrl
+      //!header) in Alignment units. This field (UsableByPreviousChunk bytes)
+      //!is OVERWRITTEN by the previous block if allocated (m_prev_allocated)
+      size_type m_prev_size;
       //!This block's memory size (including block_ctrl
       //!header) in Alignment units
-      size_type m_prev_size;
       size_type m_size      :  sizeof(size_type)*CHAR_BIT - 2;
       size_type m_prev_allocated :  1;
       size_type m_allocated :  1;
@@ -119,15 +121,22 @@ class rbtree_best_fit
 
    //!Block control structure
    struct block_ctrl
-      :  public SizeHolder, public TreeHook
+      :  public SizeHolder
+      //This tree hook is overwritten when this block is used
+      , public TreeHook
    {
       block_ctrl()
-      {  this->m_size = 0; this->m_allocated = 0, this->m_prev_allocated = 0;  }
+      {
+         this->SizeHolder::m_size = 0;
+         this->SizeHolder::m_allocated = 0;
+         this->SizeHolder::m_prev_allocated = 0;
+      }
 
       friend bool operator<(const block_ctrl &a, const block_ctrl &b)
-      {  return a.m_size < b.m_size;  }
+      {  return a.SizeHolder::m_size < b.SizeHolder::m_size;  }
+
       friend bool operator==(const block_ctrl &a, const block_ctrl &b)
-      {  return a.m_size == b.m_size;  }
+      {  return a.SizeHolder::m_size == b.SizeHolder::m_size;  }
    };
 
    struct size_block_ctrl_compare
@@ -181,14 +190,19 @@ class rbtree_best_fit
 
    //Functions for single segment management
 
-   //!Allocates bytes, returns 0 if there is not more memory
+   //!Allocates bytes, returns 0 if there is not more memory.
+   //!Returned memory is aligned to Alignment bytes.
    void* allocate             (size_type nbytes);
 
+   //!Deallocates previously allocated bytes
+   void   deallocate(void* addr);
+
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
 
    //Experimental. Dont' use
 
    //!Multiple element allocation, same size
+   //!Experimental. Dont' use
    void allocate_many(size_type elem_bytes, size_type num_elements, multiallocation_chain &chain)
    {
       //-----------------------
@@ -198,6 +212,7 @@ class rbtree_best_fit
    }
 
    //!Multiple element allocation, different size
+   //!Experimental. Dont' use
    void allocate_many(const size_type *elem_sizes, size_type n_elements, size_type sizeof_element, multiallocation_chain &chain)
    {
       //-----------------------
@@ -207,12 +222,18 @@ class rbtree_best_fit
    }
 
    //!Multiple element allocation, different size
+   //!Experimental. Dont' use
    void deallocate_many(multiallocation_chain &chain);
 
-   #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+   template<class T>
+   T* allocation_command(boost::interprocess::allocation_type command, size_type limit_size,
+      size_type& prefer_in_recvd_out_size, T*& reuse);
 
-   //!Deallocates previously allocated bytes
-   void   deallocate          (void *addr);
+   void* raw_allocation_command(boost::interprocess::allocation_type command, size_type limit_object,
+      size_type& prefer_in_recvd_out_size,
+      void*& reuse_ptr, size_type sizeof_object = 1);
+
+   #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
    //!Returns the size of the memory segment
    size_type get_size()  const;
@@ -238,14 +259,6 @@ class rbtree_best_fit
    //!and returns true if success
    bool check_sanity();
 
-   template<class T>
-   T * allocation_command  (boost::interprocess::allocation_type command, size_type limit_size,
-                           size_type &prefer_in_recvd_out_size, T *&reuse);
-
-   void * raw_allocation_command (boost::interprocess::allocation_type command,   size_type limit_object,
-                              size_type &prefer_in_recvd_out_size,
-                              void *&reuse_ptr, size_type sizeof_object = 1);
-
    //!Returns the size of the buffer previously allocated pointed by ptr
    size_type size(const void *ptr) const;
 
@@ -340,9 +353,9 @@ class rbtree_best_fit
 
    private:
    //Due to embedded bits in size, Alignment must be at least 4
-   BOOST_STATIC_ASSERT((Alignment >= 4));
+   BOOST_INTERPROCESS_STATIC_ASSERT((Alignment >= 4));
    //Due to rbtree size optimizations, Alignment must have at least pointer alignment
-   BOOST_STATIC_ASSERT((Alignment >= ::boost::container::dtl::alignment_of<void_pointer>::value));
+   BOOST_INTERPROCESS_STATIC_ASSERT((Alignment >= ::boost::container::dtl::alignment_of<void_pointer>::value));
    static const size_type AlignmentMask = (Alignment - 1);
    static const size_type BlockCtrlBytes = ipcdetail::ct_rounded_size<sizeof(block_ctrl), Alignment>::value;
    static const size_type BlockCtrlUnits = BlockCtrlBytes/Alignment;
@@ -350,11 +363,10 @@ class rbtree_best_fit
    static const size_type AllocatedCtrlUnits  = AllocatedCtrlBytes/Alignment;
    static const size_type EndCtrlBlockBytes   = ipcdetail::ct_rounded_size<sizeof(SizeHolder), Alignment>::value;
    static const size_type EndCtrlBlockUnits   = EndCtrlBlockBytes/Alignment;
-   static const size_type MinBlockUnits       = BlockCtrlUnits;
    static const size_type UsableByPreviousChunk   = sizeof(size_type);
 
    //Make sure the maximum alignment is power of two
-   BOOST_STATIC_ASSERT((0 == (Alignment & (Alignment - size_type(1u)))));
+   BOOST_INTERPROCESS_STATIC_ASSERT((0 == (Alignment & (Alignment - size_type(1u)))));
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
    public:
    static const size_type PayloadPerAllocation = AllocatedCtrlBytes - UsableByPreviousChunk;
@@ -398,7 +410,7 @@ void rbtree_best_fit<MutexFamily, VoidPointer, MemAlignment>::
    priv_mark_as_free_block (first_big_block);
    #ifdef BOOST_INTERPROCESS_RBTREE_BEST_FIT_ABI_V1_HPP
    first_big_block->m_prev_size = end_block->m_size =
-      size_type(reinterpret_cast<char*>(first_big_block) - reinterpret_cast<char*>(end_block))/Alignmen) & block_ctrl::size_mask;
+      size_type(reinterpret_cast<char*>(first_big_block) - reinterpret_cast<char*>(end_block))/Alignment) & block_ctrl::size_mask;
    #else
    first_big_block->m_prev_size = end_block->m_size =
       size_type(reinterpret_cast<char*>(end_block) - reinterpret_cast<char*>(first_big_block))/Alignment & block_ctrl::size_mask;
@@ -478,8 +490,8 @@ void rbtree_best_fit<MutexFamily, VoidPointer, MemAlignment>::grow(size_type ext
    //Update managed buffer's size
    m_header.m_size += extra_size;
 
-   //We need at least MinBlockUnits blocks to create a new block
-   if((m_header.m_size - old_border_offset) < MinBlockUnits){
+   //We need at least BlockCtrlBytes blocks to create a new block
+   if((m_header.m_size - old_border_offset) < BlockCtrlBytes){
       return;
    }
 
@@ -611,7 +623,7 @@ rbtree_best_fit<MutexFamily, VoidPointer, MemAlignment>::
 {
    return (algo_impl_t::ceil_units(sizeof(rbtree_best_fit)) +
            algo_impl_t::ceil_units(extra_hdr_bytes) +
-           MinBlockUnits + EndCtrlBlockUnits)*Alignment;
+           BlockCtrlUnits + EndCtrlBlockUnits)*Alignment;
 }
 
 template<class MutexFamily, class VoidPointer, std::size_t MemAlignment>
diff --git a/inst/include/boost/interprocess/offset_ptr.hpp b/inst/include/boost/interprocess/offset_ptr.hpp
index f5a2bbec9..be4249dc7 100644
--- a/inst/include/boost/interprocess/offset_ptr.hpp
+++ b/inst/include/boost/interprocess/offset_ptr.hpp
@@ -21,27 +21,23 @@
 
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
-
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_constructible.hpp>
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/type_traits/is_unsigned.hpp>
+#include <boost/move/detail/type_traits.hpp>
 
 #include <boost/interprocess/interprocess_fwd.hpp>
+#include <boost/interprocess/interprocess_printers.hpp>
 #include <boost/interprocess/detail/utilities.hpp>
 #include <boost/interprocess/detail/cast_tags.hpp>
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/container/detail/type_traits.hpp>  //alignment_of, aligned_storage
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <iosfwd>
+#include <cstddef>
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
 #pragma GCC diagnostic push
 //#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
-
 //!\file
 //!Describes a smart pointer that stores the offset between this pointer and
 //!target pointee, called offset_ptr.
@@ -59,15 +55,62 @@ struct has_trivial_destructor;
 namespace interprocess {
 
 #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
+
+#if !defined( BOOST_NO_CXX11_NULLPTR )
+   typedef decltype(nullptr) op_nullptr_t;
+#else
+struct op_nullptr_t
+{
+   void* lx;  //to achieve pointer alignment
+
+   struct nat {int bool_conversion;};
+
+   BOOST_INTERPROCESS_FORCEINLINE op_nullptr_t() {}
+
+   BOOST_INTERPROCESS_FORCEINLINE op_nullptr_t(int nat::*)  {}
+
+   BOOST_INTERPROCESS_FORCEINLINE operator int nat::*() const {  return 0;   }
+
+   template <class T>
+   BOOST_INTERPROCESS_FORCEINLINE operator T*() const {  return 0;   }
+
+   template <class T, class U>
+   BOOST_INTERPROCESS_FORCEINLINE operator T U::* () const {  return 0;   }
+
+   friend BOOST_INTERPROCESS_FORCEINLINE bool operator==(op_nullptr_t, op_nullptr_t) {   return true;   }
+   friend BOOST_INTERPROCESS_FORCEINLINE bool operator!=(op_nullptr_t, op_nullptr_t) {   return false;  }
+};
+
+#endif
+
 namespace ipcdetail {
 
+   //workarounds for void offset_ptrs
+   struct op_nat{};
+
+   template <class T> struct op_reference
+      : add_reference<T>
+   {};
+
+   template <> struct op_reference<void>
+   {  typedef op_nat type;   };
+
+   template <> struct op_reference<void const>
+   {  typedef op_nat type;   };
+
+   template <> struct op_reference<void volatile>
+   {  typedef op_nat type;   };
+
+   template <> struct op_reference<void const volatile>
+   {  typedef op_nat type;   };
+
    template<class OffsetType, std::size_t OffsetAlignment>
    union offset_ptr_internal
    {
-      BOOST_STATIC_ASSERT(sizeof(OffsetType) >= sizeof(uintptr_t));
-      BOOST_STATIC_ASSERT(boost::is_integral<OffsetType>::value && boost::is_unsigned<OffsetType>::value);
+      BOOST_INTERPROCESS_STATIC_ASSERT(sizeof(OffsetType) >= sizeof(uintptr_t));
+      BOOST_INTERPROCESS_STATIC_ASSERT(boost::move_detail::is_integral<OffsetType>::value && boost::move_detail::is_unsigned<OffsetType>::value);
 
-      explicit offset_ptr_internal(OffsetType off)
+      BOOST_INTERPROCESS_FORCEINLINE explicit offset_ptr_internal(OffsetType off)
          : m_offset(off)
       {}
 
@@ -196,14 +239,14 @@ namespace ipcdetail {
 
    template<class From, class To, class Ret = void>
    struct enable_if_convertible_equal_address
-      : enable_if_c< ::boost::is_convertible<From*, To*>::value
+      : enable_if_c< ::boost::move_detail::is_convertible<From*, To*>::value
                      && offset_ptr_maintains_address<From, To>::value
                   , Ret>
    {};
 
    template<class From, class To, class Ret = void>
    struct enable_if_convertible_unequal_address
-      : enable_if_c< ::boost::is_convertible<From*, To*>::value
+      : enable_if_c< ::boost::move_detail::is_convertible<From*, To*>::value
                      && !offset_ptr_maintains_address<From, To>::value
                    , Ret>
    {};
@@ -211,12 +254,12 @@ namespace ipcdetail {
 }  //namespace ipcdetail {
 #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 
-//!A smart pointer that stores the offset between between the pointer and the
-//!the object it points. This allows offset allows special properties, since
+//!A smart pointer that stores the offset between the pointer and the
+//!object it points to. This allows special properties, since
 //!the pointer is independent from the address of the pointee, if the
 //!pointer and the pointee are still separated by the same offset. This feature
 //!converts offset_ptr in a smart pointer that can be placed in shared memory and
-//!memory mapped files mapped in different addresses in every process.
+//!memory mapped files mapped at different addresses in every process.
 //!
 //! \tparam PointedType The type of the pointee.
 //! \tparam DifferenceType A signed integer type that can represent the arithmetic operations on the pointer
@@ -245,7 +288,8 @@ class offset_ptr
    typedef PointedType                       element_type;
    typedef PointedType *                     pointer;
    typedef typename ipcdetail::
-      add_reference<PointedType>::type       reference;
+      op_reference<PointedType>::type        reference;
+
    typedef typename ipcdetail::
       remove_volatile<typename ipcdetail::
          remove_const<PointedType>::type
@@ -262,21 +306,32 @@ class offset_ptr
       : internal(1)
    {}
 
-   //!Constructor from raw pointer (allows "0" pointer conversion).
+   //!Constructor from nullptr.
    //!Never throws.
-   BOOST_INTERPROCESS_FORCEINLINE offset_ptr(pointer ptr) BOOST_NOEXCEPT
-      : internal(ipcdetail::offset_ptr_to_offset<OffsetType>(ptr, this))
+   BOOST_INTERPROCESS_FORCEINLINE offset_ptr(op_nullptr_t) BOOST_NOEXCEPT
+      : internal(1)
    {}
 
-   //!Constructor from other pointer.
+   #if defined( BOOST_NO_CXX11_NULLPTR )
+   //!Constructor from nullptr. Some compilers (e.g. g++14) in C++03 mode have problems with op_nullptr_t
+   //!so a helper overload is needed. Never throws.
+   BOOST_INTERPROCESS_FORCEINLINE offset_ptr(int ipcdetail::op_nat::*) BOOST_NOEXCEPT
+      : internal(1)
+   {}
+   #endif   //BOOST_NO_CXX11_NULLPTR
+
+   //!Constructor from raw pointer. Only takes part in overload resolution if T* is convertible to PointedType*
    //!Never throws.
    template <class T>
    BOOST_INTERPROCESS_FORCEINLINE offset_ptr( T *ptr
-             , typename ipcdetail::enable_if< ::boost::is_convertible<T*, PointedType*> >::type * = 0) BOOST_NOEXCEPT
+      #ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+             , typename ipcdetail::enable_if< ::boost::move_detail::is_convertible<T*, PointedType*> >::type * = 0
+      #endif
+      ) BOOST_NOEXCEPT
       : internal(ipcdetail::offset_ptr_to_offset<OffsetType>(static_cast<PointedType*>(ptr), this))
    {}
 
-   //!Constructor from other offset_ptr
+   //!Constructor from other offset_ptr.
    //!Never throws.
    BOOST_INTERPROCESS_FORCEINLINE offset_ptr(const offset_ptr& ptr) BOOST_NOEXCEPT
       : internal(ipcdetail::offset_ptr_to_offset_from_other(this, &ptr, ptr.internal.m_offset))
@@ -303,19 +358,6 @@ class offset_ptr
 
    #endif
 
-   //!Constructor from other offset_ptr. Only takes part in overload resolution
-   //!if PointedType* is constructible from T2* other than via a conversion (e.g. cast to a derived class). Never throws.
-   template<class T2>
-   BOOST_INTERPROCESS_FORCEINLINE explicit offset_ptr(const offset_ptr<T2, DifferenceType, OffsetType, OffsetAlignment> &ptr
-             #ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
-             , typename ipcdetail::enable_if_c<
-                !::boost::is_convertible<T2*, PointedType*>::value && ::boost::is_constructible<T2*, PointedType*>::value
-             >::type * = 0
-             #endif
-             ) BOOST_NOEXCEPT
-      : internal(ipcdetail::offset_ptr_to_offset<OffsetType>(static_cast<PointedType*>(ptr.get()), this))
-   {}
-
    //!Emulates static_cast operator.
    //!Never throws.
    template<class T2, class P2, class O2, std::size_t A2>
@@ -359,7 +401,7 @@ class offset_ptr
 
    //!Dereferencing operator, if it is a null offset_ptr behavior
    //!   is undefined. Never throws.
-   BOOST_INTERPROCESS_FORCEINLINE reference operator* () const BOOST_NOEXCEPT
+   BOOST_INTERPROCESS_FORCEINLINE reference operator*() const BOOST_NOEXCEPT
    {
       pointer p = this->get();
       reference r = *p;
@@ -371,11 +413,19 @@ class offset_ptr
    BOOST_INTERPROCESS_FORCEINLINE reference operator[](difference_type idx) const BOOST_NOEXCEPT
    {  return this->get()[idx];  }
 
-   //!Assignment from pointer (saves extra conversion).
+   //!Assignment from raw pointer. Only takes part in overload resolution if T* is convertible to PointedType*
    //!Never throws.
-   BOOST_INTERPROCESS_FORCEINLINE offset_ptr& operator= (pointer from) BOOST_NOEXCEPT
+
+   template<class T> BOOST_INTERPROCESS_FORCEINLINE 
+   #ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+   typename ipcdetail::enable_if_c
+      < ::boost::move_detail::is_convertible<T*, PointedType*>::value, offset_ptr&>::type
+   #else
+   offset_ptr&
+   #endif
+      operator= (T *ptr) BOOST_NOEXCEPT
    {
-      this->internal.m_offset = ipcdetail::offset_ptr_to_offset<OffsetType>(from, this);
+      this->internal.m_offset = ipcdetail::offset_ptr_to_offset<OffsetType>(static_cast<PointedType*>(ptr), this);
       return *this;
    }
 
@@ -387,12 +437,31 @@ class offset_ptr
       return *this;
    }
 
-   //!Assignment from related offset_ptr. If pointers of pointee types
-   //!   are assignable, offset_ptrs will be assignable. Never throws.
+   //!Assignment from nullptr.
+   //!Never throws.
+   BOOST_INTERPROCESS_FORCEINLINE offset_ptr& operator= (op_nullptr_t) BOOST_NOEXCEPT
+   {
+      this->internal.m_offset = 1;
+      return *this;
+   }
+
+   #if defined( BOOST_NO_CXX11_NULLPTR )
+   //!Assignment from nullptr. Some compilers (e.g. g++14) in C++03 mode have problems with op_nullptr_t
+   //!so a helper overload is needed. Never throws.
+   BOOST_INTERPROCESS_FORCEINLINE offset_ptr& operator= (int ipcdetail::op_nat::*) BOOST_NOEXCEPT
+   {
+      this->internal.m_offset = 1;
+      return *this;
+   }
+   #endif   //BOOST_NO_CXX11_NULLPTR
+
+   //!Assignment from related offset_ptr.
+   //!Only takes part in overload resolution if T2* is convertible to PointedType*
+   //!Never throws.
    template<class T2> BOOST_INTERPROCESS_FORCEINLINE 
    #ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
    typename ipcdetail::enable_if_c
-      < ::boost::is_convertible<T2*, PointedType*>::value, offset_ptr&>::type
+      < ::boost::move_detail::is_convertible<T2*, PointedType*>::value, offset_ptr&>::type
    #else
    offset_ptr&
    #endif
@@ -473,7 +542,7 @@ class offset_ptr
 
    //!Compatibility with pointer_traits
    //!
-   BOOST_INTERPROCESS_FORCEINLINE static offset_ptr pointer_to(reference r) BOOST_NOEXCEPT
+   BOOST_INTERPROCESS_FORCEINLINE static offset_ptr pointer_to(typename ipcdetail::op_reference<PointedType>::type r) BOOST_NOEXCEPT
    { return offset_ptr(&r); }
 
    //!difference_type + offset_ptr
@@ -714,7 +783,7 @@ struct pointer_plus_bits<boost::interprocess::offset_ptr<T, P, O, A>, NumBits>
    //Bits are stored in the lower bits of the pointer except the LSB,
    //because this bit is used to represent the null pointer.
    static const O Mask = ((static_cast<O>(1) << NumBits) - static_cast<O>(1)) << 1;
-   BOOST_STATIC_ASSERT(0 ==(Mask&1));
+   BOOST_INTERPROCESS_STATIC_ASSERT(0 ==(Mask&1));
 
    //We must ALWAYS take argument "n" by reference as a copy of a null pointer
    //with a bit (e.g. offset == 3) would be incorrectly copied and interpreted as non-null.
@@ -769,7 +838,7 @@ struct pointer_to_other
 
 #include <boost/interprocess/detail/config_end.hpp>
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/inst/include/boost/interprocess/segment_manager.hpp b/inst/include/boost/interprocess/segment_manager.hpp
index 983b0f15d..024e2b424 100644
--- a/inst/include/boost/interprocess/segment_manager.hpp
+++ b/inst/include/boost/interprocess/segment_manager.hpp
@@ -22,7 +22,6 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
 
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 
 #include <boost/interprocess/detail/transform_iterator.hpp>
@@ -49,6 +48,7 @@
 #ifndef BOOST_NO_EXCEPTIONS
 #include <exception>
 #endif
+#include <typeinfo>
 
 //!\file
 //!Describes the object placed in a memory segment that provides
@@ -75,6 +75,7 @@ class segment_manager_base
    typedef segment_manager_base<MemoryAlgorithm> segment_manager_base_type;
    typedef typename MemoryAlgorithm::void_pointer  void_pointer;
    typedef typename MemoryAlgorithm::mutex_family  mutex_family;
+   static const std::size_t MemAlignment = MemoryAlgorithm::Alignment;
    typedef MemoryAlgorithm memory_algorithm;
 
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
@@ -243,7 +244,11 @@ class segment_manager_base
    //!Increases managed memory in extra_size bytes more. This only works
    //!with single-segment management.
    void grow(size_type extra_size)
-   {  MemoryAlgorithm::grow(extra_size);   }
+   {
+      //Growing managed segments that use raw pointers is UB, so disallow it.
+      BOOST_INTERPROCESS_STATIC_ASSERT(!(ipcdetail::is_same<void*, void_pointer>::value));
+      MemoryAlgorithm::grow(extra_size);
+   }
 
    //!Decreases managed memory to the minimum. This only works
    //!with single-segment management.
@@ -268,72 +273,6 @@ class segment_manager_base
    //!Returns the size of the buffer previously allocated pointed by ptr
    size_type size(const void *ptr) const
    {   return MemoryAlgorithm::size(ptr); }
-
-   #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
-   protected:
-   void * prot_anonymous_construct
-      (size_type num, bool dothrow, ipcdetail::in_place_interface &table)
-   {
-      typedef ipcdetail::block_header<size_type> block_header_t;
-      block_header_t block_info (  size_type(table.size*num)
-                                 , size_type(table.alignment)
-                                 , anonymous_type
-                                 , 1
-                                 , 0);
-
-      //Allocate memory
-      void *ptr_struct = this->allocate(block_info.total_size(), nothrow<>::get());
-
-      //Check if there is enough memory
-      if(!ptr_struct){
-         if(dothrow){
-            throw bad_alloc();
-         }
-         else{
-            return 0;
-         }
-      }
-
-      //Build scoped ptr to avoid leaks with constructor exception
-      ipcdetail::mem_algo_deallocator<MemoryAlgorithm> mem(ptr_struct, *this);
-
-      //Now construct the header
-      block_header_t * hdr = ::new(ptr_struct, boost_container_new_t()) block_header_t(block_info);
-      void *ptr = 0; //avoid gcc warning
-      ptr = hdr->value();
-
-      //Now call constructors
-      ipcdetail::array_construct(ptr, num, table);
-
-      //All constructors successful, we don't want erase memory
-      mem.release();
-      return ptr;
-   }
-
-   //!Calls the destructor and makes an anonymous deallocate
-   void prot_anonymous_destroy(const void *object, ipcdetail::in_place_interface &table)
-   {
-
-      //Get control data from associated with this object
-      typedef ipcdetail::block_header<size_type> block_header_t;
-      block_header_t *ctrl_data = block_header_t::block_header_from_value(object, table.size, table.alignment);
-
-      //-------------------------------
-      //scoped_lock<rmutex> guard(m_header);
-      //-------------------------------
-
-      if(ctrl_data->alloc_type() != anonymous_type){
-         //This is not an anonymous object, the pointer is wrong!
-         BOOST_ASSERT(0);
-      }
-
-      //Call destructors and free memory
-      //Build scoped ptr to avoid leaks with destructor exception
-      std::size_t destroyed = 0;
-     table.destroy_n(const_cast<void*>(object), ctrl_data->m_value_bytes/table.size, destroyed);
-      this->deallocate(ctrl_data);
-   }
-   #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 };
 
 //!This object is placed in the beginning of memory segment and
@@ -376,6 +315,7 @@ class segment_manager
    typedef segment_manager_base<MemoryAlgorithm>   segment_manager_base_type;
 
    static const size_type PayloadPerAllocation = segment_manager_base_t::PayloadPerAllocation;
+   static const size_type MemAlignment         = segment_manager_base_t::MemAlignment;
 
    #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
    private:
@@ -543,15 +483,12 @@ class segment_manager
    bool destroy(char_ptr_holder_t name)
    {
       BOOST_ASSERT(!name.is_anonymous());
-      ipcdetail::placement_destroy<T> dtor;
 
       if(name.is_unique()){
-         return this->priv_generic_named_destroy<char>
-            ( typeid(T).name(), m_header.m_unique_index , dtor, is_intrusive_t());
+         return this->priv_generic_named_destroy<T, char>(typeid(T).name(), m_header.m_unique_index);
       }
       else{
-         return this->priv_generic_named_destroy<CharType>
-            ( name.get(), m_header.m_named_index, dtor, is_intrusive_t());
+         return this->priv_generic_named_destroy<T, CharType>(name.get(), m_header.m_named_index);
       }
    }
 
@@ -560,10 +497,7 @@ class segment_manager
    template <class T>
    void destroy_ptr(const T *p)
    {
-      //If T is void transform it to char
-      typedef typename ipcdetail::char_if_void<T>::type data_t;
-      ipcdetail::placement_destroy<data_t> dtor;
-      priv_destroy_ptr(p, dtor);
+      priv_destroy_ptr(p);
    }
 
    //!Returns the name of an object created with construct/find_or_construct
@@ -709,15 +643,27 @@ class segment_manager
    //!Generic named/anonymous new function. Offers all the possibilities,
    //!such as throwing, search before creating, and the constructor is
    //!encapsulated in an object function.
-   template<class T>
-   T *generic_construct(const CharType *name,
-                        size_type num,
-                         bool try2find,
-                         bool dothrow,
-                         ipcdetail::in_place_interface &table)
+   template<class Proxy>
+   typename Proxy::object_type * generic_construct
+      (Proxy& pr, const CharType *name, size_type num, bool try2find, bool dothrow)
    {
-      return static_cast<T*>
-         (priv_generic_construct(name, num, try2find, dothrow, table));
+      typedef typename Proxy::object_type object_type;
+
+      //Security overflow check
+      if(num > ((size_type)-1)/sizeof(object_type)){
+         return ipcdetail::null_or_bad_alloc<object_type>(dothrow);
+      }
+      if(name == 0){
+         return this->priv_anonymous_construct(pr, num, dothrow);
+      }
+      else if(name == reinterpret_cast<const CharType*>(-1)){
+         return this->priv_generic_named_construct
+            (pr, unique_type, typeid(object_type).name(), num, try2find, dothrow, m_header.m_unique_index);
+      }
+      else{
+         return this->priv_generic_named_construct
+            (pr, named_type, name, num, try2find, dothrow, m_header.m_named_index);
+      }
    }
 
    private:
@@ -729,15 +675,14 @@ class segment_manager
    {
       //The name can't be null, no anonymous object can be found by name
       BOOST_ASSERT(name != 0);
-      ipcdetail::placement_destroy<T> table;
       size_type sz;
       void *ret;
 
       if(name == reinterpret_cast<const CharType*>(-1)){
-         ret = priv_generic_find<char> (typeid(T).name(), m_header.m_unique_index, table, sz, is_intrusive_t(), lock);
+         ret = priv_generic_find<T>(typeid(T).name(), m_header.m_unique_index, sz, lock);
       }
       else{
-         ret = priv_generic_find<CharType> (name, m_header.m_named_index, table, sz, is_intrusive_t(), lock);
+         ret = priv_generic_find<T>(name, m_header.m_named_index, sz, lock);
       }
       return std::pair<T*, size_type>(static_cast<T*>(ret), sz);
    }
@@ -746,55 +691,101 @@ class segment_manager
    //!and the object count. On failure the first member of the
    //!returned pair is 0.
    template <class T>
-   std::pair<T*, size_type> priv_find_impl (const ipcdetail::unique_instance_t* name, bool lock)
+   std::pair<T*, size_type> priv_find_impl (const ipcdetail::unique_instance_t*, bool lock)
    {
-      ipcdetail::placement_destroy<T> table;
       size_type size;
-      void *ret = priv_generic_find<char>(name, m_header.m_unique_index, table, size, is_intrusive_t(), lock);
+      void *ret = priv_generic_find<T>(typeid(T).name(), m_header.m_unique_index, size, lock);
       return std::pair<T*, size_type>(static_cast<T*>(ret), size);
    }
 
-   void *priv_generic_construct
-      (const CharType *name, size_type num, bool try2find, bool dothrow, ipcdetail::in_place_interface &table)
+
+   template<class Proxy>
+   typename Proxy::object_type * priv_anonymous_construct(Proxy pr, size_type num, bool dothrow)
    {
-      void *ret;
-      //Security overflow check
-      if(num > ((std::size_t)-1)/table.size){
-         if(dothrow)
-            throw bad_alloc();
-         else
-            return 0;
-      }
-      if(name == 0){
-         ret = this->prot_anonymous_construct(num, dothrow, table);
-      }
-      else if(name == reinterpret_cast<const CharType*>(-1)){
-         ret = this->priv_generic_named_construct<char>
-            (unique_type, table.type_name, num, try2find, dothrow, table, m_header.m_unique_index, is_intrusive_t());
-      }
-      else{
-         ret = this->priv_generic_named_construct<CharType>
-            (named_type, name, num, try2find, dothrow, table, m_header.m_named_index, is_intrusive_t());
+      typedef typename Proxy::object_type object_type;
+      BOOST_CONSTEXPR_OR_CONST std::size_t t_alignment = boost::move_detail::alignment_of<object_type>::value;
+      block_header_t block_info (  size_type(sizeof(object_type)*num)
+                                 , size_type(t_alignment)
+                                 , anonymous_type
+                                 , 1
+                                 , 0);
+
+      //Check if there is enough memory
+      const std::size_t total_size = block_info.template total_anonymous_size<t_alignment>();
+      #if (BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI < 2)
+      void *ptr_struct = this->allocate(total_size, nothrow<>::get());
+      #else
+      void* ptr_struct = this->allocate_aligned(total_size, t_alignment, nothrow<>::get());
+      #endif
+      if(!ptr_struct){
+         return ipcdetail::null_or_bad_alloc<object_type>(dothrow);
       }
-      return ret;
+
+      //Build scoped ptr to avoid leaks with constructor exception
+      ipcdetail::mem_algo_deallocator<segment_manager_base_type> mem
+         (ptr_struct, *static_cast<segment_manager_base_type*>(this));
+
+      //Now construct the header
+      const std::size_t front_space = block_header_t::template front_space_without_header<t_alignment>();
+
+      block_header_t * const hdr = ::new((char*)ptr_struct + front_space, boost_container_new_t()) block_header_t(block_info);
+      BOOST_ASSERT(is_ptr_aligned(hdr));
+      void *ptr = 0; //avoid gcc warning
+      ptr = hdr->value();
+
+      //Now call constructors
+      pr.construct_n(ptr, num);
+
+      //All constructors successful, disable rollback
+      mem.release();
+      object_type* const pret = static_cast<object_type*>(ptr);
+      BOOST_ASSERT(is_ptr_aligned(pret));
+      return pret;
    }
 
-   void priv_destroy_ptr(const void *ptr, ipcdetail::in_place_interface &dtor)
+   //!Calls the destructor and makes an anonymous deallocate
+   template <class T>
+   void priv_anonymous_destroy(const T *object)
    {
-      block_header_t *ctrl_data = block_header_t::block_header_from_value(ptr, dtor.size, dtor.alignment);
+      BOOST_ASSERT(is_ptr_aligned(object));
+      //Get control data from associated with this object
+      block_header_t *ctrl_data = block_header_t::block_header_from_value(object);
+
+      //-------------------------------
+      //scoped_lock<rmutex> guard(m_header);
+      //-------------------------------
+
+      //This is not an anonymous object, the pointer is wrong!
+      BOOST_ASSERT(ctrl_data->alloc_type() == anonymous_type);
+
+      //Call destructors and free memory
+      //Build scoped ptr to avoid leaks with destructor exception
+      priv_destroy_n(object, ctrl_data->value_bytes()/sizeof(T));
+
+      BOOST_CONSTEXPR_OR_CONST std::size_t t_alignment =
+         boost::move_detail::alignment_of<T>::value;
+      const std::size_t front_space = block_header_t::template front_space_without_header<t_alignment>();
+      this->deallocate((char*)ctrl_data - front_space);
+   }
+
+   template<class T>
+   void priv_destroy_ptr(const T *ptr)
+   {
+      BOOST_ASSERT(is_ptr_aligned(ptr));
+      block_header_t *ctrl_data = block_header_t::block_header_from_value(ptr);
       switch(ctrl_data->alloc_type()){
          case anonymous_type:
-            this->prot_anonymous_destroy(ptr, dtor);
+            this->priv_anonymous_destroy(ptr);
          break;
 
          case named_type:
-            this->priv_generic_named_destroy<CharType>
-               (ctrl_data, m_header.m_named_index, dtor, is_node_index_t());
+            this->priv_generic_named_destroy<T, CharType>
+               (ctrl_data, m_header.m_named_index, is_node_index_t());
          break;
 
          case unique_type:
-            this->priv_generic_named_destroy<char>
-               (ctrl_data, m_header.m_unique_index, dtor, is_node_index_t());
+            this->priv_generic_named_destroy<T, char>
+               (ctrl_data, m_header.m_unique_index, is_node_index_t());
          break;
 
          default:
@@ -804,21 +795,28 @@ class segment_manager
       }
    }
 
+   template<class T>
+   static void priv_destroy_n(T* memory, std::size_t num)
+   {
+      for (std::size_t destroyed = 0; destroyed < num; ++destroyed)
+         (memory++)->~T();
+   }
+
    //!Returns the name of an object created with construct/find_or_construct
    //!functions. Does not throw
    static const CharType *priv_get_instance_name(block_header_t *ctrl_data)
    {
       boost::interprocess::allocation_type type = ctrl_data->alloc_type();
       if(type == anonymous_type){
-         BOOST_ASSERT((type == anonymous_type && ctrl_data->m_num_char == 0) ||
-                (type == unique_type    && ctrl_data->m_num_char != 0) );
+         BOOST_ASSERT(ctrl_data->name_length() == 0);
          return 0;
       }
+
+      BOOST_ASSERT(ctrl_data->name_length() != 0);
       CharType *name = static_cast<CharType*>(ctrl_data->template name<CharType>());
 
       //Sanity checks
-      BOOST_ASSERT(ctrl_data->sizeof_char() == sizeof(CharType));
-      BOOST_ASSERT(ctrl_data->m_num_char == std::char_traits<CharType>::length(name));
+      BOOST_ASSERT(ctrl_data->name_length() == std::char_traits<CharType>::length(name));
       return name;
    }
 
@@ -845,23 +843,22 @@ class segment_manager
       return sizeof(segment_manager) - sizeof(segment_manager_base_t);
    }
 
-   template <class CharT>
-   void *priv_generic_find
+   template <class T, class CharT>
+   T *priv_generic_find
       (const CharT* name,
        IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-       ipcdetail::in_place_interface &table,
-       size_type &length, ipcdetail::true_ is_intrusive, bool use_lock)
+       size_type &length, bool use_lock)
    {
-      (void)is_intrusive;
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >         index_type_t;
-      typedef typename index_type_t::iterator           index_it;
+      typedef IndexType<ipcdetail::index_config
+                           <CharT, MemoryAlgorithm> > index_t;
+      typedef typename index_t::iterator              index_it;
+      typedef typename index_t::compare_key_type      compare_key_t;
 
       //-------------------------------
       scoped_lock<rmutex> guard(priv_get_lock(use_lock));
       //-------------------------------
       //Find name in index
-      ipcdetail::intrusive_compare_key<CharT> key
-         (name, std::char_traits<CharT>::length(name));
+      compare_key_t key (name, std::char_traits<CharT>::length(name));
       index_it it = index.find(key);
 
       //Initialize return values
@@ -871,95 +868,54 @@ class segment_manager
       //If found, assign values
       if(it != index.end()){
          //Get header
-         block_header_t *ctrl_data = it->get_block_header();
+         block_header_t *ctrl_data = priv_block_header_from_it(it, is_intrusive_t());
 
          //Sanity check
-         BOOST_ASSERT((ctrl_data->m_value_bytes % table.size) == 0);
-         BOOST_ASSERT(ctrl_data->sizeof_char() == sizeof(CharT));
+         BOOST_ASSERT((ctrl_data->value_bytes() % sizeof(T)) == 0);
          ret_ptr  = ctrl_data->value();
-         length  = ctrl_data->m_value_bytes/table.size;
+         length  = ctrl_data->value_bytes()/ sizeof(T);
       }
-      return ret_ptr;
+      return static_cast<T*>(ret_ptr);
    }
 
-   template <class CharT>
-   void *priv_generic_find
-      (const CharT* name,
-       IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-       ipcdetail::in_place_interface &table,
-       size_type &length, ipcdetail::false_ is_intrusive, bool use_lock)
-   {
-      (void)is_intrusive;
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >      char_aware_index_type;
-      typedef typename char_aware_index_type::key_type        key_type;
-      typedef typename char_aware_index_type::iterator        index_it;
-
-      //-------------------------------
-      scoped_lock<rmutex> guard(priv_get_lock(use_lock));
-      //-------------------------------
-      //Find name in index
-      index_it it = index.find(key_type(name, std::char_traits<CharT>::length(name)));
-
-      //Initialize return values
-      void *ret_ptr  = 0;
-      length         = 0;
-
-      //If found, assign values
-      if(it != index.end()){
-         //Get header
-         block_header_t *ctrl_data = reinterpret_cast<block_header_t*>
-                                    (ipcdetail::to_raw_pointer(it->second.m_ptr));
-
-         //Sanity check
-         BOOST_ASSERT((ctrl_data->m_value_bytes % table.size) == 0);
-         BOOST_ASSERT(ctrl_data->sizeof_char() == sizeof(CharT));
-         ret_ptr  = ctrl_data->value();
-         length  = ctrl_data->m_value_bytes/table.size;
-      }
-      return ret_ptr;
-   }
-
-   template <class CharT>
+   template <class T, class CharT>
    bool priv_generic_named_destroy
-     (block_header_t *block_header,
-      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-      ipcdetail::in_place_interface &table, ipcdetail::true_ is_node_index)
+     (block_header_t *block_header
+     ,IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index
+     ,ipcdetail::true_ is_node_index)
    {
       (void)is_node_index;
-      typedef typename IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >::iterator index_it;
+      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >  index_t;
+      typedef typename index_t::index_data_t         index_data_t;
 
-      index_it *ihdr = block_header_t::template to_first_header<index_it>(block_header);
-      return this->priv_generic_named_destroy_impl<CharT>(*ihdr, index, table);
+      index_data_t* si = block_header_t::template to_first_header<index_data_t>(block_header);
+      return this->priv_generic_named_destroy_impl<T, CharT>(*si, index);
    }
 
-   template <class CharT>
+   template <class T, class CharT>
    bool priv_generic_named_destroy
-     (block_header_t *block_header,
-      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-      ipcdetail::in_place_interface &table,
-      ipcdetail::false_ is_node_index)
+     (block_header_t *block_header
+     ,IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index
+     ,ipcdetail::false_ is_node_index)
    {
       (void)is_node_index;
       CharT *name = static_cast<CharT*>(block_header->template name<CharT>());
-      return this->priv_generic_named_destroy<CharT>(name, index, table, is_intrusive_t());
+      return this->priv_generic_named_destroy<T, CharT>(name, index);
    }
 
-   template <class CharT>
+   template <class T, class CharT>
    bool priv_generic_named_destroy(const CharT *name,
-                                   IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-                                   ipcdetail::in_place_interface &table, ipcdetail::true_ is_intrusive_index)
+                                   IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index)
    {
-      (void)is_intrusive_index;
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >         index_type_t;
-      typedef typename index_type_t::iterator           index_it;
-      typedef typename index_type_t::value_type         intrusive_value_type;
+      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >  index_t;
+      typedef typename index_t::iterator              index_it;
+      typedef typename index_t::compare_key_type      compare_key_t;
 
       //-------------------------------
       scoped_lock<rmutex> guard(m_header);
       //-------------------------------
       //Find name in index
-      ipcdetail::intrusive_compare_key<CharT> key
-         (name, std::char_traits<CharT>::length(name));
+      compare_key_t key(name, std::char_traits<CharT>::length(name));
       index_it it = index.find(key);
 
       //If not found, return false
@@ -968,353 +924,199 @@ class segment_manager
          //BOOST_ASSERT(0);
          return false;
       }
-
-      block_header_t *ctrl_data = it->get_block_header();
-      intrusive_value_type *iv = intrusive_value_type::get_intrusive_value_type(ctrl_data);
-      void *memory = iv;
-      void *values = ctrl_data->value();
-      std::size_t num = ctrl_data->m_value_bytes/table.size;
-
-      //Sanity check
-      BOOST_ASSERT((ctrl_data->m_value_bytes % table.size) == 0);
-      BOOST_ASSERT(sizeof(CharT) == ctrl_data->sizeof_char());
-
-      //Erase node from index
-      index.erase(it);
-
-      //Destroy the headers
-      ctrl_data->~block_header_t();
-      iv->~intrusive_value_type();
-
-      //Call destructors and free memory
-      std::size_t destroyed;
-      table.destroy_n(values, num, destroyed);
-      this->deallocate(memory);
-      return true;
-   }
-
-   template <class CharT>
-   bool priv_generic_named_destroy(const CharT *name,
-                                   IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-                                   ipcdetail::in_place_interface &table,
-                                   ipcdetail::false_ is_intrusive_index)
-   {
-      (void)is_intrusive_index;
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >            char_aware_index_type;
-      typedef typename char_aware_index_type::iterator              index_it;
-      typedef typename char_aware_index_type::key_type              key_type;
-
-      //-------------------------------
-      scoped_lock<rmutex> guard(m_header);
-      //-------------------------------
-      //Try to find the name in the index
-      index_it it = index.find(key_type (name,
-                                     std::char_traits<CharT>::length(name)));
-
-      //If not found, return false
-      if(it == index.end()){
-         //This name is not present in the index, wrong pointer or name!
-         //BOOST_ASSERT(0);
-         return false;
-      }
-      return this->priv_generic_named_destroy_impl<CharT>(it, index, table);
+      return this->priv_generic_named_destroy_impl<T, CharT>(it, index);
    }
 
-   template <class CharT>
+   template <class T, class CharT>
    bool priv_generic_named_destroy_impl
-      (const typename IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >::iterator &it,
-      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index,
-      ipcdetail::in_place_interface &table)
+      (typename IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >::iterator it,
+      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index)
    {
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >      char_aware_index_type;
-      typedef typename char_aware_index_type::iterator        index_it;
+      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >  index_t;
+      typedef typename index_t::index_data_t         index_data_t;
 
       //Get allocation parameters
-      block_header_t *ctrl_data = reinterpret_cast<block_header_t*>
-                                 (ipcdetail::to_raw_pointer(it->second.m_ptr));
-      char *stored_name       = static_cast<char*>(static_cast<void*>(const_cast<CharT*>(it->first.name())));
-      (void)stored_name;
+      BOOST_CONSTEXPR_OR_CONST std::size_t t_alignment =
+         boost::move_detail::alignment_of<T>::value;
+      block_header_t *ctrl_data = priv_block_header_from_it(it, is_intrusive_t());
 
-      //Check if the distance between the name pointer and the memory pointer
-      //is correct (this can detect incorrect type in destruction)
-      std::size_t num = ctrl_data->m_value_bytes/table.size;
-      void *values = ctrl_data->value();
-
-      //Sanity check
-      BOOST_ASSERT((ctrl_data->m_value_bytes % table.size) == 0);
-      BOOST_ASSERT(static_cast<void*>(stored_name) == static_cast<void*>(ctrl_data->template name<CharT>()));
-      BOOST_ASSERT(sizeof(CharT) == ctrl_data->sizeof_char());
+      //Sanity checks
+      BOOST_ASSERT((ctrl_data->value_bytes() % sizeof(T)) == 0);
 
       //Erase node from index
       index.erase(it);
 
-      //Destroy the header
-      ctrl_data->~block_header_t();
-
       void *memory;
-      if(is_node_index_t::value){
-         index_it *ihdr = block_header_t::template
-            to_first_header<index_it>(ctrl_data);
-         ihdr->~index_it();
-         memory = ihdr;
+      BOOST_IF_CONSTEXPR(is_node_index_t::value || is_intrusive_t::value){
+         index_data_t*ihdr = block_header_t::template to_first_header<index_data_t>(ctrl_data);
+         const std::size_t front_space = block_header_t::template front_space_with_header<t_alignment, index_data_t>();
+         memory = (char*)ihdr - front_space;
+         ihdr->~index_data_t();
       }
       else{
-         memory = ctrl_data;
+         const std::size_t front_space = block_header_t::template front_space_without_header<t_alignment>();
+         memory = (char*)ctrl_data - front_space;
       }
 
       //Call destructors and free memory
-      std::size_t destroyed;
-      table.destroy_n(values, num, destroyed);
+      priv_destroy_n(static_cast<T*>(ctrl_data->value()), ctrl_data->value_bytes()/sizeof(T));
+
+      //Destroy the headers
+      ctrl_data->~block_header_t();
+
       this->deallocate(memory);
       return true;
    }
 
-   template<class CharT>
-   void * priv_generic_named_construct
-      (unsigned char type, const CharT *name, size_type num, bool try2find,
-      bool dothrow, ipcdetail::in_place_interface &table, 
-      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index, ipcdetail::true_ is_intrusive)
+   template<class IndexIt>
+   static block_header_t* priv_block_header_from_it(IndexIt it, ipcdetail::true_) //is_intrusive
+   {  return block_header_t::from_first_header(&*it); }
+
+   template<class IndexIt>
+   static block_header_t* priv_block_header_from_it(IndexIt it, ipcdetail::false_ ) //!is_intrusive
+   {
+      return static_cast<block_header_t*>(ipcdetail::to_raw_pointer(it->second.m_ptr));
+   }
+
+   //!Generic named new function for
+   //!named functions
+   template<class Proxy, class CharT>
+   typename Proxy::object_type * priv_generic_named_construct
+      (Proxy pr, unsigned char type, const CharT *name, size_type num, bool try2find, bool dothrow,
+      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index)
    {
-      (void)is_intrusive;
-     std::size_t namelen  = std::char_traits<CharT>::length(name);
+      typedef typename Proxy::object_type object_type;
+      std::size_t namelen  = std::char_traits<CharT>::length(name);
+      BOOST_CONSTEXPR_OR_CONST std::size_t t_alignment = boost::move_detail::alignment_of<object_type>::value;
 
-      block_header_t block_info ( size_type(table.size*num)
-                                 , size_type(table.alignment)
-                                 , type
-                                 , sizeof(CharT)
-                                 , namelen);
+      block_header_t block_info ( size_type(sizeof(object_type)*num)
+                                , size_type(t_alignment)
+                                , type
+                                , sizeof(CharT)
+                                , namelen);
 
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >            index_type_t;
-      typedef typename index_type_t::iterator              index_it;
-      typedef std::pair<index_it, bool>                  index_ib;
+      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >  index_t;
+      typedef typename index_t::iterator                       index_it;
+      typedef typename index_t::compare_key_type               compare_key_t;
+      typedef typename index_t::insert_commit_data   commit_data_t;
+      typedef typename index_t::index_data_t  index_data_t;
 
       //-------------------------------
       scoped_lock<rmutex> guard(m_header);
       //-------------------------------
-      //Insert the node. This can throw.
       //First, we want to know if the key is already present before
       //we allocate any memory, and if the key is not present, we
       //want to allocate all memory in a single buffer that will
       //contain the name and the user buffer.
-      //
-      //Since equal_range(key) + insert(hint, value) approach is
-      //quite inefficient in container implementations
-      //(they re-test if the position is correct), I've chosen
-      //to insert the node, do an ugly un-const cast and modify
-      //the key (which is a smart pointer) to an equivalent one
-      index_ib insert_ret;
-
-      typename index_type_t::insert_commit_data   commit_data;
-      typedef typename index_type_t::value_type   intrusive_value_type;
-
-      BOOST_TRY{
-         ipcdetail::intrusive_compare_key<CharT> key(name, namelen);
-         insert_ret = index.insert_check(key, commit_data);
+      index_it existing_it;
+      bool found = false;
+
+      commit_data_t	      commit_data;
+      BOOST_INTERPROCESS_TRY{
+         typedef std::pair<index_it, bool>                  index_ib;
+         index_ib insert_ret = index.insert_check(compare_key_t(name, namelen), commit_data);
+         existing_it = insert_ret.first;
+         found = !insert_ret.second;
       }
       //Ignore exceptions
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          if(dothrow)
-            BOOST_RETHROW
+            BOOST_INTERPROCESS_RETHROW
          return 0;
       }
-      BOOST_CATCH_END
-
-      index_it it = insert_ret.first;
+      BOOST_INTERPROCESS_CATCH_END
 
-      //If found and this is find or construct, return data
-      //else return null
-      if(!insert_ret.second){
+      //If found and this is find or construct, return data, error otherwise
+      if(found){
          if(try2find){
-            return it->get_block_header()->value();
-         }
-         if(dothrow){
-            throw interprocess_exception(already_exists_error);
-         }
-         else{
-            return 0;
+            return static_cast<object_type*>(priv_block_header_from_it(existing_it, is_intrusive_t())->value());
          }
+         return ipcdetail::null_or_already_exists<object_type>(dothrow);
       }
 
       //Allocates buffer for name + data, this can throw (it hurts)
       void *buffer_ptr;
+      block_header_t * hdr;
+      std::size_t front_space;
 
-      //Check if there is enough memory
-      if(dothrow){
-         buffer_ptr = this->allocate
-            (block_info.template total_size_with_header<intrusive_value_type>());
-      }
-      else{
-         buffer_ptr = this->allocate
-            (block_info.template total_size_with_header<intrusive_value_type>(), nothrow<>::get());
+      //Allocate and construct the headers
+      BOOST_IF_CONSTEXPR(is_node_index_t::value || is_intrusive_t::value){
+         const size_type total_size = block_info.template total_named_size_with_header<t_alignment, CharT, index_data_t>(namelen);
+         #if (BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI < 2)
+         buffer_ptr = this->allocate(total_size, nothrow<>::get());
+         #else
+         buffer_ptr = this->allocate_aligned(total_size, t_alignment, nothrow<>::get());
+         #endif
+         
          if(!buffer_ptr)
-            return 0;
-      }
-
-      //Now construct the intrusive hook plus the header
-      intrusive_value_type * intrusive_hdr = ::new(buffer_ptr, boost_container_new_t()) intrusive_value_type();
-      block_header_t * hdr = ::new(intrusive_hdr->get_block_header(), boost_container_new_t())block_header_t(block_info);
-      void *ptr = 0; //avoid gcc warning
-      ptr = hdr->value();
+            return ipcdetail::null_or_bad_alloc<object_type>(dothrow);
 
-      //Copy name to memory segment and insert data
-      CharT *name_ptr = static_cast<CharT *>(hdr->template name<CharT>());
-      std::char_traits<CharT>::copy(name_ptr, name, namelen+1);
-
-      BOOST_TRY{
-         //Now commit the insertion using previous context data
-         it = index.insert_commit(*intrusive_hdr, commit_data);
+         front_space = block_header_t::template front_space_with_header<t_alignment, index_data_t>();
+         hdr = block_header_t::template from_first_header(reinterpret_cast<index_data_t*>((void*)((char*)buffer_ptr + front_space)));
       }
-      //Ignore exceptions
-      BOOST_CATCH(...){
-         if(dothrow)
-            BOOST_RETHROW
-         return 0;
+      else{
+         const size_type total_size = block_info.template total_named_size<t_alignment, CharT>(namelen);
+         #if (BOOST_INTERPROCESS_SEGMENT_MANAGER_ABI < 2)
+         buffer_ptr = this->allocate(total_size, nothrow<>::get());
+         #else
+         buffer_ptr = this->allocate_aligned(total_size, t_alignment, nothrow<>::get());
+         #endif
+
+         front_space = block_header_t::template front_space_without_header<t_alignment>();
+         
+         //Check if there is enough memory
+         if (!buffer_ptr)
+            return ipcdetail::null_or_bad_alloc<object_type>(dothrow);
+         hdr = reinterpret_cast<block_header_t*>((void*)((char*)buffer_ptr + front_space));
       }
-      BOOST_CATCH_END
 
-      //Avoid constructions if constructor is trivial
+      BOOST_ASSERT(is_ptr_aligned(hdr));
+      hdr = ::new(hdr, boost_container_new_t()) block_header_t(block_info);
+
       //Build scoped ptr to avoid leaks with constructor exception
       ipcdetail::mem_algo_deallocator<segment_manager_base_type> mem
          (buffer_ptr, *static_cast<segment_manager_base_type*>(this));
 
-      //Initialize the node value_eraser to erase inserted node
-      //if something goes wrong. This will be executed *before*
-      //the memory allocation as the intrusive value is built in that
-      //memory
-      value_eraser<index_type_t> v_eraser(index, it);
-
-      //Construct array, this can throw
-      ipcdetail::array_construct(ptr, num, table);
-
-      //Release rollbacks since construction was successful
-      v_eraser.release();
-      mem.release();
-      return ptr;
-   }
+      void *ptr = hdr->value();
 
-   //!Generic named new function for
-   //!named functions
-   template<class CharT>
-   void * priv_generic_named_construct
-      (unsigned char type, const CharT *name, size_type num, bool try2find, bool dothrow,
-      ipcdetail::in_place_interface &table, 
-      IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> > &index, ipcdetail::false_ is_intrusive)
-   {
-      (void)is_intrusive;
-      std::size_t namelen  = std::char_traits<CharT>::length(name);
-
-      block_header_t block_info ( size_type(table.size*num)
-                                 , size_type(table.alignment)
-                                 , type
-                                 , sizeof(CharT)
-                                 , namelen);
-
-      typedef IndexType<ipcdetail::index_config<CharT, MemoryAlgorithm> >            index_type_t;
-      typedef typename index_type_t::key_type              key_type;
-      typedef typename index_type_t::mapped_type           mapped_type;
-      typedef typename index_type_t::value_type            value_type;
-      typedef typename index_type_t::iterator              index_it;
-      typedef std::pair<index_it, bool>                  index_ib;
+      //Copy name to memory segment and insert data
+      hdr->store_name_length(static_cast<typename block_header_t::name_len_t>(namelen));
+      CharT *name_ptr = static_cast<CharT *>(hdr->template name<CharT>());
+      std::char_traits<CharT>::copy(name_ptr, name, namelen+1);
 
-      //-------------------------------
-      scoped_lock<rmutex> guard(m_header);
-      //-------------------------------
-      //Insert the node. This can throw.
-      //First, we want to know if the key is already present before
-      //we allocate any memory, and if the key is not present, we
-      //want to allocate all memory in a single buffer that will
-      //contain the name and the user buffer.
-      //
-      //Since equal_range(key) + insert(hint, value) approach is
-      //quite inefficient in container implementations
-      //(they re-test if the position is correct), I've chosen
-      //to insert the node, do an ugly un-const cast and modify
-      //the key (which is a smart pointer) to an equivalent one
-      index_ib insert_ret;
-      BOOST_TRY{
-         insert_ret = index.insert(value_type(key_type (name, namelen), mapped_type(0)));
+      index_it it;
+      BOOST_INTERPROCESS_TRY{
+         BOOST_IF_CONSTEXPR(is_node_index_t::value || is_intrusive_t::value) {
+            index_data_t* index_data = ::new((char*)buffer_ptr + front_space, boost_container_new_t()) index_data_t();
+            BOOST_ASSERT(is_ptr_aligned(index_data));
+            it = index.insert_commit(compare_key_t(name_ptr, namelen), hdr, *index_data, commit_data);
+         }
+         else{
+            index_data_t id;
+            it = index.insert_commit(compare_key_t(name_ptr, namelen), hdr, id, commit_data);
+         }
       }
       //Ignore exceptions
-      BOOST_CATCH(...){
+      BOOST_INTERPROCESS_CATCH(...){
          if(dothrow)
-            BOOST_RETHROW;
+            BOOST_INTERPROCESS_RETHROW
          return 0;
       }
-      BOOST_CATCH_END
-
-      index_it it = insert_ret.first;
+      BOOST_INTERPROCESS_CATCH_END
 
-      //If found and this is find or construct, return data
-      //else return null
-      if(!insert_ret.second){
-         if(try2find){
-            block_header_t *hdr = static_cast<block_header_t*>
-               (ipcdetail::to_raw_pointer(it->second.m_ptr));
-            return hdr->value();
-         }
-         return 0;
-      }
       //Initialize the node value_eraser to erase inserted node
       //if something goes wrong
-      value_eraser<index_type_t> v_eraser(index, it);
-
-      //Allocates buffer for name + data, this can throw (it hurts)
-      void *buffer_ptr;
-      block_header_t * hdr;
-
-      //Allocate and construct the headers
-      if(is_node_index_t::value){
-         size_type total_size = block_info.template total_size_with_header<index_it>();
-         if(dothrow){
-            buffer_ptr = this->allocate(total_size);
-         }
-         else{
-            buffer_ptr = this->allocate(total_size, nothrow<>::get());
-            if(!buffer_ptr)
-               return 0;
-         }
-         index_it *idr = ::new(buffer_ptr, boost_container_new_t()) index_it(it);
-         hdr = block_header_t::template from_first_header<index_it>(idr);
-      }
-      else{
-         if(dothrow){
-            buffer_ptr = this->allocate(block_info.total_size());
-         }
-         else{
-            buffer_ptr = this->allocate(block_info.total_size(), nothrow<>::get());
-            if(!buffer_ptr)
-               return 0;
-         }
-         hdr = static_cast<block_header_t*>(buffer_ptr);
-      }
-
-      hdr = ::new(hdr, boost_container_new_t())block_header_t(block_info);
-      void *ptr = 0; //avoid gcc warning
-      ptr = hdr->value();
-
-      //Copy name to memory segment and insert data
-      CharT *name_ptr = static_cast<CharT *>(hdr->template name<CharT>());
-      std::char_traits<CharT>::copy(name_ptr, name, namelen+1);
-
-      //Do the ugly cast, please mama, forgive me!
-      //This new key points to an identical string, so it must have the
-      //same position than the overwritten key according to the predicate
-      const_cast<key_type &>(it->first).name(name_ptr);
-      it->second.m_ptr  = hdr;
-
-      //Build scoped ptr to avoid leaks with constructor exception
-      ipcdetail::mem_algo_deallocator<segment_manager_base_type> mem
-         (buffer_ptr, *static_cast<segment_manager_base_type*>(this));
+      value_eraser<index_t> v_eraser(index, it);
 
       //Construct array, this can throw
-      ipcdetail::array_construct(ptr, num, table);
+      pr.construct_n(ptr, num);
 
-      //All constructors successful, we don't want to release memory
-      mem.release();
-
-      //Release node v_eraser since construction was successful
+      //Release rollbacks since construction was successful
       v_eraser.release();
-      return ptr;
+      mem.release();
+      object_type* const pret = static_cast<object_type*>(ptr);
+      BOOST_ASSERT(is_ptr_aligned(pret));
+      return pret;
    }
 
    private:
diff --git a/inst/include/boost/interprocess/shared_memory_object.hpp b/inst/include/boost/interprocess/shared_memory_object.hpp
index 2d429efcb..46c2f2019 100644
--- a/inst/include/boost/interprocess/shared_memory_object.hpp
+++ b/inst/include/boost/interprocess/shared_memory_object.hpp
@@ -186,6 +186,11 @@ class shared_memory_object
    file_handle_t     m_handle;
    mode_t            m_mode;
    char_wchar_holder m_filename;
+
+   #ifdef BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
+   static int eintr_aware_shm_open(const char* name, int oflag, ::mode_t mode);
+   #endif
+
    #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
 };
 
@@ -269,30 +274,30 @@ inline bool shared_memory_object::priv_open_or_create
 
 inline bool shared_memory_object::remove(const wchar_t *filename)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       //Make sure a temporary path is created for shared memory
       std::wstring shmfile;
       ipcdetail::shared_filepath(filename, shmfile);
       return ipcdetail::delete_file(shmfile.c_str());
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 #endif
 
 inline bool shared_memory_object::remove(const char *filename)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       //Make sure a temporary path is created for shared memory
       std::string shmfile;
       ipcdetail::shared_filepath(filename, shmfile);
       return ipcdetail::delete_file(shmfile.c_str());
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 inline void shared_memory_object::truncate(offset_t length)
@@ -374,13 +379,13 @@ inline bool shared_memory_object::priv_open_or_create
       case ipcdetail::DoOpen:
       {
          //No oflag addition
-         m_handle = shm_open(fname.c_str(), oflag, unix_perm);
+         m_handle = eintr_aware_shm_open(fname.c_str(), oflag, unix_perm);
       }
       break;
       case ipcdetail::DoCreate:
       {
          oflag |= (O_CREAT | O_EXCL);
-         m_handle = shm_open(fname.c_str(), oflag, unix_perm);
+         m_handle = eintr_aware_shm_open(fname.c_str(), oflag, unix_perm);
          if(m_handle >= 0){
             ::fchmod(m_handle, unix_perm);
          }
@@ -392,14 +397,14 @@ inline bool shared_memory_object::priv_open_or_create
          //with "O_CREAT" only we don't know if we've created or opened the shm.
          while(true){
             //Try to create shared memory
-            m_handle = shm_open(fname.c_str(), oflag | (O_CREAT | O_EXCL), unix_perm);
+            m_handle = eintr_aware_shm_open(fname.c_str(), oflag | (O_CREAT | O_EXCL), unix_perm);
             //If successful change real permissions
             if(m_handle >= 0){
                ::fchmod(m_handle, unix_perm);
             }
             //If already exists, try to open
             else if(errno == EEXIST){
-               m_handle = shm_open(fname.c_str(), oflag, unix_perm);
+               m_handle = eintr_aware_shm_open(fname.c_str(), oflag, unix_perm);
                //If open fails and errno tells the file does not exist
                //(shm was removed between creation and opening tries), just retry
                if(m_handle < 0 && errno == ENOENT){
@@ -432,7 +437,7 @@ inline bool shared_memory_object::priv_open_or_create
 
 inline bool shared_memory_object::remove(const char *filename)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       std::string filepath;
       #if defined(BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SHARED_MEMORY)
       const bool add_leading_slash = false;
@@ -449,9 +454,9 @@ inline bool shared_memory_object::remove(const char *filename)
       }
       return 0 == shm_unlink(filepath.c_str());
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 inline void shared_memory_object::truncate(offset_t length)
@@ -486,6 +491,15 @@ inline void shared_memory_object::priv_close()
    }
 }
 
+inline int shared_memory_object::eintr_aware_shm_open(const char* name, int oflag, ::mode_t mode)
+{
+   int shm_open_ret;
+   do {
+      shm_open_ret = shm_open(name, oflag, mode);
+   } while (shm_open_ret == -1 && errno == EINTR);
+   return shm_open_ret;
+}
+
 #endif
 
 //!A class that stores the name of a shared memory
diff --git a/inst/include/boost/interprocess/smart_ptr/detail/shared_count.hpp b/inst/include/boost/interprocess/smart_ptr/detail/shared_count.hpp
index 9b0244e42..941d735da 100644
--- a/inst/include/boost/interprocess/smart_ptr/detail/shared_count.hpp
+++ b/inst/include/boost/interprocess/smart_ptr/detail/shared_count.hpp
@@ -30,7 +30,6 @@
 #include <boost/interprocess/smart_ptr/detail/sp_counted_impl.hpp>
 #include <boost/interprocess/detail/utilities.hpp>
 #include <boost/container/allocator_traits.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/move/adl_move_swap.hpp>
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>   //std::less
 #include <boost/container/detail/placement_new.hpp>
@@ -100,7 +99,7 @@ class shared_count
    shared_count(const Ptr &p, const VoidAllocator &a, Deleter d)
       :  m_px(p), m_pi(0)
    {
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          if(p){
             counted_impl_allocator alloc(a);
             m_pi = alloc.allocate(1);
@@ -114,11 +113,11 @@ class shared_count
             deallocator.release();
          }
       }
-      BOOST_CATCH (...){
+      BOOST_INTERPROCESS_CATCH (...){
          d(p); // delete p
-         BOOST_RETHROW
+         BOOST_INTERPROCESS_RETHROW
       }
-      BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH_END
    }
 
    ~shared_count() // nothrow
diff --git a/inst/include/boost/interprocess/smart_ptr/shared_ptr.hpp b/inst/include/boost/interprocess/smart_ptr/shared_ptr.hpp
index 7633bd5de..ba66188ea 100644
--- a/inst/include/boost/interprocess/smart_ptr/shared_ptr.hpp
+++ b/inst/include/boost/interprocess/smart_ptr/shared_ptr.hpp
@@ -30,7 +30,6 @@
 #include <boost/interprocess/detail/utilities.hpp>
 #include <boost/interprocess/detail/cast_tags.hpp>
 #include <boost/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/interprocess/smart_ptr/detail/shared_count.hpp>
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/interprocess/detail/nothrow.hpp>
@@ -140,7 +139,7 @@ class shared_ptr
          pointer_traits<pointer>::template
             rebind_pointer<T>::type                         ParameterPointer;
 
-      BOOST_STATIC_ASSERT((ipcdetail::is_same<pointer, ParameterPointer>::value) ||
+      BOOST_INTERPROCESS_STATIC_ASSERT((ipcdetail::is_same<pointer, ParameterPointer>::value) ||
                           (ipcdetail::is_pointer<pointer>::value));
       ipcdetail::sp_enable_shared_from_this<T, VoidAllocator, Deleter>( m_pn, ipcdetail::to_raw_pointer(p), ipcdetail::to_raw_pointer(p) );
    }
@@ -245,7 +244,7 @@ class shared_ptr
       typedef typename boost::intrusive::
          pointer_traits<Pointer>::template
             rebind_pointer<T>::type                         ParameterPointer;
-      BOOST_STATIC_ASSERT((ipcdetail::is_same<pointer, ParameterPointer>::value) ||
+      BOOST_INTERPROCESS_STATIC_ASSERT((ipcdetail::is_same<pointer, ParameterPointer>::value) ||
                           (ipcdetail::is_pointer<Pointer>::value));
       this_type(p, a, d).swap(*this);
    }
@@ -397,16 +396,16 @@ template<class T, class ManagedMemory>
 inline typename managed_shared_ptr<T, ManagedMemory>::type
    make_managed_shared_ptr(T *constructed_object, ManagedMemory &managed_memory, const std::nothrow_t &)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       return typename managed_shared_ptr<T, ManagedMemory>::type
       ( constructed_object
       , managed_memory.template get_allocator<void>()
       , managed_memory.template get_deleter<T>()
       );
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return typename managed_shared_ptr<T, ManagedMemory>::type();
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 
diff --git a/inst/include/boost/interprocess/smart_ptr/weak_ptr.hpp b/inst/include/boost/interprocess/smart_ptr/weak_ptr.hpp
index e4873122d..358e7b8f7 100644
--- a/inst/include/boost/interprocess/smart_ptr/weak_ptr.hpp
+++ b/inst/include/boost/interprocess/smart_ptr/weak_ptr.hpp
@@ -27,7 +27,6 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 #include <boost/interprocess/smart_ptr/shared_ptr.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/interprocess/allocators/allocator.hpp>
 #include <boost/interprocess/smart_ptr/deleter.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
@@ -165,15 +164,15 @@ class weak_ptr
       if(expired()){
          return shared_ptr<element_type, A, D>();
       }
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          return shared_ptr<element_type, A, D>(*this);
       }
-      BOOST_CATCH(bad_weak_ptr const &){
+      BOOST_INTERPROCESS_CATCH(bad_weak_ptr const &){
          // Q: how can we get here?
          // A: another thread may have invalidated r after the use_count test above.
          return shared_ptr<element_type, A, D>();
       }
-      BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH_END
    }
 
    //!Returns: 0 if *this is empty; otherwise, the number of shared_ptr objects
diff --git a/inst/include/boost/interprocess/streams/vectorstream.hpp b/inst/include/boost/interprocess/streams/vectorstream.hpp
index 36ed39159..ee78d3546 100644
--- a/inst/include/boost/interprocess/streams/vectorstream.hpp
+++ b/inst/include/boost/interprocess/streams/vectorstream.hpp
@@ -52,6 +52,7 @@
 #include <istream>
 #include <ostream>
 #include <string>    // char traits
+#include <climits>   // INT_MAX
 #include <cstddef>   // ptrdiff_t
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/assert.hpp>
@@ -138,9 +139,9 @@ class basic_vectorbuf
          if(m_vect.size() > high_pos){
             m_vect.resize(high_pos);
             //But we must update end write pointer because vector size is now shorter
-            int old_pos = (int)(base_t::pptr() - base_t::pbase());
+            off_type old_pos = base_t::pptr() - base_t::pbase();
             const_cast<basic_vectorbuf*>(this)->base_t::setp(old_ptr, old_ptr + high_pos);
-            const_cast<basic_vectorbuf*>(this)->base_t::pbump(old_pos);
+            const_cast<basic_vectorbuf*>(this)->pbump(old_pos);
          }
       }
       return m_vect;
@@ -152,14 +153,14 @@ class basic_vectorbuf
    void reserve(typename vector_type::size_type size)
    {
       if (this->m_mode & std::ios_base::out && size > m_vect.size()){
-         typename vector_type::difference_type write_pos = base_t::pptr() - base_t::pbase();
-         typename vector_type::difference_type read_pos  = base_t::gptr() - base_t::eback();
+         off_type write_pos = base_t::pptr() - base_t::pbase();
+         off_type read_pos  = base_t::gptr() - base_t::eback();
          //Now update pointer data
          m_vect.reserve(size);
          this->initialize_pointers();
-         base_t::pbump((int)write_pos);
+         this->pbump(write_pos);
          if(this->m_mode & std::ios_base::in){
-            base_t::gbump((int)read_pos);
+            base_t::setg(base_t::eback(), base_t::eback() + read_pos, base_t::egptr());
          }
       }
    }
@@ -189,7 +190,7 @@ class basic_vectorbuf
       // The initial write position is the beginning of the vector.
       if(m_mode & std::ios_base::out){
          //First get real size
-         int real_size = (int)m_vect.size();
+         off_type real_size = static_cast<off_type>(m_vect.size());
          //Then maximize size for high watermarking
          m_vect.resize(m_vect.capacity());
          BOOST_ASSERT(m_vect.size() == m_vect.capacity());
@@ -208,11 +209,21 @@ class basic_vectorbuf
                this->setg(p, p, p + real_size);
          }
          if (m_mode & (std::ios_base::app | std::ios_base::ate)){
-            base_t::pbump((int)real_size);
+            this->pbump(real_size);
          }
       }
    }
 
+   // LWG255-inspired variant of base_t::pbump that takes a streamoff instead of an int.
+   void pbump(off_type delta) {
+      if (delta > INT_MAX) {
+            for (off_type d = delta / INT_MAX; d > 0; d--)
+                base_t::pbump(INT_MAX);
+            delta %= INT_MAX;
+      }
+      base_t::pbump((int)delta);
+   }
+
    protected:
    virtual int_type underflow() BOOST_OVERRIDE
    {
@@ -277,7 +288,7 @@ class basic_vectorbuf
                if (m_mode & std::ios_base::in)
                   base_t::setg(p, p + (base_t::gptr() - base_t::eback()), mp_high_water);
                //Update write position to the old position + 1
-               base_t::pbump((int)new_outpos);
+               this->pbump((off_type)new_outpos);
                return c;
          }
          else  // c is EOF, so we don't have to do anything
@@ -351,7 +362,7 @@ class basic_vectorbuf
          base_t::setg(base_t::eback(), base_t::eback() + newoff, base_t::egptr());
       if (out){
          base_t::setp(base_t::pbase(), base_t::epptr());
-         base_t::pbump(static_cast<int>(newoff));
+         this->pbump(newoff);
       }
       return pos_type(newoff);
    }
diff --git a/inst/include/boost/interprocess/sync/cv_status.hpp b/inst/include/boost/interprocess/sync/cv_status.hpp
index afbcdf6fd..99d1cddce 100644
--- a/inst/include/boost/interprocess/sync/cv_status.hpp
+++ b/inst/include/boost/interprocess/sync/cv_status.hpp
@@ -10,18 +10,108 @@
 #ifndef BOOST_INTERPROCESS_CV_STATUS_HPP
 #define BOOST_INTERPROCESS_CV_STATUS_HPP
 
-#include <boost/core/scoped_enum.hpp>
+#include <boost/config.hpp>
 
 namespace boost {
 namespace interprocess {
 
-  // enum class cv_status;
-  BOOST_SCOPED_ENUM_DECLARE_BEGIN(cv_status)
-  {
-    no_timeout,
-    timeout
-  }
-  BOOST_SCOPED_ENUM_DECLARE_END(cv_status)
+#if !defined(BOOST_NO_CXX11_SCOPED_ENUMS)
+
+enum class cv_status
+{
+   no_timeout,
+   timeout
+};
+
+#else //BOOST_NO_CXX11_SCOPED_ENUMS
+
+// enum class cv_status emulation
+struct cv_status
+{
+   typedef void is_boost_scoped_enum_tag;
+   typedef int underlying_type;
+
+   cv_status()  {}
+
+   explicit  cv_status(underlying_type v)
+      : v_(v)
+   {}
+
+   underlying_type get_underlying_value_() const  { return v_; }
+
+   private:
+   underlying_type v_;
+   typedef cv_status self_type;
+   public:
+   enum enum_type
+   {
+      no_timeout,
+      timeout
+   };
+
+   cv_status(enum_type v)
+      : v_(v)
+   {}
+
+   enum_type get_native_value_() const
+   { return enum_type(v_); }
+
+   friend bool operator ==(self_type lhs, self_type rhs)
+   { return enum_type(lhs.v_)==enum_type(rhs.v_); }
+
+   friend bool operator ==(self_type lhs, enum_type rhs)
+   { return enum_type(lhs.v_)==rhs; }
+
+   friend bool operator ==(enum_type lhs, self_type rhs)
+   { return lhs==enum_type(rhs.v_); }
+
+   friend bool operator !=(self_type lhs, self_type rhs)
+   { return enum_type(lhs.v_)!=enum_type(rhs.v_); }
+
+   friend  bool operator !=(self_type lhs, enum_type rhs)
+   { return enum_type(lhs.v_)!=rhs; }
+
+   friend bool operator !=(enum_type lhs, self_type rhs)
+   { return lhs!=enum_type(rhs.v_); }
+
+   friend bool operator <(self_type lhs, self_type rhs)
+   { return enum_type(lhs.v_)<enum_type(rhs.v_); }
+
+   friend bool operator <(self_type lhs, enum_type rhs)
+   { return enum_type(lhs.v_)<rhs; }
+
+   friend bool operator <(enum_type lhs, self_type rhs)
+   { return lhs<enum_type(rhs.v_); }
+
+   friend bool operator <=(self_type lhs, self_type rhs)
+   { return enum_type(lhs.v_)<=enum_type(rhs.v_); }
+
+   friend bool operator <=(self_type lhs, enum_type rhs)
+   { return enum_type(lhs.v_)<=rhs; }
+
+   friend bool operator <=(enum_type lhs, self_type rhs)
+   { return lhs<=enum_type(rhs.v_); }
+
+   friend bool operator >(self_type lhs, self_type rhs)
+   { return enum_type(lhs.v_)>enum_type(rhs.v_); }
+
+   friend bool operator >(self_type lhs, enum_type rhs)
+   { return enum_type(lhs.v_)>rhs; }
+
+   friend bool operator >(enum_type lhs, self_type rhs)
+   { return lhs>enum_type(rhs.v_); }
+
+   friend bool operator >=(self_type lhs, self_type rhs)
+   { return enum_type(lhs.v_)>=enum_type(rhs.v_); }
+
+   friend bool operator >=(self_type lhs, enum_type rhs)
+   { return enum_type(lhs.v_)>=rhs; }
+
+   friend bool operator >=(enum_type lhs, self_type rhs)
+   { return lhs>=enum_type(rhs.v_); }
+};
+
+#endif
 
 } //namespace interprocess
 } //namespace boost
diff --git a/inst/include/boost/interprocess/sync/detail/common_algorithms.hpp b/inst/include/boost/interprocess/sync/detail/common_algorithms.hpp
index 3cb1d1a17..17aafa845 100644
--- a/inst/include/boost/interprocess/sync/detail/common_algorithms.hpp
+++ b/inst/include/boost/interprocess/sync/detail/common_algorithms.hpp
@@ -23,7 +23,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 #include <boost/interprocess/sync/spin/wait.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 namespace boost {
 namespace interprocess {
@@ -78,7 +78,7 @@ void timeout_when_locking_aware_lock(MutexType &m)
 {
    #ifdef BOOST_INTERPROCESS_ENABLE_TIMEOUT_WHEN_LOCKING
       if (!m.timed_lock(microsec_clock<ustime>::universal_time()
-           + usduration_milliseconds(BOOST_INTERPROCESS_TIMEOUT_WHEN_LOCKING_DURATION_MS)))
+           + usduration_from_milliseconds(BOOST_INTERPROCESS_TIMEOUT_WHEN_LOCKING_DURATION_MS)))
       {
          throw interprocess_exception(timeout_when_locking_error
                                      , "Interprocess mutex timeout when locking. Possible deadlock: "
diff --git a/inst/include/boost/interprocess/sync/file_lock.hpp b/inst/include/boost/interprocess/sync/file_lock.hpp
index a147837c9..34adbd53b 100644
--- a/inst/include/boost/interprocess/sync/file_lock.hpp
+++ b/inst/include/boost/interprocess/sync/file_lock.hpp
@@ -22,6 +22,7 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/exceptions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/detail/os_file_functions.hpp>
 #include <boost/interprocess/detail/os_thread_functions.hpp>
 #include <boost/interprocess/sync/detail/common_algorithms.hpp>
diff --git a/inst/include/boost/interprocess/sync/interprocess_condition.hpp b/inst/include/boost/interprocess/sync/interprocess_condition.hpp
index 24ca5b5f0..7fde9fe21 100644
--- a/inst/include/boost/interprocess/sync/interprocess_condition.hpp
+++ b/inst/include/boost/interprocess/sync/interprocess_condition.hpp
@@ -27,6 +27,7 @@
 #include <boost/interprocess/sync/cv_status.hpp>
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/detail/locks.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/limits.hpp>
 #include <boost/assert.hpp>
diff --git a/inst/include/boost/interprocess/sync/interprocess_condition_any.hpp b/inst/include/boost/interprocess/sync/interprocess_condition_any.hpp
index 6b076a986..4a1d84a5a 100644
--- a/inst/include/boost/interprocess/sync/interprocess_condition_any.hpp
+++ b/inst/include/boost/interprocess/sync/interprocess_condition_any.hpp
@@ -25,6 +25,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 #include <boost/interprocess/sync/cv_status.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/interprocess_condition.hpp>
 #include <boost/interprocess/exceptions.hpp>
diff --git a/inst/include/boost/interprocess/sync/interprocess_mutex.hpp b/inst/include/boost/interprocess/sync/interprocess_mutex.hpp
index 4eb1f592c..3819080e2 100644
--- a/inst/include/boost/interprocess/sync/interprocess_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/interprocess_mutex.hpp
@@ -28,6 +28,7 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/assert.hpp>
 #include <boost/interprocess/sync/detail/common_algorithms.hpp>
 
diff --git a/inst/include/boost/interprocess/sync/interprocess_recursive_mutex.hpp b/inst/include/boost/interprocess/sync/interprocess_recursive_mutex.hpp
index 95527ee32..dc5c5a074 100644
--- a/inst/include/boost/interprocess/sync/interprocess_recursive_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/interprocess_recursive_mutex.hpp
@@ -39,6 +39,7 @@
 
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/detail/common_algorithms.hpp>
 #include <boost/assert.hpp>
 
diff --git a/inst/include/boost/interprocess/sync/interprocess_sharable_mutex.hpp b/inst/include/boost/interprocess/sync/interprocess_sharable_mutex.hpp
index 35950ae02..bee9eedea 100644
--- a/inst/include/boost/interprocess/sync/interprocess_sharable_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/interprocess_sharable_mutex.hpp
@@ -26,6 +26,7 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/interprocess_condition.hpp>
 #include <climits>
diff --git a/inst/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp b/inst/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp
index 359a28f81..7b7893a8b 100644
--- a/inst/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp
@@ -24,6 +24,7 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/interprocess_condition.hpp>
 #include <climits>
diff --git a/inst/include/boost/interprocess/sync/named_condition.hpp b/inst/include/boost/interprocess/sync/named_condition.hpp
index 9ea0182d6..78a9fb901 100644
--- a/inst/include/boost/interprocess/sync/named_condition.hpp
+++ b/inst/include/boost/interprocess/sync/named_condition.hpp
@@ -25,6 +25,7 @@
 #include <boost/interprocess/sync/cv_status.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/detail/interprocess_tester.hpp>
 #include <boost/interprocess/permissions.hpp>
 #include <boost/interprocess/sync/detail/locks.hpp>
diff --git a/inst/include/boost/interprocess/sync/named_condition_any.hpp b/inst/include/boost/interprocess/sync/named_condition_any.hpp
index 174ed9cec..2614c46d4 100644
--- a/inst/include/boost/interprocess/sync/named_condition_any.hpp
+++ b/inst/include/boost/interprocess/sync/named_condition_any.hpp
@@ -25,6 +25,7 @@
 #include <boost/interprocess/sync/cv_status.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/detail/interprocess_tester.hpp>
 #include <boost/interprocess/permissions.hpp>
 #include <boost/interprocess/sync/detail/locks.hpp>
diff --git a/inst/include/boost/interprocess/sync/named_mutex.hpp b/inst/include/boost/interprocess/sync/named_mutex.hpp
index 9d74173ff..c7415769d 100644
--- a/inst/include/boost/interprocess/sync/named_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/named_mutex.hpp
@@ -23,6 +23,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/detail/interprocess_tester.hpp>
 #include <boost/interprocess/permissions.hpp>
 
diff --git a/inst/include/boost/interprocess/sync/named_recursive_mutex.hpp b/inst/include/boost/interprocess/sync/named_recursive_mutex.hpp
index 099bd51d2..e75d0f9d6 100644
--- a/inst/include/boost/interprocess/sync/named_recursive_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/named_recursive_mutex.hpp
@@ -23,6 +23,7 @@
 #include <boost/interprocess/detail/workaround.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/permissions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 #if !defined(BOOST_INTERPROCESS_FORCE_GENERIC_EMULATION) && defined (BOOST_INTERPROCESS_WINDOWS)
    #include <boost/interprocess/sync/windows/named_recursive_mutex.hpp>
diff --git a/inst/include/boost/interprocess/sync/named_sharable_mutex.hpp b/inst/include/boost/interprocess/sync/named_sharable_mutex.hpp
index 68ce8eff0..d56e7b9c0 100644
--- a/inst/include/boost/interprocess/sync/named_sharable_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/named_sharable_mutex.hpp
@@ -24,6 +24,7 @@
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/shared_memory_object.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/detail/managed_open_or_create_impl.hpp>
 #include <boost/interprocess/sync/interprocess_sharable_mutex.hpp>
 #include <boost/interprocess/sync/shm/named_creation_functor.hpp>
diff --git a/inst/include/boost/interprocess/sync/named_upgradable_mutex.hpp b/inst/include/boost/interprocess/sync/named_upgradable_mutex.hpp
index eaf1283a2..679e961d7 100644
--- a/inst/include/boost/interprocess/sync/named_upgradable_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/named_upgradable_mutex.hpp
@@ -28,6 +28,7 @@
 #include <boost/interprocess/sync/interprocess_upgradable_mutex.hpp>
 #include <boost/interprocess/sync/shm/named_creation_functor.hpp>
 #include <boost/interprocess/permissions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 //!\file
 //!Describes a named upgradable mutex class for inter-process synchronization
diff --git a/inst/include/boost/interprocess/sync/posix/condition.hpp b/inst/include/boost/interprocess/sync/posix/condition.hpp
index f151a5b98..5b3b75266 100644
--- a/inst/include/boost/interprocess/sync/posix/condition.hpp
+++ b/inst/include/boost/interprocess/sync/posix/condition.hpp
@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <boost/interprocess/sync/posix/pthread_helpers.hpp>
 #include <boost/interprocess/sync/posix/timepoint_to_timespec.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/posix/mutex.hpp>
 #include <boost/assert.hpp>
 
diff --git a/inst/include/boost/interprocess/sync/posix/mutex.hpp b/inst/include/boost/interprocess/sync/posix/mutex.hpp
index 69cc1626e..8716f79b7 100644
--- a/inst/include/boost/interprocess/sync/posix/mutex.hpp
+++ b/inst/include/boost/interprocess/sync/posix/mutex.hpp
@@ -44,7 +44,7 @@
 #include <boost/interprocess/sync/posix/timepoint_to_timespec.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/sync/posix/pthread_helpers.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 
 #ifndef BOOST_INTERPROCESS_POSIX_TIMEOUTS
diff --git a/inst/include/boost/interprocess/sync/posix/named_mutex.hpp b/inst/include/boost/interprocess/sync/posix/named_mutex.hpp
index ac79b0512..bdf3ea4de 100644
--- a/inst/include/boost/interprocess/sync/posix/named_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/posix/named_mutex.hpp
@@ -25,7 +25,7 @@
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/detail/interprocess_tester.hpp>
 #include <boost/interprocess/permissions.hpp>
-
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/posix/named_semaphore.hpp>
 
 namespace boost {
diff --git a/inst/include/boost/interprocess/sync/posix/recursive_mutex.hpp b/inst/include/boost/interprocess/sync/posix/recursive_mutex.hpp
index bcd056d18..20e654e3d 100644
--- a/inst/include/boost/interprocess/sync/posix/recursive_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/posix/recursive_mutex.hpp
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <boost/interprocess/sync/posix/pthread_helpers.hpp>
 #include <boost/interprocess/sync/posix/timepoint_to_timespec.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #ifndef BOOST_INTERPROCESS_POSIX_TIMEOUTS
 #  include <boost/interprocess/detail/os_thread_functions.hpp>
diff --git a/inst/include/boost/interprocess/sync/posix/semaphore_wrapper.hpp b/inst/include/boost/interprocess/sync/posix/semaphore_wrapper.hpp
index 77ba48631..86c6ad1f1 100644
--- a/inst/include/boost/interprocess/sync/posix/semaphore_wrapper.hpp
+++ b/inst/include/boost/interprocess/sync/posix/semaphore_wrapper.hpp
@@ -23,7 +23,7 @@
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/detail/os_file_functions.hpp>
 #include <boost/interprocess/detail/shared_dir_helpers.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/permissions.hpp>
 
 #include <fcntl.h>      //O_CREAT, O_*...
@@ -70,7 +70,7 @@ inline bool semaphore_open
       case DoOpen:
       {
          //No addition
-         handle = ::sem_open(name.c_str(), oflag);
+         handle = BOOST_INTERPROCESS_EINTR_RETRY(sem_t*, BOOST_INTERPROCESS_POSIX_SEM_FAILED, ::sem_open(name.c_str(), oflag));
       }
       break;
       case DoOpenOrCreate:
@@ -78,7 +78,9 @@ inline bool semaphore_open
       {
          while(1){
             oflag = (O_CREAT | O_EXCL);
-            handle = ::sem_open(name.c_str(), oflag, perm.get_permissions(), count);
+            handle = BOOST_INTERPROCESS_EINTR_RETRY
+               ( sem_t*, BOOST_INTERPROCESS_POSIX_SEM_FAILED
+               , ::sem_open(name.c_str(), oflag, perm.get_permissions(), count));
             if(handle != BOOST_INTERPROCESS_POSIX_SEM_FAILED){
                //We can't change semaphore permissions!
                //::fchmod(handle, perm.get_permissions());
@@ -86,7 +88,9 @@ inline bool semaphore_open
             }
             else if(errno == EEXIST && type == DoOpenOrCreate){
                oflag = 0;
-               if( (handle = ::sem_open(name.c_str(), oflag)) != BOOST_INTERPROCESS_POSIX_SEM_FAILED
+               if( (handle = BOOST_INTERPROCESS_EINTR_RETRY
+                  (sem_t*, BOOST_INTERPROCESS_POSIX_SEM_FAILED, ::sem_open(name.c_str(), oflag)))
+                     != BOOST_INTERPROCESS_POSIX_SEM_FAILED
                    || (errno != ENOENT) ){
                   break;
                }
@@ -115,14 +119,18 @@ inline bool semaphore_open
 inline void semaphore_close(sem_t *handle)
 {
    int ret = sem_close(handle);
-   if(ret != 0){
-      BOOST_ASSERT(0);
-   }
+   #ifdef __CYGWIN__
+   //Cygwin returns EINVAL in some valid use cases
+   if (ret == -1 && errno == EINVAL)
+      ret = 0;
+   #endif
+   BOOST_ASSERT(ret == 0);
+   (void)ret;
 }
 
 inline bool semaphore_unlink(const char *semname)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       std::string sem_str;
       #ifndef BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SEMAPHORES
       add_leading_slash(semname, sem_str);
@@ -131,9 +139,9 @@ inline bool semaphore_unlink(const char *semname)
       #endif
       return 0 == sem_unlink(sem_str.c_str());
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 #endif   //BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
@@ -173,7 +181,7 @@ inline void semaphore_post(sem_t *handle)
 
 inline void semaphore_wait(sem_t *handle)
 {
-   int ret = sem_wait(handle);
+   int ret = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, sem_wait(handle));
    if(ret != 0){
       error_info err = system_error_code();
       throw interprocess_exception(err);
@@ -182,7 +190,7 @@ inline void semaphore_wait(sem_t *handle)
 
 inline bool semaphore_try_wait(sem_t *handle)
 {
-   int res = sem_trywait(handle);
+   int res = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, sem_trywait(handle));
    if(res == 0)
       return true;
    if(system_error_code() == EAGAIN){
@@ -224,7 +232,7 @@ inline bool semaphore_timed_wait(sem_t *handle, const TimePoint &abs_time)
 
    timespec tspec = timepoint_to_timespec(abs_time);
    for (;;){
-      int res = sem_timedwait(handle, &tspec);
+      int res = BOOST_INTERPROCESS_EINTR_RETRY(int, -1, sem_timedwait(handle, &tspec));
       if(res == 0)
          return true;
       if (res > 0){
diff --git a/inst/include/boost/interprocess/sync/posix/timepoint_to_timespec.hpp b/inst/include/boost/interprocess/sync/posix/timepoint_to_timespec.hpp
index 297fe8adf..6f5d795cc 100644
--- a/inst/include/boost/interprocess/sync/posix/timepoint_to_timespec.hpp
+++ b/inst/include/boost/interprocess/sync/posix/timepoint_to_timespec.hpp
@@ -21,7 +21,7 @@
 
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 namespace boost {
 
@@ -50,8 +50,9 @@ inline timespec timepoint_to_timespec ( const TimePoint &tm
 inline timespec timepoint_to_timespec (const ustime &tm)
 {
    timespec ts;
-   ts.tv_sec  = static_cast<time_t>(tm.get_microsecs()/1000000u);
-   ts.tv_nsec = static_cast<long>((tm.get_microsecs()%1000000u)*1000u);
+   const boost::uint64_t micros = tm.get_microsecs();
+   ts.tv_sec  = static_cast<time_t>(micros /1000000u);
+   ts.tv_nsec = static_cast<long>((micros%1000000u)*1000u);
    return ts;
 }
 
@@ -63,17 +64,20 @@ inline timespec timepoint_to_timespec ( const TimePoint &tm
    duration_t d(tm.time_since_epoch());
 
    timespec ts;
+   const typename duration_t::rep cnt = d.count();
+
    BOOST_IF_CONSTEXPR(duration_t::period::num == 1 && duration_t::period::den == 1000000000)
    {
-      ts.tv_sec  = static_cast<time_t>(d.count()/duration_t::period::den);
-      ts.tv_nsec = static_cast<long>(d.count()%duration_t::period::den);
+
+      ts.tv_sec  = static_cast<time_t>(cnt /duration_t::period::den);
+      ts.tv_nsec = static_cast<long>(cnt%duration_t::period::den);
    }
    else
    {
       const double factor = double(duration_t::period::num)/double(duration_t::period::den);
-      const double res = d.count()*factor;
+      const double res = double(cnt)*factor;
       ts.tv_sec  = static_cast<time_t>(res);
-      ts.tv_nsec = static_cast<long>(res - double(ts.tv_sec));
+      ts.tv_nsec = static_cast<long>(1000000000.0*(res - double(ts.tv_sec)));
    }
    return ts;
 }
diff --git a/inst/include/boost/interprocess/sync/scoped_lock.hpp b/inst/include/boost/interprocess/sync/scoped_lock.hpp
index 35e1cc4cf..3a1a2b4c2 100644
--- a/inst/include/boost/interprocess/sync/scoped_lock.hpp
+++ b/inst/include/boost/interprocess/sync/scoped_lock.hpp
@@ -253,8 +253,8 @@ class scoped_lock
    //!Notes: The destructor behavior ensures that the mutex lock is not leaked.*/
    ~scoped_lock()
    {
-      BOOST_TRY{  if(m_locked && mp_mutex)   mp_mutex->unlock();  }
-      BOOST_CATCH(...){} BOOST_CATCH_END
+      BOOST_INTERPROCESS_TRY{  if(m_locked && mp_mutex)   mp_mutex->unlock();  }
+      BOOST_INTERPROCESS_CATCH(...){} BOOST_INTERPROCESS_CATCH_END
    }
 
    //!Effects: If owns() before the call, then unlock() is called on mutex().
diff --git a/inst/include/boost/interprocess/sync/sharable_lock.hpp b/inst/include/boost/interprocess/sync/sharable_lock.hpp
index 7bdcd97b7..1fae65da0 100644
--- a/inst/include/boost/interprocess/sync/sharable_lock.hpp
+++ b/inst/include/boost/interprocess/sync/sharable_lock.hpp
@@ -182,10 +182,10 @@ class sharable_lock
    //!Notes: The destructor behavior ensures that the mutex lock is not leaked.
    ~sharable_lock()
    {
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          if(m_locked && mp_mutex)   mp_mutex->unlock_sharable();
       }
-      BOOST_CATCH(...){} BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH(...){} BOOST_INTERPROCESS_CATCH_END
    }
 
    //!Effects: If owns() before the call, then unlock_sharable() is called on mutex().
diff --git a/inst/include/boost/interprocess/sync/shm/named_condition.hpp b/inst/include/boost/interprocess/sync/shm/named_condition.hpp
index c363d3d72..6f8c178db 100644
--- a/inst/include/boost/interprocess/sync/shm/named_condition.hpp
+++ b/inst/include/boost/interprocess/sync/shm/named_condition.hpp
@@ -23,7 +23,6 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 #include <boost/interprocess/sync/cv_status.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
@@ -33,6 +32,7 @@
 #include <boost/interprocess/sync/shm/named_creation_functor.hpp>
 #include <boost/interprocess/sync/named_mutex.hpp>
 #include <boost/interprocess/permissions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #if defined (BOOST_INTERPROCESS_NAMED_MUTEX_USES_POSIX_SEMAPHORES)
    #include <boost/interprocess/sync/interprocess_mutex.hpp>
    #include <boost/interprocess/sync/scoped_lock.hpp>
diff --git a/inst/include/boost/interprocess/sync/shm/named_condition_any.hpp b/inst/include/boost/interprocess/sync/shm/named_condition_any.hpp
index dae43541b..b1f81fa01 100644
--- a/inst/include/boost/interprocess/sync/shm/named_condition_any.hpp
+++ b/inst/include/boost/interprocess/sync/shm/named_condition_any.hpp
@@ -23,7 +23,6 @@
 #include <boost/interprocess/detail/workaround.hpp>
 
 #include <boost/interprocess/sync/cv_status.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/interprocess/detail/type_traits.hpp>
 #include <boost/interprocess/creation_tags.hpp>
 #include <boost/interprocess/exceptions.hpp>
@@ -35,6 +34,7 @@
 #include <boost/interprocess/permissions.hpp>
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/detail/condition_any_algorithm.hpp>
 
 //!\file
diff --git a/inst/include/boost/interprocess/sync/shm/named_mutex.hpp b/inst/include/boost/interprocess/sync/shm/named_mutex.hpp
index 1d252879b..123f26ace 100644
--- a/inst/include/boost/interprocess/sync/shm/named_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/shm/named_mutex.hpp
@@ -30,6 +30,7 @@
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/detail/managed_open_or_create_impl.hpp>
 #include <boost/interprocess/sync/shm/named_creation_functor.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 //!\file
 //!Describes a named mutex class for inter-process synchronization
diff --git a/inst/include/boost/interprocess/sync/shm/named_recursive_mutex.hpp b/inst/include/boost/interprocess/sync/shm/named_recursive_mutex.hpp
index 3902162f9..437588ea2 100644
--- a/inst/include/boost/interprocess/sync/shm/named_recursive_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/shm/named_recursive_mutex.hpp
@@ -28,6 +28,7 @@
 #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
 #include <boost/interprocess/sync/shm/named_creation_functor.hpp>
 #include <boost/interprocess/permissions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 //!\file
 //!Describes a named shm_named_recursive_mutex class for inter-process synchronization
diff --git a/inst/include/boost/interprocess/sync/spin/condition.hpp b/inst/include/boost/interprocess/sync/spin/condition.hpp
index cf3a15970..5eead3e82 100644
--- a/inst/include/boost/interprocess/sync/spin/condition.hpp
+++ b/inst/include/boost/interprocess/sync/spin/condition.hpp
@@ -28,7 +28,7 @@
 #include <boost/interprocess/sync/scoped_lock.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/detail/os_thread_functions.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/spin/wait.hpp>
 #include <boost/move/utility_core.hpp>
 #include <boost/cstdint.hpp>
@@ -70,7 +70,7 @@ class spin_condition
    {
       if (!lock)
          throw lock_exception();
-      this->do_timed_wait_impl<false>(0, *lock.mutex());
+      this->do_timed_wait_impl<false>(ustime(0u), *lock.mutex());
    }
 
    template <typename L, typename Pr>
@@ -80,7 +80,7 @@ class spin_condition
          throw lock_exception();
 
       while (!pred())
-         this->do_timed_wait_impl<false>(0, *lock.mutex());
+         this->do_timed_wait_impl<false>(ustime(0u), *lock.mutex());
    }
 
    template <typename L, typename TimePoint>
@@ -168,7 +168,8 @@ class spin_condition
 
             //Check for timeout
             if(TimeoutEnabled){
-               TimePoint now = get_now<TimePoint>(bool_<TimeoutEnabled>());
+               typedef typename microsec_clock<TimePoint>::time_point time_point;
+               time_point now = get_now<TimePoint>(bool_<TimeoutEnabled>());
 
                if(now >= abs_time){
                   //If we can lock the mutex it means that no notification
@@ -239,12 +240,12 @@ class spin_condition
    }
 
    template <class TimePoint>
-   static TimePoint get_now(bool_<true>)
+   static typename microsec_clock<TimePoint>::time_point get_now(bool_<true>)
    {  return microsec_clock<TimePoint>::universal_time();  }
 
    template <class TimePoint>
-   static TimePoint get_now(bool_<false>)
-   {  return TimePoint();  }
+   static typename microsec_clock<TimePoint>::time_point get_now(bool_<false>)
+   {  return typename microsec_clock<TimePoint>::time_point();  }
 
    template <class Mutex, class Lock, class TimePoint>
    static void  get_lock(bool_<true>, Mutex &m, Lock &lck, const TimePoint &abs_time)
diff --git a/inst/include/boost/interprocess/sync/spin/mutex.hpp b/inst/include/boost/interprocess/sync/spin/mutex.hpp
index ce9f87fe7..2cccce226 100644
--- a/inst/include/boost/interprocess/sync/spin/mutex.hpp
+++ b/inst/include/boost/interprocess/sync/spin/mutex.hpp
@@ -26,6 +26,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/interprocess/detail/os_thread_functions.hpp>
 #include <boost/interprocess/sync/detail/common_algorithms.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 namespace boost {
 namespace interprocess {
diff --git a/inst/include/boost/interprocess/sync/spin/recursive_mutex.hpp b/inst/include/boost/interprocess/sync/spin/recursive_mutex.hpp
index 3a9e94a99..a2a855779 100644
--- a/inst/include/boost/interprocess/sync/spin/recursive_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/spin/recursive_mutex.hpp
@@ -44,6 +44,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/interprocess/detail/os_thread_functions.hpp>
 #include <boost/interprocess/sync/spin/mutex.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/assert.hpp>
 
 namespace boost {
diff --git a/inst/include/boost/interprocess/sync/spin/wait.hpp b/inst/include/boost/interprocess/sync/spin/wait.hpp
index 984f91ad0..0653aeb5b 100644
--- a/inst/include/boost/interprocess/sync/spin/wait.hpp
+++ b/inst/include/boost/interprocess/sync/spin/wait.hpp
@@ -32,21 +32,42 @@
 #include <iostream>
 #endif
 
-// BOOST_INTERPROCESS_SMT_PAUSE
+//Forward declaration of MSVC intrinsics
+#if defined(_MSC_VER)
+#if defined(_M_AMD64) || defined(_M_IX86) || defined(_M_X64)
+extern "C" void _mm_pause(void);
+#if defined(BOOST_MSVC)
+#pragma intrinsic(_mm_pause)
+#endif
+#elif defined(_M_ARM64) || defined(_M_ARM)
+extern "C" void __yield(void);
+#if defined(BOOST_MSVC)
+#pragma intrinsic(__yield)
+#endif
+#endif
+#endif
 
-#if defined(_MSC_VER) && ( defined(_M_IX86) || defined(_M_X64) )
+// BOOST_INTERPROCESS_SMT_PAUSE
 
-extern "C" void _mm_pause();
-#pragma intrinsic( _mm_pause )
+#if defined(_MSC_VER) && ( defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) )
 
 #define BOOST_INTERPROCESS_SMT_PAUSE _mm_pause();
 
+#elif defined(_MSC_VER) && ( defined(_M_ARM64) || defined(_M_ARM) )
+
+#define BOOST_INTERPROCESS_SMT_PAUSE __yield();
+
 #elif defined(__GNUC__) && ( defined(__i386__) || defined(__x86_64__) ) && !defined(_CRAYC)
 
-#define BOOST_INTERPROCESS_SMT_PAUSE __asm__ __volatile__( "rep; nop" : : : "memory" );
+#define BOOST_INTERPROCESS_SMT_PAUSE   __asm__ __volatile__("rep; nop" : : : "memory");
 
+#elif defined(__GNUC__) && ((defined(__ARM_ARCH) && __ARM_ARCH >= 8) || defined(__ARM_ARCH_8A__) || defined(__aarch64__))
+
+#define BOOST_INTERPROCESS_SMT_PAUSE   __asm__ __volatile__("yield;" : : : "memory");
+    
 #endif
 
+
 namespace boost{
 namespace interprocess{
 namespace ipcdetail {
diff --git a/inst/include/boost/interprocess/sync/upgradable_lock.hpp b/inst/include/boost/interprocess/sync/upgradable_lock.hpp
index 787cf16e1..34ffd3463 100644
--- a/inst/include/boost/interprocess/sync/upgradable_lock.hpp
+++ b/inst/include/boost/interprocess/sync/upgradable_lock.hpp
@@ -184,10 +184,10 @@ class upgradable_lock
    //!Notes: The destructor behavior ensures that the mutex lock is not leaked.
    ~upgradable_lock()
    {
-      BOOST_TRY{
+      BOOST_INTERPROCESS_TRY{
          if(m_locked && mp_mutex)   mp_mutex->unlock_upgradable();
       }
-      BOOST_CATCH(...){} BOOST_CATCH_END
+      BOOST_INTERPROCESS_CATCH(...){} BOOST_INTERPROCESS_CATCH_END
    }
 
    //!Effects: If owns(), then unlock_upgradable() is called on mutex().
diff --git a/inst/include/boost/interprocess/sync/windows/condition.hpp b/inst/include/boost/interprocess/sync/windows/condition.hpp
index 255cb69c1..fca3f1f8d 100644
--- a/inst/include/boost/interprocess/sync/windows/condition.hpp
+++ b/inst/include/boost/interprocess/sync/windows/condition.hpp
@@ -28,6 +28,7 @@
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/sync/windows/semaphore.hpp>
 #include <boost/interprocess/sync/windows/mutex.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <boost/interprocess/sync/detail/condition_algorithm_8a.hpp>
 
 
diff --git a/inst/include/boost/interprocess/sync/windows/mutex.hpp b/inst/include/boost/interprocess/sync/windows/mutex.hpp
index e1bd19080..ce168f89b 100644
--- a/inst/include/boost/interprocess/sync/windows/mutex.hpp
+++ b/inst/include/boost/interprocess/sync/windows/mutex.hpp
@@ -26,6 +26,7 @@
 #include <boost/interprocess/sync/windows/sync_utils.hpp>
 #include <boost/interprocess/sync/windows/winapi_mutex_wrapper.hpp>
 #include <boost/interprocess/exceptions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 
 namespace boost {
diff --git a/inst/include/boost/interprocess/sync/windows/named_condition_any.hpp b/inst/include/boost/interprocess/sync/windows/named_condition_any.hpp
index c00601cd9..f13a5f944 100644
--- a/inst/include/boost/interprocess/sync/windows/named_condition_any.hpp
+++ b/inst/include/boost/interprocess/sync/windows/named_condition_any.hpp
@@ -29,6 +29,7 @@
 #include <boost/interprocess/sync/windows/named_sync.hpp>
 #include <boost/interprocess/sync/windows/winapi_semaphore_wrapper.hpp>
 #include <boost/interprocess/sync/detail/condition_algorithm_8a.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 
 namespace boost {
 namespace interprocess {
diff --git a/inst/include/boost/interprocess/sync/windows/named_mutex.hpp b/inst/include/boost/interprocess/sync/windows/named_mutex.hpp
index b3d3246e0..029eb61d5 100644
--- a/inst/include/boost/interprocess/sync/windows/named_mutex.hpp
+++ b/inst/include/boost/interprocess/sync/windows/named_mutex.hpp
@@ -28,6 +28,7 @@
 #include <boost/interprocess/sync/windows/winapi_mutex_wrapper.hpp>
 #include <boost/interprocess/errors.hpp>
 #include <boost/interprocess/exceptions.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <limits>
 
 namespace boost {
diff --git a/inst/include/boost/interprocess/sync/windows/named_sync.hpp b/inst/include/boost/interprocess/sync/windows/named_sync.hpp
index 28f498c6f..1e960fd3b 100644
--- a/inst/include/boost/interprocess/sync/windows/named_sync.hpp
+++ b/inst/include/boost/interprocess/sync/windows/named_sync.hpp
@@ -81,7 +81,7 @@ inline windows_named_sync::windows_named_sync()
 
 inline void windows_named_sync::close(windows_named_sync_interface &sync_interface)
 {
-   const std::size_t buflen = sync_interface.get_data_size();
+   const unsigned long buflen = static_cast<unsigned long>(sync_interface.get_data_size());
    winapi::interprocess_overlapped overlapped;
    if(winapi::lock_file_ex
       (m_file_hnd, winapi::lockfile_exclusive_lock, 0, 1, 0, &overlapped)){
@@ -129,7 +129,7 @@ inline void windows_named_sync::open_or_create
       bool success = false;
       if(m_file_hnd != winapi::invalid_handle_value){
          //Now lock the file
-         const std::size_t buflen = sync_interface.get_data_size();
+         const unsigned long buflen = static_cast<unsigned long>(sync_interface.get_data_size());
          typedef __int64 unique_id_type;
          const std::size_t sizeof_file_info = sizeof(unique_id_type) + buflen;
          winapi::interprocess_overlapped overlapped;
@@ -204,28 +204,28 @@ inline void windows_named_sync::open_or_create
 
 inline bool windows_named_sync::remove(const char *name)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       //Make sure a temporary path is created for shared memory
       std::string semfile;
       ipcdetail::shared_filepath(name, semfile);
       return winapi::unlink_file(semfile.c_str());
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 inline bool windows_named_sync::remove(const wchar_t *name)
 {
-   BOOST_TRY{
+   BOOST_INTERPROCESS_TRY{
       //Make sure a temporary path is created for shared memory
       std::wstring semfile;
       ipcdetail::shared_filepath(name, semfile);
       return winapi::unlink_file(semfile.c_str());
    }
-   BOOST_CATCH(...){
+   BOOST_INTERPROCESS_CATCH(...){
       return false;
-   } BOOST_CATCH_END
+   } BOOST_INTERPROCESS_CATCH_END
 }
 
 }  //namespace ipcdetail {
diff --git a/inst/include/boost/interprocess/sync/windows/sync_utils.hpp b/inst/include/boost/interprocess/sync/windows/sync_utils.hpp
index 04106318c..e431df395 100644
--- a/inst/include/boost/interprocess/sync/windows/sync_utils.hpp
+++ b/inst/include/boost/interprocess/sync/windows/sync_utils.hpp
@@ -30,7 +30,7 @@
 
 //Shield against external warnings
 #include <boost/interprocess/detail/config_external_begin.hpp>
-#include <boost/unordered/unordered_map.hpp>
+#include <boost/container/map.hpp>
 #include <boost/interprocess/detail/config_external_end.hpp>
 #include <boost/container/flat_map.hpp>
 
@@ -101,11 +101,14 @@ class sync_id
    {  return rand_;  }
 
    friend std::size_t hash_value(const sync_id &m)
-   {  return boost::hash_value(m.rand_);  }
+   {  return static_cast<std::size_t>(m.rand_);  }
 
    friend bool operator==(const sync_id &l, const sync_id &r)
    {  return l.rand_ == r.rand_;  }
 
+   friend bool operator<(const sync_id &l, const sync_id &r)
+   {  return l.rand_ < r.rand_;  }
+
    private:
    internal_type rand_;
 };
@@ -118,9 +121,10 @@ class sync_handles
    private:
 
    //key: id -> mapped: HANDLE. Hash map to allow efficient sync operations
-   typedef boost::unordered_map<sync_id, void*> umap_type;
-   //key: ordered address of the sync type -> iterator from umap_type. Ordered map to allow closing handles when unmapping
-   typedef boost::container::flat_map<const void*, umap_type::iterator> map_type;
+   typedef boost::container::flat_map<sync_id, void*> id_map_type;
+   //key: ordered address of the sync type -> key from id_map_type. Ordered map to allow closing handles when unmapping
+   // Can't store iterators into id_map_type because they would get invalidated.
+   typedef boost::container::flat_map<const void*, sync_id> addr_map_type;
    static const std::size_t LengthOfGlobal = sizeof("Global\\boost.ipc")-1;
    static const std::size_t StrSize        = LengthOfGlobal + (sizeof(sync_id)*2+1);
    typedef char NameBuf[StrSize];
@@ -183,13 +187,13 @@ class sync_handles
 
    void *obtain_mutex(const sync_id &id, const void *mapping_address, bool *popen_created = 0)
    {
-      umap_type::value_type v(id, (void*)0);
+      id_map_type::value_type v(id, (void*)0);
       scoped_lock<spin_mutex> lock(mtx_);
-      umap_type::iterator it = umap_.insert(v).first;
+      id_map_type::iterator it = umap_.insert(v).first;
       void *&hnd_val = it->second;
       if(!hnd_val){
          BOOST_ASSERT(map_.find(mapping_address) == map_.end());
-         map_[mapping_address] = it;
+         map_[mapping_address] = id;
          hnd_val = open_or_create_mutex(id);
          if(popen_created) *popen_created = true;
          ++num_handles_;
@@ -204,13 +208,13 @@ class sync_handles
 
    void *obtain_semaphore(const sync_id &id, const void *mapping_address, unsigned int initial_count, bool *popen_created = 0)
    {
-      umap_type::value_type v(id, (void*)0);
+      id_map_type::value_type v(id, (void*)0);
       scoped_lock<spin_mutex> lock(mtx_);
-      umap_type::iterator it = umap_.insert(v).first;
+      id_map_type::iterator it = umap_.insert(v).first;
       void *&hnd_val = it->second;
       if(!hnd_val){
          BOOST_ASSERT(map_.find(mapping_address) == map_.end());
-         map_[mapping_address] = it;
+         map_[mapping_address] = id;
          hnd_val = open_or_create_semaphore(id, initial_count);
          if(popen_created) *popen_created = true;
          ++num_handles_;
@@ -225,8 +229,8 @@ class sync_handles
    void destroy_handle(const sync_id &id, const void *mapping_address)
    {
       scoped_lock<spin_mutex> lock(mtx_);
-      umap_type::iterator it = umap_.find(id);
-      umap_type::iterator itend = umap_.end();
+      id_map_type::iterator it = umap_.find(id);
+      id_map_type::iterator itend = umap_.end();
 
       if(it != itend){
          winapi::close_handle(it->second);
@@ -243,13 +247,15 @@ class sync_handles
       const void *low_id(addr);
       const void *hig_id(static_cast<const char*>(addr)+size);
       scoped_lock<spin_mutex> lock(mtx_);
-      map_type::iterator itlow(map_.lower_bound(low_id)),
+      addr_map_type::iterator itlow(map_.lower_bound(low_id)),
                          ithig(map_.lower_bound(hig_id)),
                          it(itlow);
       for (; it != ithig; ++it){
-         umap_type::iterator uit = it->second; 
+         sync_id ukey = it->second;
+         id_map_type::iterator uit = umap_.find(ukey);
+         BOOST_ASSERT(uit != umap_.end());
          void * const hnd = uit->second;
-         umap_.erase(uit);
+         umap_.erase(ukey);
          int ret = winapi::close_handle(hnd);
          --num_handles_;
          BOOST_ASSERT(ret != 0); (void)ret;  //Sanity check that handle was ok
@@ -260,8 +266,8 @@ class sync_handles
 
    private:
    spin_mutex mtx_;
-   umap_type umap_;
-   map_type map_;
+   id_map_type umap_;
+   addr_map_type map_;
    std::size_t num_handles_;
 };
 
diff --git a/inst/include/boost/interprocess/sync/windows/winapi_wrapper_common.hpp b/inst/include/boost/interprocess/sync/windows/winapi_wrapper_common.hpp
index 60794903d..5dcb0bec1 100644
--- a/inst/include/boost/interprocess/sync/windows/winapi_wrapper_common.hpp
+++ b/inst/include/boost/interprocess/sync/windows/winapi_wrapper_common.hpp
@@ -24,7 +24,7 @@
 #include <boost/interprocess/detail/win32_api.hpp>
 #include <boost/interprocess/errors.hpp>
 #include <boost/interprocess/exceptions.hpp>
-#include <boost/interprocess/detail/timed_utils.hpp>
+#include <boost/interprocess/timed_utils.hpp>
 #include <limits>
 
 namespace boost {
@@ -60,7 +60,8 @@ inline bool winapi_wrapper_timed_wait_for_single_object(void *handle, const Time
       time_ms = winapi::infinite_time;
    }
    else {
-      const TimePoint cur_time = microsec_clock<TimePoint>::universal_time();
+      typedef typename microsec_clock<TimePoint>::time_point time_point;
+      const time_point cur_time = microsec_clock<TimePoint>::universal_time();
       if(abs_time > cur_time){
          time_ms = static_cast<unsigned long>(duration_to_milliseconds(abs_time - cur_time));
       }
diff --git a/inst/include/boost/interprocess/timed_utils.hpp b/inst/include/boost/interprocess/timed_utils.hpp
new file mode 100644
index 000000000..768203d93
--- /dev/null
+++ b/inst/include/boost/interprocess/timed_utils.hpp
@@ -0,0 +1,189 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright Ion Gaztanaga 2023-2024. Distributed under the Boost
+// Software License, Version 1.0. (See accompanying file
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/interprocess for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BOOST_INTERPROCESS_TIMED_UTILS_HPP
+#define BOOST_INTERPROCESS_TIMED_UTILS_HPP
+
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+#
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
+
+#include <boost/interprocess/detail/config_begin.hpp>
+#include <boost/interprocess/detail/workaround.hpp>
+#include <boost/interprocess/detail/timed_utils.hpp>
+
+
+//!\file
+//!Describes some simple time-related utilities that can be used to call synchronization primitive and ipc methods that required
+//!waiting until the resource is signalled or a timeout expires.
+//!
+//! These utilities are provided for those users that want to avoid dependence on std::chrono or boost::chrono or boost::date_time
+//! and just want to implement simple portable waits.
+
+namespace boost {
+namespace interprocess {
+
+//!Describes a simple duration type with microsecond resolution that can be used with the ustime time-point utility to call timed functions
+//! of Boost.Interprocess' synchronization classes that expect a time-point (timed_wait, wait_until, timed_lock, lock_until...)
+class ustime;
+
+//!Describes a simple duration type with microsecond resolution that can be used with the ustime time-point utility to call timed functions
+//! of Boost.Interprocess' synchronization classes that expect a duration type (wait_for, lock_for...)
+class usduration
+{
+   public:
+   friend class ustime;
+
+   //!Constructs a duration type that stores microseconds from
+   //!the passed count
+   explicit usduration(boost::uint64_t microsecs = 0u)
+      : m_microsecs(microsecs)
+   {}
+
+   //!Returns the stored microsecond
+   //!count
+   boost::uint64_t get_microsecs() const
+   {  return m_microsecs;  }
+
+   bool operator < (const usduration &other) const
+   {  return m_microsecs < other.m_microsecs; }
+
+   bool operator > (const usduration &other) const
+   {  return m_microsecs > other.m_microsecs; }
+
+   bool operator <= (const usduration &other) const
+   {  return m_microsecs <= other.m_microsecs; }
+
+   bool operator >= (const usduration &other) const
+   {  return m_microsecs >= other.m_microsecs; }
+
+   private:
+   boost::uint64_t m_microsecs;
+};
+
+class ustime
+{
+   public:
+   //!Constructs a time point that is "microsecs" duration away
+   //!from the epoch of the system
+   explicit ustime(boost::uint64_t microsecs = 0u)
+      : m_microsecs(microsecs)
+   {}
+
+   ustime &operator += (const usduration &other)
+   {  m_microsecs += other.m_microsecs; return *this; }
+
+   ustime operator + (const usduration &other)
+   {  ustime r(*this); r += other; return r; }
+
+   ustime &operator -= (const usduration &other)
+   {  m_microsecs -= other.m_microsecs; return *this; }
+
+   ustime operator - (const usduration &other)
+   {  ustime r(*this); r -= other; return r; }
+
+   friend usduration operator - (const ustime &l, const ustime &r)
+   {  return usduration(l.m_microsecs - r.m_microsecs); }
+
+   bool operator < (const ustime &other) const
+   {  return m_microsecs < other.m_microsecs; }
+
+   bool operator > (const ustime &other) const
+   {  return m_microsecs > other.m_microsecs; }
+
+   bool operator <= (const ustime &other) const
+   {  return m_microsecs <= other.m_microsecs; }
+
+   bool operator >= (const ustime &other) const
+   {  return m_microsecs >= other.m_microsecs; }
+
+   //!Returns the stored count
+   //!that represents microseconds from epoch
+   boost::uint64_t get_microsecs() const
+   {  return m_microsecs;  }
+
+   private:
+   boost::uint64_t m_microsecs;
+};
+
+//!Utility that returns a duration from
+//!a seconds count
+inline usduration usduration_from_seconds(boost::uint64_t sec)
+{  return usduration(sec*uint64_t(1000000u));   }
+
+//!Utility that returns a duration from
+//!a milliseconds count
+inline usduration usduration_from_milliseconds(boost::uint64_t millisec)
+{  return usduration(millisec*1000u);   }
+
+//!Utility that returns a time_point in the future that is "msecs"
+//!milliseconds in the future from now.
+inline ustime ustime_delay_milliseconds(unsigned msecs)
+{
+   return ustime(ipcdetail::universal_time_u64_us()) + usduration(msecs*1000u);
+}
+
+#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
+
+namespace ipcdetail {
+
+template<>
+class microsec_clock<ustime>
+{
+   public:
+   typedef ustime time_point;
+
+   static ustime universal_time()
+   {  return ustime(universal_time_u64_us());   }
+};
+
+// duration_to_usduration
+
+template<class Duration>
+inline usduration duration_to_usduration(const Duration &d, typename enable_if_ptime_duration<Duration>::type* = 0)
+{
+   return usduration(static_cast<boost::uint64_t>(d.total_microseconds()));
+}
+
+template<class Duration>
+inline usduration duration_to_usduration(const Duration &d, typename enable_if_duration<Duration>::type* = 0)
+{
+   const double factor = double(Duration::period::num)*1000000.0/double(Duration::period::den);
+   return usduration(static_cast<boost::uint64_t>(double(d.count())*factor));
+}
+
+inline usduration duration_to_usduration(const usduration &d)
+{
+   return d;
+}
+
+// duration_to_ustime
+
+template<class Duration>
+inline ustime duration_to_ustime(const Duration &d)
+{
+   return microsec_clock<ustime>::universal_time() + (duration_to_usduration)(d);
+}
+
+
+}  //namespace ipcdetail {
+
+#endif   //#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
+
+}  //namespace interprocess {
+}  //namespace boost {
+
+#include <boost/interprocess/detail/config_end.hpp>
+
+#endif   //BOOST_INTERPROCESS_TIMED_UTILS_HPP
diff --git a/inst/include/boost/interprocess/windows_shared_memory.hpp b/inst/include/boost/interprocess/windows_shared_memory.hpp
index eb4bdf926..041b20eea 100644
--- a/inst/include/boost/interprocess/windows_shared_memory.hpp
+++ b/inst/include/boost/interprocess/windows_shared_memory.hpp
@@ -162,7 +162,7 @@ class windows_shared_memory
 #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
 
 inline windows_shared_memory::windows_shared_memory() BOOST_NOEXCEPT
-   :  m_handle(0)
+   :  m_handle(0), m_mode(), m_name()
 {}
 
 inline windows_shared_memory::~windows_shared_memory()
diff --git a/inst/include/boost/intrusive/avl_set.hpp b/inst/include/boost/intrusive/avl_set.hpp
index b03d30459..5c0f8aa24 100644
--- a/inst/include/boost/intrusive/avl_set.hpp
+++ b/inst/include/boost/intrusive/avl_set.hpp
@@ -17,7 +17,6 @@
 #include <boost/intrusive/avltree.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -523,48 +522,52 @@ class avl_set
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE avl_set()
+   inline avl_set()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit avl_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit avl_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE avl_set( Iterator b, Iterator e
+   inline avl_set( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE avl_set(BOOST_RV_REF(avl_set) x)
+   inline avl_set(BOOST_RV_REF(avl_set) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE avl_set& operator=(BOOST_RV_REF(avl_set) x)
+   inline avl_set& operator=(BOOST_RV_REF(avl_set) x)
    {  return static_cast<avl_set &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const avl_set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const avl_set &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(avl_set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(avl_set) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static avl_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static avl_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<avl_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const avl_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const avl_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const avl_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static avl_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static avl_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<avl_set &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const avl_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const avl_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const avl_set &>(Base::container_from_iterator(it));   }
 };
 
@@ -1018,48 +1021,52 @@ class avl_multiset
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE avl_multiset()
+   inline avl_multiset()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit avl_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit avl_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE avl_multiset( Iterator b, Iterator e
+   inline avl_multiset( Iterator b, Iterator e
            , const key_compare &cmp = key_compare()
            , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE avl_multiset(BOOST_RV_REF(avl_multiset) x)
+   inline avl_multiset(BOOST_RV_REF(avl_multiset) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE avl_multiset& operator=(BOOST_RV_REF(avl_multiset) x)
+   inline avl_multiset& operator=(BOOST_RV_REF(avl_multiset) x)
    {  return static_cast<avl_multiset &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const avl_multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const avl_multiset &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(avl_multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(avl_multiset) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static avl_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static avl_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<avl_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const avl_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const avl_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const avl_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static avl_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static avl_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<avl_multiset &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const avl_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const avl_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const avl_multiset &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/avltree.hpp b/inst/include/boost/intrusive/avltree.hpp
index 747d41cc3..09cdb5250 100644
--- a/inst/include/boost/intrusive/avltree.hpp
+++ b/inst/include/boost/intrusive/avltree.hpp
@@ -18,7 +18,6 @@
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>
 #include <boost/intrusive/detail/minimal_pair_header.hpp>
 
-#include <boost/static_assert.hpp>
 #include <boost/intrusive/avl_set_hook.hpp>
 #include <boost/intrusive/detail/avltree_node.hpp>
 #include <boost/intrusive/bstree.hpp>
@@ -533,48 +532,52 @@ class avltree
    typedef typename Base::const_reverse_iterator     const_reverse_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE avltree()
+   inline avltree()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit avltree( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit avltree( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE avltree( bool unique, Iterator b, Iterator e
+   inline avltree( bool unique, Iterator b, Iterator e
          , const key_compare &cmp = key_compare()
          , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE avltree(BOOST_RV_REF(avltree) x)
+   inline avltree(BOOST_RV_REF(avltree) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE avltree& operator=(BOOST_RV_REF(avltree) x)
+   inline avltree& operator=(BOOST_RV_REF(avltree) x)
    {  return static_cast<avltree &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const avltree &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const avltree &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(avltree) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(avltree) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static avltree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static avltree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<avltree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const avltree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const avltree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const avltree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static avltree &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static avltree &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<avltree &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const avltree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const avltree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const avltree &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/avltree_algorithms.hpp b/inst/include/boost/intrusive/avltree_algorithms.hpp
index 0fd158d59..819549065 100644
--- a/inst/include/boost/intrusive/avltree_algorithms.hpp
+++ b/inst/include/boost/intrusive/avltree_algorithms.hpp
@@ -42,7 +42,7 @@ struct avltree_node_cloner
    typedef typename NodeTraits::node_ptr  node_ptr;
    typedef detail::ebo_functor_holder<F>  base_t;
 
-   BOOST_INTRUSIVE_FORCEINLINE avltree_node_cloner(F f)
+   inline avltree_node_cloner(F f)
       :  base_t(f)
    {}
 
diff --git a/inst/include/boost/intrusive/bs_set.hpp b/inst/include/boost/intrusive/bs_set.hpp
index 1755decf1..bb06d24a2 100644
--- a/inst/include/boost/intrusive/bs_set.hpp
+++ b/inst/include/boost/intrusive/bs_set.hpp
@@ -17,7 +17,6 @@
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/bstree.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -520,48 +519,52 @@ class bs_set
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE bs_set()
+   inline bs_set()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit bs_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit bs_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE bs_set( Iterator b, Iterator e
+   inline bs_set( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bs_set(BOOST_RV_REF(bs_set) x)
+   inline bs_set(BOOST_RV_REF(bs_set) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bs_set& operator=(BOOST_RV_REF(bs_set) x)
+   inline bs_set& operator=(BOOST_RV_REF(bs_set) x)
    {  return static_cast<bs_set &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const bs_set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const bs_set &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(bs_set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(bs_set) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bs_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static bs_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<bs_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const bs_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const bs_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const bs_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bs_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static bs_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<bs_set &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const bs_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const bs_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const bs_set &>(Base::container_from_iterator(it));   }
 };
 
@@ -1014,48 +1017,52 @@ class bs_multiset
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE bs_multiset()
+   inline bs_multiset()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit bs_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit bs_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE bs_multiset( Iterator b, Iterator e
+   inline bs_multiset( Iterator b, Iterator e
            , const key_compare &cmp = key_compare()
            , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bs_multiset(BOOST_RV_REF(bs_multiset) x)
+   inline bs_multiset(BOOST_RV_REF(bs_multiset) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bs_multiset& operator=(BOOST_RV_REF(bs_multiset) x)
+   inline bs_multiset& operator=(BOOST_RV_REF(bs_multiset) x)
    {  return static_cast<bs_multiset &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const bs_multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const bs_multiset &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(bs_multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(bs_multiset) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bs_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static bs_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<bs_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const bs_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const bs_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const bs_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bs_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static bs_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<bs_multiset &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const bs_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const bs_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const bs_multiset &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/bstree.hpp b/inst/include/boost/intrusive/bstree.hpp
index 51687ebd2..6877bee23 100644
--- a/inst/include/boost/intrusive/bstree.hpp
+++ b/inst/include/boost/intrusive/bstree.hpp
@@ -16,7 +16,6 @@
 #include <boost/intrusive/intrusive_fwd.hpp>
 
 #include <boost/intrusive/detail/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
 #include <boost/intrusive/bs_set_hook.hpp>
 #include <boost/intrusive/detail/tree_node.hpp>
@@ -105,7 +104,7 @@ struct bstbase3
 
    struct holder_t : public ValueTraits
    {
-      BOOST_INTRUSIVE_FORCEINLINE explicit holder_t(const ValueTraits &vtraits)
+      inline explicit holder_t(const ValueTraits &vtraits)
          : ValueTraits(vtraits)
       {}
       header_holder_type root;
@@ -113,7 +112,7 @@ struct bstbase3
 
    static bstbase3 &get_tree_base_from_end_iterator(const const_iterator &end_iterator)
    {
-      BOOST_STATIC_ASSERT(has_container_from_iterator);
+      BOOST_INTRUSIVE_STATIC_ASSERT(has_container_from_iterator);
       node_ptr p = end_iterator.pointed_node();
       header_holder_type* h = header_holder_type::get_holder(p);
       holder_t *holder = get_parent_from_member<holder_t, header_holder_type>(h, &holder_t::root);
@@ -121,73 +120,73 @@ struct bstbase3
       return *base;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bstbase3(const ValueTraits &vtraits)
+   inline bstbase3(const ValueTraits &vtraits)
       : holder(vtraits)
    {
       node_algorithms::init_header(this->header_ptr());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr header_ptr()
+   inline node_ptr header_ptr()
    { return holder.root.get_node(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr header_ptr() const
+   inline const_node_ptr header_ptr() const
    { return holder.root.get_node(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const value_traits &get_value_traits() const
+   inline const value_traits &get_value_traits() const
    {  return this->holder;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE value_traits &get_value_traits()
+   inline value_traits &get_value_traits()
    {  return this->holder;  }
 
    typedef typename boost::intrusive::value_traits_pointers
       <ValueTraits>::const_value_traits_ptr const_value_traits_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr priv_value_traits_ptr() const
+   inline const_value_traits_ptr priv_value_traits_ptr() const
    {  return pointer_traits<const_value_traits_ptr>::pointer_to(this->get_value_traits());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator begin() BOOST_NOEXCEPT
+   inline iterator begin() BOOST_NOEXCEPT
    {  return iterator(node_algorithms::begin_node(this->header_ptr()), this->priv_value_traits_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT
+   inline const_iterator begin() const BOOST_NOEXCEPT
    {  return cbegin();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT
+   inline const_iterator cbegin() const BOOST_NOEXCEPT
    {  return const_iterator(node_algorithms::begin_node(this->header_ptr()), this->priv_value_traits_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator end() BOOST_NOEXCEPT
+   inline iterator end() BOOST_NOEXCEPT
    {  return iterator(node_algorithms::end_node(this->header_ptr()), this->priv_value_traits_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT
+   inline const_iterator end() const BOOST_NOEXCEPT
    {  return cend();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT
+   inline const_iterator cend() const BOOST_NOEXCEPT
    {  return const_iterator(node_algorithms::end_node(this->header_ptr()), this->priv_value_traits_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator root()
+   inline iterator root()
    {  return iterator(node_algorithms::root_node(this->header_ptr()), this->priv_value_traits_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator root() const
+   inline const_iterator root() const
    {  return croot();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator croot() const
+   inline const_iterator croot() const
    {  return const_iterator(node_algorithms::root_node(this->header_ptr()), this->priv_value_traits_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rbegin()
+   inline reverse_iterator rbegin()
    {  return reverse_iterator(end());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rbegin() const
+   inline const_reverse_iterator rbegin() const
    {  return const_reverse_iterator(end());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crbegin() const
+   inline const_reverse_iterator crbegin() const
    {  return const_reverse_iterator(end());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rend()
+   inline reverse_iterator rend()
    {  return reverse_iterator(begin());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rend() const
+   inline const_reverse_iterator rend() const
    {  return const_reverse_iterator(begin());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crend() const
+   inline const_reverse_iterator crend() const
    {  return const_reverse_iterator(begin());   }
 
    void replace_node(iterator replace_this, reference with_this)
@@ -199,7 +198,7 @@ struct bstbase3
          node_algorithms::init(replace_this.pointed_node());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE void rebalance() BOOST_NOEXCEPT
+   inline void rebalance() BOOST_NOEXCEPT
    {  node_algorithms::rebalance(this->header_ptr()); }
 
    iterator rebalance_subtree(iterator r) BOOST_NOEXCEPT
@@ -207,13 +206,13 @@ struct bstbase3
 
    static iterator s_iterator_to(reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       return iterator (value_traits::to_node_ptr(value), const_value_traits_ptr());
    }
 
    static const_iterator s_iterator_to(const_reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       return const_iterator (value_traits::to_node_ptr(*pointer_traits<pointer>::const_cast_from(pointer_traits<const_pointer>::pointer_to(value))), const_value_traits_ptr());
    }
 
@@ -223,7 +222,7 @@ struct bstbase3
    const_iterator iterator_to(const_reference value) const BOOST_NOEXCEPT
    {  return const_iterator (this->get_value_traits().to_node_ptr(*pointer_traits<pointer>::const_cast_from(pointer_traits<const_pointer>::pointer_to(value))), this->priv_value_traits_ptr()); }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void init_node(reference value)
+   inline static void init_node(reference value)
    { node_algorithms::init(value_traits::to_node_ptr(value)); }
 
 };
@@ -314,17 +313,17 @@ struct bstbase2
    typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<const_pointer>::difference_type)      difference_type;
    typedef typename node_algorithms::insert_commit_data insert_commit_data;
 
-   BOOST_INTRUSIVE_FORCEINLINE value_compare value_comp() const
+   inline value_compare value_comp() const
    {  return this->get_comp();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE key_compare key_comp() const
+   inline key_compare key_comp() const
    {  return this->get_comp().key_comp();   }
 
    //lower_bound
-   BOOST_INTRUSIVE_FORCEINLINE iterator lower_bound(const key_type &key)
+   inline iterator lower_bound(const key_type &key)
    {  return this->lower_bound(key, this->key_comp());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator lower_bound(const key_type &key) const
+   inline const_iterator lower_bound(const key_type &key) const
    {  return this->lower_bound(key, this->key_comp());   }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -342,7 +341,7 @@ struct bstbase2
    }
 
    //upper_bound
-   BOOST_INTRUSIVE_FORCEINLINE iterator upper_bound(const key_type &key)
+   inline iterator upper_bound(const key_type &key)
    {  return this->upper_bound(key, this->key_comp());   }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -352,7 +351,7 @@ struct bstbase2
          (this->header_ptr(), key, this->key_node_comp(comp)), this->priv_value_traits_ptr());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator upper_bound(const key_type &key) const
+   inline const_iterator upper_bound(const key_type &key) const
    {  return this->upper_bound(key, this->key_comp());   }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -367,13 +366,13 @@ struct bstbase2
    {  typedef detail::key_nodeptr_comp<KeyTypeKeyCompare, value_traits, key_of_value> type;  };
 
    template<class KeyTypeKeyCompare>
-   BOOST_INTRUSIVE_FORCEINLINE typename key_node_comp_ret<KeyTypeKeyCompare>::type key_node_comp(KeyTypeKeyCompare comp) const
+   inline typename key_node_comp_ret<KeyTypeKeyCompare>::type key_node_comp(KeyTypeKeyCompare comp) const
    {
       return detail::key_nodeptr_comp<KeyTypeKeyCompare, value_traits, key_of_value>(comp, &this->get_value_traits());
    }
 
    //find
-   BOOST_INTRUSIVE_FORCEINLINE iterator find(const key_type &key)
+   inline iterator find(const key_type &key)
    {  return this->find(key, this->key_comp()); }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -383,7 +382,7 @@ struct bstbase2
          (node_algorithms::find(this->header_ptr(), key, this->key_node_comp(comp)), this->priv_value_traits_ptr());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator find(const key_type &key) const
+   inline const_iterator find(const key_type &key) const
    {  return this->find(key, this->key_comp()); }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -394,7 +393,7 @@ struct bstbase2
    }
 
    //equal_range
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator,iterator> equal_range(const key_type &key)
+   inline std::pair<iterator,iterator> equal_range(const key_type &key)
    {  return this->equal_range(key, this->key_comp());   }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -406,7 +405,7 @@ struct bstbase2
                                           , iterator(ret.second, this->priv_value_traits_ptr()));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<const_iterator, const_iterator>
+   inline std::pair<const_iterator, const_iterator>
       equal_range(const key_type &key) const
    {  return this->equal_range(key, this->key_comp());   }
 
@@ -421,7 +420,7 @@ struct bstbase2
    }
 
    //lower_bound_range
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator,iterator> lower_bound_range(const key_type &key)
+   inline std::pair<iterator,iterator> lower_bound_range(const key_type &key)
    {  return this->lower_bound_range(key, this->key_comp());   }
 
    template<class KeyType, class KeyTypeKeyCompare>
@@ -433,7 +432,7 @@ struct bstbase2
                                           , iterator(ret.second, this->priv_value_traits_ptr()));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<const_iterator, const_iterator>
+   inline std::pair<const_iterator, const_iterator>
       lower_bound_range(const key_type &key) const
    {  return this->lower_bound_range(key, this->key_comp());   }
 
@@ -448,7 +447,7 @@ struct bstbase2
    }
 
    //bounded_range
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator,iterator> bounded_range
+   inline std::pair<iterator,iterator> bounded_range
       (const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed)
    {  return this->bounded_range(lower_key, upper_key, this->key_comp(), left_closed, right_closed);   }
 
@@ -463,7 +462,7 @@ struct bstbase2
                                           , iterator(ret.second, this->priv_value_traits_ptr()));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<const_iterator,const_iterator> bounded_range
+   inline std::pair<const_iterator,const_iterator> bounded_range
       (const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed) const
    {  return this->bounded_range(lower_key, upper_key, this->key_comp(), left_closed, right_closed);   }
 
@@ -479,11 +478,11 @@ struct bstbase2
    }
 
    //insert_unique_check
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert_unique_check
+   inline std::pair<iterator, bool> insert_unique_check
       (const key_type &key, insert_commit_data &commit_data)
    {  return this->insert_unique_check(key, this->key_comp(), commit_data);   }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert_unique_check
+   inline std::pair<iterator, bool> insert_unique_check
       (const_iterator hint, const key_type &key, insert_commit_data &commit_data)
    {  return this->insert_unique_check(hint, key, this->key_comp(), commit_data);   }
 
@@ -528,7 +527,7 @@ struct bstbase_hack
    typedef typename get_algo
       <AlgoType, node_traits>::type                algo_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE bstbase_hack(const key_compare & comp, const ValueTraits &vtraits)
+   inline bstbase_hack(const key_compare & comp, const ValueTraits &vtraits)
       : base_type(comp, vtraits)
    {
       this->sz_traits().set_size(size_type(0));
@@ -536,10 +535,10 @@ struct bstbase_hack
 
    typedef detail::size_holder<ConstantTimeSize, SizeType>     size_traits;
 
-   BOOST_INTRUSIVE_FORCEINLINE size_traits &sz_traits()
+   inline size_traits &sz_traits()
    {  return static_cast<size_traits &>(*this);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const size_traits &sz_traits() const
+   inline const size_traits &sz_traits() const
    {  return static_cast<const size_traits &>(*this);  }
 };
 
@@ -551,13 +550,13 @@ struct bstbase_hack<ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, false, SizeTyp
    typedef bstbase2< ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, AlgoType, HeaderHolder> base_type;
    typedef typename base_type::value_compare       value_compare;
    typedef typename base_type::key_compare         key_compare;
-   BOOST_INTRUSIVE_FORCEINLINE bstbase_hack(const key_compare & comp, const ValueTraits &vtraits)
+   inline bstbase_hack(const key_compare & comp, const ValueTraits &vtraits)
       : base_type(comp, vtraits)
    {}
 
    typedef detail::size_holder<false, SizeType>     size_traits;
 
-   BOOST_INTRUSIVE_FORCEINLINE size_traits sz_traits() const
+   inline size_traits sz_traits() const
    {  return size_traits();  }
 };
 
@@ -579,7 +578,7 @@ struct bstbase
       <AlgoType, node_traits>::type                node_algorithms;
    typedef SizeType                                size_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE bstbase(const key_compare & comp, const ValueTraits &vtraits)
+   inline bstbase(const key_compare & comp, const ValueTraits &vtraits)
       : base_type(comp, vtraits)
    {}
 
@@ -666,7 +665,7 @@ class bstree_impl
    static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value;
 
    //Constant-time size is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink)));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink)));
 
 
    protected:
@@ -742,7 +741,7 @@ class bstree_impl
 
    //! <b>Effects</b>: Equivalent to swap
    //!
-   BOOST_INTRUSIVE_FORCEINLINE bstree_impl& operator=(BOOST_RV_REF(bstree_impl) x)
+   inline bstree_impl& operator=(BOOST_RV_REF(bstree_impl) x)
    {  this->swap(x); return *this;  }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -877,7 +876,8 @@ class bstree_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   static bstree_impl &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   static bstree_impl& container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {
       return static_cast<bstree_impl&>
                (data_type::get_tree_base_from_end_iterator(end_iterator));
@@ -891,7 +891,8 @@ class bstree_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   static const bstree_impl &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   static const bstree_impl & container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {
       return static_cast<bstree_impl&>
                (data_type::get_tree_base_from_end_iterator(end_iterator));
@@ -905,7 +906,8 @@ class bstree_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   static bstree_impl &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   static bstree_impl & container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return container_from_end_iterator(it.end_iterator_from_it());   }
 
    //! <b>Precondition</b>: it must be a valid end const_iterator
@@ -916,7 +918,8 @@ class bstree_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   static const bstree_impl &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   static const bstree_impl & container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return container_from_end_iterator(it.end_iterator_from_it());   }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -1961,7 +1964,7 @@ class bstree_impl
    //! functor a compilation error will be issued.
    static void remove_node(reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!constant_time_size));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!constant_time_size));
       node_ptr to_remove(value_traits::to_node_ptr(value));
       node_algorithms::unlink(to_remove);
       BOOST_IF_CONSTEXPR(safemode_or_autounlink)
@@ -2184,48 +2187,52 @@ class bstree
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE bstree()
+   inline bstree()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit bstree( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit bstree( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE bstree( bool unique, Iterator b, Iterator e
+   inline bstree( bool unique, Iterator b, Iterator e
          , const key_compare &cmp = key_compare()
          , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bstree(BOOST_RV_REF(bstree) x)
+   inline bstree(BOOST_RV_REF(bstree) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bstree& operator=(BOOST_RV_REF(bstree) x)
+   inline bstree& operator=(BOOST_RV_REF(bstree) x)
    {  return static_cast<bstree &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const bstree &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const bstree &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(bstree) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(bstree) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bstree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static bstree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<bstree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const bstree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const bstree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const bstree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bstree &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static bstree &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<bstree &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const bstree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const bstree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const bstree &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/bstree_algorithms.hpp b/inst/include/boost/intrusive/bstree_algorithms.hpp
index 5113a584b..45e6b1819 100644
--- a/inst/include/boost/intrusive/bstree_algorithms.hpp
+++ b/inst/include/boost/intrusive/bstree_algorithms.hpp
@@ -38,7 +38,7 @@ namespace intrusive {
 template <class NodePtr>
 struct insert_commit_data_t
 {
-   BOOST_INTRUSIVE_FORCEINLINE insert_commit_data_t()
+   inline insert_commit_data_t()
       : link_left(false), node()
    {}
    bool     link_left;
@@ -67,7 +67,7 @@ struct bstree_node_checker
    struct return_type
       : public base_checker_t::return_type
    {
-      BOOST_INTRUSIVE_FORCEINLINE return_type()
+      inline return_type()
          : min_key_node_ptr(const_node_ptr()), max_key_node_ptr(const_node_ptr()), node_count(0)
       {}
 
@@ -76,7 +76,7 @@ struct bstree_node_checker
       size_t   node_count;
    };
 
-   BOOST_INTRUSIVE_FORCEINLINE bstree_node_checker(const NodePtrCompare& comp, ExtraChecker extra_checker)
+   inline bstree_node_checker(const NodePtrCompare& comp, ExtraChecker extra_checker)
       : base_checker_t(extra_checker), comp_(comp)
    {}
 
@@ -186,14 +186,14 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    template<class Disposer>
    struct dispose_subtree_disposer
    {
-      BOOST_INTRUSIVE_FORCEINLINE dispose_subtree_disposer(Disposer &disp, node_ptr subtree)
+      inline dispose_subtree_disposer(Disposer &disp, node_ptr subtree)
          : disposer_(&disp), subtree_(subtree)
       {}
 
-      BOOST_INTRUSIVE_FORCEINLINE void release()
+      inline void release()
       {  disposer_ = 0;  }
 
-      BOOST_INTRUSIVE_FORCEINLINE ~dispose_subtree_disposer()
+      inline ~dispose_subtree_disposer()
       {
          if(disposer_){
             dispose_subtree(subtree_, *disposer_);
@@ -213,7 +213,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr begin_node(const_node_ptr header) BOOST_NOEXCEPT
+   inline static node_ptr begin_node(const_node_ptr header) BOOST_NOEXCEPT
    {  return node_traits::get_left(header);   }
 
    //! <b>Requires</b>: 'header' is the header node of a tree.
@@ -223,7 +223,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr end_node(const_node_ptr header) BOOST_NOEXCEPT
+   inline static node_ptr end_node(const_node_ptr header) BOOST_NOEXCEPT
    {  return detail::uncast(header);   }
 
    //! <b>Requires</b>: 'header' is the header node of a tree.
@@ -233,7 +233,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr root_node(const_node_ptr header) BOOST_NOEXCEPT
+   inline static node_ptr root_node(const_node_ptr header) BOOST_NOEXCEPT
    {
       node_ptr p = node_traits::get_parent(header);
       return p ? p : detail::uncast(header);
@@ -247,7 +247,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool unique(const_node_ptr n) BOOST_NOEXCEPT
+   inline static bool unique(const_node_ptr n) BOOST_NOEXCEPT
    { return !NodeTraits::get_parent(n); }
 
    #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
@@ -456,7 +456,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //!   new_node is not equivalent to node_to_be_replaced according to the
    //!   ordering rules. This function is faster than erasing and inserting
    //!   the node, since no rebalancing and comparison is needed. Experimental function
-   BOOST_INTRUSIVE_FORCEINLINE static void replace_node(node_ptr node_to_be_replaced, node_ptr new_node) BOOST_NOEXCEPT
+   inline static void replace_node(node_ptr node_to_be_replaced, node_ptr new_node) BOOST_NOEXCEPT
    {
       replace_node(node_to_be_replaced, base_type::get_header(node_to_be_replaced), new_node);
    }
@@ -875,7 +875,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //!
    //! <b>Throws</b>: If "comp" throws.
    template<class KeyType, class KeyNodePtrCompare>
-   BOOST_INTRUSIVE_FORCEINLINE static std::pair<node_ptr, node_ptr> equal_range
+   inline static std::pair<node_ptr, node_ptr> equal_range
       (const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
    {
       return bounded_range(header, key, key, comp, true, true);
@@ -919,7 +919,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //!
    //! <b>Throws</b>: If "comp" throws.
    template<class KeyType, class KeyNodePtrCompare>
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr lower_bound
+   inline static node_ptr lower_bound
       (const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
    {
       return lower_bound_loop(NodeTraits::get_parent(header), detail::uncast(header), key, comp);
@@ -937,7 +937,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //!
    //! <b>Throws</b>: If "comp" throws.
    template<class KeyType, class KeyNodePtrCompare>
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr upper_bound
+   inline static node_ptr upper_bound
       (const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
    {
       return upper_bound_loop(NodeTraits::get_parent(header), detail::uncast(header), key, comp);
@@ -960,7 +960,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Notes</b>: This function has only sense if a "insert_unique_check" has been
    //!   previously executed to fill "commit_data". No value should be inserted or
    //!   erased between the "insert_check" and "insert_commit" calls.
-   BOOST_INTRUSIVE_FORCEINLINE static void insert_unique_commit
+   inline static void insert_unique_commit
       (node_ptr header, node_ptr new_value, const insert_commit_data &commit_data) BOOST_NOEXCEPT
    {  return insert_commit(header, new_value, commit_data); }
 
@@ -1322,7 +1322,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Amortized constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void erase(node_ptr header, node_ptr z) BOOST_NOEXCEPT
+   inline static void erase(node_ptr header, node_ptr z) BOOST_NOEXCEPT
    {
       data_for_rebalance ignored;
       erase(header, z, ignored);
@@ -1341,7 +1341,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //!
    //! <b>Throws</b>: If the comparison throws.
    template<class NodePtrCompare>
-   BOOST_INTRUSIVE_FORCEINLINE static bool transfer_unique
+   inline static bool transfer_unique
       (node_ptr header1, NodePtrCompare comp, node_ptr header2, node_ptr z)
    {
       data_for_rebalance ignored;
@@ -1358,7 +1358,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //!
    //! <b>Throws</b>: If the comparison throws.
    template<class NodePtrCompare>
-   BOOST_INTRUSIVE_FORCEINLINE static void transfer_equal
+   inline static void transfer_equal
       (node_ptr header1, NodePtrCompare comp, node_ptr header2, node_ptr z)
    {
       data_for_rebalance ignored;
@@ -1635,7 +1635,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_left_child(node_ptr p) BOOST_NOEXCEPT
+   inline static bool is_left_child(node_ptr p) BOOST_NOEXCEPT
    {  return NodeTraits::get_left(NodeTraits::get_parent(p)) == p;  }
 
    //! <b>Requires</b>: p is a node of a tree.
@@ -1645,7 +1645,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_right_child(node_ptr p) BOOST_NOEXCEPT
+   inline static bool is_right_child(node_ptr p) BOOST_NOEXCEPT
    {  return NodeTraits::get_right(NodeTraits::get_parent(p)) == p;  }
 
    static void insert_before_check
diff --git a/inst/include/boost/intrusive/circular_list_algorithms.hpp b/inst/include/boost/intrusive/circular_list_algorithms.hpp
index ab34c7e30..2c99aa051 100644
--- a/inst/include/boost/intrusive/circular_list_algorithms.hpp
+++ b/inst/include/boost/intrusive/circular_list_algorithms.hpp
@@ -80,7 +80,7 @@ class circular_list_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool inited(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool inited(const_node_ptr this_node) BOOST_NOEXCEPT
    {  return !NodeTraits::get_next(this_node); }
 
    //! <b>Effects</b>: Constructs an empty list, making this_node the only
@@ -102,7 +102,7 @@ class circular_list_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_empty(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool is_empty(const_node_ptr this_node) BOOST_NOEXCEPT
    {
       return NodeTraits::get_next(this_node) == this_node;
    }
diff --git a/inst/include/boost/intrusive/circular_slist_algorithms.hpp b/inst/include/boost/intrusive/circular_slist_algorithms.hpp
index 5ce4e8cdb..bc4beaa7e 100644
--- a/inst/include/boost/intrusive/circular_slist_algorithms.hpp
+++ b/inst/include/boost/intrusive/circular_slist_algorithms.hpp
@@ -146,7 +146,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void init_header(node_ptr this_node) BOOST_NOEXCEPT
+   inline static void init_header(node_ptr this_node) BOOST_NOEXCEPT
    {  NodeTraits::set_next(this_node, this_node);  }
 
    //! <b>Requires</b>: 'p' is the first node of a list.
@@ -156,7 +156,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr end_node(const_node_ptr p) BOOST_NOEXCEPT
+   inline static node_ptr end_node(const_node_ptr p) BOOST_NOEXCEPT
    {  return detail::uncast(p);   }
 
    //! <b>Effects</b>: Returns true if this_node_points to an empty list.
@@ -164,7 +164,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_empty(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool is_empty(const_node_ptr this_node) BOOST_NOEXCEPT
    {  return NodeTraits::get_next(this_node) == this_node;  }
 
    //! <b>Effects</b>: Returns true if this_node points to a sentinel node.
@@ -172,7 +172,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_sentinel(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool is_sentinel(const_node_ptr this_node) BOOST_NOEXCEPT
    {  return NodeTraits::get_next(this_node) == node_ptr();  }
 
    //! <b>Effects</b>: Marks this node as a "sentinel" node, a special state that is different from "empty",
@@ -181,7 +181,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void set_sentinel(node_ptr this_node) BOOST_NOEXCEPT
+   inline static void set_sentinel(node_ptr this_node) BOOST_NOEXCEPT
    {  NodeTraits::set_next(this_node, node_ptr());   }
 
    //! <b>Requires</b>: this_node and prev_init_node must be in the same circular list.
@@ -193,7 +193,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Linear to the number of elements between prev_init_node and this_node.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_previous_node(node_ptr prev_init_node, node_ptr this_node) BOOST_NOEXCEPT
+   inline static node_ptr get_previous_node(node_ptr prev_init_node, node_ptr this_node) BOOST_NOEXCEPT
    {  return base_t::get_previous_node(prev_init_node, this_node);   }
 
    //! <b>Requires</b>: this_node must be in a circular list or be an empty circular list.
@@ -203,7 +203,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Linear to the number of elements in the circular list.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_previous_node(node_ptr this_node) BOOST_NOEXCEPT
+   inline static node_ptr get_previous_node(node_ptr this_node) BOOST_NOEXCEPT
    {  return base_t::get_previous_node(this_node, this_node); }
 
    //! <b>Requires</b>: this_node must be in a circular list or be an empty circular list.
@@ -213,7 +213,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Linear to the number of elements in the circular list.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_previous_previous_node(node_ptr this_node) BOOST_NOEXCEPT
+   inline static node_ptr get_previous_previous_node(node_ptr this_node) BOOST_NOEXCEPT
    {  return get_previous_previous_node(this_node, this_node); }
 
    //! <b>Requires</b>: this_node and p must be in the same circular list.
@@ -276,7 +276,7 @@ class circular_slist_algorithms
    //! <b>Complexity</b>: Linear to the number of elements in the circular list.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void link_before (node_ptr nxt_node, node_ptr this_node) BOOST_NOEXCEPT
+   inline static void link_before (node_ptr nxt_node, node_ptr this_node) BOOST_NOEXCEPT
    {  base_t::link_after(get_previous_node(nxt_node), this_node);   }
 
    //! <b>Requires</b>: this_node and other_node must be nodes inserted
@@ -453,7 +453,7 @@ class circular_slist_algorithms
    //!
    //! <b>Throws</b>: Nothing.
    template<class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t detach_and_dispose(node_ptr p, Disposer disposer) BOOST_NOEXCEPT
+   inline static std::size_t detach_and_dispose(node_ptr p, Disposer disposer) BOOST_NOEXCEPT
    {  return base_t::unlink_after_and_dispose(p, p, disposer);   }
 };
 
diff --git a/inst/include/boost/intrusive/detail/algorithm.hpp b/inst/include/boost/intrusive/detail/algorithm.hpp
index d2421ffaa..f20c9d103 100644
--- a/inst/include/boost/intrusive/detail/algorithm.hpp
+++ b/inst/include/boost/intrusive/detail/algorithm.hpp
@@ -26,15 +26,15 @@ namespace intrusive {
 
 struct algo_pred_equal
 {
-   template<class T>
-   bool operator()(const T &x, const T &y) const
+   template<class T, class T2>
+   bool operator()(const T &x, const T2 &y) const
    {  return x == y;  }
 };
 
 struct algo_pred_less
 {
-   template<class T>
-   bool operator()(const T &x, const T &y) const
+   template<class T, class T2>
+   bool operator()(const T &x, const T2 &y) const
    {  return x < y;  }
 };
 
@@ -49,10 +49,6 @@ bool algo_equal(InputIt1 first1, InputIt1 last1, InputIt2 first2, BinaryPredicat
     return true;
 }
 
-template<class InputIt1, class InputIt2>
-bool algo_equal(InputIt1 first1, InputIt1 last1, InputIt2 first2)
-{  return (algo_equal)(first1, last1, first2, algo_pred_equal());  }
-
 template<class InputIt1, class InputIt2, class BinaryPredicate>
 bool algo_equal(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2, BinaryPredicate pred)
 {
@@ -62,6 +58,10 @@ bool algo_equal(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2
     return first1 == last1 && first2 == last2;
 }
 
+template<class InputIt1, class InputIt2>
+bool algo_equal(InputIt1 first1, InputIt1 last1, InputIt2 first2)
+{  return (algo_equal)(first1, last1, first2, algo_pred_equal());  }
+
 template<class InputIt1, class InputIt2>
 bool algo_equal(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2)
 {  return (algo_equal)(first1, last1, first2, last2, algo_pred_equal());  }
diff --git a/inst/include/boost/intrusive/detail/any_node_and_algorithms.hpp b/inst/include/boost/intrusive/detail/any_node_and_algorithms.hpp
index 7949eecdb..d216c5b12 100644
--- a/inst/include/boost/intrusive/detail/any_node_and_algorithms.hpp
+++ b/inst/include/boost/intrusive/detail/any_node_and_algorithms.hpp
@@ -252,7 +252,7 @@ class any_algorithms
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Nodes</b>: If node is inserted in a tree, this function corrupts the tree.
-   BOOST_INTRUSIVE_FORCEINLINE static void init(node_ptr n) BOOST_NOEXCEPT
+   inline static void init(node_ptr n) BOOST_NOEXCEPT
    {  n->node_ptr_1 = node_ptr();   };
 
    //! <b>Effects</b>: Returns true if 'n' is in the same state as if called init(node)
@@ -260,10 +260,10 @@ class any_algorithms
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool inited(const_node_ptr n)
+   inline static bool inited(const_node_ptr n)
    {  return !n->node_ptr_1;  };
 
-   BOOST_INTRUSIVE_FORCEINLINE static bool unique(const_node_ptr n) BOOST_NOEXCEPT
+   inline static bool unique(const_node_ptr n) BOOST_NOEXCEPT
    {  return !n->node_ptr_1; }
 
    static void unlink(node_ptr)
diff --git a/inst/include/boost/intrusive/detail/common_slist_algorithms.hpp b/inst/include/boost/intrusive/detail/common_slist_algorithms.hpp
index 8310231e3..0965079ba 100644
--- a/inst/include/boost/intrusive/detail/common_slist_algorithms.hpp
+++ b/inst/include/boost/intrusive/detail/common_slist_algorithms.hpp
@@ -52,7 +52,7 @@ class common_slist_algorithms
       return p;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void init(node_ptr this_node) BOOST_NOEXCEPT
+   inline static void init(node_ptr this_node) BOOST_NOEXCEPT
    {  NodeTraits::set_next(this_node, node_ptr());  }
 
    static bool unique(const_node_ptr this_node) BOOST_NOEXCEPT
@@ -61,16 +61,16 @@ class common_slist_algorithms
       return !next || next == this_node;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bool inited(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool inited(const_node_ptr this_node) BOOST_NOEXCEPT
    {  return !NodeTraits::get_next(this_node); }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void unlink_after(node_ptr prev_node) BOOST_NOEXCEPT
+   inline static void unlink_after(node_ptr prev_node) BOOST_NOEXCEPT
    {
       const_node_ptr this_node(NodeTraits::get_next(prev_node));
       NodeTraits::set_next(prev_node, NodeTraits::get_next(this_node));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void unlink_after(node_ptr prev_node, node_ptr last_node) BOOST_NOEXCEPT
+   inline static void unlink_after(node_ptr prev_node, node_ptr last_node) BOOST_NOEXCEPT
    {  NodeTraits::set_next(prev_node, last_node);  }
 
    static void link_after(node_ptr prev_node, node_ptr this_node) BOOST_NOEXCEPT
@@ -216,7 +216,7 @@ class common_slist_algorithms
    //!
    //! <b>Throws</b>: Nothing.
    template<class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE static void unlink_after_and_dispose(node_ptr bb, Disposer disposer) BOOST_NOEXCEPT
+   inline static void unlink_after_and_dispose(node_ptr bb, Disposer disposer) BOOST_NOEXCEPT
    {
       node_ptr i = node_traits::get_next(bb);
       node_traits::set_next(bb, node_traits::get_next(i));
diff --git a/inst/include/boost/intrusive/detail/default_header_holder.hpp b/inst/include/boost/intrusive/detail/default_header_holder.hpp
index 42f35d2be..ba665e79b 100644
--- a/inst/include/boost/intrusive/detail/default_header_holder.hpp
+++ b/inst/include/boost/intrusive/detail/default_header_holder.hpp
@@ -40,14 +40,14 @@ struct default_header_holder : public NodeTraits::node
 
    default_header_holder() : node() {}
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_node() const
+   inline const_node_ptr get_node() const
    { return pointer_traits< const_node_ptr >::pointer_to(*static_cast< const node* >(this)); }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_node()
+   inline node_ptr get_node()
    { return pointer_traits< node_ptr >::pointer_to(*static_cast< node* >(this)); }
 
    // (unsafe) downcast used to implement container-from-iterator
-   BOOST_INTRUSIVE_FORCEINLINE static default_header_holder* get_holder(node_ptr p)
+   inline static default_header_holder* get_holder(node_ptr p)
    { return static_cast< default_header_holder* >(boost::movelib::to_raw_pointer(p)); }
 };
 
diff --git a/inst/include/boost/intrusive/detail/ebo_functor_holder.hpp b/inst/include/boost/intrusive/detail/ebo_functor_holder.hpp
index 888316678..1213112c7 100644
--- a/inst/include/boost/intrusive/detail/ebo_functor_holder.hpp
+++ b/inst/include/boost/intrusive/detail/ebo_functor_holder.hpp
@@ -166,57 +166,57 @@ class ebo_functor_holder
    public:
    typedef T functor_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder()
+   inline ebo_functor_holder()
       : t_()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit ebo_functor_holder(const T &t)
+   inline explicit ebo_functor_holder(const T &t)
       : t_(t)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit ebo_functor_holder(BOOST_RV_REF(T) t)
+   inline explicit ebo_functor_holder(BOOST_RV_REF(T) t)
       : t_(::boost::move(t))
    {}
 
    template<class Arg1, class Arg2>
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder(BOOST_FWD_REF(Arg1) arg1, BOOST_FWD_REF(Arg2) arg2)
+   inline ebo_functor_holder(BOOST_FWD_REF(Arg1) arg1, BOOST_FWD_REF(Arg2) arg2)
       : t_(::boost::forward<Arg1>(arg1), ::boost::forward<Arg2>(arg2))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder(const ebo_functor_holder &x)
+   inline ebo_functor_holder(const ebo_functor_holder &x)
       : t_(x.t_)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder(BOOST_RV_REF(ebo_functor_holder) x)
+   inline ebo_functor_holder(BOOST_RV_REF(ebo_functor_holder) x)
       : t_(x.t_)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(BOOST_COPY_ASSIGN_REF(ebo_functor_holder) x)
+   inline ebo_functor_holder& operator=(BOOST_COPY_ASSIGN_REF(ebo_functor_holder) x)
    {
       this->get() = x.get();
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(BOOST_RV_REF(ebo_functor_holder) x)
+   inline ebo_functor_holder& operator=(BOOST_RV_REF(ebo_functor_holder) x)
    {
       this->get() = ::boost::move(x.get());
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(const T &x)
+   inline ebo_functor_holder& operator=(const T &x)
    {
       this->get() = x;
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(BOOST_RV_REF(T) x)
+   inline ebo_functor_holder& operator=(BOOST_RV_REF(T) x)
    {
       this->get() = ::boost::move(x);
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE T&       get(){return t_;}
-   BOOST_INTRUSIVE_FORCEINLINE const T& get()const{return t_;}
+   inline T&       get(){return t_;}
+   inline const T& get()const{return t_;}
 
    private:
    T t_;
@@ -231,58 +231,58 @@ class ebo_functor_holder<T, Tag, false>
    public:
    typedef T functor_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder()
+   inline ebo_functor_holder()
       : T()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit ebo_functor_holder(const T &t)
+   inline explicit ebo_functor_holder(const T &t)
       : T(t)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit ebo_functor_holder(BOOST_RV_REF(T) t)
+   inline explicit ebo_functor_holder(BOOST_RV_REF(T) t)
       : T(::boost::move(t))
    {}
 
    template<class Arg1, class Arg2>
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder(BOOST_FWD_REF(Arg1) arg1, BOOST_FWD_REF(Arg2) arg2)
+   inline ebo_functor_holder(BOOST_FWD_REF(Arg1) arg1, BOOST_FWD_REF(Arg2) arg2)
       : T(::boost::forward<Arg1>(arg1), ::boost::forward<Arg2>(arg2))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder(const ebo_functor_holder &x)
+   inline ebo_functor_holder(const ebo_functor_holder &x)
       : T(static_cast<const T&>(x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder(BOOST_RV_REF(ebo_functor_holder) x)
+   inline ebo_functor_holder(BOOST_RV_REF(ebo_functor_holder) x)
       : T(BOOST_MOVE_BASE(T, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(BOOST_COPY_ASSIGN_REF(ebo_functor_holder) x)
+   inline ebo_functor_holder& operator=(BOOST_COPY_ASSIGN_REF(ebo_functor_holder) x)
    {
       const ebo_functor_holder&r = x;
       this->get() = r;
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(BOOST_RV_REF(ebo_functor_holder) x)
+   inline ebo_functor_holder& operator=(BOOST_RV_REF(ebo_functor_holder) x)
    {
       this->get() = ::boost::move(x.get());
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(const T &x)
+   inline ebo_functor_holder& operator=(const T &x)
    {
       this->get() = x;
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE ebo_functor_holder& operator=(BOOST_RV_REF(T) x)
+   inline ebo_functor_holder& operator=(BOOST_RV_REF(T) x)
    {
       this->get() = ::boost::move(x);
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE T&       get(){return *this;}
-   BOOST_INTRUSIVE_FORCEINLINE const T& get()const{return *this;}
+   inline T&       get(){return *this;}
+   inline const T& get()const{return *this;}
 };
 
 }  //namespace detail {
diff --git a/inst/include/boost/intrusive/detail/equal_to_value.hpp b/inst/include/boost/intrusive/detail/equal_to_value.hpp
index c5d9e5305..48b1f411c 100644
--- a/inst/include/boost/intrusive/detail/equal_to_value.hpp
+++ b/inst/include/boost/intrusive/detail/equal_to_value.hpp
@@ -39,7 +39,7 @@ class equal_to_value
       :  t_(t)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()(ConstReference t)const
+   inline bool operator()(ConstReference t)const
    {  return t_ == t;   }
 };
 
diff --git a/inst/include/boost/intrusive/detail/exception_disposer.hpp b/inst/include/boost/intrusive/detail/exception_disposer.hpp
index 0e21faeba..f76e89172 100644
--- a/inst/include/boost/intrusive/detail/exception_disposer.hpp
+++ b/inst/include/boost/intrusive/detail/exception_disposer.hpp
@@ -41,7 +41,7 @@ class exception_disposer
       :  cont_(&cont), disp_(disp)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void release()
+   inline void release()
    {  cont_ = 0;  }
 
    ~exception_disposer()
diff --git a/inst/include/boost/intrusive/detail/function_detector.hpp b/inst/include/boost/intrusive/detail/function_detector.hpp
index 5ecaeaf07..b5e72ba22 100644
--- a/inst/include/boost/intrusive/detail/function_detector.hpp
+++ b/inst/include/boost/intrusive/detail/function_detector.hpp
@@ -78,7 +78,7 @@ namespace function_detector {
       template <class U> \
       static NotFoundType Test( ... ); \
    public : \
-      static const int check = NotFound + (sizeof(Test<T>(0, 0)) - sizeof(NotFoundType));\
+      static const int check = NotFound + int(sizeof(Test<T>(0, 0)) - sizeof(NotFoundType));\
    };\
 }}} //namespace boost::intrusive::function_detector {
 
diff --git a/inst/include/boost/intrusive/detail/generic_hook.hpp b/inst/include/boost/intrusive/detail/generic_hook.hpp
index 6e43f90d9..e7b62c650 100644
--- a/inst/include/boost/intrusive/detail/generic_hook.hpp
+++ b/inst/include/boost/intrusive/detail/generic_hook.hpp
@@ -27,7 +27,6 @@
 #include <boost/intrusive/detail/assert.hpp>
 #include <boost/intrusive/detail/node_holder.hpp>
 #include <boost/intrusive/detail/algo_type.hpp>
-#include <boost/static_assert.hpp>
 
 namespace boost {
 namespace intrusive {
@@ -41,7 +40,7 @@ struct link_dispatch
 {};
 
 template<class Hook>
-BOOST_INTRUSIVE_FORCEINLINE void destructor_impl(Hook &hook, detail::link_dispatch<safe_link>)
+inline void destructor_impl(Hook &hook, detail::link_dispatch<safe_link>)
 {  //If this assertion raises, you might have destroyed an object
    //while it was still inserted in a container that is alive.
    //If so, remove the object from the container before destroying it.
@@ -49,11 +48,11 @@ BOOST_INTRUSIVE_FORCEINLINE void destructor_impl(Hook &hook, detail::link_dispat
 }
 
 template<class Hook>
-BOOST_INTRUSIVE_FORCEINLINE void destructor_impl(Hook &hook, detail::link_dispatch<auto_unlink>)
+inline void destructor_impl(Hook &hook, detail::link_dispatch<auto_unlink>)
 {  hook.unlink();  }
 
 template<class Hook>
-BOOST_INTRUSIVE_FORCEINLINE void destructor_impl(Hook &, detail::link_dispatch<normal_link>)
+inline void destructor_impl(Hook &, detail::link_dispatch<normal_link>)
 {}
 
 }  //namespace detail {
@@ -161,54 +160,54 @@ class generic_hook
       < NodeTraits
       , Tag, LinkMode, BaseHookType>                  hooktags;
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr this_ptr() BOOST_NOEXCEPT
+   inline node_ptr this_ptr() BOOST_NOEXCEPT
    {  return pointer_traits<node_ptr>::pointer_to(static_cast<node&>(*this)); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr this_ptr() const BOOST_NOEXCEPT
+   inline const_node_ptr this_ptr() const BOOST_NOEXCEPT
    {  return pointer_traits<const_node_ptr>::pointer_to(static_cast<const node&>(*this)); }
 
    public:
    /// @endcond
 
-   BOOST_INTRUSIVE_FORCEINLINE generic_hook() BOOST_NOEXCEPT
+   inline generic_hook() BOOST_NOEXCEPT
    {
       if(hooktags::safemode_or_autounlink){
          node_algorithms::init(this->this_ptr());
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE generic_hook(const generic_hook& ) BOOST_NOEXCEPT
+   inline generic_hook(const generic_hook& ) BOOST_NOEXCEPT
    {
       if(hooktags::safemode_or_autounlink){
          node_algorithms::init(this->this_ptr());
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE generic_hook& operator=(const generic_hook& ) BOOST_NOEXCEPT
+   inline generic_hook& operator=(const generic_hook& ) BOOST_NOEXCEPT
    {  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE ~generic_hook()
+   inline ~generic_hook()
    {
       destructor_impl
          (*this, detail::link_dispatch<hooktags::link_mode>());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE void swap_nodes(generic_hook &other) BOOST_NOEXCEPT
+   inline void swap_nodes(generic_hook &other) BOOST_NOEXCEPT
    {
       node_algorithms::swap_nodes
          (this->this_ptr(), other.this_ptr());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool is_linked() const BOOST_NOEXCEPT
+   inline bool is_linked() const BOOST_NOEXCEPT
    {
       //is_linked() can be only used in safe-mode or auto-unlink
-      BOOST_STATIC_ASSERT(( hooktags::safemode_or_autounlink ));
+      BOOST_INTRUSIVE_STATIC_ASSERT(( hooktags::safemode_or_autounlink ));
       return !node_algorithms::unique(this->this_ptr());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE void unlink() BOOST_NOEXCEPT
+   inline void unlink() BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT(( (int)hooktags::link_mode == (int)auto_unlink ));
+      BOOST_INTRUSIVE_STATIC_ASSERT(( (int)hooktags::link_mode == (int)auto_unlink ));
       node_ptr n(this->this_ptr());
       if(!node_algorithms::inited(n)){
          node_algorithms::unlink(n);
diff --git a/inst/include/boost/intrusive/detail/hash.hpp b/inst/include/boost/intrusive/detail/hash.hpp
new file mode 100644
index 000000000..a18aa3abb
--- /dev/null
+++ b/inst/include/boost/intrusive/detail/hash.hpp
@@ -0,0 +1,277 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2005-2014 Daniel James.
+// Copyright 2021, 2022 Peter Dimov.
+// Copyright 2024 Ion Gaztanaga.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+//
+// Based on Peter Dimov's proposal
+// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
+// issue 6.18.
+//
+// The original C++11 implementation was done by Peter Dimov
+// The C++03 porting was done by Ion Gaztanaga.
+// 
+// The goal of this header is to avoid Intrusive's hard dependency on ContainerHash,
+// which adds additional dependencies and the minimum supported C++ standard can
+// differ between both libraries. However, a compatibility protocol is used so that
+// users compatible with ContainerHash are also compatible with Intrusive:
+// 
+// - If users define `hash_value` (as required by boost::hash) for their classes
+//   are automatically compatible with Intrusive unordered containers.
+//
+// - If users include boost/container_hash/hash.hpp in their headers, Intrusive
+//   unordered containers will take advantage of boost::hash compatibility hash functions
+//   (such as hashing functions for range-compatible types, standard containers, etc.)
+// 
+// See http://www.boost.org/libs/intrusive for documentation.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef BOOST_INTRUSIVE_HASH_HASH_HPP
+#define BOOST_INTRUSIVE_HASH_HASH_HPP
+
+#include <boost/intrusive/detail/config_begin.hpp>
+#include <boost/intrusive/detail/workaround.hpp>
+#include <boost/intrusive/detail/hash_integral.hpp>
+#include <boost/intrusive/detail/hash_mix.hpp>
+#include <boost/intrusive/detail/hash_combine.hpp>
+#include <boost/cstdint.hpp>
+#include <climits>
+#include <cstring>
+#include <cfloat>
+#include <boost/intrusive/detail/mpl.hpp>
+
+namespace boost {
+
+template<class T>
+struct hash;
+
+} //namespace boost
+
+//Fallback function to call boost::hash if scalar type and ADL fail.
+//The user must include boost/container_hash/hash.hpp when to make this call work,
+//this allows boost::intrusive to be compatible with boost::hash without
+//a mandatory physical (header inclusion) dependency
+namespace boost_intrusive_adl
+{
+   template<class T>
+   inline std::size_t hash_value(const T& v)
+   {
+      return boost::hash<T>()(v);
+   }
+}
+
+namespace boost {
+namespace intrusive {
+namespace detail {
+
+//ADL-based lookup hash call
+template <class T>
+inline typename detail::disable_if_c<detail::is_scalar<T>::value, std::size_t>::type
+   hash_value_dispatch(const T& v)
+{
+   //Try ADL lookup, if it fails, boost_intrusive_adl::hash_value will retry with boost::hash
+   using boost_intrusive_adl::hash_value;
+   return hash_value(v);
+}
+
+template <typename T>
+typename enable_if_c<is_enum<T>::value, std::size_t>::type
+   hash_value( T v )
+{
+   return static_cast<std::size_t>( v );
+}
+
+////////////////////////////////////////////////////////////   
+//
+//          floating point types
+//
+////////////////////////////////////////////////////////////
+
+template<class T, std::size_t Bits = sizeof(T) * CHAR_BIT>
+struct hash_float_impl;
+
+// float
+template<class T> struct hash_float_impl<T, 32>
+{
+   static std::size_t fn( T v )
+   {
+         boost::uint32_t w;
+         std::memcpy( &w, &v, sizeof( v ) );
+
+         return w;
+   }
+};
+
+// double
+template<class T> struct hash_float_impl<T, 64>
+{
+   static std::size_t fn( T v )
+   {
+         boost::uint64_t w;
+         std::memcpy( &w, &v, sizeof( v ) );
+
+         return hash_value( w );
+   }
+};
+
+// 80 bit long double in 12 bytes
+template<class T> struct hash_float_impl<T, 96>
+{
+   static std::size_t fn( T v )
+   {
+         boost::uint64_t w[ 2 ] = {};
+         std::memcpy( &w, &v, 80 / CHAR_BIT );
+
+         std::size_t seed = 0;
+
+         seed = hash_value( w[0] ) + (hash_mix)( seed );
+         seed = hash_value( w[1] ) + (hash_mix)( seed );
+
+         return seed;
+   }
+};
+
+#if (LDBL_MAX_10_EXP == 4932)
+
+// 80 bit long double in 16 bytes
+template<class T> struct hash_float_impl<T, 128>
+{
+   static std::size_t fn( T v )
+   {
+      boost::uint64_t w[ 2 ] = {};
+      std::memcpy( &w, &v, 80 / CHAR_BIT );
+
+      std::size_t seed = 0;
+
+      seed = hash_value( w[0] ) + (hash_mix)( seed );
+      seed = hash_value( w[1] ) + (hash_mix)( seed );
+
+      return seed;
+   }
+};
+
+#elif (LDBL_MAX_10_EXP  > 4932)
+// 128 bit long double
+template<class T> struct hash_float_impl<T, 128>
+{
+   static std::size_t fn( T v )
+   {
+      boost::uint64_t w[ 2 ];
+      std::memcpy( &w, &v, sizeof( v ) );
+
+      std::size_t seed = 0;
+
+   #if defined(__FLOAT_WORD_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
+
+      seed = hash_value( w[1] ) + (hash_mix)( seed );
+      seed = hash_value( w[0] ) + (hash_mix)( seed );
+
+   #else
+
+      seed = hash_value( w[0] ) + (hash_mix)( seed );
+      seed = hash_value( w[1] ) + (hash_mix)( seed );
+
+   #endif
+      return seed;
+   }
+};
+#endif   //#if (LDBL_MAX_10_EXP  == 4932)
+
+template <typename T>
+typename enable_if_c<is_floating_point<T>::value, std::size_t>::type
+   hash_value( T v )
+{
+   return boost::intrusive::detail::hash_float_impl<T>::fn( v + 0 );
+}
+
+////////////////////////////////////////////////////////////
+//
+//          pointer types
+//
+////////////////////////////////////////////////////////////
+// `x + (x >> 3)` adjustment by Alberto Barbati and Dave Harris.
+template <class T> std::size_t hash_value( T* const& v )
+{
+   std::size_t x = reinterpret_cast<std::size_t>( v );
+   return hash_value( x + (x >> 3) );
+}
+
+////////////////////////////////////////////////////////////
+//
+//          std::nullptr_t
+//
+////////////////////////////////////////////////////////////
+#if !defined(BOOST_NO_CXX11_NULLPTR)
+template <typename T>
+typename enable_if_c<is_same<T, std::nullptr_t>::value, std::size_t>::type
+   hash_value( T const &)
+{
+   return (hash_value)( static_cast<void*>( nullptr ) );
+}
+   #endif
+
+////////////////////////////////////////////////////////////
+//
+//          Array types
+//
+////////////////////////////////////////////////////////////
+
+//Forward declaration or internal hash functor, for array iteration
+template<class T>
+struct internal_hash_functor;
+
+template<class T, std::size_t N>
+inline std::size_t hash_value_dispatch( T const (&x)[ N ] )
+{
+   std::size_t seed = 0;
+   for(std::size_t i = 0; i != N; ++i){
+      hash_combine_size_t(seed, internal_hash_functor<T>()(x[i]));
+   }
+   return seed;
+}
+
+template<class T, std::size_t N>
+inline std::size_t hash_value_dispatch( T (&x)[ N ] )
+{
+   std::size_t seed = 0;
+   for (std::size_t i = 0; i != N; ++i) {
+      hash_combine_size_t(seed, internal_hash_functor<T>()(x[i]));
+   }
+   return seed;
+}
+
+////////////////////////////////////////////////////////////
+//
+//          Scalar types, calls proper overload
+//
+////////////////////////////////////////////////////////////
+template <class T>
+inline typename detail::enable_if_c<detail::is_scalar<T>::value, std::size_t>::type
+   hash_value_dispatch(const T &v)
+{
+   return boost::intrusive::detail::hash_value(v);
+}
+
+//Internal "anonymous" hash functor, first selects between "built-in" scalar/array types
+//and ADL-based lookup
+
+template<class T>
+struct internal_hash_functor
+{
+   inline std::size_t operator()(T const& val) const
+   {
+      return ::boost::intrusive::detail::hash_value_dispatch(val);
+   }
+};
+
+} // namespace detail {
+} // namespace intrusive {
+} // namespace boost
+
+#include <boost/intrusive/detail/config_end.hpp>
+
+#endif // #ifndef BOOST_INTRUSIVE_HASH_HASH_HPP
+
diff --git a/inst/include/boost/intrusive/detail/hash_combine.hpp b/inst/include/boost/intrusive/detail/hash_combine.hpp
index f089fb0cc..aa6f79732 100644
--- a/inst/include/boost/intrusive/detail/hash_combine.hpp
+++ b/inst/include/boost/intrusive/detail/hash_combine.hpp
@@ -1,3 +1,5 @@
+/////////////////////////////////////////////////////////////////////////////
+//
 // Copyright 2005-2014 Daniel James.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -13,9 +15,14 @@
 // domain. The author hereby disclaims copyright to this source code.
 //
 // Copyright 2021 Ion Gaztanaga
-// Refactored the original boost/container_hash/hash.hpp to avoid
+// Refactored the original Boost ContainerHash library to avoid
 // any heavy std header dependencies to just combine two hash
 // values represented in a std::size_t type.
+//
+// See http://www.boost.org/libs/intrusive for documentation.
+//
+/////////////////////////////////////////////////////////////////////////////
+
 
 #ifndef BOOST_INTRUSIVE_DETAIL_HASH_COMBINE_HPP
 #define BOOST_INTRUSIVE_DETAIL_HASH_COMBINE_HPP
@@ -29,62 +36,17 @@
 #endif
 
 #include <boost/cstdint.hpp>
-
-#if defined(_MSC_VER)
-#  include <stdlib.h>
-#  define BOOST_INTRUSIVE_HASH_ROTL32(x, r) _rotl(x,r)
-#else
-#  define BOOST_INTRUSIVE_HASH_ROTL32(x, r) (x << r) | (x >> (32 - r))
-#endif
+#include "hash_mix.hpp"
 
 namespace boost {
 namespace intrusive {
 namespace detail {
 
-template <typename SizeT>
-inline void hash_combine_size_t(SizeT& seed, SizeT value)
+inline void hash_combine_size_t(std::size_t& seed, std::size_t value)
 {
-   seed ^= value + 0x9e3779b9 + (seed<<6) + (seed>>2);
+   seed = boost::intrusive::detail::hash_mix(seed + 0x9e3779b9 + value);
 }
 
-inline void hash_combine_size_t(boost::uint32_t& h1, boost::uint32_t k1)
-{
-   const uint32_t c1 = 0xcc9e2d51;
-   const uint32_t c2 = 0x1b873593;
-
-   k1 *= c1;
-   k1 = BOOST_INTRUSIVE_HASH_ROTL32(k1,15);
-   k1 *= c2;
-
-   h1 ^= k1;
-   h1 = BOOST_INTRUSIVE_HASH_ROTL32(h1,13);
-   h1 = h1*5+0xe6546b64;
-}
-
-
-   // Don't define 64-bit hash combine on platforms without 64 bit integers,
-   // and also not for 32-bit gcc as it warns about the 64-bit constant.
-   #if !defined(BOOST_NO_INT64_T) && \
-       !(defined(__GNUC__) && ULONG_MAX == 0xffffffff)
-   inline void hash_combine_size_t(boost::uint64_t& h, boost::uint64_t k)
-   {
-      const boost::uint64_t m = UINT64_C(0xc6a4a7935bd1e995);
-      const int r = 47;
-
-      k *= m;
-      k ^= k >> r;
-      k *= m;
-
-      h ^= k;
-      h *= m;
-
-      // Completely arbitrary number, to prevent 0's
-      // from hashing to 0.
-      h += 0xe6546b64;
-   }
-
-   #endif // BOOST_NO_INT64_T
-
 }  //namespace detail {
 }  //namespace intrusive {
 }  //namespace boost {
diff --git a/inst/include/boost/intrusive/detail/hash_integral.hpp b/inst/include/boost/intrusive/detail/hash_integral.hpp
new file mode 100644
index 000000000..37ab80909
--- /dev/null
+++ b/inst/include/boost/intrusive/detail/hash_integral.hpp
@@ -0,0 +1,119 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021-2023 Peter Dimov
+// Copyright 2024 Ion Gaztanaga
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+//
+// The original C++11 implementation was done by Peter Dimov
+// The C++03 porting was done by Ion Gaztanaga
+//
+// See http://www.boost.org/libs/intrusive for documentation.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef BOOST_INTRUSIVE_DETAIL_HASH_INTEGRAL_HPP
+#define BOOST_INTRUSIVE_DETAIL_HASH_INTEGRAL_HPP
+
+#include <boost/config.hpp>
+#include "hash_mix.hpp"
+#include <cstddef>
+#include <climits>
+#include <boost/intrusive/detail/mpl.hpp>
+
+namespace boost {
+namespace intrusive {
+namespace detail {
+
+
+template<class T,
+    bool bigger_than_size_t = (sizeof(T) > sizeof(std::size_t)),
+    bool is_unsigned = is_unsigned<T>::value,
+    std::size_t size_t_bits = sizeof(std::size_t) * CHAR_BIT,
+    std::size_t type_bits = sizeof(T) * CHAR_BIT>
+struct hash_integral_impl;
+
+template<class T, bool is_unsigned, std::size_t size_t_bits, std::size_t type_bits>
+struct hash_integral_impl<T, false, is_unsigned, size_t_bits, type_bits>
+{
+    static std::size_t fn( T v )
+    {
+        return static_cast<std::size_t>( v );
+    }
+};
+
+template<class T, std::size_t size_t_bits, std::size_t type_bits>
+struct hash_integral_impl<T, true, false, size_t_bits, type_bits>
+{
+    static std::size_t fn( T v )
+    {
+        typedef typename make_unsigned<T>::type U;
+
+        if( v >= 0 )
+        {
+            return hash_integral_impl<U>::fn( static_cast<U>( v ) );
+        }
+        else
+        {
+            return ~hash_integral_impl<U>::fn( static_cast<U>( ~static_cast<U>( v ) ) );
+        }
+    }
+};
+
+template<class T>
+struct hash_integral_impl<T, true, true, 32, 64>
+{
+    static std::size_t fn( T v )
+    {
+        std::size_t seed = 0;
+
+        seed = static_cast<std::size_t>( v >> 32 ) + (hash_mix)( seed );
+        seed = static_cast<std::size_t>( v  & 0xFFFFFFFF ) + (hash_mix)( seed );
+
+        return seed;
+    }
+};
+
+template<class T>
+struct hash_integral_impl<T, true, true, 32, 128>
+{
+    static std::size_t fn( T v )
+    {
+        std::size_t seed = 0;
+
+        seed = static_cast<std::size_t>( v >> 96 ) + (hash_mix)( seed );
+        seed = static_cast<std::size_t>( v >> 64 ) + (hash_mix)( seed );
+        seed = static_cast<std::size_t>( v >> 32 ) + (hash_mix)( seed );
+        seed = static_cast<std::size_t>( v ) + (hash_mix)( seed );
+
+        return seed;
+    }
+};
+
+template<class T>
+struct hash_integral_impl<T, true, true, 64, 128>
+{
+    static std::size_t fn( T v )
+    {
+        std::size_t seed = 0;
+
+        seed = static_cast<std::size_t>( v >> 64 ) + (hash_mix)( seed );
+        seed = static_cast<std::size_t>( v ) + (hash_mix)( seed );
+
+        return seed;
+    }
+};
+
+template <typename T>
+typename enable_if_c<is_integral<T>::value, std::size_t>::type
+    hash_value( T v )
+{
+    return hash_integral_impl<T>::fn( v );
+}
+
+} // namespace detail
+} // namespace intrusive
+} // namespace boost
+
+#endif // #ifndef BOOST_INTRUSIVE_DETAIL_HASH_INTEGRAL_HPP
diff --git a/inst/include/boost/intrusive/detail/hash_mix.hpp b/inst/include/boost/intrusive/detail/hash_mix.hpp
new file mode 100644
index 000000000..a78b16916
--- /dev/null
+++ b/inst/include/boost/intrusive/detail/hash_mix.hpp
@@ -0,0 +1,130 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2022 Peter Dimov
+// Copyright 2024 Ion Gaztanaga
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+//
+// The original C++11 implementation was done by Peter Dimov
+// The C++03 porting was done by Ion Gaztanaga
+// 
+// Refactored the original Boost ContainerHash library to avoid
+// any heavy std header dependencies to just mix a hash
+// value represented in a std::size_t type.
+//
+// See http://www.boost.org/libs/intrusive for documentation.
+//
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef BOOST_INTRUSIVE_DETAIL_HASH_MIX_HPP
+#define BOOST_INTRUSIVE_DETAIL_HASH_MIX_HPP
+
+#include <boost/cstdint.hpp>      //boost::uint64_t
+#include <cstddef>
+#include <climits>
+
+namespace boost {
+namespace intrusive {
+namespace detail {
+   
+
+template<std::size_t Bits> struct hash_mix_impl;
+
+// hash_mix for 64 bit size_t
+//
+// The general "xmxmx" form of state of the art 64 bit mixers originates
+// from Murmur3 by Austin Appleby, which uses the following function as
+// its "final mix":
+//
+// k ^= k >> 33;
+// k *= 0xff51afd7ed558ccd;
+// k ^= k >> 33;
+// k *= 0xc4ceb9fe1a85ec53;
+// k ^= k >> 33;
+//
+// (https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp)
+//
+// It has subsequently been improved multiple times by different authors
+// by changing the constants. The most well known improvement is the
+// so-called "variant 13" function by David Stafford:
+//
+// k ^= k >> 30;
+//	k *= 0xbf58476d1ce4e5b9;
+//	k ^= k >> 27;
+//	k *= 0x94d049bb133111eb;
+//	k ^= k >> 31;
+//
+// (https://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html)
+//
+// This mixing function is used in the splitmix64 RNG:
+// http://xorshift.di.unimi.it/splitmix64.c
+//
+// We use Jon Maiga's implementation from
+// http://jonkagstrom.com/mx3/mx3_rev2.html
+//
+// x ^= x >> 32;
+//	x *= 0xe9846af9b1a615d;
+//	x ^= x >> 32;
+//	x *= 0xe9846af9b1a615d;
+//	x ^= x >> 28;
+//
+// An equally good alternative is Pelle Evensen's Moremur:
+//
+//	x ^= x >> 27;
+//	x *= 0x3C79AC492BA7B653;
+//	x ^= x >> 33;
+//	x *= 0x1C69B3F74AC4AE35;
+//	x ^= x >> 27;
+//
+// (https://mostlymangling.blogspot.com/2019/12/stronger-better-morer-moremur-better.html)
+
+template<> struct hash_mix_impl<64>
+{
+    inline static boost::uint64_t fn( boost::uint64_t x )
+    {
+        boost::uint64_t const m = 0xe9846af9b1a615d;
+
+        x ^= x >> 32;
+        x *= m;
+        x ^= x >> 32;
+        x *= m;
+        x ^= x >> 28;
+
+        return x;
+    }
+};
+
+// hash_mix for 32 bit size_t
+//
+// We use the "best xmxmx" implementation from
+// https://github.com/skeeto/hash-prospector/issues/19
+
+template<> struct hash_mix_impl<32>
+{
+    inline static boost::uint32_t fn( boost::uint32_t x )
+    {
+        boost::uint32_t const m1 = 0x21f0aaad;
+        boost::uint32_t const m2 = 0x735a2d97;
+
+        x ^= x >> 16;
+        x *= m1;
+        x ^= x >> 15;
+        x *= m2;
+        x ^= x >> 15;
+
+        return x;
+    }
+};
+
+inline std::size_t hash_mix( std::size_t v )
+{
+    return hash_mix_impl<sizeof(std::size_t) * CHAR_BIT>::fn( v );
+}
+
+
+} // namespace detail
+} // namespace intrusive
+} // namespace boost
+
+#endif // #ifndef BOOST_INTRUSIVE_DETAIL_HASH_MIX_HPP
diff --git a/inst/include/boost/intrusive/detail/hashtable_node.hpp b/inst/include/boost/intrusive/detail/hashtable_node.hpp
index 8e9a06258..26c84804a 100644
--- a/inst/include/boost/intrusive/detail/hashtable_node.hpp
+++ b/inst/include/boost/intrusive/detail/hashtable_node.hpp
@@ -52,25 +52,25 @@ struct bucket_impl
    typedef detail::common_slist_algorithms<NodeTraits> algo_t;
 
    public:
-   BOOST_INTRUSIVE_FORCEINLINE bucket_impl()
+   inline bucket_impl()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_impl(const bucket_impl &)
+   inline bucket_impl(const bucket_impl &)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE ~bucket_impl()
+   inline ~bucket_impl()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_impl &operator=(const bucket_impl&)
+   inline bucket_impl &operator=(const bucket_impl&)
    {  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_node_ptr()
+   inline node_ptr get_node_ptr()
    {  return pointer_traits<node_ptr>::pointer_to(*this);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_node_ptr() const
+   inline const_node_ptr get_node_ptr() const
    {  return pointer_traits<const_node_ptr>::pointer_to(*this);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr begin_ptr()
+   inline node_ptr begin_ptr()
    {  return node_traits::get_next(get_node_ptr());  }
 };
 
@@ -136,7 +136,7 @@ class hashtable_iterator
                   , hashtable_iterator<BucketValueTraits, LinearBuckets, false>
                   , nat>::type                                 nonconst_iterator;
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr downcast_bucket(typename bucket_type::node_traits::node_ptr p)
+   inline static node_ptr downcast_bucket(typename bucket_type::node_traits::node_ptr p)
    {
       return pointer_traits<node_ptr>::
          pointer_to(static_cast<typename node_traits::node&>(*p));
@@ -144,61 +144,61 @@ class hashtable_iterator
 
    public:
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator ()
+   inline hashtable_iterator ()
       : slist_it_()  //Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit hashtable_iterator(siterator ptr, const BucketValueTraits *cont)
+   inline explicit hashtable_iterator(siterator ptr, const BucketValueTraits *cont)
       : slist_it_ (ptr)
       , traitsptr_ (cont ? pointer_traits<const_bucketvaltraits_ptr>::pointer_to(*cont) : const_bucketvaltraits_ptr() )
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator(const hashtable_iterator &other)
+   inline hashtable_iterator(const hashtable_iterator &other)
       :  slist_it_(other.slist_it()), traitsptr_(other.get_bucket_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator(const nonconst_iterator &other)
+   inline hashtable_iterator(const nonconst_iterator &other)
       :  slist_it_(other.slist_it()), traitsptr_(other.get_bucket_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE const siterator &slist_it() const
+   inline const siterator &slist_it() const
    { return slist_it_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator<BucketValueTraits, LinearBuckets, false> unconst() const
+   inline hashtable_iterator<BucketValueTraits, LinearBuckets, false> unconst() const
    {  return hashtable_iterator<BucketValueTraits, LinearBuckets, false>(this->slist_it(), this->get_bucket_value_traits());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator& operator++()
+   inline hashtable_iterator& operator++()
    {  this->increment();   return *this;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator &operator=(const hashtable_iterator &other)
+   inline hashtable_iterator &operator=(const hashtable_iterator &other)
    {  slist_it_ = other.slist_it(); traitsptr_ = other.get_bucket_value_traits();   return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator operator++(int)
+   inline hashtable_iterator operator++(int)
    {
       hashtable_iterator result (*this);
       this->increment();
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator== (const hashtable_iterator& i, const hashtable_iterator& i2)
+   inline friend bool operator== (const hashtable_iterator& i, const hashtable_iterator& i2)
    { return i.slist_it_ == i2.slist_it_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!= (const hashtable_iterator& i, const hashtable_iterator& i2)
+   inline friend bool operator!= (const hashtable_iterator& i, const hashtable_iterator& i2)
    { return !(i == i2); }
 
-   BOOST_INTRUSIVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    { return *this->operator ->(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator->() const
+   inline pointer operator->() const
    {
       return this->priv_value_traits().to_value_ptr
          (downcast_bucket(slist_it_.pointed_node()));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_bucketvaltraits_ptr get_bucket_value_traits() const
+   inline const_bucketvaltraits_ptr get_bucket_value_traits() const
    {  return traitsptr_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const value_traits &priv_value_traits() const
+   inline const value_traits &priv_value_traits() const
    {  return traitsptr_->priv_value_traits();  }
 
    private:
@@ -281,7 +281,7 @@ class hashtable_iterator<BucketValueTraits, true, IsConst>
                   , hashtable_iterator<BucketValueTraits, true, false>
                   , nat>::type                                 nonconst_iterator;
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr downcast_bucket(slist_node_ptr p)
+   inline static node_ptr downcast_bucket(slist_node_ptr p)
    {
       return pointer_traits<node_ptr>::
          pointer_to(static_cast<typename node_traits::node&>(*p));
@@ -289,67 +289,67 @@ class hashtable_iterator<BucketValueTraits, true, IsConst>
 
    public:
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator ()
+   inline hashtable_iterator ()
       : slist_it_()  //Value initialization to achieve "null iterators" (N3644)
       , members_()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit hashtable_iterator(siterator ptr, bucket_ptr bp, const_value_traits_ptr traits_ptr)
+   inline explicit hashtable_iterator(siterator ptr, bucket_ptr bp, const_value_traits_ptr traits_ptr)
       : slist_it_ (ptr)
       , members_ (bp, traits_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator(const hashtable_iterator &other)
+   inline hashtable_iterator(const hashtable_iterator &other)
       :  slist_it_(other.slist_it()), members_(other.get_bucket_ptr(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator(const nonconst_iterator &other)
+   inline hashtable_iterator(const nonconst_iterator &other)
       :  slist_it_(other.slist_it()), members_(other.get_bucket_ptr(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE const siterator &slist_it() const
+   inline const siterator &slist_it() const
    { return slist_it_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator<BucketValueTraits, true, false> unconst() const
+   inline hashtable_iterator<BucketValueTraits, true, false> unconst() const
    {  return hashtable_iterator<BucketValueTraits, true, false>(this->slist_it(), members_.nodeptr_, members_.get_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator& operator++()
+   inline hashtable_iterator& operator++()
    {  this->increment();   return *this;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator &operator=(const hashtable_iterator &other)
+   inline hashtable_iterator &operator=(const hashtable_iterator &other)
    {  slist_it_ = other.slist_it(); members_ = other.members_;  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_iterator operator++(int)
+   inline hashtable_iterator operator++(int)
    {
       hashtable_iterator result (*this);
       this->increment();
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator== (const hashtable_iterator& i, const hashtable_iterator& i2)
+   inline friend bool operator== (const hashtable_iterator& i, const hashtable_iterator& i2)
    { return i.slist_it_ == i2.slist_it_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!= (const hashtable_iterator& i, const hashtable_iterator& i2)
+   inline friend bool operator!= (const hashtable_iterator& i, const hashtable_iterator& i2)
    { return i.slist_it_ != i2.slist_it_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    { return *this->operator ->(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator->() const
+   inline pointer operator->() const
    { return this->operator_arrow(detail::bool_<stateful_value_traits>()); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr get_value_traits() const
+   inline const_value_traits_ptr get_value_traits() const
    {  return members_.get_ptr(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr get_bucket_ptr() const
+   inline bucket_ptr get_bucket_ptr() const
    {  return members_.nodeptr_; }
 
    private:
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::false_) const
+   inline pointer operator_arrow(detail::false_) const
    { return value_traits::to_value_ptr(downcast_bucket(slist_it_.pointed_node())); }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::true_) const
+   inline pointer operator_arrow(detail::true_) const
    { return this->get_value_traits()->to_value_ptr(downcast_bucket(slist_it_.pointed_node())); }
 
    void increment()
diff --git a/inst/include/boost/intrusive/detail/hook_traits.hpp b/inst/include/boost/intrusive/detail/hook_traits.hpp
index 06713487f..bc51cdebe 100644
--- a/inst/include/boost/intrusive/detail/hook_traits.hpp
+++ b/inst/include/boost/intrusive/detail/hook_traits.hpp
@@ -28,7 +28,6 @@
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/intrusive/detail/node_holder.hpp>
-#include <boost/assert.hpp>
 
 namespace boost {
 namespace intrusive {
@@ -47,8 +46,10 @@ struct bhtraits_base
       template rebind_pointer<T>::type                               pointer;
    typedef typename pointer_traits<node_ptr>::
       template rebind_pointer<const T>::type                         const_pointer;
-   //typedef typename pointer_traits<pointer>::reference               reference;
-   //typedef typename pointer_traits<const_pointer>::reference         const_reference;
+   typedef typename pointer_traits<node_ptr>::
+      template rebind_pointer<node_holder_type>::type                node_holder_ptr;
+   typedef typename pointer_traits<node_ptr>::
+      template rebind_pointer<const node_holder_type>::type          const_node_holder_ptr;
    typedef T &                                                       reference;
    typedef const T &                                                 const_reference;
    typedef node_holder_type &                                        node_holder_reference;
@@ -56,35 +57,29 @@ struct bhtraits_base
    typedef node&                                                     node_reference;
    typedef const node &                                              const_node_reference;
 
-   BOOST_INTRUSIVE_FORCEINLINE static pointer to_value_ptr(node_ptr n)
+   inline static pointer to_value_ptr(node_ptr n)
    {
-      pointer p = pointer_traits<pointer>::pointer_to
-         (static_cast<reference>(static_cast<node_holder_reference>(*n)));
-      BOOST_ASSERT(!!p);
-      return p;
+      return pointer_traits<pointer>::
+         static_cast_from(pointer_traits<node_holder_ptr>::static_cast_from(n));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const_pointer to_value_ptr(const_node_ptr n)
+   inline static const_pointer to_value_ptr(const_node_ptr n)
    {
-      const_pointer p = pointer_traits<const_pointer>::pointer_to
-         (static_cast<const_reference>(static_cast<const_node_holder_reference>(*n)));
-      BOOST_ASSERT(!!p);
-      return p;
+      return pointer_traits<const_pointer>::
+         static_cast_from(pointer_traits<const_node_holder_ptr>::static_cast_from(n));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr to_node_ptr(reference value)
+   inline static node_ptr to_node_ptr(reference value)
    {
       node_ptr p = pointer_traits<node_ptr>::pointer_to
          (static_cast<node_reference>(static_cast<node_holder_reference>(value)));
-      BOOST_ASSERT(!!p);
       return p;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const_node_ptr to_node_ptr(const_reference value)
+   inline static const_node_ptr to_node_ptr(const_reference value)
    {
       const_node_ptr p = pointer_traits<const_node_ptr>::pointer_to
          (static_cast<const_node_reference>(static_cast<const_node_holder_reference>(value)));
-      BOOST_ASSERT(!!p);
       return p;
    }
 };
@@ -121,26 +116,26 @@ struct mhtraits
 
    static const link_mode_type link_mode = Hook::hooktags::link_mode;
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr to_node_ptr(reference value)
+   inline static node_ptr to_node_ptr(reference value)
    {
       return pointer_traits<node_ptr>::pointer_to
          (static_cast<node_reference>(static_cast<hook_reference>(value.*P)));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const_node_ptr to_node_ptr(const_reference value)
+   inline static const_node_ptr to_node_ptr(const_reference value)
    {
       return pointer_traits<const_node_ptr>::pointer_to
          (static_cast<const_node_reference>(static_cast<const_hook_reference>(value.*P)));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static pointer to_value_ptr(node_ptr n)
+   inline static pointer to_value_ptr(node_ptr n)
    {
       return pointer_traits<pointer>::pointer_to
          (*detail::parent_from_member<T, Hook>
             (static_cast<Hook*>(boost::movelib::to_raw_pointer(n)), P));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const_pointer to_value_ptr(const_node_ptr n)
+   inline static const_pointer to_value_ptr(const_node_ptr n)
    {
       return pointer_traits<const_pointer>::pointer_to
          (*detail::parent_from_member<T, Hook>
@@ -169,23 +164,23 @@ struct fhtraits
    typedef const value_type &                                        const_reference;
    static const link_mode_type link_mode = hook_type::hooktags::link_mode;
 
-   static node_ptr to_node_ptr(reference value)
+   inline static node_ptr to_node_ptr(reference value)
    {  return static_cast<node*>(boost::movelib::to_raw_pointer(Functor::to_hook_ptr(value)));  }
 
-   static const_node_ptr to_node_ptr(const_reference value)
+   inline static const_node_ptr to_node_ptr(const_reference value)
    {  return static_cast<const node*>(boost::movelib::to_raw_pointer(Functor::to_hook_ptr(value)));  }
 
-   static pointer to_value_ptr(node_ptr n)
+   inline static pointer to_value_ptr(node_ptr n)
    {  return Functor::to_value_ptr(to_hook_ptr(n));  }
 
-   static const_pointer to_value_ptr(const_node_ptr n)
+   inline static const_pointer to_value_ptr(const_node_ptr n)
    {  return Functor::to_value_ptr(to_hook_ptr(n));  }
 
    private:
-   static hook_ptr to_hook_ptr(node_ptr n)
+   inline static hook_ptr to_hook_ptr(node_ptr n)
    {  return hook_ptr(&*static_cast<hook_type*>(&*n));  }
 
-   static const_hook_ptr to_hook_ptr(const_node_ptr n)
+   inline static const_hook_ptr to_hook_ptr(const_node_ptr n)
    {  return const_hook_ptr(&*static_cast<const hook_type*>(&*n));  }
 };
 
diff --git a/inst/include/boost/intrusive/detail/iiterator.hpp b/inst/include/boost/intrusive/detail/iiterator.hpp
index 5ab1de2bb..75b6d8384 100644
--- a/inst/include/boost/intrusive/detail/iiterator.hpp
+++ b/inst/include/boost/intrusive/detail/iiterator.hpp
@@ -84,15 +84,15 @@ template<class NodePtr, class StoredPointer, bool StatefulValueTraits = true>
 struct iiterator_members
 {
 
-   BOOST_INTRUSIVE_FORCEINLINE iiterator_members()
+   inline iiterator_members()
       : nodeptr_()//Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE iiterator_members(const NodePtr &n_ptr, const StoredPointer &data)
+   inline iiterator_members(const NodePtr &n_ptr, const StoredPointer &data)
       :  nodeptr_(n_ptr), ptr_(data)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE StoredPointer get_ptr() const
+   inline StoredPointer get_ptr() const
    {  return ptr_;  }
 
    NodePtr nodeptr_;
@@ -102,15 +102,15 @@ struct iiterator_members
 template<class NodePtr, class StoredPointer>
 struct iiterator_members<NodePtr, StoredPointer, false>
 {
-   BOOST_INTRUSIVE_FORCEINLINE iiterator_members()
+   inline iiterator_members()
       : nodeptr_()//Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE iiterator_members(const NodePtr &n_ptr, const StoredPointer &)
+   inline iiterator_members(const NodePtr &n_ptr, const StoredPointer &)
       : nodeptr_(n_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE StoredPointer get_ptr() const
+   inline StoredPointer get_ptr() const
    {  return StoredPointer();  }
 
    NodePtr nodeptr_;
diff --git a/inst/include/boost/intrusive/detail/iterator.hpp b/inst/include/boost/intrusive/detail/iterator.hpp
index ec91cd4f2..d0ca41c33 100644
--- a/inst/include/boost/intrusive/detail/iterator.hpp
+++ b/inst/include/boost/intrusive/detail/iterator.hpp
@@ -181,7 +181,7 @@ struct iterator_disable_if_tag_difference_type
 ////////////////////
 
 template<class InputIt>
-BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag<InputIt, std::input_iterator_tag>::type
+inline typename iterator_enable_if_tag<InputIt, std::input_iterator_tag>::type
    iterator_advance(InputIt& it, typename iter_difference<InputIt>::type n)
 {
    while(n--)
@@ -197,7 +197,7 @@ typename iterator_enable_if_tag<InputIt, std::forward_iterator_tag>::type
 }
 
 template<class InputIt>
-BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag<InputIt, std::bidirectional_iterator_tag>::type
+inline typename iterator_enable_if_tag<InputIt, std::bidirectional_iterator_tag>::type
    iterator_advance(InputIt& it, typename iter_difference<InputIt>::type n)
 {
    for (; 0 < n; --n)
@@ -207,14 +207,14 @@ BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag<InputIt, std::bidire
 }
 
 template<class InputIt, class Distance>
-BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag<InputIt, std::random_access_iterator_tag>::type
+inline typename iterator_enable_if_tag<InputIt, std::random_access_iterator_tag>::type
    iterator_advance(InputIt& it, Distance n)
 {
    it += n;
 }
 
 template<class InputIt, class Distance>
-BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag<InputIt, std::random_access_iterator_tag, InputIt>::type
+inline typename iterator_enable_if_tag<InputIt, std::random_access_iterator_tag, InputIt>::type
    make_iterator_advance(InputIt it, Distance n)
 {
    (iterator_advance)(it, n);
@@ -222,14 +222,14 @@ BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag<InputIt, std::random
 }
 
 template<class It>
-BOOST_INTRUSIVE_FORCEINLINE 
+inline 
    void iterator_uadvance(It& it, typename iter_size<It>::type n)
 {
    (iterator_advance)(it, (typename iterator_traits<It>::difference_type)n);
 }
 
 template<class It>
-BOOST_INTRUSIVE_FORCEINLINE
+inline
 It make_iterator_uadvance(It it, typename iter_size<It>::type n)
 {
    (iterator_uadvance)(it, n);
@@ -253,7 +253,7 @@ typename iterator_disable_if_tag_difference_type
 }
 
 template<class InputIt>
-BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag_difference_type
+inline typename iterator_enable_if_tag_difference_type
    <InputIt, std::random_access_iterator_tag>::type
       iterator_distance(InputIt first, InputIt last)
 {
@@ -266,7 +266,7 @@ BOOST_INTRUSIVE_FORCEINLINE typename iterator_enable_if_tag_difference_type
 ////////////////////////////////////////
 
 template<class It>
-BOOST_INTRUSIVE_FORCEINLINE typename iter_size<It>::type
+inline typename iter_size<It>::type
    iterator_udistance(It first, It last)
 {
    return (typename iter_size<It>::type)(iterator_distance)(first, last);
@@ -277,14 +277,14 @@ BOOST_INTRUSIVE_FORCEINLINE typename iter_size<It>::type
 ////////////////////////////////////////
 
 template<class InputIt>
-BOOST_INTRUSIVE_FORCEINLINE InputIt iterator_next(InputIt it, typename iter_difference<InputIt>::type n)
+inline InputIt iterator_next(InputIt it, typename iter_difference<InputIt>::type n)
 {
    (iterator_advance)(it, n);
    return it;
 }
 
 template<class InputIt>
-BOOST_INTRUSIVE_FORCEINLINE InputIt iterator_unext(InputIt it, typename iterator_traits<InputIt>::size_type n)
+inline InputIt iterator_unext(InputIt it, typename iterator_traits<InputIt>::size_type n)
 {
    (iterator_uadvance)(it, n);
    return it;
@@ -295,11 +295,11 @@ BOOST_INTRUSIVE_FORCEINLINE InputIt iterator_unext(InputIt it, typename iterator
 ////////////////////////////////////////
 
 template<class I>
-BOOST_INTRUSIVE_FORCEINLINE typename iterator_traits<I>::pointer iterator_arrow_result(const I &i)
+inline typename iterator_traits<I>::pointer iterator_arrow_result(const I &i)
 {  return i.operator->();  }
 
 template<class T>
-BOOST_INTRUSIVE_FORCEINLINE T * iterator_arrow_result(T *p)
+inline T * iterator_arrow_result(T *p)
 {  return p;   }
 
 } //namespace intrusive
diff --git a/inst/include/boost/intrusive/detail/key_nodeptr_comp.hpp b/inst/include/boost/intrusive/detail/key_nodeptr_comp.hpp
index 1029a3404..4e7f7c27d 100644
--- a/inst/include/boost/intrusive/detail/key_nodeptr_comp.hpp
+++ b/inst/include/boost/intrusive/detail/key_nodeptr_comp.hpp
@@ -78,40 +78,40 @@ struct key_nodeptr_comp
       static const bool value = same_type || is_convertible<P1, const_node_ptr>::value;
    };
 
-   BOOST_INTRUSIVE_FORCEINLINE base_t base() const
+   inline base_t base() const
    {  return static_cast<const base_t&>(*this); }
 
-   BOOST_INTRUSIVE_FORCEINLINE key_nodeptr_comp(KeyTypeKeyCompare kcomp, const ValueTraits *traits)
+   inline key_nodeptr_comp(KeyTypeKeyCompare kcomp, const ValueTraits *traits)
       :  base_t(kcomp), traits_(traits)
    {}
 
    //pred(pnode)
    template<class T1>
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()(const T1 &t1, typename enable_if_c< is_same_or_nodeptr_convertible<T1>::value, sfinae_type* >::type = 0) const
+   inline bool operator()(const T1 &t1, typename enable_if_c< is_same_or_nodeptr_convertible<T1>::value, sfinae_type* >::type = 0) const
    {  return base().get()(key_of_value()(*traits_->to_value_ptr(t1)));  }
 
    //operator() 2 arg
    //pred(pnode, pnode)
    template<class T1, class T2>
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()
+   inline bool operator()
       (const T1 &t1, const T2 &t2, typename enable_if_c< is_same_or_nodeptr_convertible<T1>::value && is_same_or_nodeptr_convertible<T2>::value, sfinae_type* >::type = 0) const
    {  return base()(*traits_->to_value_ptr(t1), *traits_->to_value_ptr(t2));  }
 
    //pred(pnode, key)
    template<class T1, class T2>
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()
+   inline bool operator()
       (const T1 &t1, const T2 &t2, typename enable_if_c< is_same_or_nodeptr_convertible<T1>::value && !is_same_or_nodeptr_convertible<T2>::value, sfinae_type* >::type = 0) const
    {  return base()(*traits_->to_value_ptr(t1), t2);  }
 
    //pred(key, pnode)
    template<class T1, class T2>
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()
+   inline bool operator()
       (const T1 &t1, const T2 &t2, typename enable_if_c< !is_same_or_nodeptr_convertible<T1>::value && is_same_or_nodeptr_convertible<T2>::value, sfinae_type* >::type = 0) const
    {  return base()(t1, *traits_->to_value_ptr(t2));  }
 
    //pred(key, key)
    template<class T1, class T2>
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()
+   inline bool operator()
       (const T1 &t1, const T2 &t2, typename enable_if_c< !is_same_or_nodeptr_convertible<T1>::value && !is_same_or_nodeptr_convertible<T2>::value, sfinae_type* >::type = 0) const
    {  return base()(t1, t2);  }
 
diff --git a/inst/include/boost/intrusive/detail/list_iterator.hpp b/inst/include/boost/intrusive/detail/list_iterator.hpp
index f301a4b8e..0a10e8487 100644
--- a/inst/include/boost/intrusive/detail/list_iterator.hpp
+++ b/inst/include/boost/intrusive/detail/list_iterator.hpp
@@ -60,81 +60,81 @@ class list_iterator
    typedef typename types_t::iterator_type::reference          reference;
    typedef typename types_t::iterator_type::iterator_category  iterator_category;
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator()
+   inline list_iterator()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit list_iterator(node_ptr nodeptr, const_value_traits_ptr traits_ptr)
+   inline explicit list_iterator(node_ptr nodeptr, const_value_traits_ptr traits_ptr)
       : members_(nodeptr, traits_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator(const list_iterator &other)
+   inline list_iterator(const list_iterator &other)
       :  members_(other.pointed_node(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator(const nonconst_iterator &other)
+   inline list_iterator(const nonconst_iterator &other)
       :  members_(other.pointed_node(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator &operator=(const list_iterator &other)
+   inline list_iterator &operator=(const list_iterator &other)
    {  members_.nodeptr_ = other.members_.nodeptr_;  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr pointed_node() const
+   inline node_ptr pointed_node() const
    { return members_.nodeptr_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator &operator=(node_ptr nodeptr)
+   inline list_iterator &operator=(node_ptr nodeptr)
    {  members_.nodeptr_ = nodeptr;  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr get_value_traits() const
+   inline const_value_traits_ptr get_value_traits() const
    {  return members_.get_ptr(); }
 
    public:
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator& operator++()
+   inline list_iterator& operator++()
    {
       node_ptr p = node_traits::get_next(members_.nodeptr_);
       members_.nodeptr_ = p;
       return static_cast<list_iterator&> (*this);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator operator++(int)
+   inline list_iterator operator++(int)
    {
       list_iterator result (*this);
       members_.nodeptr_ = node_traits::get_next(members_.nodeptr_);
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator& operator--()
+   inline list_iterator& operator--()
    {
       members_.nodeptr_ = node_traits::get_previous(members_.nodeptr_);
       return static_cast<list_iterator&> (*this);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator operator--(int)
+   inline list_iterator operator--(int)
    {
       list_iterator result (*this);
       members_.nodeptr_ = node_traits::get_previous(members_.nodeptr_);
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator== (const list_iterator& l, const list_iterator& r)
+   inline friend bool operator== (const list_iterator& l, const list_iterator& r)
    {  return l.pointed_node() == r.pointed_node();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!= (const list_iterator& l, const list_iterator& r)
+   inline friend bool operator!= (const list_iterator& l, const list_iterator& r)
    {  return !(l == r); }
 
-   BOOST_INTRUSIVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    {  return *operator->();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator->() const
+   inline pointer operator->() const
    { return this->operator_arrow(detail::bool_<stateful_value_traits>()); }
 
-   BOOST_INTRUSIVE_FORCEINLINE list_iterator<ValueTraits, false> unconst() const
+   inline list_iterator<ValueTraits, false> unconst() const
    {  return list_iterator<ValueTraits, false>(this->pointed_node(), this->get_value_traits());   }
 
    private:
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::false_) const
+   inline pointer operator_arrow(detail::false_) const
    { return ValueTraits::to_value_ptr(members_.nodeptr_); }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::true_) const
+   inline pointer operator_arrow(detail::true_) const
    { return this->get_value_traits()->to_value_ptr(members_.nodeptr_); }
 
    iiterator_members<node_ptr, const_value_traits_ptr, stateful_value_traits> members_;
diff --git a/inst/include/boost/intrusive/detail/mpl.hpp b/inst/include/boost/intrusive/detail/mpl.hpp
index d86fa4f3c..cf6c74557 100644
--- a/inst/include/boost/intrusive/detail/mpl.hpp
+++ b/inst/include/boost/intrusive/detail/mpl.hpp
@@ -66,6 +66,12 @@ using boost::move_detail::eval_if_c;
 using boost::move_detail::eval_if;
 using boost::move_detail::unvoid_ref;
 using boost::move_detail::add_const_if_c;
+using boost::move_detail::is_integral;
+using boost::move_detail::make_unsigned;
+using boost::move_detail::is_enum;
+using boost::move_detail::is_floating_point;
+using boost::move_detail::is_scalar;
+using boost::move_detail::is_unsigned;
 
 template<std::size_t S>
 struct ls_zeros
diff --git a/inst/include/boost/intrusive/detail/node_cloner_disposer.hpp b/inst/include/boost/intrusive/detail/node_cloner_disposer.hpp
index 97e8d1532..a836699f3 100644
--- a/inst/include/boost/intrusive/detail/node_cloner_disposer.hpp
+++ b/inst/include/boost/intrusive/detail/node_cloner_disposer.hpp
@@ -59,7 +59,7 @@ struct node_cloner
    {}
 
    // tree-based containers use this method, which is proxy-reference friendly
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr operator()(node_ptr p)
+   inline node_ptr operator()(node_ptr p)
    {
       reference_type v = *traits_->to_value_ptr(p);
       node_ptr n = traits_->to_node_ptr(*base_t::get()(v));
@@ -85,11 +85,11 @@ struct node_disposer
    static const bool safemode_or_autounlink =
       is_safe_autounlink<value_traits::link_mode>::value;
 
-   BOOST_INTRUSIVE_FORCEINLINE node_disposer(F f, const ValueTraits *cont)
+   inline node_disposer(F f, const ValueTraits *cont)
       :  base_t(f), traits_(cont)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void operator()(node_ptr p)
+   inline void operator()(node_ptr p)
    {
       BOOST_IF_CONSTEXPR(safemode_or_autounlink)
          node_algorithms::init(p);
diff --git a/inst/include/boost/intrusive/detail/parent_from_member.hpp b/inst/include/boost/intrusive/detail/parent_from_member.hpp
index 275229ab4..b276348db 100644
--- a/inst/include/boost/intrusive/detail/parent_from_member.hpp
+++ b/inst/include/boost/intrusive/detail/parent_from_member.hpp
@@ -22,12 +22,12 @@
 
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/detail/workaround.hpp>
+#include <boost/move/detail/launder.hpp>
 #include <cstddef>
 
 #if defined(_MSC_VER)
    #define BOOST_INTRUSIVE_MSVC_ABI_PTR_TO_MEMBER
-   #include <boost/static_assert.hpp>
-#endif
+   #endif
 
 namespace boost {
 namespace intrusive {
@@ -49,7 +49,7 @@ BOOST_INTRUSIVE_FORCEINLINE std::ptrdiff_t offset_from_pointer_to_member(const M
    //MSVC ABI can use up to 3 int32 to represent pointer to member data
    //with virtual base classes, in those cases there is no simple to
    //obtain the address of the parent. So static assert to avoid runtime errors
-   BOOST_STATIC_ASSERT( sizeof(caster) == sizeof(int) );
+   BOOST_INTRUSIVE_STATIC_ASSERT( sizeof(caster) == sizeof(int) );
 
    caster.ptr_to_member = ptr_to_member;
    return std::ptrdiff_t(caster.offset);
@@ -91,25 +91,15 @@ BOOST_INTRUSIVE_FORCEINLINE std::ptrdiff_t offset_from_pointer_to_member(const M
 template<class Parent, class Member>
 BOOST_INTRUSIVE_FORCEINLINE Parent *parent_from_member(Member *member, const Member Parent::* ptr_to_member)
 {
-   return static_cast<Parent*>
-      (
-         static_cast<void*>
-         (
-            static_cast<char*>(static_cast<void*>(member)) - offset_from_pointer_to_member(ptr_to_member)
-         )
-      );
+   return boost::move_detail::launder(reinterpret_cast<Parent*>
+      (reinterpret_cast<std::size_t>(member) - static_cast<std::size_t>(offset_from_pointer_to_member(ptr_to_member))));
 }
 
 template<class Parent, class Member>
 BOOST_INTRUSIVE_FORCEINLINE const Parent *parent_from_member(const Member *member, const Member Parent::* ptr_to_member)
 {
-   return static_cast<const Parent*>
-      (
-         static_cast<const void*>
-         (
-            static_cast<const char*>(static_cast<const void*>(member)) - offset_from_pointer_to_member(ptr_to_member)
-         )
-      );
+   return boost::move_detail::launder(reinterpret_cast<const Parent*>
+      ( reinterpret_cast<std::size_t>(member) - static_cast<std::size_t>(offset_from_pointer_to_member(ptr_to_member)) ));
 }
 
 }  //namespace detail {
diff --git a/inst/include/boost/intrusive/detail/simple_disposers.hpp b/inst/include/boost/intrusive/detail/simple_disposers.hpp
index 6b9bd4bc6..41d2e2478 100644
--- a/inst/include/boost/intrusive/detail/simple_disposers.hpp
+++ b/inst/include/boost/intrusive/detail/simple_disposers.hpp
@@ -41,7 +41,7 @@ class init_disposer
    typedef typename NodeAlgorithms::node_ptr node_ptr;
 
    public:
-   BOOST_INTRUSIVE_FORCEINLINE void operator()(node_ptr p)
+   inline void operator()(node_ptr p)
    {  NodeAlgorithms::init(p);   }
 };
 
diff --git a/inst/include/boost/intrusive/detail/size_holder.hpp b/inst/include/boost/intrusive/detail/size_holder.hpp
index bd14dc504..ba5f418f9 100644
--- a/inst/include/boost/intrusive/detail/size_holder.hpp
+++ b/inst/include/boost/intrusive/detail/size_holder.hpp
@@ -33,25 +33,25 @@ struct size_holder
    static const bool constant_time_size = ConstantSize;
    typedef SizeType  size_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE SizeType get_size() const
+   inline SizeType get_size() const
    {  return size_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_size(SizeType size)
+   inline void set_size(SizeType size)
    {  size_ = size; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void decrement()
+   inline void decrement()
    {  --size_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void increment()
+   inline void increment()
    {  ++size_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void increase(SizeType n)
+   inline void increase(SizeType n)
    {  size_ += n; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void decrease(SizeType n)
+   inline void decrease(SizeType n)
    {  size_ -= n; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void swap(size_holder &other)
+   inline void swap(size_holder &other)
    {  SizeType tmp(size_); size_ = other.size_; other.size_ = tmp; }
 
    SizeType size_;
@@ -63,25 +63,25 @@ struct size_holder<false, SizeType, Tag>
    static const bool constant_time_size = false;
    typedef SizeType  size_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type get_size() const
+   inline size_type get_size() const
    {  return 0;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_size(size_type)
+   inline void set_size(size_type)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void decrement()
+   inline void decrement()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void increment()
+   inline void increment()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void increase(SizeType)
+   inline void increase(SizeType)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void decrease(SizeType)
+   inline void decrease(SizeType)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void swap(size_holder){}
+   inline void swap(size_holder){}
 };
 
 }  //namespace detail{
diff --git a/inst/include/boost/intrusive/detail/slist_iterator.hpp b/inst/include/boost/intrusive/detail/slist_iterator.hpp
index 9c5ee2747..64387c4a7 100644
--- a/inst/include/boost/intrusive/detail/slist_iterator.hpp
+++ b/inst/include/boost/intrusive/detail/slist_iterator.hpp
@@ -27,7 +27,6 @@
 #include <boost/intrusive/detail/std_fwd.hpp>
 #include <boost/intrusive/detail/iiterator.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
-#include <boost/static_assert.hpp>
 
 namespace boost {
 namespace intrusive {
@@ -63,75 +62,75 @@ class slist_iterator
    typedef typename types_t::iterator_type::reference          reference;
    typedef typename types_t::iterator_type::iterator_category  iterator_category;
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator()
+   inline slist_iterator()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator(node_ptr nodeptr, const_value_traits_ptr traits_ptr)
+   inline slist_iterator(node_ptr nodeptr, const_value_traits_ptr traits_ptr)
       : members_(nodeptr, traits_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit slist_iterator(node_ptr nodeptr)
+   inline explicit slist_iterator(node_ptr nodeptr)
       : members_(nodeptr, const_value_traits_ptr())
-   {  BOOST_STATIC_ASSERT((stateful_value_traits == false));  }
+   {  BOOST_INTRUSIVE_STATIC_ASSERT((stateful_value_traits == false));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator(const slist_iterator &other)
+   inline slist_iterator(const slist_iterator &other)
       :  members_(other.pointed_node(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator(const nonconst_iterator &other)
+   inline slist_iterator(const nonconst_iterator &other)
       :  members_(other.pointed_node(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator &operator=(const slist_iterator &other)
+   inline slist_iterator &operator=(const slist_iterator &other)
    {  members_.nodeptr_ = other.members_.nodeptr_;  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr pointed_node() const
+   inline node_ptr pointed_node() const
    { return members_.nodeptr_; }
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator &operator=(node_ptr n)
+   inline slist_iterator &operator=(node_ptr n)
    {  members_.nodeptr_ = n;  return static_cast<slist_iterator&>(*this);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr get_value_traits() const
+   inline const_value_traits_ptr get_value_traits() const
    {  return members_.get_ptr(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool operator!() const
+   inline bool operator!() const
    {  return !members_.nodeptr_; }
 
    public:
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator& operator++()
+   inline slist_iterator& operator++()
    {
       members_.nodeptr_ = node_traits::get_next(members_.nodeptr_);
       return static_cast<slist_iterator&> (*this);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator operator++(int)
+   inline slist_iterator operator++(int)
    {
       slist_iterator result (*this);
       members_.nodeptr_ = node_traits::get_next(members_.nodeptr_);
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator== (const slist_iterator& l, const slist_iterator& r)
+   inline friend bool operator== (const slist_iterator& l, const slist_iterator& r)
    {  return l.pointed_node() == r.pointed_node();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!= (const slist_iterator& l, const slist_iterator& r)
+   inline friend bool operator!= (const slist_iterator& l, const slist_iterator& r)
    {  return l.pointed_node() != r.pointed_node();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    {  return *operator->();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator->() const
+   inline pointer operator->() const
    { return this->operator_arrow(detail::bool_<stateful_value_traits>()); }
 
-   BOOST_INTRUSIVE_FORCEINLINE slist_iterator<ValueTraits, false> unconst() const
+   inline slist_iterator<ValueTraits, false> unconst() const
    {  return slist_iterator<ValueTraits, false>(this->pointed_node(), this->get_value_traits());   }
 
    private:
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::false_) const
+   inline pointer operator_arrow(detail::false_) const
    { return ValueTraits::to_value_ptr(members_.nodeptr_); }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::true_) const
+   inline pointer operator_arrow(detail::true_) const
    { return this->get_value_traits()->to_value_ptr(members_.nodeptr_); }
 
    iiterator_members<node_ptr, const_value_traits_ptr, stateful_value_traits> members_;
diff --git a/inst/include/boost/intrusive/detail/transform_iterator.hpp b/inst/include/boost/intrusive/detail/transform_iterator.hpp
index 0a715754d..551310333 100644
--- a/inst/include/boost/intrusive/detail/transform_iterator.hpp
+++ b/inst/include/boost/intrusive/detail/transform_iterator.hpp
@@ -33,11 +33,11 @@ namespace detail {
 template <class PseudoReference>
 struct operator_arrow_proxy
 {
-   BOOST_INTRUSIVE_FORCEINLINE operator_arrow_proxy(const PseudoReference &px)
+   inline operator_arrow_proxy(const PseudoReference &px)
       :  m_value(px)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE PseudoReference* operator->() const { return &m_value; }
+   inline PseudoReference* operator->() const { return &m_value; }
    // This function is needed for MWCW and BCC, which won't call operator->
    // again automatically per 13.3.1.2 para 8
 //   operator T*() const { return &m_value; }
@@ -47,11 +47,11 @@ struct operator_arrow_proxy
 template <class T>
 struct operator_arrow_proxy<T&>
 {
-   BOOST_INTRUSIVE_FORCEINLINE operator_arrow_proxy(T &px)
+   inline operator_arrow_proxy(T &px)
       :  m_value(px)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE T* operator->() const { return &m_value; }
+   inline T* operator->() const { return &m_value; }
    // This function is needed for MWCW and BCC, which won't call operator->
    // again automatically per 13.3.1.2 para 8
 //   operator T*() const { return &m_value; }
@@ -76,53 +76,53 @@ class transform_iterator
       :  members_()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE Iterator get_it() const
+   inline Iterator get_it() const
    {  return members_.m_it;   }
 
    //Constructors
-   BOOST_INTRUSIVE_FORCEINLINE transform_iterator& operator++()
+   inline transform_iterator& operator++()
    { increment();   return *this;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE transform_iterator operator++(int)
+   inline transform_iterator operator++(int)
    {
       transform_iterator result (*this);
       increment();
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator== (const transform_iterator& i, const transform_iterator& i2)
+   inline friend bool operator== (const transform_iterator& i, const transform_iterator& i2)
    { return i.equal(i2); }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!= (const transform_iterator& i, const transform_iterator& i2)
+   inline friend bool operator!= (const transform_iterator& i, const transform_iterator& i2)
    { return !(i == i2); }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend typename Iterator::difference_type operator- (const transform_iterator& i, const transform_iterator& i2)
+   inline friend typename Iterator::difference_type operator- (const transform_iterator& i, const transform_iterator& i2)
    { return i2.distance_to(i); }
 
    //Arithmetic
    transform_iterator& operator+=(typename Iterator::difference_type off)
    {  this->advance(off); return *this;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE transform_iterator operator+(typename Iterator::difference_type off) const
+   inline transform_iterator operator+(typename Iterator::difference_type off) const
    {
       transform_iterator other(*this);
       other.advance(off);
       return other;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend transform_iterator operator+(typename Iterator::difference_type off, const transform_iterator& right)
+   inline friend transform_iterator operator+(typename Iterator::difference_type off, const transform_iterator& right)
    {  return right + off; }
 
-   BOOST_INTRUSIVE_FORCEINLINE transform_iterator& operator-=(typename Iterator::difference_type off)
+   inline transform_iterator& operator-=(typename Iterator::difference_type off)
    {  this->advance(-off); return *this;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE transform_iterator operator-(typename Iterator::difference_type off) const
+   inline transform_iterator operator-(typename Iterator::difference_type off) const
    {  return *this + (-off);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE typename UnaryFunction::result_type operator*() const
+   inline typename UnaryFunction::result_type operator*() const
    { return dereference(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE operator_arrow_proxy<typename UnaryFunction::result_type>
+   inline operator_arrow_proxy<typename UnaryFunction::result_type>
       operator->() const
    { return operator_arrow_proxy<typename UnaryFunction::result_type>(dereference());  }
 
@@ -130,27 +130,27 @@ class transform_iterator
    struct members
       :  UnaryFunction
    {
-      BOOST_INTRUSIVE_FORCEINLINE members(const Iterator &it, const UnaryFunction &f)
+      inline members(const Iterator &it, const UnaryFunction &f)
          :  UnaryFunction(f), m_it(it)
       {}
 
-      BOOST_INTRUSIVE_FORCEINLINE members()
+      inline members()
       {}
 
       Iterator m_it;
    } members_;
 
 
-   BOOST_INTRUSIVE_FORCEINLINE void increment()
+   inline void increment()
    { ++members_.m_it; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void decrement()
+   inline void decrement()
    { --members_.m_it; }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool equal(const transform_iterator &other) const
+   inline bool equal(const transform_iterator &other) const
    {  return members_.m_it == other.members_.m_it;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool less(const transform_iterator &other) const
+   inline bool less(const transform_iterator &other) const
    {  return other.members_.m_it < members_.m_it;   }
 
    typename UnaryFunction::result_type dereference() const
diff --git a/inst/include/boost/intrusive/detail/tree_iterator.hpp b/inst/include/boost/intrusive/detail/tree_iterator.hpp
index ba1375f8c..f97cecb31 100644
--- a/inst/include/boost/intrusive/detail/tree_iterator.hpp
+++ b/inst/include/boost/intrusive/detail/tree_iterator.hpp
@@ -68,32 +68,32 @@ class tree_iterator
    typedef typename types_t::iterator_type::reference          reference;
    typedef typename types_t::iterator_type::iterator_category  iterator_category;
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator()
+   inline tree_iterator()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit tree_iterator(node_ptr nodeptr, const_value_traits_ptr traits_ptr)
+   inline explicit tree_iterator(node_ptr nodeptr, const_value_traits_ptr traits_ptr)
       : members_(nodeptr, traits_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator(const tree_iterator &other)
+   inline tree_iterator(const tree_iterator &other)
       :  members_(other.pointed_node(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator(const nonconst_iterator &other)
+   inline tree_iterator(const nonconst_iterator &other)
       :  members_(other.pointed_node(), other.get_value_traits())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator &operator=(const tree_iterator &other)
+   inline tree_iterator &operator=(const tree_iterator &other)
    {  members_.nodeptr_ = other.members_.nodeptr_;  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator &operator=(node_ptr nodeptr)
+   inline tree_iterator &operator=(node_ptr nodeptr)
    {  members_.nodeptr_ = nodeptr;  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr pointed_node() const
+   inline node_ptr pointed_node() const
    { return members_.nodeptr_; }
 
    public:
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator& operator++()
+   inline tree_iterator& operator++()
    {
       members_.nodeptr_ = node_algorithms::next_node(members_.nodeptr_);
       return *this;
@@ -106,7 +106,7 @@ class tree_iterator
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator& operator--()
+   inline tree_iterator& operator--()
    {
       members_.nodeptr_ = node_algorithms::prev_node(members_.nodeptr_);
       return *this;
@@ -119,43 +119,43 @@ class tree_iterator
       return result;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator&  go_left()
+   inline tree_iterator&  go_left()
    {
       members_.nodeptr_ = node_traits::get_left(members_.nodeptr_);
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator&  go_right()
+   inline tree_iterator&  go_right()
    {
       members_.nodeptr_ = node_traits::get_right(members_.nodeptr_);
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_iterator&  go_parent()
+   inline tree_iterator&  go_parent()
    {
       members_.nodeptr_ = node_traits::get_parent(members_.nodeptr_);
       return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE operator unspecified_bool_type() const
+   inline operator unspecified_bool_type() const
    {  return members_.nodeptr_ ? &tree_iterator::unspecified_bool_type_func : 0;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool operator! () const
+   inline bool operator! () const
    {  return !members_.nodeptr_;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator== (const tree_iterator& l, const tree_iterator& r)
+   inline friend bool operator== (const tree_iterator& l, const tree_iterator& r)
    { return l.pointed_node() == r.pointed_node(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!= (const tree_iterator& l, const tree_iterator& r)
+   inline friend bool operator!= (const tree_iterator& l, const tree_iterator& r)
    {  return !(l == r);   }
 
-   BOOST_INTRUSIVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    {  return *operator->();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator->() const
+   inline pointer operator->() const
    { return this->operator_arrow(detail::bool_<stateful_value_traits>()); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr get_value_traits() const
+   inline const_value_traits_ptr get_value_traits() const
    {  return members_.get_ptr();  }
 
    tree_iterator end_iterator_from_it() const
@@ -167,10 +167,10 @@ class tree_iterator
    {  return tree_iterator<value_traits, false>(this->pointed_node(), this->get_value_traits());   }
 
    private:
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::false_) const
+   inline pointer operator_arrow(detail::false_) const
    { return ValueTraits::to_value_ptr(members_.nodeptr_); }
 
-   BOOST_INTRUSIVE_FORCEINLINE pointer operator_arrow(detail::true_) const
+   inline pointer operator_arrow(detail::true_) const
    { return this->get_value_traits()->to_value_ptr(members_.nodeptr_); }
 
    iiterator_members<node_ptr, const_value_traits_ptr, stateful_value_traits> members_;
diff --git a/inst/include/boost/intrusive/detail/tree_value_compare.hpp b/inst/include/boost/intrusive/detail/tree_value_compare.hpp
index c78da0acd..d8b88f62d 100644
--- a/inst/include/boost/intrusive/detail/tree_value_compare.hpp
+++ b/inst/include/boost/intrusive/detail/tree_value_compare.hpp
@@ -59,67 +59,67 @@ struct tree_value_compare
 
    typedef boost::intrusive::detail::ebo_functor_holder<KeyCompare> base_t;
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare()
+   inline tree_value_compare()
       :  base_t()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit tree_value_compare(const key_compare &kcomp)
+   inline explicit tree_value_compare(const key_compare &kcomp)
       :  base_t(kcomp)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare (const tree_value_compare &x)
+   inline tree_value_compare (const tree_value_compare &x)
       :  base_t(x.base_t::get())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare &operator=(const tree_value_compare &x)
+   inline tree_value_compare &operator=(const tree_value_compare &x)
    {  this->base_t::get() = x.base_t::get();   return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare &operator=(const key_compare &x)
+   inline tree_value_compare &operator=(const key_compare &x)
    {  this->base_t::get() = x;   return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const key_compare &key_comp() const
+   inline const key_compare &key_comp() const
    {  return static_cast<const key_compare &>(*this);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key) const
+   inline Ret operator()(const key_type &key) const
    {  return this->key_comp()(key);   }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const value_type &value) const
+   inline Ret operator()(const value_type &value) const
    {  return this->key_comp()(KeyOfValue()(value));  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey
+   inline Ret operator()( const U &nonkey
                                              , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(nonkey);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const key_type &key2) const
+   inline Ret operator()(const key_type &key1, const key_type &key2) const
    {  return this->key_comp()(key1, key2);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const value_type &value1, const value_type &value2) const
+   inline Ret operator()(const value_type &value1, const value_type &value2) const
    {  return this->key_comp()(KeyOfValue()(value1), KeyOfValue()(value2));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const value_type &value2) const
+   inline Ret operator()(const key_type &key1, const value_type &value2) const
    {  return this->key_comp()(key1, KeyOfValue()(value2));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const value_type &value1, const key_type &key2) const
+   inline Ret operator()(const value_type &value1, const key_type &key2) const
    {  return this->key_comp()(KeyOfValue()(value1), key2);  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const key_type &key1, const U &nonkey2
+   inline Ret operator()( const key_type &key1, const U &nonkey2
                                               , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(key1, nonkey2);  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey1, const key_type &key2
+   inline Ret operator()( const U &nonkey1, const key_type &key2
                                               , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(nonkey1, key2);  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const value_type &value1, const U &nonvalue2
+   inline Ret operator()( const value_type &value1, const U &nonvalue2
                                               , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(KeyOfValue()(value1), nonvalue2);  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonvalue1, const value_type &value2
+   inline Ret operator()( const U &nonvalue1, const value_type &value2
                                               , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(nonvalue1, KeyOfValue()(value2));  }
 };
@@ -137,45 +137,45 @@ struct tree_value_compare<ValuePtr, KeyCompare, KeyOfValue, Ret, true>
    typedef boost::intrusive::detail::ebo_functor_holder<KeyCompare> base_t;
 
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare()
+   inline tree_value_compare()
       :  base_t()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit tree_value_compare(const key_compare &kcomp)
+   inline explicit tree_value_compare(const key_compare &kcomp)
       :  base_t(kcomp)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare (const tree_value_compare &x)
+   inline tree_value_compare (const tree_value_compare &x)
       :  base_t(x.base_t::get())
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare &operator=(const tree_value_compare &x)
+   inline tree_value_compare &operator=(const tree_value_compare &x)
    {  this->base_t::get() = x.base_t::get();   return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE tree_value_compare &operator=(const key_compare &x)
+   inline tree_value_compare &operator=(const key_compare &x)
    {  this->base_t::get() = x;   return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const key_compare &key_comp() const
+   inline const key_compare &key_comp() const
    {  return static_cast<const key_compare &>(*this);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key) const
+   inline Ret operator()(const key_type &key) const
    {  return this->key_comp()(key);   }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey
+   inline Ret operator()( const U &nonkey
                                              , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(nonkey);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const key_type &key2) const
+   inline Ret operator()(const key_type &key1, const key_type &key2) const
    {  return this->key_comp()(key1, key2);  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const key_type &key1, const U &nonkey2
+   inline Ret operator()( const key_type &key1, const U &nonkey2
                                               , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(key1, nonkey2);  }
 
    template<class U>
-   BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const U &nonkey1, const key_type &key2
+   inline Ret operator()(const U &nonkey1, const key_type &key2
                                               , typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const
    {  return this->key_comp()(nonkey1, key2);  }
 };
diff --git a/inst/include/boost/intrusive/detail/workaround.hpp b/inst/include/boost/intrusive/detail/workaround.hpp
index 0011fb5bf..f797b10f7 100644
--- a/inst/include/boost/intrusive/detail/workaround.hpp
+++ b/inst/include/boost/intrusive/detail/workaround.hpp
@@ -48,8 +48,11 @@
 #elif defined(BOOST_MSVC) && (_MSC_VER < 1900 || defined(_DEBUG))
    //"__forceinline" and MSVC seems to have some bugs in old versions and in debug mode
    #define BOOST_INTRUSIVE_FORCEINLINE inline
-#elif defined(BOOST_GCC) && ((__GNUC__ <= 5) || defined(__MINGW32__))
+#elif defined(BOOST_CLANG) || (defined(BOOST_GCC) && ((__GNUC__ <= 5) || defined(__MINGW32__)))
    //Older GCCs have problems with forceinline
+   //Clang can have code bloat issues with forceinline, see
+   //https://lists.boost.org/boost-users/2023/04/91445.php and
+   //https://github.com/llvm/llvm-project/issues/62202
    #define BOOST_INTRUSIVE_FORCEINLINE inline
 #else
    #define BOOST_INTRUSIVE_FORCEINLINE BOOST_FORCEINLINE
@@ -81,4 +84,42 @@
 #    define BOOST_INTRUSIVE_CATCH_END }
 #endif
 
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
+#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
+#     define BOOST_INTRUSIVE_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__)
+#  else
+#     define BOOST_INTRUSIVE_STATIC_ASSERT( B ) static_assert(B, #B)
+#  endif
+#else
+namespace boost {
+namespace intrusive {
+namespace detail {
+
+template<bool B>
+struct STATIC_ASSERTION_FAILURE;
+
+template<>
+struct STATIC_ASSERTION_FAILURE<true>{};
+
+template<unsigned> struct static_assert_test {};
+
+}}}
+
+#define BOOST_INTRUSIVE_STATIC_ASSERT(B) \
+         typedef ::boost::intrusive::detail::static_assert_test<\
+            (unsigned)sizeof(::boost::intrusive::detail::STATIC_ASSERTION_FAILURE<bool(B)>)>\
+               BOOST_JOIN(boost_intrusive_static_assert_typedef_, __LINE__) BOOST_ATTRIBUTE_UNUSED
+
+#endif   //BOOST_NO_CXX11_STATIC_ASSERT
+
+
+//GCC has some false positives with some functions returning references.
+//This silences this warning in selected functions
+#if defined(BOOST_GCC) && (BOOST_GCC >= 140000)
+#  define BOOST_INTRUSIVE_NO_DANGLING __attribute__((no_dangling))
+#else
+#  define BOOST_INTRUSIVE_NO_DANGLING
+#endif
+
+
 #endif   //#ifndef BOOST_INTRUSIVE_DETAIL_WORKAROUND_HPP
diff --git a/inst/include/boost/intrusive/hashtable.hpp b/inst/include/boost/intrusive/hashtable.hpp
index 688fb9b22..3e1293bd7 100644
--- a/inst/include/boost/intrusive/hashtable.hpp
+++ b/inst/include/boost/intrusive/hashtable.hpp
@@ -32,6 +32,8 @@
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
 
+#include <boost/move/detail/meta_utils_core.hpp>
+
 //General intrusive utilities
 #include <boost/intrusive/detail/hashtable_node.hpp>
 #include <boost/intrusive/detail/transform_iterator.hpp>
@@ -57,9 +59,7 @@
 #include <boost/intrusive/linear_slist_algorithms.hpp>
 
 //boost
-#include <boost/container_hash/hash.hpp>
 #include <boost/intrusive/detail/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/move/utility_core.hpp>
 #include <boost/move/adl_move_swap.hpp>
 #include <boost/move/algo/detail/search.hpp>
@@ -69,6 +69,9 @@
 #include <cstddef>      //std::size_t
 #include <boost/cstdint.hpp>      //std::uint64_t
 
+
+#include "detail/hash.hpp"
+
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
@@ -79,8 +82,10 @@
 
 
 namespace boost {
+
 namespace intrusive {
 
+
 #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
 
 /// @cond
@@ -100,11 +105,11 @@ struct prime_list_holder
    private:
 
    template <class SizeType> // sizeof(SizeType) < sizeof(std::size_t)
-   static BOOST_INTRUSIVE_FORCEINLINE SizeType truncate_size_type(std::size_t n, detail::true_)
+   static inline SizeType truncate_size_type(std::size_t n, detail::true_)
    {  return n < std::size_t(SizeType(-1)) ? static_cast<SizeType>(n) : SizeType(-1);  }
 
    template <class SizeType> // sizeof(SizeType) == sizeof(std::size_t)
-   static BOOST_INTRUSIVE_FORCEINLINE SizeType truncate_size_type(std::size_t n, detail::false_)
+   static inline SizeType truncate_size_type(std::size_t n, detail::false_)
    {  return static_cast<SizeType>(n);   }
 
    static const std::size_t prime_list[];
@@ -139,30 +144,30 @@ struct prime_list_holder
    public:
 
    template <class SizeType>
-   static BOOST_INTRUSIVE_FORCEINLINE SizeType suggested_upper_bucket_count(SizeType n)
+   static inline SizeType suggested_upper_bucket_count(SizeType n)
    {
       std::size_t const c = suggested_upper_bucket_count_impl(static_cast<std::size_t>(n));
       return truncate_size_type<SizeType>(c, detail::bool_<(sizeof(SizeType) < sizeof(std::size_t))>());
    }
 
    template <class SizeType>
-   static BOOST_INTRUSIVE_FORCEINLINE SizeType suggested_lower_bucket_count(SizeType n)
+   static inline SizeType suggested_lower_bucket_count(SizeType n)
    {
       std::size_t const c = suggested_lower_bucket_count_impl(static_cast<std::size_t>(n));
       return truncate_size_type<SizeType>(c, detail::bool_<(sizeof(SizeType) < sizeof(std::size_t))>());
    }
 
-   static BOOST_INTRUSIVE_FORCEINLINE std::size_t suggested_lower_bucket_count_idx(std::size_t n)
+   static inline std::size_t suggested_lower_bucket_count_idx(std::size_t n)
    {  return static_cast<std::size_t>(suggested_lower_bucket_count_ptr(n) - &prime_list[0]); }
 
-   static BOOST_INTRUSIVE_FORCEINLINE std::size_t suggested_upper_bucket_count_idx(std::size_t n)
+   static inline std::size_t suggested_upper_bucket_count_idx(std::size_t n)
    {  return static_cast<std::size_t>(suggested_upper_bucket_count_ptr(n) - &prime_list[0]); }
 
-   static BOOST_INTRUSIVE_FORCEINLINE std::size_t size_from_index(std::size_t n)
+   static inline std::size_t size_from_index(std::size_t n)
    {  return prime_list[std::ptrdiff_t(n)]; }
 
    template<std::size_t SizeIndex>
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; }
+   inline static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; }
 
    static std::size_t(*const positions[])(std::size_t);
 
@@ -171,19 +176,19 @@ struct prime_list_holder
    static const std::size_t inv_sizes32_size;
    #endif
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t lower_size_index(std::size_t n)
+   inline static std::size_t lower_size_index(std::size_t n)
    {   return prime_list_holder<>::suggested_lower_bucket_count_idx(n);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t upper_size_index(std::size_t n)
+   inline static std::size_t upper_size_index(std::size_t n)
    {   return prime_list_holder<>::suggested_upper_bucket_count_idx(n);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index)
+   inline static std::size_t size(std::size_t size_index)
    {   return prime_list_holder<>::size_from_index(size_index);  }
 
    #if BOOST_INTRUSIVE_64_BIT_SIZE_T
    // https://github.com/lemire/fastmod
 
-   BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d)
+   inline static uint64_t mul128_u32(uint64_t lowbits, uint32_t d)
    {
       #if defined(_MSC_VER)
          return __umulh(lowbits, d);
@@ -197,14 +202,14 @@ struct prime_list_holder
       #endif
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static uint32_t fastmod_u32(uint32_t a, uint64_t M, uint32_t d)
+   inline static uint32_t fastmod_u32(uint32_t a, uint64_t M, uint32_t d)
    {
       uint64_t lowbits = M * a;
       return (uint32_t)(mul128_u32(lowbits, d));
    }
    #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index)
+   inline static std::size_t position(std::size_t hash,std::size_t size_index)
    {
       #if BOOST_INTRUSIVE_64_BIT_SIZE_T
          BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]);
@@ -453,7 +458,7 @@ class exception_bucket_disposer
       :  cont_(&cont), disp_(disp), constructed_(constructed)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void release()
+   inline void release()
    {  cont_ = 0;  }
 
    ~exception_bucket_disposer()
@@ -502,37 +507,37 @@ struct bucket_traits_impl
 
    /// @endcond
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_traits_impl(bucket_ptr buckets, size_type len)
+   inline bucket_traits_impl(bucket_ptr buckets, size_type len)
       : buckets_(buckets), buckets_len_(len)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_traits_impl(const bucket_traits_impl& x)
+   inline bucket_traits_impl(const bucket_traits_impl& x)
       : buckets_(x.buckets_), buckets_len_(x.buckets_len_)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_traits_impl(BOOST_RV_REF(bucket_traits_impl) x)
+   inline bucket_traits_impl(BOOST_RV_REF(bucket_traits_impl) x)
       : buckets_(x.buckets_), buckets_len_(x.buckets_len_)
    {
       x.buckets_ = bucket_ptr();   x.buckets_len_ = 0u;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_traits_impl& operator=(BOOST_RV_REF(bucket_traits_impl) x)
+   inline bucket_traits_impl& operator=(BOOST_RV_REF(bucket_traits_impl) x)
    {
       buckets_ = x.buckets_; buckets_len_ = x.buckets_len_;
       x.buckets_ = bucket_ptr();   x.buckets_len_ = 0u; return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_traits_impl& operator=(BOOST_COPY_ASSIGN_REF(bucket_traits_impl) x)
+   inline bucket_traits_impl& operator=(BOOST_COPY_ASSIGN_REF(bucket_traits_impl) x)
    {
       buckets_ = x.buckets_;  buckets_len_ = x.buckets_len_; return *this;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr bucket_begin() const
+   inline bucket_ptr bucket_begin() const
    {
       return buckets_;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type  bucket_count() const BOOST_NOEXCEPT
+   inline size_type  bucket_count() const BOOST_NOEXCEPT
    {
       return buckets_len_;
    }
@@ -563,35 +568,23 @@ struct optimize_multikey_is_true
    static const bool value = sizeof(test<T>(0)) > sizeof(detail::yes_type)*2u;
 };
 
-template<bool StoreHash>
 struct insert_commit_data_impl
 {
    std::size_t hash;
    std::size_t bucket_idx;
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t get_hash() const
+   inline std::size_t get_hash() const
    {  return hash; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_hash(std::size_t h)
+   inline void set_hash(std::size_t h)
    {  hash = h;  }
 };
 
-template<>
-struct insert_commit_data_impl<false>
-{
-   std::size_t bucket_idx;
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t get_hash() const
-   {  return 0U; }
-
-   BOOST_INTRUSIVE_FORCEINLINE void set_hash(std::size_t)
-   {}
-};
-
 template<class Node, class SlistNodePtr>
-BOOST_INTRUSIVE_FORCEINLINE typename pointer_traits<SlistNodePtr>::template rebind_pointer<Node>::type
+inline typename pointer_traits<SlistNodePtr>::template rebind_pointer<Node>::type
    dcast_bucket_ptr(const SlistNodePtr &p)
 {
    typedef typename pointer_traits<SlistNodePtr>::template rebind_pointer<Node>::type node_ptr;
-   return pointer_traits<node_ptr>::pointer_to(static_cast<Node&>(*p));
+   return pointer_traits<node_ptr>::static_cast_from(p);
 }
 
 template<class NodeTraits>
@@ -689,13 +682,13 @@ struct group_functions
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void erase_from_group(slist_node_ptr, node_ptr, detail::false_)
+   inline static void erase_from_group(slist_node_ptr, node_ptr, detail::false_)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_last_in_group(node_ptr first_in_group, detail::true_)
+   inline static node_ptr get_last_in_group(node_ptr first_in_group, detail::true_)
    {  return group_traits::get_next(first_in_group);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_last_in_group(node_ptr n, detail::false_)
+   inline static node_ptr get_last_in_group(node_ptr n, detail::false_)
    {  return n;  }
 
    static node_ptr get_first_in_group(node_ptr n, detail::true_)
@@ -707,17 +700,17 @@ struct group_functions
       return n;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_first_in_group(node_ptr n, detail::false_)
+   inline static node_ptr get_first_in_group(node_ptr n, detail::false_)
    {  return n;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_first_in_group(node_ptr ptr)
+   inline static bool is_first_in_group(node_ptr ptr)
    {  return node_traits::get_next(group_traits::get_next(ptr)) != ptr;  }
 
 
-   BOOST_INTRUSIVE_FORCEINLINE static void insert_in_group(node_ptr first_in_group, node_ptr n, detail::true_)
+   inline static void insert_in_group(node_ptr first_in_group, node_ptr n, detail::true_)
    {  group_algorithms::link_after(first_in_group, n);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void insert_in_group(node_ptr, node_ptr, detail::false_)
+   inline static void insert_in_group(node_ptr, node_ptr, detail::false_)
    {}
 
    //Splits a group in two groups, and makes "new_first" the first node in the second group.
@@ -753,7 +746,7 @@ class incremental_rehash_rollback
       ,  split_traits_(split_tr),  released_(false)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void release()
+   inline void release()
    {  released_ = true; }
 
    ~incremental_rehash_rollback()
@@ -776,21 +769,21 @@ class incremental_rehash_rollback
 template<class NodeTraits>
 struct node_functions
 {
-   BOOST_INTRUSIVE_FORCEINLINE static void store_hash(typename NodeTraits::node_ptr p, std::size_t h, detail::true_)
+   inline static void store_hash(typename NodeTraits::node_ptr p, std::size_t h, detail::true_)
    {  return NodeTraits::set_hash(p, h); }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void store_hash(typename NodeTraits::node_ptr, std::size_t, detail::false_)
+   inline static void store_hash(typename NodeTraits::node_ptr, std::size_t, detail::false_)
    {}
 };
 
-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket(std::size_t hash_value, std::size_t bucket_cnt, detail::false_)
+inline std::size_t hash_to_bucket(std::size_t hash_value, std::size_t bucket_cnt, detail::false_)
 {  return hash_value % bucket_cnt;  }
 
-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket(std::size_t hash_value, std::size_t bucket_cnt, detail::true_)
+inline std::size_t hash_to_bucket(std::size_t hash_value, std::size_t bucket_cnt, detail::true_)
 {  return hash_value & (bucket_cnt - 1);   }
 
 template<bool Power2Buckets, bool Incremental>  //!fastmod_buckets
-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::false_)
+inline std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::false_)
 {
    std::size_t bucket_number = hash_to_bucket(hash_value, bucket_cnt, detail::bool_<Power2Buckets>());
    BOOST_IF_CONSTEXPR(Incremental)
@@ -799,7 +792,7 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va
 }
 
 template<bool Power2Buckets, bool Incremental>  //fastmod_buckets
-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_)
+inline std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_)
 {
    return prime_fmod_size::position(hash_value, split);
 }
@@ -886,11 +879,11 @@ struct downcast_node_to_value_t
          template rebind_pointer
             <const ValueTraits>::type                   const_value_traits_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE downcast_node_to_value_t(const_value_traits_ptr ptr)
+   inline downcast_node_to_value_t(const_value_traits_ptr ptr)
       :  base_t(ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE result_type operator()(first_argument_type arg) const
+   inline result_type operator()(first_argument_type arg) const
    {  return this->base_t::operator()(static_cast<intermediate_argument_type>(arg)); }
 };
 
@@ -905,14 +898,14 @@ struct node_cast_adaptor
    typedef typename pointer_traits<NodePtr>::element_type      node;
 
    template<class ConvertibleToF, class RealValuTraits>
-   BOOST_INTRUSIVE_FORCEINLINE node_cast_adaptor(const ConvertibleToF &c2f, const RealValuTraits *traits)
+   inline node_cast_adaptor(const ConvertibleToF &c2f, const RealValuTraits *traits)
       :  base_t(base_t(c2f, traits))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE typename base_t::node_ptr operator()(const slist_node &to_clone)
+   inline typename base_t::node_ptr operator()(const slist_node &to_clone)
    {  return base_t::operator()(static_cast<const node &>(to_clone));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE void operator()(SlistNodePtr to_clone)
+   inline void operator()(SlistNodePtr to_clone)
    {
       base_t::operator()(pointer_traits<NodePtr>::pointer_to(static_cast<node &>(*to_clone)));
    }
@@ -935,11 +928,11 @@ struct bucket_plus_vtraits
       BOOST_MOVABLE_BUT_NOT_COPYABLE(data_type)
 
       public:
-      BOOST_INTRUSIVE_FORCEINLINE data_type(const ValueTraits& val_traits, const BucketTraits& b_traits)
+      inline data_type(const ValueTraits& val_traits, const BucketTraits& b_traits)
          : ValueTraits(val_traits), BucketTraits(b_traits)
       {}
 
-      BOOST_INTRUSIVE_FORCEINLINE data_type(BOOST_RV_REF(data_type) other)
+      inline data_type(BOOST_RV_REF(data_type) other)
          : ValueTraits (BOOST_MOVE_BASE(ValueTraits,  other))
          , BucketTraits(BOOST_MOVE_BASE(BucketTraits, other))
       {}
@@ -994,49 +987,49 @@ struct bucket_plus_vtraits
 
    static const std::size_t bucket_overhead = LinearBuckets ? 1u : 0u;
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_plus_vtraits(const ValueTraits &val_traits, const bucket_traits &b_traits)
+   inline bucket_plus_vtraits(const ValueTraits &val_traits, const bucket_traits &b_traits)
       : m_data(val_traits, b_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_plus_vtraits(BOOST_RV_REF(bucket_plus_vtraits) other)
+   inline bucket_plus_vtraits(BOOST_RV_REF(bucket_plus_vtraits) other)
       : m_data(boost::move(((bucket_plus_vtraits&)other).m_data))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr priv_value_traits_ptr() const
+   inline const_value_traits_ptr priv_value_traits_ptr() const
    {  return pointer_traits<const_value_traits_ptr>::pointer_to(this->priv_value_traits());  }
 
    //bucket_value_traits
    //
-   BOOST_INTRUSIVE_FORCEINLINE const bucket_plus_vtraits &get_bucket_value_traits() const
+   inline const bucket_plus_vtraits &get_bucket_value_traits() const
    {  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_plus_vtraits &get_bucket_value_traits()
+   inline bucket_plus_vtraits &get_bucket_value_traits()
    {  return *this;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_bucket_value_traits_ptr bucket_value_traits_ptr() const
+   inline const_bucket_value_traits_ptr bucket_value_traits_ptr() const
    {  return pointer_traits<const_bucket_value_traits_ptr>::pointer_to(this->get_bucket_value_traits());  }
 
    //value traits
    //
-   BOOST_INTRUSIVE_FORCEINLINE const value_traits &priv_value_traits() const
+   inline const value_traits &priv_value_traits() const
    {  return static_cast<const value_traits &>(this->m_data);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE value_traits &priv_value_traits()
+   inline value_traits &priv_value_traits()
    {  return static_cast<value_traits &>(this->m_data);  }
 
    //value traits
    //
-   BOOST_INTRUSIVE_FORCEINLINE const bucket_traits &priv_bucket_traits() const
+   inline const bucket_traits &priv_bucket_traits() const
    {  return static_cast<const bucket_traits &>(this->m_data);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_traits& priv_bucket_traits()
+   inline bucket_traits& priv_bucket_traits()
    {  return static_cast<bucket_traits&>(this->m_data);  }
 
    //bucket operations
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_bucket_pointer() const BOOST_NOEXCEPT
+   inline bucket_ptr priv_bucket_pointer() const BOOST_NOEXCEPT
    {  return this->priv_bucket_traits().bucket_begin();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_usable_bucket_count() const BOOST_NOEXCEPT
+   inline std::size_t priv_usable_bucket_count() const BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(bucket_overhead){
          const std::size_t n = this->priv_bucket_traits().bucket_count();
@@ -1047,19 +1040,19 @@ struct bucket_plus_vtraits
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_type &priv_bucket(std::size_t n) const BOOST_NOEXCEPT
+   inline bucket_type &priv_bucket(std::size_t n) const BOOST_NOEXCEPT
    {
       BOOST_INTRUSIVE_INVARIANT_ASSERT(n < this->priv_usable_bucket_count());
       return this->priv_bucket_pointer()[std::ptrdiff_t(n)];
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_bucket_ptr(std::size_t n) const BOOST_NOEXCEPT
+   inline bucket_ptr priv_bucket_ptr(std::size_t n) const BOOST_NOEXCEPT
    {  return pointer_traits<bucket_ptr>::pointer_to(this->priv_bucket(n)); }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_past_usable_bucket_ptr() const
+   inline bucket_ptr priv_past_usable_bucket_ptr() const
    {  return this->priv_bucket_pointer() + std::ptrdiff_t(priv_usable_bucket_count()); }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_invalid_bucket_ptr() const
+   inline bucket_ptr priv_invalid_bucket_ptr() const
    {
       BOOST_IF_CONSTEXPR(LinearBuckets) {
          return bucket_ptr();
@@ -1069,7 +1062,7 @@ struct bucket_plus_vtraits
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_set_sentinel_bucket() const
+   inline void priv_set_sentinel_bucket() const
    {
       BOOST_IF_CONSTEXPR(LinearBuckets) {
          BOOST_INTRUSIVE_INVARIANT_ASSERT(this->priv_bucket_traits().bucket_count() > 1);
@@ -1078,7 +1071,7 @@ struct bucket_plus_vtraits
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_unset_sentinel_bucket() const
+   inline void priv_unset_sentinel_bucket() const
    {
       BOOST_IF_CONSTEXPR(LinearBuckets) {
          BOOST_INTRUSIVE_INVARIANT_ASSERT(this->priv_bucket_traits().bucket_count() > 1);
@@ -1087,46 +1080,46 @@ struct bucket_plus_vtraits
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE siterator priv_end_sit() const
+   inline siterator priv_end_sit() const
    {  return priv_end_sit(linear_buckets_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE siterator priv_end_sit(detail::true_) const
+   inline siterator priv_end_sit(detail::true_) const
    {  return siterator(this->priv_bucket_pointer() + std::ptrdiff_t(this->priv_bucket_traits().bucket_count() - bucket_overhead)); }
 
-   BOOST_INTRUSIVE_FORCEINLINE siterator priv_end_sit(detail::false_) const
+   inline siterator priv_end_sit(detail::false_) const
    {  return siterator(this->priv_bucket_pointer()->get_node_ptr());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE siterator priv_bucket_lbegin(std::size_t n) const
+   inline siterator priv_bucket_lbegin(std::size_t n) const
    {  siterator s(this->priv_bucket_lbbegin(n)); return ++s; }
 
-   BOOST_INTRUSIVE_FORCEINLINE siterator priv_bucket_lbbegin(std::size_t n) const
+   inline siterator priv_bucket_lbbegin(std::size_t n) const
    {  return this->sit_bbegin(this->priv_bucket(n));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE siterator priv_bucket_lend(std::size_t n) const
+   inline siterator priv_bucket_lend(std::size_t n) const
    {  return this->sit_end(this->priv_bucket(n));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_bucket_size(std::size_t n) const
+   inline std::size_t priv_bucket_size(std::size_t n) const
    {  return slist_node_algorithms::count(this->priv_bucket(n).get_node_ptr())-1u;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool priv_bucket_empty(std::size_t n) const
+   inline bool priv_bucket_empty(std::size_t n) const
    {  return slist_node_algorithms::is_empty(this->priv_bucket(n).get_node_ptr());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE bool priv_bucket_empty(bucket_ptr p) const
+   inline bool priv_bucket_empty(bucket_ptr p) const
    {  return slist_node_algorithms::is_empty(p->get_node_ptr());  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE siterator priv_bucket_lbegin(bucket_type &b)
+   static inline siterator priv_bucket_lbegin(bucket_type &b)
    {  return siterator(slist_node_traits::get_next(b.get_node_ptr()));  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE siterator priv_bucket_lbbegin(bucket_type& b)
+   static inline siterator priv_bucket_lbbegin(bucket_type& b)
    {  return siterator(b.get_node_ptr());  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE siterator priv_bucket_lend(bucket_type& b)
+   static inline siterator priv_bucket_lend(bucket_type& b)
    {  return siterator(slist_node_algorithms::end_node(b.get_node_ptr()));  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_bucket_size(const bucket_type& b)
+   static inline std::size_t priv_bucket_size(const bucket_type& b)
    {  return slist_node_algorithms::count(b.get_node_ptr())-1u;  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE bool priv_bucket_empty(const bucket_type& b)
+   static inline bool priv_bucket_empty(const bucket_type& b)
    {  return slist_node_algorithms::is_empty(b.get_node_ptr());  }
 
    template<class NodeDisposer>
@@ -1206,7 +1199,7 @@ struct bucket_plus_vtraits
    }
 
    template<class NodeDisposer>
-   BOOST_INTRUSIVE_FORCEINLINE static void priv_erase_node(bucket_type &b, siterator i, NodeDisposer node_disposer, detail::false_)   //!optimize multikey
+   inline static void priv_erase_node(bucket_type &b, siterator i, NodeDisposer node_disposer, detail::false_)   //!optimize multikey
    {
       slist_node_ptr bi = slist_node_algorithms::get_previous_node(b.get_node_ptr(), i.pointed_node());
       slist_node_algorithms::unlink_after_and_dispose(bi, node_disposer);
@@ -1252,14 +1245,14 @@ struct bucket_plus_vtraits
       return siterator(last_node_group);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static siterator priv_get_last(bucket_type &b, detail::false_) //NOT optimize multikey
+   inline static siterator priv_get_last(bucket_type &b, detail::false_) //NOT optimize multikey
    {
       slist_node_ptr p = b.get_node_ptr();
       return siterator(slist_node_algorithms::get_previous_node(p, slist_node_algorithms::end_node(p)));
    }
 
    template<class NodeDisposer>
-   static BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_erase_whole_bucket(bucket_type &b, NodeDisposer node_disposer)
+   static inline std::size_t priv_erase_whole_bucket(bucket_type &b, NodeDisposer node_disposer)
    {  return slist_node_algorithms::detach_and_dispose(b.get_node_ptr(), node_disposer);  }
 
    static siterator priv_get_previous(bucket_type &b, siterator i, detail::true_)   //optimize multikey
@@ -1274,7 +1267,7 @@ struct bucket_plus_vtraits
       return siterator(n);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static siterator priv_get_previous(bucket_type &b, siterator i, detail::false_)   //NOT optimize multikey
+   inline static siterator priv_get_previous(bucket_type &b, siterator i, detail::false_)   //NOT optimize multikey
    {  return siterator(slist_node_algorithms::get_previous_node(b.get_node_ptr(), i.pointed_node()));   }
 
    template<class Disposer>
@@ -1286,47 +1279,47 @@ struct bucket_plus_vtraits
    };
 
    template<class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE typename typeof_node_disposer<Disposer>::type
+   inline typename typeof_node_disposer<Disposer>::type
       make_node_disposer(const Disposer &disposer) const
    {
       typedef typename typeof_node_disposer<Disposer>::type return_t;
       return return_t(disposer, &this->priv_value_traits());
    }
 
-   static BOOST_INTRUSIVE_FORCEINLINE bucket_ptr to_ptr(bucket_type &b)
+   static inline bucket_ptr to_ptr(bucket_type &b)
    {  return pointer_traits<bucket_ptr>::pointer_to(b);   }
 
-   static BOOST_INTRUSIVE_FORCEINLINE siterator sit_bbegin(bucket_type& b)
+   static inline siterator sit_bbegin(bucket_type& b)
    {  return siterator(b.get_node_ptr());  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE siterator sit_begin(bucket_type& b)
+   static inline siterator sit_begin(bucket_type& b)
    {  return siterator(b.begin_ptr());  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE siterator sit_end(bucket_type& b)
+   static inline siterator sit_end(bucket_type& b)
    {  return siterator(slist_node_algorithms::end_node(b.get_node_ptr()));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t priv_stored_hash(siterator s, detail::true_) //store_hash
+   inline static std::size_t priv_stored_hash(siterator s, detail::true_) //store_hash
    {  return node_traits::get_hash(dcast_bucket_ptr<node>(s.pointed_node()));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t priv_stored_hash(siterator, detail::false_)  //NO store_hash
+   inline static std::size_t priv_stored_hash(siterator, detail::false_)  //NO store_hash
    {  return std::size_t(-1);   }
 
-   BOOST_INTRUSIVE_FORCEINLINE node &priv_value_to_node(reference v)
+   inline node &priv_value_to_node(reference v)
    {  return *this->priv_value_traits().to_node_ptr(v);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const node &priv_value_to_node(const_reference v) const
+   inline const node &priv_value_to_node(const_reference v) const
    {  return *this->priv_value_traits().to_node_ptr(v);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr priv_value_to_node_ptr(reference v)
+   inline node_ptr priv_value_to_node_ptr(reference v)
    {  return this->priv_value_traits().to_node_ptr(v);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr priv_value_to_node_ptr(const_reference v) const
+   inline const_node_ptr priv_value_to_node_ptr(const_reference v) const
    {  return this->priv_value_traits().to_node_ptr(v);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE reference priv_value_from_siterator(siterator s)
+   inline reference priv_value_from_siterator(siterator s)
    {  return *this->priv_value_traits().to_value_ptr(dcast_bucket_ptr<node>(s.pointed_node())); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_reference priv_value_from_siterator(siterator s) const
+   inline const_reference priv_value_from_siterator(siterator s) const
    {  return *this->priv_value_traits().to_value_ptr(dcast_bucket_ptr<node>(s.pointed_node())); }
 
    static void priv_init_buckets(const bucket_ptr buckets_ptr, const std::size_t bucket_cnt)
@@ -1351,37 +1344,37 @@ struct bucket_plus_vtraits
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_stored_or_compute_hash(const value_type &v, detail::true_) const   //For store_hash == true
+   inline std::size_t priv_stored_or_compute_hash(const value_type &v, detail::true_) const   //For store_hash == true
    {  return node_traits::get_hash(this->priv_value_traits().to_node_ptr(v));  }
 
    typedef hashtable_iterator<bucket_plus_vtraits, LinearBuckets, false>          iterator;
    typedef hashtable_iterator<bucket_plus_vtraits, LinearBuckets, true>           const_iterator;
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator end() BOOST_NOEXCEPT
+   inline iterator end() BOOST_NOEXCEPT
    {  return this->build_iterator(this->priv_end_sit(), bucket_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT
+   inline const_iterator end() const BOOST_NOEXCEPT
    {  return this->cend();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT
+   inline const_iterator cend() const BOOST_NOEXCEPT
    {  return this->build_const_iterator(this->priv_end_sit(), bucket_ptr());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator build_iterator(siterator s, bucket_ptr p)
+   inline iterator build_iterator(siterator s, bucket_ptr p)
    {  return this->build_iterator(s, p, linear_buckets_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator build_iterator(siterator s, bucket_ptr p, detail::true_)   //linear buckets
+   inline iterator build_iterator(siterator s, bucket_ptr p, detail::true_)   //linear buckets
    {  return iterator(s, p, this->priv_value_traits_ptr());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator build_iterator(siterator s, bucket_ptr, detail::false_)    //!linear buckets
+   inline iterator build_iterator(siterator s, bucket_ptr, detail::false_)    //!linear buckets
    {  return iterator(s, &this->get_bucket_value_traits());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator build_const_iterator(siterator s, bucket_ptr p) const
+   inline const_iterator build_const_iterator(siterator s, bucket_ptr p) const
    {  return this->build_const_iterator(s, p, linear_buckets_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator build_const_iterator(siterator s, bucket_ptr p, detail::true_) const   //linear buckets
+   inline const_iterator build_const_iterator(siterator s, bucket_ptr p, detail::true_) const   //linear buckets
    {  return const_iterator(s, p, this->priv_value_traits_ptr());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator build_const_iterator(siterator s, bucket_ptr, detail::false_) const   //!linear buckets
+   inline const_iterator build_const_iterator(siterator s, bucket_ptr, detail::false_) const   //!linear buckets
    {  return const_iterator(s, &this->get_bucket_value_traits());  }
 };
 
@@ -1394,7 +1387,7 @@ struct get_hash
 template<class T>
 struct get_hash<void, T>
 {
-   typedef ::boost::hash<T> type;
+   typedef detail::internal_hash_functor<T> type;
 };
 
 template<class EqualTo, class>
@@ -1477,29 +1470,29 @@ struct bucket_hash_t
    typedef bucket_plus_vtraits<ValueTraits, BucketTraits, LinearBuckets> bucket_plus_vtraits_t;
    typedef detail::ebo_functor_holder<hasher> base_t;
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_hash_t(const ValueTraits &val_traits, const bucket_traits &b_traits, const hasher & h)
+   inline bucket_hash_t(const ValueTraits &val_traits, const bucket_traits &b_traits, const hasher & h)
       : base_t(h)
       , bucket_plus_vtraits_t(val_traits, b_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_hash_t(BOOST_RV_REF(bucket_hash_t) other)
+   inline bucket_hash_t(BOOST_RV_REF(bucket_hash_t) other)
       : base_t(BOOST_MOVE_BASE(base_t, other))
       , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other))
    {}
 
    template<class K>
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const
+   inline std::size_t priv_hash(const K &k) const
    {  return this->base_t::operator()(k);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const
+   inline const hasher &priv_hasher() const
    {  return this->base_t::get();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE hasher &priv_hasher()
+   inline hasher &priv_hasher()
    {  return this->base_t::get();  }
 
    using bucket_plus_vtraits_t::priv_stored_or_compute_hash;   //For store_hash == true
 
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_stored_or_compute_hash(const value_type &v, detail::false_) const  //For store_hash == false
+   inline std::size_t priv_stored_or_compute_hash(const value_type &v, detail::false_) const  //For store_hash == false
    {  return this->priv_hasher()(key_of_value()(v));   }
 };
 
@@ -1553,27 +1546,27 @@ struct bucket_hash_equal_t
       , equal_holder_t(e)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_hash_equal_t(BOOST_RV_REF(bucket_hash_equal_t) other)
+   inline bucket_hash_equal_t(BOOST_RV_REF(bucket_hash_equal_t) other)
       : bucket_hash_type(BOOST_MOVE_BASE(bucket_hash_type, other))
       , equal_holder_t(BOOST_MOVE_BASE(equal_holder_t, other))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_get_cache()
+   inline bucket_ptr priv_get_cache()
    {  return this->priv_bucket_pointer();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_set_cache(bucket_ptr)
+   inline void priv_set_cache(bucket_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_set_cache_bucket_num(std::size_t)
+   inline void priv_set_cache_bucket_num(std::size_t)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_get_cache_bucket_num()
+   inline std::size_t priv_get_cache_bucket_num()
    {  return 0u;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_init_cache()
+   inline void priv_init_cache()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_swap_cache(bucket_hash_equal_t &)
+   inline void priv_swap_cache(bucket_hash_equal_t &)
    {}
 
    siterator priv_begin(bucket_ptr &pbucketptr) const
@@ -1591,22 +1584,22 @@ struct bucket_hash_equal_t
       return this->priv_end_sit();
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_insertion_update_cache(std::size_t)
+   inline void priv_insertion_update_cache(std::size_t)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_erasure_update_cache_range(std::size_t, std::size_t)
+   inline void priv_erasure_update_cache_range(std::size_t, std::size_t)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_erasure_update_cache(bucket_ptr)
+   inline void priv_erasure_update_cache(bucket_ptr)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_erasure_update_cache()
+   inline void priv_erasure_update_cache()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE const key_equal &priv_equal() const
+   inline const key_equal &priv_equal() const
    {  return this->equal_holder_t::get();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE key_equal &priv_equal()
+   inline key_equal &priv_equal()
    {  return this->equal_holder_t::get();  }
 };
 
@@ -1645,7 +1638,7 @@ struct bucket_hash_equal_t<ValueTraits, VoidOrKeyOfValue, VoidOrKeyHash, VoidOrK
       , equal_holder_t(e)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_hash_equal_t(BOOST_RV_REF(bucket_hash_equal_t) other)
+   inline bucket_hash_equal_t(BOOST_RV_REF(bucket_hash_equal_t) other)
       : bucket_hash_type(BOOST_MOVE_BASE(bucket_hash_type, other))
       , equal_holder_t(BOOST_MOVE_BASE(equal_holder_t, other))
    {}
@@ -1653,25 +1646,25 @@ struct bucket_hash_equal_t<ValueTraits, VoidOrKeyOfValue, VoidOrKeyHash, VoidOrK
    typedef typename unordered_bucket_ptr_impl
       <typename bucket_hash_type::value_traits>::type bucket_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_get_cache() const
+   inline bucket_ptr priv_get_cache() const
    {  return cached_begin_;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_set_cache(bucket_ptr p)
+   inline void priv_set_cache(bucket_ptr p)
    {  cached_begin_ = p;   }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_set_cache_bucket_num(std::size_t insertion_bucket)
+   inline void priv_set_cache_bucket_num(std::size_t insertion_bucket)
    {
       BOOST_INTRUSIVE_INVARIANT_ASSERT(insertion_bucket <= this->priv_usable_bucket_count());
       this->cached_begin_ = this->priv_bucket_pointer() + std::ptrdiff_t(insertion_bucket);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_get_cache_bucket_num()
+   inline std::size_t priv_get_cache_bucket_num()
    {  return std::size_t(this->cached_begin_ - this->priv_bucket_pointer());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_init_cache()
+   inline void priv_init_cache()
    {  this->cached_begin_ = this->priv_past_usable_bucket_ptr();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_swap_cache(bucket_hash_equal_t &other)
+   inline void priv_swap_cache(bucket_hash_equal_t &other)
    {  ::boost::adl_move_swap(this->cached_begin_, other.cached_begin_);  }
 
    siterator priv_begin(bucket_ptr& pbucketptr) const
@@ -1694,10 +1687,10 @@ struct bucket_hash_equal_t<ValueTraits, VoidOrKeyOfValue, VoidOrKeyHash, VoidOrK
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE const key_equal &priv_equal() const
+   inline const key_equal &priv_equal() const
    {  return this->equal_holder_t::get();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE key_equal &priv_equal()
+   inline key_equal &priv_equal()
    {  return this->equal_holder_t::get();  }
 
    void priv_erasure_update_cache_range(std::size_t first_bucket_num, std::size_t last_bucket_num)
@@ -1756,7 +1749,7 @@ struct hashtable_size_wrapper
    {}
    typedef detail::size_holder < true, SizeType> size_traits;//size_traits
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_size_wrapper(BOOST_RV_REF(hashtable_size_wrapper) other)
+   inline hashtable_size_wrapper(BOOST_RV_REF(hashtable_size_wrapper) other)
       : DeriveFrom(BOOST_MOVE_BASE(DeriveFrom, other))
    {}
 
@@ -1765,19 +1758,19 @@ struct hashtable_size_wrapper
    typedef const size_traits & size_traits_const_t;
    typedef       size_traits & size_traits_t;
 
-   BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const
+   inline SizeType get_hashtable_size_wrapper_size() const
    {  return size_traits_.get_size(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s)
+   inline void set_hashtable_size_wrapper_size(SizeType s)
    {  size_traits_.set_size(s); }
 
-   BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size()
+   inline void inc_hashtable_size_wrapper_size()
    {  size_traits_.increment(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size()
+   inline void dec_hashtable_size_wrapper_size()
    {  size_traits_.decrement(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits()
+   inline size_traits_t priv_size_traits()
    {  return size_traits_; }
 };
 
@@ -1798,7 +1791,7 @@ struct hashtable_size_wrapper<DeriveFrom, SizeType, false>
                    , ::boost::forward<Arg2>(arg2))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable_size_wrapper(BOOST_RV_REF(hashtable_size_wrapper) other)
+   inline hashtable_size_wrapper(BOOST_RV_REF(hashtable_size_wrapper) other)
       : DeriveFrom(BOOST_MOVE_BASE(DeriveFrom, other))
    {}
 
@@ -1807,19 +1800,19 @@ struct hashtable_size_wrapper<DeriveFrom, SizeType, false>
    typedef size_traits size_traits_const_t;
    typedef size_traits size_traits_t;
 
-   BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const
+   inline SizeType get_hashtable_size_wrapper_size() const
    {  return 0u; }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType)
+   inline void set_hashtable_size_wrapper_size(SizeType)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size()
+   inline void inc_hashtable_size_wrapper_size()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size()
+   inline void dec_hashtable_size_wrapper_size()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits()
+   inline size_traits priv_size_traits()
    {  return size_traits(); }
 };
 
@@ -1908,11 +1901,11 @@ struct hashdata_internal
       : split_bucket_hash_equal_t(val_traits, b_traits, h, e)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other)
+   inline hashdata_internal(BOOST_RV_REF(hashdata_internal) other)
       : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits()
+   inline typename split_bucket_hash_equal_t::size_traits_t priv_split_traits()
    {  return this->priv_size_traits();  }
 
    ~hashdata_internal()
@@ -1942,20 +1935,20 @@ struct hashdata_internal
    typedef typename bucket_plus_vtraits_t::const_iterator   const_iterator;
 
    //public functions
-   BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT
+   inline SizeType split_count() const BOOST_NOEXCEPT
    {  return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT
+   inline void split_count(SizeType s) BOOST_NOEXCEPT
    {  this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s);  }
 
    //public functions
-   BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT
+   inline void inc_split_count() BOOST_NOEXCEPT
    {  this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT
+   inline void dec_split_count() BOOST_NOEXCEPT
    {  this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT
+   inline static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(fastmod_buckets) {
          size_type split;
@@ -1975,7 +1968,7 @@ struct hashdata_internal
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static SizeType rehash_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT
+   inline static SizeType rehash_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(fastmod_buckets) {
          return (initial_split_from_bucket_count)(bc);
@@ -1991,7 +1984,7 @@ struct hashdata_internal
       }
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value) BOOST_NOEXCEPT_IF(!linear_buckets)
+   inline iterator iterator_to(reference value) BOOST_NOEXCEPT_IF(!linear_buckets)
    {  return iterator_to(value, linear_buckets_t());  }
 
    const_iterator iterator_to(const_reference value) const BOOST_NOEXCEPT_IF(!linear_buckets)
@@ -2019,25 +2012,25 @@ struct hashdata_internal
 
    typedef detail::bool_<fastmod_buckets> fastmod_buckets_t;
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_type &priv_hash_to_bucket(std::size_t hash_value) const
+   inline bucket_type &priv_hash_to_bucket(std::size_t hash_value) const
    {  return this->priv_bucket(this->priv_hash_to_nbucket(hash_value));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_hash_to_bucket_ptr(std::size_t hash_value) const
+   inline bucket_ptr priv_hash_to_bucket_ptr(std::size_t hash_value) const
    {  return this->priv_bucket_ptr(this->priv_hash_to_nbucket(hash_value));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value) const
+   inline size_type priv_hash_to_nbucket(std::size_t hash_value) const
    {  return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const  //fastmod_buckets_t
+   inline size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const  //fastmod_buckets_t
    {  return static_cast<size_type>(prime_fmod_size::position(hash_value, this->split_count()));  }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t
+   inline size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t
    {
       return static_cast<size_type>(hash_to_bucket_split<power_2_buckets, incremental>
          (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_()));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT
+   inline iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT
    {
       return iterator( siterator(this->priv_value_to_node_ptr(value))
                      , &this->get_bucket_value_traits());
@@ -2053,14 +2046,14 @@ struct hashdata_internal
 
    static local_iterator s_local_iterator_to(reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       siterator sit(value_traits::to_node_ptr(value));
       return local_iterator(sit, const_value_traits_ptr());
    }
 
    static const_local_iterator s_local_iterator_to(const_reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       siterator const sit = siterator
          ( pointer_traits<node_ptr>::const_cast_from
             (value_traits::to_node_ptr(value))
@@ -2081,22 +2074,22 @@ struct hashdata_internal
       return const_local_iterator(sit, this->priv_value_traits_ptr());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type bucket_count() const BOOST_NOEXCEPT
+   inline size_type bucket_count() const BOOST_NOEXCEPT
    {  return size_type(this->priv_usable_bucket_count());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type bucket_size(size_type n) const BOOST_NOEXCEPT
+   inline size_type bucket_size(size_type n) const BOOST_NOEXCEPT
    {  return (size_type)this->priv_bucket_size(n);   }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr bucket_pointer() const BOOST_NOEXCEPT
+   inline bucket_ptr bucket_pointer() const BOOST_NOEXCEPT
    {  return this->priv_bucket_pointer();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE local_iterator begin(size_type n) BOOST_NOEXCEPT
+   inline local_iterator begin(size_type n) BOOST_NOEXCEPT
    {  return local_iterator(this->priv_bucket_lbegin(n), this->priv_value_traits_ptr());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_local_iterator begin(size_type n) const BOOST_NOEXCEPT
+   inline const_local_iterator begin(size_type n) const BOOST_NOEXCEPT
    {  return this->cbegin(n);  }
 
-   static BOOST_INTRUSIVE_FORCEINLINE size_type suggested_upper_bucket_count(size_type n) BOOST_NOEXCEPT
+   static inline size_type suggested_upper_bucket_count(size_type n) BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(fastmod_buckets){
          std::size_t s = prime_fmod_size::upper_size_index(n);
@@ -2107,7 +2100,7 @@ struct hashdata_internal
       }
    }
 
-   static BOOST_INTRUSIVE_FORCEINLINE size_type suggested_lower_bucket_count(size_type n) BOOST_NOEXCEPT
+   static inline size_type suggested_lower_bucket_count(size_type n) BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(fastmod_buckets){
          std::size_t s = prime_fmod_size::lower_size_index(n);
@@ -2131,7 +2124,7 @@ struct hashdata_internal
    local_iterator end(size_type n) BOOST_NOEXCEPT
    {  return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_local_iterator end(size_type n) const BOOST_NOEXCEPT
+   inline const_local_iterator end(size_type n) const BOOST_NOEXCEPT
    {  return this->cend(n);  }
 
    const_local_iterator cend(size_type n) const BOOST_NOEXCEPT
@@ -2143,27 +2136,27 @@ struct hashdata_internal
 
    //Public functions for hashtable_impl
 
-   BOOST_INTRUSIVE_FORCEINLINE iterator begin() BOOST_NOEXCEPT
+   inline iterator begin() BOOST_NOEXCEPT
    {
       bucket_ptr p;
       siterator s = this->priv_begin(p);
       return this->build_iterator(s, p);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT
+   inline const_iterator begin() const BOOST_NOEXCEPT
    {  return this->cbegin();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT
+   inline const_iterator cbegin() const BOOST_NOEXCEPT
    {
       bucket_ptr p;
       siterator s = this->priv_begin(p);
       return this->build_const_iterator(s, p);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE hasher hash_function() const
+   inline hasher hash_function() const
    {  return this->priv_hasher();  }
 
-   BOOST_INTRUSIVE_FORCEINLINE key_equal key_eq() const
+   inline key_equal key_eq() const
    {  return this->priv_equal();   }
 };
 
@@ -2323,11 +2316,11 @@ class hashtable_impl
 
    //Configuration error: compare_hash<> can't be specified without store_hash<>
    //See documentation for more explanations
-   BOOST_STATIC_ASSERT((!compare_hash || store_hash));
+   BOOST_INTRUSIVE_STATIC_ASSERT((!compare_hash || store_hash));
 
    //Configuration error: fasmod_buckets<> can't be specified with incremental<> or power_2_buckets<>
    //See documentation for more explanations
-   BOOST_STATIC_ASSERT(!(fastmod_buckets && power_2_buckets));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(fastmod_buckets && power_2_buckets));
 
    typedef typename internal_type::slist_node_ptr                    slist_node_ptr;
    typedef typename pointer_traits
@@ -2354,15 +2347,15 @@ class hashtable_impl
    static const bool safemode_or_autounlink = internal_type::safemode_or_autounlink;
 
    //Constant-time size is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink)));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink)));
    //Cache begin is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(cache_begin && ((int)value_traits::link_mode == (int)auto_unlink)));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(cache_begin && ((int)value_traits::link_mode == (int)auto_unlink)));
 
 
    /// @endcond
    
    public:
-   typedef insert_commit_data_impl<store_hash> insert_commit_data;
+   typedef insert_commit_data_impl insert_commit_data;
 
    private:
    void default_init_actions()
@@ -2378,16 +2371,16 @@ class hashtable_impl
       this->split_count(this->initial_split_from_bucket_count(bucket_sz));
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT
+   inline SizeType priv_size_count() const BOOST_NOEXCEPT
    {  return this->internal_type::get_hashtable_size_wrapper_size(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT
+   inline void priv_size_count(SizeType s) BOOST_NOEXCEPT
    {  this->internal_type::set_hashtable_size_wrapper_size(s); }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT
+   inline void priv_size_inc() BOOST_NOEXCEPT
    {  this->internal_type::inc_hashtable_size_wrapper_size(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT
+   inline void priv_size_dec() BOOST_NOEXCEPT
    {  this->internal_type::dec_hashtable_size_wrapper_size(); }
 
    public:
@@ -2635,7 +2628,7 @@ class hashtable_impl
    //! <b>Throws</b>: If cloner or hasher throw or hash or equality predicate copying
    //!   throws. Basic guarantee.
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const hashtable_impl &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const hashtable_impl &src, Cloner cloner, Disposer disposer)
    {  this->priv_clone_from(src, cloner, disposer);   }
 
    //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw
@@ -2658,7 +2651,7 @@ class hashtable_impl
    //! <b>Throws</b>: If cloner or hasher throw or hash or equality predicate copying
    //!   throws. Basic guarantee.
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(hashtable_impl) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(hashtable_impl) src, Cloner cloner, Disposer disposer)
    {  this->priv_clone_from(static_cast<hashtable_impl&>(src), cloner, disposer);   }
 
    //! <b>Requires</b>: value must be an lvalue
@@ -2724,7 +2717,7 @@ class hashtable_impl
       insert_commit_data commit_data;
       std::pair<iterator, bool> ret = this->insert_unique_check(key_of_value()(value), commit_data);
       if(ret.second){
-         ret.first = this->insert_unique_commit(value, commit_data);
+         ret.first = this->insert_unique_fast_commit(value, commit_data);
       }
       return ret;
    }
@@ -2828,7 +2821,7 @@ class hashtable_impl
    //!   objects are inserted or erased from the unordered_set.
    //!
    //!   After a successful rehashing insert_commit_data remains valid.
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert_unique_check
+   inline std::pair<iterator, bool> insert_unique_check
       ( const key_type &key, insert_commit_data &commit_data)
    {  return this->insert_unique_check(key, this->priv_hasher(), this->priv_equal(), commit_data);  }
 
@@ -2851,7 +2844,43 @@ class hashtable_impl
    //!   erased between the "insert_check" and "insert_commit" calls.
    //!
    //!   After a successful rehashing insert_commit_data remains valid.
-   iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT
+   iterator insert_unique_commit(reference value, const insert_commit_data& commit_data) BOOST_NOEXCEPT
+   {
+      size_type bucket_num = this->priv_hash_to_nbucket(commit_data.get_hash());
+      bucket_type& b = this->priv_bucket(bucket_num);
+      this->priv_size_traits().increment();
+      node_ptr const n = pointer_traits<node_ptr>::pointer_to(this->priv_value_to_node(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n));
+      node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t());
+      this->priv_insertion_update_cache(bucket_num);
+      group_functions_t::insert_in_group(n, n, optimize_multikey_t());
+      slist_node_algorithms::link_after(b.get_node_ptr(), n);
+      return this->build_iterator(siterator(n), this->to_ptr(b));
+   }
+
+   //! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
+   //!   must have been obtained from a previous call to "insert_check".
+   //!   No objects should have been inserted or erased from the unordered_set between
+   //!   the "insert_check" that filled "commit_data" and the call to "insert_commit".
+   //!
+   //!   No rehashing shall be performed between `insert_check` and `insert_fast_commit`.
+   //! 
+   //! <b>Effects</b>: Inserts the value in the unordered_set using the information obtained
+   //!   from the "commit_data" that a previous "insert_check" filled.
+   //!
+   //! <b>Returns</b>: An iterator to the newly inserted object.
+   //!
+   //! <b>Complexity</b>: Constant time.
+   //!
+   //! <b>Throws</b>: Nothing.
+   //!
+   //! <b>Notes</b>: This function has only sense if a "insert_check" has been
+   //!   previously executed to fill "commit_data". No value should be inserted or
+   //!   erased between the "insert_check" and "insert_commit" calls.
+   //!
+   //!   Since this commit operation does not support rehashing between the check
+   //!   and the commit, it's faster than `insert_commit`.
+   iterator insert_unique_fast_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT
    {
       this->priv_size_inc();
       node_ptr const n = this->priv_value_to_node_ptr(value);
@@ -2872,7 +2901,7 @@ class hashtable_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased element. No destructors are called.
-   BOOST_INTRUSIVE_FORCEINLINE void erase(const_iterator i) BOOST_NOEXCEPT
+   inline void erase(const_iterator i) BOOST_NOEXCEPT
    {  this->erase_and_dispose(i, detail::null_disposer());  }
 
    //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -2884,7 +2913,7 @@ class hashtable_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
-   BOOST_INTRUSIVE_FORCEINLINE void erase(const_iterator b, const_iterator e) BOOST_NOEXCEPT
+   inline void erase(const_iterator b, const_iterator e) BOOST_NOEXCEPT
    {  this->erase_and_dispose(b, e, detail::null_disposer());  }
 
    //! <b>Effects</b>: Erases all the elements with the given value.
@@ -2899,7 +2928,7 @@ class hashtable_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
-   BOOST_INTRUSIVE_FORCEINLINE size_type erase(const key_type &key)
+   inline size_type erase(const key_type &key)
    {  return this->erase(key, this->priv_hasher(), this->priv_equal());  }
 
    //! <b>Requires</b>: "hash_func" must be a hash function that induces
@@ -2923,7 +2952,7 @@ class hashtable_impl
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
    template<class KeyType, class KeyHasher, class KeyEqual>
-   BOOST_INTRUSIVE_FORCEINLINE size_type erase(const KeyType& key, KeyHasher hash_func, KeyEqual equal_func)
+   inline size_type erase(const KeyType& key, KeyHasher hash_func, KeyEqual equal_func)
    {  return this->erase_and_dispose(key, hash_func, equal_func, detail::null_disposer()); }
 
    //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -3007,7 +3036,7 @@ class hashtable_impl
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
    template<class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE size_type erase_and_dispose(const key_type &key, Disposer disposer)
+   inline size_type erase_and_dispose(const key_type &key, Disposer disposer)
    {  return this->erase_and_dispose(key, this->priv_hasher(), this->priv_equal(), disposer);   }
 
    //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -3110,7 +3139,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case O(1), worst case O(this->size()).
    //!
    //! <b>Throws</b>: If the internal hasher or the equality functor throws.
-   BOOST_INTRUSIVE_FORCEINLINE size_type count(const key_type &key) const
+   inline size_type count(const key_type &key) const
    {  return this->count(key, this->priv_hasher(), this->priv_equal());  }
 
    //! <b>Requires</b>: "hash_func" must be a hash function that induces
@@ -3141,7 +3170,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case O(1), worst case O(this->size()).
    //!
    //! <b>Throws</b>: If the internal hasher or the equality functor throws.
-   BOOST_INTRUSIVE_FORCEINLINE iterator find(const key_type &key)
+   inline iterator find(const key_type &key)
    {  return this->find(key, this->priv_hasher(), this->priv_equal());   }
 
    //! <b>Requires</b>: "hash_func" must be a hash function that induces
@@ -3178,7 +3207,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case O(1), worst case O(this->size()).
    //!
    //! <b>Throws</b>: If the internal hasher or the equality functor throws.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator find(const key_type &key) const
+   inline const_iterator find(const key_type &key) const
    {  return this->find(key, this->priv_hasher(), this->priv_equal());   }
 
    //! <b>Requires</b>: "hash_func" must be a hash function that induces
@@ -3217,7 +3246,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case O(this->count(value)). Worst case O(this->size()).
    //!
    //! <b>Throws</b>: If the internal hasher or the equality functor throws.
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator,iterator> equal_range(const key_type &key)
+   inline std::pair<iterator,iterator> equal_range(const key_type &key)
    {  return this->equal_range(key, this->priv_hasher(), this->priv_equal());  }
 
    //! <b>Requires</b>: "hash_func" must be a hash function that induces
@@ -3258,7 +3287,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case O(this->count(value)). Worst case O(this->size()).
    //!
    //! <b>Throws</b>: If the internal hasher or the equality functor throws.
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<const_iterator, const_iterator>
+   inline std::pair<const_iterator, const_iterator>
       equal_range(const key_type &key) const
    {  return this->equal_range(key, this->priv_hasher(), this->priv_equal());  }
 
@@ -3393,7 +3422,7 @@ class hashtable_impl
    //! <b>Throws</b>: If the hash functor throws.
    //!
    //! <b>Note</b>: the return value is in the range [0, this->bucket_count()).
-   BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const
+   inline size_type bucket(const key_type& k) const
    {  return this->priv_hash_to_nbucket(this->priv_hash(k));   }
 
    //! <b>Requires</b>: "hash_func" must be a hash function that induces
@@ -3409,7 +3438,7 @@ class hashtable_impl
    //!
    //! <b>Note</b>: the return value is in the range [0, this->bucket_count()).
    template<class KeyType, class KeyHasher>
-   BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const KeyType& k, KeyHasher hash_func)  const
+   inline size_type bucket(const KeyType& k, KeyHasher hash_func)  const
    {  return this->priv_hash_to_nbucket(hash_func(k));   }
 
    #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
@@ -3527,7 +3556,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case linear in this->size(), worst case quadratic.
    //!
    //! <b>Throws</b>: If the hasher functor throws. Basic guarantee.
-   BOOST_INTRUSIVE_FORCEINLINE void rehash(const bucket_traits &new_bucket_traits)
+   inline void rehash(const bucket_traits &new_bucket_traits)
    {  this->priv_rehash_impl(new_bucket_traits, false); }
 
    //! <b>Note</b>: This function is used when keys from inserted elements are changed 
@@ -3550,7 +3579,7 @@ class hashtable_impl
    //! <b>Complexity</b>: Average case linear in this->size(), worst case quadratic.
    //!
    //! <b>Throws</b>: If the hasher functor throws. Basic guarantee.
-   BOOST_INTRUSIVE_FORCEINLINE void full_rehash()
+   inline void full_rehash()
    {  this->priv_rehash_impl(this->priv_bucket_traits(), true);  }
 
    //! <b>Requires</b>:
@@ -3565,7 +3594,7 @@ class hashtable_impl
    bool incremental_rehash(bool grow = true)
    {
       //This function is only available for containers with incremental hashing
-      BOOST_STATIC_ASSERT(( incremental && power_2_buckets ));
+      BOOST_INTRUSIVE_STATIC_ASSERT(( incremental && power_2_buckets ));
       const std::size_t split_idx  = this->split_count();
       const std::size_t bucket_cnt = this->bucket_count();
       bool ret = false;
@@ -3630,7 +3659,7 @@ class hashtable_impl
    bool incremental_rehash(const bucket_traits &new_bucket_traits) BOOST_NOEXCEPT
    {
       //This function is only available for containers with incremental hashing
-      BOOST_STATIC_ASSERT(( incremental && power_2_buckets ));
+      BOOST_INTRUSIVE_STATIC_ASSERT(( incremental && power_2_buckets ));
       const bucket_ptr new_buckets = new_bucket_traits.bucket_begin();
       const size_type new_bucket_count_stdszt = static_cast<SizeType>(new_bucket_traits.bucket_count() - bucket_overhead);
       BOOST_INTRUSIVE_INVARIANT_ASSERT(sizeof(size_type) >= sizeof(std::size_t) || new_bucket_count_stdszt <= size_type(-1));
@@ -3748,7 +3777,7 @@ class hashtable_impl
    {  return !(x < y);  }
 
    /// @cond
-   BOOST_INTRUSIVE_FORCEINLINE void check() const {}
+   inline void check() const {}
    private:
 
    static void priv_initialize_new_buckets
@@ -4050,17 +4079,17 @@ class hashtable_impl
    }
 
    template<class KeyType, class KeyEqual>
-   BOOST_INTRUSIVE_FORCEINLINE bool priv_is_value_equal_to_key
+   inline bool priv_is_value_equal_to_key
       (const value_type &v, const std::size_t h, const KeyType &key, KeyEqual equal_func, detail::true_) const //compare_hash
    {  return this->priv_stored_or_compute_hash(v, store_hash_t()) == h && equal_func(key, key_of_value()(v));  }
 
    template<class KeyType, class KeyEqual>
-   BOOST_INTRUSIVE_FORCEINLINE bool priv_is_value_equal_to_key
+   inline bool priv_is_value_equal_to_key
       (const value_type& v, const std::size_t , const KeyType& key, KeyEqual equal_func, detail::false_) const //compare_hash
    {  return equal_func(key, key_of_value()(v));   }
 
    //return previous iterator to the next equal range group in case
-   BOOST_INTRUSIVE_FORCEINLINE static void priv_go_to_last_in_group
+   inline static void priv_go_to_last_in_group
       (siterator &it_first_in_group, detail::true_) BOOST_NOEXCEPT  //optimize_multikey
    {
       it_first_in_group =
@@ -4069,7 +4098,7 @@ class hashtable_impl
    }
 
    //return previous iterator to the next equal range group in case
-   BOOST_INTRUSIVE_FORCEINLINE static void priv_go_to_last_in_group        //!optimize_multikey
+   inline static void priv_go_to_last_in_group        //!optimize_multikey
       (siterator /*&it_first_in_group*/, detail::false_) BOOST_NOEXCEPT
    { }
 
@@ -4171,16 +4200,16 @@ class hashtable_impl
       return r;
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_get_bucket_num(const_iterator it) BOOST_NOEXCEPT
+   inline size_type priv_get_bucket_num(const_iterator it) BOOST_NOEXCEPT
    {  return this->priv_get_bucket_num(it, linear_buckets_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_get_bucket_num(const_iterator it, detail::true_) BOOST_NOEXCEPT //linear
+   inline size_type priv_get_bucket_num(const_iterator it, detail::true_) BOOST_NOEXCEPT //linear
    {  return size_type(it.get_bucket_ptr() - this->priv_bucket_pointer());   }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_get_bucket_num(const_iterator it, detail::false_) BOOST_NOEXCEPT //!linear
+   inline size_type priv_get_bucket_num(const_iterator it, detail::false_) BOOST_NOEXCEPT //!linear
    {  return this->priv_get_bucket_num_hash_dispatch(it.slist_it(), store_hash_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE size_type priv_get_bucket_num_hash_dispatch(siterator it, detail::true_) BOOST_NOEXCEPT    //store_hash
+   inline size_type priv_get_bucket_num_hash_dispatch(siterator it, detail::true_) BOOST_NOEXCEPT    //store_hash
    {  return (size_type)this->priv_hash_to_nbucket(this->priv_stored_hash(it, store_hash_t()));  }
 
    size_type priv_get_bucket_num_hash_dispatch(siterator it, detail::false_) BOOST_NOEXCEPT   //NO store_hash
@@ -4199,13 +4228,13 @@ class hashtable_impl
    }
 
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_get_bucket_ptr(const_iterator it) BOOST_NOEXCEPT
+   inline bucket_ptr priv_get_bucket_ptr(const_iterator it) BOOST_NOEXCEPT
    {  return this->priv_get_bucket_ptr(it, linear_buckets_t());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_get_bucket_ptr(const_iterator it, detail::true_) BOOST_NOEXCEPT //linear
+   inline bucket_ptr priv_get_bucket_ptr(const_iterator it, detail::true_) BOOST_NOEXCEPT //linear
    {  return it.get_bucket_ptr();   }
 
-   BOOST_INTRUSIVE_FORCEINLINE bucket_ptr priv_get_bucket_ptr(const_iterator it, detail::false_) BOOST_NOEXCEPT //!linear
+   inline bucket_ptr priv_get_bucket_ptr(const_iterator it, detail::false_) BOOST_NOEXCEPT //!linear
    {  return this->priv_bucket_ptr(this->priv_get_bucket_num_hash_dispatch(it.slist_it(), store_hash_t()));  }
 
    /// @endcond
@@ -4328,28 +4357,28 @@ class hashtable
    typedef typename Base::key_equal          key_equal;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit hashtable ( const bucket_traits &b_traits
+   inline explicit hashtable ( const bucket_traits &b_traits
              , const hasher & hash_func = hasher()
              , const key_equal &equal_func = key_equal()
              , const value_traits &v_traits = value_traits())
       :  Base(b_traits, hash_func, equal_func, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable(BOOST_RV_REF(hashtable) x)
+   inline hashtable(BOOST_RV_REF(hashtable) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE hashtable& operator=(BOOST_RV_REF(hashtable) x)
+   inline hashtable& operator=(BOOST_RV_REF(hashtable) x)
    {  return static_cast<hashtable&>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const hashtable &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const hashtable &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(hashtable) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(hashtable) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 };
 
diff --git a/inst/include/boost/intrusive/linear_slist_algorithms.hpp b/inst/include/boost/intrusive/linear_slist_algorithms.hpp
index a616d7ed7..0574f8248 100644
--- a/inst/include/boost/intrusive/linear_slist_algorithms.hpp
+++ b/inst/include/boost/intrusive/linear_slist_algorithms.hpp
@@ -151,8 +151,8 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void init_header(node_ptr this_node) BOOST_NOEXCEPT
-   {  NodeTraits::set_next(this_node, node_ptr ());  }
+   inline static void init_header(node_ptr this_node) BOOST_NOEXCEPT
+   {  NodeTraits::set_next(this_node, node_ptr());  }
 
    //! <b>Requires</b>: 'p' is the first node of a list.
    //!
@@ -161,7 +161,7 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr end_node(const_node_ptr) BOOST_NOEXCEPT
+   inline static node_ptr end_node(const_node_ptr) BOOST_NOEXCEPT
    {  return node_ptr();   }
 
    //! <b>Effects</b>: Returns true if this_node_points to an empty list.
@@ -169,7 +169,7 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_empty(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool is_empty(const_node_ptr this_node) BOOST_NOEXCEPT
    {  return !NodeTraits::get_next(this_node);  }
 
    //! <b>Effects</b>: Returns true if this_node points to a sentinel node.
@@ -177,7 +177,7 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static bool is_sentinel(const_node_ptr this_node) BOOST_NOEXCEPT
+   inline static bool is_sentinel(const_node_ptr this_node) BOOST_NOEXCEPT
    {  return NodeTraits::get_next(this_node) == this_node;  }
 
    //! <b>Effects</b>: Marks this node as a "sentinel" node, a special state that is different from "empty",
@@ -186,7 +186,7 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void set_sentinel(node_ptr this_node) BOOST_NOEXCEPT
+   inline static void set_sentinel(node_ptr this_node) BOOST_NOEXCEPT
    {  NodeTraits::set_next(this_node, this_node);   }
 
    //! <b>Requires</b>: this_node and prev_init_node must be in the same linear list.
@@ -198,7 +198,7 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Linear to the number of elements between prev_init_node and this_node.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr
+   inline static node_ptr
       get_previous_node(node_ptr prev_init_node, node_ptr this_node) BOOST_NOEXCEPT
    {  return base_t::get_previous_node(prev_init_node, this_node);   }
 
@@ -230,7 +230,7 @@ class linear_slist_algorithms
    //! <b>Complexity</b>: Constant
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE static void swap_trailing_nodes(node_ptr this_node, node_ptr other_node) BOOST_NOEXCEPT
+   inline static void swap_trailing_nodes(node_ptr this_node, node_ptr other_node) BOOST_NOEXCEPT
    {
       node_ptr this_nxt    = NodeTraits::get_next(this_node);
       node_ptr other_nxt   = NodeTraits::get_next(other_node);
@@ -400,7 +400,7 @@ class linear_slist_algorithms
    //!
    //! <b>Throws</b>: Nothing.
    template<class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t detach_and_dispose(node_ptr p, Disposer disposer) BOOST_NOEXCEPT
+   inline static std::size_t detach_and_dispose(node_ptr p, Disposer disposer) BOOST_NOEXCEPT
    {  return base_t::unlink_after_and_dispose(p, node_ptr(), disposer);   }
 };
 
diff --git a/inst/include/boost/intrusive/list.hpp b/inst/include/boost/intrusive/list.hpp
index 62291b480..507e73c63 100644
--- a/inst/include/boost/intrusive/list.hpp
+++ b/inst/include/boost/intrusive/list.hpp
@@ -37,7 +37,6 @@
 #include <boost/intrusive/detail/algorithm.hpp>
 
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #include <boost/intrusive/detail/value_functors.hpp>
 #include <cstddef>   //std::size_t, etc.
@@ -123,14 +122,14 @@ class list_impl
    static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value;
 
    //Constant-time size is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(constant_time_size &&
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(constant_time_size &&
                         ((int)value_traits::link_mode == (int)auto_unlink)
                       ));
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_root_node()
+   inline node_ptr get_root_node()
    { return data_.root_plus_size_.m_header.get_node(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_root_node() const
+   inline const_node_ptr get_root_node() const
    { return data_.root_plus_size_.m_header.get_node(); }
 
    struct root_plus_size : public size_traits
@@ -141,29 +140,29 @@ class list_impl
    struct data_t : public value_traits
    {
       typedef typename list_impl::value_traits value_traits;
-      BOOST_INTRUSIVE_FORCEINLINE explicit data_t(const value_traits &val_traits)
+      inline explicit data_t(const value_traits &val_traits)
          :  value_traits(val_traits)
       {}
 
       root_plus_size root_plus_size_;
    } data_;
 
-   BOOST_INTRUSIVE_FORCEINLINE size_traits &priv_size_traits() BOOST_NOEXCEPT
+   inline size_traits &priv_size_traits() BOOST_NOEXCEPT
    {  return data_.root_plus_size_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const size_traits &priv_size_traits() const BOOST_NOEXCEPT
+   inline const size_traits &priv_size_traits() const BOOST_NOEXCEPT
    {  return data_.root_plus_size_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const value_traits &priv_value_traits() const BOOST_NOEXCEPT
+   inline const value_traits &priv_value_traits() const BOOST_NOEXCEPT
    {  return data_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE value_traits &priv_value_traits() BOOST_NOEXCEPT
+   inline value_traits &priv_value_traits() BOOST_NOEXCEPT
    {  return data_;  }
 
    typedef typename boost::intrusive::value_traits_pointers
       <ValueTraits>::const_value_traits_ptr const_value_traits_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr priv_value_traits_ptr() const BOOST_NOEXCEPT
+   inline const_value_traits_ptr priv_value_traits_ptr() const BOOST_NOEXCEPT
    {  return pointer_traits<const_value_traits_ptr>::pointer_to(this->priv_value_traits());  }
 
    /// @endcond
@@ -364,7 +363,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE reference front() BOOST_NOEXCEPT
+   inline reference front() BOOST_NOEXCEPT
    { return *priv_value_traits().to_value_ptr(node_traits::get_next(this->get_root_node())); }
 
    //! <b>Effects</b>: Returns a const_reference to the first element of the list.
@@ -372,7 +371,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reference front() const BOOST_NOEXCEPT
+   inline const_reference front() const BOOST_NOEXCEPT
    { return *priv_value_traits().to_value_ptr(node_traits::get_next(this->get_root_node())); }
 
    //! <b>Effects</b>: Returns a reference to the last element of the list.
@@ -380,7 +379,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE reference back() BOOST_NOEXCEPT
+   inline reference back() BOOST_NOEXCEPT
    { return *priv_value_traits().to_value_ptr(node_traits::get_previous(this->get_root_node())); }
 
    //! <b>Effects</b>: Returns a const_reference to the last element of the list.
@@ -388,7 +387,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reference back() const BOOST_NOEXCEPT
+   inline const_reference back() const BOOST_NOEXCEPT
    { return *priv_value_traits().to_value_ptr(detail::uncast(node_traits::get_previous(this->get_root_node()))); }
 
    //! <b>Effects</b>: Returns an iterator to the first element contained in the list.
@@ -396,7 +395,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE iterator begin() BOOST_NOEXCEPT
+   inline iterator begin() BOOST_NOEXCEPT
    { return iterator(node_traits::get_next(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the list.
@@ -404,7 +403,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT
+   inline const_iterator begin() const BOOST_NOEXCEPT
    { return this->cbegin(); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the list.
@@ -412,7 +411,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT
+   inline const_iterator cbegin() const BOOST_NOEXCEPT
    { return const_iterator(node_traits::get_next(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the list.
@@ -420,7 +419,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE iterator end() BOOST_NOEXCEPT
+   inline iterator end() BOOST_NOEXCEPT
    { return iterator(this->get_root_node(), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the list.
@@ -428,7 +427,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT
+   inline const_iterator end() const BOOST_NOEXCEPT
    { return this->cend(); }
 
    //! <b>Effects</b>: Returns a constant iterator to the end of the list.
@@ -436,7 +435,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT
+   inline const_iterator cend() const BOOST_NOEXCEPT
    { return const_iterator(detail::uncast(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
@@ -445,7 +444,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rbegin() BOOST_NOEXCEPT
+   inline reverse_iterator rbegin() BOOST_NOEXCEPT
    { return reverse_iterator(this->end()); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
@@ -454,7 +453,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rbegin() const BOOST_NOEXCEPT
+   inline const_reverse_iterator rbegin() const BOOST_NOEXCEPT
    { return this->crbegin(); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
@@ -463,7 +462,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crbegin() const BOOST_NOEXCEPT
+   inline const_reverse_iterator crbegin() const BOOST_NOEXCEPT
    { return const_reverse_iterator(end()); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
@@ -472,7 +471,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rend() BOOST_NOEXCEPT
+   inline reverse_iterator rend() BOOST_NOEXCEPT
    { return reverse_iterator(begin()); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -481,7 +480,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rend() const BOOST_NOEXCEPT
+   inline const_reverse_iterator rend() const BOOST_NOEXCEPT
    { return this->crend(); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -490,7 +489,7 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crend() const BOOST_NOEXCEPT
+   inline const_reverse_iterator crend() const BOOST_NOEXCEPT
    { return const_reverse_iterator(this->begin()); }
 
    //! <b>Precondition</b>: end_iterator must be a valid end iterator
@@ -501,7 +500,8 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE static list_impl &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static list_impl &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return list_impl::priv_container_from_end_iterator(end_iterator);   }
 
    //! <b>Precondition</b>: end_iterator must be a valid end const_iterator
@@ -512,7 +512,8 @@ class list_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE static const list_impl &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const list_impl &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return list_impl::priv_container_from_end_iterator(end_iterator);   }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the list.
@@ -523,7 +524,7 @@ class list_impl
    //!   if constant-time size option is disabled. Constant time otherwise.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
-   BOOST_INTRUSIVE_FORCEINLINE size_type size() const BOOST_NOEXCEPT
+   inline size_type size() const BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(constant_time_size)
          return this->priv_size_traits().get_size();
@@ -538,7 +539,7 @@ class list_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
-   BOOST_INTRUSIVE_FORCEINLINE bool empty() const BOOST_NOEXCEPT
+   inline bool empty() const BOOST_NOEXCEPT
    {  return node_algorithms::unique(this->get_root_node());   }
 
    //! <b>Effects</b>: Swaps the elements of x and *this.
@@ -563,7 +564,7 @@ class list_impl
    //! <b>Complexity</b>: Linear to the number of shifts.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
-   BOOST_INTRUSIVE_FORCEINLINE void shift_backwards(size_type n = 1) BOOST_NOEXCEPT
+   inline void shift_backwards(size_type n = 1) BOOST_NOEXCEPT
    {  node_algorithms::move_forward(this->get_root_node(), n);  }
 
    //! <b>Effects</b>: Moves forward all the elements, so that the second
@@ -575,7 +576,7 @@ class list_impl
    //! <b>Complexity</b>: Linear to the number of shifts.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
-   BOOST_INTRUSIVE_FORCEINLINE void shift_forward(size_type n = 1) BOOST_NOEXCEPT
+   inline void shift_forward(size_type n = 1) BOOST_NOEXCEPT
    {  node_algorithms::move_backwards(this->get_root_node(), n);  }
 
    //! <b>Effects</b>: Erases the element pointed by i of the list.
@@ -590,7 +591,7 @@ class list_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references) to the
    //!   erased element.
-   BOOST_INTRUSIVE_FORCEINLINE iterator erase(const_iterator i) BOOST_NOEXCEPT
+   inline iterator erase(const_iterator i) BOOST_NOEXCEPT
    {  return this->erase_and_dispose(i, detail::null_disposer());  }
 
    //! <b>Requires</b>: b and e must be valid iterators to elements in *this.
@@ -608,7 +609,7 @@ class list_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references) to the
    //!   erased elements.
-   BOOST_INTRUSIVE_FORCEINLINE iterator erase(const_iterator b, const_iterator e) BOOST_NOEXCEPT
+   inline iterator erase(const_iterator b, const_iterator e) BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(safemode_or_autounlink || constant_time_size){
          return this->erase_and_dispose(b, e, detail::null_disposer());
@@ -1187,14 +1188,14 @@ class list_impl
    //! <b>Effects</b>: Removes adjacent duplicate elements or adjacent
    //!   elements that are equal from the list. No destructors are called.
    //!
-   //! <b>Throws</b>: If std::equal_to<value_type throws. Basic guarantee.
+   //! <b>Throws</b>: If the comparison operator throws. Basic guarantee.
    //!
    //! <b>Complexity</b>: Linear time (size()-1 comparisons calls to pred()).
    //!
    //! <b>Note</b>: The relative order of elements that are not removed is unchanged,
    //!   and iterators to elements that are not removed remain valid.
    void unique()
-   {  this->unique_and_dispose(std::equal_to<value_type>(), detail::null_disposer());  }
+   {  this->unique_and_dispose(value_equal<value_type>(), detail::null_disposer());  }
 
    //! <b>Effects</b>: Removes adjacent duplicate elements or adjacent
    //!   elements that satisfy some binary predicate from the list.
@@ -1216,7 +1217,7 @@ class list_impl
    //!   elements that are equal from the list.
    //!   Disposer::operator()(pointer) is called for every removed element.
    //!
-   //! <b>Throws</b>: If std::equal_to<value_type throws. Basic guarantee.
+   //! <b>Throws</b>: If the equality operator throws. Basic guarantee.
    //!
    //! <b>Complexity</b>: Linear time (size()-1) comparisons equality comparisons.
    //!
@@ -1224,7 +1225,7 @@ class list_impl
    //!   and iterators to elements that are not removed remain valid.
    template<class Disposer>
    void unique_and_dispose(Disposer disposer)
-   {  this->unique_and_dispose(std::equal_to<value_type>(), disposer);  }
+   {  this->unique_and_dispose(value_equal<value_type>(), disposer);  }
 
    //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
    //!
@@ -1272,7 +1273,7 @@ class list_impl
    //!   is stateless.
    static iterator s_iterator_to(reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       BOOST_INTRUSIVE_INVARIANT_ASSERT(!node_algorithms::inited(value_traits::to_node_ptr(value)));
       return iterator(value_traits::to_node_ptr(value), const_value_traits_ptr());
    }
@@ -1290,7 +1291,7 @@ class list_impl
    //!   is stateless.
    static const_iterator s_iterator_to(const_reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       reference r =*detail::uncast(pointer_traits<const_pointer>::pointer_to(value));
       BOOST_INTRUSIVE_INVARIANT_ASSERT(!node_algorithms::inited(value_traits::to_node_ptr(r)));
       return const_iterator(value_traits::to_node_ptr(r), const_value_traits_ptr());
@@ -1371,30 +1372,31 @@ class list_impl
       return ::boost::intrusive::algo_equal(x.cbegin(), x.cend(), y.cbegin(), y.cend());
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator!=(const list_impl &x, const list_impl &y)
+   inline friend bool operator!=(const list_impl &x, const list_impl &y)
    {  return !(x == y); }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator<(const list_impl &x, const list_impl &y)
+   inline friend bool operator<(const list_impl &x, const list_impl &y)
    {  return ::boost::intrusive::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator>(const list_impl &x, const list_impl &y)
+   inline friend bool operator>(const list_impl &x, const list_impl &y)
    {  return y < x;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator<=(const list_impl &x, const list_impl &y)
+   inline friend bool operator<=(const list_impl &x, const list_impl &y)
    {  return !(y < x);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend bool operator>=(const list_impl &x, const list_impl &y)
+   inline friend bool operator>=(const list_impl &x, const list_impl &y)
    {  return !(x < y);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE friend void swap(list_impl &x, list_impl &y) BOOST_NOEXCEPT
+   inline friend void swap(list_impl &x, list_impl &y) BOOST_NOEXCEPT
    {  x.swap(y);  }
 
    /// @cond
 
    private:
+   BOOST_INTRUSIVE_NO_DANGLING
    static list_impl &priv_container_from_end_iterator(const const_iterator &end_iterator) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((has_container_from_iterator));
+      BOOST_INTRUSIVE_STATIC_ASSERT((has_container_from_iterator));
       node_ptr p = end_iterator.pointed_node();
       header_holder_type* h = header_holder_type::get_holder(p);
       root_plus_size* r = detail::parent_from_member
@@ -1466,7 +1468,7 @@ class list
       #endif
       >::type      Base;
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
    BOOST_MOVABLE_BUT_NOT_COPYABLE(list)
 
    public:
@@ -1474,38 +1476,40 @@ class list
    typedef typename Base::iterator              iterator;
    typedef typename Base::const_iterator        const_iterator;
 
-   BOOST_INTRUSIVE_FORCEINLINE list()
+   inline list()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit list(const value_traits &v_traits)
+   inline explicit list(const value_traits &v_traits)
       :  Base(v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE list(Iterator b, Iterator e, const value_traits &v_traits = value_traits())
+   inline list(Iterator b, Iterator e, const value_traits &v_traits = value_traits())
       :  Base(b, e, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE list(BOOST_RV_REF(list) x)
+   inline list(BOOST_RV_REF(list) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE list& operator=(BOOST_RV_REF(list) x)
+   inline list& operator=(BOOST_RV_REF(list) x)
    {  return static_cast<list &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const list &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const list &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(list) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(list) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static list &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static list &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<list &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const list &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const list &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const list &>(Base::container_from_end_iterator(end_iterator));   }
 };
 
diff --git a/inst/include/boost/intrusive/pack_options.hpp b/inst/include/boost/intrusive/pack_options.hpp
index 66761d762..20e093e94 100644
--- a/inst/include/boost/intrusive/pack_options.hpp
+++ b/inst/include/boost/intrusive/pack_options.hpp
@@ -14,7 +14,7 @@
 #define BOOST_INTRUSIVE_PACK_OPTIONS_HPP
 
 #include <boost/intrusive/detail/config_begin.hpp>
-
+#include <boost/intrusive/detail/workaround.hpp>
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
@@ -338,7 +338,7 @@ struct pack_options
 //!
 //!   typedef pack_options< empty_default, typename my_pointer<void*> >::type::my_pointer_type type;
 //!
-//!   BOOST_STATIC_ASSERT(( boost::is_same<type, void>::value ));
+//!   BOOST_INTRUSIVE_STATIC_ASSERT(( boost::is_same<type, void>::value ));
 //!
 //! \endcode
 #define BOOST_INTRUSIVE_OPTION_TYPE(OPTION_NAME, TYPE, TYPEDEF_EXPR, TYPEDEF_NAME)
@@ -368,7 +368,7 @@ struct pack_options
 //!
 //!   const bool is_incremental = pack_options< empty_default, incremental<true> >::type::is_incremental;
 //!
-//!   BOOST_STATIC_ASSERT(( is_incremental == true ));
+//!   BOOST_INTRUSIVE_STATIC_ASSERT(( is_incremental == true ));
 //!
 //! \endcode
 #define BOOST_INTRUSIVE_OPTION_CONSTANT(OPTION_NAME, TYPE, VALUE, CONSTANT_NAME)
diff --git a/inst/include/boost/intrusive/priority_compare.hpp b/inst/include/boost/intrusive/priority_compare.hpp
index 3e83ada19..a78e2c910 100644
--- a/inst/include/boost/intrusive/priority_compare.hpp
+++ b/inst/include/boost/intrusive/priority_compare.hpp
@@ -31,7 +31,7 @@ namespace intrusive {
 namespace adldft {
 
 template<class T, class U>
-BOOST_INTRUSIVE_FORCEINLINE bool priority_order(const T &t, const U &u)
+inline bool priority_order(const T &t, const U &u)
 {  return t < u;  }
 
 }  //namespace adldft {
@@ -46,7 +46,7 @@ struct priority_compare
    typedef T      second_argument_type;
    typedef bool   result_type;
 
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()(const T &val, const T &val2) const
+   inline bool operator()(const T &val, const T &val2) const
    {
       using adldft::priority_order;
       return priority_order(val, val2);
@@ -57,7 +57,7 @@ template <>
 struct priority_compare<void>
 {
    template<class T, class U>
-   BOOST_INTRUSIVE_FORCEINLINE bool operator()(const T &t, const U &u) const
+   inline bool operator()(const T &t, const U &u) const
    {
       using adldft::priority_order;
       return priority_order(t, u);
diff --git a/inst/include/boost/intrusive/rbtree.hpp b/inst/include/boost/intrusive/rbtree.hpp
index 922fce51b..4ca437fe4 100644
--- a/inst/include/boost/intrusive/rbtree.hpp
+++ b/inst/include/boost/intrusive/rbtree.hpp
@@ -29,7 +29,6 @@
 #include <boost/intrusive/link_mode.hpp>
 
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -536,48 +535,52 @@ class rbtree
    typedef typename Base::const_reverse_iterator     const_reverse_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE rbtree()
+   inline rbtree()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit rbtree( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit rbtree( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE rbtree( bool unique, Iterator b, Iterator e
+   inline rbtree( bool unique, Iterator b, Iterator e
          , const key_compare &cmp = key_compare()
          , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE rbtree(BOOST_RV_REF(rbtree) x)
+   inline rbtree(BOOST_RV_REF(rbtree) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE rbtree& operator=(BOOST_RV_REF(rbtree) x)
+   inline rbtree& operator=(BOOST_RV_REF(rbtree) x)
    {  return static_cast<rbtree &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const rbtree &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const rbtree &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(rbtree) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(rbtree) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static rbtree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static rbtree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<rbtree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const rbtree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const rbtree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const rbtree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static rbtree &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static rbtree &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<rbtree &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const rbtree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const rbtree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const rbtree &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/set.hpp b/inst/include/boost/intrusive/set.hpp
index 30f0760d2..91d54c4c4 100644
--- a/inst/include/boost/intrusive/set.hpp
+++ b/inst/include/boost/intrusive/set.hpp
@@ -19,7 +19,6 @@
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/rbtree.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -523,48 +522,52 @@ class set
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE set()
+   inline set()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit set( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit set( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE set( Iterator b, Iterator e
+   inline set( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE set(BOOST_RV_REF(set) x)
+   inline set(BOOST_RV_REF(set) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE set& operator=(BOOST_RV_REF(set) x)
+   inline set& operator=(BOOST_RV_REF(set) x)
    {  return static_cast<set &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const set &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(set) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static set &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static set &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<set &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const set &>(Base::container_from_iterator(it));   }
 };
 
@@ -1018,48 +1021,52 @@ class multiset
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE multiset()
+   inline multiset()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE multiset( Iterator b, Iterator e
+   inline multiset( Iterator b, Iterator e
            , const key_compare &cmp = key_compare()
            , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE multiset(BOOST_RV_REF(multiset) x)
+   inline multiset(BOOST_RV_REF(multiset) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE multiset& operator=(BOOST_RV_REF(multiset) x)
+   inline multiset& operator=(BOOST_RV_REF(multiset) x)
    {  return static_cast<multiset &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const multiset &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(multiset) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<multiset &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const multiset &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/sg_set.hpp b/inst/include/boost/intrusive/sg_set.hpp
index 72c412d65..01cac5f58 100644
--- a/inst/include/boost/intrusive/sg_set.hpp
+++ b/inst/include/boost/intrusive/sg_set.hpp
@@ -16,7 +16,6 @@
 #include <boost/intrusive/intrusive_fwd.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/sgtree.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/move/utility_core.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
@@ -532,48 +531,52 @@ class sg_set
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE sg_set()
+   inline sg_set()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit sg_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit sg_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE sg_set( Iterator b, Iterator e
+   inline sg_set( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE sg_set(BOOST_RV_REF(sg_set) x)
+   inline sg_set(BOOST_RV_REF(sg_set) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE sg_set& operator=(BOOST_RV_REF(sg_set) x)
+   inline sg_set& operator=(BOOST_RV_REF(sg_set) x)
    {  return static_cast<sg_set &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const sg_set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const sg_set &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(sg_set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(sg_set) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static sg_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static sg_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<sg_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const sg_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const sg_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const sg_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static sg_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static sg_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<sg_set &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const sg_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const sg_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const sg_set &>(Base::container_from_iterator(it));   }
 };
 
@@ -1039,48 +1042,52 @@ class sg_multiset
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE sg_multiset()
+   inline sg_multiset()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit sg_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit sg_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE sg_multiset( Iterator b, Iterator e
+   inline sg_multiset( Iterator b, Iterator e
            , const key_compare &cmp = key_compare()
            , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE sg_multiset(BOOST_RV_REF(sg_multiset) x)
+   inline sg_multiset(BOOST_RV_REF(sg_multiset) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE sg_multiset& operator=(BOOST_RV_REF(sg_multiset) x)
+   inline sg_multiset& operator=(BOOST_RV_REF(sg_multiset) x)
    {  return static_cast<sg_multiset &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const sg_multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const sg_multiset &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(sg_multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(sg_multiset) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static sg_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static sg_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<sg_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const sg_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const sg_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const sg_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static sg_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static sg_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<sg_multiset &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const sg_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const sg_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const sg_multiset &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/sgtree.hpp b/inst/include/boost/intrusive/sgtree.hpp
index 9e687da10..fa4d914eb 100644
--- a/inst/include/boost/intrusive/sgtree.hpp
+++ b/inst/include/boost/intrusive/sgtree.hpp
@@ -21,7 +21,6 @@
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
 #include <boost/intrusive/detail/assert.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/intrusive/bs_set_hook.hpp>
 #include <boost/intrusive/bstree.hpp>
 #include <boost/intrusive/detail/tree_node.hpp>
@@ -275,7 +274,7 @@ class sgtree_impl
    typedef typename alpha_traits::multiply_by_alpha_t       multiply_by_alpha_t;
 
    BOOST_MOVABLE_BUT_NOT_COPYABLE(sgtree_impl)
-   BOOST_STATIC_ASSERT(((int)value_traits::link_mode != (int)auto_unlink));
+   BOOST_INTRUSIVE_STATIC_ASSERT(((int)value_traits::link_mode != (int)auto_unlink));
 
    enum { safemode_or_autounlink  =
             (int)value_traits::link_mode == (int)auto_unlink   ||
@@ -914,7 +913,7 @@ class sgtree_impl
    {
       //The alpha factor CAN't be changed if the fixed, floating operation-less
       //1/sqrt(2) alpha factor option is activated
-      BOOST_STATIC_ASSERT((floating_point));
+      BOOST_INTRUSIVE_STATIC_ASSERT((floating_point));
       BOOST_INTRUSIVE_INVARIANT_ASSERT((new_alpha > 0.5f && new_alpha < 1.0f));
       if(new_alpha >= 0.5f && new_alpha < 1.0f){
          float old_alpha = this->get_alpha_traits().get_alpha();
@@ -1018,48 +1017,52 @@ class sgtree
    typedef typename Base::const_reverse_iterator     const_reverse_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE sgtree()
+   inline sgtree()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit sgtree(const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit sgtree(const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE sgtree( bool unique, Iterator b, Iterator e
+   inline sgtree( bool unique, Iterator b, Iterator e
          , const key_compare &cmp = key_compare()
          , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE sgtree(BOOST_RV_REF(sgtree) x)
+   inline sgtree(BOOST_RV_REF(sgtree) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE sgtree& operator=(BOOST_RV_REF(sgtree) x)
+   inline sgtree& operator=(BOOST_RV_REF(sgtree) x)
    {  return static_cast<sgtree &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const sgtree &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const sgtree &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(sgtree) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(sgtree) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static sgtree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static sgtree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<sgtree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const sgtree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const sgtree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const sgtree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static sgtree &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static sgtree &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<sgtree &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const sgtree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const sgtree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const sgtree &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/sgtree_algorithms.hpp b/inst/include/boost/intrusive/sgtree_algorithms.hpp
index 726dbb997..ea0d2c54b 100644
--- a/inst/include/boost/intrusive/sgtree_algorithms.hpp
+++ b/inst/include/boost/intrusive/sgtree_algorithms.hpp
@@ -287,7 +287,7 @@ class sgtree_algorithms
 
    //! @copydoc ::boost::intrusive::bstree_algorithms::insert_unique_commit(node_ptr,node_ptr,const insert_commit_data&)
    template<class H_Alpha>
-   BOOST_INTRUSIVE_FORCEINLINE static void insert_unique_commit
+   inline static void insert_unique_commit
       (node_ptr header, node_ptr new_value, const insert_commit_data &commit_data
       ,std::size_t tree_size, H_Alpha h_alpha, std::size_t &max_tree_size)
    {  return insert_commit(header, new_value, commit_data, tree_size, h_alpha, max_tree_size);  }
diff --git a/inst/include/boost/intrusive/slist.hpp b/inst/include/boost/intrusive/slist.hpp
index 7319bf313..ac42cb48a 100644
--- a/inst/include/boost/intrusive/slist.hpp
+++ b/inst/include/boost/intrusive/slist.hpp
@@ -41,7 +41,6 @@
 #include <boost/intrusive/detail/node_cloner_disposer.hpp>
 
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #include <cstddef>   //std::size_t
 
@@ -166,53 +165,53 @@ class slist_impl
    static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value;
 
    //Constant-time size is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink)));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink)));
    //Linear singly linked lists are incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(linear && ((int)value_traits::link_mode == (int)auto_unlink)));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(linear && ((int)value_traits::link_mode == (int)auto_unlink)));
    //A list with cached last node is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(cache_last && ((int)value_traits::link_mode == (int)auto_unlink)));
+   BOOST_INTRUSIVE_STATIC_ASSERT(!(cache_last && ((int)value_traits::link_mode == (int)auto_unlink)));
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_end_node()
+   inline node_ptr get_end_node()
    {  return node_algorithms::end_node(this->get_root_node());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_end_node() const
+   inline const_node_ptr get_end_node() const
    {  return node_algorithms::end_node(this->get_root_node());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_root_node()
+   inline node_ptr get_root_node()
    { return data_.root_plus_size_.header_holder_.get_node(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_root_node() const
+   inline const_node_ptr get_root_node() const
    { return data_.root_plus_size_.header_holder_.get_node(); }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_last_node()
+   inline node_ptr get_last_node()
    {  return this->get_last_node(detail::bool_<cache_last>());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_last_node() const
+   inline const_node_ptr get_last_node() const
    {  return this->get_last_node(detail::bool_<cache_last>());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_last_node(node_ptr n)
+   inline void set_last_node(node_ptr n)
    {  return this->set_last_node(n, detail::bool_<cache_last>());  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_last_node(detail::bool_<false>)
+   inline static node_ptr get_last_node(detail::bool_<false>)
    {
       //This function shall not be used if cache_last is not true
       BOOST_INTRUSIVE_INVARIANT_ASSERT(cache_last);
       return node_ptr();
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void set_last_node(node_ptr , detail::bool_<false>)
+   inline static void set_last_node(node_ptr , detail::bool_<false>)
    {
       //This function shall not be used if cache_last is not true
       BOOST_INTRUSIVE_INVARIANT_ASSERT(cache_last);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE node_ptr get_last_node(detail::bool_<true>)
+   inline node_ptr get_last_node(detail::bool_<true>)
    {  return node_ptr(data_.root_plus_size_.last_);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const_node_ptr get_last_node(detail::bool_<true>) const
+   inline const_node_ptr get_last_node(detail::bool_<true>) const
    {  return const_node_ptr(data_.root_plus_size_.last_);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE void set_last_node(node_ptr n, detail::bool_<true>)
+   inline void set_last_node(node_ptr n, detail::bool_<true>)
    {  data_.root_plus_size_.last_ = n;  }
 
    void set_default_constructed_state()
@@ -241,22 +240,22 @@ class slist_impl
       root_plus_size root_plus_size_;
    } data_;
 
-   BOOST_INTRUSIVE_FORCEINLINE size_traits &priv_size_traits()
+   inline size_traits &priv_size_traits()
    {  return data_.root_plus_size_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const size_traits &priv_size_traits() const
+   inline const size_traits &priv_size_traits() const
    {  return data_.root_plus_size_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE const value_traits &priv_value_traits() const
+   inline const value_traits &priv_value_traits() const
    {  return data_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE value_traits &priv_value_traits()
+   inline value_traits &priv_value_traits()
    {  return data_;  }
 
    typedef typename boost::intrusive::value_traits_pointers
       <ValueTraits>::const_value_traits_ptr const_value_traits_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE const_value_traits_ptr priv_value_traits_ptr() const
+   inline const_value_traits_ptr priv_value_traits_ptr() const
    {  return pointer_traits<const_value_traits_ptr>::pointer_to(this->priv_value_traits());  }
 
    /// @endcond
@@ -449,7 +448,7 @@ class slist_impl
    //!   This function is only available is cache_last<> is true.
    void push_back(reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((cache_last));
+      BOOST_INTRUSIVE_STATIC_ASSERT((cache_last));
       node_ptr n = priv_value_traits().to_node_ptr(value);
       BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::inited(n));
       node_algorithms::link_after(this->get_last_node(), n);
@@ -501,7 +500,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE reference front() BOOST_NOEXCEPT
+   inline reference front() BOOST_NOEXCEPT
    { return *this->priv_value_traits().to_value_ptr(node_traits::get_next(this->get_root_node())); }
 
    //! <b>Effects</b>: Returns a const_reference to the first element of the list.
@@ -509,7 +508,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_reference front() const BOOST_NOEXCEPT
+   inline const_reference front() const BOOST_NOEXCEPT
    { return *this->priv_value_traits().to_value_ptr(detail::uncast(node_traits::get_next(this->get_root_node()))); }
 
    //! <b>Effects</b>: Returns a reference to the last element of the list.
@@ -522,7 +521,7 @@ class slist_impl
    //!   This function is only available is cache_last<> is true.
    reference back() BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((cache_last));
+      BOOST_INTRUSIVE_STATIC_ASSERT((cache_last));
       return *this->priv_value_traits().to_value_ptr(this->get_last_node());
    }
 
@@ -534,9 +533,9 @@ class slist_impl
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
    //!   This function is only available is cache_last<> is true.
-   BOOST_INTRUSIVE_FORCEINLINE const_reference back() const BOOST_NOEXCEPT
+   inline const_reference back() const BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((cache_last));
+      BOOST_INTRUSIVE_STATIC_ASSERT((cache_last));
       return *this->priv_value_traits().to_value_ptr(this->get_last_node());
    }
 
@@ -545,7 +544,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE iterator begin() BOOST_NOEXCEPT
+   inline iterator begin() BOOST_NOEXCEPT
    { return iterator (node_traits::get_next(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the list.
@@ -553,7 +552,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT
+   inline const_iterator begin() const BOOST_NOEXCEPT
    { return const_iterator (node_traits::get_next(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the list.
@@ -561,7 +560,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT
+   inline const_iterator cbegin() const BOOST_NOEXCEPT
    { return const_iterator(node_traits::get_next(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the list.
@@ -569,7 +568,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE iterator end() BOOST_NOEXCEPT
+   inline iterator end() BOOST_NOEXCEPT
    { return iterator(this->get_end_node(), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the list.
@@ -577,7 +576,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT
+   inline const_iterator end() const BOOST_NOEXCEPT
    { return const_iterator(detail::uncast(this->get_end_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the list.
@@ -585,7 +584,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT
+   inline const_iterator cend() const BOOST_NOEXCEPT
    { return this->end(); }
 
    //! <b>Effects</b>: Returns an iterator that points to a position
@@ -594,7 +593,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE iterator before_begin() BOOST_NOEXCEPT
+   inline iterator before_begin() BOOST_NOEXCEPT
    { return iterator(this->get_root_node(), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns an iterator that points to a position
@@ -603,7 +602,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator before_begin() const BOOST_NOEXCEPT
+   inline const_iterator before_begin() const BOOST_NOEXCEPT
    { return const_iterator(detail::uncast(this->get_root_node()), this->priv_value_traits_ptr()); }
 
    //! <b>Effects</b>: Returns an iterator that points to a position
@@ -612,7 +611,7 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator cbefore_begin() const BOOST_NOEXCEPT
+   inline const_iterator cbefore_begin() const BOOST_NOEXCEPT
    { return this->before_begin(); }
 
    //! <b>Effects</b>: Returns an iterator to the last element contained in the list.
@@ -622,7 +621,7 @@ class slist_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: This function is present only if cached_last<> option is true.
-   BOOST_INTRUSIVE_FORCEINLINE iterator last() BOOST_NOEXCEPT
+   inline iterator last() BOOST_NOEXCEPT
    {
       //This function shall not be used if cache_last is not true
       BOOST_INTRUSIVE_INVARIANT_ASSERT(cache_last);
@@ -636,7 +635,7 @@ class slist_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: This function is present only if cached_last<> option is true.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator last() const BOOST_NOEXCEPT
+   inline const_iterator last() const BOOST_NOEXCEPT
    {
       //This function shall not be used if cache_last is not true
       BOOST_INTRUSIVE_INVARIANT_ASSERT(cache_last);
@@ -650,7 +649,7 @@ class slist_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: This function is present only if cached_last<> option is true.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator clast() const BOOST_NOEXCEPT
+   inline const_iterator clast() const BOOST_NOEXCEPT
    { return const_iterator(this->get_last_node(), this->priv_value_traits_ptr()); }
 
    //! <b>Precondition</b>: end_iterator must be a valid end iterator
@@ -661,7 +660,8 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE static slist_impl &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static slist_impl &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return slist_impl::priv_container_from_end_iterator(end_iterator);   }
 
    //! <b>Precondition</b>: end_iterator must be a valid end const_iterator
@@ -672,7 +672,8 @@ class slist_impl
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_INTRUSIVE_FORCEINLINE static const slist_impl &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const slist_impl &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return slist_impl::priv_container_from_end_iterator(end_iterator);   }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the list.
@@ -683,7 +684,7 @@ class slist_impl
    //!   if constant_time_size is false. Constant time otherwise.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
-   BOOST_INTRUSIVE_FORCEINLINE size_type size() const BOOST_NOEXCEPT
+   inline size_type size() const BOOST_NOEXCEPT
    {
       BOOST_IF_CONSTEXPR(constant_time_size)
          return this->priv_size_traits().get_size();
@@ -698,7 +699,7 @@ class slist_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
-   BOOST_INTRUSIVE_FORCEINLINE bool empty() const BOOST_NOEXCEPT
+   inline bool empty() const BOOST_NOEXCEPT
    {  return node_algorithms::is_empty(this->get_root_node()); }
 
    //! <b>Effects</b>: Swaps the elements of x and *this.
@@ -1061,7 +1062,7 @@ class slist_impl
 
    static iterator s_insert_after(const_iterator const prev_p, reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT(((!cache_last)&&(!constant_time_size)&&(!stateful_value_traits)));
+      BOOST_INTRUSIVE_STATIC_ASSERT(((!cache_last)&&(!constant_time_size)&&(!stateful_value_traits)));
       node_ptr const n = value_traits::to_node_ptr(value);
       BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::inited(n));
       node_algorithms::link_after(prev_p.pointed_node(), n);
@@ -1071,7 +1072,7 @@ class slist_impl
    template<class Disposer>
    static iterator s_erase_after_and_dispose(const_iterator prev, Disposer disposer) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT(((!cache_last)&&(!constant_time_size)&&(!stateful_value_traits)));
+      BOOST_INTRUSIVE_STATIC_ASSERT(((!cache_last)&&(!constant_time_size)&&(!stateful_value_traits)));
       const_iterator it(prev);
       ++it;
       node_ptr to_erase(it.pointed_node());
@@ -1087,7 +1088,7 @@ class slist_impl
    template<class Disposer>
    static iterator s_erase_after_and_dispose(const_iterator before_f, const_iterator l, Disposer disposer) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT(((!cache_last)&&(!constant_time_size)&&(!stateful_value_traits)));
+      BOOST_INTRUSIVE_STATIC_ASSERT(((!cache_last)&&(!constant_time_size)&&(!stateful_value_traits)));
       node_ptr bfp(before_f.pointed_node()), lp(l.pointed_node());
       node_ptr fp(node_traits::get_next(bfp));
       node_algorithms::unlink_after(bfp, lp);
@@ -1754,7 +1755,7 @@ class slist_impl
    //!   is stateless.
    static iterator s_iterator_to(reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       return iterator (value_traits::to_node_ptr(value), const_value_traits_ptr());
    }
 
@@ -1771,7 +1772,7 @@ class slist_impl
    //!   is stateless.
    static const_iterator s_iterator_to(const_reference value) BOOST_NOEXCEPT
    {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
+      BOOST_INTRUSIVE_STATIC_ASSERT((!stateful_value_traits));
       reference r =*detail::uncast(pointer_traits<const_pointer>::pointer_to(value));
       return const_iterator(value_traits::to_node_ptr(r), const_value_traits_ptr());
    }
@@ -2108,12 +2109,13 @@ class slist_impl
    static void priv_swap_lists(node_ptr this_node, node_ptr other_node, detail::bool_<true>)
    {  node_algorithms::swap_trailing_nodes(this_node, other_node); }
 
+   BOOST_INTRUSIVE_NO_DANGLING
    static slist_impl &priv_container_from_end_iterator(const const_iterator &end_iterator)
    {
       //Obtaining the container from the end iterator is not possible with linear
       //singly linked lists (because "end" is represented by the null pointer)
-      BOOST_STATIC_ASSERT(!linear);
-      BOOST_STATIC_ASSERT((has_container_from_iterator));
+      BOOST_INTRUSIVE_STATIC_ASSERT(!linear);
+      BOOST_INTRUSIVE_STATIC_ASSERT((has_container_from_iterator));
       node_ptr p = end_iterator.pointed_node();
       header_holder_type* h = header_holder_type::get_holder(p);
       header_holder_plus_last_t* hpl = detail::parent_from_member< header_holder_plus_last_t, header_holder_type>
@@ -2185,7 +2187,7 @@ class slist
       #endif
       >::type   Base;
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
    BOOST_MOVABLE_BUT_NOT_COPYABLE(slist)
 
    public:
@@ -2195,45 +2197,47 @@ class slist
    typedef typename Base::size_type          size_type;
    typedef typename Base::node_ptr           node_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE slist()
+   inline slist()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit slist(const value_traits &v_traits)
+   inline explicit slist(const value_traits &v_traits)
       :  Base(v_traits)
    {}
 
    struct incorporate_t{};
 
-   BOOST_INTRUSIVE_FORCEINLINE slist( node_ptr f, node_ptr before_l
+   inline slist( node_ptr f, node_ptr before_l
              , size_type n, const value_traits &v_traits = value_traits())
       :  Base(f, before_l, n, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE slist(Iterator b, Iterator e, const value_traits &v_traits = value_traits())
+   inline slist(Iterator b, Iterator e, const value_traits &v_traits = value_traits())
       :  Base(b, e, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE slist(BOOST_RV_REF(slist) x)
+   inline slist(BOOST_RV_REF(slist) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE slist& operator=(BOOST_RV_REF(slist) x)
+   inline slist& operator=(BOOST_RV_REF(slist) x)
    {  return static_cast<slist &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const slist &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const slist &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(slist) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(slist) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static slist &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static slist &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<slist &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const slist &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const slist &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const slist &>(Base::container_from_end_iterator(end_iterator));   }
 };
 
diff --git a/inst/include/boost/intrusive/splay_set.hpp b/inst/include/boost/intrusive/splay_set.hpp
index f700934fa..a3df8a3eb 100644
--- a/inst/include/boost/intrusive/splay_set.hpp
+++ b/inst/include/boost/intrusive/splay_set.hpp
@@ -17,7 +17,6 @@
 #include <boost/intrusive/splaytree.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -544,48 +543,52 @@ class splay_set
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE splay_set()
+   inline splay_set()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit splay_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit splay_set( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE splay_set( Iterator b, Iterator e
+   inline splay_set( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE splay_set(BOOST_RV_REF(splay_set) x)
+   inline splay_set(BOOST_RV_REF(splay_set) x)
       :  Base(::boost::move(static_cast<Base&>(x)))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE splay_set& operator=(BOOST_RV_REF(splay_set) x)
+   inline splay_set& operator=(BOOST_RV_REF(splay_set) x)
    {  return static_cast<splay_set &>(this->Base::operator=(::boost::move(static_cast<Base&>(x))));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const splay_set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const splay_set &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(splay_set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(splay_set) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static splay_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static splay_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<splay_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const splay_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const splay_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const splay_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static splay_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static splay_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<splay_set &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const splay_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const splay_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const splay_set &>(Base::container_from_iterator(it));   }
 };
 
@@ -1055,48 +1058,52 @@ class splay_multiset
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE splay_multiset()
+   inline splay_multiset()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit splay_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit splay_multiset( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE splay_multiset( Iterator b, Iterator e
+   inline splay_multiset( Iterator b, Iterator e
            , const key_compare &cmp = key_compare()
            , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE splay_multiset(BOOST_RV_REF(splay_multiset) x)
+   inline splay_multiset(BOOST_RV_REF(splay_multiset) x)
       :  Base(::boost::move(static_cast<Base&>(x)))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE splay_multiset& operator=(BOOST_RV_REF(splay_multiset) x)
+   inline splay_multiset& operator=(BOOST_RV_REF(splay_multiset) x)
    {  return static_cast<splay_multiset &>(this->Base::operator=(::boost::move(static_cast<Base&>(x))));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const splay_multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const splay_multiset &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(splay_multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(splay_multiset) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static splay_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static splay_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<splay_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const splay_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const splay_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const splay_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static splay_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static splay_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<splay_multiset &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const splay_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const splay_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const splay_multiset &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/splaytree.hpp b/inst/include/boost/intrusive/splaytree.hpp
index 44e5c7867..919f70bde 100644
--- a/inst/include/boost/intrusive/splaytree.hpp
+++ b/inst/include/boost/intrusive/splaytree.hpp
@@ -18,7 +18,6 @@
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>
 #include <boost/intrusive/detail/minimal_pair_header.hpp>   //std::pair
 
-#include <boost/static_assert.hpp>
 #include <boost/intrusive/bstree.hpp>
 #include <boost/intrusive/detail/tree_node.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
@@ -611,48 +610,52 @@ class splaytree
    typedef typename Base::const_reverse_iterator     const_reverse_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE splaytree()
+   inline splaytree()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit splaytree( const key_compare &cmp, const value_traits &v_traits = value_traits())
+   inline explicit splaytree( const key_compare &cmp, const value_traits &v_traits = value_traits())
       :  Base(cmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE splaytree( bool unique, Iterator b, Iterator e
+   inline splaytree( bool unique, Iterator b, Iterator e
          , const key_compare &cmp = key_compare()
          , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE splaytree(BOOST_RV_REF(splaytree) x)
+   inline splaytree(BOOST_RV_REF(splaytree) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE splaytree& operator=(BOOST_RV_REF(splaytree) x)
+   inline splaytree& operator=(BOOST_RV_REF(splaytree) x)
    {  return static_cast<splaytree &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const splaytree &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const splaytree &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(splaytree) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(splaytree) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static splaytree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static splaytree &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<splaytree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const splaytree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const splaytree &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const splaytree &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static splaytree &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static splaytree &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<splaytree &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const splaytree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const splaytree &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const splaytree &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/treap.hpp b/inst/include/boost/intrusive/treap.hpp
index ff84b7472..c39ccfeb9 100644
--- a/inst/include/boost/intrusive/treap.hpp
+++ b/inst/include/boost/intrusive/treap.hpp
@@ -29,7 +29,6 @@
 #include <boost/intrusive/detail/node_cloner_disposer.hpp>
 #include <boost/intrusive/detail/key_nodeptr_comp.hpp>
 
-#include <boost/static_assert.hpp>
 #include <boost/move/utility_core.hpp>
 #include <boost/move/adl_move_swap.hpp>
 
@@ -255,7 +254,7 @@ class treap_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE iterator top() BOOST_NOEXCEPT
+   inline iterator top() BOOST_NOEXCEPT
    {  return this->tree_type::root();   }
 
    //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the treap..
@@ -263,7 +262,7 @@ class treap_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator top() const BOOST_NOEXCEPT
+   inline const_iterator top() const BOOST_NOEXCEPT
    {  return this->ctop();   }
 
    //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the treap..
@@ -271,7 +270,7 @@ class treap_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator ctop() const BOOST_NOEXCEPT
+   inline const_iterator ctop() const BOOST_NOEXCEPT
    {  return this->tree_type::root();   }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -310,7 +309,7 @@ class treap_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rtop() BOOST_NOEXCEPT
+   inline reverse_iterator rtop() BOOST_NOEXCEPT
    {  return reverse_iterator(this->top());  }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the highest priority objec
@@ -319,7 +318,7 @@ class treap_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rtop() const BOOST_NOEXCEPT
+   inline const_reverse_iterator rtop() const BOOST_NOEXCEPT
    {  return const_reverse_iterator(this->top());  }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the highest priority object
@@ -328,7 +327,7 @@ class treap_impl
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: Nothing.
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crtop() const BOOST_NOEXCEPT
+   inline const_reverse_iterator crtop() const BOOST_NOEXCEPT
    {  return const_reverse_iterator(this->top());  }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -1313,51 +1312,55 @@ class treap
    typedef typename Base::const_reverse_iterator     const_reverse_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE treap()
+   inline treap()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit treap( const key_compare &cmp
+   inline explicit treap( const key_compare &cmp
                  , const priority_compare &pcmp = priority_compare()
                  , const value_traits &v_traits = value_traits())
       :  Base(cmp, pcmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE treap( bool unique, Iterator b, Iterator e
+   inline treap( bool unique, Iterator b, Iterator e
        , const key_compare &cmp = key_compare()
        , const priority_compare &pcmp = priority_compare()
        , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, pcmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE treap(BOOST_RV_REF(treap) x)
+   inline treap(BOOST_RV_REF(treap) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE treap& operator=(BOOST_RV_REF(treap) x)
+   inline treap& operator=(BOOST_RV_REF(treap) x)
    {  return static_cast<treap&>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const treap &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const treap &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(treap) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(treap) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static treap &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static treap &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<treap &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const treap &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const treap &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const treap &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static treap &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static treap &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<treap &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const treap &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const treap &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const treap &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/treap_algorithms.hpp b/inst/include/boost/intrusive/treap_algorithms.hpp
index a8ddee6e3..8c836c52f 100644
--- a/inst/include/boost/intrusive/treap_algorithms.hpp
+++ b/inst/include/boost/intrusive/treap_algorithms.hpp
@@ -172,6 +172,10 @@ class treap_algorithms
       /// @endcond
    {
       /// @cond
+      inline insert_commit_data()
+         : bstree_algo::insert_commit_data(), rotations()
+      {}
+
       std::size_t rotations;
       /// @endcond
    };
diff --git a/inst/include/boost/intrusive/treap_set.hpp b/inst/include/boost/intrusive/treap_set.hpp
index d15a83b49..a2f473780 100644
--- a/inst/include/boost/intrusive/treap_set.hpp
+++ b/inst/include/boost/intrusive/treap_set.hpp
@@ -17,7 +17,6 @@
 #include <boost/intrusive/treap.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -215,22 +214,22 @@ class treap_set_impl
    #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
 
    //! @copydoc ::boost::intrusive::treap::top()
-   BOOST_INTRUSIVE_FORCEINLINE iterator top() BOOST_NOEXCEPT;
+   inline iterator top() BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::top()const
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator top() const BOOST_NOEXCEPT;
+   inline const_iterator top() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::ctop()const
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator ctop() const BOOST_NOEXCEPT;
+   inline const_iterator ctop() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::rtop()
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rtop() BOOST_NOEXCEPT;
+   inline reverse_iterator rtop() BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::rtop()const
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rtop() const BOOST_NOEXCEPT;
+   inline const_reverse_iterator rtop() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::crtop()const
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crtop() const BOOST_NOEXCEPT;
+   inline const_reverse_iterator crtop() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::crtop() const
    priority_compare priority_comp() const;
@@ -540,51 +539,55 @@ class treap_set
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE treap_set()
+   inline treap_set()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit treap_set( const key_compare &cmp
+   inline explicit treap_set( const key_compare &cmp
                      , const priority_compare &pcmp = priority_compare()
                      , const value_traits &v_traits = value_traits())
       :  Base(cmp, pcmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE treap_set( Iterator b, Iterator e
+   inline treap_set( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const priority_compare &pcmp = priority_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, pcmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE treap_set(BOOST_RV_REF(treap_set) x)
+   inline treap_set(BOOST_RV_REF(treap_set) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE treap_set& operator=(BOOST_RV_REF(treap_set) x)
+   inline treap_set& operator=(BOOST_RV_REF(treap_set) x)
    {  return static_cast<treap_set &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const treap_set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const treap_set &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(treap_set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(treap_set) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static treap_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static treap_set &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<treap_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const treap_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const treap_set &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const treap_set &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static treap_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static treap_set &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<treap_set &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const treap_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const treap_set &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const treap_set &>(Base::container_from_iterator(it));   }
 };
 
@@ -774,22 +777,22 @@ class treap_multiset_impl
    #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
 
    //! @copydoc ::boost::intrusive::treap::top()
-   BOOST_INTRUSIVE_FORCEINLINE iterator top() BOOST_NOEXCEPT;
+   inline iterator top() BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::top()const
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator top() const BOOST_NOEXCEPT;
+   inline const_iterator top() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::ctop()const
-   BOOST_INTRUSIVE_FORCEINLINE const_iterator ctop() const BOOST_NOEXCEPT;
+   inline const_iterator ctop() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::rtop()
-   BOOST_INTRUSIVE_FORCEINLINE reverse_iterator rtop() BOOST_NOEXCEPT;
+   inline reverse_iterator rtop() BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::rtop()const
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator rtop() const BOOST_NOEXCEPT;
+   inline const_reverse_iterator rtop() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::crtop()const
-   BOOST_INTRUSIVE_FORCEINLINE const_reverse_iterator crtop() const BOOST_NOEXCEPT;
+   inline const_reverse_iterator crtop() const BOOST_NOEXCEPT;
 
    //! @copydoc ::boost::intrusive::treap::crtop() const
    priority_compare priority_comp() const;
@@ -1055,51 +1058,55 @@ class treap_multiset
    typedef typename Base::const_iterator     const_iterator;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   BOOST_INTRUSIVE_FORCEINLINE treap_multiset()
+   inline treap_multiset()
       :  Base()
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE explicit treap_multiset( const key_compare &cmp
+   inline explicit treap_multiset( const key_compare &cmp
                           , const priority_compare &pcmp = priority_compare()
                           , const value_traits &v_traits = value_traits())
       :  Base(cmp, pcmp, v_traits)
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE treap_multiset( Iterator b, Iterator e
+   inline treap_multiset( Iterator b, Iterator e
       , const key_compare &cmp = key_compare()
       , const priority_compare &pcmp = priority_compare()
       , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, pcmp, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE treap_multiset(BOOST_RV_REF(treap_multiset) x)
+   inline treap_multiset(BOOST_RV_REF(treap_multiset) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE treap_multiset& operator=(BOOST_RV_REF(treap_multiset) x)
+   inline treap_multiset& operator=(BOOST_RV_REF(treap_multiset) x)
    {  return static_cast<treap_multiset &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const treap_multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const treap_multiset &src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(treap_multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(treap_multiset) src, Cloner cloner, Disposer disposer)
    {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static treap_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static treap_multiset &container_from_end_iterator(iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<treap_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const treap_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const treap_multiset &container_from_end_iterator(const_iterator end_iterator) BOOST_NOEXCEPT
    {  return static_cast<const treap_multiset &>(Base::container_from_end_iterator(end_iterator));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static treap_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static treap_multiset &container_from_iterator(iterator it) BOOST_NOEXCEPT
    {  return static_cast<treap_multiset &>(Base::container_from_iterator(it));   }
 
-   BOOST_INTRUSIVE_FORCEINLINE static const treap_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
+   BOOST_INTRUSIVE_NO_DANGLING
+   inline static const treap_multiset &container_from_iterator(const_iterator it) BOOST_NOEXCEPT
    {  return static_cast<const treap_multiset &>(Base::container_from_iterator(it));   }
 };
 
diff --git a/inst/include/boost/intrusive/unordered_set.hpp b/inst/include/boost/intrusive/unordered_set.hpp
index 51023b8b6..c53ec5275 100644
--- a/inst/include/boost/intrusive/unordered_set.hpp
+++ b/inst/include/boost/intrusive/unordered_set.hpp
@@ -17,7 +17,6 @@
 #include <boost/intrusive/intrusive_fwd.hpp>
 #include <boost/intrusive/hashtable.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/static_assert.hpp>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
@@ -121,7 +120,7 @@ class unordered_set_impl
    public:
 
    //! @copydoc ::boost::intrusive::hashtable::hashtable(const bucket_traits &,const hasher &,const key_equal &,const value_traits &)
-   BOOST_INTRUSIVE_FORCEINLINE explicit unordered_set_impl( const bucket_traits &b_traits
+   inline explicit unordered_set_impl( const bucket_traits &b_traits
                               , const hasher & hash_func = hasher()
                               , const key_equal &equal_func = key_equal()
                               , const value_traits &v_traits = value_traits())
@@ -130,7 +129,7 @@ class unordered_set_impl
 
    //! @copydoc ::boost::intrusive::hashtable::hashtable(bool,Iterator,Iterator,const bucket_traits &,const hasher &,const key_equal &,const value_traits &)
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE unordered_set_impl( Iterator b
+   inline unordered_set_impl( Iterator b
                      , Iterator e
                      , const bucket_traits &b_traits
                      , const hasher & hash_func = hasher()
@@ -140,12 +139,12 @@ class unordered_set_impl
    {}
 
    //! @copydoc ::boost::intrusive::hashtable::hashtable(hashtable&&)
-   BOOST_INTRUSIVE_FORCEINLINE unordered_set_impl(BOOST_RV_REF(unordered_set_impl) x)
+   inline unordered_set_impl(BOOST_RV_REF(unordered_set_impl) x)
       :  table_type(BOOST_MOVE_BASE(table_type, x))
    {}
 
    //! @copydoc ::boost::intrusive::hashtable::operator=(hashtable&&)
-   BOOST_INTRUSIVE_FORCEINLINE unordered_set_impl& operator=(BOOST_RV_REF(unordered_set_impl) x)
+   inline unordered_set_impl& operator=(BOOST_RV_REF(unordered_set_impl) x)
    {  return static_cast<unordered_set_impl&>(table_type::operator=(BOOST_MOVE_BASE(table_type, x))); }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -197,32 +196,36 @@ class unordered_set_impl
 
    //! @copydoc ::boost::intrusive::hashtable::clone_from(hashtable&&,Cloner,Disposer)
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(unordered_set_impl) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(unordered_set_impl) src, Cloner cloner, Disposer disposer)
    {  table_type::clone_from(BOOST_MOVE_BASE(table_type, src), cloner, disposer);  }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_unique(reference)
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert(reference value)
+   inline std::pair<iterator, bool> insert(reference value)
    {  return table_type::insert_unique(value);  }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_unique(Iterator,Iterator)
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE void insert(Iterator b, Iterator e)
+   inline void insert(Iterator b, Iterator e)
    {  table_type::insert_unique(b, e);  }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_unique_check(const key_type&,insert_commit_data&)
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert_check(const key_type &key, insert_commit_data &commit_data)
+   inline std::pair<iterator, bool> insert_check(const key_type &key, insert_commit_data &commit_data)
    {  return table_type::insert_unique_check(key, commit_data); }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_unique_check(const KeyType&,KeyHasher,KeyEqual,insert_commit_data&)
    template<class KeyType, class KeyHasher, class KeyEqual>
-   BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert_check
+   inline std::pair<iterator, bool> insert_check
       (const KeyType &key, KeyHasher hash_func, KeyEqual key_value_equal, insert_commit_data &commit_data)
    {  return table_type::insert_unique_check(key, hash_func, key_value_equal, commit_data); }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_unique_commit
-   BOOST_INTRUSIVE_FORCEINLINE iterator insert_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT
+   inline iterator insert_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT
    {  return table_type::insert_unique_commit(value, commit_data); }
 
+   //! @copydoc ::boost::intrusive::hashtable::insert_unique_fast_commit
+   inline iterator insert_fast_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT
+   {  return table_type::insert_unique_fast_commit(value, commit_data); }
+
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
 
    //! @copydoc ::boost::intrusive::hashtable::erase(const_iterator)
@@ -277,7 +280,7 @@ class unordered_set_impl
    template<class KeyType, class KeyHasher, class KeyEqual>
    iterator find(const KeyType& key, KeyHasher hash_func, KeyEqual equal_func);
 
-   //! @copydoc ::boost::intrusive::hashtable::count(const key_type &)const
+   //! @copydoc ::boost::intrusive::hashtable::find(const key_type &)const
    const_iterator find(const key_type &key) const;
 
    //! @copydoc ::boost::intrusive::hashtable::find(const KeyType &,KeyHasher,KeyEqual)const
@@ -488,7 +491,7 @@ class unordered_set
       >::type Base;
 
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
    BOOST_MOVABLE_BUT_NOT_COPYABLE(unordered_set)
 
    public:
@@ -501,7 +504,7 @@ class unordered_set
    typedef typename Base::hasher             hasher;
    typedef typename Base::key_equal          key_equal;
 
-   BOOST_INTRUSIVE_FORCEINLINE
+   inline
    explicit unordered_set  ( const bucket_traits &b_traits
                            , const hasher & hash_func = hasher()
                            , const key_equal &equal_func = key_equal()
@@ -510,7 +513,7 @@ class unordered_set
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE
+   inline
    unordered_set
                   ( Iterator b, Iterator e
                   , const bucket_traits &b_traits
@@ -520,19 +523,19 @@ class unordered_set
       :  Base(b, e, b_traits, hash_func, equal_func, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE unordered_set(BOOST_RV_REF(unordered_set) x)
+   inline unordered_set(BOOST_RV_REF(unordered_set) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE unordered_set& operator=(BOOST_RV_REF(unordered_set) x)
+   inline unordered_set& operator=(BOOST_RV_REF(unordered_set) x)
    {  return static_cast<unordered_set&>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const unordered_set &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const unordered_set &src, Cloner cloner, Disposer disposer)
    {  this->Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(unordered_set) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(unordered_set) src, Cloner cloner, Disposer disposer)
    {  this->Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 };
 
@@ -622,7 +625,7 @@ class unordered_multiset_impl
    public:
 
    //! @copydoc ::boost::intrusive::hashtable::hashtable(const bucket_traits &,const hasher &,const key_equal &,const value_traits &)
-   BOOST_INTRUSIVE_FORCEINLINE explicit unordered_multiset_impl ( const bucket_traits &b_traits
+   inline explicit unordered_multiset_impl ( const bucket_traits &b_traits
                                     , const hasher & hash_func = hasher()
                                     , const key_equal &equal_func = key_equal()
                                     , const value_traits &v_traits = value_traits())
@@ -631,7 +634,7 @@ class unordered_multiset_impl
 
    //! @copydoc ::boost::intrusive::hashtable::hashtable(bool,Iterator,Iterator,const bucket_traits &,const hasher &,const key_equal &,const value_traits &)
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE unordered_multiset_impl ( Iterator b
+   inline unordered_multiset_impl ( Iterator b
                            , Iterator e
                            , const bucket_traits &b_traits
                            , const hasher & hash_func = hasher()
@@ -642,13 +645,13 @@ class unordered_multiset_impl
 
    //! <b>Effects</b>: to-do
    //!
-   BOOST_INTRUSIVE_FORCEINLINE unordered_multiset_impl(BOOST_RV_REF(unordered_multiset_impl) x)
+   inline unordered_multiset_impl(BOOST_RV_REF(unordered_multiset_impl) x)
       :  table_type(BOOST_MOVE_BASE(table_type, x))
    {}
 
    //! <b>Effects</b>: to-do
    //!
-   BOOST_INTRUSIVE_FORCEINLINE unordered_multiset_impl& operator=(BOOST_RV_REF(unordered_multiset_impl) x)
+   inline unordered_multiset_impl& operator=(BOOST_RV_REF(unordered_multiset_impl) x)
    {  return static_cast<unordered_multiset_impl&>(table_type::operator=(BOOST_MOVE_BASE(table_type, x)));  }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -701,16 +704,16 @@ class unordered_multiset_impl
 
    //! @copydoc ::boost::intrusive::hashtable::clone_from(hashtable&&,Cloner,Disposer)
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(unordered_multiset_impl) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(unordered_multiset_impl) src, Cloner cloner, Disposer disposer)
    {  table_type::clone_from(BOOST_MOVE_BASE(table_type, src), cloner, disposer);  }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_equal(reference)
-   BOOST_INTRUSIVE_FORCEINLINE iterator insert(reference value)
+   inline iterator insert(reference value)
    {  return table_type::insert_equal(value);  }
 
    //! @copydoc ::boost::intrusive::hashtable::insert_equal(Iterator,Iterator)
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE void insert(Iterator b, Iterator e)
+   inline void insert(Iterator b, Iterator e)
    {  table_type::insert_equal(b, e);  }
 
    #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
@@ -767,7 +770,7 @@ class unordered_multiset_impl
    template<class KeyType, class KeyHasher, class KeyEqual>
    iterator find(const KeyType& key, KeyHasher hash_func, KeyEqual equal_func);
 
-   //! @copydoc ::boost::intrusive::hashtable::count(const key_type &)const
+   //! @copydoc ::boost::intrusive::hashtable::find(const key_type &)const
    const_iterator find(const key_type &key) const;
 
    //! @copydoc ::boost::intrusive::hashtable::find(const KeyType &,KeyHasher,KeyEqual)const
@@ -943,7 +946,7 @@ class unordered_multiset
          #endif
       >::type   Base;
    //Assert if passed value traits are compatible with the type
-   BOOST_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
+   BOOST_INTRUSIVE_STATIC_ASSERT((detail::is_same<typename Base::value_traits::value_type, T>::value));
    BOOST_MOVABLE_BUT_NOT_COPYABLE(unordered_multiset)
 
    public:
@@ -956,7 +959,7 @@ class unordered_multiset
    typedef typename Base::hasher             hasher;
    typedef typename Base::key_equal          key_equal;
 
-   BOOST_INTRUSIVE_FORCEINLINE
+   inline
    explicit unordered_multiset( const bucket_traits &b_traits
                               , const hasher & hash_func = hasher()
                               , const key_equal &equal_func = key_equal()
@@ -965,7 +968,7 @@ class unordered_multiset
    {}
 
    template<class Iterator>
-   BOOST_INTRUSIVE_FORCEINLINE
+   inline
    unordered_multiset( Iterator b
                      , Iterator e
                      , const bucket_traits &b_traits
@@ -975,19 +978,19 @@ class unordered_multiset
       :  Base(b, e, b_traits, hash_func, equal_func, v_traits)
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE unordered_multiset(BOOST_RV_REF(unordered_multiset) x)
+   inline unordered_multiset(BOOST_RV_REF(unordered_multiset) x)
       :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
-   BOOST_INTRUSIVE_FORCEINLINE unordered_multiset& operator=(BOOST_RV_REF(unordered_multiset) x)
+   inline unordered_multiset& operator=(BOOST_RV_REF(unordered_multiset) x)
    {  return static_cast<unordered_multiset&>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(const unordered_multiset &src, Cloner cloner, Disposer disposer)
+   inline void clone_from(const unordered_multiset &src, Cloner cloner, Disposer disposer)
    {  this->Base::clone_from(src, cloner, disposer);  }
 
    template <class Cloner, class Disposer>
-   BOOST_INTRUSIVE_FORCEINLINE void clone_from(BOOST_RV_REF(unordered_multiset) src, Cloner cloner, Disposer disposer)
+   inline void clone_from(BOOST_RV_REF(unordered_multiset) src, Cloner cloner, Disposer disposer)
    {  this->Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 };
 
diff --git a/inst/include/boost/intrusive/unordered_set_hook.hpp b/inst/include/boost/intrusive/unordered_set_hook.hpp
index cfa4f2594..e0c306a33 100644
--- a/inst/include/boost/intrusive/unordered_set_hook.hpp
+++ b/inst/include/boost/intrusive/unordered_set_hook.hpp
@@ -82,22 +82,22 @@ struct unordered_node_traits
    static const bool store_hash        = StoreHash;
    static const bool optimize_multikey = OptimizeMultiKey;
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_next(const_node_ptr n) BOOST_NOEXCEPT
+   inline static node_ptr get_next(const_node_ptr n) BOOST_NOEXCEPT
    {  return pointer_traits<node_ptr>::static_cast_from(n->next_);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void set_next(node_ptr n, node_ptr next) BOOST_NOEXCEPT
+   inline static void set_next(node_ptr n, node_ptr next) BOOST_NOEXCEPT
    {  n->next_ = next;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_prev_in_group(const_node_ptr n) BOOST_NOEXCEPT
+   inline static node_ptr get_prev_in_group(const_node_ptr n) BOOST_NOEXCEPT
    {  return n->prev_in_group_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void set_prev_in_group(node_ptr n, node_ptr prev) BOOST_NOEXCEPT
+   inline static void set_prev_in_group(node_ptr n, node_ptr prev) BOOST_NOEXCEPT
    {  n->prev_in_group_ = prev;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static std::size_t get_hash(const_node_ptr n) BOOST_NOEXCEPT
+   inline static std::size_t get_hash(const_node_ptr n) BOOST_NOEXCEPT
    {  return n->hash_;  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void set_hash(node_ptr n, std::size_t h) BOOST_NOEXCEPT
+   inline static void set_hash(node_ptr n, std::size_t h) BOOST_NOEXCEPT
    {  n->hash_ = h;  }
 };
 
@@ -108,10 +108,10 @@ struct unordered_group_adapter
    typedef typename NodeTraits::node_ptr        node_ptr;
    typedef typename NodeTraits::const_node_ptr  const_node_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE static node_ptr get_next(const_node_ptr n)
+   inline static node_ptr get_next(const_node_ptr n)
    {  return NodeTraits::get_prev_in_group(n);  }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void set_next(node_ptr n, node_ptr next)
+   inline static void set_next(node_ptr n, node_ptr next)
    {  NodeTraits::set_prev_in_group(n, next);   }
 };
 
@@ -127,19 +127,19 @@ struct unordered_algorithms
    typedef typename NodeTraits::node_ptr           node_ptr;
    typedef typename NodeTraits::const_node_ptr     const_node_ptr;
 
-   BOOST_INTRUSIVE_FORCEINLINE static void init(typename base_type::node_ptr n) BOOST_NOEXCEPT
+   inline static void init(typename base_type::node_ptr n) BOOST_NOEXCEPT
    {
       base_type::init(n);
       group_algorithms::init(n);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void init_header(typename base_type::node_ptr n) BOOST_NOEXCEPT
+   inline static void init_header(typename base_type::node_ptr n) BOOST_NOEXCEPT
    {
       base_type::init_header(n);
       group_algorithms::init_header(n);
    }
 
-   BOOST_INTRUSIVE_FORCEINLINE static void unlink(typename base_type::node_ptr n) BOOST_NOEXCEPT
+   inline static void unlink(typename base_type::node_ptr n) BOOST_NOEXCEPT
    {
       base_type::unlink(n);
       group_algorithms::unlink(n);
diff --git a/inst/include/boost/iterator/function_output_iterator.hpp b/inst/include/boost/iterator/function_output_iterator.hpp
index b59cbc914..ea2a668bb 100644
--- a/inst/include/boost/iterator/function_output_iterator.hpp
+++ b/inst/include/boost/iterator/function_output_iterator.hpp
@@ -11,6 +11,7 @@
 #ifndef BOOST_ITERATOR_FUNCTION_OUTPUT_ITERATOR_HPP
 #define BOOST_ITERATOR_FUNCTION_OUTPUT_ITERATOR_HPP
 
+#include <cstddef>
 #include <iterator>
 #include <boost/config.hpp>
 #include <boost/core/enable_if.hpp>
@@ -36,8 +37,8 @@ namespace iterators {
       template <class T>
       typename boost::disable_if_c<
         boost::is_same< typename boost::remove_cv< T >::type, output_proxy >::value,
-        output_proxy&
-      >::type operator=(const T& value) {
+        output_proxy const&
+      >::type operator=(const T& value) const {
         m_f(value);
         return *this;
       }
@@ -45,8 +46,8 @@ namespace iterators {
       template <class T>
       typename boost::disable_if_c<
         boost::is_same< typename boost::remove_cv< typename boost::remove_reference< T >::type >::type, output_proxy >::value,
-        output_proxy&
-      >::type operator=(T&& value) {
+        output_proxy const&
+      >::type operator=(T&& value) const {
         m_f(static_cast< T&& >(value));
         return *this;
       }
@@ -62,7 +63,7 @@ namespace iterators {
   public:
     typedef std::output_iterator_tag iterator_category;
     typedef void                value_type;
-    typedef void                difference_type;
+    typedef std::ptrdiff_t      difference_type;
     typedef void                pointer;
     typedef void                reference;
 
diff --git a/inst/include/boost/json.hpp b/inst/include/boost/json.hpp
index cdd758ead..c721454e4 100644
--- a/inst/include/boost/json.hpp
+++ b/inst/include/boost/json.hpp
@@ -17,8 +17,8 @@
 #include <boost/json/conversion.hpp>
 #include <boost/json/error.hpp>
 #include <boost/json/fwd.hpp>
+#include <boost/json/is_deallocate_trivial.hpp>
 #include <boost/json/kind.hpp>
-#include <boost/json/memory_resource.hpp>
 #include <boost/json/monotonic_resource.hpp>
 #include <boost/json/null_resource.hpp>
 #include <boost/json/object.hpp>
@@ -27,6 +27,7 @@
 #include <boost/json/parse_options.hpp>
 #include <boost/json/parser.hpp>
 #include <boost/json/pilfer.hpp>
+#include <boost/json/result_for.hpp>
 #include <boost/json/serialize.hpp>
 #include <boost/json/serializer.hpp>
 #include <boost/json/set_pointer_options.hpp>
@@ -35,7 +36,6 @@
 #include <boost/json/stream_parser.hpp>
 #include <boost/json/string.hpp>
 #include <boost/json/string_view.hpp>
-#include <boost/json/system_error.hpp>
 #include <boost/json/value.hpp>
 #include <boost/json/value_from.hpp>
 #include <boost/json/value_ref.hpp>
diff --git a/inst/include/boost/json/array.hpp b/inst/include/boost/json/array.hpp
index dede5df17..ad3a48db8 100644
--- a/inst/include/boost/json/array.hpp
+++ b/inst/include/boost/json/array.hpp
@@ -11,10 +11,11 @@
 #define BOOST_JSON_ARRAY_HPP
 
 #include <boost/json/detail/config.hpp>
+#include <boost/json/detail/array.hpp>
 #include <boost/json/kind.hpp>
 #include <boost/json/pilfer.hpp>
 #include <boost/json/storage_ptr.hpp>
-#include <boost/json/detail/array.hpp>
+#include <boost/system/result.hpp>
 #include <cstdlib>
 #include <initializer_list>
 #include <iterator>
@@ -117,16 +118,8 @@ class array
     array(detail::unchecked_array&& ua);
 
 public:
-    /** The type of <em>Allocator</em> returned by @ref get_allocator
-
-        This type is a @ref polymorphic_allocator.
-    */
-#ifdef BOOST_JSON_DOCS
-    // VFALCO doc toolchain renders this incorrectly
-    using allocator_type = __see_below__;
-#else
-    using allocator_type = polymorphic_allocator<value>;
-#endif
+    /// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
+    using allocator_type = container::pmr::polymorphic_allocator<value>;
 
     /// The type used to represent unsigned integers
     using size_type = std::size_t;
@@ -169,7 +162,7 @@ class array
 
         The destructor for each element is called if needed,
         any used memory is deallocated, and shared ownership
-        of the @ref memory_resource is released.
+        of the `boost::container::pmr::memory_resource` is released.
 
         @par Complexity
         Constant, or linear in @ref size().
@@ -211,7 +204,7 @@ class array
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
     */
@@ -240,7 +233,7 @@ class array
 
         @param v The value to be inserted.
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
     */
@@ -264,7 +257,7 @@ class array
 
         @param count The number of nulls to insert.
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
     */
@@ -299,7 +292,7 @@ class array
         @param last An input iterator pointing to the end
         of the range.
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
 
@@ -350,7 +343,7 @@ class array
 
         @param other The array to copy
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
     */
@@ -442,7 +435,7 @@ class array
 
         @param other The container to move
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
     */
@@ -466,7 +459,7 @@ class array
 
         @param init The initializer list to insert
 
-        @param sp A pointer to the @ref memory_resource
+        @param sp A pointer to the `boost::container::pmr::memory_resource`
         to use. The container will acquire shared
         ownership of the memory resource.
     */
@@ -547,10 +540,10 @@ class array
 
     //------------------------------------------------------
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated memory resource.
 
-        This returns the @ref memory_resource used by
-        the container.
+        This function returns the `boost::container::pmr::memory_resource` used
+        by the container.
 
         @par Complexity
         Constant.
@@ -564,11 +557,10 @@ class array
         return sp_;
     }
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated allocator.
 
-        This function returns an instance of
-        @ref polymorphic_allocator constructed from the
-        associated @ref memory_resource.
+        This function returns an instance of @ref allocator_type constructed
+        from the associated `boost::container::pmr::memory_resource`.
 
         @par Complexity
         Constant.
@@ -588,33 +580,66 @@ class array
     //
     //------------------------------------------------------
 
+    /** Access an element, with bounds checking.
+
+        Returns `boost::system::result` containing a reference to the element
+        specified at location `pos`, if `pos` is within the range of the
+        container. Otherwise the result contains an `error_code`.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @param pos A zero-based index.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    BOOST_JSON_DECL
+    system::result<value&>
+    try_at(std::size_t pos) noexcept;
+
+    BOOST_JSON_DECL
+    system::result<value const&>
+    try_at(std::size_t pos) const noexcept;
+    /** @} */
+
     /** Access an element, with bounds checking.
 
         Returns a reference to the element specified at
         location `pos`, with bounds checking. If `pos` is
         not within the range of the container, an exception
-        of type @ref system_error is thrown.
+        of type `boost::system::system_error` is thrown.
 
         @par Complexity
         Constant.
 
         @param pos A zero-based index.
 
-        @throw system_error `pos >= size()`
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @throw `boost::system::system_error` `pos >= size()`.
     */
-    /* @{ */
+    /** @{ */
     inline
     value&
-    at(std::size_t pos) &;
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &;
 
     inline
     value&&
-    at(std::size_t pos) &&;
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &&;
 
-    inline
+    BOOST_JSON_DECL
     value const&
-    at(std::size_t pos) const&;
-    /* @} */
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const&;
+    /** @} */
 
     /** Access an element.
 
@@ -629,7 +654,7 @@ class array
 
         @param pos A zero-based index
     */
-    /* @{ */
+    /** @{ */
     inline
     value&
     operator[](std::size_t pos) & noexcept;
@@ -641,7 +666,7 @@ class array
     inline
     value const&
     operator[](std::size_t pos) const& noexcept;
-    /* @} */
+    /** @} */
 
     /** Access the first element.
 
@@ -653,7 +678,7 @@ class array
         @par Complexity
         Constant.
     */
-    /* @{ */
+    /** @{ */
     inline
     value&
     front() & noexcept;
@@ -665,7 +690,7 @@ class array
     inline
     value const&
     front() const& noexcept;
-    /* @} */
+    /** @} */
 
     /** Access the last element.
 
@@ -677,7 +702,7 @@ class array
         @par Complexity
         Constant.
     */
-    /* @{ */
+    /** @{ */
     inline
     value&
     back() & noexcept;
@@ -689,7 +714,7 @@ class array
     inline
     value const&
     back() const& noexcept;
-    /* @} */
+    /** @} */
 
     /** Access the underlying array directly.
 
@@ -1070,7 +1095,7 @@ class array
 
         @param new_capacity The new capacity of the array.
 
-        @throw system_error `new_capacity > max_size()`
+        @throw `boost::system::system_error` `new_capacity > max_size()`.
     */
     inline
     void
@@ -1141,7 +1166,7 @@ class array
         be inserted. This may be the @ref end() iterator.
 
         @param v The value to insert. A copy will be made
-        using container's associated @ref memory_resource.
+        using container's associated `boost::container::pmr::memory_resource`.
 
         @return An iterator to the inserted value
     */
@@ -1173,7 +1198,8 @@ class array
 
         @param v The value to insert. Ownership of the
         value will be transferred via move construction,
-        using the container's associated @ref memory_resource.
+        using the container's
+        associated `boost::container::pmr::memory_resource`.
 
         @return An iterator to the inserted value
     */
@@ -1206,7 +1232,8 @@ class array
         @param count The number of copies to insert.
 
         @param v The value to insert. Copies will be made
-        using container's associated @ref memory_resource.
+        using the container's
+        associated `boost::container::pmr::memory_resource`.
 
         @return An iterator to the first inserted value,
         or `pos` if `count == 0`.
@@ -1406,8 +1433,8 @@ class array
         Strong guarantee.
         Calls to `memory_resource::allocate` may throw.
 
-        @param v The value to insert. A copy will be made
-        using container's associated @ref memory_resource.
+        @param v The value to insert. A copy will be made using the container's
+        associated `boost::container::pmr::memory_resource`.
     */
     BOOST_JSON_DECL
     void
@@ -1429,9 +1456,9 @@ class array
         Strong guarantee.
         Calls to `memory_resource::allocate` may throw.
 
-        @param v The value to insert. Ownership of the
-        value will be transferred via move construction,
-        using the container's associated @ref memory_resource.
+        @param v The value to insert. Ownership of the value will be
+        transferred via move construction, using the container's
+        associated `boost::container::pmr::memory_resource`.
     */
     BOOST_JSON_DECL
     void
@@ -1543,8 +1570,8 @@ class array
     /** Swap the contents.
 
         Exchanges the contents of this array with another
-        array. Ownership of the respective @ref memory_resource
-        objects is not transferred.
+        array. Ownership of the respective
+        `boost::container::pmr::memory_resource` objects is not transferred.
 
         @li If `*other.storage() == *this->storage()`,
         ownership of the underlying memory is swapped in
@@ -1572,9 +1599,9 @@ class array
 
     /** Exchange the given values.
 
-        Exchanges the contents of the array `lhs` with
-        another array `rhs`. Ownership of the respective
-        @ref memory_resource objects is not transferred.
+        Exchanges the contents of the array `lhs` with another array `rhs`.
+        Ownership of the respective `boost::container::pmr::memory_resource`
+        objects is not transferred.
 
         @li If `*lhs.storage() == *rhs.storage()`,
         ownership of the underlying memory is swapped in
diff --git a/inst/include/boost/json/basic_parser.hpp b/inst/include/boost/json/basic_parser.hpp
index 9c8576fd0..dfecf57b5 100644
--- a/inst/include/boost/json/basic_parser.hpp
+++ b/inst/include/boost/json/basic_parser.hpp
@@ -299,7 +299,7 @@ class basic_parser
     Handler h_;
 
     number num_;
-    error_code ec_;
+    system::error_code ec_;
     detail::stack st_;
     detail::utf8_sequence seq_;
     unsigned u1_;
@@ -407,14 +407,16 @@ class basic_parser
         std::integral_constant<bool, StackEmpty_> stack_empty,
         std::integral_constant<bool, AllowComments_> allow_comments,
         /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
+        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+        bool allow_bad_utf16);
 
     template<bool AllowComments_/*,
         bool AllowTrailing_, bool AllowBadUTF8_*/>
     const char* resume_value(const char* p,
         std::integral_constant<bool, AllowComments_> allow_comments,
         /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
+        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+        bool allow_bad_utf16);
 
     template<bool StackEmpty_, bool AllowComments_/*,
         bool AllowTrailing_, bool AllowBadUTF8_*/>
@@ -422,7 +424,8 @@ class basic_parser
         std::integral_constant<bool, StackEmpty_> stack_empty,
         std::integral_constant<bool, AllowComments_> allow_comments,
         /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
+        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+        bool allow_bad_utf16);
 
     template<bool StackEmpty_, bool AllowComments_/*,
         bool AllowTrailing_, bool AllowBadUTF8_*/>
@@ -430,18 +433,26 @@ class basic_parser
         std::integral_constant<bool, StackEmpty_> stack_empty,
         std::integral_constant<bool, AllowComments_> allow_comments,
         /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
+        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+        bool allow_bad_utf16);
 
-    template<int Literal>
-    const char* parse_literal(const char* p,
-        std::integral_constant<int, Literal> literal);
+    template<class Literal>
+    const char* parse_literal(const char* p, Literal literal);
 
-    template<bool StackEmpty_, bool IsKey_/*,
-        bool AllowBadUTF8_*/>
+    template<bool StackEmpty_, bool IsKey_>
     const char* parse_string(const char* p,
         std::integral_constant<bool, StackEmpty_> stack_empty,
         std::integral_constant<bool, IsKey_> is_key,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
+        bool allow_bad_utf8,
+        bool allow_bad_utf16);
+
+    template<bool StackEmpty_>
+    const char* parse_escaped(
+        const char* p,
+        std::size_t& total,
+        std::integral_constant<bool, StackEmpty_> stack_empty,
+        bool is_key,
+        bool allow_bad_utf16);
 
     template<bool StackEmpty_, char First_, number_precision Numbers_>
     const char* parse_number(const char* p,
@@ -449,22 +460,6 @@ class basic_parser
         std::integral_constant<char, First_> first,
         std::integral_constant<number_precision, Numbers_> numbers);
 
-    template<bool StackEmpty_, bool IsKey_/*,
-        bool AllowBadUTF8_*/>
-    const char* parse_unescaped(const char* p,
-        std::integral_constant<bool, StackEmpty_> stack_empty,
-        std::integral_constant<bool, IsKey_> is_key,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
-
-    template<bool StackEmpty_/*, bool IsKey_,
-        bool AllowBadUTF8_*/>
-    const char* parse_escaped(
-        const char* p,
-        std::size_t total,
-        std::integral_constant<bool, StackEmpty_> stack_empty,
-        /*std::integral_constant<bool, IsKey_>*/ bool is_key,
-        /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8);
-
     // intentionally private
     std::size_t
     depth() const noexcept
@@ -516,8 +511,6 @@ class basic_parser
 
         @param args Optional additional arguments
         forwarded to the handler's constructor.
-
-        @see parse_options
     */
     template<class... Args>
     explicit
@@ -571,7 +564,7 @@ class basic_parser
         @par Exception Safety
         No-throw guarantee.
     */
-    error_code
+    system::error_code
     last_error() const noexcept
     {
         return ec_;
@@ -640,7 +633,7 @@ class basic_parser
         instead.
     */
     void
-    fail(error_code ec) noexcept;
+    fail(system::error_code ec) noexcept;
 
     /** Parse some of an input string as JSON, incrementally.
 
@@ -692,13 +685,13 @@ class basic_parser
 
         @param ec Set to the error, if any occurred.
     */
-/** @{ */
+    /** @{ */
     std::size_t
     write_some(
         bool more,
         char const* data,
         std::size_t size,
-        error_code& ec);
+        system::error_code& ec);
 
     std::size_t
     write_some(
@@ -706,7 +699,7 @@ class basic_parser
         char const* data,
         std::size_t size,
         std::error_code& ec);
-/** @} */
+    /** @} */
 };
 
 } // namespace json
diff --git a/inst/include/boost/json/basic_parser_impl.hpp b/inst/include/boost/json/basic_parser_impl.hpp
index 09968e444..7b8f9088b 100644
--- a/inst/include/boost/json/basic_parser_impl.hpp
+++ b/inst/include/boost/json/basic_parser_impl.hpp
@@ -12,11 +12,14 @@
 #define BOOST_JSON_BASIC_PARSER_IMPL_HPP
 
 #include <boost/json/detail/config.hpp>
+#include <boost/json/detail/literals.hpp>
 #include <boost/json/basic_parser.hpp>
 #include <boost/json/error.hpp>
 #include <boost/json/detail/buffer.hpp>
 #include <boost/json/detail/charconv/from_chars.hpp>
 #include <boost/json/detail/sse2.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/integral.hpp>
 #include <cmath>
 #include <limits>
 #include <cstring>
@@ -184,17 +187,6 @@ hex_digit(unsigned char c) noexcept
     return -1;
 }
 
-enum json_literal
-{
-    null_literal = 0,
-    true_literal,
-    false_literal,
-    infinity_literal,
-    neg_infinity_literal,
-    nan_literal,
-    resume_literal = -1
-};
-
 } // detail
 
 //----------------------------------------------------------
@@ -567,35 +559,35 @@ parse_document(const char* p,
     {
     // no extensions
     default:
-        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::false_type(), std::false_type());
+        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::false_type(), std::false_type(), opt_.allow_invalid_utf16);
         break;
     // comments
     case 1:
-        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::false_type(), std::false_type());
+        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::false_type(), std::false_type(), opt_.allow_invalid_utf16);
         break;
     // trailing
     case 2:
-        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::true_type(), std::false_type());
+        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::true_type(), std::false_type(), opt_.allow_invalid_utf16);
         break;
     // comments & trailing
     case 3:
-        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::true_type(), std::false_type());
+        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::true_type(), std::false_type(), opt_.allow_invalid_utf16);
         break;
     // skip validation
     case 4:
-        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::false_type(), std::true_type());
+        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::false_type(), std::true_type(), opt_.allow_invalid_utf16);
         break;
     // comments & skip validation
     case 5:
-        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::false_type(), std::true_type());
+        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::false_type(), std::true_type(), opt_.allow_invalid_utf16);
         break;
     // trailing & skip validation
     case 6:
-        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::true_type(), std::true_type());
+        cs = parse_value(cs.begin(), stack_empty, std::false_type(), std::true_type(), std::true_type(), opt_.allow_invalid_utf16);
         break;
     // comments & trailing & skip validation
     case 7:
-        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::true_type(), std::true_type());
+        cs = parse_value(cs.begin(), stack_empty, std::true_type(), std::true_type(), std::true_type(), opt_.allow_invalid_utf16);
         break;
     }
     if(BOOST_JSON_UNLIKELY(incomplete(cs)))
@@ -631,7 +623,8 @@ parse_value(const char* p,
     std::integral_constant<bool, StackEmpty_> stack_empty,
     std::integral_constant<bool, AllowComments_> allow_comments,
     /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
+    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+    bool allow_bad_utf16)
 {
     if(stack_empty || st_.empty())
     {
@@ -653,11 +646,11 @@ parse_value(const char* p,
                 static_cast<unsigned char>(opt_.numbers),
                 parse_number_helper<true, '+'>{ this, p });
         case 'n':
-            return parse_literal( p, mp11::mp_int<detail::null_literal>() );
+            return parse_literal( p, detail::literals_c<detail::literals::null>() );
         case 't':
-            return parse_literal( p, mp11::mp_int<detail::true_literal>() );
+            return parse_literal( p, detail::literals_c<detail::literals::true_>() );
         case 'f':
-            return parse_literal( p, mp11::mp_int<detail::false_literal>() );
+            return parse_literal( p, detail::literals_c<detail::literals::false_>() );
         case 'I':
             if( !opt_.allow_infinity_and_nan )
             {
@@ -665,7 +658,7 @@ parse_value(const char* p,
                     = BOOST_CURRENT_LOCATION;
                 return fail(p, error::syntax, &loc);
             }
-            return parse_literal( p, mp11::mp_int<detail::infinity_literal>() );
+            return parse_literal( p, detail::literals_c<detail::literals::infinity>() );
         case 'N':
             if( !opt_.allow_infinity_and_nan )
             {
@@ -673,13 +666,13 @@ parse_value(const char* p,
                     = BOOST_CURRENT_LOCATION;
                 return fail(p, error::syntax, &loc);
             }
-            return parse_literal( p, mp11::mp_int<detail::nan_literal>() );
+            return parse_literal(p, detail::literals_c<detail::literals::nan>() );
         case '"':
-            return parse_unescaped(p, std::true_type(), std::false_type(), allow_bad_utf8);
+            return parse_string(p, std::true_type(), std::false_type(), allow_bad_utf8, allow_bad_utf16);
         case '[':
-            return parse_array(p, std::true_type(), allow_comments, allow_trailing, allow_bad_utf8);
+            return parse_array(p, std::true_type(), allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
         case '{':
-            return parse_object(p, std::true_type(), allow_comments, allow_trailing, allow_bad_utf8);
+            return parse_object(p, std::true_type(), allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
         case '/':
             if(! allow_comments)
             {
@@ -710,7 +703,7 @@ parse_value(const char* p,
             }
         }
     }
-    return resume_value(p, allow_comments, allow_trailing, allow_bad_utf8);
+    return resume_value(p, allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
 }
 
 template<class Handler>
@@ -723,7 +716,8 @@ basic_parser<Handler>::
 resume_value(const char* p,
     std::integral_constant<bool, AllowComments_> allow_comments,
     /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
+    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+    bool allow_bad_utf16)
 {
     state st;
     st_.peek(st);
@@ -731,24 +725,16 @@ resume_value(const char* p,
     {
     default: BOOST_JSON_UNREACHABLE();
     case state::lit1:
-        return parse_literal(p,  mp11::mp_int<detail::resume_literal>() );
-
-    case state::str1:
-        return parse_unescaped(p, std::false_type(), std::false_type(), allow_bad_utf8);
+        return parse_literal(p,  detail::literals_c<detail::literals::resume>() );
 
-    case state::str2: case state::str3:
-    case state::str4: case state::str5:
-    case state::str6: case state::str7:
+    case state::str1: case state::str2:
     case state::str8:
-    case state::sur1: case state::sur2:
-    case state::sur3: case state::sur4:
-    case state::sur5: case state::sur6:
-        return parse_escaped(p, 0, std::false_type(), std::false_type(), allow_bad_utf8);
+        return parse_string(p, std::false_type(), std::false_type(), allow_bad_utf8, allow_bad_utf16);
 
     case state::arr1: case state::arr2:
     case state::arr3: case state::arr4:
     case state::arr5: case state::arr6:
-        return parse_array(p, std::false_type(), allow_comments, allow_trailing, allow_bad_utf8);
+        return parse_array(p, std::false_type(), allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
 
     case state::obj1: case state::obj2:
     case state::obj3: case state::obj4:
@@ -756,7 +742,7 @@ resume_value(const char* p,
     case state::obj7: case state::obj8:
     case state::obj9: case state::obj10:
     case state::obj11:
-        return parse_object(p, std::false_type(), allow_comments, allow_trailing, allow_bad_utf8);
+        return parse_object(p, std::false_type(), allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
 
     case state::num1: case state::num2:
     case state::num3: case state::num4:
@@ -776,7 +762,7 @@ resume_value(const char* p,
         p = detail::count_whitespace(p, end_);
         if(BOOST_JSON_UNLIKELY(p == end_))
             return maybe_suspend(p, state::val1);
-        return parse_value(p, std::true_type(), allow_comments, allow_trailing, allow_bad_utf8);
+        return parse_value(p, std::true_type(), allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
     }
 
     case state::val2:
@@ -788,107 +774,86 @@ resume_value(const char* p,
         if(BOOST_JSON_UNLIKELY( p == end_ ))
             return maybe_suspend(p, state::val3);
         BOOST_ASSERT(st_.empty());
-        return parse_value(p, std::true_type(), std::true_type(), allow_trailing, allow_bad_utf8);
+        return parse_value(p, std::true_type(), std::true_type(), allow_trailing, allow_bad_utf8, allow_bad_utf16);
     }
 
     case state::val3:
     {
         st_.pop(st);
-        return parse_value(p, std::true_type(), std::true_type(), allow_trailing, allow_bad_utf8);
+        return parse_value(p, std::true_type(), std::true_type(), allow_trailing, allow_bad_utf8, allow_bad_utf16);
     }
     }
 }
 
 template<class Handler>
-template<int Literal>
+template<class Literal>
 const char*
 basic_parser<Handler>::
-parse_literal(const char* p,
-    std::integral_constant<int, Literal> literal)
+parse_literal(const char* p, Literal)
 {
-    constexpr char const* literals[] = {
-        "null",
-        "true",
-        "false",
-        "Infinity",
-        "-Infinity",
-        "NaN",
-    };
-
-    constexpr std::size_t literal_sizes[] = {
-        4,
-        4,
-        5,
-        8,
-        9,
-        3,
-    };
+    using L = detail::literals;
 
     std::size_t cur_lit;
     std::size_t offset;
 
     detail::const_stream_wrapper cs(p, end_);
-    BOOST_IF_CONSTEXPR( literal != detail::resume_literal )
+    BOOST_IF_CONSTEXPR( Literal::value != L::resume )
     {
-        BOOST_ASSERT( literal >= 0 );
-        if(BOOST_JSON_LIKELY( cs.remain() >= literal_sizes[literal] ))
+        constexpr std::size_t index = literal_index(Literal::value);
+        constexpr char const* literal = detail::literal_strings[index];
+        constexpr std::size_t sz = detail::literal_sizes[index];
+
+        if(BOOST_JSON_LIKELY( cs.remain() >= sz ))
         {
-            int const cmp = std::memcmp(
-                cs.begin(), literals[literal], literal_sizes[literal] );
+            int const cmp = std::memcmp(cs.begin(), literal, sz);
             if( cmp != 0 )
             {
                 BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
                 return fail(cs.begin(), error::syntax, &loc);
             }
 
-            BOOST_IF_CONSTEXPR( literal == detail::null_literal )
+            BOOST_IF_CONSTEXPR( Literal::value == L::null )
             {
                 if(BOOST_JSON_UNLIKELY(
                     ! h_.on_null(ec_)))
                     return fail(cs.begin());
             }
-            else BOOST_IF_CONSTEXPR( literal == detail::true_literal )
+            else BOOST_IF_CONSTEXPR( Literal::value == L::true_ )
             {
                 if(BOOST_JSON_UNLIKELY(
                     ! h_.on_bool(true, ec_)))
                     return fail(cs.begin());
             }
-            else BOOST_IF_CONSTEXPR( literal == detail::false_literal )
+            else BOOST_IF_CONSTEXPR( Literal::value == L::false_ )
             {
                 if(BOOST_JSON_UNLIKELY(
                     ! h_.on_bool(false, ec_)))
                     return fail(cs.begin());
             }
-            else BOOST_IF_CONSTEXPR( literal == detail::infinity_literal )
+            else BOOST_IF_CONSTEXPR( Literal::value == L::infinity )
             {
                 if(BOOST_JSON_UNLIKELY(
                     ! h_.on_double(
                         std::numeric_limits<double>::infinity(),
-                        string_view(
-                            literals[detail::infinity_literal],
-                            literal_sizes[detail::infinity_literal]),
+                        string_view(literal, sz),
                         ec_)))
                     return fail(cs.begin());
             }
-            else BOOST_IF_CONSTEXPR( literal == detail::neg_infinity_literal )
+            else BOOST_IF_CONSTEXPR( Literal::value == L::neg_infinity )
             {
                 if(BOOST_JSON_UNLIKELY(
                     ! h_.on_double(
                         -std::numeric_limits<double>::infinity(),
-                        string_view(
-                            literals[detail::neg_infinity_literal],
-                            literal_sizes[detail::neg_infinity_literal]),
+                        string_view(literal, sz),
                         ec_)))
                     return fail(cs.begin());
             }
-            else BOOST_IF_CONSTEXPR( literal == detail::nan_literal )
+            else BOOST_IF_CONSTEXPR( Literal::value == L::nan )
             {
                 if(BOOST_JSON_UNLIKELY(
                     ! h_.on_double(
                         std::numeric_limits<double>::quiet_NaN(),
-                        string_view(
-                            literals[detail::nan_literal],
-                            literal_sizes[detail::nan_literal]),
+                        string_view(literal, sz),
                         ec_)))
                     return fail(cs.begin());
             }
@@ -897,12 +862,12 @@ parse_literal(const char* p,
                 BOOST_JSON_UNREACHABLE();
             }
 
-            cs += literal_sizes[literal];
+            cs += sz;
             return cs.begin();
         }
 
         offset = 0;
-        cur_lit = literal;
+        cur_lit = index;
     }
     else
     {
@@ -914,18 +879,19 @@ parse_literal(const char* p,
         offset = lit_offset_;
     }
 
-    std::size_t const size = (std::min)(
-        literal_sizes[cur_lit] - offset, cs.remain() );
+    std::size_t const lit_size = detail::literal_sizes[cur_lit];
+    std::size_t const size = (std::min)( lit_size - offset, cs.remain() );
     int cmp = 0;
     if(BOOST_JSON_LIKELY( cs.begin() ))
-        cmp = std::memcmp( cs.begin(), literals[cur_lit] + offset, size );
+        cmp = std::memcmp(
+            cs.begin(), detail::literal_strings[cur_lit] + offset, size );
     if( cmp != 0 )
     {
         BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
         return fail(cs.begin(), error::syntax, &loc);
     }
 
-    if(BOOST_JSON_UNLIKELY( offset + size < literal_sizes[cur_lit] ))
+    if(BOOST_JSON_UNLIKELY( offset + size < lit_size ))
     {
         BOOST_ASSERT( cur_lit < 256 );
         cur_lit_ = static_cast<unsigned char>( cur_lit );
@@ -934,50 +900,50 @@ parse_literal(const char* p,
         return maybe_suspend(cs.begin() + size, state::lit1);
     }
 
-    switch( cur_lit )
+    switch( static_cast<L>(cur_lit) )
     {
-    case detail::null_literal:
+    case L::null:
         if(BOOST_JSON_UNLIKELY(
             ! h_.on_null(ec_)))
             return fail(cs.begin());
         break;
-    case detail::true_literal:
+    case L::true_:
         if(BOOST_JSON_UNLIKELY(
             ! h_.on_bool(true, ec_)))
             return fail(cs.begin());
         break;
-    case detail::false_literal:
+    case L::false_:
         if(BOOST_JSON_UNLIKELY(
             ! h_.on_bool(false, ec_)))
             return fail(cs.begin());
         break;
-    case detail::infinity_literal:
+    case L::infinity:
         if(BOOST_JSON_UNLIKELY(
             ! h_.on_double(
                 std::numeric_limits<double>::infinity(),
                 string_view(
-                    literals[detail::infinity_literal],
-                    literal_sizes[detail::infinity_literal]),
+                    detail::literal_strings[ literal_index(L::infinity) ],
+                    detail::literal_sizes[ literal_index(L::infinity) ]),
                 ec_)))
             return fail(cs.begin());
         break;
-    case detail::neg_infinity_literal:
+    case L::neg_infinity:
         if(BOOST_JSON_UNLIKELY(
             ! h_.on_double(
                 -std::numeric_limits<double>::infinity(),
                 string_view(
-                    literals[detail::neg_infinity_literal],
-                    literal_sizes[detail::neg_infinity_literal]),
+                    detail::literal_strings[ literal_index(L::neg_infinity) ],
+                    detail::literal_sizes[ literal_index(L::neg_infinity) ]),
                 ec_)))
             return fail(cs.begin());
         break;
-    case detail::nan_literal:
+    case L::nan:
         if(BOOST_JSON_UNLIKELY(
             ! h_.on_double(
                 std::numeric_limits<double>::quiet_NaN(),
                 string_view(
-                    literals[detail::nan_literal],
-                    literal_sizes[detail::nan_literal]),
+                    detail::literal_strings[ literal_index(L::nan) ],
+                    detail::literal_sizes[ literal_index(L::nan) ]),
                 ec_)))
             return fail(cs.begin());
         break;
@@ -991,72 +957,45 @@ parse_literal(const char* p,
 //----------------------------------------------------------
 
 template<class Handler>
-template<
-    bool StackEmpty_,
-    bool IsKey_/*,
-    bool AllowBadUTF8_*/>
+template<bool StackEmpty_, bool IsKey_>
 const char*
 basic_parser<Handler>::
 parse_string(const char* p,
     std::integral_constant<bool, StackEmpty_> stack_empty,
     std::integral_constant<bool, IsKey_> is_key,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
+    bool allow_bad_utf8,
+    bool allow_bad_utf16)
 {
+    detail::const_stream_wrapper cs(p, end_);
+    std::size_t total;
+    char const* start;
+    std::size_t size;
     if(! stack_empty && ! st_.empty())
     {
         state st;
-        st_.peek(st);
+        st_.pop(st);
+        st_.pop(total);
         switch(st)
         {
         default: BOOST_JSON_UNREACHABLE();
-        case state::str1:
-            return parse_unescaped(p, stack_empty, is_key, allow_bad_utf8);
-
-        case state::str2: case state::str3:
-        case state::str4: case state::str5:
-        case state::str6: case state::str7:
-        case state::str8:
-        case state::sur1: case state::sur2:
-        case state::sur3: case state::sur4:
-        case state::sur5: case state::sur6:
-            return parse_escaped(p, 0, stack_empty, is_key, allow_bad_utf8);
+        case state::str2: goto do_str2;
+        case state::str8: goto do_str8;
+        case state::str1: break;
         }
     }
-
-    return parse_unescaped(p, std::true_type(), is_key, allow_bad_utf8);
-}
-
-template<class Handler>
-template<
-    bool StackEmpty_,
-    bool IsKey_/*,
-    bool AllowBadUTF8_*/>
-const char*
-basic_parser<Handler>::
-parse_unescaped(const char* p,
-    std::integral_constant<bool, StackEmpty_> stack_empty,
-    std::integral_constant<bool, IsKey_> is_key,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
-{
-    detail::const_stream_wrapper cs(p, end_);
-    std::size_t total;
-    if(stack_empty || st_.empty())
+    else
     {
         BOOST_ASSERT(*cs == '\x22'); // '"'
         ++cs;
         total = 0;
     }
-    else
-    {
-        state st;
-        st_.pop(st);
-        st_.pop(total);
-    }
-    char const* start = cs.begin();
+
+do_str1:
+    start = cs.begin();
     cs = allow_bad_utf8?
         detail::count_valid<true>(cs.begin(), cs.end()):
         detail::count_valid<false>(cs.begin(), cs.end());
-    std::size_t size = cs.used(start);
+    size = cs.used(start);
     if(is_key)
     {
         BOOST_ASSERT(total <= Handler::max_key_size);
@@ -1115,16 +1054,11 @@ parse_unescaped(const char* p,
             }
             if(BOOST_JSON_LIKELY(size))
             {
-                {
-                    bool r = is_key?
-                        h_.on_key_part( {start, size}, total, ec_ ):
-                        h_.on_string_part( {start, size}, total, ec_ );
-
-                    if(BOOST_JSON_UNLIKELY(!r))
-                    {
-                        return fail(cs.begin());
-                    }
-                }
+                bool const r = is_key?
+                    h_.on_key_part( {start, size}, total, ec_ ):
+                    h_.on_string_part( {start, size}, total, ec_ );
+                if(BOOST_JSON_UNLIKELY( !r ))
+                    return fail( cs.begin() );
             }
             return maybe_suspend(cs.end(), state::str8, total);
         }
@@ -1133,18 +1067,18 @@ parse_unescaped(const char* p,
             // flush unescaped run from input
             if(BOOST_JSON_LIKELY(size))
             {
-                {
-                    bool r = is_key?
-                        h_.on_key_part( {start, size}, total, ec_ ):
-                        h_.on_string_part( {start, size}, total, ec_ );
-
-                    if(BOOST_JSON_UNLIKELY(!r))
-                    {
-                        return fail(cs.begin());
-                    }
-                }
+                bool const r = is_key?
+                    h_.on_key_part( {start, size}, total, ec_ ):
+                    h_.on_string_part( {start, size}, total, ec_ );
+                if(BOOST_JSON_UNLIKELY( !r ))
+                    return fail( cs.begin() );
             }
-            return parse_escaped(cs.begin(), total, stack_empty, is_key, allow_bad_utf8);
+do_str2:
+            cs = parse_escaped(cs.begin(), total, stack_empty, is_key, allow_bad_utf16);
+            if(BOOST_JSON_UNLIKELY( incomplete(cs) ))
+                return suspend_or_fail(state::str2, total);
+
+            goto do_str1;
         }
         // illegal control
         BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
@@ -1164,22 +1098,45 @@ parse_unescaped(const char* p,
 
     ++cs;
     return cs.begin();
+
+do_str8:
+    uint8_t needed = seq_.needed();
+    if(BOOST_JSON_UNLIKELY( !seq_.append(cs.begin(), cs.remain()) ))
+        return maybe_suspend(cs.end(), state::str8, total);
+    if(BOOST_JSON_UNLIKELY( !seq_.valid() ))
+    {
+        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
+        return fail(cs.begin(), error::syntax, &loc);
+    }
+    {
+        bool const r = is_key?
+            h_.on_key_part( {seq_.data(), seq_.length()}, total, ec_ ):
+            h_.on_string_part( {seq_.data(), seq_.length()}, total, ec_ );
+        if(BOOST_JSON_UNLIKELY( !r ))
+            return fail( cs.begin() );
+    }
+    cs += needed;
+    goto do_str1;
 }
 
 template<class Handler>
-template<
-    bool StackEmpty_/*,
-    bool IsKey_,
-    bool AllowBadUTF8_*/>
+template<bool StackEmpty_>
 const char*
 basic_parser<Handler>::
 parse_escaped(
     const char* p,
-    std::size_t total,
+    std::size_t& total,
     std::integral_constant<bool, StackEmpty_> stack_empty,
-    /*std::integral_constant<bool, IsKey_>*/ bool is_key,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
+    bool is_key,
+    bool allow_bad_utf16)
 {
+    constexpr unsigned urc = 0xFFFD; // Unicode replacement character
+    auto const ev_too_large = is_key?
+        error::key_too_large : error::string_too_large;
+    auto const max_size = is_key?
+        Handler::max_key_size : Handler::max_string_size;
+    int digit;
+
     //---------------------------------------------------------------
     //
     // To handle escapes, a local temporary buffer accumulates
@@ -1193,30 +1150,28 @@ parse_escaped(
     // as possible. Thus, when the first escape is encountered,
     // the algorithm attempts to fill the temporary buffer first.
     //
-    auto const ev_too_large = is_key?
-        error::key_too_large : error::string_too_large;
-    auto const max_size = is_key?
-        Handler::max_key_size : Handler::max_string_size;
-    detail::clipped_const_stream cs(p, end_);
     detail::buffer<BOOST_JSON_STACK_BUFFER_SIZE> temp;
-    int digit;
-    char c;
+
+    // Unescaped JSON is never larger than its escaped version.
+    // To efficiently process only what will fit in the temporary buffer,
+    // the size of the input stream is temporarily "clipped" to the size
+    // of the temporary buffer.
+    // handle escaped character
+    detail::clipped_const_stream cs(p, end_);
     cs.clip(temp.max_size());
+
     if(! stack_empty && ! st_.empty())
     {
         state st;
         st_.pop(st);
-        st_.pop(total);
         switch(st)
         {
         default: BOOST_JSON_UNREACHABLE();
-        case state::str2: goto do_str2;
         case state::str3: goto do_str3;
         case state::str4: goto do_str4;
         case state::str5: goto do_str5;
         case state::str6: goto do_str6;
         case state::str7: goto do_str7;
-        case state::str8: goto do_str8;
         case state::sur1: goto do_sur1;
         case state::sur2: goto do_sur2;
         case state::sur3: goto do_sur3;
@@ -1225,501 +1180,511 @@ parse_escaped(
         case state::sur6: goto do_sur6;
         }
     }
-    // Unescaped JSON is never larger than its escaped version.
-    // To efficiently process only what will fit in the temporary buffer,
-    // the size of the input stream is temporarily "clipped" to the size
-    // of the temporary buffer.
-    // handle escaped character
-    BOOST_ASSERT(*cs == '\\');
-    ++cs;
-do_str3:
-    if(BOOST_JSON_UNLIKELY(! cs))
+
+    while(true)
     {
-        if(BOOST_JSON_LIKELY(! temp.empty()))
+        BOOST_ASSERT( temp.capacity() );
+        BOOST_ASSERT(*cs == '\\');
+        ++cs;
+do_str3:
+        if(BOOST_JSON_UNLIKELY(! cs))
         {
-            BOOST_ASSERT(total <= max_size);
-            if(BOOST_JSON_UNLIKELY(
-                temp.size() > max_size - total))
-            {
-                BOOST_STATIC_CONSTEXPR source_location loc
-                    = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), ev_too_large, &loc);
-            }
-            total += temp.size();
+            if(BOOST_JSON_LIKELY(! temp.empty()))
             {
-                bool r = is_key
-                    ? h_.on_key_part(temp.get(), total, ec_)
-                    : h_.on_string_part(temp.get(), total, ec_);
-
-                if(BOOST_JSON_UNLIKELY(!r))
+                BOOST_ASSERT(total <= max_size);
+                if(BOOST_JSON_UNLIKELY(
+                    temp.size() > max_size - total))
                 {
-                    return fail(cs.begin());
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), ev_too_large, &loc);
                 }
+                total += temp.size();
+                {
+                    bool r = is_key
+                        ? h_.on_key_part(temp.get(), total, ec_)
+                        : h_.on_string_part(temp.get(), total, ec_);
+
+                    if(BOOST_JSON_UNLIKELY(!r))
+                    {
+                        return fail(cs.begin());
+                    }
+                }
+                temp.clear();
             }
-            temp.clear();
+            cs.clip(temp.max_size());
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::str3);
         }
-        cs.clip(temp.max_size());
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::str3, total);
-    }
-    switch(*cs)
-    {
-    default:
+        switch(*cs)
         {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::syntax, &loc);
-        }
-    case '\x22': // '"'
-        temp.push_back('\x22');
-        ++cs;
-        break;
-    case '\\':
-        temp.push_back('\\');
-        ++cs;
-        break;
-    case '/':
-        temp.push_back('/');
-        ++cs;
-        break;
-    case 'b':
-        temp.push_back('\x08');
-        ++cs;
-        break;
-    case 'f':
-        temp.push_back('\x0c');
-        ++cs;
-        break;
-    case 'n':
-        temp.push_back('\x0a');
-        ++cs;
-        break;
-    case 'r':
-        temp.push_back('\x0d');
-        ++cs;
-        break;
-    case 't':
-        temp.push_back('\x09');
-        ++cs;
-        break;
-    case 'u':
-        // utf16 escape
-        //
-        // fast path only when the buffer
-        // is large enough for 2 surrogates
-        if(BOOST_JSON_LIKELY(cs.remain() > 10))
-        {
-            // KRYSTIAN TODO: this could be done
-            // with fewer instructions
-            digit = detail::load_little_endian<4>(
-                cs.begin() + 1);
-            int d4 = detail::hex_digit(static_cast<
-                unsigned char>(digit >> 24));
-            int d3 = detail::hex_digit(static_cast<
-                unsigned char>(digit >> 16));
-            int d2 = detail::hex_digit(static_cast<
-                unsigned char>(digit >> 8));
-            int d1 = detail::hex_digit(static_cast<
-                unsigned char>(digit));
-            if(BOOST_JSON_UNLIKELY(
-                (d1 | d2 | d3 | d4) == -1))
-            {
-                if(d1 != -1)
-                    ++cs;
-                if(d2 != -1)
-                    ++cs;
-                if(d3 != -1)
-                    ++cs;
+        default:
+            {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), error::expected_hex_digit, &loc);
+                return fail(cs.begin(), error::syntax, &loc);
             }
-            // 32 bit unicode scalar value
-            unsigned const u1 =
-                (d1 << 12) + (d2 << 8) +
-                (d3 << 4) + d4;
-            // valid unicode scalar values are
-            // [0, D7FF] and [E000, 10FFFF]
-            // values within this range are valid utf-8
-            // code points and invalid leading surrogates.
-            if(BOOST_JSON_LIKELY(
-                u1 < 0xd800 || u1 > 0xdfff))
-            {
+        case '\x22': // '"'
+            temp.push_back('\x22');
+            ++cs;
+            break;
+        case '\\':
+            temp.push_back('\\');
+            ++cs;
+            break;
+        case '/':
+            temp.push_back('/');
+            ++cs;
+            break;
+        case 'b':
+            temp.push_back('\x08');
+            ++cs;
+            break;
+        case 'f':
+            temp.push_back('\x0c');
+            ++cs;
+            break;
+        case 'n':
+            temp.push_back('\x0a');
+            ++cs;
+            break;
+        case 'r':
+            temp.push_back('\x0d');
+            ++cs;
+            break;
+        case 't':
+            temp.push_back('\x09');
+            ++cs;
+            break;
+        case 'u':
+            // utf16 escape
+            //
+            // fast path only when the buffer
+            // is large enough for 2 surrogates
+            if(BOOST_JSON_LIKELY(cs.remain() > 10))
+            {
+                // KRYSTIAN TODO: this could be done
+                // with fewer instructions
+                digit = detail::load_little_endian<4>(
+                    cs.begin() + 1);
+                int d4 = detail::hex_digit(static_cast<
+                    unsigned char>(digit >> 24));
+                int d3 = detail::hex_digit(static_cast<
+                    unsigned char>(digit >> 16));
+                int d2 = detail::hex_digit(static_cast<
+                    unsigned char>(digit >> 8));
+                int d1 = detail::hex_digit(static_cast<
+                    unsigned char>(digit));
+                if(BOOST_JSON_UNLIKELY(
+                    (d1 | d2 | d3 | d4) == -1))
+                {
+                    if(d1 != -1)
+                        ++cs;
+                    if(d2 != -1)
+                        ++cs;
+                    if(d3 != -1)
+                        ++cs;
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), error::expected_hex_digit, &loc);
+                }
+                // 32 bit unicode scalar value
+                unsigned u1 =
+                    (d1 << 12) + (d2 << 8) +
+                    (d3 << 4) + d4;
+                // valid unicode scalar values are
+                // [0, D7FF] and [E000, 10FFFF]
+                // values within this range are valid utf-8
+                // code points and invalid leading surrogates.
+                if(BOOST_JSON_LIKELY(
+                    u1 < 0xd800 || u1 > 0xdfff))
+                {
+                    cs += 5;
+                    temp.append_utf8(u1);
+                    break;
+                }
+                if(BOOST_JSON_UNLIKELY(u1 > 0xdbff))
+                {
+                    // If it's an illegal leading surrogate and
+                    // the parser does not allow it, return an error.
+                    if(!allow_bad_utf16)
+                    {
+                        BOOST_STATIC_CONSTEXPR source_location loc
+                            = BOOST_CURRENT_LOCATION;
+                        return fail(cs.begin(), error::illegal_leading_surrogate,
+                            &loc);
+                    }
+                    // Otherwise, append the Unicode replacement character
+                    else
+                    {
+                        cs += 5;
+                        temp.append_utf8(urc);
+                        break;
+                    }
+                }
                 cs += 5;
-                temp.append_utf8(u1);
+                // KRYSTIAN TODO: this can be a two byte load
+                // and a single comparison. We lose error information,
+                // but it's faster.
+                if(BOOST_JSON_UNLIKELY(*cs != '\\'))
+                {
+                    // If the next character is not a backslash and
+                    // the parser does not allow it, return a syntax error.
+                    if(!allow_bad_utf16)
+                    {
+                        BOOST_STATIC_CONSTEXPR source_location loc
+                            = BOOST_CURRENT_LOCATION;
+                        return fail(cs.begin(), error::syntax, &loc);
+                    }
+                    // Otherwise, append the Unicode replacement character since
+                    // the first code point is a valid leading surrogate
+                    else
+                    {
+                        temp.append_utf8(urc);
+                        break;
+                    }
+                }
+                ++cs;
+                if(BOOST_JSON_UNLIKELY(*cs != 'u'))
+                {
+                    if (!allow_bad_utf16)
+                    {
+                        BOOST_STATIC_CONSTEXPR source_location loc
+                            = BOOST_CURRENT_LOCATION;
+                        return fail(cs.begin(), error::syntax, &loc);
+                    }
+                    // Otherwise, append the Unicode replacement character since
+                    // the first code point is a valid leading surrogate
+                    else
+                    {
+                        temp.append_utf8(urc);
+                        goto do_str3;
+                    }
+                }
+                ++cs;
+                digit = detail::load_little_endian<4>(cs.begin());
+                d4 = detail::hex_digit(static_cast<
+                    unsigned char>(digit >> 24));
+                d3 = detail::hex_digit(static_cast<
+                    unsigned char>(digit >> 16));
+                d2 = detail::hex_digit(static_cast<
+                    unsigned char>(digit >> 8));
+                d1 = detail::hex_digit(static_cast<
+                    unsigned char>(digit));
+                if(BOOST_JSON_UNLIKELY(
+                    (d1 | d2 | d3 | d4) == -1))
+                {
+                    if(d1 != -1)
+                        ++cs;
+                    if(d2 != -1)
+                        ++cs;
+                    if(d3 != -1)
+                        ++cs;
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), error::expected_hex_digit, &loc);
+                }
+                unsigned u2 =
+                    (d1 << 12) + (d2 << 8) +
+                    (d3 << 4) + d4;
+                // Check if the second code point is a valid trailing surrogate.
+                // Valid trailing surrogates are [DC00, DFFF]
+                if(BOOST_JSON_UNLIKELY(
+                    u2 < 0xdc00 || u2 > 0xdfff))
+                {
+                    // If not valid and the parser does not allow it, return an error.
+                    if(!allow_bad_utf16)
+                    {
+                        BOOST_STATIC_CONSTEXPR source_location loc
+                            = BOOST_CURRENT_LOCATION;
+                        return fail(cs.begin(), error::illegal_trailing_surrogate,
+                            &loc);
+                    }
+                    // Append the replacement character for the
+                    // first leading surrogate.
+                    cs += 4;
+                    temp.append_utf8(urc);
+                    // Check if the second code point is a
+                    // valid unicode scalar value (invalid leading
+                    // or trailing surrogate)
+                    if (u2 < 0xd800 || u2 > 0xdbff)
+                    {
+                        temp.append_utf8(u2);
+                        break;
+                    }
+                    // If it is a valid leading surrogate
+                    else
+                    {
+                        u1_ = u2;
+                        goto do_sur1;
+                    }
+                }
+                cs += 4;
+                // Calculate the Unicode code point from the surrogate pair and
+                // append the UTF-8 representation.
+                unsigned cp =
+                    ((u1 - 0xd800) << 10) +
+                    ((u2 - 0xdc00)) +
+                        0x10000;
+                // utf-16 surrogate pair
+                temp.append_utf8(cp);
                 break;
             }
-            if(BOOST_JSON_UNLIKELY(u1 > 0xdbff))
+            // flush
+            if(BOOST_JSON_LIKELY(! temp.empty()))
             {
-                BOOST_STATIC_CONSTEXPR source_location loc
-                    = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), error::illegal_leading_surrogate,
-                    &loc);
+                BOOST_ASSERT(total <= max_size);
+                if(BOOST_JSON_UNLIKELY(
+                    temp.size() > max_size - total))
+                {
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), ev_too_large, &loc);
+                }
+                total += temp.size();
+                {
+                    bool r = is_key
+                        ? h_.on_key_part(temp.get(), total, ec_)
+                        : h_.on_string_part(temp.get(), total, ec_);
+
+                    if(BOOST_JSON_UNLIKELY(!r))
+                    {
+                        return fail(cs.begin());
+                    }
+                }
+                temp.clear();
+                cs.clip(temp.max_size());
             }
-            cs += 5;
-            // KRYSTIAN TODO: this can be a two byte load
-            // and a single comparison. We lose error information,
-            // but it's faster.
-            if(BOOST_JSON_UNLIKELY(*cs != '\\'))
+            ++cs;
+            // utf-16 escape
+    do_str4:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::str4);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), error::syntax, &loc);
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
             ++cs;
-            if(BOOST_JSON_UNLIKELY(*cs != 'u'))
+            u1_ = digit << 12;
+    do_str5:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::str5);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), error::syntax, &loc);
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
             ++cs;
-            digit = detail::load_little_endian<4>(cs.begin());
-            d4 = detail::hex_digit(static_cast<
-                unsigned char>(digit >> 24));
-            d3 = detail::hex_digit(static_cast<
-                unsigned char>(digit >> 16));
-            d2 = detail::hex_digit(static_cast<
-                unsigned char>(digit >> 8));
-            d1 = detail::hex_digit(static_cast<
-                unsigned char>(digit));
-            if(BOOST_JSON_UNLIKELY(
-                (d1 | d2 | d3 | d4) == -1))
-            {
-                if(d1 != -1)
-                    ++cs;
-                if(d2 != -1)
-                    ++cs;
-                if(d3 != -1)
-                    ++cs;
+            u1_ += digit << 8;
+    do_str6:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::str6);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
+            {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
                 return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
-            unsigned const u2 =
-                (d1 << 12) + (d2 << 8) +
-                (d3 << 4) + d4;
-            // valid trailing surrogates are [DC00, DFFF]
-            if(BOOST_JSON_UNLIKELY(
-                u2 < 0xdc00 || u2 > 0xdfff))
+            ++cs;
+            u1_ += digit << 4;
+    do_str7:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::str7);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), error::illegal_trailing_surrogate,
-                    &loc);
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
-            cs += 4;
-            unsigned cp =
-                ((u1 - 0xd800) << 10) +
-                ((u2 - 0xdc00)) +
-                    0x10000;
-            // utf-16 surrogate pair
-            temp.append_utf8(cp);
-            break;
-        }
-        // flush
-        if(BOOST_JSON_LIKELY(! temp.empty()))
-        {
-            BOOST_ASSERT(total <= max_size);
-            if(BOOST_JSON_UNLIKELY(
-                temp.size() > max_size - total))
+            ++cs;
+            u1_ += digit;
+            if(BOOST_JSON_LIKELY(
+                u1_ < 0xd800 || u1_ > 0xdfff))
             {
-                BOOST_STATIC_CONSTEXPR source_location loc
-                    = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), ev_too_large, &loc);
+                BOOST_ASSERT(temp.empty());
+                // utf-8 codepoint
+                temp.append_utf8(u1_);
+                break;
             }
-            total += temp.size();
+            if(BOOST_JSON_UNLIKELY(u1_ > 0xdbff))
             {
-                bool r = is_key
-                    ? h_.on_key_part(temp.get(), total, ec_)
-                    : h_.on_string_part(temp.get(), total, ec_);
-
-                if(BOOST_JSON_UNLIKELY(!r))
+                // If it's an illegal leading surrogate and
+                // the parser does not allow it, return an error.
+                if(!allow_bad_utf16)
                 {
-                    return fail(cs.begin());
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), error::illegal_leading_surrogate, &loc);
+                }
+                // Otherwise, append the Unicode replacement character
+                else
+                {
+                    BOOST_ASSERT(temp.empty());
+                    temp.append_utf8(urc);
+                    break;
                 }
             }
-            temp.clear();
-            cs.clip(temp.max_size());
-        }
-        ++cs;
-        // utf-16 escape
-do_str4:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::str4, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u1_ = digit << 12;
-do_str5:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::str5, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u1_ += digit << 8;
-do_str6:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::str6, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u1_ += digit << 4;
-do_str7:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::str7, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u1_ += digit;
-        if(BOOST_JSON_LIKELY(
-            u1_ < 0xd800 || u1_ > 0xdfff))
-        {
-            BOOST_ASSERT(temp.empty());
-            // utf-8 codepoint
-            temp.append_utf8(u1_);
-            break;
-        }
-        if(BOOST_JSON_UNLIKELY(u1_ > 0xdbff))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::illegal_trailing_surrogate, &loc);
-        }
-do_sur1:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::sur1, total);
-        if(BOOST_JSON_UNLIKELY(*cs != '\\'))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::syntax, &loc);
-        }
-        ++cs;
-do_sur2:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::sur2, total);
-        if(BOOST_JSON_UNLIKELY(*cs != 'u'))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::syntax, &loc);
-        }
-        ++cs;
-do_sur3:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::sur3, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u2_ = digit << 12;
-do_sur4:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::sur4, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u2_ += digit << 8;
-do_sur5:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::sur5, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u2_ += digit << 4;
-do_sur6:
-        if(BOOST_JSON_UNLIKELY(! cs))
-            return maybe_suspend(cs.begin(), state::sur6, total);
-        digit = detail::hex_digit(*cs);
-        if(BOOST_JSON_UNLIKELY(digit == -1))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        ++cs;
-        u2_ += digit;
-        if(BOOST_JSON_UNLIKELY(
-            u2_ < 0xdc00 || u2_ > 0xdfff))
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc
-                = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::expected_hex_digit, &loc);
-        }
-        unsigned cp =
-            ((u1_ - 0xd800) << 10) +
-            ((u2_ - 0xdc00)) +
-                0x10000;
-        BOOST_ASSERT(temp.empty());
-        // utf-16 surrogate pair
-        temp.append_utf8(cp);
-    }
-do_str2:
-    // KRYSTIAN TODO: we can append the characters
-    // all at once instead of one at a time
-    for(;;)
-    {
-        if(BOOST_JSON_UNLIKELY(! cs || temp.capacity() == 0 ))
-        {
-            // flush
-            if(BOOST_JSON_LIKELY(! temp.empty()))
+    do_sur1:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::sur1);
+            if(BOOST_JSON_UNLIKELY(*cs != '\\'))
             {
-                BOOST_ASSERT(total <= max_size);
-                if(BOOST_JSON_UNLIKELY(
-                    temp.size() > max_size - total))
+                // If the next character is not a backslash and
+                // the parser does not allow it, return a syntax error.
+                if(!allow_bad_utf16)
                 {
                     BOOST_STATIC_CONSTEXPR source_location loc
                         = BOOST_CURRENT_LOCATION;
-                    return fail(cs.begin(), ev_too_large, &loc);
+                    return fail(cs.begin(), error::syntax, &loc);
                 }
-                total += temp.size();
+                // Otherwise, append the Unicode replacement character since
+                // the first code point is a valid leading surrogate
+                else
                 {
-                    bool r = is_key
-                        ? h_.on_key_part(temp.get(), total, ec_)
-                        : h_.on_string_part(temp.get(), total, ec_);
-
-                    if(BOOST_JSON_UNLIKELY(!r))
-                    {
-                        return fail(cs.begin());
-                    }
+                    temp.append_utf8(urc);
+                    break;
                 }
-                temp.clear();
             }
-            cs.clip(temp.max_size());
+            ++cs;
+    do_sur2:
             if(BOOST_JSON_UNLIKELY(! cs))
-                return maybe_suspend(cs.begin(), state::str2, total);
-        }
-        c = *cs;
-        if(BOOST_JSON_LIKELY(c == '\x22')) // '"'
-        {
-            BOOST_ASSERT(total <= max_size);
-            if(BOOST_JSON_UNLIKELY(
-                temp.size() > max_size - total))
+                return maybe_suspend(cs.begin(), state::sur2);
+            if(BOOST_JSON_UNLIKELY(*cs != 'u'))
+            {
+                if (!allow_bad_utf16)
+                {
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), error::syntax, &loc);
+                }
+                // Otherwise, append the Unicode replacement character since
+                // the first code point is a valid leading surrogate
+                else
+                {
+                    temp.append_utf8(urc);
+                    goto do_str3;
+                }
+            }
+            ++cs;
+    do_sur3:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::sur3);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), ev_too_large, &loc);
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
-            total += temp.size();
+            ++cs;
+            u2_ = digit << 12;
+    do_sur4:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::sur4);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
-                bool r = is_key
-                    ? h_.on_key(temp.get(), total, ec_)
-                    : h_.on_string(temp.get(), total, ec_);
-
-                if(BOOST_JSON_UNLIKELY(!r))
-                {
-                    return fail(cs.begin());
-                }
+                BOOST_STATIC_CONSTEXPR source_location loc
+                    = BOOST_CURRENT_LOCATION;
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
             ++cs;
-            return cs.begin();
-        }
-        else if((c & 0x80) && !allow_bad_utf8)
-        {
-            seq_.save(cs.begin(), cs.remain());
-            if(BOOST_JSON_UNLIKELY(! seq_.complete()))
+            u2_ += digit << 8;
+    do_sur5:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::sur5);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
-                if(BOOST_JSON_LIKELY(! temp.empty()))
-                {
-                    BOOST_ASSERT(total <= max_size);
-                    if(BOOST_JSON_UNLIKELY(
-                        temp.size() > max_size - total))
-                    {
-                        BOOST_STATIC_CONSTEXPR source_location loc
-                            = BOOST_CURRENT_LOCATION;
-                        return fail(cs.begin(), ev_too_large, &loc);
-                    }
-                    total += temp.size();
-                    {
-                        bool r = is_key
-                            ? h_.on_key_part(temp.get(), total, ec_)
-                            : h_.on_string_part(temp.get(), total, ec_);
-
-                        if(BOOST_JSON_UNLIKELY(!r))
-                        {
-                            return fail(cs.begin());
-                        }
-                    }
-                    temp.clear();
-                }
-                cs = cs.end();
-                // ensure there is room for the saved byte sequence
-                cs.clip(temp.max_size() - seq_.length());
-                goto do_str8;
+                BOOST_STATIC_CONSTEXPR source_location loc
+                    = BOOST_CURRENT_LOCATION;
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
-            if(BOOST_JSON_UNLIKELY(! seq_.valid()))
+            ++cs;
+            u2_ += digit << 4;
+    do_sur6:
+            if(BOOST_JSON_UNLIKELY(! cs))
+                return maybe_suspend(cs.begin(), state::sur6);
+            digit = detail::hex_digit(*cs);
+            if(BOOST_JSON_UNLIKELY(digit == -1))
             {
                 BOOST_STATIC_CONSTEXPR source_location loc
                     = BOOST_CURRENT_LOCATION;
-                return fail(cs.begin(), error::syntax, &loc);
+                return fail(cs.begin(), error::expected_hex_digit, &loc);
             }
-            temp.append(seq_.data(), seq_.length());
-            cs += seq_.length();
-            continue;
-        }
-        else if(BOOST_JSON_LIKELY(c == '\\'))
-        {
             ++cs;
-            goto do_str3;
+            u2_ += digit;
+            // Check if the second code point is a valid trailing surrogate.
+            // Valid trailing surrogates are [DC00, DFFF]
+            if(BOOST_JSON_UNLIKELY(
+                u2_ < 0xdc00 || u2_ > 0xdfff))
+            {
+                // If not valid and the parser does not allow it, return an error.
+                if(!allow_bad_utf16)
+                {
+                    BOOST_STATIC_CONSTEXPR source_location loc
+                        = BOOST_CURRENT_LOCATION;
+                    return fail(cs.begin(), error::illegal_trailing_surrogate, &loc);
+                }
+                // Append the replacement character for the
+                // first leading surrogate.
+                temp.append_utf8(urc);
+                // Check if the second code point is a
+                // valid unicode scalar value (invalid leading
+                // or trailing surrogate)
+                if (u2_ < 0xd800 || u2_ > 0xdbff)
+                {
+                    temp.append_utf8(u2_);
+                    break;
+                }
+                // If it is a valid leading surrogate
+                else
+                {
+                    u1_ = u2_;
+                    goto do_sur1;
+                }
+            }
+            // Calculate the Unicode code point from the surrogate pair and
+            // append the UTF-8 representation.
+            unsigned cp =
+                ((u1_ - 0xd800) << 10) +
+                ((u2_ - 0xdc00)) +
+                    0x10000;
+            // utf-16 surrogate pair
+            temp.append_utf8(cp);
         }
-        else if(BOOST_JSON_UNLIKELY(
-            detail::is_control(c)))
+
+        // flush
+        if(BOOST_JSON_UNLIKELY( !cs ) || *cs != '\\')
+            break;
+    }
+
+    if(BOOST_JSON_LIKELY( temp.size() ))
+    {
+        BOOST_ASSERT(total <= max_size);
+        if(BOOST_JSON_UNLIKELY( temp.size() > max_size - total ))
         {
             BOOST_STATIC_CONSTEXPR source_location loc
                 = BOOST_CURRENT_LOCATION;
-            return fail(cs.begin(), error::syntax, &loc);
+            return fail(cs.begin(), ev_too_large, &loc);
         }
-        temp.push_back(c);
-        ++cs;
-    }
-do_str8:
-    uint8_t needed = seq_.needed();
-    if(BOOST_JSON_UNLIKELY(
-        ! seq_.append(cs.begin(), cs.remain())))
-        return maybe_suspend(cs.end(), state::str8, total);
-    if(BOOST_JSON_UNLIKELY(! seq_.valid()))
-    {
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        return fail(cs.begin(), error::syntax, &loc);
+
+        total += temp.size();
+        bool const r = is_key
+            ? h_.on_key_part(temp.get(), total, ec_)
+            : h_.on_string_part(temp.get(), total, ec_);
+        if(BOOST_JSON_UNLIKELY( !r ))
+            return fail( cs.begin() );
     }
-    temp.append(seq_.data(), seq_.length());
-    cs += needed;
-    goto do_str2;
+
+    return cs.begin();
 }
 
 //----------------------------------------------------------
@@ -1736,7 +1701,8 @@ parse_object(const char* p,
     std::integral_constant<bool, StackEmpty_> stack_empty,
     std::integral_constant<bool, AllowComments_> allow_comments,
     /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
+    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+    bool allow_bad_utf16)
 {
     detail::const_stream_wrapper cs(p, end_);
     std::size_t size;
@@ -1806,7 +1772,7 @@ parse_object(const char* p,
             return fail(cs.begin(), error::object_too_large, &loc);
         }
 do_obj3:
-        cs = parse_string(cs.begin(), stack_empty, std::true_type(), allow_bad_utf8);
+        cs = parse_string(cs.begin(), stack_empty, std::true_type(), allow_bad_utf8, allow_bad_utf16);
         if(BOOST_JSON_UNLIKELY(incomplete(cs)))
             return suspend_or_fail(state::obj3, size);
 do_obj4:
@@ -1833,7 +1799,7 @@ parse_object(const char* p,
         if(BOOST_JSON_UNLIKELY(! cs))
             return maybe_suspend(cs.begin(), state::obj6, size);
 do_obj7:
-        cs = parse_value(cs.begin(), stack_empty, allow_comments, allow_trailing, allow_bad_utf8);
+        cs = parse_value(cs.begin(), stack_empty, allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
         if(BOOST_JSON_UNLIKELY(incomplete(cs)))
             return suspend_or_fail(state::obj7, size);
 do_obj8:
@@ -1904,7 +1870,8 @@ parse_array(const char* p,
     std::integral_constant<bool, StackEmpty_> stack_empty,
     std::integral_constant<bool, AllowComments_> allow_comments,
     /*std::integral_constant<bool, AllowTrailing_>*/ bool allow_trailing,
-    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8)
+    /*std::integral_constant<bool, AllowBadUTF8_>*/ bool allow_bad_utf8,
+    bool allow_bad_utf16)
 {
     detail::const_stream_wrapper cs(p, end_);
     std::size_t size;
@@ -1964,7 +1931,7 @@ parse_array(const char* p,
         }
 do_arr3:
         // array is not empty, value required
-        cs = parse_value(cs.begin(), stack_empty, allow_comments, allow_trailing, allow_bad_utf8);
+        cs = parse_value(cs.begin(), stack_empty, allow_comments, allow_trailing, allow_bad_utf8, allow_bad_utf16);
         if(BOOST_JSON_UNLIKELY(incomplete(cs)))
             return suspend_or_fail(state::arr3, size);
 do_arr4:
@@ -2065,7 +2032,8 @@ parse_number(const char* p,
                 if( negative && n1 == 0 && opt_.allow_infinity_and_nan )
                 {
                     return parse_literal(
-                        p - 1, mp11::mp_int<detail::neg_infinity_literal>());
+                        p - 1,
+                        detail::literals_c<detail::literals::neg_infinity>());
                 }
 
                 if( ! nonzero_first && n1 == 0 )
@@ -2212,10 +2180,10 @@ parse_number(const char* p,
         else if( (negative || num.neg) && opt_.allow_infinity_and_nan )
         {
             st_.push(state::lit1);
-            cur_lit_ = detail::neg_infinity_literal;
+            cur_lit_ = literal_index(detail::literals::neg_infinity);
             lit_offset_ = 1;
             return parse_literal(
-                cs.begin(), mp11::mp_int<detail::resume_literal>() );
+                cs.begin(), detail::literals_c<detail::literals::resume>() );
         }
         else
         {
@@ -2818,7 +2786,7 @@ reset() noexcept
 template<class Handler>
 void
 basic_parser<Handler>::
-fail(error_code ec) noexcept
+fail(system::error_code ec) noexcept
 {
     if(! ec)
     {
@@ -2842,7 +2810,7 @@ write_some(
     bool more,
     char const* data,
     std::size_t size,
-    error_code& ec)
+    system::error_code& ec)
 {
     // see if we exited via exception
     // on the last call to write_some
@@ -2929,7 +2897,7 @@ write_some(
     std::size_t size,
     std::error_code& ec)
 {
-    error_code jec;
+    system::error_code jec;
     std::size_t const result = write_some(more, data, size, jec);
     ec = jec;
     return result;
diff --git a/inst/include/boost/json/conversion.hpp b/inst/include/boost/json/conversion.hpp
index 96a3a14db..1d30b3a29 100644
--- a/inst/include/boost/json/conversion.hpp
+++ b/inst/include/boost/json/conversion.hpp
@@ -102,6 +102,49 @@ struct try_value_to_tag { };
 template<class T>
 struct is_string_like;
 
+/** Determine if `T` can be treated like `std::filesystem::path` during conversions.
+
+    Given `t`, a glvalue of type `T`, if
+
+    @li given `It`, the type denoted by `decltype(std::begin(t))`,
+        <tt>std::iterator_traits<It>::iterator_category</tt> is well-formed and
+        denotes a type; and
+
+    @li <tt>std::iterator_traits<It>::value_type</tt> is `T`; and
+
+    @li `T::value_type` is well-formed and denotes a type; and
+
+    @li `T::string_type` is well-formed, denotes a type, and is an alias for
+    `std::basic_string< T::value_type >`;
+
+    then the trait provides the member constant `value` that is equal to
+    `true`. Otherwise, `value` is equal to `false`.<br>
+
+    Users can specialize the trait for their own types if they don't want them
+    to be treated like filesystem paths. For example:
+
+    @code
+    namespace boost {
+    namespace json {
+
+    template <>
+    struct is_path_like<your::path> : std::false_type
+    { };
+
+    } // namespace boost
+    } // namespace json
+    @endcode
+
+
+    @par Types satisfying the trait
+
+    `std::filesystem::path`, `boost::filesystem::path`.
+
+    @see @ref value_from, @ref value_to
+*/
+template<class T>
+struct is_path_like;
+
 /** Determine if `T` can be treated like a sequence during conversions.
 
     Given `t`, a glvalue of type `T`, if
@@ -110,7 +153,9 @@ struct is_string_like;
         <tt>std::iterator_traits<It>::iterator_category</tt> is well-formed and
         denotes a type; and
 
-    @li `decltype(std::end(t))` also denotes the type `It`;
+    @li `decltype(std::end(t))` also denotes the type `It`; and
+
+    @li <tt>std::iterator_traits<It>::value_type</tt> is not `T`; and
 
     then the trait provides the member constant `value` that is equal to
     `true`. Otherwise, `value` is equal to `false`.<br>
@@ -257,7 +302,7 @@ struct is_null_like
 /** Determine if `T` should be treated as a described class
 
     Described classes are serialised as objects with an element for each
-    described public data member. A described class should not have described
+    described data member. A described class should not have described
     bases or non-public members.<br>
 
     Or more formally, given `L`, a class template
@@ -290,10 +335,10 @@ struct is_null_like
     @endcode
 
     Users can also specialize the trait for their own types _with_ described
-    bases to enable this conversion implementation. In this case the class will
-    be serialized in a flattened way, that is members of bases will be
-    serialized as direct elements of the object, and no nested objects will be
-    created for bases.
+    bases or described non-public data members to enable this conversion
+    implementation. In this case the class will be serialized in a flattened
+    way, that is members of bases will be serialized as direct elements of the
+    object, and no nested objects will be created for bases.
 
     @see <a href="https://www.boost.org/doc/libs/develop/libs/describe/doc/html/describe.html">Boost.Describe</a>.
 */
diff --git a/inst/include/boost/json/detail/charconv/detail/fast_float/ascii_number.hpp b/inst/include/boost/json/detail/charconv/detail/fast_float/ascii_number.hpp
index bec6402d4..ede558612 100644
--- a/inst/include/boost/json/detail/charconv/detail/fast_float/ascii_number.hpp
+++ b/inst/include/boost/json/detail/charconv/detail/fast_float/ascii_number.hpp
@@ -8,6 +8,7 @@
 #ifndef BOOST_JSON_DETAIL_CHARCONV_DETAIL_FASTFLOAT_ASCII_NUMBER_HPP
 #define BOOST_JSON_DETAIL_CHARCONV_DETAIL_FASTFLOAT_ASCII_NUMBER_HPP
 
+#include <boost/endian/conversion.hpp>
 #include <boost/json/detail/charconv/detail/fast_float/float_common.hpp>
 #include <cctype>
 #include <cstdint>
@@ -46,10 +47,7 @@ uint64_t read_u64(const char *chars) {
   }
   uint64_t val;
   ::memcpy(&val, chars, sizeof(uint64_t));
-#ifdef BOOST_JSON_BIG_ENDIAN
-  // Need to read as-if the number was in little-endian order.
-  val = byteswap(val);
-#endif
+  endian::little_to_native_inplace(val);
   return val;
 }
 
@@ -63,10 +61,7 @@ void write_u64(uint8_t *chars, uint64_t val) {
     }
     return;
   }
-#ifdef BOOST_JSON_BIG_ENDIAN
-  // Need to read as-if the number was in little-endian order.
-  val = byteswap(val);
-#endif
+  endian::native_to_little_inplace(val);
   ::memcpy(chars, &val, sizeof(uint64_t));
 }
 
diff --git a/inst/include/boost/json/detail/charconv/detail/fast_float/float_common.hpp b/inst/include/boost/json/detail/charconv/detail/fast_float/float_common.hpp
index 49ba417f1..ef3114005 100644
--- a/inst/include/boost/json/detail/charconv/detail/fast_float/float_common.hpp
+++ b/inst/include/boost/json/detail/charconv/detail/fast_float/float_common.hpp
@@ -207,7 +207,8 @@ value128 full_multiplication(uint64_t a, uint64_t b) {
   // But MinGW on ARM64 doesn't have native support for 64-bit multiplications
   answer.high = __umulh(a, b);
   answer.low = a * b;
-#elif defined(BOOST_JSON_FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__))
+#elif defined(BOOST_JSON_FASTFLOAT_32BIT) ||                            \
+    (defined(_WIN64) && !defined(__clang__) && !defined(_M_ARM64))
   unsigned long long high;
   answer.low = _umul128(a, b, &high); // _umul128 not available on ARM64
   answer.high = static_cast<uint64_t>(high);
diff --git a/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp b/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp
index a4944a287..f3cb49a93 100644
--- a/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp
+++ b/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp
@@ -30,7 +30,7 @@ namespace detail {
 
 #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
 template <typename T, typename UC>
@@ -128,10 +128,10 @@ BOOST_FORCEINLINE bool rounds_to_nearest() noexcept {
   //  see https://stackoverflow.com/questions/46079446/is-there-a-warning-for-floating-point-equality-checking-in-visual-studio-2013
   #elif defined(__clang__)
   #   pragma clang diagnostic push
-  #   pragma clang diagnostic ignored "-Wfloat-equal"
+//  #   pragma clang diagnostic ignored "-Wfloat-equal"
   #elif defined(__GNUC__)
   #   pragma GCC diagnostic push
-  #   pragma GCC diagnostic ignored "-Wfloat-equal"
+//  #   pragma GCC diagnostic ignored "-Wfloat-equal"
   #endif
   return (fmini + 1.0f == 1.0f - fmini);
   #ifdef BOOST_JSON_FASTFLOAT_VISUAL_STUDIO
diff --git a/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp b/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp
index 6ca5a2508..dc9bede0f 100644
--- a/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp
+++ b/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp
@@ -22,7 +22,7 @@ namespace boost { namespace json { namespace detail { namespace charconv { names
 # pragma warning(disable: 4244) // Implict converion when BOOST_IF_CONSTEXPR expands to if
 #elif defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
 template <typename T>
diff --git a/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp b/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp
index f709ab7e7..f559736be 100644
--- a/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp
+++ b/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp
@@ -51,15 +51,15 @@ constexpr unsigned char digit_from_char(char val) noexcept
 
 #elif defined(__clang__)
 # pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wconstant-conversion"
+//# pragma clang diagnostic ignored "-Wconstant-conversion"
 
 #elif defined(__GNUC__) && (__GNUC__ < 7)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Woverflow"
+//# pragma GCC diagnostic ignored "-Woverflow"
 
 #elif defined(__GNUC__) && (__GNUC__ >= 7)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 
 #endif
 
diff --git a/inst/include/boost/json/detail/charconv/detail/parser.hpp b/inst/include/boost/json/detail/charconv/detail/parser.hpp
index b24f47faa..c8fc98812 100644
--- a/inst/include/boost/json/detail/charconv/detail/parser.hpp
+++ b/inst/include/boost/json/detail/charconv/detail/parser.hpp
@@ -20,7 +20,7 @@
 
 #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
 namespace boost { namespace json { namespace detail { namespace charconv { namespace detail {
diff --git a/inst/include/boost/json/detail/charconv/impl/from_chars.ipp b/inst/include/boost/json/detail/charconv/impl/from_chars.ipp
index e3ae64828..f012d36c9 100644
--- a/inst/include/boost/json/detail/charconv/impl/from_chars.ipp
+++ b/inst/include/boost/json/detail/charconv/impl/from_chars.ipp
@@ -21,7 +21,7 @@
 #include <cstring>
 
 #if defined(__GNUC__) && __GNUC__ < 5
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
 std::errc boost::json::detail::charconv::detail::errno_to_errc(int errno_value) noexcept
diff --git a/inst/include/boost/json/detail/config.hpp b/inst/include/boost/json/detail/config.hpp
index 46e98d3ca..9b6de0fcb 100644
--- a/inst/include/boost/json/detail/config.hpp
+++ b/inst/include/boost/json/detail/config.hpp
@@ -11,7 +11,9 @@
 #define BOOST_JSON_DETAIL_CONFIG_HPP
 
 #include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
 #include <boost/assert.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <cstdint>
 #include <type_traits>
@@ -26,21 +28,6 @@
 # error Unknown or unsupported architecture, please open an issue
 #endif
 
-// VFALCO Copied from Boost.Config
-//        This is a derivative work.
-#ifndef BOOST_JSON_NODISCARD
-# ifdef __has_cpp_attribute
-// clang-6 accepts [[nodiscard]] with -std=c++14, but warns about it -pedantic
-#  if __has_cpp_attribute(nodiscard) && !(defined(__clang__) && (__cplusplus < 201703L))
-#   define BOOST_JSON_NODISCARD [[nodiscard]]
-#  else
-#   define BOOST_JSON_NODISCARD
-#  endif
-# else
-#  define BOOST_JSON_NODISCARD
-# endif
-#endif
-
 #ifndef BOOST_JSON_REQUIRE_CONST_INIT
 # define BOOST_JSON_REQUIRE_CONST_INIT
 # if __cpp_constinit >= 201907L
@@ -62,66 +49,6 @@
 # endif
 #endif
 
-// BOOST_NORETURN ---------------------------------------------//
-// Macro to use before a function declaration/definition to designate
-// the function as not returning normally (i.e. with a return statement
-// or by leaving the function scope, if the function return type is void).
-#if !defined(BOOST_NORETURN)
-#  if defined(_MSC_VER)
-#    define BOOST_NORETURN __declspec(noreturn)
-#  elif defined(__GNUC__)
-#    define BOOST_NORETURN __attribute__ ((__noreturn__))
-#  elif defined(__has_attribute) && defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x5130)
-#    if __has_attribute(noreturn)
-#      define BOOST_NORETURN [[noreturn]]
-#    endif
-#  elif defined(__has_cpp_attribute)
-#    if __has_cpp_attribute(noreturn)
-#      define BOOST_NORETURN [[noreturn]]
-#    endif
-#  endif
-#endif
-
-#ifndef BOOST_ASSERT
-#define BOOST_ASSERT assert
-#endif
-
-#ifndef BOOST_STATIC_ASSERT
-#define BOOST_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__)
-#endif
-
-#ifndef BOOST_FALLTHROUGH
-#define BOOST_FALLTHROUGH [[fallthrough]]
-#endif
-
-#ifndef BOOST_FORCEINLINE
-# ifdef _MSC_VER
-#  define BOOST_FORCEINLINE __forceinline
-# elif defined(__GNUC__) || defined(__clang__)
-#  define BOOST_FORCEINLINE inline __attribute__((always_inline))
-# else
-#  define BOOST_FORCEINLINE inline
-# endif
-#endif
-
-#ifndef BOOST_NOINLINE
-# ifdef _MSC_VER
-#  define BOOST_NOINLINE __declspec(noinline)
-# elif defined(__GNUC__) || defined(__clang__)
-#  define BOOST_NOINLINE __attribute__((noinline))
-# else
-#  define BOOST_NOINLINE
-# endif
-#endif
-
-#ifndef BOOST_THROW_EXCEPTION
-# ifndef BOOST_NO_EXCEPTIONS
-#  define BOOST_THROW_EXCEPTION(x) throw(x)
-# else
-#  define BOOST_THROW_EXCEPTION(x) do{}while(0)
-# endif
-#endif
-
 #if ! defined(BOOST_JSON_NO_SSE2) && \
     ! defined(BOOST_JSON_USE_SSE2)
 # if (defined(_M_IX86) && _M_IX86_FP == 2) || \
@@ -130,10 +57,6 @@
 # endif
 #endif
 
-#ifndef BOOST_SYMBOL_VISIBLE
-#define BOOST_SYMBOL_VISIBLE
-#endif
-
 #if defined(BOOST_JSON_DOCS)
 # define BOOST_JSON_DECL
 #else
@@ -157,19 +80,11 @@
 #endif
 
 #ifndef BOOST_JSON_LIKELY
-# if defined(__GNUC__) || defined(__clang__)
-#  define BOOST_JSON_LIKELY(x) __builtin_expect(!!(x), 1)
-# else
-#  define BOOST_JSON_LIKELY(x) x
-# endif
+# define BOOST_JSON_LIKELY(x) BOOST_LIKELY( !!(x) )
 #endif
 
 #ifndef BOOST_JSON_UNLIKELY
-# if defined(__GNUC__) || defined(__clang__)
-#  define BOOST_JSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
-# else
-#  define BOOST_JSON_UNLIKELY(x) x
-# endif
+# define BOOST_JSON_UNLIKELY(x) BOOST_UNLIKELY( !!(x) )
 #endif
 
 #ifndef BOOST_JSON_UNREACHABLE
@@ -234,24 +149,6 @@
 # endif
 #endif
 
-
-#if ! defined(BOOST_JSON_BIG_ENDIAN) && ! defined(BOOST_JSON_LITTLE_ENDIAN)
-// Copied from Boost.Endian
-# if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#  define BOOST_JSON_LITTLE_ENDIAN
-# elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#  define BOOST_JSON_BIG_ENDIAN
-# elif defined(__LITTLE_ENDIAN__)
-#  define BOOST_JSON_LITTLE_ENDIAN
-# elif defined(__BIG_ENDIAN__)
-#  define BOOST_JSON_BIG_ENDIAN
-# elif defined(_MSC_VER) || defined(__i386__) || defined(__x86_64__)
-#  define BOOST_JSON_LITTLE_ENDIAN
-# else
-#  error The Boost.JSON library could not determine the endianness of this platform. Define either BOOST_JSON_BIG_ENDIAN or BOOST_JSON_LITTLE_ENDIAN.
-# endif
-#endif
-
 #if defined(__cpp_constinit) && __cpp_constinit >= 201907L
 # define BOOST_JSON_CONSTINIT constinit
 #elif defined(__has_cpp_attribute) && defined(__clang__)
@@ -320,4 +217,24 @@ constexpr T static_const<T>::value;
 } // namespace json
 } // namespace boost
 
+#ifndef BOOST_JSON_ALLOW_DEPRECATED
+# ifdef BOOST_ALLOW_DEPRECATED
+#  define BOOST_JSON_ALLOW_DEPRECATED
+# endif
+#endif
+
+#if defined(BOOST_GCC) && BOOST_GCC < 50000 && !defined(BOOST_JSON_ALLOW_DEPRECATED)
+# pragma GCC warning "Support for GCC versions below 5.0 is deprecated and will stop in Boost 1.88.0. To suppress this message define macro BOOST_JSON_ALLOW_DEPRECATED."
+#endif
+
+#ifndef BOOST_JSON_ALLOW_DEPRECATED
+# define BOOST_JSON_DEPRECATED(x) BOOST_DEPRECATED(x)
+#else
+# define BOOST_JSON_DEPRECATED(x)
+#endif
+
+#ifndef BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS
+#include <boost/json/detail/gdb_printers.hpp>
+#endif
+
 #endif
diff --git a/inst/include/boost/json/detail/default_resource.hpp b/inst/include/boost/json/detail/default_resource.hpp
index 1f189e44c..08b986225 100644
--- a/inst/include/boost/json/detail/default_resource.hpp
+++ b/inst/include/boost/json/detail/default_resource.hpp
@@ -11,7 +11,7 @@
 #define BOOST_JSON_DEFAULT_RESOURCE_HPP
 
 #include <boost/json/detail/config.hpp>
-#include <new>
+#include <boost/container/pmr/memory_resource.hpp>
 
 namespace boost {
 namespace json {
@@ -28,7 +28,7 @@ class
     BOOST_SYMBOL_VISIBLE
     BOOST_JSON_DECL
 default_resource final
-    : public memory_resource
+    : public container::pmr::memory_resource
 {
     union holder;
 
@@ -43,7 +43,7 @@ default_resource final
 
 public:
     static
-    memory_resource*
+    container::pmr::memory_resource*
     get() noexcept
     {
     #ifdef BOOST_JSON_WEAK_CONSTINIT
diff --git a/inst/include/boost/json/detail/except.hpp b/inst/include/boost/json/detail/except.hpp
index cdaf3f38f..ff8b0e32c 100644
--- a/inst/include/boost/json/detail/except.hpp
+++ b/inst/include/boost/json/detail/except.hpp
@@ -24,7 +24,7 @@ BOOST_JSON_DECL
 void
 BOOST_NORETURN
 throw_system_error(
-    error_code const& ec,
+    system::error_code const& ec,
     source_location const& loc = BOOST_CURRENT_LOCATION);
 
 BOOST_JSON_DECL
diff --git a/inst/include/boost/json/detail/gdb_printers.hpp b/inst/include/boost/json/detail/gdb_printers.hpp
new file mode 100644
index 000000000..6307379d2
--- /dev/null
+++ b/inst/include/boost/json/detail/gdb_printers.hpp
@@ -0,0 +1,344 @@
+// 
+//  Copyright (c) 2024 Dmitry Arkhipov (grisumbras@yandex.ru)
+// 
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// 
+//  Official repository: https://github.com/boostorg/json
+// 
+
+// Autogenerated from boost_json_gdb_printers.py by boost-pretty-printers
+
+#ifndef BOOST_JSON_DETAIL_GDB_PRINTERS_HPP
+#define BOOST_JSON_DETAIL_GDB_PRINTERS_HPP
+
+#if defined(__ELF__)
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+//# pragma clang diagnostic ignored "-Woverlength-strings"
+#elif defined(__GNUC__)
+# pragma GCC diagnostic push
+//# pragma GCC diagnostic ignored "-Woverlength-strings"
+#endif
+
+__asm__(
+  ".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+  ".ascii \"\\4gdb.inlined-script.BOOST_JSON_DETAIL_GDB_PRINTERS_HPP\\n\"\n"
+  ".ascii \"import gdb\\n\"\n"
+  ".ascii \"import gdb.printing\\n\"\n"
+
+
+  ".ascii \"class PrettyPrinterBuilder():\\n\"\n"
+  ".ascii \"    '''decorator that accumulates pretty printers for types'''\\n\"\n"
+
+  ".ascii \"    def __init__(self, name=None):\\n\"\n"
+  ".ascii \"        self.result = gdb.printing.RegexpCollectionPrettyPrinter(\\n\"\n"
+  ".ascii \"            name or 'Boost.JSON')\\n\"\n"
+
+  ".ascii \"    def __call__(self, pp=None, ns=None, template=False):\\n\"\n"
+  ".ascii \"        if pp is None:\\n\"\n"
+  ".ascii \"            def decorator(pp):\\n\"\n"
+  ".ascii \"                return self(pp, ns=ns, template=template)\\n\"\n"
+  ".ascii \"            return decorator\\n\"\n"
+
+  ".ascii \"        typename = getattr(pp, '__name__')\\n\"\n"
+  ".ascii \"        ns = ns or 'boost::json'\\n\"\n"
+  ".ascii \"        self.result.add_printer(\\n\"\n"
+  ".ascii \"            typename,\\n\"\n"
+  ".ascii \"            '^{ns}::{typename}{marker}'.format(\\n\"\n"
+  ".ascii \"                ns=ns,\\n\"\n"
+  ".ascii \"                typename=typename,\\n\"\n"
+  ".ascii \"                marker='<'if template else '$'),\\n\"\n"
+  ".ascii \"            pp)\\n\"\n"
+  ".ascii \"        return pp\\n\"\n"
+
+  ".ascii \"pretty_printer = PrettyPrinterBuilder()\\n\"\n"
+
+
+  ".ascii \"class static_property:\\n\"\n"
+  ".ascii \"    '''decorator for lazy evaluation of static members'''\\n\"\n"
+
+  ".ascii \"    def __init__(self, wrapped):\\n\"\n"
+  ".ascii \"        self.wrapped = wrapped\\n\"\n"
+  ".ascii \"        self.__name__ = wrapped.__name__\\n\"\n"
+  ".ascii \"        self.__doc__ = wrapped.__doc__\\n\"\n"
+
+  ".ascii \"    def __get__(self, inst, objtype=None):\\n\"\n"
+  ".ascii \"        val = self.wrapped()\\n\"\n"
+  ".ascii \"        if objtype is not None:\\n\"\n"
+  ".ascii \"            setattr(objtype, self.wrapped.__name__, val)\\n\"\n"
+  ".ascii \"        return val\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class storage_ptr:\\n\"\n"
+  ".ascii \"    '''boost::json::storage_ptr pretty printer'''\\n\"\n"
+
+  ".ascii \"    @static_property\\n\"\n"
+  ".ascii \"    def _size_t():\\n\"\n"
+  ".ascii \"        return gdb.lookup_type('std::size_t')\\n\"\n"
+
+  ".ascii \"    @static_property\\n\"\n"
+  ".ascii \"    def _shared_resource_ptr():\\n\"\n"
+  ".ascii \"        return gdb.lookup_type(\\n\"\n"
+  ".ascii \"            'boost::json::detail::shared_resource').pointer()\\n\"\n"
+
+  ".ascii \"    @static_property\\n\"\n"
+  ".ascii \"    def _memory_resource_ptr():\\n\"\n"
+  ".ascii \"        return gdb.lookup_type(\\n\"\n"
+  ".ascii \"            'boost::container::pmr::memory_resource').pointer()\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val['i_']\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        items = []\\n\"\n"
+
+  ".ascii \"        if bool(self.val & 2):\\n\"\n"
+  ".ascii \"            items.append('trivial')\\n\"\n"
+  ".ascii \"        shared = bool(self.val & 1)\\n\"\n"
+  ".ascii \"        if shared:\\n\"\n"
+  ".ascii \"            items.append('shared')\\n\"\n"
+
+  ".ascii \"        pointer = self.val & ~3\\n\"\n"
+  ".ascii \"        if not pointer:\\n\"\n"
+  ".ascii \"            items.append('resource=default')\\n\"\n"
+  ".ascii \"        else:\\n\"\n"
+  ".ascii \"            if shared:\\n\"\n"
+  ".ascii \"                resource = pointer.cast(\\n\"\n"
+  ".ascii \"                    self._shared_resource_ptr).dereference()\\n\"\n"
+  ".ascii \"                impl_t = resource.dynamic_type\\n\"\n"
+  ".ascii \"                impl_ptr = impl_t.pointer()\\n\"\n"
+  ".ascii \"                resource = resource.address.cast(impl_ptr).dereference()\\n\"\n"
+
+  ".ascii \"                items.append(\\n\"\n"
+  ".ascii \"                    'refs=%s' % resource['refs'].cast(self._size_t))\\n\"\n"
+
+  ".ascii \"                resource = resource['t']\\n\"\n"
+  ".ascii \"            else:\\n\"\n"
+  ".ascii \"                resource = pointer.cast(\\n\"\n"
+  ".ascii \"                    self._memory_resource_ptr).dereference()\\n\"\n"
+
+
+  ".ascii \"            derived_t = resource.dynamic_type\\n\"\n"
+  ".ascii \"            derived_ptr = derived_t.pointer()\\n\"\n"
+  ".ascii \"            resource = resource.address.cast(derived_ptr).dereference()\\n\"\n"
+  ".ascii \"            items.append('resource=%s' % resource)\\n\"\n"
+
+  ".ascii \"        return 'storage_ptr [' + ', '.join(items) + ']'\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class monotonic_resource:\\n\"\n"
+  ".ascii \"    '''boost::json::monotonic_resource pretty printer'''\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        buffer = self.val['buffer_']\\n\"\n"
+  ".ascii \"        buffer = buffer['p'] - ( int(buffer['size']) - int(buffer['avail']) )\\n\"\n"
+
+  ".ascii \"        head = self.val['head_'].dereference()\\n\"\n"
+
+  ".ascii \"        block = head['p'] - ( int(head['size']) - int(head['avail']) )\\n\"\n"
+
+  ".ascii \"        upstream = self.val['upstream_']\\n\"\n"
+
+  ".ascii \"        items = []\\n\"\n"
+  ".ascii \"        items.append('buffer=%s' % buffer)\\n\"\n"
+  ".ascii \"        items.append('block=%s' % block)\\n\"\n"
+  ".ascii \"        items.append('head=%s' % head['p'])\\n\"\n"
+  ".ascii \"        items.append('free=%s' % head['avail'])\\n\"\n"
+  ".ascii \"        if upstream['i_'] != 0:\\n\"\n"
+  ".ascii \"            items.append('upstream=%s' % upstream)\\n\"\n"
+
+  ".ascii \"        return 'monotonic_resource [%s]' % ', '.join(items)\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class static_resource:\\n\"\n"
+  ".ascii \"    '''boost::json::static_resource pretty printer'''\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        buf = self.val['p_'] - ( int(self.val['size_']) - int(self.val['n_']) )\\n\"\n"
+  ".ascii \"        return 'static_resource [buffer=%s, head=%s, free=%s]' % (\\n\"\n"
+  ".ascii \"            buf, self.val['p_'], self.val['n_'])\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class string:\\n\"\n"
+  ".ascii \"    '''boost::json::string pretty printer'''\\n\"\n"
+
+  ".ascii \"    @static_property\\n\"\n"
+  ".ascii \"    def _char_const_ptr():\\n\"\n"
+  ".ascii \"        return gdb.lookup_type('char').const().pointer()\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.impl = val['impl_']\\n\"\n"
+
+  ".ascii \"    def display_hint(self):\\n\"\n"
+  ".ascii \"        return 'string'\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        kind = self.impl['s_']['k']\\n\"\n"
+  ".ascii \"        if kind == self.impl['short_string_']:\\n\"\n"
+  ".ascii \"            sbo_size = self.impl['sbo_chars_']\\n\"\n"
+  ".ascii \"            size = sbo_size - self.impl['s_']['buf'][sbo_size]\\n\"\n"
+  ".ascii \"            pointer = self.impl['s_']['buf']\\n\"\n"
+  ".ascii \"        elif kind == self.impl['key_string_']:\\n\"\n"
+  ".ascii \"            size = self.impl['k_']['n']\\n\"\n"
+  ".ascii \"            pointer = self.impl['k_']['s']\\n\"\n"
+  ".ascii \"        else:\\n\"\n"
+  ".ascii \"            size = self.impl['p_']['t'].dereference()['size']\\n\"\n"
+  ".ascii \"            pointer = self.impl['p_']['t']\\n\"\n"
+  ".ascii \"            pointer += 1\\n\"\n"
+  ".ascii \"            pointer = pointer.cast(self._char_const_ptr)\\n\"\n"
+  ".ascii \"        return pointer.lazy_string(length=size)\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class array:\\n\"\n"
+  ".ascii \"    '''boost::json::array pretty printer'''\\n\"\n"
+
+  ".ascii \"    @static_property\\n\"\n"
+  ".ascii \"    def _value_ptr():\\n\"\n"
+  ".ascii \"        return gdb.lookup_type('boost::json::value').pointer()\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val\\n\"\n"
+
+  ".ascii \"    def display_hint(self):\\n\"\n"
+  ".ascii \"        return 'array'\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        capacity = int(self.val['t_'].dereference()['capacity'])\\n\"\n"
+  ".ascii \"        return 'array [size={0}, capacity={1}]'.format(\\n\"\n"
+  ".ascii \"            self.num_children(), capacity)\\n\"\n"
+
+  ".ascii \"    def num_children(self):\\n\"\n"
+  ".ascii \"        return int(self.val['t_'].dereference()['size'])\\n\"\n"
+
+  ".ascii \"    def children(self):\\n\"\n"
+  ".ascii \"        for i in range(0, self.num_children()):\\n\"\n"
+  ".ascii \"            yield self.child(i)\\n\"\n"
+
+  ".ascii \"    def child(self, n):\\n\"\n"
+  ".ascii \"        table = (self.val['t_'] + 1).cast(self._value_ptr)\\n\"\n"
+  ".ascii \"        return str(n), table[n]\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class key_value_pair:\\n\"\n"
+  ".ascii \"    '''boost::json::key_value_pair pretty printer'''\\n\"\n"
+
+  ".ascii \"    @staticmethod\\n\"\n"
+  ".ascii \"    def _pair(kv):\\n\"\n"
+  ".ascii \"        return kv['key_'].lazy_string(length=kv['len_']), kv['value_']\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        k, v = self._pair(self.val)\\n\"\n"
+  ".ascii \"        return '[%s] = %s' % (k.value(), v)\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class object:\\n\"\n"
+  ".ascii \"    '''boost::json::object pretty printer'''\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val\\n\"\n"
+  ".ascii \"        self.kv_ptr = gdb.lookup_type('boost::json::key_value_pair').pointer()\\n\"\n"
+
+  ".ascii \"    def display_hint(self):\\n\"\n"
+  ".ascii \"        return 'map'\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        capacity = int(self.val['t_'].dereference()['capacity'])\\n\"\n"
+  ".ascii \"        return 'object [size={}, capacity={}]'.format(\\n\"\n"
+  ".ascii \"            self.num_children(), capacity)\\n\"\n"
+
+  ".ascii \"    def num_children(self):\\n\"\n"
+  ".ascii \"        return int(self.val['t_'].dereference()['size'])\\n\"\n"
+
+  ".ascii \"    def children(self):\\n\"\n"
+  ".ascii \"        table = (self.val['t_'] + 1).cast(self.kv_ptr)\\n\"\n"
+  ".ascii \"        for i in range(0, self.num_children()):\\n\"\n"
+  ".ascii \"            k, v = key_value_pair._pair(table[i])\\n\"\n"
+  ".ascii \"            yield str(2 * i), k\\n\"\n"
+  ".ascii \"            yield str(2 * i + 1), v\\n\"\n"
+
+
+  ".ascii \"@pretty_printer\\n\"\n"
+  ".ascii \"class value:\\n\"\n"
+  ".ascii \"    '''boost::json::value pretty printer'''\\n\"\n"
+
+  ".ascii \"    @static_property\\n\"\n"
+  ".ascii \"    def _kind_t():\\n\"\n"
+  ".ascii \"        result = gdb.lookup_type('boost::json::kind')\\n\"\n"
+  ".ascii \"        return dict(result.items())\\n\"\n"
+
+  ".ascii \"    def __init__(self, val):\\n\"\n"
+  ".ascii \"        self.val = val\\n\"\n"
+
+  ".ascii \"    def to_string(self):\\n\"\n"
+  ".ascii \"        kind = self.val['sca_']['k']\\n\"\n"
+
+  ".ascii \"        if self._compare_kind(kind, 'null'):\\n\"\n"
+  ".ascii \"            return 'null'\\n\"\n"
+
+  ".ascii \"        elif self._compare_kind(kind, 'bool_'):\\n\"\n"
+  ".ascii \"            return self.val['sca_']['b']\\n\"\n"
+
+  ".ascii \"        elif self._compare_kind(kind, 'int64'):\\n\"\n"
+  ".ascii \"            return self.val['sca_']['i']\\n\"\n"
+
+  ".ascii \"        elif self._compare_kind(kind, 'uint64'):\\n\"\n"
+  ".ascii \"            return self.val['sca_']['u']\\n\"\n"
+
+  ".ascii \"        elif self._compare_kind(kind, 'double_'):\\n\"\n"
+  ".ascii \"            return self.val['sca_']['d']\\n\"\n"
+
+  ".ascii \"        elif self._compare_kind(kind, 'array'):\\n\"\n"
+  ".ascii \"            return self.val['arr_']\\n\"\n"
+
+  ".ascii \"        elif self._compare_kind(kind, 'object'):\\n\"\n"
+  ".ascii \"            return self.val['obj_']\\n\"\n"
+
+  ".ascii \"        else:\\n\"\n"
+  ".ascii \"            return self.val['str_']\\n\"\n"
+
+  ".ascii \"    def _compare_kind(self, kind, name):\\n\"\n"
+  ".ascii \"        return kind == self._kind_t['boost::json::kind::' + name].enumval\\n\"\n"
+
+
+  ".ascii \"def register(obj_file):\\n\"\n"
+  ".ascii \"    mod = obj_file or gdb\\n\"\n"
+  ".ascii \"    for printer in getattr(mod, 'pretty_printers', []):\\n\"\n"
+  ".ascii \"        if getattr(printer, 'name') == pretty_printer.result.name:\\n\"\n"
+  ".ascii \"            return\\n\"\n"
+
+  ".ascii \"    gdb.printing.register_pretty_printer(\\n\"\n"
+  ".ascii \"        obj_file,\\n\"\n"
+  ".ascii \"        pretty_printer.result)\\n\"\n"
+
+
+  ".ascii \"if __name__ == '__main__':\\n\"\n"
+  ".ascii \"    register(gdb.current_objfile())\\n\"\n"
+  ".byte 0\n"
+  ".popsection\n");
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#  pragma GCC diagnostic pop
+#endif
+
+#endif // defined(__ELF__)
+
+#endif // BOOST_JSON_DETAIL_GDB_PRINTERS_HPP
diff --git a/inst/include/boost/json/detail/handler.hpp b/inst/include/boost/json/detail/handler.hpp
index 168eec29f..47c8d4eee 100644
--- a/inst/include/boost/json/detail/handler.hpp
+++ b/inst/include/boost/json/detail/handler.hpp
@@ -41,24 +41,24 @@ struct handler
     explicit
     handler(Args&&... args);
 
-    inline bool on_document_begin(error_code& ec);
-    inline bool on_document_end(error_code& ec);
-    inline bool on_object_begin(error_code& ec);
-    inline bool on_object_end(std::size_t n, error_code& ec);
-    inline bool on_array_begin(error_code& ec);
-    inline bool on_array_end(std::size_t n, error_code& ec);
-    inline bool on_key_part(string_view s, std::size_t n, error_code& ec);
-    inline bool on_key(string_view s, std::size_t n, error_code& ec);
-    inline bool on_string_part(string_view s, std::size_t n, error_code& ec);
-    inline bool on_string(string_view s, std::size_t n, error_code& ec);
-    inline bool on_number_part(string_view, error_code&);
-    inline bool on_int64(std::int64_t i, string_view, error_code& ec);
-    inline bool on_uint64(std::uint64_t u, string_view, error_code& ec);
-    inline bool on_double(double d, string_view, error_code& ec);
-    inline bool on_bool(bool b, error_code& ec);
-    inline bool on_null(error_code& ec);
-    inline bool on_comment_part(string_view, error_code&);
-    inline bool on_comment(string_view, error_code&);
+    inline bool on_document_begin(system::error_code& ec);
+    inline bool on_document_end(system::error_code& ec);
+    inline bool on_object_begin(system::error_code& ec);
+    inline bool on_object_end(std::size_t n, system::error_code& ec);
+    inline bool on_array_begin(system::error_code& ec);
+    inline bool on_array_end(std::size_t n, system::error_code& ec);
+    inline bool on_key_part(string_view s, std::size_t n, system::error_code& ec);
+    inline bool on_key(string_view s, std::size_t n, system::error_code& ec);
+    inline bool on_string_part(string_view s, std::size_t n, system::error_code& ec);
+    inline bool on_string(string_view s, std::size_t n, system::error_code& ec);
+    inline bool on_number_part(string_view, system::error_code&);
+    inline bool on_int64(std::int64_t i, string_view, system::error_code& ec);
+    inline bool on_uint64(std::uint64_t u, string_view, system::error_code& ec);
+    inline bool on_double(double d, string_view, system::error_code& ec);
+    inline bool on_bool(bool b, system::error_code& ec);
+    inline bool on_null(system::error_code& ec);
+    inline bool on_comment_part(string_view, system::error_code&);
+    inline bool on_comment(string_view, system::error_code&);
 };
 
 } // detail
diff --git a/inst/include/boost/json/detail/impl/except.ipp b/inst/include/boost/json/detail/impl/except.ipp
index 72f7a7f8c..103892bc3 100644
--- a/inst/include/boost/json/detail/impl/except.ipp
+++ b/inst/include/boost/json/detail/impl/except.ipp
@@ -22,11 +22,11 @@ namespace detail {
 
 void
 throw_system_error(
-    error_code const& ec,
+    system::error_code const& ec,
     source_location const& loc)
 {
     throw_exception(
-        system_error(ec),
+        system::system_error(ec),
         loc);
 }
 
@@ -35,11 +35,11 @@ throw_system_error(
     error e,
     source_location const* loc)
 {
-    error_code ec;
+    system::error_code ec;
     ec.assign(e, loc);
 
     throw_exception(
-        system_error(ec),
+        system::system_error(ec),
         *loc);
 }
 
diff --git a/inst/include/boost/json/detail/impl/handler.ipp b/inst/include/boost/json/detail/impl/handler.ipp
index a377d6426..51229a952 100644
--- a/inst/include/boost/json/detail/impl/handler.ipp
+++ b/inst/include/boost/json/detail/impl/handler.ipp
@@ -27,7 +27,7 @@ handler(Args&&... args)
 bool
 handler::
 on_document_begin(
-    error_code&)
+    system::error_code&)
 {
     return true;
 }
@@ -35,7 +35,7 @@ on_document_begin(
 bool
 handler::
 on_document_end(
-    error_code&)
+    system::error_code&)
 {
     return true;
 }
@@ -43,7 +43,7 @@ on_document_end(
 bool
 handler::
 on_object_begin(
-    error_code&)
+    system::error_code&)
 {
     return true;
 }
@@ -52,7 +52,7 @@ bool
 handler::
 on_object_end(
     std::size_t n,
-    error_code&)
+    system::error_code&)
 {
     st.push_object(n);
     return true;
@@ -61,7 +61,7 @@ on_object_end(
 bool
 handler::
 on_array_begin(
-    error_code&)
+    system::error_code&)
 {
     return true;
 }
@@ -70,7 +70,7 @@ bool
 handler::
 on_array_end(
     std::size_t n,
-    error_code&)
+    system::error_code&)
 {
     st.push_array(n);
     return true;
@@ -81,29 +81,29 @@ handler::
 on_key_part(
     string_view s,
     std::size_t,
-    error_code&)
+    system::error_code&)
 {
     st.push_chars(s);
     return true;
 }
-        
+
 bool
 handler::
 on_key(
     string_view s,
     std::size_t,
-    error_code&)
+    system::error_code&)
 {
     st.push_key(s);
     return true;
 }
-        
+
 bool
 handler::
 on_string_part(
     string_view s,
-    std::size_t, 
-    error_code&)
+    std::size_t,
+    system::error_code&)
 {
     st.push_chars(s);
     return true;
@@ -113,8 +113,8 @@ bool
 handler::
 on_string(
     string_view s,
-    std::size_t, 
-    error_code&)
+    std::size_t,
+    system::error_code&)
 {
     st.push_string(s);
     return true;
@@ -124,7 +124,7 @@ bool
 handler::
 on_number_part(
     string_view,
-    error_code&)
+    system::error_code&)
 {
     return true;
 }
@@ -134,18 +134,18 @@ handler::
 on_int64(
     std::int64_t i,
     string_view,
-    error_code&)
+    system::error_code&)
 {
     st.push_int64(i);
     return true;
 }
-        
+
 bool
 handler::
 on_uint64(
     std::uint64_t u,
     string_view,
-    error_code&)
+    system::error_code&)
 {
     st.push_uint64(u);
     return true;
@@ -156,17 +156,17 @@ handler::
 on_double(
     double d,
     string_view,
-    error_code&)
+    system::error_code&)
 {
     st.push_double(d);
     return true;
 }
-        
+
 bool
 handler::
 on_bool(
     bool b,
-    error_code&)
+    system::error_code&)
 {
     st.push_bool(b);
     return true;
@@ -174,7 +174,7 @@ on_bool(
 
 bool
 handler::
-on_null(error_code&)
+on_null(system::error_code&)
 {
     st.push_null();
     return true;
@@ -184,15 +184,15 @@ bool
 handler::
 on_comment_part(
     string_view,
-    error_code&)
+    system::error_code&)
 {
     return true;
 }
-        
+
 bool
 handler::
 on_comment(
-    string_view, error_code&)
+    string_view, system::error_code&)
 {
     return true;
 }
diff --git a/inst/include/boost/json/detail/impl/stack.hpp b/inst/include/boost/json/detail/impl/stack.hpp
new file mode 100644
index 000000000..5fec6caa4
--- /dev/null
+++ b/inst/include/boost/json/detail/impl/stack.hpp
@@ -0,0 +1,172 @@
+//
+// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/json
+//
+
+#ifndef BOOST_JSON_DETAIL_IMPL_STACK_HPP
+#define BOOST_JSON_DETAIL_IMPL_STACK_HPP
+
+#include <boost/align/align.hpp>
+#include <boost/static_assert.hpp>
+
+namespace boost {
+namespace json {
+namespace detail {
+
+template<>
+struct stack::non_trivial<void>
+{
+    using relocate_t = non_trivial* (*) (non_trivial*, void*);
+
+    relocate_t rel;
+    non_trivial* next;
+    std::size_t offset;
+
+    BOOST_JSON_DECL
+    non_trivial<>*
+    destroy() noexcept;
+
+    BOOST_JSON_DECL
+    non_trivial*
+    relocate(void* dst) noexcept;
+
+protected:
+    ~non_trivial() = default;
+};
+
+template< class T >
+struct stack::non_trivial
+    : stack::non_trivial<void>
+{
+    T obj;
+
+    explicit
+    non_trivial(T t, non_trivial<>* next, std::size_t offset)
+        : non_trivial<void>{relocate, next, offset}, obj( std::move(t) )
+    {}
+
+    static
+    non_trivial<>*
+    relocate(non_trivial<>* src, void* dest) noexcept
+    {
+        non_trivial* self = static_cast<non_trivial*>(src);
+        non_trivial<>* result = nullptr;
+        if( dest )
+            result = ::new(dest) non_trivial( std::move(*self) );
+        self->~non_trivial();
+        return result;
+    }
+};
+
+template<class T>
+void
+stack::
+push_unchecked(T const& t)
+{
+    constexpr std::size_t n = sizeof(T);
+    BOOST_STATIC_ASSERT( is_trivially_copy_assignable<T>::value );
+    BOOST_ASSERT( n <= cap_ - size_ );
+    std::memcpy( base_ + size_, &t, n );
+    size_ += n;
+}
+
+template<class T>
+void
+stack::
+peek(T& t)
+{
+    constexpr std::size_t n = sizeof(T);
+    BOOST_STATIC_ASSERT( is_trivially_copy_assignable<T>::value );
+    BOOST_ASSERT( size_ >= n );
+    std::memcpy( &t, base_ + size_ - n, n );
+}
+
+//--------------------------------------
+
+// trivial
+template<class T>
+void
+stack::
+push(T const& t, std::true_type)
+{
+    if( sizeof(T) > cap_ - size_ )
+        reserve_impl( sizeof(T) + size_ );
+    push_unchecked(t);
+}
+
+// non-trivial
+template<class T>
+void
+stack::
+push(T&& t, std::false_type)
+{
+    BOOST_STATIC_ASSERT( ! is_trivially_copy_assignable<T>::value );
+
+    using Holder = non_trivial< remove_cvref<T> >;
+    constexpr std::size_t size = sizeof(Holder);
+    constexpr std::size_t alignment = alignof(Holder);
+
+    void* ptr;
+    std::size_t offset;
+    do
+    {
+        std::size_t space = cap_ - size_;
+        unsigned char* buf = base_ + size_;
+        ptr = buf;
+        if( alignment::align(alignment, size, ptr, space) )
+        {
+            offset = (reinterpret_cast<unsigned char*>(ptr) - buf) + size;
+            break;
+        }
+
+        reserve_impl(size_ + size + alignment - 1);
+    }
+    while(true);
+    BOOST_ASSERT(
+        (reinterpret_cast<unsigned char*>(ptr) + size - offset) ==
+        (base_ + size_) );
+
+    head_ = ::new(ptr) Holder( static_cast<T&&>(t), head_, offset );
+    size_ += offset;
+}
+
+// trivial
+template<class T>
+void
+stack::
+pop(T& t, std::true_type)
+{
+    BOOST_ASSERT( size_ >= sizeof(T) );
+    peek(t);
+    size_ -= sizeof(T);
+}
+
+// non-trivial
+template<class T>
+void
+stack::
+pop(T& t, std::false_type)
+{
+    auto next = head_->next;
+    auto offset = head_->offset;
+
+    using U = remove_cvref<T>;
+    using Holder = non_trivial<U>;
+    auto const head = static_cast<Holder*>(head_);
+
+    t = std::move( head->obj );
+    head->~Holder();
+
+    head_ = next;
+    size_ -= offset;
+}
+
+} // detail
+} // json
+} // boost
+
+#endif
diff --git a/inst/include/boost/json/detail/impl/stack.ipp b/inst/include/boost/json/detail/impl/stack.ipp
index ab0467821..07b7245e6 100644
--- a/inst/include/boost/json/detail/impl/stack.ipp
+++ b/inst/include/boost/json/detail/impl/stack.ipp
@@ -16,9 +16,25 @@ namespace boost {
 namespace json {
 namespace detail {
 
+stack::non_trivial<>*
+stack::non_trivial<>::destroy() noexcept
+{
+    non_trivial* const result = next;
+    rel(this, nullptr);
+    return result;
+}
+
+stack::non_trivial<>*
+stack::non_trivial<>::relocate(void* dst) noexcept
+{
+    return rel(this, dst);
+}
+
+
 stack::
 ~stack()
 {
+    clear();
     if(base_ != buf_)
         sp_->deallocate(
             base_, cap_);
@@ -38,16 +54,39 @@ stack(
 
 void
 stack::
-reserve(std::size_t n)
+clear() noexcept
 {
-    if(cap_ >= n)
-        return;
-    auto const base = static_cast<
-        unsigned char*>(sp_->allocate(n));
+    while(head_)
+        head_ = head_->destroy();
+    size_ = 0;
+}
+
+void
+stack::
+reserve_impl(std::size_t n)
+{
+    // caller checks this
+    BOOST_ASSERT(n > cap_);
+
+    auto const base = static_cast<unsigned char*>( sp_->allocate(n) );
     if(base_)
     {
-        if(size_ > 0)
-            std::memcpy(base, base_, size_);
+        // copy trivials
+        std::memcpy(base, base_, size_);
+
+        // copy non-trivials
+        non_trivial<>* src = head_;
+        non_trivial<>** prev = &head_;
+        while(src)
+        {
+            std::size_t const buf_offset =
+                reinterpret_cast<unsigned char*>(src) - base_;
+            non_trivial<>* dest = src->relocate(base + buf_offset);
+            *prev = dest;
+            prev = &dest->next;
+            src = dest->next;
+        }
+
         if(base_ != buf_)
             sp_->deallocate(base_, cap_);
     }
diff --git a/inst/include/boost/json/detail/literals.hpp b/inst/include/boost/json/detail/literals.hpp
new file mode 100644
index 000000000..215461e73
--- /dev/null
+++ b/inst/include/boost/json/detail/literals.hpp
@@ -0,0 +1,65 @@
+//
+// Copyright (c) 2024 Dmitry Arkhipov (grisumbras@yandex.ru)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/json
+//
+
+#ifndef BOOST_JSON_DETAIL_LITERALS_HPP
+#define BOOST_JSON_DETAIL_LITERALS_HPP
+
+#include <boost/json/detail/config.hpp>
+#include <boost/mp11/integral.hpp>
+
+namespace boost {
+namespace json {
+namespace detail {
+
+enum class literals
+{
+    null = 0,
+    true_,
+    false_,
+    infinity,
+    neg_infinity,
+    nan,
+    resume,
+};
+
+constexpr char const* literal_strings[] = {
+    "null",
+    "true",
+    "false",
+    "Infinity",
+    "-Infinity",
+    "NaN",
+    "",
+};
+
+constexpr std::size_t literal_sizes[] = {
+    4,
+    4,
+    5,
+    8,
+    9,
+    3,
+    0,
+};
+
+template<literals L>
+using literals_c = std::integral_constant<literals, L>;
+
+constexpr
+unsigned char
+literal_index(literals l)
+{
+    return static_cast<unsigned char>(l);
+}
+
+} // namespace detail
+} // namespace json
+} // namespace boost
+
+#endif // BOOST_JSON_DETAIL_LITERALS_HPP
diff --git a/inst/include/boost/json/detail/parse_into.hpp b/inst/include/boost/json/detail/parse_into.hpp
index 648ceb3d3..ad3fd5541 100644
--- a/inst/include/boost/json/detail/parse_into.hpp
+++ b/inst/include/boost/json/detail/parse_into.hpp
@@ -92,24 +92,24 @@ template<error E> class handler_error_base
 
 public:
 
-    bool on_object_begin( error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_array_begin( error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_array_end( error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_string_part( error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_string( error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_number_part( error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_int64( error_code& ec, std::int64_t ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_uint64( error_code& ec, std::uint64_t ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_double( error_code& ec, double ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_bool( error_code& ec, bool ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_null( error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_object_begin( system::error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_array_begin( system::error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_array_end( system::error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_string_part( system::error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_string( system::error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_number_part( system::error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_int64( system::error_code& ec, std::int64_t ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_uint64( system::error_code& ec, std::uint64_t ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_double( system::error_code& ec, double ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_bool( system::error_code& ec, bool ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_null( system::error_code& ec ) { BOOST_JSON_FAIL( ec, E ); return false; }
 
     // LCOV_EXCL_START
     // parses that can't handle this would fail at on_object_begin
-    bool on_object_end( error_code& ) { BOOST_ASSERT( false ); return false; }
-    bool on_key_part( error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    bool on_key( error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
-    // LCOV_EXCL_START
+    bool on_object_end( system::error_code& ) { BOOST_ASSERT( false ); return false; }
+    bool on_key_part( system::error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    bool on_key( system::error_code& ec, string_view ) { BOOST_JSON_FAIL( ec, E ); return false; }
+    // LCOV_EXCL_STOP
 };
 
 template< class P, error E >
@@ -126,7 +126,7 @@ class scalar_handler
     scalar_handler(P* p): parent_( p )
     {}
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         return parent_->signal_end(ec);
     }
@@ -141,7 +141,7 @@ class composite_handler
     P* parent_;
 #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
     V next_value_ = {};
     inner_handler_type inner_;
@@ -158,11 +158,10 @@ class composite_handler
 # pragma GCC diagnostic pop
 #endif
 
-    bool signal_end(error_code&)
+    bool signal_end(system::error_code& ec)
     {
         inner_active_ = false;
-        parent_->signal_value();
-        return true;
+        return parent_->signal_value(ec);
     }
 
 #define BOOST_JSON_INVOKE_INNER(f) \
@@ -173,72 +172,72 @@ class composite_handler
     else \
         return inner_.f
 
-    bool on_object_begin( error_code& ec )
+    bool on_object_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_object_begin(ec) );
     }
 
-    bool on_object_end( error_code& ec )
+    bool on_object_end( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_object_end(ec) );
     }
 
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_array_begin(ec) );
     }
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_array_end(ec) );
     }
 
-    bool on_key_part( error_code& ec, string_view sv )
+    bool on_key_part( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_key_part(ec, sv) );
     }
 
-    bool on_key( error_code& ec, string_view sv )
+    bool on_key( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_key(ec, sv) );
     }
 
-    bool on_string_part( error_code& ec, string_view sv )
+    bool on_string_part( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_string_part(ec, sv) );
     }
 
-    bool on_string( error_code& ec, string_view sv )
+    bool on_string( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_string(ec, sv) );
     }
 
-    bool on_number_part( error_code& ec )
+    bool on_number_part( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_number_part(ec) );
     }
 
-    bool on_int64( error_code& ec, std::int64_t v )
+    bool on_int64( system::error_code& ec, std::int64_t v )
     {
         BOOST_JSON_INVOKE_INNER( on_int64(ec, v) );
     }
 
-    bool on_uint64( error_code& ec, std::uint64_t v )
+    bool on_uint64( system::error_code& ec, std::uint64_t v )
     {
         BOOST_JSON_INVOKE_INNER( on_uint64(ec, v) );
     }
 
-    bool on_double( error_code& ec, double v )
+    bool on_double( system::error_code& ec, double v )
     {
         BOOST_JSON_INVOKE_INNER( on_double(ec, v) );
     }
 
-    bool on_bool( error_code& ec, bool v )
+    bool on_bool( system::error_code& ec, bool v )
     {
         BOOST_JSON_INVOKE_INNER( on_bool(ec, v) );
     }
 
-    bool on_null( error_code& ec )
+    bool on_null( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_null(ec) );
     }
@@ -280,12 +279,12 @@ class converting_handler<integral_conversion_tag, V, P>
         , value_(v)
     {}
 
-    bool on_number_part( error_code& )
+    bool on_number_part( system::error_code& )
     {
         return true;
     }
 
-    bool on_int64( error_code& ec, std::int64_t v )
+    bool on_int64(system::error_code& ec, std::int64_t v)
     {
         if( !integral_in_range<V>( v ) )
         {
@@ -294,23 +293,19 @@ class converting_handler<integral_conversion_tag, V, P>
         }
 
         *value_ = static_cast<V>( v );
-
-        this->parent_->signal_value();
-        return true;
+        return this->parent_->signal_value(ec);
     }
 
-    bool on_uint64( error_code& ec, std::uint64_t v )
+    bool on_uint64(system::error_code& ec, std::uint64_t v)
     {
-        if( !integral_in_range<V>( v ) )
+        if( !integral_in_range<V>(v) )
         {
             BOOST_JSON_FAIL( ec, error::not_exact );
             return false;
         }
 
-        *value_ = static_cast<V>( v );
-
-        this->parent_->signal_value();
-        return true;
+        *value_ = static_cast<V>(v);
+        return this->parent_->signal_value(ec);
     }
 };
 
@@ -328,33 +323,27 @@ class converting_handler<floating_point_conversion_tag, V, P>
         , value_(v)
     {}
 
-    bool on_number_part( error_code& )
+    bool on_number_part( system::error_code& )
     {
         return true;
     }
 
-    bool on_int64( error_code&, std::int64_t v )
+    bool on_int64(system::error_code& ec, std::int64_t v)
     {
-        *value_ = static_cast<V>( v );
-
-        this->parent_->signal_value();
-        return true;
+        *value_ = static_cast<V>(v);
+        return this->parent_->signal_value(ec);
     }
 
-    bool on_uint64( error_code&, std::uint64_t v )
+    bool on_uint64(system::error_code& ec, std::uint64_t v)
     {
-        *value_ = static_cast<V>( v );
-
-        this->parent_->signal_value();
-        return true;
+        *value_ = static_cast<V>(v);
+        return this->parent_->signal_value(ec);
     }
 
-    bool on_double( error_code&, double v )
+    bool on_double(system::error_code& ec, double v)
     {
-        *value_ = static_cast<V>( v );
-
-        this->parent_->signal_value();
-        return true;
+        *value_ = static_cast<V>(v);
+        return this->parent_->signal_value(ec);
     }
 };
 
@@ -373,7 +362,7 @@ class converting_handler<string_like_conversion_tag, V, P>
         , value_(v)
     {}
 
-    bool on_string_part( error_code&, string_view sv )
+    bool on_string_part( system::error_code&, string_view sv )
     {
         if( !cleared_ )
         {
@@ -385,7 +374,7 @@ class converting_handler<string_like_conversion_tag, V, P>
         return true;
     }
 
-    bool on_string( error_code&, string_view sv )
+    bool on_string(system::error_code& ec, string_view sv)
     {
         if( !cleared_ )
             value_->clear();
@@ -393,9 +382,7 @@ class converting_handler<string_like_conversion_tag, V, P>
             cleared_ = false;
 
         value_->append( sv.begin(), sv.end() );
-
-        this->parent_->signal_value();
-        return true;
+        return this->parent_->signal_value(ec);
     }
 };
 
@@ -413,12 +400,10 @@ class converting_handler<bool_conversion_tag, V, P>
         , value_(v)
     {}
 
-    bool on_bool( error_code&, bool v )
+    bool on_bool(system::error_code& ec, bool v)
     {
         *value_ = v;
-
-        this->parent_->signal_value();
-        return true;
+        return this->parent_->signal_value(ec);
     }
 };
 
@@ -436,12 +421,10 @@ class converting_handler<null_like_conversion_tag, V, P>
         , value_(v)
     {}
 
-    bool on_null( error_code& )
+    bool on_null(system::error_code& ec)
     {
         *value_ = {};
-
-        this->parent_->signal_value();
-        return true;
+        return this->parent_->signal_value(ec);
     }
 };
 
@@ -467,13 +450,13 @@ class converting_handler<described_enum_conversion_tag, V, P>
         , value_(v)
     {}
 
-    bool on_string_part( error_code&, string_view sv )
+    bool on_string_part( system::error_code&, string_view sv )
     {
         name_.append( sv.begin(), sv.end() );
         return true;
     }
 
-    bool on_string( error_code& ec, string_view sv )
+    bool on_string(system::error_code& ec, string_view sv)
     {
         string_view name = sv;
         if( !name_.empty() )
@@ -488,8 +471,7 @@ class converting_handler<described_enum_conversion_tag, V, P>
             return false;
         }
 
-        this->parent_->signal_value();
-        return true;
+        return this->parent_->signal_value(ec);
     }
 
 #endif // BOOST_DESCRIBE_CXX14
@@ -503,13 +485,25 @@ class converting_handler<no_conversion_tag, V, P>
 
 // sequence handler
 template< class It >
-bool check_inserter( It l, It r )
+bool cannot_insert(It i, It e)
 {
-    return l == r;
+    return i == e;
 }
 
 template< class It1, class It2 >
-std::true_type check_inserter( It1, It2 )
+std::false_type cannot_insert(It1, It2)
+{
+    return {};
+}
+
+template< class It >
+bool needs_more_elements(It i, It e)
+{
+    return i != e;
+}
+
+template< class It1, class It2 >
+std::false_type needs_more_elements(It1, It2)
 {
     return {};
 }
@@ -562,22 +556,29 @@ class converting_handler<sequence_conversion_tag, V, P>
         , inserter( detail::inserter(*value_, inserter_implementation<V>()) )
     {}
 
-    void signal_value()
+    bool signal_value(system::error_code& ec)
     {
+        if(cannot_insert( inserter, value_->end() ))
+        {
+            BOOST_JSON_FAIL( ec, error::size_mismatch );
+            return false;
+        }
+
         *inserter++ = std::move(this->next_value_);
 #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
         this->next_value_ = {};
 #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
 # pragma GCC diagnostic pop
 #endif
+        return true;
     }
 
-    bool signal_end(error_code& ec)
+    bool signal_end(system::error_code& ec)
     {
-        if( !check_inserter( inserter, value_->end() ) )
+        if(needs_more_elements( inserter, value_->end() ))
         {
             BOOST_JSON_FAIL( ec, error::size_mismatch );
             return false;
@@ -588,7 +589,7 @@ class converting_handler<sequence_conversion_tag, V, P>
         return converting_handler::composite_handler::signal_end(ec);
     }
 
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         if( this->inner_active_ )
             return this->inner_.on_array_begin( ec );
@@ -598,7 +599,7 @@ class converting_handler<sequence_conversion_tag, V, P>
         return true;
     }
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         if( this->inner_active_ )
             return this->inner_.on_array_end( ec );
@@ -625,7 +626,7 @@ class converting_handler<map_like_conversion_tag, V, P>
         : converting_handler::composite_handler(p), value_(v)
     {}
 
-    void signal_value()
+    bool signal_value(system::error_code&)
     {
         value_->emplace( std::move(key_), std::move(this->next_value_) );
 
@@ -633,9 +634,11 @@ class converting_handler<map_like_conversion_tag, V, P>
         this->next_value_ = {};
 
         this->inner_active_ = false;
+
+        return true;
     }
 
-    bool on_object_begin( error_code& ec )
+    bool on_object_begin( system::error_code& ec )
     {
         if( this->inner_active_ )
             return this->inner_.on_object_begin(ec);
@@ -644,16 +647,15 @@ class converting_handler<map_like_conversion_tag, V, P>
         return true;
     }
 
-    bool on_object_end( error_code& ec )
+    bool on_object_end(system::error_code& ec)
     {
         if( this->inner_active_ )
             return this->inner_.on_object_end(ec);
 
-        this->parent_->signal_value();
-        return true;
+        return this->parent_->signal_value(ec);
     }
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         if( this->inner_active_ )
             return this->inner_.on_array_end(ec);
@@ -661,7 +663,7 @@ class converting_handler<map_like_conversion_tag, V, P>
         return this->parent_->signal_end(ec);
     }
 
-    bool on_key_part( error_code& ec, string_view sv )
+    bool on_key_part( system::error_code& ec, string_view sv )
     {
         if( this->inner_active_ )
             return this->inner_.on_key_part(ec, sv);
@@ -670,7 +672,7 @@ class converting_handler<map_like_conversion_tag, V, P>
         return true;
     }
 
-    bool on_key( error_code& ec, string_view sv )
+    bool on_key( system::error_code& ec, string_view sv )
     {
         if( this->inner_active_ )
             return this->inner_.on_key(ec, sv);
@@ -709,7 +711,7 @@ struct handler_tuple;
 
 template< class P, template<class...> class L, class... V, std::size_t... I >
 struct handler_tuple< P, L<V...>, mp11::index_sequence<I...> >
-    : handler_tuple_element< I, get_handler<V, P> >
+    : handler_tuple_element<I, V>
     ...
 {
     handler_tuple( handler_tuple const& ) = delete;
@@ -717,11 +719,11 @@ struct handler_tuple< P, L<V...>, mp11::index_sequence<I...> >
 
     template< class Access, class T >
     handler_tuple( Access access, T* pv, P* pp )
-        : handler_tuple_element< I, get_handler<V, P> >(
-            access( pv, mp11::mp_int<I>() ),
+        : handler_tuple_element<I, V>(
+            access( pv, mp11::mp_size_t<I>() ),
             pp )
         ...
-    { }
+    {}
 };
 
 #if defined(BOOST_MSVC) && BOOST_MSVC < 1910
@@ -801,10 +803,17 @@ class converting_handler<tuple_conversion_tag, T, P>
 {
 
 private:
+    using ElementTypes = tuple_element_list<T>;
+
+    template<class V>
+    using ElementHandler = get_handler<V, converting_handler>;
+    using InnerHandlers = mp11::mp_transform<ElementHandler, ElementTypes>;
+    using HandlerTuple = handler_tuple<converting_handler, InnerHandlers>;
+
     T* value_;
     P* parent_;
 
-    handler_tuple< converting_handler, tuple_element_list<T> > handlers_;
+    HandlerTuple handlers_;
     int inner_active_ = -1;
 
 public:
@@ -815,23 +824,23 @@ class converting_handler<tuple_conversion_tag, T, P>
         : value_(v) , parent_(p) , handlers_(tuple_accessor(), v, this)
     {}
 
-    void signal_value()
+    bool signal_value(system::error_code&)
     {
         ++inner_active_;
+        return true;
     }
 
-    bool signal_end(error_code& ec)
+    bool signal_end(system::error_code& ec)
     {
         constexpr int N = std::tuple_size<T>::value;
         if( inner_active_ < N )
         {
             BOOST_JSON_FAIL( ec, error::size_mismatch );
-            return true;
+            return false;
         }
 
         inner_active_ = -1;
-        parent_->signal_value();
-        return true;
+        return parent_->signal_value(ec);
     }
 
 #define BOOST_JSON_HANDLE_EVENT(fn) \
@@ -845,7 +854,7 @@ class converting_handler<tuple_conversion_tag, T, P>
     }; \
        \
     template< class... Args > \
-    bool fn( error_code& ec, Args&& ... args ) \
+    bool fn( system::error_code& ec, Args&& ... args ) \
     { \
         if( inner_active_ < 0 ) \
         { \
@@ -858,7 +867,7 @@ class converting_handler<tuple_conversion_tag, T, P>
             BOOST_JSON_FAIL( ec, error::size_mismatch ); \
             return false; \
         } \
-        using F = handler_op_invoker< do_ ## fn, error_code, Args...>; \
+        using F = handler_op_invoker< do_ ## fn, system::error_code, Args...>; \
         using H = decltype(handlers_); \
         return mp11::mp_with_index<N>( \
             inner_active_, \
@@ -867,21 +876,21 @@ class converting_handler<tuple_conversion_tag, T, P>
                 F{ std::forward_as_tuple(ec, args...) } } ); \
     }
 
-    BOOST_JSON_HANDLE_EVENT( on_object_begin );
-    BOOST_JSON_HANDLE_EVENT( on_object_end );
+    BOOST_JSON_HANDLE_EVENT( on_object_begin )
+    BOOST_JSON_HANDLE_EVENT( on_object_end )
 
     struct do_on_array_begin
     {
-        handler_tuple< converting_handler, tuple_element_list<T> >& handlers;
-        error_code& ec;
+        HandlerTuple& handlers;
+        system::error_code& ec;
 
         template< class I >
         bool operator()( I ) const
         {
             return get<I::value>(handlers).on_array_begin(ec);
-        };
+        }
     };
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         if( inner_active_ < 0 )
         {
@@ -893,8 +902,8 @@ class converting_handler<tuple_conversion_tag, T, P>
 
         if( inner_active_ >= N )
         {
-            inner_active_ = 0;
-            return true;
+            BOOST_JSON_FAIL( ec, error::size_mismatch );
+            return false;
         }
 
         return mp11::mp_with_index<N>(
@@ -903,16 +912,16 @@ class converting_handler<tuple_conversion_tag, T, P>
 
     struct do_on_array_end
     {
-        handler_tuple< converting_handler, tuple_element_list<T> >& handlers;
-        error_code& ec;
+        HandlerTuple& handlers;
+        system::error_code& ec;
 
         template< class I >
         bool operator()( I ) const
         {
             return get<I::value>(handlers).on_array_end(ec);
-        };
+        }
     };
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         if( inner_active_ < 0 )
             return parent_->signal_end(ec);
@@ -926,16 +935,16 @@ class converting_handler<tuple_conversion_tag, T, P>
             inner_active_, do_on_array_end{handlers_, ec} );
     }
 
-    BOOST_JSON_HANDLE_EVENT( on_key_part );
-    BOOST_JSON_HANDLE_EVENT( on_key );
-    BOOST_JSON_HANDLE_EVENT( on_string_part );
-    BOOST_JSON_HANDLE_EVENT( on_string );
-    BOOST_JSON_HANDLE_EVENT( on_number_part );
-    BOOST_JSON_HANDLE_EVENT( on_int64 );
-    BOOST_JSON_HANDLE_EVENT( on_uint64 );
-    BOOST_JSON_HANDLE_EVENT( on_double );
-    BOOST_JSON_HANDLE_EVENT( on_bool );
-    BOOST_JSON_HANDLE_EVENT( on_null );
+    BOOST_JSON_HANDLE_EVENT( on_key_part )
+    BOOST_JSON_HANDLE_EVENT( on_key )
+    BOOST_JSON_HANDLE_EVENT( on_string_part )
+    BOOST_JSON_HANDLE_EVENT( on_string )
+    BOOST_JSON_HANDLE_EVENT( on_number_part )
+    BOOST_JSON_HANDLE_EVENT( on_int64 )
+    BOOST_JSON_HANDLE_EVENT( on_uint64 )
+    BOOST_JSON_HANDLE_EVENT( on_double )
+    BOOST_JSON_HANDLE_EVENT( on_bool )
+    BOOST_JSON_HANDLE_EVENT( on_null )
 
 #undef BOOST_JSON_HANDLE_EVENT
 };
@@ -949,9 +958,7 @@ struct struct_element_list_impl
     template< class D >
     using helper = described_member_t<T, D>;
 
-    using type = mp11::mp_transform<
-        helper,
-        describe::describe_members<T, describe::mod_public> >;
+    using type = mp11::mp_transform< helper, described_members<T> >;
 };
 template< class T >
 using struct_element_list = typename struct_element_list_impl<T>::type;
@@ -960,35 +967,155 @@ using struct_element_list = typename struct_element_list_impl<T>::type;
 
 template< class T >
 using struct_element_list = mp11::mp_transform_q<
-    mp11::mp_bind_front< described_member_t, T >,
-    describe::describe_members<T, describe::mod_public> >;
+    mp11::mp_bind_front< described_member_t, T >, described_members<T> >;
 
 #endif
 
 struct struct_accessor
 {
+    template< class T >
+    auto operator()( T*, mp11::mp_size< described_members<T> > ) const
+        -> void*
+    {
+        return nullptr;
+    }
+
     template< class T, class I >
     auto operator()( T* t, I ) const
-        -> described_member_t<T,
-             mp11::mp_at<
-                 describe::describe_members<T, describe::mod_public>, I> >*
+        -> described_member_t<T, mp11::mp_at< described_members<T>, I> >*
     {
-        using Ds = describe::describe_members<T, describe::mod_public>;
+        using Ds = described_members<T>;
         using D = mp11::mp_at<Ds, I>;
         return &(t->*D::pointer);
     }
 };
 
-template< class F >
 struct struct_key_searcher
 {
-    F fn;
+    string_view key;
+    int& found;
+    int index = 0;
+
+    struct_key_searcher(string_view key, int& found) noexcept
+        : key(key), found(found)
+    {}
 
     template< class D >
     void
-    operator()( D ) const
+    operator()( D )
     {
-        fn( D::name ) ;
+        if( key == D::name )
+            found = index;
+        ++index;
+    }
+};
+
+template<class P>
+struct ignoring_handler
+{
+    P* parent_;
+    std::size_t array_depth_ = 0;
+    std::size_t object_depth_ = 0;
+
+    ignoring_handler(ignoring_handler const&) = delete;
+    ignoring_handler& operator=(ignoring_handler const&) = delete;
+
+    ignoring_handler(void*, P* p) noexcept
+        : parent_(p)
+    {}
+
+    bool on_object_begin(system::error_code&)
+    {
+        ++object_depth_;
+        return true;
+    }
+
+    bool on_object_end(system::error_code& ec)
+    {
+        BOOST_ASSERT( object_depth_ > 0 );
+        --object_depth_;
+
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
+    }
+
+    bool on_array_begin(system::error_code&)
+    {
+        ++array_depth_;
+        return true;
+    }
+
+    bool on_array_end(system::error_code& ec)
+    {
+        BOOST_ASSERT( array_depth_ > 0 );
+        --array_depth_;
+
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_end(ec);
+        return true;
+    }
+
+    bool on_key_part(system::error_code&, string_view)
+    {
+        return true;
+    }
+
+    bool on_key(system::error_code&, string_view)
+    {
+        return true;
+    }
+
+    bool on_string_part(system::error_code&, string_view)
+    {
+        return true;
+    }
+
+    bool on_string(system::error_code& ec, string_view)
+    {
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
+    }
+
+    bool on_number_part(system::error_code&)
+    {
+        return true;
+    }
+
+    bool on_int64(system::error_code& ec, std::int64_t)
+    {
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
+    }
+
+    bool on_uint64(system::error_code& ec, std::uint64_t)
+    {
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
+    }
+
+    bool on_double(system::error_code& ec, double)
+    {
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
+    }
+
+    bool on_bool(system::error_code& ec, bool)
+    {
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
+    }
+
+    bool on_null(system::error_code& ec)
+    {
+        if( (array_depth_ + object_depth_) == 0 )
+            return parent_->signal_value(ec);
+        return true;
     }
 };
 
@@ -1003,14 +1130,22 @@ class converting_handler<described_class_conversion_tag, V, P>
 #else
 
 private:
+    using Dm = described_members<V>;
+    using Dt = struct_element_list<V>;
+
+    template<class T>
+    using MemberHandler = get_handler<T, converting_handler>;
+    using InnerHandlers = mp11::mp_push_back<
+        mp11::mp_transform<MemberHandler, Dt>,
+        ignoring_handler<converting_handler> >;
+    using InnerCount = mp11::mp_size<InnerHandlers>;
+
     V* value_;
     P* parent_;
 
     std::string key_;
 
-    using Dm = describe::describe_members<V, describe::mod_public>;
-
-    handler_tuple< converting_handler, struct_element_list<V> > handlers_;
+    handler_tuple<converting_handler, InnerHandlers> handlers_;
     int inner_active_ = -1;
     std::size_t activated_ = 0;
 
@@ -1022,35 +1157,40 @@ class converting_handler<described_class_conversion_tag, V, P>
         : value_(v), parent_(p), handlers_(struct_accessor(), v, this)
     {}
 
-    struct is_optional_checker
+    struct is_required_checker
     {
+        bool operator()( mp11::mp_size<Dt> ) const noexcept
+        {
+            return false;
+        }
+
         template< class I >
-        bool operator()( I ) const noexcept
+        auto operator()( I ) const noexcept
         {
-            using L = struct_element_list<V>;
-            using T = mp11::mp_at<L, I>;
+            using T = mp11::mp_at<Dt, I>;
             return !is_optional_like<T>::value;
         }
     };
-    void signal_value()
+
+    bool signal_value(system::error_code&)
     {
         BOOST_ASSERT( inner_active_ >= 0 );
-        bool required_member = mp11::mp_with_index< mp11::mp_size<Dm> >(
+        bool required_member = mp11::mp_with_index<InnerCount>(
             inner_active_,
-            is_optional_checker{});
+            is_required_checker{});
         if( required_member )
             ++activated_;
 
         key_ = {};
         inner_active_ = -1;
+        return true;
     }
 
-    bool signal_end(error_code&)
+    bool signal_end(system::error_code& ec)
     {
         key_ = {};
         inner_active_ = -1;
-        parent_->signal_value();
-        return true;
+        return parent_->signal_value(ec);
     }
 
 #define BOOST_JSON_INVOKE_INNER(fn) \
@@ -1062,11 +1202,11 @@ class converting_handler<described_class_conversion_tag, V, P>
     auto f = [&](auto& handler) { return handler.fn ; }; \
     using F = decltype(f); \
     using H = decltype(handlers_); \
-    return mp11::mp_with_index< mp11::mp_size<Dm> >( \
+    return mp11::mp_with_index<InnerCount>( \
             inner_active_, \
             tuple_handler_op_invoker<H, F>{handlers_, f} );
 
-    bool on_object_begin( error_code& ec )
+    bool on_object_begin( system::error_code& ec )
     {
         if( inner_active_ < 0 )
             return true;
@@ -1074,32 +1214,30 @@ class converting_handler<described_class_conversion_tag, V, P>
         BOOST_JSON_INVOKE_INNER( on_object_begin(ec) );
     }
 
-    bool on_object_end( error_code& ec )
+    bool on_object_end( system::error_code& ec )
     {
         if( inner_active_ < 0 )
         {
-            using L = struct_element_list<V>;
-            using C = mp11::mp_count_if<L, is_optional_like>;
-            constexpr int N = mp11::mp_size<L>::value - C::value;
+            using C = mp11::mp_count_if<Dt, is_optional_like>;
+            constexpr int N = mp11::mp_size<Dt>::value - C::value;
             if( activated_ < N )
             {
                 BOOST_JSON_FAIL( ec, error::size_mismatch );
                 return false;
             }
 
-            parent_->signal_value();
-            return true;
+            return parent_->signal_value(ec);
         }
 
         BOOST_JSON_INVOKE_INNER( on_object_end(ec) );
     }
 
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_array_begin(ec) );
     }
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         if( inner_active_ < 0 )
             return parent_->signal_end(ec);
@@ -1107,7 +1245,7 @@ class converting_handler<described_class_conversion_tag, V, P>
         BOOST_JSON_INVOKE_INNER( on_array_end(ec) );
     }
 
-    bool on_key_part( error_code& ec, string_view sv )
+    bool on_key_part( system::error_code& ec, string_view sv )
     {
         if( inner_active_ < 0 )
         {
@@ -1118,7 +1256,7 @@ class converting_handler<described_class_conversion_tag, V, P>
         BOOST_JSON_INVOKE_INNER( on_key_part(ec, sv) );
     }
 
-    bool on_key( error_code& ec, string_view sv )
+    bool on_key( system::error_code& ec, string_view sv )
     {
         if( inner_active_ >= 0 )
         {
@@ -1132,63 +1270,47 @@ class converting_handler<described_class_conversion_tag, V, P>
             key = key_;
         }
 
-        int i = 0;
-
-        auto f = [&](char const* name)
-        {
-            if( key == name )
-                inner_active_ = i;
-            ++i;
-        };
-
-        mp11::mp_for_each<Dm>(
-            struct_key_searcher<decltype(f)>{f} );
-
-        if( inner_active_ < 0 )
-        {
-            BOOST_JSON_FAIL(ec, error::unknown_name);
-            return false;
-        }
-
+        inner_active_ = InnerCount::value - 1;
+        mp11::mp_for_each<Dm>( struct_key_searcher(key, inner_active_) );
         return true;
     }
 
-    bool on_string_part( error_code& ec, string_view sv )
+    bool on_string_part( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_string_part(ec, sv) );
     }
 
-    bool on_string( error_code& ec, string_view sv )
+    bool on_string( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_string(ec, sv) );
     }
 
-    bool on_number_part( error_code& ec )
+    bool on_number_part( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_number_part(ec) );
     }
 
-    bool on_int64( error_code& ec, std::int64_t v )
+    bool on_int64( system::error_code& ec, std::int64_t v )
     {
         BOOST_JSON_INVOKE_INNER( on_int64(ec, v) );
     }
 
-    bool on_uint64( error_code& ec, std::uint64_t v )
+    bool on_uint64( system::error_code& ec, std::uint64_t v )
     {
         BOOST_JSON_INVOKE_INNER( on_uint64(ec, v) );
     }
 
-    bool on_double( error_code& ec, double v )
+    bool on_double( system::error_code& ec, double v )
     {
         BOOST_JSON_INVOKE_INNER( on_double(ec, v) );
     }
 
-    bool on_bool( error_code& ec, bool v )
+    bool on_bool( system::error_code& ec, bool v )
     {
         BOOST_JSON_INVOKE_INNER( on_bool(ec, v) );
     }
 
-    bool on_null( error_code& ec )
+    bool on_null( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_null(ec) );
     }
@@ -1261,7 +1383,7 @@ template< class H >
 struct event_visitor
 {
     H& handler;
-    error_code& ec;
+    system::error_code& ec;
 
     bool
     operator()(object_begin_handler_event&) const
@@ -1361,15 +1483,15 @@ class converting_handler<variant_conversion_tag, T, P>
         , parent_( p )
     {}
 
-    void signal_value()
+    bool signal_value(system::error_code& ec)
     {
         inner_.template emplace<0>();
         inner_active_ = -1;
         events_.clear();
-        parent_->signal_value();
+        return parent_->signal_value(ec);
     }
 
-    bool signal_end(error_code& ec)
+    bool signal_end(system::error_code& ec)
     {
         return parent_->signal_end(ec);
     }
@@ -1400,7 +1522,7 @@ class converting_handler<variant_conversion_tag, T, P>
     struct event_processor
     {
         converting_handler* self;
-        error_code& ec;
+        system::error_code& ec;
         parse_event& event;
 
         template< class I >
@@ -1412,7 +1534,7 @@ class converting_handler<variant_conversion_tag, T, P>
                 event_visitor<Handler>{handler, ec}, event );
         }
     };
-    bool process_events(error_code& ec)
+    bool process_events(system::error_code& ec)
     {
         constexpr std::size_t N = variant_size::value;
 
@@ -1453,22 +1575,22 @@ class converting_handler<variant_conversion_tag, T, P>
     events_.emplace_back( ev ); \
     return process_events(ec);
 
-    bool on_object_begin( error_code& ec )
+    bool on_object_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( object_begin_handler_event{}, ec );
     }
 
-    bool on_object_end( error_code& ec )
+    bool on_object_end( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( object_end_handler_event{}, ec );
     }
 
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( array_begin_handler_event{}, ec );
     }
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         if( !inner_active_ )
             return signal_end(ec);
@@ -1476,57 +1598,57 @@ class converting_handler<variant_conversion_tag, T, P>
         BOOST_JSON_INVOKE_INNER( array_end_handler_event{}, ec );
     }
 
-    bool on_key_part( error_code&, string_view sv )
+    bool on_key_part( system::error_code&, string_view sv )
     {
         string_.append(sv);
         return true;
     }
 
-    bool on_key( error_code& ec, string_view sv )
+    bool on_key( system::error_code& ec, string_view sv )
     {
         string_.append(sv);
         BOOST_JSON_INVOKE_INNER( key_handler_event{ std::move(string_) }, ec );
     }
 
-    bool on_string_part( error_code&, string_view sv )
+    bool on_string_part( system::error_code&, string_view sv )
     {
         string_.append(sv);
         return true;
     }
 
-    bool on_string( error_code& ec, string_view sv )
+    bool on_string( system::error_code& ec, string_view sv )
     {
         string_.append(sv);
         BOOST_JSON_INVOKE_INNER(
             string_handler_event{ std::move(string_) }, ec );
     }
 
-    bool on_number_part( error_code& )
+    bool on_number_part( system::error_code& )
     {
         return true;
     }
 
-    bool on_int64( error_code& ec, std::int64_t v )
+    bool on_int64( system::error_code& ec, std::int64_t v )
     {
         BOOST_JSON_INVOKE_INNER( int64_handler_event{v}, ec );
     }
 
-    bool on_uint64( error_code& ec, std::uint64_t v )
+    bool on_uint64( system::error_code& ec, std::uint64_t v )
     {
         BOOST_JSON_INVOKE_INNER( uint64_handler_event{v}, ec );
     }
 
-    bool on_double( error_code& ec, double v )
+    bool on_double( system::error_code& ec, double v )
     {
         BOOST_JSON_INVOKE_INNER( double_handler_event{v}, ec );
     }
 
-    bool on_bool( error_code& ec, bool v )
+    bool on_bool( system::error_code& ec, bool v )
     {
         BOOST_JSON_INVOKE_INNER( bool_handler_event{v}, ec );
     }
 
-    bool on_null( error_code& ec )
+    bool on_null( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( null_handler_event{}, ec );
     }
@@ -1557,15 +1679,15 @@ class converting_handler<optional_conversion_tag, V, P>
         : value_(v), parent_(p), inner_(&inner_value_, this)
     {}
 
-    void signal_value()
+    bool signal_value(system::error_code& ec)
     {
         *value_ = std::move(inner_value_);
 
         inner_active_ = false;
-        parent_->signal_value();
+        return parent_->signal_value(ec);
     }
 
-    bool signal_end(error_code& ec)
+    bool signal_end(system::error_code& ec)
     {
         return parent_->signal_end(ec);
     }
@@ -1575,22 +1697,22 @@ class converting_handler<optional_conversion_tag, V, P>
         inner_active_ = true; \
     return inner_.fn;
 
-    bool on_object_begin( error_code& ec )
+    bool on_object_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_object_begin(ec) );
     }
 
-    bool on_object_end( error_code& ec )
+    bool on_object_end( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_object_end(ec) );
     }
 
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_array_begin(ec) );
     }
 
-    bool on_array_end( error_code& ec )
+    bool on_array_end( system::error_code& ec )
     {
         if( !inner_active_ )
             return signal_end(ec);
@@ -1598,59 +1720,57 @@ class converting_handler<optional_conversion_tag, V, P>
         BOOST_JSON_INVOKE_INNER( on_array_end(ec) );
     }
 
-    bool on_key_part( error_code& ec, string_view sv )
+    bool on_key_part( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_key_part(ec, sv) );
     }
 
-    bool on_key( error_code& ec, string_view sv )
+    bool on_key( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_key(ec, sv) );
     }
 
-    bool on_string_part( error_code& ec, string_view sv )
+    bool on_string_part( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_string_part(ec, sv) );
     }
 
-    bool on_string( error_code& ec, string_view sv )
+    bool on_string( system::error_code& ec, string_view sv )
     {
         BOOST_JSON_INVOKE_INNER( on_string(ec, sv) );
     }
 
-    bool on_number_part( error_code& ec )
+    bool on_number_part( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_number_part(ec) );
     }
 
-    bool on_int64( error_code& ec, std::int64_t v )
+    bool on_int64( system::error_code& ec, std::int64_t v )
     {
         BOOST_JSON_INVOKE_INNER( on_int64(ec, v) );
     }
 
-    bool on_uint64( error_code& ec, std::uint64_t v )
+    bool on_uint64( system::error_code& ec, std::uint64_t v )
     {
         BOOST_JSON_INVOKE_INNER( on_uint64(ec, v) );
     }
 
-    bool on_double( error_code& ec, double v )
+    bool on_double( system::error_code& ec, double v )
     {
         BOOST_JSON_INVOKE_INNER( on_double(ec, v) );
     }
 
-    bool on_bool( error_code& ec, bool v )
+    bool on_bool( system::error_code& ec, bool v )
     {
         BOOST_JSON_INVOKE_INNER( on_bool(ec, v) );
     }
 
-    bool on_null( error_code& ec )
+    bool on_null(system::error_code& ec)
     {
         if( !inner_active_ )
         {
             *value_ = {};
-
-            this->parent_->signal_value();
-            return true;
+            return this->parent_->signal_value(ec);
         }
         else
         {
@@ -1661,6 +1781,46 @@ class converting_handler<optional_conversion_tag, V, P>
 #undef BOOST_JSON_INVOKE_INNER
 };
 
+// path handler
+template< class V, class P >
+class converting_handler<path_conversion_tag, V, P>
+    : public scalar_handler<P, error::not_string>
+{
+private:
+    V* value_;
+    bool cleared_ = false;
+
+public:
+    converting_handler( V* v, P* p )
+        : converting_handler::scalar_handler(p)
+        , value_(v)
+    {}
+
+    bool on_string_part( system::error_code&, string_view sv )
+    {
+        if( !cleared_ )
+        {
+            cleared_ = true;
+            value_->clear();
+        }
+
+        value_->concat( sv.begin(), sv.end() );
+        return true;
+    }
+
+    bool on_string(system::error_code& ec, string_view sv)
+    {
+        if( !cleared_ )
+            value_->clear();
+        else
+            cleared_ = false;
+
+        value_->concat( sv.begin(), sv.end() );
+
+        return this->parent_->signal_value(ec);
+    }
+};
+
 // into_handler
 template< class V >
 class into_handler
@@ -1690,21 +1850,22 @@ class into_handler
     {
     }
 
-    void signal_value()
+    bool signal_value(system::error_code&)
     {
+        return true;
     }
 
-    bool signal_end(error_code&)
+    bool signal_end(system::error_code&)
     {
         return true;
     }
 
-    bool on_document_begin( error_code& )
+    bool on_document_begin( system::error_code& )
     {
         return true;
     }
 
-    bool on_document_end( error_code& )
+    bool on_document_end( system::error_code& )
     {
         inner_active_ = false;
         return true;
@@ -1719,82 +1880,82 @@ class into_handler
     else \
         return inner_.f
 
-    bool on_object_begin( error_code& ec )
+    bool on_object_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_object_begin(ec) );
     }
 
-    bool on_object_end( std::size_t, error_code& ec )
+    bool on_object_end( std::size_t, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_object_end(ec) );
     }
 
-    bool on_array_begin( error_code& ec )
+    bool on_array_begin( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_array_begin(ec) );
     }
 
-    bool on_array_end( std::size_t, error_code& ec )
+    bool on_array_end( std::size_t, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_array_end(ec) );
     }
 
-    bool on_key_part( string_view sv, std::size_t, error_code& ec )
+    bool on_key_part( string_view sv, std::size_t, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_key_part(ec, sv) );
     }
 
-    bool on_key( string_view sv, std::size_t, error_code& ec )
+    bool on_key( string_view sv, std::size_t, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_key(ec, sv) );
     }
 
-    bool on_string_part( string_view sv, std::size_t, error_code& ec )
+    bool on_string_part( string_view sv, std::size_t, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_string_part(ec, sv) );
     }
 
-    bool on_string( string_view sv, std::size_t, error_code& ec )
+    bool on_string( string_view sv, std::size_t, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_string(ec, sv) );
     }
 
-    bool on_number_part( string_view, error_code& ec )
+    bool on_number_part( string_view, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_number_part(ec) );
     }
 
-    bool on_int64( std::int64_t v, string_view, error_code& ec )
+    bool on_int64( std::int64_t v, string_view, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_int64(ec, v) );
     }
 
-    bool on_uint64( std::uint64_t v, string_view, error_code& ec )
+    bool on_uint64( std::uint64_t v, string_view, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_uint64(ec, v) );
     }
 
-    bool on_double( double v, string_view, error_code& ec )
+    bool on_double( double v, string_view, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_double(ec, v) );
     }
 
-    bool on_bool( bool v, error_code& ec )
+    bool on_bool( bool v, system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_bool(ec, v) );
     }
 
-    bool on_null( error_code& ec )
+    bool on_null( system::error_code& ec )
     {
         BOOST_JSON_INVOKE_INNER( on_null(ec) );
     }
 
-    bool on_comment_part(string_view, error_code&)
+    bool on_comment_part(string_view, system::error_code&)
     {
         return true;
     }
 
-    bool on_comment(string_view, error_code&)
+    bool on_comment(string_view, system::error_code&)
     {
         return true;
     }
diff --git a/inst/include/boost/json/detail/sbo_buffer.hpp b/inst/include/boost/json/detail/sbo_buffer.hpp
index 5529fa5a1..6e4861910 100644
--- a/inst/include/boost/json/detail/sbo_buffer.hpp
+++ b/inst/include/boost/json/detail/sbo_buffer.hpp
@@ -52,7 +52,7 @@ class sbo_buffer
         delete[] data_;
 #if defined(__GNUC__)
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
         buffer_ = {};
 #if defined(__GNUC__)
diff --git a/inst/include/boost/json/detail/shared_resource.hpp b/inst/include/boost/json/detail/shared_resource.hpp
index 31826f9b8..1ac638634 100644
--- a/inst/include/boost/json/detail/shared_resource.hpp
+++ b/inst/include/boost/json/detail/shared_resource.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_JSON_DETAIL_SHARED_RESOURCE_HPP
 #define BOOST_JSON_DETAIL_SHARED_RESOURCE_HPP
 
-#include <boost/json/memory_resource.hpp>
+#include <boost/container/pmr/memory_resource.hpp>
 #include <atomic>
 #include <utility>
 
@@ -25,7 +25,7 @@ namespace detail {
 
 struct BOOST_SYMBOL_VISIBLE
     shared_resource
-    : memory_resource
+    : container::pmr::memory_resource
 {
     BOOST_JSON_DECL
     shared_resource();
diff --git a/inst/include/boost/json/detail/sse2.hpp b/inst/include/boost/json/detail/sse2.hpp
index d8d88f5ce..06657bc18 100644
--- a/inst/include/boost/json/detail/sse2.hpp
+++ b/inst/include/boost/json/detail/sse2.hpp
@@ -327,6 +327,7 @@ inline uint64_t parse_unsigned( uint64_t r, char const * p, std::size_t n ) noex
 #else
         uint32_t v;
         std::memcpy( &v, p, 4 );
+        endian::native_to_little_inplace(v);
 
         v -= 0x30303030;
 
@@ -335,11 +336,7 @@ inline uint64_t parse_unsigned( uint64_t r, char const * p, std::size_t n ) noex
         unsigned w2 = (v >> 16) & 0xFF;
         unsigned w3 = (v >> 24);
 
-#ifdef BOOST_JSON_BIG_ENDIAN
-        r = (((r * 10 + w3) * 10 + w2) * 10 + w1) * 10 + w0;
-#else
         r = (((r * 10 + w0) * 10 + w1) * 10 + w2) * 10 + w3;
-#endif
 #endif
         p += 4;
         n -= 4;
diff --git a/inst/include/boost/json/detail/stack.hpp b/inst/include/boost/json/detail/stack.hpp
index be2a6137b..db1ea1fe4 100644
--- a/inst/include/boost/json/detail/stack.hpp
+++ b/inst/include/boost/json/detail/stack.hpp
@@ -12,17 +12,38 @@
 
 #include <boost/json/detail/config.hpp>
 #include <boost/json/storage_ptr.hpp>
+#include <boost/mp11/integral.hpp>
 #include <cstring>
+#include <type_traits>
 
 namespace boost {
 namespace json {
 namespace detail {
 
+#if defined( BOOST_LIBSTDCXX_VERSION ) && BOOST_LIBSTDCXX_VERSION < 50000
+
+template<class T>
+struct is_trivially_copy_assignable
+    : mp11::mp_bool<
+        std::is_copy_assignable<T>::value &&
+          std::has_trivial_copy_assign<T>::value >
+{};
+
+#else
+
+using std::is_trivially_copy_assignable;
+
+#endif
+
 class stack
 {
+    template< class T = void >
+    struct non_trivial;
+
     storage_ptr sp_;
     std::size_t cap_ = 0;
     std::size_t size_ = 0;
+    non_trivial<>* head_ = nullptr;
     unsigned char* base_ = nullptr;
     unsigned char* buf_ = nullptr;
 
@@ -43,67 +64,62 @@ class stack
         return size_ == 0;
     }
 
-    void
-    clear() noexcept
-    {
-        size_ = 0;
-    }
-
     BOOST_JSON_DECL
     void
-    reserve(std::size_t n);
+    clear() noexcept;
 
-    template<class T>
     void
-    push(T const& t)
+    reserve(std::size_t n)
     {
-        auto const n = sizeof(T);
-        // If this assert goes off, it
-        // means the calling code did not
-        // reserve enough to prevent a
-        // reallocation.
-        //BOOST_ASSERT(cap_ >= size_ + n);
-        reserve(size_ + n);
-        std::memcpy(
-            base_ + size_, &t, n);
-        size_ += n;
+        if(n > cap_)
+            reserve_impl(n);
     }
 
     template<class T>
     void
-    push_unchecked(T const& t)
+    push(T&& t)
     {
-        auto const n = sizeof(T);
-        BOOST_ASSERT(size_ + n <= cap_);
-        std::memcpy(
-            base_ + size_, &t, n);
-        size_ += n;
+        using U = remove_cvref<T>;
+        push( static_cast<T&&>(t), is_trivially_copy_assignable<U>() );
     }
 
     template<class T>
     void
-    peek(T& t)
-    {
-        auto const n = sizeof(T);
-        BOOST_ASSERT(size_ >= n);
-        std::memcpy(&t,
-            base_ + size_ - n, n);
-    }
+    push_unchecked(
+        T const& t);
+
+    template<class T>
+    void
+    peek(T& t);
 
     template<class T>
     void
     pop(T& t)
     {
-        auto const n = sizeof(T);
-        BOOST_ASSERT(size_ >= n);
-        size_ -= n;
-        std::memcpy(
-            &t, base_ + size_, n);
+        using U = remove_cvref<T>;
+        pop( t, is_trivially_copy_assignable<U>() );
     }
+
+private:
+    template<class T> void push(
+        T const& t, std::true_type);
+    template<class T> void push(
+        T&& t, std::false_type);
+    template<class T> void pop(
+        T& t, std::true_type);
+    template<class T> void pop(
+        T& t, std::false_type);
+
+    BOOST_JSON_DECL
+    void
+    reserve_impl(
+        std::size_t n);
 };
 
 } // detail
 } // namespace json
 } // namespace boost
 
+#include <boost/json/detail/impl/stack.hpp>
+
 #endif
diff --git a/inst/include/boost/json/detail/utf8.hpp b/inst/include/boost/json/detail/utf8.hpp
index e3ed2cad2..74434773e 100644
--- a/inst/include/boost/json/detail/utf8.hpp
+++ b/inst/include/boost/json/detail/utf8.hpp
@@ -10,6 +10,7 @@
 #ifndef BOOST_JSON_DETAIL_UTF8_HPP
 #define BOOST_JSON_DETAIL_UTF8_HPP
 
+#include <boost/endian/conversion.hpp>
 #include <boost/json/detail/config.hpp>
 
 #include <cstddef>
@@ -26,12 +27,7 @@ load_little_endian(void const* p)
 {
     std::uint32_t v = 0;
     std::memcpy(&v, p, N);
-#ifdef BOOST_JSON_BIG_ENDIAN
-    v = ((v & 0xFF000000) >> 24) |
-        ((v & 0x00FF0000) >>  8) |
-        ((v & 0x0000FF00) <<  8) |
-        ((v & 0x000000FF) << 24);
-#endif
+    endian::little_to_native_inplace(v);
     return v;
 }
 
diff --git a/inst/include/boost/json/detail/value.hpp b/inst/include/boost/json/detail/value.hpp
index cc300185e..f84fcb5ad 100644
--- a/inst/include/boost/json/detail/value.hpp
+++ b/inst/include/boost/json/detail/value.hpp
@@ -10,6 +10,7 @@
 #ifndef BOOST_JSON_DETAIL_VALUE_HPP
 #define BOOST_JSON_DETAIL_VALUE_HPP
 
+#include <boost/json/fwd.hpp>
 #include <boost/json/kind.hpp>
 #include <boost/json/storage_ptr.hpp>
 #include <cstdint>
diff --git a/inst/include/boost/json/detail/value_from.hpp b/inst/include/boost/json/detail/value_from.hpp
index 27e06f3a8..0c9b799b2 100644
--- a/inst/include/boost/json/detail/value_from.hpp
+++ b/inst/include/boost/json/detail/value_from.hpp
@@ -155,8 +155,7 @@ value_from_impl( no_conversion_tag, value&, T&&, Ctx const& )
 template< class Ctx, class T >
 struct from_described_member
 {
-    using Ds = describe::describe_members<
-        remove_cvref<T>, describe::mod_public | describe::mod_inherited>;
+    using Ds = described_members< remove_cvref<T> >;
 
     object& obj;
     Ctx const& ctx;
@@ -249,6 +248,15 @@ value_from_impl( variant_conversion_tag, value& jv, T&& from, Ctx const& ctx )
     visit( value_from_visitor<Ctx>{ jv, ctx }, static_cast<T&&>(from) );
 }
 
+template< class Ctx, class T >
+void
+value_from_impl( path_conversion_tag, value& jv, T&& from, Ctx const& )
+{
+    std::string s = from.generic_string();
+    string_view sv = s;
+    jv.emplace_string().assign(sv);
+}
+
 //----------------------------------------------------------
 // Contextual conversions
 
diff --git a/inst/include/boost/json/detail/value_to.hpp b/inst/include/boost/json/detail/value_to.hpp
index 426c7ffae..5c4dbe28d 100644
--- a/inst/include/boost/json/detail/value_to.hpp
+++ b/inst/include/boost/json/detail/value_to.hpp
@@ -14,6 +14,7 @@
 
 #include <boost/json/value.hpp>
 #include <boost/json/conversion.hpp>
+#include <boost/json/result_for.hpp>
 #include <boost/describe/enum_from_string.hpp>
 
 #ifndef BOOST_NO_CXX17_HDR_OPTIONAL
@@ -72,7 +73,7 @@ try_reserve(
 
 // identity conversion
 template< class Ctx >
-result<value>
+system::result<value>
 value_to_impl(
     value_conversion_tag,
     try_value_to_tag<value>,
@@ -92,7 +93,7 @@ value_to_impl(
 
 // object
 template< class Ctx >
-result<object>
+system::result<object>
 value_to_impl(
     object_conversion_tag,
     try_value_to_tag<object>,
@@ -102,14 +103,14 @@ value_to_impl(
     object const* obj = jv.if_object();
     if( obj )
         return *obj;
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_object);
     return ec;
 }
 
 // array
 template< class Ctx >
-result<array>
+system::result<array>
 value_to_impl(
     array_conversion_tag,
     try_value_to_tag<array>,
@@ -119,14 +120,14 @@ value_to_impl(
     array const* arr = jv.if_array();
     if( arr )
         return *arr;
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_array);
     return ec;
 }
 
 // string
 template< class Ctx >
-result<string>
+system::result<string>
 value_to_impl(
     string_conversion_tag,
     try_value_to_tag<string>,
@@ -136,32 +137,32 @@ value_to_impl(
     string const* str = jv.if_string();
     if( str )
         return *str;
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_string);
     return ec;
 }
 
 // bool
 template< class Ctx >
-result<bool>
+system::result<bool>
 value_to_impl(
     bool_conversion_tag, try_value_to_tag<bool>, value const& jv, Ctx const& )
 {
     auto b = jv.if_bool();
     if( b )
         return *b;
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_bool);
     return {boost::system::in_place_error, ec};
 }
 
 // integral and floating point
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     number_conversion_tag, try_value_to_tag<T>, value const& jv, Ctx const& )
 {
-    error_code ec;
+    system::error_code ec;
     auto const n = jv.to_number<T>(ec);
     if( ec.failed() )
         return {boost::system::in_place_error, ec};
@@ -170,7 +171,7 @@ value_to_impl(
 
 // null-like conversion
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     null_like_conversion_tag,
     try_value_to_tag<T>,
@@ -179,14 +180,14 @@ value_to_impl(
 {
     if( jv.is_null() )
         return {boost::system::in_place_value, T{}};
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_null);
     return {boost::system::in_place_error, ec};
 }
 
 // string-like types
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     string_like_conversion_tag,
     try_value_to_tag<T>,
@@ -196,14 +197,14 @@ value_to_impl(
     auto str = jv.if_string();
     if( str )
         return {boost::system::in_place_value, T(str->subview())};
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_string);
     return {boost::system::in_place_error, ec};
 }
 
 // map-like containers
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     map_like_conversion_tag,
     try_value_to_tag<T>,
@@ -213,7 +214,7 @@ value_to_impl(
     object const* obj = jv.if_object();
     if( !obj )
     {
-        error_code ec;
+        system::error_code ec;
         BOOST_JSON_FAIL(ec, error::not_object);
         return {boost::system::in_place_error, ec};
     }
@@ -223,7 +224,7 @@ value_to_impl(
         res, obj->size(), reserve_implementation<T>());
     if( e != error() )
     {
-        error_code ec;
+        system::error_code ec;
         BOOST_JSON_FAIL( ec, e );
         return {boost::system::in_place_error, ec};
     }
@@ -243,7 +244,7 @@ value_to_impl(
 
 // all other containers
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     sequence_conversion_tag,
     try_value_to_tag<T>,
@@ -253,7 +254,7 @@ value_to_impl(
     array const* arr = jv.if_array();
     if( !arr )
     {
-        error_code ec;
+        system::error_code ec;
         BOOST_JSON_FAIL(ec, error::not_array);
         return {boost::system::in_place_error, ec};
     }
@@ -263,7 +264,7 @@ value_to_impl(
         result, arr->size(), reserve_implementation<T>());
     if( e != error() )
     {
-        error_code ec;
+        system::error_code ec;
         BOOST_JSON_FAIL( ec, e );
         return {boost::system::in_place_error, ec};
     }
@@ -281,8 +282,8 @@ value_to_impl(
 
 // tuple-like types
 template< class T, class Ctx >
-result<T>
-try_make_tuple_elem(value const& jv, Ctx const& ctx, error_code& ec)
+system::result<T>
+try_make_tuple_elem(value const& jv, Ctx const& ctx, system::error_code& ec)
 {
     if( ec.failed() )
         return {boost::system::in_place_error, ec};
@@ -293,32 +294,39 @@ try_make_tuple_elem(value const& jv, Ctx const& ctx, error_code& ec)
 }
 
 template <class T, class Ctx, std::size_t... Is>
-result<T>
+system::result<T>
 try_make_tuple_like(
     array const& arr, Ctx const& ctx, boost::mp11::index_sequence<Is...>)
 {
-    error_code ec;
+    system::error_code ec;
     auto items = std::make_tuple(
         try_make_tuple_elem<
             typename std::decay<tuple_element_t<Is, T>>::type >(
                 arr[Is], ctx, ec)
             ...);
+#if defined(BOOST_GCC)
+# pragma GCC diagnostic push
+//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     if( ec.failed() )
         return {boost::system::in_place_error, ec};
+#if defined(BOOST_GCC)
+# pragma GCC diagnostic pop
+#endif
 
     return {
         boost::system::in_place_value, T(std::move(*std::get<Is>(items))...)};
 }
 
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     tuple_conversion_tag,
     try_value_to_tag<T>,
     value const& jv,
     Ctx const& ctx )
 {
-    error_code ec;
+    system::error_code ec;
 
     array const* arr = jv.if_array();
     if( !arr )
@@ -338,17 +346,13 @@ value_to_impl(
         *arr, ctx, boost::mp11::make_index_sequence<N>());
 }
 
-template< class Ctx, class T, bool non_throwing = true >
+template< class Ctx, class T >
 struct to_described_member
 {
-    using Ds = describe::describe_members<
-        T, describe::mod_public | describe::mod_inherited>;
-
-    using result_type = mp11::mp_eval_if_c< !non_throwing, T, result, T >;
+    using Ds = described_members<T>;
 
-    result_type& res;
+    system::result<T>& res;
     object const& obj;
-    std::size_t count;
     Ctx const& ctx;
 
     template< class I >
@@ -366,8 +370,8 @@ struct to_described_member
         {
             BOOST_IF_CONSTEXPR( !is_optional_like<M>::value )
             {
-                error_code ec;
-                BOOST_JSON_FAIL(ec, error::unknown_name);
+                system::error_code ec;
+                BOOST_JSON_FAIL(ec, error::size_mismatch);
                 res = {boost::system::in_place_error, ec};
             }
             return;
@@ -375,18 +379,15 @@ struct to_described_member
 
 #if defined(__GNUC__) && BOOST_GCC_VERSION >= 80000 && BOOST_GCC_VERSION < 11000
 # pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunused"
-# pragma GCC diagnostic ignored "-Wunused-variable"
+//# pragma GCC diagnostic ignored "-Wunused"
+//# pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
         auto member_res = try_value_to<M>( found->value(), ctx );
 #if defined(__GNUC__) && BOOST_GCC_VERSION >= 80000 && BOOST_GCC_VERSION < 11000
 # pragma GCC diagnostic pop
 #endif
         if( member_res )
-        {
             (*res).* D::pointer = std::move(*member_res);
-            ++count;
-        }
         else
             res = {boost::system::in_place_error, member_res.error()};
     }
@@ -394,25 +395,26 @@ struct to_described_member
 
 // described classes
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     described_class_conversion_tag,
     try_value_to_tag<T>,
     value const& jv,
     Ctx const& ctx )
 {
-    result<T> res;
+    BOOST_STATIC_ASSERT( std::is_default_constructible<T>::value );
+    system::result<T> res;
 
     auto* obj = jv.if_object();
     if( !obj )
     {
-        error_code ec;
+        system::error_code ec;
         BOOST_JSON_FAIL(ec, error::not_object);
         res = {boost::system::in_place_error, ec};
         return res;
     }
 
-    to_described_member< Ctx, T > member_converter{ res, *obj, 0u, ctx };
+    to_described_member<Ctx, T> member_converter{res, *obj, ctx};
 
     using Ds = typename decltype(member_converter)::Ds;
     constexpr std::size_t N = mp11::mp_size<Ds>::value;
@@ -421,20 +423,12 @@ value_to_impl(
     if( !res )
         return res;
 
-    if( member_converter.count != obj->size() )
-    {
-        error_code ec;
-        BOOST_JSON_FAIL(ec, error::size_mismatch);
-        res = {boost::system::in_place_error, ec};
-        return res;
-    }
-
     return res;
 }
 
 // described enums
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     described_enum_conversion_tag,
     try_value_to_tag<T>,
@@ -444,7 +438,7 @@ value_to_impl(
     T val = {};
     (void)jv;
 #ifdef BOOST_DESCRIBE_CXX14
-    error_code ec;
+    system::error_code ec;
 
     auto str = jv.if_string();
     if( !str )
@@ -465,7 +459,7 @@ value_to_impl(
 
 // optionals
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     optional_conversion_tag,
     try_value_to_tag<T>,
@@ -516,10 +510,11 @@ initialize_variant( V&& v, mp11::mp_int<1> )
 }
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
+
 template< class T, class Ctx >
 struct alternative_converter
 {
-    result<T>& res;
+    system::result<T>& res;
     value const& jv;
     Ctx const& ctx;
 
@@ -540,23 +535,40 @@ struct alternative_converter
 };
 
 template< class T, class Ctx >
-result<T>
+system::result<T>
 value_to_impl(
     variant_conversion_tag,
     try_value_to_tag<T>,
     value const& jv,
     Ctx const& ctx)
 {
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::exhausted_variants);
 
     using Is = mp11::mp_iota< mp11::mp_size<T> >;
 
-    result<T> res = {system::in_place_error, ec};
+    system::result<T> res = {system::in_place_error, ec};
     mp11::mp_for_each<Is>( alternative_converter<T, Ctx>{res, jv, ctx} );
     return res;
 }
 
+template< class T, class Ctx >
+system::result<T>
+value_to_impl(
+    path_conversion_tag, try_value_to_tag<T>, value const& jv, Ctx const& )
+{
+    auto str = jv.if_string();
+    if( !str )
+    {
+        system::error_code ec;
+        BOOST_JSON_FAIL(ec, error::not_string);
+        return {boost::system::in_place_error, ec};
+    }
+
+    string_view sv = str->subview();
+    return {boost::system::in_place_value, T( sv.begin(), sv.end() )};
+}
+
 //----------------------------------------------------------
 // User-provided conversions; throwing -> throwing
 template< class T, class Ctx >
@@ -632,28 +644,6 @@ value_to_impl(
     return std::move(*res);
 }
 
-template< class Ctx >
-std::tuple<allow_exceptions, Ctx>
-make_throwing_context(Ctx const& ctx)
-{
-    return std::tuple<allow_exceptions, Ctx>(allow_exceptions(), ctx);
-}
-
-template< class... Ctxes >
-std::tuple<allow_exceptions, Ctxes...>
-make_throwing_context(std::tuple<Ctxes...> const& ctx)
-{
-    return std::tuple_cat(std::make_tuple( allow_exceptions() ), ctx);
-}
-
-template< class... Ctxes >
-std::tuple<allow_exceptions, Ctxes...> const&
-make_throwing_context(std::tuple<allow_exceptions, Ctxes...> const& ctx)
-    noexcept
-{
-    return ctx;
-}
-
 template<
     class T,
     class Ctx,
@@ -669,11 +659,7 @@ value_to_impl(
     value const& jv,
     Ctx const& ctx )
 {
-    auto res = tag_invoke(
-        try_value_to_tag<T>(),
-        jv,
-        Sup::get(ctx),
-        make_throwing_context(ctx));
+    auto res = tag_invoke(try_value_to_tag<T>(), jv, Sup::get(ctx), ctx);
     if( res.has_error() )
         throw_system_error( res.error() );
     return std::move(*res);
@@ -683,7 +669,8 @@ value_to_impl(
 // User-provided conversions; nonthrowing -> nonthrowing
 template< class T, class Ctx >
 mp11::mp_if<
-    mp11::mp_valid<has_nonthrowing_user_conversion_to_impl, T>, result<T> >
+    mp11::mp_valid<
+        has_nonthrowing_user_conversion_to_impl, T>, system::result<T> >
 value_to_impl(
     user_conversion_tag, try_value_to_tag<T>, value const& jv, Ctx const& )
 {
@@ -698,7 +685,7 @@ template<
 mp11::mp_if<
     mp11::mp_valid<
         has_nonthrowing_context_conversion_to_impl, typename Sup::type, T>,
-    result<T> >
+    system::result<T> >
 value_to_impl(
     context_conversion_tag,
     try_value_to_tag<T> tag,
@@ -718,7 +705,7 @@ mp11::mp_if<
         has_nonthrowing_full_context_conversion_to_impl,
         typename Sup::type,
         T>,
-    result<T> >
+    system::result<T> >
 value_to_impl(
     full_context_conversion_tag,
     try_value_to_tag<T> tag,
@@ -731,49 +718,30 @@ value_to_impl(
 //----------------------------------------------------------
 // User-provided conversions; nonthrowing -> throwing
 
-template< class Ctx >
-struct does_allow_exceptions : std::false_type
-{ };
-
-template< class... Ctxes >
-struct does_allow_exceptions< std::tuple<allow_exceptions, Ctxes...> >
-    : std::true_type
-{ };
-
-template< class T, class... Args >
-result<T>
-wrap_conversion_exceptions( std::true_type, value_to_tag<T>, Args&& ... args )
-{
-    return {
-        boost::system::in_place_value,
-        tag_invoke( value_to_tag<T>(), static_cast<Args&&>(args)... )};
-}
-
 template< class T, class... Args >
-result<T>
-wrap_conversion_exceptions( std::false_type, value_to_tag<T>, Args&& ... args )
+system::result<T>
+wrap_conversion_exceptions( value_to_tag<T>, Args&& ... args )
 {
 #ifndef BOOST_NO_EXCEPTIONS
     try
     {
 #endif
-        return wrap_conversion_exceptions(
-            std::true_type(),
-            value_to_tag<T>(),
-            static_cast<Args&&>(args)... );
+        return {
+            boost::system::in_place_value,
+            tag_invoke( value_to_tag<T>(), static_cast<Args&&>(args)... )};
 #ifndef BOOST_NO_EXCEPTIONS
     }
     catch( std::bad_alloc const&)
     {
         throw;
     }
-    catch( system_error const& e)
+    catch( system::system_error const& e)
     {
         return {boost::system::in_place_error, e.code()};
     }
     catch( ... )
     {
-        error_code ec;
+        system::error_code ec;
         BOOST_JSON_FAIL(ec, error::exception);
         return {boost::system::in_place_error, ec};
     }
@@ -783,12 +751,11 @@ wrap_conversion_exceptions( std::false_type, value_to_tag<T>, Args&& ... args )
 template< class T, class Ctx >
 mp11::mp_if_c<
     !mp11::mp_valid<has_nonthrowing_user_conversion_to_impl, T>::value,
-    result<T> >
+    system::result<T> >
 value_to_impl(
     user_conversion_tag, try_value_to_tag<T>, value const& jv, Ctx const& )
 {
-    return wrap_conversion_exceptions(
-        does_allow_exceptions<Ctx>(), value_to_tag<T>(), jv);
+    return wrap_conversion_exceptions(value_to_tag<T>(), jv);
 }
 
 template<
@@ -801,15 +768,14 @@ mp11::mp_if_c<
         has_nonthrowing_context_conversion_to_impl,
         typename Sup::type,
         T>::value,
-    result<T> >
+    system::result<T> >
 value_to_impl(
     context_conversion_tag,
     try_value_to_tag<T>,
     value const& jv,
     Ctx const& ctx )
 {
-    return wrap_conversion_exceptions(
-        does_allow_exceptions<Ctx>(), value_to_tag<T>(), jv, Sup::get(ctx) );
+    return wrap_conversion_exceptions( value_to_tag<T>(), jv, Sup::get(ctx) );
 }
 
 template<
@@ -822,7 +788,7 @@ mp11::mp_if_c<
         has_nonthrowing_full_context_conversion_to_impl,
         typename Sup::type,
         T>::value,
-    result<T> >
+    system::result<T> >
 value_to_impl(
     full_context_conversion_tag,
     try_value_to_tag<T>,
@@ -830,11 +796,7 @@ value_to_impl(
     Ctx const& ctx )
 {
     return wrap_conversion_exceptions(
-        does_allow_exceptions<Ctx>(),
-        value_to_tag<T>(),
-        jv,
-        Sup::get(ctx),
-        ctx);
+        value_to_tag<T>(), jv, Sup::get(ctx), ctx);
 }
 
 // no suitable conversion implementation
@@ -852,8 +814,7 @@ template< class Impl, class T, class Ctx >
 T
 value_to_impl( Impl impl, value_to_tag<T>, value const& jv, Ctx const& ctx )
 {
-    return value_to_impl(
-        impl, try_value_to_tag<T>(), jv, make_throwing_context(ctx) ).value();
+    return value_to_impl(impl, try_value_to_tag<T>(), jv, ctx).value();
 }
 
 template< class Ctx, class T >
@@ -864,14 +825,14 @@ using value_to_category = conversion_category<
 
 #ifndef BOOST_NO_CXX17_HDR_OPTIONAL
 inline
-result<std::nullopt_t>
+system::result<std::nullopt_t>
 tag_invoke(
     try_value_to_tag<std::nullopt_t>,
     value const& jv)
 {
     if( jv.is_null() )
         return std::nullopt;
-    error_code ec;
+    system::error_code ec;
     BOOST_JSON_FAIL(ec, error::not_null);
     return ec;
 }
diff --git a/inst/include/boost/json/detail/writer.hpp b/inst/include/boost/json/detail/writer.hpp
new file mode 100644
index 000000000..141880bf7
--- /dev/null
+++ b/inst/include/boost/json/detail/writer.hpp
@@ -0,0 +1,89 @@
+//
+// Copyright (c) 2023 Dmitry Arkhipov (grisumbras@yandex.ru)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/json
+//
+
+#ifndef BOOST_JSON_DETAIL_WRITER_HPP
+#define BOOST_JSON_DETAIL_WRITER_HPP
+
+#include <boost/json/detail/literals.hpp>
+#include <boost/json/detail/stack.hpp>
+#include <boost/json/detail/stream.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/serialize_options.hpp>
+#include <boost/json/value.hpp>
+
+namespace boost {
+namespace json {
+namespace detail {
+
+struct writer
+{
+    enum class state : char;
+
+    stack st_;
+    serialize_options opts_;
+    const_stream cs0_;
+    void const* p_ = nullptr;
+    char buf_[detail::max_number_chars + 1];
+
+    writer(
+        storage_ptr sp,
+        unsigned char* buf,
+        std::size_t buf_size,
+        serialize_options const& opts) noexcept;
+
+    inline
+    bool
+    suspend(state st);
+
+    template<class U, class T>
+    bool
+    suspend(state st, U u, T const* po);
+};
+
+bool
+BOOST_JSON_DECL
+write_true(writer& w, stream& ss);
+
+bool
+BOOST_JSON_DECL
+write_false(writer& w, stream& ss);
+
+bool
+BOOST_JSON_DECL
+write_null(writer& w, stream& ss);
+
+bool
+BOOST_JSON_DECL
+write_int64(writer&, stream& ss, std::int64_t i);
+
+bool
+BOOST_JSON_DECL
+write_uint64(writer&, stream& ss, std::uint64_t i);
+
+bool
+BOOST_JSON_DECL
+write_double(writer&, stream& ss, double d);
+
+bool
+BOOST_JSON_DECL
+resume_buffer(writer&, stream& ss);
+
+bool
+BOOST_JSON_DECL
+write_string(writer& w, stream& ss);
+
+bool
+BOOST_JSON_DECL
+resume_string(writer& w, stream& ss);
+
+} // namespace detail
+} // namespace json
+} // namespace boost
+
+#endif // BOOST_JSON_DETAIL_WRITER_HPP
diff --git a/inst/include/boost/json/error.hpp b/inst/include/boost/json/error.hpp
index 815f90446..a592d0562 100644
--- a/inst/include/boost/json/error.hpp
+++ b/inst/include/boost/json/error.hpp
@@ -11,7 +11,6 @@
 #define BOOST_JSON_ERROR_HPP
 
 #include <boost/json/detail/config.hpp>
-#include <boost/json/system_error.hpp>
 
 namespace boost {
 namespace json {
diff --git a/inst/include/boost/json/impl/array.hpp b/inst/include/boost/json/impl/array.hpp
index b5e75ff91..8e6de243d 100644
--- a/inst/include/boost/json/impl/array.hpp
+++ b/inst/include/boost/json/impl/array.hpp
@@ -204,29 +204,17 @@ emplace_back(Arg&& arg)
 
 value&
 array::
-at(std::size_t pos) &
+at(std::size_t pos, source_location const& loc) &
 {
     auto const& self = *this;
-    return const_cast< value& >( self.at(pos) );
+    return const_cast< value& >( self.at(pos, loc) );
 }
 
 value&&
 array::
-at(std::size_t pos) &&
+at(std::size_t pos, source_location const& loc) &&
 {
-    return std::move( at(pos) );
-}
-
-value const&
-array::
-at(std::size_t pos) const&
-{
-    if(pos >= t_->size)
-    {
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::out_of_range, &loc );
-    }
-    return (*t_)[pos];
+    return std::move( at(pos, loc) );
 }
 
 value&
diff --git a/inst/include/boost/json/impl/array.ipp b/inst/include/boost/json/impl/array.ipp
index 85abc61cd..e5d732e8b 100644
--- a/inst/include/boost/json/impl/array.ipp
+++ b/inst/include/boost/json/impl/array.ipp
@@ -368,6 +368,43 @@ operator=(
     return *this;
 }
 
+//----------------------------------------------------------
+//
+// Element access
+//
+//----------------------------------------------------------
+
+system::result<value&>
+array::try_at(std::size_t pos) noexcept
+{
+    if(pos >= t_->size)
+    {
+        system::error_code ec;
+        BOOST_JSON_FAIL(ec, error::out_of_range);
+        return ec;
+    }
+    return (*t_)[pos];
+}
+
+system::result<value const&>
+array::try_at(std::size_t pos) const noexcept
+{
+    if(pos >= t_->size)
+    {
+        system::error_code ec;
+        BOOST_JSON_FAIL(ec, error::out_of_range);
+        return ec;
+    }
+    return (*t_)[pos];
+}
+
+value const&
+array::
+array::at(std::size_t pos, source_location const& loc) const&
+{
+    return try_at(pos).value(loc);
+}
+
 //----------------------------------------------------------
 //
 // Capacity
diff --git a/inst/include/boost/json/impl/conversion.hpp b/inst/include/boost/json/impl/conversion.hpp
index d5e14380c..6c045ea01 100644
--- a/inst/include/boost/json/impl/conversion.hpp
+++ b/inst/include/boost/json/impl/conversion.hpp
@@ -19,6 +19,7 @@
 #include <boost/describe/bases.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/utility.hpp>
+#include <boost/system/result.hpp>
 
 #include <iterator>
 #include <tuple>
@@ -63,6 +64,15 @@ using are_begin_and_end_same = std::is_same<
     iterator_type<T>,
     decltype(std::end(std::declval<T&>()))>;
 
+// msvc 14.0 gets confused when std::is_same is used directly
+template<class A, class B>
+using is_same_msvc_140 = std::is_same<A, B>;
+template<class T>
+using is_its_own_value = is_same_msvc_140<value_type<T>, T>;
+
+template<class T>
+using not_its_own_value = mp11::mp_not< is_its_own_value<T> >;
+
 template<class T>
 using begin_iterator_category = typename std::iterator_traits<
     iterator_type<T>>::iterator_category;
@@ -76,6 +86,10 @@ using has_unique_keys = has_positive_tuple_size<decltype(
     std::declval<T&>().emplace(
         std::declval<value_type<T>>()))>;
 
+template<class T>
+using has_string_type = std::is_same<
+    typename T::string_type, std::basic_string<typename T::value_type> >;
+
 template<class T>
 struct is_value_type_pair_helper : std::false_type
 { };
@@ -188,6 +202,7 @@ struct floating_point_conversion_tag : number_conversion_tag { };
 struct null_like_conversion_tag { };
 struct string_like_conversion_tag { };
 struct map_like_conversion_tag { };
+struct path_conversion_tag { };
 struct sequence_conversion_tag { };
 struct tuple_conversion_tag { };
 struct described_class_conversion_tag { };
@@ -282,6 +297,10 @@ using described_member_t = remove_cvref<decltype(
 
 #endif
 
+template< class T >
+using described_members = describe::describe_members<
+    T, describe::mod_any_access | describe::mod_inherited>;
+
 // user conversion (via tag_invoke)
 template< class Ctx, class T, class Dir >
 using user_conversion_category = mp11::mp_cond<
@@ -312,6 +331,7 @@ using generic_conversion_category = mp11::mp_cond<
     is_described_enum<T>,      described_enum_conversion_tag,
     is_variant_like<T>,        variant_conversion_tag,
     is_optional_like<T>,       optional_conversion_tag,
+    is_path_like<T>,           path_conversion_tag,
     // failed to find a suitable implementation
     mp11::mp_true,             no_conversion_tag>;
 
@@ -367,9 +387,6 @@ struct conversion_category_impl< std::tuple<Ctxs...>, T, Dir >
 struct no_context
 {};
 
-struct allow_exceptions
-{};
-
 template <class T, class Dir>
 using can_convert = mp11::mp_not<
     std::is_same<
@@ -469,7 +486,7 @@ using has_valueless_by_exception =
 template <class T>
 struct result_for<T, value>
 {
-    using type = result< detail::remove_cvref<T> >;
+    using type = system::result< detail::remove_cvref<T> >;
 };
 
 template<class T>
@@ -477,10 +494,17 @@ struct is_string_like
     : std::is_convertible<T, string_view>
 { };
 
+template<class T>
+struct is_path_like
+    : mp11::mp_all<
+        mp11::mp_valid_and_true<detail::is_its_own_value, T>,
+        mp11::mp_valid_and_true<detail::has_string_type, T>>
+{ };
 template<class T>
 struct is_sequence_like
     : mp11::mp_all<
         mp11::mp_valid_and_true<detail::are_begin_and_end_same, T>,
+        mp11::mp_valid_and_true<detail::not_its_own_value, T>,
         mp11::mp_valid<detail::begin_iterator_category, T>>
 { };
 
diff --git a/inst/include/boost/json/impl/error.hpp b/inst/include/boost/json/impl/error.hpp
index 58f6071f1..d367a2592 100644
--- a/inst/include/boost/json/impl/error.hpp
+++ b/inst/include/boost/json/impl/error.hpp
@@ -10,6 +10,7 @@
 #ifndef BOOST_JSON_IMPL_ERROR_HPP
 #define BOOST_JSON_IMPL_ERROR_HPP
 
+#include <boost/system/error_category.hpp>
 #include <type_traits>
 
 namespace boost {
@@ -45,11 +46,11 @@ namespace json {
 namespace detail {
 
 struct error_code_category_t
-    : error_category
+    : system::error_category
 {
     constexpr
     error_code_category_t()
-        : error_category(0xB9A9B9922177C772)
+        : system::error_category(0xB9A9B9922177C772)
     {}
 
     BOOST_JSON_DECL
@@ -65,7 +66,7 @@ struct error_code_category_t
     message( int ev ) const override;
 
     BOOST_JSON_DECL
-    error_condition
+    system::error_condition
     default_error_condition( int ev ) const noexcept override;
 };
 
@@ -74,11 +75,11 @@ BOOST_JSON_DECL
 error_code_category_t error_code_category;
 
 struct error_condition_category_t
-    : error_category
+    : system::error_category
 {
     constexpr
     error_condition_category_t()
-        : error_category(0x37CEF5A036D24FD1)
+        : system::error_category(0x37CEF5A036D24FD1)
     {}
 
     BOOST_JSON_DECL
@@ -102,21 +103,21 @@ error_condition_category_t error_condition_category;
 
 inline
 BOOST_SYSTEM_CONSTEXPR
-error_code
+system::error_code
 make_error_code(error e) noexcept
 {
 
-    return error_code(
+    return system::error_code(
         static_cast<std::underlying_type<error>::type>(e),
         detail::error_code_category );
 }
 
 inline
 BOOST_SYSTEM_CONSTEXPR
-error_condition
+system::error_condition
 make_error_condition(condition c) noexcept
 {
-    return error_condition(
+    return system::error_condition(
         static_cast<std::underlying_type<condition>::type>(c),
         detail::error_condition_category );
 }
diff --git a/inst/include/boost/json/impl/error.ipp b/inst/include/boost/json/impl/error.ipp
index c45a6e1c7..5b15d2e8f 100644
--- a/inst/include/boost/json/impl/error.ipp
+++ b/inst/include/boost/json/impl/error.ipp
@@ -94,7 +94,7 @@ error_code_category_t::message( int ev ) const
     return message( ev, nullptr, 0 );
 }
 
-error_condition
+system::error_condition
 error_code_category_t::default_error_condition( int ev) const noexcept
 {
     switch(static_cast<error>(ev))
diff --git a/inst/include/boost/json/impl/null_resource.ipp b/inst/include/boost/json/impl/null_resource.ipp
index 3bfa5e18a..8e5b957ea 100644
--- a/inst/include/boost/json/impl/null_resource.ipp
+++ b/inst/include/boost/json/impl/null_resource.ipp
@@ -24,7 +24,7 @@ namespace detail {
     `std::bad_alloc` in calls to `allocate`.
 */
 class null_resource final
-    : public memory_resource
+    : public container::pmr::memory_resource
 {
 public:
     /// Copy constructor (deleted)
@@ -77,7 +77,7 @@ protected:
 
 } // detail
 
-memory_resource*
+container::pmr::memory_resource*
 get_null_resource() noexcept
 {
     static detail::null_resource mr;
diff --git a/inst/include/boost/json/impl/object.hpp b/inst/include/boost/json/impl/object.hpp
index d2458fcfb..cabed2133 100644
--- a/inst/include/boost/json/impl/object.hpp
+++ b/inst/include/boost/json/impl/object.hpp
@@ -360,35 +360,19 @@ reserve(std::size_t new_capacity)
 //
 //----------------------------------------------------------
 
-auto
+value&
 object::
-at(string_view key) & ->
-    value&
+at(string_view key, source_location const& loc) &
 {
     auto const& self = *this;
-    return const_cast< value& >( self.at(key) );
-}
-
-auto
-object::
-at(string_view key) && ->
-    value&&
-{
-    return std::move( at(key) );
+    return const_cast< value& >( self.at(key, loc) );
 }
 
-auto
+value&&
 object::
-at(string_view key) const& ->
-    value const&
+at(string_view key, source_location const& loc) &&
 {
-    auto it = find(key);
-    if(it == end())
-    {
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::out_of_range, &loc );
-    }
-    return it->value();
+    return std::move( at(key, loc) );
 }
 
 //----------------------------------------------------------
diff --git a/inst/include/boost/json/impl/object.ipp b/inst/include/boost/json/impl/object.ipp
index fc11c399b..be9e6ffba 100644
--- a/inst/include/boost/json/impl/object.ipp
+++ b/inst/include/boost/json/impl/object.ipp
@@ -421,6 +421,45 @@ operator=(
     return *this;
 }
 
+//----------------------------------------------------------
+//
+// Lookup
+//
+//----------------------------------------------------------
+
+system::result<value&>
+object::
+try_at(string_view key) noexcept
+{
+    auto it = find(key);
+    if( it != end() )
+        return it->value();
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::out_of_range);
+    return ec;
+}
+
+system::result<value const&>
+object::
+try_at(string_view key) const noexcept
+{
+    auto it = find(key);
+    if( it != end() )
+        return it->value();
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::out_of_range);
+    return ec;
+}
+
+value const&
+object::
+at(string_view key, source_location const& loc) const&
+{
+    return try_at(key).value(loc);
+}
+
 //----------------------------------------------------------
 //
 // Modifiers
diff --git a/inst/include/boost/json/impl/parse.ipp b/inst/include/boost/json/impl/parse.ipp
index 8c9aacc82..f7c218905 100644
--- a/inst/include/boost/json/impl/parse.ipp
+++ b/inst/include/boost/json/impl/parse.ipp
@@ -23,7 +23,7 @@ namespace json {
 value
 parse(
     string_view s,
-    error_code& ec,
+    system::error_code& ec,
     storage_ptr sp,
     const parse_options& opt)
 {
@@ -44,7 +44,7 @@ parse(
     storage_ptr sp,
     parse_options const& opt)
 {
-    error_code jec;
+    system::error_code jec;
     value result = parse(s, jec, std::move(sp), opt);
     ec = jec;
     return result;
@@ -56,7 +56,7 @@ parse(
     storage_ptr sp,
     const parse_options& opt)
 {
-    error_code ec;
+    system::error_code ec;
     auto jv = parse(
         s, ec, std::move(sp), opt);
     if(ec)
@@ -67,7 +67,7 @@ parse(
 value
 parse(
     std::istream& is,
-    error_code& ec,
+    system::error_code& ec,
     storage_ptr sp,
     parse_options const& opt)
 {
@@ -110,7 +110,7 @@ parse(
     storage_ptr sp,
     parse_options const& opt)
 {
-    error_code jec;
+    system::error_code jec;
     value result = parse(is, jec, std::move(sp), opt);
     ec = jec;
     return result;
@@ -122,7 +122,7 @@ parse(
     storage_ptr sp,
     parse_options const& opt)
 {
-    error_code ec;
+    system::error_code ec;
     auto jv = parse(
         is, ec, std::move(sp), opt);
     if(ec)
diff --git a/inst/include/boost/json/impl/parse_into.hpp b/inst/include/boost/json/impl/parse_into.hpp
index 6029076ed..b061827fa 100644
--- a/inst/include/boost/json/impl/parse_into.hpp
+++ b/inst/include/boost/json/impl/parse_into.hpp
@@ -23,7 +23,7 @@ void
 parse_into(
     V& v,
     string_view sv,
-    error_code& ec,
+    system::error_code& ec,
     parse_options const& opt )
 {
     parser_for<V> p( opt, &v );
@@ -44,7 +44,7 @@ parse_into(
     std::error_code& ec,
     parse_options const& opt )
 {
-    error_code jec;
+    system::error_code jec;
     parse_into(v, sv, jec, opt);
     ec = jec;
 }
@@ -56,7 +56,7 @@ parse_into(
     string_view sv,
     parse_options const& opt )
 {
-    error_code ec;
+    system::error_code ec;
     parse_into(v, sv, ec, opt);
     if( ec.failed() )
         detail::throw_system_error( ec );
@@ -67,7 +67,7 @@ void
 parse_into(
     V& v,
     std::istream& is,
-    error_code& ec,
+    system::error_code& ec,
     parse_options const& opt )
 {
     parser_for<V> p( opt, &v );
@@ -107,7 +107,7 @@ parse_into(
     std::error_code& ec,
     parse_options const& opt )
 {
-    error_code jec;
+    system::error_code jec;
     parse_into(v, is, jec, opt);
     ec = jec;
 }
@@ -119,7 +119,7 @@ parse_into(
     std::istream& is,
     parse_options const& opt )
 {
-    error_code ec;
+    system::error_code ec;
     parse_into(v, is, ec, opt);
     if( ec.failed() )
         detail::throw_system_error( ec );
diff --git a/inst/include/boost/json/impl/parser.ipp b/inst/include/boost/json/impl/parser.ipp
index 110847f89..b6c14498b 100644
--- a/inst/include/boost/json/impl/parser.ipp
+++ b/inst/include/boost/json/impl/parser.ipp
@@ -61,7 +61,7 @@ parser::
 write_some(
     char const* data,
     std::size_t size,
-    error_code& ec)
+    system::error_code& ec)
 {
     auto const n = p_.write_some(
         false, data, size, ec);
@@ -76,7 +76,7 @@ write_some(
     std::size_t size,
     std::error_code& ec)
 {
-    error_code jec;
+    system::error_code jec;
     std::size_t const result = write_some(data, size, jec);
     ec = jec;
     return result;
@@ -88,7 +88,7 @@ write_some(
     char const* data,
     std::size_t size)
 {
-    error_code ec;
+    system::error_code ec;
     auto const n = write_some(
         data, size, ec);
     if(ec)
@@ -101,7 +101,7 @@ parser::
 write(
     char const* data,
     std::size_t size,
-    error_code& ec)
+    system::error_code& ec)
 {
     auto const n = write_some(
         data, size, ec);
@@ -120,7 +120,7 @@ write(
     std::size_t size,
     std::error_code& ec)
 {
-    error_code jec;
+    system::error_code jec;
     std::size_t const result = write(data, size, jec);
     ec = jec;
     return result;
@@ -132,7 +132,7 @@ write(
     char const* data,
     std::size_t size)
 {
-    error_code ec;
+    system::error_code ec;
     auto const n = write(
         data, size, ec);
     if(ec)
@@ -149,7 +149,7 @@ release()
         // prevent undefined behavior
         if(! p_.last_error())
         {
-            error_code ec;
+            system::error_code ec;
             BOOST_JSON_FAIL(ec, error::incomplete);
             p_.fail(ec);
         }
diff --git a/inst/include/boost/json/impl/pointer.ipp b/inst/include/boost/json/impl/pointer.ipp
index 2f0ab9230..d07c48082 100644
--- a/inst/include/boost/json/impl/pointer.ipp
+++ b/inst/include/boost/json/impl/pointer.ipp
@@ -164,7 +164,7 @@ bool is_past_the_end_token(
 std::size_t
 parse_number_token(
     string_view sv,
-    error_code& ec) noexcept
+    system::error_code& ec) noexcept
 {
     BOOST_ASSERT( !sv.empty() );
 
@@ -216,7 +216,7 @@ parse_number_token(
 string_view
 next_segment(
     string_view& sv,
-    error_code& ec) noexcept
+    system::error_code& ec) noexcept
 {
     if( sv.empty() )
         return sv;
@@ -285,7 +285,7 @@ Value*
 walk_pointer(
     Value& jv,
     string_view sv,
-    error_code& ec,
+    system::error_code& ec,
     OnObject on_object,
     OnArray on_array,
     OnScalar on_scalar)
@@ -342,17 +342,33 @@ walk_pointer(
 } // namespace detail
 
 value const&
-value::at_pointer(string_view ptr) const&
+value::at_pointer(string_view ptr, source_location const& loc) const&
 {
-    error_code ec;
+    return try_at_pointer(ptr).value(loc);
+}
+
+system::result<value const&>
+value::try_at_pointer(string_view ptr) const noexcept
+{
+    system::error_code ec;
+    auto const found = find_pointer(ptr, ec);
+    if( !found )
+        return ec;
+    return *found;
+}
+
+system::result<value&>
+value::try_at_pointer(string_view ptr) noexcept
+{
+    system::error_code ec;
     auto const found = find_pointer(ptr, ec);
     if( !found )
-        detail::throw_system_error( ec );
+        return ec;
     return *found;
 }
 
 value const*
-value::find_pointer( string_view sv, error_code& ec ) const noexcept
+value::find_pointer( string_view sv, system::error_code& ec ) const noexcept
 {
     return detail::walk_pointer(
         *this,
@@ -362,7 +378,7 @@ value::find_pointer( string_view sv, error_code& ec ) const noexcept
         {
             return detail::if_contains_token(obj, token);
         },
-        []( array const& arr, std::size_t index, error_code& ec )
+        []( array const& arr, std::size_t index, system::error_code& ec )
             -> value const*
         {
             if( ec )
@@ -377,7 +393,7 @@ value::find_pointer( string_view sv, error_code& ec ) const noexcept
 }
 
 value*
-value::find_pointer(string_view ptr, error_code& ec) noexcept
+value::find_pointer(string_view ptr, system::error_code& ec) noexcept
 {
     value const& self = *this;
     return const_cast<value*>(self.find_pointer(ptr, ec));
@@ -386,7 +402,7 @@ value::find_pointer(string_view ptr, error_code& ec) noexcept
 value const*
 value::find_pointer(string_view ptr, std::error_code& ec) const noexcept
 {
-    error_code jec;
+    system::error_code jec;
     value const* result = find_pointer(ptr, jec);
     ec = jec;
     return result;
@@ -403,7 +419,7 @@ value*
 value::set_at_pointer(
     string_view sv,
     value_ref ref,
-    error_code& ec,
+    system::error_code& ec,
     set_pointer_options const& opts )
 {
     value* result = detail::walk_pointer(
@@ -422,7 +438,7 @@ value::set_at_pointer(
             string key( token.begin(), token.end(), obj.storage() );
             return &obj.emplace( std::move(key), nullptr ).first->value();
         },
-        [ &opts ]( array& arr, std::size_t index, error_code& ec ) -> value*
+        [ &opts ]( array& arr, std::size_t index, system::error_code& ec ) -> value*
         {
             if( ec == error::past_the_end )
                 index = arr.size();
@@ -447,7 +463,7 @@ value::set_at_pointer(
             {
                 if( opts.create_arrays )
                 {
-                    error_code ec;
+                    system::error_code ec;
                     detail::parse_number_token( segment, ec );
                     if( !ec.failed() || ec == error::past_the_end )
                     {
@@ -478,21 +494,30 @@ value::set_at_pointer(
     std::error_code& ec,
     set_pointer_options const& opts )
 {
-    error_code jec;
+    system::error_code jec;
     value* result = set_at_pointer( sv, ref, jec, opts );
     ec = jec;
     return result;
 }
 
+system::result<value&>
+value::try_set_at_pointer(
+    string_view sv,
+    value_ref ref,
+    set_pointer_options const& opts )
+{
+    system::error_code ec;
+    value* result = set_at_pointer( sv, ref, ec, opts );
+    if( result )
+        return *result;
+    return ec;
+}
+
 value&
 value::set_at_pointer(
     string_view sv, value_ref ref, set_pointer_options const& opts )
 {
-    error_code ec;
-    value* result = set_at_pointer( sv, ref, ec, opts );
-    if( !result )
-        detail::throw_system_error( ec );
-    return *result;
+    return try_set_at_pointer(sv, ref, opts).value();
 }
 
 } // namespace json
diff --git a/inst/include/boost/json/impl/serialize.hpp b/inst/include/boost/json/impl/serialize.hpp
new file mode 100644
index 000000000..ef2e1d823
--- /dev/null
+++ b/inst/include/boost/json/impl/serialize.hpp
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2023 Dmitry Arkhipov (grisumbras@yandex.ru)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/json
+//
+
+#ifndef BOOST_JSON_IMPL_SERIALIZE_HPP
+#define BOOST_JSON_IMPL_SERIALIZE_HPP
+
+#include <boost/json/serializer.hpp>
+
+namespace boost {
+namespace json {
+namespace detail {
+
+BOOST_JSON_DECL
+void
+serialize_impl(std::string& s, serializer& sr);
+
+} // namespace detail
+
+template<class T>
+std::string
+serialize(T const& t, serialize_options const& opts)
+{
+    unsigned char buf[256];
+    serializer sr(
+        storage_ptr(),
+        buf,
+        sizeof(buf),
+        opts);
+    std::string s;
+    sr.reset(&t);
+    detail::serialize_impl(s, sr);
+    return s;
+}
+
+} // namespace json
+} // namespace boost
+
+#endif // BOOST_JSON_IMPL_SERIALIZE_HPP
diff --git a/inst/include/boost/json/impl/serialize.ipp b/inst/include/boost/json/impl/serialize.ipp
index a3ec1f7b5..f4ec35d6e 100644
--- a/inst/include/boost/json/impl/serialize.ipp
+++ b/inst/include/boost/json/impl/serialize.ipp
@@ -50,7 +50,8 @@ get_stream_flags( std::ostream& os )
 
 } // namespace
 
-static
+namespace detail {
+
 void
 serialize_impl(
     std::string& s,
@@ -94,6 +95,8 @@ serialize_impl(
     s.resize(len);
 }
 
+} // namespace detail
+
 std::string
 serialize(
     value const& jv,
diff --git a/inst/include/boost/json/impl/serializer.hpp b/inst/include/boost/json/impl/serializer.hpp
new file mode 100644
index 000000000..f759d96c4
--- /dev/null
+++ b/inst/include/boost/json/impl/serializer.hpp
@@ -0,0 +1,844 @@
+//
+// Copyright (c) 2024 Dmitry Arkhipov (grisumbras@yandex.ru)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/json
+//
+
+#ifndef BOOST_JSON_IMPL_SERIALIZER_HPP
+#define BOOST_JSON_IMPL_SERIALIZER_HPP
+
+#include <boost/describe/enum_to_string.hpp>
+#include <boost/json/conversion.hpp>
+#include <cstddef>
+
+namespace boost {
+namespace json {
+namespace detail {
+
+enum class writer::state : char
+{
+    str1, str2, str3, esc1, utf1,
+    utf2, utf3, utf4, utf5,
+    lit,
+    arr1, arr2, arr3, arr4,
+    obj1, obj2, obj3, obj4, obj5, obj6
+};
+
+bool
+writer::
+suspend(state st)
+{
+    st_.push(st);
+    return false;
+}
+
+template<class U, class T>
+bool
+writer::
+suspend(state st, U u, T const* pt)
+{
+    st_.push(pt);
+    st_.push(u);
+    st_.push(st);
+    return false;
+}
+
+template<class T, bool StackEmpty>
+bool
+write_impl(writer& w, stream& ss);
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(null_like_conversion_tag, writer& w, stream& ss)
+{
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if( StackEmpty || w.st_.empty() )
+        return write_null(w, ss);
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    return resume_buffer(w, ss);
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(bool_conversion_tag, writer& w, stream& ss)
+{
+    BOOST_ASSERT( w.p_ );
+    auto const t = *reinterpret_cast<T const*>(w.p_);
+
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if( StackEmpty || w.st_.empty() )
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        if( t )
+            return write_true(w, ss);
+        else
+            return write_false(w, ss);
+    }
+
+    return resume_buffer(w, ss);
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(integral_conversion_tag, writer& w, stream& ss0)
+{
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if( StackEmpty || w.st_.empty() )
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        auto const& t = *reinterpret_cast<T const*>(w.p_);
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+//# pragma clang diagnostic ignored "-Wsign-compare"
+#elif defined(__GNUC__)
+# pragma GCC diagnostic push
+//# pragma GCC  diagnostic ignored "-Wsign-compare"
+#elif defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4018 )
+# pragma warning( disable : 4127 )
+#endif
+
+        if( t < 0 )
+        {
+            // T is obviously signed, so this comparison is safe
+            if( t >= (std::numeric_limits<std::int64_t>::min)() )
+            {
+                std::int64_t i = t;
+                return write_int64(w, ss0, i);
+            }
+        }
+        else if( t <= (std::numeric_limits<std::uint64_t>::max)() )
+        {
+            std::uint64_t u = t;
+            return write_uint64(w, ss0, u);
+        }
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#elif defined(__GNUC__)
+# pragma GCC diagnostic pop
+#elif defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4244 )
+#endif
+        double d = t;
+        return write_double(w, ss0, d);
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    }
+
+    return resume_buffer(w, ss0);
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(floating_point_conversion_tag, writer& w, stream& ss0)
+{
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if( StackEmpty || w.st_.empty() )
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        double d = *reinterpret_cast<T const*>(w.p_);
+        return write_double(w, ss0, d);
+    }
+
+    return resume_buffer(w, ss0);
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(string_like_conversion_tag, writer& w, stream& ss0)
+{
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if( StackEmpty || w.st_.empty() )
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        string_view const sv = *reinterpret_cast<T const*>(w.p_);
+        w.cs0_ = { sv.data(), sv.size() };
+        return write_string(w, ss0);
+    }
+
+    return resume_string(w, ss0);
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(sequence_conversion_tag, writer& w, stream& ss0)
+{
+    using It = iterator_type<T const>;
+    using Elem = value_type<T>;
+
+    T const* pt;
+    local_stream ss(ss0);
+    It it;
+    It end;
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+    {
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+        BOOST_ASSERT( w.p_ );
+        pt = reinterpret_cast<T const*>(w.p_);
+        it = std::begin(*pt);
+        end = std::end(*pt);
+    }
+    else
+    {
+        writer::state st;
+        w.st_.pop(st);
+        w.st_.pop(it);
+        w.st_.pop(pt);
+        end = std::end(*pt);
+        switch(st)
+        {
+        default:
+        case writer::state::arr1: goto do_arr1;
+        case writer::state::arr2: goto do_arr2;
+        case writer::state::arr3: goto do_arr3;
+        case writer::state::arr4: goto do_arr4;
+            break;
+        }
+    }
+do_arr1:
+    if(BOOST_JSON_LIKELY(ss))
+        ss.append('[');
+    else
+        return w.suspend(writer::state::arr1, it, pt);
+    if(it == end)
+        goto do_arr4;
+    for(;;)
+    {
+        w.p_ = std::addressof(*it);
+do_arr2:
+        if( !write_impl<Elem, StackEmpty>(w, ss) )
+            return w.suspend(writer::state::arr2, it, pt);
+        if(BOOST_JSON_UNLIKELY( ++it == end ))
+            break;
+do_arr3:
+        if(BOOST_JSON_LIKELY(ss))
+            ss.append(',');
+        else
+            return w.suspend(writer::state::arr3, it, pt);
+    }
+do_arr4:
+    if(BOOST_JSON_LIKELY(ss))
+        ss.append(']');
+    else
+        return w.suspend(writer::state::arr4, it, pt);
+    return true;
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(map_like_conversion_tag, writer& w, stream& ss0)
+{
+    using It = iterator_type<T const>;
+    using Mapped = mapped_type<T>;
+
+    T const* pt;
+    local_stream ss(ss0);
+    It it;
+    It end;
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        BOOST_ASSERT( w.p_ );
+        pt = reinterpret_cast<T const*>(w.p_);
+        it = std::begin(*pt);
+        end = std::end(*pt);
+    }
+    else
+    {
+        writer::state st;
+        w.st_.pop(st);
+        w.st_.pop(it);
+        w.st_.pop(pt);
+        end = std::end(*pt);
+        switch(st)
+        {
+        default:
+        case writer::state::obj1: goto do_obj1;
+        case writer::state::obj2: goto do_obj2;
+        case writer::state::obj3: goto do_obj3;
+        case writer::state::obj4: goto do_obj4;
+        case writer::state::obj5: goto do_obj5;
+        case writer::state::obj6: goto do_obj6;
+            break;
+        }
+    }
+do_obj1:
+    if(BOOST_JSON_LIKELY( ss ))
+        ss.append('{');
+    else
+        return w.suspend(writer::state::obj1, it, pt);
+    if(BOOST_JSON_UNLIKELY( it == end ))
+        goto do_obj6;
+    for(;;)
+    {
+        {
+            using std::get;
+            string_view const sv = get<0>(*it);
+            w.cs0_ = { sv.data(), sv.size() };
+        }
+        if( true )
+        {
+            if(BOOST_JSON_UNLIKELY( !write_string(w, ss) ))
+                return w.suspend(writer::state::obj2, it, pt);
+        }
+        else
+        {
+do_obj2:
+            if(BOOST_JSON_UNLIKELY( !resume_string(w, ss) ))
+                return w.suspend(writer::state::obj2, it, pt);
+        }
+do_obj3:
+        if(BOOST_JSON_LIKELY(ss))
+            ss.append(':');
+        else
+            return w.suspend(writer::state::obj3, it, pt);
+do_obj4:
+        {
+            using std::get;
+            w.p_ = std::addressof( get<1>(*it) );
+        }
+        if(BOOST_JSON_UNLIKELY(( !write_impl<Mapped, StackEmpty>(w, ss) )))
+            return w.suspend(writer::state::obj4, it, pt);
+        ++it;
+        if(BOOST_JSON_UNLIKELY(it == end))
+            break;
+do_obj5:
+        if(BOOST_JSON_LIKELY(ss))
+            ss.append(',');
+        else
+            return w.suspend(writer::state::obj5, it, pt);
+    }
+do_obj6:
+    if(BOOST_JSON_LIKELY( ss ))
+    {
+        ss.append('}');
+        return true;
+    }
+    return w.suspend(writer::state::obj6, it, pt);
+}
+
+template< class T, bool StackEmpty >
+struct serialize_tuple_elem_helper
+{
+    writer& w;
+    stream& ss;
+    T const* pt;
+
+    template< std::size_t I >
+    bool
+    operator()( std::integral_constant<std::size_t, I> ) const
+    {
+        using std::get;
+        w.p_ = std::addressof( get<I>(*pt) );
+
+        using Elem = tuple_element_t<I, T>;
+        return write_impl<Elem, StackEmpty>(w, ss);
+    }
+};
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(tuple_conversion_tag, writer& w, stream& ss0)
+{
+    T const* pt;
+    local_stream ss(ss0);
+    std::size_t cur;
+    constexpr std::size_t N = std::tuple_size<T>::value;
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+    {
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+        BOOST_ASSERT( w.p_ );
+        pt = reinterpret_cast<T const*>(w.p_);
+        cur = 0;
+    }
+    else
+    {
+        writer::state st;
+        w.st_.pop(st);
+        w.st_.pop(cur);
+        w.st_.pop(pt);
+        switch(st)
+        {
+        default:
+        case writer::state::arr1: goto do_arr1;
+        case writer::state::arr2: goto do_arr2;
+        case writer::state::arr3: goto do_arr3;
+        case writer::state::arr4: goto do_arr4;
+            break;
+        }
+    }
+do_arr1:
+    if(BOOST_JSON_LIKELY(ss))
+        ss.append('[');
+    else
+        return w.suspend(writer::state::arr1, cur, pt);
+    for(;;)
+    {
+do_arr2:
+        {
+            bool const stop = !mp11::mp_with_index<N>(
+                cur,
+                serialize_tuple_elem_helper<T, StackEmpty>{w, ss, pt});
+            if(BOOST_JSON_UNLIKELY( stop ))
+                return w.suspend(writer::state::arr2, cur, pt);
+        }
+        if(BOOST_JSON_UNLIKELY( ++cur == N ))
+            break;
+do_arr3:
+        if(BOOST_JSON_LIKELY(ss))
+            ss.append(',');
+        else
+            return w.suspend(writer::state::arr3, cur, pt);
+    }
+do_arr4:
+    if(BOOST_JSON_LIKELY(ss))
+        ss.append(']');
+    else
+        return w.suspend(writer::state::arr4, cur, pt);
+    return true;
+}
+
+template< class T, bool StackEmpty >
+struct serialize_struct_elem_helper
+{
+    writer& w;
+    local_stream& ss;
+    T const* pt;
+    writer::state st;
+
+    template< std::size_t I >
+    writer::state
+    operator()( std::integral_constant<std::size_t, I> ) const
+    {
+        using Ds = described_members<T>;
+        using D = mp11::mp_at_c<Ds, I>;
+        using M = described_member_t<T, D>;
+
+        switch(st)
+        {
+        case writer::state::obj2: goto do_obj2;
+        case writer::state::obj3: goto do_obj3;
+        case writer::state::obj4: goto do_obj4;
+        default: break;
+        }
+
+        {
+            string_view const sv = D::name;
+            w.cs0_ = { sv.data(), sv.size() };
+        }
+        if( true )
+        {
+            if(BOOST_JSON_UNLIKELY( !write_string(w, ss) ))
+                return writer::state::obj2;
+        }
+        else
+        {
+do_obj2:
+            if(BOOST_JSON_UNLIKELY( !resume_string(w, ss) ))
+                return writer::state::obj2;
+        }
+do_obj3:
+        if(BOOST_JSON_LIKELY(ss))
+            ss.append(':');
+        else
+            return writer::state::obj3;
+do_obj4:
+        w.p_ = std::addressof( pt->* D::pointer );
+        if(BOOST_JSON_UNLIKELY((
+                !write_impl<M, StackEmpty>(w, ss) )))
+            return writer::state::obj4;
+
+        return writer::state{};
+    }
+};
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(described_class_conversion_tag, writer& w, stream& ss0)
+{
+    using Ds = described_members<T>;
+
+    T const* pt;
+    local_stream ss(ss0);
+    std::size_t cur;
+    constexpr std::size_t N = mp11::mp_size<Ds>::value;
+    writer::state st;
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        BOOST_ASSERT( w.p_ );
+        pt = reinterpret_cast<T const*>(w.p_);
+        cur = 0;
+    }
+    else
+    {
+        w.st_.pop(st);
+        w.st_.pop(cur);
+        w.st_.pop(pt);
+        switch(st)
+        {
+        default:
+        case writer::state::obj1: goto do_obj1;
+        case writer::state::obj2: // fall through
+        case writer::state::obj3: // fall through
+        case writer::state::obj4: goto do_obj2;
+        case writer::state::obj5: goto do_obj5;
+        case writer::state::obj6: goto do_obj6;
+            break;
+        }
+    }
+do_obj1:
+    if(BOOST_JSON_LIKELY( ss ))
+        ss.append('{');
+    else
+        return w.suspend(writer::state::obj1, cur, pt);
+    if(BOOST_JSON_UNLIKELY( cur == N ))
+        goto do_obj6;
+    for(;;)
+    {
+        st = {};
+do_obj2:
+        st = mp11::mp_with_index<N>(
+            cur,
+            serialize_struct_elem_helper<T, StackEmpty>{w, ss, pt, st});
+        if(BOOST_JSON_UNLIKELY( st != writer::state{} ))
+            return w.suspend(st, cur, pt);
+        ++cur;
+        if(BOOST_JSON_UNLIKELY(cur == N))
+            break;
+do_obj5:
+        if(BOOST_JSON_LIKELY(ss))
+            ss.append(',');
+        else
+            return w.suspend(writer::state::obj5, cur, pt);
+    }
+do_obj6:
+    if(BOOST_JSON_LIKELY( ss ))
+    {
+        ss.append('}');
+        return true;
+    }
+    return w.suspend(writer::state::obj6, cur, pt);
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(described_enum_conversion_tag, writer& w, stream& ss)
+{
+#ifdef BOOST_DESCRIBE_CXX14
+    using Integer = typename std::underlying_type<T>::type;
+
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        BOOST_ASSERT( w.p_ );
+        T const* pt = reinterpret_cast<T const*>(w.p_);
+        char const* const name = describe::enum_to_string(*pt, nullptr);
+        if( name )
+        {
+            string_view const sv = name;
+            w.cs0_ = { sv.data(), sv.size() };
+            return write_string(w, ss);
+        }
+        else
+        {
+            Integer n = static_cast<Integer>(*pt);
+            w.p_ = &n;
+            return write_impl<Integer, true>(w, ss);
+        }
+    }
+    else
+    {
+        writer::state st;
+        w.st_.peek(st);
+        if( st == writer::state::lit )
+            return write_impl<Integer, false>(w, ss);
+        else
+            return resume_string(w, ss);
+    }
+#else // BOOST_DESCRIBE_CXX14
+    (void)w;
+    (void)ss;
+    static_assert(
+        !std::is_same<T, T>::value,
+        "described enums require C++14 support");
+    return false;
+#endif // BOOST_DESCRIBE_CXX14
+}
+
+template< class T, bool StackEmpty >
+struct serialize_variant_elem_helper
+{
+    writer& w;
+    stream& ss;
+
+    template<class Elem>
+    bool
+    operator()(Elem const& x) const
+    {
+        w.p_ = std::addressof(x);
+        return write_impl<Elem, true>(w, ss);
+    }
+};
+
+template< class T >
+struct serialize_variant_elem_helper<T, false>
+{
+    writer& w;
+    stream& ss;
+
+    template< std::size_t I >
+    bool
+    operator()( std::integral_constant<std::size_t, I> ) const
+    {
+        using std::get;
+        using Elem = remove_cvref<decltype(get<I>(
+            std::declval<T const&>() ))>;
+        return write_impl<Elem, false>(w, ss);
+    }
+};
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(variant_conversion_tag, writer& w, stream& ss)
+{
+    T const* pt;
+
+    using Index = remove_cvref<decltype( pt->index() )>;
+
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        BOOST_ASSERT( w.p_ );
+        pt = reinterpret_cast<T const*>(w.p_);
+        if(BOOST_JSON_LIKELY((
+                visit(serialize_variant_elem_helper<T, true>{w, ss}, *pt))))
+            return true;
+
+        Index const ix = pt->index();
+        w.st_.push(ix);
+        return false;
+    }
+    else
+    {
+        Index ix;
+        w.st_.pop(ix);
+
+        constexpr std::size_t N = mp11::mp_size<T>::value;
+        if(BOOST_JSON_LIKELY(( mp11::mp_with_index<N>(
+                ix,
+                serialize_variant_elem_helper<T, false>{w, ss}))))
+            return true;
+
+        w.st_.push(ix);
+        return false;
+    }
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(optional_conversion_tag, writer& w, stream& ss)
+{
+    using Elem = value_result_type<T>;
+
+    bool done;
+    bool has_value;
+
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        BOOST_ASSERT( w.p_ );
+        T const* pt = reinterpret_cast<T const*>(w.p_);
+        has_value = static_cast<bool>(*pt);
+        if( has_value )
+        {
+            w.p_ = std::addressof( *(*pt) );
+            done = write_impl<Elem, true>(w, ss);
+        }
+        else
+        {
+            w.p_ = nullptr;
+            done = write_impl<std::nullptr_t, true>(w, ss);;
+        }
+    }
+    else
+    {
+        w.st_.pop(has_value);
+
+        if( has_value )
+            done = write_impl<Elem, false>(w, ss);
+        else
+            done = write_impl<std::nullptr_t, false>(w, ss);
+    }
+
+    if(BOOST_JSON_UNLIKELY( !done ))
+        w.st_.push(has_value);
+
+    return done;
+}
+
+template<class T, bool StackEmpty>
+BOOST_FORCEINLINE
+bool
+write_impl(path_conversion_tag, writer& w, stream& ss)
+{
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4127 )
+#endif
+    if(StackEmpty || w.st_.empty())
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+    {
+        BOOST_ASSERT( w.p_ );
+        T const* pt = reinterpret_cast<T const*>(w.p_);
+
+        std::string const s = pt->generic_string();
+        w.cs0_ = { s.data(), s.size() };
+        if(BOOST_JSON_LIKELY( write_string(w, ss) ))
+            return true;
+
+        std::size_t const used = w.cs0_.used( s.data() );
+        w.st_.push( used );
+        w.st_.push( std::move(s) );
+        return false;
+    }
+    else
+    {
+        std::string s;
+        std::size_t used;
+        w.st_.pop( s );
+        w.st_.pop( used );
+
+        w.cs0_ = { s.data(), s.size() };
+        w.cs0_.skip(used);
+
+        if(BOOST_JSON_LIKELY( resume_string(w, ss) ))
+            return true;
+
+        used = w.cs0_.used( s.data() );
+        w.st_.push( used );
+        w.st_.push( std::move(s) );
+        return false;
+    }
+}
+
+template<class T, bool StackEmpty>
+bool
+write_impl(writer& w, stream& ss)
+{
+    using cat = detail::generic_conversion_category<T>;
+    return write_impl<T, StackEmpty>( cat(), w, ss );
+}
+
+} // namespace detail
+
+template<class T>
+void
+serializer::reset(T const* p) noexcept
+{
+    BOOST_STATIC_ASSERT( !std::is_pointer<T>::value );
+    BOOST_STATIC_ASSERT( std::is_object<T>::value );
+
+    p_ = p;
+    fn0_ = &detail::write_impl<T, true>;
+    fn1_ = &detail::write_impl<T, false>;
+    st_.clear();
+    done_ = false;
+}
+
+} // namespace json
+} // namespace boost
+
+#endif // BOOST_JSON_IMPL_SERIALIZER_HPP
diff --git a/inst/include/boost/json/impl/serializer.ipp b/inst/include/boost/json/impl/serializer.ipp
index a54d9171b..56f39ade4 100644
--- a/inst/include/boost/json/impl/serializer.ipp
+++ b/inst/include/boost/json/impl/serializer.ipp
@@ -13,7 +13,6 @@
 #include <boost/json/serializer.hpp>
 #include <boost/json/detail/format.hpp>
 #include <boost/json/detail/sse2.hpp>
-#include <ostream>
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -22,23 +21,44 @@
 
 namespace boost {
 namespace json {
+namespace detail {
 
-enum class serializer::state : char
+struct int64_formatter
 {
-    nul1, nul2, nul3, nul4,
-    tru1, tru2, tru3, tru4,
-    fal1, fal2, fal3, fal4, fal5,
-    str1, str2, str3, str4, esc1,
-    utf1, utf2, utf3, utf4, utf5,
-    num,
-    arr1, arr2, arr3, arr4,
-    obj1, obj2, obj3, obj4, obj5, obj6
+    std::int64_t i;
+
+    std::size_t
+    operator()(char* dst) const noexcept
+    {
+        return format_int64(dst, i);
+    }
 };
 
-//----------------------------------------------------------
+struct uint64_formatter
+{
+    std::uint64_t u;
 
-serializer::
-serializer(
+    std::size_t
+    operator()(char* dst) const noexcept
+    {
+        return format_uint64(dst, u);
+    }
+};
+
+struct double_formatter
+{
+    double d;
+    bool allow_infinity_and_nan;
+
+    std::size_t
+    operator()(char* dst) const noexcept
+    {
+        return format_double(dst, d, allow_infinity_and_nan);
+    }
+};
+
+writer::
+writer(
     storage_ptr sp,
     unsigned char* buf,
     std::size_t buf_size,
@@ -49,198 +69,134 @@ serializer(
         buf_size)
     , opts_(opts)
 {
+    // ensure room for \uXXXX escape plus one
+    BOOST_STATIC_ASSERT(sizeof(buf_) >= 7);
 }
 
 bool
-serializer::
-suspend(state st)
+BOOST_FORCEINLINE
+write_buffer(writer& w, stream& ss0)
 {
-    st_.push(st);
-    return false;
+    local_stream ss(ss0);
+    auto const n = ss.remain();
+    if( n < w.cs0_.remain() )
+    {
+        ss.append(w.cs0_.data(), n);
+        w.cs0_.skip(n);
+        return w.suspend(writer::state::lit);
+    }
+    ss.append( w.cs0_.data(), w.cs0_.remain() );
+    return true;
 }
 
+template< class F >
 bool
-serializer::
-suspend(
-    state st,
-    array::const_iterator it,
-    array const* pa)
+write_buffer(writer& w, stream& ss0, F f)
 {
-    st_.push(pa);
-    st_.push(it);
-    st_.push(st);
-    return false;
+    BOOST_ASSERT( w.st_.empty() );
+
+    local_stream ss(ss0);
+    if(BOOST_JSON_LIKELY( ss.remain() >= detail::max_number_chars ))
+    {
+        ss.advance( f(ss.data()) );
+        return true;
+    }
+
+    w.cs0_ = { w.buf_, f(w.buf_) };
+    return write_buffer(w, ss);
 }
 
+template<literals Lit>
 bool
-serializer::
-suspend(
-    state st,
-    object::const_iterator it,
-    object const* po)
+write_literal(writer& w, stream& ss)
 {
-    st_.push(po);
-    st_.push(it);
-    st_.push(st);
-    return false;
+    constexpr std::size_t index = literal_index(Lit);
+    constexpr char const* literal = literal_strings[index];
+    constexpr std::size_t sz = literal_sizes[index];
+
+    std::size_t const n = ss.remain();
+    if(BOOST_JSON_LIKELY( n >= sz ))
+    {
+        ss.append( literal, sz );
+        return true;
+    }
+
+    ss.append(literal, n);
+
+    w.cs0_ = {literal + n, sz - n};
+    return w.suspend(writer::state::lit);
 }
 
-template<bool StackEmpty>
 bool
-serializer::
-write_null(stream& ss0)
+write_true(writer& w, stream& ss)
 {
-    local_stream ss(ss0);
-    if(! StackEmpty && ! st_.empty())
-    {
-        state st;
-        st_.pop(st);
-        switch(st)
-        {
-        default:
-        case state::nul1: goto do_nul1;
-        case state::nul2: goto do_nul2;
-        case state::nul3: goto do_nul3;
-        case state::nul4: goto do_nul4;
-        }
-    }
-do_nul1:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('n');
-    else
-        return suspend(state::nul1);
-do_nul2:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('u');
-    else
-        return suspend(state::nul2);
-do_nul3:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('l');
-    else
-        return suspend(state::nul3);
-do_nul4:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('l');
-    else
-        return suspend(state::nul4);
-    return true;
+    return write_literal<literals::true_>(w, ss);
 }
 
-template<bool StackEmpty>
 bool
-serializer::
-write_true(stream& ss0)
+write_false(writer& w, stream& ss)
 {
-    local_stream ss(ss0);
-    if(! StackEmpty && ! st_.empty())
-    {
-        state st;
-        st_.pop(st);
-        switch(st)
-        {
-        default:
-        case state::tru1: goto do_tru1;
-        case state::tru2: goto do_tru2;
-        case state::tru3: goto do_tru3;
-        case state::tru4: goto do_tru4;
-        }
-    }
-do_tru1:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('t');
-    else
-        return suspend(state::tru1);
-do_tru2:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('r');
-    else
-        return suspend(state::tru2);
-do_tru3:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('u');
-    else
-        return suspend(state::tru3);
-do_tru4:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('e');
-    else
-        return suspend(state::tru4);
-    return true;
+    return write_literal<literals::false_>(w, ss);
 }
 
-template<bool StackEmpty>
 bool
-serializer::
-write_false(stream& ss0)
+write_null(writer& w, stream& ss)
 {
-    local_stream ss(ss0);
-    if(! StackEmpty && ! st_.empty())
-    {
-        state st;
-        st_.pop(st);
-        switch(st)
-        {
-        default:
-        case state::fal1: goto do_fal1;
-        case state::fal2: goto do_fal2;
-        case state::fal3: goto do_fal3;
-        case state::fal4: goto do_fal4;
-        case state::fal5: goto do_fal5;
-        }
-    }
-do_fal1:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('f');
-    else
-        return suspend(state::fal1);
-do_fal2:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('a');
-    else
-        return suspend(state::fal2);
-do_fal3:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('l');
-    else
-        return suspend(state::fal3);
-do_fal4:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('s');
-    else
-        return suspend(state::fal4);
-do_fal5:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('e');
-    else
-        return suspend(state::fal5);
-    return true;
+    return write_literal<literals::null>(w, ss);
+}
+
+bool
+write_int64(writer& w, stream& ss0, std::int64_t i)
+{
+    return write_buffer( w, ss0, int64_formatter{i} );
+}
+
+bool
+write_uint64(writer& w, stream& ss0, std::uint64_t u)
+{
+    return write_buffer( w, ss0, uint64_formatter{u} );
+}
+
+bool
+write_double(writer& w, stream& ss0, double d)
+{
+    return write_buffer(
+        w, ss0, double_formatter{d, w.opts_.allow_infinity_and_nan} );
+}
+
+bool
+resume_buffer(writer& w, stream& ss0)
+{
+    BOOST_ASSERT( !w.st_.empty() );
+    writer::state st;
+    w.st_.pop(st);
+    BOOST_ASSERT(st == writer::state::lit);
+
+    return write_buffer(w, ss0);
 }
 
 template<bool StackEmpty>
 bool
-serializer::
-write_string(stream& ss0)
+do_write_string(writer& w, stream& ss0)
 {
     local_stream ss(ss0);
-    local_const_stream cs(cs0_);
-    if(! StackEmpty && ! st_.empty())
+    local_const_stream cs(w.cs0_);
+    if(! StackEmpty && ! w.st_.empty())
     {
-        state st;
-        st_.pop(st);
+        writer::state st;
+        w.st_.pop(st);
         switch(st)
         {
         default:
-        case state::str1: goto do_str1;
-        case state::str2: goto do_str2;
-        case state::str3: goto do_str3;
-        case state::str4: goto do_str4;
-        case state::esc1: goto do_esc1;
-        case state::utf1: goto do_utf1;
-        case state::utf2: goto do_utf2;
-        case state::utf3: goto do_utf3;
-        case state::utf4: goto do_utf4;
-        case state::utf5: goto do_utf5;
+        case writer::state::str1: goto do_str1;
+        case writer::state::str2: goto do_str2;
+        case writer::state::str3: goto do_str3;
+        case writer::state::esc1: goto do_esc1;
+        case writer::state::utf1: goto do_utf1;
+        case writer::state::utf2: goto do_utf2;
+        case writer::state::utf3: goto do_utf3;
+        case writer::state::utf4: goto do_utf4;
+        case writer::state::utf5: goto do_utf5;
         }
     }
     static constexpr char hex[] = "0123456789abcdef";
@@ -259,7 +215,7 @@ do_str1:
     if(BOOST_JSON_LIKELY(ss))
         ss.append('\x22'); // '"'
     else
-        return suspend(state::str1);
+        return w.suspend(writer::state::str1);
 
     // fast loop,
     // copy unescaped
@@ -280,7 +236,7 @@ do_str2:
                 ss.append(cs.data(), n);
                 cs.skip(n);
                 if(! ss)
-                    return suspend(state::str2);
+                    return w.suspend(writer::state::str2);
             }
         }
         else
@@ -291,7 +247,7 @@ do_str2:
     }
     else
     {
-        return suspend(state::str2);
+        return w.suspend(writer::state::str2);
     }
 
     // slow loop,
@@ -318,9 +274,9 @@ do_str3:
                 }
                 else
                 {
-                    buf_[0] = c;
-                    return suspend(
-                        state::esc1);
+                    w.buf_[0] = c;
+                    return w.suspend(
+                        writer::state::esc1);
                 }
             }
             else
@@ -337,9 +293,9 @@ do_str3:
                 else
                 {
                     ss.append('\\');
-                    buf_[0] = hex[static_cast<
+                    w.buf_[0] = hex[static_cast<
                         unsigned char>(ch) >> 4];
-                    buf_[1] = hex[static_cast<
+                    w.buf_[1] = hex[static_cast<
                         unsigned char>(ch) & 15];
                     goto do_utf1;
                 }
@@ -351,424 +307,174 @@ do_str3:
             return true;
         }
     }
-    return suspend(state::str3);
-
-do_str4:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('\x22'); // '"'
-    else
-        return suspend(state::str4);
+    return w.suspend(writer::state::str3);
 
 do_esc1:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append(buf_[0]);
-    else
-        return suspend(state::esc1);
+    BOOST_ASSERT(ss);
+    ss.append(w.buf_[0]);
     goto do_str3;
 
 do_utf1:
     if(BOOST_JSON_LIKELY(ss))
         ss.append('u');
     else
-        return suspend(state::utf1);
+        return w.suspend(writer::state::utf1);
 do_utf2:
     if(BOOST_JSON_LIKELY(ss))
         ss.append('0');
     else
-        return suspend(state::utf2);
+        return w.suspend(writer::state::utf2);
 do_utf3:
     if(BOOST_JSON_LIKELY(ss))
         ss.append('0');
     else
-        return suspend(state::utf3);
+        return w.suspend(writer::state::utf3);
 do_utf4:
     if(BOOST_JSON_LIKELY(ss))
-        ss.append(buf_[0]);
+        ss.append(w.buf_[0]);
     else
-        return suspend(state::utf4);
+        return w.suspend(writer::state::utf4);
 do_utf5:
     if(BOOST_JSON_LIKELY(ss))
-        ss.append(buf_[1]);
+        ss.append(w.buf_[1]);
     else
-        return suspend(state::utf5);
+        return w.suspend(writer::state::utf5);
     goto do_str3;
 }
 
-template<bool StackEmpty>
 bool
-serializer::
-write_number(stream& ss0)
+write_string(writer& w, stream& ss0)
 {
-    local_stream ss(ss0);
-    if(StackEmpty || st_.empty())
-    {
-        switch(jv_->kind())
-        {
-        default:
-        case kind::int64:
-            if(BOOST_JSON_LIKELY(
-                ss.remain() >=
-                    detail::max_number_chars))
-            {
-                ss.advance(detail::format_int64(
-                    ss.data(), jv_->get_int64()));
-                return true;
-            }
-            cs0_ = { buf_, detail::format_int64(
-                buf_, jv_->get_int64()) };
-            break;
+    return do_write_string<true>(w, ss0);
+}
 
-        case kind::uint64:
-            if(BOOST_JSON_LIKELY(
-                ss.remain() >=
-                    detail::max_number_chars))
-            {
-                ss.advance(detail::format_uint64(
-                    ss.data(), jv_->get_uint64()));
-                return true;
-            }
-            cs0_ = { buf_, detail::format_uint64(
-                buf_, jv_->get_uint64()) };
-            break;
+bool
+resume_string(writer& w, stream& ss0)
+{
+    return do_write_string<false>(w, ss0);
+}
 
-        case kind::double_:
-            if(BOOST_JSON_LIKELY(
-                ss.remain() >=
-                    detail::max_number_chars))
-            {
-                ss.advance(
-                    detail::format_double(
-                        ss.data(),
-                        jv_->get_double(),
-                        opts_.allow_infinity_and_nan));
-                return true;
-            }
-            cs0_ = { buf_, detail::format_double(
-                buf_, jv_->get_double(), opts_.allow_infinity_and_nan) };
-            break;
-        }
-    }
-    else
-    {
-        state st;
-        st_.pop(st);
-        BOOST_ASSERT(
-            st == state::num);
-    }
-    auto const n = ss.remain();
-    if(n < cs0_.remain())
-    {
-        ss.append(cs0_.data(), n);
-        cs0_.skip(n);
-        return suspend(state::num);
-    }
-    ss.append(
-        cs0_.data(), cs0_.remain());
-    return true;
+template<bool StackEmpty>
+bool
+write_value(writer& w, stream& ss);
+
+template< class T, bool StackEmpty >
+BOOST_FORCEINLINE
+bool
+write_impl(no_conversion_tag, writer& w, stream& ss)
+{
+    return write_value<StackEmpty>(w, ss);
 }
 
 template<bool StackEmpty>
 bool
-serializer::
-write_array(stream& ss0)
+write_array(writer& w, stream& ss)
 {
-    array const* pa;
-    local_stream ss(ss0);
-    array::const_iterator it;
-    array::const_iterator end;
-    if(StackEmpty || st_.empty())
-    {
-        pa = pa_;
-        it = pa->begin();
-        end = pa->end();
-    }
-    else
-    {
-        state st;
-        st_.pop(st);
-        st_.pop(it);
-        st_.pop(pa);
-        end = pa->end();
-        switch(st)
-        {
-        default:
-        case state::arr1: goto do_arr1;
-        case state::arr2: goto do_arr2;
-        case state::arr3: goto do_arr3;
-        case state::arr4: goto do_arr4;
-            break;
-        }
-    }
-do_arr1:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('[');
-    else
-        return suspend(
-            state::arr1, it, pa);
-    if(it == end)
-        goto do_arr4;
-    for(;;)
-    {
-do_arr2:
-        jv_ = &*it;
-        if(! write_value<StackEmpty>(ss))
-            return suspend(
-                state::arr2, it, pa);
-        if(BOOST_JSON_UNLIKELY(
-            ++it == end))
-            break;
-do_arr3:
-        if(BOOST_JSON_LIKELY(ss))
-            ss.append(',');
-        else
-            return suspend(
-                state::arr3, it, pa);
-    }
-do_arr4:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append(']');
-    else
-        return suspend(
-            state::arr4, it, pa);
-    return true;
+    return write_impl<array, StackEmpty>(sequence_conversion_tag(), w, ss);
 }
 
 template<bool StackEmpty>
 bool
-serializer::
-write_object(stream& ss0)
+write_object(writer& w, stream& ss)
 {
-    object const* po;
-    local_stream ss(ss0);
-    object::const_iterator it;
-    object::const_iterator end;
-    if(StackEmpty || st_.empty())
-    {
-        po = po_;
-        it = po->begin();
-        end = po->end();
-    }
-    else
-    {
-        state st;
-        st_.pop(st);
-        st_.pop(it);
-        st_.pop(po);
-        end = po->end();
-        switch(st)
-        {
-        default:
-        case state::obj1: goto do_obj1;
-        case state::obj2: goto do_obj2;
-        case state::obj3: goto do_obj3;
-        case state::obj4: goto do_obj4;
-        case state::obj5: goto do_obj5;
-        case state::obj6: goto do_obj6;
-            break;
-        }
-    }
-do_obj1:
-    if(BOOST_JSON_LIKELY(ss))
-        ss.append('{');
-    else
-        return suspend(
-            state::obj1, it, po);
-    if(BOOST_JSON_UNLIKELY(
-        it == end))
-        goto do_obj6;
-    for(;;)
-    {
-        cs0_ = {
-            it->key().data(),
-            it->key().size() };
-do_obj2:
-        if(BOOST_JSON_UNLIKELY(
-            ! write_string<StackEmpty>(ss)))
-            return suspend(
-                state::obj2, it, po);
-do_obj3:
-        if(BOOST_JSON_LIKELY(ss))
-            ss.append(':');
-        else
-            return suspend(
-                state::obj3, it, po);
-do_obj4:
-        jv_ = &it->value();
-        if(BOOST_JSON_UNLIKELY(
-            ! write_value<StackEmpty>(ss)))
-            return suspend(
-                state::obj4, it, po);
-        ++it;
-        if(BOOST_JSON_UNLIKELY(it == end))
-            break;
-do_obj5:
-        if(BOOST_JSON_LIKELY(ss))
-            ss.append(',');
-        else
-            return suspend(
-                state::obj5, it, po);
-    }
-do_obj6:
-    if(BOOST_JSON_LIKELY(ss))
-    {
-        ss.append('}');
-        return true;
-    }
-    return suspend(
-        state::obj6, it, po);
+    return write_impl<object, StackEmpty>(map_like_conversion_tag(), w, ss);
 }
 
 template<bool StackEmpty>
 bool
-serializer::
-write_value(stream& ss)
+write_value(writer& w, stream& ss)
 {
-    if(StackEmpty || st_.empty())
+    if(StackEmpty || w.st_.empty())
     {
-        auto const& jv(*jv_);
-        switch(jv.kind())
+        BOOST_ASSERT( w.p_ );
+        auto const pv = reinterpret_cast<value const*>(w.p_);
+        switch(pv->kind())
         {
         default:
         case kind::object:
-            po_ = &jv.get_object();
-            return write_object<true>(ss);
+            w.p_ = &pv->get_object();
+            return write_object<true>(w, ss);
 
         case kind::array:
-            pa_ = &jv.get_array();
-            return write_array<true>(ss);
+            w.p_ = &pv->get_array();
+            return write_array<true>(w, ss);
 
         case kind::string:
         {
-            auto const& js = jv.get_string();
-            cs0_ = { js.data(), js.size() };
-            return write_string<true>(ss);
+            auto const& js = pv->get_string();
+            w.cs0_ = { js.data(), js.size() };
+            return do_write_string<true>(w, ss);
         }
 
         case kind::int64:
+            return write_int64( w, ss, pv->get_int64() );
         case kind::uint64:
+            return write_uint64( w, ss, pv->get_uint64() );
         case kind::double_:
-            return write_number<true>(ss);
+            return write_double( w, ss, pv->get_double() );
 
         case kind::bool_:
-            if(jv.get_bool())
-            {
-                if(BOOST_JSON_LIKELY(
-                    ss.remain() >= 4))
-                {
-                    ss.append("true", 4);
-                    return true;
-                }
-                return write_true<true>(ss);
-            }
+            if( pv->get_bool() )
+                return write_true(w, ss);
             else
-            {
-                if(BOOST_JSON_LIKELY(
-                    ss.remain() >= 5))
-                {
-                    ss.append("false", 5);
-                    return true;
-                }
-                return write_false<true>(ss);
-            }
+                return write_false(w, ss);
 
         case kind::null:
-            if(BOOST_JSON_LIKELY(
-                ss.remain() >= 4))
-            {
-                ss.append("null", 4);
-                return true;
-            }
-            return write_null<true>(ss);
+            return write_null(w, ss);
         }
     }
     else
     {
-        state st;
-        st_.peek(st);
+        writer::state st;
+        w.st_.peek(st);
         switch(st)
         {
         default:
-        case state::nul1: case state::nul2:
-        case state::nul3: case state::nul4:
-            return write_null<StackEmpty>(ss);
-
-        case state::tru1: case state::tru2:
-        case state::tru3: case state::tru4:
-            return write_true<StackEmpty>(ss);
-
-        case state::fal1: case state::fal2:
-        case state::fal3: case state::fal4:
-        case state::fal5:
-            return write_false<StackEmpty>(ss);
-
-        case state::str1: case state::str2:
-        case state::str3: case state::str4:
-        case state::esc1:
-        case state::utf1: case state::utf2:
-        case state::utf3: case state::utf4:
-        case state::utf5:
-            return write_string<StackEmpty>(ss);
-
-        case state::num:
-            return write_number<StackEmpty>(ss);
-
-        case state::arr1: case state::arr2:
-        case state::arr3: case state::arr4:
-            return write_array<StackEmpty>(ss);
-
-        case state::obj1: case state::obj2:
-        case state::obj3: case state::obj4:
-        case state::obj5: case state::obj6:
-            return write_object<StackEmpty>(ss);
+        case writer::state::lit:
+            return resume_buffer(w, ss);
+
+        case writer::state::str1: case writer::state::str2:
+        case writer::state::str3: case writer::state::esc1:
+        case writer::state::utf1: case writer::state::utf2:
+        case writer::state::utf3: case writer::state::utf4:
+        case writer::state::utf5:
+            return do_write_string<false>(w, ss);
+
+        case writer::state::arr1: case writer::state::arr2:
+        case writer::state::arr3: case writer::state::arr4:
+            return write_array<StackEmpty>(w, ss);
+
+        case writer::state::obj1: case writer::state::obj2:
+        case writer::state::obj3: case writer::state::obj4:
+        case writer::state::obj5: case writer::state::obj6:
+            return write_object<StackEmpty>(w, ss);
         }
     }
 }
 
-string_view
-serializer::
-read_some(
-    char* dest, std::size_t size)
-{
-    // If this goes off it means you forgot
-    // to call reset() before seriailzing a
-    // new value, or you never checked done()
-    // to see if you should stop.
-    BOOST_ASSERT(! done_);
-
-    stream ss(dest, size);
-    if(st_.empty())
-        (this->*fn0_)(ss);
-    else
-        (this->*fn1_)(ss);
-    if(st_.empty())
-    {
-        done_ = true;
-        jv_ = nullptr;
-    }
-    return string_view(
-        dest, ss.used(dest));
-}
+} // namespace detail
 
-//----------------------------------------------------------
+serializer::
+serializer(serialize_options const& opts) noexcept
+    : serializer({}, nullptr, 0, opts)
+{}
 
 serializer::
-serializer( serialize_options const& opts ) noexcept
-    : opts_(opts)
-{
-    // ensure room for \uXXXX escape plus one
-    BOOST_STATIC_ASSERT(
-        sizeof(serializer::buf_) >= 7);
-}
+serializer(
+    storage_ptr sp,
+    unsigned char* buf,
+    std::size_t buf_size,
+    serialize_options const& opts) noexcept
+    : detail::writer(std::move(sp), buf, buf_size, opts)
+{}
 
 void
 serializer::
 reset(value const* p) noexcept
 {
-    pv_ = p;
-    fn0_ = &serializer::write_value<true>;
-    fn1_ = &serializer::write_value<false>;
-
-    jv_ = p;
+    p_ = p;
+    fn0_ = &detail::write_value<true>;
+    fn1_ = &detail::write_value<false>;
     st_.clear();
     done_ = false;
 }
@@ -777,9 +483,9 @@ void
 serializer::
 reset(array const* p) noexcept
 {
-    pa_ = p;
-    fn0_ = &serializer::write_array<true>;
-    fn1_ = &serializer::write_array<false>;
+    p_ = p;
+    fn0_ = &detail::write_array<true>;
+    fn1_ = &detail::write_array<false>;
     st_.clear();
     done_ = false;
 }
@@ -788,9 +494,9 @@ void
 serializer::
 reset(object const* p) noexcept
 {
-    po_ = p;
-    fn0_ = &serializer::write_object<true>;
-    fn1_ = &serializer::write_object<false>;
+    p_ = p;
+    fn0_ = &detail::write_object<true>;
+    fn1_ = &detail::write_object<false>;
     st_.clear();
     done_ = false;
 }
@@ -800,8 +506,8 @@ serializer::
 reset(string const* p) noexcept
 {
     cs0_ = { p->data(), p->size() };
-    fn0_ = &serializer::write_string<true>;
-    fn1_ = &serializer::write_string<false>;
+    fn0_ = &detail::do_write_string<true>;
+    fn1_ = &detail::do_write_string<false>;
     st_.clear();
     done_ = false;
 }
@@ -811,8 +517,18 @@ serializer::
 reset(string_view sv) noexcept
 {
     cs0_ = { sv.data(), sv.size() };
-    fn0_ = &serializer::write_string<true>;
-    fn1_ = &serializer::write_string<false>;
+    fn0_ = &detail::do_write_string<true>;
+    fn1_ = &detail::do_write_string<false>;
+    st_.clear();
+    done_ = false;
+}
+
+void
+serializer::reset(std::nullptr_t) noexcept
+{
+    p_ = nullptr;
+    fn0_ = &detail::write_impl<std::nullptr_t, true>;
+    fn1_ = &detail::write_impl<std::nullptr_t, false>;
     st_.clear();
     done_ = false;
 }
@@ -821,12 +537,25 @@ string_view
 serializer::
 read(char* dest, std::size_t size)
 {
-    if(! jv_)
+    if( !fn0_ )
+        reset(nullptr);
+
+    if(BOOST_JSON_UNLIKELY(size == 0))
+        return {dest, 0};
+
+    detail::stream ss(dest, size);
+    if(st_.empty())
+        fn0_(*this, ss);
+    else
+        fn1_(*this, ss);
+    if(st_.empty())
     {
-        static value const null;
-        jv_ = &null;
+        done_ = true;
+        fn0_ = nullptr;
+        p_ = nullptr;
     }
-    return read_some(dest, size);
+    return string_view(
+        dest, ss.used(dest));
 }
 
 } // namespace json
diff --git a/inst/include/boost/json/impl/stream_parser.ipp b/inst/include/boost/json/impl/stream_parser.ipp
index 232df02b6..69f690565 100644
--- a/inst/include/boost/json/impl/stream_parser.ipp
+++ b/inst/include/boost/json/impl/stream_parser.ipp
@@ -61,7 +61,7 @@ stream_parser::
 write_some(
     char const* data,
     std::size_t size,
-    error_code& ec)
+    system::error_code& ec)
 {
     return p_.write_some(
         true, data, size, ec);
@@ -74,7 +74,7 @@ write_some(
     std::size_t size,
     std::error_code& ec)
 {
-    error_code jec;
+    system::error_code jec;
     std::size_t const result = write_some(data, size, jec);
     ec = jec;
     return result;
@@ -86,7 +86,7 @@ write_some(
     char const* data,
     std::size_t size)
 {
-    error_code ec;
+    system::error_code ec;
     auto const n = write_some(
         data, size, ec);
     if(ec)
@@ -99,7 +99,7 @@ stream_parser::
 write(
     char const* data,
     std::size_t size,
-    error_code& ec)
+    system::error_code& ec)
 {
     auto const n = write_some(
         data, size, ec);
@@ -118,7 +118,7 @@ write(
     std::size_t size,
     std::error_code& ec)
 {
-    error_code jec;
+    system::error_code jec;
     std::size_t const result = write(data, size, jec);
     ec = jec;
     return result;
@@ -130,7 +130,7 @@ write(
     char const* data,
     std::size_t size)
 {
-    error_code ec;
+    system::error_code ec;
     auto const n = write(
         data, size, ec);
     if(ec)
@@ -140,7 +140,7 @@ write(
 
 void
 stream_parser::
-finish(error_code& ec)
+finish(system::error_code& ec)
 {
     p_.write_some(false, nullptr, 0, ec);
 }
@@ -149,7 +149,7 @@ void
 stream_parser::
 finish()
 {
-    error_code ec;
+    system::error_code ec;
     finish(ec);
     if(ec)
         detail::throw_system_error( ec );
@@ -159,7 +159,7 @@ void
 stream_parser::
 finish(std::error_code& ec)
 {
-    error_code jec;
+    system::error_code jec;
     finish(jec);
     ec = jec;
 }
diff --git a/inst/include/boost/json/impl/string.hpp b/inst/include/boost/json/impl/string.hpp
index 1c4ddbdf9..a1666ef60 100644
--- a/inst/include/boost/json/impl/string.hpp
+++ b/inst/include/boost/json/impl/string.hpp
@@ -238,6 +238,14 @@ append(
         tmp.data(), tmp.size());
 }
 
+char&
+string::at(std::size_t pos, source_location const& loc)
+{
+
+    auto const& self = *this;
+    return const_cast< char& >( self.at(pos, loc) );
+}
+
 } // namespace json
 } // namespace boost
 
diff --git a/inst/include/boost/json/impl/string.ipp b/inst/include/boost/json/impl/string.ipp
index 63c25840e..9019e7a47 100644
--- a/inst/include/boost/json/impl/string.ipp
+++ b/inst/include/boost/json/impl/string.ipp
@@ -204,6 +204,40 @@ shrink_to_fit()
     impl_.shrink_to_fit(sp_);
 }
 
+//----------------------------------------------------------
+//
+// Access
+//
+//----------------------------------------------------------
+
+system::result<char&>
+string::try_at(std::size_t pos) noexcept
+{
+    if( pos < size() )
+        return impl_.data()[pos];
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::out_of_range);
+    return ec;
+}
+
+system::result<char const&>
+string::try_at(std::size_t pos) const noexcept
+{
+    if( pos < size() )
+        return impl_.data()[pos];
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::out_of_range);
+    return ec;
+}
+
+char const&
+string::at(std::size_t pos, source_location const& loc) const
+{
+    return try_at(pos).value(loc);
+}
+
 //----------------------------------------------------------
 //
 // Operations
diff --git a/inst/include/boost/json/impl/value.hpp b/inst/include/boost/json/impl/value.hpp
index 92e14a29c..f24586fb2 100644
--- a/inst/include/boost/json/impl/value.hpp
+++ b/inst/include/boost/json/impl/value.hpp
@@ -14,16 +14,16 @@ namespace boost {
 namespace json {
 
 value&
-value::at_pointer(string_view ptr) &
+value::at_pointer(string_view ptr, source_location const& loc) &
 {
     auto const& self = *this;
-    return const_cast<value&>( self.at_pointer(ptr) );
+    return const_cast<value&>( self.at_pointer(ptr, loc) );
 }
 
 value&&
-value::at_pointer(string_view ptr) &&
+value::at_pointer(string_view ptr, source_location const& loc) &&
 {
-    return std::move( this->at_pointer(ptr) );
+    return std::move( at_pointer(ptr, loc) );
 }
 
 } // namespace json
diff --git a/inst/include/boost/json/impl/value.ipp b/inst/include/boost/json/impl/value.ipp
index 12d60f5ff..bc3c9c99c 100644
--- a/inst/include/boost/json/impl/value.ipp
+++ b/inst/include/boost/json/impl/value.ipp
@@ -238,7 +238,6 @@ value(
     }
     else
     {
-#ifndef BOOST_JSON_LEGACY_INIT_LIST_BEHAVIOR
         if( init.size() == 1 )
         {
             ::new(&sca_) scalar();
@@ -246,7 +245,6 @@ value(
             swap(temp);
         }
         else
-#endif
         {
             ::new(&arr_) array(
                 value_ref::make_array(
@@ -356,6 +354,279 @@ operator=(object&& obj)
     return *this;
 }
 
+//----------------------------------------------------------
+//
+// Accessors
+//
+//----------------------------------------------------------
+
+system::result<array&>
+value::try_as_array() noexcept
+{
+    if( is_array() )
+        return arr_;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_array);
+    return ec;
+}
+
+system::result<array const&>
+value::try_as_array() const noexcept
+{
+    if( is_array() )
+        return arr_;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_array);
+    return ec;
+}
+
+system::result<object&>
+value::try_as_object() noexcept
+{
+    if( is_object() )
+        return obj_;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_object);
+    return ec;
+}
+
+system::result<object const&>
+value::try_as_object() const noexcept
+{
+    if( is_object() )
+        return obj_;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_object);
+    return ec;
+}
+
+system::result<string&>
+value::try_as_string() noexcept
+{
+    if( is_string() )
+        return str_;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_string);
+    return ec;
+}
+
+system::result<string const&>
+value::try_as_string() const noexcept
+{
+    if( is_string() )
+        return str_;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_string);
+    return ec;
+}
+
+system::result<std::int64_t&>
+value::try_as_int64() noexcept
+{
+    if( is_int64() )
+        return sca_.i;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_int64);
+    return ec;
+}
+
+system::result<std::int64_t>
+value::try_as_int64() const noexcept
+{
+    if( is_int64() )
+        return sca_.i;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_int64);
+    return ec;
+}
+
+system::result<std::uint64_t&>
+value::try_as_uint64() noexcept
+{
+    if( is_uint64() )
+        return sca_.u;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_uint64);
+    return ec;
+}
+
+system::result<std::uint64_t>
+value::try_as_uint64() const noexcept
+{
+    if( is_uint64() )
+        return sca_.u;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_uint64);
+    return ec;
+}
+
+system::result<double&>
+value::try_as_double() noexcept
+{
+    if( is_double() )
+        return sca_.d;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_double);
+    return ec;
+}
+
+system::result<double>
+value::try_as_double() const noexcept
+{
+    if( is_double() )
+        return sca_.d;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_double);
+    return ec;
+}
+
+system::result<bool&>
+value::try_as_bool() noexcept
+{
+    if( is_bool() )
+        return sca_.b;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_bool);
+    return ec;
+}
+
+system::result<bool>
+value::try_as_bool() const noexcept
+{
+    if( is_bool() )
+        return sca_.b;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_bool);
+    return ec;
+}
+
+system::result<std::nullptr_t>
+value::try_as_null() const noexcept
+{
+    if( is_null() )
+        return nullptr;
+
+    system::error_code ec;
+    BOOST_JSON_FAIL(ec, error::not_null);
+    return ec;
+}
+
+boost::system::result<value&>
+value::try_at(string_view key) noexcept
+{
+    auto r = try_as_object();
+    if( !r )
+        return r.error();
+    return r->try_at(key);
+}
+
+boost::system::result<value const&>
+value::try_at(string_view key) const noexcept
+{
+    auto r = try_as_object();
+    if( !r )
+        return r.error();
+    return r->try_at(key);
+}
+
+boost::system::result<value&>
+value::try_at(std::size_t pos) noexcept
+{
+    auto r = try_as_array();
+    if( !r )
+        return r.error();
+    return r->try_at(pos);
+}
+
+boost::system::result<value const&>
+value::try_at(std::size_t pos) const noexcept
+{
+    auto r = try_as_array();
+    if( !r )
+        return r.error();
+    return r->try_at(pos);
+}
+
+object const&
+value::as_object(source_location const& loc) const&
+{
+    return try_as_object().value(loc);
+}
+
+array const&
+value::as_array(source_location const& loc) const&
+{
+    return try_as_array().value(loc);
+}
+
+string const&
+value::as_string(source_location const& loc) const&
+{
+    return try_as_string().value(loc);
+}
+
+std::int64_t&
+value::as_int64(source_location const& loc)
+{
+    return try_as_int64().value(loc);
+}
+
+std::int64_t
+value::as_int64(source_location const& loc) const
+{
+    return try_as_int64().value(loc);
+}
+
+std::uint64_t&
+value::as_uint64(source_location const& loc)
+{
+    return try_as_uint64().value(loc);
+}
+
+std::uint64_t
+value::as_uint64(source_location const& loc) const
+{
+    return try_as_uint64().value(loc);
+}
+
+double&
+value::as_double(source_location const& loc)
+{
+    return try_as_double().value(loc);
+}
+
+double
+value::as_double(source_location const& loc) const
+{
+    return try_as_double().value(loc);
+}
+
+bool&
+value::as_bool(source_location const& loc)
+{
+    return try_as_bool().value(loc);
+}
+
+bool
+value::as_bool(source_location const& loc) const
+{
+    return try_as_bool().value(loc);
+}
+
 //----------------------------------------------------------
 //
 // Modifiers
@@ -445,7 +716,7 @@ operator>>(
     {
         while( true )
         {
-            error_code ec;
+            system::error_code ec;
 
             // we peek the buffer; this either makes sure that there's no
             // more input, or makes sure there's something in the internal
diff --git a/inst/include/boost/json/impl/visit.hpp b/inst/include/boost/json/impl/visit.hpp
index f647879be..75c076d7f 100644
--- a/inst/include/boost/json/impl/visit.hpp
+++ b/inst/include/boost/json/impl/visit.hpp
@@ -13,24 +13,28 @@
 namespace boost {
 namespace json {
 
+
 template<class Visitor>
 auto
 visit(
     Visitor&& v,
     value& jv) -> decltype(
-        std::declval<Visitor>()(nullptr))
+        static_cast<Visitor&&>(v)( std::declval<std::nullptr_t&>() ) )
 {
     switch(jv.kind())
     {
     default: // unreachable()?
-    case kind::null:    return std::forward<Visitor>(v)(nullptr);
-    case kind::bool_:   return std::forward<Visitor>(v)(jv.get_bool());
-    case kind::int64:   return std::forward<Visitor>(v)(jv.get_int64());
-    case kind::uint64:  return std::forward<Visitor>(v)(jv.get_uint64());
-    case kind::double_: return std::forward<Visitor>(v)(jv.get_double());
-    case kind::string:  return std::forward<Visitor>(v)(jv.get_string());
-    case kind::array:   return std::forward<Visitor>(v)(jv.get_array());
-    case kind::object:  return std::forward<Visitor>(v)(jv.get_object());
+    case kind::string:  return static_cast<Visitor&&>(v)( jv.get_string() );
+    case kind::array:   return static_cast<Visitor&&>(v)( jv.get_array() );
+    case kind::object:  return static_cast<Visitor&&>(v)( jv.get_object() );
+    case kind::bool_:   return static_cast<Visitor&&>(v)( jv.get_bool() );
+    case kind::int64:   return static_cast<Visitor&&>(v)( jv.get_int64() );
+    case kind::uint64:  return static_cast<Visitor&&>(v)( jv.get_uint64() );
+    case kind::double_: return static_cast<Visitor&&>(v)( jv.get_double() );
+    case kind::null: {
+        auto np = nullptr;
+        return static_cast<Visitor&&>(v)(np) ;
+    }
     }
 }
 
@@ -39,19 +43,44 @@ auto
 visit(
     Visitor&& v,
     value const& jv) -> decltype(
-        std::declval<Visitor>()(nullptr))
+        static_cast<Visitor&&>(v)( std::declval<std::nullptr_t const&>() ) )
+{
+    switch(jv.kind())
+    {
+    default: // unreachable()?
+    case kind::string:  return static_cast<Visitor&&>(v)( jv.get_string() );
+    case kind::array:   return static_cast<Visitor&&>(v)( jv.get_array() );
+    case kind::object:  return static_cast<Visitor&&>(v)( jv.get_object() );
+    case kind::bool_:   return static_cast<Visitor&&>(v)( jv.get_bool() );
+    case kind::int64:   return static_cast<Visitor&&>(v)( jv.get_int64() );
+    case kind::uint64:  return static_cast<Visitor&&>(v)( jv.get_uint64() );
+    case kind::double_: return static_cast<Visitor&&>(v)( jv.get_double() );
+    case kind::null: {
+        auto const np = nullptr;
+        return static_cast<Visitor&&>(v)(np) ;
+    }
+    }
+}
+
+
+template<class Visitor>
+auto
+visit(
+    Visitor&& v,
+    value&& jv) -> decltype(
+        static_cast<Visitor&&>(v)( std::declval<std::nullptr_t&&>() ) )
 {
-    switch (jv.kind())
+    switch(jv.kind())
     {
     default: // unreachable()?
-    case kind::null:    return std::forward<Visitor>(v)(nullptr);
-    case kind::bool_:   return std::forward<Visitor>(v)(jv.get_bool());
-    case kind::int64:   return std::forward<Visitor>(v)(jv.get_int64());
-    case kind::uint64:  return std::forward<Visitor>(v)(jv.get_uint64());
-    case kind::double_: return std::forward<Visitor>(v)(jv.get_double());
-    case kind::string:  return std::forward<Visitor>(v)(jv.get_string());
-    case kind::array:   return std::forward<Visitor>(v)(jv.get_array());
-    case kind::object:  return std::forward<Visitor>(v)(jv.get_object());
+    case kind::string:  return static_cast<Visitor&&>(v)( std::move( jv.get_string() ) );
+    case kind::array:   return static_cast<Visitor&&>(v)( std::move( jv.get_array() ) );
+    case kind::object:  return static_cast<Visitor&&>(v)( std::move( jv.get_object() ) );
+    case kind::bool_:   return static_cast<Visitor&&>(v)( std::move( jv.get_bool() ) );
+    case kind::int64:   return static_cast<Visitor&&>(v)( std::move( jv.get_int64() ) );
+    case kind::uint64:  return static_cast<Visitor&&>(v)( std::move( jv.get_uint64() ) );
+    case kind::double_: return static_cast<Visitor&&>(v)( std::move( jv.get_double() ) );
+    case kind::null:    return static_cast<Visitor&&>(v)( std::nullptr_t() ) ;
     }
 }
 
diff --git a/inst/include/boost/json/memory_resource.hpp b/inst/include/boost/json/is_deallocate_trivial.hpp
similarity index 50%
rename from inst/include/boost/json/memory_resource.hpp
rename to inst/include/boost/json/is_deallocate_trivial.hpp
index a2301ad58..d9224ca41 100644
--- a/inst/include/boost/json/memory_resource.hpp
+++ b/inst/include/boost/json/is_deallocate_trivial.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
+// Copyright (c) 2024 Dmitry Arkhipov (grisumbras@yandex.ru)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,54 +7,20 @@
 // Official repository: https://github.com/boostorg/json
 //
 
-#ifndef BOOST_JSON_MEMORY_RESOURCE_HPP
-#define BOOST_JSON_MEMORY_RESOURCE_HPP
-
-#include <boost/json/detail/config.hpp>
-
-#include <boost/container/pmr/memory_resource.hpp>
-#include <boost/container/pmr/polymorphic_allocator.hpp>
+#ifndef BOOST_JSON_IS_DEALLOCATE_TRIVIAL_HPP
+#define BOOST_JSON_IS_DEALLOCATE_TRIVIAL_HPP
 
 namespace boost {
 namespace json {
 
-#ifdef BOOST_JSON_DOCS
-
-/** The type of memory resource used by the library.
-
-    Alias for `boost::container::pmr::memory_resource`.
-*/
-class memory_resource
-{
-};
-
-/** The type of polymorphic allocator used by the library.
-
-    Alias template for `boost::container::pmr::polymorphic_allocator`.
-*/
-template<class T>
-class polymorphic_allocator;
-
-// VFALCO Bug: doc toolchain won't make this a ref
-//using memory_resource = __see_below__;
-
-#else
-using memory_resource = boost::container::pmr::memory_resource;
-
-template<class T>
-using polymorphic_allocator =
-    boost::container::pmr::polymorphic_allocator<T>;
-#endif
-
 /** Return true if a memory resource's deallocate function has no effect.
 
-    This metafunction may be specialized to indicate to
-    the library that calls to the `deallocate` function of
-    a @ref memory_resource have no effect. The implementation
-    will elide such calls when it is safe to do so. By default,
-    the implementation assumes that all memory resources
-    require a call to `deallocate` for each memory region
-    obtained by calling `allocate`.
+    This metafunction may be specialized to indicate to the library that calls
+    to the `deallocate` function of a `boost::container::pmr::memory_resource`
+    have no effect. The implementation will elide such calls when it is safe to
+    do so. By default, the implementation assumes that all memory resources
+    require a call to `deallocate` for each memory region obtained by
+    calling `allocate`.
 
     @par Example
 
@@ -89,8 +55,8 @@ using polymorphic_allocator =
     deallocate function.
 
     @see
-        @ref memory_resource,
-        @ref storage_ptr
+        @ref storage_ptr,
+        @ref boost::container::pmr::memory_resource
 */
 template<class T>
 struct is_deallocate_trivial
@@ -105,4 +71,4 @@ struct is_deallocate_trivial
 } // namespace json
 } // namespace boost
 
-#endif
+#endif // BOOST_JSON_IS_DEALLOCATE_TRIVIAL_HPP
diff --git a/inst/include/boost/json/monotonic_resource.hpp b/inst/include/boost/json/monotonic_resource.hpp
index 875acc4ee..be7d88fd6 100644
--- a/inst/include/boost/json/monotonic_resource.hpp
+++ b/inst/include/boost/json/monotonic_resource.hpp
@@ -11,8 +11,8 @@
 #ifndef BOOST_JSON_MONOTONIC_RESOURCE_HPP
 #define BOOST_JSON_MONOTONIC_RESOURCE_HPP
 
+#include <boost/container/pmr/memory_resource.hpp>
 #include <boost/json/detail/config.hpp>
-#include <boost/json/memory_resource.hpp>
 #include <boost/json/storage_ptr.hpp>
 #include <cstddef>
 #include <utility>
@@ -87,7 +87,7 @@ class
     BOOST_JSON_DECL
     BOOST_SYMBOL_VISIBLE
 monotonic_resource final
-    : public memory_resource
+    : public container::pmr::memory_resource
 {
     struct block;
     struct block_base
diff --git a/inst/include/boost/json/null_resource.hpp b/inst/include/boost/json/null_resource.hpp
index 80efb9268..8314d9fb7 100644
--- a/inst/include/boost/json/null_resource.hpp
+++ b/inst/include/boost/json/null_resource.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_JSON_NULL_RESOURCE_HPP
 #define BOOST_JSON_NULL_RESOURCE_HPP
 
+#include <boost/container/pmr/memory_resource.hpp>
 #include <boost/json/detail/config.hpp>
-#include <boost/json/memory_resource.hpp>
 
 namespace boost {
 namespace json {
@@ -28,7 +28,7 @@ namespace json {
     No-throw guarantee.
 */
 BOOST_JSON_DECL
-memory_resource*
+boost::container::pmr::memory_resource*
 get_null_resource() noexcept;
 
 } // namespace json
diff --git a/inst/include/boost/json/object.hpp b/inst/include/boost/json/object.hpp
index 01b240942..db1ff7e8c 100644
--- a/inst/include/boost/json/object.hpp
+++ b/inst/include/boost/json/object.hpp
@@ -11,12 +11,13 @@
 #define BOOST_JSON_OBJECT_HPP
 
 #include <boost/json/detail/config.hpp>
+#include <boost/json/detail/object.hpp>
+#include <boost/json/detail/value.hpp>
 #include <boost/json/kind.hpp>
 #include <boost/json/pilfer.hpp>
+#include <boost/system/result.hpp>
 #include <boost/json/storage_ptr.hpp>
 #include <boost/json/string_view.hpp>
-#include <boost/json/detail/object.hpp>
-#include <boost/json/detail/value.hpp>
 #include <cstdlib>
 #include <initializer_list>
 #include <iterator>
@@ -94,16 +95,8 @@ class object
     object(detail::unchecked_object&& uo);
 
 public:
-    /** The type of _Allocator_ returned by @ref get_allocator
-
-        This type is a @ref polymorphic_allocator.
-    */
-#ifdef BOOST_JSON_DOCS
-    // VFALCO doc toolchain renders this incorrectly
-    using allocator_type = __see_below__;
-#else
-    using allocator_type = polymorphic_allocator<value>;
-#endif
+    /// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
+    using allocator_type = container::pmr::polymorphic_allocator<value>;
 
     /** The type of keys.
 
@@ -154,9 +147,9 @@ class object
 
     /** Destructor.
 
-        The destructor for each element is called if needed,
-        any used memory is deallocated, and shared ownership
-        of the @ref memory_resource is released.
+        The destructor for each element is called if needed, any used memory is
+        deallocated, and shared ownership of the
+        `boost::container::pmr::memory_resource` is released.
 
         @par Complexity
         Constant, or linear in @ref size().
@@ -198,9 +191,9 @@ class object
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     explicit
     object(storage_ptr sp) noexcept
@@ -226,9 +219,9 @@ class object
         of elements for which capacity is guaranteed
         without a subsequent reallocation.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     object(
@@ -272,9 +265,9 @@ class object
         Upon construction, @ref capacity() will be greater
         than or equal to this number.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
 
         @tparam InputIt a type satisfying the requirements
         of __InputIterator__.
@@ -349,9 +342,9 @@ class object
 
         @param other The object to move.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     object(
@@ -421,9 +414,9 @@ class object
 
         @param other The object to copy.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     object(
@@ -449,9 +442,9 @@ class object
 
         @param init The initializer list to insert.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     object(
         std::initializer_list<
@@ -488,9 +481,9 @@ class object
         Upon construction, @ref capacity() will be greater
         than or equal to this number.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     object(
@@ -576,10 +569,10 @@ class object
 
     //------------------------------------------------------
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated memory resource.
 
-        This returns the @ref memory_resource used by
-        the container.
+        This function returns the `boost::container::pmr::memory_resource` used
+        by the container.
 
         @par Complexity
         Constant.
@@ -593,11 +586,10 @@ class object
         return sp_;
     }
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated allocator.
 
-        This function returns an instance of
-        @ref polymorphic_allocator constructed from the
-        associated @ref memory_resource.
+        This function returns an instance of @ref allocator_type constructed
+        from the associated `boost::container::pmr::memory_resource`.
 
         @par Complexity
         Constant.
@@ -896,7 +888,7 @@ class object
 
         @param new_capacity The new minimum capacity.
 
-        @throw system_error `new_capacity > max_size()`
+        @throw `boost::system::system_error`  `new_capacity > max_size()`.
     */
     inline
     void
@@ -952,9 +944,8 @@ class object
 
         @param p The value to insert.
 
-        @throw system_error key is too long.
-
-        @throw system_error @ref size() >= max_size().
+        @throw `boost::system::system_error` key is too long.
+        @throw `boost::system::system_error` @ref size() >= max_size().
 
         @return A pair where `first` is an iterator
         to the existing or inserted element, and `second`
@@ -1077,7 +1068,7 @@ class object
 
         @param m The value to insert or assign
 
-        @throw system_error if key is too long
+        @throw `boost::system::system_error` if key is too long.
     */
     template<class M>
     std::pair<iterator, bool>
@@ -1112,7 +1103,7 @@ class object
         This will be passed as `std::forward<Arg>(arg)` to
         the @ref value constructor.
 
-        @throw system_error if key is too long
+        @throw `boost::system::system_error` if key is too long.
     */
     template<class Arg>
     std::pair<iterator, bool>
@@ -1170,17 +1161,14 @@ class object
 
     /** Erase an element preserving order
 
-        Remove the element pointed to by `pos`, which must
-        be valid and dereferenceable.
-        References and iterators from `pos` to `end()`, both
-        included, are invalidated. Other iterators and references
-        are not invalidated.
-        The relative order of remaining elements is preserved.
+        Remove the element pointed to by `pos`, which must be valid and
+        dereferenceable. References and iterators from `pos` to @ref end(),
+        both included, are invalidated. Other iterators and references are not
+        invalidated. The relative order of remaining elements is preserved.
 
         @note
-
-        The @ref end() iterator (which is valid but cannot be
-        dereferenced) cannot be used as a value for `pos`.
+        The @ref end() iterator (which is valid but cannot be dereferenced)
+        cannot be used as a value for `pos`.
 
         @par Complexity
         Linear in @ref size().
@@ -1220,9 +1208,9 @@ class object
 
     /** Swap two objects.
 
-        Exchanges the contents of this object with another
-        object. Ownership of the respective @ref memory_resource
-        objects is not transferred.
+        Exchanges the contents of this object with another object. Ownership of
+        the respective `boost::container::pmr::memory_resource` objects is not
+        transferred.
 
         @li If `*other.storage() == *this->storage()`,
         ownership of the underlying memory is swapped in
@@ -1250,9 +1238,9 @@ class object
 
     /** Swap two objects.
 
-        Exchanges the contents of the object `lhs` with
-        another object `rhs`. Ownership of the respective
-        @ref memory_resource objects is not transferred.
+        Exchanges the contents of the object `lhs` with another object `rhs`.
+        Ownership of the respective `boost::container::pmr::memory_resource`
+        objects is not transferred.
 
         @li If `*lhs.storage() == *rhs.storage()`,
         ownership of the underlying memory is swapped in
@@ -1296,6 +1284,30 @@ class object
     //
     //------------------------------------------------------
 
+    /** Access the specified element, with bounds checking.
+
+        Returns `boost::system::result` containing a reference to the
+        mapped value of the element that matches `key`. Otherwise the result
+        contains an `error_code`.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @param key The key of the element to find.
+
+        @par Complexity
+        Constant on average, worst case linear in @ref size().
+    */
+    /** @{ */
+    BOOST_JSON_DECL
+    system::result<value&>
+    try_at(string_view key) noexcept;
+
+    BOOST_JSON_DECL
+    system::result<value const&>
+    try_at(string_view key) const noexcept;
+    /** @} */
+
     /** Access the specified element, with bounds checking.
 
         Returns a reference to the mapped value of the element
@@ -1311,21 +1323,30 @@ class object
 
         @param key The key of the element to find.
 
-        @throw system_error if no such element exists.
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @throw `boost::system::system_error` if no such element exists.
     */
-    /* @{ */
+    /** @{ */
     inline
     value&
-    at(string_view key) &;
+    at(
+        string_view key,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &;
 
     inline
     value&&
-    at(string_view key) &&;
+    at(
+        string_view key,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &&;
 
-    inline
+    BOOST_JSON_DECL
     value const&
-    at(string_view key) const&;
-    /* @} */
+    at(
+        string_view key,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const&;
+    /** @} */
 
     /** Access or insert the specified element
 
diff --git a/inst/include/boost/json/parse.hpp b/inst/include/boost/json/parse.hpp
index e322c3429..538d5c85c 100644
--- a/inst/include/boost/json/parse.hpp
+++ b/inst/include/boost/json/parse.hpp
@@ -62,7 +62,7 @@ BOOST_JSON_DECL
 value
 parse(
     string_view s,
-    error_code& ec,
+    system::error_code& ec,
     storage_ptr sp = {},
     parse_options const& opt = {});
 
@@ -101,7 +101,7 @@ parse(
     @param opt The options for the parser. If this parameter
     is omitted, the parser will accept only standard JSON.
 
-    @throw system_error Thrown on failure.
+    @throw boost::system::system_error Thrown on failure.
 
     @see
         @ref parse_options,
@@ -156,7 +156,7 @@ BOOST_JSON_DECL
 value
 parse(
     std::istream& is,
-    error_code& ec,
+    system::error_code& ec,
     storage_ptr sp = {},
     parse_options const& opt = {});
 
@@ -181,7 +181,7 @@ parse(
 
     @par Exception Safety
     Basic guarantee.
-    Throws @ref system_error on failed parse.
+    Throws `boost::system::system_error` on failed parse.
     Calls to `memory_resource::allocate` may throw.
     The stream may throw as described by
     [`std::ios::exceptions`](https://en.cppreference.com/w/cpp/io/basic_ios/exceptions).
diff --git a/inst/include/boost/json/parse_into.hpp b/inst/include/boost/json/parse_into.hpp
index 0ba3c7d00..709f21bc9 100644
--- a/inst/include/boost/json/parse_into.hpp
+++ b/inst/include/boost/json/parse_into.hpp
@@ -15,8 +15,8 @@
 
 #include <boost/json/basic_parser.hpp>
 #include <boost/json/string_view.hpp>
-#include <boost/json/system_error.hpp>
 #include <boost/json/detail/parse_into.hpp>
+#include <boost/system/result.hpp>
 
 namespace boost {
 namespace json {
@@ -75,7 +75,7 @@ void
 parse_into(
     V& v,
     string_view sv,
-    error_code& ec,
+    system::error_code& ec,
     parse_options const& opt = {} );
 
 template<class V>
@@ -105,7 +105,6 @@ parse_into(
 
     @par Exception Safety
     Basic guarantee.
-    Throws @ref system_error on failed parse.
     Calls to `memory_resource::allocate` may throw.
 
     @param v The type to parse into.
@@ -114,6 +113,8 @@ parse_into(
 
     @param opt The options for the parser. If this parameter
     is omitted, the parser will accept only standard JSON.
+
+    @throw `boost::system::system_error` on failed parse.
 */
 template<class V>
 void
@@ -159,7 +160,7 @@ void
 parse_into(
     V& v,
     std::istream& is,
-    error_code& ec,
+    system::error_code& ec,
     parse_options const& opt = {} );
 
 template<class V>
@@ -189,7 +190,6 @@ parse_into(
 
     @par Exception Safety
     Basic guarantee.
-    Throws @ref system_error on failed parse.
     Calls to `memory_resource::allocate` may throw.
     The stream may throw as described by
     [`std::ios::exceptions`](https://en.cppreference.com/w/cpp/io/basic_ios/exceptions).
@@ -200,6 +200,8 @@ parse_into(
 
     @param opt The options for the parser. If this parameter
     is omitted, the parser will accept only standard JSON.
+
+    @throw `boost::system::system_error` on failed parse.
 */
 template<class V>
 void
diff --git a/inst/include/boost/json/parse_options.hpp b/inst/include/boost/json/parse_options.hpp
index c624d40f9..df917b254 100644
--- a/inst/include/boost/json/parse_options.hpp
+++ b/inst/include/boost/json/parse_options.hpp
@@ -116,6 +116,22 @@ struct parse_options
     */
     bool allow_invalid_utf8 = false;
 
+    /** Non-standard extension option
+
+        Allow invalid UTF-16 surrogate pairs to appear
+        in strings. When enabled, the parser will not
+        strictly validate the correctness of UTF-16
+        encoding, allowing for the presence of illegal
+        leading or trailing surrogates. In case of
+        invalid sequences, the parser will replace them
+        with the Unicode replacement character.
+
+        @note Enabling this option may result in the
+        parsing of invalid UTF-16 sequences without
+        error, potentially leading to the loss of information.
+    */
+    bool allow_invalid_utf16 = false;
+
     /** Non-standard extension option
 
         Allow `Infinity`, `-Infinity`, and `NaN` JSON literals. These values
diff --git a/inst/include/boost/json/parser.hpp b/inst/include/boost/json/parser.hpp
index b62bf1978..31a294c21 100644
--- a/inst/include/boost/json/parser.hpp
+++ b/inst/include/boost/json/parser.hpp
@@ -68,14 +68,14 @@ namespace json {
     first obtained from an optional, caller-owned
     buffer specified upon construction. When that
     is exhausted, the next allocation uses the
-    @ref memory_resource passed to the constructor; if
+    `boost::container::pmr::memory_resource` passed to the constructor; if
     no such argument is specified, the default memory
     resource is used. Temporary storage is freed only
     when the parser is destroyed; The performance of
     parsing multiple JSON texts may be improved by reusing
     the same parser instance.
 \n
-    It is important to note that the @ref memory_resource
+    It is important to note that the `boost::container::pmr::memory_resource`
     supplied upon construction is used for temporary
     storage only, and not for allocating the elements
     which make up the parsed value. That other memory
@@ -410,9 +410,9 @@ class parser
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use for the resulting @ref value. The parser
-        will acquire shared ownership.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use for the resulting @ref value. The parser will acquire shared
+        ownership.
     */
     BOOST_JSON_DECL
     void
@@ -463,7 +463,7 @@ class parser
     write_some(
         char const* data,
         std::size_t size,
-        error_code& ec);
+        system::error_code& ec);
 
     BOOST_JSON_DECL
     std::size_t
@@ -510,7 +510,7 @@ class parser
         @param size The number of characters pointed to
         by `data`.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     BOOST_JSON_DECL
     std::size_t
@@ -557,7 +557,7 @@ class parser
     std::size_t
     write_some(
         string_view s,
-        error_code& ec)
+        system::error_code& ec)
     {
         return write_some(
             s.data(), s.size(), ec);
@@ -606,7 +606,7 @@ class parser
 
         @param s The character string to parse.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     std::size_t
     write_some(
@@ -658,7 +658,7 @@ class parser
     write(
         char const* data,
         std::size_t size,
-        error_code& ec);
+        system::error_code& ec);
 
     BOOST_JSON_DECL
     std::size_t
@@ -702,7 +702,7 @@ class parser
         @param size The number of characters pointed to
         by `data`.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     BOOST_JSON_DECL
     std::size_t
@@ -746,7 +746,7 @@ class parser
     std::size_t
     write(
         string_view s,
-        error_code& ec)
+        system::error_code& ec)
     {
         return write(
             s.data(), s.size(), ec);
@@ -792,7 +792,7 @@ class parser
 
         @param s The character string to parse.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     std::size_t
     write(
@@ -816,7 +816,7 @@ class parser
         @return The parsed value. Ownership of this
         value is transferred to the caller.
 
-        @throw system_error Thrown on failure.
+        @throw `boost::system::system_error` Thrown on failure.
     */
     BOOST_JSON_DECL
     value
diff --git a/inst/include/boost/json/result_for.hpp b/inst/include/boost/json/result_for.hpp
new file mode 100644
index 000000000..65bda5d10
--- /dev/null
+++ b/inst/include/boost/json/result_for.hpp
@@ -0,0 +1,146 @@
+//
+// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
+// Copyright (c) 2024 Dmitry Arkhipov (grisumbras@yandex.ru)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/json
+//
+
+#ifndef BOOST_JSON_RESULT_FOR_HPP
+#define BOOST_JSON_RESULT_FOR_HPP
+
+#include <boost/json/detail/config.hpp>
+#include <boost/json/fwd.hpp>
+#include <boost/assert/source_location.hpp>
+#include <boost/system/result.hpp>
+
+namespace boost {
+namespace json {
+
+/**
+   Helper trait that returns `boost::system::result`
+
+   The primary template is an incomplete type. The library provides a partial
+   specialisation `result_for<T1, value>`, that has nested type alias `type`
+   that aliases the type `result<T1>`.
+
+   The purpose of this trait is to let users provide non-throwing conversions
+   for their types without creating a physical dependency on Boost.Json. For
+   example:
+
+   @code
+   namespace boost
+   {
+   namespace json
+   {
+
+   template<class T>
+   struct value_to_tag;
+
+   template<class T1, class T2>
+   struct result_for;
+   }
+   }
+
+   namespace mine
+   {
+       class my_class;
+       ...
+       template<class JsonValue>
+       boost::json::result_for<my_class, JsonValue>
+       tag_invoke(boost::json::try_value_to_tag<my_class>, const JsonValue& jv)
+       { ... }
+   }
+   @endcode
+
+    @see @ref try_value_to, @ref try_value_to_tag
+*/
+template <class T1, class T2>
+struct result_for;
+
+/** Create `boost::system::result` storing a portable error code
+
+    This function constructs a `boost::system::result<T>` that stores
+    `boost::system::error_code` with `value()` equal to `e` and `category()`
+    equal to `boost::system::generic_category()`. <br>
+
+    The main use for this function is in implementation of functions returning
+    `boost::system::result`, without including `boost/json/system_error.hpp` or
+    even `<system_error>`. In particular, it may be useful for customizations
+    of @ref try_value_to without creating a physical dependency on Boost.JSON.
+    For example:
+
+    @code
+    #include <cerrno>
+    #include <boost/assert/source_location.hpp>
+
+    namespace boost
+    {
+    namespace json
+    {
+
+    class value;
+
+    template<class T>
+    struct try_value_to_tag;
+
+    template<class T1, class T2>
+    struct result_for;
+
+    template <class T>
+    typename result_for<T, value>::type
+    result_from_errno(int e, boost::source_location const* loc) noexcept
+
+    }
+    }
+
+    namespace mine
+    {
+
+    class my_class;
+    ...
+    template<class JsonValue>
+    boost::json::result_for<my_class, JsonValue>
+    tag_invoke(boost::json::try_value_to_tag<my_class>, const JsonValue& jv)
+    {
+        BOOST_STATIC_CONSTEXPR boost::source_location loc = BOOST_CURRENT_LOCATION;
+        if( !jv.is_null() )
+            return boost::json::result_from_errno<my_class>(EINVAL, &loc);
+        return my_class();
+    }
+
+    }
+    @endcode
+
+    @par Exception Safety
+    Does not throw exceptions.
+
+    @tparam T The value type of returned `result`.
+
+    @param e The error value.
+
+    @param loc The error location.
+
+    @returns `boost::system::error_code` with `value()` equal to `e` and
+    `category()` equal to `boost::system::generic_category()`.
+
+    @see @ref try_value_to_tag, @ref try_value_to, @ref result_for,
+    <a href="https://www.boost.org/doc/libs/develop/libs/system/doc/html/system.html#ref_generic_category">
+        `boost::system::generic_category`</a>,
+    <a href="https://www.boost.org/doc/libs/master/libs/assert/doc/html/assert.html#source_location_support">
+        `boost::source_location`</a>.
+*/
+template <class T>
+typename result_for<T, value>::type
+result_from_errno(int e, boost::source_location const* loc) noexcept
+{
+    system::error_code ec(e, system::generic_category(), loc);
+    return {system::in_place_error, ec};
+}
+
+} // namespace json
+} // namespace boost
+
+#endif // BOOST_JSON_RESULT_FOR_HPP
diff --git a/inst/include/boost/json/serialize.hpp b/inst/include/boost/json/serialize.hpp
index 8bad9c13a..ec6722b0b 100644
--- a/inst/include/boost/json/serialize.hpp
+++ b/inst/include/boost/json/serialize.hpp
@@ -55,6 +55,10 @@ BOOST_JSON_DECL
 std::string
 serialize(string const& t, serialize_options const& opts = {});
 
+template<class T>
+std::string
+serialize(T const& t, serialize_options const& opts = {});
+
 BOOST_JSON_DECL
 std::string
 serialize(string_view t, serialize_options const& opts = {});
@@ -63,4 +67,6 @@ serialize(string_view t, serialize_options const& opts = {});
 } // namespace json
 } // namespace boost
 
+#include <boost/json/impl/serialize.hpp>
+
 #endif
diff --git a/inst/include/boost/json/serializer.hpp b/inst/include/boost/json/serializer.hpp
index 7f4524a79..4c977ebb1 100644
--- a/inst/include/boost/json/serializer.hpp
+++ b/inst/include/boost/json/serializer.hpp
@@ -12,8 +12,8 @@
 
 #include <boost/json/detail/config.hpp>
 #include <boost/json/detail/format.hpp>
-#include <boost/json/detail/stack.hpp>
 #include <boost/json/detail/stream.hpp>
+#include <boost/json/detail/writer.hpp>
 #include <boost/json/serialize_options.hpp>
 #include <boost/json/value.hpp>
 
@@ -56,49 +56,14 @@ namespace json {
     The same instance may not be accessed concurrently.
 */
 class serializer
+    : detail::writer
 {
-    enum class state : char;
-    // VFALCO Too many streams
-    using stream = detail::stream;
-    using const_stream = detail::const_stream;
-    using local_stream = detail::local_stream;
-    using local_const_stream =
-        detail::local_const_stream;
+    using fn_t = bool (*)(writer&, detail::stream&);
 
-    using fn_t = bool (serializer::*)(stream&);
-
-#ifndef BOOST_JSON_DOCS
-    union
-    {
-        value const* pv_;
-        array const* pa_;
-        object const* po_;
-    };
-#endif
-    fn_t fn0_ = &serializer::write_null<true>;
-    fn_t fn1_ = &serializer::write_null<false>;
-    value const* jv_ = nullptr;
-    detail::stack st_;
-    const_stream cs0_;
-    serialize_options opts_;
-    char buf_[detail::max_number_chars + 1];
+    fn_t fn0_ = nullptr;
+    fn_t fn1_ = nullptr;
     bool done_ = false;
 
-    inline bool suspend(state st);
-    inline bool suspend(
-        state st, array::const_iterator it, array const* pa);
-    inline bool suspend(
-        state st, object::const_iterator it, object const* po);
-    template<bool StackEmpty> bool write_null   (stream& ss);
-    template<bool StackEmpty> bool write_true   (stream& ss);
-    template<bool StackEmpty> bool write_false  (stream& ss);
-    template<bool StackEmpty> bool write_string (stream& ss);
-    template<bool StackEmpty> bool write_number (stream& ss);
-    template<bool StackEmpty> bool write_array  (stream& ss);
-    template<bool StackEmpty> bool write_object (stream& ss);
-    template<bool StackEmpty> bool write_value  (stream& ss);
-    inline string_view read_some(char* dest, std::size_t size);
-
 public:
     /// Move constructor (deleted)
     serializer(serializer&&) = delete;
@@ -150,11 +115,9 @@ class serializer
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use when producing partial output.
-        Shared ownership of the memory resource
-        is retained until the serializer is
-        destroyed.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use when producing partial output. Shared ownership of the memory
+        resource is retained until the serializer is destroyed.
 
         @param buf An optional static buffer to
         use for temporary storage when producing
@@ -219,6 +182,10 @@ class serializer
     BOOST_JSON_DECL
     void
     reset(string const* p) noexcept;
+
+    template<class T>
+    void
+    reset(T const* p) noexcept;
     /** @} */
 
     /** Reset the serializer for a new string
@@ -238,6 +205,17 @@ class serializer
     void
     reset(string_view sv) noexcept;
 
+    /** Reset the serializer for std::nullptr_t
+
+        This function prepares the serializer to emit
+        a new serialized JSON representing null.
+        Any internally allocated memory is
+        preserved and re-used for the new output.
+    */
+    BOOST_JSON_DECL
+    void
+    reset(std::nullptr_t) noexcept;
+
     /** Read the next buffer of serialized JSON
 
         This function attempts to fill the caller
@@ -332,4 +310,6 @@ class serializer
 } // namespace json
 } // namespace boost
 
+#include <boost/json/impl/serializer.hpp>
+
 #endif
diff --git a/inst/include/boost/json/static_resource.hpp b/inst/include/boost/json/static_resource.hpp
index 8edb325ce..f99b501a0 100644
--- a/inst/include/boost/json/static_resource.hpp
+++ b/inst/include/boost/json/static_resource.hpp
@@ -10,8 +10,9 @@
 #ifndef BOOST_JSON_STATIC_RESOURCE_HPP
 #define BOOST_JSON_STATIC_RESOURCE_HPP
 
+#include <boost/container/pmr/memory_resource.hpp>
 #include <boost/json/detail/config.hpp>
-#include <boost/json/memory_resource.hpp>
+#include <boost/json/is_deallocate_trivial.hpp>
 #include <cstddef>
 
 namespace boost {
@@ -67,7 +68,7 @@ class
     BOOST_JSON_DECL
     BOOST_SYMBOL_VISIBLE
 static_resource final
-    : public memory_resource
+    : public container::pmr::memory_resource
 {
     void* p_;
     std::size_t n_;
diff --git a/inst/include/boost/json/storage_ptr.hpp b/inst/include/boost/json/storage_ptr.hpp
index 085498b4e..79e30e007 100644
--- a/inst/include/boost/json/storage_ptr.hpp
+++ b/inst/include/boost/json/storage_ptr.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_JSON_STORAGE_PTR_HPP
 #define BOOST_JSON_STORAGE_PTR_HPP
 
+#include <boost/container/pmr/polymorphic_allocator.hpp>
 #include <boost/json/detail/config.hpp>
-#include <boost/json/memory_resource.hpp>
 #include <boost/json/detail/shared_resource.hpp>
 #include <boost/json/detail/default_resource.hpp>
-#include <cstddef>
+#include <boost/json/is_deallocate_trivial.hpp>
 #include <new>
 #include <type_traits>
 #include <utility>
@@ -22,19 +22,17 @@
 namespace boost {
 namespace json {
 
-/** A smart pointer to a @ref memory_resource
+/** A smart pointer to a memory resource.
 
     This container is used to hold a pointer to a memory resource. The
     pointed-to resource is always valid. Depending on the means of
     construction, the ownership will be either:
 
-    @li Non-owning, when constructing from a raw
-    pointer to @ref memory_resource or from a
-    @ref polymorphic_allocator. In this case the
-    caller is responsible for ensuring that the
-    lifetime of the memory resource extends until
-    there are no more calls to allocate or
-    deallocate.
+    @li Non-owning, when constructing from a raw pointer to
+    `boost::container::pmr::memory_resource` or from a
+    `boost::container::pmr::polymorphic_allocator`. In this case the caller is
+    responsible for ensuring that the lifetime of the memory resource extends
+    until there are no more calls to allocate or deallocate.
 
     @li Owning, when constructing using the function
     @ref make_shared_resource. In this case
@@ -74,8 +72,9 @@ namespace json {
 
     @see
         @ref make_shared_resource,
-        @ref memory_resource,
-        @ref polymorphic_allocator
+        @ref boost::container::pmr::polymorphic_allocator,
+        @ref boost::container::pmr::memory_resource.
+
 */
 class storage_ptr
 {
@@ -95,7 +94,7 @@ class storage_ptr
     get_shared() const noexcept
     {
         return static_cast<shared_resource*>(
-            reinterpret_cast<memory_resource*>(
+            reinterpret_cast<container::pmr::memory_resource*>(
                 i_ & ~3));
     }
 
@@ -123,7 +122,7 @@ class storage_ptr
     storage_ptr(
         detail::shared_resource_impl<T>* p) noexcept
         : i_(reinterpret_cast<std::uintptr_t>(
-                static_cast<memory_resource*>(p)) + 1 +
+                static_cast<container::pmr::memory_resource*>(p)) + 1 +
             (json::is_deallocate_trivial<T>::value ? 2 : 0))
     {
         BOOST_ASSERT(p);
@@ -168,14 +167,13 @@ class storage_ptr
 
     /** Constructor
 
-        This constructs a non-owning pointer that
-        points to the memory resource `r`.
-        The caller is responsible for maintaining the
-        lifetime of the pointed-to @ref memory_resource.
+        This constructs a non-owning pointer that points to the memory resource
+        `r`. The caller is responsible for maintaining the lifetime of the
+        pointed-to `boost::container::pmr::memory_resource`.
 
         @par Constraints
         @code
-        std::is_convertible< T*, memory_resource* >::value == true
+        std::is_convertible< T*, boost::container::pmr::memory_resource* >::value == true
         @endcode
 
         @par Preconditions
@@ -193,12 +191,12 @@ class storage_ptr
 #ifndef BOOST_JSON_DOCS
         , class = typename std::enable_if<
             std::is_convertible<T*,
-                memory_resource*>::value>::type
+                container::pmr::memory_resource*>::value>::type
 #endif
     >
     storage_ptr(T* r) noexcept
         : i_(reinterpret_cast<std::uintptr_t>(
-                static_cast<memory_resource *>(r)) +
+                static_cast<container::pmr::memory_resource *>(r)) +
             (json::is_deallocate_trivial<T>::value ? 2 : 0))
     {
         BOOST_ASSERT(r);
@@ -206,26 +204,25 @@ class storage_ptr
 
     /** Constructor
 
-        This constructs a non-owning pointer that
-        points to the same memory resource as `alloc`,
-        obtained by calling `alloc.resource()`.
-        The caller is responsible for maintaining the
-        lifetime of the pointed-to @ref memory_resource.
+        This constructs a non-owning pointer that points to the same memory
+        resource as `alloc`, obtained by calling `alloc.resource()`. The caller
+        is responsible for maintaining the lifetime of the
+        pointed-to `boost::container::pmr::memory_resource`.
 
         @par Constraints
         @code
-        std::is_convertible< T*, memory_resource* >::value == true
+        std::is_convertible< T*, boost::container::pmr::memory_resource* >::value == true
         @endcode
 
         @par Exception Safety
         No-throw guarantee.
 
-        @param alloc A @ref polymorphic_allocator to
+        @param alloc A `boost::container::pmr::polymorphic_allocator` to
         construct from.
     */
     template<class T>
     storage_ptr(
-        polymorphic_allocator<T> const& alloc) noexcept
+        container::pmr::polymorphic_allocator<T> const& alloc) noexcept
         : i_(reinterpret_cast<std::uintptr_t>(
             alloc.resource()))
     {
@@ -400,7 +397,7 @@ class storage_ptr
     /** Return a pointer to the memory resource.
 
         This function returns a pointer to the
-        referenced @ref memory_resource.
+        referenced `boost::container::pmr::memory_resource`.
 
         @par Complexity
         Constant.
@@ -408,19 +405,19 @@ class storage_ptr
         @par Exception Safety
         No-throw guarantee.
     */
-    memory_resource*
+    container::pmr::memory_resource*
     get() const noexcept
     {
         if(i_ != 0)
             return reinterpret_cast<
-                memory_resource*>(i_ & ~3);
+                container::pmr::memory_resource*>(i_ & ~3);
         return default_resource::get();
     }
 
     /** Return a pointer to the memory resource.
 
         This function returns a pointer to the
-        referenced @ref memory_resource.
+        referenced `boost::container::pmr::memory_resource`.
 
         @par Complexity
         Constant.
@@ -428,7 +425,7 @@ class storage_ptr
         @par Exception Safety
         No-throw guarantee.
     */
-    memory_resource*
+    container::pmr::memory_resource*
     operator->() const noexcept
     {
         return get();
@@ -437,7 +434,7 @@ class storage_ptr
     /** Return a reference to the memory resource.
 
         This function returns a reference to the
-        pointed-to @ref memory_resource.
+        pointed-to `boost::container::pmr::memory_resource`.
 
         @par Complexity
 
@@ -447,7 +444,7 @@ class storage_ptr
 
         No-throw guarantee.
     */
-    memory_resource&
+    container::pmr::memory_resource&
     operator*() const noexcept
     {
         return *get();
@@ -474,7 +471,7 @@ class storage_ptr
 
     @par Mandates
     @code
-    std::is_base_of< memory_resource, U >::value == true
+    std::is_base_of< boost::container::pmr::memory_resource, U >::value == true
     @endcode
 
     @par Complexity
@@ -495,7 +492,7 @@ make_shared_resource(Args&&... args)
     // `T` is not a memory resource.
     BOOST_STATIC_ASSERT(
         std::is_base_of<
-            memory_resource, U>::value);
+            container::pmr::memory_resource, U>::value);
     return storage_ptr(new
         detail::shared_resource_impl<U>(
             std::forward<Args>(args)...));
@@ -506,9 +503,9 @@ make_shared_resource(Args&&... args)
 
 /** Return true if two storage pointers point to the same memory resource.
 
-    This function returns `true` if the @ref memory_resource
-    objects pointed to by `lhs` and `rhs` have the
-    same address.
+    This function returns `true` if the
+    `boost::container::pmr::memory_resource` objects pointed to by `lhs` and
+    `rhs` have the same address.
 */
 inline
 bool
@@ -521,9 +518,9 @@ operator==(
 
 /** Return true if two storage pointers point to different memory resources.
 
-    This function returns `true` if the @ref memory_resource
-    objects pointed to by `lhs` and `rhs` have different
-    addresses.
+    This function returns `true` if the
+    `boost::container::pmr::memory_resource` objects pointed to by `lhs` and
+    `rhs` have different addresses.
 */
 inline
 bool
diff --git a/inst/include/boost/json/stream_parser.hpp b/inst/include/boost/json/stream_parser.hpp
index aa61e5977..588e3a378 100644
--- a/inst/include/boost/json/stream_parser.hpp
+++ b/inst/include/boost/json/stream_parser.hpp
@@ -89,19 +89,17 @@ namespace json {
     first obtained from an optional, caller-owned
     buffer specified upon construction. When that
     is exhausted, the next allocation uses the
-    @ref memory_resource passed to the constructor; if
+    `boost::container::pmr::memory_resource` passed to the constructor; if
     no such argument is specified, the default memory
     resource is used. Temporary storage is freed only
     when the parser is destroyed; The performance of
     parsing multiple JSON texts may be improved by reusing
     the same parser instance.
 \n
-    It is important to note that the @ref memory_resource
-    supplied upon construction is used for temporary
-    storage only, and not for allocating the elements
-    which make up the parsed value. That other memory
-    resource is optionally supplied in each call
-    to @ref reset.
+    It is important to note that the `boost::container::pmr::memory_resource`
+    supplied upon construction is used for temporary storage only, and not for
+    allocating the elements which make up the parsed value. That other memory
+    resource is optionally supplied in each call to @ref reset.
 
     @par Duplicate Keys
 
@@ -431,9 +429,9 @@ class stream_parser
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use for the resulting @ref value. The parser
-        will acquire shared ownership.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use for the resulting @ref value. The parser will acquire shared
+        ownership.
     */
     BOOST_JSON_DECL
     void
@@ -511,13 +509,13 @@ class stream_parser
 
         @param ec Set to the error, if any occurred.
     */
-/** @{ */
+    /** @{ */
     BOOST_JSON_DECL
     std::size_t
     write_some(
         char const* data,
         std::size_t size,
-        error_code& ec);
+        system::error_code& ec);
 
     BOOST_JSON_DECL
     std::size_t
@@ -525,7 +523,7 @@ class stream_parser
         char const* data,
         std::size_t size,
         std::error_code& ec);
-/** @} */
+    /** @} */
 
     /** Parse a buffer containing all or part of a complete JSON text.
 
@@ -573,7 +571,7 @@ class stream_parser
         @param size The number of characters pointed to
         by `data`.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     BOOST_JSON_DECL
     std::size_t
@@ -625,11 +623,11 @@ class stream_parser
 
         @param ec Set to the error, if any occurred.
     */
-/** @{ */
+    /** @{ */
     std::size_t
     write_some(
         string_view s,
-        error_code& ec)
+        system::error_code& ec)
     {
         return write_some(
             s.data(), s.size(), ec);
@@ -643,7 +641,7 @@ class stream_parser
         return write_some(
             s.data(), s.size(), ec);
     }
-/** @} */
+    /** @} */
 
     /** Parse a buffer containing all or part of a complete JSON text.
 
@@ -687,7 +685,7 @@ class stream_parser
 
         @param s The character string to parse.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     std::size_t
     write_some(
@@ -742,13 +740,13 @@ class stream_parser
 
         @param ec Set to the error, if any occurred.
     */
-/** @{ */
+    /** @{ */
     BOOST_JSON_DECL
     std::size_t
     write(
         char const* data,
         std::size_t size,
-        error_code& ec);
+        system::error_code& ec);
 
     BOOST_JSON_DECL
     std::size_t
@@ -756,7 +754,7 @@ class stream_parser
         char const* data,
         std::size_t size,
         std::error_code& ec);
-/** @} */
+    /** @} */
 
     /** Parse a buffer containing all or part of a complete JSON text.
 
@@ -801,7 +799,7 @@ class stream_parser
         @param size The number of characters pointed to
         by `data`.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     BOOST_JSON_DECL
     std::size_t
@@ -850,11 +848,11 @@ class stream_parser
 
         @param ec Set to the error, if any occurred.
     */
-/** @{ */
+    /** @{ */
     std::size_t
     write(
         string_view s,
-        error_code& ec)
+        system::error_code& ec)
     {
         return write(
             s.data(), s.size(), ec);
@@ -868,7 +866,7 @@ class stream_parser
         return write(
             s.data(), s.size(), ec);
     }
-/** @} */
+    /** @} */
 
     /** Parse a buffer containing all or part of a complete JSON text.
 
@@ -909,7 +907,7 @@ class stream_parser
 
         @param s The character string to parse.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     std::size_t
     write(
@@ -952,15 +950,15 @@ class stream_parser
 
         @param ec Set to the error, if any occurred.
     */
-/** @{ */
+    /** @{ */
     BOOST_JSON_DECL
     void
-    finish(error_code& ec);
+    finish(system::error_code& ec);
 
     BOOST_JSON_DECL
     void
     finish(std::error_code& ec);
-/** @} */
+    /** @} */
 
     /** Indicate the end of JSON input.
 
@@ -993,7 +991,7 @@ class stream_parser
         Upon error or exception, subsequent calls will
         fail until @ref reset is called to parse a new JSON text.
 
-        @throw system_error Thrown on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     BOOST_JSON_DECL
     void
@@ -1020,7 +1018,7 @@ class stream_parser
         @return The parsed value. Ownership of this
         value is transferred to the caller.
 
-        @throw system_error Thrown on failure.
+        @throw `boost::system::system_error` Thrown on failure.
     */
     BOOST_JSON_DECL
     value
diff --git a/inst/include/boost/json/string.hpp b/inst/include/boost/json/string.hpp
index 85a3f16c2..01e5c98da 100644
--- a/inst/include/boost/json/string.hpp
+++ b/inst/include/boost/json/string.hpp
@@ -19,12 +19,10 @@
 #include <boost/json/detail/except.hpp>
 #include <boost/json/detail/string_impl.hpp>
 #include <boost/json/detail/value.hpp>
-#include <algorithm>
+#include <boost/system/result.hpp>
 #include <cstring>
-#include <initializer_list>
 #include <iosfwd>
 #include <iterator>
-#include <limits>
 #include <new>
 #include <type_traits>
 #include <utility>
@@ -84,16 +82,8 @@ class string
         storage_ptr sp);
 
 public:
-    /** The type of _Allocator_ returned by @ref get_allocator
-
-        This type is a @ref polymorphic_allocator.
-    */
-#ifdef BOOST_JSON_DOCS
-    // VFALCO doc toolchain renders this incorrectly
-    using allocator_type = __see_below__;
-#else
-    using allocator_type = polymorphic_allocator<value>;
-#endif
+    /// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
+    using allocator_type = container::pmr::polymorphic_allocator<value>;
 
     /// The type of a character
     using value_type        = char;
@@ -219,9 +209,9 @@ class string
 
         Constant.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     explicit
     string(storage_ptr sp)
@@ -248,12 +238,12 @@ class string
         @param ch The value to initialize characters
         of the string with.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
 
-        @throw system_error `count > max_size()`.
+        @throw `boost::system::system_error` `count > max_size()`.
     */
     BOOST_JSON_DECL
     explicit
@@ -281,12 +271,12 @@ class string
         @param s A pointer to a character string used to
         copy from.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
 
-        @throw system_error `strlen(s) > max_size()`.
+        @throw `boost::system::system_error` `strlen(s) > max_size()`.
     */
     BOOST_JSON_DECL
     string(
@@ -313,12 +303,12 @@ class string
         @param s A pointer to a character string used to
         copy from.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
 
-        @throw system_error `count > max_size()`.
+        @throw `boost::system::system_error` `count > max_size()`.
     */
     BOOST_JSON_DECL
     explicit
@@ -354,12 +344,12 @@ class string
         @param last An input iterator pointing to the end
         of the range.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
 
-        @throw system_error `std::distance(first, last) > max_size()`.
+        @throw `boost::system::system_error` `std::distance(first, last) > max_size()`.
     */
     template<class InputIt
     #ifndef BOOST_JSON_DOCS
@@ -407,10 +397,10 @@ class string
         @param other The string to use as a source
         to copy from.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
     */
     BOOST_JSON_DECL
     explicit
@@ -420,13 +410,12 @@ class string
 
     /** Move constructor.
 
-        Constructs the string with the contents of `other`
-        using move semantics. Ownership of the underlying
-        memory is transferred.
-        The container acquires shared ownership of the
-        @ref memory_resource used by `other`. After construction,
-        the moved-from string behaves as if newly
-        constructed with its current memory resource.
+        Constructs the string with the contents of `other` using move
+        semantics. Ownership of the underlying memory is transferred. The
+        container acquires shared ownership of the
+        `boost::container::pmr::memory_resource` used by `other`. After
+        construction, the moved-from string behaves as if newly constructed
+        with its current memory resource.
 
         @par Complexity
 
@@ -446,12 +435,10 @@ class string
         Construct the contents with those of `other`
         using move semantics.
 
-        @li If `*other.storage() == *sp`,
-        ownership of the underlying memory is transferred
-        in constant time, with no possibility
-        of exceptions. After construction, the moved-from
-        string behaves as if newly constructed with
-        its current @ref memory_resource. Otherwise,
+        @li If `*other.storage() == *sp`, ownership of the underlying memory is
+        transferred in constant time, with no possibility of exceptions. After
+        construction, the moved-from string behaves as if newly constructed
+        with its current `boost::container::pmr::memory_resource`. Otherwise,
 
         @li If `*other.storage() != *sp`,
         a copy of the characters in `other` is made. In
@@ -468,10 +455,10 @@ class string
 
         @param other The string to assign from.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
     */
     BOOST_JSON_DECL
     explicit
@@ -496,12 +483,12 @@ class string
 
         @param s The string view to copy from.
 
-        @param sp An optional pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-        The default argument for this parameter is `{}`.
+        @param sp An optional pointer to the
+        `boost::container::pmr::memory_resource` to use. The container will
+        acquire shared ownership of the memory resource. The default argument
+        for this parameter is `{}`.
 
-        @throw system_error `s.size() > max_size()`.
+        @throw `boost::system::system_error` `std::distance(first, last) > max_size()`.
     */
     BOOST_JSON_DECL
     string(
@@ -543,12 +530,11 @@ class string
 
         @li If `&other == this`, do nothing. Otherwise,
 
-        @li If `*other.storage() == *this->storage()`,
-        ownership of the underlying memory is transferred
-        in constant time, with no possibility
-        of exceptions. After construction, the moved-from
-        string behaves as if newly constructed with its
-        current @ref memory_resource. Otherwise,
+        @li If `*other.storage() == *this->storage()`, ownership of the
+        underlying memory is transferred in constant time, with no possibility
+        of exceptions. After construction, the moved-from string behaves as if
+        newly constructed with its current
+        `boost::container::pmr::memory_resource`. Otherwise,
 
         @li a copy of the characters in `other` is made. In
         this case, the moved-from container is not changed.
@@ -591,7 +577,7 @@ class string
 
         @param s The null-terminated character string.
 
-        @throw system_error `std::strlen(s) > max_size()`.
+        @throw `boost::system::system_error` `std::strlen(s) > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -616,7 +602,7 @@ class string
 
         @param s The string view to copy from.
 
-        @throw system_error `s.size() > max_size()`.
+        @throw `boost::system::system_error` `s.size() > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -645,7 +631,7 @@ class string
         @param ch The value to initialize characters
         of the string with.
 
-        @throw system_error `count > max_size()`.
+        @throw `boost::system::system_error` `count > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -683,12 +669,11 @@ class string
 
         @li If `&other == this`, do nothing. Otherwise,
 
-        @li If `*other.storage() == *this->storage()`,
-        ownership of the underlying memory is transferred
-        in constant time, with no possibility of
-        exceptions. After construction, the moved-from
-        string behaves as if newly constructed with
-        its current  @ref memory_resource, otherwise
+        @li If `*other.storage() == *this->storage()`, ownership of the
+        underlying memory is transferred in constant time, with no possibility
+        of exceptions. After construction, the moved-from string behaves as if
+        newly constructed with its current
+        `boost::container::pmr::memory_resource`, otherwise
 
         @li If `*other.storage() != *this->storage()`,
         a copy of the characters in `other` is made.
@@ -734,7 +719,7 @@ class string
         @param s A pointer to a character string used to
         copy from.
 
-        @throw system_error `count > max_size()`.
+        @throw `boost::system::system_error` `count > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -766,7 +751,7 @@ class string
         @param s A pointer to a character string used to
         copy from.
 
-        @throw system_error `strlen(s) > max_size()`.
+        @throw `boost::system::system_error` `strlen(s) > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -802,7 +787,7 @@ class string
         @param last An input iterator pointing to the end
         of the range.
 
-        @throw system_error `std::distance(first, last) > max_size()`.
+        @throw `boost::system::system_error` `std::distance(first, last) > max_size()`.
     */
     template<class InputIt
     #ifndef BOOST_JSON_DOCS
@@ -833,7 +818,7 @@ class string
 
         @param s The string view to copy from.
 
-        @throw system_error `s.size() > max_size()`.
+        @throw `boost::system::system_error` `s.size() > max_size()`.
     */
     string&
     assign(string_view s)
@@ -843,9 +828,9 @@ class string
 
     //------------------------------------------------------
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated memory resource.
 
-        This returns the @ref memory_resource used by
+        This returns the `boost::container::pmr::memory_resource` used by
         the container.
 
         @par Complexity
@@ -862,11 +847,10 @@ class string
         return sp_;
     }
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated allocator.
 
-        This function returns an instance of
-        @ref polymorphic_allocator constructed from the
-        associated @ref memory_resource.
+        This function returns an instance of @ref allocator_type constructed
+        from the associated `boost::container::pmr::memory_resource`.
 
         @par Complexity
 
@@ -888,6 +872,30 @@ class string
     //
     //------------------------------------------------------
 
+    /** Return a character with bounds checking.
+
+        Returns `boost::system::result` containing a reference to the character
+        specified at location `pos`, if `pos` is within the range of the
+        string. Otherwise the result contains an `error_code`.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @param pos A zero-based index to access.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    BOOST_JSON_DECL
+    system::result<char&>
+    try_at(std::size_t pos) noexcept;
+
+    BOOST_JSON_DECL
+    system::result<char const&>
+    try_at(std::size_t pos) const noexcept;
+    /** @} */
+
     /** Return a character with bounds checking.
 
         Returns a reference to the character specified at
@@ -903,27 +911,23 @@ class string
 
         @param pos A zero-based index to access.
 
-        @throw system_error `pos >= size()`
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @throw `boost::system::system_error` `pos >= size()`.
     */
     /** @{ */
+    inline
     char&
-    at(std::size_t pos)
-    {
-
-        auto const& self = *this;
-        return const_cast< char& >( self.at(pos) );
-    }
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION);
 
+    BOOST_JSON_DECL
     char const&
-    at(std::size_t pos) const
-    {
-        if(pos >= size())
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-            detail::throw_system_error( error::out_of_range, &loc );
-        }
-        return impl_.data()[pos];
-    }
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const;
     /** @} */
 
     /** Return a character without bounds checking.
@@ -1113,7 +1117,7 @@ class string
         return impl_.data();
     }
 
-    /** Convert to a `string_view` referring to the string.
+    /** Convert to a @ref string_view referring to the string.
 
         Returns a string view to the
         underlying character string. The size of the view
@@ -1474,7 +1478,7 @@ class string
 
         @param new_capacity The new capacity of the array.
 
-        @throw system_error `new_capacity > max_size()`
+        @throw `boost::system::system_error` `new_capacity > max_size()`.
     */
     void
     reserve(std::size_t new_capacity)
@@ -1548,9 +1552,8 @@ class string
 
         @param sv The `string_view` to insert.
 
-        @throw system_error `size() + s.size() > max_size()`
-
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `size() + s.size() > max_size()`.
+        @throw `boost::system::system_error` `pos > size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -1578,9 +1581,8 @@ class string
 
         @param ch The character to insert.
 
-        @throw system_error `size() + count > max_size()`
-
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `size() + count > max_size()`.
+        @throw `boost::system::system_error` `pos > size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -1608,9 +1610,8 @@ class string
 
         @param ch The character to insert.
 
-        @throw system_error `size() + 1 > max_size()`
-
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `size() + 1 > max_size()`.
+        @throw `boost::system::system_error` `pos > size()`.
     */
     string&
     insert(
@@ -1651,9 +1652,8 @@ class string
 
         @param last The end of the character range.
 
-        @throw system_error `size() + insert_count > max_size()`
-
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `size() + insert_count > max_size()`.
+        @throw `boost::system::system_error` `pos > size()`.
     */
     template<class InputIt
     #ifndef BOOST_JSON_DOCS
@@ -1691,7 +1691,7 @@ class string
         The default argument for this parameter
         is @ref npos.
 
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `pos > size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -1775,7 +1775,7 @@ class string
 
         @param ch The character to append.
 
-        @throw system_error `size() + 1 > max_size()`
+        @throw `boost::system::system_error` `size() + 1 > max_size()`.
     */
     BOOST_JSON_DECL
     void
@@ -1812,7 +1812,7 @@ class string
 
         @param ch The character to append.
 
-        @throw system_error `size() + count > max_size()`
+        @throw `boost::system::system_error` `size() + count > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -1832,7 +1832,7 @@ class string
 
         @param sv The `string_view` to append.
 
-        @throw system_error `size() + s.size() > max_size()`
+        @throw `boost::system::system_error` `size() + s.size() > max_size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -1865,7 +1865,7 @@ class string
         @param last An iterator one past the
         last character to append.
 
-        @throw system_error `size() + insert_count > max_size()`
+        @throw `boost::system::system_error` `size() + insert_count > max_size()`.
     */
     template<class InputIt
     #ifndef BOOST_JSON_DOCS
@@ -1890,7 +1890,7 @@ class string
 
         @param sv The `string_view` to append.
 
-        @throw system_error `size() + sv.size() > max_size()`
+        @throw `boost::system::system_error` `size() + sv.size() > max_size()`.
     */
     string&
     operator+=(string_view sv)
@@ -1908,7 +1908,7 @@ class string
 
         @param ch The character to append.
 
-        @throw system_error `size() + 1 > max_size()`
+        @throw `boost::system::system_error` `size() + 1 > max_size()`.
     */
     string&
     operator+=(char ch)
@@ -2037,9 +2037,8 @@ class string
 
         @param sv The `string_view` to replace with.
 
-        @throw system_error `size() + (sv.size() - rcount) > max_size()`
-
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `size() + (sv.size() - rcount) > max_size()`.
+        @throw `boost::system::system_error` `pos > size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -2075,7 +2074,7 @@ class string
 
         @param sv The `string_view` to replace with.
 
-        @throw system_error `size() + (sv.size() - std::distance(first, last)) > max_size()`
+        @throw `boost::system::system_error` `size() + (sv.size() - std::distance(first, last)) > max_size()`.
     */
     string&
     replace(
@@ -2125,7 +2124,7 @@ class string
         @param last2 An iterator one past the end of
         the last character to replace with.
 
-        @throw system_error `size() + (inserted - std::distance(first, last)) > max_size()`
+        @throw `boost::system::system_error` `size() + (inserted - std::distance(first, last)) > max_size()`.
     */
     template<class InputIt
     #ifndef BOOST_JSON_DOCS
@@ -2164,9 +2163,8 @@ class string
 
         @param ch The character to replace with.
 
-        @throw system_error `size() + (count2 - rcount) > max_size()`
-
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `size() + (count2 - rcount) > max_size()`.
+        @throw `boost::system::system_error` `pos > size()`.
     */
     BOOST_JSON_DECL
     string&
@@ -2206,7 +2204,7 @@ class string
 
         @param ch The character to replace with.
 
-        @throw system_error `size() + (count - std::distance(first, last)) > max_size()`
+        @throw `boost::system::system_error` `size() + (count - std::distance(first, last)) > max_size()`.
     */
     string&
     replace(
@@ -2237,7 +2235,7 @@ class string
         The default argument for this parameter
         is @ref npos.
 
-        @throw system_error `pos > size()`
+        @throw `boost::system::system_error` `pos > size()`.
     */
     string_view
     subview(
@@ -2252,8 +2250,7 @@ class string
         Returns a view of the whole string.
 
         @par Exception Safety
-
-        `noexcept`
+        No-throw guarantee.
 
         @return `string_view(this->data(), this->size())`.
     */
@@ -2282,7 +2279,7 @@ class string
         @param pos The index to begin copying from. The
         default argument for this parameter is `0`.
 
-        @throw system_error `pos > max_size()`
+        @throw `boost::system::system_error` `pos > max_size()`.
     */
     std::size_t
     copy(
@@ -2304,7 +2301,7 @@ class string
 
         @param count The size to resize the string to.
 
-        @throw system_error `count > max_size()`
+        @throw `boost::system::system_error` `count > max_size()`.
     */
     void
     resize(std::size_t count)
@@ -2324,7 +2321,7 @@ class string
         @param ch The characters to append if the size
         increases.
 
-        @throw system_error `count > max_size()`
+        @throw `boost::system::system_error` `count > max_size()`.
     */
     BOOST_JSON_DECL
     void
@@ -2360,9 +2357,9 @@ class string
 
     /** Swap the contents.
 
-        Exchanges the contents of this string with another
-        string. Ownership of the respective @ref memory_resource
-        objects is not transferred.
+        Exchanges the contents of this string with another string. Ownership of
+        the respective `boost::container::pmr::memory_resource` objects is not
+        transferred.
 
         @li If `&other == this`, do nothing. Otherwise,
 
@@ -2391,9 +2388,9 @@ class string
 
     /** Exchange the given values.
 
-        Exchanges the contents of the string `lhs` with
-        another string `rhs`. Ownership of the respective
-        @ref memory_resource objects is not transferred.
+        Exchanges the contents of the string `lhs` with another string `rhs`.
+        Ownership of the respective `boost::container::pmr::memory_resource`
+        objects is not transferred.
 
         @li If `&lhs == &rhs`, do nothing. Otherwise,
 
diff --git a/inst/include/boost/json/system_error.hpp b/inst/include/boost/json/system_error.hpp
deleted file mode 100644
index a08cd7dc1..000000000
--- a/inst/include/boost/json/system_error.hpp
+++ /dev/null
@@ -1,225 +0,0 @@
-//
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
-// Copyright (c) 2022 Dmitry Arkhipov (grisumbras@yandex.ru)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/json
-//
-
-#ifndef BOOST_JSON_SYSTEM_ERROR_HPP
-#define BOOST_JSON_SYSTEM_ERROR_HPP
-
-#include <boost/json/detail/config.hpp>
-#include <boost/json/fwd.hpp>
-#include <boost/assert/source_location.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/system/result.hpp>
-#include <boost/system/system_error.hpp>
-
-namespace boost {
-namespace json {
-
-/// The type of error code used by the library.
-using error_code = boost::system::error_code;
-
-/// The type of error category used by the library.
-using error_category = boost::system::error_category;
-
-/// The type of error condition used by the library.
-using error_condition = boost::system::error_condition;
-
-/// The type of system error thrown by the library.
-using system_error = boost::system::system_error;
-
-/** The type of result returned by library functions
-
-    This is an alias template used as the return type for functions that can
-    either return a value, or fail with an error code. This is a brief
-    synopsis of the type:
-
-    @par Declaration
-    @code
-    template< class T >
-    class result
-    {
-    public:
-        // Return true if the result contains an error
-        constexpr bool has_error() const noexcept;
-
-        // These two return true if the result contains a value
-        constexpr bool has_value() const noexcept;
-        constexpr explicit operator bool() const noexcept;
-
-        // Return the value or throw an exception if has_value() == false
-        constexpr T& value();
-        constexpr T const& value() const;
-
-        // Return the value, assuming the result contains it
-        constexpr T& operator*();
-        constexpr T const& operator*() const;
-
-        // Return the error, which is default constructed if has_error() == false
-        constexpr error_code error() const noexcept;
-        ...more
-    };
-    @endcode
-
-    @par Usage
-    Given the function @ref try_value_to with this signature:
-
-    @code
-    template< class T>
-    result< T > try_value_to( const value& jv );
-    @endcode
-
-    The following statement captures the value in a variable upon success,
-    otherwise throws:
-    @code
-    int n = try_value_to<int>( jv ).value();
-    @endcode
-
-    This statement captures the result in a variable and inspects the error
-    condition:
-    @code
-    result< int > r = try_value_to<int>( jv );
-    if( r )
-        std::cout << *r;
-    else
-        std::cout << r.error();
-    @endcode
-
-    @note For a full synopsis of the type, please see the corresponding
-    documentation in Boost.System.
-
-    @tparam T The type of value held by the result.
-*/
-template< class T >
-using result = boost::system::result<T>;
-
-/**
-   Helper trait that returns @ref result
-
-   The primary template is an incomplete type. The library provides a partial
-   specialisation `result_for<T1, value>`, that has nested type alias `type`
-   that aliases the type `result<T1>`.
-
-   The purpose of this trait is to let users provide non-throwing conversions
-   for their types without creating a physical dependency on Boost.Json. For
-   example:
-
-   @code
-   namespace boost
-   {
-   namespace json
-   {
-
-   template<class T>
-   struct value_to_tag;
-
-   template<class T1, class T2>
-   struct result_for;
-   }
-   }
-
-   namespace mine
-   {
-       class my_class;
-       ...
-       template<class JsonValue>
-       boost::json::result_for<my_class, JsonValue>
-       tag_invoke(boost::json::try_value_to_tag<my_class>, const JsonValue& jv)
-       { ... }
-   }
-   @endcode
-
-    @see @ref try_value_to, @ref try_value_to_tag
-*/
-template <class T1, class T2>
-struct result_for;
-
-/** Create @ref result storing a portable error code
-
-    This function constructs a `result<T>` that stores @ref error_code with
-    `value()` equal to `e` and `category()` equal to
-    `boost::system::generic_category()`. <br>
-
-    The main use for this function is in implementation of functions returning
-    @ref result, without including `boost/json/system_error.hpp` or even
-    `<system_error>`. In particular, it may be useful for customizations of
-    @ref try_value_to without creating a physical dependency on Boost.JSON.
-    For example:
-
-    @code
-    #include <cerrno>
-    #include <boost/assert/source_location.hpp>
-
-    namespace boost
-    {
-    namespace json
-    {
-
-    class value;
-
-    template<class T>
-    struct try_value_to_tag;
-
-    template<class T1, class T2>
-    struct result_for;
-
-    template <class T>
-    typename result_for<T, value>::type
-    result_from_errno(int e, boost::source_location const* loc) noexcept
-
-    }
-    }
-
-    namespace mine
-    {
-
-    class my_class;
-    ...
-    template<class JsonValue>
-    boost::json::result_for<my_class, JsonValue>
-    tag_invoke(boost::json::try_value_to_tag<my_class>, const JsonValue& jv)
-    {
-        BOOST_STATIC_CONSTEXPR boost::source_location loc = BOOST_CURRENT_LOCATION;
-        if( !jv.is_null() )
-            return boost::json::result_from_errno<my_class>(EINVAL, &loc);
-        return my_class();
-    }
-
-    }
-    @endcode
-
-    @par Exception Safety
-    Does not throw exceptions.
-
-    @tparam T The value type of returned `result`.
-
-    @param e The error value.
-
-    @param loc The error location.
-
-    @returns @ref error_code with `value()` equal to `e` and `category()` equal
-    to `boost::system::generic_category()`.
-
-    @see @ref try_value_to_tag, @ref try_value_to, @ref result_for,
-    <a href="https://www.boost.org/doc/libs/develop/libs/system/doc/html/system.html#ref_generic_category">
-        `boost::system::generic_category`</a>,
-    <a href="https://www.boost.org/doc/libs/master/libs/assert/doc/html/assert.html#source_location_support">
-        `boost::source_location`</a>.
-*/
-template <class T>
-typename result_for<T, value>::type
-result_from_errno(int e, boost::source_location const* loc) noexcept
-{
-    error_code ec(e, system::generic_category(), loc);
-    return {system::in_place_error, ec};
-}
-
-} // namespace json
-} // namespace boost
-
-#endif
diff --git a/inst/include/boost/json/value.hpp b/inst/include/boost/json/value.hpp
index 711f319ae..ace92a9e3 100644
--- a/inst/include/boost/json/value.hpp
+++ b/inst/include/boost/json/value.hpp
@@ -111,16 +111,8 @@ class value
     }
 
 public:
-    /** The type of _Allocator_ returned by @ref get_allocator
-
-        This type is a @ref polymorphic_allocator.
-    */
-#ifdef BOOST_JSON_DOCS
-    // VFALCO doc toolchain renders this incorrectly
-    using allocator_type = __see_below__;
-#else
-    using allocator_type = polymorphic_allocator<value>;
-#endif
+    /// Associated [Allocator](https://en.cppreference.com/w/cpp/named_req/Allocator)
+    using allocator_type = container::pmr::polymorphic_allocator<value>;
 
     /** Destructor.
 
@@ -157,8 +149,8 @@ class value
 
     /** Constructor.
 
-        The constructed value is null,
-        using the specified @ref memory_resource.
+        The constructed value is null, using the
+        specified `boost::container::pmr::memory_resource`.
 
         @par Complexity
         Constant.
@@ -166,9 +158,9 @@ class value
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     explicit
     value(storage_ptr sp) noexcept
@@ -239,9 +231,9 @@ class value
 
         @param other The value to copy.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     value(
@@ -297,9 +289,9 @@ class value
 
         @param other The value to move.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     value(
@@ -322,9 +314,9 @@ class value
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         std::nullptr_t,
@@ -346,9 +338,9 @@ class value
 
         @param b The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
 #ifdef BOOST_JSON_DOCS
     value(
@@ -377,9 +369,9 @@ class value
 
         @param i The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         signed char i,
@@ -399,9 +391,9 @@ class value
 
         @param i The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         short i,
@@ -421,9 +413,9 @@ class value
 
         @param i The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         int i,
@@ -443,9 +435,9 @@ class value
 
         @param i The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         long i,
@@ -465,9 +457,9 @@ class value
 
         @param i The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         long long i,
@@ -487,9 +479,9 @@ class value
 
         @param u The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         unsigned char u,
@@ -509,9 +501,9 @@ class value
 
         @param u The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         unsigned short u,
@@ -531,9 +523,9 @@ class value
 
         @param u The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         unsigned int u,
@@ -553,9 +545,9 @@ class value
 
         @param u The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         unsigned long u,
@@ -575,9 +567,9 @@ class value
 
         @param u The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         unsigned long long u,
@@ -597,9 +589,9 @@ class value
 
         @param d The initial value.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         double d,
@@ -622,9 +614,9 @@ class value
 
         @param s The string view to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         string_view s,
@@ -649,9 +641,9 @@ class value
         @param s The null-terminated string to construct
         with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         char const* s,
@@ -704,9 +696,9 @@ class value
 
         @param other The string to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         string const& other,
@@ -731,9 +723,9 @@ class value
 
         @param other The string to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         string&& other,
@@ -765,9 +757,9 @@ class value
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
 
         @see @ref string_kind
     */
@@ -821,9 +813,9 @@ class value
 
         @param other The array to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         array const& other,
@@ -848,9 +840,9 @@ class value
 
         @param other The array to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         array&& other,
@@ -882,9 +874,9 @@ class value
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
 
         @see @ref array_kind
     */
@@ -938,9 +930,9 @@ class value
 
         @param other The object to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         object const& other,
@@ -965,9 +957,9 @@ class value
 
         @param other The object to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     value(
         object&& other,
@@ -999,9 +991,9 @@ class value
         @par Exception Safety
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
 
         @see @ref object_kind
     */
@@ -1034,23 +1026,9 @@ class value
 
         @param init The initializer list to construct from.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The container will acquire shared
-        ownership of the memory resource.
-
-        @par Note
-        The previous behavior of this constructor was to always
-        construct either an @ref object or an @ref array. In practice though,
-        several C++ implementations did not treat `value{x}` as a constructor
-        from initializer list. This effectively resulted in different behavior
-        on different implementations. <br>
-
-        If you need the legacy behavior define macro
-        `BOOST_JSON_LEGACY_INIT_LIST_BEHAVIOR` when you are building the
-        library. The macro and the functionality will be deprecated in the
-        future and then removed, so we urge you to change your code for the new
-        behavior as soon as possible. The simplest way to create an @ref array
-        with 1 element using an initializer list is via `array{x}`.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The container will acquire shared ownership of the memory
+        resource.
     */
     BOOST_JSON_DECL
     value(
@@ -1592,10 +1570,9 @@ class value
 
     /** Return a reference to an @ref object, changing the kind and replacing the contents.
 
-        The contents are replaced with an empty @ref object
-        using the current @ref memory_resource. All
-        previously obtained iterators and references
-        obtained beforehand are invalidated.
+        The contents are replaced with an empty @ref object using the current
+        `boost::container::pmr::memory_resource`. All previously obtained
+        iterators and references obtained beforehand are invalidated.
 
         @par Complexity
         Linear in the size of `*this`.
@@ -1609,9 +1586,9 @@ class value
 
     /** Swap the given values.
 
-        Exchanges the contents of this value with another
-        value. Ownership of the respective @ref memory_resource
-        objects is not transferred:
+        Exchanges the contents of this value with another value. Ownership of
+        the respective `boost::container::pmr::memory_resource` objects is not
+        transferred:
 
         @li If `*other.storage() == *this->storage()`,
         ownership of the underlying memory is swapped in
@@ -1640,9 +1617,9 @@ class value
 
     /** Swap the given values.
 
-        Exchanges the contents of value `lhs` with
-        another value `rhs`. Ownership of the respective
-        @ref memory_resource objects is not transferred.
+        Exchanges the contents of value `lhs` with another value `rhs`.
+        Ownership of the respective `boost::container::pmr::memory_resource`
+        objects is not transferred.
 
         @li If `*lhs.storage() == *rhs.storage()`,
         ownership of the underlying memory is swapped in
@@ -2386,7 +2363,7 @@ class value
         ! std::is_same<T, bool>::value,
             T>::type
 #endif
-    to_number(error_code& ec) const noexcept
+    to_number(system::error_code& ec) const noexcept
     {
         error e;
         auto result = to_number<T>(e);
@@ -2405,13 +2382,68 @@ class value
 #endif
     to_number(std::error_code& ec) const noexcept
     {
-        error_code jec;
+        system::error_code jec;
         auto result = to_number<T>(jec);
         ec = jec;
         return result;
     }
 /** @} */
 
+    /** Return the stored number as `boost::system::result<T>`.
+
+        This function attempts to return the stored value converted to the
+        arithmetic type `T` which may not be `bool`:
+
+        @li If `T` is an integral type and the stored value is a number which
+            can be losslessly converted, the conversion is performed without
+            error and `result<T>` containing the converted number is returned.
+
+        @li If `T` is an integral type and the stored value is a number which
+            cannot be losslessly converted, then `result<T>` containing the
+            corresponding `error_code` is returned.
+
+        @li If `T` is a floating point type and the stored value is a number,
+            the conversion is performed without error. `result<T>` containing
+            the converted number, with a possible loss of precision, is
+            returned.
+
+        @li Otherwise, if the stored value is not a number; that is, if
+            `this->is_number()` returns `false`, then `result<T>` containing
+            the corresponding `error_code` is returned.
+
+        @par Constraints
+        @code
+        std::is_arithmetic< T >::value && ! std::is_same< T, bool >::value
+        @endcode
+
+        @par Complexity
+        Constant.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @return `boost::system::result<T>` with either the converted number or
+            an `error_code`.
+    */
+    template<class T>
+#ifdef BOOST_JSON_DOCS
+    system::result<T>
+#else
+    typename std::enable_if<
+        std::is_arithmetic<T>::value && ! std::is_same<T, bool>::value,
+        system::result<T>
+    >::type
+#endif
+    try_to_number() const noexcept
+    {
+        system::error_code ec;
+        T result = to_number<T>(ec);
+        if( ec )
+            return {system::in_place_error, ec};
+
+        return {system::in_place_value, result};
+    }
+
     /** Return the stored number cast to an arithmetic type.
 
         This function attempts to return the stored value
@@ -2446,7 +2478,7 @@ class value
 
         @return The converted number.
 
-        @throw system_error on error.
+        @throw `boost::system::system_error` Thrown on error.
     */
     template<class T>
 #ifdef BOOST_JSON_DOCS
@@ -2459,14 +2491,7 @@ class value
 #endif
     to_number() const
     {
-        error e;
-        auto result = to_number<T>(e);
-        if( e != error() )
-        {
-            BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-            detail::throw_system_error( e, &loc );
-        }
-        return result;
+        return try_to_number<T>().value();
     }
 
     //------------------------------------------------------
@@ -2475,10 +2500,10 @@ class value
     //
     //------------------------------------------------------
 
-    /** Return the memory resource associated with the value.
+    /** Return the associated memory resource.
 
-        This returns a pointer to the memory resource
-        that was used to construct the value.
+        This function returns the `boost::container::pmr::memory_resource` used
+        by the container.
 
         @par Complexity
         Constant.
@@ -2492,11 +2517,10 @@ class value
         return sp_;
     }
 
-    /** Return the associated @ref memory_resource
+    /** Return the associated allocator.
 
-        This function returns an instance of
-        @ref polymorphic_allocator constructed from the
-        associated @ref memory_resource.
+        This function returns an instance of @ref allocator_type constructed
+        from the associated `boost::container::pmr::memory_resource`.
 
         @par Complexity
         Constant.
@@ -2512,288 +2536,623 @@ class value
 
     //------------------------------------------------------
 
-    /** Return a reference to the underlying `object`, or throw an exception.
+    /** Return `result` with a reference to the underlying @ref array
 
-        If @ref is_object() is `true`, returns
-        a reference to the underlying @ref object,
-        otherwise throws an exception.
+        If @ref is_array() is `true`, the result contains a reference to the
+        underlying @ref array, otherwise it contains an `error_code`.
+
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_array() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_array().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
-
-        @throw system_error `! this->is_object()`
+        No-throw guarantee.
     */
-    /* @{ */
-    object&
-    as_object() &
-    {
-        auto const& self = *this;
-        return const_cast<object&>( self.as_object() );
-    }
+    /** @{ */
+    BOOST_JSON_DECL
+    system::result<array&>
+    try_as_array() noexcept;
 
-    object&&
-    as_object() &&
-    {
-        return std::move( as_object() );
-    }
+    BOOST_JSON_DECL
+    system::result<array const&>
+    try_as_array() const noexcept;
+    /** @} */
 
-    object const&
-    as_object() const&
-    {
-        if( is_object() )
-            return obj_;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_object, &loc );
-    }
-    /* @} */
+    /** Return `result` with a reference to the underlying @ref object
 
-    /** Return a reference to the underlying @ref array, or throw an exception.
+        If @ref is_object() is `true`, the result contains a reference to the
+        underlying @ref object, otherwise it contains an `error_code`.
 
-        If @ref is_array() is `true`, returns
-        a reference to the underlying @ref array,
-        otherwise throws an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_object() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_object().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
-
-        @throw system_error `! this->is_array()`
+        No-throw guarantee.
     */
-    /* @{ */
-    array&
-    as_array() &
-    {
-        auto const& self = *this;
-        return const_cast<array&>( self.as_array() );
-    }
+    /** @{ */
+    BOOST_JSON_DECL
+    system::result<object&>
+    try_as_object() noexcept;
 
-    array&&
-    as_array() &&
-    {
-        return std::move( as_array() );
-    }
+    BOOST_JSON_DECL
+    system::result<object const&>
+    try_as_object() const noexcept;
+    /** @} */
 
-    array const&
-    as_array() const&
-    {
-        if( is_array() )
-            return arr_;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_array, &loc );
-    }
-    /* @} */
+    /** Return `result` with a reference to the underlying @ref string
 
-    /** Return a reference to the underlying `string`, or throw an exception.
+        If @ref is_string() is `true`, the result contains a reference to the
+        underlying @ref string, otherwise it contains an `error_code`.
 
-        If @ref is_string() is `true`, returns
-        a reference to the underlying @ref string,
-        otherwise throws an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_string() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_string().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
-
-        @throw system_error `! this->is_string()`
+        No-throw guarantee.
     */
-    /* @{ */
-    string&
-    as_string() &
-    {
-        auto const& self = *this;
-        return const_cast<string&>( self.as_string() );
-    }
+    /** @{ */
+    BOOST_JSON_DECL
+    system::result<string&>
+    try_as_string() noexcept;
 
-    string&&
-    as_string() &&
-    {
-        return std::move( as_string() );
-    }
+    BOOST_JSON_DECL
+    system::result<string const&>
+    try_as_string() const noexcept;
+    /** @} */
 
-    string const&
-    as_string() const&
-    {
-        if( is_string() )
-            return str_;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_string, &loc );
-    }
-    /* @} */
+    /** Return `result` with a reference to the underlying `std::int64_t`
 
-    /** Return a reference to the underlying `std::int64_t`, or throw an exception.
+        If @ref is_int64() is `true`, the result contains a reference to the
+        underlying `std::int64_t`, otherwise it contains an `error_code`.
 
-        If @ref is_int64() is `true`, returns
-        a reference to the underlying `std::int64_t`,
-        otherwise throws an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_int64() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_int64().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<std::int64_t&>
+    try_as_int64() noexcept;
 
-        @throw system_error `! this->is_int64()`
+    /** Return `result` with the underlying `std::int64_t`
 
-        @par Note
-        This function is intended for direct access to the underlying object,
-        __if__ it has the type `std::int64_t`. It does not convert the
-        underlying object to type `std::int64_t` even if a lossless conversion
-        is possible. If you are not sure which kind your `value` has, and you
-        only care about getting a `std::int64_t` number, consider using
-        @ref to_number instead.
-    */
-    std::int64_t&
-    as_int64()
-    {
-        if( is_int64() )
-            return sca_.i;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_int64, &loc );
-    }
+        If @ref is_int64() is `true`, the result contains a copy of the
+        underlying `std::int64_t`, otherwise it contains an `error_code`.
 
-    /** Return the underlying `std::int64_t`, or throw an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_int64() )
+            return *r;
+        @endcode
 
-        If @ref is_int64() is `true`, returns
-        the underlying `std::int64_t`,
-        otherwise throws an exception.
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_int64().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<std::int64_t>
+    try_as_int64() const noexcept;
 
-        @throw system_error `! this->is_int64()`
+    /** Return `result` with a reference to the underlying `std::uint64_t`
 
-        @par Note
-        This function is the const-qualified overload of @ref as_int64, which
-        is intended for direct access to the underlying object, __if__ it has
-        the type `std::int64_t`. It does not convert the underlying object to
-        type `std::int64_t` even if a lossless conversion is possible. If you
-        are not sure which kind your `value` has, and you only care about
-        getting a `std::int64_t` number, consider using @ref to_number instead.
-    */
-    std::int64_t
-    as_int64() const
-    {
-        if( is_int64() )
-            return sca_.i;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_int64, &loc );
-    }
+        If @ref is_uint64() is `true`, the result contains a reference to the
+        underlying `std::uint64_t`, otherwise it contains an `error_code`.
 
-    /** Return a reference to the underlying `std::uint64_t`, or throw an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_uint64() )
+            return *r;
+        @endcode
 
-        If @ref is_uint64() is `true`, returns
-        a reference to the underlying `std::uint64_t`,
-        otherwise throws an exception.
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_uint64().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<std::uint64_t&>
+    try_as_uint64() noexcept;
 
-        @throw system_error `! this->is_uint64()`
+    /** Return `result` with the underlying `std::uint64_t`
 
-        @par Note
-        This function is intended for direct access to the underlying object,
-        __if__ it has the type `std::uint64_t`. It does not convert the
-        underlying object to type `std::uint64_t` even if a lossless conversion
-        is possible. If you are not sure which kind your `value` has, and you
-        only care about getting a `std::uint64_t` number, consider using
-        @ref to_number instead.
-    */
-    std::uint64_t&
-    as_uint64()
-    {
-        if( is_uint64() )
-            return sca_.u;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_uint64, &loc );
-    }
+        If @ref is_uint64() is `true`, the result contains a copy of the
+        underlying `std::uint64_t`, otherwise it contains an `error_code`.
 
-    /** Return the underlying `std::uint64_t`, or throw an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_uint64() )
+            return *r;
+        @endcode
 
-        If @ref is_uint64() is `true`, returns
-        the underlying `std::uint64_t`,
-        otherwise throws an exception.
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_uint64().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<std::uint64_t>
+    try_as_uint64() const noexcept;
 
-        @throw system_error `! this->is_uint64()`
+    /** Return `result` with a reference to the underlying `double`
 
-        @par Note
-        This function is the const-qualified overload of @ref as_uint64, which
-        is intended for direct access to the underlying object, __if__ it has
-        the type `std::uint64_t`. It does not convert the underlying object to
-        type `std::uint64_t` even if a lossless conversion is possible. If you
-        are not sure which kind your `value` has, and you only care about
-        getting a `std::uint64_t` number, consider using
-        @ref to_number instead.
-    */
-    std::uint64_t
-    as_uint64() const
-    {
-        if( is_uint64() )
-            return sca_.u;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_uint64, &loc );
-    }
+        If @ref is_double() is `true`, the result contains a reference to the
+        underlying `double`, otherwise it contains an `error_code`.
 
-    /** Return a reference to the underlying `double`, or throw an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_double() )
+            return *r;
+        @endcode
 
-        If @ref is_double() is `true`, returns
-        a reference to the underlying `double`,
-        otherwise throws an exception.
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_double().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<double&>
+    try_as_double() noexcept;
 
-        @throw system_error `! this->is_double()`
+    /** Return `result` with the underlying `double`
 
-        @par Note
-        This function is intended for direct access to the underlying object,
-        __if__ it has the type `double`. It does not convert the underlying
-        object to type `double` even if a lossless conversion is possible. If
-        you are not sure which kind your `value` has, and you only care about
-        getting a `double` number, consider using @ref to_number instead.
-    */
-    double&
-    as_double()
-    {
-        if( is_double() )
-            return sca_.d;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_double, &loc );
-    }
+        If @ref is_double() is `true`, the result contains a copy of the
+        underlying `double`, otherwise it contains an `error_code`.
 
-    /** Return the underlying `double`, or throw an exception.
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_double() )
+            return *r;
+        @endcode
 
-        If @ref is_double() is `true`, returns
-        the underlying `double`,
-        otherwise throws an exception.
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_double().value();
+        @endcode
 
         @par Complexity
         Constant.
 
         @par Exception Safety
-        Strong guarantee.
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<double>
+    try_as_double() const noexcept;
+
+    /** Return `result` with a reference to the underlying `bool`
+
+        If @ref is_bool() is `true`, the result contains a reference to the
+        underlying `bool`, otherwise it contains an `error_code`.
+
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_bool() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_bool().value();
+        @endcode
+
+        @par Complexity
+        Constant.
+
+        @par Exception Safety
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<bool&>
+    try_as_bool() noexcept;
+
+    /** Return `result` with the underlying `bool`
+
+        If @ref is_bool() is `true`, the result contains a copy of the
+        underlying `bool`, otherwise it contains an `error_code`.
+
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_bool() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_bool().value();
+        @endcode
+
+        @par Complexity
+        Constant.
+
+        @par Exception Safety
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<bool>
+    try_as_bool() const noexcept;
+
+    /** Return engaged `result` if the `value` is null
+
+        If @ref is_null() is `true`, the result is engaged, otherwise it
+        contains an `error_code`.
+
+        @par Example
+        The return value can be used in both a boolean context and
+        to assign a variable:
+        @code
+        if( auto r = jv.try_as_null() )
+            return *r;
+        @endcode
+
+        But can also be used to throw an exception on error:
+        @code
+        return jv.try_as_null().value();
+        @endcode
+
+        @par Complexity
+        Constant.
+
+        @par Exception Safety
+        No-throw guarantee.
+    */
+    BOOST_JSON_DECL
+    system::result<std::nullptr_t>
+    try_as_null() const noexcept;
+
+    //------------------------------------------------------
+
+    /** Return a reference to the underlying `object`, or throw an exception.
+
+        If @ref is_object() is `true`, returns
+        a reference to the underlying @ref object,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_object()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    object&
+    as_object(source_location const& loc = BOOST_CURRENT_LOCATION) &
+    {
+        auto& self = const_cast<value const&>(*this);
+        return const_cast<object&>( self.as_object(loc) );
+    }
+
+    object&&
+    as_object(source_location const& loc = BOOST_CURRENT_LOCATION) &&
+    {
+        return std::move( as_object(loc) );
+    }
+
+    BOOST_JSON_DECL
+    object const&
+    as_object(source_location const& loc = BOOST_CURRENT_LOCATION) const&;
+    /** @} */
+
+    /** Return a reference to the underlying @ref array, or throw an exception.
+
+        If @ref is_array() is `true`, returns
+        a reference to the underlying @ref array,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_array()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    array&
+    as_array(source_location const& loc = BOOST_CURRENT_LOCATION) &
+    {
+        auto& self = const_cast<value const&>(*this);
+        return const_cast<array&>( self.as_array(loc) );
+    }
+
+    array&&
+    as_array(source_location const& loc = BOOST_CURRENT_LOCATION) &&
+    {
+        return std::move( as_array(loc) );
+    }
+
+    BOOST_JSON_DECL
+    array const&
+    as_array(source_location const& loc = BOOST_CURRENT_LOCATION) const&;
+    /** @} */
 
-        @throw system_error `! this->is_double()`
+    /** Return a reference to the underlying `string`, or throw an exception.
+
+        If @ref is_string() is `true`, returns
+        a reference to the underlying @ref string,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_string()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+    */
+    string&
+    as_string(source_location const& loc = BOOST_CURRENT_LOCATION) &
+    {
+        auto& self = const_cast<value const&>(*this);
+        return const_cast<string&>( self.as_string(loc) );
+    }
+
+    /** Return a reference to the underlying `string`, or throw an exception.
+
+        If @ref is_string() is `true`, returns
+        a reference to the underlying @ref string,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_string()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    string&&
+    as_string(source_location const& loc = BOOST_CURRENT_LOCATION) &&
+    {
+        return std::move( as_string(loc) );
+    }
+
+    BOOST_JSON_DECL
+    string const&
+    as_string(source_location const& loc = BOOST_CURRENT_LOCATION) const&;
+
+    BOOST_JSON_DECL
+    std::int64_t&
+    as_int64(source_location const& loc = BOOST_CURRENT_LOCATION);
+    /** @} */
+
+    /** Return the underlying `std::int64_t`, or throw an exception.
+
+        If @ref is_int64() is `true`, returns
+        the underlying `std::int64_t`,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_int64()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+
+        @par Note
+        This function is the const-qualified overload of @ref as_int64, which
+        is intended for direct access to the underlying object, __if__ it has
+        the type `std::int64_t`. It does not convert the underlying object to
+        type `std::int64_t` even if a lossless conversion is possible. If you
+        are not sure which kind your `value` has, and you only care about
+        getting a `std::int64_t` number, consider using @ref to_number instead.
+    */
+    BOOST_JSON_DECL
+    std::int64_t
+    as_int64(source_location const& loc = BOOST_CURRENT_LOCATION) const;
+
+    /** Return a reference to the underlying `std::uint64_t`, or throw an exception.
+
+        If @ref is_uint64() is `true`, returns
+        a reference to the underlying `std::uint64_t`,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_uint64()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+
+        @par Note
+        This function is intended for direct access to the underlying object,
+        __if__ it has the type `std::uint64_t`. It does not convert the
+        underlying object to type `std::uint64_t` even if a lossless conversion
+        is possible. If you are not sure which kind your `value` has, and you
+        only care about getting a `std::uint64_t` number, consider using
+        @ref to_number instead.
+    */
+    BOOST_JSON_DECL
+    std::uint64_t&
+    as_uint64(source_location const& loc = BOOST_CURRENT_LOCATION);
+
+    /** Return the underlying `std::uint64_t`, or throw an exception.
+
+        If @ref is_uint64() is `true`, returns
+        the underlying `std::uint64_t`,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_uint64()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+
+        @par Note
+        This function is the const-qualified overload of @ref as_uint64, which
+        is intended for direct access to the underlying object, __if__ it has
+        the type `std::uint64_t`. It does not convert the underlying object to
+        type `std::uint64_t` even if a lossless conversion is possible. If you
+        are not sure which kind your `value` has, and you only care about
+        getting a `std::uint64_t` number, consider using
+        @ref to_number instead.
+    */
+    BOOST_JSON_DECL
+    std::uint64_t
+    as_uint64(source_location const& loc = BOOST_CURRENT_LOCATION) const;
+
+    /** Return a reference to the underlying `double`, or throw an exception.
+
+        If @ref is_double() is `true`, returns
+        a reference to the underlying `double`,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_double()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
+
+        @par Note
+        This function is intended for direct access to the underlying object,
+        __if__ it has the type `double`. It does not convert the underlying
+        object to type `double` even if a lossless conversion is possible. If
+        you are not sure which kind your `value` has, and you only care about
+        getting a `double` number, consider using @ref to_number instead.
+    */
+    BOOST_JSON_DECL
+    double&
+    as_double(source_location const& loc = BOOST_CURRENT_LOCATION);
+
+    /** Return the underlying `double`, or throw an exception.
+
+        If @ref is_double() is `true`, returns
+        the underlying `double`,
+        otherwise throws an exception.
+
+        @par Exception Safety
+        Strong guarantee.
+
+        @throw `boost::system::system_error` `! this->is_double()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
 
         @par Note
         This function is the const-qualified overload of @ref as_double, which
@@ -2803,14 +3162,9 @@ class value
         which kind your `value` has, and you only care about getting a `double`
         number, consider using @ref to_number instead.
     */
+    BOOST_JSON_DECL
     double
-    as_double() const
-    {
-        if( is_double() )
-            return sca_.d;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_double, &loc );
-    }
+    as_double(source_location const& loc = BOOST_CURRENT_LOCATION) const;
 
     /** Return a reference to the underlying `bool`, or throw an exception.
 
@@ -2818,22 +3172,20 @@ class value
         a reference to the underlying `bool`,
         otherwise throws an exception.
 
-        @par Complexity
-        Constant.
-
         @par Exception Safety
         Strong guarantee.
 
-        @throw system_error `! this->is_bool()`
+        @throw `boost::system::system_error` `! this->is_bool()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
     */
+    BOOST_JSON_DECL
     bool&
-    as_bool()
-    {
-        if( is_bool() )
-            return sca_.b;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_bool, &loc );
-    }
+    as_bool(source_location const& loc = BOOST_CURRENT_LOCATION);
 
     /** Return the underlying `bool`, or throw an exception.
 
@@ -2841,22 +3193,20 @@ class value
         the underlying `bool`,
         otherwise throws an exception.
 
-        @par Complexity
-        Constant.
-
         @par Exception Safety
         Strong guarantee.
 
-        @throw system_error `! this->is_bool()`
+        @throw `boost::system::system_error` `! this->is_bool()`.
+
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @par Complexity
+        Constant.
     */
+    BOOST_JSON_DECL
     bool
-    as_bool() const
-    {
-        if( is_bool() )
-            return sca_.b;
-        BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION;
-        detail::throw_system_error( error::not_bool, &loc );
-    }
+    as_bool(source_location const& loc = BOOST_CURRENT_LOCATION) const;
 
     //------------------------------------------------------
 
@@ -2877,7 +3227,7 @@ class value
         @par Exception Safety
         No-throw guarantee.
     */
-    /* @{ */
+    /** @{ */
     object&
     get_object() & noexcept
     {
@@ -2898,7 +3248,7 @@ class value
         BOOST_ASSERT(is_object());
         return obj_;
     }
-    /* @} */
+    /** @} */
 
     /** Return a reference to the underlying `array`, without checking.
 
@@ -2917,7 +3267,7 @@ class value
         @par Exception Safety
         No-throw guarantee.
     */
-    /* @{ */
+    /** @{ */
     array&
     get_array() & noexcept
     {
@@ -2938,7 +3288,7 @@ class value
         BOOST_ASSERT(is_array());
         return arr_;
     }
-    /* @} */
+    /** @} */
 
     /** Return a reference to the underlying `string`, without checking.
 
@@ -2957,7 +3307,7 @@ class value
         @par Exception Safety
         No-throw guarantee.
     */
-    /* @{ */
+    /** @{ */
     string&
     get_string() & noexcept
     {
@@ -2978,7 +3328,7 @@ class value
         BOOST_ASSERT(is_string());
         return str_;
     }
-    /* @} */
+    /** @} */
 
     /** Return a reference to the underlying `std::int64_t`, without checking.
 
@@ -3174,6 +3524,31 @@ class value
 
     //------------------------------------------------------
 
+    /** Access an element, with bounds checking.
+
+        Returns `boost::system::result` containing a reference to the element
+        of the underlying object, if `pos` is within its range. If `pos` is
+        outside of that range, or the underlying value is not an object the
+        result contains an `error_code`.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @param key The key of the element to find.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    BOOST_JSON_DECL
+    boost::system::result<value&>
+    try_at(string_view key) noexcept;
+
+    BOOST_JSON_DECL
+    boost::system::result<value const&>
+    try_at(string_view key) const noexcept;
+    /** @} */
+
     /** Access an element, with bounds checking.
 
         This function is used to access elements of
@@ -3188,27 +3563,57 @@ class value
 
         @param key The key of the element to find.
 
-        @return `this->as_object().at( key )`.
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @return `this->as_object(loc).at( key, loc )`.
     */
-/** @{ */
+    /** @{ */
     value&
-    at(string_view key) &
+    at(string_view key, source_location const& loc = BOOST_CURRENT_LOCATION) &
     {
-        return as_object().at(key);
+        return as_object(loc).at(key, loc);
     }
 
     value&&
-    at(string_view key) &&
+    at(string_view key, source_location const& loc = BOOST_CURRENT_LOCATION) &&
     {
-        return std::move( as_object() ).at(key);
+        return std::move( as_object(loc) ).at(key, loc);
     }
 
     value const&
-    at(string_view key) const&
+    at(
+        string_view key,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const&
     {
-        return as_object().at(key);
+        return as_object(loc).at(key, loc);
     }
-/** @} */
+    /** @} */
+
+    /** Access an element, with bounds checking.
+
+        Returns `boost::system::result` containing a reference to the element
+        of the underlying array, if `pos` is within its range. If `pos` is
+        outside of that range, or the underlying value is not an array the
+        result contains an `error_code`.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @param pos A zero-based array index.
+
+        @par Complexity
+        Constant.
+    */
+    /** @{ */
+    BOOST_JSON_DECL
+    boost::system::result<value&>
+    try_at(std::size_t pos) noexcept;
+
+    BOOST_JSON_DECL
+    boost::system::result<value const&>
+    try_at(std::size_t pos) const noexcept;
+    /** @} */
 
     /** Access an element, with bounds checking.
 
@@ -3224,27 +3629,79 @@ class value
 
         @param pos A zero-based array index.
 
-        @return `this->as_array().at( pos )`.
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
+        @return `this->as_array(loc).at( pos, loc )`.
     */
-/** @{ */
+    /** @{ */
     value &
-    at(std::size_t pos) &
+    at(std::size_t pos, source_location const& loc = BOOST_CURRENT_LOCATION) &
     {
-        return as_array().at(pos);
+        return as_array(loc).at(pos, loc);
     }
 
     value&&
-    at(std::size_t pos) &&
+    at(std::size_t pos, source_location const& loc = BOOST_CURRENT_LOCATION) &&
     {
-        return std::move( as_array() ).at(pos);
+        return std::move( as_array(loc) ).at(pos, loc);
     }
 
     value const&
-    at(std::size_t pos) const&
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const&
     {
-        return as_array().at(pos);
+        return as_array(loc).at(pos, loc);
     }
-/** @} */
+    /** @} */
+
+    /** Access an element via JSON Pointer.
+
+        This function is used to access a (potentially nested) element of the
+        value using a JSON Pointer string.
+
+        @par Complexity
+        Linear in the sizes of `ptr` and underlying array, object, or string.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @param ptr JSON Pointer string.
+
+        @return `boost::system::result<value&>` containing either a reference
+            to the element identified by `ptr` or a corresponding `error_code`.
+
+        @see
+            [RFC 6901 - JavaScript Object Notation (JSON) Pointer](https://datatracker.ietf.org/doc/html/rfc6901).
+    */
+    BOOST_JSON_DECL
+    system::result<value const&>
+    try_at_pointer(string_view ptr) const noexcept;
+
+    /** Access an element via JSON Pointer.
+
+        This function is used to access a (potentially nested) element of the
+        value using a JSON Pointer string.
+
+        @par Complexity
+        Linear in the sizes of `ptr` and underlying array, object, or string.
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @param ptr JSON Pointer string.
+
+        @return `boost::system::result<value const&>` containing either a
+            reference to the element identified by `ptr` or a corresponding
+            `error_code`.
+
+        @see
+            [RFC 6901 - JavaScript Object Notation (JSON) Pointer](https://datatracker.ietf.org/doc/html/rfc6901).
+    */
+    BOOST_JSON_DECL
+    system::result<value&>
+    try_at_pointer(string_view ptr) noexcept;
 
     /** Access an element via JSON Pointer.
 
@@ -3259,27 +3716,36 @@ class value
 
         @param ptr JSON Pointer string.
 
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
         @return reference to the element identified by `ptr`.
 
-        @throw system_error if an error occurs.
+        @throw `boost::system::system_error` if an error occurs.
 
         @see
         <a href="https://datatracker.ietf.org/doc/html/rfc6901">
             RFC 6901 - JavaScript Object Notation (JSON) Pointer</a>
     */
-/** @{ */
+    /** @{ */
     BOOST_JSON_DECL
     value const&
-    at_pointer(string_view ptr) const&;
+    at_pointer(
+        string_view ptr,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const&;
 
     inline
     value&&
-    at_pointer(string_view ptr) &&;
+    at_pointer(
+        string_view ptr,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &&;
 
     inline
     value&
-    at_pointer(string_view ptr) &;
-/** @} */
+    at_pointer(
+        string_view ptr,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &;
+    /** @} */
 
     /** Access an element via JSON Pointer.
 
@@ -3302,14 +3768,14 @@ class value
         <a href="https://datatracker.ietf.org/doc/html/rfc6901">
             RFC 6901 - JavaScript Object Notation (JSON) Pointer</a>
     */
-/** @{ */
+    /** @{ */
     BOOST_JSON_DECL
     value const*
-    find_pointer(string_view ptr, error_code& ec) const noexcept;
+    find_pointer(string_view ptr, system::error_code& ec) const noexcept;
 
     BOOST_JSON_DECL
     value*
-    find_pointer(string_view ptr, error_code& ec) noexcept;
+    find_pointer(string_view ptr, system::error_code& ec) noexcept;
 
     BOOST_JSON_DECL
     value const*
@@ -3318,10 +3784,76 @@ class value
     BOOST_JSON_DECL
     value*
     find_pointer(string_view ptr, std::error_code& ec) noexcept;
-/** @} */
+    /** @} */
 
     //------------------------------------------------------
 
+    /** Set an element via JSON Pointer.
+
+        This function is used to insert or assign to a potentially nested
+        element of the value using a JSON Pointer string. The function may
+        create intermediate elements corresponding to pointer segments.
+        <br/>
+
+        The particular conditions when and what kind of intermediate element
+        is created is governed by the `ptr` parameter.
+
+        Each pointer token is considered in sequence. For each token
+
+        - if the containing value is an @ref object, then a new `null`
+          element is created with key equal to unescaped token string;
+          otherwise
+
+        - if the containing value is an @ref array, and the token represents a
+          past-the-end marker, then a `null` element is appended to the array;
+          otherwise
+
+        - if the containing value is an @ref array, and the token represents a
+          number, then if the difference between the number and array's size
+          is smaller than `opts.max_created_elements`, then the size of the
+          array is increased, so that the number can reference an element in the
+          array; otherwise
+
+        - if the containing value is of different @ref kind and
+          `opts.replace_any_scalar` is `true`, or the value is `null`, then
+
+           - if `opts.create_arrays` is `true` and the token either represents
+             past-the-end marker or a number, then the value is replaced with
+             an empty array and the token is considered again; otherwise
+
+           - if `opts.create_objects` is `true`, then the value is replaced
+             with an empty object and the token is considered again; otherwise
+
+        - an error is produced.
+
+        @par Complexity
+        Linear in the sum of size of `ptr`, size of underlying array, object,
+        or string and `opts.max_created_elements`.
+
+        @par Exception Safety
+        Basic guarantee.
+        Calls to `memory_resource::allocate` may throw.
+
+        @param sv JSON Pointer string.
+
+        @param ref The value to assign to pointed element.
+
+        @param opts The options for the algorithm.
+
+        @return `boost::json::result<value&>` containing either a reference to
+            the element identified by `ptr` or a corresponding `error_code`.
+
+        @see
+            @ref set_pointer_options,
+            [RFC 6901 - JavaScript Object Notation (JSON) Pointer](https://datatracker.ietf.org/doc/html/rfc6901).
+    */
+    BOOST_JSON_DECL
+    system::result<value&>
+    try_set_at_pointer(
+        string_view sv,
+        value_ref ref,
+        set_pointer_options const& opts = {} );
+
     /** Set an element via JSON Pointer.
 
         This function is used to insert or assign to a potentially nested
@@ -3446,13 +3978,13 @@ class value
         <a href="https://datatracker.ietf.org/doc/html/rfc6901">
             RFC 6901 - JavaScript Object Notation (JSON) Pointer</a>.
     */
-/** @{ */
+    /** @{ */
     BOOST_JSON_DECL
     value*
     set_at_pointer(
         string_view sv,
         value_ref ref,
-        error_code& ec,
+        system::error_code& ec,
         set_pointer_options const& opts = {} );
 
     BOOST_JSON_DECL
@@ -3462,7 +3994,7 @@ class value
         value_ref ref,
         std::error_code& ec,
         set_pointer_options const& opts = {} );
-/** @} */
+    /** @} */
 
     //------------------------------------------------------
 
@@ -3545,8 +4077,8 @@ class value
         parsing fails, `std::ios_base::failbit` will be set for `is` and
         `jv` will be left unchanged. Regardless of whether `skipws` flag is set
         on `is`, consumes whitespace before and after JSON, because whitespace
-        is considered a part of JSON. Behaves as [_FormattedInputFunction_]
-        (https://en.cppreference.com/w/cpp/named_req/FormattedInputFunction).<br>
+        is considered a part of JSON. Behaves as
+        [_FormattedInputFunction_](https://en.cppreference.com/w/cpp/named_req/FormattedInputFunction).
 
         Note: this operator cannot assume that the stream only contains a
         single JSON document, which may result in **very underwhelming
@@ -3840,9 +4372,8 @@ class key_value_pair
 
         @param other The key/value pair to copy.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The element will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The element will acquire shared ownership of the memory resource.
     */
     BOOST_JSON_DECL
     key_value_pair(
@@ -3959,9 +4490,8 @@ class key_value_pair
         @param p A `std::pair` with the key
             string and @ref value to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The element will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The element will acquire shared ownership of the memory resource.
     */
     explicit
     key_value_pair(
@@ -3989,9 +4519,8 @@ class key_value_pair
         @param p A `std::pair` with the key
             string and @ref value to construct with.
 
-        @param sp A pointer to the @ref memory_resource
-        to use. The element will acquire shared
-        ownership of the memory resource.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use. The element will acquire shared ownership of the memory resource.
     */
     explicit
     key_value_pair(
@@ -4062,7 +4591,7 @@ class key_value_pair
         @par Exception Safety
         No-throw guarantee.
     */
-    /* @{ */
+    /** @{ */
     json::value const&
     value() const& noexcept
     {
@@ -4080,7 +4609,7 @@ class key_value_pair
     {
         return value_;
     }
-    /* @} */
+    /** @} */
 
 private:
     json::value value_;
diff --git a/inst/include/boost/json/value_ref.hpp b/inst/include/boost/json/value_ref.hpp
index e37e34cb8..2f55fc8ed 100644
--- a/inst/include/boost/json/value_ref.hpp
+++ b/inst/include/boost/json/value_ref.hpp
@@ -44,12 +44,11 @@ class string;
     @li `std::initializer_list< std::pair< string_view, value_ref > >`
     for constructing or assigning an @ref object.
 
-    A `value_ref` uses reference semantics. Creation
-    of the actual container from the initializer
-    list is lazily deferred until the list is used.
-    This means that the @ref memory_resource used to
-    construct a container can be specified after the
-    point where the initializer list is specified.
+    A `value_ref` uses reference semantics. Creation of the actual container
+    from the initializer list is lazily deferred until the list is used. This
+    means that the `boost::container::pmr::memory_resource` used to construct a
+    container can be specified after the point where the initializer list is
+    specified.
 
     @par Example
 
@@ -171,6 +170,10 @@ class value_ref
         value_ref const&) = default;
 
     /// Constructor
+    value_ref(
+        value_ref&&) = default;
+
+    /// Constructor
 #ifdef BOOST_JSON_DOCS
     value_ref(string_view s) noexcept;
 #else
diff --git a/inst/include/boost/json/value_stack.hpp b/inst/include/boost/json/value_stack.hpp
index cdf95393d..41c882381 100644
--- a/inst/include/boost/json/value_stack.hpp
+++ b/inst/include/boost/json/value_stack.hpp
@@ -23,33 +23,27 @@ namespace json {
 
 /** A stack of @ref value elements, for building a document.
 
-    This stack of @ref value allows iterative
-    construction of a JSON document in memory.
-    The implementation uses temporary internal
-    storage to buffer elements so that arrays, objects,
-    and strings in the document are constructed using a
-    single memory allocation. This improves performance
-    and makes efficient use of the @ref memory_resource
+    This stack of @ref value allows iterative construction of a JSON document
+    in memory. The implementation uses temporary internal storage to buffer
+    elements so that arrays, objects, and strings in the document are
+    constructed using a single memory allocation. This improves performance
+    and makes efficient use of the `boost::container::pmr::memory_resource`
     used to create the resulting @ref value.
 
-    Temporary storage used by the implementation
-    initially comes from an optional memory buffer
-    owned by the caller. If that storage is exhausted,
+    Temporary storage used by the implementation initially comes from an
+    optional memory buffer owned by the caller. If that storage is exhausted,
     then memory is obtained dynamically from the
-    @ref memory_resource provided on construction.
+    `boost::container::pmr::memory_resource` provided on construction.
 
     @par Usage
 
-    Construct the stack with an optional initial
-    temporary buffer, and a @ref storage_ptr to use for
-    more storage when the initial buffer is exhausted.
-    Then to build a @ref value, first call @ref reset
-    and optionally specify the @ref memory_resource
-    which will be used for the value. Then push elements
-    onto the stack by calling the corresponding functions.
-    After the document has been fully created, call
-    @ref release to acquire ownership of the top-level
-    @ref value.
+    Construct the stack with an optional initial temporary buffer, and a
+    @ref storage_ptr to use for more storage when the initial buffer is
+    exhausted. Then to build a @ref value, first call @ref reset and
+    optionally specify the `boost::container::pmr::memory_resource` which will
+    be used for the value. Then push elements onto the stack by calling the
+    corresponding functions. After the document has been fully created, call
+    @ref release to acquire ownership of the top-level @ref value.
 
     @par Performance
 
@@ -190,10 +184,9 @@ class value_stack
         intermediate storage; it will not be used
         for the @ref value returned by @ref release.
 
-        @param sp A pointer to the @ref memory_resource
-        to use for intermediate storage allocations. If
-        this argument is omitted, the default memory
-        resource is used.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use for intermediate storage allocations. If this argument is omitted,
+        the default memory resource is used.
 
         @param temp_buffer A pointer to a caller-owned
         buffer which will be used to store temporary
@@ -222,12 +215,10 @@ class value_stack
 
         No-throw guarantee.
 
-        @param sp A pointer to the @ref memory_resource
-        to use for top-level @ref value and all child
-        values. The stack will acquire shared ownership
-        of the memory resource until @ref release or
-        @ref reset is called, or when the stack is
-        destroyed.
+        @param sp A pointer to the `boost::container::pmr::memory_resource` to
+        use for top-level @ref value and all child values. The stack will
+        acquire shared ownership of the memory resource until @ref release or
+        @ref reset is called, or when the stack is destroyed.
     */
     BOOST_JSON_DECL
     void
diff --git a/inst/include/boost/json/value_to.hpp b/inst/include/boost/json/value_to.hpp
index 8787193d3..0006a7dbb 100644
--- a/inst/include/boost/json/value_to.hpp
+++ b/inst/include/boost/json/value_to.hpp
@@ -148,7 +148,7 @@ value_to(const value& jv)
     return value_to<T>( jv, detail::no_context() );
 }
 
-/** Convert a @ref value to a @ref result of `T`.
+/** Convert a @ref value to a `boost::system::result<T>`.
 
     This function attempts to convert a @ref value
     to `result<T>` using
@@ -231,7 +231,7 @@ try_value_to( value const& jv, Context const& ctx )
         cat(), try_value_to_tag<bare_T>(), jv, ctx );
 }
 
-/** Convert a @ref value to a @ref result of `T`.
+/** Convert a @ref value to a `boost::system::result<T>`.
 
     This function attempts to convert a @ref value
     to `result<T>` using
diff --git a/inst/include/boost/json/visit.hpp b/inst/include/boost/json/visit.hpp
index 5e2e2e8cd..7f614d660 100644
--- a/inst/include/boost/json/visit.hpp
+++ b/inst/include/boost/json/visit.hpp
@@ -20,27 +20,102 @@ namespace json {
 
 /** Invoke a function object with the contents of a @ref value
 
+    Invokes `v` as if by `std::forward<Visitor>(v)( X )`, where `X` is
+
+    @li `jv.get_array()` if `jv.is_array()`, or
+
+    @li `jv.get_object()` if `jv.is_object()`, or
+
+    @li `jv.get_string()` if `jv.is_string()`, or
+
+    @li `jv.get_int64()` if `jv.is_int64()`, or
+
+    @li `jv.get_uint64()` if `jv.is_uint64()`, or
+
+    @li `jv.get_double()` if `jv.is_double()`, or
+
+    @li `jv.get_bool()` if `jv.is_bool()`, or
+
+    @li reference to an object of type `std::nullptr_t` if `jv.is_null()`.
+
     @return The value returned by Visitor.
 
     @param v The visitation function to invoke
 
     @param jv The value to visit.
 */
-/** @{ */
 template<class Visitor>
 auto
 visit(
     Visitor&& v,
     value& jv) -> decltype(
-        std::declval<Visitor>()(nullptr));
+        static_cast<Visitor&&>(v)( std::declval<std::nullptr_t&>() ) );
+
+/** Invoke a function object with the contents of a @ref value
+
+    Invokes `v` as if by `std::forward<Visitor>(v)( X )`, where `X` is
+
+    @li `jv.get_array()` if `jv.is_array()`, or
+
+    @li `jv.get_object()` if `jv.is_object()`, or
+
+    @li `jv.get_string()` if `jv.is_string()`, or
+
+    @li `jv.get_int64()` if `jv.is_int64()`, or
+
+    @li `jv.get_uint64()` if `jv.is_uint64()`, or
+
+    @li `jv.get_double()` if `jv.is_double()`, or
+
+    @li `jv.get_bool()` if `jv.is_bool()`, or
+
+    @li reference to an object of type `const std::nullptr_t` if `jv.is_null()`.
+
+    @return The value returned by Visitor.
+
+    @param v The visitation function to invoke
 
+    @param jv The value to visit.
+*/
 template<class Visitor>
 auto
 visit(
     Visitor &&v,
     value const &jv) -> decltype(
-        std::declval<Visitor>()(nullptr));
-/** @} */
+        static_cast<Visitor&&>(v)( std::declval<std::nullptr_t const&>() ) );
+
+/** Invoke a function object with the contents of a @ref value
+
+    Invokes `v` as if by `std::forward<Visitor>(v)( X )`, where `X` is
+
+    @li `std::move( jv.get_array() )` if `jv.is_array()`, or
+
+    @li `std::move( jv.get_object() )` if `jv.is_object()`, or
+
+    @li `std::move( jv.get_string() )` if `jv.is_string()`, or
+
+    @li `std::move( jv.get_int64() )` if `jv.is_int64()`, or
+
+    @li `std::move( jv.get_uint64() )` if `jv.is_uint64()`, or
+
+    @li `std::move( jv.get_double() )` if `jv.is_double()`, or
+
+    @li `std::move( jv.get_bool() )` if `jv.is_bool()`, or
+
+    @li `std::nullptr_t()` if `jv.is_null()`.
+
+    @return The value returned by Visitor.
+
+    @param v The visitation function to invoke
+
+    @param jv The value to visit.
+*/
+template<class Visitor>
+auto
+visit(
+    Visitor &&v,
+    value&& jv) -> decltype(
+        static_cast<Visitor&&>(v)( std::declval<std::nullptr_t&&>() ) );
 
 } // namespace json
 } // namespace boost
diff --git a/inst/include/boost/lambda2/lambda2.hpp b/inst/include/boost/lambda2/lambda2.hpp
index 88818e389..a65cf57b6 100644
--- a/inst/include/boost/lambda2/lambda2.hpp
+++ b/inst/include/boost/lambda2/lambda2.hpp
@@ -14,7 +14,7 @@
 
 // Same format as BOOST_VERSION:
 //   major * 100000 + minor * 100 + patch
-#define BOOST_LAMBDA2_VERSION 108400
+#define BOOST_LAMBDA2_VERSION 108700
 
 namespace boost
 {
diff --git a/inst/include/boost/lexical_cast.hpp b/inst/include/boost/lexical_cast.hpp
index d0b4d7298..1984e81f3 100644
--- a/inst/include/boost/lexical_cast.hpp
+++ b/inst/include/boost/lexical_cast.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/lexical_cast/bad_lexical_cast.hpp b/inst/include/boost/lexical_cast/bad_lexical_cast.hpp
index d70f54bc4..10d1b5251 100644
--- a/inst/include/boost/lexical_cast/bad_lexical_cast.hpp
+++ b/inst/include/boost/lexical_cast/bad_lexical_cast.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/lexical_cast/detail/buffer_view.hpp b/inst/include/boost/lexical_cast/detail/buffer_view.hpp
index 888dd7e0e..9b1c68271 100644
--- a/inst/include/boost/lexical_cast/detail/buffer_view.hpp
+++ b/inst/include/boost/lexical_cast/detail/buffer_view.hpp
@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/lexical_cast/detail/converter_lexical.hpp b/inst/include/boost/lexical_cast/detail/converter_lexical.hpp
index fdc8f1fc5..cd9f76f54 100644
--- a/inst/include/boost/lexical_cast/detail/converter_lexical.hpp
+++ b/inst/include/boost/lexical_cast/detail/converter_lexical.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -35,8 +35,6 @@
 #include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_float.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_right_shift.hpp>
 #include <boost/detail/lcast_precision.hpp>
 
 #include <boost/lexical_cast/detail/widest_char.hpp>
@@ -44,6 +42,10 @@
 
 #include <array>
 
+#ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
+#include <string_view>
+#endif
+
 #include <boost/lexical_cast/detail/buffer_view.hpp>
 #include <boost/container/container_fwd.hpp>
 
@@ -57,6 +59,9 @@ namespace boost {
     template<class IteratorT>
     class iterator_range;
 
+    // Forward declaration of boost::basic_string_view from Utility
+    template<class Ch, class Tr> class basic_string_view;
+
     namespace detail // normalize_single_byte_char<Char>
     {
         // Converts signed/unsigned char to char
@@ -174,6 +179,19 @@ namespace boost {
         > {};
 #endif
 
+#ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
+        template < class Char, class Traits >
+        struct stream_char_common< std::basic_string_view< Char, Traits > >
+        {
+            typedef Char type;
+        };
+#endif
+        template < class Char, class Traits >
+        struct stream_char_common< boost::basic_string_view< Char, Traits > >
+        {
+            typedef Char type;
+        };
+
 #ifdef BOOST_HAS_INT128
         template <> struct stream_char_common< boost::int128_type >: public boost::type_identity< char > {};
         template <> struct stream_char_common< boost::uint128_type >: public boost::type_identity< char > {};
@@ -191,7 +209,7 @@ namespace boost {
     namespace detail // deduce_source_char_impl<T>
     {
         // If type T is `deduce_character_type_later` type, then tries to deduce
-        // character type using boost::has_left_shift<T> metafunction.
+        // character type using streaming metafunctions.
         // Otherwise supplied type T is a character type, that must be normalized
         // using normalize_single_byte_char<Char>.
         // Executed at Stage 2  (See deduce_source_char<T> and deduce_target_char<T>)
@@ -204,20 +222,29 @@ namespace boost {
         template < class T >
         struct deduce_source_char_impl< deduce_character_type_later< T > >
         {
-            typedef boost::has_left_shift< std::basic_ostream< char >, T > result_t;
+            template <class U>
+            static auto left_shift_type(long)
+                -> decltype( std::declval<std::basic_ostream< char >&>() << std::declval<const U&>(), char{});
+
+#if !defined(BOOST_LCAST_NO_WCHAR_T)
+            template <class U>
+            static auto left_shift_type(int)
+                -> decltype( std::declval<std::basic_ostream< wchar_t >&>() << std::declval<const U&>(), wchar_t{});
+#endif
 
+            template <class U>
+            static void left_shift_type(...);
+
+            using type = decltype(left_shift_type<T>(1L));
+
+            static_assert(!std::is_same<type, void>::value,
 #if defined(BOOST_LCAST_NO_WCHAR_T)
-            static_assert(result_t::value,
-                "Source type is not std::ostream`able and std::wostream`s are not supported by your STL implementation");
-            typedef char type;
+                "Source type is not std::ostream`able and std::wostream`s are "
+                "not supported by your STL implementation"
 #else
-            typedef typename boost::conditional<
-                result_t::value, char, wchar_t
-            >::type type;
-
-            static_assert(result_t::value || boost::has_left_shift< std::basic_ostream< type >, T >::value,
-                "Source type is neither std::ostream`able nor std::wostream`able");
+                "Source type is neither std::ostream`able nor std::wostream`able"
 #endif
+            );
         };
     }
 
@@ -237,20 +264,29 @@ namespace boost {
         template < class T >
         struct deduce_target_char_impl< deduce_character_type_later<T> >
         {
-            typedef boost::has_right_shift<std::basic_istream<char>, T > result_t;
+            template <class U>
+            static auto right_shift_type(long)
+                -> decltype( std::declval<std::basic_istream< char >&>() >> std::declval<U&>(), char{});
+
+#if !defined(BOOST_LCAST_NO_WCHAR_T)
+            template <class U>
+            static auto right_shift_type(int)
+                -> decltype( std::declval<std::basic_istream< wchar_t >&>() >> std::declval<U&>(), wchar_t{});
+#endif
 
+            template <class U>
+            static void right_shift_type(...);
+
+            using type = decltype(right_shift_type<T>(1L));
+
+            static_assert(!std::is_same<type, void>::value,
 #if defined(BOOST_LCAST_NO_WCHAR_T)
-            static_assert(result_t::value,
-                "Target type is not std::istream`able and std::wistream`s are not supported by your STL implementation");
-            typedef char type;
+               "Target type is not std::istream`able and std::wistream`s are "
+               "not supported by your STL implementation"
 #else
-            typedef typename boost::conditional<
-                result_t::value, char, wchar_t
-            >::type type;
-
-            static_assert(result_t::value || boost::has_right_shift<std::basic_istream<wchar_t>, T >::value,
-                "Target type is neither std::istream`able nor std::wistream`able");
+               "Target type is neither std::istream`able nor std::wistream`able"
 #endif
+            );
         };
     }
 
@@ -275,44 +311,14 @@ namespace boost {
         struct deduce_target_char
         {
             typedef typename stream_char_common< T >::type stage1_type;
-            typedef typename deduce_target_char_impl< stage1_type >::type stage2_type;
-
-            typedef stage2_type type;
+            typedef typename deduce_target_char_impl< stage1_type >::type type;
         };
 
         template < class T >
         struct deduce_source_char
         {
             typedef typename stream_char_common< T >::type stage1_type;
-            typedef typename deduce_source_char_impl< stage1_type >::type stage2_type;
-
-            typedef stage2_type type;
-        };
-    }
-
-    namespace detail // extract_char_traits template
-    {
-        // We are attempting to get char_traits<> from T
-        // template parameter. Otherwise we'll be using std::char_traits<Char>
-        template < class Char, class T >
-        struct extract_char_traits
-                : boost::false_type
-        {
-            typedef std::char_traits< Char > trait_t;
-        };
-
-        template < class Char, class Traits, class Alloc >
-        struct extract_char_traits< Char, std::basic_string< Char, Traits, Alloc > >
-            : boost::true_type
-        {
-            typedef Traits trait_t;
-        };
-
-        template < class Char, class Traits, class Alloc>
-        struct extract_char_traits< Char, boost::container::basic_string< Char, Traits, Alloc > >
-            : boost::true_type
-        {
-            typedef Traits trait_t;
+            typedef typename deduce_source_char_impl< stage1_type >::type type;
         };
     }
 
@@ -360,16 +366,11 @@ namespace boost {
                     Source, typename boost::enable_if<boost::is_integral<Source> >::type
                 >
         {
-#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
             BOOST_STATIC_CONSTANT(std::size_t, value =
                   std::numeric_limits<Source>::is_signed +
                   std::numeric_limits<Source>::is_specialized + /* == 1 */
                   std::numeric_limits<Source>::digits10 * 2
               );
-#else
-            BOOST_STATIC_CONSTANT(std::size_t, value = 156);
-            static_assert(sizeof(Source) * CHAR_BIT <= 256, "");
-#endif
         };
 
         // Helper for floating point types.
@@ -387,8 +388,6 @@ namespace boost {
                 Source, typename boost::enable_if<boost::is_float<Source> >::type
             >
         {
-
-#ifndef BOOST_LCAST_NO_COMPILE_TIME_PRECISION
             static_assert(
                     std::numeric_limits<Source>::max_exponent10 <=  999999L &&
                     std::numeric_limits<Source>::min_exponent10 >= -999999L
@@ -397,9 +396,6 @@ namespace boost {
             BOOST_STATIC_CONSTANT(std::size_t, value =
                     5 + lcast_precision<Source>::value + 6
                 );
-#else // #ifndef BOOST_LCAST_NO_COMPILE_TIME_PRECISION
-            BOOST_STATIC_CONSTANT(std::size_t, value = 156);
-#endif // #ifndef BOOST_LCAST_NO_COMPILE_TIME_PRECISION
         };
     }
 
@@ -429,33 +425,7 @@ namespace boost {
                 "Your compiler does not have full support for char32_t" );
 #endif
 
-            typedef typename boost::conditional<
-                boost::detail::extract_char_traits<char_type, Target>::value,
-                typename boost::detail::extract_char_traits<char_type, Target>,
-                typename boost::detail::extract_char_traits<char_type, no_cv_src>
-            >::type::trait_t traits;
-
-            typedef boost::integral_constant<
-              bool,
-              boost::is_same<char, src_char_t>::value &&                                 // source is not a wide character based type
-                (sizeof(char) != sizeof(target_char_t)) &&  // target type is based on wide character
-                (!(boost::detail::is_character<no_cv_src>::value))
-                > is_string_widening_required_t;
-
-            typedef boost::integral_constant<
-              bool,
-                !(boost::is_integral<no_cv_src>::value ||
-                  boost::detail::is_character<
-                    typename deduce_src_char_metafunc::stage1_type          // if we did not get character type at stage1
-                  >::value                                                           // then we have no optimization for that type
-                 )
-                > is_source_input_not_optimized_t;
-
-            // If we have an optimized conversion for
-            // Source, we do not need to construct stringbuf.
-            BOOST_STATIC_CONSTANT(bool, requires_stringbuf =
-                (is_string_widening_required_t::value || is_source_input_not_optimized_t::value)
-            );
+            typedef std::char_traits<char_type> traits;
 
             typedef boost::detail::lcast_src_length<no_cv_src> len_t;
         };
@@ -468,29 +438,33 @@ namespace boost {
         {
             typedef lexical_cast_stream_traits<Source, Target>  stream_trait;
 
-            typedef detail::lexical_istream_limited_src<
+            typedef detail::lcast::optimized_src_stream<
                 typename stream_trait::char_type,
                 typename stream_trait::traits,
-                stream_trait::requires_stringbuf,
                 stream_trait::len_t::value + 1
-            > i_interpreter_type;
+            > optimized_src_stream;
+            
+            template <class T>
+            static auto detect_type(int)
+                -> decltype(std::declval<optimized_src_stream&>().stream_in(std::declval<lcast::exact<T>>()), optimized_src_stream{});
+
+            template <class T>
+            static lcast::ios_src_stream<typename stream_trait::char_type, typename stream_trait::traits> detect_type(...);
+
+            using from_src_stream = decltype(detect_type<Source>(1));
 
-            typedef detail::lexical_ostream_limited_src<
+            typedef detail::lcast::to_target_stream<
                 typename stream_trait::char_type,
                 typename stream_trait::traits
-            > o_interpreter_type;
+            > to_target_stream;
 
             static inline bool try_convert(const Source& arg, Target& result) {
-                i_interpreter_type i_interpreter;
-
-                // Disabling ADL, by directly specifying operators.
-                if (!(i_interpreter.operator <<(arg)))
+                from_src_stream src_stream;
+                if (!src_stream.stream_in(lcast::exact<Source>{arg}))
                     return false;
 
-                o_interpreter_type out(i_interpreter.cbegin(), i_interpreter.cend());
-
-                // Disabling ADL, by directly specifying operators.
-                if(!(out.operator >>(result)))
+                to_target_stream out(src_stream.cbegin(), src_stream.cend());
+                if (!out.stream_out(result))
                     return false;
 
                 return true;
diff --git a/inst/include/boost/lexical_cast/detail/converter_lexical_streams.hpp b/inst/include/boost/lexical_cast/detail/converter_lexical_streams.hpp
index ad778efaa..4e35a7270 100644
--- a/inst/include/boost/lexical_cast/detail/converter_lexical_streams.hpp
+++ b/inst/include/boost/lexical_cast/detail/converter_lexical_streams.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -34,9 +34,12 @@
 #include <cstdio>
 #include <boost/limits.hpp>
 #include <boost/type_traits/conditional.hpp>
+#include <boost/type_traits/is_enum.hpp>
+#include <boost/type_traits/is_signed.hpp>
+#include <boost/type_traits/is_unsigned.hpp>
 #include <boost/type_traits/is_pointer.hpp>
 #include <boost/detail/lcast_precision.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/core/snprintf.hpp>
 
 #ifndef BOOST_NO_STD_LOCALE
@@ -58,8 +61,10 @@
 #include <sstream>
 #endif
 
+#include <boost/lexical_cast/detail/buffer_view.hpp>
 #include <boost/lexical_cast/detail/lcast_char_constants.hpp>
 #include <boost/lexical_cast/detail/lcast_unsigned_converters.hpp>
+#include <boost/lexical_cast/detail/lcast_basic_unlockedbuf.hpp>
 #include <boost/lexical_cast/detail/inf_nan.hpp>
 
 #include <istream>
@@ -69,695 +74,683 @@
 #include <boost/type_traits/make_unsigned.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_float.hpp>
-#include <boost/lexical_cast/detail/buffer_view.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/is_reference.hpp>
 #include <boost/container/container_fwd.hpp>
-#include <boost/integer.hpp>
-#include <boost/detail/basic_pointerbuf.hpp>
-#include <boost/core/noncopyable.hpp>
 #include <boost/core/enable_if.hpp>
 #ifndef BOOST_NO_CWCHAR
 #   include <cwchar>
 #endif
 
+// Forward declarations
 namespace boost {
-
-    // Forward declaration
     template<class T, std::size_t N>
     class array;
     template<class IteratorT>
     class iterator_range;
 
-    namespace detail // basic_unlockedbuf
-    {
-        // acts as a stream buffer which wraps around a pair of pointers
-        // and gives acces to internals
-        template <class BufferType, class CharT>
-        class basic_unlockedbuf : public basic_pointerbuf<CharT, BufferType> {
-        public:
-           typedef basic_pointerbuf<CharT, BufferType> base_type;
-           typedef typename base_type::streamsize streamsize;
-
-#ifndef BOOST_NO_USING_TEMPLATE
-            using base_type::pptr;
-            using base_type::pbase;
-            using base_type::setbuf;
-#else
-            charT* pptr() const { return base_type::pptr(); }
-            charT* pbase() const { return base_type::pbase(); }
-            BufferType* setbuf(char_type* s, streamsize n) { return base_type::setbuf(s, n); }
-#endif
-        };
-    }
-
-    namespace detail
-    {
-        struct do_not_construct_out_buffer_t{};
-        struct do_not_construct_out_stream_t{
-            do_not_construct_out_stream_t(do_not_construct_out_buffer_t*){}
-        };
-
-        template <class CharT, class Traits>
-        struct out_stream_helper_trait {
-#if defined(BOOST_NO_STRINGSTREAM)
-            typedef std::ostream                                                    out_stream_t;
-            typedef basic_unlockedbuf<std::strstreambuf, char>                      stringbuffer_t;
-#elif defined(BOOST_NO_STD_LOCALE)
-            typedef std::ostream                                                    out_stream_t;
-            typedef basic_unlockedbuf<std::stringbuf, char>                         stringbuffer_t;
-            typedef basic_unlockedbuf<std::streambuf, char>                         buffer_t;
-#else
-            typedef std::basic_ostream<CharT, Traits>                               out_stream_t;
-            typedef basic_unlockedbuf<std::basic_stringbuf<CharT, Traits>, CharT>   stringbuffer_t;
-            typedef basic_unlockedbuf<std::basic_streambuf<CharT, Traits>, CharT>   buffer_t;
-#endif
-        };
-    }
-
-    namespace detail // optimized stream wrappers
-    {
-        template< class CharT // a result of widest_char transformation
-                , class Traits
-                , bool RequiresStringbuffer
-                , std::size_t CharacterBufferSize
-                >
-        class lexical_istream_limited_src: boost::noncopyable {
-            typedef typename boost::conditional<
-                RequiresStringbuffer,
-                typename out_stream_helper_trait<CharT, Traits>::out_stream_t,
-                do_not_construct_out_stream_t
-            >::type deduced_out_stream_t;
-
-            typedef typename boost::conditional<
-                RequiresStringbuffer,
-                typename out_stream_helper_trait<CharT, Traits>::stringbuffer_t,
-                do_not_construct_out_buffer_t
-            >::type deduced_out_buffer_t;
-
-            deduced_out_buffer_t out_buffer;
-            deduced_out_stream_t out_stream;
-            CharT   buffer[CharacterBufferSize];
-
-            // After the `operator <<`  finishes, `[start, finish)` is
-            // the range to output by `operator >>`
-            const CharT*  start;
-            const CharT*  finish;
-
-        public:
-            lexical_istream_limited_src() noexcept
-              : out_buffer()
-              , out_stream(&out_buffer)
-              , start(buffer)
-              , finish(buffer + CharacterBufferSize)
-            {}
-
-            const CharT* cbegin() const noexcept {
-                return start;
-            }
-
-            const CharT* cend() const noexcept {
-                return finish;
-            }
-
-        private:
-/************************************ HELPER FUNCTIONS FOR OPERATORS << ( ... ) ********************************/
-            bool shl_char(CharT ch) noexcept {
-                Traits::assign(buffer[0], ch);
-                finish = start + 1;
-                return true;
-            }
+    // forward declaration of boost::basic_string_view from Utility
+    template<class Ch, class Tr> class basic_string_view;
+}
+
+namespace boost { namespace detail { namespace lcast {
+
+    template <typename T>
+    struct exact {
+        static_assert(!boost::is_const<T>::value, "");
+        static_assert(!boost::is_reference<T>::value, "");
+
+        const T& payload;
+    };
+
+    template< class CharT // a result of widest_char transformation
+            , class Traits
+            , std::size_t CharacterBufferSize
+            >
+    class optimized_src_stream {
+        CharT buffer[CharacterBufferSize];
+
+        // After the `stream_in(`  finishes, `[start, finish)` is
+        // the range to output by `operator >>`
+        const CharT*  start;
+        const CharT*  finish;
+    public:
+        optimized_src_stream(optimized_src_stream&&) = delete;
+        optimized_src_stream(const optimized_src_stream&) = delete;
+        optimized_src_stream& operator=(optimized_src_stream&&) = delete;
+        optimized_src_stream& operator=(const optimized_src_stream&) = delete;
+
+        optimized_src_stream() noexcept
+          : start(buffer)
+          , finish(buffer + CharacterBufferSize)
+        {}
+
+        const CharT* cbegin() const noexcept {
+            return start;
+        }
+
+        const CharT* cend() const noexcept {
+            return finish;
+        }
+
+    private:
+        bool shl_char(CharT ch) noexcept {
+            Traits::assign(buffer[0], ch);
+            finish = start + 1;
+            return true;
+        }
 
 #ifndef BOOST_LCAST_NO_WCHAR_T
-            template <class T>
-            bool shl_char(T ch) {
-                static_assert(sizeof(T) <= sizeof(CharT),
-                    "boost::lexical_cast does not support narrowing of char types."
-                    "Use boost::locale instead" );
+        template <class T>
+        bool shl_char(T ch) {
+            static_assert(sizeof(T) <= sizeof(CharT),
+                "boost::lexical_cast does not support narrowing of char types."
+                "Use boost::locale instead" );
 #ifndef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
-                std::locale loc;
-                CharT const w = BOOST_USE_FACET(std::ctype<CharT>, loc).widen(ch);
+            std::locale loc;
+            CharT const w = BOOST_USE_FACET(std::ctype<CharT>, loc).widen(ch);
 #else
-                CharT const w = static_cast<CharT>(ch);
+            CharT const w = static_cast<CharT>(ch);
 #endif
-                Traits::assign(buffer[0], w);
-                finish = start + 1;
-                return true;
-            }
+            Traits::assign(buffer[0], w);
+            finish = start + 1;
+            return true;
+        }
 #endif
 
-            bool shl_char_array(CharT const* str_value) noexcept {
-                start = str_value;
-                finish = start + Traits::length(str_value);
-                return true;
-            }
+        bool shl_char_array(CharT const* str_value) noexcept {
+            start = str_value;
+            finish = start + Traits::length(str_value);
+            return true;
+        }
+
+        bool shl_char_array_limited(CharT const* str, std::size_t max_size) noexcept {
+            start = str;
+            finish = start;
+            const auto zero = Traits::to_char_type(0);
+            while (finish < start + max_size && zero != *finish) {
+                 ++ finish;
+            }
+            return true;
+        }
+
+        template <class T>
+        inline bool shl_unsigned(const T n) {
+            CharT* tmp_finish = buffer + CharacterBufferSize;
+            start = lcast_put_unsigned<Traits, T, CharT>(n, tmp_finish).convert();
+            finish = tmp_finish;
+            return true;
+        }
+
+        template <class T>
+        inline bool shl_signed(const T n) {
+            CharT* tmp_finish = buffer + CharacterBufferSize;
+            typedef typename boost::make_unsigned<T>::type utype;
+            CharT* tmp_start = lcast_put_unsigned<Traits, utype, CharT>(lcast_to_unsigned(n), tmp_finish).convert();
+            if (n < 0) {
+                --tmp_start;
+                CharT const minus = lcast_char_constants<CharT>::minus;
+                Traits::assign(*tmp_start, minus);
+            }
+            start = tmp_start;
+            finish = tmp_finish;
+            return true;
+        }
+
+        bool shl_real_type(float val, char* begin) {
+            const double val_as_double = val;
+            finish = start +
+                boost::core::snprintf(begin, CharacterBufferSize,
+                "%.*g", static_cast<int>(boost::detail::lcast_precision<float>::value), val_as_double);
+            return finish > start;
+        }
+
+        bool shl_real_type(double val, char* begin) {
+            finish = start +
+                boost::core::snprintf(begin, CharacterBufferSize,
+                "%.*g", static_cast<int>(boost::detail::lcast_precision<double>::value), val);
+            return finish > start;
+        }
 
-            template <class T>
-            bool shl_char_array(T const* str_value) {
-                static_assert(sizeof(T) <= sizeof(CharT),
-                    "boost::lexical_cast does not support narrowing of char types."
-                    "Use boost::locale instead" );
-                return shl_input_streamable(str_value);
-            }
+#ifndef __MINGW32__
+        bool shl_real_type(long double val, char* begin) {
+            finish = start +
+                boost::core::snprintf(begin, CharacterBufferSize,
+                "%.*Lg", static_cast<int>(boost::detail::lcast_precision<long double>::value), val );
+            return finish > start;
+        }
+#else
+        bool shl_real_type(long double val, char* begin) {
+            return shl_real_type(static_cast<double>(val), begin);
+        }
+#endif
 
-            bool shl_char_array_limited(CharT const* str, std::size_t max_size) noexcept {
-                start = str;
-                finish = start;
-                const auto zero = Traits::to_char_type(0);
-                while (finish < start + max_size && zero != *finish) {
-                     ++ finish;
-                }
+#if !defined(BOOST_LCAST_NO_WCHAR_T)
+        bool shl_real_type(float val, wchar_t* begin) {
+            const double val_as_double = val;
+            finish = start + boost::core::swprintf(
+                begin, CharacterBufferSize, L"%.*g",
+                static_cast<int>(boost::detail::lcast_precision<float>::value),
+                val_as_double
+            );
+            return finish > start;
+        }
+
+        bool shl_real_type(double val, wchar_t* begin) {
+            finish = start + boost::core::swprintf(
+              begin, CharacterBufferSize, L"%.*g",
+              static_cast<int>(boost::detail::lcast_precision<double>::value),
+              val
+            );
+            return finish > start;
+        }
+
+        bool shl_real_type(long double val, wchar_t* begin) {
+            finish = start + boost::core::swprintf(
+                begin, CharacterBufferSize, L"%.*Lg",
+                static_cast<int>(boost::detail::lcast_precision<long double>::value),
+                val
+            );
+            return finish > start;
+        }
+#endif
+    public:
+        template <class C>
+        using enable_if_compatible_char_t = typename boost::enable_if_c<
+            boost::is_same<const C, const CharT>::value || (
+                boost::is_same<const char, const CharT>::value && (
+                    boost::is_same<const C, const unsigned char>::value ||
+                    boost::is_same<const C, const signed char>::value
+                )
+            ), bool
+        >::type;
+
+        template<class CharTraits, class Alloc>
+        bool stream_in(lcast::exact<std::basic_string<CharT,CharTraits,Alloc>> x) noexcept {
+            start = x.payload.data();
+            finish = start + x.payload.length();
+            return true;
+        }
+
+        template<class CharTraits, class Alloc>
+        bool stream_in(lcast::exact<boost::container::basic_string<CharT,CharTraits,Alloc>> x) noexcept {
+            start = x.payload.data();
+            finish = start + x.payload.length();
+            return true;
+        }
+
+        bool stream_in(lcast::exact<bool> x) noexcept {
+            CharT const czero = lcast_char_constants<CharT>::zero;
+            Traits::assign(buffer[0], Traits::to_char_type(czero + x.payload));
+            finish = start + 1;
+            return true;
+        }
+
+        bool stream_in(lcast::exact<boost::conversion::detail::buffer_view<CharT>> x) noexcept {
+            start = x.payload.begin;
+            finish = x.payload.end;
+            return true;
+        }
+
+        template <class C>
+        enable_if_compatible_char_t<C>
+        stream_in(lcast::exact<boost::iterator_range<C*>> x) noexcept {
+            auto buf = boost::conversion::detail::make_buffer_view(x.payload.begin(), x.payload.end());
+            return stream_in(lcast::exact<decltype(buf)>{buf});
+        }
+
+        bool stream_in(lcast::exact<char> x)                    { return shl_char(x.payload); }
+        bool stream_in(lcast::exact<unsigned char> x)           { return shl_char(static_cast<char>(x.payload)); }
+        bool stream_in(lcast::exact<signed char> x)             { return shl_char(static_cast<char>(x.payload)); }
+        
+        template <class C>
+        typename boost::enable_if_c<boost::detail::is_character<C>::value, bool>::type
+                stream_in(lcast::exact<C> x)                    { return shl_char(x.payload); }
+
+        template <class Type>
+        enable_if_compatible_char_t<Type>
+                stream_in(lcast::exact<Type*> x)                { return shl_char_array(reinterpret_cast<CharT const*>(x.payload)); }
+
+        template <class Type>
+        typename boost::enable_if_c<boost::is_signed<Type>::value && !boost::is_enum<Type>::value, bool>::type
+                stream_in(lcast::exact<Type> x)                  { return shl_signed(x.payload); }
+
+        template <class Type>
+        typename boost::enable_if_c<boost::is_unsigned<Type>::value && !boost::is_enum<Type>::value, bool>::type
+                stream_in(lcast::exact<Type> x)                  { return shl_unsigned(x.payload); }
+
+        template <class Type>
+        auto stream_in(lcast::exact<Type> x) -> decltype(shl_real_type(x.payload, buffer)) {
+            const CharT* inf_nan  = detail::get_inf_nan(x.payload, CharT());
+            if (inf_nan) {
+                start = inf_nan;
+                finish = start + Traits::length(inf_nan);
                 return true;
             }
-
-            template<typename InputStreamable>
-            bool shl_input_streamable(InputStreamable& input) {
+            return shl_real_type(x.payload, buffer);
+        }
+
+        template <class C, std::size_t N>
+        enable_if_compatible_char_t<C>
+        stream_in(lcast::exact<boost::array<C, N>> x) noexcept {
+            return shl_char_array_limited(reinterpret_cast<const CharT*>(x.payload.data()), N);
+        }
+
+        template <class C, std::size_t N>
+        enable_if_compatible_char_t<C>
+        stream_in(lcast::exact<std::array<C, N>> x) noexcept {
+            return shl_char_array_limited(reinterpret_cast<const CharT*>(x.payload.data()), N);
+        }
+
+#ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
+        template <class C, class CharTraits>
+        enable_if_compatible_char_t<C>
+        stream_in(lcast::exact<std::basic_string_view<C, CharTraits>> x) noexcept {
+            start = reinterpret_cast<const CharT*>(x.payload.data());
+            finish = start + x.payload.size();
+            return true;
+        }
+#endif
+        template <class C, class CharTraits>
+        enable_if_compatible_char_t<C>
+        stream_in(lcast::exact<boost::basic_string_view<C, CharTraits>> x) noexcept {
+            start = reinterpret_cast<const CharT*>(x.payload.data());
+            finish = start + x.payload.size();
+            return true;
+        }
+    };
+
+
+    template <class CharT, class Traits>
+    class ios_src_stream {
+        typedef detail::lcast::out_stream_t<CharT, Traits> deduced_out_stream_t;
+        typedef detail::lcast::stringbuffer_t<CharT, Traits> deduced_out_buffer_t;
+
+        deduced_out_buffer_t out_buffer;
+        deduced_out_stream_t out_stream;
+
+        const CharT*  start = nullptr;
+        const CharT*  finish = nullptr;
+    public:
+        ios_src_stream(ios_src_stream&&) = delete;
+        ios_src_stream(const ios_src_stream&) = delete;
+        ios_src_stream& operator=(ios_src_stream&&) = delete;
+        ios_src_stream& operator=(const ios_src_stream&) = delete;
+
+        ios_src_stream(): out_buffer(), out_stream(&out_buffer) {}
+
+        const CharT* cbegin() const noexcept {
+            return start;
+        }
+
+        const CharT* cend() const noexcept {
+            return finish;
+        }
+    private:
+        const deduced_out_buffer_t* get_rdbuf() const {
+            return static_cast<deduced_out_buffer_t*>(
+                out_stream.rdbuf()
+            );
+        }
+
+        template<typename InputStreamable>
+        bool shl_input_streamable(InputStreamable& input) {
 #if defined(BOOST_NO_STRINGSTREAM) || defined(BOOST_NO_STD_LOCALE)
-                // If you have compilation error at this point, than your STL library
-                // does not support such conversions. Try updating it.
-                static_assert(boost::is_same<char, CharT>::value, "");
+            // If you have compilation error at this point, than your STL library
+            // does not support such conversions. Try updating it.
+            static_assert(boost::is_same<char, CharT>::value, "");
 #endif
 
 #ifndef BOOST_NO_EXCEPTIONS
-                out_stream.exceptions(std::ios::badbit);
-                try {
+            out_stream.exceptions(std::ios::badbit);
+            try {
 #endif
-                bool const result = !(out_stream << input).fail();
-                const deduced_out_buffer_t* const p = static_cast<deduced_out_buffer_t*>(
-                    out_stream.rdbuf()
-                );
-                start = p->pbase();
-                finish = p->pptr();
-                return result;
+            bool const result = !(out_stream << input).fail();
+            const auto* const p = get_rdbuf();
+            start = p->pbase();
+            finish = p->pptr();
+            return result;
 #ifndef BOOST_NO_EXCEPTIONS
-                } catch (const ::std::ios_base::failure& /*f*/) {
-                    return false;
-                }
-#endif
-            }
-
-            template <class T>
-            inline bool shl_unsigned(const T n) {
-                CharT* tmp_finish = buffer + CharacterBufferSize;
-                start = lcast_put_unsigned<Traits, T, CharT>(n, tmp_finish).convert();
-                finish = tmp_finish;
-                return true;
-            }
-
-            template <class T>
-            inline bool shl_signed(const T n) {
-                CharT* tmp_finish = buffer + CharacterBufferSize;
-                typedef typename boost::make_unsigned<T>::type utype;
-                CharT* tmp_start = lcast_put_unsigned<Traits, utype, CharT>(lcast_to_unsigned(n), tmp_finish).convert();
-                if (n < 0) {
-                    --tmp_start;
-                    CharT const minus = lcast_char_constants<CharT>::minus;
-                    Traits::assign(*tmp_start, minus);
-                }
-                start = tmp_start;
-                finish = tmp_finish;
-                return true;
-            }
-
-            template <class T, class SomeCharT>
-            bool shl_real_type(const T& val, SomeCharT* /*begin*/) {
-                lcast_set_precision(out_stream, &val);
-                return shl_input_streamable(val);
-            }
-
-            bool shl_real_type(float val, char* begin) {
-                using namespace std;
-                const double val_as_double = val;
-                finish = start +
-                    boost::core::snprintf(begin, CharacterBufferSize,
-                    "%.*g", static_cast<int>(boost::detail::lcast_get_precision<float>()), val_as_double);
-                return finish > start;
-            }
-
-            bool shl_real_type(double val, char* begin) {
-                using namespace std;
-                finish = start +
-                    boost::core::snprintf(begin, CharacterBufferSize,
-                    "%.*g", static_cast<int>(boost::detail::lcast_get_precision<double>()), val);
-                return finish > start;
-            }
-
-#ifndef __MINGW32__
-            bool shl_real_type(long double val, char* begin) {
-                using namespace std;
-                finish = start +
-                    boost::core::snprintf(begin, CharacterBufferSize,
-                    "%.*Lg", static_cast<int>(boost::detail::lcast_get_precision<long double>()), val );
-                return finish > start;
+            } catch (const ::std::ios_base::failure& /*f*/) {
+                return false;
             }
 #endif
-
-
-#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_SWPRINTF) && !defined(__MINGW32__)
-            bool shl_real_type(float val, wchar_t* begin) {
-                using namespace std;
-                const double val_as_double = val;
-                finish = start + swprintf(begin, CharacterBufferSize,
-                                       L"%.*g",
-                                       static_cast<int>(boost::detail::lcast_get_precision<float >()),
-                                       val_as_double );
-                return finish > start;
-            }
-
-            bool shl_real_type(double val, wchar_t* begin) {
-                using namespace std;
-                finish = start + swprintf(begin, CharacterBufferSize,
-                                          L"%.*g", static_cast<int>(boost::detail::lcast_get_precision<double >()), val );
-                return finish > start;
-            }
-
-            bool shl_real_type(long double val, wchar_t* begin) {
-                using namespace std;
-                finish = start + swprintf(begin, CharacterBufferSize,
-                                          L"%.*Lg", static_cast<int>(boost::detail::lcast_get_precision<long double >()), val );
-                return finish > start;
-            }
-#endif
-            template <class T>
-            bool shl_real(T val) {
-                CharT* tmp_finish = buffer + CharacterBufferSize;
-                if (put_inf_nan(buffer, tmp_finish, val)) {
-                    finish = tmp_finish;
-                    return true;
-                }
-
-                return shl_real_type(val, static_cast<CharT*>(buffer));
-            }
-
-/************************************ OPERATORS << ( ... ) ********************************/
-        public:
-            template<class Alloc>
-            bool operator<<(std::basic_string<CharT,Traits,Alloc> const& str) noexcept {
-                start = str.data();
-                finish = start + str.length();
-                return true;
-            }
-
-            template<class Alloc>
-            bool operator<<(boost::container::basic_string<CharT,Traits,Alloc> const& str) noexcept {
-                start = str.data();
-                finish = start + str.length();
-                return true;
-            }
-
-            bool operator<<(bool value) noexcept {
-                CharT const czero = lcast_char_constants<CharT>::zero;
-                Traits::assign(buffer[0], Traits::to_char_type(czero + value));
-                finish = start + 1;
-                return true;
-            }
-
-            bool operator<<(boost::conversion::detail::buffer_view<CharT> rng) noexcept {
-                start = rng.begin;
-                finish = rng.end;
+        }
+
+        template <class T>
+        bool shl_char_array(T const* str_value) {
+            static_assert(sizeof(T) <= sizeof(CharT),
+                "boost::lexical_cast does not support narrowing of char types."
+                "Use boost::locale instead" );
+            return shl_input_streamable(str_value);
+        }
+
+        template <class T>
+        bool shl_real(T val) {
+            const CharT* inf_nan  = detail::get_inf_nan(val, CharT());
+            if (inf_nan) {
+                start = inf_nan;
+                finish = start + Traits::length(inf_nan);
                 return true;
             }
 
-            template <class C>
-            bool operator<<(const iterator_range<C*>& rng) noexcept {
-                return (*this) << boost::conversion::detail::make_buffer_view(rng.begin(), rng.end());
-            }
+            lcast_set_precision(out_stream, &val);
+            return shl_input_streamable(val);
+        }
 
-            bool operator<<(char ch)                    { return shl_char(ch); }
-            bool operator<<(unsigned char ch)           { return ((*this) << static_cast<char>(ch)); }
-            bool operator<<(signed char ch)             { return ((*this) << static_cast<char>(ch)); }
-#if !defined(BOOST_LCAST_NO_WCHAR_T)
-            bool operator<<(wchar_t const* str)         { return shl_char_array(str); }
-            bool operator<<(wchar_t * str)              { return shl_char_array(str); }
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
-            bool operator<<(wchar_t ch)                 { return shl_char(ch); }
-#endif
-#endif
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
-            bool operator<<(char16_t ch)                { return shl_char(ch); }
-            bool operator<<(char16_t * str)             { return shl_char_array(str); }
-            bool operator<<(char16_t const * str)       { return shl_char_array(str); }
-#endif
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
-            bool operator<<(char32_t ch)                { return shl_char(ch); }
-            bool operator<<(char32_t * str)             { return shl_char_array(str); }
-            bool operator<<(char32_t const * str)       { return shl_char_array(str); }
-#endif
-            bool operator<<(unsigned char const* ch)    { return ((*this) << reinterpret_cast<char const*>(ch)); }
-            bool operator<<(unsigned char * ch)         { return ((*this) << reinterpret_cast<char *>(ch)); }
-            bool operator<<(signed char const* ch)      { return ((*this) << reinterpret_cast<char const*>(ch)); }
-            bool operator<<(signed char * ch)           { return ((*this) << reinterpret_cast<char *>(ch)); }
-            bool operator<<(char const* str_value)      { return shl_char_array(str_value); }
-            bool operator<<(char* str_value)            { return shl_char_array(str_value); }
-            bool operator<<(short n)                    { return shl_signed(n); }
-            bool operator<<(int n)                      { return shl_signed(n); }
-            bool operator<<(long n)                     { return shl_signed(n); }
-            bool operator<<(unsigned short n)           { return shl_unsigned(n); }
-            bool operator<<(unsigned int n)             { return shl_unsigned(n); }
-            bool operator<<(unsigned long n)            { return shl_unsigned(n); }
+    public:
+        template <class Type>
+        typename boost::enable_if_c<boost::detail::is_character<Type>::value && sizeof(char) == sizeof(Type), bool>::type
+                stream_in(lcast::exact<const Type*> x)         { return shl_char_array(reinterpret_cast<char const*>(x.payload)); }
 
-#if defined(BOOST_HAS_LONG_LONG)
-            bool operator<<(boost::ulong_long_type n)   { return shl_unsigned(n); }
-            bool operator<<(boost::long_long_type n)    { return shl_signed(n); }
-#elif defined(BOOST_HAS_MS_INT64)
-            bool operator<<(unsigned __int64 n)         { return shl_unsigned(n); }
-            bool operator<<(         __int64 n)         { return shl_signed(n); }
-#endif
+        template <class Type>
+        typename boost::enable_if_c<boost::detail::is_character<Type>::value && sizeof(char) != sizeof(Type), bool>::type
+                stream_in(lcast::exact<const Type*> x)         { return shl_char_array(x.payload); }
 
-#ifdef BOOST_HAS_INT128
-            bool operator<<(const boost::uint128_type& n)   { return shl_unsigned(n); }
-            bool operator<<(const boost::int128_type& n)    { return shl_signed(n); }
-#endif
-            bool operator<<(float val)                  { return shl_real(val); }
-            bool operator<<(double val)                 { return shl_real(val); }
-            bool operator<<(long double val)            {
+        bool stream_in(lcast::exact<float> x)                  { return shl_real(x.payload); }
+        bool stream_in(lcast::exact<double> x)                 { return shl_real(x.payload); }
+        bool stream_in(lcast::exact<long double> x)            {
 #ifndef __MINGW32__
-                return shl_real(val);
+            return shl_real(x.payload);
 #else
-                return shl_real(static_cast<double>(val));
+            return shl_real(static_cast<double>(x.payload));
 #endif
-            }
+        }
+
+        template <class C>
+        typename boost::enable_if_c<boost::detail::is_character<C>::value, bool>::type
+        stream_in(lcast::exact<iterator_range<C*>> x) noexcept {
+            auto buf = boost::conversion::detail::make_buffer_view(x.payload.begin(), x.payload.end());
+            return stream_in(lcast::exact<decltype(buf)>{buf});
+        }
+
+        template <class C>
+        typename boost::enable_if_c<boost::detail::is_character<C>::value, bool>::type
+        stream_in(lcast::exact<iterator_range<const C*>> x) noexcept {
+            auto buf = boost::conversion::detail::make_buffer_view(x.payload.begin(), x.payload.end());
+            return stream_in(lcast::exact<decltype(buf)>{buf});
+        }
+
+        template <class InStreamable>
+        bool stream_in(lcast::exact<InStreamable> x)  { return shl_input_streamable(x.payload); }
+    };
+
+
+    template <class CharT, class Traits>
+    class to_target_stream {
+        //`[start, finish)` is the range to output by `operator >>`
+        const CharT*        start;
+        const CharT* const  finish;
+
+    public:
+        to_target_stream(to_target_stream&&) = delete;
+        to_target_stream(const to_target_stream&) = delete;
+        to_target_stream& operator=(to_target_stream&&) = delete;
+        to_target_stream& operator=(const to_target_stream&) = delete;
+
+        to_target_stream(const CharT* begin, const CharT* end) noexcept
+          : start(begin)
+          , finish(end)
+        {}
+
+    private:
+        template <typename Type>
+#if defined(__clang__) && (__clang_major__ > 3 || __clang_minor__ > 6)
+        __attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif
+        bool shr_unsigned(Type& output) {
+            if (start == finish) return false;
+            CharT const minus = lcast_char_constants<CharT>::minus;
+            CharT const plus = lcast_char_constants<CharT>::plus;
+            bool const has_minus = Traits::eq(minus, *start);
 
-            // Adding constness to characters. Constness does not change layout
-            template <class C, std::size_t N>
-            typename boost::disable_if<boost::is_const<C>, bool>::type
-            operator<<(boost::array<C, N> const& input) noexcept {
-                static_assert(
-                    sizeof(boost::array<const C, N>) == sizeof(boost::array<C, N>),
-                    "boost::array<C, N> and boost::array<const C, N> must have exactly the same layout."
-                );
-                return ((*this) << reinterpret_cast<boost::array<const C, N> const& >(input));
+            /* We won`t use `start' any more, so no need in decrementing it after */
+            if (has_minus || Traits::eq(plus, *start)) {
+                ++start;
             }
 
-            template <std::size_t N>
-            bool operator<<(boost::array<const CharT, N> const& input) noexcept {
-                return shl_char_array_limited(input.data(), N);
-            }
+            bool const succeed = lcast_ret_unsigned<Traits, Type, CharT>(output, start, finish).convert();
 
-            template <std::size_t N>
-            bool operator<<(boost::array<const unsigned char, N> const& input) noexcept {
-                return ((*this) << reinterpret_cast<boost::array<const char, N> const& >(input));
+            if (has_minus) {
+                output = static_cast<Type>(0u - output);
             }
 
-            template <std::size_t N>
-            bool operator<<(boost::array<const signed char, N> const& input) noexcept {
-                return ((*this) << reinterpret_cast<boost::array<const char, N> const& >(input));
-            }
+            return succeed;
+        }
 
-#ifndef BOOST_NO_CXX11_HDR_ARRAY
-            // Making a Boost.Array from std::array
-            template <class C, std::size_t N>
-            bool operator<<(std::array<C, N> const& input) noexcept {
-                static_assert(
-                    sizeof(std::array<C, N>) == sizeof(boost::array<C, N>),
-                    "std::array and boost::array must have exactly the same layout. "
-                    "Bug in implementation of std::array or boost::array."
-                );
-                return ((*this) << reinterpret_cast<boost::array<C, N> const& >(input));
-            }
+        template <typename Type>
+#if defined(__clang__) && (__clang_major__ > 3 || __clang_minor__ > 6)
+        __attribute__((no_sanitize("unsigned-integer-overflow")))
 #endif
-            template <class InStreamable>
-            bool operator<<(const InStreamable& input)  { return shl_input_streamable(input); }
-        };
-
-
-        template <class CharT, class Traits>
-        class lexical_ostream_limited_src: boost::noncopyable {
-            //`[start, finish)` is the range to output by `operator >>`
-            const CharT*        start;
-            const CharT* const  finish;
-
-        public:
-            lexical_ostream_limited_src(const CharT* begin, const CharT* end) noexcept
-              : start(begin)
-              , finish(end)
-            {}
-
-/************************************ HELPER FUNCTIONS FOR OPERATORS >> ( ... ) ********************************/
-        private:
-            template <typename Type>
-            bool shr_unsigned(Type& output) {
-                if (start == finish) return false;
-                CharT const minus = lcast_char_constants<CharT>::minus;
-                CharT const plus = lcast_char_constants<CharT>::plus;
-                bool const has_minus = Traits::eq(minus, *start);
-
-                /* We won`t use `start' any more, so no need in decrementing it after */
-                if (has_minus || Traits::eq(plus, *start)) {
-                    ++start;
-                }
-
-                bool const succeed = lcast_ret_unsigned<Traits, Type, CharT>(output, start, finish).convert();
-
-                if (has_minus) {
-                    output = static_cast<Type>(0u - output);
-                }
-
-                return succeed;
-            }
-
-            template <typename Type>
-            bool shr_signed(Type& output) {
-                if (start == finish) return false;
-                CharT const minus = lcast_char_constants<CharT>::minus;
-                CharT const plus = lcast_char_constants<CharT>::plus;
-                typedef typename make_unsigned<Type>::type utype;
-                utype out_tmp = 0;
-                bool const has_minus = Traits::eq(minus, *start);
-
-                /* We won`t use `start' any more, so no need in decrementing it after */
-                if (has_minus || Traits::eq(plus, *start)) {
-                    ++start;
-                }
-
-                bool succeed = lcast_ret_unsigned<Traits, utype, CharT>(out_tmp, start, finish).convert();
-                if (has_minus) {
-                    utype const comp_val = (static_cast<utype>(1) << std::numeric_limits<Type>::digits);
-                    succeed = succeed && out_tmp<=comp_val;
-                    output = static_cast<Type>(0u - out_tmp);
-                } else {
-                    utype const comp_val = static_cast<utype>((std::numeric_limits<Type>::max)());
-                    succeed = succeed && out_tmp<=comp_val;
-                    output = static_cast<Type>(out_tmp);
-                }
-                return succeed;
-            }
-
-            template<typename InputStreamable>
-            bool shr_using_base_class(InputStreamable& output)
-            {
-                static_assert(
-                    !boost::is_pointer<InputStreamable>::value,
-                    "boost::lexical_cast can not convert to pointers"
-                );
+        bool shr_signed(Type& output) {
+            if (start == finish) return false;
+            CharT const minus = lcast_char_constants<CharT>::minus;
+            CharT const plus = lcast_char_constants<CharT>::plus;
+            typedef typename make_unsigned<Type>::type utype;
+            utype out_tmp = 0;
+            bool const has_minus = Traits::eq(minus, *start);
+
+            /* We won`t use `start' any more, so no need in decrementing it after */
+            if (has_minus || Traits::eq(plus, *start)) {
+                ++start;
+            }
+
+            bool succeed = lcast_ret_unsigned<Traits, utype, CharT>(out_tmp, start, finish).convert();
+            if (has_minus) {
+                utype const comp_val = (static_cast<utype>(1) << std::numeric_limits<Type>::digits);
+                succeed = succeed && out_tmp<=comp_val;
+                output = static_cast<Type>(0u - out_tmp);
+            } else {
+                utype const comp_val = static_cast<utype>((std::numeric_limits<Type>::max)());
+                succeed = succeed && out_tmp<=comp_val;
+                output = static_cast<Type>(out_tmp);
+            }
+            return succeed;
+        }
+
+        template<typename InputStreamable>
+        bool shr_using_base_class(InputStreamable& output)
+        {
+            static_assert(
+                !boost::is_pointer<InputStreamable>::value,
+                "boost::lexical_cast can not convert to pointers"
+            );
 
 #if defined(BOOST_NO_STRINGSTREAM) || defined(BOOST_NO_STD_LOCALE)
-                static_assert(boost::is_same<char, CharT>::value,
-                    "boost::lexical_cast can not convert, because your STL library does not "
-                    "support such conversions. Try updating it."
-                );
+            static_assert(boost::is_same<char, CharT>::value,
+                "boost::lexical_cast can not convert, because your STL library does not "
+                "support such conversions. Try updating it."
+            );
 #endif
 
 #if defined(BOOST_NO_STRINGSTREAM)
-                std::istrstream stream(start, static_cast<std::istrstream::streamsize>(finish - start));
+            std::istrstream stream(start, static_cast<std::istrstream::streamsize>(finish - start));
 #else
-                typedef typename out_stream_helper_trait<CharT, Traits>::buffer_t buffer_t;
-                buffer_t buf;
-                // Usually `istream` and `basic_istream` do not modify
-                // content of buffer; `buffer_t` assures that this is true
-                buf.setbuf(const_cast<CharT*>(start), static_cast<typename buffer_t::streamsize>(finish - start));
+            typedef detail::lcast::buffer_t<CharT, Traits> buffer_t;
+            buffer_t buf;
+            // Usually `istream` and `basic_istream` do not modify
+            // content of buffer; `buffer_t` assures that this is true
+            buf.setbuf(const_cast<CharT*>(start), static_cast<typename buffer_t::streamsize>(finish - start));
 #if defined(BOOST_NO_STD_LOCALE)
-                std::istream stream(&buf);
+            std::istream stream(&buf);
 #else
-                std::basic_istream<CharT, Traits> stream(&buf);
+            std::basic_istream<CharT, Traits> stream(&buf);
 #endif // BOOST_NO_STD_LOCALE
 #endif // BOOST_NO_STRINGSTREAM
 
 #ifndef BOOST_NO_EXCEPTIONS
-                stream.exceptions(std::ios::badbit);
-                try {
+            stream.exceptions(std::ios::badbit);
+            try {
 #endif
-                stream.unsetf(std::ios::skipws);
-                lcast_set_precision(stream, static_cast<InputStreamable*>(0));
+            stream.unsetf(std::ios::skipws);
+            lcast_set_precision(stream, static_cast<InputStreamable*>(0));
 
-                return (stream >> output)
-                    && (stream.get() == Traits::eof());
+            return (stream >> output)
+                && (stream.get() == Traits::eof());
 
 #ifndef BOOST_NO_EXCEPTIONS
-                } catch (const ::std::ios_base::failure& /*f*/) {
-                    return false;
-                }
-#endif
-            }
-
-            template<class T>
-            inline bool shr_xchar(T& output) noexcept {
-                static_assert(sizeof(CharT) == sizeof(T),
-                    "boost::lexical_cast does not support narrowing of character types."
-                    "Use boost::locale instead" );
-                bool const ok = (finish - start == 1);
-                if (ok) {
-                    CharT out;
-                    Traits::assign(out, *start);
-                    output = static_cast<T>(out);
-                }
-                return ok;
-            }
-
-            template <std::size_t N, class ArrayT>
-            bool shr_std_array(ArrayT& output) noexcept {
-                using namespace std;
-                const std::size_t size = static_cast<std::size_t>(finish - start);
-                if (size > N - 1) { // `-1` because we need to store \0 at the end
-                    return false;
-                }
-
-                memcpy(&output[0], start, size * sizeof(CharT));
-                output[size] = Traits::to_char_type(0);
-                return true;
+            } catch (const ::std::ios_base::failure& /*f*/) {
+                return false;
             }
-
-/************************************ OPERATORS >> ( ... ) ********************************/
-        public:
-            bool operator>>(unsigned short& output)             { return shr_unsigned(output); }
-            bool operator>>(unsigned int& output)               { return shr_unsigned(output); }
-            bool operator>>(unsigned long int& output)          { return shr_unsigned(output); }
-            bool operator>>(short& output)                      { return shr_signed(output); }
-            bool operator>>(int& output)                        { return shr_signed(output); }
-            bool operator>>(long int& output)                   { return shr_signed(output); }
+#endif
+        }
+
+        template<class T>
+        inline bool shr_xchar(T& output) noexcept {
+            static_assert(sizeof(CharT) == sizeof(T),
+                "boost::lexical_cast does not support narrowing of character types."
+                "Use boost::locale instead" );
+            bool const ok = (finish - start == 1);
+            if (ok) {
+                CharT out;
+                Traits::assign(out, *start);
+                output = static_cast<T>(out);
+            }
+            return ok;
+        }
+
+        template <std::size_t N, class ArrayT>
+        bool shr_std_array(ArrayT& output) noexcept {
+            const std::size_t size = static_cast<std::size_t>(finish - start);
+            if (size > N - 1) { // `-1` because we need to store \0 at the end
+                return false;
+            }
+
+            std::memcpy(&output[0], start, size * sizeof(CharT));
+            output[size] = Traits::to_char_type(0);
+            return true;
+        }
+
+    public:
+        bool stream_out(unsigned short& output)             { return shr_unsigned(output); }
+        bool stream_out(unsigned int& output)               { return shr_unsigned(output); }
+        bool stream_out(unsigned long int& output)          { return shr_unsigned(output); }
+        bool stream_out(short& output)                      { return shr_signed(output); }
+        bool stream_out(int& output)                        { return shr_signed(output); }
+        bool stream_out(long int& output)                   { return shr_signed(output); }
 #if defined(BOOST_HAS_LONG_LONG)
-            bool operator>>(boost::ulong_long_type& output)     { return shr_unsigned(output); }
-            bool operator>>(boost::long_long_type& output)      { return shr_signed(output); }
+        bool stream_out(boost::ulong_long_type& output)     { return shr_unsigned(output); }
+        bool stream_out(boost::long_long_type& output)      { return shr_signed(output); }
 #elif defined(BOOST_HAS_MS_INT64)
-            bool operator>>(unsigned __int64& output)           { return shr_unsigned(output); }
-            bool operator>>(__int64& output)                    { return shr_signed(output); }
+        bool stream_out(unsigned __int64& output)           { return shr_unsigned(output); }
+        bool stream_out(__int64& output)                    { return shr_signed(output); }
 #endif
 
 #ifdef BOOST_HAS_INT128
-            bool operator>>(boost::uint128_type& output)        { return shr_unsigned(output); }
-            bool operator>>(boost::int128_type& output)         { return shr_signed(output); }
+        bool stream_out(boost::uint128_type& output)        { return shr_unsigned(output); }
+        bool stream_out(boost::int128_type& output)         { return shr_signed(output); }
 #endif
 
-            bool operator>>(char& output)                       { return shr_xchar(output); }
-            bool operator>>(unsigned char& output)              { return shr_xchar(output); }
-            bool operator>>(signed char& output)                { return shr_xchar(output); }
+        bool stream_out(char& output)                       { return shr_xchar(output); }
+        bool stream_out(unsigned char& output)              { return shr_xchar(output); }
+        bool stream_out(signed char& output)                { return shr_xchar(output); }
 #if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-            bool operator>>(wchar_t& output)                    { return shr_xchar(output); }
+        bool stream_out(wchar_t& output)                    { return shr_xchar(output); }
 #endif
 #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
-            bool operator>>(char16_t& output)                   { return shr_xchar(output); }
+        bool stream_out(char16_t& output)                   { return shr_xchar(output); }
 #endif
 #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
-            bool operator>>(char32_t& output)                   { return shr_xchar(output); }
+        bool stream_out(char32_t& output)                   { return shr_xchar(output); }
 #endif
-            template<class Alloc>
-            bool operator>>(std::basic_string<CharT,Traits,Alloc>& str) {
-                str.assign(start, finish); return true;
-            }
+        template<class CharTraits, class Alloc>
+        bool stream_out(std::basic_string<CharT,CharTraits,Alloc>& str) {
+            str.assign(start, finish); return true;
+        }
 
-            template<class Alloc>
-            bool operator>>(boost::container::basic_string<CharT,Traits,Alloc>& str) {
-                str.assign(start, finish); return true;
-            }
+        template<class CharTraits, class Alloc>
+        bool stream_out(boost::container::basic_string<CharT,CharTraits,Alloc>& str) {
+            str.assign(start, finish); return true;
+        }
 
-            template <std::size_t N>
-            bool operator>>(std::array<CharT, N>& output) noexcept {
-                return shr_std_array<N>(output);
-            }
+        template <class C, std::size_t N>
+        bool stream_out(std::array<C, N>& output) noexcept {
+            static_assert(sizeof(C) == sizeof(CharT), "");
+            return shr_std_array<N>(output);
+        }
 
-            template <std::size_t N>
-            bool operator>>(std::array<unsigned char, N>& output) noexcept {
-                return ((*this) >> reinterpret_cast<std::array<char, N>& >(output));
-            }
+        template <class C, std::size_t N>
+        bool stream_out(boost::array<C, N>& output) noexcept {
+            static_assert(sizeof(C) == sizeof(CharT), "");
+            return shr_std_array<N>(output);
+        }
 
-            template <std::size_t N>
-            bool operator>>(std::array<signed char, N>& output) noexcept {
-                return ((*this) >> reinterpret_cast<std::array<char, N>& >(output));
-            }
+        bool stream_out(bool& output) noexcept {
+            output = false; // Suppress warning about uninitalized variable
 
-            template <class C, std::size_t N>
-            bool operator>>(boost::array<C, N>& output) noexcept {
-                static_assert(
-                    sizeof(std::array<C, N>) == sizeof(boost::array<C, N>),
-                    "std::array<C, N> and boost::array<C, N> must have exactly the same layout."
-                );
-                return ((*this) >> reinterpret_cast<std::array<C, N>& >(output));
-            }
+            if (start == finish) return false;
+            CharT const zero = lcast_char_constants<CharT>::zero;
+            CharT const plus = lcast_char_constants<CharT>::plus;
+            CharT const minus = lcast_char_constants<CharT>::minus;
 
-            bool operator>>(bool& output) noexcept {
-                output = false; // Suppress warning about uninitalized variable
-
-                if (start == finish) return false;
-                CharT const zero = lcast_char_constants<CharT>::zero;
-                CharT const plus = lcast_char_constants<CharT>::plus;
-                CharT const minus = lcast_char_constants<CharT>::minus;
-
-                const CharT* const dec_finish = finish - 1;
-                output = Traits::eq(*dec_finish, zero + 1);
-                if (!output && !Traits::eq(*dec_finish, zero)) {
-                    return false; // Does not ends on '0' or '1'
-                }
-
-                if (start == dec_finish) return true;
-
-                // We may have sign at the beginning
-                if (Traits::eq(plus, *start) || (Traits::eq(minus, *start) && !output)) {
-                    ++ start;
-                }
-
-                // Skipping zeros
-                while (start != dec_finish) {
-                    if (!Traits::eq(zero, *start)) {
-                        return false; // Not a zero => error
-                    }
-
-                    ++ start;
-                }
-
-                return true;
+            const CharT* const dec_finish = finish - 1;
+            output = Traits::eq(*dec_finish, zero + 1);
+            if (!output && !Traits::eq(*dec_finish, zero)) {
+                return false; // Does not ends on '0' or '1'
             }
 
-        private:
-            // Not optimised converter
-            template <class T>
-            bool float_types_converter_internal(T& output) {
-                if (parse_inf_nan(start, finish, output)) return true;
-                bool const return_value = shr_using_base_class(output);
-
-                /* Some compilers and libraries successfully
-                 * parse 'inf', 'INFINITY', '1.0E', '1.0E-'...
-                 * We are trying to provide a unified behaviour,
-                 * so we just forbid such conversions (as some
-                 * of the most popular compilers/libraries do)
-                 * */
-                CharT const minus = lcast_char_constants<CharT>::minus;
-                CharT const plus = lcast_char_constants<CharT>::plus;
-                CharT const capital_e = lcast_char_constants<CharT>::capital_e;
-                CharT const lowercase_e = lcast_char_constants<CharT>::lowercase_e;
-                if ( return_value &&
-                     (
-                        Traits::eq(*(finish-1), lowercase_e)                   // 1.0e
-                        || Traits::eq(*(finish-1), capital_e)                  // 1.0E
-                        || Traits::eq(*(finish-1), minus)                      // 1.0e- or 1.0E-
-                        || Traits::eq(*(finish-1), plus)                       // 1.0e+ or 1.0E+
-                     )
-                ) return false;
-
-                return return_value;
+            if (start == dec_finish) return true;
+
+            // We may have sign at the beginning
+            if (Traits::eq(plus, *start) || (Traits::eq(minus, *start) && !output)) {
+                ++ start;
             }
 
-        public:
-            bool operator>>(float& output) { return float_types_converter_internal(output); }
-            bool operator>>(double& output) { return float_types_converter_internal(output); }
-            bool operator>>(long double& output) { return float_types_converter_internal(output); }
+            // Skipping zeros
+            while (start != dec_finish) {
+                if (!Traits::eq(zero, *start)) {
+                    return false; // Not a zero => error
+                }
 
-            // Generic istream-based algorithm.
-            // lcast_streambuf_for_target<InputStreamable>::value is true.
-            template <typename InputStreamable>
-            bool operator>>(InputStreamable& output) {
-                return shr_using_base_class(output);
-            }
-        };
-    }
-} // namespace boost
+                ++ start;
+            }
+
+            return true;
+        }
+
+    private:
+        // Not optimised converter
+        template <class T>
+        bool float_types_converter_internal(T& output) {
+            if (parse_inf_nan(start, finish, output)) return true;
+            bool const return_value = shr_using_base_class(output);
+
+            /* Some compilers and libraries successfully
+             * parse 'inf', 'INFINITY', '1.0E', '1.0E-'...
+             * We are trying to provide a unified behaviour,
+             * so we just forbid such conversions (as some
+             * of the most popular compilers/libraries do)
+             * */
+            CharT const minus = lcast_char_constants<CharT>::minus;
+            CharT const plus = lcast_char_constants<CharT>::plus;
+            CharT const capital_e = lcast_char_constants<CharT>::capital_e;
+            CharT const lowercase_e = lcast_char_constants<CharT>::lowercase_e;
+            if ( return_value &&
+                 (
+                    Traits::eq(*(finish-1), lowercase_e)                   // 1.0e
+                    || Traits::eq(*(finish-1), capital_e)                  // 1.0E
+                    || Traits::eq(*(finish-1), minus)                      // 1.0e- or 1.0E-
+                    || Traits::eq(*(finish-1), plus)                       // 1.0e+ or 1.0E+
+                 )
+            ) return false;
+
+            return return_value;
+        }
+
+    public:
+        bool stream_out(float& output) { return float_types_converter_internal(output); }
+        bool stream_out(double& output) { return float_types_converter_internal(output); }
+        bool stream_out(long double& output) { return float_types_converter_internal(output); }
+
+        // Generic istream-based algorithm.
+        // lcast_streambuf_for_target<InputStreamable>::value is true.
+        template <typename InputStreamable>
+        bool stream_out(InputStreamable& output) {
+            return shr_using_base_class(output);
+        }
+    };
+    
+}}} // namespace boost::detail::lcast
 
 #undef BOOST_LCAST_NO_WCHAR_T
 
diff --git a/inst/include/boost/lexical_cast/detail/converter_numeric.hpp b/inst/include/boost/lexical_cast/detail/converter_numeric.hpp
index a2c992db5..167473b36 100644
--- a/inst/include/boost/lexical_cast/detail/converter_numeric.hpp
+++ b/inst/include/boost/lexical_cast/detail/converter_numeric.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -23,101 +23,107 @@
 #   pragma once
 #endif
 
+#include <boost/core/cmath.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/limits.hpp>
 #include <boost/type_traits/type_identity.hpp>
 #include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
 #include <boost/type_traits/is_signed.hpp>
-#include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/type_traits/is_base_of.hpp>
 #include <boost/type_traits/is_float.hpp>
-#include <boost/type_traits/remove_volatile.hpp>
-
-#include <boost/numeric/conversion/cast.hpp>
 
 namespace boost { namespace detail {
 
-template <class Source >
-struct detect_precision_loss
-{
-    typedef Source source_type;
-    typedef boost::numeric::Trunc<Source> Rounder;
-    typedef typename conditional<
-        boost::is_arithmetic<Source>::value, Source, Source const&
-    >::type argument_type ;
-
-    static inline source_type nearbyint(argument_type s, bool& is_ok) noexcept {
-        const source_type near_int = Rounder::nearbyint(s);
-        if (near_int && is_ok) {
-            const source_type orig_div_round = s / near_int;
-            const source_type eps = std::numeric_limits<source_type>::epsilon();
-
-            is_ok = !((orig_div_round > 1 ? orig_div_round - 1 : 1 - orig_div_round) > eps);
-        }
+template <class Source, class Target>
+bool ios_numeric_comparer_float(Source x, Source y) noexcept {
+    return x == y
+        || (boost::core::isnan(x) && boost::core::isnan(y))
+        || (x < (std::numeric_limits<Target>::min)())
+    ;
+}
+
+template <class RangeType, class T>
+constexpr bool is_out_of_range_for(T value) noexcept {
+    return value > static_cast<T>((std::numeric_limits<RangeType>::max)())
+        || value < static_cast<T>((std::numeric_limits<RangeType>::min)());
+}
+
 
-        return s;
+// integral -> integral
+template <typename Target, typename Source>
+typename boost::enable_if_c<
+    !boost::is_floating_point<Source>::value && !boost::is_floating_point<Target>::value, bool
+>::type noexcept_numeric_convert(Source arg, Target& result) noexcept {
+    const Target target_tmp = static_cast<Target>(arg);
+    const Source arg_restored = static_cast<Source>(target_tmp);
+    if (arg == arg_restored) {
+        result = target_tmp;
+        return true;
     }
+    return false;
+}
 
-    typedef typename Rounder::round_style round_style;
-};
+// integral -> floating point
+template <typename Target, typename Source>
+typename boost::enable_if_c<
+    !boost::is_floating_point<Source>::value && boost::is_floating_point<Target>::value, bool
+>::type noexcept_numeric_convert(Source arg, Target& result) noexcept {
+    const Target target_tmp = static_cast<Target>(arg);
+    result = target_tmp;
+    return true;
+}
 
-template <typename Base, class Source>
-struct fake_precision_loss: public Base
-{
-    typedef Source source_type ;
-    typedef typename conditional<
-        boost::is_arithmetic<Source>::value, Source, Source const&
-    >::type argument_type ;
 
-    static inline source_type nearbyint(argument_type s, bool& /*is_ok*/) noexcept {
-        return s;
+// floating point -> floating point
+template <typename Target, typename Source>
+typename boost::enable_if_c<
+    boost::is_floating_point<Source>::value && boost::is_floating_point<Target>::value, bool
+>::type noexcept_numeric_convert(Source arg, Target& result) noexcept {
+    const Target target_tmp = static_cast<Target>(arg);
+    const Source arg_restored = static_cast<Source>(target_tmp);
+    if (detail::ios_numeric_comparer_float<Source, Target>(arg, arg_restored)) {
+        result = target_tmp;
+        return true;
     }
-};
 
-struct nothrow_overflow_handler
-{
-    inline bool operator() ( boost::numeric::range_check_result r ) const noexcept {
-        return (r == boost::numeric::cInRange);
-    }
-};
+    return false;
+}
 
+// floating point -> integral
 template <typename Target, typename Source>
-inline bool noexcept_numeric_convert(const Source& arg, Target& result) noexcept {
-    typedef boost::numeric::converter<
-            Target,
-            Source,
-            boost::numeric::conversion_traits<Target, Source >,
-            nothrow_overflow_handler,
-            detect_precision_loss<Source >
-    > converter_orig_t;
-
-    typedef typename boost::conditional<
-        boost::is_base_of< detect_precision_loss<Source >, converter_orig_t >::value,
-        converter_orig_t,
-        fake_precision_loss<converter_orig_t, Source>
-    >::type converter_t;
-
-    bool res = nothrow_overflow_handler()(converter_t::out_of_range(arg));
-    if (res) {
-        result = converter_t::low_level_convert(converter_t::nearbyint(arg, res));
+typename boost::enable_if_c<
+    boost::is_floating_point<Source>::value && !boost::is_floating_point<Target>::value, bool
+>::type noexcept_numeric_convert(Source arg, Target& result) noexcept {
+    if (detail::is_out_of_range_for<Target>(arg)) {
+        return false;
     }
 
-    return res;
+    const Target target_tmp = static_cast<Target>(arg);
+    const Source arg_restored = static_cast<Source>(target_tmp);
+    if (detail::ios_numeric_comparer_float<Source, Target>(arg, arg_restored)) {
+        result = target_tmp;
+        return true;
+    }
+
+    return false;
 }
 
-template <typename Target, typename Source>
 struct lexical_cast_dynamic_num_not_ignoring_minus
 {
-    static inline bool try_convert(const Source &arg, Target& result) noexcept {
-        return noexcept_numeric_convert<Target, Source >(arg, result);
+    template <typename Target, typename Source>
+    static inline bool try_convert(Source arg, Target& result) noexcept {
+        return boost::detail::noexcept_numeric_convert<Target, Source >(arg, result);
     }
 };
 
-template <typename Target, typename Source>
 struct lexical_cast_dynamic_num_ignoring_minus
 {
-    static inline bool try_convert(const Source &arg, Target& result) noexcept {
+    template <typename Target, typename Source>
+#if defined(__clang__) && (__clang_major__ > 3 || __clang_minor__ > 6)
+    __attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif
+    static inline bool try_convert(Source arg, Target& result) noexcept {
         typedef typename boost::conditional<
                 boost::is_float<Source>::value,
                 boost::type_identity<Source>,
@@ -126,17 +132,19 @@ struct lexical_cast_dynamic_num_ignoring_minus
         typedef typename usource_lazy_t::type usource_t;
 
         if (arg < 0) {
-            const bool res = noexcept_numeric_convert<Target, usource_t>(0u - arg, result);
+            const bool res = boost::detail::noexcept_numeric_convert<Target, usource_t>(
+                static_cast<usource_t>(0u - static_cast<usource_t>(arg)), result
+            );
             result = static_cast<Target>(0u - result);
             return res;
         } else {
-            return noexcept_numeric_convert<Target, usource_t>(arg, result);
+            return boost::detail::noexcept_numeric_convert<Target, usource_t>(arg, result);
         }
     }
 };
 
 /*
- * lexical_cast_dynamic_num follows the rules:
+ * dynamic_num_converter_impl follows the rules:
  * 1) If Source can be converted to Target without precision loss and
  * without overflows, then assign Source to Target and return
  *
@@ -156,16 +164,14 @@ struct lexical_cast_dynamic_num_ignoring_minus
 template <typename Target, typename Source>
 struct dynamic_num_converter_impl
 {
-    typedef typename boost::remove_volatile<Source>::type source_type;
-
-    static inline bool try_convert(source_type arg, Target& result) noexcept {
+    static inline bool try_convert(Source arg, Target& result) noexcept {
         typedef typename boost::conditional<
             boost::is_unsigned<Target>::value &&
-            (boost::is_signed<source_type>::value || boost::is_float<source_type>::value) &&
-            !(boost::is_same<source_type, bool>::value) &&
+            (boost::is_signed<Source>::value || boost::is_float<Source>::value) &&
+            !(boost::is_same<Source, bool>::value) &&
             !(boost::is_same<Target, bool>::value),
-            lexical_cast_dynamic_num_ignoring_minus<Target, source_type>,
-            lexical_cast_dynamic_num_not_ignoring_minus<Target, source_type>
+            lexical_cast_dynamic_num_ignoring_minus,
+            lexical_cast_dynamic_num_not_ignoring_minus
         >::type caster_type;
 
         return caster_type::try_convert(arg, result);
diff --git a/inst/include/boost/lexical_cast/detail/inf_nan.hpp b/inst/include/boost/lexical_cast/detail/inf_nan.hpp
index a9f92b2d1..c543e47ae 100644
--- a/inst/include/boost/lexical_cast/detail/inf_nan.hpp
+++ b/inst/include/boost/lexical_cast/detail/inf_nan.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -28,7 +28,7 @@
 #endif
 
 #include <boost/limits.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/core/cmath.hpp>
 #include <cstddef>
 #include <cstring>
@@ -100,32 +100,25 @@ namespace boost {
         }
 
         template <class CharT, class T>
-        bool put_inf_nan_impl(CharT* begin, CharT*& end, const T& value
+        const CharT* get_inf_nan_impl(T value
                          , const CharT* lc_nan
-                         , const CharT* lc_infinity) noexcept
+                         , const CharT* lc_minus_nan
+                         , const CharT* lc_infinity
+                         , const CharT* lc_minus_infinity) noexcept
         {
-            const CharT minus = lcast_char_constants<CharT>::minus;
             if (boost::core::isnan(value)) {
                 if (boost::core::signbit(value)) {
-                    *begin = minus;
-                    ++ begin;
+                    return lc_minus_nan;
                 }
-
-                std::memcpy(begin, lc_nan, 3 * sizeof(CharT));
-                end = begin + 3;
-                return true;
+                return lc_nan;
             } else if (boost::core::isinf(value)) {
                 if (boost::core::signbit(value)) {
-                    *begin = minus;
-                    ++ begin;
+                    return lc_minus_infinity;
                 }
-
-                std::memcpy(begin, lc_infinity, 3 * sizeof(CharT));
-                end = begin + 3;
-                return true;
+                return lc_infinity;
             }
 
-            return false;
+            return nullptr;
         }
 
 
@@ -139,8 +132,8 @@ namespace boost {
         }
 
         template <class T>
-        bool put_inf_nan(wchar_t* begin, wchar_t*& end, const T& value) noexcept {
-            return put_inf_nan_impl(begin, end, value, L"nan", L"infinity");
+        const wchar_t* get_inf_nan(T value, wchar_t) noexcept {
+            return detail::get_inf_nan_impl(value, L"nan", L"-nan", L"inf", L"-inf");
         }
 
 #endif
@@ -154,8 +147,8 @@ namespace boost {
         }
 
         template <class T>
-        bool put_inf_nan(char16_t* begin, char16_t*& end, const T& value) noexcept {
-            return put_inf_nan_impl(begin, end, value, u"nan", u"infinity");
+        const char16_t* get_inf_nan(T value, char16_t) noexcept {
+            return detail::get_inf_nan_impl(value, u"nan", u"-nan", u"inf", u"-inf");
         }
 #endif
 #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
@@ -168,8 +161,8 @@ namespace boost {
         }
 
         template <class T>
-        bool put_inf_nan(char32_t* begin, char32_t*& end, const T& value) noexcept {
-            return put_inf_nan_impl(begin, end, value, U"nan", U"infinity");
+        const char32_t* get_inf_nan(T value, char32_t) noexcept {
+            return detail::get_inf_nan_impl(value, U"nan", U"-nan", U"inf", U"-inf");
         }
 #endif
 
@@ -181,9 +174,9 @@ namespace boost {
                                , '(', ')');
         }
 
-        template <class CharT, class T>
-        bool put_inf_nan(CharT* begin, CharT*& end, const T& value) noexcept {
-            return put_inf_nan_impl(begin, end, value, "nan", "infinity");
+        template <class T>
+        const char* get_inf_nan(T value, char) noexcept {
+            return detail::get_inf_nan_impl(value, "nan", "-nan", "inf", "-inf");
         }
     }
 } // namespace boost
diff --git a/inst/include/boost/lexical_cast/detail/is_character.hpp b/inst/include/boost/lexical_cast/detail/is_character.hpp
index c0e492956..f9b223456 100644
--- a/inst/include/boost/lexical_cast/detail/is_character.hpp
+++ b/inst/include/boost/lexical_cast/detail/is_character.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -26,34 +26,27 @@
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-namespace boost {
-
-    namespace detail // is_character<...>
-    {
-        // returns true, if T is one of the character types
-        template < typename T >
-        struct is_character
-        {
-            typedef typename boost::integral_constant<
-                bool,
-                boost::is_same< T, char >::value ||
-                    #if !defined(BOOST_NO_STRINGSTREAM) && !defined(BOOST_NO_STD_WSTRING)
-                        boost::is_same< T, wchar_t >::value ||
-                    #endif
-                    #ifndef BOOST_NO_CXX11_CHAR16_T
-                        boost::is_same< T, char16_t >::value ||
-                    #endif
-                    #ifndef BOOST_NO_CXX11_CHAR32_T
-                        boost::is_same< T, char32_t >::value ||
-                    #endif
-                        boost::is_same< T, unsigned char >::value ||
-                        boost::is_same< T, signed char >::value
-            > type;
-
-            BOOST_STATIC_CONSTANT(bool, value = (type::value) );
-        };
-    }
-}
+namespace boost { namespace detail {
+
+// returns true, if T is one of the character types
+template < typename T >
+using is_character = boost::integral_constant<
+    bool,
+    boost::is_same< T, char >::value ||
+#if !defined(BOOST_NO_STRINGSTREAM) && !defined(BOOST_NO_STD_WSTRING)
+    boost::is_same< T, wchar_t >::value ||
+#endif
+#ifndef BOOST_NO_CXX11_CHAR16_T
+    boost::is_same< T, char16_t >::value ||
+#endif
+#ifndef BOOST_NO_CXX11_CHAR32_T
+    boost::is_same< T, char32_t >::value ||
+#endif
+    boost::is_same< T, unsigned char >::value ||
+    boost::is_same< T, signed char >::value
+>;
+
+}}
 
 #endif // BOOST_LEXICAL_CAST_DETAIL_IS_CHARACTER_HPP
 
diff --git a/inst/include/boost/lexical_cast/detail/lcast_basic_unlockedbuf.hpp b/inst/include/boost/lexical_cast/detail/lcast_basic_unlockedbuf.hpp
new file mode 100644
index 000000000..18168c5db
--- /dev/null
+++ b/inst/include/boost/lexical_cast/detail/lcast_basic_unlockedbuf.hpp
@@ -0,0 +1,73 @@
+// Copyright Kevlin Henney, 2000-2005.
+// Copyright Alexander Nasonov, 2006-2010.
+// Copyright Antony Polukhin, 2011-2024.
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_LEXICAL_CAST_DETAIL_CONVERTER_LEXICAL_BASIC_UNLOCKEDBUF_HPP
+#define BOOST_LEXICAL_CAST_DETAIL_CONVERTER_LEXICAL_BASIC_UNLOCKEDBUF_HPP
+
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#   pragma once
+#endif
+
+
+#ifdef BOOST_NO_STRINGSTREAM
+#include <strstream>
+#else
+#include <sstream>
+#endif
+
+#include <boost/detail/basic_pointerbuf.hpp>
+#ifndef BOOST_NO_CWCHAR
+#   include <cwchar>
+#endif
+
+namespace boost { namespace detail { namespace lcast {
+
+    // acts as a stream buffer which wraps around a pair of pointers
+    // and gives acces to internals
+    template <class BufferType, class CharT>
+    class basic_unlockedbuf : public basic_pointerbuf<CharT, BufferType> {
+    public:
+        typedef basic_pointerbuf<CharT, BufferType> base_type;
+        typedef typename base_type::streamsize streamsize;
+
+        using base_type::pptr;
+        using base_type::pbase;
+        using base_type::setbuf;
+    };
+
+#if defined(BOOST_NO_STRINGSTREAM)
+    template <class CharT, class Traits>
+    using out_stream_t = std::ostream;
+
+    template <class CharT, class Traits>
+    using stringbuffer_t = basic_unlockedbuf<std::strstreambuf, char>;
+#elif defined(BOOST_NO_STD_LOCALE)
+    template <class CharT, class Traits>
+    using out_stream_t = std::ostream;
+
+    template <class CharT, class Traits>
+    using stringbuffer_t = basic_unlockedbuf<std::stringbuf, char>;
+
+    template <class CharT, class Traits>
+    using buffer_t = basic_unlockedbuf<std::streambuf, char>;
+#else
+    template <class CharT, class Traits>
+    using out_stream_t = std::basic_ostream<CharT, Traits>;
+
+    template <class CharT, class Traits>
+    using stringbuffer_t = basic_unlockedbuf<std::basic_stringbuf<CharT, Traits>, CharT>;
+
+    template <class CharT, class Traits>
+    using buffer_t = basic_unlockedbuf<std::basic_streambuf<CharT, Traits>, CharT>;
+#endif
+
+}}} // namespace boost::detail::lcast
+
+#endif // BOOST_LEXICAL_CAST_DETAIL_CONVERTER_LEXICAL_BASIC_UNLOCKEDBUF_HPP
+
diff --git a/inst/include/boost/lexical_cast/detail/lcast_char_constants.hpp b/inst/include/boost/lexical_cast/detail/lcast_char_constants.hpp
index e2069a56b..8be09dc3e 100644
--- a/inst/include/boost/lexical_cast/detail/lcast_char_constants.hpp
+++ b/inst/include/boost/lexical_cast/detail/lcast_char_constants.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp b/inst/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
index cfb0c2e32..a899b2672 100644
--- a/inst/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
+++ b/inst/include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -30,7 +30,7 @@
 #include <cstdio>
 #include <boost/limits.hpp>
 #include <boost/type_traits/conditional.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 
 #ifndef BOOST_NO_STD_LOCALE
@@ -56,6 +56,9 @@ namespace boost
     namespace detail // lcast_to_unsigned
     {
         template<class T>
+#if defined(__clang__) && (__clang_major__ > 3 || __clang_minor__ > 6)
+       __attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif
         inline
         typename boost::make_unsigned<T>::type lcast_to_unsigned(const T value) noexcept {
             typedef typename boost::make_unsigned<T>::type result_type;
@@ -251,6 +254,9 @@ namespace boost
         private:
             // Iteration that does not care about grouping/separators and assumes that all
             // input characters are digits
+#if defined(__clang__) && (__clang_major__ > 3 || __clang_minor__ > 6)
+            __attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif
             inline bool main_convert_iteration() noexcept {
                 CharT const czero = lcast_char_constants<CharT>::zero;
                 T const maxv = (std::numeric_limits<T>::max)();
diff --git a/inst/include/boost/lexical_cast/detail/widest_char.hpp b/inst/include/boost/lexical_cast/detail/widest_char.hpp
index f7a36fab2..2db928c5d 100644
--- a/inst/include/boost/lexical_cast/detail/widest_char.hpp
+++ b/inst/include/boost/lexical_cast/detail/widest_char.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -28,14 +28,12 @@
 
 namespace boost { namespace detail {
 
-    template <typename TargetChar, typename SourceChar>
-    struct widest_char {
-        typedef typename boost::conditional<
-            (sizeof(TargetChar) > sizeof(SourceChar))
-            , TargetChar
-            , SourceChar
-        >::type type;
-    };
+template <typename TargetChar, typename SourceChar>
+using widest_char = boost::conditional<
+    (sizeof(TargetChar) > sizeof(SourceChar))
+    , TargetChar
+    , SourceChar
+>;
 
 }} // namespace boost::detail
 
diff --git a/inst/include/boost/lexical_cast/try_lexical_convert.hpp b/inst/include/boost/lexical_cast/try_lexical_convert.hpp
index a67f7732b..35cc68703 100644
--- a/inst/include/boost/lexical_cast/try_lexical_convert.hpp
+++ b/inst/include/boost/lexical_cast/try_lexical_convert.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2023.
+// Copyright Antony Polukhin, 2011-2024.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -23,20 +23,7 @@
 #   pragma once
 #endif
 
-#if defined(__clang__) || (defined(__GNUC__) && \
-    !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) && \
-    (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-#pragma GCC diagnostic push
-//#pragma GCC diagnostic ignored "-Wuninitialized"
-//#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-
-
-#include <string>
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/type_traits/type_identity.hpp>
 #include <boost/type_traits/conditional.hpp>
-#include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
 
 #include <boost/lexical_cast/detail/buffer_view.hpp>
@@ -44,119 +31,17 @@
 #include <boost/lexical_cast/detail/converter_numeric.hpp>
 #include <boost/lexical_cast/detail/converter_lexical.hpp>
 
-#include <boost/container/container_fwd.hpp>
-
 namespace boost {
     namespace detail
     {
-        template<typename T>
-        struct is_stdstring
-            : boost::false_type
-        {};
-
-        template<typename CharT, typename Traits, typename Alloc>
-        struct is_stdstring< std::basic_string<CharT, Traits, Alloc> >
-            : boost::true_type
-        {};
-
-        // Sun Studio has problem with partial specialization of templates differing only in namespace.
-        // We workaround that by making `is_booststring` trait, instead of specializing `is_stdstring` for `boost::container::basic_string`.
-        template<typename T>
-        struct is_booststring
-            : boost::false_type
-        {};
-
-        template<typename CharT, typename Traits, typename Alloc>
-        struct is_booststring< boost::container::basic_string<CharT, Traits, Alloc> >
-            : boost::true_type
-        {};
-
-        template<typename Target, typename Source>
-        struct is_arithmetic_and_not_xchars
-        {
-            typedef boost::integral_constant<
-                bool,
-                !(boost::detail::is_character<Target>::value) &&
-                    !(boost::detail::is_character<Source>::value) &&
-                    boost::is_arithmetic<Source>::value &&
-                    boost::is_arithmetic<Target>::value
-                > type;
-
-            BOOST_STATIC_CONSTANT(bool, value = (
-                type::value
-            ));
-        };
-
-        /*
-         * is_xchar_to_xchar<Target, Source>::value is true,
-         * Target and Souce are char types of the same size 1 (char, signed char, unsigned char).
-         */
-        template<typename Target, typename Source>
-        struct is_xchar_to_xchar
-        {
-            typedef boost::integral_constant<
-                bool,
-                sizeof(Source) == sizeof(Target) &&
-                     sizeof(Source) == sizeof(char) &&
-                     boost::detail::is_character<Target>::value &&
-                     boost::detail::is_character<Source>::value
-                > type;
-
-            BOOST_STATIC_CONSTANT(bool, value = (
-                type::value
-            ));
-        };
-
-        template<typename Target, typename Source>
-        struct is_char_array_to_stdstring
-            : boost::false_type
-        {};
-
-        template<typename CharT, typename Traits, typename Alloc>
-        struct is_char_array_to_stdstring< std::basic_string<CharT, Traits, Alloc>, CharT* >
-            : boost::true_type
-        {};
-
-        template<typename CharT, typename Traits, typename Alloc>
-        struct is_char_array_to_stdstring< std::basic_string<CharT, Traits, Alloc>, const CharT* >
-            : boost::true_type
-        {};
-
-        // Sun Studio has problem with partial specialization of templates differing only in namespace.
-        // We workaround that by making `is_char_array_to_booststring` trait, instead of specializing `is_char_array_to_stdstring` for `boost::container::basic_string`.
         template<typename Target, typename Source>
-        struct is_char_array_to_booststring
-            : boost::false_type
-        {};
-
-        template<typename CharT, typename Traits, typename Alloc>
-        struct is_char_array_to_booststring< boost::container::basic_string<CharT, Traits, Alloc>, CharT* >
-            : boost::true_type
-        {};
-
-        template<typename CharT, typename Traits, typename Alloc>
-        struct is_char_array_to_booststring< boost::container::basic_string<CharT, Traits, Alloc>, const CharT* >
-            : boost::true_type
-        {};
-
-        template <typename Target, typename Source>
-        struct copy_converter_impl
-        {
-// MSVC fail to forward an array (DevDiv#555157 "SILENT BAD CODEGEN triggered by perfect forwarding",
-// fixed in 2013 RTM).
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && (!defined(BOOST_MSVC) || BOOST_MSVC >= 1800)
-            template <class T>
-            static inline bool try_convert(T&& arg, Target& result) {
-                result = static_cast<T&&>(arg); // eqaul to `result = std::forward<T>(arg);`
-                return true;
-            }
-#else
-            static inline bool try_convert(const Source& arg, Target& result) {
-                result = arg;
-                return true;
-            }
-#endif
-        };
+        using is_arithmetic_and_not_xchars = boost::integral_constant<
+            bool,
+            !(boost::detail::is_character<Target>::value) &&
+                !(boost::detail::is_character<Source>::value) &&
+                boost::is_arithmetic<Source>::value &&
+                boost::is_arithmetic<Target>::value
+        >;
     }
 
     namespace conversion { namespace detail {
@@ -164,39 +49,20 @@ namespace boost {
         template <typename Target, typename Source>
         inline bool try_lexical_convert(const Source& arg, Target& result)
         {
-            typedef typename boost::detail::array_to_pointer_decay<Source>::type src;
+            static_assert(
+                !boost::is_volatile<Source>::value,
+                "Boost.LexicalCast does not support volatile input");
 
-            typedef boost::integral_constant<
-                bool,
-                boost::detail::is_xchar_to_xchar<Target, src >::value ||
-                boost::detail::is_char_array_to_stdstring<Target, src >::value ||
-                boost::detail::is_char_array_to_booststring<Target, src >::value ||
-                (
-                     boost::is_same<Target, src >::value &&
-                     (boost::detail::is_stdstring<Target >::value || boost::detail::is_booststring<Target >::value)
-                ) ||
-                (
-                     boost::is_same<Target, src >::value &&
-                     boost::detail::is_character<Target >::value
-                )
-            > shall_we_copy_t;
+            typedef typename boost::detail::array_to_pointer_decay<Source>::type src;
 
             typedef boost::detail::is_arithmetic_and_not_xchars<Target, src >
                 shall_we_copy_with_dynamic_check_t;
 
-            // We do evaluate second `if_` lazily to avoid unnecessary instantiations
-            // of `shall_we_copy_with_dynamic_check_t` and improve compilation times.
             typedef typename boost::conditional<
-                shall_we_copy_t::value,
-                boost::type_identity<boost::detail::copy_converter_impl<Target, src > >,
-                boost::conditional<
-                     shall_we_copy_with_dynamic_check_t::value,
-                     boost::detail::dynamic_num_converter_impl<Target, src >,
-                     boost::detail::lexical_converter_impl<Target, src >
-                >
-            >::type caster_type_lazy;
-
-            typedef typename caster_type_lazy::type caster_type;
+                 shall_we_copy_with_dynamic_check_t::value,
+                 boost::detail::dynamic_num_converter_impl<Target, src >,
+                 boost::detail::lexical_converter_impl<Target, src >
+            >::type caster_type;
 
             return caster_type::try_convert(arg, result);
         }
@@ -223,11 +89,5 @@ namespace boost {
 
 } // namespace boost
 
-#if defined(__clang__) || (defined(__GNUC__) && \
-    !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) && \
-    (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-#pragma GCC diagnostic pop
-#endif
-
 #endif // BOOST_LEXICAL_CAST_TRY_LEXICAL_CONVERT_HPP
 
diff --git a/inst/include/boost/locale/collator.hpp b/inst/include/boost/locale/collator.hpp
index b45f15475..693d33a6b 100644
--- a/inst/include/boost/locale/collator.hpp
+++ b/inst/include/boost/locale/collator.hpp
@@ -8,6 +8,7 @@
 #define BOOST_LOCALE_COLLATOR_HPP_INCLUDED
 
 #include <boost/locale/config.hpp>
+#include <boost/locale/detail/facet_id.hpp>
 #include <locale>
 
 #ifdef BOOST_MSVC
@@ -43,17 +44,16 @@ namespace boost { namespace locale {
 
     /// \brief Collation facet.
     ///
-    /// It reimplements standard C++ std::collate,
-    /// allowing usage of std::locale for direct string comparison
+    /// It reimplements standard C++ std::collate with support for collation levels
     template<typename CharType>
-    class collator : public std::collate<CharType> {
+    class BOOST_SYMBOL_VISIBLE collator : public std::locale::facet, public detail::facet_id<collator<CharType>> {
     public:
         /// Type of the underlying character
         typedef CharType char_type;
         /// Type of string used with this facet
         typedef std::basic_string<CharType> string_type;
 
-        /// Compare two strings in rage [b1,e1),  [b2,e2) according using a collation level \a level. Calls do_compare
+        /// Compare two strings in range [b1,e1),  [b2,e2) according to collation level \a level. Calls do_compare
         ///
         /// Returns -1 if the first of the two strings sorts before the seconds, returns 1 if sorts after and 0 if
         /// they considered equal.
@@ -66,6 +66,13 @@ namespace boost { namespace locale {
             return do_compare(level, b1, e1, b2, e2);
         }
 
+        /// Default compare function as-in std::collate that does not take collation level into account.
+        /// Uses identical level
+        int compare(const char_type* b1, const char_type* e1, const char_type* b2, const char_type* e2) const
+        {
+            return compare(collate_level::identical, b1, e1, b2, e2);
+        }
+
         /// Create a binary string that can be compared to other in order to get collation order. The string is created
         /// for text in range [b,e). It is useful for collation of multiple strings for text.
         ///
@@ -80,6 +87,13 @@ namespace boost { namespace locale {
             return do_transform(level, b, e);
         }
 
+        /// Default transform function as-in std::collate that does not take collation level into account.
+        /// Uses identical level
+        string_type transform(const char_type* b, const char_type* e) const
+        {
+            return transform(collate_level::identical, b, e);
+        }
+
         /// Calculate a hash of a text in range [b,e). The value can be used for collation sensitive string comparison.
         ///
         /// If compare(level,b1,e1,b2,e2) == 0 then hash(level,b1,e1) == hash(level,b2,e2)
@@ -87,6 +101,10 @@ namespace boost { namespace locale {
         /// Calls do_hash
         long hash(collate_level level, const char_type* b, const char_type* e) const { return do_hash(level, b, e); }
 
+        /// Default hash function as-in std::collate that does not take collation level into account.
+        /// Uses identical level
+        long hash(const char_type* b, const char_type* e) const { return hash(collate_level::identical, b, e); }
+
         /// Compare two strings \a l and \a r using collation level \a level
         ///
         /// Returns -1 if the first of the two strings sorts before the seconds, returns 1 if sorts after and 0 if
@@ -107,7 +125,7 @@ namespace boost { namespace locale {
         /// Create a binary string from string \a s, that can be compared to other, useful for collation of multiple
         /// strings.
         ///
-        /// The transformation follows these rules:
+        /// The transformation follows this rule:
         /// \code
         ///   compare(level,s1,s2) == sign( transform(level,s1).compare(transform(level,s2)) );
         /// \endcode
@@ -118,29 +136,7 @@ namespace boost { namespace locale {
 
     protected:
         /// constructor of the collator object
-        collator(size_t refs = 0) : std::collate<CharType>(refs) {}
-
-        /// This function is used to override default collation function that does not take in account collation level.
-        /// Uses primary level
-        int
-        do_compare(const char_type* b1, const char_type* e1, const char_type* b2, const char_type* e2) const override
-        {
-            return do_compare(collate_level::identical, b1, e1, b2, e2);
-        }
-
-        /// This function is used to override default collation function that does not take in account collation level.
-        /// Uses primary level
-        string_type do_transform(const char_type* b, const char_type* e) const override
-        {
-            return do_transform(collate_level::identical, b, e);
-        }
-
-        /// This function is used to override default collation function that does not take in account collation level.
-        /// Uses primary level
-        long do_hash(const char_type* b, const char_type* e) const override
-        {
-            return do_hash(collate_level::identical, b, e);
-        }
+        collator(size_t refs = 0) : std::locale::facet(refs) {}
 
         /// Actual function that performs comparison between the strings. For details see compare member function. Can
         /// be overridden.
@@ -157,7 +153,7 @@ namespace boost { namespace locale {
     };
 
     /// \brief This class can be used in STL algorithms and containers for comparison of strings
-    /// with a level other than primary
+    /// with a level other than identical
     ///
     /// For example:
     ///
@@ -169,21 +165,22 @@ namespace boost { namespace locale {
     template<typename CharType, collate_level default_level = collate_level::identical>
     struct comparator {
     public:
-        /// Create a comparator class for locale \a l and with collation leval \a level
+        /// Create a comparator class for locale \a l and with collation level \a level
         ///
         /// \throws std::bad_cast: \a l does not have \ref collator facet installed
         comparator(const std::locale& l = std::locale(), collate_level level = default_level) :
-            locale_(l), level_(level)
+            locale_(l), collator_(std::use_facet<collator<CharType>>(locale_)), level_(level)
         {}
 
         /// Compare two strings -- equivalent to return left < right according to collation rules
         bool operator()(const std::basic_string<CharType>& left, const std::basic_string<CharType>& right) const
         {
-            return std::use_facet<collator<CharType>>(locale_).compare(level_, left, right) < 0;
+            return collator_.compare(level_, left, right) < 0;
         }
 
     private:
         std::locale locale_;
+        const collator<CharType>& collator_;
         collate_level level_;
     };
 
diff --git a/inst/include/boost/locale/detail/allocator_traits.hpp b/inst/include/boost/locale/detail/allocator_traits.hpp
new file mode 100644
index 000000000..8ea225f39
--- /dev/null
+++ b/inst/include/boost/locale/detail/allocator_traits.hpp
@@ -0,0 +1,30 @@
+//
+// Copyright (c) 2024 Alexander Grund
+//
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#ifndef BOOST_LOCALE_DETAIL_ALLOCATOR_TRAITS_HPP_INCLUDED
+#define BOOST_LOCALE_DETAIL_ALLOCATOR_TRAITS_HPP_INCLUDED
+
+#include <boost/locale/config.hpp>
+#include <memory>
+#include <type_traits>
+
+/// \cond INTERNAL
+namespace boost { namespace locale { namespace conv { namespace detail {
+    template<class Alloc, typename T>
+    using rebind_alloc = typename std::allocator_traits<Alloc>::template rebind_alloc<T>;
+
+    template<class Alloc, typename T, typename Result = void>
+    using enable_if_allocator_for =
+      typename std::enable_if<std::is_same<typename Alloc::value_type, T>::value, Result>::type;
+    template<class Alloc, typename T, class Alloc2, typename T2, typename Result = void>
+    using enable_if_allocator_for2 = typename std::enable_if<std::is_same<typename Alloc::value_type, T>::value
+                                                               && std::is_same<typename Alloc2::value_type, T2>::value,
+                                                             Result>::type;
+}}}} // namespace boost::locale::conv::detail
+
+/// \endcond
+
+#endif
diff --git a/inst/include/boost/locale/detail/any_string.hpp b/inst/include/boost/locale/detail/any_string.hpp
new file mode 100644
index 000000000..c0cc7ffb3
--- /dev/null
+++ b/inst/include/boost/locale/detail/any_string.hpp
@@ -0,0 +1,71 @@
+//
+// Copyright (c) 2023 Alexander Grund
+//
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#ifndef BOOST_LOCALE_DETAIL_ANY_STRING_HPP_INCLUDED
+#define BOOST_LOCALE_DETAIL_ANY_STRING_HPP_INCLUDED
+
+#include <boost/locale/config.hpp>
+#include <boost/assert.hpp>
+#include <boost/utility/string_view.hpp>
+#include <memory>
+#include <stdexcept>
+#include <string>
+
+/// \cond INTERNAL
+namespace boost { namespace locale { namespace detail {
+    /// Type-erased std::basic_string
+    class any_string {
+        struct BOOST_SYMBOL_VISIBLE base {
+            virtual ~base() = default;
+            virtual base* clone() const = 0;
+
+        protected:
+            base() = default;
+            base(const base&) = default;
+            base(base&&) = delete;
+            base& operator=(const base&) = default;
+            base& operator=(base&&) = delete;
+        };
+        template<typename Char>
+        struct BOOST_SYMBOL_VISIBLE impl : base {
+            explicit impl(const boost::basic_string_view<Char> value) : s(value) {}
+            impl* clone() const override { return new impl(*this); }
+            std::basic_string<Char> s;
+        };
+
+        std::unique_ptr<const base> s_;
+
+    public:
+        any_string() = default;
+        any_string(const any_string& other) : s_(other.s_ ? other.s_->clone() : nullptr) {}
+        any_string(any_string&&) = default;
+        any_string& operator=(any_string other) // Covers the copy and move assignment
+        {
+            s_.swap(other.s_);
+            return *this;
+        }
+
+        template<typename Char>
+        void set(const boost::basic_string_view<Char> s)
+        {
+            BOOST_ASSERT(!s.empty());
+            s_.reset(new impl<Char>(s));
+        }
+
+        template<typename Char>
+        std::basic_string<Char> get() const
+        {
+            if(!s_)
+                throw std::bad_cast();
+            return dynamic_cast<const impl<Char>&>(*s_).s;
+        }
+    };
+
+}}} // namespace boost::locale::detail
+
+/// \endcond
+
+#endif
diff --git a/inst/include/boost/locale/detail/facet_id.hpp b/inst/include/boost/locale/detail/facet_id.hpp
index 14ab45839..06bbea9df 100644
--- a/inst/include/boost/locale/detail/facet_id.hpp
+++ b/inst/include/boost/locale/detail/facet_id.hpp
@@ -14,7 +14,7 @@
 namespace boost { namespace locale { namespace detail {
 #if BOOST_CLANG_VERSION >= 40900
 #    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wundefined-var-template"
+//#    pragma clang diagnostic ignored "-Wundefined-var-template"
 #endif
     /// CRTP base class to hold the id required for facets
     ///
diff --git a/inst/include/boost/locale/encoding_utf.hpp b/inst/include/boost/locale/encoding_utf.hpp
index c19e67d3b..592b0f368 100644
--- a/inst/include/boost/locale/encoding_utf.hpp
+++ b/inst/include/boost/locale/encoding_utf.hpp
@@ -1,5 +1,6 @@
 //
 // Copyright (c) 2009-2011 Artyom Beilis (Tonkikh)
+// Copyright (c) 2022-2024 Alexander Grund
 //
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
@@ -7,10 +8,13 @@
 #ifndef BOOST_LOCALE_ENCODING_UTF_HPP_INCLUDED
 #define BOOST_LOCALE_ENCODING_UTF_HPP_INCLUDED
 
+#include <boost/locale/detail/allocator_traits.hpp>
 #include <boost/locale/encoding_errors.hpp>
 #include <boost/locale/utf.hpp>
 #include <boost/locale/util/string.hpp>
 #include <iterator>
+#include <memory>
+#include <type_traits>
 
 #ifdef BOOST_MSVC
 #    pragma warning(push)
@@ -25,12 +29,13 @@ namespace boost { namespace locale { namespace conv {
     /// Convert a Unicode text in range [begin,end) to other Unicode encoding
     ///
     /// \throws conversion_error: Conversion failed (e.g. \a how is \c stop and any character cannot be decoded)
-    template<typename CharOut, typename CharIn>
-    std::basic_string<CharOut> utf_to_utf(const CharIn* begin, const CharIn* end, method_type how = default_method)
+    template<typename CharOut, typename CharIn, class Alloc = std::allocator<CharOut>>
+    std::basic_string<CharOut, std::char_traits<CharOut>, Alloc>
+    utf_to_utf(const CharIn* begin, const CharIn* end, method_type how = default_method, const Alloc& alloc = Alloc())
     {
-        std::basic_string<CharOut> result;
+        std::basic_string<CharOut, std::char_traits<CharOut>, Alloc> result(alloc);
         result.reserve(end - begin);
-        std::back_insert_iterator<std::basic_string<CharOut>> inserter(result);
+        auto inserter = std::back_inserter(result);
         while(begin != end) {
             const utf::code_point c = utf::utf_traits<CharIn>::decode(begin, end);
             if(c == utf::illegal || c == utf::incomplete) {
@@ -42,22 +47,97 @@ namespace boost { namespace locale { namespace conv {
         return result;
     }
 
-    /// Convert a Unicode NULL terminated string \a str other Unicode encoding
+    /// Convert a Unicode string \a str to other Unicode encoding.
+    /// Invalid characters are skipped.
+    template<typename CharOut, typename CharIn, class Alloc>
+    std::basic_string<CharOut, std::char_traits<CharOut>, Alloc>
+    utf_to_utf(const CharIn* begin, const CharIn* end, const Alloc& alloc)
+    {
+        return utf_to_utf<CharOut>(begin, end, skip, alloc);
+    }
+
+    /// Convert a Unicode NULL terminated string \a str to other Unicode encoding
+    ///
+    /// \throws conversion_error: Conversion failed (e.g. \a how is \c stop and any character cannot be decoded)
+    template<typename CharOut, typename CharIn, class Alloc = std::allocator<CharOut>>
+    std::basic_string<CharOut, std::char_traits<CharOut>, Alloc>
+    utf_to_utf(const CharIn* str, method_type how = default_method, const Alloc& alloc = Alloc())
+    {
+        return utf_to_utf<CharOut>(str, util::str_end(str), how, alloc);
+    }
+
+    /// Convert a Unicode string \a str to other Unicode encoding.
+    /// Invalid characters are skipped.
+    template<typename CharOut, typename CharIn, class Alloc>
+#ifndef BOOST_LOCALE_DOXYGEN
+    detail::enable_if_allocator_for<Alloc,
+                                    CharOut,
+#endif
+                                    std::basic_string<CharOut, std::char_traits<CharOut>, Alloc>
+#ifndef BOOST_LOCALE_DOXYGEN
+                                    >
+#endif
+    utf_to_utf(const CharIn* str, const Alloc& alloc)
+    {
+        return utf_to_utf<CharOut>(str, skip, alloc);
+    }
+
+    /// Convert a Unicode string \a str to other Unicode encoding
     ///
     /// \throws conversion_error: Conversion failed (e.g. \a how is \c stop and any character cannot be decoded)
-    template<typename CharOut, typename CharIn>
-    std::basic_string<CharOut> utf_to_utf(const CharIn* str, method_type how = default_method)
+    template<typename CharOut, typename CharIn, class Alloc>
+#ifndef BOOST_LOCALE_DOXYGEN
+    detail::enable_if_allocator_for<
+      Alloc,
+      CharIn,
+#endif
+      std::basic_string<CharOut, std::char_traits<CharOut>, detail::rebind_alloc<Alloc, CharOut>>
+#ifndef BOOST_LOCALE_DOXYGEN
+      >
+#endif
+    utf_to_utf(const std::basic_string<CharIn, std::char_traits<CharIn>, Alloc>& str, method_type how = default_method)
     {
-        return utf_to_utf<CharOut, CharIn>(str, util::str_end(str), how);
+        return utf_to_utf<CharOut>(str.c_str(),
+                                   str.c_str() + str.size(),
+                                   how,
+                                   detail::rebind_alloc<Alloc, CharOut>(str.get_allocator()));
     }
 
-    /// Convert a Unicode string \a str other Unicode encoding
+    /// Convert a Unicode string \a str to other Unicode encoding
     ///
     /// \throws conversion_error: Conversion failed (e.g. \a how is \c stop and any character cannot be decoded)
-    template<typename CharOut, typename CharIn>
-    std::basic_string<CharOut> utf_to_utf(const std::basic_string<CharIn>& str, method_type how = default_method)
+    template<typename CharOut, typename CharIn, class AllocOut, class AllocIn>
+#ifndef BOOST_LOCALE_DOXYGEN
+    detail::enable_if_allocator_for<AllocIn,
+                                    CharIn,
+#endif
+                                    std::basic_string<CharOut, std::char_traits<CharOut>, AllocOut>
+#ifndef BOOST_LOCALE_DOXYGEN
+                                    >
+#endif
+    utf_to_utf(const std::basic_string<CharIn, std::char_traits<CharIn>, AllocIn>& str,
+               method_type how = default_method,
+               const AllocOut& alloc = AllocOut())
+    {
+        return utf_to_utf<CharOut>(str.c_str(), str.c_str() + str.size(), how, alloc);
+    }
+
+    /// Convert a Unicode string \a str to other Unicode encoding.
+    /// Invalid characters are skipped.
+    template<typename CharOut, typename CharIn, class AllocOut, class AllocIn>
+#ifndef BOOST_LOCALE_DOXYGEN
+    detail::enable_if_allocator_for2<AllocIn,
+                                     CharIn,
+                                     AllocOut,
+                                     CharOut,
+#endif
+                                     std::basic_string<CharOut, std::char_traits<CharOut>, AllocOut>
+#ifndef BOOST_LOCALE_DOXYGEN
+                                     >
+#endif
+    utf_to_utf(const std::basic_string<CharIn, std::char_traits<CharIn>, AllocIn>& str, const AllocOut& alloc)
     {
-        return utf_to_utf<CharOut, CharIn>(str.c_str(), str.c_str() + str.size(), how);
+        return utf_to_utf<CharOut>(str, skip, alloc);
     }
 
     /// @}
diff --git a/inst/include/boost/locale/formatting.hpp b/inst/include/boost/locale/formatting.hpp
index d14e6f69d..e3c8619e4 100644
--- a/inst/include/boost/locale/formatting.hpp
+++ b/inst/include/boost/locale/formatting.hpp
@@ -8,15 +8,13 @@
 #ifndef BOOST_LOCALE_FORMATTING_HPP_INCLUDED
 #define BOOST_LOCALE_FORMATTING_HPP_INCLUDED
 
+#include <boost/locale/detail/any_string.hpp>
 #include <boost/locale/time_zone.hpp>
-#include <boost/assert.hpp>
-#include <boost/utility/string_view.hpp>
 #include <cstdint>
 #include <cstring>
 #include <istream>
 #include <ostream>
 #include <string>
-#include <typeinfo>
 
 #ifdef BOOST_MSVC
 #    pragma warning(push)
@@ -130,13 +128,13 @@ namespace boost { namespace locale {
         template<typename CharType>
         void date_time_pattern(const std::basic_string<CharType>& str)
         {
-            date_time_pattern_set().set<CharType>(str);
+            datetime_.set<CharType>(str);
         }
         /// Get date/time pattern (strftime like)
         template<typename CharType>
         std::basic_string<CharType> date_time_pattern() const
         {
-            return date_time_pattern_set().get<CharType>();
+            return datetime_.get<CharType>();
         }
 
         /// \cond INTERNAL
@@ -144,51 +142,10 @@ namespace boost { namespace locale {
         /// \endcond
 
     private:
-        class string_set;
-
-        const string_set& date_time_pattern_set() const;
-        string_set& date_time_pattern_set();
-
-        class BOOST_LOCALE_DECL string_set {
-        public:
-            string_set();
-            ~string_set();
-            string_set(const string_set& other);
-            string_set& operator=(string_set other);
-            void swap(string_set& other);
-
-            template<typename Char>
-            void set(const boost::basic_string_view<Char> s)
-            {
-                BOOST_ASSERT(!s.empty());
-                delete[] ptr;
-                ptr = nullptr;
-                type = &typeid(Char);
-                size = sizeof(Char) * s.size();
-                ptr = size ? new char[size] : nullptr;
-                memcpy(ptr, s.data(), size);
-            }
-
-            template<typename Char>
-            std::basic_string<Char> get() const
-            {
-                if(type == nullptr || *type != typeid(Char))
-                    throw std::bad_cast();
-                std::basic_string<Char> result(size / sizeof(Char), Char(0));
-                memcpy(&result.front(), ptr, size);
-                return result;
-            }
-
-        private:
-            const std::type_info* type;
-            size_t size;
-            char* ptr;
-        };
-
         uint64_t flags_;
         int domain_id_;
         std::string time_zone_;
-        string_set datetime_;
+        detail::any_string datetime_;
     };
 
     /// \brief This namespace includes all manipulators that can be used on IO streams
diff --git a/inst/include/boost/math/bindings/mpfr.hpp b/inst/include/boost/math/bindings/mpfr.hpp
index ceb1f7579..711daded7 100644
--- a/inst/include/boost/math/bindings/mpfr.hpp
+++ b/inst/include/boost/math/bindings/mpfr.hpp
@@ -304,8 +304,8 @@ inline int digits<mpfr_class>(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(mpfr_class)
 
 namespace detail{
 
-template<class I>
-void convert_to_long_result(mpfr_class const& r, I& result)
+template<class Integer>
+void convert_to_long_result(mpfr_class const& r, Integer& result)
 {
    result = 0;
    I last_result(0);
diff --git a/inst/include/boost/math/bindings/mpreal.hpp b/inst/include/boost/math/bindings/mpreal.hpp
index e8b6c4036..327155011 100644
--- a/inst/include/boost/math/bindings/mpreal.hpp
+++ b/inst/include/boost/math/bindings/mpreal.hpp
@@ -264,8 +264,8 @@ inline int digits<mpfr::mpreal>(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(mpfr::mpr
 
 namespace detail{
 
-template<class I>
-void convert_to_long_result(mpfr::mpreal const& r, I& result)
+template<class Integer
+void convert_to_long_result(mpfr::mpreal const& r, Integer& result)
 {
    result = 0;
    I last_result(0);
diff --git a/inst/include/boost/math/bindings/rr.hpp b/inst/include/boost/math/bindings/rr.hpp
index 6197560c0..6cd73b838 100644
--- a/inst/include/boost/math/bindings/rr.hpp
+++ b/inst/include/boost/math/bindings/rr.hpp
@@ -514,8 +514,8 @@ inline double real_cast<double, boost::math::ntl::RR>(boost::math::ntl::RR t)
 
 namespace detail{
 
-template<class I>
-void convert_to_long_result(NTL::RR const& r, I& result)
+template<class Integer>
+void convert_to_long_result(NTL::RR const& r, Integer& result)
 {
    result = 0;
    I last_result(0);
diff --git a/inst/include/boost/math/ccmath/copysign.hpp b/inst/include/boost/math/ccmath/copysign.hpp
index 90a58102b..e117e57fa 100644
--- a/inst/include/boost/math/ccmath/copysign.hpp
+++ b/inst/include/boost/math/ccmath/copysign.hpp
@@ -54,7 +54,7 @@ constexpr auto copysign(T1 mag, T2 sgn) noexcept
 {
     if (BOOST_MATH_IS_CONSTANT_EVALUATED(mag))
     {        
-        using promoted_type = boost::math::tools::promote_args_2_t<T1, T2>;
+        using promoted_type = boost::math::tools::promote_args_t<T1, T2>;
         return boost::math::ccmath::copysign(static_cast<promoted_type>(mag), static_cast<promoted_type>(sgn));
     }
     else
diff --git a/inst/include/boost/math/ccmath/detail/config.hpp b/inst/include/boost/math/ccmath/detail/config.hpp
index 61405e781..097d69a16 100644
--- a/inst/include/boost/math/ccmath/detail/config.hpp
+++ b/inst/include/boost/math/ccmath/detail/config.hpp
@@ -17,7 +17,7 @@
 #ifndef BOOST_MATH_STANDALONE
 
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #  define BOOST_MATH_NO_CCMATH
 #endif
 
@@ -43,7 +43,7 @@
 //
 // Don't check here for msvc as they didn't get std lib configuration macros at the same time as C++17 <type_traits>
 //
-#if (__cpp_lib_bool_constant < 201505L) && !defined(BOOST_MATH_NO_CCMATH)
+#if (defined(__cpp_lib_bool_constant) && __cpp_lib_bool_constant < 201505L) && !defined(BOOST_MATH_NO_CCMATH)
 #  define BOOST_MATH_NO_CCMATH
 #endif
 #endif
diff --git a/inst/include/boost/math/ccmath/fdim.hpp b/inst/include/boost/math/ccmath/fdim.hpp
index cdcbc223c..d6b4e25ce 100644
--- a/inst/include/boost/math/ccmath/fdim.hpp
+++ b/inst/include/boost/math/ccmath/fdim.hpp
@@ -66,7 +66,7 @@ constexpr auto fdim(T1 x, T2 y) noexcept
 {
     if (BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
-        using promoted_type = boost::math::tools::promote_args_2_t<T1, T2>;
+        using promoted_type = boost::math::tools::promote_args_t<T1, T2>;
         return boost::math::ccmath::fdim(promoted_type(x), promoted_type(y));
     }
     else
diff --git a/inst/include/boost/math/ccmath/floor.hpp b/inst/include/boost/math/ccmath/floor.hpp
index fa071e24b..fb1dea34d 100644
--- a/inst/include/boost/math/ccmath/floor.hpp
+++ b/inst/include/boost/math/ccmath/floor.hpp
@@ -15,6 +15,7 @@
 #include <boost/math/ccmath/abs.hpp>
 #include <boost/math/ccmath/isinf.hpp>
 #include <boost/math/ccmath/isnan.hpp>
+#include <limits>
 
 namespace boost::math::ccmath {
 
@@ -23,6 +24,13 @@ namespace detail {
 template <typename T>
 inline constexpr T floor_pos_impl(T arg) noexcept
 {
+    constexpr auto max_comp_val = T(1) / std::numeric_limits<T>::epsilon();
+
+    if (arg >= max_comp_val)
+    {
+        return arg;
+    }
+
     T result = 1;
 
     if(result < arg)
diff --git a/inst/include/boost/math/ccmath/fmax.hpp b/inst/include/boost/math/ccmath/fmax.hpp
index 237355275..8a0d17d03 100644
--- a/inst/include/boost/math/ccmath/fmax.hpp
+++ b/inst/include/boost/math/ccmath/fmax.hpp
@@ -62,7 +62,7 @@ constexpr auto fmax(T1 x, T2 y) noexcept
 {
     if (BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
-        using promoted_type = boost::math::tools::promote_args_2_t<T1, T2>;
+        using promoted_type = boost::math::tools::promote_args_t<T1, T2>;
         return boost::math::ccmath::fmax(static_cast<promoted_type>(x), static_cast<promoted_type>(y));
     }
     else
diff --git a/inst/include/boost/math/ccmath/fmin.hpp b/inst/include/boost/math/ccmath/fmin.hpp
index 4d0dc229e..29885b69c 100644
--- a/inst/include/boost/math/ccmath/fmin.hpp
+++ b/inst/include/boost/math/ccmath/fmin.hpp
@@ -62,7 +62,7 @@ constexpr auto fmin(T1 x, T2 y) noexcept
 {
     if (BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
-        using promoted_type = boost::math::tools::promote_args_2_t<T1, T2>;
+        using promoted_type = boost::math::tools::promote_args_t<T1, T2>;
         return boost::math::ccmath::fmin(static_cast<promoted_type>(x), static_cast<promoted_type>(y));
     }
     else
@@ -72,13 +72,13 @@ constexpr auto fmin(T1 x, T2 y) noexcept
     }
 }
 
-float fminf(float x, float y) noexcept
+constexpr float fminf(float x, float y) noexcept
 {
     return boost::math::ccmath::fmin(x, y);
 }
 
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
-long double fminl(long double x, long double y) noexcept
+constexpr long double fminl(long double x, long double y) noexcept
 {
     return boost::math::ccmath::fmin(x, y);
 }
diff --git a/inst/include/boost/math/ccmath/fpclassify.hpp b/inst/include/boost/math/ccmath/fpclassify.hpp
index 3201f41c3..ce0728a27 100644
--- a/inst/include/boost/math/ccmath/fpclassify.hpp
+++ b/inst/include/boost/math/ccmath/fpclassify.hpp
@@ -21,7 +21,7 @@
 namespace boost::math::ccmath {
 
 template <typename T, std::enable_if_t<!std::is_integral_v<T>, bool> = true>
-inline constexpr int fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
+inline constexpr int fpclassify BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
diff --git a/inst/include/boost/math/ccmath/hypot.hpp b/inst/include/boost/math/ccmath/hypot.hpp
index 4e0e245b4..34dd5ab2c 100644
--- a/inst/include/boost/math/ccmath/hypot.hpp
+++ b/inst/include/boost/math/ccmath/hypot.hpp
@@ -89,7 +89,7 @@ constexpr auto hypot(T1 x, T2 y) noexcept
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
-        using promoted_type = boost::math::tools::promote_args_2_t<T1, T2>;
+        using promoted_type = boost::math::tools::promote_args_t<T1, T2>;
         return boost::math::ccmath::hypot(static_cast<promoted_type>(x), static_cast<promoted_type>(y));
     }
     else
diff --git a/inst/include/boost/math/ccmath/isinf.hpp b/inst/include/boost/math/ccmath/isinf.hpp
index dfbd1f00a..1e8684176 100644
--- a/inst/include/boost/math/ccmath/isinf.hpp
+++ b/inst/include/boost/math/ccmath/isinf.hpp
@@ -16,13 +16,20 @@
 namespace boost::math::ccmath {
 
 template <typename T>
-constexpr bool isinf BOOST_PREVENT_MACRO_SUBSTITUTION(T x) noexcept
+constexpr bool isinf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x) noexcept
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
         if constexpr (std::numeric_limits<T>::is_signed)
         {
+#if defined(__clang_major__) && __clang_major__ >= 6
+#pragma clang diagnostic push
+//#pragma clang diagnostic ignored "-Wtautological-constant-compare"
+#endif
             return x == std::numeric_limits<T>::infinity() || -x == std::numeric_limits<T>::infinity();
+#if defined(__clang_major__) && __clang_major__ >= 6
+#pragma clang diagnostic pop
+#endif
         }
         else
         {
@@ -32,7 +39,7 @@ constexpr bool isinf BOOST_PREVENT_MACRO_SUBSTITUTION(T x) noexcept
     else
     {
         using boost::math::isinf;
-        
+
         if constexpr (!std::is_integral_v<T>)
         {
             return (isinf)(x);
diff --git a/inst/include/boost/math/ccmath/isnan.hpp b/inst/include/boost/math/ccmath/isnan.hpp
index 504fa90d2..753f2079b 100644
--- a/inst/include/boost/math/ccmath/isnan.hpp
+++ b/inst/include/boost/math/ccmath/isnan.hpp
@@ -16,7 +16,7 @@
 namespace boost::math::ccmath {
 
 template <typename T>
-inline constexpr bool isnan BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
+inline constexpr bool isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
diff --git a/inst/include/boost/math/concepts/distributions.hpp b/inst/include/boost/math/concepts/distributions.hpp
index 538bbe702..7f9af2dd5 100644
--- a/inst/include/boost/math/concepts/distributions.hpp
+++ b/inst/include/boost/math/concepts/distributions.hpp
@@ -343,7 +343,7 @@ struct DistributionConcept
    template <class R, class P>
    static void test_extra_members(const boost::math::hypergeometric_distribution<R, P>& d)
    {
-      unsigned u = d.defective();
+      std::uint64_t u = d.defective();
       u = d.sample_count();
       u = d.total();
       suppress_unused_variable_warning(u);
diff --git a/inst/include/boost/math/concepts/std_real_concept.hpp b/inst/include/boost/math/concepts/std_real_concept.hpp
index 277c35caf..43f562efe 100644
--- a/inst/include/boost/math/concepts/std_real_concept.hpp
+++ b/inst/include/boost/math/concepts/std_real_concept.hpp
@@ -90,6 +90,9 @@ class std_real_concept
    std_real_concept& operator=(float c) { m_value = c; return *this; }
    std_real_concept& operator=(double c) { m_value = c; return *this; }
    std_real_concept& operator=(long double c) { m_value = c; return *this; }
+#ifdef BOOST_MATH_USE_FLOAT128
+   std_real_concept& operator=(BOOST_MATH_FLOAT128_TYPE c) { m_value = c; return *this; }
+#endif
 
    // Access:
    std_real_concept_base_type value()const{ return m_value; }
@@ -226,19 +229,22 @@ inline boost::math::concepts::std_real_concept (nextafter)(boost::math::concepts
 { return (boost::math::nextafter)(a, b); }
 //
 // C++11 ism's
-// Note that these must not actually call the std:: versions as that precludes using this
-// header to test in C++03 mode, call the Boost versions instead:
+// Now that we only support C++11 and later, we can allow use of these:
 //
 inline boost::math::concepts::std_real_concept asinh(boost::math::concepts::std_real_concept a)
-{ return boost::math::asinh(a.value(), boost::math::policies::make_policy(boost::math::policies::overflow_error<boost::math::policies::ignore_error>())); }
+{ return std::asinh(a.value()); }
 inline boost::math::concepts::std_real_concept acosh(boost::math::concepts::std_real_concept a)
-{ return boost::math::acosh(a.value(), boost::math::policies::make_policy(boost::math::policies::overflow_error<boost::math::policies::ignore_error>())); }
+{ return std::acosh(a.value()); }
 inline boost::math::concepts::std_real_concept atanh(boost::math::concepts::std_real_concept a)
-{ return boost::math::atanh(a.value(), boost::math::policies::make_policy(boost::math::policies::overflow_error<boost::math::policies::ignore_error>())); }
+{ return std::atanh(a.value()); }
 inline bool (isfinite)(boost::math::concepts::std_real_concept a)
 {
    return (boost::math::isfinite)(a.value());
 }
+inline boost::math::concepts::std_real_concept log2(boost::math::concepts::std_real_concept a)
+{ return std::log2(a.value()); }
+inline int ilogb(boost::math::concepts::std_real_concept a)
+{ return std::ilogb(a.value()); }
 
 
 } // namespace std
diff --git a/inst/include/boost/math/constants/constants.hpp b/inst/include/boost/math/constants/constants.hpp
index 730256c66..df702bf89 100644
--- a/inst/include/boost/math/constants/constants.hpp
+++ b/inst/include/boost/math/constants/constants.hpp
@@ -1,5 +1,6 @@
 //  Copyright John Maddock 2005-2006, 2011.
 //  Copyright Paul A. Bristow 2006-2011.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -8,6 +9,9 @@
 #define BOOST_MATH_CONSTANTS_CONSTANTS_INCLUDED
 
 #include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/tools/cxx03_warn.hpp>
 #include <boost/math/policies/policy.hpp>
 #include <boost/math/tools/precision.hpp>
@@ -94,10 +98,10 @@ namespace boost{ namespace math
       >;
    };
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #define BOOST_MATH_CONSTANT_THREAD_HELPER(name, prefix) \
       boost::once_flag f = BOOST_ONCE_INIT;\
-      boost::call_once(f, &BOOST_JOIN(BOOST_JOIN(string_, get_), name)<T>);
+      boost::call_once(f, &BOOST_MATH_JOIN(BOOST_MATH_JOIN(string_, get_), name)<T>);
 #else
 #define BOOST_MATH_CONSTANT_THREAD_HELPER(name, prefix)
 #endif
@@ -162,20 +166,20 @@ namespace boost{ namespace math
 #ifdef BOOST_MATH_USE_FLOAT128
 #  define BOOST_MATH_FLOAT128_CONSTANT_OVERLOAD(x) \
    static inline constexpr T get(const std::integral_constant<int, construct_from_float128>&) noexcept\
-   { return BOOST_JOIN(x, Q); }
+   { return BOOST_MATH_JOIN(x, Q); }
 #else
 #  define BOOST_MATH_FLOAT128_CONSTANT_OVERLOAD(x)
 #endif
 
-#ifdef BOOST_NO_CXX11_THREAD_LOCAL
-#  define BOOST_MATH_PRECOMPUTE_IF_NOT_LOCAL(constant_, name)       constant_initializer<T, & BOOST_JOIN(constant_, name)<T>::get_from_variable_precision>::force_instantiate();
+#ifdef BOOST_MATH_NO_CXX11_THREAD_LOCAL
+#  define BOOST_MATH_PRECOMPUTE_IF_NOT_LOCAL(constant_, name)       constant_initializer<T, & BOOST_MATH_JOIN(constant_, name)<T>::get_from_variable_precision>::force_instantiate();
 #else
 #  define BOOST_MATH_PRECOMPUTE_IF_NOT_LOCAL(constant_, name)
 #endif
 
 #define BOOST_DEFINE_MATH_CONSTANT(name, x, y)\
    namespace detail{\
-   template <typename T> struct BOOST_JOIN(constant_, name){\
+   template <typename T> struct BOOST_MATH_JOIN(constant_, name){\
    private:\
    /* The default implementations come next: */ \
    static inline const T& get_from_string()\
@@ -206,19 +210,19 @@ namespace boost{ namespace math
    public:\
    static inline const T& get(const std::integral_constant<int, construct_from_string>&)\
    {\
-      constant_initializer<T, & BOOST_JOIN(constant_, name)<T>::get_from_string >::force_instantiate();\
+      constant_initializer<T, & BOOST_MATH_JOIN(constant_, name)<T>::get_from_string >::force_instantiate();\
       return get_from_string();\
    }\
-   static inline constexpr T get(const std::integral_constant<int, construct_from_float>) noexcept\
-   { return BOOST_JOIN(x, F); }\
-   static inline constexpr T get(const std::integral_constant<int, construct_from_double>&) noexcept\
+   BOOST_MATH_GPU_ENABLED static inline constexpr T get(const std::integral_constant<int, construct_from_float>) noexcept\
+   { return BOOST_MATH_JOIN(x, F); }\
+   BOOST_MATH_GPU_ENABLED static inline constexpr T get(const std::integral_constant<int, construct_from_double>&) noexcept\
    { return x; }\
-   static inline constexpr T get(const std::integral_constant<int, construct_from_long_double>&) noexcept\
-   { return BOOST_JOIN(x, L); }\
+   BOOST_MATH_GPU_ENABLED static inline constexpr T get(const std::integral_constant<int, construct_from_long_double>&) noexcept\
+   { return BOOST_MATH_JOIN(x, L); }\
    BOOST_MATH_FLOAT128_CONSTANT_OVERLOAD(x) \
    template <int N> static inline const T& get(const std::integral_constant<int, N>&)\
    {\
-      constant_initializer2<T, N, & BOOST_JOIN(constant_, name)<T>::template get_from_compute<N> >::force_instantiate();\
+      constant_initializer2<T, N, & BOOST_MATH_JOIN(constant_, name)<T>::template get_from_compute<N> >::force_instantiate();\
       return get_from_compute<N>(); \
    }\
    /* This one is for true arbitrary precision, which may well vary at runtime: */ \
@@ -231,18 +235,28 @@ namespace boost{ namespace math
    \
    \
    /* The actual forwarding function: */ \
-   template <typename T, typename Policy> inline constexpr typename detail::constant_return<T, Policy>::type name(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T) BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(Policy)) BOOST_MATH_NOEXCEPT(T)\
-   { return detail:: BOOST_JOIN(constant_, name)<T>::get(typename construction_traits<T, Policy>::type()); }\
-   template <typename T> inline constexpr typename detail::constant_return<T>::type name(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T)) BOOST_MATH_NOEXCEPT(T)\
+   template <typename T, typename Policy> BOOST_MATH_GPU_ENABLED inline constexpr typename detail::constant_return<T, Policy>::type name(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T) BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(Policy)) BOOST_MATH_NOEXCEPT(T)\
+   { return detail:: BOOST_MATH_JOIN(constant_, name)<T>::get(typename construction_traits<T, Policy>::type()); }\
+   template <typename T> BOOST_MATH_GPU_ENABLED inline constexpr typename detail::constant_return<T>::type name(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T)) BOOST_MATH_NOEXCEPT(T)\
    { return name<T, boost::math::policies::policy<> >(); }\
    \
    \
    /* Now the namespace specific versions: */ \
-   } namespace float_constants{ static constexpr float name = BOOST_JOIN(x, F); }\
+   } namespace float_constants{ static constexpr float name = BOOST_MATH_JOIN(x, F); }\
    namespace double_constants{ static constexpr double name = x; } \
-   namespace long_double_constants{ static constexpr long double name = BOOST_JOIN(x, L); }\
+   namespace long_double_constants{ static constexpr long double name = BOOST_MATH_JOIN(x, L); }\
    namespace constants{
 
+#else // NVRTC simplified macro definition
+
+#define BOOST_DEFINE_MATH_CONSTANT(name, value, str_value) template <typename T> BOOST_MATH_GPU_ENABLED constexpr T name() noexcept { return static_cast<T>(value); }
+
+namespace boost {
+namespace math {
+namespace constants {
+
+#endif
+
   BOOST_DEFINE_MATH_CONSTANT(half, 5.000000000000000000000000000000000000e-01, "5.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e-01")
   BOOST_DEFINE_MATH_CONSTANT(third, 3.333333333333333333333333333333333333e-01, "3.33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333e-01")
   BOOST_DEFINE_MATH_CONSTANT(twothirds, 6.666666666666666666666666666666666666e-01, "6.66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666667e-01")
@@ -318,17 +332,15 @@ namespace boost{ namespace math
   BOOST_DEFINE_MATH_CONSTANT(one_div_pi, 0.3183098861837906715377675267450287240689192, "0.31830988618379067153776752674502872406891929148091289749533468811779359526845307018022760553250617191214568545351")
   BOOST_DEFINE_MATH_CONSTANT(two_div_root_pi, 1.12837916709551257389615890312154517168810125, "1.12837916709551257389615890312154517168810125865799771368817144342128493688298682897348732040421472688605669581272")
 
-#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
   BOOST_DEFINE_MATH_CONSTANT(first_feigenbaum, 4.66920160910299067185320382046620161725818557747576863274,  "4.6692016091029906718532038204662016172581855774757686327456513430041343302113147371386897440239480138171")
   BOOST_DEFINE_MATH_CONSTANT(plastic, 1.324717957244746025960908854478097340734404056901733364534, "1.32471795724474602596090885447809734073440405690173336453401505030282785124554759405469934798178728032991")
   BOOST_DEFINE_MATH_CONSTANT(gauss, 0.834626841674073186281429732799046808993993013490347002449, "0.83462684167407318628142973279904680899399301349034700244982737010368199270952641186969116035127532412906785")
   BOOST_DEFINE_MATH_CONSTANT(dottie, 0.739085133215160641655312087673873404013411758900757464965, "0.739085133215160641655312087673873404013411758900757464965680635773284654883547594599376106931766531849801246")
   BOOST_DEFINE_MATH_CONSTANT(reciprocal_fibonacci, 3.35988566624317755317201130291892717968890513, "3.35988566624317755317201130291892717968890513373196848649555381532513031899668338361541621645679008729704")
   BOOST_DEFINE_MATH_CONSTANT(laplace_limit, 0.662743419349181580974742097109252907056233549115022417, "0.66274341934918158097474209710925290705623354911502241752039253499097185308651127724965480259895818168")
-#endif
 
 template <typename T>
-inline constexpr T tau() {  return two_pi<T>(); }
+BOOST_MATH_GPU_ENABLED inline constexpr T tau() {  return two_pi<T>(); }
 
 } // namespace constants
 } // namespace math
@@ -338,7 +350,11 @@ inline constexpr T tau() {  return two_pi<T>(); }
 // We deliberately include this *after* all the declarations above,
 // that way the calculation routines can call on other constants above:
 //
+// NVRTC will not have a type that needs runtime calculation
+//
+#ifndef BOOST_MATH_HAS_NVRTC
 #include <boost/math/constants/calculate_constants.hpp>
+#endif
 
 #endif // BOOST_MATH_CONSTANTS_CONSTANTS_INCLUDED
 
diff --git a/inst/include/boost/math/cstdfloat/cstdfloat_cmath.hpp b/inst/include/boost/math/cstdfloat/cstdfloat_cmath.hpp
index 515f3052a..47ac751b6 100644
--- a/inst/include/boost/math/cstdfloat/cstdfloat_cmath.hpp
+++ b/inst/include/boost/math/cstdfloat/cstdfloat_cmath.hpp
@@ -703,9 +703,9 @@ namespace boost {
             inline boost::math::cstdfloat::detail::float_internal128_t  logb(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_LOGB(x); }
             inline boost::math::cstdfloat::detail::float_internal128_t  nextafter(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y) { return ::BOOST_CSTDFLOAT_FLOAT128_NEXTAFTER(x, y); }
             inline boost::math::cstdfloat::detail::float_internal128_t  nexttoward(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y) { return -(::BOOST_CSTDFLOAT_FLOAT128_NEXTAFTER(-x, -y)); }
-            inline boost::math::cstdfloat::detail::float_internal128_t  copysign   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y) { return ::BOOST_CSTDFLOAT_FLOAT128_COPYSIGN(x, y); }
-            inline bool                                                 signbit   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_SIGNBIT(x); }
-            inline int                                                  fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x)
+            inline boost::math::cstdfloat::detail::float_internal128_t  copysign   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y) { return ::BOOST_CSTDFLOAT_FLOAT128_COPYSIGN(x, y); }
+            inline bool                                                 signbit   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_SIGNBIT(x); }
+            inline int                                                  fpclassify BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x)
             {
                if (::BOOST_CSTDFLOAT_FLOAT128_ISNAN(x))
                   return FP_NAN;
@@ -719,16 +719,16 @@ namespace boost {
                else
                   return FP_NORMAL;
             }
-            inline bool                                      isfinite   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x)
+            inline bool                                      isfinite   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x)
             {
                return !::BOOST_CSTDFLOAT_FLOAT128_ISNAN(x) && !::BOOST_CSTDFLOAT_FLOAT128_ISINF(x);
             }
-            inline bool                                      isinf      BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_ISINF(x); }
-            inline bool                                      isnan      BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_ISNAN(x); }
-            inline bool                                      isnormal   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return boost::math::cstdfloat::detail::fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION(x) == FP_NORMAL; }
-            inline bool                                      isgreater      BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
+            inline bool                                      isinf      BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_ISINF(x); }
+            inline bool                                      isnan      BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return ::BOOST_CSTDFLOAT_FLOAT128_ISNAN(x); }
+            inline bool                                      isnormal   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x) { return boost::math::cstdfloat::detail::fpclassify BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x) == FP_NORMAL; }
+            inline bool                                      isgreater      BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
             {
-               if (isnan BOOST_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_PREVENT_MACRO_SUBSTITUTION(y))
+               if (isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(y))
                   return false;
                return x > y;
             }
@@ -736,16 +736,16 @@ namespace boost {
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isgreater BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isgreater BOOST_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
+               isgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isgreater BOOST_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isgreater BOOST_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
+               isgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
 
-            inline bool                                      isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
+            inline bool                                      isgreaterequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
             {
-               if (isnan BOOST_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_PREVENT_MACRO_SUBSTITUTION(y))
+               if (isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(y))
                   return false;
                return x >= y;
             }
@@ -753,16 +753,16 @@ namespace boost {
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
+               isgreaterequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isgreaterequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
+               isgreaterequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isgreaterequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
 
-            inline bool                                      isless      BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
+            inline bool                                      isless      BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
             {
-               if (isnan BOOST_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_PREVENT_MACRO_SUBSTITUTION(y))
+               if (isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(y))
                   return false;
                return x < y;
             }
@@ -770,17 +770,17 @@ namespace boost {
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isless BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isless BOOST_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
+               isless BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isless BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isless BOOST_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isless BOOST_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
+               isless BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isless BOOST_MATH_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
 
 
-            inline bool                                      islessequal   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
+            inline bool                                      islessequal   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
             {
-               if (isnan BOOST_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_PREVENT_MACRO_SUBSTITUTION(y))
+               if (isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(y))
                   return false;
                return x <= y;
             }
@@ -788,17 +788,17 @@ namespace boost {
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               islessequal BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return islessequal BOOST_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
+               islessequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return islessequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               islessequal BOOST_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return islessequal BOOST_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
+               islessequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return islessequal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
 
 
-            inline bool                                      islessgreater   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
+            inline bool                                      islessgreater   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y)
             {
-               if (isnan BOOST_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_PREVENT_MACRO_SUBSTITUTION(y))
+               if (isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x) || isnan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(y))
                   return false;
                return (x < y) || (x > y);
             }
@@ -806,25 +806,25 @@ namespace boost {
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
+               islessgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return islessgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
+               islessgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return islessgreater BOOST_MATH_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
 
 
-            inline bool                                      isunordered   BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y) { return ::BOOST_CSTDFLOAT_FLOAT128_ISNAN(x) || ::BOOST_CSTDFLOAT_FLOAT128_ISNAN(y); }
+            inline bool                                      isunordered   BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, boost::math::cstdfloat::detail::float_internal128_t y) { return ::BOOST_CSTDFLOAT_FLOAT128_ISNAN(x) || ::BOOST_CSTDFLOAT_FLOAT128_ISNAN(y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isunordered BOOST_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isunordered BOOST_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
+               isunordered BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(boost::math::cstdfloat::detail::float_internal128_t x, T y) { return isunordered BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, (boost::math::cstdfloat::detail::float_internal128_t)y); }
             template <class T>
             inline typename std::enable_if<
                std::is_convertible<T, boost::math::cstdfloat::detail::float_internal128_t>::value
                && !std::is_same<T, boost::math::cstdfloat::detail::float_internal128_t>::value, boost::math::cstdfloat::detail::float_internal128_t>::type
-               isunordered BOOST_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isunordered BOOST_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
+               isunordered BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x, boost::math::cstdfloat::detail::float_internal128_t y) { return isunordered BOOST_MATH_PREVENT_MACRO_SUBSTITUTION((boost::math::cstdfloat::detail::float_internal128_t)x, y); }
 
 
             //   end more functions
diff --git a/inst/include/boost/math/cstdfloat/cstdfloat_iostream.hpp b/inst/include/boost/math/cstdfloat/cstdfloat_iostream.hpp
index 7c2c39677..2ae2aea33 100644
--- a/inst/include/boost/math/cstdfloat/cstdfloat_iostream.hpp
+++ b/inst/include/boost/math/cstdfloat/cstdfloat_iostream.hpp
@@ -32,6 +32,54 @@
   #include <boost/math/tools/nothrow.hpp>
   #include <boost/math/tools/throw_exception.hpp>
 
+namespace boost {
+   namespace math {
+      namespace detail {
+         //
+         // What follows is the input streaming code: this is not "proper" iostream code at all
+         // but that's hard to write.
+         // For now just pull in all the characters that could possibly form the number
+         // and let libquadmath's string parser make use of it.  This fixes most use cases
+         // including CSV type formats such as those used by the Random lib.
+         //
+         inline std::string read_string_while(std::istream& is, std::string const& permitted_chars)
+         {
+            std::ios_base::iostate     state = std::ios_base::goodbit;
+            const std::istream::sentry sentry_check(is);
+            std::string                result;
+
+            if (sentry_check)
+            {
+               int c = is.rdbuf()->sgetc();
+
+               for (;; c = is.rdbuf()->snextc())
+                  if (std::istream::traits_type::eq_int_type(std::istream::traits_type::eof(), c))
+                  { // end of file:
+                     state |= std::ios_base::eofbit;
+                     break;
+                  }
+                  else if (permitted_chars.find_first_of(std::istream::traits_type::to_char_type(c)) == std::string::npos)
+                  {
+                     // Invalid numeric character, stop reading:
+                     //is.rdbuf()->sputbackc(static_cast<char>(c));
+                     break;
+                  }
+                  else
+                  {
+                     result.append(1, std::istream::traits_type::to_char_type(c));
+                  }
+            }
+
+            if (!result.size())
+               state |= std::ios_base::failbit;
+            is.setstate(state);
+            return result;
+         }
+
+      }
+   }
+}
+
 #if defined(__GNUC__) && !defined(BOOST_MATH_TEST_IO_AS_INTEL_QUAD)
 
   // Forward declarations of quadruple-precision string functions.
@@ -97,12 +145,12 @@
 
         char* my_buffer2 = nullptr;
 
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
         try
         {
 #endif
           my_buffer2 = new char[v + 3];
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
         }
         catch(const std::bad_alloc&)
         {
@@ -135,9 +183,7 @@
     template<typename char_type, class traits_type>
     inline std::basic_istream<char_type, traits_type>& operator>>(std::basic_istream<char_type, traits_type>& is, boost::math::cstdfloat::detail::float_internal128_t& x)
     {
-      std::string str;
-
-      static_cast<void>(is >> str);
+      std::string str = boost::math::detail::read_string_while(is, "+-eE.0123456789infINFnanNANinfinityINFINITY");
 
       char* p_end;
 
@@ -749,9 +795,7 @@
     template<typename char_type, class traits_type>
     inline std::basic_istream<char_type, traits_type>& operator>>(std::basic_istream<char_type, traits_type>& is, boost::math::cstdfloat::detail::float_internal128_t& x)
     {
-      std::string str;
-
-      static_cast<void>(is >> str);
+      std::string str = boost::math::detail::read_string_while(is, "+-eE.0123456789infINFnanNANinfinityINFINITY");
 
       const bool conversion_is_ok = boost::math::cstdfloat::detail::convert_from_string(x, str.c_str());
 
diff --git a/inst/include/boost/math/cstdfloat/cstdfloat_limits.hpp b/inst/include/boost/math/cstdfloat/cstdfloat_limits.hpp
index 9661ab652..ae306c5bd 100644
--- a/inst/include/boost/math/cstdfloat/cstdfloat_limits.hpp
+++ b/inst/include/boost/math/cstdfloat/cstdfloat_limits.hpp
@@ -24,7 +24,7 @@
 #pragma GCC system_header
 #endif
 
-  #if defined(BOOST_CSTDFLOAT_HAS_INTERNAL_FLOAT128_T) && defined(BOOST_MATH_USE_FLOAT128) && !defined(BOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT) && (!defined(__GNUC__) || (defined(__GNUC__) && __GNUC__ < 14))
+  #if defined(BOOST_CSTDFLOAT_HAS_INTERNAL_FLOAT128_T) && defined(BOOST_MATH_USE_FLOAT128) && !defined(BOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT) && (!defined(_GLIBCXX_RELEASE) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 14))
 
     #include <limits>
     #include <boost/math/tools/nothrow.hpp>
diff --git a/inst/include/boost/math/differentiation/autodiff.hpp b/inst/include/boost/math/differentiation/autodiff.hpp
index 7cda19685..b8880f24d 100644
--- a/inst/include/boost/math/differentiation/autodiff.hpp
+++ b/inst/include/boost/math/differentiation/autodiff.hpp
@@ -39,7 +39,7 @@ namespace detail {
 
 template <typename RealType, typename... RealTypes>
 struct promote_args_n {
-  using type = typename tools::promote_args_2<RealType, typename promote_args_n<RealTypes...>::type>::type;
+  using type = typename tools::promote_args<RealType, typename promote_args_n<RealTypes...>::type>::type;
 };
 
 template <typename RealType>
@@ -395,7 +395,7 @@ class fvar {
   friend std::ostream& operator<<(std::ostream&, fvar<RealType2, Order2> const&);
 
   // C++11 Compatibility
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
   template <typename RootType>
   void fvar_cpp11(std::true_type, RootType const& ca, bool const is_variable);
 
@@ -623,7 +623,7 @@ autodiff_fvar<RealType, Order, Orders...> make_fvar(RealType const& ca) {
   return autodiff_fvar<RealType, Order, Orders...>(ca, true);
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 namespace detail {
 
 template <typename RealType, size_t Order, size_t... Is>
@@ -648,7 +648,7 @@ auto make_ftuple(RealTypes const&... ca) {
 
 namespace detail {
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 template <typename RealType, size_t Order>
 fvar<RealType, Order>::fvar(root_type const& ca, bool const is_variable) {
   if constexpr (is_fvar<RealType>::value) {
@@ -670,7 +670,7 @@ template <typename RealType2, size_t Order2>
 fvar<RealType, Order>::fvar(fvar<RealType2, Order2> const& cr) {
   for (size_t i = 0; i <= (std::min)(Order, Order2); ++i)
     v[i] = static_cast<RealType>(cr.v[i]);
-  BOOST_IF_CONSTEXPR (Order2 < Order)
+  BOOST_MATH_IF_CONSTEXPR (Order2 < Order)
     std::fill(v.begin() + (Order2 + 1), v.end(), static_cast<RealType>(0));
 }
 
@@ -726,7 +726,7 @@ template <typename RealType2, size_t Order2>
 fvar<RealType, Order>& fvar<RealType, Order>::operator*=(fvar<RealType2, Order2> const& cr) {
   using diff_t = typename std::array<RealType, Order + 1>::difference_type;
   promote<RealType, RealType2> const zero(0);
-  BOOST_IF_CONSTEXPR (Order <= Order2)
+  BOOST_MATH_IF_CONSTEXPR (Order <= Order2)
     for (size_t i = 0, j = Order; i <= Order; ++i, --j)
       v[j] = std::inner_product(v.cbegin(), v.cend() - diff_t(i), cr.v.crbegin() + diff_t(i), zero);
   else {
@@ -749,11 +749,11 @@ fvar<RealType, Order>& fvar<RealType, Order>::operator/=(fvar<RealType2, Order2>
   using diff_t = typename std::array<RealType, Order + 1>::difference_type;
   RealType const zero(0);
   v.front() /= cr.v.front();
-  BOOST_IF_CONSTEXPR (Order < Order2)
+  BOOST_MATH_IF_CONSTEXPR (Order < Order2)
     for (size_t i = 1, j = Order2 - 1, k = Order; i <= Order; ++i, --j, --k)
       (v[i] -= std::inner_product(
            cr.v.cbegin() + 1, cr.v.cend() - diff_t(j), v.crbegin() + diff_t(k), zero)) /= cr.v.front();
-  else BOOST_IF_CONSTEXPR (0 < Order2)
+  else BOOST_MATH_IF_CONSTEXPR (0 < Order2)
     for (size_t i = 1, j = Order2 - 1, k = Order; i <= Order; ++i, j && --j, --k)
       (v[i] -= std::inner_product(
            cr.v.cbegin() + 1, cr.v.cend() - diff_t(j), v.crbegin() + diff_t(k), zero)) /= cr.v.front();
@@ -788,10 +788,10 @@ promote<fvar<RealType, Order>, fvar<RealType2, Order2>> fvar<RealType, Order>::o
   promote<fvar<RealType, Order>, fvar<RealType2, Order2>> retval;
   for (size_t i = 0; i <= (std::min)(Order, Order2); ++i)
     retval.v[i] = v[i] + cr.v[i];
-  BOOST_IF_CONSTEXPR (Order < Order2)
+  BOOST_MATH_IF_CONSTEXPR (Order < Order2)
     for (size_t i = Order + 1; i <= Order2; ++i)
       retval.v[i] = cr.v[i];
-  else BOOST_IF_CONSTEXPR (Order2 < Order)
+  else BOOST_MATH_IF_CONSTEXPR (Order2 < Order)
     for (size_t i = Order2 + 1; i <= Order; ++i)
       retval.v[i] = v[i];
   return retval;
@@ -817,10 +817,10 @@ promote<fvar<RealType, Order>, fvar<RealType2, Order2>> fvar<RealType, Order>::o
   promote<fvar<RealType, Order>, fvar<RealType2, Order2>> retval;
   for (size_t i = 0; i <= (std::min)(Order, Order2); ++i)
     retval.v[i] = v[i] - cr.v[i];
-  BOOST_IF_CONSTEXPR (Order < Order2)
+  BOOST_MATH_IF_CONSTEXPR (Order < Order2)
     for (auto i = Order + 1; i <= Order2; ++i)
       retval.v[i] = -cr.v[i];
-  else BOOST_IF_CONSTEXPR (Order2 < Order)
+  else BOOST_MATH_IF_CONSTEXPR (Order2 < Order)
     for (auto i = Order2 + 1; i <= Order; ++i)
       retval.v[i] = v[i];
   return retval;
@@ -848,7 +848,7 @@ promote<fvar<RealType, Order>, fvar<RealType2, Order2>> fvar<RealType, Order>::o
   using diff_t = typename std::array<RealType, Order + 1>::difference_type;
   promote<RealType, RealType2> const zero(0);
   promote<fvar<RealType, Order>, fvar<RealType2, Order2>> retval;
-  BOOST_IF_CONSTEXPR (Order < Order2)
+  BOOST_MATH_IF_CONSTEXPR (Order < Order2)
     for (size_t i = 0, j = Order, k = Order2; i <= Order2; ++i, j && --j, --k)
       retval.v[i] = std::inner_product(v.cbegin(), v.cend() - diff_t(j), cr.v.crbegin() + diff_t(k), zero);
   else
@@ -878,7 +878,7 @@ promote<fvar<RealType, Order>, fvar<RealType2, Order2>> fvar<RealType, Order>::o
   promote<RealType, RealType2> const zero(0);
   promote<fvar<RealType, Order>, fvar<RealType2, Order2>> retval;
   retval.v.front() = v.front() / cr.v.front();
-  BOOST_IF_CONSTEXPR (Order < Order2) {
+  BOOST_MATH_IF_CONSTEXPR (Order < Order2) {
     for (size_t i = 1, j = Order2 - 1; i <= Order; ++i, --j)
       retval.v[i] =
           (v[i] - std::inner_product(
@@ -889,7 +889,7 @@ promote<fvar<RealType, Order>, fvar<RealType2, Order2>> fvar<RealType, Order>::o
           -std::inner_product(
               cr.v.cbegin() + 1, cr.v.cend() - diff_t(j), retval.v.crbegin() + diff_t(j + 1), zero) /
           cr.v.front();
-  } else BOOST_IF_CONSTEXPR (0 < Order2)
+  } else BOOST_MATH_IF_CONSTEXPR (0 < Order2)
     for (size_t i = 1, j = Order2 - 1, k = Order; i <= Order; ++i, j && --j, --k)
       retval.v[i] =
           (v[i] - std::inner_product(
@@ -914,7 +914,7 @@ fvar<RealType, Order> operator/(typename fvar<RealType, Order>::root_type const&
   using diff_t = typename std::array<RealType, Order + 1>::difference_type;
   fvar<RealType, Order> retval;
   retval.v.front() = ca / cr.v.front();
-  BOOST_IF_CONSTEXPR (0 < Order) {
+  BOOST_MATH_IF_CONSTEXPR (0 < Order) {
     RealType const zero(0);
     for (size_t i = 1, j = Order - 1; i <= Order; ++i, --j)
       retval.v[i] =
@@ -1023,7 +1023,7 @@ bool operator>(typename fvar<RealType, Order>::root_type const& ca, fvar<RealTyp
 
   /*** Other methods and functions ***/
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // f : order -> derivative(order)/factorial(order)
 // Use this when you have the polynomial coefficients, rather than just the derivatives. E.g. See atan2().
 template <typename RealType, size_t Order>
@@ -1050,7 +1050,7 @@ template <typename RealType, size_t Order>
 template <typename Func>
 fvar<RealType, Order> fvar<RealType, Order>::apply_coefficients(size_t const order, Func const& f) const {
   fvar<RealType, Order> const epsilon = fvar<RealType, Order>(*this).set_root(0);
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
   size_t i = (std::min)(order, order_sum);
 #else  // ODR-use of static constexpr
   size_t i = order < order_sum ? order : order_sum;
@@ -1061,7 +1061,7 @@ fvar<RealType, Order> fvar<RealType, Order>::apply_coefficients(size_t const ord
   return accumulator;
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // f : order -> derivative(order)
 template <typename RealType, size_t Order>
 template <typename Func, typename Fvar, typename... Fvars>
@@ -1101,7 +1101,7 @@ fvar<RealType, Order> fvar<RealType, Order>::apply_coefficients_nonhorner(size_t
   fvar<RealType, Order> const epsilon = fvar<RealType, Order>(*this).set_root(0);
   fvar<RealType, Order> epsilon_i = fvar<RealType, Order>(1);  // epsilon to the power of i
   fvar<RealType, Order> accumulator = fvar<RealType, Order>(f(0u));
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
   size_t const i_max = (std::min)(order, order_sum);
 #else  // ODR-use of static constexpr
   size_t const i_max = order < order_sum ? order : order_sum;
@@ -1113,7 +1113,7 @@ fvar<RealType, Order> fvar<RealType, Order>::apply_coefficients_nonhorner(size_t
   return accumulator;
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // f : order -> derivative(order)
 template <typename RealType, size_t Order>
 template <typename Func, typename Fvar, typename... Fvars>
@@ -1142,7 +1142,7 @@ template <typename RealType, size_t Order>
 template <typename Func>
 fvar<RealType, Order> fvar<RealType, Order>::apply_derivatives(size_t const order, Func const& f) const {
   fvar<RealType, Order> const epsilon = fvar<RealType, Order>(*this).set_root(0);
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
   size_t i = (std::min)(order, order_sum);
 #else  // ODR-use of static constexpr
   size_t i = order < order_sum ? order : order_sum;
@@ -1153,7 +1153,7 @@ fvar<RealType, Order> fvar<RealType, Order>::apply_derivatives(size_t const orde
   return accumulator;
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // f : order -> derivative(order)
 template <typename RealType, size_t Order>
 template <typename Func, typename Fvar, typename... Fvars>
@@ -1194,7 +1194,7 @@ fvar<RealType, Order> fvar<RealType, Order>::apply_derivatives_nonhorner(size_t
   fvar<RealType, Order> const epsilon = fvar<RealType, Order>(*this).set_root(0);
   fvar<RealType, Order> epsilon_i = fvar<RealType, Order>(1);  // epsilon to the power of i
   fvar<RealType, Order> accumulator = fvar<RealType, Order>(f(0u));
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
   size_t const i_max = (std::min)(order, order_sum);
 #else  // ODR-use of static constexpr
   size_t const i_max = order < order_sum ? order : order_sum;
@@ -1206,7 +1206,7 @@ fvar<RealType, Order> fvar<RealType, Order>::apply_derivatives_nonhorner(size_t
   return accumulator;
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // Can throw "std::out_of_range: array::at: __n (which is 7) >= _Nm (which is 7)"
 template <typename RealType, size_t Order>
 template <typename... Orders>
@@ -1218,7 +1218,7 @@ get_type_at<RealType, sizeof...(Orders)> fvar<RealType, Order>::at(size_t order,
 }
 #endif
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // Can throw "std::out_of_range: array::at: __n (which is 7) >= _Nm (which is 7)"
 template <typename RealType, size_t Order>
 template <typename... Orders>
@@ -1253,7 +1253,7 @@ RealType fvar<RealType, Order>::epsilon_inner_product(size_t z0,
   return accumulator;
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 template <typename RealType, size_t Order>
 fvar<RealType, Order> fvar<RealType, Order>::epsilon_multiply(size_t z0,
                                                               size_t isum0,
@@ -1277,7 +1277,7 @@ fvar<RealType, Order> fvar<RealType, Order>::epsilon_multiply(size_t z0,
 }
 #endif
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 // When called from outside this method, z0 should be non-zero. Otherwise if z0=0 then it will give an
 // incorrect result of 0 when the root value is 0 and ca=inf, when instead the correct product is nan.
 // If z0=0 then use the regular multiply operator*() instead.
@@ -1303,7 +1303,7 @@ fvar<RealType, Order> fvar<RealType, Order>::inverse() const {
   return static_cast<root_type>(*this) == 0 ? inverse_apply() : 1 / *this;
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 template <typename RealType, size_t Order>
 fvar<RealType, Order>& fvar<RealType, Order>::negate() {
   if constexpr (is_fvar<RealType>::value)
@@ -1326,7 +1326,7 @@ fvar<RealType, Order> fvar<RealType, Order>::inverse_apply() const {
   return apply_derivatives_nonhorner(order_sum, [&derivatives](size_t j) { return derivatives[j]; });
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 template <typename RealType, size_t Order>
 fvar<RealType, Order>& fvar<RealType, Order>::multiply_assign_by_root_type(bool is_root,
                                                                            root_type const& ca) {
@@ -1357,7 +1357,7 @@ fvar<RealType, Order>::operator T() const {
   return static_cast<T>(static_cast<root_type>(v.front()));
 }
 
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 template <typename RealType, size_t Order>
 fvar<RealType, Order>& fvar<RealType, Order>::set_root(root_type const& root) {
   if constexpr (is_fvar<RealType>::value)
@@ -1451,14 +1451,14 @@ promote<fvar<RealType1, Order1>, fvar<RealType2, Order2>> pow(fvar<RealType1, Or
   root_type const x0 = static_cast<root_type>(x);
   root_type const y0 = static_cast<root_type>(y);
   root_type dxydx[order + 1]{pow(x0, y0)};
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return return_type(*dxydx);
   else {
     for (size_t i = 0; i < order && y0 - i != 0; ++i)
       dxydx[i + 1] = (y0 - i) * dxydx[i] / x0;
     std::array<fvar<root_type, order>, order + 1> lognx;
     lognx.front() = fvar<root_type, order>(1);
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
     lognx[1] = log(make_fvar<root_type, order>(x0));
 #else  // for compilers that compile this branch when order == 0.
     lognx[(std::min)(size_t(1), order)] = log(make_fvar<root_type, order>(x0));
@@ -1488,12 +1488,12 @@ fvar<RealType, Order> sqrt(fvar<RealType, Order> const& cr) {
   root_type derivatives[order + 1];
   root_type const x = static_cast<root_type>(cr);
   *derivatives = sqrt(x);
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(*derivatives);
   else {
     root_type numerator = root_type(0.5);
     root_type powers = 1;
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
     derivatives[1] = numerator / *derivatives;
 #else  // for compilers that compile this branch when order == 0.
     derivatives[(std::min)(size_t(1), order)] = numerator / *derivatives;
@@ -1518,7 +1518,7 @@ fvar<RealType, Order> log(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = log(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto const d1 = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr)).inverse();  // log'(x) = 1 / x
@@ -1548,7 +1548,7 @@ fvar<RealType, Order> cos(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = cos(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     root_type const d1 = -sin(static_cast<root_type>(cr));
@@ -1563,7 +1563,7 @@ fvar<RealType, Order> sin(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = sin(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     root_type const d1 = cos(static_cast<root_type>(cr));
@@ -1578,7 +1578,7 @@ fvar<RealType, Order> asin(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = asin(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1593,7 +1593,7 @@ fvar<RealType, Order> tan(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = tan(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto c = cos(make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr)));
@@ -1608,7 +1608,7 @@ fvar<RealType, Order> atan(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = atan(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1624,7 +1624,7 @@ fvar<RealType, Order> atan2(fvar<RealType, Order> const& cr,
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = atan2(static_cast<root_type>(cr), ca);
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto y = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1640,7 +1640,7 @@ fvar<RealType, Order> atan2(typename fvar<RealType, Order>::root_type const& ca,
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = atan2(ca, static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1659,7 +1659,7 @@ promote<fvar<RealType1, Order1>, fvar<RealType2, Order2>> atan2(fvar<RealType1,
   root_type const y = static_cast<root_type>(cr1);
   root_type const x = static_cast<root_type>(cr2);
   root_type const d00 = atan2(y, x);
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return return_type(d00);
   else {
     constexpr size_t order1 = fvar<RealType1, Order1>::order_sum;
@@ -1749,7 +1749,7 @@ fvar<RealType, Order> acos(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = acos(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1764,7 +1764,7 @@ fvar<RealType, Order> acosh(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = acosh(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1779,7 +1779,7 @@ fvar<RealType, Order> asinh(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = asinh(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1794,7 +1794,7 @@ fvar<RealType, Order> atanh(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = atanh(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));
@@ -1809,7 +1809,7 @@ fvar<RealType, Order> cosh(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = cosh(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     root_type const derivatives[2]{d0, sinh(static_cast<root_type>(cr))};
@@ -1824,7 +1824,7 @@ fvar<RealType, Order> digamma(fvar<RealType, Order> const& cr) {
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const x = static_cast<root_type>(cr);
   root_type const d0 = digamma(x);
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     static_assert(order <= static_cast<size_t>((std::numeric_limits<int>::max)()),
@@ -1840,7 +1840,7 @@ fvar<RealType, Order> erf(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = erf(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));  // d1 = 2/sqrt(pi)*exp(-x*x)
@@ -1855,7 +1855,7 @@ fvar<RealType, Order> erfc(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = erfc(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     auto x = make_fvar<root_type, bool(order) ? order - 1 : 0>(static_cast<root_type>(cr));  // erfc'(x) = -erf'(x)
@@ -1872,12 +1872,12 @@ fvar<RealType, Order> lambert_w0(fvar<RealType, Order> const& cr) {
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type derivatives[order + 1];
   *derivatives = lambert_w0(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(*derivatives);
   else {
     root_type const expw = exp(*derivatives);
     derivatives[1] = 1 / (static_cast<root_type>(cr) + expw);
-    BOOST_IF_CONSTEXPR (order == 1)
+    BOOST_MATH_IF_CONSTEXPR (order == 1)
       return cr.apply_derivatives_nonhorner(order, [&derivatives](size_t i) { return derivatives[i]; });
     else {
       using diff_t = typename std::array<RealType, Order + 1>::difference_type;
@@ -1909,7 +1909,7 @@ fvar<RealType, Order> lgamma(fvar<RealType, Order> const& cr) {
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const x = static_cast<root_type>(cr);
   root_type const d0 = lgamma(x);
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(d0);
   else {
     static_assert(order <= static_cast<size_t>((std::numeric_limits<int>::max)()) + 1,
@@ -1926,7 +1926,7 @@ fvar<RealType, Order> sinc(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type taylor[order + 1]{1};  // sinc(0) = 1
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(*taylor);
   else {
     for (size_t n = 2; n <= order; n += 2)
@@ -1941,7 +1941,7 @@ fvar<RealType, Order> sinh(fvar<RealType, Order> const& cr) {
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
   root_type const d0 = sinh(static_cast<root_type>(cr));
-  BOOST_IF_CONSTEXPR (fvar<RealType, Order>::order_sum == 0)
+  BOOST_MATH_IF_CONSTEXPR (fvar<RealType, Order>::order_sum == 0)
     return fvar<RealType, Order>(d0);
   else {
     root_type const derivatives[2]{d0, cosh(static_cast<root_type>(cr))};
@@ -1962,7 +1962,7 @@ fvar<RealType, Order> tgamma(fvar<RealType, Order> const& cr) {
   using std::tgamma;
   using root_type = typename fvar<RealType, Order>::root_type;
   constexpr size_t order = fvar<RealType, Order>::order_sum;
-  BOOST_IF_CONSTEXPR (order == 0)
+  BOOST_MATH_IF_CONSTEXPR (order == 0)
     return fvar<RealType, Order>(tgamma(static_cast<root_type>(cr)));
   else {
     if (cr < 0)
@@ -2002,10 +2002,10 @@ using autodiff_root_type = typename autodiff_fvar_type<RealType, Order>::root_ty
 
 // See boost/math/tools/promotion.hpp
 template <typename RealType0, size_t Order0, typename RealType1, size_t Order1>
-struct promote_args_2<detail::autodiff_fvar_type<RealType0, Order0>,
+struct promote_args<detail::autodiff_fvar_type<RealType0, Order0>,
                       detail::autodiff_fvar_type<RealType1, Order1>> {
-  using type = detail::autodiff_fvar_type<typename promote_args_2<RealType0, RealType1>::type,
-#ifndef BOOST_NO_CXX14_CONSTEXPR
+  using type = detail::autodiff_fvar_type<typename promote_args<RealType0, RealType1>::type,
+#ifndef BOOST_MATH_NO_CXX14_CONSTEXPR
                                           (std::max)(Order0, Order1)>;
 #else
         Order0<Order1 ? Order1 : Order0>;
@@ -2018,13 +2018,13 @@ struct promote_args<detail::autodiff_fvar_type<RealType, Order>> {
 };
 
 template <typename RealType0, size_t Order0, typename RealType1>
-struct promote_args_2<detail::autodiff_fvar_type<RealType0, Order0>, RealType1> {
-  using type = detail::autodiff_fvar_type<typename promote_args_2<RealType0, RealType1>::type, Order0>;
+struct promote_args<detail::autodiff_fvar_type<RealType0, Order0>, RealType1> {
+  using type = detail::autodiff_fvar_type<typename promote_args<RealType0, RealType1>::type, Order0>;
 };
 
 template <typename RealType0, typename RealType1, size_t Order1>
-struct promote_args_2<RealType0, detail::autodiff_fvar_type<RealType1, Order1>> {
-  using type = detail::autodiff_fvar_type<typename promote_args_2<RealType0, RealType1>::type, Order1>;
+struct promote_args<RealType0, detail::autodiff_fvar_type<RealType1, Order1>> {
+  using type = detail::autodiff_fvar_type<typename promote_args<RealType0, RealType1>::type, Order1>;
 };
 
 template <typename destination_t, typename RealType, std::size_t Order>
@@ -2054,7 +2054,7 @@ struct evaluation<fvar_t<double, Order>, Policy> {
 }  // namespace math
 }  // namespace boost
 
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #include "autodiff_cpp11.hpp"
 #endif
 
diff --git a/inst/include/boost/math/differentiation/lanczos_smoothing.hpp b/inst/include/boost/math/differentiation/lanczos_smoothing.hpp
index 9406b302d..4103f538d 100644
--- a/inst/include/boost/math/differentiation/lanczos_smoothing.hpp
+++ b/inst/include/boost/math/differentiation/lanczos_smoothing.hpp
@@ -18,7 +18,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/distributions.hpp b/inst/include/boost/math/distributions.hpp
index 64da99415..0834db870 100644
--- a/inst/include/boost/math/distributions.hpp
+++ b/inst/include/boost/math/distributions.hpp
@@ -24,15 +24,18 @@
 #include <boost/math/distributions/fisher_f.hpp>
 #include <boost/math/distributions/gamma.hpp>
 #include <boost/math/distributions/geometric.hpp>
+#include <boost/math/distributions/holtsmark.hpp>
 #include <boost/math/distributions/hyperexponential.hpp>
 #include <boost/math/distributions/hypergeometric.hpp>
 #include <boost/math/distributions/inverse_chi_squared.hpp>
 #include <boost/math/distributions/inverse_gamma.hpp>
 #include <boost/math/distributions/inverse_gaussian.hpp>
 #include <boost/math/distributions/kolmogorov_smirnov.hpp>
+#include <boost/math/distributions/landau.hpp>
 #include <boost/math/distributions/laplace.hpp>
 #include <boost/math/distributions/logistic.hpp>
 #include <boost/math/distributions/lognormal.hpp>
+#include <boost/math/distributions/mapairy.hpp>
 #include <boost/math/distributions/negative_binomial.hpp>
 #include <boost/math/distributions/non_central_chi_squared.hpp>
 #include <boost/math/distributions/non_central_beta.hpp>
@@ -42,6 +45,7 @@
 #include <boost/math/distributions/pareto.hpp>
 #include <boost/math/distributions/poisson.hpp>
 #include <boost/math/distributions/rayleigh.hpp>
+#include <boost/math/distributions/saspoint5.hpp>
 #include <boost/math/distributions/skew_normal.hpp>
 #include <boost/math/distributions/students_t.hpp>
 #include <boost/math/distributions/triangular.hpp>
diff --git a/inst/include/boost/math/distributions/arcsine.hpp b/inst/include/boost/math/distributions/arcsine.hpp
index a8fcbbc05..899bfb1b2 100644
--- a/inst/include/boost/math/distributions/arcsine.hpp
+++ b/inst/include/boost/math/distributions/arcsine.hpp
@@ -2,6 +2,7 @@
 
 // Copyright John Maddock 2014.
 // Copyright Paul A. Bristow 2014.
+// Copyright Matt Borland 2024.
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -29,13 +30,21 @@
 #ifndef BOOST_MATH_DIST_ARCSINE_HPP
 #define BOOST_MATH_DIST_ARCSINE_HPP
 
-#include <cmath>
-#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/distributions/complement.hpp> // complements.
 #include <boost/math/distributions/detail/common_error_handling.hpp> // error checks.
 #include <boost/math/constants/constants.hpp>
-
 #include <boost/math/special_functions/fpclassify.hpp> // isnan.
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
+#include <cmath>
+#include <utility>
+#include <exception>  // For std::domain_error.
+#endif
 
 #if defined (BOOST_MSVC)
 #  pragma warning(push)
@@ -43,9 +52,6 @@
 // in domain_error_imp in error_handling.
 #endif
 
-#include <utility>
-#include <exception>  // For std::domain_error.
-
 namespace boost
 {
   namespace math
@@ -55,7 +61,7 @@ namespace boost
       // Common error checking routines for arcsine distribution functions:
       // Duplicating for x_min and x_max provides specific error messages.
       template <class RealType, class Policy>
-      inline bool check_x_min(const char* function, const RealType& x, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_x_min(const char* function, const RealType& x, RealType* result, const Policy& pol)
       {
         if (!(boost::math::isfinite)(x))
         {
@@ -68,7 +74,7 @@ namespace boost
       } // bool check_x_min
 
       template <class RealType, class Policy>
-      inline bool check_x_max(const char* function, const RealType& x, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_x_max(const char* function, const RealType& x, RealType* result, const Policy& pol)
       {
         if (!(boost::math::isfinite)(x))
         {
@@ -82,14 +88,14 @@ namespace boost
 
 
       template <class RealType, class Policy>
-      inline bool check_x_minmax(const char* function, const RealType& x_min, const RealType& x_max, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_x_minmax(const char* function, const RealType& x_min, const RealType& x_max, RealType* result, const Policy& pol)
       { // Check x_min < x_max
         if (x_min >= x_max)
         {
-          std::string msg = "x_max argument is %1%, but must be > x_min";
+          constexpr auto msg = "x_max argument is %1%, but must be > x_min";
           *result = policies::raise_domain_error<RealType>(
             function,
-            msg.c_str(), x_max, pol);
+            msg, x_max, pol);
             // "x_max argument is %1%, but must be > x_min !", x_max, pol);
             // "x_max argument is %1%, but must be > x_min %2!", x_max, x_min, pol); would be better. 
             // But would require replication of all helpers functions in /policies/error_handling.hpp for two values,
@@ -100,7 +106,7 @@ namespace boost
       } // bool check_x_minmax
 
       template <class RealType, class Policy>
-      inline bool check_prob(const char* function, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_prob(const char* function, const RealType& p, RealType* result, const Policy& pol)
       {
         if ((p < 0) || (p > 1) || !(boost::math::isfinite)(p))
         {
@@ -113,7 +119,7 @@ namespace boost
       } // bool check_prob
 
       template <class RealType, class Policy>
-      inline bool check_x(const char* function, const RealType& x_min, const RealType& x_max, const RealType& x, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_x(const char* function, const RealType& x_min, const RealType& x_max, const RealType& x, RealType* result, const Policy& pol)
       { // Check x finite and x_min < x < x_max.
         if (!(boost::math::isfinite)(x))
         {
@@ -137,7 +143,7 @@ namespace boost
       } // bool check_x
 
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& x_min, const RealType& x_max, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& x_min, const RealType& x_max, RealType* result, const Policy& pol)
       { // Check both x_min and x_max finite, and x_min  < x_max.
         return check_x_min(function, x_min, result, pol)
             && check_x_max(function, x_max, result, pol)
@@ -145,14 +151,14 @@ namespace boost
       } // bool check_dist
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_x(const char* function, const RealType& x_min, const RealType& x_max, RealType x, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_x(const char* function, const RealType& x_min, const RealType& x_max, RealType x, RealType* result, const Policy& pol)
       {
         return check_dist(function, x_min, x_max, result, pol)
           && arcsine_detail::check_x(function, x_min, x_max, x, result, pol);
       } // bool check_dist_and_x
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_prob(const char* function, const RealType& x_min, const RealType& x_max, RealType p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_prob(const char* function, const RealType& x_min, const RealType& x_max, RealType p, RealType* result, const Policy& pol)
       {
         return check_dist(function, x_min, x_max, result, pol)
           && check_prob(function, p, result, pol);
@@ -167,7 +173,7 @@ namespace boost
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      arcsine_distribution(RealType x_min = 0, RealType x_max = 1) : m_x_min(x_min), m_x_max(x_max)
+      BOOST_MATH_GPU_ENABLED arcsine_distribution(RealType x_min = 0, RealType x_max = 1) : m_x_min(x_min), m_x_max(x_max)
       { // Default beta (alpha = beta = 0.5) is standard arcsine with x_min = 0, x_max = 1.
         // Generalized to allow x_min and x_max to be specified.
         RealType result;
@@ -178,11 +184,11 @@ namespace boost
           &result, Policy());
       } // arcsine_distribution constructor.
       // Accessor functions:
-      RealType x_min() const
+      BOOST_MATH_GPU_ENABLED RealType x_min() const
       {
         return m_x_min;
       }
-      RealType x_max() const
+      BOOST_MATH_GPU_ENABLED RealType x_max() const
       {
         return m_x_max;
       }
@@ -203,21 +209,21 @@ namespace boost
     #endif
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const arcsine_distribution<RealType, Policy>&  dist)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const arcsine_distribution<RealType, Policy>&  dist)
     { // Range of permissible values for random variable x.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(static_cast<RealType>(dist.x_min()), static_cast<RealType>(dist.x_max()));
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(dist.x_min()), static_cast<RealType>(dist.x_max()));
     }
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const arcsine_distribution<RealType, Policy>&  dist)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const arcsine_distribution<RealType, Policy>&  dist)
     { // Range of supported values for random variable x.
       // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-      return std::pair<RealType, RealType>(static_cast<RealType>(dist.x_min()), static_cast<RealType>(dist.x_max()));
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(dist.x_min()), static_cast<RealType>(dist.x_max()));
     }
 
     template <class RealType, class Policy>
-    inline RealType mean(const arcsine_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const arcsine_distribution<RealType, Policy>& dist)
     { // Mean of arcsine distribution .
       RealType result;
       RealType x_min = dist.x_min();
@@ -236,7 +242,7 @@ namespace boost
     } // mean
 
     template <class RealType, class Policy>
-    inline RealType variance(const arcsine_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const arcsine_distribution<RealType, Policy>& dist)
     { // Variance of standard arcsine distribution = (1-0)/8 = 0.125.
       RealType result;
       RealType x_min = dist.x_min();
@@ -254,7 +260,7 @@ namespace boost
     } // variance
 
     template <class RealType, class Policy>
-    inline RealType mode(const arcsine_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const arcsine_distribution<RealType, Policy>& /* dist */)
     { //There are always [*two] values for the mode, at ['x_min] and at ['x_max], default 0 and 1,
       // so instead we raise the exception domain_error.
       return policies::raise_domain_error<RealType>(
@@ -265,7 +271,7 @@ namespace boost
     } // mode
 
     template <class RealType, class Policy>
-    inline RealType median(const arcsine_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType median(const arcsine_distribution<RealType, Policy>& dist)
     { // Median of arcsine distribution (a + b) / 2 == mean.
       RealType x_min = dist.x_min();
       RealType x_max = dist.x_max();
@@ -283,7 +289,7 @@ namespace boost
     }
 
     template <class RealType, class Policy>
-    inline RealType skewness(const arcsine_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const arcsine_distribution<RealType, Policy>& dist)
     {
       RealType result;
       RealType x_min = dist.x_min();
@@ -302,7 +308,7 @@ namespace boost
     } // skewness
 
     template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const arcsine_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const arcsine_distribution<RealType, Policy>& dist)
     {
       RealType result;
       RealType x_min = dist.x_min();
@@ -322,7 +328,7 @@ namespace boost
     } // kurtosis_excess
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const arcsine_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const arcsine_distribution<RealType, Policy>& dist)
     {
       RealType result;
       RealType x_min = dist.x_min();
@@ -342,12 +348,12 @@ namespace boost
     } // kurtosis
 
     template <class RealType, class Policy>
-    inline RealType pdf(const arcsine_distribution<RealType, Policy>& dist, const RealType& xx)
+    BOOST_MATH_GPU_ENABLED inline RealType pdf(const arcsine_distribution<RealType, Policy>& dist, const RealType& xx)
     { // Probability Density/Mass Function arcsine.
       BOOST_FPU_EXCEPTION_GUARD
       BOOST_MATH_STD_USING // For ADL of std functions.
 
-      static const char* function = "boost::math::pdf(arcsine_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::pdf(arcsine_distribution<%1%> const&, %1%)";
 
       RealType lo = dist.x_min();
       RealType hi = dist.x_max();
@@ -368,11 +374,11 @@ namespace boost
     } // pdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const arcsine_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const arcsine_distribution<RealType, Policy>& dist, const RealType& x)
     { // Cumulative Distribution Function arcsine.
       BOOST_MATH_STD_USING // For ADL of std functions.
 
-      static const char* function = "boost::math::cdf(arcsine_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::cdf(arcsine_distribution<%1%> const&, %1%)";
 
       RealType x_min = dist.x_min();
       RealType x_max = dist.x_max();
@@ -401,10 +407,10 @@ namespace boost
     } // arcsine cdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const complemented2_type<arcsine_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<arcsine_distribution<RealType, Policy>, RealType>& c)
     { // Complemented Cumulative Distribution Function arcsine.
       BOOST_MATH_STD_USING // For ADL of std functions.
-      static const char* function = "boost::math::cdf(arcsine_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::cdf(arcsine_distribution<%1%> const&, %1%)";
 
       RealType x = c.param;
       arcsine_distribution<RealType, Policy> const& dist = c.dist;
@@ -437,7 +443,7 @@ namespace boost
     } // arcsine ccdf
 
     template <class RealType, class Policy>
-    inline RealType quantile(const arcsine_distribution<RealType, Policy>& dist, const RealType& p)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const arcsine_distribution<RealType, Policy>& dist, const RealType& p)
     { 
       // Quantile or Percent Point arcsine function or
       // Inverse Cumulative probability distribution function CDF.
@@ -451,7 +457,7 @@ namespace boost
 
       using boost::math::constants::half_pi;
 
-      static const char* function = "boost::math::quantile(arcsine_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::quantile(arcsine_distribution<%1%> const&, %1%)";
 
       RealType result = 0; // of argument checks:
       RealType x_min = dist.x_min();
@@ -481,7 +487,7 @@ namespace boost
     } // quantile
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<arcsine_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<arcsine_distribution<RealType, Policy>, RealType>& c)
     { 
       // Complement Quantile or Percent Point arcsine function.
       // Return the number of expected x for a given
@@ -489,7 +495,7 @@ namespace boost
       BOOST_MATH_STD_USING // For ADL of std functions.
 
       using boost::math::constants::half_pi;
-      static const char* function = "boost::math::quantile(arcsine_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::quantile(arcsine_distribution<%1%> const&, %1%)";
 
       // Error checks:
       RealType q = c.param;
diff --git a/inst/include/boost/math/distributions/bernoulli.hpp b/inst/include/boost/math/distributions/bernoulli.hpp
index cce209a6f..f1c693f7f 100644
--- a/inst/include/boost/math/distributions/bernoulli.hpp
+++ b/inst/include/boost/math/distributions/bernoulli.hpp
@@ -2,6 +2,7 @@
 
 // Copyright John Maddock 2006.
 // Copyright Paul A. Bristow 2007.
+// Copyright Matt Borland 2024.
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -27,13 +28,19 @@
 #ifndef BOOST_MATH_SPECIAL_BERNOULLI_HPP
 #define BOOST_MATH_SPECIAL_BERNOULLI_HPP
 
-#include <boost/math/distributions/fwd.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/distributions/complement.hpp> // complements
 #include <boost/math/distributions/detail/common_error_handling.hpp> // error checks
 #include <boost/math/special_functions/fpclassify.hpp> // isnan.
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
+#ifndef BOOST_MATH_HAS_NVRTC
 #include <utility>
+#include <boost/math/distributions/fwd.hpp>
+#endif
 
 namespace boost
 {
@@ -43,7 +50,7 @@ namespace boost
     {
       // Common error checking routines for bernoulli distribution functions:
       template <class RealType, class Policy>
-      inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& /* pol */)
+      BOOST_MATH_GPU_ENABLED inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& /* pol */)
       {
         if(!(boost::math::isfinite)(p) || (p < 0) || (p > 1))
         {
@@ -55,23 +62,23 @@ namespace boost
         return true;
       }
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& p, RealType* result, const Policy& /* pol */, const std::true_type&)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& p, RealType* result, const Policy& /* pol */, const boost::math::true_type&)
       {
         return check_success_fraction(function, p, result, Policy());
       }
       template <class RealType, class Policy>
-      inline bool check_dist(const char* , const RealType& , RealType* , const Policy& /* pol */, const std::false_type&)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* , const RealType& , RealType* , const Policy& /* pol */, const boost::math::false_type&)
       {
          return true;
       }
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& p, RealType* result, const Policy& /* pol */)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& p, RealType* result, const Policy& /* pol */)
       {
          return check_dist(function, p, result, Policy(), typename policies::constructor_error_check<Policy>::type());
       }
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_k(const char* function, const RealType& p, RealType k, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_k(const char* function, const RealType& p, RealType k, RealType* result, const Policy& pol)
       {
         if(check_dist(function, p, result, Policy(), typename policies::method_error_check<Policy>::type()) == false)
         {
@@ -87,7 +94,7 @@ namespace boost
        return true;
       }
       template <class RealType, class Policy>
-      inline bool check_dist_and_prob(const char* function, RealType p, RealType prob, RealType* result, const Policy& /* pol */)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_prob(const char* function, RealType p, RealType prob, RealType* result, const Policy& /* pol */)
       {
         if((check_dist(function, p, result, Policy(), typename policies::method_error_check<Policy>::type()) && detail::check_probability(function, prob, result, Policy())) == false)
         {
@@ -105,7 +112,7 @@ namespace boost
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      bernoulli_distribution(RealType p = 0.5) : m_p(p)
+      BOOST_MATH_GPU_ENABLED bernoulli_distribution(RealType p = 0.5) : m_p(p)
       { // Default probability = half suits 'fair' coin tossing
         // where probability of heads == probability of tails.
         RealType result; // of checks.
@@ -115,7 +122,7 @@ namespace boost
           &result, Policy());
       } // bernoulli_distribution constructor.
 
-      RealType success_fraction() const
+      BOOST_MATH_GPU_ENABLED RealType success_fraction() const
       { // Probability.
         return m_p;
       }
@@ -132,21 +139,21 @@ namespace boost
     #endif
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const bernoulli_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const bernoulli_distribution<RealType, Policy>& /* dist */)
     { // Range of permissible values for random variable k = {0, 1}.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
     }
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const bernoulli_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const bernoulli_distribution<RealType, Policy>& /* dist */)
     { // Range of supported values for random variable k = {0, 1}.
       // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-      return std::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
     }
 
     template <class RealType, class Policy>
-    inline RealType mean(const bernoulli_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const bernoulli_distribution<RealType, Policy>& dist)
     { // Mean of bernoulli distribution = p (n = 1).
       return dist.success_fraction();
     } // mean
@@ -159,13 +166,13 @@ namespace boost
     //} // median
 
     template <class RealType, class Policy>
-    inline RealType variance(const bernoulli_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const bernoulli_distribution<RealType, Policy>& dist)
     { // Variance of bernoulli distribution =p * q.
       return  dist.success_fraction() * (1 - dist.success_fraction());
     } // variance
 
     template <class RealType, class Policy>
-    RealType pdf(const bernoulli_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED RealType pdf(const bernoulli_distribution<RealType, Policy>& dist, const RealType& k)
     { // Probability Density/Mass Function.
       BOOST_FPU_EXCEPTION_GUARD
       // Error check:
@@ -190,7 +197,7 @@ namespace boost
     } // pdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const bernoulli_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const bernoulli_distribution<RealType, Policy>& dist, const RealType& k)
     { // Cumulative Distribution Function Bernoulli.
       RealType p = dist.success_fraction();
       // Error check:
@@ -214,7 +221,7 @@ namespace boost
     } // bernoulli cdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const complemented2_type<bernoulli_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<bernoulli_distribution<RealType, Policy>, RealType>& c)
     { // Complemented Cumulative Distribution Function bernoulli.
       RealType const& k = c.param;
       bernoulli_distribution<RealType, Policy> const& dist = c.dist;
@@ -240,7 +247,7 @@ namespace boost
     } // bernoulli cdf complement
 
     template <class RealType, class Policy>
-    inline RealType quantile(const bernoulli_distribution<RealType, Policy>& dist, const RealType& p)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const bernoulli_distribution<RealType, Policy>& dist, const RealType& p)
     { // Quantile or Percent Point Bernoulli function.
       // Return the number of expected successes k either 0 or 1.
       // for a given probability p.
@@ -265,7 +272,7 @@ namespace boost
     } // quantile
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<bernoulli_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<bernoulli_distribution<RealType, Policy>, RealType>& c)
     { // Quantile or Percent Point bernoulli function.
       // Return the number of expected successes k for a given
       // complement of the probability q.
@@ -294,13 +301,13 @@ namespace boost
     } // quantile complemented.
 
     template <class RealType, class Policy>
-    inline RealType mode(const bernoulli_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const bernoulli_distribution<RealType, Policy>& dist)
     {
       return static_cast<RealType>((dist.success_fraction() <= 0.5) ? 0 : 1); // p = 0.5 can be 0 or 1
     }
 
     template <class RealType, class Policy>
-    inline RealType skewness(const bernoulli_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const bernoulli_distribution<RealType, Policy>& dist)
     {
       BOOST_MATH_STD_USING; // Aid ADL for sqrt.
       RealType p = dist.success_fraction();
@@ -308,7 +315,7 @@ namespace boost
     }
 
     template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const bernoulli_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const bernoulli_distribution<RealType, Policy>& dist)
     {
       RealType p = dist.success_fraction();
       // Note Wolfram says this is kurtosis in text, but gamma2 is the kurtosis excess,
@@ -319,7 +326,7 @@ namespace boost
     }
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const bernoulli_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const bernoulli_distribution<RealType, Policy>& dist)
     {
       RealType p = dist.success_fraction();
       return 1 / (1 - p) + 1/p -6 + 3;
diff --git a/inst/include/boost/math/distributions/beta.hpp b/inst/include/boost/math/distributions/beta.hpp
index 6c17ffa1a..fef991a87 100644
--- a/inst/include/boost/math/distributions/beta.hpp
+++ b/inst/include/boost/math/distributions/beta.hpp
@@ -25,12 +25,15 @@
 #ifndef BOOST_MATH_DIST_BETA_HPP
 #define BOOST_MATH_DIST_BETA_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for beta.
 #include <boost/math/distributions/complement.hpp> // complements.
 #include <boost/math/distributions/detail/common_error_handling.hpp> // error checks
 #include <boost/math/special_functions/fpclassify.hpp> // isnan.
 #include <boost/math/tools/roots.hpp> // for root finding.
+#include <boost/math/policies/error_handling.hpp>
 
 #if defined (BOOST_MSVC)
 #  pragma warning(push)
@@ -38,8 +41,6 @@
 // in domain_error_imp in error_handling
 #endif
 
-#include <utility>
-
 namespace boost
 {
   namespace math
@@ -48,7 +49,7 @@ namespace boost
     {
       // Common error checking routines for beta distribution functions:
       template <class RealType, class Policy>
-      inline bool check_alpha(const char* function, const RealType& alpha, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_alpha(const char* function, const RealType& alpha, RealType* result, const Policy& pol)
       {
         if(!(boost::math::isfinite)(alpha) || (alpha <= 0))
         {
@@ -61,7 +62,7 @@ namespace boost
       } // bool check_alpha
 
       template <class RealType, class Policy>
-      inline bool check_beta(const char* function, const RealType& beta, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_beta(const char* function, const RealType& beta, RealType* result, const Policy& pol)
       {
         if(!(boost::math::isfinite)(beta) || (beta <= 0))
         {
@@ -74,7 +75,7 @@ namespace boost
       } // bool check_beta
 
       template <class RealType, class Policy>
-      inline bool check_prob(const char* function, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_prob(const char* function, const RealType& p, RealType* result, const Policy& pol)
       {
         if((p < 0) || (p > 1) || !(boost::math::isfinite)(p))
         {
@@ -87,7 +88,7 @@ namespace boost
       } // bool check_prob
 
       template <class RealType, class Policy>
-      inline bool check_x(const char* function, const RealType& x, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_x(const char* function, const RealType& x, RealType* result, const Policy& pol)
       {
         if(!(boost::math::isfinite)(x) || (x < 0) || (x > 1))
         {
@@ -100,28 +101,28 @@ namespace boost
       } // bool check_x
 
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& alpha, const RealType& beta, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& alpha, const RealType& beta, RealType* result, const Policy& pol)
       { // Check both alpha and beta.
         return check_alpha(function, alpha, result, pol)
           && check_beta(function, beta, result, pol);
       } // bool check_dist
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_x(const char* function, const RealType& alpha, const RealType& beta, RealType x, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_x(const char* function, const RealType& alpha, const RealType& beta, RealType x, RealType* result, const Policy& pol)
       {
         return check_dist(function, alpha, beta, result, pol)
           && beta_detail::check_x(function, x, result, pol);
       } // bool check_dist_and_x
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_prob(const char* function, const RealType& alpha, const RealType& beta, RealType p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_prob(const char* function, const RealType& alpha, const RealType& beta, RealType p, RealType* result, const Policy& pol)
       {
         return check_dist(function, alpha, beta, result, pol)
           && check_prob(function, p, result, pol);
       } // bool check_dist_and_prob
 
       template <class RealType, class Policy>
-      inline bool check_mean(const char* function, const RealType& mean, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_mean(const char* function, const RealType& mean, RealType* result, const Policy& pol)
       {
         if(!(boost::math::isfinite)(mean) || (mean <= 0))
         {
@@ -133,7 +134,7 @@ namespace boost
         return true;
       } // bool check_mean
       template <class RealType, class Policy>
-      inline bool check_variance(const char* function, const RealType& variance, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_variance(const char* function, const RealType& variance, RealType* result, const Policy& pol)
       {
         if(!(boost::math::isfinite)(variance) || (variance <= 0))
         {
@@ -157,7 +158,7 @@ namespace boost
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      beta_distribution(RealType l_alpha = 1, RealType l_beta = 1) : m_alpha(l_alpha), m_beta(l_beta)
+      BOOST_MATH_GPU_ENABLED beta_distribution(RealType l_alpha = 1, RealType l_beta = 1) : m_alpha(l_alpha), m_beta(l_beta)
       {
         RealType result;
         beta_detail::check_dist(
@@ -167,11 +168,11 @@ namespace boost
           &result, Policy());
       } // beta_distribution constructor.
       // Accessor functions:
-      RealType alpha() const
+      BOOST_MATH_GPU_ENABLED RealType alpha() const
       {
         return m_alpha;
       }
-      RealType beta() const
+      BOOST_MATH_GPU_ENABLED RealType beta() const
       { // .
         return m_beta;
       }
@@ -183,11 +184,11 @@ namespace boost
       // http://www.itl.nist.gov/div898/handbook/eda/section3/eda366h.htm
       // http://www.epi.ucdavis.edu/diagnostictests/betabuster.html
 
-      static RealType find_alpha(
+      BOOST_MATH_GPU_ENABLED static RealType find_alpha(
         RealType mean, // Expected value of mean.
         RealType variance) // Expected value of variance.
       {
-        static const char* function = "boost::math::beta_distribution<%1%>::find_alpha";
+        constexpr auto function = "boost::math::beta_distribution<%1%>::find_alpha";
         RealType result = 0; // of error checks.
         if(false ==
             (
@@ -201,11 +202,11 @@ namespace boost
         return mean * (( (mean * (1 - mean)) / variance)- 1);
       } // RealType find_alpha
 
-      static RealType find_beta(
+      BOOST_MATH_GPU_ENABLED static RealType find_beta(
         RealType mean, // Expected value of mean.
         RealType variance) // Expected value of variance.
       {
-        static const char* function = "boost::math::beta_distribution<%1%>::find_beta";
+        constexpr auto function = "boost::math::beta_distribution<%1%>::find_beta";
         RealType result = 0; // of error checks.
         if(false ==
             (
@@ -223,12 +224,12 @@ namespace boost
       // Estimate alpha & beta from either alpha or beta, and x and probability.
       // Uses for these parameter estimators are unclear.
 
-      static RealType find_alpha(
+      BOOST_MATH_GPU_ENABLED static RealType find_alpha(
         RealType beta, // from beta.
         RealType x, //  x.
         RealType probability) // cdf
       {
-        static const char* function = "boost::math::beta_distribution<%1%>::find_alpha";
+        constexpr auto function = "boost::math::beta_distribution<%1%>::find_alpha";
         RealType result = 0; // of error checks.
         if(false ==
             (
@@ -245,13 +246,13 @@ namespace boost
         return static_cast<RealType>(ibeta_inva(beta, x, probability, Policy()));
       } // RealType find_alpha(beta, a, probability)
 
-      static RealType find_beta(
+      BOOST_MATH_GPU_ENABLED static RealType find_beta(
         // ibeta_invb(T b, T x, T p); (alpha, x, cdf,)
         RealType alpha, // alpha.
         RealType x, // probability x.
         RealType probability) // probability cdf.
       {
-        static const char* function = "boost::math::beta_distribution<%1%>::find_beta";
+        constexpr auto function = "boost::math::beta_distribution<%1%>::find_beta";
         RealType result = 0; // of error checks.
         if(false ==
             (
@@ -281,27 +282,27 @@ namespace boost
     #endif
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const beta_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const beta_distribution<RealType, Policy>& /* dist */)
     { // Range of permissible values for random variable x.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
     }
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const beta_distribution<RealType, Policy>&  /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const beta_distribution<RealType, Policy>&  /* dist */)
     { // Range of supported values for random variable x.
       // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-      return std::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
     }
 
     template <class RealType, class Policy>
-    inline RealType mean(const beta_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const beta_distribution<RealType, Policy>& dist)
     { // Mean of beta distribution = np.
       return  dist.alpha() / (dist.alpha() + dist.beta());
     } // mean
 
     template <class RealType, class Policy>
-    inline RealType variance(const beta_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const beta_distribution<RealType, Policy>& dist)
     { // Variance of beta distribution = np(1-p).
       RealType a = dist.alpha();
       RealType b = dist.beta();
@@ -309,9 +310,9 @@ namespace boost
     } // variance
 
     template <class RealType, class Policy>
-    inline RealType mode(const beta_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const beta_distribution<RealType, Policy>& dist)
     {
-      static const char* function = "boost::math::mode(beta_distribution<%1%> const&)";
+      constexpr auto function = "boost::math::mode(beta_distribution<%1%> const&)";
 
       RealType result;
       if ((dist.alpha() <= 1))
@@ -343,7 +344,7 @@ namespace boost
     //But WILL be provided by the derived accessor as quantile(0.5).
 
     template <class RealType, class Policy>
-    inline RealType skewness(const beta_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const beta_distribution<RealType, Policy>& dist)
     {
       BOOST_MATH_STD_USING // ADL of std functions.
       RealType a = dist.alpha();
@@ -352,7 +353,7 @@ namespace boost
     } // skewness
 
     template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const beta_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const beta_distribution<RealType, Policy>& dist)
     {
       RealType a = dist.alpha();
       RealType b = dist.beta();
@@ -363,17 +364,17 @@ namespace boost
     } // kurtosis_excess
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const beta_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const beta_distribution<RealType, Policy>& dist)
     {
       return 3 + kurtosis_excess(dist);
     } // kurtosis
 
     template <class RealType, class Policy>
-    inline RealType pdf(const beta_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType pdf(const beta_distribution<RealType, Policy>& dist, const RealType& x)
     { // Probability Density/Mass Function.
       BOOST_FPU_EXCEPTION_GUARD
 
-      static const char* function = "boost::math::pdf(beta_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::pdf(beta_distribution<%1%> const&, %1%)";
 
       BOOST_MATH_STD_USING // for ADL of std functions
 
@@ -428,11 +429,11 @@ namespace boost
     } // pdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const beta_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const beta_distribution<RealType, Policy>& dist, const RealType& x)
     { // Cumulative Distribution Function beta.
       BOOST_MATH_STD_USING // for ADL of std functions
 
-      static const char* function = "boost::math::cdf(beta_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::cdf(beta_distribution<%1%> const&, %1%)";
 
       RealType a = dist.alpha();
       RealType b = dist.beta();
@@ -459,12 +460,12 @@ namespace boost
     } // beta cdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const complemented2_type<beta_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<beta_distribution<RealType, Policy>, RealType>& c)
     { // Complemented Cumulative Distribution Function beta.
 
       BOOST_MATH_STD_USING // for ADL of std functions
 
-      static const char* function = "boost::math::cdf(beta_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::cdf(beta_distribution<%1%> const&, %1%)";
 
       RealType const& x = c.param;
       beta_distribution<RealType, Policy> const& dist = c.dist;
@@ -495,7 +496,7 @@ namespace boost
     } // beta cdf
 
     template <class RealType, class Policy>
-    inline RealType quantile(const beta_distribution<RealType, Policy>& dist, const RealType& p)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const beta_distribution<RealType, Policy>& dist, const RealType& p)
     { // Quantile or Percent Point beta function or
       // Inverse Cumulative probability distribution function CDF.
       // Return x (0 <= x <= 1),
@@ -505,7 +506,7 @@ namespace boost
       // will be less than or equal to that value
       // is whatever probability you supplied as an argument.
 
-      static const char* function = "boost::math::quantile(beta_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::quantile(beta_distribution<%1%> const&, %1%)";
 
       RealType result = 0; // of argument checks:
       RealType a = dist.alpha();
@@ -530,12 +531,12 @@ namespace boost
     } // quantile
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<beta_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<beta_distribution<RealType, Policy>, RealType>& c)
     { // Complement Quantile or Percent Point beta function .
       // Return the number of expected x for a given
       // complement of the probability q.
 
-      static const char* function = "boost::math::quantile(beta_distribution<%1%> const&, %1%)";
+      constexpr auto function = "boost::math::quantile(beta_distribution<%1%> const&, %1%)";
 
       //
       // Error checks:
diff --git a/inst/include/boost/math/distributions/binomial.hpp b/inst/include/boost/math/distributions/binomial.hpp
index 05ef01ab8..b17893e42 100644
--- a/inst/include/boost/math/distributions/binomial.hpp
+++ b/inst/include/boost/math/distributions/binomial.hpp
@@ -79,6 +79,8 @@
 #ifndef BOOST_MATH_SPECIAL_BINOMIAL_HPP
 #define BOOST_MATH_SPECIAL_BINOMIAL_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for incomplete beta.
 #include <boost/math/distributions/complement.hpp> // complements
@@ -100,7 +102,7 @@ namespace boost
      namespace binomial_detail{
         // common error checking routines for binomial distribution functions:
         template <class RealType, class Policy>
-        inline bool check_N(const char* function, const RealType& N, RealType* result, const Policy& pol)
+        BOOST_MATH_CUDA_ENABLED inline bool check_N(const char* function, const RealType& N, RealType* result, const Policy& pol)
         {
            if((N < 0) || !(boost::math::isfinite)(N))
            {
@@ -112,7 +114,7 @@ namespace boost
            return true;
         }
         template <class RealType, class Policy>
-        inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& pol)
+        BOOST_MATH_CUDA_ENABLED inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& pol)
         {
            if((p < 0) || (p > 1) || !(boost::math::isfinite)(p))
            {
@@ -124,7 +126,7 @@ namespace boost
            return true;
         }
         template <class RealType, class Policy>
-        inline bool check_dist(const char* function, const RealType& N, const RealType& p, RealType* result, const Policy& pol)
+        BOOST_MATH_CUDA_ENABLED inline bool check_dist(const char* function, const RealType& N, const RealType& p, RealType* result, const Policy& pol)
         {
            return check_success_fraction(
               function, p, result, pol)
@@ -132,7 +134,7 @@ namespace boost
                function, N, result, pol);
         }
         template <class RealType, class Policy>
-        inline bool check_dist_and_k(const char* function, const RealType& N, const RealType& p, RealType k, RealType* result, const Policy& pol)
+        BOOST_MATH_CUDA_ENABLED inline bool check_dist_and_k(const char* function, const RealType& N, const RealType& p, RealType k, RealType* result, const Policy& pol)
         {
            if(check_dist(function, N, p, result, pol) == false)
               return false;
@@ -153,7 +155,7 @@ namespace boost
            return true;
         }
         template <class RealType, class Policy>
-        inline bool check_dist_and_prob(const char* function, const RealType& N, RealType p, RealType prob, RealType* result, const Policy& pol)
+        BOOST_MATH_CUDA_ENABLED inline bool check_dist_and_prob(const char* function, const RealType& N, RealType p, RealType prob, RealType* result, const Policy& pol)
         {
            if((check_dist(function, N, p, result, pol) && detail::check_probability(function, prob, result, pol)) == false)
               return false;
@@ -161,7 +163,7 @@ namespace boost
         }
 
          template <class T, class Policy>
-         T inverse_binomial_cornish_fisher(T n, T sf, T p, T q, const Policy& pol)
+         BOOST_MATH_CUDA_ENABLED T inverse_binomial_cornish_fisher(T n, T sf, T p, T q, const Policy& pol)
          {
             BOOST_MATH_STD_USING
             // mean:
@@ -196,7 +198,7 @@ namespace boost
          }
 
       template <class RealType, class Policy>
-      RealType quantile_imp(const binomial_distribution<RealType, Policy>& dist, const RealType& p, const RealType& q, bool comp)
+      BOOST_MATH_CUDA_ENABLED RealType quantile_imp(const binomial_distribution<RealType, Policy>& dist, const RealType& p, const RealType& q, bool comp)
       { // Quantile or Percent Point Binomial function.
         // Return the number of expected successes k,
         // for a given probability p.
@@ -258,7 +260,7 @@ namespace boost
 
         typedef typename Policy::discrete_quantile_type discrete_quantile_type;
         std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
-        return detail::inverse_discrete_quantile(
+        result = detail::inverse_discrete_quantile(
             dist,
             comp ? q : p,
             comp,
@@ -267,6 +269,7 @@ namespace boost
             RealType(1),
             discrete_quantile_type(),
             max_iter);
+        return result;
       } // quantile
 
      }
@@ -289,11 +292,11 @@ namespace boost
             &r, Policy());
       } // binomial_distribution constructor.
 
-      RealType success_fraction() const
+      BOOST_MATH_CUDA_ENABLED RealType success_fraction() const
       { // Probability.
         return m_p;
       }
-      RealType trials() const
+      BOOST_MATH_CUDA_ENABLED RealType trials() const
       { // Total number of trials.
         return m_n;
       }
@@ -309,13 +312,13 @@ namespace boost
       // these functions are used
       // to obtain confidence intervals for the success fraction.
       //
-      static RealType find_lower_bound_on_p(
+      BOOST_MATH_CUDA_ENABLED static RealType find_lower_bound_on_p(
          RealType trials,
          RealType successes,
          RealType probability,
          interval_type t = clopper_pearson_exact_interval)
       {
-        static const char* function = "boost::math::binomial_distribution<%1%>::find_lower_bound_on_p";
+        BOOST_MATH_STATIC const char* function = "boost::math::binomial_distribution<%1%>::find_lower_bound_on_p";
         // Error checks:
         RealType result = 0;
         if(false == binomial_detail::check_dist_and_k(
@@ -334,13 +337,13 @@ namespace boost
         return (t == clopper_pearson_exact_interval) ? ibeta_inv(successes, trials - successes + 1, probability, static_cast<RealType*>(nullptr), Policy())
            : ibeta_inv(successes + 0.5f, trials - successes + 0.5f, probability, static_cast<RealType*>(nullptr), Policy());
       }
-      static RealType find_upper_bound_on_p(
+      BOOST_MATH_CUDA_ENABLED static RealType find_upper_bound_on_p(
          RealType trials,
          RealType successes,
          RealType probability,
          interval_type t = clopper_pearson_exact_interval)
       {
-        static const char* function = "boost::math::binomial_distribution<%1%>::find_upper_bound_on_p";
+        BOOST_MATH_STATIC const char* function = "boost::math::binomial_distribution<%1%>::find_upper_bound_on_p";
         // Error checks:
         RealType result = 0;
         if(false == binomial_detail::check_dist_and_k(
@@ -362,12 +365,12 @@ namespace boost
       //    or
       // "How many trials can I have to be P% sure of seeing fewer than k events?"
       //
-      static RealType find_minimum_number_of_trials(
+      BOOST_MATH_CUDA_ENABLED static RealType find_minimum_number_of_trials(
          RealType k,     // number of events
          RealType p,     // success fraction
          RealType alpha) // risk level
       {
-        static const char* function = "boost::math::binomial_distribution<%1%>::find_minimum_number_of_trials";
+        BOOST_MATH_STATIC const char* function = "boost::math::binomial_distribution<%1%>::find_minimum_number_of_trials";
         // Error checks:
         RealType result = 0;
         if(false == binomial_detail::check_dist_and_k(
@@ -381,12 +384,12 @@ namespace boost
         return result + k;
       }
 
-      static RealType find_maximum_number_of_trials(
+      BOOST_MATH_CUDA_ENABLED static RealType find_maximum_number_of_trials(
          RealType k,     // number of events
          RealType p,     // success fraction
          RealType alpha) // risk level
       {
-        static const char* function = "boost::math::binomial_distribution<%1%>::find_maximum_number_of_trials";
+        BOOST_MATH_STATIC const char* function = "boost::math::binomial_distribution<%1%>::find_maximum_number_of_trials";
         // Error checks:
         RealType result = 0;
         if(false == binomial_detail::check_dist_and_k(
@@ -418,33 +421,33 @@ namespace boost
       #endif
 
       template <class RealType, class Policy>
-      const std::pair<RealType, RealType> range(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED const boost::math::pair<RealType, RealType> range(const binomial_distribution<RealType, Policy>& dist)
       { // Range of permissible values for random variable k.
         using boost::math::tools::max_value;
-        return std::pair<RealType, RealType>(static_cast<RealType>(0), dist.trials());
+        return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), dist.trials());
       }
 
       template <class RealType, class Policy>
-      const std::pair<RealType, RealType> support(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED const boost::math::pair<RealType, RealType> support(const binomial_distribution<RealType, Policy>& dist)
       { // Range of supported values for random variable k.
         // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-        return std::pair<RealType, RealType>(static_cast<RealType>(0),  dist.trials());
+        return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  dist.trials());
       }
 
       template <class RealType, class Policy>
-      inline RealType mean(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType mean(const binomial_distribution<RealType, Policy>& dist)
       { // Mean of Binomial distribution = np.
         return  dist.trials() * dist.success_fraction();
       } // mean
 
       template <class RealType, class Policy>
-      inline RealType variance(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType variance(const binomial_distribution<RealType, Policy>& dist)
       { // Variance of Binomial distribution = np(1-p).
         return  dist.trials() * dist.success_fraction() * (1 - dist.success_fraction());
       } // variance
 
       template <class RealType, class Policy>
-      RealType pdf(const binomial_distribution<RealType, Policy>& dist, const RealType& k)
+      BOOST_MATH_CUDA_ENABLED RealType pdf(const binomial_distribution<RealType, Policy>& dist, const RealType& k)
       { // Probability Density/Mass Function.
         BOOST_FPU_EXCEPTION_GUARD
 
@@ -500,7 +503,7 @@ namespace boost
       } // pdf
 
       template <class RealType, class Policy>
-      inline RealType cdf(const binomial_distribution<RealType, Policy>& dist, const RealType& k)
+      BOOST_MATH_CUDA_ENABLED inline RealType cdf(const binomial_distribution<RealType, Policy>& dist, const RealType& k)
       { // Cumulative Distribution Function Binomial.
         // The random variate k is the number of successes in n trials.
         // k argument may be integral, signed, or unsigned, or floating point.
@@ -572,7 +575,7 @@ namespace boost
       } // binomial cdf
 
       template <class RealType, class Policy>
-      inline RealType cdf(const complemented2_type<binomial_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_CUDA_ENABLED inline RealType cdf(const complemented2_type<binomial_distribution<RealType, Policy>, RealType>& c)
       { // Complemented Cumulative Distribution Function Binomial.
         // The random variate k is the number of successes in n trials.
         // k argument may be integral, signed, or unsigned, or floating point.
@@ -649,19 +652,19 @@ namespace boost
       } // binomial cdf
 
       template <class RealType, class Policy>
-      inline RealType quantile(const binomial_distribution<RealType, Policy>& dist, const RealType& p)
+      BOOST_MATH_CUDA_ENABLED inline RealType quantile(const binomial_distribution<RealType, Policy>& dist, const RealType& p)
       {
          return binomial_detail::quantile_imp(dist, p, RealType(1-p), false);
       } // quantile
 
       template <class RealType, class Policy>
-      RealType quantile(const complemented2_type<binomial_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_CUDA_ENABLED RealType quantile(const complemented2_type<binomial_distribution<RealType, Policy>, RealType>& c)
       {
          return binomial_detail::quantile_imp(c.dist, RealType(1-c.param), c.param, true);
       } // quantile
 
       template <class RealType, class Policy>
-      inline RealType mode(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType mode(const binomial_distribution<RealType, Policy>& dist)
       {
          BOOST_MATH_STD_USING // ADL of std functions.
          RealType p = dist.success_fraction();
@@ -670,7 +673,7 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType median(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType median(const binomial_distribution<RealType, Policy>& dist)
       { // Bounds for the median of the negative binomial distribution
         // VAN DE VEN R. ; WEBER N. C. ;
         // Univ. Sydney, school mathematics statistics, Sydney N.S.W. 2006, AUSTRALIE
@@ -688,7 +691,7 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType skewness(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType skewness(const binomial_distribution<RealType, Policy>& dist)
       {
          BOOST_MATH_STD_USING // ADL of std functions.
          RealType p = dist.success_fraction();
@@ -697,7 +700,7 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType kurtosis(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType kurtosis(const binomial_distribution<RealType, Policy>& dist)
       {
          RealType p = dist.success_fraction();
          RealType n = dist.trials();
@@ -705,7 +708,7 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType kurtosis_excess(const binomial_distribution<RealType, Policy>& dist)
+      BOOST_MATH_CUDA_ENABLED inline RealType kurtosis_excess(const binomial_distribution<RealType, Policy>& dist)
       {
          RealType p = dist.success_fraction();
          RealType q = 1 - p;
diff --git a/inst/include/boost/math/distributions/cauchy.hpp b/inst/include/boost/math/distributions/cauchy.hpp
index d914cca77..3a5af69e4 100644
--- a/inst/include/boost/math/distributions/cauchy.hpp
+++ b/inst/include/boost/math/distributions/cauchy.hpp
@@ -1,5 +1,6 @@
 // Copyright John Maddock 2006, 2007.
 // Copyright Paul A. Bristow 2007.
+// Copyright Matt Borland 2024.
 
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
@@ -13,12 +14,21 @@
 #pragma warning(disable : 4127) // conditional expression is constant
 #endif
 
-#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/precision.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
 #include <utility>
 #include <cmath>
+#endif
 
 namespace boost{ namespace math
 {
@@ -30,7 +40,7 @@ namespace detail
 {
 
 template <class RealType, class Policy>
-RealType cdf_imp(const cauchy_distribution<RealType, Policy>& dist, const RealType& x, bool complement)
+BOOST_MATH_GPU_ENABLED RealType cdf_imp(const cauchy_distribution<RealType, Policy>& dist, const RealType& x, bool complement)
 {
    //
    // This calculates the cdf of the Cauchy distribution and/or its complement.
@@ -47,14 +57,14 @@ RealType cdf_imp(const cauchy_distribution<RealType, Policy>& dist, const RealTy
    //
    // Substituting into the above we get:
    //
-   // CDF = -atan(1/x)  ; x < 0
+   // CDF = -atan(1/x)/pi  ; x < 0
    //
    // So the procedure is to calculate the cdf for -fabs(x)
    // using the above formula, and then subtract from 1 when required
    // to get the result.
    //
    BOOST_MATH_STD_USING // for ADL of std functions
-   static const char* function = "boost::math::cdf(cauchy<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(cauchy<%1%>&, %1%)";
    RealType result = 0;
    RealType location = dist.location();
    RealType scale = dist.scale();
@@ -66,14 +76,25 @@ RealType cdf_imp(const cauchy_distribution<RealType, Policy>& dist, const RealTy
    {
       return result;
    }
-   if(std::numeric_limits<RealType>::has_infinity && x == std::numeric_limits<RealType>::infinity())
+   #ifdef BOOST_MATH_HAS_GPU_SUPPORT
+   if(x > tools::max_value<RealType>())
+   {
+      return static_cast<RealType>((complement) ? 0 : 1);
+   }
+   if(x < -tools::max_value<RealType>())
+   {
+      return static_cast<RealType>((complement) ? 1 : 0);
+   }
+   #else
+   if(boost::math::numeric_limits<RealType>::has_infinity && x == boost::math::numeric_limits<RealType>::infinity())
    { // cdf +infinity is unity.
      return static_cast<RealType>((complement) ? 0 : 1);
    }
-   if(std::numeric_limits<RealType>::has_infinity && x == -std::numeric_limits<RealType>::infinity())
+   if(boost::math::numeric_limits<RealType>::has_infinity && x == -boost::math::numeric_limits<RealType>::infinity())
    { // cdf -infinity is zero.
      return static_cast<RealType>((complement) ? 1 : 0);
    }
+   #endif
    if(false == detail::check_x(function, x, &result, Policy()))
    { // Catches x == NaN
       return result;
@@ -88,20 +109,19 @@ RealType cdf_imp(const cauchy_distribution<RealType, Policy>& dist, const RealTy
 } // cdf
 
 template <class RealType, class Policy>
-RealType quantile_imp(
+BOOST_MATH_GPU_ENABLED RealType quantile_imp(
       const cauchy_distribution<RealType, Policy>& dist,
-      const RealType& p,
+      RealType p,
       bool complement)
 {
    // This routine implements the quantile for the Cauchy distribution,
    // the value p may be the probability, or its complement if complement=true.
    //
-   // The procedure first performs argument reduction on p to avoid error
-   // when calculating the tangent, then calculates the distance from the
+   // The procedure calculates the distance from the
    // mid-point of the distribution.  This is either added or subtracted
    // from the location parameter depending on whether `complement` is true.
    //
-   static const char* function = "boost::math::quantile(cauchy<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(cauchy<%1%>&, %1%)";
    BOOST_MATH_STD_USING // for ADL of std functions
 
    RealType result = 0;
@@ -129,16 +149,15 @@ RealType quantile_imp(
       return (complement ? 1 : -1) * policies::raise_overflow_error<RealType>(function, 0, Policy());
    }
 
-   RealType P = p - floor(p);   // argument reduction of p:
-   if(P > 0.5)
+   if(p > 0.5)
    {
-      P = P - 1;
+      p = p - 1;
    }
-   if(P == 0.5)   // special case:
+   if(p == 0.5)   // special case:
    {
       return location;
    }
-   result = -scale / tan(constants::pi<RealType>() * P);
+   result = -scale / tan(constants::pi<RealType>() * p);
    return complement ? RealType(location - result) : RealType(location + result);
 } // quantile
 
@@ -151,20 +170,20 @@ class cauchy_distribution
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   cauchy_distribution(RealType l_location = 0, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED cauchy_distribution(RealType l_location = 0, RealType l_scale = 1)
       : m_a(l_location), m_hg(l_scale)
    {
-    static const char* function = "boost::math::cauchy_distribution<%1%>::cauchy_distribution";
+    constexpr auto function = "boost::math::cauchy_distribution<%1%>::cauchy_distribution";
      RealType result;
      detail::check_location(function, l_location, &result, Policy());
      detail::check_scale(function, l_scale, &result, Policy());
    } // cauchy_distribution
 
-   RealType location()const
+   BOOST_MATH_GPU_ENABLED RealType location()const
    {
       return m_a;
    }
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    {
       return m_hg;
    }
@@ -184,48 +203,48 @@ cauchy_distribution(RealType,RealType)->cauchy_distribution<typename boost::math
 #endif
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> range(const cauchy_distribution<RealType, Policy>&)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const cauchy_distribution<RealType, Policy>&)
 { // Range of permissible values for random variable x.
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { 
-     return std::pair<RealType, RealType>(-std::numeric_limits<RealType>::infinity(), std::numeric_limits<RealType>::infinity()); // - to + infinity.
+     return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
   }
   else
   { // Can only use max_value.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max.
+   return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max.
   }
 }
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> support(const cauchy_distribution<RealType, Policy>& )
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const cauchy_distribution<RealType, Policy>& )
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { 
-     return std::pair<RealType, RealType>(-std::numeric_limits<RealType>::infinity(), std::numeric_limits<RealType>::infinity()); // - to + infinity.
+     return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
   }
   else
   { // Can only use max_value.
      using boost::math::tools::max_value;
-     return std::pair<RealType, RealType>(-tools::max_value<RealType>(), max_value<RealType>()); // - to + max.
+     return boost::math::pair<RealType, RealType>(-tools::max_value<RealType>(), max_value<RealType>()); // - to + max.
   }
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const cauchy_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const cauchy_distribution<RealType, Policy>& dist, const RealType& x)
 {  
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::pdf(cauchy<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(cauchy<%1%>&, %1%)";
    RealType result = 0;
    RealType location = dist.location();
    RealType scale = dist.scale();
-   if(false == detail::check_scale("boost::math::pdf(cauchy<%1%>&, %1%)", scale, &result, Policy()))
+   if(false == detail::check_scale(function, scale, &result, Policy()))
    {
       return result;
    }
-   if(false == detail::check_location("boost::math::pdf(cauchy<%1%>&, %1%)", location, &result, Policy()))
+   if(false == detail::check_location(function, location, &result, Policy()))
    {
       return result;
    }
@@ -234,7 +253,7 @@ inline RealType pdf(const cauchy_distribution<RealType, Policy>& dist, const Rea
      return 0; // pdf + and - infinity is zero.
    }
    // These produce MSVC 4127 warnings, so the above used instead.
-   //if(std::numeric_limits<RealType>::has_infinity && abs(x) == std::numeric_limits<RealType>::infinity())
+   //if(boost::math::numeric_limits<RealType>::has_infinity && abs(x) == boost::math::numeric_limits<RealType>::infinity())
    //{ // pdf + and - infinity is zero.
    //  return 0;
    //}
@@ -250,111 +269,112 @@ inline RealType pdf(const cauchy_distribution<RealType, Policy>& dist, const Rea
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const cauchy_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const cauchy_distribution<RealType, Policy>& dist, const RealType& x)
 {
    return detail::cdf_imp(dist, x, false);
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const cauchy_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const cauchy_distribution<RealType, Policy>& dist, const RealType& p)
 {
    return detail::quantile_imp(dist, p, false);
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<cauchy_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<cauchy_distribution<RealType, Policy>, RealType>& c)
 {
    return detail::cdf_imp(c.dist, c.param, true);
 } //  cdf complement
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<cauchy_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<cauchy_distribution<RealType, Policy>, RealType>& c)
 {
    return detail::quantile_imp(c.dist, c.param, true);
 } // quantile complement
 
 template <class RealType, class Policy>
-inline RealType mean(const cauchy_distribution<RealType, Policy>&)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const cauchy_distribution<RealType, Policy>&)
 {  // There is no mean:
    typedef typename Policy::assert_undefined_type assert_type;
-   static_assert(assert_type::value == 0, "assert type is undefined");
+   static_assert(assert_type::value == 0, "The Cauchy Distribution has no mean");
 
    return policies::raise_domain_error<RealType>(
       "boost::math::mean(cauchy<%1%>&)",
       "The Cauchy distribution does not have a mean: "
       "the only possible return value is %1%.",
-      std::numeric_limits<RealType>::quiet_NaN(), Policy());
+      boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
 }
 
 template <class RealType, class Policy>
-inline RealType variance(const cauchy_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const cauchy_distribution<RealType, Policy>& /*dist*/)
 {
    // There is no variance:
    typedef typename Policy::assert_undefined_type assert_type;
-   static_assert(assert_type::value == 0, "assert type is undefined");
+   static_assert(assert_type::value == 0, "The Cauchy Distribution has no variance");
 
    return policies::raise_domain_error<RealType>(
       "boost::math::variance(cauchy<%1%>&)",
       "The Cauchy distribution does not have a variance: "
       "the only possible return value is %1%.",
-      std::numeric_limits<RealType>::quiet_NaN(), Policy());
+      boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const cauchy_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const cauchy_distribution<RealType, Policy>& dist)
 {
    return dist.location();
 }
 
 template <class RealType, class Policy>
-inline RealType median(const cauchy_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const cauchy_distribution<RealType, Policy>& dist)
 {
    return dist.location();
 }
+
 template <class RealType, class Policy>
-inline RealType skewness(const cauchy_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const cauchy_distribution<RealType, Policy>& /*dist*/)
 {
    // There is no skewness:
    typedef typename Policy::assert_undefined_type assert_type;
-   static_assert(assert_type::value == 0, "assert type is undefined");
+   static_assert(assert_type::value == 0, "The Cauchy Distribution has no skewness");
 
    return policies::raise_domain_error<RealType>(
       "boost::math::skewness(cauchy<%1%>&)",
       "The Cauchy distribution does not have a skewness: "
       "the only possible return value is %1%.",
-      std::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+      boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const cauchy_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const cauchy_distribution<RealType, Policy>& /*dist*/)
 {
    // There is no kurtosis:
    typedef typename Policy::assert_undefined_type assert_type;
-   static_assert(assert_type::value == 0, "assert type is undefined");
+   static_assert(assert_type::value == 0, "The Cauchy Distribution has no kurtosis");
 
    return policies::raise_domain_error<RealType>(
       "boost::math::kurtosis(cauchy<%1%>&)",
       "The Cauchy distribution does not have a kurtosis: "
       "the only possible return value is %1%.",
-      std::numeric_limits<RealType>::quiet_NaN(), Policy());
+      boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const cauchy_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const cauchy_distribution<RealType, Policy>& /*dist*/)
 {
    // There is no kurtosis excess:
    typedef typename Policy::assert_undefined_type assert_type;
-   static_assert(assert_type::value == 0, "assert type is undefined");
+   static_assert(assert_type::value == 0, "The Cauchy Distribution has no kurtosis excess");
 
    return policies::raise_domain_error<RealType>(
       "boost::math::kurtosis_excess(cauchy<%1%>&)",
       "The Cauchy distribution does not have a kurtosis: "
       "the only possible return value is %1%.",
-      std::numeric_limits<RealType>::quiet_NaN(), Policy());
+      boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const cauchy_distribution<RealType, Policy> & dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const cauchy_distribution<RealType, Policy> & dist)
 {
    using std::log;
    return log(2*constants::two_pi<RealType>()*dist.scale());
diff --git a/inst/include/boost/math/distributions/chi_squared.hpp b/inst/include/boost/math/distributions/chi_squared.hpp
index 7b65a0da6..3944569e8 100644
--- a/inst/include/boost/math/distributions/chi_squared.hpp
+++ b/inst/include/boost/math/distributions/chi_squared.hpp
@@ -9,14 +9,17 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_CHI_SQUARED_HPP
 #define BOOST_MATH_DISTRIBUTIONS_CHI_SQUARED_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/toms748_solve.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp> // for incomplete beta.
 #include <boost/math/distributions/complement.hpp> // complements
 #include <boost/math/distributions/detail/common_error_handling.hpp> // error checks
 #include <boost/math/special_functions/fpclassify.hpp>
 
-#include <utility>
-
 namespace boost{ namespace math{
 
 template <class RealType = double, class Policy = policies::policy<> >
@@ -26,20 +29,20 @@ class chi_squared_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit chi_squared_distribution(RealType i) : m_df(i)
+   BOOST_MATH_GPU_ENABLED explicit chi_squared_distribution(RealType i) : m_df(i)
    {
       RealType result;
       detail::check_df(
          "boost::math::chi_squared_distribution<%1%>::chi_squared_distribution", m_df, &result, Policy());
    } // chi_squared_distribution
 
-   RealType degrees_of_freedom()const
+   BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom()const
    {
       return m_df;
    }
 
    // Parameter estimation:
-   static RealType find_degrees_of_freedom(
+   BOOST_MATH_GPU_ENABLED static RealType find_degrees_of_freedom(
       RealType difference_from_variance,
       RealType alpha,
       RealType beta,
@@ -66,16 +69,16 @@ chi_squared_distribution(RealType)->chi_squared_distribution<typename boost::mat
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const chi_squared_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const chi_squared_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { 
-    return std::pair<RealType, RealType>(static_cast<RealType>(0), std::numeric_limits<RealType>::infinity()); // 0 to + infinity.
+    return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), boost::math::numeric_limits<RealType>::infinity()); // 0 to + infinity.
   }
   else
   {
     using boost::math::tools::max_value;
-    return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // 0 to + max.
+    return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // 0 to + max.
   }
 }
 
@@ -84,21 +87,21 @@ inline std::pair<RealType, RealType> range(const chi_squared_distribution<RealTy
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const chi_squared_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const chi_squared_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), tools::max_value<RealType>()); // 0 to + infinity.
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), tools::max_value<RealType>()); // 0 to + infinity.
 }
 
 template <class RealType, class Policy>
-RealType pdf(const chi_squared_distribution<RealType, Policy>& dist, const RealType& chi_square)
+BOOST_MATH_GPU_ENABLED RealType pdf(const chi_squared_distribution<RealType, Policy>& dist, const RealType& chi_square)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
    RealType degrees_of_freedom = dist.degrees_of_freedom();
    // Error check:
    RealType error_result;
 
-   static const char* function = "boost::math::pdf(const chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const chi_squared_distribution<%1%>&, %1%)";
 
    if(false == detail::check_df(
          function, degrees_of_freedom, &error_result, Policy()))
@@ -132,12 +135,12 @@ RealType pdf(const chi_squared_distribution<RealType, Policy>& dist, const RealT
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const chi_squared_distribution<RealType, Policy>& dist, const RealType& chi_square)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const chi_squared_distribution<RealType, Policy>& dist, const RealType& chi_square)
 {
    RealType degrees_of_freedom = dist.degrees_of_freedom();
    // Error check:
    RealType error_result;
-   static const char* function = "boost::math::cdf(const chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const chi_squared_distribution<%1%>&, %1%)";
 
    if(false == detail::check_df(
          function, degrees_of_freedom, &error_result, Policy()))
@@ -153,10 +156,10 @@ inline RealType cdf(const chi_squared_distribution<RealType, Policy>& dist, cons
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const chi_squared_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const chi_squared_distribution<RealType, Policy>& dist, const RealType& p)
 {
    RealType degrees_of_freedom = dist.degrees_of_freedom();
-   static const char* function = "boost::math::quantile(const chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const chi_squared_distribution<%1%>&, %1%)";
    // Error check:
    RealType error_result;
    if(false ==
@@ -170,11 +173,11 @@ inline RealType quantile(const chi_squared_distribution<RealType, Policy>& dist,
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<chi_squared_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<chi_squared_distribution<RealType, Policy>, RealType>& c)
 {
    RealType const& degrees_of_freedom = c.dist.degrees_of_freedom();
    RealType const& chi_square = c.param;
-   static const char* function = "boost::math::cdf(const chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const chi_squared_distribution<%1%>&, %1%)";
    // Error check:
    RealType error_result;
    if(false == detail::check_df(
@@ -191,11 +194,11 @@ inline RealType cdf(const complemented2_type<chi_squared_distribution<RealType,
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<chi_squared_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<chi_squared_distribution<RealType, Policy>, RealType>& c)
 {
    RealType const& degrees_of_freedom = c.dist.degrees_of_freedom();
    RealType const& q = c.param;
-   static const char* function = "boost::math::quantile(const chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const chi_squared_distribution<%1%>&, %1%)";
    // Error check:
    RealType error_result;
    if(false == (
@@ -208,22 +211,22 @@ inline RealType quantile(const complemented2_type<chi_squared_distribution<RealT
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const chi_squared_distribution<RealType, Policy>& dist)
 { // Mean of Chi-Squared distribution = v.
   return dist.degrees_of_freedom();
 } // mean
 
 template <class RealType, class Policy>
-inline RealType variance(const chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const chi_squared_distribution<RealType, Policy>& dist)
 { // Variance of Chi-Squared distribution = 2v.
   return 2 * dist.degrees_of_freedom();
 } // variance
 
 template <class RealType, class Policy>
-inline RealType mode(const chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const chi_squared_distribution<RealType, Policy>& dist)
 {
    RealType df = dist.degrees_of_freedom();
-   static const char* function = "boost::math::mode(const chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mode(const chi_squared_distribution<%1%>&)";
 
    if(df < 2)
       return policies::raise_domain_error<RealType>(
@@ -234,7 +237,7 @@ inline RealType mode(const chi_squared_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const chi_squared_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING // For ADL
    RealType df = dist.degrees_of_freedom();
@@ -242,14 +245,14 @@ inline RealType skewness(const chi_squared_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const chi_squared_distribution<RealType, Policy>& dist)
 {
    RealType df = dist.degrees_of_freedom();
    return 3 + 12 / df;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const chi_squared_distribution<RealType, Policy>& dist)
 {
    RealType df = dist.degrees_of_freedom();
    return 12 / df;
@@ -264,12 +267,12 @@ namespace detail
 template <class RealType, class Policy>
 struct df_estimator
 {
-   df_estimator(RealType a, RealType b, RealType variance, RealType delta)
+   BOOST_MATH_GPU_ENABLED df_estimator(RealType a, RealType b, RealType variance, RealType delta)
       : alpha(a), beta(b), ratio(delta/variance)
    { // Constructor
    }
 
-   RealType operator()(const RealType& df)
+   BOOST_MATH_GPU_ENABLED RealType operator()(const RealType& df)
    {
       if(df <= tools::min_value<RealType>())
          return 1;
@@ -297,14 +300,14 @@ struct df_estimator
 } // namespace detail
 
 template <class RealType, class Policy>
-RealType chi_squared_distribution<RealType, Policy>::find_degrees_of_freedom(
+BOOST_MATH_GPU_ENABLED RealType chi_squared_distribution<RealType, Policy>::find_degrees_of_freedom(
    RealType difference_from_variance,
    RealType alpha,
    RealType beta,
    RealType variance,
    RealType hint)
 {
-   static const char* function = "boost::math::chi_squared_distribution<%1%>::find_degrees_of_freedom(%1%,%1%,%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::chi_squared_distribution<%1%>::find_degrees_of_freedom(%1%,%1%,%1%,%1%,%1%)";
    // Check for domain errors:
    RealType error_result;
    if(false ==
@@ -321,15 +324,14 @@ RealType chi_squared_distribution<RealType, Policy>::find_degrees_of_freedom(
 
    detail::df_estimator<RealType, Policy> f(alpha, beta, variance, difference_from_variance);
    tools::eps_tolerance<RealType> tol(policies::digits<RealType, Policy>());
-   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
-   std::pair<RealType, RealType> r =
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   boost::math::pair<RealType, RealType> r =
      tools::bracket_and_solve_root(f, hint, RealType(2), false, tol, max_iter, Policy());
    RealType result = r.first + (r.second - r.first) / 2;
    if(max_iter >= policies::get_max_root_iterations<Policy>())
    {
-      policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
-         " either there is no answer to how many degrees of freedom are required"
-         " or the answer is infinite.  Current best guess is %1%", result, Policy());
+      policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"  // LCOV_EXCL_LINE
+         " either there is no answer to how many degrees of freedom are required or the answer is infinite.  Current best guess is %1%", result, Policy());  // LCOV_EXCL_LINE
    }
    return result;
 }
diff --git a/inst/include/boost/math/distributions/complement.hpp b/inst/include/boost/math/distributions/complement.hpp
index 5c062a7cd..c63b8a504 100644
--- a/inst/include/boost/math/distributions/complement.hpp
+++ b/inst/include/boost/math/distributions/complement.hpp
@@ -1,5 +1,6 @@
 //  (C) Copyright John Maddock 2006.
 //  (C) Copyright Paul A. Bristow 2006.
+//  (C) Copyright Matt Borland 2024
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,6 +8,8 @@
 #ifndef BOOST_STATS_COMPLEMENT_HPP
 #define BOOST_STATS_COMPLEMENT_HPP
 
+#include <boost/math/tools/config.hpp>
+
 //
 // This code really defines our own tuple type.
 // It would be nice to reuse boost::math::tuple
@@ -19,7 +22,7 @@ namespace boost{ namespace math{
 template <class Dist, class RealType>
 struct complemented2_type
 {
-   complemented2_type(
+   BOOST_MATH_GPU_ENABLED complemented2_type(
       const Dist& d, 
       const RealType& p1)
       : dist(d), 
@@ -35,7 +38,7 @@ struct complemented2_type
 template <class Dist, class RealType1, class RealType2>
 struct complemented3_type
 {
-   complemented3_type(
+   BOOST_MATH_GPU_ENABLED complemented3_type(
       const Dist& d, 
       const RealType1& p1,
       const RealType2& p2)
@@ -53,7 +56,7 @@ struct complemented3_type
 template <class Dist, class RealType1, class RealType2, class RealType3>
 struct complemented4_type
 {
-   complemented4_type(
+   BOOST_MATH_GPU_ENABLED complemented4_type(
       const Dist& d, 
       const RealType1& p1,
       const RealType2& p2,
@@ -74,7 +77,7 @@ struct complemented4_type
 template <class Dist, class RealType1, class RealType2, class RealType3, class RealType4>
 struct complemented5_type
 {
-   complemented5_type(
+   BOOST_MATH_GPU_ENABLED complemented5_type(
       const Dist& d, 
       const RealType1& p1,
       const RealType2& p2,
@@ -98,7 +101,7 @@ struct complemented5_type
 template <class Dist, class RealType1, class RealType2, class RealType3, class RealType4, class RealType5>
 struct complemented6_type
 {
-   complemented6_type(
+   BOOST_MATH_GPU_ENABLED complemented6_type(
       const Dist& d, 
       const RealType1& p1,
       const RealType2& p2,
@@ -125,7 +128,7 @@ struct complemented6_type
 template <class Dist, class RealType1, class RealType2, class RealType3, class RealType4, class RealType5, class RealType6>
 struct complemented7_type
 {
-   complemented7_type(
+   BOOST_MATH_GPU_ENABLED complemented7_type(
       const Dist& d, 
       const RealType1& p1,
       const RealType2& p2,
@@ -153,37 +156,37 @@ struct complemented7_type
 };
 
 template <class Dist, class RealType>
-inline complemented2_type<Dist, RealType> complement(const Dist& d, const RealType& r)
+BOOST_MATH_GPU_ENABLED inline complemented2_type<Dist, RealType> complement(const Dist& d, const RealType& r)
 {
    return complemented2_type<Dist, RealType>(d, r);
 }
 
 template <class Dist, class RealType1, class RealType2>
-inline complemented3_type<Dist, RealType1, RealType2> complement(const Dist& d, const RealType1& r1, const RealType2& r2)
+BOOST_MATH_GPU_ENABLED inline complemented3_type<Dist, RealType1, RealType2> complement(const Dist& d, const RealType1& r1, const RealType2& r2)
 {
    return complemented3_type<Dist, RealType1, RealType2>(d, r1, r2);
 }
 
 template <class Dist, class RealType1, class RealType2, class RealType3>
-inline complemented4_type<Dist, RealType1, RealType2, RealType3> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3)
+BOOST_MATH_GPU_ENABLED inline complemented4_type<Dist, RealType1, RealType2, RealType3> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3)
 {
    return complemented4_type<Dist, RealType1, RealType2, RealType3>(d, r1, r2, r3);
 }
 
 template <class Dist, class RealType1, class RealType2, class RealType3, class RealType4>
-inline complemented5_type<Dist, RealType1, RealType2, RealType3, RealType4> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3, const RealType4& r4)
+BOOST_MATH_GPU_ENABLED inline complemented5_type<Dist, RealType1, RealType2, RealType3, RealType4> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3, const RealType4& r4)
 {
    return complemented5_type<Dist, RealType1, RealType2, RealType3, RealType4>(d, r1, r2, r3, r4);
 }
 
 template <class Dist, class RealType1, class RealType2, class RealType3, class RealType4, class RealType5>
-inline complemented6_type<Dist, RealType1, RealType2, RealType3, RealType4, RealType5> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3, const RealType4& r4, const RealType5& r5)
+BOOST_MATH_GPU_ENABLED inline complemented6_type<Dist, RealType1, RealType2, RealType3, RealType4, RealType5> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3, const RealType4& r4, const RealType5& r5)
 {
    return complemented6_type<Dist, RealType1, RealType2, RealType3, RealType4, RealType5>(d, r1, r2, r3, r4, r5);
 }
 
 template <class Dist, class RealType1, class RealType2, class RealType3, class RealType4, class RealType5, class RealType6>
-inline complemented7_type<Dist, RealType1, RealType2, RealType3, RealType4, RealType5, RealType6> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3, const RealType4& r4, const RealType5& r5, const RealType6& r6)
+BOOST_MATH_GPU_ENABLED inline complemented7_type<Dist, RealType1, RealType2, RealType3, RealType4, RealType5, RealType6> complement(const Dist& d, const RealType1& r1, const RealType2& r2, const RealType3& r3, const RealType4& r4, const RealType5& r5, const RealType6& r6)
 {
    return complemented7_type<Dist, RealType1, RealType2, RealType3, RealType4, RealType5, RealType6>(d, r1, r2, r3, r4, r5, r6);
 }
diff --git a/inst/include/boost/math/distributions/detail/common_error_handling.hpp b/inst/include/boost/math/distributions/detail/common_error_handling.hpp
index f03f2c49b..06e3c105b 100644
--- a/inst/include/boost/math/distributions/detail/common_error_handling.hpp
+++ b/inst/include/boost/math/distributions/detail/common_error_handling.hpp
@@ -1,5 +1,6 @@
 // Copyright John Maddock 2006, 2007.
 // Copyright Paul A. Bristow 2006, 2007, 2012.
+// Copyright Matt Borland 2024
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -9,6 +10,8 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_COMMON_ERROR_HANDLING_HPP
 #define BOOST_MATH_DISTRIBUTIONS_COMMON_ERROR_HANDLING_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 // using boost::math::isfinite;
@@ -23,7 +26,7 @@ namespace boost{ namespace math{ namespace detail
 {
 
 template <class RealType, class Policy>
-inline bool check_probability(const char* function, RealType const& prob, RealType* result, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline bool check_probability(const char* function, RealType const& prob, RealType* result, const Policy& pol)
 {
    if((prob < 0) || (prob > 1) || !(boost::math::isfinite)(prob))
    {
@@ -36,7 +39,7 @@ inline bool check_probability(const char* function, RealType const& prob, RealTy
 }
 
 template <class RealType, class Policy>
-inline bool check_df(const char* function, RealType const& df, RealType* result, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline bool check_df(const char* function, RealType const& df, RealType* result, const Policy& pol)
 { //  df > 0 but NOT +infinity allowed.
    if((df <= 0) || !(boost::math::isfinite)(df))
    {
@@ -49,7 +52,7 @@ inline bool check_df(const char* function, RealType const& df, RealType* result,
 }
 
 template <class RealType, class Policy>
-inline bool check_df_gt0_to_inf(const char* function, RealType const& df, RealType* result, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline bool check_df_gt0_to_inf(const char* function, RealType const& df, RealType* result, const Policy& pol)
 {  // df > 0 or +infinity are allowed.
    if( (df <= 0) || (boost::math::isnan)(df) )
    { // is bad df <= 0 or NaN or -infinity.
@@ -63,7 +66,7 @@ inline bool check_df_gt0_to_inf(const char* function, RealType const& df, RealTy
 
 
 template <class RealType, class Policy>
-inline bool check_scale(
+BOOST_MATH_GPU_ENABLED inline bool check_scale(
       const char* function,
       RealType scale,
       RealType* result,
@@ -80,7 +83,7 @@ inline bool check_scale(
 }
 
 template <class RealType, class Policy>
-inline bool check_location(
+BOOST_MATH_GPU_ENABLED inline bool check_location(
       const char* function,
       RealType location,
       RealType* result,
@@ -97,7 +100,7 @@ inline bool check_location(
 }
 
 template <class RealType, class Policy>
-inline bool check_x(
+BOOST_MATH_GPU_ENABLED inline bool check_x(
       const char* function,
       RealType x,
       RealType* result,
@@ -118,7 +121,7 @@ inline bool check_x(
 } // bool check_x
 
 template <class RealType, class Policy>
-inline bool check_x_not_NaN(
+BOOST_MATH_GPU_ENABLED inline bool check_x_not_NaN(
   const char* function,
   RealType x,
   RealType* result,
@@ -138,7 +141,7 @@ inline bool check_x_not_NaN(
 } // bool check_x_not_NaN
 
 template <class RealType, class Policy>
-inline bool check_x_gt0(
+BOOST_MATH_GPU_ENABLED inline bool check_x_gt0(
       const char* function,
       RealType x,
       RealType* result,
@@ -159,7 +162,7 @@ inline bool check_x_gt0(
 } // bool check_x_gt0
 
 template <class RealType, class Policy>
-inline bool check_positive_x(
+BOOST_MATH_GPU_ENABLED inline bool check_positive_x(
       const char* function,
       RealType x,
       RealType* result,
@@ -179,13 +182,14 @@ inline bool check_positive_x(
 }
 
 template <class RealType, class Policy>
-inline bool check_non_centrality(
+BOOST_MATH_GPU_ENABLED inline bool check_non_centrality(
       const char* function,
       RealType ncp,
       RealType* result,
       const Policy& pol)
 {
-   static const RealType upper_limit = static_cast<RealType>((std::numeric_limits<long long>::max)()) - boost::math::policies::get_max_root_iterations<Policy>();
+   BOOST_MATH_STATIC const RealType upper_limit = static_cast<RealType>((boost::math::numeric_limits<long long>::max)()) - boost::math::policies::get_max_root_iterations<Policy>();
+
    if((ncp < 0) || !(boost::math::isfinite)(ncp) || ncp > upper_limit)
    {
       *result = policies::raise_domain_error<RealType>(
@@ -197,7 +201,7 @@ inline bool check_non_centrality(
 }
 
 template <class RealType, class Policy>
-inline bool check_finite(
+BOOST_MATH_GPU_ENABLED inline bool check_finite(
       const char* function,
       RealType x,
       RealType* result,
diff --git a/inst/include/boost/math/distributions/detail/derived_accessors.hpp b/inst/include/boost/math/distributions/detail/derived_accessors.hpp
index eb76409a1..90679ef21 100644
--- a/inst/include/boost/math/distributions/detail/derived_accessors.hpp
+++ b/inst/include/boost/math/distributions/detail/derived_accessors.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -27,9 +28,13 @@
 // can find the definitions referred to herein.
 //
 
-#include <cmath>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/assert.hpp>
 
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <cmath>
+#endif
+
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4723) // potential divide by 0
@@ -39,24 +44,24 @@
 namespace boost{ namespace math{
 
 template <class Distribution>
-typename Distribution::value_type variance(const Distribution& dist);
+BOOST_MATH_GPU_ENABLED typename Distribution::value_type variance(const Distribution& dist);
 
 template <class Distribution>
-inline typename Distribution::value_type standard_deviation(const Distribution& dist)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type standard_deviation(const Distribution& dist)
 {
    BOOST_MATH_STD_USING  // ADL of sqrt.
    return sqrt(variance(dist));
 }
 
 template <class Distribution>
-inline typename Distribution::value_type variance(const Distribution& dist)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type variance(const Distribution& dist)
 {
    typename Distribution::value_type result = standard_deviation(dist);
    return result * result;
 }
 
 template <class Distribution, class RealType>
-inline typename Distribution::value_type hazard(const Distribution& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type hazard(const Distribution& dist, const RealType& x)
 { // hazard function
   // http://www.itl.nist.gov/div898/handbook/eda/section3/eda362.htm#HAZ
    typedef typename Distribution::value_type value_type;
@@ -75,7 +80,7 @@ inline typename Distribution::value_type hazard(const Distribution& dist, const
 }
 
 template <class Distribution, class RealType>
-inline typename Distribution::value_type chf(const Distribution& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type chf(const Distribution& dist, const RealType& x)
 { // cumulative hazard function.
   // http://www.itl.nist.gov/div898/handbook/eda/section3/eda362.htm#HAZ
    BOOST_MATH_STD_USING
@@ -83,7 +88,7 @@ inline typename Distribution::value_type chf(const Distribution& dist, const Rea
 }
 
 template <class Distribution>
-inline typename Distribution::value_type coefficient_of_variation(const Distribution& dist)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type coefficient_of_variation(const Distribution& dist)
 {
    typedef typename Distribution::value_type value_type;
    typedef typename Distribution::policy_type policy_type;
@@ -104,33 +109,33 @@ inline typename Distribution::value_type coefficient_of_variation(const Distribu
 // implementation with all arguments of the same type:
 //
 template <class Distribution, class RealType>
-inline typename Distribution::value_type pdf(const Distribution& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type pdf(const Distribution& dist, const RealType& x)
 {
    typedef typename Distribution::value_type value_type;
    return pdf(dist, static_cast<value_type>(x));
 }
 template <class Distribution, class RealType>
-inline typename Distribution::value_type logpdf(const Distribution& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type logpdf(const Distribution& dist, const RealType& x)
 {
    using std::log;
    typedef typename Distribution::value_type value_type;
    return log(pdf(dist, static_cast<value_type>(x)));
 }
 template <class Distribution, class RealType>
-inline typename Distribution::value_type cdf(const Distribution& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type cdf(const Distribution& dist, const RealType& x)
 {
    typedef typename Distribution::value_type value_type;
    return cdf(dist, static_cast<value_type>(x));
 }
 template <class Distribution, class Realtype>
-inline typename Distribution::value_type logcdf(const Distribution& dist, const Realtype& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type logcdf(const Distribution& dist, const Realtype& x)
 {
    using std::log;
    using value_type = typename Distribution::value_type;
    return log(cdf(dist, static_cast<value_type>(x)));
 }
 template <class Distribution, class RealType>
-inline typename Distribution::value_type quantile(const Distribution& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type quantile(const Distribution& dist, const RealType& x)
 {
    typedef typename Distribution::value_type value_type;
    return quantile(dist, static_cast<value_type>(x));
@@ -144,14 +149,14 @@ inline typename Distribution::value_type chf(const Distribution& dist, const Rea
 }
 */
 template <class Distribution, class RealType>
-inline typename Distribution::value_type cdf(const complemented2_type<Distribution, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type cdf(const complemented2_type<Distribution, RealType>& c)
 {
    typedef typename Distribution::value_type value_type;
    return cdf(complement(c.dist, static_cast<value_type>(c.param)));
 }
 
 template <class Distribution, class RealType>
-inline typename Distribution::value_type logcdf(const complemented2_type<Distribution, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type logcdf(const complemented2_type<Distribution, RealType>& c)
 {
    using std::log;
    typedef typename Distribution::value_type value_type;
@@ -159,14 +164,14 @@ inline typename Distribution::value_type logcdf(const complemented2_type<Distrib
 }
 
 template <class Distribution, class RealType>
-inline typename Distribution::value_type quantile(const complemented2_type<Distribution, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline typename Distribution::value_type quantile(const complemented2_type<Distribution, RealType>& c)
 {
    typedef typename Distribution::value_type value_type;
    return quantile(complement(c.dist, static_cast<value_type>(c.param)));
 }
 
 template <class Dist>
-inline typename Dist::value_type median(const Dist& d)
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type median(const Dist& d)
 { // median - default definition for those distributions for which a
   // simple closed form is not known,
   // and for which a domain_error and/or NaN generating function is NOT defined.
diff --git a/inst/include/boost/math/distributions/detail/generic_mode.hpp b/inst/include/boost/math/distributions/detail/generic_mode.hpp
index 96d21b9b0..9306c815d 100644
--- a/inst/include/boost/math/distributions/detail/generic_mode.hpp
+++ b/inst/include/boost/math/distributions/detail/generic_mode.hpp
@@ -8,19 +8,22 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_DETAIL_MODE_HPP
 #define BOOST_MATH_DISTRIBUTIONS_DETAIL_MODE_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/tools/minima.hpp> // function minimization for mode
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/distributions/fwd.hpp>
+#include <boost/math/policies/policy.hpp>
 
 namespace boost{ namespace math{ namespace detail{
 
 template <class Dist>
 struct pdf_minimizer
 {
-   pdf_minimizer(const Dist& d)
+   BOOST_MATH_GPU_ENABLED pdf_minimizer(const Dist& d)
       : dist(d) {}
 
-   typename Dist::value_type operator()(const typename Dist::value_type& x)
+   BOOST_MATH_GPU_ENABLED typename Dist::value_type operator()(const typename Dist::value_type& x)
    {
       return -pdf(dist, x);
    }
@@ -29,7 +32,7 @@ struct pdf_minimizer
 };
 
 template <class Dist>
-typename Dist::value_type generic_find_mode(const Dist& dist, typename Dist::value_type guess, const char* function, typename Dist::value_type step = 0)
+BOOST_MATH_GPU_ENABLED typename Dist::value_type generic_find_mode(const Dist& dist, typename Dist::value_type guess, const char* function, typename Dist::value_type step = 0)
 {
    BOOST_MATH_STD_USING
    typedef typename Dist::value_type value_type;
@@ -47,9 +50,7 @@ typename Dist::value_type generic_find_mode(const Dist& dist, typename Dist::val
       // Oops we don't know how to handle this, or even in which
       // direction we should move in, treat as an evaluation error:
       //
-      return policies::raise_evaluation_error(
-         function, 
-         "Could not locate a starting location for the search for the mode, original guess was %1%", guess, policy_type());
+      return policies::raise_evaluation_error(function, "Could not locate a starting location for the search for the mode, original guess was %1%", guess, policy_type());  // LCOV_EXCL_LINE
    }
    do
    {
@@ -72,7 +73,7 @@ typename Dist::value_type generic_find_mode(const Dist& dist, typename Dist::val
       v = pdf(dist, lower_bound);
    }while(maxval < v);
 
-   std::uintmax_t max_iter = policies::get_max_root_iterations<policy_type>();
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<policy_type>();
 
    value_type result = tools::brent_find_minima(
       pdf_minimizer<Dist>(dist), 
@@ -82,11 +83,9 @@ typename Dist::value_type generic_find_mode(const Dist& dist, typename Dist::val
       max_iter).first;
    if(max_iter >= policies::get_max_root_iterations<policy_type>())
    {
-      return policies::raise_evaluation_error<value_type>(
-         function, 
-         "Unable to locate solution in a reasonable time:"
-         " either there is no answer to the mode of the distribution"
-         " or the answer is infinite.  Current best guess is %1%", result, policy_type());
+      return policies::raise_evaluation_error<value_type>(function,   // LCOV_EXCL_LINE
+         "Unable to locate solution in a reasonable time: either there is no answer to the mode of the distribution"  // LCOV_EXCL_LINE
+         " or the answer is infinite.  Current best guess is %1%", result, policy_type());  // LCOV_EXCL_LINE
    }
    return result;
 }
@@ -94,7 +93,7 @@ typename Dist::value_type generic_find_mode(const Dist& dist, typename Dist::val
 // As above,but confined to the interval [0,1]:
 //
 template <class Dist>
-typename Dist::value_type generic_find_mode_01(const Dist& dist, typename Dist::value_type guess, const char* function)
+BOOST_MATH_GPU_ENABLED typename Dist::value_type generic_find_mode_01(const Dist& dist, typename Dist::value_type guess, const char* function)
 {
    BOOST_MATH_STD_USING
    typedef typename Dist::value_type value_type;
@@ -125,7 +124,7 @@ typename Dist::value_type generic_find_mode_01(const Dist& dist, typename Dist::
       v = pdf(dist, lower_bound);
    }while(maxval < v);
 
-   std::uintmax_t max_iter = policies::get_max_root_iterations<policy_type>();
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<policy_type>();
 
    value_type result = tools::brent_find_minima(
       pdf_minimizer<Dist>(dist), 
@@ -135,11 +134,8 @@ typename Dist::value_type generic_find_mode_01(const Dist& dist, typename Dist::
       max_iter).first;
    if(max_iter >= policies::get_max_root_iterations<policy_type>())
    {
-      return policies::raise_evaluation_error<value_type>(
-         function, 
-         "Unable to locate solution in a reasonable time:"
-         " either there is no answer to the mode of the distribution"
-         " or the answer is infinite.  Current best guess is %1%", result, policy_type());
+      return policies::raise_evaluation_error<value_type>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+         " either there is no answer to the mode of the distribution or the answer is infinite.  Current best guess is %1%", result, policy_type());  // LCOV_EXCL_LINE
    }
    return result;
 }
diff --git a/inst/include/boost/math/distributions/detail/generic_quantile.hpp b/inst/include/boost/math/distributions/detail/generic_quantile.hpp
index 67d3f04f8..917532566 100644
--- a/inst/include/boost/math/distributions/detail/generic_quantile.hpp
+++ b/inst/include/boost/math/distributions/detail/generic_quantile.hpp
@@ -6,6 +6,10 @@
 #ifndef BOOST_MATH_DISTIBUTIONS_DETAIL_GENERIC_QUANTILE_HPP
 #define BOOST_MATH_DISTIBUTIONS_DETAIL_GENERIC_QUANTILE_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/cstdint.hpp>
+
 namespace boost{ namespace math{ namespace detail{
 
 template <class Dist>
@@ -14,10 +18,10 @@ struct generic_quantile_finder
    using value_type = typename Dist::value_type;
    using policy_type = typename Dist::policy_type;
 
-   generic_quantile_finder(const Dist& d, value_type t, bool c)
+   BOOST_MATH_GPU_ENABLED generic_quantile_finder(const Dist& d, value_type t, bool c)
       : dist(d), target(t), comp(c) {}
 
-   value_type operator()(const value_type& x)
+   BOOST_MATH_GPU_ENABLED value_type operator()(const value_type& x)
    {
       return comp ?
          value_type(target - cdf(complement(dist, x)))
@@ -31,7 +35,7 @@ struct generic_quantile_finder
 };
 
 template <class T, class Policy>
-inline T check_range_result(const T& x, const Policy& pol, const char* function)
+BOOST_MATH_GPU_ENABLED inline T check_range_result(const T& x, const Policy& pol, const char* function)
 {
    if((x >= 0) && (x < tools::min_value<T>()))
    {
@@ -49,7 +53,7 @@ inline T check_range_result(const T& x, const Policy& pol, const char* function)
 }
 
 template <class Dist>
-typename Dist::value_type generic_quantile(const Dist& dist, const typename Dist::value_type& p, const typename Dist::value_type& guess, bool comp, const char* function)
+BOOST_MATH_GPU_ENABLED typename Dist::value_type generic_quantile(const Dist& dist, const typename Dist::value_type& p, const typename Dist::value_type& guess, bool comp, const char* function)
 {
    using value_type = typename Dist::value_type;
    using policy_type = typename Dist::policy_type;
@@ -78,15 +82,14 @@ typename Dist::value_type generic_quantile(const Dist& dist, const typename Dist
 
    generic_quantile_finder<Dist> f(dist, p, comp);
    tools::eps_tolerance<value_type> tol(policies::digits<value_type, forwarding_policy>() - 3);
-   std::uintmax_t max_iter = policies::get_max_root_iterations<forwarding_policy>();
-   std::pair<value_type, value_type> ir = tools::bracket_and_solve_root(
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<forwarding_policy>();
+   boost::math::pair<value_type, value_type> ir = tools::bracket_and_solve_root(
       f, guess, value_type(2), true, tol, max_iter, forwarding_policy());
    value_type result = ir.first + (ir.second - ir.first) / 2;
    if(max_iter >= policies::get_max_root_iterations<forwarding_policy>())
    {
-      return policies::raise_evaluation_error<value_type>(function, "Unable to locate solution in a reasonable time:"
-         " either there is no answer to quantile"
-         " or the answer is infinite.  Current best guess is %1%", result, forwarding_policy());
+      return policies::raise_evaluation_error<value_type>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+         " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", result, forwarding_policy());  // LCOV_EXCL_LINE
    }
    return result;
 }
diff --git a/inst/include/boost/math/distributions/detail/hypergeometric_pdf.hpp b/inst/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
index 9eeef270d..0ec3065eb 100644
--- a/inst/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
+++ b/inst/include/boost/math/distributions/detail/hypergeometric_pdf.hpp
@@ -297,7 +297,7 @@ T hypergeometric_pdf_prime_loop_imp(hypergeometric_pdf_prime_loop_data& data, hy
    while(data.current_prime <= data.N)
    {
       std::uint64_t base = data.current_prime;
-      std::int64_t prime_powers = 0;
+      std::uint64_t prime_powers = 0;
       while(base <= data.N)
       {
          prime_powers += data.n / base;
@@ -313,7 +313,7 @@ T hypergeometric_pdf_prime_loop_imp(hypergeometric_pdf_prime_loop_data& data, hy
       }
       if(prime_powers)
       {
-         T p = integer_power<T>(static_cast<T>(data.current_prime), prime_powers);
+         T p = integer_power<T>(static_cast<T>(data.current_prime), static_cast<int>(prime_powers));
          if((p > 1) && (tools::max_value<T>() / p < result.value))
          {
             //
@@ -321,7 +321,7 @@ T hypergeometric_pdf_prime_loop_imp(hypergeometric_pdf_prime_loop_data& data, hy
             // to sidestep the issue:
             //
             hypergeometric_pdf_prime_loop_result_entry<T> t = { p, &result };
-            data.current_prime = prime(++data.prime_index);
+            data.current_prime = prime(static_cast<unsigned>(++data.prime_index));
             return hypergeometric_pdf_prime_loop_imp<T>(data, t);
          }
          if((p < 1) && (tools::min_value<T>() / p > result.value))
@@ -331,12 +331,12 @@ T hypergeometric_pdf_prime_loop_imp(hypergeometric_pdf_prime_loop_data& data, hy
             // to sidestep the issue:
             //
             hypergeometric_pdf_prime_loop_result_entry<T> t = { p, &result };
-            data.current_prime = prime(++data.prime_index);
+            data.current_prime = prime(static_cast<unsigned>(++data.prime_index));
             return hypergeometric_pdf_prime_loop_imp<T>(data, t);
          }
          result.value *= p;
       }
-      data.current_prime = prime(++data.prime_index);
+      data.current_prime = prime(static_cast<unsigned>(++data.prime_index));
    }
    //
    // When we get to here we have run out of prime factors,
@@ -395,18 +395,18 @@ T hypergeometric_pdf_factorial_imp(std::uint64_t x, std::uint64_t r, std::uint64
 {
    BOOST_MATH_STD_USING
    BOOST_MATH_ASSERT(N <= boost::math::max_factorial<T>::value);
-   T result = boost::math::unchecked_factorial<T>(n);
+   T result = boost::math::unchecked_factorial<T>(static_cast<unsigned>(n));
    T num[3] = {
-      boost::math::unchecked_factorial<T>(r),
-      boost::math::unchecked_factorial<T>(N - n),
-      boost::math::unchecked_factorial<T>(N - r)
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(r)),
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(N - n)),
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(N - r))
    };
    T denom[5] = {
-      boost::math::unchecked_factorial<T>(N),
-      boost::math::unchecked_factorial<T>(x),
-      boost::math::unchecked_factorial<T>(n - x),
-      boost::math::unchecked_factorial<T>(r - x),
-      boost::math::unchecked_factorial<T>(N - n - r + x)
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(N)),
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(x)),
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(n - x)),
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(r - x)),
+      boost::math::unchecked_factorial<T>(static_cast<unsigned>(N - n - r + x))
    };
    std::size_t i = 0;
    std::size_t j = 0;
diff --git a/inst/include/boost/math/distributions/detail/hypergeometric_quantile.hpp b/inst/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
index 7ab85fb14..2441a7330 100644
--- a/inst/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
+++ b/inst/include/boost/math/distributions/detail/hypergeometric_quantile.hpp
@@ -14,7 +14,7 @@
 namespace boost{ namespace math{ namespace detail{
 
 template <class T>
-inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned lbound, unsigned /*ubound*/, const policies::discrete_quantile<policies::integer_round_down>&)
+inline std::uint64_t round_x_from_p(std::uint64_t x, T p, T cum, T fudge_factor, std::uint64_t lbound, std::uint64_t /*ubound*/, const policies::discrete_quantile<policies::integer_round_down>&)
 {
    if((p < cum * fudge_factor) && (x != lbound))
    {
@@ -25,7 +25,7 @@ inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned /*lbound*/, unsigned ubound, const policies::discrete_quantile<policies::integer_round_up>&)
+inline std::uint64_t round_x_from_p(std::uint64_t x, T p, T cum, T fudge_factor, std::uint64_t /*lbound*/, std::uint64_t ubound, const policies::discrete_quantile<policies::integer_round_up>&)
 {
    if((cum < p * fudge_factor) && (x != ubound))
    {
@@ -36,7 +36,7 @@ inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned lbound, unsigned ubound, const policies::discrete_quantile<policies::integer_round_inwards>&)
+inline std::uint64_t round_x_from_p(std::uint64_t x, T p, T cum, T fudge_factor, std::uint64_t lbound, std::uint64_t ubound, const policies::discrete_quantile<policies::integer_round_inwards>&)
 {
    if(p >= 0.5)
       return round_x_from_p(x, p, cum, fudge_factor, lbound, ubound, policies::discrete_quantile<policies::integer_round_down>());
@@ -44,7 +44,7 @@ inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned lbound, unsigned ubound, const policies::discrete_quantile<policies::integer_round_outwards>&)
+inline std::uint64_t round_x_from_p(std::uint64_t x, T p, T cum, T fudge_factor, std::uint64_t lbound, std::uint64_t ubound, const policies::discrete_quantile<policies::integer_round_outwards>&)
 {
    if(p >= 0.5)
       return round_x_from_p(x, p, cum, fudge_factor, lbound, ubound, policies::discrete_quantile<policies::integer_round_up>());
@@ -52,13 +52,13 @@ inline unsigned round_x_from_p(unsigned x, T p, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_p(unsigned x, T /*p*/, T /*cum*/, T /*fudge_factor*/, unsigned /*lbound*/, unsigned /*ubound*/, const policies::discrete_quantile<policies::integer_round_nearest>&)
+inline std::uint64_t round_x_from_p(std::uint64_t x, T /*p*/, T /*cum*/, T /*fudge_factor*/, std::uint64_t /*lbound*/, std::uint64_t /*ubound*/, const policies::discrete_quantile<policies::integer_round_nearest>&)
 {
    return x;
 }
 
 template <class T>
-inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned lbound, unsigned /*ubound*/, const policies::discrete_quantile<policies::integer_round_down>&)
+inline std::uint64_t round_x_from_q(std::uint64_t x, T q, T cum, T fudge_factor, std::uint64_t lbound, std::uint64_t /*ubound*/, const policies::discrete_quantile<policies::integer_round_down>&)
 {
    if((q * fudge_factor > cum) && (x != lbound))
    {
@@ -69,7 +69,7 @@ inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned /*lbound*/, unsigned ubound, const policies::discrete_quantile<policies::integer_round_up>&)
+inline std::uint64_t round_x_from_q(std::uint64_t x, T q, T cum, T fudge_factor, std::uint64_t /*lbound*/, std::uint64_t ubound, const policies::discrete_quantile<policies::integer_round_up>&)
 {
    if((q < cum * fudge_factor) && (x != ubound))
    {
@@ -80,7 +80,7 @@ inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned lbound, unsigned ubound, const policies::discrete_quantile<policies::integer_round_inwards>&)
+inline std::uint64_t round_x_from_q(std::uint64_t x, T q, T cum, T fudge_factor, std::uint64_t lbound, std::uint64_t ubound, const policies::discrete_quantile<policies::integer_round_inwards>&)
 {
    if(q < 0.5)
       return round_x_from_q(x, q, cum, fudge_factor, lbound, ubound, policies::discrete_quantile<policies::integer_round_down>());
@@ -88,7 +88,7 @@ inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned lbound, unsigned ubound, const policies::discrete_quantile<policies::integer_round_outwards>&)
+inline std::uint64_t round_x_from_q(std::uint64_t x, T q, T cum, T fudge_factor, std::uint64_t lbound, std::uint64_t ubound, const policies::discrete_quantile<policies::integer_round_outwards>&)
 {
    if(q >= 0.5)
       return round_x_from_q(x, q, cum, fudge_factor, lbound, ubound, policies::discrete_quantile<policies::integer_round_down>());
@@ -96,13 +96,13 @@ inline unsigned round_x_from_q(unsigned x, T q, T cum, T fudge_factor, unsigned
 }
 
 template <class T>
-inline unsigned round_x_from_q(unsigned x, T /*q*/, T /*cum*/, T /*fudge_factor*/, unsigned /*lbound*/, unsigned /*ubound*/, const policies::discrete_quantile<policies::integer_round_nearest>&)
+inline std::uint64_t round_x_from_q(std::uint64_t x, T /*q*/, T /*cum*/, T /*fudge_factor*/, std::uint64_t /*lbound*/, std::uint64_t /*ubound*/, const policies::discrete_quantile<policies::integer_round_nearest>&)
 {
    return x;
 }
 
 template <class T, class Policy>
-unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned N, const Policy& pol)
+std::uint64_t hypergeometric_quantile_imp(T p, T q, std::uint64_t r, std::uint64_t n, std::uint64_t N, const Policy& pol)
 {
 #ifdef _MSC_VER
 #  pragma warning(push)
@@ -113,8 +113,8 @@ unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned
    BOOST_FPU_EXCEPTION_GUARD
    T result;
    T fudge_factor = 1 + tools::epsilon<T>() * ((N <= boost::math::prime(boost::math::max_prime - 1)) ? 50 : 2 * N);
-   unsigned base = static_cast<unsigned>((std::max)(0, static_cast<int>(n + r) - static_cast<int>(N)));
-   unsigned lim = (std::min)(r, n);
+   std::uint64_t base = static_cast<std::uint64_t>((std::max)(0, static_cast<int>(n + r) - static_cast<int>(N)));
+   std::uint64_t lim = (std::min)(r, n);
 
    BOOST_MATH_INSTRUMENT_VARIABLE(p);
    BOOST_MATH_INSTRUMENT_VARIABLE(q);
@@ -127,7 +127,7 @@ unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned
 
    if(p <= 0.5)
    {
-      unsigned x = base;
+      std::uint64_t x = base;
       result = hypergeometric_pdf<T>(x, r, n, N, pol);
       T diff = result;
       if (diff == 0)
@@ -175,7 +175,7 @@ unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned
    }
    else
    {
-      unsigned x = lim;
+      std::uint64_t x = lim;
       result = 0;
       T diff = hypergeometric_pdf<T>(x, r, n, N, pol);
       if (diff == 0)
@@ -225,7 +225,7 @@ unsigned hypergeometric_quantile_imp(T p, T q, unsigned r, unsigned n, unsigned
 }
 
 template <class T, class Policy>
-inline unsigned hypergeometric_quantile(T p, T q, unsigned r, unsigned n, unsigned N, const Policy&)
+inline std::uint64_t hypergeometric_quantile(T p, T q, std::uint64_t r, std::uint64_t n, std::uint64_t N, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T>::type result_type;
diff --git a/inst/include/boost/math/distributions/detail/inv_discrete_quantile.hpp b/inst/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
index 2f5cae743..ac4a2b231 100644
--- a/inst/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
+++ b/inst/include/boost/math/distributions/detail/inv_discrete_quantile.hpp
@@ -6,7 +6,11 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_DETAIL_INV_DISCRETE_QUANTILE
 #define BOOST_MATH_DISTRIBUTIONS_DETAIL_INV_DISCRETE_QUANTILE
 
-#include <algorithm>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/toms748_solve.hpp>
+#include <boost/math/tools/tuple.hpp>
 
 namespace boost{ namespace math{ namespace detail{
 
@@ -19,10 +23,10 @@ struct distribution_quantile_finder
    typedef typename Dist::value_type value_type;
    typedef typename Dist::policy_type policy_type;
 
-   distribution_quantile_finder(const Dist d, value_type p, bool c)
+   BOOST_MATH_GPU_ENABLED distribution_quantile_finder(const Dist d, value_type p, bool c)
       : dist(d), target(p), comp(c) {}
 
-   value_type operator()(value_type const& x)
+   BOOST_MATH_GPU_ENABLED value_type operator()(value_type const& x)
    {
       return comp ? value_type(target - cdf(complement(dist, x))) : value_type(cdf(dist, x) - target);
    }
@@ -42,24 +46,24 @@ struct distribution_quantile_finder
 // in the root no longer being bracketed.
 //
 template <class Real, class Tol>
-void adjust_bounds(Real& /* a */, Real& /* b */, Tol const& /* tol */){}
+BOOST_MATH_GPU_ENABLED void adjust_bounds(Real& /* a */, Real& /* b */, Tol const& /* tol */){}
 
 template <class Real>
-void adjust_bounds(Real& /* a */, Real& b, tools::equal_floor const& /* tol */)
+BOOST_MATH_GPU_ENABLED void adjust_bounds(Real& /* a */, Real& b, tools::equal_floor const& /* tol */)
 {
    BOOST_MATH_STD_USING
    b -= tools::epsilon<Real>() * b;
 }
 
 template <class Real>
-void adjust_bounds(Real& a, Real& /* b */, tools::equal_ceil const& /* tol */)
+BOOST_MATH_GPU_ENABLED void adjust_bounds(Real& a, Real& /* b */, tools::equal_ceil const& /* tol */)
 {
    BOOST_MATH_STD_USING
    a += tools::epsilon<Real>() * a;
 }
 
 template <class Real>
-void adjust_bounds(Real& a, Real& b, tools::equal_nearest_integer const& /* tol */)
+BOOST_MATH_GPU_ENABLED void adjust_bounds(Real& a, Real& b, tools::equal_nearest_integer const& /* tol */)
 {
    BOOST_MATH_STD_USING
    a += tools::epsilon<Real>() * a;
@@ -69,7 +73,7 @@ void adjust_bounds(Real& a, Real& b, tools::equal_nearest_integer const& /* tol
 // This is where all the work is done:
 //
 template <class Dist, class Tolerance>
-typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED typename Dist::value_type 
    do_inverse_discrete_quantile(
       const Dist& dist,
       const typename Dist::value_type& p,
@@ -78,12 +82,12 @@ typename Dist::value_type
       const typename Dist::value_type& multiplier,
       typename Dist::value_type adder,
       const Tolerance& tol,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    typedef typename Dist::value_type value_type;
    typedef typename Dist::policy_type policy_type;
 
-   static const char* function = "boost::math::do_inverse_discrete_quantile<%1%>";
+   constexpr auto function = "boost::math::do_inverse_discrete_quantile<%1%>";
 
    BOOST_MATH_STD_USING
 
@@ -100,7 +104,7 @@ typename Dist::value_type
       guess = min_bound;
 
    value_type fa = f(guess);
-   std::uintmax_t count = max_iter - 1;
+   boost::math::uintmax_t count = max_iter - 1;
    value_type fb(fa), a(guess), b =0; // Compiler warning C4701: potentially uninitialized local variable 'b' used
 
    if(fa == 0)
@@ -130,7 +134,7 @@ typename Dist::value_type
          else
          {
             b = a;
-            a = (std::max)(value_type(b - 1), value_type(0));
+            a = BOOST_MATH_GPU_SAFE_MAX(value_type(b - 1), value_type(0));
             if(a < min_bound)
                a = min_bound;
             fa = f(a);
@@ -153,7 +157,7 @@ typename Dist::value_type
       // If we're looking for a large result, then bump "adder" up
       // by a bit to increase our chances of bracketing the root:
       //
-      //adder = (std::max)(adder, 0.001f * guess);
+      //adder = BOOST_MATH_GPU_SAFE_MAX(adder, 0.001f * guess);
       if(fa < 0)
       {
          b = a + adder;
@@ -162,7 +166,7 @@ typename Dist::value_type
       }
       else
       {
-         b = (std::max)(value_type(a - adder), value_type(0));
+         b = BOOST_MATH_GPU_SAFE_MAX(value_type(a - adder), value_type(0));
          if(b < min_bound)
             b = min_bound;
       }
@@ -186,7 +190,7 @@ typename Dist::value_type
          }
          else
          {
-            b = (std::max)(value_type(a - adder), value_type(0));
+            b = BOOST_MATH_GPU_SAFE_MAX(value_type(a - adder), value_type(0));
             if(b < min_bound)
                b = min_bound;
          }
@@ -195,9 +199,8 @@ typename Dist::value_type
       }
       if(a > b)
       {
-         using std::swap;
-         swap(a, b);
-         swap(fa, fb);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(fa, fb);
       }
    }
    //
@@ -215,7 +218,7 @@ typename Dist::value_type
          while(((boost::math::sign)(fb) == (boost::math::sign)(fa)) && (a != b))
          {
             if(count == 0)
-               return policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", b, policy_type());
+               return policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", b, policy_type()); // LCOV_EXCL_LINE
             a = b;
             fa = fb;
             b *= multiplier;
@@ -242,7 +245,7 @@ typename Dist::value_type
                return 0;
             }
             if(count == 0)
-               return policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", a, policy_type());
+               return policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", a, policy_type()); // LCOV_EXCL_LINE
             b = a;
             fb = fa;
             a /= multiplier;
@@ -274,8 +277,13 @@ typename Dist::value_type
    //
    // Go ahead and find the root:
    //
-   std::pair<value_type, value_type> r = toms748_solve(f, a, b, fa, fb, tol, count, policy_type());
+   boost::math::pair<value_type, value_type> r = toms748_solve(f, a, b, fa, fb, tol, count, policy_type());
    max_iter += count;
+   if (max_iter >= policies::get_max_root_iterations<policy_type>())
+   {
+      return policies::raise_evaluation_error<value_type>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+         " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", r.first, policy_type()); // LCOV_EXCL_LINE
+   }
    BOOST_MATH_INSTRUMENT_CODE("max_iter = " << max_iter << " count = " << count);
    return (r.first + r.second) / 2;
 }
@@ -288,7 +296,7 @@ typename Dist::value_type
 // is very close 1.
 //
 template <class Dist>
-inline typename Dist::value_type round_to_floor(const Dist& d, typename Dist::value_type result, typename Dist::value_type p, bool c)
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type round_to_floor(const Dist& d, typename Dist::value_type result, typename Dist::value_type p, bool c)
 {
    BOOST_MATH_STD_USING
    typename Dist::value_type cc = ceil(result);
@@ -302,7 +310,11 @@ inline typename Dist::value_type round_to_floor(const Dist& d, typename Dist::va
    //
    while(result != 0)
    {
+      #ifdef BOOST_MATH_HAS_GPU_SUPPORT
+      cc = floor(::nextafter(result, -tools::max_value<typename Dist::value_type>()));
+      #else
       cc = floor(float_prior(result));
+      #endif
       if(cc < support(d).first)
          break;
       pp = c ? cdf(complement(d, cc)) : cdf(d, cc);
@@ -320,7 +332,7 @@ inline typename Dist::value_type round_to_floor(const Dist& d, typename Dist::va
 #endif
 
 template <class Dist>
-inline typename Dist::value_type round_to_ceil(const Dist& d, typename Dist::value_type result, typename Dist::value_type p, bool c)
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type round_to_ceil(const Dist& d, typename Dist::value_type result, typename Dist::value_type p, bool c)
 {
    BOOST_MATH_STD_USING
    typename Dist::value_type cc = floor(result);
@@ -334,7 +346,11 @@ inline typename Dist::value_type round_to_ceil(const Dist& d, typename Dist::val
    //
    while(true)
    {
+      #ifdef BOOST_MATH_HAS_GPU_SUPPORT
+      cc = ceil(::nextafter(result, tools::max_value<typename Dist::value_type>()));
+      #else
       cc = ceil(float_next(result));
+      #endif
       if(cc > support(d).second)
          break;
       pp = c ? cdf(complement(d, cc)) : cdf(d, cc);
@@ -357,7 +373,7 @@ inline typename Dist::value_type round_to_ceil(const Dist& d, typename Dist::val
 // to an int where required.
 //
 template <class Dist>
-inline typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type 
    inverse_discrete_quantile(
       const Dist& dist,
       typename Dist::value_type p,
@@ -366,7 +382,7 @@ inline typename Dist::value_type
       const typename Dist::value_type& multiplier,
       const typename Dist::value_type& adder,
       const policies::discrete_quantile<policies::real>&,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    if(p > 0.5)
    {
@@ -388,7 +404,7 @@ inline typename Dist::value_type
 }
 
 template <class Dist>
-inline typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type 
    inverse_discrete_quantile(
       const Dist& dist,
       const typename Dist::value_type& p,
@@ -397,7 +413,7 @@ inline typename Dist::value_type
       const typename Dist::value_type& multiplier,
       const typename Dist::value_type& adder,
       const policies::discrete_quantile<policies::integer_round_outwards>&,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    typedef typename Dist::value_type value_type;
    BOOST_MATH_STD_USING
@@ -431,7 +447,7 @@ inline typename Dist::value_type
 }
 
 template <class Dist>
-inline typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type 
    inverse_discrete_quantile(
       const Dist& dist,
       const typename Dist::value_type& p,
@@ -440,7 +456,7 @@ inline typename Dist::value_type
       const typename Dist::value_type& multiplier,
       const typename Dist::value_type& adder,
       const policies::discrete_quantile<policies::integer_round_inwards>&,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    typedef typename Dist::value_type value_type;
    BOOST_MATH_STD_USING
@@ -474,7 +490,7 @@ inline typename Dist::value_type
 }
 
 template <class Dist>
-inline typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type 
    inverse_discrete_quantile(
       const Dist& dist,
       const typename Dist::value_type& p,
@@ -483,7 +499,7 @@ inline typename Dist::value_type
       const typename Dist::value_type& multiplier,
       const typename Dist::value_type& adder,
       const policies::discrete_quantile<policies::integer_round_down>&,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    typedef typename Dist::value_type value_type;
    BOOST_MATH_STD_USING
@@ -502,7 +518,7 @@ inline typename Dist::value_type
 }
 
 template <class Dist>
-inline typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type 
    inverse_discrete_quantile(
       const Dist& dist,
       const typename Dist::value_type& p,
@@ -511,7 +527,7 @@ inline typename Dist::value_type
       const typename Dist::value_type& multiplier,
       const typename Dist::value_type& adder,
       const policies::discrete_quantile<policies::integer_round_up>&,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    BOOST_MATH_STD_USING
    typename Dist::value_type pp = c ? 1 - p : p;
@@ -529,7 +545,7 @@ inline typename Dist::value_type
 }
 
 template <class Dist>
-inline typename Dist::value_type 
+BOOST_MATH_GPU_ENABLED inline typename Dist::value_type 
    inverse_discrete_quantile(
       const Dist& dist,
       const typename Dist::value_type& p,
@@ -538,7 +554,7 @@ inline typename Dist::value_type
       const typename Dist::value_type& multiplier,
       const typename Dist::value_type& adder,
       const policies::discrete_quantile<policies::integer_round_nearest>&,
-      std::uintmax_t& max_iter)
+      boost::math::uintmax_t& max_iter)
 {
    typedef typename Dist::value_type value_type;
    BOOST_MATH_STD_USING
diff --git a/inst/include/boost/math/distributions/empirical_cumulative_distribution_function.hpp b/inst/include/boost/math/distributions/empirical_cumulative_distribution_function.hpp
index 767ea2e32..0d43db16f 100644
--- a/inst/include/boost/math/distributions/empirical_cumulative_distribution_function.hpp
+++ b/inst/include/boost/math/distributions/empirical_cumulative_distribution_function.hpp
@@ -14,7 +14,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/distributions/exponential.hpp b/inst/include/boost/math/distributions/exponential.hpp
index 164e01f20..9d45ac493 100644
--- a/inst/include/boost/math/distributions/exponential.hpp
+++ b/inst/include/boost/math/distributions/exponential.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -6,12 +7,16 @@
 #ifndef BOOST_STATS_EXPONENTIAL_HPP
 #define BOOST_STATS_EXPONENTIAL_HPP
 
-#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 #ifdef _MSC_VER
 # pragma warning(push)
@@ -19,8 +24,11 @@
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 #endif
 
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
 #include <utility>
 #include <cmath>
+#endif
 
 namespace boost{ namespace math{
 
@@ -29,7 +37,7 @@ namespace detail{
 // Error check:
 //
 template <class RealType, class Policy>
-inline bool verify_lambda(const char* function, RealType l, RealType* presult, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline bool verify_lambda(const char* function, RealType l, RealType* presult, const Policy& pol)
 {
    if((l <= 0) || !(boost::math::isfinite)(l))
    {
@@ -42,7 +50,7 @@ inline bool verify_lambda(const char* function, RealType l, RealType* presult, c
 }
 
 template <class RealType, class Policy>
-inline bool verify_exp_x(const char* function, RealType x, RealType* presult, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline bool verify_exp_x(const char* function, RealType x, RealType* presult, const Policy& pol)
 {
    if((x < 0) || (boost::math::isnan)(x))
    {
@@ -63,14 +71,14 @@ class exponential_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit exponential_distribution(RealType l_lambda = 1)
+   BOOST_MATH_GPU_ENABLED explicit exponential_distribution(RealType l_lambda = 1)
       : m_lambda(l_lambda)
    {
       RealType err;
       detail::verify_lambda("boost::math::exponential_distribution<%1%>::exponential_distribution", l_lambda, &err, Policy());
    } // exponential_distribution
 
-   RealType lambda()const { return m_lambda; }
+   BOOST_MATH_GPU_ENABLED RealType lambda()const { return m_lambda; }
 
 private:
    RealType m_lambda;
@@ -84,35 +92,35 @@ exponential_distribution(RealType)->exponential_distribution<typename boost::mat
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const exponential_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const exponential_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { 
-    return std::pair<RealType, RealType>(static_cast<RealType>(0), std::numeric_limits<RealType>::infinity()); // 0 to + infinity.
+    return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), boost::math::numeric_limits<RealType>::infinity()); // 0 to + infinity.
   }
   else
   {
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // 0 to + max
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // 0 to + max
   }
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const exponential_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const exponential_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
    using boost::math::tools::min_value;
-   return std::pair<RealType, RealType>(min_value<RealType>(),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(min_value<RealType>(),  max_value<RealType>());
    // min_value<RealType>() to avoid a discontinuity at x = 0.
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::pdf(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const exponential_distribution<%1%>&, %1%)";
 
    RealType lambda = dist.lambda();
    RealType result = 0;
@@ -128,14 +136,14 @@ inline RealType pdf(const exponential_distribution<RealType, Policy>& dist, cons
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::logpdf(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logpdf(const exponential_distribution<%1%>&, %1%)";
 
    RealType lambda = dist.lambda();
-   RealType result = -std::numeric_limits<RealType>::infinity();
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
    if(0 == detail::verify_lambda(function, lambda, &result, Policy()))
       return result;
    if(0 == detail::verify_exp_x(function, x, &result, Policy()))
@@ -146,11 +154,11 @@ inline RealType logpdf(const exponential_distribution<RealType, Policy>& dist, c
 } // logpdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const exponential_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    RealType lambda = dist.lambda();
@@ -164,11 +172,11 @@ inline RealType cdf(const exponential_distribution<RealType, Policy>& dist, cons
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType logcdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const exponential_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::logcdf(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const exponential_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    RealType lambda = dist.lambda();
@@ -182,11 +190,11 @@ inline RealType logcdf(const exponential_distribution<RealType, Policy>& dist, c
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const exponential_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const exponential_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const exponential_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    RealType lambda = dist.lambda();
@@ -205,11 +213,11 @@ inline RealType quantile(const exponential_distribution<RealType, Policy>& dist,
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<exponential_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<exponential_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const exponential_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    RealType lambda = c.dist.lambda();
@@ -226,11 +234,11 @@ inline RealType cdf(const complemented2_type<exponential_distribution<RealType,
 }
 
 template <class RealType, class Policy>
-inline RealType logcdf(const complemented2_type<exponential_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<exponential_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::logcdf(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const exponential_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    RealType lambda = c.dist.lambda();
@@ -247,11 +255,11 @@ inline RealType logcdf(const complemented2_type<exponential_distribution<RealTyp
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<exponential_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<exponential_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const exponential_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const exponential_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    RealType lambda = c.dist.lambda();
@@ -272,7 +280,7 @@ inline RealType quantile(const complemented2_type<exponential_distribution<RealT
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const exponential_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const exponential_distribution<RealType, Policy>& dist)
 {
    RealType result = 0;
    RealType lambda = dist.lambda();
@@ -282,7 +290,7 @@ inline RealType mean(const exponential_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType standard_deviation(const exponential_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType standard_deviation(const exponential_distribution<RealType, Policy>& dist)
 {
    RealType result = 0;
    RealType lambda = dist.lambda();
@@ -292,38 +300,38 @@ inline RealType standard_deviation(const exponential_distribution<RealType, Poli
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const exponential_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const exponential_distribution<RealType, Policy>& /*dist*/)
 {
    return 0;
 }
 
 template <class RealType, class Policy>
-inline RealType median(const exponential_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const exponential_distribution<RealType, Policy>& dist)
 {
    using boost::math::constants::ln_two;
    return ln_two<RealType>() / dist.lambda(); // ln(2) / lambda
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const exponential_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const exponential_distribution<RealType, Policy>& /*dist*/)
 {
    return 2;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const exponential_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const exponential_distribution<RealType, Policy>& /*dist*/)
 {
    return 9;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const exponential_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const exponential_distribution<RealType, Policy>& /*dist*/)
 {
    return 6;
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const exponential_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const exponential_distribution<RealType, Policy>& dist)
 {
    using std::log;
    return 1 - log(dist.lambda());
diff --git a/inst/include/boost/math/distributions/extreme_value.hpp b/inst/include/boost/math/distributions/extreme_value.hpp
index 1bde2743c..73454d29d 100644
--- a/inst/include/boost/math/distributions/extreme_value.hpp
+++ b/inst/include/boost/math/distributions/extreme_value.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -6,12 +7,17 @@
 #ifndef BOOST_STATS_EXTREME_VALUE_HPP
 #define BOOST_STATS_EXTREME_VALUE_HPP
 
-#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/precision.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 //
 // This is the maximum extreme value distribution, see
@@ -20,8 +26,11 @@
 // Also known as a Fisher-Tippett distribution, a log-Weibull
 // distribution or a Gumbel distribution.
 
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
 #include <utility>
 #include <cmath>
+#endif
 
 #ifdef _MSC_VER
 # pragma warning(push)
@@ -35,7 +44,7 @@ namespace detail{
 // Error check:
 //
 template <class RealType, class Policy>
-inline bool verify_scale_b(const char* function, RealType b, RealType* presult, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline bool verify_scale_b(const char* function, RealType b, RealType* presult, const Policy& pol)
 {
    if((b <= 0) || !(boost::math::isfinite)(b))
    {
@@ -56,7 +65,7 @@ class extreme_value_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit extreme_value_distribution(RealType a = 0, RealType b = 1)
+   BOOST_MATH_GPU_ENABLED explicit extreme_value_distribution(RealType a = 0, RealType b = 1)
       : m_a(a), m_b(b)
    {
       RealType err;
@@ -64,8 +73,8 @@ class extreme_value_distribution
       detail::check_finite("boost::math::extreme_value_distribution<%1%>::extreme_value_distribution", a, &err, Policy());
    } // extreme_value_distribution
 
-   RealType location()const { return m_a; }
-   RealType scale()const { return m_b; }
+   BOOST_MATH_GPU_ENABLED RealType location()const { return m_a; }
+   BOOST_MATH_GPU_ENABLED RealType scale()const { return m_b; }
 
 private:
    RealType m_a;
@@ -82,28 +91,28 @@ extreme_value_distribution(RealType,RealType)->extreme_value_distribution<typena
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const extreme_value_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const extreme_value_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(
-      std::numeric_limits<RealType>::has_infinity ? -std::numeric_limits<RealType>::infinity() : -max_value<RealType>(), 
-      std::numeric_limits<RealType>::has_infinity ? std::numeric_limits<RealType>::infinity() : max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(
+      boost::math::numeric_limits<RealType>::has_infinity ? -boost::math::numeric_limits<RealType>::infinity() : -max_value<RealType>(), 
+      boost::math::numeric_limits<RealType>::has_infinity ? boost::math::numeric_limits<RealType>::infinity() : max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const extreme_value_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const extreme_value_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(-max_value<RealType>(),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(-max_value<RealType>(),  max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::pdf(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const extreme_value_distribution<%1%>&, %1%)";
 
    RealType a = dist.location();
    RealType b = dist.scale();
@@ -124,15 +133,15 @@ inline RealType pdf(const extreme_value_distribution<RealType, Policy>& dist, co
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::logpdf(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logpdf(const extreme_value_distribution<%1%>&, %1%)";
 
    RealType a = dist.location();
    RealType b = dist.scale();
-   RealType result = -std::numeric_limits<RealType>::infinity();
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
    if(0 == detail::verify_scale_b(function, b, &result, Policy()))
       return result;
    if(0 == detail::check_finite(function, a, &result, Policy()))
@@ -149,11 +158,11 @@ inline RealType logpdf(const extreme_value_distribution<RealType, Policy>& dist,
 } // logpdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const extreme_value_distribution<%1%>&, %1%)";
 
    if((boost::math::isinf)(x))
       return x < 0 ? 0.0f : 1.0f;
@@ -175,11 +184,11 @@ inline RealType cdf(const extreme_value_distribution<RealType, Policy>& dist, co
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType logcdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const extreme_value_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::logcdf(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const extreme_value_distribution<%1%>&, %1%)";
 
    if((boost::math::isinf)(x))
       return x < 0 ? 0.0f : 1.0f;
@@ -201,11 +210,11 @@ inline RealType logcdf(const extreme_value_distribution<RealType, Policy>& dist,
 } // logcdf
 
 template <class RealType, class Policy>
-RealType quantile(const extreme_value_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED RealType quantile(const extreme_value_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const extreme_value_distribution<%1%>&, %1%)";
 
    RealType a = dist.location();
    RealType b = dist.scale();
@@ -228,11 +237,11 @@ RealType quantile(const extreme_value_distribution<RealType, Policy>& dist, cons
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<extreme_value_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<extreme_value_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const extreme_value_distribution<%1%>&, %1%)";
 
    if((boost::math::isinf)(c.param))
       return c.param < 0 ? 1.0f : 0.0f;
@@ -252,11 +261,11 @@ inline RealType cdf(const complemented2_type<extreme_value_distribution<RealType
 }
 
 template <class RealType, class Policy>
-inline RealType logcdf(const complemented2_type<extreme_value_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<extreme_value_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::logcdf(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const extreme_value_distribution<%1%>&, %1%)";
 
    if((boost::math::isinf)(c.param))
       return c.param < 0 ? 1.0f : 0.0f;
@@ -276,11 +285,11 @@ inline RealType logcdf(const complemented2_type<extreme_value_distribution<RealT
 }
 
 template <class RealType, class Policy>
-RealType quantile(const complemented2_type<extreme_value_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED RealType quantile(const complemented2_type<extreme_value_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const extreme_value_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const extreme_value_distribution<%1%>&, %1%)";
 
    RealType a = c.dist.location();
    RealType b = c.dist.scale();
@@ -304,7 +313,7 @@ RealType quantile(const complemented2_type<extreme_value_distribution<RealType,
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const extreme_value_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const extreme_value_distribution<RealType, Policy>& dist)
 {
    RealType a = dist.location();
    RealType b = dist.scale();
@@ -317,7 +326,7 @@ inline RealType mean(const extreme_value_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType standard_deviation(const extreme_value_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType standard_deviation(const extreme_value_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING // for ADL of std functions.
 
@@ -331,20 +340,20 @@ inline RealType standard_deviation(const extreme_value_distribution<RealType, Po
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const extreme_value_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const extreme_value_distribution<RealType, Policy>& dist)
 {
    return dist.location();
 }
 
 template <class RealType, class Policy>
-inline RealType median(const extreme_value_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const extreme_value_distribution<RealType, Policy>& dist)
 {
   using constants::ln_ln_two;
    return dist.location() - dist.scale() * ln_ln_two<RealType>();
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const extreme_value_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const extreme_value_distribution<RealType, Policy>& /*dist*/)
 {
    //
    // This is 12 * sqrt(6) * zeta(3) / pi^3:
@@ -354,14 +363,14 @@ inline RealType skewness(const extreme_value_distribution<RealType, Policy>& /*d
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const extreme_value_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const extreme_value_distribution<RealType, Policy>& /*dist*/)
 {
    // See http://mathworld.wolfram.com/ExtremeValueDistribution.html
    return RealType(27) / 5;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const extreme_value_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const extreme_value_distribution<RealType, Policy>& /*dist*/)
 {
    // See http://mathworld.wolfram.com/ExtremeValueDistribution.html
    return RealType(12) / 5;
diff --git a/inst/include/boost/math/distributions/find_scale.hpp b/inst/include/boost/math/distributions/find_scale.hpp
index 25551b87d..cd08ce95a 100644
--- a/inst/include/boost/math/distributions/find_scale.hpp
+++ b/inst/include/boost/math/distributions/find_scale.hpp
@@ -80,9 +80,7 @@ namespace boost
 
       if (result <= 0)
       { // If policy isn't to throw, return the scale <= 0.
-        policies::raise_evaluation_error<typename Dist::value_type>(function,
-          "Computed scale (%1%) is <= 0!" " Was the complement intended?",
-          result, Policy());
+        policies::raise_evaluation_error<typename Dist::value_type>(function, "Computed scale (%1%) is <= 0!" " Was the complement intended?", result, Policy()); // LCOV_EXCL_LINE
       }
       return result;
     } // template <class Dist, class Policy> find_scale
@@ -140,9 +138,7 @@ namespace boost
       //     (  z    - location) / (quantile(complement(Dist(),  q)) 
       if (result <= 0)
       { // If policy isn't to throw, return the scale <= 0.
-        policies::raise_evaluation_error<typename Dist::value_type>(function,
-          "Computed scale (%1%) is <= 0!" " Was the complement intended?",
-          result, Policy());
+        policies::raise_evaluation_error<typename Dist::value_type>(function, "Computed scale (%1%) is <= 0!" " Was the complement intended?", result, Policy()); // LCOV_EXCL_LINE
       }
       return result;
     } // template <class Dist, class Policy, class Real1, class Real2, class Real3> typename Dist::value_type find_scale
@@ -192,9 +188,8 @@ namespace boost
       //     (  z    - location) / (quantile(complement(Dist(),  q)) 
       if (result <= 0)
       { // If policy isn't to throw, return the scale <= 0.
-        policies::raise_evaluation_error<typename Dist::value_type>(function,
-          "Computed scale (%1%) is <= 0!" " Was the complement intended?",
-          result, policies::policy<>()); // This is only the default policy - also Want a version with Policy here.
+        policies::raise_evaluation_error<typename Dist::value_type>(function, "Computed scale (%1%) is <= 0!" " Was the complement intended?", // LCOV_EXCL_LINE
+           result, policies::policy<>()); // This is only the default policy - also Want a version with Policy here.  LCOV_EXCL_LINE
       }
       return result;
     } // template <class Dist, class Real1, class Real2, class Real3> typename Dist::value_type find_scale
diff --git a/inst/include/boost/math/distributions/fisher_f.hpp b/inst/include/boost/math/distributions/fisher_f.hpp
index e22cdf50a..56b288d88 100644
--- a/inst/include/boost/math/distributions/fisher_f.hpp
+++ b/inst/include/boost/math/distributions/fisher_f.hpp
@@ -1,5 +1,5 @@
 // Copyright John Maddock 2006.
-
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -8,14 +8,15 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_FISHER_F_HPP
 #define BOOST_MATH_DISTRIBUTIONS_FISHER_F_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/promotion.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for incomplete beta.
 #include <boost/math/distributions/complement.hpp> // complements
 #include <boost/math/distributions/detail/common_error_handling.hpp> // error checks
 #include <boost/math/special_functions/fpclassify.hpp>
 
-#include <utility>
-
 namespace boost{ namespace math{
 
 template <class RealType = double, class Policy = policies::policy<> >
@@ -25,9 +26,9 @@ class fisher_f_distribution
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   fisher_f_distribution(const RealType& i, const RealType& j) : m_df1(i), m_df2(j)
+   BOOST_MATH_GPU_ENABLED fisher_f_distribution(const RealType& i, const RealType& j) : m_df1(i), m_df2(j)
    {
-      static const char* function = "fisher_f_distribution<%1%>::fisher_f_distribution";
+      constexpr auto function = "fisher_f_distribution<%1%>::fisher_f_distribution";
       RealType result;
       detail::check_df(
          function, m_df1, &result, Policy());
@@ -35,11 +36,11 @@ class fisher_f_distribution
          function, m_df2, &result, Policy());
    } // fisher_f_distribution
 
-   RealType degrees_of_freedom1()const
+   BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom1()const
    {
       return m_df1;
    }
-   RealType degrees_of_freedom2()const
+   BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom2()const
    {
       return m_df2;
    }
@@ -60,29 +61,29 @@ fisher_f_distribution(RealType,RealType)->fisher_f_distribution<typename boost::
 #endif
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> range(const fisher_f_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const fisher_f_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> support(const fisher_f_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const fisher_f_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-RealType pdf(const fisher_f_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED RealType pdf(const fisher_f_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
    // Error check:
    RealType error_result = 0;
-   static const char* function = "boost::math::pdf(fisher_f_distribution<%1%> const&, %1%)";
+   constexpr auto function = "boost::math::pdf(fisher_f_distribution<%1%> const&, %1%)";
    if(false == (detail::check_df(
          function, df1, &error_result, Policy())
          && detail::check_df(
@@ -132,9 +133,9 @@ RealType pdf(const fisher_f_distribution<RealType, Policy>& dist, const RealType
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const fisher_f_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const fisher_f_distribution<RealType, Policy>& dist, const RealType& x)
 {
-   static const char* function = "boost::math::cdf(fisher_f_distribution<%1%> const&, %1%)";
+   constexpr auto function = "boost::math::cdf(fisher_f_distribution<%1%> const&, %1%)";
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
    // Error check:
@@ -167,9 +168,9 @@ inline RealType cdf(const fisher_f_distribution<RealType, Policy>& dist, const R
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const fisher_f_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const fisher_f_distribution<RealType, Policy>& dist, const RealType& p)
 {
-   static const char* function = "boost::math::quantile(fisher_f_distribution<%1%> const&, %1%)";
+   constexpr auto function = "boost::math::quantile(fisher_f_distribution<%1%> const&, %1%)";
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
    // Error check:
@@ -192,9 +193,9 @@ inline RealType quantile(const fisher_f_distribution<RealType, Policy>& dist, co
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<fisher_f_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<fisher_f_distribution<RealType, Policy>, RealType>& c)
 {
-   static const char* function = "boost::math::cdf(fisher_f_distribution<%1%> const&, %1%)";
+   constexpr auto function = "boost::math::cdf(fisher_f_distribution<%1%> const&, %1%)";
    RealType df1 = c.dist.degrees_of_freedom1();
    RealType df2 = c.dist.degrees_of_freedom2();
    RealType x = c.param;
@@ -228,9 +229,9 @@ inline RealType cdf(const complemented2_type<fisher_f_distribution<RealType, Pol
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<fisher_f_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<fisher_f_distribution<RealType, Policy>, RealType>& c)
 {
-   static const char* function = "boost::math::quantile(fisher_f_distribution<%1%> const&, %1%)";
+   constexpr auto function = "boost::math::quantile(fisher_f_distribution<%1%> const&, %1%)";
    RealType df1 = c.dist.degrees_of_freedom1();
    RealType df2 = c.dist.degrees_of_freedom2();
    RealType p = c.param;
@@ -252,9 +253,9 @@ inline RealType quantile(const complemented2_type<fisher_f_distribution<RealType
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const fisher_f_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const fisher_f_distribution<RealType, Policy>& dist)
 { // Mean of F distribution = v.
-   static const char* function = "boost::math::mean(fisher_f_distribution<%1%> const&)";
+   constexpr auto function = "boost::math::mean(fisher_f_distribution<%1%> const&)";
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
    // Error check:
@@ -273,9 +274,9 @@ inline RealType mean(const fisher_f_distribution<RealType, Policy>& dist)
 } // mean
 
 template <class RealType, class Policy>
-inline RealType variance(const fisher_f_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const fisher_f_distribution<RealType, Policy>& dist)
 { // Variance of F distribution.
-   static const char* function = "boost::math::variance(fisher_f_distribution<%1%> const&)";
+   constexpr auto function = "boost::math::variance(fisher_f_distribution<%1%> const&)";
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
    // Error check:
@@ -294,9 +295,9 @@ inline RealType variance(const fisher_f_distribution<RealType, Policy>& dist)
 } // variance
 
 template <class RealType, class Policy>
-inline RealType mode(const fisher_f_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const fisher_f_distribution<RealType, Policy>& dist)
 {
-   static const char* function = "boost::math::mode(fisher_f_distribution<%1%> const&)";
+   constexpr auto function = "boost::math::mode(fisher_f_distribution<%1%> const&)";
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
    // Error check:
@@ -317,15 +318,15 @@ inline RealType mode(const fisher_f_distribution<RealType, Policy>& dist)
 //template <class RealType, class Policy>
 //inline RealType median(const fisher_f_distribution<RealType, Policy>& dist)
 //{ // Median of Fisher F distribution is not defined.
-//  return tools::domain_error<RealType>(BOOST_CURRENT_FUNCTION, "Median is not implemented, result is %1%!", std::numeric_limits<RealType>::quiet_NaN());
+//  return tools::domain_error<RealType>(BOOST_CURRENT_FUNCTION, "Median is not implemented, result is %1%!", boost::math::numeric_limits<RealType>::quiet_NaN());
 //  } // median
 
 // Now implemented via quantile(half) in derived accessors.
 
 template <class RealType, class Policy>
-inline RealType skewness(const fisher_f_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const fisher_f_distribution<RealType, Policy>& dist)
 {
-   static const char* function = "boost::math::skewness(fisher_f_distribution<%1%> const&)";
+   constexpr auto function = "boost::math::skewness(fisher_f_distribution<%1%> const&)";
    BOOST_MATH_STD_USING // ADL of std names
    // See http://mathworld.wolfram.com/F-Distribution.html
    RealType df1 = dist.degrees_of_freedom1();
@@ -346,18 +347,18 @@ inline RealType skewness(const fisher_f_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-RealType kurtosis_excess(const fisher_f_distribution<RealType, Policy>& dist);
+BOOST_MATH_GPU_ENABLED RealType kurtosis_excess(const fisher_f_distribution<RealType, Policy>& dist);
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const fisher_f_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const fisher_f_distribution<RealType, Policy>& dist)
 {
    return 3 + kurtosis_excess(dist);
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const fisher_f_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const fisher_f_distribution<RealType, Policy>& dist)
 {
-   static const char* function = "boost::math::kurtosis_excess(fisher_f_distribution<%1%> const&)";
+   constexpr auto function = "boost::math::kurtosis_excess(fisher_f_distribution<%1%> const&)";
    // See http://mathworld.wolfram.com/F-Distribution.html
    RealType df1 = dist.degrees_of_freedom1();
    RealType df2 = dist.degrees_of_freedom2();
diff --git a/inst/include/boost/math/distributions/fwd.hpp b/inst/include/boost/math/distributions/fwd.hpp
index a3c1a41df..ccb3c0cd1 100644
--- a/inst/include/boost/math/distributions/fwd.hpp
+++ b/inst/include/boost/math/distributions/fwd.hpp
@@ -66,6 +66,18 @@ class inverse_gaussian_distribution;
 template <class RealType, class Policy>
 class kolmogorov_smirnov_distribution;
 
+template <class RealType, class Policy>
+class landau_distribution;
+
+template <class RealType, class Policy>
+class mapairy_distribution;
+
+template <class RealType, class Policy>
+class holtsmark_distribution;
+
+template <class RealType, class Policy>
+class saspoint5_distribution;
+
 template <class RealType, class Policy>
 class laplace_distribution;
 
@@ -136,6 +148,10 @@ class weibull_distribution;
    typedef boost::math::inverse_chi_squared_distribution<Type, Policy> inverse_chi_squared;\
    typedef boost::math::inverse_gaussian_distribution<Type, Policy> inverse_gaussian;\
    typedef boost::math::inverse_gamma_distribution<Type, Policy> inverse_gamma;\
+   typedef boost::math::landau_distribution<Type, Policy> landau;\
+   typedef boost::math::mapairy_distribution<Type, Policy> mapairy;\
+   typedef boost::math::holtsmark_distribution<Type, Policy> holtsmark;\
+   typedef boost::math::saspoint5_distribution<Type, Policy> saspoint5;\
    typedef boost::math::laplace_distribution<Type, Policy> laplace;\
    typedef boost::math::logistic_distribution<Type, Policy> logistic;\
    typedef boost::math::lognormal_distribution<Type, Policy> lognormal;\
diff --git a/inst/include/boost/math/distributions/gamma.hpp b/inst/include/boost/math/distributions/gamma.hpp
index 28b7c55b0..5176f906d 100644
--- a/inst/include/boost/math/distributions/gamma.hpp
+++ b/inst/include/boost/math/distributions/gamma.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,22 +11,22 @@
 // http://mathworld.wolfram.com/GammaDistribution.html
 // http://en.wikipedia.org/wiki/Gamma_distribution
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/digamma.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 
-#include <utility>
-#include <type_traits>
-
 namespace boost{ namespace math
 {
 namespace detail
 {
 
 template <class RealType, class Policy>
-inline bool check_gamma_shape(
+BOOST_MATH_GPU_ENABLED inline bool check_gamma_shape(
       const char* function,
       RealType shape,
       RealType* result, const Policy& pol)
@@ -41,7 +42,7 @@ inline bool check_gamma_shape(
 }
 
 template <class RealType, class Policy>
-inline bool check_gamma_x(
+BOOST_MATH_GPU_ENABLED inline bool check_gamma_x(
       const char* function,
       RealType const& x,
       RealType* result, const Policy& pol)
@@ -57,7 +58,7 @@ inline bool check_gamma_x(
 }
 
 template <class RealType, class Policy>
-inline bool check_gamma(
+BOOST_MATH_GPU_ENABLED inline bool check_gamma(
       const char* function,
       RealType scale,
       RealType shape,
@@ -75,19 +76,19 @@ class gamma_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit gamma_distribution(RealType l_shape, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED explicit gamma_distribution(RealType l_shape, RealType l_scale = 1)
       : m_shape(l_shape), m_scale(l_scale)
    {
       RealType result;
       detail::check_gamma("boost::math::gamma_distribution<%1%>::gamma_distribution", l_scale, l_shape, &result, Policy());
    }
 
-   RealType shape()const
+   BOOST_MATH_GPU_ENABLED RealType shape()const
    {
       return m_shape;
    }
 
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    {
       return m_scale;
    }
@@ -109,27 +110,27 @@ gamma_distribution(RealType,RealType)->gamma_distribution<typename boost::math::
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const gamma_distribution<RealType, Policy>& /* dist */)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const gamma_distribution<RealType, Policy>& /* dist */)
 { // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const gamma_distribution<RealType, Policy>& /* dist */)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const gamma_distribution<RealType, Policy>& /* dist */)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
    using boost::math::tools::min_value;
-   return std::pair<RealType, RealType>(min_value<RealType>(),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(min_value<RealType>(),  max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const gamma_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const gamma_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::pdf(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -149,17 +150,17 @@ inline RealType pdf(const gamma_distribution<RealType, Policy>& dist, const Real
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const gamma_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const gamma_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
    using boost::math::lgamma;
 
-   static const char* function = "boost::math::logpdf(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logpdf(const gamma_distribution<%1%>&, %1%)";
 
    RealType k = dist.shape();
    RealType theta = dist.scale();
 
-   RealType result = -std::numeric_limits<RealType>::infinity();
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
    if(false == detail::check_gamma(function, theta, k, &result, Policy()))
       return result;
    if(false == detail::check_gamma_x(function, x, &result, Policy()))
@@ -167,7 +168,7 @@ inline RealType logpdf(const gamma_distribution<RealType, Policy>& dist, const R
 
    if(x == 0)
    {
-      return std::numeric_limits<RealType>::quiet_NaN();
+      return boost::math::numeric_limits<RealType>::quiet_NaN();
    }
 
    result = -k*log(theta) + (k-1)*log(x) - lgamma(k) - (x/theta);
@@ -176,11 +177,11 @@ inline RealType logpdf(const gamma_distribution<RealType, Policy>& dist, const R
 } // logpdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const gamma_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const gamma_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -196,11 +197,11 @@ inline RealType cdf(const gamma_distribution<RealType, Policy>& dist, const Real
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const gamma_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const gamma_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -220,11 +221,11 @@ inline RealType quantile(const gamma_distribution<RealType, Policy>& dist, const
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<gamma_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<gamma_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -241,11 +242,11 @@ inline RealType cdf(const complemented2_type<gamma_distribution<RealType, Policy
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<gamma_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<gamma_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -266,11 +267,11 @@ inline RealType quantile(const complemented2_type<gamma_distribution<RealType, P
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::mean(const gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mean(const gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -284,11 +285,11 @@ inline RealType mean(const gamma_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType variance(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::variance(const gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::variance(const gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -302,11 +303,11 @@ inline RealType variance(const gamma_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::mode(const gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mode(const gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -331,11 +332,11 @@ inline RealType mode(const gamma_distribution<RealType, Policy>& dist)
 //}
 
 template <class RealType, class Policy>
-inline RealType skewness(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::skewness(const gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::skewness(const gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -349,11 +350,11 @@ inline RealType skewness(const gamma_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::kurtosis_excess(const gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::kurtosis_excess(const gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -367,18 +368,19 @@ inline RealType kurtosis_excess(const gamma_distribution<RealType, Policy>& dist
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const gamma_distribution<RealType, Policy>& dist)
 {
    return kurtosis_excess(dist) + 3;
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const gamma_distribution<RealType, Policy>& dist)
 {
+   BOOST_MATH_STD_USING
+
    RealType k = dist.shape();
    RealType theta = dist.scale();
-   using std::log;
-   return k + log(theta) + lgamma(k) + (1-k)*digamma(k);
+   return k + log(theta) + boost::math::lgamma(k) + (1-k)*digamma(k);
 }
 
 } // namespace math
diff --git a/inst/include/boost/math/distributions/geometric.hpp b/inst/include/boost/math/distributions/geometric.hpp
index baff0e249..0a7b383c2 100644
--- a/inst/include/boost/math/distributions/geometric.hpp
+++ b/inst/include/boost/math/distributions/geometric.hpp
@@ -36,6 +36,9 @@
 #ifndef BOOST_MATH_SPECIAL_GEOMETRIC_HPP
 #define BOOST_MATH_SPECIAL_GEOMETRIC_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for ibeta(a, b, x) == Ix(a, b).
 #include <boost/math/distributions/complement.hpp> // complement.
@@ -45,10 +48,6 @@
 #include <boost/math/distributions/detail/inv_discrete_quantile.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 
-#include <limits> // using std::numeric_limits;
-#include <utility>
-#include <cmath>
-
 #if defined (BOOST_MSVC)
 #  pragma warning(push)
 // This believed not now necessary, so commented out.
@@ -64,7 +63,7 @@ namespace boost
     {
       // Common error checking routines for geometric distribution function:
       template <class RealType, class Policy>
-      inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& pol)
       {
         if( !(boost::math::isfinite)(p) || (p < 0) || (p > 1) )
         {
@@ -77,13 +76,13 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& p, RealType* result, const Policy& pol)
       {
         return check_success_fraction(function, p, result, pol);
       }
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_k(const char* function,  const RealType& p, RealType k, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_k(const char* function,  const RealType& p, RealType k, RealType* result, const Policy& pol)
       {
         if(check_dist(function, p, result, pol) == false)
         {
@@ -100,7 +99,7 @@ namespace boost
       } // Check_dist_and_k
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_prob(const char* function, RealType p, RealType prob, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_prob(const char* function, RealType p, RealType prob, RealType* result, const Policy& pol)
       {
         if((check_dist(function, p, result, pol) && detail::check_probability(function, prob, result, pol)) == false)
         {
@@ -117,7 +116,7 @@ namespace boost
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      geometric_distribution(RealType p) : m_p(p)
+      BOOST_MATH_GPU_ENABLED geometric_distribution(RealType p) : m_p(p)
       { // Constructor stores success_fraction p.
         RealType result;
         geometric_detail::check_dist(
@@ -127,22 +126,22 @@ namespace boost
       } // geometric_distribution constructor.
 
       // Private data getter class member functions.
-      RealType success_fraction() const
+      BOOST_MATH_GPU_ENABLED RealType success_fraction() const
       { // Probability of success as fraction in range 0 to 1.
         return m_p;
       }
-      RealType successes() const
+      BOOST_MATH_GPU_ENABLED RealType successes() const
       { // Total number of successes r = 1 (for compatibility with negative binomial?).
         return 1;
       }
 
       // Parameter estimation.
       // (These are copies of negative_binomial distribution with successes = 1).
-      static RealType find_lower_bound_on_p(
+      BOOST_MATH_GPU_ENABLED static RealType find_lower_bound_on_p(
         RealType trials,
         RealType alpha) // alpha 0.05 equivalent to 95% for one-sided test.
       {
-        static const char* function = "boost::math::geometric<%1%>::find_lower_bound_on_p";
+        constexpr auto function = "boost::math::geometric<%1%>::find_lower_bound_on_p";
         RealType result = 0;  // of error checks.
         RealType successes = 1;
         RealType failures = trials - successes;
@@ -163,11 +162,11 @@ namespace boost
         return ibeta_inv(successes, failures + 1, alpha, static_cast<RealType*>(nullptr), Policy());
       } // find_lower_bound_on_p
 
-      static RealType find_upper_bound_on_p(
+      BOOST_MATH_GPU_ENABLED static RealType find_upper_bound_on_p(
         RealType trials,
         RealType alpha) // alpha 0.05 equivalent to 95% for one-sided test.
       {
-        static const char* function = "boost::math::geometric<%1%>::find_upper_bound_on_p";
+        constexpr auto function = "boost::math::geometric<%1%>::find_upper_bound_on_p";
         RealType result = 0;  // of error checks.
         RealType successes = 1;
         RealType failures = trials - successes;
@@ -195,12 +194,12 @@ namespace boost
       // Estimate number of trials :
       // "How many trials do I need to be P% sure of seeing k or fewer failures?"
 
-      static RealType find_minimum_number_of_trials(
+      BOOST_MATH_GPU_ENABLED static RealType find_minimum_number_of_trials(
         RealType k,     // number of failures (k >= 0).
         RealType p,     // success fraction 0 <= p <= 1.
         RealType alpha) // risk level threshold 0 <= alpha <= 1.
       {
-        static const char* function = "boost::math::geometric<%1%>::find_minimum_number_of_trials";
+        constexpr auto function = "boost::math::geometric<%1%>::find_minimum_number_of_trials";
         // Error checks:
         RealType result = 0;
         if(false == geometric_detail::check_dist_and_k(
@@ -213,12 +212,12 @@ namespace boost
         return result + k;
       } // RealType find_number_of_failures
 
-      static RealType find_maximum_number_of_trials(
+      BOOST_MATH_GPU_ENABLED static RealType find_maximum_number_of_trials(
         RealType k,     // number of failures (k >= 0).
         RealType p,     // success fraction 0 <= p <= 1.
         RealType alpha) // risk level threshold 0 <= alpha <= 1.
       {
-        static const char* function = "boost::math::geometric<%1%>::find_maximum_number_of_trials";
+        constexpr auto function = "boost::math::geometric<%1%>::find_maximum_number_of_trials";
         // Error checks:
         RealType result = 0;
         if(false == geometric_detail::check_dist_and_k(
@@ -244,22 +243,22 @@ namespace boost
     #endif
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const geometric_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const geometric_distribution<RealType, Policy>& /* dist */)
     { // Range of permissible values for random variable k.
        using boost::math::tools::max_value;
-       return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // max_integer?
+       return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // max_integer?
     }
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const geometric_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const geometric_distribution<RealType, Policy>& /* dist */)
     { // Range of supported values for random variable k.
        // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
        using boost::math::tools::max_value;
-       return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>()); // max_integer?
+       return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>()); // max_integer?
     }
 
     template <class RealType, class Policy>
-    inline RealType mean(const geometric_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const geometric_distribution<RealType, Policy>& dist)
     { // Mean of geometric distribution = (1-p)/p.
       return (1 - dist.success_fraction() ) / dist.success_fraction();
     } // mean
@@ -267,21 +266,21 @@ namespace boost
     // median implemented via quantile(half) in derived accessors.
 
     template <class RealType, class Policy>
-    inline RealType mode(const geometric_distribution<RealType, Policy>&)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const geometric_distribution<RealType, Policy>&)
     { // Mode of geometric distribution = zero.
       BOOST_MATH_STD_USING // ADL of std functions.
       return 0;
     } // mode
 
     template <class RealType, class Policy>
-    inline RealType variance(const geometric_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const geometric_distribution<RealType, Policy>& dist)
     { // Variance of Binomial distribution = (1-p) / p^2.
       return  (1 - dist.success_fraction())
         / (dist.success_fraction() * dist.success_fraction());
     } // variance
 
     template <class RealType, class Policy>
-    inline RealType skewness(const geometric_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const geometric_distribution<RealType, Policy>& dist)
     { // skewness of geometric distribution = 2-p / (sqrt(r(1-p))
       BOOST_MATH_STD_USING // ADL of std functions.
       RealType p = dist.success_fraction();
@@ -289,7 +288,7 @@ namespace boost
     } // skewness
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const geometric_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const geometric_distribution<RealType, Policy>& dist)
     { // kurtosis of geometric distribution
       // http://en.wikipedia.org/wiki/geometric is kurtosis_excess so add 3
       RealType p = dist.success_fraction();
@@ -297,7 +296,7 @@ namespace boost
     } // kurtosis
 
      template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const geometric_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const geometric_distribution<RealType, Policy>& dist)
     { // kurtosis excess of geometric distribution
       // http://mathworld.wolfram.com/Kurtosis.html table of kurtosis_excess
       RealType p = dist.success_fraction();
@@ -312,11 +311,11 @@ namespace boost
     // chf of geometric distribution provided by derived accessors.
 
     template <class RealType, class Policy>
-    inline RealType pdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED inline RealType pdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
     { // Probability Density/Mass Function.
       BOOST_FPU_EXCEPTION_GUARD
       BOOST_MATH_STD_USING  // For ADL of math functions.
-      static const char* function = "boost::math::pdf(const geometric_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::pdf(const geometric_distribution<%1%>&, %1%)";
 
       RealType p = dist.success_fraction();
       RealType result = 0;
@@ -350,9 +349,9 @@ namespace boost
     } // geometric_pdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
     { // Cumulative Distribution Function of geometric.
-      static const char* function = "boost::math::cdf(const geometric_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::cdf(const geometric_distribution<%1%>&, %1%)";
 
       // k argument may be integral, signed, or unsigned, or floating point.
       // If necessary, it has already been promoted from an integral type.
@@ -381,10 +380,10 @@ namespace boost
     } // cdf Cumulative Distribution Function geometric.
 
     template <class RealType, class Policy>
-    inline RealType logcdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED inline RealType logcdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
     { // Cumulative Distribution Function of geometric.
-      using std::pow;
-      static const char* function = "boost::math::logcdf(const geometric_distribution<%1%>&, %1%)";
+      BOOST_MATH_STD_USING
+      constexpr auto function = "boost::math::logcdf(const geometric_distribution<%1%>&, %1%)";
 
       // k argument may be integral, signed, or unsigned, or floating point.
       // If necessary, it has already been promoted from an integral type.
@@ -397,7 +396,7 @@ namespace boost
         k,
         &result, Policy()))
       {
-        return -std::numeric_limits<RealType>::infinity();
+        return -boost::math::numeric_limits<RealType>::infinity();
       }
       if(k == 0)
       {
@@ -411,10 +410,10 @@ namespace boost
     } // logcdf Cumulative Distribution Function geometric.
 
     template <class RealType, class Policy>
-    inline RealType cdf(const complemented2_type<geometric_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<geometric_distribution<RealType, Policy>, RealType>& c)
     { // Complemented Cumulative Distribution Function geometric.
       BOOST_MATH_STD_USING
-      static const char* function = "boost::math::cdf(const geometric_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::cdf(const geometric_distribution<%1%>&, %1%)";
       // k argument may be integral, signed, or unsigned, or floating point.
       // If necessary, it has already been promoted from an integral type.
       RealType const& k = c.param;
@@ -436,10 +435,10 @@ namespace boost
     } // cdf Complemented Cumulative Distribution Function geometric.
 
     template <class RealType, class Policy>
-    inline RealType logcdf(const complemented2_type<geometric_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<geometric_distribution<RealType, Policy>, RealType>& c)
     { // Complemented Cumulative Distribution Function geometric.
       BOOST_MATH_STD_USING
-      static const char* function = "boost::math::logcdf(const geometric_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::logcdf(const geometric_distribution<%1%>&, %1%)";
       // k argument may be integral, signed, or unsigned, or floating point.
       // If necessary, it has already been promoted from an integral type.
       RealType const& k = c.param;
@@ -453,21 +452,21 @@ namespace boost
         k,
         &result, Policy()))
       {
-        return -std::numeric_limits<RealType>::infinity();
+        return -boost::math::numeric_limits<RealType>::infinity();
       }
 
       return boost::math::log1p(-p, Policy()) * (k+1);
     } // logcdf Complemented Cumulative Distribution Function geometric.
 
     template <class RealType, class Policy>
-    inline RealType quantile(const geometric_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const geometric_distribution<RealType, Policy>& dist, const RealType& x)
     { // Quantile, percentile/100 or Percent Point geometric function.
       // Return the number of expected failures k for a given probability p.
 
       // Inverse cumulative Distribution Function or Quantile (percentile / 100) of geometric Probability.
       // k argument may be integral, signed, or unsigned, or floating point.
 
-      static const char* function = "boost::math::quantile(const geometric_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::quantile(const geometric_distribution<%1%>&, %1%)";
       BOOST_MATH_STD_USING // ADL of std functions.
 
       RealType success_fraction = dist.success_fraction();
@@ -511,11 +510,11 @@ namespace boost
     } // RealType quantile(const geometric_distribution dist, p)
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<geometric_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<geometric_distribution<RealType, Policy>, RealType>& c)
     {  // Quantile or Percent Point Binomial function.
        // Return the number of expected failures k for a given
        // complement of the probability Q = 1 - P.
-       static const char* function = "boost::math::quantile(const geometric_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::quantile(const geometric_distribution<%1%>&, %1%)";
        BOOST_MATH_STD_USING
        // Error checks:
        RealType x = c.param;
diff --git a/inst/include/boost/math/distributions/holtsmark.hpp b/inst/include/boost/math/distributions/holtsmark.hpp
new file mode 100644
index 000000000..04f5484f4
--- /dev/null
+++ b/inst/include/boost/math/distributions/holtsmark.hpp
@@ -0,0 +1,2518 @@
+//  Copyright Takuma Yoshimura 2024.
+//  Copyright Matt Borland 2024.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_STATS_HOLTSMARK_HPP
+#define BOOST_STATS_HOLTSMARK_HPP
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/distributions/complement.hpp>
+#include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/distributions/detail/derived_accessors.hpp>
+#include <boost/math/tools/rational.hpp>
+#include <boost/math/special_functions/cbrt.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/tools/promotion.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/big_constant.hpp>
+#include <utility>
+#include <cmath>
+#endif
+
+namespace boost { namespace math {
+template <class RealType, class Policy>
+class holtsmark_distribution;
+
+namespace detail {
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 4.7894e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.87352751452164445024e-1),
+            static_cast<RealType>(1.18577398160636011811e-3),
+            static_cast<RealType>(-2.16526599226820153260e-2),
+            static_cast<RealType>(2.06462093371223113592e-3),
+            static_cast<RealType>(2.43382128013710116747e-3),
+            static_cast<RealType>(-2.15930711444603559520e-4),
+            static_cast<RealType>(-1.04197836740809694657e-4),
+            static_cast<RealType>(1.74679078247026597959e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.12654472808214997252e-3),
+            static_cast<RealType>(2.93891863033354755743e-1),
+            static_cast<RealType>(8.70867222155141724171e-3),
+            static_cast<RealType>(3.15027515421842640745e-2),
+            static_cast<RealType>(2.11141832312672190669e-3),
+            static_cast<RealType>(1.23545521355569424975e-3),
+            static_cast<RealType>(1.58181113865348637475e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.0925e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.02038159607840130389e-1),
+            static_cast<RealType>(-1.20368541260123112191e-2),
+            static_cast<RealType>(-3.19235497414059987151e-3),
+            static_cast<RealType>(8.88546222140257289852e-3),
+            static_cast<RealType>(-5.37287599824602316660e-4),
+            static_cast<RealType>(-2.39059149972922243276e-4),
+            static_cast<RealType>(9.19551014849109417931e-5),
+            static_cast<RealType>(-8.45210544648986348854e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.11634701234079515138e-1),
+            static_cast<RealType>(4.39922162828115412952e-1),
+            static_cast<RealType>(1.73609068791154078128e-1),
+            static_cast<RealType>(6.15831808473403962054e-2),
+            static_cast<RealType>(1.64364949550314788638e-2),
+            static_cast<RealType>(2.94399615562137394932e-3),
+            static_cast<RealType>(4.99662797033514776061e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.4499e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(8.45396231261375200568e-2),
+            static_cast<RealType>(-9.15509628797205847643e-3),
+            static_cast<RealType>(1.82052933284907579374e-2),
+            static_cast<RealType>(-2.44157914076021125182e-4),
+            static_cast<RealType>(8.40871885414177705035e-4),
+            static_cast<RealType>(7.26592615882060553326e-5),
+            static_cast<RealType>(-1.87768359214600016641e-6),
+            static_cast<RealType>(1.65716961206268668529e-6),
+            static_cast<RealType>(-1.73979640146948858436e-7),
+            static_cast<RealType>(7.24351142163396584236e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.88099527896838765666e-1),
+            static_cast<RealType>(6.53896948546877341992e-1),
+            static_cast<RealType>(2.96296982585381844864e-1),
+            static_cast<RealType>(1.14107585229341489833e-1),
+            static_cast<RealType>(3.08914671331207488189e-2),
+            static_cast<RealType>(7.03139384769200902107e-3),
+            static_cast<RealType>(1.01201814277918577790e-3),
+            static_cast<RealType>(1.12200113270398674535e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.5259e-17
+        BOOST_MATH_STATIC const RealType P[11] = {
+            static_cast<RealType>(1.36729417918039395222e-2),
+            static_cast<RealType>(1.19749117683408419115e-2),
+            static_cast<RealType>(6.26780921592414207398e-3),
+            static_cast<RealType>(1.84846137440857608948e-3),
+            static_cast<RealType>(3.39307829797262466829e-4),
+            static_cast<RealType>(2.73606960463362090866e-5),
+            static_cast<RealType>(-1.14419838471713498717e-7),
+            static_cast<RealType>(1.64552336875610576993e-8),
+            static_cast<RealType>(-7.95501797873739398143e-10),
+            static_cast<RealType>(2.55422885338760255125e-11),
+            static_cast<RealType>(-4.12196487201928768038e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.61334003864149486454e0),
+            static_cast<RealType>(1.28348868912975898501e0),
+            static_cast<RealType>(6.36594545291321210154e-1),
+            static_cast<RealType>(2.11478937436277242988e-1),
+            static_cast<RealType>(4.71550897200311391579e-2),
+            static_cast<RealType>(6.64679677197059316835e-3),
+            static_cast<RealType>(4.93706832858615742810e-4),
+            static_cast<RealType>(9.26919465059204396228e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.5084e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.90649774685568282390e-3),
+            static_cast<RealType>(7.43708409389806210196e-4),
+            static_cast<RealType>(9.53777347766128955847e-5),
+            static_cast<RealType>(3.79800193823252979170e-6),
+            static_cast<RealType>(2.84836656088572745575e-8),
+            static_cast<RealType>(-1.22715411241721187620e-10),
+            static_cast<RealType>(8.56789906419220801109e-13),
+            static_cast<RealType>(-4.17784858891714869163e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.29383849235788831455e-1),
+            static_cast<RealType>(2.16287201867831015266e-1),
+            static_cast<RealType>(3.28789040872705709070e-2),
+            static_cast<RealType>(2.64660789801664804789e-3),
+            static_cast<RealType>(1.03662724048874906931e-4),
+            static_cast<RealType>(1.47658125632566407978e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.4660e-19
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(3.07231582988207590928e-4),
+            static_cast<RealType>(5.16108848485823513911e-5),
+            static_cast<RealType>(3.05776014220862257678e-6),
+            static_cast<RealType>(7.64787444325088143218e-8),
+            static_cast<RealType>(7.40426355029090813961e-10),
+            static_cast<RealType>(1.57451122102115077046e-12),
+            static_cast<RealType>(-2.14505675750572782093e-15),
+            static_cast<RealType>(5.11204601013038698192e-18),
+            static_cast<RealType>(-9.00826023095223871551e-21),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.28966789835486457746e-1),
+            static_cast<RealType>(4.46981634258601621625e-2),
+            static_cast<RealType>(3.22521297380474263906e-3),
+            static_cast<RealType>(1.31985203433890010111e-4),
+            static_cast<RealType>(3.01507121087942156530e-6),
+            static_cast<RealType>(3.47777238523841835495e-8),
+            static_cast<RealType>(1.50780503777979189972e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.2292e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(5.25741312407933720817e-5),
+            static_cast<RealType>(2.34425802342454046697e-6),
+            static_cast<RealType>(3.30042747965497652847e-8),
+            static_cast<RealType>(1.58564820095683252738e-10),
+            static_cast<RealType>(1.54070758384735212486e-13),
+            static_cast<RealType>(-8.89232435250437247197e-17),
+            static_cast<RealType>(8.14099948000080417199e-20),
+            static_cast<RealType>(-4.61828164399178360925e-23),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.23544974283127158019e-1),
+            static_cast<RealType>(6.01210465184576626802e-3),
+            static_cast<RealType>(1.45390926665383063500e-4),
+            static_cast<RealType>(1.80594709695117864840e-6),
+            static_cast<RealType>(1.06088985542982155880e-8),
+            static_cast<RealType>(2.20287881724613104903e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x * x * x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.3004e-17
+        BOOST_MATH_STATIC const RealType P[4] = {
+            static_cast<RealType>(2.99206710301074508455e-1),
+            static_cast<RealType>(-8.62469397757826072306e-1),
+            static_cast<RealType>(1.74661995423629075890e-1),
+            static_cast<RealType>(8.75909164947413479137e-1),
+        };
+        BOOST_MATH_STATIC const RealType Q[3] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(-6.07405848111002255020e0),
+            static_cast<RealType>(1.34068401972703571636e1),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t / x;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 4.5215e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87352751452164445024482162286994868262e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.07622509000285763173795736744991173600e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75004930885780661923539070646503039258e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.72358602484766333657370198137154157310e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80082654994455046054228833198744292689e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.53887200727615005180492399966262970151e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07684195532179300820096260852073763880e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.39151986881253768780523679256708455051e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.31700721746247708002568205696938014069e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.52538425285394123789751606057231671946e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.13997198703138372752313576244312091598e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74788965317036115104204201740144738267e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.18994723428163008965406453309272880204e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.49208308902369087634036371223527932419e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.07053963271862256947338846403373278592e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30146528469038357598785392812229655811e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.22168809220570888957518451361426420755e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.30911708477464424748895247790513118077e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.32037605861909345291211474811347056388e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.37380742268959889784160508321242249326e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.17777859396994816599172003124202701362e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.69357597449425742856874347560067711953e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.22061268498705703002731594804187464212e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.03685918248668999775572498175163352453e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.42037705933347925911510259098903765388e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.13651251802353350402740200231061151003e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.15390928968620849348804301589542546367e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.96186359077726620124148756657971390386e-9),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.3996e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.02038159607840130388931544845552929992e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.85240836242909590376775233472494840074e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.92928437142375928121954427888812334305e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.56075992368354834619445578502239925632e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85410663490566091471288623735720924369e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.09160661432404033681463938555133581443e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60290555290385646856693819798655258098e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24420942563054709904053017769325945705e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.06370233020823161157791461691510091864e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.51562554221298564845071290898761434388e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.77361020844998296791409508640756247324e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.10768937536097342883548728871352580308e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.97810512763454658214572490850146305033e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.77430867682132459087084564268263825239e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.30030169049261634787262795838348954434e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45935676273909940847479638179887855033e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14724239378269259016679286177700667008e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21580123796578745240828564510740594111e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70287348745451818082884807214512422940e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46859813604124308580987785473592196488e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.49627445316021031361394030382456867983e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05157712406194406440213776605199788051e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91541875103990251411297099611180353187e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47960462287955806798879139599079388744e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.80126815763067695392857052825785263211e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04569118116204820761181992270024358122e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.63024381269503801668229632579505279520e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00967434338725770754103109040982001783e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.6834e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.45396231261375200568114750897618690566e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.83107635287140466760500899510899613385e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71690205829238281191309321676655995475e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.95995611963950467634398178757261552497e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.52444689050426648467863527289016233648e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.40423239472181137610649503303203209123e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72181273738390251101985797318639680476e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.11423032981781501087311583401963332916e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37255768388351332508195641748235373885e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.25140171472943043666747084376053803301e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98925617316135247540832898350427842870e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27532592227329144332335468302536835334e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.25846339430429852334026937219420930290e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.17852693845678292024334670662803641322e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60008761860786244203651832067697976835e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.85474213475378978699789357283744252832e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.05561259222780127064607109581719435800e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08902510590064634965634560548380735284e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.60127698266075086782895988567899172787e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.73299227011247478433171171063045855612e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.94019328695445269130845646745771017029e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21478511930928822349285105322914093227e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.42888485420705779382804725954524839381e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36839484685440714657854206969200824442e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77082068469251728028552451884848161629e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.92625563541021144576900067220082880950e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88302521658522279293312672887766072876e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.37703703342287521257351386589629343948e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.32454189932655869016489443530062686013e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.81822848072558151338694737514507945151e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.40176559099032106726456059226930240477e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.55722115663529425797132143276461872035e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.18236697046568703899375072798708359035e-10),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.6207e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[20] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36729417918039395222067998266923903488e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05780369334958736210688756060527042344e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88449456199223796440901487003885388570e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20213624124017393492512893302682417041e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.95009975955570002297453163471062373746e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35668345583965001606910217518443864382e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.69006847702829685253055277085000792826e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08366922884479491780654020783735539561e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.71834368599657597252633517017213868956e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.88269472722301903965736220481240654265e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37797139843759131750966129487745639531e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72390971590654495025982276782257590019e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68354503497961090303189233611418754374e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20749461042713568368181066233478264894e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.71167265100639100355339812752823628805e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37497033071709741762372104386727560387e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.08992504249040731356693038222581843266e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.03311745412603363076896897060158476094e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89266184062176002518506060373755160893e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.22157263424086267338486564980223658130e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24254809760594824834854946949546737102e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66740386908805016172202899592418717176e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17175023341071972435947261868288366592e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33939409711833786730168591434519989589e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.58859674176126567295417811572162232222e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66346764121676348703738437519493817401e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.00687534341032230207422557716131339293e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57352381181825892637055619366793541271e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.23955067096868711061473058513398543786e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28279376429637301814743591831507047825e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22380760186302431267562571014519501842e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.21421839279245792393425090284615681867e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.80151544531415207189620615654737831345e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.57177992740786529976179511261318869505e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54223623314672019530719165336863142227e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26447311109866547647645308621478963788e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76514314007336173875469200193103772775e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.63785420481380041892410849615596985103e-13),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.8882e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90649774685568282389553481307707005425e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70151946710788532273869130544473159961e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76188245008605985768921328976193346788e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.94997481586873355765607596415761713534e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83556339450065349619118429405554762845e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.39766178753196196595432796889473826698e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48835240264191055418415753552383932859e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.23205178959384483669515397903609703992e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80665018951397281836428650435128239368e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27113208299726105096854812628329439191e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.75272882929773945317046764560516449105e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.73174017370926101455204470047842394787e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.55548825213165929101134655786361059720e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.79786015549170518239230891794588988732e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73060731998834750292816218696923192789e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.62842837946576938669447109511449827857e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33878078951302606409419167741041897986e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75629880937514507004822969528240262723e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43883005193126748135739157335919076027e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.26826935326347315479579835343751624245e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52263130214924169696993839078084050641e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.34708681216662922818631865761136370252e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19079618273418070513605131981401070622e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68812668867590621701228940772852924670e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81323523265546812020317698573638573275e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46655191174052062382710487986225631851e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.79864553144116347379916608661549264281e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.81866770335021233700248077520029108331e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15408288688082935176022095799735538723e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29421875915133979067465908221270435168e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74564282803894180881025348633912184161e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69782249847887916810010605635064672269e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.85875986197737611300062229945990879767e-18),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.7988e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.07231582988207590928480356376941073734e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35574911514921623999866392865480652576e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.60219401814297026945664630716309317015e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84927222345566515103807882976184811760e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96327408363203008584583124982694689234e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.86684048703029160378252571846517319101e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65469175974819997602752600929172261626e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.21842057555380199566706533446991680612e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.53555106309423641769303386628162522042e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.92686543698369260585325449306538016446e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01838615452860702770059987567879856504e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.65492535746962514730615062374864701860e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53395563720606494853374354984531107080e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.99957357701259203151690416786669242677e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46357124817620384236108395837490629563e-31),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02259092175256156108200465685980768901e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63438230616954606028022008517920766366e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.63880061357592661176130881772975919418e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81911305852397235014131637306820512975e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09690724408294608306577482852270088377e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11275552068434583356476295833517496456e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.24681861037105338446379750828324925566e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16034379416965004687140768474445096709e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23234481703249409689976894391287818596e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93297387560911081670605071704642179017e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50338428974314371000017727660753886621e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27897854868353937080739431205940604582e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.37798740524930029176790562876868493344e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29920082153439260734550295626576101192e-22),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.9688e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.25741312407933720816582583160953651639e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.04434146174674791036848306058526901384e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.68959516304795838166182070164492846877e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78859935261158263390023581309925613858e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.21854067989018450973827853792407054510e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20573856697340412957421887367218135538e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30843538021351383101589538141878424462e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.05991458689384045976214216819611949900e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.82253708752556965233757129893944884411e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.97645331663303764054986066027964294209e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.69353366461654917577775981574517182648e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59050144462227302681332505386238071973e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.85165507189649330971049854127575847359e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70711310565669331853925519429988855964e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.72047006026700174884151916064158941262e-38),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50985661940624198574968436548711898948e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81705882167596649186405364717835589894e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86537779048672498307196786015602357729e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09555188550938733096253930959407749063e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41930442687159455334801545898059105733e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.09084284266255183930305946875294557622e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.58122754063904909636061457739518406730e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.91800215912676651584368499126132687326e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.66413330532845384974993669138524203429e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65919563020196445006309683624384862816e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.61596083414169579692212575079167989319e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16321386033703806802403099255708972015e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.90892719803158002834365234646982537288e-25),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x * x * x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.0545e-39
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[8] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.99206710301074508454959544950786401357e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.75243304700875633383991614142545185173e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.69652690455351600373808930804785330828e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.36233941060408773406522171349397343951e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.28958973553713980463808202034854958375e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.55704950313835982743029388151551925282e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.28767698270323629107775935552991333781e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.80591252844738626580182351673066365090e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.57593243741246726197476469913307836496e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.99458751269722094414105565700775283458e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.91043982880665229427553316951582511317e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.99054490423334526438490907473548839751e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.36948968143124830402744607365089118030e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13781639547150826385071482161074041168e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t / x;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53> &tag) {
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    return holtsmark_pdf_plus_imp_prec<RealType>(abs(x), tag);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>& tag) {
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    return holtsmark_pdf_plus_imp_prec<RealType>(abs(x), tag);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_pdf_imp(const holtsmark_distribution<RealType, Policy>& dist, const RealType& x) {
+    //
+    // This calculates the pdf of the Holtsmark distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::pdf(holtsmark<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Holtsmark distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale;
+
+    result = holtsmark_pdf_imp_prec(u, tag_type()) / scale;
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 0.5) {
+        // Rational Approximation
+        // Maximum Relative Error: 1.3147e-17
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(5.0e-1),
+            static_cast<RealType>(-1.34752580674786639030e-1),
+            static_cast<RealType>(1.86318418252163378528e-2),
+            static_cast<RealType>(1.04499798132512381447e-2),
+            static_cast<RealType>(-1.60831910014592923855e-3),
+            static_cast<RealType>(1.38823662364438342844e-4),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.05200341554753776087e-1),
+            static_cast<RealType>(2.12663999430421346175e-1),
+            static_cast<RealType>(7.23836000984872591553e-2),
+            static_cast<RealType>(1.67941072412796299986e-2),
+            static_cast<RealType>(4.71213644318790580839e-3),
+            static_cast<RealType>(5.86825130959777535991e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 1) {
+        RealType t = x - 0.5f;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.6265e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(3.60595773518728397351e-1),
+            static_cast<RealType>(5.75238626843218819756e-1),
+            static_cast<RealType>(-3.31245319943021227117e-1),
+            static_cast<RealType>(1.48132966310216368831e-1),
+            static_cast<RealType>(-2.32875122617713403365e-2),
+            static_cast<RealType>(2.08038303148835575624e-3),
+            static_cast<RealType>(6.01511310581302829460e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.32264360456739861886e0),
+            static_cast<RealType>(6.39715443864749851087e-1),
+            static_cast<RealType>(5.03940458163958921325e-1),
+            static_cast<RealType>(8.84780893031413729292e-2),
+            static_cast<RealType>(3.01497774031208621961e-2),
+            static_cast<RealType>(3.45886005612108195390e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.4398e-20
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.43657975600729535515e-1),
+            static_cast<RealType>(-6.02286263626532324632e-2),
+            static_cast<RealType>(4.68361231392743283350e-2),
+            static_cast<RealType>(-1.13497179885838883972e-3),
+            static_cast<RealType>(1.20141595689136205012e-3),
+            static_cast<RealType>(3.02402304689333413256e-4),
+            static_cast<RealType>(-1.22652173865646814676e-6),
+            static_cast<RealType>(2.29521832683440044997e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.82002427359748247121e-1),
+            static_cast<RealType>(3.96529686558825119743e-1),
+            static_cast<RealType>(1.49690294526117385174e-1),
+            static_cast<RealType>(5.15049953937764895435e-2),
+            static_cast<RealType>(1.30218216530450637564e-2),
+            static_cast<RealType>(2.53640337919037463659e-3),
+            static_cast<RealType>(3.79575042317720710311e-4),
+            static_cast<RealType>(2.94034997185982139717e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.6148e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(1.05039829654829164883e-1),
+            static_cast<RealType>(1.66621813028423002562e-2),
+            static_cast<RealType>(2.93820049104275137099e-2),
+            static_cast<RealType>(3.36850260303189378587e-3),
+            static_cast<RealType>(2.27925819398326978014e-3),
+            static_cast<RealType>(1.66394162680543987783e-4),
+            static_cast<RealType>(4.51400415642703075050e-5),
+            static_cast<RealType>(2.12164734714059446913e-7),
+            static_cast<RealType>(1.69306881760242775488e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.63461239051296108254e-1),
+            static_cast<RealType>(6.54183344973801096611e-1),
+            static_cast<RealType>(2.92007762594247903696e-1),
+            static_cast<RealType>(1.00918751132022401499e-1),
+            static_cast<RealType>(2.55899135910670703945e-2),
+            static_cast<RealType>(4.85740416919283630358e-3),
+            static_cast<RealType>(6.11435190489589619906e-4),
+            static_cast<RealType>(4.10953248859973756440e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.5866e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(3.05754562114095142887e-2),
+            static_cast<RealType>(3.25462617990002726083e-2),
+            static_cast<RealType>(1.78205524297204753048e-2),
+            static_cast<RealType>(5.61565369088816402420e-3),
+            static_cast<RealType>(1.05695297340067353106e-3),
+            static_cast<RealType>(9.93588579804511250576e-5),
+            static_cast<RealType>(2.94302107205379334662e-6),
+            static_cast<RealType>(1.09016076876928010898e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.51164395622515150122e0),
+            static_cast<RealType>(1.09391911233213526071e0),
+            static_cast<RealType>(4.77950346062744800732e-1),
+            static_cast<RealType>(1.34082684956852773925e-1),
+            static_cast<RealType>(2.37572579895639589816e-2),
+            static_cast<RealType>(2.41806218388337284640e-3),
+            static_cast<RealType>(1.10378140456646280084e-4),
+            static_cast<RealType>(1.31559373832822136249e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.6575e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(9.47408470248235718880e-3),
+            static_cast<RealType>(4.70888722333356024081e-3),
+            static_cast<RealType>(8.66397831692913140221e-4),
+            static_cast<RealType>(7.11721056656424862090e-5),
+            static_cast<RealType>(2.56320582355149253994e-6),
+            static_cast<RealType>(3.37749186035552101702e-8),
+            static_cast<RealType>(8.32182844837952178153e-11),
+            static_cast<RealType>(-8.80541360484428526226e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.98261117346347123707e-1),
+            static_cast<RealType>(1.97823959738695249267e-1),
+            static_cast<RealType>(2.89311735096848395080e-2),
+            static_cast<RealType>(2.30087055379997473849e-3),
+            static_cast<RealType>(9.60592522700377510007e-5),
+            static_cast<RealType>(1.84474415187428058231e-6),
+            static_cast<RealType>(1.14339998084523151203e-8),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.4164e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(3.19610991747326729867e-3),
+            static_cast<RealType>(5.11880074251341162590e-4),
+            static_cast<RealType>(2.80704092977662888563e-5),
+            static_cast<RealType>(6.31310155466346114729e-7),
+            static_cast<RealType>(5.29618446795457166842e-9),
+            static_cast<RealType>(9.20292337847562746519e-12),
+            static_cast<RealType>(-9.16761719448360345363e-15),
+            static_cast<RealType>(1.20433396121606479712e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.56283944667056551858e-1),
+            static_cast<RealType>(2.56811818304462676948e-2),
+            static_cast<RealType>(1.26678062261253559927e-3),
+            static_cast<RealType>(3.17001344827541091252e-5),
+            static_cast<RealType>(3.68737201224811007437e-7),
+            static_cast<RealType>(1.47625352605312785910e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.2537e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.11172037056341397612e-3),
+            static_cast<RealType>(7.84545643188695076893e-5),
+            static_cast<RealType>(1.94862940242223222641e-6),
+            static_cast<RealType>(2.02704958737259525509e-8),
+            static_cast<RealType>(7.99772378955335076832e-11),
+            static_cast<RealType>(6.62544230949971310060e-14),
+            static_cast<RealType>(-3.18234118727325492149e-17),
+            static_cast<RealType>(2.03424457039308806437e-20),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.17861198759233241198e-1),
+            static_cast<RealType>(5.45962263583663240699e-3),
+            static_cast<RealType>(1.25274651876378267111e-4),
+            static_cast<RealType>(1.46857544539612002745e-6),
+            static_cast<RealType>(8.06441204620771968579e-9),
+            static_cast<RealType>(1.53682779460286464073e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType x_cube = x * x * x;
+        RealType t = static_cast<RealType>((boost::math::isnormal)(x_cube) ? 1 / sqrt(x_cube) : 1 / pow(sqrt(x), 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.2897e-18
+        BOOST_MATH_STATIC const RealType P[4] = {
+            static_cast<RealType>(1.99471140200716338970e-1),
+            static_cast<RealType>(-6.90933799347184400422e-1),
+            static_cast<RealType>(4.30385245884336871950e-1),
+            static_cast<RealType>(3.52790131116013716885e-1),
+        };
+        BOOST_MATH_STATIC const RealType Q[3] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(-5.05959751628952574534e0),
+            static_cast<RealType>(8.04408113719341786819e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t;
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 0.5) {
+        // Rational Approximation
+        // Maximum Relative Error: 8.6635e-36
+       // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.0e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.48548242430636907136192799540229598637e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31541453581608245475805834922621529866e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.16579064508490250336159593502955219069e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61598809551362112011328341554044706550e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.15119245273512554325709429759983470969e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02145196753734867721148927112307708045e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.90817224464950088663183617156145065001e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69596202760983052482358128481956242532e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.50461337222845025623869078372182437091e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.62777995800923647521692709390412901586e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.63937253747323898965514197114021890186e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.76090180430550757765787254935343576341e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.07685236907561593034104428156351640194e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27770556484351179553611274487979706736e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.99201460869149634331004096815257398515e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70139000408086498153685620963430185837e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74682544708653069148470666809094453722e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57607114117485446922700160080966856243e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01069214414741946409122492979083487977e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.19996282759031441186748256811206136921e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60933466092746543579699079418115420013e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.92780739162611243933581782562159603862e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 1) {
+        RealType t = x - 0.5;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.1235e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60595773518728397925852903878144761766e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.46999595154527091473427440379143006753e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36962313432466566724352608642383560211e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08387290167105915393692028475888846796e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.34156151832478939276011262838869269011e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15970594471853166393830585755485842021e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.47022841547527682761332752928069503835e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.01955019188793323293925482112543902560e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.03069493388735516695142799880566783261e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61367662035593735709965982000611000987e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.62800430658278408539398798888955969345e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.22300086876618079439960709120163780513e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19740977756009966244249035150363085180e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39394884078938560974435920719979860046e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.97107758486905601309707335353809421910e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.36594079604957733960211938310153276332e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.85712904264673773213248691029253356702e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.87605080555629969548037543637523346061e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.26356599628579249350545909071984757938e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.79582114368994462181480978781382155103e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.00970375323007336435151032145023199020e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.06528824060244313614177859412028348352e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.13914667697998291289987140319652513139e-7),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.7659e-38
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43657975600729535499895880792984203140e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.37090874182351552816526775008685285108e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70793783828569126853147999925198280654e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.27295555253412802819195403503721983066e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.95916890788873842705597506423512639342e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93625795791721417553345795882983866640e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.73237387099610415336810752053706403935e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08118655139419640900853055479087235138e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74920069862339840183963818219485580710e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59015304773612605296533206093582658838e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57256820413579442950151375512313072105e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.36240848333000575199740403759568680951e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53890585580518120552628221662318725825e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59245311730292556271235324976832000740e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.49800491033591771256676595185869442663e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.35827615015880595229881139361463765537e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41657125931991211322147702760511651998e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11782602975553967179829921562737846592e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79410805176258968660086532862367842847e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22872839892405613311532856773434270554e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.23742349724658114137235071924317934569e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.80350762663884259375711329227548815674e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59501693037547119094683008622867020131e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.86068186167498269806443077840917848151e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.36940342373887783231154918541990667741e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.48911186460768204167014270878839691938e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.55051094964993052272146587430780404904e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.96312716130620326771080033656930839768e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45496951385730104726429368791951742738e-10),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.9091e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05039829654829170780787685299556996311e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28948022754388615368533934448107849329e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.34139151583225691775740839359914493385e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13366377215523066657592295006960955345e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08045462837998791188853367062130086996e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.37648565386728404881404199616182064711e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14881702523183566448187346081007871684e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73169022445183613027772635992366708052e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.86434609673325793686202636939208406356e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20865083025640755296377488921536984172e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24550087063009488023243811976147518386e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78763689691843975658550702147832072016e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.53901449493513509116902285044951137217e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64133451376958243174967226929215155126e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78021916681275593923355425070000331160e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40116391931116431686557163556034777896e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.43891156389092896219387988411277617045e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30840297297890638941129884491157396207e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16059271948787750556465175239345182035e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.32333703228724830516425197803770832978e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.74722711058640395885914966387546141874e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57544653090705553268164186689966671940e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.65943099435809995745673109708218670077e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74158626875895095042054345316232575354e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.65978318533667031874695821156329945501e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07907034178758316909655424935083792468e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.16769901831316460137104511711073411646e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.72764558714782436683712413015421717627e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.42494185105694341746192094740530489313e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.47668761140694808076322373887857100882e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.06395948884595166425357861427667353718e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.04398743651684916010743222115099630062e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47852251142917253705233519146081069006e-10),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.2255e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[20] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05754562114095147060025732340404111260e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.29082907781747007723015304584383528212e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.15736486393536930535038719804968063752e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.47619683293773846642359668429058772885e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78777185267549567154655052281449528836e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.32280474402180284471490985942690221861e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.45430564625797085273267452885960070105e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.81643129239005795245093568930666448817e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57851748656417804512189330871167578685e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.04264676511381380381909064283066657450e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.84536783037391183433322642273799250079e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.27169201994160924743393109705813711010e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.42623512076200527099335832138825884729e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.98298083389459839517970895839114237996e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71357920034737751299594537655948527288e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.98563999354325930973228648080876368296e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36248172644168880316722905969876969074e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.61071663749398045880261823483568866904e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.95933262363502031836408613043245164787e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23007623135952181561484264810647517912e-21),
+        };
+        BOOST_MATH_STATIC const RealType Q[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17760389606658547971193065026711073898e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49565543987559264712057768584303008339e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94822569926563661124528478579051628722e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14676844425183314970062115422221981422e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.35960757354198367535169328826167556715e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04865288305482048252211468989095938024e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.51599632816346741950206107526304703067e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74065824586512487126287762563576185455e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91819078437689679732215988465616022328e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.41675362609023565846569121735444698127e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17176431752708802291177040031150143262e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52367587943529121285938327286926798550e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59405168077254169099025950029539316125e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29448420654438993509041228047289503943e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.70091773726833073512661846603385666642e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.03909417984236210307694235586859612592e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.59098698207309055890188845050700901852e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28146456709550379493162440280752828165e-14),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0174e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.47408470248235665279366712356669210597e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32149712567170349164953101675315481096e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.39806230477579028722350422669222849223e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19665271447867857827798702851111114658e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.06773237553503696884546088197977608676e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41294370314265386485116359052296796357e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74848600628353761723457890991084017928e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52963427970210468265870547940464851481e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.33389244528769791436454176079341120973e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.86702000100897346192018772319301428852e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04192907586200235211623448416582655030e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70804269459077260463819507381406529187e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52665761996923502719902050367236108720e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.01866635015788942430563628065687465455e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.46658865059509532456423012727042498365e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.05806999626031246519161395419216393127e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.37645700309533972676063947195650607935e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59608758824065179587008165265773042260e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17347162462484266250945490058846704988e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.24511137251392519285309985668265122633e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58497164094526279145784765183039854604e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40787701096334660711443654292041286786e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.34615029717812271556414485397095293077e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.17712219229282308306346195001801048971e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.24578142893420308057222282020407949529e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.23429691331344898578916434987129070432e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41486460551571344910835151948209788541e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.23569151219279213399210115101532416912e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.21438860148387356361258237451828377118e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.46770060692933726695086996017149976796e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.58079984178724940266882149462170567147e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19997796316046571607659704855966005180e-17),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.5109e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19610991747326725339429696634365932643e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74646611039453235739153286141429338461e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13331430865337412098234177873337036811e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.58947311195482646360642638791970923726e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79226752074485124923797575635082779509e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73081326043094090549807549513512116319e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05408849431691450650464797109033182773e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75716486666270246158606737499459843698e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.81075133718930099703621109350447306080e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.41318403854345256855350755520072932140e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70220987388883118699419526374266655536e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38711669183547686107032286389030018396e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31300491679098874872172866011372530771e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.99223939265527640018203019269955457925e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.18316957049006338447926554380706108087e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.47298013808154174645356607027685011183e-32),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.42561659771176310412113991024326129105e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83353398513931409985504410958429204317e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.07254121026393428163401481487563215753e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36667170168890854756291846167398225330e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54019749685699795075624204463938596069e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35321766966107368759516431698755077175e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13350720091296144188972188966204719103e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38107118390482863395863404555696613407e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59267757423034664579822257229473088511e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29549090773392058626428205171445962834e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69922128600755513676564327500993739088e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31337037977667816904491472174578334375e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.28088047429043940293455906253037445768e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.01213369826105495256520034997664473667e-22),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2707e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11172037056341396583040940446061501972e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09383362521204903801686281772843962372e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71440982391172647693486692131238237524e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.01685075759372692173396811575536866699e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36574894913423830789864836789988898151e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.59644999935503505576091023207315968623e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.95573282292603122067959656607163690356e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.10361486103428098366627536344769789255e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80946231978997457068033851007899208222e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.39341134002270945594553624959145830111e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72307967968246649714945553177468010263e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41093409238620968003297675770440189200e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70464969040825495565297719377221881609e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.25341184125872354328990441812668510029e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.54663422572657744572284839697818435372e-36),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35632539169215377884393376342532721825e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.46975491055790597767445011183622230556e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51806800870130779095309105834725930741e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.07403939022350326847926101278370197017e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66046114012817696416892197044749060854e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.16723371111678357128668916130767948114e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.22972796529973974439855811125888770710e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91073180314665062004869985842402705599e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43753004383633382914827301174981384446e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.77313206526206002175298314351042907499e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32850553089285690900825039331456226080e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.85369976595753971532524294793778805089e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28948021485210224442871255909409155592e-25),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType x_cube = x * x * x;
+        RealType t = (boost::math::isnormal)(x_cube) ? 1 / sqrt(x_cube) : 1 / pow(sqrt(x), 3);
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.4677e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[7] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99471140200716338969973029967190934238e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.48481268366645066801385595379873318648e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64087860141734943856373451877569284231e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.45555576045996041260191574503331698473e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43290677381328916734673040799990923091e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.63011127597770211743774689830589568544e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.61127812511057623691896118746981066174e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.90660291309478542795359451748753358123e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60631500002415936739518466837931659008e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.88655117367497147850617559832966816275e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48350179543067311398059386524702440002e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.18873206560757944356169500452181141647e3),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t;
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 53>& tag) {
+    if (x >= 0) {
+        return complement ? holtsmark_cdf_plus_imp_prec(x, tag) : 1 - holtsmark_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - holtsmark_cdf_plus_imp_prec(-x, tag) : holtsmark_cdf_plus_imp_prec(-x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 113>& tag) {
+    if (x >= 0) {
+        return complement ? holtsmark_cdf_plus_imp_prec(x, tag) : 1 - holtsmark_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - holtsmark_cdf_plus_imp_prec(-x, tag) : holtsmark_cdf_plus_imp_prec(-x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_cdf_imp(const holtsmark_distribution<RealType, Policy>& dist, const RealType& x, bool complement) {
+    //
+    // This calculates the cdf of the Holtsmark distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::cdf(holtsmark<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Holtsmark distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale;
+
+    result = holtsmark_cdf_imp_prec(u, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (ilogb(p) >= -2) {
+        RealType t = -log2(ldexp(p, 1));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.8068e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(7.59789769759814986929e-1),
+            static_cast<RealType>(1.27515008642985381862e0),
+            static_cast<RealType>(4.38619247097275579086e-1),
+            static_cast<RealType>(-1.25521537863031799276e-1),
+            static_cast<RealType>(-2.58555599127223857177e-2),
+            static_cast<RealType>(1.20249932437303932411e-2),
+            static_cast<RealType>(-1.36753104188136881229e-3),
+            static_cast<RealType>(6.57491277860092595148e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.48696501912062288766e0),
+            static_cast<RealType>(2.06239370128871696850e0),
+            static_cast<RealType>(5.67577904795053902651e-1),
+            static_cast<RealType>(-2.89022828087034733385e-2),
+            static_cast<RealType>(-2.17207943286085236479e-2),
+            static_cast<RealType>(3.14098307020814954876e-4),
+            static_cast<RealType>(3.51448381406676891012e-4),
+            static_cast<RealType>(5.71995514606568751522e-5),
+        };
+
+        result = t * tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -3) {
+        RealType t = -log2(ldexp(p, 2));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0339e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(3.84521387984759064238e-1),
+            static_cast<RealType>(4.15763727809667641126e-1),
+            static_cast<RealType>(-1.73610240124046440578e-2),
+            static_cast<RealType>(-3.89915764128788049837e-2),
+            static_cast<RealType>(1.07252911248451890192e-2),
+            static_cast<RealType>(7.62613727089795367882e-4),
+            static_cast<RealType>(-3.11382403581073580481e-4),
+            static_cast<RealType>(3.93093062843177374871e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.76193897442484823754e-1),
+            static_cast<RealType>(3.70953499602257825764e-2),
+            static_cast<RealType>(-2.84211795745477605398e-2),
+            static_cast<RealType>(2.66146101014551209760e-3),
+            static_cast<RealType>(1.85436727973937413751e-3),
+            static_cast<RealType>(2.00318687649825430725e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.4431e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(4.46943301497773314460e-1),
+            static_cast<RealType>(-1.07267614417424412546e-2),
+            static_cast<RealType>(-7.21097021064631831756e-2),
+            static_cast<RealType>(2.93948745441334193469e-2),
+            static_cast<RealType>(-7.33259305010485915480e-4),
+            static_cast<RealType>(-1.38660725579083612045e-3),
+            static_cast<RealType>(2.95410432808739478857e-4),
+            static_cast<RealType>(-2.88688017391292485867e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(-2.72809429017073648893e-2),
+            static_cast<RealType>(-7.85526213469762960803e-2),
+            static_cast<RealType>(2.41360900478283465241e-2),
+            static_cast<RealType>(3.44597797125179611095e-3),
+            static_cast<RealType>(-8.65046428689780375806e-4),
+            static_cast<RealType>(-1.04147382037315517658e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -6) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.8871e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(4.25344469980677332786e-1),
+            static_cast<RealType>(3.42055470008289997369e-2),
+            static_cast<RealType>(9.33607217644370441642e-2),
+            static_cast<RealType>(4.57057092587794346086e-2),
+            static_cast<RealType>(1.16149976708336017542e-2),
+            static_cast<RealType>(6.40479797962035786337e-3),
+            static_cast<RealType>(1.58526153828271386329e-3),
+            static_cast<RealType>(3.84032908993313260466e-4),
+            static_cast<RealType>(6.98960839033991110525e-5),
+            static_cast<RealType>(9.66690587477825432174e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[10] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.60044610004497775009e-1),
+            static_cast<RealType>(2.41675490962065446592e-1),
+            static_cast<RealType>(1.13752642382290596388e-1),
+            static_cast<RealType>(4.05058759031434785584e-2),
+            static_cast<RealType>(1.59432816225295660111e-2),
+            static_cast<RealType>(4.79286678946992027479e-3),
+            static_cast<RealType>(1.16048151070154814260e-3),
+            static_cast<RealType>(2.01755520912887201472e-4),
+            static_cast<RealType>(2.82884561026909054732e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 6));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.8173e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(3.68520435599726877886e-1),
+            static_cast<RealType>(8.26682725061327242371e-1),
+            static_cast<RealType>(6.85235826889543887309e-1),
+            static_cast<RealType>(3.28640408399661746210e-1),
+            static_cast<RealType>(9.04801242897407528807e-2),
+            static_cast<RealType>(1.57470088502958130451e-2),
+            static_cast<RealType>(1.61541023176880542598e-3),
+            static_cast<RealType>(9.78919203915954346945e-5),
+            static_cast<RealType>(9.71371309261213597491e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.29132755303753682133e0),
+            static_cast<RealType>(1.95530118226232968288e0),
+            static_cast<RealType>(9.55029685883545321419e-1),
+            static_cast<RealType>(2.68254036588585643328e-1),
+            static_cast<RealType>(4.61398419640231283164e-2),
+            static_cast<RealType>(4.66131710581568432246e-3),
+            static_cast<RealType>(2.94491397241310968725e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.0376e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(3.48432718168951419458e-1),
+            static_cast<RealType>(2.99680703419193973028e-1),
+            static_cast<RealType>(1.09531896991852433149e-1),
+            static_cast<RealType>(2.28766133215975559897e-2),
+            static_cast<RealType>(3.09836969941710802698e-3),
+            static_cast<RealType>(2.89346186674853481383e-4),
+            static_cast<RealType>(1.96344583080243707169e-5),
+            static_cast<RealType>(9.48415601271652569275e-7),
+            static_cast<RealType>(3.08821091232356755783e-8),
+            static_cast<RealType>(5.58003465656339818416e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[10] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.73938978582311007855e-1),
+            static_cast<RealType>(3.21771888210250878162e-1),
+            static_cast<RealType>(6.70432401844821772827e-2),
+            static_cast<RealType>(9.05369648218831664411e-3),
+            static_cast<RealType>(8.50098390828726795296e-4),
+            static_cast<RealType>(5.73568804840571459050e-5),
+            static_cast<RealType>(2.78374120155590875053e-6),
+            static_cast<RealType>(9.03427646135263412003e-8),
+            static_cast<RealType>(1.63556457120944847882e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.2804e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(3.41419813138786920868e-1),
+            static_cast<RealType>(1.30219412019722274099e-1),
+            static_cast<RealType>(2.36047671342109636195e-2),
+            static_cast<RealType>(2.67913051721210953893e-3),
+            static_cast<RealType>(2.10896260337301129968e-4),
+            static_cast<RealType>(1.19804595761611765179e-5),
+            static_cast<RealType>(4.91470756460287578143e-7),
+            static_cast<RealType>(1.38299844947707591018e-8),
+            static_cast<RealType>(2.25766283556816829070e-10),
+            static_cast<RealType>(-8.46510608386806647654e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.81461950831351846380e-1),
+            static_cast<RealType>(6.91390438866520696447e-2),
+            static_cast<RealType>(7.84798596829449138229e-3),
+            static_cast<RealType>(6.17735117400536913546e-4),
+            static_cast<RealType>(3.50937328177439258136e-5),
+            static_cast<RealType>(1.43958654321452532854e-6),
+            static_cast<RealType>(4.05109749922716264456e-8),
+            static_cast<RealType>(6.61306247924109415113e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.8545e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(3.41392032051575965049e-1),
+            static_cast<RealType>(1.53372256183388434238e-1),
+            static_cast<RealType>(3.33822240038718319714e-2),
+            static_cast<RealType>(4.66328786929735228532e-3),
+            static_cast<RealType>(4.67981207864367711082e-4),
+            static_cast<RealType>(3.48119463063280710691e-5),
+            static_cast<RealType>(2.17755850282052679342e-6),
+            static_cast<RealType>(7.40424342670289242177e-8),
+            static_cast<RealType>(4.61294046336533026640e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.49255524669251621744e-1),
+            static_cast<RealType>(9.77826688966262423974e-2),
+            static_cast<RealType>(1.36596271675764346980e-2),
+            static_cast<RealType>(1.37080296105355418281e-3),
+            static_cast<RealType>(1.01970588303201339768e-4),
+            static_cast<RealType>(6.37846903580539445994e-6),
+            static_cast<RealType>(2.16883897125962281968e-7),
+            static_cast<RealType>(1.35121503608967367232e-8),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else {
+        const BOOST_MATH_STATIC_LOCAL_VARIABLE RealType c = ldexp(cbrt(constants::pi<RealType>()), 1);
+
+        RealType p_square = p * p;
+
+        if ((boost::math::isnormal)(p_square)) {
+            result = 1 / (cbrt(p_square) * c);
+        }
+        else if (p > 0) {
+            result = 1 / (cbrt(p) * cbrt(p) * c);
+        }
+        else {
+            result = boost::math::numeric_limits<RealType>::infinity();
+        }
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (ilogb(p) >= -2) {
+        RealType u = -log2(ldexp(p, 1));
+
+        if (u < 0.5) {
+            // Rational Approximation
+            // Maximum Relative Error: 1.7987e-35
+           // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[14] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.59789769759815031687162026655576575384e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.23247138049619855169890925442523844619e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.35351935489348780511227763760731136136e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.17321534695821967609074567968260505604e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30930523792327030433989902919481147250e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.47676800034255152477549544991291837378e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.09952071024064609787697026812259269093e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.65479872964217159571026674930672527880e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.30204907832301876030269224513949605725e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.61038349134944320766567917361933431224e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.17242905696479357297850061918336600969e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43640101589433162893041733511239841220e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.39406616773257816628641556843884616119e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54871597065387376666252643921309051097e-7),
+            };
+            BOOST_MATH_STATIC const RealType Q[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.06310038178166385607814371094968073940e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06144046990424238286303107360481469219e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17860081295611631017119482265353540470e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.26319639748358310901277622665331115333e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.25962127567362715217159291513550804588e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65543974081934423010588955830131357921e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.80331848633772107482330422252085368575e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.97426948050874772305317056836660558275e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.10722999873793200671617106731723252507e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.68871255379198546500699434161302033826e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70190278641952708999014435335172772138e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.11562497711461468804693130702653542297e-7),
+            };
+            // LCOV_EXCL_STOP
+            result = u * tools::evaluate_polynomial(P, u) / (tools::evaluate_polynomial(Q, u) * cbrt(p * p));
+        }
+        else {
+            RealType t = u - static_cast <RealType>(0.5);
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.5554e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.63490994331899195346399558699533994243e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.68682839419340144322747963938810505658e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.63089084712442063245295709191126453412e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24910510426787025593146475670961782647e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.14005632199839351091767181535761567981e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.88144015238275997284082820907124267240e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.12015895125039876623372795832970536355e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.96386756665254981286292821446749025989e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.82855208595003635135641502084317667629e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.18007513930934295792217002090233670917e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.82563310387467580262182864644541746616e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52830681121195099547078704713089681353e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91383571211375811878311159248551586411e-8),
+            };
+            BOOST_MATH_STATIC const RealType Q[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96820655322136936855997114940653763917e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30209571878469737819039455443404070107e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.61235660141139249931521613001554108034e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.31683133997030095798635713869616211197e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.20681979279848555447978496580849290723e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.08958899028812330281115719259773001136e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.02478613175545210977059079339657545008e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.68653479132148912896487809682760117627e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35166554499214836086438565154832646441e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95409975934011596023165394669416595582e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.84312112139729518216217161835365265801e-7),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+        }
+    }
+    else if (ilogb(p) >= -3) {
+        RealType u = -log2(ldexp(p, 2));
+
+        if (u < 0.5) {
+            // Rational Approximation
+            // Maximum Relative Error: 1.0297e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.84521387984759060262188972210005114936e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70837834325236202821328032137877091515e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53856963029219911450181095566096563059e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.97659091653089105048621336944687224192e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.77726241585387617566937892474685179582e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21657224955483589784473724186837316423e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76357400631206366078287330192525531850e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.45967265853745968166172649261385754061e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.08367654892620484522749804048317330020e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41224530727710207304898458924763411052e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.02908228738160003274584644834000176496e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05702214080592377840761032481067834813e-7),
+            };
+            BOOST_MATH_STATIC const RealType Q[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33954869248363301881659953529609341564e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.73738626674455393272550888585363920917e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.90708494363306682523722238824373341707e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.49559648492983033200126224112060119905e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.07561158260652000950392950266037061167e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30349651195547682860585068738648645100e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.21766408404123861757376277367204136764e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.22181499366766592894880124261171657846e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.74488053046587079829684775540618210211e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90504597668186854963746384968119788469e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45195198322028676384075318222338781298e-7),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, u) / (tools::evaluate_polynomial(Q, u) * cbrt(p * p));
+        }
+        else {
+            RealType t = u - static_cast <RealType>(0.5);
+
+            // Rational Approximation
+            // Maximum Relative Error: 1.3688e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34418795581931891732555950599385666106e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.13006013029934051875748102515422669897e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.27990072710518465265454549585803147529e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.82530244963278920355650323928131927272e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05335741422175616606162502617378682462e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71242678756797136217651369710748524650e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.65147398836785709305701073315614307906e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23912765853731378067295654886575185240e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77861910171412622761254991979036167882e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.11971510714149983297022108523700437739e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23649928279010039670034778778065846828e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.99636080473697209793683863161785312159e-8),
+            };
+            BOOST_MATH_STATIC const RealType Q[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.95056572065373808001002483348789719155e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.55702988004729812458415992666809422570e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.07586989542594910084052301521098115194e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96831670560124470215505714403486118412e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.86445076378084412691927796983792892534e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.75566285003039738258189045863064261980e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.18557444175572723760508226182075127685e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66667716357950609103712975111660496416e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70999480357934082364999779023268059131e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.14604868719110256415222454908306045416e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.32724040071094913191419223901752642417e-8),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+        }
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.6020e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46943301497773318715008398224877079279e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.85403413700924949902626248891615772650e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.02791895890363892816315784780533893399e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.89147412486638444082129846251261616763e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.93382251168424191872267997181870008850e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.68332196426082871660060467570049113632e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.88720436260994811649162949644253306037e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.34099304204778307050211441936900839075e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.42970601149275611131932131801993030928e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.19329425598839605828710629592687495198e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.48826007216547106568423189194739111033e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.47132934846160946190230821709692067279e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34123780321108493820637601375183345528e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.64549285026064221742294542922996905241e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72723306533295983872420985773212608299e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.23756826160440280076231428938184359865e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.46557011055563840763437682311082689407e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18907861669025579159409035585375166964e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.09998981512549500250715800529896557509e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.09496663758959409482213456915225652712e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.37086325651334206453116588474211557676e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65325780110454655811120026458133145750e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.93435549562125602056160657604473721758e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34967558308250784125219085040752451132e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.73883529653464036447550624641291181317e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.88600727347267778330635397957540267359e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.26681383000234695948685993798733295748e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19871610873353691152255428262732390602e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42468017918888155246438948321084323623e-9),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -5) {
+        RealType u = -log2(ldexp(p, 4));
+
+        if (u < 0.5) {
+            // Rational Approximation
+            // Maximum Relative Error: 5.0596e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.25344469980677353573160570139298422046e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.41915371584999983192100443156935649063e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02829239548689190780023994008688591230e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29283473326959885625548350158197923999e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.01078477165670046284950196047161898687e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.02714892887893367912743194877742997622e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.43133417775367444366548711083157149060e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34782994090554432391320506638030058071e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06742736859237185836735105245477248882e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.55982601406660341132288721616681417444e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.57770758189194396236862269776507019313e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.29311341249565125992213260043135188072e-8),
+            };
+            BOOST_MATH_STATIC const RealType Q[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.54021943144355190773797361537886598583e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30965787836836308380896385568728211303e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19314242976592846926644622802257778872e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.84123785238634690769817401191138848504e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.75779029464908805680899310810660326192e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15078294915445673781718097749944059134e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84667183003626452412083824490324913477e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.59521438712225874821007396323337016693e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.90446539427779905568600432145715126083e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.21425779911599424040614866482614099753e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.00972806247654369646317764344373036462e-8),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, u) / (tools::evaluate_polynomial(Q, u) * cbrt(p * p));
+        }
+        else {
+            RealType t = u - static_cast <RealType>(0.5);
+
+            // Rational Approximation
+            // Maximum Relative Error: 8.3743e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08071367192424306005939751362206079160e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.94625900993512461462097316785202943274e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55970241156822104458842450713854737857e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.07663066299810473476390199553510422731e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.89859986209620592557993828310690990189e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04002735956724252558290154433164340078e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.28754717941144647796091692241880059406e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19307116062867039608045413276099792797e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.02377178609994923303160815309590928289e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.71739619655097982325716241977619135216e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70229045058419872036870274360537396648e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.90495731447121207951661931979310025968e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23210708203609461650368387780135568863e-8),
+            };
+            BOOST_MATH_STATIC const RealType Q[11] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.93402256203255215539822867473993726421e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42452702043886045884356307934634512995e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.16981055684612802160174937997247813645e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39560623514414816165791968511612762553e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.26014275897567952035148355055139912545e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.42163967753843746501638925686714935099e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.63605648300801696460942201096159808446e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.55933967787268788177266789383155699064e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.41526208021076709058374666903111908743e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.08505866202670144225100385141263360218e-6),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+        }
+    }
+    else if (ilogb(p) >= -6) {
+        RealType t = -log2(ldexp(p, 5));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.4734e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.92042979500197776619414802317216082414e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.94742044285563829335663810275331541585e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14525306632578654372860377652983462776e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.88893010132758460781753381176593178775e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08491462791290535107958214106528611951e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61374431854187722720094162894017991926e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11641062509116613779440753514902522337e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12474548036763970495563846370119556004e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.48140831258790372410036499310440980121e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.26913338169355215445128368312197650848e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63109797282729701768942543985418804075e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.55296802973076575732233624155433324402e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72108609713971908723724065216410393928e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.93328436272999507339897246655916666269e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72119240610740992234979508242967886200e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17836139198065889244530078295061548097e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78065342260594920160228973261455037923e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.08575070304822733863613657779515344137e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81185785915044621118680763035984134530e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87597191269586886460326897968559867853e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07903258768761230286548634868645339678e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.88395769450457864233486684232536503140e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05678227243099671420442217017131559055e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.24803207742284923122212652186826674987e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06094715338829793088081672723947647238e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.96454433858093590192363331553516923090e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94509901530299070041475386866323617753e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49001710126540196485963921184736711193e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58899179756014192338509671769986887613e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.06916561094749601736592488829778059190e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 6));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1570e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.68520435599726860132888599110871216319e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.01076105507184082206031922185510102322e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39912455237662038937400667644545834191e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51088991221663244634723139723207272560e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26465949648856746869050310379379898086e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.37079746226805258449355819952819997723e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.49372033421420312720741838903118544951e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95729572745049276972587492142384353131e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.92794840197452838799536047152725573779e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96897979363475104635129765703613472468e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44138843334474914059035559588791041371e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.78076328055619970057667292651627051391e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04182093251998194244585085400876144351e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04392999917657413659748817212746660436e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.76006125565969084470924344826977844710e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21045181507045010640119572995692565368e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61400097324698003962179537436043636306e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.88084230973635340409728710734906398080e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49319798750825059930589954921919984293e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.90218243410186000622818205955425584848e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.25384789213915993855434876209137054104e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.58563858782064482133038568901836564329e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39112608961600614189971858070197609546e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29192895265168981204927382938872469754e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.66418375973954918346810939649929797237e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01606040038159207768769492693779323748e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.75837675697421536953171865636865644576e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30258315910281295093103384193132807400e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.28333635097670841003561009290200071343e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.04871369296490431325621140782944603554e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05077352164673794093561693258318905067e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.28508157403208548483052311164947568580e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22527248376737724147359908626095469985e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.75479484339716254784610505187249810386e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.39990051830081888581639577552526319577e-11),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1362e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[22] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.48432718168951398420402661878962745094e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.55946442453078865766668586202885528338e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.54912640113904816247923987542554486059e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.60852745978561293262851287627328856197e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93256608166097432329211369307994852513e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.94707001299612588571704157159595918562e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40368387009950846525432054396214443833e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62326983889228773089492130483459202197e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97166112600628615762158757484340724056e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.95053681446806610424931810174198926457e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13613767164027076487881255767029235747e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46627172639536503825606138995804926378e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.26813757095977946534946955553296696736e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01393212063713249666862633388902006492e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04428602119155661411061942866480445477e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.52977051350929618206095556763031195967e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63092013964238065197415324341392517794e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.77457116423818347179318334884304764609e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10372468210274291890669895933038762772e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85517152798650696598776156882211719502e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01916800572423194619358228507804954863e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.72241483171311778625855302356391965266e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[21] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.18341916009800042837726003154518652168e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19215655980509256344434487727207541208e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34380326549827252189214516628038733750e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.65069135930665131327262366757787760402e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74132905027750048531814627726862962404e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.11184893124573373947875834716323223477e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.68456853089572312034718359282699132364e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16340806625223749486884390838046244494e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45007766006724826837429360471785418874e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50443251593190111677537955057976277305e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30829464745241179175728900376502542995e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.57256894336319418553622695416919409120e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.89973763917908403951538315949652981312e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05834675579622824896206540981508286215e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32721343511724613011656816221169980981e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.77569292346900432492044041866264215291e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39903737668944675386972393000746368518e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.23200083621376582032771041306045737695e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.43557805626692790539354751731913075096e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.91326410956582998375100191562832969140e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.1729e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41419813138786928653984591611599949126e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94225020281693988785012368481961427155e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28967134188573605597955859185818311256e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.16617725083935565014535265818666424029e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13379610773944032381149443514208866162e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06508483032198116332154635763926628153e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.89315471210589177037346413966039863126e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72993906450633221200844495419180873066e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32883391567312244751716481903540505335e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.50998889887280885500990101116973130081e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.23247766687180294767338042555173653249e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.12326475887709255500757383109178584638e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11688319088825228685832870139320733695e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95381542569360703428852622701723193645e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.70730387484749668293167350494151199659e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84243405919322052861165273432136993833e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40860917180131228318146854666419586211e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.85122374200561402546731933480737679849e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.79744248200459077556218062241428072826e-32),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.68930884381361438749954611436694811868e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54944129151720429074748655153760118465e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68493670923968273171437877298940102712e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.32109946297461941811102221103314572340e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.11983030120265263999033828442555862122e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31204888358097171713697195034681853057e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38548604936907265274059071726622071821e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.82158855359673890472124017801768455208e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78564556026252472894386810079914912632e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.46854501887011863360558947087254908412e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67236380279070121978196383998000020645e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.20076045812548485396837897240357026254e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15814123143437217877762088763846289858e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67177999717442465582949551415385496304e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71135001552136641449927514544850663366e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.98449056954034104266783180068258117013e-22),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.8330e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41392032051575981622151194498090952488e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32651097995974052731414709779952524875e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51927763729719814565225981452897995722e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.11148082477882981299945196621348531180e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80457559655975695558885644380771202301e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96223001525552834934139567532649816367e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10625449265784963560596299595289620029e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.14785887121654524328854820350425279893e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00832358736396150660417651391240544392e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.63128732906298604011217701767305935851e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86148432181465165445355560568442172406e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44088921565424320298916604159745842835e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.95220124898384051195673049864765987092e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50531060529388128674128631193212903032e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06119051130826148039530805693452156757e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19849873960405145967462029876325494393e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66833600176986734600260382043861669021e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07829060832934383885234817363480653925e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21485411177823993142696645934560017341e-40),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.88559444380290379529260819350179144435e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.37942717465159991856146428659881557553e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.11409915376157429952160202733757574026e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.21511733003564236929107862750700281202e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74773232555012468159223116269289241483e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.24042271031862389840796415749527818562e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50790246845873571117791557191071320982e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.88274886666078071130557536971927872847e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94242592538917360235050248151146832636e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45262967284548223426004177385213311949e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30081806380053435857465845326686775489e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62226426496757450797456131921060042081e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40933140159573381494354127717542598424e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.03760580312376891985077265621432029857e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.43980683769941233230954109646012150124e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.88686274782816858372719510890126716148e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07336140055510452905474533727353308321e-25),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.9085e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41392031627647840832213878541731833340e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48256908849985263191468999842405689327e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.16515822909144946601084169745484248278e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.42246334265547596187501472291026180697e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.54145961608971551335283437288203286104e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.64840354062369555376354747633807898689e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.38246669464526050793398379055335943951e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29684566081664150074215568847731661446e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.98456331768093420851844051941851740455e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36738267296531031235518935656891979319e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.08128287278026286279504717089979753319e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.38334581618709868951669630969696873534e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.08478537820365448038773095902465198679e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30768169494950935152733510713679558562e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49254243621461466892836128222648688091e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.17026357413798368802986708112771803774e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.05630817682870951728748696694117980745e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.13881361534205323565985756195674181203e-50),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34271731953273239599863811873205236246e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27133013035186849060586077266046297964e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29542078693828543540010668640353491847e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33027698228265344545932885863767276804e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06868444562964057780556916100143215394e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.97868278672593071061800234869603536243e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79869926850283188735312536038469293739e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75298857713475428365153491580710497759e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.93449891515741631851202042430818496480e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36715626731277089013724968542144140938e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.98125789528264426869121548546848968670e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78234546049400950521459021508632294206e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83044000387150792643468853129175805308e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.30111486296552039388613073915170671881e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.28628462422858134962149154420358876352e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48108558735886480279744474396456699335e-21),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else {
+        const BOOST_MATH_STATIC_LOCAL_VARIABLE RealType c = ldexp(cbrt(constants::pi<RealType>()), 1);
+
+        RealType p_square = p * p;
+
+        if ((boost::math::isnormal)(p_square)) {
+            result = 1 / (cbrt(p_square) * c);
+        }
+        else if (p > 0) {
+            result = 1 / (cbrt(p) * cbrt(p) * c);
+        }
+        else {
+            result = boost::math::numeric_limits<RealType>::infinity();
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 53>& tag)
+{
+    if (p > 0.5) {
+        return !complement ? holtsmark_quantile_upper_imp_prec(1 - p, tag) : -holtsmark_quantile_upper_imp_prec(1 - p, tag);
+    }
+
+    return complement ? holtsmark_quantile_upper_imp_prec(p, tag) : -holtsmark_quantile_upper_imp_prec(p, tag);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 113>& tag)
+{
+    if (p > 0.5) {
+        return !complement ? holtsmark_quantile_upper_imp_prec(1 - p, tag) : -holtsmark_quantile_upper_imp_prec(1 - p, tag);
+    }
+
+    return complement ? holtsmark_quantile_upper_imp_prec(p, tag) : -holtsmark_quantile_upper_imp_prec(p, tag);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_quantile_imp(const holtsmark_distribution<RealType, Policy>& dist, const RealType& p, bool complement)
+{
+    // This routine implements the quantile for the Holtsmark distribution,
+    // the value p may be the probability, or its complement if complement=true.
+
+    constexpr auto function = "boost::math::quantile(holtsmark<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_probability(function, p, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Holtsmark distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * holtsmark_quantile_imp_prec(p, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_entropy_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(2.06944850513462440032);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_entropy_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.0694485051346244003155800384542166381);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType holtsmark_entropy_imp(const holtsmark_distribution<RealType, Policy>& dist)
+{
+    // This implements the entropy for the Holtsmark distribution,
+
+    constexpr auto function = "boost::math::entropy(holtsmark<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Holtsmark distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = holtsmark_entropy_imp_prec<RealType>(tag_type()) + log(scale);
+
+    return result;
+}
+
+} // detail
+
+template <class RealType = double, class Policy = policies::policy<> >
+class holtsmark_distribution
+{
+    public:
+    typedef RealType value_type;
+    typedef Policy policy_type;
+
+    BOOST_MATH_GPU_ENABLED holtsmark_distribution(RealType l_location = 0, RealType l_scale = 1)
+        : mu(l_location), c(l_scale)
+    {
+        constexpr auto function = "boost::math::holtsmark_distribution<%1%>::holtsmark_distribution";
+        RealType result = 0;
+        detail::check_location(function, l_location, &result, Policy());
+        detail::check_scale(function, l_scale, &result, Policy());
+    } // holtsmark_distribution
+
+    BOOST_MATH_GPU_ENABLED RealType location()const
+    {
+        return mu;
+    }
+    BOOST_MATH_GPU_ENABLED RealType scale()const
+    {
+        return c;
+    }
+
+    private:
+    RealType mu;    // The location parameter.
+    RealType c;     // The scale parameter.
+};
+
+typedef holtsmark_distribution<double> holtsmark;
+
+#ifdef __cpp_deduction_guides
+template <class RealType>
+holtsmark_distribution(RealType) -> holtsmark_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+template <class RealType>
+holtsmark_distribution(RealType, RealType) -> holtsmark_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+#endif
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const holtsmark_distribution<RealType, Policy>&)
+{ // Range of permissible values for random variable x.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const holtsmark_distribution<RealType, Policy>&)
+{ // Range of supported values for random variable x.
+   // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-tools::max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const holtsmark_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::holtsmark_pdf_imp(dist, x);
+} // pdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const holtsmark_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::holtsmark_cdf_imp(dist, x, false);
+} // cdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const holtsmark_distribution<RealType, Policy>& dist, const RealType& p)
+{
+    return detail::holtsmark_quantile_imp(dist, p, false);
+} // quantile
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<holtsmark_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::holtsmark_cdf_imp(c.dist, c.param, true);
+} //  cdf complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<holtsmark_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::holtsmark_quantile_imp(c.dist, c.param, true);
+} // quantile complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mean(const holtsmark_distribution<RealType, Policy> &dist)
+{
+    return dist.location();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType variance(const holtsmark_distribution<RealType, Policy>& /*dist*/)
+{
+    return boost::math::numeric_limits<RealType>::infinity();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mode(const holtsmark_distribution<RealType, Policy>& dist)
+{
+    return dist.location();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType median(const holtsmark_distribution<RealType, Policy>& dist)
+{
+    return dist.location();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const holtsmark_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no skewness:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Holtsmark Distribution has no skewness");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::skewness(holtsmark<%1%>&)",
+        "The Holtsmark distribution does not have a skewness: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const holtsmark_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Holtsmark Distribution has no kurtosis");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis(holtsmark<%1%>&)",
+        "The Holtsmark distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const holtsmark_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis excess:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Holtsmark Distribution has no kurtosis excess");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis_excess(holtsmark<%1%>&)",
+        "The Holtsmark distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const holtsmark_distribution<RealType, Policy>& dist)
+{
+    return detail::holtsmark_entropy_imp(dist);
+}
+
+}} // namespaces
+
+
+#endif // BOOST_STATS_HOLTSMARK_HPP
diff --git a/inst/include/boost/math/distributions/inverse_chi_squared.hpp b/inst/include/boost/math/distributions/inverse_chi_squared.hpp
index 19dd0371e..1a3c680d2 100644
--- a/inst/include/boost/math/distributions/inverse_chi_squared.hpp
+++ b/inst/include/boost/math/distributions/inverse_chi_squared.hpp
@@ -1,6 +1,6 @@
 // Copyright John Maddock 2010.
 // Copyright Paul A. Bristow 2010.
-
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -9,6 +9,8 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_INVERSE_CHI_SQUARED_HPP
 #define BOOST_MATH_DISTRIBUTIONS_INVERSE_CHI_SQUARED_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp> // for incomplete beta.
 #include <boost/math/distributions/complement.hpp> // for complements.
@@ -24,14 +26,12 @@
 // Weisstein, Eric W. "Inverse Chi-Squared Distribution." From MathWorld--A Wolfram Web Resource.
 // http://mathworld.wolfram.com/InverseChi-SquaredDistribution.html
 
-#include <utility>
-
 namespace boost{ namespace math{
 
 namespace detail
 {
   template <class RealType, class Policy>
-  inline bool check_inverse_chi_squared( // Check both distribution parameters.
+  BOOST_MATH_GPU_ENABLED inline bool check_inverse_chi_squared( // Check both distribution parameters.
         const char* function,
         RealType degrees_of_freedom, // degrees_of_freedom (aka nu).
         RealType scale,  // scale (aka sigma^2)
@@ -51,7 +51,7 @@ class inverse_chi_squared_distribution
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   inverse_chi_squared_distribution(RealType df, RealType l_scale) : m_df(df), m_scale (l_scale)
+   BOOST_MATH_GPU_ENABLED inverse_chi_squared_distribution(RealType df, RealType l_scale) : m_df(df), m_scale (l_scale)
    {
       RealType result;
       detail::check_df(
@@ -62,7 +62,7 @@ class inverse_chi_squared_distribution
          m_scale, &result,  Policy());
    } // inverse_chi_squared_distribution constructor 
 
-   inverse_chi_squared_distribution(RealType df = 1) : m_df(df)
+   BOOST_MATH_GPU_ENABLED inverse_chi_squared_distribution(RealType df = 1) : m_df(df)
    {
       RealType result;
       m_scale = 1 / m_df ; // Default scale = 1 / degrees of freedom (Wikipedia definition 1).
@@ -71,11 +71,11 @@ class inverse_chi_squared_distribution
          m_df, &result, Policy());
    } // inverse_chi_squared_distribution
 
-   RealType degrees_of_freedom()const
+   BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom()const
    {
       return m_df; // aka nu
    }
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    {
       return m_scale;  // aka xi
    }
@@ -105,28 +105,28 @@ inverse_chi_squared_distribution(RealType,RealType)->inverse_chi_squared_distrib
 #endif
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> range(const inverse_chi_squared_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const inverse_chi_squared_distribution<RealType, Policy>& /*dist*/)
 {  // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // 0 to + infinity.
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // 0 to + infinity.
 }
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> support(const inverse_chi_squared_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const inverse_chi_squared_distribution<RealType, Policy>& /*dist*/)
 {  // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), tools::max_value<RealType>()); // 0 to + infinity.
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), tools::max_value<RealType>()); // 0 to + infinity.
 }
 
 template <class RealType, class Policy>
-RealType pdf(const inverse_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED RealType pdf(const inverse_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions.
    RealType df = dist.degrees_of_freedom();
    RealType scale = dist.scale();
    RealType error_result;
 
-   static const char* function = "boost::math::pdf(const inverse_chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const inverse_chi_squared_distribution<%1%>&, %1%)";
 
    if(false == detail::check_inverse_chi_squared
      (function, df, scale, &error_result, Policy())
@@ -159,9 +159,9 @@ RealType pdf(const inverse_chi_squared_distribution<RealType, Policy>& dist, con
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const inverse_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const inverse_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
 {
-   static const char* function = "boost::math::cdf(const inverse_chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const inverse_chi_squared_distribution<%1%>&, %1%)";
    RealType df = dist.degrees_of_freedom();
    RealType scale = dist.scale();
    RealType error_result;
@@ -188,13 +188,13 @@ inline RealType cdf(const inverse_chi_squared_distribution<RealType, Policy>& di
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const inverse_chi_squared_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const inverse_chi_squared_distribution<RealType, Policy>& dist, const RealType& p)
 {
    using boost::math::gamma_q_inv;
    RealType df = dist.degrees_of_freedom();
    RealType scale = dist.scale();
 
-   static const char* function = "boost::math::quantile(const inverse_chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const inverse_chi_squared_distribution<%1%>&, %1%)";
    // Error check:
    RealType error_result;
    if(false == detail::check_df(
@@ -220,13 +220,13 @@ inline RealType quantile(const inverse_chi_squared_distribution<RealType, Policy
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<inverse_chi_squared_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<inverse_chi_squared_distribution<RealType, Policy>, RealType>& c)
 {
    using boost::math::gamma_q_inv;
    RealType const& df = c.dist.degrees_of_freedom();
    RealType const& scale = c.dist.scale();
    RealType const& x = c.param;
-   static const char* function = "boost::math::cdf(const inverse_chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const inverse_chi_squared_distribution<%1%>&, %1%)";
    // Error check:
    RealType error_result;
    if(false == detail::check_df(
@@ -251,14 +251,14 @@ inline RealType cdf(const complemented2_type<inverse_chi_squared_distribution<Re
 } // cdf(complemented
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<inverse_chi_squared_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<inverse_chi_squared_distribution<RealType, Policy>, RealType>& c)
 {
    using boost::math::gamma_q_inv;
 
    RealType const& df = c.dist.degrees_of_freedom();
    RealType const& scale = c.dist.scale();
    RealType const& q = c.param;
-   static const char* function = "boost::math::quantile(const inverse_chi_squared_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const inverse_chi_squared_distribution<%1%>&, %1%)";
    // Error check:
    RealType error_result;
    if(false == detail::check_df(function, df, &error_result, Policy()))
@@ -280,12 +280,12 @@ inline RealType quantile(const complemented2_type<inverse_chi_squared_distributi
 } // quantile(const complement
 
 template <class RealType, class Policy>
-inline RealType mean(const inverse_chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const inverse_chi_squared_distribution<RealType, Policy>& dist)
 { // Mean of inverse Chi-Squared distribution.
    RealType df = dist.degrees_of_freedom();
    RealType scale = dist.scale();
 
-   static const char* function = "boost::math::mean(const inverse_chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mean(const inverse_chi_squared_distribution<%1%>&)";
    if(df <= 2)
       return policies::raise_domain_error<RealType>(
          function,
@@ -295,11 +295,11 @@ inline RealType mean(const inverse_chi_squared_distribution<RealType, Policy>& d
 } // mean
 
 template <class RealType, class Policy>
-inline RealType variance(const inverse_chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const inverse_chi_squared_distribution<RealType, Policy>& dist)
 { // Variance of inverse Chi-Squared distribution.
    RealType df = dist.degrees_of_freedom();
    RealType scale = dist.scale();
-   static const char* function = "boost::math::variance(const inverse_chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::variance(const inverse_chi_squared_distribution<%1%>&)";
    if(df <= 4)
    {
       return policies::raise_domain_error<RealType>(
@@ -311,14 +311,14 @@ inline RealType variance(const inverse_chi_squared_distribution<RealType, Policy
 } // variance
 
 template <class RealType, class Policy>
-inline RealType mode(const inverse_chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const inverse_chi_squared_distribution<RealType, Policy>& dist)
 { // mode is not defined in Mathematica.
   // See Discussion section http://en.wikipedia.org/wiki/Talk:Scaled-inverse-chi-square_distribution
   // for origin of the formula used below.
 
    RealType df = dist.degrees_of_freedom();
    RealType scale = dist.scale();
-   static const char* function = "boost::math::mode(const inverse_chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mode(const inverse_chi_squared_distribution<%1%>&)";
    if(df < 0)
       return policies::raise_domain_error<RealType>(
          function,
@@ -341,11 +341,11 @@ inline RealType mode(const inverse_chi_squared_distribution<RealType, Policy>& d
 // Now implemented via quantile(half) in derived accessors.
 
 template <class RealType, class Policy>
-inline RealType skewness(const inverse_chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const inverse_chi_squared_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING // For ADL
    RealType df = dist.degrees_of_freedom();
-   static const char* function = "boost::math::skewness(const inverse_chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::skewness(const inverse_chi_squared_distribution<%1%>&)";
    if(df <= 6)
       return policies::raise_domain_error<RealType>(
          function,
@@ -356,10 +356,10 @@ inline RealType skewness(const inverse_chi_squared_distribution<RealType, Policy
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const inverse_chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const inverse_chi_squared_distribution<RealType, Policy>& dist)
 {
    RealType df = dist.degrees_of_freedom();
-   static const char* function = "boost::math::kurtosis(const inverse_chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::kurtosis(const inverse_chi_squared_distribution<%1%>&)";
    if(df <= 8)
       return policies::raise_domain_error<RealType>(
          function,
@@ -370,10 +370,10 @@ inline RealType kurtosis(const inverse_chi_squared_distribution<RealType, Policy
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const inverse_chi_squared_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const inverse_chi_squared_distribution<RealType, Policy>& dist)
 {
    RealType df = dist.degrees_of_freedom();
-   static const char* function = "boost::math::kurtosis(const inverse_chi_squared_distribution<%1%>&)";
+   constexpr auto function = "boost::math::kurtosis(const inverse_chi_squared_distribution<%1%>&)";
    if(df <= 8)
       return policies::raise_domain_error<RealType>(
          function,
diff --git a/inst/include/boost/math/distributions/inverse_gamma.hpp b/inst/include/boost/math/distributions/inverse_gamma.hpp
index 8c9e4763d..6aa798ed8 100644
--- a/inst/include/boost/math/distributions/inverse_gamma.hpp
+++ b/inst/include/boost/math/distributions/inverse_gamma.hpp
@@ -2,6 +2,7 @@
 
 //  Copyright Paul A. Bristow 2010.
 //  Copyright John Maddock 2010.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -22,21 +23,21 @@
 // http://mathworld.wolfram.com/GammaDistribution.html
 // http://en.wikipedia.org/wiki/Gamma_distribution
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 
-#include <utility>
-#include <cfenv>
-
 namespace boost{ namespace math
 {
 namespace detail
 {
 
 template <class RealType, class Policy>
-inline bool check_inverse_gamma_shape(
+BOOST_MATH_GPU_ENABLED inline bool check_inverse_gamma_shape(
       const char* function, // inverse_gamma
       RealType shape, // shape aka alpha
       RealType* result, // to update, perhaps with NaN
@@ -57,7 +58,7 @@ inline bool check_inverse_gamma_shape(
 } //bool check_inverse_gamma_shape
 
 template <class RealType, class Policy>
-inline bool check_inverse_gamma_x(
+BOOST_MATH_GPU_ENABLED inline bool check_inverse_gamma_x(
       const char* function,
       RealType const& x,
       RealType* result, const Policy& pol)
@@ -73,7 +74,7 @@ inline bool check_inverse_gamma_x(
 }
 
 template <class RealType, class Policy>
-inline bool check_inverse_gamma(
+BOOST_MATH_GPU_ENABLED inline bool check_inverse_gamma(
       const char* function, // TODO swap these over, so shape is first.
       RealType scale,  // scale aka beta
       RealType shape, // shape aka alpha
@@ -92,7 +93,7 @@ class inverse_gamma_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit inverse_gamma_distribution(RealType l_shape = 1, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED explicit inverse_gamma_distribution(RealType l_shape = 1, RealType l_scale = 1)
       : m_shape(l_shape), m_scale(l_scale)
    {
       RealType result;
@@ -101,12 +102,12 @@ class inverse_gamma_distribution
         l_scale, l_shape, &result, Policy());
    }
 
-   RealType shape()const
+   BOOST_MATH_GPU_ENABLED RealType shape()const
    {
       return m_shape;
    }
 
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    {
       return m_scale;
    }
@@ -132,27 +133,27 @@ inverse_gamma_distribution(RealType,RealType)->inverse_gamma_distribution<typena
 // Allow random variable x to be zero, treated as a special case (unlike some definitions).
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const inverse_gamma_distribution<RealType, Policy>& /* dist */)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const inverse_gamma_distribution<RealType, Policy>& /* dist */)
 {  // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const inverse_gamma_distribution<RealType, Policy>& /* dist */)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const inverse_gamma_distribution<RealType, Policy>& /* dist */)
 {  // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
    using boost::math::tools::min_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::pdf(const inverse_gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const inverse_gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -195,17 +196,17 @@ inline RealType pdf(const inverse_gamma_distribution<RealType, Policy>& dist, co
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
    using boost::math::lgamma;
 
-   static const char* function = "boost::math::logpdf(const inverse_gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logpdf(const inverse_gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
 
-   RealType result = -std::numeric_limits<RealType>::infinity();
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
    if(false == detail::check_inverse_gamma(function, scale, shape, &result, Policy()))
    { // distribution parameters bad.
       return result;
@@ -232,11 +233,11 @@ inline RealType logpdf(const inverse_gamma_distribution<RealType, Policy>& dist,
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const inverse_gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const inverse_gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -260,12 +261,12 @@ inline RealType cdf(const inverse_gamma_distribution<RealType, Policy>& dist, co
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const inverse_gamma_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
    using boost::math::gamma_q_inv;
 
-   static const char* function = "boost::math::quantile(const inverse_gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const inverse_gamma_distribution<%1%>&, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -287,11 +288,11 @@ inline RealType quantile(const inverse_gamma_distribution<RealType, Policy>& dis
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<inverse_gamma_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<inverse_gamma_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const gamma_distribution<%1%>&, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -310,11 +311,11 @@ inline RealType cdf(const complemented2_type<inverse_gamma_distribution<RealType
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<inverse_gamma_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<inverse_gamma_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const inverse_gamma_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const inverse_gamma_distribution<%1%>&, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -338,11 +339,11 @@ inline RealType quantile(const complemented2_type<inverse_gamma_distribution<Rea
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const inverse_gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const inverse_gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::mean(const inverse_gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mean(const inverse_gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -365,11 +366,11 @@ inline RealType mean(const inverse_gamma_distribution<RealType, Policy>& dist)
 } // mean
 
 template <class RealType, class Policy>
-inline RealType variance(const inverse_gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const inverse_gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::variance(const inverse_gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::variance(const inverse_gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -391,11 +392,11 @@ inline RealType variance(const inverse_gamma_distribution<RealType, Policy>& dis
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const inverse_gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const inverse_gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::mode(const inverse_gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::mode(const inverse_gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -418,11 +419,11 @@ inline RealType mode(const inverse_gamma_distribution<RealType, Policy>& dist)
 //}
 
 template <class RealType, class Policy>
-inline RealType skewness(const inverse_gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const inverse_gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::skewness(const inverse_gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::skewness(const inverse_gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -444,11 +445,11 @@ inline RealType skewness(const inverse_gamma_distribution<RealType, Policy>& dis
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const inverse_gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const inverse_gamma_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::kurtosis_excess(const inverse_gamma_distribution<%1%>&)";
+   constexpr auto function = "boost::math::kurtosis_excess(const inverse_gamma_distribution<%1%>&)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -470,9 +471,9 @@ inline RealType kurtosis_excess(const inverse_gamma_distribution<RealType, Polic
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const inverse_gamma_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const inverse_gamma_distribution<RealType, Policy>& dist)
 {
-  static const char* function = "boost::math::kurtosis(const inverse_gamma_distribution<%1%>&)";
+  constexpr auto function = "boost::math::kurtosis(const inverse_gamma_distribution<%1%>&)";
    RealType shape = dist.shape();
    RealType scale = dist.scale();
 
diff --git a/inst/include/boost/math/distributions/inverse_gaussian.hpp b/inst/include/boost/math/distributions/inverse_gaussian.hpp
index c8e46913a..20d3b6bdd 100644
--- a/inst/include/boost/math/distributions/inverse_gaussian.hpp
+++ b/inst/include/boost/math/distributions/inverse_gaussian.hpp
@@ -1,6 +1,6 @@
 //  Copyright John Maddock 2010.
 //  Copyright Paul A. Bristow 2010.
-
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -49,17 +49,17 @@
 
 // http://www.statsci.org/s/inverse_gaussian.s  and http://www.statsci.org/s/inverse_gaussian.html
 
-//#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/special_functions/erf.hpp> // for erf/erfc.
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/normal.hpp>
 #include <boost/math/distributions/gamma.hpp> // for gamma function
-
 #include <boost/math/tools/tuple.hpp>
 #include <boost/math/tools/roots.hpp>
-
-#include <utility>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost{ namespace math{
 
@@ -70,10 +70,10 @@ class inverse_gaussian_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit inverse_gaussian_distribution(RealType l_mean = 1, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED explicit inverse_gaussian_distribution(RealType l_mean = 1, RealType l_scale = 1)
       : m_mean(l_mean), m_scale(l_scale)
    { // Default is a 1,1 inverse_gaussian distribution.
-     static const char* function = "boost::math::inverse_gaussian_distribution<%1%>::inverse_gaussian_distribution";
+     constexpr auto function = "boost::math::inverse_gaussian_distribution<%1%>::inverse_gaussian_distribution";
 
      RealType result;
      detail::check_scale(function, l_scale, &result, Policy());
@@ -81,22 +81,22 @@ class inverse_gaussian_distribution
      detail::check_x_gt0(function, l_mean, &result, Policy());
    }
 
-   RealType mean()const
+   BOOST_MATH_GPU_ENABLED RealType mean()const
    { // alias for location.
       return m_mean; // aka mu
    }
 
    // Synonyms, provided to allow generic use of find_location and find_scale.
-   RealType location()const
+   BOOST_MATH_GPU_ENABLED RealType location()const
    { // location, aka mu.
       return m_mean;
    }
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    { // scale, aka lambda.
       return m_scale;
    }
 
-   RealType shape()const
+   BOOST_MATH_GPU_ENABLED RealType shape()const
    { // shape, aka phi = lambda/mu.
       return m_scale / m_mean;
    }
@@ -119,29 +119,29 @@ inverse_gaussian_distribution(RealType,RealType)->inverse_gaussian_distribution<
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const inverse_gaussian_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const inverse_gaussian_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x, zero to max.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0.), max_value<RealType>()); // - to + max value.
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0.), max_value<RealType>()); // - to + max value.
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const inverse_gaussian_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const inverse_gaussian_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x, zero to max.
   // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0.),  max_value<RealType>()); // - to + max value.
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0.),  max_value<RealType>()); // - to + max value.
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& x)
 { // Probability Density Function
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType scale = dist.scale();
    RealType mean = dist.mean();
    RealType result = 0;
-   static const char* function = "boost::math::pdf(const inverse_gaussian_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const inverse_gaussian_distribution<%1%>&, %1%)";
    if(false == detail::check_scale(function, scale, &result, Policy()))
    {
       return result;
@@ -171,14 +171,14 @@ inline RealType pdf(const inverse_gaussian_distribution<RealType, Policy>& dist,
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& x)
 { // Probability Density Function
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType scale = dist.scale();
    RealType mean = dist.mean();
-   RealType result = -std::numeric_limits<RealType>::infinity();
-   static const char* function = "boost::math::logpdf(const inverse_gaussian_distribution<%1%>&, %1%)";
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
+   constexpr auto function = "boost::math::logpdf(const inverse_gaussian_distribution<%1%>&, %1%)";
    if(false == detail::check_scale(function, scale, &result, Policy()))
    {
       return result;
@@ -198,7 +198,7 @@ inline RealType logpdf(const inverse_gaussian_distribution<RealType, Policy>& di
 
    if (x == 0)
    {
-     return std::numeric_limits<RealType>::quiet_NaN(); // Convenient, even if not defined mathematically. log(0)
+     return boost::math::numeric_limits<RealType>::quiet_NaN(); // Convenient, even if not defined mathematically. log(0)
    }
 
    const RealType two_pi = boost::math::constants::two_pi<RealType>();
@@ -208,13 +208,13 @@ inline RealType logpdf(const inverse_gaussian_distribution<RealType, Policy>& di
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& x)
 { // Cumulative Density Function.
    BOOST_MATH_STD_USING  // for ADL of std functions.
 
    RealType scale = dist.scale();
    RealType mean = dist.mean();
-   static const char* function = "boost::math::cdf(const inverse_gaussian_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const inverse_gaussian_distribution<%1%>&, %1%)";
    RealType result = 0;
    if(false == detail::check_scale(function, scale, &result, Policy()))
    {
@@ -257,11 +257,11 @@ template <class RealType, class Policy>
 struct inverse_gaussian_quantile_functor
 { 
 
-  inverse_gaussian_quantile_functor(const boost::math::inverse_gaussian_distribution<RealType, Policy> dist, RealType const& p)
+  BOOST_MATH_GPU_ENABLED inverse_gaussian_quantile_functor(const boost::math::inverse_gaussian_distribution<RealType, Policy> dist, RealType const& p)
     : distribution(dist), prob(p)
   {
   }
-  boost::math::tuple<RealType, RealType> operator()(RealType const& x)
+  BOOST_MATH_GPU_ENABLED boost::math::tuple<RealType, RealType> operator()(RealType const& x)
   {
     RealType c = cdf(distribution, x);
     RealType fx = c - prob;  // Difference cdf - value - to minimize.
@@ -277,11 +277,11 @@ struct inverse_gaussian_quantile_functor
 template <class RealType, class Policy>
 struct inverse_gaussian_quantile_complement_functor
 { 
-    inverse_gaussian_quantile_complement_functor(const boost::math::inverse_gaussian_distribution<RealType, Policy> dist, RealType const& p)
+  BOOST_MATH_GPU_ENABLED inverse_gaussian_quantile_complement_functor(const boost::math::inverse_gaussian_distribution<RealType, Policy> dist, RealType const& p)
     : distribution(dist), prob(p)
   {
   }
-  boost::math::tuple<RealType, RealType> operator()(RealType const& x)
+  BOOST_MATH_GPU_ENABLED boost::math::tuple<RealType, RealType> operator()(RealType const& x)
   {
     RealType c = cdf(complement(distribution, x));
     RealType fx = c - prob;  // Difference cdf - value - to minimize.
@@ -298,7 +298,7 @@ struct inverse_gaussian_quantile_complement_functor
 namespace detail
 {
   template <class RealType>
-  inline RealType guess_ig(RealType p, RealType mu = 1, RealType lambda = 1)
+  BOOST_MATH_GPU_ENABLED inline RealType guess_ig(RealType p, RealType mu = 1, RealType lambda = 1)
   { // guess at random variate value x for inverse gaussian quantile.
     BOOST_MATH_STD_USING
     using boost::math::policies::policy;
@@ -350,14 +350,14 @@ namespace detail
 } // namespace detail
 
 template <class RealType, class Policy>
-inline RealType quantile(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const inverse_gaussian_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions.
    // No closed form exists so guess and use Newton Raphson iteration.
 
    RealType mean = dist.mean();
    RealType scale = dist.scale();
-   static const char* function = "boost::math::quantile(const inverse_gaussian_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const inverse_gaussian_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(false == detail::check_scale(function, scale, &result, Policy()))
@@ -388,22 +388,27 @@ inline RealType quantile(const inverse_gaussian_distribution<RealType, Policy>&
   // digits used to control how accurate to try to make the result.
   // To allow user to control accuracy versus speed,
   int get_digits = policies::digits<RealType, Policy>();// get digits from policy, 
-  std::uintmax_t m = policies::get_max_root_iterations<Policy>(); // and max iterations.
+  boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>(); // and max iterations.
   using boost::math::tools::newton_raphson_iterate;
   result =
-    newton_raphson_iterate(inverse_gaussian_quantile_functor<RealType, Policy>(dist, p), guess, min, max, get_digits, m);
-   return result;
+    newton_raphson_iterate(inverse_gaussian_quantile_functor<RealType, Policy>(dist, p), guess, min, max, get_digits, max_iter);
+  if (max_iter >= policies::get_max_root_iterations<Policy>())
+  {
+     return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+        " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
+  }
+  return result;
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<inverse_gaussian_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<inverse_gaussian_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions.
 
    RealType scale = c.dist.scale();
    RealType mean = c.dist.mean();
    RealType x = c.param;
-   static const char* function = "boost::math::cdf(const complement(inverse_gaussian_distribution<%1%>&), %1%)";
+   constexpr auto function = "boost::math::cdf(const complement(inverse_gaussian_distribution<%1%>&), %1%)";
 
    RealType result = 0;
    if(false == detail::check_scale(function, scale, &result, Policy()))
@@ -432,13 +437,13 @@ inline RealType cdf(const complemented2_type<inverse_gaussian_distribution<RealT
 } // cdf complement
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<inverse_gaussian_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<inverse_gaussian_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType scale = c.dist.scale();
    RealType mean = c.dist.mean();
-   static const char* function = "boost::math::quantile(const complement(inverse_gaussian_distribution<%1%>&), %1%)";
+   constexpr auto function = "boost::math::quantile(const complement(inverse_gaussian_distribution<%1%>&), %1%)";
    RealType result = 0;
    if(false == detail::check_scale(function, scale, &result, Policy()))
       return result;
@@ -459,33 +464,37 @@ inline RealType quantile(const complemented2_type<inverse_gaussian_distribution<
   // int digits = std::numeric_limits<RealType>::digits; // Maximum possible binary digits accuracy for type T.
   // digits used to control how accurate to try to make the result.
   int get_digits = policies::digits<RealType, Policy>();
-  std::uintmax_t m = policies::get_max_root_iterations<Policy>();
+  boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
   using boost::math::tools::newton_raphson_iterate;
-  result =
-    newton_raphson_iterate(inverse_gaussian_quantile_complement_functor<RealType, Policy>(c.dist, q), guess, min, max, get_digits, m);
-   return result;
+  result = newton_raphson_iterate(inverse_gaussian_quantile_complement_functor<RealType, Policy>(c.dist, q), guess, min, max, get_digits, max_iter);
+  if (max_iter >= policies::get_max_root_iterations<Policy>())
+  {
+     return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+        " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
+  }
+  return result;
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType mean(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const inverse_gaussian_distribution<RealType, Policy>& dist)
 { // aka mu
    return dist.mean();
 }
 
 template <class RealType, class Policy>
-inline RealType scale(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType scale(const inverse_gaussian_distribution<RealType, Policy>& dist)
 { // aka lambda
    return dist.scale();
 }
 
 template <class RealType, class Policy>
-inline RealType shape(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType shape(const inverse_gaussian_distribution<RealType, Policy>& dist)
 { // aka phi
    return dist.shape();
 }
 
 template <class RealType, class Policy>
-inline RealType standard_deviation(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType standard_deviation(const inverse_gaussian_distribution<RealType, Policy>& dist)
 {
   BOOST_MATH_STD_USING
   RealType scale = dist.scale();
@@ -495,7 +504,7 @@ inline RealType standard_deviation(const inverse_gaussian_distribution<RealType,
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const inverse_gaussian_distribution<RealType, Policy>& dist)
 {
   BOOST_MATH_STD_USING
   RealType scale = dist.scale();
@@ -506,7 +515,7 @@ inline RealType mode(const inverse_gaussian_distribution<RealType, Policy>& dist
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const inverse_gaussian_distribution<RealType, Policy>& dist)
 {
   BOOST_MATH_STD_USING
   RealType scale = dist.scale();
@@ -516,7 +525,7 @@ inline RealType skewness(const inverse_gaussian_distribution<RealType, Policy>&
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const inverse_gaussian_distribution<RealType, Policy>& dist)
 {
   RealType scale = dist.scale();
   RealType  mean = dist.mean();
@@ -525,7 +534,7 @@ inline RealType kurtosis(const inverse_gaussian_distribution<RealType, Policy>&
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const inverse_gaussian_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const inverse_gaussian_distribution<RealType, Policy>& dist)
 {
   RealType scale = dist.scale();
   RealType  mean = dist.mean();
diff --git a/inst/include/boost/math/distributions/kolmogorov_smirnov.hpp b/inst/include/boost/math/distributions/kolmogorov_smirnov.hpp
index 6ae80632d..093434413 100644
--- a/inst/include/boost/math/distributions/kolmogorov_smirnov.hpp
+++ b/inst/include/boost/math/distributions/kolmogorov_smirnov.hpp
@@ -379,10 +379,16 @@ inline RealType quantile(const kolmogorov_smirnov_distribution<RealType, Policy>
 
    RealType k = detail::kolmogorov_smirnov_quantile_guess(p) / sqrt(n);
    const int get_digits = policies::digits<RealType, Policy>();// get digits from policy,
-   std::uintmax_t m = policies::get_max_root_iterations<Policy>(); // and max iterations.
+   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>(); // and max iterations.
 
-   return tools::newton_raphson_iterate(detail::kolmogorov_smirnov_quantile_functor<RealType, Policy>(dist, p),
-           k, RealType(0), RealType(1), get_digits, m);
+   RealType result = tools::newton_raphson_iterate(detail::kolmogorov_smirnov_quantile_functor<RealType, Policy>(dist, p),
+           k, RealType(0), RealType(1), get_digits, max_iter);
+   if (max_iter >= policies::get_max_root_iterations<Policy>())
+   {
+      return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+         " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
+   }
+   return result;
 } // quantile
 
 template <class RealType, class Policy>
@@ -403,11 +409,17 @@ inline RealType quantile(const complemented2_type<kolmogorov_smirnov_distributio
    RealType k = detail::kolmogorov_smirnov_quantile_guess(RealType(1-p)) / sqrt(n);
 
    const int get_digits = policies::digits<RealType, Policy>();// get digits from policy,
-   std::uintmax_t m = policies::get_max_root_iterations<Policy>(); // and max iterations.
+   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>(); // and max iterations.
 
-   return tools::newton_raphson_iterate(
+   RealType result = tools::newton_raphson_iterate(
            detail::kolmogorov_smirnov_complementary_quantile_functor<RealType, Policy>(dist, p),
-           k, RealType(0), RealType(1), get_digits, m);
+           k, RealType(0), RealType(1), get_digits, max_iter);
+   if (max_iter >= policies::get_max_root_iterations<Policy>())
+   {
+      return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+         " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
+   }
+   return result;
 } // quantile (complemented)
 
 template <class RealType, class Policy>
diff --git a/inst/include/boost/math/distributions/landau.hpp b/inst/include/boost/math/distributions/landau.hpp
new file mode 100644
index 000000000..129eca287
--- /dev/null
+++ b/inst/include/boost/math/distributions/landau.hpp
@@ -0,0 +1,4642 @@
+//  Copyright Takuma Yoshimura 2024.
+//  Copyright Matt Borland 2024
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_STATS_LANDAU_HPP
+#define BOOST_STATS_LANDAU_HPP
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/distributions/complement.hpp>
+#include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/distributions/detail/derived_accessors.hpp>
+#include <boost/math/tools/rational.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/tools/promotion.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
+#include <boost/math/tools/big_constant.hpp>
+#include <utility>
+#include <cmath>
+#endif
+
+namespace boost { namespace math {
+template <class RealType, class Policy>
+class landau_distribution;
+
+namespace detail {
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 6.1179e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.62240126375351657026e-1),
+            static_cast<RealType>(3.37943593381366824691e-1),
+            static_cast<RealType>(1.53537606095123787618e-1),
+            static_cast<RealType>(3.01423783265555668011e-2),
+            static_cast<RealType>(2.66982581491576132363e-3),
+            static_cast<RealType>(-1.57344124519315009970e-5),
+            static_cast<RealType>(3.46237168332264544791e-7),
+            static_cast<RealType>(2.54512306953704347532e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.61596691542333069131e0),
+            static_cast<RealType>(1.31560197919990191004e0),
+            static_cast<RealType>(6.37865139714920275881e-1),
+            static_cast<RealType>(1.99051021258743986875e-1),
+            static_cast<RealType>(3.73788085017437528274e-2),
+            static_cast<RealType>(3.72580876403774116752e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if(x < 2){
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.1560e-17
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(1.63531240868022603476e-1),
+            static_cast<RealType>(1.42818648212508067982e-1),
+            static_cast<RealType>(4.95816076364679661943e-2),
+            static_cast<RealType>(8.59234710489723831273e-3),
+            static_cast<RealType>(5.76649181954629544285e-4),
+            static_cast<RealType>(-5.66279925274108366994e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.41478104966077351483e0),
+            static_cast<RealType>(9.41180365857002724714e-1),
+            static_cast<RealType>(3.65084346985789448244e-1),
+            static_cast<RealType>(8.77396986274371571301e-2),
+            static_cast<RealType>(1.24233749817860139205e-2),
+            static_cast<RealType>(8.57476298543168142524e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.1732e-19
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(9.55242261334771588094e-2),
+            static_cast<RealType>(6.66529732353979943139e-2),
+            static_cast<RealType>(1.80958840194356287100e-2),
+            static_cast<RealType>(2.34205449064047793618e-3),
+            static_cast<RealType>(1.16859089123286557482e-4),
+            static_cast<RealType>(-1.48761065213531458940e-7),
+            static_cast<RealType>(4.37245276130361710865e-9),
+            static_cast<RealType>(-8.10479404400603805292e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.21670723402658089612e0),
+            static_cast<RealType>(6.58224466688607822769e-1),
+            static_cast<RealType>(2.00828142796698077403e-1),
+            static_cast<RealType>(3.64962053761472303153e-2),
+            static_cast<RealType>(3.76034152661165826061e-3),
+            static_cast<RealType>(1.74723754509505656326e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.6621e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(3.83643820409470770350e-2),
+            static_cast<RealType>(1.97555000044256883088e-2),
+            static_cast<RealType>(3.71748668368617282698e-3),
+            static_cast<RealType>(3.04022677703754827113e-4),
+            static_cast<RealType>(8.76328889784070114569e-6),
+            static_cast<RealType>(-3.34900379044743745961e-9),
+            static_cast<RealType>(5.36581791174380716937e-11),
+            static_cast<RealType>(-5.50656207669255770963e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.09290785092251223006e-1),
+            static_cast<RealType>(3.49404120360701349529e-1),
+            static_cast<RealType>(7.23730835206014275634e-2),
+            static_cast<RealType>(8.47875744543245845354e-3),
+            static_cast<RealType>(5.28021165718081084884e-4),
+            static_cast<RealType>(1.33941126695887244822e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.6311e-19
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.12656323880287532947e-2),
+            static_cast<RealType>(2.87311140580416132088e-3),
+            static_cast<RealType>(2.61788674390925516376e-4),
+            static_cast<RealType>(9.74096895307400300508e-6),
+            static_cast<RealType>(1.19317564431052244154e-7),
+            static_cast<RealType>(-6.99543778035110375565e-12),
+            static_cast<RealType>(4.33383971045699197233e-14),
+            static_cast<RealType>(-1.75185581239955717728e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.94430267268436822392e-1),
+            static_cast<RealType>(1.00370783567964448346e-1),
+            static_cast<RealType>(1.05989564733662652696e-2),
+            static_cast<RealType>(6.04942184472254239897e-4),
+            static_cast<RealType>(1.72741008294864428917e-5),
+            static_cast<RealType>(1.85398104367945191152e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.6459e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.83847488747490686627e-3),
+            static_cast<RealType>(4.95641151588714788287e-4),
+            static_cast<RealType>(2.79159792287747766415e-5),
+            static_cast<RealType>(5.93951761884139733619e-7),
+            static_cast<RealType>(3.89602689555407749477e-9),
+            static_cast<RealType>(-4.86595415551823027835e-14),
+            static_cast<RealType>(9.68524606019510324447e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.01847536766892219351e-1),
+            static_cast<RealType>(3.63152433272831196527e-2),
+            static_cast<RealType>(2.20938897517130866817e-3),
+            static_cast<RealType>(7.05424834024833384294e-5),
+            static_cast<RealType>(1.09010608366510938768e-6),
+            static_cast<RealType>(6.08711307451776092405e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.5205e-17
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(6.85767880395157523315e-4),
+            static_cast<RealType>(4.08288098461672797376e-5),
+            static_cast<RealType>(8.10640732723079320426e-7),
+            static_cast<RealType>(6.10891161505083972565e-9),
+            static_cast<RealType>(1.37951861368789813737e-11),
+            static_cast<RealType>(-1.25906441382637535543e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.23722380864018634550e-1),
+            static_cast<RealType>(6.05800403141772433527e-3),
+            static_cast<RealType>(1.47809654123655473551e-4),
+            static_cast<RealType>(1.84909364620926802201e-6),
+            static_cast<RealType>(1.08158235309005492372e-8),
+            static_cast<RealType>(2.16335841791921214702e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(x) < 8) {
+        RealType t = log2(ldexp(x, -6));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.5572e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(6.78613480244945294595e-1),
+            static_cast<RealType>(9.61675759893298556080e-1),
+            static_cast<RealType>(3.45159462006746978086e-1),
+            static_cast<RealType>(6.32803373041761027814e-2),
+            static_cast<RealType>(6.93646175256407852991e-3),
+            static_cast<RealType>(4.69867700169714338273e-4),
+            static_cast<RealType>(1.76219117171149694118e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.44693640094228656726e0),
+            static_cast<RealType>(5.46298626321591162873e-1),
+            static_cast<RealType>(1.01572892952421447864e-1),
+            static_cast<RealType>(1.04982575345680980744e-2),
+            static_cast<RealType>(7.65591730392359463367e-4),
+            static_cast<RealType>(2.69383817793665674679e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 16) {
+        RealType t = log2(ldexp(x, -8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.7408e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.51438485661317103070e-1),
+            static_cast<RealType>(2.67941671074735988081e-1),
+            static_cast<RealType>(5.18564629295719783781e-2),
+            static_cast<RealType>(6.18976337233135940231e-3),
+            static_cast<RealType>(5.08042228681335953236e-4),
+            static_cast<RealType>(2.97268230746003939324e-5),
+            static_cast<RealType>(1.24283200336057908183e-6),
+            static_cast<RealType>(3.35670921544537716055e-8),
+            static_cast<RealType>(5.06987792821954864905e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.23792506680780833665e-1),
+            static_cast<RealType>(8.17040643791396371682e-2),
+            static_cast<RealType>(9.63961713981621216197e-3),
+            static_cast<RealType>(8.06584713485725204135e-4),
+            static_cast<RealType>(4.62050471704120102023e-5),
+            static_cast<RealType>(1.96919734048024406173e-6),
+            static_cast<RealType>(5.23890369587103685278e-8),
+            static_cast<RealType>(7.99399970089366802728e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 32) {
+        RealType t = log2(ldexp(x, -16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0195e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(6.36745544906925230102e-1),
+            static_cast<RealType>(2.06319686601209029700e-1),
+            static_cast<RealType>(3.27498059700133287053e-2),
+            static_cast<RealType>(3.30913729536910108000e-3),
+            static_cast<RealType>(2.34809665750270531592e-4),
+            static_cast<RealType>(1.21234086846551635407e-5),
+            static_cast<RealType>(4.55253563898240922019e-7),
+            static_cast<RealType>(1.17544434819877511707e-8),
+            static_cast<RealType>(1.76754192209232807941e-10),
+            static_cast<RealType>(-2.78616504641875874275e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.24145654925686670201e-1),
+            static_cast<RealType>(5.14350019501887110402e-2),
+            static_cast<RealType>(5.19867984016649969928e-3),
+            static_cast<RealType>(3.68798608372265018587e-4),
+            static_cast<RealType>(1.90449594112666257344e-5),
+            static_cast<RealType>(7.15068261954120746192e-7),
+            static_cast<RealType>(1.84646096630493837656e-8),
+            static_cast<RealType>(2.77636277083994601941e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 64) {
+        RealType t = log2(ldexp(x, -32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.0433e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.36619776379492082324e-1),
+            static_cast<RealType>(2.68158440168597706495e-1),
+            static_cast<RealType>(5.49040993767853738389e-2),
+            static_cast<RealType>(7.23458585096723552751e-3),
+            static_cast<RealType>(6.85438876301780090281e-4),
+            static_cast<RealType>(4.84561891424380633578e-5),
+            static_cast<RealType>(2.82092117716081590941e-6),
+            static_cast<RealType>(9.57557353473514565245e-8),
+            static_cast<RealType>(5.16773829224576217348e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.21222294324039934056e-1),
+            static_cast<RealType>(8.62431574655015481812e-2),
+            static_cast<RealType>(1.13640608906815986975e-2),
+            static_cast<RealType>(1.07668486873466248474e-3),
+            static_cast<RealType>(7.61148039258802068270e-5),
+            static_cast<RealType>(4.43109262308946031382e-6),
+            static_cast<RealType>(1.50412757354817481381e-7),
+            static_cast<RealType>(8.11746432728995551732e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else{
+        result = 2 / (constants::pi<RealType>() * x * x);
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 7.4629e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62240126375351657025589608183516471315e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.94698530837122818345222883832757839888e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06728003509081587907620543204047536319e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.41256254272104786752190871391781331271e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34420233794664437979710204055323742199e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55021337841765667713712845735938627884e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.90557752737535583908921594594761570259e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.89899202021818926241643215600800085123e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.19635143827754893815649685600837995626e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.90989458941330917626663002392683325107e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92038069341802550019371049232152823407e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.40251964644989324856906264776204142653e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.55873076454666680466531097660277995317e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.80771940886011613393622410616035955976e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.35771004134750535117224809381897395331e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.37002484862962406489509174332580745411e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.40833952846707180337506160933176158766e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.81709029902887471895588386777029652661e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98824705588020901032379932614151640505e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.83767868823957223030472664574235892682e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35718995485026064249286377096427165287e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.37305148463792922843850823142976586205e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.06575764439154972544253668821920460826e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07663693811543002088092708395572161856e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09711221791106684926377106608027279057e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91302186546138009232520527964387543006e-6),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.6684e-38
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63531240868022603475813051802104652763e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.17803013130262393286657457221415701909e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77780575692956605214628767143941600132e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44224824965135546671876867759691622832e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.93294212655117265065191070995706405837e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16021988737209938284910541133167243163e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89245591723934954825306673917695058577e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09614731993308746343064543583426077485e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48578173962833046113032690615443901556e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.91098199913613774034789276073191721350e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.46788618410999858374206722394998550706e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.14296339768511312584670061679121003569e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.52631422678659858574974085885146420544e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.48481735580594347909096198787726314434e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91598585888012869317473155570063821216e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12672162924784178863164220170459406872e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06981909640884405591730537337036849744e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.89767326897694369071250285702215471082e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05098647402530640576816174680275844283e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.10454903166951593161839822697382452489e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08850649343579977859251275585834901546e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.21168773136767495960695426112972188729e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21420361560900449851206650427538430926e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.84456961344035545134425261150891935402e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46462389440125559723382692664970874255e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.3397e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.55242261334771588093967856464157010584e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48866040463435403672044647455806606078e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04241715667984551487882549843428953917e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.32030608366022483736940428739436921577e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17209924605508887793687609139940354371e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.16808856405217460367038406337257561698e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75466331296758720822164534334356742122e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35657250222166360635152712608912585973e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28870137478821561164537700376942753108e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.07556331078347991810236646922418944687e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.18067019247793233704208913546277631267e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.96745094401496364651919224112160111958e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07735872062601280828576861757316683396e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00667909426245388114411629440735066799e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18840123665979969294228925712434860653e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79233661359264185181083948452464063323e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38221013998193410441723488211346327478e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91365002115280149925615665651486504495e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.50379182630668701710656913597366961277e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.03946139315999749917224356955071595508e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95417998434227083224840824790387887539e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05109028829536837163462811783445124876e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.33125282515685091345480270760501403655e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.58127838888839012133236453180928291822e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.64781659622256824499981528095809140284e-12),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.0238e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83643820409470770350079809236512802618e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.02996762669868036727057860510914079553e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88220267784864518806154823373656292346e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.12677705163934102871251710968247891123e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.96642570169484318623869835991454809217e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04358807405587072010621764865118316919e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09461879230275452416933096674703383719e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06823998699058163165831211561331795518e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24129479811279469256914665585439417704e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01799222004929573125167949870797564244e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27744716755834439008073010185921331093e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.64210356143729930758657624381557123115e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11666384975358223644665199669986358056e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.30202644697506464624965700043476935471e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44479208003384373099160875893986831861e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.54290037675901616362332580709754113529e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79815821498858750185823401350096868195e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01076480676864621093034009679744852375e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88607467767854661547920709472888000469e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51572461182263866462295745828009170865e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39843444671402317250813055670653845815e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60546478324160472036295355872288494327e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.25462551353792877506974677628167909695e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05915328498722701961972258866550409117e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20632869761578411246344533841556350518e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99438347491752820345051091574883391217e-12),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.2541e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12656323880287532946687856443190592955e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.31374972240605659239154788518240221417e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.10776910971729651587578902049263096117e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.53872632372452909103332647334935138324e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.81756147611150151751911596225474463602e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75302607308223110644722612796766590029e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33839913867469199941739467004997833889e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.32115127487193219555283158969582307620e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.90766547421015851413713511917307214275e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08939895797457378361211153362169024503e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.88597187949354708113046662952288249250e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62829447082637808482463811005771133942e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.65525705592205245661726488519562256000e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60698835222044786453848932477732972928e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.88605948104664828377228254521124685930e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.58594705700945215121673591119784576258e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.67113091918430152113322758216774649130e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39583889554372147091140765508385042797e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57139043074134496391251233307552940106e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26451960029396455805403758307828624817e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.30400557427446929311350088728080667203e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.99617890540456503276038942480115937467e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.50232186816498003232143065883536003942e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59310652872918546431499274822722004981e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82203579442241682923277858553949327687e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10345359368438386945407402887625511801e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55225829972215033873365516486524181445e-17),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.1276e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83847488747490686627461184914507143000e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.61220392257287638364190361688188696363e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42217711448675893329072184826328300776e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20597728166467972373586650878478687059e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.46404433551447410467051774706080733051e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27909145305324391651548849043874549520e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.33564789388635859003082815215888382619e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.18456219811686603951886248687349029515e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.92730718471866912036453008101994816885e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.51773776414973336511129801645901922234e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32371094281803507447435352076735970857e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44775294242071078601023962869394690897e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.94920633206242554892676642458535141153e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.18030442958390399095902441284074544279e-31),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.65871972115253665568580046072625013145e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.74531522538358367003224536101724206626e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20716479628426451344205712137554469781e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.83247584368619500260722365812456197226e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.52931189426842216323461406426803698335e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19343566926626449933230814579037896037e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.16243058880148231471744235009435586353e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21344088555713979086041331387697053780e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63246599173435592817113618949498524238e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43426263963680589288791782556801934305e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.62386317351298917459659548443220451300e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13281535580097407374477446521496074453e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27187882784316306216858933778750811182e-21),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.8458e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.85767880395157523314894776472286059373e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07684379950498990874449661385130414967e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.29181715091139597455177955800910928786e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78745116935613858188145093313446961899e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.61522707085521545633529621526418843836e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00989556810424018339768632204186394735e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94136605359672888838088037894401904574e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.15203266224687619299892471650072720579e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.25349098945982074415471295859193558426e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.31874620165906020409111024866737082384e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19330888204484008667352280840160186671e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.89951131249530265518610784629981482444e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35979606245171162602352579985003194602e-33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.50946115943875327149319867495704969908e-36),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21212467547297045538111676107434471585e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17663841151156626845609176694801024524e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25478800461954401173897968683982253458e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.69831763649657690166671862562231448718e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19712058726935472913461138967922524612e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11423395018514913507624349385447326009e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.58664605420655866109404476637021322838e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15398721299264752103644541934654351463e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17567858878427250079920401604119982576e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.92808825029184923713064129493385469531e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.06007644624654848502783947087038305433e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.01246784499782934986619755015082182398e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(x) < 8) {
+        RealType t = log2(ldexp(x, -6));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.6634e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.78613480244945294594505480426643613242e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07362312709864018864207848733814857157e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.47727521897653923649758175033206259109e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04183129813120998456717217121703605830e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09978729224187570508825456585418357590e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98739784100617344335742510102186570437e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08596635852958074572320481325030046975e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34947456497875218771996878497766058580e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31766866003171430205401377671093088134e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.29444683984117745298484117924452498776e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34885173277203843795065094551227568738e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30306828175920576070486704404727265760e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.05908347665846652276910544097430115068e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07218191317166728296013167220324207427e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.38908532499742180532814291654329829544e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63676664387672566455490461784630320677e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31302647779056928216789214742790688980e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.69477260342662648574925942030720482689e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.82918424748192763052497731722563414651e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69244295675395948278971027618145225216e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08928780307959133484802547123672997757e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.11055350627948183551681634293425028439e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22066081452382450191191677443527136733e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78025987104169227624653323808131280009e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.93164997733174955208299290433803918816e-13),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 16) {
+        RealType t = log2(ldexp(x, -8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.1919e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.51438485661317103069553924870169052838e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.29652867028564588922931020456447362877e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.90557738902930002845457640269863338815e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.47622170600415955276436226439948455362e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75198213226024095368607442455597948634e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73010116224706573149404022585502812698e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.33440551266376466187512220300943206212e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27556365758364667507686872656121131255e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.63395763346533783414747536236033733143e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75408632486279069728789506666930014630e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.74194099205847568739445023334735086627e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.52462367172968216583968200390021647482e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75367408334713835736514158797013854282e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.62633983586253025227038002631010874719e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46717630077826649018810277799043037738e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00642537643332236333695338824014611799e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47351714774371338348451112020520067028e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15896012319823666881998903857141624070e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.62176014448801854863922778456328119208e-25),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.79042471052521112984740498925369905803e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.55058068535501327896327971200536085268e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33143443551335870264469963604049242325e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75325348141376361676246108294525717629e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.28871858542582365161221803267369985933e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.23702867786056336210872367019916245663e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.14513776996445072162386201808986222616e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13763070277828149031445006534179375988e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75529866599039195417128499359378019030e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53029524184341515115464886126119582515e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.10598685541492162454676538516969294049e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75587930183994618721688808612207567233e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.83150895141383746641924725237948860959e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30675015193353451939138512698571954110e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.71774361582156518394662911172142577047e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.03397072601182597002547703682673198965e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.52666999314026491934445577764441483687e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 32) {
+        RealType t = log2(ldexp(x, -16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2411e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36745544906925230101752563433306496000e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73688900814770369626527563956988302379e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.81718746296195151971617726268038570065e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.13663059680440438907042970413471861121e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.40004645275531255402942177790836798523e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.80059489775751412372432345156902685277e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47699576477278882708291693658669435536e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.45226121992756638990044029871581321461e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13406331882918393195342615955627442395e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46682598893946975917562485374893408094e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50450743907497671918301557074470352707e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.33121239192492785826422815650499088833e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05998176182038788839361491871608950696e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17857918044922309623941523489531919822e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.67865547879145051715131144371287619666e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.89654931108624296326740455618289840327e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.73017950634516660552375272495618707905e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68519137981001059472024985205381913202e-24),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.29948066505039082395951244410552705780e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.13730690908098361287472898564563217987e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27810872138103132689695155123062073221e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31948058845675193039732511839435290811e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06822729610151747708260147063757668707e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.03250522904270408071762059653475885811e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.85197262150009124871794386644476067020e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78139536405831228129042087771755615472e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.01642938314578533660138738069251610818e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36328724659833107203404258336776286146e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.80342430290059616305921915291683180697e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66502051110007556897014898713746069491e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42209715361911856322028597714105225748e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.77842582605458905635718323117222788078e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.69147628396460384758492682185049535079e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.43015110519230289924122344324563890953e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21788819753161690674882271896091269356e-24),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 64) {
+        RealType t = log2(ldexp(x, -32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0348e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619776379492082323649724050601750141e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29818158612993476124594583743266388964e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.07736315744724186061845512973085067283e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72566458808745644851080213349673559756e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.01243670706840752914099834172565920736e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65306557791300593593488790517297048902e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41751291649776832705247036453540452119e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.26652535267657618112731521308564571490e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32742926765578976373764178875983383214e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.32948532312961882464151446137719196209e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96536595631611560703804402181953334762e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48463581600017734001916804890205661347e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.65588239861378749665334852913775575615e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39462290798829172203386678450961569536e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83049279786679854738508318703604392055e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87131679136229094080572090496960701828e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35977519905679446758726709186381481753e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.50639358104925465711435411537609380290e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.47593981758247424082096107205150226114e-40),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60997521267746350015610841742718472657e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.40470704349086277215167519790809981379e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.42305660178694704379572259575557934523e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.30272082429322808188807034927827414359e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.16742567294582284534194935923915261582e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22662407906450293978092195442686428843e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.84343501655116670387608730076359018869e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.65591734166216912475609790035240582537e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15131286290573570519912674341226377625e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08718962387679715644203327604824250850e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.04444946843492647477476784817227903589e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35966282749098189010715902284098451987e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19066854132814661112207991393498039851e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87533136296192957063599695937632598999e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93945754223094281767677343057286164777e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13592988790740273103099465658198617078e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.64942281110142621080966631872844557766e-26),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else if (ilogb(x) < 128) {
+        RealType t = log2(ldexp(x, -64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.3963e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619772367581344984274685280416528592e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72417390936686577479751162141499390532e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74319117326966091295365258834959120634e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.94269681742277805376258823511210253023e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09354876913180019634171748490068797632e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.46986612543101357465265079580805403382e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21726753043764920243710352514279216684e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29971756326232375757519588897328507962e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06770117983967828996891025614645348127e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27141668055392041978388268556174062945e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48383887723476619460217715361289178429e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.49530301203157403427315504054500005836e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18668427867427341566476567665953082312e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73377083349017331494144334612902128610e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.32380647653444581710582396517056104063e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.29865827039123699411352876626634361936e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07464506614287925844993490382319608619e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60173555862875972119871402681133785088e-23),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27912237038396638341492536677313983747e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.02138359905285600768927677649467546192e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24763589856532154099789305018886222841e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27133166772875885088000073325642460162e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01628419446817660009223289575239926907e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.62446834592284424116329218260348474201e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61238790103816844895453935630752859272e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67714109140674398508739253084218270557e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70952563202454851902810005226033501692e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33080865791583428494353408816388908148e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.06120545912923145572220606396715398781e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86403930600680015325844027465766431761e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.29419718354538719350803683985104818654e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.36261565790718847159482447247645891176e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46062982552515416754702177333530968405e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68804852250549346018535616711418533423e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51600033199082754845231795160728350588e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x * x);
+    }
+    else {
+        result = 2 / (constants::pi<RealType>() * x * x);
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if(x >= -1){
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.3928e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(2.21762208692280384264e-1),
+            static_cast<RealType>(7.10041055270973473923e-1),
+            static_cast<RealType>(8.66556480457430718380e-1),
+            static_cast<RealType>(4.78718713740071686348e-1),
+            static_cast<RealType>(1.03670563650247405820e-1),
+            static_cast<RealType>(4.31699263023057628473e-3),
+            static_cast<RealType>(1.72029926636215817416e-3),
+            static_cast<RealType>(-2.76271972015177236271e-4),
+            static_cast<RealType>(1.89483904652983701680e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(2.18155995697310361937e0),
+            static_cast<RealType>(2.53173077603836285217e0),
+            static_cast<RealType>(1.91802065831309251416e0),
+            static_cast<RealType>(9.94481663032480077373e-1),
+            static_cast<RealType>(3.72037148486473195054e-1),
+            static_cast<RealType>(8.85828240211801048938e-2),
+            static_cast<RealType>(1.41354784778520560313e-2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.4742e-18
+        BOOST_MATH_STATIC const RealType P[11] = {
+            static_cast<RealType>(6.50763682207511020789e-3),
+            static_cast<RealType>(5.73790055136022120436e-2),
+            static_cast<RealType>(2.22375662069496257066e-1),
+            static_cast<RealType>(4.92288611166073916396e-1),
+            static_cast<RealType>(6.74552077334695078716e-1),
+            static_cast<RealType>(5.75057550963763663751e-1),
+            static_cast<RealType>(2.85690710485234671432e-1),
+            static_cast<RealType>(6.73776735655426117231e-2),
+            static_cast<RealType>(3.80321995712675339999e-3),
+            static_cast<RealType>(1.09503400950148681072e-3),
+            static_cast<RealType>(-9.00045301380982997382e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[11] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.07919389927659014373e0),
+            static_cast<RealType>(2.56142472873207168042e0),
+            static_cast<RealType>(1.68357271228504881003e0),
+            static_cast<RealType>(2.23924151033591770613e0),
+            static_cast<RealType>(9.05629695159584880257e-1),
+            static_cast<RealType>(8.94372028246671579022e-1),
+            static_cast<RealType>(1.98616842716090037437e-1),
+            static_cast<RealType>(1.70142519339469434183e-1),
+            static_cast<RealType>(1.46288923980509020713e-2),
+            static_cast<RealType>(1.26171654901120724762e-2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        const static RealType lambda_bias = static_cast<RealType>(1.45158270528945486473); // (= log(pi/2)+1)
+
+        RealType sigma = exp(-x * constants::pi<RealType>() / 2 - lambda_bias);
+        RealType s = exp(-sigma) * sqrt(sigma);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 5.8685e-18
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(6.31126317567898819465e-1),
+                static_cast<RealType>(5.28493759149515726917e-1),
+                static_cast<RealType>(3.28301410420682938866e-1),
+                static_cast<RealType>(1.31682639578153092699e-1),
+                static_cast<RealType>(3.86573798047656547423e-2),
+                static_cast<RealType>(7.77797337463414935830e-3),
+                static_cast<RealType>(9.97883658430364658707e-4),
+                static_cast<RealType>(6.05131104440018116255e-5),
+            };
+            BOOST_MATH_STATIC const RealType Q[8] = {
+                static_cast<RealType>(1),
+                static_cast<RealType>(8.47781139548258655981e-1),
+                static_cast<RealType>(5.21797290075642096762e-1),
+                static_cast<RealType>(2.10939174293308469446e-1),
+                static_cast<RealType>(6.14856955543769263502e-2),
+                static_cast<RealType>(1.24427885618560158811e-2),
+                static_cast<RealType>(1.58973907730896566627e-3),
+                static_cast<RealType>(9.66647686344466292608e-5),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -5.1328125) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 3.2532e-17
+            BOOST_MATH_STATIC const RealType P[9] = {
+                static_cast<RealType>(6.26864481454444278646e-1),
+                static_cast<RealType>(5.10647753508714204745e-1),
+                static_cast<RealType>(1.98551443303285119497e-1),
+                static_cast<RealType>(4.71644854289800143386e-2),
+                static_cast<RealType>(7.71285919105951697285e-3),
+                static_cast<RealType>(8.93551020612017939395e-4),
+                static_cast<RealType>(6.97020145401946303751e-5),
+                static_cast<RealType>(4.17249760274638104772e-6),
+                static_cast<RealType>(7.73502439313710606153e-12),
+            };
+            BOOST_MATH_STATIC const RealType Q[8] = {
+                static_cast<RealType>(1),
+                static_cast<RealType>(8.15124079722976906223e-1),
+                static_cast<RealType>(3.16755852188961901369e-1),
+                static_cast<RealType>(7.52819418000330690962e-2),
+                static_cast<RealType>(1.23053506566779662890e-2),
+                static_cast<RealType>(1.42615273721494498141e-3),
+                static_cast<RealType>(1.11211928184477279204e-4),
+                static_cast<RealType>(6.65899898061789485757e-6),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2803e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21762208692280384264052188465103527015e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07121154108880017947709737976750200391e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34036993772851526455115746887751392080e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.06347688547967680654012636399459376006e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68662427153576049083876306225433068713e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67496398036468361727297056409545434117e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.69289909624425652939466055042210850769e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65649060232973461318206716040181929160e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.93006819232611588097575675157841312689e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34514211575975820725706925256381036061e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86184594939834946952489805173559003431e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66982890863184520310462776294335540260e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.28944885271022303878175622411438230193e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.47136245900831864668353768185407977846e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98034330388999615249606466662289782222e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.67931741921878993598048665757824165533e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.81019852414657529520034272090632311645e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.51602582973416348091361820936922274106e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.87246706500788771729605610442552651673e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.55758863380051182011815572544985924963e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.16921634066377885762356020006515057786e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.28590978860106110644638308039189352463e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07182688002603587927920766666962846169e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.14413931232875917473403467095618397172e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59534588679183116305361784906322155131e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.62788361787003488572546802835677555151e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32291670834750583053201239125839728061e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97300476673137879475887158731166178829e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99801949382703479169010768105376163814e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09234481837537672361990844588166022791e-5),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.8590e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.50763682207511020788551990942118742910e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.35160148798611192350830963080055471564e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.85567614778755464918744664468938413626e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24395902843792338723377508551415399267e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75803588325237557939443967923337822799e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44751743702858358960016891543930028989e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.38771920793989989423514808134997891434e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.99899457801652012757624005300136548027e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.59668432891116320233415536189782241116e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.02521376213276025040458141317737977692e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.00511857068867825025582508627038721402e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19031970665203475373248353773765801546e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.03203906044415590651592066934331209362e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01354553335348149914596284286907046333e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40077709279222086527834844446288408059e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.07036291955272673946830858788691198641e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75229595324028909877518859428663744660e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.51522041748753421579496885726802106514e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.28554063325397021905295499768922434904e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.55889733194498836168215560931863059152e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.45050534010127542130960211621894286688e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39437268390909980446225806216001154876e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85370557677145869100298813360909127310e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99358236671478050470186012149124879556e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82914467302553175692644992910876515874e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42426383410763382224410804289834740252e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.69477085497572590673874940261777949808e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.69832833104494997844651343499526754631e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95708391432781281454592429473451742972e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32541987059874996779040445020449508142e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.24889827757289516008834701298899804535e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76326709965329347689033555841964826234e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.19652942193884551681987290472603208296e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22987197033955835618810845653379470109e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51893290463268547258382709202599507274e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.43575882043846146581825453522967678538e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06683418138599962787868832158681391673e-5),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        const static RealType lambda_bias = BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.451582705289454864726195229894882143572); // (= log(pi/2)+1)
+
+        RealType sigma = exp(-x * constants::pi<RealType>() / 2 - lambda_bias);
+        RealType s = exp(-sigma) * sqrt(sigma);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 7.0019e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[18] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.31126317567898819464557840628449107915e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.31008645911415314700225107327351636697e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.60743397071713227215207831174512626190e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69243936604887410595461520921270733657e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93778117053417749769040328795824088196e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.04718815412035890861219665332918840537e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41914050146414549019258775115663029791e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17147074474397510167661838243237386450e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31006358624990533313832878493963971249e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.31424805670861981190416637260176493218e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71604447221961082506919140038819715820e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.01796816886825676412069047911936154422e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.16975381608692872525287947181531051179e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47194712963929503930146780326366215579e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19469248860267489980690249379132289464e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22272545853285700254948346226514762534e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.05432616288832680241611577865488417904e-13),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08723511461992818779941378551362882730e-14),
+            };
+            BOOST_MATH_STATIC const RealType Q[16] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01021278581037282130358759075689669228e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.91783545335316986601746168681457332835e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.90025337163174587593060864843160047245e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.09029833197792884728968597136867674585e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44295160726145715084515736090313329125e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.46416375246465800703437031839310870287e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86521610039165178072099210670199368231e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.29830357713744587265637686549132688965e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32187562202835921333177458294507064946e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75034541113922116856456794810138543224e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79216314818261657918748858010817570215e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.69179323869133503169292092727333289999e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.09019623876540244217038375274802731869e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13900582194674129200395213522524183495e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92590979457175565666605415984496551246e-9),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -6.875) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 6.4095e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[18] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.26864481454444278645937156746132802908e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35052316263030534355724898036735352905e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46701697626917441774916114124028252971e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03805679118924248671851611170709699862e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.29457230118834515743802694404620370943e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04992992250026414994541561073467805333e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.21521951889983113700615967351903983850e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50611640491200231504944279876023072268e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.96007721851412367657495076592244098807e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.76876967456744990483799856564174838073e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.34285198828980523126745002596084187049e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.98811180672843179022928339476420108494e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36933707823930146448761204037985193905e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.76515121042989743198432939393805252169e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87259915481622487665138935922067520210e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34703958446785695676542385299325713141e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53199672688507288037695102377982544434e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.97283413733676690377949556457649405210e-14),
+            };
+            BOOST_MATH_STATIC const RealType Q[18] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15492787140203223641846510939273526038e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34095796298757853634036909432345998054e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65650140652391522296109869665871008634e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.44894089102275258806976831589022821974e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27121975866547045393504246592187721233e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.91803733484503004520983723890062644122e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40341451263971324381655967408519161854e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72360046810103129487529493828280649599e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.60986435254173073868329335245110986549e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01216966786091058959421242465309838187e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11514619470960373138100691463949937779e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01639426441970732201346798259534312372e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.60411422906070056043690129326288757143e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.58398956202137709744885774931524547894e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14956902064425256856583295469934064903e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.23201118234279642321630988607491208515e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43185798646451225275728735761433082676e-13),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53> &tag) {
+    if (x >= 0) {
+        return landau_pdf_plus_imp_prec<RealType>(x, tag);
+    }
+    else if (x <= 0) {
+        return landau_pdf_minus_imp_prec<RealType>(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>& tag) {
+    if (x >= 0) {
+        return landau_pdf_plus_imp_prec<RealType>(x, tag);
+    }
+    else if (x <= 0) {
+        return landau_pdf_minus_imp_prec<RealType>(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType landau_pdf_imp(const landau_distribution<RealType, Policy>& dist, const RealType& x) {
+    //
+    // This calculates the pdf of the Landau distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::pdf(landau<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+    RealType bias = dist.bias();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Landau distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale + bias;
+
+    result = landau_pdf_imp_prec(u, tag_type()) / scale;
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 2.7348e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(6.34761298487625202628e-1),
+            static_cast<RealType>(7.86558857265845597915e-1),
+            static_cast<RealType>(4.30220871807399303399e-1),
+            static_cast<RealType>(1.26410946316538340541e-1),
+            static_cast<RealType>(2.09346669713191648490e-2),
+            static_cast<RealType>(1.48926177023501002834e-3),
+            static_cast<RealType>(-5.93750588554108593271e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.65227304522196452589e0),
+            static_cast<RealType>(1.29276828719607419526e0),
+            static_cast<RealType>(5.93815051307098615300e-1),
+            static_cast<RealType>(1.69165968013666952456e-1),
+            static_cast<RealType>(2.84272940328510367574e-2),
+            static_cast<RealType>(2.28001970477820696422e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.1487e-17
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(4.22133240358047652363e-1),
+            static_cast<RealType>(3.48421126689016131480e-1),
+            static_cast<RealType>(1.15402429637790321091e-1),
+            static_cast<RealType>(1.90374044978864005061e-2),
+            static_cast<RealType>(1.26628667888851698698e-3),
+            static_cast<RealType>(-5.75103242931559285281e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.21277435324167238159e0),
+            static_cast<RealType>(6.38324046905267845243e-1),
+            static_cast<RealType>(1.81723381692749892660e-1),
+            static_cast<RealType>(2.80457012073363245106e-2),
+            static_cast<RealType>(1.93749385908189487538e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.2975e-17
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(2.95892137955791216378e-1),
+            static_cast<RealType>(2.29083899043580095868e-1),
+            static_cast<RealType>(7.09374171394372356009e-2),
+            static_cast<RealType>(1.08774274442674552229e-2),
+            static_cast<RealType>(7.69674715320139398655e-4),
+            static_cast<RealType>(1.63486840000680408991e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.09704883482087441931e0),
+            static_cast<RealType>(5.10139057077147935327e-1),
+            static_cast<RealType>(1.27055234007499238241e-1),
+            static_cast<RealType>(1.74542139987310825683e-2),
+            static_cast<RealType>(1.18944143641885993718e-3),
+            static_cast<RealType>(2.55296292914537992309e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.6740e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.73159318667565938776e-1),
+            static_cast<RealType>(6.95847424776057206679e-2),
+            static_cast<RealType>(1.04513924567165899506e-2),
+            static_cast<RealType>(6.35094718543965631442e-4),
+            static_cast<RealType>(1.04166111154771164657e-5),
+            static_cast<RealType>(1.43633490646363733467e-9),
+            static_cast<RealType>(-4.55493341295654514558e-11),
+            static_cast<RealType>(6.71119091495929467041e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(6.23409270429130114247e-1),
+            static_cast<RealType>(1.54791925441839372663e-1),
+            static_cast<RealType>(1.85626981728559445893e-2),
+            static_cast<RealType>(1.01414235673220405086e-3),
+            static_cast<RealType>(1.63385654535791481980e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.6772e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(8.90469147411748292410e-2),
+            static_cast<RealType>(2.76033447621178662228e-2),
+            static_cast<RealType>(3.26577485081539607943e-3),
+            static_cast<RealType>(1.77755752909150255339e-4),
+            static_cast<RealType>(4.20716551767396206445e-6),
+            static_cast<RealType>(3.19415703637929092564e-8),
+            static_cast<RealType>(-1.79900915228302845362e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.36499987260915480890e-1),
+            static_cast<RealType>(7.67544181756713372678e-2),
+            static_cast<RealType>(6.83535263652329633233e-3),
+            static_cast<RealType>(3.15983778969051850073e-4),
+            static_cast<RealType>(6.84144567273078698399e-6),
+            static_cast<RealType>(5.00300197147417963939e-8),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.5678e-20
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(4.35157264931262089762e-2),
+            static_cast<RealType>(8.46833474333913742597e-3),
+            static_cast<RealType>(6.43769318301002170686e-4),
+            static_cast<RealType>(2.39440197089740502223e-5),
+            static_cast<RealType>(4.45572968892675484685e-7),
+            static_cast<RealType>(3.76071815793351687179e-9),
+            static_cast<RealType>(1.04851094362145160445e-11),
+            static_cast<RealType>(-8.50646541795105885254e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(2.59832721225510968607e-1),
+            static_cast<RealType>(2.75929030381330309762e-2),
+            static_cast<RealType>(1.53115657043391090526e-3),
+            static_cast<RealType>(4.70173086825204710446e-5),
+            static_cast<RealType>(7.76185172490852556883e-7),
+            static_cast<RealType>(6.10512879655564540102e-9),
+            static_cast<RealType>(1.64522607881748812093e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.2534e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.11253031965493064317e-2),
+            static_cast<RealType>(1.36656844320536022509e-3),
+            static_cast<RealType>(2.99036224749763963099e-5),
+            static_cast<RealType>(2.54538665523638998222e-7),
+            static_cast<RealType>(6.79286608893558228264e-10),
+            static_cast<RealType>(-6.92803349600061706079e-16),
+            static_cast<RealType>(5.47233092767314029032e-19),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(9.71506209641408410168e-2),
+            static_cast<RealType>(3.52744690483830496158e-3),
+            static_cast<RealType>(5.85142319429623560735e-5),
+            static_cast<RealType>(4.29686638196055795330e-7),
+            static_cast<RealType>(1.06586221304077993137e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(x) < 8) {
+        RealType t = log2(ldexp(x, -6));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.8057e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(6.60754766433212615409e-1),
+            static_cast<RealType>(2.47190065739055522599e-1),
+            static_cast<RealType>(4.17560046901040308267e-2),
+            static_cast<RealType>(3.71520821873148657971e-3),
+            static_cast<RealType>(2.03659383008528656781e-4),
+            static_cast<RealType>(2.52070598577347523483e-6),
+            static_cast<RealType>(-1.63741595848354479992e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(3.92836792184266080580e-1),
+            static_cast<RealType>(6.64332913820571574875e-2),
+            static_cast<RealType>(5.59456053716889879620e-3),
+            static_cast<RealType>(3.44201583106671507027e-4),
+            static_cast<RealType>(2.74554105716911980435e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 16) {
+        RealType t = log2(ldexp(x, -8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.5585e-18
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.44802371584831601817e-1),
+            static_cast<RealType>(2.74177359656349204309e-1),
+            static_cast<RealType>(5.53659240731871433983e-2),
+            static_cast<RealType>(6.97653365560511851744e-3),
+            static_cast<RealType>(6.17058143529799037402e-4),
+            static_cast<RealType>(3.94979574476108021136e-5),
+            static_cast<RealType>(1.88315864113369221822e-6),
+            static_cast<RealType>(6.10941845734962836501e-8),
+            static_cast<RealType>(1.39403332890347813312e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.32345127287830884682e-1),
+            static_cast<RealType>(8.70500634789942065799e-2),
+            static_cast<RealType>(1.09253956356393590470e-2),
+            static_cast<RealType>(9.72576825490118007977e-4),
+            static_cast<RealType>(6.18656322285414147985e-5),
+            static_cast<RealType>(2.96375876501823390564e-6),
+            static_cast<RealType>(9.58622809886777038970e-8),
+            static_cast<RealType>(2.19059124630695181004e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 32) {
+        RealType t = log2(ldexp(x, -16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.4773e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.36685748306554972132e-1),
+            static_cast<RealType>(2.22217783148381285219e-1),
+            static_cast<RealType>(3.79173960692559280353e-2),
+            static_cast<RealType>(4.13394722917837684942e-3),
+            static_cast<RealType>(3.18141233442663766089e-4),
+            static_cast<RealType>(1.79745613243740552736e-5),
+            static_cast<RealType>(7.47632665728046334131e-7),
+            static_cast<RealType>(2.18258684729250152138e-8),
+            static_cast<RealType>(3.93038365129320422968e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(3.49087806008685701060e-1),
+            static_cast<RealType>(5.95568283529034601477e-2),
+            static_cast<RealType>(6.49386742119035055908e-3),
+            static_cast<RealType>(4.99721374204563274865e-4),
+            static_cast<RealType>(2.82348248031305043777e-5),
+            static_cast<RealType>(1.17436903872210815656e-6),
+            static_cast<RealType>(3.42841159307801319359e-8),
+            static_cast<RealType>(6.17382517100568714012e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 64) {
+        RealType t = log2(ldexp(x, -32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.1441e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.36619774420718062663e-1),
+            static_cast<RealType>(2.68594096777677177874e-1),
+            static_cast<RealType>(5.50713044649497737064e-2),
+            static_cast<RealType>(7.26574134143434960446e-3),
+            static_cast<RealType>(6.89173530168387629057e-4),
+            static_cast<RealType>(4.87688310559244353811e-5),
+            static_cast<RealType>(2.84218580121660744969e-6),
+            static_cast<RealType>(9.65240367429172366675e-8),
+            static_cast<RealType>(5.21722720068664704240e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.21906621389193043384e-1),
+            static_cast<RealType>(8.65058026826346828750e-2),
+            static_cast<RealType>(1.14129998157398060009e-2),
+            static_cast<RealType>(1.08255124950652385121e-3),
+            static_cast<RealType>(7.66059006900869004871e-5),
+            static_cast<RealType>(4.46449501653114622960e-6),
+            static_cast<RealType>(1.51619602364037777665e-7),
+            static_cast<RealType>(8.19520132288940649002e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else {
+        result = 2 / (constants::pi<RealType>() * x);
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 2.6472e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.34761298487625202628055609797763667089e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67589195401255255724121983550745957195e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07502511824371206858547365520593277966e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58354381655514028012912292026393699991e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.26470588572701739953294573496059174764e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.09494168186680012705692462031819276746e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.47385718073281027400744626077865581325e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69107567947502492044754464589464306928e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39641345689672620514703813504927833352e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27003930699448633502508661352994055898e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26124673422692247711088651516214728305e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.92103390710025598612731036700549416611e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.49572523814120679048097861755172556652e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.50719933268462244255954307285373705456e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05332427324361912631483249892199461926e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46280417679002004953145547112352398783e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.10429833573651169023447466152999802738e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.63535585818618617796313647799029559407e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24103322502244219003850826414302390557e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.38359438431541204276767900393091886363e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16687583686405832820912406970664239423e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31451667102532056871497958974899742424e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31646175307279119467894327494418625431e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.22334681489114534492425036698050444462e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86326948577818727263376488455223120476e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53867591038308710930446815360572461884e-7),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2387e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.22133240358047652363270514524313049653e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.35860518549481281929441026718420080571e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.89900189271177970319691370395978805326e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84682995288088652145572170736339265315e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.10748045562955323875797887939420022326e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00246325517647746481631710824413702051e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02998394686245118431020407235000441722e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.06095284318730009040434594746639110387e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91754425158654496372516241124447726889e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.37288564874584819097890713305968351561e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.77487285800889132325390488044487626942e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.41654614425073025870130302460301244273e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13058739144695658589427075788960660400e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11792528400843967390452475642793635419e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28794756779085737559146475126886069030e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.29339015472607099189295465796550367819e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53434372685847620864540166752049026834e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.17610372643685730837081191600424913542e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.64455304425865128680681864919048610730e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.62357689170951502920019033576939977973e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.89912258835489782923345357128779660633e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.76323449710934127736624596886862488066e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21524231900555452527639738371019517044e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2281e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95892137955791216377776422765473500279e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.65957634570689820998348206103212047458e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.34657686985192350529330481818991619730e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43985500841002490334046057189458709493e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.09876223028004323158413173719329449720e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.04194660038290410425299531094974709019e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09780604136364125990393172827373829860e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02676079027875648517286351062161581740e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.30298199082321832830328345832636435982e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33633965123855006982811143987691483957e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46384114966020719170903077536685621119e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.07058773850795175564735754911699285828e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.76765053309825506619419451346428518606e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89758965744489334954041814073547951925e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65985298582650601001220682594742473012e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.81017086203232617734714711306180675445e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14481301672800918591822984940714490526e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.90605450026850685321372623938646722657e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42447999818015246265718131846902731574e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83426770079526980292392341278413549820e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65073357441521690641768959521412898756e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.90437453546925074707222505750595530773e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.63458145595422196447107547750737429872e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.94457070577990681786301801930765271001e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.80986568964737305842778359322566801845e-11),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.3269e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73159318667565938775602634998889798568e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95149372103869634275319490207451722385e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.87504411659823400690797222216564651939e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.94571385159717824767058200278511014560e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.71656210265434934399632978675652106638e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.51248899957476233641240573020681464290e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.74490600490886011190565727721143414249e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.07537323853509621126318424069471060527e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59167561354023258538869598891502822922e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.72608361427131857269675430568328018022e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.54143016370650707528704927655983490119e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07936446902207128577031566135957311260e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.73506415766100115673754920344659223382e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66918494546396383814682000746818494148e-21),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34854858486201481385140426291984169791e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.25379978655428608198799717171321453517e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.01905621587554903438286661709763596137e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.31293339647901753103699339801273898688e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22793491714510746538048140924864505813e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45360205736839126407568005196865547577e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20918479556021574336548106785887700883e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.91450617548036413606169102407934734864e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59940586452863361281618661053014404930e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.93918243796178165623395356401173295690e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.14578198844767847381800490360878776998e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.25951924258762195043744665124187621023e-13),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.8719e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.90469147411748292410422813492550092930e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.20196598836093298098360769875443462143e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92579652651763461802771336515384878994e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.50439147419887323351995227585244144060e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13214742069751393867851080954754449610e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29648648382394801501422003194522139519e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.80420399625810952886117129805960917210e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.73059844436212109742132138573157222143e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66835461298243901306176013397428732836e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.61808423521250921041207160217989047728e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39300098366988229510997966682317724011e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09447823064238788960158765421669935819e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76962456941948786610101052244821659252e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.56004343709960620209823076030906442732e-25),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.22996422556023111037354479836605618488e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05244279198013248402385148537421114680e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72477335169177427114629223821992187549e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.76404568980852320252614006021707040788e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.79959793426748071158513573279263946303e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.93524788220877416643145672816678561612e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.46692111397574773931528693806744007042e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20764040991846422990601664181377937629e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84452460717254884659858711994943474216e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30317379590981344496250492107505244036e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83736710938966780518785861828424593249e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72943283576264035508862984899450025895e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77791087299927741360821362607419036797e-18),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.3269e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35157264931262089761621934621402648954e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51407493866635569361305338029611888082e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30886132894858313459359493329266696766e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.02488735053241778868198537544867092626e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12676055870976203566712705442945186614e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.14136757304740001515364737551021389293e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01514327671186735593984375829685709678e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63783530594707477852365258482782354261e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67623013776194044717097141295482922572e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01397549144502050693284434189497148608e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.16720246008161901837639496002941412533e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70776057051329137176494230292143483874e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.02838174509144355795908173352005717435e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.07343581702278433243268463675468320030e-30),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13166129191902183515154099741529804400e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.58587877615076239769720197025023333190e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.14619910799508944167306046977187889556e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.66671218029939293563302720748492945618e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67192565058098643223751044962155343554e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.68397391192695060767615969382391508636e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94009678375859797198831431154760916459e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91901267471125881702216121486397689200e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83697721782125852878533856266722593909e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65409094893730117412328297801448869154e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.04202174160401885595563150562438901685e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.82104711207466136473754349696286794448e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0937e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11253031965493064317003259449214452745e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66886306590939856622089350675801752704e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77786526684921036345823450504680078696e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20343424607276252128027697088363135591e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29196073776799916444272401212341853981e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.92132293422644089278551376756604946339e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07465707745270914645735055945940815947e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.54424785613626844024154493717770471131e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74829439628215654062512023453584521531e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.03470347880592072854295353687395319489e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21113051919776165865529140783521696702e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.83719812218384126931626509884648891889e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.41009036423458926116066353864843586169e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04965807080681693416200699806159303323e-34),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06133417626680943824361625182288165823e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87991711814130682492211639336942588926e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.98342969282034680444232201546039059255e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41940454945139684365514171982891170420e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.90481418770909949109210069475433304086e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25451856391453896652473393039014954572e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36349120987010174609224867075354225138e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94716367816033715208164909918572061643e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.67466470065187852967064897686894407151e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31509787633232139845762764472649607555e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93147765040455324545205202900563337981e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07370974123835247210519262324524537634e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(x) < 8) {
+        RealType t = log2(ldexp(x, -6));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.1671e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.60754766433212615408805486898847664740e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.76143516602438873568296501921670869526e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.25254763859315398784817302471631188095e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.58650277225655302085863010927524053686e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92227773746592457803942136197158658110e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77170481512334811333255898903061802339e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.97864282716826576471164657368231427231e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.44243747123065035356982629201975914275e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54592817957461998135980337838429682406e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.52110831321633404722419425039513444319e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75030698219998735693228347424295850790e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.08894662488905377548940479566994482806e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11472306961184868827300852021969296872e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04202386226609593823214781180612848612e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.07648212684952405730772649955008739292e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50646784687432427178774105515508540021e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02521400964223268224629095722841793118e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35374201758795213489427690294679848997e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.67290684433876221744005507243460683585e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83834977086311601362115427826807705185e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43236252790815493406777552261402865674e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17693398496807851224497995174884274919e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34161978291568722756523120609497435933e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10819003833429876218381886615930538464e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75674945131892236663189757353419870796e-12),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 16) {
+        RealType t = log2(ldexp(x, -8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.8517e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.44802371584831601817146389426921705500e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.32962058761590152378007743852342151897e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93461601407042255925193793376118641680e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.55533612685775705468614711945893908392e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76358919439168503100357154639460097607e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74131615534562303144125602950691629908e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.34470363614899824502654995633001232079e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29020592733459891982428815398092077306e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65794017754267756566941255128608603072e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78550878208007836345763926019855723350e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00524022519953193863682806155339574713e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.75977976583947697667784048133959750133e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89287460618943500291479647438555099783e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.27647727947590174240069836749437647626e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70582660582766959108625375415057711766e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.68499175244574169768386088971844067765e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84493774639724473576782806157757824413e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.03526708437207438952843827018631758857e-20),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.88770963972332750838571146142568699263e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.60273143287476497658795203149608758815e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34393017137025732376113353720493995469e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77086140458900002000076127880391602253e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30613589576665986239534705717153313682e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.25355055770024448240128702278455001334e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.16820392686312531160900884133254461634e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.17518073757769640772428097588524967431e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80469112215756035261419102003591533407e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57898123952200478396366475124854317231e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.47675840885248141425130440389244781221e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.97339213584115778189141444065113447170e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.85845602624148484344802432304264064957e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67971825826765902713812866354682255811e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.78795543918651402032912195982033010270e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.18166403020940538730241286150437447698e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.47995312365747437038996228794650773820e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 32) {
+        RealType t = log2(ldexp(x, -16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.5315e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36685748306554972131586673701426039950e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75892450098649456865500477195142009984e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.77167300709199375935767980419262418694e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.76657987434662206916119089733639111866e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.55003354250569146980730594644539195376e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.64102805555049236216024194001407792885e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36247488122195469059567496833809879653e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63710218182036673197103906176200862606e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.60629446465979003842091012679929186607e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22712292003775206105713577811447961965e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.28539646473359376707298867613704501434e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47893806904387088760579412952474847897e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.86809622035928392542821045232270554753e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47935154807866802001012566914901169147e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.40623855123515207599160827187101517978e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.60738876249485914019826585865464103800e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29257874466803586327275841282905821499e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.06781616867813418930916928811492801723e-31),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.33391038950576592915531240096703257292e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.06598147816889621749840662500099582486e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21997213397347849640608088189055469954e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18596259982438670449688554459343971428e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.86085649929528605647139297483281849158e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28178198640304770056854166079598253406e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57155234493390297220982397633114062827e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03771216318243964850930846579433365529e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.49837117625052865973189772546210716556e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.87302306206908338457432167186661027909e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32312467403555290915110093627622951484e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.50516769529388616534895145258103120804e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.03618834064000582669276279973634033592e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.49205787058220657972891114812453768100e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.23730041323226753771240724078738146658e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60115971929371066362271909482282503973e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 64) {
+        RealType t = log2(ldexp(x, -32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0538e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619774420718062663274858007687066488e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30268560944740805268408378762250557522e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.09208091036436297425427953080968023835e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.74943166696408995577495065480328455423e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.03759498310898586326086395411203400316e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67261192787197720215143001944093963953e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42934578939412238889174695091726883834e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.32436794923711934610724023467723195718e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35077626369701051583611707128788137675e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.40836846523442062397035620402082560833e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98783806012035285862106614557391807137e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53869567415427145730376778932236900838e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.76521311340629419738016523643187305675e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41298928566351198899106243930173421965e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85552706372195482059144049293491755419e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89780987301820615664133438159710338126e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37965575161090804572561349091024723962e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.58944184323201470938493323680744408698e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35050162268451658064792430214910233545e-40),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61705010674524952791495931314010679992e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.42782564900556152436041716057503104160e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.46038982970912591009739894441944631471e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.34223936001873800295785537132905986678e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.19812900355867749521882613003222797586e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24521111398180921205229795007228494287e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.93429394949368809594897465724934596442e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69259071867341718986156650672535675726e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16370379759046264903196063336023488714e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.12248872253003553623419554868303473929e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12936649424676303532477421399492615666e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37683645610869385656713212194971883914e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21951837982136344238516771475869548147e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91465509588513270823718962232280739302e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98107277753797219142748868489983891831e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.16715818685246698314459625236675887448e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.77987471623502330881961633434056523159e-26),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else if (ilogb(x) < 128) {
+        RealType t = log2(ldexp(x, -64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.2309e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619772367581344040890134127619524371e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72522424358877592972375801826826390634e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74749058021341871895402838175268752603e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.95136532385982168410320513292144834602e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.10500792867575154180588502397506694341e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.48101840822895419487033057691746982216e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.22577211783918426674527460572438843266e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30499751609793470641331626931224574780e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07043764292750472900578756659402327450e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.28345765853059515246787820662932506931e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48838700086419232178247558529254516870e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.51015062047870581993810118835353083110e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19087584836023628483830612541904830502e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74405125338538967114280887107628943111e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.34493122865874905104884954420903910585e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.33794243240353561095702650271950891264e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07931799710240978706633227327649731325e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60935135769719557933955672887720342220e-23),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.28077223152164982690351137450174450926e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.02813709168750724641877726632095676090e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24899754437233214579860634420198464016e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27313166830073839667108783881090842820e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01803599095361490387188839658640162684e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.63782732057408167492988043000134055952e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.62068163155799642595981598061154626504e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68143951757351157612001096085234448512e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72843955600132743549395255544732133507e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33795283380674591910584657171640729449e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.08452802793967494363851669977089389376e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87062340827301546650149031133192913586e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.31034562935470222182311379138749593572e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.39579834094849668082821388907704276985e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46680056726416759571957577951115309094e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69538874529209016624246362786229032706e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52796320119313458991885552944744518437e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * x);
+    }
+    else {
+        result = 2 / (constants::pi<RealType>() * x);
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.8279e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(9.61609610406317335842e-2),
+            static_cast<RealType>(3.91836314722738553695e-1),
+            static_cast<RealType>(6.79862925205625107133e-1),
+            static_cast<RealType>(6.52516594941817706368e-1),
+            static_cast<RealType>(3.78594163612581127974e-1),
+            static_cast<RealType>(1.37741592243008345389e-1),
+            static_cast<RealType>(3.16100502353317199197e-2),
+            static_cast<RealType>(3.94935603975622336575e-3),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.76863983252615276767e0),
+            static_cast<RealType>(1.81486018095087241378e0),
+            static_cast<RealType>(1.17295504548962999723e0),
+            static_cast<RealType>(5.33998066342362562313e-1),
+            static_cast<RealType>(1.66508320794082632235e-1),
+            static_cast<RealType>(3.42192028846565504290e-2),
+            static_cast<RealType>(3.94691613177524994796e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.3675e-17
+        BOOST_MATH_STATIC const RealType P[11] = {
+            static_cast<RealType>(7.07114056489178077423e-4),
+            static_cast<RealType>(7.35277969197058909845e-3),
+            static_cast<RealType>(3.45402694579204809691e-2),
+            static_cast<RealType>(9.62849773112695332289e-2),
+            static_cast<RealType>(1.75738736725818007992e-1),
+            static_cast<RealType>(2.18309266582058485951e-1),
+            static_cast<RealType>(1.85680388782727289455e-1),
+            static_cast<RealType>(1.06177394398691169291e-1),
+            static_cast<RealType>(3.94880388335722224211e-2),
+            static_cast<RealType>(9.46543177731050647162e-3),
+            static_cast<RealType>(1.50949646857411896396e-3),
+        };
+        BOOST_MATH_STATIC const RealType Q[11] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.19520021153535414164e0),
+            static_cast<RealType>(2.24057032777744601624e0),
+            static_cast<RealType>(1.63635577968560162720e0),
+            static_cast<RealType>(1.58952087228427876880e0),
+            static_cast<RealType>(7.63062254749311648018e-1),
+            static_cast<RealType>(4.65805990343825931327e-1),
+            static_cast<RealType>(1.45821531714775598887e-1),
+            static_cast<RealType>(5.42393925507104531351e-2),
+            static_cast<RealType>(9.84276292481407168381e-3),
+            static_cast<RealType>(1.54787649925009672534e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        const static RealType lambda_bias = static_cast<RealType>(1.45158270528945486473); // (= log(pi/2)+1)
+
+        RealType sigma = exp(-x * constants::pi<RealType>() / 2 - lambda_bias);
+        RealType s = exp(-sigma) / sqrt(sigma);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 6.6532e-17
+            BOOST_MATH_STATIC const RealType P[9] = {
+                static_cast<RealType>(3.71658823632747235572e-1),
+                static_cast<RealType>(2.81493346318174084721e-1),
+                static_cast<RealType>(1.80052521696460721846e-1),
+                static_cast<RealType>(7.65907659636944822120e-2),
+                static_cast<RealType>(2.33352148213280934280e-2),
+                static_cast<RealType>(5.02308701022480574067e-3),
+                static_cast<RealType>(6.29239919421134075502e-4),
+                static_cast<RealType>(8.36993181707604609065e-6),
+                static_cast<RealType>(-8.38295154747385945293e-6),
+            };
+            BOOST_MATH_STATIC const RealType Q[9] = {
+                static_cast<RealType>(1),
+                static_cast<RealType>(6.62107509936390708604e-1),
+                static_cast<RealType>(4.72501892305147483696e-1),
+                static_cast<RealType>(1.84446743813050604353e-1),
+                static_cast<RealType>(5.99971792581573339487e-2),
+                static_cast<RealType>(1.24751029844082800143e-2),
+                static_cast<RealType>(1.56705297654475773870e-3),
+                static_cast<RealType>(2.36392472352050487445e-5),
+                static_cast<RealType>(-2.11667044716450080820e-5),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -5.1328125) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.6331e-17
+            BOOST_MATH_STATIC const RealType P[10] = {
+                static_cast<RealType>(3.97500903816385095134e-1),
+                static_cast<RealType>(5.08559630146730380854e-1),
+                static_cast<RealType>(2.99190443368166803486e-1),
+                static_cast<RealType>(1.07339363365158174786e-1),
+                static_cast<RealType>(2.61694301269384158162e-2),
+                static_cast<RealType>(4.58386867966451237870e-3),
+                static_cast<RealType>(5.80610284231484509069e-4),
+                static_cast<RealType>(5.07249042503156949021e-5),
+                static_cast<RealType>(2.91644292826084281875e-6),
+                static_cast<RealType>(9.75453868235609527534e-12),
+            };
+            BOOST_MATH_STATIC const RealType Q[9] = {
+                static_cast<RealType>(1),
+                static_cast<RealType>(1.27376091725485414303e0),
+                static_cast<RealType>(7.49829208702328578188e-1),
+                static_cast<RealType>(2.69157374996960976399e-1),
+                static_cast<RealType>(6.55795320040378662663e-2),
+                static_cast<RealType>(1.14912646428788757804e-2),
+                static_cast<RealType>(1.45541420582309879973e-3),
+                static_cast<RealType>(1.27135040794481871472e-4),
+                static_cast<RealType>(7.31138551538712031061e-6),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2055e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.61609610406317335842332400044553397267e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74152295981095898203847178356629061821e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58642905042588731020840168744866124345e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69370085525311304330141932309908104187e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14888713497930800611167630826754270499e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69123861559106636252620023643265102867e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74273532954853421626852458737661546439e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.73534665976007761924923962996725209700e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42543389723715037640714282663089570985e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05120903211852044362181935724880384488e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49586169587615171270941258051088627885e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46047939521303565932576405363107506886e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.68248726161641913236972878212857788320e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.60663638253775180681171554635861859625e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76463460016745893121574217030494989443e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.08380585744336744543979680558024295296e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66458574743150749245922924142120646408e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.87010262350733534202724862784081296105e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.51107149980251214963849267707173045433e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.71158207369578457239679595370389431171e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.37188705505573668092513124472448362633e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95647530096628718695081507038921183627e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30278895428001081342301218278371140110e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.61322060563420594659487640090297303892e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30529729106312748824241317854740876915e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.90465740298431311519387111139787971960e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.92760416706194729215037805873466599319e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02070496615845146626690561655353212151e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72080705566714681586449384371609107346e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76433504120625478720883079263866245392e-6),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.4133e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07114056489178077422539043012078031613e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.18006784954579394004360967455655021959e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.60309646092161147676756546417366564213e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13479499932401667065782086621368143322e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.68587439643060549883916236839613331692e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12366494749830793876926914920462629077e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70739124754664545339208363069646589169e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04073482998938337661285862393345731336e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94833709787596305918524943438549684109e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50214412821697972546222929550410139790e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.43105005523280337071698704765973602884e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.85396789833278250392015217207198739243e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05690359993570736607428746439280858381e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.17297815188944531843360083791153470475e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.03913601629627587800587620822216769010e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.61963034255210565218722882961703473760e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.99502258440875586452963094474829571000e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.66563884565518965562535171848480872267e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.23954896921292896539048530795544784261e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77934931846682015134812629288297137499e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.85052416252910403272283619201501701345e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45276747409453182009917448097687214033e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87717215449690275562288513806049961791e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96583424263422661540930513525639950307e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73001838976297286477856104855182595364e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29209801725936746054703603946844929105e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.31809396176316042818100839595926947461e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.62125101720695030847208519302530333864e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22912823173107974750307098204717046200e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.28404310708078592866397210871397836013e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.33433860799478110495440617696667578486e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01779942752411055394079990371203135494e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.60870827161929649807734240735205100749e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.43275518144078080917466090587075581039e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.80287554756375373913082969626543154342e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00697535360590561244468004025972321465e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.23883308105457761862174623664449205327e-6),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        const static RealType lambda_bias = BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.451582705289454864726195229894882143572); // (= log(pi/2)+1)
+
+        RealType sigma = exp(-x * constants::pi<RealType>() / 2 - lambda_bias);
+        RealType s = exp(-sigma) / sqrt(sigma);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 9.2619e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[19] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.71658823632747235572391863987803415545e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20402452680758356732340074285765302037e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53870483364594487885882489517365212394e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.73525449564340671962525942038149851804e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.67339872142847248852186397385576389802e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.60644488744851390946293970736919678433e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33042051950636491987775324999025538357e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13846819893538329440033115143593487041e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41648498082970622389678372669789346515e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.74006867625631068946791714035394785978e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.12238896415831258936563475509362795783e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88070293465108791701905953972140154151e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.24813015654516014181209691083399092303e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.64092873079064926551281731026589848877e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.09892207654972883190432072151353819511e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.86990125202059013860642688739159455800e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62986611607135348214220687891374676368e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07567013469555215514702758084138467446e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.84619752008414239602732630339626773669e-14),
+            };
+            BOOST_MATH_STATIC const RealType Q[17] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.28669950018285475182750690468224641923e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12421557061005325313661189943328446480e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68376064122323574208976258468929505299e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22010354939562426718305463635398985290e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13795955314742199207524303721722785075e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.90452274425830801819532524004271355513e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.38324283887272345859359008873739301544e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15232844484261129757743512155821350773e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.79562237779621711674853020864686436450e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64370777996591099856555782918006739330e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.02327782881305686529414731684464770990e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27181015755595543140221119020333695667e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01121287947061613072815935956604529157e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44038164966032378909755215752715620878e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.39138685106442954199109662617641745618e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.83317957765031605023198891326325990178e-10),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -6.875) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 4.9208e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[20] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97500903816385095134217223320239082420e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02058997410109156148729828665298333233e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30492992901887465108077581566548743407e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08695332228530157560495896731847709498e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.54469321766529692240388930552986490213e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00543201281990041935310905273146022998e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08633547932070289660163851972658637916e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15432691192536747268886307936712580254e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.46179071338871656505293487217938889935e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45295210106393905833273975344579255175e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34638105523514101671944454719592801562e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15786069528793080046638424661219527619e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.54781306296697568446848038567723598851e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31977279631544580423883461084970429143e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.56616743805004179430469197497030496870e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60913959062328670735884196858280987356e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.91123354712008822789348244888916948822e-11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82453513391091361890763400931018529659e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.12671859603774617133607658779709622453e-14),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03211544596001317143519388487481133891e-20),
+            };
+            BOOST_MATH_STATIC const RealType Q[19] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.56188463983858614833914386500628633184e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27273165410457713017446497319550252691e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72495122287308474449946195751088057230e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64049710819255633163836824600620426349e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.53329810455612298967902432399110414761e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72302144446588066369304547920758875106e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.90680157119357595265085115978578965640e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87039785683949322939618337154059874729e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.64199530594973983893552925652598080310e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.88147828823178863054226159776600116931e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.91569503818223078110818909039307983575e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.89289385694964650198403071737653842880e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.32154679053642509246603754078168127853e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.43239674842248090516375370051832849701e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.03349866320207008385913232167927124115e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98307302768178927108235662166752511325e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07996042577029996321821937863373306901e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53576500935979732855511826033727522138e-13),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 53>& tag) {
+    if (x >= 0) {
+        return complement ? landau_cdf_plus_imp_prec(x, tag) : 1 - landau_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - landau_cdf_minus_imp_prec(x, tag) : landau_cdf_minus_imp_prec(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 113>& tag) {
+    if (x >= 0) {
+        return complement ? landau_cdf_plus_imp_prec(x, tag) : 1 - landau_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - landau_cdf_minus_imp_prec(x, tag) : landau_cdf_minus_imp_prec(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType landau_cdf_imp(const landau_distribution<RealType, Policy>& dist, const RealType& x, bool complement) {
+    //
+    // This calculates the cdf of the Landau distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::cdf(landau<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+    RealType bias = dist.bias();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Landau distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale + bias;
+
+    result = landau_cdf_imp_prec(u, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_lower_imp_prec(const RealType& p, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.375) {
+        RealType t = p - static_cast < RealType>(0.375);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 3.0596e-17
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(3.74557416577759554506e-2),
+            static_cast<RealType>(3.87808262376545756299e0),
+            static_cast<RealType>(4.03092288183382979104e0),
+            static_cast<RealType>(-1.65221829710249468257e1),
+            static_cast<RealType>(-6.99689838230114367276e0),
+            static_cast<RealType>(1.51123479911771488314e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.37863773851525662884e-1),
+            static_cast<RealType>(-6.35020262707816744534e0),
+            static_cast<RealType>(3.07646508389502660442e-1),
+            static_cast<RealType>(9.72566583784248877260e0),
+            static_cast<RealType>(-2.72338088170674280735e0),
+            static_cast<RealType>(-1.58608957980133006476e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - static_cast < RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 5.2780e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(-4.17764764050720190117e-1),
+            static_cast<RealType>(1.27887601021900963655e0),
+            static_cast<RealType>(1.80329928265996817279e1),
+            static_cast<RealType>(2.35783605878556791719e1),
+            static_cast<RealType>(-2.67160590411398800149e1),
+            static_cast<RealType>(-2.36192101013335692266e1),
+            static_cast<RealType>(8.30396110938939237358e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(5.37459525158081633669e0),
+            static_cast<RealType>(2.35696607501498012129e0),
+            static_cast<RealType>(-1.71117034150268575909e1),
+            static_cast<RealType>(-6.72278235529877170403e0),
+            static_cast<RealType>(1.27763043804603299034e1),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - static_cast < RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 6.3254e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-8.77109518013577785811e-1),
+            static_cast<RealType>(-1.03442936529923615496e1),
+            static_cast<RealType>(-1.03389868296950570121e1),
+            static_cast<RealType>(2.01575691867458616553e2),
+            static_cast<RealType>(4.59115079925618829199e2),
+            static_cast<RealType>(-3.38676271744958577802e2),
+            static_cast<RealType>(-5.38213647878547918506e2),
+            static_cast<RealType>(1.99214574934960143349e2),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.64177607733998839003e1),
+            static_cast<RealType>(8.10042194014991761178e1),
+            static_cast<RealType>(7.61952772645589839171e1),
+            static_cast<RealType>(-2.52698871224510918595e2),
+            static_cast<RealType>(-1.95365983250723202416e2),
+            static_cast<RealType>(2.61928845964255538379e2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.5192e-18
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(-8.77109518013577852585e-1),
+            static_cast<RealType>(-1.08703720146608358678e0),
+            static_cast<RealType>(-4.34198537684719253325e-1),
+            static_cast<RealType>(-6.97264194535092564620e-2),
+            static_cast<RealType>(-4.20721933993302797971e-3),
+            static_cast<RealType>(-6.27420063107527426396e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(8.38688797993971740640e-1),
+            static_cast<RealType>(2.47558526682310722526e-1),
+            static_cast<RealType>(3.03952783355954712472e-2),
+            static_cast<RealType>(1.39226078796010665644e-3),
+            static_cast<RealType>(1.43993679246435688244e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1196e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-1.16727296241754548410e0),
+            static_cast<RealType>(-1.12325365855062172009e0),
+            static_cast<RealType>(-3.96403456954867129566e-1),
+            static_cast<RealType>(-6.50024588048629862189e-2),
+            static_cast<RealType>(-5.08582387678609504048e-3),
+            static_cast<RealType>(-1.71657051345258316598e-4),
+            static_cast<RealType>(-1.81536405273085024830e-6),
+            static_cast<RealType>(-9.65262938333207656548e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(7.55271574611337871389e-1),
+            static_cast<RealType>(2.16323131117540100488e-1),
+            static_cast<RealType>(2.92693206540519768049e-2),
+            static_cast<RealType>(1.89396907936678571916e-3),
+            static_cast<RealType>(5.20017914327360594265e-5),
+            static_cast<RealType>(4.18896774212993675707e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0763e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-1.78348038398799868409e0),
+            static_cast<RealType>(-7.74779087785346936524e-1),
+            static_cast<RealType>(-1.27121601027522656374e-1),
+            static_cast<RealType>(-9.86675785835385622362e-3),
+            static_cast<RealType>(-3.69510132425310943600e-4),
+            static_cast<RealType>(-6.00811940375633438805e-6),
+            static_cast<RealType>(-3.06397799506512676163e-8),
+            static_cast<RealType>(-7.34821360521886161256e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(3.76606062137668223823e-1),
+            static_cast<RealType>(5.37821995022686641494e-2),
+            static_cast<RealType>(3.62736078766811383733e-3),
+            static_cast<RealType>(1.16954398984720362997e-4),
+            static_cast<RealType>(1.59917906784160311385e-6),
+            static_cast<RealType>(6.41144889614705503307e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.9936e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-2.32474749499506229415e0),
+            static_cast<RealType>(-4.81681429397597263092e-1),
+            static_cast<RealType>(-3.79696253130015182335e-2),
+            static_cast<RealType>(-1.42328672650093755545e-3),
+            static_cast<RealType>(-2.58335052925986849305e-5),
+            static_cast<RealType>(-2.03945574260603170161e-7),
+            static_cast<RealType>(-5.04229972664978604816e-10),
+            static_cast<RealType>(-5.49506755992282162712e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.87186049570056737301e-1),
+            static_cast<RealType>(1.32852903862611979806e-2),
+            static_cast<RealType>(4.45262195863310928309e-4),
+            static_cast<RealType>(7.13306978839226580931e-6),
+            static_cast<RealType>(4.84555343060572391776e-8),
+            static_cast<RealType>(9.65086092007764297450e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.2449e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-2.82318656228158372998e0),
+            static_cast<RealType>(-2.84346379198027589453e-1),
+            static_cast<RealType>(-1.09194719815749710073e-2),
+            static_cast<RealType>(-1.99728160102967185378e-4),
+            static_cast<RealType>(-1.77069359938827653381e-6),
+            static_cast<RealType>(-6.82828539186572955883e-9),
+            static_cast<RealType>(-8.22634582905944543176e-12),
+            static_cast<RealType>(-4.10585514777842307175e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(9.29910333991046040738e-2),
+            static_cast<RealType>(3.27860300729204691815e-3),
+            static_cast<RealType>(5.45852206475929614010e-5),
+            static_cast<RealType>(4.34395271645812189497e-7),
+            static_cast<RealType>(1.46600782366946777467e-9),
+            static_cast<RealType>(1.45083131237841500574e-12),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.6453e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-3.29700011190686231229e0),
+            static_cast<RealType>(-1.62920309130909343601e-1),
+            static_cast<RealType>(-3.07152472866757852259e-3),
+            static_cast<RealType>(-2.75922040607620211449e-5),
+            static_cast<RealType>(-1.20144242264703283024e-7),
+            static_cast<RealType>(-2.27410079849018964454e-10),
+            static_cast<RealType>(-1.34109445298156050256e-13),
+            static_cast<RealType>(-3.08843378675512185582e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.62324092774919223927e-2),
+            static_cast<RealType>(8.10410923007867515072e-4),
+            static_cast<RealType>(6.70843016241177926470e-6),
+            static_cast<RealType>(2.65459014339231700938e-8),
+            static_cast<RealType>(4.45531791525831169724e-11),
+            static_cast<RealType>(2.19324401673412172456e-14),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -256) {
+        RealType t = -log2(ldexp(p, 128));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.2028e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-3.75666995985336008568e0),
+            static_cast<RealType>(-9.15751436135409108392e-2),
+            static_cast<RealType>(-8.51745858385908954959e-4),
+            static_cast<RealType>(-3.77453552696508401182e-6),
+            static_cast<RealType>(-8.10504146884381804474e-9),
+            static_cast<RealType>(-7.55871397276946580837e-12),
+            static_cast<RealType>(-2.19023097542770265117e-15),
+            static_cast<RealType>(-2.34270094396556916060e-20),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(2.30119177073875808729e-2),
+            static_cast<RealType>(2.00787377759037971795e-4),
+            static_cast<RealType>(8.27382543511838001513e-7),
+            static_cast<RealType>(1.62997898759733931959e-9),
+            static_cast<RealType>(1.36215810410261098317e-12),
+            static_cast<RealType>(3.33957268115953023683e-16),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -512) {
+        RealType t = -log2(ldexp(p, 256));
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.8900e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-4.20826069989721597050e0),
+            static_cast<RealType>(-5.07864788729928381957e-2),
+            static_cast<RealType>(-2.33825872475869133650e-4),
+            static_cast<RealType>(-5.12795917403072758309e-7),
+            static_cast<RealType>(-5.44657955194364350768e-10),
+            static_cast<RealType>(-2.51001805474510910538e-13),
+            static_cast<RealType>(-3.58448226638949307172e-17),
+            static_cast<RealType>(-1.79092368272097571876e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(1.14671758705641048135e-2),
+            static_cast<RealType>(4.98614103841229871806e-5),
+            static_cast<RealType>(1.02397186002860292625e-7),
+            static_cast<RealType>(1.00544286633906421384e-10),
+            static_cast<RealType>(4.18843275058038084849e-14),
+            static_cast<RealType>(5.11960642868907665857e-18),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -1024) {
+        RealType t = -log2(ldexp(p, 512));
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.6777e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-4.65527239540648658214e0),
+            static_cast<RealType>(-2.78834161568280967534e-2),
+            static_cast<RealType>(-6.37014695368461940922e-5),
+            static_cast<RealType>(-6.92971221299243529202e-8),
+            static_cast<RealType>(-3.64900562915285147191e-11),
+            static_cast<RealType>(-8.32868843440595945586e-15),
+            static_cast<RealType>(-5.87602374631705229119e-19),
+            static_cast<RealType>(-1.37812578498484605190e-24),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(5.72000087046224585566e-3),
+            static_cast<RealType>(1.24068329655043560901e-5),
+            static_cast<RealType>(1.27105410419102416943e-8),
+            static_cast<RealType>(6.22649556008196699310e-12),
+            static_cast<RealType>(1.29416254332222127404e-15),
+            static_cast<RealType>(7.89365027125866583275e-20),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else{
+        result = -boost::math::numeric_limits<RealType>::infinity();
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_lower_imp_prec(const RealType& p, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.375) {
+        RealType t = p - 0.375;
+
+        // Rational Approximation
+        // Maximum Absolute Error: 2.5723e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.74557416577759248536854968412794870581e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.04379368253541440583870397314012269006e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12622841210720956864564105821904588447e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.57744422491408570970393103737579322242e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.13509711945094517370264490591904074504e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.18322789179144512109337184576079775889e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21447613719864832622177316196592738866e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49076304733407444404640803736504398642e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.96654951892056950374719952752959986017e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.73083458872938872583408218098970368331e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.22584946471889320670122404162385347867e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98534922151507267157370682137856253991e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.09159286510191893522643172277831735606e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.86204686129323171601167115178777357431e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.43698274248278918649234376575855135232e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.75240332521434608696943994815649748669e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.31438891446345558658756610288653829009e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10716029191240549289948990305434475528e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.10878330779477313404660683539265890549e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.52360069933886703736010179403700697679e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.15864312939821257811853678185928982258e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.10341116017481903631605786613604619909e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29121822170912306719250697890270750964e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.56489746112937744052098794310386515793e1),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - 0.25;
+
+        // Rational Approximation
+        // Maximum Absolute Error: 6.1583e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.17764764050720242897742634974454113395e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.80044093802431965072543552425830082205e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23613318632011593171919848575560968064e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77438013844838858458786448973516177604e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.62569530523012138862025718052954558264e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.02005706260864894793795986187582916504e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.29383609355165614630538852833671831839e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.09367754001841471839736367284852087164e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45744413840415901080013900562654222567e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.41920296534143581978760545125050148256e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.94857580745127596732818606388347624241e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.02847586753967876900858299686189155164e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.29953583375818707785500963989580066735e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27455303165341271216882778791555788609e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.41762124591820618604790027888328605963e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.30845760165840203715852751405553821601e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.00827370048057599908445731563638383351e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.19621193929561206904250173267823637982e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.10514757798726932158537558200005910184e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.79738493761540403010052092523396617472e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.94101664430520833603032182296078344870e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.31586575577250608890806988616823861649e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.93650751613703379272667745729529916084e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.52472388998113562780767055981852228229e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.01428305018551686265238906201345171425e0),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - 0.125;
+
+        // Rational Approximation
+        // Maximum Absolute Error: 1.3135e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.77109518013577849065583862782160121458e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.05813204052660740589813216397258899528e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.19628607167020425528944673039894592264e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.67162644860799051148361885190022738759e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.05921446080443979618622123764941760355e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.26685085062411656483492973256809500654e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17117538916032273474332064444853786788e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.45059470468014721314631799845029715639e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28952226224720891553119529857430570919e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.98502296814963504284919407719496390478e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.10876326351879104392865586365509749012e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.70358021544406445036220918341411271912e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.49724346845064961378591039928633169443e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.23815021378788622035604969476085727123e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.17262073948257994617723369387261569086e4),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.94901665980514882602824575757494472790e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.54328910175180674300123471690771017388e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84847502738788846487698327848593567941e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98451502799612368808473649408471338893e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.13744760159877712051088928513298431905e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.20745061658519699732567732006176366700e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.68622317228909264645937229979147883985e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.96020751551679746882793283955926871655e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.88860541272346724142574740580038834720e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.73454107207588310809238143625482857512e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.23165643368613191971938741926948857263e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.94832163019509140191456686231012184524e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.26616234097287315007047356261933409072e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24686019847093806280148917466062407447e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0498e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.77109518013577849065583862782160155093e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.77585398076895266354686007069850894777e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.47522378123968853907102309276280187353e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.63343576432650242131602396758195296288e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.77801189859227220359806456829683498508e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.93221663334563259732178473649683953515e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.95272757466323942599253855146019408376e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.73624853556509653351605530630788087166e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.41317699770351712612969089634227647374e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.34187895701093934279414993393750297714e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.64090928155753225614302094820737249510e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62401464973350962823995096121206419019e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11979822811128264831341485706314465894e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27257342406829987209876262928379300361e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.85505879705365729768944032174855501091e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40983451000610516082352700421098499905e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23459897865681009685618192649929504121e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.28925214684463186484928824536992032740e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67647262682850294124662856194944728023e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88173142080572819772032615169461689904e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.07756799117728455728056041053803769069e-11),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.7643e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.16727296241754547290632950718657117630e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.97822895738734630842909028778257589627e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.45580723831325060656664869189975355503e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.13835678647158936819843386298690513648e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.64536831064884519168892017327822018961e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.93786616484143556451247457584976578832e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.55770899078184683328915310751857391073e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.91778173446401005072425460365992356304e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.59064619930808759325013814591048817325e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.54786673836080683521554567617693797315e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.15917340396537949894051711038346411232e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.29633344043292285568750868731529586549e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.27785620133198676852587951604694784533e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.89999814745618370028655821500875451178e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48772690114094395052120751771215809418e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.72281013057830222881716429522080327421e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.67186370229687087768391373818683340542e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.86988148601521223503040043124617333773e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43321724586909919175166704060749343677e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57428821868404424742036582321713763151e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17165774858274087452172407067668213010e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.78674439389954997342198692571336875222e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82045374895858670592647375231115294575e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40152058277291349447734231472872126483e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.34789603687129472952627586273206671442e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38087376350052845654180435966624948994e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34945081364333330292720602508979680233e-16),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.4987e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.78348038398799867332294266481364810762e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.42913983922316889357725662957488617770e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.02077376277824482097703213549730657663e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.01799479940825547859103232846394236067e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.31954083060883245879038709103320778401e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.14437110578260816704498035546280169833e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.75434713435598124790021625988306358726e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.70722283097111675839403787383067403199e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.22792548204908895458622068271940298849e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.23652632092726261134927067083229843867e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.26848751206698811476021875382152874517e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.96683933776920842966962054618493551480e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.65547426464916480144982028081303670013e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.01788104318587272115031165074724363239e-19),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.43507070588695242714872431565299762416e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.42808541175677232789532731946043918868e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.58154336417481327293949514291626832622e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.52883128062761272825364005132296437324e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46220303655089035098911370014929809787e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.44776253795594076489612438705019750179e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.09607872267766585503592561222987444825e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24270418154050297788150584301311027023e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.52138350835458198482199500102799185922e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.28330565098807415367837423320898722351e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61220858078610415609826514581165467762e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31680570822471881148008283775281806658e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61638868324981393463928986484698110415e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.4643e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.32474749499506228416012679106564727824e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.11125026189437033131539969177846635890e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.56906722402983201196890012041528422765e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.56242546565817333757522889497509484980e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.96189353402888611791301502740835972176e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.25518459970705638772495930203869523701e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.23831474024265607073689937590604367113e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.44925744847701733694636991148083680863e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.22891322042392818013643347840386719351e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.72860750698838897533843164259437533533e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.38276123679972197567738586890856461530e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.75010927807240165715236750369730131837e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.39435252454410259267870094713230289131e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.32672767938414655620839066142834241506e-23),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.71913035066927544877255131988977106466e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.07499674325721771035402891723823952963e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.73304002376509252638426379643927595435e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.45986195188119302051678426047947808068e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39631771214004792103186529415117786213e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.82972151546053891838685817022915476363e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.11484161875982352879422494936862579004e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.76886416872139526041488219568768973343e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.88160764330501845206576873052377420740e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20653899535657202009579871085255085820e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.86752135706343102514753706859178940399e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.08670633989984379551412930443791478495e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96869107941293302786688580824755244599e-24),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.2783e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.82318656228158372073367735499501003484e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.46261040951642110189344545942990712460e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.64741560190892266676648641695426188913e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.28753551974093682831398870653055328683e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.21312013770915263838500863217194379134e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.52436958859473873340733176333088176566e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.19550238139736009251193868269757013675e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.14964971787780037500173882363122301527e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.40304301938210548254468386306034204388e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.86982233973109416660769999752508002999e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.47229710624085810190563630948355644978e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.97511060097659395674010001155696382091e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.14321784268659603072523892366718901165e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.69804409248161357472540739283978368871e-27),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85763741109198600677877934140774914793e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51555423561034635648725665049090572375e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.14334282485948451530639961260946534734e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15303265564789411158928907568898290494e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.33945229806307308687045028827126348382e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.94373901322371782367428404051188999662e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.51420073260465851038482922686870398511e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.39366317896256472225488167609473929757e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32986474655329330922243678847674164814e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.09408217872473269288530036223761068322e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79051953285476930547217173280519421410e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94530899348454778842122895096072361105e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36452993460830805591166007621343447892e-28),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.0123e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.29700011190686230364493911161520668302e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.16175031776740080906111179721128106011e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.33343982195432985864570319341790342784e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.25414682801788504282484273374052405406e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.08812659343240279665150323243172015853e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.33251452861660571881208437468957953698e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.80894766863868081020089830941243893253e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.84955155823472122347227298177346716657e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.98637322645260158088125181176106901234e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.24174383760514163336627039277792172744e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.54369979866464292009398761404242103210e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.02572051048819721089874338860693952304e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.93656169061287808919601714139458074543e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.14930159772574816086864316805656403181e-31),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27154900915819978649344191118112870943e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77527908332591966425460814882436207182e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.88097249712649070373643439940164263005e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33593973311650359460519742789132084170e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34383186845963127931313004467487408932e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.18631088001587612168708294926967112654e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.25338215226314856456799568077385137286e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30644713290591280849926388043887647219e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55508263112797212356530850090635211577e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.96694528841324480583957017533192805939e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81411886190142822899424539396403206677e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.64683991040772975824276994623053932566e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81924597500766743545654858597960153152e-32),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -256) {
+        RealType t = -log2(ldexp(p, 128));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.7624e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.75666995985336007747791649448887723610e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.78960399079208663111712385988217075907e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.74942252057371678208959612011771010491e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.54567765510065203543937772001248399869e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.53093894540157655856029322335609764674e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.83833601054721321664219768559444646069e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.52281007055180941965172296953524749452e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.57322728543196345563534040700366511864e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.52881564741260266060082523971278782893e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.60440334652864372786302383583725866608e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.60691285483339296337794569661545125426e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.29567560587442907936295101146377006338e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.50976593324256906782731237116487284834e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.71308835356954147218854223581309967814e-35),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.62732785401286024270119905692156750540e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.40382961238668912455720345718267045656e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10406445824749289380797744206585266357e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.28896702052362503156922190248503561966e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.16141168910009886089186579048301366151e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41978644147717141591105056152782456952e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.28101353275172857831967521183323237520e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.02996252940600644617348281599332256544e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.91006255647885778937252519693385130907e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84585864559619959844425689120130028450e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.68573963627097356380969264657086640713e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11059307697054035905630311480256015939e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36363494270701950295678466437393953964e-36),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -512) {
+        RealType t = -log2(ldexp(p, 256));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.5621e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.20826069989721596260510558511263035942e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.97440158261228371765435988840257904642e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.03971528248920108158059927256206438162e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.27123766722395421727031536104546382045e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.42341191105097202061646583288627536471e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.27644514375284202188806395834379509517e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.10772944192965679212172315655880689287e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.32875098791800400229370712119075696952e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.06204614360238210805757647764525929969e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.43745006810807466452260414216858795476e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.66712970893511330059273629445122037896e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.72840198778128683137250377883245540424e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.91906782399731224228792112460580813901e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.42769091263044979075875010403899574987e-39),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31008507886426704374911618340654350029e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34370110384866123378972324145883460422e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37370811166006065198348108499624387519e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.14880753458828334658200185014547794333e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29049942195929206183214601044522500821e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19814793427532184357255406261941946071e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53609759199568827596069048758012402352e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94113467521833827559558236675876398395e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.46066673213431758610437384053309779874e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73781952388557106045597803110890418919e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.17225106466605017267996611448679124342e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66384334839761400228111118435077786644e-35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.02877806111195383689496741738320318348e-40),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -1024) {
+        RealType t = -log2(ldexp(p, 512));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.4128e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.65527239540648657446629479052874029563e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.49609214609793557370425343404734771058e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.85355312961840000203681352424632999367e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.57243631623079865238801420669247289633e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.64978384343879316016184643597712973486e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.12776782513387823319217102727637716531e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.86985041780323969283076332449881856202e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.11665149267826038417038582618446201377e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.44259259232002496618805591961855219612e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.13186466395317710362065595347401054176e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.72627240737786709568584848420972570566e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.40450635670659803069555960816203368299e-33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.90550919589933206991152832258558972394e-38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.33785768143117121220383154455316199086e-43),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15365252334339030944695314405853064901e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84519641047962864523571386561993045416e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71097850431873211384168229175171958023e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20268329795802836663630276028274915013e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.00891848515558877833795613956071967566e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41031229424613259381704686657785733606e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96506914235910190020798805190634423572e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.51190756655665636680121123277286815188e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82855686000721415124702578998188630945e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64298533757673219241102013167519737553e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01176104624443909516274664414542493718e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.41571947895162847564926590304679876888e-39),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.84682590163505511580949151048092123923e-44),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -2048) {
+        RealType t = -log2(ldexp(p, 1024));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.3064e-35
+        //LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.09971143249822249471944441552701756051e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.00154235169065403254826962372636417554e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.76859552294270710004718457715250134998e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.16331901379268792872208226779641113312e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.11590258438815173520561213981966313758e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.17278804462968109983985217400233347654e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.14112976645884560534267524918610371127e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.34652102658577790471066054415469309178e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.85242987373551062800089607781071064493e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.35051904844102317261572436130886083833e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.78478298776769981726834169566536801689e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.22532973433435489030532261530565473605e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.25433604872532935232490414753194993235e-41),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.49792182967344082832448065912949074241e-47),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.76316274347013095030195725596822418859e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45872499993438633169552184478587544165e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13309566903496793786045158442686362533e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99468690853840997883815075627545315449e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24734617022827960185483615293575601906e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.30099852343633243897084627428924039959e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52598626985708878790452436052924637029e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91432956461466900007096548587800675801e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.54421383015859327468201269268335476713e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55939743284103455997584863292829252782e-33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.73331214275752923691778067125447148395e-38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55089353084326800338273098565932598679e-42),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.85408276119483460035366338145310798737e-48),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4096) {
+        RealType t = -log2(ldexp(p, 2048));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.2337e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.54271778755494231572464179212263718102e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.62737121212473668543011440432166267791e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.10099492629239750693134803100262740506e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.56925359477960645026399648793960646858e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.50756287005636861300081510456668184335e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.40657453971177017986596834420774251809e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.25518001919157628924245515302669097090e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.79618511101781942757791021761865762100e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.70242241511341924787722778791482800736e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.87078860748428154402226644449936091766e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.84256560347986567120140826597805016470e-35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.71419536977123330712095123316879755172e-40),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.20746149769511232987820552765701234564e-45),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.97544543671003989410397788518265345930e-51),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87980995989632171985079518382705421728e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.64234691529227024725728122489224211774e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66149363392892604040036997518509803848e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24365427902918684575287447585802611012e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.88619663977804926166359181945671853793e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.25299846770395565237726328268659386749e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18720305257346902130922082357712771134e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13302092710568005396855019882472656722e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.88571994886818976015465466797965950164e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.48486836614948668196092864992423643733e-36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72247229252387482782783442901266890088e-41),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76046592638280288324495546006105696670e-46),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.09378739037162732758860377477607829024e-52),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -8192) {
+        RealType t = -log2(ldexp(p, 4096));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.1864e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.98493298246627952401490656857159302716e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.76990949843357898517869703626917264559e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.65042794324685841303461715489845834903e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.10605446678026983843303253925148000808e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.02762962429283889606329831562937730874e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.04105882385534634676234513866095562877e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.76001901462155366759952792570076976049e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.48255362964603267691139956218580946011e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.19422119466925125740484046268759113569e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.00719439924828639148906078835399693640e-33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.89921842231783558951433534621837291030e-38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.90738353848476619269054038082927243972e-43),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.19893980415902021846066305054394089887e-49),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.85434486590981105149494168639321627061e-55),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43932168599456260558411716919165161381e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.09851997458503734167541584552305867433e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.32285843258966417340522520711168738158e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.76041266755635729156773747720864677283e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21202253509959946958614664659473305613e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28647335562574024550800155417747339700e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.24953333571478743858014647649207040423e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.41206199962423704137133875822618501173e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34018702380092542910629787632780530080e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41732943566503750356718429150708698018e-39),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29626943299239081309470153019011607254e-44),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.13947437500822384369637881437951570653e-50),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.61766557173110449434575883392084129710e-56),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -16384) {
+        RealType t = -log2(ldexp(p, 8192));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.1568e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.42671464308364892089984144203590292562e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.70165333325375920690660683988390032004e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.51230594210711745541592189387307516997e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.81387249912672866168782835177116953008e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.35308063526816559199325906123032162155e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.67672500455361049516022171111707553191e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.45533142942305626136621399056034449775e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.37422341389432268402917477004312957781e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.32123176403616347106899307416474970831e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.07816837508332884935917946618577512264e-36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.95418937882563343895280651308376855123e-41),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.78256110112636303941842779721479313701e-47),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.09423327107440352766843873264503717048e-52),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.12386630925835960782702757402676887380e-58),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.19477412398085422408065302795208098500e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27347517804649548179786994390985841531e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15042399607786347684366638940822746311e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.84537882580411074097888848210083177973e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.78283331111405789359863743531858801963e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00711555012725961640684514298170252743e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.21370151454170604715234671414141850094e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72008007024350635082914256163415892454e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.61182095564217124712889821368695320635e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35498047010165964231841033788823033461e-42),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11828030216193307885831734256233140264e-47),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22499308298315468568520585583666049073e-53),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04877018522402283597555167651619229959e-59),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        result = -boost::math::numeric_limits<RealType>::infinity();
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.375) {
+        RealType t = p - static_cast < RealType>(0.375);
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.1286e-20
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.31348919222343858178e0),
+            static_cast<RealType>(-1.06646675961352786791e0),
+            static_cast<RealType>(-1.80946160022120488884e1),
+            static_cast<RealType>(-1.53457017598330440033e0),
+            static_cast<RealType>(4.71260102173048370028e1),
+            static_cast<RealType>(4.61048467818771410732e0),
+            static_cast<RealType>(-2.80957284947853532418e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.71007453129016317772e0),
+            static_cast<RealType>(1.31946404969596908872e0),
+            static_cast<RealType>(-1.70321827414586880227e1),
+            static_cast<RealType>(-1.11253495615474018666e1),
+            static_cast<RealType>(1.62659086449959446986e1),
+            static_cast<RealType>(7.37109203295032098763e0),
+            static_cast<RealType>(-2.43898047338699777337e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - static_cast < RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.4934e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.55081568282045924981e0),
+            static_cast<RealType>(5.38750533719526696218e0),
+            static_cast<RealType>(-2.32797421725187349036e1),
+            static_cast<RealType>(-3.96043566411306749784e1),
+            static_cast<RealType>(3.80609941977115436545e1),
+            static_cast<RealType>(3.35014421131920266346e1),
+            static_cast<RealType>(-1.17490458743273503838e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(7.52439409918350484765e0),
+            static_cast<RealType>(1.34784954182866689668e1),
+            static_cast<RealType>(-9.21002543625052363446e0),
+            static_cast<RealType>(-2.67378141317474265949e1),
+            static_cast<RealType>(2.10158795079902783094e0),
+            static_cast<RealType>(5.90098096212203282798e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - static_cast < RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.0795e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(5.68160868054034111703e0),
+            static_cast<RealType>(1.06098927525586705381e2),
+            static_cast<RealType>(5.74509518025029027944e2),
+            static_cast<RealType>(4.91117375866809056969e2),
+            static_cast<RealType>(-2.92607000654635606895e3),
+            static_cast<RealType>(-3.82912009541683403499e3),
+            static_cast<RealType>(2.49195208452006100935e3),
+            static_cast<RealType>(1.29413301335116683836e3),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(2.69603865809599480308e1),
+            static_cast<RealType>(2.63378422475372461819e2),
+            static_cast<RealType>(1.09903493506098212946e3),
+            static_cast<RealType>(1.60315072092792425370e3),
+            static_cast<RealType>(-5.44710468198458322870e2),
+            static_cast<RealType>(-1.76410218726878681387e3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.4618e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(7.10201085067542566037e-1),
+            static_cast<RealType>(6.70042401812679849451e-1),
+            static_cast<RealType>(2.42799404088685074098e-1),
+            static_cast<RealType>(4.80613880364042262227e-2),
+            static_cast<RealType>(6.04473313360581797461e-3),
+            static_cast<RealType>(5.09172911021654842046e-4),
+            static_cast<RealType>(-6.63145317984529265677e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(9.18649629646213969612e-1),
+            static_cast<RealType>(3.66343989541898286306e-1),
+            static_cast<RealType>(8.01010534748206001446e-2),
+            static_cast<RealType>(1.00553335007168823115e-2),
+            static_cast<RealType>(6.30966763237332075752e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.8994e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(7.06147398566773538296e-1),
+            static_cast<RealType>(4.26802162741800814387e-1),
+            static_cast<RealType>(1.32254436707168800420e-1),
+            static_cast<RealType>(2.86055054496737936396e-2),
+            static_cast<RealType>(3.63373131686703931514e-3),
+            static_cast<RealType>(3.84438945816411937013e-4),
+            static_cast<RealType>(1.67768561420296743529e-5),
+            static_cast<RealType>(8.76982374043363061978e-7),
+            static_cast<RealType>(-1.99744396595921347207e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(6.28190787856605587324e-1),
+            static_cast<RealType>(2.10992746593815791546e-1),
+            static_cast<RealType>(4.44397672327578790713e-2),
+            static_cast<RealType>(6.02768341661155914525e-3),
+            static_cast<RealType>(5.46578619531721658923e-4),
+            static_cast<RealType>(3.11116573895074296750e-5),
+            static_cast<RealType>(1.17729007979018602786e-6),
+            static_cast<RealType>(-2.78441865351376040812e-8),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.8685e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.48209596014908359251e-1),
+            static_cast<RealType>(2.52611824671691390768e-1),
+            static_cast<RealType>(4.65114070477803399291e-2),
+            static_cast<RealType>(5.23373513313686849909e-3),
+            static_cast<RealType>(3.83113384161076881958e-4),
+            static_cast<RealType>(1.96230077517629530809e-5),
+            static_cast<RealType>(5.83117485120890819338e-7),
+            static_cast<RealType>(6.92614450423703079737e-9),
+            static_cast<RealType>(-3.89531123166658723619e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(3.99413988076189200840e-1),
+            static_cast<RealType>(7.32068638518417765776e-2),
+            static_cast<RealType>(8.15517102642752348889e-3),
+            static_cast<RealType>(6.09126071418098074914e-4),
+            static_cast<RealType>(3.03794079468789962611e-5),
+            static_cast<RealType>(9.32109079205017197662e-7),
+            static_cast<RealType>(1.05435710482490499583e-8),
+            static_cast<RealType>(-6.08748435983193979360e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0253e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(6.36719010559816164896e-1),
+            static_cast<RealType>(2.06504115804034148753e-1),
+            static_cast<RealType>(3.28085429275407182582e-2),
+            static_cast<RealType>(3.31676417519020335859e-3),
+            static_cast<RealType>(2.35502578757551086372e-4),
+            static_cast<RealType>(1.21652240566662139418e-5),
+            static_cast<RealType>(4.57039495420392748658e-7),
+            static_cast<RealType>(1.18090959236399583940e-8),
+            static_cast<RealType>(1.77492646969597480221e-10),
+            static_cast<RealType>(-2.19331267300885448673e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(3.24422807416528490276e-1),
+            static_cast<RealType>(5.15290129833049138552e-2),
+            static_cast<RealType>(5.21051235888272287209e-3),
+            static_cast<RealType>(3.69895399249472399625e-4),
+            static_cast<RealType>(1.91103139437893226482e-5),
+            static_cast<RealType>(7.17882574725373091636e-7),
+            static_cast<RealType>(1.85502934977316481559e-8),
+            static_cast<RealType>(2.78798057565507249164e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.1705e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(6.36619775525705206992e-1),
+            static_cast<RealType>(2.68335698140634792041e-1),
+            static_cast<RealType>(5.49803347535070103650e-2),
+            static_cast<RealType>(7.25018344556356907109e-3),
+            static_cast<RealType>(6.87753481255849254220e-4),
+            static_cast<RealType>(4.86155006277788340253e-5),
+            static_cast<RealType>(2.84604768310787862450e-6),
+            static_cast<RealType>(9.56133960810049319917e-8),
+            static_cast<RealType>(5.26850116571886385248e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1),
+            static_cast<RealType>(4.21500730173440590900e-1),
+            static_cast<RealType>(8.63629077498258325752e-2),
+            static_cast<RealType>(1.13885615328098640032e-2),
+            static_cast<RealType>(1.08032064178130906887e-3),
+            static_cast<RealType>(7.63650498196064792408e-5),
+            static_cast<RealType>(4.47056124637379045275e-6),
+            static_cast<RealType>(1.50189171357721423127e-7),
+            static_cast<RealType>(8.27574227882033707932e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else {
+        result = 2 / (constants::pi<RealType>() * p);
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.4375) {
+        RealType t = p - 0.4375;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.4465e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.08338732735341567163440035550389989556e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.27245731792290848390848202647311435023e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.29317169036386848462079766136373749420e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36342136825575317326816540539659955416e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.31108700679715257074164180252148868348e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.81863611749256385875333154189074054367e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.11618233433781722149749739225688743102e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45241854625686954669050322459035410227e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.09780430233523239228350030812868983054e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.42232005306623465126477816911649683789e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.24816048952817367950452675590290535540e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[10] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80464069267458650284548842830642770344e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.28240205449280944407125436342013240876e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.94145088402407692372903806765594642452e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30062294376971843436236253827463203953e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47118047660686070998671803800237836970e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.00643263133479482753298910520340235765e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.79460803824650509439313928266686172255e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32647058691746306769699006355256099134e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.59208938705683333141038012302171324544e0),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.375) {
+        RealType t = p - 0.375;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.1929e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31348919222343858173602105619413801018e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.02800226274700443079521563669609776285e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.02091675505570786434803291987263553778e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50141943970885120432710080552941486001e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.93099903417013423125762526465625227789e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.56412922160141953385088141936082249641e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.47026602535072645589119440784669747242e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.01068960815396205074336853052832780888e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.86591619131639705495877493344047777421e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.26390836417639942474165178280649450755e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.18212484486162942333407102351878915285e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[10] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97802777458574322604171035748634755981e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.33277809211107726455308655998819166901e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.76555481647551088626503871996617234475e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.33146828123660043197526014404644087069e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.65159900182434446550785415837526228592e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.32391192521438191878041140980983374411e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.12112886240590711980064990996002999330e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.93964809733838306198746831833843897743e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53948309965401603055162465663290204205e1),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - 0.25;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.2765e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55081568282045925871949387822806890848e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21080883686702131458668798583937913025e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15083151599213113740932148510289036342e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.94190629930345397070104862391009053509e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.40768205403470729468297576291723141480e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00001008242667338579153437084294876585e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70900785394455368299616221471466320407e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48947677419760753410122194475234527150e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.01826174001050912355357867446431955195e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.55833657916143927452986099130671173511e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.32953617526068647169047596631564287934e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.32825234826729794599233825734928884074e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.47352171888649528242284500266830013906e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40793887011403443604922082103267036101e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.04348824299115035210088417095305744248e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19680004238557953382868629429538716069e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.31172263627566980203163658640597441741e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.07390429662527773449936608284938592773e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.94877589960261706923147291496752293313e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.94903802003585398809229608695623474341e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.80417437710146805538675929521229778181e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.23364098614130091185959973343748897970e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.12975537807357019330268041620753617442e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.36592279898578127130605391750428961301e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18495624730372864715421146607185990918e1),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - 0.125;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.8007e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.68160868054034088524891526884683014057e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85165791469635551063850795991424359350e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.42938802867742165917839659578485422534e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59273512668331194186228996665355137458e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.91680503091725091370507732042764517726e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85642348415580865994863513727308578556e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.90181935466760294413877600892013910183e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.89141276256233344773677083034724024215e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00250514074918631367419468760920281159e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28168216451109123143492880695546179794e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14996399533648172721538646235459709807e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.58122093722347315498230864294015130011e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.25168985723506298009849577846542992545e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01179759985059408785527092464505889999e5),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08766677593618443545489115711858395831e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.05163374816838964338807027995515659842e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.62582103160439981904537982068579322820e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.62170991799612186300694554812291085206e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11013837158432827711075385018851760313e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45458895395245243570930804678601511371e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.08336489932795411216528182314354971403e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.11314692423102333551299419575616734987e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.43287683964711678082430107025218057096e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.62052814931825182298493472041247278475e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91440920656902450957296030252809476245e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.54913345383745613446952578605023052270e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.76034827722473399290702590414091767416e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94027684838690965214346010602354223752e3),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.1905e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.10201085067542610656114408605853786551e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.04725580445598482170291458376577106746e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.35945839005443673797792325217359695272e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15894004364989372373490772246381545906e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.54550169514753150042231386414687368032e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50389998399729913427837945242228928632e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75018554725308784191307050896936055909e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95901705695908219804887362154169268380e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34386856794684798098717884587473860604e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.89025399683852111061217430321882178699e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19044156703773954109232310846984749672e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11932910013840927659486142481532276176e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64064398716881126082770692219937093427e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24909572944428286558287313527068259394e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.70912720447370835699164559729287157119e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.21998644852982625437008410769048682388e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.95906385698373052547496572397097325447e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35344144061390771459100718852878517200e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34168669072527413734185948498168454149e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.24488907049996230177518311480230131257e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.92059624838630990024209986717533470508e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84464614954263838504154559314144088371e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.67874815200287308180777775077428545024e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65919857481420519138294080418011981524e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.31466713452016682217190521435479677133e-10),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.5157e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.06147398566773479301585022897491054494e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06137881154706023038556659418303323027e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.00274868819366386235164897614448662308e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.03481313941011533876096564688041226638e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50172569438851062169493372974287427240e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.33370725278950299189434839636002761850e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.97566905908106543054773229070602272718e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85701973515993932384374087677862623215e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81956143385351702288398705969037130205e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.49975572102999645354655667945479202048e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.54665400959860442558683245665801873530e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.94292402413454232307556797758030774716e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98038791388715925556623187510676330309e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11242951548709169234296005470944661995e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.92636379295018831848234711132457626676e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77389296072621088586880199705598178518e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.57808410784300002747916947756919004207e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.93860773322862111592582321183379587624e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52683694883265337797012770275040297516e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17837082293165509684677505408307814500e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.06195236296471366891670923430225774487e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29459155224640682509948954218044556307e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.71350726081102446771887145938865551618e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55986063168260695680927535587363081713e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91996892322204645930710038043021675160e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.43907073162091303683795779882887569537e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.50034830055055263363497137448887884379e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.56615898355501904078935686679056442496e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.61099855362387625880067378834775577974e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.12940315230564635808566630258463831421e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73572881409271303264226007333510301220e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.77786420070246087920941454352749186288e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77914406265766625938477137082940482898e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.19708585422668069396821478975324123588e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40406059898292960948942525697075698413e-15),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.6812e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.48209596014908270566135466727658374314e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02026332003132864886056710532156370366e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68941634461905013212266453851941196774e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.61650792370551069313309111250434438540e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52611930219013953260661961529732777539e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29488123972430683478601278003510200360e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68806175827491046693183596144172426378e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51806782259569842628995584152985951836e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92353868262961486571527005289554589652e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21494769586031703137329731447673056499e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.39837421784601055804920937629607771973e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82216155524308827738242486229625170158e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04275785296896148301798836366902456306e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19999929939765873468528448012634122362e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.03583326787146398902262502660879425573e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59755092249701477917281379650537907903e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32583227076029470589713734885690555562e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.18237323554153660947807202150429686004e-20),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.38459552164692902984228821988876295376e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21584899508575302641780901222203752951e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19656836695824518143414401720590693544e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39821085943818944882332778361549212756e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60484296824768079700823824408428524933e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.22173385695010329771921985088956556771e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95541259523416810836752584764202086573e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02184255281138028802991551275755427743e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90825805251143907045903671893185297007e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00501277755608081163250456177637280682e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.43387099521800224735155351696799358451e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63751106922299101655071906417624415019e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.02796982349519589339629488980132546290e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26197249278457937947269910907701176956e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50981935956236238709523457678017928506e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.65309560070040982176772709693008187384e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42817828965851841104270899392956866435e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.8388e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36719010559816175149447242695581604280e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14714772485724956396126176973339095223e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.47792450677638612907408723539943311437e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14084804538576805298420530820092167411e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25784891219227004394312050838763762669e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06837168825575413225975778906503529455e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.26908306638706189702624634771158355088e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06396335535135452379658152785541731746e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89854018431899039966628599727721422261e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.48974049316978526855972339306215972434e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50886538662952684349385729585856778829e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.14095970401472469264258565259303801322e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71915162586912203234023473966563445362e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.46099196574734038609354417874908346873e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.69944075002490023348175340827135133316e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.37340205792165863440617831987825515203e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.87812199530402923085142356622707924805e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76810877067601573471489978907720495511e-24),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.94373217074550329856398644558576545146e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17462725343185049507839058445338783693e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79202779096887355136298419604918306868e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97583473532621831662838256679872014292e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67819154370257505016693473230060726722e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14182379349642191946237975301363902175e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.38367234191828732305257162934647076311e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98221340505887984555143894024281550376e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17648765147609962405833802498013198305e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.94091261341172666220769613477202626517e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12169979717068598708585414568018667622e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70043694579268983742161305612636042906e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.43651270200498902307944806310116446583e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.95266223996097470768947426604723764300e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15821111112681530432702452073811996961e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08041298058041360645934320138765284054e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.91893114159827950553463154758337724676e-24),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.8746e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619775525705288697351261475419832625e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29882145587771350744255724773409752285e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.07952726597277085327360888304737411175e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72928496414816922167597110591366081416e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.01641163277458693633771532254570177776e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65627339211110756774878685166318417370e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41953343652571732907631074381749818724e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.27682202874503433884090203197149318368e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33177176779158737868498722222027162030e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.34485618544363735547395633416797591537e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96996761199233617188435782568975757378e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.49631247632674130553464740647053162499e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.68090516971007163491968659797593218680e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39910262557283449853923535586722968539e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83704888007521886644896435914745476741e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87884425419276681417666064027484555860e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36600092466902449189685791563990733005e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.53604301472332155307661986064796109517e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.65664588229982894587678197374867153136e-40),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61098031370834273919229478584740981117e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.40810642301361416278392589243623940154e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.42874346984605660407576451987840217534e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.30896462654364903689199648803900475405e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.17246449391141576955714059812811712587e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22979790521806964047777145482613709395e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.85960899519336488582042102184331670230e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66273852553220863665584472398487539899e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15372731217983084923067673501176233172e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.09441788794783860366430915309857085224e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.06279112323261126652767146380404236150e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36359339522621405197747209968637035618e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19770526521305519813109395521868217810e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.88562963284557433336083678206625018948e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95128165317597657325539450957778690578e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14570923483883184645242764315877865073e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.69599603258626408321886443187629340033e-26),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.9915e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619772367581344576326594951209529606e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72456363182667891167613558295097711432e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74486567435450138741058930951301644059e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.94624522781897679952110594449134468564e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09848623985771449914778668831103210333e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.47493285141689711937343304940229517457e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.22134975575390048261922652492143139174e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30240148387764167235466713023950979069e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06917824188001432265980161955665997666e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27834220508404489112697949450988070802e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48663447630051388468872352628795428134e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.50514504588736921389704370029090421684e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18965303814265217659151418619980209487e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74200654214326267651127117044008493519e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.34060054352573532839373386456991657111e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.34240516843783954067548886404044879120e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07803703545135964499326712080667886449e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61500479431085205124031101160332446432e-23),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27973454499231032893774072677004977154e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.02401389920613749641292661572240166038e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24819328156695252221821935845914708591e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27210724381675120281861717194783977895e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01708007392492681238863778030115281961e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.63088069045476088736355784718397594807e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61660379368211892821215228891806384883e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67946125503415200067055797463173521598e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72040422051759599096448422858046040086e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33519997465950200122152159780364149268e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07666528975810553712124845533861745455e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86870262247486708096341722190198527508e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30713380444621290817686989936029997572e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.38899571664905345700275460272815357978e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46750157220118157937510816924752429685e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69337661543585547694652989893297703060e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53684359865963395505791671817598669527e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * p);
+    }
+    else {
+        result = 2 / (constants::pi<RealType>() * p);
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 53>& tag)
+{
+    if (p > 0.5) 
+    {
+        return !complement ? landau_quantile_upper_imp_prec(1 - p, tag) : landau_quantile_lower_imp_prec(1 - p, tag);
+    }
+
+    return complement ? landau_quantile_upper_imp_prec(p, tag) : landau_quantile_lower_imp_prec(p, tag);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 113>& tag)
+{
+    if (p > 0.5) 
+    {
+        return !complement ? landau_quantile_upper_imp_prec(1 - p, tag) : landau_quantile_lower_imp_prec(1 - p, tag);
+    }
+
+    return complement ? landau_quantile_upper_imp_prec(p, tag) : landau_quantile_lower_imp_prec(p, tag);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType landau_quantile_imp(const landau_distribution<RealType, Policy>& dist, const RealType& p, bool complement)
+{
+    // This routine implements the quantile for the Landau distribution,
+    // the value p may be the probability, or its complement if complement=true.
+
+    constexpr auto function = "boost::math::quantile(landau<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+    RealType bias = dist.bias();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_probability(function, p, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Landau distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * (landau_quantile_imp_prec(p, complement, tag_type()) - bias);
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_mode_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(-0.42931452986133525017);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_mode_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, -0.42931452986133525016556463510885028346);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType landau_mode_imp(const landau_distribution<RealType, Policy>& dist)
+{
+    // This implements the mode for the Landau distribution,
+
+    constexpr auto function = "boost::math::mode(landau<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+    RealType bias = dist.bias();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Landau distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * (landau_mode_imp_prec<RealType>(tag_type()) - bias);
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_median_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(0.57563014394507821440);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_median_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, 0.57563014394507821439627930892257517269);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType landau_median_imp(const landau_distribution<RealType, Policy>& dist)
+{
+    // This implements the median for the Landau distribution,
+
+    constexpr auto function = "boost::math::median(landau<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+    RealType bias = dist.bias();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Landau distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * (landau_median_imp_prec<RealType>(tag_type()) - bias);
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_entropy_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(2.37263644000448182448);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType landau_entropy_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.3726364400044818244844049010588577710);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType landau_entropy_imp(const landau_distribution<RealType, Policy>& dist)
+{
+    // This implements the entropy for the Landau distribution,
+
+    constexpr auto function = "boost::math::entropy(landau<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Landau distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = landau_entropy_imp_prec<RealType>(tag_type()) + log(scale);
+
+    return result;
+}
+
+} // detail
+
+template <class RealType = double, class Policy = policies::policy<> >
+class landau_distribution
+{
+    public:
+    typedef RealType value_type;
+    typedef Policy policy_type;
+
+    BOOST_MATH_GPU_ENABLED landau_distribution(RealType l_location = 0, RealType l_scale = 1)
+        : mu(l_location), c(l_scale)
+    {
+        BOOST_MATH_STD_USING
+        
+        constexpr auto function = "boost::math::landau_distribution<%1%>::landau_distribution";
+        RealType result = 0;
+        detail::check_location(function, l_location, &result, Policy());
+        detail::check_scale(function, l_scale, &result, Policy());
+
+        location_bias = -2 / constants::pi<RealType>() * log(l_scale);
+    } // landau_distribution
+
+    BOOST_MATH_GPU_ENABLED RealType location()const
+    {
+        return mu;
+    }
+    BOOST_MATH_GPU_ENABLED RealType scale()const
+    {
+        return c;
+    }
+    BOOST_MATH_GPU_ENABLED RealType bias()const
+    {
+        return location_bias;
+    }
+
+    private:
+    RealType mu;    // The location parameter.
+    RealType c;     // The scale parameter.
+    RealType location_bias;  // = -2 / pi * log(c)
+};
+
+typedef landau_distribution<double> landau;
+
+#ifdef __cpp_deduction_guides
+template <class RealType>
+landau_distribution(RealType) -> landau_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+template <class RealType>
+landau_distribution(RealType, RealType) -> landau_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+#endif
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const landau_distribution<RealType, Policy>&)
+{ // Range of permissible values for random variable x.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const landau_distribution<RealType, Policy>&)
+{ // Range of supported values for random variable x.
+   // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-tools::max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const landau_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::landau_pdf_imp(dist, x);
+} // pdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const landau_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::landau_cdf_imp(dist, x, false);
+} // cdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const landau_distribution<RealType, Policy>& dist, const RealType& p)
+{
+    return detail::landau_quantile_imp(dist, p, false);
+} // quantile
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<landau_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::landau_cdf_imp(c.dist, c.param, true);
+} //  cdf complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<landau_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::landau_quantile_imp(c.dist, c.param, true);
+} // quantile complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mean(const landau_distribution<RealType, Policy>&)
+{  // There is no mean:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Landau Distribution has no mean");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::mean(landau<%1%>&)",
+        "The Landau distribution does not have a mean: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType variance(const landau_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no variance:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Landau Distribution has no variance");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::variance(landau<%1%>&)",
+        "The Landau distribution does not have a variance: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mode(const landau_distribution<RealType, Policy>& dist)
+{
+    return detail::landau_mode_imp(dist);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType median(const landau_distribution<RealType, Policy>& dist)
+{
+    return detail::landau_median_imp(dist);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const landau_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no skewness:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Landau Distribution has no skewness");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::skewness(landau<%1%>&)",
+        "The Landau distribution does not have a skewness: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const landau_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Landau Distribution has no kurtosis");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis(landau<%1%>&)",
+        "The Landau distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const landau_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis excess:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Landau Distribution has no kurtosis excess");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis_excess(landau<%1%>&)",
+        "The Landau distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const landau_distribution<RealType, Policy>& dist)
+{
+    return detail::landau_entropy_imp(dist);
+}
+
+}} // namespaces
+
+
+#endif // BOOST_STATS_LANDAU_HPP
diff --git a/inst/include/boost/math/distributions/laplace.hpp b/inst/include/boost/math/distributions/laplace.hpp
index 81ae8fed9..81a0abe1a 100644
--- a/inst/include/boost/math/distributions/laplace.hpp
+++ b/inst/include/boost/math/distributions/laplace.hpp
@@ -1,6 +1,7 @@
 //  Copyright Thijs van den Berg, 2008.
 //  Copyright John Maddock 2008.
 //  Copyright Paul A. Bristow 2008, 2014.
+//  Copyright Matt Borland 2024.
 
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
@@ -17,11 +18,15 @@
 #ifndef BOOST_STATS_LAPLACE_HPP
 #define BOOST_STATS_LAPLACE_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/constants/constants.hpp>
-#include <limits>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost{ namespace math{
 
@@ -43,7 +48,7 @@ class laplace_distribution
    // ----------------------------------
    // Constructor(s)
    // ----------------------------------
-   explicit laplace_distribution(RealType l_location = 0, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED explicit laplace_distribution(RealType l_location = 0, RealType l_scale = 1)
       : m_location(l_location), m_scale(l_scale)
    {
       RealType result;
@@ -55,17 +60,17 @@ class laplace_distribution
    // Public functions
    // ----------------------------------
 
-   RealType location() const
+   BOOST_MATH_GPU_ENABLED RealType location() const
    {
       return m_location;
    }
 
-   RealType scale() const
+   BOOST_MATH_GPU_ENABLED RealType scale() const
    {
       return m_scale;
    }
 
-   bool check_parameters(const char* function, RealType* result) const
+   BOOST_MATH_GPU_ENABLED bool check_parameters(const char* function, RealType* result) const
    {
          if(false == detail::check_scale(function, m_scale, result, Policy())) return false;
          if(false == detail::check_location(function, m_location, result, Policy())) return false;
@@ -91,42 +96,42 @@ laplace_distribution(RealType,RealType)->laplace_distribution<typename boost::ma
 //
 // Non-member functions.
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const laplace_distribution<RealType, Policy>&)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const laplace_distribution<RealType, Policy>&)
 {
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   {  // Can use infinity.
-     return std::pair<RealType, RealType>(-std::numeric_limits<RealType>::infinity(), std::numeric_limits<RealType>::infinity()); // - to + infinity.
+     return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
   }
   else
   { // Can only use max_value.
     using boost::math::tools::max_value;
-    return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max value.
+    return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max value.
   }
 
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const laplace_distribution<RealType, Policy>&)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const laplace_distribution<RealType, Policy>&)
 {
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { // Can Use infinity.
-     return std::pair<RealType, RealType>(-std::numeric_limits<RealType>::infinity(), std::numeric_limits<RealType>::infinity()); // - to + infinity.
+     return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
   }
   else
   { // Can only use max_value.
     using boost::math::tools::max_value;
-    return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max value.
+    return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max value.
   }
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    // Checking function argument
    RealType result = 0;
-   const char* function = "boost::math::pdf(const laplace_distribution<%1%>&, %1%))";
+   constexpr auto function = "boost::math::pdf(const laplace_distribution<%1%>&, %1%))";
 
    // Check scale and location.
    if (false == dist.check_parameters(function, &result)) return result;
@@ -152,13 +157,13 @@ inline RealType pdf(const laplace_distribution<RealType, Policy>& dist, const Re
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    // Checking function argument
-   RealType result = -std::numeric_limits<RealType>::infinity();
-   const char* function = "boost::math::logpdf(const laplace_distribution<%1%>&, %1%))";
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
+   constexpr auto function = "boost::math::logpdf(const laplace_distribution<%1%>&, %1%))";
 
    // Check scale and location.
    if (false == dist.check_parameters(function, &result))
@@ -178,8 +183,8 @@ inline RealType logpdf(const laplace_distribution<RealType, Policy>& dist, const
    const RealType mu = dist.scale();
    const RealType b = dist.location();
 
-   // if b is 0 avoid divde by 0 error
-   if(abs(b) < std::numeric_limits<RealType>::epsilon())
+   // if b is 0 avoid divide by 0 error
+   if(abs(b) < boost::math::numeric_limits<RealType>::epsilon())
    {
       result = log(pdf(dist, x));
    }
@@ -194,13 +199,13 @@ inline RealType logpdf(const laplace_distribution<RealType, Policy>& dist, const
 } // logpdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // For ADL of std functions.
 
    RealType result = 0;
    // Checking function argument.
-   const char* function = "boost::math::cdf(const laplace_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const laplace_distribution<%1%>&, %1%)";
    // Check scale and location.
    if (false == dist.check_parameters(function, &result)) return result;
 
@@ -228,13 +233,13 @@ inline RealType cdf(const laplace_distribution<RealType, Policy>& dist, const Re
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType logcdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const laplace_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // For ADL of std functions.
 
    RealType result = 0;
    // Checking function argument.
-   const char* function = "boost::math::logcdf(const laplace_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const laplace_distribution<%1%>&, %1%)";
    // Check scale and location.
    if (false == dist.check_parameters(function, &result)) 
    {
@@ -273,13 +278,13 @@ inline RealType logcdf(const laplace_distribution<RealType, Policy>& dist, const
 } // logcdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const laplace_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const laplace_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING // for ADL of std functions.
 
    // Checking function argument
    RealType result = 0;
-   const char* function = "boost::math::quantile(const laplace_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const laplace_distribution<%1%>&, %1%)";
    if (false == dist.check_parameters(function, &result)) return result;
    if(false == detail::check_probability(function, p, &result, Policy())) return result;
 
@@ -311,7 +316,7 @@ inline RealType quantile(const laplace_distribution<RealType, Policy>& dist, con
 
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<laplace_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<laplace_distribution<RealType, Policy>, RealType>& c)
 {
    // Calculate complement of cdf.
    BOOST_MATH_STD_USING // for ADL of std functions
@@ -322,7 +327,7 @@ inline RealType cdf(const complemented2_type<laplace_distribution<RealType, Poli
    RealType result = 0;
 
    // Checking function argument.
-   const char* function = "boost::math::cdf(const complemented2_type<laplace_distribution<%1%>, %1%>&)";
+   constexpr auto function = "boost::math::cdf(const complemented2_type<laplace_distribution<%1%>, %1%>&)";
 
    // Check scale and location.
     if (false == c.dist.check_parameters(function, &result)) return result;
@@ -348,7 +353,7 @@ inline RealType cdf(const complemented2_type<laplace_distribution<RealType, Poli
 } // cdf complement
 
 template <class RealType, class Policy>
-inline RealType logcdf(const complemented2_type<laplace_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<laplace_distribution<RealType, Policy>, RealType>& c)
 {
    // Calculate complement of logcdf.
    BOOST_MATH_STD_USING // for ADL of std functions
@@ -359,7 +364,7 @@ inline RealType logcdf(const complemented2_type<laplace_distribution<RealType, P
    RealType result = 0;
 
    // Checking function argument.
-   const char* function = "boost::math::logcdf(const complemented2_type<laplace_distribution<%1%>, %1%>&)";
+   constexpr auto function = "boost::math::logcdf(const complemented2_type<laplace_distribution<%1%>, %1%>&)";
 
    // Check scale and location.
     if (false == c.dist.check_parameters(function, &result)) return result;
@@ -389,7 +394,7 @@ inline RealType logcdf(const complemented2_type<laplace_distribution<RealType, P
 } // cdf complement
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<laplace_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<laplace_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions.
 
@@ -400,17 +405,17 @@ inline RealType quantile(const complemented2_type<laplace_distribution<RealType,
    RealType result = 0;
 
    // Checking function argument.
-   const char* function = "quantile(const complemented2_type<laplace_distribution<%1%>, %1%>&)";
+   constexpr auto function = "quantile(const complemented2_type<laplace_distribution<%1%>, %1%>&)";
    if (false == c.dist.check_parameters(function, &result)) return result;
    
    // Extreme values.
    if(q == 0)
    {
-       return std::numeric_limits<RealType>::infinity();
+       return boost::math::numeric_limits<RealType>::infinity();
    }
    if(q == 1)
    {
-       return -std::numeric_limits<RealType>::infinity();
+       return -boost::math::numeric_limits<RealType>::infinity();
    }
    if(false == detail::check_probability(function, q, &result, Policy())) return result;
 
@@ -424,49 +429,49 @@ inline RealType quantile(const complemented2_type<laplace_distribution<RealType,
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType mean(const laplace_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const laplace_distribution<RealType, Policy>& dist)
 {
    return dist.location();
 }
 
 template <class RealType, class Policy>
-inline RealType standard_deviation(const laplace_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType standard_deviation(const laplace_distribution<RealType, Policy>& dist)
 {
    return constants::root_two<RealType>() * dist.scale();
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const laplace_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const laplace_distribution<RealType, Policy>& dist)
 {
    return dist.location();
 }
 
 template <class RealType, class Policy>
-inline RealType median(const laplace_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const laplace_distribution<RealType, Policy>& dist)
 {
    return dist.location();
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const laplace_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const laplace_distribution<RealType, Policy>& /*dist*/)
 {
    return 0;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const laplace_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const laplace_distribution<RealType, Policy>& /*dist*/)
 {
    return 6;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const laplace_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const laplace_distribution<RealType, Policy>& /*dist*/)
 {
    return 3;
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const laplace_distribution<RealType, Policy> & dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const laplace_distribution<RealType, Policy> & dist)
 {
    using std::log;
    return log(2*dist.scale()*constants::e<RealType>());
diff --git a/inst/include/boost/math/distributions/logistic.hpp b/inst/include/boost/math/distributions/logistic.hpp
index d12de48c5..56dc6e9f2 100644
--- a/inst/include/boost/math/distributions/logistic.hpp
+++ b/inst/include/boost/math/distributions/logistic.hpp
@@ -1,5 +1,5 @@
 // Copyright 2008 Gautam Sewani
-//
+// Copyright 2024 Matt Borland
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -8,12 +8,17 @@
 #ifndef BOOST_MATH_DISTRIBUTIONS_LOGISTIC
 #define BOOST_MATH_DISTRIBUTIONS_LOGISTIC
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/precision.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/constants/constants.hpp>
-#include <utility>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost { namespace math { 
 
@@ -24,22 +29,22 @@ namespace boost { namespace math {
       typedef RealType value_type;
       typedef Policy policy_type;
       
-      logistic_distribution(RealType l_location=0, RealType l_scale=1) // Constructor.
+      BOOST_MATH_GPU_ENABLED logistic_distribution(RealType l_location=0, RealType l_scale=1) // Constructor.
         : m_location(l_location), m_scale(l_scale) 
       {
-        static const char* function = "boost::math::logistic_distribution<%1%>::logistic_distribution";
+        constexpr auto function = "boost::math::logistic_distribution<%1%>::logistic_distribution";
         
         RealType result;
         detail::check_scale(function, l_scale, &result, Policy());
         detail::check_location(function, l_location, &result, Policy());
       }
       // Accessor functions.
-      RealType scale()const
+      BOOST_MATH_GPU_ENABLED RealType scale()const
       {
         return m_scale;
       }
       
-      RealType location()const
+      BOOST_MATH_GPU_ENABLED RealType location()const
       {
         return m_location;
       }
@@ -60,26 +65,26 @@ namespace boost { namespace math {
     #endif
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const logistic_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const logistic_distribution<RealType, Policy>& /* dist */)
     { // Range of permissible values for random variable x.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(
-         std::numeric_limits<RealType>::has_infinity ? -std::numeric_limits<RealType>::infinity() : -max_value<RealType>(), 
-         std::numeric_limits<RealType>::has_infinity ? std::numeric_limits<RealType>::infinity() : max_value<RealType>());
+      return boost::math::pair<RealType, RealType>(
+         boost::math::numeric_limits<RealType>::has_infinity ? -boost::math::numeric_limits<RealType>::infinity() : -max_value<RealType>(), 
+         boost::math::numeric_limits<RealType>::has_infinity ? boost::math::numeric_limits<RealType>::infinity() : max_value<RealType>());
     }
     
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const logistic_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const logistic_distribution<RealType, Policy>& /* dist */)
     { // Range of supported values for random variable x.
       // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + infinity
+      return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + infinity
     }
      
     template <class RealType, class Policy>
-    inline RealType pdf(const logistic_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType pdf(const logistic_distribution<RealType, Policy>& dist, const RealType& x)
     {
-       static const char* function = "boost::math::pdf(const logistic_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::pdf(const logistic_distribution<%1%>&, %1%)";
        RealType scale = dist.scale();
        RealType location = dist.location();
        RealType result = 0;
@@ -114,12 +119,12 @@ namespace boost { namespace math {
     } 
     
     template <class RealType, class Policy>
-    inline RealType cdf(const logistic_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const logistic_distribution<RealType, Policy>& dist, const RealType& x)
     {
        RealType scale = dist.scale();
        RealType location = dist.location();
        RealType result = 0; // of checks.
-       static const char* function = "boost::math::cdf(const logistic_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::cdf(const logistic_distribution<%1%>&, %1%)";
        if(false == detail::check_scale(function, scale, &result, Policy()))
        {
           return result;
@@ -149,12 +154,12 @@ namespace boost { namespace math {
     }
 
     template <class RealType, class Policy>
-    inline RealType logcdf(const logistic_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType logcdf(const logistic_distribution<RealType, Policy>& dist, const RealType& x)
     {
        RealType scale = dist.scale();
        RealType location = dist.location();
        RealType result = 0; // of checks.
-       static const char* function = "boost::math::cdf(const logistic_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::cdf(const logistic_distribution<%1%>&, %1%)";
        if(false == detail::check_scale(function, scale, &result, Policy()))
        {
           return result;
@@ -192,13 +197,13 @@ namespace boost { namespace math {
     } 
     
     template <class RealType, class Policy>
-    inline RealType quantile(const logistic_distribution<RealType, Policy>& dist, const RealType& p)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const logistic_distribution<RealType, Policy>& dist, const RealType& p)
     {
        BOOST_MATH_STD_USING
        RealType location = dist.location();
        RealType scale = dist.scale();
 
-       static const char* function = "boost::math::quantile(const logistic_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::quantile(const logistic_distribution<%1%>&, %1%)";
 
        RealType result = 0;
        if(false == detail::check_scale(function, scale, &result, Policy()))
@@ -228,13 +233,13 @@ namespace boost { namespace math {
      } // RealType quantile(const logistic_distribution<RealType, Policy>& dist, const RealType& p)
     
     template <class RealType, class Policy>
-    inline RealType cdf(const complemented2_type<logistic_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<logistic_distribution<RealType, Policy>, RealType>& c)
     {
        BOOST_MATH_STD_USING
        RealType location = c.dist.location();
        RealType scale = c.dist.scale();
        RealType x = c.param;
-       static const char* function = "boost::math::cdf(const complement(logistic_distribution<%1%>&), %1%)";
+       constexpr auto function = "boost::math::cdf(const complement(logistic_distribution<%1%>&), %1%)";
 
        RealType result = 0;
        if(false == detail::check_scale(function, scale, &result, Policy()))
@@ -263,13 +268,13 @@ namespace boost { namespace math {
     } 
 
     template <class RealType, class Policy>
-    inline RealType logcdf(const complemented2_type<logistic_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<logistic_distribution<RealType, Policy>, RealType>& c)
     {
        BOOST_MATH_STD_USING
        RealType location = c.dist.location();
        RealType scale = c.dist.scale();
        RealType x = c.param;
-       static const char* function = "boost::math::cdf(const complement(logistic_distribution<%1%>&), %1%)";
+       constexpr auto function = "boost::math::cdf(const complement(logistic_distribution<%1%>&), %1%)";
 
        RealType result = 0;
        if(false == detail::check_scale(function, scale, &result, Policy()))
@@ -299,12 +304,12 @@ namespace boost { namespace math {
     }  
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<logistic_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<logistic_distribution<RealType, Policy>, RealType>& c)
     {
        BOOST_MATH_STD_USING
        RealType scale = c.dist.scale();
        RealType location = c.dist.location();
-       static const char* function = "boost::math::quantile(const complement(logistic_distribution<%1%>&), %1%)";
+       constexpr auto function = "boost::math::quantile(const complement(logistic_distribution<%1%>&), %1%)";
        RealType result = 0;
        if(false == detail::check_scale(function, scale, &result, Policy()))
           return result;
@@ -335,13 +340,13 @@ namespace boost { namespace math {
     } 
     
     template <class RealType, class Policy>
-    inline RealType mean(const logistic_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const logistic_distribution<RealType, Policy>& dist)
     {
       return dist.location();
     } // RealType mean(const logistic_distribution<RealType, Policy>& dist)
     
     template <class RealType, class Policy>
-    inline RealType variance(const logistic_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const logistic_distribution<RealType, Policy>& dist)
     {
       BOOST_MATH_STD_USING
       RealType scale = dist.scale();
@@ -349,36 +354,36 @@ namespace boost { namespace math {
     } // RealType variance(const logistic_distribution<RealType, Policy>& dist)
     
     template <class RealType, class Policy>
-    inline RealType mode(const logistic_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const logistic_distribution<RealType, Policy>& dist)
     {
       return dist.location();
     }
     
     template <class RealType, class Policy>
-    inline RealType median(const logistic_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType median(const logistic_distribution<RealType, Policy>& dist)
     {
       return dist.location();
     }
     template <class RealType, class Policy>
-    inline RealType skewness(const logistic_distribution<RealType, Policy>& /*dist*/)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const logistic_distribution<RealType, Policy>& /*dist*/)
     {
       return 0;
     } // RealType skewness(const logistic_distribution<RealType, Policy>& dist)
     
     template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const logistic_distribution<RealType, Policy>& /*dist*/)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const logistic_distribution<RealType, Policy>& /*dist*/)
     {
       return static_cast<RealType>(6)/5; 
     } // RealType kurtosis_excess(const logistic_distribution<RealType, Policy>& dist)
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const logistic_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const logistic_distribution<RealType, Policy>& dist)
     {
       return kurtosis_excess(dist) + 3;
     } // RealType kurtosis_excess(const logistic_distribution<RealType, Policy>& dist)
 
     template <class RealType, class Policy>
-    inline RealType entropy(const logistic_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType entropy(const logistic_distribution<RealType, Policy>& dist)
     {
        using std::log;
        return 2 + log(dist.scale());
diff --git a/inst/include/boost/math/distributions/lognormal.hpp b/inst/include/boost/math/distributions/lognormal.hpp
index 3c8f576e5..dfc3e4b2a 100644
--- a/inst/include/boost/math/distributions/lognormal.hpp
+++ b/inst/include/boost/math/distributions/lognormal.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,12 +11,15 @@
 // http://mathworld.wolfram.com/LogNormalDistribution.html
 // http://en.wikipedia.org/wiki/Lognormal_distribution
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/promotion.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/distributions/normal.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
-
-#include <utility>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/constants/constants.hpp>
 
 namespace boost{ namespace math
 {
@@ -23,7 +27,7 @@ namespace detail
 {
 
   template <class RealType, class Policy>
-  inline bool check_lognormal_x(
+  BOOST_MATH_GPU_ENABLED inline bool check_lognormal_x(
         const char* function,
         RealType const& x,
         RealType* result, const Policy& pol)
@@ -48,7 +52,7 @@ class lognormal_distribution
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   lognormal_distribution(RealType l_location = 0, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED lognormal_distribution(RealType l_location = 0, RealType l_scale = 1)
       : m_location(l_location), m_scale(l_scale)
    {
       RealType result;
@@ -56,12 +60,12 @@ class lognormal_distribution
       detail::check_location("boost::math::lognormal_distribution<%1%>::lognormal_distribution", l_location, &result, Policy());
    }
 
-   RealType location()const
+   BOOST_MATH_GPU_ENABLED RealType location()const
    {
       return m_location;
    }
 
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    {
       return m_scale;
    }
@@ -83,29 +87,29 @@ lognormal_distribution(RealType,RealType)->lognormal_distribution<typename boost
 #endif
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> range(const lognormal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const lognormal_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x is >0 to +infinity.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> support(const lognormal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const lognormal_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-RealType pdf(const lognormal_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED RealType pdf(const lognormal_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType mu = dist.location();
    RealType sigma = dist.scale();
 
-   static const char* function = "boost::math::pdf(const lognormal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const lognormal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(0 == detail::check_scale(function, sigma, &result, Policy()))
@@ -129,11 +133,11 @@ RealType pdf(const lognormal_distribution<RealType, Policy>& dist, const RealTyp
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const lognormal_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const lognormal_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const lognormal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const lognormal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(0 == detail::check_scale(function, dist.scale(), &result, Policy()))
@@ -151,11 +155,11 @@ inline RealType cdf(const lognormal_distribution<RealType, Policy>& dist, const
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const lognormal_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const lognormal_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const lognormal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const lognormal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(0 == detail::check_scale(function, dist.scale(), &result, Policy()))
@@ -175,11 +179,11 @@ inline RealType quantile(const lognormal_distribution<RealType, Policy>& dist, c
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<lognormal_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<lognormal_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const lognormal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const lognormal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(0 == detail::check_scale(function, c.dist.scale(), &result, Policy()))
@@ -197,11 +201,11 @@ inline RealType cdf(const complemented2_type<lognormal_distribution<RealType, Po
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<lognormal_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<lognormal_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const lognormal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const lognormal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(0 == detail::check_scale(function, c.dist.scale(), &result, Policy()))
@@ -221,7 +225,7 @@ inline RealType quantile(const complemented2_type<lognormal_distribution<RealTyp
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
@@ -238,7 +242,7 @@ inline RealType mean(const lognormal_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType variance(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
@@ -255,7 +259,7 @@ inline RealType variance(const lognormal_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
@@ -272,7 +276,7 @@ inline RealType mode(const lognormal_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType median(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
    RealType mu = dist.location();
@@ -280,7 +284,7 @@ inline RealType median(const lognormal_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
@@ -300,7 +304,7 @@ inline RealType skewness(const lognormal_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
@@ -318,7 +322,7 @@ inline RealType kurtosis(const lognormal_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const lognormal_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
@@ -336,9 +340,9 @@ inline RealType kurtosis_excess(const lognormal_distribution<RealType, Policy>&
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const lognormal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const lognormal_distribution<RealType, Policy>& dist)
 {
-   using std::log;
+   BOOST_MATH_STD_USING
    RealType mu = dist.location();
    RealType sigma = dist.scale();
    return mu + log(constants::two_pi<RealType>()*constants::e<RealType>()*sigma*sigma)/2;
diff --git a/inst/include/boost/math/distributions/mapairy.hpp b/inst/include/boost/math/distributions/mapairy.hpp
new file mode 100644
index 000000000..8bf1f990c
--- /dev/null
+++ b/inst/include/boost/math/distributions/mapairy.hpp
@@ -0,0 +1,4220 @@
+//  Copyright Takuma Yoshimura 2024.
+//  Copyright Matt Borland 2024.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_STATS_MAPAIRY_HPP
+#define BOOST_STATS_MAPAIRY_HPP
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/tools/big_constant.hpp>
+#include <boost/math/distributions/complement.hpp>
+#include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/distributions/detail/derived_accessors.hpp>
+#include <boost/math/tools/rational.hpp>
+#include <boost/math/special_functions/cbrt.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/tools/promotion.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
+#include <cmath>
+#endif
+
+namespace boost { namespace math {
+template <class RealType, class Policy>
+class mapairy_distribution;
+
+namespace detail {
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 3.7591e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.97516171847191855610e-1),
+            static_cast<RealType>(3.67488253628465083737e-2),
+            static_cast<RealType>(-9.73242224038828612673e-4),
+            static_cast<RealType>(2.32207514136635673061e-3),
+            static_cast<RealType>(5.69067907423210669037e-5),
+            static_cast<RealType>(-6.02637387141524535193e-5),
+            static_cast<RealType>(1.04960324426666933327e-5),
+            static_cast<RealType>(-6.58470237954242016920e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.09464351647314165710e-1),
+            static_cast<RealType>(3.66413036246461392316e-1),
+            static_cast<RealType>(1.10947882302862241488e-1),
+            static_cast<RealType>(2.65928486676817177159e-2),
+            static_cast<RealType>(3.75507284977386290874e-3),
+            static_cast<RealType>(4.03789594641339005785e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.5996e-20
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.06251243013238748252e-1),
+            static_cast<RealType>(1.38178831205785069108e-2),
+            static_cast<RealType>(4.19280374368049006206e-3),
+            static_cast<RealType>(8.54607219684690930289e-4),
+            static_cast<RealType>(-7.46881084120928210702e-5),
+            static_cast<RealType>(1.47110856483345063335e-5),
+            static_cast<RealType>(-1.30090180307471994500e-6),
+            static_cast<RealType>(5.24801123304330014713e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.10853683888611687140e-1),
+            static_cast<RealType>(3.89361261627717143905e-1),
+            static_cast<RealType>(1.15124062681082170577e-1),
+            static_cast<RealType>(2.38803416611949902468e-2),
+            static_cast<RealType>(3.08616898814509065071e-3),
+            static_cast<RealType>(2.43760043942846261876e-4),
+            static_cast<RealType>(1.34538901435238836768e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1592e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(5.33842514891989443409e-2),
+            static_cast<RealType>(1.23301980674903270971e-2),
+            static_cast<RealType>(3.45717831433988631923e-3),
+            static_cast<RealType>(3.27034449923176875761e-4),
+            static_cast<RealType>(1.20406794831890291348e-5),
+            static_cast<RealType>(5.77489170397965604669e-7),
+            static_cast<RealType>(-1.15255267205685159063e-7),
+            static_cast<RealType>(9.15896323073109992939e-9),
+            static_cast<RealType>(-3.14068002815368247985e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.08772985520393226044e-1),
+            static_cast<RealType>(4.26418573702560818267e-1),
+            static_cast<RealType>(1.22033746594868893316e-1),
+            static_cast<RealType>(2.27934009200310243172e-2),
+            static_cast<RealType>(2.60658999011198623962e-3),
+            static_cast<RealType>(1.54461660261435227768e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.2228e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.58950538583133457384e-2),
+            static_cast<RealType>(7.47835440063141601948e-3),
+            static_cast<RealType>(1.81137244353261478410e-3),
+            static_cast<RealType>(2.26935565382135588558e-4),
+            static_cast<RealType>(1.43877113825683795505e-5),
+            static_cast<RealType>(2.08242747557417233626e-7),
+            static_cast<RealType>(-1.54976465724771282989e-9),
+            static_cast<RealType>(1.30762989300333026019e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.95505437381674174441e-1),
+            static_cast<RealType>(4.58882737262511297099e-1),
+            static_cast<RealType>(1.25031310192148865496e-1),
+            static_cast<RealType>(2.15727229249904102247e-2),
+            static_cast<RealType>(2.33597081566665672569e-3),
+            static_cast<RealType>(1.45198998318300328562e-4),
+            static_cast<RealType>(3.87962234445835345676e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0257e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(3.22517551525042172428e-3),
+            static_cast<RealType>(1.12822806030796339659e-3),
+            static_cast<RealType>(1.54489389961322571031e-4),
+            static_cast<RealType>(9.28479992527909796427e-6),
+            static_cast<RealType>(2.06168350199745832262e-7),
+            static_cast<RealType>(9.05110751997021418539e-10),
+            static_cast<RealType>(-2.15498112371756202097e-12),
+            static_cast<RealType>(6.41838355699777435924e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.53390465399680164234e-1),
+            static_cast<RealType>(1.82759048270449018482e-1),
+            static_cast<RealType>(2.80407546367978533849e-2),
+            static_cast<RealType>(2.50853443923476718145e-3),
+            static_cast<RealType>(1.27671852825846245421e-4),
+            static_cast<RealType>(3.28380135691060279203e-6),
+            static_cast<RealType>(3.06545317089055335742e-8),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.0510e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(5.82527663232857270992e-4),
+            static_cast<RealType>(6.89502117025124630567e-5),
+            static_cast<RealType>(2.24909795087265741433e-6),
+            static_cast<RealType>(2.18576787334972903790e-8),
+            static_cast<RealType>(3.39014723444178274435e-11),
+            static_cast<RealType>(-9.74481309265612390297e-15),
+            static_cast<RealType>(-1.13308546492906818388e-16),
+            static_cast<RealType>(5.32472028720777735712e-19),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.74018883667663396766e-1),
+            static_cast<RealType>(2.95901195665990089660e-2),
+            static_cast<RealType>(1.57901733512147920251e-3),
+            static_cast<RealType>(4.24965124147621236633e-5),
+            static_cast<RealType>(5.17522027193205842016e-7),
+            static_cast<RealType>(2.00522219276570039934e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.3294e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.03264853379349880039e-4),
+            static_cast<RealType>(5.35256306644392405447e-6),
+            static_cast<RealType>(9.00657716972118816692e-8),
+            static_cast<RealType>(5.34913574042209793720e-10),
+            static_cast<RealType>(6.70752605041678779380e-13),
+            static_cast<RealType>(-5.30089923101856817552e-16),
+            static_cast<RealType>(7.28133811621687143754e-19),
+            static_cast<RealType>(-7.38047553655951666420e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.29920843258164337377e-1),
+            static_cast<RealType>(6.75018577147646502386e-3),
+            static_cast<RealType>(1.77694968039695671819e-4),
+            static_cast<RealType>(2.46428299911920942946e-6),
+            static_cast<RealType>(1.67165053157990942546e-8),
+            static_cast<RealType>(4.19496974141131087116e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x * x * x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.6693e-20
+        BOOST_MATH_STATIC const RealType P[5] = {
+            static_cast<RealType>(5.98413420602149016910e-1),
+            static_cast<RealType>(3.14584075817417883086e-5),
+            static_cast<RealType>(1.62977928311793051895e1),
+            static_cast<RealType>(-4.12903117172994371875e-4),
+            static_cast<RealType>(-1.06404478702135751872e2),
+        };
+        BOOST_MATH_STATIC const RealType Q[3] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.25696892802060720079e-5),
+            static_cast<RealType>(4.03600055498020483920e1),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t / x;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 7.8308e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97516171847191855609649452292217911973e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17531822787252717270400174744562144891e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.85115358761409188259685286269086053296e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18029395189535552537870932989876189597e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77412874842522285996566741532939343827e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.77992070255086842672551073580133785334e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.54573264286260796576738952968288691782e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.94764012694602906119831079380500255557e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.97596258932025712802674070104281981323e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45466169112247379589927514614067756956e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.99760415118300349769641418430273526815e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43150486566834492207695241913522311930e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46130347604880355784938321408765318948e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11845869711743584628289654085905424438e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.80391154854347711297249357734993136108e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.75628443538173255184583966965162835227e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41016303833742742212624596040074202424e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.19142300833563644046500846364541891138e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02421707708633106515934651956262614532e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.03973732602338507411104824853671547615e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.35206168908201402570766383018708660819e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.38602606623008690327520130558254165564e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53740175911385378188372963739884519312e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27513004715414297729539702862351044344e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54510493017251997793679126704007098265e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.0723e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06251243013238748252181151646220197947e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.92438638323563234519452281479338921158e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83335793178622701784730867677919844599e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.84159075203218824591724451142550478306e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04213732090358859917896442076931334722e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.72388220651785798237487005913708387756e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.36099324022668533012286817710272936865e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74483270731217433628720245792741986795e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.56461597064783966758904403291149549559e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.28590608939674970691948223694855264817e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.81756745849477762773082030302943341729e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.65915115243311285178083515017249358853e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33250387018216706082200927591739589024e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.71707718560216685629188467984384070512e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.81316277289673837399162302797006618384e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78475951599121894570443981591530879087e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.16167801098514576400689883575304687623e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19167794366424137722223009369062644830e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.20831082064982892777497773490792080382e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27196399162146247210036306870401328410e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79335434374966775903734846875100087590e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30825409557870847168672662674521614782e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97296173230649275943984471731360073540e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.48943057909563158917114503727080517958e-9),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.0903e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.33842514891989443409465171800884519331e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53264053296761245408991932692426094424e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23210520807186629205810670362048049836e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.71104271443590027208545022968625306496e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98781446716778138729774954595209697813e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98895829308616657174932023565302947632e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.25993639218721804661037829873135732687e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.64669776700609853276056375742089715662e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.11846243382610611156151291892877027869e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.74830086064868141326053648144496072795e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07549997153431643849551871367000763445e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.10030596535721362628619523622308581344e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19376016170255697546854583591494809062e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52686177278870816414637961315363468426e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19872083945442288336636376283295310445e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.26633866969676511944680471882188527224e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41261867539396133951024374504099977090e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.18852182132645783844766153200510014113e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70152126044106007357033814742158353948e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.23810508827493234517751339979902448944e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.96161313274648769113605163816403306967e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.06693316156193327359541953619174255726e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.79366356086062616343285660797389238271e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.14585835815353770175366834099001313472e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05314631662369743547568064896403143693e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.90325380271096603676911761784650800378e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.36933359079566550212098911224675011839e-12),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.5015e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58950538583133457383574346194006716984e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.25447644411503971725638816502617490834e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47605882774114100209665040117276675598e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.12224864838900383464124716266085521485e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79164249640537972514574059182421325541e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.89668438166714230032406615413991628135e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.44410389750700463263686630222653669837e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.14788978994687095829140113472609739982e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.79821680629333600844514042061772236495e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.49636960435731257154960798035854124639e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70554745768928821263556963261516872171e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.42293994855343109617040824208078534205e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37599287094703195312894833570340165019e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.35248179978735448062307216459232932068e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.53569375838863862590910010617140120876e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94337325681904859647161946168957959628e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77120402023938328899162557073347121463e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01644685191130734907530007424741314392e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.12479655123720440909164080517207084404e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25556010526357752360439314019567992245e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.96143273204038192262150849394970544022e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.50612932318889495209230176354364299236e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.12160918304376427109905628326638480473e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.47696044292604039527013647985997661762e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.64067652576843720823459199100800335854e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.00745166063635113130434111509648306420e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05398901239421768403763864060147286105e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05698259572340563109985785513355912114e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19362835269415404005406782719825077472e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15444386779802728200716489787161419304e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02452666470008756043350040893761339083e-16),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0995e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.22517551525042172427941302520759668293e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.86576974828476461442549217748945498966e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18419822818191546598384139622512477000e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98396184944524020019688823190946146641e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.06686400532599396487775148973665625687e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.05680178109228687159829475615095925679e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.17554487015345146749705505971350254902e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14774751685364429557883242232797329274e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33266124509168360207594600356349282805e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76332756800842989348756910429214676252e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.60639771339252642992277508068105926919e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.41859490403554144799385471141184829903e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77177795293424055655391515546880774987e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76106923344461402353501262620681801053e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.68829978902134103249656805130103045021e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42496376687241918803028631991083570963e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19213376162053391168605415200906099633e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.65578261958732385181558047087365997878e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30046653564394292929001223763106276016e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.48388301731958697028701215596777178117e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.50873786049439122933188684993719288258e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23255654647151798865208394342856435797e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20861791399969402003082323686080041040e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.96882049090731653763684812243275884213e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.98669985741073085290012296575736698103e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.03383311816835346577432387682379226740e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.87320682938150375144724980774245810905e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13573468677076838075146150847170057373e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34526045003716422620879156626237175127e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.35681579117696161282979297336282783473e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92944288060269290125987728528698476197e-18),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0937e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.82527663232857270992129793621400616909e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41696401156754081476312871174198295322e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.42036620449365724707919875710197564857e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.67076745288708619632303078677641380627e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14278954094278648593125010577441869646e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40092485054621853149602511539550254471e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.17755660009065973828053533035808718033e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.23871371557251644837598540542648782066e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04069998646037977439620128812310273053e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.94055978349016208777803296823455779097e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29866428982892883091537921429389750973e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.06056281963023929277728535486590256573e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57963857545037466186123981516026589992e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.81390322233700529779563477285232205886e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52190981930441828041102818178755246228e-31),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.70564782441895707961338319466546005093e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47770566490107388849474183308889339231e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29364672385303439788399215507370006639e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.37279274083988250795581105436675097881e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72124151284421794872333348562536468054e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.96970247774973902625712414297788402746e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.38395055453444011915661055983937917120e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.19605460410208704830882138883730331113e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76945301389475508747530234950023648137e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33624384932503964160642677987886086890e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01155130710615988897664213446593907596e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03959317021567084067518847978890548086e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78213669817351488671519066803835958715e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75492332026736176991870807903277324902e-22),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.5856e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03264853379349880038687006045193401399e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79539964604630527636184900467871907171e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34840369549460790638336121351837912308e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.73087351972154879439617719914590729748e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51775493325347153520115736204545037264e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.60104651860674451546102708885530128768e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.90233449697112559539826150932808197444e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06978852724410115655105118663137681992e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.00399855296672416041126220131900937128e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.18139748830278263202087699889457673035e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43070756487288399784700274808326343543e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70126687893706466023887757573369648552e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.29405234560873665664952418690159194840e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.69069082510020066864633718082941688708e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.33468198065176301137949068264633336529e-37),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51951069241510130465691156908893803280e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84647597299970149588010858770320631739e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90239396588176334117512714878489376365e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.35551585337774834346900776840459179841e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53375746264539501168763602838029023222e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.42421935941736734247914078641324315900e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.23835501607741697737129504173606231513e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.79603272375172813955236187874231935324e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.44624821303153251954931367754173356213e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.10635081308984534416704147448323126303e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.14627867347129520510628554651739571006e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43792928765659831045040802615903432044e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.79856365207259871336606847582889916798e-25),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x * x * x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.5081e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[8] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.98413420602149016909919089901572802714e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30303835860684077803651094768293625633e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.89097726237252419724261295392691855545e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.12696604472230480273239741428914666511e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84517621403071494824886152940942995151e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.67577378292168927009421205756730205227e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.16343347002845084264982358165052437094e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.59558963351172885545760841064831356701e3),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.51965956124978480521462518750569617550e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61700833299761977287211297600922591853e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.94988298508869748383898344668918510537e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.52494213749069142804725453333400335525e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20093079283917759611690534481918040882e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.82564796242972192725215815897475246715e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t / x;
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.7525e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.76859868856746781256e-1),
+            static_cast<RealType>(1.10489814676299003241e-1),
+            static_cast<RealType>(-6.25690643488236678667e-3),
+            static_cast<RealType>(-1.17905420222527577236e-3),
+            static_cast<RealType>(1.27188963720084274122e-3),
+            static_cast<RealType>(-7.20575105181207907889e-5),
+            static_cast<RealType>(-2.22575633858411851032e-5),
+            static_cast<RealType>(2.94270091008508492304e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.98673671503410894284e-1),
+            static_cast<RealType>(3.15907666864554716291e-1),
+            static_cast<RealType>(8.34463558393629855977e-2),
+            static_cast<RealType>(2.71804643993972494173e-2),
+            static_cast<RealType>(3.52187050938036578406e-3),
+            static_cast<RealType>(7.03072974279509263844e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.0995e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.14483832832989822788e-1),
+            static_cast<RealType>(3.72789690317712876663e-1),
+            static_cast<RealType>(1.86473650057086284496e-1),
+            static_cast<RealType>(1.31182724166379598907e-2),
+            static_cast<RealType>(-9.00695064809774432392e-3),
+            static_cast<RealType>(3.46884420664996747052e-4),
+            static_cast<RealType>(4.88651392754189961173e-4),
+            static_cast<RealType>(-6.13516242712196835055e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.06478618107122200489e0),
+            static_cast<RealType>(4.08809060854459518663e-1),
+            static_cast<RealType>(2.66617598099501800866e-1),
+            static_cast<RealType>(4.53526315786051807494e-2),
+            static_cast<RealType>(2.44078693689626940834e-2),
+            static_cast<RealType>(1.52822572478697831870e-3),
+            static_cast<RealType>(8.69480001029742502197e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType s = exp(2 * x * x * x / 27) * sqrt(-x);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.4768e-18
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(2.74308494787955998605e-1),
+                static_cast<RealType>(4.87765991440983416392e-1),
+                static_cast<RealType>(3.84524365110270427617e-1),
+                static_cast<RealType>(1.77409497505926097339e-1),
+                static_cast<RealType>(5.25612864287310961520e-2),
+                static_cast<RealType>(1.01528615034079765421e-2),
+                static_cast<RealType>(1.20417225696161842090e-3),
+                static_cast<RealType>(6.97462693097107007719e-5),
+            };
+            BOOST_MATH_STATIC const RealType Q[8] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(1.81256903248465876424e0),
+                static_cast<RealType>(1.43959302060852067876e0),
+                static_cast<RealType>(6.65882284117861804351e-1),
+                static_cast<RealType>(1.97537712781845593211e-1),
+                static_cast<RealType>(3.81732970028510912201e-2),
+                static_cast<RealType>(4.52767489928026542226e-3),
+                static_cast<RealType>(2.62240194911920120003e-4),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -8) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 1.5741e-17
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(2.67391547707456587286e-1),
+                static_cast<RealType>(3.39319035621314371924e-1),
+                static_cast<RealType>(1.85434799940724207230e-1),
+                static_cast<RealType>(5.63667456320679857693e-2),
+                static_cast<RealType>(1.01231164548944177474e-2),
+                static_cast<RealType>(1.02501575174439362864e-3),
+                static_cast<RealType>(4.60769537123286016400e-5),
+                static_cast<RealType>(-4.92754650783224582641e-13),
+            };
+            BOOST_MATH_STATIC const RealType Q[7] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(1.27271216837333318516e0),
+                static_cast<RealType>(6.96551952883867277759e-1),
+                static_cast<RealType>(2.11871363524516350422e-1),
+                static_cast<RealType>(3.80622887806509632537e-2),
+                static_cast<RealType>(3.85400280812991562328e-3),
+                static_cast<RealType>(1.73246593953823694311e-4),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -16) {
+            RealType t = -x - 8;
+
+            // Rational Approximation
+            // Maximum Relative Error: 4.6579e-17
+            BOOST_MATH_STATIC const RealType P[6] = {
+                static_cast<RealType>(2.66153901932100301337e-1),
+                static_cast<RealType>(1.65767350677458230714e-1),
+                static_cast<RealType>(4.19801402197670061146e-2),
+                static_cast<RealType>(5.39337995172784579558e-3),
+                static_cast<RealType>(3.50811247702301287586e-4),
+                static_cast<RealType>(9.21758454778883157515e-6),
+            };
+            BOOST_MATH_STATIC const RealType Q[6] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(6.23092941554668369107e-1),
+                static_cast<RealType>(1.57829914506366827914e-1),
+                static_cast<RealType>(2.02787979758160988615e-2),
+                static_cast<RealType>(1.31903008994475216511e-3),
+                static_cast<RealType>(3.46575870637847438219e-5),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -32) {
+            RealType t = -x - 16;
+
+            // Rational Approximation
+            // Maximum Relative Error: 5.2014e-17
+            BOOST_MATH_STATIC const RealType P[5] = {
+                static_cast<RealType>(2.65985830928929730672e-1),
+                static_cast<RealType>(7.19655029633308583205e-2),
+                static_cast<RealType>(7.26293125679558421946e-3),
+                static_cast<RealType>(3.24276402295343802262e-4),
+                static_cast<RealType>(5.40508013573989841127e-6),
+            };
+            BOOST_MATH_STATIC const RealType Q[5] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(2.70578525590448009961e-1),
+                static_cast<RealType>(2.73082032706004833847e-2),
+                static_cast<RealType>(1.21926059813954504560e-3),
+                static_cast<RealType>(2.03227900426552177849e-5),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.2870e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76859868856746781256050397658493368372e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13037642242224438972685982606987140111e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.93206268361082760254653961897373271146e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12844418906916902333116398594921450782e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36889326770180267250286619759335338794e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.95272615884641416804001553871108995422e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.53808638264746233799776679481568171506e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.92177790427881393122479399837010657693e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93492737815019893169693306410980499366e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.87510085148730083683110532987841223544e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.28469424017979299382094276157986775969e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83693904015623816528442886551032709693e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.77632857558257155545506847333166147492e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00448215148716947837105979735199471601e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.69069814466926608209872727645156315374e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.89657828158127300370734997707096744077e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62713433978940724622996782534485162816e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.91600878366366974062522408704458777166e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.89144035500328704769924414014440238441e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.35263616916053275381069097012458200491e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49136684724986851824746531490006769036e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65912003138912073317982729161392623277e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.65931144405541620572732754508534372034e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40193555853535182510951061797573338442e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.43625211359756249232841566256877823039e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33207781577559817130740123609636060998e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1977e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14483832832989822788477500521594411868e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75657192307644021285091474845448102656e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40437358470633234235031852091608646844e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66609942512054705023295445270747546208e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.54563774151184610728476161049657676321e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51479057544157089574005315379453615537e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.59853789372610909788599341307719626846e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.76919062715142378209907670793921883406e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.58572738466179822770103948740437237476e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.66618046393835590932491510543557226290e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.26253044828460469263564567571249315188e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11130363073235247786909976446790746902e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.49023728251751416730708805268921994420e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.11919889346080886194925406930280687022e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.99082771425048574611745923487528183522e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99525320878512488641033584061027063035e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.20775109959302182467696345673111724657e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67505804311611026128557007926613964162e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.77854913919309273628222660024596583623e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91661599559554233157812211199256222756e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.83924945472605861063053622956144354568e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.84286353909650034923710426843028632590e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57737060659799463556626420070111210218e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76047305116625604109657617040360402976e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.86975509621224474718728318687795215895e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71646204381423826495116781730719271111e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30359141441663007574346497273327240071e-9),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType s = exp(2 * x * x * x / 27) * sqrt(-x);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 5.4547e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74308494787955998605105974174143750745e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.56767876568276519015214709629156760546e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23402577465454790961498400214198520261e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09577559351834952074671208183548972395e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.76209118910349927892265971592071407626e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.09368637728788364895148841703533651597e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09003822946777310058789032386408519829e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02362804210869367995322279203786166303e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.67210045349462046966360849113168808620e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17170437120510484976042000272825166724e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62068279517157268391045945672600042900e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72238125522303876741011786930129571553e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33906175951716762094473406744654874848e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.88118741063309731598638313174835288433e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78908322579081615215057968216358892954e-9),
+            };
+            BOOST_MATH_STATIC const RealType Q[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15777668058369565739250784347385217839e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.58275582332060589146223977924181161908e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08890987062755381429904193744273374370e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53062680969750921573862970262146744660e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15983695707064161504470525373678920004e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.09120624447001177857109399158887656977e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13566107440776375294261717406754395407e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50716565210262652091950832287627406780e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40417354541359829249609883808591989082e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.09285589734746898623782466689035549135e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.47580156629757526370271002425784456931e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.03479533688660179064728081632921439825e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.58728676819719406366664644282113323077e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72685000369623096389026353785111272994e-9),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -8) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 1.8813e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67391547707456587286086623414017962238e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.69944730920904699720804320295067934914e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.80384452804523880914883464295008532437e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.74832028145199140240423863864148009059e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71728522451977382202061046054643165624e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.91023495084678296967637417245526177858e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57730498044529764612538979048001166775e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31940820074475947691746555183209863058e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.54175805821840981842505041345112198286e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.31350452337838677820161124238784043790e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.52175993144502511705213771924810467309e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.85684239411667243910736588216628677445e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27124210379062272403030391492854565008e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17645475312219452046348851569796494059e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06306499345515479193219487228315566344e-11),
+            };
+            BOOST_MATH_STATIC const RealType Q[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13521398369589479131299586715604029947e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17680254721938920978999949995837883884e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40693619288419980101309080614788657638e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.44930162913500531579305526795523256972e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22044272115074113804712893993125987243e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.92745159832354238503828226333417152767e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24766164774700476810039401793119553409e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08325637569571782180723187639357833929e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74954547353553788519997212700557196088e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82800744682204649977844278025855329390e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.20210992299988298543034791887173754015e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22996819257926038785424888617824130286e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.42340212199922656577943251139931264313e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.75700556749505163188370496864513941614e-11),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -16) {
+            RealType t = -x - 8;
+
+            // Rational Approximation
+            // Maximum Relative Error: 3.7501e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66153901932100301337118653561328446399e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.52542079386371212946566450189144670788e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.17560936304516198261138159102435548430e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.26792904240601626330507068992045446428e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15418212265160879313643948347460896640e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.05247220687656529725024232836519908641e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.64228534097787946289779529645800775231e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.85634097697132464418223150629017524118e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.49585420710073223183176764488210189671e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.48871040740917898530270248991342594461e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.42577266655992039477272273926475476183e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19214263302271253341410568192952269518e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36635313919771528255819112450043338510e-12),
+            };
+            BOOST_MATH_STATIC const RealType Q[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32484755553196872705775494679365596205e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.17714315014480774542066462899317631393e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.10789882607024692577764888497624620277e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09821963157449764169644456445120769215e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52354198870000121894280965999352991441e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12133327236256081067100384182795121111e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.20187894923874357333806454001674518211e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69039238999927049119096278882765161803e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.35737444680219098802811205475695127060e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.54403624143647064402264521374546365073e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.24233005893817070145949404296998119469e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.89735152971223120087721392400123727326e-12),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -32) {
+            RealType t = -x - 16;
+
+            // Rational Approximation
+            // Maximum Relative Error: 9.2696e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65985830928929730672052407058361701971e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.80409998734303497641108024806388734755e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.49286120625421787109350223436127409819e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.89160491404149422833016337592047445082e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16725811789351893632348469796802834008e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.43438517439595919021069131504449842238e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.29058184637190638359623120253986595623e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.03288592271246432030980385908922413497e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.12286831076824535034975676306286388291e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.64563161552001551475186730009447111173e-11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13183856815615371136129883169639301710e-13),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.02405342795439598418033139109649640085e-35),
+            };
+            BOOST_MATH_STATIC const RealType Q[11] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.78286317363568496229516074305435186276e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06519013547074134846431611115576250187e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.71907733798006110542919988654989891098e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.38874744033460851257697736304200953873e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.54724289412996188575775800547576856966e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98922099980447626797646560786207812928e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.64352676367403443733555974471752023206e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92616898324742524009679754162620171773e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87471345773127482399498877510153906820e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92954174836731254818376396170511443820e-12),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -64) {
+            RealType t = -x - 32;
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.3524e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[10] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65964563346442080104568381680822923977e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.77958685324702990033291591478515962894e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.56419338083136866686699803771820491401e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.82465178504003399087279098324316458608e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92402911374159755476910533154145918079e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.91224450962405933321548581824712789516e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.84063939469145970625490205194192347630e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.15300528698702940691774461674788639801e-11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.85553643603397817535280932672322232325e-13),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.46207029637607033398822620480584537642e-38),
+            };
+            BOOST_MATH_STATIC const RealType Q[9] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54906717312241693103173902792310528801e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84408124581401290943345932332007045483e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81403744024723164669745491417804917709e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.23423244618880845765135047598258754409e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.84697524433421334697753031272973192290e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.94803525968789587050040294764458613062e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68948879514200831687856703804327184420e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07366525547027105672618224029122809899e-12),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53> &tag) {
+    if (x >= 0) {
+        return mapairy_pdf_plus_imp_prec<RealType>(x, tag);
+    }
+    else if (x <= 0) {
+        return mapairy_pdf_minus_imp_prec<RealType>(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>& tag) {
+    if (x >= 0) {
+        return mapairy_pdf_plus_imp_prec<RealType>(x, tag);
+    }
+    else if (x <= 0) {
+        return mapairy_pdf_minus_imp_prec<RealType>(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_pdf_imp(const mapairy_distribution<RealType, Policy>& dist, const RealType& x) {
+    //
+    // This calculates the pdf of the Map-Airy distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::pdf(mapairy<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Map-Airy distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale;
+
+    result = mapairy_pdf_imp_prec(u, tag_type()) / scale;
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 2.9194e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(3.33333333333333333333e-1),
+            static_cast<RealType>(7.49532137610545010591e-2),
+            static_cast<RealType>(9.25326921848155048716e-3),
+            static_cast<RealType>(6.59133092365796208900e-3),
+            static_cast<RealType>(-5.21942678326323374113e-4),
+            static_cast<RealType>(8.22766804917461941348e-5),
+            static_cast<RealType>(-3.97941251650023182117e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.17408156824742736411e-1),
+            static_cast<RealType>(3.57041011418415988268e-1),
+            static_cast<RealType>(1.04580353775369716002e-1),
+            static_cast<RealType>(1.87521616934129432292e-2),
+            static_cast<RealType>(2.33232161135637085535e-3),
+            static_cast<RealType>(7.31285352607895467310e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.1531e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.84196970581015939888e-1),
+            static_cast<RealType>(-1.19398028299089933853e-3),
+            static_cast<RealType>(1.21954054797949597854e-2),
+            static_cast<RealType>(-9.37912675685073154845e-4),
+            static_cast<RealType>(1.66651954077980453212e-4),
+            static_cast<RealType>(-1.33271812303025233648e-5),
+            static_cast<RealType>(5.35982226125013888796e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.70352826101668448273e-1),
+            static_cast<RealType>(1.98852010141232271304e-1),
+            static_cast<RealType>(3.64864882318453496161e-2),
+            static_cast<RealType>(4.22173125405065522298e-3),
+            static_cast<RealType>(1.20079284386796600356e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.8348e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.07409273397524124098e-1),
+            static_cast<RealType>(3.83900318969331880402e-2),
+            static_cast<RealType>(1.17926652359826576790e-2),
+            static_cast<RealType>(1.52181625871479030046e-3),
+            static_cast<RealType>(1.50703424417132565662e-4),
+            static_cast<RealType>(2.10117959279448106308e-6),
+            static_cast<RealType>(1.97360985832285866640e-8),
+            static_cast<RealType>(-1.06076300080048408251e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.54435380513870673497e-1),
+            static_cast<RealType>(3.66021233157880878411e-1),
+            static_cast<RealType>(9.42985570806905160687e-2),
+            static_cast<RealType>(1.54122343653998564507e-2),
+            static_cast<RealType>(1.49849056258932455548e-3),
+            static_cast<RealType>(6.94290406268856211707e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.6624e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(4.70720199535228802538e-2),
+            static_cast<RealType>(2.67200763833749070079e-2),
+            static_cast<RealType>(7.37400551855064729769e-3),
+            static_cast<RealType>(1.10592441765001623699e-3),
+            static_cast<RealType>(9.15846028547400212588e-5),
+            static_cast<RealType>(3.17801522553862136789e-6),
+            static_cast<RealType>(2.03102753319827713542e-8),
+            static_cast<RealType>(-5.16172854149066643529e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.05317644829451086870e-1),
+            static_cast<RealType>(3.73713496637025562492e-1),
+            static_cast<RealType>(8.94434672792094976627e-2),
+            static_cast<RealType>(1.31846542255347106087e-2),
+            static_cast<RealType>(1.16680596342421447100e-3),
+            static_cast<RealType>(5.44719256441278863300e-5),
+            static_cast<RealType>(8.73131209154185067287e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.6243e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.74847564444513000450e-2),
+            static_cast<RealType>(6.00209162595027323742e-3),
+            static_cast<RealType>(7.86550260761375576075e-4),
+            static_cast<RealType>(4.46682547335758521734e-5),
+            static_cast<RealType>(9.51329761417139273391e-7),
+            static_cast<RealType>(4.10313065114362712333e-9),
+            static_cast<RealType>(-9.81286503831545640189e-12),
+            static_cast<RealType>(2.98763969872672156104e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.27732094554221674504e-1),
+            static_cast<RealType>(1.14330643482604301178e-1),
+            static_cast<RealType>(1.27722341942374066265e-2),
+            static_cast<RealType>(7.54563340152441778517e-4),
+            static_cast<RealType>(2.13377039814057925832e-5),
+            static_cast<RealType>(2.09670987094350618690e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.4684e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(6.22684103170563193015e-3),
+            static_cast<RealType>(1.34714356588780958096e-3),
+            static_cast<RealType>(9.51289465377874891896e-5),
+            static_cast<RealType>(2.64918464474843134081e-6),
+            static_cast<RealType>(2.66703857491046795285e-8),
+            static_cast<RealType>(5.42037888457985833156e-11),
+            static_cast<RealType>(-6.18017115447736427379e-14),
+            static_cast<RealType>(9.11626234402148561268e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.09895694991285975774e-1),
+            static_cast<RealType>(3.69874670435930773471e-2),
+            static_cast<RealType>(2.15708854325146400153e-3),
+            static_cast<RealType>(6.35345408451056881884e-5),
+            static_cast<RealType>(8.65722805575670770555e-7),
+            static_cast<RealType>(4.03153189557220023202e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.5947e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.20357145727036120652e-3),
+            static_cast<RealType>(1.45412555771401325111e-4),
+            static_cast<RealType>(3.27819006009093198652e-6),
+            static_cast<RealType>(2.96786786716623870006e-8),
+            static_cast<RealType>(9.54192199129339742308e-11),
+            static_cast<RealType>(5.71421706870777687254e-14),
+            static_cast<RealType>(-1.48321866072033823195e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.12851983233980279746e-1),
+            static_cast<RealType>(4.94650928817638043712e-3),
+            static_cast<RealType>(1.05447405092956497114e-4),
+            static_cast<RealType>(1.11578464291338271178e-6),
+            static_cast<RealType>(5.27522295397347842625e-9),
+            static_cast<RealType>(7.95786524903707645399e-12),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType x_cube = x * x * x;
+        RealType t = static_cast<RealType>((boost::math::isnormal)(x_cube) ? 1 / sqrt(x_cube) : 1 / pow(sqrt(x), 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.2709e-17
+        BOOST_MATH_STATIC const RealType P[4] = {
+            static_cast<RealType>(3.98942280401432677940e-1),
+            static_cast<RealType>(2.89752186412133782995e-2),
+            static_cast<RealType>(4.67360459917040710474e0),
+            static_cast<RealType>(-1.26770824563800250704e-1),
+        };
+        BOOST_MATH_STATIC const RealType Q[3] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.26301023103568827709e-2),
+            static_cast<RealType>(1.60899894281099149848e1),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 1) {
+        // Rational Approximation
+        // Maximum Relative Error: 4.7720e-37
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.33333333333333333333333333333333333333e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38519736580901276671338330967060054188e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.07012342772403725079487012557507575976e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70163612228825567572185033570526547856e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.16393313438726572630782132625753922397e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.92141312947853945617138019222992750592e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16513062047959961711747864068554379374e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08850391017085844154857927364247623649e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07060872491334153829857156707699441084e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.56961733740920438026573722084839596926e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.93626747947476815631021107726714283086e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32967164823609209711923411113824666288e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.23420723211833268177898025846064230665e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13807083548358335699029971528179486964e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00810772528427939684296334977783425582e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.24383652800043768524894854013745098654e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64696616559657052516796844068580626381e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.62288747679271039067363492752820355369e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19311779292286492714550084942827207241e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48436879303839576521077892946281025894e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.28665316157256311138787387605249076674e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.36350302380845433472593647100484547496e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.05835458213330488018147374864403662878e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.13919959493955187399856105325181806876e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30960533107704070411766556906543316310e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.6297e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.84196970581015939887507434989936103587e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23864910443500344832158256856064580005e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.72066675347648126090497588433854314742e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81712740200456564860442639192891089515e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.39091197181834765859741334477680768031e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.03759464781707198959689175957603165395e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15298069568149410830642785868857309358e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18910514301176322829267019223946392192e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.16851691488007921400221017970691227149e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.82031940093536875619655849638573432722e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.30042143299959913519747484877532997335e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.19848671456872291336347012756651759817e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00479393063394570750334218362674723065e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24929390929112144560152115661603117364e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.34853762543033883106055186520573363290e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.73783624941936412984356492130276742707e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23224734370942016023173307854505597524e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.11116448823067697039703254343621931158e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.12490054037308798338231679733816982120e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.38701607014856856812627276285445001885e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10075199231657382435402462616587005087e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.43662615015322880941108094510531477066e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.37981396630189761210639158952200945512e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55820444854396304928946970937054949160e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.8103e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07409273397524124098315500450332255837e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.98373054365213259465522536994638631699e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.30851284606709136235419547406278197945e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92686617543233900289721448026065555990e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.18056394312484073294780140350522772329e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07058343449035366484618967963264380933e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71636108080692802684712497501670425230e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13155853034615230731719317488499751231e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.00070273388376168880473457782396672044e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35528857373910910704625837069445190727e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.99897218751541535347315078577172104436e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35092090729912631973050415647154137571e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72220647682193638971237255396233171508e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.45008884108655511268690849420714428764e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42652074703683973183213296310906006173e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03479786698331153607905223548719296572e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.95556520914240562719970700900964416000e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73127917601685318803655745157828471269e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.63007065833918179119250623000791647836e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.70652732923091039268400927316918354628e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60880782675229297981880241245777122866e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09979261868403910549978204036056659380e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12085610111710889118562321318284539217e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59811533082647193392924345081953134304e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.37211668706684650035086116219257276925e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62479830409039340826066305367893543134e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.22039803134898937546371285610102850458e-11),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.5930e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.70720199535228802537946089633331273434e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.85220706158476482443562698303252970927e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55090221054465759649629178911450010833e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.70398047783095186291450019612979853708e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11846661331973171721224034349719801691e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83195024406409870789088752469490824640e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.23908312140480103249294791529383548724e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.40765128885655152415228193255890859830e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.14294523267278070539100529759317560119e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.26815059429007745850376987481747435820e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.28142945635159623618312928455133399240e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77079683180868753715374495747422819326e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73710011278079325323578951018770847628e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.70140037580287364298206334732060874507e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36848014038411798213992770858203510748e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.15373052017549822413011375404872359177e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.92705544967513282963463451395766172671e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19899290805598090502434290420047460406e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74002906913724742582773116667380578990e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.80632456977494447641985312297971970632e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.53381530665983535467406445749348183915e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.86606180756179817016240556949228031340e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.49594666942152749850479792402078560469e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.25231012522695972983928740617341887334e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34987086926725472733984045599487947378e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.58286136970918021841189712851698747417e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.12238357666199366902936267515573231037e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82464168044335183356132979380360583444e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40073718480172265670072434562833527076e-17),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.3609e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74847564444513000450056174922427854591e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56842503159303803254436983444304764079e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.48504629497687889354406208309334148575e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62327083507366120871877936416427790391e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72062210557023828776202679230979309963e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19153025667221102770398900522196418041e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66248482185063262034022017727375829162e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57390218395059632327421809878050974588e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.45520328522839835737631604118833792570e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76327978880339919462910339138428389322e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.99700625463451418394515481232159889297e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82943476668680389338853032002472541164e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19415284760817575957617090798914089413e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17080879333540200065368097274334363537e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.09912208206107606750610288716869139753e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.98451733054622166748935243139556132704e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08148065380582488495702136465010348576e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.42385352331252779422725444021027377277e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66510412535270623169792008730183916611e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.47952712144801508762945315513819636452e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.20703092334999244212988997416711617790e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.71658889250345012472529115544710926154e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.63905601023452497974798277091285373919e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76730409484335386334980429532443217982e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19139408077753398896224794522985050607e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.58025872548387600940275201648443410419e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.11369336267349152895272975096509109414e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.56182954522937999103610817174373785571e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.35452907177197742692545044913125982311e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23587924912460218189929226092439805175e-17),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.7192e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.22684103170563193014558918295924551173e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55222688816852408105912768186300290291e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.60747505331765587662432023547517953629e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.80463770266821887100086895337451846880e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.19190824169154471000496746227725070963e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40646301571395681364881852739555404287e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15408836734496798091749932018121879724e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.13676779930022341958128426888835497781e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02435098103190516418351075792372986932e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.82018920071479061978244972592746216377e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.26435061215428679536159320644587957335e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.05298407883178633891153989998582851270e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.61156860101928352010449210760843428372e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.02156808288545876198121127510075217184e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65549196385656698597261688277898043367e-30),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.03426141030409708635168766288764563749e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13808987755928828118915442251025992769e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52253239792170999949444502938290297674e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33720936468171204432499390745432338841e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.08713980159883984886576124842631646880e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.43652846144339754840998823540656399165e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02849693617024492825330133490278326951e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14110017452008167954262319462808192536e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.01462578814695350559338360744897649915e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73495817568046489613308117490508832084e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47445372925844096612021093857581987132e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08200002287534174751275097848899176785e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15305756373406702253187385797525419287e-21),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.7799e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.20357145727036120652264700679701054983e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95712324967981162396595365933255312698e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08619492652809635942960438372427086939e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37140224583881547818087260161723208444e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83073777522092069988595553041062506001e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.00473542739040742110568810201412321512e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.47447289601822506789553624164171452120e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70913574957198131397471307249294758738e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36538119628489354953085829178695645929e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00763343664814257170332492241110173166e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62297585950798764290583627210836077239e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15780217054514513493147192853488153246e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31961589164397397724611386366339562789e-28),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.26440207646105117747875545474828367516e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27872879091838733280518786463281413334e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34256572873114675776148923422025029494e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13595637397535037957995766856628205747e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33745879863685053883024090247009549434e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41792226523670940279016788831933559977e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.03966147662273388060545199475024100492e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62177951640260313354050335795080248910e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50650165210517365082118441264513277196e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.48413283257020741389298806290302772976e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16439276222123152748426700489921412654e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24969602890963356175782126478237865639e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.08681155203261739689727004641345513984e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.28282024196484688479115133027874255367e-30),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType x_cube = x * x * x;
+        RealType t = (boost::math::isnormal)(x_cube) ? 1 / sqrt(x_cube) : 1 / pow(sqrt(x), 3);
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.5865e-37
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[8] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98942280401432677939946059934381868476e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12426566605292130233061857505057433291e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.91574528280329492283287073127040983832e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69914217884224943794012165979483573091e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30178902028403564086640591437738216288e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96515490341559353794378324810127583810e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44343825578434751356083230369361399507e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.07224810408790092272497403739984510394e2),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.32474438135610721926278423612948794250e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27594461167587027771303292526448542806e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.49207539478843628626934249487055017677e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.75094412095634602055738687636893575929e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.51642534474780515366628648516673270623e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05977615003758056284424652420774587813e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t;
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.6964e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(4.23238998449671083670e-1),
+            static_cast<RealType>(4.95353582976475183891e-1),
+            static_cast<RealType>(2.45823281826037784270e-1),
+            static_cast<RealType>(7.29726507468813920788e-2),
+            static_cast<RealType>(1.63332856186819713346e-2),
+            static_cast<RealType>(2.82514634871307516142e-3),
+            static_cast<RealType>(2.66220579589280704089e-4),
+            static_cast<RealType>(3.09442180091323751049e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.16241922223786900600e-1),
+            static_cast<RealType>(2.75690727171711638879e-1),
+            static_cast<RealType>(7.18707184893542884080e-2),
+            static_cast<RealType>(1.87136800286819336797e-2),
+            static_cast<RealType>(2.38383441176345054929e-3),
+            static_cast<RealType>(3.23509126477812051983e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.8303e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(1.62598955251978523175e-1),
+            static_cast<RealType>(2.30154661502402196205e-1),
+            static_cast<RealType>(1.29233975368291684522e-1),
+            static_cast<RealType>(3.80919553916980965587e-2),
+            static_cast<RealType>(8.17724414618808505948e-3),
+            static_cast<RealType>(1.95816800210481122544e-3),
+            static_cast<RealType>(3.35259917978421935141e-4),
+            static_cast<RealType>(1.22071311320012805777e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.63771793313770952352e-2),
+            static_cast<RealType>(2.23602260938227310054e-1),
+            static_cast<RealType>(9.21944797677283179038e-3),
+            static_cast<RealType>(1.82181136341939651516e-2),
+            static_cast<RealType>(1.11216849284965970458e-4),
+            static_cast<RealType>(5.57446347676836375810e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType s = exp(2 * x * x * x / 27) / sqrt(-x * x * x);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 3.6017e-18
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(8.31806744221966404520e-1),
+                static_cast<RealType>(1.34481067378012055850e0),
+                static_cast<RealType>(9.12139427469494995264e-1),
+                static_cast<RealType>(3.59706159222491124928e-1),
+                static_cast<RealType>(9.48836332725688279299e-2),
+                static_cast<RealType>(1.68259594978853951234e-2),
+                static_cast<RealType>(1.89700733471520162946e-3),
+                static_cast<RealType>(1.13854052826846329787e-4),
+            };
+            BOOST_MATH_STATIC const RealType Q[8] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(1.29694286517571741097e0),
+                static_cast<RealType>(7.99686735441213882518e-1),
+                static_cast<RealType>(3.08198207583883597188e-1),
+                static_cast<RealType>(7.97230139795658588972e-2),
+                static_cast<RealType>(1.40742142048849462162e-2),
+                static_cast<RealType>(1.58411440546277691506e-3),
+                static_cast<RealType>(9.51560785730564046338e-5),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -8) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 1.3504e-17
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(1.10294551528734705946e0),
+                static_cast<RealType>(1.26696377028973554615e0),
+                static_cast<RealType>(6.63115985833429688941e-1),
+                static_cast<RealType>(2.06289793717379095832e-1),
+                static_cast<RealType>(4.11977615717846276227e-2),
+                static_cast<RealType>(5.28620928618550859827e-3),
+                static_cast<RealType>(4.04328442334023561279e-4),
+                static_cast<RealType>(1.42364413902075896503e-5),
+            };
+            BOOST_MATH_STATIC const RealType Q[8] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(1.09709853682665798542e0),
+                static_cast<RealType>(5.63687797989627787500e-1),
+                static_cast<RealType>(1.73604358560002859604e-1),
+                static_cast<RealType>(3.44985744385890794044e-2),
+                static_cast<RealType>(4.41683993064797272821e-3),
+                static_cast<RealType>(3.37834206192286709492e-4),
+                static_cast<RealType>(1.18951465786445720729e-5),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -16) {
+            RealType t = -x - 8;
+
+            // Rational Approximation
+            // Maximum Relative Error: 8.8272e-18
+            BOOST_MATH_STATIC const RealType P[7] = {
+                static_cast<RealType>(1.18246847255744057280e0),
+                static_cast<RealType>(8.41320657699741240497e-1),
+                static_cast<RealType>(2.55093097377551881478e-1),
+                static_cast<RealType>(4.21261576802732715976e-2),
+                static_cast<RealType>(3.98805044659990523312e-3),
+                static_cast<RealType>(2.04688276265993954527e-4),
+                static_cast<RealType>(4.43354791268634655473e-6),
+            };
+            BOOST_MATH_STATIC const RealType Q[7] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(7.07103973315808077783e-1),
+                static_cast<RealType>(2.13664682181055450396e-1),
+                static_cast<RealType>(3.52218225168465984709e-2),
+                static_cast<RealType>(3.33218664347896435919e-3),
+                static_cast<RealType>(1.71025807471868853268e-4),
+                static_cast<RealType>(3.70441884597642042665e-6),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -32) {
+            RealType t = -x - 16;
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.6236e-18
+            BOOST_MATH_STATIC const RealType P[6] = {
+                static_cast<RealType>(1.19497306481411168356e0),
+                static_cast<RealType>(3.90497195765498241356e-1),
+                static_cast<RealType>(5.13120330037626853257e-2),
+                static_cast<RealType>(3.38574023921119491471e-3),
+                static_cast<RealType>(1.12075935888344736993e-4),
+                static_cast<RealType>(1.48743616420183584738e-6),
+            };
+            BOOST_MATH_STATIC const RealType Q[6] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(3.26493785348088598123e-1),
+                static_cast<RealType>(4.28813205161574223713e-2),
+                static_cast<RealType>(2.82893073845390254969e-3),
+                static_cast<RealType>(9.36442365966638579335e-5),
+                static_cast<RealType>(1.24281651532469125315e-6),
+            };
+
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_minus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x >= -1) {
+        RealType t = x + 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0688e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.23238998449671083670041452413316011920e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.14900991369455846775267187236501987891e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.19132787054572299485638029221977944555e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87295743700300806662745209398368996653e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.41994520703802035725356673887766112213e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78782099629586443747968633412271291734e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.05200546520666366552864974572901349343e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.51453477916196630939702866688348310208e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15461354910584918402088506199099270742e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43371674256124419899137414410592359185e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35849788347057186916350200082990102088e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.50359296597872967493549820191745700442e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21838020977580479741299141050400953125e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.46723648594704078875476888175530463986e-12),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.98700317671474659677458220091101276158e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.00405631175818416028878082789095587658e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04189939150805562128632256692765842568e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.03621065280443734565418469521814125946e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85722257874304617269018116436650330070e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.24191409213079401989695901900760076094e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.64269032641964601932953114106294883156e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19289631274036494326058240677240511431e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41389309719775603006897751176159931569e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42000309062533491486426399210996541477e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.02436961569668743353755318268149636644e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.50130875023154569442119099173406269991e-9),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x >= -2) {
+        RealType t = x + 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.1815e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62598955251978523174755901843430986522e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08127698872954954678270473317137288772e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70144997468767751317246482211703706086e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49486603823046766249106014234315835102e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.07186495389828596786579668258622667573e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98334953533562948674335281457057445421e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.44119017374895211020429143034854620303e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27080759819117162456137826659721634882e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53892796920597912362370019918933112349e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30530442651657077016130554430933607143e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.04837779538527662990102489150650534390e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.94354615171320374997141684442120888127e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.30746545799073289786965697800049892311e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41870129065056783732691371215602982173e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.75919235734607601884356783586727272494e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.57656678936617227532275100649989944452e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72617552401870454676736869003112018648e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.59238104942208254162102314312757621047e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06040513359343987972917295603514840777e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.26922840063034349024167652148593396307e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25628506630180107357627955876231943531e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81600387497542714853225329159728694926e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08210973846891324886779444820838563800e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.68632477858150229792523037059221563861e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.43542789104866782087701759971538600076e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70594730517167328271953424328890849790e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30162314557860623869079601905904538470e-9),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType s = exp(2 * x * x * x / 27) / sqrt(-x * x * x);
+
+        if (x >= -4) {
+            RealType t = -x - 2;
+
+            // Rational Approximation
+            // Maximum Relative Error: 6.4678e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[16] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.31806744221966404520449104514474066823e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50292887071777664663197915067642779665e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.45140067157601150721516139901304901854e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93227973605511286112712730820664209900e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74259108933048973391560053531348126900e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.77677252890665602191818487592154553094e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71843197238558832510595724454548089268e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.62811778285151415483649897138119310816e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74127763877120261698596916683136227034e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.24832552591462216226478550702845438540e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.93381036027487259940171548523889481080e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02261328789519398745019578211081412570e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.75409238451885381267277435341417474231e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.09526311389365895099871581844304449319e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96371756262605118060185816854433322493e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.88472819535099746216179119978362211227e-10),
+            };
+            BOOST_MATH_STATIC const RealType Q[16] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.68923525157720774962908922391133419863e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40714902096062779527207435671907059131e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73120596883364361220343183559076165363e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56331267512666685349409906638266569733e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.80956276267438042306216894159447642323e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34213468750936211385520570062547991332e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.50081600968590616549654807511166706919e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47297208240850928379158677132220746750e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.73392976579560287571141938466202325901e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13858821123741335782695407397784840241e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.04103497389656828224053882850778186433e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.81040189127998139689091455192659191796e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42176283104790992634826374270801565123e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64077137545614380065714904794220228239e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08139724991616322332901357866680220241e-10),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -8) {
+            RealType t = -x - 4;
+
+            // Rational Approximation
+            // Maximum Relative Error: 3.5975e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[16] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10294551528734705945662709421382590676e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.26135857114883288617323671166863478751e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23504465936865651893193560109437792738e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41598983788870071301270649341678962009e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.43871304031224174103636568402522086316e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22745720458050596514499383658714367529e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.05976431838299244997805790000128175545e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32087500190238014890030606301748111874e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32754445514451500968404092049839985196e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31866016448921762610690552586049011375e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.80197257671079297305525087998125408939e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.44212088947602969374978384512149432847e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.38857170416924025226203571589937286465e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20239999218390467567339789443070294182e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.93965060142992479149039624149602039394e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36407983918582149239548869529460234702e-12),
+            };
+            BOOST_MATH_STATIC const RealType Q[16] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99867960957804580209868321228347067213e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.94236623527818880544030470097296139679e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21644866845440678050425616384656052588e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.48653919287388803523090727546630060490e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88696531788490258477870877792341909659e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.11157356307921406032115084386689196255e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11071149696069503480091810333521267753e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95274844731679437274609760294652465905e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.77971280158253322431071249000491659536e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.18092258028773913076132483326275839950e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87773088535057996947643657676843842076e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99609277781492599950063871899582711550e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00465660598924300723542908245498229301e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.29174652982710100418474261697035968379e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.31746082236506935340972706820707017875e-12),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -16) {
+            RealType t = -x - 8;
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.6792e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18246847255744057280356900905660312795e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77955886026107125189834586992142580148e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24948425302263641813107623611637262126e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.42593662659560333324287312162818766556e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62714138002904073145045478360748042164e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.56008984285541289474850396553042124777e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84858048549330525583286373950733005244e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.30578460156038467943968005946143934751e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.93974868941529258700281962314167648967e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.95086664204515648622431580749060079100e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57811968176644056830002158465591081929e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27814751838906948007289825582251221538e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06762893426725920159998333647896590440e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15388861641344998301210173677051088515e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83956842740198388242245209024484381888e-29),
+            };
+            BOOST_MATH_STATIC const RealType Q[14] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50056124032615852703112365430040751173e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05112559537845833793684655693572118348e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.55609497026127521043140534271852131858e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36430652394614121156238070755223942728e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98167215021940993097697777547641188697e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.89418831310297071347013983522734394061e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.10980717618462843498917526227524790487e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.80119618735773019675212434416594954984e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13748676086657187580746476165248613583e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15424395860921826755718081823964568760e-7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.75228896859720124469916340725146705309e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72759238269315282789451836388878919387e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79966603543593799412565926418879689461e-12),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -32) {
+            RealType t = -x - 16;
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.1744e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19497306481411168355692832231058399132e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.15593166681833539521403250736661720488e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54020260738207743315755235213180652303e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.76467972857585566189917087631621063058e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.97922795572348613358915532172847895070e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.26998967192207380100354278434037095729e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.32827180395699855050424881575240362199e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50587178182571637802022891868380669565e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.78252548290929962236994183546354358888e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01519297007773622283120166415145520855e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29602226691665918537895803270497291716e-11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.53666531487585211574942518181922132884e-14),
+            };
+            BOOST_MATH_STATIC const RealType Q[12] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.82230649578130958108098853863277631065e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12412482738973738235656376802445565005e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98320116955422615960870363549721494683e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.99756654189000467678223166815845628725e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40414942475279981724792023159180203408e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78118445466942812088955228016254912391e-5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25827002637577602812624580692342616301e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.99604467789028963216078448884632489822e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.48237134334492289420105516726562561260e-10),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08288201960155447241423587030002372229e-11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.29720612489952110448407063201146274502e-14),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else if (x >= -64) {
+            RealType t = -x - 32;
+
+            // Rational Approximation
+            // Maximum Relative Error: 3.4699e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[10] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19659414007358083585943280640656311534e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36969140730640253987817932335415532846e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21946928005759888612066397569236165853e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08341720579009422518863704766395201498e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44908614491286780138818989614277172709e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.54172482866925057749338312942859761961e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.49281630950104861570255344237175124548e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27586759709416364899010676712546639820e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00054716479138657682306851175059678989e-11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.48798342894235412426464893852098239746e-14),
+            };
+            BOOST_MATH_STATIC const RealType Q[10] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.81588658109851219975949691772676519853e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.52583331848892383968186924120872369151e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57644670426430994363913234422346706991e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21080164634428298820141591419770346977e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79484074949580980980061103238709314326e-6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.93167250146504946763386377338487557826e-8),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06604193118724797924138056151582242604e-9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.35999937789324222934257460080153249173e-12),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.91435929481043135336094426837156247599e-14),
+            };
+            // LCOV_EXCL_STOP
+            result = s * tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+        }
+        else {
+            result = 0;
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 53>& tag) {
+    if (x >= 0) {
+        return complement ? mapairy_cdf_plus_imp_prec(x, tag) : 1 - mapairy_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - mapairy_cdf_minus_imp_prec(x, tag) : mapairy_cdf_minus_imp_prec(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 113>& tag) {
+    if (x >= 0) {
+        return complement ? mapairy_cdf_plus_imp_prec(x, tag) : 1 - mapairy_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - mapairy_cdf_minus_imp_prec(x, tag) : mapairy_cdf_minus_imp_prec(x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_cdf_imp(const mapairy_distribution<RealType, Policy>& dist, const RealType& x, bool complement) {
+    //
+    // This calculates the cdf of the Map-Airy distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::cdf(mapairy<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Map-Airy distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale;
+
+    result = mapairy_cdf_imp_prec(u, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_lower_imp_prec(const RealType& p, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.375) {
+        RealType t = p - static_cast <RealType>(0.375);
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.5488e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(-1.17326074020471664075e0),
+            static_cast<RealType>(1.51461298154568349598e0),
+            static_cast<RealType>(1.19979368094343490487e1),
+            static_cast<RealType>(-5.94882121521324108164e0),
+            static_cast<RealType>(-2.20619749774447254528e1),
+            static_cast<RealType>(7.17766543775229176131e0),
+            static_cast<RealType>(4.79284243496552841508e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.76268072706610602584e0),
+            static_cast<RealType>(-4.88492535243404839734e0),
+            static_cast<RealType>(-5.67524172432687656881e0),
+            static_cast<RealType>(6.83327389947131710596e0),
+            static_cast<RealType>(2.91338085774159042709e0),
+            static_cast<RealType>(-1.41108918944159283950e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.5181e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(-1.63281240925531302762e0),
+            static_cast<RealType>(-4.92351310795930780147e0),
+            static_cast<RealType>(1.43448529253101759409e1),
+            static_cast<RealType>(3.33182629948094299473e1),
+            static_cast<RealType>(-3.06679026539368582747e1),
+            static_cast<RealType>(-2.87298447423841965301e1),
+            static_cast<RealType>(1.31575930750093554120e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.38761652244702318296e0),
+            static_cast<RealType>(2.40932080746189543284e0),
+            static_cast<RealType>(-1.69465870062123632126e1),
+            static_cast<RealType>(-6.39998944283654848809e0),
+            static_cast<RealType>(1.27168434054332272391e1),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.3028e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-2.18765177572396469657e0),
+            static_cast<RealType>(-3.65752788934974426531e1),
+            static_cast<RealType>(-1.81144810822028903904e2),
+            static_cast<RealType>(-1.22434531262312950288e2),
+            static_cast<RealType>(8.99451018491165823831e2),
+            static_cast<RealType>(9.11333307522308410858e2),
+            static_cast<RealType>(-8.76285742384616909177e2),
+            static_cast<RealType>(-2.33786726970025938837e2),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.91797638291395345792e1),
+            static_cast<RealType>(1.24293724082506952768e2),
+            static_cast<RealType>(2.82393116012902543276e2),
+            static_cast<RealType>(-1.80472369158936285558e1),
+            static_cast<RealType>(-5.31764390192922827093e2),
+            static_cast<RealType>(-5.60586018315854885788e1),
+            static_cast<RealType>(1.21284324755968033098e2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.1147e-18
+        BOOST_MATH_STATIC const RealType P[6] = {
+            static_cast<RealType>(-2.18765177572396470773e0),
+            static_cast<RealType>(-2.19887766409334094428e0),
+            static_cast<RealType>(-7.77080107207360785208e-1),
+            static_cast<RealType>(-1.15551765136654549650e-1),
+            static_cast<RealType>(-6.64711321022529990367e-3),
+            static_cast<RealType>(-9.74212491048543799073e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.91919722132624625590e-1),
+            static_cast<RealType>(2.17415447268626558639e-1),
+            static_cast<RealType>(2.41474762519410575392e-2),
+            static_cast<RealType>(9.41084107182696904714e-4),
+            static_cast<RealType>(6.65754108797614202364e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0508e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-2.59822399410385085335e0),
+            static_cast<RealType>(-2.24306757759003016244e0),
+            static_cast<RealType>(-7.36208578161752060979e-1),
+            static_cast<RealType>(-1.15130762650287391576e-1),
+            static_cast<RealType>(-8.77652386123688618995e-3),
+            static_cast<RealType>(-2.96358888256575251437e-4),
+            static_cast<RealType>(-3.33661282483762192446e-6),
+            static_cast<RealType>(-4.19292241201527861927e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.23065798041556418844e-1),
+            static_cast<RealType>(1.96731305131315877264e-1),
+            static_cast<RealType>(2.49952034298034383781e-2),
+            static_cast<RealType>(1.49149568322111062242e-3),
+            static_cast<RealType>(3.66010398525593921460e-5),
+            static_cast<RealType>(2.46857713549279930857e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.1997e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-3.67354365380697580447e0),
+            static_cast<RealType>(-1.52181685844845957618e0),
+            static_cast<RealType>(-2.40883948836320845233e-1),
+            static_cast<RealType>(-1.82424079258401987512e-2),
+            static_cast<RealType>(-6.75844978572417703979e-4),
+            static_cast<RealType>(-1.11273358356809152121e-5),
+            static_cast<RealType>(-6.12797605223700996671e-8),
+            static_cast<RealType>(-3.78061321691170114390e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.57770840766081587688e-1),
+            static_cast<RealType>(4.81290550545412209056e-2),
+            static_cast<RealType>(3.02079969075162071807e-3),
+            static_cast<RealType>(8.89589626547135423615e-5),
+            static_cast<RealType>(1.07618717290978464257e-6),
+            static_cast<RealType>(3.57383804712249921193e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.4331e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-4.92187819510636697128e0),
+            static_cast<RealType>(-9.94924018698264727979e-1),
+            static_cast<RealType>(-7.69914962772717316098e-2),
+            static_cast<RealType>(-2.85558010159310978248e-3),
+            static_cast<RealType>(-5.19022578720207406789e-5),
+            static_cast<RealType>(-4.19975546950263453259e-7),
+            static_cast<RealType>(-1.13886013623971006760e-9),
+            static_cast<RealType>(-3.46758191090170732580e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.77270673840643360017e-1),
+            static_cast<RealType>(1.18099604045834575786e-2),
+            static_cast<RealType>(3.66889581757166584963e-4),
+            static_cast<RealType>(5.34484782554469770841e-6),
+            static_cast<RealType>(3.19694601727035291809e-8),
+            static_cast<RealType>(5.24649233511937214948e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.7742e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-6.41443550638291133784e0),
+            static_cast<RealType>(-6.38369359780748328332e-1),
+            static_cast<RealType>(-2.43420704406734621618e-2),
+            static_cast<RealType>(-4.45274771094277987075e-4),
+            static_cast<RealType>(-3.99529078051262843241e-6),
+            static_cast<RealType>(-1.59758677464731620413e-8),
+            static_cast<RealType>(-2.14338367751477432622e-11),
+            static_cast<RealType>(-3.23343844538964435927e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.79845511272943785289e-2),
+            static_cast<RealType>(2.90839059356197474893e-3),
+            static_cast<RealType>(4.48172838083912540123e-5),
+            static_cast<RealType>(3.23770691025690100895e-7),
+            static_cast<RealType>(9.60156044379859908674e-10),
+            static_cast<RealType>(7.81134095049301988435e-13),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.2451e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-8.23500806363233610938e0),
+            static_cast<RealType>(-4.05652655284908839003e-1),
+            static_cast<RealType>(-7.65978833819859622912e-3),
+            static_cast<RealType>(-6.94194676058731901672e-5),
+            static_cast<RealType>(-3.08771646223818451436e-7),
+            static_cast<RealType>(-6.12443207313641110962e-10),
+            static_cast<RealType>(-4.07882839359528825925e-13),
+            static_cast<RealType>(-3.05720104049292610799e-17),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.37395212065018405474e-2),
+            static_cast<RealType>(7.18654254114820140590e-4),
+            static_cast<RealType>(5.50371158026951899491e-6),
+            static_cast<RealType>(1.97583864365011234715e-8),
+            static_cast<RealType>(2.91169706068202431036e-11),
+            static_cast<RealType>(1.17716830382540977039e-14),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -256) {
+        RealType t = -log2(ldexp(p, 128));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.8732e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-1.04845570631944023913e1),
+            static_cast<RealType>(-2.56502856165700644836e-1),
+            static_cast<RealType>(-2.40615394566347412600e-3),
+            static_cast<RealType>(-1.08364601171893250764e-5),
+            static_cast<RealType>(-2.39603255140022514289e-8),
+            static_cast<RealType>(-2.36344017673944676435e-11),
+            static_cast<RealType>(-7.83146284114485675414e-15),
+            static_cast<RealType>(-2.92218240202835807955e-19),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.17740414929742679904e-2),
+            static_cast<RealType>(1.78084231709097280884e-4),
+            static_cast<RealType>(6.78870668961146609668e-7),
+            static_cast<RealType>(1.21313439060489363960e-9),
+            static_cast<RealType>(8.89917934953781122884e-13),
+            static_cast<RealType>(1.79115540847944524599e-16),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -512) {
+        RealType t = -log2(ldexp(p, 256));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.6946e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-1.32865827226175698181e1),
+            static_cast<RealType>(-1.61802434199627472010e-1),
+            static_cast<RealType>(-7.55642602577784211259e-4),
+            static_cast<RealType>(-1.69457608092375302291e-6),
+            static_cast<RealType>(-1.86612389867293722402e-9),
+            static_cast<RealType>(-9.17015770142364635163e-13),
+            static_cast<RealType>(-1.51422473889348610974e-16),
+            static_cast<RealType>(-2.81661279271583206526e-21),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.08518414679241420227e-2),
+            static_cast<RealType>(4.42335224797004486239e-5),
+            static_cast<RealType>(8.40387821972524402121e-8),
+            static_cast<RealType>(7.48486746424527560620e-11),
+            static_cast<RealType>(2.73676810622938942041e-14),
+            static_cast<RealType>(2.74588200481263214866e-18),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -1024) {
+        RealType t = -log2(ldexp(p, 512));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.7586e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(-1.67937186583822375593e1),
+            static_cast<RealType>(-1.01958138247797604098e-1),
+            static_cast<RealType>(-2.37409774265951876695e-4),
+            static_cast<RealType>(-2.65483321307104128810e-7),
+            static_cast<RealType>(-1.45803536947907216594e-10),
+            static_cast<RealType>(-3.57375116523338994342e-14),
+            static_cast<RealType>(-2.94401318006358820268e-18),
+            static_cast<RealType>(-2.73260616170245224789e-23),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.41357843707822974161e-3),
+            static_cast<RealType>(1.10082540037527566536e-5),
+            static_cast<RealType>(1.04338126042963003178e-8),
+            static_cast<RealType>(4.63619608458569600346e-12),
+            static_cast<RealType>(8.45781310395535984099e-16),
+            static_cast<RealType>(4.23432554226506409568e-20),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        result = -boost::math::numeric_limits<RealType>::infinity();
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_lower_imp_prec(const RealType& p, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.4375) {
+        RealType t = p - static_cast <RealType>(0.4375);
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.2901e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[10] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.48344198262277235851026749871350753173e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.18249834490570496537675012473572546187e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20191368895639224466285643454767208281e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.88388953372157636908236843798588258539e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.59477796311326067051769635858472572709e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.88799146700484120781026039104654730797e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.15708831983930955608517858269193800412e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.01389336086567891484877690859385409842e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.16683694881010716925933071465043323946e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.04356966421177683585461937085598186805e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.75444066345435020043849341970820565274e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.95105673975812427406540024601734210826e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.20381124524894051002242766595737443257e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.48370658634610329590305283520183480026e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.52213602242009530270284305006282822794e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.91028722773916006242187843372209197705e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.76130245344411748356977700519731978720e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30834721900169773543149860814908904224e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.37863084758381651884340710544840951679e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.46880981703613838666108664771931239970e0),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.375) {
+        RealType t = p - static_cast <RealType>(0.375);
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.8433e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.17326074020471664204142312429732771661e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.23412560010002723970559712941124583385e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83665111310407767293290698145068379130e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.38459476870110655357485107373883403534e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.28751995328228442619291346921055105808e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.31663592034507247231393516167247241037e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13629333446941271397790762651183997586e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.80674058829101054663235662701823250421e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.53226182094253065852552393446365315319e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.14713948941614711932063053969010219677e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.62979741122708118776725634304028246971e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[10] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.10550060286464202595779024353437346419e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.15893254630199957990897452211066782021e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.58964066823516762861256609311733069353e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.73352515261971291505497909338586980605e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.64737859211974163695241658186141083513e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.79137714768236053008878088337762178011e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.71851514659301019977259792564627124877e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.37210093190088984630526671624779422232e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06793750951779308425209267821815264457e1),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.9072e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.63281240925531315038207673147576291783e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.72733898245766165408685147762489513406e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.48666841594842113608962500631836790675e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.38711336213357101067420572773139678571e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.19536066931882831915715343914510496760e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70911330354860558400876197129777829223e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.46138758869321272507090399082047865434e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.42653825421465476333482312795245170700e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68040069633027903153088221686431049116e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.63017854949929226947577854802720988740e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.57362168966659376351959631576588023516e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.48386631313725080746815524770260451090e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.03293129698111279047104766073456412318e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29511778027351594854005887702013466376e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.66155745848864270109281703659789474448e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.25628362783798417463294553777015370203e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.93162726153946899828589402901015679821e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.51582398149308841534372162372276623400e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55512400116480727630652657714109740448e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.11949742749256615588470329024257669470e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.28090154738508864776480712360731968283e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.44307717248171941824014971579691790721e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.33595130666758203099507440236958725924e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.76156378002782668186592725145930755636e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.70446647862725980215630194019740606935e0),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.9092e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.18765177572396470161180571018467019660e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.16991481696416567893311341049825218287e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.25497491118598918048058751362064598010e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.00259915194411316966036757165146681474e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.20350803730836873687692010728689867756e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.75441278117456011071671644613599089820e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18844967505497310645091822621081741562e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.84771867850847121528386231811667556346e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.78112436422992766542256241612018834150e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.82617957794395420193751983521804760378e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.77260227244465268981198741998181334875e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.61918290776044518321561351472048170874e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.10309368217936941851272359946015001037e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.68917274690585744147547352309416731690e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.96914697182030973966321601422851730384e4),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98063872144867195074924232601423646991e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.65911346382127464683324945513128779971e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02451223307009464199634546540152067898e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.12662676019712475980273334769644047369e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.77637305574675655673572303462430608857e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.65900204382557635710258095712789133767e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.61649498173261886264315880770449636676e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.29867325788870863753779283018061152414e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.31375646045453788071216808289409712455e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.91053361331987954531162452163243245571e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.30917504462260061766689326034981496723e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.95779171217851232246427282884386844906e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.07234815204245866330282860014624832711e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21353269292094971546479026200435095695e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.9653e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.18765177572396470161180571018467025793e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.94718878144788678915739777385667044494e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.01760622104142726407095836139719210570e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.27585388152893587017559610649258643106e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.26494992809545184138230791849722703452e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.19962820888633928632710264415572027960e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.10249328404135065767844288193594496173e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.94733898567966142295343935527193851633e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.10350856810280579594619259121755788797e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.23852908701349250480831167491889740823e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.61008160195204632725691076288641221707e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[11] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59109221235949005113322202980300291082e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07119192591092503378838510797916225920e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97313678065269932508447079892684333156e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.85743007214453288049750256975889151838e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21504290861269099964963866156493713716e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00880286431998922077891394903879512720e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.78806057460269900288838437267359072282e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15390284861815831078443996558014864171e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09877166004503937701692216421704042881e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.01544823753120969225271131241177003165e-11),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.7872e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.59822399410385083283727681965013517187e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.30676107401101401386206170152508285083e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.14999782004905950712290914501961213222e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.33941786334132569296061539102765384372e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.67220197146826865151515598496049341734e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.80553562310354708419148501358813792297e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.69365728863553037992854715314245847166e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.66571611322125393586164383361858996769e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.60112572827002965346926427208336150737e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.82368436189138780270310776927920829805e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.53112953085778860983110669544602606343e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.47363651755817041383574210879856850108e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.56959356177318833325064543662295824581e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.16259632533790175212174199386945953139e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.51102540845397821195190063256442894688e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51733661576324699382035973518172469602e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01435607980568082538278883569729476204e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.93274478117803447229185270863587786287e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.79695020433868416640781960667235896490e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64179255575983014759473815411232853821e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88411076775875459504324039642698874213e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47924359965537384942568979646011627522e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.80915944234873904741224397674033111178e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67530059257263142305079790717032648103e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.59778634436027309520742387952911132163e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.45772841855129835242992919296397034883e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40356170422999016176996652783329671363e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.31127037096552892520323998665757802862e-16),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.6679e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.67354365380697578246790709817724831418e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.98681625368564496421038758088088788795e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.07310677200866436332040539417232353673e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.24429836496456823308103613923194387860e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.02985399190977938381625172095575017346e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.76782196972948240235456454778537838123e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.74449002785643398012450514191731166637e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.59599894044461264694825875303563328822e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.25326249969126313897827328136779597159e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.41714701672521323699602179629851858792e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.43197925999694667433180053594831915164e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.84385683045691486021670951412023644809e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.34484740544060627138216383389282372695e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.69717198111130468014375331439613690658e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.54464319402577486444841981479085908190e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.56568169258142086426383908572004868200e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52144703581828715720555168887427064424e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.87268567039210776554113754014224005739e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.04907480436107533324385788289629535047e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.05063218951887755000006493061952858632e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.88707869862323507236241669797692957827e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12876335369047582931728838551780783006e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.96657547014655679104867167083078285517e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.05799908632250375607393338998205481867e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.26543514080500125624753383852230043206e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02102501711063497529014782040893679505e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.91577723105757841509716090936343311518e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.13824283239122976911704652025193325941e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.6323e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.92187819510636694694450607724165689649e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.97763858433958798529675258052376253402e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.51315096979196319830162238831654165509e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.63462872759639470195664268077372442947e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.42843455093529447002457295994721102683e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.09839699044798405685726233251577671229e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.42918585783783247934440868680748693033e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.39927851612709063686969934343256912856e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.08811978806833318962489621493456773153e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.05790315329766847040100971840989677130e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.45479905512618918078640786598987515012e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.26725031195260767541308143946590024995e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.93921283405116349017396651678347306610e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.46989755992471397407520449698676945629e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.84098833615882764168840211033822541979e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76933186134913044021577076301874622292e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.25794095712489484166470336696962749356e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.02367257449622569623375613790000874499e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.72422948147678152291655497515112236849e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54841786738844966378222670550160421679e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40690766057741905625149753730480294357e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.57722740290698689456097239435447030950e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12202417878861628530322715231540006386e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.52053248659561670052645118655279630611e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.93156242508301535729374373870786335203e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40767922796889118151219837068812449420e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83472702205100162081157644960354192597e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.07575352729625387198150555665307193572e-24),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.8799e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.41443550638291131009585191506467028820e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.27887396494095561461365753577189254063e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.12752633002089885479040650194288302309e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.79073355729340068320968150408320521772e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.92104558368762745368896313096467732214e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.31521786147036353766882145733055166296e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.69209485282228501578601478546441260206e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.17440286764020598209076590905417295956e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.24323354132100896221825450145208350291e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.53395893728239001663242998169841168859e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.68737623513761169307963299679882178852e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.34293243065056704017609034428511365032e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.16077944943653158589001897848048630079e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.62195354664281744711336666974567406606e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.34400562353945663460416286570988365992e-30),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87838171063584994806998206766890809367e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55395225505766120991458653457272783334e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.45282436421694718640472363162421055686e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29570159526914149727970023744213510609e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.75502365627517415214497786524319814617e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.74140267916464056408693097635546173776e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.53554952415602030474322188152855226456e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.25818606585833092910042975933757268581e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79945579370700383986587672831350689541e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.64188969985517050219881299229805701044e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.59811800080967790439078895802795103852e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.28225402720788909349967839966304553864e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.22313199865592821923485268860178384308e-28),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1548e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.23500806363233607692361021471929016922e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.16747938711332885952564885548768072606e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.58252672740225210061031286151136185818e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.15477223656783400505701577048140375949e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.51130817987857130928725357067032472382e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.68955185187558206711296837951129048907e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.30418343536824247801373327173028702308e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.96029044368524575193330776540736319950e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.53259926294848786440686413056632823519e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.09476918795964320022985872737468492126e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.20864569882477440934325776445799604204e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.01321468510611172635388570487951907905e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.45079221107904118975166347269173516170e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.36559452694774774399884349254686988041e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.92396730553947142987611521115040472261e-35),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.36599681872296382199486815169747516110e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.86330544720458446620644055149504593514e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.23793435123936109978741252388806998743e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41867848381419339587560909646887411175e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46493580168298395584601073832432583371e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03537470107933172406224278121518518287e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.00375884189083338846655326801486182158e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62515041281615938158455493618149216047e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42337949780187570810208014464208536484e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40196890950995648233637422892711654146e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.11894256193449973803773962108906527772e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00900961462911160554915139090711911885e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.65825716532665817972751320034032284421e-32),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -256) {
+        RealType t = -log2(ldexp(p, 128));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.3756e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.04845570631944023525776899386112795330e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.18146685146173151383718092529868406030e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.13255476532916847606354932879190731233e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.44228173780288838603949849889291143631e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.18663599891768480607165516401619315227e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.61193813386433438633008774630150180359e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.54402603714659392010463991032389692959e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.76816632514967325885563032378775486543e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.22774672528068516513970610441705738842e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.47312348271366325243169398780745416279e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.10984325972747808970318612951079014854e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.81620524028936785168005732104270722618e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.03443227423068771484783389914203726108e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.02313300749670214384591200940841254958e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.40321396496046206171642334628524367374e-39),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.67292043485384876322219919215413286868e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.61652550158809553935603664087740554258e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14722810796821047167211543031044501921e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.78954660078305461714050086730116257387e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.52794892087101750452585357544956835504e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59652255206657812422503741672829368618e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.84914442937017449248597857220675602148e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.23662183613814475007146598734598810102e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.55388618781592901470236982277678753407e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.20418178834057564300014964843066904024e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48606639104883413456676877330419513129e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39845313960416564778273486179935754019e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14538443937605324316706211070799970095e-35),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -512) {
+        RealType t = -log2(ldexp(p, 256));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.6639e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.32865827226175697711590794217590458484e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.27551166309670994513910580518431041518e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.57161482253140058637495100797888501265e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.26908727392152312216118985392395130974e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.31391169101865809627389212651592902649e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.58926174475498352884244229017384309804e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.97074898765380614681225071978849430802e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.59852103341093122669197704225736036199e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.97287954178083606552531325613580819555e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.57634773176875526612407357244997035312e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.34467233210713881817055138794482883359e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.91236170873875898506577053309622472122e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.12220990075567880730037575497818287435e-33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.20881889651487527801970182542596258873e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.56848486878078288956741060120464349537e-43),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33267370502089423930888060969568705647e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39632352029900752622967578086289898150e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42703739831525305516280300008439396218e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45767617531685380458878368024246654652e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40344962756110545138002101382437142038e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.47015258371290492450093115369080460499e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.97280918936580227687603348219414768787e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40441024286579579491205384492088325576e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26130000914236204012152918399995098882e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.03893990417552709151955156348527062863e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12687002255767114781771099969545907763e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74218645918961186861014420578277888513e-35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36897549168687040570349702061165281706e-39),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -1024) {
+        RealType t = -log2(ldexp(p, 512));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0360e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.67937186583822375017526293948703697225e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.06681764321003187068904973985967908140e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.12508887240195683379004033347903251977e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.56847823157999127998977939588643284176e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.31281869105767454049413701029676766275e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.01498951390503036399081209706853095793e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.72866867304007090391517734634589972858e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.44819806993104486828983054294866921869e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.91441365806306460165885645136864045231e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.71364347097027340365042558634044496149e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.63601648491144929836375956218857970640e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.76948956673676441236280803645598939735e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.47367651137203634311843318915161504046e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.83187517541957887917067558455828915184e-41),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.21480186561579326423946788448005430367e-47),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16494591376838053609854716130343599036e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.97651667629616309497454026431358820357e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77741398674456235952879526959641925087e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.39478109667902532743651043316724748827e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35965905056304225411108295866332882930e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83206524996481183422082802793852630990e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30320324476590103123012385840054658401e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.30322948189714718819437477682869360798e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43729790298535728717477691270336818161e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.89788697114251966298674871919685298106e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.43510901856942238937717065880365530871e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38232043389918216652459244727737381677e-38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64599465785019268214108345671361994702e-43),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -2048) {
+        RealType t = -log2(ldexp(p, 1024));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.5130e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.11959316095291435774375635827672517008e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.30292575371366023255165927527306483022e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.54260157439166096303943109715675142318e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.61232819199170639867079290977704351939e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.74481972848503486840161528924694379655e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.98283577906243441829434029827766571263e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.90691715740583828769850056130458574520e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.31354728925505346732804698899977180508e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.42545288372836698650371589645832759416e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.12901629676328680681102537492164204387e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.99690040253176100731314099573187027309e-31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.07899506956133955785140496937520311210e-35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.88607240095256436460507438213387199067e-40),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.78815984551154095621830792130401294111e-45),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.20516030880916148179297554212609531432e-51),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.81973541224235020744673910266545976833e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49156990107280109344880219729275939242e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21606730563542176411852745162267260946e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11449329529433741944366607648360521674e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35659138507940819452801802756409587220e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.95708516718550485872934856595725983907e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78871290972777009292563576533612002908e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60955318960542258732596447917271198307e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72437581728117963125690670426402194936e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77473938855958487119889840032590783232e-33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66198494713809467076392278745811981500e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.34142897042941614778352280692901008538e-42),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98791658647635156162347063765388728959e-47),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4096) {
+        RealType t = -log2(ldexp(p, 2048));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.1220e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.67307564006689676593687414536012112755e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.21005690250741024744367516466433711478e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.11537345869365655126739041291119096558e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.82910297156061391001507891422501792453e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.51574933516708249049824513935386420692e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.56433757960363802088718489136097249753e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.74248235865301086829849817739500215149e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.19151506367084295119369434315371762091e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.98518959000360170320183116510466814569e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.21330422702314763225472001861559380186e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.44346922987964428874014866468161821471e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.59773305152191273570416120169527607421e-39),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.81894412321532723356954669501665983316e-44),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.25766346856943928908756472385992861288e-49),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.44601448994095786447982489957909713982e-55),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.90814053669730896497462224007523900520e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.72450689508305973756255440356759005330e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76517273086984384225845151573287252506e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31844251885317815627707511621078762352e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.22689324865113257769413663010725436393e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27524826460469866934006001123700331335e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39172850948322201614266822896191911031e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40343613937272428197414545004329993769e-27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.17936773028976355507339458927541970545e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66512598049860260933817550698863263184e-36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.06432209670481882442649684139775366719e-41),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.10247886333916820534393624270217678968e-46),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40899321122058714028548211810431871877e-51),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -8192) {
+        RealType t = -log2(ldexp(p, 4096));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.8974e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.36960987939726803544369406181770745475e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.17239311695985070524235502979761682692e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.51192208811996535244435318068035492922e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.38938553034896173195617671475670860841e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.55156910900732478717648524688116855303e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.14905040433940475292279950923000597280e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -7.35237464492052939771487320880614968639e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.07937000518607459141766382199896010484e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.42797358100745086706362563988598447929e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.27871637324128856529004325499921407260e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.99553669724530906250814559570819049401e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.04272644552406682186928100080598582627e-42),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.70093315570856725077212325128817808000e-47),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.51767319872105260145583037426067406953e-53),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.87159268409640967747617639113346310759e-59),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45350026842128595165328480395513258721e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.30398532102631290226106936127181928207e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.45242264812189519858570105609209495630e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.22745462510042159972414219082495434039e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31834645038348794443252730265421155969e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44590392528760847619123404904356730177e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08436623062305193311891193246627599030e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.46542554766048266351202730449796918707e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78672067064478133389628198943161640913e-34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.56573050761582685018467077197376031818e-39),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.92145137276530136848088270840255715047e-44),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96933863894082533505471662180541379922e-49),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.92661972206232945959915223259585457082e-55),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -16384) {
+        RealType t = -log2(ldexp(p, 8192));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.8819e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.24662793339079714510108682543625432532e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.25841960642102016210295419419373971750e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.10589156998251704634852108689102850747e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.18697614924486382142056819421294206504e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.79445222262445726654186491785652765635e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.41847338407338901513049755299049551186e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.44550500540299259432401029904726959214e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.97463434518480676079167684683604645092e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.68404349202062958045327516688040625516e-30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.14018837476359778654965300153810397742e-35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.67726222606571327724434861967972555751e-40),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.48082398191886705229604237754446294033e-45),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.28534456209055262678153908192583037946e-51),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.99466700145428173772768099494881455874e-57),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.43473066278196981345209422626769148425e-63),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.26570199429958856038191879713341034013e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32484776300757286079244074394356908390e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.31234182027812869096733088981702059020e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13711443044675425837293030288097468867e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.11480036828082409994688474687120865023e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.25592803132287127389756949487347562847e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.45726006695535760451195102271978072855e-28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13082170504731110487003517418453709982e-32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.48217827031663836930337143509338210426e-37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.47389053144555736191304002865419453269e-42),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90980968229123572201281013063229644814e-47),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79448544326289688123648457587797649323e-53),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.56179793347045575604935927245529360950e-59),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        result = -boost::math::numeric_limits<RealType>::infinity();
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.25) {
+        RealType t = p - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 1.8559e-18
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(4.81512108276093785320e-1),
+            static_cast<RealType>(-2.74296316128959647914e0),
+            static_cast<RealType>(-3.29973875964825685757e1),
+            static_cast<RealType>(-4.87536980816224603581e1),
+            static_cast<RealType>(8.22233203036734027999e1),
+            static_cast<RealType>(1.21654607908452130093e2),
+            static_cast<RealType>(-6.66681853240657307279e1),
+            static_cast<RealType>(-4.28101952511581488588e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[10] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.20189490825315245036e0),
+            static_cast<RealType>(1.63469912146101848441e1),
+            static_cast<RealType>(-1.52740920318273920072e1),
+            static_cast<RealType>(-5.41684560257839409762e1),
+            static_cast<RealType>(6.51733677169299416471e0),
+            static_cast<RealType>(3.93092001388102589237e1),
+            static_cast<RealType>(-9.59983666140749481195e-1),
+            static_cast<RealType>(-9.95648827557655863699e-1),
+            static_cast<RealType>(-1.32007124426778083829e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 4.6019e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.70276979914029733585e0),
+            static_cast<RealType>(2.09991992116646276165e1),
+            static_cast<RealType>(2.26775403775298867998e1),
+            static_cast<RealType>(-4.85384304722129472833e2),
+            static_cast<RealType>(-1.47107146466495573999e3),
+            static_cast<RealType>(-7.08748473959943943929e1),
+            static_cast<RealType>(1.54245210917147215257e3),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.13092357122115486375e1),
+            static_cast<RealType>(1.57318281834689144053e2),
+            static_cast<RealType>(4.42261730187813035957e2),
+            static_cast<RealType>(2.10814431586717588454e2),
+            static_cast<RealType>(-6.36700983439599552504e2),
+            static_cast<RealType>(-2.82923881266630617596e2),
+            static_cast<RealType>(1.36613971025062750340e2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2193e-19
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(4.25692449785074345588e-1),
+            static_cast<RealType>(3.10963501706596356267e-1),
+            static_cast<RealType>(2.91357806215297069863e-2),
+            static_cast<RealType>(2.34716342676849303244e-2),
+            static_cast<RealType>(5.83137296293361915583e-3),
+            static_cast<RealType>(3.71792415497884868748e-4),
+            static_cast<RealType>(1.59538372221030642757e-4),
+            static_cast<RealType>(4.74040834029330213692e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.14801234415100707213e-1),
+            static_cast<RealType>(1.04693730144480856638e-1),
+            static_cast<RealType>(3.81581484862997435076e-2),
+            static_cast<RealType>(8.95334009127358617362e-3),
+            static_cast<RealType>(1.43316686981760147226e-3),
+            static_cast<RealType>(1.81367766024620080990e-4),
+            static_cast<RealType>(1.54779999748286671973e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.4418e-17
+        BOOST_MATH_STATIC const RealType P[11] = {
+            static_cast<RealType>(5.07341098045260541890e-1),
+            static_cast<RealType>(3.11771145411143166935e-1),
+            static_cast<RealType>(1.74515601081894060888e-1),
+            static_cast<RealType>(8.46576990174024231338e-2),
+            static_cast<RealType>(2.57510090204322149315e-2),
+            static_cast<RealType>(8.26605326867021684811e-3),
+            static_cast<RealType>(1.73081423934722046819e-3),
+            static_cast<RealType>(3.36314161099011673569e-4),
+            static_cast<RealType>(4.50990441180388912803e-5),
+            static_cast<RealType>(4.53513191985642134268e-6),
+            static_cast<RealType>(2.62304611053075404923e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[11] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.28225379952156944029e-1),
+            static_cast<RealType>(3.49662079845715371907e-1),
+            static_cast<RealType>(1.45408903426879603625e-1),
+            static_cast<RealType>(5.06773501409016231879e-2),
+            static_cast<RealType>(1.45385556714043243731e-2),
+            static_cast<RealType>(3.31235831325018043744e-3),
+            static_cast<RealType>(6.06977554525543056050e-4),
+            static_cast<RealType>(8.42406730405209749492e-5),
+            static_cast<RealType>(8.32337989541696717905e-6),
+            static_cast<RealType>(4.84923196546857128337e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.7932e-17
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(5.41774626094491510395e-1),
+            static_cast<RealType>(4.11060141334529017898e-1),
+            static_cast<RealType>(1.48195601801946264526e-1),
+            static_cast<RealType>(3.33881552814492855873e-2),
+            static_cast<RealType>(5.20893974732203890418e-3),
+            static_cast<RealType>(5.84734765774178832854e-4),
+            static_cast<RealType>(4.71028150898133935445e-5),
+            static_cast<RealType>(2.59185739450631464618e-6),
+            static_cast<RealType>(7.77428184258777394627e-8),
+            static_cast<RealType>(2.51255632629650930196e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.58341767924960527280e-1),
+            static_cast<RealType>(2.73511775500642961539e-1),
+            static_cast<RealType>(6.16011987856129890130e-2),
+            static_cast<RealType>(9.61296002312356116021e-3),
+            static_cast<RealType>(1.07890675777726076554e-3),
+            static_cast<RealType>(8.69223632953458271977e-5),
+            static_cast<RealType>(4.78248875031756169279e-6),
+            static_cast<RealType>(1.43460852065144859304e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.0396e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(5.41926067826974905066e-1),
+            static_cast<RealType>(4.86926556246548518715e-1),
+            static_cast<RealType>(2.11963908288176005856e-1),
+            static_cast<RealType>(5.92200639925655576883e-2),
+            static_cast<RealType>(1.18859816815542567438e-2),
+            static_cast<RealType>(1.76833662992855443754e-3),
+            static_cast<RealType>(2.21226152157950219596e-4),
+            static_cast<RealType>(1.50444847316426133872e-5),
+            static_cast<RealType>(1.87458213915373906356e-6),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.98511036742503939380e-1),
+            static_cast<RealType>(3.91130673008184655152e-1),
+            static_cast<RealType>(1.09277016228474605069e-1),
+            static_cast<RealType>(2.19328471889880028208e-2),
+            static_cast<RealType>(3.26305879571349016107e-3),
+            static_cast<RealType>(4.08222014684743492069e-4),
+            static_cast<RealType>(2.77611385768697969181e-5),
+            static_cast<RealType>(3.45911046256304795257e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else {
+        RealType p_square = p * p;
+
+        if ((boost::math::isnormal)(p_square)) {
+            result = 1 / cbrt(p_square * constants::two_pi<RealType>());
+        }
+        else if (p > 0) {
+            result = 1 / (cbrt(p) * cbrt(p) * cbrt(constants::two_pi<RealType>()));
+        }
+        else {
+            result = boost::math::numeric_limits<RealType>::infinity();
+        }
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (p >= 0.375) {
+        RealType t = p - static_cast <RealType>(0.375);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 4.0835e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.00474815142578902619056852805926666121e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.56422290947427848191079775267512708223e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.70103710180837859003070678080056933649e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.08521918131449191445864593768320217287e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29340655781369686013042530147130581054e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.24198237124638368989049118891909723118e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.43382878809828906953609389440800537385e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.45564809127564867825118566276365267035e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.75881247317499884393790698530115428373e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.55845932095942777602241134226597158364e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.41328261385867825781522154621962338450e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06758225510372847658316203115073730186e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.10895417312529385966062255102265009972e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[12] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.88252553879196710256650370298744093367e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.54875259600848880869571364891152935969e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.78589587338618424770295921221996471887e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.15356831947775532414727361010652423453e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12951532118504570745988981200579372124e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48163841544376327168780999614703092433e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.56786609618056303930232548304847911521e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.25610739352108840474197350343978451729e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27063786175330237448255839666252978603e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.11941093895004369510720986032269722254e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.51487618026728514833542002963603231101e1),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.25) {
+        RealType t = p - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 5.7633e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.81512108276093787175849069715334402323e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24417080443497141096829831516758083481e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.67006165991083501886186268944009973084e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.74402382755828993223083868408545308340e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.49182541725192134610277727922493871787e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.67273564707254788337557775618297381267e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.73476432616329813096120568871900178919e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31235376166262024838125198332476698090e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.59379285677781413393733801325840617522e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.38151434050794836595564739176884302539e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33534676810383673962443893459127818078e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.38110822236764293910895765875742805411e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.42750073722992463087082849671338957023e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.54255748148299874514839812717054396793e2),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64823387375875361292425741663822893626e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02973633484731117050245517938177308809e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71288209768693917630236009171518272534e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.23837527610546426062625864735895938014e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.05056816585729983223036277071927165555e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.48087477651935811184913947280572029967e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04631058325147527913398256133791276127e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69813394441679590721342220435891453447e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.92323371456465893290687995174952942311e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.68542430563281320943284015587559056621e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.17969051793607842221356465819951568080e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82773308760283383020168853159163391394e2),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (p >= 0.125) {
+        RealType t = p - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Absolute Error: 2.1140e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70276979914029738186601698003670175907e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.63126762626382548478172664328434577553e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04190225271045202674546813475341133174e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.93523974140998850492859698545966806498e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19814006186501010136822066747124777014e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.55931423620290859807616748030589502039e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.78874021192395317496507459296221703565e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.03860533237347587977439662522389465152e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.77882648875352690605815508748162607271e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.05498612167816258406694194925933958145e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05326361485692298778330190198630232666e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.85827791876754731187453265804790139032e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.93719378006868242377955041137674308589e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.56839957539576784391036362196229047625e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95604329277359828898502487252547842378e6),
+        };
+        BOOST_MATH_STATIC const RealType Q[16] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79208640567193066236912382037923299779e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94775812217734059201656828286490832145e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16467934643564936346029555887148320030e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.35525720248600096849901920839060920346e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69760913594243328874861534307039589127e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.32330501005950982838953061458838040612e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.79610639577090112327353399739315606205e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.43314292923292828425630915931385776182e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.97538885038058371436244702169375622661e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.48431896958634429210349441846613832681e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.93459449030820736960297236799012798749e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.67200014823529787381847745962773726408e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.37035571075060153491151970623824940994e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.22682822001329636071591164177026394518e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09781406768816062486819491582960840983e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 3));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1409e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.25692449785074345466504245009175450649e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75679137667345136118441108839649360362e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06171803174020856964914440692439080669e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.87798066278592051163038122952593080648e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20070543183347459409303407166630392077e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13457391270614708627745403376469848816e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06743974464224003715510181633693539914e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16870984737226212814217822779976770316e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21845093091651861426944931268861694026e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.85357146081877929591916782097540632519e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.19085800299127898508052519062782284785e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41985644250494046067095909812634573318e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30857042700765443668305406695750760693e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.10466412567107519640190849286913680449e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31914248618040435028023418981527961171e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.73578090645412656850163531828709850171e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.57329813782272411333511950903192234311e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62736127875896578315177123764520823372e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76809643836078823237530990091078867553e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32026948719622983920194944841520771986e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.45051018027743807545734050620973716634e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.58281707210621813556068724127478674938e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.63884527227517358294732620995363921547e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15973602356223075515067915930205826229e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.35069439950884795002182517078104942615e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15454119109586223908613596754794988609e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.55273685376557721039847456564342945576e-10),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.2521e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[23] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.07341098045260497471001948654506267614e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16518383383878659278973043343250842753e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.10029094208424121908983949243560936013e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.04771840726172284780129819470963100749e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34173170868011689830672637082451998700e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41990262178664512140746911398264330173e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.06779488545758366708787010705581103705e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41892665233583725631482443019441608726e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.20692306716979208762785454648538891867e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.11097906809673639231336894729060830995e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.37476591232600886363441107536706973169e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.02659053066396720145189153810309784416e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.02209877191642023279303996697953314344e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.56663781532392665205516573323950583901e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95655734237060800145227277584749429063e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.06357695252098035545383649954315685077e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.78759045059235560356343893064681290047e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.95881339136963512103591745337914059651e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70156441275519927563064848389865812060e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.99745225746277063516394774908346367811e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.45718440382347867317547921045052714102e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.39027665085346558512961348663034579801e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05739751797738770096482688062542436470e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[23] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43370372582239919321785765900615222895e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.52872159582703775260145036441128318159e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28243735290178057451806192890274584778e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.93375398009812888642212045868197435998e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.73364866677217419593129631900708646445e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53645928499107852437053167521160449434e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74280939589407863107682593092148442428e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.80095449855178765594835180574448729793e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.65924845456946706158946250220103271334e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52170861715436344002253767944763106994e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.87246437551620484806338690322735878649e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.88631873230311653853089809596759382095e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.84478812152918182782333415475103623486e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.47998768403859674841488325856607782853e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.82364683269852480160620586102339743788e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.65854316058742127585142691993199177898e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11358340340462071552670838135645042498e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22818744671190957896035448856159685984e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11038729491846772238262374112315536796e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.21355801166652957655438257794658921155e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.41278271853370874105923461404291742454e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95100373579692323015092323646110838623e-15),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0703e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[21] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.41774626094491452462664949805613444094e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.96383089261273022706449773421031102175e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.16315295073029174376617863024082371446e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.65377894193914426949840018839915119410e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33210993830236821503160637845009556016e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69315463529653886947182738378630780083e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09869947341518160436616160018702590834e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44331691052908906654005398143769791881e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13131413925652085071882765653750661678e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.64441840437413591336927030249538399459e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78393581596372725434038621824715039765e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.50239319821178575427758224587858938204e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92619647697287767235953207451871137149e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26901081456833267780600560830367533351e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12151768312254597726918329997945574766e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36907507996686107513673694597817437197e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31699373909892506279113260845246144240e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.11230682511893290562864133995544214588e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.44627067257461788044784631155226503036e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39869585157420474301450400944478312794e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.82128612844034824876694595066123093042e-27),
+        };
+        BOOST_MATH_STATIC const RealType Q[20] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65414405277042133067228113526697909557e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32179221250476209346757936207079534440e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.74217392682100275524983756207618144313e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.45810448055940046896534973720645113799e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.81487408603233765436807980794697048675e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49442843848941402948883852684502731460e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66330842256792791665907478718489013963e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.93285292223845804061941359223505045576e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.87966347754794288681626114849829710697e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13711644429711675111080150193733607164e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.61758862007482013187806625777101452737e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.55435556106272558989915248980090731639e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34166571320580242213843747025082914011e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31411360099525131959755145015018410429e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.21684839228785650625270026640716752452e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.43021096301255274530428188746599779008e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.58831290247776456235908211620983180005e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74309280855806399632683315923592902203e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.58097100528573186098159133443927182780e-18),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.4124e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[19] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.41926067826974814669251179264786585885e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.21141529920003643675474888047093566280e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59964592861304582755436075901659426485e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.95135112971576806260593571877646426022e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12322024725362032809787183337883163254e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.96758465518847580191799508363466893068e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12389553946694902774213055563291192175e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04599236076217479033545023949602272721e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.16143771174487665823565565218797804931e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.38966874413947625866830582082846088427e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02590325514935982607907975481732376204e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44376747400143802055827426602151525955e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.82088624006657184426589019067893704020e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95757210706845964048697237729100056232e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.36096213291559182424937062842308387702e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14362780521873256616533770657488533993e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73571098395815275003552523759665474105e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47286214854389274681661944885238913581e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.73701196181204039400706651811524874455e-34),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.77119890916406072259446489508263892540e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95177888809731859578167185583119074026e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.29131027214559081111011582466619105016e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31442657037887347262737789825299661237e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83928863984637222329515960387531101267e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07389089078167127136964851949662391744e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93013847797006474150589676891548600820e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50600573851533884594030683413819219915e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94539484213971921794449107859541806317e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.58360895032645281635534287874266252341e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66414102108217999886628042310332365446e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07411076181287950822375436854492998754e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61224937285582228022463072515935601355e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.89242339209389981530783624934733098598e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11030225010379194015550512905872992373e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20285566539355859922818448335043495666e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71782855576364068752705740544460766362e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.1680e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.41926070139289008206183757488364846894e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.78434820569480998586988738136492447574e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07939171933509333571821660328723436210e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.92438439347811482522082798370060349739e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24288918322433485413615362874371441367e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04437759300344740815274986587186340509e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74063952231188399929705762263485071234e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.07228849610363181194047955109059900544e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93120850707001212714821992328252707694e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40911049607879914351205073608184243057e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71898232013947717725198847649536278438e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06963706982203753050300400912657068823e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.79849166632277658631839126599110199710e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.74682085785152276503345630444792840850e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09650236336641219916377836114077389212e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97326394822836529817663710792553753811e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.26635728806398747570910072594323836441e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.96470010392255781222480229189380065951e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.82841492468725267177870050157374330523e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83703946702662950408034486958999188355e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09320896703777230915306208582393356690e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29346630787642344947323515884281464979e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77242894492599243245354774839232776944e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.05722029871614922850936250945431594997e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.66920224988248720006255827987385374411e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.40887155754772190509572243444386095560e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44545968319921473942351968892623238920e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.17198676140022989760684932594389017027e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97376935482567419865730773801543995320e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06997835790265899882151030367297786861e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.06862653266619706928282319356971834957e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.02334307903766790059473763725329176667e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.33174535634931487079630169746402085699e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70989324903345102377898775620363767855e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.47067260145014475572799216996976703615e-18),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * cbrt(p * p));
+    }
+    else {
+        RealType p_square = p * p;
+
+        if ((boost::math::isnormal)(p_square)) {
+            result = 1 / cbrt(p_square * constants::two_pi<RealType>());
+        }
+        else if (p > 0) {
+            result = 1 / (cbrt(p) * cbrt(p) * cbrt(constants::two_pi<RealType>()));
+        }
+        else {
+            result = boost::math::numeric_limits<RealType>::infinity();
+        }
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 53>& tag)
+{
+    if (p > 0.5) {
+        return !complement ? mapairy_quantile_upper_imp_prec(1 - p, tag) : mapairy_quantile_lower_imp_prec(1 - p, tag);
+    }
+
+    return complement ? mapairy_quantile_upper_imp_prec(p, tag) : mapairy_quantile_lower_imp_prec(p, tag);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 113>& tag)
+{
+    if (p > 0.5) {
+        return !complement ? mapairy_quantile_upper_imp_prec(1 - p, tag) : mapairy_quantile_lower_imp_prec(1 - p, tag);
+    }
+
+    return complement ? mapairy_quantile_upper_imp_prec(p, tag) : mapairy_quantile_lower_imp_prec(p, tag);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_quantile_imp(const mapairy_distribution<RealType, Policy>& dist, const RealType& p, bool complement)
+{
+    // This routine implements the quantile for the Map-Airy distribution,
+    // the value p may be the probability, or its complement if complement=true.
+
+    constexpr auto function = "boost::math::quantile(mapairy<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_probability(function, p, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Map-Airy distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * mapairy_quantile_imp_prec(p, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_mode_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(-1.16158727113597068525);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_mode_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.1615872711359706852500000803029112987);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_mode_imp(const mapairy_distribution<RealType, Policy>& dist)
+{
+    // This implements the mode for the Map-Airy distribution,
+
+    constexpr auto function = "boost::math::mode(mapairy<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Map-Airy distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * mapairy_mode_imp_prec<RealType>(tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_median_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(-0.71671068545502205332);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_median_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, -0.71671068545502205331700196278067230944440);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_median_imp(const mapairy_distribution<RealType, Policy>& dist)
+{
+    // This implements the median for the Map-Airy distribution,
+
+    constexpr auto function = "boost::math::median(mapairy<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Map-Airy distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * mapairy_median_imp_prec<RealType>(tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_entropy_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(2.00727681841065634600);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_entropy_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.0072768184106563460003025875575283708);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mapairy_entropy_imp(const mapairy_distribution<RealType, Policy>& dist)
+{
+    // This implements the entropy for the Map-Airy distribution,
+
+    constexpr auto function = "boost::math::entropy(mapairy<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The Map-Airy distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = mapairy_entropy_imp_prec<RealType>(tag_type()) + log(scale);
+
+    return result;
+}
+
+} // detail
+
+template <class RealType = double, class Policy = policies::policy<> >
+class mapairy_distribution
+{
+    public:
+    typedef RealType value_type;
+    typedef Policy policy_type;
+
+    BOOST_MATH_GPU_ENABLED mapairy_distribution(RealType l_location = 0, RealType l_scale = 1)
+        : mu(l_location), c(l_scale)
+    {
+        constexpr auto function = "boost::math::mapairy_distribution<%1%>::mapairy_distribution";
+        RealType result = 0;
+        detail::check_location(function, l_location, &result, Policy());
+        detail::check_scale(function, l_scale, &result, Policy());
+    } // mapairy_distribution
+
+    BOOST_MATH_GPU_ENABLED RealType location()const
+    {
+        return mu;
+    }
+    BOOST_MATH_GPU_ENABLED RealType scale()const
+    {
+        return c;
+    }
+
+    private:
+    RealType mu;    // The location parameter.
+    RealType c;     // The scale parameter.
+};
+
+typedef mapairy_distribution<double> mapairy;
+
+#ifdef __cpp_deduction_guides
+template <class RealType>
+mapairy_distribution(RealType) -> mapairy_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+template <class RealType>
+mapairy_distribution(RealType, RealType) -> mapairy_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+#endif
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const mapairy_distribution<RealType, Policy>&)
+{ // Range of permissible values for random variable x.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const mapairy_distribution<RealType, Policy>&)
+{ // Range of supported values for random variable x.
+   // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-tools::max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const mapairy_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::mapairy_pdf_imp(dist, x);
+} // pdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const mapairy_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::mapairy_cdf_imp(dist, x, false);
+} // cdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const mapairy_distribution<RealType, Policy>& dist, const RealType& p)
+{
+    return detail::mapairy_quantile_imp(dist, p, false);
+} // quantile
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<mapairy_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::mapairy_cdf_imp(c.dist, c.param, true);
+} //  cdf complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<mapairy_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::mapairy_quantile_imp(c.dist, c.param, true);
+} // quantile complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mean(const mapairy_distribution<RealType, Policy> &dist)
+{
+    return dist.location();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType variance(const mapairy_distribution<RealType, Policy>& /*dist*/)
+{
+    return boost::math::numeric_limits<RealType>::infinity();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mode(const mapairy_distribution<RealType, Policy>& dist)
+{
+    return detail::mapairy_mode_imp(dist);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType median(const mapairy_distribution<RealType, Policy>& dist)
+{
+    return detail::mapairy_median_imp(dist);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const mapairy_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no skewness:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Map-Airy Distribution has no skewness");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::skewness(mapairy<%1%>&)",
+        "The Map-Airy distribution does not have a skewness: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const mapairy_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Map-Airy Distribution has no kurtosis");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis(mapairy<%1%>&)",
+        "The Map-Airy distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const mapairy_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis excess:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The Map-Airy Distribution has no kurtosis excess");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis_excess(mapairy<%1%>&)",
+        "The Map-Airy distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const mapairy_distribution<RealType, Policy>& dist)
+{
+    return detail::mapairy_entropy_imp(dist);
+}
+
+}} // namespaces
+
+
+#endif // BOOST_STATS_MAPAIRY_HPP
diff --git a/inst/include/boost/math/distributions/negative_binomial.hpp b/inst/include/boost/math/distributions/negative_binomial.hpp
index 18eec0993..f520c9480 100644
--- a/inst/include/boost/math/distributions/negative_binomial.hpp
+++ b/inst/include/boost/math/distributions/negative_binomial.hpp
@@ -44,6 +44,10 @@
 #ifndef BOOST_MATH_SPECIAL_NEGATIVE_BINOMIAL_HPP
 #define BOOST_MATH_SPECIAL_NEGATIVE_BINOMIAL_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for ibeta(a, b, x) == Ix(a, b).
 #include <boost/math/distributions/complement.hpp> // complement.
@@ -51,9 +55,7 @@
 #include <boost/math/special_functions/fpclassify.hpp> // isnan.
 #include <boost/math/tools/roots.hpp> // for root finding.
 #include <boost/math/distributions/detail/inv_discrete_quantile.hpp>
-
-#include <limits> // using std::numeric_limits;
-#include <utility>
+#include <boost/math/policies/error_handling.hpp>
 
 #if defined (BOOST_MSVC)
 #  pragma warning(push)
@@ -70,7 +72,7 @@ namespace boost
     {
       // Common error checking routines for negative binomial distribution functions:
       template <class RealType, class Policy>
-      inline bool check_successes(const char* function, const RealType& r, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_successes(const char* function, const RealType& r, RealType* result, const Policy& pol)
       {
         if( !(boost::math::isfinite)(r) || (r <= 0) )
         {
@@ -82,7 +84,7 @@ namespace boost
         return true;
       }
       template <class RealType, class Policy>
-      inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_success_fraction(const char* function, const RealType& p, RealType* result, const Policy& pol)
       {
         if( !(boost::math::isfinite)(p) || (p < 0) || (p > 1) )
         {
@@ -94,13 +96,13 @@ namespace boost
         return true;
       }
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& r, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& r, const RealType& p, RealType* result, const Policy& pol)
       {
         return check_success_fraction(function, p, result, pol)
           && check_successes(function, r, result, pol);
       }
       template <class RealType, class Policy>
-      inline bool check_dist_and_k(const char* function, const RealType& r, const RealType& p, RealType k, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_k(const char* function, const RealType& r, const RealType& p, RealType k, RealType* result, const Policy& pol)
       {
         if(check_dist(function, r, p, result, pol) == false)
         {
@@ -117,7 +119,7 @@ namespace boost
       } // Check_dist_and_k
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_prob(const char* function, const RealType& r, RealType p, RealType prob, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_prob(const char* function, const RealType& r, RealType p, RealType prob, RealType* result, const Policy& pol)
       {
         if((check_dist(function, r, p, result, pol) && detail::check_probability(function, prob, result, pol)) == false)
         {
@@ -134,7 +136,7 @@ namespace boost
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      negative_binomial_distribution(RealType r, RealType p) : m_r(r), m_p(p)
+      BOOST_MATH_GPU_ENABLED negative_binomial_distribution(RealType r, RealType p) : m_r(r), m_p(p)
       { // Constructor.
         RealType result;
         negative_binomial_detail::check_dist(
@@ -145,21 +147,21 @@ namespace boost
       } // negative_binomial_distribution constructor.
 
       // Private data getter class member functions.
-      RealType success_fraction() const
+      BOOST_MATH_GPU_ENABLED RealType success_fraction() const
       { // Probability of success as fraction in range 0 to 1.
         return m_p;
       }
-      RealType successes() const
+      BOOST_MATH_GPU_ENABLED RealType successes() const
       { // Total number of successes r.
         return m_r;
       }
 
-      static RealType find_lower_bound_on_p(
+      BOOST_MATH_GPU_ENABLED static RealType find_lower_bound_on_p(
         RealType trials,
         RealType successes,
         RealType alpha) // alpha 0.05 equivalent to 95% for one-sided test.
       {
-        static const char* function = "boost::math::negative_binomial<%1%>::find_lower_bound_on_p";
+        constexpr auto function = "boost::math::negative_binomial<%1%>::find_lower_bound_on_p";
         RealType result = 0;  // of error checks.
         RealType failures = trials - successes;
         if(false == detail::check_probability(function, alpha, &result, Policy())
@@ -179,12 +181,12 @@ namespace boost
         return ibeta_inv(successes, failures + 1, alpha, static_cast<RealType*>(nullptr), Policy());
       } // find_lower_bound_on_p
 
-      static RealType find_upper_bound_on_p(
+      BOOST_MATH_GPU_ENABLED static RealType find_upper_bound_on_p(
         RealType trials,
         RealType successes,
         RealType alpha) // alpha 0.05 equivalent to 95% for one-sided test.
       {
-        static const char* function = "boost::math::negative_binomial<%1%>::find_upper_bound_on_p";
+        constexpr auto function = "boost::math::negative_binomial<%1%>::find_upper_bound_on_p";
         RealType result = 0;  // of error checks.
         RealType failures = trials - successes;
         if(false == negative_binomial_detail::check_dist_and_k(
@@ -210,12 +212,12 @@ namespace boost
       // Estimate number of trials :
       // "How many trials do I need to be P% sure of seeing k or fewer failures?"
 
-      static RealType find_minimum_number_of_trials(
+      BOOST_MATH_GPU_ENABLED static RealType find_minimum_number_of_trials(
         RealType k,     // number of failures (k >= 0).
         RealType p,     // success fraction 0 <= p <= 1.
         RealType alpha) // risk level threshold 0 <= alpha <= 1.
       {
-        static const char* function = "boost::math::negative_binomial<%1%>::find_minimum_number_of_trials";
+        constexpr auto function = "boost::math::negative_binomial<%1%>::find_minimum_number_of_trials";
         // Error checks:
         RealType result = 0;
         if(false == negative_binomial_detail::check_dist_and_k(
@@ -227,12 +229,12 @@ namespace boost
         return result + k;
       } // RealType find_number_of_failures
 
-      static RealType find_maximum_number_of_trials(
+      BOOST_MATH_GPU_ENABLED static RealType find_maximum_number_of_trials(
         RealType k,     // number of failures (k >= 0).
         RealType p,     // success fraction 0 <= p <= 1.
         RealType alpha) // risk level threshold 0 <= alpha <= 1.
       {
-        static const char* function = "boost::math::negative_binomial<%1%>::find_maximum_number_of_trials";
+        constexpr auto function = "boost::math::negative_binomial<%1%>::find_maximum_number_of_trials";
         // Error checks:
         RealType result = 0;
         if(false == negative_binomial_detail::check_dist_and_k(
@@ -257,22 +259,22 @@ namespace boost
     #endif
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const negative_binomial_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const negative_binomial_distribution<RealType, Policy>& /* dist */)
     { // Range of permissible values for random variable k.
        using boost::math::tools::max_value;
-       return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // max_integer?
+       return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // max_integer?
     }
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const negative_binomial_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const negative_binomial_distribution<RealType, Policy>& /* dist */)
     { // Range of supported values for random variable k.
        // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
        using boost::math::tools::max_value;
-       return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>()); // max_integer?
+       return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>()); // max_integer?
     }
 
     template <class RealType, class Policy>
-    inline RealType mean(const negative_binomial_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const negative_binomial_distribution<RealType, Policy>& dist)
     { // Mean of Negative Binomial distribution = r(1-p)/p.
       return dist.successes() * (1 - dist.success_fraction() ) / dist.success_fraction();
     } // mean
@@ -285,14 +287,14 @@ namespace boost
     // Now implemented via quantile(half) in derived accessors.
 
     template <class RealType, class Policy>
-    inline RealType mode(const negative_binomial_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const negative_binomial_distribution<RealType, Policy>& dist)
     { // Mode of Negative Binomial distribution = floor[(r-1) * (1 - p)/p]
       BOOST_MATH_STD_USING // ADL of std functions.
       return floor((dist.successes() -1) * (1 - dist.success_fraction()) / dist.success_fraction());
     } // mode
 
     template <class RealType, class Policy>
-    inline RealType skewness(const negative_binomial_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const negative_binomial_distribution<RealType, Policy>& dist)
     { // skewness of Negative Binomial distribution = 2-p / (sqrt(r(1-p))
       BOOST_MATH_STD_USING // ADL of std functions.
       RealType p = dist.success_fraction();
@@ -303,7 +305,7 @@ namespace boost
     } // skewness
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const negative_binomial_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const negative_binomial_distribution<RealType, Policy>& dist)
     { // kurtosis of Negative Binomial distribution
       // http://en.wikipedia.org/wiki/Negative_binomial is kurtosis_excess so add 3
       RealType p = dist.success_fraction();
@@ -312,7 +314,7 @@ namespace boost
     } // kurtosis
 
      template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const negative_binomial_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const negative_binomial_distribution<RealType, Policy>& dist)
     { // kurtosis excess of Negative Binomial distribution
       // http://mathworld.wolfram.com/Kurtosis.html table of kurtosis_excess
       RealType p = dist.success_fraction();
@@ -321,7 +323,7 @@ namespace boost
     } // kurtosis_excess
 
     template <class RealType, class Policy>
-    inline RealType variance(const negative_binomial_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const negative_binomial_distribution<RealType, Policy>& dist)
     { // Variance of Binomial distribution = r (1-p) / p^2.
       return  dist.successes() * (1 - dist.success_fraction())
         / (dist.success_fraction() * dist.success_fraction());
@@ -335,11 +337,11 @@ namespace boost
     // chf of Negative Binomial distribution provided by derived accessors.
 
     template <class RealType, class Policy>
-    inline RealType pdf(const negative_binomial_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED inline RealType pdf(const negative_binomial_distribution<RealType, Policy>& dist, const RealType& k)
     { // Probability Density/Mass Function.
       BOOST_FPU_EXCEPTION_GUARD
 
-      static const char* function = "boost::math::pdf(const negative_binomial_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::pdf(const negative_binomial_distribution<%1%>&, %1%)";
 
       RealType r = dist.successes();
       RealType p = dist.success_fraction();
@@ -361,9 +363,9 @@ namespace boost
     } // negative_binomial_pdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const negative_binomial_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const negative_binomial_distribution<RealType, Policy>& dist, const RealType& k)
     { // Cumulative Distribution Function of Negative Binomial.
-      static const char* function = "boost::math::cdf(const negative_binomial_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::cdf(const negative_binomial_distribution<%1%>&, %1%)";
       using boost::math::ibeta; // Regularized incomplete beta function.
       // k argument may be integral, signed, or unsigned, or floating point.
       // If necessary, it has already been promoted from an integral type.
@@ -387,10 +389,10 @@ namespace boost
     } // cdf Cumulative Distribution Function Negative Binomial.
 
       template <class RealType, class Policy>
-      inline RealType cdf(const complemented2_type<negative_binomial_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<negative_binomial_distribution<RealType, Policy>, RealType>& c)
       { // Complemented Cumulative Distribution Function Negative Binomial.
 
-      static const char* function = "boost::math::cdf(const negative_binomial_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::cdf(const negative_binomial_distribution<%1%>&, %1%)";
       using boost::math::ibetac; // Regularized incomplete beta function complement.
       // k argument may be integral, signed, or unsigned, or floating point.
       // If necessary, it has already been promoted from an integral type.
@@ -421,7 +423,7 @@ namespace boost
     } // cdf Cumulative Distribution Function Negative Binomial.
 
     template <class RealType, class Policy>
-    inline RealType quantile(const negative_binomial_distribution<RealType, Policy>& dist, const RealType& P)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const negative_binomial_distribution<RealType, Policy>& dist, const RealType& P)
     { // Quantile, percentile/100 or Percent Point Negative Binomial function.
       // Return the number of expected failures k for a given probability p.
 
@@ -429,7 +431,7 @@ namespace boost
       // MAthCAD pnbinom return smallest k such that negative_binomial(k, n, p) >= probability.
       // k argument may be integral, signed, or unsigned, or floating point.
       // BUT Cephes/CodeCogs says: finds argument p (0 to 1) such that cdf(k, n, p) = y
-      static const char* function = "boost::math::quantile(const negative_binomial_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::quantile(const negative_binomial_distribution<%1%>&, %1%)";
       BOOST_MATH_STD_USING // ADL of std functions.
 
       RealType p = dist.success_fraction();
@@ -484,7 +486,7 @@ namespace boost
          //
          // Cornish-Fisher Negative binomial approximation not accurate in this area:
          //
-         guess = (std::min)(RealType(r * 2), RealType(10));
+         guess = BOOST_MATH_GPU_SAFE_MIN(RealType(r * 2), RealType(10));
       }
       else
          factor = (1-P < sqrt(tools::epsilon<RealType>())) ? 2 : (guess < 20 ? 1.2f : 1.1f);
@@ -492,7 +494,7 @@ namespace boost
       //
       // Max iterations permitted:
       //
-      std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+      boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
       typedef typename Policy::discrete_quantile_type discrete_type;
       return detail::inverse_discrete_quantile(
          dist,
@@ -506,11 +508,11 @@ namespace boost
     } // RealType quantile(const negative_binomial_distribution dist, p)
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<negative_binomial_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<negative_binomial_distribution<RealType, Policy>, RealType>& c)
     {  // Quantile or Percent Point Binomial function.
        // Return the number of expected failures k for a given
        // complement of the probability Q = 1 - P.
-       static const char* function = "boost::math::quantile(const negative_binomial_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::quantile(const negative_binomial_distribution<%1%>&, %1%)";
        BOOST_MATH_STD_USING
 
        // Error checks:
@@ -571,7 +573,7 @@ namespace boost
           //
           // Cornish-Fisher Negative binomial approximation not accurate in this area:
           //
-          guess = (std::min)(RealType(r * 2), RealType(10));
+          guess = BOOST_MATH_GPU_SAFE_MIN(RealType(r * 2), RealType(10));
        }
        else
           factor = (Q < sqrt(tools::epsilon<RealType>())) ? 2 : (guess < 20 ? 1.2f : 1.1f);
@@ -579,7 +581,7 @@ namespace boost
        //
        // Max iterations permitted:
        //
-       std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+       boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
        typedef typename Policy::discrete_quantile_type discrete_type;
        return detail::inverse_discrete_quantile(
           dist,
diff --git a/inst/include/boost/math/distributions/non_central_beta.hpp b/inst/include/boost/math/distributions/non_central_beta.hpp
index 9266c9e57..9dd7d5e60 100644
--- a/inst/include/boost/math/distributions/non_central_beta.hpp
+++ b/inst/include/boost/math/distributions/non_central_beta.hpp
@@ -1,7 +1,7 @@
 // boost\math\distributions\non_central_beta.hpp
 
 // Copyright John Maddock 2008.
-
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -10,6 +10,10 @@
 #ifndef BOOST_MATH_SPECIAL_NON_CENTRAL_BETA_HPP
 #define BOOST_MATH_SPECIAL_NON_CENTRAL_BETA_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for incomplete gamma. gamma_q
 #include <boost/math/distributions/complement.hpp> // complements
@@ -20,6 +24,7 @@
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/tools/roots.hpp> // for root finding.
 #include <boost/math/tools/series.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost
 {
@@ -32,14 +37,14 @@ namespace boost
       namespace detail{
 
          template <class T, class Policy>
-         T non_central_beta_p(T a, T b, T lam, T x, T y, const Policy& pol, T init_val = 0)
+         BOOST_MATH_GPU_ENABLED T non_central_beta_p(T a, T b, T lam, T x, T y, const Policy& pol, T init_val = 0)
          {
             BOOST_MATH_STD_USING
                using namespace boost::math;
             //
             // Variables come first:
             //
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
             T l2 = lam / 2;
             //
@@ -63,6 +68,17 @@ namespace boost
                ? detail::ibeta_imp(T(a + k), b, x, pol, false, true, &xterm)
                : detail::ibeta_imp(b, T(a + k), y, pol, true, true, &xterm);
 
+            while (fabs(beta * pois) < tools::min_value<T>())
+            {
+               if ((k == 0) || (pois == 0))
+                  return init_val;
+               k /= 2;
+               pois = gamma_p_derivative(T(k + 1), l2, pol);
+               beta = x < y
+                  ? detail::ibeta_imp(T(a + k), b, x, pol, false, true, &xterm)
+                  : detail::ibeta_imp(b, T(a + k), y, pol, true, true, &xterm);
+            }
+
             xterm *= y / (a + b + k - 1);
             T poisf(pois), betaf(beta), xtermf(xterm);
             T sum = init_val;
@@ -75,12 +91,12 @@ namespace boost
             // direction for recursion:
             //
             T last_term = 0;
-            std::uintmax_t count = k;
+            boost::math::uintmax_t count = k;
             for(auto i = k; i >= 0; --i)
             {
                T term = beta * pois;
                sum += term;
-               if(((fabs(term/sum) < errtol) && (last_term >= term)) || (term == 0))
+               if(((fabs(term/sum) < errtol) && (fabs(last_term) >= fabs(term))) || (term == 0))
                {
                   count = k - i;
                   break;
@@ -95,6 +111,7 @@ namespace boost
                
                last_term = term;
             }
+            last_term = 0;
             for(auto i = k + 1; ; ++i)
             {
                poisf *= l2 / i;
@@ -103,29 +120,28 @@ namespace boost
 
                T term = poisf * betaf;
                sum += term;
-               if((fabs(term/sum) < errtol) || (term == 0))
+               if(((fabs(term/sum) < errtol) && (fabs(last_term) >= fabs(term))) || (term == 0))
                {
                   break;
                }
-               if(static_cast<std::uintmax_t>(count + i - k) > max_iter)
+               last_term = term;
+               if(static_cast<boost::math::uintmax_t>(count + i - k) > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "cdf(non_central_beta_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("cdf(non_central_beta_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
             }
             return sum;
          }
 
          template <class T, class Policy>
-         T non_central_beta_q(T a, T b, T lam, T x, T y, const Policy& pol, T init_val = 0)
+         BOOST_MATH_GPU_ENABLED T non_central_beta_q(T a, T b, T lam, T x, T y, const Policy& pol, T init_val = 0)
          {
             BOOST_MATH_STD_USING
                using namespace boost::math;
             //
             // Variables come first:
             //
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
             T l2 = lam / 2;
             //
@@ -174,7 +190,7 @@ namespace boost
             // of the bulk of the sum:
             //
             T last_term = 0;
-            std::uintmax_t count = 0;
+            boost::math::uintmax_t count = 0;
             for(auto i = k + 1; ; ++i)
             {
                poisf *= l2 / i;
@@ -188,11 +204,9 @@ namespace boost
                   count = i - k;
                   break;
                }
-               if(static_cast<std::uintmax_t>(i - k) > max_iter)
+               if(static_cast<boost::math::uintmax_t>(i - k) > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "cdf(non_central_beta_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("cdf(non_central_beta_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
                last_term = term;
             }
@@ -204,21 +218,22 @@ namespace boost
                {
                   break;
                }
-               if(static_cast<std::uintmax_t>(count + k - i) > max_iter)
+               if(static_cast<boost::math::uintmax_t>(count + k - i) > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "cdf(non_central_beta_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("cdf(non_central_beta_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
                pois *= i / l2;
                beta -= xterm;
-               xterm *= (a + i - 1) / (x * (a + b + i - 2));
+               if (a + b + i - 2 != 0)
+               {
+                   xterm *= (a + i - 1) / (x * (a + b + i - 2));
+               }
             }
             return sum;
          }
 
          template <class RealType, class Policy>
-         inline RealType non_central_beta_cdf(RealType x, RealType y, RealType a, RealType b, RealType l, bool invert, const Policy&)
+         BOOST_MATH_GPU_ENABLED inline RealType non_central_beta_cdf(RealType x, RealType y, RealType a, RealType b, RealType l, bool invert, const Policy&)
          {
             typedef typename policies::evaluation<RealType, Policy>::type value_type;
             typedef typename policies::normalise<
@@ -273,10 +288,10 @@ namespace boost
          template <class T, class Policy>
          struct nc_beta_quantile_functor
          {
-            nc_beta_quantile_functor(const non_central_beta_distribution<T,Policy>& d, T t, bool c)
+            BOOST_MATH_GPU_ENABLED nc_beta_quantile_functor(const non_central_beta_distribution<T,Policy>& d, T t, bool c)
                : dist(d), target(t), comp(c) {}
 
-            T operator()(const T& x)
+            BOOST_MATH_GPU_ENABLED T operator()(const T& x)
             {
                return comp ?
                   T(target - cdf(complement(dist, x)))
@@ -295,10 +310,10 @@ namespace boost
          // heuristics.
          //
          template <class F, class T, class Tol, class Policy>
-         std::pair<T, T> bracket_and_solve_root_01(F f, const T& guess, T factor, bool rising, Tol tol, std::uintmax_t& max_iter, const Policy& pol)
+         BOOST_MATH_GPU_ENABLED boost::math::pair<T, T> bracket_and_solve_root_01(F f, const T& guess, T factor, bool rising, Tol tol, boost::math::uintmax_t& max_iter, const Policy& pol)
          {
             BOOST_MATH_STD_USING
-               static const char* function = "boost::math::tools::bracket_and_solve_root_01<%1%>";
+               constexpr auto function = "boost::math::tools::bracket_and_solve_root_01<%1%>";
             //
             // Set up initial brackets:
             //
@@ -309,7 +324,7 @@ namespace boost
             //
             // Set up invocation count:
             //
-            std::uintmax_t count = max_iter - 1;
+            boost::math::uintmax_t count = max_iter - 1;
 
             if((fa < 0) == (guess < 0 ? !rising : rising))
             {
@@ -321,8 +336,8 @@ namespace boost
                {
                   if(count == 0)
                   {
-                     b = policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", b, pol);
-                     return std::make_pair(a, b);
+                     b = policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", b, pol); // LCOV_EXCL_LINE
+                     return boost::math::make_pair(a, b);
                   }
                   //
                   // Heuristic: every 20 iterations we double the growth factor in case the
@@ -355,12 +370,12 @@ namespace boost
                      // Escape route just in case the answer is zero!
                      max_iter -= count;
                      max_iter += 1;
-                     return a > 0 ? std::make_pair(T(0), T(a)) : std::make_pair(T(a), T(0));
+                     return a > 0 ? boost::math::make_pair(T(0), T(a)) : boost::math::make_pair(T(a), T(0));
                   }
                   if(count == 0)
                   {
-                     a = policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", a, pol);
-                     return std::make_pair(a, b);
+                     a = policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", a, pol); // LCOV_EXCL_LINE
+                     return boost::math::make_pair(a, b);
                   }
                   //
                   // Heuristic: every 20 iterations we double the growth factor in case the
@@ -381,7 +396,7 @@ namespace boost
             }
             max_iter -= count;
             max_iter += 1;
-            std::pair<T, T> r = toms748_solve(
+            boost::math::pair<T, T> r = toms748_solve(
                f,
                (a < 0 ? b : a),
                (a < 0 ? a : b),
@@ -396,9 +411,9 @@ namespace boost
          }
 
          template <class RealType, class Policy>
-         RealType nc_beta_quantile(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& p, bool comp)
+         BOOST_MATH_GPU_ENABLED RealType nc_beta_quantile(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& p, bool comp)
          {
-            static const char* function = "quantile(non_central_beta_distribution<%1%>, %1%)";
+            constexpr auto function = "quantile(non_central_beta_distribution<%1%>, %1%)";
             typedef typename policies::evaluation<RealType, Policy>::type value_type;
             typedef typename policies::normalise<
                Policy,
@@ -495,9 +510,9 @@ namespace boost
             detail::nc_beta_quantile_functor<value_type, Policy>
                f(non_central_beta_distribution<value_type, Policy>(a, b, l), p, comp);
             tools::eps_tolerance<value_type> tol(policies::digits<RealType, Policy>());
-            std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
 
-            std::pair<value_type, value_type> ir
+            boost::math::pair<value_type, value_type> ir
                = bracket_and_solve_root_01(
                   f, guess, value_type(2.5), true, tol,
                   max_iter, Policy());
@@ -505,12 +520,14 @@ namespace boost
 
             if(max_iter >= policies::get_max_root_iterations<Policy>())
             {
+               // LCOV_EXCL_START
                return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
                   " either there is no answer to quantile of the non central beta distribution"
                   " or the answer is infinite.  Current best guess is %1%",
                   policies::checked_narrowing_cast<RealType, forwarding_policy>(
                      result,
                      function), Policy());
+               // LCOV_EXCL_STOP
             }
             return policies::checked_narrowing_cast<RealType, forwarding_policy>(
                result,
@@ -518,7 +535,7 @@ namespace boost
          }
 
          template <class T, class Policy>
-         T non_central_beta_pdf(T a, T b, T lam, T x, T y, const Policy& pol)
+         BOOST_MATH_GPU_ENABLED T non_central_beta_pdf(T a, T b, T lam, T x, T y, const Policy& pol)
          {
             BOOST_MATH_STD_USING
             //
@@ -529,7 +546,7 @@ namespace boost
             //
             // Variables come first:
             //
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
             T l2 = lam / 2;
             //
@@ -543,6 +560,24 @@ namespace boost
             T beta = x < y ?
                ibeta_derivative(a + k, b, x, pol)
                : ibeta_derivative(b, a + k, y, pol);
+
+            while (fabs(beta * pois) < tools::min_value<T>())
+            {
+               if ((k == 0) || (pois == 0))
+                  return 0;  // Nothing else we can do!
+               //
+               // We only get here when a+k and b are large and x is small,
+               // in that case reduce k (bisect) until both terms are finite:
+               //
+               k /= 2;
+               pois = gamma_p_derivative(T(k + 1), l2, pol);
+               // Starting beta term:
+               beta = x < y ?
+                  ibeta_derivative(a + k, b, x, pol)
+                  : ibeta_derivative(b, a + k, y, pol);
+            }
+
+
             T sum = 0;
             T poisf(pois);
             T betaf(beta);
@@ -550,16 +585,20 @@ namespace boost
             //
             // Stable backwards recursion first:
             //
-            std::uintmax_t count = k;
+            boost::math::uintmax_t count = k;
+            T ratio = 0;
+            T old_ratio = 0;
             for(auto i = k; i >= 0; --i)
             {
                T term = beta * pois;
                sum += term;
-               if((fabs(term/sum) < errtol) || (term == 0))
+               ratio = fabs(term / sum);
+               if(((ratio < errtol) && (ratio < old_ratio)) || (term == 0))
                {
                   count = k - i;
                   break;
                }
+               ratio = old_ratio;
                pois *= i / l2;
 
                if (a + b + i != 1)
@@ -567,6 +606,7 @@ namespace boost
                   beta *= (a + i - 1) / (x * (a + i + b - 1));
                }
             }
+            old_ratio = 0;
             for(auto i = k + 1; ; ++i)
             {
                poisf *= l2 / i;
@@ -574,25 +614,25 @@ namespace boost
 
                T term = poisf * betaf;
                sum += term;
-               if((fabs(term/sum) < errtol) || (term == 0))
+               ratio = fabs(term / sum);
+               if(((ratio < errtol) && (ratio < old_ratio)) || (term == 0))
                {
                   break;
                }
-               if(static_cast<std::uintmax_t>(count + i - k) > max_iter)
+               old_ratio = ratio;
+               if(static_cast<boost::math::uintmax_t>(count + i - k) > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "pdf(non_central_beta_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("pdf(non_central_beta_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
             }
             return sum;
          }
 
          template <class RealType, class Policy>
-         RealType nc_beta_pdf(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& x)
+         BOOST_MATH_GPU_ENABLED RealType nc_beta_pdf(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& x)
          {
             BOOST_MATH_STD_USING
-            static const char* function = "pdf(non_central_beta_distribution<%1%>, %1%)";
+            constexpr auto function = "pdf(non_central_beta_distribution<%1%>, %1%)";
             typedef typename policies::evaluation<RealType, Policy>::type value_type;
             typedef typename policies::normalise<
                Policy,
@@ -637,8 +677,8 @@ namespace boost
          struct hypergeometric_2F2_sum
          {
             typedef T result_type;
-            hypergeometric_2F2_sum(T a1_, T a2_, T b1_, T b2_, T z_) : a1(a1_), a2(a2_), b1(b1_), b2(b2_), z(z_), term(1), k(0) {}
-            T operator()()
+            BOOST_MATH_GPU_ENABLED hypergeometric_2F2_sum(T a1_, T a2_, T b1_, T b2_, T z_) : a1(a1_), a2(a2_), b1(b1_), b2(b2_), z(z_), term(1), k(0) {}
+            BOOST_MATH_GPU_ENABLED T operator()()
             {
                T result = term;
                term *= a1 * a2 / (b1 * b2);
@@ -655,14 +695,14 @@ namespace boost
          };
 
          template <class T, class Policy>
-         T hypergeometric_2F2(T a1, T a2, T b1, T b2, T z, const Policy& pol)
+         BOOST_MATH_GPU_ENABLED T hypergeometric_2F2(T a1, T a2, T b1, T b2, T z, const Policy& pol)
          {
             typedef typename policies::evaluation<T, Policy>::type value_type;
 
             const char* function = "boost::math::detail::hypergeometric_2F2<%1%>(%1%,%1%,%1%,%1%,%1%)";
 
             hypergeometric_2F2_sum<value_type> s(a1, a2, b1, b2, z);
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
             value_type result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<value_type, Policy>(), max_iter);
 
@@ -679,7 +719,7 @@ namespace boost
          typedef RealType value_type;
          typedef Policy policy_type;
 
-         non_central_beta_distribution(RealType a_, RealType b_, RealType lambda) : a(a_), b(b_), ncp(lambda)
+         BOOST_MATH_GPU_ENABLED non_central_beta_distribution(RealType a_, RealType b_, RealType lambda) : a(a_), b(b_), ncp(lambda)
          {
             const char* function = "boost::math::non_central_beta_distribution<%1%>::non_central_beta_distribution(%1%,%1%)";
             RealType r;
@@ -696,15 +736,15 @@ namespace boost
                Policy());
          } // non_central_beta_distribution constructor.
 
-         RealType alpha() const
+         BOOST_MATH_GPU_ENABLED RealType alpha() const
          { // Private data getter function.
             return a;
          }
-         RealType beta() const
+         BOOST_MATH_GPU_ENABLED RealType beta() const
          { // Private data getter function.
             return b;
          }
-         RealType non_centrality() const
+         BOOST_MATH_GPU_ENABLED RealType non_centrality() const
          { // Private data getter function.
             return ncp;
          }
@@ -725,24 +765,24 @@ namespace boost
       // Non-member functions to give properties of the distribution.
 
       template <class RealType, class Policy>
-      inline const std::pair<RealType, RealType> range(const non_central_beta_distribution<RealType, Policy>& /* dist */)
+      BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const non_central_beta_distribution<RealType, Policy>& /* dist */)
       { // Range of permissible values for random variable k.
          using boost::math::tools::max_value;
-         return std::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
+         return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
       }
 
       template <class RealType, class Policy>
-      inline const std::pair<RealType, RealType> support(const non_central_beta_distribution<RealType, Policy>& /* dist */)
+      BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const non_central_beta_distribution<RealType, Policy>& /* dist */)
       { // Range of supported values for random variable k.
          // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
          using boost::math::tools::max_value;
-         return std::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
+         return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), static_cast<RealType>(1));
       }
 
       template <class RealType, class Policy>
-      inline RealType mode(const non_central_beta_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType mode(const non_central_beta_distribution<RealType, Policy>& dist)
       { // mode.
-         static const char* function = "mode(non_central_beta_distribution<%1%> const&)";
+         constexpr auto function = "mode(non_central_beta_distribution<%1%> const&)";
 
          RealType a = dist.alpha();
          RealType b = dist.beta();
@@ -777,7 +817,7 @@ namespace boost
       // later:
       //
       template <class RealType, class Policy>
-      inline RealType mean(const non_central_beta_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType mean(const non_central_beta_distribution<RealType, Policy>& dist)
       {
          BOOST_MATH_STD_USING
          RealType a = dist.alpha();
@@ -788,7 +828,7 @@ namespace boost
       } // mean
 
       template <class RealType, class Policy>
-      inline RealType variance(const non_central_beta_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType variance(const non_central_beta_distribution<RealType, Policy>& dist)
       { 
          //
          // Relative error of this function may be arbitrarily large... absolute
@@ -808,45 +848,41 @@ namespace boost
       // RealType standard_deviation(const non_central_beta_distribution<RealType, Policy>& dist)
       // standard_deviation provided by derived accessors.
       template <class RealType, class Policy>
-      inline RealType skewness(const non_central_beta_distribution<RealType, Policy>& /*dist*/)
+      BOOST_MATH_GPU_ENABLED inline RealType skewness(const non_central_beta_distribution<RealType, Policy>& /*dist*/)
       { // skewness = sqrt(l).
          const char* function = "boost::math::non_central_beta_distribution<%1%>::skewness()";
          typedef typename Policy::assert_undefined_type assert_type;
-         static_assert(assert_type::value == 0, "Assert type is undefined.");
+         static_assert(assert_type::value == 0, "The Non Central Beta Distribution has no skewness.");
 
-         return policies::raise_evaluation_error<RealType>(
-            function,
-            "This function is not yet implemented, the only sensible result is %1%.",
-            std::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+         return policies::raise_evaluation_error<RealType>(function, "This function is not yet implemented, the only sensible result is %1%.", // LCOV_EXCL_LINE
+            boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?  LCOV_EXCL_LINE
       }
 
       template <class RealType, class Policy>
-      inline RealType kurtosis_excess(const non_central_beta_distribution<RealType, Policy>& /*dist*/)
+      BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const non_central_beta_distribution<RealType, Policy>& /*dist*/)
       {
          const char* function = "boost::math::non_central_beta_distribution<%1%>::kurtosis_excess()";
          typedef typename Policy::assert_undefined_type assert_type;
-         static_assert(assert_type::value == 0, "Assert type is undefined.");
+         static_assert(assert_type::value == 0, "The Non Central Beta Distribution has no kurtosis excess.");
 
-         return policies::raise_evaluation_error<RealType>(
-            function,
-            "This function is not yet implemented, the only sensible result is %1%.",
-            std::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+         return policies::raise_evaluation_error<RealType>(function, "This function is not yet implemented, the only sensible result is %1%.", // LCOV_EXCL_LINE
+            boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?  LCOV_EXCL_LINE
       } // kurtosis_excess
 
       template <class RealType, class Policy>
-      inline RealType kurtosis(const non_central_beta_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const non_central_beta_distribution<RealType, Policy>& dist)
       {
          return kurtosis_excess(dist) + 3;
       }
 
       template <class RealType, class Policy>
-      inline RealType pdf(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& x)
+      BOOST_MATH_GPU_ENABLED inline RealType pdf(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& x)
       { // Probability Density/Mass Function.
          return detail::nc_beta_pdf(dist, x);
       } // pdf
 
       template <class RealType, class Policy>
-      RealType cdf(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& x)
+      BOOST_MATH_GPU_ENABLED RealType cdf(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& x)
       {
          const char* function = "boost::math::non_central_beta_distribution<%1%>::cdf(%1%)";
             RealType a = dist.alpha();
@@ -881,7 +917,7 @@ namespace boost
       } // cdf
 
       template <class RealType, class Policy>
-      RealType cdf(const complemented2_type<non_central_beta_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED RealType cdf(const complemented2_type<non_central_beta_distribution<RealType, Policy>, RealType>& c)
       { // Complemented Cumulative Distribution Function
          const char* function = "boost::math::non_central_beta_distribution<%1%>::cdf(%1%)";
          non_central_beta_distribution<RealType, Policy> const& dist = c.dist;
@@ -918,13 +954,13 @@ namespace boost
       } // ccdf
 
       template <class RealType, class Policy>
-      inline RealType quantile(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& p)
+      BOOST_MATH_GPU_ENABLED inline RealType quantile(const non_central_beta_distribution<RealType, Policy>& dist, const RealType& p)
       { // Quantile (or Percent Point) function.
          return detail::nc_beta_quantile(dist, p, false);
       } // quantile
 
       template <class RealType, class Policy>
-      inline RealType quantile(const complemented2_type<non_central_beta_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<non_central_beta_distribution<RealType, Policy>, RealType>& c)
       { // Quantile (or Percent Point) function.
          return detail::nc_beta_quantile(c.dist, c.param, true);
       } // quantile complement.
diff --git a/inst/include/boost/math/distributions/non_central_chi_squared.hpp b/inst/include/boost/math/distributions/non_central_chi_squared.hpp
index c85c1d08d..5917b3732 100644
--- a/inst/include/boost/math/distributions/non_central_chi_squared.hpp
+++ b/inst/include/boost/math/distributions/non_central_chi_squared.hpp
@@ -1,7 +1,7 @@
 // boost\math\distributions\non_central_chi_squared.hpp
 
 // Copyright John Maddock 2008.
-
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -10,6 +10,10 @@
 #ifndef BOOST_MATH_SPECIAL_NON_CENTRAL_CHI_SQUARE_HPP
 #define BOOST_MATH_SPECIAL_NON_CENTRAL_CHI_SQUARE_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp> // for incomplete gamma. gamma_q
 #include <boost/math/special_functions/bessel.hpp> // for cyl_bessel_i
@@ -21,6 +25,7 @@
 #include <boost/math/tools/roots.hpp> // for root finding.
 #include <boost/math/distributions/detail/generic_mode.hpp>
 #include <boost/math/distributions/detail/generic_quantile.hpp>
+#include <boost/math/policies/policy.hpp>
 
 namespace boost
 {
@@ -33,7 +38,7 @@ namespace boost
       namespace detail{
 
          template <class T, class Policy>
-         T non_central_chi_square_q(T x, T f, T theta, const Policy& pol, T init_sum = 0)
+         BOOST_MATH_GPU_ENABLED T non_central_chi_square_q(T x, T f, T theta, const Policy& pol, T init_sum = 0)
          {
             //
             // Computes the complement of the Non-Central Chi-Square
@@ -62,7 +67,7 @@ namespace boost
             T lambda = theta / 2;
             T del = f / 2;
             T y = x / 2;
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
             T sum = init_sum;
             //
@@ -89,7 +94,7 @@ namespace boost
             // recurrences:
             //
             long long i;
-            for(i = k; static_cast<std::uintmax_t>(i-k) < max_iter; ++i)
+            for(i = k; static_cast<boost::math::uintmax_t>(i-k) < max_iter; ++i)
             {
                T term = poisf * gamf;
                sum += term;
@@ -100,10 +105,8 @@ namespace boost
                   break;
             }
             //Error check:
-            if(static_cast<std::uintmax_t>(i-k) >= max_iter)
-               return policies::raise_evaluation_error(
-                  "cdf(non_central_chi_squared_distribution<%1%>, %1%)",
-                  "Series did not converge, closest value was %1%", sum, pol);
+            if(static_cast<boost::math::uintmax_t>(i-k) >= max_iter)
+               return policies::raise_evaluation_error("cdf(non_central_chi_squared_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
             //
             // Now backwards iteration: the gamma
             // function recurrences are unstable in this
@@ -128,7 +131,7 @@ namespace boost
          }
 
          template <class T, class Policy>
-         T non_central_chi_square_p_ding(T x, T f, T theta, const Policy& pol, T init_sum = 0)
+         BOOST_MATH_GPU_ENABLED T non_central_chi_square_p_ding(T x, T f, T theta, const Policy& pol, T init_sum = 0)
          {
             //
             // This is an implementation of:
@@ -157,12 +160,12 @@ namespace boost
             if(sum == 0)
                return sum;
 
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
 
             int i;
             T lterm(0), term(0);
-            for(i = 1; static_cast<std::uintmax_t>(i) < max_iter; ++i)
+            for(i = 1; static_cast<boost::math::uintmax_t>(i) < max_iter; ++i)
             {
                tk = tk * x / (f + 2 * i);
                uk = uk * lambda / i;
@@ -174,16 +177,14 @@ namespace boost
                   break;
             }
             //Error check:
-            if(static_cast<std::uintmax_t>(i) >= max_iter)
-               return policies::raise_evaluation_error(
-                  "cdf(non_central_chi_squared_distribution<%1%>, %1%)",
-                  "Series did not converge, closest value was %1%", sum, pol);
+            if(static_cast<boost::math::uintmax_t>(i) >= max_iter)
+               return policies::raise_evaluation_error("cdf(non_central_chi_squared_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
             return sum;
          }
 
 
          template <class T, class Policy>
-         T non_central_chi_square_p(T y, T n, T lambda, const Policy& pol, T init_sum)
+         BOOST_MATH_GPU_ENABLED T non_central_chi_square_p(T y, T n, T lambda, const Policy& pol, T init_sum)
          {
             //
             // This is taken more or less directly from:
@@ -202,7 +203,7 @@ namespace boost
             // Special case:
             if(y == 0)
                return 0;
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
             T errorf(0), errorb(0);
 
@@ -270,25 +271,23 @@ namespace boost
                errorf = poiskf * gamkf;
                sum += errorf;
                ++i;
-            }while((fabs(errorf / sum) > errtol) && (static_cast<std::uintmax_t>(i) < max_iter));
+            }while((fabs(errorf / sum) > errtol) && (static_cast<boost::math::uintmax_t>(i) < max_iter));
 
             //Error check:
-            if(static_cast<std::uintmax_t>(i) >= max_iter)
-               return policies::raise_evaluation_error(
-                  "cdf(non_central_chi_squared_distribution<%1%>, %1%)",
-                  "Series did not converge, closest value was %1%", sum, pol);
+            if(static_cast<boost::math::uintmax_t>(i) >= max_iter)
+               return policies::raise_evaluation_error("cdf(non_central_chi_squared_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
 
             return sum;
          }
 
          template <class T, class Policy>
-         T non_central_chi_square_pdf(T x, T n, T lambda, const Policy& pol)
+         BOOST_MATH_GPU_ENABLED T non_central_chi_square_pdf(T x, T n, T lambda, const Policy& pol)
          {
             //
             // As above but for the PDF:
             //
             BOOST_MATH_STD_USING
-            std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
             T errtol = boost::math::policies::get_epsilon<T, Policy>();
             T x2 = x / 2;
             T n2 = n / 2;
@@ -304,10 +303,8 @@ namespace boost
                sum += pois;
                if(pois / sum < errtol)
                   break;
-               if(static_cast<std::uintmax_t>(i - k) >= max_iter)
-                  return policies::raise_evaluation_error(
-                     "pdf(non_central_chi_squared_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+               if(static_cast<boost::math::uintmax_t>(i - k) >= max_iter)
+                  return policies::raise_evaluation_error("pdf(non_central_chi_squared_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                pois *= l2 * x2 / ((i + 1) * (n2 + i));
             }
             for(long long i = k - 1; i >= 0; --i)
@@ -321,7 +318,7 @@ namespace boost
          }
 
          template <class RealType, class Policy>
-         inline RealType non_central_chi_squared_cdf(RealType x, RealType k, RealType l, bool invert, const Policy&)
+         BOOST_MATH_GPU_ENABLED inline RealType non_central_chi_squared_cdf(RealType x, RealType k, RealType l, bool invert, const Policy&)
          {
             typedef typename policies::evaluation<RealType, Policy>::type value_type;
             typedef typename policies::normalise<
@@ -381,10 +378,10 @@ namespace boost
          template <class T, class Policy>
          struct nccs_quantile_functor
          {
-            nccs_quantile_functor(const non_central_chi_squared_distribution<T,Policy>& d, T t, bool c)
+            BOOST_MATH_GPU_ENABLED nccs_quantile_functor(const non_central_chi_squared_distribution<T,Policy>& d, T t, bool c)
                : dist(d), target(t), comp(c) {}
 
-            T operator()(const T& x)
+            BOOST_MATH_GPU_ENABLED T operator()(const T& x)
             {
                return comp ?
                   target - cdf(complement(dist, x))
@@ -398,10 +395,10 @@ namespace boost
          };
 
          template <class RealType, class Policy>
-         RealType nccs_quantile(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& p, bool comp)
+         BOOST_MATH_GPU_ENABLED RealType nccs_quantile(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& p, bool comp)
          {
             BOOST_MATH_STD_USING
-            static const char* function = "quantile(non_central_chi_squared_distribution<%1%>, %1%)";
+            constexpr auto function = "quantile(non_central_chi_squared_distribution<%1%>, %1%)";
             typedef typename policies::evaluation<RealType, Policy>::type value_type;
             typedef typename policies::normalise<
                Policy,
@@ -489,10 +486,10 @@ namespace boost
          }
 
          template <class RealType, class Policy>
-         RealType nccs_pdf(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
+         BOOST_MATH_GPU_ENABLED RealType nccs_pdf(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
          {
             BOOST_MATH_STD_USING
-            static const char* function = "pdf(non_central_chi_squared_distribution<%1%>, %1%)";
+            constexpr auto function = "pdf(non_central_chi_squared_distribution<%1%>, %1%)";
             typedef typename policies::evaluation<RealType, Policy>::type value_type;
             typedef typename policies::normalise<
                Policy,
@@ -553,11 +550,11 @@ namespace boost
          template <class RealType, class Policy>
          struct degrees_of_freedom_finder
          {
-            degrees_of_freedom_finder(
+            BOOST_MATH_GPU_ENABLED degrees_of_freedom_finder(
                RealType lam_, RealType x_, RealType p_, bool c)
                : lam(lam_), x(x_), p(p_), comp(c) {}
 
-            RealType operator()(const RealType& v)
+            BOOST_MATH_GPU_ENABLED RealType operator()(const RealType& v)
             {
                non_central_chi_squared_distribution<RealType, Policy> d(v, lam);
                return comp ?
@@ -572,22 +569,21 @@ namespace boost
          };
 
          template <class RealType, class Policy>
-         inline RealType find_degrees_of_freedom(
+         BOOST_MATH_GPU_ENABLED inline RealType find_degrees_of_freedom(
             RealType lam, RealType x, RealType p, RealType q, const Policy& pol)
          {
-            const char* function = "non_central_chi_squared<%1%>::find_degrees_of_freedom";
+            constexpr auto function = "non_central_chi_squared<%1%>::find_degrees_of_freedom";
             if((p == 0) || (q == 0))
             {
                //
                // Can't a thing if one of p and q is zero:
                //
-               return policies::raise_evaluation_error<RealType>(function,
-                  "Can't find degrees of freedom when the probability is 0 or 1, only possible answer is %1%",
-                  RealType(std::numeric_limits<RealType>::quiet_NaN()), Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Can't find degrees of freedom when the probability is 0 or 1, only possible answer is %1%", // LCOV_EXCL_LINE
+                  RealType(boost::math::numeric_limits<RealType>::quiet_NaN()), Policy()); // LCOV_EXCL_LINE
             }
             degrees_of_freedom_finder<RealType, Policy> f(lam, x, p < q ? p : q, p < q ? false : true);
             tools::eps_tolerance<RealType> tol(policies::digits<RealType, Policy>());
-            std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
             //
             // Pick an initial guess that we know will give us a probability
             // right around 0.5.
@@ -595,13 +591,13 @@ namespace boost
             RealType guess = x - lam;
             if(guess < 1)
                guess = 1;
-            std::pair<RealType, RealType> ir = tools::bracket_and_solve_root(
+            boost::math::pair<RealType, RealType> ir = tools::bracket_and_solve_root(
                f, guess, RealType(2), false, tol, max_iter, pol);
             RealType result = ir.first + (ir.second - ir.first) / 2;
             if(max_iter >= policies::get_max_root_iterations<Policy>())
             {
-               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
-                  " or there is no answer to problem.  Current best guess is %1%", result, Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+                  " or there is no answer to problem.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
             }
             return result;
          }
@@ -609,11 +605,11 @@ namespace boost
          template <class RealType, class Policy>
          struct non_centrality_finder
          {
-            non_centrality_finder(
+            BOOST_MATH_GPU_ENABLED non_centrality_finder(
                RealType v_, RealType x_, RealType p_, bool c)
                : v(v_), x(x_), p(p_), comp(c) {}
 
-            RealType operator()(const RealType& lam)
+            BOOST_MATH_GPU_ENABLED RealType operator()(const RealType& lam)
             {
                non_central_chi_squared_distribution<RealType, Policy> d(v, lam);
                return comp ?
@@ -628,22 +624,21 @@ namespace boost
          };
 
          template <class RealType, class Policy>
-         inline RealType find_non_centrality(
+         BOOST_MATH_GPU_ENABLED inline RealType find_non_centrality(
             RealType v, RealType x, RealType p, RealType q, const Policy& pol)
          {
-            const char* function = "non_central_chi_squared<%1%>::find_non_centrality";
+            constexpr auto function = "non_central_chi_squared<%1%>::find_non_centrality";
             if((p == 0) || (q == 0))
             {
                //
                // Can't do a thing if one of p and q is zero:
                //
-               return policies::raise_evaluation_error<RealType>(function,
-                  "Can't find non centrality parameter when the probability is 0 or 1, only possible answer is %1%",
-                  RealType(std::numeric_limits<RealType>::quiet_NaN()), Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Can't find non centrality parameter when the probability is 0 or 1, only possible answer is %1%", // LCOV_EXCL_LINE
+                  RealType(boost::math::numeric_limits<RealType>::quiet_NaN()), Policy()); // LCOV_EXCL_LINE
             }
             non_centrality_finder<RealType, Policy> f(v, x, p < q ? p : q, p < q ? false : true);
             tools::eps_tolerance<RealType> tol(policies::digits<RealType, Policy>());
-            std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+            boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
             //
             // Pick an initial guess that we know will give us a probability
             // right around 0.5.
@@ -651,13 +646,13 @@ namespace boost
             RealType guess = x - v;
             if(guess < 1)
                guess = 1;
-            std::pair<RealType, RealType> ir = tools::bracket_and_solve_root(
+            boost::math::pair<RealType, RealType> ir = tools::bracket_and_solve_root(
                f, guess, RealType(2), false, tol, max_iter, pol);
             RealType result = ir.first + (ir.second - ir.first) / 2;
             if(max_iter >= policies::get_max_root_iterations<Policy>())
             {
-               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
-                  " or there is no answer to problem.  Current best guess is %1%", result, Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+                  " or there is no answer to problem.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
             }
             return result;
          }
@@ -671,9 +666,9 @@ namespace boost
          typedef RealType value_type;
          typedef Policy policy_type;
 
-         non_central_chi_squared_distribution(RealType df_, RealType lambda) : df(df_), ncp(lambda)
+         BOOST_MATH_GPU_ENABLED non_central_chi_squared_distribution(RealType df_, RealType lambda) : df(df_), ncp(lambda)
          {
-            const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::non_central_chi_squared_distribution(%1%,%1%)";
+            constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::non_central_chi_squared_distribution(%1%,%1%)";
             RealType r;
             detail::check_df(
                function,
@@ -685,17 +680,17 @@ namespace boost
                Policy());
          } // non_central_chi_squared_distribution constructor.
 
-         RealType degrees_of_freedom() const
+         BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom() const
          { // Private data getter function.
             return df;
          }
-         RealType non_centrality() const
+         BOOST_MATH_GPU_ENABLED RealType non_centrality() const
          { // Private data getter function.
             return ncp;
          }
-         static RealType find_degrees_of_freedom(RealType lam, RealType x, RealType p)
+         BOOST_MATH_GPU_ENABLED static RealType find_degrees_of_freedom(RealType lam, RealType x, RealType p)
          {
-            const char* function = "non_central_chi_squared<%1%>::find_degrees_of_freedom";
+            constexpr auto function = "non_central_chi_squared<%1%>::find_degrees_of_freedom";
             typedef typename policies::evaluation<RealType, Policy>::type eval_type;
             typedef typename policies::normalise<
                Policy,
@@ -714,9 +709,9 @@ namespace boost
                function);
          }
          template <class A, class B, class C>
-         static RealType find_degrees_of_freedom(const complemented3_type<A,B,C>& c)
+         BOOST_MATH_GPU_ENABLED static RealType find_degrees_of_freedom(const complemented3_type<A,B,C>& c)
          {
-            const char* function = "non_central_chi_squared<%1%>::find_degrees_of_freedom";
+            constexpr auto function = "non_central_chi_squared<%1%>::find_degrees_of_freedom";
             typedef typename policies::evaluation<RealType, Policy>::type eval_type;
             typedef typename policies::normalise<
                Policy,
@@ -734,9 +729,9 @@ namespace boost
                result,
                function);
          }
-         static RealType find_non_centrality(RealType v, RealType x, RealType p)
+         BOOST_MATH_GPU_ENABLED static RealType find_non_centrality(RealType v, RealType x, RealType p)
          {
-            const char* function = "non_central_chi_squared<%1%>::find_non_centrality";
+            constexpr auto function = "non_central_chi_squared<%1%>::find_non_centrality";
             typedef typename policies::evaluation<RealType, Policy>::type eval_type;
             typedef typename policies::normalise<
                Policy,
@@ -755,9 +750,9 @@ namespace boost
                function);
          }
          template <class A, class B, class C>
-         static RealType find_non_centrality(const complemented3_type<A,B,C>& c)
+         BOOST_MATH_GPU_ENABLED static RealType find_non_centrality(const complemented3_type<A,B,C>& c)
          {
-            const char* function = "non_central_chi_squared<%1%>::find_non_centrality";
+            constexpr auto function = "non_central_chi_squared<%1%>::find_non_centrality";
             typedef typename policies::evaluation<RealType, Policy>::type eval_type;
             typedef typename policies::normalise<
                Policy,
@@ -791,24 +786,24 @@ namespace boost
       // Non-member functions to give properties of the distribution.
 
       template <class RealType, class Policy>
-      inline const std::pair<RealType, RealType> range(const non_central_chi_squared_distribution<RealType, Policy>& /* dist */)
+      BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const non_central_chi_squared_distribution<RealType, Policy>& /* dist */)
       { // Range of permissible values for random variable k.
          using boost::math::tools::max_value;
-         return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // Max integer?
+         return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // Max integer?
       }
 
       template <class RealType, class Policy>
-      inline const std::pair<RealType, RealType> support(const non_central_chi_squared_distribution<RealType, Policy>& /* dist */)
+      BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const non_central_chi_squared_distribution<RealType, Policy>& /* dist */)
       { // Range of supported values for random variable k.
          // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
          using boost::math::tools::max_value;
-         return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
+         return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
       }
 
       template <class RealType, class Policy>
-      inline RealType mean(const non_central_chi_squared_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType mean(const non_central_chi_squared_distribution<RealType, Policy>& dist)
       { // Mean of poisson distribution = lambda.
-         const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::mean()";
+         constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::mean()";
          RealType k = dist.degrees_of_freedom();
          RealType l = dist.non_centrality();
          RealType r;
@@ -826,9 +821,9 @@ namespace boost
       } // mean
 
       template <class RealType, class Policy>
-      inline RealType mode(const non_central_chi_squared_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType mode(const non_central_chi_squared_distribution<RealType, Policy>& dist)
       { // mode.
-         static const char* function = "mode(non_central_chi_squared_distribution<%1%> const&)";
+         constexpr auto function = "mode(non_central_chi_squared_distribution<%1%> const&)";
 
          RealType k = dist.degrees_of_freedom();
          RealType l = dist.non_centrality();
@@ -849,9 +844,9 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType variance(const non_central_chi_squared_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType variance(const non_central_chi_squared_distribution<RealType, Policy>& dist)
       { // variance.
-         const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::variance()";
+         constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::variance()";
          RealType k = dist.degrees_of_freedom();
          RealType l = dist.non_centrality();
          RealType r;
@@ -872,9 +867,9 @@ namespace boost
       // standard_deviation provided by derived accessors.
 
       template <class RealType, class Policy>
-      inline RealType skewness(const non_central_chi_squared_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType skewness(const non_central_chi_squared_distribution<RealType, Policy>& dist)
       { // skewness = sqrt(l).
-         const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::skewness()";
+         constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::skewness()";
          RealType k = dist.degrees_of_freedom();
          RealType l = dist.non_centrality();
          RealType r;
@@ -893,9 +888,9 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType kurtosis_excess(const non_central_chi_squared_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const non_central_chi_squared_distribution<RealType, Policy>& dist)
       {
-         const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::kurtosis_excess()";
+         constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::kurtosis_excess()";
          RealType k = dist.degrees_of_freedom();
          RealType l = dist.non_centrality();
          RealType r;
@@ -913,21 +908,21 @@ namespace boost
       } // kurtosis_excess
 
       template <class RealType, class Policy>
-      inline RealType kurtosis(const non_central_chi_squared_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const non_central_chi_squared_distribution<RealType, Policy>& dist)
       {
          return kurtosis_excess(dist) + 3;
       }
 
       template <class RealType, class Policy>
-      inline RealType pdf(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
+      BOOST_MATH_GPU_ENABLED inline RealType pdf(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
       { // Probability Density/Mass Function.
          return detail::nccs_pdf(dist, x);
       } // pdf
 
       template <class RealType, class Policy>
-      RealType cdf(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
+      BOOST_MATH_GPU_ENABLED RealType cdf(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& x)
       {
-         const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::cdf(%1%)";
+         constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::cdf(%1%)";
          RealType k = dist.degrees_of_freedom();
          RealType l = dist.non_centrality();
          RealType r;
@@ -952,9 +947,9 @@ namespace boost
       } // cdf
 
       template <class RealType, class Policy>
-      RealType cdf(const complemented2_type<non_central_chi_squared_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED RealType cdf(const complemented2_type<non_central_chi_squared_distribution<RealType, Policy>, RealType>& c)
       { // Complemented Cumulative Distribution Function
-         const char* function = "boost::math::non_central_chi_squared_distribution<%1%>::cdf(%1%)";
+         constexpr auto function = "boost::math::non_central_chi_squared_distribution<%1%>::cdf(%1%)";
          non_central_chi_squared_distribution<RealType, Policy> const& dist = c.dist;
          RealType x = c.param;
          RealType k = dist.degrees_of_freedom();
@@ -981,13 +976,13 @@ namespace boost
       } // ccdf
 
       template <class RealType, class Policy>
-      inline RealType quantile(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& p)
+      BOOST_MATH_GPU_ENABLED inline RealType quantile(const non_central_chi_squared_distribution<RealType, Policy>& dist, const RealType& p)
       { // Quantile (or Percent Point) function.
          return detail::nccs_quantile(dist, p, false);
       } // quantile
 
       template <class RealType, class Policy>
-      inline RealType quantile(const complemented2_type<non_central_chi_squared_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<non_central_chi_squared_distribution<RealType, Policy>, RealType>& c)
       { // Quantile (or Percent Point) function.
          return detail::nccs_quantile(c.dist, c.param, true);
       } // quantile complement.
diff --git a/inst/include/boost/math/distributions/non_central_f.hpp b/inst/include/boost/math/distributions/non_central_f.hpp
index e93d03e59..dedd43714 100644
--- a/inst/include/boost/math/distributions/non_central_f.hpp
+++ b/inst/include/boost/math/distributions/non_central_f.hpp
@@ -1,7 +1,7 @@
 // boost\math\distributions\non_central_f.hpp
 
 // Copyright John Maddock 2008.
-
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -10,9 +10,13 @@
 #ifndef BOOST_MATH_SPECIAL_NON_CENTRAL_F_HPP
 #define BOOST_MATH_SPECIAL_NON_CENTRAL_F_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/promotion.hpp>
 #include <boost/math/distributions/non_central_beta.hpp>
 #include <boost/math/distributions/detail/generic_mode.hpp>
 #include <boost/math/special_functions/pow.hpp>
+#include <boost/math/policies/policy.hpp>
 
 namespace boost
 {
@@ -25,9 +29,9 @@ namespace boost
          typedef RealType value_type;
          typedef Policy policy_type;
 
-         non_central_f_distribution(RealType v1_, RealType v2_, RealType lambda) : v1(v1_), v2(v2_), ncp(lambda)
+         BOOST_MATH_GPU_ENABLED non_central_f_distribution(RealType v1_, RealType v2_, RealType lambda) : v1(v1_), v2(v2_), ncp(lambda)
          {
-            const char* function = "boost::math::non_central_f_distribution<%1%>::non_central_f_distribution(%1%,%1%)";
+            constexpr auto function = "boost::math::non_central_f_distribution<%1%>::non_central_f_distribution(%1%,%1%)";
             RealType r;
             detail::check_df(
                function,
@@ -42,15 +46,15 @@ namespace boost
                Policy());
          } // non_central_f_distribution constructor.
 
-         RealType degrees_of_freedom1()const
+         BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom1()const
          {
             return v1;
          }
-         RealType degrees_of_freedom2()const
+         BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom2()const
          {
             return v2;
          }
-         RealType non_centrality() const
+         BOOST_MATH_GPU_ENABLED RealType non_centrality() const
          { // Private data getter function.
             return ncp;
          }
@@ -71,24 +75,24 @@ namespace boost
       // Non-member functions to give properties of the distribution.
 
       template <class RealType, class Policy>
-      inline const std::pair<RealType, RealType> range(const non_central_f_distribution<RealType, Policy>& /* dist */)
+      BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const non_central_f_distribution<RealType, Policy>& /* dist */)
       { // Range of permissible values for random variable k.
          using boost::math::tools::max_value;
-         return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+         return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
       }
 
       template <class RealType, class Policy>
-      inline const std::pair<RealType, RealType> support(const non_central_f_distribution<RealType, Policy>& /* dist */)
+      BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const non_central_f_distribution<RealType, Policy>& /* dist */)
       { // Range of supported values for random variable k.
          // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
          using boost::math::tools::max_value;
-         return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+         return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
       }
 
       template <class RealType, class Policy>
-      inline RealType mean(const non_central_f_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType mean(const non_central_f_distribution<RealType, Policy>& dist)
       {
-         const char* function = "mean(non_central_f_distribution<%1%> const&)";
+         constexpr auto function = "mean(non_central_f_distribution<%1%> const&)";
          RealType v1 = dist.degrees_of_freedom1();
          RealType v2 = dist.degrees_of_freedom2();
          RealType l = dist.non_centrality();
@@ -116,9 +120,9 @@ namespace boost
       } // mean
 
       template <class RealType, class Policy>
-      inline RealType mode(const non_central_f_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType mode(const non_central_f_distribution<RealType, Policy>& dist)
       { // mode.
-         static const char* function = "mode(non_central_chi_squared_distribution<%1%> const&)";
+         constexpr auto function = "mode(non_central_chi_squared_distribution<%1%> const&)";
 
          RealType n = dist.degrees_of_freedom1();
          RealType m = dist.degrees_of_freedom2();
@@ -146,9 +150,9 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType variance(const non_central_f_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType variance(const non_central_f_distribution<RealType, Policy>& dist)
       { // variance.
-         const char* function = "variance(non_central_f_distribution<%1%> const&)";
+         constexpr auto function = "variance(non_central_f_distribution<%1%> const&)";
          RealType n = dist.degrees_of_freedom1();
          RealType m = dist.degrees_of_freedom2();
          RealType l = dist.non_centrality();
@@ -182,9 +186,9 @@ namespace boost
       // standard_deviation provided by derived accessors.
 
       template <class RealType, class Policy>
-      inline RealType skewness(const non_central_f_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType skewness(const non_central_f_distribution<RealType, Policy>& dist)
       { // skewness = sqrt(l).
-         const char* function = "skewness(non_central_f_distribution<%1%> const&)";
+         constexpr auto function = "skewness(non_central_f_distribution<%1%> const&)";
          BOOST_MATH_STD_USING
          RealType n = dist.degrees_of_freedom1();
          RealType m = dist.degrees_of_freedom2();
@@ -219,9 +223,9 @@ namespace boost
       }
 
       template <class RealType, class Policy>
-      inline RealType kurtosis_excess(const non_central_f_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const non_central_f_distribution<RealType, Policy>& dist)
       {
-         const char* function = "kurtosis_excess(non_central_f_distribution<%1%> const&)";
+         constexpr auto function = "kurtosis_excess(non_central_f_distribution<%1%> const&)";
          BOOST_MATH_STD_USING
          RealType n = dist.degrees_of_freedom1();
          RealType m = dist.degrees_of_freedom2();
@@ -266,13 +270,13 @@ namespace boost
       } // kurtosis_excess
 
       template <class RealType, class Policy>
-      inline RealType kurtosis(const non_central_f_distribution<RealType, Policy>& dist)
+      BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const non_central_f_distribution<RealType, Policy>& dist)
       {
          return kurtosis_excess(dist) + 3;
       }
 
       template <class RealType, class Policy>
-      inline RealType pdf(const non_central_f_distribution<RealType, Policy>& dist, const RealType& x)
+      BOOST_MATH_GPU_ENABLED inline RealType pdf(const non_central_f_distribution<RealType, Policy>& dist, const RealType& x)
       { // Probability Density/Mass Function.
          typedef typename policies::evaluation<RealType, Policy>::type value_type;
          typedef typename policies::normalise<
@@ -292,9 +296,9 @@ namespace boost
       } // pdf
 
       template <class RealType, class Policy>
-      RealType cdf(const non_central_f_distribution<RealType, Policy>& dist, const RealType& x)
+      BOOST_MATH_GPU_ENABLED RealType cdf(const non_central_f_distribution<RealType, Policy>& dist, const RealType& x)
       {
-         const char* function = "cdf(const non_central_f_distribution<%1%>&, %1%)";
+         constexpr auto function = "cdf(const non_central_f_distribution<%1%>&, %1%)";
          RealType r;
          if(!detail::check_df(
             function,
@@ -333,9 +337,9 @@ namespace boost
       } // cdf
 
       template <class RealType, class Policy>
-      RealType cdf(const complemented2_type<non_central_f_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED RealType cdf(const complemented2_type<non_central_f_distribution<RealType, Policy>, RealType>& c)
       { // Complemented Cumulative Distribution Function
-         const char* function = "cdf(complement(const non_central_f_distribution<%1%>&, %1%))";
+         constexpr auto function = "cdf(complement(const non_central_f_distribution<%1%>&, %1%))";
          RealType r;
          if(!detail::check_df(
             function,
@@ -374,7 +378,7 @@ namespace boost
       } // ccdf
 
       template <class RealType, class Policy>
-      inline RealType quantile(const non_central_f_distribution<RealType, Policy>& dist, const RealType& p)
+      BOOST_MATH_GPU_ENABLED inline RealType quantile(const non_central_f_distribution<RealType, Policy>& dist, const RealType& p)
       { // Quantile (or Percent Point) function.
          RealType alpha = dist.degrees_of_freedom1() / 2;
          RealType beta = dist.degrees_of_freedom2() / 2;
@@ -388,7 +392,7 @@ namespace boost
       } // quantile
 
       template <class RealType, class Policy>
-      inline RealType quantile(const complemented2_type<non_central_f_distribution<RealType, Policy>, RealType>& c)
+      BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<non_central_f_distribution<RealType, Policy>, RealType>& c)
       { // Quantile (or Percent Point) function.
          RealType alpha = c.dist.degrees_of_freedom1() / 2;
          RealType beta = c.dist.degrees_of_freedom2() / 2;
diff --git a/inst/include/boost/math/distributions/non_central_t.hpp b/inst/include/boost/math/distributions/non_central_t.hpp
index 48483f0ca..a6c988d75 100644
--- a/inst/include/boost/math/distributions/non_central_t.hpp
+++ b/inst/include/boost/math/distributions/non_central_t.hpp
@@ -16,6 +16,8 @@
 #include <boost/math/distributions/students_t.hpp>
 #include <boost/math/distributions/detail/generic_quantile.hpp> // quantile
 #include <boost/math/special_functions/trunc.hpp>
+#include <boost/math/special_functions/detail/hypergeometric_series.hpp>
+#include <boost/math/quadrature/exp_sinh.hpp>
 
 namespace boost
 {
@@ -58,6 +60,20 @@ namespace boost
             beta = x < y
                ? detail::ibeta_imp(T(k + 1), T(v / 2), x, pol, false, true, &xterm)
                : detail::ibeta_imp(T(v / 2), T(k + 1), y, pol, true, true, &xterm);
+
+            while (fabs(beta * pois) < tools::min_value<T>())
+            {
+               if ((k == 0) || (pois == 0))
+                  return init_val;
+               k /= 2;
+               pois = gamma_p_derivative(T(k + 1), d2, pol)
+                  * tgamma_delta_ratio(T(k + 1), T(0.5f))
+                  * delta / constants::root_two<T>();
+               beta = x < y
+                  ? detail::ibeta_imp(T(k + 1), T(v / 2), x, pol, false, true, &xterm)
+                  : detail::ibeta_imp(T(v / 2), T(k + 1), y, pol, true, true, &xterm);
+            }
+
             xterm *= y / (v / 2 + k);
             T poisf(pois), betaf(beta), xtermf(xterm);
             T sum = init_val;
@@ -97,9 +113,7 @@ namespace boost
                ++count;
                if(count > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "cdf(non_central_t_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("cdf(non_central_t_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
             }
             return sum;
@@ -195,9 +209,7 @@ namespace boost
                last_term = term;
                if(count > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "cdf(non_central_t_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("cdf(non_central_t_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
                ++count;
             }
@@ -266,7 +278,13 @@ namespace boost
                }
                else
                   result = 0;
-               result += cdf(boost::math::normal_distribution<T, Policy>(), -delta);
+               if (invert)
+               {
+                  result = cdf(complement(boost::math::normal_distribution<T, Policy>(), -delta)) - result;
+                  invert = false;
+               }
+               else
+                  result += cdf(boost::math::normal_distribution<T, Policy>(), -delta);
             }
             else
             {
@@ -374,6 +392,60 @@ namespace boost
                function);
          }
 
+         template <class T, class Policy>
+         T non_central_t_pdf_integral(T x, T v, T mu, const Policy& pol)
+         {
+            BOOST_MATH_STD_USING
+            boost::math::quadrature::exp_sinh<T, Policy> integrator;
+            T integral = pow(v, v / 2) * exp(-v * mu * mu / (2 * (x * x + v)));
+            if (integral != 0)
+            {
+               integral *= integrator.integrate([&x, v, mu](T y) 
+                  {
+                     T p;
+                     if (v * log(y) < tools::log_max_value<T>())
+                        p = pow(y, v) * exp(boost::math::pow<2>((y - mu * x / sqrt(x * x + v))) / -2);
+                     else
+                        p = exp(log(y) * v + boost::math::pow<2>((y - mu * x / sqrt(x * x + v))) / -2);
+                     return p; 
+                  });
+            }
+            integral /= boost::math::constants::root_pi<T>() * boost::math::tgamma(v / 2, pol) * pow(T(2), (v - 1) / 2) * pow(x * x + v, (v + 1) / 2);
+            return integral;
+         }
+
+         template <class T, class Policy>
+         T non_central_t_pdf_hypergeometric(T x, T v, T mu, const Policy& pol)
+         {
+            BOOST_MATH_STD_USING
+            long long scale = 0;
+            const char* function = "non central T PDF";
+            //
+            // We only call this routine when we know that the series form of 1F1 is cheap to evaluate,
+            // so no need to call the whole 1F1 function, just the series will do:
+            //
+            T Av = hypergeometric_1F1_generic_series(static_cast<T>((v + 1) / 2), boost::math::constants::half<T>(), static_cast<T>(mu * mu * x * x / (2 * (x * x + v))), pol, scale, function);
+            Av = ldexp(Av, static_cast<int>(scale));
+            scale = 0;
+            T Bv = hypergeometric_1F1_generic_series(static_cast<T>(v / 2 + T(1)), static_cast<T>(T(3) / 2), static_cast<T>(mu * mu * x * x / (2 * (x * x + v))), pol, scale, function);
+            Bv = ldexp(Bv, static_cast<int>(scale));
+            Bv *= boost::math::tgamma_delta_ratio(v / 2 + T(1), -constants::half<T>(), pol);
+            Bv *= boost::math::constants::root_two<T>() * mu * x / sqrt(x * x + v);
+
+            T tolerance = tools::root_epsilon<T>() * Av * 4;
+            Av += Bv;
+
+            if (Av < tolerance)
+            {
+               // More than half the digits have cancelled, fall back to the integral method:
+               return non_central_t_pdf_integral(x, v, mu, pol);
+            }
+
+            Av *= exp(-mu * mu / 2) * pow(1 + x * x / v, -(v + 1) / 2) * boost::math::tgamma_delta_ratio(v / 2 + constants::half<T>(), -constants::half<T>(), pol);
+            Av /= sqrt(v) * boost::math::constants::root_pi<T>();
+            return Av;
+         }
+
          template <class T, class Policy>
          T non_central_t2_pdf(T n, T delta, T x, T y, const Policy& pol, T init_val)
          {
@@ -402,10 +474,25 @@ namespace boost
                ? ibeta_derivative(T(k + 1), n / 2, x, pol)
                : ibeta_derivative(n / 2, T(k + 1), y, pol);
             BOOST_MATH_INSTRUMENT_VARIABLE(xterm);
+
+            while (fabs(xterm * pois) < tools::min_value<T>())
+            {
+               if (k == 0)
+                  return init_val;
+               k /= 2;
+               pois = gamma_p_derivative(T(k + 1), d2, pol)
+                  * tgamma_delta_ratio(T(k + 1), T(0.5f))
+                  * delta / constants::root_two<T>();
+               BOOST_MATH_INSTRUMENT_VARIABLE(pois);
+               // Starting beta term:
+               xterm = x < y
+                  ? ibeta_derivative(T(k + 1), n / 2, x, pol)
+                  : ibeta_derivative(n / 2, T(k + 1), y, pol);
+               BOOST_MATH_INSTRUMENT_VARIABLE(xterm);
+            }
+
             T poisf(pois), xtermf(xterm);
             T sum = init_val;
-            if((pois == 0) || (xterm == 0))
-               return init_val;
 
             //
             // Backwards recursion first, this is the stable
@@ -427,26 +514,25 @@ namespace boost
                ++count;
                if(count > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "pdf(non_central_t_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("pdf(non_central_t_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
             }
             BOOST_MATH_INSTRUMENT_VARIABLE(sum);
+            old_ratio = 0;
             for(auto i = k + 1; ; ++i)
             {
                poisf *= d2 / (i + 0.5f);
                xtermf *= (x * (n / 2 + i)) / (i);
                T term = poisf * xtermf;
                sum += term;
-               if((fabs(term/sum) < errtol) || (term == 0))
+               T ratio = fabs(term / sum);
+               if(((ratio < errtol) && (ratio < old_ratio)) || (term == 0))
                   break;
                ++count;
+               old_ratio = ratio;
                if(count > max_iter)
                {
-                  return policies::raise_evaluation_error(
-                     "pdf(non_central_t_distribution<%1%>, %1%)",
-                     "Series did not converge, closest value was %1%", sum, pol);
+                  return policies::raise_evaluation_error("pdf(non_central_t_distribution<%1%>, %1%)", "Series did not converge, closest value was %1%", sum, pol); // LCOV_EXCL_LINE
                }
             }
             BOOST_MATH_INSTRUMENT_VARIABLE(sum);
@@ -462,14 +548,7 @@ namespace boost
                normal_distribution<T, Policy> norm(delta, 1);
                return pdf(norm, t);
             }
-            //
-            // Otherwise, for t < 0 we have to use the reflection formula:
-            if(t < 0)
-            {
-               t = -t;
-               delta = -delta;
-            }
-            if(t == 0)
+            if(t * t < tools::epsilon<T>())
             {
                //
                // Handle this as a special case, using the formula
@@ -500,13 +579,30 @@ namespace boost
                return pdf(students_t_distribution<T, Policy>(n), t - delta);
             }
             //
+            // Figure out if the hypergeometric formula will be efficient or not, 
+            // based on where the summit of the series.
+            //
+            T a = (n + 1) / 2;
+            T x = delta * delta * t * t / (2 * (t * t + n));
+            T summit = (sqrt(x * (4 * a + x)) + x) / 2;
+            if (summit < 40)
+               return non_central_t_pdf_hypergeometric(t, n, delta, pol);
+            // 
+            // Otherwise, for t < 0 we have to use the reflection formula:
+            //
+            if (t < 0)
+            {
+               t = -t;
+               delta = -delta;
+            }
+            //
             // x and y are the corresponding random
             // variables for the noncentral beta distribution,
             // with y = 1 - x:
             //
-            T x = t * t / (n + t * t);
+            x = t * t / (n + t * t);
             T y = n / (n + t * t);
-            T a = 0.5f;
+            a = 0.5f;
             T b = n / 2;
             T d2 = delta * delta;
             //
@@ -516,12 +612,22 @@ namespace boost
             BOOST_MATH_INSTRUMENT_VARIABLE(dt);
             T result = non_central_beta_pdf(a, b, d2, x, y, pol);
             BOOST_MATH_INSTRUMENT_VARIABLE(result);
-            T tol = tools::epsilon<T>() * result * 500;
+            T tol = tools::root_epsilon<T>() * result;
             result = non_central_t2_pdf(n, delta, x, y, pol, result);
             BOOST_MATH_INSTRUMENT_VARIABLE(result);
-            if(result <= tol)
-               result = 0;
             result *= dt;
+            if (result <= tol)
+            {
+               // More than half the digits in the result have cancelled, 
+               // Try direct integration... super slow but reliable as far as we can tell...
+               if (delta < 0)
+               {
+                  // reflect back:
+                  delta = -delta;
+                  t = -t;
+               }
+               result = non_central_t_pdf_integral(t, n, delta, pol);
+            }
             return result;
          }
 
@@ -645,9 +751,8 @@ namespace boost
                //
                // Can't a thing if one of p and q is zero:
                //
-               return policies::raise_evaluation_error<RealType>(function,
-                  "Can't find degrees of freedom when the probability is 0 or 1, only possible answer is %1%",
-                  RealType(std::numeric_limits<RealType>::quiet_NaN()), Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Can't find degrees of freedom when the probability is 0 or 1, only possible answer is %1%", // LCOV_EXCL_LINE
+                  RealType(std::numeric_limits<RealType>::quiet_NaN()), Policy()); // LCOV_EXCL_LINE
             }
             t_degrees_of_freedom_finder<RealType, Policy> f(delta, x, p < q ? p : q, p < q ? false : true);
             tools::eps_tolerance<RealType> tol(policies::digits<RealType, Policy>());
@@ -661,8 +766,8 @@ namespace boost
             RealType result = ir.first + (ir.second - ir.first) / 2;
             if(max_iter >= policies::get_max_root_iterations<Policy>())
             {
-               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
-                  " or there is no answer to problem.  Current best guess is %1%", result, Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+                  " or there is no answer to problem.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
             }
             return result;
          }
@@ -698,9 +803,8 @@ namespace boost
                //
                // Can't do a thing if one of p and q is zero:
                //
-               return policies::raise_evaluation_error<RealType>(function,
-                  "Can't find non-centrality parameter when the probability is 0 or 1, only possible answer is %1%",
-                  RealType(std::numeric_limits<RealType>::quiet_NaN()), Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Can't find non-centrality parameter when the probability is 0 or 1, only possible answer is %1%", // LCOV_EXCL_LINE
+                  RealType(std::numeric_limits<RealType>::quiet_NaN()), Policy()); // LCOV_EXCL_LINE
             }
             t_non_centrality_finder<RealType, Policy> f(v, x, p < q ? p : q, p < q ? false : true);
             tools::eps_tolerance<RealType> tol(policies::digits<RealType, Policy>());
@@ -719,8 +823,8 @@ namespace boost
             RealType result = ir.first + (ir.second - ir.first) / 2;
             if(max_iter >= policies::get_max_root_iterations<Policy>())
             {
-               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
-                  " or there is no answer to problem.  Current best guess is %1%", result, Policy());
+               return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+                  " or there is no answer to problem.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
             }
             return result;
          }
diff --git a/inst/include/boost/math/distributions/normal.hpp b/inst/include/boost/math/distributions/normal.hpp
index 70259e62b..9d973fb53 100644
--- a/inst/include/boost/math/distributions/normal.hpp
+++ b/inst/include/boost/math/distributions/normal.hpp
@@ -1,6 +1,6 @@
 //  Copyright John Maddock 2006, 2007.
 //  Copyright Paul A. Bristow 2006, 2007.
-
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -15,13 +15,15 @@
 // From MathWorld--A Wolfram Web Resource.
 // http://mathworld.wolfram.com/NormalDistribution.html
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/erf.hpp> // for erf/erfc.
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
-
-#include <utility>
-#include <type_traits>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/policies/policy.hpp>
 
 namespace boost{ namespace math{
 
@@ -32,32 +34,32 @@ class normal_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit normal_distribution(RealType l_mean = 0, RealType sd = 1)
+   BOOST_MATH_GPU_ENABLED explicit normal_distribution(RealType l_mean = 0, RealType sd = 1)
       : m_mean(l_mean), m_sd(sd)
    { // Default is a 'standard' normal distribution N01.
-     static const char* function = "boost::math::normal_distribution<%1%>::normal_distribution";
+     constexpr auto function = "boost::math::normal_distribution<%1%>::normal_distribution";
 
      RealType result;
      detail::check_scale(function, sd, &result, Policy());
      detail::check_location(function, l_mean, &result, Policy());
    }
 
-   RealType mean()const
+   BOOST_MATH_GPU_ENABLED RealType mean()const
    { // alias for location.
       return m_mean;
    }
 
-   RealType standard_deviation()const
+   BOOST_MATH_GPU_ENABLED RealType standard_deviation()const
    { // alias for scale.
       return m_sd;
    }
 
    // Synonyms, provided to allow generic use of find_location and find_scale.
-   RealType location()const
+   BOOST_MATH_GPU_ENABLED RealType location()const
    { // location.
       return m_mean;
    }
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    { // scale.
       return m_sd;
    }
@@ -92,30 +94,30 @@ normal_distribution(RealType)->normal_distribution<typename boost::math::tools::
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const normal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const normal_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { 
-     return std::pair<RealType, RealType>(-std::numeric_limits<RealType>::infinity(), std::numeric_limits<RealType>::infinity()); // - to + infinity.
+     return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
   }
   else
   { // Can only use max_value.
     using boost::math::tools::max_value;
-    return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max value.
+    return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max value.
   }
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const normal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const normal_distribution<RealType, Policy>& /*dist*/)
 { // This is range values for random variable x where cdf rises from 0 to 1, and outside it, the pdf is zero.
-  if (std::numeric_limits<RealType>::has_infinity)
+  BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
   { 
-     return std::pair<RealType, RealType>(-std::numeric_limits<RealType>::infinity(), std::numeric_limits<RealType>::infinity()); // - to + infinity.
+     return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
   }
   else
   { // Can only use max_value.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(-max_value<RealType>(),  max_value<RealType>()); // - to + max value.
+   return boost::math::pair<RealType, RealType>(-max_value<RealType>(),  max_value<RealType>()); // - to + max value.
   }
 }
 
@@ -124,14 +126,14 @@ inline std::pair<RealType, RealType> support(const normal_distribution<RealType,
 #endif
 
 template <class RealType, class Policy>
-inline RealType pdf(const normal_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const normal_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType sd = dist.standard_deviation();
    RealType mean = dist.mean();
 
-   static const char* function = "boost::math::pdf(const normal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const normal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(false == detail::check_scale(function, sd, &result, Policy()))
@@ -162,16 +164,16 @@ inline RealType pdf(const normal_distribution<RealType, Policy>& dist, const Rea
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const normal_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const normal_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    const RealType sd = dist.standard_deviation();
    const RealType mean = dist.mean();
 
-   static const char* function = "boost::math::logpdf(const normal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logpdf(const normal_distribution<%1%>&, %1%)";
 
-   RealType result = -std::numeric_limits<RealType>::infinity();
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
    if(false == detail::check_scale(function, sd, &result, Policy()))
    {
       return result;
@@ -198,13 +200,13 @@ inline RealType logpdf(const normal_distribution<RealType, Policy>& dist, const
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const normal_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const normal_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType sd = dist.standard_deviation();
    RealType mean = dist.mean();
-   static const char* function = "boost::math::cdf(const normal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const normal_distribution<%1%>&, %1%)";
    RealType result = 0;
    if(false == detail::check_scale(function, sd, &result, Policy()))
    {
@@ -229,13 +231,13 @@ inline RealType cdf(const normal_distribution<RealType, Policy>& dist, const Rea
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const normal_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const normal_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType sd = dist.standard_deviation();
    RealType mean = dist.mean();
-   static const char* function = "boost::math::quantile(const normal_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const normal_distribution<%1%>&, %1%)";
 
    RealType result = 0;
    if(false == detail::check_scale(function, sd, &result, Policy()))
@@ -253,14 +255,14 @@ inline RealType quantile(const normal_distribution<RealType, Policy>& dist, cons
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<normal_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<normal_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType sd = c.dist.standard_deviation();
    RealType mean = c.dist.mean();
    RealType x = c.param;
-   static const char* function = "boost::math::cdf(const complement(normal_distribution<%1%>&), %1%)";
+   constexpr auto function = "boost::math::cdf(const complement(normal_distribution<%1%>&), %1%)";
 
    RealType result = 0;
    if(false == detail::check_scale(function, sd, &result, Policy()))
@@ -281,13 +283,13 @@ inline RealType cdf(const complemented2_type<normal_distribution<RealType, Polic
 } // cdf complement
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<normal_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<normal_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
    RealType sd = c.dist.standard_deviation();
    RealType mean = c.dist.mean();
-   static const char* function = "boost::math::quantile(const complement(normal_distribution<%1%>&), %1%)";
+   constexpr auto function = "boost::math::quantile(const complement(normal_distribution<%1%>&), %1%)";
    RealType result = 0;
    if(false == detail::check_scale(function, sd, &result, Policy()))
       return result;
@@ -303,51 +305,51 @@ inline RealType quantile(const complemented2_type<normal_distribution<RealType,
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType mean(const normal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const normal_distribution<RealType, Policy>& dist)
 {
    return dist.mean();
 }
 
 template <class RealType, class Policy>
-inline RealType standard_deviation(const normal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType standard_deviation(const normal_distribution<RealType, Policy>& dist)
 {
    return dist.standard_deviation();
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const normal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const normal_distribution<RealType, Policy>& dist)
 {
    return dist.mean();
 }
 
 template <class RealType, class Policy>
-inline RealType median(const normal_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const normal_distribution<RealType, Policy>& dist)
 {
    return dist.mean();
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const normal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const normal_distribution<RealType, Policy>& /*dist*/)
 {
    return 0;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const normal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const normal_distribution<RealType, Policy>& /*dist*/)
 {
    return 3;
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const normal_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const normal_distribution<RealType, Policy>& /*dist*/)
 {
    return 0;
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const normal_distribution<RealType, Policy> & dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const normal_distribution<RealType, Policy> & dist)
 {
-   using std::log;
+   BOOST_MATH_STD_USING
    RealType arg = constants::two_pi<RealType>()*constants::e<RealType>()*dist.standard_deviation()*dist.standard_deviation();
    return log(arg)/2;
 }
diff --git a/inst/include/boost/math/distributions/pareto.hpp b/inst/include/boost/math/distributions/pareto.hpp
index 778310d10..97cf8024a 100644
--- a/inst/include/boost/math/distributions/pareto.hpp
+++ b/inst/include/boost/math/distributions/pareto.hpp
@@ -17,16 +17,15 @@
 // Handbook of Statistical Distributions with Applications, K Krishnamoorthy, ISBN 1-58488-635-8, Chapter 23, pp 257 - 267.
 // Caution KK's a and b are the reverse of Mathworld!
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/special_functions/powm1.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 
-#include <utility> // for BOOST_CURRENT_VALUE?
-#include <limits>
-#include <cmath>
-
 namespace boost
 {
   namespace math
@@ -34,7 +33,7 @@ namespace boost
     namespace detail
     { // Parameter checking.
       template <class RealType, class Policy>
-      inline bool check_pareto_scale(
+      BOOST_MATH_GPU_ENABLED inline bool check_pareto_scale(
         const char* function,
         RealType scale,
         RealType* result, const Policy& pol)
@@ -63,7 +62,7 @@ namespace boost
       } // bool check_pareto_scale
 
       template <class RealType, class Policy>
-      inline bool check_pareto_shape(
+      BOOST_MATH_GPU_ENABLED inline bool check_pareto_shape(
         const char* function,
         RealType shape,
         RealType* result, const Policy& pol)
@@ -92,7 +91,7 @@ namespace boost
       } // bool check_pareto_shape(
 
       template <class RealType, class Policy>
-      inline bool check_pareto_x(
+      BOOST_MATH_GPU_ENABLED inline bool check_pareto_x(
         const char* function,
         RealType const& x,
         RealType* result, const Policy& pol)
@@ -121,7 +120,7 @@ namespace boost
       } // bool check_pareto_x
 
       template <class RealType, class Policy>
-      inline bool check_pareto( // distribution parameters.
+      BOOST_MATH_GPU_ENABLED inline bool check_pareto( // distribution parameters.
         const char* function,
         RealType scale,
         RealType shape,
@@ -140,19 +139,19 @@ namespace boost
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      pareto_distribution(RealType l_scale = 1, RealType l_shape = 1)
+      BOOST_MATH_GPU_ENABLED pareto_distribution(RealType l_scale = 1, RealType l_shape = 1)
         : m_scale(l_scale), m_shape(l_shape)
       { // Constructor.
         RealType result = 0;
         detail::check_pareto("boost::math::pareto_distribution<%1%>::pareto_distribution", l_scale, l_shape, &result, Policy());
       }
 
-      RealType scale()const
+      BOOST_MATH_GPU_ENABLED RealType scale()const
       { // AKA Xm and Wolfram b and beta
         return m_scale;
       }
 
-      RealType shape()const
+      BOOST_MATH_GPU_ENABLED RealType shape()const
       { // AKA k and Wolfram a and alpha
         return m_shape;
       }
@@ -173,25 +172,25 @@ namespace boost
 
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> range(const pareto_distribution<RealType, Policy>& /*dist*/)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const pareto_distribution<RealType, Policy>& /*dist*/)
     { // Range of permissible values for random variable x.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // scale zero to + infinity.
+      return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // scale zero to + infinity.
     } // range
 
     template <class RealType, class Policy>
-    inline const std::pair<RealType, RealType> support(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const pareto_distribution<RealType, Policy>& dist)
     { // Range of supported values for random variable x.
       // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
       using boost::math::tools::max_value;
-      return std::pair<RealType, RealType>(dist.scale(), max_value<RealType>() ); // scale to + infinity.
+      return boost::math::pair<RealType, RealType>(dist.scale(), max_value<RealType>() ); // scale to + infinity.
     } // support
 
     template <class RealType, class Policy>
-    inline RealType pdf(const pareto_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType pdf(const pareto_distribution<RealType, Policy>& dist, const RealType& x)
     {
       BOOST_MATH_STD_USING  // for ADL of std function pow.
-      static const char* function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
       RealType scale = dist.scale();
       RealType shape = dist.shape();
       RealType result = 0;
@@ -207,10 +206,10 @@ namespace boost
     } // pdf
 
     template <class RealType, class Policy>
-    inline RealType cdf(const pareto_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const pareto_distribution<RealType, Policy>& dist, const RealType& x)
     {
       BOOST_MATH_STD_USING  // for ADL of std function pow.
-      static const char* function = "boost::math::cdf(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::cdf(const pareto_distribution<%1%>&, %1%)";
       RealType scale = dist.scale();
       RealType shape = dist.shape();
       RealType result = 0;
@@ -230,10 +229,10 @@ namespace boost
     } // cdf
 
     template <class RealType, class Policy>
-    inline RealType logcdf(const pareto_distribution<RealType, Policy>& dist, const RealType& x)
+    BOOST_MATH_GPU_ENABLED inline RealType logcdf(const pareto_distribution<RealType, Policy>& dist, const RealType& x)
     {
       BOOST_MATH_STD_USING  // for ADL of std function pow.
-      static const char* function = "boost::math::logcdf(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::logcdf(const pareto_distribution<%1%>&, %1%)";
       RealType scale = dist.scale();
       RealType shape = dist.shape();
       RealType result = 0;
@@ -244,7 +243,7 @@ namespace boost
 
       if (x <= scale)
       { // regardless of shape, cdf is zero.
-        return -std::numeric_limits<RealType>::infinity();
+        return -boost::math::numeric_limits<RealType>::infinity();
       }
 
       result = log1p(-pow(scale/x, shape), Policy());
@@ -252,10 +251,10 @@ namespace boost
     } // logcdf
 
     template <class RealType, class Policy>
-    inline RealType quantile(const pareto_distribution<RealType, Policy>& dist, const RealType& p)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const pareto_distribution<RealType, Policy>& dist, const RealType& p)
     {
       BOOST_MATH_STD_USING  // for ADL of std function pow.
-      static const char* function = "boost::math::quantile(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::quantile(const pareto_distribution<%1%>&, %1%)";
       RealType result = 0;
       RealType scale = dist.scale();
       RealType shape = dist.shape();
@@ -279,10 +278,10 @@ namespace boost
     } // quantile
 
     template <class RealType, class Policy>
-    inline RealType cdf(const complemented2_type<pareto_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<pareto_distribution<RealType, Policy>, RealType>& c)
     {
        BOOST_MATH_STD_USING  // for ADL of std function pow.
-       static const char* function = "boost::math::cdf(const pareto_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::cdf(const pareto_distribution<%1%>&, %1%)";
        RealType result = 0;
        RealType x = c.param;
        RealType scale = c.dist.scale();
@@ -301,10 +300,10 @@ namespace boost
     } // cdf complement
 
     template <class RealType, class Policy>
-    inline RealType logcdf(const complemented2_type<pareto_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<pareto_distribution<RealType, Policy>, RealType>& c)
     {
        BOOST_MATH_STD_USING  // for ADL of std function pow.
-       static const char* function = "boost::math::logcdf(const pareto_distribution<%1%>&, %1%)";
+       constexpr auto function = "boost::math::logcdf(const pareto_distribution<%1%>&, %1%)";
        RealType result = 0;
        RealType x = c.param;
        RealType scale = c.dist.scale();
@@ -323,10 +322,10 @@ namespace boost
     } // logcdf complement
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<pareto_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<pareto_distribution<RealType, Policy>, RealType>& c)
     {
       BOOST_MATH_STD_USING  // for ADL of std function pow.
-      static const char* function = "boost::math::quantile(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::quantile(const pareto_distribution<%1%>&, %1%)";
       RealType result = 0;
       RealType q = c.param;
       RealType scale = c.dist.scale();
@@ -350,10 +349,10 @@ namespace boost
     } // quantile complement
 
     template <class RealType, class Policy>
-    inline RealType mean(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const pareto_distribution<RealType, Policy>& dist)
     {
       RealType result = 0;
-      static const char* function = "boost::math::mean(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::mean(const pareto_distribution<%1%>&, %1%)";
       if(false == detail::check_pareto(function, dist.scale(), dist.shape(), &result, Policy()))
       {
         return result;
@@ -370,16 +369,16 @@ namespace boost
     } // mean
 
     template <class RealType, class Policy>
-    inline RealType mode(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const pareto_distribution<RealType, Policy>& dist)
     {
       return dist.scale();
     } // mode
 
     template <class RealType, class Policy>
-    inline RealType median(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType median(const pareto_distribution<RealType, Policy>& dist)
     {
       RealType result = 0;
-      static const char* function = "boost::math::median(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::median(const pareto_distribution<%1%>&, %1%)";
       if(false == detail::check_pareto(function, dist.scale(), dist.shape(), &result, Policy()))
       {
         return result;
@@ -389,12 +388,12 @@ namespace boost
     } // median
 
     template <class RealType, class Policy>
-    inline RealType variance(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const pareto_distribution<RealType, Policy>& dist)
     {
       RealType result = 0;
       RealType scale = dist.scale();
       RealType shape = dist.shape();
-      static const char* function = "boost::math::variance(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::variance(const pareto_distribution<%1%>&, %1%)";
       if(false == detail::check_pareto(function, scale, shape, &result, Policy()))
       {
         return result;
@@ -414,12 +413,12 @@ namespace boost
     } // variance
 
     template <class RealType, class Policy>
-    inline RealType skewness(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const pareto_distribution<RealType, Policy>& dist)
     {
       BOOST_MATH_STD_USING
       RealType result = 0;
       RealType shape = dist.shape();
-      static const char* function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
       if(false == detail::check_pareto(function, dist.scale(), shape, &result, Policy()))
       {
         return result;
@@ -440,11 +439,11 @@ namespace boost
     } // skewness
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const pareto_distribution<RealType, Policy>& dist)
     {
       RealType result = 0;
       RealType shape = dist.shape();
-      static const char* function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
       if(false == detail::check_pareto(function, dist.scale(), shape, &result, Policy()))
       {
         return result;
@@ -464,11 +463,11 @@ namespace boost
     } // kurtosis
 
     template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const pareto_distribution<RealType, Policy>& dist)
     {
       RealType result = 0;
       RealType shape = dist.shape();
-      static const char* function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::pdf(const pareto_distribution<%1%>&, %1%)";
       if(false == detail::check_pareto(function, dist.scale(), shape, &result, Policy()))
       {
         return result;
@@ -488,9 +487,9 @@ namespace boost
     } // kurtosis_excess
 
     template <class RealType, class Policy>
-    inline RealType entropy(const pareto_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType entropy(const pareto_distribution<RealType, Policy>& dist)
     {
-      using std::log;
+      BOOST_MATH_STD_USING
       RealType xm = dist.scale();
       RealType alpha = dist.shape();
       return log(xm/alpha) + 1 + 1/alpha;
diff --git a/inst/include/boost/math/distributions/poisson.hpp b/inst/include/boost/math/distributions/poisson.hpp
index 570a59025..c2fad66be 100644
--- a/inst/include/boost/math/distributions/poisson.hpp
+++ b/inst/include/boost/math/distributions/poisson.hpp
@@ -2,6 +2,7 @@
 
 // Copyright John Maddock 2006.
 // Copyright Paul A. Bristow 2007.
+// Copyright Matt Borland 2024.
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -36,6 +37,10 @@
 #ifndef BOOST_MATH_SPECIAL_POISSON_HPP
 #define BOOST_MATH_SPECIAL_POISSON_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp> // for incomplete gamma. gamma_q
 #include <boost/math/special_functions/trunc.hpp> // for incomplete gamma. gamma_q
@@ -46,9 +51,6 @@
 #include <boost/math/tools/roots.hpp> // for root finding.
 #include <boost/math/distributions/detail/inv_discrete_quantile.hpp>
 
-#include <utility>
-#include <limits>
-
 namespace boost
 {
   namespace math
@@ -60,7 +62,7 @@ namespace boost
       // checks are always performed, even if exceptions are not enabled.
 
       template <class RealType, class Policy>
-      inline bool check_mean(const char* function, const RealType& mean, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_mean(const char* function, const RealType& mean, RealType* result, const Policy& pol)
       {
         if(!(boost::math::isfinite)(mean) || (mean < 0))
         {
@@ -73,7 +75,7 @@ namespace boost
       } // bool check_mean
 
       template <class RealType, class Policy>
-      inline bool check_mean_NZ(const char* function, const RealType& mean, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_mean_NZ(const char* function, const RealType& mean, RealType* result, const Policy& pol)
       { // mean == 0 is considered an error.
         if( !(boost::math::isfinite)(mean) || (mean <= 0))
         {
@@ -86,13 +88,13 @@ namespace boost
       } // bool check_mean_NZ
 
       template <class RealType, class Policy>
-      inline bool check_dist(const char* function, const RealType& mean, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist(const char* function, const RealType& mean, RealType* result, const Policy& pol)
       { // Only one check, so this is redundant really but should be optimized away.
         return check_mean_NZ(function, mean, result, pol);
       } // bool check_dist
 
       template <class RealType, class Policy>
-      inline bool check_k(const char* function, const RealType& k, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_k(const char* function, const RealType& k, RealType* result, const Policy& pol)
       {
         if((k < 0) || !(boost::math::isfinite)(k))
         {
@@ -105,7 +107,7 @@ namespace boost
       } // bool check_k
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_k(const char* function, RealType mean, RealType k, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_k(const char* function, RealType mean, RealType k, RealType* result, const Policy& pol)
       {
         if((check_dist(function, mean, result, pol) == false) ||
           (check_k(function, k, result, pol) == false))
@@ -116,7 +118,7 @@ namespace boost
       } // bool check_dist_and_k
 
       template <class RealType, class Policy>
-      inline bool check_prob(const char* function, const RealType& p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_prob(const char* function, const RealType& p, RealType* result, const Policy& pol)
       { // Check 0 <= p <= 1
         if(!(boost::math::isfinite)(p) || (p < 0) || (p > 1))
         {
@@ -129,7 +131,7 @@ namespace boost
       } // bool check_prob
 
       template <class RealType, class Policy>
-      inline bool check_dist_and_prob(const char* function, RealType mean,  RealType p, RealType* result, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED inline bool check_dist_and_prob(const char* function, RealType mean,  RealType p, RealType* result, const Policy& pol)
       {
         if((check_dist(function, mean, result, pol) == false) ||
           (check_prob(function, p, result, pol) == false))
@@ -148,7 +150,7 @@ namespace boost
       using value_type = RealType;
       using policy_type = Policy;
 
-      explicit poisson_distribution(RealType l_mean = 1) : m_l(l_mean) // mean (lambda).
+      BOOST_MATH_GPU_ENABLED explicit poisson_distribution(RealType l_mean = 1) : m_l(l_mean) // mean (lambda).
       { // Expected mean number of events that occur during the given interval.
         RealType r;
         poisson_detail::check_dist(
@@ -157,7 +159,7 @@ namespace boost
           &r, Policy());
       } // poisson_distribution constructor.
 
-      RealType mean() const
+      BOOST_MATH_GPU_ENABLED RealType mean() const
       { // Private data getter function.
         return m_l;
       }
@@ -176,28 +178,28 @@ namespace boost
     // Non-member functions to give properties of the distribution.
 
     template <class RealType, class Policy>
-    inline std::pair<RealType, RealType> range(const poisson_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const poisson_distribution<RealType, Policy>& /* dist */)
     { // Range of permissible values for random variable k.
        using boost::math::tools::max_value;
-       return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // Max integer?
+       return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>()); // Max integer?
     }
 
     template <class RealType, class Policy>
-    inline std::pair<RealType, RealType> support(const poisson_distribution<RealType, Policy>& /* dist */)
+    BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const poisson_distribution<RealType, Policy>& /* dist */)
     { // Range of supported values for random variable k.
        // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
        using boost::math::tools::max_value;
-       return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
+       return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
     }
 
     template <class RealType, class Policy>
-    inline RealType mean(const poisson_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mean(const poisson_distribution<RealType, Policy>& dist)
     { // Mean of poisson distribution = lambda.
       return dist.mean();
     } // mean
 
     template <class RealType, class Policy>
-    inline RealType mode(const poisson_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType mode(const poisson_distribution<RealType, Policy>& dist)
     { // mode.
       BOOST_MATH_STD_USING // ADL of std functions.
       return floor(dist.mean());
@@ -206,7 +208,7 @@ namespace boost
     // Median now implemented via quantile(half) in derived accessors.
 
     template <class RealType, class Policy>
-    inline RealType variance(const poisson_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType variance(const poisson_distribution<RealType, Policy>& dist)
     { // variance.
       return dist.mean();
     }
@@ -214,14 +216,14 @@ namespace boost
     // standard_deviation provided by derived accessors.
 
     template <class RealType, class Policy>
-    inline RealType skewness(const poisson_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType skewness(const poisson_distribution<RealType, Policy>& dist)
     { // skewness = sqrt(l).
       BOOST_MATH_STD_USING // ADL of std functions.
       return 1 / sqrt(dist.mean());
     }
 
     template <class RealType, class Policy>
-    inline RealType kurtosis_excess(const poisson_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const poisson_distribution<RealType, Policy>& dist)
     { // skewness = sqrt(l).
       return 1 / dist.mean(); // kurtosis_excess 1/mean from Wiki & MathWorld eq 31.
       // http://mathworld.wolfram.com/Kurtosis.html explains that the kurtosis excess
@@ -230,7 +232,7 @@ namespace boost
     } // RealType kurtosis_excess
 
     template <class RealType, class Policy>
-    inline RealType kurtosis(const poisson_distribution<RealType, Policy>& dist)
+    BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const poisson_distribution<RealType, Policy>& dist)
     { // kurtosis is 4th moment about the mean = u4 / sd ^ 4
       // http://en.wikipedia.org/wiki/Kurtosis
       // kurtosis can range from -2 (flat top) to +infinity (sharp peak & heavy tails).
@@ -242,7 +244,7 @@ namespace boost
     } // RealType kurtosis
 
     template <class RealType, class Policy>
-    RealType pdf(const poisson_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED RealType pdf(const poisson_distribution<RealType, Policy>& dist, const RealType& k)
     { // Probability Density/Mass Function.
       // Probability that there are EXACTLY k occurrences (or arrivals).
       BOOST_FPU_EXCEPTION_GUARD
@@ -274,7 +276,7 @@ namespace boost
     } // pdf
 
     template <class RealType, class Policy>
-    RealType logpdf(const poisson_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED RealType logpdf(const poisson_distribution<RealType, Policy>& dist, const RealType& k)
     {
       BOOST_FPU_EXCEPTION_GUARD
 
@@ -283,7 +285,7 @@ namespace boost
 
       RealType mean = dist.mean();
       // Error check:
-      RealType result = -std::numeric_limits<RealType>::infinity();
+      RealType result = -boost::math::numeric_limits<RealType>::infinity();
       if(false == poisson_detail::check_dist_and_k(
         "boost::math::pdf(const poisson_distribution<%1%>&, %1%)",
         mean,
@@ -296,7 +298,7 @@ namespace boost
       // Special case of mean zero, regardless of the number of events k.
       if (mean == 0)
       { // Probability for any k is zero.
-        return std::numeric_limits<RealType>::quiet_NaN();
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
       }
       
       // Special case where k and lambda are both positive
@@ -310,7 +312,7 @@ namespace boost
     }
 
     template <class RealType, class Policy>
-    RealType cdf(const poisson_distribution<RealType, Policy>& dist, const RealType& k)
+    BOOST_MATH_GPU_ENABLED RealType cdf(const poisson_distribution<RealType, Policy>& dist, const RealType& k)
     { // Cumulative Distribution Function Poisson.
       // The random variate k is the number of occurrences(or arrivals)
       // k argument may be integral, signed, or unsigned, or floating point.
@@ -361,7 +363,7 @@ namespace boost
     } // binomial cdf
 
     template <class RealType, class Policy>
-    RealType cdf(const complemented2_type<poisson_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED RealType cdf(const complemented2_type<poisson_distribution<RealType, Policy>, RealType>& c)
     { // Complemented Cumulative Distribution Function Poisson
       // The random variate k is the number of events, occurrences or arrivals.
       // k argument may be integral, signed, or unsigned, or floating point.
@@ -411,10 +413,10 @@ namespace boost
     } // poisson ccdf
 
     template <class RealType, class Policy>
-    inline RealType quantile(const poisson_distribution<RealType, Policy>& dist, const RealType& p)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const poisson_distribution<RealType, Policy>& dist, const RealType& p)
     { // Quantile (or Percent Point) Poisson function.
       // Return the number of expected events k for a given probability p.
-      static const char* function = "boost::math::quantile(const poisson_distribution<%1%>&, %1%)";
+      constexpr auto function = "boost::math::quantile(const poisson_distribution<%1%>&, %1%)";
       RealType result = 0; // of Argument checks:
       if(false == poisson_detail::check_prob(
         function,
@@ -443,7 +445,7 @@ namespace boost
          return policies::raise_overflow_error<RealType>(function, 0, Policy());
       }
       using discrete_type = typename Policy::discrete_quantile_type;
-      std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+      boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
       RealType guess;
       RealType factor = 8;
       RealType z = dist.mean();
@@ -477,13 +479,13 @@ namespace boost
    } // quantile
 
     template <class RealType, class Policy>
-    inline RealType quantile(const complemented2_type<poisson_distribution<RealType, Policy>, RealType>& c)
+    BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<poisson_distribution<RealType, Policy>, RealType>& c)
     { // Quantile (or Percent Point) of Poisson function.
       // Return the number of expected events k for a given
       // complement of the probability q.
       //
       // Error checks:
-      static const char* function = "boost::math::quantile(complement(const poisson_distribution<%1%>&, %1%))";
+      constexpr auto function = "boost::math::quantile(complement(const poisson_distribution<%1%>&, %1%))";
       RealType q = c.param;
       const poisson_distribution<RealType, Policy>& dist = c.dist;
       RealType result = 0;  // of argument checks.
@@ -514,7 +516,7 @@ namespace boost
          return 0;  // Exact result regardless of discrete-quantile Policy
       }
       using discrete_type = typename Policy::discrete_quantile_type;
-      std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+      boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
       RealType guess;
       RealType factor = 8;
       RealType z = dist.mean();
diff --git a/inst/include/boost/math/distributions/rayleigh.hpp b/inst/include/boost/math/distributions/rayleigh.hpp
index 4e741313c..155525b53 100644
--- a/inst/include/boost/math/distributions/rayleigh.hpp
+++ b/inst/include/boost/math/distributions/rayleigh.hpp
@@ -7,6 +7,10 @@
 #ifndef BOOST_STATS_rayleigh_HPP
 #define BOOST_STATS_rayleigh_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/log1p.hpp>
@@ -19,16 +23,12 @@
 # pragma warning(disable: 4702) // unreachable code (return after domain_error throw).
 #endif
 
-#include <utility>
-#include <limits>
-#include <cmath>
-
 namespace boost{ namespace math{
 
 namespace detail
 { // Error checks:
   template <class RealType, class Policy>
-  inline bool verify_sigma(const char* function, RealType sigma, RealType* presult, const Policy& pol)
+  BOOST_MATH_GPU_ENABLED inline bool verify_sigma(const char* function, RealType sigma, RealType* presult, const Policy& pol)
   {
      if((sigma <= 0) || (!(boost::math::isfinite)(sigma)))
      {
@@ -41,7 +41,7 @@ namespace detail
   } // bool verify_sigma
 
   template <class RealType, class Policy>
-  inline bool verify_rayleigh_x(const char* function, RealType x, RealType* presult, const Policy& pol)
+  BOOST_MATH_GPU_ENABLED inline bool verify_rayleigh_x(const char* function, RealType x, RealType* presult, const Policy& pol)
   {
      if((x < 0) || (boost::math::isnan)(x))
      {
@@ -61,14 +61,14 @@ class rayleigh_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit rayleigh_distribution(RealType l_sigma = 1)
+   BOOST_MATH_GPU_ENABLED explicit rayleigh_distribution(RealType l_sigma = 1)
       : m_sigma(l_sigma)
    {
       RealType err;
       detail::verify_sigma("boost::math::rayleigh_distribution<%1%>::rayleigh_distribution", l_sigma, &err, Policy());
    } // rayleigh_distribution
 
-   RealType sigma()const
+   BOOST_MATH_GPU_ENABLED RealType sigma()const
    { // Accessor.
      return m_sigma;
    }
@@ -85,28 +85,28 @@ rayleigh_distribution(RealType)->rayleigh_distribution<typename boost::math::too
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const rayleigh_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const rayleigh_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), std::numeric_limits<RealType>::has_infinity ? std::numeric_limits<RealType>::infinity() : max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), boost::math::numeric_limits<RealType>::has_infinity ? boost::math::numeric_limits<RealType>::infinity() : max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const rayleigh_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const rayleigh_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0),  max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std function exp.
 
    RealType sigma = dist.sigma();
    RealType result = 0;
-   static const char* function = "boost::math::pdf(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::pdf(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
       return result;
@@ -125,13 +125,13 @@ inline RealType pdf(const rayleigh_distribution<RealType, Policy>& dist, const R
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType logpdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std function exp.
 
    const RealType sigma = dist.sigma();
-   RealType result = -std::numeric_limits<RealType>::infinity();
-   static const char* function = "boost::math::logpdf(const rayleigh_distribution<%1%>&, %1%)";
+   RealType result = -boost::math::numeric_limits<RealType>::infinity();
+   constexpr auto function = "boost::math::logpdf(const rayleigh_distribution<%1%>&, %1%)";
 
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
@@ -151,13 +151,13 @@ inline RealType logpdf(const rayleigh_distribution<RealType, Policy>& dist, cons
 } // logpdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    RealType result = 0;
    RealType sigma = dist.sigma();
-   static const char* function = "boost::math::cdf(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
       return result;
@@ -171,33 +171,33 @@ inline RealType cdf(const rayleigh_distribution<RealType, Policy>& dist, const R
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType logcdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const rayleigh_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    RealType result = 0;
    RealType sigma = dist.sigma();
-   static const char* function = "boost::math::logcdf(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
-      return -std::numeric_limits<RealType>::infinity();
+      return -boost::math::numeric_limits<RealType>::infinity();
    }
    if(false == detail::verify_rayleigh_x(function, x, &result, Policy()))
    {
-      return -std::numeric_limits<RealType>::infinity();
+      return -boost::math::numeric_limits<RealType>::infinity();
    }
    result = log1p(-exp(-x * x / ( 2 * sigma * sigma)), Policy());   
    return result;
 } // logcdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const rayleigh_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const rayleigh_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    RealType result = 0;
    RealType sigma = dist.sigma();
-   static const char* function = "boost::math::quantile(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
       return result;
    if(false == detail::check_probability(function, p, &result, Policy()))
@@ -216,13 +216,13 @@ inline RealType quantile(const rayleigh_distribution<RealType, Policy>& dist, co
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<rayleigh_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<rayleigh_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    RealType result = 0;
    RealType sigma = c.dist.sigma();
-   static const char* function = "boost::math::cdf(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::cdf(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
       return result;
@@ -241,21 +241,21 @@ inline RealType cdf(const complemented2_type<rayleigh_distribution<RealType, Pol
 } // cdf complement
 
 template <class RealType, class Policy>
-inline RealType logcdf(const complemented2_type<rayleigh_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<rayleigh_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
 
    RealType result = 0;
    RealType sigma = c.dist.sigma();
-   static const char* function = "boost::math::logcdf(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::logcdf(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
-      return -std::numeric_limits<RealType>::infinity();
+      return -boost::math::numeric_limits<RealType>::infinity();
    }
    RealType x = c.param;
    if(false == detail::verify_rayleigh_x(function, x, &result, Policy()))
    {
-      return -std::numeric_limits<RealType>::infinity();
+      return -boost::math::numeric_limits<RealType>::infinity();
    }
    RealType ea = x * x / (2 * sigma * sigma);
    // Fix for VC11/12 x64 bug in exp(float):
@@ -266,13 +266,13 @@ inline RealType logcdf(const complemented2_type<rayleigh_distribution<RealType,
 } // logcdf complement
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<rayleigh_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<rayleigh_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING // for ADL of std functions, log & sqrt.
 
    RealType result = 0;
    RealType sigma = c.dist.sigma();
-   static const char* function = "boost::math::quantile(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
       return result;
@@ -295,11 +295,11 @@ inline RealType quantile(const complemented2_type<rayleigh_distribution<RealType
 } // quantile complement
 
 template <class RealType, class Policy>
-inline RealType mean(const rayleigh_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const rayleigh_distribution<RealType, Policy>& dist)
 {
    RealType result = 0;
    RealType sigma = dist.sigma();
-   static const char* function = "boost::math::mean(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::mean(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
       return result;
@@ -309,11 +309,11 @@ inline RealType mean(const rayleigh_distribution<RealType, Policy>& dist)
 } // mean
 
 template <class RealType, class Policy>
-inline RealType variance(const rayleigh_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const rayleigh_distribution<RealType, Policy>& dist)
 {
    RealType result = 0;
    RealType sigma = dist.sigma();
-   static const char* function = "boost::math::variance(const rayleigh_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::variance(const rayleigh_distribution<%1%>&, %1%)";
    if(false == detail::verify_sigma(function, sigma, &result, Policy()))
    {
       return result;
@@ -323,20 +323,20 @@ inline RealType variance(const rayleigh_distribution<RealType, Policy>& dist)
 } // variance
 
 template <class RealType, class Policy>
-inline RealType mode(const rayleigh_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const rayleigh_distribution<RealType, Policy>& dist)
 {
    return dist.sigma();
 }
 
 template <class RealType, class Policy>
-inline RealType median(const rayleigh_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const rayleigh_distribution<RealType, Policy>& dist)
 {
    using boost::math::constants::root_ln_four;
    return root_ln_four<RealType>() * dist.sigma();
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const rayleigh_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const rayleigh_distribution<RealType, Policy>& /*dist*/)
 {
   return static_cast<RealType>(0.63111065781893713819189935154422777984404221106391L);
   // Computed using NTL at 150 bit, about 50 decimal digits.
@@ -344,7 +344,7 @@ inline RealType skewness(const rayleigh_distribution<RealType, Policy>& /*dist*/
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const rayleigh_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const rayleigh_distribution<RealType, Policy>& /*dist*/)
 {
   return static_cast<RealType>(3.2450893006876380628486604106197544154170667057995L);
   // Computed using NTL at 150 bit, about 50 decimal digits.
@@ -352,7 +352,7 @@ inline RealType kurtosis(const rayleigh_distribution<RealType, Policy>& /*dist*/
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const rayleigh_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const rayleigh_distribution<RealType, Policy>& /*dist*/)
 {
   return static_cast<RealType>(0.2450893006876380628486604106197544154170667057995L);
   // Computed using NTL at 150 bit, about 50 decimal digits.
@@ -360,9 +360,9 @@ inline RealType kurtosis_excess(const rayleigh_distribution<RealType, Policy>& /
 } // kurtosis_excess
 
 template <class RealType, class Policy>
-inline RealType entropy(const rayleigh_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const rayleigh_distribution<RealType, Policy>& dist)
 {
-   using std::log;
+   BOOST_MATH_STD_USING
    return 1 + log(dist.sigma()*constants::one_div_root_two<RealType>()) + constants::euler<RealType>()/2;
 }
 
diff --git a/inst/include/boost/math/distributions/saspoint5.hpp b/inst/include/boost/math/distributions/saspoint5.hpp
new file mode 100644
index 000000000..7846b9956
--- /dev/null
+++ b/inst/include/boost/math/distributions/saspoint5.hpp
@@ -0,0 +1,2796 @@
+//  Copyright Takuma Yoshimura 2024.
+//  Copyright Matt Borland 2024.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_STATS_SASPOINT5_HPP
+#define BOOST_STATS_SASPOINT5_HPP
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/tools/big_constant.hpp>
+#include <boost/math/distributions/complement.hpp>
+#include <boost/math/distributions/detail/common_error_handling.hpp>
+#include <boost/math/distributions/detail/derived_accessors.hpp>
+#include <boost/math/tools/rational.hpp>
+#include <boost/math/tools/promotion.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/distributions/fwd.hpp>
+#include <cmath>
+#endif
+
+namespace boost { namespace math {
+template <class RealType, class Policy>
+class saspoint5_distribution;
+
+namespace detail {
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 0.125) {
+        // Rational Approximation
+        // Maximum Relative Error: 7.8747e-17
+        BOOST_MATH_STATIC const RealType P[13] = {
+            static_cast<RealType>(6.36619772367581343076e-1),
+            static_cast<RealType>(2.17275699713513462507e2),
+            static_cast<RealType>(3.49063163361344578910e4),
+            static_cast<RealType>(3.40332906932698464252e6),
+            static_cast<RealType>(2.19485577044357440949e8),
+            static_cast<RealType>(9.66086435948730562464e9),
+            static_cast<RealType>(2.90571833690383003932e11),
+            static_cast<RealType>(5.83089315593106044683e12),
+            static_cast<RealType>(7.37911022713775715766e13),
+            static_cast<RealType>(5.26757196603002476852e14),
+            static_cast<RealType>(1.75780353683063527570e15),
+            static_cast<RealType>(1.85883041942144306222e15),
+            static_cast<RealType>(4.19828222275972713819e14),
+        };
+        BOOST_MATH_STATIC const RealType Q[15] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.41295871011779138155e2),
+            static_cast<RealType>(5.48907134827349102297e4),
+            static_cast<RealType>(5.36641455324410261980e6),
+            static_cast<RealType>(3.48045461004960397915e8),
+            static_cast<RealType>(1.54920747349701741537e10),
+            static_cast<RealType>(4.76490595358644532404e11),
+            static_cast<RealType>(1.00104823128402735005e13),
+            static_cast<RealType>(1.39703522470411802507e14),
+            static_cast<RealType>(1.23724881334160220266e15),
+            static_cast<RealType>(6.47437580921138359461e15),
+            static_cast<RealType>(1.77627318260037604066e16),
+            static_cast<RealType>(2.04792815832538146160e16),
+            static_cast<RealType>(7.45102534638640681964e15),
+            static_cast<RealType>(3.68496090049571174527e14),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 0.25) {
+        RealType t = x - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.1471e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(4.35668401768623200524e-1),
+            static_cast<RealType>(7.12477357389655327116e0),
+            static_cast<RealType>(4.02466317948738993787e1),
+            static_cast<RealType>(9.04888497628205955839e1),
+            static_cast<RealType>(7.56175387288619211460e1),
+            static_cast<RealType>(1.26950253999694502457e1),
+            static_cast<RealType>(-6.59304802132933325219e-1),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.98623818041545101115e1),
+            static_cast<RealType>(1.52856383017632616759e2),
+            static_cast<RealType>(5.70706902111659740041e2),
+            static_cast<RealType>(1.06454927680197927878e3),
+            static_cast<RealType>(9.13160352749764887791e2),
+            static_cast<RealType>(2.58872466837209126618e2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 0.5) {
+        RealType t = x - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.3265e-17
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(2.95645445681747568732e-1),
+            static_cast<RealType>(2.23779537590791610124e0),
+            static_cast<RealType>(5.01302198171248036052e0),
+            static_cast<RealType>(2.76363131116340641935e0),
+            static_cast<RealType>(1.18134858311074670327e-1),
+            static_cast<RealType>(2.00287083462139382715e-2),
+            static_cast<RealType>(-7.53979800555375661516e-3),
+            static_cast<RealType>(1.37294648777729527395e-3),
+        };
+        BOOST_MATH_STATIC const RealType Q[6] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.02879626214781666701e1),
+            static_cast<RealType>(3.85125274509784615691e1),
+            static_cast<RealType>(6.18474367367800231625e1),
+            static_cast<RealType>(3.77100050087302476029e1),
+            static_cast<RealType>(5.41866360740066443656e0),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 1) {
+        RealType t = x - static_cast <RealType>(0.5);
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.7947e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.70762401725206223811e-1),
+            static_cast<RealType>(8.43343631021918972436e-1),
+            static_cast<RealType>(1.39703819152564365627e0),
+            static_cast<RealType>(8.75843324574692085009e-1),
+            static_cast<RealType>(1.86199552443747562584e-1),
+            static_cast<RealType>(7.35858280181579907616e-3),
+            static_cast<RealType>(-1.03693607694266081126e-4),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.73363440952557318819e0),
+            static_cast<RealType>(1.74288966619209299976e1),
+            static_cast<RealType>(2.15943268035083671893e1),
+            static_cast<RealType>(1.29818726981381859879e1),
+            static_cast<RealType>(3.40707211426946022041e0),
+            static_cast<RealType>(2.80229012541729457678e-1),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.7051e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(8.61071469126041183247e-2),
+            static_cast<RealType>(1.69689585946245345838e-1),
+            static_cast<RealType>(1.09494833291892212033e-1),
+            static_cast<RealType>(2.76619622453130604637e-2),
+            static_cast<RealType>(2.44972748006913061509e-3),
+            static_cast<RealType>(4.09853605772288438003e-5),
+            static_cast<RealType>(-2.63561415158954865283e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.04082856018856244947e0),
+            static_cast<RealType>(3.52558663323956252986e0),
+            static_cast<RealType>(1.94795523079701426332e0),
+            static_cast<RealType>(5.23956733400745421623e-1),
+            static_cast<RealType>(6.19453597593998871667e-2),
+            static_cast<RealType>(2.31061984192347753499e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.9247e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(3.91428580496513429479e-2),
+            static_cast<RealType>(4.07162484034780126757e-2),
+            static_cast<RealType>(1.43342733342753081931e-2),
+            static_cast<RealType>(2.01622178115394696215e-3),
+            static_cast<RealType>(1.00648013467757737201e-4),
+            static_cast<RealType>(9.51545046750892356441e-7),
+            static_cast<RealType>(-3.56598940936439037087e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.63904431617187026619e0),
+            static_cast<RealType>(1.03812003196677309121e0),
+            static_cast<RealType>(3.18144310790210668797e-1),
+            static_cast<RealType>(4.81930155615666517263e-2),
+            static_cast<RealType>(3.25435391589941361778e-3),
+            static_cast<RealType>(7.01626957128181647457e-5),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.6547e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.65057384221262866484e-2),
+            static_cast<RealType>(8.05429762031495873704e-3),
+            static_cast<RealType>(1.35249234647852784985e-3),
+            static_cast<RealType>(9.18685252682786794440e-5),
+            static_cast<RealType>(2.23447790937806602674e-6),
+            static_cast<RealType>(1.03176916111395079569e-8),
+            static_cast<RealType>(-1.94913182592441292094e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.10113554189626079232e-1),
+            static_cast<RealType>(2.54175325409968367580e-1),
+            static_cast<RealType>(3.87119072807894983910e-2),
+            static_cast<RealType>(2.92520770162792443587e-3),
+            static_cast<RealType>(9.89094130526684467420e-5),
+            static_cast<RealType>(1.07148513311070719488e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.5484e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(6.60044810497290557553e-3),
+            static_cast<RealType>(1.59342644994950292031e-3),
+            static_cast<RealType>(1.32429706922966110874e-4),
+            static_cast<RealType>(4.45378136978435909660e-6),
+            static_cast<RealType>(5.36409958111394628239e-8),
+            static_cast<RealType>(1.22293787679910067873e-10),
+            static_cast<RealType>(-1.16300443044165216564e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.10446485803039594111e-1),
+            static_cast<RealType>(6.51887342399859289520e-2),
+            static_cast<RealType>(5.02151225308643905366e-3),
+            static_cast<RealType>(1.91741179639551137839e-4),
+            static_cast<RealType>(3.27316600311598190022e-6),
+            static_cast<RealType>(1.78840301213102212857e-8),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.9866e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.54339461777955741686e-3),
+            static_cast<RealType>(3.10069525357852579756e-4),
+            static_cast<RealType>(1.30082682796085732756e-5),
+            static_cast<RealType>(2.20715868479255585050e-7),
+            static_cast<RealType>(1.33996659756026452288e-9),
+            static_cast<RealType>(1.53505360463827994365e-12),
+            static_cast<RealType>(-7.42649416356965421308e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.09203384450859785642e-1),
+            static_cast<RealType>(1.69422626897631306130e-2),
+            static_cast<RealType>(6.65649059670689720386e-4),
+            static_cast<RealType>(1.29654785666009849481e-5),
+            static_cast<RealType>(1.12886139474560969619e-7),
+            static_cast<RealType>(3.14420104899170413840e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.3581e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(9.55085695067883584460e-4),
+            static_cast<RealType>(5.86125496733202756668e-5),
+            static_cast<RealType>(1.23753971325810931282e-6),
+            static_cast<RealType>(1.05643819745933041408e-8),
+            static_cast<RealType>(3.22502949410095015524e-11),
+            static_cast<RealType>(1.85366144680157942079e-14),
+            static_cast<RealType>(-4.53975807317403152058e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.05980850386474826374e-1),
+            static_cast<RealType>(4.34966042652000070674e-3),
+            static_cast<RealType>(8.66341538387446465700e-5),
+            static_cast<RealType>(8.55608082202236124363e-7),
+            static_cast<RealType>(3.77719968378509293354e-9),
+            static_cast<RealType>(5.33287361559571716670e-12),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.7450e-19
+        BOOST_MATH_STATIC const RealType P[5] = {
+            static_cast<RealType>(1.99471140200716338970e-1),
+            static_cast<RealType>(-1.93310094131437487158e-2),
+            static_cast<RealType>(-8.44282614309073196195e-3),
+            static_cast<RealType>(3.47296024282356038069e-3),
+            static_cast<RealType>(-4.05398011689821941383e-4),
+        };
+        BOOST_MATH_STATIC const RealType Q[5] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(7.00973251258577238892e-1),
+            static_cast<RealType>(2.66969681258835723157e-1),
+            static_cast<RealType>(5.51785147503612200456e-2),
+            static_cast<RealType>(6.50130030979966274341e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t / x;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_pdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 0.0625) {
+        // Rational Approximation
+        // Maximum Relative Error: 8.8841e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[27] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.36619772367581343075535053490057448138e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.57459506929453385798277946154823008327e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46717322844023441698710451505816706570e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71501459971530549476153273173061194095e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.76700973495278431084530045707075552432e10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01328150775099946510145440412520620021e13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70028222513668830210058353057559790101e15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29641781943744384078006991488193839955e17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52611994112742436432957758588495082163e19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27833177267552931459542318826727288124e21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68946162731840551853993619351896931533e23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02965010233956763504899745874128908220e25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.14128569264874914146628076133997950655e26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09103580386900060922163883603492216942e28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.86778299087452621293332172137014749128e29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.80029712249744334924217328667885673985e31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70890080432228368476255091774238573277e32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.88600513999992354909078399482884993261e33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.01189178534848836605739139176681647755e34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.06531475170803043941021113424602440078e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.64956999370443524098457423629252855270e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44276098283517934229787916584447559248e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.45856704224433991524661028965741649584e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.47263237190968408624388275549716907309e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.66186300951901408251743228798832386260e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.48064966533519934186356663849904556319e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64877082086372991309408001661535573441e35),
+        };
+        BOOST_MATH_STATIC const RealType Q[28] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18981461118065892086304195732751798634e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.01761929839041982958990681130944341399e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69465252239913021973760046507387620537e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.49221044103838155300076098325950584061e10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59327386289821190042576978177896481082e13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67528179803224728786405503232064643870e15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61672367849271591791062829736720884633e17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98395893917909208201801908435620016552e19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60025693881358827551113845076726845495e21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67730578745705562356709169493821118109e23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63843883526710042156562706339553092312e25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.23075214698024188140971761421762265880e26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.37775321923937393366376907114580842429e28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12444724625354796650300159037364355605e30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00860835602766063447009568106012449767e31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.39614080159468893509273006948526469708e32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06547095715472468415058181351212520255e34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36755997709303811764051969789337337957e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32519530489892818585066019217287415587e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.45230390606834183602522256278256501404e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.80344475131699029428900627020022801971e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66469314795307459840482483320814279444e38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70209065673736156218117594311801487932e38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.84490531246108754748100009460860427732e38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30215083398643966091721732133851539475e38),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.58032845332990262754766784625271262271e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.50461648438613634025964361513066059697e36),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 0.125) {
+        RealType t = x - static_cast <RealType>(0.0625);
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.4585e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.46416716200748206779925127900698754119e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.41771273526123373239570033672829787791e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56142610225585235535211648703534340871e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15655694129872563686497490176725921724e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.00791883661952751945853742455643714995e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30252591667828615354689186280704562254e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76168115448224677276551213052798322583e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.88534624532179841393387625270218172719e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14740447137831585842166880265350244623e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14904082614021239315925958812100948136e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.76866867279164114004579652405104553404e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53475339598769347326916978463911377965e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.88896160275915786487519266368539625326e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05543800791717482823610940401201712196e4),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.44407579416524903840331499438398472639e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15911780811299460009161345260146251462e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.88457596285725454686358792906273558406e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.66501639812506059997744549411633476528e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.12674134216028769532305433586266118000e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.87676063477990584593444083577765264392e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.56084282739608760299329382263598821653e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.34250986378665047914811630036201995871e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31288233106689286803200674021353188597e9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33621494302241474082474689597125896975e9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.63379428046258653791600947328520263412e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14558538557562267533922961110917101850e8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 0.25) {
+        RealType t = x - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.9278e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35668401768623200524372663239480799018e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30066509937988171489091367354416214000e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.05924026744937322690717755156090122074e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.12998524955326375684693500551926325112e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.52237930808361186011042950178715609183e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.10734809597587633852077152938985998879e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.20796157836149826988172603622242119074e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12398478061053302537736799402801934778e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17841330491647012385157454335820786724e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.46281413765362795389526259057436151953e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52220357379402116641048490644093497829e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.51130316105543847380510577656570543736e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.32201781975497810173532067354797097401e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.96874547436310030183519174847668703774e0),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.63164311578114868477819520857286165076e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34964379844144961683927306966955217328e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82966031793809959278519002412667883288e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56215285850856046267451500310816276675e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.81046679663412610005501878092824281161e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.33868038251479411246071640628518434659e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.46262495881941625571640264458627940579e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.40052628730443097561652737049917920495e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44394803828297754346261138417756941544e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.56647617803506258343236509255155360957e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.53513095899009948733175317927025056561e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69130675750530663088963759279778748696e5),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 0.5) {
+        RealType t = x - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.9378e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95645445681747568731488283573032414811e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.83246437763964151893665752064650172391e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.85333417559435252576820440080930004674e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.90974714199542064991001365628659054084e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39707205668285805800884524044738261436e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.24814598419826565698241508792385416075e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.95012897118808793886195172068123345314e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.87265743900139300849404272909665705025e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.98795164648056126707212245325405968413e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07012128790318535418330629467906917213e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99797198893523173981812955075412130913e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55029227544167913873724286459253168886e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54064889901609722583601330171719819660e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.72254289950537680833853394958874977464e-3),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.58291085070053442257438623486099473087e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95618461039379226195473938654286975682e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97427161745150579714266897556974326502e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.52730436681412535198281529590508861106e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49521185356761585062135933350225236726e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.03881178612341724262911142022761966061e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.02360046338629039644581819847209730553e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.65580339066083507998465454599272345735e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.15462499626138125314518636645472893045e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61951767959774678843021179589300545717e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.60745557054877240279811529503888551492e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91061555870569579915258835459255406575e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43045229010040855016672246098687100063e1),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 1) {
+        RealType t = x - static_cast <RealType>(0.5);
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.4363e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70762401725206223811383500786268939645e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19353011456197635663058525904929358535e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22974648900600015961253465796487372402e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91951696059042324975935209295355569292e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.79039444119906169910281912009369164227e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00089963120992100860902142265631127046e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.37108883429306700857182028809960789020e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.49586566873564432788366931251358248417e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49790521605774884174840168128255220471e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.90660338063979435668763608259382712726e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93409982383888149064797608605579930804e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22802459215932860445033185874876812040e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.07739227340181463034286653569468171767e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.02669738424010290973023004028523684766e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46404480283267324138113869370306506431e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.54550184643308468933661600211579108422e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.63602410602063476726031476852965502123e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.94463479638213888403144706176973026333e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48607087483870766806529883069123352339e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69715692924508994524755312953665710218e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33237849965272853370191827043868842100e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.08460086451666825383009487734769646087e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.47365552394788536087148438788608689300e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.38010282703940184371247559455167674975e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.67219842525655806370702248122668214685e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.01852843874982199859775136086676841910e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.14767043526088185802569803397824432028e-3),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.1244e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.61071469126041183247373313827161939454e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.35837460186564880289965856498718321896e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.47783071967681246738651796742079530382e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16019502727107539284403003943433359877e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.80510046274709592896987229782879937271e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30456542768955299533391113704078540955e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36539167913428133313942008990965988621e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76450743657913389896743235938695682829e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42847090205575096649865021874905747106e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41380341540026027117735179862124402398e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.40549721587212773424211923602910622515e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09089653391032945883918434200567278139e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21403900721572475664926557233205232491e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.13172035933794917563324458011617112124e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65687100738157412154132860910003018338e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59672433683883998168388916533196510994e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.61469557815097583209668778301921207455e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.77070955301136405523492329700943077340e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.20825570431301943907348077675777546304e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.60136197167727810483751794121979805142e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.53723076053642006159503073104152703814e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.63397465217490984394478518334313362490e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.40577918603319523990542237990107206371e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.94376458316662573143947719026985667328e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.09333568224541559157192543410988474886e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.59947287428695057506683902409023760438e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.1110e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91428580496513429479068747515164587814e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.69015019070193436467106672180804948494e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03147451266231819912643754579290008651e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.18825170881552297150779588545792258740e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30548850262278582401286533053286406505e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.54315108501815531776138839512564427279e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.66434584176931077662201101557716482514e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.66158632576958238392567355014249971287e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.31365802206301246598393821671437863818e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85378389166807263837732376845556856416e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20375363151456683883984823721339648679e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06637401794693307359898089790558771957e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08663671047376684678494625068451888284e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.07443397096591141329212291707948432414e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.16665031056584124503224711639009530348e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27666060511630720485121299731204403783e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65646979169107732387032821262953301311e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.63594064986880863092994744424349361396e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31360114173642293100378020953197965181e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.09489929949457075237756409511944811481e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24574519309785870806550506199124944514e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56048486483867679310086683710523566607e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.60417286783794818094722636906776809193e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53154117367296710469692755461431646999e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60041713691072903334637560080298818163e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.77381528950794767694352468734042252745e-12),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.5228e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.65057384221262866484014802392420311075e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.92801687242885330588201777283015178448e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.65508815862861196424333614846876229064e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71545573465295958468808641544341412235e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72077718130407940498710469661947719216e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.26299620525538984108147098966692839348e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77971404992990847565880351976461271350e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71176235845517643695464740679643640241e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.64603919225244695533557520384631958897e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.85274347406803894317891882905083368489e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48564096627181435612831469651920186491e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.90886715044580341917806394089282500340e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -6.39396206221935864416563232680283312796e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.37760675743046300528308203869876086823e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49023284463742780238035958819642738891e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.76284367953836866133894756472541395734e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.69932155343422362573146811195224195135e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.97593541520549770519034085640975455763e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45862809001322359249894968573830094537e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.61348135835522976885804369721316193713e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21069949470458047530981551232427019037e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.03132437580490629136144285669590192597e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91030348024641585284338958059030520141e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.56320479309161046934628280237629402373e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.39524198476052364627683067034422502163e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18666081063885228839052386515073873844e-13),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.6732e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.60044810497290557552736366450372523266e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27034183360438185616541260923634443241e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19813403884333707962156711479716066536e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91346554854771687970018076643044998737e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91975837766081548424458764226669789039e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26031304514411902758114277797443618334e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.47127194811140370123712253347211626753e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55248861254135821097921903190564312000e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78340847719683652633864722047250151066e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95888612422041337572422846394029849086e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66363005792960308636467394552324255493e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.93244800648299424751906591077496534948e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.95046217952146113063614290717113024410e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.46784746963816915795587433372284530785e-25),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.16012189991825507132967712656930682478e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95202772611563835130347051925062280272e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.23801477561401113332870463345197159418e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.54022665579711946784722766000062263305e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.94266182294627770206082679848878391116e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.11782839184878848480753630961211685630e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.28827067686094594197542725283923947812e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.00220719177374237332018587370837457299e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.42250513143925626748132661121749401409e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82007216963767723991309138907689681422e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34214834652884406013489167210936679359e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.85519293212465087373898447546710143008e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.96728437809303144188312623363453475831e-19),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.0113e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54339461777955741686401041938275102207e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.17747085249877439037826121862689145081e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14104576580586095462211756659036062930e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.06903778663262313120049231822412184382e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53115958954246158081703822428768781010e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48225007017630665357941682179157662142e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20810829523286181556951002345409843125e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.54070972719909957155251432996372246019e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06258623970363729581390609798632080752e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15603641527498625694677136504611545743e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.05376970060354261667000502105893106009e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.14727542705613448694396750352455931731e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76883960167449461476228984331517762578e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.03558202009465610972808653993060437679e-29),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08809672969012756295937194823378109391e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.41148083436617376855422685448827300528e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.85101541143091590863368934606849033688e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.38984899982960112626157576750593711628e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51437845497783812562009857096371643785e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.12891276596072815764119699444334380521e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82412500887161687329929693518498698716e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80215715026891688444965605768621763721e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.85838684678780184082810752634454259831e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83675729736846176693608812315852523556e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.80347165008408134158968403924819637224e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23639219622240634094606955067799349447e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.63446235885036169537726818244420509024e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.7056e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.55085695067883584460317653567009454037e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52919532248638251721278667010429548877e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06266842295477991789450356745903177571e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.20671609948319334255323512011575892813e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04692714549374449244320605137676408001e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70605481454469287545965803970738264158e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83960996572005209177458712170004097587e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29732261733491885750067029092181853751e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.78385693918239619309147428897790440735e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52969197316398995616879018998891661712e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14063120299947677255281707434419044806e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25957675329657493245893497219459256248e-25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.55238112862817593053765898004447484717e-29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -8.93970406521541790658675747195982964585e-34),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04722757068068234153968603374387493579e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85854131835804458353300285777969427206e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.85809281481040288085436275150792074968e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.38860750164285700051427698379841626305e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.91463283601681120487987016215594255423e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28104952818420195583669572450494959042e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43912720109615655035554724090181888734e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10668954229813492117417896681856998595e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.65093571330749369067212003571435698558e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81758227619561958470583781325371429458e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.36970757752002915423191164330598255294e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.06487673393164724939989217811068656932e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.47121057452822097779067717258050172115e-27),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.1032e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[8] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99471140200716338969973029967190934238e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.82846732476244747063962056024672844211e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -3.69724475658159099827638225237895868258e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21259630917863228526439367416146293173e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.13469812721679130825429547254346177005e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.73237434182338329541631611908947123606e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72986150007117100707304201395140411630e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -2.53567129749337040254350979652515879881e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.89815449697874475254942178935516387239e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.21223228867921988134838870379132038419e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79514417558927397512722128659468888701e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.43331254539687594239741585764730095049e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.99078779616201786316256750758748178864e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04590833634768023225748107112347131311e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.17497990182339853998751740288392648984e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53420609011698705803549938558385779137e-6),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t / x;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53> &tag) {
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    return saspoint5_pdf_plus_imp_prec<RealType>(abs(x), tag);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_pdf_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>& tag) {
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    return saspoint5_pdf_plus_imp_prec<RealType>(abs(x), tag);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_pdf_imp(const saspoint5_distribution<RealType, Policy>& dist, const RealType& x) {
+    //
+    // This calculates the pdf of the Saspoint5 distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::pdf(saspoint5<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The SaS point5 distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale;
+
+    result = saspoint5_pdf_imp_prec(u, tag_type()) / scale;
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 0.5) {
+        // Rational Approximation
+        // Maximum Relative Error: 2.6225e-17
+        BOOST_MATH_STATIC const RealType P[16] = {
+            static_cast<RealType>(5.0e-1),
+            static_cast<RealType>(1.11530082549581486148e2),
+            static_cast<RealType>(1.18564167533523512811e4),
+            static_cast<RealType>(7.51503793077701705413e5),
+            static_cast<RealType>(3.05648233678438482191e7),
+            static_cast<RealType>(8.12176734530090957088e8),
+            static_cast<RealType>(1.39533182836234507573e10),
+            static_cast<RealType>(1.50394359286077974212e11),
+            static_cast<RealType>(9.79057903542935575811e11),
+            static_cast<RealType>(3.73800992855150140014e12),
+            static_cast<RealType>(8.12697090329432868343e12),
+            static_cast<RealType>(9.63154058643818290870e12),
+            static_cast<RealType>(5.77714904017642642181e12),
+            static_cast<RealType>(1.53321958252091815685e12),
+            static_cast<RealType>(1.36220966258718212359e11),
+            static_cast<RealType>(1.70766655065405022702e9),
+        };
+        BOOST_MATH_STATIC const RealType Q[16] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.24333404643898143947e2),
+            static_cast<RealType>(2.39984636687021023600e4),
+            static_cast<RealType>(1.53353791432086858132e6),
+            static_cast<RealType>(6.30764952479861776476e7),
+            static_cast<RealType>(1.70405769169309597488e9),
+            static_cast<RealType>(3.00381227010195289341e10),
+            static_cast<RealType>(3.37519046677507392667e11),
+            static_cast<RealType>(2.35001610518109063314e12),
+            static_cast<RealType>(9.90961948200767679416e12),
+            static_cast<RealType>(2.47066673978544828258e13),
+            static_cast<RealType>(3.51442593932882610556e13),
+            static_cast<RealType>(2.68891431106117733130e13),
+            static_cast<RealType>(9.99723484253582494535e12),
+            static_cast<RealType>(1.49190229409236772612e12),
+            static_cast<RealType>(5.68752980146893975323e10),
+        };
+
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 1) {
+        RealType t = x - static_cast <RealType>(0.5);
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.2135e-19
+        BOOST_MATH_STATIC const RealType P[8] = {
+            static_cast<RealType>(3.31309550000758082456e-1),
+            static_cast<RealType>(1.63012162307622129396e0),
+            static_cast<RealType>(2.97763161467248770571e0),
+            static_cast<RealType>(2.49277948739575294031e0),
+            static_cast<RealType>(9.49619262302649586821e-1),
+            static_cast<RealType>(1.38360148984087584165e-1),
+            static_cast<RealType>(4.00812864075652334798e-3),
+            static_cast<RealType>(-4.82051978765960490940e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(5.43565383128046471592e0),
+            static_cast<RealType>(1.13265160672130133152e1),
+            static_cast<RealType>(1.13352316246726435292e1),
+            static_cast<RealType>(5.56671465170409694873e0),
+            static_cast<RealType>(1.21011708389501479550e0),
+            static_cast<RealType>(8.34618282872428849500e-2),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.4688e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.71280312689343248819e-1),
+            static_cast<RealType>(7.44610837974139249205e-1),
+            static_cast<RealType>(7.17844128359406982825e-1),
+            static_cast<RealType>(2.98789060945288850507e-1),
+            static_cast<RealType>(5.22747411439102272576e-2),
+            static_cast<RealType>(3.06447984437786430265e-3),
+            static_cast<RealType>(2.60407071021044908690e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.06221257507188300824e0),
+            static_cast<RealType>(3.44827372231472308047e0),
+            static_cast<RealType>(1.78166113338930668519e0),
+            static_cast<RealType>(4.25580478492907232687e-1),
+            static_cast<RealType>(4.09983847731128510426e-2),
+            static_cast<RealType>(1.04343172183467651240e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.2289e-18
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(2.13928162275383716645e-1),
+            static_cast<RealType>(2.35139109235828185307e-1),
+            static_cast<RealType>(9.35967515134932733243e-2),
+            static_cast<RealType>(1.64310489592753858417e-2),
+            static_cast<RealType>(1.23186728989215889119e-3),
+            static_cast<RealType>(3.13500969261032539402e-5),
+            static_cast<RealType>(1.17021346758965979212e-7),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.28212183177829510267e0),
+            static_cast<RealType>(6.17321009406850420793e-1),
+            static_cast<RealType>(1.38400318019319970893e-1),
+            static_cast<RealType>(1.44994794535896837497e-2),
+            static_cast<RealType>(6.17774446282546623636e-4),
+            static_cast<RealType>(7.00521050169239269819e-6),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.7284e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.63772802979087193656e-1),
+            static_cast<RealType>(9.69009603942214234119e-2),
+            static_cast<RealType>(2.08261725719828138744e-2),
+            static_cast<RealType>(1.97965182693146960970e-3),
+            static_cast<RealType>(8.05499273532204276894e-5),
+            static_cast<RealType>(1.11401971145777879684e-6),
+            static_cast<RealType>(2.25932082770588727842e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.92463563872865541733e-1),
+            static_cast<RealType>(1.80720987166755982366e-1),
+            static_cast<RealType>(2.20416647324531054557e-2),
+            static_cast<RealType>(1.26052070140663063778e-3),
+            static_cast<RealType>(2.93967534265875431639e-5),
+            static_cast<RealType>(1.82706995042259549615e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.9609e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(1.22610122564874280532e-1),
+            static_cast<RealType>(3.70273222121572231593e-2),
+            static_cast<RealType>(4.06083618461789591121e-3),
+            static_cast<RealType>(1.96898134215932126299e-4),
+            static_cast<RealType>(4.08421066512186972853e-6),
+            static_cast<RealType>(2.87707419853226244584e-8),
+            static_cast<RealType>(2.96850126180387702894e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.55825191301363023576e-1),
+            static_cast<RealType>(4.77251766176046719729e-2),
+            static_cast<RealType>(2.99136605131226103925e-3),
+            static_cast<RealType>(8.78895785432321899939e-5),
+            static_cast<RealType>(1.05235770624006494709e-6),
+            static_cast<RealType>(3.35423877769913468556e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.6559e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(9.03056141356415077080e-2),
+            static_cast<RealType>(1.37568904417652631821e-2),
+            static_cast<RealType>(7.60947271383247418831e-4),
+            static_cast<RealType>(1.86048302967560067128e-5),
+            static_cast<RealType>(1.94537860496575427218e-7),
+            static_cast<RealType>(6.90524093915996283104e-10),
+            static_cast<RealType>(3.58808434477817122371e-13),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(1.80501347735272292079e-1),
+            static_cast<RealType>(1.22807958286146936376e-2),
+            static_cast<RealType>(3.90421541115275676253e-4),
+            static_cast<RealType>(5.81669449234915057779e-6),
+            static_cast<RealType>(3.53005415676201803667e-8),
+            static_cast<RealType>(5.69883025435873921433e-11),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.0653e-17
+        BOOST_MATH_STATIC const RealType P[7] = {
+            static_cast<RealType>(6.57333571766941474226e-2),
+            static_cast<RealType>(5.02795551798163084224e-3),
+            static_cast<RealType>(1.39633616037997111325e-4),
+            static_cast<RealType>(1.71386564634533872559e-6),
+            static_cast<RealType>(8.99508156357247137439e-9),
+            static_cast<RealType>(1.60229460572297160486e-11),
+            static_cast<RealType>(4.17711709622960498456e-15),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(9.10198637347368265508e-2),
+            static_cast<RealType>(3.12263472357578263712e-3),
+            static_cast<RealType>(5.00524795130325614005e-5),
+            static_cast<RealType>(3.75913188747149725195e-7),
+            static_cast<RealType>(1.14970132098893394023e-9),
+            static_cast<RealType>(9.34957119271300093120e-13),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0104e-20
+        BOOST_MATH_STATIC const RealType P[5] = {
+            static_cast<RealType>(3.98942280401432677940e-1),
+            static_cast<RealType>(8.12222388783621449146e-2),
+            static_cast<RealType>(1.68515703707271703934e-2),
+            static_cast<RealType>(2.19801627205374824460e-3),
+            static_cast<RealType>(-5.63321705854968264807e-5),
+        };
+        BOOST_MATH_STATIC const RealType Q[5] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(6.02536240902768558315e-1),
+            static_cast<RealType>(1.99284471400121092380e-1),
+            static_cast<RealType>(3.48012577961755452113e-2),
+            static_cast<RealType>(3.38545004473058881799e-3),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t;
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_cdf_plus_imp_prec(const RealType& x, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (x < 0.125) {
+        // Rational Approximation
+        // Maximum Relative Error: 6.9340e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[30] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.0e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.25520067710293108163697513129883130648e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.70866020657515874782126804139443323023e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.00865235319309486225795793030882782077e7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.15226363537737769449645357346965170790e10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.90371247243851280277289046301838071764e12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.55124590509169425751300134399513503679e14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.31282020412787511681760982839078664474e16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.81134278666896523873256421982740565131e18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.36154530125229747305141034242362609073e20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.67793867640429875837167908549938345465e22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34584264816825205490037614178084070903e24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.52622279567059369718208827282730379468e25),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.84678324511679577282571711018484545185e27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.99412564257799793932936828924325638617e28),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.08467105431111959283045453636520222779e30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87466808926544728702827204697734995611e31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55020252231174414164534905191762212055e32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69582736077420504345389671165954321163e33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.18203860972249826626461130638196586188e34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.32955733788770318392204091471121129386e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.97972270315674052071792562126668438695e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93941537398987201071027348577636994465e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40818708062034138095495206258366082481e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.76833406751769751643745383413977973530e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.67873467711368838525239991688791162617e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.94179310584115437584091984619858795365e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24348215908456320362232906012152922949e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71625432346533320597285660433110657670e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.54662474187354179772157464533408058525e33),
+        };
+        BOOST_MATH_STATIC const RealType Q[31] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05231337496532137901354609636674085703e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.43071888317491317900094470796567113997e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.80864482202910830302921131771345102044e8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.32755297215862998181755216820621285536e10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.86251123527611073428156549377791985741e12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.12025543961949466786297141758805461421e15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27681657695574252637426145112570596483e17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17850553865715973904162289375819555884e19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.87285897504702686250962844939736867339e20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.46852796231948446334549476317560711795e22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76101689878844725930808096548998198853e24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14017776727845251567032313915953239178e26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83738954971390158348334918235614003163e27),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04701345216121451992682705965658316871e29),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29994190638467725374533751141434904865e30),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.03334024242845994501493644478442360593e31),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.59094378123268840693978620156028975277e32),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.05630254163426327113368743426054256780e33),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.06008195534030444387061989883493342898e34),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.21262490304347036689874956206774563906e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52353024633841796119920505314785365242e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28839143293381125956284415313626962263e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31074057704096457802547386358094338369e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24762412200364040971704861346921094354e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.55663903116458425420509083471048286114e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81839283802391753865642022579846918253e37),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.40026559327708207943879092058654410696e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48767474646810049293505781106444169229e36),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10591353097667671736865938428051885499e35),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26980708896893794012677171239610721832e33),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, x) / tools::evaluate_polynomial(Q, x);
+    }
+    else if (x < 0.25) {
+        RealType t = x - static_cast <RealType>(0.125);
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.6106e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.31887921568009055676985827521151969069e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62791448964529380666250180886203090183e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.18238045199893937316918299064825702894e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.77274519306540522227493503092956314136e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.89424638466340765479970877448972418958e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.84027004420207996285174223581748706097e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.84633134142285937075423713704784530853e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76780579189423063605715733542379494552e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19812409802969581112716039533798357401e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60039008588877024309600768114757310858e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.10268260529501421009222937882726290612e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.72169594688819848498039471657587836720e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27181379647139697258984772894869505788e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.73617450590346508706222885401965820190e1),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.18558935411552146390814444666395959919e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49210559503096368944407109881023223654e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93959323596111340518285858313038058302e4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53590607436758691037825792660167970938e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.82700985983018132572589829602100319330e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62137033935442506086127262036686905276e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.76014299715348555304267927238963139228e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.12336796972134088340556958396544477713e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.01952132024838508233050167059872220508e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.41846547214877387780832317250797043384e6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.02083431572388097955901208994308271581e5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.30401057171447074343957754855656724141e4),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 0.5) {
+        RealType t = x - static_cast <RealType>(0.25);
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.1519e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.87119665000174806422420129219814467874e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.60769554551148293079169764245570645155e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.49181979810834706538329284478129952168e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15722765491675871778645250624425739489e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.65973147084701923411221710174830072860e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93709338011482232037110656459951914303e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.57393131299425403017769538642434714791e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.24110491141294379107651487490031694257e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23670394514211681515965192338544032862e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06141024932329394052395469123628405389e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.08599362073145455095790192415468286304e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.22746783794652085925801188098270888502e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.19652234873414609727168969049557770989e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -5.73529976407853894192156335785920329181e-4),
+        };
+        BOOST_MATH_STATIC const RealType Q[13] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.04157569499592889296640733909653747983e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82248883130787159161541119440215325308e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.35191216924911901198168794737654512677e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05099314677808235578577204150229855903e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.61081069236463123032873733048661305746e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.65340645555368229718826047069323437201e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.44526681322128674428653420882660351679e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.03963804195353853550682049993122898950e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40399236835577953127465726826981753422e3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.46764755170079991793106428011388637748e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.06384106042490712972156545051459068443e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.27614406724572981099586665536543423891e0),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 1) {
+        RealType t = x - static_cast <RealType>(0.5);
+
+        // Rational Approximation
+        // Maximum Relative Error: 7.1196e-37
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[15] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31309550000758082761278726632760756847e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.07242222531117199094690544171275415854e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.18286763141875580859241637334381199648e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72102024869298528501604761974348686708e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.31748399999514540052066169132819656757e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.72168003284748405703923567644025252608e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52648991506052496046447777354251378257e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.16777263528764704804758173026143295383e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.66044453196259367950849328889468385159e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.35095952392355288307377427145581700484e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43011308494452327007589069222668324337e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16582092138863383294685790744721021189e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.02261914949200575965813000131964695720e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.93943913630044161720796150617166047233e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -9.76395009419307902351328300308365369814e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28073115520716780203055949058270715651e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.20245752585870752942356137496087189194e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.34548337034735803039553186623067144497e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.90925817267776213429724248532378895039e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.92883822651628140083115301005227577059e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.72868136219107985834601503784789993218e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.50498744791568911029110559017896701095e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05178276667813671578581259848923964311e2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.16880263792490095344135867620645018480e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16199396397514668672304602774610890666e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.25543193822942088303609988399416145281e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.62522294286034117189844614005500278984e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18342889744790118595835138444372660676e-3),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 2) {
+        RealType t = x - 1;
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.5605e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71280312689343266367958859259591541365e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49628636612698702680819948707479820292e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61090930375686902075245639803646265081e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.01191924051756106307211298794294657688e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.42496510376427957390465373165464672088e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59577769624139820954046058289100998534e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02664809521258420718170586857797408674e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72258711278476951299824066502536249701e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.72578941800687566921553416498339481887e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.12553368488232553360765667155702324159e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.20749770911901442251726681861858323649e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00621121212654384864006297569770703900e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18976033102817074104109472578202752346e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22093548539863254922531707899658394458e-10),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.83305694892673455436552817409325835774e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.49922543669955056754932640312490112609e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.23488972536322019584648241457582608908e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.14051527527038669918848981363974859889e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37891280136777182304388426277537358346e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.08058775103864815769223385606687612117e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83305488980337433132332401784292281716e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.71072208215804671719811563659227630554e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.86332040813989094594982937011005305263e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.87698178237970337664105782546771501188e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69113555019737313680732855691540088318e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.31888539972217875242352157306613891243e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85633766164682554126992822326956560433e-8),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 4) {
+        RealType t = x - 2;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.1494e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.13928162275383718405630406427822960090e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.90742307267701162395764574873947997211e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.13821826367941514387521090205756466068e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.96186879146063565484800486550739025293e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19438785955706463753454881511977831603e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.44969124820016994689518539612465708536e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27841835070651018079759230944461773079e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69952429132675045239242077293594666305e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47919853099168659881487026035933933068e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.04644774117864306055402364094681541437e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.52604718870921084048756263996119841957e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97610950633031564892821158058978809537e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35934159016861180185992558083703785765e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21044098237798939057079316997065892072e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.94437702178976797218081686254875998984e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.82068837586514484653828718675654460991e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87606058269189306593797764456467061128e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39130528408903116343256483948950693356e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.52792074489091396425713962375223436022e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00892233011840867583848470677898363716e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.53717105060592851173320646706141911461e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57293857675930200001382624769341451561e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04219251796696135508847408131139677925e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.20053006131133304932740325113068767057e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.26384707028090985155079342718673255493e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.19146442700994823924806249608315505708e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59879298772002950043508762057850408213e-12),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 8) {
+        RealType t = x - 4;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.9710e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63772802979087199762340235165979751298e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31941534705372320785274994658709390116e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.43643960022585762678456016437621064500e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.11415302325466272779041471612529728187e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15767742459744253874067896740220951622e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.74049309186016489825053763513176160256e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.76349898574685150849080543168157785281e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19757202370729036627932327405149840205e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.32067727965321839898287320520750897894e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47636340015260789807543414080472136575e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36236727340568181129875213546468908164e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89379573960280486883733996547662506245e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.71832232038263988173042637335112603365e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.72380245500539326441037770757072641975e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51702400281458104713682413542736419584e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01375164846907815766683647295932603968e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.92796007869834847612192314006582598557e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.77580441164023725582659445614058463183e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63592331843149724480258804892989851727e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.87334158717610115008450674967492650941e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46596056941432875244263245821845070102e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.69980051560936361597177347949112822752e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.61690034211585843423761830218320365457e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.40619773800285766355596852314940341504e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.10624533319804091814643828283820958419e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.10009654621246392691126133176423833259e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.48070591106986983088640496621926852293e-16),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 16) {
+        RealType t = x - 8;
+
+        // Rational Approximation
+        // Maximum Relative Error: 5.2049e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22610122564874286614786819620499101143e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.30352481858382230273216195795534959290e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.45933050053542949214164590814846222512e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.18776888646200567321599584635465632591e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53421996228923143480455729204878676265e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.26075686557831306993734433164305349875e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58045762501721375879877727645933749122e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13469629033419341069106781092024950086e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09157226556088521407323375433512662525e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44961350323527660188267669752380722085e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11052101325523147964890915835024505324e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.26421404354976214191891992583151033361e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.17133505681224996657291059553060754343e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41010917905686427164414364663355769988e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.31062773739451672808456319166347015167e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35386721434011881226168110614121649232e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.39357338312443465616015226804775178232e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.26630144036271792027494677957363535353e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.24340476859846183414651435036807677467e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.33917136421389571662908749253850939876e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.80972141456523767244381195690041498939e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22653625120465488656616983786525028119e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.64072452032620505897896978124863889812e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.61842001579321492488462230987972104386e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96631619425501661980194304605724632777e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.80392324086028812772385536034034039168e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.34254502871215949266781048808984963366e-20),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 32) {
+        RealType t = x - 16;
+
+        // Rational Approximation
+        // Maximum Relative Error: 1.7434e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.03056141356415128156562790092782153630e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.15331583242023443256381237551843296356e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.81847913073640285776566199343276995613e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.23578443960486030170636772457627141406e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36906354316016270165240908809929957836e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.80584421020238085239890207672296651219e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.20726437845755296397071540583729544203e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.71042563703818585243207722641746283288e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08307373360265947158569900625482137206e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.80776566500233755365518221977875432763e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11405351639704510305055492207286172753e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21575609293568296049921888011966327905e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66081982641748223969990279975752576675e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96483118060215455299182487430511998831e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.77347004038951368607085827825968614455e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.27559305780716801070924630708599448466e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.05452382624230160738008550961679711827e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.75369667590360521677018734348769796476e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56551290985905942229892419848093494661e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.46972102361871185271727958608184616388e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.72423917010499649257775199140781647069e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14337306905269302583746182007852069459e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.69949885309711859563395555285232232606e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.00318719634300754237920041312234711548e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41139664927184402637020651515172315287e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79013190225240505774959477465594797961e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.46536966503325413797061462062918707370e-24),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else if (x < 64) {
+        RealType t = x - 32;
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.0402e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.57333571766941514095434647381791040479e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15416685251021339933358981066948923001e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.86806753164417557035166075399588122481e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.91972616817770660098405128729991574724e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10225768760715861978198010761036882002e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.05986998674039047865566990469266534338e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.59572646670205456333051888086612875871e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19347294198055585461131949159508730257e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21328285448498841418774425071549974153e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.19331596847283822557042655221763459728e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.36128017817576942059191451016251062072e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.35600223942735523925477855247725326228e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.14658948592500290756690769268766876322e-26),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.86984591055448991335081550609451649866e-30),
+        };
+        BOOST_MATH_STATIC const RealType Q[14] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90112824856612652807095815199496602262e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59291524937386142936420775839969648652e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.74245361925275011235694006013677228467e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41828589449615478387532599798645159282e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.08088176420557205743676774127863572768e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.30760429417424419297000535744450830697e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.18464910867914234357511605329900284981e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.74255540513281299503596269087176674333e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.02616028440371294233330747672966435921e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.26276597941744408946918920573146445795e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.47463109867603732992337779860914933775e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.77217411888267832243050973915295217582e-24),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.67397425207383164084527830512920206074e-28),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t);
+    }
+    else {
+        RealType t = 1 / sqrt(x);
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.2612e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[9] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.98942280401432677939946059934381868476e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33908701314796522684603310107061150444e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.92120397142832495974006972404741124398e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.15463147603421962834297353867930971657e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44488751006069172847577645328482300099e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44057582804743599116332797864164802887e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.02968018188491417839349438941039867033e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, -4.75092244933846337077999183310087492887e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35099582728548602389917143511323566818e-8),
+        };
+        BOOST_MATH_STATIC const RealType Q[7] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.34601617336219074065534356705298927390e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.82954035780824611941899463895040327299e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.70929001162671283123255408612494541378e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.05508596604210030533747793197422815105e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02913299057943756875992272236063124608e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.37824426836648736125759177846682556245e-5),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / tools::evaluate_polynomial(Q, t) * t;
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 53>& tag) {
+    if (x >= 0) {
+        return complement ? saspoint5_cdf_plus_imp_prec(x, tag) : 1 - saspoint5_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - saspoint5_cdf_plus_imp_prec(-x, tag) : saspoint5_cdf_plus_imp_prec(-x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_cdf_imp_prec(const RealType& x, bool complement, const boost::math::integral_constant<int, 113>& tag) {
+    if (x >= 0) {
+        return complement ? saspoint5_cdf_plus_imp_prec(x, tag) : 1 - saspoint5_cdf_plus_imp_prec(x, tag);
+    }
+    else if (x <= 0) {
+        return complement ? 1 - saspoint5_cdf_plus_imp_prec(-x, tag) : saspoint5_cdf_plus_imp_prec(-x, tag);
+    }
+    else {
+        return boost::math::numeric_limits<RealType>::quiet_NaN();
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_cdf_imp(const saspoint5_distribution<RealType, Policy>& dist, const RealType& x, bool complement) {
+    //
+    // This calculates the cdf of the Saspoint5 distribution and/or its complement.
+    //
+
+    BOOST_MATH_STD_USING // for ADL of std functions
+    constexpr auto function = "boost::math::cdf(saspoint5<%1%>&, %1%)";
+    RealType result = 0;
+    RealType location = dist.location();
+    RealType scale = dist.scale();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_x(function, x, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The SaS point5 distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    RealType u = (x - location) / scale;
+
+    result = saspoint5_cdf_imp_prec(u, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 53>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (ilogb(p) >= -2) {
+        RealType u = -log2(ldexp(p, 1));
+
+        if (u < 0.125) {
+            // Rational Approximation
+            // Maximum Relative Error: 4.2616e-17
+            BOOST_MATH_STATIC const RealType P[13] = {
+                static_cast<RealType>(1.36099130643975127045e-1),
+                static_cast<RealType>(2.19634434498311523885e1),
+                static_cast<RealType>(1.70276954848343179287e3),
+                static_cast<RealType>(8.02187341786354339306e4),
+                static_cast<RealType>(2.48750112198456813443e6),
+                static_cast<RealType>(5.20617858300443231437e7),
+                static_cast<RealType>(7.31202030685167303439e8),
+                static_cast<RealType>(6.66061403138355591915e9),
+                static_cast<RealType>(3.65687892725590813998e10),
+                static_cast<RealType>(1.06061776220305595494e11),
+                static_cast<RealType>(1.23930642673461465346e11),
+                static_cast<RealType>(1.49986408149520127078e10),
+                static_cast<RealType>(-6.17325587219357123900e8),
+            };
+            BOOST_MATH_STATIC const RealType Q[13] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(1.63111146753825227716e2),
+                static_cast<RealType>(1.27864461509685444043e4),
+                static_cast<RealType>(6.10371533241799228037e5),
+                static_cast<RealType>(1.92422115963507708309e7),
+                static_cast<RealType>(4.11544185502250709497e8),
+                static_cast<RealType>(5.95343302992055062258e9),
+                static_cast<RealType>(5.65615858889758369947e10),
+                static_cast<RealType>(3.30833154992293143503e11),
+                static_cast<RealType>(1.06032392136054207216e12),
+                static_cast<RealType>(1.50071282012095447931e12),
+                static_cast<RealType>(5.43552396263989180433e11),
+                static_cast<RealType>(9.57434915768660935004e10),
+            };
+
+            result = u * tools::evaluate_polynomial(P, u) / (tools::evaluate_polynomial(Q, u) * (p * p));
+        }
+        else if (u < 0.25) {
+            RealType t = u - static_cast <RealType>(0.125);
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.3770e-19
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(1.46698650748920243698e-2),
+                static_cast<RealType>(3.58380131788385557227e-1),
+                static_cast<RealType>(3.39153750029553194566e0),
+                static_cast<RealType>(1.55457424873957272207e1),
+                static_cast<RealType>(3.44403897039657057261e1),
+                static_cast<RealType>(3.01881531964962975320e1),
+                static_cast<RealType>(2.77679052294606319767e0),
+                static_cast<RealType>(-7.76665288232972435969e-2),
+            };
+            BOOST_MATH_STATIC const RealType Q[7] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(1.72584280323876188464e1),
+                static_cast<RealType>(1.11983518800147654866e2),
+                static_cast<RealType>(3.25969893054048132145e2),
+                static_cast<RealType>(3.91978809680672051666e2),
+                static_cast<RealType>(1.29874252720714897530e2),
+                static_cast<RealType>(2.08740114519610102248e1),
+            };
+
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+        }
+        else if (u < 0.5) {
+            RealType t = u - static_cast <RealType>(0.25);
+
+            // Rational Approximation
+            // Maximum Relative Error: 9.2445e-18
+            BOOST_MATH_STATIC const RealType P[8] = {
+                static_cast<RealType>(2.69627866689346445458e-2),
+                static_cast<RealType>(3.23091180507445216811e-1),
+                static_cast<RealType>(1.42164019533549860681e0),
+                static_cast<RealType>(2.74613170828120023406e0),
+                static_cast<RealType>(2.07865023346180997996e0),
+                static_cast<RealType>(2.53267176863740856907e-1),
+                static_cast<RealType>(-2.55816250186301841152e-2),
+                static_cast<RealType>(3.02683750470398342224e-3),
+            };
+            BOOST_MATH_STATIC const RealType Q[6] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(8.55049920135376003042e0),
+                static_cast<RealType>(2.48726119139047911316e1),
+                static_cast<RealType>(2.79519589592198994574e1),
+                static_cast<RealType>(9.88212916161823866098e0),
+                static_cast<RealType>(1.39749417956251951564e0),
+            };
+
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+        }
+        else {
+            RealType t = u - static_cast <RealType>(0.5);
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.2918e-20
+            BOOST_MATH_STATIC const RealType P[9] = {
+                static_cast<RealType>(4.79518653373241051274e-2),
+                static_cast<RealType>(3.81837125793765918564e-1),
+                static_cast<RealType>(1.13370353708146321188e0),
+                static_cast<RealType>(1.55218145762186846509e0),
+                static_cast<RealType>(9.60938271141036509605e-1),
+                static_cast<RealType>(2.11811755464425606950e-1),
+                static_cast<RealType>(8.84533960603915742831e-3),
+                static_cast<RealType>(1.73314614571009160225e-3),
+                static_cast<RealType>(-3.63491208733876986098e-5),
+            };
+            BOOST_MATH_STATIC const RealType Q[8] = {
+                static_cast<RealType>(1.),
+                static_cast<RealType>(6.36954463000253710936e0),
+                static_cast<RealType>(1.40601897306833147611e1),
+                static_cast<RealType>(1.33838075106916667084e1),
+                static_cast<RealType>(5.60958095533108032859e0),
+                static_cast<RealType>(1.11796035623375210182e0),
+                static_cast<RealType>(1.12508482637488861060e-1),
+                static_cast<RealType>(5.18503975949799718538e-3),
+            };
+
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+        }
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 2));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.2057e-18
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(8.02395484493329835881e-2),
+            static_cast<RealType>(2.46132933068351274622e-1),
+            static_cast<RealType>(2.81820176867119231101e-1),
+            static_cast<RealType>(1.47754061028371025893e-1),
+            static_cast<RealType>(3.54638964490281023406e-2),
+            static_cast<RealType>(3.99998730093393774294e-3),
+            static_cast<RealType>(3.81581928434827040262e-4),
+            static_cast<RealType>(1.82520920154354221101e-5),
+            static_cast<RealType>(-2.06151396745690348445e-7),
+            static_cast<RealType>(6.77986548138011345849e-9),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(2.39244329037830026691e0),
+            static_cast<RealType>(2.12683465416376620896e0),
+            static_cast<RealType>(9.02612272334554457823e-1),
+            static_cast<RealType>(2.06667959191488815314e-1),
+            static_cast<RealType>(2.79328968525257867541e-2),
+            static_cast<RealType>(2.28216286216537879937e-3),
+            static_cast<RealType>(1.04195690531437767679e-4),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.3944e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(1.39293493266195561875e-1),
+            static_cast<RealType>(1.26741380938661691592e-1),
+            static_cast<RealType>(4.31117040307200265931e-2),
+            static_cast<RealType>(7.50528269269498076949e-3),
+            static_cast<RealType>(8.63100497178570310436e-4),
+            static_cast<RealType>(6.75686286034521991703e-5),
+            static_cast<RealType>(3.11102625473120771882e-6),
+            static_cast<RealType>(9.63513655399980075083e-8),
+            static_cast<RealType>(-6.40223609013005302318e-11),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(8.11234548272888947555e-1),
+            static_cast<RealType>(2.63525516991753831892e-1),
+            static_cast<RealType>(4.77118226533147280522e-2),
+            static_cast<RealType>(5.46090741266888954909e-3),
+            static_cast<RealType>(4.15325425646862026425e-4),
+            static_cast<RealType>(2.02377681998442384863e-5),
+            static_cast<RealType>(5.79823311154876056655e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.1544e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(1.57911660613037760235e-1),
+            static_cast<RealType>(5.59740955695099219682e-2),
+            static_cast<RealType>(8.92895854008560399142e-3),
+            static_cast<RealType>(8.88795299273855801726e-4),
+            static_cast<RealType>(5.66358335596607738071e-5),
+            static_cast<RealType>(2.46733195253941569922e-6),
+            static_cast<RealType>(6.44829870181825872501e-8),
+            static_cast<RealType>(7.62193242864380357931e-10),
+            static_cast<RealType>(-7.82035413331699873450e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.49007782566002620811e-1),
+            static_cast<RealType>(5.65303702876260444572e-2),
+            static_cast<RealType>(5.54316442661801299351e-3),
+            static_cast<RealType>(3.58498995501703237922e-4),
+            static_cast<RealType>(1.53872913968336341278e-5),
+            static_cast<RealType>(4.08512152326482573624e-7),
+            static_cast<RealType>(4.72959615756470826429e-9),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.5877e-18
+        BOOST_MATH_STATIC const RealType P[10] = {
+            static_cast<RealType>(1.59150086070234563099e-1),
+            static_cast<RealType>(6.07144002506911115092e-2),
+            static_cast<RealType>(1.10026443723891740392e-2),
+            static_cast<RealType>(1.24892739209332398698e-3),
+            static_cast<RealType>(9.82922518655171276487e-5),
+            static_cast<RealType>(5.58366837526347222893e-6),
+            static_cast<RealType>(2.29005408647580194007e-7),
+            static_cast<RealType>(6.44325718317518336404e-9),
+            static_cast<RealType>(1.05110361316230054467e-10),
+            static_cast<RealType>(1.48083450629432857655e-18),
+        };
+        BOOST_MATH_STATIC const RealType Q[9] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(3.81470315977341203351e-1),
+            static_cast<RealType>(6.91330250512167919573e-2),
+            static_cast<RealType>(7.84712209182587717077e-3),
+            static_cast<RealType>(6.17595479676821181012e-4),
+            static_cast<RealType>(3.50829361179041199953e-5),
+            static_cast<RealType>(1.43889153071571504712e-6),
+            static_cast<RealType>(4.04840254888235877998e-8),
+            static_cast<RealType>(6.60429636407045050112e-10),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 8.7254e-17
+        BOOST_MATH_STATIC const RealType P[9] = {
+            static_cast<RealType>(1.59154943017783026201e-1),
+            static_cast<RealType>(6.91506515614472069475e-2),
+            static_cast<RealType>(1.44590186111155933843e-2),
+            static_cast<RealType>(1.92616138327724025421e-3),
+            static_cast<RealType>(1.79640147906775699469e-4),
+            static_cast<RealType>(1.30852535070639833809e-5),
+            static_cast<RealType>(5.55259657884038297268e-7),
+            static_cast<RealType>(3.50107118687544980820e-8),
+            static_cast<RealType>(-1.47102592933729597720e-22),
+        };
+        BOOST_MATH_STATIC const RealType Q[8] = {
+            static_cast<RealType>(1.),
+            static_cast<RealType>(4.34486357752330500669e-1),
+            static_cast<RealType>(9.08486933075320995164e-2),
+            static_cast<RealType>(1.21024289017243304241e-2),
+            static_cast<RealType>(1.12871233794777525784e-3),
+            static_cast<RealType>(8.22170725751776749123e-5),
+            static_cast<RealType>(3.48879932410650101194e-6),
+            static_cast<RealType>(2.19978790407451988423e-7),
+        };
+
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else {
+        result = 1 / (p * p * constants::two_pi<RealType>());
+    }
+
+    return result;
+}
+
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_quantile_upper_imp_prec(const RealType& p, const boost::math::integral_constant<int, 113>&)
+{
+    BOOST_MATH_STD_USING
+    RealType result;
+
+    if (ilogb(p) >= -2) {
+        RealType u = -log2(ldexp(p, 1));
+
+        if (u < 0.125) {
+            // Rational Approximation
+            // Maximum Relative Error: 2.5675e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[31] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36099130643975133156293056139850872219e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.03940482189350763127508703926866548690e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00518276893354880480781640750482315271e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.55844903094077096941027360107304259099e6),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04507684135310729583474324660276395831e9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28519957085041757616278379578781441623e11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26054173986187219679917530171252145632e13),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00693075272502479915569708465960917906e15),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.64153695410984136395853200311209462775e16),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.64993034609287363745840801813540992383e18),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68080300629977787949474098413155901197e20),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.50632142671665246974634799849090331338e21),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11943753054362349397013211631038480307e23),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.80601829873419334580289886671478701625e24),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33441650581633426542372642262736818512e26),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.56279427934163518272441555879970370340e27),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.08899113985387092689705022477814364717e28),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.37750989391907347952902900750138805007e29),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.76961267256299304213687639380275530721e30),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.98417586455955659885944915688130612888e31),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.40932923796679251232655132670811114351e32),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.80810239916688876216017180714744912573e33),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.23907429566810200929293428832485038147e33),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11441754640405256305951569489818422227e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.30534222360394829628175800718529342304e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.73301799323855143458670230536670073483e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.53142592196246595846485130434777396548e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81719621726393542967303806360105998384e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00188544550531824809437206713326495544e33),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62706943144847786115732327787879709587e32),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32129438774563059735783287456769609571e31),
+            };
+            BOOST_MATH_STATIC const RealType Q[32] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.65910866673514847742559406762379054364e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21954860438789969160116317316418373146e5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.85684385746348850219351196129081986508e7),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.76131116920014625994371306210585646224e9),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.57402411617965582839975369786525269977e11),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.42213951996062253608905591667405322835e13),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.55477693883842522631954327528060778834e15),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.00397907346473927493255003955380711046e17),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76305959503723486331556274939198109922e19),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.27926540483498824808520492399128682366e21),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.98253913105291675445666919447864520248e22),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.63457445658532249936389003141915626894e24),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.51446616633910582673057455450707805902e25),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04744823698010333311911891992022528040e27),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.03400927415310540137351756981742318263e28),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.28761940359662123632247441327784689568e29),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.39016138777648624292953560568071708327e30),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79639567867465767764785448609833337532e31),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.23406781975678544311073661662680006588e32),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.97261483656310352862554580475760827374e33),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.62715040832592600542933595577003951697e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.77359945057399130202830211722221279906e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07842295432910751940058270741081867701e35),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.51739306780247334064265249344359460675e35),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.60574331076505049588401700048488577194e35),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.08286808700840316336961663635580879141e35),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.27661033115008662284071342245200272702e35),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00465576791024249023365007797010262700e35),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83311248273885136105510175099322638440e34),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96635220211386288597285960837372073054e33),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23849744128418288892902205619933047730e32),
+            };
+            // LCOV_EXCL_STOP
+            result = u * tools::evaluate_polynomial(P, u) / (tools::evaluate_polynomial(Q, u) * (p * p));
+        }
+        else if (u < 0.25) {
+            RealType t = u - static_cast <RealType>(0.125);
+
+            // Rational Approximation
+            // Maximum Relative Error: 9.0663e-36
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.46698650748920243663487731226111319705e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.39021286045890143123252180276484388346e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21933242816562043224009451007344301143e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33741547463966207206741888477702151242e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.29556944160837955334643715180923663741e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.25261081330476435844217173674285740857e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28690563577245995896389783271544510833e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.51764495004238264050843085122188741180e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.00501773552098137637598813101153206656e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.93991776883375928647775429233323885440e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.13059418708769178567954713937745050279e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.41565791250614170744069436181282300453e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.35838723365672196069179944509778281549e1),
+            };
+            BOOST_MATH_STATIC const RealType Q[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.63888803456697300467924455320638435538e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.74785179836182339383932806919167693991e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.15133301804008879476562749311747788645e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87361675398393057971764841741518474061e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.02992617475892211368309739891693879676e5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36356854400440662641546588001882412251e5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.35807552915245783626759227539698719908e5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75959389290929178190646034566377062463e5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18514088996371641206828142820042918681e5),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54881978220293930450469794941944831047e4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83958740186543542804045767758191509433e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26637084978098507405883170227585648985e2),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+        }
+        else if (u < 0.5) {
+            RealType t = u - static_cast <RealType>(0.25);
+
+            // Rational Approximation
+            // Maximum Relative Error: 7.1265e-35
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[14] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.69627866689346442965083437425920959525e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.28948812330446670380449765578224539665e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.38832694133021352110245148952631526683e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.70206624753427831733487031852769976576e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.34677850226082773550206949299306677736e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.18657422004942861459539366963056149110e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.90933843076824719761937043667767333536e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.78597771586582252472927601403235921029e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76489020985978559079198751910122765603e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.37662018494780327201390375334403954354e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11303058491765900888068268844399186476e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.38147649159947518976483710606042789880e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.81260575060831053615857196033574207714e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, -1.26783311530618626413866321968979725353e-3),
+            };
+            BOOST_MATH_STATIC const RealType Q[13] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.98941943311823528497840052715295329781e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70142252619301982454969690308614487433e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.17472255695869018956165466705137979540e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.42016169942136311355803413981032780219e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.55874385736597452997483327962434131932e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45782883079400958761816030672202996788e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.05272877129840019671123017296056938361e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.79833037593794381103412381177370862105e3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.67388248713896792948592889733513376054e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.19952164110429183557842014635391021832e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.43813483967503071358907030110791934870e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.21327682641358836049127780506729428797e-1),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+        }
+        else {
+            RealType t = u - static_cast <RealType>(0.5);
+
+            // Rational Approximation
+            // Maximum Relative Error: 2.7048e-37
+            // LCOV_EXCL_START
+            BOOST_MATH_STATIC const RealType P[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.79518653373241051262822702930040975338e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.62230291299220868262265687829866364204e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.87315544620612697712513318458226575394e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.38993950875334507399211313740958438201e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54257654902026056547861805085572437922e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85673656862223617197701693270067722169e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47842193222521213922734312546590337064e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.76640627287007744941009407221495229316e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.71884893887802925773271837595143776207e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.87432154629995817972739015224205530101e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.44664933176248007092868241686074743562e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.32094739938150047092982705610586287965e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.18537678581395571564129512698022192316e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.99365265557355974918712592061740510276e-4),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.66467016868206844419002547523627548705e-6),
+            };
+            BOOST_MATH_STATIC const RealType Q[15] = {
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01315080955831561204744043759079263546e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.43409077070585581955481063438385546913e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09863540097812452102765922256432103612e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.69971336507400724019217277303598318934e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.71444880426858110981683485927452024652e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15252748520663939799185721687082682973e2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.28399989835264172624148638350889215004e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.73464700365199500083227290575797895127e1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.40421770918884020099427978511354197438e0),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.97023025282119988988976542004620759235e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38774609088015115009880504176630591783e-1),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.52748138528630655371589047000668876440e-2),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13088455793478303045390386135591069087e-3),
+                BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.18220605549460262119565543089703387122e-5),
+            };
+            // LCOV_EXCL_STOP
+            result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+        }
+    }
+    else if (ilogb(p) >= -4) {
+        RealType t = -log2(ldexp(p, 2));
+
+        // Rational Approximation
+        // Maximum Relative Error: 3.8969e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.02395484493329839255216366819344305871e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.02703992140456336967688958960484716694e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.38779662796374026809611637926067177436e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.22326903547451397450399124548020897393e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.29321119874906326000117036864856138032e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60045794013093831332658415095234082115e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.75863216252160126657107771372004587438e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.65658718311497180532644775193008407069e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.53225259384404343896446164609240157391e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17876243295156782920260122855798305258e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59647007234516896762020830535717539733e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64519789656979327339865975091579252352e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29566724776730544346201080459027524931e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.40979492647851412567441418477263395917e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78894057948338305679452471174923939381e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.97064244496171921075006182915678263370e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13496588267213644899739513941375650458e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.75224691413667093006312591320754720811e-14),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.59000688626663121310675150262772434285e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37518060227321498297232252379976917550e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.96559443266702775026538144474892076437e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.81865210018244220041408788510705356696e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15188291931842064325756652570456168425e1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.16909307081950035111952362482113369939e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.68454509269150307761046136063890222011e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.06391236761753712424925832120306727169e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.35744804731044427608283991933125506859e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00655928177646208520006978937806043639e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04093230988242553633939757013466501271e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.07921031269974885975846184199640060403e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.61356596082773699708092475561216104426e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.83968520269928804453766899533464507543e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.44620973323561344735660659502096499899e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.84398925760354259350870730551452956164e-11),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -8) {
+        RealType t = -log2(ldexp(p, 4));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.0176e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.39293493266195566603513288406748830312e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.75724665658983779947977436518056682748e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.42437549740894393207094008058345312893e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.26189619865771499663660627120168211026e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.38952430871711360962228087792821341859e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.09604487371653920602809626594722822237e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06215021409396534038209460967790566899e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.02245531075243838209245241246011523536e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.52822482024384335373072062232322682354e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.32527687997718638700761890588399465467e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.54799997015944073019842889902521208940e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59368565314052950335981455903474908073e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.09459594346367728583560281313278117879e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.30296867679720593932307487485758431355e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04594079707862644415224596859620253913e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40274507498190913768918372242285652373e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.48644117815971872777609922455371868747e-16),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88079839671202113888025645668230104601e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58898753182105924446845274197682915131e0),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.05418719178760837974322764299800701708e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.76439568495464423890950166804368135632e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.87661284201828717694596419805804620767e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29462021166220769918154388930589492957e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.89960014717788045459266868996575581278e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.21759236630028632465777310665839652757e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.08884467282860764261728614542418632608e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60098870889198704716300891829788260654e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.00120123451682223443624210304146589040e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.08868117923724451329261971335574401646e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.07346130275947166224129347124306950150e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.57848230665832873347797099944091265220e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.50841502849442327828534131901583916707e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.19165038770000448560339443014882434202e-15),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -16) {
+        RealType t = -log2(ldexp(p, 8));
+
+        // Rational Approximation
+        // Maximum Relative Error: 4.1682e-36
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.57911660613037766795694241662819364797e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.28799302413396670477035614399187456630e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.87488304496324715063356722168914018093e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.15106082041721012436439208357739139578e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91744691940169259573871742836817806248e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.40707390548486625606656777332664791183e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.37047148097688601398129659532643297674e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88039545021930711122085375901243257574e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22254460725736448552173288004145978774e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.58462349007293730244197837509157696852e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.95242372547984999431208546685672497090e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10113734998651793201123616276573169622e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.38963677413425618019569452771868834246e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.45242599273032563942546507899265865936e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.64855118157117311049698715635863670233e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.31679318790012894619592273346600264199e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.97289727214495789126072009268721022605e-20),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.10184661848812835285809771940181522329e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.06179300560230499194426573196970342618e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.23171547302923911058112454487643162794e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.20486436116678834807354529081908850425e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.51239574861351183874145649960640500707e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48939385253081273966380467344920741615e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18148716720470800170115047757600735127e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.68156131480770927662478944117713742978e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.13720275846166334505537351224097058812e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.85505701632948614345319635028225905820e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.91876669388212587242659571229471930880e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.12971661051277278610784329698988278013e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.31096179726750865531615367639563072055e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.03579138802970748888093188937926461893e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.45570688568663643410924100311054014175e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.23959804461200982866930072222355142173e-19),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -32) {
+        RealType t = -log2(ldexp(p, 16));
+
+        // Rational Approximation
+        // Maximum Relative Error: 6.2158e-37
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59150086070234561732507586188017224084e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.80849532387385837583114307010320459997e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.41158479406270598752210344238285334672e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88824037165656723581890282427897772492e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.82912940787568736176030025420621547622e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.36469458704261637785603215754389736108e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.13801486421774537025334682673091205328e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.97058432407176502984043208925327069250e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.60823277541385163663463406307766614689e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.45016369260792040947272022706860047646e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.54846457278644736871929319230398689553e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.67291749890916930953794688556299297735e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.18742803398417392282841454979723852423e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.13337431668170547244474715030235433597e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.37782648734897338547414800391203459036e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.17863064141234633971470839644872485483e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.58768205048500915346781559321978174829e-24),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.27782279546086824129750042200649907991e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.86934772625607907724733810228981095894e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.18640923531164938140838239032346416143e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14927915778694317602192656254187608215e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.57462121236985574785071163024761935943e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 5.11326475640883361512750692176665937785e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.49479333407835032831192117009600622344e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.01048164044583907219965175201239136609e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.42444147056333448589159611785359705792e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.72928365136507710372724683325279209464e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.30776323450676114149657959931149982200e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.51599272091669693373558919762006698549e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.12120236145539526122748260176385899774e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.65713807525694136400636427188839379484e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.40555520515542383952495965093730818381e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.51084407433793180162386990118245623958e-23),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -64) {
+        RealType t = -log2(ldexp(p, 32));
+
+        // Rational Approximation
+        // Maximum Relative Error: 9.8515e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59154943017783040087729009335921759322e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.35955784629344586058432079844665517425e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.24333525582177610783141409282489279582e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.58257137499954581519132407255793210808e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47191495695958634792434622715063010854e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06408464185207904662485396901099847317e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.20796977470988464880970001894205834196e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.99451680244976178843047944033382023574e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.21331607817814211329055723244764031561e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.16997758215752306644496702331954449485e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.22151810180865778439184946086488092970e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.05017329554372903197056366604190738772e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.45919279055502465343977575104142733356e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.14611865933281087898817644094411667861e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.66574579315129285098834562564888533591e-19),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.90098275536617376789480602467351545227e-21),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.56200324658873566425094389271790730206e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.35526648761411463124801128103381691418e-26),
+        };
+        BOOST_MATH_STATIC const RealType Q[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.99582804063194774835771688139366152937e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.81210581320456331960539046132284190053e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.94358920922810097599951120081974275145e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.24831443209858422294319043037419780210e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.68584098673893150929178892200446909375e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.90058244779420124535106788512940199547e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.88151039746201934320258158884886191886e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.62348975553160355852344937226490493460e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.62007418751593938350474825754731470453e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.67502458979132962529935588245058477825e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.91648040348401277706598232576212305626e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.05843052379331618504561151714467880641e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.20127592059771206959014911028588129920e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.04661894930286305556240859086772458465e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.19442269177165740287568170417649762849e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.81435584873372180820418114652670864136e-23),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.62145023253666168339801687459484937001e-25),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else if (ilogb(p) >= -128) {
+        RealType t = -log2(ldexp(p, 64));
+
+        // Rational Approximation
+        // Maximum Relative Error: 2.2157e-35
+        // LCOV_EXCL_START
+        BOOST_MATH_STATIC const RealType P[18] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.59154943091895335751628149866310390641e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.91164927854420277537616294413463565970e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47557801928232619499125670863084398577e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.06172621625221091203249391660455847328e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.11720157411653968975956625234656001375e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.70086412127379161257840749700428137407e-5),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11069186177775505692019195793079552937e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.04581765901792649215653828121992908775e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.78996797234624395264657873201296117159e-9),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.10365978021268853654282661591051834468e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.76744621013787434243259445839624450867e-12),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.11110170303355425599446515240949433934e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.83669090335022069229153919882930282425e-15),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.09633460833089193733622172621696983652e-17),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.16200852052266861122422190933586966917e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.47795810090424252745150042033544310609e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.35722092370326505616747155207965300634e-22),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 8.98381676423023212724768510437325359364e-51),
+        };
+        BOOST_MATH_STATIC const RealType Q[17] = {
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 4.34271731953273239691423485699928257808e-1),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.27133013035186849140772481980360839559e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.29542078693828543560388747333519393752e-2),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.33027698228265344561650492600955601983e-3),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.06868444562964057795387778972002636261e-4),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.97868278672593071151212650783507879919e-6),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.79869926850283188785885503049178903204e-7),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.75298857713475428388051708713106549590e-8),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.93449891515741631942400181171061740767e-10),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 2.36715626731277089044713008494971829270e-11),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 6.98125789528264426960496891930942311971e-13),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.78234546049400950544724588355539821858e-14),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.83044000387150792693434128054414524740e-16),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 7.30111486296552039483196431122555524886e-18),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 9.28628462422858135083238952377446358986e-20),
+            BOOST_MATH_BIG_CONSTANT(RealType, 113, 1.48108558735886480298604270981393793162e-21),
+        };
+        // LCOV_EXCL_STOP
+        result = tools::evaluate_polynomial(P, t) / (tools::evaluate_polynomial(Q, t) * (p * p));
+    }
+    else {
+        result = 1 / (p * p * constants::two_pi<RealType>());
+    }
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 53>& tag)
+{
+    if (p > 0.5) {
+        return !complement ? saspoint5_quantile_upper_imp_prec(1 - p, tag) : -saspoint5_quantile_upper_imp_prec(1 - p, tag);
+    }
+
+    return complement ? saspoint5_quantile_upper_imp_prec(p, tag) : -saspoint5_quantile_upper_imp_prec(p, tag);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_quantile_imp_prec(const RealType& p, bool complement, const boost::math::integral_constant<int, 113>& tag)
+{
+    if (p > 0.5) {
+        return !complement ? saspoint5_quantile_upper_imp_prec(1 - p, tag) : -saspoint5_quantile_upper_imp_prec(1 - p, tag);
+    }
+
+    return complement ? saspoint5_quantile_upper_imp_prec(p, tag) : -saspoint5_quantile_upper_imp_prec(p, tag);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_quantile_imp(const saspoint5_distribution<RealType, Policy>& dist, const RealType& p, bool complement)
+{
+    // This routine implements the quantile for the Saspoint5 distribution,
+    // the value p may be the probability, or its complement if complement=true.
+
+    constexpr auto function = "boost::math::quantile(saspoint5<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+    RealType location = dist.location();
+
+    if (false == detail::check_location(function, location, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+    if (false == detail::check_probability(function, p, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The SaS point5 distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = location + scale * saspoint5_quantile_imp_prec(p, complement, tag_type());
+
+    return result;
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_entropy_imp_prec(const boost::math::integral_constant<int, 53>&)
+{
+    return static_cast<RealType>(3.63992444568030649573);
+}
+
+template <class RealType>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_entropy_imp_prec(const boost::math::integral_constant<int, 113>&)
+{
+    return BOOST_MATH_BIG_CONSTANT(RealType, 113, 3.6399244456803064957308496039071853510);
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType saspoint5_entropy_imp(const saspoint5_distribution<RealType, Policy>& dist)
+{
+    // This implements the entropy for the Saspoint5 distribution,
+
+    constexpr auto function = "boost::math::entropy(saspoint5<%1%>&, %1%)";
+    BOOST_MATH_STD_USING // for ADL of std functions
+
+    RealType result = 0;
+    RealType scale = dist.scale();
+
+    if (false == detail::check_scale(function, scale, &result, Policy()))
+    {
+        return result;
+    }
+
+    typedef typename tools::promote_args<RealType>::type result_type;
+    typedef typename policies::precision<result_type, Policy>::type precision_type;
+    typedef boost::math::integral_constant<int,
+        precision_type::value <= 0 ? 0 :
+        precision_type::value <= 53 ? 53 :
+        precision_type::value <= 113 ? 113 : 0
+    > tag_type;
+
+    static_assert(tag_type::value, "The SaS point5 distribution is only implemented for types with known precision, and 113 bits or fewer in the mantissa (ie 128 bit quad-floats");
+
+    result = saspoint5_entropy_imp_prec<RealType>(tag_type()) + log(scale);
+
+    return result;
+}
+
+} // detail
+
+template <class RealType = double, class Policy = policies::policy<> >
+class saspoint5_distribution
+{
+    public:
+    typedef RealType value_type;
+    typedef Policy policy_type;
+
+    BOOST_MATH_GPU_ENABLED saspoint5_distribution(RealType l_location = 0, RealType l_scale = 1)
+        : mu(l_location), c(l_scale)
+    {
+        constexpr auto function = "boost::math::saspoint5_distribution<%1%>::saspoint5_distribution";
+        RealType result = 0;
+        detail::check_location(function, l_location, &result, Policy());
+        detail::check_scale(function, l_scale, &result, Policy());
+    } // saspoint5_distribution
+
+    BOOST_MATH_GPU_ENABLED RealType location()const
+    {
+        return mu;
+    }
+    BOOST_MATH_GPU_ENABLED RealType scale()const
+    {
+        return c;
+    }
+
+    private:
+    RealType mu;    // The location parameter.
+    RealType c;     // The scale parameter.
+};
+
+typedef saspoint5_distribution<double> saspoint5;
+
+#ifdef __cpp_deduction_guides
+template <class RealType>
+saspoint5_distribution(RealType) -> saspoint5_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+template <class RealType>
+saspoint5_distribution(RealType, RealType) -> saspoint5_distribution<typename boost::math::tools::promote_args<RealType>::type>;
+#endif
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const saspoint5_distribution<RealType, Policy>&)
+{ // Range of permissible values for random variable x.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const saspoint5_distribution<RealType, Policy>&)
+{ // Range of supported values for random variable x.
+   // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
+    BOOST_MATH_IF_CONSTEXPR (boost::math::numeric_limits<RealType>::has_infinity)
+    {
+        return boost::math::pair<RealType, RealType>(-boost::math::numeric_limits<RealType>::infinity(), boost::math::numeric_limits<RealType>::infinity()); // - to + infinity.
+    }
+    else
+    { // Can only use max_value.
+        using boost::math::tools::max_value;
+        return boost::math::pair<RealType, RealType>(-tools::max_value<RealType>(), max_value<RealType>()); // - to + max.
+    }
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const saspoint5_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::saspoint5_pdf_imp(dist, x);
+} // pdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const saspoint5_distribution<RealType, Policy>& dist, const RealType& x)
+{
+    return detail::saspoint5_cdf_imp(dist, x, false);
+} // cdf
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const saspoint5_distribution<RealType, Policy>& dist, const RealType& p)
+{
+    return detail::saspoint5_quantile_imp(dist, p, false);
+} // quantile
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<saspoint5_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::saspoint5_cdf_imp(c.dist, c.param, true);
+} //  cdf complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<saspoint5_distribution<RealType, Policy>, RealType>& c)
+{
+    return detail::saspoint5_quantile_imp(c.dist, c.param, true);
+} // quantile complement
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mean(const saspoint5_distribution<RealType, Policy> &dist)
+{
+    // There is no mean:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The SaS point5 Distribution has no mean");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::mean(saspoint5<%1%>&)",
+        "The SaS point5 distribution does not have a mean: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType variance(const saspoint5_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no variance:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The SaS point5 Distribution has no variance");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::variance(saspoint5<%1%>&)",
+        "The SaS point5 distribution does not have a variance: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType mode(const saspoint5_distribution<RealType, Policy>& dist)
+{
+    return dist.location();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType median(const saspoint5_distribution<RealType, Policy>& dist)
+{
+    return dist.location();
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const saspoint5_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no skewness:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The SaS point5 Distribution has no skewness");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::skewness(saspoint5<%1%>&)",
+        "The SaS point5 distribution does not have a skewness: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy()); // infinity?
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const saspoint5_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The SaS point5 Distribution has no kurtosis");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis(saspoint5<%1%>&)",
+        "The SaS point5 distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const saspoint5_distribution<RealType, Policy>& /*dist*/)
+{
+    // There is no kurtosis excess:
+    typedef typename Policy::assert_undefined_type assert_type;
+    static_assert(assert_type::value == 0, "The SaS point5 Distribution has no kurtosis excess");
+
+    return policies::raise_domain_error<RealType>(
+        "boost::math::kurtosis_excess(saspoint5<%1%>&)",
+        "The SaS point5 distribution does not have a kurtosis: "
+        "the only possible return value is %1%.",
+        boost::math::numeric_limits<RealType>::quiet_NaN(), Policy());
+}
+
+template <class RealType, class Policy>
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const saspoint5_distribution<RealType, Policy>& dist)
+{
+    return detail::saspoint5_entropy_imp(dist);
+}
+
+}} // namespaces
+
+
+#endif // BOOST_STATS_SASPOINT5_HPP
diff --git a/inst/include/boost/math/distributions/skew_normal.hpp b/inst/include/boost/math/distributions/skew_normal.hpp
index 0f0ffea8a..7df81b6f5 100644
--- a/inst/include/boost/math/distributions/skew_normal.hpp
+++ b/inst/include/boost/math/distributions/skew_normal.hpp
@@ -27,6 +27,10 @@
 #include <utility>
 #include <algorithm> // std::lower_bound, std::distance
 
+#ifdef BOOST_MATH_INSTRUMENT_SKEW_NORMAL_ITERATIONS
+extern std::uintmax_t global_iter_count;
+#endif
+
 namespace boost{ namespace math{
 
   namespace detail
@@ -561,12 +565,17 @@ namespace boost{ namespace math{
     }
 
     const int get_digits = policies::digits<RealType, Policy>();// get digits from policy,
-    std::uintmax_t m = policies::get_max_root_iterations<Policy>(); // and max iterations.
+    std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>(); // and max iterations.
 
     skew_normal_distribution<RealType, Policy> helper(0, 1, shape);
 
     result = tools::newton_raphson_iterate(detail::skew_normal_mode_functor<RealType, Policy>(helper), result,
-      search_min, search_max, get_digits, m);
+      search_min, search_max, get_digits, max_iter);
+    if (max_iter >= policies::get_max_root_iterations<Policy>())
+    {
+       return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:" // LCOV_EXCL_LINE
+          " either there is no answer to quantile or the answer is infinite.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
+    }
 
     result = result*scale + location;
 
@@ -609,32 +618,6 @@ namespace boost{ namespace math{
     return factor * y*y / (x*x);
   }
 
-  namespace detail
-  {
-
-    template <class RealType, class Policy>
-    struct skew_normal_quantile_functor
-    {
-      skew_normal_quantile_functor(const boost::math::skew_normal_distribution<RealType, Policy> dist, RealType const& p)
-        : distribution(dist), prob(p)
-      {
-      }
-
-      boost::math::tuple<RealType, RealType> operator()(RealType const& x)
-      {
-        RealType c = cdf(distribution, x);
-        RealType fx = c - prob;  // Difference cdf - value - to minimize.
-        RealType dx = pdf(distribution, x); // pdf is 1st derivative.
-        // return both function evaluation difference f(x) and 1st derivative f'(x).
-        return boost::math::make_tuple(fx, dx);
-      }
-    private:
-      const boost::math::skew_normal_distribution<RealType, Policy> distribution;
-      RealType prob;
-    };
-
-  } // namespace detail
-
   template <class RealType, class Policy>
   inline RealType quantile(const skew_normal_distribution<RealType, Policy>& dist, const RealType& p)
   {
@@ -676,14 +659,63 @@ namespace boost{ namespace math{
 
     // refine the result by numerically searching the root of (p-cdf)
 
-    const RealType search_min = support(dist).first;
-    const RealType search_max = support(dist).second;
-
     const int get_digits = policies::digits<RealType, Policy>();// get digits from policy,
-    std::uintmax_t m = policies::get_max_root_iterations<Policy>(); // and max iterations.
+    std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>(); // and max iterations.
+
+    if (result == 0)
+       result = tools::min_value<RealType>(); // we need to be one side of zero or the other for the root finder to work.
+
+    auto fun = [&, dist, p](const RealType& x)->RealType { return cdf(dist, x) - p; };
+
+    RealType f_result = fun(result);
+
+    if (f_result == 0)
+       return result;
+
+    if (f_result * result > 0)
+    {
+       // If the root is in the direction of zero, we need to check that we're the correct side of it:
+       RealType f_zero = fun(static_cast<RealType>(0));
+       if (f_zero * f_result > 0)
+       {
+          // we're the wrong side of zero:
+          result = -result;
+          f_result = fun(result);
+       }
+    }
+
+    RealType scaling_factor = 1.25;
+    if (f_result * result > 0)
+    {
+       // We're heading towards zero... it's a long way down so use a larger scaling factor:
+       scaling_factor = 16;
+    }
+
+    auto p_result = tools::bracket_and_solve_root(fun, result, scaling_factor, true, tools::eps_tolerance<RealType>(get_digits), max_iter, Policy());
+
+#ifdef BOOST_MATH_INSTRUMENT_SKEW_NORMAL_ITERATIONS
+    global_iter_count += max_iter;
+#endif
+
+    result = (p_result.first + p_result.second) / 2;
+
+    //
+    // Try one last Newton step, just to close up the interval:
+    //
+    RealType step = fun(result) / pdf(dist, result);
+
+    if (result - step <= p_result.first)
+       result = p_result.first;
+    else if (result - step >= p_result.second)
+       result = p_result.second;
+    else
+       result -= step;
 
-    result = tools::newton_raphson_iterate(detail::skew_normal_quantile_functor<RealType, Policy>(dist, p), result,
-      search_min, search_max, get_digits, m);
+    if (max_iter >= policies::get_max_root_iterations<Policy>())
+    {
+       return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time: either there is no answer to quantile" // LCOV_EXCL_LINE
+          " or the answer is infinite.  Current best guess is %1%", result, Policy());  // LCOV_EXCL_LINE
+    }
 
     return result;
   } // quantile
diff --git a/inst/include/boost/math/distributions/students_t.hpp b/inst/include/boost/math/distributions/students_t.hpp
index 321c4751b..39f20d6e4 100644
--- a/inst/include/boost/math/distributions/students_t.hpp
+++ b/inst/include/boost/math/distributions/students_t.hpp
@@ -1,7 +1,7 @@
 //  Copyright John Maddock 2006.
 //  Copyright Paul A. Bristow 2006, 2012, 2017.
 //  Copyright Thomas Mang 2012.
-
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -12,14 +12,17 @@
 // http://en.wikipedia.org/wiki/Student%27s_t_distribution
 // http://www.itl.nist.gov/div898/handbook/eda/section3/eda3664.htm
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/beta.hpp> // for ibeta(a, b, x).
 #include <boost/math/special_functions/digamma.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/normal.hpp> 
-
-#include <utility>
+#include <boost/math/policies/policy.hpp>
 
 #ifdef _MSC_VER
 # pragma warning(push)
@@ -35,20 +38,20 @@ class students_t_distribution
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   students_t_distribution(RealType df) : df_(df)
+   BOOST_MATH_GPU_ENABLED students_t_distribution(RealType df) : df_(df)
    { // Constructor.
       RealType result;
       detail::check_df_gt0_to_inf( // Checks that df > 0 or df == inf.
          "boost::math::students_t_distribution<%1%>::students_t_distribution", df_, &result, Policy());
    } // students_t_distribution
 
-   RealType degrees_of_freedom()const
+   BOOST_MATH_GPU_ENABLED RealType degrees_of_freedom()const
    {
       return df_;
    }
 
    // Parameter estimation:
-   static RealType find_degrees_of_freedom(
+   BOOST_MATH_GPU_ENABLED static RealType find_degrees_of_freedom(
       RealType difference_from_mean,
       RealType alpha,
       RealType beta,
@@ -68,26 +71,26 @@ students_t_distribution(RealType)->students_t_distribution<typename boost::math:
 #endif
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> range(const students_t_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const students_t_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
   // Now including infinity.
    using boost::math::tools::max_value;
-   //return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>());
-   return std::pair<RealType, RealType>(((::std::numeric_limits<RealType>::is_specialized & ::std::numeric_limits<RealType>::has_infinity) ? -std::numeric_limits<RealType>::infinity() : -max_value<RealType>()), ((::std::numeric_limits<RealType>::is_specialized & ::std::numeric_limits<RealType>::has_infinity) ? +std::numeric_limits<RealType>::infinity() : +max_value<RealType>()));
+   //return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(((::boost::math::numeric_limits<RealType>::is_specialized & ::boost::math::numeric_limits<RealType>::has_infinity) ? -boost::math::numeric_limits<RealType>::infinity() : -max_value<RealType>()), ((::boost::math::numeric_limits<RealType>::is_specialized & ::boost::math::numeric_limits<RealType>::has_infinity) ? +boost::math::numeric_limits<RealType>::infinity() : +max_value<RealType>()));
 }
 
 template <class RealType, class Policy>
-inline const std::pair<RealType, RealType> support(const students_t_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const students_t_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
   // Now including infinity.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
-   //return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>());
-   return std::pair<RealType, RealType>(((::std::numeric_limits<RealType>::is_specialized & ::std::numeric_limits<RealType>::has_infinity) ? -std::numeric_limits<RealType>::infinity() : -max_value<RealType>()), ((::std::numeric_limits<RealType>::is_specialized & ::std::numeric_limits<RealType>::has_infinity) ? +std::numeric_limits<RealType>::infinity() : +max_value<RealType>()));
+   //return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(((::boost::math::numeric_limits<RealType>::is_specialized & ::boost::math::numeric_limits<RealType>::has_infinity) ? -boost::math::numeric_limits<RealType>::infinity() : -max_value<RealType>()), ((::boost::math::numeric_limits<RealType>::is_specialized & ::boost::math::numeric_limits<RealType>::has_infinity) ? +boost::math::numeric_limits<RealType>::infinity() : +max_value<RealType>()));
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const students_t_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const students_t_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_FPU_EXCEPTION_GUARD
    BOOST_MATH_STD_USING  // for ADL of std functions.
@@ -135,7 +138,7 @@ inline RealType pdf(const students_t_distribution<RealType, Policy>& dist, const
 } // pdf
 
 template <class RealType, class Policy>
-inline RealType cdf(const students_t_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const students_t_distribution<RealType, Policy>& dist, const RealType& x)
 {
    RealType error_result;
    // degrees_of_freedom > 0 or infinity check:
@@ -209,7 +212,7 @@ inline RealType cdf(const students_t_distribution<RealType, Policy>& dist, const
 } // cdf
 
 template <class RealType, class Policy>
-inline RealType quantile(const students_t_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const students_t_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING // for ADL of std functions
    //
@@ -218,7 +221,7 @@ inline RealType quantile(const students_t_distribution<RealType, Policy>& dist,
  
    // Check for domain errors:
    RealType df = dist.degrees_of_freedom();
-   static const char* function = "boost::math::quantile(const students_t_distribution<%1%>&, %1%)";
+   constexpr auto function = "boost::math::quantile(const students_t_distribution<%1%>&, %1%)";
    RealType error_result;
    if(false == (detail::check_df_gt0_to_inf( // Check that df > 0 or == +infinity.
       function, df, &error_result, Policy())
@@ -263,13 +266,13 @@ inline RealType quantile(const students_t_distribution<RealType, Policy>& dist,
 } // quantile
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<students_t_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<students_t_distribution<RealType, Policy>, RealType>& c)
 {
    return cdf(c.dist, -c.param);
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<students_t_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<students_t_distribution<RealType, Policy>, RealType>& c)
 {
    return -quantile(c.dist, c.param);
 }
@@ -284,10 +287,10 @@ namespace detail{
 template <class RealType, class Policy>
 struct sample_size_func
 {
-   sample_size_func(RealType a, RealType b, RealType s, RealType d)
+   BOOST_MATH_GPU_ENABLED sample_size_func(RealType a, RealType b, RealType s, RealType d)
       : alpha(a), beta(b), ratio(s*s/(d*d)) {}
 
-   RealType operator()(const RealType& df)
+   BOOST_MATH_GPU_ENABLED RealType operator()(const RealType& df)
    {
       if(df <= tools::min_value<RealType>())
       { // 
@@ -308,14 +311,14 @@ struct sample_size_func
 }  // namespace detail
 
 template <class RealType, class Policy>
-RealType students_t_distribution<RealType, Policy>::find_degrees_of_freedom(
+BOOST_MATH_GPU_ENABLED RealType students_t_distribution<RealType, Policy>::find_degrees_of_freedom(
       RealType difference_from_mean,
       RealType alpha,
       RealType beta,
       RealType sd,
       RealType hint)
 {
-   static const char* function = "boost::math::students_t_distribution<%1%>::find_degrees_of_freedom";
+   constexpr auto function = "boost::math::students_t_distribution<%1%>::find_degrees_of_freedom";
    //
    // Check for domain errors:
    //
@@ -330,27 +333,26 @@ RealType students_t_distribution<RealType, Policy>::find_degrees_of_freedom(
 
    detail::sample_size_func<RealType, Policy> f(alpha, beta, sd, difference_from_mean);
    tools::eps_tolerance<RealType> tol(policies::digits<RealType, Policy>());
-   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
-   std::pair<RealType, RealType> r = tools::bracket_and_solve_root(f, hint, RealType(2), false, tol, max_iter, Policy());
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   boost::math::pair<RealType, RealType> r = tools::bracket_and_solve_root(f, hint, RealType(2), false, tol, max_iter, Policy());
    RealType result = r.first + (r.second - r.first) / 2;
    if(max_iter >= policies::get_max_root_iterations<Policy>())
    {
-      return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time:"
-         " either there is no answer to how many degrees of freedom are required"
-         " or the answer is infinite.  Current best guess is %1%", result, Policy());
+      return policies::raise_evaluation_error<RealType>(function, "Unable to locate solution in a reasonable time: either there is no answer to how many degrees of freedom are required" // LCOV_EXCL_LINE
+         " or the answer is infinite.  Current best guess is %1%", result, Policy()); // LCOV_EXCL_LINE
    }
    return result;
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const students_t_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const students_t_distribution<RealType, Policy>& /*dist*/)
 {
   // Assume no checks on degrees of freedom are useful (unlike mean).
    return 0; // Always zero by definition.
 }
 
 template <class RealType, class Policy>
-inline RealType median(const students_t_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline RealType median(const students_t_distribution<RealType, Policy>& /*dist*/)
 {
    // Assume no checks on degrees of freedom are useful (unlike mean).
    return 0; // Always zero by definition.
@@ -359,7 +361,7 @@ inline RealType median(const students_t_distribution<RealType, Policy>& /*dist*/
 // See section 5.1 on moments at  http://en.wikipedia.org/wiki/Student%27s_t-distribution
 
 template <class RealType, class Policy>
-inline RealType mean(const students_t_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const students_t_distribution<RealType, Policy>& dist)
 {  // Revised for https://svn.boost.org/trac/boost/ticket/7177
    RealType df = dist.degrees_of_freedom();
    if(((boost::math::isnan)(df)) || (df <= 1) ) 
@@ -367,13 +369,13 @@ inline RealType mean(const students_t_distribution<RealType, Policy>& dist)
       return policies::raise_domain_error<RealType>(
       "boost::math::mean(students_t_distribution<%1%> const&, %1%)",
       "Mean is undefined for degrees of freedom < 1 but got %1%.", df, Policy());
-      return std::numeric_limits<RealType>::quiet_NaN();
+      return boost::math::numeric_limits<RealType>::quiet_NaN();
    }
    return 0;
 } // mean
 
 template <class RealType, class Policy>
-inline RealType variance(const students_t_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const students_t_distribution<RealType, Policy>& dist)
 { // http://en.wikipedia.org/wiki/Student%27s_t-distribution
   // Revised for https://svn.boost.org/trac/boost/ticket/7177
   RealType df = dist.degrees_of_freedom();
@@ -383,7 +385,7 @@ inline RealType variance(const students_t_distribution<RealType, Policy>& dist)
       "boost::math::variance(students_t_distribution<%1%> const&, %1%)",
       "variance is undefined for degrees of freedom <= 2, but got %1%.",
       df, Policy());
-    return std::numeric_limits<RealType>::quiet_NaN(); // Undefined.
+    return boost::math::numeric_limits<RealType>::quiet_NaN(); // Undefined.
   }
   if ((boost::math::isinf)(df))
   { // +infinity.
@@ -405,7 +407,7 @@ inline RealType variance(const students_t_distribution<RealType, Policy>& dist)
 } // variance
 
 template <class RealType, class Policy>
-inline RealType skewness(const students_t_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const students_t_distribution<RealType, Policy>& dist)
 {
     RealType df = dist.degrees_of_freedom();
    if( ((boost::math::isnan)(df)) || (dist.degrees_of_freedom() <= 3))
@@ -414,13 +416,13 @@ inline RealType skewness(const students_t_distribution<RealType, Policy>& dist)
          "boost::math::skewness(students_t_distribution<%1%> const&, %1%)",
          "Skewness is undefined for degrees of freedom <= 3, but got %1%.",
          dist.degrees_of_freedom(), Policy());
-      return std::numeric_limits<RealType>::quiet_NaN();
+      return boost::math::numeric_limits<RealType>::quiet_NaN();
    }
    return 0; // For all valid df, including infinity.
 } // skewness
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const students_t_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const students_t_distribution<RealType, Policy>& dist)
 {
    RealType df = dist.degrees_of_freedom();
    if(((boost::math::isnan)(df)) || (df <= 4))
@@ -429,7 +431,7 @@ inline RealType kurtosis(const students_t_distribution<RealType, Policy>& dist)
        "boost::math::kurtosis(students_t_distribution<%1%> const&, %1%)",
        "Kurtosis is undefined for degrees of freedom <= 4, but got %1%.",
         df, Policy());
-        return std::numeric_limits<RealType>::quiet_NaN(); // Undefined.
+        return boost::math::numeric_limits<RealType>::quiet_NaN(); // Undefined.
    }
    if ((boost::math::isinf)(df))
    { // +infinity.
@@ -452,7 +454,7 @@ inline RealType kurtosis(const students_t_distribution<RealType, Policy>& dist)
 } // kurtosis
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const students_t_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const students_t_distribution<RealType, Policy>& dist)
 {
    // see http://mathworld.wolfram.com/Kurtosis.html
 
@@ -463,7 +465,7 @@ inline RealType kurtosis_excess(const students_t_distribution<RealType, Policy>&
        "boost::math::kurtosis_excess(students_t_distribution<%1%> const&, %1%)",
        "Kurtosis_excess is undefined for degrees of freedom <= 4, but got %1%.",
       df, Policy());
-     return std::numeric_limits<RealType>::quiet_NaN(); // Undefined.
+     return boost::math::numeric_limits<RealType>::quiet_NaN(); // Undefined.
    }
    if ((boost::math::isinf)(df))
    { // +infinity.
@@ -485,10 +487,9 @@ inline RealType kurtosis_excess(const students_t_distribution<RealType, Policy>&
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const students_t_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const students_t_distribution<RealType, Policy>& dist)
 {
-   using std::log;
-   using std::sqrt;
+   BOOST_MATH_STD_USING
    RealType v = dist.degrees_of_freedom();
    RealType vp1 = (v+1)/2;
    RealType vd2 = v/2;
diff --git a/inst/include/boost/math/distributions/triangular.hpp b/inst/include/boost/math/distributions/triangular.hpp
index 950d78147..b333ddbc3 100644
--- a/inst/include/boost/math/distributions/triangular.hpp
+++ b/inst/include/boost/math/distributions/triangular.hpp
@@ -16,20 +16,20 @@
 
 // http://en.wikipedia.org/wiki/Triangular_distribution
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/constants/constants.hpp>
 
-#include <utility>
-
 namespace boost{ namespace math
 {
   namespace detail
   {
     template <class RealType, class Policy>
-    inline bool check_triangular_lower(
+    BOOST_MATH_GPU_ENABLED inline bool check_triangular_lower(
       const char* function,
       RealType lower,
       RealType* result, const Policy& pol)
@@ -48,7 +48,7 @@ namespace boost{ namespace math
     } // bool check_triangular_lower(
 
     template <class RealType, class Policy>
-    inline bool check_triangular_mode(
+    BOOST_MATH_GPU_ENABLED inline bool check_triangular_mode(
       const char* function,
       RealType mode,
       RealType* result, const Policy& pol)
@@ -67,7 +67,7 @@ namespace boost{ namespace math
     } // bool check_triangular_mode(
 
     template <class RealType, class Policy>
-    inline bool check_triangular_upper(
+    BOOST_MATH_GPU_ENABLED inline bool check_triangular_upper(
       const char* function,
       RealType upper,
       RealType* result, const Policy& pol)
@@ -86,7 +86,7 @@ namespace boost{ namespace math
     } // bool check_triangular_upper(
 
     template <class RealType, class Policy>
-    inline bool check_triangular_x(
+    BOOST_MATH_GPU_ENABLED inline bool check_triangular_x(
       const char* function,
       RealType const& x,
       RealType* result, const Policy& pol)
@@ -105,7 +105,7 @@ namespace boost{ namespace math
     } // bool check_triangular_x
 
     template <class RealType, class Policy>
-    inline bool check_triangular(
+    BOOST_MATH_GPU_ENABLED inline bool check_triangular(
       const char* function,
       RealType lower,
       RealType mode,
@@ -153,7 +153,7 @@ namespace boost{ namespace math
     typedef RealType value_type;
     typedef Policy policy_type;
 
-    triangular_distribution(RealType l_lower = -1, RealType l_mode = 0, RealType l_upper = 1)
+    BOOST_MATH_GPU_ENABLED triangular_distribution(RealType l_lower = -1, RealType l_mode = 0, RealType l_upper = 1)
       : m_lower(l_lower), m_mode(l_mode), m_upper(l_upper) // Constructor.
     { // Evans says 'standard triangular' is lower 0, mode 1/2, upper 1,
       // has median sqrt(c/2) for c <=1/2 and 1 - sqrt(1-c)/2 for c >= 1/2
@@ -163,15 +163,15 @@ namespace boost{ namespace math
       detail::check_triangular("boost::math::triangular_distribution<%1%>::triangular_distribution",l_lower, l_mode, l_upper, &result, Policy());
     }
     // Accessor functions.
-    RealType lower()const
+    BOOST_MATH_GPU_ENABLED RealType lower()const
     {
       return m_lower;
     }
-    RealType mode()const
+    BOOST_MATH_GPU_ENABLED RealType mode()const
     {
       return m_mode;
     }
-    RealType upper()const
+    BOOST_MATH_GPU_ENABLED RealType upper()const
     {
       return m_upper;
     }
@@ -194,23 +194,23 @@ namespace boost{ namespace math
   #endif
 
   template <class RealType, class Policy>
-  inline const std::pair<RealType, RealType> range(const triangular_distribution<RealType, Policy>& /* dist */)
+  BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const triangular_distribution<RealType, Policy>& /* dist */)
   { // Range of permissible values for random variable x.
     using boost::math::tools::max_value;
-    return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>());
+    return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>());
   }
 
   template <class RealType, class Policy>
-  inline const std::pair<RealType, RealType> support(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const triangular_distribution<RealType, Policy>& dist)
   { // Range of supported values for random variable x.
     // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
-    return std::pair<RealType, RealType>(dist.lower(), dist.upper());
+    return boost::math::pair<RealType, RealType>(dist.lower(), dist.upper());
   }
 
   template <class RealType, class Policy>
-  RealType pdf(const triangular_distribution<RealType, Policy>& dist, const RealType& x)
+  BOOST_MATH_GPU_ENABLED RealType pdf(const triangular_distribution<RealType, Policy>& dist, const RealType& x)
   {
-    static const char* function = "boost::math::pdf(const triangular_distribution<%1%>&, %1%)";
+    constexpr auto function = "boost::math::pdf(const triangular_distribution<%1%>&, %1%)";
     RealType lower = dist.lower();
     RealType mode = dist.mode();
     RealType upper = dist.upper();
@@ -246,9 +246,9 @@ namespace boost{ namespace math
   } // RealType pdf(const triangular_distribution<RealType, Policy>& dist, const RealType& x)
 
   template <class RealType, class Policy>
-  inline RealType cdf(const triangular_distribution<RealType, Policy>& dist, const RealType& x)
+  BOOST_MATH_GPU_ENABLED inline RealType cdf(const triangular_distribution<RealType, Policy>& dist, const RealType& x)
   {
-    static const char* function = "boost::math::cdf(const triangular_distribution<%1%>&, %1%)";
+    constexpr auto function = "boost::math::cdf(const triangular_distribution<%1%>&, %1%)";
     RealType lower = dist.lower();
     RealType mode = dist.mode();
     RealType upper = dist.upper();
@@ -281,10 +281,10 @@ namespace boost{ namespace math
   } // RealType cdf(const triangular_distribution<RealType, Policy>& dist, const RealType& x)
 
   template <class RealType, class Policy>
-  RealType quantile(const triangular_distribution<RealType, Policy>& dist, const RealType& p)
+  BOOST_MATH_GPU_ENABLED RealType quantile(const triangular_distribution<RealType, Policy>& dist, const RealType& p)
   {
     BOOST_MATH_STD_USING  // for ADL of std functions (sqrt).
-    static const char* function = "boost::math::quantile(const triangular_distribution<%1%>&, %1%)";
+    constexpr auto function = "boost::math::quantile(const triangular_distribution<%1%>&, %1%)";
     RealType lower = dist.lower();
     RealType mode = dist.mode();
     RealType upper = dist.upper();
@@ -324,9 +324,9 @@ namespace boost{ namespace math
   } // RealType quantile(const triangular_distribution<RealType, Policy>& dist, const RealType& q)
 
   template <class RealType, class Policy>
-  RealType cdf(const complemented2_type<triangular_distribution<RealType, Policy>, RealType>& c)
+  BOOST_MATH_GPU_ENABLED RealType cdf(const complemented2_type<triangular_distribution<RealType, Policy>, RealType>& c)
   {
-    static const char* function = "boost::math::cdf(const triangular_distribution<%1%>&, %1%)";
+    constexpr auto function = "boost::math::cdf(const triangular_distribution<%1%>&, %1%)";
     RealType lower = c.dist.lower();
     RealType mode = c.dist.mode();
     RealType upper = c.dist.upper();
@@ -359,10 +359,10 @@ namespace boost{ namespace math
   } // RealType cdf(const complemented2_type<triangular_distribution<RealType, Policy>, RealType>& c)
 
   template <class RealType, class Policy>
-  RealType quantile(const complemented2_type<triangular_distribution<RealType, Policy>, RealType>& c)
+  BOOST_MATH_GPU_ENABLED RealType quantile(const complemented2_type<triangular_distribution<RealType, Policy>, RealType>& c)
   {
     BOOST_MATH_STD_USING  // Aid ADL for sqrt.
-    static const char* function = "boost::math::quantile(const triangular_distribution<%1%>&, %1%)";
+    constexpr auto function = "boost::math::quantile(const triangular_distribution<%1%>&, %1%)";
     RealType l = c.dist.lower();
     RealType m = c.dist.mode();
     RealType u = c.dist.upper();
@@ -408,9 +408,9 @@ namespace boost{ namespace math
   } // RealType quantile(const complemented2_type<triangular_distribution<RealType, Policy>, RealType>& c)
 
   template <class RealType, class Policy>
-  inline RealType mean(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType mean(const triangular_distribution<RealType, Policy>& dist)
   {
-    static const char* function = "boost::math::mean(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::mean(const triangular_distribution<%1%>&)";
     RealType lower = dist.lower();
     RealType mode = dist.mode();
     RealType upper = dist.upper();
@@ -424,9 +424,9 @@ namespace boost{ namespace math
 
 
   template <class RealType, class Policy>
-  inline RealType variance(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType variance(const triangular_distribution<RealType, Policy>& dist)
   {
-    static const char* function = "boost::math::mean(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::mean(const triangular_distribution<%1%>&)";
     RealType lower = dist.lower();
     RealType mode = dist.mode();
     RealType upper = dist.upper();
@@ -439,9 +439,9 @@ namespace boost{ namespace math
   } // RealType variance(const triangular_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType mode(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType mode(const triangular_distribution<RealType, Policy>& dist)
   {
-    static const char* function = "boost::math::mode(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::mode(const triangular_distribution<%1%>&)";
     RealType mode = dist.mode();
     RealType result = 0; // of checks.
     if(false == detail::check_triangular_mode(function, mode, &result, Policy()))
@@ -452,10 +452,10 @@ namespace boost{ namespace math
   } // RealType mode
 
   template <class RealType, class Policy>
-  inline RealType median(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType median(const triangular_distribution<RealType, Policy>& dist)
   {
     BOOST_MATH_STD_USING // ADL of std functions.
-    static const char* function = "boost::math::median(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::median(const triangular_distribution<%1%>&)";
     RealType mode = dist.mode();
     RealType result = 0; // of checks.
     if(false == detail::check_triangular_mode(function, mode, &result, Policy()))
@@ -475,11 +475,11 @@ namespace boost{ namespace math
   } // RealType mode
 
   template <class RealType, class Policy>
-  inline RealType skewness(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType skewness(const triangular_distribution<RealType, Policy>& dist)
   {
     BOOST_MATH_STD_USING  // for ADL of std functions
     using namespace boost::math::constants; // for root_two
-    static const char* function = "boost::math::skewness(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::skewness(const triangular_distribution<%1%>&)";
 
     RealType lower = dist.lower();
     RealType mode = dist.mode();
@@ -496,9 +496,9 @@ namespace boost{ namespace math
   } // RealType skewness(const triangular_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType kurtosis(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const triangular_distribution<RealType, Policy>& dist)
   { // These checks may be belt and braces as should have been checked on construction?
-    static const char* function = "boost::math::kurtosis(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::kurtosis(const triangular_distribution<%1%>&)";
     RealType lower = dist.lower();
     RealType upper = dist.upper();
     RealType mode = dist.mode();
@@ -511,9 +511,9 @@ namespace boost{ namespace math
   } // RealType kurtosis_excess(const triangular_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType kurtosis_excess(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const triangular_distribution<RealType, Policy>& dist)
   { // These checks may be belt and braces as should have been checked on construction?
-    static const char* function = "boost::math::kurtosis_excess(const triangular_distribution<%1%>&)";
+    constexpr auto function = "boost::math::kurtosis_excess(const triangular_distribution<%1%>&)";
     RealType lower = dist.lower();
     RealType upper = dist.upper();
     RealType mode = dist.mode();
@@ -527,9 +527,9 @@ namespace boost{ namespace math
   }
 
   template <class RealType, class Policy>
-  inline RealType entropy(const triangular_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType entropy(const triangular_distribution<RealType, Policy>& dist)
   {
-    using std::log;
+    BOOST_MATH_STD_USING
     return constants::half<RealType>() + log((dist.upper() - dist.lower())/2);
   }
 
diff --git a/inst/include/boost/math/distributions/uniform.hpp b/inst/include/boost/math/distributions/uniform.hpp
index f57f8cc9f..328fc6133 100644
--- a/inst/include/boost/math/distributions/uniform.hpp
+++ b/inst/include/boost/math/distributions/uniform.hpp
@@ -1,5 +1,6 @@
 //  Copyright John Maddock 2006.
 //  Copyright Paul A. Bristow 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -15,18 +16,18 @@
 // http://documents.wolfram.com/calculationcenter/v2/Functions/ListsMatrices/Statistics/UniformDistribution.html
 // http://en.wikipedia.org/wiki/Uniform_distribution_%28continuous%29
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 
-#include <utility>
-
 namespace boost{ namespace math
 {
   namespace detail
   {
     template <class RealType, class Policy>
-    inline bool check_uniform_lower(
+    BOOST_MATH_GPU_ENABLED inline bool check_uniform_lower(
       const char* function,
       RealType lower,
       RealType* result, const Policy& pol)
@@ -45,7 +46,7 @@ namespace boost{ namespace math
     } // bool check_uniform_lower(
 
     template <class RealType, class Policy>
-    inline bool check_uniform_upper(
+    BOOST_MATH_GPU_ENABLED inline bool check_uniform_upper(
       const char* function,
       RealType upper,
       RealType* result, const Policy& pol)
@@ -64,7 +65,7 @@ namespace boost{ namespace math
     } // bool check_uniform_upper(
 
     template <class RealType, class Policy>
-    inline bool check_uniform_x(
+    BOOST_MATH_GPU_ENABLED inline bool check_uniform_x(
       const char* function,
       RealType const& x,
       RealType* result, const Policy& pol)
@@ -83,7 +84,7 @@ namespace boost{ namespace math
     } // bool check_uniform_x
 
     template <class RealType, class Policy>
-    inline bool check_uniform(
+    BOOST_MATH_GPU_ENABLED inline bool check_uniform(
       const char* function,
       RealType lower,
       RealType upper,
@@ -116,19 +117,19 @@ namespace boost{ namespace math
     typedef RealType value_type;
     typedef Policy policy_type;
 
-    uniform_distribution(RealType l_lower = 0, RealType l_upper = 1) // Constructor.
+    BOOST_MATH_GPU_ENABLED uniform_distribution(RealType l_lower = 0, RealType l_upper = 1) // Constructor.
       : m_lower(l_lower), m_upper(l_upper) // Default is standard uniform distribution.
     {
       RealType result;
       detail::check_uniform("boost::math::uniform_distribution<%1%>::uniform_distribution", l_lower, l_upper, &result, Policy());
     }
     // Accessor functions.
-    RealType lower()const
+    BOOST_MATH_GPU_ENABLED RealType lower()const
     {
       return m_lower;
     }
 
-    RealType upper()const
+    BOOST_MATH_GPU_ENABLED RealType upper()const
     {
       return m_upper;
     }
@@ -148,23 +149,23 @@ namespace boost{ namespace math
   #endif
 
   template <class RealType, class Policy>
-  inline const std::pair<RealType, RealType> range(const uniform_distribution<RealType, Policy>& /* dist */)
+  BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> range(const uniform_distribution<RealType, Policy>& /* dist */)
   { // Range of permissible values for random variable x.
      using boost::math::tools::max_value;
-     return std::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + 'infinity'.
+     return boost::math::pair<RealType, RealType>(-max_value<RealType>(), max_value<RealType>()); // - to + 'infinity'.
      // Note RealType infinity is NOT permitted, only max_value.
   }
 
   template <class RealType, class Policy>
-  inline const std::pair<RealType, RealType> support(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline const boost::math::pair<RealType, RealType> support(const uniform_distribution<RealType, Policy>& dist)
   { // Range of supported values for random variable x.
      // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
      using boost::math::tools::max_value;
-     return std::pair<RealType, RealType>(dist.lower(),  dist.upper());
+     return boost::math::pair<RealType, RealType>(dist.lower(),  dist.upper());
   }
 
   template <class RealType, class Policy>
-  inline RealType pdf(const uniform_distribution<RealType, Policy>& dist, const RealType& x)
+  BOOST_MATH_GPU_ENABLED inline RealType pdf(const uniform_distribution<RealType, Policy>& dist, const RealType& x)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -189,7 +190,7 @@ namespace boost{ namespace math
   } // RealType pdf(const uniform_distribution<RealType, Policy>& dist, const RealType& x)
 
   template <class RealType, class Policy>
-  inline RealType cdf(const uniform_distribution<RealType, Policy>& dist, const RealType& x)
+  BOOST_MATH_GPU_ENABLED inline RealType cdf(const uniform_distribution<RealType, Policy>& dist, const RealType& x)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -214,7 +215,7 @@ namespace boost{ namespace math
   } // RealType cdf(const uniform_distribution<RealType, Policy>& dist, const RealType& x)
 
   template <class RealType, class Policy>
-  inline RealType quantile(const uniform_distribution<RealType, Policy>& dist, const RealType& p)
+  BOOST_MATH_GPU_ENABLED inline RealType quantile(const uniform_distribution<RealType, Policy>& dist, const RealType& p)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -239,7 +240,7 @@ namespace boost{ namespace math
   } // RealType quantile(const uniform_distribution<RealType, Policy>& dist, const RealType& p)
 
   template <class RealType, class Policy>
-  inline RealType cdf(const complemented2_type<uniform_distribution<RealType, Policy>, RealType>& c)
+  BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<uniform_distribution<RealType, Policy>, RealType>& c)
   {
     RealType lower = c.dist.lower();
     RealType upper = c.dist.upper();
@@ -265,7 +266,7 @@ namespace boost{ namespace math
   } // RealType cdf(const complemented2_type<uniform_distribution<RealType, Policy>, RealType>& c)
 
   template <class RealType, class Policy>
-  inline RealType quantile(const complemented2_type<uniform_distribution<RealType, Policy>, RealType>& c)
+  BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<uniform_distribution<RealType, Policy>, RealType>& c)
   {
     RealType lower = c.dist.lower();
     RealType upper = c.dist.upper();
@@ -291,7 +292,7 @@ namespace boost{ namespace math
   } // RealType quantile(const complemented2_type<uniform_distribution<RealType, Policy>, RealType>& c)
 
   template <class RealType, class Policy>
-  inline RealType mean(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType mean(const uniform_distribution<RealType, Policy>& dist)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -304,7 +305,7 @@ namespace boost{ namespace math
   } // RealType mean(const uniform_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType variance(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType variance(const uniform_distribution<RealType, Policy>& dist)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -318,7 +319,7 @@ namespace boost{ namespace math
   } // RealType variance(const uniform_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType mode(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType mode(const uniform_distribution<RealType, Policy>& dist)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -332,7 +333,7 @@ namespace boost{ namespace math
   }
 
   template <class RealType, class Policy>
-  inline RealType median(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType median(const uniform_distribution<RealType, Policy>& dist)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -344,7 +345,7 @@ namespace boost{ namespace math
     return (lower + upper) / 2; //
   }
   template <class RealType, class Policy>
-  inline RealType skewness(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType skewness(const uniform_distribution<RealType, Policy>& dist)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -357,7 +358,7 @@ namespace boost{ namespace math
   } // RealType skewness(const uniform_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType kurtosis_excess(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const uniform_distribution<RealType, Policy>& dist)
   {
     RealType lower = dist.lower();
     RealType upper = dist.upper();
@@ -370,15 +371,15 @@ namespace boost{ namespace math
   } // RealType kurtosis_excess(const uniform_distribution<RealType, Policy>& dist)
 
   template <class RealType, class Policy>
-  inline RealType kurtosis(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const uniform_distribution<RealType, Policy>& dist)
   {
     return kurtosis_excess(dist) + 3;
   }
 
   template <class RealType, class Policy>
-  inline RealType entropy(const uniform_distribution<RealType, Policy>& dist)
+  BOOST_MATH_GPU_ENABLED inline RealType entropy(const uniform_distribution<RealType, Policy>& dist)
   {
-    using std::log;
+    BOOST_MATH_STD_USING
     return log(dist.upper() - dist.lower());
   }
 
diff --git a/inst/include/boost/math/distributions/weibull.hpp b/inst/include/boost/math/distributions/weibull.hpp
index ca4bbd7b5..eb4de106c 100644
--- a/inst/include/boost/math/distributions/weibull.hpp
+++ b/inst/include/boost/math/distributions/weibull.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,6 +10,10 @@
 // http://www.itl.nist.gov/div898/handbook/eda/section3/eda3668.htm
 // http://mathworld.wolfram.com/WeibullDistribution.html
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/log1p.hpp>
@@ -16,14 +21,12 @@
 #include <boost/math/distributions/detail/common_error_handling.hpp>
 #include <boost/math/distributions/complement.hpp>
 
-#include <utility>
-
 namespace boost{ namespace math
 {
 namespace detail{
 
 template <class RealType, class Policy>
-inline bool check_weibull_shape(
+BOOST_MATH_GPU_ENABLED inline bool check_weibull_shape(
       const char* function,
       RealType shape,
       RealType* result, const Policy& pol)
@@ -39,7 +42,7 @@ inline bool check_weibull_shape(
 }
 
 template <class RealType, class Policy>
-inline bool check_weibull_x(
+BOOST_MATH_GPU_ENABLED inline bool check_weibull_x(
       const char* function,
       RealType const& x,
       RealType* result, const Policy& pol)
@@ -55,7 +58,7 @@ inline bool check_weibull_x(
 }
 
 template <class RealType, class Policy>
-inline bool check_weibull(
+BOOST_MATH_GPU_ENABLED inline bool check_weibull(
       const char* function,
       RealType scale,
       RealType shape,
@@ -73,19 +76,19 @@ class weibull_distribution
    using value_type = RealType;
    using policy_type = Policy;
 
-   explicit weibull_distribution(RealType l_shape, RealType l_scale = 1)
+   BOOST_MATH_GPU_ENABLED explicit weibull_distribution(RealType l_shape, RealType l_scale = 1)
       : m_shape(l_shape), m_scale(l_scale)
    {
       RealType result;
       detail::check_weibull("boost::math::weibull_distribution<%1%>::weibull_distribution", l_scale, l_shape, &result, Policy());
    }
 
-   RealType shape()const
+   BOOST_MATH_GPU_ENABLED RealType shape()const
    {
       return m_shape;
    }
 
-   RealType scale()const
+   BOOST_MATH_GPU_ENABLED RealType scale()const
    {
       return m_scale;
    }
@@ -107,28 +110,28 @@ weibull_distribution(RealType,RealType)->weibull_distribution<typename boost::ma
 #endif
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> range(const weibull_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> range(const weibull_distribution<RealType, Policy>& /*dist*/)
 { // Range of permissible values for random variable x.
    using boost::math::tools::max_value;
-   return std::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(static_cast<RealType>(0), max_value<RealType>());
 }
 
 template <class RealType, class Policy>
-inline std::pair<RealType, RealType> support(const weibull_distribution<RealType, Policy>& /*dist*/)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<RealType, RealType> support(const weibull_distribution<RealType, Policy>& /*dist*/)
 { // Range of supported values for random variable x.
    // This is range where cdf rises from 0 to 1, and outside it, the pdf is zero.
    using boost::math::tools::max_value;
    using boost::math::tools::min_value;
-   return std::pair<RealType, RealType>(min_value<RealType>(),  max_value<RealType>());
+   return boost::math::pair<RealType, RealType>(min_value<RealType>(),  max_value<RealType>());
    // A discontinuity at x == 0, so only support down to min_value.
 }
 
 template <class RealType, class Policy>
-inline RealType pdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType pdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::pdf(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::pdf(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -158,11 +161,11 @@ inline RealType pdf(const weibull_distribution<RealType, Policy>& dist, const Re
 }
 
 template <class RealType, class Policy>
-inline RealType logpdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logpdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::logpdf(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::logpdf(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -192,11 +195,11 @@ inline RealType logpdf(const weibull_distribution<RealType, Policy>& dist, const
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::cdf(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -213,11 +216,11 @@ inline RealType cdf(const weibull_distribution<RealType, Policy>& dist, const Re
 }
 
 template <class RealType, class Policy>
-inline RealType logcdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const weibull_distribution<RealType, Policy>& dist, const RealType& x)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::logcdf(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::logcdf(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -234,11 +237,11 @@ inline RealType logcdf(const weibull_distribution<RealType, Policy>& dist, const
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const weibull_distribution<RealType, Policy>& dist, const RealType& p)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const weibull_distribution<RealType, Policy>& dist, const RealType& p)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::quantile(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -258,11 +261,11 @@ inline RealType quantile(const weibull_distribution<RealType, Policy>& dist, con
 }
 
 template <class RealType, class Policy>
-inline RealType cdf(const complemented2_type<weibull_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType cdf(const complemented2_type<weibull_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::cdf(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::cdf(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -279,11 +282,11 @@ inline RealType cdf(const complemented2_type<weibull_distribution<RealType, Poli
 }
 
 template <class RealType, class Policy>
-inline RealType logcdf(const complemented2_type<weibull_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType logcdf(const complemented2_type<weibull_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::logcdf(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::logcdf(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -300,11 +303,11 @@ inline RealType logcdf(const complemented2_type<weibull_distribution<RealType, P
 }
 
 template <class RealType, class Policy>
-inline RealType quantile(const complemented2_type<weibull_distribution<RealType, Policy>, RealType>& c)
+BOOST_MATH_GPU_ENABLED inline RealType quantile(const complemented2_type<weibull_distribution<RealType, Policy>, RealType>& c)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::quantile(const weibull_distribution<%1%>, %1%)";
+   constexpr auto function = "boost::math::quantile(const weibull_distribution<%1%>, %1%)";
 
    RealType shape = c.dist.shape();
    RealType scale = c.dist.scale();
@@ -325,11 +328,11 @@ inline RealType quantile(const complemented2_type<weibull_distribution<RealType,
 }
 
 template <class RealType, class Policy>
-inline RealType mean(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mean(const weibull_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::mean(const weibull_distribution<%1%>)";
+   constexpr auto function = "boost::math::mean(const weibull_distribution<%1%>)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -343,12 +346,12 @@ inline RealType mean(const weibull_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType variance(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType variance(const weibull_distribution<RealType, Policy>& dist)
 {
    RealType shape = dist.shape();
    RealType scale = dist.scale();
 
-   static const char* function = "boost::math::variance(const weibull_distribution<%1%>)";
+   constexpr auto function = "boost::math::variance(const weibull_distribution<%1%>)";
 
    RealType result = 0;
    if(false == detail::check_weibull(function, scale, shape, &result, Policy()))
@@ -363,11 +366,11 @@ inline RealType variance(const weibull_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType mode(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType mode(const weibull_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std function pow.
 
-   static const char* function = "boost::math::mode(const weibull_distribution<%1%>)";
+   constexpr auto function = "boost::math::mode(const weibull_distribution<%1%>)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -384,11 +387,11 @@ inline RealType mode(const weibull_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType median(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType median(const weibull_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std function pow.
 
-   static const char* function = "boost::math::median(const weibull_distribution<%1%>)";
+   constexpr auto function = "boost::math::median(const weibull_distribution<%1%>)";
 
    RealType shape = dist.shape(); // Wikipedia k
    RealType scale = dist.scale(); // Wikipedia lambda
@@ -404,11 +407,11 @@ inline RealType median(const weibull_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType skewness(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType skewness(const weibull_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::skewness(const weibull_distribution<%1%>)";
+   constexpr auto function = "boost::math::skewness(const weibull_distribution<%1%>)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -429,11 +432,11 @@ inline RealType skewness(const weibull_distribution<RealType, Policy>& dist)
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis_excess(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis_excess(const weibull_distribution<RealType, Policy>& dist)
 {
    BOOST_MATH_STD_USING  // for ADL of std functions
 
-   static const char* function = "boost::math::kurtosis_excess(const weibull_distribution<%1%>)";
+   constexpr auto function = "boost::math::kurtosis_excess(const weibull_distribution<%1%>)";
 
    RealType shape = dist.shape();
    RealType scale = dist.scale();
@@ -457,15 +460,15 @@ inline RealType kurtosis_excess(const weibull_distribution<RealType, Policy>& di
 }
 
 template <class RealType, class Policy>
-inline RealType kurtosis(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType kurtosis(const weibull_distribution<RealType, Policy>& dist)
 {
    return kurtosis_excess(dist) + 3;
 }
 
 template <class RealType, class Policy>
-inline RealType entropy(const weibull_distribution<RealType, Policy>& dist)
+BOOST_MATH_GPU_ENABLED inline RealType entropy(const weibull_distribution<RealType, Policy>& dist)
 {
-   using std::log;
+   BOOST_MATH_STD_USING
    RealType k = dist.shape();
    RealType lambda = dist.scale();
    return constants::euler<RealType>()*(1-1/k) + log(lambda/k) + 1;
diff --git a/inst/include/boost/math/filters/daubechies.hpp b/inst/include/boost/math/filters/daubechies.hpp
index 0fdeac6a3..0655be379 100644
--- a/inst/include/boost/math/filters/daubechies.hpp
+++ b/inst/include/boost/math/filters/daubechies.hpp
@@ -13,7 +13,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/octonion.hpp b/inst/include/boost/math/octonion.hpp
index 56d8c9e05..5d147df58 100644
--- a/inst/include/boost/math/octonion.hpp
+++ b/inst/include/boost/math/octonion.hpp
@@ -174,6 +174,10 @@ namespace boost
             type    g;                                \
             type    h;                                \
 
+        // LCOV_EXCL_START
+        // No code coverage for the generic case, like std::complex,
+        // the The behavior of octonion is unspecified if T is not
+        // one of float, double or long double.
 
         template<typename T>
         class octonion
@@ -658,7 +662,7 @@ namespace boost
         private:
 
         };
-
+        // LCOV_EXCL_STOP
 
         // declaration of octonion specialization
 
@@ -1697,6 +1701,8 @@ namespace boost
 
     #undef    BOOST_OCTONION_NOT_EQUAL_GENERATOR
 
+        // LCOV_EXCL_START
+        // Something like 2,100 lines of input-streaming up to line 3,800 and beyond.
 
         // Note:    the default values in the constructors of the complex and quaternions make for
         //            a very complex and ambiguous situation; we have made choices to disambiguate.
@@ -3843,6 +3849,7 @@ namespace boost
             finish:
             return(is);
         }
+        // LCOV_EXCL_STOP
 
 
         template<typename T, typename charT, class traits>
diff --git a/inst/include/boost/math/optimization/cma_es.hpp b/inst/include/boost/math/optimization/cma_es.hpp
new file mode 100644
index 000000000..42b901a19
--- /dev/null
+++ b/inst/include/boost/math/optimization/cma_es.hpp
@@ -0,0 +1,392 @@
+/*
+ * Copyright Nick Thompson, 2024
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef BOOST_MATH_OPTIMIZATION_CMA_ES_HPP
+#define BOOST_MATH_OPTIMIZATION_CMA_ES_HPP
+#include <atomic>
+#include <cmath>
+#include <iostream>
+#include <limits>
+#include <random>
+#include <sstream>
+#include <stdexcept>
+#include <utility>
+#include <vector>
+#include <boost/math/optimization/detail/common.hpp>
+#include <boost/math/tools/assert.hpp>
+#if __has_include(<Eigen/Dense>)
+#include <Eigen/Dense>
+#else
+#error "CMA-ES requires Eigen."
+#endif
+
+// Follows the notation in:
+// https://arxiv.org/pdf/1604.00772.pdf
+// This is a (hopefully) faithful reproduction of the pseudocode in the arxiv review
+// by Nikolaus Hansen.
+// Comments referring to equations all refer to this arxiv review.
+// A slide deck by the same author is given here:
+// http://www.cmap.polytechnique.fr/~nikolaus.hansen/CmaTutorialGecco2023-no-audio.pdf
+// which is also a very useful reference.
+
+#ifndef BOOST_MATH_DEBUG_CMA_ES
+#define BOOST_MATH_DEBUG_CMA_ES 0
+#endif
+
+namespace boost::math::optimization {
+
+template <typename ArgumentContainer> struct cma_es_parameters {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  ArgumentContainer lower_bounds;
+  ArgumentContainer upper_bounds;
+  size_t max_generations = 1000;
+  ArgumentContainer const *initial_guess = nullptr;
+  // In the reference, population size = \lambda.
+  // If the population size is zero, it is set to equation (48) of the reference
+  // and rounded up to the nearest multiple of threads:
+  size_t population_size = 0;
+  // In the reference, learning_rate = c_m:
+  DimensionlessReal learning_rate = 1;
+};
+
+template <typename ArgumentContainer>
+void validate_cma_es_parameters(cma_es_parameters<ArgumentContainer> &params) {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  using std::isfinite;
+  using std::isnan;
+  using std::log;
+  using std::ceil;
+  using std::floor;
+
+  std::ostringstream oss;
+  detail::validate_bounds(params.lower_bounds, params.upper_bounds);
+  if (params.initial_guess) {
+    detail::validate_initial_guess(*params.initial_guess, params.lower_bounds, params.upper_bounds);
+  }
+  const size_t n = params.upper_bounds.size();
+  // Equation 48 of the arxiv review:
+  if (params.population_size == 0) {
+    //auto tmp = 4.0 + floor(3*log(n));
+    // But round to the nearest multiple of the thread count:
+    //auto k = static_cast<size_t>(std::ceil(tmp/params.threads));
+    //params.population_size = k*params.threads;
+    params.population_size = static_cast<size_t>(4 + floor(3*log(n)));
+  }
+  if (params.learning_rate <= DimensionlessReal(0) || !isfinite(params.learning_rate)) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": The learning rate must be > 0, but got " << params.learning_rate << ".";
+    throw std::invalid_argument(oss.str());
+  }
+}
+
+template <typename ArgumentContainer, class Func, class URBG>
+ArgumentContainer cma_es(
+    const Func cost_function,
+    cma_es_parameters<ArgumentContainer> &params,
+    URBG &gen,
+    std::invoke_result_t<Func, ArgumentContainer> target_value = std::numeric_limits<std::invoke_result_t<Func, ArgumentContainer>>::quiet_NaN(),
+    std::atomic<bool> *cancellation = nullptr,
+    std::atomic<std::invoke_result_t<Func, ArgumentContainer>> *current_minimum_cost = nullptr,
+    std::vector<std::pair<ArgumentContainer, std::invoke_result_t<Func, ArgumentContainer>>> *queries = nullptr)
+ {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  using ResultType = std::invoke_result_t<Func, ArgumentContainer>;
+  using std::abs;
+  using std::log;
+  using std::exp;
+  using std::pow;
+  using std::min;
+  using std::max;
+  using std::sqrt;
+  using std::isnan;
+  using std::isfinite;
+  using std::uniform_real_distribution;
+  using std::normal_distribution;
+  validate_cma_es_parameters(params);
+  // n = dimension of problem:
+  const size_t n = params.lower_bounds.size();
+  std::atomic<bool> target_attained = false;
+  std::atomic<ResultType> lowest_cost = std::numeric_limits<ResultType>::infinity();
+  ArgumentContainer best_vector;
+  // p_{c} := evolution path, equation (24) of the arxiv review:
+  Eigen::Vector<DimensionlessReal, Eigen::Dynamic> p_c(n);
+  // p_{\sigma} := conjugate evolution path, equation (31) of the arxiv review:
+  Eigen::Vector<DimensionlessReal, Eigen::Dynamic> p_sigma(n);
+  if constexpr (detail::has_resize_v<ArgumentContainer>) {
+    best_vector.resize(n, std::numeric_limits<Real>::quiet_NaN());
+  }
+  for (size_t i = 0; i < n; ++i) {
+    p_c[i] = DimensionlessReal(0);
+    p_sigma[i] = DimensionlessReal(0);
+  }
+  // Table 1, \mu = floor(\lambda/2):
+  size_t mu = params.population_size/2;
+  std::vector<DimensionlessReal> w_prime(params.population_size, std::numeric_limits<DimensionlessReal>::quiet_NaN());
+  for (size_t i = 0; i < params.population_size; ++i) {
+    // Equation (49), but 0-indexed:
+    w_prime[i] = log(static_cast<DimensionlessReal>(params.population_size + 1)/(2*(i+1)));
+  }
+  // Table 1, notes at top:
+  DimensionlessReal positive_weight_sum = 0;
+  DimensionlessReal sq_weight_sum = 0;
+  for (size_t i = 0; i < mu; ++i) {
+    BOOST_MATH_ASSERT(w_prime[i] > 0);
+    positive_weight_sum += w_prime[i];
+    sq_weight_sum += w_prime[i]*w_prime[i];
+  }
+  DimensionlessReal mu_eff = positive_weight_sum*positive_weight_sum/sq_weight_sum;
+  BOOST_MATH_ASSERT(1 <= mu_eff);
+  BOOST_MATH_ASSERT(mu_eff <= mu);
+  DimensionlessReal negative_weight_sum = 0;
+  sq_weight_sum = 0;
+  for (size_t i = mu; i < params.population_size; ++i) {
+    BOOST_MATH_ASSERT(w_prime[i] <= 0);
+    negative_weight_sum += w_prime[i];
+    sq_weight_sum += w_prime[i]*w_prime[i];
+  }
+  DimensionlessReal mu_eff_m = negative_weight_sum*negative_weight_sum/sq_weight_sum;
+  // Equation (54):
+  DimensionlessReal c_m = params.learning_rate;
+  // Equation (55):
+  DimensionlessReal c_sigma = (mu_eff + 2)/(n + mu_eff + 5);
+  BOOST_MATH_ASSERT(c_sigma < 1);
+  DimensionlessReal d_sigma = 1 + 2*(max)(DimensionlessReal(0), sqrt(DimensionlessReal((mu_eff - 1)/(n + 1))) - DimensionlessReal(1)) + c_sigma;
+  // Equation (56):
+  DimensionlessReal c_c = (4 + mu_eff/n)/(n + 4 + 2*mu_eff/n);
+  BOOST_MATH_ASSERT(c_c <= 1);
+  // Equation (57):
+  DimensionlessReal c_1 = DimensionlessReal(2)/(pow(n + 1.3, 2) + mu_eff);
+  // Equation (58)
+  DimensionlessReal c_mu = (min)(1 - c_1, 2*(DimensionlessReal(0.25)  + mu_eff  + 1/mu_eff - 2)/((n+2)*(n+2) + mu_eff));
+  BOOST_MATH_ASSERT(c_1 + c_mu <= DimensionlessReal(1));
+  // Equation (50):
+  DimensionlessReal alpha_mu_m = 1 + c_1/c_mu;
+  // Equation (51):
+  DimensionlessReal alpha_mu_eff_m = 1 + 2*mu_eff_m/(mu_eff + 2);
+  // Equation (52):
+  DimensionlessReal alpha_m_pos_def = (1- c_1 - c_mu)/(n*c_mu);
+  // Equation (53):
+  std::vector<DimensionlessReal> weights(params.population_size, std::numeric_limits<DimensionlessReal>::quiet_NaN());
+  for (size_t i = 0; i < mu; ++i) {
+    weights[i] = w_prime[i]/positive_weight_sum;
+  }
+  DimensionlessReal min_alpha = (min)(alpha_mu_m, (min)(alpha_mu_eff_m, alpha_m_pos_def));
+  for (size_t i = mu; i < params.population_size; ++i) {
+    weights[i] = min_alpha*w_prime[i]/abs(negative_weight_sum);
+  }
+  // mu:= number of parents, lambda := number of offspring.
+  Eigen::Matrix<DimensionlessReal, Eigen::Dynamic, Eigen::Dynamic> C = Eigen::Matrix<DimensionlessReal, Eigen::Dynamic, Eigen::Dynamic>::Identity(n, n);
+  ArgumentContainer mean_vector;
+  // See the footnote in Figure 6 of the arxiv review:
+  // We should consider the more robust initialization described there. . . 
+  Real sigma = DimensionlessReal(0.3)*(params.upper_bounds[0] - params.lower_bounds[0]);;
+  if (params.initial_guess) {
+    mean_vector = *params.initial_guess;
+  }
+  else {
+    mean_vector = detail::random_initial_population(params.lower_bounds, params.upper_bounds, 1, gen)[0];
+  }
+  auto initial_cost = cost_function(mean_vector);
+  if (!isnan(initial_cost)) {
+    best_vector = mean_vector;
+    lowest_cost = initial_cost;
+    if (current_minimum_cost) {
+      *current_minimum_cost = initial_cost;
+    }
+  }
+#if BOOST_MATH_DEBUG_CMA_ES
+  {
+    std::cout << __FILE__ << ":" << __LINE__ << ":" << __func__ << "\n";
+    std::cout << "\tRunning a (" << params.population_size/2 << "/" << params.population_size/2 << "_W, " << params.population_size << ")-aCMA Evolutionary Strategy on " << params.threads << " threads.\n";
+    std::cout << "\tInitial mean vector: {";
+    for (size_t i = 0; i < n - 1; ++i) {
+      std::cout << mean_vector[i] << ", ";
+    }
+    std::cout << mean_vector[n - 1] << "}.\n";
+    std::cout << "\tCost: " << lowest_cost << ".\n";
+    std::cout << "\tInitial step length: " << sigma << ".\n";
+    std::cout << "\tVariance effective selection mass: " << mu_eff << ".\n";
+    std::cout << "\tLearning rate for rank-one update of covariance matrix: " << c_1 << ".\n";
+    std::cout << "\tLearning rate for rank-mu update of covariance matrix: " << c_mu << ".\n";
+    std::cout << "\tDecay rate for cumulation path for step-size control: " << c_sigma << ".\n";
+    std::cout << "\tLearning rate for the mean: " << c_m << ".\n";
+    std::cout << "\tDamping parameter for step-size update: " << d_sigma << ".\n";
+  }
+#endif
+  size_t generation = 0;
+
+  std::vector<Eigen::Vector<DimensionlessReal, Eigen::Dynamic>> ys(params.population_size);
+  std::vector<ArgumentContainer> xs(params.population_size);
+  std::vector<ResultType> costs(params.population_size, std::numeric_limits<ResultType>::quiet_NaN());
+  Eigen::Vector<DimensionlessReal, Eigen::Dynamic> weighted_avg_y(n);
+  Eigen::Vector<DimensionlessReal, Eigen::Dynamic> z(n);
+  if constexpr (detail::has_resize_v<ArgumentContainer>) {
+    for (auto & x : xs) {
+      x.resize(n, std::numeric_limits<Real>::quiet_NaN());
+    }
+  }
+  for (auto & y : ys) {
+    y.resize(n);
+  }
+  normal_distribution<DimensionlessReal> dis(DimensionlessReal(0), DimensionlessReal(1));
+  do {
+    if (cancellation && *cancellation) {
+      break;
+    }
+    // TODO: The reference contends the following in
+    // Section B.2 "Strategy internal numerical effort":
+    // "In practice, the re-calculation of B and D needs to be done not until about
+    // max(1, floor(1/(10n(c_1+c_mu)))) generations."
+    // Note that sigma can be dimensionless, in which case C carries the units.
+    // This is a weird decision-we're not gonna do that!
+    Eigen::SelfAdjointEigenSolver<Eigen::Matrix<DimensionlessReal, Eigen::Dynamic, Eigen::Dynamic>> eigensolver(C);
+    if (eigensolver.info() != Eigen::Success) {
+      std::ostringstream oss;
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": Could not decompose the covariance matrix as BDB^{T}.";
+      throw std::logic_error(oss.str());
+    }
+    Eigen::Matrix<DimensionlessReal, Eigen::Dynamic, Eigen::Dynamic> B = eigensolver.eigenvectors();
+    // Eigen returns D^2, in the notation of the survey:
+    auto D = eigensolver.eigenvalues();
+    // So make it better:
+    for (auto & d : D) {
+      if (d <= 0 || isnan(d)) {
+        std::ostringstream oss;
+        oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+        oss << ": The covariance matrix is not positive definite. This breaks the evolution path computation downstream.\n";
+        oss << "C=\n" << C << "\n";
+        oss << "Eigenvalues: " << D;
+        throw std::domain_error(oss.str());
+      }
+      d = sqrt(d);
+    }
+
+    for (size_t k = 0; k < params.population_size; ++k) {
+      auto & y = ys[k];
+      auto & x = xs[k];
+      BOOST_MATH_ASSERT(static_cast<size_t>(x.size()) == n);
+      BOOST_MATH_ASSERT(static_cast<size_t>(y.size()) == n);
+      size_t resample_counter = 0;
+      do {
+        // equation (39) of Figure 6:
+        // Also see equation (4):
+        for (size_t i = 0; i < n; ++i) {
+          z[i] = dis(gen);
+        }
+        Eigen::Vector<DimensionlessReal, Eigen::Dynamic> Dz(n);
+        for (size_t i = 0; i < n; ++i) {
+          Dz[i] = D[i]*z[i];
+        }
+        y = B*Dz;
+        for (size_t i = 0; i < n; ++i) {
+          BOOST_MATH_ASSERT(!isnan(mean_vector[i]));
+          BOOST_MATH_ASSERT(!isnan(y[i]));
+          x[i] = mean_vector[i] + sigma*y[i]; // equation (40) of Figure 6.
+        }
+        costs[k] = cost_function(x);
+        if (resample_counter++ == 50) {
+          std::ostringstream oss;
+          oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+          oss << ": 50 resamples was not sufficient to find an argument to the cost function which did not return NaN.";
+          oss << " Giving up.";
+          throw std::domain_error(oss.str());
+        }
+      } while (isnan(costs[k]));
+
+      if (queries) {
+        queries->emplace_back(std::make_pair(x, costs[k]));
+      }
+      if (costs[k] < lowest_cost) {
+        lowest_cost = costs[k];
+        best_vector = x;
+        if (current_minimum_cost && costs[k] < *current_minimum_cost) {
+          *current_minimum_cost = costs[k];
+        }
+        if (lowest_cost < target_value) {
+          target_attained = true;
+          break;
+        }
+      }
+    }
+    if (target_attained) {
+      break;
+    }
+    if (cancellation && *cancellation) {
+      break;
+    }
+    auto indices = detail::best_indices(costs);
+    // Equation (41), Figure 6:
+    for (size_t j = 0; j < n; ++j) {
+      weighted_avg_y[j] = 0;
+      for (size_t i = 0; i < mu; ++i) {
+        BOOST_MATH_ASSERT(!isnan(weights[i]));
+        BOOST_MATH_ASSERT(!isnan(ys[indices[i]][j]));
+        weighted_avg_y[j] += weights[i]*ys[indices[i]][j];
+      }
+    }
+    // Equation (42), Figure 6:
+    for (size_t j = 0; j < n; ++j) {
+      mean_vector[j] = mean_vector[j] + c_m*sigma*weighted_avg_y[j];
+    }
+    // Equation (43), Figure 6: Start with C^{-1/2}<y>_{w}
+    Eigen::Vector<DimensionlessReal, Eigen::Dynamic> inv_D_B_transpose_y = B.transpose()*weighted_avg_y;
+    for (long j = 0; j < inv_D_B_transpose_y.size(); ++j) {
+      inv_D_B_transpose_y[j] /= D[j];
+    }
+    Eigen::Vector<DimensionlessReal, Eigen::Dynamic> C_inv_sqrt_y_avg = B*inv_D_B_transpose_y;
+    // Equation (43), Figure 6:
+    DimensionlessReal p_sigma_norm = 0;
+    for (size_t j = 0; j < n; ++j) {
+      p_sigma[j] = (1-c_sigma)*p_sigma[j] + sqrt(c_sigma*(2-c_sigma)*mu_eff)*C_inv_sqrt_y_avg[j];
+      p_sigma_norm += p_sigma[j]*p_sigma[j];
+    }
+    p_sigma_norm = sqrt(p_sigma_norm);
+    // A: Algorithm Summary: E[||N(0,1)||]:
+    const DimensionlessReal expectation_norm_0I = sqrt(static_cast<DimensionlessReal>(n))*(DimensionlessReal(1) - DimensionlessReal(1)/(4*n) + DimensionlessReal(1)/(21*n*n));
+    // Equation (44), Figure 6:
+    sigma = sigma*exp(c_sigma*(p_sigma_norm/expectation_norm_0I -1)/d_sigma);
+    // A: Algorithm Summary:
+    DimensionlessReal h_sigma = 0;
+    DimensionlessReal rhs = (DimensionlessReal(1.4) + DimensionlessReal(2)/(n+1))*expectation_norm_0I*sqrt(1 - pow(1-c_sigma, 2*(generation+1)));
+    if (p_sigma_norm < rhs) {
+      h_sigma = 1;
+    }
+    // Equation (45), Figure 6:
+    p_c = (1-c_c)*p_c + h_sigma*sqrt(c_c*(2-c_c)*mu_eff)*weighted_avg_y;
+    DimensionlessReal delta_h_sigma = (1-h_sigma)*c_c*(2-c_c);
+    DimensionlessReal weight_sum = 0;
+    for (auto & w : weights) {
+      weight_sum += w;
+    }
+    // Equation (47), Figure 6:
+    DimensionlessReal K = (1 + c_1*delta_h_sigma - c_1 - c_mu*weight_sum);
+    // Can these operations be sped up using `.selfadjointView<Eigen::Upper>`?
+    // Maybe: A.selfadjointView<Eigen::Lower>().rankUpdate(p_c, c_1);?
+    C = K*C + c_1*p_c*p_c.transpose();
+    // Incorporate positive weights of Equation (46):
+    for (size_t i = 0; i < params.population_size/2; ++i) {
+      C += c_mu*weights[i]*ys[indices[i]]*ys[indices[i]].transpose();
+    }
+    for (size_t i = params.population_size/2; i < params.population_size; ++i) {
+      Eigen::Vector<DimensionlessReal, Eigen::Dynamic> D_inv_BTy = B.transpose()*ys[indices[i]];
+      for (size_t j = 0; j < n; ++j) {
+        D_inv_BTy[j] /= D[j];
+      }
+      DimensionlessReal squared_norm = D_inv_BTy.squaredNorm();
+      DimensionlessReal K2 = c_mu*weights[i]/squared_norm;
+      C += K2*ys[indices[i]]*ys[indices[i]].transpose();
+    }
+  } while (generation++ < params.max_generations);
+
+  return best_vector;
+}
+
+} // namespace boost::math::optimization
+#endif
diff --git a/inst/include/boost/math/optimization/detail/common.hpp b/inst/include/boost/math/optimization/detail/common.hpp
new file mode 100644
index 000000000..05124026e
--- /dev/null
+++ b/inst/include/boost/math/optimization/detail/common.hpp
@@ -0,0 +1,200 @@
+/*
+ * Copyright Nick Thompson, 2024
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef BOOST_MATH_OPTIMIZATION_DETAIL_COMMON_HPP
+#define BOOST_MATH_OPTIMIZATION_DETAIL_COMMON_HPP
+#include <algorithm> // for std::sort
+#include <cmath>
+#include <limits>
+#include <sstream>
+#include <stdexcept>
+#include <random>
+#include <type_traits>  // for std::false_type
+
+namespace boost::math::optimization::detail {
+
+template <typename T, typename = void> struct has_resize : std::false_type {};
+
+template <typename T>
+struct has_resize<T, std::void_t<decltype(std::declval<T>().resize(size_t{}))>> : std::true_type {};
+
+template <typename T> constexpr bool has_resize_v = has_resize<T>::value;
+
+template <typename ArgumentContainer>
+void validate_bounds(ArgumentContainer const &lower_bounds, ArgumentContainer const &upper_bounds) {
+  using std::isfinite;
+  std::ostringstream oss;
+  if (lower_bounds.size() == 0) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": The dimension of the problem cannot be zero.";
+    throw std::domain_error(oss.str());
+  }
+  if (upper_bounds.size() != lower_bounds.size()) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must be the same number of lower bounds as upper bounds, but given ";
+    oss << upper_bounds.size() << " upper bounds, and " << lower_bounds.size() << " lower bounds.";
+    throw std::domain_error(oss.str());
+  }
+  for (size_t i = 0; i < lower_bounds.size(); ++i) {
+    auto lb = lower_bounds[i];
+    auto ub = upper_bounds[i];
+    if (lb > ub) {
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": The upper bound must be greater than or equal to the lower bound, but the upper bound is " << ub
+          << " and the lower is " << lb << ".";
+      throw std::domain_error(oss.str());
+    }
+    if (!isfinite(lb)) {
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": The lower bound must be finite, but got " << lb << ".";
+      oss << " For infinite bounds, emulate with std::numeric_limits<Real>::lower() or use a standard infinite->finite "
+             "transform.";
+      throw std::domain_error(oss.str());
+    }
+    if (!isfinite(ub)) {
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": The upper bound must be finite, but got " << ub << ".";
+      oss << " For infinite bounds, emulate with std::numeric_limits<Real>::max() or use a standard infinite->finite "
+             "transform.";
+      throw std::domain_error(oss.str());
+    }
+  }
+}
+
+template <typename ArgumentContainer, class URBG>
+std::vector<ArgumentContainer> random_initial_population(ArgumentContainer const &lower_bounds,
+                                                         ArgumentContainer const &upper_bounds,
+                                                         size_t initial_population_size, URBG &&gen) {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  constexpr bool has_resize = detail::has_resize_v<ArgumentContainer>;
+  std::vector<ArgumentContainer> population(initial_population_size);
+  auto const dimension = lower_bounds.size();
+  for (size_t i = 0; i < population.size(); ++i) {
+    if constexpr (has_resize) {
+      population[i].resize(dimension);
+    } else {
+      // Argument type must be known at compile-time; like std::array:
+      if (population[i].size() != dimension) {
+        std::ostringstream oss;
+        oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+        oss << ": For containers which do not have resize, the default size must be the same as the dimension, ";
+        oss << "but the default container size is " << population[i].size() << " and the dimension of the problem is "
+            << dimension << ".";
+        oss << " The function argument container type is " << typeid(ArgumentContainer).name() << ".\n";
+        throw std::runtime_error(oss.str());
+      }
+    }
+  }
+
+  // Why don't we provide an option to initialize with (say) a Gaussian distribution?
+  // > If the optimum's location is fairly well known,
+  // > a Gaussian distribution may prove somewhat faster, although it
+  // > may also increase the probability that the population will converge prematurely.
+  // > In general, uniform distributions are preferred, since they best reflect
+  // > the lack of knowledge about the optimum's location.
+  //  - Differential Evolution: A Practical Approach to Global Optimization
+  // That said, scipy uses Latin Hypercube sampling and says self-avoiding sequences are preferable.
+  // So this is something that could be investigated and potentially improved.
+  using std::uniform_real_distribution;
+  uniform_real_distribution<DimensionlessReal> dis(DimensionlessReal(0), DimensionlessReal(1));
+  for (size_t i = 0; i < population.size(); ++i) {
+    for (size_t j = 0; j < dimension; ++j) {
+      auto const &lb = lower_bounds[j];
+      auto const &ub = upper_bounds[j];
+      population[i][j] = lb + dis(gen) * (ub - lb);
+    }
+  }
+
+  return population;
+}
+
+template <typename ArgumentContainer>
+void validate_initial_guess(ArgumentContainer const &initial_guess, ArgumentContainer const &lower_bounds,
+                            ArgumentContainer const &upper_bounds) {
+  using std::isfinite;
+  std::ostringstream oss;
+  auto const dimension = lower_bounds.size();
+  if (initial_guess.size() != dimension) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": The initial guess must have the same dimensions as the problem,";
+    oss << ", but the problem size is " << dimension << " and the initial guess has " << initial_guess.size()
+        << " elements.";
+    throw std::domain_error(oss.str());
+  }
+  for (size_t i = 0; i < dimension; ++i) {
+    auto lb = lower_bounds[i];
+    auto ub = upper_bounds[i];
+    if (!isfinite(initial_guess[i])) {
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": At index " << i << ", the initial guess is " << initial_guess[i]
+          << ", make sure all elements of the initial guess are finite.";
+      throw std::domain_error(oss.str());
+    }
+    if (initial_guess[i] < lb || initial_guess[i] > ub) {
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": At index " << i << " the initial guess " << initial_guess[i] << " is not in the bounds [" << lb << ", "
+          << ub << "].";
+      throw std::domain_error(oss.str());
+    }
+  }
+}
+
+// Return indices corresponding to the minimum function values.
+template <typename Real> std::vector<size_t> best_indices(std::vector<Real> const &function_values) {
+  using std::isnan;
+  const size_t n = function_values.size();
+  std::vector<size_t> indices(n);
+  for (size_t i = 0; i < n; ++i) {
+    indices[i] = i;
+  }
+
+  std::sort(indices.begin(), indices.end(), [&](size_t a, size_t b) {
+    if (isnan(function_values[a])) {
+      return false;
+    }
+    if (isnan(function_values[b])) {
+      return true;
+    }
+    return function_values[a] < function_values[b];
+  });
+  return indices;
+}
+
+template<typename RandomAccessContainer>
+auto weighted_lehmer_mean(RandomAccessContainer const & values, RandomAccessContainer const & weights) {
+  using std::isfinite;
+  if (values.size() != weights.size()) {
+    std::ostringstream oss;
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must be the same number of weights as values, but got " << values.size() << " values and " << weights.size() << " weights.";
+    throw std::logic_error(oss.str());
+  }
+  if (values.size() == 0) {
+    std::ostringstream oss;
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must at least one value provided.";
+    throw std::logic_error(oss.str());
+  }
+  using Real = typename RandomAccessContainer::value_type;
+  Real numerator = 0;
+  Real denominator = 0;
+  for (size_t i = 0; i < values.size(); ++i) {
+    if (weights[i] < 0 || !isfinite(weights[i])) {
+      std::ostringstream oss;
+      oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+      oss << ": All weights must be positive and finite, but got received weight " << weights[i] << " at index " << i << " of " << weights.size() << ".";
+      throw std::domain_error(oss.str());
+    }
+    Real tmp = weights[i]*values[i];
+    numerator += tmp*values[i];
+    denominator += tmp;
+  }
+  return numerator/denominator;
+}
+
+} // namespace boost::math::optimization::detail
+#endif
diff --git a/inst/include/boost/math/optimization/differential_evolution.hpp b/inst/include/boost/math/optimization/differential_evolution.hpp
new file mode 100644
index 000000000..4a488542b
--- /dev/null
+++ b/inst/include/boost/math/optimization/differential_evolution.hpp
@@ -0,0 +1,236 @@
+/*
+ * Copyright Nick Thompson, 2024
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef BOOST_MATH_OPTIMIZATION_DIFFERENTIAL_EVOLUTION_HPP
+#define BOOST_MATH_OPTIMIZATION_DIFFERENTIAL_EVOLUTION_HPP
+#include <atomic>
+#include <boost/math/optimization/detail/common.hpp>
+#include <cmath>
+#include <limits>
+#include <mutex>
+#include <random>
+#include <sstream>
+#include <stdexcept>
+#include <thread>
+#include <utility>
+#include <vector>
+
+namespace boost::math::optimization {
+
+// Storn, R., Price, K. (1997). Differential evolution-a simple and efficient heuristic for global optimization over
+// continuous spaces.
+// Journal of global optimization, 11, 341-359.
+// See:
+// https://www.cp.eng.chula.ac.th/~prabhas//teaching/ec/ec2012/storn_price_de.pdf
+
+// We provide the parameters in a struct-there are too many of them and they are too unwieldy to pass individually:
+template <typename ArgumentContainer> struct differential_evolution_parameters {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  ArgumentContainer lower_bounds;
+  ArgumentContainer upper_bounds;
+  // mutation factor is also called scale factor or just F in the literature:
+  DimensionlessReal mutation_factor = static_cast<DimensionlessReal>(0.65);
+  DimensionlessReal crossover_probability = static_cast<DimensionlessReal>(0.5);
+  // Population in each generation:
+  size_t NP = 500;
+  size_t max_generations = 1000;
+  ArgumentContainer const *initial_guess = nullptr;
+  unsigned threads = std::thread::hardware_concurrency();
+};
+
+template <typename ArgumentContainer>
+void validate_differential_evolution_parameters(differential_evolution_parameters<ArgumentContainer> const &de_params) {
+  using std::isfinite;
+  using std::isnan;
+  std::ostringstream oss;
+  detail::validate_bounds(de_params.lower_bounds, de_params.upper_bounds);
+  if (de_params.NP < 4) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": The population size must be at least 4, but requested population size of " << de_params.NP << ".";
+    throw std::invalid_argument(oss.str());
+  }
+  // From: "Differential Evolution: A Practical Approach to Global Optimization (Natural Computing Series)"
+  // > The scale factor, F in (0,1+), is a positive real number that controls the rate at which the population evolves.
+  // > While there is no upper limit on F, effective values are seldom greater than 1.0.
+  // ...
+  // Also see "Limits on F", Section 2.5.1:
+  // > This discontinuity at F = 1 reduces the number of mutants by half and can result in erratic convergence...
+  auto F = de_params.mutation_factor;
+  if (isnan(F) || F >= 1 || F <= 0) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": F in (0, 1) is required, but got F=" << F << ".";
+    throw std::domain_error(oss.str());
+  }
+  if (de_params.max_generations < 1) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must be at least one generation.";
+    throw std::invalid_argument(oss.str());
+  }
+  if (de_params.initial_guess) {
+    detail::validate_initial_guess(*de_params.initial_guess, de_params.lower_bounds, de_params.upper_bounds);
+  }
+  if (de_params.threads == 0) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must be at least one thread.";
+    throw std::invalid_argument(oss.str());
+  }
+}
+
+template <typename ArgumentContainer, class Func, class URBG>
+ArgumentContainer differential_evolution(
+    const Func cost_function, differential_evolution_parameters<ArgumentContainer> const &de_params, URBG &gen,
+    std::invoke_result_t<Func, ArgumentContainer> target_value =
+        std::numeric_limits<std::invoke_result_t<Func, ArgumentContainer>>::quiet_NaN(),
+    std::atomic<bool> *cancellation = nullptr,
+    std::vector<std::pair<ArgumentContainer, std::invoke_result_t<Func, ArgumentContainer>>> *queries = nullptr,
+    std::atomic<std::invoke_result_t<Func, ArgumentContainer>> *current_minimum_cost = nullptr) {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  using ResultType = std::invoke_result_t<Func, ArgumentContainer>;
+  using std::clamp;
+  using std::isnan;
+  using std::round;
+  using std::uniform_real_distribution;
+  validate_differential_evolution_parameters(de_params);
+  const size_t dimension = de_params.lower_bounds.size();
+  auto NP = de_params.NP;
+  auto population = detail::random_initial_population(de_params.lower_bounds, de_params.upper_bounds, NP, gen);
+  if (de_params.initial_guess) {
+    population[0] = *de_params.initial_guess;
+  }
+  std::vector<ResultType> cost(NP, std::numeric_limits<ResultType>::quiet_NaN());
+  std::atomic<bool> target_attained = false;
+  // This mutex is only used if the queries are stored:
+  std::mutex mt;
+
+  std::vector<std::thread> thread_pool;
+  auto const threads = de_params.threads;
+  for (size_t j = 0; j < threads; ++j) {
+    // Note that if some members of the population take way longer to compute,
+    // then this parallelization strategy is very suboptimal.
+    // However, we tried using std::async (which should be robust to this particular problem),
+    // but the overhead was just totally unacceptable on ARM Macs (the only platform tested).
+    // As the economists say "there are no solutions, only tradeoffs".
+    thread_pool.emplace_back([&, j]() {
+      for (size_t i = j; i < cost.size(); i += threads) {
+        cost[i] = cost_function(population[i]);
+        if (current_minimum_cost && cost[i] < *current_minimum_cost) {
+          *current_minimum_cost = cost[i];
+        }
+        if (queries) {
+          std::scoped_lock lock(mt);
+          queries->push_back(std::make_pair(population[i], cost[i]));
+        }
+        if (!isnan(target_value) && cost[i] <= target_value) {
+          target_attained = true;
+        }
+      }
+    });
+  }
+  for (auto &thread : thread_pool) {
+    thread.join();
+  }
+
+  std::vector<ArgumentContainer> trial_vectors(NP);
+  for (size_t i = 0; i < NP; ++i) {
+    if constexpr (detail::has_resize_v<ArgumentContainer>) {
+      trial_vectors[i].resize(dimension);
+    }
+  }
+  std::vector<URBG> thread_generators(threads);
+  for (size_t j = 0; j < threads; ++j) {
+    thread_generators[j].seed(gen());
+  }
+  // std::vector<bool> isn't threadsafe!
+  std::vector<int> updated_indices(NP, 0);
+
+  for (size_t generation = 0; generation < de_params.max_generations; ++generation) {
+    if (cancellation && *cancellation) {
+      break;
+    }
+    if (target_attained) {
+      break;
+    }
+    thread_pool.resize(0);
+    for (size_t j = 0; j < threads; ++j) {
+      thread_pool.emplace_back([&, j]() {
+        auto& tlg = thread_generators[j];
+        uniform_real_distribution<DimensionlessReal> unif01(DimensionlessReal(0), DimensionlessReal(1));
+        for (size_t i = j; i < cost.size(); i += threads) {
+          if (target_attained) {
+            return;
+          }
+          if (cancellation && *cancellation) {
+            return;
+          }
+          size_t r1, r2, r3;
+          do {
+            r1 = tlg() % NP;
+          } while (r1 == i);
+          do {
+            r2 = tlg() % NP;
+          } while (r2 == i || r2 == r1);
+          do {
+            r3 = tlg() % NP;
+          } while (r3 == i || r3 == r2 || r3 == r1);
+
+          for (size_t k = 0; k < dimension; ++k) {
+            // See equation (4) of the reference:
+            auto guaranteed_changed_idx = tlg() % dimension;
+            if (unif01(tlg) < de_params.crossover_probability || k == guaranteed_changed_idx) {
+              auto tmp = population[r1][k] + de_params.mutation_factor * (population[r2][k] - population[r3][k]);
+              auto const &lb = de_params.lower_bounds[k];
+              auto const &ub = de_params.upper_bounds[k];
+              // Some others recommend regenerating the indices rather than clamping;
+              // I dunno seems like it could get stuck regenerating . . .
+              trial_vectors[i][k] = clamp(tmp, lb, ub);
+            } else {
+              trial_vectors[i][k] = population[i][k];
+            }
+          }
+
+          auto const trial_cost = cost_function(trial_vectors[i]);
+          if (isnan(trial_cost)) {
+            continue;
+          }
+          if (queries) {
+            std::scoped_lock lock(mt);
+            queries->push_back(std::make_pair(trial_vectors[i], trial_cost));
+          }
+          if (trial_cost < cost[i] || isnan(cost[i])) {
+            cost[i] = trial_cost;
+            if (!isnan(target_value) && cost[i] <= target_value) {
+              target_attained = true;
+            }
+            if (current_minimum_cost && cost[i] < *current_minimum_cost) {
+              *current_minimum_cost = cost[i];
+            }
+            // Can't do this! It's a race condition!
+            //population[i] = trial_vectors[i];
+            // Instead mark all the indices that need to be updated:
+            updated_indices[i] = 1;
+          }
+        }
+      });
+    }
+    for (auto &thread : thread_pool) {
+      thread.join();
+    }
+    for (size_t i = 0; i < NP; ++i) {
+      if (updated_indices[i]) {
+        population[i] = trial_vectors[i];
+        updated_indices[i] = 0;
+      }
+    }
+  }
+
+  auto it = std::min_element(cost.begin(), cost.end());
+  return population[std::distance(cost.begin(), it)];
+}
+
+} // namespace boost::math::optimization
+#endif
diff --git a/inst/include/boost/math/optimization/jso.hpp b/inst/include/boost/math/optimization/jso.hpp
new file mode 100644
index 000000000..25bc5e8fc
--- /dev/null
+++ b/inst/include/boost/math/optimization/jso.hpp
@@ -0,0 +1,464 @@
+/*
+ * Copyright Nick Thompson, 2024
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef BOOST_MATH_OPTIMIZATION_JSO_HPP
+#define BOOST_MATH_OPTIMIZATION_JSO_HPP
+#include <atomic>
+#include <boost/math/optimization/detail/common.hpp>
+#include <cmath>
+#include <iostream>
+#include <limits>
+#include <random>
+#include <sstream>
+#include <stdexcept>
+#include <thread>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace boost::math::optimization {
+
+#ifndef BOOST_MATH_DEBUG_JSO
+#define BOOST_MATH_DEBUG_JSO 0
+#endif
+// Follows: Brest, Janez, Mirjam Sepesy Maucec, and Borko Boskovic. "Single
+// objective real-parameter optimization: Algorithm jSO." 2017 IEEE congress on
+// evolutionary computation (CEC). IEEE, 2017. In the sequel, this wil be
+// referred to as "the reference". Note that the reference is rather difficult
+// to understand without also reading: Zhang, J., & Sanderson, A. C. (2009).
+// JADE: adaptive differential evolution with optional external archive.
+// IEEE Transactions on evolutionary computation, 13(5), 945-958."
+template <typename ArgumentContainer> struct jso_parameters {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  ArgumentContainer lower_bounds;
+  ArgumentContainer upper_bounds;
+  // Population in the first generation.
+  // This defaults to 0, which indicates "use the default specified in the
+  // referenced paper". To wit, initial population size
+  // =ceil(25log(D+1)sqrt(D)), where D is the dimension of the problem.
+  size_t initial_population_size = 0;
+  // Maximum number of function evaluations.
+  // The default of 0 indicates "use max_function_evaluations = 10,000D", where
+  // D is the dimension of the problem.
+  size_t max_function_evaluations = 0;
+  size_t threads = std::thread::hardware_concurrency();
+  ArgumentContainer const *initial_guess = nullptr;
+};
+
+template <typename ArgumentContainer>
+void validate_jso_parameters(jso_parameters<ArgumentContainer> &jso_params) {
+  using std::isfinite;
+  using std::isnan;
+  std::ostringstream oss;
+  if (jso_params.threads == 0) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": Requested zero threads to perform the calculation, but at least "
+           "1 is required.";
+    throw std::invalid_argument(oss.str());
+  }
+  detail::validate_bounds(jso_params.lower_bounds, jso_params.upper_bounds);
+  auto const dimension = jso_params.lower_bounds.size();
+  if (jso_params.initial_population_size == 0) {
+    // Ever so slightly different than the reference-the dimension can be 1,
+    // but if we followed the reference, the population size would then be zero.
+    jso_params.initial_population_size = static_cast<size_t>(
+        std::ceil(25 * std::log(dimension + 1.0) * sqrt(dimension)));
+  }
+  if (jso_params.max_function_evaluations == 0) {
+    // Recommended value from the reference:
+    jso_params.max_function_evaluations = 10000 * dimension;
+  }
+  if (jso_params.initial_population_size < 4) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": The population size must be at least 4, but requested population "
+           "size of "
+        << jso_params.initial_population_size << ".";
+    throw std::invalid_argument(oss.str());
+  }
+  if (jso_params.threads > jso_params.initial_population_size) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must be more individuals in the population than threads.";
+    throw std::invalid_argument(oss.str());
+  }
+  if (jso_params.initial_guess) {
+    detail::validate_initial_guess(*jso_params.initial_guess,
+                                   jso_params.lower_bounds,
+                                   jso_params.upper_bounds);
+  }
+}
+
+template <typename ArgumentContainer, class Func, class URBG>
+ArgumentContainer
+jso(const Func cost_function, jso_parameters<ArgumentContainer> &jso_params,
+    URBG &gen,
+    std::invoke_result_t<Func, ArgumentContainer> target_value =
+        std::numeric_limits<
+            std::invoke_result_t<Func, ArgumentContainer>>::quiet_NaN(),
+    std::atomic<bool> *cancellation = nullptr,
+    std::atomic<std::invoke_result_t<Func, ArgumentContainer>>
+        *current_minimum_cost = nullptr,
+    std::vector<std::pair<ArgumentContainer,
+                          std::invoke_result_t<Func, ArgumentContainer>>>
+        *queries = nullptr) {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  validate_jso_parameters(jso_params);
+
+  using ResultType = std::invoke_result_t<Func, ArgumentContainer>;
+  using std::abs;
+  using std::cauchy_distribution;
+  using std::clamp;
+  using std::isnan;
+  using std::max;
+  using std::round;
+  using std::isfinite;
+  using std::uniform_real_distribution;
+
+  // Refer to the referenced paper, pseudocode on page 1313:
+  // Algorithm 1, jSO, Line 1:
+  std::vector<ArgumentContainer> archive;
+
+  // Algorithm 1, jSO, Line 2
+  // "Initialize population P_g = (x_0,g, ..., x_{np-1},g) randomly.
+  auto population = detail::random_initial_population(
+      jso_params.lower_bounds, jso_params.upper_bounds,
+      jso_params.initial_population_size, gen);
+  if (jso_params.initial_guess) {
+    population[0] = *jso_params.initial_guess;
+  }
+  size_t dimension = jso_params.lower_bounds.size();
+  // Don't force the user to initialize to sane value:
+  if (current_minimum_cost) {
+    *current_minimum_cost = std::numeric_limits<ResultType>::infinity();
+  }
+  std::atomic<bool> target_attained = false;
+  std::vector<ResultType> cost(jso_params.initial_population_size,
+                               std::numeric_limits<ResultType>::quiet_NaN());
+  for (size_t i = 0; i < cost.size(); ++i) {
+    cost[i] = cost_function(population[i]);
+    if (!isnan(target_value) && cost[i] <= target_value) {
+      target_attained = true;
+    }
+    if (current_minimum_cost && cost[i] < *current_minimum_cost) {
+      *current_minimum_cost = cost[i];
+    }
+    if (queries) {
+      queries->push_back(std::make_pair(population[i], cost[i]));
+    }
+  }
+  std::vector<size_t> indices = detail::best_indices(cost);
+  std::atomic<size_t> function_evaluations = population.size();
+#if BOOST_MATH_DEBUG_JSO
+  {
+    auto const &min_cost = cost[indices[0]];
+    auto const &location = population[indices[0]];
+    std::cout << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    std::cout << "\n\tMinimum cost after evaluation of initial random "
+                 "population of size "
+              << population.size() << " is " << min_cost << "."
+              << "\n\tLocation {";
+    for (size_t i = 0; i < location.size() - 1; ++i) {
+      std::cout << location[i] << ", ";
+    }
+    std::cout << location.back() << "}.\n";
+  }
+#endif
+  // Algorithm 1: jSO algorithm, Line 3:
+  // "Set all values in M_F to 0.5":
+  // I believe this is a typo: Compare with "Section B. Experimental Results",
+  // last bullet, which claims this should be set to 0.3. The reference
+  // implementation also does 0.3:
+  size_t H = 5;
+  std::vector<DimensionlessReal> M_F(H, static_cast<DimensionlessReal>(0.3));
+  // Algorithm 1: jSO algorithm, Line 4:
+  // "Set all values in M_CR to 0.8":
+  std::vector<DimensionlessReal> M_CR(H, static_cast<DimensionlessReal>(0.8));
+
+  std::uniform_real_distribution<DimensionlessReal> unif01(DimensionlessReal(0), DimensionlessReal(1));
+  bool keep_going = !target_attained;
+  if (cancellation && *cancellation) {
+    keep_going = false;
+  }
+  // k from:
+  // http://metahack.org/CEC2014-Tanabe-Fukunaga.pdf, Algorithm 1:
+  // Determines where Lehmer means are stored in the memory:
+  size_t k = 0;
+  size_t minimum_population_size = (max)(size_t(4), size_t(jso_params.threads));
+  while (keep_going) {
+    // Algorithm 1, jSO, Line 7:
+    std::vector<DimensionlessReal> S_CR;
+    std::vector<DimensionlessReal> S_F;
+    // Equation 9 of L-SHADE:
+    std::vector<ResultType> delta_f;
+    for (size_t i = 0; i < population.size(); ++i) {
+      // Algorithm 1, jSO, Line 9:
+      auto ri = gen() % H;
+      // Algorithm 1, jSO, Line 10-13:
+      // Again, what is written in the pseudocode is not quite right.
+      // What they mean is mu_F = 0.9-the historical memory is not used.
+      // I confess I find it weird to store the historical memory if we're just
+      // gonna ignore it, but that's what the paper and the reference
+      // implementation says!
+      DimensionlessReal mu_F = static_cast<DimensionlessReal>(0.9);
+      DimensionlessReal mu_CR = static_cast<DimensionlessReal>(0.9);
+      if (ri != H - 1) {
+        mu_F = M_F[ri];
+        mu_CR = M_CR[ri];
+      }
+      // Algorithm 1, jSO, Line 14-18:
+      DimensionlessReal crossover_probability = static_cast<DimensionlessReal>(0);
+      if (mu_CR >= 0) {
+        using std::normal_distribution;
+        normal_distribution<DimensionlessReal> normal(mu_CR, static_cast<DimensionlessReal>(0.1));
+        crossover_probability = normal(gen);
+        // Clamp comes from L-SHADE description:
+        crossover_probability = clamp(crossover_probability, DimensionlessReal(0), DimensionlessReal(1));
+      }
+      // Algorithm 1, jSO, Line 19-23:
+      // Note that the pseudocode uses a "max_generations parameter",
+      // but the reference implementation does not.
+      // Since we already require specification of max_function_evaluations,
+      // the pseudocode adds an unnecessary parameter.
+      if (4 * function_evaluations < jso_params.max_function_evaluations) {
+        crossover_probability = (max)(crossover_probability, DimensionlessReal(0.7));
+      } else if (2 * function_evaluations <
+                 jso_params.max_function_evaluations) {
+        crossover_probability = (max)(crossover_probability, DimensionlessReal(0.6));
+      }
+
+      // Algorithm 1, jSO, Line 24-27:
+      // Note the adjustments to the pseudocode given in the reference
+      // implementation.
+      cauchy_distribution<DimensionlessReal> cauchy(mu_F, static_cast<DimensionlessReal>(0.1));
+      DimensionlessReal F;
+      do {
+        F = cauchy(gen);
+        if (F > 1) {
+          F = 1;
+        }
+      } while (F <= 0);
+      DimensionlessReal threshold = static_cast<DimensionlessReal>(7) / static_cast<DimensionlessReal>(10);
+      if ((10 * function_evaluations <
+           6 * jso_params.max_function_evaluations) &&
+          (F > threshold)) {
+        F = threshold;
+      }
+      // > p value for mutation strategy linearly decreases from pmax to pmin
+      // during the evolutionary process, > where pmax = 0.25 in jSO and pmin =
+      // pmax/2.
+      DimensionlessReal p = DimensionlessReal(0.25) * (1 - static_cast<DimensionlessReal>(function_evaluations) /
+                                     (2 * jso_params.max_function_evaluations));
+      // Equation (4) of the reference:
+      DimensionlessReal Fw = static_cast<DimensionlessReal>(1.2) * F;
+      if (10 * function_evaluations < 4 * jso_params.max_function_evaluations) {
+        if (10 * function_evaluations <
+            2 * jso_params.max_function_evaluations) {
+          Fw = static_cast<DimensionlessReal>(0.7) * F;
+        } else {
+          Fw = static_cast<DimensionlessReal>(0.8) * F;
+        }
+      }
+      // Algorithm 1, jSO, Line 28:
+      // "ui,g := current-to-pBest-w/1/bin using Eq. (3)"
+      // This is not explained in the reference, but "current-to-pBest"
+      // strategy means "select randomly among the best values available."
+      // See:
+      // Zhang, J., & Sanderson, A. C. (2009).
+      // JADE: adaptive differential evolution with optional external archive.
+      // IEEE Transactions on evolutionary computation, 13(5), 945-958.
+      // > As a generalization of DE/current-to- best,
+      // > DE/current-to-pbest utilizes not only the best solution information
+      // > but also the information of other good solutions.
+      // > To be specific, any of the top 100p%, p in (0, 1],
+      // > solutions can be randomly chosen in DE/current-to-pbest to play the
+      // role > designed exclusively for the single best solution in
+      // DE/current-to-best."
+      size_t max_p_index = static_cast<size_t>(std::ceil(p * indices.size()));
+      size_t p_best_idx = gen() % max_p_index;
+      // We now need r1, r2 so that r1 != r2 != i:
+      size_t r1;
+      do {
+        r1 = gen() % population.size();
+      } while (r1 == i);
+      size_t r2;
+      do {
+        r2 = gen() % (population.size() + archive.size());
+      } while (r2 == r1 || r2 == i);
+
+      ArgumentContainer trial_vector;
+      if constexpr (detail::has_resize_v<ArgumentContainer>) {
+        trial_vector.resize(dimension);
+      }
+      auto const &xi = population[i];
+      auto const &xr1 = population[r1];
+      ArgumentContainer xr2;
+      if (r2 < population.size()) {
+        xr2 = population[r2];
+      } else {
+        xr2 = archive[r2 - population.size()];
+      }
+      auto const &x_p_best = population[p_best_idx];
+      for (size_t j = 0; j < dimension; ++j) {
+        auto guaranteed_changed_idx = gen() % dimension;
+        if (unif01(gen) < crossover_probability ||
+            j == guaranteed_changed_idx) {
+          auto tmp = xi[j] + Fw * (x_p_best[j] - xi[j]) + F * (xr1[j] - xr2[j]);
+          auto const &lb = jso_params.lower_bounds[j];
+          auto const &ub = jso_params.upper_bounds[j];
+          // Some others recommend regenerating the indices rather than
+          // clamping; I dunno seems like it could get stuck regenerating . . .
+          // Another suggestion is provided in:
+          // "JADE: Adaptive Differential Evolution with Optional External
+          // Archive" page 947. Perhaps we should implement it!
+          trial_vector[j] = clamp(tmp, lb, ub);
+        } else {
+          trial_vector[j] = population[i][j];
+        }
+      }
+      auto trial_cost = cost_function(trial_vector);
+      function_evaluations++;
+      if (isnan(trial_cost)) {
+        continue;
+      }
+      if (queries) {
+        queries->push_back(std::make_pair(trial_vector, trial_cost));
+      }
+
+      // Successful trial:
+      if (trial_cost < cost[i] || isnan(cost[i])) {
+        if (!isnan(target_value) && trial_cost <= target_value) {
+          target_attained = true;
+        }
+        if (current_minimum_cost && trial_cost < *current_minimum_cost) {
+          *current_minimum_cost = trial_cost;
+        }
+        // Can't decide on improvement if the previous evaluation was a NaN:
+        if (!isnan(cost[i])) {
+          if (crossover_probability > 1 || crossover_probability < 0) {
+            throw std::domain_error("Crossover probability is weird.");
+          }
+          if (F > 1 || F < 0) {
+            throw std::domain_error("Scale factor (F) is weird.");
+          }
+          S_CR.push_back(crossover_probability);
+          S_F.push_back(F);
+          delta_f.push_back(abs(cost[i] - trial_cost));
+        }
+        // Build the historical archive:
+        if (archive.size() < cost.size()) {
+          archive.push_back(trial_vector);
+        } else {
+          // If it's already built, then put the successful trial in a random index:
+          archive.resize(cost.size());
+          auto idx = gen() % archive.size();
+          archive[idx] = trial_vector;
+        }
+        cost[i] = trial_cost;
+        population[i] = trial_vector;
+      }
+    }
+
+    indices = detail::best_indices(cost);
+
+    // If there are no successful updates this generation, we do not update the
+    // historical memory:
+    if (S_CR.size() > 0) {
+      std::vector<DimensionlessReal> weights(S_CR.size(),
+                                std::numeric_limits<DimensionlessReal>::quiet_NaN());
+      ResultType delta_sum = static_cast<ResultType>(0);
+      for (auto const &delta : delta_f) {
+        delta_sum += delta;
+      }
+      if (delta_sum <= 0 || !isfinite(delta_sum)) {
+        std::ostringstream oss;
+        oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+        oss << "\n\tYou've hit a bug: The sum of improvements must be strictly "
+               "positive, but got "
+            << delta_sum << " improvement from " << S_CR.size()
+            << " successful updates.\n";
+        oss << "\tImprovements: {" << std::hexfloat;
+        for (size_t l = 0; l < delta_f.size() -1; ++l) {
+          oss << delta_f[l] << ", ";
+        }
+        oss << delta_f.back() << "}.\n";
+        throw std::logic_error(oss.str());
+      }
+      for (size_t i = 0; i < weights.size(); ++i) {
+        weights[i] = delta_f[i] / delta_sum;
+      }
+
+      M_CR[k] = detail::weighted_lehmer_mean(S_CR, weights);
+      M_F[k] = detail::weighted_lehmer_mean(S_F, weights);
+    }
+    k++;
+    if (k == M_F.size()) {
+      k = 0;
+    }
+    if (target_attained) {
+      break;
+    }
+    if (cancellation && *cancellation) {
+      break;
+    }
+    if (function_evaluations >= jso_params.max_function_evaluations) {
+      break;
+    }
+    // Linear population size reduction:
+    size_t new_population_size = static_cast<size_t>(round(
+        -double(jso_params.initial_population_size - minimum_population_size) *
+            function_evaluations /
+            static_cast<double>(jso_params.max_function_evaluations) +
+        jso_params.initial_population_size));
+    size_t num_erased = population.size() - new_population_size;
+    std::vector<size_t> indices_to_erase(num_erased);
+    size_t j = 0;
+    for (size_t i = population.size() - 1; i >= new_population_size; --i) {
+      indices_to_erase[j++] = indices[i];
+    }
+    std::sort(indices_to_erase.rbegin(), indices_to_erase.rend());
+    for (auto const &idx : indices_to_erase) {
+      population.erase(population.begin() + idx);
+      cost.erase(cost.begin() + idx);
+    }
+    indices.resize(new_population_size);
+  }
+
+#if BOOST_MATH_DEBUG_JSO
+  {
+    auto const &min_cost = cost[indices[0]];
+    auto const &location = population[indices[0]];
+    std::cout << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    std::cout << "\n\tMinimum cost after completion is " << min_cost
+              << ".\n\tLocation: {";
+    for (size_t i = 0; i < location.size() - 1; ++i) {
+      std::cout << location[i] << ", ";
+    }
+    std::cout << location.back() << "}.\n";
+    std::cout << "\tRequired " << function_evaluations
+              << " function calls out of "
+              << jso_params.max_function_evaluations << " allowed.\n";
+    if (target_attained) {
+      std::cout << "\tReason for return: Target value attained.\n";
+    }
+    std::cout << "\tHistorical crossover probabilities (M_CR): {";
+    for (size_t i = 0; i < M_CR.size() - 1; ++i) {
+      std::cout << M_CR[i] << ", ";
+    }
+    std::cout << M_CR.back() << "}.\n";
+    std::cout << "\tHistorical scale factors (M_F): {";
+    for (size_t i = 0; i < M_F.size() - 1; ++i) {
+      std::cout << M_F[i] << ", ";
+    }
+    std::cout << M_F.back() << "}.\n";
+    std::cout << "\tFinal population size: " << population.size() << ".\n";
+  }
+#endif
+  return population[indices[0]];
+}
+
+} // namespace boost::math::optimization
+#endif
diff --git a/inst/include/boost/math/optimization/random_search.hpp b/inst/include/boost/math/optimization/random_search.hpp
new file mode 100644
index 000000000..4ecd4ce36
--- /dev/null
+++ b/inst/include/boost/math/optimization/random_search.hpp
@@ -0,0 +1,145 @@
+/*
+ * Copyright Nick Thompson, 2024
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef BOOST_MATH_OPTIMIZATION_RANDOM_SEARCH_HPP
+#define BOOST_MATH_OPTIMIZATION_RANDOM_SEARCH_HPP
+#include <atomic>
+#include <cmath>
+#include <limits>
+#include <mutex>
+#include <random>
+#include <sstream>
+#include <stdexcept>
+#include <thread>
+#include <utility>
+#include <vector>
+#include <boost/math/optimization/detail/common.hpp>
+
+namespace boost::math::optimization {
+
+template <typename ArgumentContainer> struct random_search_parameters {
+  using Real = typename ArgumentContainer::value_type;
+  ArgumentContainer lower_bounds;
+  ArgumentContainer upper_bounds;
+  size_t max_function_calls = 10000*std::thread::hardware_concurrency();
+  ArgumentContainer const *initial_guess = nullptr;
+  unsigned threads = std::thread::hardware_concurrency();
+};
+
+template <typename ArgumentContainer>
+void validate_random_search_parameters(random_search_parameters<ArgumentContainer> const &params) {
+  using std::isfinite;
+  using std::isnan;
+  std::ostringstream oss;
+  detail::validate_bounds(params.lower_bounds, params.upper_bounds);
+  if (params.initial_guess) {
+    detail::validate_initial_guess(*params.initial_guess, params.lower_bounds, params.upper_bounds);
+  }
+  if (params.threads == 0) {
+    oss << __FILE__ << ":" << __LINE__ << ":" << __func__;
+    oss << ": There must be at least one thread.";
+    throw std::invalid_argument(oss.str());
+  }
+}
+
+template <typename ArgumentContainer, class Func, class URBG>
+ArgumentContainer random_search(
+    const Func cost_function,
+    random_search_parameters<ArgumentContainer> const &params,
+    URBG &gen,
+    std::invoke_result_t<Func, ArgumentContainer> target_value = std::numeric_limits<std::invoke_result_t<Func, ArgumentContainer>>::quiet_NaN(),
+    std::atomic<bool> *cancellation = nullptr,
+    std::atomic<std::invoke_result_t<Func, ArgumentContainer>> *current_minimum_cost = nullptr,
+    std::vector<std::pair<ArgumentContainer, std::invoke_result_t<Func, ArgumentContainer>>> *queries = nullptr)
+ {
+  using Real = typename ArgumentContainer::value_type;
+  using DimensionlessReal = decltype(Real()/Real());
+  using ResultType = std::invoke_result_t<Func, ArgumentContainer>;
+  using std::isnan;
+  using std::uniform_real_distribution;
+  validate_random_search_parameters(params);
+  const size_t dimension = params.lower_bounds.size();
+  std::atomic<bool> target_attained = false;
+  // Unfortunately, the "minimum_cost" variable can either be passed
+  // (for observability) or not (if the user doesn't care).
+  // That makes this a bit awkward . . .
+  std::atomic<ResultType> lowest_cost = std::numeric_limits<ResultType>::infinity();
+
+  ArgumentContainer best_vector;
+  if constexpr (detail::has_resize_v<ArgumentContainer>) {
+    best_vector.resize(dimension, std::numeric_limits<Real>::quiet_NaN());
+  }
+  if (params.initial_guess) {
+    auto initial_cost = cost_function(*params.initial_guess);
+    if (!isnan(initial_cost)) {
+      lowest_cost = initial_cost;
+      best_vector = *params.initial_guess;
+      if (current_minimum_cost) {
+        *current_minimum_cost = initial_cost;
+      }
+    }
+  }
+  std::mutex mt;
+  std::vector<std::thread> thread_pool;
+  std::atomic<size_t> function_calls = 0;
+  for (unsigned j = 0; j < params.threads; ++j) {
+    auto seed = gen();
+    thread_pool.emplace_back([&, seed]() {
+      URBG g(seed);
+      ArgumentContainer trial_vector;
+      // This vector is empty unless the user requests the queries be stored:
+      std::vector<std::pair<ArgumentContainer, std::invoke_result_t<Func, ArgumentContainer>>> local_queries;
+      if constexpr (detail::has_resize_v<ArgumentContainer>) {
+          trial_vector.resize(dimension, std::numeric_limits<Real>::quiet_NaN());
+      }
+      while (function_calls < params.max_function_calls) {
+        if (cancellation && *cancellation) {
+            break;
+        }
+        if (target_attained) {
+            break;
+        }
+        // Fill trial vector: 
+        uniform_real_distribution<DimensionlessReal> unif01(DimensionlessReal(0), DimensionlessReal(1));
+        for (size_t i = 0; i < dimension; ++i) {
+            trial_vector[i] = params.lower_bounds[i] + (params.upper_bounds[i] - params.lower_bounds[i])*unif01(g);
+        }
+        ResultType trial_cost = cost_function(trial_vector);
+        ++function_calls;
+        if (isnan(trial_cost)) {
+          continue;
+        }
+        if (trial_cost < lowest_cost) {
+          lowest_cost = trial_cost;
+          if (current_minimum_cost) {
+            *current_minimum_cost = trial_cost;
+          }
+          // We expect to need to acquire this lock with decreasing frequency
+          // as the computation proceeds:
+          std::scoped_lock lock(mt);
+          best_vector = trial_vector;
+        }
+        if (queries) {
+          local_queries.push_back(std::make_pair(trial_vector, trial_cost));
+        }
+        if (!isnan(target_value) && trial_cost <= target_value) {
+          target_attained = true;
+        }
+      }
+      if (queries) {
+        std::scoped_lock lock(mt);
+        queries->insert(queries->begin(), local_queries.begin(), local_queries.end());
+      }
+    });
+  }
+  for (auto &thread : thread_pool) {
+    thread.join();
+  }
+  return best_vector;
+}
+
+} // namespace boost::math::optimization
+#endif
diff --git a/inst/include/boost/math/policies/error_handling.hpp b/inst/include/boost/math/policies/error_handling.hpp
index d5e30c08f..0a22dffa7 100644
--- a/inst/include/boost/math/policies/error_handling.hpp
+++ b/inst/include/boost/math/policies/error_handling.hpp
@@ -1,6 +1,6 @@
 //  Copyright John Maddock 2007.
 //  Copyright Paul A. Bristow 2007.
-
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,19 +9,26 @@
 #define BOOST_MATH_POLICY_ERROR_HANDLING_HPP
 
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/tools/precision.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <iomanip>
 #include <string>
 #include <cstring>
-#ifndef BOOST_NO_RTTI
+#ifndef BOOST_MATH_NO_RTTI
 #include <typeinfo>
 #endif
 #include <cerrno>
 #include <complex>
 #include <cmath>
 #include <cstdint>
-#include <boost/math/policies/policy.hpp>
-#include <boost/math/tools/precision.hpp>
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
 #include <stdexcept>
 #include <boost/math/tools/throw_exception.hpp>
 #endif
@@ -40,7 +47,7 @@
 
 namespace boost{ namespace math{
 
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
 
 class evaluation_error : public std::runtime_error
 {
@@ -122,7 +129,7 @@ inline void replace_all_in_string(std::string& result, const char* what, const c
 template <class T>
 inline const char* name_of()
 {
-#ifndef BOOST_NO_RTTI
+#ifndef BOOST_MATH_NO_RTTI
    return typeid(T).name();
 #else
    return "unknown";
@@ -140,7 +147,7 @@ inline const char* name_of<BOOST_MATH_FLOAT128_TYPE>()
 }
 #endif
 
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
 template <class E, class T>
 void raise_error(const char* pfunction, const char* message)
 {
@@ -155,7 +162,7 @@ void raise_error(const char* pfunction, const char* message)
 
   std::string function(pfunction);
   std::string msg("Error in function ");
-#ifndef BOOST_NO_RTTI
+#ifndef BOOST_MATH_NO_RTTI
   replace_all_in_string(function, "%1%", boost::math::policies::detail::name_of<T>());
 #else
   replace_all_in_string(function, "%1%", "Unknown");
@@ -182,7 +189,7 @@ void raise_error(const char* pfunction, const char* pmessage, const T& val)
   std::string function(pfunction);
   std::string message(pmessage);
   std::string msg("Error in function ");
-#ifndef BOOST_NO_RTTI
+#ifndef BOOST_MATH_NO_RTTI
   replace_all_in_string(function, "%1%", boost::math::policies::detail::name_of<T>());
 #else
   replace_all_in_string(function, "%1%", "Unknown");
@@ -199,23 +206,23 @@ void raise_error(const char* pfunction, const char* pmessage, const T& val)
 #endif
 
 template <class T>
-inline T raise_domain_error(
+BOOST_MATH_GPU_ENABLED inline T raise_domain_error(
            const char* function,
            const char* message,
            const T& val,
            const ::boost::math::policies::domain_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<std::domain_error, T>(function, message, val);
    // we never get here:
-   return std::numeric_limits<T>::quiet_NaN();
+   return boost::math::numeric_limits<T>::quiet_NaN();
 #endif
 }
 
 template <class T>
-inline constexpr T raise_domain_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_domain_error(
            const char* ,
            const char* ,
            const T& ,
@@ -223,11 +230,11 @@ inline constexpr T raise_domain_error(
 {
    // This may or may not do the right thing, but the user asked for the error
    // to be ignored so here we go anyway:
-   return std::numeric_limits<T>::quiet_NaN();
+   return boost::math::numeric_limits<T>::quiet_NaN();
 }
 
 template <class T>
-inline T raise_domain_error(
+BOOST_MATH_GPU_ENABLED inline T raise_domain_error(
            const char* ,
            const char* ,
            const T& ,
@@ -236,11 +243,11 @@ inline T raise_domain_error(
    errno = EDOM;
    // This may or may not do the right thing, but the user asked for the error
    // to be silent so here we go anyway:
-   return std::numeric_limits<T>::quiet_NaN();
+   return boost::math::numeric_limits<T>::quiet_NaN();
 }
 
 template <class T>
-inline T raise_domain_error(
+BOOST_MATH_GPU_ENABLED inline T raise_domain_error(
            const char* function,
            const char* message,
            const T& val,
@@ -250,21 +257,21 @@ inline T raise_domain_error(
 }
 
 template <class T>
-inline T raise_pole_error(
+BOOST_MATH_GPU_ENABLED inline T raise_pole_error(
            const char* function,
            const char* message,
            const T& val,
            const  ::boost::math::policies::pole_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    return boost::math::policies::detail::raise_domain_error(function, message, val,  ::boost::math::policies::domain_error< ::boost::math::policies::throw_on_error>());
 #endif
 }
 
 template <class T>
-inline constexpr T raise_pole_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_pole_error(
            const char* function,
            const char* message,
            const T& val,
@@ -274,7 +281,7 @@ inline constexpr T raise_pole_error(
 }
 
 template <class T>
-inline constexpr T raise_pole_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_pole_error(
            const char* function,
            const char* message,
            const T& val,
@@ -284,7 +291,7 @@ inline constexpr T raise_pole_error(
 }
 
 template <class T>
-inline T raise_pole_error(
+BOOST_MATH_GPU_ENABLED inline T raise_pole_error(
            const char* function,
            const char* message,
            const T& val,
@@ -294,49 +301,49 @@ inline T raise_pole_error(
 }
 
 template <class T>
-inline T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_overflow_error(
            const char* function,
            const char* message,
            const  ::boost::math::policies::overflow_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<std::overflow_error, T>(function, message ? message : "numeric overflow");
    // We should never get here:
-   return std::numeric_limits<T>::has_infinity ? std::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
 #endif
 }
 
 template <class T>
-inline T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_overflow_error(
            const char* function,
            const char* message,
            const T& val,
            const ::boost::math::policies::overflow_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<std::overflow_error, T>(function, message ? message : "numeric overflow", val);
    // We should never get here:
-   return std::numeric_limits<T>::has_infinity ? std::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
 #endif
 }
 
 template <class T>
-inline constexpr T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_overflow_error(
            const char* ,
            const char* ,
            const  ::boost::math::policies::overflow_error< ::boost::math::policies::ignore_error>&) BOOST_MATH_NOEXCEPT(T)
 {
    // This may or may not do the right thing, but the user asked for the error
    // to be ignored so here we go anyway:
-   return std::numeric_limits<T>::has_infinity ? std::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
 }
 
 template <class T>
-inline constexpr T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_overflow_error(
            const char* ,
            const char* ,
            const T&,
@@ -344,11 +351,11 @@ inline constexpr T raise_overflow_error(
 {
    // This may or may not do the right thing, but the user asked for the error
    // to be ignored so here we go anyway:
-   return std::numeric_limits<T>::has_infinity ? std::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
 }
 
 template <class T>
-inline T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_overflow_error(
            const char* ,
            const char* ,
            const  ::boost::math::policies::overflow_error< ::boost::math::policies::errno_on_error>&) BOOST_MATH_NOEXCEPT(T)
@@ -356,11 +363,11 @@ inline T raise_overflow_error(
    errno = ERANGE;
    // This may or may not do the right thing, but the user asked for the error
    // to be silent so here we go anyway:
-   return std::numeric_limits<T>::has_infinity ? std::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
 }
 
 template <class T>
-inline T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_overflow_error(
            const char* ,
            const char* ,
            const T&,
@@ -369,20 +376,20 @@ inline T raise_overflow_error(
    errno = ERANGE;
    // This may or may not do the right thing, but the user asked for the error
    // to be silent so here we go anyway:
-   return std::numeric_limits<T>::has_infinity ? std::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : boost::math::tools::max_value<T>();
 }
 
 template <class T>
-inline T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_overflow_error(
            const char* function,
            const char* message,
            const  ::boost::math::policies::overflow_error< ::boost::math::policies::user_error>&)
 {
-   return user_overflow_error(function, message, std::numeric_limits<T>::infinity());
+   return user_overflow_error(function, message, boost::math::numeric_limits<T>::infinity());
 }
 
 template <class T>
-inline T raise_overflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_overflow_error(
            const char* function,
            const char* message,
            const T& val,
@@ -392,17 +399,17 @@ inline T raise_overflow_error(
    std::string sval = prec_format(val);
    replace_all_in_string(m, "%1%", sval.c_str());
 
-   return user_overflow_error(function, m.c_str(), std::numeric_limits<T>::infinity());
+   return user_overflow_error(function, m.c_str(), boost::math::numeric_limits<T>::infinity());
 }
 
 template <class T>
-inline T raise_underflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_underflow_error(
            const char* function,
            const char* message,
            const  ::boost::math::policies::underflow_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<std::underflow_error, T>(function, message ? message : "numeric underflow");
    // We should never get here:
@@ -411,7 +418,7 @@ inline T raise_underflow_error(
 }
 
 template <class T>
-inline constexpr T raise_underflow_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_underflow_error(
            const char* ,
            const char* ,
            const  ::boost::math::policies::underflow_error< ::boost::math::policies::ignore_error>&) BOOST_MATH_NOEXCEPT(T)
@@ -422,7 +429,7 @@ inline constexpr T raise_underflow_error(
 }
 
 template <class T>
-inline T raise_underflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_underflow_error(
            const char* /* function */,
            const char* /* message */,
            const  ::boost::math::policies::underflow_error< ::boost::math::policies::errno_on_error>&) BOOST_MATH_NOEXCEPT(T)
@@ -434,7 +441,7 @@ inline T raise_underflow_error(
 }
 
 template <class T>
-inline T raise_underflow_error(
+BOOST_MATH_GPU_ENABLED inline T raise_underflow_error(
            const char* function,
            const char* message,
            const  ::boost::math::policies::underflow_error< ::boost::math::policies::user_error>&)
@@ -443,14 +450,14 @@ inline T raise_underflow_error(
 }
 
 template <class T>
-inline T raise_denorm_error(
+BOOST_MATH_GPU_ENABLED inline T raise_denorm_error(
            const char* function,
            const char* message,
            const T& /* val */,
            const  ::boost::math::policies::denorm_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<std::underflow_error, T>(function, message ? message : "denormalised result");
    // we never get here:
@@ -459,7 +466,7 @@ inline T raise_denorm_error(
 }
 
 template <class T>
-inline constexpr T raise_denorm_error(
+BOOST_MATH_GPU_ENABLED inline constexpr T raise_denorm_error(
            const char* ,
            const char* ,
            const T&  val,
@@ -471,7 +478,7 @@ inline constexpr T raise_denorm_error(
 }
 
 template <class T>
-inline T raise_denorm_error(
+BOOST_MATH_GPU_ENABLED inline T raise_denorm_error(
            const char* ,
            const char* ,
            const T& val,
@@ -484,7 +491,7 @@ inline T raise_denorm_error(
 }
 
 template <class T>
-inline T raise_denorm_error(
+BOOST_MATH_GPU_ENABLED inline T raise_denorm_error(
            const char* function,
            const char* message,
            const T& val,
@@ -494,14 +501,14 @@ inline T raise_denorm_error(
 }
 
 template <class T>
-inline T raise_evaluation_error(
+BOOST_MATH_GPU_ENABLED inline T raise_evaluation_error(
            const char* function,
            const char* message,
            const T& val,
            const  ::boost::math::policies::evaluation_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<boost::math::evaluation_error, T>(function, message, val);
    // we never get here:
@@ -510,7 +517,7 @@ inline T raise_evaluation_error(
 }
 
 template <class T>
-inline constexpr T raise_evaluation_error(
+BOOST_MATH_GPU_ENABLED constexpr T raise_evaluation_error(
            const char* ,
            const char* ,
            const T& val,
@@ -522,7 +529,7 @@ inline constexpr T raise_evaluation_error(
 }
 
 template <class T>
-inline T raise_evaluation_error(
+BOOST_MATH_GPU_ENABLED inline T raise_evaluation_error(
            const char* ,
            const char* ,
            const T& val,
@@ -535,7 +542,7 @@ inline T raise_evaluation_error(
 }
 
 template <class T>
-inline T raise_evaluation_error(
+BOOST_MATH_GPU_ENABLED inline T raise_evaluation_error(
            const char* function,
            const char* message,
            const T& val,
@@ -545,15 +552,15 @@ inline T raise_evaluation_error(
 }
 
 template <class T, class TargetType>
-inline TargetType raise_rounding_error(
+BOOST_MATH_GPU_ENABLED inline TargetType raise_rounding_error(
            const char* function,
            const char* message,
            const T& val,
            const TargetType&,
            const  ::boost::math::policies::rounding_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<boost::math::rounding_error, T>(function, message, val);
    // we never get here:
@@ -562,7 +569,7 @@ inline TargetType raise_rounding_error(
 }
 
 template <class T, class TargetType>
-inline constexpr TargetType raise_rounding_error(
+BOOST_MATH_GPU_ENABLED constexpr TargetType raise_rounding_error(
            const char* ,
            const char* ,
            const T& val,
@@ -571,12 +578,12 @@ inline constexpr TargetType raise_rounding_error(
 {
    // This may or may not do the right thing, but the user asked for the error
    // to be ignored so here we go anyway:
-   static_assert(std::numeric_limits<TargetType>::is_specialized, "The target type must have std::numeric_limits specialized.");
-   return  val > 0 ? (std::numeric_limits<TargetType>::max)() : (std::numeric_limits<TargetType>::is_integer ? (std::numeric_limits<TargetType>::min)() : -(std::numeric_limits<TargetType>::max)());
+   static_assert(boost::math::numeric_limits<TargetType>::is_specialized, "The target type must have std::numeric_limits specialized.");
+   return  val > 0 ? (boost::math::numeric_limits<TargetType>::max)() : (boost::math::numeric_limits<TargetType>::is_integer ? (boost::math::numeric_limits<TargetType>::min)() : -(boost::math::numeric_limits<TargetType>::max)());
 }
 
 template <class T, class TargetType>
-inline TargetType raise_rounding_error(
+BOOST_MATH_GPU_ENABLED inline TargetType raise_rounding_error(
            const char* ,
            const char* ,
            const T& val,
@@ -586,11 +593,11 @@ inline TargetType raise_rounding_error(
    errno = ERANGE;
    // This may or may not do the right thing, but the user asked for the error
    // to be silent so here we go anyway:
-   static_assert(std::numeric_limits<TargetType>::is_specialized, "The target type must have std::numeric_limits specialized.");
-   return  val > 0 ? (std::numeric_limits<TargetType>::max)() : (std::numeric_limits<TargetType>::is_integer ? (std::numeric_limits<TargetType>::min)() : -(std::numeric_limits<TargetType>::max)());
+   static_assert(boost::math::numeric_limits<TargetType>::is_specialized, "The target type must have std::numeric_limits specialized.");
+   return  val > 0 ? (boost::math::numeric_limits<TargetType>::max)() : (boost::math::numeric_limits<TargetType>::is_integer ? (boost::math::numeric_limits<TargetType>::min)() : -(boost::math::numeric_limits<TargetType>::max)());
 }
 template <class T, class TargetType>
-inline TargetType raise_rounding_error(
+BOOST_MATH_GPU_ENABLED inline TargetType raise_rounding_error(
            const char* function,
            const char* message,
            const T& val,
@@ -601,24 +608,24 @@ inline TargetType raise_rounding_error(
 }
 
 template <class T, class R>
-inline T raise_indeterminate_result_error(
+BOOST_MATH_GPU_ENABLED inline T raise_indeterminate_result_error(
            const char* function,
            const char* message,
            const T& val,
            const R& ,
            const ::boost::math::policies::indeterminate_result_error< ::boost::math::policies::throw_on_error>&)
 {
-#ifdef BOOST_NO_EXCEPTIONS
-   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_NO_EXCEPTIONS set.");
+#ifdef BOOST_MATH_NO_EXCEPTIONS
+   static_assert(sizeof(T) == 0, "Error handler called with throw_on_error and BOOST_MATH_NO_EXCEPTIONS set.");
 #else
    raise_error<std::domain_error, T>(function, message, val);
    // we never get here:
-   return std::numeric_limits<T>::quiet_NaN();
+   return boost::math::numeric_limits<T>::quiet_NaN();
 #endif
 }
 
 template <class T, class R>
-inline constexpr T raise_indeterminate_result_error(
+BOOST_MATH_GPU_ENABLED inline constexpr T raise_indeterminate_result_error(
            const char* ,
            const char* ,
            const T& ,
@@ -631,7 +638,7 @@ inline constexpr T raise_indeterminate_result_error(
 }
 
 template <class T, class R>
-inline T raise_indeterminate_result_error(
+BOOST_MATH_GPU_ENABLED inline T raise_indeterminate_result_error(
            const char* ,
            const char* ,
            const T& ,
@@ -645,7 +652,7 @@ inline T raise_indeterminate_result_error(
 }
 
 template <class T, class R>
-inline T raise_indeterminate_result_error(
+BOOST_MATH_GPU_ENABLED inline T raise_indeterminate_result_error(
            const char* function,
            const char* message,
            const T& val,
@@ -658,7 +665,7 @@ inline T raise_indeterminate_result_error(
 }  // namespace detail
 
 template <class T, class Policy>
-inline constexpr T raise_domain_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_domain_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::domain_error_type policy_type;
    return detail::raise_domain_error(
@@ -667,7 +674,7 @@ inline constexpr T raise_domain_error(const char* function, const char* message,
 }
 
 template <class T, class Policy>
-inline constexpr T raise_pole_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_pole_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::pole_error_type policy_type;
    return detail::raise_pole_error(
@@ -676,7 +683,7 @@ inline constexpr T raise_pole_error(const char* function, const char* message, c
 }
 
 template <class T, class Policy>
-inline constexpr T raise_overflow_error(const char* function, const char* message, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_overflow_error(const char* function, const char* message, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::overflow_error_type policy_type;
    return detail::raise_overflow_error<T>(
@@ -685,7 +692,7 @@ inline constexpr T raise_overflow_error(const char* function, const char* messag
 }
 
 template <class T, class Policy>
-inline constexpr T raise_overflow_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_overflow_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::overflow_error_type policy_type;
    return detail::raise_overflow_error(
@@ -694,7 +701,7 @@ inline constexpr T raise_overflow_error(const char* function, const char* messag
 }
 
 template <class T, class Policy>
-inline constexpr T raise_underflow_error(const char* function, const char* message, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_underflow_error(const char* function, const char* message, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::underflow_error_type policy_type;
    return detail::raise_underflow_error<T>(
@@ -703,7 +710,7 @@ inline constexpr T raise_underflow_error(const char* function, const char* messa
 }
 
 template <class T, class Policy>
-inline constexpr T raise_denorm_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_denorm_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::denorm_error_type policy_type;
    return detail::raise_denorm_error<T>(
@@ -713,7 +720,7 @@ inline constexpr T raise_denorm_error(const char* function, const char* message,
 }
 
 template <class T, class Policy>
-inline constexpr T raise_evaluation_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_evaluation_error(const char* function, const char* message, const T& val, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::evaluation_error_type policy_type;
    return detail::raise_evaluation_error(
@@ -722,7 +729,7 @@ inline constexpr T raise_evaluation_error(const char* function, const char* mess
 }
 
 template <class T, class TargetType, class Policy>
-inline constexpr TargetType raise_rounding_error(const char* function, const char* message, const T& val, const TargetType& t, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr TargetType raise_rounding_error(const char* function, const char* message, const T& val, const TargetType& t, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::rounding_error_type policy_type;
    return detail::raise_rounding_error(
@@ -731,7 +738,7 @@ inline constexpr TargetType raise_rounding_error(const char* function, const cha
 }
 
 template <class T, class R, class Policy>
-inline constexpr T raise_indeterminate_result_error(const char* function, const char* message, const T& val, const R& result, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED constexpr T raise_indeterminate_result_error(const char* function, const char* message, const T& val, const R& result, const Policy&) noexcept(is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T))
 {
    typedef typename Policy::indeterminate_result_error_type policy_type;
    return detail::raise_indeterminate_result_error(
@@ -746,7 +753,7 @@ namespace detail
 {
 
 template <class R, class T, class Policy>
-BOOST_FORCEINLINE bool check_overflow(T val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE bool check_overflow(T val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
 {
    BOOST_MATH_STD_USING
    if(fabs(val) > tools::max_value<R>())
@@ -758,7 +765,7 @@ BOOST_FORCEINLINE bool check_overflow(T val, R* result, const char* function, co
    return false;
 }
 template <class R, class T, class Policy>
-BOOST_FORCEINLINE bool check_overflow(std::complex<T> val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE bool check_overflow(std::complex<T> val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
 {
    typedef typename R::value_type r_type;
    r_type re, im;
@@ -768,7 +775,7 @@ BOOST_FORCEINLINE bool check_overflow(std::complex<T> val, R* result, const char
    return r;
 }
 template <class R, class T, class Policy>
-BOOST_FORCEINLINE bool check_underflow(T val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE bool check_underflow(T val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
 {
    if((val != 0) && (static_cast<R>(val) == 0))
    {
@@ -778,7 +785,7 @@ BOOST_FORCEINLINE bool check_underflow(T val, R* result, const char* function, c
    return false;
 }
 template <class R, class T, class Policy>
-BOOST_FORCEINLINE bool check_underflow(std::complex<T> val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE bool check_underflow(std::complex<T> val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
 {
    typedef typename R::value_type r_type;
    r_type re, im;
@@ -788,7 +795,7 @@ BOOST_FORCEINLINE bool check_underflow(std::complex<T> val, R* result, const cha
    return r;
 }
 template <class R, class T, class Policy>
-BOOST_FORCEINLINE bool check_denorm(T val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE bool check_denorm(T val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
 {
    BOOST_MATH_STD_USING
    if((fabs(val) < static_cast<T>(tools::min_value<R>())) && (static_cast<R>(val) != 0))
@@ -799,7 +806,7 @@ BOOST_FORCEINLINE bool check_denorm(T val, R* result, const char* function, cons
    return false;
 }
 template <class R, class T, class Policy>
-BOOST_FORCEINLINE bool check_denorm(std::complex<T> val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE bool check_denorm(std::complex<T> val, R* result, const char* function, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && (Policy::value != throw_on_error) && (Policy::value != user_error))
 {
    typedef typename R::value_type r_type;
    r_type re, im;
@@ -811,28 +818,28 @@ BOOST_FORCEINLINE bool check_denorm(std::complex<T> val, R* result, const char*
 
 // Default instantiations with ignore_error policy.
 template <class R, class T>
-BOOST_FORCEINLINE constexpr bool check_overflow(T /* val */, R* /* result */, const char* /* function */, const overflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE constexpr bool check_overflow(T /* val */, R* /* result */, const char* /* function */, const overflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
 { return false; }
 template <class R, class T>
-BOOST_FORCEINLINE constexpr bool check_overflow(std::complex<T> /* val */, R* /* result */, const char* /* function */, const overflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE constexpr bool check_overflow(std::complex<T> /* val */, R* /* result */, const char* /* function */, const overflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
 { return false; }
 template <class R, class T>
-BOOST_FORCEINLINE constexpr bool check_underflow(T /* val */, R* /* result */, const char* /* function */, const underflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE constexpr bool check_underflow(T /* val */, R* /* result */, const char* /* function */, const underflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
 { return false; }
 template <class R, class T>
-BOOST_FORCEINLINE constexpr bool check_underflow(std::complex<T> /* val */, R* /* result */, const char* /* function */, const underflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE constexpr bool check_underflow(std::complex<T> /* val */, R* /* result */, const char* /* function */, const underflow_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
 { return false; }
 template <class R, class T>
-BOOST_FORCEINLINE constexpr bool check_denorm(T /* val */, R* /* result*/, const char* /* function */, const denorm_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE constexpr bool check_denorm(T /* val */, R* /* result*/, const char* /* function */, const denorm_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
 { return false; }
 template <class R, class T>
-BOOST_FORCEINLINE constexpr bool check_denorm(std::complex<T> /* val */, R* /* result*/, const char* /* function */, const denorm_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE constexpr bool check_denorm(std::complex<T> /* val */, R* /* result*/, const char* /* function */, const denorm_error<ignore_error>&) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T))
 { return false; }
 
 } // namespace detail
 
 template <class R, class Policy, class T>
-BOOST_FORCEINLINE R checked_narrowing_cast(T val, const char* function) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && is_noexcept_error_policy<Policy>::value)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE R checked_narrowing_cast(T val, const char* function) noexcept(BOOST_MATH_IS_FLOAT(R) && BOOST_MATH_IS_FLOAT(T) && is_noexcept_error_policy<Policy>::value)
 {
    typedef typename Policy::overflow_error_type overflow_type;
    typedef typename Policy::underflow_error_type underflow_type;
@@ -852,7 +859,7 @@ BOOST_FORCEINLINE R checked_narrowing_cast(T val, const char* function) noexcept
 }
 
 template <class T, class Policy>
-inline void check_series_iterations(const char* function, std::uintmax_t max_iter, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(T) && is_noexcept_error_policy<Policy>::value)
+BOOST_MATH_GPU_ENABLED inline void check_series_iterations(const char* function, std::uintmax_t max_iter, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(T) && is_noexcept_error_policy<Policy>::value)
 {
    if(max_iter >= policies::get_max_series_iterations<Policy>())
       raise_evaluation_error<T>(
@@ -861,7 +868,7 @@ inline void check_series_iterations(const char* function, std::uintmax_t max_ite
 }
 
 template <class T, class Policy>
-inline void check_root_iterations(const char* function, std::uintmax_t max_iter, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(T) && is_noexcept_error_policy<Policy>::value)
+BOOST_MATH_GPU_ENABLED inline void check_root_iterations(const char* function, std::uintmax_t max_iter, const Policy& pol) noexcept(BOOST_MATH_IS_FLOAT(T) && is_noexcept_error_policy<Policy>::value)
 {
    if(max_iter >= policies::get_max_root_iterations<Policy>())
       raise_evaluation_error<T>(
@@ -871,25 +878,169 @@ inline void check_root_iterations(const char* function, std::uintmax_t max_iter,
 
 } //namespace policies
 
-namespace detail{
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
+
+}} // namespaces boost/math
+
+#else // Special values for NVRTC
+
+namespace boost {
+namespace math {
+namespace policies {
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr T raise_domain_error(
+           const char* ,
+           const char* ,
+           const T& ,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return boost::math::numeric_limits<T>::quiet_NaN();
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr T raise_pole_error(
+           const char* function,
+           const char* message,
+           const T& val,
+           const  Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   return boost::math::numeric_limits<T>::quiet_NaN();
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr T raise_overflow_error(
+           const char* ,
+           const char* ,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : (boost::math::numeric_limits<T>::max)();
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr T raise_overflow_error(
+           const char* ,
+           const char* ,
+           const T&,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return boost::math::numeric_limits<T>::has_infinity ? boost::math::numeric_limits<T>::infinity() : (boost::math::numeric_limits<T>::max)();
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr T raise_underflow_error(
+           const char* ,
+           const char* ,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return static_cast<T>(0);
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED inline constexpr T raise_denorm_error(
+           const char* ,
+           const char* ,
+           const T& val,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return val;
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr T raise_evaluation_error(
+           const char* ,
+           const char* ,
+           const T& val,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return val;
+}
+
+template <class T, class TargetType, class Policy>
+BOOST_MATH_GPU_ENABLED constexpr TargetType raise_rounding_error(
+           const char* ,
+           const char* ,
+           const T& val,
+           const TargetType&,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   static_assert(boost::math::numeric_limits<TargetType>::is_specialized, "The target type must have std::numeric_limits specialized.");
+   return  val > 0 ? (boost::math::numeric_limits<TargetType>::max)() : (boost::math::numeric_limits<TargetType>::is_integer ? (boost::math::numeric_limits<TargetType>::min)() : -(boost::math::numeric_limits<TargetType>::max)());
+}
+
+template <class T, class R, class Policy>
+BOOST_MATH_GPU_ENABLED inline constexpr T raise_indeterminate_result_error(
+           const char* ,
+           const char* ,
+           const T& ,
+           const R& result,
+           const Policy&) BOOST_MATH_NOEXCEPT(T)
+{
+   // This may or may not do the right thing, but the user asked for the error
+   // to be ignored so here we go anyway:
+   return result;
+}
+
+template <class R, class Policy, class T>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE R checked_narrowing_cast(T val, const char* function) noexcept(boost::math::is_floating_point_v<R> && boost::math::is_floating_point_v<T>)
+{
+   // We only have ignore error policy so no reason to check
+   return static_cast<R>(val);
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED inline void check_series_iterations(const char* function, boost::math::uintmax_t max_iter, const Policy& pol) noexcept(boost::math::is_floating_point_v<T>)
+{
+   if(max_iter >= policies::get_max_series_iterations<Policy>())
+      raise_evaluation_error<T>(
+         function,
+         "Series evaluation exceeded %1% iterations, giving up now.", static_cast<T>(static_cast<double>(max_iter)), pol);
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED inline void check_root_iterations(const char* function, boost::math::uintmax_t max_iter, const Policy& pol) noexcept(boost::math::is_floating_point_v<T>)
+{
+   if(max_iter >= policies::get_max_root_iterations<Policy>())
+      raise_evaluation_error<T>(
+         function,
+         "Root finding evaluation exceeded %1% iterations, giving up now.", static_cast<T>(static_cast<double>(max_iter)), pol);
+}
+
+} // namespace policies
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
+namespace boost { namespace math { namespace detail {
 
 //
 // Simple helper function to assist in returning a pair from a single value,
 // that value usually comes from one of the error handlers above:
 //
 template <class T>
-std::pair<T, T> pair_from_single(const T& val) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED boost::math::pair<T, T> pair_from_single(const T& val) BOOST_MATH_NOEXCEPT(T)
 {
-   return std::make_pair(val, val);
+   return boost::math::make_pair(val, val);
 }
 
-}
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-}} // namespaces boost/math
+}}} // boost::math::detail
 
 #endif // BOOST_MATH_POLICY_ERROR_HANDLING_HPP
 
diff --git a/inst/include/boost/math/policies/policy.hpp b/inst/include/boost/math/policies/policy.hpp
index 6daebaa64..ec7b36f2d 100644
--- a/inst/include/boost/math/policies/policy.hpp
+++ b/inst/include/boost/math/policies/policy.hpp
@@ -9,11 +9,9 @@
 
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/mp.hpp>
-#include <limits>
-#include <type_traits>
-#include <cmath>
-#include <cstdint>
-#include <cstddef>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 
 namespace boost{ namespace math{
 
@@ -22,9 +20,9 @@ namespace mp = tools::meta_programming;
 namespace tools{
 
 template <class T>
-constexpr int digits(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept;
+BOOST_MATH_GPU_ENABLED constexpr int digits(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept;
 template <class T>
-constexpr T epsilon(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value);
+BOOST_MATH_GPU_ENABLED constexpr T epsilon(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value);
 
 }
 
@@ -33,9 +31,36 @@ namespace policies{
 //
 // Define macros for our default policies, if they're not defined already:
 //
+
+
+//
+// Generic support for GPUs
+//
+#ifdef BOOST_MATH_HAS_GPU_SUPPORT
+#  ifndef BOOST_MATH_OVERFLOW_ERROR_POLICY
+#    define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#  endif
+#  ifndef BOOST_MATH_PROMOTE_DOUBLE_POLICY
+#     define BOOST_MATH_PROMOTE_DOUBLE_POLICY false
+#  endif
+#  ifndef BOOST_MATH_DOMAIN_ERROR_POLICY
+#    define BOOST_MATH_DOMAIN_ERROR_POLICY ignore_error
+#  endif
+#  ifndef BOOST_MATH_POLE_ERROR_POLICY
+#     define BOOST_MATH_POLE_ERROR_POLICY ignore_error
+#  endif
+#  ifndef BOOST_MATH_EVALUATION_ERROR_POLICY
+#     define BOOST_MATH_EVALUATION_ERROR_POLICY ignore_error
+#  endif
+#  ifndef BOOST_MATH_ROUNDING_ERROR_POLICY
+#     define BOOST_MATH_ROUNDING_ERROR_POLICY ignore_error
+#  endif
+#endif
+
+//
 // Special cases for exceptions disabled first:
 //
-#ifdef BOOST_NO_EXCEPTIONS
+#ifdef BOOST_MATH_NO_EXCEPTIONS
 #  ifndef BOOST_MATH_DOMAIN_ERROR_POLICY
 #    define BOOST_MATH_DOMAIN_ERROR_POLICY errno_on_error
 #  endif
@@ -107,20 +132,20 @@ namespace policies{
 
 #define BOOST_MATH_META_INT(Type, name, Default)                                                \
    template <Type N = Default>                                                                  \
-   class name : public std::integral_constant<int, N>{};                                        \
+   class name : public boost::math::integral_constant<int, N>{};                                \
                                                                                                 \
    namespace detail{                                                                            \
    template <Type N>                                                                            \
-   char test_is_valid_arg(const name<N>* = nullptr);                                            \
-   char test_is_default_arg(const name<Default>* = nullptr);                                    \
+   BOOST_MATH_GPU_ENABLED char test_is_valid_arg(const name<N>* = nullptr);                     \
+   BOOST_MATH_GPU_ENABLED char test_is_default_arg(const name<Default>* = nullptr);             \
                                                                                                 \
    template <typename T>                                                                        \
    class is_##name##_imp                                                                        \
    {                                                                                            \
    private:                                                                                     \
       template <Type N>                                                                         \
-      static char test(const name<N>* = nullptr);                                               \
-      static double test(...);                                                                  \
+      BOOST_MATH_GPU_ENABLED static char test(const name<N>* = nullptr);                        \
+      BOOST_MATH_GPU_ENABLED static double test(...);                                           \
    public:                                                                                      \
       static constexpr bool value = sizeof(test(static_cast<T*>(nullptr))) == sizeof(char);     \
    };                                                                                           \
@@ -131,27 +156,27 @@ namespace policies{
    {                                                                                            \
    public:                                                                                      \
       static constexpr bool value = boost::math::policies::detail::is_##name##_imp<T>::value;   \
-      using type = std::integral_constant<bool, value>;                                         \
+      using type = boost::math::integral_constant<bool, value>;                                 \
    };
 
 #define BOOST_MATH_META_BOOL(name, Default)                                                     \
    template <bool N = Default>                                                                  \
-   class name : public std::integral_constant<bool, N>{};                                       \
+   class name : public boost::math::integral_constant<bool, N>{};                               \
                                                                                                 \
    namespace detail{                                                                            \
    template <bool N>                                                                            \
-   char test_is_valid_arg(const name<N>* = nullptr);                                            \
-   char test_is_default_arg(const name<Default>* = nullptr);                                    \
+   BOOST_MATH_GPU_ENABLED char test_is_valid_arg(const name<N>* = nullptr);                     \
+   BOOST_MATH_GPU_ENABLED char test_is_default_arg(const name<Default>* = nullptr);             \
                                                                                                 \
    template <typename T>                                                                        \
    class is_##name##_imp                                                                        \
    {                                                                                            \
    private:                                                                                     \
       template <bool N>                                                                         \
-      static char test(const name<N>* = nullptr);                                               \
-      static double test(...);                                                                  \
+      BOOST_MATH_GPU_ENABLED static char test(const name<N>* = nullptr);                        \
+      BOOST_MATH_GPU_ENABLED static double test(...);                                           \
    public:                                                                                      \
-      static constexpr bool value = sizeof(test(static_cast<T*>(nullptr))) == sizeof(char);           \
+      static constexpr bool value = sizeof(test(static_cast<T*>(nullptr))) == sizeof(char);     \
    };                                                                                           \
    }                                                                                            \
                                                                                                 \
@@ -160,7 +185,7 @@ namespace policies{
    {                                                                                            \
    public:                                                                                      \
       static constexpr bool value = boost::math::policies::detail::is_##name##_imp<T>::value;   \
-      using type = std::integral_constant<bool, value>;                                         \
+      using type = boost::math::integral_constant<bool, value>;                                 \
    };
 
 //
@@ -232,27 +257,27 @@ struct precision
    //
    // Now work out the precision:
    //
-   using digits2_type = typename std::conditional<
+   using digits2_type = typename boost::math::conditional<
       (Digits10::value == 0),
       digits2<0>,
       digits2<((Digits10::value + 1) * 1000L) / 301L>
    >::type;
 public:
 #ifdef BOOST_BORLANDC
-   using type = typename std::conditional<
+   using type = typename boost::math::conditional<
       (Digits2::value > ::boost::math::policies::detail::precision<Digits10,Digits2>::digits2_type::value),
       Digits2, digits2_type>::type;
 #else
-   using type = typename std::conditional<
+   using type = typename boost::math::conditional<
       (Digits2::value > digits2_type::value),
       Digits2, digits2_type>::type;
 #endif
 };
 
-double test_is_valid_arg(...);
-double test_is_default_arg(...);
-char test_is_valid_arg(const default_policy*);
-char test_is_default_arg(const default_policy*);
+BOOST_MATH_GPU_ENABLED double test_is_valid_arg(...);
+BOOST_MATH_GPU_ENABLED double test_is_default_arg(...);
+BOOST_MATH_GPU_ENABLED char test_is_valid_arg(const default_policy*);
+BOOST_MATH_GPU_ENABLED char test_is_default_arg(const default_policy*);
 
 template <typename T>
 class is_valid_policy_imp
@@ -280,7 +305,7 @@ class is_default_policy
 {
 public:
    static constexpr bool value = boost::math::policies::detail::is_default_policy_imp<T>::value;
-   using type = std::integral_constant<bool, value>;
+   using type = boost::math::integral_constant<bool, value>;
 
    template <typename U>
    struct apply
@@ -289,7 +314,7 @@ class is_default_policy
    };
 };
 
-template <class Seq, class T, std::size_t N>
+template <class Seq, class T, boost::math::size_t N>
 struct append_N
 {
    using type = typename append_N<mp::mp_push_back<Seq, T>, T, N-1>::type;
@@ -378,7 +403,7 @@ class policy
    // Typelist of the arguments:
    //
    using arg_list = mp::mp_list<A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13>;
-   static constexpr std::size_t arg_list_size = mp::mp_size<arg_list>::value;
+   static constexpr boost::math::size_t arg_list_size = mp::mp_size<arg_list>::value;
 
    template<typename A, typename B, bool b>
    struct pick_arg
@@ -509,7 +534,7 @@ class normalise
 {
 private:
    using arg_list = mp::mp_list<A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13>;
-   static constexpr std::size_t arg_list_size = mp::mp_size<arg_list>::value;
+   static constexpr boost::math::size_t arg_list_size = mp::mp_size<arg_list>::value;
 
    template<typename A, typename B, bool b>
    struct pick_arg
@@ -640,81 +665,81 @@ struct normalise<policy<detail::forwarding_arg1, detail::forwarding_arg2>,
    using type = policy<detail::forwarding_arg1, detail::forwarding_arg2>;
 };
 
-inline constexpr policy<> make_policy() noexcept
+BOOST_MATH_GPU_ENABLED constexpr policy<> make_policy() noexcept
 { return {}; }
 
 template <class A1>
-inline constexpr typename normalise<policy<>, A1>::type make_policy(const A1&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1>::type make_policy(const A1&) noexcept
 {
    typedef typename normalise<policy<>, A1>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2>
-inline constexpr typename normalise<policy<>, A1, A2>::type make_policy(const A1&, const A2&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2>::type make_policy(const A1&, const A2&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3>
-inline constexpr typename normalise<policy<>, A1, A2, A3>::type make_policy(const A1&, const A2&, const A3&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3>::type make_policy(const A1&, const A2&, const A3&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4>::type make_policy(const A1&, const A2&, const A3&, const A4&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4>::type make_policy(const A1&, const A2&, const A3&, const A4&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5, class A6>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5, A6>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&, const A9&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&, const A9&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&, const A9&, const A10&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&, const A9&, const A10&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>::type result_type;
    return result_type();
 }
 
 template <class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10, class A11>
-inline constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&, const A9&, const A10&, const A11&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>::type make_policy(const A1&, const A2&, const A3&, const A4&, const A5&, const A6&, const A7&, const A8&, const A9&, const A10&, const A11&) noexcept
 {
    typedef typename normalise<policy<>, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>::type result_type;
    return result_type();
@@ -732,47 +757,47 @@ struct evaluation
 template <class Policy>
 struct evaluation<float, Policy>
 {
-   using type = typename std::conditional<Policy::promote_float_type::value, double, float>::type;
+   using type = typename boost::math::conditional<Policy::promote_float_type::value, double, float>::type;
 };
 
 template <class Policy>
 struct evaluation<double, Policy>
 {
-   using type = typename std::conditional<Policy::promote_double_type::value, long double, double>::type;
+   using type = typename boost::math::conditional<Policy::promote_double_type::value, long double, double>::type;
 };
 
 template <class Real, class Policy>
 struct precision
 {
-   static_assert((std::numeric_limits<Real>::radix == 2) || ((std::numeric_limits<Real>::is_specialized == 0) || (std::numeric_limits<Real>::digits == 0)),
-   "(std::numeric_limits<Real>::radix == 2) || ((std::numeric_limits<Real>::is_specialized == 0) || (std::numeric_limits<Real>::digits == 0))");
+   static_assert((boost::math::numeric_limits<Real>::radix == 2) || ((boost::math::numeric_limits<Real>::is_specialized == 0) || (boost::math::numeric_limits<Real>::digits == 0)),
+   "(boost::math::numeric_limits<Real>::radix == 2) || ((boost::math::numeric_limits<Real>::is_specialized == 0) || (boost::math::numeric_limits<Real>::digits == 0))");
 #ifndef BOOST_BORLANDC
    using precision_type = typename Policy::precision_type;
-   using type = typename std::conditional<
-      ((std::numeric_limits<Real>::is_specialized == 0) || (std::numeric_limits<Real>::digits == 0)),
+   using type = typename boost::math::conditional<
+      ((boost::math::numeric_limits<Real>::is_specialized == 0) || (boost::math::numeric_limits<Real>::digits == 0)),
       // Possibly unknown precision:
       precision_type,
-      typename std::conditional<
-         ((std::numeric_limits<Real>::digits <= precision_type::value)
+      typename boost::math::conditional<
+         ((boost::math::numeric_limits<Real>::digits <= precision_type::value)
          || (Policy::precision_type::value <= 0)),
          // Default case, full precision for RealType:
-         digits2< std::numeric_limits<Real>::digits>,
+         digits2< boost::math::numeric_limits<Real>::digits>,
          // User customised precision:
          precision_type
       >::type
    >::type;
 #else
    using precision_type = typename Policy::precision_type;
-   using digits_t = std::integral_constant<int, std::numeric_limits<Real>::digits>;
-   using spec_t = std::integral_constant<bool, std::numeric_limits<Real>::is_specialized>;
-   using type = typename std::conditional<
-      (spec_t::value == true std::true_type || digits_t::value == 0),
+   using digits_t = boost::math::integral_constant<int, boost::math::numeric_limits<Real>::digits>;
+   using spec_t = boost::math::integral_constant<bool, boost::math::numeric_limits<Real>::is_specialized>;
+   using type = typename boost::math::conditional<
+      (spec_t::value == true boost::math::true_type || digits_t::value == 0),
       // Possibly unknown precision:
       precision_type,
-      typename std::conditional<
+      typename boost::math::conditional<
          (digits_t::value <= precision_type::value || precision_type::value <= 0),
          // Default case, full precision for RealType:
-         digits2< std::numeric_limits<Real>::digits>,
+         digits2< boost::math::numeric_limits<Real>::digits>,
          // User customised precision:
          precision_type
       >::type
@@ -785,7 +810,7 @@ struct precision
 template <class Policy>
 struct precision<BOOST_MATH_FLOAT128_TYPE, Policy>
 {
-   typedef std::integral_constant<int, 113> type;
+   typedef boost::math::integral_constant<int, 113> type;
 };
 
 #endif
@@ -793,15 +818,15 @@ struct precision<BOOST_MATH_FLOAT128_TYPE, Policy>
 namespace detail{
 
 template <class T, class Policy>
-inline constexpr int digits_imp(std::true_type const&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr int digits_imp(boost::math::true_type const&) noexcept
 {
-   static_assert( std::numeric_limits<T>::is_specialized, "std::numeric_limits<T>::is_specialized");
+   static_assert( boost::math::numeric_limits<T>::is_specialized, "boost::math::numeric_limits<T>::is_specialized");
    typedef typename boost::math::policies::precision<T, Policy>::type p_t;
    return p_t::value;
 }
 
 template <class T, class Policy>
-inline constexpr int digits_imp(std::false_type const&) noexcept
+BOOST_MATH_GPU_ENABLED constexpr int digits_imp(boost::math::false_type const&) noexcept
 {
    return tools::digits<T>();
 }
@@ -809,26 +834,26 @@ inline constexpr int digits_imp(std::false_type const&) noexcept
 } // namespace detail
 
 template <class T, class Policy>
-inline constexpr int digits(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept
+BOOST_MATH_GPU_ENABLED constexpr int digits(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept
 {
-   typedef std::integral_constant<bool, std::numeric_limits<T>::is_specialized > tag_type;
+   typedef boost::math::integral_constant<bool, boost::math::numeric_limits<T>::is_specialized > tag_type;
    return detail::digits_imp<T, Policy>(tag_type());
 }
 template <class T, class Policy>
-inline constexpr int digits_base10(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept
+BOOST_MATH_GPU_ENABLED constexpr int digits_base10(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept
 {
    return boost::math::policies::digits<T, Policy>() * 301 / 1000L;
 }
 
 template <class Policy>
-inline constexpr unsigned long get_max_series_iterations() noexcept
+BOOST_MATH_GPU_ENABLED constexpr unsigned long get_max_series_iterations() noexcept
 {
    typedef typename Policy::max_series_iterations_type iter_type;
    return iter_type::value;
 }
 
 template <class Policy>
-inline constexpr unsigned long get_max_root_iterations() noexcept
+BOOST_MATH_GPU_ENABLED constexpr unsigned long get_max_root_iterations() noexcept
 {
    typedef typename Policy::max_root_iterations_type iter_type;
    return iter_type::value;
@@ -839,51 +864,51 @@ namespace detail{
 template <class T, class Digits, class Small, class Default>
 struct series_factor_calc
 {
-   static T get() noexcept(std::is_floating_point<T>::value)
+   BOOST_MATH_GPU_ENABLED static T get() noexcept(boost::math::is_floating_point<T>::value)
    {
       return ldexp(T(1.0), 1 - Digits::value);
    }
 };
 
 template <class T, class Digits>
-struct series_factor_calc<T, Digits, std::true_type, std::true_type>
+struct series_factor_calc<T, Digits, boost::math::true_type, boost::math::true_type>
 {
-   static constexpr T get() noexcept(std::is_floating_point<T>::value)
+   BOOST_MATH_GPU_ENABLED static constexpr T get() noexcept(boost::math::is_floating_point<T>::value)
    {
       return boost::math::tools::epsilon<T>();
    }
 };
 template <class T, class Digits>
-struct series_factor_calc<T, Digits, std::true_type, std::false_type>
+struct series_factor_calc<T, Digits, boost::math::true_type, boost::math::false_type>
 {
-   static constexpr T get() noexcept(std::is_floating_point<T>::value)
+   BOOST_MATH_GPU_ENABLED static constexpr T get() noexcept(boost::math::is_floating_point<T>::value)
    {
-      return 1 / static_cast<T>(static_cast<std::uintmax_t>(1u) << (Digits::value - 1));
+      return 1 / static_cast<T>(static_cast<boost::math::uintmax_t>(1u) << (Digits::value - 1));
    }
 };
 template <class T, class Digits>
-struct series_factor_calc<T, Digits, std::false_type, std::true_type>
+struct series_factor_calc<T, Digits, boost::math::false_type, boost::math::true_type>
 {
-   static constexpr T get() noexcept(std::is_floating_point<T>::value)
+   BOOST_MATH_GPU_ENABLED static constexpr T get() noexcept(boost::math::is_floating_point<T>::value)
    {
       return boost::math::tools::epsilon<T>();
    }
 };
 
 template <class T, class Policy>
-inline constexpr T get_epsilon_imp(std::true_type const&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T get_epsilon_imp(boost::math::true_type const&) noexcept(boost::math::is_floating_point<T>::value)
 {
-   static_assert(std::numeric_limits<T>::is_specialized, "std::numeric_limits<T>::is_specialized");
-   static_assert(std::numeric_limits<T>::radix == 2, "std::numeric_limits<T>::radix == 2");
+   static_assert(boost::math::numeric_limits<T>::is_specialized, "boost::math::numeric_limits<T>::is_specialized");
+   static_assert(boost::math::numeric_limits<T>::radix == 2, "boost::math::numeric_limits<T>::radix == 2");
 
    typedef typename boost::math::policies::precision<T, Policy>::type p_t;
-   typedef std::integral_constant<bool, p_t::value <= std::numeric_limits<std::uintmax_t>::digits> is_small_int;
-   typedef std::integral_constant<bool, p_t::value >= std::numeric_limits<T>::digits> is_default_value;
+   typedef boost::math::integral_constant<bool, p_t::value <= boost::math::numeric_limits<boost::math::uintmax_t>::digits> is_small_int;
+   typedef boost::math::integral_constant<bool, p_t::value >= boost::math::numeric_limits<T>::digits> is_default_value;
    return series_factor_calc<T, p_t, is_small_int, is_default_value>::get();
 }
 
 template <class T, class Policy>
-inline constexpr T get_epsilon_imp(std::false_type const&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T get_epsilon_imp(boost::math::false_type const&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return tools::epsilon<T>();
 }
@@ -891,9 +916,9 @@ inline constexpr T get_epsilon_imp(std::false_type const&) noexcept(std::is_floa
 } // namespace detail
 
 template <class T, class Policy>
-inline constexpr T get_epsilon(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T get_epsilon(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
-   typedef std::integral_constant<bool, (std::numeric_limits<T>::is_specialized && (std::numeric_limits<T>::radix == 2)) > tag_type;
+   typedef boost::math::integral_constant<bool, (boost::math::numeric_limits<T>::is_specialized && (boost::math::numeric_limits<T>::radix == 2)) > tag_type;
    return detail::get_epsilon_imp<T, Policy>(tag_type());
 }
 
@@ -910,8 +935,8 @@ template <class A1,
           class A9,
           class A10,
           class A11>
-char test_is_policy(const policy<A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11>*);
-double test_is_policy(...);
+BOOST_MATH_GPU_ENABLED char test_is_policy(const policy<A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11>*);
+BOOST_MATH_GPU_ENABLED double test_is_policy(...);
 
 template <typename P>
 class is_policy_imp
@@ -927,7 +952,7 @@ class is_policy
 {
 public:
    static constexpr bool value = boost::math::policies::detail::is_policy_imp<P>::value;
-   using type = std::integral_constant<bool, value>;
+   using type = boost::math::integral_constant<bool, value>;
 };
 
 //
@@ -937,20 +962,20 @@ template <class Policy>
 struct constructor_error_check
 {
    using domain_error_type = typename Policy::domain_error_type;
-   using type = typename std::conditional<
+   using type = typename boost::math::conditional<
       (domain_error_type::value == throw_on_error) || (domain_error_type::value == user_error) || (domain_error_type::value == errno_on_error),
-      std::true_type,
-      std::false_type>::type;
+      boost::math::true_type,
+      boost::math::false_type>::type;
 };
 
 template <class Policy>
 struct method_error_check
 {
    using domain_error_type = typename Policy::domain_error_type;
-   using type = typename std::conditional<
+   using type = typename boost::math::conditional<
       (domain_error_type::value == throw_on_error),
-      std::false_type,
-      std::true_type>::type;
+      boost::math::false_type,
+      boost::math::true_type>::type;
 };
 //
 // Does the Policy ever throw on error?
diff --git a/inst/include/boost/math/quadrature/detail/exp_sinh_detail.hpp b/inst/include/boost/math/quadrature/detail/exp_sinh_detail.hpp
index db4863e7a..77f2fbf06 100644
--- a/inst/include/boost/math/quadrature/detail/exp_sinh_detail.hpp
+++ b/inst/include/boost/math/quadrature/detail/exp_sinh_detail.hpp
@@ -7,6 +7,10 @@
 #ifndef BOOST_MATH_QUADRATURE_DETAIL_EXP_SINH_DETAIL_HPP
 #define BOOST_MATH_QUADRATURE_DETAIL_EXP_SINH_DETAIL_HPP
 
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <cmath>
 #include <vector>
 #include <typeinfo>
@@ -15,7 +19,7 @@
 #include <boost/math/tools/atomic.hpp>
 #include <boost/math/tools/config.hpp>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <mutex>
 #endif
 
@@ -49,7 +53,7 @@ class exp_sinh_detail
 private:
    const std::vector<Real>& get_abscissa_row(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -62,7 +66,7 @@ class exp_sinh_detail
    }
    const std::vector<Real>& get_weight_row(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -83,13 +87,13 @@ class exp_sinh_detail
 
    void extend_refinements()const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       std::lock_guard<std::mutex> guard(m_mutex);
 #endif
       //
       // Check some other thread hasn't got here after we read the atomic variable, but before we got here:
       //
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() >= m_max_refinements)
          return;
 #else
@@ -129,7 +133,7 @@ class exp_sinh_detail
     mutable std::vector<std::vector<Real>> m_abscissas;
     mutable std::vector<std::vector<Real>> m_weights;
     std::size_t                       m_max_refinements;
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
     mutable boost::math::detail::atomic_unsigned_type      m_committed_refinements{};
     mutable std::mutex m_mutex;
 #else
@@ -198,13 +202,29 @@ auto exp_sinh_detail<Real, Policy>::integrate(const F& f, Real* error, Real* L1,
         if (!have_first_j && (I1_last == I1))
         {
            // No change to the sum, disregard these values on the LHS:
-           min_abscissa = m_abscissas[1][i];
-           first_j = i;
+           if ((i < m_abscissas[1].size() - 1) && (m_abscissas[1][i + 1] > max_abscissa))
+           {
+              // The summit is so high, that we found nothing in this row which added to the integral!!
+              have_first_j = true;
+           }
+           else
+           {
+              min_abscissa = m_abscissas[1][i];
+              first_j = i;
+           }
         }
         else
            have_first_j = true;
     }
 
+    if (I0 == static_cast<Real>(0))
+    {
+       // We failed to find anything, is the integral zero, or have we just not found it yet?
+       // We'll try one more level, if that still finds nothing then it'll terminate.
+       min_abscissa = 0;
+       max_abscissa = boost::math::tools::max_value<Real>();
+    }
+
     I1 *= half<Real>();
     L1_I1 *= half<Real>();
     Real err = abs(I0 - I1);
@@ -243,7 +263,7 @@ auto exp_sinh_detail<Real, Policy>::integrate(const F& f, Real* error, Real* L1,
         err = abs(I0 - I1);
         //std::cout << "Estimate:        " << I1 << " Error estimate at level " << i  << " = " << err << std::endl;
         // Use L1_I1 here to make it work with both complex and real valued integrands:
-        if (!isfinite(L1_I1))
+        if (!(boost::math::isfinite)(L1_I1))
         {
             return static_cast<K>(policies::raise_evaluation_error(function, "The exp_sinh quadrature evaluated your function at a singular point and returned %1%. Please ensure your function evaluates to a finite number over its entire domain.", I1, Policy()));
         }
@@ -373,7 +393,7 @@ void exp_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 1>&)
       { 3.95175890e-21f, 1.83575349e-20f, 8.12661397e-20f, 3.43336935e-19f, 1.38634563e-18f, 5.35757029e-18f, 1.98424944e-17f, 7.05221126e-17f, 2.40827550e-16f, 7.91175869e-16f, 2.50347754e-15f, 7.63871031e-15f, 2.25003103e-14f, 6.40502166e-14f, 1.76389749e-13f, 4.70424252e-13f, 1.21618334e-12f, 3.05082685e-12f, 7.43273471e-12f, 1.76028616e-11f, 4.05602375e-11f, 9.10055013e-11f, 1.98994391e-10f, 4.24390078e-10f, 8.83436580e-10f, 1.79636925e-09f, 3.57059250e-09f, 6.94247187e-09f, 1.32133371e-08f, 2.46332536e-08f, 4.50110843e-08f, 8.06630537e-08f, 1.41856144e-07f, 2.44958654e-07f, 4.15579069e-07f, 6.93056106e-07f, 1.13675616e-06f, 1.83473665e-06f, 2.91544023e-06f, 4.56318858e-06f, 7.03833675e-06f, 1.07030190e-05f, 1.60534529e-05f, 2.37597559e-05f, 3.47141604e-05f, 5.00883685e-05f, 7.14005734e-05f, 1.00592372e-04f, 1.40115414e-04f, 1.93027181e-04f, 2.63094779e-04f, 3.54905080e-04f, 4.73978972e-04f, 6.26886955e-04f, 8.21362793e-04f, 1.06641153e-03f, 1.37240787e-03f, 1.75118071e-03f, 2.21607971e-03f, 2.78201983e-03f, 3.46550010e-03f, 4.28459361e-03f, 5.25890609e-03f, 6.40950150e-03f, 7.75879384e-03f, 9.33040551e-03f, 1.11489935e-02f, 1.32400455e-02f, 1.56296499e-02f, 1.83442433e-02f, 2.14103400e-02f, 2.48542509e-02f, 2.87017958e-02f, 3.29780164e-02f, 3.77068968e-02f, 4.29110964e-02f, 4.86117029e-02f, 5.48280093e-02f, 6.15773214e-02f, 6.88747982e-02f, 7.67333308e-02f, 8.51634602e-02f, 9.41733378e-02f, 1.03768728e-01f, 1.13953051e-01f, 1.24727473e-01f, 1.36091031e-01f, 1.48040798e-01f, 1.60572082e-01f, 1.73678660e-01f, 1.87353038e-01f, 2.01586736e-01f, 2.16370598e-01f, 2.31695113e-01f, 2.47550758e-01f, 2.63928342e-01f, 2.80819365e-01f, 2.98216379e-01f, 3.16113348e-01f, 3.34506011e-01f, 3.53392244e-01f, 3.72772414e-01f, 3.92649735e-01f, 4.13030618e-01f, 4.33925021e-01f, 4.55346789e-01f, 4.77314001e-01f, 4.99849320e-01f, 5.22980337e-01f, 5.46739932e-01f, 5.71166640e-01f, 5.96305036e-01f, 6.22206131e-01f, 6.48927802e-01f, 6.76535247e-01f, 7.05101473e-01f, 7.34707835e-01f, 7.65444619e-01f, 7.97411688e-01f, 8.30719192e-01f, 8.65488366e-01f, 9.01852407e-01f, 9.39957463e-01f, 9.79963735e-01f, 1.02204672e+00f, 1.06639858e+00f, 1.11322974e+00f, 1.16277062e+00f, 1.21527359e+00f, 1.27101525e+00f, 1.33029891e+00f, 1.39345744e+00f, 1.46085648e+00f, 1.53289803e+00f, 1.61002461e+00f, 1.69272386e+00f, 1.78153384e+00f, 1.87704900e+00f, 1.97992701e+00f, 2.09089644e+00f, 2.21076567e+00f, 2.34043290e+00f, 2.48089770e+00f, 2.63327413e+00f, 2.79880590e+00f, 2.97888368e+00f, 3.17506505e+00f, 3.38909744e+00f, 3.62294469e+00f, 3.87881764e+00f, 4.15920968e+00f, 4.46693789e+00f, 4.80519096e+00f, 5.17758497e+00f, 5.58822853e+00f, 6.04179895e+00f, 6.54363157e+00f, 7.09982467e+00f, 7.71736306e+00f, 8.40426388e+00f, 9.16974906e+00f, 1.00244499e+01f, 1.09806502e+01f, 1.20525758e+01f, 1.32567410e+01f, 1.46123627e+01f, 1.61418586e+01f, 1.78714466e+01f, 1.98318690e+01f, 2.20592694e+01f, 2.45962577e+01f, 2.74932084e+01f, 3.08098460e+01f, 3.46171893e+01f, 3.89999428e+01f, 4.40594471e+01f, 4.99173320e+01f, 5.67200545e+01f, 6.46445583e+01f, 7.39053537e+01f, 8.47634121e+01f, 9.75373786e+01f, 1.12617765e+02f, 1.30484989e+02f, 1.51732386e+02f, 1.77095712e+02f, 2.07491096e+02f, 2.44064119e+02f, 2.88253545e+02f, 3.41874461e+02f, 4.07227291e+02f, 4.87241400e+02f, 5.85665251e+02f, 7.07319497e+02f, 8.58435639e+02f, 1.04711167e+03f, 1.28392853e+03f, 1.58278901e+03f, 1.96206607e+03f, 2.44618436e+03f, 3.06781187e+03f, 3.87091688e+03f, 4.91505977e+03f, 6.28145970e+03f, 8.08162997e+03f, 1.04697579e+04f, 1.36605846e+04f, 1.79554230e+04f, 2.37803156e+04f, 3.17424455e+04f, 4.27142204e+04f, 5.79596727e+04f, 7.93261335e+04f, 1.09537503e+05f, 1.52647130e+05f, 2.14743829e+05f, 3.05063335e+05f, 4.37755687e+05f, 6.34724899e+05f, 9.30240305e+05f, 1.37850753e+06f, 2.06623977e+06f, 3.13377596e+06f, 4.81098405e+06f, 7.47905793e+06f, 1.17782423e+07f, 1.87980927e+07f, 3.04180655e+07f, 4.99257437e+07f, 8.31551852e+07f, 1.40614107e+08f, 2.41519712e+08f, 4.21576502e+08f, 7.48209440e+08f, 1.35089892e+09f, 2.48263348e+09f, 4.64662007e+09f, 8.86235204e+09f, 1.72348930e+10f, 3.41967381e+10f, 6.92714904e+10f, 1.43352142e+11f, 3.03269524e+11f, 6.56345865e+11f, 1.45422052e+12f, 3.30099910e+12f, 7.68267630e+12f, 1.83474885e+13f, 4.49980389e+13f, 1.13430702e+14f, 2.94148450e+14f, 7.85402504e+14f, 2.16127995e+15f, 6.13534293e+15f, 1.79847736e+16f, 5.44944507e+16f, 1.70858922e+17f, 5.54922744e+17f, 1.86905990e+18f, 6.53599225e+18f, 2.37582887e+19f, 8.98810682e+19f, 3.54341330e+20f, },
       { 2.67108015e-21f, 5.82833463e-21f, 1.25616316e-20f, 2.67469785e-20f, 5.62745845e-20f, 1.17014394e-19f, 2.40511019e-19f, 4.88739481e-19f, 9.82072303e-19f, 1.95168062e-18f, 3.83661097e-18f, 7.46163208e-18f, 1.43594942e-17f, 2.73485792e-17f, 5.15573612e-17f, 9.62223075e-17f, 1.77810682e-16f, 3.25389618e-16f, 5.89765054e-16f, 1.05888451e-15f, 1.88354538e-15f, 3.31989417e-15f, 5.79902273e-15f, 1.00398818e-14f, 1.72308010e-14f, 2.93186753e-14f, 4.94655967e-14f, 8.27635884e-14f, 1.37343706e-13f, 2.26082511e-13f, 3.69205736e-13f, 5.98228147e-13f, 9.61866975e-13f, 1.53484658e-12f, 2.43090464e-12f, 3.82185577e-12f, 5.96531965e-12f, 9.24474797e-12f, 1.42267754e-11f, 2.17427910e-11f, 3.30041201e-11f, 4.97635091e-11f, 7.45399354e-11f, 1.10929412e-10f, 1.64031748e-10f, 2.41032586e-10f, 3.51991946e-10f, 5.10905560e-10f, 7.37124150e-10f, 1.05723929e-09f, 1.50757352e-09f, 2.13744796e-09f, 3.01344401e-09f, 4.22492806e-09f, 5.89117093e-09f, 8.17046854e-09f, 1.12717587e-08f, 1.54693324e-08f, 2.11213594e-08f, 2.86930859e-08f, 3.87857241e-08f, 5.21722335e-08f, 6.98414017e-08f, 9.30518593e-08f, 1.23397923e-07f, 1.62889442e-07f, 2.14048123e-07f, 2.80023159e-07f, 3.64729321e-07f, 4.73011070e-07f, 6.10836627e-07f, 7.85526363e-07f, 1.00602028e-06f, 1.28318979e-06f, 1.63019938e-06f, 2.06292424e-06f, 2.60043021e-06f, 3.26552286e-06f, 4.08537275e-06f, 5.09222413e-06f, 6.32419483e-06f, 7.82617466e-06f, 9.65083023e-06f, 1.18597236e-05f, 1.45245521e-05f, 1.77285168e-05f, 2.15678251e-05f, 2.61533347e-05f, 3.16123436e-05f, 3.80905295e-05f, 4.57540432e-05f, 5.47917575e-05f, 6.54176707e-05f, 7.78734661e-05f, 9.24312223e-05f, 1.09396271e-04f, 1.29110197e-04f, 1.51953965e-04f, 1.78351176e-04f, 2.08771424e-04f, 2.43733750e-04f, 2.83810168e-04f, 3.29629253e-04f, 3.81879756e-04f, 4.41314233e-04f, 5.08752659e-04f, 5.85085996e-04f, 6.71279692e-04f, 7.68377076e-04f, 8.77502620e-04f, 9.99865030e-04f, 1.13676015e-03f, 1.28957360e-03f, 1.45978322e-03f, 1.64896113e-03f, 1.85877551e-03f, 2.09099200e-03f, 2.34747474e-03f, 2.63018699e-03f, 2.94119122e-03f, 3.28264890e-03f, 3.65681963e-03f, 4.06605991e-03f, 4.51282135e-03f, 4.99964828e-03f, 5.52917497e-03f, 6.10412222e-03f, 6.72729343e-03f, 7.40157020e-03f, 8.12990738e-03f, 8.91532760e-03f, 9.76091537e-03f, 1.06698107e-02f, 1.16452023e-02f, 1.26903202e-02f, 1.38084285e-02f, 1.50028172e-02f, 1.62767940e-02f, 1.76336759e-02f, 1.90767806e-02f, 2.06094173e-02f, 2.22348784e-02f, 2.39564300e-02f, 2.57773028e-02f, 2.77006834e-02f, 2.97297055e-02f, 3.18674406e-02f, 3.41168899e-02f, 3.64809756e-02f, 3.89625331e-02f, 4.15643030e-02f, 4.42889240e-02f, 4.71389254e-02f, 5.01167213e-02f, 5.32246039e-02f, 5.64647382e-02f, 5.98391571e-02f, 6.33497571e-02f, 6.69982939e-02f, 7.07863800e-02f, 7.47154815e-02f, 7.87869165e-02f, 8.30018539e-02f, 8.73613125e-02f, 9.18661613e-02f, 9.65171203e-02f, 1.01314762e-01f, 1.06259513e-01f, 1.11351656e-01f, 1.16591337e-01f, 1.21978563e-01f, 1.27513213e-01f, 1.33195039e-01f, 1.39023671e-01f, 1.44998628e-01f, 1.51119321e-01f, 1.57385061e-01f, 1.63795066e-01f, 1.70348473e-01f, 1.77044340e-01f, 1.83881662e-01f, 1.90859375e-01f, 1.97976367e-01f, 2.05231492e-01f, 2.12623572e-01f, 2.20151415e-01f, 2.27813822e-01f, 2.35609599e-01f, 2.43537565e-01f, 2.51596569e-01f, 2.59785494e-01f, 2.68103274e-01f, 2.76548903e-01f, 2.85121445e-01f, 2.93820047e-01f, 3.02643950e-01f, 3.11592502e-01f, 3.20665165e-01f, 3.29861530e-01f, 3.39181328e-01f, 3.48624439e-01f, 3.58190905e-01f, 3.67880941e-01f, 3.77694943e-01f, 3.87633504e-01f, 3.97697421e-01f, 4.07887708e-01f, 4.18205605e-01f, 4.28652591e-01f, 4.39230391e-01f, 4.49940993e-01f, 4.60786652e-01f, 4.71769905e-01f, 4.82893580e-01f, 4.94160809e-01f, 5.05575036e-01f, 5.17140031e-01f, 5.28859900e-01f, 5.40739096e-01f, 5.52782432e-01f, 5.64995090e-01f, 5.77382639e-01f, 5.89951040e-01f, 6.02706666e-01f, 6.15656310e-01f, 6.28807202e-01f, 6.42167019e-01f, 6.55743908e-01f, 6.69546490e-01f, 6.83583887e-01f, 6.97865729e-01f, 7.12402181e-01f, 7.27203953e-01f, 7.42282322e-01f, 7.57649155e-01f, 7.73316926e-01f, 7.89298740e-01f, 8.05608358e-01f, 8.22260217e-01f, 8.39269463e-01f, 8.56651970e-01f, 8.74424378e-01f, 8.92604116e-01f, 9.11209442e-01f, 9.30259469e-01f, 9.49774208e-01f, 9.69774604e-01f, 9.90282579e-01f, 1.01132107e+00f, 1.03291408e+00f, 1.05508673e+00f, 1.07786529e+00f, 1.10127728e+00f, 1.12535146e+00f, 1.15011796e+00f, 1.17560829e+00f, 1.20185546e+00f, 1.22889400e+00f, 1.25676010e+00f, 1.28549162e+00f, 1.31512826e+00f, 1.34571158e+00f, 1.37728514e+00f, 1.40989460e+00f, 1.44358784e+00f, 1.47841507e+00f, 1.51442894e+00f, 1.55168471e+00f, 1.59024039e+00f, 1.63015687e+00f, 1.67149810e+00f, 1.71433126e+00f, 1.75872698e+00f, 1.80475947e+00f, 1.85250679e+00f, 1.90205105e+00f, 1.95347869e+00f, 2.00688065e+00f, 2.06235275e+00f, 2.11999592e+00f, 2.17991652e+00f, 2.24222670e+00f, 2.30704472e+00f, 2.37449538e+00f, 2.44471039e+00f, 2.51782884e+00f, 2.59399766e+00f, 2.67337209e+00f, 2.75611628e+00f, 2.84240383e+00f, 2.93241843e+00f, 3.02635449e+00f, 3.12441791e+00f, 3.22682682e+00f, 3.33381238e+00f, 3.44561973e+00f, 3.56250887e+00f, 3.68475574e+00f, 3.81265333e+00f, 3.94651282e+00f, 4.08666490e+00f, 4.23346116e+00f, 4.38727553e+00f, 4.54850596e+00f, 4.71757611e+00f, 4.89493722e+00f, 5.08107015e+00f, 5.27648761e+00f, 5.48173646e+00f, 5.69740032e+00f, 5.92410235e+00f, 6.16250823e+00f, 6.41332946e+00f, 6.67732689e+00f, 6.95531455e+00f, 7.24816384e+00f, 7.55680807e+00f, 7.88224735e+00f, 8.22555401e+00f, 8.58787841e+00f, 8.97045530e+00f, 9.37461076e+00f, 9.80176975e+00f, 1.02534643e+01f, 1.07313428e+01f, 1.12371793e+01f, 1.17728848e+01f, 1.23405187e+01f, 1.29423019e+01f, 1.35806306e+01f, 1.42580922e+01f, 1.49774818e+01f, 1.57418213e+01f, 1.65543795e+01f, 1.74186947e+01f, 1.83385994e+01f, 1.93182476e+01f, 2.03621450e+01f, 2.14751816e+01f, 2.26626686e+01f, 2.39303784e+01f, 2.52845893e+01f, 2.67321348e+01f, 2.82804577e+01f, 2.99376708e+01f, 3.17126238e+01f, 3.36149769e+01f, 3.56552840e+01f, 3.78450835e+01f, 4.01970005e+01f, 4.27248599e+01f, 4.54438126e+01f, 4.83704762e+01f, 5.15230921e+01f, 5.49217006e+01f, 5.85883374e+01f, 6.25472527e+01f, 6.68251567e+01f, 7.14514957e+01f, 7.64587609e+01f, 8.18828353e+01f, 8.77633847e+01f, 9.41442967e+01f, 1.01074176e+02f, 1.08606902e+02f, 1.16802259e+02f, 1.25726650e+02f, 1.35453899e+02f, 1.46066166e+02f, 1.57654979e+02f, 1.70322410e+02f, 1.84182406e+02f, 1.99362306e+02f, 2.16004568e+02f, 2.34268740e+02f, 2.54333703e+02f, 2.76400239e+02f, 3.00693971e+02f, 3.27468728e+02f, 3.57010397e+02f, 3.89641362e+02f, 4.25725590e+02f, 4.65674502e+02f, 5.09953726e+02f, 5.59090900e+02f, 6.13684688e+02f, 6.74415211e+02f, 7.42056139e+02f, 8.17488717e+02f, 9.01718069e+02f, 9.95892168e+02f, 1.10132394e+03f, 1.21951707e+03f, 1.35219615e+03f, 1.50134197e+03f, 1.66923291e+03f, 1.85849349e+03f, 2.07215152e+03f, 2.31370536e+03f, 2.58720328e+03f, 2.89733724e+03f, 3.24955383e+03f, 3.65018587e+03f, 4.10660860e+03f, 4.62742547e+03f, 5.22268956e+03f, 5.90416786e+03f, 6.68565726e+03f, 7.58336313e+03f, 8.61635357e+03f, 9.80710572e+03f, 1.11821637e+04f, 1.27729327e+04f, 1.46166396e+04f, 1.67574960e+04f, 1.92481112e+04f, 2.21512104e+04f, 2.55417295e+04f, 2.95093735e+04f, 3.41617487e+04f, 3.96282043e+04f, 4.60645561e+04f, 5.36589049e+04f, 6.26388223e+04f, 7.32802431e+04f, 8.59184957e+04f, 1.00962017e+05f, 1.18909442e+05f, 1.40370957e+05f, 1.66095034e+05f, 1.97001996e+05f, 2.34226253e+05f, 2.79169596e+05f, 3.33568603e+05f, 3.99580125e+05f, 4.79889989e+05f, 5.77851588e+05f, 6.97663062e+05f, 8.44594440e+05f, 1.02527965e+06f, 1.24809298e+06f, 1.52363581e+06f, 1.86536786e+06f, 2.29042802e+06f, 2.82070529e+06f, 3.48424008e+06f, 4.31706343e+06f, 5.36561882e+06f, 6.68996113e+06f, 8.36799594e+06f, 1.05011160e+07f, 1.32217203e+07f, 1.67032788e+07f, 2.11738506e+07f, 2.69343047e+07f, 3.43829654e+07f, 4.40490690e+07f, 5.66383460e+07f, 7.30953564e+07f, 9.46890531e+07f, 1.23130681e+08f, 1.60736861e+08f, 2.10656057e+08f, 2.77184338e+08f, 3.66207397e+08f, 4.85821891e+08f, 6.47212479e+08f, 8.65895044e+08f, 1.16348659e+09f, 1.57023596e+09f, 2.12865840e+09f, 2.89877917e+09f, 3.96573294e+09f, 5.45082863e+09f, 7.52773593e+09f, 1.04462776e+10f, 1.45675716e+10f, 2.04161928e+10f, 2.87579864e+10f, 4.07167363e+10f, 5.79499965e+10f, 8.29154750e+10f, 1.19276754e+11f, 1.72524570e+11f, 2.50933409e+11f, 3.67042596e+11f, 5.39962441e+11f, 7.98985690e+11f, 1.18927611e+12f, 1.78088199e+12f, 2.68310388e+12f, 4.06753710e+12f, 6.20525592e+12f, 9.52719664e+12f, 1.47228407e+13f, 2.29025392e+13f, 3.58662837e+13f, 5.65517100e+13f, 8.97859411e+13f, 1.43556057e+14f, 2.31171020e+14f, 3.74966777e+14f, 6.12702071e+14f, 1.00868013e+15f, 1.67323268e+15f, 2.79711270e+15f, 4.71267150e+15f, 8.00353033e+15f, 1.37027503e+16f, 2.36538022e+16f, 4.11734705e+16f, 7.22793757e+16f, 1.27982244e+17f, 2.28603237e+17f, 4.11976277e+17f, 7.49169358e+17f, 1.37488861e+18f, 2.54681529e+18f, 4.76248383e+18f, 8.99167123e+18f, 1.71428840e+19f, 3.30088717e+19f, 6.42020070e+19f, 1.26155602e+20f, 2.50480806e+20f, 5.02601059e+20f, 1.01935525e+21f, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -413,7 +433,7 @@ void exp_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 2>&)
       { 8.688318611421924613e-158, 6.864317997043424201e-153, 3.829638174036322920e-148, 1.524985558970066863e-143, 4.379527631402474835e-139, 9.162408388991747001e-135, 1.410086556664696347e-130, 1.611529786006329005e-126, 1.380269212504431613e-122, 8.938739565456142404e-119, 4.414803004265274778e-115, 1.676831992534574674e-111, 4.937648515671545377e-108, 1.136068312653058895e-104, 2.057969760853201132e-101, 2.956779836249922681e-98, 3.393449014375824853e-95, 3.132619285740674842e-92, 2.341677665639346254e-89, 1.426656997926173190e-86, 7.128825597334931865e-84, 2.939485275517928205e-81, 1.006113300119903410e-78, 2.874969402023240560e-76, 6.896713338909433222e-74, 1.396405038640012785e-71, 2.398869799873387326e-69, 3.514180228970525006e-67, 4.411557600438730779e-65, 4.768408435763044172e-63, 4.458287229998440383e-61, 3.621710763086768959e-59, 2.567373174003034094e-57, 1.594829856885795944e-55, 8.716746897177859412e-54, 4.208424534880021226e-52, 1.801637343401221381e-50, 6.864432292330768862e-49, 2.336084584516383243e-47, 7.125716658075193173e-46, 1.954733295862350631e-44, 4.838195020814970471e-43, 1.083903033389729471e-41, 2.204655424309513426e-40, 4.083431629921110537e-39, 6.907095608064865023e-38, 1.069951518082577963e-36, 1.521972185061747284e-35, 1.993254198127980161e-34, 2.409552194902670884e-33, 2.695243589253751811e-32, 2.796309045342585624e-31, 2.697138787161831243e-30, 2.423968619042656074e-29, 2.034233848004972409e-28, 1.597498662808006882e-27, 1.176341105034547043e-26, 8.138404856556384931e-26, 5.300199402716282910e-25, 3.255367628680633536e-24, 1.889060856810273071e-23, 1.037502167741821871e-22, 5.402129194695882094e-22, 2.671080147950250592e-21, 1.256163163817414397e-20, 5.627458451375099018e-20, 2.405110192151924414e-19, 9.820723025892385774e-19, 3.836610965933493002e-18, 1.435949417965440387e-17, 5.155736116435221852e-17, 1.778106820243535736e-16, 5.897650538103448384e-16, 1.883545377386949394e-15, 5.799022727889041128e-15, 1.723080101027408120e-14, 4.946559668895564981e-14, 1.373437058883951037e-13, 3.692057356296675476e-13, 9.618669754374864080e-13, 2.430904641718059201e-12, 5.965319652795549281e-12, 1.422677541958913512e-11, 3.300412010407028696e-11, 7.453993539444124847e-11, 1.640317480539372495e-10, 3.519919455549922227e-10, 7.371241496931924727e-10, 1.507573517782825692e-09, 3.013444008176544118e-09, 5.891170930525923854e-09, 1.127175867596519203e-08, 2.112135943063526334e-08, 3.878572405868819131e-08, 6.984140168311147329e-08, 1.233979234102365865e-07, 2.140481233406505212e-07, 3.647293211756793211e-07, 6.108366265875129839e-07, 1.006020283089617901e-06, 1.630199379920459998e-06, 2.600430208375972125e-06, 4.085372746054298735e-06, 6.324194831966406940e-06, 9.650830226718535837e-06, 1.452455211307694488e-05, 2.156782506321975658e-05, 3.161234361554654466e-05, 4.575404320696170555e-05, 6.541767069965264068e-05, 9.243122234114186712e-05, 1.291101968446571125e-04, 1.783511762821284409e-04, 2.437337497712608884e-04, 3.296292528289701234e-04, 4.413142327104518440e-04, 5.850859955683163216e-04, 7.683770763700705263e-04, 9.998650298180469208e-04, 1.289573601590465490e-03, 1.648961132392222413e-03, 2.090991995585424661e-03, 2.630186988492201910e-03, 3.282648895332118799e-03, 4.066059914467245175e-03, 4.999648283080481820e-03, 6.104122218554241819e-03, 7.401570199659662364e-03, 8.915327597805008451e-03, 1.066981070009509413e-02, 1.269032020049755525e-02, 1.500281723149735994e-02, 1.763367592672867332e-02, 2.060941730962251417e-02, 2.395642996410886880e-02, 2.770068343772389725e-02, 3.186744063963193757e-02, 3.648097561865623097e-02, 4.156430303997019336e-02, 4.713892543167989540e-02, 5.322460385886412684e-02, 5.983915712308283792e-02, 6.699829390463281224e-02, 7.471548149065050122e-02, 8.300185389391494996e-02, 9.186616129460712899e-02, 1.013147618591979452e-01, 1.113516561340355690e-01, 1.219785634003157786e-01, 1.331950386328042665e-01, 1.449986280439946752e-01, 1.573850606313672716e-01, 1.703484726870446791e-01, 1.838816618814874884e-01, 1.979763672973498048e-01, 2.126235716643688402e-01, 2.278138220265254991e-01, 2.435375651517067386e-01, 2.597854941629632707e-01, 2.765489031191654411e-01, 2.938200465906351752e-01, 3.115925016510994851e-01, 3.298615301301230823e-01, 3.486244394295739435e-01, 3.678809406939879716e-01, 3.876335036292959599e-01, 4.078877077798518471e-01, 4.286525905940105684e-01, 4.499409931290513174e-01, 4.717699047639316286e-01, 4.941608088016098926e-01, 5.171400313514193966e-01, 5.407390963876342256e-01, 5.649950903858123945e-01, 5.899510404480374918e-01, 6.156563103475134535e-01, 6.421670194591982411e-01, 6.695464901047961714e-01, 6.978657294374126896e-01, 7.272039526349696447e-01, 7.576491548751669105e-01, 7.892987403432202489e-01, 8.222602173936578230e-01, 8.566519699682320391e-01, 8.926041164852169437e-01, 9.302594686857616145e-01, 9.697746043788558519e-01, 1.011321069700320644e+00, 1.055086728430498711e+00, 1.101277278143300224e+00, 1.150117955536247302e+00, 1.201855456275760449e+00, 1.256760098152647779e+00, 1.315128260359919236e+00, 1.377285136373095709e+00, 1.443587843343442141e+00, 1.514428937238563465e+00, 1.590240390338335337e+00, 1.671498096302065311e+00, 1.758726978084942299e+00, 1.852506785760205887e+00, 1.953478685110838140e+00, 2.062352754065132708e+00, 2.179916523112736371e+00, 2.307044718290330681e+00, 2.444710391817196957e+00, 2.593997656772008968e+00, 2.756116279277535182e+00, 2.932418425642610903e+00, 3.124417914187536020e+00, 3.333812383735923205e+00, 3.562508865047068391e+00, 3.812653330296280988e+00, 4.086664902155689132e+00, 4.387275531849634155e+00, 4.717576109385405085e+00, 5.081070154695596855e+00, 5.481736462718817995e+00, 5.924102347216244340e+00, 6.413329458204850426e+00, 6.955314549766230740e+00, 7.556808065486941215e+00, 8.225554008952760095e+00, 8.970455302965185036e+00, 9.801769746699598466e+00, 1.073134279679936208e+01, 1.177288477943655549e+01, 1.294230185297226511e+01, 1.425809217068106541e+01, 1.574182134943112610e+01, 1.741869467329444792e+01, 1.931824763074534781e+01, 2.147518163232618457e+01, 2.393037838236259586e+01, 2.673213477270754163e+01, 2.993767083537830673e+01, 3.361497689655818107e+01, 3.784508348524495401e+01, 4.272485990900652026e+01, 4.837047622725585887e+01, 5.492170063250241752e+01, 6.254725265973777743e+01, 7.145149574983117631e+01, 8.188283528217430591e+01, 9.414429671899321190e+01, 1.086069017070108772e+02, 1.257266497442910506e+02, 1.460661655727672308e+02, 1.703224100743601641e+02, 1.993623058409479084e+02, 2.342687403011957198e+02, 2.764002385528330658e+02, 3.274687277481591846e+02, 3.896413615832930151e+02, 4.656745019682919178e+02, 5.590908996105107215e+02, 6.744152109571297875e+02, 8.174887172033244140e+02, 9.958921680864290197e+02, 1.219517071629880108e+03, 1.501341972869855447e+03, 1.858493492282554856e+03, 2.313705362529768409e+03, 2.897337235279879262e+03, 3.650185874628374320e+03, 4.627425468074182920e+03, 5.904167858279871204e+03, 7.583363128219763259e+03, 9.807105719965428472e+03, 1.277293273832114230e+04, 1.675749596877978193e+04, 2.215121038263169759e+04, 2.950937349291504490e+04, 3.962820433513419525e+04, 5.365890489878942635e+04, 7.328024305737981431e+04, 1.009620167752942516e+05, 1.403709568321740997e+05, 1.970019955923188504e+05, 2.791695960502382133e+05, 3.995801250202947693e+05, 5.778515877588312220e+05, 8.445944401474017243e+05, 1.248092975135001687e+06, 1.865367859966950385e+06, 2.820705292493674480e+06, 4.317063433830483499e+06, 6.689961127164684387e+06, 1.050111601631327499e+07, 1.670327884792325766e+07, 2.693430470211696200e+07, 4.404906898054894166e+07, 7.309535640536363311e+07, 1.231306812701882145e+08, 2.106560568719367745e+08, 3.662073971851359192e+08, 6.472124787519330196e+08, 1.163486593592585616e+09, 2.128658395254150452e+09, 3.965732938755983605e+09, 7.527735928223242836e+09, 1.456757162128879538e+10, 2.875798636941021041e+10, 5.794999654160054887e+10, 1.192767536774485257e+11, 2.509334090779650360e+11, 5.399624414800303207e+11, 1.189276111740286910e+12, 2.683103883355551677e+12, 6.205255919751506427e+12, 1.472284072112162717e+13, 3.586628373992547853e+13, 8.978594107356889337e+13, 2.311710197091641250e+14, 6.127020712804348908e+14, 1.673232679378485978e+15, 4.712671499032329365e+15, 1.370275025680988289e+16, 4.117347054027612886e+16, 1.279822436878842710e+17, 4.119762767831332886e+17, 1.374888606936629814e+18, 4.762483833659790733e+18, 1.714288404980390540e+19, 6.420200704842635702e+19, 2.504808062315322558e+20, 1.019355251138167687e+21, 4.332952958521756932e+21, 1.926416464889827426e+22, 8.971059571108856501e+22, 4.382317748928748816e+23, 2.249003059943548727e+24, 1.214458587662725100e+25, 6.911683912813140938e+25, 4.152578123301633020e+26, 2.638346388179288086e+27, 1.775811490887700718e+28, 1.268552401544524965e+29, 9.635786341213661742e+29, 7.797939379813000783e+30, 6.736900087983560033e+31, 6.226288752443836475e+32, 6.169035287163451891e+33, 6.567250104576983172e+34, 7.528666735185428595e+35, 9.316271421365627344e+36, 1.247410737003664698e+38, 1.811787648043939987e+39, 2.861918583157116420e+40, 4.929657099622567574e+41, 9.284951278562156071e+42, 1.917687997037326435e+44, 4.355948096683946408e+45, 1.091453486585817118e+47, 3.026206402784023251e+48, 9.314478983991942688e+49, 3.193195693823940775e+51, 1.223447678968662613e+53, 5.257403184148516426e+54, 2.543108925126136766e+56, 1.389947584026783879e+58, 8.616987336205957549e+59, 6.083777056769299984e+61, 4.911841077800001710e+63, 4.554259483169784661e+65, 4.870815185962582259e+67, 6.036211886847067841e+69, 8.708377755587698026e+71, 1.469655296381977267e+74, 2.915822924489215887e+76, 6.836044306573246016e+78, 1.903917300559946782e+81, 6.333813341980360028e+83, 2.531082268773868753e+86, 1.222077360592898816e+89, 7.172167453276776330e+91, 5.148160232410244898e+94, 4.548619807672339638e+97, 4.979632843475864923e+100, 6.800802744782331957e+103, 1.166855497965918386e+107, 2.533457765534279043e+110, 7.012864641215147208e+113, 2.494083354169569414e+117, 1.148722178881219993e+121, 6.908313932158993510e+124, 5.470912484744367184e+128, 5.755359832684120769e+132, 8.115681923907451939e+136, 1.548304780334447081e+141, 4.034912159113614601e+145, 1.450632759611715526e+150, 7.268799665580789770e+154, },
       { 4.901759085947701448e-159, 1.505832423620814399e-156, 4.231872109262999523e-154, 1.089479701785106001e-151, 2.572922387150651649e-149, 5.581311054334156941e-147, 1.113575900126970040e-144, 2.046165051332286084e-142, 3.466994885004770636e-140, 5.423795404073501922e-138, 7.843833272402847010e-136, 1.049922957933194415e-133, 1.302301071957418603e-131, 1.498659737828393008e-129, 1.601906622414286282e-127, 1.592248618401983561e-125, 1.473375345916436274e-123, 1.270651551394009593e-121, 1.022408263525766209e-119, 7.683762602329562781e-118, 5.399268127233373186e-116, 3.551074274853494676e-114, 2.188235409519121010e-112, 1.264667515430816934e-110, 6.861807566737243712e-109, 3.498691686825209963e-107, 1.678016807398375157e-105, 7.577439431441931490e-104, 3.224703770159386809e-102, 1.294487090677705963e-100, 4.906133250963454139e-99, 1.757121317988153326e-97, 5.952042491454320383e-96, 1.908566653286417264e-94, 5.798224459236429212e-93, 1.670293239978334727e-91, 4.566236673398083038e-90, 1.185617342791547945e-88, 2.926160027801296929e-87, 6.870061134126707137e-86, 1.535565783500379945e-84, 3.270036736778401257e-83, 6.639558007206580362e-82, 1.286319750967398593e-80, 2.379566581139022958e-79, 4.206268231398883425e-78, 7.109719237833379433e-77, 1.149915104115372777e-75, 1.780876201255594220e-74, 2.642703796179329883e-73, 3.760085375941719327e-72, 5.132920951124251993e-71, 6.727100274601427696e-70, 8.469585621347697498e-69, 1.025032382672232848e-67, 1.193219127557863348e-66, 1.336816930381306582e-65, 1.442283479679798385e-64, 1.499374555004793991e-63, 1.502797203133501438e-62, 1.453005969318485303e-61, 1.355980448377862540e-60, 1.222072412212552127e-59, 1.064223180270520159e-58, 8.959667396075636845e-58, 7.296288808079294105e-57, 5.750255296190181158e-56, 4.388011664829013518e-55, 3.243852451291832398e-54, 2.324239357665538806e-53, 1.614869776203026446e-52, 1.088524605545274842e-51, 7.121755574192829045e-51, 4.524647662549067074e-50, 2.792730715818793035e-49, 1.675384879603864227e-48, 9.773114328777676091e-48, 5.545910766847627082e-47, 3.062809705627873645e-46, 1.646862118038266234e-45, 8.625108513887155847e-45, 4.401687663868890701e-44, 2.189755778847646746e-43, 1.062345336449265889e-42, 5.028036663485684049e-42, 2.322524635717249223e-41, 1.047406593898341306e-40, 4.613438388449698168e-40, 1.985397445118162005e-39, 8.351027367454628343e-39, 3.434440903484543389e-38, 1.381489131877196646e-37, 5.437051201310225224e-37, 2.094357548080647717e-36, 7.898676618592006902e-36, 2.917536870947471272e-35, 1.055788886022716597e-34, 3.744333812160330812e-34, 1.301801185251957290e-33, 4.438346216893387768e-33, 1.484348268951816542e-32, 4.871001129849836971e-32, 1.568903000742513942e-31, 4.961295315917935235e-31, 1.540773910027990821e-30, 4.700558022172014910e-30, 1.409115230718949596e-29, 4.151913103955692034e-29, 1.202737613715427748e-28, 3.426327374934496736e-28, 9.601405359397026012e-28, 2.647278642033773301e-27, 7.183442220565147103e-27, 1.918850545981494042e-26, 5.046974779455992494e-26, 1.307394799925911700e-25, 3.336342198236957082e-25, 8.389259581136262194e-25, 2.079051813513548608e-24, 5.079178967243765280e-24, 1.223501794357837278e-23, 2.906654911057549530e-23, 6.811668606095015470e-23, 1.574985938238025303e-22, 3.593796788969348326e-22, 8.094185411205212564e-22, 1.799796183237481721e-21, 3.951758901641017285e-21, 8.569580068050865775e-21, 1.835753486517298696e-20, 3.885414339966022317e-20, 8.126613972895021790e-20, 1.680007182889503141e-19, 3.433369351563962828e-19, 6.937695550399427499e-19, 1.386345631008981755e-18, 2.740087497759230881e-18, 5.357570288683386626e-18, 1.036464933022803784e-17, 1.984249442010084992e-17, 3.759788006060003409e-17, 7.052211261821684795e-17, 1.309635641529546221e-16, 2.408275496109180528e-16, 4.385898809611711552e-16, 7.911758686849121285e-16, 1.413883597877183873e-15, 2.503477536644680210e-15, 4.392637866550705827e-15, 7.638710306960574612e-15, 1.316703360377476041e-14, 2.250031027275448919e-14, 3.812239733412214953e-14, 6.405021660191363479e-14, 1.067250538270319484e-13, 1.763897493784721010e-13, 2.891987565334547756e-13, 4.704242520369958085e-13, 7.592878273512691990e-13, 1.216183338372525172e-12, 1.933388593436624879e-12, 3.050826852442290751e-12, 4.779080020017636657e-12, 7.432734713385425098e-12, 1.147833888125873666e-11, 1.760286160372422754e-11, 2.681071101623953168e-11, 4.056023754295965437e-11, 6.095443492241537222e-11, 9.100550129616064211e-11, 1.349993452136967652e-10, 1.989943912395156051e-10, 2.914996073619059788e-10, 4.243900781412219621e-10, 6.141353162671391082e-10, 8.834365795894798511e-10, 1.263395594025933170e-09, 1.796369250051716047e-09, 2.539704143326480862e-09, 3.570592498287890499e-09, 4.992348403150539107e-09, 6.942471870489931483e-09, 9.602949600164561371e-09, 1.321333712761666777e-08, 1.808727901635346390e-08, 2.463325364767791516e-08, 3.338047870136870496e-08, 4.501108426108505069e-08, 6.039985413333259594e-08, 8.066305374526097834e-08, 1.072181059018892614e-07, 1.418561443795353991e-07, 1.868297699836383305e-07, 2.449586539172972009e-07, 3.197559780442760832e-07, 4.155790690867544334e-07, 5.378079713325544678e-07, 6.930561064776686194e-07, 8.894175852502122454e-07, 1.136756157868726006e-06, 1.447041212534730898e-06, 1.834736645332833504e-06, 2.317248822354253644e-06, 2.915440225825303911e-06, 3.654215709863551870e-06, 4.563188576773760151e-06, 5.677433909482232878e-06, 7.038336747307571784e-06, 8.694542758083067228e-06, 1.070301902702759858e-05, 1.313023243937403750e-05, 1.605345286789073897e-05, 1.956218797728780449e-05, 2.375975591555218862e-05, 2.876500146954361208e-05, 3.471416041263076209e-05, 4.176287576185915239e-05, 5.008836848967403773e-05, 5.989176390181730373e-05, 7.140057340280213227e-05, 8.487132973049760036e-05, 1.005923719620999934e-04, 1.188867746885496973e-04, 1.401154137398069279e-04, 1.646801587388731249e-04, 1.930271805904271778e-04, 2.256503597954330556e-04, 2.630947792533707128e-04, 3.059602829980946180e-04, 3.549050801425155303e-04, 4.106493712131842727e-04, 4.739789720708565436e-04, 5.457489087697051069e-04, 6.268869550379884668e-04, 7.183970825975973673e-04, 8.213627933082928901e-04, 9.369503011517966364e-04, 1.066411531385725184e-03, 1.211086903819095417e-03, 1.372407867107646339e-03, 1.551899151252505624e-03, 1.751180706119547318e-03, 1.971969294784470944e-03, 2.216079711850908971e-03, 2.485425598581779636e-03, 2.782019828718993257e-03, 3.107974441230220176e-03, 3.465500098895993776e-03, 3.856905054613959619e-03, 4.284593610523639393e-03, 4.751064058515097225e-03, 5.258906094345618421e-03, 5.810797701414435799e-03, 6.409501504198915943e-03, 7.057860595396970186e-03, 7.758793844909123446e-03, 8.515290702888369372e-03, 9.330405513145299523e-03, 1.020725135717912572e-02, 1.114899345297222760e-02, 1.215884213639836574e-02, 1.324004545661629463e-02, 1.439588142011718850e-02, 1.562964992113485073e-02, 1.694466439888404584e-02, 1.834424326453982033e-02, 1.983170114298836870e-02, 2.141033997615067889e-02, 2.308344003609062690e-02, 2.485425089716015368e-02, 2.672598241710042669e-02, 2.870179577730820310e-02, 3.078479463239356953e-02, 3.297801641870515720e-02, 3.528442387069167064e-02, 3.770689679281728890e-02, 4.024822413326941635e-02, 4.291109640390936770e-02, 4.569809848884132640e-02, 4.861170288163592155e-02, 5.165426338866744454e-02, 5.482800933323496446e-02, 5.813504029216542680e-02, 6.157732139347005467e-02, 6.515667920037330165e-02, 6.887479820368566403e-02, 7.273321794107712090e-02, 7.673333075835566151e-02, 8.087638022439339824e-02, 8.516346020789830747e-02, 8.959551462082867423e-02, 9.417333782991444898e-02, 9.889757573450802477e-02, 1.037687275058577967e-01, 1.087871479799008567e-01, 1.139530506928239996e-01, 1.192665115459606141e-01, 1.247274730840887416e-01, 1.303357493688843496e-01, 1.360910314271734020e-01, 1.419928932517243620e-01, 1.480407983306351483e-01, 1.542341066798992024e-01, 1.605720823524863565e-01, 1.670539013962460335e-01, 1.736786602321317742e-01, 1.804453844236544912e-01, 1.873530378080931153e-01, 1.944005319598201097e-01, 2.015867359561292115e-01, 2.089104864161762672e-01, 2.163705977840528187e-01, 2.239658728275971045e-01, 2.316951133252986765e-01, 2.395571309145607347e-01, 2.475507580756380088e-01, 2.556748592267567912e-01, 2.639283419072366399e-01, 2.723101680268593668e-01, 2.808193651612593497e-01, 2.894550378747292326e-01, 2.982163790535362503e-01, 3.071026812346166036e-01, 3.161133479163487600e-01, 3.252479048399920142e-01, 3.345060112323053140e-01, 3.438874710018250777e-01, 3.533922438832718793e-01, 3.630204565265675291e-01, 3.727724135289699431e-01, 3.826486084108677024e-01, 3.926497345378144818e-01, 4.027766959934214472e-01, 4.130306184097598756e-01, 4.234128597639539906e-01, 4.339250211516634154e-01, 4.445689575501645526e-01, 4.553467885857401860e-01, 4.662609093220769612e-01, 4.773140010883521767e-01, 4.885090423676662636e-01, 4.998493197684479070e-01, 5.113384391034281429e-01, 5.229803366027518117e-01, 5.347792902897740156e-01, 5.467399315500809553e-01, 5.588672569262846167e-01, 5.711666401731758417e-01, 5.836438446098876156e-01, 5.963050358078278898e-01, 6.091567946552975691e-01, 6.222061308419237716e-01, 6.354604968083211637e-01, 6.489278022087558681e-01, 6.626164289370386795e-01, 6.765352467684294227e-01, 6.906936296730053994e-01, 7.051014728587479919e-01, 7.197692106055475377e-01, 7.347078349544334315e-01, 7.499289153196209421e-01, 7.654446190944464391e-01, 7.812677333259577661e-01, 7.974116875368567865e-01, 8.138905777776784362e-01, 8.307191919965581771e-01, 8.479130368187123741e-01, 8.654883658328603475e-01, 8.834622094872810766e-01, 9.018524067040521621e-01, 9.206776383262963142e-01, 9.399574625199963151e-01, 9.597123522591707284e-01, 9.799637350309700387e-01, 1.000734034905599933e+00, 1.022046717124952010e+00, 1.043926335373472893e+00, 1.066398581905185161e+00, 1.089490340711946628e+00, 1.113229743930062164e+00, 1.137646231695313314e+00, 1.162770615670420260e+00, 1.188635146483979071e+00, 1.215273585336112390e+00, 1.242721280043529050e+00, 1.271015245815510799e+00, 1.300194251072644711e+00, 1.330298908642019971e+00, 1.361371772686240192e+00, 1.393457441749111730e+00, 1.426602668328411758e+00, 1.460856475415888358e+00, 1.496270280476785338e+00, 1.532898027375920169e+00, 1.570796326794896619e+00, 1.610024605725646420e+00, 1.650645266669431435e+00, 1.692723857217988332e+00, 1.736329250744977731e+00, 1.781533838991654903e+00, 1.828413737391087381e+00, 1.877049004040720448e+00, 1.927523873304087635e+00, 1.979927005099477087e+00, 2.034351751016940433e+00, 2.090896438495766214e+00, 2.149664674393090421e+00, 2.210765669381402212e+00, 2.274314584729113927e+00, 2.340432903144970240e+00, 2.409248825504827076e+00, 2.480897695429288043e+00, 2.555522453844001656e+00, 2.633274125832370887e+00, 2.714312342284411608e+00, 2.798805899057066353e+00, 2.886933356592141886e+00, 2.978883683190077867e+00, 3.074856945413050211e+00, 3.175065049391765683e+00, 3.279732537139255280e+00, 3.389097442334834102e+00, 3.503412210435275865e+00, 3.622944688401595705e+00, 3.747979189802462585e+00, 3.878817641573403805e+00, 4.015780819279312670e+00, 4.159209678351536168e+00, 4.309466789455788368e+00, 4.466937886899736897e+00, 4.632033539816493591e+00, 4.805190956770360727e+00, 4.986875935432896972e+00, 5.177584970080537688e+00, 5.377847530880629761e+00, 5.588228530273088035e+00, 5.809330993233640059e+00, 6.041798949837089488e+00, 6.286320570342285919e+00, 6.543631565013652661e+00, 6.814518873098582608e+00, 7.099824667819718682e+00, 7.400450706942931008e+00, 7.717363061475788814e+00, 8.051597258371279584e+00, 8.404263876795383951e+00, 8.776554641607500109e+00, 9.169749062247565207e+00, 9.585221670276993889e+00, 1.002444991444300704e+01, 1.048902277839603856e+01, 1.098065019316492606e+01, 1.150117332427169985e+01, 1.205257582204547280e+01, 1.263699613338454324e+01, 1.325674098404332380e+01, 1.391430015262873368e+01, 1.461236267104086712e+01, 1.535383460126837531e+01, 1.614185855545811846e+01, 1.697983514525758524e+01, 1.787144656784601339e+01, 1.882068256013178484e+01, 1.983186897964764985e+01, 2.090969930111845450e+01, 2.205926935196095527e+01, 2.328611564861881683e+01, 2.459625773922860138e+01, 2.599624500732998276e+01, 2.749320844694889238e+01, 2.909491798228195984e+01, 3.080984597641076715e+01, 3.264723765414180400e+01, 3.461718925554321861e+01, 3.673073484057443067e+01, 3.899994278315456980e+01, 4.143802312713618427e+01, 4.405944712930142330e+01, 4.688008048840357439e+01, 4.991733195758662298e+01, 5.319031926387298369e+01, 5.672005451703465811e+01, 6.052965158594831140e+01, 6.464455825915836491e+01, 6.909281639443131774e+01, 7.390535370725211687e+01, 7.911631135942343489e+01, 8.476341209659472308e+01, 9.088837435982152722e+01, 9.753737857533253823e+01, 1.047615927251647361e+02, 1.126177653386554197e+02, 1.211688952437418817e+02, 1.304849888043593828e+02, 1.406439169773708701e+02, 1.517323863863765989e+02, 1.638470407739824279e+02, 1.770957117100033620e+02, 1.915988403612775885e+02, 2.074910955409497265e+02, 2.249232172361061194e+02, 2.440641194630869936e+02, 2.651032917390266964e+02, 2.882535448280364212e+02, 3.137541538897424513e+02, 3.418744609277612322e+02, 3.729180087461214321e+02, 4.072272907593818790e+02, 4.451892153103389878e+02, 4.872414000388630927e+02, 5.338794318098249932e+02, 5.856652513400113117e+02, 6.432368496766822816e+02, 7.073194969336578611e+02, 7.787387632221277236e+02, 8.584356387770406827e+02, 9.474841163944599543e+02, 1.047111666301969297e+03, 1.158723113719277435e+03, 1.283928525349707755e+03, 1.424575826189363437e+03, 1.582789006393775706e+03, 1.761012944445459235e+03, 1.962066073573121788e+03, 2.189202360708354222e+03, 2.446184360349559652e+03, 2.737369460761187093e+03, 3.067811870808767638e+03, 3.443383419509962754e+03, 3.870916878218207705e+03, 4.358376293464465508e+03, 4.915059769420260559e+03, 5.551841303216967404e+03, 6.281459704453426129e+03, 7.118864385205665710e+03, 8.081629967627799596e+03, 9.190454321738597280e+03, 1.046975794051835702e+04, 1.194840663946247320e+04, 1.366058463062104793e+04, 1.564685131637809273e+04, 1.795542299179967539e+04, 2.064373043744082514e+04, 2.378031563732670807e+04, 2.744714621995650953e+04, 3.174244552480722739e+04, 3.678416050731336226e+04, 4.271422037773508051e+04, 4.970377768100323981e+04, 5.795967273138576164e+04, 6.773242484608792593e+04, 7.932613346949942761e+04, 9.311077397156915450e+04, 1.095375030536372224e+05, 1.291577556735669526e+05, 1.526471301608741586e+05, 1.808353350969648289e+05, 2.147438294770164181e+05, 2.556332515573999948e+05, 3.050633345562097502e+05, 3.649687926665853954e+05, 4.377556866857485380e+05, 5.264241222943208736e+05, 6.347248990108319410e+05, 7.673600526542426466e+05, 9.302403050337502786e+05, 1.130816502666451845e+06, 1.378507531155523742e+06, 1.685254393964162275e+06, 2.066239770168639390e+06, 2.540825270229354918e+06, 3.133775962036416630e+06, 3.876865148275802393e+06, 4.810984054018349430e+06, 5.988924089534678664e+06, 7.479057929608060924e+06, 9.370225698693408867e+06, 1.177824230977510661e+07, 1.485459301432580619e+07, 1.879809270383398104e+07, 2.387057334436346400e+07, 3.041806552258603202e+07, 3.889950046843262151e+07, 4.992574374586696017e+07, 6.431287504495613210e+07, 8.315518519925858136e+07, 1.079255664704117961e+08, 1.406141073390035115e+08, 1.839201785677305607e+08, 2.415197116904975365e+08, 3.184386015381112281e+08, 4.215765018929686736e+08, 5.604446356915114550e+08, 7.482094398046911572e+08, 1.003175129668246151e+09, 1.350898918997482870e+09, 1.827222165053491590e+09, 2.482633480831760933e+09, 3.388577637234919719e+09, 4.646620065299105644e+09, 6.401821801566297122e+09, 8.862352038053251473e+09, 1.232838602859196811e+10, 1.723489297480180023e+10, 2.421530528469447376e+10, 3.419673813208063025e+10, 4.854312364622606540e+10, 6.927149043760342676e+10, 9.938049490186203616e+10, 1.433521424759854145e+11, 2.079221734483088227e+11, 3.032695241820108158e+11, 4.448631503727710431e+11, 6.563458646477901051e+11, 9.740635696398910980e+11, 1.454220520059656158e+12, 2.184250688898627320e+12, 3.300999104757560757e+12, 5.019970485022749012e+12, 7.682676299017607834e+12, 1.183376596003983872e+13, 1.834748853557035315e+13, 2.863639312458363586e+13, 4.499803892715039958e+13, 7.119486876989154498e+13, 1.134307017980122346e+14, 1.820065782363618395e+14, 2.941484500615394037e+14, 4.788707305890930382e+14, 7.854025036928623551e+14, 1.297894304619860251e+15, 2.161279954782425640e+15, 3.627102147035003834e+15, 6.135342933440950378e+15, 1.046170006362244506e+16, 1.798477357839665686e+16, 3.117473412332331475e+16, 5.449445073049184222e+16, 9.607515505017978212e+16, 1.708589224452677852e+17, 3.065429751110228665e+17, 5.549227437451149511e+17, 1.013730232778046314e+18, 1.869059895876405824e+18, 3.478549552381578424e+18, 6.535992245975463763e+18, 1.240019272261066308e+19, 2.375828866910936629e+19, 4.597682433604432625e+19, 8.988106816837128428e+19, 1.775302379393632263e+20, 3.543413304390973486e+20, 7.148061397675525327e+20, 1.457620510577186305e+21, 3.005137124879829797e+21, 6.265024861633250697e+21, 1.320979941090283816e+22, 2.817487535902146221e+22, 6.079933041429805231e+22, 1.327658853647212083e+23, 2.934311759183641318e+23, 6.565087216807130026e+23, 1.487212273437937650e+24, 3.411840196076788128e+24, 7.928189928797018762e+24, 1.866451877029704857e+25, 4.452521859886739549e+25, 1.076545435174977662e+26, 2.638685681190697586e+26, 6.557908470244186498e+26, 1.652952243735585721e+27, 4.226383395914916199e+27, 1.096450394268080148e+28, 2.886822082999286080e+28, 7.715480389344015925e+28, 2.093728789309964846e+29, 5.770275789447655037e+29, 1.615463845391781140e+30, 4.595470055795608691e+30, 1.328629392686523255e+31, 3.905079681530784219e+31, 1.167134024271997252e+32, 3.548058538654277403e+32, 1.097378059358046160e+33, 3.454102978064445595e+33, 1.106745393701652323e+34, 3.610899559139069994e+34, 1.199946999283670567e+35, 4.062687014190878792e+35, 1.401835223893224514e+36, 4.931085527333162173e+36, 1.768812393284919500e+37, 6.472148293945199961e+37, 2.416453721739211922e+38, 9.208944720398123862e+38, 3.583297028622126676e+39, 1.424097482596699440e+40, 5.782627833426411524e+40, 2.399862204084363183e+41, 1.018291572042305460e+42, 4.419105414822034531e+42, 1.962126117680499311e+43, 8.916742424061253707e+43, 4.148882478294757720e+44, 1.977256529558276930e+45, 9.655300233875401080e+45, 4.832878898335598922e+46, 2.480575878223098058e+47, 1.306102809757654706e+48, 7.057565717289569232e+48, 3.915276522229618618e+49, 2.230898980943393318e+50, 1.306141334496309306e+51, 7.861021286656392627e+51, 4.865583758538451107e+52, 3.098487425915704674e+53, 2.031037614862563901e+54, 1.370999647608260200e+55, 9.534736274325001528e+55, 6.834959923166415407e+56, 5.052733546324789020e+57, 3.853810997282159979e+58, 3.034183107853208298e+59, 2.467161926009838899e+60, 2.072901039813580593e+61, 1.800563980579615383e+62, 1.617764027895344257e+63, 1.504283028250688329e+64, 1.448393206525427172e+65, 1.444855510980115799e+66, 1.494120428855029243e+67, 1.602566566107015722e+68, 1.783880504153942988e+69, 2.061999240572760738e+70, 2.476521794698572715e+71, 3.092349914153497358e+72, 4.016927238305985810e+73, 5.431607545226497387e+74, 7.650086824042822759e+75, 1.123017984114349288e+77, 1.719382952966052004e+78, 2.747335718690686674e+79, 4.584545010557684123e+80, 7.995082041539250252e+81, 1.458119909365899044e+83, 2.783001178679600175e+84, 5.562812231966194628e+85, 1.165338768982404578e+87, 2.560399126432838224e+88, 5.904549641859098192e+89, 1.430278474749838710e+91, 3.642046122956932563e+92, 9.756698571206402300e+93, 2.751946044275883051e+95, 8.179164793643197279e+96, 2.563704735086825890e+98, 8.481656496128255880e+99, 2.964260254403981007e+101, 1.095342970031208886e+103, 4.283148547584870628e+104, 1.773954352944319744e+106, 7.788991081894224760e+107, 3.628931721056821352e+109, 1.795729272516020592e+111, 9.446685151482835339e+112, 5.288263179614488101e+114, 3.153311236741401362e+116, 2.004807079683827669e+118, 1.360407192665237716e+120, 9.862825609807810517e+121, 7.647551788591128099e+123, 6.348802224871730088e+125, 5.649062361980019098e+127, 5.393248003523784781e+129, 5.530897191915703916e+131, 6.099598644640894333e+133, 7.242098433491964504e+135, 9.268083053637375570e+137, 1.279942702416040582e+140, 1.909796626960621302e+142, 3.082540300669885040e+144, 5.388809732384179657e+146, 1.021610251056626535e+149, 2.103005440072790650e+151, 4.706753990348725570e+153, 1.146834128125248991e+156, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -453,7 +473,7 @@ void exp_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 3>&)
       { 2.99827136671822203139659705254947108e-2455L, 1.24882827026046387418324170521821293e-2379L, 2.44988423001973909940876922057761351e-2306L, 2.66927540888423924256197676379835451e-2235L, 1.89512300782142727523964560129359997e-2166L, 1.02360851047736978252291085443458258e-2099L, 4.88730957021167285814599122540648196e-2035L, 2.38575973739960063984613176811112623e-1972L, 1.37101430897591401677957283544539320e-1911L, 1.06333264218828160158212770967007648e-1852L, 1.27067801926958817891969964688113127e-1795L, 2.66010333678426336904594890897508436e-1740L, 1.10484167956085896672647638913688653e-1686L, 1.02711572445228877679664077673865962e-1634L, 2.40228312498468537472913439313888633e-1584L, 1.58314329557188545251248547330891601e-1535L, 3.28094781159949863603124081342946968e-1488L, 2.37840601013012306745513950331950428e-1442L, 6.68624945754691841776166731458196006e-1398L, 8.05587986859135128455444199209469004e-1355L, 4.58316096287519065423952255855034306e-1313L, 1.35248343166964409448147921555689922e-1272L, 2.26752160966952001157168922897574770e-1233L, 2.35909278572023604645731071940961914e-1195L, 1.65903351294385543451470844717805067e-1158L, 8.56804094411838080986008744972959423e-1123L, 3.52140713988280887124946897137042691e-1088L, 1.24502439015653832112887580419259567e-1054L, 4.08361208615792538039018647193947162e-1022L, 1.33685935274460284904788097419890160e-990L, 4.68914584779066055505548198640894341e-960L, 1.88761464755010821415650640440428715e-930L, 9.32118389977759099804089947706407268e-902L, 6.02287072293155834327191570771930380e-874L, 5.42106639858656175956621834625906078e-847L, 7.22191826970524227339284882890548040e-821L, 1.51020072122639353372149509671977024e-795L, 5.24775126181523166368024963040824842e-771L, 3.20220580014087429159629013136223785e-747L, 3.61997704502523196516304924921584345e-724L, 7.98492800624004092804929885145612391e-702L, 3.61392988815279171930655913638563273e-680L, 3.52366894930304180660437805611575996e-659L, 7.75941790954346674475792064117877807e-639L, 4.03982705605992279012386676527754690e-619L, 5.19834669028776461984659088482903679e-600L, 1.72588931588477933787290173538689408e-581L, 1.54137268468058258004178745033532316e-563L, 3.85562019823508006565291873935904091e-546L, 2.80916830174896024691081755907263354e-529L, 6.19212992045820718698085583700822639e-513L, 4.28406369726641450642830646435371014e-497L, 9.64070107276137860266813577293097959e-482L, 7.30474502980487251348070249880206420e-467L, 1.92703875472217605577664104239882285e-452L, 1.82836317722867439282495454446115074e-438L, 6.43850535226391166629598797094394826e-425L, 8.67564527079512826366041439069686406e-412L, 4.60732378382987117665981750506044471e-399L, 9.92355019653945096209219622811507181e-387L, 8.91282113369599082908019662526444168e-375L, 3.42910268669860807072991706793596262e-363L, 5.80083861220020883214825204353252963e-352L, 4.42512315593917892307328787082985460e-341L, 1.56000404760553377203351190297454435e-330L, 2.60259125151860978088621742839596354e-320L, 2.10262994916038774260354592873630300e-310L, 8.41173460487346663387701675407432002e-301L, 1.70280612724644563266907394311476267e-291L, 1.78116409086610297225917597830385624e-282L, 9.82480313804105048460709403983300504e-274L, 2.91457791899830525764575140294420231e-265L, 4.73965774855838520901565109021450612e-257L, 4.30398176296336788976377718753404885e-249L, 2.22193567988028967419035853512154624e-241L, 6.63553772275767193165934337486647504e-234L, 1.16578412206922730540647811503608703e-226L, 1.22474675486304476176402962758102117e-219L, 7.81684108965031293490823429466674471e-213L, 3.07774321188900147460180897292349446e-206L, 7.58759251414243265302591311385078772e-200L, 1.18823395876906229284835410783359514e-193L, 1.19864235179097517931485807315756884e-187L, 7.89484815058732018316693655376229205e-182L, 3.44001585820470930356951346759790116e-176L, 1.00429282413458278190733306028479555e-170L, 1.98881516262612704197372631141044676e-165L, 2.70364023416269358290386889178454878e-160L, 2.55241036356528886321774073237366662e-155L, 1.69227628517124062919375344585284149e-150L, 7.96587271931569005985245219884752131e-146L, 2.69038016965415710141558028398178580e-141L, 6.58640142296301821553052201959182941e-137L, 1.18042002159083828066729019346791192e-132L, 1.56367343741949029569249898774237153e-128L, 1.54531048534737740803236941099285613e-124L, 1.14963627239221457328345144952502533e-120L, 6.49493107141223206477306791588740146e-117L, 2.81018975962531457950258683552245790e-113L, 9.38876009983047538463236277234608306e-110L, 2.44144614978077332940218030178369234e-106L, 4.97967380423964535764132428105410190e-103L, 8.02629250855504170950085275141889693e-100L, 1.02975774422556528975197839046564511e-96L, 1.05903428462392788554333849690582167e-93L, 8.79012224539705420215807394822091933e-91L, 5.92725904620589386119574720007659266e-88L, 3.26785695641876626125438772016710733e-85L, 1.48222090912512196733576972776187035e-82L, 5.56431172687041304333655416134228735e-80L, 1.73894644850180973193834439393406052e-77L, 4.54974501627115811330277659341709811e-75L, 1.00204791018402181301004224966380115e-72L, 1.86763466487726841127561204857118883e-70L, 2.96092907372076963741238677845263773e-68L, 4.01290356278003207547213477434374557e-66L, 4.67174973180940285995675266523420122e-64L, 4.69376738484344030975102668254954324e-62L, 4.08839867480777582716177965835471551e-60L, 3.10086294017966876521788239138705860e-58L, 2.05664262860193002265928563040484563e-56L, 1.19777269867460483717671801459380654e-54L, 6.14987857896674930479991965502306936e-53L, 2.79459594105487367405294144558243202e-51L, 1.12814222153195027375952194262805170e-49L, 4.06053088698370288660361299969573584e-48L, 1.30770277764601303984357205166621959e-46L, 3.78118998998858848129267831928491324e-45L, 9.84875712554165931773609676827898732e-44L, 2.31826871061275836674260034702071180e-42L, 4.94684766719278736886703293137447413e-41L, 9.59814033368779163526953048426266162e-40L, 1.69828465632158908850726775955673984e-38L, 2.74808806067694979431131601699073400e-37L, 4.07794734980576448596813627579221148e-36L, 5.56417400808680411162969051547065270e-35L, 6.99889732124326604821939972498753725e-34L, 8.13608686966403922600365716655177400e-33L, 8.76218322965140584555660990677761542e-32L, 8.76276637192578280309577248461260176e-31L, 8.15628170980170063345810303188191933e-30L, 7.08149199986036059275640615879247609e-29L, 5.74736606938180421303095720610698091e-28L, 4.36944079330436317602800446372377792e-27L, 3.11795190731786551713306066746724497e-26L, 2.09240762901978141675541589343048983e-25L, 1.32305299259448285811442078319939693e-24L, 7.89691997711578359267081292526106870e-24L, 4.45716605711992632203887297614028920e-23L, 2.38302054707699751676620265710858837e-22L, 1.20889613263470803214753580918237251e-21L, 5.82833462566546297036431040060608322e-21L, 2.67469784973934035752489871481337927e-20L, 1.17014393860453605367131279149462226e-19L, 4.88739480774243667158625429475089610e-19L, 1.95168062031382677617975635339602042e-18L, 7.46163208304186839076058133462415646e-18L, 2.73485791500251557979443670181385630e-17L, 9.62223074873981898938153222962813147e-17L, 3.25389617800670808719193210653774700e-16L, 1.05888451003262711834291997535706834e-15L, 3.31989417456924550647348023471492055e-15L, 1.00398818028880718004903688096398433e-14L, 2.93186753434992804142094819281287207e-14L, 8.27635883877837412701034478711895464e-14L, 2.26082510653047710401828799240495861e-13L, 5.98228146965673437508140635644104873e-13L, 1.53484657642706271558550260287175188e-12L, 3.82185576688620308819449258941130914e-12L, 9.24474797424185856221360345157220406e-12L, 2.17427909729908200066806520833424743e-11L, 4.97635090813511876195380613765617708e-11L, 1.10929412007484858271399815868498117e-10L, 2.41032585809105707126681740366639425e-10L, 5.10905559690208602233885434283852003e-10L, 1.05723928928894498681155298267174319e-09L, 2.13744795688281626795384543565327267e-09L, 4.22492806022042378177884800843897317e-09L, 8.17046853836402216132200964074977087e-09L, 1.54693324186061707441588930749976281e-08L, 2.86930859292637487108510416894642893e-08L, 5.21722334965282980403485300265738444e-08L, 9.30518593041943674159836371480799295e-08L, 1.62889442240265382985512933741863589e-07L, 2.80023159222713498193152226335713707e-07L, 4.73011069732904671695491353591017402e-07L, 7.85526363421471709139200654941264315e-07L, 1.28318979177475296348420727772184965e-06L, 2.06292423671439573062357518920248604e-06L, 3.26552286428871054459476770292453844e-06L, 5.09222413107163744070769490625113325e-06L, 7.82617466349549247600633222001776503e-06L, 1.18597235737360853531010814128200937e-05L, 1.77285167845861097132511756107809923e-05L, 2.61533347347083551795448324767635695e-05L, 3.80905294601878233958593851046717171e-05L, 5.47917574609632216617322114415284106e-05L, 7.78734661207721580410532787755478685e-05L, 1.09396271310786841597436260479638662e-04L, 1.51953965111990518244589142984584154e-04L, 2.08771424329052859462812228725402767e-04L, 2.83810167897154635400111152886276561e-04L, 3.81879755641776745662197699923565149e-04L, 5.08752658539288473040921063606067979e-04L, 6.71279691879016478989727452815073290e-04L, 8.77502619869410964596211481799673429e-04L, 1.13676014562695660388935295197579588e-03L, 1.45978322435393926290231969328136083e-03L, 1.85877550576562291461373383997358853e-03L, 2.34747474413929171623192976971642926e-03L, 2.94119122257973574562047404684570218e-03L, 3.65681962518947136825693675506580632e-03L, 4.51282135037802008049500003706382224e-03L, 5.52917497487431572466643627095469859e-03L, 6.72729342693880289247231232743320046e-03L, 8.12990737739402925191380506695287882e-03L, 9.76091537148098089988167779205704956e-03L, 1.16452022628003896766716791241908478e-02L, 1.38084285310255098081489577923406060e-02L, 1.62767940269060299249627834088541599e-02L, 1.90767805535439719611430291452241110e-02L, 2.22348784290424057418829018676115193e-02L, 2.57773027557106041232220835190089403e-02L, 2.97297055256785242037107379259364943e-02L, 3.41168899105681014303940274877700652e-02L, 3.89625331103873045168982262850032695e-02L, 4.42889239784348614272085648656341809e-02L, 5.01167213062401896725837060595306942e-02L, 5.64647381631055655160905842942135176e-02L, 6.33497570613638646379858081046281019e-02L, 7.07863799874088410337603891340254733e-02L, 7.87869165286187403201277486249691639e-02L, 8.73613124671846027274852311959507760e-02L, 9.65171203330026184766273626679604986e-02L, 1.06259512537229504582581766840088037e-01L, 1.16591336871525032405196867775170242e-01L, 1.27513213378027801743713746335418149e-01L, 1.39023670890726644461647310110564995e-01L, 1.51119320935163034926767802526948718e-01L, 1.63795066161333054101624624583286900e-01L, 1.77044340081249140375155906842322507e-01L, 1.90859374591070988709995096163492901e-01L, 2.05231491577749618625157075644473454e-01L, 2.20151414838427133582099008248376327e-01L, 2.35609598571509171617873703655361587e-01L, 2.51596568823441496049692748064095951e-01L, 2.68103274485319808338763876413696112e-01L, 2.85121444718080293120944366000785895e-01L, 3.02643950033175240463650928525241062e-01L, 3.20665164656273759511495325736015581e-01L, 3.39181328243896232934423095526947639e-01L, 3.58190905496894238632513262989320923e-01L, 3.77694942711148444854921008885136613e-01L, 3.97697420816736709936441112125746846e-01L, 4.18205604975383785180004107895309545e-01L, 4.39230391326913892071217294036947977e-01L, 4.60786651994838310108569244001462874e-01L, 4.82893579976783682783259082280697090e-01L, 5.05575036056380615456191240843198089e-01L, 5.28859900380164343616138823034844308e-01L, 5.52782431848141026163801711629569094e-01L, 5.77382638973537667728623589540847426e-01L, 6.02706666380887845415163251209767664e-01L, 6.28807201638412861233038059400000985e-01L, 6.55743907668438480076422889144751851e-01L, 6.83583886557560546105565188637319809e-01L, 7.12402181207131050122140520074497354e-01L, 7.42282321936634874071712163942668772e-01L, 7.73316925891616774766609626518222875e-01L, 8.05608357929825762678392686079844024e-01L, 8.39269462582114444255866071824225817e-01L, 8.74424377728731780655872302934188327e-01L, 9.11209441820152654384317758539800255e-01L, 9.49774207830947999703385257169606442e-01L, 9.90282578695719860661750084965348602e-01L, 1.03291408077266220499949941381670461e+00L, 1.07786529395310786342015831094913754e+00L, 1.12535145943113425409772316889306152e+00L, 1.17560828892019106387681852443264510e+00L, 1.22889400231711865029290591255755794e+00L, 1.28549162454200134646596760738351906e+00L, 1.34571157661211478758710729669915294e+00L, 1.40989460104228631141154693756330089e+00L, 1.47841506752326819907071392253335661e+00L, 1.55168471165732988584072993312632620e+00L, 1.63015686749586045646523839878119043e+00L, 1.71433126392888582869445858515841385e+00L, 1.80475946586097450583979351681595524e+00L, 1.90205105385821569910651758727035418e+00L, 2.00688065090883085704250790253631297e+00L, 2.11999592251508776978462701922381176e+00L, 2.24222669701791864392841075957133612e+00L, 2.37449537743872890090165532424204567e+00L, 2.51782884491687412950125924770996677e+00L, 2.67337208788498443977901451698681543e+00L, 2.84240383149636938582597352632467033e+00L, 3.02635448975787151687626271616744396e+00L, 3.22682681985641084640836568780538092e+00L, 3.44561972615851906798292101239468486e+00L, 3.68475574257857058166416238846674883e+00L, 3.94651281922700641882215705186324970e+00L, 4.23346115586300426882702466682124288e+00L, 4.54850596485993372358839139642384894e+00L, 4.89493721528314838282250644869812537e+00L, 5.27648761361579143482640951008870741e+00L, 5.69740032348777653019331418706396336e+00L, 6.16250822618479874280298612217822529e+00L, 6.67732688781902305621720870171254858e+00L, 7.24816384288680618425673773908490765e+00L, 7.88224734633420137754997440176783259e+00L, 8.58787841076847338040196250304371454e+00L, 9.37461076170556588083589376387132811e+00L, 1.02534643490360208202755813725095827e+01L, 1.12371792943596952958405098972799626e+01L, 1.23405186912073323038589589843390563e+01L, 1.35806305843369735705552654775963352e+01L, 1.49774818320198815684165550755584428e+01L, 1.65543795252306978072060668000283508e+01L, 1.83385993586213963662082373601202455e+01L, 2.03621450242974894275535474068497776e+01L, 2.26626685943754163096516986406459795e+01L, 2.52845893136112912405786286347442878e+01L, 2.82804576829875229843082739941801350e+01L, 3.17126237580911006574531329780573620e+01L, 3.56552839704483033860162655552985983e+01L, 4.01970005016327611735412627281826315e+01L, 4.54438126123299012690083228854751285e+01L, 5.15230920902650058925899224137885947e+01L, 5.85883374425407037894686827319101058e+01L, 6.68251567023112069515824430636222454e+01L, 7.64587608768192360600680527705062884e+01L, 8.77633846894782777864438965135974549e+01L, 1.01074175868700380244224060820937268e+02L, 1.16802258994842453002226105258170771e+02L, 1.35453898714114297683765730207366657e+02L, 1.57654978967903747896778920825912898e+02L, 1.84182405906460887204718250035971904e+02L, 2.16004568481915370203941996632993398e+02L, 2.54333702516246823953928460722661707e+02L, 3.00693971336392029288524445812313026e+02L, 3.57010397089553597741305454749296236e+02L, 4.25725590115811669827894375931285872e+02L, 5.09953725643224718975881101989299450e+02L, 6.13684687521816216675628323432708789e+02L, 7.42056139017496594867562213902074498e+02L, 9.01718069398279102081695287947885045e+02L, 1.10132394119371945146169423670051948e+03L, 1.35219615071533062822615520086342752e+03L, 1.66923291068630661586092129359067647e+03L, 2.07215152332054272741081984137877196e+03L, 2.58720328209038570262408045410782795e+03L, 3.24955382874419473343636700904469745e+03L, 4.10660860213453501373964026030452875e+03L, 5.22268955795277619388623264624171874e+03L, 6.68565726355089669998707553230747827e+03L, 8.61635357331041935557199135249564277e+03L, 1.11821636876213398227716019227207708e+04L, 1.46166395927660444135310088609126834e+04L, 1.92481111548503807855046302083949422e+04L, 2.55417294787310992653570084425920733e+04L, 3.41617486573493312682855974958999477e+04L, 4.60645561151339657587241032816274431e+04L, 6.26388222783949624156629031841856307e+04L, 8.59184957335087735876745002390386986e+04L, 1.18909441895224029432207119296169161e+05L, 1.66095033938427884484826987675525104e+05L, 2.34226252811038979343276539537003434e+05L, 3.33568602948986258437654580586715228e+05L, 4.79889988962864687601246140266254885e+05L, 6.97663061660509733330079420786394691e+05L, 1.02527964914474052697145671441285507e+06L, 1.52363581455429196593138247075709981e+06L, 2.29042801548317740734746692037333714e+06L, 3.48424008370597272699707163872949391e+06L, 5.36561882022124111785765119998290944e+06L, 8.36799594465384427071057649003523823e+06L, 1.32217203482688374239659605009398927e+07L, 2.11738506478689471767346755297403608e+07L, 3.43829654204789362343598103327212044e+07L, 5.66383460344826705635075490736605924e+07L, 9.46890531446099216978642309212033877e+07L, 1.60736860537955754766368401888105613e+08L, 2.77184337816824251216810756452423932e+08L, 4.85821891491727553231947839400706241e+08L, 8.65895043719996967916785083318862010e+08L, 1.57023595787763814315717820663521931e+09L, 2.89877916582589084595240112564380085e+09L, 5.45082862939618857716273065316347458e+09L, 1.04462776299019818355322697028773431e+10L, 2.04161928476231748290058801874576093e+10L, 4.07167362508726715447348035164126587e+10L, 8.29154750329098975446073110291771593e+10L, 1.72524569678310615987347680670953976e+11L, 3.67042596452982637114653516749325639e+11L, 7.98985690430384590881851382687868095e+11L, 1.78088199348481822130071407591775159e+12L, 4.06753710066430378340194042741373814e+12L, 9.52719664341172412580158176782396629e+12L, 2.29025392291311484677517351429897325e+13L, 5.65517100257158446400477892790807623e+13L, 1.43556057453169991412842468344287817e+14L, 3.74966777273576618576956864828262686e+14L, 1.00868013060119404846072345341681988e+15L, 2.79711270328189457750729359218050034e+15L, 8.00353033476527491290557180677857043e+15L, 2.36538022352308798092653239020367364e+16L, 7.22793756862980926623333746953184515e+16L, 2.28603237125675384523138361921766753e+17L, 7.49169357670736182787260118136384206e+17L, 2.54681528722697062733706069581540403e+18L, 8.99167123461421679854681325569917778e+18L, 3.30088716836331393064955543786333400e+19L, 1.26155602488854061815298573346753948e+20L, 5.02601059129997078887664234449072840e+20L, 2.09003840003334609133024432910535654e+21L, 9.08427629135679092557541630988833736e+21L, 4.13277307337650905633261831455054852e+22L, 1.97077591472219550165099701845426740e+23L, 9.86567192878194333593095251120628263e+23L, 5.19253827231351201624600034890440225e+24L, 2.87797813261600767124658244003026900e+25L, 1.68253103834271529795445964171621893e+26L, 1.03930300492804406447430223922613789e+27L, 6.79491179196076158722692150701779494e+27L, 4.71054472298412825215699352759734253e+28L, 3.46906218798171940969795067049186910e+29L, 2.71919469298029646397308102518695120e+30L, 2.27308597305997987201797057125811269e+31L, 2.03060816941963451979890589753656719e+32L, 1.94261454794602808054773809715560372e+33L, 1.99453642796409945684693816457728868e+34L, 2.20275757078165507105373401305070760e+35L, 2.62280693187648585243154230451397289e+36L, 3.37503469494102278406378324431267258e+37L, 4.70514262885548973786602859197635105e+38L, 7.12449819522227214155183099218285736e+39L, 1.17479491699687500984526531336188586e+41L, 2.11529840618171125644793575486664802e+42L, 4.17057423654484355854313046574264130e+43L, 9.02996402249218455912158145716517353e+44L, 2.15344195364580091650722699472214395e+46L, 5.67373854091156226750041136308702235e+47L, 1.65679493344512341491651081156308385e+49L, 5.37959274142567387437479000715431452e+50L, 1.94883090765131732574822421459033340e+52L, 7.90409930117048365355172083360408902e+53L, 3.60198039300535878643618051284879761e+55L, 1.85117602089555214211892984185617326e+57L, 1.07703344015399312416171835284404207e+59L, 7.12190311508435674119313111798381629e+60L, 5.37418888386167437844586074702336014e+62L, 4.64729650833728307491157079699691435e+64L, 4.62526710582644946748054017004844382e+66L, 5.32182077764493049141810605179622557e+68L, 7.11164697902038500579051989777466680e+70L, 1.10899515910236266304919828966923200e+73L, 2.02799605144484652148788128416483129e+75L, 4.37097775363901059074163853783972656e+77L, 1.11616878412036714566047843287003825e+80L, 3.39514715649439557125494531010505893e+82L, 1.23701982128373508607730444611285161e+85L, 5.42965793175551379743384549971838572e+87L, 2.88810817234216647705316265060164148e+90L, 1.87304637361264791993354548498385904e+93L, 1.49042693797246054384025095285834884e+96L, 1.46460222682423294988692623274219021e+99L, 1.78930667727185631768641895397399502e+102L, 2.73657637241785643461962451320315667e+105L, 5.27697387534476684848681508483720442e+108L, 1.29244503566283656061209233007634805e+112L, 4.05121786788653633019340698712667656e+115L, 1.63797303768105580759099639209855651e+119L, 8.61161786816897952522273022842847467e+122L, 5.93663320306070547376727413186770748e+126L, 5.41263435338015569490052234550484999e+130L, 6.58482575653621278094067557171475624e+134L, 1.07875660982114746476517100137547561e+139L, 2.40241992462133691284825971033750350e+143L, 7.34435324696612505273925787730222850e+147L, 3.11318307060514113999896732347290570e+152L, 1.84887752009365552806348833513339683e+157L, 1.55493753489569904210242587934359215e+162L, 1.87247311840034398087857290386878308e+167L, 3.26561398822344966034897508874934342e+172L, 8.34577318106206521818843721578177275e+177L, 3.16365209967032443701802479913075857e+183L, 1.80121863573431611955949232303314972e+189L, 1.56029746814154042157436181814468250e+195L, 2.08399815409632719398233238905315693e+201L, 4.35116508686695844690078637651674080e+207L, 1.44042594283375698824917457557971547e+214L, 7.67198578340176495038072549202750984e+220L, 6.67439909212164301008970795489093574e+227L, 9.63314810388083227111873828289832687e+234L, 2.34398517046722427869034729305744960e+242L, 9.77625325893464652861772945740140456e+249L, 7.10967843958998030041427991161778060e+257L, 9.17597441867286774623146964891772219e+265L, 2.14036206544827332284805812358315196e+274L, 9.19420612380519250234059644495148895e+282L, 7.41568524413971300723452081581189161e+291L, 1.14573384520235218510170025456065061e+301L, 3.46156619789802557007367290577360329e+310L, 2.08912045049233012342096277237544009e+320L, 2.57451388307699184873778115477509299e+330L, 6.62688893229567984520960366416649465e+340L, 3.64721218233974203748299012650543732e+351L, 4.39668921699312866048896359512324981e+362L, 1.19018091828589034728575506532863164e+374L, 7.42292147631996488193728378356566879e+385L, 1.09526098640141261390128648437627728e+398L, 3.92927734436557751277903528467662194e+410L, 3.52539958718458390412925405124992174e+423L, 8.14407380085561132671651242382158564e+436L, 4.99172864167925991508434677916290384e+450L, 8.37313822543668537823480408319630674e+464L, 3.96855771450749046728173847477197045e+479L, 5.49292894873452993989300213358944271e+494L, 2.29708122354182613470710687416853220e+510L, 3.00602816347641813806476628260504686e+526L, 1.27638345565474398023933739505382139e+543L, 1.82543785151714558753981850731109273e+560L, 9.13886193903951047182967076404934097e+577L, 1.66659166393902754183225415655293639e+596L, 1.15345182570915755941253059732455874e+615L, 3.16074696483848527092291852149349249e+634L, 3.58237065512849118228300807716046934e+654L, 1.75676845140981179589000705343726870e+675L, 3.90495239094757591264933748015965848e+696L, 4.12771024114613858596256966986824636e+718L, 2.18017473107123494465764845328386818e+741L, 6.05537171542030830962660182644895823e+764L, 9.32267445280349135813949292533678488e+788L, 8.40039310752404384099688064836067109e+813L, 4.68572386284109286448290494678984852e+839L, 1.71436621216433181556756205470621080e+866L, 4.36726894564208691170045669145775062e+893L, 8.23850494545149522733960578619372006e+921L, 1.22636833130359811940229369518492693e+951L, 1.53817446772510796133546119401337038e+981L, 1.73934010579080275675622752667739992e+1012L, 1.90139542390828308944919910797818652e+1044L, 2.15946649839694693874583032395369802e+1077L, 2.74458385322614086037916005350795661e+1111L, 4.21460437827726866824631065747020388e+1146L, 8.46327678591246014474308263680903354e+1182L, 2.41136671056709946500959023526115708e+1220L, 1.06046799402590770086828664893536628e+1259L, 7.85179239227989671195411257856609735e+1298L, 1.07053761782523090834371225181245647e+1340L, 2.94820375013014518743449818159813519e+1382L, 1.80414267837505733123417059421507186e+1426L, 2.70702818749460407693598763878577805e+1471L, 1.10237898995725987663697548890315962e+1518L, 1.35298567513553498909522877321159185e+1566L, 5.57611902405430874175886881037679558e+1615L, 8.62760618106732185887902244008862925e+1666L, 5.62274836328861658358184936480919820e+1719L, 1.73809780706704538846353037945373733e+1774L, 2.88052131688282318513745853191288493e+1830L, 2.90423838801873888374451692095277096e+1888L, 2.02951924440811805047282880080209219e+1948L, 1.12457154445459099155545223242406413e+2010L, 5.67678101812548596682420412619518564e+2073L, 3.01259124479996611916817067093268060e+2139L, 1.94839799990442184578594656275869899e+2207L, 1.78866123976568468449541367729975757e+2277L, 2.72776450570640988722564402903756955e+2349L, 8.12826724972980545013533499964424395e+2423L, },
       { 1.58403833597397609272337637131715304e-2474L, 4.01729907956437307269377706375953438e-2436L, 2.58580645701935131155084366864422406e-2398L, 4.31502895023559220093536948165386274e-2361L, 1.90627959218882483095663188951084330e-2324L, 2.27589955667507909301636117518932802e-2288L, 7.49364095876812027654477175001110624e-2253L, 6.94191154236392933887288062436725643e-2218L, 1.84522919671267474043685120983334524e-2183L, 1.43487104640347241520251346864979221e-2149L, 3.32692243646438795745471365264644590e-2116L, 2.34362088307498827836613435573448115e-2083L, 5.10938037262713942693655713913568198e-2051L, 3.51060735754549615330960873223686009e-2019L, 7.73934046950102664330281533900661264e-1988L, 5.57169465236073520583741860201801676e-1957L, 1.33280818206626290524674045358563098e-1926L, 1.07761463878385909143899244627194248e-1896L, 2.99487219016399829947920738111566372e-1867L, 2.90872283894068508271645083240599458e-1838L, 1.00349314519658897817146360011284604e-1809L, 1.24963603019269210233323055704536134e-1781L, 5.70651178926661193581089363715896182e-1754L, 9.70578293043209307574192077696195294e-1727L, 6.24328278846472954410732505740796953e-1700L, 1.54193058035632514209035337344023300e-1673L, 1.48399119945730121895709095048379728e-1647L, 5.64752158032889554103477750567193685e-1622L, 8.62167301557505164690437370018957398e-1597L, 5.35528299764763984143338000418037832e-1572L, 1.37241462764951847155586335894427418e-1547L, 1.47116444020541724843474277134735959e-1523L, 6.68618803692998895772448346916660911e-1500L, 1.30561453192449212967328116730742424e-1476L, 1.10983482751594629837009226116529299e-1453L, 4.16014518377810797736243906294304347e-1431L, 6.96431413050131379947014047903616964e-1409L, 5.27224320695995707920555229340409925e-1387L, 1.82727152085917578757399986780345619e-1365L, 2.93468712490571136931409720092296819e-1344L, 2.21029656493081556265677595112314098e-1323L, 7.89892460822856456312620943162424218e-1303L, 1.35498246922475851477828612647429926e-1282L, 1.12846854910106323887966343965144914e-1262L, 4.61424330893765402182473137993848704e-1243L, 9.36605095127672178405946589653781928e-1224L, 9.54054141854710811663726016692763275e-1205L, 4.92938100391460828476769674596652859e-1186L, 1.30552448174985025504800286655378847e-1167L, 1.79081395504489298673122868237542862e-1149L, 1.28534148947828407343141932678878641e-1131L, 4.87584961151572559819046616829450419e-1114L, 9.87277629967922144952427945151885497e-1097L, 1.07748800964228010206356572218732211e-1079L, 6.39928058051557015650179754550910965e-1063L, 2.08781638937389821580749246439535224e-1046L, 3.77684590339710704264469235045684970e-1030L, 3.82307555361237861173188661605677525e-1014L, 2.18500494285229212661260038960152445e-998L, 7.11371665672211288079530438419393765e-983L, 1.33086590459456967821090511427946680e-967L, 1.44309821421378874919204882407008472e-952L, 9.14647515187060050796469146648366553e-938L, 3.41683020290309632448426799765730462e-923L, 7.58515118221027874504569883083804726e-909L, 1.00874302140725085602226074835782694e-894L, 8.10069400524047548461447004237480370e-881L, 3.95900210017885619699714022194103898e-867L, 1.18662867376446832171113003401601030e-853L, 2.19786739893484213511853337557279548e-840L, 2.53446665772094387684997171428381901e-827L, 1.83299289701163579779687245566728015e-814L, 8.37462324951323786164578010773011160e-802L, 2.43440349985894963165438833576050630e-789L, 4.53405919015746926984345204895280285e-777L, 5.44811780296147933680587250736719556e-765L, 4.25227509910246244055269284525208521e-753L, 2.17028567518979939311612851867355063e-741L, 7.29110293097611082922276966606966112e-730L, 1.62280402409213923291155004693280799e-718L, 2.40828308813354260030814303685712546e-707L, 2.39798644647022706006083856285038692e-696L, 1.61202006993232554271262188260349029e-685L, 7.36078014307223356522361505691981658e-675L, 2.29673595120013740585571409952171287e-664L, 4.92601668045549547120303143586093867e-654L, 7.30469847326532782734592211727680659e-644L, 7.53208483045812497621524949105624661e-634L, 5.43101457218649885434844485451114112e-624L, 2.75364547737132169841544376328974616e-614L, 9.87114363624257039419731807833639141e-605L, 2.51532230246971379761137727536103954e-595L, 4.58020252011364324634687161502454437e-586L, 5.99105224430269595047395967421408836e-577L, 5.65817475729598864582006398104320790e-568L, 3.87790653215945353008449656152626419e-559L, 1.93831767408426944576894121111160849e-550L, 7.10042999124518145073529096418920675e-542L, 1.91544155185588660392537613901890409e-533L, 3.82329460613706944718834058784982843e-525L, 5.67308558344799642959861077485254353e-517L, 6.28651971015047054176370541889652534e-509L, 5.22608309691007325295015732741277330e-501L, 3.27380385796518526996963624688451015e-493L, 1.55218880567110686358214096387337744e-485L, 5.59406715134492552797785887998506288e-478L, 1.53903555561583129370612427064103671e-470L, 3.24582771097869247388161880434215690e-463L, 5.26923908371102477241383694074670819e-456L, 6.61116543964979170247326465662672578e-449L, 6.43651161747399650924315876123367361e-442L, 4.88172530890739153159755873311503383e-435L, 2.89552772291014307121494513337008901e-428L, 1.34824561713159645449381177450374044e-421L, 4.94682830703508395886779775564904786e-415L, 1.43550778574773554814450699757551163e-408L, 3.30662278156545301906789072182270217e-402L, 6.06763076341882342375981845143813941e-396L, 8.90102295078976467641802004915383639e-390L, 1.04750026993369008379812665328207076e-383L, 9.92305977697594285442750520712185343e-378L, 7.59233047709729007268137313555513461e-372L, 4.70739644774061079459196244467224618e-366L, 2.37289471679140773116577190541471766e-360L, 9.75578189470698031776059091702014024e-355L, 3.28173795958592945075990020191630023e-349L, 9.06055778471501819614486253220513415e-344L, 2.05942153439035557149195606898627504e-338L, 3.86530964740245225250791387282901296e-333L, 6.00843270324960642367292431619041056e-328L, 7.75791717613089963209182313649669073e-323L, 8.34421688870272754369905134347321346e-318L, 7.49743392110895125137984446953806518e-313L, 5.64335493091932417079632230402715339e-308L, 3.56822312364224796215751885944182157e-303L, 1.90033575264131712027297219010231489e-298L, 8.54728045366493643486236298588028833e-294L, 3.25523625801393911932111212124054975e-289L, 1.05248047241632062076489482718979111e-284L, 2.89617776712893256185087414745466351e-280L, 6.79988531580997322799099912957691248e-276L, 1.36556351036663137564575797911341140e-271L, 2.35130154856703817933308580165070895e-267L, 3.47957918602140446743207712996488528e-263L, 4.43595246742156897562714682208015764e-259L, 4.88306826050902558584812739817346803e-255L, 4.65192688318894071322199120456680912e-251L, 3.84397217698170104458131412518090261e-247L, 2.76116826189849718252009792299798034e-243L, 1.72788148193695597819524956747708857e-239L, 9.44000021446169518374327174980091189e-236L, 4.51212554821909958969480138145008725e-232L, 1.89078188020015147413152497967774898e-228L, 6.96047357819953940988624584998189879e-225L, 2.25551400000095886908107215813083451e-221L, 6.44644677476230409449870129589571800e-218L, 1.62820413693305623578289570883910133e-214L, 3.64118898140332008867604954881435445e-211L, 7.22342104300488240353501601432620632e-208L, 1.27354621995150979542739771832851778e-204L, 1.99918407175965223164864543465886820e-201L, 2.79923301669228713128194864334595626e-198L, 3.50221902155243103789141550909762023e-195L, 3.92214264392110857739154085058742459e-192L, 3.93845056335503285763060194710496279e-189L, 3.55208932101704820479562248595366349e-186L, 2.88218576501349132033303488025583146e-183L, 2.10742246561673617325867420889217990e-180L, 1.39082883056909297835969428096996258e-177L, 8.29809184041509702782403322046680024e-175L, 4.48275079028324875908925844854947607e-172L, 2.19604664947993546897548946859268970e-169L, 9.77074245531826439290686011595488065e-167L, 3.95412900034836577575737163397063382e-164L, 1.45763752143522946134851229157315125e-161L, 4.90175908594770144816169627656347413e-159L, 1.50583242362081439890282730822964005e-156L, 4.23187210926299952258468916772463829e-154L, 1.08947970178510600143883902241342972e-151L, 2.57292238715065164920970933548863818e-149L, 5.58131105433415694107142145348480095e-147L, 1.11357590012697004029170524556205260e-144L, 2.04616505133228608383036998688279538e-142L, 3.46699488500477063569923373366652510e-140L, 5.42379540407350192206120227447952764e-138L, 7.84383327240284700975116490839187822e-136L, 1.04992295793319441478934809931921214e-133L, 1.30230107195741860304672567525213181e-131L, 1.49865973782839300796909511415792928e-129L, 1.60190662241428628230308870106117967e-127L, 1.59224861840198356125270425396669689e-125L, 1.47337534591643627391632824044256382e-123L, 1.27065155139400959289502878067800521e-121L, 1.02240826352576620907328663762929630e-119L, 7.68376260232956278119400404906698852e-118L, 5.39926812723337318582425048609813182e-116L, 3.55107427485349467569160645183534302e-114L, 2.18823540951912101048500342930263842e-112L, 1.26466751543081693428147968135946762e-110L, 6.86180756673724371219029573988488620e-109L, 3.49869168682520996337772693940273721e-107L, 1.67801680739837515692197356611469711e-105L, 7.57743943144193148982405002124429739e-104L, 3.22470377015938680899710533122019572e-102L, 1.29448709067770596337952427228314258e-100L, 4.90613325096345413914934529363944533e-99L, 1.75712131798815332550332783841135938e-97L, 5.95204249145432038279376449394263726e-96L, 1.90856665328641726356485393831448064e-94L, 5.79822445923642921233565089484060205e-93L, 1.67029323997833472695510332615399040e-91L, 4.56623667339808303761814383193281614e-90L, 1.18561734279154794522720467403607684e-88L, 2.92616002780129692916694825399426567e-87L, 6.87006113412670713749912656047162470e-86L, 1.53556578350037994526862611062995548e-84L, 3.27003673677840125658578850353789865e-83L, 6.63955800720658036202444029681088661e-82L, 1.28631975096739859347518450406626244e-80L, 2.37956658113902295790875474474928153e-79L, 4.20626823139888342521923162463424944e-78L, 7.10971923783337943250783648529172174e-77L, 1.14991510411537277718541841100610582e-75L, 1.78087620125559422021122815240864113e-74L, 2.64270379617932988289762938432353092e-73L, 3.76008537594171932684988546369276565e-72L, 5.13292095112425199264463076393673633e-71L, 6.72710027460142769581137467118289653e-70L, 8.46958562134769749810317782657268756e-69L, 1.02503238267223284787859415412841523e-67L, 1.19321912755786334798650299344282298e-66L, 1.33681693038130658171632078204446788e-65L, 1.44228347967979838541089585366023007e-64L, 1.49937455500479399063651651865716553e-63L, 1.50279720313350143765006477517598013e-62L, 1.45300596931848530329429215240805653e-61L, 1.35598044837786253974814702268132430e-60L, 1.22207241221255212718220407758970979e-59L, 1.06422318027052015901612579353436284e-58L, 8.95966739607563684498250506056071091e-58L, 7.29628880807929410507791279851435148e-57L, 5.75025529619018115782221236649660618e-56L, 4.38801166482901351758297994035262224e-55L, 3.24385245129183239778054564241318804e-54L, 2.32423935766553880551312730791561599e-53L, 1.61486977620302644603098163288002715e-52L, 1.08852460554527484166896264813585652e-51L, 7.12175557419282904469498440847683331e-51L, 4.52464766254906707378983948806266105e-50L, 2.79273071581879303547665803856393705e-49L, 1.67538487960386422664995380528599268e-48L, 9.77311432877767609128920687351148833e-48L, 5.54591076684762708155258243373876422e-47L, 3.06280970562787364526087771025696151e-46L, 1.64686211803826623376300968100335938e-45L, 8.62510851388715584666563483664725226e-45L, 4.40168766386889070104410967553191993e-44L, 2.18975577884764674623829698191429056e-43L, 1.06234533644926588892221744026505121e-42L, 5.02803666348568404922856964957017674e-42L, 2.32252463571724922291588384046952088e-41L, 1.04740659389834130621977678673036650e-40L, 4.61343838844969816849890851044847674e-40L, 1.98539744511816200515536891243051363e-39L, 8.35102736745462834322783293199882340e-39L, 3.43444090348454338873945310910863585e-38L, 1.38148913187719664577281415801326678e-37L, 5.43705120131022522415564030011104834e-37L, 2.09435754808064771674030165617400032e-36L, 7.89867661859200690211003183623252601e-36L, 2.91753687094747127218152557081492503e-35L, 1.05578888602271659701510267800456427e-34L, 3.74433381216033081152946793044225824e-34L, 1.30180118525195729018565371931285108e-33L, 4.43834621689338776826444391843192077e-33L, 1.48434826895181654234585115302567433e-32L, 4.87100112984983697071424260901079389e-32L, 1.56890300074251394167498791840311009e-31L, 4.96129531591793523529868958902224169e-31L, 1.54077391002799082070667599670892752e-30L, 4.70055802217201491012415527477898338e-30L, 1.40911523071894959581827729743208189e-29L, 4.15191310395569203370171887252329295e-29L, 1.20273761371542774812275721780834541e-28L, 3.42632737493449673556641936029297478e-28L, 9.60140535939702601155477307042148556e-28L, 2.64727864203377330130778700812469317e-27L, 7.18344222056514710304108009603342664e-27L, 1.91885054598149404233254994607045127e-26L, 5.04697477945599249407828848720385551e-26L, 1.30739479992591170007499101639277446e-25L, 3.33634219823695708156517864262133521e-25L, 8.38925958113626219399750986165640649e-25L, 2.07905181351354860827899559955891196e-24L, 5.07917896724376528007260946058158296e-24L, 1.22350179435783727784530143589061714e-23L, 2.90665491105754953014975765085018324e-23L, 6.81166860609501546977145188171063268e-23L, 1.57498593823802530267320052674032470e-22L, 3.59379678896934832551131875550134077e-22L, 8.09418541120521256436201968800902213e-22L, 1.79979618323748172103553749785052354e-21L, 3.95175890164101728455789689950582204e-21L, 8.56958006805086577463240518925283894e-21L, 1.83575348651729869648335347322858802e-20L, 3.88541433996602231722399876322981769e-20L, 8.12661397289502178971121801417655470e-20L, 1.68000718288950314093575786904308274e-19L, 3.43336935156396282804714345750464903e-19L, 6.93769555039942749928599832442683686e-19L, 1.38634563100898175510110455954156138e-18L, 2.74008749775923088060873199170519103e-18L, 5.35757028868338662612872498580241047e-18L, 1.03646493302280378406673184005440162e-17L, 1.98424944201008499240310250250687800e-17L, 3.75978800606000340899396301904932318e-17L, 7.05221126182168479511704811938887205e-17L, 1.30963564152954622082996853685780292e-16L, 2.40827549610918052797562865726934570e-16L, 4.38589880961171155211843738902302126e-16L, 7.91175868684912128549216604428547791e-16L, 1.41388359787718387270571947224924145e-15L, 2.50347753664468021020115723250325879e-15L, 4.39263786655070582741822344903139686e-15L, 7.63871030696057461236914444427999640e-15L, 1.31670336037747604093705380830550144e-14L, 2.25003102727544891850217684727399098e-14L, 3.81223973341221495282227985716493129e-14L, 6.40502166019136347918960755019998163e-14L, 1.06725053827031948353711195948826425e-13L, 1.76389749378472101040375240485184047e-13L, 2.89198756533454775599767608849931393e-13L, 4.70424252036995808470327107927435060e-13L, 7.59287827351269198973041796516049688e-13L, 1.21618333837252517178450702971971531e-12L, 1.93338859343662487903047794738683986e-12L, 3.05082685244229075126272877890267121e-12L, 4.77908002001763665704541557372044375e-12L, 7.43273471338542509759247990082208445e-12L, 1.14783388812587366578078714999164060e-11L, 1.76028616037242275427822154657272751e-11L, 2.68107110162395316788540367212924769e-11L, 4.05602375429596543728262134893310443e-11L, 6.09544349224153722159236648112669209e-11L, 9.10055012961606421079182569690846497e-11L, 1.34999345213696765153127846451643325e-10L, 1.98994391239515605127817880646635584e-10L, 2.91499607361905978799020781323598840e-10L, 4.24390078141221962088655373293736779e-10L, 6.14135316267139108184909214050184662e-10L, 8.83436579589479851125156253066831718e-10L, 1.26339559402593316965102282486280599e-09L, 1.79636925005171604673781604814805685e-09L, 2.53970414332648086166213535713251755e-09L, 3.57059249828789049877331667413514712e-09L, 4.99234840315053910682137402914672922e-09L, 6.94247187048993148295924434414634261e-09L, 9.60294960016456137105057353194608309e-09L, 1.32133371276166677672139906194961059e-08L, 1.80872790163534638977965561238944112e-08L, 2.46332536476779151638500763225429049e-08L, 3.33804787013687049574791297244907192e-08L, 4.50110842610850506871431532628603516e-08L, 6.03998541333325959410060827223996830e-08L, 8.06630537452609783391065479881400036e-08L, 1.07218105901889261435737857618298194e-07L, 1.41856144379535399139351236825663488e-07L, 1.86829769983638330491745888879438028e-07L, 2.44958653917297200861483891225150109e-07L, 3.19755978044276083153634882857883309e-07L, 4.15579069086754433405340505039048729e-07L, 5.37807971332554467827633744547482376e-07L, 6.93056106477668619385798002644561466e-07L, 8.89417585250212245375810218669817408e-07L, 1.13675615786872600638029106996132895e-06L, 1.44704121253473089806789252868181132e-06L, 1.83473664533283350419063698449974520e-06L, 2.31724882235425364363184937796552995e-06L, 2.91544022582530391094107183656707013e-06L, 3.65421570986355186992807571629053921e-06L, 4.56318857677376015133362727471956847e-06L, 5.67743390948223287752620793591929613e-06L, 7.03833674730757178417069911600525632e-06L, 8.69454275808306722839276847105496531e-06L, 1.07030190270275985848630609511672890e-05L, 1.31302324393740374972736712543053054e-05L, 1.60534528678907389671161995891497537e-05L, 1.95621879772878044903047444244351033e-05L, 2.37597559155521886172243888058434365e-05L, 2.87650014695436120790473222143336354e-05L, 3.47141604126307620878569429267584729e-05L, 4.17628757618591523872557240511914786e-05L, 5.00883684896740377264076716570754303e-05L, 5.98917639018173037280503906445049523e-05L, 7.14005734028021322676450426011314791e-05L, 8.48713297304976003620620060812799411e-05L, 1.00592371962099993408798498455907607e-04L, 1.18886774688549697317681023800631139e-04L, 1.40115413739806927896468824589692520e-04L, 1.64680158738873124934815777767252928e-04L, 1.93027180590427177790609959505517465e-04L, 2.25650359795433055575151925625868196e-04L, 2.63094779253370712822446127059315509e-04L, 3.05960282998094618038061759727754321e-04L, 3.54905080142515530273890819014315333e-04L, 4.10649371213184272695586730470455583e-04L, 4.73978972070856543596623702324547537e-04L, 5.45748908769705106925744948564871657e-04L, 6.26886955037988466777589811218012335e-04L, 7.18397082597597367255394668144143647e-04L, 8.21362793308292890121036733909194916e-04L, 9.36950301151796636389593916360605611e-04L, 1.06641153138572518429387087881256567e-03L, 1.21108690381909541715522898126065244e-03L, 1.37240786710764633931488483556773354e-03L, 1.55189915125250562428574475103346186e-03L, 1.75118070611954731846143391024982058e-03L, 1.97196929478447094442182021751059029e-03L, 2.21607971185090897097885205424488147e-03L, 2.48542559858177963603431553204765315e-03L, 2.78201982871899325746660736300345366e-03L, 3.10797444123022017600460098808123935e-03L, 3.46550009889599377554207066240202628e-03L, 3.85690505461395961880575720620871256e-03L, 4.28459361052363939313848682793859897e-03L, 4.75106405851509722505038175681427297e-03L, 5.25890609434561842084606413815284753e-03L, 5.81079770141443579933464319447926318e-03L, 6.40950150419891594280210549702450453e-03L, 7.05786059539697018633739598386855559e-03L, 7.75879384490912344645900750924930976e-03L, 8.51529070288836937235862937785994511e-03L, 9.33040551314529952303815524992440065e-03L, 1.02072513571791257196870650265821749e-02L, 1.11489934529722276019901656254303012e-02L, 1.21588421363983657377673415921445027e-02L, 1.32400454566162946339651246079183099e-02L, 1.43958814201171884975897081297216705e-02L, 1.56296499211348507284307663166667625e-02L, 1.69446643988840458394481431193257832e-02L, 1.83442432645398203334614155955590374e-02L, 1.98317011429883687012533532738687781e-02L, 2.14103399761506788853091011534572156e-02L, 2.30834400360906269037251797223442256e-02L, 2.48542508971601536767883257823339293e-02L, 2.67259824171004266947925047187844041e-02L, 2.87017957773082030971446046374914401e-02L, 3.07847946323935695276863138190467659e-02L, 3.29780164187051571955970986393933287e-02L, 3.52844238706916706398930809090405599e-02L, 3.77068967928172889046621767464058045e-02L, 4.02482241332694163505581270228186661e-02L, 4.29110964039093677010619866631701642e-02L, 4.56980984888413264034413616112869595e-02L, 4.86117028816359215545912812117182378e-02L, 5.16542633886674445449455067720287452e-02L, 5.48280093332349644585895096278308003e-02L, 5.81350402921654268021994051667911914e-02L, 6.15773213934700546744487567673172633e-02L, 6.51566792003733016470332458328988615e-02L, 6.88747982036856640340840950741077307e-02L, 7.27332179410771208959941663503595393e-02L, 7.67333307583556615050326531083587939e-02L, 8.08763802243933982425303227000944183e-02L, 8.51634602078983074689360505021182257e-02L, 8.95955146208286742294968393977769930e-02L, 9.41733378299144489750576704343915921e-02L, 9.88975757345080247656478735188449399e-02L, 1.03768727505857796722978821461546404e-01L, 1.08787147979900856678514246787241454e-01L, 1.13953050692823999603416543952272158e-01L, 1.19266511545960614110252460361458099e-01L, 1.24727473084088741556780346524879069e-01L, 1.30335749368884349581460099687500407e-01L, 1.36091031427173401966757170543046798e-01L, 1.41992893251724361991875167825655695e-01L, 1.48040798330635148304426193810368709e-01L, 1.54234106679899202351157467338543629e-01L, 1.60572082352486356465237071613156643e-01L, 1.67053901396246033471214692284653203e-01L, 1.73678660232131774208044201415508905e-01L, 1.80445384423654491197811595430697492e-01L, 1.87353037808093115326776430258837481e-01L, 1.94400531959820109714578533182084599e-01L, 2.01586735956129211498107459964096125e-01L, 2.08910486416176267158329341893267875e-01L, 2.16370597784052818695266702661187610e-01L, 2.23965872827597104489240738884195628e-01L, 2.31695113325298676464455224512869174e-01L, 2.39557130914560734720290079897448420e-01L, 2.47550758075638008786996132954185789e-01L, 2.55674859226756791227887436442350007e-01L, 2.63928341907236639931045094151784107e-01L, 2.72310168026859366788753574972476498e-01L, 2.80819365161259349748148678323641718e-01L, 2.89455037874729232565423711864655899e-01L, 2.98216379053536250342702367445487260e-01L, 3.07102681234616603556790972526892770e-01L, 3.16113347916348760019249138447488231e-01L, 3.25247904839992014226666657864488014e-01L, 3.34506011232305314043635112310304911e-01L, 3.43887471001825077739424147442217492e-01L, 3.53392243883271879333889785572599272e-01L, 3.63020456526567529072712529376719554e-01L, 3.72772413528969943076239230990758849e-01L, 3.82648608410867702369280704118517439e-01L, 3.92649734537814481801171047048544340e-01L, 4.02776695993421447225756159687866121e-01L, 4.13030618409759875566958499890031988e-01L, 4.23412859763953990585030832527434639e-01L, 4.33925021151663415382683548295156320e-01L, 4.44568957550164552554831720660662401e-01L, 4.55346788585740186021655771168112611e-01L, 4.66260909322076961243786064631384911e-01L, 4.77314001088352176735947056292312804e-01L, 4.88509042367666263602229097070513234e-01L, 4.99849319768447906973686731056178972e-01L, 5.11338439103428142948352352152044385e-01L, 5.22980336602751811729499672944460101e-01L, 5.34779290289774015573364455286468490e-01L, 5.46739931550080955287380242064660003e-01L, 5.58867256926284616744877484869191055e-01L, 5.71166640173175841717312971842336611e-01L, 5.83643844609887615578228626088462787e-01L, 5.96305035807827889758567710635182685e-01L, 6.09156794655297569062821736349343099e-01L, 6.22206130841923771587050175584017347e-01L, 6.35460496808321163697317796410781296e-01L, 6.48927802208755868138883757264025330e-01L, 6.62616428937038679525110869491604161e-01L, 6.76535246768429422677267756666823087e-01L, 6.90693629673005399383708050292572666e-01L, 7.05101472858747991895757442966727674e-01L, 7.19769210605547537680146085503476253e-01L, 7.34707834954433431482100014962668745e-01L, 7.49928915319620942104629439591963551e-01L, 7.65444619094446439133009723643838630e-01L, 7.81267733325957766141060146767846541e-01L, 7.97411687536856786535849810135961905e-01L, 8.13890577777678436208431256995493454e-01L, 8.30719191996558177068293937598919209e-01L, 8.47913036818712374055336621201445842e-01L, 8.65488365832860347537655780480228440e-01L, 8.83462209487281076620051655836621909e-01L, 9.01852406704052162112602532863159232e-01L, 9.20677638326296314246112109641174382e-01L, 9.39957462519996315051517977272639457e-01L, 9.59712352259170728365681565566195274e-01L, 9.79963735030970038685207606899372777e-01L, 1.00073403490559993309000835270230984e+00L, 1.02204671712495200986974494164817378e+00L, 1.04392633537347289336664619627296763e+00L, 1.06639858190518516071876464455235265e+00L, 1.08949034071194662751500934725633506e+00L, 1.11322974393006216402411430386892104e+00L, 1.13764623169531331372630723630321340e+00L, 1.16277061567042026013306680494416940e+00L, 1.18863514648397907083703649648730714e+00L, 1.21527358533611238960293477132347556e+00L, 1.24272128004352904999786719958821158e+00L, 1.27101524581551079885511358011134290e+00L, 1.30019425107264471110982901454765895e+00L, 1.33029890864201997125110745686528366e+00L, 1.36137177268624019179654148863686280e+00L, 1.39345744174911173037014751038646328e+00L, 1.42660266832841175766232711333173310e+00L, 1.46085647541588835802048454309412779e+00L, 1.49627028047678533760134362560179034e+00L, 1.53289802737592016874439144914426210e+00L, 1.57079632679489661923132169163975144e+00L, 1.61002460572564642000849608863176067e+00L, 1.65064526666943143532240244567555108e+00L, 1.69272385721798833166204038375277879e+00L, 1.73632925074497773069781144176863796e+00L, 1.78153383899165490255124499430464714e+00L, 1.82841373739108738124596203605065226e+00L, 1.87704900404072044775471792428672248e+00L, 1.92752387330408763463712892863710673e+00L, 1.97992700509947708650365975965257989e+00L, 2.03435175101694043322616088522632134e+00L, 2.09089643849576621383396167595935906e+00L, 2.14966467439309042108153883973067514e+00L, 2.21076566938140221236799358744093376e+00L, 2.27431458472911392711904220601704565e+00L, 2.34043290314497023966214961240421096e+00L, 2.40924882550482707578395780381837657e+00L, 2.48089769542928804270777308901824137e+00L, 2.55552245384400165592583716337259322e+00L, 2.63327412583237088656291310907475315e+00L, 2.71431234228441160768610076838330351e+00L, 2.79880589905706635256578441640292763e+00L, 2.88693335659214188612865513175227518e+00L, 2.97888368319007786718164917079966461e+00L, 3.07485694541305021056656397487876403e+00L, 3.17506504939176568339259231884822943e+00L, 3.27973253713925527986226523992226922e+00L, 3.38909744233483410200034132396842728e+00L, 3.50341221043527586541966899038246748e+00L, 3.62294468840159570502872359754361586e+00L, 3.74797918980246258518386393043115941e+00L, 3.87881764157340380510220562013091253e+00L, 4.01578081927931267029397913978942025e+00L, 4.15920967835153616848634566919310171e+00L, 4.30946678945578836835486232808829311e+00L, 4.46693788689973689723986043138805888e+00L, 4.63203353981649359057533901265089751e+00L, 4.80519095677036072684883899803335247e+00L, 4.98687593543289697160079921623416533e+00L, 5.17758497008053768765855285400689531e+00L, 5.37784753088062976076034128768012631e+00L, 5.58822853027308803485444007033170411e+00L, 5.80933099323364005938466841106588229e+00L, 6.04179894983708948784718604678234941e+00L, 6.28632057034228591922334730387683243e+00L, 6.54363156501365266125399451934329088e+00L, 6.81451887309858260791767579514605499e+00L, 7.09982466781971868191373433617700078e+00L, 7.40045070694293100845796745008949286e+00L, 7.71736306147578881407568826714170705e+00L, 8.05159725837127958401987584151171259e+00L, 8.40426387679538395058384455428283593e+00L, 8.77655464160750010892022612040926275e+00L, 9.16974906224756520705691589269677116e+00L, 9.58522167027699388874228356777329920e+00L, 1.00244499144430070386099274885141050e+01L, 1.04890227783960385614814296197680936e+01L, 1.09806501931649260624015170997236345e+01L, 1.15011733242716998455210622743445835e+01L, 1.20525758220454727952816341992419823e+01L, 1.26369961333845432419384699684768677e+01L, 1.32567409840433238017603739136360460e+01L, 1.39143001526287336814820956823084828e+01L, 1.46123626710408671221171338391349055e+01L, 1.53538346012683753120053442509520620e+01L, 1.61418585554581184591279187098492208e+01L, 1.69798351452575852400510409025135738e+01L, 1.78714465678460133882677098961576727e+01L, 1.88206825601317848442892749807248071e+01L, 1.98318689796476498521560439791262319e+01L, 2.09096993011184544989073368255312499e+01L, 2.20592693519609552724995680207860407e+01L, 2.32861156486188168325833440616926330e+01L, 2.45962577392286013760094208279475314e+01L, 2.59962450073299827601794849672397508e+01L, 2.74932084469488923833030086627802945e+01L, 2.90949179822819598429999086944366938e+01L, 3.08098459764107671506384842333391345e+01L, 3.26472376541418040006352140116179211e+01L, 3.46171892555432186128355184008936311e+01L, 3.67307348405744306653537849794079228e+01L, 3.89999427831545697992227880433189487e+01L, 4.14380231271361842696931290595974334e+01L, 4.40594471293014233018696008435982161e+01L, 4.68800804884035743932352319123055757e+01L, 4.99173319575866229822636583993237381e+01L, 5.31903192638729836914160122380617184e+01L, 5.67200545170346581087003708738282234e+01L, 6.05296515859483113978235132985845589e+01L, 6.46445582591583649124780712968047055e+01L, 6.90928163944313177415529394071665670e+01L, 7.39053537072521168719419511314839173e+01L, 7.91163113594234348927381617490387462e+01L, 8.47634120965947230809397578710282148e+01L, 9.08883743598215272174601093484125344e+01L, 9.75373785753325382322893051705294986e+01L, 1.04761592725164736089639534479074532e+02L, 1.12617765338655419662606911403899284e+02L, 1.21168895243741881709481972315918511e+02L, 1.30484988804359382802013970413388238e+02L, 1.40643916977370870089294791135734370e+02L, 1.51732386386376598946153144686407135e+02L, 1.63847040773982427929709267988083986e+02L, 1.77095711710003361983546853982729852e+02L, 1.91598840361277588527216638598210664e+02L, 2.07491095540949726522855395012839290e+02L, 2.24923217236106119394568010864647153e+02L, 2.44064119463086993590008673999888577e+02L, 2.65103291739026696423162894476095053e+02L, 2.88253544828036421249450783362468048e+02L, 3.13754153889742451327114437895012151e+02L, 3.41874460927761232190324931320648150e+02L, 3.72918008746121432097478949634992228e+02L, 4.07227290759381879033987273956073881e+02L, 4.45189215310338987815842929936219157e+02L, 4.87241400038863092710563840938907565e+02L, 5.33879431809824993154116113611340152e+02L, 5.85665251340011311718653543776253641e+02L, 6.43236849676682281579530292235801252e+02L, 7.07319496933657861116096423723089184e+02L, 7.78738763222127723625961426334336958e+02L, 8.58435638777040682657342340030579928e+02L, 9.47484116394459954294416631122613257e+02L, 1.04711166630196929712820316594777632e+03L, 1.15872311371927743485840786701904690e+03L, 1.28392852534970775486315470390457819e+03L, 1.42457582618936343671625036189352836e+03L, 1.58278900639377570598543689683858411e+03L, 1.76101294444545923486104598108258215e+03L, 1.96206607357312178755673700966218336e+03L, 2.18920236070835422209657734442941355e+03L, 2.44618436034955965177471357752869960e+03L, 2.73736946076118709316717034422700237e+03L, 3.06781187080876763823587584403262657e+03L, 3.44338341950996275353420062305895100e+03L, 3.87091687821820770548262640961099474e+03L, 4.35837629346446550811483742251576785e+03L, 4.91505976942026055884439891778599977e+03L, 5.55184130321696740425893724460092414e+03L, 6.28145970445342612877221303833900020e+03L, 7.11886438520566571043900024525721790e+03L, 8.08162996762779959609851789890726579e+03L, 9.19045432173859727983153055486718404e+03L, 1.04697579405183570171054706781681133e+04L, 1.19484066394624731955974446656465043e+04L, 1.36605846306210479280006137726608390e+04L, 1.56468513163780927299848865296760921e+04L, 1.79554229917996753910020302361418910e+04L, 2.06437304374408251386790990436920728e+04L, 2.37803156373267080705808819875316658e+04L, 2.74471462199565095258711815725505419e+04L, 3.17424455248072273922403695999752070e+04L, 3.67841605073133622632674187774059283e+04L, 4.27142203777350805091608476572382608e+04L, 4.97037776810032398127125994364568099e+04L, 5.79596727313857616360132420453444344e+04L, 6.77324248460879259253530791773167141e+04L, 7.93261334694994276050922426242412735e+04L, 9.31107739715691545023768199956003639e+04L, 1.09537503053637222429417759669716212e+05L, 1.29157755673566952599086463851912376e+05L, 1.52647130160874158565239969760504587e+05L, 1.80835335096964828910095096138515211e+05L, 2.14743829477016418053483721316277484e+05L, 2.55633251557399994754680946686048161e+05L, 3.05063334556209750218324509503461449e+05L, 3.64968792666585395419705030588899790e+05L, 4.37755686685748537981529230100717254e+05L, 5.26424122294320873553623779329790816e+05L, 6.34724899010831940960718793968560727e+05L, 7.67360052654242646579956157559309383e+05L, 9.30240305033750278572545038832724621e+05L, 1.13081650266645184495081585123306969e+06L, 1.37850753115552374245055838415718322e+06L, 1.68525439396416227539607702063253047e+06L, 2.06623977016863939032179814240740936e+06L, 2.54082527022935491763036651163297626e+06L, 3.13377596203641663047341272710642846e+06L, 3.87686514827580239293595658539782774e+06L, 4.81098405401834942973721071475737211e+06L, 5.98892408953467866424875864774796159e+06L, 7.47905792960806092396497010475870265e+06L, 9.37022569869340886743682668142431718e+06L, 1.17782423097751066120254539266241595e+07L, 1.48545930143258061872721569284540776e+07L, 1.87980927038339810411221199415802492e+07L, 2.38705733443634639976678131975655720e+07L, 3.04180655225860320213756009749555241e+07L, 3.88995004684326215069338023547372206e+07L, 4.99257437458669601662091946924574592e+07L, 6.43128750449561321017861557895848463e+07L, 8.31551851992585813643149605060553440e+07L, 1.07925566470411796107305712037505869e+08L, 1.40614107339003511498586442587195365e+08L, 1.83920178567730560673713663331917338e+08L, 2.41519711690497536458569405379734816e+08L, 3.18438601538111228132801183275722771e+08L, 4.21576501892968673592102667497462836e+08L, 5.60444635691511454953230090792878868e+08L, 7.48209439804691157215633476755723997e+08L, 1.00317512966824615144294234414110893e+09L, 1.35089891899748286951692285814894218e+09L, 1.82722216505349159044967968934424570e+09L, 2.48263348083176093300905605774694855e+09L, 3.38857763723491971892999484076543171e+09L, 4.64662006529910564426883234085294096e+09L, 6.40182180156629712154379147661940269e+09L, 8.86235203805325147258573091932997831e+09L, 1.23283860285919681076337828978766266e+10L, 1.72348929748018002343932808836953853e+10L, 2.42153052846944737603768649152219024e+10L, 3.41967381320806302529104945578396652e+10L, 4.85431236462260654032773006433818623e+10L, 6.92714904376034267631798991329824532e+10L, 9.93804949018620361644641133903513098e+10L, 1.43352142475985414523266188918663249e+11L, 2.07922173448308822669953899424734201e+11L, 3.03269524182010815814751345567548609e+11L, 4.44863150372771043146060595057040363e+11L, 6.56345864647790105139454816812312939e+11L, 9.74063569639891097956397109813490533e+11L, 1.45422052005965615789962842879352220e+12L, 2.18425068889862732017431485970855335e+12L, 3.30099910475756075681442440083420253e+12L, 5.01997048502274901150163921982195024e+12L, 7.68267629901760783371009641842522603e+12L, 1.18337659600398387182686793240868246e+13L, 1.83474885355703531496992152648661997e+13L, 2.86363931245836358559523100954017414e+13L, 4.49980389271503995761664922194406313e+13L, 7.11948687698915449751693845544920647e+13L, 1.13430701798012234619458399048221594e+14L, 1.82006578236361839541514524597276231e+14L, 2.94148450061539403705926461420998342e+14L, 4.78870730589093038221910605812495108e+14L, 7.85402503692862355090784993078672085e+14L, 1.29789430461986025113447366376693514e+15L, 2.16127995478242564041665605678872071e+15L, 3.62710214703500383377916061381597850e+15L, 6.13534293344095037788551479051826967e+15L, 1.04617000636224450596060724147477482e+16L, 1.79847735783966568554234927670508824e+16L, 3.11747341233233147536151972501734499e+16L, 5.44944507304918422218082921598846642e+16L, 9.60751550501797821243248841373822216e+16L, 1.70858922445267785163471612163490444e+17L, 3.06542975111022866531582625971692938e+17L, 5.54922743745114951066953816028814728e+17L, 1.01373023277804631428305560194491190e+18L, 1.86905989587640582429259395332686294e+18L, 3.47854955238157842413369108802590798e+18L, 6.53599224597546376326701108631484361e+18L, 1.24001927226106630812645719537154550e+19L, 2.37582886691093662903464587039857427e+19L, 4.59768243360443262528520790447211677e+19L, 8.98810681683712842794124622629411311e+19L, 1.77530237939363226330723906827319437e+20L, 3.54341330439097348610370779591666976e+20L, 7.14806139767552532748817894789979543e+20L, 1.45762051057718630539520752847120279e+21L, 3.00513712487982979744944726506420716e+21L, 6.26502486163325069730377264873611059e+21L, 1.32097994109028381590144585332181800e+22L, 2.81748753590214622077676014001554368e+22L, 6.07993304142980523101356268020373032e+22L, 1.32765885364721208288263553578233241e+23L, 2.93431175918364131820516218129002628e+23L, 6.56508721680713002578214496043109168e+23L, 1.48721227343793765013154051597710086e+24L, 3.41184019607678812819334291291332010e+24L, 7.92818992879701876208212761012395842e+24L, 1.86645187702970485690987148720542546e+25L, 4.45252185988673954885155645168863932e+25L, 1.07654543517497766241465472692681594e+26L, 2.63868568119069758552386276646714408e+26L, 6.55790847024418649820013325410592483e+26L, 1.65295224373558572055534033842757998e+27L, 4.22638339591491619855432610245411904e+27L, 1.09645039426808014848951068590561771e+28L, 2.88682208299928608019375692651426610e+28L, 7.71548038934401592468282155249032740e+28L, 2.09372878930996484632394470400138705e+29L, 5.77027578944765503685743525710220950e+29L, 1.61546384539178114004658391605197219e+30L, 4.59547005579560869055708560274363012e+30L, 1.32862939268652325541488091880021431e+31L, 3.90507968153078421921910800039715306e+31L, 1.16713402427199725201363486127342874e+32L, 3.54805853865427740256789009746696294e+32L, 1.09737805935804615955239963430188272e+33L, 3.45410297806444559459316674852385198e+33L, 1.10674539370165232283645935543266144e+34L, 3.61089955913906999391756229494586894e+34L, 1.19994699928367056689901878605794596e+35L, 4.06268701419087879160332452792716198e+35L, 1.40183522389322451388311239745912475e+36L, 4.93108552733316217324966630695184171e+36L, 1.76881239328491949973951925349674313e+37L, 6.47214829394519996070845864216337266e+37L, 2.41645372173921192231147151489004683e+38L, 9.20894472039812386191245000342688835e+38L, 3.58329702862212667598998865894252598e+39L, 1.42409748259669944005518449916929857e+40L, 5.78262783342641152433806724533524027e+40L, 2.39986220408436318313990705343752378e+41L, 1.01829157204230545960231903208713235e+42L, 4.41910541482203453093956062976933998e+42L, 1.96212611768049931065065590432043620e+43L, 8.91674242406125370712417447773466783e+43L, 4.14888247829475772044491476179936724e+44L, 1.97725652955827692966670149947470575e+45L, 9.65530023387540108044378286001152781e+45L, 4.83287889833559892166961276593618835e+46L, 2.48057587822309805808523773881299449e+47L, 1.30610280975765470571043683527277027e+48L, 7.05756571728956923233902004974509542e+48L, 3.91527652222961861840270351783060925e+49L, 2.23089898094339331762072829615745302e+50L, 1.30614133449630930559423540813368509e+51L, 7.86102128665639262739828585146248224e+51L, 4.86558375853845110678814792824481696e+52L, 3.09848742591570467373735298285106117e+53L, 2.03103761486256390140847277681645261e+54L, 1.37099964760826020030246335833308722e+55L, 9.53473627432500152782873935909970826e+55L, 6.83495992316641540715754654005899263e+56L, 5.05273354632478901960113633106144814e+57L, 3.85381099728215997914445000026608173e+58L, 3.03418310785320829824308157124864982e+59L, 2.46716192600983889917114272951924381e+60L, 2.07290103981358059329932171745274528e+61L, 1.80056398057961538305615630314631614e+62L, 1.61776402789534425695658193709805813e+63L, 1.50428302825068832904492692640561694e+64L, 1.44839320652542717214779500803249160e+65L, 1.44485551098011579855868939330990133e+66L, 1.49412042885502924277326734308483245e+67L, 1.60256656610701572194891345599497651e+68L, 1.78388050415394298763315503064430164e+69L, 2.06199924057276073839995264039101124e+70L, 2.47652179469857271457600275335452230e+71L, 3.09234991415349735847967247784284417e+72L, 4.01692723830598581004567643058591262e+73L, 5.43160754522649738742682321649737815e+74L, 7.65008682404282275932608294522372170e+75L, 1.12301798411434928750045233045701052e+77L, 1.71938295296605200401018803799684912e+78L, 2.74733571869068667385885336550518795e+79L, 4.58454501055768412308971248876333874e+80L, 7.99508204153925025226317876728470146e+81L, 1.45811990936589904392804782726885652e+83L, 2.78300117867960017490532778932474629e+84L, 5.56281223196619462795860275879049153e+85L, 1.16533876898240457849831832137567995e+87L, 2.56039912643283822420817604614012086e+88L, 5.90454964185909819164533268125527979e+89L, 1.43027847474983870988836419822056214e+91L, 3.64204612295693256305339371887263313e+92L, 9.75669857120640229967783787120452211e+93L, 2.75194604427588305129487979774984195e+95L, 8.17916479364319727936284803066665955e+96L, 2.56370473508682589047202009616066313e+98L, 8.48165649612825587957771293185197099e+99L, 2.96426025440398100674466172613133159e+101L, 1.09534297003120888620652471421812455e+103L, 4.28314854758487062838465336068295133e+104L, 1.77395435294431974409395342323139198e+106L, 7.78899108189422475969140390458031321e+107L, 3.62893172105682135159715800277136586e+109L, 1.79572927251602059220958063790243562e+111L, 9.44668515148283533862523011302496150e+112L, 5.28826317961448810089554134850695191e+114L, 3.15331123674140136231493452577546350e+116L, 2.00480707968382766860514611914082879e+118L, 1.36040719266523771611516008331762962e+120L, 9.86282560980781051743602195410395887e+121L, 7.64755178859112809938428139017982021e+123L, 6.34880222487173008841344329862213996e+125L, 5.64906236198001909791959175488227229e+127L, 5.39324800352378478055022039572371179e+129L, 5.53089719191570391565414448432944942e+131L, 6.09959864464089433289271654904908851e+133L, 7.24209843349196450391058906977712497e+135L, 9.26808305363737556950784175210077690e+137L, 1.27994270241604058214925694813276489e+140L, 1.90979662696062130244831484512150929e+142L, 3.08254030066988503957988563764712878e+144L, 5.38880973238417965706179354197373928e+146L, 1.02161025105662653467101460483765248e+149L, 2.10300544007279065014421211807768152e+151L, 4.70675399034872557015773705065650223e+153L, 1.14683412812524899101968167573148610e+156L, 3.04620262376779901134561159740015427e+158L, 8.83255301555740088857655282843830654e+160L, 2.79951315833790052768515917244690507e+163L, 9.71307000884329724595836237775132776e+165L, 3.69425449543187541186652254254454177e+168L, 1.54248755204034481247092284401752383e+171L, 7.08075007659653083674442572183052884e+173L, 3.57888569536270290704774796012385631e+176L, 1.99473765641034107285413476042860568e+179L, 1.22789700989638770500092926180435793e+182L, 8.36095001442791620159284429240141671e+184L, 6.30749438488829733664127973626729614e+187L, 5.28039699582730274851611343025005913e+190L, 4.91356459266260178144685151251583280e+193L, 5.09061556382806163145943155929283695e+196L, 5.88195913486315120755496558081929324e+199L, 7.59272859182451584412681161192886089e+202L, 1.09687154447604565252927157604063023e+206L, 1.77650105264457177914887205035954057e+209L, 3.23153511879574325299022213712900198e+212L, 6.61424415330008555964088497876375007e+215L, 1.52611134962392865764465743843181152e+219L, 3.97691502072254861067816109956158434e+222L, 1.17271592685350180601663411607927347e+226L, 3.92076851079784438154800269803529292e+229L, 1.48915601904650135853122181753421959e+233L, 6.43831323019893638007682069747894997e+236L, 3.17506717851901774760997889290937204e+240L, 1.78970981603629426034165602936202663e+244L, 1.15551435950001094003467361479483663e+248L, 8.56366431033316582912879348191377839e+251L, 7.30093770528170061921940254565023758e+255L, 7.17613138815551609337504025522760569e+259L, 8.15019404042552378087870259624107791e+263L, 1.07201229194901841245742935320285314e+268L, 1.63677814658507005123653360340510968e+272L, 2.90775562270833690431514296460636317e+276L, 6.02476179304325236422526103127046739e+280L, 1.45944561364291559252990517774206937e+285L, 4.14353248208966528107409825739318649e+289L, 1.38220972739972368321976302536673924e+294L, 5.43125471568796436605394023488404770e+298L, 2.52039989595272682474151246524004609e+303L, 1.38490332203279628724542169932072504e+308L, 9.03453415480179250943103381623811201e+312L, 7.01620311300324094081813342355630834e+317L, 6.50430483422567669743617206850738485e+322L, 7.21793562600493199951776097195343971e+327L, 9.61542788471746566451160668498411528e+332L, 1.54211655565340209996546117001243607e+338L, 2.98626205265198316430063943341329432e+343L, 7.00309320577422492544778192980108604e+348L, 1.99486089518136492496460973366880635e+354L, 6.92350663128275446878446973158773950e+359L, 2.93684755383592258491626945473185368e+365L, 1.52739293250863294426010436780725812e+371L, 9.77075509850276765943058812672579852e+376L, 7.71310608088780517993569363011828070e+382L, 7.53863036472313339350939561575995488e+388L, 9.15331385155864163687518059055937567e+394L, 1.38538605697398143363179835422022577e+401L, 2.62287133256068615930266548676255190e+407L, 6.23343982286571042809890547122705804e+413L, 1.86628588041890755929921756251934723e+420L, 7.06492694188791912037300528166794228e+426L, 3.39406886800977749230458579824930803e+433L, 2.07704891812976483907563047536681219e+440L, 1.62532865525590176989706193358042030e+447L, 1.63262112354994112352218911327913750e+454L, 2.11342684365334123128646755974119857e+461L, 3.53982137873383101244091847412793714e+468L, 7.70246700302666062188915359100825615e+475L, 2.18636422788338230254129077405708124e+483L, 8.12975261672049081897166938196495657e+490L, 3.97686557044826916151646962242652853e+498L, 2.57033035969007091507617008526033295e+506L, 2.20458407348036235529376715504150602e+514L, 2.52051509380683369529400145083533353e+522L, 3.85871376898138292734730034828559871e+530L, 7.94663225793828689108907007781152553e+538L, 2.21176541223395827472447113026924253e+547L, 8.35931033048630497134082029598865726e+555L, 4.31091797212556485985662056018893390e+564L, 3.04833317305882254988404372326531988e+573L, 2.97034828681146526635277450855709161e+582L, 4.00864404566992526097179834506253327e+591L, 7.53113144131492631353410204171028663e+600L, 1.97996763586022811207860344830247407e+610L, 7.32300332662100885299893727481183608e+619L, 3.83078680906847773947984890776183687e+629L, 2.84987258373806149506606754536239806e+639L, 3.03186631046306534459943952897407369e+649L, 4.63861318260680959360747724936035922e+659L, 1.02646622253495677529633262335412306e+670L, 3.30448344760519942319105428211388701e+680L, 1.55678514244926540491694986676104766e+691L, 1.07975219247204914347510266773073325e+702L, 1.10926415409608640204268413223928121e+713L, 1.69843188882084389205231670587156933e+724L, 3.90025209215096037836224226547246383e+735L, 1.35188796159061122898267917047667153e+747L, 7.11881895741722013661309086794573765e+758L, 5.73263787962641176699015570741387791e+770L, 7.10698682909851371094390920546530663e+782L, 1.36568905751347705631533710470350932e+795L, 4.09591384091714486453161283605440034e+807L, 1.93075428208975454032168180693618424e+820L, 1.44069783794868490577087909226154603e+833L, 1.71407451380697883211569548277738601e+846L, 3.27557874564463748685767424892341420e+859L, 1.01295195987435253561137255728975319e+873L, 5.10768437019276174029340754351596177e+886L, 4.23191986113702770379280941046346950e+900L, 5.80664714178397794019307157189161329e+914L, 1.32995815980583547946711112525038194e+929L, 5.12600842672542100652183507817331030e+943L, 3.35203762278831767267193293263751763e+958L, 3.75009417204153826893896307870937057e+973L, 7.23855050824188975713471018223024339e+988L, 2.43146178229439003194650931378387467e+1004L, 1.43376736234835679429446577737976919e+1020L, 1.49738681485939897351147361037410278e+1036L, 2.79474808763788045317059787958854766e+1052L, 9.40752795141195895210630116566470676e+1068L, 5.76455681194134988563523968421696548e+1085L, 6.49098750070655215612470119412325218e+1102L, 1.35603677524062211064037225514112165e+1120L, 5.30731596106421482379267500594247426e+1137L, 3.93020043869734370491941322540535807e+1155L, 5.56226722613029149136813618379760709e+1173L, 1.51990408820680241841102181882025951e+1192L, 8.10228003417607034858018290055212984e+1210L, 8.51521180721994744419289716417963237e+1229L, 1.78329495296502824223674285976432097e+1249L, 7.52325725334531880022021234450122858e+1268L, 6.46447702663797449769360764507187142e+1288L, 1.14411796435953528891736478925455547e+1309L, 4.21851818337788742448241659152628519e+1329L, 3.27808619028067308419286053048979085e+1350L, 5.43188779501763188996015031600338462e+1371L, 1.94236185576822902995555282219996135e+1393L, 1.51711647857248503907031482339088565e+1415L, 2.62035716514505778741231466041668281e+1437L, 1.01340333806343444348385264050569250e+1460L, 8.88786410219005270769408353397020687e+1482L, 1.79062851327433476234422894649930707e+1506L, 8.39642792144232596950658702528918677e+1529L, 9.28628794761707451127390451820966789e+1553L, 2.45536895088636462839367313490581387e+1578L, 1.57354562229875356978426356241845302e+1603L, 2.47847583619098850454983740131691503e+1628L, 9.73157119375940175602769413110414643e+1653L, 9.66320447484532719750186034583884499e+1679L, 2.46232109538721189753853963925622165e+1706L, 1.63417596934387293040006746046570718e+1733L, 2.86767794799456586471233013913198039e+1760L, 1.35110548955493375904544893914917995e+1788L, 1.73592152545700077097814839827674920e+1816L, 6.17893831026015926230407301367680801e+1844L, 6.19169576655007716364858612984691562e+1873L, 1.77539961419331109157892833779912252e+1903L, 1.48102931564535770775910220632570312e+1933L, 3.65523833138677287346435504279580939e+1963L, 2.71500576533505130343548298805675281e+1994L, 6.17538661057993294979124427622665421e+2025L, 4.37773911614056336228335278244614535e+2057L, 9.84696637606677900175890481086698860e+2089L, 7.15679932872021171306956409599896671e+2122L, 1.71206538074954819527676482193571839e+2156L, 1.37358203471630226464631105286036694e+2190L, 3.76701670663930120912543386433302245e+2224L, 3.60043887764831236838085599723119708e+2259L, 1.22311399177140229476034440208616729e+2295L, 1.50662485913882109231872682750679813e+2331L, 6.86720031172136555587682118613084257e+2367L, 1.18233110675109495729851537371527994e+2405L, 7.85186218386652904615339091354671418e+2442L, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -494,7 +514,7 @@ void exp_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 4>&)
       { 3.396187965591260438897244230849252949133e-2500Q, 3.41747159490076194366166435197892344024e-2423Q, 1.468507678341085936510631686027018193702e-2348Q, 3.187196102551453055654175541511540035227e-2276Q, 4.111144618799882938247446443042495922138e-2206Q, 3.689982379249148439178153280533053022001e-2138Q, 2.685174204657092092067226298561204870573e-2072Q, 1.837147705508098860673717768368232067662e-2008Q, 1.364257907967552000423094508893268899947e-1946Q, 1.263771364208497251750238943339938928533e-1886Q, 1.671242563857819954841665799077012782254e-1828Q, 3.59572473348901442338115273389639464694e-1772Q, 1.428695046663295321301312704790120159931e-1717Q, 1.185320708968814213894285445648910693797e-1664Q, 2.312978025972053806095540476447810494724e-1613Q, 1.191384629114553103202392185340997162652e-1563Q, 1.811512325837822942229802348315430051691e-1515Q, 9.061690335018066855688935640999855840642e-1469Q, 1.656446393553325828143168688464980737559e-1423Q, 1.225078144907203399772561902982205963608e-1379Q, 4.046000991642731324022030505096438995941e-1337Q, 6.566030925389917368793803468023222144906e-1296Q, 5.744543867554393981259543937791978449595e-1256Q, 2.964190466284077618451217948796617398864e-1217Q, 9.841838762797010428171966754803344043532e-1180Q, 2.287831175258608392805748160775135819389e-1143Q, 4.040912495622704041470131809505159517349e-1108Q, 5.87056189991253569332657105113103824038e-1074Q, 7.575340244592727205322278379346787745011e-1041Q, 9.354001575325859412659652699978018590336e-1009Q, 1.188011952293188317901713987657283819367e-977Q, 1.664419563784475798800943375399832441798e-947Q, 2.752827383868394227330239571429534681919e-918Q, 5.740088624159127463245451711190174595819e-890Q, 1.608246374016315723402165607871082117057e-862Q, 6.440216987884563060048094831994625373593e-836Q, 3.913422837501277880548253194801428546448e-810Q, 3.823983955989560074096123125871957896214e-785Q, 6.356204437923014497781992143867806067066e-761Q, 1.897887002136970233209553057528902481451e-737Q, 1.073182396417440952923883248248820918596e-714Q, 1.209599587842878172907735383699977342323e-692Q, 2.855780038744229524130906951698839053919e-671Q, 1.481869691380590340606688460267010905665e-650Q, 1.770687381130960661518257581666080736263e-630Q, 5.097321233667122918955939586473322120615e-611Q, 3.693416425056334731671036194098592621278e-592Q, 7.028028538800977471757544285347858958102e-574Q, 3.659514003462772290514441124205917047976e-556Q, 5.426427278796883021042905920496694956698e-539Q, 2.381707918869144677895468509571771901592e-522Q, 3.212283372523687089209961685271370035808e-506Q, 1.380563704271665131614814775099207204703e-490Q, 1.958383048574468276677385071723507356519e-475Q, 9.48743029982518591875701010064880276966e-461Q, 1.622425672258543869160313396312274060462e-446Q, 1.011253624597190818422622302876493852764e-432Q, 2.369846278374825178509948199829322673406e-419Q, 2.151869280186648519304900103376776987149e-406Q, 7.794995966503254880771477408719032168903e-394Q, 1.158774967764284452774587235820678160811e-381Q, 7.265518880056698052413196249715572214718e-370Q, 1.973119772438811666557920176657054992131e-358Q, 2.381439826231545597543020603431153384525e-347Q, 1.309668015497819382164964970820775932287e-336Q, 3.362180147598881535117942142551368440204e-326Q, 4.124757840732051332008577708750119570912e-316Q, 2.473774062046798241443322474966268652708e-306Q, 7.414272202331839719973914818818580322732e-297Q, 1.134468775996673043912791038078875526892e-287Q, 9.047228020735108713214081674437370270152e-279Q, 3.836582522644715763942703819520627288712e-270Q, 8.821018545646132764191081245790014964075e-262Q, 1.120514881106390681395171052626683473171e-253Q, 8.008830218793913153208169453114674961091e-246Q, 3.278363148993695291288199990793809607438e-238Q, 7.818601615846121111349439345713965603164e-231Q, 1.104596257773265868270077717696885587749e-223Q, 9.394568230893641749287701746065205133818e-217Q, 4.885735162640535435890107738269252106649e-210Q, 1.577376231155234084689651390459997701678e-203Q, 3.208212741662475033190349289840478119199e-197Q, 4.169536264702376953290079421852225148214e-191Q, 3.510697043108920771297336971888026846695e-185Q, 1.940796992053920703808111564711495526893e-179Q, 7.136244685320035109754945708241458423185e-174Q, 1.76730280063163466059025249772515470605e-168Q, 2.983904480026560548776384248696357376925e-163Q, 3.475443323448652658867118439684844230342e-158Q, 2.824541702249354041220922001046298716151e-153Q, 1.619596258103472503516391027755171126672e-148Q, 6.622883213895051670195179932778951351576e-144Q, 1.951579126231643346975253911702685400056e-139Q, 4.18602835981743857108590756268931043387e-135Q, 6.599918926269709459823212257675014743931e-131Q, 7.721619700426055982173615669852719657832e-127Q, 6.765470266069447535409496863264786718304e-123Q, 4.478897242147858909930672029381816582225e-119Q, 2.259813587851430691340478359494188813328e-115Q, 8.762584216656783897599480439549782669278e-112Q, 2.632496848689131735621784382242972332592e-108Q, 6.175744762125928416051254264663305408061e-105Q, 1.139991187420054499517789858269823323244e-101Q, 1.668043996811119184547324447087614691957e-98Q, 1.948551942896453232736618306447207462772e-95Q, 1.829886111019235604640158140033504624484e-92Q, 1.390785816650512241305706201256468524959e-89Q, 8.610876597126909947907951239288763095391e-87Q, 4.370440681745287512655018464467927347986e-84Q, 1.829571499724700982569308406477858583305e-81Q, 6.35467982337703555609574874386279503639e-79Q, 1.841843585185443349017139118584710840766e-76Q, 4.47965436588705164639200919931593795846e-74Q, 9.192051994113798021355923589255861583052e-72Q, 1.599661377244400320973091930394038454107e-69Q, 2.372973035131768911030516185612566198015e-67Q, 3.01536930226127366549303637826992082662e-65Q, 3.297914067466215137502368249038560260817e-63Q, 3.118845146643306964903272759796966041873e-61Q, 2.561809323663349754640588340955031999901e-59Q, 1.835614139432453324042425981398349070542e-57Q, 1.1521864053538881965046566277201188672e-55Q, 6.361211949301700767511994322063706295027e-54Q, 3.101325408187412574813091914708051546337e-52Q, 1.340315366748084943795568462034401125423e-50Q, 5.153823682493916697673436399844338582989e-49Q, 1.769604350572757034480939371983385367057e-47Q, 5.444524938929029722644073109230252087076e-46Q, 1.506078410473230887467835250237074953313e-44Q, 3.758031524066051846680267047613132037807e-43Q, 8.485476543792520256759499913448061725315e-42Q, 1.73912337985688401526741472924132534839e-40Q, 3.245018402217835203803189828064206880925e-39Q, 5.52829245911326158677969008013854969983e-38Q, 8.623186993970885363149060426291059432547e-37Q, 1.234883577447636456455512573156980104766e-35Q, 1.627825555297558296682254587731016740804e-34Q, 1.980251853197110750740177033192542117995e-33Q, 2.228623687736138529232852162477642705595e-32Q, 2.325930995307119978621491337043388856308e-31Q, 2.256361660464174192555048087618606554597e-30Q, 2.03915117811515128440130306842025272854e-29Q, 1.720544614806180272783100692189304247844e-28Q, 1.358238700291425183093124587457930780547e-27Q, 1.005239457303406154474744151833947246431e-26Q, 6.988894303606753297669433851126311708373e-26Q, 4.573289270207565220088232217355246375583e-25Q, 2.821890506943991496371146647405255494984e-24Q, 1.644856636073523601510029605009201973651e-23Q, 9.073050442568561823275320558923185848283e-23Q, 4.744096929010692481229783323592456352853e-22Q, 2.355285875813243315269790791700485018621e-21Q, 1.112029876447833293355894317984646400697e-20Q, 5.0008478161487906265030783014276491832e-20Q, 2.14524119442811961043233114548051430279e-19Q, 8.79113320178734153345564529895449040709e-19Q, 3.446365815960497059834387107630422028738e-18Q, 1.29425069073833323669197152514107143377e-17Q, 4.662195383020049630863703520736565781021e-17Q, 1.613000201366897700480549038203950457934e-16Q, 5.366485961582633012834800491739735664821e-16Q, 1.719017688382153776104960609843894364829e-15Q, 5.307775363464215365491509744435747831714e-15Q, 1.58153224028765965650956502083229696234e-14Q, 4.552534798688262530368751552485493008278e-14Q, 1.267359873762161999061953574910727734371e-13Q, 3.415589293705976822709962615841017474303e-13Q, 8.920396441522617984563473743690015005656e-13Q, 2.259831056683534791299863302560269236812e-12Q, 5.558385496914281158626259742154054243881e-12Q, 1.328609277181416985306808048226260048845e-11Q, 3.088906383077323034217900364942328595424e-11Q, 6.991047069852996644705052389828829263697e-11Q, 1.541592161799424949759540552003006648952e-10Q, 3.314631696092892696852523428007047458956e-10Q, 6.954687377912267443923690708860638478132e-10Q, 1.425030481896628988210436275967793904415e-09Q, 2.853596165859016481994370182243409560513e-09Q, 5.588439560806246713133438407216443307775e-09Q, 1.071067205395228191517684123993601779709e-08Q, 2.010297293947428624088705656550599163117e-08Q, 3.697444612237240406525896448389116570807e-08Q, 6.668262990662516945946174242814702190448e-08Q, 1.179931847916722133357063059921902676628e-07Q, 2.049697303194034837958769536530460272066e-07Q, 3.497508382194711899593633326040760388855e-07Q, 5.865487025318323293753202306221287078656e-07Q, 9.672937611928622460886601535198624050582e-07Q, 1.569449303967431028048007992388750555246e-06Q, 2.506625809822351496367236588148835401765e-06Q, 3.942730303856445318459553494614961666457e-06Q, 6.110483188339684780731192452553392150661e-06Q, 9.335213605738775483770667944380871611306e-06Q, 1.406489270953562868811484480472520033374e-05Q, 2.090736966298033607047604777694817538599e-05Q, 3.067572523977360728549911196951929768457e-05Q, 4.444254125522237612570935119262098204356e-05Q, 6.360369186365502157943693424315842416464e-05Q, 8.995198988623426391713559325836996156118e-05Q, 0.0001257606674958313871253473701449253355037Q, 0.0001738762412077100706379667970818335522797Q, 0.0002378198178307528456808477520866366646793Q, 0.0003218953586603673896746051260032347406477Q, 0.000431302857278104350328175477422461855135Q, 0.0005722538300635913579360920152701977667389Q, 0.0007520859992681880710509445633320017863057Q, 0.0009793735988494621503195966592341074592935Q, 0.001264029384952618301528623595188256832377Q, 0.001617394214613631295305190408599562642199Q, 0.002052309991459652915632773174511094733367Q, 0.00258317188244673197819727310558453131011Q, 0.003225955993218896497486226124906372664769Q, 0.003998219150540716791460047207042995806204Q, 0.004919068068090767024211469275276612172327Q, 0.00600909594733817652192578530463654010429Q, 0.007290285460855384857058707803522235069712Q, 0.008785878047288446808894606650882064620093Q, 0.01052021047666635132307480661080880814452Q, 0.01251852068056883921977029876570047333533Q, 0.01480672584232190128610556778358216498454Q, 0.01741117666809860093225669085692180516086Q, 0.02035839257460948797638140898975661102703Q, 0.02367478320248247763739778834391071393716Q, 0.02738636217273390454768575395117704136113Q, 0.03151845933082324581907457369661258727617Q, 0.03609543786059629424946593596435380994262Q, 0.04114042259887953993494104853150125354906Q, 0.0466750456480661216715303674857866168132Q, 0.05271921498296900191850699684600263052343Q, 0.05929091119945738364187060701710146534661Q, 0.06640601688035302862345335055441729364649Q, 0.07407818228628303425809436316411971898579Q, 0.08231873024496119428365313871533264809944Q, 0.09113660224143843130137094535859755638343Q, 0.1005383468331949678476633629507285246196Q, 0.1105281506546976411534200317116736403124Q, 0.121107911460692283295465500059636925578Q, 0.1322773519071888937074497167516771096546Q, 0.1440341721011981269170563712300225480081Q, 0.1563742383781529019329462935434102354245Q, 0.16929180529890363384017378918294150837Q, 0.1827797675015790272999775984418466966127Q, 0.1968299377991512902933613706115501276824Q, 0.2114333477796263038189171478034961399731Q, 0.2265805671379344452230433758251512257964Q, 0.2422620380400139215659763053475126372656Q, 0.2584684209816167422154096623392631193615Q, 0.2751909488470871954314516615118286765006Q, 0.292421786186026106706648834563937352905Q, 0.3101543910972953239589783999692036454244Q, 0.3283838775292636198506142015003861049102Q, 0.3471073762620363765649565589914160563095Q, 0.3663243933219057311460108766773067464956Q, 0.3860371650816835811494186931036726843691Q, 0.406251009815427415089167957119716552498Q, 0.4269746759961805873630290348183986624008Q, 0.4482206881460109502730547965841668757419Q, 0.4700056915656277899431961667430783936476Q, 0.4923507977844861273498956739046383206408Q, 0.5152819330813603300309886035691222305983Q, 0.5388301929311863111421213198913401934378Q, 0.5630322057392941342388625306808580909827Q, 0.5879305097331706661595300552630455764344Q, 0.6135739474002000455026043925050716049865Q, 0.6400180823944171101131289807198543701499Q, 0.6673256443945673609364872806279077990422Q, 0.6955670079895264329659912952632680789938Q, 0.7248207123067282158967442704471550423678Q, 0.755174028797632235942287932936820869365Q, 0.7867235853661413244076962098206460684032Q, 0.8195760558879440923143584503029939308205Q, 0.8538489251399243780669486054066034940311Q, 0.8896713402605466323065095493330976770865Q, 0.9271850611189796768353779214968518621624Q, 0.9665455234106549820541670985068771774387Q, 1.007923029952093538678666103220858418246Q, 1.051504087555186687117183984945832760065Q, 1.097492909063483883997601555693094342315Q, 1.146113102680112719972734092736933142041Q, 1.197609573666617166428932839178577498609Q, 1.252250666911899143547941192591371436231Q, 1.310330582839888493701788295465003738157Q, 1.37217210373676733630920077182877790563Q, 1.438129672943398791959487191769629934714Q, 1.508592875605843567792546896641817408196Q, 1.583990376960161405728445978404738182695Q, 1.664794382629429266013098961741791558223Q, 1.751525695347873485191917162770484106857Q, 1.844759454157519975124726858748082186858Q, 1.945131655755179789450074815727091684967Q, 2.053346573670745058772720412100260503836Q, 2.170185209773702783125573644862289332091Q, 2.296514934764264073224142035073302023876Q, 2.433300500447164388577695004113074013905Q, 2.58161663747988776667509546620948920106Q, 2.742662488862789158372641819356759385405Q, 2.917778172822028903433359898800151747826Q, 3.108463820292819287982021469423989376857Q, 3.316401493599933781190010602613013995669Q, 3.54348046617653089369704252750263265078Q, 3.791826430729338944919813121549353097009Q, 4.063835308168158064754708867837643609124Q, 4.362212455574033518518003957573686930251Q, 4.690018223035719205027755685192834005172Q, 5.050720991947143731968899118688088940902Q, 5.448259048256953387079920394084937571864Q, 5.887112911771720144158430210651581802686Q, 6.372390067582751971642819361195420653775Q, 6.90992444125988827953012481002020831555Q, 7.506393442161772368175053194733459234238Q, 8.169455989725808324527513652199713813185Q, 8.907915661855472823639384908936684643353Q, 9.731913995136417711816003089572337623446Q, 10.65316006472897621652551260868663551892Q, 11.68520382944801969713109764242848374433Q, 12.84376241077977807680500867803300301828Q, 14.14711056741875730648931534734397225137Q, 15.61654923657610797854796792165924553916Q, 17.27696927711813081034870582050023535149Q, 19.1575316438972062177517199312460728233Q, 21.29249037469088386815163901407216178668Q, 23.72219127477837271220994964328656674383Q, 26.49428742050364820557155179532147420304Q, 29.66522306835508141969084020865324390507Q, 33.30205089827977157270000960709570859413Q, 37.48466458890380022160714648508118317334Q, 42.30855063623495252454033790164450670327Q, 47.8881915632378843451955961800195447245Q, 54.36128918373743651121334551785550120256Q, 61.89402398727235984409338948213129946593Q, 70.68762848584778035111708853851365105352Q, 80.98663318461299861455744390021635011055Q, 93.08925000731765179043536794223242453694Q, 107.360498051909977877638468111141356496Q, 124.2488620644913487541111414904888517612Q, 144.3075208306123537479577194819288207331Q, 168.2215125059906251544039241246965052271Q, 196.8426466712140109699287106212096785157Q, 231.2345700412004162865664673411149073857Q, 272.7312019667013277459148899897857891488Q, 323.0128578028804552965843198380088014832Q, 384.2058863035695149259386485193758599267Q, 459.0137217198435660140055247689248768806Q, 550.8901200041443942937196398242337901245Q, 664.2693368837686965599246065404881270217Q, 804.8735811989890924404636182648277160974Q, 980.1259156504395891459619379603039765341Q, 1199.707861561135993394057942286167343594Q, 1476.316731695328101407692303706838300626Q, 1826.700281041640180200375170800299114979Q, 2273.078763337010832434612762840156927958Q, 2845.111583125694562939705485499061319494Q, 3582.63445229515952348100007249931464674Q, 4539.493895490226925280328582195285263756Q, 5788.955233042394450770042652752120480379Q, 7431.382535413996455795580622729193897504Q, 9605.22268816346298456472600902460366535Q, 12502.83007762372328074237673282359093081Q, 16393.43674235796806736737398613354988262Q, 21656.75254389093564900375379131087677274Q, 28832.50596892479639714830479215091321586Q, 38694.08631185854918420830577505233860916Q, 52358.93467063693914614720804658599988759Q, 71455.456360801919182448351605271054385Q, 98377.64507715702272833892935236019203581Q, 136677.0756867775216880054458611011665626Q, 191672.0751837584047014496772899197949398Q, 271403.5992651355850921027142705425693394Q, 388150.1489980647547347704942553355997537Q, 560853.4130088772447154039295543588593931Q, 819043.3312820769048716008983572259664347Q, 1209258.817558563172770397433801307820624Q, 1805669.064478872952573635882889999089934Q, 2727847.041283590928457428564030560101144Q, 4170866.124317416698666405920199452972485Q, 6456890.228079086947156608652453964442837Q, 10124726.37272406821615834787676485411144Q, 16087301.34833727189340602159225001909214Q, 25912302.39431432285806898738587495423666Q, 42329233.71376092207616725342280744956334Q, 70158627.34273633230839208484182467105049Q, 118039913.5748636616256979688722947376115Q, 201693090.8294808535841471498441901946314Q, 350171893.7910157422614179826343745861743Q, 618045198.9354320713114267484128373842008Q, 1109520762.65117402853282816165715478028Q, 2027036851.386298662396084471850133567806Q, 3770865836.139748847448857684280330919226Q, 7146997570.085695415162843692670918823862Q, 13809155423.7635644350563312672690880342Q, 27216828505.22509686672818101177168461874Q, 54753167786.17979572173272483227070679431Q, 112503345834.2116875456216420474620516059Q, 236264339141.4388903275724307413980800073Q, 507468184268.3981316720163337618534278446Q, 1115599423406.056750358630646519147758314Q, 2511986677094.979276772007287643222172789Q, 5797849169011.042298094625503200359295722Q, 13727721548993.32343665617597576637303556Q, 33370617336501.58545603365672095860275791Q, 83354238202660.91699429975122294150089333Q, 214123217249312.3976721926402658332174117Q, 566186245097249.2404127137280597778292079Q, 1542458444402443.371440183667494867781715Q, 4333492171181691.733058240784286416444505Q, 12567757410549319.01294953377020420832395Q, 37662670435513236.74825914523236427898489Q, 116748202247647142.7587746965785438338682Q, 374749992316334764.5035248090549339897237Q, 1247000912952610699.068918595764499658321Q, 4306478248247432160.48599458994176300511Q, 15453273378202816390.33518176991213146053Q, 57688614909942567753.38454019969606422075Q, 224324420244279774891.5933154795594761405Q, 909792898611770682517.3964923463766620933Q, 3853617984492513550125.129076034019123708Q, 17070801413556696833779.13934163759159904Q, 79198380783368988856761.15648214291897699Q, 385383801466035476735828.0064437179791326Q, 1969895659051426429613504.41964918030692Q, 10593618501197001697030611.61632899678015Q, 60033966329846568637130543.04333463171392Q, 359106968518167632524691177.3080001529087Q, 2271277124005940993621700920.257498362904Q, 15216157171278585594752783876.84164894054Q, 108173748902143609868441659437.8836108294Q, 817597332272823012424833955943.3418687263Q, 6582674375871431329198879326278.80655534Q, 56569460748304763531726402484221.24071294Q, 519969127337393591722068633515796.7939186Q, 5122908034001797018186468009479969.983806Q, 54219575049584711207951705824720122.49792Q, 617850853251241831307357121612505215.2627Q, 7598326740673873945470445853982730673.683Q, 101090458794504259380071592279087005881.1Q, 1458628632586491581554836293603735700553.0Q, 2.288445431879986075288969228297589916294e+40Q, 3.914281502784266353374296872381741581596e+41Q, 7.319312087167267244726757556658409266855e+42Q, 1.500458683672485184540463104819915256685e+44Q, 3.382059446944515486362813459304381825179e+45Q, 8.40717228899724214872703723897524019292e+46Q, 2.311957183444258916605122634003678725418e+48Q, 7.056075282456062930798909861538304101971e+49Q, 2.397931935961417566906622041440033927301e+51Q, 9.105063361761505316713558735495605805833e+52Q, 3.876420331062826191501135623097992286507e+54Q, 1.857198647483778496415448329375750635825e+56Q, 1.005063215679245721735518932962246661573e+58Q, 6.167590234451758437399991565606037242384e+59Q, 4.308813152379759511416924169109982265891e+61Q, 3.441182726656605944775469940970363892009e+63Q, 3.155080085289705076440136183714307040901e+65Q, 3.335560569120603606052934730277045229653e+67Q, 4.084573232398309215368829036499274751723e+69Q, 5.820628809283804990396620764580300086666e+71Q, 9.699039800361010527223356682487354608079e+73Q, 1.89923980668320512816136152429593080513e+76Q, 4.392868007405665883421052875783971749913e+78Q, 1.206505986650708892173158064003257826858e+81Q, 3.956328505753650002939043382097189172455e+83Q, 1.557688055206654931604309948079068934868e+86Q, 7.406537535531269658298708915037136600795e+88Q, 4.278562761054468958052314006843284683637e+91Q, 3.021429361815161697337775526021250674025e+94Q, 2.624991835754469757869340327198684862761e+97Q, 2.824239055865323697007157867310795887143e+100Q, 3.788616439302435442144238888291948175614e+103Q, 6.381265012445197114926701012217755404272e+106Q, 1.359307419444233008395198137493298288245e+110Q, 3.689357736818599529286450344745920764709e+113Q, 1.285719405981015169347543552934268877769e+117Q, 5.79896089805386955461804251259128564304e+120Q, 3.412858686517390979492612468054488171338e+124Q, 2.643133109091891288299365259101435230764e+128Q, 2.717298021659115627801241121693599358524e+132Q, 3.741778449844632488889983162905015325601e+136Q, 6.965790897246310296313827180334657009428e+140Q, 1.769991845748830191769012548081426586684e+145Q, 6.199682080134586417994375593693813669468e+149Q, 3.024056421749683185151625522184732565621e+154Q, 2.075860353782646995243205830982511919541e+159Q, 2.027237041997503527729877101258258485667e+164Q, 2.84819019631263809337561430719405846138e+169Q, 5.823789472478759398822868913946380670277e+174Q, 1.753831670213037732308430178708200856584e+180Q, 7.875048994214403791228526371140330003633e+185Q, 5.33959995017489809314309431564145975465e+191Q, 5.539060004117798714171786555151150971203e+197Q, 8.910405429080536887142895484227329351929e+203Q, 2.25393372621235039418834085888287214571e+210Q, 9.095096825715822376272275522195235473437e+216Q, 5.94202303286497040346001141219106057472e+223Q, 6.382118127492160537643353652683681344379e+230Q, 1.144860031429102206755598498207317533823e+238Q, 3.486326812227187949835465276465097663203e+245Q, 1.832768040117385552841365088677720918755e+253Q, 1.692379509135740137727773957097833887452e+261Q, 2.794505326132115346915299861915404249723e+269Q, 8.405076170451043189493827526418502257828e+277Q, 4.693262451309588660736308776755416725156e+286Q, 4.961738495062629283767259212421455782816e+295Q, 1.013488586645822568937692055235633940552e+305Q, 4.084221398756118821350576889490962044446e+314Q, 3.31797255076755830584401562393461184623e+324Q, 5.556156061512309994500204693690071227389e+334Q, 1.962393306169292859108099309776943823055e+345Q, 1.496911135838772621973260501875737184473e+356Q, 2.527081774155980938068575705055676841454e+367Q, 9.682952487842774440282680190380581838128e+378Q, 8.642932154430007387844488354704403530376e+390Q, 1.846024495166690994263298662566528477956e+403Q, 9.699853937915510903638593851109203549831e+415Q, 1.29019233082477503168780727447218377249e+429Q, 4.474137533288725774889486358089933849193e+442Q, 4.170041218844572969270760095147757353548e+456Q, 1.077897308040601801221120607931770758264e+471Q, 7.981471823702425518749857998096499633387e+485Q, 1.750515936677737147078175240321968864283e+501Q, 1.177053303545360119348788135380274557129e+517Q, 2.514304327715581467017451008836642461283e+533Q, 1.769970977432511196406520490255351180778e+550Q, 4.2646343986308794030088301101938804053e+567Q, 3.657021198954671244361265926107390170785e+585Q, 1.161995022380376800254911849215938667325e+604Q, 1.426161883992266887019615450265103556361e+623Q, 7.057501509770417183799008967192326349846e+642Q, 1.471878408492178033263031885767465334416e+663Q, 1.354138353815247160487911075189635081583e+684Q, 5.760831288581247091444505472239736239879e+705Q, 1.189730645764784786336307075095066200968e+728Q, 1.254105261294047490114939349887062439042e+751Q, 7.105801021107686895390768106399523520351e+774Q, 2.28281648423858553167251131768916156991e+799Q, 4.393686187647260979367904999350735520579e+824Q, 5.362504350805858665245291197548444739952e+850Q, 4.400994460175449649406744849257249937177e+877Q, 2.580184691440319635082387832634782416379e+905Q, 1.150201187760129651179050406857281109502e+934Q, 4.158019827686647740035176845444359313922e+963Q, 1.302697158180542995105180498547801432023e+994Q, 3.78804315469310114235168697055913940647e+1025Q, 1.097277067032447599839448667453494574529e+1058Q, 3.405948056419239816971511993948200677928e+1091Q, 1.221452079059747140866097947720732213944e+1126Q, 5.469728834947448905323012416213783681996e+1161Q, 3.313684879917774900254086176181829781121e+1198Q, 2.950003898158737668709569796392213974285e+1236Q, 4.202906985201980113057532813808859421914e+1275Q, 1.046450503925266293149709371732059242222e+1316Q, 4.986188211546778571602783903171292775302e+1357Q, 4.993338241348295306012588782782184198345e+1400Q, 1.157626881881270934779792801922724477911e+1445Q, 6.864630422932014748167413728259165043085e+1490Q, 1.154057064570998816035086816885432531351e+1538Q, 6.116573955685408991594979059166788310164e+1586Q, 1.14033623849635356868515171774059586735e+1637Q, 8.373064137120280572431494406435413559046e+1688Q, 2.720845114960258853420084277841813860219e+1742Q, 4.413059336919928865301216672097302323433e+1797Q, 4.044822257870394599276743613321249907269e+1854Q, 2.381229351958722417177138670512610760689e+1913Q, 1.027611652914733400897244248728364151035e+1974Q, 3.725531848970894050805213745804832393498e+2036Q, 1.306062165371036629009984640124042230203e+2101Q, 5.118934916287102017127361633252835489039e+2167Q, 2.605313756841350663666908726854909254754e+2236Q, 2.009526310597759100040671805249352251293e+2307Q, 2.754855306228952463612144173863317999165e+2380Q, 7.912081217360857939375130225445886436671e+2455Q, },
       { 7.967275909080119173260394105433878829225e-2520Q, 1.018328235596330817906641738531405586075e-2480Q, 3.221582354315018745133234535022765889901e-2442Q, 2.577837396125923566854501272739510663846e-2404Q, 5.329692879048212454158155682964916728316e-2367Q, 2.907510479746435248283830679207105484516e-2330Q, 4.272515272958308108570054029079326796036e-2294Q, 1.725920944512128844318784735433112719801e-2258Q, 1.955365288532498067112004500362223834133e-2223Q, 6.33672146224698551106793067421941599521e-2189Q, 5.989055317923577956367893208101537342355e-2155Q, 1.682695935085939711542031154300739978911e-2121Q, 1.432104065344727957976083590066231975447e-2088Q, 3.761027283440035276506274748665174438543e-2056Q, 3.103973882224385163725384328628978101726e-2024Q, 8.196024681248225777873004659982426819745e-1993Q, 7.047501943265264073804265038957515028249e-1962Q, 2.008020122030836044260092764882735792941e-1931Q, 1.928585386478996757051377061536226588734e-1901Q, 6.349936504026115699331271816067930197654e-1872Q, 7.287319738451912662822173117194663954913e-1843Q, 2.962993354437338667093054088027903427137e-1814Q, 4.337549035352199493070093298251396522747e-1786Q, 2.322667953684500393631534979205588114281e-1758Q, 4.620940493203111397883251148877460552652e-1731Q, 3.46849175006702283349982309232738215393e-1704Q, 9.97197469066253825213923346003213563319e-1678Q, 1.114585267326982901794838942479030932334e-1651Q, 4.914714563824319863256125426084037061236e-1626Q, 8.673588082334046069888398076950448507162e-1601Q, 6.214129581324762232775539905301734104147e-1576Q, 1.832790291938882421191920578959728374086e-1551Q, 2.256171136581882657900944651081598896733e-1527Q, 1.175009240711975388097085650021684742673e-1503Q, 2.62368977120029668942611642547157610416e-1480Q, 2.545000194584350068428255601470918881705e-1457Q, 1.086378274323549748723752477385721065205e-1434Q, 2.066897696539443930872351598446447515579e-1412Q, 1.774772157298710208337196463122169403564e-1390Q, 6.963196512155587707171477008714118644169e-1369Q, 1.263545167784085371065018714077427939719e-1347Q, 1.073200483671541400965432755811734945193e-1326Q, 4.317082212314184926835882760831574340329e-1306Q, 8.32053604965395861253463941646191625903e-1286Q, 7.771734618559071081107688528229970310621e-1266Q, 3.557686044605213104209030012940037706499e-1246Q, 8.070528916876981426176871131000861955335e-1227Q, 9.171668926752907939883632747855449181794e-1208Q, 5.277894673647840384307719753102608158502e-1189Q, 1.55425000722110468554188982028632391378e-1170Q, 2.366680555098895290029405613091848674444e-1152Q, 1.882599225459190082401671846340953390019e-1134Q, 7.902192246540000601320781601302423345806e-1117Q, 1.767718149213402068974713376178812787862e-1099Q, 2.128098208048214966164629867555770669406e-1082Q, 1.392051591976656401133824170145523168896e-1065Q, 4.994719960920755555531504146997873320923e-1049Q, 9.922076126548449719468150236395605850173e-1033Q, 1.101311891894924117612397672953984177965e-1016Q, 6.892130837218420956087582351392004213975e-1001Q, 2.453524489921414170305853712838952078459e-985Q, 5.012096823429272595408207301327403858682e-970Q, 5.92625397256846848563576817503982351625e-955Q, 4.090293049633920583650165040912103911016e-940Q, 1.661753006709297398826495491631296133997e-925Q, 4.006680757962520202236462553833604795318e-911Q, 5.779925457403545302890808903391113431044e-897Q, 5.02848909102539886751126002796168835514e-883Q, 2.659105037910872144852205745069380936102e-869Q, 8.613275102396233614296997155697707276489e-856Q, 1.722011941149323047500322262512900155623e-842Q, 2.140858770279205828196814199482763570967e-829Q, 1.66733371240769894937624182878072907988e-816Q, 8.193863812957329774412230281809513275895e-804Q, 2.559097724964727559938640778629276385374e-791Q, 5.11527606584153978380615675677219021198e-779Q, 6.589313932434497001234913531610383100585e-767Q, 5.507550516048129444656311084411711270861e-755Q, 3.007020142650284579022887900120691321832e-743Q, 1.079545570904019147607701162275175357017e-731Q, 2.565046260212020805453775161290492247735e-720Q, 4.059551213679369050731379503131672168122e-709Q, 4.306509253842678754390905922017562669864e-698Q, 3.081277425837841400021155036519520671543e-687Q, 1.496049756497725324561151798326667339225e-676Q, 4.958858781223578709469932084235076593428e-666Q, 1.128776827757009886737844677649633126831e-655Q, 1.774824438031273259221674871341421861954e-645Q, 1.938718628529578614339845914362132261711e-635Q, 1.479580889476868168834482402842115319684e-625Q, 7.933076560959459481932759219061929332943e-616Q, 3.004696447884786585684784182577260233339e-606Q, 8.082686940259012888778153139360914820557e-597Q, 1.552426325390131757062306746548839627663e-587Q, 2.140102119938385745802494123096422882483e-578Q, 2.128429453740900159670547695806420238397e-569Q, 1.534912683226941140367083241016749973227e-560Q, 8.066256819954909759673837062709789215779e-552Q, 3.104238792273031330484452756380286340285e-543Q, 8.790844945644080595293305902463382662207e-535Q, 1.840618291261842948588744341179843557088e-526Q, 2.862777784664184513037699746755593033611e-518Q, 3.32279837181041061553234462323492937839e-510Q, 2.891235095586630121781435408715459157878e-502Q, 1.894375038101531296060137038995059871087e-494Q, 9.387752849968810937579512549662307625661e-487Q, 3.533872224235785186218523407943928105631e-479Q, 1.014810086945078087894935086994004318066e-471Q, 2.2324717569626557013949548912766445982e-464Q, 3.777884776738657261205533855337240737918e-457Q, 4.93786751664639347798897645870074547883e-450Q, 5.004920895479663677446497643024618520578e-443Q, 3.949427686727102477250133390725874321876e-436Q, 2.435767559087040930634684216214147613966e-429Q, 1.178587076580330886964544022890917953058e-422Q, 4.491023912606049854427428106653051102875e-416Q, 1.352680705533714285427651131064219006969e-409Q, 3.232175229700192859974514601701313013174e-403Q, 6.148979779244951167078060501065764873822e-397Q, 9.346618557699555690197507374939990133164e-391Q, 1.139095638725565354570660165510495028107e-384Q, 1.116882736988512594287339256913954444686e-378Q, 8.840180431626061992850152992185607078407e-373Q, 5.667122232091659511764331764542937857446e-367Q, 2.95210171074869287556924947738750388968e-361Q, 1.253616557485983210249402924206741962015e-355Q, 4.353499566130717956144486781651064963442e-350Q, 1.240243792752263780952771158279701378416e-344Q, 2.907393260879684488880153095982345233788e-339Q, 5.625244131026162975882364543895958678556e-334Q, 9.009739108786675273276970385188647555895e-329Q, 1.198087756353396256356294131034463223006e-323Q, 1.326548775108682048756687665666583870046e-318Q, 1.226448111135483120974035454571292238148e-313Q, 9.49468504349439811133142768178704940847e-309Q, 6.17181101323002240744175397407031718684e-304Q, 3.377707669589353604487497237523332765898e-299Q, 1.560512872109863571844393575758792286036e-294Q, 6.102236208573128122093888164692727956235e-290Q, 2.024929301988449522883491544065893159998e-285Q, 5.716567372402404783728122475078537540453e-281Q, 1.376428575092612476633988432370532525456e-276Q, 2.833585596240407856348272111949931080586e-272Q, 4.999632626016703452297995188196308401074e-268Q, 7.578746796653130874873290482021210756378e-264Q, 9.893195588497945068609978048738483752363e-260Q, 1.114710731734833240955445714249086995456e-255Q, 1.086588366772543409228146502433142567442e-251Q, 9.183764349360752966385023754968415218934e-248Q, 6.745119200393479925712383108023813390928e-244Q, 4.314368731526732239250885070923775496171e-240Q, 2.408432510386531771142800736481978254764e-236Q, 1.175865689260863816680634119022166918193e-232Q, 5.031403985679824041735142472001594305874e-229Q, 1.890676059338627176469623532390876131616e-225Q, 6.251957030364086922481747023515455758277e-222Q, 1.822832110299319014901260869272013670981e-218Q, 4.695228558883599546359502992313929137066e-215Q, 1.070485041990253205844787613056619988479e-211Q, 2.164411061170786494289133504038746022617e-208Q, 3.888149057834327052303287962939662414968e-205Q, 6.217077650284409358885672093877174576393e-202Q, 8.864490176680272259518995033084329107486e-199Q, 1.129060018025413968826902845797468943636e-195Q, 1.286873424792917053839022851662100381367e-192Q, 1.314795291417549889849051617164565642141e-189Q, 1.206202769586152888447188064879769552541e-186Q, 9.952847031230403569515431731634107940163e-184Q, 7.398656727363347668880677233416039563592e-181Q, 4.962946760441355726269312188537195172159e-178Q, 3.008841426137019577290269695130774172341e-175Q, 1.651250489636657038514219704463078872032e-172Q, 8.215822870116426810896344350411473632426e-170Q, 3.711707137271423160180212748621691502977e-167Q, 1.524862581521331587673406461025625884709e-164Q, 5.70508150602545345515626627261166302806e-162Q, 1.946690864521063015447882642259593648046e-159Q, 6.066751495971832907946605731816433411601e-157Q, 1.729218890749008111955745508052309562408e-154Q, 4.514184397107540977965003426103559880641e-152Q, 1.080776439193461578737828802075769030367e-149Q, 2.37630514513441024032933923861341092174e-147Q, 4.804539863300466911851715067980750771531e-145Q, 8.944359411396089882336022433298240800498e-143Q, 1.535148433653602528126818304598839769627e-140Q, 2.432217566861172517425147458255035408531e-138Q, 3.56159164851978783755994271005743068325e-136Q, 4.826206194592030239608964808604974782439e-134Q, 6.059123883793098626317651235341860311477e-132Q, 7.056186855737804734056421101084240937306e-130Q, 7.631197540594714170535291222444902661627e-128Q, 7.673190056935230923349040383785807876549e-126Q, 7.181420901238450533979697028062603205731e-124Q, 6.262949340804115487531782118695348240253e-122Q, 5.095149668836320992407738242504181244468e-120Q, 3.870905682539942846661487470875055347721e-118Q, 2.749201932883450268151961331830477076878e-116Q, 1.827228100144142861000456602099118570404e-114Q, 1.137673382674035107250733931604905546067e-112Q, 6.642336072005941146361966661287119272804e-111Q, 3.64028512339331626869107380312786986349e-109Q, 1.87450863444735780747041756540496602537e-107Q, 9.078133222842635422121285050940964351573e-106Q, 4.138812855052761279043494154268599225563e-104Q, 1.778000270650318764431469309976610087858e-102Q, 7.203855822800213289973969862777328396312e-101Q, 2.755303928538917650732532471686512499588e-99Q, 9.957111327196065437803034062710072445763e-98Q, 3.402816997218076148572057943527130789008e-96Q, 1.100680588716144971407937016574430544574e-94Q, 3.372653914433340593300308221192502433386e-93Q, 9.79793465921741389410002031066177808616e-92Q, 2.70089978913542155792813430020605674429e-90Q, 7.070447343835118744270507416522429771431e-89Q, 1.759128817422289300267493076673104253506e-87Q, 4.162968945574391702034525851121326185222e-86Q, 9.37779241810731989238679712769217329023e-85Q, 2.01243511678120567645753438316089357156e-83Q, 4.117122160765049554856907584525124497579e-82Q, 8.03596273765328793581294339359042233865e-81Q, 1.497514661862748564043414139894766607224e-79Q, 2.66627575240526913684138994676860937559e-78Q, 4.538860378486968408830116582994751799953e-77Q, 7.392623260932249293359287648677921377725e-76Q, 1.152810282079105430900943269743976641052e-74Q, 1.722334641963998877538919046212108072676e-73Q, 2.466982294003650362347496250523874402798e-72Q, 3.389902673647822893523319180268544603664e-71Q, 4.471576114525864494621630170567724674708e-70Q, 5.665802004349935660857687324817574414575e-69Q, 6.900180136205711399260007796162289923614e-68Q, 8.082103978670433565158160112244695539644e-67Q, 9.109949614051296700342120658333526754299e-66Q, 9.887660566787155914957022540708377404886e-65Q, 1.033978824499191800266695652953562102366e-63Q, 1.042367363142603472683903942222927019223e-62Q, 1.01360253850642711420235182625207856357e-61Q, 9.512510161747350299580075950049163390633e-61Q, 8.620693578866897400350402598749549001733e-60Q, 7.548215286708061079286950592874024396203e-59Q, 6.389002522263073684828225781548498851979e-58Q, 5.2304213467999807285495233989909068078e-57Q, 4.143618029730144849471458722659316057844e-56Q, 3.178215053889138479032361583006970626875e-55Q, 2.361375497747090350319603916992762005858e-54Q, 1.700353947901992650870275190000853698062e-53Q, 1.187181461482834292235814755757571995841e-52Q, 8.040926262915060358135936625876559056833e-52Q, 5.285800219918840044239185423363506533173e-51Q, 3.373901677142706872070242716798262993283e-50Q, 2.092036760993143554287714553393156854658e-49Q, 1.26071389736459024550376938832573535614e-48Q, 7.386967875256930161617715368501896621111e-48Q, 4.210245750567381301823721041940686239094e-47Q, 2.335212680852443576888813564758399301987e-46Q, 1.260975065550456669584777965304501230694e-45Q, 6.63174909295324620401889662345375243662e-45Q, 3.398355988046612747841700088585271753564e-44Q, 1.697476472841236183609850797662451898689e-43Q, 8.268085659326493130435461342952520749743e-43Q, 3.928638007500358866351367670626935931854e-42Q, 1.821720759355284457527987958132111168364e-41Q, 8.246860808847354549111270503081351496818e-41Q, 3.646064568177825762669789860457940857642e-40Q, 1.574882443754619623541008196995070064258e-39Q, 6.648395042005376085395386282489705285924e-39Q, 2.744004024875076628507083135601534661763e-38Q, 1.107653420681031633888214018454568434403e-37Q, 4.374454244420129201505123651246128890729e-37Q, 1.690799049659970724466269924181801546001e-36Q, 6.398132877939130220610010163346102651855e-36Q, 2.371103019047426350497793704573373960345e-35Q, 8.608431951088272831647481050248077098396e-35Q, 3.062756779443238602319536870269819051555e-34Q, 1.068198659583210038973746806524748536317e-33Q, 3.653227544700454531305797630670503225392e-33Q, 1.225515001519945073404871285296100665347e-32Q, 4.033738539559432392661992185921035446855e-32Q, 1.303082875824869971414005942159261214305e-31Q, 4.132734479820748852758173795520437853314e-31Q, 1.287147098350869770886623826581464367999e-30Q, 3.937913659653477883694284311172054333025e-30Q, 1.183782052799315485733017592458599891775e-29Q, 3.497544328892517187831545842100287032186e-29Q, 1.015914466727185220837422441064387754207e-28Q, 2.901804990894522420127448030270270503252e-28Q, 8.152849127534845411362622488936266274172e-28Q, 2.25367809417179806852681105934818375896e-27Q, 6.130912603089867849064196318283416796732e-27Q, 1.64178734291463510902060102240353937311e-26Q, 4.328857792089817047005743679842334899927e-26Q, 1.124084164810469092376383461223505192932e-25Q, 2.875386797856971912981506559923184846915e-25Q, 7.247144107627277984808094958723307043434e-25Q, 1.800156961022553615025218914199947112878e-24Q, 4.407829997906358459896106459287958053e-24Q, 1.064159909656974016807111538128709340566e-23Q, 2.533679394987778730189472745065558452445e-23Q, 5.950490597088776019748683578472561818409e-23Q, 1.378803645178565675477663430920122567538e-22Q, 3.152763311863490040779656649906049613957e-22Q, 7.11555798463800555819351867739855080496e-22Q, 1.585415769087416794558428166428232224083e-21Q, 3.488033184094363861639854904349888742437e-21Q, 7.578906150306100545423157126174164576149e-21Q, 1.626690309979793927151914765130208588376e-20Q, 3.449517091693030714666710333959651136005e-20Q, 7.228499497618258130899446599161547874565e-20Q, 1.497112865860816048764094432862181982629e-19Q, 3.065182400463867687382144796026279060458e-19Q, 6.204847831174082599165287964674983928818e-19Q, 1.242096716667761537684098553412968423806e-18Q, 2.4592597959525768067059363490903017727e-18Q, 4.81672896226015964045793790028985306539e-18Q, 9.334084950562834068284127795290557105276e-18Q, 1.789925014943490672474409292990156919458e-17Q, 3.397130025636848212544218713465822505885e-17Q, 6.382243159919550687632232044625421720437e-17Q, 1.187098865362206582279245836506254018227e-16Q, 2.186352889657557664550744789902758712378e-16Q, 3.987859744831167732326236478627157162656e-16Q, 7.204620697873539912480086209051030823416e-16Q, 1.289431790155955917841351554233503242944e-15Q, 2.286467374882308613486205332118436402814e-15Q, 4.017662252161183047836187284910855861237e-15Q, 6.99656785784342408232633767751107637346e-15Q, 1.207703613093171430146873960414485693713e-14Q, 2.066611834161126240026963698131523479667e-14Q, 3.506221191208017396780249818547308545177e-14Q, 5.89874025912113410833559535930664457693e-14Q, 9.841824583826900982294185470382304100122e-14Q, 1.628711979356644195640673557575737399349e-13Q, 2.673747297244544464041144412989940524217e-13Q, 4.354698030762685456146522867684472784597e-13Q, 7.037375613470243013811036742819534450189e-13Q, 1.128576426207602409839136130428624894649e-12Q, 1.796265444979361204491866760276216506487e-12Q, 2.837790274411961929167645624257533119362e-12Q, 4.450517051624898219124643410702559319937e-12Q, 6.92963583879943637167224732796899185484e-12Q, 1.071343498653279805152831768444006526848e-11Q, 1.644800798713549170982066141603139794962e-11Q, 2.507905928632347374338630836942320447304e-11Q, 3.798122183988670139277644917971882044735e-11Q, 5.713892308950583341199546461179201773938e-11Q, 8.539758065003606420501230564062147832472e-11Q, 1.268100729620471661902817410073941033457e-10Q, 1.871113767059724245386976661776370778825e-10Q, 2.743644295142664772759283079615343882946e-10Q, 3.99833185555888171640293913723530982506e-10Q, 5.791550996315273321902088121824651906299e-10Q, 8.33905623640836900250032445405370043217e-10Q, 1.193672562105227931589388299289134785728e-09Q, 1.698789266026923550073522461535190652611e-09Q, 2.403913727893853297080383302536080724682e-09Q, 3.382686884515520208065080745279262391703e-09Q, 4.733759174712641803740945710631487071936e-09Q, 6.588541092193685952258947629496486846735e-09Q, 9.121112685152380583998835576941094529702e-09Q, 1.256082033795070258308096624958598291786e-08Q, 1.720819844523096099720474511434503885155e-08Q, 2.345498050299132447846326603361136043516e-08Q, 3.180911042916052139309955352436778506108e-08Q, 4.292583225702628201046231718407734046636e-08Q, 5.764612626060727958623931970026984259394e-08Q, 7.704397341666848653267095123338097208871e-08Q, 1.02484168952891991947754465547361714047e-07Q, 1.356926702837583879755051597078815730847e-07Q, 1.788417551503950471950015064517069882061e-07Q, 2.346525819658947020385582160747980704228e-07Q, 3.065180852876392019694236336586654765768e-07Q, 3.986495033191807496354173430939013698484e-07Q, 5.162502188850122540844684197019554711165e-07Q, 6.65720997012649014040997771515440610649e-07Q, 8.549011167117627077144919459539055163198e-07Q, 1.093350316344842739482570460075507090481e-06Q, 1.392676894662565462032126480798341973487e-06Q, 1.766917725585667241992898344161547873865e-06Q, 2.232976345560288036947373699573375726808e-06Q, 2.811125648202381706895272765136403841401e-06Q, 3.525582061468103068665653163476736687771e-06Q, 4.405158376428709913646029278948069283329e-06Q, 5.484002631927202129384801097079834656695e-06Q, 6.802430623520435693108355760476215953221e-06Q, 8.407859685487256287710959317409001943954e-06Q, 1.03558513786321915073962476007182566071e-05Q, 1.27112705917308531277560249413305391114e-05Q, 1.554956831891198412168337708959965747403e-05Q, 1.895819499809689983959597375272763044769e-05Q, 2.303815077706507768668930312189393944145e-05Q, 2.790567840555153504276820390388733949771e-05Q, 3.369410362760997145481708684122315699185e-05Q, 4.055582696403286559517626972868029344242e-05Q, 4.866446962805309592997024360400453753624e-05Q, 5.821717500966089824845365574649413158772e-05Q, 6.943706569830923930053447899093868098698e-05Q, 8.257585439721267879079897718480289417549e-05Q, 9.7916605324640385949085647909368095273e-05Q, 0.0001157766408114819489026696755064685711663Q, 0.0001365105858059673951916433332558940095964Q, 0.0001605135409048256559138258125495353142543Q, 0.0001882243723673180815859848425981422149923Q, 0.000220129105359083888832193195380277964631Q, 0.0002567644044435395558985376934615952746774Q, 0.0002987211231186489549516252551089359495587Q, 0.0003466479020167920218943287065081041086883Q, 0.0004012547932769214992784035333438157199896Q, 0.0004633168865935784338501681041310863439442Q, 0.0005336779105791366983905761533437676567429Q, 0.0006132537813759504708063524124765235945565Q, 0.0007030360689550059158765139669182449713927Q, 0.0008040953502668325012890028878715651258039Q, 0.0009175844173963607454679355479874424263829Q, 0.001044741308141107407038707367942396160755Q, 0.001186892126003470975743583081981798214652Q, 0.001345453616481502859286364987039915779821Q, 0.001521935466772907586110083455839761654915Q, 0.001717942296584680418941635241375263314963Q, 0.001935175308671765557581701564207351830222Q, 0.002175433569013882948578843986006403688485Q, 0.00244061488817701827933962177717454590009Q, 0.002732716277387093760523031790972800227035Q, 0.003053833955155494667190955668647144637077Q, 0.003406162882922376111090737904328858634942Q, 0.003791995811102684339694547552585507990223Q, 0.004213721820106255238520670138395000924438Q, 0.004673824344328191012589440091579259760752Q, 0.005174878670736688316509780570084920182513Q, 0.005719548907487502446481303679623316137136Q, 0.00631058442192985698627201889000303700039Q, 0.006950815751398609527548621000197550798988Q, 0.007643149994271354192801093440865419580856Q, 0.008390565692865655199126566293274333642062Q, 0.009196107223819374276889186313994843390353Q, 0.01006287871559507536535044833068973909294Q, 0.0109940375166376773728040945023712313313Q, 0.01199278724145422091671644293048154728942Q, 0.01306237042543906222476060243442814308369Q, 0.01420606082260259352562017237936801265042Q, 0.01542715538344503858931888643358628745717Q, 0.0167289659530203930831754338734874664053Q, 0.01811481073173395916859919022391664972282Q, 0.01958800554358856744019143892683179847952Q, 0.02115185495842169316583797633449771810677Q, 0.0228096433161443911301425779096357227542Q, 0.02456462570209342382627799804527821306298Q, 0.02642001892333428109789892692937509533337Q, 0.02837899253610309628758625557724591354616Q, 0.03044465997455174638840433200930338711507Q, 0.0326200698305684182561478766940614844802Q, 0.03490819733369493186523156261607315466053Q, 0.03731193607906478545336713244881109055547Q, 0.03983409004985797457339959837144377122436Q, 0.04247736597902870508264605012848775314015Q, 0.04524436609303125412480485866465061775906Q, 0.04813758127797071695188343575966783160027Q, 0.05115938470606436195469305247887685131832Q, 0.05431202595754248111789162569375577872956Q, 0.0575976256701728356651407164727388580805Q, 0.0610181707454887735519286127955001295239Q, 0.06457551013756707073912038813096685540493Q, 0.06827135124686695200131838960274498733873Q, 0.07210725693823589850320643270045776879156Q, 0.0760846431987396666107037402041258283206Q, 0.08020477744751167235556685358836323731335Q, 0.08446877750636786639701687175860442218662Q, 0.08887761123652361947156590658579628794683Q, 0.09343209684340379971159263353331405267565Q, 0.09813290384827947634314597377864550592762Q, 0.1029805547223161917217849662754146410394Q, 0.107975427175599384648800929258392588213Q, 0.1131177570908303240224652780558492398361Q, 0.1184076420886768784022524072852628267607Q, 0.1238450457092316689652810284506150029169Q, 0.1294298021916876848049165341926394261599Q, 0.1351616218321983257068963021357149291953Q, 0.1410400968979531369261616983876599890975Q, 0.1470647080737783262838611415820062681671Q, 0.153234831416066732619412144570512369546Q, 0.1595497457875576600290825257800962557912Q, 0.1660086407454235928297088004549011805831Q, 0.1726106248542773238830740951304465857529Q, 0.1793547343950870081915214248666534071515Q, 0.1862399424405742377120762392711272315017Q, 0.1932651682674662866336549954877868791502Q, 0.2004292870759719115746122524278836114001Q, 0.2077311399870431986348998739442376385985Q, 0.2151695442883657277414314663960325511106Q, 0.2227433039005768119334724476408616510273Q, 0.2304512200359371707379802858704110927547Q, 0.238292102022565012438636869295500477757Q, 0.2462647782683726466471199486866921649987Q, 0.254368107340013678004869448238984448963Q, 0.2626009891334426438055153641042268648289Q, 0.2709623761140977072718583929657258698507Q, 0.2794512846062298136893226330853142403707Q, 0.2880668061125078167787824382718038889734Q, 0.296808118646717980840005593177875755319Q, 0.3056744980641377677579036909396937192142Q, 0.3146653293759881203313235805942140830196Q, 0.3237801180362461983090820270519599818301Q, 0.3330185011910228622657311928027273913756Q, 0.3423802588826678418804113983776109433992Q, 0.3518653252027527789924367138981015674402Q, 0.3614737993900911492268336792036467644866Q, 0.3712059568719780542735256003769499002505Q, 0.3810622602488663480435171795984767091639Q, 0.3910433702247335339010502511824521314023Q, 0.4011501564874320933236375501478126225841Q, 0.4113837085453508612370763030338926460708Q, 0.4217453465287439745740029610957751723861Q, 0.4322366319661047574509906269685113863411Q, 0.4428593785479733817386890110895733244681Q, 0.4536156628925687094231449505202515619854Q, 0.464507835329626572328505104590646627441Q, 0.4755385307208097937482079206198446406668Q, 0.4867106793370311448540891233670977920386Q, 0.4980275178150015090250825860923349908605Q, 0.5094926002172848568191354394503605415964Q, 0.5211098092221129673730069757438879031618Q, 0.5328833674711906123911808005586354523419Q, 0.5448178491057112741679836363725011074712Q, 0.5569181915228102063547315863613788776984Q, 0.5691897073867122497869745706167773132242Q, 0.5816380969308934474793883532843665800915Q, 0.594269460589676005299802716361632023448Q, 0.6070903119998240471222356070870425052955Q, 0.6201075914149121414331976341764137620912Q, 0.6333286795775096670077450936959654630057Q, 0.6467614120965724037497804104943555382337Q, 0.6604140943798696982054270851497081511967Q, 0.6742955171738133585239271173870307816064Q, 0.6884149727657060911128222112013278833933Q, 0.7027822719062066643044698811599154029693Q, 0.7174077615127308354587586170401139201738Q, 0.7323023432175871214633425313512827364943Q, 0.7474774928279014552006592596985716213354Q, 0.7629452807678324593654003954321067804243Q, 0.7787183935772384484317206900527945313626Q, 0.794810156544848547172767589390981649492Q, 0.8112345575581350364947114757891812390685Q, 0.8280062722565051964220310805112035656865Q, 0.8451406905791530670663872308556803104808Q, 0.862653944803960940002105223911111611703Q, 0.8805629391792451103891710796280884448635Q, 0.8988853812559305452871967488187545907845Q, 0.9176398150339469056412351899494533187875Q, 0.9368456560432984078524666287687994133458Q, 0.9565232284874095042002045886475279507954Q, 0.9766938045840272767944337301321751065917Q, 0.9973796462472128045133642631801931333523Q, 1.01860404926282392956317946592394034531Q, 1.040391390119430800501306096390484332391Q, 1.062767175666867240516297891529939479756Q, 1.085758095785663642281105802222348812045Q, 1.10939207926249369916261716500126785443Q, 1.133698353079565973147506826247703249701Q, 1.158707505339675825255735779161136390472Q, 1.184451552063483495095045621317392891301Q, 1.210964008111586732614521606850934884333Q, 1.238279962501205323185680973891105950334Q, 1.266436158405892106534863447479802864076Q, 1.295471078146741458304256385907446823312Q, 1.325425033505202083685015684659959438256Q, 1.356340261710947294764081629105735343643Q, 1.388261027483455161025774293888757855687Q, 1.421233731533158113469992887140017312801Q, 1.455307025957405656451286211771500914052Q, 1.490531936998228868219023421638164269274Q, 1.526961995663202046567211183531908173458Q, 1.564653376747784111876581362830437011253Q, 1.603665046837629160778144804262475653057Q, 1.644058921912742785217971171041985143034Q, 1.685900035222313480214992667532713310022Q, 1.729256716149878219924242767000386187611Q, 1.774200780843528793008066259722862522388Q, 1.820807735445503515984476325588028533978Q, 1.869156992820145515977178445445390578286Q, 1.919332103749290742415019782061183726939Q, 1.971421003640165834597778573110233965466Q, 2.025516275873364649088115856648097485223Q, 2.081715433008021275938209590135990804757Q, 2.140121217158552655052438896015999577182Q, 2.200841920963014547929530531274604977917Q, 2.263991730677979497484300076901683513364Q, 2.32969109305976045411657347024763207472Q, 2.398067107827710058779643401999432795631Q, 2.469253947653258420191531652724380454066Q, 2.543393307779451047507153399185346597841Q, 2.620634887551268158229579783397916906989Q, 2.701136906328329337203785565785074072196Q, 2.785066656460237449889254046340672661742Q, 2.872601096232473677614318257460754228219Q, 2.963927485939276452660257201800769243529Q, 3.059244070511369011437875195340374346818Q, 3.158760812423005873912952719525474220384Q, 3.262700178927088806749953484425989249023Q, 3.371297988021823798897713011575447983367Q, 3.484804317940613202084006553747118493489Q, 3.603484485381990625764882737049172673747Q, 3.727620098162165171514708146288863084124Q, 3.857510188483308323724907886381561506691Q, 3.993472433570707806928526443290607188682Q, 4.135844471046451472454246597080688613615Q, 4.284985317082080327173205151052609770788Q, 4.441276896113985089457451399096067523765Q, 4.605125691720244026764370781104263535342Q, 4.776964529153930976873581660867167367634Q, 4.95725450101436623824090639311762907648Q, 5.146487048624035738339801115424373145069Q, 5.345186212875773055646526104283213166619Q, 5.553911069634338220218711432966624812946Q, 5.77325836623218909927059759764589584879Q, 6.003865377206048605761449274343927216903Q, 6.246412999195612054604668256261603981218Q, 6.501629106887186763618395996193518237451Q, 6.770292194054217171968109306745209606844Q, 7.053235326147045417971320097171996692265Q, 7.35135043354224614666015033130666518755Q, 7.665592977507008524711768710447822251596Q, 7.99698702419947858650763841033117635338Q, 8.346630765648955546734771430943712584567Q, 8.715702530682195108316710736134856148585Q, 9.105467333230856750332784441560793915267Q, 9.517284010423279804954247067378435207565Q, 9.952613008390899735914523387635646169422Q, 10.41302487987290341264917855291653594177Q, 10.90020956455793654418731784931574442836Q, 11.41598653074432960761644356555484658751Q, 11.96231586542698517926431253288706983627Q, 12.54131040943894482491352029147685616503Q, 13.15524904491223096736253493917986547645Q, 13.80659125421566013309472641076367137531Q, 14.49799308283537068733806522611592929918Q, 15.23232465356644138323597883223098213734Q, 16.01268939608506359051333506048449232573Q, 16.8424451747018194731026127671712692775Q, 17.72522751812091969571786639162509975806Q, 18.66497517864721511431497872041775884551Q, 19.66595827483338098446967472260739788953Q, 20.73280930143244666471574442281522903193Q, 21.87055732415900772060659367071969224017Q, 23.08466571467196402575438824917868654178Q, 24.38107382395057915687200907586246892126Q, 25.7662430405051812966499914509625384785Q, 27.24720773440068300935745005728667380869Q, 28.83163164974229758945104220936171273136Q, 30.52787037807261230893713949085699006405Q, 32.3450406241987409077896619933344018561Q, 34.29309706561872681849669817137072613286Q, 36.38291770845545162245476827741032427239Q, 38.62639875836956225627789882526940946526Q, 41.03656015631005798746236445920699096398Q, 43.62766307847848111679875785712898620598Q, 46.41534087019270662202361582551787873513Q, 49.41674507751608025548331094469808937291Q, 52.65070846212654381646552716106077643221Q, 56.13792713806019302031335914182740881889Q, 59.90116425845236114237707095933490569938Q, 63.96547801176112688533109691101640809997Q, 68.35847706663356290654056305516520187869Q, 73.1106070400535228943010840853771922367Q, 78.2554720634100436673165461770242295508Q, 83.83019609580841382274286001915828318548Q, 89.87582929516635773217532104021295646478Q, 96.43780551924200423365120382987901990037Q, 103.5664579069193585087895746723625879788Q, 111.3176005037851754525798266671368531998Q, 119.7531850674833499641095701349550588967Q, 128.9420435435961078207576974725019132169Q, 138.9607282724984871708695514001995649591Q, 149.8944638077825781408536567743182992156Q, 161.8382263398671525938367526689287312097Q, 174.8979691743083696073045128037176486302Q, 189.1920155721483495460012542161168057521Q, 204.8526435891665175913537920041964014778Q, 222.027891434725956190837338565467777867Q, 240.88361640690763753526746528298183629Q, 261.6058457649334272046319924765364648261Q, 284.403464110476071641090421744246851318Q, 309.51128913049882030120008084966685685Q, 337.1935961013210043006610512490274375597Q, 367.7481615999600937711438359582960700752Q, 401.5109086931381617979355424315925378221Q, 438.8612498100309866908178648997732329971Q, 480.2282399512316532893085494373602185103Q, 526.0976723225701163012986065722476344299Q, 577.0202714839153277613560365269689534811Q, 633.6211663623286914660652375227156227858Q, 696.6108578302568399031998061512477922416Q, 766.7979339996213953902457962279823199983Q, 845.1038321483961377544033152655484401883Q, 932.5800007502418686784878634625973295461Q, 1030.427880205268371607863481564260421702Q, 1140.022198738619409531305753764053160504Q, 1262.938173179340126267770568255475671177Q, 1400.983316165672812706630096023677023453Q, 1556.234685661799166419834076272895832667Q, 1731.082574302171248664168847453614878774Q, 1928.281830862719311465180216556548647829Q, 2151.012241278362996194541735020086674113Q, 2402.949680908323672668281479483735120957Q, 2688.35009405274898539046388166782344203Q, 3012.148774428996002817780038366771869698Q, 3380.077927947738665430980404057153553452Q, 3798.8061171273287816025804901302085407Q, 4276.103940178038843575493542846970132437Q, 4821.041218620766468858314278886473414916Q, 5444.222094388470795213327524033646097556Q, 6158.065819431147727245029087643341223611Q, 6977.142718757731621969847227843666046181Q, 7918.57689772303460428259761072791249996Q, 9002.529841616973008609731087967074460965Q, 10252.78224006547697358532192963572223849Q, 11697.43531120386115196874312407799521273Q, 13369.75779118806422297716318991439523796Q, 15309.21083364664327603498100930983535561Q, 17562.690635400711230682290340971331153Q, 20186.03805526835731073576014831323115031Q, 23245.87631298432720823386094470123690508Q, 26821.8526708964660159886933177732467881Q, 31009.37861130203017968748996249105326523Q, 35922.98645004505473991896385042800280479Q, 41700.44988478085183088793644390235506667Q, 48507.85335185738720597387629792697758441Q, 56545.84243439263590453434852169343975209Q, 66057.34773622772120970119305119425356007Q, 77337.15125150264720189777207255380428642Q, 90743.76204222132276487959174812557638943Q, 106714.1931345439161543996792387468025379Q, 125782.3919792783606644548980631212452294Q, 148602.28308268868913284386494314759249Q, 175976.6472537126831529901228629810350888Q, 208893.4054123648023151893924130651509251Q, 248571.3198896581872265252528072315261787Q, 296517.7041099588785074932688713451965026Q, 354601.4842046107884858345245389612826445Q, 425145.9388942126878002415502363163400429Q, 511046.7307492540007761231679727362111046Q, 615922.5313638820825468503152050330940154Q, 744307.7672522774013301855992769478990101Q, 901899.9500280627208570829224628231273515Q, 1095877.943017809647466283294609129783732Q, 1335312.680400192900473900972313608959584Q, 1631698.732799417297778849111829227960256Q, 1999644.301287932721508706558730228833034Q, 2457769.533243204063209231606836355450074Q, 3029879.601126654923164320051829081011141Q, 3746501.296107716197697994644755801894388Q, 4646902.065144207843314545735079873944726Q, 5781751.367051714701608613666500464883081Q, 7216639.965420261461783043861588641172554Q, 9036748.91103818439407145784950842727797Q, 11353064.30295396674362518583710002098171Q, 14310677.38848294383826734043939982225179Q, 18099907.52814647757667209831825354212464Q, 22971259.6668891917836879617589957239566Q, 29255608.85808781354322251315088609515549Q, 37391535.59237359316460832559373862826806Q, 47962479.20390166985661378587634109109441Q, 61747421.18114908020763006555364067577321Q, 79790283.20014303517364767024983720002342Q, 103495309.7818322791392225142306514842407Q, 134758668.4335062392784062691770869168908Q, 176150727.1167647396710291203195515696546Q, 231169523.1730998536214569360302706436015Q, 304594644.4399651635506297387509567217169Q, 402983315.5328752866261842165179493486228Q, 535368712.0454349728436136721216726833139Q, 714247070.3053378406139506672831438081902Q, 956978978.7740373778892004432884152696425Q, 1287787251.056266365052170195833743740423Q, 1740617888.192125045084695206325485163025Q, 2363255270.596386879033770262261785331955Q, 3223268243.013810967426011910089526282321Q, 4416641191.505012065410596295491828581351Q, 6080361037.679268493630106361893438552833Q, 8410860300.522297192863904820721664748136Q, 11691170810.23185446900657258020662184426Q, 16331097466.34382519842012415317299709164Q, 22926949953.32506221058163368461899055449Q, 32350801251.34441900313971832417983264306Q, 45884550887.87373756921169916820389200205Q, 65422328991.26591065899030653729434101914Q, 93777690083.05024525805287034041120136343Q, 135152344877.9312446339111822592163115366Q, 195855262619.5102394227400235042902030497Q, 285411966950.5744584463492472652528305332Q, 418285339123.4088687905886483684441030554Q, 616560216997.1507015559128477210327029614Q, 914155798247.046721897379660004085140681Q, 1363474103153.313475332332520737128454563Q, 2045955806530.38080332307163606468874395Q, 3088941238912.347778181637746413811180547Q, 4692768203830.229326011299203618570047404Q, 7174593389222.668179510729483054183954121Q, 11039707421424.7535285760553205782673006Q, 17098339814642.30883189402376214028857248Q, 26658220492645.27096615518476281285140601Q, 41844137833284.34059723603044347303078534Q, 66131822092212.56260433143407179128676762Q, 105246004103885.8447522437221674794658493Q, 168681559938365.0716704855055188081332796Q, 272298230587943.4228747819094080068890302Q, 442778332914208.8581203935475801325800709Q, 725340820090340.5850347950296827399214103Q, 1197189129009285.106993300968997149725738Q, 1991130686955199.032617972879924186900084Q, 3337378010666735.506952950406469988115707Q, 5638099922749490.406581662527138521678621Q, 9601427499741881.211823807926750198760527Q, 16484254092349348.98845372947631486314024Q, 28535723974924115.84032543376000631602713Q, 49813965452361994.64837345276433255672811Q, 87702782408500507.02084267463945306822658Q, 155752125029829556.4155463030004333389455Q, 279043670263039211.1950144058463979753731Q, 504415149791330774.373714179037049083309Q, 920116740121384961.3827433654664139990454Q, 1693942563317466607.969360487779734224803Q, 3147881813588503606.949687187530927219109Q, 5905629394327348620.964750033118718606609Q, 11186830170429972683.90503304219913230732Q, 21399669223814878252.89102214192683014818Q, 41345985808186444702.65217417004483350894Q, 80696386697395085475.26410049325816995634Q, 159125037274329006606.8786857330403125667Q, 317071329836898082746.6238825600530512982Q, 638529399076067500974.9466574352370019617Q, 1299818924097534326158.990461297267263975Q, 2675078654074978206518.637506117225931Q, 5566944189022631213362.099038457498976086Q, 11716552341597990248990.5171435566483995Q, 24943805360858062472816.00063661308666544Q, 53725930189976218263874.47358413133583937Q, 117096316957750403564988.56304888156271Q, 258298292038703721390495.8236396936501247Q, 576767877261231270067849.8484954071029679Q, 1303963227039250295013435.358818079135299Q, 2985377159576379451118689.073633893728235Q, 6922912113704827260367186.083906017707785Q, 16263788067632228522850044.30274061276946Q, 38715669422591640446273220.48107692525781Q, 93405902326795746218849693.41808866100623Q, 228442062263956655676707457.4277829780059Q, 566480802429004551807161785.525553048924Q, 1424611114198876208195667756.664348169039Q, 3634172949857829218775326055.022683993536Q, 9406122364586675152583301141.322786625963Q, 24706464444758897130981477914.48038397415Q, 65872820457540932835165401933.67205736797Q, 178319944111489749419279438635.2410294258Q, 490225068350940521098480834251.6808904126Q, 1368984772740533848004072374113.409441503Q, 3884333014472347772834359801746.655971535Q, 11201029764013440779432129805270.58958674Q, 32834751787829632611461325466661.61440042Q, 97871488077698794764611261629326.14611831Q, 296714970484721897998030463296972.3588181Q, 915165168173240309272518702527005.381633Q, 2872460267173498910803623624768017.743058Q, 9177464747767130953083654377275067.095958Q, 29855687257363621764846076009157648.30726Q, 98921454300453615088000828632641016.23094Q, 333916858936387164243193277343677648.8645Q, 1148677119756490680705739927834502644.262Q, 4028085735873633572809913571370067079.051Q, 14403629095536081310122394964760721828.66Q, 52535284391711770924959341342130057524.83Q, 195511238702341217234148056362961569426.5Q, 742628359135587348679681010616409214772.4Q, 2879985786290129359256278011916116854096.0Q, 1.140696796840996797711738648003995766426e+40Q, 4.615889998203199535641248805067886524741e+40Q, 1.908941368569039653622830158192604926747e+41Q, 8.071058712835471546948188653318290734289e+41Q, 3.489959706112432919449108947044335064462e+42Q, 1.543888386814652700671726911000678239128e+43Q, 6.989932474233277622942141615547447627292e+43Q, 3.240038117762964872837102805973332306521e+44Q, 1.538183968209712484725068871595387907532e+45Q, 7.481883824192840270769874827358924746817e+45Q, 3.73013225339343201187931343434453690825e+46Q, 1.906851076505672829935280449453775492013e+47Q, 9.999077656071522270351775782972854776915e+47Q, 5.380563552050893470837576599671463394205e+48Q, 2.972330032282961488357047932157273938273e+49Q, 1.686348374699422063673300554972483611095e+50Q, 9.830168535442368803758339268296974599245e+50Q, 5.890108429190751064006128529315046824849e+51Q, 3.629296561939369243399179077578354993584e+52Q, 2.300645004501572067249374084078975050572e+53Q, 1.50106294849063099901010627951209585913e+54Q, 1.008480606717589095366587976999767304221e+55Q, 6.980007119035887928080977649978198675152e+55Q, 4.979288841677991603006522250488653330001e+56Q, 3.66276106448839180486992300970231614026e+57Q, 2.779646718727500962719473248533230654228e+58Q, 2.177326686395961419408952027332377399652e+59Q, 1.761274961525829532053705828024510976734e+60Q, 1.472042344123250900757337524678434441804e+61Q, 1.271822455421028839508598095571294694327e+62Q, 1.136508544602098866393539277964124525428e+63Q, 1.050968050635916077523427282417608640335e+64Q, 1.00626207712914662753370159827651041146e+65Q, 9.981030000833852218070495344493841448017e+65Q, 1.026180847075813778541059391701842979761e+67Q, 1.09421374737140946315988080967962942332e+68Q, 1.210763841397564590646317030645949174098e+69Q, 1.391069896832891097224590572614426931551e+70Q, 1.66045803643638884585898488848404012021e+71Q, 2.060428539953847004622281786713096894814e+72Q, 2.659520130664924331541795505319434146906e+73Q, 3.573013284264659144117143659354260264313e+74Q, 4.999486492804923952719809970672723582345e+75Q, 7.290439237429593217623599777130532573045e+76Q, 1.108669253112891672863961714590332883419e+78Q, 1.759370316250180690332753515259259156688e+79Q, 2.915485723182837008934603124966328270354e+80Q, 5.048461194348245760902730455814691168198e+81Q, 9.14118029796915194428405620075256632899e+82Q, 1.731992937477462342845227375134295284526e+84Q, 3.436376953072005833211777807213125461832e+85Q, 7.144658133694111972876923978928526300053e+86Q, 1.55778737763103944888409221887807238926e+88Q, 3.564561555743844052143091887908206876342e+89Q, 8.566541566276859225670891601341438867685e+90Q, 2.163923297209145308730010116371450613445e+92Q, 5.74984144627868535047457089036754294733e+93Q, 1.60839847723572274756032280074086871365e+95Q, 4.740310317452400773817968906768308847938e+96Q, 1.473168155068744631692643356229607264882e+98Q, 4.831622757046275226639687085840067067887e+99Q, 1.673775819766076748422178976772154137065e+101Q, 6.129702080773580414198288240232221663836e+102Q, 2.375195572649536955856341846366320025447e+104Q, 9.746830708765397472546215846003382904173e+105Q, 4.239588455190572482069216933841673146039e+107Q, 1.956494245370687105054870244894992250777e+109Q, 9.588102853447409054394849979650825404339e+110Q, 4.994557760892807128927411547962380678913e+112Q, 2.768146852290885169241442660307412799022e+114Q, 1.633928319786263704798907980813701003631e+116Q, 1.028156908727469064515118226996254551401e+118Q, 6.904080374041585885024483266963686212709e+119Q, 4.952411576392766271393256067965393360727e+121Q, 3.798774197493427340709475899043548697485e+123Q, 3.119209910408000389677151746883852508364e+125Q, 2.74464281329371919028887605085237578063e+127Q, 2.590837914912684682640131392851692377728e+129Q, 2.626566210336074467392696546232535266827e+131Q, 2.862979557234280901204803416309101850378e+133Q, 3.359121393671599351439597581159266025716e+135Q, 4.247313211033286464137443445775235101828e+137Q, 5.7942272714265457019323508964771867228e+139Q, 8.538645358004657015182819424098214783173e+141Q, 1.360888004282941018668670601150276254469e+144Q, 2.348723067724485698744588128779913095071e+146Q, 4.395029120308788033535362463288942558768e+148Q, 8.928228383284871526851861594213174257963e+150Q, 1.971533670422240464246243093548157857339e+153Q, 4.738589737247294610658233560831235896082e+155Q, 1.241308244941580876284153148872321788032e+158Q, 3.548824589134106728881153020185390663367e+160Q, 1.108821925774839482718156058757565092921e+163Q, 3.791568324747532283399755029435267152261e+165Q, 1.420930300659947104773952851462106093989e+168Q, 5.84453799109152853361078444336558106409e+170Q, 2.642333927756119541622130789938393830472e+173Q, 1.315018700128967486521348415446442009019e+176Q, 7.215055214056115599570975509522351983024e+178Q, 4.370972004835405599501947122396095759213e+181Q, 2.9283613461041822425605630116860831466e+184Q, 2.173040852495516111888092260762700043093e+187Q, 1.788985622982511228211473383825580284642e+190Q, 1.636634504773987713192039651921165926626e+193Q, 1.666570888998858107369856444049108728955e+196Q, 1.892151113181535234424384795106566625139e+199Q, 2.399341256020760750689416036737132433809e+202Q, 3.403990692562377717224530571668026437231e+205Q, 5.412684450566753125713167924326746292328e+208Q, 9.663735052574312957366051717393887459725e+211Q, 1.940785411690247394647362413292066051113e+215Q, 4.392532041151062373685805234839718468544e+218Q, 1.122469784801228315610393382333655697996e+222Q, 3.244792593820658963686565461190260558268e+225Q, 1.063151412606654581889047233605046614442e+229Q, 3.955995687476636211061457789343143304844e+232Q, 1.675093730347128892220647880504964819835e+236Q, 8.087770848773335454281892374161575798369e+239Q, 4.461929541005863065785797298033896045328e+243Q, 2.818594400456011731351928477247466992727e+247Q, 2.043076786152914736967629947070114858535e+251Q, 1.703020313436824993942113027133546248076e+255Q, 1.636038893251936899296016502545612941115e+259Q, 1.815418460356235422023246399959725267478e+263Q, 2.332142886850178672234463486793710072382e+267Q, 3.476404726198879520090342868431980509165e+271Q, 6.02725450669274575708398710171785543849e+275Q, 1.218304996377836253272518577114790751006e+280Q, 2.877990538823511127754633031010804415019e+284Q, 7.964996943223120262348859076890157988359e+288Q, 2.588973716628916728047311617227986411804e+293Q, 9.908669888497828069120771232809956622636e+297Q, 4.476782590934448698631648708447218305023e+302Q, 2.393946289872904750991457301609667478573e+307Q, 1.519194065472150234303611944283693040837e+312Q, 1.147184880467145335990085347869884772013e+317Q, 1.033627774385061887195237160951315788932e+322Q, 1.114329281092576402692439832629726866969e+327Q, 1.441479839401683621084678999839363913781e+332Q, 2.243859327319511203437262571615345659758e+337Q, 4.215418497025923051098094558302194889077e+342Q, 9.585829785115038185661111425389321480842e+347Q, 2.646481452232988267470696963344934626712e+353Q, 8.89784570848809579740737460434820021581e+358Q, 3.654478434391815119731593878923994274866e+364Q, 1.839328571998191153309682048643039357777e+370Q, 1.138091115297408561689593979279964151166e+376Q, 8.685420860596502744558689502785399264335e+381Q, 8.202294873735399393185427253762485343561e+387Q, 9.617622211012637558143840626406701008311e+393Q, 1.404972969423732814470812460457324672731e+400Q, 2.565898938978703228107858106775855677516e+406Q, 5.879082125410122180654821992667679428038e+412Q, 1.696012443986232559131127974976016333649e+419Q, 6.182635207061036709662140763355431230729e+425Q, 2.858535933001077693342990841750579771279e+432Q, 1.682537298081273384688483838923408088448e+439Q, 1.265575099379113494236586140787099830899e+446Q, 1.221210377447344985626110580846200012905e+453Q, 1.517665191579856561612622774652863045029e+460Q, 2.438792156389105075630091184035735481592e+467Q, 5.087970569512535749002437068314762668605e+474Q, 1.383791668577664156393179945731681404331e+482Q, 4.926818942421142280481071642006166530446e+489Q, 2.306079479408307605132901861123305364681e+497Q, 1.425163636904652491964810204050170654619e+505Q, 1.167988230033416008655199893436256564186e+513Q, 1.275046076993048598825372293330373578487e+521Q, 1.86246353592536022566810742828968418859e+529Q, 3.656923281780862954333590022998862124388e+537Q, 9.696905002869973525940370399688193605905e+545Q, 3.488948519517137250033917388900863677716e+554Q, 1.711541280860496566193503287636236147624e+563Q, 1.150354590150357338329469526604301396277e+572Q, 1.064586955227472600644681500814476378383e+581Q, 1.363399241303394867639622834102250083249e+590Q, 2.428730562379263868477135617904841079855e+599Q, 6.049324540156405309997840862794643030452e+608Q, 2.117864171596828953446343836759090767393e+618Q, 1.047807516700166731633507555828693597684e+628Q, 7.365840114672675880252522494113514523595e+637Q, 7.398145492560429927900357801839811327058e+647Q, 1.067636747584131414468100025618283209301e+658Q, 2.22639858034098687306401094797599805894e+668Q, 6.748057923046794570772294496845240165064e+678Q, 2.990257191488723121175096872976103128614e+689Q, 1.948901043872427503145006863820911627038e+700Q, 1.879581186786894369816802738913105922879e+711Q, 2.698997931735600125081085882104105417964e+722Q, 5.806794882741622880474886909554775109619e+733Q, 1.883770843607193027100793847871062947288e+745Q, 9.274404492358642603751756778289018245069e+756Q, 6.975307042717716858281521605314873677261e+768Q, 8.067850522456048441251197638882843500221e+780Q, 1.444817834210597780118974729779559393721e+793Q, 4.033842652061704730692481744304620504234e+805Q, 1.768122616586398867633690641669676999188e+818Q, 1.225400779279196264005900309164283624649e+831Q, 1.352538486275098128663407391866246559851e+844Q, 2.395022076176373866310260662550018260889e+857Q, 6.85473457159274328678409145257099377572e+870Q, 3.195043165613256224203167145283241373075e+884Q, 2.444011394541681034079796623093288489705e+898Q, 3.092132542900569483086826127272209424616e+912Q, 6.52202827899369001274608906112336954129e+926Q, 2.311918230803327273869816369617489055755e+941Q, 1.388602808524064591680879431092854078226e+956Q, 1.424970459220504800074970047827419053133e+971Q, 2.519528084028136647765117343629838887978e+986Q, 7.741747865648544410946053665346929221769e+1001Q, 4.170084664493231900748918523968910566173e+1017Q, 3.972609017709578843063743585633222829841e+1033Q, 6.753538916409713709617458845853916542168e+1049Q, 2.067628729105681113174425295794554011159e+1066Q, 1.150595286862592019698043377859855347102e+1083Q, 1.174811465056168119582538764054374610771e+1100Q, 2.222083328904688772385369058449897242601e+1117Q, 7.861682153952467469302910158034016013007e+1134Q, 5.254318461012202675141984565028119771927e+1152Q, 6.700594094583685233271878665147881576963e+1170Q, 1.647119020685994883163368465161853068246e+1189Q, 7.885690686668208640526803176415414652937e+1207Q, 7.4304751845758892706961097079985818407e+1226Q, 1.392792237173373732943845763489796692971e+1246Q, 5.249920365660960360703118769306589305549e+1265Q, 4.023402905801975410548914995317394511897e+1285Q, 6.339599284962247390595019787493325156388e+1305Q, 2.077241686093845039324765598314087816491e+1326Q, 1.431779975481430956320443955567912020619e+1347Q, 2.100465323416655119498460724075198611756e+1368Q, 6.636983859221341948458642440032983398444e+1389Q, 4.571823013121701821960348272081362696364e+1411Q, 6.950266919826043719478213435615389027377e+1433Q, 2.361135677422321798996803825169777731761e+1456Q, 1.81529414070336188314937395066678659112e+1479Q, 3.199377508347820763307843188560103423205e+1502Q, 1.309634685394754467330604052024343046006e+1526Q, 1.261723464022528810857575246242118215115e+1550Q, 2.899755666233745652203077582611886981277e+1574Q, 1.611713776270703974807271588562419300726e+1599Q, 2.19676411063602902712587963185490636918e+1624Q, 7.447023857089897627918973727754688355819e+1649Q, 6.369675504111348389431884118799197436233e+1675Q, 1.394815207171927514566140884379200385497e+1702Q, 7.936153825171883059251330198006999518483e+1728Q, 1.1910445325646918131560389884140321995e+1756Q, 4.787444622805551600670119808904041332089e+1783Q, 5.234499335419787802823707399035765773041e+1811Q, 1.581561346401448146226935104237919854933e+1840Q, 1.341800978646655211480455388688595380576e+1869Q, 3.248945821168265660658282098925159913182e+1898Q, 2.282556137907219990369095437167406320923e+1928Q, 4.731625652419454163270049779439076104421e+1958Q, 2.943806123841568264632623519839271578756e+1989Q, 5.592866921504286485703902089288874207169e+2020Q, 3.302335002048689098318554609779249829828e+2052Q, 6.169134926587465224122713900861282080699e+2084Q, 3.712967718086223830358857404823946563008e+2117Q, 7.333531367839546065849712040185078455141e+2150Q, 4.843145606030966902891830748397061937228e+2184Q, 1.089982666110516514588223374299888929834e+2219Q, 8.522650010812465527516484755846137052377e+2253Q, 2.3610765478146005801436450249132797273e+2289Q, 2.364162440159704628905098100196710729676e+2325Q, 8.731002547249769088070048025315387840088e+2361Q, 1.213938210671504830248830740465072981967e+2399Q, 6.488456377484030822273896401425291289227e+2436Q, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -525,4 +545,1458 @@ void exp_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 4>&)
 }
 }
 }
-#endif
+
+#endif // BOOST_MATH_HAS_NVRTC
+
+#ifdef BOOST_MATH_ENABLE_CUDA // BOOST_MATH_ENABLE_CUDA
+
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+namespace boost { 
+namespace math { 
+namespace quadrature {
+namespace detail {
+
+// In the CUDA case we break these down into a series of fixed size arrays and then make a pointer to the arrays
+// We can't use a 2D array because it takes up far too much memory that is primarily wasted space
+
+__constant__ float m_abscissas_float_1[9] =
+      { 3.47876573e-23f, 5.62503650e-09f, 9.95706124e-04f, 9.67438487e-02f, 7.43599217e-01f, 4.14293205e+00f, 
+        1.08086768e+02f, 4.56291316e+05f, 2.70123007e+15f, };
+
+__constant__ float m_abscissas_float_2[8] =
+      { 2.41870864e-14f, 1.02534662e-05f, 1.65637566e-02f, 3.11290799e-01f, 1.64691269e+00f, 1.49800773e+01f, 
+        2.57724301e+03f, 2.24833766e+09f, };
+
+__constant__ float m_abscissas_float_3[16] =
+      { 3.24983286e-18f, 2.51095186e-11f, 3.82035773e-07f, 1.33717837e-04f, 4.80260650e-03f, 4.41526928e-02f, 
+        1.83045938e-01f, 4.91960276e-01f, 1.10322609e+00f, 2.53681744e+00f, 7.39791792e+00f, 3.59560256e+01f, 
+        4.36061333e+02f, 2.49501460e+04f, 1.89216933e+07f, 1.03348694e+12f, };
+
+__constant__ float m_abscissas_float_4[33] =
+      { 1.51941172e-20f, 3.70201714e-16f, 9.67598102e-13f, 4.44773051e-10f, 5.28493928e-08f, 2.19158236e-06f, 
+        4.00799258e-05f, 3.88011529e-04f, 2.29325538e-03f, 9.25182629e-03f, 2.78117501e-02f, 6.67553298e-02f, 
+        1.35173168e-01f, 2.41374946e-01f, 3.94194704e-01f, 6.07196731e-01f, 9.06432514e-01f, 1.34481045e+00f, 
+        2.03268444e+00f, 3.21243032e+00f, 5.46310949e+00f, 1.03365745e+01f, 2.26486752e+01f, 6.03727778e+01f, 
+        2.08220266e+02f, 1.00431239e+03f, 7.47843388e+03f, 9.75279951e+04f, 2.61755592e+06f, 1.77776624e+08f, 
+        3.98255346e+10f, 4.13443763e+13f, 3.07708133e+17f, };
+
+__constant__ float m_abscissas_float_5[66] =
+      { 7.99409438e-22f, 2.41624595e-19f, 3.73461321e-17f, 3.19397902e-15f, 1.62042378e-13f, 5.18579386e-12f, 
+        1.10520072e-10f, 1.64548212e-09f, 1.78534009e-08f, 1.46529196e-07f, 9.40168786e-07f, 4.85507733e-06f, 
+        2.07038029e-05f, 7.45799409e-05f, 2.31536599e-04f, 6.30580368e-04f, 1.53035449e-03f, 3.35582040e-03f, 
+        6.73124842e-03f, 1.24856832e-02f, 2.16245309e-02f, 3.52720523e-02f, 5.45995171e-02f, 8.07587788e-02f, 
+        1.14840025e-01f, 1.57867103e-01f, 2.10837078e-01f, 2.74805391e-01f, 3.51015955e-01f, 4.41077540e-01f, 
+        5.47194016e-01f, 6.72466825e-01f, 8.21304567e-01f, 1.00000000e+00f, 1.21757511e+00f, 1.48706221e+00f, 
+        1.82750536e+00f, 2.26717507e+00f, 2.84887335e+00f, 3.63893880e+00f, 4.74299876e+00f, 6.33444194e+00f, 
+        8.70776542e+00f, 1.23825548e+01f, 1.83151803e+01f, 2.83510579e+01f, 4.62437776e+01f, 8.00917327e+01f, 
+        1.48560852e+02f, 2.97989725e+02f, 6.53443372e+02f, 1.58584068e+03f, 4.31897162e+03f, 1.34084311e+04f, 
+        4.83003053e+04f, 2.05969943e+05f, 1.06363880e+06f, 6.82457850e+06f, 5.60117371e+07f, 6.07724622e+08f, 
+        9.04813016e+09f, 1.92834507e+11f, 6.17122515e+12f, 3.13089095e+14f, 2.67765347e+16f, 4.13865153e+18f, };
+
+__constant__ float m_abscissas_float_6[132] =
+      { 1.70893932e-22f, 3.56621447e-21f, 6.19138882e-20f, 9.04299298e-19f, 1.12287188e-17f, 1.19706303e-16f, 
+        1.10583090e-15f, 8.92931857e-15f, 6.35404710e-14f, 4.01527389e-13f, 2.26955738e-12f, 1.15522811e-11f, 
+        5.32913181e-11f, 2.24130967e-10f, 8.64254491e-10f, 3.07161058e-09f, 1.01117742e-08f, 3.09775637e-08f, 
+        8.87004371e-08f, 2.38368096e-07f, 6.03520392e-07f, 1.44488635e-06f, 3.28212299e-06f, 7.09655821e-06f, 
+        1.46494407e-05f, 2.89537394e-05f, 5.49357161e-05f, 1.00313252e-04f, 1.76700203e-04f, 3.00920507e-04f, 
+        4.96484845e-04f, 7.95150594e-04f, 1.23845781e-03f, 1.87911525e-03f, 2.78210510e-03f, 4.02538552e-03f, 
+        5.70009588e-03f, 7.91020800e-03f, 1.07716137e-02f, 1.44106884e-02f, 1.89624177e-02f, 2.45682104e-02f, 
+        3.13735515e-02f, 3.95256605e-02f, 4.91713196e-02f, 6.04550279e-02f, 7.35176150e-02f, 8.84954195e-02f, 
+        1.05520113e-01f, 1.24719213e-01f, 1.46217318e-01f, 1.70138063e-01f, 1.96606781e-01f, 2.25753880e-01f,
+        2.57718900e-01f, 2.92655274e-01f, 3.30735809e-01f, 3.72158929e-01f, 4.17155794e-01f, 4.65998399e-01f,
+        5.19008863e-01f, 5.76570161e-01f, 6.39138643e-01f, 7.07258781e-01f, 7.81580731e-01f, 8.62881450e-01f, 
+        9.52090320e-01f, 1.05032052e+00f, 1.15890775e+00f, 1.27945836e+00f, 1.41390963e+00f, 1.56460576e+00f,
+        1.73439430e+00f, 1.92674937e+00f, 2.14593012e+00f, 2.39718593e+00f, 2.68702407e+00f, 3.02356133e+00f,
+        3.41698950e+00f, 3.88019661e+00f, 4.42960272e+00f, 5.08629455e+00f, 5.87757956e+00f, 6.83913514e+00f,
+        8.01801085e+00f, 9.47686632e+00f, 1.13000199e+01f, 1.36021823e+01f, 1.65412214e+01f, 2.03370584e+01f, 
+        2.53000199e+01f, 3.18739815e+01f, 4.07030054e+01f, 5.27358913e+01f, 6.93929374e+01f, 9.28366010e+01f,
+        1.26418926e+02f, 1.75435645e+02f, 2.48423411e+02f, 3.59440052e+02f, 5.32165336e+02f, 8.07455844e+02f,
+        1.25762341e+03f, 2.01416017e+03f, 3.32313676e+03f, 5.65930306e+03f, 9.96877263e+03f, 1.82030939e+04f,
+        3.45378531e+04f, 6.82619916e+04f, 1.40913380e+05f, 3.04680844e+05f, 6.92095957e+05f, 1.65694484e+06f,
+        4.19519229e+06f, 1.12739016e+07f, 3.22814282e+07f, 9.88946136e+07f, 3.25562103e+08f, 1.15706659e+09f,
+        4.46167708e+09f, 1.87647826e+10f, 8.65629909e+10f, 4.40614549e+11f, 2.49049013e+12f, 1.57380011e+13f,
+        1.11990629e+14f, 9.04297390e+14f, 8.35377903e+15f, 8.90573552e+16f, 1.10582857e+18f, 1.61514650e+19f, };
+
+__constant__ float m_abscissas_float_7[263] =
+      { 7.75845008e-23f, 3.71846701e-22f, 1.69833677e-21f, 7.40284853e-21f, 3.08399399e-20f, 1.22962599e-19f, 
+        4.69855182e-19f, 1.72288020e-18f, 6.07012059e-18f, 2.05742924e-17f, 6.71669437e-17f, 2.11441966e-16f, 
+        6.42566550e-16f, 1.88715605e-15f, 5.36188198e-15f, 1.47533056e-14f, 3.93507835e-14f, 1.01841667e-13f,
+        2.55981752e-13f, 6.25453236e-13f, 1.48683211e-12f, 3.44173601e-12f, 7.76421789e-12f, 1.70831312e-11f,
+        3.66877698e-11f, 7.69632540e-11f, 1.57822184e-10f, 3.16577320e-10f, 6.21604166e-10f, 1.19551931e-09f,
+        2.25364361e-09f, 4.16647469e-09f, 7.55905964e-09f, 1.34658870e-08f, 2.35675936e-08f, 4.05458117e-08f,
+        6.86052525e-08f, 1.14227960e-07f, 1.87243781e-07f, 3.02323521e-07f, 4.81026747e-07f, 7.54564302e-07f,
+        1.16746531e-06f, 1.78236867e-06f, 2.68618781e-06f, 3.99792342e-06f, 5.87841837e-06f, 8.54236163e-06f,
+        1.22728487e-05f, 1.74387947e-05f, 2.45154696e-05f, 3.41083807e-05f, 4.69806683e-05f, 6.40841007e-05f,
+        8.65936597e-05f, 1.15945600e-04f, 1.53878746e-04f, 2.02478652e-04f, 2.64224143e-04f, 3.42035594e-04f,
+        4.39324211e-04f, 5.60041454e-04f, 7.08727668e-04f, 8.90558896e-04f, 1.11139085e-03f, 1.37779898e-03f,
+        1.69711358e-03f, 2.07744903e-03f, 2.52772622e-03f, 3.05768742e-03f, 3.67790298e-03f, 4.39976940e-03f,
+        5.23549846e-03f, 6.19809738e-03f, 7.30134015e-03f, 8.55973022e-03f, 9.98845520e-03f, 1.16033342e-02f,
+        1.34207587e-02f, 1.54576276e-02f, 1.77312787e-02f, 2.02594158e-02f, 2.30600348e-02f, 2.61513493e-02f,
+        2.95517158e-02f, 3.32795626e-02f, 3.73533204e-02f, 4.17913590e-02f, 4.66119283e-02f, 5.18331072e-02f,
+        5.74727595e-02f, 6.35484986e-02f, 7.00776615e-02f, 7.70772927e-02f, 8.45641386e-02f, 9.25546518e-02f,
+        1.01065008e-01f, 1.10111132e-01f, 1.19708739e-01f, 1.29873379e-01f, 1.40620505e-01f, 1.51965539e-01f,
+        1.63923958e-01f, 1.76511391e-01f, 1.89743720e-01f, 2.03637197e-01f, 2.18208574e-01f, 2.33475238e-01f,
+        2.49455360e-01f, 2.66168055e-01f, 2.83633553e-01f, 3.01873381e-01f, 3.20910560e-01f, 3.40769809e-01f,
+        3.61477772e-01f, 3.83063247e-01f, 4.05557445e-01f, 4.28994258e-01f, 4.53410546e-01f, 4.78846448e-01f,
+        5.05345717e-01f, 5.32956079e-01f, 5.61729623e-01f, 5.91723220e-01f, 6.22998983e-01f, 6.55624768e-01f,
+        6.89674714e-01f, 7.25229845e-01f, 7.62378724e-01f, 8.01218171e-01f, 8.41854062e-01f, 8.84402205e-01f,
+        9.28989312e-01f, 9.75754080e-01f, 1.02484839e+00f, 1.07643865e+00f, 1.13070727e+00f, 1.18785434e+00f,
+        1.24809950e+00f, 1.31168403e+00f, 1.37887320e+00f, 1.44995892e+00f, 1.52526270e+00f, 1.60513906e+00f,
+        1.68997931e+00f, 1.78021589e+00f, 1.87632722e+00f, 1.97884333e+00f, 2.08835213e+00f, 2.20550671e+00f,
+        2.33103353e+00f, 2.46574193e+00f, 2.61053497e+00f, 2.76642183e+00f, 2.93453226e+00f, 3.11613304e+00f,
+        3.31264716e+00f, 3.52567596e+00f, 3.75702486e+00f, 4.00873326e+00f, 4.28310945e+00f, 4.58277134e+00f,
+        4.91069419e+00f, 5.27026666e+00f, 5.66535674e+00f, 6.10038953e+00f, 6.58043928e+00f, 7.11133842e+00f,
+        7.69980735e+00f, 8.35360902e+00f, 9.08173387e+00f, 9.89462150e+00f, 1.08044272e+01f, 1.18253437e+01f,
+        1.29739897e+01f, 1.42698826e+01f, 1.57360130e+01f, 1.73995473e+01f, 1.92926887e+01f, 2.14537359e+01f,
+        2.39283915e+01f, 2.67713817e+01f, 3.00484719e+01f, 3.38389827e+01f, 3.82389447e+01f, 4.33650689e+01f,
+        4.93597649e+01f, 5.63975118e+01f, 6.46929803e+01f, 7.45114359e+01f, 8.61821250e+01f, 1.00115581e+02f,
+        1.16826112e+02f, 1.36961158e+02f, 1.61339834e+02f, 1.91003781e+02f, 2.27284639e+02f, 2.71894067e+02f,
+        3.27044548e+02f, 3.95612465e+02f, 4.81359585e+02f, 5.89235756e+02f, 7.25795284e+02f, 8.99773468e+02f,
+        1.12289036e+03f, 1.41097920e+03f, 1.78558211e+03f, 2.27622329e+03f, 2.92367233e+03f, 3.78466551e+03f,
+        4.93879227e+03f, 6.49862329e+03f, 8.62473434e+03f, 1.15481896e+04f, 1.56044945e+04f, 2.12853507e+04f,
+        2.93183077e+04f, 4.07905708e+04f, 5.73434125e+04f, 8.14806753e+04f, 1.17063646e+05f, 1.70113785e+05f,
+        2.50129854e+05f, 3.72274789e+05f, 5.61051155e+05f, 8.56556497e+05f, 1.32526810e+06f, 2.07888648e+06f,
+        3.30771485e+06f, 5.34063130e+06f, 8.75442405e+06f, 1.45761434e+07f, 2.46634599e+07f, 4.24311457e+07f,
+        7.42617251e+07f, 1.32291588e+08f, 2.40011058e+08f, 4.43725882e+08f, 8.36456588e+08f, 1.60874083e+09f,
+        3.15878598e+09f, 6.33624483e+09f, 1.29932136e+10f, 2.72570398e+10f, 5.85372779e+10f, 1.28795973e+11f,
+        2.90551047e+11f, 6.72570892e+11f, 1.59884056e+12f, 3.90652847e+12f, 9.81916374e+12f, 2.54124546e+13f,
+        6.77814197e+13f, 1.86501681e+14f, 5.29897885e+14f, 1.55625904e+15f, 4.72943011e+15f, 1.48882761e+16f,
+        4.86043448e+16f, 1.64741373e+17f, 5.80423410e+17f, 2.12831536e+18f, 8.13255421e+18f, };
+
+__constant__ float m_abscissas_float_8[527] =
+      { 5.20331508e-23f, 1.15324162e-22f, 2.52466875e-22f, 5.46028730e-22f, 1.16690465e-21f, 2.46458927e-21f,
+        5.14543768e-21f, 1.06205431e-20f, 2.16767715e-20f, 4.37564009e-20f, 8.73699691e-20f, 1.72595588e-19f,
+        3.37377643e-19f, 6.52669145e-19f, 1.24976973e-18f, 2.36916845e-18f, 4.44691383e-18f, 8.26580373e-18f,
+        1.52174118e-17f, 2.77517606e-17f, 5.01415830e-17f, 8.97689232e-17f, 1.59270821e-16f, 2.80084735e-16f,
+        4.88253693e-16f, 8.43846463e-16f, 1.44610939e-15f, 2.45762595e-15f, 4.14251017e-15f, 6.92627770e-15f,
+        1.14889208e-14f, 1.89084205e-14f, 3.08802476e-14f, 5.00504297e-14f, 8.05169965e-14f, 1.28579121e-13f,
+        2.03847833e-13f, 3.20880532e-13f, 5.01568631e-13f, 7.78600100e-13f, 1.20044498e-12f, 1.83848331e-12f,
+        2.79712543e-12f, 4.22808302e-12f, 6.35035779e-12f, 9.47805307e-12f, 1.40588174e-11f, 2.07266430e-11f,
+        3.03739182e-11f, 4.42491437e-11f, 6.40886341e-11f, 9.22929507e-11f, 1.32161843e-10f, 1.88205259e-10f,
+        2.66552657e-10f, 3.75488615e-10f, 5.26149742e-10f, 7.33426418e-10f, 1.01712318e-09f, 1.40344387e-09f,
+        1.92688222e-09f, 2.63261606e-09f, 3.57952343e-09f, 4.84396276e-09f, 6.52448685e-09f, 8.74769197e-09f,
+        1.16754399e-08f, 1.55137320e-08f, 2.05235608e-08f, 2.70341184e-08f, 3.54587968e-08f, 4.63144836e-08f,
+        6.02447248e-08f, 7.80474059e-08f, 1.00707687e-07f, 1.29437018e-07f, 1.65719157e-07f, 2.11364220e-07f,
+        2.68571894e-07f, 3.40005066e-07f, 4.28875221e-07f, 5.39041105e-07f, 6.75122241e-07f, 8.42629031e-07f,
+        1.04811127e-06f, 1.29932703e-06f, 1.60543396e-06f, 1.97720518e-06f, 2.42727196e-06f, 2.97039558e-06f,
+        3.62377065e-06f, 4.40736236e-06f, 5.34428013e-06f, 6.46118994e-06f, 7.78876789e-06f, 9.36219733e-06f,
+        1.12217116e-05f, 1.34131848e-05f, 1.59887725e-05f, 1.90076038e-05f, 2.25365270e-05f, 2.66509096e-05f,
+        3.14354940e-05f, 3.69853096e-05f, 4.34066412e-05f, 5.08180543e-05f, 5.93514765e-05f, 6.91533342e-05f,
+        8.03857429e-05f, 9.32277499e-05f, 1.07876627e-04f, 1.24549208e-04f, 1.43483273e-04f, 1.64938971e-04f,
+        1.89200275e-04f, 2.16576471e-04f, 2.47403671e-04f, 2.82046341e-04f, 3.20898851e-04f, 3.64387021e-04f,
+        4.12969671e-04f, 4.67140163e-04f, 5.27427922e-04f, 5.94399942e-04f, 6.68662248e-04f, 7.50861330e-04f,
+        8.41685517e-04f, 9.41866302e-04f, 1.05217960e-03f, 1.17344692e-03f, 1.30653650e-03f, 1.45236427e-03f,
+        1.61189482e-03f, 1.78614219e-03f, 1.97617055e-03f, 2.18309485e-03f, 2.40808123e-03f, 2.65234740e-03f,
+        2.91716284e-03f, 3.20384886e-03f, 3.51377855e-03f, 3.84837661e-03f, 4.20911898e-03f, 4.59753235e-03f,
+        5.01519359e-03f, 5.46372894e-03f, 5.94481312e-03f, 6.46016832e-03f, 7.01156301e-03f, 7.60081065e-03f,
+        8.22976829e-03f, 8.90033499e-03f, 9.61445021e-03f, 1.03740920e-02f, 1.11812753e-02f, 1.20380497e-02f, 
+        1.29464978e-02f, 1.39087327e-02f, 1.49268962e-02f, 1.60031562e-02f, 1.71397050e-02f, 1.83387564e-02f,
+        1.96025436e-02f, 2.09333170e-02f, 2.23333419e-02f, 2.38048956e-02f, 2.53502659e-02f, 2.69717481e-02f,
+        2.86716433e-02f, 3.04522558e-02f, 3.23158911e-02f, 3.42648538e-02f, 3.63014456e-02f, 3.84279634e-02f,
+        4.06466974e-02f, 4.29599296e-02f, 4.53699317e-02f, 4.78789641e-02f, 5.04892744e-02f, 5.32030959e-02f,
+        5.60226468e-02f, 5.89501290e-02f, 6.19877276e-02f, 6.51376099e-02f, 6.84019251e-02f, 7.17828036e-02f,
+        7.52823576e-02f, 7.89026802e-02f, 8.26458461e-02f, 8.65139116e-02f, 9.05089155e-02f, 9.46328794e-02f,
+        9.88878087e-02f, 1.03275694e-01f, 1.07798510e-01f, 1.12458223e-01f, 1.17256783e-01f, 1.22196135e-01f,
+        1.27278214e-01f, 1.32504950e-01f, 1.37878272e-01f, 1.43400107e-01f, 1.49072382e-01f, 1.54897032e-01f,
+        1.60875997e-01f, 1.67011231e-01f, 1.73304700e-01f, 1.79758387e-01f, 1.86374297e-01f, 1.93154462e-01f,
+        2.00100939e-01f, 2.07215821e-01f, 2.14501238e-01f, 2.21959362e-01f, 2.29592410e-01f, 2.37402653e-01f,
+        2.45392415e-01f, 2.53564085e-01f, 2.61920117e-01f, 2.70463037e-01f, 2.79195450e-01f, 2.88120044e-01f,
+        2.97239599e-01f, 3.06556989e-01f, 3.16075193e-01f, 3.25797297e-01f, 3.35726506e-01f, 3.45866147e-01f,
+        3.56219679e-01f, 3.66790698e-01f, 3.77582948e-01f, 3.88600328e-01f, 3.99846898e-01f, 4.11326892e-01f,
+        4.23044723e-01f, 4.35004995e-01f, 4.47212512e-01f, 4.59672288e-01f, 4.72389556e-01f, 4.85369781e-01f,
+        4.98618671e-01f, 5.12142186e-01f, 5.25946554e-01f, 5.40038281e-01f, 5.54424165e-01f, 5.69111309e-01f,
+        5.84107138e-01f, 5.99419409e-01f, 6.15056232e-01f, 6.31026081e-01f, 6.47337815e-01f, 6.64000696e-01f,
+        6.81024405e-01f, 6.98419060e-01f, 7.16195243e-01f, 7.34364016e-01f, 7.52936944e-01f, 7.71926120e-01f,
+        7.91344191e-01f, 8.11204381e-01f, 8.31520518e-01f, 8.52307069e-01f, 8.73579162e-01f, 8.95352625e-01f,
+        9.17644013e-01f, 9.40470650e-01f, 9.63850664e-01f, 9.87803022e-01f, 1.01234758e+00f, 1.03750512e+00f,
+        1.06329740e+00f, 1.08974721e+00f, 1.11687839e+00f, 1.14471595e+00f, 1.17328606e+00f, 1.20261614e+00f,
+        1.23273496e+00f, 1.26367264e+00f, 1.29546076e+00f, 1.32813247e+00f, 1.36172249e+00f, 1.39626730e+00f,
+        1.43180514e+00f, 1.46837616e+00f, 1.50602252e+00f, 1.54478848e+00f, 1.58472055e+00f, 1.62586760e+00f,
+        1.66828098e+00f, 1.71201469e+00f, 1.75712551e+00f, 1.80367319e+00f, 1.85172058e+00f, 1.90133388e+00f,
+        1.95258276e+00f, 2.00554062e+00f, 2.06028484e+00f, 2.11689693e+00f, 2.17546288e+00f, 2.23607339e+00f,
+        2.29882418e+00f, 2.36381627e+00f, 2.43115639e+00f, 2.50095725e+00f, 2.57333803e+00f, 2.64842468e+00f,
+        2.72635049e+00f, 2.80725648e+00f, 2.89129193e+00f, 2.97861498e+00f, 3.06939317e+00f, 3.16380413e+00f,
+        3.26203621e+00f, 3.36428929e+00f, 3.47077553e+00f, 3.58172026e+00f, 3.69736291e+00f, 3.81795798e+00f,
+        3.94377618e+00f, 4.07510558e+00f, 4.21225285e+00f, 4.35554468e+00f, 4.50532923e+00f, 4.66197775e+00f,
+        4.82588634e+00f, 4.99747780e+00f, 5.17720373e+00f, 5.36554672e+00f, 5.56302277e+00f, 5.77018396e+00f,
+        5.98762126e+00f, 6.21596768e+00f, 6.45590164e+00f, 6.70815069e+00f, 6.97349551e+00f, 7.25277437e+00f,
+        7.54688785e+00f, 7.85680417e+00f, 8.18356491e+00f, 8.52829128e+00f, 8.89219104e+00f, 9.27656603e+00f,
+        9.68282047e+00f, 1.01124700e+01f, 1.05671518e+01f, 1.10486353e+01f, 1.15588347e+01f, 1.20998217e+01f,
+        1.26738407e+01f, 1.32833247e+01f, 1.39309131e+01f, 1.46194716e+01f, 1.53521138e+01f, 1.61322255e+01f,
+        1.69634913e+01f, 1.78499242e+01f, 1.87958987e+01f, 1.98061868e+01f, 2.08859991e+01f, 2.20410294e+01f,
+        2.32775056e+01f, 2.46022448e+01f, 2.60227166e+01f, 2.75471124e+01f, 2.91844234e+01f, 3.09445281e+01f,
+        3.28382897e+01f, 3.48776660e+01f, 3.70758319e+01f, 3.94473180e+01f, 4.20081658e+01f, 4.47761023e+01f,
+        4.77707378e+01f, 5.10137879e+01f, 5.45293247e+01f, 5.83440613e+01f, 6.24876734e+01f, 6.69931639e+01f,
+        7.18972765e+01f, 7.72409663e+01f, 8.30699343e+01f, 8.94352364e+01f, 9.63939781e+01f, 1.04010108e+02f,
+        1.12355322e+02f, 1.21510104e+02f, 1.31564914e+02f, 1.42621552e+02f, 1.54794728e+02f, 1.68213867e+02f,
+        1.83025185e+02f, 1.99394097e+02f, 2.17507985e+02f, 2.37579409e+02f, 2.59849828e+02f, 2.84593917e+02f,
+        3.12124587e+02f, 3.42798827e+02f, 3.77024517e+02f, 4.15268384e+02f, 4.58065302e+02f, 5.06029199e+02f,
+        5.59865843e+02f, 6.20387872e+02f, 6.88532497e+02f, 7.65382367e+02f, 8.52190227e+02f, 9.50408087e+02f,
+        1.06172182e+03f, 1.18809220e+03f, 1.33180384e+03f, 1.49552334e+03f, 1.68236894e+03f, 1.89599367e+03f,
+        2.14068513e+03f, 2.42148533e+03f, 2.74433485e+03f, 3.11624675e+03f, 3.54551666e+03f, 4.04197722e+03f,
+        4.61730674e+03f, 5.28540457e+03f, 6.06284853e+03f, 6.96945350e+03f, 8.02895513e+03f, 9.26984864e+03f,
+        1.07264200e+04f, 1.24400169e+04f, 1.44606187e+04f, 1.68487805e+04f, 1.96780458e+04f, 2.30379493e+04f,
+        2.70377620e+04f, 3.18111749e+04f, 3.75221715e+04f, 4.43724093e+04f, 5.26105241e+04f, 6.25438881e+04f,
+        7.45535092e+04f, 8.91129656e+04f, 1.06812532e+05f, 1.28390012e+05f, 1.54770253e+05f, 1.87115940e+05f,
+        2.26893075e+05f, 2.75955654e+05f, 3.36655497e+05f, 4.11985149e+05f, 5.05764405e+05f, 6.22884544e+05f,
+        7.69629183e+05f, 9.54097173e+05f, 1.18676186e+06f, 1.48121324e+06f, 1.85514609e+06f, 2.33168052e+06f,
+        2.94113264e+06f, 3.72339780e+06f, 4.73116974e+06f, 6.03430539e+06f, 7.72576515e+06f, 9.92972861e+06f,
+        1.28127257e+07f, 1.65989637e+07f, 2.15915179e+07f, 2.82017465e+07f, 3.69902945e+07f, 4.87244884e+07f,
+        6.44590226e+07f, 8.56498776e+07f, 1.14315868e+08f, 1.53268759e+08f, 2.06442545e+08f, 2.79366798e+08f,
+        3.79850300e+08f, 5.18973079e+08f, 7.12532948e+08f, 9.83165083e+08f, 1.36346329e+09f, 1.90059962e+09f,
+        2.66319659e+09f, 3.75160395e+09f, 5.31334782e+09f, 7.56648043e+09f, 1.08350637e+10f, 1.56033907e+10f,
+        2.25993074e+10f, 3.29229832e+10f, 4.82470799e+10f, 7.11297379e+10f, 1.05506900e+11f, 1.57471442e+11f,
+        2.36513804e+11f, 3.57509889e+11f, 5.43926613e+11f, 8.33024431e+11f, 1.28435637e+12f, 1.99374510e+12f,
+        3.11642465e+12f, 4.90561997e+12f, 7.77731247e+12f, 1.24197380e+13f, 1.99798484e+13f, 3.23831600e+13f,
+        5.28864904e+13f, 8.70403770e+13f, 1.44377694e+14f, 2.41399528e+14f, 4.06896744e+14f, 6.91510621e+14f,
+        1.18504970e+15f, 2.04811559e+15f, 3.57034809e+15f, 6.27861398e+15f, 1.11397125e+16f, 1.99435267e+16f,
+        3.60337498e+16f, 6.57141972e+16f, 1.20980371e+17f, 2.24875057e+17f, 4.22089025e+17f, 8.00147402e+17f,
+        1.53216987e+18f, 2.96403754e+18f, 5.79389087e+18f, 1.14455803e+19f, 2.28537992e+19f, };
+
+__constant__ float* m_abscissas_float[8] = {
+    m_abscissas_float_1,
+    m_abscissas_float_2,
+    m_abscissas_float_3,
+    m_abscissas_float_4,
+    m_abscissas_float_5,
+    m_abscissas_float_6,
+    m_abscissas_float_7,
+    m_abscissas_float_8,
+};
+
+__constant__ float m_weights_float_1[9] = 
+      { 1.79979618e-21f, 1.07218106e-07f, 7.05786060e-03f, 2.72310168e-01f, 1.18863515e+00f, 8.77655464e+00f, 
+        5.33879432e+02f, 5.98892409e+06f, 9.60751551e+16f, };
+
+__constant__ float m_weights_float_2[8] =
+      { 7.59287827e-13f, 1.18886775e-04f, 7.27332179e-02f, 6.09156795e-01f, 2.71431234e+00f, 4.68800805e+01f, 
+        2.06437304e+04f, 4.85431236e+10f, };
+
+__constant__ float m_weights_float_3[16] = 
+      { 1.30963564e-16f, 6.14135316e-10f, 5.67743391e-06f, 1.21108690e-03f, 2.67259824e-02f, 1.54234107e-01f, 
+        4.23412860e-01f, 8.47913037e-01f, 1.73632925e+00f, 4.63203354e+00f, 1.88206826e+01f, 1.40643917e+02f, 
+        2.73736946e+03f, 2.55633252e+05f, 3.18438602e+08f, 2.86363931e+13f, };
+
+__constant__ float m_weights_float_4[33] = 
+      { 6.93769555e-19f, 1.31670336e-14f, 2.68107110e-11f, 9.60294960e-09f, 8.89417585e-07f, 2.87650015e-05f, 
+        4.10649371e-04f, 3.10797444e-03f, 1.43958814e-02f, 4.56980985e-02f, 1.08787148e-01f, 2.08910486e-01f,
+        3.43887471e-01f, 5.11338439e-01f, 7.19769211e-01f, 1.00073403e+00f, 1.42660267e+00f, 2.14966467e+00f,
+        3.50341221e+00f, 6.28632057e+00f, 1.26369961e+01f, 2.90949180e+01f, 7.91163114e+01f, 2.65103292e+02f,
+        1.15872311e+03f, 7.11886439e+03f, 6.77324248e+04f, 1.13081650e+06f, 3.88995005e+07f, 3.38857764e+09f,
+        9.74063570e+11f, 1.29789430e+15f, 1.24001927e+19f, };
+
+__constant__ float m_weights_float_5[66] = 
+      { 3.88541434e-20f, 1.03646493e-17f, 1.41388360e-15f, 1.06725054e-13f, 4.77908002e-12f, 1.34999345e-10f,
+        2.53970414e-09f, 3.33804787e-08f, 3.19755978e-07f, 2.31724882e-06f, 1.31302324e-05f, 5.98917639e-05f,
+        2.25650360e-04f, 7.18397083e-04f, 1.97196929e-03f, 4.75106406e-03f, 1.02072514e-02f, 1.98317011e-02f,
+        3.52844239e-02f, 5.81350403e-02f, 8.95955146e-02f, 1.30335749e-01f, 1.80445384e-01f, 2.39557131e-01f,
+        3.07102681e-01f, 3.82648608e-01f, 4.66260909e-01f, 5.58867257e-01f, 6.62616429e-01f, 7.81267733e-01f,
+        9.20677638e-01f, 1.08949034e+00f, 1.30019425e+00f, 1.57079633e+00f, 1.92752387e+00f, 2.40924883e+00f,
+        3.07485695e+00f, 4.01578082e+00f, 5.37784753e+00f, 7.40045071e+00f, 1.04890228e+01f, 1.53538346e+01f,
+        2.32861156e+01f, 3.67307348e+01f, 6.05296516e+01f, 1.04761593e+02f, 1.91598840e+02f, 3.72918009e+02f,
+        7.78738763e+02f, 1.76101294e+03f, 4.35837629e+03f, 1.19484066e+04f, 3.67841605e+04f, 1.29157756e+05f,
+        5.26424122e+05f, 2.54082527e+06f, 1.48545930e+07f, 1.07925566e+08f, 1.00317513e+09f, 1.23283860e+10f,
+        2.07922173e+11f, 5.01997049e+12f, 1.82006578e+14f, 1.04617001e+16f, 1.01373023e+18f, 1.77530238e+20f, };
+
+__constant__ float m_weights_float_6[132] = 
+      { 8.56958007e-21f, 1.68000718e-19f, 2.74008750e-18f, 3.75978801e-17f, 4.38589881e-16f, 4.39263787e-15f,
+        3.81223973e-14f, 2.89198757e-13f, 1.93338859e-12f, 1.14783389e-11f, 6.09544349e-11f, 2.91499607e-10f,
+        1.26339559e-09f, 4.99234840e-09f, 1.80872790e-08f, 6.03998541e-08f, 1.86829770e-07f, 5.37807971e-07f,
+        1.44704121e-06f, 3.65421571e-06f, 8.69454276e-06f, 1.95621880e-05f, 4.17628758e-05f, 8.48713297e-05f,
+        1.64680159e-04f, 3.05960283e-04f, 5.45748909e-04f, 9.36950301e-04f, 1.55189915e-03f, 2.48542560e-03f,
+        3.85690505e-03f, 5.81079770e-03f, 8.51529070e-03f, 1.21588421e-02f, 1.69446644e-02f, 2.30834400e-02f,
+        3.07847946e-02f, 4.02482241e-02f, 5.16542634e-02f, 6.51566792e-02f, 8.08763802e-02f, 9.88975757e-02f,
+        1.19266512e-01f, 1.41992893e-01f, 1.67053901e-01f, 1.94400532e-01f, 2.23965873e-01f, 2.55674859e-01f,
+        2.89455038e-01f, 3.25247905e-01f, 3.63020457e-01f, 4.02776696e-01f, 4.44568958e-01f, 4.88509042e-01f,
+        5.34779290e-01f, 5.83643845e-01f, 6.35460497e-01f, 6.90693630e-01f, 7.49928915e-01f, 8.13890578e-01f,
+        8.83462209e-01f, 9.59712352e-01f, 1.04392634e+00f, 1.13764623e+00f, 1.24272128e+00f, 1.36137177e+00f,
+        1.49627028e+00f, 1.65064527e+00f, 1.82841374e+00f, 2.03435175e+00f, 2.27431458e+00f, 2.55552245e+00f,
+        2.88693336e+00f, 3.27973254e+00f, 3.74797919e+00f, 4.30946679e+00f, 4.98687594e+00f, 5.80933099e+00f,
+        6.81451887e+00f, 8.05159726e+00f, 9.58522167e+00f, 1.15011733e+01f, 1.39143002e+01f, 1.69798351e+01f,
+        2.09096993e+01f, 2.59962450e+01f, 3.26472377e+01f, 4.14380231e+01f, 5.31903193e+01f, 6.90928164e+01f,
+        9.08883744e+01f, 1.21168895e+02f, 1.63847041e+02f, 2.24923217e+02f, 3.13754154e+02f, 4.45189215e+02f,
+        6.43236850e+02f, 9.47484116e+02f, 1.42457583e+03f, 2.18920236e+03f, 3.44338342e+03f, 5.55184130e+03f,
+        9.19045432e+03f, 1.56468513e+04f, 2.74471462e+04f, 4.97037777e+04f, 9.31107740e+04f, 1.80835335e+05f,
+        3.64968793e+05f, 7.67360053e+05f, 1.68525439e+06f, 3.87686515e+06f, 9.37022570e+06f, 2.38705733e+07f,
+        6.43128750e+07f, 1.83920179e+08f, 5.60444636e+08f, 1.82722217e+09f, 6.40182180e+09f, 2.42153053e+10f,
+        9.93804949e+10f, 4.44863150e+11f, 2.18425069e+12f, 1.18337660e+13f, 7.11948688e+13f, 4.78870731e+14f,
+        3.62710215e+15f, 3.11747341e+16f, 3.06542975e+17f, 3.47854955e+18f, 4.59768243e+19f, 7.14806140e+20f, };
+
+__constant__ float m_weights_float_7[263] = 
+      { 3.95175890e-21f, 1.83575349e-20f, 8.12661397e-20f, 3.43336935e-19f, 1.38634563e-18f, 5.35757029e-18f, 
+        1.98424944e-17f, 7.05221126e-17f, 2.40827550e-16f, 7.91175869e-16f, 2.50347754e-15f, 7.63871031e-15f,
+        2.25003103e-14f, 6.40502166e-14f, 1.76389749e-13f, 4.70424252e-13f, 1.21618334e-12f, 3.05082685e-12f,
+        7.43273471e-12f, 1.76028616e-11f, 4.05602375e-11f, 9.10055013e-11f, 1.98994391e-10f, 4.24390078e-10f,
+        8.83436580e-10f, 1.79636925e-09f, 3.57059250e-09f, 6.94247187e-09f, 1.32133371e-08f, 2.46332536e-08f,
+        4.50110843e-08f, 8.06630537e-08f, 1.41856144e-07f, 2.44958654e-07f, 4.15579069e-07f, 6.93056106e-07f,
+        1.13675616e-06f, 1.83473665e-06f, 2.91544023e-06f, 4.56318858e-06f, 7.03833675e-06f, 1.07030190e-05f,
+        1.60534529e-05f, 2.37597559e-05f, 3.47141604e-05f, 5.00883685e-05f, 7.14005734e-05f, 1.00592372e-04f,
+        1.40115414e-04f, 1.93027181e-04f, 2.63094779e-04f, 3.54905080e-04f, 4.73978972e-04f, 6.26886955e-04f,
+        8.21362793e-04f, 1.06641153e-03f, 1.37240787e-03f, 1.75118071e-03f, 2.21607971e-03f, 2.78201983e-03f,
+        3.46550010e-03f, 4.28459361e-03f, 5.25890609e-03f, 6.40950150e-03f, 7.75879384e-03f, 9.33040551e-03f,
+        1.11489935e-02f, 1.32400455e-02f, 1.56296499e-02f, 1.83442433e-02f, 2.14103400e-02f, 2.48542509e-02f,
+        2.87017958e-02f, 3.29780164e-02f, 3.77068968e-02f, 4.29110964e-02f, 4.86117029e-02f, 5.48280093e-02f,
+        6.15773214e-02f, 6.88747982e-02f, 7.67333308e-02f, 8.51634602e-02f, 9.41733378e-02f, 1.03768728e-01f,
+        1.13953051e-01f, 1.24727473e-01f, 1.36091031e-01f, 1.48040798e-01f, 1.60572082e-01f, 1.73678660e-01f,
+        1.87353038e-01f, 2.01586736e-01f, 2.16370598e-01f, 2.31695113e-01f, 2.47550758e-01f, 2.63928342e-01f,
+        2.80819365e-01f, 2.98216379e-01f, 3.16113348e-01f, 3.34506011e-01f, 3.53392244e-01f, 3.72772414e-01f,
+        3.92649735e-01f, 4.13030618e-01f, 4.33925021e-01f, 4.55346789e-01f, 4.77314001e-01f, 4.99849320e-01f,
+        5.22980337e-01f, 5.46739932e-01f, 5.71166640e-01f, 5.96305036e-01f, 6.22206131e-01f, 6.48927802e-01f,
+        6.76535247e-01f, 7.05101473e-01f, 7.34707835e-01f, 7.65444619e-01f, 7.97411688e-01f, 8.30719192e-01f,
+        8.65488366e-01f, 9.01852407e-01f, 9.39957463e-01f, 9.79963735e-01f, 1.02204672e+00f, 1.06639858e+00f,
+        1.11322974e+00f, 1.16277062e+00f, 1.21527359e+00f, 1.27101525e+00f, 1.33029891e+00f, 1.39345744e+00f,
+        1.46085648e+00f, 1.53289803e+00f, 1.61002461e+00f, 1.69272386e+00f, 1.78153384e+00f, 1.87704900e+00f,
+        1.97992701e+00f, 2.09089644e+00f, 2.21076567e+00f, 2.34043290e+00f, 2.48089770e+00f, 2.63327413e+00f,
+        2.79880590e+00f, 2.97888368e+00f, 3.17506505e+00f, 3.38909744e+00f, 3.62294469e+00f, 3.87881764e+00f,
+        4.15920968e+00f, 4.46693789e+00f, 4.80519096e+00f, 5.17758497e+00f, 5.58822853e+00f, 6.04179895e+00f,
+        6.54363157e+00f, 7.09982467e+00f, 7.71736306e+00f, 8.40426388e+00f, 9.16974906e+00f, 1.00244499e+01f,
+        1.09806502e+01f, 1.20525758e+01f, 1.32567410e+01f, 1.46123627e+01f, 1.61418586e+01f, 1.78714466e+01f,
+        1.98318690e+01f, 2.20592694e+01f, 2.45962577e+01f, 2.74932084e+01f, 3.08098460e+01f, 3.46171893e+01f,
+        3.89999428e+01f, 4.40594471e+01f, 4.99173320e+01f, 5.67200545e+01f, 6.46445583e+01f, 7.39053537e+01f,
+        8.47634121e+01f, 9.75373786e+01f, 1.12617765e+02f, 1.30484989e+02f, 1.51732386e+02f, 1.77095712e+02f,
+        2.07491096e+02f, 2.44064119e+02f, 2.88253545e+02f, 3.41874461e+02f, 4.07227291e+02f, 4.87241400e+02f,
+        5.85665251e+02f, 7.07319497e+02f, 8.58435639e+02f, 1.04711167e+03f, 1.28392853e+03f, 1.58278901e+03f,
+        1.96206607e+03f, 2.44618436e+03f, 3.06781187e+03f, 3.87091688e+03f, 4.91505977e+03f, 6.28145970e+03f,
+        8.08162997e+03f, 1.04697579e+04f, 1.36605846e+04f, 1.79554230e+04f, 2.37803156e+04f, 3.17424455e+04f,
+        4.27142204e+04f, 5.79596727e+04f, 7.93261335e+04f, 1.09537503e+05f, 1.52647130e+05f, 2.14743829e+05f,
+        3.05063335e+05f, 4.37755687e+05f, 6.34724899e+05f, 9.30240305e+05f, 1.37850753e+06f, 2.06623977e+06f,
+        3.13377596e+06f, 4.81098405e+06f, 7.47905793e+06f, 1.17782423e+07f, 1.87980927e+07f, 3.04180655e+07f,
+        4.99257437e+07f, 8.31551852e+07f, 1.40614107e+08f, 2.41519712e+08f, 4.21576502e+08f, 7.48209440e+08f,
+        1.35089892e+09f, 2.48263348e+09f, 4.64662007e+09f, 8.86235204e+09f, 1.72348930e+10f, 3.41967381e+10f,
+        6.92714904e+10f, 1.43352142e+11f, 3.03269524e+11f, 6.56345865e+11f, 1.45422052e+12f, 3.30099910e+12f,
+        7.68267630e+12f, 1.83474885e+13f, 4.49980389e+13f, 1.13430702e+14f, 2.94148450e+14f, 7.85402504e+14f,
+        2.16127995e+15f, 6.13534293e+15f, 1.79847736e+16f, 5.44944507e+16f, 1.70858922e+17f, 5.54922744e+17f,
+        1.86905990e+18f, 6.53599225e+18f, 2.37582887e+19f, 8.98810682e+19f, 3.54341330e+20f, };
+
+__constant__ float m_weights_float_8[527] = 
+      { 2.67108015e-21f, 5.82833463e-21f, 1.25616316e-20f, 2.67469785e-20f, 5.62745845e-20f, 1.17014394e-19f, 
+        2.40511019e-19f, 4.88739481e-19f, 9.82072303e-19f, 1.95168062e-18f, 3.83661097e-18f, 7.46163208e-18f,
+        1.43594942e-17f, 2.73485792e-17f, 5.15573612e-17f, 9.62223075e-17f, 1.77810682e-16f, 3.25389618e-16f,
+        5.89765054e-16f, 1.05888451e-15f, 1.88354538e-15f, 3.31989417e-15f, 5.79902273e-15f, 1.00398818e-14f,
+        1.72308010e-14f, 2.93186753e-14f, 4.94655967e-14f, 8.27635884e-14f, 1.37343706e-13f, 2.26082511e-13f,
+        3.69205736e-13f, 5.98228147e-13f, 9.61866975e-13f, 1.53484658e-12f, 2.43090464e-12f, 3.82185577e-12f,
+        5.96531965e-12f, 9.24474797e-12f, 1.42267754e-11f, 2.17427910e-11f, 3.30041201e-11f, 4.97635091e-11f,
+        7.45399354e-11f, 1.10929412e-10f, 1.64031748e-10f, 2.41032586e-10f, 3.51991946e-10f, 5.10905560e-10f,
+        7.37124150e-10f, 1.05723929e-09f, 1.50757352e-09f, 2.13744796e-09f, 3.01344401e-09f, 4.22492806e-09f,
+        5.89117093e-09f, 8.17046854e-09f, 1.12717587e-08f, 1.54693324e-08f, 2.11213594e-08f, 2.86930859e-08f,
+        3.87857241e-08f, 5.21722335e-08f, 6.98414017e-08f, 9.30518593e-08f, 1.23397923e-07f, 1.62889442e-07f,
+        2.14048123e-07f, 2.80023159e-07f, 3.64729321e-07f, 4.73011070e-07f, 6.10836627e-07f, 7.85526363e-07f,
+        1.00602028e-06f, 1.28318979e-06f, 1.63019938e-06f, 2.06292424e-06f, 2.60043021e-06f, 3.26552286e-06f,
+        4.08537275e-06f, 5.09222413e-06f, 6.32419483e-06f, 7.82617466e-06f, 9.65083023e-06f, 1.18597236e-05f,
+        1.45245521e-05f, 1.77285168e-05f, 2.15678251e-05f, 2.61533347e-05f, 3.16123436e-05f, 3.80905295e-05f,
+        4.57540432e-05f, 5.47917575e-05f, 6.54176707e-05f, 7.78734661e-05f, 9.24312223e-05f, 1.09396271e-04f,
+        1.29110197e-04f, 1.51953965e-04f, 1.78351176e-04f, 2.08771424e-04f, 2.43733750e-04f, 2.83810168e-04f,
+        3.29629253e-04f, 3.81879756e-04f, 4.41314233e-04f, 5.08752659e-04f, 5.85085996e-04f, 6.71279692e-04f,
+        7.68377076e-04f, 8.77502620e-04f, 9.99865030e-04f, 1.13676015e-03f, 1.28957360e-03f, 1.45978322e-03f,
+        1.64896113e-03f, 1.85877551e-03f, 2.09099200e-03f, 2.34747474e-03f, 2.63018699e-03f, 2.94119122e-03f,
+        3.28264890e-03f, 3.65681963e-03f, 4.06605991e-03f, 4.51282135e-03f, 4.99964828e-03f, 5.52917497e-03f,
+        6.10412222e-03f, 6.72729343e-03f, 7.40157020e-03f, 8.12990738e-03f, 8.91532760e-03f, 9.76091537e-03f,
+        1.06698107e-02f, 1.16452023e-02f, 1.26903202e-02f, 1.38084285e-02f, 1.50028172e-02f, 1.62767940e-02f,
+        1.76336759e-02f, 1.90767806e-02f, 2.06094173e-02f, 2.22348784e-02f, 2.39564300e-02f, 2.57773028e-02f,
+        2.77006834e-02f, 2.97297055e-02f, 3.18674406e-02f, 3.41168899e-02f, 3.64809756e-02f, 3.89625331e-02f,
+        4.15643030e-02f, 4.42889240e-02f, 4.71389254e-02f, 5.01167213e-02f, 5.32246039e-02f, 5.64647382e-02f,
+        5.98391571e-02f, 6.33497571e-02f, 6.69982939e-02f, 7.07863800e-02f, 7.47154815e-02f, 7.87869165e-02f,
+        8.30018539e-02f, 8.73613125e-02f, 9.18661613e-02f, 9.65171203e-02f, 1.01314762e-01f, 1.06259513e-01f,
+        1.11351656e-01f, 1.16591337e-01f, 1.21978563e-01f, 1.27513213e-01f, 1.33195039e-01f, 1.39023671e-01f,
+        1.44998628e-01f, 1.51119321e-01f, 1.57385061e-01f, 1.63795066e-01f, 1.70348473e-01f, 1.77044340e-01f,
+        1.83881662e-01f, 1.90859375e-01f, 1.97976367e-01f, 2.05231492e-01f, 2.12623572e-01f, 2.20151415e-01f,
+        2.27813822e-01f, 2.35609599e-01f, 2.43537565e-01f, 2.51596569e-01f, 2.59785494e-01f, 2.68103274e-01f,
+        2.76548903e-01f, 2.85121445e-01f, 2.93820047e-01f, 3.02643950e-01f, 3.11592502e-01f, 3.20665165e-01f,
+        3.29861530e-01f, 3.39181328e-01f, 3.48624439e-01f, 3.58190905e-01f, 3.67880941e-01f, 3.77694943e-01f,
+        3.87633504e-01f, 3.97697421e-01f, 4.07887708e-01f, 4.18205605e-01f, 4.28652591e-01f, 4.39230391e-01f,
+        4.49940993e-01f, 4.60786652e-01f, 4.71769905e-01f, 4.82893580e-01f, 4.94160809e-01f, 5.05575036e-01f,
+        5.17140031e-01f, 5.28859900e-01f, 5.40739096e-01f, 5.52782432e-01f, 5.64995090e-01f, 5.77382639e-01f,
+        5.89951040e-01f, 6.02706666e-01f, 6.15656310e-01f, 6.28807202e-01f, 6.42167019e-01f, 6.55743908e-01f,
+        6.69546490e-01f, 6.83583887e-01f, 6.97865729e-01f, 7.12402181e-01f, 7.27203953e-01f, 7.42282322e-01f,
+        7.57649155e-01f, 7.73316926e-01f, 7.89298740e-01f, 8.05608358e-01f, 8.22260217e-01f, 8.39269463e-01f,
+        8.56651970e-01f, 8.74424378e-01f, 8.92604116e-01f, 9.11209442e-01f, 9.30259469e-01f, 9.49774208e-01f,
+        9.69774604e-01f, 9.90282579e-01f, 1.01132107e+00f, 1.03291408e+00f, 1.05508673e+00f, 1.07786529e+00f,
+        1.10127728e+00f, 1.12535146e+00f, 1.15011796e+00f, 1.17560829e+00f, 1.20185546e+00f, 1.22889400e+00f,
+        1.25676010e+00f, 1.28549162e+00f, 1.31512826e+00f, 1.34571158e+00f, 1.37728514e+00f, 1.40989460e+00f,
+        1.44358784e+00f, 1.47841507e+00f, 1.51442894e+00f, 1.55168471e+00f, 1.59024039e+00f, 1.63015687e+00f,
+        1.67149810e+00f, 1.71433126e+00f, 1.75872698e+00f, 1.80475947e+00f, 1.85250679e+00f, 1.90205105e+00f,
+        1.95347869e+00f, 2.00688065e+00f, 2.06235275e+00f, 2.11999592e+00f, 2.17991652e+00f, 2.24222670e+00f,
+        2.30704472e+00f, 2.37449538e+00f, 2.44471039e+00f, 2.51782884e+00f, 2.59399766e+00f, 2.67337209e+00f,
+        2.75611628e+00f, 2.84240383e+00f, 2.93241843e+00f, 3.02635449e+00f, 3.12441791e+00f, 3.22682682e+00f,
+        3.33381238e+00f, 3.44561973e+00f, 3.56250887e+00f, 3.68475574e+00f, 3.81265333e+00f, 3.94651282e+00f,
+        4.08666490e+00f, 4.23346116e+00f, 4.38727553e+00f, 4.54850596e+00f, 4.71757611e+00f, 4.89493722e+00f,
+        5.08107015e+00f, 5.27648761e+00f, 5.48173646e+00f, 5.69740032e+00f, 5.92410235e+00f, 6.16250823e+00f,
+        6.41332946e+00f, 6.67732689e+00f, 6.95531455e+00f, 7.24816384e+00f, 7.55680807e+00f, 7.88224735e+00f,
+        8.22555401e+00f, 8.58787841e+00f, 8.97045530e+00f, 9.37461076e+00f, 9.80176975e+00f, 1.02534643e+01f,
+        1.07313428e+01f, 1.12371793e+01f, 1.17728848e+01f, 1.23405187e+01f, 1.29423019e+01f, 1.35806306e+01f,
+        1.42580922e+01f, 1.49774818e+01f, 1.57418213e+01f, 1.65543795e+01f, 1.74186947e+01f, 1.83385994e+01f,
+        1.93182476e+01f, 2.03621450e+01f, 2.14751816e+01f, 2.26626686e+01f, 2.39303784e+01f, 2.52845893e+01f,
+        2.67321348e+01f, 2.82804577e+01f, 2.99376708e+01f, 3.17126238e+01f, 3.36149769e+01f, 3.56552840e+01f,
+        3.78450835e+01f, 4.01970005e+01f, 4.27248599e+01f, 4.54438126e+01f, 4.83704762e+01f, 5.15230921e+01f,
+        5.49217006e+01f, 5.85883374e+01f, 6.25472527e+01f, 6.68251567e+01f, 7.14514957e+01f, 7.64587609e+01f,
+        8.18828353e+01f, 8.77633847e+01f, 9.41442967e+01f, 1.01074176e+02f, 1.08606902e+02f, 1.16802259e+02f,
+        1.25726650e+02f, 1.35453899e+02f, 1.46066166e+02f, 1.57654979e+02f, 1.70322410e+02f, 1.84182406e+02f,
+        1.99362306e+02f, 2.16004568e+02f, 2.34268740e+02f, 2.54333703e+02f, 2.76400239e+02f, 3.00693971e+02f,
+        3.27468728e+02f, 3.57010397e+02f, 3.89641362e+02f, 4.25725590e+02f, 4.65674502e+02f, 5.09953726e+02f,
+        5.59090900e+02f, 6.13684688e+02f, 6.74415211e+02f, 7.42056139e+02f, 8.17488717e+02f, 9.01718069e+02f,
+        9.95892168e+02f, 1.10132394e+03f, 1.21951707e+03f, 1.35219615e+03f, 1.50134197e+03f, 1.66923291e+03f,
+        1.85849349e+03f, 2.07215152e+03f, 2.31370536e+03f, 2.58720328e+03f, 2.89733724e+03f, 3.24955383e+03f,
+        3.65018587e+03f, 4.10660860e+03f, 4.62742547e+03f, 5.22268956e+03f, 5.90416786e+03f, 6.68565726e+03f,
+        7.58336313e+03f, 8.61635357e+03f, 9.80710572e+03f, 1.11821637e+04f, 1.27729327e+04f, 1.46166396e+04f,
+        1.67574960e+04f, 1.92481112e+04f, 2.21512104e+04f, 2.55417295e+04f, 2.95093735e+04f, 3.41617487e+04f,
+        3.96282043e+04f, 4.60645561e+04f, 5.36589049e+04f, 6.26388223e+04f, 7.32802431e+04f, 8.59184957e+04f,
+        1.00962017e+05f, 1.18909442e+05f, 1.40370957e+05f, 1.66095034e+05f, 1.97001996e+05f, 2.34226253e+05f,
+        2.79169596e+05f, 3.33568603e+05f, 3.99580125e+05f, 4.79889989e+05f, 5.77851588e+05f, 6.97663062e+05f,
+        8.44594440e+05f, 1.02527965e+06f, 1.24809298e+06f, 1.52363581e+06f, 1.86536786e+06f, 2.29042802e+06f,
+        2.82070529e+06f, 3.48424008e+06f, 4.31706343e+06f, 5.36561882e+06f, 6.68996113e+06f, 8.36799594e+06f,
+        1.05011160e+07f, 1.32217203e+07f, 1.67032788e+07f, 2.11738506e+07f, 2.69343047e+07f, 3.43829654e+07f,
+        4.40490690e+07f, 5.66383460e+07f, 7.30953564e+07f, 9.46890531e+07f, 1.23130681e+08f, 1.60736861e+08f,
+        2.10656057e+08f, 2.77184338e+08f, 3.66207397e+08f, 4.85821891e+08f, 6.47212479e+08f, 8.65895044e+08f,
+        1.16348659e+09f, 1.57023596e+09f, 2.12865840e+09f, 2.89877917e+09f, 3.96573294e+09f, 5.45082863e+09f,
+        7.52773593e+09f, 1.04462776e+10f, 1.45675716e+10f, 2.04161928e+10f, 2.87579864e+10f, 4.07167363e+10f,
+        5.79499965e+10f, 8.29154750e+10f, 1.19276754e+11f, 1.72524570e+11f, 2.50933409e+11f, 3.67042596e+11f,
+        5.39962441e+11f, 7.98985690e+11f, 1.18927611e+12f, 1.78088199e+12f, 2.68310388e+12f, 4.06753710e+12f,
+        6.20525592e+12f, 9.52719664e+12f, 1.47228407e+13f, 2.29025392e+13f, 3.58662837e+13f, 5.65517100e+13f,
+        8.97859411e+13f, 1.43556057e+14f, 2.31171020e+14f, 3.74966777e+14f, 6.12702071e+14f, 1.00868013e+15f,
+        1.67323268e+15f, 2.79711270e+15f, 4.71267150e+15f, 8.00353033e+15f, 1.37027503e+16f, 2.36538022e+16f,
+        4.11734705e+16f, 7.22793757e+16f, 1.27982244e+17f, 2.28603237e+17f, 4.11976277e+17f, 7.49169358e+17f,
+        1.37488861e+18f, 2.54681529e+18f, 4.76248383e+18f, 8.99167123e+18f, 1.71428840e+19f, 3.30088717e+19f,
+        6.42020070e+19f, 1.26155602e+20f, 2.50480806e+20f, 5.02601059e+20f, 1.01935525e+21f, };
+
+__constant__ float* m_weights_float[8] = {
+    m_weights_float_1,
+    m_weights_float_2,
+    m_weights_float_3,
+    m_weights_float_4,
+    m_weights_float_5,
+    m_weights_float_6,
+    m_weights_float_7,
+    m_weights_float_8
+};
+
+__constant__ double m_abscissas_double_1[13] =
+      { 7.241670621354483269e-163, 2.257639733856759198e-60, 1.153241619257215165e-22, 8.747691973876861825e-09, 
+        1.173446923800022477e-03, 1.032756936219208144e-01, 7.719261204224504866e-01, 4.355544675823585545e+00,
+        1.215101039066652656e+02, 6.228845436711506169e+05, 6.278613977336989392e+15, 9.127414935180233465e+42, 
+        6.091127771174027909e+116, };
+
+__constant__ double m_abscissas_double_2[12] =
+      { 4.547459836328942014e-99, 6.678756542928857080e-37, 5.005042973041566360e-14, 1.341318484151208960e-05, 
+        1.833875636365939263e-02, 3.257972971286326131e-01, 1.712014688483495078e+00, 1.613222549264089627e+01, 
+        3.116246745274236447e+03, 3.751603952020919663e+09, 1.132259067258797346e+26, 6.799257464097374238e+70, };
+
+__constant__ double m_abscissas_double_3[25] =
+      { 5.314690663257815465e-127, 2.579830034615362946e-77, 3.534801062399966878e-47, 6.733941646704537777e-29, 
+        8.265803726974829043e-18, 4.424914371157762285e-11, 5.390411046738629465e-07, 1.649389713333761449e-04, 
+        5.463728936866216652e-03, 4.787896410534771955e-02, 1.931544616590306846e-01, 5.121421856617965197e-01, 
+        1.144715949265016019e+00, 2.648424684387670480e+00, 7.856804169938798917e+00, 3.944731803343517708e+01, 
+        5.060291993016831194e+02, 3.181117494063683297e+04, 2.820174654949211729e+07, 1.993745099515255184e+12, 
+        1.943469269499068563e+20, 2.858803732300638372e+33, 1.457292199029008637e+55, 8.943565831706355607e+90,
+        9.016198369791554655e+149, };
+
+__constant__ double m_abscissas_double_4[49] =
+      { 8.165631636299519857e-144, 3.658949309353149331e-112, 1.635242513882908826e-87, 2.578381184977746454e-68,
+        2.305546416275824199e-53, 1.016725540031465162e-41, 1.191823622917539774e-32, 1.379018088205016509e-25, 
+        4.375640088826073184e-20, 8.438464631330991606e-16, 1.838483310261119782e-12, 7.334264181393092650e-10, 
+        7.804740587931068021e-08, 2.970395577741681504e-06, 5.081805431666579484e-05, 4.671401627620431498e-04, 
+        2.652347404231090523e-03, 1.037409202661683856e-02, 3.045225582205323946e-02, 7.178280364982721201e-02, 
+        1.434001065841990688e-01, 2.535640852949085796e-01, 4.113268917643175920e-01, 6.310260805648534613e-01,
+        9.404706503455087817e-01, 1.396267301972783068e+00, 2.116896928689963277e+00, 3.364289290471596568e+00,
+        5.770183960005836987e+00, 1.104863531218761752e+01, 2.460224479439805859e+01, 6.699316387888639988e+01,
+        2.375794092475844708e+02, 1.188092202760116066e+03, 9.269848635975416108e+03, 1.283900116155671304e+05,
+        3.723397798030112514e+06, 2.793667983952389721e+08, 7.112973790863854188e+10, 8.704037695808749572e+13,
+        8.001474015782459984e+17, 9.804091819390540578e+22, 3.342777673392873288e+29, 8.160092668471508447e+37,
+        4.798775331663586528e+48, 3.228614320248853938e+62, 1.836986041572136151e+80, 1.153145986877483804e+103,
+        2.160972586723647751e+132, };
+
+__constant__ double m_abscissas_double_5[98] =
+      { 4.825077401709435655e-153, 3.813781211050297560e-135, 2.377824349780240844e-119, 2.065817295388293122e-105,
+        4.132105770181358886e-93, 2.963965169989404311e-82, 1.127296662046635391e-72, 3.210346399945695041e-64,
+        9.282992368222161062e-57, 3.565977853916619677e-50, 2.306962519220473637e-44, 3.098751038516535098e-39,
+        1.039558064722960891e-34, 1.025256027381235200e-30, 3.432612000569885403e-27, 4.429681881379089961e-24,
+        2.464589267395236846e-21, 6.526691446363344923e-19, 8.976892324445928684e-17, 6.926277695183452225e-15,
+        3.208805316815751272e-13, 9.478053068835988899e-12, 1.882052586691155400e-10, 2.632616062773909009e-09,
+        2.703411837703917665e-08, 2.113642195965330965e-07, 1.299327029813074013e-06, 6.461189935136030673e-06,
+        2.665090959570723827e-05, 9.322774986189288194e-05, 2.820463407940068813e-04, 7.508613300035051413e-04,
+        1.786142185986551786e-03, 3.848376610765768211e-03, 7.600810651854199771e-03, 1.390873269178271700e-02,
+        2.380489559528694982e-02, 3.842796337748997654e-02, 5.895012901671883992e-02, 8.651391160689367948e-02,
+        1.221961347398101671e-01, 1.670112314557845555e-01, 2.219593619059930701e-01, 2.881200442770917241e-01,
+        3.667906976948184315e-01, 4.596722879563388211e-01, 5.691113093602836208e-01, 6.984190600916228379e-01,
+        8.523070690462583711e-01, 1.037505121571600249e+00, 1.263672635742961915e+00, 1.544788480334120896e+00,
+        1.901333876886441433e+00, 2.363816272813317635e+00, 2.978614980117902904e+00, 3.817957977526709364e+00,
+        4.997477803461245639e+00, 6.708150685706236545e+00, 9.276566033183386532e+00, 1.328332469239125539e+01,
+        1.980618680552458639e+01, 3.094452809319702849e+01, 5.101378787119006225e+01, 8.943523638413590523e+01,
+        1.682138665185088325e+02, 3.427988270281270587e+02, 7.653823671943767281e+02, 1.895993667030670343e+03,
+        5.285404568827643942e+03, 1.684878049282191210e+04, 6.254388805482299369e+04, 2.759556544455721132e+05,
+        1.481213238071008345e+06, 9.929728611179601424e+06, 8.564987764771851841e+07, 9.831650826344826952e+08,
+        1.560339073978569502e+10, 3.575098885016726922e+11, 1.241973798101884982e+13, 6.915106205748805839e+14,
+        6.571419716645131084e+16, 1.144558033138694099e+19, 3.960915669532823553e+21, 2.984410558028297842e+24,
+        5.430494850258846715e+27, 2.683747612498502676e+31, 4.114885708325522701e+35, 2.276004816861421600e+40,
+        5.387544917595833246e+45, 6.623575732955432303e+51, 5.266881304835239338e+58, 3.473234812654772210e+66,
+        2.517492645985977377e+75, 2.759797646289240629e+85, 6.569603829502412077e+96, 5.116181648220647995e+109,
+        2.073901892339407423e+124, 7.406462446666255838e+140, };
+
+__constant__ double m_abscissas_double_6[196] =
+      { 7.053618140948655098e-158, 2.343354218558056628e-148, 2.062509087689351439e-139, 5.212388628332260488e-131,
+        4.079380320868843387e-123, 1.061481285006738214e-115, 9.816727607793017691e-109, 3.435400719609722581e-102,
+        4.825198574681495574e-96, 2.874760995089533358e-90, 7.652499977338879996e-85, 9.556944498127119032e-80, 
+        5.862241023038227937e-75, 1.843934000129616663e-70, 3.096983980846232911e-66, 2.885057452402340330e-62,
+        1.544904681826443837e-58, 4.917572705671511534e-55, 9.602608566391652866e-52, 1.184882375237471009e-48,
+        9.499223316355714793e-46, 5.078965858882528461e-43, 1.856080838373584123e-40, 4.744245560917271585e-38,
+        8.667497891102658240e-36, 1.155086178652063612e-33, 1.144541329818836153e-31, 8.585083084065812874e-30,
+        4.957702933032408922e-28, 2.239353794616277882e-26, 8.030405447708765492e-25, 2.318459271131684362e-23,
+        5.460287296679086677e-22, 1.062054307071706375e-20, 1.725955878033239909e-19, 2.369168446274347137e-18,
+        2.775176063916613602e-17, 2.800847352316621903e-16, 2.457625954357892245e-15, 1.890842052364646528e-14,
+        1.285791209258834942e-13, 7.786001004707878219e-13, 4.228083024410741194e-12, 2.072664297543567489e-11,
+        9.229295073519997559e-11, 3.754886152592311575e-10, 1.403443871774813834e-09, 4.843962757371872495e-09,
+        1.551373196623161433e-08, 4.631448362339623514e-08, 1.294370176865168120e-07, 3.400050664017164356e-07,
+        8.426290307581447654e-07, 1.977205177561996033e-06, 4.407362363338667830e-06, 9.362197325373404563e-06,
+        1.900760383449277992e-05, 3.698530963711860636e-05, 6.915333419235766653e-05, 1.245492076251852927e-04,
+        2.165764713808099093e-04, 3.643870211078977292e-04, 5.943999416122372516e-04, 9.418663022314558591e-04,
+        1.452364274261880083e-03, 2.183094846035196562e-03, 3.203848855069215278e-03, 4.597532353031862490e-03,
+        6.460168315117479792e-03, 8.900334989802041559e-03, 1.203804973137064275e-02, 1.600315622064554965e-02,
+        2.093331703849583304e-02, 2.697174812170771748e-02, 3.426485378063329473e-02, 4.295992956149806344e-02,
+        5.320309587203163231e-02, 6.513760993479510261e-02, 7.890268021756337834e-02, 9.463287940877026649e-02,
+        1.124582226719385153e-01, 1.325049504086213973e-01, 1.548970316076579260e-01, 1.797583869192584860e-01,
+        2.072158210677632145e-01, 2.374026527414815016e-01, 2.704630368855767324e-01, 3.065569893452247137e-01,
+        3.458661469783558388e-01, 3.886003277325320632e-01, 4.350049951304795319e-01, 4.853697810067132707e-01,
+        5.400382807495678589e-01, 5.994194092045578293e-01, 6.640006964388650918e-01, 7.343640159321037167e-01,
+        8.112043806284638130e-01, 8.953526245122194172e-01, 9.878030224123093447e-01, 1.089747207002141516e+00,
+        1.202616144679226559e+00, 1.328132465995424226e+00, 1.468376159872979355e+00, 1.625867601500928277e+00,
+        1.803673186618691186e+00, 2.005540624723209206e+00, 2.236073393446881709e+00, 2.500957254018255004e+00,
+        2.807256477663534857e+00, 3.163804128101147487e+00, 3.581720263742550029e+00, 4.075105576391566303e+00,
+        4.661977749936137761e+00, 5.365546718714963091e+00, 6.215967676434536043e+00, 7.252774367330402583e+00,
+        8.528291278204291331e+00, 1.011247001122720391e+01, 1.209982167952718578e+01, 1.461947158782994207e+01,
+        1.784992423404041042e+01, 2.204102944968352178e+01, 2.754711235628932374e+01, 3.487766600641650640e+01,
+        4.477610230214251576e+01, 5.834406132739843834e+01, 7.724096630394042216e+01, 1.040101075374387191e+02,
+        1.426215523101601730e+02, 1.993940974645466479e+02, 2.845939167898235356e+02, 4.152683836292551147e+02,
+        6.203878718481709769e+02, 9.504080873581791535e+02, 1.495523342124078853e+03, 2.421485328006836634e+03,
+        4.041977218227396500e+03, 6.969453497454785202e+03, 1.244001690461442846e+04, 2.303794930506892099e+04,
+        4.437240927040385250e+04, 8.911296561746717657e+04, 1.871159398849787994e+05, 4.119851492265743330e+05,
+        9.540971729944126398e+05, 2.331680521880789706e+06, 6.034305391011695472e+06, 1.659896369452266448e+07,
+        4.872448839341613053e+07, 1.532687586549090392e+08, 5.189730792935011722e+08, 1.900599621040508288e+09,
+        7.566480431232731818e+09, 3.292298322781643849e+10, 1.574714421665075635e+11, 8.330244306239795892e+11,
+        4.905619969814187571e+12, 3.238316002757222702e+13, 2.413995281454699076e+14, 2.048115587426077343e+15,
+        1.994352670766892066e+16, 2.248750566422739144e+17, 2.964037541992353401e+18, 4.613233119968213445e+19,
+        8.569680508342001161e+20, 1.921851711942844799e+22, 5.266829246099861758e+23, 1.786779952992288976e+25,
+        7.607919705736976491e+26, 4.125721424346450007e+28, 2.894340142292214313e+30, 2.670720269656428272e+32,
+        3.299248229135205151e+34, 5.560105583582310103e+36, 1.304167266599523020e+39, 4.349382146382717353e+41,
+        2.109720387774341509e+44, 1.524825352702403324e+47, 1.684941265105084589e+50, 2.925572737558413426e+53,
+        8.217834961057481281e+56, 3.852117991896536784e+60, 3.114452310394384063e+64, 4.498555465873245751e+68,
+        1.205113215232800796e+73, 6.230864727145221322e+77, 6.487131248948465269e+82, 1.422810109167834249e+88,
+        6.897656089181724717e+93, 7.779163462756485195e+99, 2.155213251859555072e+106, 1.554347160152705281e+113,
+        3.103875072425192272e+120, 1.832673821557018634e+128, 3.431285951865278376e+136, 2.194542081542393530e+145, };
+
+__constant__ double m_abscissas_double_7[393] =
+      { 2.363803632659058081e-160, 1.926835442612677686e-155, 1.109114905180506786e-150, 4.556759282087534164e-146,
+        1.350172241067816232e-141, 2.914359263635229435e-137, 4.627545976953585825e-133, 5.456508344460398758e-129,
+        4.821828861306345485e-125, 3.221779152402086241e-121, 1.641732102111619421e-117, 6.433569189921227126e-114,
+        1.954582672700428961e-110, 4.639912078942456372e-107, 8.671928891742699827e-104, 1.285485264305858782e-100,
+        1.522161801460927566e-97, 1.449767844425295085e-94, 1.118122255504445235e-91, 7.028344777398825069e-89,
+        3.623454064991238081e-86, 1.541513438874996543e-83, 5.443699502170284982e-81, 1.604913673768949456e-78,
+        3.972206240977317536e-76, 8.297975554162539562e-74, 1.470748835855054032e-71, 2.222935801472624670e-69,
+        2.879160361851977720e-67, 3.210837413250902178e-65, 3.097303984958235490e-63, 2.595974479763180595e-61,
+        1.898656799199089593e-59, 1.216865518398435626e-57, 6.862041810601184397e-56, 3.418134121780773218e-54,
+        1.509758535747580387e-52, 5.934924977563731784e-51, 2.083865009061241099e-49, 6.558128104492290092e-48,
+        1.856133016606468181e-46, 4.739964621828176249e-45, 1.095600459825324697e-43, 2.299177139060262518e-42,
+        4.393663812095906869e-41, 7.667728102142858487e-40, 1.225476279042445010e-38, 1.798526997315960782e-37,
+        2.430201154741018716e-36, 3.030993518975438712e-35, 3.497966609954172613e-34, 3.744308272796551045e-33,
+        3.726132797819332658e-32, 3.455018936399215381e-31, 2.991524108706319604e-30, 2.423818520801870809e-29,
+        1.841452809687011486e-28, 1.314419760826235421e-27, 8.831901010260867670e-27, 5.596660060604091621e-26,
+        3.350745417080507841e-25, 1.898675566025820409e-24, 1.019982287418197376e-23, 5.203315082978366918e-23,
+        2.524668746906057148e-22, 1.166904646009344233e-21, 5.145437675264868732e-21, 2.167677145279166596e-20,
+        8.736996911006110678e-20, 3.373776431076593266e-19, 1.249769727462160008e-18, 4.446913832647864892e-18,
+        1.521741180930875343e-17, 5.014158301377399707e-17, 1.592708205361177316e-16, 4.882536933653862982e-16,
+        1.446109387544416586e-15, 4.142510168443201880e-15, 1.148892083132325407e-14, 3.088024760858924214e-14,
+        8.051699653634442236e-14, 2.038478329249539199e-13, 5.015686309363884049e-13, 1.200444984849900298e-12,
+        2.797125428309156462e-12, 6.350357793399881333e-12, 1.405881744263466936e-11, 3.037391821635123795e-11,
+        6.408863411016101449e-11, 1.321618431565916164e-10, 2.665526566207284474e-10, 5.261497418654313068e-10,
+        1.017123184766088896e-09, 1.926882221639203388e-09, 3.579523428497157488e-09, 6.524486847652635035e-09,
+        1.167543991262942921e-08, 2.052356080018121741e-08, 3.545879678923676129e-08, 6.024472481556065885e-08,
+        1.007076869023518125e-07, 1.657191565891799652e-07, 2.685718943404479677e-07, 4.288752213761154116e-07,
+        6.751222405372943925e-07, 1.048111270324302884e-06, 1.605433960692314060e-06, 2.427271958412371013e-06,
+        3.623770645356477660e-06, 5.344280132492750309e-06, 7.788767891027678939e-06, 1.122171160022519082e-05,
+        1.598877254198599908e-05, 2.253652700952153115e-05, 3.143549403208496646e-05, 4.340664122305257288e-05,
+        5.935147653125578529e-05, 8.038574285450253209e-05, 1.078766266062957565e-04, 1.434832731669987826e-04,
+        1.892002753957224677e-04, 2.474036705329449166e-04, 3.208988510028906069e-04, 4.129696713145546995e-04,
+        5.274279220384250390e-04, 6.686622480794640482e-04, 8.416855170641220285e-04, 1.052179598744440400e-03,
+        1.306536501050643762e-03, 1.611894824798787196e-03, 1.976170547826080496e-03, 2.408081229927640721e-03,
+        2.917162840577481875e-03, 3.513778549028205519e-03, 4.209118976964403112e-03, 5.015193592567630665e-03,
+        5.944813116164644191e-03, 7.011563005746090924e-03, 8.229768289624073049e-03, 9.614450207543986041e-03,
+        1.118127530523730813e-02, 1.294649779580742160e-02, 1.492689615029751590e-02, 1.713970500593860526e-02,
+        1.960254358145296755e-02, 2.233334186285684056e-02, 2.535026586984720664e-02, 2.867164333232700310e-02,
+        3.231589109997912964e-02, 3.630144557680610965e-02, 4.064669741956638109e-02, 4.536993166688766414e-02,
+        5.048927437769432941e-02, 5.602264675683979161e-02, 6.198772763597769678e-02, 6.840192506222012774e-02,
+        7.528235762939712171e-02, 8.264584606994605986e-02, 9.050891551257121825e-02, 9.888780870447738360e-02,
+        1.077985103995250356e-01, 1.172567830270636607e-01, 1.272782136821146663e-01, 1.378782724173011162e-01,
+        1.490723817714478840e-01, 1.608759974398061173e-01, 1.733046999768424060e-01, 1.863742974247175786e-01,
+        2.001009387790379976e-01, 2.145012382381487190e-01, 2.295924102330349785e-01, 2.453924153016625057e-01,
+        2.619201169541956490e-01, 2.791954497739298773e-01, 2.972395991130188526e-01, 3.160751928723792943e-01,
+        3.357265060019327741e-01, 3.562196785212496373e-01, 3.775829480426418792e-01, 3.998468979800887046e-01,
+        4.230447228497335035e-01, 4.472125123131631074e-01, 4.723895558858634018e-01, 4.986186705332947608e-01,
+        5.259465537097384485e-01, 5.544241647649479754e-01, 5.841071380560416511e-01, 6.150562315632864018e-01,
+        6.473378153258308278e-01, 6.810244045956889952e-01, 7.161952432654565143e-01, 7.529369438691556459e-01,
+        7.913441913000366617e-01, 8.315205183502086596e-01, 8.735791622734589226e-01, 9.176440128265773576e-01,
+        9.638506636817484398e-01, 1.012347580753402101e+00, 1.063297402882930381e+00, 1.116878392515788506e+00,
+        1.173286056537125469e+00, 1.232734960362603918e+00, 1.295460761779549539e+00, 1.361722494981910846e+00,
+        1.431805139837984876e+00, 1.506022516788234345e+00, 1.584720554029819354e+00, 1.668280980969603645e+00,
+        1.757125510515793421e+00, 1.851720582866847453e+00, 1.952582755329533200e+00, 2.060284836698905963e+00,
+        2.175462881275503983e+00, 2.298824177179966629e+00, 2.431156386859774759e+00, 2.573338025304717222e+00,
+        2.726350494395667363e+00, 2.891291931102408784e+00, 3.069393174263124520e+00, 3.262036211067640944e+00,
+        3.470775532153801919e+00, 3.697362905908153155e+00, 3.943776181224350319e+00, 4.212252847439515687e+00,
+        4.505329225191826639e+00, 4.825886338442190807e+00, 5.177203733275742875e+00, 5.563022772612923373e+00,
+        5.987621259260909859e+00, 6.455901637501497370e+00, 6.973495514195020291e+00, 7.546887847708181032e+00,
+        8.183564906772872855e+00, 8.892191039842283431e+00, 9.682820467523296204e+00, 1.056715177903931837e+01,
+        1.155883465937652851e+01, 1.267384070151528947e+01, 1.393091310389918289e+01, 1.535211379418177923e+01,
+        1.696349128797309510e+01, 1.879589868990482198e+01, 2.088599907466058846e+01, 2.327750557804054323e+01,
+        2.602271658731131093e+01, 2.918442338619305962e+01, 3.283828974258811174e+01, 3.707583192189045823e+01,
+        4.200816575721451990e+01, 4.777073782243997224e+01, 5.452932468101429049e+01, 6.248767344468634478e+01,
+        7.189727649240108469e+01, 8.306993427631743111e+01, 9.639397813652482031e+01, 1.123553215857374919e+02,
+        1.315649140340119335e+02, 1.547947284376312334e+02, 1.830251850988715552e+02, 2.175079854175568113e+02,
+        2.598498278995140400e+02, 3.121245867818556035e+02, 3.770245173783702458e+02, 4.580653020257635092e+02,
+        5.598658426219653689e+02, 6.885324967857802403e+02, 8.521902266884453403e+02, 1.061721815114114004e+03,
+        1.331803836529085656e+03, 1.682368940494210217e+03, 2.140685129891926443e+03, 2.744334847491432747e+03,
+        3.545516659371773357e+03, 4.617306735234797694e+03, 6.062848530677391758e+03, 8.028955134017154634e+03,
+        1.072641999277462936e+04, 1.446061873485939411e+04, 1.967804579389513789e+04, 2.703776201447279367e+04,
+        3.752217148194723312e+04, 5.261052412010591097e+04, 7.455350923854624329e+04, 1.068125318497402759e+05,
+        1.547702528541975911e+05, 2.268930751685412563e+05, 3.366554971645478061e+05, 5.057644049026088560e+05,
+        7.696291826884134742e+05, 1.186761864945790800e+06, 1.855146094294667715e+06, 2.941132644236832276e+06,
+        4.731169740596920355e+06, 7.725765147199987935e+06, 1.281272565991955126e+07, 2.159151785284808339e+07,
+        3.699029448836502904e+07, 6.445902263727884020e+07, 1.143158678867853615e+08, 2.064425450996979446e+08,
+        3.798502995329785506e+08, 7.125329484929003007e+08, 1.363463294023391629e+09, 2.663196590686555077e+09,
+        5.313347815419462975e+09, 1.083506369700027396e+10, 2.259930737910197667e+10, 4.824707991473375387e+10,
+        1.055069002818752104e+11, 2.365138040635727209e+11, 5.439266129959972285e+11, 1.284356371641026839e+12,
+        3.116424654245920797e+12, 7.777312465656280419e+12, 1.997984843259596733e+13, 5.288649037339853118e+13,
+        1.443776937640548342e+14, 4.068967444890414804e+14, 1.185049702391501141e+15, 3.570348091883284324e+15,
+        1.113971254034978026e+16, 3.603374982229766184e+16, 1.209803708182151942e+17, 4.220890251904870611e+17,
+        1.532169872312865862e+18, 5.793890867821715890e+18, 2.285379920879842924e+19, 9.415714369232187727e+19,
+        4.057471211245170887e+20, 1.831405465804324767e+21, 8.671209773404504008e+21, 4.313209261217173994e+22,
+        2.257498454242656934e+23, 1.245267136898199709e+24, 7.251536499435180219e+24, 4.465573963364524765e+25,
+        2.913233420596266283e+26, 2.017063171206072979e+27, 1.485014353353330393e+28, 1.164811091759882662e+29,
+        9.753661264047912784e+29, 8.737124417851167566e+30, 8.390503265508677363e+31, 8.657362701430272680e+32,
+        9.619472292454361392e+33, 1.153735498483960294e+35, 1.497284701983562213e+36, 2.107816695320163748e+37,
+        3.227106623185610745e+38, 5.387696372515021985e+39, 9.835496017627849225e+40, 1.968904749086105300e+42,
+        4.334704147416758275e+43, 1.052717645113369473e+45, 2.829013521120326147e+46, 8.439656297525588822e+47,
+        2.804279894508234869e+49, 1.041383695988523864e+51, 4.337366591019718310e+52, 2.033523569151676725e+54,
+        1.077238847489773081e+56, 6.472891251891105455e+57, 4.429404678715878536e+59, 3.466135480828349864e+61,
+        3.114928656972704276e+63, 3.228947925415990689e+65, 3.878402486902381042e+67, 5.423187597439531197e+69,
+        8.870779393460412583e+71, 1.705832285076755970e+74, 3.876224350373120420e+76, 1.046359534886878004e+79,
+        3.373858809560757544e+81, 1.306762499786044015e+84, 6.115300889685679832e+86, 3.478550048884517349e+89,
+        2.420073578988056289e+92, 2.072453567501123129e+95, 2.199029867204449277e+98, 2.910868575802139983e+101,
+        4.840699137490951163e+104, 1.018669397739170369e+108, 2.733025017438095928e+111, 9.420797277586029837e+114,
+        4.205525105722885986e+118, 2.451352708852151939e+122, 1.881577053794165543e+126, 1.918506219134233785e+130,
+        2.622069659115564900e+134, 4.848463485415763756e+138, 1.224645005481997780e+143, 4.267387286482591954e+147,
+        2.072505613372582377e+152, };
+
+__constant__ double m_abscissas_double_8[786] =
+      { 1.323228129684237783e-161, 4.129002973520822791e-159, 1.178655462569548882e-156, 3.082189008893206231e-154, 
+        7.393542832199414487e-152, 1.629100644355328639e-149, 3.301545529059822941e-147, 6.162031390854241227e-145,
+        1.060528194470986309e-142, 1.685225757497235089e-140, 2.475534097582263629e-138, 3.365764749507587192e-136,
+        4.240562683924022383e-134, 4.956794227885611715e-132, 5.381716367914161520e-130, 5.433507172294988849e-128,
+        5.107031242794315420e-126, 4.473704932098646394e-124, 3.656376947377888629e-122, 2.791170022694259001e-120,
+        1.992200238692415032e-118, 1.330894359393789718e-116, 8.330356767359890503e-115, 4.890256639970245146e-113,
+        2.695128935451165447e-111, 1.395829605415630844e-109, 6.799997527188085942e-108, 3.119037767379032293e-106,
+        1.348260131419216291e-104, 5.497526018943990804e-103, 2.116384670251198533e-101, 7.699148714858061209e-100,
+        2.649065347250598345e-98, 8.628189263549727753e-97, 2.662520943248368922e-95, 7.790698623582886341e-94,
+        2.163354866683077281e-92, 5.705576739797220361e-91, 1.430338193028564913e-89, 3.411040781372328747e-88,
+        7.744268073516449037e-87, 1.675136564303435813e-85, 3.454795810595704816e-84, 6.798573137099477363e-83,
+        1.277474708033782661e-81, 2.293702139426309483e-80, 3.938021700015175030e-79, 6.469593934876300124e-78,
+        1.017725266990912471e-76, 1.534019529793324951e-75, 2.216999886838860916e-74, 3.074100747562803362e-73,
+        4.092295330837549092e-72, 5.233434175636538471e-71, 6.433506079763357418e-70, 7.607042677901362161e-69,
+        8.656714387163425357e-68, 9.486746058685489974e-67, 1.001756724248288397e-65, 1.019853943834854330e-64,
+        1.001591106610665630e-63, 9.494277822444263952e-63, 8.691422918891890649e-62, 7.687977047887448276e-61,
+        6.574408104196605248e-60, 5.438162502918425191e-59, 4.353340831363003212e-58, 3.374338762181243411e-57,
+        2.533770921173042330e-56, 1.844048925248616738e-55, 1.301410812308480184e-54, 8.910466744374470063e-54,
+        5.921538384124132331e-53, 3.821356134297705127e-52, 2.395780657353036891e-51, 1.459882187581820236e-50,
+        8.650105472076777327e-50, 4.985933550797199316e-49, 2.796911903237435916e-48, 1.527570118993503332e-47,
+        8.126314048196993302e-47, 4.212436363948578182e-46, 2.128604050242564662e-45, 1.048938356323431072e-44,
+        5.042753142653687842e-44, 2.365999225494165364e-43, 1.083813462091040325e-42, 4.848963367960316169e-42,
+        2.119612873737657277e-41, 9.055947139022002648e-41, 3.782987192192666650e-40, 1.545649846917574765e-39,
+        6.178909752126026357e-39, 2.417597558625940386e-38, 9.261305999966332746e-38, 3.474712971194656115e-37,
+        1.277215890629181345e-36, 4.600938133935473864e-36, 1.624804314773052044e-35, 5.626808103137929972e-35,
+        1.911442429947086471e-34, 6.371300415498187125e-34, 2.084444531309441237e-33, 6.695356060065574234e-33,
+        2.112038435637792931e-32, 6.544802906551512393e-32, 1.992864937623987114e-31, 5.964358817764151755e-31,
+        1.754973231464949500e-30, 5.078231558861773863e-30, 1.445447866528259475e-29, 4.048099759391660786e-29,
+        1.115752878927994221e-28, 3.027334168442338592e-28, 8.087868498106224788e-28, 2.128106544151858936e-27,
+        5.516210113930227985e-27, 1.408890921124863906e-26, 3.546520734326774807e-26, 8.800636481096360494e-26,
+        2.153319509043984465e-25, 5.196136544731926346e-25, 1.236869058422202190e-24, 2.904891674490918873e-24,
+        6.732707317563258763e-24, 1.540253603361391055e-23, 3.478765727687221019e-23, 7.758450079933031976e-23,
+        1.708939324269830276e-22, 3.718467010568811152e-22, 7.994094376769029920e-22, 1.698336774318343123e-21,
+        3.566214469724002275e-21, 7.402848534866351662e-21, 1.519411719755297549e-20, 3.083993994528608740e-20,
+        6.191388817974459809e-20, 1.229625987010589227e-19, 2.416245949308411084e-19, 4.698551818749419706e-19,
+        9.042992978848520439e-19, 1.722880198390020817e-18, 3.249832858354112322e-18, 6.070120594586457562e-18,
+        1.122871881646098441e-17, 2.057429235664205922e-17, 3.734613207742816399e-17, 6.716694369267842075e-17,
+        1.197063025055043952e-16, 2.114419661115663617e-16, 3.702017138231021853e-16, 6.425665498746337860e-16,
+        1.105830903726985419e-15, 1.887156051660563224e-15, 3.193979018679125833e-15, 5.361881977473204459e-15,
+        8.929318568606692809e-15, 1.475330560958586660e-14, 2.418708636765824964e-14, 3.935078350904051302e-14,
+        6.354047096308654479e-14, 1.018416666466509442e-13, 1.620423782999307693e-13, 2.559817517056126166e-13,
+        4.015273886294212810e-13, 6.254532358261761291e-13, 9.675981021394182858e-13, 1.486832112534566186e-12,
+        2.269557377760486879e-12, 3.441736008766365832e-12, 5.185793859860652413e-12, 7.764217889314004663e-12,
+        1.155228105746548036e-11, 1.708313121464262097e-11, 2.510951856086201897e-11, 3.668776978510952341e-11,
+        5.329131813941740314e-11, 7.696325397299480856e-11, 1.105200723643722855e-10, 1.578221843796034825e-10,
+        2.241309672940976766e-10, 3.165773201144956642e-10, 4.447730510871610704e-10, 6.216041661455164049e-10,
+        8.642544905395987868e-10, 1.195519306516659349e-09, 1.645482121417189823e-09, 2.253643612941620883e-09,
+        3.071610576496751310e-09, 4.166474690460445927e-09, 5.625036504185181035e-09, 7.559059638953998396e-09,
+        1.011177417876491092e-08, 1.346588701906267454e-08, 1.785340092957703350e-08, 2.356759364235337519e-08,
+        3.097756373337616088e-08, 4.054581171302714730e-08, 5.284939280085554173e-08, 6.860525247854168448e-08,
+        8.870043714076795346e-08, 1.142279599340281637e-07, 1.465291959965373757e-07, 1.872437814520259903e-07,
+        2.383680961705324062e-07, 3.023235208219232784e-07, 3.820357732606947876e-07, 4.810267467496160044e-07,
+        6.035203917139166314e-07, 7.545643021775656875e-07, 9.401687861337141280e-07, 1.167465314019272078e-06,
+        1.444886349199346242e-06, 1.782368666762205796e-06, 2.191582359683820240e-06, 2.686187812137005286e-06,
+        3.282122985909738110e-06, 3.997923415034129149e-06, 4.855077333283880469e-06, 5.878418366687560187e-06,
+        7.096558206229387964e-06, 8.542361632206236097e-06, 1.025346618920209381e-05, 1.227284870748632855e-05,
+        1.464944073127878202e-05, 1.743879474552002742e-05, 2.070380288967650755e-05, 2.451546960924430874e-05,
+        2.895373942298085844e-05, 3.410838067694928604e-05, 4.007992581615393488e-05, 4.698066833232878622e-05,
+        5.493571614427227251e-05, 6.408410073746518169e-05, 7.457994093551813828e-05, 8.659365970069775654e-05,
+        1.003132518682442285e-04, 1.159456002136906496e-04, 1.337178367385581674e-04, 1.538787455425709779e-04,
+        1.767002031351005554e-04, 2.024786515302844608e-04, 2.315365989746650402e-04, 2.642241426787982083e-04,
+        3.009205074706080013e-04, 3.420355938637258307e-04, 3.880115286439000550e-04, 4.393242107257947798e-04,
+        4.964848447258090522e-04, 5.600414544382562271e-04, 6.305803681962314437e-04, 7.087276679481586600e-04,
+        7.951505937892094439e-04, 8.905588956558126794e-04, 9.957061239230124343e-04, 1.111390850739538593e-03,
+        1.238457814094548688e-03, 1.377798976832850428e-03, 1.530354493121150144e-03, 1.697113575214988470e-03,
+        1.879115253782404405e-03, 2.077449025503311209e-03, 2.293255382179820056e-03, 2.527726216158548279e-03,
+        2.782105097477072741e-03, 3.057687418798497807e-03, 3.355820404885606963e-03, 3.677902984083964409e-03,
+        4.025385520026097270e-03, 4.399769402530814407e-03, 4.802606497446985045e-03, 5.235498455973840111e-03,
+        5.700095884774212336e-03, 6.198097378977308725e-03, 6.731248420937948614e-03, 7.301340148374219834e-03,
+        7.910207996239952125e-03, 8.559730217397303903e-03, 9.251826287833445298e-03, 9.988455202809488913e-03,
+        1.077161367093554544e-02, 1.160333421372954856e-02, 1.248568317873621646e-02, 1.342075867475355427e-02,
+        1.441068843813546585e-02, 1.545762763950860648e-02, 1.656375664055830135e-02, 1.773127871080136402e-02,
+        1.896241771447260382e-02, 2.025941577780677588e-02, 2.162453094709917839e-02, 2.306003484797691421e-02,
+        2.456821035631025318e-02, 2.615134929114115217e-02, 2.781175013990572523e-02, 2.955171582608151263e-02,
+        3.137355152920124081e-02, 3.327956256694509270e-02, 3.527205234875621605e-02, 3.735332041012234938e-02,
+        3.952566053633324126e-02, 4.179135898416228534e-02, 4.415269280953487221e-02, 4.661192830883879903e-02,
+        4.917131958110712872e-02, 5.183310721786459418e-02, 5.459951712697841302e-02, 5.747275949639657337e-02,
+        6.045502790319455825e-02, 6.354849857288828754e-02, 6.675532979350985865e-02, 7.007766148848641979e-02,
+        7.351761495191403887e-02, 7.707729274938041525e-02, 8.075877878706524317e-02, 8.456413855143733669e-02,
+        8.849541952147546057e-02, 9.255465175496720496e-02, 9.674384865008904765e-02, 1.010650078831426502e-01,
+        1.055201125230189472e-01, 1.101111323226840632e-01, 1.148400251877307103e-01, 1.197087388218165293e-01,
+        1.247192125486176994e-01, 1.298733793097628269e-01, 1.351731678380792159e-01, 1.406205050053816316e-01,
+        1.462173183439629526e-01, 1.519655387409069424e-01, 1.578671033043359383e-01, 1.639239584007306411e-01,
+        1.701380628625154331e-01, 1.765113913651907042e-01, 1.830459379734134606e-01, 1.897437198555789051e-01,
+        1.966067811666385690e-01, 2.036371970991047974e-01, 2.108370781024367852e-01, 2.182085742712797843e-01,
+        2.257538799033364379e-01, 2.334752382279873511e-01, 2.413749463071469410e-01, 2.494553601102403241e-01,
+        2.577188997656175820e-01, 2.661680549911833443e-01, 2.748053907075124803e-01, 2.836335528372471376e-01,
+        2.926552742951268547e-01, 3.018733811735925662e-01, 3.112907991295277084e-01, 3.209105599783561596e-01,
+        3.307358085024083972e-01, 3.407698094811951648e-01, 3.510159549519934555e-01, 3.614777717099542274e-01,
+        3.721589290577866932e-01, 3.830632468159621812e-01, 3.941947036053136035e-01, 4.055574454148868711e-01,
+        4.171557944689308074e-01, 4.289942584079951543e-01, 4.410775398002453309e-01, 4.534105460003012245e-01,
+        4.659983993741692944e-01, 4.788464479101668631e-01, 4.919602762371392109e-01, 5.053457170727489659e-01, 
+        5.190088631261786795e-01, 5.329560794812372669e-01, 5.471940164876055195e-01, 5.617296231898020413e-01, 
+        5.765701613254061793e-01, 5.917232199261468491e-01, 6.071967305576643327e-01, 6.229989832360855492e-01, 
+        6.391386430620321596e-01, 6.556247676153161584e-01, 6.724668251563812272e-01, 6.896747136835329047e-01, 
+        7.072587808981804764e-01, 7.252298451337033758e-01, 7.435992173071710726e-01, 7.623787239570054101e-01, 
+        7.815807314337971290e-01, 8.012181713158943859e-01, 8.213045671260926392e-01, 8.418540624307963733e-01, 
+        8.628814504084197628e-01, 8.844022049795737430e-01, 9.064325135977815717e-01, 9.289893118061069464e-01, 
+        9.520903196722039764e-01, 9.757540802219457353e-01, 1.000000000000000000e+00, 1.024848391894543008e+00, 
+        1.050320520372784475e+00, 1.076438649284173871e+00, 1.103226092399127978e+00, 1.130707266862927052e+00, 
+        1.158907749757141229e+00, 1.187854337974646084e+00, 1.217575111629048984e+00, 1.248099501235266386e+00, 
+        1.279458358915164500e+00, 1.311684033900709062e+00, 1.344810452627081143e+00, 1.378873203729832710e+00, 
+        1.413909628283517352e+00, 1.449958915644490754e+00, 1.487062205287898607e+00, 1.525262695058439148e+00, 
+        1.564605756286502811e+00, 1.605139056255971231e+00, 1.646912688547541313e+00, 1.689979311822189937e+00, 
+        1.734394297653598793e+00, 1.780215888066332921e+00, 1.827505363488657555e+00, 1.876327221885466881e+00,
+        1.926749369898304239e+00, 1.978843326886336694e+00, 2.032684442834914613e+00, 2.088352131177556992e+00,
+        2.145930117663470432e+00, 2.205506706496711366e+00, 2.267175065075584681e+00, 2.331033528772661605e+00,
+        2.397185927317806037e+00, 2.465741934479827004e+00, 2.536817442887937264e+00, 2.610534965993323711e+00,
+        2.687024069345184956e+00, 2.766421833546071979e+00, 2.848873351459948781e+00, 2.934532262474922666e+00,
+        3.023561326873131923e+00, 3.116133043635102211e+00, 3.212430315307524598e+00, 3.312647163894682976e+00, 
+        3.416989502097797957e+00, 3.525675964626843197e+00, 3.638938804749809967e+00, 3.757024861729272487e+00, 
+        3.880196605330264341e+00, 4.008733264172298986e+00, 4.142932045347867609e+00, 4.283109453446644399e+00, 
+        4.429602717916437040e+00, 4.582771338567048147e+00, 4.742998759991079249e+00, 4.910694186746867507e+00, 
+        5.086294552335034437e+00, 5.270266656314831820e+00, 5.463109485364516396e+00, 5.665356735708146927e+00, 
+        5.877579556128345480e+00, 6.100389532781943879e+00, 6.334441939256981670e+00, 6.580439277782222274e+00, 
+        6.839135140254664526e+00, 7.111338420820842566e+00, 7.397917915172903763e+00, 7.699807345544508469e+00, 
+        8.018010854664294474e+00, 8.353609016702406728e+00, 8.707765418592385473e+00, 9.081733871099147484e+00, 
+        9.476866315716376006e+00, 9.894621501007146275e+00, 1.033657451045679019e+01, 1.080442723340841910e+01, 
+        1.130001988133777781e+01, 1.182534366375335115e+01, 1.238255475156052427e+01, 1.297398967101161563e+01, 
+        1.360218228861306245e+01, 1.426988256684760289e+01, 1.498007729260327644e+01, 1.573601300513857081e+01, 
+        1.654122137866316500e+01, 1.739954734664685784e+01, 1.831518029132688981e+01, 1.929268866318984532e+01, 
+        2.033705844217826172e+01, 2.145373590584482942e+01, 2.264867523060898736e+01, 2.392839152177298272e+01, 
+        2.530001994731418268e+01, 2.677138174118011529e+01, 2.835105794560498805e+01, 3.004847188085487195e+01, 
+        3.187398146713610639e+01, 3.383898267989664904e+01, 3.595602559959535672e+01, 3.823894472392493310e+01, 
+        4.070300544879345396e+01, 4.336506889917953679e+01, 4.624377760823269784e+01, 4.935976490967979071e+01, 
+        5.273589133292714765e+01, 5.639751178186770847e+01, 6.037277784867852275e+01, 6.469298027622754351e+01, 
+        6.939293735292118365e+01, 7.451143592061966836e+01, 8.009173272176674066e+01, 8.618212503236856949e+01, 
+        9.283660095406551480e+01, 1.001155814082968890e+02, 1.080867678325352448e+02, 1.168261118752949279e+02, 
+        1.264189260858047240e+02, 1.369611577708331715e+02, 1.485608519349011866e+02, 1.613398336385932743e+02, 
+        1.754356453320629017e+02, 1.910037809024609590e+02, 2.082202655019913565e+02, 2.272846389233001078e+02, 
+        2.484234106336023257e+02, 2.718940668983047258e+02, 2.979897251188232016e+02, 3.270445480633676878e+02, 
+        3.594400516741229885e+02, 3.956124653087335485e+02, 4.360613334959077953e+02, 4.813595846269808355e+02, 
+        5.321653357808338203e+02, 5.892357556996862196e+02, 6.534433717775449045e+02, 7.257952842284018994e+02, 
+        8.074558443729566627e+02, 8.997734679339701200e+02, 1.004312392957944252e+03, 1.122890361185594877e+03,
+        1.257623408459775530e+03, 1.410979202907522234e+03, 1.585840680166573460e+03, 1.785582106601447262e+03, 
+        2.014160171499825914e+03, 2.276223289283167479e+03, 2.577243010007973485e+03, 2.923672325162804598e+03, 
+        3.323136759290736047e+03, 3.784665511113575050e+03, 4.318971620160236406e+03, 4.938792274850918489e+03, 
+        5.659303058273368331e+03, 6.498623292476395004e+03, 7.478433875318933386e+03, 8.624734342286166238e+03, 
+        9.968772633484590145e+03, 1.154818959559393902e+04, 1.340843110702649390e+04, 1.560449453908580443e+04, 
+        1.820309391023133793e+04, 2.128535066649680777e+04, 2.495014598048375046e+04, 2.931830770482188047e+04,
+        3.453785313845473397e+04, 4.079057084931056631e+04, 4.830030527863206410e+04, 5.734341246586992004e+04,
+        6.826199159022146453e+04, 8.148067525594191464e+04, 9.752799507478730867e+04, 1.170636462204808295e+05,
+        1.409133795481584143e+05, 1.701137853111825512e+05, 2.059699426710509940e+05, 2.501298539735692463e+05,
+        3.046808435555379486e+05, 3.722747886360361411e+05, 4.562913164460176067e+05, 5.610511554921845541e+05, 
+        6.920959565810343691e+05, 8.565564972181198149e+05, 1.063638800552326000e+06, 1.325268101226286025e+06,
+        1.656944841847240121e+06, 2.078886479301160156e+06, 2.617555920130068069e+06, 3.307714852226224955e+06,
+        4.195192293202626259e+06, 5.340631300250745566e+06, 6.824578495767020734e+06, 8.754424053248831818e+06,
+        1.127390159772263517e+07, 1.457614342739689625e+07, 1.892169326841938100e+07, 2.466345986800667442e+07,
+        3.228142821711217588e+07, 4.243114571539869754e+07, 5.601173714434088431e+07, 7.426172509723072112e+07,
+        9.889461357830121731e+07, 1.322915875470427182e+08, 1.777766240727455981e+08, 2.400110583389834263e+08,
+        3.255621033641982742e+08, 4.437258820593761403e+08, 6.077246218504877165e+08, 8.364565879857375417e+08,
+        1.157066594326456169e+09, 1.608740826498742961e+09, 2.248337657948688269e+09, 3.158785978851336228e+09,
+        4.461677081363911380e+09, 6.336244831048209270e+09, 9.048130159588677560e+09, 1.299321362309972265e+10,
+        1.876478261212947929e+10, 2.725703976712888971e+10, 3.982553459064288940e+10, 5.853727794017415415e+10,
+        8.656299089553103385e+10, 1.287959733041898747e+11, 1.928345065430099883e+11, 2.905510467545806044e+11,
+        4.406145488098485809e+11, 6.725708918778493152e+11, 1.033486938212196930e+12, 1.598840557086695854e+12,
+        2.490490134218272825e+12, 3.906528466724583921e+12, 6.171225147961354244e+12, 9.819163736485109137e+12,
+        1.573800106991564475e+13, 2.541245461530031221e+13, 4.134437628407981776e+13, 6.778141973485971528e+13,
+        1.119906286595884492e+14, 1.865016806041768967e+14, 3.130890948724989738e+14, 5.298978847669068280e+14,
+        9.042973899804181753e+14, 1.556259036818991439e+15, 2.701230066368200812e+15, 4.729430105054711279e+15,
+        8.353779033096586530e+15, 1.488827606293191651e+16, 2.677653466031614956e+16, 4.860434481369499270e+16,
+        8.905735519300993312e+16, 1.647413728306871552e+17, 3.077081325673016377e+17, 5.804234101329097680e+17,
+        1.105828570628099614e+18, 2.128315358808074026e+18, 4.138651532085235581e+18, 8.132554212123920035e+18,
+        1.615146503312570855e+19, 3.242548467260718193e+19, 6.581494581080701321e+19, 1.350831366183090003e+20,
+        2.804093832520937396e+20, 5.888113683467563837e+20, 1.250923435312468276e+21, 2.689280279098215635e+21,
+        5.851582825664479700e+21, 1.288917231788944660e+22, 2.874582763768997631e+22, 6.492437335109217869e+22,
+        1.485286605867082177e+23, 3.442469159113307066e+23, 8.084930196860438207e+23, 1.924506778048094878e+24,
+        4.643992662491470729e+24, 1.136281452083591334e+25, 2.819664891060694571e+25, 7.097781559991856367e+25,
+        1.812838850127688486e+26, 4.699012851344539124e+26, 1.236419707162832951e+27, 3.303236261210411286e+27,
+        8.962558097638891218e+27, 2.470294852986226117e+28, 6.918270960555942883e+28, 1.969189447958411510e+29,
+        5.698092609453981289e+29, 1.676626156396922084e+30, 5.017901520171556970e+30, 1.527929892279834489e+31,
+        4.734762318366711949e+31, 1.493572546446777040e+32, 4.797441164681908184e+32, 1.569538296400998732e+33,
+        5.231651156910242454e+33, 1.777206511525290941e+34, 6.154587299576916134e+34, 2.173469781356604872e+35,
+        7.829529896526581616e+35, 2.877935554073076917e+36, 1.079761320923458592e+37, 4.136337730951207042e+37,
+        1.618408489711185844e+38, 6.469770640447824771e+38, 2.643413654859316358e+39, 1.104246728308525703e+40,
+        4.717842641881260665e+40, 2.062296462389327711e+41, 9.226680005161257219e+41, 4.226544071632731963e+42,
+        1.983043729707066518e+43, 9.533448690970155039e+43, 4.697914578740208606e+44, 2.373923101980436574e+45,
+        1.230570211868531753e+46, 6.546344338411695147e+46, 3.575371819335804914e+47, 2.005642453538335506e+48,
+        1.156055268028903078e+49, 6.849867807870312958e+49, 4.174004815218951121e+50, 2.616872034052857472e+51,
+        1.688750346837297725e+52, 1.122275666009684101e+53, 7.683968740248677071e+53, 5.422849612654278583e+54,
+        3.946686701799533415e+55, 2.963543587288132884e+56, 2.297086395798939516e+57, 1.838856414208555761e+58,
+        1.521049475711243996e+59, 1.300732291175071112e+60, 1.150559591141716740e+61, 1.053265997373725461e+62,
+        9.984114209879020836e+62, 9.805325615938694719e+63, 9.982463564199115995e+64, 1.054102211457911410e+66,
+        1.155172684780782463e+67, 1.314571302334116663e+68, 1.554362407685457310e+69, 1.910791206002645077e+70,
+        2.443616403890711206e+71, 3.252983822318823232e+72, 4.510600140020139737e+73, 6.518821831001902447e+74,
+        9.825834460774267633e+75, 1.545692063622722856e+77, 2.539346088408163253e+78, 4.359763993811836117e+79,
+        7.827943627464404744e+80, 1.470896877674301183e+82, 2.894527071420674290e+83, 5.969662541607915492e+84,
+        1.291277613981057357e+86, 2.931656535626877923e+87, 6.991353547531463135e+88, 1.752671194525972852e+90,
+        4.622450137056020715e+91, 1.283581933169566226e+93, 3.755839001138390788e+94, 1.158991729845978702e+96,
+        3.774916315438862678e+97, 1.298844894462381673e+99, 4.725038949943384889e+100, 1.819000031203286740e+102,
+        7.416966330876906188e+103, 3.206116996910598204e+105, 1.470588770071975193e+107, 7.164198238238641057e+108,
+        3.710397624567077270e+110, 2.044882454279709373e+112, 1.200428778654730225e+114, 7.513744370030172114e+115,
+        5.019575746343410636e+117, 3.582726927665698318e+119, 2.734947775877248560e+121, 2.235283764078944248e+123,
+        1.958084751118243323e+125, 1.840431913109305657e+127, 1.858143260692831108e+129, 2.017432949655777136e+131,
+        2.358177615888101494e+133, 2.971092974178603610e+135, 4.039532321435816302e+137, 5.933923069661132195e+139,
+        9.429263693444953240e+141, 1.622841456932873872e+144, 3.028884476067694180e+146, 6.138356175015339477e+148,
+        1.352531557191942648e+151, 3.244447362295582945e+153, };
+
+__constant__ double* m_abscissas_double[8] = {
+    m_abscissas_double_1,
+    m_abscissas_double_2,
+    m_abscissas_double_3,
+    m_abscissas_double_4,
+    m_abscissas_double_5,
+    m_abscissas_double_6,
+    m_abscissas_double_7,
+    m_abscissas_double_8,
+};
+
+__constant__ double m_weights_double_1[13] =
+      { 2.703640234162693583e-160, 3.100862940179668765e-58, 5.828334625665462970e-21, 1.628894422402653830e-07,
+        8.129907377394029252e-03, 2.851214447180802931e-01, 1.228894002317118650e+00, 9.374610761705565881e+00,
+        6.136846875218162167e+02, 8.367995944653844271e+06, 2.286032371256753845e+17, 9.029964022492184559e+44,
+        1.637973037681055808e+119, };
+
+__constant__ double m_weights_double_2[12] =
+      { 1.029757744225565290e-96, 5.564174008086804112e-35, 1.534846576427062716e-12, 1.519539651119905182e-04,
+        7.878691652861874032e-02, 6.288072016384128612e-01, 2.842403831496369386e+00, 5.152309209026500589e+01,
+        2.554172947873109927e+04, 8.291547503290989754e+10, 6.794911791960761587e+27, 1.108995159102362663e+73, };
+
+__constant__ double m_weights_double_3[25] =
+      { 1.545310485347377408e-124, 4.549745016271158113e-75, 3.781189989988588481e-45, 4.369440793304363176e-27,
+        3.253896178006708087e-16, 1.057239289288944987e-09, 7.826174663495492476e-06, 1.459783224353939263e-03,
+        2.972970552567852420e-02, 1.637950661613330541e-01, 4.392303913269138921e-01, 8.744243777287317807e-01,
+        1.804759465860974506e+00, 4.894937215283148383e+00, 2.036214502429748943e+01, 1.576549789679037479e+02,
+        3.249553828744194733e+03, 3.335686029489862584e+05, 4.858218914917275532e+08, 5.655171002571584464e+13,
+        9.084276291356790926e+21, 2.202757570781655071e+35, 1.851176020895552142e+57, 1.873046373612647920e+93,
+        3.113183070605141140e+152, };
+
+__constant__ double m_weights_double_4[49] =
+      { 2.690380169654157101e-141, 9.388760099830475385e-110, 3.267856956418766261e-85, 4.012903562780032075e-66,
+        2.794595941054873674e-51, 9.598140333687791635e-40, 8.762766371925782803e-31, 7.896919977115783593e-24,
+        1.951680620313826776e-18, 2.931867534349928041e-14, 4.976350908135118762e-11, 1.546933241860617074e-08,
+        1.283189791774752963e-06, 3.809052946018782340e-05, 5.087526585392884730e-04, 3.656819625189471368e-03,
+        1.627679402690602992e-02, 5.011672130624018967e-02, 1.165913368715250324e-01, 2.201514148384271336e-01,
+        3.581909054968942386e-01, 5.288599003801643436e-01, 7.422823219366348741e-01, 1.032914080772662205e+00,
+        1.478415067523268199e+00, 2.242226697017918644e+00, 3.684755742578570582e+00, 6.677326887819023056e+00,
+        1.358063058433697357e+01, 3.171262375809110066e+01, 8.776338468947827779e+01, 3.006939713363920293e+02,
+        1.352196150715330628e+03, 8.616353573310419356e+03, 8.591849573350877359e+04, 1.523635814554291966e+06,
+        5.663834603448267056e+07, 5.450828629396188577e+09, 1.780881993484818221e+12, 2.797112703281894578e+15,
+        3.300887168363313931e+19, 5.192538272313512016e+24, 2.273085973059979872e+31, 7.124498195222272142e+39,
+        5.379592741425673874e+50, 4.647296508337283075e+64, 3.395147156494395571e+82, 2.736576372417856435e+105,
+        6.584825756536212781e+134, };
+
+__constant__ double m_weights_double_5[98] =
+      { 1.692276285171240629e-150, 1.180420021590838281e-132, 6.494931071412232065e-117, 4.979673804239645358e-103, 
+        8.790122245397054202e-91, 5.564311726870413043e-80, 1.867634664877268411e-70, 4.693767384843440310e-62,
+        1.197772698674604837e-54, 4.060530886983702887e-48, 2.318268710612758367e-42, 2.748088060676949794e-37,
+        8.136086869664039226e-33, 7.081491999860360593e-29, 2.092407629019781417e-25, 2.383020547076997517e-22,
+        1.170143938604536054e-19, 2.734857915002515580e-17, 3.319894174569245506e-15, 2.260825106530477104e-13,
+        9.244747974241858562e-12, 2.410325858091057071e-10, 4.224928060220423782e-09, 5.217223349652829804e-08,
+        4.730110697329046717e-07, 3.265522864288710545e-06, 1.772851678458610971e-05, 7.787346612077215804e-05,
+        2.838101678971546354e-04, 8.775026198694109646e-04, 2.347474744139291716e-03, 5.529174974874315725e-03,
+        1.164520226280038968e-02, 2.223487842904240574e-02, 3.896253311038730452e-02, 6.334975706136386464e-02,
+        9.651712033300261848e-02, 1.390236708907266445e-01, 1.908593745910709887e-01, 2.515965688234414960e-01,
+        3.206651646562737595e-01, 3.976974208167367099e-01, 4.828935799767836828e-01, 5.773826389735376677e-01,
+        6.835838865575605461e-01, 8.056083579298257627e-01, 9.497742078309479997e-01, 1.125351459431134254e+00,
+        1.345711576612114788e+00, 1.630156867495860456e+00, 2.006880650908830857e+00, 2.517828844916874130e+00,
+        3.226826819856410846e+00, 4.233461155863004269e+00, 5.697400323487776530e+00, 7.882247346334201378e+00,
+        1.123717929435969530e+01, 1.655437952523069781e+01, 2.528458931361129124e+01, 4.019700050163276117e+01,
+        6.682515670231120695e+01, 1.168022589948424530e+02, 2.160045684819153702e+02, 4.257255901158116698e+02,
+        9.017180693982791021e+02, 2.072151523320542727e+03, 5.222689557952776194e+03, 1.461663959276604441e+04,
+        4.606455611513396576e+04, 1.660950339384278845e+05, 6.976630616605097333e+05, 3.484240083705972727e+06,
+        2.117385064786894718e+07, 1.607368605379557548e+08, 1.570235957877638143e+09, 2.041619284762317483e+10,
+        3.670425964529826371e+11, 9.527196643411724126e+12, 3.749667772735766186e+14, 2.365380223523087981e+16,
+        2.546815287226970627e+18, 5.026010591299970789e+20, 1.970775914722195502e+23, 1.682531038342715298e+26,
+        3.469062187981719410e+29, 1.942614547946028081e+33, 3.375034694941022784e+37, 2.115298406181711256e+42,
+        5.673738540911562268e+47, 7.904099301170483654e+53, 7.121903115084356741e+60, 5.321820777644930491e+68,
+        4.370977753639010591e+77, 5.429657931755513797e+87, 1.464602226824232950e+99, 1.292445035662836561e+112,
+        5.936633203060705474e+126, 2.402419924621336913e+143, };
+
+__constant__ double m_weights_double_6[196] =
+      { 2.552410363565288863e-155, 7.965872719315690060e-146, 6.586401422963018216e-137, 1.563673437419490296e-128, 
+        1.149636272392214573e-120, 2.810189759625314580e-113, 2.441446149780773329e-106, 8.026292508555041710e-100,
+        1.059034284623927886e-93, 5.927259046205893861e-88, 1.482220909125121967e-82, 1.738946448501809732e-77,
+        1.002047910184021813e-72, 2.960929073720769637e-68, 4.671749731809402860e-64, 4.088398674807775827e-60,
+        2.056642628601930023e-56, 6.149878578966749305e-53, 1.128142221531950274e-49, 1.307702777646013040e-46,
+        9.848757125541659318e-44, 4.946847667192787369e-41, 1.698284656321589089e-38, 4.077947349805764486e-36,
+        6.998897321243266048e-34, 8.762183229651405846e-32, 8.156281709801700633e-30, 5.747366069381804213e-28,
+        3.117951907317865517e-26, 1.323052992594482858e-24, 4.457166057119926322e-23, 1.208896132634708032e-21,
+        2.674697849739340358e-20, 4.887394807742436672e-19, 7.461632083041868391e-18, 9.622230748739818989e-17,
+        1.058884510032627118e-15, 1.003988180288807180e-14, 8.276358838778374127e-14, 5.982281469656734375e-13,
+        3.821855766886203088e-12, 2.174279097299082001e-11, 1.109294120074848583e-10, 5.109055596902086022e-10,
+        2.137447956882816268e-09, 8.170468538364022161e-09, 2.869308592926374871e-08, 9.305185930419436742e-08,
+        2.800231592227134982e-07, 7.855263634214717091e-07, 2.062924236714395731e-06, 5.092224131071637441e-06,
+        1.185972357373608535e-05, 2.615333473470835518e-05, 5.479175746096322166e-05, 1.093962713107868416e-04,
+        2.087714243290528595e-04, 3.818797556417767457e-04, 6.712796918790164790e-04, 1.136760145626956604e-03,
+        1.858775505765622915e-03, 2.941191222579735746e-03, 4.512821350378020080e-03, 6.727293426938802892e-03,
+        9.760915371480980900e-03, 1.380842853102550981e-02, 1.907678055354397196e-02, 2.577730275571060412e-02,
+        3.411688991056810143e-02, 4.428892397843486143e-02, 5.646473816310556552e-02, 7.078637998740884103e-02,
+        8.736131246718460273e-02, 1.062595125372295046e-01, 1.275132133780278017e-01, 1.511193209351630349e-01,
+        1.770443400812491404e-01, 2.052314915777496186e-01, 2.356095985715091716e-01, 2.681032744853198083e-01,
+        3.026439500331752405e-01, 3.391813282438962329e-01, 3.776949427111484449e-01, 4.182056049753837852e-01,
+        4.607866519948383101e-01, 5.055750360563806155e-01, 5.527824318481410262e-01, 6.027066663808878454e-01,
+        6.557439076684384801e-01, 7.124021812071310501e-01, 7.733169258916167748e-01, 8.392694625821144443e-01,
+        9.112094418201526544e-01, 9.902825786957198607e-01, 1.077865293953107863e+00, 1.175608288920191064e+00,
+        1.285491624542001346e+00, 1.409894601042286311e+00, 1.551684711657329886e+00, 1.714331263928885829e+00,
+        1.902051053858215699e+00, 2.119995922515087770e+00, 2.374495377438728901e+00, 2.673372087884984440e+00,
+        3.026354489757871517e+00, 3.445619726158519068e+00, 3.946512819227006419e+00, 4.548505964859933724e+00,
+        5.276487613615791435e+00, 6.162508226184798743e+00, 7.248163842886806184e+00, 8.587878410768473380e+00,
+        1.025346434903602082e+01, 1.234051869120733230e+01, 1.497748183201988157e+01, 1.833859935862139637e+01,
+        2.266266859437541631e+01, 2.828045768298752298e+01, 3.565528397044830339e+01, 4.544381261232990127e+01,
+        5.858833744254070379e+01, 7.645876087681923606e+01, 1.010741758687003802e+02, 1.354538987141142977e+02,
+        1.841824059064608872e+02, 2.543337025162468240e+02, 3.570103970895535977e+02, 5.099537256432247190e+02,
+        7.420561390174965949e+02, 1.101323941193719451e+03, 1.669232910686306616e+03, 2.587203282090385703e+03,
+        4.106608602134535014e+03, 6.685657263550896700e+03, 1.118216368762133982e+04, 1.924811115485038079e+04,
+        3.416174865734933127e+04, 6.263882227839496242e+04, 1.189094418952240294e+05, 2.342262528110389793e+05,
+        4.798899889628646876e+05, 1.025279649144740527e+06, 2.290428015483177407e+06, 5.365618820221241118e+06,
+        1.322172034826883742e+07, 3.438296542047893623e+07, 9.468905314460992170e+07, 2.771843378168242512e+08,
+        8.658950437199969679e+08, 2.898779165825890846e+09, 1.044627762990198184e+10, 4.071673625087267154e+10,
+        1.725245696783106160e+11, 7.989856904303845909e+11, 4.067537100664303783e+12, 2.290253922913114847e+13,
+        1.435560574531699914e+14, 1.008680130601194048e+15, 8.003530334765274913e+15, 7.227937568629809266e+16,
+        7.491693576707361828e+17, 8.991671234614216799e+18, 1.261556024888540618e+20, 2.090038400033346091e+21,
+        4.132773073376509056e+22, 9.865671928781943336e+23, 2.877978132616007671e+25, 1.039303004928044064e+27,
+        4.710544722984128252e+28, 2.719194692980296464e+30, 2.030608169419634520e+32, 1.994536427964099457e+34,
+        2.622806931876485852e+36, 4.705142628855489738e+38, 1.174794916996875010e+41, 4.170574236544843559e+43,
+        2.153441953645800917e+46, 1.656794933445123415e+49, 1.948830907651317326e+52, 3.601980393005358786e+55,
+        1.077033440153993124e+59, 5.374188883861674378e+62, 4.625267105826449467e+66, 7.111646979020385006e+70,
+        2.027996051444846521e+75, 1.116168784120367146e+80, 1.237019821283735086e+85, 2.888108172342166477e+90,
+        1.490426937972460544e+96, 1.789306677271856318e+102, 5.276973875344766848e+108, 4.051217867886536330e+115,
+        8.611617868168979525e+122, 5.412634353380155695e+130, 1.078756609821147465e+139, 7.344353246966125053e+147, };
+
+__constant__ double m_weights_double_7[393] =
+      { 8.688318611421924613e-158, 6.864317997043424201e-153, 3.829638174036322920e-148, 1.524985558970066863e-143, 
+        4.379527631402474835e-139, 9.162408388991747001e-135, 1.410086556664696347e-130, 1.611529786006329005e-126,
+        1.380269212504431613e-122, 8.938739565456142404e-119, 4.414803004265274778e-115, 1.676831992534574674e-111,
+        4.937648515671545377e-108, 1.136068312653058895e-104, 2.057969760853201132e-101, 2.956779836249922681e-98,
+        3.393449014375824853e-95, 3.132619285740674842e-92, 2.341677665639346254e-89, 1.426656997926173190e-86,
+        7.128825597334931865e-84, 2.939485275517928205e-81, 1.006113300119903410e-78, 2.874969402023240560e-76,
+        6.896713338909433222e-74, 1.396405038640012785e-71, 2.398869799873387326e-69, 3.514180228970525006e-67,
+        4.411557600438730779e-65, 4.768408435763044172e-63, 4.458287229998440383e-61, 3.621710763086768959e-59,
+        2.567373174003034094e-57, 1.594829856885795944e-55, 8.716746897177859412e-54, 4.208424534880021226e-52,
+        1.801637343401221381e-50, 6.864432292330768862e-49, 2.336084584516383243e-47, 7.125716658075193173e-46,
+        1.954733295862350631e-44, 4.838195020814970471e-43, 1.083903033389729471e-41, 2.204655424309513426e-40,
+        4.083431629921110537e-39, 6.907095608064865023e-38, 1.069951518082577963e-36, 1.521972185061747284e-35,
+        1.993254198127980161e-34, 2.409552194902670884e-33, 2.695243589253751811e-32, 2.796309045342585624e-31,
+        2.697138787161831243e-30, 2.423968619042656074e-29, 2.034233848004972409e-28, 1.597498662808006882e-27,
+        1.176341105034547043e-26, 8.138404856556384931e-26, 5.300199402716282910e-25, 3.255367628680633536e-24,
+        1.889060856810273071e-23, 1.037502167741821871e-22, 5.402129194695882094e-22, 2.671080147950250592e-21,
+        1.256163163817414397e-20, 5.627458451375099018e-20, 2.405110192151924414e-19, 9.820723025892385774e-19,
+        3.836610965933493002e-18, 1.435949417965440387e-17, 5.155736116435221852e-17, 1.778106820243535736e-16,
+        5.897650538103448384e-16, 1.883545377386949394e-15, 5.799022727889041128e-15, 1.723080101027408120e-14,
+        4.946559668895564981e-14, 1.373437058883951037e-13, 3.692057356296675476e-13, 9.618669754374864080e-13,
+        2.430904641718059201e-12, 5.965319652795549281e-12, 1.422677541958913512e-11, 3.300412010407028696e-11,
+        7.453993539444124847e-11, 1.640317480539372495e-10, 3.519919455549922227e-10, 7.371241496931924727e-10,
+        1.507573517782825692e-09, 3.013444008176544118e-09, 5.891170930525923854e-09, 1.127175867596519203e-08,
+        2.112135943063526334e-08, 3.878572405868819131e-08, 6.984140168311147329e-08, 1.233979234102365865e-07,
+        2.140481233406505212e-07, 3.647293211756793211e-07, 6.108366265875129839e-07, 1.006020283089617901e-06,
+        1.630199379920459998e-06, 2.600430208375972125e-06, 4.085372746054298735e-06, 6.324194831966406940e-06,
+        9.650830226718535837e-06, 1.452455211307694488e-05, 2.156782506321975658e-05, 3.161234361554654466e-05,
+        4.575404320696170555e-05, 6.541767069965264068e-05, 9.243122234114186712e-05, 1.291101968446571125e-04,
+        1.783511762821284409e-04, 2.437337497712608884e-04, 3.296292528289701234e-04, 4.413142327104518440e-04,
+        5.850859955683163216e-04, 7.683770763700705263e-04, 9.998650298180469208e-04, 1.289573601590465490e-03,
+        1.648961132392222413e-03, 2.090991995585424661e-03, 2.630186988492201910e-03, 3.282648895332118799e-03,
+        4.066059914467245175e-03, 4.999648283080481820e-03, 6.104122218554241819e-03, 7.401570199659662364e-03,
+        8.915327597805008451e-03, 1.066981070009509413e-02, 1.269032020049755525e-02, 1.500281723149735994e-02,
+        1.763367592672867332e-02, 2.060941730962251417e-02, 2.395642996410886880e-02, 2.770068343772389725e-02,
+        3.186744063963193757e-02, 3.648097561865623097e-02, 4.156430303997019336e-02, 4.713892543167989540e-02,
+        5.322460385886412684e-02, 5.983915712308283792e-02, 6.699829390463281224e-02, 7.471548149065050122e-02,
+        8.300185389391494996e-02, 9.186616129460712899e-02, 1.013147618591979452e-01, 1.113516561340355690e-01,
+        1.219785634003157786e-01, 1.331950386328042665e-01, 1.449986280439946752e-01, 1.573850606313672716e-01,
+        1.703484726870446791e-01, 1.838816618814874884e-01, 1.979763672973498048e-01, 2.126235716643688402e-01,
+        2.278138220265254991e-01, 2.435375651517067386e-01, 2.597854941629632707e-01, 2.765489031191654411e-01,
+        2.938200465906351752e-01, 3.115925016510994851e-01, 3.298615301301230823e-01, 3.486244394295739435e-01,
+        3.678809406939879716e-01, 3.876335036292959599e-01, 4.078877077798518471e-01, 4.286525905940105684e-01,
+        4.499409931290513174e-01, 4.717699047639316286e-01, 4.941608088016098926e-01, 5.171400313514193966e-01,
+        5.407390963876342256e-01, 5.649950903858123945e-01, 5.899510404480374918e-01, 6.156563103475134535e-01,
+        6.421670194591982411e-01, 6.695464901047961714e-01, 6.978657294374126896e-01, 7.272039526349696447e-01,
+        7.576491548751669105e-01, 7.892987403432202489e-01, 8.222602173936578230e-01, 8.566519699682320391e-01,
+        8.926041164852169437e-01, 9.302594686857616145e-01, 9.697746043788558519e-01, 1.011321069700320644e+00,
+        1.055086728430498711e+00, 1.101277278143300224e+00, 1.150117955536247302e+00, 1.201855456275760449e+00,
+        1.256760098152647779e+00, 1.315128260359919236e+00, 1.377285136373095709e+00, 1.443587843343442141e+00,
+        1.514428937238563465e+00, 1.590240390338335337e+00, 1.671498096302065311e+00, 1.758726978084942299e+00,
+        1.852506785760205887e+00, 1.953478685110838140e+00, 2.062352754065132708e+00, 2.179916523112736371e+00,
+        2.307044718290330681e+00, 2.444710391817196957e+00, 2.593997656772008968e+00, 2.756116279277535182e+00,
+        2.932418425642610903e+00, 3.124417914187536020e+00, 3.333812383735923205e+00, 3.562508865047068391e+00,
+        3.812653330296280988e+00, 4.086664902155689132e+00, 4.387275531849634155e+00, 4.717576109385405085e+00,
+        5.081070154695596855e+00, 5.481736462718817995e+00, 5.924102347216244340e+00, 6.413329458204850426e+00,
+        6.955314549766230740e+00, 7.556808065486941215e+00, 8.225554008952760095e+00, 8.970455302965185036e+00,
+        9.801769746699598466e+00, 1.073134279679936208e+01, 1.177288477943655549e+01, 1.294230185297226511e+01,
+        1.425809217068106541e+01, 1.574182134943112610e+01, 1.741869467329444792e+01, 1.931824763074534781e+01,
+        2.147518163232618457e+01, 2.393037838236259586e+01, 2.673213477270754163e+01, 2.993767083537830673e+01,
+        3.361497689655818107e+01, 3.784508348524495401e+01, 4.272485990900652026e+01, 4.837047622725585887e+01,
+        5.492170063250241752e+01, 6.254725265973777743e+01, 7.145149574983117631e+01, 8.188283528217430591e+01,
+        9.414429671899321190e+01, 1.086069017070108772e+02, 1.257266497442910506e+02, 1.460661655727672308e+02,
+        1.703224100743601641e+02, 1.993623058409479084e+02, 2.342687403011957198e+02, 2.764002385528330658e+02,
+        3.274687277481591846e+02, 3.896413615832930151e+02, 4.656745019682919178e+02, 5.590908996105107215e+02,
+        6.744152109571297875e+02, 8.174887172033244140e+02, 9.958921680864290197e+02, 1.219517071629880108e+03,
+        1.501341972869855447e+03, 1.858493492282554856e+03, 2.313705362529768409e+03, 2.897337235279879262e+03,
+        3.650185874628374320e+03, 4.627425468074182920e+03, 5.904167858279871204e+03, 7.583363128219763259e+03,
+        9.807105719965428472e+03, 1.277293273832114230e+04, 1.675749596877978193e+04, 2.215121038263169759e+04,
+        2.950937349291504490e+04, 3.962820433513419525e+04, 5.365890489878942635e+04, 7.328024305737981431e+04,
+        1.009620167752942516e+05, 1.403709568321740997e+05, 1.970019955923188504e+05, 2.791695960502382133e+05,
+        3.995801250202947693e+05, 5.778515877588312220e+05, 8.445944401474017243e+05, 1.248092975135001687e+06,
+        1.865367859966950385e+06, 2.820705292493674480e+06, 4.317063433830483499e+06, 6.689961127164684387e+06,
+        1.050111601631327499e+07, 1.670327884792325766e+07, 2.693430470211696200e+07, 4.404906898054894166e+07,
+        7.309535640536363311e+07, 1.231306812701882145e+08, 2.106560568719367745e+08, 3.662073971851359192e+08,
+        6.472124787519330196e+08, 1.163486593592585616e+09, 2.128658395254150452e+09, 3.965732938755983605e+09,
+        7.527735928223242836e+09, 1.456757162128879538e+10, 2.875798636941021041e+10, 5.794999654160054887e+10,
+        1.192767536774485257e+11, 2.509334090779650360e+11, 5.399624414800303207e+11, 1.189276111740286910e+12,
+        2.683103883355551677e+12, 6.205255919751506427e+12, 1.472284072112162717e+13, 3.586628373992547853e+13,
+        8.978594107356889337e+13, 2.311710197091641250e+14, 6.127020712804348908e+14, 1.673232679378485978e+15,
+        4.712671499032329365e+15, 1.370275025680988289e+16, 4.117347054027612886e+16, 1.279822436878842710e+17,
+        4.119762767831332886e+17, 1.374888606936629814e+18, 4.762483833659790733e+18, 1.714288404980390540e+19,
+        6.420200704842635702e+19, 2.504808062315322558e+20, 1.019355251138167687e+21, 4.332952958521756932e+21,
+        1.926416464889827426e+22, 8.971059571108856501e+22, 4.382317748928748816e+23, 2.249003059943548727e+24,
+        1.214458587662725100e+25, 6.911683912813140938e+25, 4.152578123301633020e+26, 2.638346388179288086e+27,
+        1.775811490887700718e+28, 1.268552401544524965e+29, 9.635786341213661742e+29, 7.797939379813000783e+30,
+        6.736900087983560033e+31, 6.226288752443836475e+32, 6.169035287163451891e+33, 6.567250104576983172e+34,
+        7.528666735185428595e+35, 9.316271421365627344e+36, 1.247410737003664698e+38, 1.811787648043939987e+39,
+        2.861918583157116420e+40, 4.929657099622567574e+41, 9.284951278562156071e+42, 1.917687997037326435e+44,
+        4.355948096683946408e+45, 1.091453486585817118e+47, 3.026206402784023251e+48, 9.314478983991942688e+49,
+        3.193195693823940775e+51, 1.223447678968662613e+53, 5.257403184148516426e+54, 2.543108925126136766e+56,
+        1.389947584026783879e+58, 8.616987336205957549e+59, 6.083777056769299984e+61, 4.911841077800001710e+63,
+        4.554259483169784661e+65, 4.870815185962582259e+67, 6.036211886847067841e+69, 8.708377755587698026e+71,
+        1.469655296381977267e+74, 2.915822924489215887e+76, 6.836044306573246016e+78, 1.903917300559946782e+81,
+        6.333813341980360028e+83, 2.531082268773868753e+86, 1.222077360592898816e+89, 7.172167453276776330e+91,
+        5.148160232410244898e+94, 4.548619807672339638e+97, 4.979632843475864923e+100, 6.800802744782331957e+103,
+        1.166855497965918386e+107, 2.533457765534279043e+110, 7.012864641215147208e+113, 2.494083354169569414e+117,
+        1.148722178881219993e+121, 6.908313932158993510e+124, 5.470912484744367184e+128, 5.755359832684120769e+132,
+        8.115681923907451939e+136, 1.548304780334447081e+141, 4.034912159113614601e+145, 1.450632759611715526e+150,
+        7.268799665580789770e+154, };
+
+__constant__ double m_weights_double_8[786] =
+      { 4.901759085947701448e-159, 1.505832423620814399e-156, 4.231872109262999523e-154, 1.089479701785106001e-151,
+        2.572922387150651649e-149, 5.581311054334156941e-147, 1.113575900126970040e-144, 2.046165051332286084e-142,
+        3.466994885004770636e-140, 5.423795404073501922e-138, 7.843833272402847010e-136, 1.049922957933194415e-133,
+        1.302301071957418603e-131, 1.498659737828393008e-129, 1.601906622414286282e-127, 1.592248618401983561e-125,
+        1.473375345916436274e-123, 1.270651551394009593e-121, 1.022408263525766209e-119, 7.683762602329562781e-118,
+        5.399268127233373186e-116, 3.551074274853494676e-114, 2.188235409519121010e-112, 1.264667515430816934e-110,
+        6.861807566737243712e-109, 3.498691686825209963e-107, 1.678016807398375157e-105, 7.577439431441931490e-104,
+        3.224703770159386809e-102, 1.294487090677705963e-100, 4.906133250963454139e-99, 1.757121317988153326e-97,
+        5.952042491454320383e-96, 1.908566653286417264e-94, 5.798224459236429212e-93, 1.670293239978334727e-91,
+        4.566236673398083038e-90, 1.185617342791547945e-88, 2.926160027801296929e-87, 6.870061134126707137e-86,
+        1.535565783500379945e-84, 3.270036736778401257e-83, 6.639558007206580362e-82, 1.286319750967398593e-80,
+        2.379566581139022958e-79, 4.206268231398883425e-78, 7.109719237833379433e-77, 1.149915104115372777e-75,
+        1.780876201255594220e-74, 2.642703796179329883e-73, 3.760085375941719327e-72, 5.132920951124251993e-71,
+        6.727100274601427696e-70, 8.469585621347697498e-69, 1.025032382672232848e-67, 1.193219127557863348e-66,
+        1.336816930381306582e-65, 1.442283479679798385e-64, 1.499374555004793991e-63, 1.502797203133501438e-62,
+        1.453005969318485303e-61, 1.355980448377862540e-60, 1.222072412212552127e-59, 1.064223180270520159e-58,
+        8.959667396075636845e-58, 7.296288808079294105e-57, 5.750255296190181158e-56, 4.388011664829013518e-55,
+        3.243852451291832398e-54, 2.324239357665538806e-53, 1.614869776203026446e-52, 1.088524605545274842e-51,
+        7.121755574192829045e-51, 4.524647662549067074e-50, 2.792730715818793035e-49, 1.675384879603864227e-48,
+        9.773114328777676091e-48, 5.545910766847627082e-47, 3.062809705627873645e-46, 1.646862118038266234e-45,
+        8.625108513887155847e-45, 4.401687663868890701e-44, 2.189755778847646746e-43, 1.062345336449265889e-42,
+        5.028036663485684049e-42, 2.322524635717249223e-41, 1.047406593898341306e-40, 4.613438388449698168e-40,
+        1.985397445118162005e-39, 8.351027367454628343e-39, 3.434440903484543389e-38, 1.381489131877196646e-37,
+        5.437051201310225224e-37, 2.094357548080647717e-36, 7.898676618592006902e-36, 2.917536870947471272e-35,
+        1.055788886022716597e-34, 3.744333812160330812e-34, 1.301801185251957290e-33, 4.438346216893387768e-33,
+        1.484348268951816542e-32, 4.871001129849836971e-32, 1.568903000742513942e-31, 4.961295315917935235e-31,
+        1.540773910027990821e-30, 4.700558022172014910e-30, 1.409115230718949596e-29, 4.151913103955692034e-29,
+        1.202737613715427748e-28, 3.426327374934496736e-28, 9.601405359397026012e-28, 2.647278642033773301e-27,
+        7.183442220565147103e-27, 1.918850545981494042e-26, 5.046974779455992494e-26, 1.307394799925911700e-25,
+        3.336342198236957082e-25, 8.389259581136262194e-25, 2.079051813513548608e-24, 5.079178967243765280e-24,
+        1.223501794357837278e-23, 2.906654911057549530e-23, 6.811668606095015470e-23, 1.574985938238025303e-22,
+        3.593796788969348326e-22, 8.094185411205212564e-22, 1.799796183237481721e-21, 3.951758901641017285e-21,
+        8.569580068050865775e-21, 1.835753486517298696e-20, 3.885414339966022317e-20, 8.126613972895021790e-20,
+        1.680007182889503141e-19, 3.433369351563962828e-19, 6.937695550399427499e-19, 1.386345631008981755e-18,
+        2.740087497759230881e-18, 5.357570288683386626e-18, 1.036464933022803784e-17, 1.984249442010084992e-17,
+        3.759788006060003409e-17, 7.052211261821684795e-17, 1.309635641529546221e-16, 2.408275496109180528e-16,
+        4.385898809611711552e-16, 7.911758686849121285e-16, 1.413883597877183873e-15, 2.503477536644680210e-15,
+        4.392637866550705827e-15, 7.638710306960574612e-15, 1.316703360377476041e-14, 2.250031027275448919e-14,
+        3.812239733412214953e-14, 6.405021660191363479e-14, 1.067250538270319484e-13, 1.763897493784721010e-13,
+        2.891987565334547756e-13, 4.704242520369958085e-13, 7.592878273512691990e-13, 1.216183338372525172e-12,
+        1.933388593436624879e-12, 3.050826852442290751e-12, 4.779080020017636657e-12, 7.432734713385425098e-12,
+        1.147833888125873666e-11, 1.760286160372422754e-11, 2.681071101623953168e-11, 4.056023754295965437e-11,
+        6.095443492241537222e-11, 9.100550129616064211e-11, 1.349993452136967652e-10, 1.989943912395156051e-10,
+        2.914996073619059788e-10, 4.243900781412219621e-10, 6.141353162671391082e-10, 8.834365795894798511e-10,
+        1.263395594025933170e-09, 1.796369250051716047e-09, 2.539704143326480862e-09, 3.570592498287890499e-09,
+        4.992348403150539107e-09, 6.942471870489931483e-09, 9.602949600164561371e-09, 1.321333712761666777e-08,
+        1.808727901635346390e-08, 2.463325364767791516e-08, 3.338047870136870496e-08, 4.501108426108505069e-08,
+        6.039985413333259594e-08, 8.066305374526097834e-08, 1.072181059018892614e-07, 1.418561443795353991e-07,
+        1.868297699836383305e-07, 2.449586539172972009e-07, 3.197559780442760832e-07, 4.155790690867544334e-07,
+        5.378079713325544678e-07, 6.930561064776686194e-07, 8.894175852502122454e-07, 1.136756157868726006e-06,
+        1.447041212534730898e-06, 1.834736645332833504e-06, 2.317248822354253644e-06, 2.915440225825303911e-06,
+        3.654215709863551870e-06, 4.563188576773760151e-06, 5.677433909482232878e-06, 7.038336747307571784e-06,
+        8.694542758083067228e-06, 1.070301902702759858e-05, 1.313023243937403750e-05, 1.605345286789073897e-05,
+        1.956218797728780449e-05, 2.375975591555218862e-05, 2.876500146954361208e-05, 3.471416041263076209e-05,
+        4.176287576185915239e-05, 5.008836848967403773e-05, 5.989176390181730373e-05, 7.140057340280213227e-05,
+        8.487132973049760036e-05, 1.005923719620999934e-04, 1.188867746885496973e-04, 1.401154137398069279e-04,
+        1.646801587388731249e-04, 1.930271805904271778e-04, 2.256503597954330556e-04, 2.630947792533707128e-04,
+        3.059602829980946180e-04, 3.549050801425155303e-04, 4.106493712131842727e-04, 4.739789720708565436e-04,
+        5.457489087697051069e-04, 6.268869550379884668e-04, 7.183970825975973673e-04, 8.213627933082928901e-04,
+        9.369503011517966364e-04, 1.066411531385725184e-03, 1.211086903819095417e-03, 1.372407867107646339e-03,
+        1.551899151252505624e-03, 1.751180706119547318e-03, 1.971969294784470944e-03, 2.216079711850908971e-03,
+        2.485425598581779636e-03, 2.782019828718993257e-03, 3.107974441230220176e-03, 3.465500098895993776e-03,
+        3.856905054613959619e-03, 4.284593610523639393e-03, 4.751064058515097225e-03, 5.258906094345618421e-03,
+        5.810797701414435799e-03, 6.409501504198915943e-03, 7.057860595396970186e-03, 7.758793844909123446e-03,
+        8.515290702888369372e-03, 9.330405513145299523e-03, 1.020725135717912572e-02, 1.114899345297222760e-02,
+        1.215884213639836574e-02, 1.324004545661629463e-02, 1.439588142011718850e-02, 1.562964992113485073e-02,
+        1.694466439888404584e-02, 1.834424326453982033e-02, 1.983170114298836870e-02, 2.141033997615067889e-02,
+        2.308344003609062690e-02, 2.485425089716015368e-02, 2.672598241710042669e-02, 2.870179577730820310e-02,
+        3.078479463239356953e-02, 3.297801641870515720e-02, 3.528442387069167064e-02, 3.770689679281728890e-02,
+        4.024822413326941635e-02, 4.291109640390936770e-02, 4.569809848884132640e-02, 4.861170288163592155e-02,
+        5.165426338866744454e-02, 5.482800933323496446e-02, 5.813504029216542680e-02, 6.157732139347005467e-02,
+        6.515667920037330165e-02, 6.887479820368566403e-02, 7.273321794107712090e-02, 7.673333075835566151e-02,
+        8.087638022439339824e-02, 8.516346020789830747e-02, 8.959551462082867423e-02, 9.417333782991444898e-02,
+        9.889757573450802477e-02, 1.037687275058577967e-01, 1.087871479799008567e-01, 1.139530506928239996e-01,
+        1.192665115459606141e-01, 1.247274730840887416e-01, 1.303357493688843496e-01, 1.360910314271734020e-01,
+        1.419928932517243620e-01, 1.480407983306351483e-01, 1.542341066798992024e-01, 1.605720823524863565e-01,
+        1.670539013962460335e-01, 1.736786602321317742e-01, 1.804453844236544912e-01, 1.873530378080931153e-01,
+        1.944005319598201097e-01, 2.015867359561292115e-01, 2.089104864161762672e-01, 2.163705977840528187e-01,
+        2.239658728275971045e-01, 2.316951133252986765e-01, 2.395571309145607347e-01, 2.475507580756380088e-01,
+        2.556748592267567912e-01, 2.639283419072366399e-01, 2.723101680268593668e-01, 2.808193651612593497e-01,
+        2.894550378747292326e-01, 2.982163790535362503e-01, 3.071026812346166036e-01, 3.161133479163487600e-01,
+        3.252479048399920142e-01, 3.345060112323053140e-01, 3.438874710018250777e-01, 3.533922438832718793e-01, 
+        3.630204565265675291e-01, 3.727724135289699431e-01, 3.826486084108677024e-01, 3.926497345378144818e-01,
+        4.027766959934214472e-01, 4.130306184097598756e-01, 4.234128597639539906e-01, 4.339250211516634154e-01,
+        4.445689575501645526e-01, 4.553467885857401860e-01, 4.662609093220769612e-01, 4.773140010883521767e-01,
+        4.885090423676662636e-01, 4.998493197684479070e-01, 5.113384391034281429e-01, 5.229803366027518117e-01,
+        5.347792902897740156e-01, 5.467399315500809553e-01, 5.588672569262846167e-01, 5.711666401731758417e-01,
+        5.836438446098876156e-01, 5.963050358078278898e-01, 6.091567946552975691e-01, 6.222061308419237716e-01,
+        6.354604968083211637e-01, 6.489278022087558681e-01, 6.626164289370386795e-01, 6.765352467684294227e-01,
+        6.906936296730053994e-01, 7.051014728587479919e-01, 7.197692106055475377e-01, 7.347078349544334315e-01,
+        7.499289153196209421e-01, 7.654446190944464391e-01, 7.812677333259577661e-01, 7.974116875368567865e-01,
+        8.138905777776784362e-01, 8.307191919965581771e-01, 8.479130368187123741e-01, 8.654883658328603475e-01,
+        8.834622094872810766e-01, 9.018524067040521621e-01, 9.206776383262963142e-01, 9.399574625199963151e-01,
+        9.597123522591707284e-01, 9.799637350309700387e-01, 1.000734034905599933e+00, 1.022046717124952010e+00,
+        1.043926335373472893e+00, 1.066398581905185161e+00, 1.089490340711946628e+00, 1.113229743930062164e+00,
+        1.137646231695313314e+00, 1.162770615670420260e+00, 1.188635146483979071e+00, 1.215273585336112390e+00,
+        1.242721280043529050e+00, 1.271015245815510799e+00, 1.300194251072644711e+00, 1.330298908642019971e+00,
+        1.361371772686240192e+00, 1.393457441749111730e+00, 1.426602668328411758e+00, 1.460856475415888358e+00,
+        1.496270280476785338e+00, 1.532898027375920169e+00, 1.570796326794896619e+00, 1.610024605725646420e+00,
+        1.650645266669431435e+00, 1.692723857217988332e+00, 1.736329250744977731e+00, 1.781533838991654903e+00,
+        1.828413737391087381e+00, 1.877049004040720448e+00, 1.927523873304087635e+00, 1.979927005099477087e+00,
+        2.034351751016940433e+00, 2.090896438495766214e+00, 2.149664674393090421e+00, 2.210765669381402212e+00,
+        2.274314584729113927e+00, 2.340432903144970240e+00, 2.409248825504827076e+00, 2.480897695429288043e+00,
+        2.555522453844001656e+00, 2.633274125832370887e+00, 2.714312342284411608e+00, 2.798805899057066353e+00,
+        2.886933356592141886e+00, 2.978883683190077867e+00, 3.074856945413050211e+00, 3.175065049391765683e+00,
+        3.279732537139255280e+00, 3.389097442334834102e+00, 3.503412210435275865e+00, 3.622944688401595705e+00,
+        3.747979189802462585e+00, 3.878817641573403805e+00, 4.015780819279312670e+00, 4.159209678351536168e+00,
+        4.309466789455788368e+00, 4.466937886899736897e+00, 4.632033539816493591e+00, 4.805190956770360727e+00,
+        4.986875935432896972e+00, 5.177584970080537688e+00, 5.377847530880629761e+00, 5.588228530273088035e+00,
+        5.809330993233640059e+00, 6.041798949837089488e+00, 6.286320570342285919e+00, 6.543631565013652661e+00,
+        6.814518873098582608e+00, 7.099824667819718682e+00, 7.400450706942931008e+00, 7.717363061475788814e+00,
+        8.051597258371279584e+00, 8.404263876795383951e+00, 8.776554641607500109e+00, 9.169749062247565207e+00,
+        9.585221670276993889e+00, 1.002444991444300704e+01, 1.048902277839603856e+01, 1.098065019316492606e+01,
+        1.150117332427169985e+01, 1.205257582204547280e+01, 1.263699613338454324e+01, 1.325674098404332380e+01,
+        1.391430015262873368e+01, 1.461236267104086712e+01, 1.535383460126837531e+01, 1.614185855545811846e+01,
+        1.697983514525758524e+01, 1.787144656784601339e+01, 1.882068256013178484e+01, 1.983186897964764985e+01,
+        2.090969930111845450e+01, 2.205926935196095527e+01, 2.328611564861881683e+01, 2.459625773922860138e+01,
+        2.599624500732998276e+01, 2.749320844694889238e+01, 2.909491798228195984e+01, 3.080984597641076715e+01,
+        3.264723765414180400e+01, 3.461718925554321861e+01, 3.673073484057443067e+01, 3.899994278315456980e+01,
+        4.143802312713618427e+01, 4.405944712930142330e+01, 4.688008048840357439e+01, 4.991733195758662298e+01,
+        5.319031926387298369e+01, 5.672005451703465811e+01, 6.052965158594831140e+01, 6.464455825915836491e+01,
+        6.909281639443131774e+01, 7.390535370725211687e+01, 7.911631135942343489e+01, 8.476341209659472308e+01,
+        9.088837435982152722e+01, 9.753737857533253823e+01, 1.047615927251647361e+02, 1.126177653386554197e+02,
+        1.211688952437418817e+02, 1.304849888043593828e+02, 1.406439169773708701e+02, 1.517323863863765989e+02,
+        1.638470407739824279e+02, 1.770957117100033620e+02, 1.915988403612775885e+02, 2.074910955409497265e+02,
+        2.249232172361061194e+02, 2.440641194630869936e+02, 2.651032917390266964e+02, 2.882535448280364212e+02,
+        3.137541538897424513e+02, 3.418744609277612322e+02, 3.729180087461214321e+02, 4.072272907593818790e+02,
+        4.451892153103389878e+02, 4.872414000388630927e+02, 5.338794318098249932e+02, 5.856652513400113117e+02,
+        6.432368496766822816e+02, 7.073194969336578611e+02, 7.787387632221277236e+02, 8.584356387770406827e+02,
+        9.474841163944599543e+02, 1.047111666301969297e+03, 1.158723113719277435e+03, 1.283928525349707755e+03,
+        1.424575826189363437e+03, 1.582789006393775706e+03, 1.761012944445459235e+03, 1.962066073573121788e+03,
+        2.189202360708354222e+03, 2.446184360349559652e+03, 2.737369460761187093e+03, 3.067811870808767638e+03,
+        3.443383419509962754e+03, 3.870916878218207705e+03, 4.358376293464465508e+03, 4.915059769420260559e+03,
+        5.551841303216967404e+03, 6.281459704453426129e+03, 7.118864385205665710e+03, 8.081629967627799596e+03,
+        9.190454321738597280e+03, 1.046975794051835702e+04, 1.194840663946247320e+04, 1.366058463062104793e+04,
+        1.564685131637809273e+04, 1.795542299179967539e+04, 2.064373043744082514e+04, 2.378031563732670807e+04,
+        2.744714621995650953e+04, 3.174244552480722739e+04, 3.678416050731336226e+04, 4.271422037773508051e+04,
+        4.970377768100323981e+04, 5.795967273138576164e+04, 6.773242484608792593e+04, 7.932613346949942761e+04,
+        9.311077397156915450e+04, 1.095375030536372224e+05, 1.291577556735669526e+05, 1.526471301608741586e+05,
+        1.808353350969648289e+05, 2.147438294770164181e+05, 2.556332515573999948e+05, 3.050633345562097502e+05,
+        3.649687926665853954e+05, 4.377556866857485380e+05, 5.264241222943208736e+05, 6.347248990108319410e+05,
+        7.673600526542426466e+05, 9.302403050337502786e+05, 1.130816502666451845e+06, 1.378507531155523742e+06,
+        1.685254393964162275e+06, 2.066239770168639390e+06, 2.540825270229354918e+06, 3.133775962036416630e+06,
+        3.876865148275802393e+06, 4.810984054018349430e+06, 5.988924089534678664e+06, 7.479057929608060924e+06,
+        9.370225698693408867e+06, 1.177824230977510661e+07, 1.485459301432580619e+07, 1.879809270383398104e+07,
+        2.387057334436346400e+07, 3.041806552258603202e+07, 3.889950046843262151e+07, 4.992574374586696017e+07,
+        6.431287504495613210e+07, 8.315518519925858136e+07, 1.079255664704117961e+08, 1.406141073390035115e+08,
+        1.839201785677305607e+08, 2.415197116904975365e+08, 3.184386015381112281e+08, 4.215765018929686736e+08,
+        5.604446356915114550e+08, 7.482094398046911572e+08, 1.003175129668246151e+09, 1.350898918997482870e+09,
+        1.827222165053491590e+09, 2.482633480831760933e+09, 3.388577637234919719e+09, 4.646620065299105644e+09,
+        6.401821801566297122e+09, 8.862352038053251473e+09, 1.232838602859196811e+10, 1.723489297480180023e+10,
+        2.421530528469447376e+10, 3.419673813208063025e+10, 4.854312364622606540e+10, 6.927149043760342676e+10,
+        9.938049490186203616e+10, 1.433521424759854145e+11, 2.079221734483088227e+11, 3.032695241820108158e+11,
+        4.448631503727710431e+11, 6.563458646477901051e+11, 9.740635696398910980e+11, 1.454220520059656158e+12,
+        2.184250688898627320e+12, 3.300999104757560757e+12, 5.019970485022749012e+12, 7.682676299017607834e+12,
+        1.183376596003983872e+13, 1.834748853557035315e+13, 2.863639312458363586e+13, 4.499803892715039958e+13,
+        7.119486876989154498e+13, 1.134307017980122346e+14, 1.820065782363618395e+14, 2.941484500615394037e+14,
+        4.788707305890930382e+14, 7.854025036928623551e+14, 1.297894304619860251e+15, 2.161279954782425640e+15,
+        3.627102147035003834e+15, 6.135342933440950378e+15, 1.046170006362244506e+16, 1.798477357839665686e+16,
+        3.117473412332331475e+16, 5.449445073049184222e+16, 9.607515505017978212e+16, 1.708589224452677852e+17,
+        3.065429751110228665e+17, 5.549227437451149511e+17, 1.013730232778046314e+18, 1.869059895876405824e+18,
+        3.478549552381578424e+18, 6.535992245975463763e+18, 1.240019272261066308e+19, 2.375828866910936629e+19,
+        4.597682433604432625e+19, 8.988106816837128428e+19, 1.775302379393632263e+20, 3.543413304390973486e+20,
+        7.148061397675525327e+20, 1.457620510577186305e+21, 3.005137124879829797e+21, 6.265024861633250697e+21,
+        1.320979941090283816e+22, 2.817487535902146221e+22, 6.079933041429805231e+22, 1.327658853647212083e+23,
+        2.934311759183641318e+23, 6.565087216807130026e+23, 1.487212273437937650e+24, 3.411840196076788128e+24,
+        7.928189928797018762e+24, 1.866451877029704857e+25, 4.452521859886739549e+25, 1.076545435174977662e+26,
+        2.638685681190697586e+26, 6.557908470244186498e+26, 1.652952243735585721e+27, 4.226383395914916199e+27,
+        1.096450394268080148e+28, 2.886822082999286080e+28, 7.715480389344015925e+28, 2.093728789309964846e+29,
+        5.770275789447655037e+29, 1.615463845391781140e+30, 4.595470055795608691e+30, 1.328629392686523255e+31,
+        3.905079681530784219e+31, 1.167134024271997252e+32, 3.548058538654277403e+32, 1.097378059358046160e+33,
+        3.454102978064445595e+33, 1.106745393701652323e+34, 3.610899559139069994e+34, 1.199946999283670567e+35,
+        4.062687014190878792e+35, 1.401835223893224514e+36, 4.931085527333162173e+36, 1.768812393284919500e+37,
+        6.472148293945199961e+37, 2.416453721739211922e+38, 9.208944720398123862e+38, 3.583297028622126676e+39,
+        1.424097482596699440e+40, 5.782627833426411524e+40, 2.399862204084363183e+41, 1.018291572042305460e+42,
+        4.419105414822034531e+42, 1.962126117680499311e+43, 8.916742424061253707e+43, 4.148882478294757720e+44,
+        1.977256529558276930e+45, 9.655300233875401080e+45, 4.832878898335598922e+46, 2.480575878223098058e+47,
+        1.306102809757654706e+48, 7.057565717289569232e+48, 3.915276522229618618e+49, 2.230898980943393318e+50,
+        1.306141334496309306e+51, 7.861021286656392627e+51, 4.865583758538451107e+52, 3.098487425915704674e+53,
+        2.031037614862563901e+54, 1.370999647608260200e+55, 9.534736274325001528e+55, 6.834959923166415407e+56,
+        5.052733546324789020e+57, 3.853810997282159979e+58, 3.034183107853208298e+59, 2.467161926009838899e+60,
+        2.072901039813580593e+61, 1.800563980579615383e+62, 1.617764027895344257e+63, 1.504283028250688329e+64,
+        1.448393206525427172e+65, 1.444855510980115799e+66, 1.494120428855029243e+67, 1.602566566107015722e+68,
+        1.783880504153942988e+69, 2.061999240572760738e+70, 2.476521794698572715e+71, 3.092349914153497358e+72,
+        4.016927238305985810e+73, 5.431607545226497387e+74, 7.650086824042822759e+75, 1.123017984114349288e+77,
+        1.719382952966052004e+78, 2.747335718690686674e+79, 4.584545010557684123e+80, 7.995082041539250252e+81,
+        1.458119909365899044e+83, 2.783001178679600175e+84, 5.562812231966194628e+85, 1.165338768982404578e+87,
+        2.560399126432838224e+88, 5.904549641859098192e+89, 1.430278474749838710e+91, 3.642046122956932563e+92,
+        9.756698571206402300e+93, 2.751946044275883051e+95, 8.179164793643197279e+96, 2.563704735086825890e+98,
+        8.481656496128255880e+99, 2.964260254403981007e+101, 1.095342970031208886e+103, 4.283148547584870628e+104,
+        1.773954352944319744e+106, 7.788991081894224760e+107, 3.628931721056821352e+109, 1.795729272516020592e+111,
+        9.446685151482835339e+112, 5.288263179614488101e+114, 3.153311236741401362e+116, 2.004807079683827669e+118,
+        1.360407192665237716e+120, 9.862825609807810517e+121, 7.647551788591128099e+123, 6.348802224871730088e+125,
+        5.649062361980019098e+127, 5.393248003523784781e+129, 5.530897191915703916e+131, 6.099598644640894333e+133,
+        7.242098433491964504e+135, 9.268083053637375570e+137, 1.279942702416040582e+140, 1.909796626960621302e+142,
+        3.082540300669885040e+144, 5.388809732384179657e+146, 1.021610251056626535e+149, 2.103005440072790650e+151,
+        4.706753990348725570e+153, 1.146834128125248991e+156, };
+
+__constant__ double* m_weights_double[8] = {
+    m_weights_double_1,
+    m_weights_double_2,
+    m_weights_double_3,
+    m_weights_double_4,
+    m_weights_double_5,
+    m_weights_double_6,
+    m_weights_double_7,
+    m_weights_double_8
+};
+
+__constant__ boost::math::size_t float_coefficients_size[8] = {9, 8, 16, 33, 66, 132, 263, 527};
+
+__constant__ boost::math::size_t double_coefficients_size[8] = {13, 12, 25, 49, 98, 196, 393, 786};
+
+template<typename T>
+struct coefficients_selector;
+
+template<>
+struct coefficients_selector<float>
+{
+    __device__ static const auto abscissas() { return m_abscissas_float; }
+    __device__ static const auto weights() { return m_weights_float; }
+    __device__ static const auto size() { return float_coefficients_size; }
+};
+
+template<>
+struct coefficients_selector<double>
+{
+    __device__ static const auto abscissas() { return m_abscissas_double; }
+    __device__ static const auto weights() { return m_weights_double; }
+    __device__ static const auto size() { return double_coefficients_size; }
+};
+
+
+template <typename F, typename Real, typename Policy = policies::policy<> >
+__device__ auto exp_sinh_integrate_impl(const F& f, Real tolerance, Real* error, Real* L1, boost::math::size_t* levels)
+{
+    using K = decltype(f(static_cast<Real>(0)));
+    using boost::math::constants::half;
+    using boost::math::constants::half_pi;
+
+   // This provided a nice error message for real valued integrals, but it's super awkward for complex-valued integrals:
+   /*K y_max = f(tools::max_value<Real>());
+   if(abs(y_max) > tools::epsilon<Real>() || !(boost::math::isfinite)(y_max))
+   {
+       K val = abs(y_max);
+       return static_cast<K>(policies::raise_domain_error(function, "The function you are trying to integrate does not go to zero at infinity, and instead evaluates to %1%", val, Policy()));
+   }*/
+
+   //std::cout << std::setprecision(5*std::numeric_limits<Real>::digits10);
+
+    // Get the party started with two estimates of the integral:
+    const auto m_abscissas = coefficients_selector<Real>::abscissas();
+    const auto m_weights = coefficients_selector<Real>::weights();
+    const auto m_size = coefficients_selector<Real>::size();
+    
+    Real min_abscissa{ 0 }, max_abscissa{ boost::math::tools::max_value<Real>() };
+    K I0 = 0;
+    Real L1_I0 = 0;
+    for(boost::math::size_t i = 0; i < m_size[0]; ++i)
+    {
+        K y = f(m_abscissas[0][i]);
+        K I0_last = I0;
+        I0 += y*m_weights[0][i];
+        L1_I0 += abs(y)*m_weights[0][i];
+        if ((I0_last == I0) && (abs(I0) != 0))
+        {
+           max_abscissa = m_abscissas[0][i];
+           break;
+        }
+    }
+
+    //std::cout << "First estimate : " << I0 << std::endl;
+    K I1 = I0;
+    Real L1_I1 = L1_I0;
+    bool have_first_j = false;
+    boost::math::size_t first_j = 0;
+    for (boost::math::size_t i = 0; (i < m_size[1]) && (m_abscissas[1][i] < max_abscissa); ++i)
+    {
+        K y = f(m_abscissas[1][i]);
+        K I1_last = I1;
+        I1 += y*m_weights[1][i];
+        L1_I1 += abs(y)*m_weights[1][i];
+        if (!have_first_j && (I1_last == I1))
+        {
+           // No change to the sum, disregard these values on the LHS:
+           if ((i < m_size[1] - 1) && (m_abscissas[1][i + 1] > max_abscissa))
+           {
+              // The summit is so high, that we found nothing in this row which added to the integral!!
+              have_first_j = true;
+           }
+           else
+           {
+              min_abscissa = m_abscissas[1][i];
+              first_j = i;
+           }
+        }
+        else
+        {
+           have_first_j = true;
+        }
+    }
+
+    if (I0 == static_cast<Real>(0))
+    {
+       // We failed to find anything, is the integral zero, or have we just not found it yet?
+       // We'll try one more level, if that still finds nothing then it'll terminate.
+       min_abscissa = 0;
+       max_abscissa = boost::math::tools::max_value<Real>();
+    }
+
+    I1 *= half<Real>();
+    L1_I1 *= half<Real>();
+    Real err = abs(I0 - I1);
+    //std::cout << "Second estimate: " << I1 << " Error estimate at level " << 1 << " = " << err << std::endl;
+
+    boost::math::size_t i = 2;
+    for(; i < 8U; ++i) // Magic number 8 is the number of precomputed levels
+    {
+        I0 = I1;
+        L1_I0 = L1_I1;
+
+        I1 = half<Real>()*I0;
+        L1_I1 = half<Real>()*L1_I0;
+        Real h = static_cast<Real>(1)/static_cast<Real>(1 << i);
+        K sum = 0;
+        Real absum = 0;
+
+        auto& abscissas_row = m_abscissas[i];
+        auto& weight_row = m_weights[i];
+
+        // appoximate location to start looking for lowest meaningful abscissa value
+        first_j = first_j == 0 ? 0 : 2 * first_j - 1;  
+        
+        boost::math::size_t j = first_j;
+        while (abscissas_row[j] < min_abscissa)
+        {
+           ++j;
+        }
+
+        for(; (j < m_size[i]) && (abscissas_row[j] < max_abscissa); ++j)
+        {
+            Real x = abscissas_row[j];
+            K y = f(x);
+            sum += y*weight_row[j];
+            Real abterm0 = abs(y)*weight_row[j];
+            absum += abterm0;
+        }
+
+        I1 += sum*h;
+        L1_I1 += absum*h;
+        err = abs(I0 - I1);
+        if (!(boost::math::isfinite)(L1_I1))
+        {
+            return static_cast<K>(policies::raise_evaluation_error("exp_sinh_integrate", "The exp_sinh quadrature evaluated your function at a singular point and returned %1%. Please ensure your function evaluates to a finite number over its entire domain.", I1, Policy()));
+        }
+        if (err <= tolerance*L1_I1)
+        {
+            break;
+        }
+    }
+
+    if (error)
+    {
+        *error = err;
+    }
+
+    if(L1)
+    {
+        *L1 = L1_I1;
+    }
+
+    if (levels)
+    {
+       *levels = i;
+    }
+
+    return I1;
+}
+
+} // namespace detail
+} // namespace quadrature
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_ENABLE_CUDA
+
+#endif // BOOST_MATH_QUADRATURE_DETAIL_EXP_SINH_DETAIL_HPP
diff --git a/inst/include/boost/math/quadrature/detail/ooura_fourier_integrals_detail.hpp b/inst/include/boost/math/quadrature/detail/ooura_fourier_integrals_detail.hpp
index 84d98ee84..49677a8d2 100644
--- a/inst/include/boost/math/quadrature/detail/ooura_fourier_integrals_detail.hpp
+++ b/inst/include/boost/math/quadrature/detail/ooura_fourier_integrals_detail.hpp
@@ -14,7 +14,7 @@
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/config.hpp>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <mutex>
 #include <atomic>
 #endif
@@ -382,7 +382,7 @@ class ooura_fourier_sin_detail {
         lnode_row.shrink_to_fit();
         lweight_row.shrink_to_fit();
 
-        #ifdef BOOST_HAS_THREADS
+        #ifdef BOOST_MATH_HAS_THREADS
         // std::scoped_lock once C++17 is more common?
         std::lock_guard<std::mutex> lock(node_weight_mutex_);
         #endif 
@@ -419,7 +419,7 @@ class ooura_fourier_sin_detail {
         return I0;
     }
 
-    #ifdef BOOST_HAS_THREADS
+    #ifdef BOOST_MATH_HAS_THREADS
     std::mutex node_weight_mutex_;
     #endif
     // Nodes for n >= 0, giving t_n = pi*phi(nh)/h. Generally t_n >> 1.
@@ -433,7 +433,7 @@ class ooura_fourier_sin_detail {
     std::vector<std::vector<Real>> lweights_;
     Real rel_err_goal_;
 
-    #ifdef BOOST_HAS_THREADS
+    #ifdef BOOST_MATH_HAS_THREADS
     std::atomic<long> starting_level_{};
     #else
     long starting_level_;
@@ -619,7 +619,7 @@ class ooura_fourier_cos_detail {
         lnode_row.shrink_to_fit();
         lweight_row.shrink_to_fit();
 
-        #ifdef BOOST_HAS_THREADS
+        #ifdef BOOST_MATH_HAS_THREADS
         std::lock_guard<std::mutex> lock(node_weight_mutex_);
         #endif
 
@@ -651,7 +651,7 @@ class ooura_fourier_cos_detail {
         return I0;
     }
 
-    #ifdef BOOST_HAS_THREADS
+    #ifdef BOOST_MATH_HAS_THREADS
     std::mutex node_weight_mutex_;
     #endif 
 
@@ -662,7 +662,7 @@ class ooura_fourier_cos_detail {
     std::vector<std::vector<Real>> lweights_;
     Real rel_err_goal_;
 
-    #ifdef BOOST_HAS_THREADS
+    #ifdef BOOST_MATH_HAS_THREADS
     std::atomic<long> starting_level_{};
     #else
     long starting_level_;
diff --git a/inst/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp b/inst/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp
index 903ad9601..7f7477a6e 100644
--- a/inst/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp
+++ b/inst/include/boost/math/quadrature/detail/sinh_sinh_detail.hpp
@@ -1,4 +1,5 @@
 // Copyright Nick Thompson, 2017
+// Copyright Matt Borland, 2024
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -7,6 +8,10 @@
 #ifndef BOOST_MATH_QUADRATURE_DETAIL_SINH_SINH_DETAIL_HPP
 #define BOOST_MATH_QUADRATURE_DETAIL_SINH_SINH_DETAIL_HPP
 
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <cmath>
 #include <string>
 #include <vector>
@@ -15,9 +20,8 @@
 #include <boost/math/tools/atomic.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/trunc.hpp>
-#include <boost/math/tools/config.hpp>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <mutex>
 #endif
 
@@ -53,7 +57,7 @@ class sinh_sinh_detail
 
    const std::vector<Real>& get_abscissa_row(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -66,7 +70,7 @@ class sinh_sinh_detail
    }
    const std::vector<Real>& get_weight_row(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -87,13 +91,13 @@ class sinh_sinh_detail
 
    void extend_refinements()const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       std::lock_guard<std::mutex> guard(m_mutex);
 #endif
       //
       // Check some other thread hasn't got here after we read the atomic variable, but before we got here:
       //
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() >= m_max_refinements)
          return;
 #else
@@ -131,7 +135,7 @@ class sinh_sinh_detail
    mutable std::vector<std::vector<Real>> m_abscissas;
    mutable std::vector<std::vector<Real>> m_weights;
    std::size_t                       m_max_refinements;
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    mutable boost::math::detail::atomic_unsigned_type      m_committed_refinements{};
    mutable std::mutex m_mutex;
 #else
@@ -344,7 +348,7 @@ void sinh_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 1>&)
       { 1.57146132e+00f, 1.57679017e+00f, 1.58749564e+00f, 1.60367396e+00f, 1.62547113e+00f, 1.65308501e+00f, 1.68676814e+00f, 1.72683132e+00f, 1.77364814e+00f, 1.82766042e+00f, 1.88938482e+00f, 1.95942057e+00f, 2.03845873e+00f, 2.12729290e+00f, 2.22683194e+00f, 2.33811466e+00f, 2.46232715e+00f, 2.60082286e+00f, 2.75514621e+00f, 2.92706011e+00f, 3.11857817e+00f, 3.33200254e+00f, 3.56996830e+00f, 3.83549565e+00f, 4.13205150e+00f, 4.46362211e+00f, 4.83479919e+00f, 5.25088196e+00f, 5.71799849e+00f, 6.24325042e+00f, 6.83488580e+00f, 7.50250620e+00f, 8.25731548e+00f, 9.11241941e+00f, 1.00831875e+01f, 1.11876913e+01f, 1.24472371e+01f, 1.38870139e+01f, 1.55368872e+01f, 1.74323700e+01f, 1.96158189e+01f, 2.21379089e+01f, 2.50594593e+01f, 2.84537038e+01f, 3.24091185e+01f, 3.70329629e+01f, 4.24557264e+01f, 4.88367348e+01f, 5.63712464e+01f, 6.52994709e+01f, 7.59180776e+01f, 8.85949425e+01f, 1.03788130e+02f, 1.22070426e+02f, 1.44161210e+02f, 1.70968019e+02f, 2.03641059e+02f, 2.43645006e+02f, 2.92854081e+02f, 3.53678602e+02f, 4.29234308e+02f, 5.23570184e+02f, 6.41976690e+02f, 7.91405208e+02f, 9.81042209e+02f, 1.22309999e+03f, 1.53391256e+03f, 1.93546401e+03f, 2.45753455e+03f, 3.14073373e+03f, 4.04081819e+03f, 5.23488160e+03f, 6.83029446e+03f, 8.97771323e+03f, 1.18901592e+04f, 1.58712239e+04f, 2.13571111e+04f, 2.89798371e+04f, 3.96630673e+04f, 5.47687519e+04f, 7.63235654e+04f, 1.07371915e+05f, 1.52531667e+05f, 2.18877843e+05f, 3.17362450e+05f, 4.65120153e+05f, 6.89253766e+05f, 1.03311989e+06f, 1.56688798e+06f, 2.40549203e+06f, 3.73952896e+06f, 5.88912115e+06f, 9.39904635e+06f, 1.52090328e+07f, 2.49628719e+07f, 4.15775926e+07f, 7.03070537e+07f, 1.20759856e+08f, 2.10788251e+08f, 3.74104720e+08f, 6.75449459e+08f, 1.24131674e+09f, 2.32331003e+09f, 4.43117602e+09f, 8.61744649e+09f, 1.70983691e+10f, 3.46357452e+10f, 7.16760712e+10f, 1.51634762e+11f, 3.28172932e+11f, 7.27110260e+11f, 1.65049955e+12f, 3.84133815e+12f, 9.17374427e+12f, 2.24990195e+13f, 5.67153509e+13f, 1.47074225e+14f, 3.92701252e+14f, 1.08063998e+15f, 3.06767147e+15f, 8.99238679e+15f, 2.72472254e+16f, 8.54294612e+16f, 2.77461372e+17f, 9.34529948e+17f, 3.26799612e+18f, 1.18791443e+19f, 4.49405341e+19f, 1.77170665e+20f, },
       { 1.57096255e+00f, 1.57229290e+00f, 1.57495658e+00f, 1.57895955e+00f, 1.58431079e+00f, 1.59102230e+00f, 1.59910918e+00f, 1.60858966e+00f, 1.61948515e+00f, 1.63182037e+00f, 1.64562338e+00f, 1.66092569e+00f, 1.67776241e+00f, 1.69617233e+00f, 1.71619809e+00f, 1.73788633e+00f, 1.76128784e+00f, 1.78645779e+00f, 1.81345587e+00f, 1.84234658e+00f, 1.87319943e+00f, 1.90608922e+00f, 1.94109632e+00f, 1.97830698e+00f, 2.01781368e+00f, 2.05971547e+00f, 2.10411838e+00f, 2.15113585e+00f, 2.20088916e+00f, 2.25350798e+00f, 2.30913084e+00f, 2.36790578e+00f, 2.42999091e+00f, 2.49555516e+00f, 2.56477893e+00f, 2.63785496e+00f, 2.71498915e+00f, 2.79640147e+00f, 2.88232702e+00f, 2.97301705e+00f, 3.06874019e+00f, 3.16978367e+00f, 3.27645477e+00f, 3.38908227e+00f, 3.50801806e+00f, 3.63363896e+00f, 3.76634859e+00f, 3.90657947e+00f, 4.05479525e+00f, 4.21149322e+00f, 4.37720695e+00f, 4.55250922e+00f, 4.73801517e+00f, 4.93438579e+00f, 5.14233166e+00f, 5.36261713e+00f, 5.59606472e+00f, 5.84356014e+00f, 6.10605759e+00f, 6.38458564e+00f, 6.68025373e+00f, 6.99425915e+00f, 7.32789480e+00f, 7.68255767e+00f, 8.05975815e+00f, 8.46113023e+00f, 8.88844279e+00f, 9.34361190e+00f, 9.82871448e+00f, 1.03460033e+01f, 1.08979234e+01f, 1.14871305e+01f, 1.21165112e+01f, 1.27892047e+01f, 1.35086281e+01f, 1.42785033e+01f, 1.51028871e+01f, 1.59862046e+01f, 1.69332867e+01f, 1.79494108e+01f, 1.90403465e+01f, 2.02124072e+01f, 2.14725057e+01f, 2.28282181e+01f, 2.42878539e+01f, 2.58605342e+01f, 2.75562800e+01f, 2.93861096e+01f, 3.13621485e+01f, 3.34977526e+01f, 3.58076454e+01f, 3.83080730e+01f, 4.10169773e+01f, 4.39541917e+01f, 4.71416602e+01f, 5.06036855e+01f, 5.43672075e+01f, 5.84621188e+01f, 6.29216205e+01f, 6.77826252e+01f, 7.30862125e+01f, 7.88781469e+01f, 8.52094636e+01f, 9.21371360e+01f, 9.97248336e+01f, 1.08043785e+02f, 1.17173764e+02f, 1.27204209e+02f, 1.38235512e+02f, 1.50380485e+02f, 1.63766039e+02f, 1.78535118e+02f, 1.94848913e+02f, 2.12889407e+02f, 2.32862309e+02f, 2.55000432e+02f, 2.79567594e+02f, 3.06863126e+02f, 3.37227087e+02f, 3.71046310e+02f, 4.08761417e+02f, 4.50874968e+02f, 4.97960949e+02f, 5.50675821e+02f, 6.09771424e+02f, 6.76110054e+02f, 7.50682104e+02f, 8.34626760e+02f, 9.29256285e+02f, 1.03608458e+03f, 1.15686082e+03f, 1.29360914e+03f, 1.44867552e+03f, 1.62478326e+03f, 1.82509876e+03f, 2.05330964e+03f, 2.31371761e+03f, 2.61134924e+03f, 2.95208799e+03f, 3.34283233e+03f, 3.79168493e+03f, 4.30817984e+03f, 4.90355562e+03f, 5.59108434e+03f, 6.38646863e+03f, 7.30832183e+03f, 8.37874981e+03f, 9.62405722e+03f, 1.10756067e+04f, 1.27708661e+04f, 1.47546879e+04f, 1.70808754e+04f, 1.98141031e+04f, 2.30322789e+04f, 2.68294532e+04f, 3.13194118e+04f, 3.66401221e+04f, 4.29592484e+04f, 5.04810088e+04f, 5.94547213e+04f, 7.01854788e+04f, 8.30475173e+04f, 9.85009981e+04f, 1.17113127e+05f, 1.39584798e+05f, 1.66784302e+05f, 1.99790063e+05f, 2.39944995e+05f, 2.88925794e+05f, 3.48831531e+05f, 4.22297220e+05f, 5.12639825e+05f, 6.24046488e+05f, 7.61817907e+05f, 9.32683930e+05f, 1.14521401e+06f, 1.41035265e+06f, 1.74212004e+06f, 2.15853172e+06f, 2.68280941e+06f, 3.34498056e+06f, 4.18399797e+06f, 5.25055801e+06f, 6.61086017e+06f, 8.35163942e+06f, 1.05869253e+07f, 1.34671524e+07f, 1.71914827e+07f, 2.20245345e+07f, 2.83191730e+07f, 3.65476782e+07f, 4.73445266e+07f, 6.15653406e+07f, 8.03684303e+07f, 1.05328028e+08f, 1.38592169e+08f, 1.83103699e+08f, 2.42910946e+08f, 3.23606239e+08f, 4.32947522e+08f, 5.81743297e+08f, 7.85117979e+08f, 1.06432920e+09f, 1.44938958e+09f, 1.98286647e+09f, 2.72541431e+09f, 3.76386796e+09f, 5.22313881e+09f, 7.28378581e+09f, 1.02080964e+10f, 1.43789932e+10f, 2.03583681e+10f, 2.89749983e+10f, 4.14577375e+10f, 5.96383768e+10f, 8.62622848e+10f, 1.25466705e+11f, 1.83521298e+11f, 2.69981221e+11f, 3.99492845e+11f, 5.94638056e+11f, 8.90440997e+11f, 1.34155194e+12f, 2.03376855e+12f, 3.10262796e+12f, 4.76359832e+12f, 7.36142036e+12f, 1.14512696e+13f, 1.79331419e+13f, 2.82758550e+13f, 4.48929705e+13f, 7.17780287e+13f, 1.15585510e+14f, 1.87483389e+14f, 3.06351036e+14f, 5.04340065e+14f, 8.36616340e+14f, 1.39855635e+15f, 2.35633575e+15f, 4.00176517e+15f, 6.85137513e+15f, 1.18269011e+16f, 2.05867353e+16f, 3.61396878e+16f, 6.39911218e+16f, 1.14301619e+17f, 2.05988138e+17f, 3.74584679e+17f, 6.87444303e+17f, 1.27340764e+18f, 2.38124192e+18f, 4.49583562e+18f, 8.57144202e+18f, 1.65044358e+19f, 3.21010035e+19f, 6.30778012e+19f, 1.25240403e+20f, 2.51300530e+20f, 5.09677626e+20f, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -384,7 +388,7 @@ void sinh_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 2>&)
       { 1.571461316550783294e+00, 1.576790166316938345e+00, 1.587495640370383316e+00, 1.603673956341370210e+00, 1.625471125457493943e+00, 1.653085011915939302e+00, 1.686768142525911236e+00, 1.726831323537516202e+00, 1.773648138667236602e+00, 1.827660421478661448e+00, 1.889384817044018196e+00, 1.959420572855037091e+00, 2.038458728047908923e+00, 2.127292904083847225e+00, 2.226831940199076941e+00, 2.338114664555130296e+00, 2.462327148722991304e+00, 2.600822860927085164e+00, 2.755146214814554359e+00, 2.927060108424483555e+00, 3.118578166240921951e+00, 3.332002540339506630e+00, 3.569968300410740276e+00, 3.835495653996447262e+00, 4.132051496512934885e+00, 4.463622106699067881e+00, 4.834799191008006557e+00, 5.250881957765679608e+00, 5.717998490875333124e+00, 6.243250421598568105e+00, 6.834885801226541839e+00, 7.502506202789340802e+00, 8.257315484493544201e+00, 9.112419405864642634e+00, 1.008318749543997758e+01, 1.118769134993865202e+01, 1.244723705914106881e+01, 1.388701390605507587e+01, 1.553688715915900190e+01, 1.743237000680942831e+01, 1.961581894823993424e+01, 2.213790886354273806e+01, 2.505945934677137610e+01, 2.845370377742137561e+01, 3.240911845969524834e+01, 3.703296289480230161e+01, 4.245572644746267911e+01, 4.883673480337985582e+01, 5.637124640586975420e+01, 6.529947092752610340e+01, 7.591807755694122837e+01, 8.859494252391663822e+01, 1.037881295005788124e+02, 1.220704263969226746e+02, 1.441612098131200535e+02, 1.709680191245773511e+02, 2.036410593843575570e+02, 2.436450058708723643e+02, 2.928540812182076105e+02, 3.536786019152253392e+02, 4.292343083967296939e+02, 5.235701840488733027e+02, 6.419766898003024575e+02, 7.914052083668759283e+02, 9.810422089081931637e+02, 1.223099994999740393e+03, 1.533912555427112127e+03, 1.935464013605830339e+03, 2.457534549912886852e+03, 3.140733731623635519e+03, 4.040818188564651898e+03, 5.234881599712225681e+03, 6.830294457607329226e+03, 8.977713228649887143e+03, 1.189015920967326839e+04, 1.587122387044346962e+04, 2.135711106445789331e+04, 2.897983705189681437e+04, 3.966306726795547950e+04, 5.476875193750000787e+04, 7.632356539388055680e+04, 1.073719149754976951e+05, 1.525316674555574152e+05, 2.188778434744216586e+05, 3.173624496019295608e+05, 4.651201525869328462e+05, 6.892537656280580572e+05, 1.033119885120019982e+06, 1.566887981043252499e+06, 2.405492027026531795e+06, 3.739528964815910340e+06, 5.889121154895580032e+06, 9.399046351922342030e+06, 1.520903276129653518e+07, 2.496287187293576168e+07, 4.157759259963074840e+07, 7.030705366950267312e+07, 1.207598558452493366e+08, 2.107882509464846833e+08, 3.741047199023457864e+08, 6.754494594987415572e+08, 1.241316740415880537e+09, 2.323310032649552862e+09, 4.431176019026625759e+09, 8.617446487400900130e+09, 1.709836906604031513e+10, 3.463574521880171339e+10, 7.167607123799270726e+10, 1.516347620910054079e+11, 3.281729323238950526e+11, 7.271102600298280790e+11, 1.650499552378780378e+12, 3.841338149508803917e+12, 9.173744267785176575e+12, 2.249901946357519979e+13, 5.671535089900611731e+13, 1.470742250307697019e+14, 3.927012518464311775e+14, 1.080639977391212820e+15, 3.067671466720475189e+15, 8.992386789198328428e+15, 2.724722536524592111e+16, 8.542946122263389258e+16, 2.774613718725574755e+17, 9.345299479382029121e+17, 3.267996122987731882e+18, 1.187914433455468315e+19, 4.494053408418564214e+19, 1.771706652195486743e+20, 7.288102552885931527e+20, 3.132512430816625349e+21, 1.408743767951073110e+22, 6.638294268236060414e+22, 3.282543608403565013e+23, 1.705920098038394064e+24, 9.332259385148524285e+24, 5.382727175874888312e+25, 3.278954235122093249e+26, 2.113191697957458099e+27, 1.443411041499643040e+28, 1.046864394654982423e+29, 8.077319226958905700e+29, 6.643146963432616277e+30, 5.835670121359986260e+31, 5.486890296790230798e+32, 5.533726968508261614e+33, 5.999734996418352834e+34, 7.009176119466122569e+35, 8.844061966424597499e+36, 1.208226860869605961e+38, 1.791648514311063338e+39, 2.891313916713205762e+40, 5.091457860211527298e+41, 9.810630588402496553e+42, 2.074441239147378860e+44, 4.827650116937700540e+45, 1.240287939111549029e+47, 3.528782858644784616e+48, 1.115449490471696659e+50, 3.930510643328196314e+51, 1.549243712957852337e+53, 6.854998238041301002e+54, 3.417479961583207704e+56, 1.926905498641079990e+58, 1.233580963004919450e+60, 9.002819902898076915e+61, 7.521415141253441645e+63, 7.224277554900578993e+65, 8.012832830535078610e+67, 1.030999620286380369e+70, 1.546174957076748679e+72, 2.715803772613248694e+74, 5.615089920571746438e+76, 1.373667859345343337e+79, 3.997541020769625126e+81, 1.391500589339800087e+84, 5.826693844912022892e+86, 2.952274820929549096e+89, 1.821023061478466282e+92, 1.375973022137941526e+95, 1.281852367543412945e+98, 1.482130127201990503e+101, 2.141574273792435314e+104, 3.894495540947112380e+107, 8.978646362580102961e+110, 2.644131589807244050e+114, 1.002403539841913834e+118, 4.931412804903905259e+121, 3.174401112435865044e+125, 2.696624001761892390e+129, 3.049799322320447166e+133, 4.634041526818687785e+137, 9.548983134803106512e+141, 2.694404866192089829e+146, 1.051502720036395325e+151, 5.734170640626244955e+155, },
       { 1.570962550997832611e+00, 1.572292902367211961e+00, 1.574956581912666755e+00, 1.578959553636163985e+00, 1.584310789563614305e+00, 1.591022301117035107e+00, 1.599109181186160337e+00, 1.608589657109067468e+00, 1.619485154826419743e+00, 1.631820374530739318e+00, 1.645623378191125679e+00, 1.660925689395424109e+00, 1.677762406016463717e+00, 1.696172326277082973e+00, 1.716198088860732467e+00, 1.737886327791014562e+00, 1.761287842885152410e+00, 1.786457786673686420e+00, 1.813455868772335587e+00, 1.842346578792652542e+00, 1.873199428986627521e+00, 1.906089217937612619e+00, 1.941096316736779451e+00, 1.978306979221816566e+00, 2.017813678003844337e+00, 2.059715468170813895e+00, 2.104118380732327493e+00, 2.151135848063375554e+00, 2.200889163814591418e+00, 2.253507979986114202e+00, 2.309130844113053375e+00, 2.367905779785113334e+00, 2.429990914023652954e+00, 2.495555155369085590e+00, 2.564778926893134514e+00, 2.637854958747451684e+00, 2.714989145296268067e+00, 2.796401472360280536e+00, 2.882327020626578700e+00, 2.973017051860293803e+00, 3.068740185193628238e+00, 3.169783671473487386e+00, 3.276454774427328601e+00, 3.389082268266156098e+00, 3.508018062292869136e+00, 3.633638964133530274e+00, 3.766348594369884204e+00, 3.906579466636309289e+00, 4.054795248667541120e+00, 4.211493221360917802e+00, 4.377206954666462219e+00, 4.552509221059946388e+00, 4.738015169510782826e+00, 4.934385785253587887e+00, 5.142331663338191074e+00, 5.362617126899976224e+00, 5.596064724397100194e+00, 5.843560143744373307e+00, 6.106057585381734693e+00, 6.384585640900671436e+00, 6.680253728973824449e+00, 6.994259146058412709e+00, 7.327894795748901060e+00, 7.682557667824588764e+00, 8.059758146071137270e+00, 8.461130232962342889e+00, 8.888442789395671080e+00, 9.343611899025485155e+00, 9.828714479494622022e+00, 1.034600327721380625e+01, 1.089792339849122916e+01, 1.148713054801325790e+01, 1.211651116619788555e+01, 1.278920468010096321e+01, 1.350862810871281096e+01, 1.427850329305334421e+01, 1.510288705493181327e+01, 1.598620462612703196e+01, 1.693328673269081128e+01, 1.794941076780000506e+01, 1.904034654190823159e+01, 2.021240716182964334e+01, 2.147250566192247370e+01, 2.282821809199713505e+01, 2.428785385941680425e+01, 2.586053422878117785e+01, 2.755628000354674426e+01, 2.938610955221109564e+01, 3.136214849990951329e+01, 3.349775258749912582e+01, 3.580764540799625468e+01, 3.830807296872530167e+01, 4.101697730155473447e+01, 4.395419165876113623e+01, 4.714166019494196927e+01, 5.060368545366659226e+01, 5.436720746019445252e+01, 5.846211877912138439e+01, 6.292162054058128784e+01, 6.778262518512416663e+01, 7.308621254265223015e+01, 7.887814686488147292e+01, 8.520946359734658334e+01, 9.213713603387774717e+01, 9.972483357670754649e+01, 1.080437851679046426e+02, 1.171737636088621692e+02, 1.272042089988687372e+02, 1.382355124664102373e+02, 1.503804848151483311e+02, 1.637660387526102742e+02, 1.785351181233383403e+02, 1.948489131607280604e+02, 2.128894073598352670e+02, 2.328623093447990790e+02, 2.550004322843281994e+02, 2.795675942672445782e+02, 3.068631259124280934e+02, 3.372270867451200874e+02, 3.710463099965576255e+02, 4.087614170466174911e+02, 4.508749684194593670e+02, 4.979609488959773491e+02, 5.506758209385785877e+02, 6.097714244663179092e+02, 6.761100535726473685e+02, 7.506821038741422446e+02, 8.346267600518081192e+02, 9.292562845315541998e+02, 1.036084578498234728e+03, 1.156860819661897657e+03, 1.293609142453808600e+03, 1.448675521854205144e+03, 1.624783259532197615e+03, 1.825098759915318560e+03, 2.053309635972617554e+03, 2.313717614494777200e+03, 2.611349236640186999e+03, 2.952087994093624299e+03, 3.342832332560548180e+03, 3.791684927756595099e+03, 4.308179838716318955e+03, 4.903555624570201673e+03, 5.591084343634811452e+03, 6.386468625571246341e+03, 7.308321829412979440e+03, 8.378749812799703561e+03, 9.624057218749638059e+03, 1.107560666191146008e+04, 1.277086605445904388e+04, 1.475468792019489452e+04, 1.708087537417066343e+04, 1.981410309695485051e+04, 2.303227888204754908e+04, 2.682945317928632535e+04, 3.131941178398428200e+04, 3.664012209706997997e+04, 4.295924836668690170e+04, 5.048100882639843572e+04, 5.945472133180055290e+04, 7.018547875172689579e+04, 8.304751726175694003e+04, 9.850099805053575446e+04, 1.171131266261766060e+05, 1.395847982160589845e+05, 1.667843016393077556e+05, 1.997900626520524686e+05, 2.399449946032992187e+05, 2.889257939838013232e+05, 3.488315309194304548e+05, 4.222972201496778447e+05, 5.126398246369253619e+05, 6.240464876221989792e+05, 7.618179073233615941e+05, 9.326839300224119257e+05, 1.145214007774297539e+06, 1.410352646274233119e+06, 1.742120041875863385e+06, 2.158531716934287014e+06, 2.682809410126426731e+06, 3.344980563595418861e+06, 4.183997972337706048e+06, 5.250558008165501752e+06, 6.610860174141680988e+06, 8.351639423967558693e+06, 1.058692532393929900e+07, 1.346715235106239409e+07, 1.719148271024263021e+07, 2.202453449027701694e+07, 2.831917301724337797e+07, 3.654767820268344932e+07, 4.734452657230626106e+07, 6.156534063509513873e+07, 8.036843026897869248e+07, 1.053280284359690289e+08, 1.385921689084126286e+08, 1.831036985925683524e+08, 2.429109457458640820e+08, 3.236062393759667463e+08, 4.329475218599986663e+08, 5.817432967962929479e+08, 7.851179789388191786e+08, 1.064329197627075307e+09, 1.449389582912945485e+09, 1.982866469377991849e+09, 2.725414314698094324e+09, 3.763867964111621444e+09, 5.223138814950990937e+09, 7.283785810644397704e+09, 1.020809642381158743e+10, 1.437899318470510521e+10, 2.035836812543633578e+10, 2.897499827080027444e+10, 4.145773751645494878e+10, 5.963837683872426287e+10, 8.626228483915530800e+10, 1.254667045389825180e+11, 1.835212982264913186e+11, 2.699812207400151604e+11, 3.994928452151922954e+11, 5.946380558701434550e+11, 8.904409967424091107e+11, 1.341551941677775838e+12, 2.033768550332151892e+12, 3.102627959875753214e+12, 4.763598321705862063e+12, 7.361420360560813584e+12, 1.145126961456557423e+13, 1.793314186996273926e+13, 2.827585501285792232e+13, 4.489297053678444669e+13, 7.177802872658499571e+13, 1.155855098545820625e+14, 1.874833886367883093e+14, 3.063510356402174454e+14, 5.043400653005970242e+14, 8.366163396892429890e+14, 1.398556351640947289e+15, 2.356335749516164682e+15, 4.001765167382637456e+15, 6.851375128404941445e+15, 1.182690111761543990e+16, 2.058673527013806443e+16, 3.613968784314904633e+16, 6.399112184394213551e+16, 1.143016185628376923e+17, 2.059881383915666443e+17, 3.745846788353680914e+17, 6.874443034683149068e+17, 1.273407643613485314e+18, 2.381241916829895366e+18, 4.495835617307108399e+18, 8.571442024901952701e+18, 1.650443584181656965e+19, 3.210100352421317851e+19, 6.307780124442703091e+19, 1.252404031157661279e+20, 2.513005295649985394e+20, 5.096776255690838436e+20, 1.045019200016673046e+21, 2.166476479260878466e+21, 4.542138145678395463e+21, 9.632082324449137128e+21, 2.066386536688254528e+22, 4.485529785554428251e+22, 9.853879573610977508e+22, 2.191158874464374408e+23, 4.932835964390971668e+23, 1.124501529971774363e+24, 2.596269136156756008e+24, 6.072292938313625501e+24, 1.438989066308003836e+25, 3.455841956406570469e+25, 8.412655191713576490e+25, 2.076289061650816510e+26, 5.196515024640220322e+26, 1.319173194089644043e+27, 3.397455895980380794e+27, 8.879057454438503591e+27, 2.355272361492064126e+28, 6.342762007722624824e+28, 1.734531093990859705e+29, 4.817893170606830871e+29, 1.359597346490148232e+30, 3.898969689906500392e+30, 1.136542986529989936e+31, 3.368450043991780017e+31, 1.015304084709817260e+32, 3.113144376221918237e+32, 9.713072739730140403e+32, 3.084517643581725946e+33, 9.972682139820497284e+33, 3.283625052288491586e+34, 1.101378785390827536e+35, 3.764333367592714297e+35, 1.311403465938242926e+36, 4.658135710682813672e+36, 1.687517347470511392e+37, 6.237053685018323490e+37, 2.352571314427744869e+38, 9.058938240219699936e+38, 3.562249097611136071e+39, 1.430959291578558210e+40, 5.873974584984375049e+40, 2.464828549811283787e+41, 1.057649203090855628e+42, 4.642475639281078035e+42, 2.085287118272421779e+43, 9.588439985186632177e+43, 4.514982011246092280e+44, 2.177974048341973204e+45, 1.076720976822900458e+46, 5.457267432929085589e+46, 2.836869270455781134e+47, 1.513103201392011626e+48, 8.283974667225617075e+48, 4.657239491995971344e+49, 2.689796370712836937e+50, 1.596597846911970388e+51, 9.744154538256586629e+51, 6.117238394843313065e+52, 3.952049650585241827e+53, 2.628701592074258213e+54, 1.800990196502679393e+55, 1.271554462563068383e+56, 9.255880104477760711e+56, 6.949737920133919393e+57, 5.385167200769965621e+58, 4.308493668102978774e+59, 3.560951557542178371e+60, 3.041888528384649992e+61, 2.687094441930837189e+62, 2.455920538900000855e+63, 2.323648254168641537e+64, 2.277129741584892331e+65, 2.312633552913224734e+66, 2.435407592981291129e+67, 2.660910388822465246e+68, 3.018105943423533920e+69, 3.555823489510192503e+70, 4.354188877793849013e+71, 5.544975795511813315e+72, 7.348276481909886336e+73, 1.013998025722423261e+75, 1.457911462244607943e+76, 2.185488876819505295e+77, 3.418022153286623008e+78, 5.580843920601835728e+79, 9.519586502799733908e+80, 1.697573578247197786e+82, 3.166906670990180014e+83, 6.185099106418675430e+84, 1.265541134386934377e+86, 2.714828965877756899e+87, 6.110386802964494082e+88, 1.444054086171083239e+90, 3.586083726638388165e+91, 9.365231868063239600e+92, 2.574080116205122449e+94, 7.452134689862302719e+95, 2.274309903836169819e+97, 7.323011134121164749e+98, 2.489816421737932462e+100, 8.946533386359281588e+101, 3.400401372391165979e+103, 1.368288186208928217e+105, 5.834277489829591931e+106, 2.638486937672383424e+108, 1.266728882767139521e+110, 6.462225178314182803e+111, 3.506432320607573604e+113, 2.025608933943268165e+115, 1.247041677084784707e+117, 8.189865188405279038e+118, 5.743610894406099965e+120, 4.305808934084489763e+122, 3.454156966079496755e+124, 2.968316601530352737e+126, 2.735456242372183592e+128, 2.706317176690077847e+130, 2.877679916342060385e+132, 3.292412878268106390e+134, 4.057840961953725969e+136, 5.393783049105737324e+138, 7.741523901672235406e+140, 1.201209962310668456e+143, 2.017456079556807301e+145, 3.672176623483062526e+147, 7.253163798058577630e+149, 1.556591535302570570e+152, 3.634399832790394885e+154, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -425,7 +429,7 @@ void sinh_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 3>&)
       { 1.57146131655078329437644376888801138e+00L, 1.57679016631693834484126246342345329e+00L, 1.58749564037038331646069625234555521e+00L, 1.60367395634137020950291269057600307e+00L, 1.62547112545749394267938666988196139e+00L, 1.65308501191593930171844822364141731e+00L, 1.68676814252591123625053019619255158e+00L, 1.72683132353751620184313195813656600e+00L, 1.77364813866723660171326886678529701e+00L, 1.82766042147866144821632902536146347e+00L, 1.88938481704401819562549601165115021e+00L, 1.95942057285503709111658357403615203e+00L, 2.03845872804790892275259742585569433e+00L, 2.12729290408384722476899855222432786e+00L, 2.22683194019907694104850876757126753e+00L, 2.33811466455513029581902771513343722e+00L, 2.46232714872299130380967769641847017e+00L, 2.60082286092708516436098022317536381e+00L, 2.75514621481455435937229822050004007e+00L, 2.92706010842448355516791030533685920e+00L, 3.11857816624092195149666191379786472e+00L, 3.33200254033950662971711811118318338e+00L, 3.56996830041074027550628111498923678e+00L, 3.83549565399644726181552365400966870e+00L, 4.13205149651293488468153425460318353e+00L, 4.46362210669906788115667211361364802e+00L, 4.83479919100800655701530131187647507e+00L, 5.25088195776567960767293727240320892e+00L, 5.71799849087533312421158643544587353e+00L, 6.24325042159856810533215887376856930e+00L, 6.83488580122654183866366620676303900e+00L, 7.50250620278934080195915244309172491e+00L, 8.25731548449354420110207897041998984e+00L, 9.11241940586464263380079984086513597e+00L, 1.00831874954399775830998395457182684e+01L, 1.11876913499386520162594085796167645e+01L, 1.24472370591410688131760615976965093e+01L, 1.38870139060550758665255786705519681e+01L, 1.55368871591590018952847646637454593e+01L, 1.74323700068094283108112572669239084e+01L, 1.96158189482399342378436216339159090e+01L, 2.21379088635427380602824337731297019e+01L, 2.50594593467713760968808829296439171e+01L, 2.84537037774213756120135736520435304e+01L, 3.24091184596952483433430577491101072e+01L, 3.70329628948023016142035941015485370e+01L, 4.24557264474626791146220920324192917e+01L, 4.88367348033798558171280311705362727e+01L, 5.63712464058697542020818458752120814e+01L, 6.52994709275261034008086934786702551e+01L, 7.59180775569412283714380617539343408e+01L, 8.85949425239166382162609558265821220e+01L, 1.03788129500578812415162165531670704e+02L, 1.22070426396922674625756853326498468e+02L, 1.44161209813120053456742433728771078e+02L, 1.70968019124577351122499690038707734e+02L, 2.03641059384357556999222931732850856e+02L, 2.43645005870872364316059216110059642e+02L, 2.92854081218207610543177302881458406e+02L, 3.53678601915225339202500542949917795e+02L, 4.29234308396729693907268968564609660e+02L, 5.23570184048873302665650155276206906e+02L, 6.41976689800302457508415746115180260e+02L, 7.91405208366875928332161102969868782e+02L, 9.81042208908193163688535235538889459e+02L, 1.22309999499974039331272100414750813e+03L, 1.53391255542711212726525490457861725e+03L, 1.93546401360583033885511419988831009e+03L, 2.45753454991288685207196097797062484e+03L, 3.14073373162363551894782974867325472e+03L, 4.04081818856465189750723035050638141e+03L, 5.23488159971222568136194576211612571e+03L, 6.83029445760732922582000345557383347e+03L, 8.97771322864988714349790288910627671e+03L, 1.18901592096732683947870697270695144e+04L, 1.58712238704434696215746702894136306e+04L, 2.13571110644578933143540830593360855e+04L, 2.89798370518968143718297906801146350e+04L, 3.96630672679554794954087134590560762e+04L, 5.47687519375000078688553248953764732e+04L, 7.63235653938805568016142182690471993e+04L, 1.07371914975497695062170132456450593e+05L, 1.52531667455557415180420019888676134e+05L, 2.18877843474421658617449971461581691e+05L, 3.17362449601929560775572985879585343e+05L, 4.65120152586932846156175983364596723e+05L, 6.89253765628058057206329188782990860e+05L, 1.03311988512001998186230013733752720e+06L, 1.56688798104325249948154338241641806e+06L, 2.40549202702653179507492073842261453e+06L, 3.73952896481591033994026114668796352e+06L, 5.88912115489558003244667233279563785e+06L, 9.39904635192234203007457377008255614e+06L, 1.52090327612965351790614542733698474e+07L, 2.49628718729357616773929842263043964e+07L, 4.15775925996307484022703929049831425e+07L, 7.03070536695026731176158877103497776e+07L, 1.20759855845249336607363637052870598e+08L, 2.10788250946484683324104572583041111e+08L, 3.74104719902345786397351281755078701e+08L, 6.75449459498741557237788387723071522e+08L, 1.24131674041588053743260021864117384e+09L, 2.32331003264955286246594304305695965e+09L, 4.43117601902662575879840759020751450e+09L, 8.61744648740090012951326726568665021e+09L, 1.70983690660403151330619158427281665e+10L, 3.46357452188017133850611855017361923e+10L, 7.16760712379927072634183907084755700e+10L, 1.51634762091005407908273857408800162e+11L, 3.28172932323895052570169126695951209e+11L, 7.27110260029828078950026409435831711e+11L, 1.65049955237878037840731169761272102e+12L, 3.84133814950880391685509371196326109e+12L, 9.17374426778517657484962791255187134e+12L, 2.24990194635751997880832549111511175e+13L, 5.67153508990061173097292032404781538e+13L, 1.47074225030769701852963232235912597e+14L, 3.92701251846431177545392497147427712e+14L, 1.08063997739121282020832802862957248e+15L, 3.06767146672047518894275739534732971e+15L, 8.99238678919832842771174638355746631e+15L, 2.72472253652459211109041460799535823e+16L, 8.54294612226338925817358060817490416e+16L, 2.77461371872557475533476908014408616e+17L, 9.34529947938202912146296976663431863e+17L, 3.26799612298773188163350554315742192e+18L, 1.18791443345546831451732293519928714e+19L, 4.49405340841856421397062311314705655e+19L, 1.77170665219548674305185389795833488e+20L, 7.28810255288593152697603764235601397e+20L, 3.13251243081662534865188632436805529e+21L, 1.40874376795107311038838007000777184e+22L, 6.63829426823606041441317767891166205e+22L, 3.28254360840356501289107248021554584e+23L, 1.70592009803839406409667145645666005e+24L, 9.33225938514852428454935743602712728e+24L, 5.38272717587488831207327363463407970e+25L, 3.27895423512209324910006662705296242e+26L, 2.11319169795745809927716305122705952e+27L, 1.44341104149964304009687846325713305e+28L, 1.04686439465498242316197235200069352e+29L, 8.07731922695890570023291958025986094e+29L, 6.64314696343261627707440459400107155e+30L, 5.83567012135998626006817430636714368e+31L, 5.48689029679023079776199817150941362e+32L, 5.53372696850826161418229677716330718e+33L, 5.99973499641835283449509393028972981e+34L, 7.00917611946612256941556198729562373e+35L, 8.84406196642459749869759626748371565e+36L, 1.20822686086960596115573575744502341e+38L, 1.79164851431106333799499432947126299e+39L, 2.89131391671320576216903362266762013e+40L, 5.09145786021152729801159516043566174e+41L, 9.81063058840249655325327952160218101e+42L, 2.07444123914737886022245738089968362e+44L, 4.82765011693770054022189143000576390e+45L, 1.24028793911154902904261886940649724e+47L, 3.52878285864478461616951002487254771e+48L, 1.11544949047169665881036414807872651e+50L, 3.93051064332819631369914292573124112e+51L, 1.54924371295785233686867649142553059e+53L, 6.85499823804130100151231679166543611e+54L, 3.41747996158320770357877327002949632e+56L, 1.92690549864107998957222500013304086e+58L, 1.23358096300491944958557136475962190e+60L, 9.00281990289807691528078151573158069e+61L, 7.52141514125344164522463463202808470e+63L, 7.22427755490057899279344696654950663e+65L, 8.01283283053507860974456727997488253e+67L, 1.03099962028638036919997632019550562e+70L, 1.54617495707674867923983623892142209e+72L, 2.71580377261324869371341160824868908e+74L, 5.61508992057174643750226165228505259e+76L, 1.37366785934534333692942668275259398e+79L, 3.99754102076962512613158938364235073e+81L, 1.39150058933980008745266389466237314e+84L, 5.82669384491202289249159160687839973e+86L, 2.95227482092954909582266634062763990e+89L, 1.82102306147846628152669685943631657e+92L, 1.37597302213794152564743989887492097e+95L, 1.28185236754341294523601004808033157e+98L, 1.48213012720199050337233086306566580e+101L, 2.14157427379243531419232668034147566e+104L, 3.89449554094711237984570195229015661e+107L, 8.97864636258010296104790318951217808e+110L, 2.64413158980724405044777067425347595e+114L, 1.00240353984191383430257305957041439e+118L, 4.93141280490390525871801097705197944e+121L, 3.17440111243586504420672164931106998e+125L, 2.69662400176189239027511019786185589e+129L, 3.04979932232044716644635827452454425e+133L, 4.63404152681868778475392087605038845e+137L, 9.54898313480310651224157422560754643e+141L, 2.69440486619208982853089677098686964e+146L, 1.05150272003639532507210605903884076e+151L, 5.73417064062624495509840837865743050e+155L, 4.41627650777870044428827641421915327e+160L, 4.85653500442164862297918118887566388e+165L, 7.71243776020172406235461422008761914e+170L, 1.78944284768135145352387398006192815e+176L, 6.13948504948193852500464630902178966e+181L, 3.15374719244414866832063986813364807e+187L, 2.45678229633130089072342575625791640e+193L, 2.94097956743157560377748279040964662e+199L, 5.48435772238022826264635788020315114e+205L, 1.61576755939787162649511106856450099e+212L, 7.63055674811964328822328719215905762e+218L, 5.86357963426750903008317058039636736e+225L, 7.44578009523250679265610908767109796e+232L, 1.58753358925950887380498944645468602e+240L, 5.77757179750005470017336807397418313e+247L, 3.65046885264085030960970127282511879e+255L, 4.07509702021276189043935129812053895e+263L, 8.18389073292535025618266801702554839e+271L, 3.01238089652162618211263051563523370e+280L, 2.07176624104483264053704912869659325e+289L, 2.71562735784398218302697011744202385e+298L, 6.92451661016398143622710849660362520e+307L, 3.50810155650162047040906671177815417e+317L, 3.60896781300246599975888048597671985e+327L, 7.71058277826701049982730585006218034e+337L, 3.50154660288711246272389096490054302e+348L, 3.46175331564137723439223486579386975e+359L, 7.63696466254316472130052183903629062e+370L, 3.85655304044390258996784681505914035e+382L, 4.57665692577932081843759029527968784e+394L, 1.31143566628034307965133274338127595e+407L, 9.33142940209453779649608781259673613e+419L, 1.69703443400488874615229289912465401e+433L, 8.12664327627950884948530966790210152e+446L, 1.05671342182667061564323377987059929e+461L, 3.85123350151333031094457679550412807e+475L, 4.06487630836024540948583469098247829e+490L, 1.28516517984503545753808504263016648e+506L, 1.26025754690341684764700072541766676e+522L, 3.97331612896914344554453503890576277e+538L, 4.17965516524315248567041014799432863e+555L, 1.52416658652941127494202186163265994e+573L, 2.00432202283496263048589917253126663e+591L, 9.89983817930114056039301724151237036e+609L, 1.91539340453423886973992445388091844e+629L, 1.51593315523153267229971976448703684e+649L, 5.13233111267478387648166311677061530e+669L, 7.78392571224632702458474933380523830e+690L, 5.54632077048043201021342066119640603e+712L, 1.95012604607548018918112113273623192e+735L, 3.55940947870861006830654543397286882e+758L, 3.55349341454925685547195460273265331e+782L, 2.04795692045857243226580641802720017e+807L, 7.20348918974342452885439546130773017e+832L, 1.63778937282231874342883712446170710e+859L, 2.55384218509638087014670377175798088e+886L, 2.90332357089198897009653578594580665e+914L, 2.56300421336271050326091753908665515e+943L, 1.87504708602076913446948153935468528e+973L, 1.21573089114719501597325465689193734e+1004L, 7.48693407429699486755736805187051392e+1035L, 4.70376397570597947605315058283235338e+1068L, 3.24549375035327607806235059706162609e+1102L, 2.65365798053210741189633750297123713e+1137L, 2.78113361306514574568406809189880354e+1173L, 4.05114001708803517429009145027606492e+1210L, 8.91647476482514121118371429882160487e+1248L, 3.23223851331898724884680382253593571e+1288L, 2.10925909168894371224120829576314259e+1329L, 2.71594389750881594498007515800169231e+1371L, 7.58558239286242519535157411695442827e+1414L, 5.06701669031717221741926320252846248e+1459L, 8.95314256637167381172114473249653533e+1505L, 4.64314397380853725563695225910483395e+1553L, 7.86772811149376784892131781209226509e+1602L, 4.86578559687970087801384706555207321e+1653L, 1.23116054769360594876926981962811083e+1706L, 1.43383897399728293235616506956599019e+1760L, 8.67960762728500385489074199138374599e+1815L, 3.09584788327503858182429306492345781e+1873L, 7.40514657822678853879551103162851562e+1932L, 1.35750288266752565171774149402837640e+1994L, 2.18886955807028168114167639122307268e+2057L, 3.57839966436010585653478204799948336e+2122L, 6.86791017358151132323155526430183469e+2189L, 1.80021943882415618419042799861559854e+2259L, 7.53312429569410546159363413753399067e+2330L, 5.91165553375547478649257686857639971e+2404L, },
       { 1.57096255099783261137673508918980377e+00L, 1.57229290236721196082451564636254803e+00L, 1.57495658191266675503402671533627186e+00L, 1.57895955363616398471678434379990522e+00L, 1.58431078956361430514416599492388597e+00L, 1.59102230111703510742216272394562613e+00L, 1.59910918118616033722590556649394763e+00L, 1.60858965710906746764504456185444654e+00L, 1.61948515482641974319339137784305225e+00L, 1.63182037453073931785527493516038124e+00L, 1.64562337819112567903033806653906069e+00L, 1.66092568939542410935608828998468834e+00L, 1.67776240601646371733138779357535047e+00L, 1.69617232627708297296989766202480515e+00L, 1.71619808886073246730768842066355199e+00L, 1.73788632779101456236627555096372654e+00L, 1.76128784288515241044102589887617560e+00L, 1.78645778667368642025315725404601102e+00L, 1.81345586877233558659749539967614045e+00L, 1.84234657879265254187280543490489739e+00L, 1.87319942898662752121993510591579920e+00L, 1.90608921793761261888076943857856180e+00L, 1.94109631673677945144587926354356120e+00L, 1.97830697922181656566949720098719647e+00L, 2.01781367800384433737712026561151498e+00L, 2.05971546817081389507270282494773392e+00L, 2.10411838073232749275747224342524909e+00L, 2.15113584806337555354918618566085438e+00L, 2.20088916381459141771044083611555369e+00L, 2.25350797998611420231160903572594743e+00L, 2.30913084411305337537709048855358397e+00L, 2.36790577978511333384857209921738492e+00L, 2.42999091402365295350102767412517845e+00L, 2.49555515536908558968587982458158759e+00L, 2.56477892689313451429557802920827974e+00L, 2.63785495874745168415081659796280588e+00L, 2.71498914529626806741705564771250802e+00L, 2.79640147236028053619149909690973720e+00L, 2.88232702062657870038560203490158574e+00L, 2.97301705186029380311201985278736098e+00L, 3.06874018519362823755119514588303156e+00L, 3.16978367147348738564623946178566521e+00L, 3.27645477442732860056345607892739085e+00L, 3.38908226826615609816107421136979984e+00L, 3.50801806229286913554992299494422526e+00L, 3.63363896413353027399263692498221540e+00L, 3.76634859436988420367634452674074607e+00L, 3.90657946663630928939225987850575005e+00L, 4.05479524866754112035397645627643742e+00L, 4.21149322136091780158052739625729631e+00L, 4.37720695466646221916071477112304019e+00L, 4.55250922105994638849140210916632132e+00L, 4.73801516951078282566987752649050466e+00L, 4.93438578525358788671420711795537458e+00L, 5.14233166333819107447595069798421539e+00L, 5.36261712689997622445803908396748884e+00L, 5.59606472439710019418213140693069575e+00L, 5.84356014374437330661446789126222075e+00L, 6.10605758538173469317727364122669467e+00L, 6.38458564090067143612732202429488542e+00L, 6.68025372897382444864907987044889317e+00L, 6.99425914605841270881961646990609410e+00L, 7.32789479574890106033548644768353338e+00L, 7.68255766782458876413667730681699443e+00L, 8.05975814607113727007240055318338450e+00L, 8.46113023296234288939356989479671723e+00L, 8.88844278939567108027044653070693778e+00L, 9.34361189902548515485066576358196470e+00L, 9.82871447949462202212030994384949241e+00L, 1.03460032772138062549383568058709409e+01L, 1.08979233984912291622835480030167114e+01L, 1.14871305480132578973614919602781370e+01L, 1.21165111661978855517781913327317255e+01L, 1.27892046801009632078942555615288463e+01L, 1.35086281087128109623831457304510920e+01L, 1.42785032930533442126932924888187804e+01L, 1.51028870549318132669071327511660921e+01L, 1.59862046261270319640752848374642080e+01L, 1.69332867326908112807352382039426796e+01L, 1.79494107678000050622926329104204826e+01L, 1.90403465419082315888820165929975494e+01L, 2.02124071618296433363312214170232623e+01L, 2.14725056619224736964251610816575600e+01L, 2.28282180919971350546248653847563966e+01L, 2.42878538594168042463845071817020910e+01L, 2.58605342287811778487151334440784950e+01L, 2.75562800035467442565131080245429614e+01L, 2.93861095522110956389210768876799587e+01L, 3.13621484999095132865600012683857137e+01L, 3.34977525874991258153646142408367963e+01L, 3.58076454079962546803810835720597110e+01L, 3.83080729687253016658377309622401176e+01L, 4.10169773015547344709659456503154667e+01L, 4.39541916587611362308342994483809472e+01L, 4.71416601949419692729062784327679986e+01L, 5.06036854536665922553724504470269960e+01L, 5.43672074601944525232284101611170030e+01L, 5.84621187791213843904071404608607478e+01L, 6.29216205405812878410372213510070276e+01L, 6.77826251851241666263837617897404532e+01L, 7.30862125426522301461255132629846162e+01L, 7.88781468648814729209715096907821639e+01L, 8.52094635973465833426799692679733796e+01L, 9.21371360338777471668559829773781201e+01L, 9.97248335767075464896305315099053068e+01L, 1.08043785167904642576949987865910954e+02L, 1.17173763608862169247776700625586421e+02L, 1.27204208998868737227575356110541727e+02L, 1.38235512466410237338282474486031692e+02L, 1.50380484815148331050381123359927804e+02L, 1.63766038752610274212021042234298836e+02L, 1.78535118123338340289613569013808793e+02L, 1.94848913160728060357302969254459805e+02L, 2.12889407359835266977366307026062112e+02L, 2.32862309344799079018746113493039633e+02L, 2.55000432284328199435640048881527463e+02L, 2.79567594267244578195192766207761694e+02L, 3.06863125912428093434496643114651412e+02L, 3.37227086745120087399301385427960651e+02L, 3.71046309996557625549265358225650347e+02L, 4.08761417046617491055856040237506316e+02L, 4.50874968419459367009632339064163929e+02L, 4.97960948895977349122916983180817637e+02L, 5.50675820938578587679472462796822793e+02L, 6.09771424466317909206822143572649707e+02L, 6.76110053572647368547479902312230309e+02L, 7.50682103874142244645724064576848341e+02L, 8.34626760051808119187547981730818179e+02L, 9.29256284531554199823656475151338963e+02L, 1.03608457849823472804207172846963877e+03L, 1.15686081966189765730466332807313547e+03L, 1.29360914245380859999201252074469995e+03L, 1.44867552185420514387789438088656434e+03L, 1.62478325953219761549580736728832563e+03L, 1.82509875991531856022535679631713756e+03L, 2.05330963597261755441688599655848892e+03L, 2.31371761449477720025881552764731872e+03L, 2.61134923664018699944734187657483567e+03L, 2.95208799409362429898911389656789101e+03L, 3.34283233256054817982471990245472659e+03L, 3.79168492775659509883214798303432158e+03L, 4.30817983871631895490690508451026040e+03L, 4.90355562457020167332670064217006554e+03L, 5.59108434363481145162671079876733528e+03L, 6.38646862557124634146730890858054275e+03L, 7.30832182941297944038809179971510199e+03L, 8.37874981279970356111509048453001571e+03L, 9.62405721874963805881171453111047092e+03L, 1.10756066619114600841076275282388063e+04L, 1.27708660544590438787794590107117849e+04L, 1.47546879201948945213025955616435132e+04L, 1.70808753741706634268551294101897318e+04L, 1.98141030969548505096681178137364270e+04L, 2.30322788820475490754732581365999861e+04L, 2.68294531792863253502182123460963590e+04L, 3.13194117839842820030641964449539820e+04L, 3.66401220970699799668192565829190288e+04L, 4.29592483666869017028607105165763804e+04L, 5.04810088263984357248209974578040223e+04L, 5.94547213318005529011388227962133751e+04L, 7.01854787517268957919092596317475529e+04L, 8.30475172617569400265716546608431303e+04L, 9.85009980505357544638949542794405193e+04L, 1.17113126626176606026864191754698095e+05L, 1.39584798216058984483938678946454092e+05L, 1.66784301639307755633312351999980104e+05L, 1.99790062652052468605951710457597772e+05L, 2.39944994603299218686253514351518948e+05L, 2.88925793983801323167992289814829493e+05L, 3.48831530919430454806103930858415528e+05L, 4.22297220149677844682618484564386312e+05L, 5.12639824636925361908056913471196846e+05L, 6.24046487622198979196137566922551170e+05L, 7.61817907323361594136262168936978923e+05L, 9.32683930022411925704630601110030182e+05L, 1.14521400777429753902355978052778602e+06L, 1.41035264627423311876298925540665884e+06L, 1.74212004187586338510201667214170577e+06L, 2.15853171693428701405141183541166264e+06L, 2.68280941012642673073659887232388938e+06L, 3.34498056359541886091597912499527306e+06L, 4.18399797233770604788689812330719069e+06L, 5.25055800816550175243256559083639418e+06L, 6.61086017414168098803951872291131863e+06L, 8.35163942396755869310534556270941378e+06L, 1.05869253239392990034806970327887878e+07L, 1.34671523510623940861241599892229316e+07L, 1.71914827102426302145958883698307763e+07L, 2.20245344902770169422620623417295079e+07L, 2.83191730172433779681268016861978467e+07L, 3.65476782026834493187990343694010282e+07L, 4.73445265723062610640363034466641760e+07L, 6.15653406350951387288804933390908042e+07L, 8.03684302689786924828741611740519293e+07L, 1.05328028435969028854761469747289545e+08L, 1.38592168908412628618546923035162247e+08L, 1.83103698592568352374304770508191971e+08L, 2.42910945745864082034287213456845086e+08L, 3.23606239375966746282831194186614169e+08L, 4.32947521859998666323053129499091577e+08L, 5.81743296796292947920442886775592966e+08L, 7.85117978938819178602650773642870262e+08L, 1.06432919762707530726575966438229782e+09L, 1.44938958291294548467516226794019366e+09L, 1.98286646937799184909776706883985509e+09L, 2.72541431469809432350206616813747393e+09L, 3.76386796411162144400474070771015333e+09L, 5.22313881495099093715899688078276720e+09L, 7.28378581064439770444275729738468286e+09L, 1.02080964238115874250636198090464363e+10L, 1.43789931847051052135186583023967432e+10L, 2.03583681254363357780032810961889254e+10L, 2.89749982708002744366825785538936402e+10L, 4.14577375164549487752492409798515416e+10L, 5.96383768387242628650336526594122215e+10L, 8.62622848391553079951805623395652598e+10L, 1.25466704538982518000690409655705216e+11L, 1.83521298226491318558080545133554232e+11L, 2.69981220740015160361114268684563366e+11L, 3.99492845215192295441294253418780644e+11L, 5.94638055870143455023933020703444642e+11L, 8.90440996742409110650533033931653292e+11L, 1.34155194167777583831947241717631506e+12L, 2.03376855033215189170105222958089604e+12L, 3.10262795987575321360135087196684567e+12L, 4.76359832170586206290082815387968037e+12L, 7.36142036056081358397678626842794083e+12L, 1.14512696145655742338758840735549183e+13L, 1.79331418699627392634462052642542749e+13L, 2.82758550128579223200239017529280909e+13L, 4.48929705367844466861372765075631687e+13L, 7.17780287265849957064212371548037347e+13L, 1.15585509854582062520354852997620279e+14L, 1.87483388636788309288478433629583664e+14L, 3.06351035640217445409310567498133847e+14L, 5.04340065300597024230361727189343426e+14L, 8.36616339689242989007881200440488764e+14L, 1.39855635164094728875364679627485304e+15L, 2.35633574951616468243164849507855064e+15L, 4.00176516738263745645278590345795707e+15L, 6.85137512840494144543571512545601884e+15L, 1.18269011176154399046326619510431010e+16L, 2.05867352701380644281110910622942185e+16L, 3.61396878431490463311666873476678412e+16L, 6.39911218439421355095519025524482256e+16L, 1.14301618562837692261569180960886276e+17L, 2.05988138391566644299797673070467922e+17L, 3.74584678835368091393630059068193045e+17L, 6.87444303468314906803024757565005462e+17L, 1.27340764361348531366853034790770231e+18L, 2.38124191682989536626992792404294190e+18L, 4.49583561730710839927340662784958898e+18L, 8.57144202490195270096830399067728169e+18L, 1.65044358418165696532477771893166700e+19L, 3.21010035242131785085169993033188229e+19L, 6.30778012444270309076492866733769742e+19L, 1.25240403115766127899628450500249765e+20L, 2.51300529564998539443832117224536420e+20L, 5.09677625569083843571268035202853929e+20L, 1.04501920001667304566512216455267827e+21L, 2.16647647926087846601520265828431353e+21L, 4.54213814567839546278770815494416868e+21L, 9.63208232444913712819259248595549405e+21L, 2.06638653668825452816630915727527426e+22L, 4.48552978555442825059406438230470388e+22L, 9.85387957361097750825498509227133701e+22L, 2.19115887446437440814640517501285189e+23L, 4.93283596439097166796547625560314132e+23L, 1.12450152997177436346173556893175508e+24L, 2.59626913615675600812300017445220112e+24L, 6.07229293831362550112108555687653017e+24L, 1.43898906630800383562329122001513450e+25L, 3.45584195640657046905140678735606870e+25L, 8.41265519171357648977229820858109463e+25L, 2.07628906165081651016090959669418757e+26L, 5.19651502464022032237151119613068945e+26L, 1.31917319408964404296057699402007921e+27L, 3.39745589598038079361346075350889747e+27L, 8.87905745443850359109225209251728000e+27L, 2.35527236149206412607849676379867126e+28L, 6.34276200772262482389475687836384423e+28L, 1.73453109399085970484897533524593455e+29L, 4.81789317060683087119323058524624972e+29L, 1.35959734649014823198654051259347560e+30L, 3.89896968990650039174705544740914822e+30L, 1.13654298652998993600898528562905634e+31L, 3.36845004399178001650511659074612092e+31L, 1.01530408470981725989945294876828360e+32L, 3.11314437622191823730222798219255685e+32L, 9.71307273973014040273869048577801862e+32L, 3.08451764358172594571945077912559223e+33L, 9.97268213982049728423469082288644341e+33L, 3.28362505228849158612675319471610094e+34L, 1.10137878539082753552686700652535380e+35L, 3.76433336759271429732220889611944227e+35L, 1.31140346593824292621577115225698644e+36L, 4.65813571068281367213354863266427946e+36L, 1.68751734747051139203189162215633629e+37L, 6.23705368501832349017363870039959902e+37L, 2.35257131442774486893301429598817553e+38L, 9.05893824021969993626817980294413695e+38L, 3.56224909761113607077591549609142868e+39L, 1.43095929157855820977839447284784020e+40L, 5.87397458498437504922632656680942932e+40L, 2.46482854981128378684502286098690220e+41L, 1.05764920309085562822396787743332401e+42L, 4.64247563928107803530506772359734012e+42L, 2.08528711827242177927156523287132065e+43L, 9.58843998518663217709277358040461543e+43L, 4.51498201124609227956079072858258677e+44L, 2.17797404834197320411588567916752909e+45L, 1.07672097682290045825361349736107198e+46L, 5.45726743292908558875367244655615249e+46L, 2.83686927045578113375020568154351117e+47L, 1.51310320139201162564313806536303971e+48L, 8.28397466722561707458255405781541923e+48L, 4.65723949199597134403065145457979764e+49L, 2.68979637071283693718739500357715726e+50L, 1.59659784691197038762901224386099403e+51L, 9.74415453825658662874112107295166701e+51L, 6.11723839484331306452493250946377612e+52L, 3.95204965058524182677586041680204451e+53L, 2.62870159207425821306145211826683375e+54L, 1.80099019650267939321809025642439880e+55L, 1.27155446256306838318997486480890087e+56L, 9.25588010447776071059464920928086632e+56L, 6.94973792013391939342588109222317053e+57L, 5.38516720076996562080859176422021036e+58L, 4.30849366810297877444039522534393308e+59L, 3.56095155754217837059656555899190815e+60L, 3.04188852838464999204043663335571874e+61L, 2.68709444193083718922293037351168007e+62L, 2.45592053890000085507656649738841713e+63L, 2.32364825416864153745578539849845717e+64L, 2.27712974158489233058096874867974690e+65L, 2.31263355291322473374027008502422191e+66L, 2.43540759298129112939388619780518297e+67L, 2.66091038882246524570905302589811279e+68L, 3.01810594342353392025458974267831671e+69L, 3.55582348951019250289525994888733340e+70L, 4.35418887779384901315251041444022899e+71L, 5.54497579551181331524599144834616000e+72L, 7.34827648190988633565298908145357523e+73L, 1.01399802572242326074394064208241565e+75L, 1.45791146224460794340779409761344050e+76L, 2.18548887681950529537081926891986328e+77L, 3.41802215328662300798456454917771592e+78L, 5.58084392060183572830239216435019125e+79L, 9.51958650279973390758331753317257950e+80L, 1.69757357824719778562747265505252946e+82L, 3.16690667099018001388115076193097403e+83L, 6.18509910641867543038652223056425804e+84L, 1.26554113438693437654962757714903554e+86L, 2.71482896587775689871692274985919286e+87L, 6.11038680296449408162222719197467046e+88L, 1.44405408617108323852658132530082074e+90L, 3.58608372663838816495703910754396082e+91L, 9.36523186806323959966772742491929522e+92L, 2.57408011620512244881601880029319908e+94L, 7.45213468986230271920125476429174422e+95L, 2.27430990383616981910627355587444817e+97L, 7.32301113412116474943463116371095103e+98L, 2.48981642173793246167799170730006141e+100L, 8.94653338635928158843209476986997508e+101L, 3.40040137239116597862336436061445989e+103L, 1.36828818620892821730981225660157834e+105L, 5.83427748982959193060571787534606697e+106L, 2.63848693767238342424340754241860221e+108L, 1.26672888276713952132156406152434700e+110L, 6.46222517831418280306046165038174027e+111L, 3.50643232060757360375065377104810475e+113L, 2.02560893394326816509670349356333828e+115L, 1.24704167708478470702273287091045609e+117L, 8.18986518840527903795498196049278255e+118L, 5.74361089440609996487936977642920132e+120L, 4.30580893408448976261136511421423734e+122L, 3.45415696607949675499703108821962730e+124L, 2.96831660153035273688363706593385374e+126L, 2.73545624237218359223636851390580041e+128L, 2.70631717669007784745026117275242499e+130L, 2.87767991634206038473084413615742294e+132L, 3.29241287826810639047033778585737812e+134L, 4.05784096195372596931902665934287382e+136L, 5.39378304910573732382585500687737807e+138L, 7.74152390167223540621293648465491842e+140L, 1.20120996231066845642412985516875175e+143L, 2.01745607955680730064740044686640147e+145L, 3.67217662348306252636962893865111425e+147L, 7.25316379805857762968710347450256630e+149L, 1.55659153530257056999948366173645285e+152L, 3.63439983279039488510674235872123571e+154L, 9.24438760046827764031744167566698413e+156L, 2.56505460126015154661078513762260065e+159L, 7.77468767447849521051212939671796074e+161L, 2.57775340952739965069105894604883404e+164L, 9.36236559200171990439286451934391539e+166L, 3.73025928974609135812613567068392186e+169L, 1.63280699411172483017448754437467171e+172L, 7.86350685466830069681739337700194312e+174L, 4.17288659053103260909421860789088638e+177L, 2.44376468354452976432259429734905692e+180L, 1.58182604983516221850901239956537929e+183L, 1.13349408906485996833819126879692168e+186L, 9.00609317867158059779746161516574861e+188L, 7.94724581006520631483760616875503191e+191L, 7.80148734070770210787180909072341250e+194L, 8.53389980133319877537947288273508168e+197L, 1.04199907704816359699116619452657846e+201L, 1.42261945983107616739713958471131412e+204L, 2.17558254343347922345039318825837040e+207L, 3.73339221107050141050095672544726852e+210L, 7.20212971416878494124587287789857735e+213L, 1.56476087980246841023430707631510252e+217L, 3.83599289170088247519036274601375492e+220L, 1.06310518934360483187879118646180568e+224L, 3.33719954606082150504485397744546787e+227L, 1.18890644129926367056386614030943443e+231L, 4.81657405194041613555936914144916344e+234L, 2.22347874123114616622582251703709887e+238L, 1.17199258523361213934517364652872480e+242L, 7.06839671131322838482398929154588609e+245L, 4.88812662946732326430886472870070228e+249L, 3.88441192207630934518298772235960268e+253L, 3.55483921979499015020713995580889030e+257L, 3.75484510816250928148708038190395303e+261L, 4.58798720933643387311573482445886110e+265L, 6.49989966050568126079524541048529496e+269L, 1.07018103272413666142402906179157598e+274L, 2.05258799808849457042833394124187317e+278L, 4.59710306190259625117029822247574448e+282L, 1.20521640888055636836192268959955157e+287L, 3.70784262206985650361726040790594581e+291L, 1.34198324051735290325452259089861845e+296L, 5.72866922601176092550850127280325304e+300L, 2.89181208605318627652310091586335359e+305L, 1.73078309894901278503683645288680165e+310L, 1.23150483936231719457381379774516673e+315L, 1.04456022524616506171048138618772005e+320L, 1.05909848234544418123752752792015094e+325L, 1.28725694153849592436889057738754649e+330L, 1.88087499295689639308903342601320607e+335L, 3.31344446614783992260480183208324732e+340L, 7.05835740270200829603933852702222207e+345L, 1.82360609116987101874149506325271866e+351L, 5.73167527316999715111499624522524490e+356L, 2.19834460849656433024448179756162490e+362L, 1.03213196012299389398122351217909554e+368L, 5.95090459142945173642877532664315820e+373L, 4.22711326689560391486862730288730260e+379L, 3.71146073815998244096864189178283440e+385L, 4.04143285030597516778349567433491877e+391L, 5.47630493200706306950643242188138639e+397L, 9.26610183846830899934754118194991047e+403L, 1.96463867218278875638951764233831097e+410L, 5.23826401399289488725708314794013273e+416L, 1.76269979359229195206462702562496087e+423L, 7.51358974574222029659643352716721030e+429L, 4.07203690042780566335825621191079282e+436L, 2.81652392485993763998682010256080428e+443L, 2.49586432083962995754217338958145192e+450L, 2.84464997550187838898841424132533307e+457L, 4.18656911271834268911740204159815337e+464L, 7.98835944729121866190974499356597568e+471L, 1.98427885725374523364086923738598523e+479L, 6.44313780728812316513345459942694301e+486L, 2.74646447436726496994650106679472135e+494L, 1.54345331097536381511922890966406624e+502L, 1.14854061177091306735355343708426610e+510L, 1.13671799925771100929831048483235430e+518L, 1.50301408173820906903238314130252343e+526L, 2.66721742401349021977265127553699936e+534L, 6.38191727827371990119668697526910696e+542L, 2.06864189323929509313332139375745418e+551L, 9.12718925758572793769909253655546363e+559L, 5.50827087084343716443556503345322384e+568L, 4.56943096951975523591483538202467049e+577L, 5.23664812769936727945516120554813767e+586L, 8.33295831969513770916127078276468196e+595L, 1.85073603040006635508770638738735213e+605L, 5.76725912854578779706265298662279369e+614L, 2.53507221317613667093309510235117825e+624L, 1.58037348241924263546145926074674624e+634L, 1.40497098317887844492262106048698980e+644L, 1.79118532756424559114150403858023467e+654L, 3.29340233091271285034548969456076701e+664L, 8.78384225704905897945003526718634352e+674L, 3.41824790512159692619674889187554870e+685L, 1.95247619547378795632466874007982924e+696L, 1.64685615123975037569921507294781182e+707L, 2.06385512057306929298128483493412318e+718L, 3.86691162964076111860523245198584961e+729L, 1.09008736553561747232882422664193409e+741L, 4.65333391196364819411904308657257877e+752L, 3.02768585771015415481330091322447912e+764L, 3.02262040534180824988954474846992913e+776L, 4.66133722640174567906974646266839244e+788L, 1.11806119156969171229108916233644999e+801L, 4.20019655376202192049844032418033555e+813L, 2.48880615873773868126893696694455625e+826L, 2.34286193142054643224145247339492426e+839L, 3.52941162196327496812531706159176164e+852L, 8.57183106082165907783781027353105401e+865L, 3.38163627323872188047900717079347979e+879L, 2.18363447282104345585022834572887531e+893L, 2.32596275137292895223293068081362090e+907L, 4.11925247272574761366980289309686003e+921L, 1.22265489460258041690738897372130823e+936L, 6.13184165651799059701146847592463464e+950L, 5.23922303275545560334122760478493484e+965L, 7.69087233862553980667730597006685190e+980L, 1.95622275953749870274795206909257068e+996L, 8.69670052895401378378113763338699958e+1011L, 6.81715148318539616903616353647181598e+1027L, 9.50697711954141544724599553989093262e+1043L, 2.38019733682587370869498352841844428e+1060L, 1.07973324919847346937291516197684901e+1077L, 8.95814284819025403820872820042945790e+1093L, 1.37229192661307043018958002675397831e+1111L, 3.91918794622242371528673544888524419e+1128L, 2.10730218913863433412315532873510194e+1146L, 2.15459607934366008026324206138837528e+1164L, 4.23163839295623007237154131840451677e+1182L, 1.61294441956204958952970453918741185e+1201L, 1.20568335528354973250479511763057854e+1220L, 1.78630819666459637235669417819650103e+1239L, 5.30233997012953850434143324467683139e+1258L, 3.18800705045665419646272046839479382e+1278L, 3.92589619613994835597705628928304867e+1298L, 1.00145056975313260959947278741812233e+1319L, 5.35268808912615454171856125906228237e+1339L, 6.06491960606218539467705074145131193e+1360L, 1.47410187506507259371724909079906759e+1382L, 7.77855372825975976779550291054389078e+1403L, 9.02071339187528665617085297107535931e+1425L, 2.32776342394968427168699373890370933e+1448L, 1.35351409374730203846799381939288903e+1471L, 1.79625881886715571166142200348072039e+1494L, 5.51189494978629938318487744451579809e+1517L, 3.96270198063441303687686251379779681e+1541L, 6.76492837567767494547614386605795924e+1565L, 2.77991073110506719318274536923711255e+1590L, 2.78805951202715437087943440518839779e+1615L, 6.92116280606414755524296394791409952e+1640L, 4.31380309053366092943951122004431463e+1666L, 6.84923073262139995438889690748178280e+1692L, 2.81137418164430829179092468240459910e+1719L, 3.02821524237655652451836921974619657e+1746L, 8.69048903533522694231765189726868666e+1773L, 6.74828063313306417588175763238310325e+1801L, 1.44026065844141159256872926595644247e+1830L, 8.58426091495439408178371839859019039e+1858L, 1.45211919400936944187225846047638548e+1888L, 7.08718013380970011842483247147601395e+1917L, 1.01475962220405902523641440040104610e+1948L, 4.33542978691578087509838132034723750e+1978L, 5.62285772227295495777726116212032065e+2009L, 2.25285072921565445630031609130087435e+2041L, 2.83839050906274298341210206309759282e+2073L, 1.14501659579022194588844609345877849e+2106L, 1.50629562239998305958408533546634030e+2139L, 6.58342161306998815751663631350733541e+2172L, 9.74198999952210922892973281379349494e+2206L, 4.97552704772088889228035264268694867e+2241L, 8.94330619882842342247706838649878784e+2276L, 5.77072420156026800834371478648673792e+2312L, 1.36388225285320494361282201451878478e+2349L, 1.20508189950290985406298094670730466e+2386L, 4.06413362486490272506766749982212198e+2423L, 5.34308092015215251528601382597439463e+2461L, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -466,7 +470,7 @@ void sinh_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 4>&)
       { 1.57146131655078329437644376888801138e+00Q, 1.57679016631693834484126246342345329e+00Q, 1.58749564037038331646069625234555521e+00Q, 1.60367395634137020950291269057600307e+00Q, 1.62547112545749394267938666988196139e+00Q, 1.65308501191593930171844822364141731e+00Q, 1.68676814252591123625053019619255158e+00Q, 1.72683132353751620184313195813656600e+00Q, 1.77364813866723660171326886678529701e+00Q, 1.82766042147866144821632902536146347e+00Q, 1.88938481704401819562549601165115021e+00Q, 1.95942057285503709111658357403615203e+00Q, 2.03845872804790892275259742585569433e+00Q, 2.12729290408384722476899855222432786e+00Q, 2.22683194019907694104850876757126753e+00Q, 2.33811466455513029581902771513343722e+00Q, 2.46232714872299130380967769641847017e+00Q, 2.60082286092708516436098022317536381e+00Q, 2.75514621481455435937229822050004007e+00Q, 2.92706010842448355516791030533685920e+00Q, 3.11857816624092195149666191379786472e+00Q, 3.33200254033950662971711811118318338e+00Q, 3.56996830041074027550628111498923678e+00Q, 3.83549565399644726181552365400966870e+00Q, 4.13205149651293488468153425460318353e+00Q, 4.46362210669906788115667211361364802e+00Q, 4.83479919100800655701530131187647507e+00Q, 5.25088195776567960767293727240320892e+00Q, 5.71799849087533312421158643544587353e+00Q, 6.24325042159856810533215887376856930e+00Q, 6.83488580122654183866366620676303900e+00Q, 7.50250620278934080195915244309172491e+00Q, 8.25731548449354420110207897041998984e+00Q, 9.11241940586464263380079984086513597e+00Q, 1.00831874954399775830998395457182684e+01Q, 1.11876913499386520162594085796167645e+01Q, 1.24472370591410688131760615976965093e+01Q, 1.38870139060550758665255786705519681e+01Q, 1.55368871591590018952847646637454593e+01Q, 1.74323700068094283108112572669239084e+01Q, 1.96158189482399342378436216339159090e+01Q, 2.21379088635427380602824337731297019e+01Q, 2.50594593467713760968808829296439171e+01Q, 2.84537037774213756120135736520435304e+01Q, 3.24091184596952483433430577491101072e+01Q, 3.70329628948023016142035941015485370e+01Q, 4.24557264474626791146220920324192917e+01Q, 4.88367348033798558171280311705362727e+01Q, 5.63712464058697542020818458752120814e+01Q, 6.52994709275261034008086934786702551e+01Q, 7.59180775569412283714380617539343408e+01Q, 8.85949425239166382162609558265821220e+01Q, 1.03788129500578812415162165531670704e+02Q, 1.22070426396922674625756853326498468e+02Q, 1.44161209813120053456742433728771078e+02Q, 1.70968019124577351122499690038707734e+02Q, 2.03641059384357556999222931732850856e+02Q, 2.43645005870872364316059216110059642e+02Q, 2.92854081218207610543177302881458406e+02Q, 3.53678601915225339202500542949917795e+02Q, 4.29234308396729693907268968564609660e+02Q, 5.23570184048873302665650155276206906e+02Q, 6.41976689800302457508415746115180260e+02Q, 7.91405208366875928332161102969868782e+02Q, 9.81042208908193163688535235538889459e+02Q, 1.22309999499974039331272100414750813e+03Q, 1.53391255542711212726525490457861725e+03Q, 1.93546401360583033885511419988831009e+03Q, 2.45753454991288685207196097797062484e+03Q, 3.14073373162363551894782974867325472e+03Q, 4.04081818856465189750723035050638141e+03Q, 5.23488159971222568136194576211612571e+03Q, 6.83029445760732922582000345557383347e+03Q, 8.97771322864988714349790288910627671e+03Q, 1.18901592096732683947870697270695144e+04Q, 1.58712238704434696215746702894136306e+04Q, 2.13571110644578933143540830593360855e+04Q, 2.89798370518968143718297906801146350e+04Q, 3.96630672679554794954087134590560762e+04Q, 5.47687519375000078688553248953764732e+04Q, 7.63235653938805568016142182690471993e+04Q, 1.07371914975497695062170132456450593e+05Q, 1.52531667455557415180420019888676134e+05Q, 2.18877843474421658617449971461581691e+05Q, 3.17362449601929560775572985879585343e+05Q, 4.65120152586932846156175983364596723e+05Q, 6.89253765628058057206329188782990860e+05Q, 1.03311988512001998186230013733752720e+06Q, 1.56688798104325249948154338241641806e+06Q, 2.40549202702653179507492073842261453e+06Q, 3.73952896481591033994026114668796352e+06Q, 5.88912115489558003244667233279563785e+06Q, 9.39904635192234203007457377008255614e+06Q, 1.52090327612965351790614542733698474e+07Q, 2.49628718729357616773929842263043964e+07Q, 4.15775925996307484022703929049831425e+07Q, 7.03070536695026731176158877103497776e+07Q, 1.20759855845249336607363637052870598e+08Q, 2.10788250946484683324104572583041111e+08Q, 3.74104719902345786397351281755078701e+08Q, 6.75449459498741557237788387723071522e+08Q, 1.24131674041588053743260021864117384e+09Q, 2.32331003264955286246594304305695965e+09Q, 4.43117601902662575879840759020751450e+09Q, 8.61744648740090012951326726568665021e+09Q, 1.70983690660403151330619158427281665e+10Q, 3.46357452188017133850611855017361923e+10Q, 7.16760712379927072634183907084755700e+10Q, 1.51634762091005407908273857408800162e+11Q, 3.28172932323895052570169126695951209e+11Q, 7.27110260029828078950026409435831711e+11Q, 1.65049955237878037840731169761272102e+12Q, 3.84133814950880391685509371196326109e+12Q, 9.17374426778517657484962791255187134e+12Q, 2.24990194635751997880832549111511175e+13Q, 5.67153508990061173097292032404781538e+13Q, 1.47074225030769701852963232235912597e+14Q, 3.92701251846431177545392497147427712e+14Q, 1.08063997739121282020832802862957248e+15Q, 3.06767146672047518894275739534732971e+15Q, 8.99238678919832842771174638355746631e+15Q, 2.72472253652459211109041460799535823e+16Q, 8.54294612226338925817358060817490416e+16Q, 2.77461371872557475533476908014408616e+17Q, 9.34529947938202912146296976663431863e+17Q, 3.26799612298773188163350554315742192e+18Q, 1.18791443345546831451732293519928714e+19Q, 4.49405340841856421397062311314705655e+19Q, 1.77170665219548674305185389795833488e+20Q, 7.28810255288593152697603764235601397e+20Q, 3.13251243081662534865188632436805529e+21Q, 1.40874376795107311038838007000777184e+22Q, 6.63829426823606041441317767891166205e+22Q, 3.28254360840356501289107248021554584e+23Q, 1.70592009803839406409667145645666005e+24Q, 9.33225938514852428454935743602712728e+24Q, 5.38272717587488831207327363463407970e+25Q, 3.27895423512209324910006662705296242e+26Q, 2.11319169795745809927716305122705952e+27Q, 1.44341104149964304009687846325713305e+28Q, 1.04686439465498242316197235200069352e+29Q, 8.07731922695890570023291958025986094e+29Q, 6.64314696343261627707440459400107155e+30Q, 5.83567012135998626006817430636714368e+31Q, 5.48689029679023079776199817150941362e+32Q, 5.53372696850826161418229677716330718e+33Q, 5.99973499641835283449509393028972981e+34Q, 7.00917611946612256941556198729562373e+35Q, 8.84406196642459749869759626748371565e+36Q, 1.20822686086960596115573575744502341e+38Q, 1.79164851431106333799499432947126299e+39Q, 2.89131391671320576216903362266762013e+40Q, 5.09145786021152729801159516043566174e+41Q, 9.81063058840249655325327952160218101e+42Q, 2.07444123914737886022245738089968362e+44Q, 4.82765011693770054022189143000576390e+45Q, 1.24028793911154902904261886940649724e+47Q, 3.52878285864478461616951002487254771e+48Q, 1.11544949047169665881036414807872651e+50Q, 3.93051064332819631369914292573124112e+51Q, 1.54924371295785233686867649142553059e+53Q, 6.85499823804130100151231679166543611e+54Q, 3.41747996158320770357877327002949632e+56Q, 1.92690549864107998957222500013304086e+58Q, 1.23358096300491944958557136475962190e+60Q, 9.00281990289807691528078151573158069e+61Q, 7.52141514125344164522463463202808470e+63Q, 7.22427755490057899279344696654950663e+65Q, 8.01283283053507860974456727997488253e+67Q, 1.03099962028638036919997632019550562e+70Q, 1.54617495707674867923983623892142209e+72Q, 2.71580377261324869371341160824868908e+74Q, 5.61508992057174643750226165228505259e+76Q, 1.37366785934534333692942668275259398e+79Q, 3.99754102076962512613158938364235073e+81Q, 1.39150058933980008745266389466237314e+84Q, 5.82669384491202289249159160687839973e+86Q, 2.95227482092954909582266634062763990e+89Q, 1.82102306147846628152669685943631657e+92Q, 1.37597302213794152564743989887492097e+95Q, 1.28185236754341294523601004808033157e+98Q, 1.48213012720199050337233086306566580e+101Q, 2.14157427379243531419232668034147566e+104Q, 3.89449554094711237984570195229015661e+107Q, 8.97864636258010296104790318951217808e+110Q, 2.64413158980724405044777067425347595e+114Q, 1.00240353984191383430257305957041439e+118Q, 4.93141280490390525871801097705197944e+121Q, 3.17440111243586504420672164931106998e+125Q, 2.69662400176189239027511019786185589e+129Q, 3.04979932232044716644635827452454425e+133Q, 4.63404152681868778475392087605038845e+137Q, 9.54898313480310651224157422560754643e+141Q, 2.69440486619208982853089677098686964e+146Q, 1.05150272003639532507210605903884076e+151Q, 5.73417064062624495509840837865743050e+155Q, 4.41627650777870044428827641421915327e+160Q, 4.85653500442164862297918118887566388e+165Q, 7.71243776020172406235461422008761914e+170Q, 1.78944284768135145352387398006192815e+176Q, 6.13948504948193852500464630902178966e+181Q, 3.15374719244414866832063986813364807e+187Q, 2.45678229633130089072342575625791640e+193Q, 2.94097956743157560377748279040964662e+199Q, 5.48435772238022826264635788020315114e+205Q, 1.61576755939787162649511106856450099e+212Q, 7.63055674811964328822328719215905762e+218Q, 5.86357963426750903008317058039636736e+225Q, 7.44578009523250679265610908767109796e+232Q, 1.58753358925950887380498944645468602e+240Q, 5.77757179750005470017336807397418313e+247Q, 3.65046885264085030960970127282511879e+255Q, 4.07509702021276189043935129812053895e+263Q, 8.18389073292535025618266801702554839e+271Q, 3.01238089652162618211263051563523370e+280Q, 2.07176624104483264053704912869659325e+289Q, 2.71562735784398218302697011744202385e+298Q, 6.92451661016398143622710849660362520e+307Q, 3.50810155650162047040906671177815417e+317Q, 3.60896781300246599975888048597671985e+327Q, 7.71058277826701049982730585006218034e+337Q, 3.50154660288711246272389096490054302e+348Q, 3.46175331564137723439223486579386975e+359Q, 7.63696466254316472130052183903629062e+370Q, 3.85655304044390258996784681505914035e+382Q, 4.57665692577932081843759029527968784e+394Q, 1.31143566628034307965133274338127595e+407Q, 9.33142940209453779649608781259673613e+419Q, 1.69703443400488874615229289912465401e+433Q, 8.12664327627950884948530966790210152e+446Q, 1.05671342182667061564323377987059929e+461Q, 3.85123350151333031094457679550412807e+475Q, 4.06487630836024540948583469098247829e+490Q, 1.28516517984503545753808504263016648e+506Q, 1.26025754690341684764700072541766676e+522Q, 3.97331612896914344554453503890576277e+538Q, 4.17965516524315248567041014799432863e+555Q, 1.52416658652941127494202186163265994e+573Q, 2.00432202283496263048589917253126663e+591Q, 9.89983817930114056039301724151237036e+609Q, 1.91539340453423886973992445388091844e+629Q, 1.51593315523153267229971976448703684e+649Q, 5.13233111267478387648166311677061530e+669Q, 7.78392571224632702458474933380523830e+690Q, 5.54632077048043201021342066119640603e+712Q, 1.95012604607548018918112113273623192e+735Q, 3.55940947870861006830654543397286882e+758Q, 3.55349341454925685547195460273265331e+782Q, 2.04795692045857243226580641802720017e+807Q, 7.20348918974342452885439546130773017e+832Q, 1.63778937282231874342883712446170710e+859Q, 2.55384218509638087014670377175798088e+886Q, 2.90332357089198897009653578594580665e+914Q, 2.56300421336271050326091753908665515e+943Q, 1.87504708602076913446948153935468528e+973Q, 1.21573089114719501597325465689193734e+1004Q, 7.48693407429699486755736805187051392e+1035Q, 4.70376397570597947605315058283235338e+1068Q, 3.24549375035327607806235059706162609e+1102Q, 2.65365798053210741189633750297123713e+1137Q, 2.78113361306514574568406809189880354e+1173Q, 4.05114001708803517429009145027606492e+1210Q, 8.91647476482514121118371429882160487e+1248Q, 3.23223851331898724884680382253593571e+1288Q, 2.10925909168894371224120829576314259e+1329Q, 2.71594389750881594498007515800169231e+1371Q, 7.58558239286242519535157411695442827e+1414Q, 5.06701669031717221741926320252846248e+1459Q, 8.95314256637167381172114473249653533e+1505Q, 4.64314397380853725563695225910483395e+1553Q, 7.86772811149376784892131781209226509e+1602Q, 4.86578559687970087801384706555207321e+1653Q, 1.23116054769360594876926981962811083e+1706Q, 1.43383897399728293235616506956599019e+1760Q, 8.67960762728500385489074199138374599e+1815Q, 3.09584788327503858182429306492345781e+1873Q, 7.40514657822678853879551103162851562e+1932Q, 1.35750288266752565171774149402837640e+1994Q, 2.18886955807028168114167639122307268e+2057Q, 3.57839966436010585653478204799948336e+2122Q, 6.86791017358151132323155526430183469e+2189Q, 1.80021943882415618419042799861559854e+2259Q, 7.53312429569410546159363413753399067e+2330Q, 5.91165553375547478649257686857639971e+2404Q, },
       { 1.57096255099783261137673508918980377e+00Q, 1.57229290236721196082451564636254803e+00Q, 1.57495658191266675503402671533627186e+00Q, 1.57895955363616398471678434379990522e+00Q, 1.58431078956361430514416599492388597e+00Q, 1.59102230111703510742216272394562613e+00Q, 1.59910918118616033722590556649394763e+00Q, 1.60858965710906746764504456185444654e+00Q, 1.61948515482641974319339137784305225e+00Q, 1.63182037453073931785527493516038124e+00Q, 1.64562337819112567903033806653906069e+00Q, 1.66092568939542410935608828998468834e+00Q, 1.67776240601646371733138779357535047e+00Q, 1.69617232627708297296989766202480515e+00Q, 1.71619808886073246730768842066355199e+00Q, 1.73788632779101456236627555096372654e+00Q, 1.76128784288515241044102589887617560e+00Q, 1.78645778667368642025315725404601102e+00Q, 1.81345586877233558659749539967614045e+00Q, 1.84234657879265254187280543490489739e+00Q, 1.87319942898662752121993510591579920e+00Q, 1.90608921793761261888076943857856180e+00Q, 1.94109631673677945144587926354356120e+00Q, 1.97830697922181656566949720098719647e+00Q, 2.01781367800384433737712026561151498e+00Q, 2.05971546817081389507270282494773392e+00Q, 2.10411838073232749275747224342524909e+00Q, 2.15113584806337555354918618566085438e+00Q, 2.20088916381459141771044083611555369e+00Q, 2.25350797998611420231160903572594743e+00Q, 2.30913084411305337537709048855358397e+00Q, 2.36790577978511333384857209921738492e+00Q, 2.42999091402365295350102767412517845e+00Q, 2.49555515536908558968587982458158759e+00Q, 2.56477892689313451429557802920827974e+00Q, 2.63785495874745168415081659796280588e+00Q, 2.71498914529626806741705564771250802e+00Q, 2.79640147236028053619149909690973720e+00Q, 2.88232702062657870038560203490158574e+00Q, 2.97301705186029380311201985278736098e+00Q, 3.06874018519362823755119514588303156e+00Q, 3.16978367147348738564623946178566521e+00Q, 3.27645477442732860056345607892739085e+00Q, 3.38908226826615609816107421136979984e+00Q, 3.50801806229286913554992299494422526e+00Q, 3.63363896413353027399263692498221540e+00Q, 3.76634859436988420367634452674074607e+00Q, 3.90657946663630928939225987850575005e+00Q, 4.05479524866754112035397645627643742e+00Q, 4.21149322136091780158052739625729631e+00Q, 4.37720695466646221916071477112304019e+00Q, 4.55250922105994638849140210916632132e+00Q, 4.73801516951078282566987752649050466e+00Q, 4.93438578525358788671420711795537458e+00Q, 5.14233166333819107447595069798421539e+00Q, 5.36261712689997622445803908396748884e+00Q, 5.59606472439710019418213140693069575e+00Q, 5.84356014374437330661446789126222075e+00Q, 6.10605758538173469317727364122669467e+00Q, 6.38458564090067143612732202429488542e+00Q, 6.68025372897382444864907987044889317e+00Q, 6.99425914605841270881961646990609410e+00Q, 7.32789479574890106033548644768353338e+00Q, 7.68255766782458876413667730681699443e+00Q, 8.05975814607113727007240055318338450e+00Q, 8.46113023296234288939356989479671723e+00Q, 8.88844278939567108027044653070693778e+00Q, 9.34361189902548515485066576358196470e+00Q, 9.82871447949462202212030994384949241e+00Q, 1.03460032772138062549383568058709409e+01Q, 1.08979233984912291622835480030167114e+01Q, 1.14871305480132578973614919602781370e+01Q, 1.21165111661978855517781913327317255e+01Q, 1.27892046801009632078942555615288463e+01Q, 1.35086281087128109623831457304510920e+01Q, 1.42785032930533442126932924888187804e+01Q, 1.51028870549318132669071327511660921e+01Q, 1.59862046261270319640752848374642080e+01Q, 1.69332867326908112807352382039426796e+01Q, 1.79494107678000050622926329104204826e+01Q, 1.90403465419082315888820165929975494e+01Q, 2.02124071618296433363312214170232623e+01Q, 2.14725056619224736964251610816575600e+01Q, 2.28282180919971350546248653847563966e+01Q, 2.42878538594168042463845071817020910e+01Q, 2.58605342287811778487151334440784950e+01Q, 2.75562800035467442565131080245429614e+01Q, 2.93861095522110956389210768876799587e+01Q, 3.13621484999095132865600012683857137e+01Q, 3.34977525874991258153646142408367963e+01Q, 3.58076454079962546803810835720597110e+01Q, 3.83080729687253016658377309622401176e+01Q, 4.10169773015547344709659456503154667e+01Q, 4.39541916587611362308342994483809472e+01Q, 4.71416601949419692729062784327679986e+01Q, 5.06036854536665922553724504470269960e+01Q, 5.43672074601944525232284101611170030e+01Q, 5.84621187791213843904071404608607478e+01Q, 6.29216205405812878410372213510070276e+01Q, 6.77826251851241666263837617897404532e+01Q, 7.30862125426522301461255132629846162e+01Q, 7.88781468648814729209715096907821639e+01Q, 8.52094635973465833426799692679733796e+01Q, 9.21371360338777471668559829773781201e+01Q, 9.97248335767075464896305315099053068e+01Q, 1.08043785167904642576949987865910954e+02Q, 1.17173763608862169247776700625586421e+02Q, 1.27204208998868737227575356110541727e+02Q, 1.38235512466410237338282474486031692e+02Q, 1.50380484815148331050381123359927804e+02Q, 1.63766038752610274212021042234298836e+02Q, 1.78535118123338340289613569013808793e+02Q, 1.94848913160728060357302969254459805e+02Q, 2.12889407359835266977366307026062112e+02Q, 2.32862309344799079018746113493039633e+02Q, 2.55000432284328199435640048881527463e+02Q, 2.79567594267244578195192766207761694e+02Q, 3.06863125912428093434496643114651412e+02Q, 3.37227086745120087399301385427960651e+02Q, 3.71046309996557625549265358225650347e+02Q, 4.08761417046617491055856040237506316e+02Q, 4.50874968419459367009632339064163929e+02Q, 4.97960948895977349122916983180817637e+02Q, 5.50675820938578587679472462796822793e+02Q, 6.09771424466317909206822143572649707e+02Q, 6.76110053572647368547479902312230309e+02Q, 7.50682103874142244645724064576848341e+02Q, 8.34626760051808119187547981730818179e+02Q, 9.29256284531554199823656475151338963e+02Q, 1.03608457849823472804207172846963877e+03Q, 1.15686081966189765730466332807313547e+03Q, 1.29360914245380859999201252074469995e+03Q, 1.44867552185420514387789438088656434e+03Q, 1.62478325953219761549580736728832563e+03Q, 1.82509875991531856022535679631713756e+03Q, 2.05330963597261755441688599655848892e+03Q, 2.31371761449477720025881552764731872e+03Q, 2.61134923664018699944734187657483567e+03Q, 2.95208799409362429898911389656789101e+03Q, 3.34283233256054817982471990245472659e+03Q, 3.79168492775659509883214798303432158e+03Q, 4.30817983871631895490690508451026040e+03Q, 4.90355562457020167332670064217006554e+03Q, 5.59108434363481145162671079876733528e+03Q, 6.38646862557124634146730890858054275e+03Q, 7.30832182941297944038809179971510199e+03Q, 8.37874981279970356111509048453001571e+03Q, 9.62405721874963805881171453111047092e+03Q, 1.10756066619114600841076275282388063e+04Q, 1.27708660544590438787794590107117849e+04Q, 1.47546879201948945213025955616435132e+04Q, 1.70808753741706634268551294101897318e+04Q, 1.98141030969548505096681178137364270e+04Q, 2.30322788820475490754732581365999861e+04Q, 2.68294531792863253502182123460963590e+04Q, 3.13194117839842820030641964449539820e+04Q, 3.66401220970699799668192565829190288e+04Q, 4.29592483666869017028607105165763804e+04Q, 5.04810088263984357248209974578040223e+04Q, 5.94547213318005529011388227962133751e+04Q, 7.01854787517268957919092596317475529e+04Q, 8.30475172617569400265716546608431303e+04Q, 9.85009980505357544638949542794405193e+04Q, 1.17113126626176606026864191754698095e+05Q, 1.39584798216058984483938678946454092e+05Q, 1.66784301639307755633312351999980104e+05Q, 1.99790062652052468605951710457597772e+05Q, 2.39944994603299218686253514351518948e+05Q, 2.88925793983801323167992289814829493e+05Q, 3.48831530919430454806103930858415528e+05Q, 4.22297220149677844682618484564386312e+05Q, 5.12639824636925361908056913471196846e+05Q, 6.24046487622198979196137566922551170e+05Q, 7.61817907323361594136262168936978923e+05Q, 9.32683930022411925704630601110030182e+05Q, 1.14521400777429753902355978052778602e+06Q, 1.41035264627423311876298925540665884e+06Q, 1.74212004187586338510201667214170577e+06Q, 2.15853171693428701405141183541166264e+06Q, 2.68280941012642673073659887232388938e+06Q, 3.34498056359541886091597912499527306e+06Q, 4.18399797233770604788689812330719069e+06Q, 5.25055800816550175243256559083639418e+06Q, 6.61086017414168098803951872291131863e+06Q, 8.35163942396755869310534556270941378e+06Q, 1.05869253239392990034806970327887878e+07Q, 1.34671523510623940861241599892229316e+07Q, 1.71914827102426302145958883698307763e+07Q, 2.20245344902770169422620623417295079e+07Q, 2.83191730172433779681268016861978467e+07Q, 3.65476782026834493187990343694010282e+07Q, 4.73445265723062610640363034466641760e+07Q, 6.15653406350951387288804933390908042e+07Q, 8.03684302689786924828741611740519293e+07Q, 1.05328028435969028854761469747289545e+08Q, 1.38592168908412628618546923035162247e+08Q, 1.83103698592568352374304770508191971e+08Q, 2.42910945745864082034287213456845086e+08Q, 3.23606239375966746282831194186614169e+08Q, 4.32947521859998666323053129499091577e+08Q, 5.81743296796292947920442886775592966e+08Q, 7.85117978938819178602650773642870262e+08Q, 1.06432919762707530726575966438229782e+09Q, 1.44938958291294548467516226794019366e+09Q, 1.98286646937799184909776706883985509e+09Q, 2.72541431469809432350206616813747393e+09Q, 3.76386796411162144400474070771015333e+09Q, 5.22313881495099093715899688078276720e+09Q, 7.28378581064439770444275729738468286e+09Q, 1.02080964238115874250636198090464363e+10Q, 1.43789931847051052135186583023967432e+10Q, 2.03583681254363357780032810961889254e+10Q, 2.89749982708002744366825785538936402e+10Q, 4.14577375164549487752492409798515416e+10Q, 5.96383768387242628650336526594122215e+10Q, 8.62622848391553079951805623395652598e+10Q, 1.25466704538982518000690409655705216e+11Q, 1.83521298226491318558080545133554232e+11Q, 2.69981220740015160361114268684563366e+11Q, 3.99492845215192295441294253418780644e+11Q, 5.94638055870143455023933020703444642e+11Q, 8.90440996742409110650533033931653292e+11Q, 1.34155194167777583831947241717631506e+12Q, 2.03376855033215189170105222958089604e+12Q, 3.10262795987575321360135087196684567e+12Q, 4.76359832170586206290082815387968037e+12Q, 7.36142036056081358397678626842794083e+12Q, 1.14512696145655742338758840735549183e+13Q, 1.79331418699627392634462052642542749e+13Q, 2.82758550128579223200239017529280909e+13Q, 4.48929705367844466861372765075631687e+13Q, 7.17780287265849957064212371548037347e+13Q, 1.15585509854582062520354852997620279e+14Q, 1.87483388636788309288478433629583664e+14Q, 3.06351035640217445409310567498133847e+14Q, 5.04340065300597024230361727189343426e+14Q, 8.36616339689242989007881200440488764e+14Q, 1.39855635164094728875364679627485304e+15Q, 2.35633574951616468243164849507855064e+15Q, 4.00176516738263745645278590345795707e+15Q, 6.85137512840494144543571512545601884e+15Q, 1.18269011176154399046326619510431010e+16Q, 2.05867352701380644281110910622942185e+16Q, 3.61396878431490463311666873476678412e+16Q, 6.39911218439421355095519025524482256e+16Q, 1.14301618562837692261569180960886276e+17Q, 2.05988138391566644299797673070467922e+17Q, 3.74584678835368091393630059068193045e+17Q, 6.87444303468314906803024757565005462e+17Q, 1.27340764361348531366853034790770231e+18Q, 2.38124191682989536626992792404294190e+18Q, 4.49583561730710839927340662784958898e+18Q, 8.57144202490195270096830399067728169e+18Q, 1.65044358418165696532477771893166700e+19Q, 3.21010035242131785085169993033188229e+19Q, 6.30778012444270309076492866733769742e+19Q, 1.25240403115766127899628450500249765e+20Q, 2.51300529564998539443832117224536420e+20Q, 5.09677625569083843571268035202853929e+20Q, 1.04501920001667304566512216455267827e+21Q, 2.16647647926087846601520265828431353e+21Q, 4.54213814567839546278770815494416868e+21Q, 9.63208232444913712819259248595549405e+21Q, 2.06638653668825452816630915727527426e+22Q, 4.48552978555442825059406438230470388e+22Q, 9.85387957361097750825498509227133701e+22Q, 2.19115887446437440814640517501285189e+23Q, 4.93283596439097166796547625560314132e+23Q, 1.12450152997177436346173556893175508e+24Q, 2.59626913615675600812300017445220112e+24Q, 6.07229293831362550112108555687653017e+24Q, 1.43898906630800383562329122001513450e+25Q, 3.45584195640657046905140678735606870e+25Q, 8.41265519171357648977229820858109463e+25Q, 2.07628906165081651016090959669418757e+26Q, 5.19651502464022032237151119613068945e+26Q, 1.31917319408964404296057699402007921e+27Q, 3.39745589598038079361346075350889747e+27Q, 8.87905745443850359109225209251728000e+27Q, 2.35527236149206412607849676379867126e+28Q, 6.34276200772262482389475687836384423e+28Q, 1.73453109399085970484897533524593455e+29Q, 4.81789317060683087119323058524624972e+29Q, 1.35959734649014823198654051259347560e+30Q, 3.89896968990650039174705544740914822e+30Q, 1.13654298652998993600898528562905634e+31Q, 3.36845004399178001650511659074612092e+31Q, 1.01530408470981725989945294876828360e+32Q, 3.11314437622191823730222798219255685e+32Q, 9.71307273973014040273869048577801862e+32Q, 3.08451764358172594571945077912559223e+33Q, 9.97268213982049728423469082288644341e+33Q, 3.28362505228849158612675319471610094e+34Q, 1.10137878539082753552686700652535380e+35Q, 3.76433336759271429732220889611944227e+35Q, 1.31140346593824292621577115225698644e+36Q, 4.65813571068281367213354863266427946e+36Q, 1.68751734747051139203189162215633629e+37Q, 6.23705368501832349017363870039959902e+37Q, 2.35257131442774486893301429598817553e+38Q, 9.05893824021969993626817980294413695e+38Q, 3.56224909761113607077591549609142868e+39Q, 1.43095929157855820977839447284784020e+40Q, 5.87397458498437504922632656680942932e+40Q, 2.46482854981128378684502286098690220e+41Q, 1.05764920309085562822396787743332401e+42Q, 4.64247563928107803530506772359734012e+42Q, 2.08528711827242177927156523287132065e+43Q, 9.58843998518663217709277358040461543e+43Q, 4.51498201124609227956079072858258677e+44Q, 2.17797404834197320411588567916752909e+45Q, 1.07672097682290045825361349736107198e+46Q, 5.45726743292908558875367244655615249e+46Q, 2.83686927045578113375020568154351117e+47Q, 1.51310320139201162564313806536303971e+48Q, 8.28397466722561707458255405781541923e+48Q, 4.65723949199597134403065145457979764e+49Q, 2.68979637071283693718739500357715726e+50Q, 1.59659784691197038762901224386099403e+51Q, 9.74415453825658662874112107295166701e+51Q, 6.11723839484331306452493250946377612e+52Q, 3.95204965058524182677586041680204451e+53Q, 2.62870159207425821306145211826683375e+54Q, 1.80099019650267939321809025642439880e+55Q, 1.27155446256306838318997486480890087e+56Q, 9.25588010447776071059464920928086632e+56Q, 6.94973792013391939342588109222317053e+57Q, 5.38516720076996562080859176422021036e+58Q, 4.30849366810297877444039522534393308e+59Q, 3.56095155754217837059656555899190815e+60Q, 3.04188852838464999204043663335571874e+61Q, 2.68709444193083718922293037351168007e+62Q, 2.45592053890000085507656649738841713e+63Q, 2.32364825416864153745578539849845717e+64Q, 2.27712974158489233058096874867974690e+65Q, 2.31263355291322473374027008502422191e+66Q, 2.43540759298129112939388619780518297e+67Q, 2.66091038882246524570905302589811279e+68Q, 3.01810594342353392025458974267831671e+69Q, 3.55582348951019250289525994888733340e+70Q, 4.35418887779384901315251041444022899e+71Q, 5.54497579551181331524599144834616000e+72Q, 7.34827648190988633565298908145357523e+73Q, 1.01399802572242326074394064208241565e+75Q, 1.45791146224460794340779409761344050e+76Q, 2.18548887681950529537081926891986328e+77Q, 3.41802215328662300798456454917771592e+78Q, 5.58084392060183572830239216435019125e+79Q, 9.51958650279973390758331753317257950e+80Q, 1.69757357824719778562747265505252946e+82Q, 3.16690667099018001388115076193097403e+83Q, 6.18509910641867543038652223056425804e+84Q, 1.26554113438693437654962757714903554e+86Q, 2.71482896587775689871692274985919286e+87Q, 6.11038680296449408162222719197467046e+88Q, 1.44405408617108323852658132530082074e+90Q, 3.58608372663838816495703910754396082e+91Q, 9.36523186806323959966772742491929522e+92Q, 2.57408011620512244881601880029319908e+94Q, 7.45213468986230271920125476429174422e+95Q, 2.27430990383616981910627355587444817e+97Q, 7.32301113412116474943463116371095103e+98Q, 2.48981642173793246167799170730006141e+100Q, 8.94653338635928158843209476986997508e+101Q, 3.40040137239116597862336436061445989e+103Q, 1.36828818620892821730981225660157834e+105Q, 5.83427748982959193060571787534606697e+106Q, 2.63848693767238342424340754241860221e+108Q, 1.26672888276713952132156406152434700e+110Q, 6.46222517831418280306046165038174027e+111Q, 3.50643232060757360375065377104810475e+113Q, 2.02560893394326816509670349356333828e+115Q, 1.24704167708478470702273287091045609e+117Q, 8.18986518840527903795498196049278255e+118Q, 5.74361089440609996487936977642920132e+120Q, 4.30580893408448976261136511421423734e+122Q, 3.45415696607949675499703108821962730e+124Q, 2.96831660153035273688363706593385374e+126Q, 2.73545624237218359223636851390580041e+128Q, 2.70631717669007784745026117275242499e+130Q, 2.87767991634206038473084413615742294e+132Q, 3.29241287826810639047033778585737812e+134Q, 4.05784096195372596931902665934287382e+136Q, 5.39378304910573732382585500687737807e+138Q, 7.74152390167223540621293648465491842e+140Q, 1.20120996231066845642412985516875175e+143Q, 2.01745607955680730064740044686640147e+145Q, 3.67217662348306252636962893865111425e+147Q, 7.25316379805857762968710347450256630e+149Q, 1.55659153530257056999948366173645285e+152Q, 3.63439983279039488510674235872123571e+154Q, 9.24438760046827764031744167566698413e+156Q, 2.56505460126015154661078513762260065e+159Q, 7.77468767447849521051212939671796074e+161Q, 2.57775340952739965069105894604883404e+164Q, 9.36236559200171990439286451934391539e+166Q, 3.73025928974609135812613567068392186e+169Q, 1.63280699411172483017448754437467171e+172Q, 7.86350685466830069681739337700194312e+174Q, 4.17288659053103260909421860789088638e+177Q, 2.44376468354452976432259429734905692e+180Q, 1.58182604983516221850901239956537929e+183Q, 1.13349408906485996833819126879692168e+186Q, 9.00609317867158059779746161516574861e+188Q, 7.94724581006520631483760616875503191e+191Q, 7.80148734070770210787180909072341250e+194Q, 8.53389980133319877537947288273508168e+197Q, 1.04199907704816359699116619452657846e+201Q, 1.42261945983107616739713958471131412e+204Q, 2.17558254343347922345039318825837040e+207Q, 3.73339221107050141050095672544726852e+210Q, 7.20212971416878494124587287789857735e+213Q, 1.56476087980246841023430707631510252e+217Q, 3.83599289170088247519036274601375492e+220Q, 1.06310518934360483187879118646180568e+224Q, 3.33719954606082150504485397744546787e+227Q, 1.18890644129926367056386614030943443e+231Q, 4.81657405194041613555936914144916344e+234Q, 2.22347874123114616622582251703709887e+238Q, 1.17199258523361213934517364652872480e+242Q, 7.06839671131322838482398929154588609e+245Q, 4.88812662946732326430886472870070228e+249Q, 3.88441192207630934518298772235960268e+253Q, 3.55483921979499015020713995580889030e+257Q, 3.75484510816250928148708038190395303e+261Q, 4.58798720933643387311573482445886110e+265Q, 6.49989966050568126079524541048529496e+269Q, 1.07018103272413666142402906179157598e+274Q, 2.05258799808849457042833394124187317e+278Q, 4.59710306190259625117029822247574448e+282Q, 1.20521640888055636836192268959955157e+287Q, 3.70784262206985650361726040790594581e+291Q, 1.34198324051735290325452259089861845e+296Q, 5.72866922601176092550850127280325304e+300Q, 2.89181208605318627652310091586335359e+305Q, 1.73078309894901278503683645288680165e+310Q, 1.23150483936231719457381379774516673e+315Q, 1.04456022524616506171048138618772005e+320Q, 1.05909848234544418123752752792015094e+325Q, 1.28725694153849592436889057738754649e+330Q, 1.88087499295689639308903342601320607e+335Q, 3.31344446614783992260480183208324732e+340Q, 7.05835740270200829603933852702222207e+345Q, 1.82360609116987101874149506325271866e+351Q, 5.73167527316999715111499624522524490e+356Q, 2.19834460849656433024448179756162490e+362Q, 1.03213196012299389398122351217909554e+368Q, 5.95090459142945173642877532664315820e+373Q, 4.22711326689560391486862730288730260e+379Q, 3.71146073815998244096864189178283440e+385Q, 4.04143285030597516778349567433491877e+391Q, 5.47630493200706306950643242188138639e+397Q, 9.26610183846830899934754118194991047e+403Q, 1.96463867218278875638951764233831097e+410Q, 5.23826401399289488725708314794013273e+416Q, 1.76269979359229195206462702562496087e+423Q, 7.51358974574222029659643352716721030e+429Q, 4.07203690042780566335825621191079282e+436Q, 2.81652392485993763998682010256080428e+443Q, 2.49586432083962995754217338958145192e+450Q, 2.84464997550187838898841424132533307e+457Q, 4.18656911271834268911740204159815337e+464Q, 7.98835944729121866190974499356597568e+471Q, 1.98427885725374523364086923738598523e+479Q, 6.44313780728812316513345459942694301e+486Q, 2.74646447436726496994650106679472135e+494Q, 1.54345331097536381511922890966406624e+502Q, 1.14854061177091306735355343708426610e+510Q, 1.13671799925771100929831048483235430e+518Q, 1.50301408173820906903238314130252343e+526Q, 2.66721742401349021977265127553699936e+534Q, 6.38191727827371990119668697526910696e+542Q, 2.06864189323929509313332139375745418e+551Q, 9.12718925758572793769909253655546363e+559Q, 5.50827087084343716443556503345322384e+568Q, 4.56943096951975523591483538202467049e+577Q, 5.23664812769936727945516120554813767e+586Q, 8.33295831969513770916127078276468196e+595Q, 1.85073603040006635508770638738735213e+605Q, 5.76725912854578779706265298662279369e+614Q, 2.53507221317613667093309510235117825e+624Q, 1.58037348241924263546145926074674624e+634Q, 1.40497098317887844492262106048698980e+644Q, 1.79118532756424559114150403858023467e+654Q, 3.29340233091271285034548969456076701e+664Q, 8.78384225704905897945003526718634352e+674Q, 3.41824790512159692619674889187554870e+685Q, 1.95247619547378795632466874007982924e+696Q, 1.64685615123975037569921507294781182e+707Q, 2.06385512057306929298128483493412318e+718Q, 3.86691162964076111860523245198584961e+729Q, 1.09008736553561747232882422664193409e+741Q, 4.65333391196364819411904308657257877e+752Q, 3.02768585771015415481330091322447912e+764Q, 3.02262040534180824988954474846992913e+776Q, 4.66133722640174567906974646266839244e+788Q, 1.11806119156969171229108916233644999e+801Q, 4.20019655376202192049844032418033555e+813Q, 2.48880615873773868126893696694455625e+826Q, 2.34286193142054643224145247339492426e+839Q, 3.52941162196327496812531706159176164e+852Q, 8.57183106082165907783781027353105401e+865Q, 3.38163627323872188047900717079347979e+879Q, 2.18363447282104345585022834572887531e+893Q, 2.32596275137292895223293068081362090e+907Q, 4.11925247272574761366980289309686003e+921Q, 1.22265489460258041690738897372130823e+936Q, 6.13184165651799059701146847592463464e+950Q, 5.23922303275545560334122760478493484e+965Q, 7.69087233862553980667730597006685190e+980Q, 1.95622275953749870274795206909257068e+996Q, 8.69670052895401378378113763338699958e+1011Q, 6.81715148318539616903616353647181598e+1027Q, 9.50697711954141544724599553989093262e+1043Q, 2.38019733682587370869498352841844428e+1060Q, 1.07973324919847346937291516197684901e+1077Q, 8.95814284819025403820872820042945790e+1093Q, 1.37229192661307043018958002675397831e+1111Q, 3.91918794622242371528673544888524419e+1128Q, 2.10730218913863433412315532873510194e+1146Q, 2.15459607934366008026324206138837528e+1164Q, 4.23163839295623007237154131840451677e+1182Q, 1.61294441956204958952970453918741185e+1201Q, 1.20568335528354973250479511763057854e+1220Q, 1.78630819666459637235669417819650103e+1239Q, 5.30233997012953850434143324467683139e+1258Q, 3.18800705045665419646272046839479382e+1278Q, 3.92589619613994835597705628928304867e+1298Q, 1.00145056975313260959947278741812233e+1319Q, 5.35268808912615454171856125906228237e+1339Q, 6.06491960606218539467705074145131193e+1360Q, 1.47410187506507259371724909079906759e+1382Q, 7.77855372825975976779550291054389078e+1403Q, 9.02071339187528665617085297107535931e+1425Q, 2.32776342394968427168699373890370933e+1448Q, 1.35351409374730203846799381939288903e+1471Q, 1.79625881886715571166142200348072039e+1494Q, 5.51189494978629938318487744451579809e+1517Q, 3.96270198063441303687686251379779681e+1541Q, 6.76492837567767494547614386605795924e+1565Q, 2.77991073110506719318274536923711255e+1590Q, 2.78805951202715437087943440518839779e+1615Q, 6.92116280606414755524296394791409952e+1640Q, 4.31380309053366092943951122004431463e+1666Q, 6.84923073262139995438889690748178280e+1692Q, 2.81137418164430829179092468240459910e+1719Q, 3.02821524237655652451836921974619657e+1746Q, 8.69048903533522694231765189726868666e+1773Q, 6.74828063313306417588175763238310325e+1801Q, 1.44026065844141159256872926595644247e+1830Q, 8.58426091495439408178371839859019039e+1858Q, 1.45211919400936944187225846047638548e+1888Q, 7.08718013380970011842483247147601395e+1917Q, 1.01475962220405902523641440040104610e+1948Q, 4.33542978691578087509838132034723750e+1978Q, 5.62285772227295495777726116212032065e+2009Q, 2.25285072921565445630031609130087435e+2041Q, 2.83839050906274298341210206309759282e+2073Q, 1.14501659579022194588844609345877849e+2106Q, 1.50629562239998305958408533546634030e+2139Q, 6.58342161306998815751663631350733541e+2172Q, 9.74198999952210922892973281379349494e+2206Q, 4.97552704772088889228035264268694867e+2241Q, 8.94330619882842342247706838649878784e+2276Q, 5.77072420156026800834371478648673792e+2312Q, 1.36388225285320494361282201451878478e+2349Q, 1.20508189950290985406298094670730466e+2386Q, 4.06413362486490272506766749982212198e+2423Q, 5.34308092015215251528601382597439463e+2461Q, },
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_weights.size() - 1);
 #else
    m_committed_refinements = m_weights.size() - 1;
@@ -485,4 +489,865 @@ void sinh_sinh_detail<Real, Policy>::init(const std::integral_constant<int, 4>&)
 #endif
 
 }}}}
-#endif
+
+#endif // BOOST_MATH_HAS_NVRTC
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+namespace boost { 
+namespace math { 
+namespace quadrature {
+namespace detail {
+
+__constant__ float m_abscissas_float_1[4] = 
+      { 3.08828742e+00f, 1.48993185e+02f, 3.41228925e+06f, 2.06932577e+18f, };
+
+__constant__ float m_abscissas_float_2[4] =
+      { 9.13048763e-01f, 1.41578929e+01f, 6.70421552e+03f, 9.64172533e+10f, };
+
+__constant__ float m_abscissas_float_3[8] =
+      { 4.07297690e-01f, 1.68206671e+00f, 6.15089799e+00f, 4.00396235e+01f, 7.92920025e+02f, 1.02984971e+05f, 
+        3.03862311e+08f, 1.56544547e+14f, };
+
+__constant__ float m_abscissas_float_4[16] =
+      { 1.98135272e-01f, 6.40155674e-01f, 1.24892870e+00f, 2.26608084e+00f, 4.29646270e+00f, 9.13029039e+00f, 
+        2.31110765e+01f, 7.42770603e+01f, 3.26720921e+02f, 2.15948569e+03f, 2.41501526e+04f, 5.31819400e+05f, 
+        2.80058686e+07f, 4.52406508e+09f, 3.08561257e+12f, 1.33882673e+16f, };
+
+__constant__ float m_abscissas_float_5[32] =
+      { 9.83967894e-02f, 3.00605618e-01f, 5.19857979e-01f, 7.70362083e-01f, 1.07131137e+00f, 1.45056976e+00f, 
+        1.95077855e+00f, 2.64003177e+00f, 3.63137237e+00f, 5.11991533e+00f, 7.45666098e+00f, 1.13022613e+01f, 
+        1.79641069e+01f, 3.01781070e+01f, 5.40387580e+01f, 1.04107731e+02f, 2.18029520e+02f, 5.02155699e+02f, 
+        1.28862131e+03f, 3.73921687e+03f, 1.24750730e+04f, 4.87639975e+04f, 2.28145658e+05f, 1.30877796e+06f, 
+        9.46084663e+06f, 8.88883120e+07f, 1.12416883e+09f, 1.99127673e+10f, 5.16743469e+11f, 2.06721881e+13f, 
+        1.35061503e+15f, 1.53854066e+17f, };
+
+__constant__ float m_abscissas_float_6[65] =
+      { 4.91151004e-02f, 1.48013150e-01f, 2.48938814e-01f, 3.53325424e-01f, 4.62733557e-01f, 5.78912068e-01f,
+        7.03870253e-01f, 8.39965859e-01f, 9.90015066e-01f, 1.15743257e+00f, 1.34641276e+00f, 1.56216711e+00f, 
+        1.81123885e+00f, 2.10192442e+00f, 2.44484389e+00f, 2.85372075e+00f, 3.34645891e+00f, 3.94664582e+00f, 
+        4.68567310e+00f, 5.60576223e+00f, 6.76433234e+00f, 8.24038318e+00f, 1.01439436e+01f, 1.26302471e+01f,
+        1.59213040e+01f, 2.03392186e+01f, 2.63584645e+01f, 3.46892633e+01f, 4.64129147e+01f, 6.32055079e+01f,
+        8.77149726e+01f, 1.24209693e+02f, 1.79718635e+02f, 2.66081728e+02f, 4.03727303e+02f, 6.28811307e+02f,
+        1.00707984e+03f, 1.66156823e+03f, 2.82965144e+03f, 4.98438627e+03f, 9.10154693e+03f, 1.72689266e+04f,
+        3.41309958e+04f, 7.04566898e+04f, 1.52340422e+05f, 3.46047978e+05f, 8.28472421e+05f, 2.09759615e+06f,
+        5.63695080e+06f, 1.61407141e+07f, 4.94473068e+07f, 1.62781052e+08f, 5.78533297e+08f, 2.23083854e+09f,
+        9.38239131e+09f, 4.32814954e+10f, 2.20307274e+11f, 1.24524507e+12f, 7.86900053e+12f, 5.59953143e+13f,
+        4.52148695e+14f, 4.17688952e+15f, 4.45286776e+16f, 5.52914285e+17f, 8.07573252e+18f, };
+
+__constant__ float m_abscissas_float_7[129] =
+      { 2.45471558e-02f, 7.37246687e-02f, 1.23152531e-01f, 1.73000138e-01f, 2.23440665e-01f, 2.74652655e-01f, 
+        3.26821679e-01f, 3.80142101e-01f, 4.34818964e-01f, 4.91070037e-01f, 5.49128046e-01f, 6.09243132e-01f,
+        6.71685571e-01f, 7.36748805e-01f, 8.04752842e-01f, 8.76048080e-01f, 9.51019635e-01f, 1.03009224e+00f,
+        1.11373586e+00f, 1.20247203e+00f, 1.29688123e+00f, 1.39761124e+00f, 1.50538689e+00f, 1.62102121e+00f,
+        1.74542840e+00f, 1.87963895e+00f, 2.02481711e+00f, 2.18228138e+00f, 2.35352849e+00f, 2.54026147e+00f,
+        2.74442267e+00f, 2.96823279e+00f, 3.21423687e+00f, 3.48535896e+00f, 3.78496698e+00f, 4.11695014e+00f,
+        4.48581137e+00f, 4.89677825e+00f, 5.35593629e+00f, 5.87038976e+00f, 6.44845619e+00f, 7.09990245e+00f,
+        7.83623225e+00f, 8.67103729e+00f, 9.62042778e+00f, 1.07035620e+01f, 1.19433001e+01f, 1.33670142e+01f,
+        1.50075962e+01f, 1.69047155e+01f, 1.91063967e+01f, 2.16710044e+01f, 2.46697527e+01f, 2.81898903e+01f,
+        3.23387613e+01f, 3.72490076e+01f, 4.30852608e+01f, 5.00527965e+01f, 5.84087761e+01f, 6.84769282e+01f,
+        8.06668178e+01f, 9.54992727e+01f, 1.13640120e+02f, 1.35945194e+02f, 1.63520745e+02f, 1.97804969e+02f,
+        2.40678754e+02f, 2.94617029e+02f, 3.62896953e+02f, 4.49886178e+02f, 5.61444735e+02f, 7.05489247e+02f,
+        8.92790773e+02f, 1.13811142e+03f, 1.46183599e+03f, 1.89233262e+03f, 2.46939604e+03f, 3.24931157e+03f,
+        4.31236711e+03f, 5.77409475e+03f, 7.80224724e+03f, 1.06426753e+04f, 1.46591538e+04f, 2.03952854e+04f,
+        2.86717062e+04f, 4.07403376e+04f, 5.85318231e+04f, 8.50568927e+04f, 1.25064927e+05f, 1.86137394e+05f,
+        2.80525578e+05f, 4.28278249e+05f, 6.62634051e+05f, 1.03944324e+06f, 1.65385743e+06f, 2.67031565e+06f,
+        4.37721203e+06f, 7.28807171e+06f, 1.23317299e+07f, 2.12155729e+07f, 3.71308625e+07f, 6.61457938e+07f,
+        1.20005529e+08f, 2.21862941e+08f, 4.18228294e+08f, 8.04370413e+08f, 1.57939299e+09f, 3.16812242e+09f,
+        6.49660681e+09f, 1.36285199e+10f, 2.92686390e+10f, 6.43979867e+10f, 1.45275523e+11f, 3.36285446e+11f,
+        7.99420279e+11f, 1.95326423e+12f, 4.90958187e+12f, 1.27062273e+13f, 3.38907099e+13f, 9.32508403e+13f,
+        2.64948942e+14f, 7.78129518e+14f, 2.36471505e+15f, 7.44413803e+15f, 2.43021724e+16f, 8.23706864e+16f,
+        2.90211705e+17f, 1.06415768e+18f, 4.06627711e+18f, };
+
+__constant__ float m_abscissas_float_8[259] =
+      { 1.22722792e-02f, 3.68272289e-02f, 6.14133763e-02f, 8.60515971e-02f, 1.10762884e-01f, 1.35568393e-01f,
+        1.60489494e-01f, 1.85547813e-01f, 2.10765290e-01f, 2.36164222e-01f, 2.61767321e-01f, 2.87597761e-01f,
+        3.13679240e-01f, 3.40036029e-01f, 3.66693040e-01f, 3.93675878e-01f, 4.21010910e-01f, 4.48725333e-01f,
+        4.76847237e-01f, 5.05405685e-01f, 5.34430786e-01f, 5.63953775e-01f, 5.94007101e-01f, 6.24624511e-01f,
+        6.55841151e-01f, 6.87693662e-01f, 7.20220285e-01f, 7.53460977e-01f, 7.87457528e-01f, 8.22253686e-01f,
+        8.57895297e-01f, 8.94430441e-01f, 9.31909591e-01f, 9.70385775e-01f, 1.00991475e+00f, 1.05055518e+00f,
+        1.09236885e+00f, 1.13542087e+00f, 1.17977990e+00f, 1.22551840e+00f, 1.27271289e+00f, 1.32144424e+00f,
+        1.37179794e+00f, 1.42386447e+00f, 1.47773961e+00f, 1.53352485e+00f, 1.59132774e+00f, 1.65126241e+00f,
+        1.71344993e+00f, 1.77801893e+00f, 1.84510605e+00f, 1.91485658e+00f, 1.98742510e+00f, 2.06297613e+00f,
+        2.14168493e+00f, 2.22373826e+00f, 2.30933526e+00f, 2.39868843e+00f, 2.49202464e+00f, 2.58958621e+00f,
+        2.69163219e+00f, 2.79843963e+00f, 2.91030501e+00f, 3.02754584e+00f, 3.15050230e+00f, 3.27953915e+00f,
+        3.41504770e+00f, 3.55744805e+00f, 3.70719145e+00f, 3.86476298e+00f, 4.03068439e+00f, 4.20551725e+00f,
+        4.38986641e+00f, 4.58438376e+00f, 4.78977239e+00f, 5.00679110e+00f, 5.23625945e+00f, 5.47906320e+00f,
+        5.73616037e+00f, 6.00858792e+00f, 6.29746901e+00f, 6.60402117e+00f, 6.92956515e+00f, 7.27553483e+00f,
+        7.64348809e+00f, 8.03511888e+00f, 8.45227058e+00f, 8.89695079e+00f, 9.37134780e+00f, 9.87784877e+00f,
+        1.04190601e+01f, 1.09978298e+01f, 1.16172728e+01f, 1.22807990e+01f, 1.29921443e+01f, 1.37554055e+01f,
+        1.45750793e+01f, 1.54561061e+01f, 1.64039187e+01f, 1.74244972e+01f, 1.85244301e+01f, 1.97109839e+01f,
+        2.09921804e+01f, 2.23768845e+01f, 2.38749023e+01f, 2.54970927e+01f, 2.72554930e+01f, 2.91634608e+01f,
+        3.12358351e+01f, 3.34891185e+01f, 3.59416839e+01f, 3.86140099e+01f, 4.15289481e+01f, 4.47120276e+01f,
+        4.81918020e+01f, 5.20002465e+01f, 5.61732106e+01f, 6.07509371e+01f, 6.57786566e+01f, 7.13072704e+01f,
+        7.73941341e+01f, 8.41039609e+01f, 9.15098607e+01f, 9.96945411e+01f, 1.08751694e+02f, 1.18787600e+02f,
+        1.29922990e+02f, 1.42295202e+02f, 1.56060691e+02f, 1.71397955e+02f, 1.88510933e+02f, 2.07632988e+02f,
+        2.29031559e+02f, 2.53013612e+02f, 2.79932028e+02f, 3.10193130e+02f, 3.44265522e+02f, 3.82690530e+02f,
+        4.26094527e+02f, 4.75203518e+02f, 5.30860437e+02f, 5.94045681e+02f, 6.65901543e+02f, 7.47761337e+02f,
+        8.41184173e+02f, 9.47996570e+02f, 1.07034233e+03f, 1.21074246e+03f, 1.37216724e+03f, 1.55812321e+03f,
+        1.77275819e+03f, 2.02098849e+03f, 2.30865326e+03f, 2.64270219e+03f, 3.03142418e+03f, 3.48472668e+03f,
+        4.01447750e+03f, 4.63492426e+03f, 5.36320995e+03f, 6.22000841e+03f, 7.23030933e+03f, 8.42439022e+03f,
+        9.83902287e+03f, 1.15189746e+04f, 1.35188810e+04f, 1.59055875e+04f, 1.87610857e+04f, 2.21862046e+04f,
+        2.63052621e+04f, 3.12719440e+04f, 3.72767546e+04f, 4.45564828e+04f, 5.34062659e+04f, 6.41950058e+04f,
+        7.73851264e+04f, 9.35579699e+04f, 1.13446538e+05f, 1.37977827e+05f, 1.68327749e+05f, 2.05992575e+05f,
+        2.52882202e+05f, 3.11442272e+05f, 3.84814591e+05f, 4.77048586e+05f, 5.93380932e+05f, 7.40606619e+05f,
+        9.27573047e+05f, 1.16584026e+06f, 1.47056632e+06f, 1.86169890e+06f, 2.36558487e+06f, 3.01715270e+06f,
+        3.86288257e+06f, 4.96486431e+06f, 6.40636283e+06f, 8.29948185e+06f, 1.07957589e+07f, 1.41008733e+07f,
+        1.84951472e+07f, 2.43622442e+07f, 3.22295113e+07f, 4.28249388e+07f, 5.71579339e+07f, 7.66343793e+07f,
+        1.03221273e+08f, 1.39683399e+08f, 1.89925150e+08f, 2.59486540e+08f, 3.56266474e+08f, 4.91582541e+08f,
+        6.81731647e+08f, 9.50299811e+08f, 1.33159830e+09f, 1.87580198e+09f, 2.65667391e+09f, 3.78324022e+09f,
+        5.41753185e+09f, 7.80169537e+09f, 1.12996537e+10f, 1.64614916e+10f, 2.41235400e+10f, 3.55648690e+10f,
+        5.27534501e+10f, 7.87357211e+10f, 1.18256902e+11f, 1.78754944e+11f, 2.71963306e+11f, 4.16512215e+11f,
+        6.42178186e+11f, 9.96872550e+11f, 1.55821233e+12f, 2.45280998e+12f, 3.88865623e+12f, 6.20986899e+12f,
+        9.98992422e+12f, 1.61915800e+13f, 2.64432452e+13f, 4.35201885e+13f, 7.21888469e+13f, 1.20699764e+14f,
+        2.03448372e+14f, 3.45755310e+14f, 5.92524851e+14f, 1.02405779e+15f, 1.78517405e+15f, 3.13930699e+15f,
+        5.56985627e+15f, 9.97176335e+15f, 1.80168749e+16f, 3.28570986e+16f, 6.04901854e+16f, 1.12437528e+17f,
+        2.11044513e+17f, 4.00073701e+17f, 7.66084936e+17f, 1.48201877e+18f, 2.89694543e+18f, 5.72279017e+18f,
+        1.14268996e+19f, };
+
+__constant__ float* m_abscissas_float[8] = {
+    m_abscissas_float_1,
+    m_abscissas_float_2,
+    m_abscissas_float_3,
+    m_abscissas_float_4,
+    m_abscissas_float_5,
+    m_abscissas_float_6,
+    m_abscissas_float_7,
+    m_abscissas_float_8,
+};
+
+__constant__ float m_weights_float_1[4] = 
+      { 7.86824160e+00f, 8.80516388e+02f, 5.39627832e+07f, 8.87651190e+19f, };
+
+__constant__ float m_weights_float_2[4] = 
+      { 2.39852428e+00f, 5.24459642e+01f, 6.45788782e+04f, 2.50998524e+12f, };
+
+__constant__ float m_weights_float_3[8] = 
+      { 1.74936958e+00f, 3.97965898e+00f, 1.84851460e+01f, 1.86488072e+02f, 5.97420570e+03f, 1.27041264e+06f, 
+        6.16419301e+09f, 5.23085003e+15f, };
+
+__constant__ float m_weights_float_4[16] = 
+      { 1.61385906e+00f, 1.99776729e+00f, 3.02023198e+00f, 5.47764184e+00f, 1.17966092e+01f, 3.03550485e+01f, 
+        9.58442179e+01f, 3.89387024e+02f, 2.17919325e+03f, 1.83920812e+04f, 2.63212061e+05f, 7.42729651e+06f,
+        5.01587565e+08f, 1.03961087e+11f, 9.10032891e+13f, 5.06865116e+17f, };
+
+__constant__ float m_weights_float_5[32] = 
+      { 1.58146596e+00f, 1.66914991e+00f, 1.85752319e+00f, 2.17566262e+00f, 2.67590138e+00f, 3.44773868e+00f,
+        4.64394654e+00f, 6.53020450e+00f, 9.58228502e+00f, 1.46836141e+01f, 2.35444955e+01f, 3.96352727e+01f,
+        7.03763521e+01f, 1.32588012e+02f, 2.66962565e+02f, 5.79374920e+02f, 1.36869193e+03f, 3.55943572e+03f,
+        1.03218668e+04f, 3.38662130e+04f, 1.27816626e+05f, 5.65408251e+05f, 2.99446204e+06f, 1.94497502e+07f,
+        1.59219301e+08f, 1.69428882e+09f, 2.42715618e+10f, 4.87031785e+11f, 1.43181966e+13f, 6.48947152e+14f,
+        4.80375775e+16f, 6.20009636e+18f, };
+
+__constant__ float m_weights_float_6[65] = 
+      { 1.57345777e+00f, 1.59489276e+00f, 1.63853652e+00f, 1.70598041e+00f, 1.79972439e+00f, 1.92332285e+00f,
+        2.08159737e+00f, 2.28093488e+00f, 2.52969785e+00f, 2.83878478e+00f, 3.22239575e+00f, 3.69908136e+00f,
+        4.29318827e+00f, 5.03686536e+00f, 5.97287114e+00f, 7.15853842e+00f, 8.67142780e+00f, 1.06174736e+01f,
+        1.31428500e+01f, 1.64514563e+01f, 2.08309945e+01f, 2.66923599e+01f, 3.46299351e+01f, 4.55151836e+01f,
+        6.06440809e+01f, 8.19729692e+01f, 1.12502047e+02f, 1.56909655e+02f, 2.22620435e+02f, 3.21638549e+02f,
+        4.73757451e+02f, 7.12299455e+02f, 1.09460965e+03f, 1.72169779e+03f, 2.77592491e+03f, 4.59523007e+03f,
+        7.82342759e+03f, 1.37235744e+04f, 2.48518896e+04f, 4.65553875e+04f, 9.04176678e+04f, 1.82484396e+05f,
+        3.83680026e+05f, 8.42627197e+05f, 1.93843257e+06f, 4.68511285e+06f, 1.19352867e+07f, 3.21564375e+07f,
+        9.19600893e+07f, 2.80222318e+08f, 9.13611083e+08f, 3.20091090e+09f, 1.21076526e+10f, 4.96902475e+10f,
+        2.22431575e+11f, 1.09212534e+12f, 5.91688298e+12f, 3.55974344e+13f, 2.39435365e+14f, 1.81355107e+15f,
+        1.55873671e+16f, 1.53271488e+17f, 1.73927478e+18f, 2.29884122e+19f, 3.57403070e+20f, };
+
+__constant__ float m_weights_float_7[129] = 
+      { 1.57146132e+00f, 1.57679017e+00f, 1.58749564e+00f, 1.60367396e+00f, 1.62547113e+00f, 1.65308501e+00f,
+        1.68676814e+00f, 1.72683132e+00f, 1.77364814e+00f, 1.82766042e+00f, 1.88938482e+00f, 1.95942057e+00f,
+        2.03845873e+00f, 2.12729290e+00f, 2.22683194e+00f, 2.33811466e+00f, 2.46232715e+00f, 2.60082286e+00f,
+        2.75514621e+00f, 2.92706011e+00f, 3.11857817e+00f, 3.33200254e+00f, 3.56996830e+00f, 3.83549565e+00f,
+        4.13205150e+00f, 4.46362211e+00f, 4.83479919e+00f, 5.25088196e+00f, 5.71799849e+00f, 6.24325042e+00f,
+        6.83488580e+00f, 7.50250620e+00f, 8.25731548e+00f, 9.11241941e+00f, 1.00831875e+01f, 1.11876913e+01f,
+        1.24472371e+01f, 1.38870139e+01f, 1.55368872e+01f, 1.74323700e+01f, 1.96158189e+01f, 2.21379089e+01f,
+        2.50594593e+01f, 2.84537038e+01f, 3.24091185e+01f, 3.70329629e+01f, 4.24557264e+01f, 4.88367348e+01f,
+        5.63712464e+01f, 6.52994709e+01f, 7.59180776e+01f, 8.85949425e+01f, 1.03788130e+02f, 1.22070426e+02f,
+        1.44161210e+02f, 1.70968019e+02f, 2.03641059e+02f, 2.43645006e+02f, 2.92854081e+02f, 3.53678602e+02f,
+        4.29234308e+02f, 5.23570184e+02f, 6.41976690e+02f, 7.91405208e+02f, 9.81042209e+02f, 1.22309999e+03f,
+        1.53391256e+03f, 1.93546401e+03f, 2.45753455e+03f, 3.14073373e+03f, 4.04081819e+03f, 5.23488160e+03f,
+        6.83029446e+03f, 8.97771323e+03f, 1.18901592e+04f, 1.58712239e+04f, 2.13571111e+04f, 2.89798371e+04f,
+        3.96630673e+04f, 5.47687519e+04f, 7.63235654e+04f, 1.07371915e+05f, 1.52531667e+05f, 2.18877843e+05f,
+        3.17362450e+05f, 4.65120153e+05f, 6.89253766e+05f, 1.03311989e+06f, 1.56688798e+06f, 2.40549203e+06f,
+        3.73952896e+06f, 5.88912115e+06f, 9.39904635e+06f, 1.52090328e+07f, 2.49628719e+07f, 4.15775926e+07f,
+        7.03070537e+07f, 1.20759856e+08f, 2.10788251e+08f, 3.74104720e+08f, 6.75449459e+08f, 1.24131674e+09f,
+        2.32331003e+09f, 4.43117602e+09f, 8.61744649e+09f, 1.70983691e+10f, 3.46357452e+10f, 7.16760712e+10f,
+        1.51634762e+11f, 3.28172932e+11f, 7.27110260e+11f, 1.65049955e+12f, 3.84133815e+12f, 9.17374427e+12f,
+        2.24990195e+13f, 5.67153509e+13f, 1.47074225e+14f, 3.92701252e+14f, 1.08063998e+15f, 3.06767147e+15f,
+        8.99238679e+15f, 2.72472254e+16f, 8.54294612e+16f, 2.77461372e+17f, 9.34529948e+17f, 3.26799612e+18f,
+        1.18791443e+19f, 4.49405341e+19f, 1.77170665e+20f, };
+
+__constant__ float m_weights_float_8[259] = 
+      { 1.57096255e+00f, 1.57229290e+00f, 1.57495658e+00f, 1.57895955e+00f, 1.58431079e+00f, 1.59102230e+00f,
+        1.59910918e+00f, 1.60858966e+00f, 1.61948515e+00f, 1.63182037e+00f, 1.64562338e+00f, 1.66092569e+00f,
+        1.67776241e+00f, 1.69617233e+00f, 1.71619809e+00f, 1.73788633e+00f, 1.76128784e+00f, 1.78645779e+00f,
+        1.81345587e+00f, 1.84234658e+00f, 1.87319943e+00f, 1.90608922e+00f, 1.94109632e+00f, 1.97830698e+00f,
+        2.01781368e+00f, 2.05971547e+00f, 2.10411838e+00f, 2.15113585e+00f, 2.20088916e+00f, 2.25350798e+00f,
+        2.30913084e+00f, 2.36790578e+00f, 2.42999091e+00f, 2.49555516e+00f, 2.56477893e+00f, 2.63785496e+00f,
+        2.71498915e+00f, 2.79640147e+00f, 2.88232702e+00f, 2.97301705e+00f, 3.06874019e+00f, 3.16978367e+00f,
+        3.27645477e+00f, 3.38908227e+00f, 3.50801806e+00f, 3.63363896e+00f, 3.76634859e+00f, 3.90657947e+00f,
+        4.05479525e+00f, 4.21149322e+00f, 4.37720695e+00f, 4.55250922e+00f, 4.73801517e+00f, 4.93438579e+00f,
+        5.14233166e+00f, 5.36261713e+00f, 5.59606472e+00f, 5.84356014e+00f, 6.10605759e+00f, 6.38458564e+00f,
+        6.68025373e+00f, 6.99425915e+00f, 7.32789480e+00f, 7.68255767e+00f, 8.05975815e+00f, 8.46113023e+00f,
+        8.88844279e+00f, 9.34361190e+00f, 9.82871448e+00f, 1.03460033e+01f, 1.08979234e+01f, 1.14871305e+01f,
+        1.21165112e+01f, 1.27892047e+01f, 1.35086281e+01f, 1.42785033e+01f, 1.51028871e+01f, 1.59862046e+01f,
+        1.69332867e+01f, 1.79494108e+01f, 1.90403465e+01f, 2.02124072e+01f, 2.14725057e+01f, 2.28282181e+01f,
+        2.42878539e+01f, 2.58605342e+01f, 2.75562800e+01f, 2.93861096e+01f, 3.13621485e+01f, 3.34977526e+01f,
+        3.58076454e+01f, 3.83080730e+01f, 4.10169773e+01f, 4.39541917e+01f, 4.71416602e+01f, 5.06036855e+01f,
+        5.43672075e+01f, 5.84621188e+01f, 6.29216205e+01f, 6.77826252e+01f, 7.30862125e+01f, 7.88781469e+01f,
+        8.52094636e+01f, 9.21371360e+01f, 9.97248336e+01f, 1.08043785e+02f, 1.17173764e+02f, 1.27204209e+02f,
+        1.38235512e+02f, 1.50380485e+02f, 1.63766039e+02f, 1.78535118e+02f, 1.94848913e+02f, 2.12889407e+02f,
+        2.32862309e+02f, 2.55000432e+02f, 2.79567594e+02f, 3.06863126e+02f, 3.37227087e+02f, 3.71046310e+02f,
+        4.08761417e+02f, 4.50874968e+02f, 4.97960949e+02f, 5.50675821e+02f, 6.09771424e+02f, 6.76110054e+02f,
+        7.50682104e+02f, 8.34626760e+02f, 9.29256285e+02f, 1.03608458e+03f, 1.15686082e+03f, 1.29360914e+03f,
+        1.44867552e+03f, 1.62478326e+03f, 1.82509876e+03f, 2.05330964e+03f, 2.31371761e+03f, 2.61134924e+03f,
+        2.95208799e+03f, 3.34283233e+03f, 3.79168493e+03f, 4.30817984e+03f, 4.90355562e+03f, 5.59108434e+03f,
+        6.38646863e+03f, 7.30832183e+03f, 8.37874981e+03f, 9.62405722e+03f, 1.10756067e+04f, 1.27708661e+04f,
+        1.47546879e+04f, 1.70808754e+04f, 1.98141031e+04f, 2.30322789e+04f, 2.68294532e+04f, 3.13194118e+04f,
+        3.66401221e+04f, 4.29592484e+04f, 5.04810088e+04f, 5.94547213e+04f, 7.01854788e+04f, 8.30475173e+04f,
+        9.85009981e+04f, 1.17113127e+05f, 1.39584798e+05f, 1.66784302e+05f, 1.99790063e+05f, 2.39944995e+05f,
+        2.88925794e+05f, 3.48831531e+05f, 4.22297220e+05f, 5.12639825e+05f, 6.24046488e+05f, 7.61817907e+05f,
+        9.32683930e+05f, 1.14521401e+06f, 1.41035265e+06f, 1.74212004e+06f, 2.15853172e+06f, 2.68280941e+06f,
+        3.34498056e+06f, 4.18399797e+06f, 5.25055801e+06f, 6.61086017e+06f, 8.35163942e+06f, 1.05869253e+07f,
+        1.34671524e+07f, 1.71914827e+07f, 2.20245345e+07f, 2.83191730e+07f, 3.65476782e+07f, 4.73445266e+07f,
+        6.15653406e+07f, 8.03684303e+07f, 1.05328028e+08f, 1.38592169e+08f, 1.83103699e+08f, 2.42910946e+08f,
+        3.23606239e+08f, 4.32947522e+08f, 5.81743297e+08f, 7.85117979e+08f, 1.06432920e+09f, 1.44938958e+09f,
+        1.98286647e+09f, 2.72541431e+09f, 3.76386796e+09f, 5.22313881e+09f, 7.28378581e+09f, 1.02080964e+10f,
+        1.43789932e+10f, 2.03583681e+10f, 2.89749983e+10f, 4.14577375e+10f, 5.96383768e+10f, 8.62622848e+10f,
+        1.25466705e+11f, 1.83521298e+11f, 2.69981221e+11f, 3.99492845e+11f, 5.94638056e+11f, 8.90440997e+11f,
+        1.34155194e+12f, 2.03376855e+12f, 3.10262796e+12f, 4.76359832e+12f, 7.36142036e+12f, 1.14512696e+13f,
+        1.79331419e+13f, 2.82758550e+13f, 4.48929705e+13f, 7.17780287e+13f, 1.15585510e+14f, 1.87483389e+14f,
+        3.06351036e+14f, 5.04340065e+14f, 8.36616340e+14f, 1.39855635e+15f, 2.35633575e+15f, 4.00176517e+15f,
+        6.85137513e+15f, 1.18269011e+16f, 2.05867353e+16f, 3.61396878e+16f, 6.39911218e+16f, 1.14301619e+17f,
+        2.05988138e+17f, 3.74584679e+17f, 6.87444303e+17f, 1.27340764e+18f, 2.38124192e+18f, 4.49583562e+18f,
+        8.57144202e+18f, 1.65044358e+19f, 3.21010035e+19f, 6.30778012e+19f, 1.25240403e+20f, 2.51300530e+20f,
+        5.09677626e+20f, };
+
+__constant__ float* m_weights_float[8] = {
+    m_weights_float_1,
+    m_weights_float_2,
+    m_weights_float_3,
+    m_weights_float_4,
+    m_weights_float_5,
+    m_weights_float_6,
+    m_weights_float_7,
+    m_weights_float_8
+};
+
+__constant__ double m_abscissas_double_1[6] = 
+      { 3.088287417976322866e+00, 1.489931846492091580e+02, 3.412289247883437102e+06, 2.069325766042617791e+18, 
+        2.087002407609475560e+50, 2.019766160717908151e+137, };
+
+__constant__ double m_abscissas_double_2[6] =
+      { 9.130487626376696748e-01, 1.415789294662811592e+01, 6.704215516223276482e+03, 9.641725327150499415e+10, 
+        2.508950760085778485e+30, 1.447263535710337145e+83, };
+
+__constant__ double m_abscissas_double_3[12] =
+      { 4.072976900657586902e-01, 1.682066707021148743e+00, 6.150897986386729515e+00, 4.003962351929400222e+01,
+        7.929200247931026321e+02, 1.029849713330979583e+05, 3.038623109252438574e+08, 1.565445474362494869e+14, 
+        4.042465098430219104e+23, 1.321706827429658179e+39, 4.991231782099557998e+64, 7.352943850359875966e+106, };
+
+__constant__ double m_abscissas_double_4[24] =
+      { 1.981352722514781726e-01, 6.401556735005260177e-01, 1.248928698253977663e+00, 2.266080840944321232e+00, 
+        4.296462696702327381e+00, 9.130290387099955696e+00, 2.311107653864279933e+01, 7.427706034324012430e+01,
+        3.267209207115258917e+02, 2.159485694311818716e+03, 2.415015262896413060e+04, 5.318194002756929158e+05,
+        2.800586857217043323e+07, 4.524065079794338780e+09, 3.085612573980677122e+12, 1.338826733015807478e+16,
+        6.254617176562341381e+20, 6.182098535814164754e+26, 3.077293649788458067e+34, 2.348957289370104303e+44, 
+        1.148543197899469758e+57, 2.255300070010069868e+73, 1.877919500569195394e+94, 1.367473887938624280e+121, };
+
+__constant__ double m_abscissas_double_5[49] = 
+      { 9.839678940067320339e-02, 3.006056176599550351e-01, 5.198579789949384900e-01, 7.703620832988877009e-01, 
+        1.071311369641311830e+00, 1.450569758088998445e+00, 1.950778549520360334e+00, 2.640031773695551468e+00,
+        3.631372373667412273e+00, 5.119915330903350570e+00, 7.456660981404883289e+00, 1.130226126889972624e+01,
+        1.796410692472772550e+01, 3.017810704601898222e+01, 5.403875800312370567e+01, 1.041077314477469548e+02,
+        2.180295201202628077e+02, 5.021556986259101646e+02, 1.288621310998222420e+03, 3.739216870800548324e+03,
+        1.247507297020191232e+04, 4.876399753226692124e+04, 2.281456582219130122e+05, 1.308777960064843017e+06,
+        9.460846634209664077e+06, 8.888831203637279622e+07, 1.124168828974344134e+09, 1.991276729532144470e+10,
+        5.167434691060984650e+11, 2.067218814203990888e+13, 1.350615033184100406e+15, 1.538540662836508188e+17,
+        3.290747290540350661e+19, 1.437291381884498816e+22, 1.409832445530347286e+25, 3.459135480277971441e+28,
+        2.398720582340954092e+32, 5.398806604617292960e+36, 4.613340002580628610e+41, 1.787685909667902457e+47,
+        3.841984370124338536e+53, 5.752797955708583700e+60, 7.771812038427286551e+68, 1.269673044204081626e+78,
+        3.495676773765731568e+88, 2.362519474971692445e+100, 6.002143893273651123e+113, 9.290716303464155539e+128,
+        1.514442238033847090e+146, };
+
+__constant__ double m_abscissas_double_6[98] = 
+      { 4.911510035029024930e-02, 1.480131496743607333e-01, 2.489388137406836857e-01, 3.533254236926684378e-01,
+        4.627335566122353259e-01, 5.789120681640963067e-01, 7.038702533860627799e-01, 8.399658591446505688e-01,
+        9.900150664244376147e-01, 1.157432570143699131e+00, 1.346412759185361763e+00, 1.562167113901335551e+00,
+        1.811238852782323380e+00, 2.101924419006550301e+00, 2.444843885584197934e+00, 2.853720746632915024e+00,
+        3.346458910955350787e+00, 3.946645821057838387e+00, 4.685673101596678529e+00, 5.605762230908151175e+00,
+        6.764332336830574204e+00, 8.240383175379985221e+00, 1.014394356129857730e+01, 1.263024714338892472e+01,
+        1.592130395780345258e+01, 2.033921861921857185e+01, 2.635846445760633752e+01, 3.468926333224152409e+01,
+        4.641291467019728963e+01, 6.320550793890424203e+01, 8.771497261808906374e+01, 1.242096926240411498e+02,
+        1.797186347845127557e+02, 2.660817283327900190e+02, 4.037273029575712841e+02, 6.288113066545908703e+02,
+        1.007079837507490594e+03, 1.661568229185114288e+03, 2.829651440786582598e+03, 4.984386266585669139e+03,
+        9.101546927647810893e+03, 1.726892655475049727e+04, 3.413099578778601190e+04, 7.045668977053092802e+04,
+        1.523404217761279128e+05, 3.460479782897947414e+05, 8.284724209233183002e+05, 2.097596146601193946e+06,
+        5.636950798861273236e+06, 1.614071410855607245e+07, 4.944730678915060360e+07, 1.627810516820991356e+08,
+        5.785332971632280838e+08, 2.230838540681955690e+09, 9.382391306064739643e+09, 4.328149544776551692e+10,
+        2.203072744049242904e+11, 1.245245067109136413e+12, 7.869000534957822375e+12, 5.599531432979422461e+13,
+        4.521486949902090877e+14, 4.176889516548293265e+15, 4.452867759650496656e+16, 5.529142853140498068e+17,
+        8.075732516562854275e+18, 1.402046916260468698e+20, 2.925791412832239850e+21, 7.426433029335410886e+22,
+        2.321996331245735364e+24, 9.064194250638442432e+25, 4.481279048819445609e+27, 2.849046304726990645e+29,
+        2.367381159183355975e+31, 2.615825578455121227e+33, 3.914764948263290808e+35, 8.092042448555929219e+37,
+        2.358921320940630332e+40, 9.915218648535332591e+42, 6.152851059342658764e+45, 5.780276340144515388e+48,
+        8.443751734186488626e+51, 1.973343350899766708e+55, 7.605247378556219980e+58, 4.992057104939510418e+62,
+        5.775863423903912316e+66, 1.221808201945355603e+71, 4.912917230387133816e+75, 3.913971813732202372e+80,
+        6.456388069905286787e+85, 2.311225068528010358e+91, 1.887458157719431339e+97, 3.708483165438453094e+103,
+        1.855198812283538635e+110, 2.509787873171705318e+117, 9.790423755591216617e+124, 1.179088807944050747e+133,
+        4.714631846722476620e+141, 6.762657785959713240e+150, };
+
+__constant__ double m_abscissas_double_7[196] = 
+      { 2.454715583629863651e-02, 7.372466873903346224e-02, 1.231525309416766543e-01, 1.730001377719248556e-01,
+        2.234406649596860001e-01, 2.746526549718518258e-01, 3.268216792980646669e-01, 3.801421009804789245e-01,
+        4.348189637215614948e-01, 4.910700365099428407e-01, 5.491280459480215441e-01, 6.092431324382654397e-01,
+        6.716855712021148069e-01, 7.367488049067938643e-01, 8.047528416336950644e-01, 8.760480802482050705e-01,
+        9.510196351823332253e-01, 1.030092244532470067e+00, 1.113735859588680765e+00, 1.202472030918058876e+00,
+        1.296881226496863751e+00, 1.397611241828373026e+00, 1.505386891360545205e+00, 1.621021205894798030e+00,
+        1.745428403369044572e+00, 1.879638952031029331e+00, 2.024817107609328524e+00, 2.182281382147884181e+00,
+        2.353528494823881355e+00, 2.540261468229626457e+00, 2.744422672171478111e+00, 2.968232787190606619e+00,
+        3.214236869520657666e+00, 3.485358957907730467e+00, 3.784966983117372821e+00, 4.116950138940295100e+00,
+        4.485811369388231710e+00, 4.896778246562001812e+00, 5.355936290826725948e+00, 5.870389762600956907e+00,
+        6.448456189131117605e+00, 7.099902452679558236e+00, 7.836232253282841261e+00, 8.671037293575230635e+00,
+        9.620427777985990363e+00, 1.070356198876799531e+01, 1.194330008139441022e+01, 1.336701421038499647e+01,
+        1.500759615914396343e+01, 1.690471548203528376e+01, 1.910639668731689597e+01, 2.167100443216577994e+01,
+        2.466975274695099197e+01, 2.818989025157845355e+01, 3.233876132429401745e+01, 3.724900758097245740e+01,
+        4.308526084907741997e+01, 5.005279647654703975e+01, 5.840877607253876528e+01, 6.847692821534239862e+01,
+        8.066681777060714848e+01, 9.549927270200249260e+01, 1.136401195769487885e+02, 1.359451944976603209e+02,
+        1.635207451879744447e+02, 1.978049687912586950e+02, 2.406787535889776661e+02, 2.946170292930555023e+02,
+        3.628969532147125333e+02, 4.498861782715596902e+02, 5.614447353133496106e+02, 7.054892470899271429e+02,
+        8.927907732799964116e+02, 1.138111424979478376e+03, 1.461835991563605367e+03, 1.892332623444716186e+03,
+        2.469396036186133479e+03, 3.249311569298824731e+03, 4.312367113170283012e+03, 5.774094754500139661e+03,
+        7.802247237500851845e+03, 1.064267530975806972e+04, 1.465915383535674990e+04, 2.039528541239754835e+04,
+        2.867170622421556265e+04, 4.074033762183453297e+04, 5.853182310596923393e+04, 8.505689265265206640e+04,
+        1.250649269847856615e+05, 1.861373943166749766e+05, 2.805255777452010927e+05, 4.282782486084761748e+05,
+        6.626340506127657304e+05, 1.039443239650339565e+06, 1.653857426112961316e+06, 2.670315650125279161e+06,
+        4.377212026624358795e+06, 7.288071713698413821e+06, 1.233172993400331694e+07, 2.121557285769933699e+07,
+        3.713086254861535383e+07, 6.614579377352135534e+07, 1.200055291694917110e+08, 2.218629410296880690e+08,
+        4.182282939928687703e+08, 8.043704132493714804e+08, 1.579392989425668114e+09, 3.168122415524104635e+09,
+        6.496606811549861323e+09, 1.362851988356444486e+10, 2.926863897008707708e+10, 6.439798665209493735e+10,
+        1.452755233772903022e+11, 3.362854459389246576e+11, 7.994202785433479271e+11, 1.953264233362291960e+12,
+        4.909581868242554569e+12, 1.270622730765015610e+13, 3.389070986742985764e+13, 9.325084030208844833e+13,
+        2.649489423834534140e+14, 7.781295184094957195e+14, 2.364715052527355639e+15, 7.444138031465958255e+15,
+        2.430217240684749635e+16, 8.237068641534357762e+16, 2.902117050664548840e+17, 1.064157679404037013e+18,
+        4.066277106061960017e+18, 1.621274233630359097e+19, 6.754156830915450013e+19, 2.944056841733781919e+20,
+        1.344640139549107817e+21, 6.444586158944723300e+21, 3.246218667554608934e+22, 1.721234579556653533e+23,
+        9.622533890240474391e+23, 5.681407260417956671e+24, 3.548890779995928184e+25, 2.349506425672269562e+26,
+        1.651618130605205643e+27, 1.235147426493113059e+28, 9.845947239792057550e+28, 8.383130781984610418e+29,
+        7.639649461399172445e+30, 7.467862732233885201e+31, 7.847691482004993660e+32, 8.886032557626454704e+33,
+        1.086734890678302436e+35, 1.438967777036538458e+36, 2.068168865475603521e+37, 3.234885320223912385e+38,
+        5.521233641542628514e+39, 1.031148231194663855e+41, 2.113272035816365982e+42, 4.766724345485077520e+43,
+        1.186961550990218287e+45, 3.273172169205847573e+46, 1.002821226769167753e+48, 3.424933903935156479e+49,
+        1.308436017026428736e+51, 5.611378330048420503e+52, 2.711424806327139291e+54, 1.481771793644066442e+56,
+        9.194282071042778804e+57, 6.503661455875355562e+59, 5.266329986868627303e+61, 4.902662807969347359e+63,
+        5.270511057289557050e+65, 6.572856511670583316e+67, 9.553956030013225387e+69, 1.626491911159411616e+72,
+        3.259410915500951223e+74, 7.728460318113614280e+76, 2.179881996905918059e+79, 7.354484388371505915e+81,
+        2.984831270803957746e+84, 1.465828267813438962e+87, 8.763355972629864261e+89, 6.417909665847831130e+92,
+        5.794958649229893510e+95, 6.494224472311908365e+98, 9.095000156016433698e+101, 1.603058498455299102e+105,
+        3.582099119119320529e+108, 1.022441227139854687e+112, 3.756872185015086057e+115, 1.791363463832849159e+119,
+        1.117641882039472124e+123, 9.202159565546528285e+126, 1.008716474827888568e+131, 1.485546487089301805e+135,
+        2.966961534830566097e+139, 8.114207284664369360e+143, 3.069178087507669739e+148, 1.622223681147791473e+153, };
+
+__constant__ double m_abscissas_double_8[391] = 
+      { 1.227227917054637830e-02, 3.682722894492590471e-02, 6.141337626871079991e-02, 8.605159708778207907e-02,
+        1.107628840017845446e-01, 1.355683934957785482e-01, 1.604894937454335489e-01, 1.855478131645089496e-01,
+        2.107652898670700524e-01, 2.361642222214626268e-01, 2.617673206785495261e-01, 2.875977610631342900e-01,
+        3.136792395249035647e-01, 3.400360293536632770e-01, 3.666930398731810193e-01, 3.936758776386451797e-01,
+        4.210109101746846268e-01, 4.487253325041450341e-01, 4.768472367324829462e-01, 5.054056849688209375e-01,
+        5.344307858825229079e-01, 5.639537752137267134e-01, 5.940071005777549000e-01, 6.246245109268716053e-01,
+        6.558411510586397969e-01, 6.876936615883514922e-01, 7.202202848338683401e-01, 7.534609770949572224e-01,
+        7.874575278460963461e-01, 8.222536864020499377e-01, 8.578952966595825808e-01, 8.944304405668593009e-01,
+        9.319095910247435485e-01, 9.703857749817920659e-01, 1.009914747547728584e+00, 1.050555178019083150e+00,
+        1.092368848786092579e+00, 1.135420868172514300e+00, 1.179779898350424466e+00, 1.225518399571142610e+00,
+        1.272712892062026473e+00, 1.321444237057985065e+00, 1.371797938567245953e+00, 1.423864467614384096e+00,
+        1.477739610861208115e+00, 1.533524845679288858e+00, 1.591327743938355098e+00, 1.651262406984310076e+00,
+        1.713449934511288211e+00, 1.778018930286256858e+00, 1.845106047964720870e+00, 1.914856580544951899e+00,
+        1.987425097349017093e+00, 2.062976132795275283e+00, 2.141684931642916785e+00, 2.223738255848994521e+00,
+        2.309335258687213796e+00, 2.398688432341103821e+00, 2.492024635808356095e+00, 2.589586210645122756e+00,
+        2.691632192846832444e+00, 2.798439630014497291e+00, 2.910305013902562652e+00, 3.027545839497364963e+00,
+        3.150502302946919722e+00, 3.279539151967394330e+00, 3.415047703805410611e+00, 3.557448047456550733e+00,
+        3.707191448649779817e+00, 3.864762978128342125e+00, 4.030684386016531344e+00, 4.205517247588613835e+00,
+        4.389866408585172458e+00, 4.584383761391930748e+00, 4.789772386950687695e+00, 5.006791101261363264e+00,
+        5.236259449815274050e+00, 5.479063198337523150e+00, 5.736160373884817415e+00, 6.008587916728619858e+00,
+        6.297469010648863048e+00, 6.604021167380929133e+00, 6.929565150124677837e+00, 7.275534831383860972e+00,
+        7.643488092123492064e+00, 8.035118882502459288e+00, 8.452270579478188130e+00, 8.896950793641785313e+00,
+        9.371347797016395173e+00, 9.877848765573446033e+00, 1.041906005527762037e+01, 1.099782975900831706e+01,
+        1.161727282423952258e+01, 1.228079904848924611e+01, 1.299214431196691048e+01, 1.375540545535625881e+01,
+        1.457507926620621316e+01, 1.545610610104852468e+01, 1.640391874338302925e+01, 1.742449718154208970e+01,
+        1.852443008688437526e+01, 1.971098388378266494e+01, 2.099218043080961648e+01, 2.237688448013982946e+01,
+        2.387490225270073820e+01, 2.549709266380430464e+01, 2.725549296232531555e+01, 2.916346081119624987e+01,
+        3.123583514423284962e+01, 3.348911849136805118e+01, 3.594168387985465099e+01, 3.861400990307230737e+01,
+        4.152894811329303023e+01, 4.471202755441533396e+01, 4.819180202224910174e+01, 5.200024654361558757e+01,
+        5.617321062537384494e+01, 6.075093706918782079e+01, 6.577865661168003966e+01, 7.130727037357721343e+01,
+        7.739413413465805794e+01, 8.410396085269633392e+01, 9.150986068496734448e+01, 9.969454113547704016e+01,
+        1.087516939426018897e+02, 1.187876000643037532e+02, 1.299229897614516371e+02, 1.422952015056372537e+02,
+        1.560606914665002671e+02, 1.713979549326432406e+02, 1.885109325154830073e+02, 2.076329877740125935e+02,
+        2.290315594654587370e+02, 2.530136115655676467e+02, 2.799320282398896912e+02, 3.101931299766730890e+02,
+        3.442655222107529892e+02, 3.826905303289378387e+02, 4.260945266207607701e+02, 4.752035175892902045e+02,
+        5.308604366239058864e+02, 5.940456805372995009e+02, 6.659015428338778262e+02, 7.477613367309153870e+02,
+        8.411841730471343023e+02, 9.479965698013741524e+02, 1.070342331375881840e+03, 1.210742457518582660e+03,
+        1.372167241552205820e+03, 1.558123212187692722e+03, 1.772758188662716282e+03, 2.020988485411862984e+03,
+        2.308653259329163157e+03, 2.642702189813684273e+03, 3.031424182869210212e+03, 3.484726676985756018e+03,
+        4.014477504733973505e+03, 4.634924264049394751e+03, 5.363209949773439749e+03, 6.220008412114342803e+03,
+        7.230309332853029956e+03, 8.424390216735217783e+03, 9.839022871538541787e+03, 1.151897463083113988e+04,
+        1.351888098874374202e+04, 1.590558745460066947e+04, 1.876108572764816176e+04, 2.218620462393366275e+04,
+        2.630526205054915357e+04, 3.127194401941711057e+04, 3.727675461256652923e+04, 4.455648280312273249e+04,
+        5.340626592018903930e+04, 6.419500580388918123e+04, 7.738512642386820060e+04, 9.355796993981725963e+04,
+        1.134465375820669470e+05, 1.379778272209741713e+05, 1.683277485807887053e+05, 2.059925746120735305e+05,
+        2.528822024503158254e+05, 3.114422718347725915e+05, 3.848145913435570736e+05, 4.770485864966822643e+05,
+        5.933809324724740854e+05, 7.406066190351666115e+05, 9.275730471470643372e+05, 1.165840260940180415e+06,
+        1.470566322118246135e+06, 1.861698899014921971e+06, 2.365584870298354495e+06, 3.017152695505764877e+06,
+        3.862882573599929249e+06, 4.964864305589750358e+06, 6.406362829959736606e+06, 8.299481847261302115e+06,
+        1.079575892642401854e+07, 1.410087327474604091e+07, 1.849514724418250100e+07, 2.436224419670805500e+07,
+        3.222951131863941234e+07, 4.282493882385925337e+07, 5.715793394339267637e+07, 7.663437932745451635e+07,
+        1.032212725498489699e+08, 1.396833991976194842e+08, 1.899251497664892740e+08, 2.594865396467505851e+08,
+        3.562664742464501497e+08, 4.915825413172413471e+08, 6.817316470116958142e+08, 9.502998105202541438e+08,
+        1.331598295343277538e+09, 1.875801976010459831e+09, 2.656673907709731487e+09, 3.783240215616365909e+09,
+        5.417531848500136979e+09, 7.801695369892847510e+09, 1.129965368955098833e+10, 1.646149161390821924e+10,
+        2.412353995736687694e+10, 3.556486895431927094e+10, 5.275345014093760519e+10, 7.873572108325378177e+10,
+        1.182569020317863604e+11, 1.787549442508363461e+11, 2.719633064979986142e+11, 4.165122153119897946e+11,
+        6.421781858205134197e+11, 9.968725497576275918e+11, 1.558212327122960399e+12, 2.452809984907093786e+12,
+        3.888656232828140210e+12, 6.209868990509424909e+12, 9.989924216297983665e+12, 1.619158001378611351e+13,
+        2.644324518669926559e+13, 4.352018847904374786e+13, 7.218884688202741709e+13, 1.206997640727349538e+14,
+        2.034483722445207402e+14, 3.457553102874402920e+14, 5.925248511957505706e+14, 1.024057793713038672e+15,
+        1.785174045941642162e+15, 3.139306988668494696e+15, 5.569856270174890128e+15, 9.971763353834460328e+15,
+        1.801687491114883092e+16, 3.285709858322565542e+16, 6.049018540910759710e+16, 1.124375283211369572e+17,
+        2.110445125952435305e+17, 4.000737007891229992e+17, 7.660849361564329309e+17, 1.482018770996176700e+18,
+        2.896945433910857945e+18, 5.722790165693470493e+18, 1.142689960439921462e+19, 2.306616559984106723e+19,
+        4.707857184616093863e+19, 9.717346347495342813e+19, 2.028735605622585444e+20, 4.284840254171000581e+20,
+        9.157027329021623836e+20, 1.980457834766411777e+21, 4.335604886702252004e+21, 9.609258559714223995e+21,
+        2.156604630608586997e+22, 4.902045909695270289e+22, 1.128749227121328467e+23, 2.633414623049930879e+23,
+        6.226335684490998543e+23, 1.492205279014148921e+24, 3.625768249717590109e+24, 8.933899764961444882e+24,
+        2.232786981682262383e+25, 5.661295336293986732e+25, 1.456616710298133142e+26, 3.803959852868488245e+26,
+        1.008531585603036490e+27, 2.715247425129423358e+27, 7.425071766766651967e+27, 2.062860712173225003e+28,
+        5.824055458799413312e+28, 1.671388836696436644e+29, 4.876830632023956392e+29, 1.447170071146107156e+30,
+        4.368562208925583783e+30, 1.341873806249251338e+31, 4.195251632754338682e+31, 1.335360134828214136e+32,
+        4.328681350715136340e+32, 1.429401866150319186e+33, 4.809736146227180696e+33, 1.649624114567602575e+34,
+        5.768677492419801469e+34, 2.057442854162761350e+35, 7.486423509917811063e+35, 2.780052791791155051e+36,
+        1.053908347660081874e+37, 4.080046334235754223e+37, 1.613553311592805373e+38, 6.520836332997615098e+38,
+        2.693848186257510992e+39, 1.138002408430710800e+40, 4.917748008813924613e+40, 2.174691073191358676e+41,
+        9.844523745430526502e+41, 4.563707467590116732e+42, 2.167352073708379137e+43, 1.054860193887170754e+44,
+        5.263588225566847365e+44, 2.693772458797916623e+45, 1.414506760560163074e+46, 7.624126763512016620e+46,
+        4.219828148762794411e+47, 2.399387665831793264e+48, 1.402139947254117434e+49, 8.424706325525422943e+49,
+        5.206918479942619318e+50, 3.311787866477716151e+51, 2.168683295509859155e+52, 1.462786368779206713e+53,
+        1.016761784575838363e+54, 7.286460995145043184e+54, 5.386194237448865407e+55, 4.108917480528740640e+56,
+        3.236445625945552728e+57, 2.633440652417619669e+58, 2.214702339357939268e+59, 1.926058995948268392e+60,
+        1.733067740414174932e+61, 1.614307160124426969e+62, 1.557464328486352138e+63, 1.557226155197192031e+64,
+        1.614473962707995344e+65, 1.736617406327386105e+66, 1.939201243451190521e+67, 2.249277732936622876e+68,
+        2.711593798719765599e+69, 3.399628732048687119e+70, 4.435389696730206291e+71, 6.025566076164003981e+72,
+        8.529161425383779849e+73, 1.258746322992988688e+75, 1.938112175186560210e+76, 3.115432363572610661e+77,
+        5.231797674434390018e+78, 9.184930207860680757e+79, 1.686929404780378772e+81, 3.243565624474232635e+82,
+        6.533812498930220075e+83, 1.379898823144620314e+85, 3.057650444842839916e+86, 7.114050545839171245e+87,
+        1.739275024442258674e+89, 4.471782915853177804e+90, 1.210036789494028144e+92, 3.448828044590862359e+93,
+        1.036226783750561565e+95, 3.284801914751206038e+96, 1.099514933602224638e+98, 3.889581731378242597e+99,
+        1.455434287901069991e+101, 5.765729934387419019e+102, 2.420349568745475582e+104, 1.077606625929777536e+106,
+        5.093346988695851845e+107, 2.558090824110323997e+109, 1.366512508719047964e+111, 7.771735800763526406e+112,
+        4.710398638793014918e+114, 3.045563885587013954e+116, 2.102762552861442993e+118, 1.551937536212596136e+120,
+        1.225676354426075970e+122, 1.036950946169703711e+124, 9.407885268970827717e+125, 9.163369107785093171e+127,
+        9.592531095671168926e+129, 1.080486293361823875e+132, 1.311034829557782450e+134, 1.715642975932639188e+136,
+        2.424231742707881878e+138, 3.703231223333127919e+140, 6.123225027409988902e+142, 1.097271040771196765e+145,
+        2.133693643241295977e+147, 4.508099184895777328e+149, 1.036252806686291189e+152, };
+
+__constant__ double* m_abscissas_double[8] = {
+    m_abscissas_double_1,
+    m_abscissas_double_2,
+    m_abscissas_double_3,
+    m_abscissas_double_4,
+    m_abscissas_double_5,
+    m_abscissas_double_6,
+    m_abscissas_double_7,
+    m_abscissas_double_8,
+};
+
+__constant__ double m_weights_double_1[6] =
+      { 7.868241604839621507e+00, 8.805163880733011116e+02, 5.396278323520705668e+07, 8.876511896968161317e+19,
+        2.432791879269225553e+52, 6.399713512080202911e+139, };
+
+__constant__ double m_weights_double_2[6] =
+      { 2.398524276302635218e+00, 5.244596423726681022e+01, 6.457887819598201760e+04, 2.509985242511374506e+12,
+        1.774029269327138701e+32, 2.781406115983097314e+85, };
+
+__constant__ double m_weights_double_3[12] =
+      { 1.749369583108386852e+00, 3.979658981934607813e+00, 1.848514598574449570e+01, 1.864880718932067988e+02,
+        5.974205695263265855e+03, 1.270412635144623341e+06, 6.164193014295984071e+09, 5.230850031811222530e+15,
+        2.226260929943369774e+25, 1.199931102042181592e+41, 7.470602144275146214e+66, 1.814465860528410676e+109, };
+
+__constant__ double m_weights_double_4[24] =
+      { 1.613859062188366173e+00, 1.997767291869673262e+00, 3.020231979908834220e+00, 5.477641843859057761e+00,
+        1.179660916492671672e+01, 3.035504848518598294e+01, 9.584421793794920860e+01, 3.893870238229992076e+02,
+        2.179193250357911344e+03, 1.839208123964132852e+04, 2.632120612599856167e+05, 7.427296507169468210e+06,
+        5.015875648341232356e+08, 1.039610867241544113e+11, 9.100328911818091977e+13, 5.068651163890231571e+17,
+        3.039966520714902616e+22, 3.857740194672007962e+28, 2.465542763666581087e+36, 2.416439449167799461e+46,
+        1.517091553926604149e+59, 3.825043412021411380e+75, 4.089582396821598640e+96, 3.823775894295564050e+123, };
+
+__constant__ double m_weights_double_5[49] =
+      { 1.581465959536694744e+00, 1.669149910438534746e+00, 1.857523188595005770e+00, 2.175662623626994120e+00,
+        2.675901375211020564e+00, 3.447738682498791744e+00, 4.643946540355464126e+00, 6.530204496574248616e+00,
+        9.582285015566804961e+00, 1.468361407515440960e+01, 2.354449548740987533e+01, 3.963527273305166705e+01,
+        7.037635206267538547e+01, 1.325880124784838868e+02, 2.669625649541569172e+02, 5.793749198508472676e+02,
+        1.368691928321303605e+03, 3.559435721533130554e+03, 1.032186677270763318e+04, 3.386621302858741487e+04,
+        1.278166259840246830e+05, 5.654082513926693098e+05, 2.994462044781721833e+06, 1.944975023421914947e+07,
+        1.592193007690560588e+08, 1.694288818617459913e+09, 2.427156182311303271e+10, 4.870317848199455490e+11,
+        1.431819656229181793e+13, 6.489471523099301256e+14, 4.803757752508989106e+16, 6.200096361305331541e+18,
+        1.502568562439914899e+21, 7.436061367189688251e+23, 8.264761218677928603e+26, 2.297735027897804345e+30,
+        1.805449779569534997e+34, 4.604472360199061931e+38, 4.458371212030626854e+43, 1.957638261114809309e+49,
+        4.767368137162500764e+55, 8.088820139476721285e+62, 1.238260897349286357e+71, 2.292272505278842062e+80,
+        7.151392373749193549e+90, 5.476714850156044431e+102, 1.576655618370700681e+116, 2.765448595957851958e+131,
+        5.108051255283132673e+148, };
+
+__constant__ double m_weights_double_6[98] =
+      { 1.573457773573108386e+00, 1.594892755038663787e+00, 1.638536515530234742e+00, 1.705980408212213620e+00,
+        1.799724394608737275e+00, 1.923322854425656307e+00, 2.081597373313268178e+00, 2.280934883790070511e+00,
+        2.529697852387704655e+00, 2.838784782552951185e+00, 3.222395745020980612e+00, 3.699081358854235112e+00,
+        4.293188274330526800e+00, 5.036865356322330076e+00, 5.972871140910932199e+00, 7.158538424311077564e+00,
+        8.671427800892076385e+00, 1.061747360297922326e+01, 1.314285002260235600e+01, 1.645145625668428040e+01,
+        2.083099449998189069e+01, 2.669235989791640190e+01, 3.462993514791378189e+01, 4.551518362653662579e+01,
+        6.064408087764392116e+01, 8.197296917485846798e+01, 1.125020468081652564e+02, 1.569096552844714123e+02,
+        2.226204347868638276e+02, 3.216385489504077755e+02, 4.737574505945461739e+02, 7.122994548146997637e+02,
+        1.094609652686376553e+03, 1.721697789176049576e+03, 2.775924909253835146e+03, 4.595230066268149347e+03,
+        7.823427586641573672e+03, 1.372357435269105405e+04, 2.485188961645119553e+04, 4.655538745425972783e+04,
+        9.041766782135686884e+04, 1.824843964862728392e+05, 3.836800264094614027e+05, 8.426271970245168026e+05,
+        1.938432574158782634e+06, 4.685112849356485528e+06, 1.193528667218607927e+07, 3.215643752247989316e+07,
+        9.196008928386600386e+07, 2.802223178457559964e+08, 9.136110825267458886e+08, 3.200910900783148591e+09,
+        1.210765264234723689e+10, 4.969024745093101808e+10, 2.224315751863855216e+11, 1.092125344449313660e+12,
+        5.916882980019919359e+12, 3.559743438494577249e+13, 2.394353652945465191e+14, 1.813551073517501917e+15,
+        1.558736706166165738e+16, 1.532714875555114333e+17, 1.739274776190789212e+18, 2.298841216802216313e+19,
+        3.574030698837762664e+20, 6.604899705451419080e+21, 1.467155879591820659e+23, 3.964094964398509381e+24,
+        1.319342840595348793e+26, 5.482251971340400742e+27, 2.885137894723827518e+29, 1.952539840765392110e+31,
+        1.727051489032222797e+33, 2.031343507095439396e+35, 3.236074146972599980e+37, 7.120487412983497200e+39,
+        2.209552707411017265e+42, 9.886282647791384648e+44, 6.530514048788273529e+47, 6.530706672481546528e+50,
+        1.015518807431281951e+54, 2.526366773162394510e+57, 1.036450519906790297e+61, 7.241966032627135861e+64,
+        8.919402520769714938e+68, 2.008463619152992905e+73, 8.596914764830260020e+77, 7.290599546829495220e+82,
+        1.280199563216419112e+88, 4.878349285603201150e+93, 4.240828248064127940e+99, 8.869771764721598720e+105,
+        4.723342575741417669e+112, 6.802035963326188581e+119, 2.824531180990009549e+127, 3.621049216745982252e+135,
+        1.541270150334942520e+144, 2.353376995174362785e+153, };
+
+__constant__ double m_weights_double_7[196] =
+      { 1.571461316550783294e+00, 1.576790166316938345e+00, 1.587495640370383316e+00, 1.603673956341370210e+00,
+        1.625471125457493943e+00, 1.653085011915939302e+00, 1.686768142525911236e+00, 1.726831323537516202e+00,
+        1.773648138667236602e+00, 1.827660421478661448e+00, 1.889384817044018196e+00, 1.959420572855037091e+00,
+        2.038458728047908923e+00, 2.127292904083847225e+00, 2.226831940199076941e+00, 2.338114664555130296e+00,
+        2.462327148722991304e+00, 2.600822860927085164e+00, 2.755146214814554359e+00, 2.927060108424483555e+00,
+        3.118578166240921951e+00, 3.332002540339506630e+00, 3.569968300410740276e+00, 3.835495653996447262e+00,
+        4.132051496512934885e+00, 4.463622106699067881e+00, 4.834799191008006557e+00, 5.250881957765679608e+00,
+        5.717998490875333124e+00, 6.243250421598568105e+00, 6.834885801226541839e+00, 7.502506202789340802e+00,
+        8.257315484493544201e+00, 9.112419405864642634e+00, 1.008318749543997758e+01, 1.118769134993865202e+01,
+        1.244723705914106881e+01, 1.388701390605507587e+01, 1.553688715915900190e+01, 1.743237000680942831e+01,
+        1.961581894823993424e+01, 2.213790886354273806e+01, 2.505945934677137610e+01, 2.845370377742137561e+01,
+        3.240911845969524834e+01, 3.703296289480230161e+01, 4.245572644746267911e+01, 4.883673480337985582e+01,
+        5.637124640586975420e+01, 6.529947092752610340e+01, 7.591807755694122837e+01, 8.859494252391663822e+01,
+        1.037881295005788124e+02, 1.220704263969226746e+02, 1.441612098131200535e+02, 1.709680191245773511e+02,
+        2.036410593843575570e+02, 2.436450058708723643e+02, 2.928540812182076105e+02, 3.536786019152253392e+02,
+        4.292343083967296939e+02, 5.235701840488733027e+02, 6.419766898003024575e+02, 7.914052083668759283e+02,
+        9.810422089081931637e+02, 1.223099994999740393e+03, 1.533912555427112127e+03, 1.935464013605830339e+03,
+        2.457534549912886852e+03, 3.140733731623635519e+03, 4.040818188564651898e+03, 5.234881599712225681e+03,
+        6.830294457607329226e+03, 8.977713228649887143e+03, 1.189015920967326839e+04, 1.587122387044346962e+04,
+        2.135711106445789331e+04, 2.897983705189681437e+04, 3.966306726795547950e+04, 5.476875193750000787e+04,
+        7.632356539388055680e+04, 1.073719149754976951e+05, 1.525316674555574152e+05, 2.188778434744216586e+05,
+        3.173624496019295608e+05, 4.651201525869328462e+05, 6.892537656280580572e+05, 1.033119885120019982e+06,
+        1.566887981043252499e+06, 2.405492027026531795e+06, 3.739528964815910340e+06, 5.889121154895580032e+06,
+        9.399046351922342030e+06, 1.520903276129653518e+07, 2.496287187293576168e+07, 4.157759259963074840e+07,
+        7.030705366950267312e+07, 1.207598558452493366e+08, 2.107882509464846833e+08, 3.741047199023457864e+08,
+        6.754494594987415572e+08, 1.241316740415880537e+09, 2.323310032649552862e+09, 4.431176019026625759e+09,
+        8.617446487400900130e+09, 1.709836906604031513e+10, 3.463574521880171339e+10, 7.167607123799270726e+10,
+        1.516347620910054079e+11, 3.281729323238950526e+11, 7.271102600298280790e+11, 1.650499552378780378e+12,
+        3.841338149508803917e+12, 9.173744267785176575e+12, 2.249901946357519979e+13, 5.671535089900611731e+13,
+        1.470742250307697019e+14, 3.927012518464311775e+14, 1.080639977391212820e+15, 3.067671466720475189e+15,
+        8.992386789198328428e+15, 2.724722536524592111e+16, 8.542946122263389258e+16, 2.774613718725574755e+17,
+        9.345299479382029121e+17, 3.267996122987731882e+18, 1.187914433455468315e+19, 4.494053408418564214e+19,
+        1.771706652195486743e+20, 7.288102552885931527e+20, 3.132512430816625349e+21, 1.408743767951073110e+22,
+        6.638294268236060414e+22, 3.282543608403565013e+23, 1.705920098038394064e+24, 9.332259385148524285e+24,
+        5.382727175874888312e+25, 3.278954235122093249e+26, 2.113191697957458099e+27, 1.443411041499643040e+28,
+        1.046864394654982423e+29, 8.077319226958905700e+29, 6.643146963432616277e+30, 5.835670121359986260e+31,
+        5.486890296790230798e+32, 5.533726968508261614e+33, 5.999734996418352834e+34, 7.009176119466122569e+35,
+        8.844061966424597499e+36, 1.208226860869605961e+38, 1.791648514311063338e+39, 2.891313916713205762e+40,
+        5.091457860211527298e+41, 9.810630588402496553e+42, 2.074441239147378860e+44, 4.827650116937700540e+45,
+        1.240287939111549029e+47, 3.528782858644784616e+48, 1.115449490471696659e+50, 3.930510643328196314e+51,
+        1.549243712957852337e+53, 6.854998238041301002e+54, 3.417479961583207704e+56, 1.926905498641079990e+58,
+        1.233580963004919450e+60, 9.002819902898076915e+61, 7.521415141253441645e+63, 7.224277554900578993e+65,
+        8.012832830535078610e+67, 1.030999620286380369e+70, 1.546174957076748679e+72, 2.715803772613248694e+74,
+        5.615089920571746438e+76, 1.373667859345343337e+79, 3.997541020769625126e+81, 1.391500589339800087e+84,
+        5.826693844912022892e+86, 2.952274820929549096e+89, 1.821023061478466282e+92, 1.375973022137941526e+95,
+        1.281852367543412945e+98, 1.482130127201990503e+101, 2.141574273792435314e+104, 3.894495540947112380e+107,
+        8.978646362580102961e+110, 2.644131589807244050e+114, 1.002403539841913834e+118, 4.931412804903905259e+121,
+        3.174401112435865044e+125, 2.696624001761892390e+129, 3.049799322320447166e+133, 4.634041526818687785e+137,
+        9.548983134803106512e+141, 2.694404866192089829e+146, 1.051502720036395325e+151, 5.734170640626244955e+155, };
+
+__constant__ double m_weights_double_8[391] =
+      { 1.570962550997832611e+00, 1.572292902367211961e+00, 1.574956581912666755e+00, 1.578959553636163985e+00,
+        1.584310789563614305e+00, 1.591022301117035107e+00, 1.599109181186160337e+00, 1.608589657109067468e+00,
+        1.619485154826419743e+00, 1.631820374530739318e+00, 1.645623378191125679e+00, 1.660925689395424109e+00,
+        1.677762406016463717e+00, 1.696172326277082973e+00, 1.716198088860732467e+00, 1.737886327791014562e+00,
+        1.761287842885152410e+00, 1.786457786673686420e+00, 1.813455868772335587e+00, 1.842346578792652542e+00,
+        1.873199428986627521e+00, 1.906089217937612619e+00, 1.941096316736779451e+00, 1.978306979221816566e+00,
+        2.017813678003844337e+00, 2.059715468170813895e+00, 2.104118380732327493e+00, 2.151135848063375554e+00,
+        2.200889163814591418e+00, 2.253507979986114202e+00, 2.309130844113053375e+00, 2.367905779785113334e+00,
+        2.429990914023652954e+00, 2.495555155369085590e+00, 2.564778926893134514e+00, 2.637854958747451684e+00,
+        2.714989145296268067e+00, 2.796401472360280536e+00, 2.882327020626578700e+00, 2.973017051860293803e+00,
+        3.068740185193628238e+00, 3.169783671473487386e+00, 3.276454774427328601e+00, 3.389082268266156098e+00,
+        3.508018062292869136e+00, 3.633638964133530274e+00, 3.766348594369884204e+00, 3.906579466636309289e+00,
+        4.054795248667541120e+00, 4.211493221360917802e+00, 4.377206954666462219e+00, 4.552509221059946388e+00,
+        4.738015169510782826e+00, 4.934385785253587887e+00, 5.142331663338191074e+00, 5.362617126899976224e+00,
+        5.596064724397100194e+00, 5.843560143744373307e+00, 6.106057585381734693e+00, 6.384585640900671436e+00,
+        6.680253728973824449e+00, 6.994259146058412709e+00, 7.327894795748901060e+00, 7.682557667824588764e+00,
+        8.059758146071137270e+00, 8.461130232962342889e+00, 8.888442789395671080e+00, 9.343611899025485155e+00,
+        9.828714479494622022e+00, 1.034600327721380625e+01, 1.089792339849122916e+01, 1.148713054801325790e+01,
+        1.211651116619788555e+01, 1.278920468010096321e+01, 1.350862810871281096e+01, 1.427850329305334421e+01,
+        1.510288705493181327e+01, 1.598620462612703196e+01, 1.693328673269081128e+01, 1.794941076780000506e+01,
+        1.904034654190823159e+01, 2.021240716182964334e+01, 2.147250566192247370e+01, 2.282821809199713505e+01,
+        2.428785385941680425e+01, 2.586053422878117785e+01, 2.755628000354674426e+01, 2.938610955221109564e+01,
+        3.136214849990951329e+01, 3.349775258749912582e+01, 3.580764540799625468e+01, 3.830807296872530167e+01,
+        4.101697730155473447e+01, 4.395419165876113623e+01, 4.714166019494196927e+01, 5.060368545366659226e+01,
+        5.436720746019445252e+01, 5.846211877912138439e+01, 6.292162054058128784e+01, 6.778262518512416663e+01,
+        7.308621254265223015e+01, 7.887814686488147292e+01, 8.520946359734658334e+01, 9.213713603387774717e+01,
+        9.972483357670754649e+01, 1.080437851679046426e+02, 1.171737636088621692e+02, 1.272042089988687372e+02,
+        1.382355124664102373e+02, 1.503804848151483311e+02, 1.637660387526102742e+02, 1.785351181233383403e+02,
+        1.948489131607280604e+02, 2.128894073598352670e+02, 2.328623093447990790e+02, 2.550004322843281994e+02,
+        2.795675942672445782e+02, 3.068631259124280934e+02, 3.372270867451200874e+02, 3.710463099965576255e+02,
+        4.087614170466174911e+02, 4.508749684194593670e+02, 4.979609488959773491e+02, 5.506758209385785877e+02,
+        6.097714244663179092e+02, 6.761100535726473685e+02, 7.506821038741422446e+02, 8.346267600518081192e+02,
+        9.292562845315541998e+02, 1.036084578498234728e+03, 1.156860819661897657e+03, 1.293609142453808600e+03,
+        1.448675521854205144e+03, 1.624783259532197615e+03, 1.825098759915318560e+03, 2.053309635972617554e+03,
+        2.313717614494777200e+03, 2.611349236640186999e+03, 2.952087994093624299e+03, 3.342832332560548180e+03,
+        3.791684927756595099e+03, 4.308179838716318955e+03, 4.903555624570201673e+03, 5.591084343634811452e+03,
+        6.386468625571246341e+03, 7.308321829412979440e+03, 8.378749812799703561e+03, 9.624057218749638059e+03,
+        1.107560666191146008e+04, 1.277086605445904388e+04, 1.475468792019489452e+04, 1.708087537417066343e+04,
+        1.981410309695485051e+04, 2.303227888204754908e+04, 2.682945317928632535e+04, 3.131941178398428200e+04,
+        3.664012209706997997e+04, 4.295924836668690170e+04, 5.048100882639843572e+04, 5.945472133180055290e+04,
+        7.018547875172689579e+04, 8.304751726175694003e+04, 9.850099805053575446e+04, 1.171131266261766060e+05,
+        1.395847982160589845e+05, 1.667843016393077556e+05, 1.997900626520524686e+05, 2.399449946032992187e+05,
+        2.889257939838013232e+05, 3.488315309194304548e+05, 4.222972201496778447e+05, 5.126398246369253619e+05,
+        6.240464876221989792e+05, 7.618179073233615941e+05, 9.326839300224119257e+05, 1.145214007774297539e+06,
+        1.410352646274233119e+06, 1.742120041875863385e+06, 2.158531716934287014e+06, 2.682809410126426731e+06,
+        3.344980563595418861e+06, 4.183997972337706048e+06, 5.250558008165501752e+06, 6.610860174141680988e+06,
+        8.351639423967558693e+06, 1.058692532393929900e+07, 1.346715235106239409e+07, 1.719148271024263021e+07,
+        2.202453449027701694e+07, 2.831917301724337797e+07, 3.654767820268344932e+07, 4.734452657230626106e+07,
+        6.156534063509513873e+07, 8.036843026897869248e+07, 1.053280284359690289e+08, 1.385921689084126286e+08,
+        1.831036985925683524e+08, 2.429109457458640820e+08, 3.236062393759667463e+08, 4.329475218599986663e+08,
+        5.817432967962929479e+08, 7.851179789388191786e+08, 1.064329197627075307e+09, 1.449389582912945485e+09,
+        1.982866469377991849e+09, 2.725414314698094324e+09, 3.763867964111621444e+09, 5.223138814950990937e+09,
+        7.283785810644397704e+09, 1.020809642381158743e+10, 1.437899318470510521e+10, 2.035836812543633578e+10,
+        2.897499827080027444e+10, 4.145773751645494878e+10, 5.963837683872426287e+10, 8.626228483915530800e+10,
+        1.254667045389825180e+11, 1.835212982264913186e+11, 2.699812207400151604e+11, 3.994928452151922954e+11,
+        5.946380558701434550e+11, 8.904409967424091107e+11, 1.341551941677775838e+12, 2.033768550332151892e+12,
+        3.102627959875753214e+12, 4.763598321705862063e+12, 7.361420360560813584e+12, 1.145126961456557423e+13,
+        1.793314186996273926e+13, 2.827585501285792232e+13, 4.489297053678444669e+13, 7.177802872658499571e+13,
+        1.155855098545820625e+14, 1.874833886367883093e+14, 3.063510356402174454e+14, 5.043400653005970242e+14,
+        8.366163396892429890e+14, 1.398556351640947289e+15, 2.356335749516164682e+15, 4.001765167382637456e+15,
+        6.851375128404941445e+15, 1.182690111761543990e+16, 2.058673527013806443e+16, 3.613968784314904633e+16,
+        6.399112184394213551e+16, 1.143016185628376923e+17, 2.059881383915666443e+17, 3.745846788353680914e+17,
+        6.874443034683149068e+17, 1.273407643613485314e+18, 2.381241916829895366e+18, 4.495835617307108399e+18,
+        8.571442024901952701e+18, 1.650443584181656965e+19, 3.210100352421317851e+19, 6.307780124442703091e+19,
+        1.252404031157661279e+20, 2.513005295649985394e+20, 5.096776255690838436e+20, 1.045019200016673046e+21,
+        2.166476479260878466e+21, 4.542138145678395463e+21, 9.632082324449137128e+21, 2.066386536688254528e+22,
+        4.485529785554428251e+22, 9.853879573610977508e+22, 2.191158874464374408e+23, 4.932835964390971668e+23,
+        1.124501529971774363e+24, 2.596269136156756008e+24, 6.072292938313625501e+24, 1.438989066308003836e+25,
+        3.455841956406570469e+25, 8.412655191713576490e+25, 2.076289061650816510e+26, 5.196515024640220322e+26,
+        1.319173194089644043e+27, 3.397455895980380794e+27, 8.879057454438503591e+27, 2.355272361492064126e+28,
+        6.342762007722624824e+28, 1.734531093990859705e+29, 4.817893170606830871e+29, 1.359597346490148232e+30,
+        3.898969689906500392e+30, 1.136542986529989936e+31, 3.368450043991780017e+31, 1.015304084709817260e+32,
+        3.113144376221918237e+32, 9.713072739730140403e+32, 3.084517643581725946e+33, 9.972682139820497284e+33,
+        3.283625052288491586e+34, 1.101378785390827536e+35, 3.764333367592714297e+35, 1.311403465938242926e+36,
+        4.658135710682813672e+36, 1.687517347470511392e+37, 6.237053685018323490e+37, 2.352571314427744869e+38,
+        9.058938240219699936e+38, 3.562249097611136071e+39, 1.430959291578558210e+40, 5.873974584984375049e+40,
+        2.464828549811283787e+41, 1.057649203090855628e+42, 4.642475639281078035e+42, 2.085287118272421779e+43,
+        9.588439985186632177e+43, 4.514982011246092280e+44, 2.177974048341973204e+45, 1.076720976822900458e+46,
+        5.457267432929085589e+46, 2.836869270455781134e+47, 1.513103201392011626e+48, 8.283974667225617075e+48,
+        4.657239491995971344e+49, 2.689796370712836937e+50, 1.596597846911970388e+51, 9.744154538256586629e+51,
+        6.117238394843313065e+52, 3.952049650585241827e+53, 2.628701592074258213e+54, 1.800990196502679393e+55,
+        1.271554462563068383e+56, 9.255880104477760711e+56, 6.949737920133919393e+57, 5.385167200769965621e+58,
+        4.308493668102978774e+59, 3.560951557542178371e+60, 3.041888528384649992e+61, 2.687094441930837189e+62,
+        2.455920538900000855e+63, 2.323648254168641537e+64, 2.277129741584892331e+65, 2.312633552913224734e+66,
+        2.435407592981291129e+67, 2.660910388822465246e+68, 3.018105943423533920e+69, 3.555823489510192503e+70,
+        4.354188877793849013e+71, 5.544975795511813315e+72, 7.348276481909886336e+73, 1.013998025722423261e+75,
+        1.457911462244607943e+76, 2.185488876819505295e+77, 3.418022153286623008e+78, 5.580843920601835728e+79,
+        9.519586502799733908e+80, 1.697573578247197786e+82, 3.166906670990180014e+83, 6.185099106418675430e+84,
+        1.265541134386934377e+86, 2.714828965877756899e+87, 6.110386802964494082e+88, 1.444054086171083239e+90,
+        3.586083726638388165e+91, 9.365231868063239600e+92, 2.574080116205122449e+94, 7.452134689862302719e+95,
+        2.274309903836169819e+97, 7.323011134121164749e+98, 2.489816421737932462e+100, 8.946533386359281588e+101,
+        3.400401372391165979e+103, 1.368288186208928217e+105, 5.834277489829591931e+106, 2.638486937672383424e+108,
+        1.266728882767139521e+110, 6.462225178314182803e+111, 3.506432320607573604e+113, 2.025608933943268165e+115,
+        1.247041677084784707e+117, 8.189865188405279038e+118, 5.743610894406099965e+120, 4.305808934084489763e+122,
+        3.454156966079496755e+124, 2.968316601530352737e+126, 2.735456242372183592e+128, 2.706317176690077847e+130,
+        2.877679916342060385e+132, 3.292412878268106390e+134, 4.057840961953725969e+136, 5.393783049105737324e+138,
+        7.741523901672235406e+140, 1.201209962310668456e+143, 2.017456079556807301e+145, 3.672176623483062526e+147,
+        7.253163798058577630e+149, 1.556591535302570570e+152, 3.634399832790394885e+154, };
+
+__constant__ double* m_weights_double[8] = {
+    m_weights_double_1,
+    m_weights_double_2,
+    m_weights_double_3,
+    m_weights_double_4,
+    m_weights_double_5,
+    m_weights_double_6,
+    m_weights_double_7,
+    m_weights_double_8
+};
+__constant__ boost::math::size_t float_coefficients_size[8] = {4, 4, 8, 16, 32, 65, 129, 259};
+
+__constant__ boost::math::size_t double_coefficients_size[8] = {6, 6, 12, 24, 49, 98, 196, 391};
+
+template<typename T>
+struct coefficients_selector;
+
+template<>
+struct coefficients_selector<float>
+{
+    __device__ static const auto abscissas() { return m_abscissas_float; }
+    __device__ static const auto weights() { return m_weights_float; }
+    __device__ static const auto size() { return float_coefficients_size; }
+};
+
+template<>
+struct coefficients_selector<double>
+{
+    __device__ static const auto abscissas() { return m_abscissas_double; }
+    __device__ static const auto weights() { return m_weights_double; }
+    __device__ static const auto size() { return double_coefficients_size; }
+};
+
+template <class F, class Real, class Policy = boost::math::policies::policy<> >
+__device__ auto sinh_sinh_integrate_impl(const F& f, Real tolerance, Real* error, Real* L1, boost::math::size_t* levels)
+{
+    BOOST_MATH_STD_USING
+    using boost::math::constants::half;
+    using boost::math::constants::half_pi;
+    using boost::math::size_t;
+
+    constexpr auto function = "boost::math::quadrature::sinh_sinh<%1%>::integrate";
+
+    using K = decltype(f(static_cast<Real>(0)));
+    static_assert(!boost::math::is_integral<K>::value,
+                  "The return type cannot be integral, it must be either a real or complex floating point type.");
+
+    K y_max = f(boost::math::tools::max_value<Real>());
+    
+    if(abs(y_max) > boost::math::tools::epsilon<Real>())
+    {
+        return static_cast<K>(policies::raise_domain_error(function,
+           "The function you are trying to integrate does not go to zero at infinity, and instead evaluates to %1%", y_max, Policy()));
+    }
+
+    K y_min = f(-boost::math::tools::max_value<Real>());
+    
+    if(abs(y_min) > boost::math::tools::epsilon<Real>())
+    {
+        return static_cast<K>(policies::raise_domain_error(function,
+           "The function you are trying to integrate does not go to zero at -infinity, and instead evaluates to %1%", y_max, Policy()));
+    }
+
+    // Get the party started with two estimates of the integral:
+    const auto m_abscissas = coefficients_selector<Real>::abscissas();
+    const auto m_weights = coefficients_selector<Real>::weights();
+    const auto m_size = coefficients_selector<Real>::size();
+
+    K I0 = f(0)*half_pi<Real>();
+    Real L1_I0 = abs(I0);
+    for(size_t i = 0; i < m_size[0]; ++i)
+    {
+        Real x = m_abscissas[0][i];
+        K yp = f(x);
+        K ym = f(-x);
+        I0 += (yp + ym)*m_weights[0][i];
+        L1_I0 += (abs(yp)+abs(ym))*m_weights[0][i];
+    }
+
+    K I1 = I0;
+    Real L1_I1 = L1_I0;
+    for (size_t i = 0; i < m_size[1]; ++i)
+    {
+        Real x= m_abscissas[1][i];
+        K yp = f(x);
+        K ym = f(-x);
+        I1 += (yp + ym)*m_weights[1][i];
+        L1_I1 += (abs(yp) + abs(ym))*m_weights[1][i];
+    }
+
+    I1 *= half<Real>();
+    L1_I1 *= half<Real>();
+    Real err = abs(I0 - I1);
+
+    size_t i = 2;
+    for(; i <= 8U; ++i)
+    {
+        I0 = I1;
+        L1_I0 = L1_I1;
+
+        I1 = half<Real>()*I0;
+        L1_I1 = half<Real>()*L1_I0;
+        Real h = static_cast<Real>(1) / static_cast<Real>(1 << i);
+        K sum = 0;
+        Real absum = 0;
+
+        Real abterm1 = 1;
+        Real eps = boost::math::tools::epsilon<Real>()*L1_I1;
+
+        auto abscissa_row = m_abscissas[i];
+        auto weight_row = m_weights[i];
+
+        for(size_t j = 0; j < m_size[i]; ++j)
+        {
+            Real x = abscissa_row[j];
+            K yp = f(x);
+            K ym = f(-x);
+            sum += (yp + ym)*weight_row[j];
+            Real abterm0 = (abs(yp) + abs(ym))*weight_row[j];
+            absum += abterm0;
+
+            // We require two consecutive terms to be < eps in case we hit a zero of f.
+            if (x > static_cast<Real>(100) && abterm0 < eps && abterm1 < eps)
+            {
+                break;
+            }
+            abterm1 = abterm0;
+        }
+
+        I1 += sum*h;
+        L1_I1 += absum*h;
+        err = abs(I0 - I1);
+
+        if (!(boost::math::isfinite)(L1_I1))
+        {
+            constexpr auto err_msg = "The sinh_sinh quadrature evaluated your function at a singular point, leading to the value %1%.\n"
+               "sinh_sinh quadrature cannot handle singularities in the domain.\n"
+               "If you are sure your function has no singularities, please submit a bug against boost.math\n";
+            return static_cast<K>(policies::raise_evaluation_error(function, err_msg, I1, Policy()));
+        }
+        if (err <= tolerance*L1_I1)
+        {
+            break;
+        }
+    }
+
+    if (error)
+    {
+        *error = err;
+    }
+
+    if (L1)
+    {
+        *L1 = L1_I1;
+    }
+
+    if (levels)
+    {
+       *levels = i;
+    }
+
+    return I1;
+}
+
+} // Namespace detail
+} // Namespace quadrature
+} // Namespace math
+} // Namespace boost
+
+#endif // BOOST_MATH_ENABLE_CUDA
+
+#endif // BOOST_MATH_QUADRATURE_DETAIL_SINH_SINH_DETAIL_HPP
diff --git a/inst/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp b/inst/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp
index 6f5be06f5..47961423b 100644
--- a/inst/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp
+++ b/inst/include/boost/math/quadrature/detail/tanh_sinh_detail.hpp
@@ -15,7 +15,7 @@
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/tools/config.hpp>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <mutex>
 #endif
 
@@ -54,7 +54,7 @@ class tanh_sinh_detail
 private:
    const std::vector<Real>& get_abscissa_row(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -67,7 +67,7 @@ class tanh_sinh_detail
    }
    const std::vector<Real>& get_weight_row(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -80,7 +80,7 @@ class tanh_sinh_detail
    }
    std::size_t get_first_complement_index(std::size_t n)const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() < n)
          extend_refinements();
       BOOST_MATH_ASSERT(m_committed_refinements.load() >= n);
@@ -102,13 +102,13 @@ class tanh_sinh_detail
    void prune_to_min_complement(const Real& m);
    void extend_refinements()const
    {
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       std::lock_guard<std::mutex> guard(m_mutex);
 #endif
       //
       // Check some other thread hasn't got here after we read the atomic variable, but before we got here:
       //
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       if (m_committed_refinements.load() >= m_max_refinements)
          return;
 #else
@@ -119,7 +119,7 @@ class tanh_sinh_detail
       using std::ldexp;
       using std::ceil;
       ++m_committed_refinements;
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
       std::size_t row = m_committed_refinements.load();
 #else
       std::size_t row = m_committed_refinements;
@@ -178,7 +178,7 @@ class tanh_sinh_detail
    mutable std::vector<std::vector<Real>> m_weights;
    mutable std::vector<std::size_t>       m_first_complements;
    std::size_t                       m_max_refinements, m_inital_row_length{};
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    mutable boost::math::detail::atomic_unsigned_type      m_committed_refinements{};
    mutable std::mutex m_mutex;
 #else
@@ -607,7 +607,7 @@ void tanh_sinh_detail<Real, Policy>::init(const Real& min_complement, const std:
    temp[m_inital_row_length] = weight_at_t(m_t_max);
    m_weights[0].swap(temp);
 
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    for (std::size_t row = 1; row <= m_committed_refinements.load(); ++row)
 #else
    for (std::size_t row = 1; row <= m_committed_refinements; ++row)
@@ -668,7 +668,7 @@ void tanh_sinh_detail<Real, Policy>::init(const Real& min_complement, const std:
    m_first_complements = {
       1, 0, 1, 1, 3, 5, 11, 22,
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_abscissas.size() - 1);
 #else
    m_committed_refinements = m_abscissas.size() - 1;
@@ -721,7 +721,7 @@ void tanh_sinh_detail<Real, Policy>::init(const Real& min_complement, const std:
    m_first_complements = {
       1, 0, 1, 1, 3, 5, 11, 22,
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_abscissas.size() - 1);
 #else
    m_committed_refinements = m_abscissas.size() - 1;
@@ -773,7 +773,7 @@ void tanh_sinh_detail<Real, Policy>::init(const Real& min_complement, const std:
    m_first_complements = {
       1, 0, 1, 1, 3, 5, 11, 22,
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_abscissas.size() - 1);
 #else
    m_committed_refinements = m_abscissas.size() - 1;
@@ -827,7 +827,7 @@ void tanh_sinh_detail<Real, Policy>::init(const Real& min_complement, const std:
    m_first_complements = {
       1, 0, 1, 1, 3, 5, 11, 22,
    };
-#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_ATOMIC_INT) && defined(BOOST_MATH_HAS_THREADS)
    m_committed_refinements = static_cast<boost::math::detail::atomic_unsigned_integer_type>(m_abscissas.size() - 1);
 #else
    m_committed_refinements = m_abscissas.size() - 1;
diff --git a/inst/include/boost/math/quadrature/exp_sinh.hpp b/inst/include/boost/math/quadrature/exp_sinh.hpp
index 14970bfdb..d3148e0c0 100644
--- a/inst/include/boost/math/quadrature/exp_sinh.hpp
+++ b/inst/include/boost/math/quadrature/exp_sinh.hpp
@@ -15,11 +15,15 @@
 #ifndef BOOST_MATH_QUADRATURE_EXP_SINH_HPP
 #define BOOST_MATH_QUADRATURE_EXP_SINH_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/quadrature/detail/exp_sinh_detail.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <cmath>
 #include <limits>
 #include <memory>
 #include <string>
-#include <boost/math/quadrature/detail/exp_sinh_detail.hpp>
 
 namespace boost{ namespace math{ namespace quadrature {
 
@@ -91,12 +95,86 @@ auto exp_sinh<Real, Policy>::integrate(const F& f, Real tolerance, Real* error,
     static const char* function = "boost::math::quadrature::exp_sinh<%1%>::integrate";
     using std::abs;
     if (abs(tolerance) > 1) {
-        std::string msg = std::string(__FILE__) + ":" + std::to_string(__LINE__) + ":" + std::string(function) + ": The tolerance provided is unusually large; did you confuse it with a domain bound?";
-        throw std::domain_error(msg);
+        return policies::raise_domain_error(function, "The tolerance provided (%1%) is unusually large; did you confuse it with a domain bound?", tolerance, Policy());
     }
     return m_imp->integrate(f, error, L1, function, tolerance, levels);
 }
 
 
 }}}
-#endif
+
+#endif // BOOST_MATH_HAS_NVRTC
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/constants/constants.hpp>
+
+namespace boost { 
+namespace math { 
+namespace quadrature {
+
+template <class F, class Real, class Policy = policies::policy<> >
+__device__ auto exp_sinh_integrate(const F& f, Real a, Real b, Real tolerance, Real* error, Real* L1, boost::math::size_t* levels)
+{
+    BOOST_MATH_STD_USING
+
+    using K = decltype(f(a));
+    static_assert(!boost::math::is_integral<K>::value,
+                  "The return type cannot be integral, it must be either a real or complex floating point type.");
+
+    constexpr auto function = "boost::math::quadrature::exp_sinh<%1%>::integrate";
+
+    // Neither limit may be a NaN:
+    if((boost::math::isnan)(a) || (boost::math::isnan)(b))
+    {
+       return static_cast<K>(policies::raise_domain_error(function, "NaN supplied as one limit of integration - sorry I don't know what to do", a, Policy()));
+    }
+    // Right limit is infinite:
+    if ((boost::math::isfinite)(a) && (b >= boost::math::tools::max_value<Real>()))
+    {
+        // If a = 0, don't use an additional level of indirection:
+        if (a == static_cast<Real>(0))
+        {
+            return detail::exp_sinh_integrate_impl(f, tolerance, error, L1, levels);
+        }
+        const auto u = [&](Real t)->K { return f(t + a); };
+        return detail::exp_sinh_integrate_impl(u, tolerance, error, L1, levels);
+    }
+
+    if ((boost::math::isfinite)(b) && a <= -boost::math::tools::max_value<Real>())
+    {
+        const auto u = [&](Real t)->K { return f(b-t);};
+        return detail::exp_sinh_integrate_impl(u, tolerance, error, L1, levels);
+    }
+
+    // Infinite limits:
+    if ((a <= -boost::math::tools::max_value<Real>()) && (b >= boost::math::tools::max_value<Real>()))
+    {
+        return static_cast<K>(policies::raise_domain_error(function, "Use sinh_sinh quadrature for integration over the whole real line; exp_sinh is for half infinite integrals.", a, Policy()));
+    }
+    // If we get to here then both ends must necessarily be finite:
+    return static_cast<K>(policies::raise_domain_error(function, "Use tanh_sinh quadrature for integration over finite domains; exp_sinh is for half infinite integrals.", a, Policy()));
+}
+
+template <class F, class Real, class Policy = policies::policy<> >
+__device__ auto exp_sinh_integrate(const F& f, Real tolerance, Real* error, Real* L1, boost::math::size_t* levels)
+{
+    BOOST_MATH_STD_USING
+    constexpr auto function = "boost::math::quadrature::exp_sinh<%1%>::integrate";
+    if (abs(tolerance) > 1) {
+        return policies::raise_domain_error(function, "The tolerance provided (%1%) is unusually large; did you confuse it with a domain bound?", tolerance, Policy());
+    }
+    return detail::exp_sinh_integrate_impl(f, tolerance, error, L1, levels);
+}
+
+} // namespace quadrature
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_ENABLE_CUDA
+
+#endif // BOOST_MATH_QUADRATURE_EXP_SINH_HPP
diff --git a/inst/include/boost/math/quadrature/gauss.hpp b/inst/include/boost/math/quadrature/gauss.hpp
index 0e5bc0c78..91ffcf0bc 100644
--- a/inst/include/boost/math/quadrature/gauss.hpp
+++ b/inst/include/boost/math/quadrature/gauss.hpp
@@ -29,14 +29,37 @@ struct gauss_constant_category
       (std::numeric_limits<T>::is_specialized == 0) ? 999 :
       (std::numeric_limits<T>::radix == 2) ?
       (
-         (std::numeric_limits<T>::digits <= std::numeric_limits<float>::digits) && std::is_convertible<float, T>::value ? 0 :
-         (std::numeric_limits<T>::digits <= std::numeric_limits<double>::digits) && std::is_convertible<double, T>::value ? 1 :
-         (std::numeric_limits<T>::digits <= std::numeric_limits<long double>::digits) && std::is_convertible<long double, T>::value ? 2 :
 #ifdef BOOST_HAS_FLOAT128
-         (std::numeric_limits<T>::digits <= 113) && std::is_constructible<__float128, T>::value ? 3 :
+         (std::numeric_limits<T>::digits <= 113) && std::is_constructible<T, __float128>::value ? 0 :
+#else
+         (std::numeric_limits<T>::digits <= std::numeric_limits<long double>::digits) && std::is_constructible<T, long double>::value ? 0 :
+#endif
+         (std::numeric_limits<T>::digits10 <= 110) && std::is_constructible<T, const char*>::value ? 4 : 999
+      ) : (std::numeric_limits<T>::digits10 <= 110) && std::is_constructible<T, const char*>::value ? 4 : 999;
+   
+   using storage_type =
+      std::conditional_t<(std::numeric_limits<T>::is_specialized == 0), T,
+         std::conditional_t<(std::numeric_limits<T>::radix == 2),
+            std::conditional_t< ((std::numeric_limits<T>::digits <= std::numeric_limits<float>::digits) && std::is_constructible<T, float>::value),
+               float,
+               std::conditional_t<((std::numeric_limits<T>::digits <= std::numeric_limits<double>::digits) && std::is_constructible<T, double>::value),
+                  double,
+                  std::conditional_t<((std::numeric_limits<T>::digits <= std::numeric_limits<long double>::digits) && std::is_constructible<T, long double>::value),
+                     long double,
+#ifdef BOOST_HAS_FLOAT128
+                     std::conditional_t<((std::numeric_limits<T>::digits <= 113) && std::is_constructible<T, __float128>::value),
+                        __float128,
+                        T
+                     >
+                  >
+#else
+                     T
+                  >
 #endif
-         (std::numeric_limits<T>::digits10 <= 110) ? 4 : 999
-      ) : (std::numeric_limits<T>::digits10 <= 110) ? 4 : 999;
+               >
+            >, T
+         >
+      >;
 };
 
 #ifndef BOOST_MATH_GAUSS_NO_COMPUTE_ON_DEMAND
@@ -74,106 +97,56 @@ template <class Real, unsigned N, unsigned Category>
 class gauss_detail;
 
 #endif
-
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_detail<T, 7, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 4> const & abscissa()
+   static std::array<storage_type, 4> const & abscissa()
    {
-      static constexpr std::array<T, 4> data = {
-         0.000000000e+00f,
-         4.058451514e-01f,
-         7.415311856e-01f,
-         9.491079123e-01f,
+      static constexpr std::array<storage_type, 4> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(4.05845151377397166906606412076961463e-01L),
+         static_cast<storage_type>(7.41531185599394439863864773280788407e-01L),
+         static_cast<storage_type>(9.49107912342758524526189684047851262e-01L),
       };
       return data;
    }
-   static std::array<T, 4> const & weights()
+   static std::array<storage_type, 4> const & weights()
    {
-      static constexpr std::array<T, 4> data = {
-         4.179591837e-01f,
-         3.818300505e-01f,
-         2.797053915e-01f,
-         1.294849662e-01f,
+      static constexpr std::array<storage_type, 4> data = {
+         static_cast<storage_type>(4.17959183673469387755102040816326531e-01L),
+         static_cast<storage_type>(3.81830050505118944950369775488975134e-01L),
+         static_cast<storage_type>(2.79705391489276667901467771423779582e-01L),
+         static_cast<storage_type>(1.29484966168869693270611432679082018e-01L),
       };
       return data;
    }
 };
-
-template <class T>
-class gauss_detail<T, 7, 1>
-{
-public:
-   static std::array<T, 4> const & abscissa()
-   {
-      static constexpr std::array<T, 4> data = {
-         0.00000000000000000e+00,
-         4.05845151377397167e-01,
-         7.41531185599394440e-01,
-         9.49107912342758525e-01,
-      };
-      return data;
-   }
-   static std::array<T, 4> const & weights()
-   {
-      static constexpr std::array<T, 4> data = {
-         4.17959183673469388e-01,
-         3.81830050505118945e-01,
-         2.79705391489276668e-01,
-         1.29484966168869693e-01,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 7, 2>
-{
-public:
-   static std::array<T, 4> const & abscissa()
-   {
-      static constexpr std::array<T, 4> data = {
-         0.00000000000000000000000000000000000e+00L,
-         4.05845151377397166906606412076961463e-01L,
-         7.41531185599394439863864773280788407e-01L,
-         9.49107912342758524526189684047851262e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 4> const & weights()
-   {
-      static constexpr std::array<T, 4> data = {
-         4.17959183673469387755102040816326531e-01L,
-         3.81830050505118944950369775488975134e-01L,
-         2.79705391489276667901467771423779582e-01L,
-         1.29484966168869693270611432679082018e-01L,
-      };
-      return data;
-   }
-};
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_detail<T, 7, 3>
+class gauss_detail<T, 7, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 4> const & abscissa()
+   static std::array<storage_type, 4> const & abscissa()
    {
-      static const std::array<T, 4> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         4.05845151377397166906606412076961463e-01Q,
-         7.41531185599394439863864773280788407e-01Q,
-         9.49107912342758524526189684047851262e-01Q,
+      static const std::array<storage_type, 4> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(4.05845151377397166906606412076961463e-01Q),
+         static_cast<storage_type>(7.41531185599394439863864773280788407e-01Q),
+         static_cast<storage_type>(9.49107912342758524526189684047851262e-01Q),
       };
       return data;
    }
-   static std::array<T, 4> const & weights()
+   static std::array<storage_type, 4> const & weights()
    {
-      static const std::array<T, 4> data = {
-         4.17959183673469387755102040816326531e-01Q,
-         3.81830050505118944950369775488975134e-01Q,
-         2.79705391489276667901467771423779582e-01Q,
-         1.29484966168869693270611432679082018e-01Q,
+      static const std::array<storage_type, 4> data = {
+         static_cast<storage_type>(4.17959183673469387755102040816326531e-01Q),
+         static_cast<storage_type>(3.81830050505118944950369775488975134e-01Q),
+         static_cast<storage_type>(2.79705391489276667901467771423779582e-01Q),
+         static_cast<storage_type>(1.29484966168869693270611432679082018e-01Q),
       };
       return data;
    }
@@ -185,133 +158,79 @@ class gauss_detail<T, 7, 4>
 public:
    static  std::array<T, 4> const & abscissa()
    {
-      static  std::array<T, 4> data = {
+      static  std::array<T, 4> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 4.0584515137739716690660641207696146334738201409937012638704325179466381322612565532831268972774658776528675866604802e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.4153118559939443986386477328078840707414764714139026011995535196742987467218051379282683236686324705969251809311201e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.4910791234275852452618968404785126240077093767061778354876910391306333035484014080573077002792572414430073966699522e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 4> const & weights()
    {
-      static  std::array<T, 4> data = {
+      static  std::array<T, 4> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 4.1795918367346938775510204081632653061224489795918367346938775510204081632653061224489795918367346938775510204081633e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.8183005050511894495036977548897513387836508353386273475108345103070554643412970834868465934404480145031467176458536e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.7970539148927666790146777142377958248692506522659876453701403269361881043056267681324094290119761876632337521337205e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.2948496616886969327061143267908201832858740225994666397720863872465523497204230871562541816292084508948440200163443e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
-
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_detail<T, 10, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 5> const & abscissa()
+   static std::array<storage_type, 5> const & abscissa()
    {
-      static constexpr std::array<T, 5> data = {
-         1.488743390e-01f,
-         4.333953941e-01f,
-         6.794095683e-01f,
-         8.650633667e-01f,
-         9.739065285e-01f,
+      static constexpr std::array<storage_type, 5> data = {
+         static_cast<storage_type>(1.48874338981631210884826001129719985e-01L),
+         static_cast<storage_type>(4.33395394129247190799265943165784162e-01L),
+         static_cast<storage_type>(6.79409568299024406234327365114873576e-01L),
+         static_cast<storage_type>(8.65063366688984510732096688423493049e-01L),
+         static_cast<storage_type>(9.73906528517171720077964012084452053e-01L),
       };
       return data;
    }
-   static std::array<T, 5> const & weights()
+   static std::array<storage_type, 5> const & weights()
    {
-      static constexpr std::array<T, 5> data = {
-         2.955242247e-01f,
-         2.692667193e-01f,
-         2.190863625e-01f,
-         1.494513492e-01f,
-         6.667134431e-02f,
+      static constexpr std::array<storage_type, 5> data = {
+         static_cast<storage_type>(2.95524224714752870173892994651338329e-01L),
+         static_cast<storage_type>(2.69266719309996355091226921569469353e-01L),
+         static_cast<storage_type>(2.19086362515982043995534934228163192e-01L),
+         static_cast<storage_type>(1.49451349150580593145776339657697332e-01L),
+         static_cast<storage_type>(6.66713443086881375935688098933317929e-02L),
       };
       return data;
    }
 };
-
-template <class T>
-class gauss_detail<T, 10, 1>
-{
-public:
-   static std::array<T, 5> const & abscissa()
-   {
-      static constexpr std::array<T, 5> data = {
-         1.48874338981631211e-01,
-         4.33395394129247191e-01,
-         6.79409568299024406e-01,
-         8.65063366688984511e-01,
-         9.73906528517171720e-01,
-      };
-      return data;
-   }
-   static std::array<T, 5> const & weights()
-   {
-      static constexpr std::array<T, 5> data = {
-         2.95524224714752870e-01,
-         2.69266719309996355e-01,
-         2.19086362515982044e-01,
-         1.49451349150580593e-01,
-         6.66713443086881376e-02,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 10, 2>
-{
-public:
-   static std::array<T, 5> const & abscissa()
-   {
-      static constexpr std::array<T, 5> data = {
-         1.48874338981631210884826001129719985e-01L,
-         4.33395394129247190799265943165784162e-01L,
-         6.79409568299024406234327365114873576e-01L,
-         8.65063366688984510732096688423493049e-01L,
-         9.73906528517171720077964012084452053e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 5> const & weights()
-   {
-      static constexpr std::array<T, 5> data = {
-         2.95524224714752870173892994651338329e-01L,
-         2.69266719309996355091226921569469353e-01L,
-         2.19086362515982043995534934228163192e-01L,
-         1.49451349150580593145776339657697332e-01L,
-         6.66713443086881375935688098933317929e-02L,
-      };
-      return data;
-   }
-};
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_detail<T, 10, 3>
+class gauss_detail<T, 10, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 5> const & abscissa()
+   static std::array<storage_type, 5> const & abscissa()
    {
-      static const std::array<T, 5> data = {
-         1.48874338981631210884826001129719985e-01Q,
-         4.33395394129247190799265943165784162e-01Q,
-         6.79409568299024406234327365114873576e-01Q,
-         8.65063366688984510732096688423493049e-01Q,
-         9.73906528517171720077964012084452053e-01Q,
+      static const std::array<storage_type, 5> data = {
+         static_cast<storage_type>(1.48874338981631210884826001129719985e-01Q),
+         static_cast<storage_type>(4.33395394129247190799265943165784162e-01Q),
+         static_cast<storage_type>(6.79409568299024406234327365114873576e-01Q),
+         static_cast<storage_type>(8.65063366688984510732096688423493049e-01Q),
+         static_cast<storage_type>(9.73906528517171720077964012084452053e-01Q),
       };
       return data;
    }
-   static std::array<T, 5> const & weights()
+   static std::array<storage_type, 5> const & weights()
    {
-      static const std::array<T, 5> data = {
-         2.95524224714752870173892994651338329e-01Q,
-         2.69266719309996355091226921569469353e-01Q,
-         2.19086362515982043995534934228163192e-01Q,
-         1.49451349150580593145776339657697332e-01Q,
-         6.66713443086881375935688098933317929e-02Q,
+      static const std::array<storage_type, 5> data = {
+         static_cast<storage_type>(2.95524224714752870173892994651338329e-01Q),
+         static_cast<storage_type>(2.69266719309996355091226921569469353e-01Q),
+         static_cast<storage_type>(2.19086362515982043995534934228163192e-01Q),
+         static_cast<storage_type>(1.49451349150580593145776339657697332e-01Q),
+         static_cast<storage_type>(6.66713443086881375935688098933317929e-02Q),
       };
       return data;
    }
@@ -323,159 +242,94 @@ class gauss_detail<T, 10, 4>
 public:
    static  std::array<T, 5> const & abscissa()
    {
-      static  std::array<T, 5> data = {
+      static  std::array<T, 5> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4887433898163121088482600112971998461756485942069169570798925351590361735566852137117762979946369123003116080525534e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 4.3339539412924719079926594316578416220007183765624649650270151314376698907770350122510275795011772122368293504099894e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.7940956829902440623432736511487357576929471183480946766481718895255857539507492461507857357048037949983390204739932e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 8.6506336668898451073209668842349304852754301496533045252195973184537475513805556135679072894604577069440463108641177e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.7390652851717172007796401208445205342826994669238211923121206669659520323463615962572356495626855625823304251877421e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 5> const & weights()
    {
-      static  std::array<T, 5> data = {
+      static  std::array<T, 5> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.9552422471475287017389299465133832942104671702685360135430802975599593821715232927035659579375421672271716440125256e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.6926671930999635509122692156946935285975993846088379580056327624215343231917927676422663670925276075559581145036870e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.1908636251598204399553493422816319245877187052267708988095654363519991065295128124268399317720219278659121687281289e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4945134915058059314577633965769733240255663966942736783547726875323865472663001094594726463473195191400575256104544e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.6671344308688137593568809893331792857864834320158145128694881613412064084087101776785509685058877821090054714520419e-02),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_detail<T, 15, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 8> const & abscissa()
-   {
-      static constexpr std::array<T, 8> data = {
-         0.000000000e+00f,
-         2.011940940e-01f,
-         3.941513471e-01f,
-         5.709721726e-01f,
-         7.244177314e-01f,
-         8.482065834e-01f,
-         9.372733924e-01f,
-         9.879925180e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 8> const & weights()
-   {
-      static constexpr std::array<T, 8> data = {
-         2.025782419e-01f,
-         1.984314853e-01f,
-         1.861610000e-01f,
-         1.662692058e-01f,
-         1.395706779e-01f,
-         1.071592205e-01f,
-         7.036604749e-02f,
-         3.075324200e-02f,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 15, 1>
-{
-public:
-   static std::array<T, 8> const & abscissa()
-   {
-      static constexpr std::array<T, 8> data = {
-         0.00000000000000000e+00,
-         2.01194093997434522e-01,
-         3.94151347077563370e-01,
-         5.70972172608538848e-01,
-         7.24417731360170047e-01,
-         8.48206583410427216e-01,
-         9.37273392400705904e-01,
-         9.87992518020485428e-01,
-      };
-      return data;
-   }
-   static std::array<T, 8> const & weights()
-   {
-      static constexpr std::array<T, 8> data = {
-         2.02578241925561273e-01,
-         1.98431485327111576e-01,
-         1.86161000015562211e-01,
-         1.66269205816993934e-01,
-         1.39570677926154314e-01,
-         1.07159220467171935e-01,
-         7.03660474881081247e-02,
-         3.07532419961172684e-02,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 15, 2>
-{
-public:
-   static std::array<T, 8> const & abscissa()
+   static std::array<storage_type, 8> const & abscissa()
    {
-      static constexpr std::array<T, 8> data = {
-         0.00000000000000000000000000000000000e+00L,
-         2.01194093997434522300628303394596208e-01L,
-         3.94151347077563369897207370981045468e-01L,
-         5.70972172608538847537226737253910641e-01L,
-         7.24417731360170047416186054613938010e-01L,
-         8.48206583410427216200648320774216851e-01L,
-         9.37273392400705904307758947710209471e-01L,
-         9.87992518020485428489565718586612581e-01L,
+      static constexpr std::array<storage_type, 8> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(2.01194093997434522300628303394596208e-01L),
+         static_cast<storage_type>(3.94151347077563369897207370981045468e-01L),
+         static_cast<storage_type>(5.70972172608538847537226737253910641e-01L),
+         static_cast<storage_type>(7.24417731360170047416186054613938010e-01L),
+         static_cast<storage_type>(8.48206583410427216200648320774216851e-01L),
+         static_cast<storage_type>(9.37273392400705904307758947710209471e-01L),
+         static_cast<storage_type>(9.87992518020485428489565718586612581e-01L),
       };
       return data;
    }
-   static std::array<T, 8> const & weights()
+   static std::array<storage_type, 8> const & weights()
    {
-      static constexpr std::array<T, 8> data = {
-         2.02578241925561272880620199967519315e-01L,
-         1.98431485327111576456118326443839325e-01L,
-         1.86161000015562211026800561866422825e-01L,
-         1.66269205816993933553200860481208811e-01L,
-         1.39570677926154314447804794511028323e-01L,
-         1.07159220467171935011869546685869303e-01L,
-         7.03660474881081247092674164506673385e-02L,
-         3.07532419961172683546283935772044177e-02L,
+      static constexpr std::array<storage_type, 8> data = {
+         static_cast<storage_type>(2.02578241925561272880620199967519315e-01L),
+         static_cast<storage_type>(1.98431485327111576456118326443839325e-01L),
+         static_cast<storage_type>(1.86161000015562211026800561866422825e-01L),
+         static_cast<storage_type>(1.66269205816993933553200860481208811e-01L),
+         static_cast<storage_type>(1.39570677926154314447804794511028323e-01L),
+         static_cast<storage_type>(1.07159220467171935011869546685869303e-01L),
+         static_cast<storage_type>(7.03660474881081247092674164506673385e-02L),
+         static_cast<storage_type>(3.07532419961172683546283935772044177e-02L),
       };
       return data;
    }
 };
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_detail<T, 15, 3>
+class gauss_detail<T, 15, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 8> const & abscissa()
+   static std::array<storage_type, 8> const & abscissa()
    {
-      static const std::array<T, 8> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         2.01194093997434522300628303394596208e-01Q,
-         3.94151347077563369897207370981045468e-01Q,
-         5.70972172608538847537226737253910641e-01Q,
-         7.24417731360170047416186054613938010e-01Q,
-         8.48206583410427216200648320774216851e-01Q,
-         9.37273392400705904307758947710209471e-01Q,
-         9.87992518020485428489565718586612581e-01Q,
+      static const std::array<storage_type, 8> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(2.01194093997434522300628303394596208e-01Q),
+         static_cast<storage_type>(3.94151347077563369897207370981045468e-01Q),
+         static_cast<storage_type>(5.70972172608538847537226737253910641e-01Q),
+         static_cast<storage_type>(7.24417731360170047416186054613938010e-01Q),
+         static_cast<storage_type>(8.48206583410427216200648320774216851e-01Q),
+         static_cast<storage_type>(9.37273392400705904307758947710209471e-01Q),
+         static_cast<storage_type>(9.87992518020485428489565718586612581e-01Q),
       };
       return data;
    }
-   static std::array<T, 8> const & weights()
+   static std::array<storage_type, 8> const & weights()
    {
-      static const std::array<T, 8> data = {
-         2.02578241925561272880620199967519315e-01Q,
-         1.98431485327111576456118326443839325e-01Q,
-         1.86161000015562211026800561866422825e-01Q,
-         1.66269205816993933553200860481208811e-01Q,
-         1.39570677926154314447804794511028323e-01Q,
-         1.07159220467171935011869546685869303e-01Q,
-         7.03660474881081247092674164506673385e-02Q,
-         3.07532419961172683546283935772044177e-02Q,
+      static const std::array<storage_type, 8> data = {
+         static_cast<storage_type>(2.02578241925561272880620199967519315e-01Q),
+         static_cast<storage_type>(1.98431485327111576456118326443839325e-01Q),
+         static_cast<storage_type>(1.86161000015562211026800561866422825e-01Q),
+         static_cast<storage_type>(1.66269205816993933553200860481208811e-01Q),
+         static_cast<storage_type>(1.39570677926154314447804794511028323e-01Q),
+         static_cast<storage_type>(1.07159220467171935011869546685869303e-01Q),
+         static_cast<storage_type>(7.03660474881081247092674164506673385e-02Q),
+         static_cast<storage_type>(3.07532419961172683546283935772044177e-02Q),
       };
       return data;
    }
@@ -487,7 +341,7 @@ class gauss_detail<T, 15, 4>
 public:
    static  std::array<T, 8> const & abscissa()
    {
-      static  std::array<T, 8> data = {
+      static  std::array<T, 8> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.0119409399743452230062830339459620781283645446263767961594972460994823900302018760183625806752105908967902257386509e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.9415134707756336989720737098104546836275277615869825503116534395160895778696141797549711416165976202589352169635648e-01),
@@ -496,12 +350,12 @@ class gauss_detail<T, 15, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 8.4820658341042721620064832077421685136625617473699263409572755876067507517414548519760771975082148085090373835713340e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.3727339240070590430775894771020947124399627351530445790136307635020297379704552795054758617426808659746824044603157e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.8799251802048542848956571858661258114697281712376148999999751558738843736901942471272205036831914497667516843990079e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 8> const & weights()
    {
-      static  std::array<T, 8> data = {
+      static  std::array<T, 8> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.0257824192556127288062019996751931483866215800947735679670411605143539875474607409339344071278803213535148267082999e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.9843148532711157645611832644383932481869255995754199348473792792912479753343426813331499916481782320766020854889310e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.8616100001556221102680056186642282450622601227792840281549572731001325550269916061894976888609932360539977709001384e-01),
@@ -510,158 +364,85 @@ class gauss_detail<T, 15, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0715922046717193501186954668586930341554371575810198068702238912187799485231579972568585713760862404439808767837506e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.0366047488108124709267416450667338466708032754330719825907292914387055512874237044840452066693939219355489858595041e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.0753241996117268354628393577204417721748144833434074264228285504237189467117168039038770732399404002516991188859473e-02),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_detail<T, 20, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 10> const & abscissa()
-   {
-      static constexpr std::array<T, 10> data = {
-         7.652652113e-02f,
-         2.277858511e-01f,
-         3.737060887e-01f,
-         5.108670020e-01f,
-         6.360536807e-01f,
-         7.463319065e-01f,
-         8.391169718e-01f,
-         9.122344283e-01f,
-         9.639719273e-01f,
-         9.931285992e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 10> const & weights()
-   {
-      static constexpr std::array<T, 10> data = {
-         1.527533871e-01f,
-         1.491729865e-01f,
-         1.420961093e-01f,
-         1.316886384e-01f,
-         1.181945320e-01f,
-         1.019301198e-01f,
-         8.327674158e-02f,
-         6.267204833e-02f,
-         4.060142980e-02f,
-         1.761400714e-02f,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 20, 1>
-{
-public:
-   static std::array<T, 10> const & abscissa()
-   {
-      static constexpr std::array<T, 10> data = {
-         7.65265211334973338e-02,
-         2.27785851141645078e-01,
-         3.73706088715419561e-01,
-         5.10867001950827098e-01,
-         6.36053680726515025e-01,
-         7.46331906460150793e-01,
-         8.39116971822218823e-01,
-         9.12234428251325906e-01,
-         9.63971927277913791e-01,
-         9.93128599185094925e-01,
-      };
-      return data;
-   }
-   static std::array<T, 10> const & weights()
-   {
-      static constexpr std::array<T, 10> data = {
-         1.52753387130725851e-01,
-         1.49172986472603747e-01,
-         1.42096109318382051e-01,
-         1.31688638449176627e-01,
-         1.18194531961518417e-01,
-         1.01930119817240435e-01,
-         8.32767415767047487e-02,
-         6.26720483341090636e-02,
-         4.06014298003869413e-02,
-         1.76140071391521183e-02,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 20, 2>
-{
-public:
-   static std::array<T, 10> const & abscissa()
+   static std::array<storage_type, 10> const & abscissa()
    {
-      static constexpr std::array<T, 10> data = {
-         7.65265211334973337546404093988382110e-02L,
-         2.27785851141645078080496195368574625e-01L,
-         3.73706088715419560672548177024927237e-01L,
-         5.10867001950827098004364050955250998e-01L,
-         6.36053680726515025452836696226285937e-01L,
-         7.46331906460150792614305070355641590e-01L,
-         8.39116971822218823394529061701520685e-01L,
-         9.12234428251325905867752441203298113e-01L,
-         9.63971927277913791267666131197277222e-01L,
-         9.93128599185094924786122388471320278e-01L,
+      static constexpr std::array<storage_type, 10> data = {
+         static_cast<storage_type>(7.65265211334973337546404093988382110e-02L),
+         static_cast<storage_type>(2.27785851141645078080496195368574625e-01L),
+         static_cast<storage_type>(3.73706088715419560672548177024927237e-01L),
+         static_cast<storage_type>(5.10867001950827098004364050955250998e-01L),
+         static_cast<storage_type>(6.36053680726515025452836696226285937e-01L),
+         static_cast<storage_type>(7.46331906460150792614305070355641590e-01L),
+         static_cast<storage_type>(8.39116971822218823394529061701520685e-01L),
+         static_cast<storage_type>(9.12234428251325905867752441203298113e-01L),
+         static_cast<storage_type>(9.63971927277913791267666131197277222e-01L),
+         static_cast<storage_type>(9.93128599185094924786122388471320278e-01L),
       };
       return data;
    }
-   static std::array<T, 10> const & weights()
+   static std::array<storage_type, 10> const & weights()
    {
-      static constexpr std::array<T, 10> data = {
-         1.52753387130725850698084331955097593e-01L,
-         1.49172986472603746787828737001969437e-01L,
-         1.42096109318382051329298325067164933e-01L,
-         1.31688638449176626898494499748163135e-01L,
-         1.18194531961518417312377377711382287e-01L,
-         1.01930119817240435036750135480349876e-01L,
-         8.32767415767047487247581432220462061e-02L,
-         6.26720483341090635695065351870416064e-02L,
-         4.06014298003869413310399522749321099e-02L,
-         1.76140071391521183118619623518528164e-02L,
+      static constexpr std::array<storage_type, 10> data = {
+         static_cast<storage_type>(1.52753387130725850698084331955097593e-01L),
+         static_cast<storage_type>(1.49172986472603746787828737001969437e-01L),
+         static_cast<storage_type>(1.42096109318382051329298325067164933e-01L),
+         static_cast<storage_type>(1.31688638449176626898494499748163135e-01L),
+         static_cast<storage_type>(1.18194531961518417312377377711382287e-01L),
+         static_cast<storage_type>(1.01930119817240435036750135480349876e-01L),
+         static_cast<storage_type>(8.32767415767047487247581432220462061e-02L),
+         static_cast<storage_type>(6.26720483341090635695065351870416064e-02L),
+         static_cast<storage_type>(4.06014298003869413310399522749321099e-02L),
+         static_cast<storage_type>(1.76140071391521183118619623518528164e-02L),
       };
       return data;
    }
 };
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_detail<T, 20, 3>
+class gauss_detail<T, 20, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 10> const & abscissa()
+   static std::array<storage_type, 10> const & abscissa()
    {
-      static const std::array<T, 10> data = {
-         7.65265211334973337546404093988382110e-02Q,
-         2.27785851141645078080496195368574625e-01Q,
-         3.73706088715419560672548177024927237e-01Q,
-         5.10867001950827098004364050955250998e-01Q,
-         6.36053680726515025452836696226285937e-01Q,
-         7.46331906460150792614305070355641590e-01Q,
-         8.39116971822218823394529061701520685e-01Q,
-         9.12234428251325905867752441203298113e-01Q,
-         9.63971927277913791267666131197277222e-01Q,
-         9.93128599185094924786122388471320278e-01Q,
+      static const std::array<storage_type, 10> data = {
+         static_cast<storage_type>(7.65265211334973337546404093988382110e-02Q),
+         static_cast<storage_type>(2.27785851141645078080496195368574625e-01Q),
+         static_cast<storage_type>(3.73706088715419560672548177024927237e-01Q),
+         static_cast<storage_type>(5.10867001950827098004364050955250998e-01Q),
+         static_cast<storage_type>(6.36053680726515025452836696226285937e-01Q),
+         static_cast<storage_type>(7.46331906460150792614305070355641590e-01Q),
+         static_cast<storage_type>(8.39116971822218823394529061701520685e-01Q),
+         static_cast<storage_type>(9.12234428251325905867752441203298113e-01Q),
+         static_cast<storage_type>(9.63971927277913791267666131197277222e-01Q),
+         static_cast<storage_type>(9.93128599185094924786122388471320278e-01Q),
       };
       return data;
    }
-   static std::array<T, 10> const & weights()
+   static std::array<storage_type, 10> const & weights()
    {
-      static const std::array<T, 10> data = {
-         1.52753387130725850698084331955097593e-01Q,
-         1.49172986472603746787828737001969437e-01Q,
-         1.42096109318382051329298325067164933e-01Q,
-         1.31688638449176626898494499748163135e-01Q,
-         1.18194531961518417312377377711382287e-01Q,
-         1.01930119817240435036750135480349876e-01Q,
-         8.32767415767047487247581432220462061e-02Q,
-         6.26720483341090635695065351870416064e-02Q,
-         4.06014298003869413310399522749321099e-02Q,
-         1.76140071391521183118619623518528164e-02Q,
+      static const std::array<storage_type, 10> data = {
+         static_cast<storage_type>(1.52753387130725850698084331955097593e-01Q),
+         static_cast<storage_type>(1.49172986472603746787828737001969437e-01Q),
+         static_cast<storage_type>(1.42096109318382051329298325067164933e-01Q),
+         static_cast<storage_type>(1.31688638449176626898494499748163135e-01Q),
+         static_cast<storage_type>(1.18194531961518417312377377711382287e-01Q),
+         static_cast<storage_type>(1.01930119817240435036750135480349876e-01Q),
+         static_cast<storage_type>(8.32767415767047487247581432220462061e-02Q),
+         static_cast<storage_type>(6.26720483341090635695065351870416064e-02Q),
+         static_cast<storage_type>(4.06014298003869413310399522749321099e-02Q),
+         static_cast<storage_type>(1.76140071391521183118619623518528164e-02Q),
       };
       return data;
    }
@@ -673,7 +454,7 @@ class gauss_detail<T, 20, 4>
 public:
    static  std::array<T, 10> const & abscissa()
    {
-      static  std::array<T, 10> data = {
+      static  std::array<T, 10> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.6526521133497333754640409398838211004796266813497500804795244384256342048336978241545114181556215606998505646364133e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.2778585114164507808049619536857462474308893768292747231463573920717134186355582779495212519096870803177373131560430e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.7370608871541956067254817702492723739574632170568271182794861351564576437305952789589568363453337894476772208852815e-01),
@@ -684,12 +465,12 @@ class gauss_detail<T, 20, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.1223442825132590586775244120329811304918479742369177479588221915807089120871907893644472619292138737876039175464603e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.6397192727791379126766613119727722191206032780618885606353759389204158078438305698001812525596471563131043491596423e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9312859918509492478612238847132027822264713090165589614818413121798471762775378083944940249657220927472894034724419e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 10> const & weights()
    {
-      static  std::array<T, 10> data = {
+      static  std::array<T, 10> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.5275338713072585069808433195509759349194864511237859727470104981759745316273778153557248783650390593544001842813788e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4917298647260374678782873700196943669267990408136831649621121780984442259558678069396132603521048105170913854567338e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4209610931838205132929832506716493303451541339202030333736708298382808749793436761694922428320058260133068573666201e-01),
@@ -700,182 +481,97 @@ class gauss_detail<T, 20, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.2672048334109063569506535187041606351601076578436364099584345437974811033665678644563766056832203512603253399592073e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 4.0601429800386941331039952274932109879090639989951536817606854561832296750987328295538920623044384976189825709675075e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.7614007139152118311861962351852816362143105543336732524349326677348419259621847817403105542146097668703716227512570e-02),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_detail<T, 25, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 13> const & abscissa()
-   {
-      static constexpr std::array<T, 13> data = {
-         0.000000000e+00f,
-         1.228646926e-01f,
-         2.438668837e-01f,
-         3.611723058e-01f,
-         4.730027314e-01f,
-         5.776629302e-01f,
-         6.735663685e-01f,
-         7.592592630e-01f,
-         8.334426288e-01f,
-         8.949919979e-01f,
-         9.429745712e-01f,
-         9.766639215e-01f,
-         9.955569698e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 13> const & weights()
-   {
-      static constexpr std::array<T, 13> data = {
-         1.231760537e-01f,
-         1.222424430e-01f,
-         1.194557635e-01f,
-         1.148582591e-01f,
-         1.085196245e-01f,
-         1.005359491e-01f,
-         9.102826198e-02f,
-         8.014070034e-02f,
-         6.803833381e-02f,
-         5.490469598e-02f,
-         4.093915670e-02f,
-         2.635498662e-02f,
-         1.139379850e-02f,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 25, 1>
-{
-public:
-   static std::array<T, 13> const & abscissa()
-   {
-      static constexpr std::array<T, 13> data = {
-         0.00000000000000000e+00,
-         1.22864692610710396e-01,
-         2.43866883720988432e-01,
-         3.61172305809387838e-01,
-         4.73002731445714961e-01,
-         5.77662930241222968e-01,
-         6.73566368473468364e-01,
-         7.59259263037357631e-01,
-         8.33442628760834001e-01,
-         8.94991997878275369e-01,
-         9.42974571228974339e-01,
-         9.76663921459517511e-01,
-         9.95556969790498098e-01,
-      };
-      return data;
-   }
-   static std::array<T, 13> const & weights()
-   {
-      static constexpr std::array<T, 13> data = {
-         1.23176053726715451e-01,
-         1.22242442990310042e-01,
-         1.19455763535784772e-01,
-         1.14858259145711648e-01,
-         1.08519624474263653e-01,
-         1.00535949067050644e-01,
-         9.10282619829636498e-02,
-         8.01407003350010180e-02,
-         6.80383338123569172e-02,
-         5.49046959758351919e-02,
-         4.09391567013063127e-02,
-         2.63549866150321373e-02,
-         1.13937985010262879e-02,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 25, 2>
-{
-public:
-   static std::array<T, 13> const & abscissa()
+   static std::array<storage_type, 13> const & abscissa()
    {
-      static constexpr std::array<T, 13> data = {
-         0.00000000000000000000000000000000000e+00L,
-         1.22864692610710396387359818808036806e-01L,
-         2.43866883720988432045190362797451586e-01L,
-         3.61172305809387837735821730127640667e-01L,
-         4.73002731445714960522182115009192041e-01L,
-         5.77662930241222967723689841612654067e-01L,
-         6.73566368473468364485120633247622176e-01L,
-         7.59259263037357630577282865204360976e-01L,
-         8.33442628760834001421021108693569569e-01L,
-         8.94991997878275368851042006782804954e-01L,
-         9.42974571228974339414011169658470532e-01L,
-         9.76663921459517511498315386479594068e-01L,
-         9.95556969790498097908784946893901617e-01L,
+      static constexpr std::array<storage_type, 13> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(1.22864692610710396387359818808036806e-01L),
+         static_cast<storage_type>(2.43866883720988432045190362797451586e-01L),
+         static_cast<storage_type>(3.61172305809387837735821730127640667e-01L),
+         static_cast<storage_type>(4.73002731445714960522182115009192041e-01L),
+         static_cast<storage_type>(5.77662930241222967723689841612654067e-01L),
+         static_cast<storage_type>(6.73566368473468364485120633247622176e-01L),
+         static_cast<storage_type>(7.59259263037357630577282865204360976e-01L),
+         static_cast<storage_type>(8.33442628760834001421021108693569569e-01L),
+         static_cast<storage_type>(8.94991997878275368851042006782804954e-01L),
+         static_cast<storage_type>(9.42974571228974339414011169658470532e-01L),
+         static_cast<storage_type>(9.76663921459517511498315386479594068e-01L),
+         static_cast<storage_type>(9.95556969790498097908784946893901617e-01L),
       };
       return data;
    }
-   static std::array<T, 13> const & weights()
+   static std::array<storage_type, 13> const & weights()
    {
-      static constexpr std::array<T, 13> data = {
-         1.23176053726715451203902873079050142e-01L,
-         1.22242442990310041688959518945851506e-01L,
-         1.19455763535784772228178126512901047e-01L,
-         1.14858259145711648339325545869555809e-01L,
-         1.08519624474263653116093957050116619e-01L,
-         1.00535949067050644202206890392685827e-01L,
-         9.10282619829636498114972207028916534e-02L,
-         8.01407003350010180132349596691113023e-02L,
-         6.80383338123569172071871856567079686e-02L,
-         5.49046959758351919259368915404733242e-02L,
-         4.09391567013063126556234877116459537e-02L,
-         2.63549866150321372619018152952991449e-02L,
-         1.13937985010262879479029641132347736e-02L,
+      static constexpr std::array<storage_type, 13> data = {
+         static_cast<storage_type>(1.23176053726715451203902873079050142e-01L),
+         static_cast<storage_type>(1.22242442990310041688959518945851506e-01L),
+         static_cast<storage_type>(1.19455763535784772228178126512901047e-01L),
+         static_cast<storage_type>(1.14858259145711648339325545869555809e-01L),
+         static_cast<storage_type>(1.08519624474263653116093957050116619e-01L),
+         static_cast<storage_type>(1.00535949067050644202206890392685827e-01L),
+         static_cast<storage_type>(9.10282619829636498114972207028916534e-02L),
+         static_cast<storage_type>(8.01407003350010180132349596691113023e-02L),
+         static_cast<storage_type>(6.80383338123569172071871856567079686e-02L),
+         static_cast<storage_type>(5.49046959758351919259368915404733242e-02L),
+         static_cast<storage_type>(4.09391567013063126556234877116459537e-02L),
+         static_cast<storage_type>(2.63549866150321372619018152952991449e-02L),
+         static_cast<storage_type>(1.13937985010262879479029641132347736e-02L),
       };
       return data;
    }
 };
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_detail<T, 25, 3>
+class gauss_detail<T, 25, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 13> const & abscissa()
+   static std::array<storage_type, 13> const & abscissa()
    {
-      static const std::array<T, 13> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         1.22864692610710396387359818808036806e-01Q,
-         2.43866883720988432045190362797451586e-01Q,
-         3.61172305809387837735821730127640667e-01Q,
-         4.73002731445714960522182115009192041e-01Q,
-         5.77662930241222967723689841612654067e-01Q,
-         6.73566368473468364485120633247622176e-01Q,
-         7.59259263037357630577282865204360976e-01Q,
-         8.33442628760834001421021108693569569e-01Q,
-         8.94991997878275368851042006782804954e-01Q,
-         9.42974571228974339414011169658470532e-01Q,
-         9.76663921459517511498315386479594068e-01Q,
-         9.95556969790498097908784946893901617e-01Q,
+      static const std::array<storage_type, 13> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(1.22864692610710396387359818808036806e-01Q),
+         static_cast<storage_type>(2.43866883720988432045190362797451586e-01Q),
+         static_cast<storage_type>(3.61172305809387837735821730127640667e-01Q),
+         static_cast<storage_type>(4.73002731445714960522182115009192041e-01Q),
+         static_cast<storage_type>(5.77662930241222967723689841612654067e-01Q),
+         static_cast<storage_type>(6.73566368473468364485120633247622176e-01Q),
+         static_cast<storage_type>(7.59259263037357630577282865204360976e-01Q),
+         static_cast<storage_type>(8.33442628760834001421021108693569569e-01Q),
+         static_cast<storage_type>(8.94991997878275368851042006782804954e-01Q),
+         static_cast<storage_type>(9.42974571228974339414011169658470532e-01Q),
+         static_cast<storage_type>(9.76663921459517511498315386479594068e-01Q),
+         static_cast<storage_type>(9.95556969790498097908784946893901617e-01Q),
       };
       return data;
    }
-   static std::array<T, 13> const & weights()
+   static std::array<storage_type, 13> const & weights()
    {
-      static const std::array<T, 13> data = {
-         1.23176053726715451203902873079050142e-01Q,
-         1.22242442990310041688959518945851506e-01Q,
-         1.19455763535784772228178126512901047e-01Q,
-         1.14858259145711648339325545869555809e-01Q,
-         1.08519624474263653116093957050116619e-01Q,
-         1.00535949067050644202206890392685827e-01Q,
-         9.10282619829636498114972207028916534e-02Q,
-         8.01407003350010180132349596691113023e-02Q,
-         6.80383338123569172071871856567079686e-02Q,
-         5.49046959758351919259368915404733242e-02Q,
-         4.09391567013063126556234877116459537e-02Q,
-         2.63549866150321372619018152952991449e-02Q,
-         1.13937985010262879479029641132347736e-02Q,
+      static const std::array<storage_type, 13> data = {
+         static_cast<storage_type>(1.23176053726715451203902873079050142e-01Q),
+         static_cast<storage_type>(1.22242442990310041688959518945851506e-01Q),
+         static_cast<storage_type>(1.19455763535784772228178126512901047e-01Q),
+         static_cast<storage_type>(1.14858259145711648339325545869555809e-01Q),
+         static_cast<storage_type>(1.08519624474263653116093957050116619e-01Q),
+         static_cast<storage_type>(1.00535949067050644202206890392685827e-01Q),
+         static_cast<storage_type>(9.10282619829636498114972207028916534e-02Q),
+         static_cast<storage_type>(8.01407003350010180132349596691113023e-02Q),
+         static_cast<storage_type>(6.80383338123569172071871856567079686e-02Q),
+         static_cast<storage_type>(5.49046959758351919259368915404733242e-02Q),
+         static_cast<storage_type>(4.09391567013063126556234877116459537e-02Q),
+         static_cast<storage_type>(2.63549866150321372619018152952991449e-02Q),
+         static_cast<storage_type>(1.13937985010262879479029641132347736e-02Q),
       };
       return data;
    }
@@ -887,7 +583,7 @@ class gauss_detail<T, 25, 4>
 public:
    static  std::array<T, 13> const & abscissa()
    {
-      static  std::array<T, 13> data = {
+      static  std::array<T, 13> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.2286469261071039638735981880803680553220534604978373842389353789270883496885841582643884994633105537597765980412320e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.4386688372098843204519036279745158640563315632598447642113565325038747278585595067977636776325034060327548499765742e-01),
@@ -901,12 +597,12 @@ class gauss_detail<T, 25, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.4297457122897433941401116965847053190520157060899014192745249713729532254404926130890521815127348327109666786665572e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.7666392145951751149831538647959406774537055531440674467098742731616386753588055389644670948300617866819865983054648e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9555696979049809790878494689390161725756264940480817121080493113293348134372793448728802635294700756868258870429256e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 13> const & weights()
    {
-      static  std::array<T, 13> data = {
+      static  std::array<T, 13> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.2317605372671545120390287307905014243823362751815166539135219731691200794926142128460112517504958377310054583945994e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.2224244299031004168895951894585150583505924756305904090758008223203896721918010243033540891078906637115620156845304e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.1945576353578477222817812651290104739017670141372642551958788133518409022018773502442869720975271321374348568426235e-01),
@@ -920,198 +616,106 @@ class gauss_detail<T, 25, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 4.0939156701306312655623487711645953660845783364104346504698414899297432880215512770478971055110424130123527015425511e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.6354986615032137261901815295299144935963281703322468755366165783870934008879499371529821528172928890350362464605104e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.1393798501026287947902964113234773603320526292909696448948061116189891729766743355923677112945033505688431618009664e-02),
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_detail<T, 30, 0>
-{
-public:
-   static std::array<T, 15> const & abscissa()
-   {
-      static constexpr std::array<T, 15> data = {
-         5.147184256e-02f,
-         1.538699136e-01f,
-         2.546369262e-01f,
-         3.527047255e-01f,
-         4.470337695e-01f,
-         5.366241481e-01f,
-         6.205261830e-01f,
-         6.978504948e-01f,
-         7.677774321e-01f,
-         8.295657624e-01f,
-         8.825605358e-01f,
-         9.262000474e-01f,
-         9.600218650e-01f,
-         9.836681233e-01f,
-         9.968934841e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 15> const & weights()
-   {
-      static constexpr std::array<T, 15> data = {
-         1.028526529e-01f,
-         1.017623897e-01f,
-         9.959342059e-02f,
-         9.636873717e-02f,
-         9.212252224e-02f,
-         8.689978720e-02f,
-         8.075589523e-02f,
-         7.375597474e-02f,
-         6.597422988e-02f,
-         5.749315622e-02f,
-         4.840267283e-02f,
-         3.879919257e-02f,
-         2.878470788e-02f,
-         1.846646831e-02f,
-         7.968192496e-03f,
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
-template <class T>
-class gauss_detail<T, 30, 1>
-{
-public:
-   static std::array<T, 15> const & abscissa()
-   {
-      static constexpr std::array<T, 15> data = {
-         5.14718425553176958e-02,
-         1.53869913608583547e-01,
-         2.54636926167889846e-01,
-         3.52704725530878113e-01,
-         4.47033769538089177e-01,
-         5.36624148142019899e-01,
-         6.20526182989242861e-01,
-         6.97850494793315797e-01,
-         7.67777432104826195e-01,
-         8.29565762382768397e-01,
-         8.82560535792052682e-01,
-         9.26200047429274326e-01,
-         9.60021864968307512e-01,
-         9.83668123279747210e-01,
-         9.96893484074649540e-01,
-      };
-      return data;
-   }
-   static std::array<T, 15> const & weights()
-   {
-      static constexpr std::array<T, 15> data = {
-         1.02852652893558840e-01,
-         1.01762389748405505e-01,
-         9.95934205867952671e-02,
-         9.63687371746442596e-02,
-         9.21225222377861287e-02,
-         8.68997872010829798e-02,
-         8.07558952294202154e-02,
-         7.37559747377052063e-02,
-         6.59742298821804951e-02,
-         5.74931562176190665e-02,
-         4.84026728305940529e-02,
-         3.87991925696270496e-02,
-         2.87847078833233693e-02,
-         1.84664683110909591e-02,
-         7.96819249616660562e-03,
-      };
-      return data;
-   }
-};
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
-class gauss_detail<T, 30, 2>
+class gauss_detail<T, 30, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 15> const & abscissa()
+   static std::array<storage_type, 15> const & abscissa()
    {
-      static constexpr std::array<T, 15> data = {
-         5.14718425553176958330252131667225737e-02L,
-         1.53869913608583546963794672743255920e-01L,
-         2.54636926167889846439805129817805108e-01L,
-         3.52704725530878113471037207089373861e-01L,
-         4.47033769538089176780609900322854000e-01L,
-         5.36624148142019899264169793311072794e-01L,
-         6.20526182989242861140477556431189299e-01L,
-         6.97850494793315796932292388026640068e-01L,
-         7.67777432104826194917977340974503132e-01L,
-         8.29565762382768397442898119732501916e-01L,
-         8.82560535792052681543116462530225590e-01L,
-         9.26200047429274325879324277080474004e-01L,
-         9.60021864968307512216871025581797663e-01L,
-         9.83668123279747209970032581605662802e-01L,
-         9.96893484074649540271630050918695283e-01L,
+      static constexpr std::array<storage_type, 15> data = {
+         static_cast<storage_type>(5.14718425553176958330252131667225737e-02L),
+         static_cast<storage_type>(1.53869913608583546963794672743255920e-01L),
+         static_cast<storage_type>(2.54636926167889846439805129817805108e-01L),
+         static_cast<storage_type>(3.52704725530878113471037207089373861e-01L),
+         static_cast<storage_type>(4.47033769538089176780609900322854000e-01L),
+         static_cast<storage_type>(5.36624148142019899264169793311072794e-01L),
+         static_cast<storage_type>(6.20526182989242861140477556431189299e-01L),
+         static_cast<storage_type>(6.97850494793315796932292388026640068e-01L),
+         static_cast<storage_type>(7.67777432104826194917977340974503132e-01L),
+         static_cast<storage_type>(8.29565762382768397442898119732501916e-01L),
+         static_cast<storage_type>(8.82560535792052681543116462530225590e-01L),
+         static_cast<storage_type>(9.26200047429274325879324277080474004e-01L),
+         static_cast<storage_type>(9.60021864968307512216871025581797663e-01L),
+         static_cast<storage_type>(9.83668123279747209970032581605662802e-01L),
+         static_cast<storage_type>(9.96893484074649540271630050918695283e-01L),
       };
       return data;
    }
-   static std::array<T, 15> const & weights()
+   static std::array<storage_type, 15> const & weights()
    {
-      static constexpr std::array<T, 15> data = {
-         1.02852652893558840341285636705415044e-01L,
-         1.01762389748405504596428952168554045e-01L,
-         9.95934205867952670627802821035694765e-02L,
-         9.63687371746442596394686263518098651e-02L,
-         9.21225222377861287176327070876187672e-02L,
-         8.68997872010829798023875307151257026e-02L,
-         8.07558952294202153546949384605297309e-02L,
-         7.37559747377052062682438500221907342e-02L,
-         6.59742298821804951281285151159623612e-02L,
-         5.74931562176190664817216894020561288e-02L,
-         4.84026728305940529029381404228075178e-02L,
-         3.87991925696270495968019364463476920e-02L,
-         2.87847078833233693497191796112920436e-02L,
-         1.84664683110909591423021319120472691e-02L,
-         7.96819249616660561546588347467362245e-03L,
+      static constexpr std::array<storage_type, 15> data = {
+         static_cast<storage_type>(1.02852652893558840341285636705415044e-01L),
+         static_cast<storage_type>(1.01762389748405504596428952168554045e-01L),
+         static_cast<storage_type>(9.95934205867952670627802821035694765e-02L),
+         static_cast<storage_type>(9.63687371746442596394686263518098651e-02L),
+         static_cast<storage_type>(9.21225222377861287176327070876187672e-02L),
+         static_cast<storage_type>(8.68997872010829798023875307151257026e-02L),
+         static_cast<storage_type>(8.07558952294202153546949384605297309e-02L),
+         static_cast<storage_type>(7.37559747377052062682438500221907342e-02L),
+         static_cast<storage_type>(6.59742298821804951281285151159623612e-02L),
+         static_cast<storage_type>(5.74931562176190664817216894020561288e-02L),
+         static_cast<storage_type>(4.84026728305940529029381404228075178e-02L),
+         static_cast<storage_type>(3.87991925696270495968019364463476920e-02L),
+         static_cast<storage_type>(2.87847078833233693497191796112920436e-02L),
+         static_cast<storage_type>(1.84664683110909591423021319120472691e-02L),
+         static_cast<storage_type>(7.96819249616660561546588347467362245e-03L),
       };
       return data;
    }
 };
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_detail<T, 30, 3>
+class gauss_detail<T, 30, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 15> const & abscissa()
+   static std::array<storage_type, 15> const & abscissa()
    {
-      static const std::array<T, 15> data = {
-         5.14718425553176958330252131667225737e-02Q,
-         1.53869913608583546963794672743255920e-01Q,
-         2.54636926167889846439805129817805108e-01Q,
-         3.52704725530878113471037207089373861e-01Q,
-         4.47033769538089176780609900322854000e-01Q,
-         5.36624148142019899264169793311072794e-01Q,
-         6.20526182989242861140477556431189299e-01Q,
-         6.97850494793315796932292388026640068e-01Q,
-         7.67777432104826194917977340974503132e-01Q,
-         8.29565762382768397442898119732501916e-01Q,
-         8.82560535792052681543116462530225590e-01Q,
-         9.26200047429274325879324277080474004e-01Q,
-         9.60021864968307512216871025581797663e-01Q,
-         9.83668123279747209970032581605662802e-01Q,
-         9.96893484074649540271630050918695283e-01Q,
+      static const std::array<storage_type, 15> data = {
+         static_cast<storage_type>(5.14718425553176958330252131667225737e-02Q),
+         static_cast<storage_type>(1.53869913608583546963794672743255920e-01Q),
+         static_cast<storage_type>(2.54636926167889846439805129817805108e-01Q),
+         static_cast<storage_type>(3.52704725530878113471037207089373861e-01Q),
+         static_cast<storage_type>(4.47033769538089176780609900322854000e-01Q),
+         static_cast<storage_type>(5.36624148142019899264169793311072794e-01Q),
+         static_cast<storage_type>(6.20526182989242861140477556431189299e-01Q),
+         static_cast<storage_type>(6.97850494793315796932292388026640068e-01Q),
+         static_cast<storage_type>(7.67777432104826194917977340974503132e-01Q),
+         static_cast<storage_type>(8.29565762382768397442898119732501916e-01Q),
+         static_cast<storage_type>(8.82560535792052681543116462530225590e-01Q),
+         static_cast<storage_type>(9.26200047429274325879324277080474004e-01Q),
+         static_cast<storage_type>(9.60021864968307512216871025581797663e-01Q),
+         static_cast<storage_type>(9.83668123279747209970032581605662802e-01Q),
+         static_cast<storage_type>(9.96893484074649540271630050918695283e-01Q),
       };
       return data;
    }
-   static std::array<T, 15> const & weights()
+   static std::array<storage_type, 15> const & weights()
    {
-      static const std::array<T, 15> data = {
-         1.02852652893558840341285636705415044e-01Q,
-         1.01762389748405504596428952168554045e-01Q,
-         9.95934205867952670627802821035694765e-02Q,
-         9.63687371746442596394686263518098651e-02Q,
-         9.21225222377861287176327070876187672e-02Q,
-         8.68997872010829798023875307151257026e-02Q,
-         8.07558952294202153546949384605297309e-02Q,
-         7.37559747377052062682438500221907342e-02Q,
-         6.59742298821804951281285151159623612e-02Q,
-         5.74931562176190664817216894020561288e-02Q,
-         4.84026728305940529029381404228075178e-02Q,
-         3.87991925696270495968019364463476920e-02Q,
-         2.87847078833233693497191796112920436e-02Q,
-         1.84664683110909591423021319120472691e-02Q,
-         7.96819249616660561546588347467362245e-03Q,
+      static const std::array<storage_type, 15> data = {
+         static_cast<storage_type>(1.02852652893558840341285636705415044e-01Q),
+         static_cast<storage_type>(1.01762389748405504596428952168554045e-01Q),
+         static_cast<storage_type>(9.95934205867952670627802821035694765e-02Q),
+         static_cast<storage_type>(9.63687371746442596394686263518098651e-02Q),
+         static_cast<storage_type>(9.21225222377861287176327070876187672e-02Q),
+         static_cast<storage_type>(8.68997872010829798023875307151257026e-02Q),
+         static_cast<storage_type>(8.07558952294202153546949384605297309e-02Q),
+         static_cast<storage_type>(7.37559747377052062682438500221907342e-02Q),
+         static_cast<storage_type>(6.59742298821804951281285151159623612e-02Q),
+         static_cast<storage_type>(5.74931562176190664817216894020561288e-02Q),
+         static_cast<storage_type>(4.84026728305940529029381404228075178e-02Q),
+         static_cast<storage_type>(3.87991925696270495968019364463476920e-02Q),
+         static_cast<storage_type>(2.87847078833233693497191796112920436e-02Q),
+         static_cast<storage_type>(1.84664683110909591423021319120472691e-02Q),
+         static_cast<storage_type>(7.96819249616660561546588347467362245e-03Q),
       };
       return data;
    }
@@ -1123,7 +727,7 @@ class gauss_detail<T, 30, 4>
 public:
    static  std::array<T, 15> const & abscissa()
    {
-      static  std::array<T, 15> data = {
+      static  std::array<T, 15> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.1471842555317695833025213166722573749141453666569564255160843987964755210427109055870090707285485841217089963590678e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.5386991360858354696379467274325592041855197124433846171896298291578714851081610139692310651074078557990111754952062e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.5463692616788984643980512981780510788278930330251842616428597508896353156907880290636628138423620257595521678255758e-01),
@@ -1139,12 +743,12 @@ class gauss_detail<T, 30, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.6002186496830751221687102558179766293035921740392339948566167242493995770706842922718944370380002378239172677454384e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.8366812327974720997003258160566280194031785470971136351718001015114429536479104370207597166035471368057762560137209e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9689348407464954027163005091869528334088203811775079010809429780238769521016374081588201955806171741257405095963817e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 15> const & weights()
    {
-      static  std::array<T, 15> data = {
+      static  std::array<T, 15> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0285265289355884034128563670541504386837555706492822258631898667601623865660942939262884632188870916503815852709086e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0176238974840550459642895216855404463270628948712684086426094541964251360531767494547599781978391198881693385887696e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9593420586795267062780282103569476529869263666704277221365146183946660389908809018092299289324184705373523229592037e-02),
@@ -1160,7 +764,7 @@ class gauss_detail<T, 30, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.8784707883323369349719179611292043639588894546287496474180122608145988940013933101730206711484171554940392262251283e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.8466468311090959142302131912047269096206533968181403371298365514585599521307973654080519029675417955638095832046164e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.9681924961666056154658834746736224504806965871517212294851633569200384329013332941536616922861735209846506562158817e-03),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
@@ -1185,7 +789,7 @@ class gauss : public detail::gauss_detail<Real, N, detail::gauss_constant_catego
       unsigned non_zero_start = 1;
       K result = Real(0);
       if (N & 1) {
-         result = f(Real(0)) * base::weights()[0];
+         result = f(Real(0)) * static_cast<Real>(base::weights()[0]);
       }
       else {
          result = 0;
@@ -1194,10 +798,10 @@ class gauss : public detail::gauss_detail<Real, N, detail::gauss_constant_catego
       Real L1 = abs(result);
       for (unsigned i = non_zero_start; i < base::abscissa().size(); ++i)
       {
-         K fp = f(base::abscissa()[i]);
-         K fm = f(-base::abscissa()[i]);
-         result += (fp + fm) * base::weights()[i];
-         L1 += (abs(fp) + abs(fm)) *  base::weights()[i];
+         K fp = f(static_cast<Real>(base::abscissa()[i]));
+         K fm = f(static_cast<Real>(-base::abscissa()[i]));
+         result += (fp + fm) * static_cast<Real>(base::weights()[i]);
+         L1 += (abs(fp) + abs(fm)) * static_cast<Real>(base::weights()[i]);
       }
       if (pL1)
          *pL1 = L1;
diff --git a/inst/include/boost/math/quadrature/gauss_kronrod.hpp b/inst/include/boost/math/quadrature/gauss_kronrod.hpp
index 63390db83..a81cb43c4 100644
--- a/inst/include/boost/math/quadrature/gauss_kronrod.hpp
+++ b/inst/include/boost/math/quadrature/gauss_kronrod.hpp
@@ -82,138 +82,73 @@ class gauss_kronrod_detail;
 
 #endif
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_kronrod_detail<T, 15, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 8> const & abscissa()
-   {
-      static constexpr std::array<T, 8> data = {
-         0.000000000e+00f,
-         2.077849550e-01f,
-         4.058451514e-01f,
-         5.860872355e-01f,
-         7.415311856e-01f,
-         8.648644234e-01f,
-         9.491079123e-01f,
-         9.914553711e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 8> const & weights()
-   {
-      static constexpr std::array<T, 8> data = {
-         2.094821411e-01f,
-         2.044329401e-01f,
-         1.903505781e-01f,
-         1.690047266e-01f,
-         1.406532597e-01f,
-         1.047900103e-01f,
-         6.309209263e-02f,
-         2.293532201e-02f,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_kronrod_detail<T, 15, 1>
-{
-public:
-   static std::array<T, 8> const & abscissa()
-   {
-      static constexpr std::array<T, 8> data = {
-         0.00000000000000000e+00,
-         2.07784955007898468e-01,
-         4.05845151377397167e-01,
-         5.86087235467691130e-01,
-         7.41531185599394440e-01,
-         8.64864423359769073e-01,
-         9.49107912342758525e-01,
-         9.91455371120812639e-01,
+   static std::array<storage_type, 8> const & abscissa()
+   {
+      static constexpr std::array<storage_type, 8> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(2.07784955007898467600689403773244913e-01L),
+         static_cast<storage_type>(4.05845151377397166906606412076961463e-01L),
+         static_cast<storage_type>(5.86087235467691130294144838258729598e-01L),
+         static_cast<storage_type>(7.41531185599394439863864773280788407e-01L),
+         static_cast<storage_type>(8.64864423359769072789712788640926201e-01L),
+         static_cast<storage_type>(9.49107912342758524526189684047851262e-01L),
+         static_cast<storage_type>(9.91455371120812639206854697526328517e-01L),
       };
       return data;
    }
-   static std::array<T, 8> const & weights()
-   {
-      static constexpr std::array<T, 8> data = {
-         2.09482141084727828e-01,
-         2.04432940075298892e-01,
-         1.90350578064785410e-01,
-         1.69004726639267903e-01,
-         1.40653259715525919e-01,
-         1.04790010322250184e-01,
-         6.30920926299785533e-02,
-         2.29353220105292250e-02,
+   static std::array<storage_type, 8> const & weights()
+   {
+      static constexpr std::array<storage_type, 8> data = {
+         static_cast<storage_type>(2.09482141084727828012999174891714264e-01L),
+         static_cast<storage_type>(2.04432940075298892414161999234649085e-01L),
+         static_cast<storage_type>(1.90350578064785409913256402421013683e-01L),
+         static_cast<storage_type>(1.69004726639267902826583426598550284e-01L),
+         static_cast<storage_type>(1.40653259715525918745189590510237920e-01L),
+         static_cast<storage_type>(1.04790010322250183839876322541518017e-01L),
+         static_cast<storage_type>(6.30920926299785532907006631892042867e-02L),
+         static_cast<storage_type>(2.29353220105292249637320080589695920e-02L),
       };
       return data;
    }
 };
 
+#else
 template <class T>
-class gauss_kronrod_detail<T, 15, 2>
-{
-public:
-   static std::array<T, 8> const & abscissa()
-   {
-      static constexpr std::array<T, 8> data = {
-         0.00000000000000000000000000000000000e+00L,
-         2.07784955007898467600689403773244913e-01L,
-         4.05845151377397166906606412076961463e-01L,
-         5.86087235467691130294144838258729598e-01L,
-         7.41531185599394439863864773280788407e-01L,
-         8.64864423359769072789712788640926201e-01L,
-         9.49107912342758524526189684047851262e-01L,
-         9.91455371120812639206854697526328517e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 8> const & weights()
-   {
-      static constexpr std::array<T, 8> data = {
-         2.09482141084727828012999174891714264e-01L,
-         2.04432940075298892414161999234649085e-01L,
-         1.90350578064785409913256402421013683e-01L,
-         1.69004726639267902826583426598550284e-01L,
-         1.40653259715525918745189590510237920e-01L,
-         1.04790010322250183839876322541518017e-01L,
-         6.30920926299785532907006631892042867e-02L,
-         2.29353220105292249637320080589695920e-02L,
-      };
-      return data;
-   }
-};
-
-#ifdef BOOST_HAS_FLOAT128
-template <class T>
-class gauss_kronrod_detail<T, 15, 3>
+class gauss_kronrod_detail<T, 15, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 8> const & abscissa()
-   {
-      static const std::array<T, 8> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         2.07784955007898467600689403773244913e-01Q,
-         4.05845151377397166906606412076961463e-01Q,
-         5.86087235467691130294144838258729598e-01Q,
-         7.41531185599394439863864773280788407e-01Q,
-         8.64864423359769072789712788640926201e-01Q,
-         9.49107912342758524526189684047851262e-01Q,
-         9.91455371120812639206854697526328517e-01Q,
+   static std::array<storage_type, 8> const & abscissa()
+   {
+      static const std::array<storage_type, 8> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(2.07784955007898467600689403773244913e-01Q),
+         static_cast<storage_type>(4.05845151377397166906606412076961463e-01Q),
+         static_cast<storage_type>(5.86087235467691130294144838258729598e-01Q),
+         static_cast<storage_type>(7.41531185599394439863864773280788407e-01Q),
+         static_cast<storage_type>(8.64864423359769072789712788640926201e-01Q),
+         static_cast<storage_type>(9.49107912342758524526189684047851262e-01Q),
+         static_cast<storage_type>(9.91455371120812639206854697526328517e-01Q),
       };
       return data;
    }
-   static std::array<T, 8> const & weights()
-   {
-      static const std::array<T, 8> data = {
-         2.09482141084727828012999174891714264e-01Q,
-         2.04432940075298892414161999234649085e-01Q,
-         1.90350578064785409913256402421013683e-01Q,
-         1.69004726639267902826583426598550284e-01Q,
-         1.40653259715525918745189590510237920e-01Q,
-         1.04790010322250183839876322541518017e-01Q,
-         6.30920926299785532907006631892042867e-02Q,
-         2.29353220105292249637320080589695920e-02Q,
+   static std::array<storage_type, 8> const & weights()
+   {
+      static const std::array<storage_type, 8> data = {
+         static_cast<storage_type>(2.09482141084727828012999174891714264e-01Q),
+         static_cast<storage_type>(2.04432940075298892414161999234649085e-01Q),
+         static_cast<storage_type>(1.90350578064785409913256402421013683e-01Q),
+         static_cast<storage_type>(1.69004726639267902826583426598550284e-01Q),
+         static_cast<storage_type>(1.40653259715525918745189590510237920e-01Q),
+         static_cast<storage_type>(1.04790010322250183839876322541518017e-01Q),
+         static_cast<storage_type>(6.30920926299785532907006631892042867e-02Q),
+         static_cast<storage_type>(2.29353220105292249637320080589695920e-02Q),
       };
       return data;
    }
@@ -226,7 +161,7 @@ class gauss_kronrod_detail<T, 15, 4>
 public:
    static  std::array<T, 8> const & abscissa()
    {
-      static  std::array<T, 8> data = {
+      static  std::array<T, 8> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.0778495500789846760068940377324491347978440714517064971384573461986693844943520226910343227183698530560857645062738e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 4.0584515137739716690660641207696146334738201409937012638704325179466381322612565532831268972774658776528675866604802e-01),
@@ -235,12 +170,12 @@ class gauss_kronrod_detail<T, 15, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 8.6486442335976907278971278864092620121097230707408814860145771276706770813259572103585847859604590541475281326027862e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.4910791234275852452618968404785126240077093767061778354876910391306333035484014080573077002792572414430073966699522e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9145537112081263920685469752632851664204433837033470129108741357244173934653407235924503509626841760744349505339308e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 8> const & weights()
    {
-      static  std::array<T, 8> data = {
+      static  std::array<T, 8> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.0948214108472782801299917489171426369776208022370431671299800656137515132325648616816908211675949102392971459688215e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.0443294007529889241416199923464908471651760418071835742447095312045467698546598879348374292009347554167803659293064e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.9035057806478540991325640242101368282607807545535835588544088036744058072410212679605964605106377593834568683551139e-01),
@@ -249,167 +184,91 @@ class gauss_kronrod_detail<T, 15, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0479001032225018383987632254151801744375665421383061189339065133963746321576289524167571627509311333949422518201492e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.3092092629978553290700663189204286665071157211550707113605545146983997477964874928199170264504441995865872491871943e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.2935322010529224963732008058969591993560811275746992267507430254711815787976075946156368168156289483493617134063245e-02),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 21, 0>
-{
-public:
-   static std::array<T, 11> const & abscissa()
-   {
-      static constexpr std::array<T, 11> data = {
-         0.000000000e+00f,
-         1.488743390e-01f,
-         2.943928627e-01f,
-         4.333953941e-01f,
-         5.627571347e-01f,
-         6.794095683e-01f,
-         7.808177266e-01f,
-         8.650633667e-01f,
-         9.301574914e-01f,
-         9.739065285e-01f,
-         9.956571630e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 11> const & weights()
-   {
-      static constexpr std::array<T, 11> data = {
-         1.494455540e-01f,
-         1.477391049e-01f,
-         1.427759386e-01f,
-         1.347092173e-01f,
-         1.234919763e-01f,
-         1.093871588e-01f,
-         9.312545458e-02f,
-         7.503967481e-02f,
-         5.475589657e-02f,
-         3.255816231e-02f,
-         1.169463887e-02f,
-      };
-      return data;
-   }
-};
-
-template <class T>
-class gauss_kronrod_detail<T, 21, 1>
-{
-public:
-   static std::array<T, 11> const & abscissa()
-   {
-      static constexpr std::array<T, 11> data = {
-         0.00000000000000000e+00,
-         1.48874338981631211e-01,
-         2.94392862701460198e-01,
-         4.33395394129247191e-01,
-         5.62757134668604683e-01,
-         6.79409568299024406e-01,
-         7.80817726586416897e-01,
-         8.65063366688984511e-01,
-         9.30157491355708226e-01,
-         9.73906528517171720e-01,
-         9.95657163025808081e-01,
-      };
-      return data;
-   }
-   static std::array<T, 11> const & weights()
-   {
-      static constexpr std::array<T, 11> data = {
-         1.49445554002916906e-01,
-         1.47739104901338491e-01,
-         1.42775938577060081e-01,
-         1.34709217311473326e-01,
-         1.23491976262065851e-01,
-         1.09387158802297642e-01,
-         9.31254545836976055e-02,
-         7.50396748109199528e-02,
-         5.47558965743519960e-02,
-         3.25581623079647275e-02,
-         1.16946388673718743e-02,
-      };
-      return data;
-   }
-};
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
-class gauss_kronrod_detail<T, 21, 2>
+class gauss_kronrod_detail<T, 21, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 11> const & abscissa()
-   {
-      static constexpr std::array<T, 11> data = {
-         0.00000000000000000000000000000000000e+00L,
-         1.48874338981631210884826001129719985e-01L,
-         2.94392862701460198131126603103865566e-01L,
-         4.33395394129247190799265943165784162e-01L,
-         5.62757134668604683339000099272694141e-01L,
-         6.79409568299024406234327365114873576e-01L,
-         7.80817726586416897063717578345042377e-01L,
-         8.65063366688984510732096688423493049e-01L,
-         9.30157491355708226001207180059508346e-01L,
-         9.73906528517171720077964012084452053e-01L,
-         9.95657163025808080735527280689002848e-01L,
+   static std::array<storage_type, 11> const & abscissa()
+   {
+      static constexpr std::array<storage_type, 11> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(1.48874338981631210884826001129719985e-01L),
+         static_cast<storage_type>(2.94392862701460198131126603103865566e-01L),
+         static_cast<storage_type>(4.33395394129247190799265943165784162e-01L),
+         static_cast<storage_type>(5.62757134668604683339000099272694141e-01L),
+         static_cast<storage_type>(6.79409568299024406234327365114873576e-01L),
+         static_cast<storage_type>(7.80817726586416897063717578345042377e-01L),
+         static_cast<storage_type>(8.65063366688984510732096688423493049e-01L),
+         static_cast<storage_type>(9.30157491355708226001207180059508346e-01L),
+         static_cast<storage_type>(9.73906528517171720077964012084452053e-01L),
+         static_cast<storage_type>(9.95657163025808080735527280689002848e-01L),
       };
       return data;
    }
-   static std::array<T, 11> const & weights()
-   {
-      static constexpr std::array<T, 11> data = {
-         1.49445554002916905664936468389821204e-01L,
-         1.47739104901338491374841515972068046e-01L,
-         1.42775938577060080797094273138717061e-01L,
-         1.34709217311473325928054001771706833e-01L,
-         1.23491976262065851077958109831074160e-01L,
-         1.09387158802297641899210590325804960e-01L,
-         9.31254545836976055350654650833663444e-02L,
-         7.50396748109199527670431409161900094e-02L,
-         5.47558965743519960313813002445801764e-02L,
-         3.25581623079647274788189724593897606e-02L,
-         1.16946388673718742780643960621920484e-02L,
+   static std::array<storage_type, 11> const & weights()
+   {
+      static constexpr std::array<storage_type, 11> data = {
+         static_cast<storage_type>(1.49445554002916905664936468389821204e-01L),
+         static_cast<storage_type>(1.47739104901338491374841515972068046e-01L),
+         static_cast<storage_type>(1.42775938577060080797094273138717061e-01L),
+         static_cast<storage_type>(1.34709217311473325928054001771706833e-01L),
+         static_cast<storage_type>(1.23491976262065851077958109831074160e-01L),
+         static_cast<storage_type>(1.09387158802297641899210590325804960e-01L),
+         static_cast<storage_type>(9.31254545836976055350654650833663444e-02L),
+         static_cast<storage_type>(7.50396748109199527670431409161900094e-02L),
+         static_cast<storage_type>(5.47558965743519960313813002445801764e-02L),
+         static_cast<storage_type>(3.25581623079647274788189724593897606e-02L),
+         static_cast<storage_type>(1.16946388673718742780643960621920484e-02L),
       };
       return data;
    }
 };
 
-#ifdef BOOST_HAS_FLOAT128
+#else
 template <class T>
-class gauss_kronrod_detail<T, 21, 3>
+class gauss_kronrod_detail<T, 21, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 11> const & abscissa()
-   {
-      static const std::array<T, 11> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         1.48874338981631210884826001129719985e-01Q,
-         2.94392862701460198131126603103865566e-01Q,
-         4.33395394129247190799265943165784162e-01Q,
-         5.62757134668604683339000099272694141e-01Q,
-         6.79409568299024406234327365114873576e-01Q,
-         7.80817726586416897063717578345042377e-01Q,
-         8.65063366688984510732096688423493049e-01Q,
-         9.30157491355708226001207180059508346e-01Q,
-         9.73906528517171720077964012084452053e-01Q,
-         9.95657163025808080735527280689002848e-01Q,
+   static std::array<storage_type, 11> const & abscissa()
+   {
+      static const std::array<storage_type, 11> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(1.48874338981631210884826001129719985e-01Q),
+         static_cast<storage_type>(2.94392862701460198131126603103865566e-01Q),
+         static_cast<storage_type>(4.33395394129247190799265943165784162e-01Q),
+         static_cast<storage_type>(5.62757134668604683339000099272694141e-01Q),
+         static_cast<storage_type>(6.79409568299024406234327365114873576e-01Q),
+         static_cast<storage_type>(7.80817726586416897063717578345042377e-01Q),
+         static_cast<storage_type>(8.65063366688984510732096688423493049e-01Q),
+         static_cast<storage_type>(9.30157491355708226001207180059508346e-01Q),
+         static_cast<storage_type>(9.73906528517171720077964012084452053e-01Q),
+         static_cast<storage_type>(9.95657163025808080735527280689002848e-01Q),
       };
       return data;
    }
-   static std::array<T, 11> const & weights()
-   {
-      static const std::array<T, 11> data = {
-         1.49445554002916905664936468389821204e-01Q,
-         1.47739104901338491374841515972068046e-01Q,
-         1.42775938577060080797094273138717061e-01Q,
-         1.34709217311473325928054001771706833e-01Q,
-         1.23491976262065851077958109831074160e-01Q,
-         1.09387158802297641899210590325804960e-01Q,
-         9.31254545836976055350654650833663444e-02Q,
-         7.50396748109199527670431409161900094e-02Q,
-         5.47558965743519960313813002445801764e-02Q,
-         3.25581623079647274788189724593897606e-02Q,
-         1.16946388673718742780643960621920484e-02Q,
+   static std::array<storage_type, 11> const & weights()
+   {
+      static const std::array<storage_type, 11> data = {
+         static_cast<storage_type>(1.49445554002916905664936468389821204e-01Q),
+         static_cast<storage_type>(1.47739104901338491374841515972068046e-01Q),
+         static_cast<storage_type>(1.42775938577060080797094273138717061e-01Q),
+         static_cast<storage_type>(1.34709217311473325928054001771706833e-01Q),
+         static_cast<storage_type>(1.23491976262065851077958109831074160e-01Q),
+         static_cast<storage_type>(1.09387158802297641899210590325804960e-01Q),
+         static_cast<storage_type>(9.31254545836976055350654650833663444e-02Q),
+         static_cast<storage_type>(7.50396748109199527670431409161900094e-02Q),
+         static_cast<storage_type>(5.47558965743519960313813002445801764e-02Q),
+         static_cast<storage_type>(3.25581623079647274788189724593897606e-02Q),
+         static_cast<storage_type>(1.16946388673718742780643960621920484e-02Q),
       };
       return data;
    }
@@ -422,7 +281,7 @@ class gauss_kronrod_detail<T, 21, 4>
 public:
    static  std::array<T, 11> const & abscissa()
    {
-      static  std::array<T, 11> data = {
+      static  std::array<T, 11> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4887433898163121088482600112971998461756485942069169570798925351590361735566852137117762979946369123003116080525534e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.9439286270146019813112660310386556616268662515695791864888229172724611166332737888445523178268237359119185139299872e-01),
@@ -434,12 +293,12 @@ class gauss_kronrod_detail<T, 21, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.3015749135570822600120718005950834622516790998193924230349406866828415983091673055011194572851007884702013619684320e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.7390652851717172007796401208445205342826994669238211923121206669659520323463615962572356495626855625823304251877421e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9565716302580808073552728068900284792126058721947892436337916111757023046774867357152325996912076724298149077812671e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 11> const & weights()
    {
-      static  std::array<T, 11> data = {
+      static  std::array<T, 11> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4944555400291690566493646838982120374523631668747280383560851873698964478511841925721030705689540264726493367634340e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4773910490133849137484151597206804552373162548520660451819195439885993016735696405732703959182882254268727823258502e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4277593857706008079709427313871706088597905653190555560741004743970770449909340027811131706283756428281146832304737e-01),
@@ -451,207 +310,112 @@ class gauss_kronrod_detail<T, 21, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.4755896574351996031381300244580176373721114058333557524432615804784098927818975325116301569003298086458722055550981e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.2558162307964727478818972459389760617388939845662609571537504232714121820165498692381607605384626494546068817765276e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.1694638867371874278064396062192048396217332481931888927598147525622222058064992651806736704969967250888097490233242e-02),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 31, 0>
-{
-public:
-   static std::array<T, 16> const & abscissa()
-   {
-      static constexpr std::array<T, 16> data = {
-         0.000000000e+00f,
-         1.011420669e-01f,
-         2.011940940e-01f,
-         2.991800072e-01f,
-         3.941513471e-01f,
-         4.850818636e-01f,
-         5.709721726e-01f,
-         6.509967413e-01f,
-         7.244177314e-01f,
-         7.904185014e-01f,
-         8.482065834e-01f,
-         8.972645323e-01f,
-         9.372733924e-01f,
-         9.677390757e-01f,
-         9.879925180e-01f,
-         9.980022987e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 16> const & weights()
-   {
-      static constexpr std::array<T, 16> data = {
-         1.013300070e-01f,
-         1.007698455e-01f,
-         9.917359872e-02f,
-         9.664272698e-02f,
-         9.312659817e-02f,
-         8.856444306e-02f,
-         8.308050282e-02f,
-         7.684968076e-02f,
-         6.985412132e-02f,
-         6.200956780e-02f,
-         5.348152469e-02f,
-         4.458975132e-02f,
-         3.534636079e-02f,
-         2.546084733e-02f,
-         1.500794733e-02f,
-         5.377479873e-03f,
-      };
-      return data;
-   }
-};
 
+#ifndef BOOST_HAS_FLOAT128
 template <class T>
-class gauss_kronrod_detail<T, 31, 1>
+class gauss_kronrod_detail<T, 31, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 16> const & abscissa()
-   {
-      static constexpr std::array<T, 16> data = {
-         0.00000000000000000e+00,
-         1.01142066918717499e-01,
-         2.01194093997434522e-01,
-         2.99180007153168812e-01,
-         3.94151347077563370e-01,
-         4.85081863640239681e-01,
-         5.70972172608538848e-01,
-         6.50996741297416971e-01,
-         7.24417731360170047e-01,
-         7.90418501442465933e-01,
-         8.48206583410427216e-01,
-         8.97264532344081901e-01,
-         9.37273392400705904e-01,
-         9.67739075679139134e-01,
-         9.87992518020485428e-01,
-         9.98002298693397060e-01,
+   static std::array<storage_type, 16> const & abscissa()
+   {
+      static constexpr std::array<storage_type, 16> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(1.01142066918717499027074231447392339e-01L),
+         static_cast<storage_type>(2.01194093997434522300628303394596208e-01L),
+         static_cast<storage_type>(2.99180007153168812166780024266388963e-01L),
+         static_cast<storage_type>(3.94151347077563369897207370981045468e-01L),
+         static_cast<storage_type>(4.85081863640239680693655740232350613e-01L),
+         static_cast<storage_type>(5.70972172608538847537226737253910641e-01L),
+         static_cast<storage_type>(6.50996741297416970533735895313274693e-01L),
+         static_cast<storage_type>(7.24417731360170047416186054613938010e-01L),
+         static_cast<storage_type>(7.90418501442465932967649294817947347e-01L),
+         static_cast<storage_type>(8.48206583410427216200648320774216851e-01L),
+         static_cast<storage_type>(8.97264532344081900882509656454495883e-01L),
+         static_cast<storage_type>(9.37273392400705904307758947710209471e-01L),
+         static_cast<storage_type>(9.67739075679139134257347978784337225e-01L),
+         static_cast<storage_type>(9.87992518020485428489565718586612581e-01L),
+         static_cast<storage_type>(9.98002298693397060285172840152271209e-01L),
       };
       return data;
    }
-   static std::array<T, 16> const & weights()
-   {
-      static constexpr std::array<T, 16> data = {
-         1.01330007014791549e-01,
-         1.00769845523875595e-01,
-         9.91735987217919593e-02,
-         9.66427269836236785e-02,
-         9.31265981708253212e-02,
-         8.85644430562117706e-02,
-         8.30805028231330210e-02,
-         7.68496807577203789e-02,
-         6.98541213187282587e-02,
-         6.20095678006706403e-02,
-         5.34815246909280873e-02,
-         4.45897513247648766e-02,
-         3.53463607913758462e-02,
-         2.54608473267153202e-02,
-         1.50079473293161225e-02,
-         5.37747987292334899e-03,
+   static std::array<storage_type, 16> const & weights()
+   {
+      static constexpr std::array<storage_type, 16> data = {
+         static_cast<storage_type>(1.01330007014791549017374792767492547e-01L),
+         static_cast<storage_type>(1.00769845523875595044946662617569722e-01L),
+         static_cast<storage_type>(9.91735987217919593323931734846031311e-02L),
+         static_cast<storage_type>(9.66427269836236785051799076275893351e-02L),
+         static_cast<storage_type>(9.31265981708253212254868727473457186e-02L),
+         static_cast<storage_type>(8.85644430562117706472754436937743032e-02L),
+         static_cast<storage_type>(8.30805028231330210382892472861037896e-02L),
+         static_cast<storage_type>(7.68496807577203788944327774826590067e-02L),
+         static_cast<storage_type>(6.98541213187282587095200770991474758e-02L),
+         static_cast<storage_type>(6.20095678006706402851392309608029322e-02L),
+         static_cast<storage_type>(5.34815246909280872653431472394302968e-02L),
+         static_cast<storage_type>(4.45897513247648766082272993732796902e-02L),
+         static_cast<storage_type>(3.53463607913758462220379484783600481e-02L),
+         static_cast<storage_type>(2.54608473267153201868740010196533594e-02L),
+         static_cast<storage_type>(1.50079473293161225383747630758072681e-02L),
+         static_cast<storage_type>(5.37747987292334898779205143012764982e-03L),
       };
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 31, 2>
-{
-public:
-   static std::array<T, 16> const & abscissa()
-   {
-      static constexpr std::array<T, 16> data = {
-         0.00000000000000000000000000000000000e+00L,
-         1.01142066918717499027074231447392339e-01L,
-         2.01194093997434522300628303394596208e-01L,
-         2.99180007153168812166780024266388963e-01L,
-         3.94151347077563369897207370981045468e-01L,
-         4.85081863640239680693655740232350613e-01L,
-         5.70972172608538847537226737253910641e-01L,
-         6.50996741297416970533735895313274693e-01L,
-         7.24417731360170047416186054613938010e-01L,
-         7.90418501442465932967649294817947347e-01L,
-         8.48206583410427216200648320774216851e-01L,
-         8.97264532344081900882509656454495883e-01L,
-         9.37273392400705904307758947710209471e-01L,
-         9.67739075679139134257347978784337225e-01L,
-         9.87992518020485428489565718586612581e-01L,
-         9.98002298693397060285172840152271209e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 16> const & weights()
-   {
-      static constexpr std::array<T, 16> data = {
-         1.01330007014791549017374792767492547e-01L,
-         1.00769845523875595044946662617569722e-01L,
-         9.91735987217919593323931734846031311e-02L,
-         9.66427269836236785051799076275893351e-02L,
-         9.31265981708253212254868727473457186e-02L,
-         8.85644430562117706472754436937743032e-02L,
-         8.30805028231330210382892472861037896e-02L,
-         7.68496807577203788944327774826590067e-02L,
-         6.98541213187282587095200770991474758e-02L,
-         6.20095678006706402851392309608029322e-02L,
-         5.34815246909280872653431472394302968e-02L,
-         4.45897513247648766082272993732796902e-02L,
-         3.53463607913758462220379484783600481e-02L,
-         2.54608473267153201868740010196533594e-02L,
-         1.50079473293161225383747630758072681e-02L,
-         5.37747987292334898779205143012764982e-03L,
-      };
-      return data;
-   }
-};
+#else
 
-#ifdef BOOST_HAS_FLOAT128
 template <class T>
-class gauss_kronrod_detail<T, 31, 3>
+class gauss_kronrod_detail<T, 31, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 16> const & abscissa()
-   {
-      static const std::array<T, 16> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         1.01142066918717499027074231447392339e-01Q,
-         2.01194093997434522300628303394596208e-01Q,
-         2.99180007153168812166780024266388963e-01Q,
-         3.94151347077563369897207370981045468e-01Q,
-         4.85081863640239680693655740232350613e-01Q,
-         5.70972172608538847537226737253910641e-01Q,
-         6.50996741297416970533735895313274693e-01Q,
-         7.24417731360170047416186054613938010e-01Q,
-         7.90418501442465932967649294817947347e-01Q,
-         8.48206583410427216200648320774216851e-01Q,
-         8.97264532344081900882509656454495883e-01Q,
-         9.37273392400705904307758947710209471e-01Q,
-         9.67739075679139134257347978784337225e-01Q,
-         9.87992518020485428489565718586612581e-01Q,
-         9.98002298693397060285172840152271209e-01Q,
+   static std::array<storage_type, 16> const & abscissa()
+   {
+      static const std::array<storage_type, 16> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(1.01142066918717499027074231447392339e-01Q),
+         static_cast<storage_type>(2.01194093997434522300628303394596208e-01Q),
+         static_cast<storage_type>(2.99180007153168812166780024266388963e-01Q),
+         static_cast<storage_type>(3.94151347077563369897207370981045468e-01Q),
+         static_cast<storage_type>(4.85081863640239680693655740232350613e-01Q),
+         static_cast<storage_type>(5.70972172608538847537226737253910641e-01Q),
+         static_cast<storage_type>(6.50996741297416970533735895313274693e-01Q),
+         static_cast<storage_type>(7.24417731360170047416186054613938010e-01Q),
+         static_cast<storage_type>(7.90418501442465932967649294817947347e-01Q),
+         static_cast<storage_type>(8.48206583410427216200648320774216851e-01Q),
+         static_cast<storage_type>(8.97264532344081900882509656454495883e-01Q),
+         static_cast<storage_type>(9.37273392400705904307758947710209471e-01Q),
+         static_cast<storage_type>(9.67739075679139134257347978784337225e-01Q),
+         static_cast<storage_type>(9.87992518020485428489565718586612581e-01Q),
+         static_cast<storage_type>(9.98002298693397060285172840152271209e-01Q),
       };
       return data;
    }
-   static std::array<T, 16> const & weights()
-   {
-      static const std::array<T, 16> data = {
-         1.01330007014791549017374792767492547e-01Q,
-         1.00769845523875595044946662617569722e-01Q,
-         9.91735987217919593323931734846031311e-02Q,
-         9.66427269836236785051799076275893351e-02Q,
-         9.31265981708253212254868727473457186e-02Q,
-         8.85644430562117706472754436937743032e-02Q,
-         8.30805028231330210382892472861037896e-02Q,
-         7.68496807577203788944327774826590067e-02Q,
-         6.98541213187282587095200770991474758e-02Q,
-         6.20095678006706402851392309608029322e-02Q,
-         5.34815246909280872653431472394302968e-02Q,
-         4.45897513247648766082272993732796902e-02Q,
-         3.53463607913758462220379484783600481e-02Q,
-         2.54608473267153201868740010196533594e-02Q,
-         1.50079473293161225383747630758072681e-02Q,
-         5.37747987292334898779205143012764982e-03Q,
+   static std::array<storage_type, 16> const & weights()
+   {
+      static const std::array<storage_type, 16> data = {
+         static_cast<storage_type>(1.01330007014791549017374792767492547e-01Q),
+         static_cast<storage_type>(1.00769845523875595044946662617569722e-01Q),
+         static_cast<storage_type>(9.91735987217919593323931734846031311e-02Q),
+         static_cast<storage_type>(9.66427269836236785051799076275893351e-02Q),
+         static_cast<storage_type>(9.31265981708253212254868727473457186e-02Q),
+         static_cast<storage_type>(8.85644430562117706472754436937743032e-02Q),
+         static_cast<storage_type>(8.30805028231330210382892472861037896e-02Q),
+         static_cast<storage_type>(7.68496807577203788944327774826590067e-02Q),
+         static_cast<storage_type>(6.98541213187282587095200770991474758e-02Q),
+         static_cast<storage_type>(6.20095678006706402851392309608029322e-02Q),
+         static_cast<storage_type>(5.34815246909280872653431472394302968e-02Q),
+         static_cast<storage_type>(4.45897513247648766082272993732796902e-02Q),
+         static_cast<storage_type>(3.53463607913758462220379484783600481e-02Q),
+         static_cast<storage_type>(2.54608473267153201868740010196533594e-02Q),
+         static_cast<storage_type>(1.50079473293161225383747630758072681e-02Q),
+         static_cast<storage_type>(5.37747987292334898779205143012764982e-03Q),
       };
       return data;
    }
@@ -664,7 +428,7 @@ class gauss_kronrod_detail<T, 31, 4>
 public:
    static  std::array<T, 16> const & abscissa()
    {
-      static  std::array<T, 16> data = {
+      static  std::array<T, 16> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0114206691871749902707423144739233878745105740164180495800189504151097862454083050931321451540380998341273193681967e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.0119409399743452230062830339459620781283645446263767961594972460994823900302018760183625806752105908967902257386509e-01),
@@ -681,12 +445,12 @@ class gauss_kronrod_detail<T, 31, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.6773907567913913425734797878433722528335733730013163797468062226335804249452174804319385048203118506304424717089291e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.8799251802048542848956571858661258114697281712376148999999751558738843736901942471272205036831914497667516843990079e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9800229869339706028517284015227120907340644231555723034839427970683348682837134566648979907760125278631896777136104e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 16> const & weights()
    {
-      static  std::array<T, 16> data = {
+      static  std::array<T, 16> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0133000701479154901737479276749254677092627259659629246734858372174107615774696665932418050683956749891773195816338e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0076984552387559504494666261756972191634838013536373069278929029488122760822761077475060185965408326901925180106227e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9173598721791959332393173484603131059567260816713281734860095693651563064308745717056680128223790739026832596087552e-02),
@@ -703,247 +467,132 @@ class gauss_kronrod_detail<T, 31, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 2.5460847326715320186874001019653359397271745046864640508377984982400903447009185267605205778819712848080691366407461e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.5007947329316122538374763075807268094639436437387634979291759700896494746154334398961710227490402528151677469993935e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.3774798729233489877920514301276498183080402431284197876486169536848635554354599213793172596490038991436925569025913e-03),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 41, 0>
-{
-public:
-   static std::array<T, 21> const & abscissa()
-   {
-      static constexpr std::array<T, 21> data = {
-         0.000000000e+00f,
-         7.652652113e-02f,
-         1.526054652e-01f,
-         2.277858511e-01f,
-         3.016278681e-01f,
-         3.737060887e-01f,
-         4.435931752e-01f,
-         5.108670020e-01f,
-         5.751404468e-01f,
-         6.360536807e-01f,
-         6.932376563e-01f,
-         7.463319065e-01f,
-         7.950414288e-01f,
-         8.391169718e-01f,
-         8.782768113e-01f,
-         9.122344283e-01f,
-         9.408226338e-01f,
-         9.639719273e-01f,
-         9.815078775e-01f,
-         9.931285992e-01f,
-         9.988590316e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 21> const & weights()
-   {
-      static constexpr std::array<T, 21> data = {
-         7.660071192e-02f,
-         7.637786767e-02f,
-         7.570449768e-02f,
-         7.458287540e-02f,
-         7.303069033e-02f,
-         7.105442355e-02f,
-         6.864867293e-02f,
-         6.583459713e-02f,
-         6.265323755e-02f,
-         5.911140088e-02f,
-         5.519510535e-02f,
-         5.094457392e-02f,
-         4.643482187e-02f,
-         4.166887333e-02f,
-         3.660016976e-02f,
-         3.128730678e-02f,
-         2.588213360e-02f,
-         2.038837346e-02f,
-         1.462616926e-02f,
-         8.600269856e-03f,
-         3.073583719e-03f,
-      };
-      return data;
-   }
-};
+#ifndef BOOST_HAS_FLOAT128
 
 template <class T>
-class gauss_kronrod_detail<T, 41, 1>
+class gauss_kronrod_detail<T, 41, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 21> const & abscissa()
-   {
-      static constexpr std::array<T, 21> data = {
-         0.00000000000000000e+00,
-         7.65265211334973338e-02,
-         1.52605465240922676e-01,
-         2.27785851141645078e-01,
-         3.01627868114913004e-01,
-         3.73706088715419561e-01,
-         4.43593175238725103e-01,
-         5.10867001950827098e-01,
-         5.75140446819710315e-01,
-         6.36053680726515025e-01,
-         6.93237656334751385e-01,
-         7.46331906460150793e-01,
-         7.95041428837551198e-01,
-         8.39116971822218823e-01,
-         8.78276811252281976e-01,
-         9.12234428251325906e-01,
-         9.40822633831754754e-01,
-         9.63971927277913791e-01,
-         9.81507877450250259e-01,
-         9.93128599185094925e-01,
-         9.98859031588277664e-01,
+   static std::array<storage_type, 21> const & abscissa()
+   {
+      static constexpr std::array<storage_type, 21> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(7.65265211334973337546404093988382110e-02L),
+         static_cast<storage_type>(1.52605465240922675505220241022677528e-01L),
+         static_cast<storage_type>(2.27785851141645078080496195368574625e-01L),
+         static_cast<storage_type>(3.01627868114913004320555356858592261e-01L),
+         static_cast<storage_type>(3.73706088715419560672548177024927237e-01L),
+         static_cast<storage_type>(4.43593175238725103199992213492640108e-01L),
+         static_cast<storage_type>(5.10867001950827098004364050955250998e-01L),
+         static_cast<storage_type>(5.75140446819710315342946036586425133e-01L),
+         static_cast<storage_type>(6.36053680726515025452836696226285937e-01L),
+         static_cast<storage_type>(6.93237656334751384805490711845931533e-01L),
+         static_cast<storage_type>(7.46331906460150792614305070355641590e-01L),
+         static_cast<storage_type>(7.95041428837551198350638833272787943e-01L),
+         static_cast<storage_type>(8.39116971822218823394529061701520685e-01L),
+         static_cast<storage_type>(8.78276811252281976077442995113078467e-01L),
+         static_cast<storage_type>(9.12234428251325905867752441203298113e-01L),
+         static_cast<storage_type>(9.40822633831754753519982722212443380e-01L),
+         static_cast<storage_type>(9.63971927277913791267666131197277222e-01L),
+         static_cast<storage_type>(9.81507877450250259193342994720216945e-01L),
+         static_cast<storage_type>(9.93128599185094924786122388471320278e-01L),
+         static_cast<storage_type>(9.98859031588277663838315576545863010e-01L),
       };
       return data;
    }
-   static std::array<T, 21> const & weights()
-   {
-      static constexpr std::array<T, 21> data = {
-         7.66007119179996564e-02,
-         7.63778676720807367e-02,
-         7.57044976845566747e-02,
-         7.45828754004991890e-02,
-         7.30306903327866675e-02,
-         7.10544235534440683e-02,
-         6.86486729285216193e-02,
-         6.58345971336184221e-02,
-         6.26532375547811680e-02,
-         5.91114008806395724e-02,
-         5.51951053482859947e-02,
-         5.09445739237286919e-02,
-         4.64348218674976747e-02,
-         4.16688733279736863e-02,
-         3.66001697582007980e-02,
-         3.12873067770327990e-02,
-         2.58821336049511588e-02,
-         2.03883734612665236e-02,
-         1.46261692569712530e-02,
-         8.60026985564294220e-03,
-         3.07358371852053150e-03,
+   static std::array<storage_type, 21> const & weights()
+   {
+      static constexpr std::array<storage_type, 21> data = {
+         static_cast<storage_type>(7.66007119179996564450499015301017408e-02L),
+         static_cast<storage_type>(7.63778676720807367055028350380610018e-02L),
+         static_cast<storage_type>(7.57044976845566746595427753766165583e-02L),
+         static_cast<storage_type>(7.45828754004991889865814183624875286e-02L),
+         static_cast<storage_type>(7.30306903327866674951894176589131128e-02L),
+         static_cast<storage_type>(7.10544235534440683057903617232101674e-02L),
+         static_cast<storage_type>(6.86486729285216193456234118853678017e-02L),
+         static_cast<storage_type>(6.58345971336184221115635569693979431e-02L),
+         static_cast<storage_type>(6.26532375547811680258701221742549806e-02L),
+         static_cast<storage_type>(5.91114008806395723749672206485942171e-02L),
+         static_cast<storage_type>(5.51951053482859947448323724197773292e-02L),
+         static_cast<storage_type>(5.09445739237286919327076700503449487e-02L),
+         static_cast<storage_type>(4.64348218674976747202318809261075168e-02L),
+         static_cast<storage_type>(4.16688733279736862637883059368947380e-02L),
+         static_cast<storage_type>(3.66001697582007980305572407072110085e-02L),
+         static_cast<storage_type>(3.12873067770327989585431193238007379e-02L),
+         static_cast<storage_type>(2.58821336049511588345050670961531430e-02L),
+         static_cast<storage_type>(2.03883734612665235980102314327547051e-02L),
+         static_cast<storage_type>(1.46261692569712529837879603088683562e-02L),
+         static_cast<storage_type>(8.60026985564294219866178795010234725e-03L),
+         static_cast<storage_type>(3.07358371852053150121829324603098749e-03L),
       };
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 41, 2>
-{
-public:
-   static std::array<T, 21> const & abscissa()
-   {
-      static constexpr std::array<T, 21> data = {
-         0.00000000000000000000000000000000000e+00L,
-         7.65265211334973337546404093988382110e-02L,
-         1.52605465240922675505220241022677528e-01L,
-         2.27785851141645078080496195368574625e-01L,
-         3.01627868114913004320555356858592261e-01L,
-         3.73706088715419560672548177024927237e-01L,
-         4.43593175238725103199992213492640108e-01L,
-         5.10867001950827098004364050955250998e-01L,
-         5.75140446819710315342946036586425133e-01L,
-         6.36053680726515025452836696226285937e-01L,
-         6.93237656334751384805490711845931533e-01L,
-         7.46331906460150792614305070355641590e-01L,
-         7.95041428837551198350638833272787943e-01L,
-         8.39116971822218823394529061701520685e-01L,
-         8.78276811252281976077442995113078467e-01L,
-         9.12234428251325905867752441203298113e-01L,
-         9.40822633831754753519982722212443380e-01L,
-         9.63971927277913791267666131197277222e-01L,
-         9.81507877450250259193342994720216945e-01L,
-         9.93128599185094924786122388471320278e-01L,
-         9.98859031588277663838315576545863010e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 21> const & weights()
-   {
-      static constexpr std::array<T, 21> data = {
-         7.66007119179996564450499015301017408e-02L,
-         7.63778676720807367055028350380610018e-02L,
-         7.57044976845566746595427753766165583e-02L,
-         7.45828754004991889865814183624875286e-02L,
-         7.30306903327866674951894176589131128e-02L,
-         7.10544235534440683057903617232101674e-02L,
-         6.86486729285216193456234118853678017e-02L,
-         6.58345971336184221115635569693979431e-02L,
-         6.26532375547811680258701221742549806e-02L,
-         5.91114008806395723749672206485942171e-02L,
-         5.51951053482859947448323724197773292e-02L,
-         5.09445739237286919327076700503449487e-02L,
-         4.64348218674976747202318809261075168e-02L,
-         4.16688733279736862637883059368947380e-02L,
-         3.66001697582007980305572407072110085e-02L,
-         3.12873067770327989585431193238007379e-02L,
-         2.58821336049511588345050670961531430e-02L,
-         2.03883734612665235980102314327547051e-02L,
-         1.46261692569712529837879603088683562e-02L,
-         8.60026985564294219866178795010234725e-03L,
-         3.07358371852053150121829324603098749e-03L,
-      };
-      return data;
-   }
-};
+#else
 
-#ifdef BOOST_HAS_FLOAT128
 template <class T>
-class gauss_kronrod_detail<T, 41, 3>
+class gauss_kronrod_detail<T, 41, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 21> const & abscissa()
-   {
-      static const std::array<T, 21> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         7.65265211334973337546404093988382110e-02Q,
-         1.52605465240922675505220241022677528e-01Q,
-         2.27785851141645078080496195368574625e-01Q,
-         3.01627868114913004320555356858592261e-01Q,
-         3.73706088715419560672548177024927237e-01Q,
-         4.43593175238725103199992213492640108e-01Q,
-         5.10867001950827098004364050955250998e-01Q,
-         5.75140446819710315342946036586425133e-01Q,
-         6.36053680726515025452836696226285937e-01Q,
-         6.93237656334751384805490711845931533e-01Q,
-         7.46331906460150792614305070355641590e-01Q,
-         7.95041428837551198350638833272787943e-01Q,
-         8.39116971822218823394529061701520685e-01Q,
-         8.78276811252281976077442995113078467e-01Q,
-         9.12234428251325905867752441203298113e-01Q,
-         9.40822633831754753519982722212443380e-01Q,
-         9.63971927277913791267666131197277222e-01Q,
-         9.81507877450250259193342994720216945e-01Q,
-         9.93128599185094924786122388471320278e-01Q,
-         9.98859031588277663838315576545863010e-01Q,
+   static std::array<storage_type, 21> const & abscissa()
+   {
+      static const std::array<storage_type, 21> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(7.65265211334973337546404093988382110e-02Q),
+         static_cast<storage_type>(1.52605465240922675505220241022677528e-01Q),
+         static_cast<storage_type>(2.27785851141645078080496195368574625e-01Q),
+         static_cast<storage_type>(3.01627868114913004320555356858592261e-01Q),
+         static_cast<storage_type>(3.73706088715419560672548177024927237e-01Q),
+         static_cast<storage_type>(4.43593175238725103199992213492640108e-01Q),
+         static_cast<storage_type>(5.10867001950827098004364050955250998e-01Q),
+         static_cast<storage_type>(5.75140446819710315342946036586425133e-01Q),
+         static_cast<storage_type>(6.36053680726515025452836696226285937e-01Q),
+         static_cast<storage_type>(6.93237656334751384805490711845931533e-01Q),
+         static_cast<storage_type>(7.46331906460150792614305070355641590e-01Q),
+         static_cast<storage_type>(7.95041428837551198350638833272787943e-01Q),
+         static_cast<storage_type>(8.39116971822218823394529061701520685e-01Q),
+         static_cast<storage_type>(8.78276811252281976077442995113078467e-01Q),
+         static_cast<storage_type>(9.12234428251325905867752441203298113e-01Q),
+         static_cast<storage_type>(9.40822633831754753519982722212443380e-01Q),
+         static_cast<storage_type>(9.63971927277913791267666131197277222e-01Q),
+         static_cast<storage_type>(9.81507877450250259193342994720216945e-01Q),
+         static_cast<storage_type>(9.93128599185094924786122388471320278e-01Q),
+         static_cast<storage_type>(9.98859031588277663838315576545863010e-01Q),
       };
       return data;
    }
-   static std::array<T, 21> const & weights()
-   {
-      static const std::array<T, 21> data = {
-         7.66007119179996564450499015301017408e-02Q,
-         7.63778676720807367055028350380610018e-02Q,
-         7.57044976845566746595427753766165583e-02Q,
-         7.45828754004991889865814183624875286e-02Q,
-         7.30306903327866674951894176589131128e-02Q,
-         7.10544235534440683057903617232101674e-02Q,
-         6.86486729285216193456234118853678017e-02Q,
-         6.58345971336184221115635569693979431e-02Q,
-         6.26532375547811680258701221742549806e-02Q,
-         5.91114008806395723749672206485942171e-02Q,
-         5.51951053482859947448323724197773292e-02Q,
-         5.09445739237286919327076700503449487e-02Q,
-         4.64348218674976747202318809261075168e-02Q,
-         4.16688733279736862637883059368947380e-02Q,
-         3.66001697582007980305572407072110085e-02Q,
-         3.12873067770327989585431193238007379e-02Q,
-         2.58821336049511588345050670961531430e-02Q,
-         2.03883734612665235980102314327547051e-02Q,
-         1.46261692569712529837879603088683562e-02Q,
-         8.60026985564294219866178795010234725e-03Q,
-         3.07358371852053150121829324603098749e-03Q,
+   static std::array<storage_type, 21> const & weights()
+   {
+      static const std::array<storage_type, 21> data = {
+         static_cast<storage_type>(7.66007119179996564450499015301017408e-02Q),
+         static_cast<storage_type>(7.63778676720807367055028350380610018e-02Q),
+         static_cast<storage_type>(7.57044976845566746595427753766165583e-02Q),
+         static_cast<storage_type>(7.45828754004991889865814183624875286e-02Q),
+         static_cast<storage_type>(7.30306903327866674951894176589131128e-02Q),
+         static_cast<storage_type>(7.10544235534440683057903617232101674e-02Q),
+         static_cast<storage_type>(6.86486729285216193456234118853678017e-02Q),
+         static_cast<storage_type>(6.58345971336184221115635569693979431e-02Q),
+         static_cast<storage_type>(6.26532375547811680258701221742549806e-02Q),
+         static_cast<storage_type>(5.91114008806395723749672206485942171e-02Q),
+         static_cast<storage_type>(5.51951053482859947448323724197773292e-02Q),
+         static_cast<storage_type>(5.09445739237286919327076700503449487e-02Q),
+         static_cast<storage_type>(4.64348218674976747202318809261075168e-02Q),
+         static_cast<storage_type>(4.16688733279736862637883059368947380e-02Q),
+         static_cast<storage_type>(3.66001697582007980305572407072110085e-02Q),
+         static_cast<storage_type>(3.12873067770327989585431193238007379e-02Q),
+         static_cast<storage_type>(2.58821336049511588345050670961531430e-02Q),
+         static_cast<storage_type>(2.03883734612665235980102314327547051e-02Q),
+         static_cast<storage_type>(1.46261692569712529837879603088683562e-02Q),
+         static_cast<storage_type>(8.60026985564294219866178795010234725e-03Q),
+         static_cast<storage_type>(3.07358371852053150121829324603098749e-03Q),
       };
       return data;
    }
@@ -956,7 +605,7 @@ class gauss_kronrod_detail<T, 41, 4>
 public:
    static  std::array<T, 21> const & abscissa()
    {
-      static  std::array<T, 21> data = {
+      static  std::array<T, 21> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.6526521133497333754640409398838211004796266813497500804795244384256342048336978241545114181556215606998505646364133e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.5260546524092267550522024102267752791167622481841730660174156703809133685751696356987995886397049724808931527012542e-01),
@@ -978,12 +627,12 @@ class gauss_kronrod_detail<T, 41, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.8150787745025025919334299472021694456725093981023759869077533318793098857465723460898060491887511355706497739384103e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9312859918509492478612238847132027822264713090165589614818413121798471762775378083944940249657220927472894034724419e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9885903158827766383831557654586300999957020432629666866666860339324411793311982967839129772854179884971700274369367e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 21> const & weights()
    {
-      static  std::array<T, 21> data = {
+      static  std::array<T, 21> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.6600711917999656445049901530101740827932500628670118055485349620314721456712029449597396569857880493210849110825276e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.6377867672080736705502835038061001800801036764945996714946431116936745542061941050008345047482501253320401746334511e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 7.5704497684556674659542775376616558263363155900414326194855223272348838596099414841886740468379707283366777797425290e-02),
@@ -1005,287 +654,152 @@ class gauss_kronrod_detail<T, 41, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.4626169256971252983787960308868356163881050162249770342103474631076960029748751959380482484308382288261238476948520e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 8.6002698556429421986617879501023472521289227667077976622450602031426535362696437838448828009554532025301579670206091e-03),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.0735837185205315012182932460309874880335046882543449198461628212114333665590378156706265241414469306987988292234740e-03),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 51, 0>
-{
-public:
-   static std::array<T, 26> const & abscissa()
-   {
-      static constexpr std::array<T, 26> data = {
-         0.000000000e+00f,
-         6.154448301e-02f,
-         1.228646926e-01f,
-         1.837189394e-01f,
-         2.438668837e-01f,
-         3.030895389e-01f,
-         3.611723058e-01f,
-         4.178853822e-01f,
-         4.730027314e-01f,
-         5.263252843e-01f,
-         5.776629302e-01f,
-         6.268100990e-01f,
-         6.735663685e-01f,
-         7.177664068e-01f,
-         7.592592630e-01f,
-         7.978737980e-01f,
-         8.334426288e-01f,
-         8.658470653e-01f,
-         8.949919979e-01f,
-         9.207471153e-01f,
-         9.429745712e-01f,
-         9.616149864e-01f,
-         9.766639215e-01f,
-         9.880357945e-01f,
-         9.955569698e-01f,
-         9.992621050e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 26> const & weights()
-   {
-      static constexpr std::array<T, 26> data = {
-         6.158081807e-02f,
-         6.147118987e-02f,
-         6.112850972e-02f,
-         6.053945538e-02f,
-         5.972034032e-02f,
-         5.868968002e-02f,
-         5.743711636e-02f,
-         5.595081122e-02f,
-         5.425112989e-02f,
-         5.236288581e-02f,
-         5.027767908e-02f,
-         4.798253714e-02f,
-         4.550291305e-02f,
-         4.287284502e-02f,
-         4.008382550e-02f,
-         3.711627148e-02f,
-         3.400213027e-02f,
-         3.079230017e-02f,
-         2.747531759e-02f,
-         2.400994561e-02f,
-         2.043537115e-02f,
-         1.684781771e-02f,
-         1.323622920e-02f,
-         9.473973386e-03f,
-         5.561932135e-03f,
-         1.987383892e-03f,
-      };
-      return data;
-   }
-};
+#ifndef BOOST_HAS_FLOAT128
 
 template <class T>
-class gauss_kronrod_detail<T, 51, 1>
+class gauss_kronrod_detail<T, 51, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 26> const & abscissa()
-   {
-      static constexpr std::array<T, 26> data = {
-         0.00000000000000000e+00,
-         6.15444830056850789e-02,
-         1.22864692610710396e-01,
-         1.83718939421048892e-01,
-         2.43866883720988432e-01,
-         3.03089538931107830e-01,
-         3.61172305809387838e-01,
-         4.17885382193037749e-01,
-         4.73002731445714961e-01,
-         5.26325284334719183e-01,
-         5.77662930241222968e-01,
-         6.26810099010317413e-01,
-         6.73566368473468364e-01,
-         7.17766406813084388e-01,
-         7.59259263037357631e-01,
-         7.97873797998500059e-01,
-         8.33442628760834001e-01,
-         8.65847065293275595e-01,
-         8.94991997878275369e-01,
-         9.20747115281701562e-01,
-         9.42974571228974339e-01,
-         9.61614986425842512e-01,
-         9.76663921459517511e-01,
-         9.88035794534077248e-01,
-         9.95556969790498098e-01,
-         9.99262104992609834e-01,
+   static std::array<storage_type, 26> const & abscissa()
+   {
+      static constexpr std::array<storage_type, 26> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(6.15444830056850788865463923667966313e-02L),
+         static_cast<storage_type>(1.22864692610710396387359818808036806e-01L),
+         static_cast<storage_type>(1.83718939421048892015969888759528416e-01L),
+         static_cast<storage_type>(2.43866883720988432045190362797451586e-01L),
+         static_cast<storage_type>(3.03089538931107830167478909980339329e-01L),
+         static_cast<storage_type>(3.61172305809387837735821730127640667e-01L),
+         static_cast<storage_type>(4.17885382193037748851814394594572487e-01L),
+         static_cast<storage_type>(4.73002731445714960522182115009192041e-01L),
+         static_cast<storage_type>(5.26325284334719182599623778158010178e-01L),
+         static_cast<storage_type>(5.77662930241222967723689841612654067e-01L),
+         static_cast<storage_type>(6.26810099010317412788122681624517881e-01L),
+         static_cast<storage_type>(6.73566368473468364485120633247622176e-01L),
+         static_cast<storage_type>(7.17766406813084388186654079773297781e-01L),
+         static_cast<storage_type>(7.59259263037357630577282865204360976e-01L),
+         static_cast<storage_type>(7.97873797998500059410410904994306569e-01L),
+         static_cast<storage_type>(8.33442628760834001421021108693569569e-01L),
+         static_cast<storage_type>(8.65847065293275595448996969588340088e-01L),
+         static_cast<storage_type>(8.94991997878275368851042006782804954e-01L),
+         static_cast<storage_type>(9.20747115281701561746346084546330632e-01L),
+         static_cast<storage_type>(9.42974571228974339414011169658470532e-01L),
+         static_cast<storage_type>(9.61614986425842512418130033660167242e-01L),
+         static_cast<storage_type>(9.76663921459517511498315386479594068e-01L),
+         static_cast<storage_type>(9.88035794534077247637331014577406227e-01L),
+         static_cast<storage_type>(9.95556969790498097908784946893901617e-01L),
+         static_cast<storage_type>(9.99262104992609834193457486540340594e-01L),
       };
       return data;
    }
-   static std::array<T, 26> const & weights()
-   {
-      static constexpr std::array<T, 26> data = {
-         6.15808180678329351e-02,
-         6.14711898714253167e-02,
-         6.11285097170530483e-02,
-         6.05394553760458629e-02,
-         5.97203403241740600e-02,
-         5.86896800223942080e-02,
-         5.74371163615678329e-02,
-         5.59508112204123173e-02,
-         5.42511298885454901e-02,
-         5.23628858064074759e-02,
-         5.02776790807156720e-02,
-         4.79825371388367139e-02,
-         4.55029130499217889e-02,
-         4.28728450201700495e-02,
-         4.00838255040323821e-02,
-         3.71162714834155436e-02,
-         3.40021302743293378e-02,
-         3.07923001673874889e-02,
-         2.74753175878517378e-02,
-         2.40099456069532162e-02,
-         2.04353711458828355e-02,
-         1.68478177091282982e-02,
-         1.32362291955716748e-02,
-         9.47397338617415161e-03,
-         5.56193213535671376e-03,
-         1.98738389233031593e-03,
+   static std::array<storage_type, 26> const & weights()
+   {
+      static constexpr std::array<storage_type, 26> data = {
+         static_cast<storage_type>(6.15808180678329350787598242400645532e-02L),
+         static_cast<storage_type>(6.14711898714253166615441319652641776e-02L),
+         static_cast<storage_type>(6.11285097170530483058590304162927119e-02L),
+         static_cast<storage_type>(6.05394553760458629453602675175654272e-02L),
+         static_cast<storage_type>(5.97203403241740599790992919325618538e-02L),
+         static_cast<storage_type>(5.86896800223942079619741758567877641e-02L),
+         static_cast<storage_type>(5.74371163615678328535826939395064720e-02L),
+         static_cast<storage_type>(5.59508112204123173082406863827473468e-02L),
+         static_cast<storage_type>(5.42511298885454901445433704598756068e-02L),
+         static_cast<storage_type>(5.23628858064074758643667121378727149e-02L),
+         static_cast<storage_type>(5.02776790807156719633252594334400844e-02L),
+         static_cast<storage_type>(4.79825371388367139063922557569147550e-02L),
+         static_cast<storage_type>(4.55029130499217889098705847526603930e-02L),
+         static_cast<storage_type>(4.28728450201700494768957924394951611e-02L),
+         static_cast<storage_type>(4.00838255040323820748392844670756464e-02L),
+         static_cast<storage_type>(3.71162714834155435603306253676198760e-02L),
+         static_cast<storage_type>(3.40021302743293378367487952295512032e-02L),
+         static_cast<storage_type>(3.07923001673874888911090202152285856e-02L),
+         static_cast<storage_type>(2.74753175878517378029484555178110786e-02L),
+         static_cast<storage_type>(2.40099456069532162200924891648810814e-02L),
+         static_cast<storage_type>(2.04353711458828354565682922359389737e-02L),
+         static_cast<storage_type>(1.68478177091282982315166675363363158e-02L),
+         static_cast<storage_type>(1.32362291955716748136564058469762381e-02L),
+         static_cast<storage_type>(9.47397338617415160720771052365532387e-03L),
+         static_cast<storage_type>(5.56193213535671375804023690106552207e-03L),
+         static_cast<storage_type>(1.98738389233031592650785188284340989e-03L),
       };
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 51, 2>
-{
-public:
-   static std::array<T, 26> const & abscissa()
-   {
-      static constexpr std::array<T, 26> data = {
-         0.00000000000000000000000000000000000e+00L,
-         6.15444830056850788865463923667966313e-02L,
-         1.22864692610710396387359818808036806e-01L,
-         1.83718939421048892015969888759528416e-01L,
-         2.43866883720988432045190362797451586e-01L,
-         3.03089538931107830167478909980339329e-01L,
-         3.61172305809387837735821730127640667e-01L,
-         4.17885382193037748851814394594572487e-01L,
-         4.73002731445714960522182115009192041e-01L,
-         5.26325284334719182599623778158010178e-01L,
-         5.77662930241222967723689841612654067e-01L,
-         6.26810099010317412788122681624517881e-01L,
-         6.73566368473468364485120633247622176e-01L,
-         7.17766406813084388186654079773297781e-01L,
-         7.59259263037357630577282865204360976e-01L,
-         7.97873797998500059410410904994306569e-01L,
-         8.33442628760834001421021108693569569e-01L,
-         8.65847065293275595448996969588340088e-01L,
-         8.94991997878275368851042006782804954e-01L,
-         9.20747115281701561746346084546330632e-01L,
-         9.42974571228974339414011169658470532e-01L,
-         9.61614986425842512418130033660167242e-01L,
-         9.76663921459517511498315386479594068e-01L,
-         9.88035794534077247637331014577406227e-01L,
-         9.95556969790498097908784946893901617e-01L,
-         9.99262104992609834193457486540340594e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 26> const & weights()
-   {
-      static constexpr std::array<T, 26> data = {
-         6.15808180678329350787598242400645532e-02L,
-         6.14711898714253166615441319652641776e-02L,
-         6.11285097170530483058590304162927119e-02L,
-         6.05394553760458629453602675175654272e-02L,
-         5.97203403241740599790992919325618538e-02L,
-         5.86896800223942079619741758567877641e-02L,
-         5.74371163615678328535826939395064720e-02L,
-         5.59508112204123173082406863827473468e-02L,
-         5.42511298885454901445433704598756068e-02L,
-         5.23628858064074758643667121378727149e-02L,
-         5.02776790807156719633252594334400844e-02L,
-         4.79825371388367139063922557569147550e-02L,
-         4.55029130499217889098705847526603930e-02L,
-         4.28728450201700494768957924394951611e-02L,
-         4.00838255040323820748392844670756464e-02L,
-         3.71162714834155435603306253676198760e-02L,
-         3.40021302743293378367487952295512032e-02L,
-         3.07923001673874888911090202152285856e-02L,
-         2.74753175878517378029484555178110786e-02L,
-         2.40099456069532162200924891648810814e-02L,
-         2.04353711458828354565682922359389737e-02L,
-         1.68478177091282982315166675363363158e-02L,
-         1.32362291955716748136564058469762381e-02L,
-         9.47397338617415160720771052365532387e-03L,
-         5.56193213535671375804023690106552207e-03L,
-         1.98738389233031592650785188284340989e-03L,
-      };
-      return data;
-   }
-};
+#else
 
-#ifdef BOOST_HAS_FLOAT128
 template <class T>
 class gauss_kronrod_detail<T, 51, 3>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 26> const & abscissa()
-   {
-      static const std::array<T, 26> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         6.15444830056850788865463923667966313e-02Q,
-         1.22864692610710396387359818808036806e-01Q,
-         1.83718939421048892015969888759528416e-01Q,
-         2.43866883720988432045190362797451586e-01Q,
-         3.03089538931107830167478909980339329e-01Q,
-         3.61172305809387837735821730127640667e-01Q,
-         4.17885382193037748851814394594572487e-01Q,
-         4.73002731445714960522182115009192041e-01Q,
-         5.26325284334719182599623778158010178e-01Q,
-         5.77662930241222967723689841612654067e-01Q,
-         6.26810099010317412788122681624517881e-01Q,
-         6.73566368473468364485120633247622176e-01Q,
-         7.17766406813084388186654079773297781e-01Q,
-         7.59259263037357630577282865204360976e-01Q,
-         7.97873797998500059410410904994306569e-01Q,
-         8.33442628760834001421021108693569569e-01Q,
-         8.65847065293275595448996969588340088e-01Q,
-         8.94991997878275368851042006782804954e-01Q,
-         9.20747115281701561746346084546330632e-01Q,
-         9.42974571228974339414011169658470532e-01Q,
-         9.61614986425842512418130033660167242e-01Q,
-         9.76663921459517511498315386479594068e-01Q,
-         9.88035794534077247637331014577406227e-01Q,
-         9.95556969790498097908784946893901617e-01Q,
-         9.99262104992609834193457486540340594e-01Q,
+   static std::array<storage_type, 26> const & abscissa()
+   {
+      static const std::array<storage_type, 26> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(6.15444830056850788865463923667966313e-02Q),
+         static_cast<storage_type>(1.22864692610710396387359818808036806e-01Q),
+         static_cast<storage_type>(1.83718939421048892015969888759528416e-01Q),
+         static_cast<storage_type>(2.43866883720988432045190362797451586e-01Q),
+         static_cast<storage_type>(3.03089538931107830167478909980339329e-01Q),
+         static_cast<storage_type>(3.61172305809387837735821730127640667e-01Q),
+         static_cast<storage_type>(4.17885382193037748851814394594572487e-01Q),
+         static_cast<storage_type>(4.73002731445714960522182115009192041e-01Q),
+         static_cast<storage_type>(5.26325284334719182599623778158010178e-01Q),
+         static_cast<storage_type>(5.77662930241222967723689841612654067e-01Q),
+         static_cast<storage_type>(6.26810099010317412788122681624517881e-01Q),
+         static_cast<storage_type>(6.73566368473468364485120633247622176e-01Q),
+         static_cast<storage_type>(7.17766406813084388186654079773297781e-01Q),
+         static_cast<storage_type>(7.59259263037357630577282865204360976e-01Q),
+         static_cast<storage_type>(7.97873797998500059410410904994306569e-01Q),
+         static_cast<storage_type>(8.33442628760834001421021108693569569e-01Q),
+         static_cast<storage_type>(8.65847065293275595448996969588340088e-01Q),
+         static_cast<storage_type>(8.94991997878275368851042006782804954e-01Q),
+         static_cast<storage_type>(9.20747115281701561746346084546330632e-01Q),
+         static_cast<storage_type>(9.42974571228974339414011169658470532e-01Q),
+         static_cast<storage_type>(9.61614986425842512418130033660167242e-01Q),
+         static_cast<storage_type>(9.76663921459517511498315386479594068e-01Q),
+         static_cast<storage_type>(9.88035794534077247637331014577406227e-01Q),
+         static_cast<storage_type>(9.95556969790498097908784946893901617e-01Q),
+         static_cast<storage_type>(9.99262104992609834193457486540340594e-01Q),
       };
       return data;
    }
-   static std::array<T, 26> const & weights()
-   {
-      static const std::array<T, 26> data = {
-         6.15808180678329350787598242400645532e-02Q,
-         6.14711898714253166615441319652641776e-02Q,
-         6.11285097170530483058590304162927119e-02Q,
-         6.05394553760458629453602675175654272e-02Q,
-         5.97203403241740599790992919325618538e-02Q,
-         5.86896800223942079619741758567877641e-02Q,
-         5.74371163615678328535826939395064720e-02Q,
-         5.59508112204123173082406863827473468e-02Q,
-         5.42511298885454901445433704598756068e-02Q,
-         5.23628858064074758643667121378727149e-02Q,
-         5.02776790807156719633252594334400844e-02Q,
-         4.79825371388367139063922557569147550e-02Q,
-         4.55029130499217889098705847526603930e-02Q,
-         4.28728450201700494768957924394951611e-02Q,
-         4.00838255040323820748392844670756464e-02Q,
-         3.71162714834155435603306253676198760e-02Q,
-         3.40021302743293378367487952295512032e-02Q,
-         3.07923001673874888911090202152285856e-02Q,
-         2.74753175878517378029484555178110786e-02Q,
-         2.40099456069532162200924891648810814e-02Q,
-         2.04353711458828354565682922359389737e-02Q,
-         1.68478177091282982315166675363363158e-02Q,
-         1.32362291955716748136564058469762381e-02Q,
-         9.47397338617415160720771052365532387e-03Q,
-         5.56193213535671375804023690106552207e-03Q,
-         1.98738389233031592650785188284340989e-03Q,
+   static std::array<storage_type, 26> const & weights()
+   {
+      static const std::array<storage_type, 26> data = {
+         static_cast<storage_type>(6.15808180678329350787598242400645532e-02Q),
+         static_cast<storage_type>(6.14711898714253166615441319652641776e-02Q),
+         static_cast<storage_type>(6.11285097170530483058590304162927119e-02Q),
+         static_cast<storage_type>(6.05394553760458629453602675175654272e-02Q),
+         static_cast<storage_type>(5.97203403241740599790992919325618538e-02Q),
+         static_cast<storage_type>(5.86896800223942079619741758567877641e-02Q),
+         static_cast<storage_type>(5.74371163615678328535826939395064720e-02Q),
+         static_cast<storage_type>(5.59508112204123173082406863827473468e-02Q),
+         static_cast<storage_type>(5.42511298885454901445433704598756068e-02Q),
+         static_cast<storage_type>(5.23628858064074758643667121378727149e-02Q),
+         static_cast<storage_type>(5.02776790807156719633252594334400844e-02Q),
+         static_cast<storage_type>(4.79825371388367139063922557569147550e-02Q),
+         static_cast<storage_type>(4.55029130499217889098705847526603930e-02Q),
+         static_cast<storage_type>(4.28728450201700494768957924394951611e-02Q),
+         static_cast<storage_type>(4.00838255040323820748392844670756464e-02Q),
+         static_cast<storage_type>(3.71162714834155435603306253676198760e-02Q),
+         static_cast<storage_type>(3.40021302743293378367487952295512032e-02Q),
+         static_cast<storage_type>(3.07923001673874888911090202152285856e-02Q),
+         static_cast<storage_type>(2.74753175878517378029484555178110786e-02Q),
+         static_cast<storage_type>(2.40099456069532162200924891648810814e-02Q),
+         static_cast<storage_type>(2.04353711458828354565682922359389737e-02Q),
+         static_cast<storage_type>(1.68478177091282982315166675363363158e-02Q),
+         static_cast<storage_type>(1.32362291955716748136564058469762381e-02Q),
+         static_cast<storage_type>(9.47397338617415160720771052365532387e-03Q),
+         static_cast<storage_type>(5.56193213535671375804023690106552207e-03Q),
+         static_cast<storage_type>(1.98738389233031592650785188284340989e-03Q),
       };
       return data;
    }
@@ -1298,7 +812,7 @@ class gauss_kronrod_detail<T, 51, 4>
 public:
    static  std::array<T, 26> const & abscissa()
    {
-      static  std::array<T, 26> data = {
+      static  std::array<T, 26> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.1544483005685078886546392366796631281724348039823545274305431751687279361558658545141048781022691067898008423227288e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.2286469261071039638735981880803680553220534604978373842389353789270883496885841582643884994633105537597765980412320e-01),
@@ -1325,12 +839,12 @@ class gauss_kronrod_detail<T, 51, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.8803579453407724763733101457740622707248415209160748131449972199405186821347293686245404742032360498210710718706868e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9555696979049809790878494689390161725756264940480817121080493113293348134372793448728802635294700756868258870429256e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9926210499260983419345748654034059370452496042279618586228697762904524428167719073818746102238075978747461480736921e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 26> const & weights()
    {
-      static  std::array<T, 26> data = {
+      static  std::array<T, 26> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.1580818067832935078759824240064553190436936903140808056908996403358367244202623293256774502185186717703954810463664e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.1471189871425316661544131965264177586537962876885022711111683500151700796198726558483367566537422877227096643444043e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.1128509717053048305859030416292711922678552321960938357322028070390133769952032831204895569347757809858568165047769e-02),
@@ -1357,327 +871,172 @@ class gauss_kronrod_detail<T, 51, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.4739733861741516072077105236553238716453268483726334971394029603529306140359023187904705754719643032594360138998941e-03),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.5619321353567137580402369010655220701769295496290984052961210793810038857581724171021610100708799763006942755331129e-03),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.9873838923303159265078518828434098894299804282505973837653346298985629336820118753523093675303476883723992297810124e-03),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 61, 0>
-{
-public:
-   static std::array<T, 31> const & abscissa()
-   {
-      static constexpr std::array<T, 31> data = {
-         0.000000000e+00f,
-         5.147184256e-02f,
-         1.028069380e-01f,
-         1.538699136e-01f,
-         2.045251167e-01f,
-         2.546369262e-01f,
-         3.040732023e-01f,
-         3.527047255e-01f,
-         4.004012548e-01f,
-         4.470337695e-01f,
-         4.924804679e-01f,
-         5.366241481e-01f,
-         5.793452358e-01f,
-         6.205261830e-01f,
-         6.600610641e-01f,
-         6.978504948e-01f,
-         7.337900625e-01f,
-         7.677774321e-01f,
-         7.997278358e-01f,
-         8.295657624e-01f,
-         8.572052335e-01f,
-         8.825605358e-01f,
-         9.055733077e-01f,
-         9.262000474e-01f,
-         9.443744447e-01f,
-         9.600218650e-01f,
-         9.731163225e-01f,
-         9.836681233e-01f,
-         9.916309969e-01f,
-         9.968934841e-01f,
-         9.994844101e-01f,
-      };
-      return data;
-   }
-   static std::array<T, 31> const & weights()
-   {
-      static constexpr std::array<T, 31> data = {
-         5.149472943e-02f,
-         5.142612854e-02f,
-         5.122154785e-02f,
-         5.088179590e-02f,
-         5.040592140e-02f,
-         4.979568343e-02f,
-         4.905543456e-02f,
-         4.818586176e-02f,
-         4.718554657e-02f,
-         4.605923827e-02f,
-         4.481480013e-02f,
-         4.345253970e-02f,
-         4.196981022e-02f,
-         4.037453895e-02f,
-         3.867894562e-02f,
-         3.688236465e-02f,
-         3.497933803e-02f,
-         3.298144706e-02f,
-         3.090725756e-02f,
-         2.875404877e-02f,
-         2.650995488e-02f,
-         2.419116208e-02f,
-         2.182803582e-02f,
-         1.941414119e-02f,
-         1.692088919e-02f,
-         1.436972951e-02f,
-         1.182301525e-02f,
-         9.273279660e-03f,
-         6.630703916e-03f,
-         3.890461127e-03f,
-         1.389013699e-03f,
-      };
-      return data;
-   }
-};
+#ifndef BOOST_HAS_FLOAT128
 
 template <class T>
-class gauss_kronrod_detail<T, 61, 1>
+class gauss_kronrod_detail<T, 61, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 31> const & abscissa()
-   {
-      static constexpr std::array<T, 31> data = {
-         0.00000000000000000e+00,
-         5.14718425553176958e-02,
-         1.02806937966737030e-01,
-         1.53869913608583547e-01,
-         2.04525116682309891e-01,
-         2.54636926167889846e-01,
-         3.04073202273625077e-01,
-         3.52704725530878113e-01,
-         4.00401254830394393e-01,
-         4.47033769538089177e-01,
-         4.92480467861778575e-01,
-         5.36624148142019899e-01,
-         5.79345235826361692e-01,
-         6.20526182989242861e-01,
-         6.60061064126626961e-01,
-         6.97850494793315797e-01,
-         7.33790062453226805e-01,
-         7.67777432104826195e-01,
-         7.99727835821839083e-01,
-         8.29565762382768397e-01,
-         8.57205233546061099e-01,
-         8.82560535792052682e-01,
-         9.05573307699907799e-01,
-         9.26200047429274326e-01,
-         9.44374444748559979e-01,
-         9.60021864968307512e-01,
-         9.73116322501126268e-01,
-         9.83668123279747210e-01,
-         9.91630996870404595e-01,
-         9.96893484074649540e-01,
-         9.99484410050490638e-01,
+   static std::array<storage_type, 31> const & abscissa()
+   {
+      static constexpr std::array<storage_type, 31> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00L),
+         static_cast<storage_type>(5.14718425553176958330252131667225737e-02L),
+         static_cast<storage_type>(1.02806937966737030147096751318000592e-01L),
+         static_cast<storage_type>(1.53869913608583546963794672743255920e-01L),
+         static_cast<storage_type>(2.04525116682309891438957671002024710e-01L),
+         static_cast<storage_type>(2.54636926167889846439805129817805108e-01L),
+         static_cast<storage_type>(3.04073202273625077372677107199256554e-01L),
+         static_cast<storage_type>(3.52704725530878113471037207089373861e-01L),
+         static_cast<storage_type>(4.00401254830394392535476211542660634e-01L),
+         static_cast<storage_type>(4.47033769538089176780609900322854000e-01L),
+         static_cast<storage_type>(4.92480467861778574993693061207708796e-01L),
+         static_cast<storage_type>(5.36624148142019899264169793311072794e-01L),
+         static_cast<storage_type>(5.79345235826361691756024932172540496e-01L),
+         static_cast<storage_type>(6.20526182989242861140477556431189299e-01L),
+         static_cast<storage_type>(6.60061064126626961370053668149270753e-01L),
+         static_cast<storage_type>(6.97850494793315796932292388026640068e-01L),
+         static_cast<storage_type>(7.33790062453226804726171131369527646e-01L),
+         static_cast<storage_type>(7.67777432104826194917977340974503132e-01L),
+         static_cast<storage_type>(7.99727835821839083013668942322683241e-01L),
+         static_cast<storage_type>(8.29565762382768397442898119732501916e-01L),
+         static_cast<storage_type>(8.57205233546061098958658510658943857e-01L),
+         static_cast<storage_type>(8.82560535792052681543116462530225590e-01L),
+         static_cast<storage_type>(9.05573307699907798546522558925958320e-01L),
+         static_cast<storage_type>(9.26200047429274325879324277080474004e-01L),
+         static_cast<storage_type>(9.44374444748559979415831324037439122e-01L),
+         static_cast<storage_type>(9.60021864968307512216871025581797663e-01L),
+         static_cast<storage_type>(9.73116322501126268374693868423706885e-01L),
+         static_cast<storage_type>(9.83668123279747209970032581605662802e-01L),
+         static_cast<storage_type>(9.91630996870404594858628366109485725e-01L),
+         static_cast<storage_type>(9.96893484074649540271630050918695283e-01L),
+         static_cast<storage_type>(9.99484410050490637571325895705810819e-01L),
       };
       return data;
    }
-   static std::array<T, 31> const & weights()
-   {
-      static constexpr std::array<T, 31> data = {
-         5.14947294294515676e-02,
-         5.14261285374590259e-02,
-         5.12215478492587722e-02,
-         5.08817958987496065e-02,
-         5.04059214027823468e-02,
-         4.97956834270742064e-02,
-         4.90554345550297789e-02,
-         4.81858617570871291e-02,
-         4.71855465692991539e-02,
-         4.60592382710069881e-02,
-         4.48148001331626632e-02,
-         4.34525397013560693e-02,
-         4.19698102151642461e-02,
-         4.03745389515359591e-02,
-         3.86789456247275930e-02,
-         3.68823646518212292e-02,
-         3.49793380280600241e-02,
-         3.29814470574837260e-02,
-         3.09072575623877625e-02,
-         2.87540487650412928e-02,
-         2.65099548823331016e-02,
-         2.41911620780806014e-02,
-         2.18280358216091923e-02,
-         1.94141411939423812e-02,
-         1.69208891890532726e-02,
-         1.43697295070458048e-02,
-         1.18230152534963417e-02,
-         9.27327965951776343e-03,
-         6.63070391593129217e-03,
-         3.89046112709988405e-03,
-         1.38901369867700762e-03,
+   static std::array<storage_type, 31> const & weights()
+   {
+      static constexpr std::array<storage_type, 31> data = {
+         static_cast<storage_type>(5.14947294294515675583404336470993075e-02L),
+         static_cast<storage_type>(5.14261285374590259338628792157812598e-02L),
+         static_cast<storage_type>(5.12215478492587721706562826049442083e-02L),
+         static_cast<storage_type>(5.08817958987496064922974730498046919e-02L),
+         static_cast<storage_type>(5.04059214027823468408930856535850289e-02L),
+         static_cast<storage_type>(4.97956834270742063578115693799423285e-02L),
+         static_cast<storage_type>(4.90554345550297788875281653672381736e-02L),
+         static_cast<storage_type>(4.81858617570871291407794922983045926e-02L),
+         static_cast<storage_type>(4.71855465692991539452614781810994865e-02L),
+         static_cast<storage_type>(4.60592382710069881162717355593735806e-02L),
+         static_cast<storage_type>(4.48148001331626631923555516167232438e-02L),
+         static_cast<storage_type>(4.34525397013560693168317281170732581e-02L),
+         static_cast<storage_type>(4.19698102151642461471475412859697578e-02L),
+         static_cast<storage_type>(4.03745389515359591119952797524681142e-02L),
+         static_cast<storage_type>(3.86789456247275929503486515322810503e-02L),
+         static_cast<storage_type>(3.68823646518212292239110656171359677e-02L),
+         static_cast<storage_type>(3.49793380280600241374996707314678751e-02L),
+         static_cast<storage_type>(3.29814470574837260318141910168539275e-02L),
+         static_cast<storage_type>(3.09072575623877624728842529430922726e-02L),
+         static_cast<storage_type>(2.87540487650412928439787853543342111e-02L),
+         static_cast<storage_type>(2.65099548823331016106017093350754144e-02L),
+         static_cast<storage_type>(2.41911620780806013656863707252320268e-02L),
+         static_cast<storage_type>(2.18280358216091922971674857383389934e-02L),
+         static_cast<storage_type>(1.94141411939423811734089510501284559e-02L),
+         static_cast<storage_type>(1.69208891890532726275722894203220924e-02L),
+         static_cast<storage_type>(1.43697295070458048124514324435800102e-02L),
+         static_cast<storage_type>(1.18230152534963417422328988532505929e-02L),
+         static_cast<storage_type>(9.27327965951776342844114689202436042e-03L),
+         static_cast<storage_type>(6.63070391593129217331982636975016813e-03L),
+         static_cast<storage_type>(3.89046112709988405126720184451550328e-03L),
+         static_cast<storage_type>(1.38901369867700762455159122675969968e-03L),
       };
       return data;
    }
 };
 
-template <class T>
-class gauss_kronrod_detail<T, 61, 2>
-{
-public:
-   static std::array<T, 31> const & abscissa()
-   {
-      static constexpr std::array<T, 31> data = {
-         0.00000000000000000000000000000000000e+00L,
-         5.14718425553176958330252131667225737e-02L,
-         1.02806937966737030147096751318000592e-01L,
-         1.53869913608583546963794672743255920e-01L,
-         2.04525116682309891438957671002024710e-01L,
-         2.54636926167889846439805129817805108e-01L,
-         3.04073202273625077372677107199256554e-01L,
-         3.52704725530878113471037207089373861e-01L,
-         4.00401254830394392535476211542660634e-01L,
-         4.47033769538089176780609900322854000e-01L,
-         4.92480467861778574993693061207708796e-01L,
-         5.36624148142019899264169793311072794e-01L,
-         5.79345235826361691756024932172540496e-01L,
-         6.20526182989242861140477556431189299e-01L,
-         6.60061064126626961370053668149270753e-01L,
-         6.97850494793315796932292388026640068e-01L,
-         7.33790062453226804726171131369527646e-01L,
-         7.67777432104826194917977340974503132e-01L,
-         7.99727835821839083013668942322683241e-01L,
-         8.29565762382768397442898119732501916e-01L,
-         8.57205233546061098958658510658943857e-01L,
-         8.82560535792052681543116462530225590e-01L,
-         9.05573307699907798546522558925958320e-01L,
-         9.26200047429274325879324277080474004e-01L,
-         9.44374444748559979415831324037439122e-01L,
-         9.60021864968307512216871025581797663e-01L,
-         9.73116322501126268374693868423706885e-01L,
-         9.83668123279747209970032581605662802e-01L,
-         9.91630996870404594858628366109485725e-01L,
-         9.96893484074649540271630050918695283e-01L,
-         9.99484410050490637571325895705810819e-01L,
-      };
-      return data;
-   }
-   static std::array<T, 31> const & weights()
-   {
-      static constexpr std::array<T, 31> data = {
-         5.14947294294515675583404336470993075e-02L,
-         5.14261285374590259338628792157812598e-02L,
-         5.12215478492587721706562826049442083e-02L,
-         5.08817958987496064922974730498046919e-02L,
-         5.04059214027823468408930856535850289e-02L,
-         4.97956834270742063578115693799423285e-02L,
-         4.90554345550297788875281653672381736e-02L,
-         4.81858617570871291407794922983045926e-02L,
-         4.71855465692991539452614781810994865e-02L,
-         4.60592382710069881162717355593735806e-02L,
-         4.48148001331626631923555516167232438e-02L,
-         4.34525397013560693168317281170732581e-02L,
-         4.19698102151642461471475412859697578e-02L,
-         4.03745389515359591119952797524681142e-02L,
-         3.86789456247275929503486515322810503e-02L,
-         3.68823646518212292239110656171359677e-02L,
-         3.49793380280600241374996707314678751e-02L,
-         3.29814470574837260318141910168539275e-02L,
-         3.09072575623877624728842529430922726e-02L,
-         2.87540487650412928439787853543342111e-02L,
-         2.65099548823331016106017093350754144e-02L,
-         2.41911620780806013656863707252320268e-02L,
-         2.18280358216091922971674857383389934e-02L,
-         1.94141411939423811734089510501284559e-02L,
-         1.69208891890532726275722894203220924e-02L,
-         1.43697295070458048124514324435800102e-02L,
-         1.18230152534963417422328988532505929e-02L,
-         9.27327965951776342844114689202436042e-03L,
-         6.63070391593129217331982636975016813e-03L,
-         3.89046112709988405126720184451550328e-03L,
-         1.38901369867700762455159122675969968e-03L,
-      };
-      return data;
-   }
-};
+#else
 
-#ifdef BOOST_HAS_FLOAT128
 template <class T>
-class gauss_kronrod_detail<T, 61, 3>
+class gauss_kronrod_detail<T, 61, 0>
 {
+   using storage_type = typename gauss_constant_category<T>::storage_type;
 public:
-   static std::array<T, 31> const & abscissa()
-   {
-      static const std::array<T, 31> data = {
-         0.00000000000000000000000000000000000e+00Q,
-         5.14718425553176958330252131667225737e-02Q,
-         1.02806937966737030147096751318000592e-01Q,
-         1.53869913608583546963794672743255920e-01Q,
-         2.04525116682309891438957671002024710e-01Q,
-         2.54636926167889846439805129817805108e-01Q,
-         3.04073202273625077372677107199256554e-01Q,
-         3.52704725530878113471037207089373861e-01Q,
-         4.00401254830394392535476211542660634e-01Q,
-         4.47033769538089176780609900322854000e-01Q,
-         4.92480467861778574993693061207708796e-01Q,
-         5.36624148142019899264169793311072794e-01Q,
-         5.79345235826361691756024932172540496e-01Q,
-         6.20526182989242861140477556431189299e-01Q,
-         6.60061064126626961370053668149270753e-01Q,
-         6.97850494793315796932292388026640068e-01Q,
-         7.33790062453226804726171131369527646e-01Q,
-         7.67777432104826194917977340974503132e-01Q,
-         7.99727835821839083013668942322683241e-01Q,
-         8.29565762382768397442898119732501916e-01Q,
-         8.57205233546061098958658510658943857e-01Q,
-         8.82560535792052681543116462530225590e-01Q,
-         9.05573307699907798546522558925958320e-01Q,
-         9.26200047429274325879324277080474004e-01Q,
-         9.44374444748559979415831324037439122e-01Q,
-         9.60021864968307512216871025581797663e-01Q,
-         9.73116322501126268374693868423706885e-01Q,
-         9.83668123279747209970032581605662802e-01Q,
-         9.91630996870404594858628366109485725e-01Q,
-         9.96893484074649540271630050918695283e-01Q,
-         9.99484410050490637571325895705810819e-01Q,
+   static std::array<storage_type, 31> const & abscissa()
+   {
+      static const std::array<storage_type, 31> data = {
+         static_cast<storage_type>(0.00000000000000000000000000000000000e+00Q),
+         static_cast<storage_type>(5.14718425553176958330252131667225737e-02Q),
+         static_cast<storage_type>(1.02806937966737030147096751318000592e-01Q),
+         static_cast<storage_type>(1.53869913608583546963794672743255920e-01Q),
+         static_cast<storage_type>(2.04525116682309891438957671002024710e-01Q),
+         static_cast<storage_type>(2.54636926167889846439805129817805108e-01Q),
+         static_cast<storage_type>(3.04073202273625077372677107199256554e-01Q),
+         static_cast<storage_type>(3.52704725530878113471037207089373861e-01Q),
+         static_cast<storage_type>(4.00401254830394392535476211542660634e-01Q),
+         static_cast<storage_type>(4.47033769538089176780609900322854000e-01Q),
+         static_cast<storage_type>(4.92480467861778574993693061207708796e-01Q),
+         static_cast<storage_type>(5.36624148142019899264169793311072794e-01Q),
+         static_cast<storage_type>(5.79345235826361691756024932172540496e-01Q),
+         static_cast<storage_type>(6.20526182989242861140477556431189299e-01Q),
+         static_cast<storage_type>(6.60061064126626961370053668149270753e-01Q),
+         static_cast<storage_type>(6.97850494793315796932292388026640068e-01Q),
+         static_cast<storage_type>(7.33790062453226804726171131369527646e-01Q),
+         static_cast<storage_type>(7.67777432104826194917977340974503132e-01Q),
+         static_cast<storage_type>(7.99727835821839083013668942322683241e-01Q),
+         static_cast<storage_type>(8.29565762382768397442898119732501916e-01Q),
+         static_cast<storage_type>(8.57205233546061098958658510658943857e-01Q),
+         static_cast<storage_type>(8.82560535792052681543116462530225590e-01Q),
+         static_cast<storage_type>(9.05573307699907798546522558925958320e-01Q),
+         static_cast<storage_type>(9.26200047429274325879324277080474004e-01Q),
+         static_cast<storage_type>(9.44374444748559979415831324037439122e-01Q),
+         static_cast<storage_type>(9.60021864968307512216871025581797663e-01Q),
+         static_cast<storage_type>(9.73116322501126268374693868423706885e-01Q),
+         static_cast<storage_type>(9.83668123279747209970032581605662802e-01Q),
+         static_cast<storage_type>(9.91630996870404594858628366109485725e-01Q),
+         static_cast<storage_type>(9.96893484074649540271630050918695283e-01Q),
+         static_cast<storage_type>(9.99484410050490637571325895705810819e-01Q),
       };
       return data;
    }
-   static std::array<T, 31> const & weights()
-   {
-      static const std::array<T, 31> data = {
-         5.14947294294515675583404336470993075e-02Q,
-         5.14261285374590259338628792157812598e-02Q,
-         5.12215478492587721706562826049442083e-02Q,
-         5.08817958987496064922974730498046919e-02Q,
-         5.04059214027823468408930856535850289e-02Q,
-         4.97956834270742063578115693799423285e-02Q,
-         4.90554345550297788875281653672381736e-02Q,
-         4.81858617570871291407794922983045926e-02Q,
-         4.71855465692991539452614781810994865e-02Q,
-         4.60592382710069881162717355593735806e-02Q,
-         4.48148001331626631923555516167232438e-02Q,
-         4.34525397013560693168317281170732581e-02Q,
-         4.19698102151642461471475412859697578e-02Q,
-         4.03745389515359591119952797524681142e-02Q,
-         3.86789456247275929503486515322810503e-02Q,
-         3.68823646518212292239110656171359677e-02Q,
-         3.49793380280600241374996707314678751e-02Q,
-         3.29814470574837260318141910168539275e-02Q,
-         3.09072575623877624728842529430922726e-02Q,
-         2.87540487650412928439787853543342111e-02Q,
-         2.65099548823331016106017093350754144e-02Q,
-         2.41911620780806013656863707252320268e-02Q,
-         2.18280358216091922971674857383389934e-02Q,
-         1.94141411939423811734089510501284559e-02Q,
-         1.69208891890532726275722894203220924e-02Q,
-         1.43697295070458048124514324435800102e-02Q,
-         1.18230152534963417422328988532505929e-02Q,
-         9.27327965951776342844114689202436042e-03Q,
-         6.63070391593129217331982636975016813e-03Q,
-         3.89046112709988405126720184451550328e-03Q,
-         1.38901369867700762455159122675969968e-03Q,
+   static std::array<storage_type, 31> const & weights()
+   {
+      static const std::array<storage_type, 31> data = {
+         static_cast<storage_type>(5.14947294294515675583404336470993075e-02Q),
+         static_cast<storage_type>(5.14261285374590259338628792157812598e-02Q),
+         static_cast<storage_type>(5.12215478492587721706562826049442083e-02Q),
+         static_cast<storage_type>(5.08817958987496064922974730498046919e-02Q),
+         static_cast<storage_type>(5.04059214027823468408930856535850289e-02Q),
+         static_cast<storage_type>(4.97956834270742063578115693799423285e-02Q),
+         static_cast<storage_type>(4.90554345550297788875281653672381736e-02Q),
+         static_cast<storage_type>(4.81858617570871291407794922983045926e-02Q),
+         static_cast<storage_type>(4.71855465692991539452614781810994865e-02Q),
+         static_cast<storage_type>(4.60592382710069881162717355593735806e-02Q),
+         static_cast<storage_type>(4.48148001331626631923555516167232438e-02Q),
+         static_cast<storage_type>(4.34525397013560693168317281170732581e-02Q),
+         static_cast<storage_type>(4.19698102151642461471475412859697578e-02Q),
+         static_cast<storage_type>(4.03745389515359591119952797524681142e-02Q),
+         static_cast<storage_type>(3.86789456247275929503486515322810503e-02Q),
+         static_cast<storage_type>(3.68823646518212292239110656171359677e-02Q),
+         static_cast<storage_type>(3.49793380280600241374996707314678751e-02Q),
+         static_cast<storage_type>(3.29814470574837260318141910168539275e-02Q),
+         static_cast<storage_type>(3.09072575623877624728842529430922726e-02Q),
+         static_cast<storage_type>(2.87540487650412928439787853543342111e-02Q),
+         static_cast<storage_type>(2.65099548823331016106017093350754144e-02Q),
+         static_cast<storage_type>(2.41911620780806013656863707252320268e-02Q),
+         static_cast<storage_type>(2.18280358216091922971674857383389934e-02Q),
+         static_cast<storage_type>(1.94141411939423811734089510501284559e-02Q),
+         static_cast<storage_type>(1.69208891890532726275722894203220924e-02Q),
+         static_cast<storage_type>(1.43697295070458048124514324435800102e-02Q),
+         static_cast<storage_type>(1.18230152534963417422328988532505929e-02Q),
+         static_cast<storage_type>(9.27327965951776342844114689202436042e-03Q),
+         static_cast<storage_type>(6.63070391593129217331982636975016813e-03Q),
+         static_cast<storage_type>(3.89046112709988405126720184451550328e-03Q),
+         static_cast<storage_type>(1.38901369867700762455159122675969968e-03Q),
       };
       return data;
    }
@@ -1690,7 +1049,7 @@ class gauss_kronrod_detail<T, 61, 4>
 public:
    static  std::array<T, 31> const & abscissa()
    {
-      static  std::array<T, 31> data = {
+      static  std::array<T, 31> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.1471842555317695833025213166722573749141453666569564255160843987964755210427109055870090707285485841217089963590678e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.0280693796673703014709675131800059247190133296515840552101946914632788253917872738234797140786490207720254922664913e-01),
@@ -1722,12 +1081,12 @@ class gauss_kronrod_detail<T, 61, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9163099687040459485862836610948572485050033374616325510019923349807489603260796605556191495843575227494654783755353e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9689348407464954027163005091869528334088203811775079010809429780238769521016374081588201955806171741257405095963817e-01),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 9.9948441005049063757132589570581081946887394701850801923632642830748016674843587830656468823145435723317885056396548e-01),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
    static  std::array<T, 31> const & weights()
    {
-      static  std::array<T, 31> data = {
+      static  std::array<T, 31> data = { // LCOV_EXCL_START
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.1494729429451567558340433647099307532736880396464168074637323362474083844397567724480716864880173808112573901197920e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.1426128537459025933862879215781259829552034862395987263855824172761589259406892072066110681184224608133314131500422e-02),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 5.1221547849258772170656282604944208251146952425246327553509056805511015401279553971190412722969308620984161625812560e-02),
@@ -1759,7 +1118,7 @@ class gauss_kronrod_detail<T, 61, 4>
          BOOST_MATH_HUGE_CONSTANT(T, 0, 6.6307039159312921733198263697501681336283882177812585973955597357837568277731921327731815844512598157843672104469554e-03),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 3.8904611270998840512672018445155032785151429848864649214200101281144733676455451061226273655941038347210163533085954e-03),
          BOOST_MATH_HUGE_CONSTANT(T, 0, 1.3890136986770076245515912267596996810488412919632724534411055332301367130989865366956251556423820479579333920310978e-03),
-      };
+      }; // LCOV_EXCL_STOP
       return data;
    }
 };
@@ -1787,31 +1146,31 @@ class gauss_kronrod : public detail::gauss_kronrod_detail<Real, N, detail::gauss
       if (gauss_order & 1)
       {
          fp = f(value_type(0));
-         kronrod_result = fp * base::weights()[0];
-         gauss_result += fp * gauss<Real, (N - 1) / 2>::weights()[0];
+         kronrod_result = fp * static_cast<Real>(base::weights()[0]);
+         gauss_result += fp * static_cast<Real>(gauss<Real, (N - 1) / 2>::weights()[0]);
       }
       else
       {
          fp = f(value_type(0));
-         kronrod_result = fp * base::weights()[0];
+         kronrod_result = fp * static_cast<Real>(base::weights()[0]);
          gauss_start = 1;
          kronrod_start = 2;
       }
       Real L1 = abs(kronrod_result);
       for (unsigned i = gauss_start; i < base::abscissa().size(); i += 2)
       {
-         fp = f(base::abscissa()[i]);
-         fm = f(-base::abscissa()[i]);
-         kronrod_result += (fp + fm) * base::weights()[i];
-         L1 += (abs(fp) + abs(fm)) *  base::weights()[i];
-         gauss_result += (fp + fm) * gauss<Real, (N - 1) / 2>::weights()[i / 2];
+         fp = f(static_cast<Real>(base::abscissa()[i]));
+         fm = f(static_cast<Real>(-base::abscissa()[i]));
+         kronrod_result += (fp + fm) * static_cast<Real>(base::weights()[i]);
+         L1 += (abs(fp) + abs(fm)) * static_cast<Real>(base::weights()[i]);
+         gauss_result += (fp + fm) * static_cast<Real>(gauss<Real, (N - 1) / 2>::weights()[i / 2]);
       }
       for (unsigned i = kronrod_start; i < base::abscissa().size(); i += 2)
       {
-         fp = f(base::abscissa()[i]);
-         fm = f(-base::abscissa()[i]);
-         kronrod_result += (fp + fm) * base::weights()[i];
-         L1 += (abs(fp) + abs(fm)) *  base::weights()[i];
+         fp = f(static_cast<Real>(base::abscissa()[i]));
+         fm = f(static_cast<Real>(-base::abscissa()[i]));
+         kronrod_result += (fp + fm) * static_cast<Real>(base::weights()[i]);
+         L1 += (abs(fp) + abs(fm)) * static_cast<Real>(base::weights()[i]);
       }
       if (pL1)
          *pL1 = L1;
diff --git a/inst/include/boost/math/quadrature/sinh_sinh.hpp b/inst/include/boost/math/quadrature/sinh_sinh.hpp
index ed958eb8d..7aabcb437 100644
--- a/inst/include/boost/math/quadrature/sinh_sinh.hpp
+++ b/inst/include/boost/math/quadrature/sinh_sinh.hpp
@@ -1,4 +1,5 @@
 // Copyright Nick Thompson, 2017
+// Copyright Matt Borland, 2024
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -15,10 +16,17 @@
 #ifndef BOOST_MATH_QUADRATURE_SINH_SINH_HPP
 #define BOOST_MATH_QUADRATURE_SINH_SINH_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/quadrature/detail/sinh_sinh_detail.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <cmath>
 #include <limits>
 #include <memory>
-#include <boost/math/quadrature/detail/sinh_sinh_detail.hpp>
 
 namespace boost{ namespace math{ namespace quadrature {
 
@@ -40,4 +48,25 @@ class sinh_sinh
 };
 
 }}}
-#endif
+
+#endif // BOOST_MATH_HAS_NVRTC
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+namespace boost {
+namespace math {
+namespace quadrature {
+
+template <class F, class Real, class Policy = boost::math::policies::policy<> >
+__device__ auto sinh_sinh_integrate(const F& f, Real tol = boost::math::tools::root_epsilon<Real>(), Real* error = nullptr, Real* L1 = nullptr, boost::math::size_t* levels = nullptr)
+{
+    return detail::sinh_sinh_integrate_impl(f, tol, error, L1, levels);
+}
+
+} // namespace quadrature
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_ENABLE_CUDA
+
+#endif // BOOST_MATH_QUADRATURE_SINH_SINH_HPP
diff --git a/inst/include/boost/math/quaternion.hpp b/inst/include/boost/math/quaternion.hpp
index 5cb8b36e5..831dd92be 100644
--- a/inst/include/boost/math/quaternion.hpp
+++ b/inst/include/boost/math/quaternion.hpp
@@ -46,7 +46,7 @@ namespace boost
          struct is_trivial_arithmetic_type : public is_trivial_arithmetic_type_imp<T>::type {};
       }
 
-#ifndef BOOST_NO_CXX14_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX14_CONSTEXPR
       namespace constexpr_detail
       {
          template <class T>
@@ -175,9 +175,9 @@ namespace boost
                return(::std::complex<T>(c, d));
             }
 
-            BOOST_CXX14_CONSTEXPR void swap(quaternion& o)
+            BOOST_MATH_CXX14_CONSTEXPR void swap(quaternion& o)
             {
-#ifndef BOOST_NO_CXX14_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX14_CONSTEXPR
                using constexpr_detail::swap;
 #else
                using std::swap;
@@ -191,7 +191,7 @@ namespace boost
             // assignment operators
             
             template<typename X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator = (quaternion<X> const  & a_affecter)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator = (quaternion<X> const  & a_affecter)
             {
                a = static_cast<T>(a_affecter.R_component_1());
                b = static_cast<T>(a_affecter.R_component_2());
@@ -201,7 +201,7 @@ namespace boost
                return(*this);
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator = (quaternion<T> const & a_affecter)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator = (quaternion<T> const & a_affecter)
             {
                a = a_affecter.a;
                b = a_affecter.b;
@@ -211,7 +211,7 @@ namespace boost
                return(*this);
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator = (quaternion<T> && a_affecter)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator = (quaternion<T> && a_affecter)
             {
                a = std::move(a_affecter.a);
                b = std::move(a_affecter.b);
@@ -221,7 +221,7 @@ namespace boost
                return(*this);
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator = (T const & a_affecter)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator = (T const & a_affecter)
             {
                a = a_affecter;
 
@@ -230,7 +230,7 @@ namespace boost
                return(*this);
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator = (::std::complex<T> const & a_affecter)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator = (::std::complex<T> const & a_affecter)
             {
                a = a_affecter.real();
                b = a_affecter.imag();
@@ -250,31 +250,31 @@ namespace boost
             //          type T throws no exceptions, and one exception-safe version
             //          for the case where it might.
          private:
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_add(T const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_add(T const & rhs, const std::true_type&)
             {
                a += rhs;
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_add(T const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_add(T const & rhs, const std::false_type&)
             {
                quaternion<T> result(a + rhs, b, c, d); // exception guard
                swap(result);
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_add(std::complex<T> const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_add(std::complex<T> const & rhs, const std::true_type&)
             {
                a += std::real(rhs);
                b += std::imag(rhs);
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_add(std::complex<T> const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_add(std::complex<T> const & rhs, const std::false_type&)
             {
                quaternion<T> result(a + std::real(rhs), b + std::imag(rhs), c, d); // exception guard
                swap(result);
                return *this;
             }
             template <class X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_add(quaternion<X> const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_add(quaternion<X> const & rhs, const std::true_type&)
             {
                a += rhs.R_component_1();
                b += rhs.R_component_2();
@@ -283,38 +283,38 @@ namespace boost
                return *this;
             }
             template <class X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_add(quaternion<X> const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_add(quaternion<X> const & rhs, const std::false_type&)
             {
                quaternion<T> result(a + rhs.R_component_1(), b + rhs.R_component_2(), c + rhs.R_component_3(), d + rhs.R_component_4()); // exception guard
                swap(result);
                return *this;
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_subtract(T const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_subtract(T const & rhs, const std::true_type&)
             {
                a -= rhs;
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_subtract(T const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_subtract(T const & rhs, const std::false_type&)
             {
                quaternion<T> result(a - rhs, b, c, d); // exception guard
                swap(result);
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_subtract(std::complex<T> const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_subtract(std::complex<T> const & rhs, const std::true_type&)
             {
                a -= std::real(rhs);
                b -= std::imag(rhs);
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_subtract(std::complex<T> const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_subtract(std::complex<T> const & rhs, const std::false_type&)
             {
                quaternion<T> result(a - std::real(rhs), b - std::imag(rhs), c, d); // exception guard
                swap(result);
                return *this;
             }
             template <class X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_subtract(quaternion<X> const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_subtract(quaternion<X> const & rhs, const std::true_type&)
             {
                a -= rhs.R_component_1();
                b -= rhs.R_component_2();
@@ -323,14 +323,14 @@ namespace boost
                return *this;
             }
             template <class X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_subtract(quaternion<X> const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_subtract(quaternion<X> const & rhs, const std::false_type&)
             {
                quaternion<T> result(a - rhs.R_component_1(), b - rhs.R_component_2(), c - rhs.R_component_3(), d - rhs.R_component_4()); // exception guard
                swap(result);
                return *this;
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_multiply(T const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_multiply(T const & rhs, const std::true_type&)
             {
                a *= rhs;
                b *= rhs;
@@ -338,14 +338,14 @@ namespace boost
                d *= rhs;
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_multiply(T const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_multiply(T const & rhs, const std::false_type&)
             {
                quaternion<T> result(a * rhs, b * rhs, c * rhs, d * rhs); // exception guard
                swap(result);
                return *this;
             }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_divide(T const & rhs, const std::true_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_divide(T const & rhs, const std::true_type&)
             {
                a /= rhs;
                b /= rhs;
@@ -353,7 +353,7 @@ namespace boost
                d /= rhs;
                return *this;
             }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        do_divide(T const & rhs, const std::false_type&)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        do_divide(T const & rhs, const std::false_type&)
             {
                quaternion<T> result(a / rhs, b / rhs, c / rhs, d / rhs); // exception guard
                swap(result);
@@ -361,17 +361,17 @@ namespace boost
             }
          public:
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator += (T const & rhs) { return do_add(rhs, detail::is_trivial_arithmetic_type<T>()); }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator += (::std::complex<T> const & rhs) { return do_add(rhs, detail::is_trivial_arithmetic_type<T>()); }
-            template<typename X> BOOST_CXX14_CONSTEXPR quaternion<T> & operator += (quaternion<X> const & rhs) { return do_add(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator += (T const & rhs) { return do_add(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator += (::std::complex<T> const & rhs) { return do_add(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            template<typename X> BOOST_MATH_CXX14_CONSTEXPR quaternion<T> & operator += (quaternion<X> const & rhs) { return do_add(rhs, detail::is_trivial_arithmetic_type<T>()); }
 
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator -= (T const & rhs) { return do_subtract(rhs, detail::is_trivial_arithmetic_type<T>()); }
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator -= (::std::complex<T> const & rhs) { return do_subtract(rhs, detail::is_trivial_arithmetic_type<T>()); }
-            template<typename X> BOOST_CXX14_CONSTEXPR quaternion<T> & operator -= (quaternion<X> const & rhs) { return do_subtract(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator -= (T const & rhs) { return do_subtract(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator -= (::std::complex<T> const & rhs) { return do_subtract(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            template<typename X> BOOST_MATH_CXX14_CONSTEXPR quaternion<T> & operator -= (quaternion<X> const & rhs) { return do_subtract(rhs, detail::is_trivial_arithmetic_type<T>()); }
             
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator *= (T const & rhs) { return do_multiply(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator *= (T const & rhs) { return do_multiply(rhs, detail::is_trivial_arithmetic_type<T>()); }
             
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator *= (::std::complex<T> const & rhs)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator *= (::std::complex<T> const & rhs)
             {
                 T    ar = rhs.real();
                 T    br = rhs.imag();
@@ -381,7 +381,7 @@ namespace boost
             }
             
             template<typename X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator *= (quaternion<X> const & rhs)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator *= (quaternion<X> const & rhs)
             {
                 T    ar = static_cast<T>(rhs.R_component_1());
                 T    br = static_cast<T>(rhs.R_component_2());
@@ -393,9 +393,9 @@ namespace boost
                 return(*this);
             }
             
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator /= (T const & rhs) { return do_divide(rhs, detail::is_trivial_arithmetic_type<T>()); }
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator /= (T const & rhs) { return do_divide(rhs, detail::is_trivial_arithmetic_type<T>()); }
             
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator /= (::std::complex<T> const & rhs)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator /= (::std::complex<T> const & rhs)
             {
                 T    ar = rhs.real();
                 T    br = rhs.imag();
@@ -406,7 +406,7 @@ namespace boost
             }
             
             template<typename X>
-            BOOST_CXX14_CONSTEXPR quaternion<T> &        operator /= (quaternion<X> const & rhs)
+            BOOST_MATH_CXX14_CONSTEXPR quaternion<T> &        operator /= (quaternion<X> const & rhs)
             {
                 T    ar = static_cast<T>(rhs.R_component_1());
                 T    br = static_cast<T>(rhs.R_component_2());
@@ -425,7 +425,7 @@ namespace boost
 
 // swap:
 template <class T>
-BOOST_CXX14_CONSTEXPR void swap(quaternion<T>& a, quaternion<T>& b) { a.swap(b); }
+BOOST_MATH_CXX14_CONSTEXPR void swap(quaternion<T>& a, quaternion<T>& b) { a.swap(b); }
         
 // operator+
 template <class T1, class T2>
@@ -441,13 +441,13 @@ operator + (const T1& a, const quaternion<T2>& b)
    return quaternion<T2>(static_cast<T2>(b.R_component_1() + a), b.R_component_2(), b.R_component_3(), b.R_component_4());
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
 operator + (const quaternion<T1>& a, const std::complex<T2>& b)
 {
    return quaternion<T1>(a.R_component_1() + std::real(b), a.R_component_2() + std::imag(b), a.R_component_3(), a.R_component_4());
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
 operator + (const std::complex<T1>& a, const quaternion<T2>& b)
 {
    return quaternion<T1>(b.R_component_1() + std::real(a), b.R_component_2() + std::imag(a), b.R_component_3(), b.R_component_4());
@@ -471,13 +471,13 @@ operator - (const T1& a, const quaternion<T2>& b)
    return quaternion<T2>(static_cast<T2>(a - b.R_component_1()), -b.R_component_2(), -b.R_component_3(), -b.R_component_4());
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
 operator - (const quaternion<T1>& a, const std::complex<T2>& b)
 {
    return quaternion<T1>(a.R_component_1() - std::real(b), a.R_component_2() - std::imag(b), a.R_component_3(), a.R_component_4());
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
 operator - (const std::complex<T1>& a, const quaternion<T2>& b)
 {
    return quaternion<T1>(std::real(a) - b.R_component_1(), std::imag(a) - b.R_component_2(), -b.R_component_3(), -b.R_component_4());
@@ -502,7 +502,7 @@ operator * (const T1& a, const quaternion<T2>& b)
    return quaternion<T2>(static_cast<T2>(a * b.R_component_1()), a * b.R_component_2(), a * b.R_component_3(), a * b.R_component_4());
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
 operator * (const quaternion<T1>& a, const std::complex<T2>& b)
 {
    quaternion<T1> result(a);
@@ -510,7 +510,7 @@ operator * (const quaternion<T1>& a, const std::complex<T2>& b)
    return result;
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
 operator * (const std::complex<T1>& a, const quaternion<T2>& b)
 {
    quaternion<T1> result(a);
@@ -518,7 +518,7 @@ operator * (const std::complex<T1>& a, const quaternion<T2>& b)
    return result;
 }
 template <class T>
-inline BOOST_CXX14_CONSTEXPR quaternion<T> operator * (const quaternion<T>& a, const quaternion<T>& b)
+inline BOOST_MATH_CXX14_CONSTEXPR quaternion<T> operator * (const quaternion<T>& a, const quaternion<T>& b)
 {
    quaternion<T> result(a);
    result *= b;
@@ -533,7 +533,7 @@ operator / (const quaternion<T1>& a, const T2& b)
    return quaternion<T1>(a.R_component_1() / b, a.R_component_2() / b, a.R_component_3() / b, a.R_component_4() / b);
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
 operator / (const T1& a, const quaternion<T2>& b)
 {
    quaternion<T2> result(a);
@@ -541,7 +541,7 @@ operator / (const T1& a, const quaternion<T2>& b)
    return result;
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T2, T1>::value, quaternion<T1> >::type
 operator / (const quaternion<T1>& a, const std::complex<T2>& b)
 {
    quaternion<T1> result(a);
@@ -549,7 +549,7 @@ operator / (const quaternion<T1>& a, const std::complex<T2>& b)
    return result;
 }
 template <class T1, class T2>
-inline BOOST_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
+inline BOOST_MATH_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<T1, T2>::value, quaternion<T2> >::type
 operator / (const std::complex<T1>& a, const quaternion<T2>& b)
 {
    quaternion<T2> result(a);
@@ -557,7 +557,7 @@ operator / (const std::complex<T1>& a, const quaternion<T2>& b)
    return result;
 }
 template <class T>
-inline BOOST_CXX14_CONSTEXPR quaternion<T> operator / (const quaternion<T>& a, const quaternion<T>& b)
+inline BOOST_MATH_CXX14_CONSTEXPR quaternion<T> operator / (const quaternion<T>& a, const quaternion<T>& b)
 {
    quaternion<T> result(a);
    result /= b;
@@ -944,7 +944,7 @@ inline BOOST_CXX14_CONSTEXPR quaternion<T> operator / (const quaternion<T>& a, c
         // Note:    This is the Cayley norm, not the Euclidean norm...
         
         template<typename T>
-        inline BOOST_CXX14_CONSTEXPR T norm(quaternion<T>const  & q)
+        inline BOOST_MATH_CXX14_CONSTEXPR T norm(quaternion<T>const  & q)
         {
             return(real(q*conj(q)));
         }
diff --git a/inst/include/boost/math/special_functions.hpp b/inst/include/boost/math/special_functions.hpp
index af9319876..d3aa95c5c 100644
--- a/inst/include/boost/math/special_functions.hpp
+++ b/inst/include/boost/math/special_functions.hpp
@@ -79,7 +79,8 @@
 #include <boost/math/special_functions/lambert_w.hpp>
 #include <boost/math/special_functions/gegenbauer.hpp>
 #include <boost/math/special_functions/jacobi.hpp>
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
 #include <boost/math/special_functions/legendre_stieltjes.hpp>
 #endif
+
 #endif // BOOST_MATH_SPECIAL_FUNCTIONS_HPP
diff --git a/inst/include/boost/math/special_functions/acosh.hpp b/inst/include/boost/math/special_functions/acosh.hpp
index c601960fc..63e8e2dff 100644
--- a/inst/include/boost/math/special_functions/acosh.hpp
+++ b/inst/include/boost/math/special_functions/acosh.hpp
@@ -38,9 +38,7 @@ namespace boost
             
             if((x < 1) || (boost::math::isnan)(x))
             {
-               return policies::raise_domain_error<T>(
-                  "boost::math::acosh<%1%>(%1%)",
-                  "acosh requires x >= 1, but got x = %1%.", x, pol);
+               return policies::raise_domain_error<T>("boost::math::acosh<%1%>(%1%)", "acosh requires x >= 1, but got x = %1%.", x, pol);
             }
             else if    ((x - 1) >= tools::root_epsilon<T>())
             {
diff --git a/inst/include/boost/math/special_functions/airy.hpp b/inst/include/boost/math/special_functions/airy.hpp
index d7da0035d..65114089a 100644
--- a/inst/include/boost/math/special_functions/airy.hpp
+++ b/inst/include/boost/math/special_functions/airy.hpp
@@ -1,4 +1,5 @@
 // Copyright John Maddock 2012.
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -7,19 +8,24 @@
 #ifndef BOOST_MATH_AIRY_HPP
 #define BOOST_MATH_AIRY_HPP
 
-#include <limits>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/bessel.hpp>
 #include <boost/math/special_functions/cbrt.hpp>
 #include <boost/math/special_functions/detail/airy_ai_bi_zero.hpp>
 #include <boost/math/tools/roots.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/constants/constants.hpp>
 
 namespace boost{ namespace math{
 
 namespace detail{
 
 template <class T, class Policy>
-T airy_ai_imp(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T airy_ai_imp(T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -57,7 +63,7 @@ T airy_ai_imp(T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-T airy_bi_imp(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T airy_bi_imp(T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -90,7 +96,7 @@ T airy_bi_imp(T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-T airy_ai_prime_imp(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T airy_ai_prime_imp(T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -125,7 +131,7 @@ T airy_ai_prime_imp(T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-T airy_bi_prime_imp(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T airy_bi_prime_imp(T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -156,7 +162,7 @@ T airy_bi_prime_imp(T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-T airy_ai_zero_imp(int m, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T airy_ai_zero_imp(int m, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names, needed for log, sqrt.
 
@@ -186,7 +192,7 @@ T airy_ai_zero_imp(int m, const Policy& pol)
    std::uintmax_t iterations_used = iterations_allowed;
 
    // Use a dynamic tolerance because the roots get closer the higher m gets.
-   T tolerance;
+   T tolerance;  // LCOV_EXCL_LINE
 
    if     (m <=   10) { tolerance = T(0.3F); }
    else if(m <=  100) { tolerance = T(0.1F); }
@@ -209,7 +215,7 @@ T airy_ai_zero_imp(int m, const Policy& pol)
 }
 
 template <class T, class Policy>
-T airy_bi_zero_imp(int m, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T airy_bi_zero_imp(int m, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names, needed for log, sqrt.
 
@@ -238,7 +244,7 @@ T airy_bi_zero_imp(int m, const Policy& pol)
    std::uintmax_t iterations_used = iterations_allowed;
 
    // Use a dynamic tolerance because the roots get closer the higher m gets.
-   T tolerance;
+   T tolerance; // LCOV_EXCL_LINE
 
    if     (m <=   10) { tolerance = T(0.3F); }
    else if(m <=  100) { tolerance = T(0.1F); }
@@ -263,7 +269,7 @@ T airy_bi_zero_imp(int m, const Policy& pol)
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type airy_ai(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_ai(T x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T>::type result_type;
@@ -279,13 +285,13 @@ inline typename tools::promote_args<T>::type airy_ai(T x, const Policy&)
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type airy_ai(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_ai(T x)
 {
    return airy_ai(x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type airy_bi(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_bi(T x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T>::type result_type;
@@ -301,13 +307,13 @@ inline typename tools::promote_args<T>::type airy_bi(T x, const Policy&)
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type airy_bi(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_bi(T x)
 {
    return airy_bi(x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type airy_ai_prime(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_ai_prime(T x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T>::type result_type;
@@ -323,13 +329,13 @@ inline typename tools::promote_args<T>::type airy_ai_prime(T x, const Policy&)
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type airy_ai_prime(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_ai_prime(T x)
 {
    return airy_ai_prime(x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type airy_bi_prime(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_bi_prime(T x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T>::type result_type;
@@ -345,13 +351,13 @@ inline typename tools::promote_args<T>::type airy_bi_prime(T x, const Policy&)
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type airy_bi_prime(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type airy_bi_prime(T x)
 {
    return airy_bi_prime(x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline T airy_ai_zero(int m, const Policy& /*pol*/)
+BOOST_MATH_GPU_ENABLED inline T airy_ai_zero(int m, const Policy& /*pol*/)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename policies::evaluation<T, Policy>::type value_type;
@@ -371,13 +377,13 @@ inline T airy_ai_zero(int m, const Policy& /*pol*/)
 }
 
 template <class T>
-inline T airy_ai_zero(int m)
+BOOST_MATH_GPU_ENABLED inline T airy_ai_zero(int m)
 {
    return airy_ai_zero<T>(m, policies::policy<>());
 }
 
 template <class T, class OutputIterator, class Policy>
-inline OutputIterator airy_ai_zero(
+BOOST_MATH_GPU_ENABLED inline OutputIterator airy_ai_zero(
                          int start_index,
                          unsigned number_of_zeros,
                          OutputIterator out_it,
@@ -399,7 +405,7 @@ inline OutputIterator airy_ai_zero(
 }
 
 template <class T, class OutputIterator>
-inline OutputIterator airy_ai_zero(
+BOOST_MATH_GPU_ENABLED inline OutputIterator airy_ai_zero(
                          int start_index,
                          unsigned number_of_zeros,
                          OutputIterator out_it)
@@ -408,7 +414,7 @@ inline OutputIterator airy_ai_zero(
 }
 
 template <class T, class Policy>
-inline T airy_bi_zero(int m, const Policy& /*pol*/)
+BOOST_MATH_GPU_ENABLED inline T airy_bi_zero(int m, const Policy& /*pol*/)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename policies::evaluation<T, Policy>::type value_type;
@@ -428,13 +434,13 @@ inline T airy_bi_zero(int m, const Policy& /*pol*/)
 }
 
 template <typename T>
-inline T airy_bi_zero(int m)
+BOOST_MATH_GPU_ENABLED inline T airy_bi_zero(int m)
 {
    return airy_bi_zero<T>(m, policies::policy<>());
 }
 
 template <class T, class OutputIterator, class Policy>
-inline OutputIterator airy_bi_zero(
+BOOST_MATH_GPU_ENABLED inline OutputIterator airy_bi_zero(
                          int start_index,
                          unsigned number_of_zeros,
                          OutputIterator out_it,
@@ -456,7 +462,7 @@ inline OutputIterator airy_bi_zero(
 }
 
 template <class T, class OutputIterator>
-inline OutputIterator airy_bi_zero(
+BOOST_MATH_GPU_ENABLED inline OutputIterator airy_bi_zero(
                          int start_index,
                          unsigned number_of_zeros,
                          OutputIterator out_it)
diff --git a/inst/include/boost/math/special_functions/asinh.hpp b/inst/include/boost/math/special_functions/asinh.hpp
index d66551e49..52362dd29 100644
--- a/inst/include/boost/math/special_functions/asinh.hpp
+++ b/inst/include/boost/math/special_functions/asinh.hpp
@@ -38,9 +38,7 @@ namespace boost
             
             if((boost::math::isnan)(x))
             {
-               return policies::raise_domain_error<T>(
-                  "boost::math::asinh<%1%>(%1%)",
-                  "asinh requires a finite argument, but got x = %1%.", x, pol);
+               return policies::raise_domain_error<T>("boost::math::asinh<%1%>(%1%)", "asinh requires a finite argument, but got x = %1%.", x, pol);
             }
             if        (x >= tools::forth_root_epsilon<T>())
             {
diff --git a/inst/include/boost/math/special_functions/atanh.hpp b/inst/include/boost/math/special_functions/atanh.hpp
index 6204dc434..9d73e568c 100644
--- a/inst/include/boost/math/special_functions/atanh.hpp
+++ b/inst/include/boost/math/special_functions/atanh.hpp
@@ -15,7 +15,7 @@
 #pragma once
 #endif
 
-#include <cmath>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
@@ -33,28 +33,22 @@ namespace boost
         // This is the main fare
 
         template<typename T, typename Policy>
-        inline T    atanh_imp(const T x, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED inline T    atanh_imp(const T x, const Policy& pol)
         {
             BOOST_MATH_STD_USING
-            static const char* function = "boost::math::atanh<%1%>(%1%)";
+            constexpr auto function = "boost::math::atanh<%1%>(%1%)";
 
             if(x < -1)
             {
-               return policies::raise_domain_error<T>(
-                  function,
-                  "atanh requires x >= -1, but got x = %1%.", x, pol);
+               return policies::raise_domain_error<T>(function, "atanh requires x >= -1, but got x = %1%.", x, pol);
             }
             else if(x > 1)
             {
-               return policies::raise_domain_error<T>(
-                  function,
-                  "atanh requires x <= 1, but got x = %1%.", x, pol);
+               return policies::raise_domain_error<T>(function, "atanh requires x <= 1, but got x = %1%.", x, pol);
             }
             else if((boost::math::isnan)(x))
             {
-               return policies::raise_domain_error<T>(
-                  function,
-                  "atanh requires -1 <= x <= 1, but got x = %1%.", x, pol);
+               return policies::raise_domain_error<T>(function, "atanh requires -1 <= x <= 1, but got x = %1%.", x, pol);
             }
             else if(x < -1 + tools::epsilon<T>())
             {
@@ -93,7 +87,7 @@ namespace boost
        }
 
         template<typename T, typename Policy>
-        inline typename tools::promote_args<T>::type atanh(T x, const Policy&)
+        BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type atanh(T x, const Policy&)
         {
             typedef typename tools::promote_args<T>::type result_type;
             typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -108,7 +102,7 @@ namespace boost
               "boost::math::atanh<%1%>(%1%)");
         }
         template<typename T>
-        inline typename tools::promote_args<T>::type atanh(T x)
+        BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type atanh(T x)
         {
            return boost::math::atanh(x, policies::policy<>());
         }
diff --git a/inst/include/boost/math/special_functions/bernoulli.hpp b/inst/include/boost/math/special_functions/bernoulli.hpp
index d77a52089..102b49399 100644
--- a/inst/include/boost/math/special_functions/bernoulli.hpp
+++ b/inst/include/boost/math/special_functions/bernoulli.hpp
@@ -88,7 +88,7 @@ inline OutputIterator bernoulli_b2n(const int start_index,
    if(start_index < 0)
    {
       *out_it = policies::raise_domain_error<T>("boost::math::bernoulli_b2n<%1%>", "Index should be >= 0 but got %1%", T(start_index), pol);
-      return ++out_it;
+      return ++out_it; // LCOV_EXCL_LINE we don't reach here, previous line throws.
    }
 
    return boost::math::detail::bernoulli_number_imp<T>(out_it, start_index, number_of_bernoullis_b2n, pol, tag_type());
@@ -130,7 +130,7 @@ inline OutputIterator tangent_t2n(const int start_index,
    if(start_index < 0)
    {
       *out_it = policies::raise_domain_error<T>("boost::math::tangent_t2n<%1%>", "Index should be >= 0 but got %1%", T(start_index), pol);
-      return ++out_it;
+      return ++out_it; // LCOV_EXCL_LINE we don't reach here, previous line throws.
    }
 
    return boost::math::detail::get_bernoulli_numbers_cache<T, Policy>().copy_tangent_numbers(out_it, start_index, number_of_tangent_t2n, pol);
diff --git a/inst/include/boost/math/special_functions/bessel.hpp b/inst/include/boost/math/special_functions/bessel.hpp
index 35ad35026..c32f251bc 100644
--- a/inst/include/boost/math/special_functions/bessel.hpp
+++ b/inst/include/boost/math/special_functions/bessel.hpp
@@ -15,8 +15,14 @@
 #  pragma once
 #endif
 
-#include <limits>
-#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/rational.hpp>
+#include <boost/math/tools/promotion.hpp>
+#include <boost/math/tools/series.hpp>
+#include <boost/math/tools/roots.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/special_functions/detail/bessel_jy.hpp>
 #include <boost/math/special_functions/detail/bessel_jn.hpp>
 #include <boost/math/special_functions/detail/bessel_yn.hpp>
@@ -31,10 +37,8 @@
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/special_functions/round.hpp>
-#include <boost/math/tools/rational.hpp>
-#include <boost/math/tools/promotion.hpp>
-#include <boost/math/tools/series.hpp>
-#include <boost/math/tools/roots.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/special_functions/math_fwd.hpp>
 
 #ifdef _MSC_VER
 # pragma warning(push)
@@ -50,7 +54,7 @@ struct sph_bessel_j_small_z_series_term
 {
    typedef T result_type;
 
-   sph_bessel_j_small_z_series_term(unsigned v_, T x)
+   BOOST_MATH_GPU_ENABLED sph_bessel_j_small_z_series_term(unsigned v_, T x)
       : N(0), v(v_)
    {
       BOOST_MATH_STD_USING
@@ -64,7 +68,7 @@ struct sph_bessel_j_small_z_series_term
          term = pow(mult, T(v)) / boost::math::tgamma(v+1+T(0.5f), Policy());
       mult *= -mult;
    }
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T r = term;
       ++N;
@@ -79,11 +83,11 @@ struct sph_bessel_j_small_z_series_term
 };
 
 template <class T, class Policy>
-inline T sph_bessel_j_small_z_series(unsigned v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T sph_bessel_j_small_z_series(unsigned v, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
    sph_bessel_j_small_z_series_term<T, Policy> s(v, x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    T result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter);
 
@@ -92,33 +96,51 @@ inline T sph_bessel_j_small_z_series(unsigned v, T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-T cyl_bessel_j_imp(T v, T x, const bessel_no_int_tag& t, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T cyl_bessel_j_imp_final(T v, T x, const bessel_no_int_tag& t, const Policy& pol)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::bessel_j<%1%>(%1%,%1%)";
+
+   T result_J, y; // LCOV_EXCL_LINE
+   bessel_jy(v, x, &result_J, &y, need_j, pol);
+   return result_J;
+}
+
+// Dispatch funtion to avoid recursion
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED T cyl_bessel_j_imp(T v, T x, const bessel_no_int_tag& t, const Policy& pol)
+{
+   BOOST_MATH_STD_USING
+
    if(x < 0)
    {
       // better have integer v:
-      if(floor(v) == v)
+      if (floor(v) == v)
       {
-         T r = cyl_bessel_j_imp(v, T(-x), t, pol);
-         if(iround(v, pol) & 1)
+         // LCOV_EXCL_START
+         // This branch is hit by multiprecision types only, and is
+         // tested by our real_concept tests, but thee are excluded from coverage
+         // due to time constraints.
+         T r = cyl_bessel_j_imp_final(T(v), T(-x), t, pol);
+         if (iround(v, pol) & 1)
+         {
             r = -r;
+         }
+
          return r;
+         // LCOV_EXCL_STOP
       }
       else
-         return policies::raise_domain_error<T>(
-            function,
-            "Got x = %1%, but we need x >= 0", x, pol);
+      {
+         constexpr auto function = "boost::math::bessel_j<%1%>(%1%,%1%)";
+         return policies::raise_domain_error<T>(function, "Got x = %1%, but we need x >= 0", x, pol);
+      }
    }
 
-   T j, y;
-   bessel_jy(v, x, &j, &y, need_j, pol);
-   return j;
+   return cyl_bessel_j_imp_final(T(v), T(x), t, pol);
 }
 
 template <class T, class Policy>
-inline T cyl_bessel_j_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_bessel_j_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // ADL of std names.
    int ival = detail::iconv(v, pol);
@@ -132,25 +154,23 @@ inline T cyl_bessel_j_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& p
 }
 
 template <class T, class Policy>
-inline T cyl_bessel_j_imp(int v, T x, const bessel_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_bessel_j_imp(int v, T x, const bessel_int_tag&, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    return bessel_jn(v, x, pol);
 }
 
 template <class T, class Policy>
-inline T sph_bessel_j_imp(unsigned n, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T sph_bessel_j_imp(unsigned n, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
    if(x < 0)
-      return policies::raise_domain_error<T>(
-         "boost::math::sph_bessel_j<%1%>(%1%,%1%)",
-         "Got x = %1%, but function requires x > 0.", x, pol);
+      return policies::raise_domain_error<T>("boost::math::sph_bessel_j<%1%>(%1%,%1%)", "Got x = %1%, but function requires x > 0.", x, pol);
    //
    // Special case, n == 0 resolves down to the sinus cardinal of x:
    //
    if(n == 0)
-      return boost::math::sinc_pi(x, pol);
+      return (boost::math::isinf)(x) ? T(0) : boost::math::sinc_pi(x, pol);
    //
    // Special case for x == 0:
    //
@@ -170,7 +190,7 @@ inline T sph_bessel_j_imp(unsigned n, T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-T cyl_bessel_i_imp(T v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T cyl_bessel_i_imp_final(T v, T x, const Policy& pol)
 {
    //
    // This handles all the bessel I functions, note that we don't optimise
@@ -179,23 +199,11 @@ T cyl_bessel_i_imp(T v, T x, const Policy& pol)
    // case has better error handling too).
    //
    BOOST_MATH_STD_USING
-   if(x < 0)
-   {
-      // better have integer v:
-      if(floor(v) == v)
-      {
-         T r = cyl_bessel_i_imp(v, T(-x), pol);
-         if(iround(v, pol) & 1)
-            r = -r;
-         return r;
-      }
-      else
-         return policies::raise_domain_error<T>(
-         "boost::math::cyl_bessel_i<%1%>(%1%,%1%)",
-            "Got x = %1%, but we need x >= 0", x, pol);
-   }
+   constexpr auto function = "boost::math::cyl_bessel_i<%1%>(%1%,%1%)";
    if(x == 0)
    {
+      if(v < 0) 
+         return floor(v) == v ? static_cast<T>(0) : policies::raise_overflow_error<T>(function, nullptr, pol);
       return (v == 0) ? static_cast<T>(1) : static_cast<T>(0);
    }
    if(v == 0.5f)
@@ -208,7 +216,7 @@ T cyl_bessel_i_imp(T v, T x, const Policy& pol)
       }
       return sqrt(2 / (x * constants::pi<T>())) * sinh(x);
    }
-   if((policies::digits<T, Policy>() <= 113) && (std::numeric_limits<T>::digits <= 113) && (std::numeric_limits<T>::radix == 2))
+   if((policies::digits<T, Policy>() <= 113) && (boost::math::numeric_limits<T>::digits <= 113) && (boost::math::numeric_limits<T>::radix == 2))
    {
       if(v == 0)
       {
@@ -221,36 +229,61 @@ T cyl_bessel_i_imp(T v, T x, const Policy& pol)
    }
    if((v > 0) && (x / v < 0.25))
       return bessel_i_small_z_series(v, x, pol);
-   T I, K;
-   bessel_ik(v, x, &I, &K, need_i, pol);
-   return I;
+   T result_I, result_K; // LCOV_EXCL_LINE
+   bessel_ik(v, x, &result_I, &result_K, need_i, pol);
+   return result_I;
+}
+
+// Additional dispatch function to get the GPU impls happy
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED T cyl_bessel_i_imp(T v, T x, const Policy& pol)
+{
+   BOOST_MATH_STD_USING
+   constexpr auto function = "boost::math::cyl_bessel_i<%1%>(%1%,%1%)";
+
+   if(x < 0)
+   {
+      // better have integer v:
+      if(floor(v) == v)
+      {
+         T r = cyl_bessel_i_imp_final(T(v), T(-x), pol);
+         if(iround(v, pol) & 1)
+         {
+            r = -r;
+         }
+         
+         return r;
+      }
+      else
+      {
+         return policies::raise_domain_error<T>(function, "Got x = %1%, but we need x >= 0", x, pol);
+      }
+   }
+   
+   return cyl_bessel_i_imp_final(T(v), T(x), pol);
 }
 
 template <class T, class Policy>
-inline T cyl_bessel_k_imp(T v, T x, const bessel_no_int_tag& /* t */, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_bessel_k_imp(T v, T x, const bessel_no_int_tag& /* t */, const Policy& pol)
 {
-   static const char* function = "boost::math::cyl_bessel_k<%1%>(%1%,%1%)";
+   constexpr auto function = "boost::math::cyl_bessel_k<%1%>(%1%,%1%)";
    BOOST_MATH_STD_USING
    if(x < 0)
    {
-      return policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but we need x > 0", x, pol);
+      return policies::raise_domain_error<T>(function, "Got x = %1%, but we need x > 0", x, pol);
    }
    if(x == 0)
    {
       return (v == 0) ? policies::raise_overflow_error<T>(function, nullptr, pol)
-         : policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but we need x > 0", x, pol);
+         : policies::raise_domain_error<T>(function, "Got x = %1%, but we need x > 0", x, pol);
    }
-   T I, K;
-   bessel_ik(v, x, &I, &K, need_k, pol);
-   return K;
+   T result_I, result_K; // LCOV_EXCL_LINE
+   bessel_ik(v, x, &result_I, &result_K, need_k, pol);
+   return result_K;
 }
 
 template <class T, class Policy>
-inline T cyl_bessel_k_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_bessel_k_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    if((floor(v) == v))
@@ -261,15 +294,15 @@ inline T cyl_bessel_k_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& p
 }
 
 template <class T, class Policy>
-inline T cyl_bessel_k_imp(int v, T x, const bessel_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_bessel_k_imp(int v, T x, const bessel_int_tag&, const Policy& pol)
 {
    return bessel_kn(v, x, pol);
 }
 
 template <class T, class Policy>
-inline T cyl_neumann_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_neumann_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol)
 {
-   static const char* function = "boost::math::cyl_neumann<%1%>(%1%,%1%)";
+   constexpr auto function = "boost::math::cyl_neumann<%1%>(%1%,%1%)";
 
    BOOST_MATH_INSTRUMENT_VARIABLE(v);
    BOOST_MATH_INSTRUMENT_VARIABLE(x);
@@ -277,25 +310,23 @@ inline T cyl_neumann_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol)
    if(x <= 0)
    {
       return (v == 0) && (x == 0) ?
-         policies::raise_overflow_error<T>(function, nullptr, pol)
-         : policies::raise_domain_error<T>(
-               function,
-               "Got x = %1%, but result is complex for x <= 0", x, pol);
+         -policies::raise_overflow_error<T>(function, nullptr, pol) // LCOV_EXCL_LINE MP case only here, not tested in code coverage as it takes too long.
+         : policies::raise_domain_error<T>(function, "Got x = %1%, but result is complex for x <= 0", x, pol);
    }
-   T j, y;
-   bessel_jy(v, x, &j, &y, need_y, pol);
+   T result_J, y; // LCOV_EXCL_LINE
+   bessel_jy(v, x, &result_J, &y, need_y, pol);
    //
    // Post evaluation check for internal overflow during evaluation,
    // can occur when x is small and v is large, in which case the result
    // is -INF:
    //
    if(!(boost::math::isfinite)(y))
-      return -policies::raise_overflow_error<T>(function, nullptr, pol);
+      return -policies::raise_overflow_error<T>(function, nullptr, pol); // LCOV_EXCL_LINE defensive programming?  Might be dead code now...
    return y;
 }
 
 template <class T, class Policy>
-inline T cyl_neumann_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_neumann_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -314,24 +345,22 @@ inline T cyl_neumann_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& po
 }
 
 template <class T, class Policy>
-inline T cyl_neumann_imp(int v, T x, const bessel_int_tag&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_neumann_imp(int v, T x, const bessel_int_tag&, const Policy& pol)
 {
    return bessel_yn(v, x, pol);
 }
 
 template <class T, class Policy>
-inline T sph_neumann_imp(unsigned v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T sph_neumann_imp(unsigned v, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
-   static const char* function = "boost::math::sph_neumann<%1%>(%1%,%1%)";
+   constexpr auto function = "boost::math::sph_neumann<%1%>(%1%,%1%)";
    //
    // Nothing much to do here but check for errors, and
    // evaluate the function's definition directly:
    //
    if(x < 0)
-      return policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function requires x > 0.", x, pol);
+      return policies::raise_domain_error<T>(function, "Got x = %1%, but function requires x > 0.", x, pol);
 
    if(x < 2 * tools::min_value<T>())
       return -policies::raise_overflow_error<T>(function, nullptr, pol);
@@ -339,18 +368,18 @@ inline T sph_neumann_imp(unsigned v, T x, const Policy& pol)
    T result = cyl_neumann_imp(T(T(v)+0.5f), x, bessel_no_int_tag(), pol);
    T tx = sqrt(constants::pi<T>() / (2 * x));
 
-   if((tx > 1) && (tools::max_value<T>() / tx < result))
+   if((tx > 1) && (tools::max_value<T>() / tx < fabs(result)))
       return -policies::raise_overflow_error<T>(function, nullptr, pol);
 
    return result * tx;
 }
 
 template <class T, class Policy>
-inline T cyl_bessel_j_zero_imp(T v, int m, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_bessel_j_zero_imp(T v, int m, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names, needed for floor.
 
-   static const char* function = "boost::math::cyl_bessel_j_zero<%1%>(%1%, int)";
+   constexpr auto function = "boost::math::cyl_bessel_j_zero<%1%>(%1%, int)";
 
    const T half_epsilon(boost::math::tools::epsilon<T>() / 2U);
 
@@ -401,7 +430,7 @@ inline T cyl_bessel_j_zero_imp(T v, int m, const Policy& pol)
    const T guess_root = boost::math::detail::bessel_zero::cyl_bessel_j_zero_detail::initial_guess<T, Policy>((order_is_integer ? vv : v), m, pol);
 
    // Select the maximum allowed iterations from the policy.
-   std::uintmax_t number_of_iterations = policies::get_max_root_iterations<Policy>();
+   boost::math::uintmax_t number_of_iterations = policies::get_max_root_iterations<Policy>();
 
    const T delta_lo = ((guess_root > 0.2F) ? T(0.2) : T(guess_root / 2U));
 
@@ -417,19 +446,18 @@ inline T cyl_bessel_j_zero_imp(T v, int m, const Policy& pol)
 
    if(number_of_iterations >= policies::get_max_root_iterations<Policy>())
    {
-      return policies::raise_evaluation_error<T>(function, "Unable to locate root in a reasonable time:"
-         "  Current best guess is %1%", jvm, Policy());
+      return policies::raise_evaluation_error<T>(function, "Unable to locate root in a reasonable time: Current best guess is %1%", jvm, Policy()); // LCOV_EXCL_LINE
    }
 
    return jvm;
 }
 
 template <class T, class Policy>
-inline T cyl_neumann_zero_imp(T v, int m, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T cyl_neumann_zero_imp(T v, int m, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names, needed for floor.
 
-   static const char* function = "boost::math::cyl_neumann_zero<%1%>(%1%, int)";
+   constexpr auto function = "boost::math::cyl_neumann_zero<%1%>(%1%, int)";
 
    // Handle non-finite order.
    if (!(boost::math::isfinite)(v) )
@@ -480,7 +508,7 @@ inline T cyl_neumann_zero_imp(T v, int m, const Policy& pol)
    const T guess_root = boost::math::detail::bessel_zero::cyl_neumann_zero_detail::initial_guess<T, Policy>(v, m, pol);
 
    // Select the maximum allowed iterations from the policy.
-   std::uintmax_t number_of_iterations = policies::get_max_root_iterations<Policy>();
+   boost::math::uintmax_t number_of_iterations = policies::get_max_root_iterations<Policy>();
 
    const T delta_lo = ((guess_root > 0.2F) ? T(0.2) : T(guess_root / 2U));
 
@@ -496,8 +524,7 @@ inline T cyl_neumann_zero_imp(T v, int m, const Policy& pol)
 
    if(number_of_iterations >= policies::get_max_root_iterations<Policy>())
    {
-      return policies::raise_evaluation_error<T>(function, "Unable to locate root in a reasonable time:"
-         "  Current best guess is %1%", yvm, Policy());
+      return policies::raise_evaluation_error<T>(function, "Unable to locate root in a reasonable time: Current best guess is %1%", yvm, Policy()); //LCOV_EXCL_LINE
    }
 
    return yvm;
@@ -506,7 +533,7 @@ inline T cyl_neumann_zero_imp(T v, int m, const Policy& pol)
 } // namespace detail
 
 template <class T1, class T2, class Policy>
-inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j(T1 v, T2 x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j(T1 v, T2 x, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
@@ -522,13 +549,13 @@ inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j(
 }
 
 template <class T1, class T2>
-inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_j(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_j(T1 v, T2 x)
 {
    return cyl_bessel_j(v, x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel(unsigned v, T x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel(unsigned v, T x, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T, T, Policy>::result_type result_type;
@@ -543,13 +570,13 @@ inline typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel(unsi
 }
 
 template <class T>
-inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_bessel(unsigned v, T x)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_bessel(unsigned v, T x)
 {
    return sph_bessel(v, x, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i(T1 v, T2 x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i(T1 v, T2 x, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
@@ -564,13 +591,13 @@ inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i(
 }
 
 template <class T1, class T2>
-inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_i(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_i(T1 v, T2 x)
 {
    return cyl_bessel_i(v, x, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k(T1 v, T2 x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k(T1 v, T2 x, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
@@ -586,13 +613,13 @@ inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k(
 }
 
 template <class T1, class T2>
-inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_k(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_k(T1 v, T2 x)
 {
    return cyl_bessel_k(v, x, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann(T1 v, T2 x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann(T1 v, T2 x, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
@@ -608,13 +635,13 @@ inline typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann(T
 }
 
 template <class T1, class T2>
-inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_neumann(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_neumann(T1 v, T2 x)
 {
    return cyl_neumann(v, x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann(unsigned v, T x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann(unsigned v, T x, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T, T, Policy>::result_type result_type;
@@ -629,13 +656,13 @@ inline typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann(uns
 }
 
 template <class T>
-inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_neumann(unsigned v, T x)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_neumann(unsigned v, T x)
 {
    return sph_neumann(v, x, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename detail::bessel_traits<T, T, Policy>::result_type cyl_bessel_j_zero(T v, int m, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, Policy>::result_type cyl_bessel_j_zero(T v, int m, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T, T, Policy>::result_type result_type;
@@ -647,35 +674,35 @@ inline typename detail::bessel_traits<T, T, Policy>::result_type cyl_bessel_j_ze
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   static_assert(    false == std::numeric_limits<T>::is_specialized
-                           || (   true  == std::numeric_limits<T>::is_specialized
-                               && false == std::numeric_limits<T>::is_integer),
+   static_assert(    false == boost::math::numeric_limits<T>::is_specialized
+                           || (   true  == boost::math::numeric_limits<T>::is_specialized
+                               && false == boost::math::numeric_limits<T>::is_integer),
                            "Order must be a floating-point type.");
 
    return policies::checked_narrowing_cast<result_type, Policy>(detail::cyl_bessel_j_zero_imp<value_type>(v, m, forwarding_policy()), "boost::math::cyl_bessel_j_zero<%1%>(%1%,%1%)");
 }
 
 template <class T>
-inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_bessel_j_zero(T v, int m)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_bessel_j_zero(T v, int m)
 {
-   static_assert(    false == std::numeric_limits<T>::is_specialized
-                           || (   true  == std::numeric_limits<T>::is_specialized
-                               && false == std::numeric_limits<T>::is_integer),
+   static_assert(    false == boost::math::numeric_limits<T>::is_specialized
+                           || (   true  == boost::math::numeric_limits<T>::is_specialized
+                               && false == boost::math::numeric_limits<T>::is_integer),
                            "Order must be a floating-point type.");
 
    return cyl_bessel_j_zero<T, policies::policy<> >(v, m, policies::policy<>());
 }
 
 template <class T, class OutputIterator, class Policy>
-inline OutputIterator cyl_bessel_j_zero(T v,
+BOOST_MATH_GPU_ENABLED inline OutputIterator cyl_bessel_j_zero(T v,
                               int start_index,
                               unsigned number_of_zeros,
                               OutputIterator out_it,
                               const Policy& pol)
 {
-   static_assert(    false == std::numeric_limits<T>::is_specialized
-                           || (   true  == std::numeric_limits<T>::is_specialized
-                               && false == std::numeric_limits<T>::is_integer),
+   static_assert(    false == boost::math::numeric_limits<T>::is_specialized
+                           || (   true  == boost::math::numeric_limits<T>::is_specialized
+                               && false == boost::math::numeric_limits<T>::is_integer),
                            "Order must be a floating-point type.");
 
    for(int i = 0; i < static_cast<int>(number_of_zeros); ++i)
@@ -687,7 +714,7 @@ inline OutputIterator cyl_bessel_j_zero(T v,
 }
 
 template <class T, class OutputIterator>
-inline OutputIterator cyl_bessel_j_zero(T v,
+BOOST_MATH_GPU_ENABLED inline OutputIterator cyl_bessel_j_zero(T v,
                               int start_index,
                               unsigned number_of_zeros,
                               OutputIterator out_it)
@@ -696,7 +723,7 @@ inline OutputIterator cyl_bessel_j_zero(T v,
 }
 
 template <class T, class Policy>
-inline typename detail::bessel_traits<T, T, Policy>::result_type cyl_neumann_zero(T v, int m, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, Policy>::result_type cyl_neumann_zero(T v, int m, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T, T, Policy>::result_type result_type;
@@ -708,35 +735,35 @@ inline typename detail::bessel_traits<T, T, Policy>::result_type cyl_neumann_zer
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   static_assert(    false == std::numeric_limits<T>::is_specialized
-                           || (   true  == std::numeric_limits<T>::is_specialized
-                               && false == std::numeric_limits<T>::is_integer),
+   static_assert(    false == boost::math::numeric_limits<T>::is_specialized
+                           || (   true  == boost::math::numeric_limits<T>::is_specialized
+                               && false == boost::math::numeric_limits<T>::is_integer),
                            "Order must be a floating-point type.");
 
    return policies::checked_narrowing_cast<result_type, Policy>(detail::cyl_neumann_zero_imp<value_type>(v, m, forwarding_policy()), "boost::math::cyl_neumann_zero<%1%>(%1%,%1%)");
 }
 
 template <class T>
-inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_neumann_zero(T v, int m)
+BOOST_MATH_GPU_ENABLED inline typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_neumann_zero(T v, int m)
 {
-   static_assert(    false == std::numeric_limits<T>::is_specialized
-                           || (   true  == std::numeric_limits<T>::is_specialized
-                               && false == std::numeric_limits<T>::is_integer),
+   static_assert(    false == boost::math::numeric_limits<T>::is_specialized
+                           || (   true  == boost::math::numeric_limits<T>::is_specialized
+                               && false == boost::math::numeric_limits<T>::is_integer),
                            "Order must be a floating-point type.");
 
    return cyl_neumann_zero<T, policies::policy<> >(v, m, policies::policy<>());
 }
 
 template <class T, class OutputIterator, class Policy>
-inline OutputIterator cyl_neumann_zero(T v,
+BOOST_MATH_GPU_ENABLED inline OutputIterator cyl_neumann_zero(T v,
                              int start_index,
                              unsigned number_of_zeros,
                              OutputIterator out_it,
                              const Policy& pol)
 {
-   static_assert(    false == std::numeric_limits<T>::is_specialized
-                           || (   true  == std::numeric_limits<T>::is_specialized
-                               && false == std::numeric_limits<T>::is_integer),
+   static_assert(    false == boost::math::numeric_limits<T>::is_specialized
+                           || (   true  == boost::math::numeric_limits<T>::is_specialized
+                               && false == boost::math::numeric_limits<T>::is_integer),
                            "Order must be a floating-point type.");
 
    for(int i = 0; i < static_cast<int>(number_of_zeros); ++i)
@@ -748,7 +775,7 @@ inline OutputIterator cyl_neumann_zero(T v,
 }
 
 template <class T, class OutputIterator>
-inline OutputIterator cyl_neumann_zero(T v,
+BOOST_MATH_GPU_ENABLED inline OutputIterator cyl_neumann_zero(T v,
                              int start_index,
                              unsigned number_of_zeros,
                              OutputIterator out_it)
diff --git a/inst/include/boost/math/special_functions/bessel_iterators.hpp b/inst/include/boost/math/special_functions/bessel_iterators.hpp
index c577f7564..7e0de2f86 100644
--- a/inst/include/boost/math/special_functions/bessel_iterators.hpp
+++ b/inst/include/boost/math/special_functions/bessel_iterators.hpp
@@ -9,6 +9,7 @@
 #define BOOST_MATH_BESSEL_ITERATORS_HPP
 
 #include <boost/math/tools/recurrence.hpp>
+#include <boost/math/special_functions/bessel.hpp>
 
 namespace boost {
    namespace math {
@@ -154,8 +155,8 @@ namespace boost {
             if (v > 1)
                boost::math::policies::raise_domain_error("bessel_i_forwards_iterator<%1%>", "Order must be < 0 stable forwards recurrence but got %1%", v, Policy());
          }
-         bessel_i_forwards_iterator(const T& v, const T& x, const T& I_v_plus_1, const T& I_v)
-            : it(detail::bessel_ik_recurrence<T>(v, x), I_v_plus_1, I_v)
+         bessel_i_forwards_iterator(const T& v, const T& x, const T& I_v_minus_1, const T& I_v)
+            : it(detail::bessel_ik_recurrence<T>(v, x), I_v_minus_1, I_v)
          {
             if (v > 1)
                boost::math::policies::raise_domain_error("bessel_i_forwards_iterator<%1%>", "Order must be < 0 stable forwards recurrence but got %1%", v, Policy());
diff --git a/inst/include/boost/math/special_functions/bessel_prime.hpp b/inst/include/boost/math/special_functions/bessel_prime.hpp
index 6d8b466f2..ba7156288 100644
--- a/inst/include/boost/math/special_functions/bessel_prime.hpp
+++ b/inst/include/boost/math/special_functions/bessel_prime.hpp
@@ -28,10 +28,8 @@ inline T cyl_bessel_j_prime_imp(T v, T x, const Policy& pol)
    //
    // Prevent complex result:
    //
-   if (x < 0 && floor(v) != v)
-      return boost::math::policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function requires x >= 0", x, pol);
+   if ((x < 0) && (floor(v) != v))
+      return boost::math::policies::raise_domain_error<T>(function, "Got x = %1%, but function requires x >= 0", x, pol);
    //
    // Special cases for x == 0:
    //
@@ -43,9 +41,8 @@ inline T cyl_bessel_j_prime_imp(T v, T x, const Policy& pol)
          return static_cast<T>(-0.5);
       else if (floor(v) == v || v > 1)
          return 0;
-      else return boost::math::policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function is indeterminate for this order", x, pol);
+      else
+         return boost::math::policies::raise_domain_error<T>(function, "Got x = %1%, but function is indeterminate for this order", x, pol);
    }
    //
    // Special case for large x: use asymptotic expansion:
@@ -86,9 +83,7 @@ inline T sph_bessel_j_prime_imp(unsigned v, T x, const Policy& pol)
    // Prevent complex result:
    //
    if (x < 0)
-      return boost::math::policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function requires x >= 0.", x, pol);
+      return boost::math::policies::raise_domain_error<T>(function, "Got x = %1%, but function requires x >= 0.", x, pol);
    //
    // Special case for v == 0:
    //
@@ -99,9 +94,7 @@ inline T sph_bessel_j_prime_imp(unsigned v, T x, const Policy& pol)
    // Special case for x == 0 and v > 0:
    //
    if (x == 0)
-      return boost::math::policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function is indeterminate for this order", x, pol);
+      return boost::math::policies::raise_domain_error<T>(function, "Got x = %1%, but function is indeterminate for this order", x, pol);
    //
    // Default case:
    //
@@ -117,9 +110,7 @@ inline T cyl_bessel_i_prime_imp(T v, T x, const Policy& pol)
    // Prevent complex result:
    //
    if (x < 0 && floor(v) != v)
-      return boost::math::policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function requires x >= 0", x, pol);
+      return boost::math::policies::raise_domain_error<T>(function, "Got x = %1%, but function requires x >= 0", x, pol);
    //
    // Special cases for x == 0:
    //
@@ -129,9 +120,8 @@ inline T cyl_bessel_i_prime_imp(T v, T x, const Policy& pol)
          return static_cast<T>(0.5);
       else if (floor(v) == v || v > 1)
          return 0;
-      else return boost::math::policies::raise_domain_error<T>(
-         function,
-         "Got x = %1%, but function is indeterminate for this order", x, pol);
+      else 
+         return boost::math::policies::raise_domain_error<T>(function, "Got x = %1%, but function is indeterminate for this order", x, pol);
    }
    //
    // Special case for v == 0:
@@ -151,9 +141,7 @@ inline T cyl_bessel_k_prime_imp(T v, T x, const Policy& pol)
    // Prevent complex and indeterminate results:
    //
    if (x <= 0)
-      return boost::math::policies::raise_domain_error<T>(
-         "boost::math::cyl_bessel_k_prime<%1%>(%1%,%1%)",
-         "Got x = %1%, but function requires x > 0", x, pol);
+      return boost::math::policies::raise_domain_error<T>("boost::math::cyl_bessel_k_prime<%1%>(%1%,%1%)", "Got x = %1%, but function requires x > 0", x, pol);
    //
    // Special case for v == 0:
    //
@@ -173,9 +161,7 @@ inline T cyl_neumann_prime_imp(T v, T x, const Policy& pol)
    // Prevent complex and indeterminate results:
    //
    if (x <= 0)
-      return boost::math::policies::raise_domain_error<T>(
-         "boost::math::cyl_neumann_prime<%1%>(%1%,%1%)",
-         "Got x = %1%, but function requires x > 0", x, pol);
+      return boost::math::policies::raise_domain_error<T>("boost::math::cyl_neumann_prime<%1%>(%1%,%1%)", "Got x = %1%, but function requires x > 0", x, pol);
    //
    // Special case for large x: use asymptotic expansion:
    //
@@ -208,9 +194,7 @@ inline T sph_neumann_prime_imp(unsigned v, T x, const Policy& pol)
    // Prevent complex and indeterminate result:
    //
    if (x <= 0)
-      return boost::math::policies::raise_domain_error<T>(
-         "boost::math::sph_neumann_prime<%1%>(%1%,%1%)",
-         "Got x = %1%, but function requires x > 0.", x, pol);
+      return boost::math::policies::raise_domain_error<T>("boost::math::sph_neumann_prime<%1%>(%1%,%1%)", "Got x = %1%, but function requires x > 0.", x, pol);
    //
    // Special case for v == 0:
    //
diff --git a/inst/include/boost/math/special_functions/beta.hpp b/inst/include/boost/math/special_functions/beta.hpp
index f15e15732..27901a113 100644
--- a/inst/include/boost/math/special_functions/beta.hpp
+++ b/inst/include/boost/math/special_functions/beta.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,18 +11,27 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/promotion.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/special_functions/gamma.hpp>
-#include <boost/math/special_functions/binomial.hpp>
-#include <boost/math/special_functions/factorials.hpp>
 #include <boost/math/special_functions/erf.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/special_functions/trunc.hpp>
+#include <boost/math/special_functions/lanczos.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/special_functions/binomial.hpp>
+#include <boost/math/special_functions/factorials.hpp>
 #include <boost/math/tools/roots.hpp>
-#include <boost/math/tools/assert.hpp>
-#include <cmath>
 
 namespace boost{ namespace math{
 
@@ -31,7 +41,7 @@ namespace detail{
 // Implementation of Beta(a,b) using the Lanczos approximation:
 //
 template <class T, class Lanczos, class Policy>
-T beta_imp(T a, T b, const Lanczos&, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T beta_imp(T a, T b, const Lanczos&, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // for ADL of std names
 
@@ -40,7 +50,7 @@ T beta_imp(T a, T b, const Lanczos&, const Policy& pol)
    if(b <= 0)
       return policies::raise_domain_error<T>("boost::math::beta<%1%>(%1%,%1%)", "The arguments to the beta function must be greater than zero (got b=%1%).", b, pol);
 
-   T result;
+   T result;  // LCOV_EXCL_LINE
 
    T prefix = 1;
    T c = a + b;
@@ -85,7 +95,9 @@ T beta_imp(T a, T b, const Lanczos&, const Policy& pol)
    */
 
    if(a < b)
-      std::swap(a, b);
+   {
+      BOOST_MATH_GPU_SAFE_SWAP(a, b);
+   }
 
    // Lanczos calculation:
    T agh = static_cast<T>(a + Lanczos::g() - 0.5f);
@@ -120,8 +132,9 @@ T beta_imp(T a, T b, const Lanczos&, const Policy& pol)
 // Generic implementation of Beta(a,b) without Lanczos approximation support
 // (Caution this is slow!!!):
 //
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
 template <class T, class Policy>
-T beta_imp(T a, T b, const lanczos::undefined_lanczos& l, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T beta_imp(T a, T b, const lanczos::undefined_lanczos& l, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -190,7 +203,7 @@ T beta_imp(T a, T b, const lanczos::undefined_lanczos& l, const Policy& pol)
    }
 
 } // template <class T>T beta_imp(T a, T b, const lanczos::undefined_lanczos& l)
-
+#endif
 
 //
 // Compute the leading power terms in the incomplete Beta:
@@ -204,7 +217,7 @@ T beta_imp(T a, T b, const lanczos::undefined_lanczos& l, const Policy& pol)
 // horrendous cancellation errors.
 //
 template <class T, class Lanczos, class Policy>
-T ibeta_power_terms(T a,
+BOOST_MATH_GPU_ENABLED T ibeta_power_terms(T a,
                         T b,
                         T x,
                         T y,
@@ -222,7 +235,7 @@ T ibeta_power_terms(T a,
       return pow(x, a) * pow(y, b);
    }
 
-   T result;
+   T result;  // LCOV_EXCL_LINE
 
    T c = a + b;
 
@@ -242,11 +255,11 @@ T ibeta_power_terms(T a,
    // l1 and l2 are the base of the exponents minus one:
    T l1 = (x * b - y * agh) / agh;
    T l2 = (y * a - x * bgh) / bgh;
-   if(((std::min)(fabs(l1), fabs(l2)) < 0.2))
+   if((BOOST_MATH_GPU_SAFE_MIN(fabs(l1), fabs(l2)) < 0.2))
    {
       // when the base of the exponent is very near 1 we get really
       // gross errors unless extra care is taken:
-      if((l1 * l2 > 0) || ((std::min)(a, b) < 1))
+      if((l1 * l2 > 0) || (BOOST_MATH_GPU_SAFE_MIN(a, b) < 1))
       {
          //
          // This first branch handles the simple cases where either:
@@ -282,7 +295,7 @@ T ibeta_power_terms(T a,
             BOOST_MATH_INSTRUMENT_VARIABLE(result);
          }
       }
-      else if((std::max)(fabs(l1), fabs(l2)) < 0.5)
+      else if(BOOST_MATH_GPU_SAFE_MAX(fabs(l1), fabs(l2)) < 0.5)
       {
          //
          // Both exponents are near one and both the exponents are
@@ -331,7 +344,7 @@ T ibeta_power_terms(T a,
          {
             l += log(result);
             if(l >= tools::log_max_value<T>())
-               return policies::raise_overflow_error<T>(function, nullptr, pol);
+               return policies::raise_overflow_error<T>(function, nullptr, pol);  // LCOV_EXCL_LINE we can probably never get here, probably!
             result = exp(l);
          }
          else
@@ -347,7 +360,7 @@ T ibeta_power_terms(T a,
          {
             l += log(result);
             if(l >= tools::log_max_value<T>())
-               return policies::raise_overflow_error<T>(function, nullptr, pol);
+               return policies::raise_overflow_error<T>(function, nullptr, pol);  // LCOV_EXCL_LINE we can probably never get here, probably!
             result = exp(l);
          }
          else
@@ -386,7 +399,7 @@ T ibeta_power_terms(T a,
             {
                l2 += l1 + log(result);
                if(l2 >= tools::log_max_value<T>())
-                  return policies::raise_overflow_error<T>(function, nullptr, pol);
+                  return policies::raise_overflow_error<T>(function, nullptr, pol);  // LCOV_EXCL_LINE we can probably never get here, probably!
                result = exp(l2);
             }
          }
@@ -404,7 +417,7 @@ T ibeta_power_terms(T a,
             {
                l2 += l1 + log(result);
                if(l2 >= tools::log_max_value<T>())
-                  return policies::raise_overflow_error<T>(function, nullptr, pol);
+                  return policies::raise_overflow_error<T>(function, nullptr, pol);  // LCOV_EXCL_LINE we can probably never get here, probably!
                result = exp(l2);
             }
          }
@@ -423,9 +436,9 @@ T ibeta_power_terms(T a,
    if (0 == result)
    {
       if ((a > 1) && (x == 0))
-         return result;  // true zero
+         return result;  // true zero LCOV_EXCL_LINE we can probably never get here
       if ((b > 1) && (y == 0))
-         return result; // true zero
+         return result; // true zero LCOV_EXCL_LINE we can probably never get here
       return boost::math::policies::raise_underflow_error<T>(function, nullptr, pol);
    }
 
@@ -444,8 +457,9 @@ T ibeta_power_terms(T a,
 //
 // This version is generic, slow, and does not use the Lanczos approximation.
 //
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
 template <class T, class Policy>
-T ibeta_power_terms(T a,
+BOOST_MATH_GPU_ENABLED T ibeta_power_terms(T a,
                         T b,
                         T x,
                         T y,
@@ -480,7 +494,7 @@ T ibeta_power_terms(T a,
       bool need_logs = false;
       if (a < b)
       {
-         BOOST_IF_CONSTEXPR(std::numeric_limits<T>::has_infinity)
+         BOOST_MATH_IF_CONSTEXPR(boost::math::numeric_limits<T>::has_infinity)
          {
             power1 = pow((x * y * c * c) / (a * b), a);
             power2 = pow((y * c) / b, b - a);
@@ -503,7 +517,7 @@ T ibeta_power_terms(T a,
       }
       else
       {
-         BOOST_IF_CONSTEXPR(std::numeric_limits<T>::has_infinity)
+         BOOST_MATH_IF_CONSTEXPR(boost::math::numeric_limits<T>::has_infinity)
          {
             power1 = pow((x * y * c * c) / (a * b), b);
             power2 = pow((x * c) / a, a - b);
@@ -522,7 +536,7 @@ T ibeta_power_terms(T a,
                need_logs = true;
          }
       }
-      BOOST_IF_CONSTEXPR(std::numeric_limits<T>::has_infinity)
+      BOOST_MATH_IF_CONSTEXPR(boost::math::numeric_limits<T>::has_infinity)
       {
          if (!(boost::math::isnormal)(power1) || !(boost::math::isnormal)(power2))
          {
@@ -554,7 +568,7 @@ T ibeta_power_terms(T a,
          // exp(a * log1p((xb - ya) / a + p + p(xb - ya) / a))
          //
          // Analogously, when a > b we can just swap all the terms around.
-         // 
+         //
          // Finally, there are a few cases (x or y is unity) when the above logic can't be used
          // or where there is no logarithmic cancellation and accuracy is better just using
          // the regular formula:
@@ -621,6 +635,8 @@ T ibeta_power_terms(T a,
    }
    return prefix * power1 * (power2 / bet);
 }
+
+#endif
 //
 // Series approximation to the incomplete beta:
 //
@@ -628,8 +644,8 @@ template <class T>
 struct ibeta_series_t
 {
    typedef T result_type;
-   ibeta_series_t(T a_, T b_, T x_, T mult) : result(mult), x(x_), apn(a_), poch(1-b_), n(1) {}
-   T operator()()
+   BOOST_MATH_GPU_ENABLED ibeta_series_t(T a_, T b_, T x_, T mult) : result(mult), x(x_), apn(a_), poch(1-b_), n(1) {}
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T r = result / apn;
       apn += 1;
@@ -644,7 +660,7 @@ struct ibeta_series_t
 };
 
 template <class T, class Lanczos, class Policy>
-T ibeta_series(T a, T b, T x, T s0, const Lanczos&, bool normalised, T* p_derivative, T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ibeta_series(T a, T b, T x, T s0, const Lanczos&, bool normalised, T* p_derivative, T y, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -666,7 +682,7 @@ T ibeta_series(T a, T b, T x, T s0, const Lanczos&, bool normalised, T* p_deriva
          result = Lanczos::lanczos_sum_expG_scaled(c) / (Lanczos::lanczos_sum_expG_scaled(a) * Lanczos::lanczos_sum_expG_scaled(b));
 
       if (!(boost::math::isfinite)(result))
-         result = 0;
+         result = 0;  // LCOV_EXCL_LINE we can probably never get here, covered already above?
 
       T l1 = log(cgh / bgh) * (b - 0.5f);
       T l2 = log(x * cgh / agh) * a;
@@ -713,7 +729,7 @@ T ibeta_series(T a, T b, T x, T s0, const Lanczos&, bool normalised, T* p_deriva
    if(result < tools::min_value<T>())
       return s0; // Safeguard: series can't cope with denorms.
    ibeta_series_t<T> s(a, b, x, result);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
    result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter, s0);
    policies::check_series_iterations<T>("boost::math::ibeta<%1%>(%1%, %1%, %1%) in ibeta_series (with lanczos)", max_iter, pol);
    return result;
@@ -721,8 +737,9 @@ T ibeta_series(T a, T b, T x, T s0, const Lanczos&, bool normalised, T* p_deriva
 //
 // Incomplete Beta series again, this time without Lanczos support:
 //
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
 template <class T, class Policy>
-T ibeta_series(T a, T b, T x, T s0, const boost::math::lanczos::undefined_lanczos& l, bool normalised, T* p_derivative, T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ibeta_series(T a, T b, T x, T s0, const boost::math::lanczos::undefined_lanczos& l, bool normalised, T* p_derivative, T y, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -774,23 +791,23 @@ T ibeta_series(T a, T b, T x, T s0, const boost::math::lanczos::undefined_lanczo
    if(result < tools::min_value<T>())
       return s0; // Safeguard: series can't cope with denorms.
    ibeta_series_t<T> s(a, b, x, result);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
    result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter, s0);
    policies::check_series_iterations<T>("boost::math::ibeta<%1%>(%1%, %1%, %1%) in ibeta_series (without lanczos)", max_iter, pol);
    return result;
 }
-
+#endif
 //
 // Continued fraction for the incomplete beta:
 //
 template <class T>
 struct ibeta_fraction2_t
 {
-   typedef std::pair<T, T> result_type;
+   typedef boost::math::pair<T, T> result_type;
 
-   ibeta_fraction2_t(T a_, T b_, T x_, T y_) : a(a_), b(b_), x(x_), y(y_), m(0) {}
+   BOOST_MATH_GPU_ENABLED ibeta_fraction2_t(T a_, T b_, T x_, T y_) : a(a_), b(b_), x(x_), y(y_), m(0) {}
 
-   result_type operator()()
+   BOOST_MATH_GPU_ENABLED result_type operator()()
    {
       T aN = (a + m - 1) * (a + b + m - 1) * m * (b - m) * x * x;
       T denom = (a + 2 * m - 1);
@@ -802,7 +819,7 @@ struct ibeta_fraction2_t
 
       ++m;
 
-      return std::make_pair(aN, bN);
+      return boost::math::make_pair(aN, bN);
    }
 
 private:
@@ -813,7 +830,7 @@ struct ibeta_fraction2_t
 // Evaluate the incomplete beta via the continued fraction representation:
 //
 template <class T, class Policy>
-inline T ibeta_fraction2(T a, T b, T x, T y, const Policy& pol, bool normalised, T* p_derivative)
+BOOST_MATH_GPU_ENABLED inline T ibeta_fraction2(T a, T b, T x, T y, const Policy& pol, bool normalised, T* p_derivative)
 {
    typedef typename lanczos::lanczos<T, Policy>::type lanczos_type;
    BOOST_MATH_STD_USING
@@ -836,7 +853,7 @@ inline T ibeta_fraction2(T a, T b, T x, T y, const Policy& pol, bool normalised,
 // Computes the difference between ibeta(a,b,x) and ibeta(a+k,b,x):
 //
 template <class T, class Policy>
-T ibeta_a_step(T a, T b, T x, T y, int k, const Policy& pol, bool normalised, T* p_derivative)
+BOOST_MATH_GPU_ENABLED T ibeta_a_step(T a, T b, T x, T y, int k, const Policy& pol, bool normalised, T* p_derivative)
 {
    typedef typename lanczos::lanczos<T, Policy>::type lanczos_type;
 
@@ -863,6 +880,7 @@ T ibeta_a_step(T a, T b, T x, T y, int k, const Policy& pol, bool normalised, T*
 
    return prefix;
 }
+
 //
 // This function is only needed for the non-regular incomplete beta,
 // it computes the delta in:
@@ -870,7 +888,7 @@ T ibeta_a_step(T a, T b, T x, T y, int k, const Policy& pol, bool normalised, T*
 // it is currently only called for small k.
 //
 template <class T>
-inline T rising_factorial_ratio(T a, T b, int k)
+BOOST_MATH_GPU_ENABLED inline T rising_factorial_ratio(T a, T b, int k)
 {
    // calculate:
    // (a)(a+1)(a+2)...(a+k-1)
@@ -881,8 +899,8 @@ inline T rising_factorial_ratio(T a, T b, int k)
    // it is grossly inefficient, do not use outside it's
    // intended purpose!!!
    BOOST_MATH_INSTRUMENT_VARIABLE(k);
-   if(k == 0)
-      return 1;
+   BOOST_MATH_ASSERT(k > 0);
+
    T result = 1;
    for(int i = 0; i < k; ++i)
       result *= (a+i) / (b+i);
@@ -901,33 +919,43 @@ struct Pn_size
 {
    // This is likely to be enough for ~35-50 digit accuracy
    // but it's hard to quantify exactly:
+   #ifndef BOOST_MATH_HAS_NVRTC
    static constexpr unsigned value =
       ::boost::math::max_factorial<T>::value >= 100 ? 50
    : ::boost::math::max_factorial<T>::value >= ::boost::math::max_factorial<double>::value ? 30
    : ::boost::math::max_factorial<T>::value >= ::boost::math::max_factorial<float>::value ? 15 : 1;
    static_assert(::boost::math::max_factorial<T>::value >= ::boost::math::max_factorial<float>::value, "Type does not provide for 35-50 digits of accuracy.");
+   #else
+   static constexpr unsigned value = 0; // Will never be called
+   #endif
 };
 template <>
 struct Pn_size<float>
 {
    static constexpr unsigned value = 15; // ~8-15 digit accuracy
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
    static_assert(::boost::math::max_factorial<float>::value >= 30, "Type does not provide for 8-15 digits of accuracy.");
+#endif
 };
 template <>
 struct Pn_size<double>
 {
    static constexpr unsigned value = 30; // 16-20 digit accuracy
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
    static_assert(::boost::math::max_factorial<double>::value >= 60, "Type does not provide for 16-20 digits of accuracy.");
+#endif
 };
 template <>
 struct Pn_size<long double>
 {
    static constexpr unsigned value = 50; // ~35-50 digit accuracy
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
    static_assert(::boost::math::max_factorial<long double>::value >= 100, "Type does not provide for ~35-50 digits of accuracy");
+#endif
 };
 
 template <class T, class Policy>
-T beta_small_b_large_a_series(T a, T b, T x, T y, T s0, T mult, const Policy& pol, bool normalised)
+BOOST_MATH_GPU_ENABLED T beta_small_b_large_a_series(T a, T b, T x, T y, T s0, T mult, const Policy& pol, bool normalised)
 {
    typedef typename lanczos::lanczos<T, Policy>::type lanczos_type;
    BOOST_MATH_STD_USING
@@ -938,14 +966,14 @@ T beta_small_b_large_a_series(T a, T b, T x, T y, T s0, T mult, const Policy& po
    //
    T bm1 = b - 1;
    T t = a + bm1 / 2;
-   T lx, u;
+   T lx, u;  // LCOV_EXCL_LINE
    if(y < 0.35)
       lx = boost::math::log1p(-y, pol);
    else
       lx = log(x);
    u = -t * lx;
    // and from from 9.2:
-   T prefix;
+   T prefix;  // LCOV_EXCL_LINE
    T h = regularised_gamma_prefix(b, u, pol, lanczos_type());
    if(h <= tools::min_value<T>())
       return s0;
@@ -1020,16 +1048,10 @@ T beta_small_b_large_a_series(T a, T b, T x, T y, T s0, T mult, const Policy& po
       //
       T r = prefix * p[n] * j;
       sum += r;
-      if(r > 1)
-      {
-         if(fabs(r) < fabs(tools::epsilon<T>() * sum))
-            break;
-      }
-      else
-      {
-         if(fabs(r / tools::epsilon<T>()) < fabs(sum))
-            break;
-      }
+      // r is always small:
+      BOOST_MATH_ASSERT(tools::max_value<T>() * tools::epsilon<T>() > fabs(r));
+      if(fabs(r / tools::epsilon<T>()) < fabs(sum))
+         break;
    }
    return sum;
 } // template <class T, class Lanczos>T beta_small_b_large_a_series(T a, T b, T x, T y, T s0, T mult, const Lanczos& l, bool normalised)
@@ -1039,7 +1061,7 @@ T beta_small_b_large_a_series(T a, T b, T x, T y, T s0, T mult, const Policy& po
 // complement of the binomial distribution cdf and use this finite sum.
 //
 template <class T, class Policy>
-T binomial_ccdf(T n, T k, T x, T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T binomial_ccdf(T n, T k, T x, T y, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -1065,11 +1087,15 @@ T binomial_ccdf(T n, T k, T x, T y, const Policy& pol)
       if(result == 0)
       {
          // OK, starting slightly above the mode didn't work,
-         // we'll have to sum the terms the old fashioned way:
+         // we'll have to sum the terms the old fashioned way.
+         // Very hard to get here, possibly only when exponent
+         // range is very limited (as with type float):
+         // LCOV_EXCL_START
          for(unsigned i = start - 1; i > k; --i)
          {
             result += static_cast<T>(pow(x, static_cast<T>(i)) * pow(y, n - i) * boost::math::binomial_coefficient<T>(itrunc(n), itrunc(i), pol));
          }
+         // LCOV_EXCL_STOP
       }
       else
       {
@@ -1099,10 +1125,11 @@ T binomial_ccdf(T n, T k, T x, T y, const Policy& pol)
 // input range and select the right implementation method for
 // each domain:
 //
+
 template <class T, class Policy>
-T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_derivative)
+BOOST_MATH_GPU_ENABLED T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_derivative)
 {
-   static const char* function = "boost::math::ibeta<%1%>(%1%, %1%, %1%)";
+   constexpr auto function = "boost::math::ibeta<%1%>(%1%, %1%, %1%)";
    typedef typename lanczos::lanczos<T, Policy>::type lanczos_type;
    BOOST_MATH_STD_USING // for ADL of std math functions.
 
@@ -1177,7 +1204,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
       // We have an arcsine distribution:
       if(p_derivative)
       {
-         *p_derivative = 1 / constants::pi<T>() * sqrt(y * x);
+         *p_derivative = 1 / (constants::pi<T>() * sqrt(y * x));
       }
       T p = invert ? asin(sqrt(y)) / constants::half_pi<T>() : asin(sqrt(x)) / constants::half_pi<T>();
       if(!normalised)
@@ -1186,8 +1213,8 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
    }
    if(a == 1)
    {
-      std::swap(a, b);
-      std::swap(x, y);
+      BOOST_MATH_GPU_SAFE_SWAP(a, b);
+      BOOST_MATH_GPU_SAFE_SWAP(x, y);
       invert = !invert;
    }
    if(b == 1)
@@ -1206,7 +1233,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
       {
          *p_derivative = a * pow(x, a - 1);
       }
-      T p;
+      T p;  // LCOV_EXCL_LINE
       if(y < 0.5)
          p = invert ? T(-boost::math::expm1(a * boost::math::log1p(-y, pol), pol)) : T(exp(a * boost::math::log1p(-y, pol)));
       else
@@ -1216,19 +1243,19 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
       return p;
    }
 
-   if((std::min)(a, b) <= 1)
+   if(BOOST_MATH_GPU_SAFE_MIN(a, b) <= 1)
    {
       if(x > 0.5)
       {
-         std::swap(a, b);
-         std::swap(x, y);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(x, y);
          invert = !invert;
          BOOST_MATH_INSTRUMENT_VARIABLE(invert);
       }
-      if((std::max)(a, b) <= 1)
+      if(BOOST_MATH_GPU_SAFE_MAX(a, b) <= 1)
       {
          // Both a,b < 1:
-         if((a >= (std::min)(T(0.2), b)) || (pow(x, a) <= 0.9))
+         if((a >= BOOST_MATH_GPU_SAFE_MIN(T(0.2), b)) || (pow(x, a) <= 0.9))
          {
             if(!invert)
             {
@@ -1245,8 +1272,8 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
          }
          else
          {
-            std::swap(a, b);
-            std::swap(x, y);
+            BOOST_MATH_GPU_SAFE_SWAP(a, b);
+            BOOST_MATH_GPU_SAFE_SWAP(x, y);
             invert = !invert;
             if(y >= 0.3)
             {
@@ -1266,7 +1293,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
             else
             {
                // Sidestep on a, and then use the series representation:
-               T prefix;
+               T prefix;  // LCOV_EXCL_LINE
                if(!normalised)
                {
                   prefix = rising_factorial_ratio(T(a+b), a, 20);
@@ -1311,8 +1338,8 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
          }
          else
          {
-            std::swap(a, b);
-            std::swap(x, y);
+            BOOST_MATH_GPU_SAFE_SWAP(a, b);
+            BOOST_MATH_GPU_SAFE_SWAP(x, y);
             invert = !invert;
 
             if(y >= 0.3)
@@ -1348,7 +1375,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
             else
             {
                // Sidestep to improve errors:
-               T prefix;
+               T prefix;  // LCOV_EXCL_LINE
                if(!normalised)
                {
                   prefix = rising_factorial_ratio(T(a+b), a, 20);
@@ -1378,7 +1405,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
    else
    {
       // Both a,b >= 1:
-      T lambda;
+      T lambda;  // LCOV_EXCL_LINE
       if(a < b)
       {
          lambda = a - (a + b) * x;
@@ -1389,15 +1416,15 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
       }
       if(lambda < 0)
       {
-         std::swap(a, b);
-         std::swap(x, y);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(x, y);
          invert = !invert;
          BOOST_MATH_INSTRUMENT_VARIABLE(invert);
       }
 
       if(b < 40)
       {
-         if((floor(a) == a) && (floor(b) == b) && (a < static_cast<T>((std::numeric_limits<int>::max)() - 100)) && (y != 1))
+         if((floor(a) == a) && (floor(b) == b) && (a < static_cast<T>((boost::math::numeric_limits<int>::max)() - 100)) && (y != 1))
          {
             // relate to the binomial distribution and use a finite sum:
             T k = a - 1;
@@ -1429,7 +1456,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
             if(n == b)
                --n;
             T bbar = b - n;
-            T prefix;
+            T prefix; // LCOV_EXCL_LINE
             if(!normalised)
             {
                prefix = rising_factorial_ratio(T(a+bbar), bbar, n);
@@ -1492,7 +1519,7 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
          if((tools::max_value<T>() * div < *p_derivative))
          {
             // overflow, return an arbitrarily large value:
-            *p_derivative = tools::max_value<T>() / 2;
+            *p_derivative = tools::max_value<T>() / 2;   // LCOV_EXCL_LINE  Probably can only get here with denormalized x.
          }
          else
          {
@@ -1504,15 +1531,15 @@ T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised, T* p_de
 } // template <class T, class Lanczos>T ibeta_imp(T a, T b, T x, const Lanczos& l, bool inv, bool normalised)
 
 template <class T, class Policy>
-inline T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised)
+BOOST_MATH_GPU_ENABLED inline T ibeta_imp(T a, T b, T x, const Policy& pol, bool inv, bool normalised)
 {
    return ibeta_imp(a, b, x, pol, inv, normalised, static_cast<T*>(nullptr));
 }
 
 template <class T, class Policy>
-T ibeta_derivative_imp(T a, T b, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ibeta_derivative_imp(T a, T b, T x, const Policy& pol)
 {
-   static const char* function = "ibeta_derivative<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "ibeta_derivative<%1%>(%1%,%1%,%1%)";
    //
    // start with the usual error checks:
    //
@@ -1561,8 +1588,8 @@ T ibeta_derivative_imp(T a, T b, T x, const Policy& pol)
 // Some forwarding functions that disambiguate the third argument type:
 //
 template <class RT1, class RT2, class Policy>
-inline typename tools::promote_args<RT1, RT2>::type
-   beta(RT1 a, RT2 b, const Policy&, const std::true_type*)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2>::type
+   beta(RT1 a, RT2 b, const Policy&, const boost::math::true_type*)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<RT1, RT2>::type result_type;
@@ -1578,8 +1605,8 @@ inline typename tools::promote_args<RT1, RT2>::type
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::beta_imp(static_cast<value_type>(a), static_cast<value_type>(b), evaluation_type(), forwarding_policy()), "boost::math::beta<%1%>(%1%,%1%)");
 }
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
-   beta(RT1 a, RT2 b, RT3 x, const std::false_type*)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
+   beta(RT1 a, RT2 b, RT3 x, const boost::math::false_type*)
 {
    return boost::math::beta(a, b, x, policies::policy<>());
 }
@@ -1591,7 +1618,7 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
 // and forward to the implementation functions:
 //
 template <class RT1, class RT2, class A>
-inline typename tools::promote_args<RT1, RT2, A>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, A>::type
    beta(RT1 a, RT2 b, A arg)
 {
    using tag = typename policies::is_policy<A>::type;
@@ -1600,14 +1627,14 @@ inline typename tools::promote_args<RT1, RT2, A>::type
 }
 
 template <class RT1, class RT2>
-inline typename tools::promote_args<RT1, RT2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2>::type
    beta(RT1 a, RT2 b)
 {
    return boost::math::beta(a, b, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    beta(RT1 a, RT2 b, RT3 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -1624,7 +1651,7 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    betac(RT1 a, RT2 b, RT3 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -1640,14 +1667,14 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::ibeta_imp(static_cast<value_type>(a), static_cast<value_type>(b), static_cast<value_type>(x), forwarding_policy(), true, false), "boost::math::betac<%1%>(%1%,%1%,%1%)");
 }
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    betac(RT1 a, RT2 b, RT3 x)
 {
    return boost::math::betac(a, b, x, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibeta(RT1 a, RT2 b, RT3 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -1663,14 +1690,14 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::ibeta_imp(static_cast<value_type>(a), static_cast<value_type>(b), static_cast<value_type>(x), forwarding_policy(), false, true), "boost::math::ibeta<%1%>(%1%,%1%,%1%)");
 }
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibeta(RT1 a, RT2 b, RT3 x)
 {
    return boost::math::ibeta(a, b, x, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibetac(RT1 a, RT2 b, RT3 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -1686,14 +1713,14 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::ibeta_imp(static_cast<value_type>(a), static_cast<value_type>(b), static_cast<value_type>(x), forwarding_policy(), true, true), "boost::math::ibetac<%1%>(%1%,%1%,%1%)");
 }
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibetac(RT1 a, RT2 b, RT3 x)
 {
    return boost::math::ibetac(a, b, x, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibeta_derivative(RT1 a, RT2 b, RT3 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -1709,7 +1736,7 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::ibeta_derivative_imp(static_cast<value_type>(a), static_cast<value_type>(b), static_cast<value_type>(x), forwarding_policy()), "boost::math::ibeta_derivative<%1%>(%1%,%1%,%1%)");
 }
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibeta_derivative(RT1 a, RT2 b, RT3 x)
 {
    return boost::math::ibeta_derivative(a, b, x, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/binomial.hpp b/inst/include/boost/math/special_functions/binomial.hpp
index 20bcf3e8c..3c49ff30d 100644
--- a/inst/include/boost/math/special_functions/binomial.hpp
+++ b/inst/include/boost/math/special_functions/binomial.hpp
@@ -10,26 +10,24 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/factorials.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/policies/error_handling.hpp>
-#include <type_traits>
 
 namespace boost{ namespace math{
 
 template <class T, class Policy>
-T binomial_coefficient(unsigned n, unsigned k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T binomial_coefficient(unsigned n, unsigned k, const Policy& pol)
 {
-   static_assert(!std::is_integral<T>::value, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value, "Type T must not be an integral type");
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::binomial_coefficient<%1%>(unsigned, unsigned)";
+   constexpr auto function = "boost::math::binomial_coefficient<%1%>(unsigned, unsigned)";
    if(k > n)
-      return policies::raise_domain_error<T>(
-         function,
-         "The binomial coefficient is undefined for k > n, but got k = %1%.",
-         static_cast<T>(k), pol);
-   T result;
+      return policies::raise_domain_error<T>(function, "The binomial coefficient is undefined for k > n, but got k = %1%.", static_cast<T>(k), pol);
+   T result;  // LCOV_EXCL_LINE
    if((k == 0) || (k == n))
       return static_cast<T>(1);
    if((k == 1) || (k == n-1))
@@ -46,9 +44,9 @@ T binomial_coefficient(unsigned n, unsigned k, const Policy& pol)
    {
       // Use the beta function:
       if(k < n - k)
-         result = static_cast<T>(k * beta(static_cast<T>(k), static_cast<T>(n-k+1), pol));
+         result = static_cast<T>(k * boost::math::beta(static_cast<T>(k), static_cast<T>(n-k+1), pol));
       else
-         result = static_cast<T>((n - k) * beta(static_cast<T>(k+1), static_cast<T>(n-k), pol));
+         result = static_cast<T>((n - k) * boost::math::beta(static_cast<T>(k+1), static_cast<T>(n-k), pol));
       if(result == 0)
          return policies::raise_overflow_error<T>(function, nullptr, pol);
       result = 1 / result;
@@ -62,7 +60,7 @@ T binomial_coefficient(unsigned n, unsigned k, const Policy& pol)
 // we'll promote to double:
 //
 template <>
-inline float binomial_coefficient<float, policies::policy<> >(unsigned n, unsigned k, const policies::policy<>&)
+BOOST_MATH_GPU_ENABLED inline float binomial_coefficient<float, policies::policy<> >(unsigned n, unsigned k, const policies::policy<>&)
 {
    typedef policies::normalise<
        policies::policy<>,
@@ -74,7 +72,7 @@ inline float binomial_coefficient<float, policies::policy<> >(unsigned n, unsign
 }
 
 template <class T>
-inline T binomial_coefficient(unsigned n, unsigned k)
+BOOST_MATH_GPU_ENABLED inline T binomial_coefficient(unsigned n, unsigned k)
 {
    return binomial_coefficient<T>(n, k, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/cbrt.hpp b/inst/include/boost/math/special_functions/cbrt.hpp
index 77cd5f0ae..7fdf78d01 100644
--- a/inst/include/boost/math/special_functions/cbrt.hpp
+++ b/inst/include/boost/math/special_functions/cbrt.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,12 +11,16 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/tools/rational.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <type_traits>
-#include <cstdint>
 
 namespace boost{ namespace math{
 
@@ -38,7 +43,7 @@ struct largest_cbrt_int_type
 };
 
 template <typename T, typename Policy>
-T cbrt_imp(T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T cbrt_imp(T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    //
@@ -51,7 +56,7 @@ T cbrt_imp(T z, const Policy& pol)
    // Expected Error Term:                         -1.231e-006
    // Maximum Relative Change in Control Points:   5.982e-004
    //
-   static const T P[] = { 
+   BOOST_MATH_STATIC const T P[] = { 
       static_cast<T>(0.37568269008611818),
       static_cast<T>(1.3304968705558024),
       static_cast<T>(-1.4897101632445036),
@@ -59,7 +64,7 @@ T cbrt_imp(T z, const Policy& pol)
       static_cast<T>(-0.6398703759826468),
       static_cast<T>(0.13584489959258635),
    };
-   static const T correction[] = {
+   BOOST_MATH_STATIC const T correction[] = {
       static_cast<T>(0.62996052494743658238360530363911),  // 2^-2/3
       static_cast<T>(0.79370052598409973737585281963615),  // 2^-1/3
       static_cast<T>(1),
@@ -154,7 +159,7 @@ T cbrt_imp(T z, const Policy& pol)
 } // namespace detail
 
 template <typename T, typename Policy>
-inline typename tools::promote_args<T>::type cbrt(T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type cbrt(T z, const Policy& pol)
 {
    using result_type = typename tools::promote_args<T>::type;
    using value_type = typename policies::evaluation<result_type, Policy>::type;
@@ -162,7 +167,7 @@ inline typename tools::promote_args<T>::type cbrt(T z, const Policy& pol)
 }
 
 template <typename T>
-inline typename tools::promote_args<T>::type cbrt(T z)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type cbrt(T z)
 {
    return cbrt(z, policies::policy<>());
 }
@@ -170,6 +175,39 @@ inline typename tools::promote_args<T>::type cbrt(T z)
 } // namespace math
 } // namespace boost
 
+#else // Special NVRTC handling
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED double cbrt(T x)
+{
+   return ::cbrt(x);
+}
+
+BOOST_MATH_GPU_ENABLED inline float cbrt(float x)
+{
+   return ::cbrtf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED double cbrt(T x, const Policy&)
+{
+   return ::cbrt(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED float cbrt(float x, const Policy&)
+{
+   return ::cbrtf(x);
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // NVRTC
+
 #endif // BOOST_MATH_SF_CBRT_HPP
 
 
diff --git a/inst/include/boost/math/special_functions/chebyshev.hpp b/inst/include/boost/math/special_functions/chebyshev.hpp
index 2c6695446..df8570821 100644
--- a/inst/include/boost/math/special_functions/chebyshev.hpp
+++ b/inst/include/boost/math/special_functions/chebyshev.hpp
@@ -72,7 +72,7 @@ inline Real chebyshev_imp(unsigned n, Real const & x, const Policy&)
     Real T0 = 1;
     Real T1;
 
-    BOOST_IF_CONSTEXPR (second)
+    BOOST_MATH_IF_CONSTEXPR (second)
     {
         if (x > 1 || x < -1)
         {
diff --git a/inst/include/boost/math/special_functions/cos_pi.hpp b/inst/include/boost/math/special_functions/cos_pi.hpp
index e09700ec5..7c33614de 100644
--- a/inst/include/boost/math/special_functions/cos_pi.hpp
+++ b/inst/include/boost/math/special_functions/cos_pi.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2007 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,10 +11,14 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <cmath>
 #include <limits>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/tools/promotion.hpp>
 #include <boost/math/constants/constants.hpp>
@@ -21,7 +26,7 @@
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Policy>
-T cos_pi_imp(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED T cos_pi_imp(T x, const Policy&)
 {
    BOOST_MATH_STD_USING // ADL of std names
    // cos of pi*x:
@@ -34,7 +39,7 @@ T cos_pi_imp(T x, const Policy&)
       x = -x;
    }
    T rem = floor(x);
-   if(abs(floor(rem/2)*2 - rem) > std::numeric_limits<T>::epsilon())
+   if(abs(floor(rem/2)*2 - rem) > boost::math::numeric_limits<T>::epsilon())
    {
       invert = !invert;
    }
@@ -60,7 +65,7 @@ T cos_pi_imp(T x, const Policy&)
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type cos_pi(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type cos_pi(T x, const Policy&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -77,12 +82,47 @@ inline typename tools::promote_args<T>::type cos_pi(T x, const Policy&)
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type cos_pi(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type cos_pi(T x)
 {
    return boost::math::cos_pi(x, policies::policy<>());
 }
 
 } // namespace math
 } // namespace boost
+
+#else // Special handling for NVRTC
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto cos_pi(T x)
+{
+   return ::cospi(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto cos_pi(float x)
+{
+   return ::cospif(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto cos_pi(T x, const Policy&)
+{
+   return ::cospi(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto cos_pi(float x, const Policy&)
+{
+   return ::cospif(x);
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif
 
diff --git a/inst/include/boost/math/special_functions/daubechies_scaling.hpp b/inst/include/boost/math/special_functions/daubechies_scaling.hpp
index 40de7b5ac..fe9d7b16d 100644
--- a/inst/include/boost/math/special_functions/daubechies_scaling.hpp
+++ b/inst/include/boost/math/special_functions/daubechies_scaling.hpp
@@ -26,7 +26,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #  include <boost/config.hpp>
-#  ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#  ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #    error "The header <boost/special_functions/daubechies_scaling.hpp> can only be used in C++17 and later."
 #  endif
 #endif
@@ -48,7 +48,7 @@ std::vector<Real> daubechies_scaling_dyadic_grid(int64_t j_max)
     auto phik = detail::daubechies_scaling_integer_grid<Real, p, order>();
 
     // Maximum sensible j for 32 bit floats is j_max = 22:
-    if (std::is_same_v<Real, float>)
+    if constexpr (std::is_same_v<Real, float>)
     {
         if (j_max > 23)
         {
@@ -357,27 +357,27 @@ class daubechies_scaling {
         else {
             if (grid_refinements < 0)
             {
-                if (std::is_same_v<Real, float>)
+                if constexpr (std::is_same_v<Real, float>)
                 {
                 if (grid_refinements == -2)
                 {
                     // Control absolute error:
                     //                          p= 2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-                    std::array<int, 20> r{ -1, -1, 18, 19, 16, 11,  8,  7,  7,  7,  5,  5,  4,  4,  4,  4,  3,  3,  3,  3 };
+                    constexpr std::array<int, 20> r{ -1, -1, 18, 19, 16, 11,  8,  7,  7,  7,  5,  5,  4,  4,  4,  4,  3,  3,  3,  3 };
                     grid_refinements = r[p];
                 }
                 else
                 {
                     // Control relative error:
                     //                          p= 2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-                    std::array<int, 20> r{ -1, -1, 21, 21, 21, 17, 16, 15, 14, 13, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11 };
+                    constexpr std::array<int, 20> r{ -1, -1, 21, 21, 21, 17, 16, 15, 14, 13, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11 };
                     grid_refinements = r[p];
                 }
                 }
-                else if (std::is_same_v<Real, double>)
+                else if constexpr (std::is_same_v<Real, double>)
                 {
                     //                          p= 2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-                    std::array<int, 20> r{ -1, -1, 21, 21, 21, 21, 21, 21, 21, 21, 20, 20, 19, 19, 18, 18, 18, 18, 18, 18 };
+                    constexpr std::array<int, 20> r{ -1, -1, 21, 21, 21, 21, 21, 21, 21, 21, 20, 20, 19, 19, 18, 18, 18, 18, 18, 18 };
                     grid_refinements = r[p];
                 }
                 else
diff --git a/inst/include/boost/math/special_functions/daubechies_wavelet.hpp b/inst/include/boost/math/special_functions/daubechies_wavelet.hpp
index d12a6df6b..d374c8487 100644
--- a/inst/include/boost/math/special_functions/daubechies_wavelet.hpp
+++ b/inst/include/boost/math/special_functions/daubechies_wavelet.hpp
@@ -24,7 +24,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp b/inst/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
index 7735eb858..e518422f1 100644
--- a/inst/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
+++ b/inst/include/boost/math/special_functions/detail/airy_ai_bi_zero.hpp
@@ -13,6 +13,8 @@
 #ifndef BOOST_MATH_AIRY_AI_BI_ZERO_2013_01_20_HPP_
   #define BOOST_MATH_AIRY_AI_BI_ZERO_2013_01_20_HPP_
 
+  #include <boost/math/tools/config.hpp>
+  #include <boost/math/tools/tuple.hpp>
   #include <boost/math/constants/constants.hpp>
   #include <boost/math/special_functions/cbrt.hpp>
 
@@ -21,18 +23,18 @@
   {
     // Forward declarations of the needed Airy function implementations.
     template <class T, class Policy>
-    T airy_ai_imp(T x, const Policy& pol);
+    BOOST_MATH_GPU_ENABLED T airy_ai_imp(T x, const Policy& pol);
     template <class T, class Policy>
-    T airy_bi_imp(T x, const Policy& pol);
+    BOOST_MATH_GPU_ENABLED T airy_bi_imp(T x, const Policy& pol);
     template <class T, class Policy>
-    T airy_ai_prime_imp(T x, const Policy& pol);
+    BOOST_MATH_GPU_ENABLED T airy_ai_prime_imp(T x, const Policy& pol);
     template <class T, class Policy>
-    T airy_bi_prime_imp(T x, const Policy& pol);
+    BOOST_MATH_GPU_ENABLED T airy_bi_prime_imp(T x, const Policy& pol);
 
     namespace airy_zero
     {
       template<class T, class Policy>
-      T equation_as_10_4_105(const T& z, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED T equation_as_10_4_105(const T& z, const Policy& pol)
       {
         const T one_over_z        (T(1) / z);
         const T one_over_z_squared(one_over_z * one_over_z);
@@ -54,7 +56,7 @@
       namespace airy_ai_zero_detail
       {
         template<class T, class Policy>
-        T initial_guess(const int m, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED T initial_guess(const int m, const Policy& pol)
         {
           T guess;
 
@@ -106,11 +108,19 @@
         class function_object_ai_and_ai_prime
         {
         public:
-          explicit function_object_ai_and_ai_prime(const Policy& pol) : my_pol(pol) { }
+          BOOST_MATH_GPU_ENABLED explicit function_object_ai_and_ai_prime(const Policy& pol) : my_pol(pol) { }
 
-          function_object_ai_and_ai_prime(const function_object_ai_and_ai_prime&) = default;
+          #ifdef BOOST_MATH_ENABLE_CUDA
+          #  pragma nv_diag_suppress 20012
+          #endif
 
-          boost::math::tuple<T, T> operator()(const T& x) const
+          BOOST_MATH_GPU_ENABLED function_object_ai_and_ai_prime(const function_object_ai_and_ai_prime&) = default;
+
+          #ifdef BOOST_MATH_ENABLE_CUDA
+          #  pragma nv_diag_default 20012
+          #endif
+
+          BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T> operator()(const T& x) const
           {
             // Return a tuple containing both Ai(x) and Ai'(x).
             return boost::math::make_tuple(
@@ -127,7 +137,7 @@
       namespace airy_bi_zero_detail
       {
         template<class T, class Policy>
-        T initial_guess(const int m, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED T initial_guess(const int m, const Policy& pol)
         {
           T guess;
 
@@ -179,11 +189,19 @@
         class function_object_bi_and_bi_prime
         {
         public:
-          explicit function_object_bi_and_bi_prime(const Policy& pol) : my_pol(pol) { }
-
-          function_object_bi_and_bi_prime(const function_object_bi_and_bi_prime&) = default;
-
-          boost::math::tuple<T, T> operator()(const T& x) const
+          BOOST_MATH_GPU_ENABLED explicit function_object_bi_and_bi_prime(const Policy& pol) : my_pol(pol) { }
+
+          #ifdef BOOST_MATH_ENABLE_CUDA
+          #  pragma nv_diag_suppress 20012
+          #endif
+          
+          BOOST_MATH_GPU_ENABLED function_object_bi_and_bi_prime(const function_object_bi_and_bi_prime&) = default;
+          
+          #ifdef BOOST_MATH_ENABLE_CUDA
+          #  pragma nv_diag_default 20012
+          #endif
+
+          BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T> operator()(const T& x) const
           {
             // Return a tuple containing both Bi(x) and Bi'(x).
             return boost::math::make_tuple(
diff --git a/inst/include/boost/math/special_functions/detail/bernoulli_details.hpp b/inst/include/boost/math/special_functions/detail/bernoulli_details.hpp
index c1754db11..419ddddbb 100644
--- a/inst/include/boost/math/special_functions/detail/bernoulli_details.hpp
+++ b/inst/include/boost/math/special_functions/detail/bernoulli_details.hpp
@@ -16,7 +16,7 @@
 #include <vector>
 #include <type_traits>
 
-#if defined(BOOST_HAS_THREADS) && !defined(BOOST_NO_CXX11_HDR_MUTEX) && !defined(BOOST_MATH_NO_ATOMIC_INT)
+#if defined(BOOST_MATH_HAS_THREADS) && !defined(BOOST_NO_CXX11_HDR_MUTEX) && !defined(BOOST_MATH_NO_ATOMIC_INT)
 #include <mutex>
 #else
 #  define BOOST_MATH_BERNOULLI_NOTHREADS
@@ -196,7 +196,7 @@ struct fixed_vector : private std::allocator<T>
    {
       if(n > m_capacity)
       {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          BOOST_MATH_THROW_EXCEPTION(std::runtime_error("Exhausted storage for Bernoulli numbers."));
 #else
          return false;
@@ -351,7 +351,7 @@ class bernoulli_numbers_cache
       //
       // There are basically 3 thread safety options:
       //
-      // 1) There are no threads (BOOST_HAS_THREADS is not defined).
+      // 1) There are no threads (BOOST_MATH_HAS_THREADS is not defined).
       // 2) There are threads, but we do not have a true atomic integer type,
       //    in this case we just use a mutex to guard against race conditions.
       // 3) There are threads, and we have an atomic integer: in this case we can
@@ -384,7 +384,7 @@ class bernoulli_numbers_cache
          return out;
       }
 
-      #if defined(BOOST_HAS_THREADS) && defined(BOOST_MATH_BERNOULLI_NOTHREADS) && !defined(BOOST_MATH_BERNOULLI_UNTHREADED)
+      #if defined(BOOST_MATH_HAS_THREADS) && defined(BOOST_MATH_BERNOULLI_NOTHREADS) && !defined(BOOST_MATH_BERNOULLI_UNTHREADED)
       // Add a static_assert on instantiation if we have threads, but no C++11 threading support.
       static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have either no atomic integers, or no std::mutex.  If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error.");
       #elif defined(BOOST_MATH_BERNOULLI_NOTHREADS)
@@ -451,7 +451,7 @@ class bernoulli_numbers_cache
          ++out;
       }
 
-      #endif // BOOST_HAS_THREADS
+      #endif // BOOST_MATH_HAS_THREADS
       return out;
    }
 
@@ -461,7 +461,7 @@ class bernoulli_numbers_cache
       //
       // There are basically 3 thread safety options:
       //
-      // 1) There are no threads (BOOST_HAS_THREADS is not defined).
+      // 1) There are no threads (BOOST_MATH_HAS_THREADS is not defined).
       // 2) There are threads, but we do not have a true atomic integer type,
       //    in this case we just use a mutex to guard against race conditions.
       // 3) There are threads, and we have an atomic integer: in this case we can
@@ -575,7 +575,7 @@ class bernoulli_numbers_cache
          ++out;
       }
 
-      #endif // BOOST_HAS_THREADS
+      #endif // BOOST_MATH_HAS_THREADS
       return out;
    }
 
@@ -596,7 +596,7 @@ class bernoulli_numbers_cache
    #else
    int m_counter;
    int m_current_precision;
-   #endif // BOOST_HAS_THREADS
+   #endif // BOOST_MATH_HAS_THREADS
 };
 
 template <class T, class Policy>
diff --git a/inst/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp b/inst/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp
index 72fddc61c..ca62f38a5 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_derivatives_linear.hpp
@@ -9,7 +9,7 @@
 // Linear combination for bessel derivatives are defined here
 #ifndef BOOST_MATH_SF_DETAIL_BESSEL_DERIVATIVES_LINEAR_HPP
 #define BOOST_MATH_SF_DETAIL_BESSEL_DERIVATIVES_LINEAR_HPP
-
+#include <iostream>
 #ifdef _MSC_VER
 #pragma once
 #endif
@@ -40,10 +40,11 @@ inline T bessel_i_derivative_linear(T v, T x, Policy pol)
    T result = boost::math::detail::cyl_bessel_i_imp<T>(v - 1, x, pol);
    if(result >= tools::max_value<T>())
       return result;  // result is infinite
+   // Both experimentally, and based on https://www.wolframalpha.com/input?i=BesselI%5Bv%2C+x%5D%2FBesselI%5Bv%2B2%2C+x%5D
+   // I[v + 1, x] < I[v-1, x], so this can't overflow:
    T result2 = boost::math::detail::cyl_bessel_i_imp<T>(v + 1, x, pol);
-   if(result2 >= tools::max_value<T>() - result)
-      return result2;  // result is infinite
-   return (result + result2) / 2;
+
+   return result / 2 + result2 / 2;
 }
 
 template <class T, class Tag, class Policy>
@@ -53,15 +54,34 @@ inline T bessel_k_derivative_linear(T v, T x, Tag tag, Policy pol)
    if(result >= tools::max_value<T>())
       return -result;  // result is infinite
    T result2 = boost::math::detail::cyl_bessel_k_imp<T>(v + 1, x, tag, pol);
-   if(result2 >= tools::max_value<T>() - result)
-      return -result2;  // result is infinite
-   return (result + result2) / -2;
+   if(result2 >= tools::max_value<T>() + result)
+      return -boost::math::policies::raise_overflow_error<T>("cyl_bessel_k_prime<%1>", 0, pol);  // result is infinite
+   result /= -2;
+   result2 /= -2;
+   return result + result2;
 }
 
 template <class T, class Policy>
 inline T bessel_k_derivative_linear(T v, T x, const bessel_int_tag& tag, Policy pol)
 {
-   return (boost::math::detail::cyl_bessel_k_imp<T>(itrunc(v-1), x, tag, pol) + boost::math::detail::cyl_bessel_k_imp<T>(itrunc(v+1), x, tag, pol)) / -2;
+   T result = boost::math::detail::cyl_bessel_k_imp<T>(itrunc(v - 1), x, tag, pol);
+   if (result >= tools::max_value<T>())
+      return -result;  // result is infinite
+   T result2 = boost::math::detail::cyl_bessel_k_imp<T>(itrunc(v + 1), x, tag, pol);
+   if (result2 >= tools::max_value<T>() + result)
+      return -boost::math::policies::raise_overflow_error<T>("cyl_bessel_k_prime<%1>", 0, pol);  // result is infinite
+   result /= -2;
+   result2 /= -2;
+   return result + result2;
+}
+
+template <class T, class Policy>
+inline T bessel_k_derivative_linear(T v, T x, const bessel_maybe_int_tag&, Policy pol)
+{
+   using std::floor;
+   if (floor(v) == v)
+      return bessel_k_derivative_linear(v, x, bessel_int_tag(), pol);
+   return bessel_k_derivative_linear(v, x, bessel_no_int_tag(), pol);
 }
 
 template <class T, class Tag, class Policy>
diff --git a/inst/include/boost/math/special_functions/detail/bessel_i0.hpp b/inst/include/boost/math/special_functions/detail/bessel_i0.hpp
index 4d36110da..f2219cc94 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_i0.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_i0.hpp
@@ -1,5 +1,6 @@
 //  Copyright (c) 2006 Xiaogang Zhang
 //  Copyright (c) 2017 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,6 +15,9 @@
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/precision.hpp>
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -35,63 +39,24 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T>
-T bessel_i0(const T& x);
-
-template <class T, class tag>
-struct bessel_i0_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init(tag());
-      }
-      static void do_init(const std::integral_constant<int, 64>&)
-      {
-         bessel_i0(T(1));
-         bessel_i0(T(8));
-         bessel_i0(T(12));
-         bessel_i0(T(40));
-         bessel_i0(T(101));
-      }
-      static void do_init(const std::integral_constant<int, 113>&)
-      {
-         bessel_i0(T(1));
-         bessel_i0(T(10));
-         bessel_i0(T(20));
-         bessel_i0(T(40));
-         bessel_i0(T(101));
-      }
-      template <class U>
-      static void do_init(const U&) {}
-      void force_instantiate()const {}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T, class tag>
-const typename bessel_i0_initializer<T, tag>::init bessel_i0_initializer<T, tag>::initializer;
+BOOST_MATH_GPU_ENABLED T bessel_i0(const T& x);
 
 template <typename T, int N>
-T bessel_i0_imp(const T&, const std::integral_constant<int, N>&)
+BOOST_MATH_GPU_ENABLED T bessel_i0_imp(const T&, const boost::math::integral_constant<int, N>&)
 {
    BOOST_MATH_ASSERT(0);
    return 0;
 }
 
 template <typename T>
-T bessel_i0_imp(const T& x, const std::integral_constant<int, 24>&)
+BOOST_MATH_GPU_ENABLED T bessel_i0_imp(const T& x, const boost::math::integral_constant<int, 24>&)
 {
    BOOST_MATH_STD_USING
    if(x < 7.75)
    {
       // Max error in interpolated form: 3.929e-08
       // Max Error found at float precision = Poly: 1.991226e-07
-      static const float P[] = {
+      BOOST_MATH_STATIC const float P[] = {
          1.00000003928615375e+00f,
          2.49999576572179639e-01f,
          2.77785268558399407e-02f,
@@ -109,7 +74,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 24>&)
    {
       // Max error in interpolated form: 5.195e-08
       // Max Error found at float precision = Poly: 8.502534e-08
-      static const float P[] = {
+      BOOST_MATH_STATIC const float P[] = {
          3.98942651588301770e-01f,
          4.98327234176892844e-02f,
          2.91866904423115499e-02f,
@@ -122,7 +87,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 24>&)
    {
       // Max error in interpolated form: 1.782e-09
       // Max Error found at float precision = Poly: 6.473568e-08
-      static const float P[] = {
+      BOOST_MATH_STATIC const float P[] = {
          3.98942391532752700e-01f,
          4.98455950638200020e-02f,
          2.94835666900682535e-02f
@@ -135,7 +100,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 24>&)
 }
 
 template <typename T>
-T bessel_i0_imp(const T& x, const std::integral_constant<int, 53>&)
+BOOST_MATH_GPU_ENABLED T bessel_i0_imp(const T& x, const boost::math::integral_constant<int, 53>&)
 {
    BOOST_MATH_STD_USING
    if(x < 7.75)
@@ -143,7 +108,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 53>&)
       // Bessel I0 over[10 ^ -16, 7.75]
       // Max error in interpolated form : 3.042e-18
       // Max Error found at double precision = Poly : 5.106609e-16 Cheb : 5.239199e-16
-      static const double P[] = {
+      BOOST_MATH_STATIC const double P[] = {
          1.00000000000000000e+00,
          2.49999999999999909e-01,
          2.77777777777782257e-02,
@@ -167,7 +132,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 53>&)
    {
       // Max error in interpolated form : 1.685e-16
       // Max Error found at double precision = Poly : 2.575063e-16 Cheb : 2.247615e+00
-      static const double P[] = {
+      BOOST_MATH_STATIC const double P[] = {
          3.98942280401425088e-01,
          4.98677850604961985e-02,
          2.80506233928312623e-02,
@@ -197,7 +162,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 53>&)
    {
       // Max error in interpolated form : 2.437e-18
       // Max Error found at double precision = Poly : 1.216719e-16
-      static const double P[] = {
+      BOOST_MATH_STATIC const double P[] = {
          3.98942280401432905e-01,
          4.98677850491434560e-02,
          2.80506308916506102e-02,
@@ -212,7 +177,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 53>&)
 }
 
 template <typename T>
-T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
+BOOST_MATH_GPU_ENABLED T bessel_i0_imp(const T& x, const boost::math::integral_constant<int, 64>&)
 {
    BOOST_MATH_STD_USING
    if(x < 7.75)
@@ -220,7 +185,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
       // Bessel I0 over[10 ^ -16, 7.75]
       // Max error in interpolated form : 3.899e-20
       // Max Error found at float80 precision = Poly : 1.770840e-19
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, 9.99999999999999999961011629e-01),
          BOOST_MATH_BIG_CONSTANT(T, 64, 2.50000000000000001321873912e-01),
          BOOST_MATH_BIG_CONSTANT(T, 64, 2.77777777777777703400424216e-02),
@@ -238,6 +204,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
          BOOST_MATH_BIG_CONSTANT(T, 64, 5.15976668870980234582896010e-25),
          BOOST_MATH_BIG_CONSTANT(T, 64, 3.46240478946376069211156548e-27)
       };
+      // LCOV_EXCL_STOP
       T a = x * x / 4;
       return a * boost::math::tools::evaluate_polynomial(P, a) + 1;
    }
@@ -247,8 +214,9 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
       // Expected Error Term : -6.903e-21
       // Maximum Relative Change in Control Points : 1.631e-04
       // Max Error found at float80 precision = Poly : 7.811948e-21
-      static const T Y = 4.051098823547363281250e-01f;
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T Y = 4.051098823547363281250e-01f;
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, -6.158081780620616479492e-03),
          BOOST_MATH_BIG_CONSTANT(T, 64, 4.883635969834048766148e-02),
          BOOST_MATH_BIG_CONSTANT(T, 64, 7.892782002476195771920e-02),
@@ -263,6 +231,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
          BOOST_MATH_BIG_CONSTANT(T, 64, -1.601530760654337045917e+06),
          BOOST_MATH_BIG_CONSTANT(T, 64, 9.504921137873298402679e+05)
       };
+      // LCOV_EXCL_STOP
       return exp(x) * (boost::math::tools::evaluate_polynomial(P, T(1 / x)) + Y) / sqrt(x);
    }
    else if(x < 15)
@@ -271,8 +240,9 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
       // Expected Error Term : -4.025e-21
       // Maximum Relative Change in Control Points : 1.304e-03
       // Max Error found at float80 precision = Poly : 2.303527e-20
-      static const T Y = 4.033188819885253906250e-01f;
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T Y = 4.033188819885253906250e-01f;
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, -4.376373876116109401062e-03),
          BOOST_MATH_BIG_CONSTANT(T, 64, 4.982899138682911273321e-02),
          BOOST_MATH_BIG_CONSTANT(T, 64, 3.109477529533515397644e-02),
@@ -288,14 +258,16 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
          BOOST_MATH_BIG_CONSTANT(T, 64, 5.227776578828667629347e+07),
          BOOST_MATH_BIG_CONSTANT(T, 64, -4.727797957441040896878e+07)
       };
+      // LCOV_EXCL_STOP
       return exp(x) * (boost::math::tools::evaluate_polynomial(P, T(1 / x)) + Y) / sqrt(x);
    }
    else if(x < 50)
    {
       // Max error in interpolated form: 1.035e-21
       // Max Error found at float80 precision = Poly: 1.885872e-21
-      static const T Y = 4.011702537536621093750e-01f;
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T Y = 4.011702537536621093750e-01f;
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, -2.227973351806078464328e-03),
          BOOST_MATH_BIG_CONSTANT(T, 64, 4.986778486088017419036e-02),
          BOOST_MATH_BIG_CONSTANT(T, 64, 2.805066823812285310011e-02),
@@ -314,6 +286,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
          BOOST_MATH_BIG_CONSTANT(T, 64, -4.441995678177349895640e+09),
          BOOST_MATH_BIG_CONSTANT(T, 64, 4.482292669974971387738e+09)
       };
+      // LCOV_EXCL_STOP
       return exp(x) * (boost::math::tools::evaluate_polynomial(P, T(1 / x)) + Y) / sqrt(x);
    }
    else
@@ -321,7 +294,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
       // Bessel I0 over[50, INF]
       // Max error in interpolated form : 5.587e-20
       // Max Error found at float80 precision = Poly : 8.776852e-20
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, 3.98942280401432677955074061e-01),
          BOOST_MATH_BIG_CONSTANT(T, 64, 4.98677850501789875615574058e-02),
          BOOST_MATH_BIG_CONSTANT(T, 64, 2.80506290908675604202206833e-02),
@@ -341,6 +315,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
          BOOST_MATH_BIG_CONSTANT(T, 64, 3.27310000726207055200805893e+10),
          BOOST_MATH_BIG_CONSTANT(T, 64, -6.64365417189215599168817064e+10)
       };
+      // LCOV_EXCL_STOP
       T ex = exp(x / 2);
       T result = ex * boost::math::tools::evaluate_polynomial(P, T(1 / x)) / sqrt(x);
       result *= ex;
@@ -349,7 +324,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 64>&)
 }
 
 template <typename T>
-T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
+BOOST_MATH_GPU_ENABLED T bessel_i0_imp(const T& x, const boost::math::integral_constant<int, 113>&)
 {
    BOOST_MATH_STD_USING
    if(x < 7.75)
@@ -357,7 +332,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
       // Bessel I0 over[10 ^ -34, 7.75]
       // Max error in interpolated form : 1.274e-34
       // Max Error found at float128 precision = Poly : 3.096091e-34
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 1.0000000000000000000000000000000001273856e+00),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.4999999999999999999999999999999107477496e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.7777777777777777777777777777881795230918e-02),
@@ -382,6 +358,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
          BOOST_MATH_BIG_CONSTANT(T, 113, 7.4684706070226893763741850944911705726436e-43),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.0210715309399646335858150349406935414314e-45)
       };
+      // LCOV_EXCL_STOP
       T a = x * x / 4;
       return a * boost::math::tools::evaluate_polynomial(P, a) + 1;
    }
@@ -390,7 +367,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
       // Bessel I0 over[7.75, 15]
       // Max error in interpolated form : 7.534e-35
       // Max Error found at float128 precision = Poly : 6.123912e-34
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 9.9999999999999999992388573069504617493518e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.5000000000000000007304739268173096975340e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.7777777777777777744261405400543564492074e-02),
@@ -420,6 +398,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
          -BOOST_MATH_BIG_CONSTANT(T, 113, 5.1255595184052024349371058585102280860878e-57),
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.4652470895944157957727948355523715335882e-59)
       };
+      // LCOV_EXCL_STOP
       T a = x * x / 4;
       return a * boost::math::tools::evaluate_polynomial(P, a) + 1;
    }
@@ -427,7 +406,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
    {
       // Max error in interpolated form : 1.808e-34
       // Max Error found at float128 precision = Poly : 2.399403e-34
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.9894228040870793650581242239624530714032e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, 4.9867780576714783790784348982178607842250e-02),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.8051948347934462928487999569249907599510e-02),
@@ -458,7 +438,9 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
          BOOST_MATH_BIG_CONSTANT(T, 113, 1.2368879358870281916900125550129211146626e+28),
          BOOST_MATH_BIG_CONSTANT(T, 113, -2.8296235063297831758204519071113999839858e+28),
          BOOST_MATH_BIG_CONSTANT(T, 113, 4.1253861666023020670144616019148954773662e+28),
-         BOOST_MATH_BIG_CONSTANT(T, 113, -2.8809536950051955163648980306847791014734e+28) };
+         BOOST_MATH_BIG_CONSTANT(T, 113, -2.8809536950051955163648980306847791014734e+28) 
+      };
+      // LCOV_EXCL_STOP
       return exp(x) * boost::math::tools::evaluate_polynomial(P, T(1 / x)) / sqrt(x);
    }
    else if(x < 100)
@@ -466,7 +448,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
       // Bessel I0 over[30, 100]
       // Max error in interpolated form : 1.487e-34
       // Max Error found at float128 precision = Poly : 1.929924e-34
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.9894228040143267793996798658172135362278e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, 4.9867785050179084714910130342157246539820e-02),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.8050629090725751585266360464766768437048e-02),
@@ -492,6 +475,7 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
          BOOST_MATH_BIG_CONSTANT(T, 113, -2.0375525734060401555856465179734887312420e+16),
          BOOST_MATH_BIG_CONSTANT(T, 113, 5.6392664899881014534361728644608549445131e+16)
       };
+      // LCOV_EXCL_STOP
       return exp(x) * boost::math::tools::evaluate_polynomial(P, T(1 / x)) / sqrt(x);
    }
    else
@@ -499,7 +483,8 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
       // Bessel I0 over[100, INF]
       // Max error in interpolated form : 5.459e-35
       // Max Error found at float128 precision = Poly : 1.472240e-34
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.9894228040143267793994605993438166526772e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, 4.9867785050179084742493257495245185241487e-02),
          BOOST_MATH_BIG_CONSTANT(T, 113, 2.8050629090725735167652437695397756897920e-02),
@@ -515,7 +500,9 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
          BOOST_MATH_BIG_CONSTANT(T, 113, 1.2076909538525038580501368530598517194748e+03),
          BOOST_MATH_BIG_CONSTANT(T, 113, 7.5684635141332367730007149159063086133399e+03),
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.5178192543258299267923025833141286569141e+04),
-         BOOST_MATH_BIG_CONSTANT(T, 113, 6.2966297919851965784482163987240461837728e+05) };
+         BOOST_MATH_BIG_CONSTANT(T, 113, 6.2966297919851965784482163987240461837728e+05) 
+      };
+      // LCOV_EXCL_STOP
       T ex = exp(x / 2);
       T result = ex * boost::math::tools::evaluate_polynomial(P, T(1 / x)) / sqrt(x);
       result *= ex;
@@ -524,37 +511,36 @@ T bessel_i0_imp(const T& x, const std::integral_constant<int, 113>&)
 }
 
 template <typename T>
-T bessel_i0_imp(const T& x, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED T bessel_i0_imp(const T& x, const boost::math::integral_constant<int, 0>&)
 {
    if(boost::math::tools::digits<T>() <= 24)
-      return bessel_i0_imp(x, std::integral_constant<int, 24>());
+      return bessel_i0_imp(x, boost::math::integral_constant<int, 24>());
    else if(boost::math::tools::digits<T>() <= 53)
-      return bessel_i0_imp(x, std::integral_constant<int, 53>());
+      return bessel_i0_imp(x, boost::math::integral_constant<int, 53>());
    else if(boost::math::tools::digits<T>() <= 64)
-      return bessel_i0_imp(x, std::integral_constant<int, 64>());
+      return bessel_i0_imp(x, boost::math::integral_constant<int, 64>());
    else if(boost::math::tools::digits<T>() <= 113)
-      return bessel_i0_imp(x, std::integral_constant<int, 113>());
+      return bessel_i0_imp(x, boost::math::integral_constant<int, 113>());
    BOOST_MATH_ASSERT(0);
    return 0;
 }
 
 template <typename T>
-inline T bessel_i0(const T& x)
+BOOST_MATH_GPU_ENABLED inline T bessel_i0(const T& x)
 {
-   typedef std::integral_constant<int,
-      ((std::numeric_limits<T>::digits == 0) || (std::numeric_limits<T>::radix != 2)) ?
+   typedef boost::math::integral_constant<int,
+      ((boost::math::numeric_limits<T>::digits == 0) || (boost::math::numeric_limits<T>::radix != 2)) ?
       0 :
-      std::numeric_limits<T>::digits <= 24 ?
+      boost::math::numeric_limits<T>::digits <= 24 ?
       24 :
-      std::numeric_limits<T>::digits <= 53 ?
+      boost::math::numeric_limits<T>::digits <= 53 ?
       53 :
-      std::numeric_limits<T>::digits <= 64 ?
+      boost::math::numeric_limits<T>::digits <= 64 ?
       64 :
-      std::numeric_limits<T>::digits <= 113 ?
+      boost::math::numeric_limits<T>::digits <= 113 ?
       113 : -1
    > tag_type;
 
-   bessel_i0_initializer<T, tag_type>::force_instantiate();
    return bessel_i0_imp(x, tag_type());
 }
 
diff --git a/inst/include/boost/math/special_functions/detail/bessel_i1.hpp b/inst/include/boost/math/special_functions/detail/bessel_i1.hpp
index ea77f6791..d2c750df0 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_i1.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_i1.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2017 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,9 +18,13 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/precision.hpp>
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -38,64 +43,24 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T>
-T bessel_i1(const T& x);
-
-template <class T, class tag>
-struct bessel_i1_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init(tag());
-      }
-      static void do_init(const std::integral_constant<int, 64>&)
-      {
-         bessel_i1(T(1));
-         bessel_i1(T(15));
-         bessel_i1(T(80));
-         bessel_i1(T(101));
-      }
-      static void do_init(const std::integral_constant<int, 113>&)
-      {
-         bessel_i1(T(1));
-         bessel_i1(T(10));
-         bessel_i1(T(14));
-         bessel_i1(T(19));
-         bessel_i1(T(34));
-         bessel_i1(T(99));
-         bessel_i1(T(101));
-      }
-      template <class U>
-      static void do_init(const U&) {}
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T, class tag>
-const typename bessel_i1_initializer<T, tag>::init bessel_i1_initializer<T, tag>::initializer;
+BOOST_MATH_GPU_ENABLED T bessel_i1(const T& x);
 
 template <typename T, int N>
-T bessel_i1_imp(const T&, const std::integral_constant<int, N>&)
+BOOST_MATH_GPU_ENABLED T bessel_i1_imp(const T&, const boost::math::integral_constant<int, N>&)
 {
    BOOST_MATH_ASSERT(0);
    return 0;
 }
 
 template <typename T>
-T bessel_i1_imp(const T& x, const std::integral_constant<int, 24>&)
+BOOST_MATH_GPU_ENABLED T bessel_i1_imp(const T& x, const boost::math::integral_constant<int, 24>&)
 {
    BOOST_MATH_STD_USING
       if(x < 7.75)
       {
          //Max error in interpolated form : 1.348e-08
          // Max Error found at float precision = Poly : 1.469121e-07
-         static const float P[] = {
+         BOOST_MATH_STATIC const float P[] = {
             8.333333221e-02f,
             6.944453712e-03f,
             3.472097211e-04f,
@@ -114,7 +79,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 24>&)
          // Max error in interpolated form: 9.000e-08
          // Max Error found at float precision = Poly: 1.044345e-07
 
-         static const float P[] = {
+         BOOST_MATH_STATIC const float P[] = {
             3.98942115977513013e-01f,
             -1.49581264836620262e-01f,
             -4.76475741878486795e-02f,
@@ -129,7 +94,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 24>&)
 }
 
 template <typename T>
-T bessel_i1_imp(const T& x, const std::integral_constant<int, 53>&)
+BOOST_MATH_GPU_ENABLED T bessel_i1_imp(const T& x, const boost::math::integral_constant<int, 53>&)
 {
    BOOST_MATH_STD_USING
    if(x < 7.75)
@@ -138,7 +103,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 53>&)
       // Max error in interpolated form: 5.639e-17
       // Max Error found at double precision = Poly: 1.795559e-16
 
-      static const double P[] = {
+      BOOST_MATH_STATIC const double P[] = {
          8.333333333333333803e-02,
          6.944444444444341983e-03,
          3.472222222225921045e-04,
@@ -162,7 +127,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 53>&)
       // Max error in interpolated form: 1.796e-16
       // Max Error found at double precision = Poly: 2.898731e-16
 
-      static const double P[] = {
+      BOOST_MATH_STATIC const double P[] = {
          3.989422804014406054e-01,
          -1.496033551613111533e-01,
          -4.675104253598537322e-02,
@@ -192,7 +157,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 53>&)
    {
       // Max error in interpolated form: 1.320e-19
       // Max Error found at double precision = Poly: 7.065357e-17
-      static const double P[] = {
+      BOOST_MATH_STATIC const double P[] = {
          3.989422804014314820e-01,
          -1.496033551467584157e-01,
          -4.675105322571775911e-02,
@@ -207,7 +172,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 53>&)
 }
 
 template <typename T>
-T bessel_i1_imp(const T& x, const std::integral_constant<int, 64>&)
+BOOST_MATH_GPU_ENABLED T bessel_i1_imp(const T& x, const boost::math::integral_constant<int, 64>&)
 {
    BOOST_MATH_STD_USING
       if(x < 7.75)
@@ -215,7 +180,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 64>&)
          // Bessel I0 over[10 ^ -16, 7.75]
          // Max error in interpolated form: 8.086e-21
          // Max Error found at float80 precision = Poly: 7.225090e-20
-         static const T P[] = {
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 8.33333333333333333340071817e-02),
             BOOST_MATH_BIG_CONSTANT(T, 64, 6.94444444444444442462728070e-03),
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.47222222222222318886683883e-04),
@@ -243,7 +208,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 64>&)
          // Maximum Deviation Found : 3.887e-20
          // Expected Error Term : 3.887e-20
          // Maximum Relative Change in Control Points : 1.681e-04
-         static const T P[] = {
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.98942260530218897338680e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.49599542849073670179540e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.70492865454119188276875e-02),
@@ -276,7 +241,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 64>&)
          // Maximum Relative Change in Control Points : 2.101e-03
          // Max Error found at float80 precision = Poly : 6.029974e-20
 
-         static const T P[] = {
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.98942280401431675205845e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.49603355149968887210170e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.67510486284376330257260e-02),
@@ -298,7 +263,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 64>&)
          // Bessel I0 over[100, INF]
          // Max error in interpolated form: 2.456e-20
          // Max Error found at float80 precision = Poly: 5.446356e-20
-         static const T P[] = {
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.98942280401432677958445e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.49603355150537411254359e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.67510484842456251368526e-02),
@@ -316,7 +281,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 64>&)
 }
 
 template <typename T>
-T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
+BOOST_MATH_GPU_ENABLED T bessel_i1_imp(const T& x, const boost::math::integral_constant<int, 113>&)
 {
    BOOST_MATH_STD_USING
    if(x < 7.75)
@@ -325,7 +290,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
       // Max error in interpolated form: 1.835e-35
       // Max Error found at float128 precision = Poly: 1.645036e-34
 
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 8.3333333333333333333333333333333331804098e-02),
          BOOST_MATH_BIG_CONSTANT(T, 113, 6.9444444444444444444444444444445418303082e-03),
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.4722222222222222222222222222119082346591e-04),
@@ -361,7 +326,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
       // Maximum Relative Change in Control Points : 5.204e-03
       // Max Error found at float128 precision = Poly : 2.882561e-34
 
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 8.333333333333333326889717360850080939e-02),
          BOOST_MATH_BIG_CONSTANT(T, 113, 6.944444444444444511272790848815114507e-03),
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.472222222222221892451965054394153443e-04),
@@ -395,7 +360,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
       // Maximum Deviation Found : 1.766e-35
       // Expected Error Term : 1.021e-35
       // Maximum Relative Change in Control Points : 6.228e-03
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 8.333333333333255774414858563409941233e-02),
          BOOST_MATH_BIG_CONSTANT(T, 113, 6.944444444444897867884955912228700291e-03),
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.472222222220954970397343617150959467e-04),
@@ -429,7 +394,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
    {
       // Max error in interpolated form: 8.864e-36
       // Max Error found at float128 precision = Poly: 8.522841e-35
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.989422793693152031514179994954750043e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -1.496029423752889591425633234009799670e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -4.682975926820553021482820043377990241e-02),
@@ -461,7 +426,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
       // Max error in interpolated form: 6.028e-35
       // Max Error found at float128 precision = Poly: 1.368313e-34
 
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.989422804012941975429616956496046931e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -1.496033550576049830976679315420681402e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -4.675107835141866009896710750800622147e-02),
@@ -496,7 +461,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
       // Max error in interpolated form: 5.494e-35
       // Max Error found at float128 precision = Poly: 1.214651e-34
 
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.989422804014326779399307367861631577e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -1.496033551505372542086590873271571919e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -4.675104848454290286276466276677172664e-02),
@@ -526,7 +491,7 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
       // Bessel I0 over[100, INF]
       // Max error in interpolated form: 6.081e-35
       // Max Error found at float128 precision = Poly: 1.407151e-34
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 113, 3.9894228040143267793994605993438200208417e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -1.4960335515053725422747977247811372936584e-01),
          BOOST_MATH_BIG_CONSTANT(T, 113, -4.6751048484542891946087411826356811991039e-02),
@@ -552,37 +517,36 @@ T bessel_i1_imp(const T& x, const std::integral_constant<int, 113>&)
 }
 
 template <typename T>
-T bessel_i1_imp(const T& x, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED T bessel_i1_imp(const T& x, const boost::math::integral_constant<int, 0>&)
 {
    if(boost::math::tools::digits<T>() <= 24)
-      return bessel_i1_imp(x, std::integral_constant<int, 24>());
+      return bessel_i1_imp(x, boost::math::integral_constant<int, 24>());
    else if(boost::math::tools::digits<T>() <= 53)
-      return bessel_i1_imp(x, std::integral_constant<int, 53>());
+      return bessel_i1_imp(x, boost::math::integral_constant<int, 53>());
    else if(boost::math::tools::digits<T>() <= 64)
-      return bessel_i1_imp(x, std::integral_constant<int, 64>());
+      return bessel_i1_imp(x, boost::math::integral_constant<int, 64>());
    else if(boost::math::tools::digits<T>() <= 113)
-      return bessel_i1_imp(x, std::integral_constant<int, 113>());
+      return bessel_i1_imp(x, boost::math::integral_constant<int, 113>());
    BOOST_MATH_ASSERT(0);
    return 0;
 }
 
 template <typename T>
-inline T bessel_i1(const T& x)
+inline BOOST_MATH_GPU_ENABLED T bessel_i1(const T& x)
 {
-   typedef std::integral_constant<int,
-      ((std::numeric_limits<T>::digits == 0) || (std::numeric_limits<T>::radix != 2)) ?
+   typedef boost::math::integral_constant<int,
+      ((boost::math::numeric_limits<T>::digits == 0) || (boost::math::numeric_limits<T>::radix != 2)) ?
       0 :
-      std::numeric_limits<T>::digits <= 24 ?
+      boost::math::numeric_limits<T>::digits <= 24 ?
       24 :
-      std::numeric_limits<T>::digits <= 53 ?
+      boost::math::numeric_limits<T>::digits <= 53 ?
       53 :
-      std::numeric_limits<T>::digits <= 64 ?
+      boost::math::numeric_limits<T>::digits <= 64 ?
       64 :
-      std::numeric_limits<T>::digits <= 113 ?
+      boost::math::numeric_limits<T>::digits <= 113 ?
       113 : -1
    > tag_type;
 
-   bessel_i1_initializer<T, tag_type>::force_instantiate();
    return bessel_i1_imp(x, tag_type());
 }
 
diff --git a/inst/include/boost/math/special_functions/detail/bessel_ik.hpp b/inst/include/boost/math/special_functions/detail/bessel_ik.hpp
index f6d222db1..b3e7378fd 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_ik.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_ik.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2006 Xiaogang Zhang
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,14 +11,17 @@
 #pragma once
 #endif
 
-#include <cmath>
-#include <cstdint>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/series.hpp>
+#include <boost/math/special_functions/sign.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/sin_pi.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/policies/error_handling.hpp>
-#include <boost/math/tools/config.hpp>
 
 // Modified Bessel functions of the first and second kind of fractional order
 
@@ -30,13 +34,13 @@ struct cyl_bessel_i_small_z
 {
    typedef T result_type;
 
-   cyl_bessel_i_small_z(T v_, T z_) : k(0), v(v_), mult(z_*z_/4)
+   BOOST_MATH_GPU_ENABLED cyl_bessel_i_small_z(T v_, T z_) : k(0), v(v_), mult(z_*z_/4)
    {
       BOOST_MATH_STD_USING
       term = 1;
    }
 
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T result = term;
       ++k;
@@ -52,7 +56,7 @@ struct cyl_bessel_i_small_z
 };
 
 template <class T, class Policy>
-inline T bessel_i_small_z_series(T v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T bessel_i_small_z_series(T v, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    T prefix;
@@ -69,7 +73,7 @@ inline T bessel_i_small_z_series(T v, T x, const Policy& pol)
       return prefix;
 
    cyl_bessel_i_small_z<T, Policy> s(v, x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    T result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter);
 
@@ -80,7 +84,7 @@ inline T bessel_i_small_z_series(T v, T x, const Policy& pol)
 // Calculate K(v, x) and K(v+1, x) by method analogous to
 // Temme, Journal of Computational Physics, vol 21, 343 (1976)
 template <typename T, typename Policy>
-int temme_ik(T v, T x, T* K, T* K1, const Policy& pol)
+BOOST_MATH_GPU_ENABLED int temme_ik(T v, T x, T* result_K, T* K1, const Policy& pol)
 {
     T f, h, p, q, coef, sum, sum1, tolerance;
     T a, b, c, d, sigma, gamma1, gamma2;
@@ -148,7 +152,7 @@ int temme_ik(T v, T x, T* K, T* K1, const Policy& pol)
     }
     policies::check_series_iterations<T>("boost::math::bessel_ik<%1%>(%1%,%1%) in temme_ik", k, pol);
 
-    *K = sum;
+    *result_K = sum;
     *K1 = 2 * sum1 / x;
 
     return 0;
@@ -157,7 +161,7 @@ int temme_ik(T v, T x, T* K, T* K1, const Policy& pol)
 // Evaluate continued fraction fv = I_(v+1) / I_v, derived from
 // Abramowitz and Stegun, Handbook of Mathematical Functions, 1972, 9.1.73
 template <typename T, typename Policy>
-int CF1_ik(T v, T x, T* fv, const Policy& pol)
+BOOST_MATH_GPU_ENABLED int CF1_ik(T v, T x, T* fv, const Policy& pol)
 {
     T C, D, f, a, b, delta, tiny, tolerance;
     unsigned long k;
@@ -204,7 +208,7 @@ int CF1_ik(T v, T x, T* fv, const Policy& pol)
 // z1 / z0 = U(v+1.5, 2v+1, 2x) / U(v+0.5, 2v+1, 2x), see
 // Thompson and Barnett, Computer Physics Communications, vol 47, 245 (1987)
 template <typename T, typename Policy>
-int CF2_ik(T v, T x, T* Kv, T* Kv1, const Policy& pol)
+BOOST_MATH_GPU_ENABLED int CF2_ik(T v, T x, T* Kv, T* Kv1, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::constants;
@@ -297,7 +301,7 @@ enum{
 // Compute I(v, x) and K(v, x) simultaneously by Temme's method, see
 // Temme, Journal of Computational Physics, vol 19, 324 (1975)
 template <typename T, typename Policy>
-int bessel_ik(T v, T x, T* I, T* K, int kind, const Policy& pol)
+BOOST_MATH_GPU_ENABLED int bessel_ik(T v, T x, T* result_I, T* result_K, int kind, const Policy& pol)
 {
     // Kv1 = K_(v+1), fv = I_(v+1) / I_v
     // Ku1 = K_(u+1), fu = I_(u+1) / I_u
@@ -314,7 +318,7 @@ int bessel_ik(T v, T x, T* I, T* K, int kind, const Policy& pol)
     using namespace boost::math::tools;
     using namespace boost::math::constants;
 
-    static const char* function = "boost::math::bessel_ik<%1%>(%1%,%1%)";
+    constexpr auto function = "boost::math::bessel_ik<%1%>(%1%,%1%)";
 
     if (v < 0)
     {
@@ -322,133 +326,117 @@ int bessel_ik(T v, T x, T* I, T* K, int kind, const Policy& pol)
         v = -v;                             // v is non-negative from here
         kind |= need_k;
     }
-    n = iround(v, pol);
-    u = v - n;                              // -1/2 <= u < 1/2
-    BOOST_MATH_INSTRUMENT_VARIABLE(n);
-    BOOST_MATH_INSTRUMENT_VARIABLE(u);
 
-    if (x < 0)
+    T scale = 1;
+    T scale_sign = 1;
+
+    if (((kind & need_i) == 0) && (fabs(4 * v * v - 25) / (8 * x) < tools::forth_root_epsilon<T>()))
     {
-       *I = *K = policies::raise_domain_error<T>(function,
-            "Got x = %1% but real argument x must be non-negative, complex number result not supported.", x, pol);
-        return 1;
+       // A&S 9.7.2
+       Iv = boost::math::numeric_limits<T>::quiet_NaN(); // any value will do
+       T mu = 4 * v * v;
+       T eight_z = 8 * x;
+       Kv = 1 + (mu - 1) / eight_z + (mu - 1) * (mu - 9) / (2 * eight_z * eight_z) + (mu - 1) * (mu - 9) * (mu - 25) / (6 * eight_z * eight_z * eight_z);
+       Kv *= exp(-x) * constants::root_pi<T>() / sqrt(2 * x);
     }
-    if (x == 0)
+    else
     {
-       Iv = (v == 0) ? static_cast<T>(1) : static_cast<T>(0);
-       if(kind & need_k)
-       {
-         Kv = policies::raise_overflow_error<T>(function, nullptr, pol);
-       }
-       else
-       {
-          Kv = std::numeric_limits<T>::quiet_NaN(); // any value will do
-       }
+       n = iround(v, pol);
+       u = v - n;                              // -1/2 <= u < 1/2
+       BOOST_MATH_INSTRUMENT_VARIABLE(n);
+       BOOST_MATH_INSTRUMENT_VARIABLE(u);
+
+       BOOST_MATH_ASSERT(x > 0); // Error handling for x <= 0 handled in cyl_bessel_i and cyl_bessel_k
 
-       if(reflect && (kind & need_i))
+       // x is positive until reflection
+       W = 1 / x;                                 // Wronskian
+       if (x <= 2)                                // x in (0, 2]
        {
-           T z = (u + n % 2);
-           Iv = boost::math::sin_pi(z, pol) == 0 ?
-               Iv :
-               policies::raise_overflow_error<T>(function, nullptr, pol);   // reflection formula
+          temme_ik(u, x, &Ku, &Ku1, pol);             // Temme series
        }
-
-       *I = Iv;
-       *K = Kv;
-       return 0;
-    }
-
-    // x is positive until reflection
-    W = 1 / x;                                 // Wronskian
-    if (x <= 2)                                // x in (0, 2]
-    {
-        temme_ik(u, x, &Ku, &Ku1, pol);             // Temme series
-    }
-    else                                       // x in (2, \infty)
-    {
-        CF2_ik(u, x, &Ku, &Ku1, pol);               // continued fraction CF2_ik
-    }
-    BOOST_MATH_INSTRUMENT_VARIABLE(Ku);
-    BOOST_MATH_INSTRUMENT_VARIABLE(Ku1);
-    prev = Ku;
-    current = Ku1;
-    T scale = 1;
-    T scale_sign = 1;
-    for (k = 1; k <= n; k++)                   // forward recurrence for K
-    {
-        T fact = 2 * (u + k) / x;
-        // Check for overflow: if (max - |prev|) / fact > max, then overflow
-        // (max - |prev|) / fact > max
-        // max * (1 - fact) > |prev|
-        // if fact < 1: safe to compute overflow check
-        // if fact >= 1:  won't overflow
-        const bool will_overflow = (fact < 1)
-          ? tools::max_value<T>() * (1 - fact) > fabs(prev)
-          : false;
-        if(!will_overflow && ((tools::max_value<T>() - fabs(prev)) / fact < fabs(current)))
-        {
-           prev /= current;
-           scale /= current;
-           scale_sign *= boost::math::sign(current);
-           current = 1;
-        }
-        next = fact * current + prev;
-        prev = current;
-        current = next;
-    }
-    Kv = prev;
-    Kv1 = current;
-    BOOST_MATH_INSTRUMENT_VARIABLE(Kv);
-    BOOST_MATH_INSTRUMENT_VARIABLE(Kv1);
-    if(kind & need_i)
-    {
-       T lim = (4 * v * v + 10) / (8 * x);
-       lim *= lim;
-       lim *= lim;
-       lim /= 24;
-       if((lim < tools::epsilon<T>() * 10) && (x > 100))
+       else                                       // x in (2, \infty)
        {
-          // x is huge compared to v, CF1 may be very slow
-          // to converge so use asymptotic expansion for large
-          // x case instead.  Note that the asymptotic expansion
-          // isn't very accurate - so it's deliberately very hard
-          // to get here - probably we're going to overflow:
-          Iv = asymptotic_bessel_i_large_x(v, x, pol);
+          CF2_ik(u, x, &Ku, &Ku1, pol);               // continued fraction CF2_ik
        }
-       else if((v > 0) && (x / v < 0.25))
+       BOOST_MATH_INSTRUMENT_VARIABLE(Ku);
+       BOOST_MATH_INSTRUMENT_VARIABLE(Ku1);
+       prev = Ku;
+       current = Ku1;
+       for (k = 1; k <= n; k++)                   // forward recurrence for K
        {
-          Iv = bessel_i_small_z_series(v, x, pol);
+          T fact = 2 * (u + k) / x;
+          // Check for overflow: if (max - |prev|) / fact > max, then overflow
+          // (max - |prev|) / fact > max
+          // max * (1 - fact) > |prev|
+          // if fact < 1: safe to compute overflow check
+          // if fact >= 1:  won't overflow
+          const bool will_overflow = (fact < 1)
+             ? tools::max_value<T>() * (1 - fact) > fabs(prev)
+             : false;
+          if (!will_overflow && ((tools::max_value<T>() - fabs(prev)) / fact < fabs(current)))
+          {
+             prev /= current;
+             scale /= current;
+             scale_sign *= ((boost::math::signbit)(current) ? -1 : 1);
+             current = 1;
+          }
+          next = fact * current + prev;
+          prev = current;
+          current = next;
        }
-       else
+       Kv = prev;
+       Kv1 = current;
+       BOOST_MATH_INSTRUMENT_VARIABLE(Kv);
+       BOOST_MATH_INSTRUMENT_VARIABLE(Kv1);
+       if (kind & need_i)
        {
-          CF1_ik(v, x, &fv, pol);                         // continued fraction CF1_ik
-          Iv = scale * W / (Kv * fv + Kv1);                  // Wronskian relation
+          T lim = (4 * v * v + 10) / (8 * x);
+          lim *= lim;
+          lim *= lim;
+          lim /= 24;
+          if ((lim < tools::epsilon<T>() * 10) && (x > 100))
+          {
+             // x is huge compared to v, CF1 may be very slow
+             // to converge so use asymptotic expansion for large
+             // x case instead.  Note that the asymptotic expansion
+             // isn't very accurate - so it's deliberately very hard
+             // to get here - probably we're going to overflow:
+             Iv = asymptotic_bessel_i_large_x(v, x, pol);
+          }
+          else if ((v > 0) && (x / v < 0.25))
+          {
+             Iv = bessel_i_small_z_series(v, x, pol);
+          }
+          else
+          {
+             CF1_ik(v, x, &fv, pol);                         // continued fraction CF1_ik
+             Iv = scale * W / (Kv * fv + Kv1);                  // Wronskian relation
+          }
        }
+       else
+          Iv = boost::math::numeric_limits<T>::quiet_NaN(); // any value will do
     }
-    else
-       Iv = std::numeric_limits<T>::quiet_NaN(); // any value will do
-
     if (reflect)
     {
         T z = (u + n % 2);
         T fact = (2 / pi<T>()) * (boost::math::sin_pi(z, pol) * Kv);
         if(fact == 0)
-           *I = Iv;
+           *result_I = Iv;
         else if(tools::max_value<T>() * scale < fact)
-           *I = (org_kind & need_i) ? T(sign(fact) * scale_sign * policies::raise_overflow_error<T>(function, nullptr, pol)) : T(0);
+           *result_I = (org_kind & need_i) ? T(sign(fact) * scale_sign * policies::raise_overflow_error<T>(function, nullptr, pol)) : T(0);
         else
-         *I = Iv + fact / scale;   // reflection formula
+         *result_I = Iv + fact / scale;   // reflection formula
     }
     else
     {
-        *I = Iv;
+        *result_I = Iv;
     }
     if(tools::max_value<T>() * scale < Kv)
-       *K = (org_kind & need_k) ? T(sign(Kv) * scale_sign * policies::raise_overflow_error<T>(function, nullptr, pol)) : T(0);
+       *result_K = (org_kind & need_k) ? T(sign(Kv) * scale_sign * policies::raise_overflow_error<T>(function, nullptr, pol)) : T(0);
     else
-      *K = Kv / scale;
-    BOOST_MATH_INSTRUMENT_VARIABLE(*I);
-    BOOST_MATH_INSTRUMENT_VARIABLE(*K);
+      *result_K = Kv / scale;
+    BOOST_MATH_INSTRUMENT_VARIABLE(*result_I);
+    BOOST_MATH_INSTRUMENT_VARIABLE(*result_K);
     return 0;
 }
 
diff --git a/inst/include/boost/math/special_functions/detail/bessel_j0.hpp b/inst/include/boost/math/special_functions/detail/bessel_j0.hpp
index 564f86d7a..2df027b21 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_j0.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_j0.hpp
@@ -10,6 +10,7 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
@@ -32,38 +33,11 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T>
-T bessel_j0(T x);
-
-template <class T>
-struct bessel_j0_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init();
-      }
-      static void do_init()
-      {
-         bessel_j0(T(1));
-      }
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T>
-const typename bessel_j0_initializer<T>::init bessel_j0_initializer<T>::initializer;
+BOOST_MATH_GPU_ENABLED T bessel_j0(T x);
 
 template <typename T>
-T bessel_j0(T x)
+BOOST_MATH_GPU_ENABLED T bessel_j0(T x)
 {
-    bessel_j0_initializer<T>::force_instantiate();
-    
 #ifdef BOOST_MATH_INSTRUMENT
     static bool b = false;
     if (!b)
@@ -75,7 +49,7 @@ T bessel_j0(T x)
     }
 #endif
 
-    static const T P1[] = {
+    BOOST_MATH_STATIC const T P1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -4.1298668500990866786e+11)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.7282507878605942706e+10)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -6.2140700423540120665e+08)),
@@ -84,7 +58,7 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0344222815443188943e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.2117036164593528341e-01))
     };
-    static const T Q1[] = {
+    BOOST_MATH_STATIC const T Q1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.3883787996332290397e+12)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.6328198300859648632e+10)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.3985097372263433271e+08)),
@@ -93,7 +67,7 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.0))
     };
-    static const T P2[] = {
+    BOOST_MATH_STATIC const T P2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.8319397969392084011e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.2254078161378989535e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -7.2879702464464618998e+03)),
@@ -103,7 +77,7 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.4321196680624245801e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.8591703355916499363e+01))
     };
-    static const T Q2[] = {
+    BOOST_MATH_STATIC const T Q2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.5783478026152301072e+05)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.4599102262586308984e+05)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.4055062591169562211e+04)),
@@ -113,7 +87,7 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -2.5258076240801555057e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0))
     };
-    static const T PC[] = {
+    BOOST_MATH_STATIC const T PC[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.2779090197304684302e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.1345386639580765797e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1170523380864944322e+04)),
@@ -121,7 +95,7 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.5376201909008354296e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.8961548424210455236e-01))
     };
-    static const T QC[] = {
+    BOOST_MATH_STATIC const T QC[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.2779090197304684318e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.1370412495510416640e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1215350561880115730e+04)),
@@ -129,7 +103,7 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.5711159858080893649e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0))
     };
-    static const T PS[] = {
+    BOOST_MATH_STATIC const T PS[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.9226600200800094098e+01)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.8591953644342993800e+02)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.1183429920482737611e+02)),
@@ -137,7 +111,7 @@ T bessel_j0(T x)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.2441026745835638459e+00)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.8033303048680751817e-03))
     };
-    static const T QS[] = {
+    BOOST_MATH_STATIC const T QS[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.7105024128512061905e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.1951131543434613647e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.2642780169211018836e+03)),
@@ -145,12 +119,13 @@ T bessel_j0(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 9.0593769594993125859e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0))
     };
-    static const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.4048255576957727686e+00)),
-                   x2  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.5200781102863106496e+00)),
-                   x11 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.160e+02)),
-                   x12 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.42444230422723137837e-03)),
-                   x21 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.4130e+03)),
-                   x22 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.46860286310649596604e-04));
+
+    BOOST_MATH_STATIC const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.4048255576957727686e+00));
+    BOOST_MATH_STATIC const T x2  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.5200781102863106496e+00));
+    BOOST_MATH_STATIC const T x11 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.160e+02));
+    BOOST_MATH_STATIC const T x12 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.42444230422723137837e-03));
+    BOOST_MATH_STATIC const T x21 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.4130e+03));
+    BOOST_MATH_STATIC const T x22 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.46860286310649596604e-04));
 
     T value, factor, r, rc, rs;
 
@@ -158,10 +133,8 @@ T bessel_j0(T x)
     using namespace boost::math::tools;
     using namespace boost::math::constants;
 
-    if (x < 0)
-    {
-        x = -x;                         // even function
-    }
+    BOOST_MATH_ASSERT(x >= 0); // reflection handled elsewhere.
+
     if (x == 0)
     {
         return static_cast<T>(1);
diff --git a/inst/include/boost/math/special_functions/detail/bessel_j1.hpp b/inst/include/boost/math/special_functions/detail/bessel_j1.hpp
index 3b24ec239..43df9fa0c 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_j1.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_j1.hpp
@@ -10,6 +10,7 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
@@ -32,27 +33,29 @@
 namespace boost { namespace math{  namespace detail{
 
 template <typename T>
-T bessel_j1(T x);
+BOOST_MATH_GPU_ENABLED T bessel_j1(T x);
 
 template <class T>
 struct bessel_j1_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          do_init();
       }
-      static void do_init()
+      BOOST_MATH_GPU_ENABLED static void do_init()
       {
          bessel_j1(T(1));
       }
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
-   static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_STATIC const init initializer;
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -60,11 +63,11 @@ template <class T>
 const typename bessel_j1_initializer<T>::init bessel_j1_initializer<T>::initializer;
 
 template <typename T>
-T bessel_j1(T x)
+BOOST_MATH_GPU_ENABLED T bessel_j1(T x)
 {
     bessel_j1_initializer<T>::force_instantiate();
 
-    static const T P1[] = {
+    BOOST_MATH_STATIC const T P1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.4258509801366645672e+11)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.6781041261492395835e+09)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.1548696764841276794e+08)),
@@ -73,7 +76,7 @@ T bessel_j1(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0650724020080236441e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.0767857011487300348e-02))
     };
-    static const T Q1[] = {
+    BOOST_MATH_STATIC const T Q1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.1868604460820175290e+12)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.2091902282580133541e+10)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.0228375140097033958e+08)),
@@ -82,7 +85,7 @@ T bessel_j1(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.0))
     };
-    static const T P2[] = {
+    BOOST_MATH_STATIC const T P2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.7527881995806511112e+16)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.6608531731299018674e+15)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.6658018905416665164e+13)),
@@ -92,7 +95,7 @@ T bessel_j1(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -7.5023342220781607561e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.6179191852758252278e+00))
     };
-    static const T Q2[] = {
+    BOOST_MATH_STATIC const T Q2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.7253905888447681194e+18)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.7128800897135812012e+16)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.4899346165481429307e+13)),
@@ -102,7 +105,7 @@ T bessel_j1(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.3886978985861357615e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0))
     };
-    static const T PC[] = {
+    BOOST_MATH_STATIC const T PC[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -4.4357578167941278571e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -9.9422465050776411957e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -6.6033732483649391093e+06)),
@@ -111,7 +114,7 @@ T bessel_j1(T x)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.6116166443246101165e+03)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.0))
     };
-    static const T QC[] = {
+    BOOST_MATH_STATIC const T QC[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -4.4357578167941278568e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -9.9341243899345856590e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -6.5853394797230870728e+06)),
@@ -120,7 +123,7 @@ T bessel_j1(T x)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.4550094401904961825e+03)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0))
     };
-    static const T PS[] = {
+    BOOST_MATH_STATIC const T PS[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.3220913409857223519e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.5145160675335701966e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.6178836581270835179e+04)),
@@ -129,7 +132,7 @@ T bessel_j1(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.5265133846636032186e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.0))
     };
-    static const T QS[] = {
+    BOOST_MATH_STATIC const T QS[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.0871281941028743574e+05)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.8194580422439972989e+06)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.4194606696037208929e+06)),
@@ -138,12 +141,13 @@ T bessel_j1(T x)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.6383677696049909675e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0))
     };
-    static const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.8317059702075123156e+00)),
-                   x2  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.0155866698156187535e+00)),
-                   x11 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 9.810e+02)),
-                   x12 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.2527979248768438556e-04)),
-                   x21 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.7960e+03)),
-                   x22 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.8330184381246462950e-05));
+
+    BOOST_MATH_STATIC const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.8317059702075123156e+00));
+    BOOST_MATH_STATIC const T x2  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.0155866698156187535e+00));
+    BOOST_MATH_STATIC const T x11 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 9.810e+02));
+    BOOST_MATH_STATIC const T x12 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.2527979248768438556e-04));
+    BOOST_MATH_STATIC const T x21 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.7960e+03));
+    BOOST_MATH_STATIC const T x22 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.8330184381246462950e-05));
 
     T value, factor, r, rc, rs, w;
 
@@ -196,10 +200,8 @@ T bessel_j1(T x)
         value = factor * (rc * (sx - cx) + y * rs * (sx + cx));
     }
 
-    if (x < 0)
-    {
-        value *= -1;                 // odd function
-    }
+    BOOST_MATH_ASSERT(x >= 0);  // Negative values handled by the caller.
+
     return value;
 }
 
diff --git a/inst/include/boost/math/special_functions/detail/bessel_jn.hpp b/inst/include/boost/math/special_functions/detail/bessel_jn.hpp
index 3388e8df2..73bc0c562 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_jn.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_jn.hpp
@@ -10,6 +10,10 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/assert.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/detail/bessel_j0.hpp>
 #include <boost/math/special_functions/detail/bessel_j1.hpp>
 #include <boost/math/special_functions/detail/bessel_jy.hpp>
@@ -24,7 +28,7 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T bessel_jn(int n, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T bessel_jn(int n, T x, const Policy& pol)
 {
     T value(0), factor, current, prev, next;
 
@@ -75,17 +79,7 @@ T bessel_jn(int n, T x, const Policy& pol)
         policies::check_series_iterations<T>("boost::math::bessel_j_n<%1%>(%1%,%1%)", n, pol);
         for (int k = 1; k < n; k++)
         {
-            T fact = 2 * k / x;
-            //
-            // rescale if we would overflow or underflow:
-            //
-            if((fabs(fact) > 1) && ((tools::max_value<T>() - fabs(prev)) / fabs(fact) < fabs(current)))
-            {
-               scale /= current;
-               prev /= current;
-               current = 1;
-            }
-            value = fact * current - prev;
+            value = (2 * k * current / x) - prev;
             prev = current;
             current = value;
         }
@@ -122,7 +116,7 @@ T bessel_jn(int n, T x, const Policy& pol)
     value *= factor;
 
     if(tools::max_value<T>() * scale < fabs(value))
-       return policies::raise_overflow_error<T>("boost::math::bessel_jn<%1%>(%1%,%1%)", nullptr, pol);
+       return policies::raise_overflow_error<T>("boost::math::bessel_jn<%1%>(%1%,%1%)", nullptr, pol); // LCOV_EXCL_LINE we should never get here!
 
     return value / scale;
 }
diff --git a/inst/include/boost/math/special_functions/detail/bessel_jy.hpp b/inst/include/boost/math/special_functions/detail/bessel_jy.hpp
index ca0aa7d2c..143dce872 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_jy.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_jy.hpp
@@ -11,16 +11,18 @@
 #endif
 
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/sign.hpp>
 #include <boost/math/special_functions/hypot.hpp>
 #include <boost/math/special_functions/sin_pi.hpp>
 #include <boost/math/special_functions/cos_pi.hpp>
+#include <boost/math/special_functions/round.hpp>
 #include <boost/math/special_functions/detail/bessel_jy_asym.hpp>
 #include <boost/math/special_functions/detail/bessel_jy_series.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/policies/error_handling.hpp>
-#include <complex>
 
 // Bessel functions of the first and second kind of fractional order
 
@@ -38,7 +40,7 @@ namespace boost { namespace math {
       // try it and see...
       //
       template <class T, class Policy>
-      bool hankel_PQ(T v, T x, T* p, T* q, const Policy& )
+      BOOST_MATH_GPU_ENABLED bool hankel_PQ(T v, T x, T* p, T* q, const Policy& )
       {
          BOOST_MATH_STD_USING
             T tolerance = 2 * policies::get_epsilon<T, Policy>();
@@ -70,7 +72,7 @@ namespace boost { namespace math {
       // Calculate Y(v, x) and Y(v+1, x) by Temme's method, see
       // Temme, Journal of Computational Physics, vol 21, 343 (1976)
       template <typename T, typename Policy>
-      int temme_jy(T v, T x, T* Y, T* Y1, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED int temme_jy(T v, T x, T* Y, T* Y1, const Policy& pol)
       {
          T g, h, p, q, f, coef, sum, sum1, tolerance;
          T a, d, e, sigma;
@@ -139,7 +141,7 @@ namespace boost { namespace math {
       // Evaluate continued fraction fv = J_(v+1) / J_v, see
       // Abramowitz and Stegun, Handbook of Mathematical Functions, 1972, 9.1.73
       template <typename T, typename Policy>
-      int CF1_jy(T v, T x, T* fv, int* sign, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED int CF1_jy(T v, T x, T* fv, int* sign, const Policy& pol)
       {
          T C, D, f, a, b, delta, tiny, tolerance;
          unsigned long k;
@@ -185,7 +187,7 @@ namespace boost { namespace math {
       // real values only.
       //
       template <typename T, typename Policy>
-      int CF2_jy(T v, T x, T* p, T* q, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED int CF2_jy(T v, T x, T* p, T* q, const Policy& pol)
       {
          BOOST_MATH_STD_USING
 
@@ -254,13 +256,13 @@ namespace boost { namespace math {
          return 0;
       }
 
-      static const int need_j = 1;
-      static const int need_y = 2;
+      BOOST_MATH_STATIC const int need_j = 1;
+      BOOST_MATH_STATIC const int need_y = 2;
 
       // Compute J(v, x) and Y(v, x) simultaneously by Steed's method, see
       // Barnett et al, Computer Physics Communications, vol 8, 377 (1974)
       template <typename T, typename Policy>
-      int bessel_jy(T v, T x, T* J, T* Y, int kind, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED int bessel_jy(T v, T x, T* J, T* Y, int kind, const Policy& pol)
       {
          BOOST_MATH_ASSERT(x >= 0);
 
@@ -273,7 +275,7 @@ namespace boost { namespace math {
          T cp = 0;
          T sp = 0;
 
-         static const char* function = "boost::math::bessel_jy<%1%>(%1%,%1%)";
+         constexpr auto function = "boost::math::bessel_jy<%1%>(%1%,%1%)";
 
          BOOST_MATH_STD_USING
             using namespace boost::math::tools;
@@ -284,10 +286,10 @@ namespace boost { namespace math {
             reflect = true;
             v = -v;                             // v is non-negative from here
          }
-         if (v > static_cast<T>((std::numeric_limits<int>::max)()))
+         if (v > static_cast<T>((boost::math::numeric_limits<int>::max)()))
          {
             *J = *Y = policies::raise_evaluation_error<T>(function, "Order of Bessel function is too large to evaluate: got %1%", v, pol);
-            return 1;
+            return 1;  // LCOV_EXCL_LINE previous line will throw.
          }
          n = iround(v, pol);
          u = v - n;                              // -1/2 <= u < 1/2
@@ -303,21 +305,22 @@ namespace boost { namespace math {
 
          if(x == 0)
          {
-            if(v == 0)
-               *J = 1;
-            else if((u == 0) || !reflect)
+            if (v == 0)
+               *J = 1; // LCOV_EXCL_LINE multiprecision case only
+            else if ((u == 0) || !reflect)
                *J = 0;
             else if(kind & need_j)
                *J = policies::raise_domain_error<T>(function, "Value of Bessel J_v(x) is complex-infinity at %1%", x, pol); // complex infinity
             else
-               *J = std::numeric_limits<T>::quiet_NaN();  // any value will do, not using J.
+               *J = boost::math::numeric_limits<T>::quiet_NaN();  // LCOV_EXCL_LINE, we should never get here, any value will do, not using J.
 
             if((kind & need_y) == 0)
-               *Y = std::numeric_limits<T>::quiet_NaN();  // any value will do, not using Y.
-            else if(v == 0)
-               *Y = -policies::raise_overflow_error<T>(function, nullptr, pol);
+               *Y = boost::math::numeric_limits<T>::quiet_NaN();  // any value will do, not using Y.
             else
-               *Y = policies::raise_domain_error<T>(function, "Value of Bessel Y_v(x) is complex-infinity at %1%", x, pol); // complex infinity
+            {
+               // We shoud never get here:
+               BOOST_MATH_ASSERT(x != 0); // LCOV_EXCL_LINE
+            }
             return 1;
          }
 
@@ -332,7 +335,7 @@ namespace boost { namespace math {
             // and divergent which leads to large errors :-(
             //
             Jv = bessel_j_small_z_series(v, x, pol);
-            Yv = std::numeric_limits<T>::quiet_NaN();
+            Yv = boost::math::numeric_limits<T>::quiet_NaN();
          }
          else if((x < 1) && (u != 0) && (log(policies::get_epsilon<T, Policy>() / 2) > v * log((x/2) * (x/2) / v)))
          {
@@ -343,7 +346,7 @@ namespace boost { namespace math {
             if(kind&need_j)
                Jv = bessel_j_small_z_series(v, x, pol);
             else
-               Jv = std::numeric_limits<T>::quiet_NaN();
+               Jv = boost::math::numeric_limits<T>::quiet_NaN();
             if((org_kind&need_y && (!reflect || (cp != 0)))
                || (org_kind & need_j && (reflect && (sp != 0))))
             {
@@ -351,16 +354,18 @@ namespace boost { namespace math {
                Yv = bessel_y_small_z_series(v, x, &Yv_scale, pol);
             }
             else
-               Yv = std::numeric_limits<T>::quiet_NaN();
+               Yv = boost::math::numeric_limits<T>::quiet_NaN();
          }
          else if((u == 0) && (x < policies::get_epsilon<T, Policy>()))
          {
             // Truncated series evaluation for small x and v an integer,
             // much quicker in this area than temme_jy below.
+            // This code is only used in the multiprecision case, otherwise
+            // we go via bessel_jn.  LCOV_EXCL_START
             if(kind&need_j)
                Jv = bessel_j_small_z_series(v, x, pol);
             else
-               Jv = std::numeric_limits<T>::quiet_NaN();
+               Jv = boost::math::numeric_limits<T>::quiet_NaN();
             if((org_kind&need_y && (!reflect || (cp != 0)))
                || (org_kind & need_j && (reflect && (sp != 0))))
             {
@@ -368,7 +373,8 @@ namespace boost { namespace math {
                Yv = bessel_yn_small_z(n, x, &Yv_scale, pol);
             }
             else
-               Yv = std::numeric_limits<T>::quiet_NaN();
+               Yv = boost::math::numeric_limits<T>::quiet_NaN();
+            // LCOV_EXCL_STOP
          }
          else if(asymptotic_bessel_large_x_limit(v, x))
          {
@@ -377,13 +383,13 @@ namespace boost { namespace math {
                Yv = asymptotic_bessel_y_large_x_2(v, x, pol);
             }
             else
-               Yv = std::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
+               Yv = boost::math::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
             if(kind&need_j)
             {
                Jv = asymptotic_bessel_j_large_x_2(v, x, pol);
             }
             else
-               Jv = std::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
+               Jv = boost::math::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
          }
          else if((x > 8) && hankel_PQ(v, x, &p, &q, pol))
          {
@@ -416,9 +422,9 @@ namespace boost { namespace math {
          {
             if(temme_jy(u, x, &Yu, &Yu1, pol))             // Temme series
             {
-               // domain error:
-               *J = *Y = Yu;
-               return 1;
+               // domain error, this should really have already been handled.
+               *J = *Y = Yu; // LCOV_EXCL_LINE
+               return 1;     // LCOV_EXCL_LINE
             }
             prev = Yu;
             current = Yu1;
@@ -445,7 +451,7 @@ namespace boost { namespace math {
                Jv = scale * W / (Yv * fv - Yv1);           // Wronskian relation
             }
             else
-               Jv = std::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
+               Jv = boost::math::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
             Yv_scale = scale;
          }
          else                                    // x in (2, \infty)
@@ -470,7 +476,7 @@ namespace boost { namespace math {
                   // Pretend that one bit did not cancel:
                   if (next == 0)
                   {
-                     next = prev * tools::epsilon<T>() / 2;
+                     next = prev * tools::epsilon<T>() / 2;  // LCOV_EXCL_LINE requires specific hardware and rounding to trigger, does get tested on msvc
                   }
                   prev = current;
                   current = next;
@@ -522,7 +528,7 @@ namespace boost { namespace math {
             //
             if(gamma == 0)
             {
-               gamma = u * tools::epsilon<T>() / x;
+               gamma = u * tools::epsilon<T>() / x;  // LCOV_EXCL_LINE requires specific hardware and rounding to trigger, does get tested on msvc
             }
             BOOST_MATH_INSTRUMENT_VARIABLE(current);
             BOOST_MATH_INSTRUMENT_VARIABLE(W);
@@ -560,7 +566,7 @@ namespace boost { namespace math {
                Yv = prev;
             }
             else
-               Yv = std::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
+               Yv = boost::math::numeric_limits<T>::quiet_NaN(); // any value will do, we're not using it.
          }
 
          if (reflect)
diff --git a/inst/include/boost/math/special_functions/detail/bessel_jy_asym.hpp b/inst/include/boost/math/special_functions/detail/bessel_jy_asym.hpp
index 16b6543f9..51e4efafc 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_jy_asym.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_jy_asym.hpp
@@ -16,12 +16,15 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/factorials.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
 
 namespace boost{ namespace math{ namespace detail{
 
 template <class T>
-inline T asymptotic_bessel_amplitude(T v, T x)
+BOOST_MATH_GPU_ENABLED inline T asymptotic_bessel_amplitude(T v, T x)
 {
    // Calculate the amplitude of J(v, x) and Y(v, x) for large
    // x: see A&S 9.2.28.
@@ -39,7 +42,7 @@ inline T asymptotic_bessel_amplitude(T v, T x)
 }
 
 template <class T>
-T asymptotic_bessel_phase_mx(T v, T x)
+BOOST_MATH_GPU_ENABLED T asymptotic_bessel_phase_mx(T v, T x)
 {
    //
    // Calculate the phase of J(v, x) and Y(v, x) for large x.
@@ -63,12 +66,14 @@ T asymptotic_bessel_phase_mx(T v, T x)
 }
 
 template <class T, class Policy>
-inline T asymptotic_bessel_y_large_x_2(T v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T asymptotic_bessel_y_large_x_2(T v, T x, const Policy& pol)
 {
    // See A&S 9.2.19.
    BOOST_MATH_STD_USING
    // Get the phase and amplitude:
    T ampl = asymptotic_bessel_amplitude(v, x);
+   if (0 == ampl)
+      return ampl;
    T phase = asymptotic_bessel_phase_mx(v, x);
    BOOST_MATH_INSTRUMENT_VARIABLE(ampl);
    BOOST_MATH_INSTRUMENT_VARIABLE(phase);
@@ -91,12 +96,14 @@ inline T asymptotic_bessel_y_large_x_2(T v, T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-inline T asymptotic_bessel_j_large_x_2(T v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T asymptotic_bessel_j_large_x_2(T v, T x, const Policy& pol)
 {
    // See A&S 9.2.19.
    BOOST_MATH_STD_USING
    // Get the phase and amplitude:
    T ampl = asymptotic_bessel_amplitude(v, x);
+   if (0 == ampl) 
+      return ampl;  // shortcut.
    T phase = asymptotic_bessel_phase_mx(v, x);
    BOOST_MATH_INSTRUMENT_VARIABLE(ampl);
    BOOST_MATH_INSTRUMENT_VARIABLE(phase);
@@ -120,7 +127,7 @@ inline T asymptotic_bessel_j_large_x_2(T v, T x, const Policy& pol)
 }
 
 template <class T>
-inline bool asymptotic_bessel_large_x_limit(int v, const T& x)
+BOOST_MATH_GPU_ENABLED inline bool asymptotic_bessel_large_x_limit(int v, const T& x)
 {
    BOOST_MATH_STD_USING
       //
@@ -138,7 +145,7 @@ inline bool asymptotic_bessel_large_x_limit(int v, const T& x)
 }
 
 template <class T>
-inline bool asymptotic_bessel_large_x_limit(const T& v, const T& x)
+BOOST_MATH_GPU_ENABLED inline bool asymptotic_bessel_large_x_limit(const T& v, const T& x)
 {
    BOOST_MATH_STD_USING
    //
@@ -151,11 +158,11 @@ inline bool asymptotic_bessel_large_x_limit(const T& v, const T& x)
    // error rates either side of the divide for v < 10000.
    // At double precision eps^1/8 ~= 0.01.
    //
-   return (std::max)(T(fabs(v)), T(1)) < x * sqrt(tools::forth_root_epsilon<T>());
+   return BOOST_MATH_GPU_SAFE_MAX(T(fabs(v)), T(1)) < x * sqrt(tools::forth_root_epsilon<T>());
 }
 
 template <class T, class Policy>
-void temme_asymptotic_y_small_x(T v, T x, T* Y, T* Y1, const Policy& pol)
+BOOST_MATH_GPU_ENABLED void temme_asymptotic_y_small_x(T v, T x, T* Y, T* Y1, const Policy& pol)
 {
    T c = 1;
    T p = (v / boost::math::sin_pi(v, pol)) * pow(x / 2, -v) / boost::math::tgamma(1 - v, pol);
@@ -189,7 +196,7 @@ void temme_asymptotic_y_small_x(T v, T x, T* Y, T* Y1, const Policy& pol)
 }
 
 template <class T, class Policy>
-T asymptotic_bessel_i_large_x(T v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T asymptotic_bessel_i_large_x(T v, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // ADL of std names
    T s = 1;
diff --git a/inst/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp b/inst/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp
index 8914e2c3f..d7bb64f8c 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_jy_derivatives_series.hpp
@@ -147,6 +147,7 @@ inline T bessel_y_derivative_small_z_series(T v, T x, const Policy& pol)
    T p = log(x / 2);
    T scale = 1;
    bool need_logs = (v >= boost::math::max_factorial<T>::value) || (boost::math::tools::log_max_value<T>() / v < fabs(p));
+
    if (!need_logs)
    {
       gam = boost::math::tgamma(v, pol);
@@ -204,7 +205,9 @@ inline T bessel_y_derivative_small_z_series(T v, T x, const Policy& pol)
    T b = boost::math::tools::sum_series(s2, boost::math::policies::get_epsilon<T, Policy>(), max_iter);
 
    result += scale * prefix * b;
-   return result;
+   if(scale * tools::max_value<T>() < result)
+      return boost::math::policies::raise_overflow_error<T>(function, nullptr, pol);
+   return result / scale;
 }
 
 // Calculating of BesselY'(v,x) with small x (x < epsilon) and integer x using derivatives
diff --git a/inst/include/boost/math/special_functions/detail/bessel_jy_series.hpp b/inst/include/boost/math/special_functions/detail/bessel_jy_series.hpp
index a5fc7b832..5c083f348 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_jy_series.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_jy_series.hpp
@@ -10,10 +10,9 @@
 #pragma once
 #endif
 
-#include <cmath>
-#include <cstdint>
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/cstdint.hpp>
 
 namespace boost { namespace math { namespace detail{
 
@@ -22,7 +21,7 @@ struct bessel_j_small_z_series_term
 {
    typedef T result_type;
 
-   bessel_j_small_z_series_term(T v_, T x)
+   BOOST_MATH_GPU_ENABLED bessel_j_small_z_series_term(T v_, T x)
       : N(0), v(v_)
    {
       BOOST_MATH_STD_USING
@@ -30,7 +29,7 @@ struct bessel_j_small_z_series_term
       mult *= -mult;
       term = 1;
    }
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T r = term;
       ++N;
@@ -49,7 +48,7 @@ struct bessel_j_small_z_series_term
 // Converges rapidly for all z << v.
 //
 template <class T, class Policy>
-inline T bessel_j_small_z_series(T v, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T bessel_j_small_z_series(T v, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    T prefix;
@@ -66,7 +65,7 @@ inline T bessel_j_small_z_series(T v, T x, const Policy& pol)
       return prefix;
 
    bessel_j_small_z_series_term<T, Policy> s(v, x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    T result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter);
 
@@ -79,7 +78,7 @@ struct bessel_y_small_z_series_term_a
 {
    typedef T result_type;
 
-   bessel_y_small_z_series_term_a(T v_, T x)
+   BOOST_MATH_GPU_ENABLED bessel_y_small_z_series_term_a(T v_, T x)
       : N(0), v(v_)
    {
       BOOST_MATH_STD_USING
@@ -87,7 +86,7 @@ struct bessel_y_small_z_series_term_a
       mult *= -mult;
       term = 1;
    }
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       BOOST_MATH_STD_USING
       T r = term;
@@ -107,7 +106,7 @@ struct bessel_y_small_z_series_term_b
 {
    typedef T result_type;
 
-   bessel_y_small_z_series_term_b(T v_, T x)
+   BOOST_MATH_GPU_ENABLED bessel_y_small_z_series_term_b(T v_, T x)
       : N(0), v(v_)
    {
       BOOST_MATH_STD_USING
@@ -115,7 +114,7 @@ struct bessel_y_small_z_series_term_b
       mult *= -mult;
       term = 1;
    }
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T r = term;
       ++N;
@@ -138,15 +137,16 @@ struct bessel_y_small_z_series_term_b
 // eps/2 * v^v(x/2)^-v > (x/2)^v or log(eps/2) > v log((x/2)^2/v)
 //
 template <class T, class Policy>
-inline T bessel_y_small_z_series(T v, T x, T* pscale, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T bessel_y_small_z_series(T v, T x, T* pscale, const Policy& pol)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "bessel_y_small_z_series<%1%>(%1%,%1%)";
+   constexpr auto function = "bessel_y_small_z_series<%1%>(%1%,%1%)";
    T prefix;
    T gam;
    T p = log(x / 2);
    T scale = 1;
    bool need_logs = (v >= max_factorial<T>::value) || (tools::log_max_value<T>() / v < fabs(p));
+
    if(!need_logs)
    {
       gam = boost::math::tgamma(v, pol);
@@ -155,10 +155,13 @@ inline T bessel_y_small_z_series(T v, T x, T* pscale, const Policy& pol)
       {
          scale /= gam;
          gam = 1;
+         /*
+         * We can never get here, it would require p < 1/max_value.
          if(tools::max_value<T>() * p < gam)
          {
             return -policies::raise_overflow_error<T>(function, nullptr, pol);
          }
+         */
       }
       prefix = -gam / (constants::pi<T>() * p);
    }
@@ -179,7 +182,7 @@ inline T bessel_y_small_z_series(T v, T x, T* pscale, const Policy& pol)
       prefix = -exp(prefix);
    }
    bessel_y_small_z_series_term_a<T, Policy> s(v, x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
    *pscale = scale;
 
    T result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter);
@@ -207,7 +210,7 @@ inline T bessel_y_small_z_series(T v, T x, T* pscale, const Policy& pol)
 }
 
 template <class T, class Policy>
-T bessel_yn_small_z(int n, T z, T* scale, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T bessel_yn_small_z(int n, T z, T* scale, const Policy& pol)
 {
    //
    // See http://functions.wolfram.com/Bessel-TypeFunctions/BesselY/06/01/04/01/02/
@@ -243,14 +246,15 @@ T bessel_yn_small_z(int n, T z, T* scale, const Policy& pol)
       #endif
       
       T result = -((boost::math::factorial<T>(n - 1, pol) / constants::pi<T>()));
-      if(p * tools::max_value<T>() < result)
+      if(p * tools::max_value<T>() < fabs(result))
       {
          T div = tools::max_value<T>() / 8;
          result /= div;
          *scale /= div;
          if(p * tools::max_value<T>() < result)
          {
-            return -policies::raise_overflow_error<T>("bessel_yn_small_z<%1%>(%1%,%1%)", nullptr, pol);
+            // Impossible to get here??
+            return -policies::raise_overflow_error<T>("bessel_yn_small_z<%1%>(%1%,%1%)", nullptr, pol); // LCOV_EXCL_LINE
          }
       }
       return result / p;
diff --git a/inst/include/boost/math/special_functions/detail/bessel_jy_zero.hpp b/inst/include/boost/math/special_functions/detail/bessel_jy_zero.hpp
index 18981a074..15671c0df 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_jy_zero.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_jy_zero.hpp
@@ -18,19 +18,30 @@
 #ifndef BOOST_MATH_BESSEL_JY_ZERO_2013_01_18_HPP_
   #define BOOST_MATH_BESSEL_JY_ZERO_2013_01_18_HPP_
 
-  #include <algorithm>
+  #include <boost/math/tools/config.hpp>
+  #include <boost/math/tools/tuple.hpp>
+  #include <boost/math/tools/precision.hpp>
+  #include <boost/math/tools/cstdint.hpp>
+  #include <boost/math/tools/roots.hpp>
   #include <boost/math/constants/constants.hpp>
-  #include <boost/math/special_functions/math_fwd.hpp>
   #include <boost/math/special_functions/cbrt.hpp>
   #include <boost/math/special_functions/detail/airy_ai_bi_zero.hpp>
 
+  #ifndef BOOST_MATH_HAS_NVRTC
+  #include <boost/math/special_functions/math_fwd.hpp>
+  #endif
+
+  #ifdef BOOST_MATH_ENABLE_CUDA
+  #  pragma nv_diag_suppress 20012
+  #endif
+
   namespace boost { namespace math {
   namespace detail
   {
     namespace bessel_zero
     {
       template<class T>
-      T equation_nist_10_21_19(const T& v, const T& a)
+      BOOST_MATH_GPU_ENABLED T equation_nist_10_21_19(const T& v, const T& a)
       {
         // Get the initial estimate of the m'th root of Jv or Yv.
         // This subroutine is used for the order m with m > 1.
@@ -57,11 +68,11 @@
       class equation_as_9_3_39_and_its_derivative
       {
       public:
-        explicit equation_as_9_3_39_and_its_derivative(const T& zt) : zeta(zt) { }
+        BOOST_MATH_GPU_ENABLED explicit equation_as_9_3_39_and_its_derivative(const T& zt) : zeta(zt) { }
 
-        equation_as_9_3_39_and_its_derivative(const equation_as_9_3_39_and_its_derivative&) = default;
+        BOOST_MATH_GPU_ENABLED equation_as_9_3_39_and_its_derivative(const equation_as_9_3_39_and_its_derivative&) = default;
 
-        boost::math::tuple<T, T> operator()(const T& z) const
+        BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T> operator()(const T& z) const
         {
           BOOST_MATH_STD_USING // ADL of std names, needed for acos, sqrt.
 
@@ -86,7 +97,7 @@
       };
 
       template<class T, class Policy>
-      static T equation_as_9_5_26(const T& v, const T& ai_bi_root, const Policy& pol)
+      BOOST_MATH_GPU_ENABLED T equation_as_9_5_26(const T& v, const T& ai_bi_root, const Policy& pol)
       {
         BOOST_MATH_STD_USING // ADL of std names, needed for log, sqrt.
 
@@ -132,9 +143,9 @@
 
         // Select the maximum allowed iterations based on the number
         // of decimal digits in the numeric type T, being at least 12.
-        const auto iterations_allowed = static_cast<std::uintmax_t>((std::max)(12, my_digits10 * 2));
+        const auto iterations_allowed = static_cast<boost::math::uintmax_t>(BOOST_MATH_GPU_SAFE_MAX(12, my_digits10 * 2));
 
-        std::uintmax_t iterations_used = iterations_allowed;
+        boost::math::uintmax_t iterations_used = iterations_allowed;
 
         // Calculate the root of z as a function of zeta.
         const T z = boost::math::tools::newton_raphson_iterate(
@@ -142,7 +153,7 @@
           z_estimate,
           range_zmin,
           range_zmax,
-          (std::min)(boost::math::tools::digits<T>(), boost::math::tools::digits<float>()),
+          BOOST_MATH_GPU_SAFE_MIN(boost::math::tools::digits<T>(), boost::math::tools::digits<float>()),
           iterations_used);
 
         static_cast<void>(iterations_used);
@@ -168,7 +179,7 @@
       namespace cyl_bessel_j_zero_detail
       {
         template<class T, class Policy>
-        T equation_nist_10_21_40_a(const T& v, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED T equation_nist_10_21_40_a(const T& v, const Policy& pol)
         {
           const T v_pow_third(boost::math::cbrt(v, pol));
           const T v_pow_minus_two_thirds(T(1) / (v_pow_third * v_pow_third));
@@ -185,13 +196,13 @@
         class function_object_jv
         {
         public:
-          function_object_jv(const T& v,
+          BOOST_MATH_GPU_ENABLED function_object_jv(const T& v,
                              const Policy& pol) : my_v(v),
                                                   my_pol(pol) { }
 
-          function_object_jv(const function_object_jv&) = default;
+          BOOST_MATH_GPU_ENABLED function_object_jv(const function_object_jv&) = default;
 
-          T operator()(const T& x) const
+          BOOST_MATH_GPU_ENABLED T operator()(const T& x) const
           {
             return boost::math::cyl_bessel_j(my_v, x, my_pol);
           }
@@ -206,15 +217,16 @@
         class function_object_jv_and_jv_prime
         {
         public:
-          function_object_jv_and_jv_prime(const T& v,
-                                          const bool order_is_zero,
-                                          const Policy& pol) : my_v(v),
+          BOOST_MATH_GPU_ENABLED function_object_jv_and_jv_prime(
+                                                         const T& v,
+                                                         const bool order_is_zero,
+                                                         const Policy& pol) : my_v(v),
                                                                my_order_is_zero(order_is_zero),
                                                                my_pol(pol) { }
 
           function_object_jv_and_jv_prime(const function_object_jv_and_jv_prime&) = default;
 
-          boost::math::tuple<T, T> operator()(const T& x) const
+          BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T> operator()(const T& x) const
           {
             // Obtain Jv(x) and Jv'(x).
             // Chris's original code called the Bessel function implementation layer direct, 
@@ -246,10 +258,10 @@
           const function_object_jv_and_jv_prime& operator=(const function_object_jv_and_jv_prime&) = delete;
         };
 
-        template<class T> bool my_bisection_unreachable_tolerance(const T&, const T&) { return false; }
+        template<class T> BOOST_MATH_GPU_ENABLED bool my_bisection_unreachable_tolerance(const T&, const T&) { return false; }
 
         template<class T, class Policy>
-        T initial_guess(const T& v, const int m, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED T initial_guess(const T& v, const int m, const Policy& pol)
         {
           BOOST_MATH_STD_USING // ADL of std names, needed for floor.
 
@@ -315,7 +327,7 @@
                 }
                 else
                 {
-                  root_lo *= 0.75F;
+                  root_lo *= 0.75F; // LCOV_EXCL_LINE probably unreachable, but hard to prove?
                 }
               }
             }
@@ -325,7 +337,7 @@
             }
 
             // Perform several steps of bisection iteration to refine the guess.
-            std::uintmax_t number_of_iterations(12U);
+            boost::math::uintmax_t number_of_iterations(12U);
 
             // Do the bisection iteration.
             const boost::math::tuple<T, T> guess_pair =
@@ -390,7 +402,7 @@
       namespace cyl_neumann_zero_detail
       {
         template<class T, class Policy>
-        T equation_nist_10_21_40_b(const T& v, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED T equation_nist_10_21_40_b(const T& v, const Policy& pol)
         {
           const T v_pow_third(boost::math::cbrt(v, pol));
           const T v_pow_minus_two_thirds(T(1) / (v_pow_third * v_pow_third));
@@ -407,13 +419,13 @@
         class function_object_yv
         {
         public:
-          function_object_yv(const T& v,
-                             const Policy& pol) : my_v(v),
-                                                  my_pol(pol) { }
+          BOOST_MATH_GPU_ENABLED function_object_yv(const T& v,
+                                                    const Policy& pol) : my_v(v),
+                                                                         my_pol(pol) { }
 
-          function_object_yv(const function_object_yv&) = default;
+          BOOST_MATH_GPU_ENABLED function_object_yv(const function_object_yv&) = default;
 
-          T operator()(const T& x) const
+          BOOST_MATH_GPU_ENABLED T operator()(const T& x) const
           {
             return boost::math::cyl_neumann(my_v, x, my_pol);
           }
@@ -428,13 +440,13 @@
         class function_object_yv_and_yv_prime
         {
         public:
-          function_object_yv_and_yv_prime(const T& v,
-                                          const Policy& pol) : my_v(v),
-                                                               my_pol(pol) { }
+          BOOST_MATH_GPU_ENABLED function_object_yv_and_yv_prime(const T& v,
+                                                                 const Policy& pol) : my_v(v),
+                                                                                      my_pol(pol) { }
 
-          function_object_yv_and_yv_prime(const function_object_yv_and_yv_prime&) = default;
+          BOOST_MATH_GPU_ENABLED function_object_yv_and_yv_prime(const function_object_yv_and_yv_prime&) = default;
 
-          boost::math::tuple<T, T> operator()(const T& x) const
+          BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T> operator()(const T& x) const
           {
             const T half_epsilon(boost::math::tools::epsilon<T>() / 2U);
 
@@ -469,10 +481,10 @@
           const function_object_yv_and_yv_prime& operator=(const function_object_yv_and_yv_prime&) = delete;
         };
 
-        template<class T> bool my_bisection_unreachable_tolerance(const T&, const T&) { return false; }
+        template<class T> BOOST_MATH_GPU_ENABLED bool my_bisection_unreachable_tolerance(const T&, const T&) { return false; }
 
         template<class T, class Policy>
-        T initial_guess(const T& v, const int m, const Policy& pol)
+        BOOST_MATH_GPU_ENABLED T initial_guess(const T& v, const int m, const Policy& pol)
         {
           BOOST_MATH_STD_USING // ADL of std names, needed for floor.
 
@@ -537,7 +549,7 @@
                 }
                 else
                 {
-                  root_lo *= 0.75F;
+                  root_lo *= 0.75F; // LCOV_EXCL_LINE probably unreachable, but hard to prove?
                 }
               }
             }
@@ -560,7 +572,7 @@
             }
 
             // Perform several steps of bisection iteration to refine the guess.
-            std::uintmax_t number_of_iterations(12U);
+            boost::math::uintmax_t number_of_iterations(12U);
 
             // Do the bisection iteration.
             const boost::math::tuple<T, T> guess_pair =
@@ -624,4 +636,8 @@
     } // namespace bessel_zero
   } } } // namespace boost::math::detail
 
+  #ifdef BOOST_MATH_ENABLE_CUDA
+  #  pragma nv_diag_default 20012
+  #endif
+
 #endif // BOOST_MATH_BESSEL_JY_ZERO_2013_01_18_HPP_
diff --git a/inst/include/boost/math/special_functions/detail/bessel_k0.hpp b/inst/include/boost/math/special_functions/detail/bessel_k0.hpp
index f29ffa75c..bab202b6c 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_k0.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_k0.hpp
@@ -13,10 +13,14 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
-#include <boost/math/policies/error_handling.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -44,35 +48,37 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T>
-T bessel_k0(const T& x);
+BOOST_MATH_GPU_ENABLED T bessel_k0(const T& x);
 
 template <class T, class tag>
 struct bessel_k0_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          do_init(tag());
       }
-      static void do_init(const std::integral_constant<int, 113>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 113>&)
       {
          bessel_k0(T(0.5));
          bessel_k0(T(1.5));
       }
-      static void do_init(const std::integral_constant<int, 64>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
       {
          bessel_k0(T(0.5));
          bessel_k0(T(1.5));
       }
       template <class U>
-      static void do_init(const U&){}
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED static void do_init(const U&){}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
-   static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_STATIC const init initializer;
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -81,14 +87,14 @@ const typename bessel_k0_initializer<T, tag>::init bessel_k0_initializer<T, tag>
 
 
 template <typename T, int N>
-T bessel_k0_imp(const T&, const std::integral_constant<int, N>&)
+BOOST_MATH_GPU_ENABLED T bessel_k0_imp(const T&, const boost::math::integral_constant<int, N>&)
 {
    BOOST_MATH_ASSERT(0);
    return 0;
 }
 
 template <typename T>
-T bessel_k0_imp(const T& x, const std::integral_constant<int, 24>&)
+BOOST_MATH_GPU_ENABLED T bessel_k0_imp(const T& x, const boost::math::integral_constant<int, 24>&)
 {
    BOOST_MATH_STD_USING
    if(x <= 1)
@@ -97,14 +103,14 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 24>&)
       // Expected Error Term : -2.358e-09
       // Maximum Relative Change in Control Points : 9.552e-02
       // Max Error found at float precision = Poly : 4.448220e-08
-      static const T Y = 1.137250900268554688f;
-      static const T P[] = 
+      BOOST_MATH_STATIC const T Y = 1.137250900268554688f;
+      BOOST_MATH_STATIC const T P[] = 
       {
          -1.372508979104259711e-01f,
          2.622545986273687617e-01f,
          5.047103728247919836e-03f
       };
-      static const T Q[] = 
+      BOOST_MATH_STATIC const T Q[] = 
       {
          1.000000000000000000e+00f,
          -8.928694018000029415e-02f,
@@ -117,7 +123,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 24>&)
       // Expected Error Term : -1.343e-09
       // Maximum Relative Change in Control Points : 2.405e-02
       // Max Error found at float precision = Poly : 1.354814e-07
-      static const T P2[] = {
+      BOOST_MATH_STATIC const T P2[] = {
          1.159315158e-01f,
          2.789828686e-01f,
          2.524902861e-02f,
@@ -133,14 +139,14 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 24>&)
       // Maximum Relative Change in Control Points : 9.064e-02
       // Max Error found at float precision = Poly : 5.065020e-08
 
-      static const T P[] =
+      BOOST_MATH_STATIC const T P[] =
       {
          2.533141220e-01f,
          5.221502603e-01f,
          6.380180669e-02f,
          -5.934976547e-02f
       };
-      static const T Q[] =
+      BOOST_MATH_STATIC const T Q[] =
       {
          1.000000000e+00f,
          2.679722431e+00f,
@@ -158,7 +164,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 24>&)
 }
 
 template <typename T>
-T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
+BOOST_MATH_GPU_ENABLED T bessel_k0_imp(const T& x, const boost::math::integral_constant<int, 53>&)
 {
    BOOST_MATH_STD_USING
    if(x <= 1)
@@ -167,8 +173,8 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
       // Expected Error Term : -6.077e-17
       // Maximum Relative Change in Control Points : 7.797e-02
       // Max Error found at double precision = Poly : 1.003156e-16
-      static const T Y = 1.137250900268554688;
-      static const T P[] =
+      BOOST_MATH_STATIC const T Y = 1.137250900268554688;
+      BOOST_MATH_STATIC const T P[] =
       {
          -1.372509002685546267e-01,
          2.574916117833312855e-01,
@@ -176,7 +182,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
          5.445476986653926759e-04,
          7.125159422136622118e-06
       };
-      static const T Q[] =
+      BOOST_MATH_STATIC const T Q[] =
       {
          1.000000000000000000e+00,
          -5.458333438017788530e-02,
@@ -191,7 +197,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
       // Expected Error Term : 3.392e-18
       // Maximum Relative Change in Control Points : 2.041e-02
       // Max Error found at double precision = Poly : 2.513112e-16
-      static const T P2[] =
+      BOOST_MATH_STATIC const T P2[] =
       {
          1.159315156584124484e-01,
          2.789828789146031732e-01,
@@ -212,8 +218,8 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
       // Maximum Relative Change in Control Points : 2.757e-01
       // Max Error found at double precision = Poly : 1.001560e-16
 
-      static const T Y = 1;
-      static const T P[] =
+      BOOST_MATH_STATIC const T Y = 1;
+      BOOST_MATH_STATIC const T P[] =
       {
          2.533141373155002416e-01,
          3.628342133984595192e+00,
@@ -225,7 +231,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
          -1.414237994269995877e+00,
          -9.369168119754924625e-02
       };
-      static const T Q[] =
+      BOOST_MATH_STATIC const T Q[] =
       {
          1.000000000000000000e+00,
          1.494194694879908328e+01,
@@ -248,7 +254,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 53>&)
 }
 
 template <typename T>
-T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
+BOOST_MATH_GPU_ENABLED T bessel_k0_imp(const T& x, const boost::math::integral_constant<int, 64>&)
 {
    BOOST_MATH_STD_USING
       if(x <= 1)
@@ -257,8 +263,8 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
          // Expected Error Term : 2.180e-22
          // Maximum Relative Change in Control Points : 2.943e-01
          // Max Error found at float80 precision = Poly : 3.923207e-20
-         static const T Y = 1.137250900268554687500e+00;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.137250900268554687500e+00;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.372509002685546875002e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.566481981037407600436e-01),
@@ -267,7 +273,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.213747930378196492543e-05),
             BOOST_MATH_BIG_CONSTANT(T, 64, 9.423709328020389560844e-08)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.843828412587773008342e-02),
@@ -284,7 +290,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
          // Expected Error Term : -2.434e-21
          // Maximum Relative Change in Control Points : 2.459e-02
          // Max Error found at float80 precision = Poly : 1.482487e-19
-         static const T P2[] =
+         BOOST_MATH_STATIC const T P2[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.159315156584124488110e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.764832791416047889734e-01),
@@ -292,7 +298,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.660777862036966089410e-04),
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.094942446930673386849e-06)
          };
-         static const T Q2[] =
+         BOOST_MATH_STATIC const T Q2[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, -2.156100313881251616320e-02),
@@ -308,8 +314,8 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
          // Expected Error Term : 2.236e-21
          // Maximum Relative Change in Control Points : 3.021e-01
          //Max Error found at float80 precision = Poly : 8.727378e-20
-         static const T Y = 1;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.533141373155002512056e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, 5.417942070721928652715e+00),
@@ -323,7 +329,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.059789241612946683713e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.612783121537333908889e-01)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.200669254769325861404e+01),
@@ -348,7 +354,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 64>&)
 }
 
 template <typename T>
-T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
+BOOST_MATH_GPU_ENABLED T bessel_k0_imp(const T& x, const boost::math::integral_constant<int, 113>&)
 {
    BOOST_MATH_STD_USING
       if(x <= 1)
@@ -357,8 +363,8 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
          // Expected Error Term : 5.682e-37
          // Maximum Relative Change in Control Points : 6.094e-04
          // Max Error found at float128 precision = Poly : 5.338213e-35
-         static const T Y = 1.137250900268554687500000000000000000e+00f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.137250900268554687500000000000000000e+00f;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, -1.372509002685546875000000000000000006e-01),
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.556212905071072782462974351698081303e-01),
@@ -369,7 +375,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.752489221949580551692915881999762125e-09),
             BOOST_MATH_BIG_CONSTANT(T, 113, 5.243010555737173524710512824955368526e-12)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.000000000000000000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, -4.095631064064621099785696980653193721e-02),
@@ -387,7 +393,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
          // Expected Error Term : 5.105e-38
          // Maximum Relative Change in Control Points : 9.734e-03
          // Max Error found at float128 precision = Poly : 1.688806e-34
-         static const T P2[] =
+         BOOST_MATH_STATIC const T P2[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.159315156584124488107200313757741370e-01),
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.789828789146031122026800078439435369e-01),
@@ -413,8 +419,8 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
          // Expected Error Term : 4.917e-40
          // Maximum Relative Change in Control Points : 3.385e-01
          // Max Error found at float128 precision = Poly : 1.567573e-34
-         static const T Y = 1;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.533141373155002512078826424055226265e-01),
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.001949740768235770078339977110749204e+01),
@@ -439,7 +445,7 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
             BOOST_MATH_BIG_CONSTANT(T, 113, -4.201632288615609937883545928660649813e+03),
             BOOST_MATH_BIG_CONSTANT(T, 113, -3.690820607338480548346746717311811406e+01)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.000000000000000000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, 7.964877874035741452203497983642653107e+01),
@@ -475,33 +481,33 @@ T bessel_k0_imp(const T& x, const std::integral_constant<int, 113>&)
 }
 
 template <typename T>
-T bessel_k0_imp(const T& x, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED T bessel_k0_imp(const T& x, const boost::math::integral_constant<int, 0>&)
 {
    if(boost::math::tools::digits<T>() <= 24)
-      return bessel_k0_imp(x, std::integral_constant<int, 24>());
+      return bessel_k0_imp(x, boost::math::integral_constant<int, 24>());
    else if(boost::math::tools::digits<T>() <= 53)
-      return bessel_k0_imp(x, std::integral_constant<int, 53>());
+      return bessel_k0_imp(x, boost::math::integral_constant<int, 53>());
    else if(boost::math::tools::digits<T>() <= 64)
-      return bessel_k0_imp(x, std::integral_constant<int, 64>());
+      return bessel_k0_imp(x, boost::math::integral_constant<int, 64>());
    else if(boost::math::tools::digits<T>() <= 113)
-      return bessel_k0_imp(x, std::integral_constant<int, 113>());
+      return bessel_k0_imp(x, boost::math::integral_constant<int, 113>());
    BOOST_MATH_ASSERT(0);
    return 0;
 }
 
 template <typename T>
-inline T bessel_k0(const T& x)
+BOOST_MATH_GPU_ENABLED inline T bessel_k0(const T& x)
 {
-   typedef std::integral_constant<int,
-      ((std::numeric_limits<T>::digits == 0) || (std::numeric_limits<T>::radix != 2)) ?
+   typedef boost::math::integral_constant<int,
+      ((boost::math::numeric_limits<T>::digits == 0) || (boost::math::numeric_limits<T>::radix != 2)) ?
       0 :
-      std::numeric_limits<T>::digits <= 24 ?
+      boost::math::numeric_limits<T>::digits <= 24 ?
       24 :
-      std::numeric_limits<T>::digits <= 53 ?
+      boost::math::numeric_limits<T>::digits <= 53 ?
       53 :
-      std::numeric_limits<T>::digits <= 64 ?
+      boost::math::numeric_limits<T>::digits <= 64 ?
       64 :
-      std::numeric_limits<T>::digits <= 113 ?
+      boost::math::numeric_limits<T>::digits <= 113 ?
       113 : -1
    > tag_type;
 
diff --git a/inst/include/boost/math/special_functions/detail/bessel_k1.hpp b/inst/include/boost/math/special_functions/detail/bessel_k1.hpp
index bd37f9021..49846dc8c 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_k1.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_k1.hpp
@@ -13,6 +13,10 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
 #include <boost/math/policies/error_handling.hpp>
@@ -44,36 +48,38 @@
 namespace boost { namespace math { namespace detail{
 
    template <typename T>
-   T bessel_k1(const T&);
+   BOOST_MATH_GPU_ENABLED T bessel_k1(const T&);
 
    template <class T, class tag>
    struct bessel_k1_initializer
    {
       struct init
       {
-         init()
+         BOOST_MATH_GPU_ENABLED init()
          {
             do_init(tag());
          }
-         static void do_init(const std::integral_constant<int, 113>&)
+         BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 113>&)
          {
             bessel_k1(T(0.5));
             bessel_k1(T(2));
             bessel_k1(T(6));
          }
-         static void do_init(const std::integral_constant<int, 64>&)
+         BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
          {
             bessel_k1(T(0.5));
             bessel_k1(T(6));
          }
          template <class U>
-         static void do_init(const U&) {}
-         void force_instantiate()const {}
+         BOOST_MATH_GPU_ENABLED static void do_init(const U&) {}
+         BOOST_MATH_GPU_ENABLED void force_instantiate()const {}
       };
-      static const init initializer;
-      static void force_instantiate()
+      BOOST_MATH_STATIC const init initializer;
+      BOOST_MATH_GPU_ENABLED static void force_instantiate()
       {
+         #ifndef BOOST_MATH_HAS_GPU_SUPPORT
          initializer.force_instantiate();
+         #endif
       }
    };
 
@@ -82,14 +88,14 @@ namespace boost { namespace math { namespace detail{
 
 
    template <typename T, int N>
-   inline T bessel_k1_imp(const T&, const std::integral_constant<int, N>&)
+   inline BOOST_MATH_GPU_ENABLED T bessel_k1_imp(const T&, const boost::math::integral_constant<int, N>&)
    {
       BOOST_MATH_ASSERT(0);
       return 0;
    }
 
    template <typename T>
-   T bessel_k1_imp(const T& x, const std::integral_constant<int, 24>&)
+   BOOST_MATH_GPU_ENABLED T bessel_k1_imp(const T& x, const boost::math::integral_constant<int, 24>&)
    {
       BOOST_MATH_STD_USING
       if(x <= 1)
@@ -98,14 +104,14 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : -3.053e-12
          // Maximum Relative Change in Control Points : 4.927e-02
          // Max Error found at float precision = Poly : 7.918347e-10
-         static const T Y = 8.695471287e-02f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 8.695471287e-02f;
+         BOOST_MATH_STATIC const T P[] =
          {
             -3.621379531e-03f,
             7.131781976e-03f,
             -1.535278300e-05f
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             1.000000000e+00f,
             -5.173102701e-02f,
@@ -118,7 +124,7 @@ namespace boost { namespace math { namespace detail{
          // Maximum Deviation Found:                     3.556e-08
          // Expected Error Term : -3.541e-08
          // Maximum Relative Change in Control Points : 8.203e-02
-         static const T P2[] =
+         BOOST_MATH_STATIC const T P2[] =
          {
             -3.079657469e-01f,
             -8.537108913e-02f,
@@ -134,15 +140,15 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : -3.227e-08
          // Maximum Relative Change in Control Points : 9.917e-02
          // Max Error found at float precision = Poly : 6.084411e-08
-         static const T Y = 1.450342178f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.450342178f;
+         BOOST_MATH_STATIC const T P[] =
          {
             -1.970280088e-01f,
             2.188747807e-02f,
             7.270394756e-01f,
             2.490678196e-01f
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             1.000000000e+00f,
             2.274292882e+00f,
@@ -160,7 +166,7 @@ namespace boost { namespace math { namespace detail{
    }
 
    template <typename T>
-   T bessel_k1_imp(const T& x, const std::integral_constant<int, 53>&)
+   BOOST_MATH_GPU_ENABLED T bessel_k1_imp(const T& x, const boost::math::integral_constant<int, 53>&)
    {
       BOOST_MATH_STD_USING
       if(x <= 1)
@@ -169,15 +175,15 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : 1.921e-17
          // Maximum Relative Change in Control Points : 5.287e-03
          // Max Error found at double precision = Poly : 2.004747e-17
-         static const T Y = 8.69547128677368164e-02f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 8.69547128677368164e-02f;
+         BOOST_MATH_STATIC const T P[] =
          {
             -3.62137953440350228e-03,
             7.11842087490330300e-03,
             1.00302560256614306e-05,
             1.77231085381040811e-06
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             1.00000000000000000e+00,
             -4.80414794429043831e-02,
@@ -193,14 +199,14 @@ namespace boost { namespace math { namespace detail{
          // Maximum Relative Change in Control Points : 3.103e-04
          // Max Error found at double precision = Poly : 1.246698e-16
 
-         static const T P2[] =
+         BOOST_MATH_STATIC const T P2[] =
          {
             -3.07965757829206184e-01,
             -7.80929703673074907e-02,
             -2.70619343754051620e-03,
             -2.49549522229072008e-05
          };
-         static const T Q2[] = 
+         BOOST_MATH_STATIC const T Q2[] = 
          {
             1.00000000000000000e+00,
             -2.36316836412163098e-02,
@@ -217,8 +223,8 @@ namespace boost { namespace math { namespace detail{
          // Maximum Relative Change in Control Points : 2.786e-01
          // Max Error found at double precision = Poly : 1.258798e-16
 
-         static const T Y = 1.45034217834472656f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.45034217834472656f;
+         BOOST_MATH_STATIC const T P[] =
          {
             -1.97028041029226295e-01,
             -2.32408961548087617e+00,
@@ -230,7 +236,7 @@ namespace boost { namespace math { namespace detail{
             6.62582288933739787e+00,
             3.08851840645286691e-01
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             1.00000000000000000e+00,
             1.41811409298826118e+01,
@@ -253,7 +259,7 @@ namespace boost { namespace math { namespace detail{
    }
 
    template <typename T>
-   T bessel_k1_imp(const T& x, const std::integral_constant<int, 64>&)
+   BOOST_MATH_GPU_ENABLED T bessel_k1_imp(const T& x, const boost::math::integral_constant<int, 64>&)
    {
       BOOST_MATH_STD_USING
       if(x <= 1)
@@ -262,8 +268,8 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : -5.548e-23
          // Maximum Relative Change in Control Points : 2.002e-03
          // Max Error found at float80 precision = Poly : 9.352785e-22
-         static const T Y = 8.695471286773681640625e-02f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 8.695471286773681640625e-02f;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, -3.621379534403483072861e-03),
             BOOST_MATH_BIG_CONSTANT(T, 64, 7.102135866103952705932e-03),
@@ -271,7 +277,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.537484002571894870830e-06),
             BOOST_MATH_BIG_CONSTANT(T, 64, 6.603228256820000135990e-09)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.354457194045068370363e-02),
@@ -287,7 +293,7 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : 1.995e-23
          // Maximum Relative Change in Control Points : 8.174e-04
          // Max Error found at float80 precision = Poly : 4.137325e-20
-         static const T P2[] =
+         BOOST_MATH_STATIC const T P2[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, -3.079657578292062244054e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -7.963049154965966503231e-02),
@@ -295,7 +301,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.023052834702215699504e-05),
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.719459155018493821839e-07)
          };
-         static const T Q2[] = 
+         BOOST_MATH_STATIC const T Q2[] = 
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.863917670410152669768e-02),
@@ -312,8 +318,8 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : -3.302e-21
          // Maximum Relative Change in Control Points : 3.432e-01
          // Max Error found at float80 precision = Poly : 1.083755e-19
-         static const T Y = 1.450342178344726562500e+00f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.450342178344726562500e+00f;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, -1.970280410292263112917e-01),
             BOOST_MATH_BIG_CONSTANT(T, 64, -4.058564803062959169322e+00),
@@ -328,7 +334,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 64, 4.319614662598089438939e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.710715864316521856193e-02)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 64, 2.298433045824439052398e+01),
@@ -353,7 +359,7 @@ namespace boost { namespace math { namespace detail{
    }
 
    template <typename T>
-   T bessel_k1_imp(const T& x, const std::integral_constant<int, 113>&)
+   BOOST_MATH_GPU_ENABLED T bessel_k1_imp(const T& x, const boost::math::integral_constant<int, 113>&)
    {
       BOOST_MATH_STD_USING
       if(x <= 1)
@@ -362,8 +368,8 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : -7.119e-35
          // Maximum Relative Change in Control Points : 1.207e-03
          // Max Error found at float128 precision = Poly : 7.143688e-35
-         static const T Y = 8.695471286773681640625000000000000000e-02f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 8.695471286773681640625000000000000000e-02f;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, -3.621379534403483072916666666666595475e-03),
             BOOST_MATH_BIG_CONSTANT(T, 113, 7.074117676930975433219826471336547627e-03),
@@ -373,7 +379,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.347140307321161346703214099534250263e-10),
             BOOST_MATH_BIG_CONSTANT(T, 113, 5.569608494081482873946791086435679661e-13)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.000000000000000000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, -3.580768910152105375615558920428350204e-02),
@@ -391,7 +397,7 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : 4.473e-37
          // Maximum Relative Change in Control Points : 8.550e-04
          // Max Error found at float128 precision = Poly : 8.167701e-35
-         static const T P2[] =
+         BOOST_MATH_STATIC const T P2[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, -3.079657578292062244053600156878870690e-01),
             BOOST_MATH_BIG_CONSTANT(T, 113, -8.133183745732467770755578848987414875e-02),
@@ -401,7 +407,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 113, -1.632502325880313239698965376754406011e-09),
             BOOST_MATH_BIG_CONSTANT(T, 113, -2.311973065898784812266544485665624227e-12)
          };
-         static const T Q2[] = 
+         BOOST_MATH_STATIC const T Q2[] = 
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.000000000000000000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, -1.311471216733781016657962995723287450e-02),
@@ -418,8 +424,8 @@ namespace boost { namespace math { namespace detail{
       {
          // Max error in interpolated form: 5.307e-37
          // Max Error found at float128 precision = Poly: 7.087862e-35
-         static const T Y = 1.5023040771484375f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.5023040771484375f;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, -2.489899398329369710528254347931380044e-01),
             BOOST_MATH_BIG_CONSTANT(T, 113, -6.819080211203854781858815596508456873e+00),
@@ -438,7 +444,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.039705646510167437971862966128055524e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.008418100718254816100425022904039530e-02)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.000000000000000000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.927456835239137986889227412815459529e+01),
@@ -465,8 +471,8 @@ namespace boost { namespace math { namespace detail{
          // Expected Error Term : -6.565e-40
          // Maximum Relative Change in Control Points : 1.880e-01
          // Max Error found at float128 precision = Poly : 2.943572e-35
-         static const T Y = 1.308816909790039062500000000000000000f;
-         static const T P[] =
+         BOOST_MATH_STATIC const T Y = 1.308816909790039062500000000000000000f;
+         BOOST_MATH_STATIC const T P[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, -5.550277247453881129211735759447737350e-02),
             BOOST_MATH_BIG_CONSTANT(T, 113, -3.485883080219574328217554864956175929e+00),
@@ -486,7 +492,7 @@ namespace boost { namespace math { namespace detail{
             BOOST_MATH_BIG_CONSTANT(T, 113, 8.981057433937398731355768088809437625e+05),
             BOOST_MATH_BIG_CONSTANT(T, 113, 2.519440069856232098711793483639792952e+04)
          };
-         static const T Q[] =
+         BOOST_MATH_STATIC const T Q[] =
          {
             BOOST_MATH_BIG_CONSTANT(T, 113, 1.000000000000000000000000000000000000e+00),
             BOOST_MATH_BIG_CONSTANT(T, 113, 7.127348248283623146544565916604103560e+01),
@@ -517,33 +523,33 @@ namespace boost { namespace math { namespace detail{
     }
 
     template <typename T>
-    T bessel_k1_imp(const T& x, const std::integral_constant<int, 0>&)
+    BOOST_MATH_GPU_ENABLED T bessel_k1_imp(const T& x, const boost::math::integral_constant<int, 0>&)
     {
        if(boost::math::tools::digits<T>() <= 24)
-          return bessel_k1_imp(x, std::integral_constant<int, 24>());
+          return bessel_k1_imp(x, boost::math::integral_constant<int, 24>());
        else if(boost::math::tools::digits<T>() <= 53)
-          return bessel_k1_imp(x, std::integral_constant<int, 53>());
+          return bessel_k1_imp(x, boost::math::integral_constant<int, 53>());
        else if(boost::math::tools::digits<T>() <= 64)
-          return bessel_k1_imp(x, std::integral_constant<int, 64>());
+          return bessel_k1_imp(x, boost::math::integral_constant<int, 64>());
        else if(boost::math::tools::digits<T>() <= 113)
-          return bessel_k1_imp(x, std::integral_constant<int, 113>());
+          return bessel_k1_imp(x, boost::math::integral_constant<int, 113>());
        BOOST_MATH_ASSERT(0);
        return 0;
     }
 
-    template <typename T>
-   inline T bessel_k1(const T& x)
+   template <typename T>
+   inline BOOST_MATH_GPU_ENABLED T bessel_k1(const T& x)
    {
-      typedef std::integral_constant<int,
-         ((std::numeric_limits<T>::digits == 0) || (std::numeric_limits<T>::radix != 2)) ?
+      typedef boost::math::integral_constant<int,
+         ((boost::math::numeric_limits<T>::digits == 0) || (boost::math::numeric_limits<T>::radix != 2)) ?
          0 :
-         std::numeric_limits<T>::digits <= 24 ?
+         boost::math::numeric_limits<T>::digits <= 24 ?
          24 :
-         std::numeric_limits<T>::digits <= 53 ?
+         boost::math::numeric_limits<T>::digits <= 53 ?
          53 :
-         std::numeric_limits<T>::digits <= 64 ?
+         boost::math::numeric_limits<T>::digits <= 64 ?
          64 :
-         std::numeric_limits<T>::digits <= 113 ?
+         boost::math::numeric_limits<T>::digits <= 113 ?
          113 : -1
       > tag_type;
 
diff --git a/inst/include/boost/math/special_functions/detail/bessel_kn.hpp b/inst/include/boost/math/special_functions/detail/bessel_kn.hpp
index 9463ce161..41becc8aa 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_kn.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_kn.hpp
@@ -10,8 +10,12 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/detail/bessel_k0.hpp>
 #include <boost/math/special_functions/detail/bessel_k1.hpp>
+#include <boost/math/special_functions/sign.hpp>
 #include <boost/math/policies/error_handling.hpp>
 
 // Modified Bessel function of the second kind of integer order
@@ -20,23 +24,24 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T bessel_kn(int n, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T bessel_kn(int n, T x, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     T value, current, prev;
 
     using namespace boost::math::tools;
 
-    static const char* function = "boost::math::bessel_kn<%1%>(%1%,%1%)";
+    constexpr auto function = "boost::math::bessel_kn<%1%>(%1%,%1%)";
 
     if (x < 0)
     {
-       return policies::raise_domain_error<T>(function,
-            "Got x = %1%, but argument x must be non-negative, complex number result not supported.", x, pol);
+       return policies::raise_domain_error<T>(function, "Got x = %1%, but argument x must be non-negative, complex number result not supported.", x, pol);
     }
     if (x == 0)
     {
-       return policies::raise_overflow_error<T>(function, nullptr, pol);
+       return (n == 0) ? 
+          policies::raise_overflow_error<T>(function, nullptr, pol) 
+          : policies::raise_domain_error<T>(function, "Got x = %1%, but argument x must be positive, complex number result not supported.", x, pol);
     }
 
     if (n < 0)
@@ -73,8 +78,8 @@ T bessel_kn(int n, T x, const Policy& pol)
            ++k;
        }
        while(k < n);
-       if(tools::max_value<T>() * scale < fabs(value))
-          return sign(scale) * sign(value) * policies::raise_overflow_error<T>(function, nullptr, pol);
+       if (tools::max_value<T>() * scale < fabs(value))
+          return ((boost::math::signbit)(scale) ? -1 : 1) * sign(value) * policies::raise_overflow_error<T>(function, nullptr, pol);
        value /= scale;
     }
     return value;
diff --git a/inst/include/boost/math/special_functions/detail/bessel_y0.hpp b/inst/include/boost/math/special_functions/detail/bessel_y0.hpp
index 1ea348b05..f1aea6acb 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_y0.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_y0.hpp
@@ -12,6 +12,7 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/detail/bessel_j0.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/rational.hpp>
@@ -36,39 +37,12 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T bessel_y0(T x, const Policy&);
-
-template <class T, class Policy>
-struct bessel_y0_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init();
-      }
-      static void do_init()
-      {
-         bessel_y0(T(1), Policy());
-      }
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T, class Policy>
-const typename bessel_y0_initializer<T, Policy>::init bessel_y0_initializer<T, Policy>::initializer;
+BOOST_MATH_GPU_ENABLED T bessel_y0(T x, const Policy&);
 
 template <typename T, typename Policy>
-T bessel_y0(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T bessel_y0(T x, const Policy&)
 {
-    bessel_y0_initializer<T, Policy>::force_instantiate();
-
-    static const T P1[] = {
+    BOOST_MATH_STATIC const T P1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0723538782003176831e+11)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.3716255451260504098e+09)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.0422274357376619816e+08)),
@@ -76,7 +50,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0102532948020907590e+04)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.8402381979244993524e+01)),
     };
-    static const T Q1[] = {
+    BOOST_MATH_STATIC const T Q1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.8873865738997033405e+11)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.1617187777290363573e+09)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.5662956624278251596e+07)),
@@ -84,7 +58,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.6475986689240190091e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T P2[] = {
+    BOOST_MATH_STATIC const T P2[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -2.2213976967566192242e+13)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -5.5107435206722644429e+11)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.3600098638603061642e+10)),
@@ -93,7 +67,7 @@ T bessel_y0(T x, const Policy& pol)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.4566865832663635920e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.7427031242901594547e+01)),
     };
-    static const T Q2[] = {
+    BOOST_MATH_STATIC const T Q2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.3386146580707264428e+14)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.4266824419412347550e+12)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.4015103849971240096e+10)),
@@ -102,7 +76,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.3030857612070288823e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T P3[] = {
+    BOOST_MATH_STATIC const T P3[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.0728726905150210443e+15)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.7016641869173237784e+14)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.2829912364088687306e+11)),
@@ -112,7 +86,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1363534169313901632e+04)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.7439661319197499338e+01)),
     };
-    static const T Q3[] = {
+    BOOST_MATH_STATIC const T Q3[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.4563724628846457519e+17)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.9272425569640309819e+15)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.2598377924042897629e+13)),
@@ -122,7 +96,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.7903362168128450017e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T PC[] = {
+    BOOST_MATH_STATIC const T PC[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.2779090197304684302e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.1345386639580765797e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1170523380864944322e+04)),
@@ -130,7 +104,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.5376201909008354296e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.8961548424210455236e-01)),
     };
-    static const T QC[] = {
+    BOOST_MATH_STATIC const T QC[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.2779090197304684318e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.1370412495510416640e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1215350561880115730e+04)),
@@ -138,7 +112,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.5711159858080893649e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T PS[] = {
+    BOOST_MATH_STATIC const T PS[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.9226600200800094098e+01)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.8591953644342993800e+02)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.1183429920482737611e+02)),
@@ -146,7 +120,7 @@ T bessel_y0(T x, const Policy& pol)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.2441026745835638459e+00)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -8.8033303048680751817e-03)),
     };
-    static const T QS[] = {
+    BOOST_MATH_STATIC const T QS[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.7105024128512061905e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.1951131543434613647e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.2642780169211018836e+03)),
@@ -154,7 +128,7 @@ T bessel_y0(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 9.0593769594993125859e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.9357696627916752158e-01)),
+    BOOST_MATH_STATIC const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.9357696627916752158e-01)),
                    x2  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.9576784193148578684e+00)),
                    x3  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.0860510603017726976e+00)),
                    x11 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.280e+02)),
@@ -170,17 +144,8 @@ T bessel_y0(T x, const Policy& pol)
     using namespace boost::math::tools;
     using namespace boost::math::constants;
 
-    static const char* function = "boost::math::bessel_y0<%1%>(%1%,%1%)";
+    BOOST_MATH_ASSERT(x > 0);
 
-    if (x < 0)
-    {
-       return policies::raise_domain_error<T>(function,
-            "Got x = %1% but x must be non-negative, complex result not supported.", x, pol);
-    }
-    if (x == 0)
-    {
-       return -policies::raise_overflow_error<T>(function, nullptr, pol);
-    }
     if (x <= 3)                       // x in (0, 3]
     {
         T y = x * x;
diff --git a/inst/include/boost/math/special_functions/detail/bessel_y1.hpp b/inst/include/boost/math/special_functions/detail/bessel_y1.hpp
index b76878751..0f0dbdf3b 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_y1.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_y1.hpp
@@ -12,6 +12,7 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/detail/bessel_j1.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/rational.hpp>
@@ -36,39 +37,12 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T bessel_y1(T x, const Policy&);
-
-template <class T, class Policy>
-struct bessel_y1_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init();
-      }
-      static void do_init()
-      {
-         bessel_y1(T(1), Policy());
-      }
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T, class Policy>
-const typename bessel_y1_initializer<T, Policy>::init bessel_y1_initializer<T, Policy>::initializer;
+BOOST_MATH_GPU_ENABLED T bessel_y1(T x, const Policy&);
 
 template <typename T, typename Policy>
-T bessel_y1(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T bessel_y1(T x, const Policy&)
 {
-    bessel_y1_initializer<T, Policy>::force_instantiate();
-
-    static const T P1[] = {
+    BOOST_MATH_STATIC const T P1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.0535726612579544093e+13)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.4708611716525426053e+12)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.7595974497819597599e+11)),
@@ -77,7 +51,7 @@ T bessel_y1(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.2157953222280260820e+05)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -3.1714424660046133456e+02)),
     };
-    static const T Q1[] = {
+    BOOST_MATH_STATIC const T Q1[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.0737873921079286084e+14)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.1272286200406461981e+12)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.7800352738690585613e+10)),
@@ -86,7 +60,7 @@ T bessel_y1(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.2079908168393867438e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T P2[] = {
+    BOOST_MATH_STATIC const T P2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.1514276357909013326e+19)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -5.6808094574724204577e+18)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -2.3638408497043134724e+16)),
@@ -97,7 +71,7 @@ T bessel_y1(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.9153806858264202986e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.2337180442012953128e+03)),
     };
-    static const T Q2[] = {
+    BOOST_MATH_STATIC const T Q2[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.3321844313316185697e+20)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.6968198822857178911e+18)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.0837179548112881950e+16)),
@@ -108,7 +82,7 @@ T bessel_y1(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.2855164849321609336e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T PC[] = {
+    BOOST_MATH_STATIC const T PC[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -4.4357578167941278571e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -9.9422465050776411957e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -6.6033732483649391093e+06)),
@@ -117,7 +91,7 @@ T bessel_y1(T x, const Policy& pol)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.6116166443246101165e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.0)),
     };
-    static const T QC[] = {
+    BOOST_MATH_STATIC const T QC[] = {
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -4.4357578167941278568e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -9.9341243899345856590e+06)),
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -6.5853394797230870728e+06)),
@@ -126,7 +100,7 @@ T bessel_y1(T x, const Policy& pol)
         static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -1.4550094401904961825e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T PS[] = {
+    BOOST_MATH_STATIC const T PS[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.3220913409857223519e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.5145160675335701966e+04)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 6.6178836581270835179e+04)),
@@ -135,7 +109,7 @@ T bessel_y1(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3.5265133846636032186e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.0)),
     };
-    static const T QS[] = {
+    BOOST_MATH_STATIC const T QS[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 7.0871281941028743574e+05)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.8194580422439972989e+06)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.4194606696037208929e+06)),
@@ -144,7 +118,7 @@ T bessel_y1(T x, const Policy& pol)
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 8.6383677696049909675e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.0)),
     };
-    static const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1971413260310170351e+00)),
+    BOOST_MATH_STATIC const T x1  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.1971413260310170351e+00)),
                    x2  =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.4296810407941351328e+00)),
                    x11 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 5.620e+02)),
                    x12 =  static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1.8288260310170351490e-03)),
@@ -157,11 +131,8 @@ T bessel_y1(T x, const Policy& pol)
     using namespace boost::math::tools;
     using namespace boost::math::constants;
 
-    if (x <= 0)
-    {
-       return policies::raise_domain_error<T>("boost::math::bessel_y1<%1%>(%1%,%1%)",
-            "Got x == %1%, but x must be > 0, complex result not supported.", x, pol);
-    }
+    BOOST_MATH_ASSERT(x > 0);
+
     if (x <= 4)                       // x in (0, 4]
     {
         T y = x * x;
diff --git a/inst/include/boost/math/special_functions/detail/bessel_yn.hpp b/inst/include/boost/math/special_functions/detail/bessel_yn.hpp
index 939c04d0a..a45d1761c 100644
--- a/inst/include/boost/math/special_functions/detail/bessel_yn.hpp
+++ b/inst/include/boost/math/special_functions/detail/bessel_yn.hpp
@@ -10,9 +10,11 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/detail/bessel_y0.hpp>
 #include <boost/math/special_functions/detail/bessel_y1.hpp>
 #include <boost/math/special_functions/detail/bessel_jy_series.hpp>
+#include <boost/math/special_functions/sign.hpp>
 #include <boost/math/policies/error_handling.hpp>
 
 // Bessel function of the second kind of integer order
@@ -21,14 +23,14 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T bessel_yn(int n, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T bessel_yn(int n, T x, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     T value, factor, current, prev;
 
     using namespace boost::math::tools;
 
-    static const char* function = "boost::math::bessel_yn<%1%>(%1%,%1%)";
+    constexpr auto function = "boost::math::bessel_yn<%1%>(%1%,%1%)";
 
     if ((x == 0) && (n == 0))
     {
@@ -36,8 +38,7 @@ T bessel_yn(int n, T x, const Policy& pol)
     }
     if (x <= 0)
     {
-       return policies::raise_domain_error<T>(function,
-            "Got x = %1%, but x must be > 0, complex result not supported.", x, pol);
+       return policies::raise_domain_error<T>(function, "Got x = %1%, but x must be > 0, complex result not supported.", x, pol);
     }
 
     //
@@ -56,7 +57,7 @@ T bessel_yn(int n, T x, const Policy& pol)
     {
        T scale = 1;
        value = bessel_yn_small_z(n, x, &scale, pol);
-       if(tools::max_value<T>() * fabs(scale) < fabs(value))
+       if (tools::max_value<T>() * fabs(scale) < fabs(value))
           return boost::math::sign(scale) * boost::math::sign(value) * policies::raise_overflow_error<T>(function, nullptr, pol);
        value /= scale;
     }
@@ -99,7 +100,7 @@ T bessel_yn(int n, T x, const Policy& pol)
            current = value;
            ++k;
        }
-       if(fabs(tools::max_value<T>() * factor) < fabs(value))
+       if (fabs(tools::max_value<T>() * factor) < fabs(value))
           return sign(value) * sign(factor) * policies::raise_overflow_error<T>(function, nullptr, pol);
        value /= factor;
     }
diff --git a/inst/include/boost/math/special_functions/detail/erf_inv.hpp b/inst/include/boost/math/special_functions/detail/erf_inv.hpp
index ad6843e2a..cb65cffbc 100644
--- a/inst/include/boost/math/special_functions/detail/erf_inv.hpp
+++ b/inst/include/boost/math/special_functions/detail/erf_inv.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -13,6 +14,10 @@
 #pragma warning(disable:4702) // Unreachable code: optimization warning
 #endif
 
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <type_traits>
 
 namespace boost{ namespace math{
@@ -23,7 +28,7 @@ namespace detail{
 // this version is for 80-bit long double's and smaller:
 //
 template <class T, class Policy>
-T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constant<int, 64>*)
+BOOST_MATH_GPU_ENABLED T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constant<int, 64>&)
 {
    BOOST_MATH_STD_USING // for ADL of std names.
 
@@ -43,8 +48,9 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
       // long double: Max error found: 1.017064e-20
       // Maximum Deviation Found (actual error term at infinite precision) 8.030e-21
       //
-      static const float Y = 0.0891314744949340820313f;
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 0.0891314744949340820313f;
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, -0.000508781949658280665617),
          BOOST_MATH_BIG_CONSTANT(T, 64, -0.00836874819741736770379),
          BOOST_MATH_BIG_CONSTANT(T, 64, 0.0334806625409744615033),
@@ -54,7 +60,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
          BOOST_MATH_BIG_CONSTANT(T, 64, 0.00822687874676915743155),
          BOOST_MATH_BIG_CONSTANT(T, 64, -0.00538772965071242932965)
       };
-      static const T Q[] = {
+      BOOST_MATH_STATIC const T Q[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 64, -0.970005043303290640362),
          BOOST_MATH_BIG_CONSTANT(T, 64, -1.56574558234175846809),
@@ -66,6 +72,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
          BOOST_MATH_BIG_CONSTANT(T, 64, -0.00233393759374190016776),
          BOOST_MATH_BIG_CONSTANT(T, 64, 0.000886216390456424707504)
       };
+      // LCOV_EXCL_STOP
       T g = p * (p + 10);
       T r = tools::evaluate_polynomial(P, p) / tools::evaluate_polynomial(Q, p);
       result = g * Y + g * r;
@@ -84,8 +91,9 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
       // long double : Max error found: 6.084616e-20
       // Maximum Deviation Found (error term) 4.811e-20
       //
-      static const float Y = 2.249481201171875f;
-      static const T P[] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 2.249481201171875f;
+      BOOST_MATH_STATIC const T P[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, -0.202433508355938759655),
          BOOST_MATH_BIG_CONSTANT(T, 64, 0.105264680699391713268),
          BOOST_MATH_BIG_CONSTANT(T, 64, 8.37050328343119927838),
@@ -96,7 +104,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
          BOOST_MATH_BIG_CONSTANT(T, 64, 21.1294655448340526258),
          BOOST_MATH_BIG_CONSTANT(T, 64, -3.67192254707729348546)
       };
-      static const T Q[] = {
+      BOOST_MATH_STATIC const T Q[] = {
          BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 64, 6.24264124854247537712),
          BOOST_MATH_BIG_CONSTANT(T, 64, 3.9713437953343869095),
@@ -107,6 +115,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
          BOOST_MATH_BIG_CONSTANT(T, 64, -22.6436933413139721736),
          BOOST_MATH_BIG_CONSTANT(T, 64, 1.72114765761200282724)
       };
+      // LCOV_EXCL_STOP
       T g = sqrt(-2 * log(q));
       T xs = q - 0.25f;
       T r = tools::evaluate_polynomial(P, xs) / tools::evaluate_polynomial(Q, xs);
@@ -136,9 +145,10 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
       T x = sqrt(-log(q));
       if(x < 3)
       {
+         // LCOV_EXCL_START
          // Max error found: 1.089051e-20
-         static const float Y = 0.807220458984375f;
-         static const T P[] = {
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 0.807220458984375f;
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.131102781679951906451),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.163794047193317060787),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.117030156341995252019),
@@ -151,7 +161,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.285225331782217055858e-7),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.681149956853776992068e-9)
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 64, 3.46625407242567245975),
             BOOST_MATH_BIG_CONSTANT(T, 64, 5.38168345707006855425),
@@ -161,15 +171,17 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.152264338295331783612),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.01105924229346489121)
          };
+         // LCOV_EXCL_STOP
          T xs = x - 1.125f;
          T R = tools::evaluate_polynomial(P, xs) / tools::evaluate_polynomial(Q, xs);
          result = Y * x + R * x;
       }
       else if(x < 6)
       {
+         // LCOV_EXCL_START
          // Max error found: 8.389174e-21
-         static const float Y = 0.93995571136474609375f;
-         static const T P[] = {
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 0.93995571136474609375f;
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.0350353787183177984712),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.00222426529213447927281),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0185573306514231072324),
@@ -180,7 +192,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.230404776911882601748e-9),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.266339227425782031962e-11)
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.3653349817554063097),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.762059164553623404043),
@@ -189,15 +201,17 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.00263861676657015992959),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.764675292302794483503e-4)
          };
+         // LCOV_EXCL_STOP
          T xs = x - 3;
          T R = tools::evaluate_polynomial(P, xs) / tools::evaluate_polynomial(Q, xs);
          result = Y * x + R * x;
       }
       else if(x < 18)
       {
+         // LCOV_EXCL_START
          // Max error found: 1.481312e-19
-         static const float Y = 0.98362827301025390625f;
-         static const T P[] = {
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 0.98362827301025390625f;
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.0167431005076633737133),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.00112951438745580278863),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.00105628862152492910091),
@@ -208,7 +222,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.281128735628831791805e-13),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.99055709973310326855e-16)
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.591429344886417493481),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.138151865749083321638),
@@ -217,15 +231,17 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.275335474764726041141e-4),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.282243172016108031869e-6)
          };
+         // LCOV_EXCL_STOP
          T xs = x - 6;
          T R = tools::evaluate_polynomial(P, xs) / tools::evaluate_polynomial(Q, xs);
          result = Y * x + R * x;
       }
       else if(x < 44)
       {
+         // LCOV_EXCL_START
          // Max error found: 5.697761e-20
-         static const float Y = 0.99714565277099609375f;
-         static const T P[] = {
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 0.99714565277099609375f;
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.0024978212791898131227),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.779190719229053954292e-5),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.254723037413027451751e-4),
@@ -235,7 +251,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.145596286718675035587e-11),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.116765012397184275695e-17)
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.207123112214422517181),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0169410838120975906478),
@@ -244,15 +260,17 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.144437756628144157666e-6),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.509761276599778486139e-9)
          };
+         // LCOV_EXCL_STOP
          T xs = x - 18;
          T R = tools::evaluate_polynomial(P, xs) / tools::evaluate_polynomial(Q, xs);
          result = Y * x + R * x;
       }
       else
       {
+         // LCOV_EXCL_START
          // Max error found: 1.279746e-20
-         static const float Y = 0.99941349029541015625f;
-         static const T P[] = {
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const float Y = 0.99941349029541015625f;
+         BOOST_MATH_STATIC const T P[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.000539042911019078575891),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.28398759004727721098e-6),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.899465114892291446442e-6),
@@ -262,7 +280,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.135880130108924861008e-14),
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.348890393399948882918e-21)
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0845746234001899436914),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.00282092984726264681981),
@@ -271,6 +289,7 @@ T erf_inv_imp(const T& p, const T& q, const Policy&, const std::integral_constan
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.161809290887904476097e-8),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.231558608310259605225e-11)
          };
+         // LCOV_EXCL_STOP
          T xs = x - 44;
          T R = tools::evaluate_polynomial(P, xs) / tools::evaluate_polynomial(Q, xs);
          result = Y * x + R * x;
@@ -296,12 +315,13 @@ struct erf_roots
 };
 
 template <class T, class Policy>
-T erf_inv_imp(const T& p, const T& q, const Policy& pol, const std::integral_constant<int, 0>*)
+T erf_inv_imp(const T& p, const T& q, const Policy& pol, const std::integral_constant<int, 0>&)
 {
    //
    // Generic version, get a guess that's accurate to 64-bits (10^-19)
    //
-   T guess = erf_inv_imp(p, q, pol, static_cast<std::integral_constant<int, 64> const*>(nullptr));
+   using tag_type = std::integral_constant<int, 64>;
+   T guess = erf_inv_imp(p, q, pol, tag_type());
    T result;
    //
    // If T has more bit's than 64 in it's mantissa then we need to iterate,
@@ -327,82 +347,17 @@ T erf_inv_imp(const T& p, const T& q, const Policy& pol, const std::integral_con
    return result;
 }
 
-template <class T, class Policy>
-struct erf_inv_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init();
-      }
-      static bool is_value_non_zero(T);
-      static void do_init()
-      {
-         // If std::numeric_limits<T>::digits is zero, we must not call
-         // our initialization code here as the precision presumably
-         // varies at runtime, and will not have been set yet.
-         if(std::numeric_limits<T>::digits)
-         {
-            boost::math::erf_inv(static_cast<T>(0.25), Policy());
-            boost::math::erf_inv(static_cast<T>(0.55), Policy());
-            boost::math::erf_inv(static_cast<T>(0.95), Policy());
-            boost::math::erfc_inv(static_cast<T>(1e-15), Policy());
-            // These following initializations must not be called if
-            // type T can not hold the relevant values without
-            // underflow to zero.  We check this at runtime because
-            // some tools such as valgrind silently change the precision
-            // of T at runtime, and numeric_limits basically lies!
-            if(is_value_non_zero(static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1e-130))))
-               boost::math::erfc_inv(static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1e-130)), Policy());
-
-            // Some compilers choke on constants that would underflow, even in code that isn't instantiated
-            // so try and filter these cases out in the preprocessor:
-#if LDBL_MAX_10_EXP >= 800
-            if(is_value_non_zero(static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1e-800))))
-               boost::math::erfc_inv(static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1e-800)), Policy());
-            if(is_value_non_zero(static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1e-900))))
-               boost::math::erfc_inv(static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 1e-900)), Policy());
-#else
-            if(is_value_non_zero(static_cast<T>(BOOST_MATH_HUGE_CONSTANT(T, 64, 1e-800))))
-               boost::math::erfc_inv(static_cast<T>(BOOST_MATH_HUGE_CONSTANT(T, 64, 1e-800)), Policy());
-            if(is_value_non_zero(static_cast<T>(BOOST_MATH_HUGE_CONSTANT(T, 64, 1e-900))))
-               boost::math::erfc_inv(static_cast<T>(BOOST_MATH_HUGE_CONSTANT(T, 64, 1e-900)), Policy());
-#endif
-         }
-      }
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T, class Policy>
-const typename erf_inv_initializer<T, Policy>::init erf_inv_initializer<T, Policy>::initializer;
-
-template <class T, class Policy>
-BOOST_NOINLINE bool erf_inv_initializer<T, Policy>::init::is_value_non_zero(T v)
-{
-   // This needs to be non-inline to detect whether v is non zero at runtime
-   // rather than at compile time, only relevant when running under valgrind
-   // which changes long double's to double's on the fly.
-   return v != 0;
-}
-
 } // namespace detail
 
 template <class T, class Policy>
-typename tools::promote_args<T>::type erfc_inv(T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type erfc_inv(T z, const Policy& pol)
 {
    typedef typename tools::promote_args<T>::type result_type;
 
    //
    // Begin by testing for domain errors, and other special cases:
    //
-   static const char* function = "boost::math::erfc_inv<%1%>(%1%, %1%)";
+   constexpr auto function = "boost::math::erfc_inv<%1%>(%1%, %1%)";
    if((z < 0) || (z > 2))
       return policies::raise_domain_error<result_type>(function, "Argument outside range [0,2] in inverse erfc function (got p=%1%).", z, pol);
    if(z == 0)
@@ -448,24 +403,22 @@ typename tools::promote_args<T>::type erfc_inv(T z, const Policy& pol)
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   detail::erf_inv_initializer<eval_type, forwarding_policy>::force_instantiate();
-
    //
    // And get the result, negating where required:
    //
    return s * policies::checked_narrowing_cast<result_type, forwarding_policy>(
-      detail::erf_inv_imp(static_cast<eval_type>(p), static_cast<eval_type>(q), forwarding_policy(), static_cast<tag_type const*>(nullptr)), function);
+      detail::erf_inv_imp(static_cast<eval_type>(p), static_cast<eval_type>(q), forwarding_policy(), tag_type()), function);
 }
 
 template <class T, class Policy>
-typename tools::promote_args<T>::type erf_inv(T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type erf_inv(T z, const Policy& pol)
 {
    typedef typename tools::promote_args<T>::type result_type;
 
    //
    // Begin by testing for domain errors, and other special cases:
    //
-   static const char* function = "boost::math::erf_inv<%1%>(%1%, %1%)";
+   constexpr auto function = "boost::math::erf_inv<%1%>(%1%, %1%)";
    if((z < -1) || (z > 1))
       return policies::raise_domain_error<result_type>(function, "Argument outside range [-1, 1] in inverse erf function (got p=%1%).", z, pol);
    if(z == 1)
@@ -518,22 +471,21 @@ typename tools::promote_args<T>::type erf_inv(T z, const Policy& pol)
    //
    typedef typename policies::evaluation<result_type, Policy>::type eval_type;
 
-   detail::erf_inv_initializer<eval_type, forwarding_policy>::force_instantiate();
    //
    // And get the result, negating where required:
    //
    return s * policies::checked_narrowing_cast<result_type, forwarding_policy>(
-      detail::erf_inv_imp(static_cast<eval_type>(p), static_cast<eval_type>(q), forwarding_policy(), static_cast<tag_type const*>(nullptr)), function);
+      detail::erf_inv_imp(static_cast<eval_type>(p), static_cast<eval_type>(q), forwarding_policy(), tag_type()), function);
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type erfc_inv(T z)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type erfc_inv(T z)
 {
    return erfc_inv(z, policies::policy<>());
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type erf_inv(T z)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type erf_inv(T z)
 {
    return erf_inv(z, policies::policy<>());
 }
@@ -541,6 +493,64 @@ inline typename tools::promote_args<T>::type erf_inv(T z)
 } // namespace math
 } // namespace boost
 
+#else // Special handling for NVRTC
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto erf_inv(T x)
+{
+   return ::erfinv(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto erf_inv(float x)
+{
+   return ::erfinvf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto erf_inv(T x, const Policy&)
+{
+   return ::erfinv(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto erf_inv(float x, const Policy&)
+{
+   return ::erfinvf(x);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto erfc_inv(T x)
+{
+   return ::erfcinv(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto erfc_inv(float x)
+{
+   return ::erfcinvf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto erfc_inv(T x, const Policy&)
+{
+   return ::erfcinv(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto erfc_inv(float x, const Policy&)
+{
+   return ::erfcinvf(x);
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTV
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/inst/include/boost/math/special_functions/detail/fp_traits.hpp b/inst/include/boost/math/special_functions/detail/fp_traits.hpp
index 975052b52..015ea9cd3 100644
--- a/inst/include/boost/math/special_functions/detail/fp_traits.hpp
+++ b/inst/include/boost/math/special_functions/detail/fp_traits.hpp
@@ -4,6 +4,7 @@
 #define BOOST_MATH_FP_TRAITS_HPP
 
 // Copyright (c) 2006 Johan Rade
+// Copyright (c) 2024 Matt Borland
 
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -24,6 +25,7 @@ With these techniques, the code could be simplified.
 #include <cstdint>
 #include <limits>
 #include <type_traits>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/is_standalone.hpp>
 #include <boost/math/tools/assert.hpp>
 
@@ -34,16 +36,6 @@ With these techniques, the code could be simplified.
 #define BOOST_MATH_ENDIAN_BIG_BYTE BOOST_ENDIAN_BIG_BYTE
 #define BOOST_MATH_ENDIAN_LITTLE_BYTE BOOST_ENDIAN_LITTLE_BYTE
 
-#elif (__cplusplus >= 202002L || _MSVC_LANG >= 202002L)
-
-#if __has_include(<bit>)
-#include <bit>
-#define BOOST_MATH_ENDIAN_BIG_BYTE (std::endian::native == std::endian::big)
-#define BOOST_MATH_ENDIAN_LITTLE_BYTE (std::endian::native == std::endian::little)
-#else
-#error Missing <bit> header. Please disable standalone mode, and file an issue at https://github.com/boostorg/math
-#endif
-
 #elif defined(_WIN32)
 
 #define BOOST_MATH_ENDIAN_BIG_BYTE 0
@@ -212,14 +204,14 @@ template<> struct fp_traits_non_native<float, single_precision>
 {
     typedef ieee_copy_all_bits_tag method;
 
-    static constexpr uint32_t sign        = 0x80000000u;
-    static constexpr uint32_t exponent    = 0x7f800000;
-    static constexpr uint32_t flag        = 0x00000000;
-    static constexpr uint32_t significand = 0x007fffff;
+    BOOST_MATH_STATIC constexpr uint32_t sign        = 0x80000000u;
+    BOOST_MATH_STATIC constexpr uint32_t exponent    = 0x7f800000;
+    BOOST_MATH_STATIC constexpr uint32_t flag        = 0x00000000;
+    BOOST_MATH_STATIC constexpr uint32_t significand = 0x007fffff;
 
     typedef uint32_t bits;
-    static void get_bits(float x, uint32_t& a) { std::memcpy(&a, &x, 4); }
-    static void set_bits(float& x, uint32_t a) { std::memcpy(&x, &a, 4); }
+    BOOST_MATH_GPU_ENABLED static void get_bits(float x, uint32_t& a) { std::memcpy(&a, &x, 4); }
+    BOOST_MATH_GPU_ENABLED static void set_bits(float& x, uint32_t a) { std::memcpy(&x, &a, 4); }
 };
 
 // ieee_tag version, double (64 bits) ----------------------------------------------
@@ -260,15 +252,15 @@ template<> struct fp_traits_non_native<double, double_precision>
 {
     typedef ieee_copy_all_bits_tag method;
 
-    static constexpr uint64_t sign     = static_cast<uint64_t>(0x80000000u) << 32;
-    static constexpr uint64_t exponent = static_cast<uint64_t>(0x7ff00000) << 32;
-    static constexpr uint64_t flag     = 0;
-    static constexpr uint64_t significand
+    BOOST_MATH_STATIC constexpr uint64_t sign     = static_cast<uint64_t>(0x80000000u) << 32;
+    BOOST_MATH_STATIC constexpr uint64_t exponent = static_cast<uint64_t>(0x7ff00000) << 32;
+    BOOST_MATH_STATIC constexpr uint64_t flag     = 0;
+    BOOST_MATH_STATIC constexpr uint64_t significand
         = (static_cast<uint64_t>(0x000fffff) << 32) + static_cast<uint64_t>(0xffffffffu);
 
     typedef uint64_t bits;
-    static void get_bits(double x, uint64_t& a) { std::memcpy(&a, &x, 8); }
-    static void set_bits(double& x, uint64_t a) { std::memcpy(&x, &a, 8); }
+    BOOST_MATH_GPU_ENABLED static void get_bits(double x, uint64_t& a) { std::memcpy(&a, &x, 8); }
+    BOOST_MATH_GPU_ENABLED static void set_bits(double& x, uint64_t a) { std::memcpy(&x, &a, 8); }
 };
 
 #endif
@@ -340,10 +332,10 @@ struct fp_traits_non_native<long double, extended_double_precision>
 {
     typedef ieee_copy_leading_bits_tag method;
 
-    static constexpr uint32_t sign        = 0x80000000u;
-    static constexpr uint32_t exponent    = 0x7fff0000;
-    static constexpr uint32_t flag        = 0x00008000;
-    static constexpr uint32_t significand = 0x00007fff;
+    BOOST_MATH_STATIC constexpr uint32_t sign        = 0x80000000u;
+    BOOST_MATH_STATIC constexpr uint32_t exponent    = 0x7fff0000;
+    BOOST_MATH_STATIC constexpr uint32_t flag        = 0x00008000;
+    BOOST_MATH_STATIC constexpr uint32_t significand = 0x00007fff;
 
     typedef uint32_t bits;
 
@@ -391,10 +383,10 @@ struct fp_traits_non_native<long double, extended_double_precision>
 {
     typedef ieee_copy_leading_bits_tag method;
 
-    static constexpr uint32_t sign        = 0x80000000u;
-    static constexpr uint32_t exponent    = 0x7ff00000;
-    static constexpr uint32_t flag        = 0x00000000;
-    static constexpr uint32_t significand = 0x000fffff;
+    BOOST_MATH_STATIC constexpr uint32_t sign        = 0x80000000u;
+    BOOST_MATH_STATIC constexpr uint32_t exponent    = 0x7ff00000;
+    BOOST_MATH_STATIC constexpr uint32_t flag        = 0x00000000;
+    BOOST_MATH_STATIC constexpr uint32_t significand = 0x000fffff;
 
     typedef uint32_t bits;
 
@@ -409,7 +401,7 @@ struct fp_traits_non_native<long double, extended_double_precision>
     }
 
 private:
-    static constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 12;
+    BOOST_MATH_STATIC constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 12;
 };
 
 
@@ -429,10 +421,10 @@ struct fp_traits_non_native<long double, extended_double_precision>
 {
     typedef ieee_copy_leading_bits_tag method;
 
-    static constexpr uint32_t sign        = 0x80000000u;
-    static constexpr uint32_t exponent    = 0x7fff0000;
-    static constexpr uint32_t flag        = 0x00008000;
-    static constexpr uint32_t significand = 0x00007fff;
+    BOOST_MATH_STATIC constexpr uint32_t sign        = 0x80000000u;
+    BOOST_MATH_STATIC constexpr uint32_t exponent    = 0x7fff0000;
+    BOOST_MATH_STATIC constexpr uint32_t flag        = 0x00008000;
+    BOOST_MATH_STATIC constexpr uint32_t significand = 0x00007fff;
 
     // copy 1st, 2nd, 5th and 6th byte. 3rd and 4th byte are padding.
 
@@ -465,10 +457,10 @@ struct fp_traits_non_native<long double, extended_double_precision>
 {
     typedef ieee_copy_leading_bits_tag method;
 
-    static constexpr uint32_t sign        = 0x80000000u;
-    static constexpr uint32_t exponent    = 0x7fff0000;
-    static constexpr uint32_t flag        = 0x00000000;
-    static constexpr uint32_t significand = 0x0000ffff;
+    BOOST_MATH_STATIC constexpr uint32_t sign        = 0x80000000u;
+    BOOST_MATH_STATIC constexpr uint32_t exponent    = 0x7fff0000;
+    BOOST_MATH_STATIC constexpr uint32_t flag        = 0x00000000;
+    BOOST_MATH_STATIC constexpr uint32_t significand = 0x0000ffff;
 
     typedef uint32_t bits;
 
@@ -483,7 +475,7 @@ struct fp_traits_non_native<long double, extended_double_precision>
     }
 
 private:
-    static constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 12;
+    BOOST_MATH_STATIC constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 12;
 };
 
 #endif
@@ -563,7 +555,8 @@ struct select_native<long double>
    && !defined(BOOST_MATH_DISABLE_STD_FPCLASSIFY)\
    && !defined(__INTEL_COMPILER)\
    && !defined(sun)\
-   && !defined(__VXWORKS__)
+   && !defined(__VXWORKS__)\
+   && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
 #  define BOOST_MATH_USE_STD_FPCLASSIFY
 #endif
 
diff --git a/inst/include/boost/math/special_functions/detail/gamma_inva.hpp b/inst/include/boost/math/special_functions/detail/gamma_inva.hpp
index 75ac89e43..8c3be8ef1 100644
--- a/inst/include/boost/math/special_functions/detail/gamma_inva.hpp
+++ b/inst/include/boost/math/special_functions/detail/gamma_inva.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,16 +18,23 @@
 #pragma once
 #endif
 
-#include <cstdint>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/toms748_solve.hpp>
 
-namespace boost{ namespace math{ namespace detail{
+namespace boost{ namespace math{ 
+
+#ifdef BOOST_MATH_HAS_NVRTC
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto erfc_inv(T x, const Policy&);
+#endif
+   
+namespace detail{
 
 template <class T, class Policy>
 struct gamma_inva_t
 {
-   gamma_inva_t(T z_, T p_, bool invert_) : z(z_), p(p_), invert(invert_) {}
-   T operator()(T a)
+   BOOST_MATH_GPU_ENABLED gamma_inva_t(T z_, T p_, bool invert_) : z(z_), p(p_), invert(invert_) {}
+   BOOST_MATH_GPU_ENABLED T operator()(T a)
    {
       return invert ? p - boost::math::gamma_q(a, z, Policy()) : boost::math::gamma_p(a, z, Policy()) - p;
    }
@@ -36,7 +44,7 @@ struct gamma_inva_t
 };
 
 template <class T, class Policy>
-T inverse_poisson_cornish_fisher(T lambda, T p, T q, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T inverse_poisson_cornish_fisher(T lambda, T p, T q, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    // mean:
@@ -67,7 +75,7 @@ T inverse_poisson_cornish_fisher(T lambda, T p, T q, const Policy& pol)
 }
 
 template <class T, class Policy>
-T gamma_inva_imp(const T& z, const T& p, const T& q, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T gamma_inva_imp(const T& z, const T& p, const T& q, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // for ADL of std lib math functions
    //
@@ -151,7 +159,7 @@ T gamma_inva_imp(const T& z, const T& p, const T& q, const Policy& pol)
 } // namespace detail
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_p_inva(T1 x, T2 p, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
@@ -181,7 +189,7 @@ inline typename tools::promote_args<T1, T2>::type
 }
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_q_inva(T1 x, T2 q, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
@@ -211,14 +219,14 @@ inline typename tools::promote_args<T1, T2>::type
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_p_inva(T1 x, T2 p)
 {
    return boost::math::gamma_p_inva(x, p, policies::policy<>());
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_q_inva(T1 x, T2 q)
 {
    return boost::math::gamma_q_inva(x, q, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_bessel.hpp b/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_bessel.hpp
index 763b2fa1b..860217b05 100644
--- a/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_bessel.hpp
+++ b/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_bessel.hpp
@@ -84,7 +84,7 @@
            }
            else
               log_scale = 0;
-#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifndef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
            if constexpr (std::numeric_limits<T>::has_infinity)
            {
               if (!(boost::math::isfinite)(bessel_cache[cache_size - 1]))
@@ -339,14 +339,14 @@
         if(b == 2 * a)
            return hypergeometric_1F1_divergent_fallback(a, b, z, pol, log_scale);
 
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
         try
 #endif
         {
            prefix = boost::math::tgamma(b, pol);
            prefix *= exp(z / 2);
         }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
         catch (const std::runtime_error&)
         {
            use_logs = true;
@@ -364,14 +364,14 @@
         std::uintmax_t max_iter = boost::math::policies::get_max_series_iterations<Policy>();
         bool retry = false;
         long long series_scale = 0;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
         try
 #endif
         {
            hypergeometric_1F1_AS_13_3_7_tricomi_series<T, Policy> s(a, b, z, pol);
            series_scale = s.scale();
            log_scale += s.scale();
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
            try
 #endif
            {
@@ -386,7 +386,7 @@
               if (norm / fabs(result) > 1 / boost::math::tools::root_epsilon<T>())
                  retry = true;  // fatal cancellation
            }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
            catch (const std::overflow_error&)
            {
               retry = true;
@@ -397,7 +397,7 @@
            }
 #endif
         }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
         catch (const std::overflow_error&)
         {
            log_scale -= scale;
diff --git a/inst/include/boost/math/special_functions/detail/hypergeometric_pFq_checked_series.hpp b/inst/include/boost/math/special_functions/detail/hypergeometric_pFq_checked_series.hpp
index 861d981a1..3adc86f74 100644
--- a/inst/include/boost/math/special_functions/detail/hypergeometric_pFq_checked_series.hpp
+++ b/inst/include/boost/math/special_functions/detail/hypergeometric_pFq_checked_series.hpp
@@ -271,7 +271,7 @@
         //
         if(bj.size() > BOOST_MATH_PFQ_MAX_B_TERMS)
            policies::raise_domain_error<Real>("boost::math::hypergeometric_pFq<%1%>(Seq, Seq, %1%)",
-              "The number of b terms must be less than the value of BOOST_MATH_PFQ_MAX_B_TERMS (" BOOST_STRINGIZE(BOOST_MATH_PFQ_MAX_B_TERMS)  "), but got %1%.",
+              "The number of b terms must be less than the value of BOOST_MATH_PFQ_MAX_B_TERMS (" BOOST_MATH_STRINGIZE(BOOST_MATH_PFQ_MAX_B_TERMS)  "), but got %1%.",
               Real(bj.size()), pol);
 
         unsigned crossover_locations[BOOST_MATH_PFQ_MAX_B_TERMS];
diff --git a/inst/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp b/inst/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp
index 0ce0d7560..aab18f50f 100644
--- a/inst/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp
+++ b/inst/include/boost/math/special_functions/detail/ibeta_inv_ab.hpp
@@ -17,17 +17,19 @@
 #pragma once
 #endif
 
-#include <cstdint>
-#include <utility>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/toms748_solve.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Policy>
 struct beta_inv_ab_t
 {
-   beta_inv_ab_t(T b_, T z_, T p_, bool invert_, bool swap_ab_) : b(b_), z(z_), p(p_), invert(invert_), swap_ab(swap_ab_) {}
-   T operator()(T a)
+   BOOST_MATH_GPU_ENABLED beta_inv_ab_t(T b_, T z_, T p_, bool invert_, bool swap_ab_) : b(b_), z(z_), p(p_), invert(invert_), swap_ab(swap_ab_) {}
+   BOOST_MATH_GPU_ENABLED T operator()(T a)
    {
       return invert ? 
          p - boost::math::ibetac(swap_ab ? b : a, swap_ab ? a : b, z, Policy()) 
@@ -39,7 +41,7 @@ struct beta_inv_ab_t
 };
 
 template <class T, class Policy>
-T inverse_negative_binomial_cornish_fisher(T n, T sf, T sfc, T p, T q, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T inverse_negative_binomial_cornish_fisher(T n, T sf, T sfc, T p, T q, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    // mean:
@@ -72,7 +74,7 @@ T inverse_negative_binomial_cornish_fisher(T n, T sf, T sfc, T p, T q, const Pol
 }
 
 template <class T, class Policy>
-T ibeta_inv_ab_imp(const T& b, const T& z, const T& p, const T& q, bool swap_ab, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ibeta_inv_ab_imp(const T& b, const T& z, const T& p, const T& q, bool swap_ab, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // for ADL of std lib math functions
    //
@@ -121,11 +123,11 @@ T ibeta_inv_ab_imp(const T& b, const T& z, const T& p, const T& q, bool swap_ab,
       //
       if((p < q) != swap_ab)
       {
-         guess = (std::min)(T(b * 2), T(1));
+         guess = BOOST_MATH_GPU_SAFE_MIN(T(b * 2), T(1));
       }
       else
       {
-         guess = (std::min)(T(b / 2), T(1));
+         guess = BOOST_MATH_GPU_SAFE_MIN(T(b / 2), T(1));
       }
    }
    if(n * n * n * u * sf > 0.005)
@@ -138,11 +140,11 @@ T ibeta_inv_ab_imp(const T& b, const T& z, const T& p, const T& q, bool swap_ab,
       //
       if((p < q) != swap_ab)
       {
-         guess = (std::min)(T(b * 2), T(10));
+         guess = BOOST_MATH_GPU_SAFE_MIN(T(b * 2), T(10));
       }
       else
       {
-         guess = (std::min)(T(b / 2), T(10));
+         guess = BOOST_MATH_GPU_SAFE_MIN(T(b / 2), T(10));
       }
    }
    else
@@ -151,8 +153,8 @@ T ibeta_inv_ab_imp(const T& b, const T& z, const T& p, const T& q, bool swap_ab,
    //
    // Max iterations permitted:
    //
-   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
-   std::pair<T, T> r = bracket_and_solve_root(f, guess, factor, swap_ab ? true : false, tol, max_iter, pol);
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   boost::math::pair<T, T> r = bracket_and_solve_root(f, guess, factor, swap_ab ? true : false, tol, max_iter, pol);
    if(max_iter >= policies::get_max_root_iterations<Policy>())
       return policies::raise_evaluation_error<T>("boost::math::ibeta_invab_imp<%1%>(%1%,%1%,%1%)", "Unable to locate the root within a reasonable number of iterations, closest approximation so far was %1%", r.first, pol);
    return (r.first + r.second) / 2;
@@ -161,7 +163,7 @@ T ibeta_inv_ab_imp(const T& b, const T& z, const T& p, const T& q, bool swap_ab,
 } // namespace detail
 
 template <class RT1, class RT2, class RT3, class Policy>
-typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<RT1, RT2, RT3>::type 
       ibeta_inva(RT1 b, RT2 x, RT3 p, const Policy& pol)
 {
    typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
@@ -173,7 +175,7 @@ typename tools::promote_args<RT1, RT2, RT3>::type
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   static const char* function = "boost::math::ibeta_inva<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ibeta_inva<%1%>(%1%,%1%,%1%)";
    if(p == 0)
    {
       return policies::raise_overflow_error<result_type>(function, 0, Policy());
@@ -185,28 +187,28 @@ typename tools::promote_args<RT1, RT2, RT3>::type
 
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(
       detail::ibeta_inv_ab_imp(
-         static_cast<value_type>(b), 
-         static_cast<value_type>(x), 
-         static_cast<value_type>(p), 
-         static_cast<value_type>(1 - static_cast<value_type>(p)), 
-         false, pol), 
+         static_cast<value_type>(b),
+         static_cast<value_type>(x),
+         static_cast<value_type>(p),
+         static_cast<value_type>(1 - static_cast<value_type>(p)),
+         false, pol),
       function);
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<RT1, RT2, RT3>::type
       ibetac_inva(RT1 b, RT2 x, RT3 q, const Policy& pol)
 {
    typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
    typedef typename policies::normalise<
-      Policy, 
-      policies::promote_float<false>, 
-      policies::promote_double<false>, 
+      Policy,
+      policies::promote_float<false>,
+      policies::promote_double<false>,
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   static const char* function = "boost::math::ibetac_inva<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ibetac_inva<%1%>(%1%,%1%,%1%)";
    if(q == 1)
    {
       return policies::raise_overflow_error<result_type>(function, 0, Policy());
@@ -218,28 +220,28 @@ typename tools::promote_args<RT1, RT2, RT3>::type
 
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(
       detail::ibeta_inv_ab_imp(
-         static_cast<value_type>(b), 
-         static_cast<value_type>(x), 
-         static_cast<value_type>(1 - static_cast<value_type>(q)), 
-         static_cast<value_type>(q), 
+         static_cast<value_type>(b),
+         static_cast<value_type>(x),
+         static_cast<value_type>(1 - static_cast<value_type>(q)),
+         static_cast<value_type>(q),
          false, pol),
       function);
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<RT1, RT2, RT3>::type
       ibeta_invb(RT1 a, RT2 x, RT3 p, const Policy& pol)
 {
    typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
    typedef typename policies::normalise<
-      Policy, 
-      policies::promote_float<false>, 
-      policies::promote_double<false>, 
+      Policy,
+      policies::promote_float<false>,
+      policies::promote_double<false>,
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   static const char* function = "boost::math::ibeta_invb<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ibeta_invb<%1%>(%1%,%1%,%1%)";
    if(p == 0)
    {
       return tools::min_value<result_type>();
@@ -251,19 +253,19 @@ typename tools::promote_args<RT1, RT2, RT3>::type
 
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(
       detail::ibeta_inv_ab_imp(
-         static_cast<value_type>(a), 
-         static_cast<value_type>(x), 
-         static_cast<value_type>(p), 
-         static_cast<value_type>(1 - static_cast<value_type>(p)), 
+         static_cast<value_type>(a),
+         static_cast<value_type>(x),
+         static_cast<value_type>(p),
+         static_cast<value_type>(1 - static_cast<value_type>(p)),
          true, pol),
       function);
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<RT1, RT2, RT3>::type
       ibetac_invb(RT1 a, RT2 x, RT3 q, const Policy& pol)
 {
-   static const char* function = "boost::math::ibeta_invb<%1%>(%1%, %1%, %1%)";
+   constexpr auto function = "boost::math::ibeta_invb<%1%>(%1%, %1%, %1%)";
    typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
    typedef typename policies::normalise<
@@ -293,28 +295,28 @@ typename tools::promote_args<RT1, RT2, RT3>::type
 }
 
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type 
          ibeta_inva(RT1 b, RT2 x, RT3 p)
 {
    return boost::math::ibeta_inva(b, x, p, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type 
          ibetac_inva(RT1 b, RT2 x, RT3 q)
 {
    return boost::math::ibetac_inva(b, x, q, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type 
          ibeta_invb(RT1 a, RT2 x, RT3 p)
 {
    return boost::math::ibeta_invb(a, x, p, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type 
          ibetac_invb(RT1 a, RT2 x, RT3 q)
 {
    return boost::math::ibetac_invb(a, x, q, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/detail/ibeta_inverse.hpp b/inst/include/boost/math/special_functions/detail/ibeta_inverse.hpp
index 98cc1d748..6f222cf77 100644
--- a/inst/include/boost/math/special_functions/detail/ibeta_inverse.hpp
+++ b/inst/include/boost/math/special_functions/detail/ibeta_inverse.hpp
@@ -11,10 +11,14 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/roots.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/special_functions/erf.hpp>
-#include <boost/math/tools/roots.hpp>
 #include <boost/math/special_functions/detail/t_distribution_inv.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
 
 namespace boost{ namespace math{ namespace detail{
 
@@ -25,12 +29,12 @@ namespace boost{ namespace math{ namespace detail{
 template <class T>
 struct temme_root_finder
 {
-   temme_root_finder(const T t_, const T a_) : t(t_), a(a_) {
-      const T x_extrema = 1 / (1 + a);
-      BOOST_MATH_ASSERT(0 < x_extrema && x_extrema < 1);
+   BOOST_MATH_GPU_ENABLED temme_root_finder(const T t_, const T a_) : t(t_), a(a_) {
+      BOOST_MATH_ASSERT(
+         math::tools::epsilon<T>() <= a && !(boost::math::isinf)(a));
    }
 
-   boost::math::tuple<T, T> operator()(T x)
+   BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T> operator()(T x)
    {
       BOOST_MATH_STD_USING // ADL of std names
 
@@ -50,7 +54,7 @@ struct temme_root_finder
 // Section 2.
 //
 template <class T, class Policy>
-T temme_method_1_ibeta_inverse(T a, T b, T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T temme_method_1_ibeta_inverse(T a, T b, T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -136,7 +140,7 @@ T temme_method_1_ibeta_inverse(T a, T b, T z, const Policy& pol)
 // Section 3.
 //
 template <class T, class Policy>
-T temme_method_2_ibeta_inverse(T /*a*/, T /*b*/, T z, T r, T theta, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T temme_method_2_ibeta_inverse(T /*a*/, T /*b*/, T z, T r, T theta, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -300,9 +304,23 @@ T temme_method_2_ibeta_inverse(T /*a*/, T /*b*/, T z, T r, T theta, const Policy
    //
    // And iterate:
    //
-   x = tools::newton_raphson_iterate(
-      temme_root_finder<T>(-lu, alpha), x, lower, upper, policies::digits<T, Policy>() / 2);
-
+#ifndef BOOST_MATH_NO_EXCEPTIONS
+   try {
+#endif
+      x = tools::newton_raphson_iterate(
+         temme_root_finder<T>(-lu, alpha), x, lower, upper, policies::digits<T, Policy>() / 2);
+#ifndef BOOST_MATH_NO_EXCEPTIONS
+   }
+   catch (const boost::math::evaluation_error&)
+   {
+      // Due to numerical instability we may have cases where no root is found when
+      // in fact we should just touch the origin.  We simply ignore the error here
+      // and return our best guess for x so far...
+      // Maybe we should special case the symmetrical parameter case, but it's not clear 
+      // whether that is the only situation when problems can occur.
+      // See https://github.com/boostorg/math/issues/1169
+   }
+#endif
    return x;
 }
 //
@@ -313,10 +331,11 @@ T temme_method_2_ibeta_inverse(T /*a*/, T /*b*/, T z, T r, T theta, const Policy
 // Section 4.
 //
 template <class T, class Policy>
-T temme_method_3_ibeta_inverse(T a, T b, T p, T q, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T temme_method_3_ibeta_inverse(T a, T b, T p, T q, const Policy& pol)
 {
    BOOST_MATH_STD_USING // ADL of std names
 
+
    //
    // Begin by getting an initial approximation for the quantity
    // eta from the dominant part of the incomplete beta:
@@ -418,10 +437,10 @@ T temme_method_3_ibeta_inverse(T a, T b, T p, T q, const Policy& pol)
 template <class T, class Policy>
 struct ibeta_roots
 {
-   ibeta_roots(T _a, T _b, T t, bool inv = false)
+   BOOST_MATH_GPU_ENABLED ibeta_roots(T _a, T _b, T t, bool inv = false)
       : a(_a), b(_b), target(t), invert(inv) {}
 
-   boost::math::tuple<T, T, T> operator()(T x)
+   BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T, T> operator()(T x)
    {
       BOOST_MATH_STD_USING // ADL of std names
 
@@ -455,7 +474,7 @@ struct ibeta_roots
 };
 
 template <class T, class Policy>
-T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
+BOOST_MATH_GPU_ENABLED T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
 {
    BOOST_MATH_STD_USING  // For ADL of math functions.
 
@@ -485,8 +504,8 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
          return p;
       }
       // Change things around so we can handle as b == 1 special case below:
-      std::swap(a, b);
-      std::swap(p, q);
+      BOOST_MATH_GPU_SAFE_SWAP(a, b);
+      BOOST_MATH_GPU_SAFE_SWAP(p, q);
       invert = true;
    }
    //
@@ -522,8 +541,8 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       }
       else if(b > 0.5f)
       {
-         std::swap(a, b);
-         std::swap(p, q);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(p, q);
          invert = !invert;
       }
    }
@@ -557,7 +576,7 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
          y = -boost::math::expm1(boost::math::log1p(-q, pol) / a, pol);
       }
       if(invert)
-         std::swap(x, y);
+         BOOST_MATH_GPU_SAFE_SWAP(x, y);
       if(py)
          *py = y;
       return x;
@@ -572,12 +591,12 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       //
       if(p > 0.5)
       {
-         std::swap(a, b);
-         std::swap(p, q);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(p, q);
          invert = !invert;
       }
-      T minv = (std::min)(a, b);
-      T maxv = (std::max)(a, b);
+      T minv = BOOST_MATH_GPU_SAFE_MIN(a, b);
+      T maxv = BOOST_MATH_GPU_SAFE_MAX(a, b);
       if((sqrt(minv) > (maxv - minv)) && (minv > 5))
       {
          //
@@ -628,8 +647,8 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
             //
             if(a < b)
             {
-               std::swap(a, b);
-               std::swap(p, q);
+               BOOST_MATH_GPU_SAFE_SWAP(a, b);
+               BOOST_MATH_GPU_SAFE_SWAP(p, q);
                invert = !invert;
             }
             //
@@ -638,7 +657,7 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
             T bet = 0;
             if (b < 2)
             {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                try
 #endif
                {
@@ -646,11 +665,11 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
 
                   typedef typename Policy::overflow_error_type overflow_type;
 
-                  BOOST_IF_CONSTEXPR(overflow_type::value != boost::math::policies::throw_on_error)
+                  BOOST_MATH_IF_CONSTEXPR(overflow_type::value != boost::math::policies::throw_on_error)
                      if(bet > tools::max_value<T>())
                         bet = tools::max_value<T>();
                }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                catch (const std::overflow_error&)
                {
                   bet = tools::max_value<T>();
@@ -692,8 +711,8 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       }
       if(fs < 0)
       {
-         std::swap(a, b);
-         std::swap(p, q);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(p, q);
          invert = !invert;
          xs = 1 - xs;
       }
@@ -712,11 +731,11 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       T bet = 0;
       T xg;
       bool overflow = false;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
       try {
 #endif
          bet = boost::math::beta(a, b, pol);
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
       }
       catch (const std::runtime_error&)
       {
@@ -756,9 +775,9 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
 
       if(ps < 0)
       {
-         std::swap(a, b);
-         std::swap(p, q);
-         std::swap(xs, xs2);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(p, q);
+         BOOST_MATH_GPU_SAFE_SWAP(xs, xs2);
          invert = !invert;
       }
       //
@@ -821,8 +840,8 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       //
       if(b < a)
       {
-         std::swap(a, b);
-         std::swap(p, q);
+         BOOST_MATH_GPU_SAFE_SWAP(a, b);
+         BOOST_MATH_GPU_SAFE_SWAP(p, q);
          invert = !invert;
       }
       if (a < tools::min_value<T>())
@@ -841,14 +860,14 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       }
       else if(pow(p, 1/a) < 0.5)
       {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          try 
          {
 #endif
             x = pow(p * a * boost::math::beta(a, b, pol), 1 / a);
             if ((x > 1) || !(boost::math::isfinite)(x))
                x = 1;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          }
          catch (const std::overflow_error&)
          {
@@ -862,14 +881,14 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       else /*if(pow(q, 1/b) < 0.1)*/
       {
          // model a distorted quarter circle:
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          try 
          {
 #endif
             y = pow(1 - pow(p, b * boost::math::beta(a, b, pol)), 1/b);
             if ((y > 1) || !(boost::math::isfinite)(y))
                y = 1;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          }
          catch (const std::overflow_error&)
          {
@@ -888,9 +907,9 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
    //
    if(x > 0.5)
    {
-      std::swap(a, b);
-      std::swap(p, q);
-      std::swap(x, y);
+      BOOST_MATH_GPU_SAFE_SWAP(a, b);
+      BOOST_MATH_GPU_SAFE_SWAP(p, q);
+      BOOST_MATH_GPU_SAFE_SWAP(x, y);
       invert = !invert;
       T l = 1 - upper;
       T u = 1 - lower;
@@ -920,8 +939,8 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
       if(x < lower)
          x = lower;
    }
-   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
-   std::uintmax_t max_iter_used = 0;
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   boost::math::uintmax_t max_iter_used = 0;
    //
    // Figure out how many digits to iterate towards:
    //
@@ -944,7 +963,13 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
    // Now iterate, we can use either p or q as the target here
    // depending on which is smaller:
    //
+   // Since we can't use halley_iterate on device we use newton raphson
+   //
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
    x = boost::math::tools::halley_iterate(
+   #else
+   x = boost::math::tools::newton_raphson_iterate(
+   #endif
       boost::math::detail::ibeta_roots<T, Policy>(a, b, (p < q ? p : q), (p < q ? false : true)), x, lower, upper, digits, max_iter);
    policies::check_root_iterations<T>("boost::math::ibeta<%1%>(%1%, %1%, %1%)", max_iter + max_iter_used, pol);
    //
@@ -966,10 +991,10 @@ T ibeta_inv_imp(T a, T b, T p, T q, const Policy& pol, T* py)
 } // namespace detail
 
 template <class T1, class T2, class T3, class T4, class Policy>
-inline typename tools::promote_args<T1, T2, T3, T4>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type
    ibeta_inv(T1 a, T2 b, T3 p, T4* py, const Policy& pol)
 {
-   static const char* function = "boost::math::ibeta_inv<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ibeta_inv<%1%>(%1%,%1%,%1%)";
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T1, T2, T3, T4>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -1001,14 +1026,14 @@ inline typename tools::promote_args<T1, T2, T3, T4>::type
 }
 
 template <class T1, class T2, class T3, class T4>
-inline typename tools::promote_args<T1, T2, T3, T4>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type
    ibeta_inv(T1 a, T2 b, T3 p, T4* py)
 {
    return ibeta_inv(a, b, p, py, policies::policy<>());
 }
 
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type
    ibeta_inv(T1 a, T2 b, T3 p)
 {
    typedef typename tools::promote_args<T1, T2, T3>::type result_type;
@@ -1016,7 +1041,7 @@ inline typename tools::promote_args<T1, T2, T3>::type
 }
 
 template <class T1, class T2, class T3, class Policy>
-inline typename tools::promote_args<T1, T2, T3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type
    ibeta_inv(T1 a, T2 b, T3 p, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2, T3>::type result_type;
@@ -1024,10 +1049,10 @@ inline typename tools::promote_args<T1, T2, T3>::type
 }
 
 template <class T1, class T2, class T3, class T4, class Policy>
-inline typename tools::promote_args<T1, T2, T3, T4>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type
    ibetac_inv(T1 a, T2 b, T3 q, T4* py, const Policy& pol)
 {
-   static const char* function = "boost::math::ibetac_inv<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ibetac_inv<%1%>(%1%,%1%,%1%)";
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T1, T2, T3, T4>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -1059,14 +1084,14 @@ inline typename tools::promote_args<T1, T2, T3, T4>::type
 }
 
 template <class T1, class T2, class T3, class T4>
-inline typename tools::promote_args<T1, T2, T3, T4>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type
    ibetac_inv(T1 a, T2 b, T3 q, T4* py)
 {
    return ibetac_inv(a, b, q, py, policies::policy<>());
 }
 
 template <class RT1, class RT2, class RT3>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibetac_inv(RT1 a, RT2 b, RT3 q)
 {
    typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
@@ -1074,7 +1099,7 @@ inline typename tools::promote_args<RT1, RT2, RT3>::type
 }
 
 template <class RT1, class RT2, class RT3, class Policy>
-inline typename tools::promote_args<RT1, RT2, RT3>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, RT3>::type
    ibetac_inv(RT1 a, RT2 b, RT3 q, const Policy& pol)
 {
    typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
diff --git a/inst/include/boost/math/special_functions/detail/iconv.hpp b/inst/include/boost/math/special_functions/detail/iconv.hpp
index 90b4aa938..20889d411 100644
--- a/inst/include/boost/math/special_functions/detail/iconv.hpp
+++ b/inst/include/boost/math/special_functions/detail/iconv.hpp
@@ -10,28 +10,29 @@
 #pragma once
 #endif
 
-#include <type_traits>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/round.hpp>
 
 namespace boost { namespace math { namespace detail{
 
 template <class T, class Policy>
-inline int iconv_imp(T v, Policy const&, std::true_type const&)
+BOOST_MATH_GPU_ENABLED inline int iconv_imp(T v, Policy const&, boost::math::true_type const&)
 {
    return static_cast<int>(v);
 }
 
 template <class T, class Policy>
-inline int iconv_imp(T v, Policy const& pol, std::false_type const&)
+BOOST_MATH_GPU_ENABLED inline int iconv_imp(T v, Policy const& pol, boost::math::false_type const&)
 {
    BOOST_MATH_STD_USING
    return iround(v, pol);
 }
 
 template <class T, class Policy>
-inline int iconv(T v, Policy const& pol)
+BOOST_MATH_GPU_ENABLED inline int iconv(T v, Policy const& pol)
 {
-   typedef typename std::is_convertible<T, int>::type tag_type;
+   typedef typename boost::math::is_convertible<T, int>::type tag_type;
    return iconv_imp(v, pol, tag_type());
 }
 
diff --git a/inst/include/boost/math/special_functions/detail/igamma_inverse.hpp b/inst/include/boost/math/special_functions/detail/igamma_inverse.hpp
index f6bbcd72d..4efd4f78a 100644
--- a/inst/include/boost/math/special_functions/detail/igamma_inverse.hpp
+++ b/inst/include/boost/math/special_functions/detail/igamma_inverse.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,6 +11,8 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/tools/tuple.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/sign.hpp>
@@ -21,7 +24,7 @@ namespace boost{ namespace math{
 namespace detail{
 
 template <class T>
-T find_inverse_s(T p, T q)
+BOOST_MATH_GPU_ENABLED T find_inverse_s(T p, T q)
 {
    //
    // Computation of the Incomplete Gamma Function Ratios and their Inverse
@@ -41,8 +44,8 @@ T find_inverse_s(T p, T q)
    {
       t = sqrt(-2 * log(q));
    }
-   static const double a[4] = { 3.31125922108741, 11.6616720288968, 4.28342155967104, 0.213623493715853 };
-   static const double b[5] = { 1, 6.61053765625462, 6.40691597760039, 1.27364489782223, 0.3611708101884203e-1 };
+   BOOST_MATH_STATIC const double a[4] = { 3.31125922108741, 11.6616720288968, 4.28342155967104, 0.213623493715853 };
+   BOOST_MATH_STATIC const double b[5] = { 1, 6.61053765625462, 6.40691597760039, 1.27364489782223, 0.3611708101884203e-1 };
    T s = t - tools::evaluate_polynomial(a, t) / tools::evaluate_polynomial(b, t);
    if(p < T(0.5))
       s = -s;
@@ -50,7 +53,7 @@ T find_inverse_s(T p, T q)
 }
 
 template <class T>
-T didonato_SN(T a, T x, unsigned N, T tolerance = 0)
+BOOST_MATH_GPU_ENABLED T didonato_SN(T a, T x, unsigned N, T tolerance = 0)
 {
    //
    // Computation of the Incomplete Gamma Function Ratios and their Inverse
@@ -77,7 +80,7 @@ T didonato_SN(T a, T x, unsigned N, T tolerance = 0)
 }
 
 template <class T, class Policy>
-inline T didonato_FN(T p, T a, T x, unsigned N, T tolerance, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T didonato_FN(T p, T a, T x, unsigned N, T tolerance, const Policy& pol)
 {
    //
    // Computation of the Incomplete Gamma Function Ratios and their Inverse
@@ -93,7 +96,7 @@ inline T didonato_FN(T p, T a, T x, unsigned N, T tolerance, const Policy& pol)
 }
 
 template <class T, class Policy>
-T find_inverse_gamma(T a, T p, T q, const Policy& pol, bool* p_has_10_digits)
+BOOST_MATH_GPU_ENABLED T find_inverse_gamma(T a, T p, T q, const Policy& pol, bool* p_has_10_digits)
 {
    //
    // In order to understand what's going on here, you will
@@ -233,7 +236,7 @@ T find_inverse_gamma(T a, T p, T q, const Policy& pol, bool* p_has_10_digits)
          }
          else
          {
-            T D = (std::max)(T(2), T(a * (a - 1)));
+            T D = BOOST_MATH_GPU_SAFE_MAX(T(2), T(a * (a - 1)));
             T lg = boost::math::lgamma(a, pol);
             T lb = log(q) + lg;
             if(lb < -D * T(2.3))
@@ -315,7 +318,7 @@ T find_inverse_gamma(T a, T p, T q, const Policy& pol, bool* p_has_10_digits)
 template <class T, class Policy>
 struct gamma_p_inverse_func
 {
-   gamma_p_inverse_func(T a_, T p_, bool inv) : a(a_), p(p_), invert(inv)
+   BOOST_MATH_GPU_ENABLED gamma_p_inverse_func(T a_, T p_, bool inv) : a(a_), p(p_), invert(inv)
    {
       //
       // If p is too near 1 then P(x) - p suffers from cancellation
@@ -333,7 +336,7 @@ struct gamma_p_inverse_func
       }
    }
 
-   boost::math::tuple<T, T, T> operator()(const T& x)const
+   BOOST_MATH_GPU_ENABLED boost::math::tuple<T, T, T> operator()(const T& x)const
    {
       BOOST_FPU_EXCEPTION_GUARD
       //
@@ -395,11 +398,11 @@ struct gamma_p_inverse_func
 };
 
 template <class T, class Policy>
-T gamma_p_inv_imp(T a, T p, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T gamma_p_inv_imp(T a, T p, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // ADL of std functions.
 
-   static const char* function = "boost::math::gamma_p_inv<%1%>(%1%, %1%)";
+   constexpr auto function = "boost::math::gamma_p_inv<%1%>(%1%, %1%)";
 
    BOOST_MATH_INSTRUMENT_VARIABLE(a);
    BOOST_MATH_INSTRUMENT_VARIABLE(p);
@@ -442,7 +445,9 @@ T gamma_p_inv_imp(T a, T p, const Policy& pol)
    //
    // Go ahead and iterate:
    //
-   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
    guess = tools::halley_iterate(
       detail::gamma_p_inverse_func<T, Policy>(a, p, false),
       guess,
@@ -450,6 +455,16 @@ T gamma_p_inv_imp(T a, T p, const Policy& pol)
       tools::max_value<T>(),
       digits,
       max_iter);
+   #else
+   guess = tools::newton_raphson_iterate(
+      detail::gamma_p_inverse_func<T, Policy>(a, p, false),
+      guess,
+      lower,
+      tools::max_value<T>(),
+      digits,
+      max_iter);
+   #endif
+   
    policies::check_root_iterations<T>(function, max_iter, pol);
    BOOST_MATH_INSTRUMENT_VARIABLE(guess);
    if(guess == lower)
@@ -458,11 +473,11 @@ T gamma_p_inv_imp(T a, T p, const Policy& pol)
 }
 
 template <class T, class Policy>
-T gamma_q_inv_imp(T a, T q, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T gamma_q_inv_imp(T a, T q, const Policy& pol)
 {
    BOOST_MATH_STD_USING  // ADL of std functions.
 
-   static const char* function = "boost::math::gamma_q_inv<%1%>(%1%, %1%)";
+   constexpr auto function = "boost::math::gamma_q_inv<%1%>(%1%, %1%)";
 
    if(a <= 0)
       return policies::raise_domain_error<T>(function, "Argument a in the incomplete gamma function inverse must be >= 0 (got a=%1%).", a, pol);
@@ -501,7 +516,9 @@ T gamma_q_inv_imp(T a, T q, const Policy& pol)
    //
    // Go ahead and iterate:
    //
-   std::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_root_iterations<Policy>();
+
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
    guess = tools::halley_iterate(
       detail::gamma_p_inverse_func<T, Policy>(a, q, true),
       guess,
@@ -509,6 +526,16 @@ T gamma_q_inv_imp(T a, T q, const Policy& pol)
       tools::max_value<T>(),
       digits,
       max_iter);
+   #else
+   guess = tools::newton_raphson_iterate(
+      detail::gamma_p_inverse_func<T, Policy>(a, q, true),
+      guess,
+      lower,
+      tools::max_value<T>(),
+      digits,
+      max_iter);
+   #endif
+
    policies::check_root_iterations<T>(function, max_iter, pol);
    if(guess == lower)
       guess = policies::raise_underflow_error<T>(function, "Expected result known to be non-zero, but is smaller than the smallest available number.", pol);
@@ -518,7 +545,7 @@ T gamma_q_inv_imp(T a, T q, const Policy& pol)
 } // namespace detail
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_p_inv(T1 a, T2 p, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
@@ -528,7 +555,7 @@ inline typename tools::promote_args<T1, T2>::type
 }
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_q_inv(T1 a, T2 p, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
@@ -538,14 +565,14 @@ inline typename tools::promote_args<T1, T2>::type
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_p_inv(T1 a, T2 p)
 {
    return gamma_p_inv(a, p, policies::policy<>());
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    gamma_q_inv(T1 a, T2 p)
 {
    return gamma_q_inv(a, p, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/detail/igamma_large.hpp b/inst/include/boost/math/special_functions/detail/igamma_large.hpp
index 5483b53fb..8e0ad1b0d 100644
--- a/inst/include/boost/math/special_functions/detail/igamma_large.hpp
+++ b/inst/include/boost/math/special_functions/detail/igamma_large.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2006.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -59,13 +60,16 @@
 #pragma GCC system_header
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+
 namespace boost{ namespace math{ namespace detail{
 
 // This version will never be called (at runtime), it's a stub used
 // when T is unsuitable to be passed to these routines:
 //
 template <class T, class Policy>
-inline T igamma_temme_large(T, T, const Policy& /* pol */, std::integral_constant<int, 0> const *)
+BOOST_MATH_GPU_ENABLED inline T igamma_temme_large(T, T, const Policy& /* pol */, const boost::math::integral_constant<int, 0>&)
 {
    // stub function, should never actually be called
    BOOST_MATH_ASSERT(0);
@@ -75,8 +79,11 @@ inline T igamma_temme_large(T, T, const Policy& /* pol */, std::integral_constan
 // This version is accurate for up to 64-bit mantissa's, 
 // (80-bit long double, or 10^-20).
 //
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <class T, class Policy>
-T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64> const *)
+BOOST_MATH_GPU_ENABLED T igamma_temme_large(T a, T x, const Policy& pol, const boost::math::integral_constant<int, 64>&)
 {
    BOOST_MATH_STD_USING // ADL of std functions
    T sigma = (x - a) / a;
@@ -88,7 +95,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
 
    T workspace[13];
 
-   static const T C0[] = {
+   BOOST_MATH_STATIC const T C0[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.333333333333333333333),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.0833333333333333333333),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.0148148148148148148148),
@@ -111,7 +118,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[0] = tools::evaluate_polynomial(C0, z);
 
-   static const T C1[] = {
+   BOOST_MATH_STATIC const T C1[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.00185185185185185185185),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.00347222222222222222222),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00264550264550264550265),
@@ -132,7 +139,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[1] = tools::evaluate_polynomial(C1, z);
 
-   static const T C2[] = {
+   BOOST_MATH_STATIC const T C2[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00413359788359788359788),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.00268132716049382716049),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000771604938271604938272),
@@ -151,7 +158,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[2] = tools::evaluate_polynomial(C2, z);
 
-   static const T C3[] = {
+   BOOST_MATH_STATIC const T C3[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000649434156378600823045),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000229472093621399176955),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000469189494395255712128),
@@ -168,7 +175,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[3] = tools::evaluate_polynomial(C3, z);
 
-   static const T C4[] = {
+   BOOST_MATH_STATIC const T C4[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000861888290916711698605),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000784039221720066627474),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000299072480303190179733),
@@ -183,7 +190,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[4] = tools::evaluate_polynomial(C4, z);
 
-   static const T C5[] = {
+   BOOST_MATH_STATIC const T C5[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000336798553366358150309),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.697281375836585777429e-4),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000277275324495939207873),
@@ -196,7 +203,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[5] = tools::evaluate_polynomial(C5, z);
 
-   static const T C6[] = {
+   BOOST_MATH_STATIC const T C6[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000531307936463992223166),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000592166437353693882865),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000270878209671804482771),
@@ -211,7 +218,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[6] = tools::evaluate_polynomial(C6, z);
 
-   static const T C7[] = {
+   BOOST_MATH_STATIC const T C7[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000344367606892377671254),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.517179090826059219337e-4),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000334931610811422363117),
@@ -224,7 +231,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[7] = tools::evaluate_polynomial(C7, z);
 
-   static const T C8[] = {
+   BOOST_MATH_STATIC const T C8[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000652623918595309418922),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000839498720672087279993),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000438297098541721005061),
@@ -235,7 +242,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[8] = tools::evaluate_polynomial(C8, z);
 
-   static const T C9[] = {
+   BOOST_MATH_STATIC const T C9[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.000596761290192746250124),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.720489541602001055909e-4),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000678230883766732836162),
@@ -244,14 +251,14 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[9] = tools::evaluate_polynomial(C9, z);
 
-   static const T C10[] = {
+   BOOST_MATH_STATIC const T C10[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00133244544948006563713),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.0019144384985654775265),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00110893691345966373396),
    };
    workspace[10] = tools::evaluate_polynomial(C10, z);
 
-   static const T C11[] = {
+   BOOST_MATH_STATIC const T C11[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00157972766073083495909),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.000162516262783915816899),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.00206334210355432762645),
@@ -260,7 +267,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
    };
    workspace[11] = tools::evaluate_polynomial(C11, z);
 
-   static const T C12[] = {
+   BOOST_MATH_STATIC const T C12[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.00407251211951401664727),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00640336283380806979482),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.00404101610816766177474),
@@ -276,12 +283,15 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 64
 
    return result;
 }
+
+#endif
+
 //
 // This one is accurate for 53-bit mantissa's
 // (IEEE double precision or 10^-17).
 //
 template <class T, class Policy>
-T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53> const *)
+BOOST_MATH_GPU_ENABLED T igamma_temme_large(T a, T x, const Policy& pol, const boost::math::integral_constant<int, 53>&)
 {
    BOOST_MATH_STD_USING // ADL of std functions
    T sigma = (x - a) / a;
@@ -293,7 +303,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
 
    T workspace[10];
 
-   static const T C0[] = {
+   BOOST_MATH_STATIC const T C0[] = {
       static_cast<T>(-0.33333333333333333L),
       static_cast<T>(0.083333333333333333L),
       static_cast<T>(-0.014814814814814815L),
@@ -312,7 +322,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[0] = tools::evaluate_polynomial(C0, z);
 
-   static const T C1[] = {
+   BOOST_MATH_STATIC const T C1[] = {
       static_cast<T>(-0.0018518518518518519L),
       static_cast<T>(-0.0034722222222222222L),
       static_cast<T>(0.0026455026455026455L),
@@ -329,7 +339,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[1] = tools::evaluate_polynomial(C1, z);
 
-   static const T C2[] = {
+   BOOST_MATH_STATIC const T C2[] = {
       static_cast<T>(0.0041335978835978836L),
       static_cast<T>(-0.0026813271604938272L),
       static_cast<T>(0.00077160493827160494L),
@@ -344,7 +354,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[2] = tools::evaluate_polynomial(C2, z);
 
-   static const T C3[] = {
+   BOOST_MATH_STATIC const T C3[] = {
       static_cast<T>(0.00064943415637860082L),
       static_cast<T>(0.00022947209362139918L),
       static_cast<T>(-0.00046918949439525571L),
@@ -357,7 +367,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[3] = tools::evaluate_polynomial(C3, z);
 
-   static const T C4[] = {
+   BOOST_MATH_STATIC const T C4[] = {
       static_cast<T>(-0.0008618882909167117L),
       static_cast<T>(0.00078403922172006663L),
       static_cast<T>(-0.00029907248030319018L),
@@ -368,7 +378,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[4] = tools::evaluate_polynomial(C4, z);
 
-   static const T C5[] = {
+   BOOST_MATH_STATIC const T C5[] = {
       static_cast<T>(-0.00033679855336635815L),
       static_cast<T>(-0.69728137583658578e-4L),
       static_cast<T>(0.00027727532449593921L),
@@ -381,7 +391,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[5] = tools::evaluate_polynomial(C5, z);
 
-   static const T C6[] = {
+   BOOST_MATH_STATIC const T C6[] = {
       static_cast<T>(0.00053130793646399222L),
       static_cast<T>(-0.00059216643735369388L),
       static_cast<T>(0.00027087820967180448L),
@@ -392,7 +402,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[6] = tools::evaluate_polynomial(C6, z);
 
-   static const T C7[] = {
+   BOOST_MATH_STATIC const T C7[] = {
       static_cast<T>(0.00034436760689237767L),
       static_cast<T>(0.51717909082605922e-4L),
       static_cast<T>(-0.00033493161081142236L),
@@ -401,7 +411,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    };
    workspace[7] = tools::evaluate_polynomial(C7, z);
 
-   static const T C8[] = {
+   BOOST_MATH_STATIC const T C8[] = {
       static_cast<T>(-0.00065262391859530942L),
       static_cast<T>(0.00083949872067208728L),
       static_cast<T>(-0.00043829709854172101L),
@@ -414,7 +424,18 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
    if(x < a)
       result = -result;
 
+   #ifdef BOOST_MATH_HAS_NVRTC
+   if (boost::math::is_same_v<T, float>)
+   {
+      result += ::erfcf(::sqrtf(y)) / 2;
+   }
+   else
+   {
+      result += ::erfc(::sqrt(y)) / 2;
+   }
+   #else
    result += boost::math::erfc(sqrt(y), pol) / 2;
+   #endif
 
    return result;
 }
@@ -423,7 +444,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 53
 // (IEEE float precision, or 10^-8)
 //
 template <class T, class Policy>
-T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 24> const *)
+BOOST_MATH_GPU_ENABLED T igamma_temme_large(T a, T x, const Policy& pol, const boost::math::integral_constant<int, 24>&)
 {
    BOOST_MATH_STD_USING // ADL of std functions
    T sigma = (x - a) / a;
@@ -435,7 +456,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 24
 
    T workspace[3];
 
-   static const T C0[] = {
+   BOOST_MATH_STATIC const T C0[] = {
       static_cast<T>(-0.333333333L),
       static_cast<T>(0.0833333333L),
       static_cast<T>(-0.0148148148L),
@@ -446,7 +467,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 24
    };
    workspace[0] = tools::evaluate_polynomial(C0, z);
 
-   static const T C1[] = {
+   BOOST_MATH_STATIC const T C1[] = {
       static_cast<T>(-0.00185185185L),
       static_cast<T>(-0.00347222222L),
       static_cast<T>(0.00264550265L),
@@ -455,7 +476,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 24
    };
    workspace[1] = tools::evaluate_polynomial(C1, z);
 
-   static const T C2[] = {
+   BOOST_MATH_STATIC const T C2[] = {
       static_cast<T>(0.00413359788L),
       static_cast<T>(-0.00268132716L),
       static_cast<T>(0.000771604938L),
@@ -467,7 +488,18 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 24
    if(x < a)
       result = -result;
 
+   #ifdef BOOST_MATH_HAS_NVRTC
+   if (boost::math::is_same_v<T, float>)
+   {
+      result += ::erfcf(::sqrtf(y)) / 2;
+   }
+   else
+   {
+      result += ::erfc(::sqrt(y)) / 2;
+   }
+   #else
    result += boost::math::erfc(sqrt(y), pol) / 2;
+   #endif
 
    return result;
 }
@@ -478,8 +510,10 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 24
 // It's use for a < 200 is not recommended, that would
 // require many more terms in the polynomials.
 //
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <class T, class Policy>
-T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 113> const *)
+BOOST_MATH_GPU_ENABLED T igamma_temme_large(T a, T x, const Policy& pol, const boost::math::integral_constant<int, 113>&)
 {
    BOOST_MATH_STD_USING // ADL of std functions
    T sigma = (x - a) / a;
@@ -491,7 +525,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
 
    T workspace[14];
 
-   static const T C0[] = {
+   BOOST_MATH_STATIC const T C0[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.333333333333333333333333333333333333),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.0833333333333333333333333333333333333),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.0148148148148148148148148148148148148),
@@ -526,7 +560,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[0] = tools::evaluate_polynomial(C0, z);
 
-   static const T C1[] = {
+   BOOST_MATH_STATIC const T C1[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00185185185185185185185185185185185185),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00347222222222222222222222222222222222),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.0026455026455026455026455026455026455),
@@ -559,7 +593,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[1] = tools::evaluate_polynomial(C1, z);
 
-   static const T C2[] = {
+   BOOST_MATH_STATIC const T C2[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.0041335978835978835978835978835978836),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00268132716049382716049382716049382716),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000771604938271604938271604938271604938),
@@ -590,7 +624,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[2] = tools::evaluate_polynomial(C2, z);
 
-   static const T C3[] = {
+   BOOST_MATH_STATIC const T C3[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000649434156378600823045267489711934156),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000229472093621399176954732510288065844),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000469189494395255712128140111679206329),
@@ -619,7 +653,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[3] = tools::evaluate_polynomial(C3, z);
 
-   static const T C4[] = {
+   BOOST_MATH_STATIC const T C4[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000861888290916711698604702719929057378),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.00078403922172006662747403488144228885),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000299072480303190179733389609932819809),
@@ -646,7 +680,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[4] = tools::evaluate_polynomial(C4, z);
 
-   static const T C5[] = {
+   BOOST_MATH_STATIC const T C5[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000336798553366358150308767592718210002),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.697281375836585777429398828575783308e-4),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.00027727532449593920787336425196507501),
@@ -667,7 +701,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[5] = tools::evaluate_polynomial(C5, z);
 
-   static const T C6[] = {
+   BOOST_MATH_STATIC const T C6[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.00053130793646399222316574854297762391),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000592166437353693882864836225604401187),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000270878209671804482771279183488328692),
@@ -686,7 +720,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[6] = tools::evaluate_polynomial(C6, z);
 
-   static const T C7[] = {
+   BOOST_MATH_STATIC const T C7[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000344367606892377671254279625108523655),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.517179090826059219337057843002058823e-4),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000334931610811422363116635090580012327),
@@ -703,7 +737,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[7] = tools::evaluate_polynomial(C7, z);
 
-   static const T C8[] = {
+   BOOST_MATH_STATIC const T C8[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000652623918595309418922034919726622692),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000839498720672087279993357516764983445),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000438297098541721005061087953050560377),
@@ -718,7 +752,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[8] = tools::evaluate_polynomial(C8, z);
 
-   static const T C9[] = {
+   BOOST_MATH_STATIC const T C9[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.000596761290192746250124390067179459605),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.720489541602001055908571930225015052e-4),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000678230883766732836161951166000673426),
@@ -731,7 +765,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[9] = tools::evaluate_polynomial(C9, z);
 
-   static const T C10[] = {
+   BOOST_MATH_STATIC const T C10[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.00133244544948006563712694993432717968),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00191443849856547752650089885832852254),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.0011089369134596637339607446329267522),
@@ -742,7 +776,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[10] = tools::evaluate_polynomial(C10, z);
 
-   static const T C11[] = {
+   BOOST_MATH_STATIC const T C11[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.00157972766073083495908785631307733022),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.000162516262783915816898635123980270998),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00206334210355432762645284467690276817),
@@ -751,7 +785,7 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    };
    workspace[11] = tools::evaluate_polynomial(C11, z);
 
-   static const T C12[] = {
+   BOOST_MATH_STATIC const T C12[] = {
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00407251211951401664727281097914544601),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.00640336283380806979482363809026579583),
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.00404101610816766177473974858518094879),
@@ -769,6 +803,8 @@ T igamma_temme_large(T a, T x, const Policy& pol, std::integral_constant<int, 11
    return result;
 }
 
+#endif
+
 }  // namespace detail
 }  // namespace math
 }  // namespace math
diff --git a/inst/include/boost/math/special_functions/detail/lgamma_small.hpp b/inst/include/boost/math/special_functions/detail/lgamma_small.hpp
index 6a4a9171f..1ce52fac3 100644
--- a/inst/include/boost/math/special_functions/detail/lgamma_small.hpp
+++ b/inst/include/boost/math/special_functions/detail/lgamma_small.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,7 +11,11 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/big_constant.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/special_functions/lanczos.hpp>
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -28,15 +33,15 @@ namespace boost{ namespace math{ namespace detail{
 // These need forward declaring to keep GCC happy:
 //
 template <class T, class Policy, class Lanczos>
-T gamma_imp(T z, const Policy& pol, const Lanczos& l);
+BOOST_MATH_GPU_ENABLED T gamma_imp(T z, const Policy& pol, const Lanczos& l);
 template <class T, class Policy>
-T gamma_imp(T z, const Policy& pol, const lanczos::undefined_lanczos& l);
+BOOST_MATH_GPU_ENABLED T gamma_imp(T z, const Policy& pol, const lanczos::undefined_lanczos& l);
 
 //
 // lgamma for small arguments:
 //
 template <class T, class Policy, class Lanczos>
-T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, const Policy& /* l */, const Lanczos&)
+BOOST_MATH_GPU_ENABLED T lgamma_small_imp(T z, T zm1, T zm2, const boost::math::integral_constant<int, 64>&, const Policy& /* l */, const Lanczos&)
 {
    // This version uses rational approximations for small
    // values of z accurate enough for 64-bit mantissas
@@ -87,7 +92,7 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
       // At long double: Max error found:               1.987e-21
       // Maximum Deviation Found (approximation error): 5.900e-24
       //
-      static const T P[] = {
+      BOOST_MATH_STATIC const T P[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.180355685678449379109e-1)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.25126649619989678683e-1)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.494103151567532234274e-1)),
@@ -96,7 +101,7 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.541009869215204396339e-3)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.324588649825948492091e-4))
       };
-      static const T Q[] = {
+      BOOST_MATH_STATIC const T Q[] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.1e1)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.196202987197795200688e1)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.148019669424231326694e1)),
@@ -107,7 +112,7 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.223352763208617092964e-6))
       };
 
-      static const float Y = 0.158963680267333984375e0f;
+      constexpr float Y = 0.158963680267333984375e0f;
 
       T r = zm2 * (z + 1);
       T R = tools::evaluate_polynomial(P, zm2);
@@ -152,9 +157,9 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
          // Expected Error Term:                                 3.139e-021
 
          //
-         static const float Y = 0.52815341949462890625f;
+         constexpr float Y = 0.52815341949462890625f;
 
-         static const T P[] = {
+         BOOST_MATH_STATIC const T P[] = {
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.490622454069039543534e-1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.969117530159521214579e-1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.414983358359495381969e0)),
@@ -163,7 +168,7 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.240149820648571559892e-1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.100346687696279557415e-2))
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.1e1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.302349829846463038743e1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.348739585360723852576e1)),
@@ -197,9 +202,9 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
          // Maximum Deviation Found:                           2.151e-021
          // Expected Error Term:                               2.150e-021
          //
-         static const float Y = 0.452017307281494140625f;
+         constexpr float Y = 0.452017307281494140625f;
 
-         static const T P[] = {
+         BOOST_MATH_STATIC const T P[] = {
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.292329721830270012337e-1)), 
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.144216267757192309184e0)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.142440390738631274135e0)),
@@ -207,7 +212,7 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.850535976868336437746e-2)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.431171342679297331241e-3))
          };
-         static const T Q[] = {
+         BOOST_MATH_STATIC const T Q[] = {
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.1e1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.150169356054485044494e1)),
             static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.846973248876495016101e0)),
@@ -224,8 +229,10 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 64>&, co
    }
    return result;
 }
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
 template <class T, class Policy, class Lanczos>
-T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 113>&, const Policy& /* l */, const Lanczos&)
+T lgamma_small_imp(T z, T zm1, T zm2, const boost::math::integral_constant<int, 113>&, const Policy& /* l */, const Lanczos&)
 {
    //
    // This version uses rational approximations for small
@@ -482,7 +489,7 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 113>&, c
    return result;
 }
 template <class T, class Policy, class Lanczos>
-T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 0>&, const Policy& pol, const Lanczos& l)
+BOOST_MATH_GPU_ENABLED T lgamma_small_imp(T z, T zm1, T zm2, const boost::math::integral_constant<int, 0>&, const Policy& pol, const Lanczos& l)
 {
    //
    // No rational approximations are available because either
@@ -526,6 +533,8 @@ T lgamma_small_imp(T z, T zm1, T zm2, const std::integral_constant<int, 0>&, con
    return result;
 }
 
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
 }}} // namespaces
 
 #endif // BOOST_MATH_SPECIAL_FUNCTIONS_DETAIL_LGAMMA_SMALL
diff --git a/inst/include/boost/math/special_functions/detail/polygamma.hpp b/inst/include/boost/math/special_functions/detail/polygamma.hpp
index 8c11f40ae..8ca366314 100644
--- a/inst/include/boost/math/special_functions/detail/polygamma.hpp
+++ b/inst/include/boost/math/special_functions/detail/polygamma.hpp
@@ -25,7 +25,7 @@
 #include <boost/math/tools/assert.hpp>
 #include <boost/math/tools/config.hpp>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <mutex>
 #endif
 
@@ -406,7 +406,7 @@ namespace boost { namespace math { namespace detail{
      //
      if((unsigned)n / 2u > policies::get_max_series_iterations<Policy>())
         return policies::raise_evaluation_error<T>(function, "The value of n is so large that we're unable to compute the result in reasonable time, best guess is %1%", 0, pol);
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
      static std::mutex m;
      std::lock_guard<std::mutex> l(m);
 #endif
diff --git a/inst/include/boost/math/special_functions/detail/round_fwd.hpp b/inst/include/boost/math/special_functions/detail/round_fwd.hpp
index c58459e36..7d69f8b9c 100644
--- a/inst/include/boost/math/special_functions/detail/round_fwd.hpp
+++ b/inst/include/boost/math/special_functions/detail/round_fwd.hpp
@@ -1,4 +1,5 @@
 // Copyright John Maddock 2008.
+// Copyright Matt Borland 2024
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -21,53 +22,53 @@ namespace boost
    { 
 
    template <class T, class Policy>
-   typename tools::promote_args<T>::type trunc(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type trunc(const T& v, const Policy& pol);
    template <class T>
-   typename tools::promote_args<T>::type trunc(const T& v);
+   BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type trunc(const T& v);
    template <class T, class Policy>
-   int itrunc(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED int itrunc(const T& v, const Policy& pol);
    template <class T>
-   int itrunc(const T& v);
+   BOOST_MATH_GPU_ENABLED int itrunc(const T& v);
    template <class T, class Policy>
-   long ltrunc(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED long ltrunc(const T& v, const Policy& pol);
    template <class T>
-   long ltrunc(const T& v);
+   BOOST_MATH_GPU_ENABLED long ltrunc(const T& v);
    template <class T, class Policy>
-   long long lltrunc(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED long long lltrunc(const T& v, const Policy& pol);
    template <class T>
-   long long lltrunc(const T& v);
+   BOOST_MATH_GPU_ENABLED long long lltrunc(const T& v);
    template <class T, class Policy>
-   typename tools::promote_args<T>::type round(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type round(const T& v, const Policy& pol);
    template <class T>
-   typename tools::promote_args<T>::type round(const T& v);
+   BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type round(const T& v);
    template <class T, class Policy>
-   int iround(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED int iround(const T& v, const Policy& pol);
    template <class T>
-   int iround(const T& v);
+   BOOST_MATH_GPU_ENABLED int iround(const T& v);
    template <class T, class Policy>
-   long lround(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED long lround(const T& v, const Policy& pol);
    template <class T>
-   long lround(const T& v);
+   BOOST_MATH_GPU_ENABLED long lround(const T& v);
    template <class T, class Policy>
-   long long llround(const T& v, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED long long llround(const T& v, const Policy& pol);
    template <class T>
-   long long llround(const T& v);
+   BOOST_MATH_GPU_ENABLED long long llround(const T& v);
    template <class T, class Policy>
-   T modf(const T& v, T* ipart, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, T* ipart, const Policy& pol);
    template <class T>
-   T modf(const T& v, T* ipart);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, T* ipart);
    template <class T, class Policy>
-   T modf(const T& v, int* ipart, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, int* ipart, const Policy& pol);
    template <class T>
-   T modf(const T& v, int* ipart);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, int* ipart);
    template <class T, class Policy>
-   T modf(const T& v, long* ipart, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, long* ipart, const Policy& pol);
    template <class T>
-   T modf(const T& v, long* ipart);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, long* ipart);
    template <class T, class Policy>
-   T modf(const T& v, long long* ipart, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, long long* ipart, const Policy& pol);
    template <class T>
-   T modf(const T& v, long long* ipart);
+   BOOST_MATH_GPU_ENABLED T modf(const T& v, long long* ipart);
    }
 }
 
diff --git a/inst/include/boost/math/special_functions/detail/t_distribution_inv.hpp b/inst/include/boost/math/special_functions/detail/t_distribution_inv.hpp
index 9209b6d40..79a29a027 100644
--- a/inst/include/boost/math/special_functions/detail/t_distribution_inv.hpp
+++ b/inst/include/boost/math/special_functions/detail/t_distribution_inv.hpp
@@ -11,6 +11,9 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/special_functions/cbrt.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/math/special_functions/trunc.hpp>
@@ -24,7 +27,7 @@ namespace boost{ namespace math{ namespace detail{
 // Communications of the ACM, 13(10): 619-620, Oct., 1970.
 //
 template <class T, class Policy>
-T inverse_students_t_hill(T ndf, T u, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T inverse_students_t_hill(T ndf, T u, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    BOOST_MATH_ASSERT(u <= 0.5);
@@ -74,7 +77,7 @@ T inverse_students_t_hill(T ndf, T u, const Policy& pol)
 // Journal of Computational Finance, Vol 9 Issue 4, pp 37-73, Summer 2006
 //
 template <class T, class Policy>
-T inverse_students_t_tail_series(T df, T v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T inverse_students_t_tail_series(T df, T v, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    // Tail series expansion, see section 6 of Shaw's paper.
@@ -125,7 +128,7 @@ T inverse_students_t_tail_series(T df, T v, const Policy& pol)
 }
 
 template <class T, class Policy>
-T inverse_students_t_body_series(T df, T u, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T inverse_students_t_body_series(T df, T u, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    //
@@ -204,7 +207,7 @@ T inverse_students_t_body_series(T df, T u, const Policy& pol)
 }
 
 template <class T, class Policy>
-T inverse_students_t(T df, T u, T v, const Policy& pol, bool* pexact = nullptr)
+BOOST_MATH_GPU_ENABLED T inverse_students_t(T df, T u, T v, const Policy& pol, bool* pexact = nullptr)
 {
    //
    // df = number of degrees of freedom.
@@ -220,7 +223,7 @@ T inverse_students_t(T df, T u, T v, const Policy& pol, bool* pexact = nullptr)
    if(u > v)
    {
       // function is symmetric, invert it:
-      std::swap(u, v);
+      BOOST_MATH_GPU_SAFE_SWAP(u, v);
       invert = true;
    }
    if((floor(df) == df) && (df < 20))
@@ -416,7 +419,7 @@ T inverse_students_t(T df, T u, T v, const Policy& pol, bool* pexact = nullptr)
 }
 
 template <class T, class Policy>
-inline T find_ibeta_inv_from_t_dist(T a, T p, T /*q*/, T* py, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T find_ibeta_inv_from_t_dist(T a, T p, T /*q*/, T* py, const Policy& pol)
 {
    T u = p / 2;
    T v = 1 - u;
@@ -426,8 +429,21 @@ inline T find_ibeta_inv_from_t_dist(T a, T p, T /*q*/, T* py, const Policy& pol)
    return df / (df + t * t);
 }
 
+// NVRTC requires this forward decl because there is a header cycle between here and ibeta_inverse.hpp
+#ifdef BOOST_MATH_HAS_NVRTC
+
+} // Namespace detail
+
+template <class T1, class T2, class T3, class T4, class Policy>
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type
+   ibeta_inv(T1 a, T2 b, T3 p, T4* py, const Policy& pol);
+
+namespace detail {
+
+#endif
+
 template <class T, class Policy>
-inline T fast_students_t_quantile_imp(T df, T p, const Policy& pol, const std::false_type*)
+BOOST_MATH_GPU_ENABLED inline T fast_students_t_quantile_imp(T df, T p, const Policy& pol, const boost::math::false_type*)
 {
    BOOST_MATH_STD_USING
    //
@@ -450,12 +466,12 @@ inline T fast_students_t_quantile_imp(T df, T p, const Policy& pol, const std::f
 }
 
 template <class T, class Policy>
-T fast_students_t_quantile_imp(T df, T p, const Policy& pol, const std::true_type*)
+BOOST_MATH_GPU_ENABLED T fast_students_t_quantile_imp(T df, T p, const Policy& pol, const boost::math::true_type*)
 {
    BOOST_MATH_STD_USING
    bool invert = false;
    if((df < 2) && (floor(df) != df))
-      return boost::math::detail::fast_students_t_quantile_imp(df, p, pol, static_cast<std::false_type*>(nullptr));
+      return boost::math::detail::fast_students_t_quantile_imp(df, p, pol, static_cast<boost::math::false_type*>(nullptr));
    if(p > 0.5)
    {
       p = 1 - p;
@@ -521,7 +537,7 @@ T fast_students_t_quantile_imp(T df, T p, const Policy& pol, const std::true_typ
 }
 
 template <class T, class Policy>
-inline T fast_students_t_quantile(T df, T p, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T fast_students_t_quantile(T df, T p, const Policy& pol)
 {
    typedef typename policies::evaluation<T, Policy>::type value_type;
    typedef typename policies::normalise<
@@ -531,12 +547,12 @@ inline T fast_students_t_quantile(T df, T p, const Policy& pol)
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   typedef std::integral_constant<bool,
-      (std::numeric_limits<T>::digits <= 53)
+   typedef boost::math::integral_constant<bool,
+      (boost::math::numeric_limits<T>::digits <= 53)
        &&
-      (std::numeric_limits<T>::is_specialized)
+      (boost::math::numeric_limits<T>::is_specialized)
        &&
-      (std::numeric_limits<T>::radix == 2)
+      (boost::math::numeric_limits<T>::radix == 2)
    > tag_type;
    return policies::checked_narrowing_cast<T, forwarding_policy>(fast_students_t_quantile_imp(static_cast<value_type>(df), static_cast<value_type>(p), pol, static_cast<tag_type*>(nullptr)), "boost::math::students_t_quantile<%1%>(%1%,%1%,%1%)");
 }
diff --git a/inst/include/boost/math/special_functions/detail/unchecked_factorial.hpp b/inst/include/boost/math/special_functions/detail/unchecked_factorial.hpp
index b528a24fe..92481f2c6 100644
--- a/inst/include/boost/math/special_functions/detail/unchecked_factorial.hpp
+++ b/inst/include/boost/math/special_functions/detail/unchecked_factorial.hpp
@@ -10,19 +10,23 @@
 #pragma once
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(push) // Temporary until lexical cast fixed.
-#pragma warning(disable: 4127 4701)
-#endif
-#include <boost/math/tools/convert_from_string.hpp>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <cmath>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/array.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/math/tools/cxx03_warn.hpp>
-#include <array>
-#include <type_traits>
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+#  ifdef _MSC_VER
+#    pragma warning(push) // Temporary until lexical cast fixed.
+#    pragma warning(disable: 4127 4701)
+#  endif
+#  include <boost/math/tools/convert_from_string.hpp>
+#  ifdef _MSC_VER
+#    pragma warning(pop)
+#  endif
+#endif
+
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -46,11 +50,21 @@ struct max_factorial;
 template <class T, bool = true>
 struct unchecked_factorial_data;
 
+#ifdef BOOST_MATH_HAS_NVRTC
+
+// Need fwd decl
+template <typename T>
+BOOST_MATH_GPU_ENABLED inline T unchecked_factorial(unsigned i);
+
+#endif
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <bool b>
 struct unchecked_factorial_data<float, b>
 {
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   static constexpr std::array<float, 35> factorials = { {
+   static constexpr boost::math::array<float, 35> factorials = { {
       1.0F,
       1.0F,
       2.0F,
@@ -88,15 +102,15 @@ struct unchecked_factorial_data<float, b>
       0.29523279903960414084761860964352e39F,
    }};
 #else
-   static const std::array<float, 35> factorials;
+   static const boost::math::array<float, 35> factorials;
 #endif
 };
 
 template<bool b>
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   constexpr std::array<float, 35> unchecked_factorial_data<float, b>::factorials;
+   constexpr boost::math::array<float, 35> unchecked_factorial_data<float, b>::factorials;
 #else
-   const std::array<float, 35> unchecked_factorial_data<float, b>::factorials = {{
+   const boost::math::array<float, 35> unchecked_factorial_data<float, b>::factorials = {{
       1.0F,
       1.0F,
       2.0F,
@@ -137,22 +151,72 @@ template<bool b>
 
 // Definitions:
 template <>
-inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION float unchecked_factorial<float>(unsigned i BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(float))
+BOOST_MATH_GPU_ENABLED inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION float unchecked_factorial<float>(unsigned i BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(float))
 {
    return unchecked_factorial_data<float>::factorials[i];
 }
 
+#else
+
+template <>
+BOOST_MATH_GPU_ENABLED inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION float unchecked_factorial<float>(unsigned i BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(float))
+{
+   constexpr float factorials[] = {
+      1.0F,
+      1.0F,
+      2.0F,
+      6.0F,
+      24.0F,
+      120.0F,
+      720.0F,
+      5040.0F,
+      40320.0F,
+      362880.0F,
+      3628800.0F,
+      39916800.0F,
+      479001600.0F,
+      6227020800.0F,
+      87178291200.0F,
+      1307674368000.0F,
+      20922789888000.0F,
+      355687428096000.0F,
+      6402373705728000.0F,
+      121645100408832000.0F,
+      0.243290200817664e19F,
+      0.5109094217170944e20F,
+      0.112400072777760768e22F,
+      0.2585201673888497664e23F,
+      0.62044840173323943936e24F,
+      0.15511210043330985984e26F,
+      0.403291461126605635584e27F,
+      0.10888869450418352160768e29F,
+      0.304888344611713860501504e30F,
+      0.8841761993739701954543616e31F,
+      0.26525285981219105863630848e33F,
+      0.822283865417792281772556288e34F,
+      0.26313083693369353016721801216e36F,
+      0.868331761881188649551819440128e37F,
+      0.29523279903960414084761860964352e39F,
+   };
+
+   return factorials[i];
+}
+
+#endif
+
 template <>
 struct max_factorial<float>
 {
    static constexpr unsigned value = 34;
 };
 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <bool b>
 struct unchecked_factorial_data<double, b>
 {
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   static constexpr std::array<double, 171> factorials = { {
+   static constexpr boost::math::array<double, 171> factorials = { {
       1.0,
       1.0,
       2.0,
@@ -326,15 +390,15 @@ struct unchecked_factorial_data<double, b>
       0.7257415615307998967396728211129263114717e307,
    }};
 #else
-   static const std::array<double, 171> factorials;
+   static const boost::math::array<double, 171> factorials;
 #endif
 };
 
 template <bool b>
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   constexpr std::array<double, 171> unchecked_factorial_data<double, b>::factorials;
+   constexpr boost::math::array<double, 171> unchecked_factorial_data<double, b>::factorials;
 #else
-   const std::array<double, 171> unchecked_factorial_data<double, b>::factorials = {{
+   const boost::math::array<double, 171> unchecked_factorial_data<double, b>::factorials = {{
       1.0,
       1.0,
       2.0,
@@ -510,7 +574,7 @@ template <bool b>
 #endif
 
 template <>
-inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION double unchecked_factorial<double>(unsigned i BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(double))
+BOOST_MATH_GPU_ENABLED inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION double unchecked_factorial<double>(unsigned i BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(double))
 {
    return unchecked_factorial_data<double>::factorials[i];
 }
@@ -521,11 +585,67 @@ struct max_factorial<double>
    static constexpr unsigned value = 170;
 };
 
+#else
+
+template <>
+BOOST_MATH_GPU_ENABLED inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION double unchecked_factorial<double>(unsigned i BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(double))
+{
+   constexpr double factorials[] = {
+      1,
+      1,
+      2,
+      6,
+      24,
+      120,
+      720,
+      5040,
+      40320,
+      362880.0,
+      3628800.0,
+      39916800.0,
+      479001600.0,
+      6227020800.0,
+      87178291200.0,
+      1307674368000.0,
+      20922789888000.0,
+      355687428096000.0,
+      6402373705728000.0,
+      121645100408832000.0,
+      0.243290200817664e19,
+      0.5109094217170944e20,
+      0.112400072777760768e22,
+      0.2585201673888497664e23,
+      0.62044840173323943936e24,
+      0.15511210043330985984e26,
+      0.403291461126605635584e27,
+      0.10888869450418352160768e29,
+      0.304888344611713860501504e30,
+      0.8841761993739701954543616e31,
+      0.26525285981219105863630848e33,
+      0.822283865417792281772556288e34,
+      0.26313083693369353016721801216e36,
+      0.868331761881188649551819440128e37,
+      0.29523279903960414084761860964352e39,
+   };
+
+   return factorials[i];
+}
+
+template <>
+struct max_factorial<double>
+{
+   static constexpr unsigned value = 34;
+};
+
+#endif
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <bool b>
 struct unchecked_factorial_data<long double, b>
 {
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   static constexpr std::array<long double, 171> factorials = { {
+   static constexpr boost::math::array<long double, 171> factorials = { {
       1L,
       1L,
       2L,
@@ -699,15 +819,15 @@ struct unchecked_factorial_data<long double, b>
       0.7257415615307998967396728211129263114717e307L,
    }};
 #else
-   static const std::array<long double, 171> factorials;
+   static const boost::math::array<long double, 171> factorials;
 #endif
 };
 
 template <bool b>
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   constexpr std::array<long double, 171> unchecked_factorial_data<long double, b>::factorials;
+   constexpr boost::math::array<long double, 171> unchecked_factorial_data<long double, b>::factorials;
 #else
-   const std::array<long double, 171> unchecked_factorial_data<long double, b>::factorials = {{
+   const boost::math::array<long double, 171> unchecked_factorial_data<long double, b>::factorials = {{
       1L,
       1L,
       2L,
@@ -900,7 +1020,7 @@ template <bool b>
 struct unchecked_factorial_data<BOOST_MATH_FLOAT128_TYPE, b>
 {
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   static constexpr std::array<BOOST_MATH_FLOAT128_TYPE, 171> factorials = { {
+   static constexpr boost::math::array<BOOST_MATH_FLOAT128_TYPE, 171> factorials = { {
       1,
       1,
       2,
@@ -1074,15 +1194,15 @@ struct unchecked_factorial_data<BOOST_MATH_FLOAT128_TYPE, b>
       0.7257415615307998967396728211129263114717e307Q,
    } };
 #else
-   static const std::array<BOOST_MATH_FLOAT128_TYPE, 171> factorials;
+   static const boost::math::array<BOOST_MATH_FLOAT128_TYPE, 171> factorials;
 #endif
 };
 
 template <bool b>
 #ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-constexpr std::array<BOOST_MATH_FLOAT128_TYPE, 171> unchecked_factorial_data<BOOST_MATH_FLOAT128_TYPE, b>::factorials;
+constexpr boost::math::array<BOOST_MATH_FLOAT128_TYPE, 171> unchecked_factorial_data<BOOST_MATH_FLOAT128_TYPE, b>::factorials;
 #else
-const std::array<BOOST_MATH_FLOAT128_TYPE, 171> unchecked_factorial_data<BOOST_MATH_FLOAT128_TYPE, b>::factorials = { {
+const boost::math::array<BOOST_MATH_FLOAT128_TYPE, 171> unchecked_factorial_data<BOOST_MATH_FLOAT128_TYPE, b>::factorials = { {
       1,
       1,
       2,
@@ -1294,7 +1414,7 @@ const typename unchecked_factorial_initializer<T>::init unchecked_factorial_init
 
 
 template <class T, int N>
-inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, N>&)
+inline T unchecked_factorial_imp(unsigned i, const boost::math::integral_constant<int, N>&)
 {
    //
    // If you're foolish enough to instantiate factorial
@@ -1308,10 +1428,10 @@ inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, N
    // unsigned int nfac = static_cast<unsigned int>(factorial<double>(n));
    // See factorial documentation for more detail.
    //
-   static_assert(!std::is_integral<T>::value && !std::numeric_limits<T>::is_integer, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value && !boost::math::numeric_limits<T>::is_integer, "Type T must not be an integral type");
 
    // We rely on C++11 thread safe initialization here:
-   static const std::array<T, 101> factorials = {{
+   static const boost::math::array<T, 101> factorials = {{
       T(boost::math::tools::convert_from_string<T>("1")),
       T(boost::math::tools::convert_from_string<T>("1")),
       T(boost::math::tools::convert_from_string<T>("2")),
@@ -1419,7 +1539,7 @@ inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, N
 }
 
 template <class T>
-inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, 0>&)
+inline T unchecked_factorial_imp(unsigned i, const boost::math::integral_constant<int, 0>&)
 {
    //
    // If you're foolish enough to instantiate factorial
@@ -1433,7 +1553,7 @@ inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, 0
    // unsigned int nfac = static_cast<unsigned int>(factorial<double>(n));
    // See factorial documentation for more detail.
    //
-   static_assert(!std::is_integral<T>::value && !std::numeric_limits<T>::is_integer, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value && !boost::math::numeric_limits<T>::is_integer, "Type T must not be an integral type");
 
    static const char* const factorial_strings[] = {
          "1",
@@ -1556,42 +1676,48 @@ inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, 0
    return factorials[i];
 }
 
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
 template <class T>
-inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, std::numeric_limits<float>::digits>&)
+BOOST_MATH_GPU_ENABLED inline T unchecked_factorial_imp(unsigned i, const boost::math::integral_constant<int, boost::math::numeric_limits<float>::digits>&)
 {
    return unchecked_factorial<float>(i);
 }
 
 template <class T>
-inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, std::numeric_limits<double>::digits>&)
+BOOST_MATH_GPU_ENABLED inline T unchecked_factorial_imp(unsigned i, const boost::math::integral_constant<int, boost::math::numeric_limits<double>::digits>&)
 {
    return unchecked_factorial<double>(i);
 }
 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 #if DBL_MANT_DIG != LDBL_MANT_DIG
 template <class T>
-inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, LDBL_MANT_DIG>&)
+inline T unchecked_factorial_imp(unsigned i, const boost::math::integral_constant<int, LDBL_MANT_DIG>&)
 {
    return unchecked_factorial<long double>(i);
 }
 #endif
 #ifdef BOOST_MATH_USE_FLOAT128
 template <class T>
-inline T unchecked_factorial_imp(unsigned i, const std::integral_constant<int, 113>&)
+inline T unchecked_factorial_imp(unsigned i, const boost::math::integral_constant<int, 113>&)
 {
    return unchecked_factorial<BOOST_MATH_FLOAT128_TYPE>(i);
 }
 #endif
 
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
 template <class T>
-inline T unchecked_factorial(unsigned i)
+BOOST_MATH_GPU_ENABLED inline T unchecked_factorial(unsigned i)
 {
    typedef typename boost::math::policies::precision<T, boost::math::policies::policy<> >::type tag_type;
    return unchecked_factorial_imp<T>(i, tag_type());
 }
 
 #ifdef BOOST_MATH_USE_FLOAT128
-#define BOOST_MATH_DETAIL_FLOAT128_MAX_FACTORIAL : std::numeric_limits<T>::digits == 113 ? max_factorial<BOOST_MATH_FLOAT128_TYPE>::value
+#define BOOST_MATH_DETAIL_FLOAT128_MAX_FACTORIAL : boost::math::numeric_limits<T>::digits == 113 ? max_factorial<BOOST_MATH_FLOAT128_TYPE>::value
 #else
 #define BOOST_MATH_DETAIL_FLOAT128_MAX_FACTORIAL
 #endif
@@ -1600,10 +1726,12 @@ template <class T>
 struct max_factorial
 {
    static constexpr unsigned value = 
-      std::numeric_limits<T>::digits == std::numeric_limits<float>::digits ? max_factorial<float>::value 
-      : std::numeric_limits<T>::digits == std::numeric_limits<double>::digits ? max_factorial<double>::value 
-      : std::numeric_limits<T>::digits == std::numeric_limits<long double>::digits ? max_factorial<long double>::value 
+      boost::math::numeric_limits<T>::digits == boost::math::numeric_limits<float>::digits ? max_factorial<float>::value 
+      : boost::math::numeric_limits<T>::digits == boost::math::numeric_limits<double>::digits ? max_factorial<double>::value
+      #ifndef BOOST_MATH_GPU_ENABLED 
+      : boost::math::numeric_limits<T>::digits == boost::math::numeric_limits<long double>::digits ? max_factorial<long double>::value 
       BOOST_MATH_DETAIL_FLOAT128_MAX_FACTORIAL
+      #endif
       : 100;
 };
 
diff --git a/inst/include/boost/math/special_functions/digamma.hpp b/inst/include/boost/math/special_functions/digamma.hpp
index 86d5e2ffb..382ad0d6b 100644
--- a/inst/include/boost/math/special_functions/digamma.hpp
+++ b/inst/include/boost/math/special_functions/digamma.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -12,13 +13,21 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/tools/rational.hpp>
-#include <boost/math/tools/series.hpp>
 #include <boost/math/tools/promotion.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+#include <boost/math/constants/constants.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/tools/series.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/big_constant.hpp>
+#endif
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -37,11 +46,11 @@ namespace detail{
 // Begin by defining the smallest value for which it is safe to
 // use the asymptotic expansion for digamma:
 //
-inline unsigned digamma_large_lim(const std::integral_constant<int, 0>*)
+BOOST_MATH_GPU_ENABLED inline unsigned digamma_large_lim(const boost::math::integral_constant<int, 0>*)
 {  return 20;  }
-inline unsigned digamma_large_lim(const std::integral_constant<int, 113>*)
+BOOST_MATH_GPU_ENABLED inline unsigned digamma_large_lim(const boost::math::integral_constant<int, 113>*)
 {  return 20;  }
-inline unsigned digamma_large_lim(const void*)
+BOOST_MATH_GPU_ENABLED inline unsigned digamma_large_lim(const void*)
 {  return 10;  }
 //
 // Implementations of the asymptotic expansion come next,
@@ -53,8 +62,10 @@ inline unsigned digamma_large_lim(const void*)
 //
 // This first one gives 34-digit precision for x >= 20:
 //
+
+#ifndef BOOST_MATH_HAS_NVRTC
 template <class T>
-inline T digamma_imp_large(T x, const std::integral_constant<int, 113>*)
+inline T digamma_imp_large(T x, const boost::math::integral_constant<int, 113>*)
 {
    BOOST_MATH_STD_USING // ADL of std functions.
    static const T P[] = {
@@ -87,7 +98,7 @@ inline T digamma_imp_large(T x, const std::integral_constant<int, 113>*)
 // 19-digit precision for x >= 10:
 //
 template <class T>
-inline T digamma_imp_large(T x, const std::integral_constant<int, 64>*)
+inline T digamma_imp_large(T x, const boost::math::integral_constant<int, 64>*)
 {
    BOOST_MATH_STD_USING // ADL of std functions.
    static const T P[] = {
@@ -110,22 +121,23 @@ inline T digamma_imp_large(T x, const std::integral_constant<int, 64>*)
    result -= z * tools::evaluate_polynomial(P, z);
    return result;
 }
+#endif
 //
 // 17-digit precision for x >= 10:
 //
 template <class T>
-inline T digamma_imp_large(T x, const std::integral_constant<int, 53>*)
+BOOST_MATH_GPU_ENABLED inline T digamma_imp_large(T x, const boost::math::integral_constant<int, 53>*)
 {
    BOOST_MATH_STD_USING // ADL of std functions.
-   static const T P[] = {
-      BOOST_MATH_BIG_CONSTANT(T, 53, 0.083333333333333333333333333333333333333333333333333),
-      BOOST_MATH_BIG_CONSTANT(T, 53, -0.0083333333333333333333333333333333333333333333333333),
-      BOOST_MATH_BIG_CONSTANT(T, 53, 0.003968253968253968253968253968253968253968253968254),
-      BOOST_MATH_BIG_CONSTANT(T, 53, -0.0041666666666666666666666666666666666666666666666667),
-      BOOST_MATH_BIG_CONSTANT(T, 53, 0.0075757575757575757575757575757575757575757575757576),
-      BOOST_MATH_BIG_CONSTANT(T, 53, -0.021092796092796092796092796092796092796092796092796),
-      BOOST_MATH_BIG_CONSTANT(T, 53, 0.083333333333333333333333333333333333333333333333333),
-      BOOST_MATH_BIG_CONSTANT(T, 53, -0.44325980392156862745098039215686274509803921568627)
+   BOOST_MATH_STATIC const T P[] = {
+      0.083333333333333333333333333333333333333333333333333,
+      -0.0083333333333333333333333333333333333333333333333333,
+      0.003968253968253968253968253968253968253968253968254,
+      -0.0041666666666666666666666666666666666666666666666667,
+      0.0075757575757575757575757575757575757575757575757576,
+      -0.021092796092796092796092796092796092796092796092796,
+      0.083333333333333333333333333333333333333333333333333,
+      -0.44325980392156862745098039215686274509803921568627
    };
    x -= 1;
    T result = log(x);
@@ -138,13 +150,13 @@ inline T digamma_imp_large(T x, const std::integral_constant<int, 53>*)
 // 9-digit precision for x >= 10:
 //
 template <class T>
-inline T digamma_imp_large(T x, const std::integral_constant<int, 24>*)
+BOOST_MATH_GPU_ENABLED inline T digamma_imp_large(T x, const boost::math::integral_constant<int, 24>*)
 {
    BOOST_MATH_STD_USING // ADL of std functions.
-   static const T P[] = {
-      BOOST_MATH_BIG_CONSTANT(T, 24, 0.083333333333333333333333333333333333333333333333333),
-      BOOST_MATH_BIG_CONSTANT(T, 24, -0.0083333333333333333333333333333333333333333333333333),
-      BOOST_MATH_BIG_CONSTANT(T, 24, 0.003968253968253968253968253968253968253968253968254)
+   BOOST_MATH_STATIC const T P[] = {
+      0.083333333333333333333333333333333333333333333333333f,
+      -0.0083333333333333333333333333333333333333333333333333f,
+      0.003968253968253968253968253968253968253968253968254f
    };
    x -= 1;
    T result = log(x);
@@ -153,6 +165,8 @@ inline T digamma_imp_large(T x, const std::integral_constant<int, 24>*)
    result -= z * tools::evaluate_polynomial(P, z);
    return result;
 }
+
+#ifndef BOOST_MATH_HAS_NVRTC
 //
 // Fully generic asymptotic expansion in terms of Bernoulli numbers, see:
 // http://functions.wolfram.com/06.14.06.0012.01
@@ -177,7 +191,7 @@ struct digamma_series_func
 };
 
 template <class T, class Policy>
-inline T digamma_imp_large(T x, const Policy& pol, const std::integral_constant<int, 0>*)
+inline T digamma_imp_large(T x, const Policy& pol, const boost::math::integral_constant<int, 0>*)
 {
    BOOST_MATH_STD_USING
    digamma_series_func<T> s(x);
@@ -194,7 +208,7 @@ inline T digamma_imp_large(T x, const Policy& pol, const std::integral_constant<
 // 35-digit precision:
 //
 template <class T>
-T digamma_imp_1_2(T x, const std::integral_constant<int, 113>*)
+T digamma_imp_1_2(T x, const boost::math::integral_constant<int, 113>*)
 {
    //
    // Now the approximation, we use the form:
@@ -208,6 +222,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 113>*)
    // Max error found at 128-bit long double precision:  5.541e-35
    // Maximum Deviation Found (approximation error):     1.965e-35
    //
+   // LCOV_EXCL_START
    static const float Y = 0.99558162689208984375F;
 
    static const T root1 = T(1569415565) / 1073741824uL;
@@ -242,6 +257,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 113>*)
       BOOST_MATH_BIG_CONSTANT(T, 113, -0.90745971844439990284514121823069162795e-11),
       BOOST_MATH_BIG_CONSTANT(T, 113, 0.48857673606545846774761343500033283272e-13),
    };
+   // LCOV_EXCL_STOP
    T g = x - root1;
    g -= root2;
    g -= root3;
@@ -256,7 +272,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 113>*)
 // 19-digit precision:
 //
 template <class T>
-T digamma_imp_1_2(T x, const std::integral_constant<int, 64>*)
+T digamma_imp_1_2(T x, const boost::math::integral_constant<int, 64>*)
 {
    //
    // Now the approximation, we use the form:
@@ -270,6 +286,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 64>*)
    // Max error found at 80-bit long double precision:   5.016e-20
    // Maximum Deviation Found (approximation error):     3.575e-20
    //
+   // LCOV_EXCL_START
    static const float Y = 0.99558162689208984375F;
 
    static const T root1 = T(1569415565) / 1073741824uL;
@@ -294,6 +311,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 64>*)
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.165079794012604905639e-5),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.317940243105952177571e-7)
    };
+   // LCOV_EXCL_STOP
    T g = x - root1;
    g -= root2;
    g -= root3;
@@ -302,11 +320,13 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 64>*)
 
    return result;
 }
+
+#endif
 //
 // 18-digit precision:
 //
 template <class T>
-T digamma_imp_1_2(T x, const std::integral_constant<int, 53>*)
+BOOST_MATH_GPU_ENABLED T digamma_imp_1_2(T x, const boost::math::integral_constant<int, 53>*)
 {
    //
    // Now the approximation, we use the form:
@@ -320,13 +340,14 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 53>*)
    // Maximum Deviation Found:               1.466e-18
    // At double precision, max error found:  2.452e-17
    //
-   static const float Y = 0.99558162689208984F;
+   // LCOV_EXCL_START
+   BOOST_MATH_STATIC const float Y = 0.99558162689208984F;
 
-   static const T root1 = T(1569415565) / 1073741824uL;
-   static const T root2 = (T(381566830) / 1073741824uL) / 1073741824uL;
-   static const T root3 = BOOST_MATH_BIG_CONSTANT(T, 53, 0.9016312093258695918615325266959189453125e-19);
+   BOOST_MATH_STATIC const T root1 = T(1569415565) / 1073741824uL;
+   BOOST_MATH_STATIC const T root2 = (T(381566830) / 1073741824uL) / 1073741824uL;
+   BOOST_MATH_STATIC const T root3 = BOOST_MATH_BIG_CONSTANT(T, 53, 0.9016312093258695918615325266959189453125e-19);
 
-   static const T P[] = {
+   BOOST_MATH_STATIC const T P[] = {
       BOOST_MATH_BIG_CONSTANT(T, 53, 0.25479851061131551),
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.32555031186804491),
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.65031853770896507),
@@ -334,7 +355,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 53>*)
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.045251321448739056),
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.0020713321167745952)
    };
-   static const T Q[] = {
+   BOOST_MATH_STATIC const T Q[] = {
       BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 53, 2.0767117023730469),
       BOOST_MATH_BIG_CONSTANT(T, 53, 1.4606242909763515),
@@ -343,6 +364,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 53>*)
       BOOST_MATH_BIG_CONSTANT(T, 53, 0.0021284987017821144),
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.55789841321675513e-6)
    };
+   // LCOV_EXCL_STOP
    T g = x - root1;
    g -= root2;
    g -= root3;
@@ -355,7 +377,7 @@ T digamma_imp_1_2(T x, const std::integral_constant<int, 53>*)
 // 9-digit precision:
 //
 template <class T>
-inline T digamma_imp_1_2(T x, const std::integral_constant<int, 24>*)
+BOOST_MATH_GPU_ENABLED inline T digamma_imp_1_2(T x, const boost::math::integral_constant<int, 24>*)
 {
    //
    // Now the approximation, we use the form:
@@ -369,21 +391,23 @@ inline T digamma_imp_1_2(T x, const std::integral_constant<int, 24>*)
    // Maximum Deviation Found:              3.388e-010
    // At float precision, max error found:  2.008725e-008
    //
-   static const float Y = 0.99558162689208984f;
-   static const T root = 1532632.0f / 1048576;
-   static const T root_minor = static_cast<T>(0.3700660185912626595423257213284682051735604e-6L);
-   static const T P[] = {
+   // LCOV_EXCL_START
+   BOOST_MATH_STATIC const float Y = 0.99558162689208984f;
+   BOOST_MATH_STATIC const T root = 1532632.0f / 1048576;
+   BOOST_MATH_STATIC const T root_minor = static_cast<T>(0.3700660185912626595423257213284682051735604e-6L);
+   BOOST_MATH_STATIC const T P[] = {
       0.25479851023250261e0f,
       -0.44981331915268368e0f,
       -0.43916936919946835e0f,
       -0.61041765350579073e-1f
    };
-   static const T Q[] = {
+   BOOST_MATH_STATIC const T Q[] = {
       0.1e1f,
       0.15890202430554952e1f,
       0.65341249856146947e0f,
       0.63851690523355715e-1f
    };
+   // LCOV_EXCL_STOP
    T g = x - root;
    g -= root_minor;
    T r = tools::evaluate_polynomial(P, T(x-1)) / tools::evaluate_polynomial(Q, T(x-1));
@@ -393,7 +417,7 @@ inline T digamma_imp_1_2(T x, const std::integral_constant<int, 24>*)
 }
 
 template <class T, class Tag, class Policy>
-T digamma_imp(T x, const Tag* t, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T digamma_imp(T x, const Tag* t, const Policy& pol)
 {
    //
    // This handles reflection of negative arguments, and all our
@@ -431,11 +455,13 @@ T digamma_imp(T x, const Tag* t, const Policy& pol)
    // If we're above the lower-limit for the
    // asymptotic expansion then use it:
    //
+   #ifndef BOOST_MATH_HAS_NVRTC
    if(x >= digamma_large_lim(t))
    {
       result += digamma_imp_large(x, t);
    }
    else
+   #endif
    {
       //
       // If x > 2 reduce to the interval [1,2]:
@@ -458,13 +484,19 @@ T digamma_imp(T x, const Tag* t, const Policy& pol)
    return result;
 }
 
+#ifndef BOOST_MATH_HAS_NVRTC
+
 template <class T, class Policy>
-T digamma_imp(T x, const std::integral_constant<int, 0>* t, const Policy& pol)
+T digamma_imp(T x, const boost::math::integral_constant<int, 0>* t, const Policy& pol)
 {
    //
    // This handles reflection of negative arguments, and all our
    // error handling, then forwards to the T-specific approximation.
    //
+   // This is covered by our real_concept tests, but these are disabled for
+   // code coverage runs for performance reasons.
+   // LCOV_EXCL_START
+   //
    BOOST_MATH_STD_USING // ADL of std functions.
 
    T result = 0;
@@ -549,48 +581,21 @@ T digamma_imp(T x, const std::integral_constant<int, 0>* t, const Policy& pol)
       result += digamma_imp_large(x, pol, t);
    }
    return result;
+   // LCOV_EXCL_STOP
 }
-//
-// Initializer: ensure all our constants are initialized prior to the first call of main:
-//
-template <class T, class Policy>
-struct digamma_initializer
-{
-   struct init
-   {
-      init()
-      {
-         typedef typename policies::precision<T, Policy>::type precision_type;
-         do_init(std::integral_constant<bool, precision_type::value && (precision_type::value <= 113)>());
-      }
-      void do_init(const std::true_type&)
-      {
-         boost::math::digamma(T(1.5), Policy());
-         boost::math::digamma(T(500), Policy());
-      }
-      void do_init(const std::false_type&){}
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
 
-template <class T, class Policy>
-const typename digamma_initializer<T, Policy>::init digamma_initializer<T, Policy>::initializer;
+#endif
 
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    digamma(T x, const Policy&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
    typedef typename policies::precision<T, Policy>::type precision_type;
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       (precision_type::value <= 0) || (precision_type::value > 113) ? 0 :
       precision_type::value <= 24 ? 24 :
       precision_type::value <= 53 ? 53 :
@@ -603,16 +608,13 @@ inline typename tools::promote_args<T>::type
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   // Force initialization of constants:
-   detail::digamma_initializer<value_type, forwarding_policy>::force_instantiate();
-
    return policies::checked_narrowing_cast<result_type, Policy>(detail::digamma_imp(
       static_cast<value_type>(x),
       static_cast<const tag_type*>(nullptr), forwarding_policy()), "boost::math::digamma<%1%>(%1%)");
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    digamma(T x)
 {
    return digamma(x, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/ellint_1.hpp b/inst/include/boost/math/special_functions/ellint_1.hpp
index 837963935..96c7c9e9b 100644
--- a/inst/include/boost/math/special_functions/ellint_1.hpp
+++ b/inst/include/boost/math/special_functions/ellint_1.hpp
@@ -1,5 +1,6 @@
 //  Copyright (c) 2006 Xiaogang Zhang
 //  Copyright (c) 2006 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +19,8 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rf.hpp>
 #include <boost/math/constants/constants.hpp>
@@ -31,26 +34,28 @@
 namespace boost { namespace math {
 
 template <class T1, class T2, class Policy>
-typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi, const Policy& pol);
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi, const Policy& pol);
 
 namespace detail{
 
 template <typename T, typename Policy>
-T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 0> const&);
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, boost::math::integral_constant<int, 0> const&);
 template <typename T, typename Policy>
-T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 1> const&);
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, boost::math::integral_constant<int, 1> const&);
 template <typename T, typename Policy>
-T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&);
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, boost::math::integral_constant<int, 2> const&);
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, T one_minus_k2);
 
 // Elliptic integral (Legendre form) of the first kind
 template <typename T, typename Policy>
-T ellint_f_imp(T phi, T k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_f_imp(T phi, T k, const Policy& pol, T one_minus_k2)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
     using namespace boost::math::constants;
 
-    static const char* function = "boost::math::ellint_f<%1%>(%1%,%1%)";
+    constexpr auto function = "boost::math::ellint_f<%1%>(%1%,%1%)";
     BOOST_MATH_INSTRUMENT_VARIABLE(phi);
     BOOST_MATH_INSTRUMENT_VARIABLE(k);
     BOOST_MATH_INSTRUMENT_VARIABLE(function);
@@ -75,12 +80,7 @@ T ellint_f_imp(T phi, T k, const Policy& pol)
     {
        // Phi is so large that phi%pi is necessarily zero (or garbage),
        // just return the second part of the duplication formula:
-       typedef std::integral_constant<int,
-          std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-          std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
-       > precision_tag_type;
-
-       result = 2 * phi * ellint_k_imp(k, pol, precision_tag_type()) / constants::pi<T>();
+       result = 2 * phi * ellint_k_imp(k, pol, one_minus_k2) / constants::pi<T>();
        BOOST_MATH_INSTRUMENT_VARIABLE(result);
     }
     else
@@ -121,41 +121,54 @@ T ellint_f_imp(T phi, T k, const Policy& pol)
           BOOST_MATH_ASSERT(rphi != 0); // precondition, can't be true if sin(rphi) != 0.
           //
           // Use http://dlmf.nist.gov/19.25#E5, note that
-          // c-1 simplifies to cot^2(rphi) which avoid cancellation:
+          // c-1 simplifies to cot^2(rphi) which avoids cancellation.
+          // Likewise c - k^2 is the same as (c - 1) + (1 - k^2).
           //
           T c = 1 / sinp;
-          result = static_cast<T>(s * ellint_rf_imp(T(cosp / sinp), T(c - k * k), c, pol));
+          T c_minus_one = cosp / sinp;
+          T arg2;
+          if (k != 0)
+          {
+             T cross = fabs(c / (k * k));
+             if ((cross > 0.9f) && (cross < 1.1f))
+                arg2 = c_minus_one + one_minus_k2;
+             else
+                arg2 = c - k * k;
+          }
+          else
+             arg2 = c;
+          result = static_cast<T>(s * ellint_rf_imp(c_minus_one, arg2, c, pol));
        }
        else
           result = s * sin(rphi);
        BOOST_MATH_INSTRUMENT_VARIABLE(result);
        if(m != 0)
        {
-          typedef std::integral_constant<int,
-             std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-             std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
-          > precision_tag_type;
-
-          result += m * ellint_k_imp(k, pol, precision_tag_type());
+          result += m * ellint_k_imp(k, pol, one_minus_k2);
           BOOST_MATH_INSTRUMENT_VARIABLE(result);
        }
     }
     return invert ? T(-result) : result;
 }
 
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED inline T ellint_f_imp(T phi, T k, const Policy& pol)
+{
+   return ellint_f_imp(phi, k, pol, T(1 - k * k));
+}
+
 // Complete elliptic integral (Legendre form) of the first kind
 template <typename T, typename Policy>
-T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
+BOOST_MATH_GPU_ENABLED T ellint_k_imp(T k, const Policy& pol, T one_minus_k2)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
 
-    static const char* function = "boost::math::ellint_k<%1%>(%1%)";
+    constexpr auto function = "boost::math::ellint_k<%1%>(%1%)";
 
     if (abs(k) > 1)
     {
-       return policies::raise_domain_error<T>(function,
-            "Got k = %1%, function requires |k| <= 1", k, pol);
+       return policies::raise_domain_error<T>(function, "Got k = %1%, function requires |k| <= 1", k, pol);
     }
     if (abs(k) == 1)
     {
@@ -163,12 +176,16 @@ T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
     }
 
     T x = 0;
-    T y = 1 - k * k;
     T z = 1;
-    T value = ellint_rf_imp(x, y, z, pol);
+    T value = ellint_rf_imp(x, one_minus_k2, z, pol);
 
     return value;
 }
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED inline T ellint_k_imp(T k, const Policy& pol, boost::math::integral_constant<int, 2> const&)
+{
+   return ellint_k_imp(k, pol, T(1 - k * k));
+}
 
 //
 // Special versions for double and 80-bit long double precision,
@@ -187,9 +204,9 @@ T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
 // archived in the code below), but was found to have slightly higher error rates.
 //
 template <typename T, typename Policy>
-BOOST_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 0> const&)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, boost::math::integral_constant<int, 0> const&)
 {
-   using std::abs;
+   BOOST_MATH_STD_USING
    using namespace boost::math::tools;
 
    T m = k * k;
@@ -440,7 +457,7 @@ BOOST_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, std::integral_constant<
       // This handles all cases where m > 0.9, 
       // including all error handling:
       //
-      return ellint_k_imp(k, pol, std::integral_constant<int, 2>());
+      return ellint_k_imp(k, pol, boost::math::integral_constant<int, 2>());
 #if 0
    else
    {
@@ -460,9 +477,9 @@ BOOST_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, std::integral_constant<
    }
 }
 template <typename T, typename Policy>
-BOOST_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 1> const&)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, boost::math::integral_constant<int, 1> const&)
 {
-   using std::abs;
+   BOOST_MATH_STD_USING
    using namespace boost::math::tools;
 
    T m = k * k;
@@ -741,44 +758,37 @@ BOOST_FORCEINLINE T ellint_k_imp(T k, const Policy& pol, std::integral_constant<
       // All cases where m > 0.9
       // including all error handling:
       //
-      return ellint_k_imp(k, pol, std::integral_constant<int, 2>());
+      return ellint_k_imp(k, pol, boost::math::integral_constant<int, 2>());
    }
 }
 
 template <typename T, typename Policy>
-BOOST_FORCEINLINE typename tools::promote_args<T>::type ellint_1(T k, const Policy& pol, const std::true_type&)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type ellint_1(T k, const Policy& pol, const boost::math::true_type&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
-   typedef std::integral_constant<int, 
+   typedef boost::math::integral_constant<int, 
 #if defined(__clang_major__) && (__clang_major__ == 7)
       2
 #else
-      std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-      std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
+      boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 54) ? 0 :
+      boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 64) ? 1 : 2
 #endif
    > precision_tag_type;
    return policies::checked_narrowing_cast<result_type, Policy>(detail::ellint_k_imp(static_cast<value_type>(k), pol, precision_tag_type()), "boost::math::ellint_1<%1%>(%1%)");
 }
 
 template <class T1, class T2>
-BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi, const std::false_type&)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi, const boost::math::false_type&)
 {
    return boost::math::ellint_1(k, phi, policies::policy<>());
 }
 
-}
-
-// Complete elliptic integral (Legendre form) of the first kind
-template <typename T>
-BOOST_FORCEINLINE typename tools::promote_args<T>::type ellint_1(T k)
-{
-   return ellint_1(k, policies::policy<>());
-}
+} // namespace detail
 
 // Elliptic integral (Legendre form) of the first kind
 template <class T1, class T2, class Policy>
-BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi, const Policy& pol)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi, const Policy& pol)  // LCOV_EXCL_LINE gcc misses this but sees the function body, strange!
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -786,12 +796,19 @@ BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 p
 }
 
 template <class T1, class T2>
-BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_1(T1 k, T2 phi)
 {
    typedef typename policies::is_policy<T2>::type tag_type;
    return detail::ellint_1(k, phi, tag_type());
 }
 
+// Complete elliptic integral (Legendre form) of the first kind
+template <typename T>
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type ellint_1(T k)
+{
+   return ellint_1(k, policies::policy<>());
+}
+
 }} // namespaces
 
 #endif // BOOST_MATH_ELLINT_1_HPP
diff --git a/inst/include/boost/math/special_functions/ellint_2.hpp b/inst/include/boost/math/special_functions/ellint_2.hpp
index 81e82410b..0cc1fa094 100644
--- a/inst/include/boost/math/special_functions/ellint_2.hpp
+++ b/inst/include/boost/math/special_functions/ellint_2.hpp
@@ -1,5 +1,6 @@
 //  Copyright (c) 2006 Xiaogang Zhang
 //  Copyright (c) 2006 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +19,9 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rf.hpp>
 #include <boost/math/special_functions/ellint_rd.hpp>
@@ -33,20 +37,20 @@
 namespace boost { namespace math {
 
 template <class T1, class T2, class Policy>
-typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi, const Policy& pol);
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi, const Policy& pol);
 
 namespace detail{
 
 template <typename T, typename Policy>
-T ellint_e_imp(T k, const Policy& pol, const std::integral_constant<int, 0>&);
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, const boost::math::integral_constant<int, 0>&);
 template <typename T, typename Policy>
-T ellint_e_imp(T k, const Policy& pol, const std::integral_constant<int, 1>&);
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, const boost::math::integral_constant<int, 1>&);
 template <typename T, typename Policy>
-T ellint_e_imp(T k, const Policy& pol, const std::integral_constant<int, 2>&);
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, const boost::math::integral_constant<int, 2>&);
 
 // Elliptic integral (Legendre form) of the second kind
 template <typename T, typename Policy>
-T ellint_e_imp(T phi, T k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_e_imp(T phi, T k, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
@@ -71,9 +75,9 @@ T ellint_e_imp(T phi, T k, const Policy& pol)
     }
     else if(phi > 1 / tools::epsilon<T>())
     {
-       typedef std::integral_constant<int,
-          std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-          std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
+       typedef boost::math::integral_constant<int,
+          boost::math::is_floating_point<T>::value&& boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 54) ? 0 :
+          boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 64) ? 1 : 2
        > precision_tag_type;
        // Phi is so large that phi%pi is necessarily zero (or garbage),
        // just return the second part of the duplication formula:
@@ -138,9 +142,9 @@ T ellint_e_imp(T phi, T k, const Policy& pol)
        }
        if (m != 0)
        {
-          typedef std::integral_constant<int,
-             std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-             std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
+          typedef boost::math::integral_constant<int,
+             boost::math::is_floating_point<T>::value&& boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 54) ? 0 :
+             boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 64) ? 1 : 2
           > precision_tag_type;
           result += m * ellint_e_imp(k, pol, precision_tag_type());
        }
@@ -150,15 +154,14 @@ T ellint_e_imp(T phi, T k, const Policy& pol)
 
 // Complete elliptic integral (Legendre form) of the second kind
 template <typename T, typename Policy>
-T ellint_e_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
+BOOST_MATH_GPU_ENABLED T ellint_e_imp(T k, const Policy& pol, boost::math::integral_constant<int, 2> const&)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
 
     if (abs(k) > 1)
     {
-       return policies::raise_domain_error<T>("boost::math::ellint_e<%1%>(%1%)",
-            "Got k = %1%, function requires |k| <= 1", k, pol);
+       return policies::raise_domain_error<T>("boost::math::ellint_e<%1%>(%1%)", "Got k = %1%, function requires |k| <= 1", k, pol);
     }
     if (abs(k) == 1)
     {
@@ -189,9 +192,9 @@ T ellint_e_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
 // existing routines.
 //
 template <typename T, typename Policy>
-BOOST_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, std::integral_constant<int, 0> const&)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, boost::math::integral_constant<int, 0> const&)
 {
-   using std::abs;
+   BOOST_MATH_STD_USING
    using namespace boost::math::tools;
 
    T m = k * k;
@@ -424,13 +427,13 @@ BOOST_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, std::integral_constant<
       // All cases where m > 0.9
       // including all error handling:
       //
-      return ellint_e_imp(k, pol, std::integral_constant<int, 2>());
+      return ellint_e_imp(k, pol, boost::math::integral_constant<int, 2>());
    }
 }
 template <typename T, typename Policy>
-BOOST_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, std::integral_constant<int, 1> const&)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, boost::math::integral_constant<int, 1> const&)
 {
-   using std::abs;
+   BOOST_MATH_STD_USING
    using namespace boost::math::tools;
 
    T m = k * k;
@@ -697,54 +700,56 @@ BOOST_FORCEINLINE T ellint_e_imp(T k, const Policy& pol, std::integral_constant<
       // All cases where m > 0.9
       // including all error handling:
       //
-      return ellint_e_imp(k, pol, std::integral_constant<int, 2>());
+      return ellint_e_imp(k, pol, boost::math::integral_constant<int, 2>());
    }
 }
 
 template <typename T, typename Policy>
-BOOST_FORCEINLINE typename tools::promote_args<T>::type ellint_2(T k, const Policy& pol, const std::true_type&)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type ellint_2(T k, const Policy& pol, const boost::math::true_type&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
-   typedef std::integral_constant<int,
-      std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-      std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
+   typedef boost::math::integral_constant<int,
+      boost::math::is_floating_point<T>::value&& boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 54) ? 0 :
+      boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 64) ? 1 : 2
    > precision_tag_type;
    return policies::checked_narrowing_cast<result_type, Policy>(detail::ellint_e_imp(static_cast<value_type>(k), pol, precision_tag_type()), "boost::math::ellint_2<%1%>(%1%)");
 }
 
 // Elliptic integral (Legendre form) of the second kind
 template <class T1, class T2>
-BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi, const std::false_type&)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi, const boost::math::false_type&)
 {
    return boost::math::ellint_2(k, phi, policies::policy<>());
 }
 
 } // detail
 
-// Complete elliptic integral (Legendre form) of the second kind
-template <typename T>
-BOOST_FORCEINLINE typename tools::promote_args<T>::type ellint_2(T k)
-{
-   return ellint_2(k, policies::policy<>());
-}
-
 // Elliptic integral (Legendre form) of the second kind
 template <class T1, class T2>
-BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi)
 {
    typedef typename policies::is_policy<T2>::type tag_type;
    return detail::ellint_2(k, phi, tag_type());
 }
 
 template <class T1, class T2, class Policy>
-BOOST_FORCEINLINE typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi, const Policy& pol)
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_2(T1 k, T2 phi, const Policy& pol)  // LCOV_EXCL_LINE gcc misses this but sees the function body, strange!
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
    return policies::checked_narrowing_cast<result_type, Policy>(detail::ellint_e_imp(static_cast<value_type>(phi), static_cast<value_type>(k), pol), "boost::math::ellint_2<%1%>(%1%,%1%)");
 }
 
+
+// Complete elliptic integral (Legendre form) of the second kind
+template <typename T>
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T>::type ellint_2(T k)
+{
+   return ellint_2(k, policies::policy<>());
+}
+
+
 }} // namespaces
 
 #endif // BOOST_MATH_ELLINT_2_HPP
diff --git a/inst/include/boost/math/special_functions/ellint_3.hpp b/inst/include/boost/math/special_functions/ellint_3.hpp
index 5c6c507b6..b8df7e264 100644
--- a/inst/include/boost/math/special_functions/ellint_3.hpp
+++ b/inst/include/boost/math/special_functions/ellint_3.hpp
@@ -18,6 +18,8 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rf.hpp>
 #include <boost/math/special_functions/ellint_rj.hpp>
@@ -38,16 +40,16 @@ namespace boost { namespace math {
 namespace detail{
 
 template <typename T, typename Policy>
-T ellint_pi_imp(T v, T k, T vc, const Policy& pol);
+BOOST_MATH_CUDA_ENABLED T ellint_pi_imp(T v, T k, T vc, const Policy& pol);
 
 // Elliptic integral (Legendre form) of the third kind
 template <typename T, typename Policy>
-T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
+BOOST_MATH_CUDA_ENABLED T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
 {
    // Note vc = 1-v presumably without cancellation error.
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::ellint_3<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ellint_3<%1%>(%1%,%1%,%1%)";
 
 
    T sphi = sin(fabs(phi));
@@ -55,8 +57,7 @@ T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
 
    if (k * k * sphi * sphi > 1)
    {
-      return policies::raise_domain_error<T>(function,
-         "Got k = %1%, function requires |k| <= 1", k, pol);
+      return policies::raise_domain_error<T>(function, "Got k = %1%, function requires |k| <= 1", k, pol);
    }
    // Special cases first:
    if(v == 0)
@@ -67,8 +68,7 @@ T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
    if((v > 0) && (1 / v < (sphi * sphi)))
    {
       // Complex result is a domain error:
-      return policies::raise_domain_error<T>(function,
-         "Got v = %1%, but result is complex for v > 1 / sin^2(phi)", v, pol);
+      return policies::raise_domain_error<T>(function, "Got v = %1%, but result is complex for v > 1 / sin^2(phi)", v, pol);
    }
 
    if(v == 1)
@@ -107,10 +107,8 @@ T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
       //
       if(fabs(phi) > 1 / tools::epsilon<T>())
       {
-         if(v > 1)
-            return policies::raise_domain_error<T>(
-            function,
-            "Got v = %1%, but this is only supported for 0 <= phi <= pi/2", v, pol);
+         // Invalid for v > 1, this case is caught above since v > 1 implies 1/v < sin^2(phi)
+         BOOST_MATH_ASSERT(v <= 1);
          //  
          // Phi is so large that phi%pi is necessarily zero (or garbage),
          // just return the second part of the duplication formula:
@@ -180,8 +178,10 @@ T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
       T Nm1 = (1 - k2) / (1 - v);
       T p2 = -v * N;
       T t;
-      if(p2 <= tools::min_value<T>())
+      if (p2 <= tools::min_value<T>())
+      {
          p2 = sqrt(-v) * sqrt(N);
+      }
       else
          p2 = sqrt(p2);
       T delta = sqrt(1 - k2 * sphi * sphi);
@@ -272,24 +272,22 @@ T ellint_pi_imp(T v, T phi, T k, T vc, const Policy& pol)
 
 // Complete elliptic integral (Legendre form) of the third kind
 template <typename T, typename Policy>
-T ellint_pi_imp(T v, T k, T vc, const Policy& pol)
+BOOST_MATH_CUDA_ENABLED T ellint_pi_imp(T v, T k, T vc, const Policy& pol)
 {
     // Note arg vc = 1-v, possibly without cancellation errors
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
 
-    static const char* function = "boost::math::ellint_pi<%1%>(%1%,%1%)";
+    constexpr auto function = "boost::math::ellint_pi<%1%>(%1%,%1%)";
 
     if (abs(k) >= 1)
     {
-       return policies::raise_domain_error<T>(function,
-            "Got k = %1%, function requires |k| <= 1", k, pol);
+       return policies::raise_domain_error<T>(function, "Got k = %1%, function requires |k| <= 1", k, pol);
     }
     if(vc <= 0)
     {
        // Result is complex:
-       return policies::raise_domain_error<T>(function,
-            "Got v = %1%, function requires v < 1", v, pol);
+       return policies::raise_domain_error<T>(function, "Got v = %1%, function requires v < 1", v, pol);
     }
 
     if(v == 0)
@@ -322,13 +320,13 @@ T ellint_pi_imp(T v, T k, T vc, const Policy& pol)
 }
 
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi, const std::false_type&)
+BOOST_MATH_CUDA_ENABLED inline typename tools::promote_args<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi, const boost::math::false_type&)
 {
    return boost::math::ellint_3(k, v, phi, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type ellint_3(T1 k, T2 v, const Policy& pol, const std::true_type&)
+BOOST_MATH_CUDA_ENABLED inline typename tools::promote_args<T1, T2>::type ellint_3(T1 k, T2 v, const Policy& pol, const boost::math::true_type&)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -343,7 +341,7 @@ inline typename tools::promote_args<T1, T2>::type ellint_3(T1 k, T2 v, const Pol
 } // namespace detail
 
 template <class T1, class T2, class T3, class Policy>
-inline typename tools::promote_args<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi, const Policy&)
+BOOST_MATH_CUDA_ENABLED inline typename tools::promote_args<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi, const Policy&)
 {
    typedef typename tools::promote_args<T1, T2, T3>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -358,14 +356,14 @@ inline typename tools::promote_args<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 ph
 }
 
 template <class T1, class T2, class T3>
-typename detail::ellint_3_result<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi)
+BOOST_MATH_CUDA_ENABLED typename detail::ellint_3_result<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi)
 {
    typedef typename policies::is_policy<T3>::type tag_type;
    return detail::ellint_3(k, v, phi, tag_type());
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type ellint_3(T1 k, T2 v)
+BOOST_MATH_CUDA_ENABLED inline typename tools::promote_args<T1, T2>::type ellint_3(T1 k, T2 v)
 {
    return ellint_3(k, v, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/ellint_d.hpp b/inst/include/boost/math/special_functions/ellint_d.hpp
index 67c3702c1..f5a8491f5 100644
--- a/inst/include/boost/math/special_functions/ellint_d.hpp
+++ b/inst/include/boost/math/special_functions/ellint_d.hpp
@@ -1,5 +1,6 @@
 //  Copyright (c) 2006 Xiaogang Zhang
 //  Copyright (c) 2006 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +19,8 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rf.hpp>
 #include <boost/math/special_functions/ellint_rd.hpp>
@@ -33,16 +36,16 @@
 namespace boost { namespace math {
 
 template <class T1, class T2, class Policy>
-typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const Policy& pol);
+BOOST_MATH_GPU_ENABLED typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const Policy& pol);
 
 namespace detail{
 
 template <typename T, typename Policy>
-T ellint_d_imp(T k, const Policy& pol);
+BOOST_MATH_GPU_ENABLED T ellint_d_imp(T k, const Policy& pol);
 
 // Elliptic integral (Legendre form) of the second kind
 template <typename T, typename Policy>
-T ellint_d_imp(T phi, T k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_d_imp(T phi, T k, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
@@ -113,15 +116,14 @@ T ellint_d_imp(T phi, T k, const Policy& pol)
 
 // Complete elliptic integral (Legendre form) of the second kind
 template <typename T, typename Policy>
-T ellint_d_imp(T k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_d_imp(T k, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
 
     if (abs(k) >= 1)
     {
-       return policies::raise_domain_error<T>("boost::math::ellint_d<%1%>(%1%)",
-            "Got k = %1%, function requires |k| <= 1", k, pol);
+       return policies::raise_domain_error<T>("boost::math::ellint_d<%1%>(%1%)", "Got k = %1%, function requires |k| <= 1", k, pol);
     }
     if(fabs(k) <= tools::root_epsilon<T>())
        return constants::pi<T>() / 4;
@@ -136,7 +138,7 @@ T ellint_d_imp(T k, const Policy& pol)
 }
 
 template <typename T, typename Policy>
-inline typename tools::promote_args<T>::type ellint_d(T k, const Policy& pol, const std::true_type&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type ellint_d(T k, const Policy& pol, const boost::math::true_type&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -145,7 +147,7 @@ inline typename tools::promote_args<T>::type ellint_d(T k, const Policy& pol, co
 
 // Elliptic integral (Legendre form) of the second kind
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const std::false_type&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const boost::math::false_type&)
 {
    return boost::math::ellint_d(k, phi, policies::policy<>());
 }
@@ -154,21 +156,21 @@ inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const s
 
 // Complete elliptic integral (Legendre form) of the second kind
 template <typename T>
-inline typename tools::promote_args<T>::type ellint_d(T k)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type ellint_d(T k)
 {
    return ellint_d(k, policies::policy<>());
 }
 
 // Elliptic integral (Legendre form) of the second kind
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi)
 {
    typedef typename policies::is_policy<T2>::type tag_type;
    return detail::ellint_d(k, phi, tag_type());
 }
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type ellint_d(T1 k, T2 phi, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
diff --git a/inst/include/boost/math/special_functions/ellint_rc.hpp b/inst/include/boost/math/special_functions/ellint_rc.hpp
index c25f00cc5..ae3c6375e 100644
--- a/inst/include/boost/math/special_functions/ellint_rc.hpp
+++ b/inst/include/boost/math/special_functions/ellint_rc.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2006 Xiaogang Zhang, 2015 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,12 +19,11 @@
 #pragma once
 #endif
 
-#include <boost/math/policies/error_handling.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/constants/constants.hpp>
-#include <iostream>
 
 // Carlson's degenerate elliptic integral
 // R_C(x, y) = R_F(x, y, y) = 0.5 * \int_{0}^{\infty} (t+x)^{-1/2} (t+y)^{-1} dt
@@ -32,21 +32,19 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T ellint_rc_imp(T x, T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_rc_imp(T x, T y, const Policy& pol)
 {
     BOOST_MATH_STD_USING
 
-    static const char* function = "boost::math::ellint_rc<%1%>(%1%,%1%)";
+    constexpr auto function = "boost::math::ellint_rc<%1%>(%1%,%1%)";
 
     if(x < 0)
     {
-       return policies::raise_domain_error<T>(function,
-            "Argument x must be non-negative but got %1%", x, pol);
+       return policies::raise_domain_error<T>(function, "Argument x must be non-negative but got %1%", x, pol);
     }
     if(y == 0)
     {
-       return policies::raise_domain_error<T>(function,
-            "Argument y must not be zero but got %1%", y, pol);
+       return policies::raise_domain_error<T>(function, "Argument y must not be zero but got %1%", y, pol);
     }
 
     // for y < 0, the integral is singular, return Cauchy principal value
@@ -90,7 +88,7 @@ T ellint_rc_imp(T x, T y, const Policy& pol)
 } // namespace detail
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type 
    ellint_rc(T1 x, T2 y, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
@@ -102,7 +100,7 @@ inline typename tools::promote_args<T1, T2>::type
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type 
    ellint_rc(T1 x, T2 y)
 {
    return ellint_rc(x, y, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/ellint_rd.hpp b/inst/include/boost/math/special_functions/ellint_rd.hpp
index 08cfecb04..f2a33adc4 100644
--- a/inst/include/boost/math/special_functions/ellint_rd.hpp
+++ b/inst/include/boost/math/special_functions/ellint_rd.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2006 Xiaogang Zhang, 2015 John Maddock.
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,10 +17,10 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/promotion.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rc.hpp>
-#include <boost/math/special_functions/pow.hpp>
-#include <boost/math/tools/config.hpp>
 #include <boost/math/policies/error_handling.hpp>
 
 // Carlson's elliptic integral of the second kind
@@ -29,39 +30,36 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T ellint_rd_imp(T x, T y, T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_rd_imp(T x, T y, T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
-   using std::swap;
 
-   static const char* function = "boost::math::ellint_rd<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ellint_rd<%1%>(%1%,%1%,%1%)";
 
    if(x < 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument x must be >= 0, but got %1%", x, pol);
+      return policies::raise_domain_error<T>(function, "Argument x must be >= 0, but got %1%", x, pol);
    }
    if(y < 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument y must be >= 0, but got %1%", y, pol);
+      return policies::raise_domain_error<T>(function, "Argument y must be >= 0, but got %1%", y, pol);
    }
    if(z <= 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument z must be > 0, but got %1%", z, pol);
+      return policies::raise_domain_error<T>(function, "Argument z must be > 0, but got %1%", z, pol);
    }
    if(x + y == 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "At most one argument can be zero, but got, x + y = %1%", x + y, pol);
+      return policies::raise_domain_error<T>(function, "At most one argument can be zero, but got, x + y = %1%", x + y, pol);
    }
    //
    // Special cases from http://dlmf.nist.gov/19.20#iv
    //
-   using std::swap;
+
    if(x == z)
-      swap(x, y);
+   {
+      BOOST_MATH_GPU_SAFE_SWAP(x, y);
+   }
    if(y == z)
    {
       if(x == y)
@@ -74,19 +72,21 @@ T ellint_rd_imp(T x, T y, T z, const Policy& pol)
       }
       else
       {
-         if((std::min)(x, y) / (std::max)(x, y) > T(1.3))
+         if(BOOST_MATH_GPU_SAFE_MAX(x, y) / BOOST_MATH_GPU_SAFE_MIN(x, y) > T(1.3))
             return 3 * (ellint_rc_imp(x, y, pol) - sqrt(x) / y) / (2 * (y - x));
          // Otherwise fall through to avoid cancellation in the above (RC(x,y) -> 1/x^0.5 as x -> y)
       }
    }
    if(x == y)
    {
-      if((std::min)(x, z) / (std::max)(x, z) > T(1.3))
+      if(BOOST_MATH_GPU_SAFE_MAX(x, z) / BOOST_MATH_GPU_SAFE_MIN(x, z) > T(1.3))
          return 3 * (ellint_rc_imp(z, x, pol) - 1 / sqrt(z)) / (z - x);
       // Otherwise fall through to avoid cancellation in the above (RC(x,y) -> 1/x^0.5 as x -> y)
    }
    if(y == 0)
-      swap(x, y);
+   {
+      BOOST_MATH_GPU_SAFE_SWAP(x, y);
+   }
    if(x == 0)
    {
       //
@@ -106,7 +106,8 @@ T ellint_rd_imp(T x, T y, T z, const Policy& pol)
          xn = (xn + yn) / 2;
          yn = t;
          sum_pow *= 2;
-         sum += sum_pow * boost::math::pow<2>(xn - yn);
+         const auto temp = (xn - yn);
+         sum += sum_pow * temp * temp;
       }
       T RF = constants::pi<T>() / (xn + yn);
       //
@@ -132,7 +133,7 @@ T ellint_rd_imp(T x, T y, T z, const Policy& pol)
    T An = (x + y + 3 * z) / 5;
    T A0 = An;
    // This has an extra 1.2 fudge factor which is really only needed when x, y and z are close in magnitude:
-   T Q = pow(tools::epsilon<T>() / 4, -T(1) / 8) * (std::max)((std::max)(An - x, An - y), An - z) * 1.2f;
+   T Q = pow(tools::epsilon<T>() / 4, -T(1) / 8) * BOOST_MATH_GPU_SAFE_MAX(BOOST_MATH_GPU_SAFE_MAX(An - x, An - y), An - z) * 1.2f;
    BOOST_MATH_INSTRUMENT_VARIABLE(Q);
    T lambda, rx, ry, rz;
    unsigned k = 0;
@@ -181,7 +182,7 @@ T ellint_rd_imp(T x, T y, T z, const Policy& pol)
 } // namespace detail
 
 template <class T1, class T2, class T3, class Policy>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    ellint_rd(T1 x, T2 y, T3 z, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2, T3>::type result_type;
@@ -194,7 +195,7 @@ inline typename tools::promote_args<T1, T2, T3>::type
 }
 
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    ellint_rd(T1 x, T2 y, T3 z)
 {
    return ellint_rd(x, y, z, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/ellint_rf.hpp b/inst/include/boost/math/special_functions/ellint_rf.hpp
index 5d5d73c25..eb1c2b6e7 100644
--- a/inst/include/boost/math/special_functions/ellint_rf.hpp
+++ b/inst/include/boost/math/special_functions/ellint_rf.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2006 Xiaogang Zhang, 2015 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,8 +18,9 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/ellint_rc.hpp>
@@ -30,27 +32,20 @@
 namespace boost { namespace math { namespace detail{
 
    template <typename T, typename Policy>
-   T ellint_rf_imp(T x, T y, T z, const Policy& pol)
+   BOOST_MATH_GPU_ENABLED T ellint_rf_imp(T x, T y, T z, const Policy& pol)
    {
       BOOST_MATH_STD_USING
       using namespace boost::math;
-      using std::swap;
 
-      static const char* function = "boost::math::ellint_rf<%1%>(%1%,%1%,%1%)";
+      constexpr auto function = "boost::math::ellint_rf<%1%>(%1%,%1%,%1%)";
 
       if(x < 0 || y < 0 || z < 0)
       {
-         return policies::raise_domain_error<T>(function,
-            "domain error, all arguments must be non-negative, "
-            "only sensible result is %1%.",
-            std::numeric_limits<T>::quiet_NaN(), pol);
+         return policies::raise_domain_error<T>(function, "domain error, all arguments must be non-negative, only sensible result is %1%.", boost::math::numeric_limits<T>::quiet_NaN(), pol);
       }
       if(x + y == 0 || y + z == 0 || z + x == 0)
       {
-         return policies::raise_domain_error<T>(function,
-            "domain error, at most one argument can be zero, "
-            "only sensible result is %1%.",
-            std::numeric_limits<T>::quiet_NaN(), pol);
+         return policies::raise_domain_error<T>(function, "domain error, at most one argument can be zero, only sensible result is %1%.", boost::math::numeric_limits<T>::quiet_NaN(), pol);
       }
       //
       // Special cases from http://dlmf.nist.gov/19.20#i
@@ -86,9 +81,9 @@ namespace boost { namespace math { namespace detail{
             return ellint_rc_imp(x, y, pol);
       }
       if(x == 0)
-         swap(x, z);
+         BOOST_MATH_GPU_SAFE_SWAP(x, z);
       else if(y == 0)
-         swap(y, z);
+         BOOST_MATH_GPU_SAFE_SWAP(y, z);
       if(z == 0)
       {
          //
@@ -111,7 +106,7 @@ namespace boost { namespace math { namespace detail{
       T zn = z;
       T An = (x + y + z) / 3;
       T A0 = An;
-      T Q = pow(3 * boost::math::tools::epsilon<T>(), T(-1) / 8) * (std::max)((std::max)(fabs(An - xn), fabs(An - yn)), fabs(An - zn));
+      T Q = pow(3 * boost::math::tools::epsilon<T>(), T(-1) / 8) * BOOST_MATH_GPU_SAFE_MAX(BOOST_MATH_GPU_SAFE_MAX(fabs(An - xn), fabs(An - yn)), fabs(An - zn));
       T fn = 1;
 
 
@@ -149,7 +144,7 @@ namespace boost { namespace math { namespace detail{
 } // namespace detail
 
 template <class T1, class T2, class T3, class Policy>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    ellint_rf(T1 x, T2 y, T3 z, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2, T3>::type result_type;
@@ -162,7 +157,7 @@ inline typename tools::promote_args<T1, T2, T3>::type
 }
 
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    ellint_rf(T1 x, T2 y, T3 z)
 {
    return ellint_rf(x, y, z, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/ellint_rg.hpp b/inst/include/boost/math/special_functions/ellint_rg.hpp
index 96accdac0..8a7f706ac 100644
--- a/inst/include/boost/math/special_functions/ellint_rg.hpp
+++ b/inst/include/boost/math/special_functions/ellint_rg.hpp
@@ -10,8 +10,8 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/ellint_rd.hpp>
@@ -21,30 +21,26 @@
 namespace boost { namespace math { namespace detail{
 
    template <typename T, typename Policy>
-   T ellint_rg_imp(T x, T y, T z, const Policy& pol)
+   BOOST_MATH_GPU_ENABLED T ellint_rg_imp(T x, T y, T z, const Policy& pol)
    {
       BOOST_MATH_STD_USING
-      static const char* function = "boost::math::ellint_rf<%1%>(%1%,%1%,%1%)";
+      constexpr auto function = "boost::math::ellint_rf<%1%>(%1%,%1%,%1%)";
 
       if(x < 0 || y < 0 || z < 0)
       {
-         return policies::raise_domain_error<T>(function,
-            "domain error, all arguments must be non-negative, "
-            "only sensible result is %1%.",
-            std::numeric_limits<T>::quiet_NaN(), pol);
+         return policies::raise_domain_error<T>(function, "domain error, all arguments must be non-negative, only sensible result is %1%.", boost::math::numeric_limits<T>::quiet_NaN(), pol);
       }
       //
       // Function is symmetric in x, y and z, but we require
       // (x - z)(y - z) >= 0 to avoid cancellation error in the result
       // which implies (for example) x >= z >= y
       //
-      using std::swap;
       if(x < y)
-         swap(x, y);
+         BOOST_MATH_GPU_SAFE_SWAP(x, y);
       if(x < z)
-         swap(x, z);
+         BOOST_MATH_GPU_SAFE_SWAP(x, z);
       if(y > z)
-         swap(y, z);
+         BOOST_MATH_GPU_SAFE_SWAP(y, z);
       
       BOOST_MATH_ASSERT(x >= z);
       BOOST_MATH_ASSERT(z >= y);
@@ -67,20 +63,18 @@ namespace boost { namespace math { namespace detail{
          else
          {
             // x = z, y != 0
-            swap(x, y);
+            BOOST_MATH_GPU_SAFE_SWAP(x, y);
             return (x == 0) ? T(sqrt(z) / 2) : T((z * ellint_rc_imp(x, z, pol) + sqrt(x)) / 2);
          }
       }
       else if(y == z)
       {
-         if(x == 0)
-            return constants::pi<T>() * sqrt(y) / 4;
-         else
-            return (y == 0) ? T(sqrt(x) / 2) : T((y * ellint_rc_imp(x, y, pol) + sqrt(x)) / 2);
+         BOOST_MATH_ASSERT(x > 0);  // Ordering of x,y,z above takes care of x == 0 case.
+         return (y == 0) ? T(sqrt(x) / 2) : T((y * ellint_rc_imp(x, y, pol) + sqrt(x)) / 2);
       }
       else if(y == 0)
       {
-         swap(y, z);
+         BOOST_MATH_GPU_SAFE_SWAP(y, z);
          //
          // Special handling for common case, from
          // Numerical Computation of Real or Complex Elliptic Integrals, eq.46
@@ -111,7 +105,7 @@ namespace boost { namespace math { namespace detail{
 } // namespace detail
 
 template <class T1, class T2, class T3, class Policy>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    ellint_rg(T1 x, T2 y, T3 z, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2, T3>::type result_type;
@@ -124,7 +118,7 @@ inline typename tools::promote_args<T1, T2, T3>::type
 }
 
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    ellint_rg(T1 x, T2 y, T3 z)
 {
    return ellint_rg(x, y, z, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/ellint_rj.hpp b/inst/include/boost/math/special_functions/ellint_rj.hpp
index 714223321..76e1a14eb 100644
--- a/inst/include/boost/math/special_functions/ellint_rj.hpp
+++ b/inst/include/boost/math/special_functions/ellint_rj.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2006 Xiaogang Zhang, 2015 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,8 +19,9 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/ellint_rc.hpp>
 #include <boost/math/special_functions/ellint_rf.hpp>
@@ -32,19 +34,13 @@
 namespace boost { namespace math { namespace detail{
 
 template <typename T, typename Policy>
-T ellint_rc1p_imp(T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_rc1p_imp(T y, const Policy& pol)
 {
    using namespace boost::math;
    // Calculate RC(1, 1 + x)
    BOOST_MATH_STD_USING
 
-  static const char* function = "boost::math::ellint_rc<%1%>(%1%,%1%)";
-
-   if(y == -1)
-   {
-      return policies::raise_domain_error<T>(function,
-         "Argument y must not be zero but got %1%", y, pol);
-   }
+   BOOST_MATH_ASSERT(y != -1);
 
    // for 1 + y < 0, the integral is singular, return Cauchy principal value
    T result;
@@ -76,67 +72,31 @@ T ellint_rc1p_imp(T y, const Policy& pol)
 }
 
 template <typename T, typename Policy>
-T ellint_rj_imp(T x, T y, T z, T p, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T ellint_rj_imp_final(T x, T y, T z, T p, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::ellint_rj<%1%>(%1%,%1%,%1%)";
+   constexpr auto function = "boost::math::ellint_rj<%1%>(%1%,%1%,%1%)";
 
    if(x < 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument x must be non-negative, but got x = %1%", x, pol);
+      return policies::raise_domain_error<T>(function, "Argument x must be non-negative, but got x = %1%", x, pol);
    }
    if(y < 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument y must be non-negative, but got y = %1%", y, pol);
+      return policies::raise_domain_error<T>(function, "Argument y must be non-negative, but got y = %1%", y, pol);
    }
    if(z < 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument z must be non-negative, but got z = %1%", z, pol);
+      return policies::raise_domain_error<T>(function, "Argument z must be non-negative, but got z = %1%", z, pol);
    }
    if(p == 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "Argument p must not be zero, but got p = %1%", p, pol);
+      return policies::raise_domain_error<T>(function, "Argument p must not be zero, but got p = %1%", p, pol);
    }
    if(x + y == 0 || y + z == 0 || z + x == 0)
    {
-      return policies::raise_domain_error<T>(function,
-         "At most one argument can be zero, "
-         "only possible result is %1%.", std::numeric_limits<T>::quiet_NaN(), pol);
-   }
-
-   // for p < 0, the integral is singular, return Cauchy principal value
-   if(p < 0)
-   {
-      //
-      // We must ensure that x < y < z.
-      // Since the integral is symmetrical in x, y and z
-      // we can just permute the values:
-      //
-      if(x > y)
-         std::swap(x, y);
-      if(y > z)
-         std::swap(y, z);
-      if(x > y)
-         std::swap(x, y);
-
-      BOOST_MATH_ASSERT(x <= y);
-      BOOST_MATH_ASSERT(y <= z);
-
-      T q = -p;
-      p = (z * (x + y + q) - x * y) / (z + q);
-
-      BOOST_MATH_ASSERT(p >= 0);
-
-      T value = (p - z) * ellint_rj_imp(x, y, z, p, pol);
-      value -= 3 * ellint_rf_imp(x, y, z, pol);
-      value += 3 * sqrt((x * y * z) / (x * y + p * q)) * ellint_rc_imp(T(x * y + p * q), T(p * q), pol);
-      value /= (z + q);
-      return value;
+      return policies::raise_domain_error<T>(function, "At most one argument can be zero, only possible result is %1%.", boost::math::numeric_limits<T>::quiet_NaN(), pol);
    }
 
    //
@@ -160,13 +120,12 @@ T ellint_rj_imp(T x, T y, T z, T p, const Policy& pol)
       else
       {
          // x = y only, permute so y = z:
-         using std::swap;
-         swap(x, z);
+         BOOST_MATH_GPU_SAFE_SWAP(x, z);
          if(y == p)
          {
             return ellint_rd_imp(x, y, y, pol);
          }
-         else if((std::max)(y, p) / (std::min)(y, p) > T(1.2))
+         else if(BOOST_MATH_GPU_SAFE_MAX(y, p) / BOOST_MATH_GPU_SAFE_MIN(y, p) > T(1.2))
          {
             return 3 * (ellint_rc_imp(x, y, pol) - ellint_rc_imp(x, p, pol)) / (p - y);
          }
@@ -180,7 +139,7 @@ T ellint_rj_imp(T x, T y, T z, T p, const Policy& pol)
          // y = z = p:
          return ellint_rd_imp(x, y, y, pol);
       }
-      else if((std::max)(y, p) / (std::min)(y, p) > T(1.2))
+      else if(BOOST_MATH_GPU_SAFE_MAX(y, p) / BOOST_MATH_GPU_SAFE_MIN(y, p) > T(1.2))
       {
          // y = z:
          return 3 * (ellint_rc_imp(x, y, pol) - ellint_rc_imp(x, p, pol)) / (p - y);
@@ -199,7 +158,7 @@ T ellint_rj_imp(T x, T y, T z, T p, const Policy& pol)
    T An = (x + y + z + 2 * p) / 5;
    T A0 = An;
    T delta = (p - x) * (p - y) * (p - z);
-   T Q = pow(tools::epsilon<T>() / 5, -T(1) / 8) * (std::max)((std::max)(fabs(An - x), fabs(An - y)), (std::max)(fabs(An - z), fabs(An - p)));
+   T Q = pow(tools::epsilon<T>() / 5, -T(1) / 8) * BOOST_MATH_GPU_SAFE_MAX(BOOST_MATH_GPU_SAFE_MAX(fabs(An - x), fabs(An - y)), BOOST_MATH_GPU_SAFE_MAX(fabs(An - z), fabs(An - p)));
 
    unsigned n;
    T lambda;
@@ -272,10 +231,71 @@ T ellint_rj_imp(T x, T y, T z, T p, const Policy& pol)
    return result;
 }
 
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED T ellint_rj_imp(T x, T y, T z, T p, const Policy& pol)
+{
+   BOOST_MATH_STD_USING
+   
+   constexpr auto function = "boost::math::ellint_rj<%1%>(%1%,%1%,%1%)";
+
+   if(x < 0)
+   {
+      return policies::raise_domain_error<T>(function, "Argument x must be non-negative, but got x = %1%", x, pol);
+   }
+   if(y < 0)
+   {
+      return policies::raise_domain_error<T>(function, "Argument y must be non-negative, but got y = %1%", y, pol);
+   }
+   if(z < 0)
+   {
+      return policies::raise_domain_error<T>(function, "Argument z must be non-negative, but got z = %1%", z, pol);
+   }
+   if(p == 0)
+   {
+      return policies::raise_domain_error<T>(function, "Argument p must not be zero, but got p = %1%", p, pol);
+   }
+   if(x + y == 0 || y + z == 0 || z + x == 0)
+   {
+      return policies::raise_domain_error<T>(function, "At most one argument can be zero, only possible result is %1%.", boost::math::numeric_limits<T>::quiet_NaN(), pol);
+   }
+
+   // for p < 0, the integral is singular, return Cauchy principal value
+   if(p < 0)
+   {
+      //
+      // We must ensure that x < y < z.
+      // Since the integral is symmetrical in x, y and z
+      // we can just permute the values:
+      //
+      if(x > y)
+         BOOST_MATH_GPU_SAFE_SWAP(x, y);
+      if(y > z)
+         BOOST_MATH_GPU_SAFE_SWAP(y, z);
+      if(x > y)
+         BOOST_MATH_GPU_SAFE_SWAP(x, y);
+
+      BOOST_MATH_ASSERT(x <= y);
+      BOOST_MATH_ASSERT(y <= z);
+
+      T q = -p;
+      p = (z * (x + y + q) - x * y) / (z + q);
+
+      BOOST_MATH_ASSERT(p >= 0);
+
+      T value = (p - z) * ellint_rj_imp_final(x, y, z, p, pol);
+      value -= 3 * ellint_rf_imp(x, y, z, pol);
+      value += 3 * sqrt((x * y * z) / (x * y + p * q)) * ellint_rc_imp(T(x * y + p * q), T(p * q), pol);
+      value /= (z + q);
+      return value;
+   }
+
+   return ellint_rj_imp_final(x, y, z, p, pol);
+}
+
 } // namespace detail
 
 template <class T1, class T2, class T3, class T4, class Policy>
-inline typename tools::promote_args<T1, T2, T3, T4>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type 
    ellint_rj(T1 x, T2 y, T3 z, T4 p, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2, T3, T4>::type result_type;
@@ -290,7 +310,7 @@ inline typename tools::promote_args<T1, T2, T3, T4>::type
 }
 
 template <class T1, class T2, class T3, class T4>
-inline typename tools::promote_args<T1, T2, T3, T4>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3, T4>::type 
    ellint_rj(T1 x, T2 y, T3 z, T4 p)
 {
    return ellint_rj(x, y, z, p, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/erf.hpp b/inst/include/boost/math/special_functions/erf.hpp
index 5cc322ae4..9f0da9282 100644
--- a/inst/include/boost/math/special_functions/erf.hpp
+++ b/inst/include/boost/math/special_functions/erf.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,8 +11,11 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
+#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/tools/roots.hpp>
 #include <boost/math/policies/error_handling.hpp>
@@ -38,7 +42,8 @@ namespace detail
 template <class T>
 struct erf_asympt_series_t
 {
-   erf_asympt_series_t(T z) : xx(2 * -z * z), tk(1)
+   // LCOV_EXCL_START multiprecision case only, excluded from coverage analysis
+   BOOST_MATH_GPU_ENABLED erf_asympt_series_t(T z) : xx(2 * -z * z), tk(1)
    {
       BOOST_MATH_STD_USING
       result = -exp(-z * z) / sqrt(boost::math::constants::pi<T>());
@@ -47,7 +52,7 @@ struct erf_asympt_series_t
 
    typedef T result_type;
 
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       BOOST_MATH_STD_USING
       T r = result;
@@ -57,6 +62,7 @@ struct erf_asympt_series_t
          result = 0;
       return r;
    }
+   // LCOV_EXCL_STOP
 private:
    T result;
    T xx;
@@ -66,33 +72,33 @@ struct erf_asympt_series_t
 // How large z has to be in order to ensure that the series converges:
 //
 template <class T>
-inline float erf_asymptotic_limit_N(const T&)
+BOOST_MATH_GPU_ENABLED inline float erf_asymptotic_limit_N(const T&)
 {
    return (std::numeric_limits<float>::max)();
 }
-inline float erf_asymptotic_limit_N(const std::integral_constant<int, 24>&)
+BOOST_MATH_GPU_ENABLED inline float erf_asymptotic_limit_N(const std::integral_constant<int, 24>&)
 {
    return 2.8F;
 }
-inline float erf_asymptotic_limit_N(const std::integral_constant<int, 53>&)
+BOOST_MATH_GPU_ENABLED inline float erf_asymptotic_limit_N(const std::integral_constant<int, 53>&)
 {
    return 4.3F;
 }
-inline float erf_asymptotic_limit_N(const std::integral_constant<int, 64>&)
+BOOST_MATH_GPU_ENABLED inline float erf_asymptotic_limit_N(const std::integral_constant<int, 64>&)
 {
    return 4.8F;
 }
-inline float erf_asymptotic_limit_N(const std::integral_constant<int, 106>&)
+BOOST_MATH_GPU_ENABLED inline float erf_asymptotic_limit_N(const std::integral_constant<int, 106>&)
 {
    return 6.5F;
 }
-inline float erf_asymptotic_limit_N(const std::integral_constant<int, 113>&)
+BOOST_MATH_GPU_ENABLED inline float erf_asymptotic_limit_N(const std::integral_constant<int, 113>&)
 {
    return 6.8F;
 }
 
 template <class T, class Policy>
-inline T erf_asymptotic_limit()
+BOOST_MATH_GPU_ENABLED inline T erf_asymptotic_limit()
 {
    typedef typename policies::precision<T, Policy>::type precision_type;
    typedef std::integral_constant<int,
@@ -139,10 +145,14 @@ T erf_series_near_zero_sum(const T& x, const Policy& pol)
 template <class T, class Policy, class Tag>
 T erf_imp(T z, bool invert, const Policy& pol, const Tag& t)
 {
+   // LCOV_EXCL_START multiprecision case only, excluded from coverage analysis
    BOOST_MATH_STD_USING
 
    BOOST_MATH_INSTRUMENT_CODE("Generic erf_imp called");
 
+   if ((boost::math::isnan)(z))
+      return policies::raise_domain_error("boost::math::erf<%1%>(%1%)", "Expected a finite argument but got %1%", z, pol);
+
    if(z < 0)
    {
       if(!invert)
@@ -188,26 +198,43 @@ T erf_imp(T z, bool invert, const Policy& pol, const Tag& t)
    if(invert)
       result = 1 - result;
    return result;
+   // LCOV_EXCL_STOP
 }
 
 template <class T, class Policy>
-T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int, 53>& t)
+BOOST_MATH_GPU_ENABLED T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int, 53>&)
 {
    BOOST_MATH_STD_USING
 
    BOOST_MATH_INSTRUMENT_CODE("53-bit precision erf_imp called");
 
    if ((boost::math::isnan)(z))
-      return policies::raise_denorm_error("boost::math::erf<%1%>(%1%)", "Expected a finite argument but got %1%", z, pol);
+      return policies::raise_domain_error("boost::math::erf<%1%>(%1%)", "Expected a finite argument but got %1%", z, pol);
+
+   int prefix_multiplier = 1;
+   int prefix_adder = 0;
 
    if(z < 0)
    {
+      // Recursion is logically simpler here, but confuses static analyzers that need to be
+      // able to calculate the maximimum program stack size at compile time (ie CUDA).
+      z = -z;
       if(!invert)
-         return -erf_imp(T(-z), invert, pol, t);
+      {
+         prefix_multiplier = -1;
+         // return -erf_imp(T(-z), invert, pol, t);
+      }
       else if(z < T(-0.5))
-         return 2 - erf_imp(T(-z), invert, pol, t);
+      {
+         prefix_adder = 2;
+         // return 2 - erf_imp(T(-z), invert, pol, t);
+      }
       else
-         return 1 + erf_imp(T(-z), false, pol, t);
+      {
+         invert = false;
+         prefix_adder = 1;
+         // return 1 + erf_imp(T(-z), false, pol, t);
+      }
    }
 
    T result;
@@ -230,7 +257,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          }
          else
          {
-            static const T c = BOOST_MATH_BIG_CONSTANT(T, 53, 0.003379167095512573896158903121545171688);
+            BOOST_MATH_STATIC_LOCAL_VARIABLE const T c = BOOST_MATH_BIG_CONSTANT(T, 53, 0.003379167095512573896158903121545171688);  // LCOV_EXCL_LINE
             result = static_cast<T>(z * 1.125f + z * c);
          }
       }
@@ -240,22 +267,23 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         1.561e-17
          // Maximum Relative Change in Control Points:   1.155e-04
          // Max Error found at double precision =        2.961182e-17
-
-         static const T Y = 1.044948577880859375f;
-         static const T P[] = {    
+         // LCOV_EXCL_START
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 1.044948577880859375f;
+         BOOST_MATH_STATIC const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0834305892146531832907),
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.338165134459360935041),
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.0509990735146777432841),
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.00772758345802133288487),
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.000322780120964605683831),
          };
-         static const T Q[] = {    
+         BOOST_MATH_STATIC const T Q[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.455004033050794024546),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0875222600142252549554),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00858571925074406212772),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.000370900071787748000569),
          };
+         // LCOV_EXCL_STOP
          T zz = z * z;
          result = z * (Y + tools::evaluate_polynomial(P, zz) / tools::evaluate_polynomial(Q, zz));
       }
@@ -272,8 +300,9 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         3.702e-17
          // Maximum Relative Change in Control Points:   2.845e-04
          // Max Error found at double precision =        4.841816e-17
-         static const T Y = 0.405935764312744140625f;
-         static const T P[] = {    
+         // LCOV_EXCL_START
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 0.405935764312744140625f;
+         BOOST_MATH_STATIC const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.098090592216281240205),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.178114665841120341155),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.191003695796775433986),
@@ -281,7 +310,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0195049001251218801359),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00180424538297014223957),
          };
-         static const T Q[] = {    
+         BOOST_MATH_STATIC const T Q[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.84759070983002217845),
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.42628004845511324508),
@@ -290,6 +319,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0113385233577001411017),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.337511472483094676155e-5),
          };
+         // LCOV_EXCL_STOP
          BOOST_MATH_INSTRUMENT_VARIABLE(Y);
          BOOST_MATH_INSTRUMENT_VARIABLE(P[0]);
          BOOST_MATH_INSTRUMENT_VARIABLE(Q[0]);
@@ -305,8 +335,9 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     3.909e-18
          // Expected Error Term:                         3.909e-18
          // Maximum Relative Change in Control Points:   9.886e-05
-         static const T Y = 0.50672817230224609375f;
-         static const T P[] = {    
+         // LCOV_EXCL_START
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 0.50672817230224609375f;
+         BOOST_MATH_STATIC const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.0243500476207698441272),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0386540375035707201728),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.04394818964209516296),
@@ -314,7 +345,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00323962406290842133584),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.000235839115596880717416),
          };
-         static const T Q[] = {    
+         BOOST_MATH_STATIC const T Q[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.53991494948552447182),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.982403709157920235114),
@@ -322,6 +353,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0563921837420478160373),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00410369723978904575884),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - T(1.5))) / tools::evaluate_polynomial(Q, z - T(1.5));
          T hi, lo;
          int expon;
@@ -338,8 +370,9 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         1.512e-17
          // Maximum Relative Change in Control Points:   2.222e-04
          // Max Error found at double precision =        2.062515e-17
-         static const T Y = 0.5405750274658203125f;
-         static const T P[] = {    
+         // LCOV_EXCL_START
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 0.5405750274658203125f;
+         BOOST_MATH_STATIC const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00295276716530971662634),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0137384425896355332126),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00840807615555585383007),
@@ -347,7 +380,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.000250269961544794627958),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.113212406648847561139e-4),
          };
-         static const T Q[] = {    
+         BOOST_MATH_STATIC const T Q[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.04217814166938418171),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.442597659481563127003),
@@ -355,6 +388,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0105982906484876531489),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.000479411269521714493907),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - T(3.5))) / tools::evaluate_polynomial(Q, z - T(3.5));
          T hi, lo;
          int expon;
@@ -371,8 +405,9 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     2.860e-17
          // Expected Error Term:                         2.859e-17
          // Maximum Relative Change in Control Points:   1.357e-05
-         static const T Y = 0.5579090118408203125f;
-         static const T P[] = {    
+         // LCOV_EXCL_START
+         BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 0.5579090118408203125f;
+         BOOST_MATH_STATIC const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.00628057170626964891937),
             BOOST_MATH_BIG_CONSTANT(T, 53, 0.0175389834052493308818),
             BOOST_MATH_BIG_CONSTANT(T, 53, -0.212652252872804219852),
@@ -381,7 +416,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, -3.22729451764143718517),
             BOOST_MATH_BIG_CONSTANT(T, 53, -2.8175401114513378771),
          };
-         static const T Q[] = {    
+         BOOST_MATH_STATIC const T Q[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
             BOOST_MATH_BIG_CONSTANT(T, 53, 2.79257750980575282228),
             BOOST_MATH_BIG_CONSTANT(T, 53, 11.0567237927800161565),
@@ -390,6 +425,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 53, 13.5064170191802889145),
             BOOST_MATH_BIG_CONSTANT(T, 53, 5.48409182238641741584),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(1 / z)) / tools::evaluate_polynomial(Q, T(1 / z));
          T hi, lo;
          int expon;
@@ -412,10 +448,11 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
 
    if(invert)
    {
-      result = 1 - result;
+      prefix_adder += prefix_multiplier * 1;
+      prefix_multiplier = -prefix_multiplier;
    }
 
-   return result;
+   return prefix_adder + prefix_multiplier * result;
 } // template <class T, class Lanczos>T erf_imp(T z, bool invert, const Lanczos& l, const std::integral_constant<int, 53>& t)
 
 
@@ -426,6 +463,9 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
 
    BOOST_MATH_INSTRUMENT_CODE("64-bit precision erf_imp called");
 
+   if ((boost::math::isnan)(z))
+      return policies::raise_domain_error("boost::math::erf<%1%>(%1%)", "Expected a finite argument but got %1%", z, pol);
+
    if(z < 0)
    {
       if(!invert)
@@ -454,7 +494,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
       }
       else if(z < 1e-10)
       {
-         static const T c = BOOST_MATH_BIG_CONSTANT(T, 64, 0.003379167095512573896158903121545171688);
+         static const T c = BOOST_MATH_BIG_CONSTANT(T, 64, 0.003379167095512573896158903121545171688); // LCOV_EXCL_LINE
          result = z * 1.125 + z * c;
       }
       else
@@ -463,6 +503,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     4.326e-22
          // Expected Error Term:                         -4.326e-22
          // Maximum Relative Change in Control Points:   1.474e-04
+         // LCOV_EXCL_START
          static const T Y = 1.044948577880859375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0834305892146531988966),
@@ -480,6 +521,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.000650511752687851548735),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.189532519105655496778e-4),
          };
+         // LCOV_EXCL_STOP
          result = z * (Y + tools::evaluate_polynomial(P, T(z * z)) / tools::evaluate_polynomial(Q, T(z * z)));
       }
    }
@@ -495,6 +537,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     2.241e-20
          // Expected Error Term:                         -2.241e-20
          // Maximum Relative Change in Control Points:   5.110e-03
+         // LCOV_EXCL_START
          static const T Y = 0.405935764312744140625f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.0980905922162812031672),
@@ -515,6 +558,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0396649631833002269861),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.00279220237309449026796),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 0.5f)) / tools::evaluate_polynomial(Q, T(z - 0.5f));
          T hi, lo;
          int expon;
@@ -531,6 +575,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     1.495e-21
          // Expected Error Term:                         -1.494e-21
          // Maximum Relative Change in Control Points:   1.793e-04
+         // LCOV_EXCL_START
          static const T Y = 0.50672817230224609375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 64, -0.024350047620769840217),
@@ -550,6 +595,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0158027197831887485261),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.000897871370778031611439),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 1.5f)) / tools::evaluate_polynomial(Q, T(z - 1.5f));
          T hi, lo;
          int expon;
@@ -566,6 +612,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         -1.106e-20
          // Maximum Relative Change in Control Points:   1.709e-04
          // Max Error found at long double precision =   1.446908e-20
+         // LCOV_EXCL_START
          static const T Y  = 0.5405750274658203125f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.0029527671653097284033),
@@ -585,6 +632,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.00221657568292893699158),
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.804149464190309799804e-4),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 3.5f)) / tools::evaluate_polynomial(Q, T(z - 3.5f));
          T hi, lo;
          int expon;
@@ -601,6 +649,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     6.677e-21
          // Expected Error Term:                         6.676e-21
          // Maximum Relative Change in Control Points:   2.319e-05
+         // LCOV_EXCL_START
          static const T Y = 0.55825519561767578125f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 64, 0.00593438793008050214106),
@@ -624,6 +673,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 64, 104.365251479578577989),
             BOOST_MATH_BIG_CONSTANT(T, 64, 30.8365511891224291717),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(1 / z)) / tools::evaluate_polynomial(Q, T(1 / z));
          T hi, lo;
          int expon;
@@ -660,10 +710,13 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
 
    BOOST_MATH_INSTRUMENT_CODE("113-bit precision erf_imp called");
 
+   if ((boost::math::isnan)(z))
+      return policies::raise_domain_error("boost::math::erf<%1%>(%1%)", "Expected a finite argument but got %1%", z, pol);
+
    if(z < 0)
    {
-      if(!invert)
-         return -erf_imp(T(-z), invert, pol, t);
+      if (!invert)
+         return -erf_imp(T(-z), invert, pol, t); // LCOV_EXCL_LINE confirmed as covered, not sure why lcov does see it.
       else if(z < -0.5)
          return 2 - erf_imp(T(-z), invert, pol, t);
       else
@@ -688,8 +741,8 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
       }
       else if(z < 1e-20)
       {
-         static const T c = BOOST_MATH_BIG_CONSTANT(T, 113, 0.003379167095512573896158903121545171688);
-         result = z * 1.125 + z * c;
+         static const T c = BOOST_MATH_BIG_CONSTANT(T, 113, 0.003379167095512573896158903121545171688); // LCOV_EXCL_LINE
+         result = z * 1.125 + z * c;  // LCOV_EXCL_LINE confirmed as covered, not sure why lcov doesn't see this.
       }
       else
       {
@@ -697,6 +750,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     6.124e-36
          // Expected Error Term:                         -6.124e-36
          // Maximum Relative Change in Control Points:   3.492e-10
+         // LCOV_EXCL_START
          static const T Y = 1.0841522216796875f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.0442269454158250738961589031215451778),
@@ -718,6 +772,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.196230608502104324965623171516808796e-5),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.313388521582925207734229967907890146e-7),
          };
+         // LCOV_EXCL_STOP
          result = z * (Y + tools::evaluate_polynomial(P, T(z * z)) / tools::evaluate_polynomial(Q, T(z * z)));
       }
    }
@@ -733,6 +788,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     1.388e-35
          // Expected Error Term:                         1.387e-35
          // Maximum Relative Change in Control Points:   6.127e-05
+         // LCOV_EXCL_START
          static const T Y = 0.371877193450927734375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, -0.0640320213544647969396032886581290455),
@@ -759,13 +815,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.226988669466501655990637599399326874e-4),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.270666232259029102353426738909226413e-10),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 0.5f)) / tools::evaluate_polynomial(Q, T(z - 0.5f));
-         T hi, lo;
+         T hi, lo;  // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z;  // LCOV_EXCL_LINE strangely not seen by lcov.
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -775,6 +832,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Maximum Deviation Found:                     1.539e-35
          // Expected Error Term:                         1.538e-35
          // Maximum Relative Change in Control Points:   6.104e-05
+         // LCOV_EXCL_START
          static const T Y = 0.45658016204833984375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, -0.0289965858925328393392496555094848345),
@@ -800,13 +858,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.000349871943711566546821198612518656486),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.123749319840299552925421880481085392e-4),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 1.0f)) / tools::evaluate_polynomial(Q, T(z - 1.0f));
-         T hi, lo;
+         T hi, lo;  // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z;  // LCOV_EXCL_LINE strangley not seen by lcov
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -816,6 +875,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         1.418e-35
          // Maximum Relative Change in Control Points:   1.316e-04
          // Max Error found at long double precision =   1.998462e-35
+         // LCOV_EXCL_START
          static const T Y = 0.50250148773193359375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, -0.0201233630504573402185161184151016606),
@@ -842,13 +902,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.507158721790721802724402992033269266e-5),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.18647774409821470950544212696270639e-12),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 1.5f)) / tools::evaluate_polynomial(Q, T(z - 1.5f));
-         T hi, lo;
+         T hi, lo;  // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z;  // LCOV_EXCL_LINE strangely not seen by lcov.
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -858,6 +919,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         3.575e-36
          // Maximum Relative Change in Control Points:   7.103e-05
          // Max Error found at long double precision =   5.794737e-36
+         // LCOV_EXCL_START
          static const T Y = 0.52896785736083984375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, -0.00902152521745813634562524098263360074),
@@ -883,13 +945,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.686843205749767250666787987163701209e-4),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.192093541425429248675532015101904262e-5),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 2.25f)) / tools::evaluate_polynomial(Q, T(z - 2.25f));
-         T hi, lo;
+         T hi, lo;  // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z;  // LCOV_EXCL_LINE strangely not seen by lcov.
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -899,6 +962,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         -8.126e-37
          // Maximum Relative Change in Control Points:   1.363e-04
          // Max Error found at long double precision =   1.747062e-36
+         // LCOV_EXCL_START
          static const T Y = 0.54037380218505859375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, -0.0033703486408887424921155540591370375),
@@ -922,13 +986,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.000144243326443913171313947613547085553),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.407763415954267700941230249989140046e-5),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 3.0f)) / tools::evaluate_polynomial(Q, T(z - 3.0f));
-         T hi, lo;
+         T hi, lo;  // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z;  // LCOV_EXCL_LINE strangely not seen by lcov.
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -938,6 +1003,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         -5.803e-36
          // Maximum Relative Change in Control Points:   2.475e-05
          // Max Error found at long double precision =   1.349545e-35
+         // LCOV_EXCL_START
          static const T Y = 0.55000019073486328125f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.00118142849742309772151454518093813615),
@@ -965,13 +1031,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.655068544833064069223029299070876623e-6),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.11005507545746069573608988651927452e-7),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 4.5f)) / tools::evaluate_polynomial(Q, T(z - 4.5f));
-         T hi, lo;
+         T hi, lo; // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z;  // LCOV_EXCL_LINE strangely not seen by lcov.
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -981,6 +1048,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         1.007e-36
          // Maximum Relative Change in Control Points:   1.027e-03
          // Max Error found at long double precision =   2.646420e-36
+         // LCOV_EXCL_START
          static const T Y = 0.5574436187744140625f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.000293236907400849056269309713064107674),
@@ -1006,6 +1074,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.674128352521481412232785122943508729e-6),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.997637501418963696542159244436245077e-8),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z - 6.5f)) / tools::evaluate_polynomial(Q, T(z - 6.5f));
          T hi, lo;
          int expon;
@@ -1022,6 +1091,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         8.380e-36
          // Maximum Relative Change in Control Points:   2.632e-06
          // Max Error found at long double precision =   9.849522e-36
+         // LCOV_EXCL_START
          static const T Y = 0.56083202362060546875f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.000282420728751494363613829834891390121),
@@ -1047,13 +1117,14 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.164033049810404773469413526427932109e-4),
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.356615210500531410114914617294694857e-6),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(z / 2 - 4.75f)) / tools::evaluate_polynomial(Q, T(z / 2 - 4.75f));
-         T hi, lo;
+         T hi, lo;  // LCOV_EXCL_LINE
          int expon;
          hi = floor(ldexp(frexp(z, &expon), 56));
          hi = ldexp(hi, expon - 56);
          lo = z - hi;
-         T sq = z * z;
+         T sq = z * z; // LCOV_EXCL_LINE  strangely not seen by lcov.
          T err_sqr = ((hi * hi - sq) + 2 * hi * lo) + lo * lo;
          result *= exp(-sq) * exp(-err_sqr) / z;
       }
@@ -1063,6 +1134,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
          // Expected Error Term:                         -1.132e-35
          // Maximum Relative Change in Control Points:   4.674e-04
          // Max Error found at long double precision =   1.162590e-35
+         // LCOV_EXCL_START
          static const T Y = 0.5632686614990234375f;
          static const T P[] = {    
             BOOST_MATH_BIG_CONSTANT(T, 113, 0.000920922048732849448079451574171836943),
@@ -1092,6 +1164,7 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
             BOOST_MATH_BIG_CONSTANT(T, 113, 799.359797306084372350264298361110448),
             BOOST_MATH_BIG_CONSTANT(T, 113, 72.7415265778588087243442792401576737),
          };
+         // LCOV_EXCL_STOP
          result = Y + tools::evaluate_polynomial(P, T(1 / z)) / tools::evaluate_polynomial(Q, T(1 / z));
          T hi, lo;
          int expon;
@@ -1120,63 +1193,10 @@ T erf_imp(T z, bool invert, const Policy& pol, const std::integral_constant<int,
    return result;
 } // template <class T, class Lanczos>T erf_imp(T z, bool invert, const Lanczos& l, const std::integral_constant<int, 113>& t)
 
-template <class T, class Policy, class tag>
-struct erf_initializer
-{
-   struct init
-   {
-      init()
-      {
-         do_init(tag());
-      }
-      static void do_init(const std::integral_constant<int, 0>&){}
-      static void do_init(const std::integral_constant<int, 53>&)
-      {
-         boost::math::erf(static_cast<T>(1e-12), Policy());
-         boost::math::erf(static_cast<T>(0.25), Policy());
-         boost::math::erf(static_cast<T>(1.25), Policy());
-         boost::math::erf(static_cast<T>(2.25), Policy());
-         boost::math::erf(static_cast<T>(4.25), Policy());
-         boost::math::erf(static_cast<T>(5.25), Policy());
-      }
-      static void do_init(const std::integral_constant<int, 64>&)
-      {
-         boost::math::erf(static_cast<T>(1e-12), Policy());
-         boost::math::erf(static_cast<T>(0.25), Policy());
-         boost::math::erf(static_cast<T>(1.25), Policy());
-         boost::math::erf(static_cast<T>(2.25), Policy());
-         boost::math::erf(static_cast<T>(4.25), Policy());
-         boost::math::erf(static_cast<T>(5.25), Policy());
-      }
-      static void do_init(const std::integral_constant<int, 113>&)
-      {
-         boost::math::erf(static_cast<T>(1e-22), Policy());
-         boost::math::erf(static_cast<T>(0.25), Policy());
-         boost::math::erf(static_cast<T>(1.25), Policy());
-         boost::math::erf(static_cast<T>(2.125), Policy());
-         boost::math::erf(static_cast<T>(2.75), Policy());
-         boost::math::erf(static_cast<T>(3.25), Policy());
-         boost::math::erf(static_cast<T>(5.25), Policy());
-         boost::math::erf(static_cast<T>(7.25), Policy());
-         boost::math::erf(static_cast<T>(11.25), Policy());
-         boost::math::erf(static_cast<T>(12.5), Policy());
-      }
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-
-template <class T, class Policy, class tag>
-const typename erf_initializer<T, Policy, tag>::init erf_initializer<T, Policy, tag>::initializer;
-
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type erf(T z, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type erf(T z, const Policy& /* pol */)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -1201,8 +1221,6 @@ inline typename tools::promote_args<T>::type erf(T z, const Policy& /* pol */)
 
    BOOST_MATH_INSTRUMENT_CODE("tag_type = " << typeid(tag_type).name());
 
-   detail::erf_initializer<value_type, forwarding_policy, tag_type>::force_instantiate(); // Force constants to be initialized before main
-
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::erf_imp(
       static_cast<value_type>(z),
       false,
@@ -1211,7 +1229,7 @@ inline typename tools::promote_args<T>::type erf(T z, const Policy& /* pol */)
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type erfc(T z, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type erfc(T z, const Policy& /* pol */)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -1236,8 +1254,6 @@ inline typename tools::promote_args<T>::type erfc(T z, const Policy& /* pol */)
 
    BOOST_MATH_INSTRUMENT_CODE("tag_type = " << typeid(tag_type).name());
 
-   detail::erf_initializer<value_type, forwarding_policy, tag_type>::force_instantiate(); // Force constants to be initialized before main
-
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::erf_imp(
       static_cast<value_type>(z),
       true,
@@ -1246,13 +1262,13 @@ inline typename tools::promote_args<T>::type erfc(T z, const Policy& /* pol */)
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type erf(T z)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type erf(T z)
 {
    return boost::math::erf(z, policies::policy<>());
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type erfc(T z)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type erfc(T z)
 {
    return boost::math::erfc(z, policies::policy<>());
 }
@@ -1260,6 +1276,64 @@ inline typename tools::promote_args<T>::type erfc(T z)
 } // namespace math
 } // namespace boost
 
+#else // Special handling for NVRTC platform
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto erf(T x)
+{
+   return ::erf(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto erf(float x)
+{
+   return ::erff(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto erf(T x, const Policy&)
+{
+   return ::erf(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto erf(float x, const Policy&)
+{
+   return ::erff(x);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto erfc(T x)
+{
+   return ::erfc(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto erfc(float x)
+{
+   return ::erfcf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto erfc(T x, const Policy&)
+{
+   return ::erfc(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto erfc(float x, const Policy&)
+{
+   return ::erfcf(x);
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/special_functions/detail/erf_inv.hpp>
 
 #endif // BOOST_MATH_SPECIAL_ERF_HPP
diff --git a/inst/include/boost/math/special_functions/expint.hpp b/inst/include/boost/math/special_functions/expint.hpp
index 1475a9a88..09e97bd4f 100644
--- a/inst/include/boost/math/special_functions/expint.hpp
+++ b/inst/include/boost/math/special_functions/expint.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2007.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -12,6 +13,10 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/promotion.hpp>
 #include <boost/math/tools/fraction.hpp>
@@ -20,7 +25,6 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/digamma.hpp>
 #include <boost/math/special_functions/log1p.hpp>
-#include <boost/math/special_functions/pow.hpp>
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -35,13 +39,13 @@
 namespace boost{ namespace math{
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    expint(unsigned n, T z, const Policy& /*pol*/);
 
 namespace detail{
 
 template <class T>
-inline T expint_1_rational(const T& z, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED inline T expint_1_rational(const T& z, const boost::math::integral_constant<int, 0>&)
 {
    // this function is never actually called
    BOOST_MATH_ASSERT(0);
@@ -49,7 +53,7 @@ inline T expint_1_rational(const T& z, const std::integral_constant<int, 0>&)
 }
 
 template <class T>
-T expint_1_rational(const T& z, const std::integral_constant<int, 53>&)
+BOOST_MATH_GPU_ENABLED T expint_1_rational(const T& z, const boost::math::integral_constant<int, 53>&)
 {
    BOOST_MATH_STD_USING
    T result;
@@ -123,7 +127,7 @@ T expint_1_rational(const T& z, const std::integral_constant<int, 53>&)
 }
 
 template <class T>
-T expint_1_rational(const T& z, const std::integral_constant<int, 64>&)
+BOOST_MATH_GPU_ENABLED T expint_1_rational(const T& z, const boost::math::integral_constant<int, 64>&)
 {
    BOOST_MATH_STD_USING
    T result;
@@ -204,7 +208,7 @@ T expint_1_rational(const T& z, const std::integral_constant<int, 64>&)
 }
 
 template <class T>
-T expint_1_rational(const T& z, const std::integral_constant<int, 113>&)
+BOOST_MATH_GPU_ENABLED T expint_1_rational(const T& z, const boost::math::integral_constant<int, 113>&)
 {
    BOOST_MATH_STD_USING
    T result;
@@ -351,14 +355,15 @@ T expint_1_rational(const T& z, const std::integral_constant<int, 113>&)
    return result;
 }
 
+
 template <class T>
 struct expint_fraction
 {
-   typedef std::pair<T,T> result_type;
-   expint_fraction(unsigned n_, T z_) : b(n_ + z_), i(-1), n(n_){}
-   std::pair<T,T> operator()()
+   typedef boost::math::pair<T,T> result_type;
+   BOOST_MATH_GPU_ENABLED expint_fraction(unsigned n_, T z_) : b(n_ + z_), i(-1), n(n_){}
+   BOOST_MATH_GPU_ENABLED boost::math::pair<T,T> operator()()
    {
-      std::pair<T,T> result = std::make_pair(-static_cast<T>((i+1) * (n+i)), b);
+      boost::math::pair<T,T> result = boost::math::make_pair(-static_cast<T>((i+1) * (n+i)), b);
       b += 2;
       ++i;
       return result;
@@ -370,11 +375,11 @@ struct expint_fraction
 };
 
 template <class T, class Policy>
-inline T expint_as_fraction(unsigned n, T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T expint_as_fraction(unsigned n, T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    BOOST_MATH_INSTRUMENT_VARIABLE(z)
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
    expint_fraction<T> f(n, z);
    T result = tools::continued_fraction_b(
       f,
@@ -392,9 +397,9 @@ template <class T>
 struct expint_series
 {
    typedef T result_type;
-   expint_series(unsigned k_, T z_, T x_k_, T denom_, T fact_)
+   BOOST_MATH_GPU_ENABLED expint_series(unsigned k_, T z_, T x_k_, T denom_, T fact_)
       : k(k_), z(z_), x_k(x_k_), denom(denom_), fact(fact_){}
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       x_k *= -z;
       denom += 1;
@@ -410,10 +415,10 @@ struct expint_series
 };
 
 template <class T, class Policy>
-inline T expint_as_series(unsigned n, T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T expint_as_series(unsigned n, T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    BOOST_MATH_INSTRUMENT_VARIABLE(z)
 
@@ -443,10 +448,10 @@ inline T expint_as_series(unsigned n, T z, const Policy& pol)
 }
 
 template <class T, class Policy, class Tag>
-T expint_imp(unsigned n, T z, const Policy& pol, const Tag& tag)
+BOOST_MATH_GPU_ENABLED T expint_imp(unsigned n, T z, const Policy& pol, const Tag& tag)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::expint<%1%>(unsigned, %1%)";
+   constexpr auto function = "boost::math::expint<%1%>(unsigned, %1%)";
    if(z < 0)
       return policies::raise_domain_error<T>(function, "Function requires z >= 0 but got %1%.", z, pol);
    if(z == 0)
@@ -468,15 +473,21 @@ T expint_imp(unsigned n, T z, const Policy& pol, const Tag& tag)
 #  pragma warning(disable:4127) // conditional expression is constant
 #endif
    if(n == 0)
+   {
       result = exp(-z) / z;
+   }
    else if((n == 1) && (Tag::value))
    {
       result = expint_1_rational(z, tag);
    }
    else if(f)
+   {
       result = expint_as_series(n, z, pol);
+   }
    else
+   {
       result = expint_as_fraction(n, z, pol);
+   }
 #ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
@@ -488,8 +499,8 @@ template <class T>
 struct expint_i_series
 {
    typedef T result_type;
-   expint_i_series(T z_) : k(0), z_k(1), z(z_){}
-   T operator()()
+   BOOST_MATH_GPU_ENABLED expint_i_series(T z_) : k(0), z_k(1), z(z_){}
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       z_k *= z / ++k;
       return z_k / k;
@@ -501,22 +512,22 @@ struct expint_i_series
 };
 
 template <class T, class Policy>
-T expint_i_as_series(T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T expint_i_as_series(T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    T result = log(z); // (log(z) - log(1 / z)) / 2;
    result += constants::euler<T>();
    expint_i_series<T> s(z);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
    result = tools::sum_series(s, policies::get_epsilon<T, Policy>(), max_iter, result);
    policies::check_series_iterations<T>("boost::math::expint_i_series<%1%>(%1%)", max_iter, pol);
    return result;
 }
 
 template <class T, class Policy, class Tag>
-T expint_i_imp(T z, const Policy& pol, const Tag& tag)
+BOOST_MATH_GPU_ENABLED T expint_i_imp(T z, const Policy& pol, const Tag& tag)
 {
-   static const char* function = "boost::math::expint<%1%>(%1%)";
+   constexpr auto function = "boost::math::expint<%1%>(%1%)";
    if(z < 0)
       return -expint_imp(1, T(-z), pol, tag);
    if(z == 0)
@@ -525,10 +536,10 @@ T expint_i_imp(T z, const Policy& pol, const Tag& tag)
 }
 
 template <class T, class Policy>
-T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& tag)
+BOOST_MATH_GPU_ENABLED T expint_i_imp(T z, const Policy& pol, const boost::math::integral_constant<int, 53>& tag)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::expint<%1%>(%1%)";
+   constexpr auto function = "boost::math::expint<%1%>(%1%)";
    if(z < 0)
       return -expint_imp(1, T(-z), pol, tag);
    if(z == 0)
@@ -541,7 +552,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
       // Maximum Deviation Found:                     2.852e-18
       // Expected Error Term:                         2.852e-18
       // Max Error found at double precision =        Poly: 2.636335e-16   Cheb: 4.187027e-16
-      static const T P[10] = {
+      BOOST_MATH_STATIC const T P[10] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 2.98677224343598593013),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.356343618769377415068),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.780836076283730801839),
@@ -553,7 +564,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.798296365679269702435e-5),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.2777056254402008721e-6)
       };
-      static const T Q[8] = {
+      BOOST_MATH_STATIC const T Q[8] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 53, -1.17090412365413911947),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.62215109846016746276),
@@ -564,11 +575,11 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.138972589601781706598e-4)
       };
 
-      static const T c1 = BOOST_MATH_BIG_CONSTANT(T, 53, 1677624236387711.0);
-      static const T c2 = BOOST_MATH_BIG_CONSTANT(T, 53, 4503599627370496.0);
-      static const T r1 = static_cast<T>(c1 / c2);
-      static const T r2 = BOOST_MATH_BIG_CONSTANT(T, 53, 0.131401834143860282009280387409357165515556574352422001206362e-16);
-      static const T r = static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 53, 0.372507410781366634461991866580119133535689497771654051555657435242200120636201854384926049951548942392));
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T c1 = BOOST_MATH_BIG_CONSTANT(T, 53, 1677624236387711.0);
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T c2 = BOOST_MATH_BIG_CONSTANT(T, 53, 4503599627370496.0);
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T r1 = static_cast<T>(c1 / c2);
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T r2 = BOOST_MATH_BIG_CONSTANT(T, 53, 0.131401834143860282009280387409357165515556574352422001206362e-16);
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T r = static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 53, 0.372507410781366634461991866580119133535689497771654051555657435242200120636201854384926049951548942392));
       T t = (z / 3) - 1;
       result = tools::evaluate_polynomial(P, t)
          / tools::evaluate_polynomial(Q, t);
@@ -588,8 +599,8 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
       // Maximum Deviation Found:                     6.546e-17
       // Expected Error Term:                         6.546e-17
       // Max Error found at double precision =        Poly: 6.890169e-17   Cheb: 6.772128e-17
-      static const T Y = 1.158985137939453125F;
-      static const T P[8] = {
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 1.158985137939453125F;
+      BOOST_MATH_STATIC const T P[8] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.00139324086199402804173),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0349921221823888744966),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0264095520754134848538),
@@ -599,7 +610,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.554086272024881826253e-4),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.396487648924804510056e-5)
       };
-      static const T Q[8] = {
+      BOOST_MATH_STATIC const T Q[8] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.744625566823272107711),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.329061095011767059236),
@@ -621,8 +632,8 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
       // Expected Error Term:                         -1.842e-17
       // Max Error found at double precision =        Poly: 4.375868e-17   Cheb: 5.860967e-17
 
-      static const T Y = 1.0869731903076171875F;
-      static const T P[9] = {
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 1.0869731903076171875F;
+      BOOST_MATH_STATIC const T P[9] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.00893891094356945667451),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0484607730127134045806),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0652810444222236895772),
@@ -633,7 +644,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.000209750022660200888349),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.138652200349182596186e-4)
       };
-      static const T Q[9] = {
+      BOOST_MATH_STATIC const T Q[9] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.97017214039061194971),
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.86232465043073157508),
@@ -657,8 +668,8 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
       // Max Error found at double precision =        Poly: 1.441088e-16   Cheb: 1.864792e-16
 
 
-      static const T Y = 1.03937530517578125F;
-      static const T P[9] = {
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y = 1.03937530517578125F;
+      BOOST_MATH_STATIC const T P[9] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.00356165148914447597995),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0229930320357982333406),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0449814350482277917716),
@@ -669,7 +680,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.000192178045857733706044),
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.113161784705911400295e-9)
       };
-      static const T Q[9] = {
+      BOOST_MATH_STATIC const T Q[9] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 53, 2.84354408840148561131),
          BOOST_MATH_BIG_CONSTANT(T, 53, 3.6599610090072393012),
@@ -688,9 +699,9 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
    else
    {
       // Max Error found at double precision =        3.381886e-17
-      static const T exp40 = static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 53, 2.35385266837019985407899910749034804508871617254555467236651e17));
-      static const T Y= 1.013065338134765625F;
-      static const T P[6] = {
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T exp40 = static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 53, 2.35385266837019985407899910749034804508871617254555467236651e17));
+      BOOST_MATH_STATIC_LOCAL_VARIABLE const T Y= 1.013065338134765625F;
+      BOOST_MATH_STATIC const T P[6] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, -0.0130653381347656243849),
          BOOST_MATH_BIG_CONSTANT(T, 53, 0.19029710559486576682),
          BOOST_MATH_BIG_CONSTANT(T, 53, 94.7365094537197236011),
@@ -698,7 +709,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
          BOOST_MATH_BIG_CONSTANT(T, 53, 18932.0850014925993025),
          BOOST_MATH_BIG_CONSTANT(T, 53, -38703.1431362056714134)
       };
-      static const T Q[7] = {
+      BOOST_MATH_STATIC const T Q[7] = {
          BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
          BOOST_MATH_BIG_CONSTANT(T, 53, 61.9733592849439884145),
          BOOST_MATH_BIG_CONSTANT(T, 53, -2354.56211323420194283),
@@ -739,10 +750,10 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 53>& ta
 }
 
 template <class T, class Policy>
-T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 64>& tag)
+BOOST_MATH_GPU_ENABLED T expint_i_imp(T z, const Policy& pol, const boost::math::integral_constant<int, 64>& tag)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::expint<%1%>(%1%)";
+   constexpr auto function = "boost::math::expint<%1%>(%1%)";
    if(z < 0)
       return -expint_imp(1, T(-z), pol, tag);
    if(z == 0)
@@ -976,7 +987,7 @@ T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 64>& ta
 }
 
 template <class T, class Policy>
-void expint_i_imp_113a(T& result, const T& z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED void expint_i_imp_113a(T& result, const T& z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     1.230e-36
@@ -1044,7 +1055,7 @@ void expint_i_imp_113a(T& result, const T& z, const Policy& pol)
 }
 
 template <class T>
-void expint_i_113b(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113b(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     7.779e-36
@@ -1094,7 +1105,7 @@ void expint_i_113b(T& result, const T& z)
 }
 
 template <class T>
-void expint_i_113c(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113c(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     1.082e-34
@@ -1147,7 +1158,7 @@ void expint_i_113c(T& result, const T& z)
 }
 
 template <class T>
-void expint_i_113d(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113d(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     3.163e-35
@@ -1198,7 +1209,7 @@ void expint_i_113d(T& result, const T& z)
 }
 
 template <class T>
-void expint_i_113e(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113e(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     7.972e-36
@@ -1252,7 +1263,7 @@ void expint_i_113e(T& result, const T& z)
 }
 
 template <class T>
-void expint_i_113f(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113f(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     4.469e-36
@@ -1299,7 +1310,7 @@ void expint_i_113f(T& result, const T& z)
 }
 
 template <class T>
-void expint_i_113g(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113g(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     5.588e-35
@@ -1344,7 +1355,7 @@ void expint_i_113g(T& result, const T& z)
 }
 
 template <class T>
-void expint_i_113h(T& result, const T& z)
+BOOST_MATH_GPU_ENABLED void expint_i_113h(T& result, const T& z)
 {
    BOOST_MATH_STD_USING
    // Maximum Deviation Found:                     4.448e-36
@@ -1383,10 +1394,10 @@ void expint_i_113h(T& result, const T& z)
 }
 
 template <class T, class Policy>
-T expint_i_imp(T z, const Policy& pol, const std::integral_constant<int, 113>& tag)
+BOOST_MATH_GPU_ENABLED T expint_i_imp(T z, const Policy& pol, const boost::math::integral_constant<int, 113>& tag)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::expint<%1%>(%1%)";
+   constexpr auto function = "boost::math::expint<%1%>(%1%)";
    if(z < 0)
       return -expint_imp(1, T(-z), pol, tag);
    if(z == 0)
@@ -1491,12 +1502,12 @@ struct expint_i_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          do_init(tag());
       }
-      static void do_init(const std::integral_constant<int, 0>&){}
-      static void do_init(const std::integral_constant<int, 53>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 0>&){}
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 53>&)
       {
          boost::math::expint(T(5), Policy());
          boost::math::expint(T(7), Policy());
@@ -1504,7 +1515,7 @@ struct expint_i_initializer
          boost::math::expint(T(38), Policy());
          boost::math::expint(T(45), Policy());
       }
-      static void do_init(const std::integral_constant<int, 64>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
       {
          boost::math::expint(T(5), Policy());
          boost::math::expint(T(7), Policy());
@@ -1512,7 +1523,7 @@ struct expint_i_initializer
          boost::math::expint(T(38), Policy());
          boost::math::expint(T(45), Policy());
       }
-      static void do_init(const std::integral_constant<int, 113>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 113>&)
       {
          boost::math::expint(T(5), Policy());
          boost::math::expint(T(7), Policy());
@@ -1524,12 +1535,14 @@ struct expint_i_initializer
          boost::math::expint(T(200), Policy());
          boost::math::expint(T(220), Policy());
       }
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
    static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -1541,33 +1554,35 @@ struct expint_1_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          do_init(tag());
       }
-      static void do_init(const std::integral_constant<int, 0>&){}
-      static void do_init(const std::integral_constant<int, 53>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 0>&){}
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 53>&)
       {
          boost::math::expint(1, T(0.5), Policy());
          boost::math::expint(1, T(2), Policy());
       }
-      static void do_init(const std::integral_constant<int, 64>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
       {
          boost::math::expint(1, T(0.5), Policy());
          boost::math::expint(1, T(2), Policy());
       }
-      static void do_init(const std::integral_constant<int, 113>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 113>&)
       {
          boost::math::expint(1, T(0.5), Policy());
          boost::math::expint(1, T(2), Policy());
          boost::math::expint(1, T(6), Policy());
       }
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
    static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -1575,8 +1590,8 @@ template <class T, class Policy, class tag>
 const typename expint_1_initializer<T, Policy, tag>::init expint_1_initializer<T, Policy, tag>::initializer;
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
-   expint_forwarder(T z, const Policy& /*pol*/, std::true_type const&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
+   expint_forwarder(T z, const Policy& /*pol*/, boost::math::true_type const&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -1587,7 +1602,7 @@ inline typename tools::promote_args<T>::type
       policies::promote_double<false>,
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       precision_type::value <= 0 ? 0 :
       precision_type::value <= 53 ? 53 :
       precision_type::value <= 64 ? 64 :
@@ -1603,8 +1618,8 @@ inline typename tools::promote_args<T>::type
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
-expint_forwarder(unsigned n, T z, const std::false_type&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
+expint_forwarder(unsigned n, T z, const boost::math::false_type&)
 {
    return boost::math::expint(n, z, policies::policy<>());
 }
@@ -1612,7 +1627,7 @@ expint_forwarder(unsigned n, T z, const std::false_type&)
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    expint(unsigned n, T z, const Policy& /*pol*/)
 {
    typedef typename tools::promote_args<T>::type result_type;
@@ -1624,7 +1639,7 @@ inline typename tools::promote_args<T>::type
       policies::promote_double<false>,
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       precision_type::value <= 0 ? 0 :
       precision_type::value <= 53 ? 53 :
       precision_type::value <= 64 ? 64 :
@@ -1641,7 +1656,7 @@ inline typename tools::promote_args<T>::type
 }
 
 template <class T, class U>
-inline typename detail::expint_result<T, U>::type
+BOOST_MATH_GPU_ENABLED inline typename detail::expint_result<T, U>::type
    expint(T const z, U const u)
 {
    typedef typename policies::is_policy<U>::type tag_type;
@@ -1649,7 +1664,7 @@ inline typename detail::expint_result<T, U>::type
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    expint(T z)
 {
    return expint(z, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/expm1.hpp b/inst/include/boost/math/special_functions/expm1.hpp
index eec635603..5e61ca20b 100644
--- a/inst/include/boost/math/special_functions/expm1.hpp
+++ b/inst/include/boost/math/special_functions/expm1.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,10 +11,10 @@
 #pragma once
 #endif
 
-#include <cmath>
-#include <cstdint>
-#include <limits>
 #include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/tools/series.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/big_constant.hpp>
@@ -21,6 +22,9 @@
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -45,10 +49,10 @@ namespace detail
   {
      typedef T result_type;
 
-     expm1_series(T x)
+     BOOST_MATH_GPU_ENABLED expm1_series(T x)
         : k(0), m_x(x), m_term(1) {}
 
-     T operator()()
+     BOOST_MATH_GPU_ENABLED T operator()()
      {
         ++k;
         m_term *= m_x;
@@ -56,7 +60,7 @@ namespace detail
         return m_term;
      }
 
-     int count()const
+     BOOST_MATH_GPU_ENABLED int count()const
      {
         return k;
      }
@@ -74,26 +78,28 @@ struct expm1_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          do_init(tag());
       }
       template <int N>
-      static void do_init(const std::integral_constant<int, N>&){}
-      static void do_init(const std::integral_constant<int, 64>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, N>&){}
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
       {
          expm1(T(0.5));
       }
-      static void do_init(const std::integral_constant<int, 113>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 113>&)
       {
          expm1(T(0.5));
       }
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
-   static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_STATIC const init initializer;
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -106,7 +112,7 @@ const typename expm1_initializer<T, Policy, tag>::init expm1_initializer<T, Poli
 // This version uses a Taylor series expansion for 0.5 > |x| > epsilon.
 //
 template <class T, class Policy>
-T expm1_imp(T x, const std::integral_constant<int, 0>&, const Policy& pol)
+T expm1_imp(T x, const boost::math::integral_constant<int, 0>&, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -128,7 +134,7 @@ T expm1_imp(T x, const std::integral_constant<int, 0>&, const Policy& pol)
    if(a < tools::epsilon<T>())
       return x;
    detail::expm1_series<T> s(x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    T result = tools::sum_series(s, policies::get_epsilon<T, Policy>(), max_iter);
 
@@ -137,7 +143,7 @@ T expm1_imp(T x, const std::integral_constant<int, 0>&, const Policy& pol)
 }
 
 template <class T, class P>
-T expm1_imp(T x, const std::integral_constant<int, 53>&, const P& pol)
+BOOST_MATH_GPU_ENABLED T expm1_imp(T x, const boost::math::integral_constant<int, 53>&, const P& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -155,16 +161,16 @@ T expm1_imp(T x, const std::integral_constant<int, 53>&, const P& pol)
    if(a < tools::epsilon<T>())
       return x;
 
-   static const float Y = 0.10281276702880859e1f;
-   static const T n[] = { static_cast<T>(-0.28127670288085937e-1), static_cast<T>(0.51278186299064534e0), static_cast<T>(-0.6310029069350198e-1), static_cast<T>(0.11638457975729296e-1), static_cast<T>(-0.52143390687521003e-3), static_cast<T>(0.21491399776965688e-4) };
-   static const T d[] = { 1, static_cast<T>(-0.45442309511354755e0), static_cast<T>(0.90850389570911714e-1), static_cast<T>(-0.10088963629815502e-1), static_cast<T>(0.63003407478692265e-3), static_cast<T>(-0.17976570003654402e-4) };
+   BOOST_MATH_STATIC const float Y = 0.10281276702880859e1f;
+   BOOST_MATH_STATIC const T n[] = { static_cast<T>(-0.28127670288085937e-1), static_cast<T>(0.51278186299064534e0), static_cast<T>(-0.6310029069350198e-1), static_cast<T>(0.11638457975729296e-1), static_cast<T>(-0.52143390687521003e-3), static_cast<T>(0.21491399776965688e-4) };
+   BOOST_MATH_STATIC const T d[] = { 1, static_cast<T>(-0.45442309511354755e0), static_cast<T>(0.90850389570911714e-1), static_cast<T>(-0.10088963629815502e-1), static_cast<T>(0.63003407478692265e-3), static_cast<T>(-0.17976570003654402e-4) };
 
    T result = x * Y + x * tools::evaluate_polynomial(n, x) / tools::evaluate_polynomial(d, x);
    return result;
 }
 
 template <class T, class P>
-T expm1_imp(T x, const std::integral_constant<int, 64>&, const P& pol)
+BOOST_MATH_GPU_ENABLED T expm1_imp(T x, const boost::math::integral_constant<int, 64>&, const P& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -182,8 +188,8 @@ T expm1_imp(T x, const std::integral_constant<int, 64>&, const P& pol)
    if(a < tools::epsilon<T>())
       return x;
 
-   static const float Y = 0.10281276702880859375e1f;
-   static const T n[] = {
+   BOOST_MATH_STATIC const float Y = 0.10281276702880859375e1f;
+   BOOST_MATH_STATIC const T n[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.281276702880859375e-1),
        BOOST_MATH_BIG_CONSTANT(T, 64, 0.512980290285154286358e0),
        BOOST_MATH_BIG_CONSTANT(T, 64, -0.667758794592881019644e-1),
@@ -192,7 +198,7 @@ T expm1_imp(T x, const std::integral_constant<int, 64>&, const P& pol)
        BOOST_MATH_BIG_CONSTANT(T, 64, 0.447441185192951335042e-4),
        BOOST_MATH_BIG_CONSTANT(T, 64, -0.714539134024984593011e-6)
    };
-   static const T d[] = {
+   BOOST_MATH_STATIC const T d[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.461477618025562520389e0),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.961237488025708540713e-1),
@@ -207,7 +213,7 @@ T expm1_imp(T x, const std::integral_constant<int, 64>&, const P& pol)
 }
 
 template <class T, class P>
-T expm1_imp(T x, const std::integral_constant<int, 113>&, const P& pol)
+BOOST_MATH_GPU_ENABLED T expm1_imp(T x, const boost::math::integral_constant<int, 113>&, const P& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -259,7 +265,7 @@ T expm1_imp(T x, const std::integral_constant<int, 113>&, const P& pol)
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type expm1(T x, const Policy& /* pol */)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type expm1(T x, const Policy& /* pol */)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -271,7 +277,7 @@ inline typename tools::promote_args<T>::type expm1(T x, const Policy& /* pol */)
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       precision_type::value <= 0 ? 0 :
       precision_type::value <= 53 ? 53 :
       precision_type::value <= 64 ? 64 :
@@ -294,18 +300,18 @@ inline typename tools::promote_args<T>::type expm1(T x, const Policy& /* pol */)
 
 #if defined(BOOST_HAS_EXPM1) && !(defined(__osf__) && defined(__DECCXX_VER))
 #  ifdef BOOST_MATH_USE_C99
-inline float expm1(float x, const policies::policy<>&){ return ::expm1f(x); }
+BOOST_MATH_GPU_ENABLED inline float expm1(float x, const policies::policy<>&){ return ::expm1f(x); }
 #     ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 inline long double expm1(long double x, const policies::policy<>&){ return ::expm1l(x); }
 #     endif
 #  else
 inline float expm1(float x, const policies::policy<>&){ return static_cast<float>(::expm1(x)); }
 #  endif
-inline double expm1(double x, const policies::policy<>&){ return ::expm1(x); }
+BOOST_MATH_GPU_ENABLED inline double expm1(double x, const policies::policy<>&){ return ::expm1(x); }
 #endif
 
 template <class T>
-inline typename tools::promote_args<T>::type expm1(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type expm1(T x)
 {
    return expm1(x, policies::policy<>());
 }
@@ -313,6 +319,40 @@ inline typename tools::promote_args<T>::type expm1(T x)
 } // namespace math
 } // namespace boost
 
+#else // Special handling for NVRTC 
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto expm1(T x)
+{
+   return ::expm1(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto expm1(float x)
+{
+   return ::expm1f(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto expm1(T x, const Policy&)
+{
+   return ::expm1(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto expm1(float x, const Policy&)
+{
+   return ::expm1f(x);
+}
+
+} // Namespace math
+} // Namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif // BOOST_MATH_HYPOT_INCLUDED
 
 
diff --git a/inst/include/boost/math/special_functions/factorials.hpp b/inst/include/boost/math/special_functions/factorials.hpp
index 7229635cb..ec6978bdc 100644
--- a/inst/include/boost/math/special_functions/factorials.hpp
+++ b/inst/include/boost/math/special_functions/factorials.hpp
@@ -10,10 +10,14 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/precision.hpp>
+#include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/detail/unchecked_factorial.hpp>
-#include <array>
+#include <boost/math/special_functions/math_fwd.hpp>
+
 #ifdef _MSC_VER
 #pragma warning(push) // Temporary until lexical cast fixed.
 #pragma warning(disable: 4127 4701)
@@ -21,16 +25,14 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#include <type_traits>
-#include <cmath>
 
 namespace boost { namespace math
 {
 
 template <class T, class Policy>
-inline T factorial(unsigned i, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T factorial(unsigned i, const Policy& pol)
 {
-   static_assert(!std::is_integral<T>::value, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value, "Type T must not be an integral type");
    // factorial<unsigned int>(n) is not implemented
    // because it would overflow integral type T for too small n
    // to be useful. Use instead a floating-point type,
@@ -49,7 +51,7 @@ inline T factorial(unsigned i, const Policy& pol)
 }
 
 template <class T>
-inline T factorial(unsigned i)
+BOOST_MATH_GPU_ENABLED inline T factorial(unsigned i)
 {
    return factorial<T>(i, policies::policy<>());
 }
@@ -72,9 +74,9 @@ inline double factorial<double>(unsigned i)
 }
 */
 template <class T, class Policy>
-T double_factorial(unsigned i, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T double_factorial(unsigned i, const Policy& pol)
 {
-   static_assert(!std::is_integral<T>::value, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value, "Type T must not be an integral type");
    BOOST_MATH_STD_USING  // ADL lookup of std names
    if(i & 1)
    {
@@ -107,17 +109,20 @@ T double_factorial(unsigned i, const Policy& pol)
 }
 
 template <class T>
-inline T double_factorial(unsigned i)
+BOOST_MATH_GPU_ENABLED inline T double_factorial(unsigned i)
 {
    return double_factorial<T>(i, policies::policy<>());
 }
 
+// TODO(mborland): We do not currently have support for tgamma_delta_ratio
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 namespace detail{
 
 template <class T, class Policy>
 T rising_factorial_imp(T x, int n, const Policy& pol)
 {
-   static_assert(!std::is_integral<T>::value, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value, "Type T must not be an integral type");
    if(x < 0)
    {
       //
@@ -165,7 +170,7 @@ T rising_factorial_imp(T x, int n, const Policy& pol)
 template <class T, class Policy>
 inline T falling_factorial_imp(T x, unsigned n, const Policy& pol)
 {
-   static_assert(!std::is_integral<T>::value, "Type T must not be an integral type");
+   static_assert(!boost::math::is_integral<T>::value, "Type T must not be an integral type");
    BOOST_MATH_STD_USING // ADL of std names
    if(x == 0)
       return 0;
@@ -262,6 +267,8 @@ inline typename tools::promote_args<RT>::type
       static_cast<result_type>(x), n, pol);
 }
 
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
 } // namespace math
 } // namespace boost
 
diff --git a/inst/include/boost/math/special_functions/fibonacci.hpp b/inst/include/boost/math/special_functions/fibonacci.hpp
index 2eb4cabaf..e62fa8928 100644
--- a/inst/include/boost/math/special_functions/fibonacci.hpp
+++ b/inst/include/boost/math/special_functions/fibonacci.hpp
@@ -26,7 +26,7 @@ namespace detail {
 } // namespace detail
 
 template <typename T>
-inline BOOST_CXX14_CONSTEXPR T unchecked_fibonacci(unsigned long long n) noexcept(std::is_fundamental<T>::value) {
+inline BOOST_MATH_CXX14_CONSTEXPR T unchecked_fibonacci(unsigned long long n) noexcept(std::is_fundamental<T>::value) {
     // This function is called by the rest and computes the actual nth fibonacci number
     // First few fibonacci numbers: 0 (0th), 1 (1st), 1 (2nd), 2 (3rd), ...
     if (n <= 2) return n == 0 ? 0 : 1;
@@ -50,7 +50,7 @@ inline BOOST_CXX14_CONSTEXPR T unchecked_fibonacci(unsigned long long n) noexcep
 }
 
 template <typename T, class Policy>
-T inline BOOST_CXX14_CONSTEXPR fibonacci(unsigned long long n, const Policy &pol) {
+T inline BOOST_MATH_CXX14_CONSTEXPR fibonacci(unsigned long long n, const Policy &pol) {
     // check for overflow using approximation to binet's formula: F_n ~ phi^n / sqrt(5)
     if (n > 20 && n * detail::fib_bits_phi - detail::fib_bits_deno > std::numeric_limits<T>::digits)
         return policies::raise_overflow_error<T>("boost::math::fibonacci<%1%>(unsigned long long)", "Possible overflow detected.", pol);
@@ -58,7 +58,7 @@ T inline BOOST_CXX14_CONSTEXPR fibonacci(unsigned long long n, const Policy &pol
 }
 
 template <typename T>
-T inline BOOST_CXX14_CONSTEXPR fibonacci(unsigned long long n) {
+T inline BOOST_MATH_CXX14_CONSTEXPR fibonacci(unsigned long long n) {
     return fibonacci<T>(n, policies::policy<>());
 }
 
diff --git a/inst/include/boost/math/special_functions/fpclassify.hpp b/inst/include/boost/math/special_functions/fpclassify.hpp
index 2c504d7ac..0ac9470f2 100644
--- a/inst/include/boost/math/special_functions/fpclassify.hpp
+++ b/inst/include/boost/math/special_functions/fpclassify.hpp
@@ -1,5 +1,6 @@
 //  Copyright John Maddock 2005-2008.
 //  Copyright (c) 2006-2008 Johan Rade
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -11,12 +12,17 @@
 #pragma once
 #endif
 
-#include <limits>
-#include <type_traits>
-#include <cmath>
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/tools/real_cast.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/detail/fp_traits.hpp>
+#include <limits>
+#include <type_traits>
+#include <cmath>
+
 /*!
   \file fpclassify.hpp
   \brief Classify floating-point value as normal, subnormal, zero, infinite, or NaN.
@@ -76,6 +82,80 @@ is used.
 
 */
 
+#ifdef BOOST_MATH_HAS_GPU_SUPPORT
+
+namespace boost { namespace math {
+
+template<> inline BOOST_MATH_GPU_ENABLED bool (isnan)(float x) { return x != x; }
+template<> inline BOOST_MATH_GPU_ENABLED bool (isnan)(double x) { return x != x; }
+
+template<> inline BOOST_MATH_GPU_ENABLED bool (isinf)(float x) { return x > FLT_MAX || x < -FLT_MAX; }
+template<> inline BOOST_MATH_GPU_ENABLED bool (isinf)(double x) { return x > DBL_MAX || x < -DBL_MAX; }
+
+template<> inline BOOST_MATH_GPU_ENABLED bool (isfinite)(float x) {  return !isnan(x) && !isinf(x);  }
+template<> inline BOOST_MATH_GPU_ENABLED bool (isfinite)(double x) {  return !isnan(x) && !isinf(x); }
+
+template<> inline BOOST_MATH_GPU_ENABLED bool (isnormal)(float x)
+{
+   if(x < 0) x = -x;
+   return (x >= FLT_MIN) && (x <= FLT_MAX);
+}
+template<> inline BOOST_MATH_GPU_ENABLED bool (isnormal)(double x)
+{
+   if(x < 0) x = -x;
+   return (x >= DBL_MIN) && (x <= DBL_MAX);
+}
+
+template<> inline BOOST_MATH_GPU_ENABLED int (fpclassify)(float t)
+{
+   if((boost::math::isnan)(t))
+      return FP_NAN;
+   // std::fabs broken on a few systems especially for long long!!!!
+   float at = (t < 0.0f) ? -t : t;
+
+   // Use a process of exclusion to figure out
+   // what kind of type we have, this relies on
+   // IEEE conforming reals that will treat
+   // Nan's as unordered.  Some compilers
+   // don't do this once optimisations are
+   // turned on, hence the check for nan's above.
+   if(at <= FLT_MAX)
+   {
+      if(at >= FLT_MIN)
+         return FP_NORMAL;
+      return (at != 0) ? FP_SUBNORMAL : FP_ZERO;
+   }
+   else if(at > FLT_MAX)
+      return FP_INFINITE;
+   return FP_NAN;
+}
+
+template<> inline BOOST_MATH_GPU_ENABLED int (fpclassify)(double t)
+{
+   if((boost::math::isnan)(t))
+      return FP_NAN;
+   // std::fabs broken on a few systems especially for long long!!!!
+   double at = (t < 0.0) ? -t : t;
+
+   // Use a process of exclusion to figure out
+   // what kind of type we have, this relies on
+   // IEEE conforming reals that will treat
+   // Nan's as unordered.  Some compilers
+   // don't do this once optimisations are
+   // turned on, hence the check for nan's above.
+   if(at <= DBL_MAX)
+   {
+      if(at >= DBL_MIN)
+         return FP_NORMAL;
+      return (at != 0) ? FP_SUBNORMAL : FP_ZERO;
+   }
+   else if(at > DBL_MAX)
+      return FP_INFINITE;
+   return FP_NAN;
+}
+
+#else
+
 #if defined(_MSC_VER) || defined(BOOST_BORLANDC)
 #include <cfloat>
 #endif
@@ -632,7 +712,86 @@ inline bool (isnan)(__float128 x)
 }
 #endif
 
+#endif
+
 } // namespace math
 } // namespace boost
+
+#else // Special handling generally using the CUDA library
+
+#include <boost/math/tools/type_traits.hpp>
+
+namespace boost {
+namespace math {
+
+template <typename T, boost::math::enable_if_t<boost::math::is_integral_v<T>, bool> = true>
+inline BOOST_MATH_GPU_ENABLED bool isnan(T x)
+{
+   return false;
+}
+
+template <typename T, boost::math::enable_if_t<!boost::math::is_integral_v<T>, bool> = true>
+inline BOOST_MATH_GPU_ENABLED bool isnan(T x)
+{
+   return ::isnan(x);
+}
+
+template <typename T, boost::math::enable_if_t<boost::math::is_integral_v<T>, bool> = true>
+inline BOOST_MATH_GPU_ENABLED bool isinf(T x)
+{
+   return false;
+}
+
+template <typename T, boost::math::enable_if_t<!boost::math::is_integral_v<T>, bool> = true>
+inline BOOST_MATH_GPU_ENABLED bool isinf(T x)
+{
+   return ::isinf(x);
+}
+
+template <typename T, boost::math::enable_if_t<boost::math::is_integral_v<T>, bool> = true>
+inline BOOST_MATH_GPU_ENABLED bool isfinite(T x)
+{
+   return true;
+}
+
+template <typename T, boost::math::enable_if_t<!boost::math::is_integral_v<T>, bool> = true>
+inline BOOST_MATH_GPU_ENABLED bool isfinite(T x)
+{
+   return ::isfinite(x);
+}
+
+template <typename T>
+inline BOOST_MATH_GPU_ENABLED bool isnormal(T x)
+{
+   return x != static_cast<T>(0) && x != static_cast<T>(-0) && 
+            !boost::math::isnan(x) && 
+            !boost::math::isinf(x);
+}
+
+// We skip the check for FP_SUBNORMAL since they are not supported on these platforms
+template <typename T>
+inline BOOST_MATH_GPU_ENABLED int fpclassify(T x)
+{
+   if (boost::math::isnan(x))
+   {
+      return BOOST_MATH_FP_NAN;
+   }
+   else if (boost::math::isinf(x))
+   {
+      return BOOST_MATH_FP_INFINITE;
+   }
+   else if (x == static_cast<T>(0) || x == static_cast<T>(-0))
+   {
+      return BOOST_MATH_FP_ZERO;
+   }
+
+   return BOOST_MATH_FP_NORMAL;
+}
+
+} // Namespace math
+} // Namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif // BOOST_MATH_FPCLASSIFY_HPP
 
diff --git a/inst/include/boost/math/special_functions/gamma.hpp b/inst/include/boost/math/special_functions/gamma.hpp
index 4af2ebdcf..4a15782c0 100644
--- a/inst/include/boost/math/special_functions/gamma.hpp
+++ b/inst/include/boost/math/special_functions/gamma.hpp
@@ -1,8 +1,8 @@
 //  Copyright John Maddock 2006-7, 2013-20.
 //  Copyright Paul A. Bristow 2007, 2013-14.
 //  Copyright Nikhar Agrawal 2013-14
-//  Copyright Christopher Kormanyos 2013-14, 2020
-
+//  Copyright Christopher Kormanyos 2013-14, 2020, 2024
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,12 +14,15 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/series.hpp>
 #include <boost/math/tools/fraction.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/promotion.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/tools/assert.hpp>
-#include <boost/math/tools/config.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
@@ -32,12 +35,12 @@
 #include <boost/math/special_functions/detail/igamma_large.hpp>
 #include <boost/math/special_functions/detail/unchecked_factorial.hpp>
 #include <boost/math/special_functions/detail/lgamma_small.hpp>
+
+// Only needed for types larger than double
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
 #include <boost/math/special_functions/bernoulli.hpp>
 #include <boost/math/special_functions/polygamma.hpp>
-
-#include <cmath>
-#include <algorithm>
-#include <type_traits>
+#endif
 
 #ifdef _MSC_VER
 # pragma warning(push)
@@ -56,13 +59,13 @@ namespace boost{ namespace math{
 namespace detail{
 
 template <class T>
-inline bool is_odd(T v, const std::true_type&)
+BOOST_MATH_GPU_ENABLED inline bool is_odd(T v, const boost::math::true_type&)
 {
    int i = static_cast<int>(v);
    return i&1;
 }
 template <class T>
-inline bool is_odd(T v, const std::false_type&)
+BOOST_MATH_GPU_ENABLED inline bool is_odd(T v, const boost::math::false_type&)
 {
    // Oh dear can't cast T to int!
    BOOST_MATH_STD_USING
@@ -70,13 +73,13 @@ inline bool is_odd(T v, const std::false_type&)
    return static_cast<bool>(modulus != 0);
 }
 template <class T>
-inline bool is_odd(T v)
+BOOST_MATH_GPU_ENABLED inline bool is_odd(T v)
 {
-   return is_odd(v, ::std::is_convertible<T, int>());
+   return is_odd(v, ::boost::math::is_convertible<T, int>());
 }
 
 template <class T>
-T sinpx(T z)
+BOOST_MATH_GPU_ENABLED T sinpx(T z)
 {
    // Ad hoc function calculates x * sin(pi * x),
    // taking extra care near when x is near a whole number.
@@ -108,7 +111,7 @@ T sinpx(T z)
 // tgamma(z), with Lanczos support:
 //
 template <class T, class Policy, class Lanczos>
-T gamma_imp(T z, const Policy& pol, const Lanczos& l)
+BOOST_MATH_GPU_ENABLED T gamma_imp_final(T z, const Policy& pol, const Lanczos&)
 {
    BOOST_MATH_STD_USING
 
@@ -122,25 +125,13 @@ T gamma_imp(T z, const Policy& pol, const Lanczos& l)
       b = true;
    }
 #endif
-   static const char* function = "boost::math::tgamma<%1%>(%1%)";
+   constexpr auto function = "boost::math::tgamma<%1%>(%1%)";
 
    if(z <= 0)
    {
       if(floor(z) == z)
-         return policies::raise_pole_error<T>(function, "Evaluation of tgamma at a negative integer %1%.", z, pol);
-      if(z <= -20)
       {
-         result = gamma_imp(T(-z), pol, l) * sinpx(z);
-         BOOST_MATH_INSTRUMENT_VARIABLE(result);
-         if((fabs(result) < 1) && (tools::max_value<T>() * fabs(result) < boost::math::constants::pi<T>()))
-            return -boost::math::sign(result) * policies::raise_overflow_error<T>(function, "Result of tgamma is too large to represent.", pol);
-         result = -boost::math::constants::pi<T>() / result;
-         if(result == 0)
-            return policies::raise_underflow_error<T>(function, "Result of tgamma is too small to represent.", pol);
-         if((boost::math::fpclassify)(result) == (int)FP_SUBNORMAL)
-            return policies::raise_denorm_error<T>(function, "Result of tgamma is denormalized.", result, pol);
-         BOOST_MATH_INSTRUMENT_VARIABLE(result);
-         return result;
+         return policies::raise_pole_error<T>(function, "Evaluation of tgamma at a negative integer %1%.", z, pol);
       }
 
       // shift z to > 1:
@@ -195,11 +186,52 @@ T gamma_imp(T z, const Policy& pol, const Lanczos& l)
    }
    return result;
 }
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+#  pragma nv_diag_suppress 2190
+#endif
+
+// SYCL compilers can not support recursion so we extract it into a dispatch function
+template <class T, class Policy, class Lanczos>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T gamma_imp(T z, const Policy& pol, const Lanczos& l)
+{
+   BOOST_MATH_STD_USING
+
+   T result = 1;
+   constexpr auto function = "boost::math::tgamma<%1%>(%1%)";
+
+   if(z <= 0)
+   {
+      if(floor(z) == z)
+         return policies::raise_pole_error<T>(function, "Evaluation of tgamma at a negative integer %1%.", z, pol);
+      if(z <= -20)
+      {
+         result = gamma_imp_final(T(-z), pol, l) * sinpx(z);
+         BOOST_MATH_INSTRUMENT_VARIABLE(result);
+         if((fabs(result) < 1) && (tools::max_value<T>() * fabs(result) < boost::math::constants::pi<T>()))
+            return -boost::math::sign(result) * policies::raise_overflow_error<T>(function, "Result of tgamma is too large to represent.", pol);
+         result = -boost::math::constants::pi<T>() / result;
+         if(result == 0)
+            return policies::raise_underflow_error<T>(function, "Result of tgamma is too small to represent.", pol);
+         if((boost::math::fpclassify)(result) == BOOST_MATH_FP_SUBNORMAL)
+            return policies::raise_denorm_error<T>(function, "Result of tgamma is denormalized.", result, pol);
+         BOOST_MATH_INSTRUMENT_VARIABLE(result);
+         return result;
+      }
+   }
+
+   return gamma_imp_final(T(z), pol, l);
+}
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+#  pragma nv_diag_default 2190
+#endif
+
 //
 // lgamma(z) with Lanczos support:
 //
 template <class T, class Policy, class Lanczos>
-T lgamma_imp(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
+BOOST_MATH_GPU_ENABLED T lgamma_imp_final(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
 {
 #ifdef BOOST_MATH_INSTRUMENT
    static bool b = false;
@@ -212,29 +244,12 @@ T lgamma_imp(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
 
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::lgamma<%1%>(%1%)";
+   constexpr auto function = "boost::math::lgamma<%1%>(%1%)";
 
    T result = 0;
    int sresult = 1;
-   if(z <= -tools::root_epsilon<T>())
-   {
-      // reflection formula:
-      if(floor(z) == z)
-         return policies::raise_pole_error<T>(function, "Evaluation of lgamma at a negative integer %1%.", z, pol);
-
-      T t = sinpx(z);
-      z = -z;
-      if(t < 0)
-      {
-         t = -t;
-      }
-      else
-      {
-         sresult = -sresult;
-      }
-      result = log(boost::math::constants::pi<T>()) - lgamma_imp(z, pol, l) - log(t);
-   }
-   else if (z < tools::root_epsilon<T>())
+   
+   if (z < tools::root_epsilon<T>())
    {
       if (0 == z)
          return policies::raise_pole_error<T>(function, "Evaluation of lgamma at %1%.", z, pol);
@@ -248,7 +263,7 @@ T lgamma_imp(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
    else if(z < 15)
    {
       typedef typename policies::precision<T, Policy>::type precision_type;
-      typedef std::integral_constant<int,
+      typedef boost::math::integral_constant<int,
          precision_type::value <= 0 ? 0 :
          precision_type::value <= 64 ? 64 :
          precision_type::value <= 113 ? 113 : 0
@@ -256,7 +271,7 @@ T lgamma_imp(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
 
       result = lgamma_small_imp<T>(z, T(z - 1), T(z - 2), tag_type(), pol, l);
    }
-   else if((z >= 3) && (z < 100) && (std::numeric_limits<T>::max_exponent >= 1024))
+   else if((z >= 3) && (z < 100) && (boost::math::numeric_limits<T>::max_exponent >= 1024))
    {
       // taking the log of tgamma reduces the error, no danger of overflow here:
       result = log(gamma_imp(z, pol, l));
@@ -279,6 +294,55 @@ T lgamma_imp(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
    return result;
 }
 
+#ifdef BOOST_MATH_ENABLE_CUDA
+#  pragma nv_diag_suppress 2190
+#endif
+
+template <class T, class Policy, class Lanczos>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_FORCEINLINE T lgamma_imp(T z, const Policy& pol, const Lanczos& l, int* sign = nullptr)
+{
+   BOOST_MATH_STD_USING
+
+   if(z <= -tools::root_epsilon<T>())
+   {
+      constexpr auto function = "boost::math::lgamma<%1%>(%1%)";
+
+      T result = 0;
+      int sresult = 1;
+
+      // reflection formula:
+      if(floor(z) == z)
+         return policies::raise_pole_error<T>(function, "Evaluation of lgamma at a negative integer %1%.", z, pol);
+
+      T t = sinpx(z);
+      z = -z;
+      if(t < 0)
+      {
+         t = -t;
+      }
+      else
+      {
+         sresult = -sresult;
+      }
+      result = log(boost::math::constants::pi<T>()) - lgamma_imp_final(T(z), pol, l) - log(t);
+
+      if(sign)
+      {
+         *sign = sresult;
+      }
+
+      return result;
+   }
+   else
+   {
+      return lgamma_imp_final(T(z), pol, l, sign);
+   }
+}
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+#  pragma nv_diag_default 2190
+#endif
+
 //
 // Incomplete gamma functions follow:
 //
@@ -289,14 +353,14 @@ struct upper_incomplete_gamma_fract
    T z, a;
    int k;
 public:
-   typedef std::pair<T,T> result_type;
+   typedef boost::math::pair<T,T> result_type;
 
-   upper_incomplete_gamma_fract(T a1, T z1)
+   BOOST_MATH_GPU_ENABLED upper_incomplete_gamma_fract(T a1, T z1)
       : z(z1-a1+1), a(a1), k(0)
    {
    }
 
-   result_type operator()()
+   BOOST_MATH_GPU_ENABLED result_type operator()()
    {
       ++k;
       z += 2;
@@ -305,7 +369,7 @@ struct upper_incomplete_gamma_fract
 };
 
 template <class T>
-inline T upper_gamma_fraction(T a, T z, T eps)
+BOOST_MATH_GPU_ENABLED inline T upper_gamma_fraction(T a, T z, T eps)
 {
    // Multiply result by z^a * e^-z to get the full
    // upper incomplete integral.  Divide by tgamma(z)
@@ -321,9 +385,9 @@ struct lower_incomplete_gamma_series
    T a, z, result;
 public:
    typedef T result_type;
-   lower_incomplete_gamma_series(T a1, T z1) : a(a1), z(z1), result(1){}
+   BOOST_MATH_GPU_ENABLED lower_incomplete_gamma_series(T a1, T z1) : a(a1), z(z1), result(1){}
 
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T r = result;
       a += 1;
@@ -333,32 +397,34 @@ struct lower_incomplete_gamma_series
 };
 
 template <class T, class Policy>
-inline T lower_gamma_series(T a, T z, const Policy& pol, T init_value = 0)
+BOOST_MATH_GPU_ENABLED inline T lower_gamma_series(T a, T z, const Policy& pol, T init_value = 0)
 {
    // Multiply result by ((z^a) * (e^-z) / a) to get the full
    // lower incomplete integral. Then divide by tgamma(a)
    // to get the normalised value.
    lower_incomplete_gamma_series<T> s(a, z);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
    T factor = policies::get_epsilon<T, Policy>();
    T result = boost::math::tools::sum_series(s, factor, max_iter, init_value);
    policies::check_series_iterations<T>("boost::math::detail::lower_gamma_series<%1%>(%1%)", max_iter, pol);
    return result;
 }
 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 //
 // Fully generic tgamma and lgamma use Stirling's approximation
 // with Bernoulli numbers.
 //
 template<class T>
-std::size_t highest_bernoulli_index()
+boost::math::size_t highest_bernoulli_index()
 {
-   const float digits10_of_type = (std::numeric_limits<T>::is_specialized
-                                      ? static_cast<float>(std::numeric_limits<T>::digits10)
+   const float digits10_of_type = (boost::math::numeric_limits<T>::is_specialized
+                                      ? static_cast<float>(boost::math::numeric_limits<T>::digits10)
                                       : static_cast<float>(boost::math::tools::digits<T>() * 0.301F));
 
    // Find the high index n for Bn to produce the desired precision in Stirling's calculation.
-   return static_cast<std::size_t>(18.0F + (0.6F * digits10_of_type));
+   return static_cast<boost::math::size_t>(18.0F + (0.6F * digits10_of_type));
 }
 
 template<class T>
@@ -366,8 +432,8 @@ int minimum_argument_for_bernoulli_recursion()
 {
    BOOST_MATH_STD_USING
 
-   const float digits10_of_type = (std::numeric_limits<T>::is_specialized
-                                    ? (float) std::numeric_limits<T>::digits10
+   const float digits10_of_type = (boost::math::numeric_limits<T>::is_specialized
+                                    ? (float) boost::math::numeric_limits<T>::digits10
                                     : (float) (boost::math::tools::digits<T>() * 0.301F));
 
    int min_arg = (int) (digits10_of_type * 1.7F);
@@ -389,7 +455,7 @@ int minimum_argument_for_bernoulli_recursion()
       const float d2_minus_one = ((digits10_of_type / 0.301F) - 1.0F);
       const float limit        = ceil(exp((d2_minus_one * log(2.0F)) / 20.0F));
 
-      min_arg = (int) ((std::min)(digits10_of_type * 1.7F, limit));
+      min_arg = (int) (BOOST_MATH_GPU_SAFE_MIN(digits10_of_type * 1.7F, limit));
    }
 
    return min_arg;
@@ -408,7 +474,7 @@ T scaled_tgamma_no_lanczos(const T& z, const Policy& pol, bool islog = false)
 
    // Perform the Bernoulli series expansion of Stirling's approximation.
 
-   const std::size_t number_of_bernoullis_b2n = policies::get_max_series_iterations<Policy>();
+   const boost::math::size_t number_of_bernoullis_b2n = policies::get_max_series_iterations<Policy>();
 
    T one_over_x_pow_two_n_minus_one = 1 / z;
    const T one_over_x2 = one_over_x_pow_two_n_minus_one * one_over_x_pow_two_n_minus_one;
@@ -417,11 +483,11 @@ T scaled_tgamma_no_lanczos(const T& z, const Policy& pol, bool islog = false)
    const T half_ln_two_pi_over_z = sqrt(boost::math::constants::two_pi<T>() / z);
    T last_term = 2 * sum;
 
-   for (std::size_t n = 2U;; ++n)
+   for (boost::math::size_t n = 2U;; ++n)
    {
       one_over_x_pow_two_n_minus_one *= one_over_x2;
 
-      const std::size_t n2 = static_cast<std::size_t>(n * 2U);
+      const boost::math::size_t n2 = static_cast<boost::math::size_t>(n * 2U);
 
       const T term = (boost::math::bernoulli_b2n<T>(static_cast<int>(n)) * one_over_x_pow_two_n_minus_one) / (n2 * (n2 - 1U));
 
@@ -460,7 +526,7 @@ T gamma_imp(T z, const Policy& pol, const lanczos::undefined_lanczos&)
 {
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::tgamma<%1%>(%1%)";
+   constexpr auto function = "boost::math::tgamma<%1%>(%1%)";
 
    // Check if the argument of tgamma is identically zero.
    const bool is_at_zero = (z == 0);
@@ -569,7 +635,7 @@ T gamma_imp(T z, const Policy& pol, const lanczos::undefined_lanczos&)
       if(gamma_value == 0)
          return policies::raise_underflow_error<T>(function, "Result of tgamma is too small to represent.", pol);
 
-      if((boost::math::fpclassify)(gamma_value) == static_cast<int>(FP_SUBNORMAL))
+      if((boost::math::fpclassify)(gamma_value) == static_cast<int>(BOOST_MATH_FP_SUBNORMAL))
          return policies::raise_denorm_error<T>(function, "Result of tgamma is denormalized.", gamma_value, pol);
    }
 
@@ -610,7 +676,7 @@ T lgamma_imp(T z, const Policy& pol, const lanczos::undefined_lanczos&, int* sig
 {
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::lgamma<%1%>(%1%)";
+   constexpr auto function = "boost::math::lgamma<%1%>(%1%)";
 
    // Check if the argument of lgamma is identically zero.
    const bool is_at_zero = (z == 0);
@@ -715,18 +781,33 @@ T lgamma_imp(T z, const Policy& pol, const lanczos::undefined_lanczos&, int* sig
    return log_gamma_value;
 }
 
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
+// In order for tgammap1m1_imp to compile we need a forward decl of boost::math::tgamma
+// The rub is that we can't just use math_fwd so we provide one here only in that circumstance
+#ifdef BOOST_MATH_HAS_NVRTC
+template <class RT>
+BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> tgamma(RT z);
+
+template <class RT1, class RT2>
+BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z);
+
+template <class RT1, class RT2, class Policy>
+BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z, const Policy& pol);
+#endif
+
 //
 // This helper calculates tgamma(dz+1)-1 without cancellation errors,
 // used by the upper incomplete gamma with z < 1:
 //
 template <class T, class Policy, class Lanczos>
-T tgammap1m1_imp(T dz, Policy const& pol, const Lanczos& l)
+BOOST_MATH_GPU_ENABLED T tgammap1m1_imp(T dz, Policy const& pol, const Lanczos& l)
 {
    BOOST_MATH_STD_USING
 
    typedef typename policies::precision<T,Policy>::type precision_type;
 
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       precision_type::value <= 0 ? 0 :
       precision_type::value <= 64 ? 64 :
       precision_type::value <= 113 ? 113 : 0
@@ -738,7 +819,11 @@ T tgammap1m1_imp(T dz, Policy const& pol, const Lanczos& l)
       if(dz < T(-0.5))
       {
          // Best method is simply to subtract 1 from tgamma:
+         #ifdef BOOST_MATH_HAS_NVRTC
+         result = ::tgamma(1+dz);
+         #else
          result = boost::math::tgamma(1+dz, pol) - 1;
+         #endif
          BOOST_MATH_INSTRUMENT_CODE(result);
       }
       else
@@ -760,7 +845,11 @@ T tgammap1m1_imp(T dz, Policy const& pol, const Lanczos& l)
       else
       {
          // Best method is simply to subtract 1 from tgamma:
+         #ifdef BOOST_MATH_HAS_NVRTC
+         result = ::tgamma(1+dz);
+         #else
          result = boost::math::tgamma(1+dz, pol) - 1;
+         #endif
          BOOST_MATH_INSTRUMENT_CODE(result);
       }
    }
@@ -768,6 +857,8 @@ T tgammap1m1_imp(T dz, Policy const& pol, const Lanczos& l)
    return result;
 }
 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <class T, class Policy>
 inline T tgammap1m1_imp(T z, Policy const& pol,
                  const ::boost::math::lanczos::undefined_lanczos&)
@@ -781,6 +872,8 @@ inline T tgammap1m1_imp(T z, Policy const& pol,
    return boost::math::expm1(boost::math::lgamma(1 + z, pol));
 }
 
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
 //
 // Series representation for upper fraction when z is small:
 //
@@ -789,9 +882,9 @@ struct small_gamma2_series
 {
    typedef T result_type;
 
-   small_gamma2_series(T a_, T x_) : result(-x_), x(-x_), apn(a_+1), n(1){}
+   BOOST_MATH_GPU_ENABLED small_gamma2_series(T a_, T x_) : result(-x_), x(-x_), apn(a_+1), n(1){}
 
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T r = result / (apn);
       result *= x;
@@ -809,15 +902,17 @@ struct small_gamma2_series
 // incomplete gammas:
 //
 template <class T, class Policy>
-T full_igamma_prefix(T a, T z, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T full_igamma_prefix(T a, T z, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
-   T prefix;
    if (z > tools::max_value<T>())
       return 0;
+
    T alz = a * log(z);
 
+   T prefix { };
+
    if(z >= 1)
    {
       if((alz < tools::log_max_value<T>()) && (-z > tools::log_min_value<T>()))
@@ -852,7 +947,7 @@ T full_igamma_prefix(T a, T z, const Policy& pol)
    // This error handling isn't very good: it happens after the fact
    // rather than before it...
    //
-   if((boost::math::fpclassify)(prefix) == (int)FP_INFINITE)
+   if((boost::math::fpclassify)(prefix) == (int)BOOST_MATH_FP_INFINITE)
       return policies::raise_overflow_error<T>("boost::math::detail::full_igamma_prefix<%1%>(%1%, %1%)", "Result of incomplete gamma function is too large to represent.", pol);
 
    return prefix;
@@ -862,7 +957,7 @@ T full_igamma_prefix(T a, T z, const Policy& pol)
 // most if the error occurs in this function:
 //
 template <class T, class Policy, class Lanczos>
-T regularised_gamma_prefix(T a, T z, const Policy& pol, const Lanczos& l)
+BOOST_MATH_GPU_ENABLED T regularised_gamma_prefix(T a, T z, const Policy& pol, const Lanczos& l)
 {
    BOOST_MATH_STD_USING
    if (z >= tools::max_value<T>())
@@ -909,16 +1004,16 @@ T regularised_gamma_prefix(T a, T z, const Policy& pol, const Lanczos& l)
       //
       T alz = a * log(z / agh);
       T amz = a - z;
-      if(((std::min)(alz, amz) <= tools::log_min_value<T>()) || ((std::max)(alz, amz) >= tools::log_max_value<T>()))
+      if((BOOST_MATH_GPU_SAFE_MIN(alz, amz) <= tools::log_min_value<T>()) || (BOOST_MATH_GPU_SAFE_MAX(alz, amz) >= tools::log_max_value<T>()))
       {
          T amza = amz / a;
-         if(((std::min)(alz, amz)/2 > tools::log_min_value<T>()) && ((std::max)(alz, amz)/2 < tools::log_max_value<T>()))
+         if((BOOST_MATH_GPU_SAFE_MIN(alz, amz)/2 > tools::log_min_value<T>()) && (BOOST_MATH_GPU_SAFE_MAX(alz, amz)/2 < tools::log_max_value<T>()))
          {
             // compute square root of the result and then square it:
             T sq = pow(z / agh, a / 2) * exp(amz / 2);
             prefix = sq * sq;
          }
-         else if(((std::min)(alz, amz)/4 > tools::log_min_value<T>()) && ((std::max)(alz, amz)/4 < tools::log_max_value<T>()) && (z > a))
+         else if((BOOST_MATH_GPU_SAFE_MIN(alz, amz)/4 > tools::log_min_value<T>()) && (BOOST_MATH_GPU_SAFE_MAX(alz, amz)/4 < tools::log_max_value<T>()) && (z > a))
          {
             // compute the 4th root of the result then square it twice:
             T sq = pow(z / agh, a / 4) * exp(amz / 4);
@@ -942,6 +1037,9 @@ T regularised_gamma_prefix(T a, T z, const Policy& pol, const Lanczos& l)
    prefix *= sqrt(agh / boost::math::constants::e<T>()) / Lanczos::lanczos_sum_expG_scaled(a);
    return prefix;
 }
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 //
 // And again, without Lanczos support:
 //
@@ -1011,25 +1109,36 @@ T regularised_gamma_prefix(T a, T z, const Policy& pol, const lanczos::undefined
       }
    }
 }
+
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
 //
 // Upper gamma fraction for very small a:
 //
 template <class T, class Policy>
-inline T tgamma_small_upper_part(T a, T x, const Policy& pol, T* pgam = 0, bool invert = false, T* pderivative = 0)
+BOOST_MATH_GPU_ENABLED inline T tgamma_small_upper_part(T a, T x, const Policy& pol, T* pgam = 0, bool invert = false, T* pderivative = 0)
 {
    BOOST_MATH_STD_USING  // ADL of std functions.
    //
    // Compute the full upper fraction (Q) when a is very small:
    //
-   T result;
-   result = boost::math::tgamma1pm1(a, pol);
+
+   #ifdef BOOST_MATH_HAS_NVRTC
+   typedef typename tools::promote_args<T>::type result_type;
+   typedef typename policies::evaluation<result_type, Policy>::type value_type;
+   typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
+   T result {detail::tgammap1m1_imp(static_cast<value_type>(a), pol, evaluation_type())};
+   #else
+   T result { boost::math::tgamma1pm1(a, pol) };
+   #endif
+
    if(pgam)
       *pgam = (result + 1) / a;
    T p = boost::math::powm1(x, a, pol);
    result -= p;
    result /= a;
    detail::small_gamma2_series<T> s(a, x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>() - 10;
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>() - 10;
    p += 1;
    if(pderivative)
       *pderivative = p / (*pgam * exp(x));
@@ -1044,7 +1153,7 @@ inline T tgamma_small_upper_part(T a, T x, const Policy& pol, T* pgam = 0, bool
 // Upper gamma fraction for integer a:
 //
 template <class T, class Policy>
-inline T finite_gamma_q(T a, T x, Policy const& pol, T* pderivative = 0)
+BOOST_MATH_GPU_ENABLED inline T finite_gamma_q(T a, T x, Policy const& pol, T* pderivative = 0)
 {
    //
    // Calculates normalised Q when a is an integer:
@@ -1072,13 +1181,27 @@ inline T finite_gamma_q(T a, T x, Policy const& pol, T* pderivative = 0)
 // Upper gamma fraction for half integer a:
 //
 template <class T, class Policy>
-T finite_half_gamma_q(T a, T x, T* p_derivative, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T finite_half_gamma_q(T a, T x, T* p_derivative, const Policy& pol)
 {
    //
    // Calculates normalised Q when a is a half-integer:
    //
    BOOST_MATH_STD_USING
+
+   #ifdef BOOST_MATH_HAS_NVRTC
+   T e;
+   if (boost::math::is_same_v<T, float>)
+   {
+      e = ::erfcf(::sqrtf(x));
+   }
+   else
+   {
+      e = ::erfc(::sqrt(x));
+   }
+   #else
    T e = boost::math::erfc(sqrt(x), pol);
+   #endif
+
    if((e != 0) && (a > 1))
    {
       T term = exp(-x) / sqrt(constants::pi<T>() * x);
@@ -1112,9 +1235,9 @@ template <class T>
 struct incomplete_tgamma_large_x_series
 {
    typedef T result_type;
-   incomplete_tgamma_large_x_series(const T& a, const T& x)
+   BOOST_MATH_GPU_ENABLED incomplete_tgamma_large_x_series(const T& a, const T& x)
       : a_poch(a - 1), z(x), term(1) {}
-   T operator()()
+   BOOST_MATH_GPU_ENABLED T operator()()
    {
       T result = term;
       term *= a_poch / z;
@@ -1125,11 +1248,11 @@ struct incomplete_tgamma_large_x_series
 };
 
 template <class T, class Policy>
-T incomplete_tgamma_large_x(const T& a, const T& x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T incomplete_tgamma_large_x(const T& a, const T& x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    incomplete_tgamma_large_x_series<T> s(a, x);
-   std::uintmax_t max_iter = boost::math::policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = boost::math::policies::get_max_series_iterations<Policy>();
    T result = boost::math::tools::sum_series(s, boost::math::policies::get_epsilon<T, Policy>(), max_iter);
    boost::math::policies::check_series_iterations<T>("boost::math::tgamma<%1%>(%1%,%1%)", max_iter, pol);
    return result;
@@ -1140,10 +1263,10 @@ T incomplete_tgamma_large_x(const T& a, const T& x, const Policy& pol)
 // Main incomplete gamma entry point, handles all four incomplete gamma's:
 //
 template <class T, class Policy>
-T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
+BOOST_MATH_GPU_ENABLED T gamma_incomplete_imp_final(T a, T x, bool normalised, bool invert,
                        const Policy& pol, T* p_derivative)
 {
-   static const char* function = "boost::math::gamma_p<%1%>(%1%, %1%)";
+   constexpr auto function = "boost::math::gamma_p<%1%>(%1%, %1%)";
    if(a <= 0)
       return policies::raise_domain_error<T>(function, "Argument a to the incomplete gamma function must be greater than zero (got a=%1%).", a, pol);
    if(x < 0)
@@ -1155,70 +1278,6 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
 
    T result = 0; // Just to avoid warning C4701: potentially uninitialized local variable 'result' used
 
-   if(a >= max_factorial<T>::value && !normalised)
-   {
-      //
-      // When we're computing the non-normalized incomplete gamma
-      // and a is large the result is rather hard to compute unless
-      // we use logs.  There are really two options - if x is a long
-      // way from a in value then we can reliably use methods 2 and 4
-      // below in logarithmic form and go straight to the result.
-      // Otherwise we let the regularized gamma take the strain
-      // (the result is unlikely to underflow in the central region anyway)
-      // and combine with lgamma in the hopes that we get a finite result.
-      //
-      if(invert && (a * 4 < x))
-      {
-         // This is method 4 below, done in logs:
-         result = a * log(x) - x;
-         if(p_derivative)
-            *p_derivative = exp(result);
-         result += log(upper_gamma_fraction(a, x, policies::get_epsilon<T, Policy>()));
-      }
-      else if(!invert && (a > 4 * x))
-      {
-         // This is method 2 below, done in logs:
-         result = a * log(x) - x;
-         if(p_derivative)
-            *p_derivative = exp(result);
-         T init_value = 0;
-         result += log(detail::lower_gamma_series(a, x, pol, init_value) / a);
-      }
-      else
-      {
-         result = gamma_incomplete_imp(a, x, true, invert, pol, p_derivative);
-         if(result == 0)
-         {
-            if(invert)
-            {
-               // Try http://functions.wolfram.com/06.06.06.0039.01
-               result = 1 + 1 / (12 * a) + 1 / (288 * a * a);
-               result = log(result) - a + (a - 0.5f) * log(a) + log(boost::math::constants::root_two_pi<T>());
-               if(p_derivative)
-                  *p_derivative = exp(a * log(x) - x);
-            }
-            else
-            {
-               // This is method 2 below, done in logs, we're really outside the
-               // range of this method, but since the result is almost certainly
-               // infinite, we should probably be OK:
-               result = a * log(x) - x;
-               if(p_derivative)
-                  *p_derivative = exp(result);
-               T init_value = 0;
-               result += log(detail::lower_gamma_series(a, x, pol, init_value) / a);
-            }
-         }
-         else
-         {
-            result = log(result) + boost::math::lgamma(a, pol);
-         }
-      }
-      if(result > tools::log_max_value<T>())
-         return policies::raise_overflow_error<T>(function, nullptr, pol);
-      return exp(result);
-   }
-
    BOOST_MATH_ASSERT((p_derivative == nullptr) || normalised);
 
    bool is_int, is_half_int;
@@ -1294,7 +1353,7 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
       // series and continued fractions are slow to converge:
       //
       bool use_temme = false;
-      if(normalised && std::numeric_limits<T>::is_specialized && (a > 20))
+      if(normalised && boost::math::numeric_limits<T>::is_specialized && (a > 20))
       {
          T sigma = fabs((x-a)/a);
          if((a > 200) && (policies::digits<T, Policy>() <= 113))
@@ -1351,14 +1410,40 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
       {
          result = finite_gamma_q(a, x, pol, p_derivative);
          if(!normalised)
+         {
+            #ifdef BOOST_MATH_HAS_NVRTC
+            if (boost::math::is_same_v<T, float>)
+            {
+               result *= ::tgammaf(a);
+            }
+            else
+            {
+               result *= ::tgamma(a);
+            }
+            #else
             result *= boost::math::tgamma(a, pol);
+            #endif
+         }
          break;
       }
    case 1:
       {
          result = finite_half_gamma_q(a, x, p_derivative, pol);
          if(!normalised)
+         {
+            #ifdef BOOST_MATH_HAS_NVRTC
+            if (boost::math::is_same_v<T, float>)
+            {
+               result *= ::tgammaf(a);
+            }
+            else
+            {
+               result *= ::tgamma(a);
+            }
+            #else
             result *= boost::math::tgamma(a, pol);
+            #endif
+         }
          if(p_derivative && (*p_derivative == 0))
             *p_derivative = regularised_gamma_prefix(a, x, pol, lanczos_type());
          break;
@@ -1387,7 +1472,19 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
             bool optimised_invert = false;
             if(invert)
             {
+               #ifdef BOOST_MATH_HAS_NVRTC
+               if (boost::math::is_same_v<T, float>)
+               {
+                  init_value = (normalised ? 1 : ::tgammaf(a));
+               }
+               else
+               {
+                  init_value = (normalised ? 1 : ::tgamma(a));
+               }
+               #else
                init_value = (normalised ? 1 : boost::math::tgamma(a, pol));
+               #endif
+
                if(normalised || (result >= 1) || (tools::max_value<T>() * result > init_value))
                {
                   init_value /= result;
@@ -1444,14 +1541,14 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
          //
          typedef typename policies::precision<T, Policy>::type precision_type;
 
-         typedef std::integral_constant<int,
+         typedef boost::math::integral_constant<int,
             precision_type::value <= 0 ? 0 :
             precision_type::value <= 53 ? 53 :
             precision_type::value <= 64 ? 64 :
             precision_type::value <= 113 ? 113 : 0
          > tag_type;
 
-         result = igamma_temme_large(a, x, pol, static_cast<tag_type const*>(nullptr));
+         result = igamma_temme_large(a, x, pol, tag_type());
          if(x >= a)
             invert = !invert;
          if(p_derivative)
@@ -1466,12 +1563,23 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
             result = pow(x, a) / (a);
          else
          {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             try
             {
 #endif
+               #ifdef BOOST_MATH_HAS_NVRTC
+               if (boost::math::is_same_v<T, float>)
+               {
+                  result = ::powf(x, a) / ::tgammaf(a + 1);
+               }
+               else
+               {
+                  result = ::pow(x, a) / ::tgamma(a + 1);
+               }
+               #else
                result = pow(x, a) / boost::math::tgamma(a + 1, pol);
-#ifndef BOOST_NO_EXCEPTIONS
+               #endif
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             }
             catch (const std::overflow_error&)
             {
@@ -1502,7 +1610,19 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
       result = 1;
    if(invert)
    {
+      #ifdef BOOST_MATH_HAS_NVRTC
+      T gam;
+      if (boost::math::is_same_v<T, float>)
+      {
+         gam = normalised ? 1 : ::tgammaf(a);
+      }
+      else
+      {
+         gam = normalised ? 1 : ::tgamma(a);
+      }
+      #else
       T gam = normalised ? 1 : boost::math::tgamma(a, pol);
+      #endif
       result = gam - result;
    }
    if(p_derivative)
@@ -1522,36 +1642,109 @@ T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
    return result;
 }
 
-//
-// Ratios of two gamma functions:
-//
-template <class T, class Policy, class Lanczos>
-T tgamma_delta_ratio_imp_lanczos(T z, T delta, const Policy& pol, const Lanczos& l)
+// Need to implement this dispatch to avoid recursion for device compilers
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED T gamma_incomplete_imp(T a, T x, bool normalised, bool invert,
+                       const Policy& pol, T* p_derivative)
 {
+   constexpr auto function = "boost::math::gamma_p<%1%>(%1%, %1%)";
+   if(a <= 0)
+      return policies::raise_domain_error<T>(function, "Argument a to the incomplete gamma function must be greater than zero (got a=%1%).", a, pol);
+   if(x < 0)
+      return policies::raise_domain_error<T>(function, "Argument x to the incomplete gamma function must be >= 0 (got x=%1%).", x, pol);
+
    BOOST_MATH_STD_USING
-   if(z < tools::epsilon<T>())
+
+
+   T result = 0; // Just to avoid warning C4701: potentially uninitialized local variable 'result' used
+
+   if(a >= max_factorial<T>::value && !normalised)
    {
       //
-      // We get spurious numeric overflow unless we're very careful, this
-      // can occur either inside Lanczos::lanczos_sum(z) or in the
-      // final combination of terms, to avoid this, split the product up
-      // into 2 (or 3) parts:
-      //
-      // G(z) / G(L) = 1 / (z * G(L)) ; z < eps, L = z + delta = delta
-      //    z * G(L) = z * G(lim) * (G(L)/G(lim)) ; lim = largest factorial
+      // When we're computing the non-normalized incomplete gamma
+      // and a is large the result is rather hard to compute unless
+      // we use logs.  There are really two options - if x is a long
+      // way from a in value then we can reliably use methods 2 and 4
+      // below in logarithmic form and go straight to the result.
+      // Otherwise we let the regularized gamma take the strain
+      // (the result is unlikely to underflow in the central region anyway)
+      // and combine with lgamma in the hopes that we get a finite result.
       //
-      if(boost::math::max_factorial<T>::value < delta)
+      if(invert && (a * 4 < x))
       {
-         T ratio = tgamma_delta_ratio_imp_lanczos(delta, T(boost::math::max_factorial<T>::value - delta), pol, l);
-         ratio *= z;
-         ratio *= boost::math::unchecked_factorial<T>(boost::math::max_factorial<T>::value - 1);
-         return 1 / ratio;
+         // This is method 4 below, done in logs:
+         result = a * log(x) - x;
+         if(p_derivative)
+            *p_derivative = exp(result);
+         result += log(upper_gamma_fraction(a, x, policies::get_epsilon<T, Policy>()));
+      }
+      else if(!invert && (a > 4 * x))
+      {
+         // This is method 2 below, done in logs:
+         result = a * log(x) - x;
+         if(p_derivative)
+            *p_derivative = exp(result);
+         T init_value = 0;
+         result += log(detail::lower_gamma_series(a, x, pol, init_value) / a);
       }
       else
       {
-         return 1 / (z * boost::math::tgamma(z + delta, pol));
+         result = gamma_incomplete_imp_final(T(a), T(x), true, invert, pol, p_derivative);
+         if(result == 0)
+         {
+            if(invert)
+            {
+               // Try http://functions.wolfram.com/06.06.06.0039.01
+               result = 1 + 1 / (12 * a) + 1 / (288 * a * a);
+               result = log(result) - a + (a - 0.5f) * log(a) + log(boost::math::constants::root_two_pi<T>());
+               if(p_derivative)
+                  *p_derivative = exp(a * log(x) - x);
+            }
+            else
+            {
+               // This is method 2 below, done in logs, we're really outside the
+               // range of this method, but since the result is almost certainly
+               // infinite, we should probably be OK:
+               result = a * log(x) - x;
+               if(p_derivative)
+                  *p_derivative = exp(result);
+               T init_value = 0;
+               result += log(detail::lower_gamma_series(a, x, pol, init_value) / a);
+            }
+         }
+         else
+         {
+            #ifdef BOOST_MATH_HAS_NVRTC
+            if (boost::math::is_same_v<T, float>)
+            {
+               result = ::logf(result) + ::lgammaf(a);
+            }
+            else
+            {
+               result = ::log(result) + ::lgamma(a);
+            }
+            #else
+            result = log(result) + boost::math::lgamma(a, pol);
+            #endif
+         }
       }
+      if(result > tools::log_max_value<T>())
+         return policies::raise_overflow_error<T>(function, nullptr, pol);
+      return exp(result);
    }
+
+   // If no special handling is required then we proceeds as normal
+   return gamma_incomplete_imp_final(T(a), T(x), normalised, invert, pol, p_derivative);
+}
+
+//
+// Ratios of two gamma functions:
+//
+template <class T, class Policy, class Lanczos>
+BOOST_MATH_GPU_ENABLED T tgamma_delta_ratio_imp_lanczos_final(T z, T delta, const Policy& pol, const Lanczos&)
+{
+   BOOST_MATH_STD_USING
+
    T zgh = static_cast<T>(z + T(Lanczos::g()) - constants::half<T>());
    T result;
    if(z + delta == z)
@@ -1585,9 +1778,55 @@ T tgamma_delta_ratio_imp_lanczos(T z, T delta, const Policy& pol, const Lanczos&
    result *= pow(T(constants::e<T>() / (zgh + delta)), delta);
    return result;
 }
+
+template <class T, class Policy, class Lanczos>
+BOOST_MATH_GPU_ENABLED T tgamma_delta_ratio_imp_lanczos(T z, T delta, const Policy& pol, const Lanczos& l)
+{
+   BOOST_MATH_STD_USING
+
+   if(z < tools::epsilon<T>())
+   {
+      //
+      // We get spurious numeric overflow unless we're very careful, this
+      // can occur either inside Lanczos::lanczos_sum(z) or in the
+      // final combination of terms, to avoid this, split the product up
+      // into 2 (or 3) parts:
+      //
+      // G(z) / G(L) = 1 / (z * G(L)) ; z < eps, L = z + delta = delta
+      //    z * G(L) = z * G(lim) * (G(L)/G(lim)) ; lim = largest factorial
+      //
+      if(boost::math::max_factorial<T>::value < delta)
+      {
+         T ratio = tgamma_delta_ratio_imp_lanczos_final(T(delta), T(boost::math::max_factorial<T>::value - delta), pol, l);
+         ratio *= z;
+         ratio *= boost::math::unchecked_factorial<T>(boost::math::max_factorial<T>::value - 1);
+         return 1 / ratio;
+      }
+      else
+      {
+         #ifdef BOOST_MATH_HAS_NVRTC
+         if (boost::math::is_same_v<T, float>)
+         {
+            return 1 / (z * ::tgammaf(z + delta));
+         }
+         else
+         {
+            return 1 / (z * ::tgamma(z + delta));
+         }
+         #else
+         return 1 / (z * boost::math::tgamma(z + delta, pol));
+         #endif
+      }
+   }
+
+   return tgamma_delta_ratio_imp_lanczos_final(T(z), T(delta), pol, l);
+}
+
 //
 // And again without Lanczos support this time:
 //
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
 template <class T, class Policy>
 T tgamma_delta_ratio_imp_lanczos(T z, T delta, const Policy& pol, const lanczos::undefined_lanczos& l)
 {
@@ -1644,15 +1883,28 @@ T tgamma_delta_ratio_imp_lanczos(T z, T delta, const Policy& pol, const lanczos:
    return ratio;
 }
 
+#endif
+
 template <class T, class Policy>
-T tgamma_delta_ratio_imp(T z, T delta, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T tgamma_delta_ratio_imp(T z, T delta, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
    if((z <= 0) || (z + delta <= 0))
    {
       // This isn't very sophisticated, or accurate, but it does work:
+      #ifdef BOOST_MATH_HAS_NVRTC
+      if (boost::math::is_same_v<T, float>)
+      {
+         return ::tgammaf(z) / ::tgammaf(z + delta);
+      }
+      else
+      {
+         return ::tgamma(z) / ::tgamma(z + delta);
+      }
+      #else
       return boost::math::tgamma(z, pol) / boost::math::tgamma(z + delta, pol);
+      #endif
    }
 
    if(floor(delta) == delta)
@@ -1703,7 +1955,7 @@ T tgamma_delta_ratio_imp(T z, T delta, const Policy& pol)
 }
 
 template <class T, class Policy>
-T tgamma_ratio_imp(T x, T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T tgamma_ratio_imp(T x, T y, const Policy& pol)
 {
    BOOST_MATH_STD_USING
 
@@ -1712,17 +1964,32 @@ T tgamma_ratio_imp(T x, T y, const Policy& pol)
    if((y <= 0) || (boost::math::isinf)(y))
       return policies::raise_domain_error<T>("boost::math::tgamma_ratio<%1%>(%1%, %1%)", "Gamma function ratios only implemented for positive arguments (got b=%1%).", y, pol);
 
+   // We don't need to worry about the denorm case on device
+   // And this has the added bonus of removing recursion
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
    if(x <= tools::min_value<T>())
    {
       // Special case for denorms...Ugh.
       T shift = ldexp(T(1), tools::digits<T>());
       return shift * tgamma_ratio_imp(T(x * shift), y, pol);
    }
+   #endif
 
    if((x < max_factorial<T>::value) && (y < max_factorial<T>::value))
    {
       // Rather than subtracting values, lets just call the gamma functions directly:
+      #ifdef BOOST_MATH_HAS_NVRTC
+      if (boost::math::is_same_v<T, float>)
+      {
+         return ::tgammaf(x) / ::tgammaf(y);
+      }
+      else
+      {
+         return ::tgamma(x) / ::tgamma(y);
+      }
+      #else
       return boost::math::tgamma(x, pol) / boost::math::tgamma(y, pol);
+      #endif
    }
    T prefix = 1;
    if(x < 1)
@@ -1738,12 +2005,35 @@ T tgamma_ratio_imp(T x, T y, const Policy& pol)
             y -= 1;
             prefix /= y;
          }
+
+         #ifdef BOOST_MATH_HAS_NVRTC
+         if (boost::math::is_same_v<T, float>)
+         {
+            return prefix * ::tgammaf(x) / ::tgammaf(y);
+         }
+         else
+         {
+            return prefix * ::tgamma(x) / ::tgamma(y);
+         }
+         #else
          return prefix * boost::math::tgamma(x, pol) / boost::math::tgamma(y, pol);
+         #endif
       }
       //
       // result is almost certainly going to underflow to zero, try logs just in case:
       //
+      #ifdef BOOST_MATH_HAS_NVRTC
+      if (boost::math::is_same_v<T, float>)
+      {
+         return ::expf(::lgammaf(x) - ::lgammaf(y));
+      }
+      else
+      {
+         return ::exp(::lgamma(x) - ::lgamma(y));
+      }
+      #else
       return exp(boost::math::lgamma(x, pol) - boost::math::lgamma(y, pol));
+      #endif
    }
    if(y < 1)
    {
@@ -1758,21 +2048,48 @@ T tgamma_ratio_imp(T x, T y, const Policy& pol)
             x -= 1;
             prefix *= x;
          }
+
+         #ifdef BOOST_MATH_HAS_NVRTC
+         if (boost::math::is_same_v<T, float>)
+         {
+            return prefix * ::tgammaf(x) / ::tgammaf(y);
+         }
+         else
+         {
+            return prefix * ::tgamma(x) / ::tgamma(y);
+         }
+         #else
          return prefix * boost::math::tgamma(x, pol) / boost::math::tgamma(y, pol);
+         #endif
       }
       //
       // Result will almost certainly overflow, try logs just in case:
       //
+      #ifdef BOOST_MATH_HAS_NVRTC
+      if (boost::math::is_same_v<T, float>)
+      {
+         return ::expf(::lgammaf(x) - ::lgammaf(y));
+      }
+      else
+      {
+         return ::exp(::lgamma(x) - ::lgamma(y));
+      }
+      #else
       return exp(boost::math::lgamma(x, pol) - boost::math::lgamma(y, pol));
+      #endif
    }
    //
    // Regular case, x and y both large and similar in magnitude:
    //
+   #ifdef BOOST_MATH_HAS_NVRTC
+   return detail::tgamma_delta_ratio_imp(x, y - x, pol);
+   #else
    return boost::math::tgamma_delta_ratio(x, y - x, pol);
+   #endif
 }
 
 template <class T, class Policy>
-T gamma_p_derivative_imp(T a, T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T gamma_p_derivative_imp(T a, T x, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    //
@@ -1803,7 +2120,18 @@ T gamma_p_derivative_imp(T a, T x, const Policy& pol)
    if(f1 == 0)
    {
       // Underflow in calculation, use logs instead:
+      #ifdef BOOST_MATH_HAS_NVRTC
+      if (boost::math::is_same_v<T, float>)
+      {
+         f1 = a * ::logf(x) - x - ::lgammaf(a) - ::logf(x);
+      }
+      else
+      {
+         f1 = a * ::log(x) - x - ::lgamma(a) - ::log(x);
+      }
+      #else
       f1 = a * log(x) - x - lgamma(a, pol) - log(x);
+      #endif
       f1 = exp(f1);
    }
    else
@@ -1813,8 +2141,8 @@ T gamma_p_derivative_imp(T a, T x, const Policy& pol)
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
-   tgamma(T z, const Policy& /* pol */, const std::true_type)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
+   tgamma(T z, const Policy& /* pol */, const boost::math::true_type)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename tools::promote_args<T>::type result_type;
@@ -1834,11 +2162,11 @@ struct igamma_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          typedef typename policies::precision<T, Policy>::type precision_type;
 
-         typedef std::integral_constant<int,
+         typedef boost::math::integral_constant<int,
             precision_type::value <= 0 ? 0 :
             precision_type::value <= 53 ? 53 :
             precision_type::value <= 64 ? 64 :
@@ -1848,24 +2176,26 @@ struct igamma_initializer
          do_init(tag_type());
       }
       template <int N>
-      static void do_init(const std::integral_constant<int, N>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, N>&)
       {
          // If std::numeric_limits<T>::digits is zero, we must not call
          // our initialization code here as the precision presumably
          // varies at runtime, and will not have been set yet.  Plus the
          // code requiring initialization isn't called when digits == 0.
-         if(std::numeric_limits<T>::digits)
+         if (boost::math::numeric_limits<T>::digits)
          {
             boost::math::gamma_p(static_cast<T>(400), static_cast<T>(400), Policy());
          }
       }
-      static void do_init(const std::integral_constant<int, 53>&){}
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 53>&){}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
-   static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_STATIC const init initializer;
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -1877,10 +2207,10 @@ struct lgamma_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          typedef typename policies::precision<T, Policy>::type precision_type;
-         typedef std::integral_constant<int,
+         typedef boost::math::integral_constant<int,
             precision_type::value <= 0 ? 0 :
             precision_type::value <= 64 ? 64 :
             precision_type::value <= 113 ? 113 : 0
@@ -1888,28 +2218,30 @@ struct lgamma_initializer
 
          do_init(tag_type());
       }
-      static void do_init(const std::integral_constant<int, 64>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
       {
          boost::math::lgamma(static_cast<T>(2.5), Policy());
          boost::math::lgamma(static_cast<T>(1.25), Policy());
          boost::math::lgamma(static_cast<T>(1.75), Policy());
       }
-      static void do_init(const std::integral_constant<int, 113>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 113>&)
       {
          boost::math::lgamma(static_cast<T>(2.5), Policy());
          boost::math::lgamma(static_cast<T>(1.25), Policy());
          boost::math::lgamma(static_cast<T>(1.5), Policy());
          boost::math::lgamma(static_cast<T>(1.75), Policy());
       }
-      static void do_init(const std::integral_constant<int, 0>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 0>&)
       {
       }
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
-   static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_STATIC const init initializer;
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -1917,8 +2249,8 @@ template <class T, class Policy>
 const typename lgamma_initializer<T, Policy>::init lgamma_initializer<T, Policy>::initializer;
 
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
-   tgamma(T1 a, T2 z, const Policy&, const std::false_type)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
+   tgamma(T1 a, T2 z, const Policy&, const boost::math::false_type)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef tools::promote_args_t<T1, T2> result_type;
@@ -1940,8 +2272,8 @@ inline tools::promote_args_t<T1, T2>
 }
 
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
-   tgamma(T1 a, T2 z, const std::false_type& tag)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
+   tgamma(T1 a, T2 z, const boost::math::false_type& tag)
 {
    return tgamma(a, z, policies::policy<>(), tag);
 }
@@ -1949,15 +2281,8 @@ inline tools::promote_args_t<T1, T2>
 
 } // namespace detail
 
-template <class T>
-inline typename tools::promote_args<T>::type
-   tgamma(T z)
-{
-   return tgamma(z, policies::policy<>());
-}
-
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    lgamma(T z, int* sign, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -1977,28 +2302,28 @@ inline typename tools::promote_args<T>::type
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    lgamma(T z, int* sign)
 {
    return lgamma(z, sign, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    lgamma(T x, const Policy& pol)
 {
    return ::boost::math::lgamma(x, nullptr, pol);
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    lgamma(T x)
 {
    return ::boost::math::lgamma(x, nullptr, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    tgamma1pm1(T z, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -2012,11 +2337,11 @@ inline typename tools::promote_args<T>::type
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   return policies::checked_narrowing_cast<typename std::remove_cv<result_type>::type, forwarding_policy>(detail::tgammap1m1_imp(static_cast<value_type>(z), forwarding_policy(), evaluation_type()), "boost::math::tgamma1pm1<%!%>(%1%)");
+   return policies::checked_narrowing_cast<typename boost::math::remove_cv<result_type>::type, forwarding_policy>(detail::tgammap1m1_imp(static_cast<value_type>(z), forwarding_policy(), evaluation_type()), "boost::math::tgamma1pm1<%!%>(%1%)");
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    tgamma1pm1(T z)
 {
    return tgamma1pm1(z, policies::policy<>());
@@ -2026,7 +2351,7 @@ inline typename tools::promote_args<T>::type
 // Full upper incomplete gamma:
 //
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma(T1 a, T2 z)
 {
    //
@@ -2038,17 +2363,23 @@ inline tools::promote_args_t<T1, T2>
    return static_cast<result_type>(detail::tgamma(a, z, maybe_policy()));
 }
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma(T1 a, T2 z, const Policy& pol)
 {
    using result_type = tools::promote_args_t<T1, T2>;
-   return static_cast<result_type>(detail::tgamma(a, z, pol, std::false_type()));
+   return static_cast<result_type>(detail::tgamma(a, z, pol, boost::math::false_type()));
+}
+template <class T>
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
+   tgamma(T z)
+{
+   return tgamma(z, policies::policy<>());
 }
 //
 // Full lower incomplete gamma:
 //
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma_lower(T1 a, T2 z, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -2070,7 +2401,7 @@ inline tools::promote_args_t<T1, T2>
       forwarding_policy(), static_cast<value_type*>(nullptr)), "tgamma_lower<%1%>(%1%, %1%)");
 }
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma_lower(T1 a, T2 z)
 {
    return tgamma_lower(a, z, policies::policy<>());
@@ -2079,7 +2410,7 @@ inline tools::promote_args_t<T1, T2>
 // Regularised upper incomplete gamma:
 //
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    gamma_q(T1 a, T2 z, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -2101,7 +2432,7 @@ inline tools::promote_args_t<T1, T2>
       forwarding_policy(), static_cast<value_type*>(nullptr)), "gamma_q<%1%>(%1%, %1%)");
 }
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    gamma_q(T1 a, T2 z)
 {
    return gamma_q(a, z, policies::policy<>());
@@ -2110,7 +2441,7 @@ inline tools::promote_args_t<T1, T2>
 // Regularised lower incomplete gamma:
 //
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    gamma_p(T1 a, T2 z, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -2132,7 +2463,7 @@ inline tools::promote_args_t<T1, T2>
       forwarding_policy(), static_cast<value_type*>(nullptr)), "gamma_p<%1%>(%1%, %1%)");
 }
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    gamma_p(T1 a, T2 z)
 {
    return gamma_p(a, z, policies::policy<>());
@@ -2140,7 +2471,7 @@ inline tools::promote_args_t<T1, T2>
 
 // ratios of gamma functions:
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma_delta_ratio(T1 z, T2 delta, const Policy& /* pol */)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -2156,13 +2487,13 @@ inline tools::promote_args_t<T1, T2>
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::tgamma_delta_ratio_imp(static_cast<value_type>(z), static_cast<value_type>(delta), forwarding_policy()), "boost::math::tgamma_delta_ratio<%1%>(%1%, %1%)");
 }
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma_delta_ratio(T1 z, T2 delta)
 {
    return tgamma_delta_ratio(z, delta, policies::policy<>());
 }
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma_ratio(T1 a, T2 b, const Policy&)
 {
    typedef tools::promote_args_t<T1, T2> result_type;
@@ -2177,14 +2508,14 @@ inline tools::promote_args_t<T1, T2>
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::tgamma_ratio_imp(static_cast<value_type>(a), static_cast<value_type>(b), forwarding_policy()), "boost::math::tgamma_delta_ratio<%1%>(%1%, %1%)");
 }
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    tgamma_ratio(T1 a, T2 b)
 {
    return tgamma_ratio(a, b, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    gamma_p_derivative(T1 a, T2 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
@@ -2200,7 +2531,7 @@ inline tools::promote_args_t<T1, T2>
    return policies::checked_narrowing_cast<result_type, forwarding_policy>(detail::gamma_p_derivative_imp(static_cast<value_type>(a), static_cast<value_type>(x), forwarding_policy()), "boost::math::gamma_p_derivative<%1%>(%1%, %1%)");
 }
 template <class T1, class T2>
-inline tools::promote_args_t<T1, T2>
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T1, T2>
    gamma_p_derivative(T1 a, T2 x)
 {
    return gamma_p_derivative(a, x, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/gegenbauer.hpp b/inst/include/boost/math/special_functions/gegenbauer.hpp
index e2c5c71a0..70324cf65 100644
--- a/inst/include/boost/math/special_functions/gegenbauer.hpp
+++ b/inst/include/boost/math/special_functions/gegenbauer.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright Nick Thompson 2019.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -6,21 +7,25 @@
 #ifndef BOOST_MATH_SPECIAL_GEGENBAUER_HPP
 #define BOOST_MATH_SPECIAL_GEGENBAUER_HPP
 
-#include <limits>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+
+#ifndef BOOST_MATH_NO_EXCEPTIONS
 #include <stdexcept>
-#include <type_traits>
+#endif
 
 namespace boost { namespace math {
 
 template<typename Real>
-Real gegenbauer(unsigned n, Real lambda, Real x)
+BOOST_MATH_GPU_ENABLED Real gegenbauer(unsigned n, Real lambda, Real x)
 {
-    static_assert(!std::is_integral<Real>::value, "Gegenbauer polynomials required floating point arguments.");
+    static_assert(!boost::math::is_integral<Real>::value, "Gegenbauer polynomials required floating point arguments.");
     if (lambda <= -1/Real(2)) {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
        throw std::domain_error("lambda > -1/2 is required.");
 #else
-       return std::numeric_limits<Real>::quiet_NaN();
+       return boost::math::numeric_limits<Real>::quiet_NaN();
 #endif
     }
     // The only reason to do this is because of some instability that could be present for x < 0 that is not present for x > 0.
@@ -41,7 +46,7 @@ Real gegenbauer(unsigned n, Real lambda, Real x)
 
     Real yk = y1;
     Real k = 2;
-    Real k_max = n*(1+std::numeric_limits<Real>::epsilon());
+    Real k_max = n*(1+boost::math::numeric_limits<Real>::epsilon());
     Real gamma = 2*(lambda - 1);
     while(k < k_max)
     {
@@ -55,7 +60,7 @@ Real gegenbauer(unsigned n, Real lambda, Real x)
 
 
 template<typename Real>
-Real gegenbauer_derivative(unsigned n, Real lambda, Real x, unsigned k)
+BOOST_MATH_GPU_ENABLED Real gegenbauer_derivative(unsigned n, Real lambda, Real x, unsigned k)
 {
     if (k > n) {
         return Real(0);
@@ -70,7 +75,7 @@ Real gegenbauer_derivative(unsigned n, Real lambda, Real x, unsigned k)
 }
 
 template<typename Real>
-Real gegenbauer_prime(unsigned n, Real lambda, Real x) {
+BOOST_MATH_GPU_ENABLED Real gegenbauer_prime(unsigned n, Real lambda, Real x) {
     return gegenbauer_derivative<Real>(n, lambda, x, 1);
 }
 
diff --git a/inst/include/boost/math/special_functions/hankel.hpp b/inst/include/boost/math/special_functions/hankel.hpp
index 51b8390d9..730c7afa0 100644
--- a/inst/include/boost/math/special_functions/hankel.hpp
+++ b/inst/include/boost/math/special_functions/hankel.hpp
@@ -1,4 +1,5 @@
 // Copyright John Maddock 2012.
+// Copyright Matt Borland 2024.
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -7,26 +8,31 @@
 #ifndef BOOST_MATH_HANKEL_HPP
 #define BOOST_MATH_HANKEL_HPP
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/complex.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/bessel.hpp>
+#include <boost/math/special_functions/detail/iconv.hpp>
+#include <boost/math/constants/constants.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost{ namespace math{
 
 namespace detail{
 
 template <class T, class Policy>
-std::complex<T> hankel_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol, int sign)
+BOOST_MATH_GPU_ENABLED boost::math::complex<T> hankel_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol, int sign)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::cyl_hankel_1<%1%>(%1%,%1%)";
+   constexpr auto function = "boost::math::cyl_hankel_1<%1%>(%1%,%1%)";
 
    if(x < 0)
    {
       bool isint_v = floor(v) == v;
       T j, y;
       bessel_jy(v, -x, &j, &y, need_j | need_y, pol);
-      std::complex<T> cx(x), cv(v);
-      std::complex<T> j_result, y_result;
+      boost::math::complex<T> cx(x), cv(v);
+      boost::math::complex<T> j_result, y_result;
       if(isint_v)
       {
          int s = (iround(v) & 1) ? -1 : 1;
@@ -37,12 +43,12 @@ std::complex<T> hankel_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol
       {
          j_result = pow(cx, v) * pow(-cx, -v) * j;
          T p1 = pow(-x, v);
-         std::complex<T> p2 = pow(cx, v);
+         boost::math::complex<T> p2 = pow(cx, v);
          y_result = p1 * y / p2
             + (p2 / p1 - p1 / p2) * j / tan(constants::pi<T>() * v);
       }
       // multiply y_result by i:
-      y_result = std::complex<T>(-sign * y_result.imag(), sign * y_result.real());
+      y_result = boost::math::complex<T>(-sign * y_result.imag(), sign * y_result.real());
       return j_result + y_result;
    }
 
@@ -51,25 +57,25 @@ std::complex<T> hankel_imp(T v, T x, const bessel_no_int_tag&, const Policy& pol
       if(v == 0)
       {
          // J is 1, Y is -INF
-         return std::complex<T>(1, sign * -policies::raise_overflow_error<T>(function, nullptr, pol));
+         return boost::math::complex<T>(1, sign * -policies::raise_overflow_error<T>(function, nullptr, pol));
       }
       else
       {
          // At least one of J and Y is complex infinity:
-         return std::complex<T>(policies::raise_overflow_error<T>(function, nullptr, pol), sign * policies::raise_overflow_error<T>(function, nullptr, pol));
+         return boost::math::complex<T>(policies::raise_overflow_error<T>(function, nullptr, pol), sign * policies::raise_overflow_error<T>(function, nullptr, pol));
       }
    }
 
    T j, y;
    bessel_jy(v, x, &j, &y, need_j | need_y, pol);
-   return std::complex<T>(j, sign * y);
+   return boost::math::complex<T>(j, sign * y);
 }
 
 template <class T, class Policy>
-std::complex<T> hankel_imp(int v, T x, const bessel_int_tag&, const Policy& pol, int sign);
+BOOST_MATH_GPU_ENABLED boost::math::complex<T> hankel_imp(int v, T x, const bessel_int_tag&, const Policy& pol, int sign);
 
 template <class T, class Policy>
-inline std::complex<T> hankel_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol, int sign)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<T> hankel_imp(T v, T x, const bessel_maybe_int_tag&, const Policy& pol, int sign)
 {
    BOOST_MATH_STD_USING  // ADL of std names.
    int ival = detail::iconv(v, pol);
@@ -81,57 +87,57 @@ inline std::complex<T> hankel_imp(T v, T x, const bessel_maybe_int_tag&, const P
 }
 
 template <class T, class Policy>
-inline std::complex<T> hankel_imp(int v, T x, const bessel_int_tag&, const Policy& pol, int sign)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<T> hankel_imp(int v, T x, const bessel_int_tag&, const Policy& pol, int sign)
 {
    BOOST_MATH_STD_USING
-   if((std::abs(v) < 200) && (x > 0))
-      return std::complex<T>(bessel_jn(v, x, pol), sign * bessel_yn(v, x, pol));
+   if((abs(v) < 200) && (x > 0))
+      return boost::math::complex<T>(bessel_jn(v, x, pol), sign * bessel_yn(v, x, pol));
    return hankel_imp(static_cast<T>(v), x, bessel_no_int_tag(), pol, sign);
 }
 
 template <class T, class Policy>
-inline std::complex<T> sph_hankel_imp(T v, T x, const Policy& pol, int sign)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<T> sph_hankel_imp(T v, T x, const Policy& pol, int sign)
 {
    BOOST_MATH_STD_USING
-   return constants::root_half_pi<T>() * hankel_imp(v + 0.5f, x, bessel_no_int_tag(), pol, sign) / sqrt(std::complex<T>(x));
+   return constants::root_half_pi<T>() * hankel_imp(v + 0.5f, x, bessel_no_int_tag(), pol, sign) / sqrt(boost::math::complex<T>(x));
 }
 
 } // namespace detail
 
 template <class T1, class T2, class Policy>
-inline std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_1(T1 v, T2 x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_1(T1 v, T2 x, const Policy& pol)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
    typedef typename detail::bessel_traits<T1, T2, Policy>::optimisation_tag tag_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
-   return policies::checked_narrowing_cast<std::complex<result_type>, Policy>(detail::hankel_imp<value_type>(v, static_cast<value_type>(x), tag_type(), pol, 1), "boost::math::cyl_hankel_1<%1%>(%1%,%1%)");
+   return policies::checked_narrowing_cast<boost::math::complex<result_type>, Policy>(detail::hankel_imp<value_type>(v, static_cast<value_type>(x), tag_type(), pol, 1), "boost::math::cyl_hankel_1<%1%>(%1%,%1%)");
 }
 
 template <class T1, class T2>
-inline std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_1(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_1(T1 v, T2 x)
 {
    return cyl_hankel_1(v, x, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_2(T1 v, T2 x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_2(T1 v, T2 x, const Policy& pol)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
    typedef typename detail::bessel_traits<T1, T2, Policy>::optimisation_tag tag_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
-   return policies::checked_narrowing_cast<std::complex<result_type>, Policy>(detail::hankel_imp<value_type>(v, static_cast<value_type>(x), tag_type(), pol, -1), "boost::math::cyl_hankel_1<%1%>(%1%,%1%)");
+   return policies::checked_narrowing_cast<boost::math::complex<result_type>, Policy>(detail::hankel_imp<value_type>(v, static_cast<value_type>(x), tag_type(), pol, -1), "boost::math::cyl_hankel_1<%1%>(%1%,%1%)");
 }
 
 template <class T1, class T2>
-inline std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_2(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_2(T1 v, T2 x)
 {
    return cyl_hankel_2(v, x, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_1(T1 v, T2 x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_1(T1 v, T2 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
@@ -143,17 +149,17 @@ inline std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type>
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   return policies::checked_narrowing_cast<std::complex<result_type>, Policy>(detail::sph_hankel_imp<value_type>(static_cast<value_type>(v), static_cast<value_type>(x), forwarding_policy(), 1), "boost::math::sph_hankel_1<%1%>(%1%,%1%)");
+   return policies::checked_narrowing_cast<boost::math::complex<result_type>, Policy>(detail::sph_hankel_imp<value_type>(static_cast<value_type>(v), static_cast<value_type>(x), forwarding_policy(), 1), "boost::math::sph_hankel_1<%1%>(%1%,%1%)");
 }
 
 template <class T1, class T2>
-inline std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_1(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_1(T1 v, T2 x)
 {
    return sph_hankel_1(v, x, policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_2(T1 v, T2 x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_2(T1 v, T2 x, const Policy&)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename detail::bessel_traits<T1, T2, Policy>::result_type result_type;
@@ -165,11 +171,11 @@ inline std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type>
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   return policies::checked_narrowing_cast<std::complex<result_type>, Policy>(detail::sph_hankel_imp<value_type>(static_cast<value_type>(v), static_cast<value_type>(x), forwarding_policy(), -1), "boost::math::sph_hankel_1<%1%>(%1%,%1%)");
+   return policies::checked_narrowing_cast<boost::math::complex<result_type>, Policy>(detail::sph_hankel_imp<value_type>(static_cast<value_type>(v), static_cast<value_type>(x), forwarding_policy(), -1), "boost::math::sph_hankel_1<%1%>(%1%,%1%)");
 }
 
 template <class T1, class T2>
-inline std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_2(T1 v, T2 x)
+BOOST_MATH_GPU_ENABLED inline boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_2(T1 v, T2 x)
 {
    return sph_hankel_2(v, x, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/hermite.hpp b/inst/include/boost/math/special_functions/hermite.hpp
index 81ccb2ac6..3d77fc03e 100644
--- a/inst/include/boost/math/special_functions/hermite.hpp
+++ b/inst/include/boost/math/special_functions/hermite.hpp
@@ -1,5 +1,6 @@
 
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -11,8 +12,9 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/promotion.hpp>
+#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/policies/error_handling.hpp>
 
 namespace boost{
@@ -20,7 +22,7 @@ namespace math{
 
 // Recurrence relation for Hermite polynomials:
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2, T3>::type 
    hermite_next(unsigned n, T1 x, T2 Hn, T3 Hnm1)
 {
    using promoted_type = tools::promote_args_t<T1, T2, T3>;
@@ -31,7 +33,7 @@ namespace detail{
 
 // Implement Hermite polynomials via recurrence:
 template <class T>
-T hermite_imp(unsigned n, T x)
+BOOST_MATH_GPU_ENABLED T hermite_imp(unsigned n, T x)
 {
    T p0 = 1;
    T p1 = 2 * x;
@@ -43,7 +45,7 @@ T hermite_imp(unsigned n, T x)
 
    while(c < n)
    {
-      std::swap(p0, p1);
+      BOOST_MATH_GPU_SAFE_SWAP(p0, p1);
       p1 = static_cast<T>(hermite_next(c, x, p0, p1));
       ++c;
    }
@@ -53,7 +55,7 @@ T hermite_imp(unsigned n, T x)
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type 
    hermite(unsigned n, T x, const Policy&)
 {
    typedef typename tools::promote_args<T>::type result_type;
@@ -62,7 +64,7 @@ inline typename tools::promote_args<T>::type
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type 
    hermite(unsigned n, T x)
 {
    return boost::math::hermite(n, x, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/heuman_lambda.hpp b/inst/include/boost/math/special_functions/heuman_lambda.hpp
index c2d16d46e..05002725f 100644
--- a/inst/include/boost/math/special_functions/heuman_lambda.hpp
+++ b/inst/include/boost/math/special_functions/heuman_lambda.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2015 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,6 +11,9 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rj.hpp>
 #include <boost/math/special_functions/ellint_1.hpp>
@@ -26,13 +30,13 @@ namespace detail{
 
 // Elliptic integral - Jacobi Zeta
 template <typename T, typename Policy>
-T heuman_lambda_imp(T phi, T k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T heuman_lambda_imp(T phi, T k, const Policy& pol)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
     using namespace boost::math::constants;
 
-    const char* function = "boost::math::heuman_lambda<%1%>(%1%, %1%)";
+    constexpr auto function = "boost::math::heuman_lambda<%1%>(%1%, %1%)";
 
     if(fabs(k) > 1)
        return policies::raise_domain_error<T>(function, "We require |k| <= 1 but got k = %1%", k, pol);
@@ -51,10 +55,10 @@ T heuman_lambda_imp(T phi, T k, const Policy& pol)
     }
     else
     {
-          typedef std::integral_constant<int,
-             std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-             std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
-          > precision_tag_type;
+       typedef boost::math::integral_constant<int,
+          boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 54) ? 0 :
+          boost::math::is_floating_point<T>::value && boost::math::numeric_limits<T>::digits && (boost::math::numeric_limits<T>::digits <= 64) ? 1 : 2
+       > precision_tag_type;
 
        T rkp = sqrt(kp);
        T ratio;
@@ -63,8 +67,10 @@ T heuman_lambda_imp(T phi, T k, const Policy& pol)
           return policies::raise_domain_error<T>(function, "When 1-k^2 == 1 then phi must be < Pi/2, but got phi = %1%", phi, pol);
        }
        else
-          ratio = ellint_f_imp(phi, rkp, pol) / ellint_k_imp(rkp, pol, precision_tag_type());
-       result = ratio + ellint_k_imp(k, pol, precision_tag_type()) * jacobi_zeta_imp(phi, rkp, pol) / constants::half_pi<T>();
+       {
+          ratio = ellint_f_imp(phi, rkp, pol, k2) / ellint_k_imp(rkp, pol, k2);
+       }
+       result = ratio + ellint_k_imp(k, pol, precision_tag_type()) * jacobi_zeta_imp(phi, rkp, pol, k2) / constants::half_pi<T>();
     }
     return result;
 }
@@ -72,7 +78,7 @@ T heuman_lambda_imp(T phi, T k, const Policy& pol)
 } // detail
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type heuman_lambda(T1 k, T2 phi, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type heuman_lambda(T1 k, T2 phi, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -80,7 +86,7 @@ inline typename tools::promote_args<T1, T2>::type heuman_lambda(T1 k, T2 phi, co
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type heuman_lambda(T1 k, T2 phi)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type heuman_lambda(T1 k, T2 phi)
 {
    return boost::math::heuman_lambda(k, phi, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp b/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp
index 6f13172d7..73444520c 100644
--- a/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp
+++ b/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp
@@ -123,13 +123,13 @@ namespace boost { namespace math { namespace detail {
             {
                if (boost::math::policies::digits<T, Policy>() <= 64)
                   return hypergeometric_1F1_from_function_ratio_negative_b_forwards(a, b, z, pol, log_scaling);
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                try
 #endif
                {
                   return hypergeometric_1F1_checked_series_impl(a, b, z, pol, log_scaling);
                }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                catch (const evaluation_error&)
                {
                   //
@@ -419,13 +419,13 @@ namespace boost { namespace math { namespace detail {
       if (detail::hypergeometric_1F1_asym_region(a, b, z, pol))
       {
          long long saved_scale = log_scaling;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          try
 #endif
          {
             return hypergeometric_1F1_asym_large_z_series(a, b, z, pol, log_scaling);
          }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          catch (const evaluation_error&)
          {
          }
diff --git a/inst/include/boost/math/special_functions/hypergeometric_pFq.hpp b/inst/include/boost/math/special_functions/hypergeometric_pFq.hpp
index c5e687bbe..070b852dd 100644
--- a/inst/include/boost/math/special_functions/hypergeometric_pFq.hpp
+++ b/inst/include/boost/math/special_functions/hypergeometric_pFq.hpp
@@ -84,7 +84,7 @@ namespace boost {
          return hypergeometric_pFq<std::initializer_list<R>, Real>(aj, bj, z, p_abs_error);
       }
 
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
       template <class T>
       struct scoped_precision
       {
diff --git a/inst/include/boost/math/special_functions/hypot.hpp b/inst/include/boost/math/special_functions/hypot.hpp
index c56c75110..f38e37e87 100644
--- a/inst/include/boost/math/special_functions/hypot.hpp
+++ b/inst/include/boost/math/special_functions/hypot.hpp
@@ -12,20 +12,20 @@
 
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <algorithm> // for swap
-#include <cmath>
 
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Policy>
-T hypot_imp(T x, T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T hypot_imp(T x, T y, const Policy& pol)
 {
    //
    // Normalize x and y, so that both are positive and x >= y:
    //
-   using std::fabs; using std::sqrt; // ADL of std names
+   BOOST_MATH_STD_USING
 
    x = fabs(x);
    y = fabs(y);
@@ -35,16 +35,16 @@ T hypot_imp(T x, T y, const Policy& pol)
 #pragma warning(disable: 4127)
 #endif
    // special case, see C99 Annex F:
-   if(std::numeric_limits<T>::has_infinity
-      && ((x == std::numeric_limits<T>::infinity())
-      || (y == std::numeric_limits<T>::infinity())))
+   if(boost::math::numeric_limits<T>::has_infinity
+      && ((x == boost::math::numeric_limits<T>::infinity())
+      || (y == boost::math::numeric_limits<T>::infinity())))
       return policies::raise_overflow_error<T>("boost::math::hypot<%1%>(%1%,%1%)", nullptr, pol);
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
    if(y > x)
-      (std::swap)(x, y);
+      BOOST_MATH_GPU_SAFE_SWAP(x, y);
 
    if(x * tools::epsilon<T>() >= y)
       return x;
@@ -56,7 +56,7 @@ T hypot_imp(T x, T y, const Policy& pol)
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    hypot(T1 x, T2 y)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
@@ -65,7 +65,7 @@ inline typename tools::promote_args<T1, T2>::type
 }
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    hypot(T1 x, T2 y, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
diff --git a/inst/include/boost/math/special_functions/jacobi_zeta.hpp b/inst/include/boost/math/special_functions/jacobi_zeta.hpp
index aca9ff6d4..8b6f80912 100644
--- a/inst/include/boost/math/special_functions/jacobi_zeta.hpp
+++ b/inst/include/boost/math/special_functions/jacobi_zeta.hpp
@@ -11,6 +11,8 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/promotion.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_1.hpp>
 #include <boost/math/special_functions/ellint_rj.hpp>
@@ -27,7 +29,7 @@ namespace detail{
 
 // Elliptic integral - Jacobi Zeta
 template <typename T, typename Policy>
-T jacobi_zeta_imp(T phi, T k, const Policy& pol)
+BOOST_MATH_GPU_ENABLED T jacobi_zeta_imp(T phi, T k, const Policy& pol, T kp)
 {
     BOOST_MATH_STD_USING
     using namespace boost::math::tools;
@@ -43,26 +45,26 @@ T jacobi_zeta_imp(T phi, T k, const Policy& pol)
     T result;
     T sinp = sin(phi);
     T cosp = cos(phi);
-    T s2 = sinp * sinp;
+    T c2 = cosp * cosp;
+    T one_minus_ks2 = kp + c2 - kp * c2;
     T k2 = k * k;
-    T kp = 1 - k2;
     if(k == 1)
        result = sinp * (boost::math::sign)(cosp);  // We get here by simplifying JacobiZeta[w, 1] in Mathematica, and the fact that 0 <= phi.
     else
     {
-       typedef std::integral_constant<int,
-          std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
-          std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
-       > precision_tag_type;
-       result = k2 * sinp * cosp * sqrt(1 - k2 * s2) * ellint_rj_imp(T(0), kp, T(1), T(1 - k2 * s2), pol) / (3 * ellint_k_imp(k, pol, precision_tag_type()));
+       result = k2 * sinp * cosp * sqrt(one_minus_ks2) * ellint_rj_imp(T(0), kp, T(1), one_minus_ks2, pol) / (3 * ellint_k_imp(k, pol, kp));
     }
     return invert ? T(-result) : result;
 }
-
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED inline T jacobi_zeta_imp(T phi, T k, const Policy& pol)
+{
+   return jacobi_zeta_imp(phi, k, pol, T(1 - k * k));
+}
 } // detail
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type jacobi_zeta(T1 k, T2 phi, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type jacobi_zeta(T1 k, T2 phi, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -70,7 +72,7 @@ inline typename tools::promote_args<T1, T2>::type jacobi_zeta(T1 k, T2 phi, cons
 }
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type jacobi_zeta(T1 k, T2 phi)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type jacobi_zeta(T1 k, T2 phi)
 {
    return boost::math::jacobi_zeta(k, phi, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/lambert_w.hpp b/inst/include/boost/math/special_functions/lambert_w.hpp
index 014282e0c..1d21973e4 100644
--- a/inst/include/boost/math/special_functions/lambert_w.hpp
+++ b/inst/include/boost/math/special_functions/lambert_w.hpp
@@ -1822,12 +1822,12 @@ T lambert_wm1_imp(const T z, const Policy&  pol)
       "Argument z = %1% is too small (z < -std::numeric_limits<T>::min so denormalized) for Lambert W-1 branch!",
       z, pol);
   }
-  if (z == -boost::math::constants::exp_minus_one<T>()) // == singularity/branch point z = -exp(-1) = -3.6787944.
+  if (z == -boost::math::constants::exp_minus_one<T>()) // == singularity/branch point z = -exp(-1) = -0.36787944.
   { // At singularity, so return exactly -1.
     return -static_cast<T>(1);
   }
   // z is too negative for the W-1 (or W0) branch.
-  if (z < -boost::math::constants::exp_minus_one<T>()) // > singularity/branch point z = -exp(-1) = -3.6787944.
+  if (z < -boost::math::constants::exp_minus_one<T>()) // > singularity/branch point z = -exp(-1) = -0.36787944.
   {
     return policies::raise_domain_error(function,
       "Argument z = %1% is out of range (z < -exp(-1) = -3.6787944... <= 0) for Lambert W-1 (or W0) branch!",
diff --git a/inst/include/boost/math/special_functions/lanczos.hpp b/inst/include/boost/math/special_functions/lanczos.hpp
index cb6e34d26..0ec24bddb 100644
--- a/inst/include/boost/math/special_functions/lanczos.hpp
+++ b/inst/include/boost/math/special_functions/lanczos.hpp
@@ -11,12 +11,16 @@
 #endif
 
 #include <boost/math/tools/config.hpp>
-#include <boost/math/tools/big_constant.hpp>
 #include <boost/math/tools/rational.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/policies/policy.hpp>
-#include <limits>
-#include <type_traits>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/tools/big_constant.hpp>
 #include <cstdint>
+#endif
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -41,35 +45,6 @@ namespace boost{ namespace math{ namespace lanczos{
 // http://my.fit.edu/~gabdo/gamma.txt and elaborated by Toth at
 // http://www.rskey.org/gamma.htm using NTL::RR at 1000 bit precision.
 //
-// Begin with a small helper to force initialization of constants prior
-// to main.  This makes the constant initialization thread safe, even
-// when called with a user-defined number type.
-//
-template <class Lanczos, class T>
-struct lanczos_initializer
-{
-   struct init
-   {
-      init()
-      {
-         T t(1);
-         Lanczos::lanczos_sum(t);
-         Lanczos::lanczos_sum_expG_scaled(t);
-         Lanczos::lanczos_sum_near_1(t);
-         Lanczos::lanczos_sum_near_2(t);
-         Lanczos::g();
-      }
-      void force_instantiate()const{}
-   };
-   static const init initializer;
-   static void force_instantiate()
-   {
-      initializer.force_instantiate();
-   }
-};
-template <class Lanczos, class T>
-typename lanczos_initializer<Lanczos, T>::init const lanczos_initializer<Lanczos, T>::initializer;
-
 //
 // Non-member helper which allows us to have a different g() value for the
 // near_1 and near_2 approximations.  This is a big help in reducing error
@@ -77,7 +52,7 @@ typename lanczos_initializer<Lanczos, T>::init const lanczos_initializer<Lanczos
 // Default version assumes all g() values are the same.
 //
 template <class L>
-inline double lanczos_g_near_1_and_2(const L&)
+BOOST_MATH_GPU_ENABLED inline double lanczos_g_near_1_and_2(const L&)
 {
    return L::g();
 }
@@ -88,17 +63,17 @@ inline double lanczos_g_near_1_and_2(const L&)
 // Max experimental error (with arbitrary precision arithmetic) 9.516e-12
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos6 : public std::integral_constant<int, 35>
+struct lanczos6 : public boost::math::integral_constant<int, 35>
 {
    //
    // Produces slightly better than float precision when evaluated at
    // double precision:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      lanczos_initializer<lanczos6, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[6] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[6] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 8706.349592549009182288174442774377925882)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 8523.650341121874633477483696775067709735)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 3338.029219476423550899999750161289306564)),
@@ -106,22 +81,23 @@ struct lanczos6 : public std::integral_constant<int, 35>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 63.99951844938187085666201263218840287667)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 2.506628274631006311133031631822390264407))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint16_t) denom[6] = {
-         static_cast<std::uint16_t>(0u),
-         static_cast<std::uint16_t>(24u),
-         static_cast<std::uint16_t>(50u),
-         static_cast<std::uint16_t>(35u),
-         static_cast<std::uint16_t>(10u),
-         static_cast<std::uint16_t>(1u)
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint16_t) denom[6] = {
+         static_cast<boost::math::uint16_t>(0u),
+         static_cast<boost::math::uint16_t>(24u),
+         static_cast<boost::math::uint16_t>(50u),
+         static_cast<boost::math::uint16_t>(35u),
+         static_cast<boost::math::uint16_t>(10u),
+         static_cast<boost::math::uint16_t>(1u)
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      lanczos_initializer<lanczos6, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[6] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[6] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 32.81244541029783471623665933780748627823)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 32.12388941444332003446077108933558534361)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 12.58034729455216106950851080138931470954)),
@@ -129,29 +105,31 @@ struct lanczos6 : public std::integral_constant<int, 35>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 0.2412010548258800231126240760264822486599)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 0.009446967704539249494420221613134244048319))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint16_t) denom[6] = {
-         static_cast<std::uint16_t>(0u),
-         static_cast<std::uint16_t>(24u),
-         static_cast<std::uint16_t>(50u),
-         static_cast<std::uint16_t>(35u),
-         static_cast<std::uint16_t>(10u),
-         static_cast<std::uint16_t>(1u)
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint16_t) denom[6] = {
+         static_cast<boost::math::uint16_t>(0u),
+         static_cast<boost::math::uint16_t>(24u),
+         static_cast<boost::math::uint16_t>(50u),
+         static_cast<boost::math::uint16_t>(35u),
+         static_cast<boost::math::uint16_t>(10u),
+         static_cast<boost::math::uint16_t>(1u)
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      lanczos_initializer<lanczos6, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[5] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[5] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 2.044879010930422922760429926121241330235)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, -2.751366405578505366591317846728753993668)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 1.02282965224225004296750609604264824677)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, -0.09786124911582813985028889636665335893627)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 0.0009829742267506615183144364420540766510112)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -161,16 +139,17 @@ struct lanczos6 : public std::integral_constant<int, 35>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      lanczos_initializer<lanczos6, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[5] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[5] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 5.748142489536043490764289256167080091892)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, -7.734074268282457156081021756682138251825)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 2.875167944990511006997713242805893543947)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, -0.2750873773533504542306766137703788781776)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 35, 0.002763134585812698552178368447708846850353)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -180,7 +159,7 @@ struct lanczos6 : public std::integral_constant<int, 35>
       return result;
    }
 
-   static double g(){ return 5.581000000000000405009359383257105946541; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 5.581000000000000405009359383257105946541; }
 };
 
 //
@@ -188,17 +167,17 @@ struct lanczos6 : public std::integral_constant<int, 35>
 // Max experimental error (with arbitrary precision arithmetic) 2.16676e-19
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos11 : public std::integral_constant<int, 60>
+struct lanczos11 : public boost::math::integral_constant<int, 60>
 {
    //
    // Produces slightly better than double precision when evaluated at
    // extended-double precision:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      lanczos_initializer<lanczos11, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[11] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[11] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 38474670393.31776828316099004518914832218)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 36857665043.51950660081971227404959150474)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 15889202453.72942008945006665994637853242)),
@@ -211,27 +190,28 @@ struct lanczos11 : public std::integral_constant<int, 60>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 261.6140441641668190791708576058805625502)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 2.506628274631000502415573855452633787834))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint32_t) denom[11] = {
-         static_cast<std::uint32_t>(0u),
-         static_cast<std::uint32_t>(362880u),
-         static_cast<std::uint32_t>(1026576u),
-         static_cast<std::uint32_t>(1172700u),
-         static_cast<std::uint32_t>(723680u),
-         static_cast<std::uint32_t>(269325u),
-         static_cast<std::uint32_t>(63273u),
-         static_cast<std::uint32_t>(9450u),
-         static_cast<std::uint32_t>(870u),
-         static_cast<std::uint32_t>(45u),
-         static_cast<std::uint32_t>(1u)
-      };
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint32_t) denom[11] = {
+         static_cast<boost::math::uint32_t>(0u),
+         static_cast<boost::math::uint32_t>(362880u),
+         static_cast<boost::math::uint32_t>(1026576u),
+         static_cast<boost::math::uint32_t>(1172700u),
+         static_cast<boost::math::uint32_t>(723680u),
+         static_cast<boost::math::uint32_t>(269325u),
+         static_cast<boost::math::uint32_t>(63273u),
+         static_cast<boost::math::uint32_t>(9450u),
+         static_cast<boost::math::uint32_t>(870u),
+         static_cast<boost::math::uint32_t>(45u),
+         static_cast<boost::math::uint32_t>(1u)
+      };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      lanczos_initializer<lanczos11, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[11] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[11] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 709811.662581657956893540610814842699825)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 679979.847415722640161734319823103390728)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 293136.785721159725251629480984140341656)),
@@ -244,28 +224,29 @@ struct lanczos11 : public std::integral_constant<int, 60>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 0.004826466289237661857584712046231435101741)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 0.4624429436045378766270459638520555557321e-4))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint32_t) denom[11] = {
-         static_cast<std::uint32_t>(0u),
-         static_cast<std::uint32_t>(362880u),
-         static_cast<std::uint32_t>(1026576u),
-         static_cast<std::uint32_t>(1172700u),
-         static_cast<std::uint32_t>(723680u),
-         static_cast<std::uint32_t>(269325u),
-         static_cast<std::uint32_t>(63273u),
-         static_cast<std::uint32_t>(9450u),
-         static_cast<std::uint32_t>(870u),
-         static_cast<std::uint32_t>(45u),
-         static_cast<std::uint32_t>(1u)
-      };
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint32_t) denom[11] = {
+         static_cast<boost::math::uint32_t>(0u),
+         static_cast<boost::math::uint32_t>(362880u),
+         static_cast<boost::math::uint32_t>(1026576u),
+         static_cast<boost::math::uint32_t>(1172700u),
+         static_cast<boost::math::uint32_t>(723680u),
+         static_cast<boost::math::uint32_t>(269325u),
+         static_cast<boost::math::uint32_t>(63273u),
+         static_cast<boost::math::uint32_t>(9450u),
+         static_cast<boost::math::uint32_t>(870u),
+         static_cast<boost::math::uint32_t>(45u),
+         static_cast<boost::math::uint32_t>(1u)
+      };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      lanczos_initializer<lanczos11, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[10] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[10] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 4.005853070677940377969080796551266387954)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, -13.17044315127646469834125159673527183164)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 17.19146865350790353683895137079288129318)),
@@ -277,6 +258,7 @@ struct lanczos11 : public std::integral_constant<int, 60>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 0.17655204574495137651670832229571934738e-4)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, -0.1036282091079938047775645941885460820853e-7)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -286,10 +268,10 @@ struct lanczos11 : public std::integral_constant<int, 60>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      lanczos_initializer<lanczos11, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[10] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[10] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 19.05889633808148715159575716844556056056)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, -62.66183664701721716960978577959655644762)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 81.7929198065004751699057192860287512027)),
@@ -301,6 +283,7 @@ struct lanczos11 : public std::integral_constant<int, 60>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, 0.8399926504443119927673843789048514017761e-4)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 60, -0.493038376656195010308610694048822561263e-7)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -310,7 +293,7 @@ struct lanczos11 : public std::integral_constant<int, 60>
       return result;
    }
 
-   static double g(){ return 10.90051099999999983936049829935654997826; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 10.90051099999999983936049829935654997826; }
 };
 
 //
@@ -318,17 +301,17 @@ struct lanczos11 : public std::integral_constant<int, 60>
 // Max experimental error (with arbitrary precision arithmetic) 9.2213e-23
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos13 : public std::integral_constant<int, 72>
+struct lanczos13 : public boost::math::integral_constant<int, 72>
 {
    //
    // Produces slightly better than extended-double precision when evaluated at
    // higher precision:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      lanczos_initializer<lanczos13, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[13] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[13] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 44012138428004.60895436261759919070125699)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 41590453358593.20051581730723108131357995)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 18013842787117.99677796276038389462742949)),
@@ -343,29 +326,30 @@ struct lanczos13 : public std::integral_constant<int, 72>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 381.8801248632926870394389468349331394196)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 2.506628274631000502415763426076722427007))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint32_t) denom[13] = {
-         static_cast<std::uint32_t>(0u),
-         static_cast<std::uint32_t>(39916800u),
-         static_cast<std::uint32_t>(120543840u),
-         static_cast<std::uint32_t>(150917976u),
-         static_cast<std::uint32_t>(105258076u),
-         static_cast<std::uint32_t>(45995730u),
-         static_cast<std::uint32_t>(13339535u),
-         static_cast<std::uint32_t>(2637558u),
-         static_cast<std::uint32_t>(357423u),
-         static_cast<std::uint32_t>(32670u),
-         static_cast<std::uint32_t>(1925u),
-         static_cast<std::uint32_t>(66u),
-         static_cast<std::uint32_t>(1u)
-      };
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint32_t) denom[13] = {
+         static_cast<boost::math::uint32_t>(0u),
+         static_cast<boost::math::uint32_t>(39916800u),
+         static_cast<boost::math::uint32_t>(120543840u),
+         static_cast<boost::math::uint32_t>(150917976u),
+         static_cast<boost::math::uint32_t>(105258076u),
+         static_cast<boost::math::uint32_t>(45995730u),
+         static_cast<boost::math::uint32_t>(13339535u),
+         static_cast<boost::math::uint32_t>(2637558u),
+         static_cast<boost::math::uint32_t>(357423u),
+         static_cast<boost::math::uint32_t>(32670u),
+         static_cast<boost::math::uint32_t>(1925u),
+         static_cast<boost::math::uint32_t>(66u),
+         static_cast<boost::math::uint32_t>(1u)
+      };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      lanczos_initializer<lanczos13, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[13] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[13] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 86091529.53418537217994842267760536134841)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 81354505.17858011242874285785316135398567)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 35236626.38815461910817650960734605416521)),
@@ -380,30 +364,31 @@ struct lanczos13 : public std::integral_constant<int, 72>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 0.0007469903808915448316510079585999893674101)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 0.4903180573459871862552197089738373164184e-5))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint32_t) denom[13] = {
-         static_cast<std::uint32_t>(0u),
-         static_cast<std::uint32_t>(39916800u),
-         static_cast<std::uint32_t>(120543840u),
-         static_cast<std::uint32_t>(150917976u),
-         static_cast<std::uint32_t>(105258076u),
-         static_cast<std::uint32_t>(45995730u),
-         static_cast<std::uint32_t>(13339535u),
-         static_cast<std::uint32_t>(2637558u),
-         static_cast<std::uint32_t>(357423u),
-         static_cast<std::uint32_t>(32670u),
-         static_cast<std::uint32_t>(1925u),
-         static_cast<std::uint32_t>(66u),
-         static_cast<std::uint32_t>(1u)
-      };
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint32_t) denom[13] = {
+         static_cast<boost::math::uint32_t>(0u),
+         static_cast<boost::math::uint32_t>(39916800u),
+         static_cast<boost::math::uint32_t>(120543840u),
+         static_cast<boost::math::uint32_t>(150917976u),
+         static_cast<boost::math::uint32_t>(105258076u),
+         static_cast<boost::math::uint32_t>(45995730u),
+         static_cast<boost::math::uint32_t>(13339535u),
+         static_cast<boost::math::uint32_t>(2637558u),
+         static_cast<boost::math::uint32_t>(357423u),
+         static_cast<boost::math::uint32_t>(32670u),
+         static_cast<boost::math::uint32_t>(1925u),
+         static_cast<boost::math::uint32_t>(66u),
+         static_cast<boost::math::uint32_t>(1u)
+      };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      lanczos_initializer<lanczos13, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[12] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[12] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 4.832115561461656947793029596285626840312)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, -19.86441536140337740383120735104359034688)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 33.9927422807443239927197864963170585331)),
@@ -417,6 +402,7 @@ struct lanczos13 : public std::integral_constant<int, 72>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 0.462590910138598083940803704521211569234e-6)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, -0.1735307814426389420248044907765671743012e-9)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -426,10 +412,10 @@ struct lanczos13 : public std::integral_constant<int, 72>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      lanczos_initializer<lanczos13, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[12] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[12] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 26.96979819614830698367887026728396466395)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, -110.8705424709385114023884328797900204863)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 189.7258846119231466417015694690434770085)),
@@ -443,6 +429,7 @@ struct lanczos13 : public std::integral_constant<int, 72>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, 0.2581888478270733025288922038673392636029e-5)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 72, -0.9685385411006641478305219367315965391289e-9)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -452,7 +439,7 @@ struct lanczos13 : public std::integral_constant<int, 72>
       return result;
    }
 
-   static double g(){ return 13.1445650000000000545696821063756942749; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 13.1445650000000000545696821063756942749; }
 };
 
 //
@@ -460,15 +447,16 @@ struct lanczos13 : public std::integral_constant<int, 72>
 // Max experimental error (with arbitrary precision arithmetic) 8.111667e-8
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos6m24 : public std::integral_constant<int, 24>
+struct lanczos6m24 : public boost::math::integral_constant<int, 24>
 {
    //
    // Use for float precision, when evaluated as a float:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[6] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[6] = {
          static_cast<T>(58.52061591769095910314047740215847630266L),
          static_cast<T>(182.5248962595894264831189414768236280862L),
          static_cast<T>(211.0971093028510041839168287718170827259L),
@@ -476,21 +464,23 @@ struct lanczos6m24 : public std::integral_constant<int, 24>
          static_cast<T>(27.5192015197455403062503721613097825345L),
          static_cast<T>(2.50662858515256974113978724717473206342L)
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint16_t) denom[6] = {
-         static_cast<std::uint16_t>(0u),
-         static_cast<std::uint16_t>(24u),
-         static_cast<std::uint16_t>(50u),
-         static_cast<std::uint16_t>(35u),
-         static_cast<std::uint16_t>(10u),
-         static_cast<std::uint16_t>(1u)
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint16_t) denom[6] = {
+         static_cast<boost::math::uint16_t>(0u),
+         static_cast<boost::math::uint16_t>(24u),
+         static_cast<boost::math::uint16_t>(50u),
+         static_cast<boost::math::uint16_t>(35u),
+         static_cast<boost::math::uint16_t>(10u),
+         static_cast<boost::math::uint16_t>(1u)
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[6] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[6] = {
          static_cast<T>(14.0261432874996476619570577285003839357L),
          static_cast<T>(43.74732405540314316089531289293124360129L),
          static_cast<T>(50.59547402616588964511581430025589038612L),
@@ -498,28 +488,31 @@ struct lanczos6m24 : public std::integral_constant<int, 24>
          static_cast<T>(6.595765571169314946316366571954421695196L),
          static_cast<T>(0.6007854010515290065101128585795542383721L)
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint16_t) denom[6] = {
-         static_cast<std::uint16_t>(0u),
-         static_cast<std::uint16_t>(24u),
-         static_cast<std::uint16_t>(50u),
-         static_cast<std::uint16_t>(35u),
-         static_cast<std::uint16_t>(10u),
-         static_cast<std::uint16_t>(1u)
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint16_t) denom[6] = {
+         static_cast<boost::math::uint16_t>(0u),
+         static_cast<boost::math::uint16_t>(24u),
+         static_cast<boost::math::uint16_t>(50u),
+         static_cast<boost::math::uint16_t>(35u),
+         static_cast<boost::math::uint16_t>(10u),
+         static_cast<boost::math::uint16_t>(1u)
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[5] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[5] = {
          static_cast<T>(0.4922488055204602807654354732674868442106L),
          static_cast<T>(0.004954497451132152436631238060933905650346L),
          static_cast<T>(-0.003374784572167105840686977985330859371848L),
          static_cast<T>(0.001924276018962061937026396537786414831385L),
          static_cast<T>(-0.00056533046336427583708166383712907694434L),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -529,15 +522,17 @@ struct lanczos6m24 : public std::integral_constant<int, 24>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[5] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[5] = {
          static_cast<T>(0.6534966888520080645505805298901130485464L),
          static_cast<T>(0.006577461728560758362509168026049182707101L),
          static_cast<T>(-0.004480276069269967207178373559014835978161L),
          static_cast<T>(0.00255461870648818292376982818026706528842L),
          static_cast<T>(-0.000750517993690428370380996157470900204524L),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -547,7 +542,7 @@ struct lanczos6m24 : public std::integral_constant<int, 24>
       return result;
    }
 
-   static double g(){ return 1.428456135094165802001953125; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 1.428456135094165802001953125; }
 };
 
 //
@@ -555,15 +550,16 @@ struct lanczos6m24 : public std::integral_constant<int, 24>
 // Max experimental error (with arbitrary precision arithmetic) 1.196214e-17
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos13m53 : public std::integral_constant<int, 53>
+struct lanczos13m53 : public boost::math::integral_constant<int, 53>
 {
    //
    // Use for double precision, when evaluated as a double:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[13] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[13] = {
          static_cast<T>(23531376880.41075968857200767445163675473L),
          static_cast<T>(42919803642.64909876895789904700198885093L),
          static_cast<T>(35711959237.35566804944018545154716670596L),
@@ -578,28 +574,30 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
          static_cast<T>(210.8242777515793458725097339207133627117L),
          static_cast<T>(2.506628274631000270164908177133837338626L)
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint32_t) denom[13] = {
-         static_cast<std::uint32_t>(0u),
-         static_cast<std::uint32_t>(39916800u),
-         static_cast<std::uint32_t>(120543840u),
-         static_cast<std::uint32_t>(150917976u),
-         static_cast<std::uint32_t>(105258076u),
-         static_cast<std::uint32_t>(45995730u),
-         static_cast<std::uint32_t>(13339535u),
-         static_cast<std::uint32_t>(2637558u),
-         static_cast<std::uint32_t>(357423u),
-         static_cast<std::uint32_t>(32670u),
-         static_cast<std::uint32_t>(1925u),
-         static_cast<std::uint32_t>(66u),
-         static_cast<std::uint32_t>(1u)
-      };
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint32_t) denom[13] = {
+         static_cast<boost::math::uint32_t>(0u),
+         static_cast<boost::math::uint32_t>(39916800u),
+         static_cast<boost::math::uint32_t>(120543840u),
+         static_cast<boost::math::uint32_t>(150917976u),
+         static_cast<boost::math::uint32_t>(105258076u),
+         static_cast<boost::math::uint32_t>(45995730u),
+         static_cast<boost::math::uint32_t>(13339535u),
+         static_cast<boost::math::uint32_t>(2637558u),
+         static_cast<boost::math::uint32_t>(357423u),
+         static_cast<boost::math::uint32_t>(32670u),
+         static_cast<boost::math::uint32_t>(1925u),
+         static_cast<boost::math::uint32_t>(66u),
+         static_cast<boost::math::uint32_t>(1u)
+      };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[13] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[13] = {
          static_cast<T>(56906521.91347156388090791033559122686859L),
          static_cast<T>(103794043.1163445451906271053616070238554L),
          static_cast<T>(86363131.28813859145546927288977868422342L),
@@ -614,29 +612,31 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
          static_cast<T>(0.5098416655656676188125178644804694509993L),
          static_cast<T>(0.006061842346248906525783753964555936883222L)
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint32_t) denom[13] = {
-         static_cast<std::uint32_t>(0u),
-         static_cast<std::uint32_t>(39916800u),
-         static_cast<std::uint32_t>(120543840u),
-         static_cast<std::uint32_t>(150917976u),
-         static_cast<std::uint32_t>(105258076u),
-         static_cast<std::uint32_t>(45995730u),
-         static_cast<std::uint32_t>(13339535u),
-         static_cast<std::uint32_t>(2637558u),
-         static_cast<std::uint32_t>(357423u),
-         static_cast<std::uint32_t>(32670u),
-         static_cast<std::uint32_t>(1925u),
-         static_cast<std::uint32_t>(66u),
-         static_cast<std::uint32_t>(1u)
-      };
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint32_t) denom[13] = {
+         static_cast<boost::math::uint32_t>(0u),
+         static_cast<boost::math::uint32_t>(39916800u),
+         static_cast<boost::math::uint32_t>(120543840u),
+         static_cast<boost::math::uint32_t>(150917976u),
+         static_cast<boost::math::uint32_t>(105258076u),
+         static_cast<boost::math::uint32_t>(45995730u),
+         static_cast<boost::math::uint32_t>(13339535u),
+         static_cast<boost::math::uint32_t>(2637558u),
+         static_cast<boost::math::uint32_t>(357423u),
+         static_cast<boost::math::uint32_t>(32670u),
+         static_cast<boost::math::uint32_t>(1925u),
+         static_cast<boost::math::uint32_t>(66u),
+         static_cast<boost::math::uint32_t>(1u)
+      };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[12] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[12] = {
          static_cast<T>(2.208709979316623790862569924861841433016L),
          static_cast<T>(-3.327150580651624233553677113928873034916L),
          static_cast<T>(1.483082862367253753040442933770164111678L),
@@ -650,6 +650,7 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
          static_cast<T>(-0.2499505151487868335680273909354071938387e-8L),
          static_cast<T>(0.3394643171893132535170101292240837927725e-9L),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -659,9 +660,10 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[12] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[12] = {
          static_cast<T>(6.565936202082889535528455955485877361223L),
          static_cast<T>(-9.8907772644920670589288081640128194231L),
          static_cast<T>(4.408830289125943377923077727900630927902L),
@@ -675,6 +677,7 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
          static_cast<T>(-0.7430396708998719707642735577238449585822e-8L),
          static_cast<T>(0.1009141566987569892221439918230042368112e-8L),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -684,7 +687,7 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
       return result;
    }
 
-   static double g(){ return 6.024680040776729583740234375; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 6.024680040776729583740234375; }
 };
 
 //
@@ -692,16 +695,16 @@ struct lanczos13m53 : public std::integral_constant<int, 53>
 // Max experimental error (with arbitrary precision arithmetic) 2.7699e-26
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos17m64 : public std::integral_constant<int, 64>
+struct lanczos17m64 : public boost::math::integral_constant<int, 64>
 {
    //
    // Use for extended-double precision, when evaluated as an extended-double:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      lanczos_initializer<lanczos17m64, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[17] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[17] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 553681095419291969.2230556393350368550504)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 731918863887667017.2511276782146694632234)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 453393234285807339.4627124634539085143364)),
@@ -720,7 +723,7 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 488.0063567520005730476791712814838113252)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2.50662827463100050241576877135758834683))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint64_t) denom[17] = {
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint64_t) denom[17] = {
          BOOST_MATH_INT_VALUE_SUFFIX(0, uLL),
          BOOST_MATH_INT_VALUE_SUFFIX(1307674368000, uLL),
          BOOST_MATH_INT_VALUE_SUFFIX(4339163001600, uLL),
@@ -739,14 +742,15 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
          BOOST_MATH_INT_VALUE_SUFFIX(120, uLL),
          BOOST_MATH_INT_VALUE_SUFFIX(1, uLL)
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      lanczos_initializer<lanczos17m64, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[17] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[17] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2715894658327.717377557655133124376674911)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 3590179526097.912105038525528721129550434)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 2223966599737.814969312127353235818710172)),
@@ -765,7 +769,7 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.002393749522058449186690627996063983095463)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.1229541408909435212800785616808830746135e-4))
       };
-      static const BOOST_MATH_INT_TABLE_TYPE(T, std::uint64_t) denom[17] = {
+      BOOST_MATH_STATIC const BOOST_MATH_INT_TABLE_TYPE(T, boost::math::uint64_t) denom[17] = {
          BOOST_MATH_INT_VALUE_SUFFIX(0, uLL),
          BOOST_MATH_INT_VALUE_SUFFIX(1307674368000, uLL),
          BOOST_MATH_INT_VALUE_SUFFIX(4339163001600, uLL),
@@ -784,15 +788,16 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
          BOOST_MATH_INT_VALUE_SUFFIX(120, uLL),
          BOOST_MATH_INT_VALUE_SUFFIX(1, uLL)
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      lanczos_initializer<lanczos17m64, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[16] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[16] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 4.493645054286536365763334986866616581265)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -16.95716370392468543800733966378143997694)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 26.19196892983737527836811770970479846644)),
@@ -810,6 +815,7 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.1472114697343266749193617793755763792681e-15)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.1410901942033374651613542904678399264447e-16)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -819,10 +825,10 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      lanczos_initializer<lanczos17m64, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[16] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[16] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 23.56409085052261327114594781581930373708)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -88.92116338946308797946237246006238652361)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 137.3472822086847596961177383569603988797)),
@@ -840,6 +846,7 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, 0.7719578215795234036320348283011129450595e-15)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 64, -0.7398586479708476329563577384044188912075e-16)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -849,7 +856,7 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
       return result;
    }
 
-   static double g(){ return 12.2252227365970611572265625; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 12.2252227365970611572265625; }
 };
 
 //
@@ -857,16 +864,16 @@ struct lanczos17m64 : public std::integral_constant<int, 64>
 // Max experimental error (with arbitrary precision arithmetic) 1.0541e-38
 // Generated with compiler: Microsoft Visual C++ version 8.0 on Win32 at Mar 23 2006
 //
-struct lanczos24m113 : public std::integral_constant<int, 113>
+struct lanczos24m113 : public boost::math::integral_constant<int, 113>
 {
    //
    // Use for long-double precision, when evaluated as an long-double:
    //
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      lanczos_initializer<lanczos24m113, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[24] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[24] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 2029889364934367661624137213253.22102954656825019111612712252027267955023987678816620961507)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 2338599599286656537526273232565.2727349714338768161421882478417543004440597874814359063158)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 1288527989493833400335117708406.3953711906175960449186720680201425446299360322830739180195)),
@@ -892,7 +899,7 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 1151.61895453463992438325318456328526085882924197763140514450975619271382783957699017875304)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 2.50662827463100050241576528481104515966515623051532908941425544355490413900497467936202516))
       };
-      static const T denom[24] = {
+      BOOST_MATH_STATIC const T denom[24] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.0)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.112400072777760768e22)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.414847677933545472e22)),
@@ -918,14 +925,15 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 253.0)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 1.0))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      lanczos_initializer<lanczos24m113, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T num[24] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[24] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 3035162425359883494754.02878223286972654682199012688209026810841953293372712802258398358538)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 3496756894406430103600.16057175075063458536101374170860226963245118484234495645518505519827)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 1926652656689320888654.01954015145958293168365236755537645929361841917596501251362171653478)),
@@ -951,7 +959,7 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.172194142179211139195966608011235161516824700287310869949928393345257114743230967204370963e-5)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.374799931707148855771381263542708435935402853962736029347951399323367765509988401336565436e-8))
       };
-      static const T denom[24] = {
+      BOOST_MATH_STATIC const T denom[24] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.0)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.112400072777760768e22)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.414847677933545472e22)),
@@ -977,15 +985,16 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 253.0)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 1.0))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      lanczos_initializer<lanczos24m113, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[23] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[23] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 7.4734083002469026177867421609938203388868806387315406134072298925733950040583068760685908)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, -50.4225805042247530267317342133388132970816607563062253708655085754357843064134941138154171)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 152.288200621747008570784082624444625293884063492396162110698238568311211546361189979357019)),
@@ -1010,6 +1019,7 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, -0.615420597971283870342083342286977366161772327800327789325710571275345878439656918541092056e-25)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.499641233843540749369110053005439398774706583601830828776209650445427083113181961630763702e-26)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
       {
@@ -1019,10 +1029,10 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      lanczos_initializer<lanczos24m113, T>::force_instantiate(); // Ensure our constants get initialized before main()
-      static const T d[23] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[23] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 61.4165001061101455341808888883960361969557848005400286332291451422461117307237198559485365)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, -414.372973678657049667308134761613915623353625332248315105320470271523320700386200587519147)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 1251.50505818554680171298972755376376836161706773644771875668053742215217922228357204561873)),
@@ -1047,6 +1057,7 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, -0.505752900177513489906064295001851463338022055787536494321532352380960774349054239257683149e-24)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 113, 0.410605371184590959139968810080063542546949719163227555918846829816144878123034347778284006e-25)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for(unsigned k = 1; k <= sizeof(d)/sizeof(d[0]); ++k)
@@ -1056,7 +1067,7 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
       return result;
    }
 
-   static double g(){ return 20.3209821879863739013671875; }
+   BOOST_MATH_GPU_ENABLED static double g(){ return 20.3209821879863739013671875; }
 };
 
 //
@@ -1065,12 +1076,13 @@ struct lanczos24m113 : public std::integral_constant<int, 113>
 // Generated with compiler: Microsoft Visual C++ version 14.2 on Win32 at May 23 2021
 // Type precision was 134 bits or 42 max_digits10
 //
-struct lanczos27MP : public std::integral_constant<int, 134>
+struct lanczos27MP : public boost::math::integral_constant<int, 134>
 {
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[27] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[27] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 2.532923291341302819860952064783714673718970e+36)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 2.715272050979243637524956158081893927075092e+36)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.399396313336459710065708403038293278484916e+36)),
@@ -1099,7 +1111,7 @@ struct lanczos27MP : public std::integral_constant<int, 134>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.580741273679785112052701460119954412080073e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 2.506628274631000502415765284811045253005320e+00))
       };
-      static const T denom[27] = {
+      BOOST_MATH_STATIC const T denom[27] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 0.000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.551121004333098598400000000000000000000000e+25)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 5.919012881170120359936000000000000000000000e+25)),
@@ -1128,13 +1140,15 @@ struct lanczos27MP : public std::integral_constant<int, 134>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 3.250000000000000000000000000000000000000000e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[27] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[27] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 4.630539114451826442425094380936505531231478e+25)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 4.963898228350662244301785145431331232866294e+25)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 2.558292778812387748738731408569861630189290e+25)),
@@ -1163,7 +1177,7 @@ struct lanczos27MP : public std::integral_constant<int, 134>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 2.889816806780013044430000551700375309307825e-08)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 4.582468135039046226997146555551548992616343e-11))
       };
-      static const T denom[27] = {
+      BOOST_MATH_STATIC const T denom[27] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 0.000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.551121004333098598400000000000000000000000e+25)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 5.919012881170120359936000000000000000000000e+25)),
@@ -1192,14 +1206,16 @@ struct lanczos27MP : public std::integral_constant<int, 134>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 3.250000000000000000000000000000000000000000e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[34] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[34] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 6.264579889722939745225908247624593169040293e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, -3.470545597111704235784909052092266897169254e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 8.398164226943527197542310295220360303173237e+01)),
@@ -1235,6 +1251,7 @@ struct lanczos27MP : public std::integral_constant<int, 134>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, -2.542428477414786133402832964643707382175743e-24)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 1.409458057545117569935733339065832415295665e-25))
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
       {
@@ -1244,9 +1261,10 @@ struct lanczos27MP : public std::integral_constant<int, 134>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[34] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[34] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 4.391991857844535020743473289228849738381662e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, -2.433141291692735004291785549611375831426138e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 5.887812040849956173864447000497922705559488e+02)),
@@ -1282,6 +1300,7 @@ struct lanczos27MP : public std::integral_constant<int, 134>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, -1.782453950387991004107321678322483537333246e-23)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 134, 9.881473972208065873607436095608077625677024e-25)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
@@ -1291,10 +1310,10 @@ struct lanczos27MP : public std::integral_constant<int, 134>
       return result;
    }
 
-   static double g() { return 2.472513680905104038743047567550092935562134e+01; }
+   BOOST_MATH_GPU_ENABLED static double g() { return 2.472513680905104038743047567550092935562134e+01; }
 };
 
-inline double lanczos_g_near_1_and_2(const lanczos27MP&)
+BOOST_MATH_GPU_ENABLED inline double lanczos_g_near_1_and_2(const lanczos27MP&)
 {
    return 17.03623256087303;
 }
@@ -1305,12 +1324,13 @@ inline double lanczos_g_near_1_and_2(const lanczos27MP&)
 // Generated with compiler: Microsoft Visual C++ version 14.2 on Win32 at Oct 14 2019
 // Type precision was 168 bits or 53 max_digits10
 //
-struct lanczos35MP : public std::integral_constant<int, 168>
+struct lanczos35MP : public boost::math::integral_constant<int, 168>
 {
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[35] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[35] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 2.17215050716253100021302249837728942659410271586236104e+50)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 2.51055117651708470336913962553466820524801246971658127e+50)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 1.40813458996718289733677017073036013655624930344397267e+50)),
@@ -1347,7 +1367,7 @@ struct lanczos35MP : public std::integral_constant<int, 168>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 2.50897418653428667959996348205296461689142907811767371e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 2.50662827463100050241576528481104525300698674060984055e+00))
       };
-      static const T denom[35] = {
+      BOOST_MATH_STATIC const T denom[35] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 0.00000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 8.68331761881188649551819440128000000000000000000000000e+36)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 3.55043336733310191803732770947072000000000000000000000e+37)),
@@ -1384,13 +1404,15 @@ struct lanczos35MP : public std::integral_constant<int, 168>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 5.61000000000000000000000000000000000000000000000000000e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 1.00000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[35] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[35] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 2.84421398435712762388902267099927585742388886580864424e+37)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 3.28731583799033736725852757551292030085556435695468295e+37)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 1.84381150359300352571680869181416248982215282642834936e+37)),
@@ -1427,7 +1449,7 @@ struct lanczos35MP : public std::integral_constant<int, 168>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 3.28525092722679899458094768960179796663588010298597603e-10)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 3.28217919006153582429216342066702743329957749672852350e-13))
       };
-      static const T denom[35] = {
+      BOOST_MATH_STATIC const T denom[35] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 0.00000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 8.68331761881188649551819440128000000000000000000000000e+36)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 3.55043336733310191803732770947072000000000000000000000e+37)),
@@ -1464,14 +1486,16 @@ struct lanczos35MP : public std::integral_constant<int, 168>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 5.61000000000000000000000000000000000000000000000000000e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 1.00000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[42] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[42] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 8.2258008829795701933757823508857131818190413131511363e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, -6.1680809698202901664719598422224259984110345848176138e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 2.0937956909159916126016144892534179459545368045658870e+02)),
@@ -1515,6 +1539,7 @@ struct lanczos35MP : public std::integral_constant<int, 168>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 9.4607280988529299025458955706898751267120992042268667e-32)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, -4.2702032336418528894772149178970767164510337389404370e-33))
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
       {
@@ -1524,9 +1549,10 @@ struct lanczos35MP : public std::integral_constant<int, 168>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[42] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[42] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 7.3782193657165970743894979068466124765194827248379940e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, -5.5325256602067816772285455933211570612342576586214891e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 1.8780522570799869937961476290263461833002660531646012e+03)),
@@ -1570,6 +1596,7 @@ struct lanczos35MP : public std::integral_constant<int, 168>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, 8.4859004327675283792859615082199609974336399587796249e-31)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 168, -3.8302040910318742925508017945893539585506545571212821e-32)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
@@ -1579,10 +1606,10 @@ struct lanczos35MP : public std::integral_constant<int, 168>
       return result;
    }
 
-   static double g() { return 2.96640371531248092651367187500000000000000000000000000e+01; }
+   BOOST_MATH_GPU_ENABLED static double g() { return 2.96640371531248092651367187500000000000000000000000000e+01; }
 };
 
-inline double lanczos_g_near_1_and_2(const lanczos35MP&)
+BOOST_MATH_GPU_ENABLED inline double lanczos_g_near_1_and_2(const lanczos35MP&)
 {
    return 22.36563469469547;
 }
@@ -1592,12 +1619,13 @@ inline double lanczos_g_near_1_and_2(const lanczos35MP&)
 // Generated with compiler: Microsoft Visual C++ version 14.2 on Win32 at Oct 14 2019
 // Type precision was 201 bits or 63 max_digits10
 //
-struct lanczos48MP : public std::integral_constant<int, 201>
+struct lanczos48MP : public boost::math::integral_constant<int, 201>
 {
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[48] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[48] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 5.761757987425932419978923296640371540367427757167447418730589877e+70)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 8.723233313564421930629677035555276136256253817229396631458438691e+70)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 6.460052620548943146316510839385235752729444155384745952604400014e+70)),
@@ -1647,7 +1675,7 @@ struct lanczos48MP : public std::integral_constant<int, 201>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 3.749690888961891063146468955091435916957208840312184463551812828e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 2.506628274631000502415765284811045253006986740609938316629929233e+00))
       };
-      static const T denom[48] = {
+      BOOST_MATH_STATIC const T denom[48] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 0.000000000000000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 5.502622159812088949850305428800254892961651752960000000000000000e+57)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 2.430336111272256671478593169569751383305061494947840000000000000e+58)),
@@ -1697,13 +1725,15 @@ struct lanczos48MP : public std::integral_constant<int, 201>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.081000000000000000000000000000000000000000000000000000000000000e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.000000000000000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[48] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[48] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.775732062655417998910881298714821053061055705608286949609421120e+58)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 2.688437299644448784121592662352787426980194425446481703306505899e+58)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.990941408817264621124181941423397180231807676408175000011574647e+58)),
@@ -1753,7 +1783,7 @@ struct lanczos48MP : public std::integral_constant<int, 201>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.155627562127299657410444702080985966726894475302009989071093439e-09)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 7.725246714864934496649491688787278190129598018071339049048385845e-13))
       };
-      static const T denom[48] = {
+      BOOST_MATH_STATIC const T denom[48] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 0.000000000000000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 5.502622159812088949850305428800254892961651752960000000000000000e+57)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 2.430336111272256671478593169569751383305061494947840000000000000e+58)),
@@ -1803,14 +1833,16 @@ struct lanczos48MP : public std::integral_constant<int, 201>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.081000000000000000000000000000000000000000000000000000000000000e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.000000000000000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[47] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[47] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.059629332377126683204423480567078764834299559082175332563440691e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, -1.045539783916612448318159279915745234781500064405838259582295756e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 4.784116147862702971548198855631720823614071322755242269800139953e+02)),
@@ -1859,6 +1891,7 @@ struct lanczos48MP : public std::integral_constant<int, 201>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.819104328189909539214493755590516594857915205552841395610714917e-40)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, -7.261124772729210946163851510369531392121538686694430629664292782e-42))
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
       {
@@ -1868,9 +1901,10 @@ struct lanczos48MP : public std::integral_constant<int, 201>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[47] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[47] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 1.201442621036266842137537764128372139686555918574926377003612763e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, -1.185467427150643969519910927764836582205108528009141221591420898e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 5.424388386017623557963301151646679462091516489317860889362683594e+03)),
@@ -1919,6 +1953,7 @@ struct lanczos48MP : public std::integral_constant<int, 201>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, 2.062560373914843383483799612278119836498689222815662595453851079e-39)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 201, -8.232902310328177520527925464546117674377821202617522000849431630e-41)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
@@ -1928,7 +1963,7 @@ struct lanczos48MP : public std::integral_constant<int, 201>
       return result;
    }
 
-   static double g() { return 2.880805098265409469604492187500000000000000000000000000000000000e+01; }
+   BOOST_MATH_GPU_ENABLED static double g() { return 2.880805098265409469604492187500000000000000000000000000000000000e+01; }
 };
 //
 // Lanczos Coefficients for N=49 G=3.531905273437499914734871708787977695465087890625000000000000000000000000e+01
@@ -1936,12 +1971,13 @@ struct lanczos48MP : public std::integral_constant<int, 201>
 // Generated with compiler: Microsoft Visual C++ version 14.2 on Win32 at May 23 2021
 // Type precision was 234 bits or 72 max_digits10
 //
-struct lanczos49MP : public std::integral_constant<int, 234>
+struct lanczos49MP : public boost::math::integral_constant<int, 234>
 {
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[49] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[49] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 2.019754080776483553135944314398390557182640085494778723336498544843678485e+75)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 2.676059842235360762770131859925648183945167646928679564649946220888559950e+75)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.735650057396761011129552305882284776566019938011364428733911563803428382e+75)),
@@ -1992,7 +2028,7 @@ struct lanczos49MP : public std::integral_constant<int, 234>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 4.390800780998954208500039666019609185743083611214630479125238184115750385e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 2.506628274631000502415765284811045253006986740609938316629923576327386304e+00))
       };
-      static const T denom[49] = {
+      BOOST_MATH_STATIC const T denom[49] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 0.000000000000000000000000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 2.586232415111681806429643551536119799691976323891200000000000000000000000e+59)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.147760594457772724544789095126583405046340554378444800000000000000000000e+60)),
@@ -2043,13 +2079,15 @@ struct lanczos49MP : public std::integral_constant<int, 234>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.128000000000000000000000000000000000000000000000000000000000000000000000e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.000000000000000000000000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[49] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[49] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 9.256115936295239128792053510340342045264892843178101822334871337037830072e+59)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.226382973449509462464247401218271019985727521806127065773488938845990367e+60)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 7.954125855720840120393676022050001333138789037332565663424594891457273557e+59)),
@@ -2100,7 +2138,7 @@ struct lanczos49MP : public std::integral_constant<int, 234>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 2.012213341659767638341287600182102653785253052492980766472349845276996656e-12)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.148735984247176123115370642724455566337349193609892794757225210307646070e-15))
       };
-      static const T denom[49] = {
+      BOOST_MATH_STATIC const T denom[49] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 0.000000000000000000000000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 2.586232415111681806429643551536119799691976323891200000000000000000000000e+59)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.147760594457772724544789095126583405046340554378444800000000000000000000e+60)),
@@ -2151,14 +2189,16 @@ struct lanczos49MP : public std::integral_constant<int, 234>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.128000000000000000000000000000000000000000000000000000000000000000000000e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.000000000000000000000000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[48] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[48] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.233965513689195496302526816415068018137532804347903252026160914018410959e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, -1.432567696701419045483804034990696504881298696037704685583731202573594084e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 7.800990151010204780591569831451389602736047219596430673280355834870101274e+02)),
@@ -2208,6 +2248,7 @@ struct lanczos49MP : public std::integral_constant<int, 234>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 6.892571860428412953244204670046307154753124542150699703190076405369134986e-46)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, -2.750996769906711001487027901108989269217518777400665423098451353536180397e-47))
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
       {
@@ -2217,9 +2258,10 @@ struct lanczos49MP : public std::integral_constant<int, 234>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[48] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[48] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.614127734928823683399031924928203896697519780457812139739363243361356121e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, -1.873915620620241270111954934939697069495813017577862172724257417200307532e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 1.020433263568799913803105156119729477192007677199414299858195073560627451e+04)),
@@ -2269,6 +2311,7 @@ struct lanczos49MP : public std::integral_constant<int, 234>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, 9.016047273189589762707582112298788030798897468010511171850691914431226857e-45)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 234, -3.598528593988298984798384438686079221879557020145063999565131046963034260e-46)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
@@ -2278,10 +2321,10 @@ struct lanczos49MP : public std::integral_constant<int, 234>
       return result;
    }
 
-   static double g() { return 3.531905273437499914734871708787977695465087890625000000000000000000000000e+01; }
+   BOOST_MATH_GPU_ENABLED static double g() { return 3.531905273437499914734871708787977695465087890625000000000000000000000000e+01; }
 };
 
-inline double lanczos_g_near_1_and_2(const lanczos49MP&)
+BOOST_MATH_GPU_ENABLED inline double lanczos_g_near_1_and_2(const lanczos49MP&)
 {
    return 33.54638671875000;
 }
@@ -2292,12 +2335,13 @@ inline double lanczos_g_near_1_and_2(const lanczos49MP&)
 // Generated with compiler: Microsoft Visual C++ version 14.2 on Win32 at May 22 2021
 // Type precision was 267 bits or 82 max_digits10
 //
-struct lanczos52MP : public std::integral_constant<int, 267>
+struct lanczos52MP : public boost::math::integral_constant<int, 267>
 {
    template <class T>
-   static T lanczos_sum(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum(const T& z)
    {
-      static const T num[52] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[52] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 6.2155666558597192337239536765115831322604714024167432764126799013946738944179064162e+86)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 6.4127424062560995063147129656553600039438028633959646865531341376543275935920940510e+86)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 3.2432219642804430367752303997394644425738553439619047355470691880100895245432999409e+86)),
@@ -2351,7 +2395,7 @@ struct lanczos52MP : public std::integral_constant<int, 267>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 6.3192906485096381210566149918556620595525679738152760526187454875638091923687554946e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 2.5066282746310005024157652848110452530069867406099383166299235763422936546004304390e+00))
       };
-      static const T denom[52] = {
+      BOOST_MATH_STATIC const T denom[52] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 3.0414093201713378043612608166064768844377641568960512000000000000000000000000000000e+64)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.3683925049359750564345782687270252191318781054337155072000000000000000000000000000e+65)),
@@ -2405,13 +2449,15 @@ struct lanczos52MP : public std::integral_constant<int, 267>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.2750000000000000000000000000000000000000000000000000000000000000000000000000000000e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
    template <class T>
-   static T lanczos_sum_expG_scaled(const T& z)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_expG_scaled(const T& z)
    {
-      static const T num[52] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T num[52] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.2968364952374867351881152115042817894191583875220489481700563388077315440993668645e+65)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.3379758994539627857606593702434364057385206718035611620158459666404856221820703129e+65)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 6.7667661507089657936560642518188013126674666141084536651063996312630940638352438169e+64)),
@@ -2465,7 +2511,7 @@ struct lanczos52MP : public std::integral_constant<int, 267>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.3184778139696006596104645792244972612333458493576785210966728195969324996631733257e-18)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 5.2299125832253333486600023635817464870204660970908989075481425992405717273229096642e-22))
       };
-      static const T denom[52] = {
+      BOOST_MATH_STATIC const T denom[52] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 3.0414093201713378043612608166064768844377641568960512000000000000000000000000000000e+64)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.3683925049359750564345782687270252191318781054337155072000000000000000000000000000e+65)),
@@ -2519,14 +2565,16 @@ struct lanczos52MP : public std::integral_constant<int, 267>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.2750000000000000000000000000000000000000000000000000000000000000000000000000000000e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000e+00))
       };
+      // LCOV_EXCL_STOP
       return boost::math::tools::evaluate_rational(num, denom, z);
    }
 
 
    template<class T>
-   static T lanczos_sum_near_1(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_1(const T& dz)
    {
-      static const T d[56] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[56] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.4249481633301349696310814410227012806541100102720500928500445853537331413655453290e+01)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, -1.9263209672927829270913652941762375058727326960303110137656951784697992824730035351e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.2326134462101140657073655882621393643823409472993225649429843685598155061860815843e+03)),
@@ -2584,6 +2632,7 @@ struct lanczos52MP : public std::integral_constant<int, 267>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, -2.4634008445755689570224291035627638546740260971523702032261365019321949141711275488e-53)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 8.2246731300220072906782081133065950352668949898418513030190006777980796985877588993e-55))
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
       {
@@ -2593,9 +2642,10 @@ struct lanczos52MP : public std::integral_constant<int, 267>
    }
 
    template<class T>
-   static T lanczos_sum_near_2(const T& dz)
+   BOOST_MATH_GPU_ENABLED static T lanczos_sum_near_2(const T& dz)
    {
-      static const T d[56] = {
+      // LCOV_EXCL_START
+      BOOST_MATH_STATIC const T d[56] = {
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 2.1359871474796665853092357455924330354587340093067807143261699873815704783987359772e+02)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, -2.8875414095359657817766255009397774415784763914903057809977502598124862632510767554e+03)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.8476787764422274017528261804071971508619123082396685980448133660376964287516316704e+04)),
@@ -2653,6 +2703,7 @@ struct lanczos52MP : public std::integral_constant<int, 267>
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, -3.6926203201715401183464726950807528731521709827951454941037337126228208878967951308e-52)),
          static_cast<T>(BOOST_MATH_BIG_CONSTANT(T, 267, 1.2328726440751392123787631395330686880390176572387043105330275032212649717981066795e-53)),
       };
+      // LCOV_EXCL_STOP
       T result = 0;
       T z = dz + 2;
       for (unsigned k = 1; k <= sizeof(d) / sizeof(d[0]); ++k)
@@ -2662,10 +2713,10 @@ struct lanczos52MP : public std::integral_constant<int, 267>
       return result;
    }
 
-   static double g() { return 4.9921416015624998863131622783839702606201171875000000000000000000000000000000000000e+01; }
+   BOOST_MATH_GPU_ENABLED static double g() { return 4.9921416015624998863131622783839702606201171875000000000000000000000000000000000000e+01; }
 };
 
-inline double lanczos_g_near_1_and_2(const lanczos52MP&)
+BOOST_MATH_GPU_ENABLED inline double lanczos_g_near_1_and_2(const lanczos52MP&)
 {
    return 38.73733398437500;
 }
@@ -2674,24 +2725,24 @@ inline double lanczos_g_near_1_and_2(const lanczos52MP&)
 //
 // placeholder for no lanczos info available:
 //
-struct undefined_lanczos : public std::integral_constant<int, (std::numeric_limits<int>::max)() - 1> { };
+struct undefined_lanczos : public boost::math::integral_constant<int, (boost::math::numeric_limits<int>::max)() - 1> { };
 
 template <class Real, class Policy>
 struct lanczos
 {
-   static constexpr auto target_precision = policies::precision<Real, Policy>::type::value <= 0 ? (std::numeric_limits<int>::max)()-2 : 
+   BOOST_MATH_STATIC constexpr auto target_precision = policies::precision<Real, Policy>::type::value <= 0 ? (boost::math::numeric_limits<int>::max)()-2 : 
                                                                                                    policies::precision<Real, Policy>::type::value;
 
-   using type = typename std::conditional<(target_precision <= lanczos6m24::value), lanczos6m24, 
-                typename std::conditional<(target_precision <= lanczos13m53::value), lanczos13m53,
-                typename std::conditional<(target_precision <= lanczos11::value), lanczos11,
-                typename std::conditional<(target_precision <= lanczos17m64::value), lanczos17m64,
-                typename std::conditional<(target_precision <= lanczos24m113::value), lanczos24m113,
-                typename std::conditional<(target_precision <= lanczos27MP::value), lanczos27MP,
-                typename std::conditional<(target_precision <= lanczos35MP::value), lanczos35MP,
-                typename std::conditional<(target_precision <= lanczos48MP::value), lanczos48MP,
-                typename std::conditional<(target_precision <= lanczos49MP::value), lanczos49MP,
-                typename std::conditional<(target_precision <= lanczos52MP::value), lanczos52MP, undefined_lanczos>::type
+   using type = typename boost::math::conditional<(target_precision <= lanczos6m24::value), lanczos6m24, 
+                typename boost::math::conditional<(target_precision <= lanczos13m53::value), lanczos13m53,
+                typename boost::math::conditional<(target_precision <= lanczos11::value), lanczos11,
+                typename boost::math::conditional<(target_precision <= lanczos17m64::value), lanczos17m64,
+                typename boost::math::conditional<(target_precision <= lanczos24m113::value), lanczos24m113,
+                typename boost::math::conditional<(target_precision <= lanczos27MP::value), lanczos27MP,
+                typename boost::math::conditional<(target_precision <= lanczos35MP::value), lanczos35MP,
+                typename boost::math::conditional<(target_precision <= lanczos48MP::value), lanczos48MP,
+                typename boost::math::conditional<(target_precision <= lanczos49MP::value), lanczos49MP,
+                typename boost::math::conditional<(target_precision <= lanczos52MP::value), lanczos52MP, undefined_lanczos>::type
                 >::type>::type>::type>::type>::type>::type>::type>::type
                 >::type;
 };
@@ -2701,7 +2752,7 @@ struct lanczos
 } // namespace boost
 
 #if !defined(_CRAYC) && !defined(__CUDACC__) && (!defined(__GNUC__) || (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)))
-#if ((defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) || defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64)) && !defined(_MANAGED)
+#if ((defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) || defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64)) && !defined(_MANAGED) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
 #include <boost/math/special_functions/detail/lanczos_sse2.hpp>
 #endif
 #endif
diff --git a/inst/include/boost/math/special_functions/legendre.hpp b/inst/include/boost/math/special_functions/legendre.hpp
index 6af798e0d..5e7f0029a 100644
--- a/inst/include/boost/math/special_functions/legendre.hpp
+++ b/inst/include/boost/math/special_functions/legendre.hpp
@@ -206,6 +206,11 @@ std::vector<T> legendre_p_zeros_imp(int n, const Policy& pol)
                                               lower_bound, upper_bound,
                                               policies::digits<T, Policy>(),
                                               number_of_iterations);
+        if (number_of_iterations >= policies::get_max_root_iterations<Policy>())
+        {
+           policies::raise_evaluation_error<T>("legendre_p_zeros<%1%>", "Unable to locate solution in a reasonable time:"  // LCOV_EXCL_LINE
+              " either there is no answer or the answer is infinite.  Current best guess is %1%", x_nk, Policy()); // LCOV_EXCL_LINE
+        }
 
         BOOST_MATH_ASSERT(lower_bound < x_nk);
         BOOST_MATH_ASSERT(upper_bound > x_nk);
diff --git a/inst/include/boost/math/special_functions/log1p.hpp b/inst/include/boost/math/special_functions/log1p.hpp
index 9b8a8e0eb..758f60668 100644
--- a/inst/include/boost/math/special_functions/log1p.hpp
+++ b/inst/include/boost/math/special_functions/log1p.hpp
@@ -12,13 +12,14 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
-#include <cmath>
-#include <cstdint>
-#include <limits>
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/series.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/big_constant.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/promotion.hpp>
+#include <boost/math/tools/precision.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/assert.hpp>
@@ -47,16 +48,16 @@ namespace detail
   {
      typedef T result_type;
 
-     log1p_series(T x)
+     BOOST_MATH_GPU_ENABLED log1p_series(T x)
         : k(0), m_mult(-x), m_prod(-1){}
 
-     T operator()()
+     BOOST_MATH_GPU_ENABLED T operator()()
      {
         m_prod *= m_mult;
         return m_prod / ++k;
      }
 
-     int count()const
+     BOOST_MATH_GPU_ENABLED int count()const
      {
         return k;
      }
@@ -79,12 +80,12 @@ namespace detail
 // it performs no better than log(1+x): which is to say not very well at all.
 //
 template <class T, class Policy>
-T log1p_imp(T const & x, const Policy& pol, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED T log1p_imp(T const & x, const Policy& pol, const boost::math::integral_constant<int, 0>&)
 { // The function returns the natural logarithm of 1 + x.
    typedef typename tools::promote_args<T>::type result_type;
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::log1p<%1%>(%1%)";
+   constexpr auto function = "boost::math::log1p<%1%>(%1%)";
 
    if((x < -1) || (boost::math::isnan)(x))
       return policies::raise_domain_error<T>(
@@ -101,7 +102,7 @@ T log1p_imp(T const & x, const Policy& pol, const std::integral_constant<int, 0>
    if(a < tools::epsilon<result_type>())
       return x;
    detail::log1p_series<result_type> s(x);
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    result_type result = tools::sum_series(s, policies::get_epsilon<result_type, Policy>(), max_iter);
 
@@ -110,11 +111,11 @@ T log1p_imp(T const & x, const Policy& pol, const std::integral_constant<int, 0>
 }
 
 template <class T, class Policy>
-T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 53>&)
+BOOST_MATH_GPU_ENABLED T log1p_imp(T const& x, const Policy& pol, const boost::math::integral_constant<int, 53>&)
 { // The function returns the natural logarithm of 1 + x.
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::log1p<%1%>(%1%)";
+   constexpr auto function = "boost::math::log1p<%1%>(%1%)";
 
    if(x < -1)
       return policies::raise_domain_error<T>(
@@ -135,7 +136,7 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 53>
    // Expected Error Term:                         1.843e-017
    // Maximum Relative Change in Control Points:   8.138e-004
    // Max Error found at double precision =        3.250766e-016
-   static const T P[] = {
+   BOOST_MATH_STATIC const T P[] = {
        static_cast<T>(0.15141069795941984e-16L),
        static_cast<T>(0.35495104378055055e-15L),
        static_cast<T>(0.33333333333332835L),
@@ -145,7 +146,7 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 53>
        static_cast<T>(0.13703234928513215L),
        static_cast<T>(0.011294864812099712L)
      };
-   static const T Q[] = {
+   BOOST_MATH_STATIC const T Q[] = {
        static_cast<T>(1L),
        static_cast<T>(3.7274719063011499L),
        static_cast<T>(5.5387948649720334L),
@@ -163,11 +164,11 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 53>
 }
 
 template <class T, class Policy>
-T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 64>&)
+BOOST_MATH_GPU_ENABLED T log1p_imp(T const& x, const Policy& pol, const boost::math::integral_constant<int, 64>&)
 { // The function returns the natural logarithm of 1 + x.
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::log1p<%1%>(%1%)";
+   constexpr auto function = "boost::math::log1p<%1%>(%1%)";
 
    if(x < -1)
       return policies::raise_domain_error<T>(
@@ -188,7 +189,7 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 64>
    // Expected Error Term:                         8.088e-20
    // Maximum Relative Change in Control Points:   9.648e-05
    // Max Error found at long double precision =   2.242324e-19
-   static const T P[] = {
+   BOOST_MATH_STATIC const T P[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.807533446680736736712e-19),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.490881544804798926426e-18),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.333333333333333373941),
@@ -199,7 +200,7 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 64>
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.0706537026422828914622),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.00441709903782239229447)
    };
-   static const T Q[] = {
+   BOOST_MATH_STATIC const T Q[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 64, 4.26423872346263928361),
       BOOST_MATH_BIG_CONSTANT(T, 64, 7.48189472704477708962),
@@ -218,11 +219,11 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 64>
 }
 
 template <class T, class Policy>
-T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 24>&)
+BOOST_MATH_GPU_ENABLED T log1p_imp(T const& x, const Policy& pol, const boost::math::integral_constant<int, 24>&)
 { // The function returns the natural logarithm of 1 + x.
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::log1p<%1%>(%1%)";
+   constexpr auto function = "boost::math::log1p<%1%>(%1%)";
 
    if(x < -1)
       return policies::raise_domain_error<T>(
@@ -244,13 +245,13 @@ T log1p_imp(T const& x, const Policy& pol, const std::integral_constant<int, 24>
    // Maximum Relative Change in Control Points:   2.509e-04
    // Max Error found at double precision =        6.910422e-08
    // Max Error found at float precision =         8.357242e-08
-   static const T P[] = {
+   BOOST_MATH_STATIC const T P[] = {
       -0.671192866803148236519e-7L,
       0.119670999140731844725e-6L,
       0.333339469182083148598L,
       0.237827183019664122066L
    };
-   static const T Q[] = {
+   BOOST_MATH_STATIC const T Q[] = {
       1L,
       1.46348272586988539733L,
       0.497859871350117338894L,
@@ -268,22 +269,24 @@ struct log1p_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          do_init(tag());
       }
       template <int N>
-      static void do_init(const std::integral_constant<int, N>&){}
-      static void do_init(const std::integral_constant<int, 64>&)
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, N>&){}
+      BOOST_MATH_GPU_ENABLED static void do_init(const boost::math::integral_constant<int, 64>&)
       {
          boost::math::log1p(static_cast<T>(0.25), Policy());
       }
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
-   static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_STATIC const init initializer;
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -294,7 +297,7 @@ const typename log1p_initializer<T, Policy, tag>::init log1p_initializer<T, Poli
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type log1p(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type log1p(T x, const Policy&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -306,7 +309,7 @@ inline typename tools::promote_args<T>::type log1p(T x, const Policy&)
       policies::discrete_quantile<>,
       policies::assert_undefined<> >::type forwarding_policy;
 
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       precision_type::value <= 0 ? 0 :
       precision_type::value <= 53 ? 53 :
       precision_type::value <= 64 ? 64 : 0
@@ -328,7 +331,7 @@ inline typename tools::promote_args<T>::type log1p(T x, const Policy&)
 #if defined(BOOST_HAS_LOG1P) && !(defined(__osf__) && defined(__DECCXX_VER))
 #  ifdef BOOST_MATH_USE_C99
 template <class Policy>
-inline float log1p(float x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline float log1p(float x, const Policy& pol)
 {
    if(x < -1)
       return policies::raise_domain_error<float>(
@@ -340,7 +343,7 @@ inline float log1p(float x, const Policy& pol)
 }
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 template <class Policy>
-inline long double log1p(long double x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline long double log1p(long double x, const Policy& pol)
 {
    if(x < -1)
       return policies::raise_domain_error<long double>(
@@ -365,7 +368,7 @@ inline float log1p(float x, const Policy& pol)
 }
 #endif
 template <class Policy>
-inline double log1p(double x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline double log1p(double x, const Policy& pol)
 {
    if(x < -1)
       return policies::raise_domain_error<double>(
@@ -425,7 +428,7 @@ inline long double log1p(long double x, const Policy& pol)
 #endif
 
 template <class T>
-inline typename tools::promote_args<T>::type log1p(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type log1p(T x)
 {
    return boost::math::log1p(x, policies::policy<>());
 }
@@ -433,12 +436,12 @@ inline typename tools::promote_args<T>::type log1p(T x)
 // Compute log(1+x)-x:
 //
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    log1pmx(T x, const Policy& pol)
 {
    typedef typename tools::promote_args<T>::type result_type;
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::log1pmx<%1%>(%1%)";
+   constexpr auto function = "boost::math::log1pmx<%1%>(%1%)";
 
    if(x < -1)
       return policies::raise_domain_error<T>(
@@ -456,7 +459,7 @@ inline typename tools::promote_args<T>::type
       return -x * x / 2;
    boost::math::detail::log1p_series<T> s(x);
    s();
-   std::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
+   boost::math::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
 
    T result = boost::math::tools::sum_series(s, policies::get_epsilon<T, Policy>(), max_iter);
 
@@ -465,7 +468,7 @@ inline typename tools::promote_args<T>::type
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type log1pmx(T x)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type log1pmx(T x)
 {
    return log1pmx(x, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/math_fwd.hpp b/inst/include/boost/math/special_functions/math_fwd.hpp
index 7b9965140..91dde74cc 100644
--- a/inst/include/boost/math/special_functions/math_fwd.hpp
+++ b/inst/include/boost/math/special_functions/math_fwd.hpp
@@ -4,6 +4,7 @@
 
 // Copyright Paul A. Bristow 2006.
 // Copyright John Maddock 2006.
+// Copyright Matt Borland 2024
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -23,11 +24,91 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/promotion.hpp> // for argument promotion.
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/complex.hpp>
+#include <boost/math/policies/policy.hpp>
+
+#ifdef BOOST_MATH_HAS_NVRTC
+
+namespace boost {
+namespace math {
+
+template <class RT1, class RT2, class A>
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<RT1, RT2, A>::type
+beta(RT1 a, RT2 b, A arg);
+
+namespace detail{
+
+   template <class T, class U, class V>
+   struct ellint_3_result
+   {
+      using type = typename boost::math::conditional<
+         policies::is_policy<V>::value,
+         tools::promote_args_t<T, U>,
+         tools::promote_args_t<T, U, V>
+      >::type;
+   };
+
+   template <class T, class U>
+   struct expint_result
+   {
+      using type = typename boost::math::conditional<
+         policies::is_policy<U>::value,
+         tools::promote_args_t<T>,
+         typename tools::promote_args<U>::type
+      >::type;
+   };
+
+   typedef boost::math::integral_constant<int, 0> bessel_no_int_tag;      // No integer optimisation possible.
+   typedef boost::math::integral_constant<int, 1> bessel_maybe_int_tag;   // Maybe integer optimisation.
+   typedef boost::math::integral_constant<int, 2> bessel_int_tag;         // Definite integer optimisation.
+
+   template <class T1, class T2, class Policy>
+   struct bessel_traits
+   {
+      using result_type = typename boost::math::conditional<
+         boost::math::is_integral<T1>::value,
+         typename tools::promote_args<T2>::type,
+         tools::promote_args_t<T1, T2>
+      >::type;
+
+      typedef typename policies::precision<result_type, Policy>::type precision_type;
+
+      using optimisation_tag = typename boost::math::conditional<
+         (precision_type::value <= 0 || precision_type::value > 64),
+         bessel_no_int_tag,
+         typename boost::math::conditional<
+            boost::math::is_integral<T1>::value,
+            bessel_int_tag,
+            bessel_maybe_int_tag
+         >::type
+      >::type;
+
+      using optimisation_tag128 = typename boost::math::conditional<
+         (precision_type::value <= 0 || precision_type::value > 113),
+         bessel_no_int_tag,
+         typename boost::math::conditional<
+            boost::math::is_integral<T1>::value,
+            bessel_int_tag,
+            bessel_maybe_int_tag
+         >::type
+      >::type;
+   };
+
+} // namespace detail
+
+} // namespace math
+} // namespace boost
+
+#else
+
 #include <vector>
 #include <complex>
 #include <type_traits>
 #include <boost/math/special_functions/detail/round_fwd.hpp>
-#include <boost/math/tools/promotion.hpp> // for argument promotion.
+#include <boost/math/tools/type_traits.hpp>
 #include <boost/math/policies/policy.hpp>
 
 #define BOOST_NO_MACRO_EXPAND /**/
@@ -39,139 +120,139 @@ namespace boost
 
    // Beta functions.
    template <class RT1, class RT2>
-   tools::promote_args_t<RT1, RT2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2>
          beta(RT1 a, RT2 b); // Beta function (2 arguments).
 
    template <class RT1, class RT2, class A>
-   tools::promote_args_t<RT1, RT2, A>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, A>
          beta(RT1 a, RT2 b, A x); // Beta function (3 arguments).
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          beta(RT1 a, RT2 b, RT3 x, const Policy& pol); // Beta function (3 arguments).
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          betac(RT1 a, RT2 b, RT3 x);
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          betac(RT1 a, RT2 b, RT3 x, const Policy& pol);
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta(RT1 a, RT2 b, RT3 x); // Incomplete beta function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta(RT1 a, RT2 b, RT3 x, const Policy& pol); // Incomplete beta function.
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac(RT1 a, RT2 b, RT3 x); // Incomplete beta complement function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac(RT1 a, RT2 b, RT3 x, const Policy& pol); // Incomplete beta complement function.
 
    template <class T1, class T2, class T3, class T4>
-   tools::promote_args_t<T1, T2, T3, T4>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3, T4>
          ibeta_inv(T1 a, T2 b, T3 p, T4* py);
 
    template <class T1, class T2, class T3, class T4, class Policy>
-   tools::promote_args_t<T1, T2, T3, T4>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3, T4>
          ibeta_inv(T1 a, T2 b, T3 p, T4* py, const Policy& pol);
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_inv(RT1 a, RT2 b, RT3 p); // Incomplete beta inverse function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_inv(RT1 a, RT2 b, RT3 p, const Policy&); // Incomplete beta inverse function.
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_inva(RT1 a, RT2 b, RT3 p); // Incomplete beta inverse function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_inva(RT1 a, RT2 b, RT3 p, const Policy&); // Incomplete beta inverse function.
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_invb(RT1 a, RT2 b, RT3 p); // Incomplete beta inverse function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_invb(RT1 a, RT2 b, RT3 p, const Policy&); // Incomplete beta inverse function.
 
    template <class T1, class T2, class T3, class T4>
-   tools::promote_args_t<T1, T2, T3, T4>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3, T4>
          ibetac_inv(T1 a, T2 b, T3 q, T4* py);
 
    template <class T1, class T2, class T3, class T4, class Policy>
-   tools::promote_args_t<T1, T2, T3, T4>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3, T4>
          ibetac_inv(T1 a, T2 b, T3 q, T4* py, const Policy& pol);
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac_inv(RT1 a, RT2 b, RT3 q); // Incomplete beta complement inverse function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac_inv(RT1 a, RT2 b, RT3 q, const Policy&); // Incomplete beta complement inverse function.
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac_inva(RT1 a, RT2 b, RT3 q); // Incomplete beta complement inverse function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac_inva(RT1 a, RT2 b, RT3 q, const Policy&); // Incomplete beta complement inverse function.
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac_invb(RT1 a, RT2 b, RT3 q); // Incomplete beta complement inverse function.
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibetac_invb(RT1 a, RT2 b, RT3 q, const Policy&); // Incomplete beta complement inverse function.
 
    template <class RT1, class RT2, class RT3>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_derivative(RT1 a, RT2 b, RT3 x);  // derivative of incomplete beta
 
    template <class RT1, class RT2, class RT3, class Policy>
-   tools::promote_args_t<RT1, RT2, RT3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2, RT3>
          ibeta_derivative(RT1 a, RT2 b, RT3 x, const Policy& pol);  // derivative of incomplete beta
 
    // Binomial:
    template <class T, class Policy>
-   T binomial_coefficient(unsigned n, unsigned k, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED T binomial_coefficient(unsigned n, unsigned k, const Policy& pol);
    template <class T>
-   T binomial_coefficient(unsigned n, unsigned k);
+   BOOST_MATH_GPU_ENABLED T binomial_coefficient(unsigned n, unsigned k);
 
    // erf & erfc error functions.
    template <class RT> // Error function.
-   tools::promote_args_t<RT> erf(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erf(RT z);
    template <class RT, class Policy> // Error function.
-   tools::promote_args_t<RT> erf(RT z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erf(RT z, const Policy&);
 
    template <class RT>// Error function complement.
-   tools::promote_args_t<RT> erfc(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erfc(RT z);
    template <class RT, class Policy>// Error function complement.
-   tools::promote_args_t<RT> erfc(RT z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erfc(RT z, const Policy&);
 
    template <class RT>// Error function inverse.
-   tools::promote_args_t<RT> erf_inv(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erf_inv(RT z);
    template <class RT, class Policy>// Error function inverse.
-   tools::promote_args_t<RT> erf_inv(RT z, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erf_inv(RT z, const Policy& pol);
 
    template <class RT>// Error function complement inverse.
-   tools::promote_args_t<RT> erfc_inv(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erfc_inv(RT z);
    template <class RT, class Policy>// Error function complement inverse.
-   tools::promote_args_t<RT> erfc_inv(RT z, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> erfc_inv(RT z, const Policy& pol);
 
    // Polynomials:
    template <class T1, class T2, class T3>
@@ -250,15 +331,15 @@ namespace boost
       laguerre(unsigned n, T1 m, T2 x);
 
    template <class T>
-   tools::promote_args_t<T>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T>
       hermite(unsigned n, T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T>
       hermite(unsigned n, T x, const Policy& pol);
 
    template <class T1, class T2, class T3>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
       hermite_next(unsigned n, T1 x, T2 Hn, T3 Hnm1);
 
    template<class T1, class T2, class T3>
@@ -311,90 +392,90 @@ namespace boost
 
    // Elliptic integrals:
    template <class T1, class T2, class T3>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
          ellint_rf(T1 x, T2 y, T3 z);
 
    template <class T1, class T2, class T3, class Policy>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
          ellint_rf(T1 x, T2 y, T3 z, const Policy& pol);
 
    template <class T1, class T2, class T3>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
          ellint_rd(T1 x, T2 y, T3 z);
 
    template <class T1, class T2, class T3, class Policy>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
          ellint_rd(T1 x, T2 y, T3 z, const Policy& pol);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2>
          ellint_rc(T1 x, T2 y);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2>
          ellint_rc(T1 x, T2 y, const Policy& pol);
 
    template <class T1, class T2, class T3, class T4>
-   tools::promote_args_t<T1, T2, T3, T4>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3, T4>
          ellint_rj(T1 x, T2 y, T3 z, T4 p);
 
    template <class T1, class T2, class T3, class T4, class Policy>
-   tools::promote_args_t<T1, T2, T3, T4>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3, T4>
          ellint_rj(T1 x, T2 y, T3 z, T4 p, const Policy& pol);
 
    template <class T1, class T2, class T3>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
       ellint_rg(T1 x, T2 y, T3 z);
 
    template <class T1, class T2, class T3, class Policy>
-   tools::promote_args_t<T1, T2, T3>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3>
       ellint_rg(T1 x, T2 y, T3 z, const Policy& pol);
 
    template <typename T>
-   tools::promote_args_t<T> ellint_2(T k);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> ellint_2(T k);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> ellint_2(T1 k, T2 phi);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_2(T1 k, T2 phi);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> ellint_2(T1 k, T2 phi, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_2(T1 k, T2 phi, const Policy& pol);
 
    template <typename T>
-   tools::promote_args_t<T> ellint_1(T k);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> ellint_1(T k);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> ellint_1(T1 k, T2 phi);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_1(T1 k, T2 phi);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> ellint_1(T1 k, T2 phi, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_1(T1 k, T2 phi, const Policy& pol);
 
    template <typename T>
-   tools::promote_args_t<T> ellint_d(T k);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> ellint_d(T k);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> ellint_d(T1 k, T2 phi);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_d(T1 k, T2 phi);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> ellint_d(T1 k, T2 phi, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_d(T1 k, T2 phi, const Policy& pol);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> jacobi_zeta(T1 k, T2 phi);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> jacobi_zeta(T1 k, T2 phi);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> jacobi_zeta(T1 k, T2 phi, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> jacobi_zeta(T1 k, T2 phi, const Policy& pol);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> heuman_lambda(T1 k, T2 phi);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> heuman_lambda(T1 k, T2 phi);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> heuman_lambda(T1 k, T2 phi, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> heuman_lambda(T1 k, T2 phi, const Policy& pol);
 
    namespace detail{
 
    template <class T, class U, class V>
    struct ellint_3_result
    {
-      using type = typename std::conditional<
+      using type = typename boost::math::conditional<
          policies::is_policy<V>::value,
          tools::promote_args_t<T, U>,
          tools::promote_args_t<T, U, V>
@@ -405,28 +486,28 @@ namespace boost
 
 
    template <class T1, class T2, class T3>
-   typename detail::ellint_3_result<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi);
+   BOOST_MATH_GPU_ENABLED typename detail::ellint_3_result<T1, T2, T3>::type ellint_3(T1 k, T2 v, T3 phi);
 
    template <class T1, class T2, class T3, class Policy>
-   tools::promote_args_t<T1, T2, T3> ellint_3(T1 k, T2 v, T3 phi, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2, T3> ellint_3(T1 k, T2 v, T3 phi, const Policy& pol);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> ellint_3(T1 k, T2 v);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> ellint_3(T1 k, T2 v);
 
    // Factorial functions.
    // Note: not for integral types, at present.
    template <class RT>
    struct max_factorial;
    template <class RT>
-   RT factorial(unsigned int);
+   BOOST_MATH_GPU_ENABLED RT factorial(unsigned int);
    template <class RT, class Policy>
-   RT factorial(unsigned int, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED RT factorial(unsigned int, const Policy& pol);
    template <class RT>
-   RT unchecked_factorial(unsigned int BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(RT));
+   BOOST_MATH_GPU_ENABLED RT unchecked_factorial(unsigned int BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(RT));
    template <class RT>
-   RT double_factorial(unsigned i);
+   BOOST_MATH_GPU_ENABLED RT double_factorial(unsigned i);
    template <class RT, class Policy>
-   RT double_factorial(unsigned i, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED RT double_factorial(unsigned i, const Policy& pol);
 
    template <class RT>
    tools::promote_args_t<RT> falling_factorial(RT x, unsigned n);
@@ -442,106 +523,106 @@ namespace boost
 
    // Gamma functions.
    template <class RT>
-   tools::promote_args_t<RT> tgamma(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> tgamma(RT z);
 
    template <class RT>
-   tools::promote_args_t<RT> tgamma1pm1(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> tgamma1pm1(RT z);
 
    template <class RT, class Policy>
-   tools::promote_args_t<RT> tgamma1pm1(RT z, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> tgamma1pm1(RT z, const Policy& pol);
 
    template <class RT1, class RT2>
-   tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z);
 
    template <class RT1, class RT2, class Policy>
-   tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z, const Policy& pol);
 
    template <class RT>
-   tools::promote_args_t<RT> lgamma(RT z, int* sign);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> lgamma(RT z, int* sign);
 
    template <class RT, class Policy>
-   tools::promote_args_t<RT> lgamma(RT z, int* sign, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> lgamma(RT z, int* sign, const Policy& pol);
 
    template <class RT>
-   tools::promote_args_t<RT> lgamma(RT x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> lgamma(RT x);
 
    template <class RT, class Policy>
-   tools::promote_args_t<RT> lgamma(RT x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> lgamma(RT x, const Policy& pol);
 
    template <class RT1, class RT2>
-   tools::promote_args_t<RT1, RT2> tgamma_lower(RT1 a, RT2 z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> tgamma_lower(RT1 a, RT2 z);
 
    template <class RT1, class RT2, class Policy>
-   tools::promote_args_t<RT1, RT2> tgamma_lower(RT1 a, RT2 z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> tgamma_lower(RT1 a, RT2 z, const Policy&);
 
    template <class RT1, class RT2>
-   tools::promote_args_t<RT1, RT2> gamma_q(RT1 a, RT2 z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> gamma_q(RT1 a, RT2 z);
 
    template <class RT1, class RT2, class Policy>
-   tools::promote_args_t<RT1, RT2> gamma_q(RT1 a, RT2 z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> gamma_q(RT1 a, RT2 z, const Policy&);
 
    template <class RT1, class RT2>
-   tools::promote_args_t<RT1, RT2> gamma_p(RT1 a, RT2 z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> gamma_p(RT1 a, RT2 z);
 
    template <class RT1, class RT2, class Policy>
-   tools::promote_args_t<RT1, RT2> gamma_p(RT1 a, RT2 z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT1, RT2> gamma_p(RT1 a, RT2 z, const Policy&);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> tgamma_delta_ratio(T1 z, T2 delta);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> tgamma_delta_ratio(T1 z, T2 delta);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> tgamma_delta_ratio(T1 z, T2 delta, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> tgamma_delta_ratio(T1 z, T2 delta, const Policy&);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> tgamma_ratio(T1 a, T2 b);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> tgamma_ratio(T1 a, T2 b);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> tgamma_ratio(T1 a, T2 b, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> tgamma_ratio(T1 a, T2 b, const Policy&);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> gamma_p_derivative(T1 a, T2 x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_p_derivative(T1 a, T2 x);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> gamma_p_derivative(T1 a, T2 x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_p_derivative(T1 a, T2 x, const Policy&);
 
    // gamma inverse.
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> gamma_p_inv(T1 a, T2 p);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_p_inv(T1 a, T2 p);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> gamma_p_inva(T1 a, T2 p, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_p_inva(T1 a, T2 p, const Policy&);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> gamma_p_inva(T1 a, T2 p);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_p_inva(T1 a, T2 p);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> gamma_p_inv(T1 a, T2 p, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_p_inv(T1 a, T2 p, const Policy&);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> gamma_q_inv(T1 a, T2 q);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_q_inv(T1 a, T2 q);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> gamma_q_inv(T1 a, T2 q, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_q_inv(T1 a, T2 q, const Policy&);
 
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2> gamma_q_inva(T1 a, T2 q);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_q_inva(T1 a, T2 q);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2> gamma_q_inva(T1 a, T2 q, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2> gamma_q_inva(T1 a, T2 q, const Policy&);
 
    // digamma:
    template <class T>
-   tools::promote_args_t<T> digamma(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> digamma(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> digamma(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> digamma(T x, const Policy&);
 
    // trigamma:
    template <class T>
-   tools::promote_args_t<T> trigamma(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> trigamma(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> trigamma(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> trigamma(T x, const Policy&);
 
    // polygamma:
    template <class T>
@@ -552,63 +633,63 @@ namespace boost
 
    // Hypotenuse function sqrt(x ^ 2 + y ^ 2).
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2>
          hypot(T1 x, T2 y);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2>
          hypot(T1 x, T2 y, const Policy&);
 
    // cbrt - cube root.
    template <class RT>
-   tools::promote_args_t<RT> cbrt(RT z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> cbrt(RT z);
 
    template <class RT, class Policy>
-   tools::promote_args_t<RT> cbrt(RT z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<RT> cbrt(RT z, const Policy&);
 
    // log1p is log(x + 1)
    template <class T>
-   tools::promote_args_t<T> log1p(T);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> log1p(T);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> log1p(T, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> log1p(T, const Policy&);
 
    // log1pmx is log(x + 1) - x
    template <class T>
-   tools::promote_args_t<T> log1pmx(T);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> log1pmx(T);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> log1pmx(T, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> log1pmx(T, const Policy&);
 
    // Exp (x) minus 1 functions.
    template <class T>
-   tools::promote_args_t<T> expm1(T);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> expm1(T);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> expm1(T, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> expm1(T, const Policy&);
 
    // Power - 1
    template <class T1, class T2>
-   tools::promote_args_t<T1, T2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2>
          powm1(const T1 a, const T2 z);
 
    template <class T1, class T2, class Policy>
-   tools::promote_args_t<T1, T2>
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T1, T2>
          powm1(const T1 a, const T2 z, const Policy&);
 
    // sqrt(1+x) - 1
    template <class T>
-   tools::promote_args_t<T> sqrt1pm1(const T& val);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> sqrt1pm1(const T& val);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> sqrt1pm1(const T& val, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> sqrt1pm1(const T& val, const Policy&);
 
    // sinus cardinals:
    template <class T>
-   tools::promote_args_t<T> sinc_pi(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> sinc_pi(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> sinc_pi(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> sinc_pi(T x, const Policy&);
 
    template <class T>
    tools::promote_args_t<T> sinhc_pi(T x);
@@ -630,43 +711,43 @@ namespace boost
    tools::promote_args_t<T> acosh(T x, const Policy&);
 
    template<typename T>
-   tools::promote_args_t<T> atanh(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> atanh(T x);
 
    template<typename T, class Policy>
-   tools::promote_args_t<T> atanh(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> atanh(T x, const Policy&);
 
    namespace detail{
 
-      typedef std::integral_constant<int, 0> bessel_no_int_tag;      // No integer optimisation possible.
-      typedef std::integral_constant<int, 1> bessel_maybe_int_tag;   // Maybe integer optimisation.
-      typedef std::integral_constant<int, 2> bessel_int_tag;         // Definite integer optimisation.
+      typedef boost::math::integral_constant<int, 0> bessel_no_int_tag;      // No integer optimisation possible.
+      typedef boost::math::integral_constant<int, 1> bessel_maybe_int_tag;   // Maybe integer optimisation.
+      typedef boost::math::integral_constant<int, 2> bessel_int_tag;         // Definite integer optimisation.
 
       template <class T1, class T2, class Policy>
       struct bessel_traits
       {
-         using result_type = typename std::conditional<
-            std::is_integral<T1>::value,
+         using result_type = typename boost::math::conditional<
+            boost::math::is_integral<T1>::value,
             typename tools::promote_args<T2>::type,
             tools::promote_args_t<T1, T2>
          >::type;
 
          typedef typename policies::precision<result_type, Policy>::type precision_type;
 
-         using optimisation_tag = typename std::conditional<
+         using optimisation_tag = typename boost::math::conditional<
             (precision_type::value <= 0 || precision_type::value > 64),
             bessel_no_int_tag,
-            typename std::conditional<
-               std::is_integral<T1>::value,
+            typename boost::math::conditional<
+               boost::math::is_integral<T1>::value,
                bessel_int_tag,
                bessel_maybe_int_tag
             >::type
          >::type;
 
-         using optimisation_tag128 = typename std::conditional<
+         using optimisation_tag128 = typename boost::math::conditional<
             (precision_type::value <= 0 || precision_type::value > 113),
             bessel_no_int_tag,
-            typename std::conditional<
-               std::is_integral<T1>::value,
+            typename boost::math::conditional<
+               boost::math::is_integral<T1>::value,
                bessel_int_tag,
                bessel_maybe_int_tag
             >::type
@@ -676,223 +757,225 @@ namespace boost
 
    // Bessel functions:
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j(T1 v, T2 x, const Policy& pol);
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j_prime(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_j_prime(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_j(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_j(T1 v, T2 x);
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_j_prime(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_j_prime(T1 v, T2 x);
 
    template <class T, class Policy>
-   typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel(unsigned v, T x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel(unsigned v, T x, const Policy& pol);
    template <class T, class Policy>
-   typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel_prime(unsigned v, T x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, Policy>::result_type sph_bessel_prime(unsigned v, T x, const Policy& pol);
 
    template <class T>
-   typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_bessel(unsigned v, T x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_bessel(unsigned v, T x);
    template <class T>
-   typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_bessel_prime(unsigned v, T x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_bessel_prime(unsigned v, T x);
 
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i(T1 v, T2 x, const Policy& pol);
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i_prime(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_i_prime(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_i(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_i(T1 v, T2 x);
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_i_prime(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_i_prime(T1 v, T2 x);
 
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k(T1 v, T2 x, const Policy& pol);
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k_prime(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_bessel_k_prime(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_k(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_k(T1 v, T2 x);
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_k_prime(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_bessel_k_prime(T1 v, T2 x);
 
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann(T1 v, T2 x, const Policy& pol);
    template <class T1, class T2, class Policy>
-   typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann_prime(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, Policy>::result_type cyl_neumann_prime(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_neumann(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_neumann(T1 v, T2 x);
    template <class T1, class T2>
-   typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_neumann_prime(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type cyl_neumann_prime(T1 v, T2 x);
 
    template <class T, class Policy>
-   typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann(unsigned v, T x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann(unsigned v, T x, const Policy& pol);
    template <class T, class Policy>
-   typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann_prime(unsigned v, T x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, Policy>::result_type sph_neumann_prime(unsigned v, T x, const Policy& pol);
 
    template <class T>
-   typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_neumann(unsigned v, T x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_neumann(unsigned v, T x);
    template <class T>
-   typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_neumann_prime(unsigned v, T x);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, policies::policy<> >::result_type sph_neumann_prime(unsigned v, T x);
 
    template <class T, class Policy>
-   typename detail::bessel_traits<T, T, Policy>::result_type cyl_bessel_j_zero(T v, int m, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, Policy>::result_type cyl_bessel_j_zero(T v, int m, const Policy& pol);
 
    template <class T>
-   typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_bessel_j_zero(T v, int m);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_bessel_j_zero(T v, int m);
 
    template <class T, class OutputIterator>
-   OutputIterator cyl_bessel_j_zero(T v,
+   BOOST_MATH_GPU_ENABLED OutputIterator cyl_bessel_j_zero(T v,
                           int start_index,
                           unsigned number_of_zeros,
                           OutputIterator out_it);
 
    template <class T, class OutputIterator, class Policy>
-   OutputIterator cyl_bessel_j_zero(T v,
+   BOOST_MATH_GPU_ENABLED OutputIterator cyl_bessel_j_zero(T v,
                           int start_index,
                           unsigned number_of_zeros,
                           OutputIterator out_it,
                           const Policy&);
 
    template <class T, class Policy>
-   typename detail::bessel_traits<T, T, Policy>::result_type cyl_neumann_zero(T v, int m, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, Policy>::result_type cyl_neumann_zero(T v, int m, const Policy& pol);
 
    template <class T>
-   typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_neumann_zero(T v, int m);
+   BOOST_MATH_GPU_ENABLED typename detail::bessel_traits<T, T, policies::policy<> >::result_type cyl_neumann_zero(T v, int m);
 
    template <class T, class OutputIterator>
-   OutputIterator cyl_neumann_zero(T v,
+   BOOST_MATH_GPU_ENABLED OutputIterator cyl_neumann_zero(T v,
                          int start_index,
                          unsigned number_of_zeros,
                          OutputIterator out_it);
 
    template <class T, class OutputIterator, class Policy>
-   OutputIterator cyl_neumann_zero(T v,
+   BOOST_MATH_GPU_ENABLED OutputIterator cyl_neumann_zero(T v,
                          int start_index,
                          unsigned number_of_zeros,
                          OutputIterator out_it,
                          const Policy&);
 
    template <class T1, class T2>
-   std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_1(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_1(T1 v, T2 x);
 
    template <class T1, class T2, class Policy>
-   std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_1(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_1(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2, class Policy>
-   std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_2(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> cyl_hankel_2(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_2(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> cyl_hankel_2(T1 v, T2 x);
 
    template <class T1, class T2, class Policy>
-   std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_1(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_1(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_1(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_1(T1 v, T2 x);
 
    template <class T1, class T2, class Policy>
-   std::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_2(T1 v, T2 x, const Policy& pol);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, Policy>::result_type> sph_hankel_2(T1 v, T2 x, const Policy& pol);
 
    template <class T1, class T2>
-   std::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_2(T1 v, T2 x);
+   BOOST_MATH_GPU_ENABLED boost::math::complex<typename detail::bessel_traits<T1, T2, policies::policy<> >::result_type> sph_hankel_2(T1 v, T2 x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> airy_ai(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_ai(T x, const Policy&);
 
    template <class T>
-   tools::promote_args_t<T> airy_ai(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_ai(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> airy_bi(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_bi(T x, const Policy&);
 
    template <class T>
-   tools::promote_args_t<T> airy_bi(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_bi(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> airy_ai_prime(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_ai_prime(T x, const Policy&);
 
    template <class T>
-   tools::promote_args_t<T> airy_ai_prime(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_ai_prime(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> airy_bi_prime(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_bi_prime(T x, const Policy&);
 
    template <class T>
-   tools::promote_args_t<T> airy_bi_prime(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> airy_bi_prime(T x);
 
    template <class T>
-   T airy_ai_zero(int m);
+   BOOST_MATH_GPU_ENABLED T airy_ai_zero(int m);
    template <class T, class Policy>
-   T airy_ai_zero(int m, const Policy&);
+   BOOST_MATH_GPU_ENABLED T airy_ai_zero(int m, const Policy&);
 
    template <class OutputIterator>
-   OutputIterator airy_ai_zero(
+   BOOST_MATH_GPU_ENABLED OutputIterator airy_ai_zero(
                      int start_index,
                      unsigned number_of_zeros,
                      OutputIterator out_it);
    template <class OutputIterator, class Policy>
-   OutputIterator airy_ai_zero(
+   BOOST_MATH_GPU_ENABLED OutputIterator airy_ai_zero(
                      int start_index,
                      unsigned number_of_zeros,
                      OutputIterator out_it,
                      const Policy&);
 
    template <class T>
-   T airy_bi_zero(int m);
+   BOOST_MATH_GPU_ENABLED T airy_bi_zero(int m);
    template <class T, class Policy>
-   T airy_bi_zero(int m, const Policy&);
+   BOOST_MATH_GPU_ENABLED T airy_bi_zero(int m, const Policy&);
 
    template <class OutputIterator>
-   OutputIterator airy_bi_zero(
+   BOOST_MATH_GPU_ENABLED OutputIterator airy_bi_zero(
                      int start_index,
                      unsigned number_of_zeros,
                      OutputIterator out_it);
    template <class OutputIterator, class Policy>
-   OutputIterator airy_bi_zero(
+   BOOST_MATH_GPU_ENABLED OutputIterator airy_bi_zero(
                      int start_index,
                      unsigned number_of_zeros,
                      OutputIterator out_it,
                      const Policy&);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> sin_pi(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> sin_pi(T x, const Policy&);
 
    template <class T>
-   tools::promote_args_t<T> sin_pi(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> sin_pi(T x);
 
    template <class T, class Policy>
-   tools::promote_args_t<T> cos_pi(T x, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> cos_pi(T x, const Policy&);
 
    template <class T>
-   tools::promote_args_t<T> cos_pi(T x);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> cos_pi(T x);
 
    template <class T>
-   int fpclassify BOOST_NO_MACRO_EXPAND(T t);
+   BOOST_MATH_GPU_ENABLED int fpclassify BOOST_NO_MACRO_EXPAND(T t);
 
    template <class T>
-   bool isfinite BOOST_NO_MACRO_EXPAND(T z);
+   BOOST_MATH_GPU_ENABLED bool isfinite BOOST_NO_MACRO_EXPAND(T z);
 
    template <class T>
-   bool isinf BOOST_NO_MACRO_EXPAND(T t);
+   BOOST_MATH_GPU_ENABLED bool isinf BOOST_NO_MACRO_EXPAND(T t);
 
    template <class T>
-   bool isnan BOOST_NO_MACRO_EXPAND(T t);
+   BOOST_MATH_GPU_ENABLED bool isnan BOOST_NO_MACRO_EXPAND(T t);
 
    template <class T>
-   bool isnormal BOOST_NO_MACRO_EXPAND(T t);
+   BOOST_MATH_GPU_ENABLED bool isnormal BOOST_NO_MACRO_EXPAND(T t);
 
    template<class T>
-   int signbit BOOST_NO_MACRO_EXPAND(T x);
+   BOOST_MATH_GPU_ENABLED int signbit BOOST_NO_MACRO_EXPAND(T x);
 
    template <class T>
-   int sign BOOST_NO_MACRO_EXPAND(const T& z);
+   BOOST_MATH_GPU_ENABLED int sign BOOST_NO_MACRO_EXPAND(const T& z);
 
    template <class T, class U>
-   typename tools::promote_args_permissive<T, U>::type copysign BOOST_NO_MACRO_EXPAND(const T& x, const U& y);
+   BOOST_MATH_GPU_ENABLED typename tools::promote_args_permissive<T, U>::type 
+   copysign BOOST_NO_MACRO_EXPAND(const T& x, const U& y);
 
    template <class T>
-   typename tools::promote_args_permissive<T>::type changesign BOOST_NO_MACRO_EXPAND(const T& z);
+   BOOST_MATH_GPU_ENABLED typename tools::promote_args_permissive<T>::type 
+   changesign BOOST_NO_MACRO_EXPAND(const T& z);
 
    // Exponential integrals:
    namespace detail{
@@ -900,7 +983,7 @@ namespace boost
    template <class T, class U>
    struct expint_result
    {
-      typedef typename std::conditional<
+      typedef typename boost::math::conditional<
          policies::is_policy<U>::value,
          tools::promote_args_t<T>,
          typename tools::promote_args<U>::type
@@ -910,13 +993,13 @@ namespace boost
    } // namespace detail
 
    template <class T, class Policy>
-   tools::promote_args_t<T> expint(unsigned n, T z, const Policy&);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> expint(unsigned n, T z, const Policy&);
 
    template <class T, class U>
-   typename detail::expint_result<T, U>::type expint(T const z, U const u);
+   BOOST_MATH_GPU_ENABLED typename detail::expint_result<T, U>::type expint(T const z, U const u);
 
    template <class T>
-   tools::promote_args_t<T> expint(T z);
+   BOOST_MATH_GPU_ENABLED tools::promote_args_t<T> expint(T z);
 
    // Zeta:
    template <class T, class Policy>
@@ -1087,10 +1170,10 @@ namespace boost
 
    // pow:
    template <int N, typename T, class Policy>
-   BOOST_CXX14_CONSTEXPR tools::promote_args_t<T> pow(T base, const Policy& policy);
+   BOOST_MATH_GPU_ENABLED BOOST_MATH_CXX14_CONSTEXPR tools::promote_args_t<T> pow(T base, const Policy& policy);
 
    template <int N, typename T>
-   BOOST_CXX14_CONSTEXPR tools::promote_args_t<T> pow(T base);
+   BOOST_MATH_GPU_ENABLED BOOST_MATH_CXX14_CONSTEXPR tools::promote_args_t<T> pow(T base);
 
    // next:
    template <class T, class U, class Policy>
@@ -1191,13 +1274,13 @@ namespace boost
 #define BOOST_MATH_DETAIL_LL_FUNC(Policy)\
    \
    template <class T>\
-   inline T modf(const T& v, long long* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline T modf(const T& v, long long* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
    \
    template <class T>\
-   inline long long lltrunc(const T& v){ using boost::math::lltrunc; return lltrunc(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline long long lltrunc(const T& v){ using boost::math::lltrunc; return lltrunc(v, Policy()); }\
    \
    template <class T>\
-   inline long long llround(const T& v){ using boost::math::llround; return llround(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline long long llround(const T& v){ using boost::math::llround; return llround(v, Policy()); }\
 
 #  define BOOST_MATH_DETAIL_11_FUNC(Policy)\
    template <class T, class U, class V>\
@@ -1210,74 +1293,74 @@ namespace boost
    BOOST_MATH_DETAIL_11_FUNC(Policy)\
    \
    template <class RT1, class RT2>\
-   inline boost::math::tools::promote_args_t<RT1, RT2> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2> \
    beta(RT1 a, RT2 b) { return ::boost::math::beta(a, b, Policy()); }\
 \
    template <class RT1, class RT2, class A>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, A> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, A> \
    beta(RT1 a, RT2 b, A x){ return ::boost::math::beta(a, b, x, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    betac(RT1 a, RT2 b, RT3 x) { return ::boost::math::betac(a, b, x, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibeta(RT1 a, RT2 b, RT3 x){ return ::boost::math::ibeta(a, b, x, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibetac(RT1 a, RT2 b, RT3 x){ return ::boost::math::ibetac(a, b, x, Policy()); }\
 \
    template <class T1, class T2, class T3, class T4>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3, T4>  \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3, T4>  \
    ibeta_inv(T1 a, T2 b, T3 p, T4* py){ return ::boost::math::ibeta_inv(a, b, p, py, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibeta_inv(RT1 a, RT2 b, RT3 p){ return ::boost::math::ibeta_inv(a, b, p, Policy()); }\
 \
    template <class T1, class T2, class T3, class T4>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3, T4> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3, T4> \
    ibetac_inv(T1 a, T2 b, T3 q, T4* py){ return ::boost::math::ibetac_inv(a, b, q, py, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibeta_inva(RT1 a, RT2 b, RT3 p){ return ::boost::math::ibeta_inva(a, b, p, Policy()); }\
 \
    template <class T1, class T2, class T3>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3> \
    ibetac_inva(T1 a, T2 b, T3 q){ return ::boost::math::ibetac_inva(a, b, q, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibeta_invb(RT1 a, RT2 b, RT3 p){ return ::boost::math::ibeta_invb(a, b, p, Policy()); }\
 \
    template <class T1, class T2, class T3>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3> \
    ibetac_invb(T1 a, T2 b, T3 q){ return ::boost::math::ibetac_invb(a, b, q, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibetac_inv(RT1 a, RT2 b, RT3 q){ return ::boost::math::ibetac_inv(a, b, q, Policy()); }\
 \
    template <class RT1, class RT2, class RT3>\
-   inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2, RT3> \
    ibeta_derivative(RT1 a, RT2 b, RT3 x){ return ::boost::math::ibeta_derivative(a, b, x, Policy()); }\
 \
-   template <class T> T binomial_coefficient(unsigned n, unsigned k){ return ::boost::math::binomial_coefficient<T, Policy>(n, k, Policy()); }\
+   template <class T> BOOST_MATH_GPU_ENABLED T binomial_coefficient(unsigned n, unsigned k){ return ::boost::math::binomial_coefficient<T, Policy>(n, k, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> erf(RT z) { return ::boost::math::erf(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> erf(RT z) { return ::boost::math::erf(z, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> erfc(RT z){ return ::boost::math::erfc(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> erfc(RT z){ return ::boost::math::erfc(z, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> erf_inv(RT z) { return ::boost::math::erf_inv(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> erf_inv(RT z) { return ::boost::math::erf_inv(z, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> erfc_inv(RT z){ return ::boost::math::erfc_inv(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> erfc_inv(RT z){ return ::boost::math::erfc_inv(z, Policy()); }\
 \
    using boost::math::legendre_next;\
 \
@@ -1310,7 +1393,7 @@ namespace boost
    laguerre(unsigned n, T1 m, T2 x) { return ::boost::math::laguerre(n, m, x, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> \
    hermite(unsigned n, T x){ return ::boost::math::hermite(n, x, Policy()); }\
 \
    using boost::math::hermite_next;\
@@ -1345,145 +1428,145 @@ namespace boost
       spherical_harmonic_i(unsigned n, int m, T1 theta, T2 phi, const Policy& pol);\
 \
    template <class T1, class T2, class T3>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3> \
    ellint_rf(T1 x, T2 y, T3 z){ return ::boost::math::ellint_rf(x, y, z, Policy()); }\
 \
    template <class T1, class T2, class T3>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3> \
    ellint_rd(T1 x, T2 y, T3 z){ return ::boost::math::ellint_rd(x, y, z, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> \
    ellint_rc(T1 x, T2 y){ return ::boost::math::ellint_rc(x, y, Policy()); }\
 \
    template <class T1, class T2, class T3, class T4>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3, T4> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3, T4> \
    ellint_rj(T1 x, T2 y, T3 z, T4 p){ return boost::math::ellint_rj(x, y, z, p, Policy()); }\
 \
    template <class T1, class T2, class T3>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3> \
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3> \
    ellint_rg(T1 x, T2 y, T3 z){ return ::boost::math::ellint_rg(x, y, z, Policy()); }\
    \
    template <typename T>\
-   inline boost::math::tools::promote_args_t<T> ellint_2(T k){ return boost::math::ellint_2(k, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> ellint_2(T k){ return boost::math::ellint_2(k, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> ellint_2(T1 k, T2 phi){ return boost::math::ellint_2(k, phi, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> ellint_2(T1 k, T2 phi){ return boost::math::ellint_2(k, phi, Policy()); }\
 \
    template <typename T>\
-   inline boost::math::tools::promote_args_t<T> ellint_d(T k){ return boost::math::ellint_d(k, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> ellint_d(T k){ return boost::math::ellint_d(k, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> ellint_d(T1 k, T2 phi){ return boost::math::ellint_d(k, phi, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> ellint_d(T1 k, T2 phi){ return boost::math::ellint_d(k, phi, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> jacobi_zeta(T1 k, T2 phi){ return boost::math::jacobi_zeta(k, phi, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> jacobi_zeta(T1 k, T2 phi){ return boost::math::jacobi_zeta(k, phi, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> heuman_lambda(T1 k, T2 phi){ return boost::math::heuman_lambda(k, phi, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> heuman_lambda(T1 k, T2 phi){ return boost::math::heuman_lambda(k, phi, Policy()); }\
 \
    template <typename T>\
-   inline boost::math::tools::promote_args_t<T> ellint_1(T k){ return boost::math::ellint_1(k, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> ellint_1(T k){ return boost::math::ellint_1(k, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> ellint_1(T1 k, T2 phi){ return boost::math::ellint_1(k, phi, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> ellint_1(T1 k, T2 phi){ return boost::math::ellint_1(k, phi, Policy()); }\
 \
    template <class T1, class T2, class T3>\
-   inline boost::math::tools::promote_args_t<T1, T2, T3> ellint_3(T1 k, T2 v, T3 phi){ return boost::math::ellint_3(k, v, phi, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2, T3> ellint_3(T1 k, T2 v, T3 phi){ return boost::math::ellint_3(k, v, phi, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> ellint_3(T1 k, T2 v){ return boost::math::ellint_3(k, v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> ellint_3(T1 k, T2 v){ return boost::math::ellint_3(k, v, Policy()); }\
 \
    using boost::math::max_factorial;\
    template <class RT>\
-   inline RT factorial(unsigned int i) { return boost::math::factorial<RT>(i, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline RT factorial(unsigned int i) { return boost::math::factorial<RT>(i, Policy()); }\
    using boost::math::unchecked_factorial;\
    template <class RT>\
-   inline RT double_factorial(unsigned i){ return boost::math::double_factorial<RT>(i, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline RT double_factorial(unsigned i){ return boost::math::double_factorial<RT>(i, Policy()); }\
    template <class RT>\
    inline boost::math::tools::promote_args_t<RT> falling_factorial(RT x, unsigned n){ return boost::math::falling_factorial(x, n, Policy()); }\
    template <class RT>\
    inline boost::math::tools::promote_args_t<RT> rising_factorial(RT x, unsigned n){ return boost::math::rising_factorial(x, n, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> tgamma(RT z){ return boost::math::tgamma(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> tgamma(RT z){ return boost::math::tgamma(z, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> tgamma1pm1(RT z){ return boost::math::tgamma1pm1(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> tgamma1pm1(RT z){ return boost::math::tgamma1pm1(z, Policy()); }\
 \
    template <class RT1, class RT2>\
-   inline boost::math::tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z){ return boost::math::tgamma(a, z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2> tgamma(RT1 a, RT2 z){ return boost::math::tgamma(a, z, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> lgamma(RT z, int* sign){ return boost::math::lgamma(z, sign, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> lgamma(RT z, int* sign){ return boost::math::lgamma(z, sign, Policy()); }\
 \
    template <class RT>\
-   inline boost::math::tools::promote_args_t<RT> lgamma(RT x){ return boost::math::lgamma(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT> lgamma(RT x){ return boost::math::lgamma(x, Policy()); }\
 \
    template <class RT1, class RT2>\
-   inline boost::math::tools::promote_args_t<RT1, RT2> tgamma_lower(RT1 a, RT2 z){ return boost::math::tgamma_lower(a, z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2> tgamma_lower(RT1 a, RT2 z){ return boost::math::tgamma_lower(a, z, Policy()); }\
 \
    template <class RT1, class RT2>\
-   inline boost::math::tools::promote_args_t<RT1, RT2> gamma_q(RT1 a, RT2 z){ return boost::math::gamma_q(a, z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2> gamma_q(RT1 a, RT2 z){ return boost::math::gamma_q(a, z, Policy()); }\
 \
    template <class RT1, class RT2>\
-   inline boost::math::tools::promote_args_t<RT1, RT2> gamma_p(RT1 a, RT2 z){ return boost::math::gamma_p(a, z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<RT1, RT2> gamma_p(RT1 a, RT2 z){ return boost::math::gamma_p(a, z, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> tgamma_delta_ratio(T1 z, T2 delta){ return boost::math::tgamma_delta_ratio(z, delta, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> tgamma_delta_ratio(T1 z, T2 delta){ return boost::math::tgamma_delta_ratio(z, delta, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> tgamma_ratio(T1 a, T2 b) { return boost::math::tgamma_ratio(a, b, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> tgamma_ratio(T1 a, T2 b) { return boost::math::tgamma_ratio(a, b, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> gamma_p_derivative(T1 a, T2 x){ return boost::math::gamma_p_derivative(a, x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> gamma_p_derivative(T1 a, T2 x){ return boost::math::gamma_p_derivative(a, x, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> gamma_p_inv(T1 a, T2 p){ return boost::math::gamma_p_inv(a, p, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> gamma_p_inv(T1 a, T2 p){ return boost::math::gamma_p_inv(a, p, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> gamma_p_inva(T1 a, T2 p){ return boost::math::gamma_p_inva(a, p, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> gamma_p_inva(T1 a, T2 p){ return boost::math::gamma_p_inva(a, p, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> gamma_q_inv(T1 a, T2 q){ return boost::math::gamma_q_inv(a, q, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> gamma_q_inv(T1 a, T2 q){ return boost::math::gamma_q_inv(a, q, Policy()); }\
 \
    template <class T1, class T2>\
-   inline boost::math::tools::promote_args_t<T1, T2> gamma_q_inva(T1 a, T2 q){ return boost::math::gamma_q_inva(a, q, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T1, T2> gamma_q_inva(T1 a, T2 q){ return boost::math::gamma_q_inva(a, q, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> digamma(T x){ return boost::math::digamma(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> digamma(T x){ return boost::math::digamma(x, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> trigamma(T x){ return boost::math::trigamma(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> trigamma(T x){ return boost::math::trigamma(x, Policy()); }\
 \
    template <class T>\
    inline boost::math::tools::promote_args_t<T> polygamma(int n, T x){ return boost::math::polygamma(n, x, Policy()); }\
    \
    template <class T1, class T2>\
    inline boost::math::tools::promote_args_t<T1, T2> \
-   hypot(T1 x, T2 y){ return boost::math::hypot(x, y, Policy()); }\
+   BOOST_MATH_GPU_ENABLED hypot(T1 x, T2 y){ return boost::math::hypot(x, y, Policy()); }\
 \
    template <class RT>\
    inline boost::math::tools::promote_args_t<RT> cbrt(RT z){ return boost::math::cbrt(z, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> log1p(T x){ return boost::math::log1p(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> log1p(T x){ return boost::math::log1p(x, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> log1pmx(T x){ return boost::math::log1pmx(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> log1pmx(T x){ return boost::math::log1pmx(x, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> expm1(T x){ return boost::math::expm1(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> expm1(T x){ return boost::math::expm1(x, Policy()); }\
 \
    template <class T1, class T2>\
    inline boost::math::tools::promote_args_t<T1, T2> \
-   powm1(const T1 a, const T2 z){ return boost::math::powm1(a, z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED powm1(const T1 a, const T2 z){ return boost::math::powm1(a, z, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> sqrt1pm1(const T& val){ return boost::math::sqrt1pm1(val, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> sqrt1pm1(const T& val){ return boost::math::sqrt1pm1(val, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> sinc_pi(T x){ return boost::math::sinc_pi(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> sinc_pi(T x){ return boost::math::sinc_pi(x, Policy()); }\
 \
    template <class T>\
    inline boost::math::tools::promote_args_t<T> sinhc_pi(T x){ return boost::math::sinhc_pi(x, Policy()); }\
@@ -1495,7 +1578,7 @@ namespace boost
    inline boost::math::tools::promote_args_t<T> acosh(const T x){ return boost::math::acosh(x, Policy()); }\
 \
    template<typename T>\
-   inline boost::math::tools::promote_args_t<T> atanh(const T x){ return boost::math::atanh(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> atanh(const T x){ return boost::math::atanh(x, Policy()); }\
 \
    template <class T1, class T2>\
    inline typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type cyl_bessel_j(T1 v, T2 x)\
@@ -1568,10 +1651,10 @@ template <class OutputIterator, class T>\
    { boost::math::cyl_neumann_zero(v, start_index, number_of_zeros, out_it, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> sin_pi(T x){ return boost::math::sin_pi(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> sin_pi(T x){ return boost::math::sin_pi(x, Policy()); }\
 \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> cos_pi(T x){ return boost::math::cos_pi(x, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> cos_pi(T x){ return boost::math::cos_pi(x, Policy()); }\
 \
    using boost::math::fpclassify;\
    using boost::math::isfinite;\
@@ -1584,44 +1667,44 @@ template <class OutputIterator, class T>\
    using boost::math::changesign;\
    \
    template <class T, class U>\
-   inline typename boost::math::tools::promote_args_t<T,U> expint(T const& z, U const& u)\
+   BOOST_MATH_GPU_ENABLED inline typename boost::math::tools::promote_args_t<T,U> expint(T const& z, U const& u)\
    { return boost::math::expint(z, u, Policy()); }\
    \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> expint(T z){ return boost::math::expint(z, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> expint(T z){ return boost::math::expint(z, Policy()); }\
    \
    template <class T>\
    inline boost::math::tools::promote_args_t<T> zeta(T s){ return boost::math::zeta(s, Policy()); }\
    \
    template <class T>\
-   inline T round(const T& v){ using boost::math::round; return round(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline T round(const T& v){ using boost::math::round; return round(v, Policy()); }\
    \
    template <class T>\
-   inline int iround(const T& v){ using boost::math::iround; return iround(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline int iround(const T& v){ using boost::math::iround; return iround(v, Policy()); }\
    \
    template <class T>\
-   inline long lround(const T& v){ using boost::math::lround; return lround(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline long lround(const T& v){ using boost::math::lround; return lround(v, Policy()); }\
    \
    template <class T>\
-   inline T trunc(const T& v){ using boost::math::trunc; return trunc(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline T trunc(const T& v){ using boost::math::trunc; return trunc(v, Policy()); }\
    \
    template <class T>\
-   inline int itrunc(const T& v){ using boost::math::itrunc; return itrunc(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline int itrunc(const T& v){ using boost::math::itrunc; return itrunc(v, Policy()); }\
    \
    template <class T>\
-   inline long ltrunc(const T& v){ using boost::math::ltrunc; return ltrunc(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline long ltrunc(const T& v){ using boost::math::ltrunc; return ltrunc(v, Policy()); }\
    \
    template <class T>\
-   inline T modf(const T& v, T* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline T modf(const T& v, T* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
    \
    template <class T>\
-   inline T modf(const T& v, int* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline T modf(const T& v, int* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
    \
    template <class T>\
-   inline T modf(const T& v, long* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline T modf(const T& v, long* ipart){ using boost::math::modf; return modf(v, ipart, Policy()); }\
    \
    template <int N, class T>\
-   inline boost::math::tools::promote_args_t<T> pow(T v){ return boost::math::pow<N>(v, Policy()); }\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> pow(T v){ return boost::math::pow<N>(v, Policy()); }\
    \
    template <class T> T nextafter(const T& a, const T& b){ return static_cast<T>(boost::math::nextafter(a, b, Policy())); }\
    template <class T> T float_next(const T& a){ return static_cast<T>(boost::math::float_next(a, Policy())); }\
@@ -1633,19 +1716,19 @@ template <class OutputIterator, class T>\
    inline boost::math::tools::promote_args_t<RT1, RT2> owens_t(RT1 a, RT2 z){ return boost::math::owens_t(a, z, Policy()); }\
    \
    template <class T1, class T2>\
-   inline std::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> cyl_hankel_1(T1 v, T2 x)\
+   inline BOOST_MATH_GPU_ENABLED boost::math::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> cyl_hankel_1(T1 v, T2 x)\
    {  return boost::math::cyl_hankel_1(v, x, Policy()); }\
    \
    template <class T1, class T2>\
-   inline std::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> cyl_hankel_2(T1 v, T2 x)\
+   inline BOOST_MATH_GPU_ENABLED boost::math::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> cyl_hankel_2(T1 v, T2 x)\
    { return boost::math::cyl_hankel_2(v, x, Policy()); }\
    \
    template <class T1, class T2>\
-   inline std::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> sph_hankel_1(T1 v, T2 x)\
+   inline BOOST_MATH_GPU_ENABLED boost::math::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> sph_hankel_1(T1 v, T2 x)\
    { return boost::math::sph_hankel_1(v, x, Policy()); }\
    \
    template <class T1, class T2>\
-   inline std::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> sph_hankel_2(T1 v, T2 x)\
+   inline BOOST_MATH_GPU_ENABLED boost::math::complex<typename boost::math::detail::bessel_traits<T1, T2, Policy >::result_type> sph_hankel_2(T1 v, T2 x)\
    { return boost::math::sph_hankel_2(v, x, Policy()); }\
    \
    template <class T>\
@@ -1749,33 +1832,33 @@ template <class OutputIterator, class T>\
    { return boost::math::jacobi_theta4m1tau(z, q, Policy()); }\
    \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> airy_ai(T x)\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> airy_ai(T x)\
    {  return boost::math::airy_ai(x, Policy());  }\
    \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> airy_bi(T x)\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> airy_bi(T x)\
    {  return boost::math::airy_bi(x, Policy());  }\
    \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> airy_ai_prime(T x)\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> airy_ai_prime(T x)\
    {  return boost::math::airy_ai_prime(x, Policy());  }\
    \
    template <class T>\
-   inline boost::math::tools::promote_args_t<T> airy_bi_prime(T x)\
+   BOOST_MATH_GPU_ENABLED inline boost::math::tools::promote_args_t<T> airy_bi_prime(T x)\
    {  return boost::math::airy_bi_prime(x, Policy());  }\
    \
    template <class T>\
-   inline T airy_ai_zero(int m)\
+   BOOST_MATH_GPU_ENABLED inline T airy_ai_zero(int m)\
    { return boost::math::airy_ai_zero<T>(m, Policy()); }\
    template <class T, class OutputIterator>\
-   OutputIterator airy_ai_zero(int start_index, unsigned number_of_zeros, OutputIterator out_it)\
+   BOOST_MATH_GPU_ENABLED OutputIterator airy_ai_zero(int start_index, unsigned number_of_zeros, OutputIterator out_it)\
    { return boost::math::airy_ai_zero<T>(start_index, number_of_zeros, out_it, Policy()); }\
    \
    template <class T>\
-   inline T airy_bi_zero(int m)\
+   BOOST_MATH_GPU_ENABLED inline T airy_bi_zero(int m)\
    { return boost::math::airy_bi_zero<T>(m, Policy()); }\
    template <class T, class OutputIterator>\
-   OutputIterator airy_bi_zero(int start_index, unsigned number_of_zeros, OutputIterator out_it)\
+   BOOST_MATH_GPU_ENABLED OutputIterator airy_bi_zero(int start_index, unsigned number_of_zeros, OutputIterator out_it)\
    { return boost::math::airy_bi_zero<T>(start_index, number_of_zeros, out_it, Policy()); }\
    \
    template <class T>\
@@ -1813,6 +1896,6 @@ template <class OutputIterator, class T>\
 
 
 
-
+#endif // BOOST_MATH_HAS_NVRTC
 
 #endif // BOOST_MATH_SPECIAL_MATH_FWD_HPP
diff --git a/inst/include/boost/math/special_functions/modf.hpp b/inst/include/boost/math/special_functions/modf.hpp
index 75e6be9f4..6e372ec9a 100644
--- a/inst/include/boost/math/special_functions/modf.hpp
+++ b/inst/include/boost/math/special_functions/modf.hpp
@@ -1,4 +1,5 @@
 //  Copyright John Maddock 2007.
+//  Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,56 +11,60 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/trunc.hpp>
+#include <boost/math/policies/policy.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/special_functions/math_fwd.hpp>
+#endif
 
 namespace boost{ namespace math{
 
 template <class T, class Policy>
-inline T modf(const T& v, T* ipart, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, T* ipart, const Policy& pol)
 {
    *ipart = trunc(v, pol);
    return v - *ipart;
 }
 template <class T>
-inline T modf(const T& v, T* ipart)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, T* ipart)
 {
    return modf(v, ipart, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline T modf(const T& v, int* ipart, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, int* ipart, const Policy& pol)
 {
    *ipart = itrunc(v, pol);
    return v - *ipart;
 }
 template <class T>
-inline T modf(const T& v, int* ipart)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, int* ipart)
 {
    return modf(v, ipart, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline T modf(const T& v, long* ipart, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, long* ipart, const Policy& pol)
 {
    *ipart = ltrunc(v, pol);
    return v - *ipart;
 }
 template <class T>
-inline T modf(const T& v, long* ipart)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, long* ipart)
 {
    return modf(v, ipart, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline T modf(const T& v, long long* ipart, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, long long* ipart, const Policy& pol)
 {
    *ipart = lltrunc(v, pol);
    return v - *ipart;
 }
 template <class T>
-inline T modf(const T& v, long long* ipart)
+BOOST_MATH_GPU_ENABLED inline T modf(const T& v, long long* ipart)
 {
    return modf(v, ipart, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/next.hpp b/inst/include/boost/math/special_functions/next.hpp
index 1b5693242..fd08162f9 100644
--- a/inst/include/boost/math/special_functions/next.hpp
+++ b/inst/include/boost/math/special_functions/next.hpp
@@ -10,6 +10,11 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+
+// TODO(mborland): Need to remove recurrsion from these algos
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
@@ -194,10 +199,14 @@ T float_next_imp(const T& val, const std::true_type&, const Policy& pol)
 
    int fpclass = (boost::math::fpclassify)(val);
 
-   if((fpclass == (int)FP_NAN) || (fpclass == (int)FP_INFINITE))
+   if (fpclass == (int)FP_INFINITE)
    {
-      if(val < 0)
+      if (val < 0)
          return -tools::max_value<T>();
+      return val;  // +INF
+   }
+   else if (fpclass == (int)FP_NAN)
+   {
       return policies::raise_domain_error<T>(
          function,
          "Argument must be finite, but got %1%", val, pol);
@@ -243,10 +252,14 @@ T float_next_imp(const T& val, const std::false_type&, const Policy& pol)
 
    int fpclass = (boost::math::fpclassify)(val);
 
-   if((fpclass == (int)FP_NAN) || (fpclass == (int)FP_INFINITE))
+   if (fpclass == (int)FP_INFINITE)
    {
-      if(val < 0)
+      if (val < 0)
          return -tools::max_value<T>();
+      return val;  // +INF
+   }
+   else if (fpclass == (int)FP_NAN)
+   {
       return policies::raise_domain_error<T>(
          function,
          "Argument must be finite, but got %1%", val, pol);
@@ -328,10 +341,14 @@ T float_prior_imp(const T& val, const std::true_type&, const Policy& pol)
 
    int fpclass = (boost::math::fpclassify)(val);
 
-   if((fpclass == (int)FP_NAN) || (fpclass == (int)FP_INFINITE))
+   if (fpclass == (int)FP_INFINITE)
    {
-      if(val > 0)
+      if (val > 0)
          return tools::max_value<T>();
+      return val; // -INF
+   }
+   else if (fpclass == (int)FP_NAN)
+   {
       return policies::raise_domain_error<T>(
          function,
          "Argument must be finite, but got %1%", val, pol);
@@ -378,10 +395,14 @@ T float_prior_imp(const T& val, const std::false_type&, const Policy& pol)
 
    int fpclass = (boost::math::fpclassify)(val);
 
-   if((fpclass == (int)FP_NAN) || (fpclass == (int)FP_INFINITE))
+   if (fpclass == (int)FP_INFINITE)
    {
-      if(val > 0)
+      if (val > 0)
          return tools::max_value<T>();
+      return val; // -INF
+   }
+   else if (fpclass == (int)FP_NAN)
+   {
       return policies::raise_domain_error<T>(
          function,
          "Argument must be finite, but got %1%", val, pol);
@@ -694,9 +715,9 @@ inline typename tools::promote_args<T, U>::type float_distance(const T& a, const
          && !std::numeric_limits<T>::is_integer && !std::numeric_limits<U>::is_integer)),
       "Float distance between two different floating point types is undefined.");
 
-   BOOST_IF_CONSTEXPR (!std::is_same<T, U>::value)
+   BOOST_MATH_IF_CONSTEXPR (!std::is_same<T, U>::value)
    {
-      BOOST_IF_CONSTEXPR(std::is_integral<T>::value)
+      BOOST_MATH_IF_CONSTEXPR(std::is_integral<T>::value)
       {
          return float_distance(static_cast<U>(a), b, pol);
       }
@@ -904,4 +925,6 @@ inline typename tools::promote_args<T>::type float_advance(const T& val, int dis
 
 }} // boost math namespaces
 
+#endif
+
 #endif // BOOST_MATH_SPECIAL_NEXT_HPP
diff --git a/inst/include/boost/math/special_functions/owens_t.hpp b/inst/include/boost/math/special_functions/owens_t.hpp
index 7a93246ee..c794f0cac 100644
--- a/inst/include/boost/math/special_functions/owens_t.hpp
+++ b/inst/include/boost/math/special_functions/owens_t.hpp
@@ -575,12 +575,12 @@ namespace boost
             // when the last accelerated term was small enough...
             //
             int n;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             try
             {
 #endif
                n = itrunc(T(tools::log_max_value<T>() / 6));
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             }
             catch(...)
             {
@@ -693,12 +693,12 @@ namespace boost
             // when the last accelerated term was small enough...
             //
             int n;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             try
             {
 #endif
                n = itrunc(RealType(tools::log_max_value<RealType>() / 6));
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             }
             catch(...)
             {
@@ -866,7 +866,7 @@ namespace boost
             bool have_t1(false), have_t2(false);
             if(ah < 3)
             {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                try
                {
 #endif
@@ -874,14 +874,14 @@ namespace boost
                   p1 = owens_t_T1_accelerated(h, a, forwarding_policy());
                   if(p1.second < target_precision)
                      return p1.first;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                }
                catch(const boost::math::evaluation_error&){}  // T1 may fail and throw, that's OK
 #endif
             }
             if(ah > 1)
             {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                try
                {
 #endif
@@ -889,7 +889,7 @@ namespace boost
                   p2 = owens_t_T2_accelerated(h, a, ah, forwarding_policy());
                   if(p2.second < target_precision)
                      return p2.first;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                }
                catch(const boost::math::evaluation_error&){}  // T2 may fail and throw, that's OK
 #endif
@@ -900,7 +900,7 @@ namespace boost
             //
             if(!have_t1)
             {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                try
                {
 #endif
@@ -908,7 +908,7 @@ namespace boost
                   p1 = owens_t_T1_accelerated(h, a, forwarding_policy());
                   if(p1.second < target_precision)
                      return p1.first;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                }
                catch(const boost::math::evaluation_error&){}  // T1 may fail and throw, that's OK
 #endif
@@ -919,7 +919,7 @@ namespace boost
             //
             if(!have_t2)
             {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                try
                {
 #endif
@@ -927,7 +927,7 @@ namespace boost
                   p2 = owens_t_T2_accelerated(h, a, ah, forwarding_policy());
                   if(p2.second < target_precision)
                      return p2.first;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
                }
                catch(const boost::math::evaluation_error&){}  // T2 may fail and throw, that's OK
 #endif
@@ -936,12 +936,12 @@ namespace boost
             // OK, nothing left to do but try the most expensive option which is T4,
             // this is often slow to converge, but when it does converge it tends to
             // be accurate:
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             try
             {
 #endif
                return T4_mp(h, a, pol);
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
             }
             catch(const boost::math::evaluation_error&){}  // T4 may fail and throw, that's OK
 #endif
diff --git a/inst/include/boost/math/special_functions/pow.hpp b/inst/include/boost/math/special_functions/pow.hpp
index 753ac208b..7a1bb14eb 100644
--- a/inst/include/boost/math/special_functions/pow.hpp
+++ b/inst/include/boost/math/special_functions/pow.hpp
@@ -2,6 +2,7 @@
 //   Computes a power with exponent known at compile-time
 
 //  (C) Copyright Bruno Lalande 2008.
+//  (C) Copyright Matt Borland 2024.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -12,12 +13,14 @@
 #ifndef BOOST_MATH_POW_HPP
 #define BOOST_MATH_POW_HPP
 
-
-#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/policies/policy.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/tools/promotion.hpp>
 
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/special_functions/math_fwd.hpp>
+#endif
 
 namespace boost {
 namespace math {
@@ -34,7 +37,7 @@ template <int N, int M = N%2>
 struct positive_power
 {
     template <typename T>
-    static BOOST_CXX14_CONSTEXPR T result(T base)
+    BOOST_MATH_GPU_ENABLED static constexpr T result(T base)
     {
         T power = positive_power<N/2>::result(base);
         return power * power;
@@ -45,7 +48,7 @@ template <int N>
 struct positive_power<N, 1>
 {
     template <typename T>
-    static BOOST_CXX14_CONSTEXPR T result(T base)
+    BOOST_MATH_GPU_ENABLED static constexpr T result(T base)
     {
         T power = positive_power<N/2>::result(base);
         return base * power * power;
@@ -56,7 +59,7 @@ template <>
 struct positive_power<1, 1>
 {
     template <typename T>
-    static BOOST_CXX14_CONSTEXPR T result(T base){ return base; }
+    BOOST_MATH_GPU_ENABLED static constexpr T result(T base){ return base; }
 };
 
 
@@ -64,7 +67,7 @@ template <int N, bool>
 struct power_if_positive
 {
     template <typename T, class Policy>
-    static BOOST_CXX14_CONSTEXPR T result(T base, const Policy&)
+    BOOST_MATH_GPU_ENABLED static constexpr T result(T base, const Policy&)
     { return positive_power<N>::result(base); }
 };
 
@@ -72,7 +75,7 @@ template <int N>
 struct power_if_positive<N, false>
 {
     template <typename T, class Policy>
-    static BOOST_CXX14_CONSTEXPR T result(T base, const Policy& policy)
+    BOOST_MATH_GPU_ENABLED static constexpr T result(T base, const Policy& policy)
     {
         if (base == 0)
         {
@@ -91,7 +94,7 @@ template <>
 struct power_if_positive<0, true>
 {
     template <typename T, class Policy>
-    static BOOST_CXX14_CONSTEXPR T result(T base, const Policy& policy)
+    BOOST_MATH_GPU_ENABLED static constexpr T result(T base, const Policy& policy)
     {
         if (base == 0)
         {
@@ -120,14 +123,14 @@ struct select_power_if_positive
 
 
 template <int N, typename T, class Policy>
-BOOST_CXX14_CONSTEXPR inline typename tools::promote_args<T>::type pow(T base, const Policy& policy)
+BOOST_MATH_GPU_ENABLED constexpr inline typename tools::promote_args<T>::type pow(T base, const Policy& policy)
 { 
    using result_type = typename tools::promote_args<T>::type;
    return detail::select_power_if_positive<N>::type::result(static_cast<result_type>(base), policy); 
 }
 
 template <int N, typename T>
-BOOST_CXX14_CONSTEXPR inline typename tools::promote_args<T>::type pow(T base)
+BOOST_MATH_GPU_ENABLED constexpr inline typename tools::promote_args<T>::type pow(T base)
 { return pow<N>(base, policies::policy<>()); }
 
 #ifdef _MSC_VER
diff --git a/inst/include/boost/math/special_functions/powm1.hpp b/inst/include/boost/math/special_functions/powm1.hpp
index e52277b16..80d02dc29 100644
--- a/inst/include/boost/math/special_functions/powm1.hpp
+++ b/inst/include/boost/math/special_functions/powm1.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -12,6 +13,7 @@
 #pragma warning(disable:4702) // Unreachable code (release mode only warning)
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/expm1.hpp>
@@ -22,32 +24,23 @@
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Policy>
-inline T powm1_imp(const T x, const T y, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T powm1_imp(const T x, const T y, const Policy& pol)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::powm1<%1%>(%1%, %1%)";
-   if (x > 0)
+   constexpr auto function = "boost::math::powm1<%1%>(%1%, %1%)";
+
+   if ((fabs(y * (x - 1)) < T(0.5)) || (fabs(y) < T(0.2)))
    {
-      if ((fabs(y * (x - 1)) < T(0.5)) || (fabs(y) < T(0.2)))
-      {
-         // We don't have any good/quick approximation for log(x) * y
-         // so just try it and see:
-         T l = y * log(x);
-         if (l < T(0.5))
-            return boost::math::expm1(l, pol);
-         if (l > boost::math::tools::log_max_value<T>())
-            return boost::math::policies::raise_overflow_error<T>(function, nullptr, pol);
-         // fall through....
-      }
-   }
-   else if ((boost::math::signbit)(x)) // Need to error check -0 here as well
-   {
-      // y had better be an integer:
-      if (boost::math::trunc(y) != y)
-         return boost::math::policies::raise_domain_error<T>(function, "For non-integral exponent, expected base > 0 but got %1%", x, pol);
-      if (boost::math::trunc(y / 2) == y / 2)
-         return powm1_imp(T(-x), y, pol);
+      // We don't have any good/quick approximation for log(x) * y
+      // so just try it and see:
+      T l = y * log(x);
+      if (l < T(0.5))
+         return boost::math::expm1(l, pol);
+      if (l > boost::math::tools::log_max_value<T>())
+         return boost::math::policies::raise_overflow_error<T>(function, nullptr, pol);
+      // fall through....
    }
+   
    T result = pow(x, y) - 1;
    if((boost::math::isinf)(result))
       return result < 0 ? -boost::math::policies::raise_overflow_error<T>(function, nullptr, pol) : boost::math::policies::raise_overflow_error<T>(function, nullptr, pol);
@@ -56,22 +49,41 @@ inline T powm1_imp(const T x, const T y, const Policy& pol)
    return result;
 }
 
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED inline T powm1_imp_dispatch(const T x, const T y, const Policy& pol)
+{
+   BOOST_MATH_STD_USING
+
+   if ((boost::math::signbit)(x)) // Need to error check -0 here as well
+   {
+      constexpr auto function = "boost::math::powm1<%1%>(%1%, %1%)";
+
+      // y had better be an integer:
+      if (boost::math::trunc(y) != y)
+         return boost::math::policies::raise_domain_error<T>(function, "For non-integral exponent, expected base > 0 but got %1%", x, pol);
+      if (boost::math::trunc(y / 2) == y / 2)
+         return powm1_imp(T(-x), T(y), pol);
+   }
+
+   return powm1_imp(T(x), T(y), pol);
+}
+
 } // detail
 
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    powm1(const T1 a, const T2 z)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
-   return detail::powm1_imp(static_cast<result_type>(a), static_cast<result_type>(z), policies::policy<>());
+   return detail::powm1_imp_dispatch(static_cast<result_type>(a), static_cast<result_type>(z), policies::policy<>());
 }
 
 template <class T1, class T2, class Policy>
-inline typename tools::promote_args<T1, T2>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T1, T2>::type
    powm1(const T1 a, const T2 z, const Policy& pol)
 {
    typedef typename tools::promote_args<T1, T2>::type result_type;
-   return detail::powm1_imp(static_cast<result_type>(a), static_cast<result_type>(z), pol);
+   return detail::powm1_imp_dispatch(static_cast<result_type>(a), static_cast<result_type>(z), pol);
 }
 
 } // namespace math
diff --git a/inst/include/boost/math/special_functions/round.hpp b/inst/include/boost/math/special_functions/round.hpp
index e74acba85..bb99da7e3 100644
--- a/inst/include/boost/math/special_functions/round.hpp
+++ b/inst/include/boost/math/special_functions/round.hpp
@@ -12,6 +12,9 @@
 #endif
 
 #include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <boost/math/ccmath/detail/config.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
@@ -30,7 +33,7 @@ namespace boost{ namespace math{
 namespace detail{
 
 template <class T, class Policy>
-inline tools::promote_args_t<T> round(const T& v, const Policy& pol, const std::false_type&)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> round(const T& v, const Policy& pol, const std::false_type&)
 {
    BOOST_MATH_STD_USING
    using result_type = tools::promote_args_t<T>;
@@ -65,7 +68,7 @@ inline tools::promote_args_t<T> round(const T& v, const Policy& pol, const std::
    }
 }
 template <class T, class Policy>
-inline tools::promote_args_t<T> round(const T& v, const Policy&, const std::true_type&)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> round(const T& v, const Policy&, const std::true_type&)
 {
    return v;
 }
@@ -73,12 +76,12 @@ inline tools::promote_args_t<T> round(const T& v, const Policy&, const std::true
 } // namespace detail
 
 template <class T, class Policy>
-inline tools::promote_args_t<T> round(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> round(const T& v, const Policy& pol)
 {
    return detail::round(v, pol, std::integral_constant<bool, detail::is_integer_for_rounding<T>::value>());
 }
 template <class T>
-inline tools::promote_args_t<T> round(const T& v)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> round(const T& v)
 {
    return round(v, policies::policy<>());
 }
@@ -103,7 +106,7 @@ inline int iround(const T& v, const Policy& pol)
 
    result_type r = boost::math::round(v, pol);
 
-   #ifdef BOOST_MATH_HAS_CONSTEXPR_LDEXP
+   #if defined(BOOST_MATH_HAS_CONSTEXPR_LDEXP) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
    if constexpr (std::is_arithmetic_v<result_type>
                  #ifdef BOOST_MATH_FLOAT128_TYPE
                  && !std::is_same_v<BOOST_MATH_FLOAT128_TYPE, result_type>
@@ -127,7 +130,7 @@ inline int iround(const T& v, const Policy& pol)
       }
    }
    #else
-   static const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<int>::digits);
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<int>::digits);
 
    if (r >= max_val || r < -max_val)
    {
@@ -138,20 +141,20 @@ inline int iround(const T& v, const Policy& pol)
    return static_cast<int>(r);
 }
 template <class T>
-inline int iround(const T& v)
+BOOST_MATH_GPU_ENABLED inline int iround(const T& v)
 {
    return iround(v, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline long lround(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline long lround(const T& v, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    using result_type = tools::promote_args_t<T>;
 
    result_type r = boost::math::round(v, pol);
    
-   #ifdef BOOST_MATH_HAS_CONSTEXPR_LDEXP
+   #if defined(BOOST_MATH_HAS_CONSTEXPR_LDEXP) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
    if constexpr (std::is_arithmetic_v<result_type>
                  #ifdef BOOST_MATH_FLOAT128_TYPE
                  && !std::is_same_v<BOOST_MATH_FLOAT128_TYPE, result_type>
@@ -175,7 +178,7 @@ inline long lround(const T& v, const Policy& pol)
       }
    }
    #else
-   static const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long>::digits);
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long>::digits);
 
    if (r >= max_val || r < -max_val)
    {
@@ -186,20 +189,20 @@ inline long lround(const T& v, const Policy& pol)
    return static_cast<long>(r);
 }
 template <class T>
-inline long lround(const T& v)
+BOOST_MATH_GPU_ENABLED inline long lround(const T& v)
 {
    return lround(v, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline long long llround(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline long long llround(const T& v, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    using result_type = boost::math::tools::promote_args_t<T>;
 
    result_type r = boost::math::round(v, pol);
 
-   #ifdef BOOST_MATH_HAS_CONSTEXPR_LDEXP
+   #if defined(BOOST_MATH_HAS_CONSTEXPR_LDEXP) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
    if constexpr (std::is_arithmetic_v<result_type>
                  #ifdef BOOST_MATH_FLOAT128_TYPE
                  && !std::is_same_v<BOOST_MATH_FLOAT128_TYPE, result_type>
@@ -223,7 +226,7 @@ inline long long llround(const T& v, const Policy& pol)
       }
    }
    #else
-   static const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long long>::digits);
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long long>::digits);
 
    if (r >= max_val || r < -max_val)
    {
@@ -234,11 +237,117 @@ inline long long llround(const T& v, const Policy& pol)
    return static_cast<long long>(r);
 }
 template <class T>
-inline long long llround(const T& v)
+BOOST_MATH_GPU_ENABLED inline long long llround(const T& v)
 {
    return llround(v, policies::policy<>());
 }
 
 }} // namespaces
 
+#else // Specialized NVRTC overloads
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED T round(T x)
+{
+   return ::round(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED float round(float x)
+{
+   return ::roundf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED T round(T x, const Policy&)
+{
+   return ::round(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED float round(float x, const Policy&)
+{
+   return ::roundf(x);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED int iround(T x)
+{
+   return static_cast<int>(::lround(x));
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED int iround(float x)
+{
+   return static_cast<int>(::lroundf(x));
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED int iround(T x, const Policy&)
+{
+   return static_cast<int>(::lround(x));
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED int iround(float x, const Policy&)
+{
+   return static_cast<int>(::lroundf(x));
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED long lround(T x)
+{
+   return ::lround(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED long lround(float x)
+{
+   return ::lroundf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED long lround(T x, const Policy&)
+{
+   return ::lround(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED long lround(float x, const Policy&)
+{
+   return ::lroundf(x);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED long long llround(T x)
+{
+   return ::llround(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED long long llround(float x)
+{
+   return ::llroundf(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED long long llround(T x, const Policy&)
+{
+   return ::llround(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED long long llround(float x, const Policy&)
+{
+   return ::llroundf(x);
+}
+
+} // Namespace math
+} // Namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif // BOOST_MATH_ROUND_HPP
diff --git a/inst/include/boost/math/special_functions/rsqrt.hpp b/inst/include/boost/math/special_functions/rsqrt.hpp
index fec6468e2..b42fa12bc 100644
--- a/inst/include/boost/math/special_functions/rsqrt.hpp
+++ b/inst/include/boost/math/special_functions/rsqrt.hpp
@@ -12,7 +12,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #  include <boost/config.hpp>
-#  ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#  ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #    error "The header <boost/math/rqrt.hpp> can only be used in C++17 and later."
 #  endif
 #endif
diff --git a/inst/include/boost/math/special_functions/sign.hpp b/inst/include/boost/math/special_functions/sign.hpp
index 8f9fc4793..4f7652265 100644
--- a/inst/include/boost/math/special_functions/sign.hpp
+++ b/inst/include/boost/math/special_functions/sign.hpp
@@ -1,6 +1,7 @@
 //  (C) Copyright John Maddock 2006.
 //  (C) Copyright Johan Rade 2006.
 //  (C) Copyright Paul A. Bristow 2011 (added changesign).
+//  (C) Copyright Matt Borland 2024
 
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
@@ -13,6 +14,8 @@
 #pragma once
 #endif
 
+#ifndef __CUDACC_RTC__
+
 #include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/detail/fp_traits.hpp>
@@ -25,9 +28,10 @@ namespace detail {
 
 #ifdef BOOST_MATH_USE_STD_FPCLASSIFY
     template<class T> 
-    inline int signbit_impl(T x, native_tag const&)
+    BOOST_MATH_GPU_ENABLED inline int signbit_impl(T x, native_tag const&)
     {
-        return (std::signbit)(x) ? 1 : 0;
+        using std::signbit;
+        return (signbit)(x) ? 1 : 0;
     }
 #endif
 
@@ -35,13 +39,13 @@ namespace detail {
     // signed zero or NaN.
 
     template<class T>
-    inline int signbit_impl(T x, generic_tag<true> const&)
+    BOOST_MATH_GPU_ENABLED inline int signbit_impl(T x, generic_tag<true> const&)
     {
         return x < 0;
     }
 
     template<class T> 
-    inline int signbit_impl(T x, generic_tag<false> const&)
+    BOOST_MATH_GPU_ENABLED inline int signbit_impl(T x, generic_tag<false> const&)
     {
         return x < 0;
     }
@@ -65,7 +69,7 @@ namespace detail {
 #endif
 
     template<class T>
-    inline int signbit_impl(T x, ieee_copy_all_bits_tag const&)
+    BOOST_MATH_GPU_ENABLED inline int signbit_impl(T x, ieee_copy_all_bits_tag const&)
     {
         typedef typename fp_traits<T>::type traits;
 
@@ -75,7 +79,7 @@ namespace detail {
     }
 
     template<class T> 
-    inline int signbit_impl(T x, ieee_copy_leading_bits_tag const&)
+    BOOST_MATH_GPU_ENABLED inline int signbit_impl(T x, ieee_copy_leading_bits_tag const&)
     {
         typedef typename fp_traits<T>::type traits;
 
@@ -91,13 +95,13 @@ namespace detail {
     // signed zero or NaN.
 
     template<class T>
-    inline T (changesign_impl)(T x, generic_tag<true> const&)
+    BOOST_MATH_GPU_ENABLED inline T (changesign_impl)(T x, generic_tag<true> const&)
     {
         return -x;
     }
 
     template<class T>
-    inline T (changesign_impl)(T x, generic_tag<false> const&)
+    BOOST_MATH_GPU_ENABLED inline T (changesign_impl)(T x, generic_tag<false> const&)
     {
         return -x;
     }
@@ -124,7 +128,7 @@ namespace detail {
 #endif
 
     template<class T>
-    inline T changesign_impl(T x, ieee_copy_all_bits_tag const&)
+    BOOST_MATH_GPU_ENABLED inline T changesign_impl(T x, ieee_copy_all_bits_tag const&)
     {
         typedef typename fp_traits<T>::sign_change_type traits;
 
@@ -136,7 +140,7 @@ namespace detail {
     }
 
     template<class T>
-    inline T (changesign_impl)(T x, ieee_copy_leading_bits_tag const&)
+    BOOST_MATH_GPU_ENABLED inline T (changesign_impl)(T x, ieee_copy_leading_bits_tag const&)
     {
         typedef typename fp_traits<T>::sign_change_type traits;
 
@@ -150,7 +154,8 @@ namespace detail {
 
 }   // namespace detail
 
-template<class T> int (signbit)(T x)
+template<class T> 
+BOOST_MATH_GPU_ENABLED int (signbit)(T x)
 { 
    typedef typename detail::fp_traits<T>::type traits;
    typedef typename traits::method method;
@@ -160,12 +165,13 @@ template<class T> int (signbit)(T x)
 }
 
 template <class T>
-inline int sign BOOST_NO_MACRO_EXPAND(const T& z)
+BOOST_MATH_GPU_ENABLED inline int sign BOOST_NO_MACRO_EXPAND(const T& z)
 {
    return (z == 0) ? 0 : (boost::math::signbit)(z) ? -1 : 1;
 }
 
-template <class T> typename tools::promote_args_permissive<T>::type (changesign)(const T& x)
+template <class T> 
+BOOST_MATH_GPU_ENABLED typename tools::promote_args_permissive<T>::type (changesign)(const T& x)
 { //!< \brief return unchanged binary pattern of x, except for change of sign bit. 
    typedef typename detail::fp_traits<T>::sign_change_type traits;
    typedef typename traits::method method;
@@ -176,7 +182,7 @@ template <class T> typename tools::promote_args_permissive<T>::type (changesign)
 }
 
 template <class T, class U>
-inline typename tools::promote_args_permissive<T, U>::type 
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args_permissive<T, U>::type 
    copysign BOOST_NO_MACRO_EXPAND(const T& x, const U& y)
 {
    BOOST_MATH_STD_USING
@@ -188,6 +194,47 @@ inline typename tools::promote_args_permissive<T, U>::type
 } // namespace math
 } // namespace boost
 
+#else // NVRTC alias versions
+
+#include <boost/math/tools/config.hpp>
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED int signbit(T x)
+{
+    return ::signbit(x);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED T changesign(T x)
+{
+    return -x;
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED T copysign(T x, T y)
+{
+    return ::copysign(x, y);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED float copysign(float x, float y)
+{
+    return ::copysignf(x, y);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED T sign(T z)
+{
+    return (z == 0) ? 0 : ::signbit(z) ? -1 : 1;
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // __CUDACC_RTC__
 
 #endif // BOOST_MATH_TOOLS_SIGN_HPP
 
diff --git a/inst/include/boost/math/special_functions/sin_pi.hpp b/inst/include/boost/math/special_functions/sin_pi.hpp
index 5b8eb6fcf..e59e232e6 100644
--- a/inst/include/boost/math/special_functions/sin_pi.hpp
+++ b/inst/include/boost/math/special_functions/sin_pi.hpp
@@ -1,4 +1,5 @@
 //  Copyright (c) 2007 John Maddock
+//  Copyright (c) 2024 Matt Borland
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,9 +11,14 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <cmath>
 #include <limits>
-#include <boost/math/tools/config.hpp>
+#include <type_traits>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/tools/promotion.hpp>
@@ -21,11 +27,9 @@
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Policy>
-inline T sin_pi_imp(T x, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline T sin_pi_imp(T x, const Policy&)
 {
    BOOST_MATH_STD_USING // ADL of std names
-   if(x < 0)
-      return -sin_pi_imp(T(-x), pol);
    // sin of pi*x:
    if(x < T(0.5))
       return sin(constants::pi<T>() * x);
@@ -39,7 +43,7 @@ inline T sin_pi_imp(T x, const Policy& pol)
       invert = false;
 
    T rem = floor(x);
-   if(abs(floor(rem/2)*2 - rem) > std::numeric_limits<T>::epsilon())
+   if(abs(floor(rem/2)*2 - rem) > boost::math::numeric_limits<T>::epsilon())
    {
       invert = !invert;
    }
@@ -53,10 +57,23 @@ inline T sin_pi_imp(T x, const Policy& pol)
    return invert ? T(-rem) : rem;
 }
 
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED inline T sin_pi_dispatch(T x, const Policy& pol)
+{
+   if (x < T(0))
+   {
+      return -sin_pi_imp(T(-x), pol);
+   }
+   else
+   {
+      return sin_pi_imp(T(x), pol);
+   }
+}
+
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type sin_pi(T x, const Policy&)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type sin_pi(T x, const Policy&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
@@ -69,7 +86,7 @@ inline typename tools::promote_args<T>::type sin_pi(T x, const Policy&)
       // We want to ignore overflows since the result is in [-1,1] and the 
       // check slows the code down considerably.
       policies::overflow_error<policies::ignore_error> >::type forwarding_policy;
-   return policies::checked_narrowing_cast<result_type, forwarding_policy>(boost::math::detail::sin_pi_imp<value_type>(x, forwarding_policy()), "sin_pi");
+   return policies::checked_narrowing_cast<result_type, forwarding_policy>(boost::math::detail::sin_pi_dispatch<value_type>(x, forwarding_policy()), "sin_pi");
 }
 
 template <class T>
@@ -80,5 +97,40 @@ inline typename tools::promote_args<T>::type sin_pi(T x)
 
 } // namespace math
 } // namespace boost
+
+#else // Special handling for NVRTC
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto sin_pi(T x)
+{
+   return ::sinpi(x);
+}
+
+template <>
+BOOST_MATH_GPU_ENABLED auto sin_pi(float x)
+{
+   return ::sinpif(x);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto sin_pi(T x, const Policy&)
+{
+   return ::sinpi(x);
+}
+
+template <typename Policy>
+BOOST_MATH_GPU_ENABLED auto sin_pi(float x, const Policy&)
+{
+   return ::sinpif(x);
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif
 
diff --git a/inst/include/boost/math/special_functions/sinc.hpp b/inst/include/boost/math/special_functions/sinc.hpp
index 7220d30b8..0c18ac346 100644
--- a/inst/include/boost/math/special_functions/sinc.hpp
+++ b/inst/include/boost/math/special_functions/sinc.hpp
@@ -17,12 +17,13 @@
 
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/promotion.hpp>
 #include <boost/math/policies/policy.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <limits>
-#include <string>
-#include <stdexcept>
-#include <cmath>
+#endif
 
 // These are the the "Sinus Cardinal" functions.
 
@@ -35,11 +36,15 @@ namespace boost
         // This is the "Sinus Cardinal" of index Pi.
 
         template<typename T>
-        inline T    sinc_pi_imp(const T x)
+        BOOST_MATH_GPU_ENABLED inline T    sinc_pi_imp(const T x)
         {
             BOOST_MATH_STD_USING
 
-            if    (abs(x) >= 3.3 * tools::forth_root_epsilon<T>())
+            if ((boost::math::isinf)(x))
+            {
+               return 0;
+            }
+            else if (abs(x) >= T(3.3) * tools::forth_root_epsilon<T>())
             {
                 return(sin(x)/x);
             }
@@ -53,24 +58,23 @@ namespace boost
        } // namespace detail
 
        template <class T>
-       inline typename tools::promote_args<T>::type sinc_pi(T x)
+       BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type sinc_pi(T x)
        {
           typedef typename tools::promote_args<T>::type result_type;
           return detail::sinc_pi_imp(static_cast<result_type>(x));
        }
 
        template <class T, class Policy>
-       inline typename tools::promote_args<T>::type sinc_pi(T x, const Policy&)
+       BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type sinc_pi(T x, const Policy&)
        {
           typedef typename tools::promote_args<T>::type result_type;
           return detail::sinc_pi_imp(static_cast<result_type>(x));
        }
 
         template<typename T, template<typename> class U>
-        inline U<T>    sinc_pi(const U<T> x)
+        BOOST_MATH_GPU_ENABLED inline U<T>    sinc_pi(const U<T> x)
         {
             BOOST_MATH_STD_USING
-            using    ::std::numeric_limits;
 
             T const    taylor_0_bound = tools::epsilon<T>();
             T const    taylor_2_bound = tools::root_epsilon<T>();
@@ -83,11 +87,11 @@ namespace boost
             else
             {
                 // approximation by taylor series in x at 0 up to order 0
-#ifdef __MWERKS__
+                #ifdef __MWERKS__
                 U<T>    result = static_cast<U<T> >(1);
-#else
+                #else
                 U<T>    result = U<T>(1);
-#endif
+                #endif
 
                 if    (abs(x) >= taylor_0_bound)
                 {
@@ -108,7 +112,7 @@ namespace boost
         }
 
         template<typename T, template<typename> class U, class Policy>
-        inline U<T>    sinc_pi(const U<T> x, const Policy&)
+        BOOST_MATH_GPU_ENABLED inline U<T>    sinc_pi(const U<T> x, const Policy&)
         {
            return sinc_pi(x);
         }
diff --git a/inst/include/boost/math/special_functions/sinhc.hpp b/inst/include/boost/math/special_functions/sinhc.hpp
index 6606ad3ea..b8c5f9f2e 100644
--- a/inst/include/boost/math/special_functions/sinhc.hpp
+++ b/inst/include/boost/math/special_functions/sinhc.hpp
@@ -16,7 +16,9 @@
 #endif
 
 #include <boost/math/tools/precision.hpp>
+#include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
 #include <limits>
 #include <string>
 #include <stdexcept>
@@ -32,8 +34,8 @@ namespace boost
        {
         // This is the "Hyperbolic Sinus Cardinal" of index Pi.
 
-        template<typename T>
-        inline T    sinhc_pi_imp(const T x)
+        template<typename T, typename Policy>
+        inline T    sinhc_pi_imp(const T x, const Policy&)
         {
             using    ::std::abs;
             using    ::std::sinh;
@@ -43,6 +45,10 @@ namespace boost
             static T const    taylor_2_bound = sqrt(taylor_0_bound);
             static T const    taylor_n_bound = sqrt(taylor_2_bound);
 
+            if((boost::math::isinf)(x))
+            {
+               return policies::raise_overflow_error<T>("sinhc(%1%)", nullptr, Policy());
+            }
             if    (abs(x) >= taylor_n_bound)
             {
                 return(sinh(x)/x);
@@ -72,17 +78,18 @@ namespace boost
 
        } // namespace detail
 
-       template <class T>
-       inline typename tools::promote_args<T>::type sinhc_pi(T x)
+       template <class T, class Policy>
+       inline typename tools::promote_args<T>::type sinhc_pi(T x, const Policy& pol)
        {
           typedef typename tools::promote_args<T>::type result_type;
-          return detail::sinhc_pi_imp(static_cast<result_type>(x));
+          return policies::checked_narrowing_cast<T, Policy>(detail::sinhc_pi_imp(static_cast<result_type>(x), pol), "sinhc(%1%)");
        }
 
-       template <class T, class Policy>
-       inline typename tools::promote_args<T>::type sinhc_pi(T x, const Policy&)
+       template <class T>
+       inline typename tools::promote_args<T>::type sinhc_pi(T x)
        {
-          return boost::math::sinhc_pi(x);
+          typedef typename tools::promote_args<T>::type result_type;
+          return sinhc_pi(static_cast<result_type>(x), policies::policy<>());
        }
 
         template<typename T, template<typename> class U>
diff --git a/inst/include/boost/math/special_functions/sqrt1pm1.hpp b/inst/include/boost/math/special_functions/sqrt1pm1.hpp
index 041916a53..4d8aeb38c 100644
--- a/inst/include/boost/math/special_functions/sqrt1pm1.hpp
+++ b/inst/include/boost/math/special_functions/sqrt1pm1.hpp
@@ -10,6 +10,7 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/expm1.hpp>
@@ -21,7 +22,7 @@
 namespace boost{ namespace math{
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type sqrt1pm1(const T& val, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type sqrt1pm1(const T& val, const Policy& pol)
 {
    typedef typename tools::promote_args<T>::type result_type;
    BOOST_MATH_STD_USING
@@ -32,7 +33,7 @@ inline typename tools::promote_args<T>::type sqrt1pm1(const T& val, const Policy
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type sqrt1pm1(const T& val)
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type sqrt1pm1(const T& val)
 {
    return sqrt1pm1(val, policies::policy<>());
 }
diff --git a/inst/include/boost/math/special_functions/trigamma.hpp b/inst/include/boost/math/special_functions/trigamma.hpp
index f74b43db1..61a60b502 100644
--- a/inst/include/boost/math/special_functions/trigamma.hpp
+++ b/inst/include/boost/math/special_functions/trigamma.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,14 +11,22 @@
 #pragma once
 #endif
 
-#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/rational.hpp>
-#include <boost/math/tools/series.hpp>
 #include <boost/math/tools/promotion.hpp>
+#include <boost/math/tools/big_constant.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/policies/policy.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/constants/constants.hpp>
-#include <boost/math/tools/big_constant.hpp>
+#include <boost/math/special_functions/sin_pi.hpp>
+#include <boost/math/special_functions/pow.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/polygamma.hpp>
+#include <boost/math/tools/series.hpp>
+#endif
 
 #if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
 //
@@ -33,15 +42,24 @@ namespace boost{
 namespace math{
 namespace detail{
 
+// TODO(mborland): Temporary for NVRTC
+#ifndef BOOST_MATH_HAS_NVRTC
 template<class T, class Policy>
 T polygamma_imp(const int n, T x, const Policy &pol);
 
 template <class T, class Policy>
-T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
+T trigamma_prec(T x, const Policy& pol, const boost::math::integral_constant<int, 0>&)
+{
+   return polygamma_imp(1, x, pol);
+}
+#endif
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED T trigamma_prec(T x, const Policy&, const boost::math::integral_constant<int, 53>&)
 {
    // Max error in interpolated form: 3.736e-017
-   static const T offset = BOOST_MATH_BIG_CONSTANT(T, 53, 2.1093254089355469);
-   static const T P_1_2[] = {
+   BOOST_MATH_STATIC const T offset = BOOST_MATH_BIG_CONSTANT(T, 53, 2.1093254089355469);
+   BOOST_MATH_STATIC const T P_1_2[] = {
       BOOST_MATH_BIG_CONSTANT(T, 53, -1.1093280605946045),
       BOOST_MATH_BIG_CONSTANT(T, 53, -3.8310674472619321),
       BOOST_MATH_BIG_CONSTANT(T, 53, -3.3703848401898283),
@@ -49,7 +67,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 53, 1.6638069578676164),
       BOOST_MATH_BIG_CONSTANT(T, 53, 0.64468386819102836),
    };
-   static const T Q_1_2[] = {
+   BOOST_MATH_STATIC const T Q_1_2[] = {
       BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 53, 3.4535389668541151),
       BOOST_MATH_BIG_CONSTANT(T, 53, 4.5208926987851437),
@@ -58,7 +76,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.20314516859987728e-6),
    };
    // Max error in interpolated form: 1.159e-017
-   static const T P_2_4[] = {
+   BOOST_MATH_STATIC const T P_2_4[] = {
       BOOST_MATH_BIG_CONSTANT(T, 53, -0.13803835004508849e-7),
       BOOST_MATH_BIG_CONSTANT(T, 53, 0.50000049158540261),
       BOOST_MATH_BIG_CONSTANT(T, 53, 1.6077979838469348),
@@ -66,7 +84,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 53, 2.0534873203680393),
       BOOST_MATH_BIG_CONSTANT(T, 53, 0.74566981111565923),
    };
-   static const T Q_2_4[] = {
+   BOOST_MATH_STATIC const T Q_2_4[] = {
       BOOST_MATH_BIG_CONSTANT(T, 53, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 53, 2.8822787662376169),
       BOOST_MATH_BIG_CONSTANT(T, 53, 4.1681660554090917),
@@ -77,7 +95,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
    // Maximum Deviation Found:                     6.896e-018
    // Expected Error Term :                       -6.895e-018
    // Maximum Relative Change in Control Points :  8.497e-004
-   static const T P_4_inf[] = {
+   BOOST_MATH_STATIC const T P_4_inf[] = {
       static_cast<T>(0.68947581948701249e-17L),
       static_cast<T>(0.49999999999998975L),
       static_cast<T>(1.0177274392923795L),
@@ -86,7 +104,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
       static_cast<T>(1.5897035272532764L),
       static_cast<T>(0.40154388356961734L),
    };
-   static const T Q_4_inf[] = {
+   BOOST_MATH_STATIC const T Q_4_inf[] = {
       static_cast<T>(1.0L),
       static_cast<T>(1.7021215452463932L),
       static_cast<T>(4.4290431747556469L),
@@ -110,11 +128,11 @@ T trigamma_prec(T x, const std::integral_constant<int, 53>*, const Policy&)
 }
 
 template <class T, class Policy>
-T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
+BOOST_MATH_GPU_ENABLED T trigamma_prec(T x, const Policy&, const boost::math::integral_constant<int, 64>&)
 {
    // Max error in interpolated form: 1.178e-020
-   static const T offset_1_2 = BOOST_MATH_BIG_CONSTANT(T, 64, 2.109325408935546875);
-   static const T P_1_2[] = {
+   BOOST_MATH_STATIC const T offset_1_2 = BOOST_MATH_BIG_CONSTANT(T, 64, 2.109325408935546875);
+   BOOST_MATH_STATIC const T P_1_2[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -1.10932535608960258341),
       BOOST_MATH_BIG_CONSTANT(T, 64, -4.18793841543017129052),
       BOOST_MATH_BIG_CONSTANT(T, 64, -4.63865531898487734531),
@@ -123,7 +141,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.21172611429185622377),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.259635673503366427284),
    };
-   static const T Q_1_2[] = {
+   BOOST_MATH_STATIC const T Q_1_2[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 64, 3.77521119359546982995),
       BOOST_MATH_BIG_CONSTANT(T, 64, 5.664338024578956321),
@@ -133,7 +151,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.629642219810618032207e-8),
    };
    // Max error in interpolated form: 3.912e-020
-   static const T P_2_8[] = {
+   BOOST_MATH_STATIC const T P_2_8[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.387540035162952880976e-11),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.500000000276430504),
       BOOST_MATH_BIG_CONSTANT(T, 64, 3.21926880986360957306),
@@ -143,7 +161,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 64, 13.4346512182925923978),
       BOOST_MATH_BIG_CONSTANT(T, 64, 3.98656291026448279118),
    };
-   static const T Q_2_8[] = {
+   BOOST_MATH_STATIC const T Q_2_8[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 64, 6.10520430478613667724),
       BOOST_MATH_BIG_CONSTANT(T, 64, 18.475001060603645512),
@@ -156,7 +174,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
    // Maximum Deviation Found:                     2.635e-020
    // Expected Error Term :                        2.635e-020
    // Maximum Relative Change in Control Points :  1.791e-003
-   static const T P_8_inf[] = {
+   BOOST_MATH_STATIC const T P_8_inf[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.263527875092466899848e-19),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.500000000000000058145),
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.0730121433777364138677),
@@ -164,7 +182,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
       BOOST_MATH_BIG_CONSTANT(T, 64, 0.0517092358874932620529),
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.07995383547483921121),
    };
-   static const T Q_8_inf[] = {
+   BOOST_MATH_STATIC const T Q_8_inf[] = {
       BOOST_MATH_BIG_CONSTANT(T, 64, 1.0),
       BOOST_MATH_BIG_CONSTANT(T, 64, -0.187309046577818095504),
       BOOST_MATH_BIG_CONSTANT(T, 64, 3.95255391645238842975),
@@ -188,7 +206,7 @@ T trigamma_prec(T x, const std::integral_constant<int, 64>*, const Policy&)
 }
 
 template <class T, class Policy>
-T trigamma_prec(T x, const std::integral_constant<int, 113>*, const Policy&)
+BOOST_MATH_GPU_ENABLED T trigamma_prec(T x, const Policy&, const boost::math::integral_constant<int, 113>&)
 {
    // Max error in interpolated form: 1.916e-035
 
@@ -356,8 +374,8 @@ T trigamma_prec(T x, const std::integral_constant<int, 113>*, const Policy&)
    return (1 + tools::evaluate_polynomial(P_16_inf, y) / tools::evaluate_polynomial(Q_16_inf, y)) / x;
 }
 
-template <class T, class Tag, class Policy>
-T trigamma_imp(T x, const Tag* t, const Policy& pol)
+template <class T, class Policy, class Tag>
+BOOST_MATH_GPU_ENABLED T trigamma_dispatch(T x, const Policy& pol, const Tag& tag)
 {
    //
    // This handles reflection of negative arguments, and all our
@@ -373,27 +391,29 @@ T trigamma_imp(T x, const Tag* t, const Policy& pol)
    {
       // Reflect:
       T z = 1 - x;
+
+      if(z < 1)
+      {
+         result = 1 / (z * z);
+         z += 1;
+      }
+
       // Argument reduction for tan:
       if(floor(x) == x)
       {
          return policies::raise_pole_error<T>("boost::math::trigamma<%1%>(%1%)", nullptr, (1-x), pol);
       }
       T s = fabs(x) < fabs(z) ? boost::math::sin_pi(x, pol) : boost::math::sin_pi(z, pol);
-      return -trigamma_imp(z, t, pol) + boost::math::pow<2>(constants::pi<T>()) / (s * s);
+      return result - trigamma_prec(T(z), pol, tag) + boost::math::pow<2>(constants::pi<T>()) / (s * s);
    }
    if(x < 1)
    {
       result = 1 / (x * x);
       x += 1;
    }
-   return result + trigamma_prec(x, t, pol);
+   return result + trigamma_prec(x, pol, tag);
 }
 
-template <class T, class Policy>
-T trigamma_imp(T x, const std::integral_constant<int, 0>*, const Policy& pol)
-{
-   return polygamma_imp(1, x, pol);
-}
 //
 // Initializer: ensure all our constants are initialized prior to the first call of main:
 //
@@ -402,22 +422,24 @@ struct trigamma_initializer
 {
    struct init
    {
-      init()
+      BOOST_MATH_GPU_ENABLED init()
       {
          typedef typename policies::precision<T, Policy>::type precision_type;
-         do_init(std::integral_constant<bool, precision_type::value && (precision_type::value <= 113)>());
+         do_init(boost::math::integral_constant<bool, precision_type::value && (precision_type::value <= 113)>());
       }
-      void do_init(const std::true_type&)
+      BOOST_MATH_GPU_ENABLED void do_init(const boost::math::true_type&)
       {
          boost::math::trigamma(T(2.5), Policy());
       }
-      void do_init(const std::false_type&){}
-      void force_instantiate()const{}
+      BOOST_MATH_GPU_ENABLED void do_init(const boost::math::false_type&){}
+      BOOST_MATH_GPU_ENABLED void force_instantiate()const{}
    };
    static const init initializer;
-   static void force_instantiate()
+   BOOST_MATH_GPU_ENABLED static void force_instantiate()
    {
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
       initializer.force_instantiate();
+      #endif
    }
 };
 
@@ -427,13 +449,13 @@ const typename trigamma_initializer<T, Policy>::init trigamma_initializer<T, Pol
 } // namespace detail
 
 template <class T, class Policy>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    trigamma(T x, const Policy&)
 {
    typedef typename tools::promote_args<T>::type result_type;
    typedef typename policies::evaluation<result_type, Policy>::type value_type;
    typedef typename policies::precision<T, Policy>::type precision_type;
-   typedef std::integral_constant<int,
+   typedef boost::math::integral_constant<int,
       precision_type::value <= 0 ? 0 :
       precision_type::value <= 53 ? 53 :
       precision_type::value <= 64 ? 64 :
@@ -449,13 +471,14 @@ inline typename tools::promote_args<T>::type
    // Force initialization of constants:
    detail::trigamma_initializer<value_type, forwarding_policy>::force_instantiate();
 
-   return policies::checked_narrowing_cast<result_type, Policy>(detail::trigamma_imp(
+   return policies::checked_narrowing_cast<result_type, Policy>(detail::trigamma_dispatch(
       static_cast<value_type>(x),
-      static_cast<const tag_type*>(nullptr), forwarding_policy()), "boost::math::trigamma<%1%>(%1%)");
+      forwarding_policy(),
+      tag_type()), "boost::math::trigamma<%1%>(%1%)");
 }
 
 template <class T>
-inline typename tools::promote_args<T>::type
+BOOST_MATH_GPU_ENABLED inline typename tools::promote_args<T>::type
    trigamma(T x)
 {
    return trigamma(x, policies::policy<>());
diff --git a/inst/include/boost/math/special_functions/trunc.hpp b/inst/include/boost/math/special_functions/trunc.hpp
index a084de560..b52f4f321 100644
--- a/inst/include/boost/math/special_functions/trunc.hpp
+++ b/inst/include/boost/math/special_functions/trunc.hpp
@@ -11,9 +11,14 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 #include <type_traits>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/math/tools/config.hpp>
 #include <boost/math/ccmath/detail/config.hpp>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
@@ -27,7 +32,7 @@
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Policy>
-inline tools::promote_args_t<T> trunc(const T& v, const Policy& pol, const std::false_type&)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> trunc(const T& v, const Policy& pol, const std::false_type&)
 {
    BOOST_MATH_STD_USING
    using result_type = tools::promote_args_t<T>;
@@ -39,23 +44,66 @@ inline tools::promote_args_t<T> trunc(const T& v, const Policy& pol, const std::
 }
 
 template <class T, class Policy>
-inline tools::promote_args_t<T> trunc(const T& v, const Policy&, const std::true_type&)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> trunc(const T& v, const Policy&, const std::true_type&)
 {
    return v;
 }
 
-}
+} // Namespace detail
 
 template <class T, class Policy>
-inline tools::promote_args_t<T> trunc(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> trunc(const T& v, const Policy& pol)
 {
    return detail::trunc(v, pol, std::integral_constant<bool, detail::is_integer_for_rounding<T>::value>());
 }
+
 template <class T>
-inline tools::promote_args_t<T> trunc(const T& v)
+BOOST_MATH_GPU_ENABLED inline tools::promote_args_t<T> trunc(const T& v)
 {
    return trunc(v, policies::policy<>());
 }
+
+#else // Special handling for nvrtc
+
+namespace boost {
+namespace math {
+
+namespace detail {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED double trunc_impl(T x)
+{
+   return static_cast<double>(x);
+}
+
+BOOST_MATH_GPU_ENABLED inline float trunc_impl(float x)
+{
+   return ::truncf(x);
+}
+
+BOOST_MATH_GPU_ENABLED inline double trunc_impl(double x)
+{
+   return ::trunc(x);
+}
+
+} // Namespace detail
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED auto trunc(T x, const Policy&)
+{
+   return detail::trunc_impl(x);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED auto trunc(T x)
+{
+   return detail::trunc_impl(x);
+}
+
+#endif
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
 //
 // The following functions will not compile unless T has an
 // implicit conversion to the integer types.  For user-defined
@@ -70,13 +118,13 @@ inline tools::promote_args_t<T> trunc(const T& v)
 // https://stackoverflow.com/questions/27442885/syntax-error-with-stdnumeric-limitsmax
 //
 template <class T, class Policy>
-inline int itrunc(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline int itrunc(const T& v, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    using result_type = tools::promote_args_t<T>;
    result_type r = boost::math::trunc(v, pol);
 
-   #ifdef BOOST_MATH_HAS_CONSTEXPR_LDEXP
+   #if defined(BOOST_MATH_HAS_CONSTEXPR_LDEXP) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
    if constexpr (std::is_arithmetic_v<result_type>
                  #ifdef BOOST_MATH_FLOAT128_TYPE
                  && !std::is_same_v<BOOST_MATH_FLOAT128_TYPE, result_type>
@@ -100,7 +148,7 @@ inline int itrunc(const T& v, const Policy& pol)
       }
    }
    #else
-   static const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<int>::digits);
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<int>::digits);
 
    if (r >= max_val || r < -max_val)
    {
@@ -110,20 +158,21 @@ inline int itrunc(const T& v, const Policy& pol)
 
    return static_cast<int>(r);
 }
+
 template <class T>
-inline int itrunc(const T& v)
+BOOST_MATH_GPU_ENABLED inline int itrunc(const T& v)
 {
    return itrunc(v, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline long ltrunc(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline long ltrunc(const T& v, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    using result_type = tools::promote_args_t<T>;
    result_type r = boost::math::trunc(v, pol);
 
-   #ifdef BOOST_MATH_HAS_CONSTEXPR_LDEXP
+   #if defined(BOOST_MATH_HAS_CONSTEXPR_LDEXP) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
    if constexpr (std::is_arithmetic_v<result_type>
                  #ifdef BOOST_MATH_FLOAT128_TYPE
                  && !std::is_same_v<BOOST_MATH_FLOAT128_TYPE, result_type>
@@ -147,7 +196,7 @@ inline long ltrunc(const T& v, const Policy& pol)
       }
    }
    #else
-   static const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long>::digits);
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long>::digits);
 
    if (r >= max_val || r < -max_val)
    {
@@ -157,20 +206,21 @@ inline long ltrunc(const T& v, const Policy& pol)
 
    return static_cast<long>(r);
 }
+
 template <class T>
-inline long ltrunc(const T& v)
+BOOST_MATH_GPU_ENABLED inline long ltrunc(const T& v)
 {
    return ltrunc(v, policies::policy<>());
 }
 
 template <class T, class Policy>
-inline long long lltrunc(const T& v, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline long long lltrunc(const T& v, const Policy& pol)
 {
    BOOST_MATH_STD_USING
    using result_type = tools::promote_args_t<T>;
    result_type r = boost::math::trunc(v, pol);
 
-   #ifdef BOOST_MATH_HAS_CONSTEXPR_LDEXP
+   #if defined(BOOST_MATH_HAS_CONSTEXPR_LDEXP) && !defined(BOOST_MATH_HAS_GPU_SUPPORT)
    if constexpr (std::is_arithmetic_v<result_type>
                  #ifdef BOOST_MATH_FLOAT128_TYPE
                  && !std::is_same_v<BOOST_MATH_FLOAT128_TYPE, result_type>
@@ -194,7 +244,7 @@ inline long long lltrunc(const T& v, const Policy& pol)
       }
    }
    #else
-   static const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long long>::digits);
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const result_type max_val = ldexp(static_cast<result_type>(1), std::numeric_limits<long long>::digits);
 
    if (r >= max_val || r < -max_val)
    {
@@ -204,21 +254,81 @@ inline long long lltrunc(const T& v, const Policy& pol)
 
    return static_cast<long long>(r);
 }
+
 template <class T>
-inline long long lltrunc(const T& v)
+BOOST_MATH_GPU_ENABLED inline long long lltrunc(const T& v)
 {
    return lltrunc(v, policies::policy<>());
 }
 
+#else // Reduced impl specifically for NVRTC platform
+
+namespace detail {
+
+template <typename TargetType, typename T>
+BOOST_MATH_GPU_ENABLED TargetType integer_trunc_impl(T v)
+{
+   double r = boost::math::trunc(v);
+
+   const double max_val = ldexp(1.0, boost::math::numeric_limits<TargetType>::digits);
+
+   if (r >= max_val || r < -max_val)
+   {
+      r = 0;
+   }
+
+   return static_cast<TargetType>(r);
+}
+
+} // Namespace detail
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED int itrunc(T v)
+{
+   return detail::integer_trunc_impl<int>(v);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED int itrunc(T v, const Policy&)
+{
+   return detail::integer_trunc_impl<int>(v);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED long ltrunc(T v)
+{
+   return detail::integer_trunc_impl<long>(v);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED long ltrunc(T v, const Policy&)
+{
+   return detail::integer_trunc_impl<long>(v);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED long long lltrunc(T v)
+{
+   return detail::integer_trunc_impl<long long>(v);
+}
+
+template <typename T, typename Policy>
+BOOST_MATH_GPU_ENABLED long long lltrunc(T v, const Policy&)
+{
+   return detail::integer_trunc_impl<long long>(v);
+}
+
+#endif // BOOST_MATH_HAS_NVRTC
+
 template <class T, class Policy>
-inline typename std::enable_if<std::is_constructible<int, T>::value, int>::type
+BOOST_MATH_GPU_ENABLED inline boost::math::enable_if_t<boost::math::is_constructible_v<int, T>, int>
    iconvert(const T& v, const Policy&)
 {
    return static_cast<int>(v);
 }
 
 template <class T, class Policy>
-inline typename std::enable_if<!std::is_constructible<int, T>::value, int>::type
+BOOST_MATH_GPU_ENABLED inline boost::math::enable_if_t<!boost::math::is_constructible_v<int, T>, int>
    iconvert(const T& v, const Policy& pol)
 {
    using boost::math::itrunc;
@@ -226,14 +336,14 @@ inline typename std::enable_if<!std::is_constructible<int, T>::value, int>::type
 }
 
 template <class T, class Policy>
-inline typename std::enable_if<std::is_constructible<long, T>::value, long>::type
+BOOST_MATH_GPU_ENABLED inline boost::math::enable_if_t<boost::math::is_constructible_v<long, T>, long>
    lconvert(const T& v, const Policy&)
 {
    return static_cast<long>(v);
 }
 
 template <class T, class Policy>
-inline typename std::enable_if<!std::is_constructible<long, T>::value, long>::type
+BOOST_MATH_GPU_ENABLED inline boost::math::enable_if_t<!boost::math::is_constructible_v<long, T>, long>
    lconvert(const T& v, const Policy& pol)
 {
    using boost::math::ltrunc;
@@ -241,14 +351,29 @@ inline typename std::enable_if<!std::is_constructible<long, T>::value, long>::ty
 }
 
 template <class T, class Policy>
-inline typename std::enable_if<std::is_constructible<long long, T>::value, long long>::type
+BOOST_MATH_GPU_ENABLED inline boost::math::enable_if_t<boost::math::is_constructible_v<long long, T>, long long>
+   llconvert(const T& v, const Policy&)
+{
+   return static_cast<long long>(v);
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED inline typename boost::math::enable_if_t<!boost::math::is_constructible_v<long long, T>, long long>
+   llconvert(const T& v, const Policy& pol)
+{
+   using boost::math::lltrunc;
+   return lltrunc(v, pol);
+}
+
+template <class T, class Policy>
+BOOST_MATH_GPU_ENABLED [[deprecated("Use llconvert")]] inline boost::math::enable_if_t<boost::math::is_constructible_v<long long, T>, long long>
    llconvertert(const T& v, const Policy&)
 {
    return static_cast<long long>(v);
 }
 
 template <class T, class Policy>
-inline typename std::enable_if<!std::is_constructible<long long, T>::value, long long>::type
+BOOST_MATH_GPU_ENABLED [[deprecated("Use llconvert")]] inline typename boost::math::enable_if_t<!boost::math::is_constructible_v<long long, T>, long long>
    llconvertert(const T& v, const Policy& pol)
 {
    using boost::math::lltrunc;
diff --git a/inst/include/boost/math/special_functions/ulp.hpp b/inst/include/boost/math/special_functions/ulp.hpp
index 3c0616db0..5d1617ace 100644
--- a/inst/include/boost/math/special_functions/ulp.hpp
+++ b/inst/include/boost/math/special_functions/ulp.hpp
@@ -14,6 +14,7 @@
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/special_functions/next.hpp>
+#include <boost/math/tools/precision.hpp>
 
 namespace boost{ namespace math{ namespace detail{
 
diff --git a/inst/include/boost/math/special_functions/zeta.hpp b/inst/include/boost/math/special_functions/zeta.hpp
index 118aa7d35..1a3bba748 100644
--- a/inst/include/boost/math/special_functions/zeta.hpp
+++ b/inst/include/boost/math/special_functions/zeta.hpp
@@ -936,7 +936,7 @@ T zeta_imp(T s, T sc, const Policy& pol, const Tag& tag)
    //
    if(floor(s) == s)
    {
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
       // Without exceptions we expect itrunc to return INT_MAX on overflow
       // and we fall through anyway.
       try
@@ -964,7 +964,7 @@ T zeta_imp(T s, T sc, const Policy& pol, const Tag& tag)
             else
                return zeta_imp_odd_integer(v, sc, pol, std::integral_constant<bool, (Tag::value <= 113) && Tag::value>());
          }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
       }
       catch(const boost::math::rounding_error&){} // Just fall through, s is too large to round
       catch(const std::overflow_error&){}
diff --git a/inst/include/boost/math/statistics/detail/single_pass.hpp b/inst/include/boost/math/statistics/detail/single_pass.hpp
index 738850965..015021f2b 100644
--- a/inst/include/boost/math/statistics/detail/single_pass.hpp
+++ b/inst/include/boost/math/statistics/detail/single_pass.hpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <vector>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <future>
 #include <thread>
 #endif
@@ -112,7 +112,7 @@ ReturnType first_four_moments_sequential_impl(ForwardIterator first, ForwardIter
     return std::make_tuple(M1, M2, M3, M4, n-1);
 }
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 
 // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Higher-order_statistics
 // EQN 3.1: https://www.osti.gov/servlets/purl/1426900
@@ -200,7 +200,7 @@ ReturnType first_four_moments_parallel_impl(ForwardIterator first, ForwardIterat
     return std::make_tuple(M1_a, M2_a, M3_a, M4_a, elements);
 }
 
-#endif // BOOST_HAS_THREADS
+#endif // BOOST_MATH_HAS_THREADS
 
 // Follows equation 1.5 of:
 // https://prod.sandia.gov/techlib-noauth/access-control.cgi/2008/086212.pdf
@@ -282,7 +282,7 @@ ReturnType gini_range_fraction(ForwardIterator first, ForwardIterator last, std:
     return std::make_tuple(num, denom, i);
 }
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 
 template<typename ReturnType, typename ExecutionPolicy, typename ForwardIterator>
 ReturnType gini_coefficient_parallel_impl(ExecutionPolicy&&, ForwardIterator first, ForwardIterator last)
@@ -357,7 +357,7 @@ ReturnType gini_coefficient_parallel_impl(ExecutionPolicy&&, ForwardIterator fir
     }
 }
 
-#endif // BOOST_HAS_THREADS
+#endif // BOOST_MATH_HAS_THREADS
 
 template<typename ForwardIterator, typename OutputIterator>
 OutputIterator mode_impl(ForwardIterator first, ForwardIterator last, OutputIterator output)
diff --git a/inst/include/boost/math/statistics/signal_statistics.hpp b/inst/include/boost/math/statistics/signal_statistics.hpp
index ebde0f8bb..d2ded721c 100644
--- a/inst/include/boost/math/statistics/signal_statistics.hpp
+++ b/inst/include/boost/math/statistics/signal_statistics.hpp
@@ -16,7 +16,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/array.hpp b/inst/include/boost/math/tools/array.hpp
new file mode 100644
index 000000000..23e666673
--- /dev/null
+++ b/inst/include/boost/math/tools/array.hpp
@@ -0,0 +1,41 @@
+//  Copyright (c) 2024 Matt Borland
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+//  Regular use of std::array functions can not be used on 
+//  GPU platforms like CUDA since they are missing the __device__ marker
+//  Alias as needed to get correct support
+
+#ifndef BOOST_MATH_TOOLS_ARRAY_HPP
+#define BOOST_MATH_TOOLS_ARRAY_HPP
+
+#include <boost/math/tools/config.hpp>
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <cuda/std/array>
+
+namespace boost {
+namespace math {
+
+using cuda::std::array;
+
+} // namespace math
+} // namespace boost
+
+#else
+
+#include <array>
+
+namespace boost {
+namespace math {
+
+using std::array;
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_ENABLE_CUDA
+
+#endif // BOOST_MATH_TOOLS_ARRAY_HPP
diff --git a/inst/include/boost/math/tools/assert.hpp b/inst/include/boost/math/tools/assert.hpp
index 3d5655923..3f57351fc 100644
--- a/inst/include/boost/math/tools/assert.hpp
+++ b/inst/include/boost/math/tools/assert.hpp
@@ -10,6 +10,19 @@
 #ifndef BOOST_MATH_TOOLS_ASSERT_HPP
 #define BOOST_MATH_TOOLS_ASSERT_HPP
 
+#include <boost/math/tools/config.hpp>
+
+#ifdef BOOST_MATH_HAS_GPU_SUPPORT
+
+// Run time asserts are generally unsupported
+
+#define BOOST_MATH_ASSERT(expr)
+#define BOOST_MATH_ASSERT_MSG(expr, msg)
+#define BOOST_MATH_STATIC_ASSERT(expr) static_assert(expr, #expr " failed")
+#define BOOST_MATH_STATIC_ASSERT_MSG(expr, msg) static_assert(expr, msg)
+
+#else
+
 #include <boost/math/tools/is_standalone.hpp>
 
 #ifndef BOOST_MATH_STANDALONE
@@ -29,6 +42,8 @@
 #define BOOST_MATH_STATIC_ASSERT(expr) static_assert(expr, #expr " failed")
 #define BOOST_MATH_STATIC_ASSERT_MSG(expr, msg) static_assert(expr, msg)
 
-#endif
+#endif // Is standalone
+
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
 
 #endif // BOOST_MATH_TOOLS_ASSERT_HPP
diff --git a/inst/include/boost/math/tools/atomic.hpp b/inst/include/boost/math/tools/atomic.hpp
index e3cbf5db8..f558bd63a 100644
--- a/inst/include/boost/math/tools/atomic.hpp
+++ b/inst/include/boost/math/tools/atomic.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/cxx03_warn.hpp>
 
-#ifdef BOOST_HAS_THREADS
+#ifdef BOOST_MATH_HAS_THREADS
 #include <atomic>
 
 namespace boost {
@@ -45,6 +45,6 @@ namespace boost {
 
 #else
 #  define BOOST_MATH_NO_ATOMIC_INT
-#endif // BOOST_HAS_THREADS
+#endif // BOOST_MATH_HAS_THREADS
 
 #endif // BOOST_MATH_ATOMIC_DETAIL_HPP
diff --git a/inst/include/boost/math/tools/big_constant.hpp b/inst/include/boost/math/tools/big_constant.hpp
index b26d8cf86..0d54976bc 100644
--- a/inst/include/boost/math/tools/big_constant.hpp
+++ b/inst/include/boost/math/tools/big_constant.hpp
@@ -8,6 +8,12 @@
 #define BOOST_MATH_TOOLS_BIG_CONSTANT_HPP
 
 #include <boost/math/tools/config.hpp>
+
+// On NVRTC we don't need any of this
+// We just have a simple definition of the macro since the largest float
+// type on the platform is a 64-bit double
+#ifndef BOOST_MATH_HAS_NVRTC 
+
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/lexical_cast.hpp>
 #endif
@@ -43,12 +49,12 @@ typedef double largest_float;
 #endif
 
 template <class T>
-inline constexpr T make_big_value(largest_float v, const char*, std::true_type const&, std::false_type const&) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED constexpr T make_big_value(largest_float v, const char*, std::true_type const&, std::false_type const&) BOOST_MATH_NOEXCEPT(T)
 {
    return static_cast<T>(v);
 }
 template <class T>
-inline constexpr T make_big_value(largest_float v, const char*, std::true_type const&, std::true_type const&) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED constexpr T make_big_value(largest_float v, const char*, std::true_type const&, std::true_type const&) BOOST_MATH_NOEXCEPT(T)
 {
    return static_cast<T>(v);
 }
@@ -77,7 +83,7 @@ inline constexpr T make_big_value(largest_float, const char* s, std::false_type
 #define BOOST_MATH_BIG_CONSTANT(T, D, x)\
    boost::math::tools::make_big_value<T>(\
       BOOST_MATH_LARGEST_FLOAT_C(x), \
-      BOOST_STRINGIZE(x), \
+      BOOST_MATH_STRINGIZE(x), \
       std::integral_constant<bool, (std::is_convertible<boost::math::tools::largest_float, T>::value) && \
       ((D <= boost::math::tools::numeric_traits<boost::math::tools::largest_float>::digits) \
           || std::is_floating_point<T>::value \
@@ -88,11 +94,13 @@ inline constexpr T make_big_value(largest_float, const char* s, std::false_type
 // For constants too huge for any conceivable long double (and which generate compiler errors if we try and declare them as such):
 //
 #define BOOST_MATH_HUGE_CONSTANT(T, D, x)\
-   boost::math::tools::make_big_value<T>(0.0L, BOOST_STRINGIZE(x), \
+   boost::math::tools::make_big_value<T>(0.0L, BOOST_MATH_STRINGIZE(x), \
    std::integral_constant<bool, std::is_floating_point<T>::value || (boost::math::tools::numeric_traits<T>::is_specialized && boost::math::tools::numeric_traits<T>::max_exponent <= boost::math::tools::numeric_traits<boost::math::tools::largest_float>::max_exponent && boost::math::tools::numeric_traits<T>::digits <= boost::math::tools::numeric_traits<boost::math::tools::largest_float>::digits)>(), \
    std::is_constructible<T, const char*>())
 
 }}} // namespaces
 
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif
 
diff --git a/inst/include/boost/math/tools/centered_continued_fraction.hpp b/inst/include/boost/math/tools/centered_continued_fraction.hpp
index 1bb095c8f..87e76b51b 100644
--- a/inst/include/boost/math/tools/centered_continued_fraction.hpp
+++ b/inst/include/boost/math/tools/centered_continued_fraction.hpp
@@ -20,7 +20,7 @@
 
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/complex.hpp b/inst/include/boost/math/tools/complex.hpp
index d462ca809..ec5144011 100644
--- a/inst/include/boost/math/tools/complex.hpp
+++ b/inst/include/boost/math/tools/complex.hpp
@@ -10,9 +10,39 @@
 #ifndef BOOST_MATH_TOOLS_COMPLEX_HPP
 #define BOOST_MATH_TOOLS_COMPLEX_HPP
 
-#include <utility>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/is_detected.hpp>
 
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <cuda/std/utility>
+#include <cuda/std/complex>
+
+namespace boost {
+namespace math {
+
+template <typename T>
+using complex = cuda::std::complex<T>;
+
+} // namespace math
+} // namespace boost
+
+#else
+
+#include <utility>
+#include <complex>
+
+namespace boost {
+namespace math {
+
+template <typename T>
+using complex = std::complex<T>;
+
+} // namespace math
+} // namespace boost
+
+#endif
+
 namespace boost {
    namespace math {
       namespace tools {
@@ -24,12 +54,21 @@ namespace boost {
             static constexpr bool value = false;
          };
 
+         #ifndef BOOST_MATH_ENABLE_CUDA
          template <typename T>
          struct is_complex_type_impl<T, void_t<decltype(std::declval<T>().real()), 
                                                decltype(std::declval<T>().imag())>>
          {
             static constexpr bool value = true;
          };
+         #else
+         template <typename T>
+         struct is_complex_type_impl<T, void_t<decltype(cuda::std::declval<T>().real()), 
+                                               decltype(cuda::std::declval<T>().imag())>>
+         {
+            static constexpr bool value = true;
+         };
+         #endif
          } // Namespace detail
 
          template <typename T>
diff --git a/inst/include/boost/math/tools/condition_numbers.hpp b/inst/include/boost/math/tools/condition_numbers.hpp
index b25c32d6a..c285b479f 100644
--- a/inst/include/boost/math/tools/condition_numbers.hpp
+++ b/inst/include/boost/math/tools/condition_numbers.hpp
@@ -28,7 +28,7 @@ class summation_condition_number {
         using std::abs;
         // No need to Kahan the l1 calc; it's well conditioned:
         m_l1 += abs(x);
-        BOOST_IF_CONSTEXPR (kahan)
+        BOOST_MATH_IF_CONSTEXPR (kahan)
         {
             Real y = x - m_c;
             Real t = m_sum + y;
@@ -95,12 +95,12 @@ Real evaluation_condition_number(F const & f, Real const & x)
     }
     bool caught_exception = false;
     Real fp;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
     try
     {
 #endif
         fp = finite_difference_derivative(f, x);
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
     }
     catch(...)
     {
diff --git a/inst/include/boost/math/tools/config.hpp b/inst/include/boost/math/tools/config.hpp
index b1d93bc3d..12f3411c2 100644
--- a/inst/include/boost/math/tools/config.hpp
+++ b/inst/include/boost/math/tools/config.hpp
@@ -11,25 +11,80 @@
 #pragma once
 #endif
 
+#ifndef __CUDACC_RTC__
+
 #include <boost/math/tools/is_standalone.hpp>
 
 // Minimum language standard transition
 #ifdef _MSVC_LANG
 #  if _MSVC_LANG < 201402L
-#    pragma warning("The minimum language standard to use Boost.Math will be C++14 starting in July 2023 (Boost 1.82 release)");
+#    pragma message("Boost.Math requires C++14");
+#  endif
+#  if _MSC_VER == 1900
+#    pragma message("MSVC 14.0 has broken C++14 constexpr support. Support for this compiler will be removed in Boost 1.86")
 #  endif
 #else
 #  if __cplusplus < 201402L
-#    warning "The minimum language standard to use Boost.Math will be C++14 starting in July 2023 (Boost 1.82 release)"
+#    warning "Boost.Math requires C++14"
 #  endif
 #endif
 
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
 
+
+// The following are all defined as standalone macros as well
+// If Boost.Config is available just use those definitions because they are more fine-grained
+
+// Could be defined in TR1
+#ifndef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION
+#  define BOOST_MATH_PREVENT_MACRO_SUBSTITUTION BOOST_PREVENT_MACRO_SUBSTITUTION
+#endif
+
+#define BOOST_MATH_CXX14_CONSTEXPR BOOST_CXX14_CONSTEXPR
+#ifdef BOOST_NO_CXX14_CONSTEXPR
+#  define BOOST_MATH_NO_CXX14_CONSTEXPR
+#endif
+
+#define BOOST_MATH_IF_CONSTEXPR BOOST_IF_CONSTEXPR
+#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#  define BOOST_MATH_NO_CXX17_IF_CONSTEXPR
+#endif
+
+#ifdef BOOST_NO_CXX17_HDR_EXECUTION
+#  define BOOST_MATH_NO_CXX17_HDR_EXECUTION
+#endif
+
+#ifdef BOOST_HAS_THREADS
+#  define BOOST_MATH_HAS_THREADS
+#endif
+#ifdef BOOST_DISABLE_THREADS
+#  define BOOST_MATH_DISABLE_THREADS
+#endif
+#ifdef BOOST_NO_CXX11_THREAD_LOCAL
+#  define BOOST_MATH_NO_CXX11_THREAD_LOCAL
+#endif
+
+#ifdef BOOST_NO_EXCEPTIONS
+#  define BOOST_MATH_NO_EXCEPTIONS
+#endif
+
+#ifdef BOOST_NO_TYPEID
+#  define BOOST_MATH_NO_TYPEID
+#endif
+#ifdef BOOST_NO_RTTI
+#  define BOOST_MATH_NO_RTTI
+#endif
+
+#define BOOST_MATH_NOINLINE BOOST_NOINLINE
+#define BOOST_MATH_FORCEINLINE BOOST_FORCEINLINE
+
+#define BOOST_MATH_JOIN(X, Y) BOOST_JOIN(X, Y)
+#define BOOST_MATH_STRINGIZE(X) BOOST_STRINGIZE(X)
+
 #else // Things from boost/config that are required, and easy to replicate
 
-#define BOOST_PREVENT_MACRO_SUBSTITUTION
+#define BOOST_MATH_PREVENT_MACRO_SUBSTITUTION
 #define BOOST_MATH_NO_REAL_CONCEPT_TESTS
 #define BOOST_MATH_NO_DISTRIBUTION_CONCEPT_TESTS
 #define BOOST_MATH_NO_LEXICAL_CAST
@@ -38,59 +93,56 @@
 #define BOOST_MATH_NO_MP_TESTS
 
 #if (__cplusplus > 201400L || _MSVC_LANG > 201400L)
-#define BOOST_CXX14_CONSTEXPR constexpr
+#define BOOST_MATH_CXX14_CONSTEXPR constexpr
 #else
-#define BOOST_CXX14_CONSTEXPR
-#define BOOST_NO_CXX14_CONSTEXPR
-#endif // BOOST_CXX14_CONSTEXPR
+#define BOOST_MATH_CXX14_CONSTEXPR
+#define BOOST_MATH_NO_CXX14_CONSTEXPR
+#endif // BOOST_MATH_CXX14_CONSTEXPR
 
 #if (__cplusplus > 201700L || _MSVC_LANG > 201700L)
-#define BOOST_IF_CONSTEXPR if constexpr
+#define BOOST_MATH_IF_CONSTEXPR if constexpr
 
 // Clang on mac provides the execution header with none of the functionality. TODO: Check back on this
 // https://en.cppreference.com/w/cpp/compiler_support "Standardization of Parallelism TS"
-#if !__has_include(<execution>) || (defined(__APPLE__) && defined(__clang__))
-#define BOOST_NO_CXX17_HDR_EXECUTION
-#endif
+#  if !__has_include(<execution>) || (defined(__APPLE__) && defined(__clang__))
+#  define BOOST_MATH_NO_CXX17_HDR_EXECUTION
+#  endif
 #else
-#define BOOST_IF_CONSTEXPR if
-#define BOOST_NO_CXX17_IF_CONSTEXPR
-#define BOOST_NO_CXX17_HDR_EXECUTION
+#  define BOOST_MATH_IF_CONSTEXPR if
+#  define BOOST_MATH_NO_CXX17_IF_CONSTEXPR
+#  define BOOST_MATH_NO_CXX17_HDR_EXECUTION
 #endif
 
 #if __cpp_lib_gcd_lcm >= 201606L
 #define BOOST_MATH_HAS_CXX17_NUMERIC
 #endif
 
-#define BOOST_JOIN(X, Y) BOOST_DO_JOIN(X, Y)
-#define BOOST_DO_JOIN(X, Y) BOOST_DO_JOIN2(X,Y)
-#define BOOST_DO_JOIN2(X, Y) X##Y
+#define BOOST_MATH_JOIN(X, Y) BOOST_MATH_DO_JOIN(X, Y)
+#define BOOST_MATH_DO_JOIN(X, Y) BOOST_MATH_DO_JOIN2(X,Y)
+#define BOOST_MATH_DO_JOIN2(X, Y) X##Y
 
-#define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X)
-#define BOOST_DO_STRINGIZE(X) #X
+#define BOOST_MATH_STRINGIZE(X) BOOST_MATH_DO_STRINGIZE(X)
+#define BOOST_MATH_DO_STRINGIZE(X) #X
 
-#ifdef BOOST_DISABLE_THREADS // No threads, do nothing
+#ifdef BOOST_MATH_DISABLE_THREADS // No threads, do nothing
 // Detect thread support via STL implementation
 #elif defined(__has_include)
 #  if !__has_include(<thread>) || !__has_include(<mutex>) || !__has_include(<future>) || !__has_include(<atomic>)
-#     define BOOST_DISABLE_THREADS
+#     define BOOST_MATH_DISABLE_THREADS
 #  else
-#     define BOOST_HAS_THREADS
+#     define BOOST_MATH_HAS_THREADS
 #  endif 
 #else
-#  define BOOST_HAS_THREADS // The default assumption is that the machine has threads
+#  define BOOST_MATH_HAS_THREADS // The default assumption is that the machine has threads
 #endif // Thread Support
 
-#ifdef BOOST_DISABLE_THREADS
-#  define BOOST_NO_CXX11_HDR_ATOMIC
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_THREAD_LOCAL
-#endif // BOOST_DISABLE_THREADS
+#ifdef BOOST_MATH_DISABLE_THREADS
+#  define BOOST_MATH_NO_CXX11_THREAD_LOCAL
+#endif // BOOST_MATH_DISABLE_THREADS
 
 #ifdef __GNUC__
-#  if !defined(__EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
-#     define BOOST_NO_EXCEPTIONS
+#  if !defined(__EXCEPTIONS) && !defined(BOOST_MATH_NO_EXCEPTIONS)
+#     define BOOST_MATH_NO_EXCEPTIONS
 #  endif
    //
    // Make sure we have some std lib headers included so we can detect __GXX_RTTI:
@@ -98,43 +150,43 @@
 #  include <algorithm>  // for min and max
 #  include <limits>
 #  ifndef __GXX_RTTI
-#     ifndef BOOST_NO_TYPEID
-#        define BOOST_NO_TYPEID
+#     ifndef BOOST_MATH_NO_TYPEID
+#        define BOOST_MATH_NO_TYPEID
 #     endif
-#     ifndef BOOST_NO_RTTI
-#        define BOOST_NO_RTTI
+#     ifndef BOOST_MATH_NO_RTTI
+#        define BOOST_MATH_NO_RTTI
 #     endif
 #  endif
 #endif
 
-#if !defined(BOOST_NOINLINE)
+#if !defined(BOOST_MATH_NOINLINE)
 #  if defined(_MSC_VER)
-#    define BOOST_NOINLINE __declspec(noinline)
+#    define BOOST_MATH_NOINLINE __declspec(noinline)
 #  elif defined(__GNUC__) && __GNUC__ > 3
      // Clang also defines __GNUC__ (as 4)
 #    if defined(__CUDACC__)
        // nvcc doesn't always parse __noinline__,
        // see: https://svn.boost.org/trac/boost/ticket/9392
-#      define BOOST_NOINLINE __attribute__ ((noinline))
+#      define BOOST_MATH_NOINLINE __attribute__ ((noinline))
 #    elif defined(__HIP__)
        // See https://github.com/boostorg/config/issues/392
-#      define BOOST_NOINLINE __attribute__ ((noinline))
+#      define BOOST_MATH_NOINLINE __attribute__ ((noinline))
 #    else
-#      define BOOST_NOINLINE __attribute__ ((__noinline__))
+#      define BOOST_MATH_NOINLINE __attribute__ ((__noinline__))
 #    endif
 #  else
-#    define BOOST_NOINLINE
+#    define BOOST_MATH_NOINLINE
 #  endif
 #endif
 
-#if !defined(BOOST_FORCEINLINE)
+#if !defined(BOOST_MATH_FORCEINLINE)
 #  if defined(_MSC_VER)
-#    define BOOST_FORCEINLINE __forceinline
+#    define BOOST_MATH_FORCEINLINE __forceinline
 #  elif defined(__GNUC__) && __GNUC__ > 3
      // Clang also defines __GNUC__ (as 4)
-#    define BOOST_FORCEINLINE inline __attribute__ ((__always_inline__))
+#    define BOOST_MATH_FORCEINLINE inline __attribute__ ((__always_inline__))
 #  else
-#    define BOOST_FORCEINLINE inline
+#    define BOOST_MATH_FORCEINLINE inline
 #  endif
 #endif
 
@@ -142,12 +194,12 @@
 
 // Support compilers with P0024R2 implemented without linking TBB
 // https://en.cppreference.com/w/cpp/compiler_support
-#if !defined(BOOST_NO_CXX17_HDR_EXECUTION) && defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_MATH_NO_CXX17_HDR_EXECUTION) && defined(BOOST_MATH_HAS_THREADS)
 #  define BOOST_MATH_EXEC_COMPATIBLE
 #endif
 
 // C++23
-#if __cplusplus > 202002L || _MSVC_LANG > 202002L
+#if __cplusplus > 202002L || (defined(_MSVC_LANG) &&_MSVC_LANG > 202002L)
 #  if __GNUC__ >= 13
      // libstdc++3 only defines to/from_chars for std::float128_t when one of these defines are set
      // otherwise we're right out of luck...
@@ -168,12 +220,16 @@
 
 #include <boost/math/tools/user.hpp>
 
-#if (defined(__NetBSD__) || defined(__EMSCRIPTEN__)\
+#if (defined(__NetBSD__)\
    || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
    && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 //#  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 #endif
 
+#if defined(__EMSCRIPTEN__) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
+#  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+#endif
+
 #ifdef __IBMCPP__
 //
 // For reasons I don't understand, the tests with IMB's compiler all
@@ -315,42 +371,62 @@ struct non_type {};
 #endif
 
 //
-// Tune performance options for specific compilers:
+// Tune performance options for specific compilers,
+// but check at each step that nothing has been previously defined by the user first
 //
 #ifdef _MSC_VER
-#  define BOOST_MATH_POLY_METHOD 2
+#  ifndef BOOST_MATH_POLY_METHOD
+#    define BOOST_MATH_POLY_METHOD 2
+#  endif
 #if _MSC_VER <= 1900
-#  define BOOST_MATH_RATIONAL_METHOD 1
+#  ifndef BOOST_MATH_POLY_METHOD
+#    define BOOST_MATH_RATIONAL_METHOD 1
+#  endif
 #else
-#  define BOOST_MATH_RATIONAL_METHOD 2
+#  ifndef BOOST_MATH_RATIONAL_METHOD
+#    define BOOST_MATH_RATIONAL_METHOD 2
+#  endif
 #endif
 #if _MSC_VER > 1900
-#  define BOOST_MATH_INT_TABLE_TYPE(RT, IT) RT
-#  define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##.0L
+#  ifndef BOOST_MATH_INT_TABLE_TYPE
+#    define BOOST_MATH_INT_TABLE_TYPE(RT, IT) RT
+#  endif
+#  ifndef BOOST_MATH_INT_VALUE_SUFFIX
+#    define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##.0L
+#  endif
 #endif
 
 #elif defined(__INTEL_COMPILER)
-#  define BOOST_MATH_POLY_METHOD 2
-#  define BOOST_MATH_RATIONAL_METHOD 1
+#  ifndef BOOST_MATH_POLY_METHOD
+#    define BOOST_MATH_POLY_METHOD 2
+#  endif
+#  ifndef BOOST_MATH_RATIONAL_METHOD
+#    define BOOST_MATH_RATIONAL_METHOD 1
+#  endif
 
 #elif defined(__GNUC__)
-#if __GNUC__ < 4
-#  define BOOST_MATH_POLY_METHOD 3
-#  define BOOST_MATH_RATIONAL_METHOD 3
-#  define BOOST_MATH_INT_TABLE_TYPE(RT, IT) RT
-#  define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##.0L
-#else
-#  define BOOST_MATH_POLY_METHOD 3
-#  define BOOST_MATH_RATIONAL_METHOD 3
-#endif
+#  ifndef BOOST_MATH_POLY_METHOD
+#    define BOOST_MATH_POLY_METHOD 3
+#  endif
+#  ifndef BOOST_MATH_RATIONAL_METHOD
+#    define BOOST_MATH_RATIONAL_METHOD 3
+#  endif
 
 #elif defined(__clang__)
 
 #if __clang__ > 6
-#  define BOOST_MATH_POLY_METHOD 3
-#  define BOOST_MATH_RATIONAL_METHOD 3
-#  define BOOST_MATH_INT_TABLE_TYPE(RT, IT) RT
-#  define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##.0L
+#  ifndef BOOST_MATH_POLY_METHOD
+#    define BOOST_MATH_POLY_METHOD 3
+#  endif
+#  ifndef BOOST_MATH_RATIONAL_METHOD
+#    define BOOST_MATH_RATIONAL_METHOD 3
+#  endif
+#  ifndef BOOST_MATH_INT_TABLE_TYPE
+#    define BOOST_MATH_INT_TABLE_TYPE(RT, IT) RT
+#  endif
+#  ifndef BOOST_MATH_INT_VALUE_SUFFIX
+#    define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##.0L
+#  endif
 #endif
 
 #endif
@@ -393,7 +469,7 @@ struct non_type {};
 #if defined(BOOST_MATH_STANDALONE) && defined(_GLIBCXX_USE_FLOAT128) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && !defined(__STRICT_ANSI__) \
    && !defined(BOOST_MATH_DISABLE_FLOAT128) && !defined(BOOST_MATH_USE_FLOAT128)
 #  define BOOST_MATH_USE_FLOAT128
-#elif defined(BOOST_HAS_FLOAT128) && !defined(BOOST_MATH_USE_FLOAT128)
+#elif defined(BOOST_HAS_FLOAT128) && !defined(BOOST_MATH_USE_FLOAT128) && !defined(BOOST_MATH_DISABLE_FLOAT128)
 #  define BOOST_MATH_USE_FLOAT128
 #endif
 #ifdef BOOST_MATH_USE_FLOAT128
@@ -452,7 +528,9 @@ struct non_type {};
    using std::ceil;\
    using std::floor;\
    using std::log10;\
-   using std::sqrt;
+   using std::sqrt;\
+   using std::log2;\
+   using std::ilogb;
 
 #define BOOST_MATH_STD_USING BOOST_MATH_STD_USING_CORE
 
@@ -461,13 +539,13 @@ namespace tools
 {
 
 template <class T>
-inline T max BOOST_PREVENT_MACRO_SUBSTITUTION(T a, T b, T c) BOOST_MATH_NOEXCEPT(T)
+inline T max BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T a, T b, T c) BOOST_MATH_NOEXCEPT(T)
 {
    return (std::max)((std::max)(a, b), c);
 }
 
 template <class T>
-inline T max BOOST_PREVENT_MACRO_SUBSTITUTION(T a, T b, T c, T d) BOOST_MATH_NOEXCEPT(T)
+inline T max BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T a, T b, T c, T d) BOOST_MATH_NOEXCEPT(T)
 {
    return (std::max)((std::max)(a, b), (std::max)(c, d));
 }
@@ -565,7 +643,7 @@ namespace boost{ namespace math{
 //
 // Thread local storage:
 //
-#ifndef BOOST_DISABLE_THREADS
+#ifndef BOOST_MATH_DISABLE_THREADS
 #  define BOOST_MATH_THREAD_LOCAL thread_local
 #else
 #  define BOOST_MATH_THREAD_LOCAL 
@@ -583,13 +661,191 @@ namespace boost{ namespace math{
 //
 // Can we have constexpr tables?
 //
-#if (!defined(BOOST_NO_CXX14_CONSTEXPR)) || (defined(_MSC_VER) && _MSC_VER >= 1910)
+#if (!defined(BOOST_MATH_NO_CXX14_CONSTEXPR)) || (defined(_MSC_VER) && _MSC_VER >= 1910)
 #define BOOST_MATH_HAVE_CONSTEXPR_TABLES
 #define BOOST_MATH_CONSTEXPR_TABLE_FUNCTION constexpr
 #else
 #define BOOST_MATH_CONSTEXPR_TABLE_FUNCTION
 #endif
 
+//
+// CUDA support:
+//
+
+#ifdef __CUDACC__
+
+// We have to get our include order correct otherwise you get compilation failures
+#include <cuda.h>
+#include <cuda_runtime.h>
+#include <cuda/std/type_traits>
+#include <cuda/std/utility>
+#include <cuda/std/cstdint>
+#include <cuda/std/array>
+#include <cuda/std/tuple>
+#include <cuda/std/complex>
+
+#  define BOOST_MATH_CUDA_ENABLED __host__ __device__
+#  define BOOST_MATH_HAS_GPU_SUPPORT
+
+#  ifndef BOOST_MATH_ENABLE_CUDA
+#    define BOOST_MATH_ENABLE_CUDA
+#  endif
+
+// Device code can not handle exceptions
+#  ifndef BOOST_MATH_NO_EXCEPTIONS
+#    define BOOST_MATH_NO_EXCEPTIONS
+#  endif
+
+// We want to use force inline from CUDA instead of the host compiler
+#  undef BOOST_MATH_FORCEINLINE
+#  define BOOST_MATH_FORCEINLINE __forceinline__
+
+#elif defined(SYCL_LANGUAGE_VERSION)
+
+#  define BOOST_MATH_SYCL_ENABLED SYCL_EXTERNAL
+#  define BOOST_MATH_HAS_GPU_SUPPORT
+
+#  ifndef BOOST_MATH_ENABLE_SYCL
+#    define BOOST_MATH_ENABLE_SYCL
+#  endif
+
+#  ifndef BOOST_MATH_NO_EXCEPTIONS
+#    define BOOST_MATH_NO_EXCEPTIONS
+#  endif
+
+// spir64 does not support long double
+#  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+#  define BOOST_MATH_NO_REAL_CONCEPT_TESTS
+
+#  undef BOOST_MATH_FORCEINLINE
+#  define BOOST_MATH_FORCEINLINE inline
+
+#endif
+
+#ifndef BOOST_MATH_CUDA_ENABLED
+#  define BOOST_MATH_CUDA_ENABLED
+#endif
+
+#ifndef BOOST_MATH_SYCL_ENABLED
+#  define BOOST_MATH_SYCL_ENABLED
+#endif
+
+// Not all functions that allow CUDA allow SYCL (e.g. Recursion is disallowed by SYCL)
+#  define BOOST_MATH_GPU_ENABLED BOOST_MATH_CUDA_ENABLED BOOST_MATH_SYCL_ENABLED
+
+// Additional functions that need replaced/marked up
+#ifdef BOOST_MATH_HAS_GPU_SUPPORT
+template <class T>
+BOOST_MATH_GPU_ENABLED constexpr void gpu_safe_swap(T& a, T& b) { T t(a); a = b; b = t; }
+template <class T>
+BOOST_MATH_GPU_ENABLED constexpr T gpu_safe_min(const T& a, const T& b) { return a < b ? a : b; }
+template <class T>
+BOOST_MATH_GPU_ENABLED constexpr T gpu_safe_max(const T& a, const T& b) { return a > b ? a : b; }
+
+#define BOOST_MATH_GPU_SAFE_SWAP(a, b) gpu_safe_swap(a, b)
+#define BOOST_MATH_GPU_SAFE_MIN(a, b) gpu_safe_min(a, b)
+#define BOOST_MATH_GPU_SAFE_MAX(a, b) gpu_safe_max(a, b)
+
+#else
+
+#define BOOST_MATH_GPU_SAFE_SWAP(a, b) std::swap(a, b)
+#define BOOST_MATH_GPU_SAFE_MIN(a, b) (std::min)(a, b)
+#define BOOST_MATH_GPU_SAFE_MAX(a, b) (std::max)(a, b)
+
+#endif
+
+// Static variables are not allowed with CUDA or C++20 modules
+// See if we can inline them instead
+
+#if defined(__cpp_inline_variables) && __cpp_inline_variables >= 201606L
+#  define BOOST_MATH_INLINE_CONSTEXPR inline constexpr
+#  define BOOST_MATH_STATIC static
+#  ifndef BOOST_MATH_HAS_GPU_SUPPORT
+#    define BOOST_MATH_STATIC_LOCAL_VARIABLE static
+#  else
+#    define BOOST_MATH_STATIC_LOCAL_VARIABLE
+#  endif
+#else
+#  ifndef BOOST_MATH_HAS_GPU_SUPPORT
+#    define BOOST_MATH_INLINE_CONSTEXPR static constexpr
+#    define BOOST_MATH_STATIC static
+#    define BOOST_MATH_STATIC_LOCAL_VARIABLE
+#  else
+#    define BOOST_MATH_INLINE_CONSTEXPR constexpr
+#    define BOOST_MATH_STATIC constexpr
+#    define BOOST_MATH_STATIC_LOCAL_VARIABLE static
+#  endif
+#endif
+
+#define BOOST_MATH_FP_NAN FP_NAN
+#define BOOST_MATH_FP_INFINITE FP_INFINITE
+#define BOOST_MATH_FP_ZERO FP_ZERO
+#define BOOST_MATH_FP_SUBNORMAL FP_SUBNORMAL
+#define BOOST_MATH_FP_NORMAL FP_NORMAL
+
+#else // Special section for CUDA NVRTC to ensure we consume no STL headers
+
+#ifndef BOOST_MATH_STANDALONE
+#  define BOOST_MATH_STANDALONE
+#endif
+
+#define BOOST_MATH_HAS_NVRTC
+#define BOOST_MATH_ENABLE_CUDA
+#define BOOST_MATH_HAS_GPU_SUPPORT
+
+#define BOOST_MATH_GPU_ENABLED __host__ __device__
+#define BOOST_MATH_CUDA_ENABLED __host__ __device__
+
+#define BOOST_MATH_STATIC static
+#define BOOST_MATH_STATIC_LOCAL_VARIABLE
+
+#define BOOST_MATH_NOEXCEPT(T) noexcept(boost::math::is_floating_point_v<T>)
+#define BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T) 
+#define BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T) 
+#define BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE_SPEC(T) 
+#define BOOST_MATH_BIG_CONSTANT(T, N, V) static_cast<T>(V)
+#define BOOST_MATH_FORCEINLINE __forceinline__
+#define BOOST_MATH_STD_USING  
+#define BOOST_MATH_IF_CONSTEXPR if
+#define BOOST_MATH_IS_FLOAT(T) (boost::math::is_floating_point<T>::value)
+#define BOOST_MATH_CONSTEXPR_TABLE_FUNCTION constexpr
+#define BOOST_MATH_NO_EXCEPTIONS
+#define BOOST_MATH_PREVENT_MACRO_SUBSTITUTION 
+
+// This should be defined to nothing but since it is not specifically a math macro
+// we need to undef before proceeding
+#ifdef BOOST_FPU_EXCEPTION_GUARD
+#  undef BOOST_FPU_EXCEPTION_GUARD
+#endif
+
+#define BOOST_FPU_EXCEPTION_GUARD
+
+template <class T>
+BOOST_MATH_GPU_ENABLED constexpr void gpu_safe_swap(T& a, T& b) { T t(a); a = b; b = t; }
+
+#define BOOST_MATH_GPU_SAFE_SWAP(a, b) gpu_safe_swap(a, b)
+#define BOOST_MATH_GPU_SAFE_MIN(a, b) (::min)(a, b)
+#define BOOST_MATH_GPU_SAFE_MAX(a, b) (::max)(a, b)
+
+#define BOOST_MATH_FP_NAN 0
+#define BOOST_MATH_FP_INFINITE 1
+#define BOOST_MATH_FP_ZERO 2
+#define BOOST_MATH_FP_SUBNORMAL 3
+#define BOOST_MATH_FP_NORMAL 4
+
+#define BOOST_MATH_INT_VALUE_SUFFIX(RV, SUF) RV##SUF
+#define BOOST_MATH_INT_TABLE_TYPE(RT, IT) IT
+
+#if defined(__cpp_inline_variables) && __cpp_inline_variables >= 201606L
+#  define BOOST_MATH_INLINE_CONSTEXPR inline constexpr
+#else
+#  define BOOST_MATH_INLINE_CONSTEXPR constexpr
+#endif
+
+#define BOOST_MATH_INSTRUMENT_VARIABLE(x)
+#define BOOST_MATH_INSTRUMENT_CODE(x) 
+
+#endif // NVRTC
 
 #endif // BOOST_MATH_TOOLS_CONFIG_HPP
 
diff --git a/inst/include/boost/math/tools/convert_from_string.hpp b/inst/include/boost/math/tools/convert_from_string.hpp
index f6fe08aee..3b7895cdf 100644
--- a/inst/include/boost/math/tools/convert_from_string.hpp
+++ b/inst/include/boost/math/tools/convert_from_string.hpp
@@ -14,7 +14,18 @@
 #include <boost/math/tools/config.hpp>
 #include <type_traits>
 #ifndef BOOST_MATH_STANDALONE
+
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 #include <boost/lexical_cast.hpp>
+
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #endif
 
 namespace boost{ namespace math{ namespace tools{
diff --git a/inst/include/boost/math/tools/cstdint.hpp b/inst/include/boost/math/tools/cstdint.hpp
new file mode 100644
index 000000000..ce2c913b5
--- /dev/null
+++ b/inst/include/boost/math/tools/cstdint.hpp
@@ -0,0 +1,107 @@
+//  Copyright (c) 2024 Matt Borland
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_MATH_TOOLS_CSTDINT
+#define BOOST_MATH_TOOLS_CSTDINT
+
+#include <boost/math/tools/config.hpp>
+
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <cuda/std/cstdint>
+
+namespace boost {
+namespace math {
+
+using cuda::std::int8_t;
+using cuda::std::int16_t;
+using cuda::std::int32_t;
+using cuda::std::int64_t;
+
+using cuda::std::int_fast8_t;
+using cuda::std::int_fast16_t;
+using cuda::std::int_fast32_t;
+using cuda::std::int_fast64_t;
+
+using cuda::std::int_least8_t;
+using cuda::std::int_least16_t;
+using cuda::std::int_least32_t;
+using cuda::std::int_least64_t;
+
+using cuda::std::intmax_t;
+using cuda::std::intptr_t;
+
+using cuda::std::uint8_t;
+using cuda::std::uint16_t;
+using cuda::std::uint32_t;
+using cuda::std::uint64_t;
+
+using cuda::std::uint_fast8_t;
+using cuda::std::uint_fast16_t;
+using cuda::std::uint_fast32_t;
+using cuda::std::uint_fast64_t;
+
+using cuda::std::uint_least8_t;
+using cuda::std::uint_least16_t;
+using cuda::std::uint_least32_t;
+using cuda::std::uint_least64_t;
+
+using cuda::std::uintmax_t;
+using cuda::std::uintptr_t;
+
+using size_t = unsigned long;
+
+#else
+
+#include <cstdint>
+
+namespace boost {
+namespace math {
+
+using std::int8_t;
+using std::int16_t;
+using std::int32_t;
+using std::int64_t;
+
+using std::int_fast8_t;
+using std::int_fast16_t;
+using std::int_fast32_t;
+using std::int_fast64_t;
+
+using std::int_least8_t;
+using std::int_least16_t;
+using std::int_least32_t;
+using std::int_least64_t;
+
+using std::intmax_t;
+using std::intptr_t;
+
+using std::uint8_t;
+using std::uint16_t;
+using std::uint32_t;
+using std::uint64_t;
+
+using std::uint_fast8_t;
+using std::uint_fast16_t;
+using std::uint_fast32_t;
+using std::uint_fast64_t;
+
+using std::uint_least8_t;
+using std::uint_least16_t;
+using std::uint_least32_t;
+using std::uint_least64_t;
+
+using std::uintmax_t;
+using std::uintptr_t;
+
+using std::size_t;
+
+#endif
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_TOOLS_CSTDINT
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_10.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_10.hpp
index 6876af2d2..04ad90b69 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_10.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_10.hpp
@@ -12,67 +12,67 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_11.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_11.hpp
index a5154c7a6..f99ab8250 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_11.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_11.hpp
@@ -12,73 +12,73 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_12.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_12.hpp
index 82bf88c28..3006ebe51 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_12.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_12.hpp
@@ -12,79 +12,79 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_13.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_13.hpp
index f61c553dd..0f1118909 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_13.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_13.hpp
@@ -12,85 +12,85 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_14.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_14.hpp
index 76e9f07b2..caba4b97e 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_14.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_14.hpp
@@ -12,91 +12,91 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_15.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_15.hpp
index bca8cf724..c8f42ac81 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_15.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_15.hpp
@@ -12,97 +12,97 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_16.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_16.hpp
index 16ddb081d..2ed591ccf 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_16.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_16.hpp
@@ -12,103 +12,103 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_17.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_17.hpp
index 5828621fb..5e9fc8cd7 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_17.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_17.hpp
@@ -12,109 +12,109 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_18.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_18.hpp
index a2a1c12f4..ffb62ff04 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_18.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_18.hpp
@@ -12,115 +12,115 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((((a[17] * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_19.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_19.hpp
index 83ede26b5..56df108ac 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_19.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_19.hpp
@@ -12,121 +12,121 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((((a[17] * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((((((a[18] * x + a[17]) * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_2.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_2.hpp
index 93d0f7c9c..63091ebdd 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_2.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_2.hpp
@@ -12,19 +12,19 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_20.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_20.hpp
index d77020911..c16e5143e 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_20.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_20.hpp
@@ -12,127 +12,127 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((((a[17] * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((((((((((((a[18] * x + a[17]) * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((((((((((((((a[19] * x + a[18]) * x + a[17]) * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_3.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_3.hpp
index 0fde1a743..0aeccc111 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_3.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_3.hpp
@@ -12,25 +12,25 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_4.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_4.hpp
index 9e589791c..61058fce8 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_4.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_4.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_5.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_5.hpp
index 64dc00251..47021bc50 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_5.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_5.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_6.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_6.hpp
index dbc06347f..bfd24371d 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_6.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_6.hpp
@@ -12,43 +12,43 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_7.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_7.hpp
index 1472b2ede..50ddca63f 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_7.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_7.hpp
@@ -12,49 +12,49 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_8.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_8.hpp
index 95edfa0c6..3be7ba4d1 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_8.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_8.hpp
@@ -12,55 +12,55 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner1_9.hpp b/inst/include/boost/math/tools/detail/polynomial_horner1_9.hpp
index f434a26c4..4ec53c48b 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner1_9.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner1_9.hpp
@@ -12,61 +12,61 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_10.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_10.hpp
index 1fce239a4..f242d7464 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_10.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_10.hpp
@@ -12,72 +12,72 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_11.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_11.hpp
index 3cf086c3b..edf7f86c5 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_11.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_11.hpp
@@ -12,79 +12,79 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_12.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_12.hpp
index e9f8eae7c..969c9c4dd 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_12.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_12.hpp
@@ -12,86 +12,86 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_13.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_13.hpp
index d9d2a5e24..ed4559d11 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_13.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_13.hpp
@@ -12,93 +12,93 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_14.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_14.hpp
index b4280597a..4b79eb78a 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_14.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_14.hpp
@@ -12,100 +12,100 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_15.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_15.hpp
index 89a7a46f5..28b62eee7 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_15.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_15.hpp
@@ -12,107 +12,107 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_16.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_16.hpp
index d2379d2bc..6368b4054 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_16.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_16.hpp
@@ -12,114 +12,114 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_17.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_17.hpp
index d1921efc4..551e6191c 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_17.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_17.hpp
@@ -12,121 +12,121 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_18.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_18.hpp
index 945c4e403..19cfdc19e 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_18.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_18.hpp
@@ -12,128 +12,128 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_19.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_19.hpp
index a3049354c..9ea87fd93 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_19.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_19.hpp
@@ -12,135 +12,135 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((((a[18] * x2 + a[16]) * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_2.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_2.hpp
index 8b3a7dcd8..1982a81f3 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_2.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_2.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_20.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_20.hpp
index a4ccc93b3..23afe55e0 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_20.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_20.hpp
@@ -12,142 +12,142 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((((((((a[18] * x2 + a[16]) * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((((((((a[19] * x2 + a[17]) * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((((a[18] * x2 + a[16]) * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_3.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_3.hpp
index d0b988cf8..f9d6953b8 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_3.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_3.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_4.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_4.hpp
index 7f0708680..8f11de5b3 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_4.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_4.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_5.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_5.hpp
index f4e7b809b..eba9ee9e6 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_5.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_5.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_6.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_6.hpp
index 764e52250..ef77c6255 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_6.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_6.hpp
@@ -12,44 +12,44 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_7.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_7.hpp
index 50fb3333c..fe8d21b95 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_7.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_7.hpp
@@ -12,51 +12,51 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_8.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_8.hpp
index c74b19d43..de1810a94 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_8.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_8.hpp
@@ -12,58 +12,58 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner2_9.hpp b/inst/include/boost/math/tools/detail/polynomial_horner2_9.hpp
index 7d6e7e421..5c53b7329 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner2_9.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner2_9.hpp
@@ -12,65 +12,65 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>(((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    return static_cast<V>((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x);
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_10.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_10.hpp
index b980b1b3d..7fb5bb474 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_10.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_10.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_11.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_11.hpp
index 2ab4b2ac3..9f22820de 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_11.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_11.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_12.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_12.hpp
index 460642727..b04961376 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_12.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_12.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_13.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_13.hpp
index d35fa904f..f39a33cc9 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_13.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_13.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_14.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_14.hpp
index 346b9dc28..32b9e7db2 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_14.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_14.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_15.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_15.hpp
index 500bc3231..55325c84b 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_15.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_15.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -262,7 +262,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_16.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_16.hpp
index 269f36739..f71d62f50 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_16.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_16.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -262,7 +262,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -295,7 +295,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_17.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_17.hpp
index 1d97a6f15..783a34558 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_17.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_17.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -262,7 +262,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -295,7 +295,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -330,7 +330,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_18.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_18.hpp
index 80e49cbb1..b10b270c4 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_18.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_18.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -262,7 +262,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -295,7 +295,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -330,7 +330,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -367,7 +367,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_19.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_19.hpp
index eae3775e0..21147591c 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_19.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_19.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -262,7 +262,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -295,7 +295,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -330,7 +330,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -367,7 +367,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -406,7 +406,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_2.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_2.hpp
index 628167420..ee3e35e6c 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_2.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_2.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_20.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_20.hpp
index 00f8caae2..338aeb7db 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_20.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_20.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -127,7 +127,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -150,7 +150,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -175,7 +175,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -202,7 +202,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -231,7 +231,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -262,7 +262,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -295,7 +295,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -330,7 +330,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -367,7 +367,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -406,7 +406,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -447,7 +447,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_3.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_3.hpp
index 8f69c2bfe..1eee0cfac 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_3.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_3.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_4.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_4.hpp
index 34db81234..efa7fba48 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_4.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_4.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_5.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_5.hpp
index ed955e4a7..f150e2a4a 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_5.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_5.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_6.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_6.hpp
index 96d9a6dda..fe679e74d 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_6.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_6.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_7.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_7.hpp
index 80a9f3af4..76f080ad9 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_7.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_7.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_8.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_8.hpp
index ee526ad73..75634bdfc 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_8.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_8.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/polynomial_horner3_9.hpp b/inst/include/boost/math/tools/detail/polynomial_horner3_9.hpp
index a17ce909c..63a40580d 100644
--- a/inst/include/boost/math/tools/detail/polynomial_horner3_9.hpp
+++ b/inst/include/boost/math/tools/detail/polynomial_horner3_9.hpp
@@ -12,37 +12,37 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[1] * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[2] * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[3] * x + a[2]) * x + a[1]) * x + a[0]);
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -55,7 +55,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -70,7 +70,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -87,7 +87,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
@@ -106,7 +106,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_c
 }
 
 template <class T, class V>
-inline V evaluate_polynomial_c_imp(const T* a, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
    V x2 = x * x;
    V t[2];
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_10.hpp b/inst/include/boost/math/tools/detail/rational_horner1_10.hpp
index dd23e0d7b..e2f6c6d2f 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_10.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_10.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_11.hpp b/inst/include/boost/math/tools/detail/rational_horner1_11.hpp
index 7ca35d39f..31d480a65 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_11.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_11.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_12.hpp b/inst/include/boost/math/tools/detail/rational_horner1_12.hpp
index 5ee313852..c08a85b3a 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_12.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_12.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_13.hpp b/inst/include/boost/math/tools/detail/rational_horner1_13.hpp
index 6e675777a..cc87ec2dc 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_13.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_13.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_14.hpp b/inst/include/boost/math/tools/detail/rational_horner1_14.hpp
index b8e5f7b2e..256473710 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_14.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_14.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_15.hpp b/inst/include/boost/math/tools/detail/rational_horner1_15.hpp
index 801f4439b..2ab24814e 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_15.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_15.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((b[14] * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_16.hpp b/inst/include/boost/math/tools/detail/rational_horner1_16.hpp
index b0f8cbb03..dce0b5e9b 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_16.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_16.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((b[14] * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -192,9 +192,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((b[15] * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_17.hpp b/inst/include/boost/math/tools/detail/rational_horner1_17.hpp
index 32759b831..8e875d657 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_17.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_17.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((b[14] * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -192,9 +192,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((b[15] * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -204,9 +204,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((((b[16] * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_18.hpp b/inst/include/boost/math/tools/detail/rational_horner1_18.hpp
index 6c91a930d..ab67a970b 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_18.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_18.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((b[14] * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -192,9 +192,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((b[15] * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -204,9 +204,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((((b[16] * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -216,9 +216,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((((a[17] * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((((b[17] * x + b[16]) * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_19.hpp b/inst/include/boost/math/tools/detail/rational_horner1_19.hpp
index 8c9e08315..dc300343a 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_19.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_19.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((b[14] * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -192,9 +192,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((b[15] * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -204,9 +204,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((((b[16] * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -216,9 +216,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((((a[17] * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((((b[17] * x + b[16]) * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -228,9 +228,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((((((a[18] * x + a[17]) * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((((((b[18] * x + b[17]) * x + b[16]) * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_2.hpp b/inst/include/boost/math/tools/detail/rational_horner1_2.hpp
index 605bb0424..c6b1ef9ef 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_2.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_2.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_20.hpp b/inst/include/boost/math/tools/detail/rational_horner1_20.hpp
index 2c29d6ba8..5b8b170c1 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_20.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_20.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -120,9 +120,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((a[9] * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((b[9] * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -132,9 +132,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((a[10] * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((b[10] * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -144,9 +144,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((a[11] * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((b[11] * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -156,9 +156,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((a[12] * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((b[12] * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -168,9 +168,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((a[13] * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((b[13] * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((a[14] * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((b[14] * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -192,9 +192,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((a[15] * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((b[15] * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -204,9 +204,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((((a[16] * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((((b[16] * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -216,9 +216,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((((a[17] * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((((b[17] * x + b[16]) * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -228,9 +228,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((((((((((((a[18] * x + a[17]) * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((((((((((((b[18] * x + b[17]) * x + b[16]) * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -240,9 +240,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((((((((((((((a[19] * x + a[18]) * x + a[17]) * x + a[16]) * x + a[15]) * x + a[14]) * x + a[13]) * x + a[12]) * x + a[11]) * x + a[10]) * x + a[9]) * x + a[8]) * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((((((((((((((b[19] * x + b[18]) * x + b[17]) * x + b[16]) * x + b[15]) * x + b[14]) * x + b[13]) * x + b[12]) * x + b[11]) * x + b[10]) * x + b[9]) * x + b[8]) * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_3.hpp b/inst/include/boost/math/tools/detail/rational_horner1_3.hpp
index 3f16fdf1d..6933e22bf 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_3.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_3.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_4.hpp b/inst/include/boost/math/tools/detail/rational_horner1_4.hpp
index 778a692c8..49b983577 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_4.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_4.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_5.hpp b/inst/include/boost/math/tools/detail/rational_horner1_5.hpp
index 0ae61fca0..91e97ff44 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_5.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_5.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_6.hpp b/inst/include/boost/math/tools/detail/rational_horner1_6.hpp
index 9e2501696..876b026cd 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_6.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_6.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_7.hpp b/inst/include/boost/math/tools/detail/rational_horner1_7.hpp
index 7dc78d1f9..bcac18293 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_7.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_7.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_8.hpp b/inst/include/boost/math/tools/detail/rational_horner1_8.hpp
index 8f5df2c22..55e30a53e 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_8.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_8.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner1_9.hpp b/inst/include/boost/math/tools/detail/rational_horner1_9.hpp
index a46c9d7aa..c7087de50 100644
--- a/inst/include/boost/math/tools/detail/rational_horner1_9.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner1_9.hpp
@@ -12,21 +12,21 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
    else
    {
@@ -36,9 +36,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
    else
    {
@@ -48,9 +48,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -60,9 +60,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((a[4] * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((b[4] * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -72,9 +72,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((a[5] * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((b[5] * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -84,9 +84,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((a[6] * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((b[6] * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -96,9 +96,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>((((((((a[7] * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / (((((((b[7] * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
@@ -108,9 +108,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
      return static_cast<V>(((((((((a[8] * x + a[7]) * x + a[6]) * x + a[5]) * x + a[4]) * x + a[3]) * x + a[2]) * x + a[1]) * x + a[0]) / ((((((((b[8] * x + b[7]) * x + b[6]) * x + b[5]) * x + b[4]) * x + b[3]) * x + b[2]) * x + b[1]) * x + b[0]));
    else
    {
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_10.hpp b/inst/include/boost/math/tools/detail/rational_horner2_10.hpp
index f3ff07535..4d74a714d 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_10.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_10.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_11.hpp b/inst/include/boost/math/tools/detail/rational_horner2_11.hpp
index 250b4ee29..15f1cf255 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_11.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_11.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_12.hpp b/inst/include/boost/math/tools/detail/rational_horner2_12.hpp
index df2b2771f..24e9d9e7f 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_12.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_12.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_13.hpp b/inst/include/boost/math/tools/detail/rational_horner2_13.hpp
index 2bbc97e4d..495f88525 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_13.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_13.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_14.hpp b/inst/include/boost/math/tools/detail/rational_horner2_14.hpp
index 157a844ce..273e723b6 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_14.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_14.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_15.hpp b/inst/include/boost/math/tools/detail/rational_horner2_15.hpp
index 9b392bef2..c7e24ec7d 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_15.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_15.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -202,9 +202,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_16.hpp b/inst/include/boost/math/tools/detail/rational_horner2_16.hpp
index d884131ad..2eebd702b 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_16.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_16.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -202,9 +202,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -218,9 +218,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_17.hpp b/inst/include/boost/math/tools/detail/rational_horner2_17.hpp
index 87efe07f8..1fee63047 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_17.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_17.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -202,9 +202,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -218,9 +218,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -234,9 +234,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_18.hpp b/inst/include/boost/math/tools/detail/rational_horner2_18.hpp
index 6989c6dba..7aedbf2aa 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_18.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_18.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -202,9 +202,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -218,9 +218,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -234,9 +234,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -250,9 +250,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((((b[17] * x2 + b[15]) * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_19.hpp b/inst/include/boost/math/tools/detail/rational_horner2_19.hpp
index 11d382a5c..1c36a267c 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_19.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_19.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -202,9 +202,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -218,9 +218,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -234,9 +234,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -250,9 +250,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((((b[17] * x2 + b[15]) * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -266,9 +266,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((((a[18] * x2 + a[16]) * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((((b[18] * x2 + b[16]) * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((((b[17] * x2 + b[15]) * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_2.hpp b/inst/include/boost/math/tools/detail/rational_horner2_2.hpp
index 9c4fe47a7..bb2e2c4dc 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_2.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_2.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_20.hpp b/inst/include/boost/math/tools/detail/rational_horner2_20.hpp
index 469cbb7ee..a591b901c 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_20.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_20.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -122,9 +122,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -138,9 +138,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((a[9] * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((b[9] * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -154,9 +154,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((a[10] * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((b[10] * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -170,9 +170,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((a[11] * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((b[11] * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -186,9 +186,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((a[12] * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((b[12] * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -202,9 +202,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((a[13] * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((b[13] * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -218,9 +218,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((a[14] * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((((b[14] * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -234,9 +234,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((((((a[15] * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((((((b[15] * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -250,9 +250,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + (((((((a[16] * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / (((((((((b[17] * x2 + b[15]) * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + (((((((b[16] * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -266,9 +266,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((((((((a[18] * x2 + a[16]) * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((((((((a[17] * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / (((((((((b[18] * x2 + b[16]) * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((((((((b[17] * x2 + b[15]) * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
@@ -282,9 +282,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((((((((a[19] * x2 + a[17]) * x2 + a[15]) * x2 + a[13]) * x2 + a[11]) * x2 + a[9]) * x2 + a[7]) * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((((((((a[18] * x2 + a[16]) * x2 + a[14]) * x2 + a[12]) * x2 + a[10]) * x2 + a[8]) * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((((((((b[19] * x2 + b[17]) * x2 + b[15]) * x2 + b[13]) * x2 + b[11]) * x2 + b[9]) * x2 + b[7]) * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((((((((b[18] * x2 + b[16]) * x2 + b[14]) * x2 + b[12]) * x2 + b[10]) * x2 + b[8]) * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_3.hpp b/inst/include/boost/math/tools/detail/rational_horner2_3.hpp
index d19993cce..0b410d8bb 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_3.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_3.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_4.hpp b/inst/include/boost/math/tools/detail/rational_horner2_4.hpp
index 847f26dc4..07a9a2c5a 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_4.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_4.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_5.hpp b/inst/include/boost/math/tools/detail/rational_horner2_5.hpp
index e1cf56671..0933ddfbc 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_5.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_5.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_6.hpp b/inst/include/boost/math/tools/detail/rational_horner2_6.hpp
index 480fcb471..dee9c6e16 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_6.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_6.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_7.hpp b/inst/include/boost/math/tools/detail/rational_horner2_7.hpp
index 9ae76bd3c..6f9a85838 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_7.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_7.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_8.hpp b/inst/include/boost/math/tools/detail/rational_horner2_8.hpp
index 2f82d3653..33dda23bb 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_8.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_8.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
diff --git a/inst/include/boost/math/tools/detail/rational_horner2_9.hpp b/inst/include/boost/math/tools/detail/rational_horner2_9.hpp
index e4b222430..a9025a890 100644
--- a/inst/include/boost/math/tools/detail/rational_horner2_9.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner2_9.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((a[4] * x2 + a[2]) * x2 + a[0] + (a[3] * x2 + a[1]) * x) / ((b[4] * x2 + b[2]) * x2 + b[0] + (b[3] * x2 + b[1]) * x));
@@ -58,9 +58,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[5] * x2 + a[3]) * x2 + a[1]) * x + (a[4] * x2 + a[2]) * x2 + a[0]) / (((b[5] * x2 + b[3]) * x2 + b[1]) * x + (b[4] * x2 + b[2]) * x2 + b[0]));
@@ -74,9 +74,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>((((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + ((a[5] * x2 + a[3]) * x2 + a[1]) * x) / (((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + ((b[5] * x2 + b[3]) * x2 + b[1]) * x));
@@ -90,9 +90,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x + ((a[6] * x2 + a[4]) * x2 + a[2]) * x2 + a[0]) / ((((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x + ((b[6] * x2 + b[4]) * x2 + b[2]) * x2 + b[0]));
@@ -106,9 +106,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       return static_cast<V>(((((a[8] * x2 + a[6]) * x2 + a[4]) * x2 + a[2]) * x2 + a[0] + (((a[7] * x2 + a[5]) * x2 + a[3]) * x2 + a[1]) * x) / ((((b[8] * x2 + b[6]) * x2 + b[4]) * x2 + b[2]) * x2 + b[0] + (((b[7] * x2 + b[5]) * x2 + b[3]) * x2 + b[1]) * x));
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_10.hpp b/inst/include/boost/math/tools/detail/rational_horner3_10.hpp
index 9b3bdbe92..b7cec124e 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_10.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_10.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_11.hpp b/inst/include/boost/math/tools/detail/rational_horner3_11.hpp
index dd00d58cf..579f0e486 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_11.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_11.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_12.hpp b/inst/include/boost/math/tools/detail/rational_horner3_12.hpp
index bfc53420e..54300dd08 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_12.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_12.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_13.hpp b/inst/include/boost/math/tools/detail/rational_horner3_13.hpp
index c1237d587..d2fc7b633 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_13.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_13.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_14.hpp b/inst/include/boost/math/tools/detail/rational_horner3_14.hpp
index 030fa4ec7..0b7675f49 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_14.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_14.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_15.hpp b/inst/include/boost/math/tools/detail/rational_horner3_15.hpp
index 925267548..8286caed0 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_15.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_15.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -782,9 +782,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_16.hpp b/inst/include/boost/math/tools/detail/rational_horner3_16.hpp
index 5bbf67d90..fc823e416 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_16.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_16.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -782,9 +782,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -900,9 +900,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_17.hpp b/inst/include/boost/math/tools/detail/rational_horner3_17.hpp
index 1f1e2d736..cf7f75a70 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_17.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_17.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -782,9 +782,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -900,9 +900,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1026,9 +1026,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_18.hpp b/inst/include/boost/math/tools/detail/rational_horner3_18.hpp
index 6ce9844bf..f853ed3e0 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_18.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_18.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -782,9 +782,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -900,9 +900,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1026,9 +1026,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1160,9 +1160,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_19.hpp b/inst/include/boost/math/tools/detail/rational_horner3_19.hpp
index b10844767..d44e22c90 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_19.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_19.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -782,9 +782,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -900,9 +900,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1026,9 +1026,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1160,9 +1160,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1302,9 +1302,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_2.hpp b/inst/include/boost/math/tools/detail/rational_horner3_2.hpp
index 9c4fe47a7..bb2e2c4dc 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_2.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_2.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_20.hpp b/inst/include/boost/math/tools/detail/rational_horner3_20.hpp
index e125934a1..967edf083 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_20.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_20.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -312,9 +312,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 10>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -390,9 +390,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 11>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -476,9 +476,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 12>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -570,9 +570,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 13>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -672,9 +672,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 14>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -782,9 +782,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 15>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -900,9 +900,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 16>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1026,9 +1026,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 17>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1160,9 +1160,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 18>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1302,9 +1302,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 19>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -1452,9 +1452,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 20>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_3.hpp b/inst/include/boost/math/tools/detail/rational_horner3_3.hpp
index d19993cce..0b410d8bb 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_3.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_3.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_4.hpp b/inst/include/boost/math/tools/detail/rational_horner3_4.hpp
index 847f26dc4..07a9a2c5a 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_4.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_4.hpp
@@ -12,31 +12,31 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_5.hpp b/inst/include/boost/math/tools/detail/rational_horner3_5.hpp
index 0150b143f..62c76dd50 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_5.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_5.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_6.hpp b/inst/include/boost/math/tools/detail/rational_horner3_6.hpp
index c4a2c14f5..f81a068ac 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_6.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_6.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_7.hpp b/inst/include/boost/math/tools/detail/rational_horner3_7.hpp
index 43555ab1d..fea457ccf 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_7.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_7.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_8.hpp b/inst/include/boost/math/tools/detail/rational_horner3_8.hpp
index 1c14fb461..306e2a41d 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_8.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_8.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/detail/rational_horner3_9.hpp b/inst/include/boost/math/tools/detail/rational_horner3_9.hpp
index 057035237..93a3527c1 100644
--- a/inst/include/boost/math/tools/detail/rational_horner3_9.hpp
+++ b/inst/include/boost/math/tools/detail/rational_horner3_9.hpp
@@ -12,39 +12,39 @@
 namespace boost{ namespace math{ namespace tools{ namespace detail{
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T*, const U*, const V&, const std::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T*, const U*, const V&, const boost::math::integral_constant<int, 0>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(0);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const std::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V&, const boost::math::integral_constant<int, 1>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(a[0]) / static_cast<V>(b[0]);
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 2>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((a[1] * x + a[0]) / (b[1] * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 3>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>(((a[2] * x + a[1]) * x + a[0]) / ((b[2] * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 4>*) BOOST_MATH_NOEXCEPT(V)
 {
    return static_cast<V>((((a[3] * x + a[2]) * x + a[1]) * x + a[0]) / (((b[3] * x + b[2]) * x + b[1]) * x + b[0]));
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 5>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -80,9 +80,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 6>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -126,9 +126,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 7>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -180,9 +180,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 8>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
@@ -242,9 +242,9 @@ inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::
 }
 
 template <class T, class U, class V>
-inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const std::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* a, const U* b, const V& x, const boost::math::integral_constant<int, 9>*) BOOST_MATH_NOEXCEPT(V)
 {
-   if(x <= 1)
+   if((-1 <= x) && (x <= 1))
    {
       V x2 = x * x;
       V t[4];
diff --git a/inst/include/boost/math/tools/engel_expansion.hpp b/inst/include/boost/math/tools/engel_expansion.hpp
index 4e54988be..2d22a84d8 100644
--- a/inst/include/boost/math/tools/engel_expansion.hpp
+++ b/inst/include/boost/math/tools/engel_expansion.hpp
@@ -17,7 +17,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/fraction.hpp b/inst/include/boost/math/tools/fraction.hpp
index a64c07025..f36d024c4 100644
--- a/inst/include/boost/math/tools/fraction.hpp
+++ b/inst/include/boost/math/tools/fraction.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2005-2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,11 +11,13 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <boost/math/tools/complex.hpp>
-#include <type_traits>
-#include <cstdint>
-#include <cmath>
+#include <boost/math/tools/cstdint.hpp>
 
 namespace boost{ namespace math{ namespace tools{
 
@@ -22,10 +25,10 @@ namespace detail
 {
 
    template <typename T>
-   struct is_pair : public std::false_type{};
+   struct is_pair : public boost::math::false_type{};
 
    template <typename T, typename U>
-   struct is_pair<std::pair<T,U>> : public std::true_type{};
+   struct is_pair<boost::math::pair<T,U>> : public boost::math::true_type{};
 
    template <typename Gen>
    struct fraction_traits_simple
@@ -33,11 +36,11 @@ namespace detail
       using result_type = typename Gen::result_type;
       using  value_type = typename Gen::result_type;
 
-      static result_type a(const value_type&) BOOST_MATH_NOEXCEPT(value_type)
+      BOOST_MATH_GPU_ENABLED static result_type a(const value_type&) BOOST_MATH_NOEXCEPT(value_type)
       {
          return 1;
       }
-      static result_type b(const value_type& v) BOOST_MATH_NOEXCEPT(value_type)
+      BOOST_MATH_GPU_ENABLED static result_type b(const value_type& v) BOOST_MATH_NOEXCEPT(value_type)
       {
          return v;
       }
@@ -49,11 +52,11 @@ namespace detail
       using  value_type = typename Gen::result_type;
       using result_type = typename value_type::first_type;
 
-      static result_type a(const value_type& v) BOOST_MATH_NOEXCEPT(value_type)
+      BOOST_MATH_GPU_ENABLED static result_type a(const value_type& v) BOOST_MATH_NOEXCEPT(value_type)
       {
          return v.first;
       }
-      static result_type b(const value_type& v) BOOST_MATH_NOEXCEPT(value_type)
+      BOOST_MATH_GPU_ENABLED static result_type b(const value_type& v) BOOST_MATH_NOEXCEPT(value_type)
       {
          return v.second;
       }
@@ -61,7 +64,7 @@ namespace detail
 
    template <typename Gen>
    struct fraction_traits
-       : public std::conditional<
+       : public boost::math::conditional<
          is_pair<typename Gen::result_type>::value,
          fraction_traits_pair<Gen>,
          fraction_traits_simple<Gen>>::type
@@ -74,7 +77,7 @@ namespace detail
       // For float, double, and long double, 1/min_value<T>() is finite.
       // But for mpfr_float and cpp_bin_float, 1/min_value<T>() is inf.
       // Multiply the min by 16 so that the reciprocal doesn't overflow.
-      static T get() {
+      BOOST_MATH_GPU_ENABLED static T get() {
          return 16*tools::min_value<T>();
       }
    };
@@ -82,13 +85,15 @@ namespace detail
    struct tiny_value<T, true>
    {
       using value_type = typename T::value_type;
-      static T get() {
+      BOOST_MATH_GPU_ENABLED static T get() {
          return 16*tools::min_value<value_type>();
       }
    };
 
 } // namespace detail
 
+namespace detail {
+
 //
 // continued_fraction_b
 // Evaluates:
@@ -103,9 +108,15 @@ namespace detail
 //
 // Note that the first a0 returned by generator Gen is discarded.
 //
+
 template <typename Gen, typename U>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, const U& factor, std::uintmax_t& max_terms)
-      noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b_impl(Gen& g, const U& factor, boost::math::uintmax_t& max_terms)
+      noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+      #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+      // SYCL can not handle this condition so we only check float on that platform
+      && noexcept(std::declval<Gen>()())
+      #endif
+      )
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -129,7 +140,7 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(G
    C = f;
    D = 0;
 
-   std::uintmax_t counter(max_terms);
+   boost::math::uintmax_t counter(max_terms);
    do{
       v = g();
       D = traits::b(v) + traits::a(v) * D;
@@ -148,17 +159,38 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(G
    return f;
 }
 
+} // namespace detail
+
+template <typename Gen, typename U>
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, const U& factor, boost::math::uintmax_t& max_terms)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+         #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+         && noexcept(std::declval<Gen>()())
+         #endif
+         )
+{
+   return detail::continued_fraction_b_impl(g, factor, max_terms);
+}
+
 template <typename Gen, typename U>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, const U& factor)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, const U& factor)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
-   std::uintmax_t max_terms = (std::numeric_limits<std::uintmax_t>::max)();
-   return continued_fraction_b(g, factor, max_terms);
+   boost::math::uintmax_t max_terms = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
+   return detail::continued_fraction_b_impl(g, factor, max_terms);
 }
 
 template <typename Gen>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, int bits)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, int bits)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -166,13 +198,17 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(G
    using result_type = typename traits::result_type;
 
    result_type factor = ldexp(1.0f, 1 - bits); // 1 / pow(result_type(2), bits);
-   std::uintmax_t max_terms = (std::numeric_limits<std::uintmax_t>::max)();
-   return continued_fraction_b(g, factor, max_terms);
+   boost::math::uintmax_t max_terms = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
+   return detail::continued_fraction_b_impl(g, factor, max_terms);
 }
 
 template <typename Gen>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, int bits, std::uintmax_t& max_terms)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(Gen& g, int bits, boost::math::uintmax_t& max_terms)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -180,9 +216,11 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(G
    using result_type = typename traits::result_type;
 
    result_type factor = ldexp(1.0f, 1 - bits); // 1 / pow(result_type(2), bits);
-   return continued_fraction_b(g, factor, max_terms);
+   return detail::continued_fraction_b_impl(g, factor, max_terms);
 }
 
+namespace detail {
+
 //
 // continued_fraction_a
 // Evaluates:
@@ -198,8 +236,12 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_b(G
 // Note that the first a1 and b1 returned by generator Gen are both used.
 //
 template <typename Gen, typename U>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, const U& factor, std::uintmax_t& max_terms)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a_impl(Gen& g, const U& factor, boost::math::uintmax_t& max_terms)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -224,7 +266,7 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(G
    C = f;
    D = 0;
 
-   std::uintmax_t counter(max_terms);
+   boost::math::uintmax_t counter(max_terms);
 
    do{
       v = g();
@@ -244,17 +286,38 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(G
    return a0/f;
 }
 
+} // namespace detail
+
+template <typename Gen, typename U>
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, const U& factor, boost::math::uintmax_t& max_terms)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
+{
+   return detail::continued_fraction_a_impl(g, factor, max_terms);
+}
+
 template <typename Gen, typename U>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, const U& factor)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, const U& factor)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type)
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
-   std::uintmax_t max_iter = (std::numeric_limits<std::uintmax_t>::max)();
-   return continued_fraction_a(g, factor, max_iter);
+   boost::math::uintmax_t max_iter = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
+   return detail::continued_fraction_a_impl(g, factor, max_iter);
 }
 
 template <typename Gen>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, int bits)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, int bits)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -262,14 +325,18 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(G
    typedef typename traits::result_type result_type;
 
    result_type factor = ldexp(1.0f, 1-bits); // 1 / pow(result_type(2), bits);
-   std::uintmax_t max_iter = (std::numeric_limits<std::uintmax_t>::max)();
+   boost::math::uintmax_t max_iter = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
 
-   return continued_fraction_a(g, factor, max_iter);
+   return detail::continued_fraction_a_impl(g, factor, max_iter);
 }
 
 template <typename Gen>
-inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, int bits, std::uintmax_t& max_terms)
-   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) && noexcept(std::declval<Gen>()()))
+BOOST_MATH_GPU_ENABLED inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(Gen& g, int bits, boost::math::uintmax_t& max_terms)
+   noexcept(BOOST_MATH_IS_FLOAT(typename detail::fraction_traits<Gen>::result_type) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<Gen>()())
+   #endif
+   )
 {
    BOOST_MATH_STD_USING // ADL of std names
 
@@ -277,7 +344,7 @@ inline typename detail::fraction_traits<Gen>::result_type continued_fraction_a(G
    using result_type = typename traits::result_type;
 
    result_type factor = ldexp(1.0f, 1-bits); // 1 / pow(result_type(2), bits);
-   return continued_fraction_a(g, factor, max_terms);
+   return detail::continued_fraction_a_impl(g, factor, max_terms);
 }
 
 } // namespace tools
diff --git a/inst/include/boost/math/tools/is_constant_evaluated.hpp b/inst/include/boost/math/tools/is_constant_evaluated.hpp
index 6803b7d72..eb903dbd7 100644
--- a/inst/include/boost/math/tools/is_constant_evaluated.hpp
+++ b/inst/include/boost/math/tools/is_constant_evaluated.hpp
@@ -19,7 +19,7 @@
 #endif
 
 #ifdef __has_builtin
-#  if __has_builtin(__builtin_is_constant_evaluated) && !defined(BOOST_NO_CXX14_CONSTEXPR) && !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
+#  if __has_builtin(__builtin_is_constant_evaluated) && !defined(BOOST_MATH_NO_CXX14_CONSTEXPR) && !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
 #    define BOOST_MATH_HAS_BUILTIN_IS_CONSTANT_EVALUATED
 #  endif
 #endif
@@ -32,15 +32,15 @@
 //
 // As does GCC-9:
 //
-#if !defined(BOOST_NO_CXX14_CONSTEXPR) && (__GNUC__ >= 9) && !defined(BOOST_MATH_HAS_BUILTIN_IS_CONSTANT_EVALUATED)
+#if !defined(BOOST_MATH_NO_CXX14_CONSTEXPR) && (__GNUC__ >= 9) && !defined(BOOST_MATH_HAS_BUILTIN_IS_CONSTANT_EVALUATED)
 #  define BOOST_MATH_HAS_BUILTIN_IS_CONSTANT_EVALUATED
 #endif
 
-#if defined(BOOST_MATH_HAS_IS_CONSTANT_EVALUATED) && !defined(BOOST_NO_CXX14_CONSTEXPR)
+#if defined(BOOST_MATH_HAS_IS_CONSTANT_EVALUATED) && !defined(BOOST_MATH_NO_CXX14_CONSTEXPR)
 #  define BOOST_MATH_IS_CONSTANT_EVALUATED(x) std::is_constant_evaluated()
 #elif defined(BOOST_MATH_HAS_BUILTIN_IS_CONSTANT_EVALUATED)
 #  define BOOST_MATH_IS_CONSTANT_EVALUATED(x) __builtin_is_constant_evaluated()
-#elif !defined(BOOST_NO_CXX14_CONSTEXPR) && (__GNUC__ >= 6)
+#elif !defined(BOOST_MATH_NO_CXX14_CONSTEXPR) && (__GNUC__ >= 6)
 #  define BOOST_MATH_IS_CONSTANT_EVALUATED(x) __builtin_constant_p(x)
 #  define BOOST_MATH_USING_BUILTIN_CONSTANT_P
 #else
diff --git a/inst/include/boost/math/tools/is_detected.hpp b/inst/include/boost/math/tools/is_detected.hpp
index 8dfe86b74..93fa96f60 100644
--- a/inst/include/boost/math/tools/is_detected.hpp
+++ b/inst/include/boost/math/tools/is_detected.hpp
@@ -8,7 +8,7 @@
 #ifndef BOOST_MATH_TOOLS_IS_DETECTED_HPP
 #define BOOST_MATH_TOOLS_IS_DETECTED_HPP
 
-#include <type_traits>
+#include <boost/math/tools/type_traits.hpp>
 
 namespace boost { namespace math { namespace tools {
 
@@ -20,14 +20,14 @@ namespace detail {
 template <typename Default, typename AlwaysVoid, template<typename...> class Op, typename... Args>
 struct detector
 {
-    using value_t = std::false_type;
+    using value_t = boost::math::false_type;
     using type = Default;
 };
 
 template <typename Default, template<typename...> class Op, typename... Args>
 struct detector<Default, void_t<Op<Args...>>, Op, Args...>
 {
-    using value_t = std::true_type;
+    using value_t = boost::math::true_type;
     using type = Op<Args...>;
 };
 
diff --git a/inst/include/boost/math/tools/luroth_expansion.hpp b/inst/include/boost/math/tools/luroth_expansion.hpp
index f98594251..583b227d7 100644
--- a/inst/include/boost/math/tools/luroth_expansion.hpp
+++ b/inst/include/boost/math/tools/luroth_expansion.hpp
@@ -17,7 +17,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/minima.hpp b/inst/include/boost/math/tools/minima.hpp
index 6070fc530..a6be94cb2 100644
--- a/inst/include/boost/math/tools/minima.hpp
+++ b/inst/include/boost/math/tools/minima.hpp
@@ -11,20 +11,26 @@
 #pragma once
 #endif
 
-#include <cstdint>
-#include <cmath>
-#include <utility>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/utility.hpp>
 #include <boost/math/policies/policy.hpp>
 
 namespace boost{ namespace math{ namespace tools{
 
 template <class F, class T>
-std::pair<T, T> brent_find_minima(F f, T min, T max, int bits, std::uintmax_t& max_iter)
-   noexcept(BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED boost::math::pair<T, T> brent_find_minima(F f, T min, T max, int bits, boost::math::uintmax_t& max_iter)
+   noexcept(BOOST_MATH_IS_FLOAT(T) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<F>()(std::declval<T>()))
+   #endif
+   )
 {
    BOOST_MATH_STD_USING
-   bits = (std::min)(policies::digits<T, policies::policy<> >() / 2, bits);
+   bits = (boost::math::min)(policies::digits<T, policies::policy<> >() / 2, bits);
    T tolerance = static_cast<T>(ldexp(1.0, 1-bits));
    T x;  // minima so far
    T w;  // second best point
@@ -42,7 +48,7 @@ std::pair<T, T> brent_find_minima(F f, T min, T max, int bits, std::uintmax_t& m
    fw = fv = fx = f(x);
    delta2 = delta = 0;
 
-   uintmax_t count = max_iter;
+   boost::math::uintmax_t count = max_iter;
 
    do{
       // get midpoint
@@ -134,14 +140,18 @@ std::pair<T, T> brent_find_minima(F f, T min, T max, int bits, std::uintmax_t& m
 
    max_iter -= count;
 
-   return std::make_pair(x, fx);
+   return boost::math::make_pair(x, fx);
 }
 
 template <class F, class T>
-inline std::pair<T, T> brent_find_minima(F f, T min, T max, int digits)
-   noexcept(BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> brent_find_minima(F f, T min, T max, int digits)
+   noexcept(BOOST_MATH_IS_FLOAT(T)
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<F>()(std::declval<T>()))
+   #endif
+   )
 {
-   std::uintmax_t m = (std::numeric_limits<std::uintmax_t>::max)();
+   boost::math::uintmax_t m = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
    return brent_find_minima(f, min, max, digits, m);
 }
 
diff --git a/inst/include/boost/math/tools/mp.hpp b/inst/include/boost/math/tools/mp.hpp
index 3100a0bb6..560ae8b50 100644
--- a/inst/include/boost/math/tools/mp.hpp
+++ b/inst/include/boost/math/tools/mp.hpp
@@ -11,9 +11,9 @@
 #ifndef BOOST_MATH_TOOLS_MP
 #define BOOST_MATH_TOOLS_MP
 
-#include <type_traits>
-#include <cstddef>
-#include <utility>
+#include <boost/math/tools/config.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
 
 namespace boost { namespace math { namespace tools { namespace meta_programming {
 
@@ -23,12 +23,12 @@ template<typename... T>
 struct mp_list {};
 
 // Size_t
-template<std::size_t N> 
-using mp_size_t = std::integral_constant<std::size_t, N>;
+template<boost::math::size_t N> 
+using mp_size_t = boost::math::integral_constant<boost::math::size_t, N>;
 
 // Boolean
 template<bool B>
-using mp_bool = std::integral_constant<bool, B>;
+using mp_bool = boost::math::integral_constant<bool, B>;
 
 // Identity
 template<typename T>
@@ -53,7 +53,7 @@ struct mp_size_impl {};
 template<template<typename...> class L, typename... T> // Template template parameter must use class
 struct mp_size_impl<L<T...>>
 {
-    using type = std::integral_constant<std::size_t, sizeof...(T)>;
+    using type = boost::math::integral_constant<boost::math::size_t, sizeof...(T)>;
 };
 }
 
@@ -79,7 +79,7 @@ namespace detail {
 // At
 // TODO - Use tree based lookup for larger typelists
 // http://odinthenerd.blogspot.com/2017/04/tree-based-lookup-why-kvasirmpl-is.html
-template<typename L, std::size_t>
+template<typename L, boost::math::size_t>
 struct mp_at_c {};
 
 template<template<typename...> class L, typename T0, typename... T>
@@ -168,11 +168,11 @@ struct mp_at_c<L<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T...>, 1
 };
 }
 
-template<typename L, std::size_t I>
-using mp_at_c = typename detail::mp_at_c<L, I>::type;
+template<typename L, boost::math::size_t Index>
+using mp_at_c = typename detail::mp_at_c<L, Index>::type;
 
-template<typename L, typename I>
-using mp_at = typename detail::mp_at_c<L, I::value>::type;
+template<typename L, typename Index>
+using mp_at = typename detail::mp_at_c<L, Index::value>::type;
 
 // Back
 template<typename L> 
@@ -336,25 +336,11 @@ using mp_remove_if = typename detail::mp_remove_if_impl<L, P>::type;
 template<typename L, typename Q> 
 using mp_remove_if_q = mp_remove_if<L, Q::template fn>;
 
-// Index sequence
-// Use C++14 index sequence if available
-#if defined(__cpp_lib_integer_sequence) && (__cpp_lib_integer_sequence >= 201304)
-template<std::size_t... I>
-using index_sequence = std::index_sequence<I...>;
-
-template<std::size_t N>
-using make_index_sequence = std::make_index_sequence<N>;
-
-template<typename... T>
-using index_sequence_for = std::index_sequence_for<T...>;
-
-#else
-
-template<typename T, T... I>
+template<typename T, T... Index>
 struct integer_sequence {};
 
-template<std::size_t... I>
-using index_sequence = integer_sequence<std::size_t, I...>;
+template<boost::math::size_t... Index>
+using index_sequence = integer_sequence<boost::math::size_t, Index...>;
 
 namespace detail {
 
@@ -385,10 +371,10 @@ struct iseq_identity
 template<typename T1, typename T2>
 struct append_integer_sequence {};
 
-template<typename T, T... I, T... J>
-struct append_integer_sequence<integer_sequence<T, I...>, integer_sequence<T, J...>>
+template<typename T, T... Index, T... J>
+struct append_integer_sequence<integer_sequence<T, Index...>, integer_sequence<T, J...>>
 {
-    using type = integer_sequence<T, I..., (J + sizeof...(I))...>;
+    using type = integer_sequence<T, Index..., (J + sizeof...(Index))...>;
 };
 
 template<typename T, T N>
@@ -426,13 +412,11 @@ struct make_integer_sequence_impl
 template<typename T, T N>
 using make_integer_sequence = typename detail::make_integer_sequence_impl<T, N>::type;
 
-template<std::size_t N>
-using make_index_sequence = make_integer_sequence<std::size_t, N>;
+template<boost::math::size_t N>
+using make_index_sequence = make_integer_sequence<boost::math::size_t, N>;
 
 template<typename... T>
-using index_sequence_for = make_integer_sequence<std::size_t, sizeof...(T)>;
-
-#endif 
+using index_sequence_for = make_integer_sequence<boost::math::size_t, sizeof...(T)>;
 
 }}}} // namespaces
 
diff --git a/inst/include/boost/math/tools/norms.hpp b/inst/include/boost/math/tools/norms.hpp
index ad444bae4..3be45f14c 100644
--- a/inst/include/boost/math/tools/norms.hpp
+++ b/inst/include/boost/math/tools/norms.hpp
@@ -15,7 +15,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/numeric_limits.hpp b/inst/include/boost/math/tools/numeric_limits.hpp
new file mode 100644
index 000000000..87a780236
--- /dev/null
+++ b/inst/include/boost/math/tools/numeric_limits.hpp
@@ -0,0 +1,888 @@
+//  Copyright (c) 2024 Matt Borland
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+//  Regular use of std::numeric_limits functions can not be used on 
+//  GPU platforms like CUDA since they are missing the __device__ marker
+//  and libcu++ does not provide something analogous.
+//  Rather than using giant if else blocks make our own version of numeric limits
+//
+//  On the CUDA NVRTC platform we use a best attempt at emulating the functions
+//  and values since we do not have any macros to go off of.
+//  Use the values as found on GCC 11.4 RHEL 9.4 x64
+
+#ifndef BOOST_MATH_TOOLS_NUMERIC_LIMITS_HPP
+#define BOOST_MATH_TOOLS_NUMERIC_LIMITS_HPP
+
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+
+#include <type_traits>
+#include <limits>
+#include <climits>
+#include <cfloat>
+
+#endif
+
+namespace boost {
+namespace math {
+
+template <typename T>
+struct numeric_limits 
+#ifndef BOOST_MATH_HAS_NVRTC
+: public std::numeric_limits<T> {};
+#else
+{};
+#endif
+
+#if defined(BOOST_MATH_HAS_GPU_SUPPORT) && !defined(BOOST_MATH_HAS_NVRTC)
+
+template <>
+struct numeric_limits<float>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<float>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<float>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<float>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<float>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<float>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<float>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<float>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<float>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<float>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<float>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<float>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<float>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<float>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<float>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<float>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<float>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<float>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<float>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<float>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<float>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<float>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float (min)         () { return FLT_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float (max)         () { return FLT_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float lowest        () { return -FLT_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float epsilon       () { return FLT_EPSILON; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float round_error   () { return 0.5F; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float infinity      () { return static_cast<float>(INFINITY); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float quiet_NaN     () { return static_cast<float>(NAN); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float signaling_NaN () 
+    { 
+        #ifdef FLT_SNAN
+        return FLT_SNAN;
+        #else
+        return static_cast<float>(NAN);
+        #endif
+    }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float denorm_min    () { return FLT_TRUE_MIN; }
+};
+
+template <>
+struct numeric_limits<double>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<double>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<double>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<double>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<double>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<double>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<double>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<double>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<double>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<double>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<double>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<double>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<double>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<double>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<double>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<double>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<double>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<double>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<double>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<double>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<double>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<double>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double (min)         () { return DBL_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double (max)         () { return DBL_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double lowest        () { return -DBL_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double epsilon       () { return DBL_EPSILON; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double round_error   () { return 0.5; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double infinity      () { return static_cast<double>(INFINITY); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double quiet_NaN     () { return static_cast<double>(NAN); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double signaling_NaN () 
+    { 
+        #ifdef DBL_SNAN
+        return DBL_SNAN;
+        #else
+        return static_cast<double>(NAN);
+        #endif
+    }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double denorm_min    () { return DBL_TRUE_MIN; }
+};
+
+template <>
+struct numeric_limits<short>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<short>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<short>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<short>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<short>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<short>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<short>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<short>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<short>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<short>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<short>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<short>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<short>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<short>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<short>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<short>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<short>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<short>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<short>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<short>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<short>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<short>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short (min)         () { return SHRT_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short (max)         () { return SHRT_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short lowest        () { return SHRT_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned short>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<unsigned short>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<unsigned short>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<unsigned short>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<unsigned short>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<unsigned short>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<unsigned short>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<unsigned short>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<unsigned short>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<unsigned short>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<unsigned short>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<unsigned short>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<unsigned short>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<unsigned short>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<unsigned short>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<unsigned short>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<unsigned short>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<unsigned short>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<unsigned short>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<unsigned short>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<unsigned short>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<unsigned short>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short (max)         () { return USHRT_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<int>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<int>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<int>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<int>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<int>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<int>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<int>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<int>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<int>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<int>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<int>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<int>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<int>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<int>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<int>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<int>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<int>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<int>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<int>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<int>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<int>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<int>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int (min)         () { return INT_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int (max)         () { return INT_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int lowest        () { return INT_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned int>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<unsigned int>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<unsigned int>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<unsigned int>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<unsigned int>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<unsigned int>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<unsigned int>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<unsigned int>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<unsigned int>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<unsigned int>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<unsigned int>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<unsigned int>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<unsigned int>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<unsigned int>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<unsigned int>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<unsigned int>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<unsigned int>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<unsigned int>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<unsigned int>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<unsigned int>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<unsigned int>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<unsigned int>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int (max)         () { return UINT_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<long>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<long>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<long>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<long>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<long>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<long>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<long>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<long>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<long>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<long>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<long>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<long>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<long>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<long>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<long>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<long>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<long>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<long>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<long>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<long>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<long>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long (min)         () { return LONG_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long (max)         () { return LONG_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long lowest        () { return LONG_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<unsigned long>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<unsigned long>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<unsigned long>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<unsigned long>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<unsigned long>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<unsigned long>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<unsigned long>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<unsigned long>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<unsigned long>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<unsigned long>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<unsigned long>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<unsigned long>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<unsigned long>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<unsigned long>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<unsigned long>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<unsigned long>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<unsigned long>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<unsigned long>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<unsigned long>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<unsigned long>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<unsigned long>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long (max)         () { return ULONG_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<long long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<long long>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<long long>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<long long>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<long long>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<long long>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<long long>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<long long>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<long long>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<long long>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<long long>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<long long>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<long long>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<long long>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<long long>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<long long>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<long long>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<long long>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<long long>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<long long>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<long long>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<long long>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long (min)         () { return LLONG_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long (max)         () { return LLONG_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long lowest        () { return LLONG_MIN; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned long long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<unsigned long long>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<unsigned long long>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<unsigned long long>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<unsigned long long>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<unsigned long long>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<unsigned long long>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<unsigned long long>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<unsigned long long>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<unsigned long long>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<unsigned long long>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<unsigned long long>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<unsigned long long>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<unsigned long long>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<unsigned long long>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<unsigned long long>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<unsigned long long>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<unsigned long long>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<unsigned long long>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<unsigned long long>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<unsigned long long>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<unsigned long long>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long (max)         () { return ULLONG_MAX; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<bool>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = std::numeric_limits<bool>::is_specialized;
+    BOOST_MATH_STATIC constexpr bool is_signed = std::numeric_limits<bool>::is_signed;
+    BOOST_MATH_STATIC constexpr bool is_integer = std::numeric_limits<bool>::is_integer;
+    BOOST_MATH_STATIC constexpr bool is_exact = std::numeric_limits<bool>::is_exact;
+    BOOST_MATH_STATIC constexpr bool has_infinity = std::numeric_limits<bool>::has_infinity;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = std::numeric_limits<bool>::has_quiet_NaN;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = std::numeric_limits<bool>::has_signaling_NaN;
+
+    BOOST_MATH_STATIC constexpr std::float_round_style round_style = std::numeric_limits<bool>::round_style;
+    BOOST_MATH_STATIC constexpr bool is_iec559 = std::numeric_limits<bool>::is_iec559;
+    BOOST_MATH_STATIC constexpr bool is_bounded = std::numeric_limits<bool>::is_bounded;
+    BOOST_MATH_STATIC constexpr bool is_modulo = std::numeric_limits<bool>::is_modulo;
+    BOOST_MATH_STATIC constexpr int digits = std::numeric_limits<bool>::digits;
+    BOOST_MATH_STATIC constexpr int digits10 = std::numeric_limits<bool>::digits10;
+    BOOST_MATH_STATIC constexpr int max_digits10 = std::numeric_limits<bool>::max_digits10;
+    BOOST_MATH_STATIC constexpr int radix = std::numeric_limits<bool>::radix;
+    BOOST_MATH_STATIC constexpr int min_exponent = std::numeric_limits<bool>::min_exponent;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = std::numeric_limits<bool>::min_exponent10;
+    BOOST_MATH_STATIC constexpr int max_exponent = std::numeric_limits<bool>::max_exponent;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = std::numeric_limits<bool>::max_exponent10;
+    BOOST_MATH_STATIC constexpr bool traps = std::numeric_limits<bool>::traps;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = std::numeric_limits<bool>::tinyness_before;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool (min)         () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool (max)         () { return true; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool lowest        () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool epsilon       () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool round_error   () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool infinity      () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool quiet_NaN     () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool signaling_NaN () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool denorm_min    () { return false; }
+};
+
+#elif defined(BOOST_MATH_HAS_NVRTC) // Pure NVRTC support - Removes rounding style and approximates the traits
+
+template <>
+struct numeric_limits<float>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = true;
+    BOOST_MATH_STATIC constexpr bool is_integer = false;
+    BOOST_MATH_STATIC constexpr bool is_exact = false;
+    BOOST_MATH_STATIC constexpr bool has_infinity = true;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = true;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = true;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = true;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 24;
+    BOOST_MATH_STATIC constexpr int digits10 = 6;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 9;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = -125;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = -37;
+    BOOST_MATH_STATIC constexpr int max_exponent = 128;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 38;
+    BOOST_MATH_STATIC constexpr bool traps = false;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float (min)         () { return 1.17549435e-38F; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float (max)         () { return 3.40282347e+38F; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float lowest        () { return -3.40282347e+38F; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float epsilon       () { return 1.1920929e-07; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float round_error   () { return 0.5F; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float infinity      () { return __int_as_float(0x7f800000); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float quiet_NaN     () { return __int_as_float(0x7fc00000); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float signaling_NaN () { return __int_as_float(0x7fa00000); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr float denorm_min    () { return 1.4013e-45F; }
+};
+
+template <>
+struct numeric_limits<double>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = true;
+    BOOST_MATH_STATIC constexpr bool is_integer = false;
+    BOOST_MATH_STATIC constexpr bool is_exact = false;
+    BOOST_MATH_STATIC constexpr bool has_infinity = true;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = true;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = true;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = true;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 53;
+    BOOST_MATH_STATIC constexpr int digits10 = 15;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 21;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = -1021;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = -307;
+    BOOST_MATH_STATIC constexpr int max_exponent = 1024;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 308;
+    BOOST_MATH_STATIC constexpr bool traps = false;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double (min)         () { return 2.2250738585072014e-308; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double (max)         () { return 1.7976931348623157e+308; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double lowest        () { return -1.7976931348623157e+308; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double epsilon       () { return 2.2204460492503131e-16; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double round_error   () { return 0.5; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double infinity      () { return __longlong_as_double(0x7ff0000000000000ULL); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double quiet_NaN     () { return __longlong_as_double(0x7ff8000000000000ULL); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double signaling_NaN () { return __longlong_as_double(0x7ff4000000000000ULL); }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr double denorm_min    () { return 4.9406564584124654e-324; }
+};
+
+template <>
+struct numeric_limits<short>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = true;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 15;
+    BOOST_MATH_STATIC constexpr int digits10 = 4;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short (min)         () { return -32768; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short (max)         () { return 32767; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short lowest        () { return -32768; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr short denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned short>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = false;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = true;
+    BOOST_MATH_STATIC constexpr int digits = 16;
+    BOOST_MATH_STATIC constexpr int digits10 = 4;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short (max)         () { return 65535U; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned short denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<int>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = true;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 31;
+    BOOST_MATH_STATIC constexpr int digits10 = 9;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int (min)         () { return -2147483648; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int (max)         () { return 2147483647; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int lowest        () { return -2147483648; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr int denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned int>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = false;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = true;
+    BOOST_MATH_STATIC constexpr int digits = 32;
+    BOOST_MATH_STATIC constexpr int digits10 = 9;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int (max)         () { return 4294967295U; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned int denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = true;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 63;
+    BOOST_MATH_STATIC constexpr int digits10 = 18;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long (min)         () { return -9223372036854775808L; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long (max)         () { return 9223372036854775807L; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long lowest        () { return -9223372036854775808L; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = false;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = true;
+    BOOST_MATH_STATIC constexpr int digits = 64;
+    BOOST_MATH_STATIC constexpr int digits10 = 19;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long (max)         () { return 18446744073709551615UL; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<long long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = true;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 63;
+    BOOST_MATH_STATIC constexpr int digits10 = 18;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long (min)         () { return -9223372036854775808LL; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long (max)         () { return 9223372036854775807LL; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long lowest        () { return -9223372036854775808LL; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr long long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<unsigned long long>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = false;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = true;
+    BOOST_MATH_STATIC constexpr int digits = 64;
+    BOOST_MATH_STATIC constexpr int digits10 = 19;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = true;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long (min)         () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long (max)         () { return 18446744073709551615UL; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long lowest        () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long epsilon       () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long round_error   () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long infinity      () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long quiet_NaN     () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long signaling_NaN () { return 0; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr unsigned long long denorm_min    () { return 0; }
+};
+
+template <>
+struct numeric_limits<bool>
+{
+    BOOST_MATH_STATIC constexpr bool is_specialized = true;
+    BOOST_MATH_STATIC constexpr bool is_signed = false;
+    BOOST_MATH_STATIC constexpr bool is_integer = true;
+    BOOST_MATH_STATIC constexpr bool is_exact = true;
+    BOOST_MATH_STATIC constexpr bool has_infinity = false;
+    BOOST_MATH_STATIC constexpr bool has_quiet_NaN = false;
+    BOOST_MATH_STATIC constexpr bool has_signaling_NaN = false;
+
+    BOOST_MATH_STATIC constexpr bool is_iec559 = false;
+    BOOST_MATH_STATIC constexpr bool is_bounded = true;
+    BOOST_MATH_STATIC constexpr bool is_modulo = false;
+    BOOST_MATH_STATIC constexpr int digits = 1;
+    BOOST_MATH_STATIC constexpr int digits10 = 0;
+    BOOST_MATH_STATIC constexpr int max_digits10 = 0;
+    BOOST_MATH_STATIC constexpr int radix = 2;
+    BOOST_MATH_STATIC constexpr int min_exponent = 0;
+    BOOST_MATH_STATIC constexpr int min_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent = 0;
+    BOOST_MATH_STATIC constexpr int max_exponent10 = 0;
+    BOOST_MATH_STATIC constexpr bool traps = false;
+    BOOST_MATH_STATIC constexpr bool tinyness_before = false;
+
+    // Member Functions
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool (min)         () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool (max)         () { return true; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool lowest        () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool epsilon       () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool round_error   () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool infinity      () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool quiet_NaN     () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool signaling_NaN () { return false; }
+    BOOST_MATH_GPU_ENABLED BOOST_MATH_STATIC constexpr bool denorm_min    () { return false; }
+};
+
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
+} // namespace math
+} // namespace boost
+
+#endif
diff --git a/inst/include/boost/math/tools/polynomial.hpp b/inst/include/boost/math/tools/polynomial.hpp
index fdff23254..5d395cdbe 100644
--- a/inst/include/boost/math/tools/polynomial.hpp
+++ b/inst/include/boost/math/tools/polynomial.hpp
@@ -32,7 +32,7 @@
 namespace boost{ namespace math{ namespace tools{
 
 template <class T>
-T chebyshev_coefficient(unsigned n, unsigned m)
+BOOST_MATH_GPU_ENABLED T chebyshev_coefficient(unsigned n, unsigned m)
 {
    BOOST_MATH_STD_USING
    if(m > n)
@@ -56,7 +56,7 @@ T chebyshev_coefficient(unsigned n, unsigned m)
 }
 
 template <class Seq>
-Seq polynomial_to_chebyshev(const Seq& s)
+BOOST_MATH_GPU_ENABLED Seq polynomial_to_chebyshev(const Seq& s)
 {
    // Converts a Polynomial into Chebyshev form:
    typedef typename Seq::value_type value_type;
@@ -92,7 +92,7 @@ Seq polynomial_to_chebyshev(const Seq& s)
 }
 
 template <class Seq, class T>
-T evaluate_chebyshev(const Seq& a, const T& x)
+BOOST_MATH_GPU_ENABLED T evaluate_chebyshev(const Seq& a, const T& x)
 {
    // Clenshaw's formula:
    typedef typename Seq::difference_type difference_type;
@@ -124,7 +124,7 @@ namespace detail {
 * subtlety of distinction.
 */
 template <typename T, typename N>
-typename std::enable_if<!std::numeric_limits<T>::is_integer, void >::type
+BOOST_MATH_GPU_ENABLED typename std::enable_if<!std::numeric_limits<T>::is_integer, void >::type
 division_impl(polynomial<T> &q, polynomial<T> &u, const polynomial<T>& v, N n, N k)
 {
     q[k] = u[n + k] / v[n];
@@ -136,7 +136,7 @@ division_impl(polynomial<T> &q, polynomial<T> &u, const polynomial<T>& v, N n, N
 }
 
 template <class T, class N>
-T integer_power(T t, N n)
+BOOST_MATH_GPU_ENABLED T integer_power(T t, N n)
 {
    switch(n)
    {
@@ -167,7 +167,7 @@ T integer_power(T t, N n)
 * don't currently have that subtlety of distinction.
 */
 template <typename T, typename N>
-typename std::enable_if<std::numeric_limits<T>::is_integer, void >::type
+BOOST_MATH_GPU_ENABLED typename std::enable_if<std::numeric_limits<T>::is_integer, void >::type
 division_impl(polynomial<T> &q, polynomial<T> &u, const polynomial<T>& v, N n, N k)
 {
     q[k] = u[n + k] * integer_power(v[n], k);
@@ -187,7 +187,7 @@ division_impl(polynomial<T> &q, polynomial<T> &u, const polynomial<T>& v, N n, N
  * @param   v   Divisor.
  */
 template <typename T>
-std::pair< polynomial<T>, polynomial<T> >
+BOOST_MATH_GPU_ENABLED std::pair< polynomial<T>, polynomial<T> >
 division(polynomial<T> u, const polynomial<T>& v)
 {
     BOOST_MATH_ASSERT(v.size() <= u.size());
@@ -218,7 +218,7 @@ division(polynomial<T> u, const polynomial<T>& v)
 struct negate
 {
    template <class T>
-   T operator()(T const &x) const
+   BOOST_MATH_GPU_ENABLED T operator()(T const &x) const
    {
       return -x;
    }
@@ -227,7 +227,7 @@ struct negate
 struct plus
 {
    template <class T, class U>
-   T operator()(T const &x, U const& y) const
+   BOOST_MATH_GPU_ENABLED T operator()(T const &x, U const& y) const
    {
       return x + y;
    }
@@ -236,7 +236,7 @@ struct plus
 struct minus
 {
    template <class T, class U>
-   T operator()(T const &x, U const& y) const
+   BOOST_MATH_GPU_ENABLED T operator()(T const &x, U const& y) const
    {
       return x - y;
    }
@@ -248,13 +248,13 @@ struct minus
  * Returns the zero element for multiplication of polynomials.
  */
 template <class T>
-polynomial<T> zero_element(std::multiplies< polynomial<T> >)
+BOOST_MATH_GPU_ENABLED polynomial<T> zero_element(std::multiplies< polynomial<T> >)
 {
     return polynomial<T>();
 }
 
 template <class T>
-polynomial<T> identity_element(std::multiplies< polynomial<T> >)
+BOOST_MATH_GPU_ENABLED polynomial<T> identity_element(std::multiplies< polynomial<T> >)
 {
     return polynomial<T>(T(1));
 }
@@ -264,7 +264,7 @@ polynomial<T> identity_element(std::multiplies< polynomial<T> >)
  * This function is not defined for division by zero: user beware.
  */
 template <typename T>
-std::pair< polynomial<T>, polynomial<T> >
+BOOST_MATH_GPU_ENABLED std::pair< polynomial<T>, polynomial<T> >
 quotient_remainder(const polynomial<T>& dividend, const polynomial<T>& divisor)
 {
     BOOST_MATH_ASSERT(divisor);
@@ -283,51 +283,51 @@ class polynomial
    typedef typename std::vector<T>::size_type size_type;
 
    // construct:
-   polynomial()= default;
+   BOOST_MATH_GPU_ENABLED polynomial()= default;
 
    template <class U>
-   polynomial(const U* data, unsigned order)
+   BOOST_MATH_GPU_ENABLED polynomial(const U* data, unsigned order)
       : m_data(data, data + order + 1)
    {
        normalize();
    }
 
-   template <class I>
-   polynomial(I first, I last)
+   template <class Iterator>
+   BOOST_MATH_GPU_ENABLED polynomial(Iterator first, Iterator last)
       : m_data(first, last)
    {
        normalize();
    }
 
-   template <class I>
-   polynomial(I first, unsigned length)
+   template <class Iterator>
+   BOOST_MATH_GPU_ENABLED polynomial(Iterator first, unsigned length)
       : m_data(first, std::next(first, length + 1))
    {
        normalize();
    }
 
-   polynomial(std::vector<T>&& p) : m_data(std::move(p))
+   BOOST_MATH_GPU_ENABLED polynomial(std::vector<T>&& p) : m_data(std::move(p))
    {
       normalize();
    }
 
    template <class U, typename std::enable_if<std::is_convertible<U, T>::value, bool>::type = true>
-   explicit polynomial(const U& point)
+   BOOST_MATH_GPU_ENABLED explicit polynomial(const U& point)
    {
        if (point != U(0))
           m_data.push_back(point);
    }
 
    // move:
-   polynomial(polynomial&& p) noexcept
+   BOOST_MATH_GPU_ENABLED polynomial(polynomial&& p) noexcept
       : m_data(std::move(p.m_data)) { }
 
    // copy:
-   polynomial(const polynomial& p)
+   BOOST_MATH_GPU_ENABLED polynomial(const polynomial& p)
       : m_data(p.m_data) { }
 
    template <class U>
-   polynomial(const polynomial<U>& p)
+   BOOST_MATH_GPU_ENABLED polynomial(const polynomial<U>& p)
    {
       m_data.resize(p.size());
       for(unsigned i = 0; i < p.size(); ++i)
@@ -337,17 +337,17 @@ class polynomial
    }
 #ifdef BOOST_MATH_HAS_IS_CONST_ITERABLE
     template <class Range, typename std::enable_if<boost::math::tools::detail::is_const_iterable<Range>::value, bool>::type = true>
-    explicit polynomial(const Range& r) 
+    BOOST_MATH_GPU_ENABLED explicit polynomial(const Range& r)
        : polynomial(r.begin(), r.end()) 
     {
     }
 #endif
-    polynomial(std::initializer_list<T> l) : polynomial(std::begin(l), std::end(l))
+    BOOST_MATH_GPU_ENABLED polynomial(std::initializer_list<T> l) : polynomial(std::begin(l), std::end(l))
     {
     }
 
     polynomial&
-    operator=(std::initializer_list<T> l)
+    BOOST_MATH_GPU_ENABLED operator=(std::initializer_list<T> l)
     {
         m_data.assign(std::begin(l), std::end(l));
         normalize();
@@ -356,47 +356,47 @@ class polynomial
 
 
    // access:
-   size_type size() const { return m_data.size(); }
-   size_type degree() const
+   BOOST_MATH_GPU_ENABLED size_type size() const { return m_data.size(); }
+   BOOST_MATH_GPU_ENABLED size_type degree() const
    {
        if (size() == 0)
           BOOST_MATH_THROW_EXCEPTION(std::logic_error("degree() is undefined for the zero polynomial."));
        return m_data.size() - 1;
    }
-   value_type& operator[](size_type i)
+   BOOST_MATH_GPU_ENABLED value_type& operator[](size_type i)
    {
       return m_data[i];
    }
-   const value_type& operator[](size_type i) const
+   BOOST_MATH_GPU_ENABLED const value_type& operator[](size_type i) const
    {
       return m_data[i];
    }
 
-   T evaluate(T z) const
+   BOOST_MATH_GPU_ENABLED T evaluate(T z) const
    {
       return this->operator()(z);
    }
 
-   T operator()(T z) const
+   BOOST_MATH_GPU_ENABLED T operator()(T z) const
    {
       return m_data.size() > 0 ? boost::math::tools::evaluate_polynomial((m_data).data(), z, m_data.size()) : T(0);
    }
-   std::vector<T> chebyshev() const
+   BOOST_MATH_GPU_ENABLED std::vector<T> chebyshev() const
    {
       return polynomial_to_chebyshev(m_data);
    }
 
-   std::vector<T> const& data() const
+   BOOST_MATH_GPU_ENABLED std::vector<T> const& data() const
    {
        return m_data;
    }
 
-   std::vector<T> & data()
+   BOOST_MATH_GPU_ENABLED std::vector<T> & data()
    {
        return m_data;
    }
 
-   polynomial<T> prime() const
+   BOOST_MATH_GPU_ENABLED polynomial<T> prime() const
    {
 #ifdef _MSC_VER
       // Disable int->float conversion warning:
@@ -418,7 +418,7 @@ class polynomial
 #endif
    }
 
-   polynomial<T> integrate() const
+   BOOST_MATH_GPU_ENABLED polynomial<T> integrate() const
    {
       std::vector<T> i_data(m_data.size() + 1);
       // Choose integration constant such that P(0) = 0.
@@ -431,20 +431,20 @@ class polynomial
    }
 
    // operators:
-   polynomial& operator =(polynomial&& p) noexcept
+   BOOST_MATH_GPU_ENABLED polynomial& operator =(polynomial&& p) noexcept
    {
        m_data = std::move(p.m_data);
        return *this;
    }
 
-   polynomial& operator =(const polynomial& p)
+   BOOST_MATH_GPU_ENABLED polynomial& operator =(const polynomial& p)
    {
        m_data = p.m_data;
        return *this;
    }
 
    template <class U>
-   typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator +=(const U& value)
+   BOOST_MATH_GPU_ENABLED typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator +=(const U& value)
    {
        addition(value);
        normalize();
@@ -452,7 +452,7 @@ class polynomial
    }
 
    template <class U>
-   typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator -=(const U& value)
+   BOOST_MATH_GPU_ENABLED typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator -=(const U& value)
    {
        subtraction(value);
        normalize();
@@ -460,7 +460,7 @@ class polynomial
    }
 
    template <class U>
-   typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator *=(const U& value)
+   BOOST_MATH_GPU_ENABLED typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator *=(const U& value)
    {
       multiplication(value);
       normalize();
@@ -468,7 +468,7 @@ class polynomial
    }
 
    template <class U>
-   typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator /=(const U& value)
+   BOOST_MATH_GPU_ENABLED typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator /=(const U& value)
    {
        division(value);
        normalize();
@@ -476,7 +476,7 @@ class polynomial
    }
 
    template <class U>
-   typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator %=(const U& /*value*/)
+   BOOST_MATH_GPU_ENABLED typename std::enable_if<std::is_constructible<T, U>::value, polynomial&>::type operator %=(const U& /*value*/)
    {
        // We can always divide by a scalar, so there is no remainder:
        this->set_zero();
@@ -484,7 +484,7 @@ class polynomial
    }
 
    template <class U>
-   polynomial& operator +=(const polynomial<U>& value)
+   BOOST_MATH_GPU_ENABLED polynomial& operator +=(const polynomial<U>& value)
    {
       addition(value);
       normalize();
@@ -492,7 +492,7 @@ class polynomial
    }
 
    template <class U>
-   polynomial& operator -=(const polynomial<U>& value)
+   BOOST_MATH_GPU_ENABLED polynomial& operator -=(const polynomial<U>& value)
    {
        subtraction(value);
        normalize();
@@ -500,7 +500,7 @@ class polynomial
    }
 
    template <typename U, typename V>
-   void multiply(const polynomial<U>& a, const polynomial<V>& b) {
+   BOOST_MATH_GPU_ENABLED void multiply(const polynomial<U>& a, const polynomial<V>& b) {
        if (!a || !b)
        {
            this->set_zero();
@@ -514,28 +514,28 @@ class polynomial
    }
 
    template <class U>
-   polynomial& operator *=(const polynomial<U>& value)
+   BOOST_MATH_GPU_ENABLED polynomial& operator *=(const polynomial<U>& value)
    {
       this->multiply(*this, value);
       return *this;
    }
 
    template <typename U>
-   polynomial& operator /=(const polynomial<U>& value)
+   BOOST_MATH_GPU_ENABLED polynomial& operator /=(const polynomial<U>& value)
    {
        *this = quotient_remainder(*this, value).first;
        return *this;
    }
 
    template <typename U>
-   polynomial& operator %=(const polynomial<U>& value)
+   BOOST_MATH_GPU_ENABLED polynomial& operator %=(const polynomial<U>& value)
    {
        *this = quotient_remainder(*this, value).second;
        return *this;
    }
 
    template <typename U>
-   polynomial& operator >>=(U const &n)
+   BOOST_MATH_GPU_ENABLED polynomial& operator >>=(U const &n)
    {
        BOOST_MATH_ASSERT(n <= m_data.size());
        m_data.erase(m_data.begin(), m_data.begin() + n);
@@ -543,7 +543,7 @@ class polynomial
    }
 
    template <typename U>
-   polynomial& operator <<=(U const &n)
+   BOOST_MATH_GPU_ENABLED polynomial& operator <<=(U const &n)
    {
        m_data.insert(m_data.begin(), n, static_cast<T>(0));
        normalize();
@@ -551,33 +551,33 @@ class polynomial
    }
 
    // Convenient and efficient query for zero.
-   bool is_zero() const
+   BOOST_MATH_GPU_ENABLED bool is_zero() const
    {
        return m_data.empty();
    }
 
    // Conversion to bool.
-   inline explicit operator bool() const
+   BOOST_MATH_GPU_ENABLED inline explicit operator bool() const
    {
        return !m_data.empty();
    }
 
    // Fast way to set a polynomial to zero.
-   void set_zero()
+   BOOST_MATH_GPU_ENABLED void set_zero()
    {
        m_data.clear();
    }
 
     /** Remove zero coefficients 'from the top', that is for which there are no
     *        non-zero coefficients of higher degree. */
-   void normalize()
+   BOOST_MATH_GPU_ENABLED void normalize()
    {
       m_data.erase(std::find_if(m_data.rbegin(), m_data.rend(), [](const T& x)->bool { return x != T(0); }).base(), m_data.end());
    }
 
 private:
     template <class U, class R>
-    polynomial& addition(const U& value, R op)
+    BOOST_MATH_GPU_ENABLED polynomial& addition(const U& value, R op)
     {
         if(m_data.size() == 0)
             m_data.resize(1, 0);
@@ -586,19 +586,19 @@ class polynomial
     }
 
     template <class U>
-    polynomial& addition(const U& value)
+    BOOST_MATH_GPU_ENABLED polynomial& addition(const U& value)
     {
         return addition(value, detail::plus());
     }
 
     template <class U>
-    polynomial& subtraction(const U& value)
+    BOOST_MATH_GPU_ENABLED polynomial& subtraction(const U& value)
     {
         return addition(value, detail::minus());
     }
 
     template <class U, class R>
-    polynomial& addition(const polynomial<U>& value, R op)
+    BOOST_MATH_GPU_ENABLED polynomial& addition(const polynomial<U>& value, R op)
     {
         if (m_data.size() < value.size())
             m_data.resize(value.size(), 0);
@@ -608,26 +608,26 @@ class polynomial
     }
 
     template <class U>
-    polynomial& addition(const polynomial<U>& value)
+    BOOST_MATH_GPU_ENABLED polynomial& addition(const polynomial<U>& value)
     {
         return addition(value, detail::plus());
     }
 
     template <class U>
-    polynomial& subtraction(const polynomial<U>& value)
+    BOOST_MATH_GPU_ENABLED polynomial& subtraction(const polynomial<U>& value)
     {
         return addition(value, detail::minus());
     }
 
     template <class U>
-    polynomial& multiplication(const U& value)
+    BOOST_MATH_GPU_ENABLED polynomial& multiplication(const U& value)
     {
        std::transform(m_data.begin(), m_data.end(), m_data.begin(), [&](const T& x)->T { return x * value; });
        return *this;
     }
 
     template <class U>
-    polynomial& division(const U& value)
+    BOOST_MATH_GPU_ENABLED polynomial& division(const U& value)
     {
        std::transform(m_data.begin(), m_data.end(), m_data.begin(), [&](const T& x)->T { return x / value; });
        return *this;
@@ -638,7 +638,7 @@ class polynomial
 
 
 template <class T>
-inline polynomial<T> operator + (const polynomial<T>& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator + (const polynomial<T>& a, const polynomial<T>& b)
 {
    polynomial<T> result(a);
    result += b;
@@ -646,26 +646,26 @@ inline polynomial<T> operator + (const polynomial<T>& a, const polynomial<T>& b)
 }
 
 template <class T>
-inline polynomial<T> operator + (polynomial<T>&& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator + (polynomial<T>&& a, const polynomial<T>& b)
 {
    a += b;
    return std::move(a);
 }
 template <class T>
-inline polynomial<T> operator + (const polynomial<T>& a, polynomial<T>&& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator + (const polynomial<T>& a, polynomial<T>&& b)
 {
    b += a;
    return b;
 }
 template <class T>
-inline polynomial<T> operator + (polynomial<T>&& a, polynomial<T>&& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator + (polynomial<T>&& a, polynomial<T>&& b)
 {
    a += b;
    return a;
 }
 
 template <class T>
-inline polynomial<T> operator - (const polynomial<T>& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator - (const polynomial<T>& a, const polynomial<T>& b)
 {
    polynomial<T> result(a);
    result -= b;
@@ -673,26 +673,26 @@ inline polynomial<T> operator - (const polynomial<T>& a, const polynomial<T>& b)
 }
 
 template <class T>
-inline polynomial<T> operator - (polynomial<T>&& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator - (polynomial<T>&& a, const polynomial<T>& b)
 {
    a -= b;
    return a;
 }
 template <class T>
-inline polynomial<T> operator - (const polynomial<T>& a, polynomial<T>&& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator - (const polynomial<T>& a, polynomial<T>&& b)
 {
    b -= a;
    return -b;
 }
 template <class T>
-inline polynomial<T> operator - (polynomial<T>&& a, polynomial<T>&& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator - (polynomial<T>&& a, polynomial<T>&& b)
 {
    a -= b;
    return a;
 }
 
 template <class T>
-inline polynomial<T> operator * (const polynomial<T>& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator * (const polynomial<T>& a, const polynomial<T>& b)
 {
    polynomial<T> result;
    result.multiply(a, b);
@@ -700,94 +700,94 @@ inline polynomial<T> operator * (const polynomial<T>& a, const polynomial<T>& b)
 }
 
 template <class T>
-inline polynomial<T> operator / (const polynomial<T>& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator / (const polynomial<T>& a, const polynomial<T>& b)
 {
    return quotient_remainder(a, b).first;
 }
 
 template <class T>
-inline polynomial<T> operator % (const polynomial<T>& a, const polynomial<T>& b)
+BOOST_MATH_GPU_ENABLED inline polynomial<T> operator % (const polynomial<T>& a, const polynomial<T>& b)
 {
    return quotient_remainder(a, b).second;
 }
 
 template <class T, class U>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator + (polynomial<T> a, const U& b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator + (polynomial<T> a, const U& b)
 {
    a += b;
    return a;
 }
 
 template <class T, class U>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator - (polynomial<T> a, const U& b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator - (polynomial<T> a, const U& b)
 {
    a -= b;
    return a;
 }
 
 template <class T, class U>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator * (polynomial<T> a, const U& b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator * (polynomial<T> a, const U& b)
 {
    a *= b;
    return a;
 }
 
 template <class T, class U>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator / (polynomial<T> a, const U& b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator / (polynomial<T> a, const U& b)
 {
    a /= b;
    return a;
 }
 
 template <class T, class U>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator % (const polynomial<T>&, const U&)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator % (const polynomial<T>&, const U&)
 {
    // Since we can always divide by a scalar, result is always an empty polynomial:
    return polynomial<T>();
 }
 
 template <class U, class T>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator + (const U& a, polynomial<T> b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator + (const U& a, polynomial<T> b)
 {
    b += a;
    return b;
 }
 
 template <class U, class T>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator - (const U& a, polynomial<T> b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator - (const U& a, polynomial<T> b)
 {
    b -= a;
    return -b;
 }
 
 template <class U, class T>
-inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator * (const U& a, polynomial<T> b)
+BOOST_MATH_GPU_ENABLED inline typename std::enable_if<std::is_constructible<T, U>::value, polynomial<T> >::type operator * (const U& a, polynomial<T> b)
 {
    b *= a;
    return b;
 }
 
 template <class T>
-bool operator == (const polynomial<T> &a, const polynomial<T> &b)
+BOOST_MATH_GPU_ENABLED bool operator == (const polynomial<T> &a, const polynomial<T> &b)
 {
     return a.data() == b.data();
 }
 
 template <class T>
-bool operator != (const polynomial<T> &a, const polynomial<T> &b)
+BOOST_MATH_GPU_ENABLED bool operator != (const polynomial<T> &a, const polynomial<T> &b)
 {
     return a.data() != b.data();
 }
 
 template <typename T, typename U>
-polynomial<T> operator >> (polynomial<T> a, const U& b)
+BOOST_MATH_GPU_ENABLED polynomial<T> operator >> (polynomial<T> a, const U& b)
 {
     a >>= b;
     return a;
 }
 
 template <typename T, typename U>
-polynomial<T> operator << (polynomial<T> a, const U& b)
+BOOST_MATH_GPU_ENABLED polynomial<T> operator << (polynomial<T> a, const U& b)
 {
     a <<= b;
     return a;
@@ -795,26 +795,26 @@ polynomial<T> operator << (polynomial<T> a, const U& b)
 
 // Unary minus (negate).
 template <class T>
-polynomial<T> operator - (polynomial<T> a)
+BOOST_MATH_GPU_ENABLED polynomial<T> operator - (polynomial<T> a)
 {
     std::transform(a.data().begin(), a.data().end(), a.data().begin(), detail::negate());
     return a;
 }
 
 template <class T>
-bool odd(polynomial<T> const &a)
+BOOST_MATH_GPU_ENABLED bool odd(polynomial<T> const &a)
 {
     return a.size() > 0 && a[0] != static_cast<T>(0);
 }
 
 template <class T>
-bool even(polynomial<T> const &a)
+BOOST_MATH_GPU_ENABLED bool even(polynomial<T> const &a)
 {
     return !odd(a);
 }
 
 template <class T>
-polynomial<T> pow(polynomial<T> base, int exp)
+BOOST_MATH_GPU_ENABLED polynomial<T> pow(polynomial<T> base, int exp)
 {
     if (exp < 0)
         return policies::raise_domain_error(
@@ -838,7 +838,7 @@ polynomial<T> pow(polynomial<T> base, int exp)
 }
 
 template <class charT, class traits, class T>
-inline std::basic_ostream<charT, traits>& operator << (std::basic_ostream<charT, traits>& os, const polynomial<T>& poly)
+BOOST_MATH_GPU_ENABLED inline std::basic_ostream<charT, traits>& operator << (std::basic_ostream<charT, traits>& os, const polynomial<T>& poly)
 {
    os << "{ ";
    for(unsigned i = 0; i < poly.size(); ++i)
diff --git a/inst/include/boost/math/tools/precision.hpp b/inst/include/boost/math/tools/precision.hpp
index d1643e01d..662657732 100644
--- a/inst/include/boost/math/tools/precision.hpp
+++ b/inst/include/boost/math/tools/precision.hpp
@@ -10,14 +10,20 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
 #include <boost/math/policies/policy.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
 #include <type_traits>
 #include <limits>
 #include <climits>
 #include <cmath>
 #include <cstdint>
 #include <cfloat> // LDBL_MANT_DIG
+#endif
 
 namespace boost{ namespace math
 {
@@ -36,30 +42,30 @@ namespace tools
 // See  Conceptual Requirements for Real Number Types.
 
 template <class T>
-inline constexpr int digits(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T)) noexcept
+BOOST_MATH_GPU_ENABLED inline constexpr int digits(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T)) noexcept
 {
-   static_assert( ::std::numeric_limits<T>::is_specialized, "Type T must be specialized");
-   static_assert( ::std::numeric_limits<T>::radix == 2 || ::std::numeric_limits<T>::radix == 10, "Type T must have a radix of 2 or 10");
+   static_assert( ::boost::math::numeric_limits<T>::is_specialized, "Type T must be specialized");
+   static_assert( ::boost::math::numeric_limits<T>::radix == 2 || ::boost::math::numeric_limits<T>::radix == 10, "Type T must have a radix of 2 or 10");
 
-   return std::numeric_limits<T>::radix == 2
-      ? std::numeric_limits<T>::digits
-      : ((std::numeric_limits<T>::digits + 1) * 1000L) / 301L;
+   return boost::math::numeric_limits<T>::radix == 2
+      ? boost::math::numeric_limits<T>::digits
+      : ((boost::math::numeric_limits<T>::digits + 1) * 1000L) / 301L;
 }
 
 template <class T>
-inline constexpr T max_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T))  noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T max_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T))  noexcept(boost::math::is_floating_point<T>::value)
 {
-   static_assert( ::std::numeric_limits<T>::is_specialized, "Type T must be specialized");
-   return (std::numeric_limits<T>::max)();
+   static_assert( ::boost::math::numeric_limits<T>::is_specialized, "Type T must be specialized");
+   return (boost::math::numeric_limits<T>::max)();
 } // Also used as a finite 'infinite' value for - and +infinity, for example:
 // -max_value<double> = -1.79769e+308, max_value<double> = 1.79769e+308.
 
 template <class T>
-inline constexpr T min_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T min_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
-   static_assert( ::std::numeric_limits<T>::is_specialized, "Type T must be specialized");
+   static_assert( ::boost::math::numeric_limits<T>::is_specialized, "Type T must be specialized");
 
-   return (std::numeric_limits<T>::min)();
+   return (boost::math::numeric_limits<T>::min)();
 }
 
 namespace detail{
@@ -72,13 +78,13 @@ namespace detail{
 // For type float first:
 //
 template <class T>
-inline constexpr T log_max_value(const std::integral_constant<int, 128>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T log_max_value(const boost::math::integral_constant<int, 128>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
    return 88.0f;
 }
 
 template <class T>
-inline constexpr T log_min_value(const std::integral_constant<int, 128>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T log_min_value(const boost::math::integral_constant<int, 128>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
    return -87.0f;
 }
@@ -86,13 +92,13 @@ inline constexpr T log_min_value(const std::integral_constant<int, 128>& BOOST_M
 // Now double:
 //
 template <class T>
-inline constexpr T log_max_value(const std::integral_constant<int, 1024>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T log_max_value(const boost::math::integral_constant<int, 1024>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
    return 709.0;
 }
 
 template <class T>
-inline constexpr T log_min_value(const std::integral_constant<int, 1024>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T log_min_value(const boost::math::integral_constant<int, 1024>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
    return -708.0;
 }
@@ -100,19 +106,19 @@ inline constexpr T log_min_value(const std::integral_constant<int, 1024>& BOOST_
 // 80 and 128-bit long doubles:
 //
 template <class T>
-inline constexpr T log_max_value(const std::integral_constant<int, 16384>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T log_max_value(const boost::math::integral_constant<int, 16384>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
    return 11356.0L;
 }
 
 template <class T>
-inline constexpr T log_min_value(const std::integral_constant<int, 16384>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T log_min_value(const boost::math::integral_constant<int, 16384>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
    return -11355.0L;
 }
 
 template <class T>
-inline T log_max_value(const std::integral_constant<int, 0>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
+BOOST_MATH_GPU_ENABLED inline T log_max_value(const boost::math::integral_constant<int, 0>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
 {
    BOOST_MATH_STD_USING
 #ifdef __SUNPRO_CC
@@ -125,7 +131,7 @@ inline T log_max_value(const std::integral_constant<int, 0>& BOOST_MATH_APPEND_E
 }
 
 template <class T>
-inline T log_min_value(const std::integral_constant<int, 0>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
+BOOST_MATH_GPU_ENABLED inline T log_min_value(const boost::math::integral_constant<int, 0>& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
 {
    BOOST_MATH_STD_USING
 #ifdef __SUNPRO_CC
@@ -138,14 +144,14 @@ inline T log_min_value(const std::integral_constant<int, 0>& BOOST_MATH_APPEND_E
 }
 
 template <class T>
-inline constexpr T epsilon(const std::true_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T epsilon(const boost::math::true_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
-   return std::numeric_limits<T>::epsilon();
+   return boost::math::numeric_limits<T>::epsilon();
 }
 
 #if defined(__GNUC__) && ((LDBL_MANT_DIG == 106) || (__LDBL_MANT_DIG__ == 106))
 template <>
-inline constexpr long double epsilon<long double>(const std::true_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(long double)) noexcept(std::is_floating_point<long double>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr long double epsilon<long double>(const boost::math::true_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(long double)) noexcept(boost::math::is_floating_point<long double>::value)
 {
    // numeric_limits on Darwin (and elsewhere) tells lies here:
    // the issue is that long double on a few platforms is
@@ -164,7 +170,7 @@ inline constexpr long double epsilon<long double>(const std::true_type& BOOST_MA
 #endif
 
 template <class T>
-inline T epsilon(const std::false_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
+BOOST_MATH_GPU_ENABLED inline T epsilon(const boost::math::false_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
 {
    // Note: don't cache result as precision may vary at runtime:
    BOOST_MATH_STD_USING  // for ADL of std names
@@ -174,23 +180,23 @@ inline T epsilon(const std::false_type& BOOST_MATH_APPEND_EXPLICIT_TEMPLATE_TYPE
 template <class T>
 struct log_limit_traits
 {
-   typedef typename std::conditional<
-      (std::numeric_limits<T>::radix == 2) &&
-      (std::numeric_limits<T>::max_exponent == 128
-         || std::numeric_limits<T>::max_exponent == 1024
-         || std::numeric_limits<T>::max_exponent == 16384),
-      std::integral_constant<int, (std::numeric_limits<T>::max_exponent > INT_MAX ? INT_MAX : static_cast<int>(std::numeric_limits<T>::max_exponent))>,
-      std::integral_constant<int, 0>
+   typedef typename boost::math::conditional<
+      (boost::math::numeric_limits<T>::radix == 2) &&
+      (boost::math::numeric_limits<T>::max_exponent == 128
+         || boost::math::numeric_limits<T>::max_exponent == 1024
+         || boost::math::numeric_limits<T>::max_exponent == 16384),
+      boost::math::integral_constant<int, (boost::math::numeric_limits<T>::max_exponent > (boost::math::numeric_limits<int>::max)() ? (boost::math::numeric_limits<int>::max)() : static_cast<int>(boost::math::numeric_limits<T>::max_exponent))>,
+      boost::math::integral_constant<int, 0>
    >::type tag_type;
    static constexpr bool value = (tag_type::value != 0);
-   static_assert(::std::numeric_limits<T>::is_specialized || !value, "Type T must be specialized or equal to 0");
+   static_assert(::boost::math::numeric_limits<T>::is_specialized || !value, "Type T must be specialized or equal to 0");
 };
 
 template <class T, bool b> struct log_limit_noexcept_traits_imp : public log_limit_traits<T> {};
-template <class T> struct log_limit_noexcept_traits_imp<T, false> : public std::integral_constant<bool, false> {};
+template <class T> struct log_limit_noexcept_traits_imp<T, false> : public boost::math::integral_constant<bool, false> {};
 
 template <class T>
-struct log_limit_noexcept_traits : public log_limit_noexcept_traits_imp<T, std::is_floating_point<T>::value> {};
+struct log_limit_noexcept_traits : public log_limit_noexcept_traits_imp<T, boost::math::is_floating_point<T>::value> {};
 
 } // namespace detail
 
@@ -200,28 +206,36 @@ struct log_limit_noexcept_traits : public log_limit_noexcept_traits_imp<T, std::
 #endif
 
 template <class T>
-inline constexpr T log_max_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(detail::log_limit_noexcept_traits<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T log_max_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(detail::log_limit_noexcept_traits<T>::value)
 {
-#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-   return detail::log_max_value<T>(typename detail::log_limit_traits<T>::tag_type());
+#ifndef BOOST_MATH_HAS_NVRTC
+   #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
+      return detail::log_max_value<T>(typename detail::log_limit_traits<T>::tag_type());
+   #else
+      BOOST_MATH_ASSERT(::boost::math::numeric_limits<T>::is_specialized);
+      BOOST_MATH_STD_USING
+      static const T val = log((boost::math::numeric_limits<T>::max)());
+      return val;
+   #endif
 #else
-   BOOST_MATH_ASSERT(::std::numeric_limits<T>::is_specialized);
-   BOOST_MATH_STD_USING
-   static const T val = log((std::numeric_limits<T>::max)());
-   return val;
+   return log((boost::math::numeric_limits<T>::max)());
 #endif
 }
 
 template <class T>
-inline constexpr T log_min_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(detail::log_limit_noexcept_traits<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T log_min_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(detail::log_limit_noexcept_traits<T>::value)
 {
-#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-   return detail::log_min_value<T>(typename detail::log_limit_traits<T>::tag_type());
+#ifndef BOOST_MATH_HAS_NVRTC
+   #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
+      return detail::log_min_value<T>(typename detail::log_limit_traits<T>::tag_type());
+   #else
+      BOOST_MATH_ASSERT(::boost::math::numeric_limits<T>::is_specialized);
+      BOOST_MATH_STD_USING
+      static const T val = log((boost::math::numeric_limits<T>::min)());
+      return val;
+   #endif
 #else
-   BOOST_MATH_ASSERT(::std::numeric_limits<T>::is_specialized);
-   BOOST_MATH_STD_USING
-   static const T val = log((std::numeric_limits<T>::min)());
-   return val;
+   return log((boost::math::numeric_limits<T>::min)());
 #endif
 }
 
@@ -230,84 +244,89 @@ inline constexpr T log_min_value(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T)) noexcept(
 #endif
 
 template <class T>
-inline constexpr T epsilon(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T)) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED constexpr T epsilon(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(T)) noexcept(boost::math::is_floating_point<T>::value)
 {
-#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-   return detail::epsilon<T>(std::integral_constant<bool, ::std::numeric_limits<T>::is_specialized>());
+   // NVRTC does not like this dispatching method so we just skip to where we want to go
+#ifndef BOOST_MATH_HAS_NVRTC
+   #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
+      return detail::epsilon<T>(boost::math::integral_constant<bool, ::boost::math::numeric_limits<T>::is_specialized>());
+   #else
+      return ::boost::math::numeric_limits<T>::is_specialized ?
+         detail::epsilon<T>(boost::math::true_type()) :
+         detail::epsilon<T>(boost::math::false_type());
+   #endif
 #else
-   return ::std::numeric_limits<T>::is_specialized ?
-      detail::epsilon<T>(std::true_type()) :
-      detail::epsilon<T>(std::false_type());
+   return boost::math::numeric_limits<T>::epsilon();
 #endif
 }
 
 namespace detail{
 
 template <class T>
-inline constexpr T root_epsilon_imp(const std::integral_constant<int, 24>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T root_epsilon_imp(const boost::math::integral_constant<int, 24>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.00034526698300124390839884978618400831996329879769945L);
 }
 
 template <class T>
-inline constexpr T root_epsilon_imp(const T*, const std::integral_constant<int, 53>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T root_epsilon_imp(const T*, const boost::math::integral_constant<int, 53>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.1490116119384765625e-7L);
 }
 
 template <class T>
-inline constexpr T root_epsilon_imp(const T*, const std::integral_constant<int, 64>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T root_epsilon_imp(const T*, const boost::math::integral_constant<int, 64>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.32927225399135962333569506281281311031656150598474e-9L);
 }
 
 template <class T>
-inline constexpr T root_epsilon_imp(const T*, const std::integral_constant<int, 113>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T root_epsilon_imp(const T*, const boost::math::integral_constant<int, 113>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.1387778780781445675529539585113525390625e-16L);
 }
 
 template <class T, class Tag>
-inline T root_epsilon_imp(const T*, const Tag&)
+BOOST_MATH_GPU_ENABLED inline T root_epsilon_imp(const T*, const Tag&)
 {
    BOOST_MATH_STD_USING
-   static const T r_eps = sqrt(tools::epsilon<T>());
+   BOOST_MATH_STATIC_LOCAL_VARIABLE const T r_eps = sqrt(tools::epsilon<T>());
    return r_eps;
 }
 
 template <class T>
-inline T root_epsilon_imp(const T*, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED inline T root_epsilon_imp(const T*, const boost::math::integral_constant<int, 0>&)
 {
    BOOST_MATH_STD_USING
    return sqrt(tools::epsilon<T>());
 }
 
 template <class T>
-inline constexpr T cbrt_epsilon_imp(const std::integral_constant<int, 24>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T cbrt_epsilon_imp(const boost::math::integral_constant<int, 24>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.0049215666011518482998719164346805794944150447839903L);
 }
 
 template <class T>
-inline constexpr T cbrt_epsilon_imp(const T*, const std::integral_constant<int, 53>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T cbrt_epsilon_imp(const T*, const boost::math::integral_constant<int, 53>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(6.05545445239333906078989272793696693569753008995e-6L);
 }
 
 template <class T>
-inline constexpr T cbrt_epsilon_imp(const T*, const std::integral_constant<int, 64>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T cbrt_epsilon_imp(const T*, const boost::math::integral_constant<int, 64>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(4.76837158203125e-7L);
 }
 
 template <class T>
-inline constexpr T cbrt_epsilon_imp(const T*, const std::integral_constant<int, 113>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T cbrt_epsilon_imp(const T*, const boost::math::integral_constant<int, 113>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(5.7749313854154005630396773604745549542403508090496e-12L);
 }
 
 template <class T, class Tag>
-inline T cbrt_epsilon_imp(const T*, const Tag&)
+BOOST_MATH_GPU_ENABLED inline T cbrt_epsilon_imp(const T*, const Tag&)
 {
    BOOST_MATH_STD_USING;
    static const T cbrt_eps = pow(tools::epsilon<T>(), T(1) / 3);
@@ -315,38 +334,38 @@ inline T cbrt_epsilon_imp(const T*, const Tag&)
 }
 
 template <class T>
-inline T cbrt_epsilon_imp(const T*, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED inline T cbrt_epsilon_imp(const T*, const boost::math::integral_constant<int, 0>&)
 {
    BOOST_MATH_STD_USING;
    return pow(tools::epsilon<T>(), T(1) / 3);
 }
 
 template <class T>
-inline constexpr T forth_root_epsilon_imp(const T*, const std::integral_constant<int, 24>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T forth_root_epsilon_imp(const T*, const boost::math::integral_constant<int, 24>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.018581361171917516667460937040007436176452688944747L);
 }
 
 template <class T>
-inline constexpr T forth_root_epsilon_imp(const T*, const std::integral_constant<int, 53>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T forth_root_epsilon_imp(const T*, const boost::math::integral_constant<int, 53>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.0001220703125L);
 }
 
 template <class T>
-inline constexpr T forth_root_epsilon_imp(const T*, const std::integral_constant<int, 64>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T forth_root_epsilon_imp(const T*, const boost::math::integral_constant<int, 64>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.18145860519450699870567321328132261891067079047605e-4L);
 }
 
 template <class T>
-inline constexpr T forth_root_epsilon_imp(const T*, const std::integral_constant<int, 113>&) noexcept(std::is_floating_point<T>::value)
+BOOST_MATH_GPU_ENABLED inline constexpr T forth_root_epsilon_imp(const T*, const boost::math::integral_constant<int, 113>&) noexcept(boost::math::is_floating_point<T>::value)
 {
    return static_cast<T>(0.37252902984619140625e-8L);
 }
 
 template <class T, class Tag>
-inline T forth_root_epsilon_imp(const T*, const Tag&)
+BOOST_MATH_GPU_ENABLED inline T forth_root_epsilon_imp(const T*, const Tag&)
 {
    BOOST_MATH_STD_USING
    static const T r_eps = sqrt(sqrt(tools::epsilon<T>()));
@@ -354,7 +373,7 @@ inline T forth_root_epsilon_imp(const T*, const Tag&)
 }
 
 template <class T>
-inline T forth_root_epsilon_imp(const T*, const std::integral_constant<int, 0>&)
+BOOST_MATH_GPU_ENABLED inline T forth_root_epsilon_imp(const T*, const boost::math::integral_constant<int, 0>&)
 {
    BOOST_MATH_STD_USING
    return sqrt(sqrt(tools::epsilon<T>()));
@@ -363,26 +382,26 @@ inline T forth_root_epsilon_imp(const T*, const std::integral_constant<int, 0>&)
 template <class T>
 struct root_epsilon_traits
 {
-   typedef std::integral_constant<int, (::std::numeric_limits<T>::radix == 2) && (::std::numeric_limits<T>::digits != INT_MAX) ? std::numeric_limits<T>::digits : 0> tag_type;
+   typedef boost::math::integral_constant<int, (::boost::math::numeric_limits<T>::radix == 2) && (::boost::math::numeric_limits<T>::digits != (boost::math::numeric_limits<int>::max)()) ? boost::math::numeric_limits<T>::digits : 0> tag_type;
    static constexpr bool has_noexcept = (tag_type::value == 113) || (tag_type::value == 64) || (tag_type::value == 53) || (tag_type::value == 24);
 };
 
 }
 
 template <class T>
-inline constexpr T root_epsilon() noexcept(std::is_floating_point<T>::value && detail::root_epsilon_traits<T>::has_noexcept)
+BOOST_MATH_GPU_ENABLED inline constexpr T root_epsilon() noexcept(boost::math::is_floating_point<T>::value && detail::root_epsilon_traits<T>::has_noexcept)
 {
    return detail::root_epsilon_imp(static_cast<T const*>(nullptr), typename detail::root_epsilon_traits<T>::tag_type());
 }
 
 template <class T>
-inline constexpr T cbrt_epsilon() noexcept(std::is_floating_point<T>::value && detail::root_epsilon_traits<T>::has_noexcept)
+BOOST_MATH_GPU_ENABLED inline constexpr T cbrt_epsilon() noexcept(boost::math::is_floating_point<T>::value && detail::root_epsilon_traits<T>::has_noexcept)
 {
    return detail::cbrt_epsilon_imp(static_cast<T const*>(nullptr), typename detail::root_epsilon_traits<T>::tag_type());
 }
 
 template <class T>
-inline constexpr T forth_root_epsilon() noexcept(std::is_floating_point<T>::value && detail::root_epsilon_traits<T>::has_noexcept)
+BOOST_MATH_GPU_ENABLED inline constexpr T forth_root_epsilon() noexcept(boost::math::is_floating_point<T>::value && detail::root_epsilon_traits<T>::has_noexcept)
 {
    return detail::forth_root_epsilon_imp(static_cast<T const*>(nullptr), typename detail::root_epsilon_traits<T>::tag_type());
 }
diff --git a/inst/include/boost/math/tools/promotion.hpp b/inst/include/boost/math/tools/promotion.hpp
index 842022694..a65f3703f 100644
--- a/inst/include/boost/math/tools/promotion.hpp
+++ b/inst/include/boost/math/tools/promotion.hpp
@@ -3,6 +3,7 @@
 // Copyright John Maddock 2006.
 // Copyright Paul A. Bristow 2006.
 // Copyright Matt Borland 2023.
+// Copyright Ryan Elandt 2023.
 
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -24,15 +25,7 @@
 #endif
 
 #include <boost/math/tools/config.hpp>
-#include <type_traits>
-
-#if defined __has_include
-#  if __cplusplus > 202002L || _MSVC_LANG > 202002L 
-#    if __has_include (<stdfloat>)
-#    include <stdfloat>
-#    endif
-#  endif
-#endif
+#include <boost/math/tools/type_traits.hpp>
 
 namespace boost
 {
@@ -40,272 +33,103 @@ namespace boost
   {
     namespace tools
     {
+      ///// This promotion system works as follows:
+      // 
+      // Rule<T1> (one argument promotion rule):
+      //   - Promotes `T` to `double` if `T` is an integer type as identified by
+      //     `std::is_integral`, otherwise is `T`
+      //
+      // Rule<T1, T2_to_TN...> (two or more argument promotion rule):
+      //   - 1. Calculates type using applying Rule<T1>.
+      //   - 2. Calculates type using applying Rule<T2_to_TN...> 
+      //   - If the type calculated in 1 and 2 are both floating point types, as
+      //     identified by `std::is_floating_point`, then return the type
+      //     determined by `std::common_type`. Otherwise return the type using
+      //     an asymmetric convertibility rule.
+      //
+      ///// Discussion:
+      //
       // If either T1 or T2 is an integer type,
       // pretend it was a double (for the purposes of further analysis).
       // Then pick the wider of the two floating-point types
       // as the actual signature to forward to.
       // For example:
-      // foo(int, short) -> double foo(double, double);
-      // foo(int, float) -> double foo(double, double);
-      // Note: NOT float foo(float, float)
-      // foo(int, double) -> foo(double, double);
-      // foo(double, float) -> double foo(double, double);
-      // foo(double, float) -> double foo(double, double);
-      // foo(any-int-or-float-type, long double) -> foo(long double, long double);
-      // but ONLY float foo(float, float) is unchanged.
-      // So the only way to get an entirely float version is to call foo(1.F, 2.F),
-      // But since most (all?) the math functions convert to double internally,
-      // probably there would not be the hoped-for gain by using float here.
-
+      //    foo(int, short) -> double foo(double, double);  // ***NOT*** float foo(float, float)
+      //    foo(int, float) -> double foo(double, double);  // ***NOT*** float foo(float, float)
+      //    foo(int, double) -> foo(double, double);
+      //    foo(double, float) -> double foo(double, double);
+      //    foo(double, float) -> double foo(double, double);
+      //    foo(any-int-or-float-type, long double) -> foo(long double, long double);
+      // ONLY float foo(float, float) is unchanged, so the only way to get an
+      // entirely float version is to call foo(1.F, 2.F). But since most (all?) the
+      // math functions convert to double internally, probably there would not be the
+      // hoped-for gain by using float here.
+      //
       // This follows the C-compatible conversion rules of pow, etc
       // where pow(int, float) is converted to pow(double, double).
 
+
+      // Promotes a single argument to double if it is an integer type
       template <class T>
-      struct promote_arg
-      { // If T is integral type, then promote to double.
-        using type = typename std::conditional<std::is_integral<T>::value, double, T>::type;
+      struct promote_arg {
+         using type = typename boost::math::conditional<boost::math::is_integral<T>::value, double, T>::type;
       };
-      // These full specialisations reduce std::conditional usage and speed up
-      // compilation:
-      template <> struct promote_arg<float> { using type = float; };
-      template <> struct promote_arg<double>{ using type = double; };
-      template <> struct promote_arg<long double> { using type = long double; };
-      template <> struct promote_arg<int> {  using type = double; };
 
-      #ifdef __STDCPP_FLOAT16_T__
-      template <> struct promote_arg<std::float16_t> { using type = std::float16_t; };
-      #endif
-      #ifdef __STDCPP_FLOAT32_T__
-      template <> struct promote_arg<std::float32_t> { using type = std::float32_t; };
-      #endif
-      #ifdef __STDCPP_FLOAT64_T__
-      template <> struct promote_arg<std::float64_t> { using type = std::float64_t; };
-      #endif
-      #ifdef __STDCPP_FLOAT128_T__
-      template <> struct promote_arg<std::float128_t> { using type = std::float128_t; };
-      #endif
-
-      template <typename T>
-      using promote_arg_t = typename promote_arg<T>::type;
 
+      // Promotes two arguments, neither of which is an integer type using an asymmetric
+      // convertibility rule.
+      template <class T1, class T2, bool = (boost::math::is_floating_point<T1>::value && boost::math::is_floating_point<T2>::value)>
+      struct pa2_integral_already_removed {
+         using type = typename boost::math::conditional<
+            !boost::math::is_floating_point<T2>::value && boost::math::is_convertible<T1, T2>::value, 
+            T2, T1>::type;
+      };
+      // For two floating point types, promotes using `std::common_type` functionality 
       template <class T1, class T2>
-      struct promote_args_2
-      { // Promote, if necessary, & pick the wider of the two floating-point types.
-        // for both parameter types, if integral promote to double.
-        using T1P = typename promote_arg<T1>::type; // T1 perhaps promoted.
-        using T2P = typename promote_arg<T2>::type; // T2 perhaps promoted.
-        using intermediate_type = typename std::conditional<
-          std::is_floating_point<T1P>::value && std::is_floating_point<T2P>::value, // both T1P and T2P are floating-point?
-#ifdef __STDCPP_FLOAT128_T__
-           typename std::conditional<std::is_same<std::float128_t, T1P>::value || std::is_same<std::float128_t, T2P>::value, // either long double?
-            std::float128_t,
-#endif 
-#ifdef BOOST_MATH_USE_FLOAT128
-           typename std::conditional<std::is_same<__float128, T1P>::value || std::is_same<__float128, T2P>::value, // either long double?
-            __float128,
-#endif 
-             typename std::conditional<std::is_same<long double, T1P>::value || std::is_same<long double, T2P>::value, // either long double?
-               long double, // then result type is long double.
-#ifdef __STDCPP_FLOAT64_T__
-             typename std::conditional<std::is_same<std::float64_t, T1P>::value || std::is_same<std::float64_t, T2P>::value, // either float64?
-               std::float64_t, // then result type is float64_t.
-#endif
-               typename std::conditional<std::is_same<double, T1P>::value || std::is_same<double, T2P>::value, // either double?
-                  double, // result type is double.
-#ifdef __STDCPP_FLOAT32_T__
-             typename std::conditional<std::is_same<std::float32_t, T1P>::value || std::is_same<std::float32_t, T2P>::value, // either float32?
-               std::float32_t, // then result type is float32_t.
-#endif
-                  float // else result type is float.
-             >::type
-#ifdef BOOST_MATH_USE_FLOAT128
-             >::type
-#endif
-#ifdef __STDCPP_FLOAT128_T__
-             >::type
-#endif
-#ifdef __STDCPP_FLOAT64_T__
-             >::type
-#endif
-#ifdef __STDCPP_FLOAT32_T__
-             >::type
-#endif
-             >::type,
-          // else one or the other is a user-defined type:
-          typename std::conditional<!std::is_floating_point<T2P>::value && std::is_convertible<T1P, T2P>::value, T2P, T1P>::type>::type;
-
-#ifdef __STDCPP_FLOAT64_T__
-          // If long doubles are doubles then we should prefer to use std::float64_t when available
-          using type = std::conditional_t<(sizeof(double) == sizeof(long double) && std::is_same<intermediate_type, long double>::value), std::float64_t, intermediate_type>;
-#else
-          using type = intermediate_type;
-#endif
-      }; // promote_arg2
-      // These full specialisations reduce std::conditional usage and speed up
-      // compilation:
-      template <> struct promote_args_2<float, float> { using type = float; };
-      template <> struct promote_args_2<double, double>{ using type = double; };
-      template <> struct promote_args_2<long double, long double> { using type = long double; };
-      template <> struct promote_args_2<int, int> {  using type = double; };
-      template <> struct promote_args_2<int, float> {  using type = double; };
-      template <> struct promote_args_2<float, int> {  using type = double; };
-      template <> struct promote_args_2<int, double> {  using type = double; };
-      template <> struct promote_args_2<double, int> {  using type = double; };
-      template <> struct promote_args_2<int, long double> {  using type = long double; };
-      template <> struct promote_args_2<long double, int> {  using type = long double; };
-      template <> struct promote_args_2<float, double> {  using type = double; };
-      template <> struct promote_args_2<double, float> {  using type = double; };
-      template <> struct promote_args_2<float, long double> {  using type = long double; };
-      template <> struct promote_args_2<long double, float> {  using type = long double; };
-      template <> struct promote_args_2<double, long double> {  using type = long double; };
-      template <> struct promote_args_2<long double, double> {  using type = long double; };
-
-      #ifdef __STDCPP_FLOAT128_T__
-      template <> struct promote_args_2<int, std::float128_t> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float128_t, int> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float128_t, float> { using type = std::float128_t; };
-      template <> struct promote_args_2<float, std::float128_t> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float128_t, double> { using type = std::float128_t; };
-      template <> struct promote_args_2<double, std::float128_t> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float128_t, long double> { using type = std::float128_t; };
-      template <> struct promote_args_2<long double, std::float128_t> { using type = std::float128_t; };
-
-      #ifdef __STDCPP_FLOAT16_T__
-      template <> struct promote_args_2<std::float128_t, std::float16_t> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float16_t, std::float128_t> { using type = std::float128_t; };
-      #endif
-
-      #ifdef __STDCPP_FLOAT32_T__
-      template <> struct promote_args_2<std::float128_t, std::float32_t> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float32_t, std::float128_t> { using type = std::float128_t; };
-      #endif
-
-      #ifdef __STDCPP_FLOAT64_T__
-      template <> struct promote_args_2<std::float128_t, std::float64_t> { using type = std::float128_t; };
-      template <> struct promote_args_2<std::float64_t, std::float128_t> { using type = std::float128_t; };
-      #endif
-
-      template <> struct promote_args_2<std::float128_t, std::float128_t> { using type = std::float128_t; };
-      #endif
-
-      #ifdef __STDCPP_FLOAT64_T__
-      template <> struct promote_args_2<int, std::float64_t> { using type = std::float64_t; };
-      template <> struct promote_args_2<std::float64_t, int> { using type = std::float64_t; };
-      template <> struct promote_args_2<std::float64_t, float> { using type = std::float64_t; };
-      template <> struct promote_args_2<float, std::float64_t> { using type = std::float64_t; };
-      template <> struct promote_args_2<std::float64_t, double> { using type = std::float64_t; };
-      template <> struct promote_args_2<double, std::float64_t> { using type = std::float64_t; };
-      template <> struct promote_args_2<std::float64_t, long double> { using type = long double; };
-      template <> struct promote_args_2<long double, std::float64_t> { using type = long double; };
-
-      #ifdef __STDCPP_FLOAT16_T__
-      template <> struct promote_args_2<std::float64_t, std::float16_t> { using type = std::float64_t; };
-      template <> struct promote_args_2<std::float16_t, std::float64_t> { using type = std::float64_t; };
-      #endif
-
-      #ifdef __STDCPP_FLOAT32_T__
-      template <> struct promote_args_2<std::float64_t, std::float32_t> { using type = std::float64_t; };
-      template <> struct promote_args_2<std::float32_t, std::float64_t> { using type = std::float64_t; };
-      #endif
-
-      template <> struct promote_args_2<std::float64_t, std::float64_t> { using type = std::float64_t; };
-      #endif
-
-      #ifdef __STDCPP_FLOAT32_T__
-      template <> struct promote_args_2<int, std::float32_t> { using type = std::float32_t; };
-      template <> struct promote_args_2<std::float32_t, int> { using type = std::float32_t; };
-      template <> struct promote_args_2<std::float32_t, float> { using type = std::float32_t; };
-      template <> struct promote_args_2<float, std::float32_t> { using type = std::float32_t; };
-      template <> struct promote_args_2<std::float32_t, double> { using type = double; };
-      template <> struct promote_args_2<double, std::float32_t> { using type = double; };
-      template <> struct promote_args_2<std::float32_t, long double> { using type = long double; };
-      template <> struct promote_args_2<long double, std::float32_t> { using type = long double; };
-
-      #ifdef __STDCPP_FLOAT16_T__
-      template <> struct promote_args_2<std::float32_t, std::float16_t> { using type = std::float32_t; };
-      template <> struct promote_args_2<std::float16_t, std::float32_t> { using type = std::float32_t; };
-      #endif
-
-      template <> struct promote_args_2<std::float32_t, std::float32_t> { using type = std::float32_t; };
-      #endif
+      struct pa2_integral_already_removed<T1, T2, true> {
+         using type = boost::math::common_type_t<T1, T2, float>;
+      };
 
-      #ifdef __STDCPP_FLOAT16_T__
-      template <> struct promote_args_2<int, std::float16_t> { using type = std::float16_t; };
-      template <> struct promote_args_2<std::float16_t, int> { using type = std::float16_t; };
-      template <> struct promote_args_2<std::float16_t, float> { using type = float; };
-      template <> struct promote_args_2<float, std::float16_t> { using type = float; };
-      template <> struct promote_args_2<std::float16_t, double> { using type = double; };
-      template <> struct promote_args_2<double, std::float16_t> { using type = double; };
-      template <> struct promote_args_2<std::float16_t, long double> { using type = long double; };
-      template <> struct promote_args_2<long double, std::float16_t> { using type = long double; };
 
-      template <> struct promote_args_2<std::float16_t, std::float16_t> { using type = std::float16_t; };
-      #endif
+      // Template definition for promote_args_permissive
+      template <typename... Args>
+      struct promote_args_permissive;
+      // Specialization for one argument
+      template <typename T>
+      struct promote_args_permissive<T> {
+         using type = typename promote_arg<typename boost::math::remove_cv<T>::type>::type;
+      };
+      // Specialization for two or more arguments
+      template <typename T1, typename... T2_to_TN>
+      struct promote_args_permissive<T1, T2_to_TN...> {
+         using type = typename pa2_integral_already_removed<
+                  typename promote_args_permissive<T1>::type,
+                  typename promote_args_permissive<T2_to_TN...>::type
+               >::type;
+      };
 
-      template <typename T, typename U>
-      using promote_args_2_t = typename promote_args_2<T, U>::type;
+      template <class... Args>
+      using promote_args_permissive_t = typename promote_args_permissive<Args...>::type;
 
-      template <class T1, class T2=float, class T3=float, class T4=float, class T5=float, class T6=float>
-      struct promote_args
-      {
-         using type = typename promote_args_2<
-            typename std::remove_cv<T1>::type,
-            typename promote_args_2<
-               typename std::remove_cv<T2>::type,
-               typename promote_args_2<
-                  typename std::remove_cv<T3>::type,
-                  typename promote_args_2<
-                     typename std::remove_cv<T4>::type,
-                     typename promote_args_2<
-                        typename std::remove_cv<T5>::type, typename std::remove_cv<T6>::type
-                     >::type
-                  >::type
-               >::type
-            >::type
-         >::type;
 
+      // Same as `promote_args_permissive` but with a static assertion that the promoted type
+      // is not `long double` if `BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS` is defined
+      template <class... Args>
+      struct promote_args {
+         using type = typename promote_args_permissive<Args...>::type;
 #if defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
          //
          // Guard against use of long double if it's not supported:
          //
-         static_assert((0 == std::is_same<type, long double>::value), "Sorry, but this platform does not have sufficient long double support for the special functions to be reliably implemented.");
+         static_assert((0 == boost::math::is_same<type, long double>::value), "Sorry, but this platform does not have sufficient long double support for the special functions to be reliably implemented.");
 #endif
       };
 
-      template <class T1, class T2=float, class T3=float, class T4=float, class T5=float, class T6=float>
-      using promote_args_t = typename promote_args<T1, T2, T3, T4, T5, T6>::type;
-
-      //
-      // This struct is the same as above, but has no static assert on long double usage,
-      // it should be used only on functions that can be implemented for long double
-      // even when std lib support is missing or broken for that type.
-      //
-      template <class T1, class T2=float, class T3=float, class T4=float, class T5=float, class T6=float>
-      struct promote_args_permissive
-      {
-         using type = typename promote_args_2<
-            typename std::remove_cv<T1>::type,
-            typename promote_args_2<
-               typename std::remove_cv<T2>::type,
-               typename promote_args_2<
-                  typename std::remove_cv<T3>::type,
-                  typename promote_args_2<
-                     typename std::remove_cv<T4>::type,
-                     typename promote_args_2<
-                        typename std::remove_cv<T5>::type, typename std::remove_cv<T6>::type
-                     >::type
-                  >::type
-               >::type
-            >::type
-         >::type;
-      };
-
-      template <class T1, class T2=float, class T3=float, class T4=float, class T5=float, class T6=float>
-      using promote_args_permissive_t = typename promote_args_permissive<T1, T2, T3, T4, T5, T6>::type;
+      template <class... Args>
+      using promote_args_t = typename promote_args<Args...>::type;
 
     } // namespace tools
   } // namespace math
 } // namespace boost
 
 #endif // BOOST_MATH_PROMOTION_HPP
-
diff --git a/inst/include/boost/math/tools/quartic_roots.hpp b/inst/include/boost/math/tools/quartic_roots.hpp
index 56e46fd03..88a4f7253 100644
--- a/inst/include/boost/math/tools/quartic_roots.hpp
+++ b/inst/include/boost/math/tools/quartic_roots.hpp
@@ -135,7 +135,7 @@ std::array<Real, 4> quartic_roots(Real a, Real b, Real c, Real d, Real e) {
     }
     Real s = sqrt(largest_root);
     // s is nonzero, because we took care of the biquadratic case.
-    Real v = (p + s*s + q/s)/2;
+    Real v = (p + largest_root + q/s)/2;
     Real u = v - q/s;
     // Now solve y^2 + sy + u = 0:
     auto [root0, root1] = quadratic_roots(Real(1), s, u);
diff --git a/inst/include/boost/math/tools/rational.hpp b/inst/include/boost/math/tools/rational.hpp
index 727720b2c..a535abcdc 100644
--- a/inst/include/boost/math/tools/rational.hpp
+++ b/inst/include/boost/math/tools/rational.hpp
@@ -10,33 +10,38 @@
 #pragma once
 #endif
 
-#include <array>
 #include <boost/math/tools/config.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+
+#ifndef BOOST_MATH_HAS_NVRTC
+#include <array>
+#endif
 
 #if BOOST_MATH_POLY_METHOD == 1
-#  define BOOST_HEADER() <BOOST_JOIN(boost/math/tools/detail/polynomial_horner1_, BOOST_MATH_MAX_POLY_ORDER).hpp>
+#  define BOOST_HEADER() <BOOST_MATH_JOIN(boost/math/tools/detail/polynomial_horner1_, BOOST_MATH_MAX_POLY_ORDER).hpp>
 #  include BOOST_HEADER()
 #  undef BOOST_HEADER
 #elif BOOST_MATH_POLY_METHOD == 2
-#  define BOOST_HEADER() <BOOST_JOIN(boost/math/tools/detail/polynomial_horner2_, BOOST_MATH_MAX_POLY_ORDER).hpp>
+#  define BOOST_HEADER() <BOOST_MATH_JOIN(boost/math/tools/detail/polynomial_horner2_, BOOST_MATH_MAX_POLY_ORDER).hpp>
 #  include BOOST_HEADER()
 #  undef BOOST_HEADER
 #elif BOOST_MATH_POLY_METHOD == 3
-#  define BOOST_HEADER() <BOOST_JOIN(boost/math/tools/detail/polynomial_horner3_, BOOST_MATH_MAX_POLY_ORDER).hpp>
+#  define BOOST_HEADER() <BOOST_MATH_JOIN(boost/math/tools/detail/polynomial_horner3_, BOOST_MATH_MAX_POLY_ORDER).hpp>
 #  include BOOST_HEADER()
 #  undef BOOST_HEADER
 #endif
 #if BOOST_MATH_RATIONAL_METHOD == 1
-#  define BOOST_HEADER() <BOOST_JOIN(boost/math/tools/detail/rational_horner1_, BOOST_MATH_MAX_POLY_ORDER).hpp>
+#  define BOOST_HEADER() <BOOST_MATH_JOIN(boost/math/tools/detail/rational_horner1_, BOOST_MATH_MAX_POLY_ORDER).hpp>
 #  include BOOST_HEADER()
 #  undef BOOST_HEADER
 #elif BOOST_MATH_RATIONAL_METHOD == 2
-#  define BOOST_HEADER() <BOOST_JOIN(boost/math/tools/detail/rational_horner2_, BOOST_MATH_MAX_POLY_ORDER).hpp>
+#  define BOOST_HEADER() <BOOST_MATH_JOIN(boost/math/tools/detail/rational_horner2_, BOOST_MATH_MAX_POLY_ORDER).hpp>
 #  include BOOST_HEADER()
 #  undef BOOST_HEADER
 #elif BOOST_MATH_RATIONAL_METHOD == 3
-#  define BOOST_HEADER() <BOOST_JOIN(boost/math/tools/detail/rational_horner3_, BOOST_MATH_MAX_POLY_ORDER).hpp>
+#  define BOOST_HEADER() <BOOST_MATH_JOIN(boost/math/tools/detail/rational_horner3_, BOOST_MATH_MAX_POLY_ORDER).hpp>
 #  include BOOST_HEADER()
 #  undef BOOST_HEADER
 #endif
@@ -168,12 +173,12 @@ namespace boost{ namespace math{ namespace tools{
 // Forward declaration to keep two phase lookup happy:
 //
 template <class T, class U>
-U evaluate_polynomial(const T* poly, U const& z, std::size_t count) BOOST_MATH_NOEXCEPT(U);
+BOOST_MATH_GPU_ENABLED U evaluate_polynomial(const T* poly, U const& z, boost::math::size_t count) BOOST_MATH_NOEXCEPT(U);
 
 namespace detail{
 
 template <class T, class V, class Tag>
-inline V evaluate_polynomial_c_imp(const T* a, const V& val, const Tag*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial_c_imp(const T* a, const V& val, const Tag*) BOOST_MATH_NOEXCEPT(V)
 {
    return evaluate_polynomial(a, val, Tag::value);
 }
@@ -186,7 +191,7 @@ inline V evaluate_polynomial_c_imp(const T* a, const V& val, const Tag*) BOOST_M
 // the loop expanded versions above:
 //
 template <class T, class U>
-inline U evaluate_polynomial(const T* poly, U const& z, std::size_t count) BOOST_MATH_NOEXCEPT(U)
+BOOST_MATH_GPU_ENABLED inline U evaluate_polynomial(const T* poly, U const& z, boost::math::size_t count) BOOST_MATH_NOEXCEPT(U)
 {
    BOOST_MATH_ASSERT(count > 0);
    U sum = static_cast<U>(poly[count - 1]);
@@ -201,69 +206,75 @@ inline U evaluate_polynomial(const T* poly, U const& z, std::size_t count) BOOST
 // Compile time sized polynomials, just inline forwarders to the
 // implementations above:
 //
-template <std::size_t N, class T, class V>
-inline V evaluate_polynomial(const T(&a)[N], const V& val) BOOST_MATH_NOEXCEPT(V)
+template <boost::math::size_t N, class T, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial(const T(&a)[N], const V& val) BOOST_MATH_NOEXCEPT(V)
 {
-   typedef std::integral_constant<int, N> tag_type;
+   typedef boost::math::integral_constant<int, N> tag_type;
    return detail::evaluate_polynomial_c_imp(static_cast<const T*>(a), val, static_cast<tag_type const*>(nullptr));
 }
 
-template <std::size_t N, class T, class V>
-inline V evaluate_polynomial(const std::array<T,N>& a, const V& val) BOOST_MATH_NOEXCEPT(V)
+#ifndef BOOST_MATH_HAS_NVRTC
+template <boost::math::size_t N, class T, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_polynomial(const std::array<T,N>& a, const V& val) BOOST_MATH_NOEXCEPT(V)
 {
-   typedef std::integral_constant<int, N> tag_type;
+   typedef boost::math::integral_constant<int, N> tag_type;
    return detail::evaluate_polynomial_c_imp(static_cast<const T*>(a.data()), val, static_cast<tag_type const*>(nullptr));
 }
+#endif
 //
 // Even polynomials are trivial: just square the argument!
 //
 template <class T, class U>
-inline U evaluate_even_polynomial(const T* poly, U z, std::size_t count) BOOST_MATH_NOEXCEPT(U)
+BOOST_MATH_GPU_ENABLED inline U evaluate_even_polynomial(const T* poly, U z, boost::math::size_t count) BOOST_MATH_NOEXCEPT(U)
 {
    return evaluate_polynomial(poly, U(z*z), count);
 }
 
-template <std::size_t N, class T, class V>
-inline V evaluate_even_polynomial(const T(&a)[N], const V& z) BOOST_MATH_NOEXCEPT(V)
+template <boost::math::size_t N, class T, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_even_polynomial(const T(&a)[N], const V& z) BOOST_MATH_NOEXCEPT(V)
 {
    return evaluate_polynomial(a, V(z*z));
 }
 
-template <std::size_t N, class T, class V>
-inline V evaluate_even_polynomial(const std::array<T,N>& a, const V& z) BOOST_MATH_NOEXCEPT(V)
+#ifndef BOOST_MATH_HAS_NVRTC
+template <boost::math::size_t N, class T, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_even_polynomial(const std::array<T,N>& a, const V& z) BOOST_MATH_NOEXCEPT(V)
 {
    return evaluate_polynomial(a, V(z*z));
 }
+#endif
 //
 // Odd polynomials come next:
 //
 template <class T, class U>
-inline U evaluate_odd_polynomial(const T* poly, U z, std::size_t count) BOOST_MATH_NOEXCEPT(U)
+BOOST_MATH_GPU_ENABLED inline U evaluate_odd_polynomial(const T* poly, U z, boost::math::size_t count) BOOST_MATH_NOEXCEPT(U)
 {
    return poly[0] + z * evaluate_polynomial(poly+1, U(z*z), count-1);
 }
 
-template <std::size_t N, class T, class V>
-inline V evaluate_odd_polynomial(const T(&a)[N], const V& z) BOOST_MATH_NOEXCEPT(V)
+template <boost::math::size_t N, class T, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_odd_polynomial(const T(&a)[N], const V& z) BOOST_MATH_NOEXCEPT(V)
 {
-   typedef std::integral_constant<int, N-1> tag_type;
+   typedef boost::math::integral_constant<int, N-1> tag_type;
    return a[0] + z * detail::evaluate_polynomial_c_imp(static_cast<const T*>(a) + 1, V(z*z), static_cast<tag_type const*>(nullptr));
 }
 
-template <std::size_t N, class T, class V>
-inline V evaluate_odd_polynomial(const std::array<T,N>& a, const V& z) BOOST_MATH_NOEXCEPT(V)
+#ifndef BOOST_MATH_HAS_NVRTC
+template <boost::math::size_t N, class T, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_odd_polynomial(const std::array<T,N>& a, const V& z) BOOST_MATH_NOEXCEPT(V)
 {
-   typedef std::integral_constant<int, N-1> tag_type;
+   typedef boost::math::integral_constant<int, N-1> tag_type;
    return a[0] + z * detail::evaluate_polynomial_c_imp(static_cast<const T*>(a.data()) + 1, V(z*z), static_cast<tag_type const*>(nullptr));
 }
+#endif
 
 template <class T, class U, class V>
-V evaluate_rational(const T* num, const U* denom, const V& z_, std::size_t count) BOOST_MATH_NOEXCEPT(V);
+BOOST_MATH_GPU_ENABLED V evaluate_rational(const T* num, const U* denom, const V& z_, boost::math::size_t count) BOOST_MATH_NOEXCEPT(V);
 
 namespace detail{
 
 template <class T, class U, class V, class Tag>
-inline V evaluate_rational_c_imp(const T* num, const U* denom, const V& z, const Tag*) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_rational_c_imp(const T* num, const U* denom, const V& z, const Tag*) BOOST_MATH_NOEXCEPT(V)
 {
    return boost::math::tools::evaluate_rational(num, denom, z, Tag::value);
 }
@@ -278,7 +289,7 @@ inline V evaluate_rational_c_imp(const T* num, const U* denom, const V& z, const
 // in our Lanczos code for example.
 //
 template <class T, class U, class V>
-V evaluate_rational(const T* num, const U* denom, const V& z_, std::size_t count) BOOST_MATH_NOEXCEPT(V)
+BOOST_MATH_GPU_ENABLED V evaluate_rational(const T* num, const U* denom, const V& z_, boost::math::size_t count) BOOST_MATH_NOEXCEPT(V)
 {
    V z(z_);
    V s1, s2;
@@ -310,17 +321,19 @@ V evaluate_rational(const T* num, const U* denom, const V& z_, std::size_t count
    return s1 / s2;
 }
 
-template <std::size_t N, class T, class U, class V>
-inline V evaluate_rational(const T(&a)[N], const U(&b)[N], const V& z) BOOST_MATH_NOEXCEPT(V)
+template <boost::math::size_t N, class T, class U, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_rational(const T(&a)[N], const U(&b)[N], const V& z) BOOST_MATH_NOEXCEPT(V)
 {
-   return detail::evaluate_rational_c_imp(a, b, z, static_cast<const std::integral_constant<int, N>*>(nullptr));
+   return detail::evaluate_rational_c_imp(a, b, z, static_cast<const boost::math::integral_constant<int, N>*>(nullptr));
 }
 
-template <std::size_t N, class T, class U, class V>
-inline V evaluate_rational(const std::array<T,N>& a, const std::array<U,N>& b, const V& z) BOOST_MATH_NOEXCEPT(V)
+#ifndef BOOST_MATH_HAS_NVRTC
+template <boost::math::size_t N, class T, class U, class V>
+BOOST_MATH_GPU_ENABLED BOOST_MATH_GPU_ENABLED inline V evaluate_rational(const std::array<T,N>& a, const std::array<U,N>& b, const V& z) BOOST_MATH_NOEXCEPT(V)
 {
-   return detail::evaluate_rational_c_imp(a.data(), b.data(), z, static_cast<std::integral_constant<int, N>*>(nullptr));
+   return detail::evaluate_rational_c_imp(a.data(), b.data(), z, static_cast<boost::math::integral_constant<int, N>*>(nullptr));
 }
+#endif
 
 } // namespace tools
 } // namespace math
diff --git a/inst/include/boost/math/tools/recurrence.hpp b/inst/include/boost/math/tools/recurrence.hpp
index 10b3c097b..b08988d4b 100644
--- a/inst/include/boost/math/tools/recurrence.hpp
+++ b/inst/include/boost/math/tools/recurrence.hpp
@@ -15,6 +15,8 @@
 #include <boost/math/tools/fraction.hpp>
 #include <boost/math/tools/cxx03_warn.hpp>
 #include <boost/math/tools/assert.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+#include <boost/math/policies/error_handling.hpp>
 
 namespace boost {
    namespace math {
diff --git a/inst/include/boost/math/tools/roots.hpp b/inst/include/boost/math/tools/roots.hpp
index af46e2fcd..b0b0fc246 100644
--- a/inst/include/boost/math/tools/roots.hpp
+++ b/inst/include/boost/math/tools/roots.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,20 +10,21 @@
 #ifdef _MSC_VER
 #pragma once
 #endif
-#include <boost/math/tools/complex.hpp> // test for multiprecision types in complex Newton
-
-#include <utility>
-#include <cmath>
-#include <tuple>
-#include <cstdint>
 
 #include <boost/math/tools/config.hpp>
-#include <boost/math/tools/cxx03_warn.hpp>
-
+#include <boost/math/tools/complex.hpp> // test for multiprecision types in complex Newton
+#include <boost/math/tools/type_traits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
 #include <boost/math/special_functions/sign.hpp>
+#include <boost/math/policies/policy.hpp>
+#include <boost/math/policies/error_handling.hpp>
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/tools/toms748_solve.hpp>
-#include <boost/math/policies/error_handling.hpp>
+#endif
 
 namespace boost {
 namespace math {
@@ -33,11 +35,11 @@ namespace detail {
 namespace dummy {
 
    template<int n, class T>
-   typename T::value_type get(const T&) BOOST_MATH_NOEXCEPT(T);
+   BOOST_MATH_GPU_ENABLED typename T::value_type get(const T&) BOOST_MATH_NOEXCEPT(T);
 }
 
 template <class Tuple, class T>
-void unpack_tuple(const Tuple& t, T& a, T& b) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED void unpack_tuple(const Tuple& t, T& a, T& b) BOOST_MATH_NOEXCEPT(T)
 {
    using dummy::get;
    // Use ADL to find the right overload for get:
@@ -45,7 +47,7 @@ void unpack_tuple(const Tuple& t, T& a, T& b) BOOST_MATH_NOEXCEPT(T)
    b = get<1>(t);
 }
 template <class Tuple, class T>
-void unpack_tuple(const Tuple& t, T& a, T& b, T& c) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED void unpack_tuple(const Tuple& t, T& a, T& b, T& c) BOOST_MATH_NOEXCEPT(T)
 {
    using dummy::get;
    // Use ADL to find the right overload for get:
@@ -55,7 +57,7 @@ void unpack_tuple(const Tuple& t, T& a, T& b, T& c) BOOST_MATH_NOEXCEPT(T)
 }
 
 template <class Tuple, class T>
-inline void unpack_0(const Tuple& t, T& val) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED inline void unpack_0(const Tuple& t, T& val) BOOST_MATH_NOEXCEPT(T)
 {
    using dummy::get;
    // Rely on ADL to find the correct overload of get:
@@ -63,26 +65,30 @@ inline void unpack_0(const Tuple& t, T& val) BOOST_MATH_NOEXCEPT(T)
 }
 
 template <class T, class U, class V>
-inline void unpack_tuple(const std::pair<T, U>& p, V& a, V& b) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED inline void unpack_tuple(const boost::math::pair<T, U>& p, V& a, V& b) BOOST_MATH_NOEXCEPT(T)
 {
    a = p.first;
    b = p.second;
 }
 template <class T, class U, class V>
-inline void unpack_0(const std::pair<T, U>& p, V& a) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED inline void unpack_0(const boost::math::pair<T, U>& p, V& a) BOOST_MATH_NOEXCEPT(T)
 {
    a = p.first;
 }
 
 template <class F, class T>
-void handle_zero_derivative(F f,
+BOOST_MATH_GPU_ENABLED void handle_zero_derivative(F f,
    T& last_f0,
    const T& f0,
    T& delta,
    T& result,
    T& guess,
    const T& min,
-   const T& max) noexcept(BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+   const T& max) noexcept(BOOST_MATH_IS_FLOAT(T) 
+   #ifndef BOOST_MATH_HAS_GPU_SUPPORT
+   && noexcept(std::declval<F>()(std::declval<T>()))
+   #endif
+   )
 {
    if (last_f0 == 0)
    {
@@ -128,25 +134,29 @@ void handle_zero_derivative(F f,
 } // namespace
 
 template <class F, class T, class Tol, class Policy>
-std::pair<T, T> bisect(F f, T min, T max, Tol tol, std::uintmax_t& max_iter, const Policy& pol) noexcept(policies::is_noexcept_error_policy<Policy>::value&& BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED boost::math::pair<T, T> bisect(F f, T min, T max, Tol tol, boost::math::uintmax_t& max_iter, const Policy& pol) noexcept(policies::is_noexcept_error_policy<Policy>::value && BOOST_MATH_IS_FLOAT(T) 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<F>()(std::declval<T>()))
+#endif
+)
 {
    T fmin = f(min);
    T fmax = f(max);
    if (fmin == 0)
    {
       max_iter = 2;
-      return std::make_pair(min, min);
+      return boost::math::make_pair(min, min);
    }
    if (fmax == 0)
    {
       max_iter = 2;
-      return std::make_pair(max, max);
+      return boost::math::make_pair(max, max);
    }
 
    //
    // Error checking:
    //
-   static const char* function = "boost::math::tools::bisect<%1%>";
+   constexpr auto function = "boost::math::tools::bisect<%1%>";
    if (min >= max)
    {
       return boost::math::detail::pair_from_single(policies::raise_evaluation_error(function,
@@ -196,29 +206,41 @@ std::pair<T, T> bisect(F f, T min, T max, Tol tol, std::uintmax_t& max_iter, con
    std::cout << "Bisection required " << max_iter << " iterations.\n";
 #endif
 
-   return std::make_pair(min, max);
+   return boost::math::make_pair(min, max);
 }
 
 template <class F, class T, class Tol>
-inline std::pair<T, T> bisect(F f, T min, T max, Tol tol, std::uintmax_t& max_iter)  noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value&& BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> bisect(F f, T min, T max, Tol tol, boost::math::uintmax_t& max_iter)  noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value && BOOST_MATH_IS_FLOAT(T)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<F>()(std::declval<T>()))
+#endif
+)
 {
    return bisect(f, min, max, tol, max_iter, policies::policy<>());
 }
 
 template <class F, class T, class Tol>
-inline std::pair<T, T> bisect(F f, T min, T max, Tol tol) noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value&& BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> bisect(F f, T min, T max, Tol tol) noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value && BOOST_MATH_IS_FLOAT(T) 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<F>()(std::declval<T>()))
+#endif
+)
 {
-   std::uintmax_t m = (std::numeric_limits<std::uintmax_t>::max)();
+   boost::math::uintmax_t m = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
    return bisect(f, min, max, tol, m, policies::policy<>());
 }
 
 
 template <class F, class T>
-T newton_raphson_iterate(F f, T guess, T min, T max, int digits, std::uintmax_t& max_iter) noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value&& BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED T newton_raphson_iterate(F f, T guess, T min, T max, int digits, boost::math::uintmax_t& max_iter) noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value && BOOST_MATH_IS_FLOAT(T)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<F>()(std::declval<T>()))
+#endif
+)
 {
    BOOST_MATH_STD_USING
 
-   static const char* function = "boost::math::tools::newton_raphson_iterate<%1%>";
+   constexpr auto function = "boost::math::tools::newton_raphson_iterate<%1%>";
    if (min > max)
    {
       return policies::raise_evaluation_error(function, "Range arguments in wrong order in boost::math::tools::newton_raphson_iterate(first arg=%1%)", min, boost::math::policies::policy<>());
@@ -245,7 +267,7 @@ T newton_raphson_iterate(F f, T guess, T min, T max, int digits, std::uintmax_t&
    T max_range_f = 0;
    T min_range_f = 0;
 
-   std::uintmax_t count(max_iter);
+   boost::math::uintmax_t count(max_iter);
 
 #ifdef BOOST_MATH_INSTRUMENT
    std::cout << "Newton_raphson_iterate, guess = " << guess << ", min = " << min << ", max = " << max
@@ -275,7 +297,13 @@ T newton_raphson_iterate(F f, T guess, T min, T max, int digits, std::uintmax_t&
       if (fabs(delta * 2) > fabs(delta2))
       {
          // Last two steps haven't converged.
-         delta = (delta > 0) ? (result - min) / 2 : (result - max) / 2;
+         T shift = (delta > 0) ? (result - min) / 2 : (result - max) / 2;
+         if ((result != 0) && (fabs(shift) > fabs(result)))
+         {
+            delta = sign(delta) * fabs(result); // protect against huge jumps!
+         }
+         else
+            delta = shift;
          // reset delta1/2 so we don't take this branch next time round:
          delta1 = 3 * delta;
          delta2 = 3 * delta;
@@ -326,12 +354,22 @@ T newton_raphson_iterate(F f, T guess, T min, T max, int digits, std::uintmax_t&
 }
 
 template <class F, class T>
-inline T newton_raphson_iterate(F f, T guess, T min, T max, int digits) noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value&& BOOST_MATH_IS_FLOAT(T) && noexcept(std::declval<F>()(std::declval<T>())))
+BOOST_MATH_GPU_ENABLED inline T newton_raphson_iterate(F f, T guess, T min, T max, int digits) noexcept(policies::is_noexcept_error_policy<policies::policy<> >::value && BOOST_MATH_IS_FLOAT(T)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<F>()(std::declval<T>()))
+#endif
+)
 {
-   std::uintmax_t m = (std::numeric_limits<std::uintmax_t>::max)();
+   boost::math::uintmax_t m = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
    return newton_raphson_iterate(f, guess, min, max, digits, m);
 }
 
+// TODO(mborland): Disabled for now
+// Recursion needs to be removed, but there is no demand at this time
+#ifdef BOOST_MATH_HAS_NVRTC
+}}} // Namespaces
+#else
+
 namespace detail {
 
    struct halley_step
@@ -536,13 +574,13 @@ namespace detail {
          last_f0 = f0;
          delta2 = delta1;
          delta1 = delta;
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          try
 #endif
          {
             detail::unpack_tuple(f(result), f0, f1, f2);
          }
-#ifndef BOOST_NO_EXCEPTIONS
+#ifndef BOOST_MATH_NO_EXCEPTIONS
          catch (const std::overflow_error&)
          {
             f0 = max > 0 ? tools::max_value<T>() : -tools::min_value<T>();
@@ -784,35 +822,35 @@ inline T schroeder_iterate(F f, T guess, T min, T max, int digits) noexcept(poli
    * so this default should recover full precision even in this somewhat pathological case.
    * For isolated roots, the problem is so rapidly convergent that this doesn't matter at all.
    */
-template<class Complex, class F>
-Complex complex_newton(F g, Complex guess, int max_iterations = std::numeric_limits<typename Complex::value_type>::digits)
+template<class ComplexType, class F>
+ComplexType complex_newton(F g, ComplexType guess, int max_iterations = std::numeric_limits<typename ComplexType::value_type>::digits)
 {
-   typedef typename Complex::value_type Real;
+   typedef typename ComplexType::value_type Real;
    using std::norm;
    using std::abs;
    using std::max;
    // z0, z1, and z2 cannot be the same, in case we immediately need to resort to Muller's Method:
-   Complex z0 = guess + Complex(1, 0);
-   Complex z1 = guess + Complex(0, 1);
-   Complex z2 = guess;
+   ComplexType z0 = guess + ComplexType(1, 0);
+   ComplexType z1 = guess + ComplexType(0, 1);
+   ComplexType z2 = guess;
 
    do {
       auto pair = g(z2);
       if (norm(pair.second) == 0)
       {
          // Muller's method. Notation follows Numerical Recipes, 9.5.2:
-         Complex q = (z2 - z1) / (z1 - z0);
+         ComplexType q = (z2 - z1) / (z1 - z0);
          auto P0 = g(z0);
          auto P1 = g(z1);
-         Complex qp1 = static_cast<Complex>(1) + q;
-         Complex A = q * (pair.first - qp1 * P1.first + q * P0.first);
-
-         Complex B = (static_cast<Complex>(2) * q + static_cast<Complex>(1)) * pair.first - qp1 * qp1 * P1.first + q * q * P0.first;
-         Complex C = qp1 * pair.first;
-         Complex rad = sqrt(B * B - static_cast<Complex>(4) * A * C);
-         Complex denom1 = B + rad;
-         Complex denom2 = B - rad;
-         Complex correction = (z1 - z2) * static_cast<Complex>(2) * C;
+         ComplexType qp1 = static_cast<ComplexType>(1) + q;
+         ComplexType A = q * (pair.first - qp1 * P1.first + q * P0.first);
+
+         ComplexType B = (static_cast<ComplexType>(2) * q + static_cast<ComplexType>(1)) * pair.first - qp1 * qp1 * P1.first + q * q * P0.first;
+         ComplexType C = qp1 * pair.first;
+         ComplexType rad = sqrt(B * B - static_cast<ComplexType>(4) * A * C);
+         ComplexType denom1 = B + rad;
+         ComplexType denom2 = B - rad;
+         ComplexType correction = (z1 - z2) * static_cast<ComplexType>(2) * C;
          if (norm(denom1) > norm(denom2))
          {
             correction /= denom1;
@@ -864,7 +902,7 @@ Complex complex_newton(F g, Complex guess, int max_iterations = std::numeric_lim
 #endif
 
 
-#if !defined(BOOST_NO_CXX17_IF_CONSTEXPR)
+#if !defined(BOOST_MATH_NO_CXX17_IF_CONSTEXPR)
 // https://stackoverflow.com/questions/48979861/numerically-stable-method-for-solving-quadratic-equations/50065711
 namespace detail
 {
@@ -1019,4 +1057,6 @@ inline std::pair<typename tools::promote_args<T1, T2, T3>::type, typename tools:
 } // namespace math
 } // namespace boost
 
+#endif // BOOST_MATH_HAS_NVRTC
+
 #endif // BOOST_MATH_TOOLS_NEWTON_SOLVER_HPP
diff --git a/inst/include/boost/math/tools/series.hpp b/inst/include/boost/math/tools/series.hpp
index a4822fea4..4617ea3df 100644
--- a/inst/include/boost/math/tools/series.hpp
+++ b/inst/include/boost/math/tools/series.hpp
@@ -10,10 +10,11 @@
 #pragma once
 #endif
 
-#include <cmath>
-#include <cstdint>
-#include <limits>
+
 #include <boost/math/tools/config.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/cstdint.hpp>
+#include <boost/math/tools/type_traits.hpp>
 
 namespace boost{ namespace math{ namespace tools{
 
@@ -21,13 +22,17 @@ namespace boost{ namespace math{ namespace tools{
 // Simple series summation come first:
 //
 template <class Functor, class U, class V>
-inline typename Functor::result_type sum_series(Functor& func, const U& factor, std::uintmax_t& max_terms, const V& init_value) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type sum_series(Functor& func, const U& factor, boost::math::uintmax_t& max_terms, const V& init_value) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
 
    typedef typename Functor::result_type result_type;
 
-   std::uintmax_t counter = max_terms;
+   boost::math::uintmax_t counter = max_terms;
 
    result_type result = init_value;
    result_type next_term;
@@ -44,14 +49,22 @@ inline typename Functor::result_type sum_series(Functor& func, const U& factor,
 }
 
 template <class Functor, class U>
-inline typename Functor::result_type sum_series(Functor& func, const U& factor, std::uintmax_t& max_terms) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type sum_series(Functor& func, const U& factor, boost::math::uintmax_t& max_terms) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    typename Functor::result_type init_value = 0;
    return sum_series(func, factor, max_terms, init_value);
 }
 
 template <class Functor, class U>
-inline typename Functor::result_type sum_series(Functor& func, int bits, std::uintmax_t& max_terms, const U& init_value) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type sum_series(Functor& func, int bits, boost::math::uintmax_t& max_terms, const U& init_value) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
    typedef typename Functor::result_type result_type;
@@ -60,17 +73,25 @@ inline typename Functor::result_type sum_series(Functor& func, int bits, std::ui
 }
 
 template <class Functor>
-inline typename Functor::result_type sum_series(Functor& func, int bits) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type sum_series(Functor& func, int bits) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) 
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
    typedef typename Functor::result_type result_type;
-   std::uintmax_t iters = (std::numeric_limits<std::uintmax_t>::max)();
+   boost::math::uintmax_t iters = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
    result_type init_val = 0;
    return sum_series(func, bits, iters, init_val);
 }
 
 template <class Functor>
-inline typename Functor::result_type sum_series(Functor& func, int bits, std::uintmax_t& max_terms) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type sum_series(Functor& func, int bits, boost::math::uintmax_t& max_terms) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
    typedef typename Functor::result_type result_type;
@@ -79,23 +100,31 @@ inline typename Functor::result_type sum_series(Functor& func, int bits, std::ui
 }
 
 template <class Functor, class U>
-inline typename Functor::result_type sum_series(Functor& func, int bits, const U& init_value) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type sum_series(Functor& func, int bits, const U& init_value) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
-   std::uintmax_t iters = (std::numeric_limits<std::uintmax_t>::max)();
+   boost::math::uintmax_t iters = (boost::math::numeric_limits<boost::math::uintmax_t>::max)();
    return sum_series(func, bits, iters, init_value);
 }
 //
 // Checked summation:
 //
 template <class Functor, class U, class V>
-inline typename Functor::result_type checked_sum_series(Functor& func, const U& factor, std::uintmax_t& max_terms, const V& init_value, V& norm) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type checked_sum_series(Functor& func, const U& factor, boost::math::uintmax_t& max_terms, const V& init_value, V& norm) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
 
    typedef typename Functor::result_type result_type;
 
-   std::uintmax_t counter = max_terms;
+   boost::math::uintmax_t counter = max_terms;
 
    result_type result = init_value;
    result_type next_term;
@@ -125,7 +154,11 @@ inline typename Functor::result_type checked_sum_series(Functor& func, const U&
 // in any case the result is still much better than a naive summation.
 //
 template <class Functor>
-inline typename Functor::result_type kahan_sum_series(Functor& func, int bits) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type kahan_sum_series(Functor& func, int bits) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
 
@@ -148,13 +181,17 @@ inline typename Functor::result_type kahan_sum_series(Functor& func, int bits) n
 }
 
 template <class Functor>
-inline typename Functor::result_type kahan_sum_series(Functor& func, int bits, std::uintmax_t& max_terms) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type) && noexcept(std::declval<Functor>()()))
+BOOST_MATH_GPU_ENABLED inline typename Functor::result_type kahan_sum_series(Functor& func, int bits, boost::math::uintmax_t& max_terms) noexcept(BOOST_MATH_IS_FLOAT(typename Functor::result_type)
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+&& noexcept(std::declval<Functor>()())
+#endif
+)
 {
    BOOST_MATH_STD_USING
 
    typedef typename Functor::result_type result_type;
 
-   std::uintmax_t counter = max_terms;
+   boost::math::uintmax_t counter = max_terms;
 
    result_type factor = ldexp(result_type(1), bits);
    result_type result = func();
diff --git a/inst/include/boost/math/tools/signal_statistics.hpp b/inst/include/boost/math/tools/signal_statistics.hpp
index 382844c19..419e55f60 100644
--- a/inst/include/boost/math/tools/signal_statistics.hpp
+++ b/inst/include/boost/math/tools/signal_statistics.hpp
@@ -17,7 +17,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/simple_continued_fraction.hpp b/inst/include/boost/math/tools/simple_continued_fraction.hpp
index 790f98462..daf2c3c65 100644
--- a/inst/include/boost/math/tools/simple_continued_fraction.hpp
+++ b/inst/include/boost/math/tools/simple_continued_fraction.hpp
@@ -19,7 +19,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/stats.hpp b/inst/include/boost/math/tools/stats.hpp
index 1f87c4e65..b57cc7951 100644
--- a/inst/include/boost/math/tools/stats.hpp
+++ b/inst/include/boost/math/tools/stats.hpp
@@ -36,8 +36,8 @@ class stats
       ++m_count;
       m_squared_total += val*val;
    }
-   T min BOOST_PREVENT_MACRO_SUBSTITUTION()const{ return m_min; }
-   T max BOOST_PREVENT_MACRO_SUBSTITUTION()const{ return m_max; }
+   T min BOOST_MATH_PREVENT_MACRO_SUBSTITUTION()const{ return m_min; }
+   T max BOOST_MATH_PREVENT_MACRO_SUBSTITUTION()const{ return m_max; }
    T total()const{ return m_total; }
    T mean()const{ return m_total / static_cast<T>(m_count); }
    std::uintmax_t count()const{ return m_count; }
diff --git a/inst/include/boost/math/tools/throw_exception.hpp b/inst/include/boost/math/tools/throw_exception.hpp
index 56a2c9c3e..3a918db94 100644
--- a/inst/include/boost/math/tools/throw_exception.hpp
+++ b/inst/include/boost/math/tools/throw_exception.hpp
@@ -10,12 +10,33 @@
 
 #ifndef BOOST_MATH_STANDALONE
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 #include <boost/throw_exception.hpp>
 #define BOOST_MATH_THROW_EXCEPTION(expr) boost::throw_exception(expr);
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #else // Standalone mode - use standard library facilities
 
-#define BOOST_MATH_THROW_EXCEPTION(expr) throw expr;
+#ifdef _MSC_VER
+#  ifdef _CPPUNWIND
+#    define BOOST_MATH_THROW_EXCEPTION(expr) throw expr;
+#  else
+#    define BOOST_MATH_THROW_EXCEPTION(expr)
+#  endif
+#else
+#  ifdef __EXCEPTIONS
+#    define BOOST_MATH_THROW_EXCEPTION(expr) throw expr;
+#  else
+#    define BOOST_MATH_THROW_EXCEPTION(expr)
+#  endif
+#endif
 
 #endif // BOOST_MATH_STANDALONE
 
diff --git a/inst/include/boost/math/tools/toms748_solve.hpp b/inst/include/boost/math/tools/toms748_solve.hpp
index 2de491a95..dee234685 100644
--- a/inst/include/boost/math/tools/toms748_solve.hpp
+++ b/inst/include/boost/math/tools/toms748_solve.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2006.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,13 +11,13 @@
 #pragma once
 #endif
 
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/precision.hpp>
+#include <boost/math/tools/numeric_limits.hpp>
+#include <boost/math/tools/tuple.hpp>
+#include <boost/math/tools/cstdint.hpp>
 #include <boost/math/policies/error_handling.hpp>
-#include <boost/math/tools/config.hpp>
 #include <boost/math/special_functions/sign.hpp>
-#include <limits>
-#include <utility>
-#include <cstdint>
 
 #ifdef BOOST_MATH_LOG_ROOT_ITERATIONS
 #  define BOOST_MATH_LOGGER_INCLUDE <boost/math/tools/iteration_logger.hpp>
@@ -32,61 +33,74 @@ template <class T>
 class eps_tolerance
 {
 public:
-   eps_tolerance() : eps(4 * tools::epsilon<T>())
+   BOOST_MATH_GPU_ENABLED eps_tolerance() : eps(4 * tools::epsilon<T>())
    {
 
    }
-   eps_tolerance(unsigned bits)
+   BOOST_MATH_GPU_ENABLED eps_tolerance(unsigned bits)
    {
       BOOST_MATH_STD_USING
-      eps = (std::max)(T(ldexp(1.0F, 1-bits)), T(4 * tools::epsilon<T>()));
+      eps = BOOST_MATH_GPU_SAFE_MAX(T(ldexp(1.0F, 1-bits)), T(4 * tools::epsilon<T>()));
    }
-   bool operator()(const T& a, const T& b)
+   BOOST_MATH_GPU_ENABLED bool operator()(const T& a, const T& b)
    {
       BOOST_MATH_STD_USING
-      return fabs(a - b) <= (eps * (std::min)(fabs(a), fabs(b)));
+      return fabs(a - b) <= (eps * BOOST_MATH_GPU_SAFE_MIN(fabs(a), fabs(b)));
    }
 private:
    T eps;
 };
 
+// CUDA warns about __host__ __device__ marker on defaulted constructor
+// but the warning is benign 
+#ifdef BOOST_MATH_ENABLE_CUDA
+#  pragma nv_diag_suppress 20012
+#endif
+
 struct equal_floor
 {
-   equal_floor()= default;
+   BOOST_MATH_GPU_ENABLED equal_floor() = default;
+   
    template <class T>
-   bool operator()(const T& a, const T& b)
+   BOOST_MATH_GPU_ENABLED bool operator()(const T& a, const T& b)
    {
       BOOST_MATH_STD_USING
-      return floor(a) == floor(b);
+      return (floor(a) == floor(b)) || (fabs((b-a)/b) < boost::math::tools::epsilon<T>() * 2);
    }
 };
 
 struct equal_ceil
 {
-   equal_ceil()= default;
+   BOOST_MATH_GPU_ENABLED equal_ceil() = default;
+   
    template <class T>
-   bool operator()(const T& a, const T& b)
+   BOOST_MATH_GPU_ENABLED bool operator()(const T& a, const T& b)
    {
       BOOST_MATH_STD_USING
-      return ceil(a) == ceil(b);
+      return (ceil(a) == ceil(b)) || (fabs((b - a) / b) < boost::math::tools::epsilon<T>() * 2);
    }
 };
 
 struct equal_nearest_integer
 {
-   equal_nearest_integer()= default;
+   BOOST_MATH_GPU_ENABLED equal_nearest_integer() = default;
+   
    template <class T>
-   bool operator()(const T& a, const T& b)
+   BOOST_MATH_GPU_ENABLED bool operator()(const T& a, const T& b)
    {
       BOOST_MATH_STD_USING
-      return floor(a + 0.5f) == floor(b + 0.5f);
+      return (floor(a + 0.5f) == floor(b + 0.5f)) || (fabs((b - a) / b) < boost::math::tools::epsilon<T>() * 2);
    }
 };
 
+#ifdef BOOST_MATH_ENABLE_CUDA
+#  pragma nv_diag_default 20012
+#endif
+
 namespace detail{
 
 template <class F, class T>
-void bracket(F f, T& a, T& b, T c, T& fa, T& fb, T& d, T& fd)
+BOOST_MATH_GPU_ENABLED void bracket(F f, T& a, T& b, T c, T& fa, T& fb, T& d, T& fd)
 {
    //
    // Given a point c inside the existing enclosing interval
@@ -150,7 +164,7 @@ void bracket(F f, T& a, T& b, T c, T& fa, T& fb, T& d, T& fd)
 }
 
 template <class T>
-inline T safe_div(T num, T denom, T r)
+BOOST_MATH_GPU_ENABLED inline T safe_div(T num, T denom, T r)
 {
    //
    // return num / denom without overflow,
@@ -167,7 +181,7 @@ inline T safe_div(T num, T denom, T r)
 }
 
 template <class T>
-inline T secant_interpolate(const T& a, const T& b, const T& fa, const T& fb)
+BOOST_MATH_GPU_ENABLED inline T secant_interpolate(const T& a, const T& b, const T& fa, const T& fb)
 {
    //
    // Performs standard secant interpolation of [a,b] given
@@ -188,9 +202,9 @@ inline T secant_interpolate(const T& a, const T& b, const T& fa, const T& fb)
 }
 
 template <class T>
-T quadratic_interpolate(const T& a, const T& b, T const& d,
-                           const T& fa, const T& fb, T const& fd, 
-                           unsigned count)
+BOOST_MATH_GPU_ENABLED T quadratic_interpolate(const T& a, const T& b, T const& d,
+                                               const T& fa, const T& fb, T const& fd, 
+                                               unsigned count)
 {
    //
    // Performs quadratic interpolation to determine the next point,
@@ -244,9 +258,9 @@ T quadratic_interpolate(const T& a, const T& b, T const& d,
 }
 
 template <class T>
-T cubic_interpolate(const T& a, const T& b, const T& d, 
-                    const T& e, const T& fa, const T& fb, 
-                    const T& fd, const T& fe)
+BOOST_MATH_GPU_ENABLED T cubic_interpolate(const T& a, const T& b, const T& d, 
+                                           const T& e, const T& fa, const T& fb, 
+                                           const T& fd, const T& fe)
 {
    //
    // Uses inverse cubic interpolation of f(x) at points 
@@ -293,7 +307,7 @@ T cubic_interpolate(const T& a, const T& b, const T& d,
 } // namespace detail
 
 template <class F, class T, class Tol, class Policy>
-std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const T& fbx, Tol tol, std::uintmax_t& max_iter, const Policy& pol)
+BOOST_MATH_GPU_ENABLED boost::math::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const T& fbx, Tol tol, boost::math::uintmax_t& max_iter, const Policy& pol)
 {
    //
    // Main entry point and logic for Toms Algorithm 748
@@ -301,15 +315,15 @@ std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const
    //
    BOOST_MATH_STD_USING  // For ADL of std math functions
 
-   static const char* function = "boost::math::tools::toms748_solve<%1%>";
+   constexpr auto function = "boost::math::tools::toms748_solve<%1%>";
 
    //
    // Sanity check - are we allowed to iterate at all?
    //
    if (max_iter == 0)
-      return std::make_pair(ax, bx);
+      return boost::math::make_pair(ax, bx);
 
-   std::uintmax_t count = max_iter;
+   boost::math::uintmax_t count = max_iter;
    T a, b, fa, fb, c, u, fu, a0, b0, d, fd, e, fe;
    static const T mu = 0.5f;
 
@@ -330,7 +344,7 @@ std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const
          b = a;
       else if(fb == 0)
          a = b;
-      return std::make_pair(a, b);
+      return boost::math::make_pair(a, b);
    }
 
    if(boost::math::sign(fa) * boost::math::sign(fb) > 0)
@@ -472,37 +486,37 @@ std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const
       a = b;
    }
    BOOST_MATH_LOG_COUNT(max_iter)
-   return std::make_pair(a, b);
+   return boost::math::make_pair(a, b);
 }
 
 template <class F, class T, class Tol>
-inline std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const T& fbx, Tol tol, std::uintmax_t& max_iter)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, const T& fax, const T& fbx, Tol tol, boost::math::uintmax_t& max_iter)
 {
    return toms748_solve(f, ax, bx, fax, fbx, tol, max_iter, policies::policy<>());
 }
 
 template <class F, class T, class Tol, class Policy>
-inline std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, Tol tol, std::uintmax_t& max_iter, const Policy& pol)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, Tol tol, boost::math::uintmax_t& max_iter, const Policy& pol)
 {
    if (max_iter <= 2)
-      return std::make_pair(ax, bx);
+      return boost::math::make_pair(ax, bx);
    max_iter -= 2;
-   std::pair<T, T> r = toms748_solve(f, ax, bx, f(ax), f(bx), tol, max_iter, pol);
+   boost::math::pair<T, T> r = toms748_solve(f, ax, bx, f(ax), f(bx), tol, max_iter, pol);
    max_iter += 2;
    return r;
 }
 
 template <class F, class T, class Tol>
-inline std::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, Tol tol, std::uintmax_t& max_iter)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> toms748_solve(F f, const T& ax, const T& bx, Tol tol, boost::math::uintmax_t& max_iter)
 {
    return toms748_solve(f, ax, bx, tol, max_iter, policies::policy<>());
 }
 
 template <class F, class T, class Tol, class Policy>
-std::pair<T, T> bracket_and_solve_root(F f, const T& guess, T factor, bool rising, Tol tol, std::uintmax_t& max_iter, const Policy& pol)
+BOOST_MATH_GPU_ENABLED boost::math::pair<T, T> bracket_and_solve_root(F f, const T& guess, T factor, bool rising, Tol tol, boost::math::uintmax_t& max_iter, const Policy& pol)
 {
    BOOST_MATH_STD_USING
-   static const char* function = "boost::math::tools::bracket_and_solve_root<%1%>";
+   constexpr auto function = "boost::math::tools::bracket_and_solve_root<%1%>";
    //
    // Set up initial brackets:
    //
@@ -513,7 +527,7 @@ std::pair<T, T> bracket_and_solve_root(F f, const T& guess, T factor, bool risin
    //
    // Set up invocation count:
    //
-   std::uintmax_t count = max_iter - 1;
+   boost::math::uintmax_t count = max_iter - 1;
 
    int step = 32;
 
@@ -563,7 +577,7 @@ std::pair<T, T> bracket_and_solve_root(F f, const T& guess, T factor, bool risin
             // Escape route just in case the answer is zero!
             max_iter -= count;
             max_iter += 1;
-            return a > 0 ? std::make_pair(T(0), T(a)) : std::make_pair(T(a), T(0)); 
+            return a > 0 ? boost::math::make_pair(T(0), T(a)) : boost::math::make_pair(T(a), T(0)); 
          }
          if(count == 0)
             return boost::math::detail::pair_from_single(policies::raise_evaluation_error(function, "Unable to bracket root, last nearest value was %1%", a, pol));
@@ -592,7 +606,7 @@ std::pair<T, T> bracket_and_solve_root(F f, const T& guess, T factor, bool risin
    }
    max_iter -= count;
    max_iter += 1;
-   std::pair<T, T> r = toms748_solve(
+   boost::math::pair<T, T> r = toms748_solve(
       f, 
       (a < 0 ? b : a), 
       (a < 0 ? a : b), 
@@ -608,7 +622,7 @@ std::pair<T, T> bracket_and_solve_root(F f, const T& guess, T factor, bool risin
 }
 
 template <class F, class T, class Tol>
-inline std::pair<T, T> bracket_and_solve_root(F f, const T& guess, const T& factor, bool rising, Tol tol, std::uintmax_t& max_iter)
+BOOST_MATH_GPU_ENABLED inline boost::math::pair<T, T> bracket_and_solve_root(F f, const T& guess, const T& factor, bool rising, Tol tol, boost::math::uintmax_t& max_iter)
 {
    return bracket_and_solve_root(f, guess, factor, rising, tol, max_iter, policies::policy<>());
 }
diff --git a/inst/include/boost/math/tools/tuple.hpp b/inst/include/boost/math/tools/tuple.hpp
index b5e42fc59..dcc763e37 100644
--- a/inst/include/boost/math/tools/tuple.hpp
+++ b/inst/include/boost/math/tools/tuple.hpp
@@ -1,4 +1,5 @@
 //  (C) Copyright John Maddock 2010.
+//  (C) Copyright Matt Borland 2024.
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -6,12 +7,65 @@
 #ifndef BOOST_MATH_TUPLE_HPP_INCLUDED
 #define BOOST_MATH_TUPLE_HPP_INCLUDED
 
-#include <boost/math/tools/cxx03_warn.hpp>
+#include <boost/math/tools/config.hpp>
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <boost/math/tools/type_traits.hpp>
+#include <cuda/std/utility>
+#include <cuda/std/tuple>
+
+namespace boost { 
+namespace math {
+
+using cuda::std::pair;
+using cuda::std::tuple;
+
+using cuda::std::make_pair;
+
+using cuda::std::tie;
+using cuda::std::get;
+
+using cuda::std::tuple_size;
+using cuda::std::tuple_element;
+
+namespace detail {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED T&& forward(boost::math::remove_reference_t<T>& arg) noexcept
+{
+    return static_cast<T&&>(arg);
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED T&& forward(boost::math::remove_reference_t<T>&& arg) noexcept
+{
+    static_assert(!boost::math::is_lvalue_reference<T>::value, "Cannot forward an rvalue as an lvalue.");
+    return static_cast<T&&>(arg);
+}
+
+} // namespace detail
+
+template <typename T, typename... Ts>
+BOOST_MATH_GPU_ENABLED auto make_tuple(T&& t, Ts&&... ts) 
+{
+    return cuda::std::tuple<boost::math::decay_t<T>, boost::math::decay_t<Ts>...>(
+        boost::math::detail::forward<T>(t), boost::math::detail::forward<Ts>(ts)...
+    );
+}
+
+} // namespace math
+} // namespace boost
+
+#else
+
 #include <tuple>
 
-namespace boost{ namespace math{
+namespace boost { 
+namespace math {
 
 using ::std::tuple;
+using ::std::pair;
 
 // [6.1.3.2] Tuple creation functions
 using ::std::ignore;
@@ -23,5 +77,12 @@ using ::std::get;
 using ::std::tuple_size;
 using ::std::tuple_element;
 
-}}
+// Pair helpers
+using ::std::make_pair;
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_ENABLE_CUDA
+
 #endif
diff --git a/inst/include/boost/math/tools/type_traits.hpp b/inst/include/boost/math/tools/type_traits.hpp
new file mode 100644
index 000000000..a13332797
--- /dev/null
+++ b/inst/include/boost/math/tools/type_traits.hpp
@@ -0,0 +1,494 @@
+//  Copyright (c) 2024 Matt Borland
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+//  Regular use of <type_traits> is not compatible with CUDA
+//  Adds aliases to unify the support
+//  Also adds convience overloads like is_same_v so we don't have to wait for C++17
+
+#ifndef BOOST_MATH_TOOLS_TYPE_TRAITS
+#define BOOST_MATH_TOOLS_TYPE_TRAITS
+
+#include <boost/math/tools/config.hpp>
+
+#ifdef BOOST_MATH_ENABLE_CUDA
+
+#include <cuda/std/type_traits>
+
+namespace boost {
+namespace math {
+
+// Helper classes
+using cuda::std::integral_constant;
+using cuda::std::true_type;
+using cuda::std::false_type;
+
+// Primary type categories
+using cuda::std::is_void;
+using cuda::std::is_null_pointer;
+using cuda::std::is_integral;
+using cuda::std::is_floating_point;
+using cuda::std::is_array;
+using cuda::std::is_enum;
+using cuda::std::is_union;
+using cuda::std::is_class;
+using cuda::std::is_function;
+using cuda::std::is_pointer;
+using cuda::std::is_lvalue_reference;
+using cuda::std::is_rvalue_reference;
+using cuda::std::is_member_object_pointer;
+using cuda::std::is_member_function_pointer;
+
+// Composite Type Categories
+using cuda::std::is_fundamental;
+using cuda::std::is_arithmetic;
+using cuda::std::is_scalar;
+using cuda::std::is_object;
+using cuda::std::is_compound;
+using cuda::std::is_reference;
+using cuda::std::is_member_pointer;
+
+// Type properties
+using cuda::std::is_const;
+using cuda::std::is_volatile;
+using cuda::std::is_trivial;
+using cuda::std::is_trivially_copyable;
+using cuda::std::is_standard_layout;
+using cuda::std::is_empty;
+using cuda::std::is_polymorphic;
+using cuda::std::is_abstract;
+using cuda::std::is_final;
+using cuda::std::is_signed;
+using cuda::std::is_unsigned; 
+
+// Supported Operations
+using cuda::std::is_constructible;
+using cuda::std::is_trivially_constructible;
+using cuda::std::is_nothrow_constructible;
+
+using cuda::std::is_default_constructible;
+using cuda::std::is_trivially_default_constructible;
+using cuda::std::is_nothrow_default_constructible;
+
+using cuda::std::is_copy_constructible;
+using cuda::std::is_trivially_copy_constructible;
+using cuda::std::is_nothrow_copy_constructible;
+
+using cuda::std::is_move_constructible;
+using cuda::std::is_trivially_move_constructible;
+using cuda::std::is_nothrow_move_constructible;
+
+using cuda::std::is_assignable;
+using cuda::std::is_trivially_assignable;
+using cuda::std::is_nothrow_assignable;
+
+using cuda::std::is_copy_assignable;
+using cuda::std::is_trivially_copy_assignable;
+using cuda::std::is_nothrow_copy_assignable;
+
+using cuda::std::is_move_assignable;
+using cuda::std::is_trivially_move_assignable;
+using cuda::std::is_nothrow_move_assignable;
+
+using cuda::std::is_destructible;
+using cuda::std::is_trivially_destructible;
+using cuda::std::is_nothrow_destructible;
+
+using cuda::std::has_virtual_destructor;
+
+// Property Queries
+using cuda::std::alignment_of;
+using cuda::std::rank;
+using cuda::std::extent;
+
+// Type Relationships
+using cuda::std::is_same;
+using cuda::std::is_base_of;
+using cuda::std::is_convertible;
+
+// Const-volatility specifiers
+using cuda::std::remove_cv;
+using cuda::std::remove_cv_t;
+using cuda::std::remove_const;
+using cuda::std::remove_const_t;
+using cuda::std::remove_volatile;
+using cuda::std::remove_volatile_t;
+using cuda::std::add_cv;
+using cuda::std::add_cv_t;
+using cuda::std::add_const;
+using cuda::std::add_const_t;
+using cuda::std::add_volatile;
+using cuda::std::add_volatile_t;
+
+// References
+using cuda::std::remove_reference;
+using cuda::std::remove_reference_t;
+using cuda::std::add_lvalue_reference;
+using cuda::std::add_lvalue_reference_t;
+using cuda::std::add_rvalue_reference;
+using cuda::std::add_rvalue_reference_t;
+
+// Pointers
+using cuda::std::remove_pointer;
+using cuda::std::remove_pointer_t;
+using cuda::std::add_pointer;
+using cuda::std::add_pointer_t;
+
+// Sign Modifiers
+using cuda::std::make_signed;
+using cuda::std::make_signed_t;
+using cuda::std::make_unsigned;
+using cuda::std::make_unsigned_t;
+
+// Arrays
+using cuda::std::remove_extent;
+using cuda::std::remove_extent_t;
+using cuda::std::remove_all_extents;
+using cuda::std::remove_all_extents_t;
+
+// Misc transformations
+using cuda::std::decay;
+using cuda::std::decay_t;
+using cuda::std::enable_if;
+using cuda::std::enable_if_t;
+using cuda::std::conditional;
+using cuda::std::conditional_t;
+using cuda::std::common_type;
+using cuda::std::common_type_t;
+using cuda::std::underlying_type;
+using cuda::std::underlying_type_t;
+
+#else // STD versions
+
+#include <type_traits>
+
+namespace boost {
+namespace math {
+
+// Helper classes
+using std::integral_constant;
+using std::true_type;
+using std::false_type;
+
+// Primary type categories
+using std::is_void;
+using std::is_null_pointer;
+using std::is_integral;
+using std::is_floating_point;
+using std::is_array;
+using std::is_enum;
+using std::is_union;
+using std::is_class;
+using std::is_function;
+using std::is_pointer;
+using std::is_lvalue_reference;
+using std::is_rvalue_reference;
+using std::is_member_object_pointer;
+using std::is_member_function_pointer;
+
+// Composite Type Categories
+using std::is_fundamental;
+using std::is_arithmetic;
+using std::is_scalar;
+using std::is_object;
+using std::is_compound;
+using std::is_reference;
+using std::is_member_pointer;
+
+// Type properties
+using std::is_const;
+using std::is_volatile;
+using std::is_trivial;
+using std::is_trivially_copyable;
+using std::is_standard_layout;
+using std::is_empty;
+using std::is_polymorphic;
+using std::is_abstract;
+using std::is_final;
+using std::is_signed;
+using std::is_unsigned; 
+
+// Supported Operations
+using std::is_constructible;
+using std::is_trivially_constructible;
+using std::is_nothrow_constructible;
+
+using std::is_default_constructible;
+using std::is_trivially_default_constructible;
+using std::is_nothrow_default_constructible;
+
+using std::is_copy_constructible;
+using std::is_trivially_copy_constructible;
+using std::is_nothrow_copy_constructible;
+
+using std::is_move_constructible;
+using std::is_trivially_move_constructible;
+using std::is_nothrow_move_constructible;
+
+using std::is_assignable;
+using std::is_trivially_assignable;
+using std::is_nothrow_assignable;
+
+using std::is_copy_assignable;
+using std::is_trivially_copy_assignable;
+using std::is_nothrow_copy_assignable;
+
+using std::is_move_assignable;
+using std::is_trivially_move_assignable;
+using std::is_nothrow_move_assignable;
+
+using std::is_destructible;
+using std::is_trivially_destructible;
+using std::is_nothrow_destructible;
+
+using std::has_virtual_destructor;
+
+// Property Queries
+using std::alignment_of;
+using std::rank;
+using std::extent;
+
+// Type Relationships
+using std::is_same;
+using std::is_base_of;
+using std::is_convertible;
+
+// Const-volatility specifiers
+using std::remove_cv;
+using std::remove_cv_t;
+using std::remove_const;
+using std::remove_const_t;
+using std::remove_volatile;
+using std::remove_volatile_t;
+using std::add_cv;
+using std::add_cv_t;
+using std::add_const;
+using std::add_const_t;
+using std::add_volatile;
+using std::add_volatile_t;
+
+// References
+using std::remove_reference;
+using std::remove_reference_t;
+using std::add_lvalue_reference;
+using std::add_lvalue_reference_t;
+using std::add_rvalue_reference;
+using std::add_rvalue_reference_t;
+
+// Pointers
+using std::remove_pointer;
+using std::remove_pointer_t;
+using std::add_pointer;
+using std::add_pointer_t;
+
+// Sign Modifiers
+using std::make_signed;
+using std::make_signed_t;
+using std::make_unsigned;
+using std::make_unsigned_t;
+
+// Arrays
+using std::remove_extent;
+using std::remove_extent_t;
+using std::remove_all_extents;
+using std::remove_all_extents_t;
+
+// Misc transformations
+using std::decay;
+using std::decay_t;
+using std::enable_if;
+using std::enable_if_t;
+using std::conditional;
+using std::conditional_t;
+using std::common_type;
+using std::common_type_t;
+using std::underlying_type;
+using std::underlying_type_t;
+
+#endif 
+
+template <bool B>
+using bool_constant = boost::math::integral_constant<bool, B>;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_void_v = boost::math::is_void<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_null_pointer_v = boost::math::is_null_pointer<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_integral_v = boost::math::is_integral<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_floating_point_v = boost::math::is_floating_point<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_array_v = boost::math::is_array<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_enum_v = boost::math::is_enum<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_union_v = boost::math::is_union<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_class_v = boost::math::is_class<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_function_v = boost::math::is_function<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_pointer_v = boost::math::is_pointer<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_lvalue_reference_v = boost::math::is_lvalue_reference<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_rvalue_reference_v = boost::math::is_rvalue_reference<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_member_object_pointer_v = boost::math::is_member_object_pointer<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_member_function_pointer_v = boost::math::is_member_function_pointer<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_fundamental_v = boost::math::is_fundamental<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_arithmetic_v = boost::math::is_arithmetic<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_scalar_v = boost::math::is_scalar<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_object_v = boost::math::is_object<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_compound_v = boost::math::is_compound<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_reference_v = boost::math::is_reference<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_member_pointer_v = boost::math::is_member_pointer<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_const_v = boost::math::is_const<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_volatile_v = boost::math::is_volatile<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivial_v = boost::math::is_trivial<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_copyable_v = boost::math::is_trivially_copyable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_standard_layout_v = boost::math::is_standard_layout<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_empty_v = boost::math::is_empty<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_polymorphic_v = boost::math::is_polymorphic<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_abstract_v = boost::math::is_abstract<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_final_v = boost::math::is_final<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_signed_v = boost::math::is_signed<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_unsigned_v = boost::math::is_unsigned<T>::value;
+
+template <typename T, typename... Args>
+BOOST_MATH_INLINE_CONSTEXPR bool is_constructible_v = boost::math::is_constructible<T, Args...>::value;
+
+template <typename T, typename... Args>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_constructible_v = boost::math::is_trivially_constructible<T, Args...>::value;
+
+template <typename T, typename... Args>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_constructible_v = boost::math::is_nothrow_constructible<T, Args...>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_default_constructible_v = boost::math::is_default_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_default_constructible_v = boost::math::is_trivially_default_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_default_constructible_v = boost::math::is_nothrow_default_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_copy_constructible_v = boost::math::is_copy_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_copy_constructible_v = boost::math::is_trivially_copy_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_copy_constructible_v = boost::math::is_nothrow_copy_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_move_constructible_v = boost::math::is_move_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_move_constructible_v = boost::math::is_trivially_move_constructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_move_constructible_v = boost::math::is_nothrow_move_constructible<T>::value;
+
+template <typename T, typename U>
+BOOST_MATH_INLINE_CONSTEXPR bool is_assignable_v = boost::math::is_assignable<T, U>::value;
+
+template <typename T, typename U>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_assignable_v = boost::math::is_trivially_assignable<T, U>::value;
+
+template <typename T, typename U>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_assignable_v = boost::math::is_nothrow_assignable<T, U>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_copy_assignable_v = boost::math::is_copy_assignable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_copy_assignable_v = boost::math::is_trivially_copy_assignable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_copy_assignable_v = boost::math::is_nothrow_copy_assignable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_move_assignable_v = boost::math::is_move_assignable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_move_assignable_v = boost::math::is_trivially_move_assignable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_move_assignable_v = boost::math::is_nothrow_move_assignable<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_destructible_v = boost::math::is_destructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_trivially_destructible_v = boost::math::is_trivially_destructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool is_nothrow_destructible_v = boost::math::is_nothrow_destructible<T>::value;
+
+template <typename T>
+BOOST_MATH_INLINE_CONSTEXPR bool has_virtual_destructor_v = boost::math::has_virtual_destructor<T>::value;
+
+template <typename T, typename U>
+BOOST_MATH_INLINE_CONSTEXPR bool is_same_v = boost::math::is_same<T, U>::value;
+
+template <typename T, typename U>
+BOOST_MATH_INLINE_CONSTEXPR bool is_base_of_v = boost::math::is_base_of<T, U>::value;
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_TOOLS_TYPE_TRAITS
diff --git a/inst/include/boost/math/tools/univariate_statistics.hpp b/inst/include/boost/math/tools/univariate_statistics.hpp
index 1091d9f6e..98a97abac 100644
--- a/inst/include/boost/math/tools/univariate_statistics.hpp
+++ b/inst/include/boost/math/tools/univariate_statistics.hpp
@@ -15,7 +15,7 @@
 #include <boost/math/tools/is_standalone.hpp>
 #ifndef BOOST_MATH_STANDALONE
 #include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
+#ifdef BOOST_MATH_NO_CXX17_IF_CONSTEXPR
 #error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
 #endif
 #endif
diff --git a/inst/include/boost/math/tools/utility.hpp b/inst/include/boost/math/tools/utility.hpp
new file mode 100644
index 000000000..3e2286578
--- /dev/null
+++ b/inst/include/boost/math/tools/utility.hpp
@@ -0,0 +1,69 @@
+//  Copyright (c) 2024 Matt Borland
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_MATH_TOOLS_UTILITY
+#define BOOST_MATH_TOOLS_UTILITY
+
+#include <boost/math/tools/config.hpp>
+
+#ifndef BOOST_MATH_HAS_GPU_SUPPORT
+
+#include <utility>
+
+namespace boost {
+namespace math {
+
+template <typename T>
+constexpr T min BOOST_MATH_PREVENT_MACRO_SUBSTITUTION (const T& a, const T& b)
+{
+    return (std::min)(a, b);
+}
+
+template <typename T>
+constexpr T max BOOST_MATH_PREVENT_MACRO_SUBSTITUTION (const T& a, const T& b)
+{
+    return (std::max)(a, b);
+}
+
+template <typename T>
+void swap BOOST_MATH_PREVENT_MACRO_SUBSTITUTION (T& a, T& b)
+{
+    return (std::swap)(a, b);
+}
+
+} // namespace math
+} // namespace boost
+
+#else
+
+namespace boost {
+namespace math {
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED constexpr T min BOOST_MATH_PREVENT_MACRO_SUBSTITUTION (const T& a, const T& b)
+{ 
+    return a < b ? a : b; 
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED constexpr T max BOOST_MATH_PREVENT_MACRO_SUBSTITUTION (const T& a, const T& b)
+{ 
+    return a > b ? a : b;
+}
+
+template <typename T>
+BOOST_MATH_GPU_ENABLED constexpr void swap BOOST_MATH_PREVENT_MACRO_SUBSTITUTION (T& a, T& b)
+{ 
+    T t(a); 
+    a = b; 
+    b = t;
+}
+
+} // namespace math
+} // namespace boost
+
+#endif // BOOST_MATH_HAS_GPU_SUPPORT
+
+#endif // BOOST_MATH_TOOLS_UTILITY
diff --git a/inst/include/boost/math/tools/workaround.hpp b/inst/include/boost/math/tools/workaround.hpp
index 9b15c4e93..7edd1c12a 100644
--- a/inst/include/boost/math/tools/workaround.hpp
+++ b/inst/include/boost/math/tools/workaround.hpp
@@ -23,7 +23,7 @@ namespace boost{ namespace math{ namespace tools{
 // std::fmod(1185.0L, 1.5L);
 //
 template <class T>
-inline T fmod_workaround(T a, T b) BOOST_MATH_NOEXCEPT(T)
+BOOST_MATH_GPU_ENABLED inline T fmod_workaround(T a, T b) BOOST_MATH_NOEXCEPT(T)
 {
    BOOST_MATH_STD_USING
    return fmod(a, b);
diff --git a/inst/include/boost/math/tr1.hpp b/inst/include/boost/math/tr1.hpp
index 3b1ed93de..0ec947b61 100644
--- a/inst/include/boost/math/tr1.hpp
+++ b/inst/include/boost/math/tr1.hpp
@@ -22,8 +22,8 @@ namespace boost{ namespace math{ namespace tr1{ extern "C"{
 
 #endif // __cplusplus
 
-#ifndef BOOST_PREVENT_MACRO_SUBSTITUTION
-#define BOOST_PREVENT_MACRO_SUBSTITUTION /**/
+#ifndef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION
+#define BOOST_MATH_PREVENT_MACRO_SUBSTITUTION /**/
 #endif
 
 // we need to import/export our code only if the user has specifically
@@ -132,255 +132,255 @@ typedef long double double_t;
 #endif
 
 // C99 Functions:
-double BOOST_MATH_TR1_DECL boost_acosh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_acoshf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_acoshl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_acoshf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_acoshl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_asinh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_asinhf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_asinhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_asinhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_asinhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_atanh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_atanhf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_atanhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_atanhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_atanhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_cbrtf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_cbrtl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_cbrtf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_cbrtl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_copysign BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_copysignf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_copysignl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_copysignf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_copysignl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_erf BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_erff BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_erfl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_erff BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_erfl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_erfc BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_erfcf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_erfcl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_erfcf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_erfcl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-double BOOST_MATH_TR1_DECL boost_exp2 BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_exp2f BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_exp2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_exp2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_exp2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_exp2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
-double BOOST_MATH_TR1_DECL boost_expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_expm1f BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_expm1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_expm1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_expm1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-double BOOST_MATH_TR1_DECL boost_fdim BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_fdimf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_fdiml BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
-double BOOST_MATH_TR1_DECL boost_fma BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y, double z) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_fmaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y, float z) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_fmal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, long double z) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_fdim BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_fdimf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_fdiml BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_fma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y, double z) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_fmaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y, float z) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_fmal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, long double z) BOOST_MATH_C99_THROW_SPEC;
 #endif
-double BOOST_MATH_TR1_DECL boost_fmax BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_fmaxf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_fmaxl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_fmaxf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_fmaxl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_fmin BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_fminf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_fminl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_fminf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_fminl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_hypot BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_hypotf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_hypotf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_hypotl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-int BOOST_MATH_TR1_DECL boost_ilogb BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-int BOOST_MATH_TR1_DECL boost_ilogbf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-int BOOST_MATH_TR1_DECL boost_ilogbl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+int BOOST_MATH_TR1_DECL boost_ilogb BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+int BOOST_MATH_TR1_DECL boost_ilogbf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+int BOOST_MATH_TR1_DECL boost_ilogbl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
-double BOOST_MATH_TR1_DECL boost_lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_lgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_lgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_lgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_lgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-long long BOOST_MATH_TR1_DECL boost_llround BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-long long BOOST_MATH_TR1_DECL boost_llroundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long long BOOST_MATH_TR1_DECL boost_llroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+long long BOOST_MATH_TR1_DECL boost_llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+long long BOOST_MATH_TR1_DECL boost_llroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long long BOOST_MATH_TR1_DECL boost_llroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_log1p BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_log1pf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_log1pl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_log1pf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_log1pl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-double BOOST_MATH_TR1_DECL log2 BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL log2f BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL log2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
-
-double BOOST_MATH_TR1_DECL logb BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL logbf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL logbl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
-long BOOST_MATH_TR1_DECL lrint BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-long BOOST_MATH_TR1_DECL lrintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long BOOST_MATH_TR1_DECL lrintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL log2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL log2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL log2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+
+double BOOST_MATH_TR1_DECL logb BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL logbf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL logbl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+long BOOST_MATH_TR1_DECL lrint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+long BOOST_MATH_TR1_DECL lrintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long BOOST_MATH_TR1_DECL lrintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
-long BOOST_MATH_TR1_DECL boost_lround BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-long BOOST_MATH_TR1_DECL boost_lroundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long BOOST_MATH_TR1_DECL boost_lroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+long BOOST_MATH_TR1_DECL boost_lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+long BOOST_MATH_TR1_DECL boost_lroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long BOOST_MATH_TR1_DECL boost_lroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-double BOOST_MATH_TR1_DECL nan BOOST_PREVENT_MACRO_SUBSTITUTION(const char *str) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL nanf BOOST_PREVENT_MACRO_SUBSTITUTION(const char *str) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL nanl BOOST_PREVENT_MACRO_SUBSTITUTION(const char *str) BOOST_MATH_C99_THROW_SPEC;
-double BOOST_MATH_TR1_DECL nearbyint BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL nearbyintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL nearbyintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL nan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(const char *str) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL nanf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(const char *str) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL nanl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(const char *str) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL nearbyint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL nearbyintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL nearbyintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
-double BOOST_MATH_TR1_DECL boost_nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_nextafterf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_nextafterl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_nextafterf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_nextafterl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(double x, long double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_nexttowardf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, long double y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_nexttowardl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_nexttowardf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, long double y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_nexttowardl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-double BOOST_MATH_TR1_DECL boost_remainder BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_remainderf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_remainderl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
-double BOOST_MATH_TR1_DECL boost_remquo BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y, int *pquo) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_remquof BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y, int *pquo) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_remquol BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, int *pquo) BOOST_MATH_C99_THROW_SPEC;
-double BOOST_MATH_TR1_DECL boost_rint BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_rintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_rintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_remainder BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_remainderf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_remainderl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_remquo BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y, int *pquo) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_remquof BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y, int *pquo) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_remquol BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, int *pquo) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_rint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_rintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_rintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
-double BOOST_MATH_TR1_DECL boost_round BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_roundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_roundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_roundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_roundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 #if 0
-double BOOST_MATH_TR1_DECL boost_scalbln BOOST_PREVENT_MACRO_SUBSTITUTION(double x, long ex) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_scalblnf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, long ex) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_scalblnl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long ex) BOOST_MATH_C99_THROW_SPEC;
-double BOOST_MATH_TR1_DECL boost_scalbn BOOST_PREVENT_MACRO_SUBSTITUTION(double x, int ex) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_scalbnf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, int ex) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_scalbnl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, int ex) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_scalbln BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, long ex) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_scalblnf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, long ex) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_scalblnl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long ex) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_scalbn BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, int ex) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_scalbnf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, int ex) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_scalbnl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, int ex) BOOST_MATH_C99_THROW_SPEC;
 #endif
-double BOOST_MATH_TR1_DECL boost_tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_tgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_tgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_tgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_tgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
-double BOOST_MATH_TR1_DECL boost_trunc BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_truncf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_truncl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_truncf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_truncl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.1] associated Laguerre polynomials:
-double BOOST_MATH_TR1_DECL boost_assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_assoc_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_assoc_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_assoc_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_assoc_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.2] associated Legendre functions:
-double BOOST_MATH_TR1_DECL boost_assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_assoc_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_assoc_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_assoc_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_assoc_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.3] beta function:
-double BOOST_MATH_TR1_DECL boost_beta BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_betaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_betal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_betaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_betal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.4] (complete) elliptic integral of the first kind:
-double BOOST_MATH_TR1_DECL boost_comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(double k) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_comp_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(float k) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_comp_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_comp_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_comp_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.5] (complete) elliptic integral of the second kind:
-double BOOST_MATH_TR1_DECL boost_comp_ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(double k) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_comp_ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(float k) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_comp_ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_comp_ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_comp_ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_comp_ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.6] (complete) elliptic integral of the third kind:
-double BOOST_MATH_TR1_DECL boost_comp_ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double nu) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_comp_ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float nu) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_comp_ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_comp_ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double nu) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_comp_ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float nu) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_comp_ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu) BOOST_MATH_C99_THROW_SPEC;
 #if 0
 // [5.2.1.7] confluent hypergeometric functions:
-double BOOST_MATH_TR1_DECL conf_hyperg BOOST_PREVENT_MACRO_SUBSTITUTION(double a, double c, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL conf_hypergf BOOST_PREVENT_MACRO_SUBSTITUTION(float a, float c, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL conf_hypergl BOOST_PREVENT_MACRO_SUBSTITUTION(long double a, long double c, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL conf_hyperg BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double a, double c, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL conf_hypergf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float a, float c, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL conf_hypergl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double a, long double c, long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
 // [5.2.1.8] regular modified cylindrical Bessel functions:
-double BOOST_MATH_TR1_DECL boost_cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_cyl_bessel_if BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_cyl_bessel_il BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_cyl_bessel_if BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_cyl_bessel_il BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.9] cylindrical Bessel functions (of the first kind):
-double BOOST_MATH_TR1_DECL boost_cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_cyl_bessel_jf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_cyl_bessel_jl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_cyl_bessel_jf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_cyl_bessel_jl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.10] irregular modified cylindrical Bessel functions:
-double BOOST_MATH_TR1_DECL boost_cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_cyl_bessel_kf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_cyl_bessel_kl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_cyl_bessel_kf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_cyl_bessel_kl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.11] cylindrical Neumann functions BOOST_MATH_C99_THROW_SPEC;
 // cylindrical Bessel functions (of the second kind):
-double BOOST_MATH_TR1_DECL boost_cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_cyl_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_cyl_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_cyl_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_cyl_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.12] (incomplete) elliptic integral of the first kind:
-double BOOST_MATH_TR1_DECL boost_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.13] (incomplete) elliptic integral of the second kind:
-double BOOST_MATH_TR1_DECL boost_ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.14] (incomplete) elliptic integral of the third kind:
-double BOOST_MATH_TR1_DECL boost_ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double nu, double phi) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double nu, double phi) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.15] exponential integral:
-double BOOST_MATH_TR1_DECL boost_expint BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_expintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_expintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_expintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_expintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.16] Hermite polynomials:
-double BOOST_MATH_TR1_DECL boost_hermite BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_hermitef BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_hermitel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_hermitef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_hermitel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 #if 0
 // [5.2.1.17] hypergeometric functions:
-double BOOST_MATH_TR1_DECL hyperg BOOST_PREVENT_MACRO_SUBSTITUTION(double a, double b, double c, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL hypergf BOOST_PREVENT_MACRO_SUBSTITUTION(float a, float b, float c, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL hypergl BOOST_PREVENT_MACRO_SUBSTITUTION(long double a, long double b, long double c,
+double BOOST_MATH_TR1_DECL hyperg BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double a, double b, double c, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL hypergf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float a, float b, float c, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL hypergl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double a, long double b, long double c,
 long double x) BOOST_MATH_C99_THROW_SPEC;
 #endif
 
 // [5.2.1.18] Laguerre polynomials:
-double BOOST_MATH_TR1_DECL boost_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.19] Legendre polynomials:
-double BOOST_MATH_TR1_DECL boost_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.20] Riemann zeta function:
-double BOOST_MATH_TR1_DECL boost_riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(double) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_riemann_zetaf BOOST_PREVENT_MACRO_SUBSTITUTION(float) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_riemann_zetal BOOST_PREVENT_MACRO_SUBSTITUTION(long double) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_riemann_zetaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_riemann_zetal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.21] spherical Bessel functions (of the first kind):
-double BOOST_MATH_TR1_DECL boost_sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_sph_besself BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_sph_bessell BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_sph_besself BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_sph_bessell BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.22] spherical associated Legendre functions:
-double BOOST_MATH_TR1_DECL boost_sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double theta) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_sph_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float theta) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_sph_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double theta) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double theta) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_sph_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float theta) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_sph_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double theta) BOOST_MATH_C99_THROW_SPEC;
 
 // [5.2.1.23] spherical Neumann functions BOOST_MATH_C99_THROW_SPEC;
 // spherical Bessel functions (of the second kind):
-double BOOST_MATH_TR1_DECL boost_sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
-float BOOST_MATH_TR1_DECL boost_sph_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
-long double BOOST_MATH_TR1_DECL boost_sph_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
+double BOOST_MATH_TR1_DECL boost_sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC;
+float BOOST_MATH_TR1_DECL boost_sph_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC;
+long double BOOST_MATH_TR1_DECL boost_sph_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC;
 
 #ifdef __cplusplus
 
@@ -394,348 +394,348 @@ namespace boost{ namespace math{ namespace tr1{
 // C interfaces:
 //
 // C99 Functions:
-inline double acosh BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_acosh BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float acoshf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_acoshf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double acoshl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_acoshl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float acosh BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::acoshf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double acosh BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::acoshl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float acoshf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_acoshf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double acoshl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_acoshl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::acoshf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::acoshl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type acosh BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::acosh BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
-
-inline double asinh BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_asinh BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float asinhf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_asinhf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double asinhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_asinhl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float asinh BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::asinhf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double asinh BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::asinhl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline typename tools::promote_args<T>::type acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+
+inline double asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float asinhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_asinhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double asinhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_asinhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::asinhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::asinhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type asinh BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::asinh BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
-
-inline double atanh BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_atanh BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float atanhf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_atanhf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double atanhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_atanhl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float atanh BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::atanhf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double atanh BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+inline typename tools::promote_args<T>::type asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+
+inline double atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float atanhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_atanhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double atanhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_atanhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::atanhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 { return boost::math::tr1::atanhl(x); }
 template <class T>
-inline typename tools::promote_args<T>::type atanh BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::atanh BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
-
-inline double cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float cbrtf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_cbrtf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double cbrtl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_cbrtl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::cbrtf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::cbrtl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline typename tools::promote_args<T>::type atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+
+inline double cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float cbrtf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_cbrtf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double cbrtl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_cbrtl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::cbrtf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::cbrtl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
-
-inline double copysign BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_copysign BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float copysignf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_copysignf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double copysignl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_copysignl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float copysign BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::copysignf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double copysign BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::copysignl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline typename tools::promote_args<T>::type cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+
+inline double copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float copysignf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_copysignf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double copysignl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_copysignl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::copysignf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::copysignl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type copysign BOOST_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
-{ return boost::math::tr1::copysign BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
-
-inline double erf BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_erf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float erff BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_erff BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double erfl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_erfl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float erf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::erff BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double erf BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::erfl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline typename tools::promote_args<T1, T2>::type copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
+{ return boost::math::tr1::copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
+
+inline double erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float erff BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_erff BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double erfl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_erfl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::erff BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::erfl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type erf BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::erf BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
-
-inline double erfc BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_erfc BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float erfcf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_erfcf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double erfcl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_erfcl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float erfc BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::erfcf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double erfc BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::erfcl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline typename tools::promote_args<T>::type erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+
+inline double erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float erfcf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_erfcf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double erfcl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_erfcl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::erfcf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::erfcl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type erfc BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::erfc BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 
 #if 0
-double exp2 BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-float exp2f BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long double exp2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
+double exp2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+float exp2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long double exp2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
 #endif
 
-inline float expm1f BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_expm1f BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double expm1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_expm1l BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::expm1f BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::expm1l BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float expm1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_expm1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double expm1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_expm1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::expm1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::expm1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 
 #if 0
-double fdim BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y);
-float fdimf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y);
-long double fdiml BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y);
-double fma BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y, double z);
-float fmaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y, float z);
-long double fmal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, long double z);
+double fdim BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y);
+float fdimf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y);
+long double fdiml BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y);
+double fma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y, double z);
+float fmaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y, float z);
+long double fmal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, long double z);
 #endif
-inline double fmax BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_fmax BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float fmaxf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_fmaxf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double fmaxl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_fmaxl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float fmax BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::fmaxf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double fmax BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::fmaxl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline double fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float fmaxf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_fmaxf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double fmaxl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_fmaxl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::fmaxf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::fmaxl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type fmax BOOST_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
-{ return boost::math::tr1::fmax BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
-
-inline double fmin BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_fmin BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float fminf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_fminf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double fminl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_fminl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float fmin BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::fminf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double fmin BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::fminl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline typename tools::promote_args<T1, T2>::type fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
+{ return boost::math::tr1::fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
+
+inline double fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float fminf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_fminf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double fminl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_fminl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::fminf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::fminl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type fmin BOOST_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
-{ return boost::math::tr1::fmin BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
-
-inline float hypotf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_hypotf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline double hypot BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_hypot BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float hypot BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::hypotf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double hypot BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline typename tools::promote_args<T1, T2>::type fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
+{ return boost::math::tr1::fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
+
+inline float hypotf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_hypotf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline double hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double hypotl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_hypotl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::hypotf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::hypotl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type hypot BOOST_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
-{ return boost::math::tr1::hypot BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
+inline typename tools::promote_args<T1, T2>::type hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
+{ return boost::math::tr1::hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
 
 #if 0
-int ilogb BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-int ilogbf BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-int ilogbl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
+int ilogb BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+int ilogbf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+int ilogbl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
 #endif
 
-inline float lgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_lgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double lgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_lgammal BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::lgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::lgammal BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float lgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_lgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double lgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_lgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::lgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::lgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 
 #ifdef BOOST_HAS_LONG_LONG
 #if 0
-long long llrint BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-long long llrintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long long llrintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
+long long llrint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+long long llrintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long long llrintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
 #endif
 
-inline long long llroundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_llroundf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long long llround BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_llround BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long long llroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_llroundl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long long llround BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::llroundf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long long llround BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::llroundl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long long llroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_llroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long long llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long long llroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_llroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long long llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::llroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long long llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::llroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline long long llround BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return llround BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<double>(x)); }
+inline long long llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<double>(x)); }
 #endif
 
-inline float log1pf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_log1pf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double log1p BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_log1p BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double log1pl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_log1pl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float log1p BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::log1pf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double log1p BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::log1pl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float log1pf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_log1pf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double log1pl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_log1pl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::log1pf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::log1pl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type log1p BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::log1p BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 #if 0
-double log2 BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-float log2f BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long double log2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
-
-double logb BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-float logbf BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long double logbl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
-long lrint BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-long lrintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long lrintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
+double log2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+float log2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long double log2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
+
+double logb BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+float logbf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long double logbl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
+long lrint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+long lrintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long lrintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
 #endif
-inline long lroundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_lroundf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long lround BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_lround BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long lroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_lroundl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long lround BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::lroundf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long lround BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::lroundl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long lroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_lroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long lroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_lroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::lroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::lroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-long lround BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::lround BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<double>(x)); }
+long lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<double>(x)); }
 #if 0
-double nan BOOST_PREVENT_MACRO_SUBSTITUTION(const char *str);
-float nanf BOOST_PREVENT_MACRO_SUBSTITUTION(const char *str);
-long double nanl BOOST_PREVENT_MACRO_SUBSTITUTION(const char *str);
-double nearbyint BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-float nearbyintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long double nearbyintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
+double nan BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(const char *str);
+float nanf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(const char *str);
+long double nanl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(const char *str);
+double nearbyint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+float nearbyintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long double nearbyintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
 #endif
-inline float nextafterf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_nextafterf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline double nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double nextafterl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_nextafterl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::nextafterf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::nextafterl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float nextafterf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_nextafterf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline double nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double nextafterl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_nextafterl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::nextafterf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::nextafterl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
-{ return boost::math::tr1::nextafter BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
-
-inline float nexttowardf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_nexttowardf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline double nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double nexttowardl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_nexttowardl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::nexttowardf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::nexttowardl BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline typename tools::promote_args<T1, T2>::type nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
+{ return boost::math::tr1::nextafter BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
+
+inline float nexttowardf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_nexttowardf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline double nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double nexttowardl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_nexttowardl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::nexttowardf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::nexttowardl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
-{ return static_cast<typename tools::promote_args<T1, T2>::type>(boost::math::tr1::nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<long double>(y))); }
+inline typename tools::promote_args<T1, T2>::type nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 x, T2 y)
+{ return static_cast<typename tools::promote_args<T1, T2>::type>(boost::math::tr1::nexttoward BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<long double>(y))); }
 #if 0
-double remainder BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y);
-float remainderf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y);
-long double remainderl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y);
-double remquo BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y, int *pquo);
-float remquof BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y, int *pquo);
-long double remquol BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, int *pquo);
-double rint BOOST_PREVENT_MACRO_SUBSTITUTION(double x);
-float rintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x);
-long double rintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x);
+double remainder BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y);
+float remainderf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y);
+long double remainderl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y);
+double remquo BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y, int *pquo);
+float remquof BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y, int *pquo);
+long double remquol BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y, int *pquo);
+double rint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x);
+float rintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x);
+long double rintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x);
 #endif
-inline float roundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_roundf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double round BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_round BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double roundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_roundl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float round BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::roundf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double round BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::roundl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float roundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_roundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double roundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_roundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::roundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::roundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type round BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::round BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::round BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 #if 0
-double scalbln BOOST_PREVENT_MACRO_SUBSTITUTION(double x, long ex);
-float scalblnf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, long ex);
-long double scalblnl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long ex);
-double scalbn BOOST_PREVENT_MACRO_SUBSTITUTION(double x, int ex);
-float scalbnf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, int ex);
-long double scalbnl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, int ex);
+double scalbln BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, long ex);
+float scalblnf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, long ex);
+long double scalblnl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long ex);
+double scalbn BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, int ex);
+float scalbnf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, int ex);
+long double scalbnl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, int ex);
 #endif
-inline float tgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_tgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double tgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_tgammal BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::tgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::tgammal BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float tgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_tgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double tgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_tgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::tgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::tgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::tgamma BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
-
-inline float truncf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_truncf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double trunc BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_trunc BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double truncl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_truncl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float trunc BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::truncf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double trunc BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::truncl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline typename tools::promote_args<T>::type tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::tgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+
+inline float truncf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_truncf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double truncl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_truncl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::truncf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::truncl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type trunc BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::trunc BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::trunc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 
 # define NO_MACRO_EXPAND /**/
 // C99 macros defined as C++ templates
@@ -778,64 +778,64 @@ template<> bool BOOST_MATH_TR1_DECL isnormal<long double> NO_MACRO_EXPAND(long d
 #undef NO_MACRO_EXPAND
 
 // [5.2.1.1] associated Laguerre polynomials:
-inline float assoc_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x)
-{ return boost::math::tr1::boost_assoc_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
-inline double assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, double x)
-{ return boost::math::tr1::boost_assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
-inline long double assoc_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x)
-{ return boost::math::tr1::boost_assoc_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
-inline float assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x)
-{ return boost::math::tr1::assoc_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
-inline long double assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x)
-{ return boost::math::tr1::assoc_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
+inline float assoc_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x)
+{ return boost::math::tr1::boost_assoc_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
+inline double assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, double x)
+{ return boost::math::tr1::boost_assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
+inline long double assoc_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x)
+{ return boost::math::tr1::boost_assoc_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
+inline float assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x)
+{ return boost::math::tr1::assoc_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
+inline long double assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x)
+{ return boost::math::tr1::assoc_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x); }
 template <class T>
-inline typename tools::promote_args<T>::type assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, T x)
-{ return boost::math::tr1::assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, T x)
+{ return boost::math::tr1::assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 // [5.2.1.2] associated Legendre functions:
-inline float assoc_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x)
-{ return boost::math::tr1::boost_assoc_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
-inline double assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double x)
-{ return boost::math::tr1::boost_assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
-inline long double assoc_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x)
-{ return boost::math::tr1::boost_assoc_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
-inline float assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x)
-{ return boost::math::tr1::assoc_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
-inline long double assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x)
-{ return boost::math::tr1::assoc_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
+inline float assoc_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x)
+{ return boost::math::tr1::boost_assoc_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
+inline double assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double x)
+{ return boost::math::tr1::boost_assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
+inline long double assoc_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x)
+{ return boost::math::tr1::boost_assoc_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
+inline float assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x)
+{ return boost::math::tr1::assoc_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
+inline long double assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x)
+{ return boost::math::tr1::assoc_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x); }
 template <class T>
-inline typename tools::promote_args<T>::type assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, T x)
-{ return boost::math::tr1::assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, T x)
+{ return boost::math::tr1::assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 // [5.2.1.3] beta function:
-inline float betaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::boost_betaf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline double beta BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y)
-{ return boost::math::tr1::boost_beta BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double betal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::boost_betal BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline float beta BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y)
-{ return boost::math::tr1::betaf BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
-inline long double beta BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
-{ return boost::math::tr1::betal BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float betaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::boost_betaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline double beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y)
+{ return boost::math::tr1::boost_beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double betal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::boost_betal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline float beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y)
+{ return boost::math::tr1::betaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
+inline long double beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
+{ return boost::math::tr1::betal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type beta BOOST_PREVENT_MACRO_SUBSTITUTION(T2 x, T1 y)
-{ return boost::math::tr1::beta BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
+inline typename tools::promote_args<T1, T2>::type beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T2 x, T1 y)
+{ return boost::math::tr1::beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(x), static_cast<typename tools::promote_args<T1, T2>::type>(y)); }
 
 // [5.2.1.4] (complete) elliptic integral of the first kind:
-inline float comp_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(float k)
-{ return boost::math::tr1::boost_comp_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(k); }
-inline double comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(double k)
-{ return boost::math::tr1::boost_comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(k); }
-inline long double comp_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k)
-{ return boost::math::tr1::boost_comp_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(k); }
-inline float comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(float k)
-{ return boost::math::tr1::comp_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(k); }
-inline long double comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(long double k)
-{ return boost::math::tr1::comp_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(k); }
+inline float comp_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k)
+{ return boost::math::tr1::boost_comp_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k); }
+inline double comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k)
+{ return boost::math::tr1::boost_comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k); }
+inline long double comp_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k)
+{ return boost::math::tr1::boost_comp_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k); }
+inline float comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k)
+{ return boost::math::tr1::comp_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k); }
+inline long double comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k)
+{ return boost::math::tr1::comp_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k); }
 template <class T>
-inline typename tools::promote_args<T>::type comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(T k)
-{ return boost::math::tr1::comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(k)); }
+inline typename tools::promote_args<T>::type comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T k)
+{ return boost::math::tr1::comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(k)); }
 
 // [5.2.1.5]  (complete) elliptic integral of the second kind:
 inline float comp_ellint_2f(float k)
@@ -850,7 +850,7 @@ inline long double comp_ellint_2(long double k)
 { return boost::math::tr1::comp_ellint_2l(k); }
 template <class T>
 inline typename tools::promote_args<T>::type comp_ellint_2(T k)
-{ return boost::math::tr1::comp_ellint_2(static_cast<typename tools::promote_args<T>::type> BOOST_PREVENT_MACRO_SUBSTITUTION(k)); }
+{ return boost::math::tr1::comp_ellint_2(static_cast<typename tools::promote_args<T>::type> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k)); }
 
 // [5.2.1.6]  (complete) elliptic integral of the third kind:
 inline float comp_ellint_3f(float k, float nu)
@@ -865,249 +865,249 @@ inline long double comp_ellint_3(long double k, long double nu)
 { return boost::math::tr1::comp_ellint_3l(k, nu); }
 template <class T1, class T2>
 inline typename tools::promote_args<T1, T2>::type comp_ellint_3(T1 k, T2 nu)
-{ return boost::math::tr1::comp_ellint_3(static_cast<typename tools::promote_args<T1, T2>::type> BOOST_PREVENT_MACRO_SUBSTITUTION(k), static_cast<typename tools::promote_args<T1, T2>::type> BOOST_PREVENT_MACRO_SUBSTITUTION(nu)); }
+{ return boost::math::tr1::comp_ellint_3(static_cast<typename tools::promote_args<T1, T2>::type> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k), static_cast<typename tools::promote_args<T1, T2>::type> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu)); }
 
 #if 0
 // [5.2.1.7] confluent hypergeometric functions:
-double conf_hyperg BOOST_PREVENT_MACRO_SUBSTITUTION(double a, double c, double x);
-float conf_hypergf BOOST_PREVENT_MACRO_SUBSTITUTION(float a, float c, float x);
-long double conf_hypergl BOOST_PREVENT_MACRO_SUBSTITUTION(long double a, long double c, long double x);
+double conf_hyperg BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double a, double c, double x);
+float conf_hypergf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float a, float c, float x);
+long double conf_hypergl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double a, long double c, long double x);
 #endif
 
 // [5.2.1.8] regular modified cylindrical Bessel functions:
-inline float cyl_bessel_if BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::boost_cyl_bessel_if BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline double cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
-{ return boost::math::tr1::boost_cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_bessel_il BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::boost_cyl_bessel_il BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline float cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::cyl_bessel_if BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::cyl_bessel_il BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_bessel_if BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::boost_cyl_bessel_if BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline double cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
+{ return boost::math::tr1::boost_cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_bessel_il BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::boost_cyl_bessel_il BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::cyl_bessel_if BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::cyl_bessel_il BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
-{ return boost::math::tr1::cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
+inline typename tools::promote_args<T1, T2>::type cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
+{ return boost::math::tr1::cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
 
 // [5.2.1.9] cylindrical Bessel functions (of the first kind):
-inline float cyl_bessel_jf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::boost_cyl_bessel_jf BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline double cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
-{ return boost::math::tr1::boost_cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_bessel_jl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::boost_cyl_bessel_jl BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline float cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::cyl_bessel_jf BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::cyl_bessel_jl BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_bessel_jf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::boost_cyl_bessel_jf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline double cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
+{ return boost::math::tr1::boost_cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_bessel_jl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::boost_cyl_bessel_jl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::cyl_bessel_jf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::cyl_bessel_jl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
-{ return boost::math::tr1::cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
+inline typename tools::promote_args<T1, T2>::type cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
+{ return boost::math::tr1::cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
 
 // [5.2.1.10] irregular modified cylindrical Bessel functions:
-inline float cyl_bessel_kf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::boost_cyl_bessel_kf BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline double cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
-{ return boost::math::tr1::boost_cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_bessel_kl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::boost_cyl_bessel_kl BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline float cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::cyl_bessel_kf BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::cyl_bessel_kl BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_bessel_kf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::boost_cyl_bessel_kf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline double cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
+{ return boost::math::tr1::boost_cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_bessel_kl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::boost_cyl_bessel_kl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::cyl_bessel_kf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::cyl_bessel_kl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
-{ return boost::math::tr1::cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type> BOOST_PREVENT_MACRO_SUBSTITUTION(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
+inline typename tools::promote_args<T1, T2>::type cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
+{ return boost::math::tr1::cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
 
 // [5.2.1.11] cylindrical Neumann functions;
 // cylindrical Bessel functions (of the second kind):
-inline float cyl_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::boost_cyl_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline double cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
-{ return boost::math::tr1::boost_cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::boost_cyl_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline float cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
-{ return boost::math::tr1::cyl_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
-inline long double cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
-{ return boost::math::tr1::cyl_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::boost_cyl_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline double cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x)
+{ return boost::math::tr1::boost_cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::boost_cyl_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline float cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x)
+{ return boost::math::tr1::cyl_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
+inline long double cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x)
+{ return boost::math::tr1::cyl_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
-{ return boost::math::tr1::cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
+inline typename tools::promote_args<T1, T2>::type cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 nu, T2 x)
+{ return boost::math::tr1::cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(nu), static_cast<typename tools::promote_args<T1, T2>::type>(x)); }
 
 // [5.2.1.12] (incomplete) elliptic integral of the first kind:
-inline float ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
-{ return boost::math::tr1::boost_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline double ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double phi)
-{ return boost::math::tr1::boost_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline long double ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
-{ return boost::math::tr1::boost_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline float ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
-{ return boost::math::tr1::ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline long double ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
-{ return boost::math::tr1::ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline float ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
+{ return boost::math::tr1::boost_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline double ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double phi)
+{ return boost::math::tr1::boost_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline long double ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
+{ return boost::math::tr1::boost_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline float ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
+{ return boost::math::tr1::ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline long double ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
+{ return boost::math::tr1::ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(T1 k, T2 phi)
-{ return boost::math::tr1::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(k), static_cast<typename tools::promote_args<T1, T2>::type>(phi)); }
+inline typename tools::promote_args<T1, T2>::type ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 k, T2 phi)
+{ return boost::math::tr1::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(k), static_cast<typename tools::promote_args<T1, T2>::type>(phi)); }
 
 // [5.2.1.13] (incomplete) elliptic integral of the second kind:
-inline float ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
-{ return boost::math::tr1::boost_ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline double ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double phi)
-{ return boost::math::tr1::boost_ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline long double ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
-{ return boost::math::tr1::boost_ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline float ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
-{ return boost::math::tr1::ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
-inline long double ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
-{ return boost::math::tr1::ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline float ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
+{ return boost::math::tr1::boost_ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline double ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double phi)
+{ return boost::math::tr1::boost_ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline long double ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
+{ return boost::math::tr1::boost_ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline float ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi)
+{ return boost::math::tr1::ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
+inline long double ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi)
+{ return boost::math::tr1::ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi); }
 template <class T1, class T2>
-inline typename tools::promote_args<T1, T2>::type ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(T1 k, T2 phi)
-{ return boost::math::tr1::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(k), static_cast<typename tools::promote_args<T1, T2>::type>(phi)); }
+inline typename tools::promote_args<T1, T2>::type ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 k, T2 phi)
+{ return boost::math::tr1::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2>::type>(k), static_cast<typename tools::promote_args<T1, T2>::type>(phi)); }
 
 // [5.2.1.14] (incomplete) elliptic integral of the third kind:
-inline float ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi)
-{ return boost::math::tr1::boost_ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
-inline double ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double nu, double phi)
-{ return boost::math::tr1::boost_ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
-inline long double ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi)
-{ return boost::math::tr1::boost_ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
-inline float ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi)
-{ return boost::math::tr1::ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
-inline long double ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi)
-{ return boost::math::tr1::ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
+inline float ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi)
+{ return boost::math::tr1::boost_ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
+inline double ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double nu, double phi)
+{ return boost::math::tr1::boost_ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
+inline long double ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi)
+{ return boost::math::tr1::boost_ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
+inline float ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi)
+{ return boost::math::tr1::ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
+inline long double ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi)
+{ return boost::math::tr1::ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi); }
 template <class T1, class T2, class T3>
-inline typename tools::promote_args<T1, T2, T3>::type ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(T1 k, T2 nu, T3 phi)
-{ return boost::math::tr1::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2, T3>::type>(k), static_cast<typename tools::promote_args<T1, T2, T3>::type>(nu), static_cast<typename tools::promote_args<T1, T2, T3>::type>(phi)); }
+inline typename tools::promote_args<T1, T2, T3>::type ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T1 k, T2 nu, T3 phi)
+{ return boost::math::tr1::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T1, T2, T3>::type>(k), static_cast<typename tools::promote_args<T1, T2, T3>::type>(nu), static_cast<typename tools::promote_args<T1, T2, T3>::type>(phi)); }
 
 // [5.2.1.15] exponential integral:
-inline float expintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::boost_expintf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline double expint BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
-{ return boost::math::tr1::boost_expint BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double expintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::boost_expintl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline float expint BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
-{ return boost::math::tr1::expintf BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
-inline long double expint BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
-{ return boost::math::tr1::expintl BOOST_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float expintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::boost_expintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline double expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
+{ return boost::math::tr1::boost_expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double expintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::boost_expintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline float expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
+{ return boost::math::tr1::expintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
+inline long double expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
+{ return boost::math::tr1::expintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x); }
 template <class T>
-inline typename tools::promote_args<T>::type expint BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
-{ return boost::math::tr1::expint BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x)
+{ return boost::math::tr1::expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(x)); }
 
 // [5.2.1.16] Hermite polynomials:
-inline float hermitef BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::boost_hermitef BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline double hermite BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
-{ return boost::math::tr1::boost_hermite BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double hermitel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::boost_hermitel BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline float hermite BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::hermitef BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double hermite BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::hermitel BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float hermitef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::boost_hermitef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline double hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
+{ return boost::math::tr1::boost_hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double hermitel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::boost_hermitel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::hermitef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::hermitel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
 template <class T>
-inline typename tools::promote_args<T>::type hermite BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
-{ return boost::math::tr1::hermite BOOST_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
+{ return boost::math::tr1::hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 #if 0
 // [5.2.1.17] hypergeometric functions:
-double hyperg BOOST_PREVENT_MACRO_SUBSTITUTION(double a, double b, double c, double x);
-float hypergf BOOST_PREVENT_MACRO_SUBSTITUTION(float a, float b, float c, float x);
-long double hypergl BOOST_PREVENT_MACRO_SUBSTITUTION(long double a, long double b, long double c,
+double hyperg BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double a, double b, double c, double x);
+float hypergf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float a, float b, float c, float x);
+long double hypergl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double a, long double b, long double c,
 long double x);
 #endif
 
 // [5.2.1.18] Laguerre polynomials:
-inline float laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::boost_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline double laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
-{ return boost::math::tr1::boost_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::boost_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline float laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::boost_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline double laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
+{ return boost::math::tr1::boost_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::boost_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
 template <class T>
-inline typename tools::promote_args<T>::type laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
-{ return boost::math::tr1::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
+{ return boost::math::tr1::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 // [5.2.1.19] Legendre polynomials:
-inline float legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, float x)
-{ return boost::math::tr1::boost_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(l, x); }
-inline double legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, double x)
-{ return boost::math::tr1::boost_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(l, x); }
-inline long double legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, long double x)
-{ return boost::math::tr1::boost_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(l, x); }
-inline float legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, float x)
-{ return boost::math::tr1::legendref BOOST_PREVENT_MACRO_SUBSTITUTION(l, x); }
-inline long double legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, long double x)
-{ return boost::math::tr1::legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(l, x); }
+inline float legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, float x)
+{ return boost::math::tr1::boost_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, x); }
+inline double legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, double x)
+{ return boost::math::tr1::boost_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, x); }
+inline long double legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, long double x)
+{ return boost::math::tr1::boost_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, x); }
+inline float legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, float x)
+{ return boost::math::tr1::legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, x); }
+inline long double legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, long double x)
+{ return boost::math::tr1::legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, x); }
 template <class T>
-inline typename tools::promote_args<T>::type legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, T x)
-{ return boost::math::tr1::legendre BOOST_PREVENT_MACRO_SUBSTITUTION(l, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, T x)
+{ return boost::math::tr1::legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 // [5.2.1.20] Riemann zeta function:
-inline float riemann_zetaf BOOST_PREVENT_MACRO_SUBSTITUTION(float z)
-{ return boost::math::tr1::boost_riemann_zetaf BOOST_PREVENT_MACRO_SUBSTITUTION(z); }
-inline double riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(double z)
-{ return boost::math::tr1::boost_riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(z); }
-inline long double riemann_zetal BOOST_PREVENT_MACRO_SUBSTITUTION(long double z)
-{ return boost::math::tr1::boost_riemann_zetal BOOST_PREVENT_MACRO_SUBSTITUTION(z); }
-inline float riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(float z)
-{ return boost::math::tr1::riemann_zetaf BOOST_PREVENT_MACRO_SUBSTITUTION(z); }
-inline long double riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(long double z)
-{ return boost::math::tr1::riemann_zetal BOOST_PREVENT_MACRO_SUBSTITUTION(z); }
+inline float riemann_zetaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float z)
+{ return boost::math::tr1::boost_riemann_zetaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(z); }
+inline double riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double z)
+{ return boost::math::tr1::boost_riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(z); }
+inline long double riemann_zetal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double z)
+{ return boost::math::tr1::boost_riemann_zetal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(z); }
+inline float riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float z)
+{ return boost::math::tr1::riemann_zetaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(z); }
+inline long double riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double z)
+{ return boost::math::tr1::riemann_zetal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(z); }
 template <class T>
-inline typename tools::promote_args<T>::type riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(T z)
-{ return boost::math::tr1::riemann_zeta BOOST_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(z)); }
+inline typename tools::promote_args<T>::type riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T z)
+{ return boost::math::tr1::riemann_zeta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(static_cast<typename tools::promote_args<T>::type>(z)); }
 
 // [5.2.1.21] spherical Bessel functions (of the first kind):
-inline float sph_besself BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::boost_sph_besself BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline double sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
-{ return boost::math::tr1::boost_sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double sph_bessell BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::boost_sph_bessell BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline float sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::sph_besself BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::sph_bessell BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float sph_besself BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::boost_sph_besself BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline double sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
+{ return boost::math::tr1::boost_sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double sph_bessell BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::boost_sph_bessell BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::sph_besself BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::sph_bessell BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
 template <class T>
-inline typename tools::promote_args<T>::type sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
-{ return boost::math::tr1::sph_bessel BOOST_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
+{ return boost::math::tr1::sph_bessel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 // [5.2.1.22] spherical associated Legendre functions:
-inline float sph_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float theta)
-{ return boost::math::tr1::boost_sph_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
-inline double sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double theta)
-{ return boost::math::tr1::boost_sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
-inline long double sph_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double theta)
-{ return boost::math::tr1::boost_sph_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
-inline float sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float theta)
-{ return boost::math::tr1::sph_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
-inline long double sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double theta)
-{ return boost::math::tr1::sph_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
+inline float sph_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float theta)
+{ return boost::math::tr1::boost_sph_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
+inline double sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double theta)
+{ return boost::math::tr1::boost_sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
+inline long double sph_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double theta)
+{ return boost::math::tr1::boost_sph_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
+inline float sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float theta)
+{ return boost::math::tr1::sph_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
+inline long double sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double theta)
+{ return boost::math::tr1::sph_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, theta); }
 template <class T>
-inline typename tools::promote_args<T>::type sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, T theta)
-{ return boost::math::tr1::sph_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, static_cast<typename tools::promote_args<T>::type>(theta)); }
+inline typename tools::promote_args<T>::type sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, T theta)
+{ return boost::math::tr1::sph_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, static_cast<typename tools::promote_args<T>::type>(theta)); }
 
 // [5.2.1.23] spherical Neumann functions;
 // spherical Bessel functions (of the second kind):
-inline float sph_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::boost_sph_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline double sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
-{ return boost::math::tr1::boost_sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double sph_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::boost_sph_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline float sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
-{ return boost::math::tr1::sph_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
-inline long double sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
-{ return boost::math::tr1::sph_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float sph_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::boost_sph_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline double sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x)
+{ return boost::math::tr1::boost_sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double sph_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::boost_sph_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline float sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x)
+{ return boost::math::tr1::sph_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
+inline long double sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x)
+{ return boost::math::tr1::sph_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x); }
 template <class T>
-inline typename tools::promote_args<T>::type sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
-{ return boost::math::tr1::sph_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
+inline typename tools::promote_args<T>::type sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, T x)
+{ return boost::math::tr1::sph_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, static_cast<typename tools::promote_args<T>::type>(x)); }
 
 }}} // namespaces
 
diff --git a/inst/include/boost/move/adl_move_swap.hpp b/inst/include/boost/move/adl_move_swap.hpp
index d9096e36c..3648ea47f 100644
--- a/inst/include/boost/move/adl_move_swap.hpp
+++ b/inst/include/boost/move/adl_move_swap.hpp
@@ -40,6 +40,8 @@
       //In GCC 4.4 stl_move.h was renamed to move.h
       #include <bits/move.h>
    #endif
+#elif defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 13000)
+   #include <__utility/swap.h>  //libc++ refactored <utility> headers in smaller headers
 #elif defined(_LIBCPP_VERSION)
    #include <type_traits>  //The initial import of libc++ defines std::swap and still there
 #elif __cplusplus >= 201103L
@@ -155,7 +157,7 @@ struct and_op_not
 {};
 
 template<class T>
-BOOST_MOVE_FORCEINLINE void swap_proxy(T& x, T& y, typename boost::move_detail::enable_if_c<!boost::move_detail::has_move_emulation_enabled_impl<T>::value>::type* = 0)
+inline void swap_proxy(T& x, T& y, typename boost::move_detail::enable_if_c<!boost::move_detail::has_move_emulation_enabled_impl<T>::value>::type* = 0)
 {
    //use std::swap if argument dependent lookup fails
    //Use using directive ("using namespace xxx;") instead as some older compilers
@@ -165,14 +167,14 @@ BOOST_MOVE_FORCEINLINE void swap_proxy(T& x, T& y, typename boost::move_detail::
 }
 
 template<class T>
-BOOST_MOVE_FORCEINLINE void swap_proxy(T& x, T& y
+void swap_proxy(T& x, T& y
                , typename boost::move_detail::enable_if< and_op_not_impl<boost::move_detail::has_move_emulation_enabled_impl<T>
                                                                         , boost_move_member_swap::has_member_swap<T> >
                                                        >::type* = 0)
 {  T t(::boost::move(x)); x = ::boost::move(y); y = ::boost::move(t);  }
 
 template<class T>
-BOOST_MOVE_FORCEINLINE void swap_proxy(T& x, T& y
+inline void swap_proxy(T& x, T& y
                , typename boost::move_detail::enable_if< and_op_impl< boost::move_detail::has_move_emulation_enabled_impl<T>
                                                                     , boost_move_member_swap::has_member_swap<T> >
                                                        >::type* = 0)
@@ -185,7 +187,7 @@ BOOST_MOVE_FORCEINLINE void swap_proxy(T& x, T& y
 namespace boost_move_adl_swap{
 
 template<class T>
-BOOST_MOVE_FORCEINLINE void swap_proxy(T& x, T& y)
+inline void swap_proxy(T& x, T& y)
 {
    using std::swap;
    swap(x, y);
@@ -222,7 +224,7 @@ namespace boost{
 //!   -  Otherwise a move-based swap is called, equivalent to: 
 //!      <code>T t(::boost::move(x)); x = ::boost::move(y); y = ::boost::move(t);</code>.
 template<class T>
-BOOST_MOVE_FORCEINLINE void adl_move_swap(T& x, T& y)
+inline void adl_move_swap(T& x, T& y)
 {
    ::boost_move_adl_swap::swap_proxy(x, y);
 }
diff --git a/inst/include/boost/move/algo/adaptive_merge.hpp b/inst/include/boost/move/algo/adaptive_merge.hpp
index 58430bfd9..3631adef3 100644
--- a/inst/include/boost/move/algo/adaptive_merge.hpp
+++ b/inst/include/boost/move/algo/adaptive_merge.hpp
@@ -19,6 +19,7 @@
 #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
 #pragma GCC diagnostic push
 //#pragma GCC diagnostic ignored "-Wsign-conversion"
+//#pragma GCC diagnostic ignored "-Wconversion"
 #endif
 
 namespace boost {
diff --git a/inst/include/boost/move/algo/adaptive_sort.hpp b/inst/include/boost/move/algo/adaptive_sort.hpp
index 91cdd7c9e..8e313ae2e 100644
--- a/inst/include/boost/move/algo/adaptive_sort.hpp
+++ b/inst/include/boost/move/algo/adaptive_sort.hpp
@@ -20,6 +20,7 @@
 #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
 #pragma GCC diagnostic push
 //#pragma GCC diagnostic ignored "-Wsign-conversion"
+//#pragma GCC diagnostic ignored "-Wconversion"
 #endif
 
 namespace boost {
diff --git a/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp b/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp
index 0fb2d10fd..b9b1fde33 100644
--- a/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp
+++ b/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp
@@ -60,6 +60,7 @@
 #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
 #pragma GCC diagnostic push
 //#pragma GCC diagnostic ignored "-Wsign-conversion"
+//#pragma GCC diagnostic ignored "-Wconversion"
 #endif
 
 #ifndef BOOST_MOVE_ADAPTIVE_SORT_STATS_LEVEL
@@ -93,26 +94,12 @@
    #define BOOST_MOVE_ADAPTIVE_SORT_INVARIANT(L)
 #endif
 
-namespace boost {
-namespace movelib {
-
 #if defined(BOOST_MOVE_ADAPTIVE_SORT_INVARIANTS)
+#include <boost/move/algo/detail/is_sorted.hpp>
+#endif
 
-bool is_sorted(::order_perf_type *first, ::order_perf_type *last, ::order_type_less)
-{
-   if (first != last) {
-      const order_perf_type *next = first, *cur(first);
-      while (++next != last) {
-         if (!(cur->key < next->key || (cur->key == next->key && cur->val < next->val)))
-            return false;
-         cur = next;
-      }
-   }
-   return true;
-}
-
-#endif   //BOOST_MOVE_ADAPTIVE_SORT_INVARIANTS
-
+namespace boost {
+namespace movelib {
 namespace detail_adaptive {
 
 static const std::size_t AdaptiveSortInsertionSortThreshold = 16;
@@ -1320,7 +1307,6 @@ void op_merge_blocks_with_buf
          //swap_and_update_key(key_next, key_range2, key_mid, first2, last2, first_min);
          buffer_end = buffer_and_update_key(key_next, key_range2, key_mid, first2, last2, first_min, buffer = buf_first, op);
          BOOST_MOVE_ADAPTIVE_SORT_PRINT_L2("   merge_blocks_w_swp: ", len);
-         BOOST_MOVE_ADAPTIVE_SORT_INVARIANT(boost::movelib::is_sorted(first2, last2, comp));
          BOOST_MOVE_ADAPTIVE_SORT_INVARIANT(boost::movelib::is_sorted(first_min, last_min, comp));
          first1 = first2;
          BOOST_MOVE_ADAPTIVE_SORT_INVARIANT(boost::movelib::is_sorted(first, first1, comp));
diff --git a/inst/include/boost/move/algo/detail/basic_op.hpp b/inst/include/boost/move/algo/detail/basic_op.hpp
index 144280b3f..43ae68d17 100644
--- a/inst/include/boost/move/algo/detail/basic_op.hpp
+++ b/inst/include/boost/move/algo/detail/basic_op.hpp
@@ -36,19 +36,19 @@ struct four_way_t{};
 struct move_op
 {
    template <class SourceIt, class DestinationIt>
-   BOOST_MOVE_FORCEINLINE void operator()(SourceIt source, DestinationIt dest)
+   inline void operator()(SourceIt source, DestinationIt dest)
    {  *dest = ::boost::move(*source);  }
 
    template <class SourceIt, class DestinationIt>
-   BOOST_MOVE_FORCEINLINE DestinationIt operator()(forward_t, SourceIt first, SourceIt last, DestinationIt dest_begin)
+   inline DestinationIt operator()(forward_t, SourceIt first, SourceIt last, DestinationIt dest_begin)
    {  return ::boost::move(first, last, dest_begin);  }
 
    template <class SourceIt, class DestinationIt>
-   BOOST_MOVE_FORCEINLINE DestinationIt operator()(backward_t, SourceIt first, SourceIt last, DestinationIt dest_last)
+   inline DestinationIt operator()(backward_t, SourceIt first, SourceIt last, DestinationIt dest_last)
    {  return ::boost::move_backward(first, last, dest_last);  }
 
    template <class SourceIt, class DestinationIt1, class DestinationIt2>
-   BOOST_MOVE_FORCEINLINE void operator()(three_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it)
+   inline void operator()(three_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it)
    {
       *dest2it = boost::move(*dest1it);
       *dest1it = boost::move(*srcit);
@@ -65,7 +65,7 @@ struct move_op
    }
 
    template <class SourceIt, class DestinationIt1, class DestinationIt2, class DestinationIt3>
-   BOOST_MOVE_FORCEINLINE void operator()(four_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it, DestinationIt3 dest3it)
+   inline void operator()(four_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it, DestinationIt3 dest3it)
    {
       *dest3it = boost::move(*dest2it);
       *dest2it = boost::move(*dest1it);
@@ -76,19 +76,19 @@ struct move_op
 struct swap_op
 {
    template <class SourceIt, class DestinationIt>
-   BOOST_MOVE_FORCEINLINE void operator()(SourceIt source, DestinationIt dest)
+   inline void operator()(SourceIt source, DestinationIt dest)
    {  boost::adl_move_swap(*dest, *source);  }
 
    template <class SourceIt, class DestinationIt>
-   BOOST_MOVE_FORCEINLINE DestinationIt operator()(forward_t, SourceIt first, SourceIt last, DestinationIt dest_begin)
+   inline DestinationIt operator()(forward_t, SourceIt first, SourceIt last, DestinationIt dest_begin)
    {  return boost::adl_move_swap_ranges(first, last, dest_begin);  }
 
    template <class SourceIt, class DestinationIt>
-   BOOST_MOVE_FORCEINLINE DestinationIt operator()(backward_t, SourceIt first, SourceIt last, DestinationIt dest_begin)
+   inline DestinationIt operator()(backward_t, SourceIt first, SourceIt last, DestinationIt dest_begin)
    {  return boost::adl_move_swap_ranges_backward(first, last, dest_begin);  }
 
    template <class SourceIt, class DestinationIt1, class DestinationIt2>
-   BOOST_MOVE_FORCEINLINE void operator()(three_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it)
+   inline void operator()(three_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it)
    {
       typename ::boost::movelib::iterator_traits<SourceIt>::value_type tmp(boost::move(*dest2it));
       *dest2it = boost::move(*dest1it);
@@ -106,7 +106,7 @@ struct swap_op
    }
 
    template <class SourceIt, class DestinationIt1, class DestinationIt2, class DestinationIt3>
-   BOOST_MOVE_FORCEINLINE void operator()(four_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it, DestinationIt3 dest3it)
+   inline void operator()(four_way_t, SourceIt srcit, DestinationIt1 dest1it, DestinationIt2 dest2it, DestinationIt3 dest3it)
    {
       typename ::boost::movelib::iterator_traits<SourceIt>::value_type tmp(boost::move(*dest3it));
       *dest3it = boost::move(*dest2it);
diff --git a/inst/include/boost/move/algo/detail/heap_sort.hpp b/inst/include/boost/move/algo/detail/heap_sort.hpp
index 6f42d4430..1158a2cbf 100644
--- a/inst/include/boost/move/algo/detail/heap_sort.hpp
+++ b/inst/include/boost/move/algo/detail/heap_sort.hpp
@@ -106,7 +106,7 @@ class heap_sort_helper
 };
 
 template <class RandomAccessIterator, class Compare>
-BOOST_MOVE_FORCEINLINE void heap_sort(RandomAccessIterator first, RandomAccessIterator last, Compare comp)
+inline void heap_sort(RandomAccessIterator first, RandomAccessIterator last, Compare comp)
 {
    heap_sort_helper<RandomAccessIterator, Compare>::sort(first, last, comp);
 }
diff --git a/inst/include/boost/move/algo/detail/merge.hpp b/inst/include/boost/move/algo/detail/merge.hpp
index eba2627fb..3617da8c7 100644
--- a/inst/include/boost/move/algo/detail/merge.hpp
+++ b/inst/include/boost/move/algo/detail/merge.hpp
@@ -43,11 +43,11 @@ class adaptive_xbuf
    typedef RandRawIt iterator;
    typedef SizeType  size_type;
 
-   BOOST_MOVE_FORCEINLINE adaptive_xbuf()
+   inline adaptive_xbuf()
       : m_ptr(), m_size(0), m_capacity(0)
    {}
 
-   BOOST_MOVE_FORCEINLINE adaptive_xbuf(RandRawIt raw_memory, size_type cap)
+   inline adaptive_xbuf(RandRawIt raw_memory, size_type cap)
       : m_ptr(raw_memory), m_size(0), m_capacity(cap)
    {}
 
@@ -102,7 +102,7 @@ class adaptive_xbuf
       }
    }
 
-   BOOST_MOVE_FORCEINLINE void set_size(size_type sz)
+   inline void set_size(size_type sz)
    {
       m_size = sz;
    }
@@ -144,12 +144,12 @@ class adaptive_xbuf
 
    private:
    template<class RIt>
-   BOOST_MOVE_FORCEINLINE static bool is_raw_ptr(RIt)
+   inline static bool is_raw_ptr(RIt)
    {
       return false;
    }
 
-   BOOST_MOVE_FORCEINLINE static bool is_raw_ptr(T*)
+   inline static bool is_raw_ptr(T*)
    {
       return true;
    }
@@ -168,43 +168,43 @@ class adaptive_xbuf
    }
 
    template<class U>
-   BOOST_MOVE_FORCEINLINE U *aligned_trailing() const
+   inline U *aligned_trailing() const
    {
       return this->aligned_trailing<U>(this->size());
    }
 
    template<class U>
-   BOOST_MOVE_FORCEINLINE U *aligned_trailing(size_type pos) const
+   inline U *aligned_trailing(size_type pos) const
    {
       uintptr_t u_addr = uintptr_t(&*(this->data()+pos));
       u_addr = ((u_addr + sizeof(U)-1)/sizeof(U))*sizeof(U);
       return (U*)u_addr;
    }
 
-   BOOST_MOVE_FORCEINLINE ~adaptive_xbuf()
+   inline ~adaptive_xbuf()
    {
       this->clear();
    }
 
-   BOOST_MOVE_FORCEINLINE size_type capacity() const
+   inline size_type capacity() const
    {  return m_capacity;   }
 
-   BOOST_MOVE_FORCEINLINE iterator data() const
+   inline iterator data() const
    {  return m_ptr;   }
 
-   BOOST_MOVE_FORCEINLINE iterator begin() const
+   inline iterator begin() const
    {  return m_ptr;   }
 
-   BOOST_MOVE_FORCEINLINE iterator end() const
+   inline iterator end() const
    {  return m_ptr+m_size;   }
 
-   BOOST_MOVE_FORCEINLINE size_type size() const
+   inline size_type size() const
    {  return m_size;   }
 
-   BOOST_MOVE_FORCEINLINE bool empty() const
+   inline bool empty() const
    {  return !m_size;   }
 
-   BOOST_MOVE_FORCEINLINE void clear()
+   inline void clear()
    {
       this->shrink_to_fit(0u);
    }
diff --git a/inst/include/boost/move/algo/predicate.hpp b/inst/include/boost/move/algo/predicate.hpp
index 58a4d620c..023066a12 100644
--- a/inst/include/boost/move/algo/predicate.hpp
+++ b/inst/include/boost/move/algo/predicate.hpp
@@ -24,19 +24,19 @@ namespace movelib {
 template<class Comp>
 struct antistable
 {
-   BOOST_MOVE_FORCEINLINE explicit antistable(Comp &comp)
+   inline explicit antistable(Comp &comp)
       : m_comp(comp)
    {}
 
-   BOOST_MOVE_FORCEINLINE antistable(const antistable & other)
+   inline antistable(const antistable & other)
       : m_comp(other.m_comp)
    {}
 
    template<class U, class V>
-   BOOST_MOVE_FORCEINLINE bool operator()(const U &u, const V & v)
+   inline bool operator()(const U &u, const V & v)
    {  return !m_comp(v, u);  }
 
-   BOOST_MOVE_FORCEINLINE const Comp &get() const
+   inline const Comp &get() const
    {  return m_comp; }
 
    private:
@@ -56,15 +56,15 @@ template <class Comp>
 class negate
 {
    public:
-   BOOST_MOVE_FORCEINLINE negate()
+   inline negate()
    {}
 
-   BOOST_MOVE_FORCEINLINE explicit negate(Comp comp)
+   inline explicit negate(Comp comp)
       : m_comp(comp)
    {}
 
    template <class T1, class T2>
-   BOOST_MOVE_FORCEINLINE bool operator()(const T1& l, const T2& r)
+   inline bool operator()(const T1& l, const T2& r)
    {
       return !m_comp(l, r);
    }
@@ -78,15 +78,15 @@ template <class Comp>
 class inverse
 {
    public:
-   BOOST_MOVE_FORCEINLINE inverse()
+   inline inverse()
    {}
 
-   BOOST_MOVE_FORCEINLINE explicit inverse(Comp comp)
+   inline explicit inverse(Comp comp)
       : m_comp(comp)
    {}
 
    template <class T1, class T2>
-   BOOST_MOVE_FORCEINLINE bool operator()(const T1& l, const T2& r)
+   inline bool operator()(const T1& l, const T2& r)
    {
       return m_comp(r, l);
    }
diff --git a/inst/include/boost/move/core.hpp b/inst/include/boost/move/core.hpp
index 7b604e678..e5e82ca84 100644
--- a/inst/include/boost/move/core.hpp
+++ b/inst/include/boost/move/core.hpp
@@ -447,7 +447,7 @@
 
    #else //!defined(BOOST_MOVE_MSVC_AUTO_MOVE_RETURN_BUG) || defined(BOOST_MOVE_DOXYGEN_INVOKED)
 
-      #include <boost/move/detail/meta_utils.hpp>
+      #include <boost/move/detail/meta_utils_core.hpp>
 
       namespace boost {
       namespace move_detail {
diff --git a/inst/include/boost/move/detail/config_begin.hpp b/inst/include/boost/move/detail/config_begin.hpp
index 4e95a4aba..ded005018 100644
--- a/inst/include/boost/move/detail/config_begin.hpp
+++ b/inst/include/boost/move/detail/config_begin.hpp
@@ -16,7 +16,6 @@
 #  pragma warning (disable : 4619) // there is no warning number 'XXXX'
 #  pragma warning (disable : 4324) // structure was padded due to __declspec(align())
 #  pragma warning (disable : 4675) // "function":  resolved overload was found by argument-dependent lookup
-#  pragma warning (disable : 4996) // "function": was declared deprecated (_CRT_SECURE_NO_DEPRECATE/_SCL_SECURE_NO_WARNINGS)
 #  pragma warning (disable : 4714) // "function": marked as __forceinline not inlined
 #  pragma warning (disable : 4127) // conditional expression is constant
 #endif
diff --git a/inst/include/boost/move/detail/iterator_to_raw_pointer.hpp b/inst/include/boost/move/detail/iterator_to_raw_pointer.hpp
index 67afd6c1e..97ee3a659 100644
--- a/inst/include/boost/move/detail/iterator_to_raw_pointer.hpp
+++ b/inst/include/boost/move/detail/iterator_to_raw_pointer.hpp
@@ -27,11 +27,11 @@ namespace movelib {
 namespace detail {
 
 template <class T>
-BOOST_MOVE_FORCEINLINE T* iterator_to_pointer(T* i)
+inline T* iterator_to_pointer(T* i)
 {  return i; }
 
 template <class Iterator>
-BOOST_MOVE_FORCEINLINE typename boost::movelib::iterator_traits<Iterator>::pointer
+inline typename boost::movelib::iterator_traits<Iterator>::pointer
    iterator_to_pointer(const Iterator &i)
 {  return i.operator->();  }
 
@@ -46,7 +46,7 @@ struct iterator_to_element_ptr
 }  //namespace detail {
 
 template <class Iterator>
-BOOST_MOVE_FORCEINLINE typename boost::movelib::detail::iterator_to_element_ptr<Iterator>::type
+inline typename boost::movelib::detail::iterator_to_element_ptr<Iterator>::type
    iterator_to_raw_pointer(const Iterator &i)
 {
    return ::boost::movelib::to_raw_pointer
diff --git a/inst/include/boost/move/detail/launder.hpp b/inst/include/boost/move/detail/launder.hpp
new file mode 100644
index 000000000..a6236de95
--- /dev/null
+++ b/inst/include/boost/move/detail/launder.hpp
@@ -0,0 +1,53 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright Ion Gaztanaga 2014-2015. Distributed under the Boost
+// Software License, Version 1.0. (See accompanying file
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/container for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+#ifndef BOOST_MOVE_DETAIL_LAUNDER_HPP
+#define BOOST_MOVE_DETAIL_LAUNDER_HPP
+
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
+
+#include <boost/move/detail/workaround.hpp>
+
+namespace boost {
+namespace move_detail {
+
+#if defined(BOOST_MOVE_HAS_BUILTIN_LAUNDER)
+
+template<class T>
+BOOST_MOVE_FORCEINLINE T* launder(T* p)
+{
+    return __builtin_launder( p );
+}
+
+#else
+
+template<class T>
+BOOST_MOVE_FORCEINLINE T* launder(T* p)
+{
+    return p;
+}
+
+#endif
+
+template<class T>
+BOOST_MOVE_FORCEINLINE T launder_cast(const volatile void* p)
+{
+   return (launder)((T)p);
+}
+
+}  //namespace move_detail {
+}  //namespace boost {
+
+#endif   //#ifndef BOOST_MOVE_DETAIL_LAUNDER_HPP
diff --git a/inst/include/boost/move/detail/meta_utils.hpp b/inst/include/boost/move/detail/meta_utils.hpp
index 7c90de287..6e12b178f 100644
--- a/inst/include/boost/move/detail/meta_utils.hpp
+++ b/inst/include/boost/move/detail/meta_utils.hpp
@@ -17,10 +17,9 @@
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
-#include <boost/move/detail/config_begin.hpp>
+
 #include <boost/move/detail/workaround.hpp>  //forceinline
 #include <boost/move/detail/meta_utils_core.hpp>
-#include <cstddef>   //for std::size_t
 #include <boost/move/detail/addressof.hpp>
 
 //Small meta-typetraits to support move
@@ -57,8 +56,8 @@ struct apply
 template< bool C_ >
 struct bool_ : integral_constant<bool, C_>
 {
-   BOOST_MOVE_FORCEINLINE operator bool() const { return C_; }
-   BOOST_MOVE_FORCEINLINE bool operator()() const { return C_; }
+   inline operator bool() const { return C_; }
+   inline bool operator()() const { return C_; }
 };
 
 typedef bool_<true>        true_;
@@ -201,22 +200,6 @@ struct add_const_lvalue_reference
       <t_unreferenced_const>::type                    type;
 };
 
-//////////////////////////////////////
-//             is_lvalue_reference
-//////////////////////////////////////
-template<class T>
-struct is_lvalue_reference
-{
-    static const bool value = false;
-};
-
-template<class T>
-struct is_lvalue_reference<T&>
-{
-    static const bool value = true;
-};
-
-
 //////////////////////////////////////
 //             identity
 //////////////////////////////////////
@@ -558,6 +541,4 @@ template< class T > struct remove_rvalue_reference { typedef T type; };
 }  //namespace move_detail {
 }  //namespace boost {
 
-#include <boost/move/detail/config_end.hpp>
-
 #endif //#ifndef BOOST_MOVE_DETAIL_META_UTILS_HPP
diff --git a/inst/include/boost/move/detail/meta_utils_core.hpp b/inst/include/boost/move/detail/meta_utils_core.hpp
index 4e1167383..fcd04c749 100644
--- a/inst/include/boost/move/detail/meta_utils_core.hpp
+++ b/inst/include/boost/move/detail/meta_utils_core.hpp
@@ -131,6 +131,21 @@ struct enable_if_same : enable_if<is_same<T, U>, R> {};
 template <class T, class U, class R = enable_if_nat>
 struct disable_if_same : disable_if<is_same<T, U>, R> {};
 
+//////////////////////////////////////
+//             is_lvalue_reference
+//////////////////////////////////////
+template<class T>
+struct is_lvalue_reference
+{
+    static const bool value = false;
+};
+
+template<class T>
+struct is_lvalue_reference<T&>
+{
+    static const bool value = true;
+};
+
 }  //namespace move_detail {
 }  //namespace boost {
 
diff --git a/inst/include/boost/move/detail/move_helpers.hpp b/inst/include/boost/move/detail/move_helpers.hpp
index 17138444d..89c73a090 100644
--- a/inst/include/boost/move/detail/move_helpers.hpp
+++ b/inst/include/boost/move/detail/move_helpers.hpp
@@ -69,13 +69,13 @@
    {};
 
    #define BOOST_MOVE_CONVERSION_AWARE_CATCH_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
+      inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
       {  return FWD_FUNCTION(static_cast<const TYPE&>(x)); }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
+      inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
       {  return FWD_FUNCTION(::boost::move(x));  }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(TYPE &x)\
+      inline RETURN_VALUE PUB_FUNCTION(TYPE &x)\
       {  return FWD_FUNCTION(const_cast<const TYPE &>(x)); }\
    //
    #if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
@@ -83,12 +83,12 @@
          BOOST_MOVE_CONVERSION_AWARE_CATCH_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
+         inline RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
             typename boost_move_conversion_aware_catch_1< ::boost::move_detail::nat, BOOST_MOVE_TEMPL_PARAM, TYPE>::type* = 0)\
          { return FWD_FUNCTION(u); }\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
+         inline RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
             typename boost_move_conversion_aware_catch_2< ::boost::move_detail::nat, BOOST_MOVE_TEMPL_PARAM, TYPE>::type* = 0)\
          {\
             TYPE t((u));\
@@ -100,12 +100,12 @@
          BOOST_MOVE_CONVERSION_AWARE_CATCH_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
+         inline typename boost_move_conversion_aware_catch_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
             PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u)\
          { return FWD_FUNCTION(u); }\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
+         inline typename boost_move_conversion_aware_catch_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
             PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u)\
          {\
             TYPE t((u));\
@@ -116,14 +116,14 @@
 #elif (defined(_MSC_VER) && (_MSC_VER == 1600))
 
    #define BOOST_MOVE_CONVERSION_AWARE_CATCH(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
+      inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
       {  return FWD_FUNCTION(static_cast<const TYPE&>(x)); }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
+      inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
       {  return FWD_FUNCTION(::boost::move(x));  }\
       \
       template<class BOOST_MOVE_TEMPL_PARAM>\
-      BOOST_MOVE_FORCEINLINE typename ::boost::move_detail::enable_if_c\
+      inline typename ::boost::move_detail::enable_if_c\
                         < !::boost::move_detail::is_same<TYPE, BOOST_MOVE_TEMPL_PARAM>::value\
                         , RETURN_VALUE >::type\
       PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u)\
@@ -136,10 +136,10 @@
 #else    //BOOST_NO_CXX11_RVALUE_REFERENCES
 
    #define BOOST_MOVE_CONVERSION_AWARE_CATCH(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
+      inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
       {  return FWD_FUNCTION(x); }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
+      inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
       {  return FWD_FUNCTION(::boost::move(x));  }\
    //
 
@@ -174,13 +174,13 @@
    {};
 
    #define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
       {  return FWD_FUNCTION(arg1, static_cast<const TYPE&>(x)); }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
       {  return FWD_FUNCTION(arg1, ::boost::move(x));  }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, TYPE &x)\
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, TYPE &x)\
       {  return FWD_FUNCTION(arg1, const_cast<const TYPE &>(x)); }\
    //
    #if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
@@ -188,12 +188,12 @@
          BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
+         inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
             typename boost_move_conversion_aware_catch_1arg_1<void, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type* = 0)\
          { return FWD_FUNCTION(arg1, u); }\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
+         inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
             typename boost_move_conversion_aware_catch_1arg_2<void, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type* = 0)\
          {\
             TYPE t((u));\
@@ -205,12 +205,12 @@
          BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_1arg_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
+         inline typename boost_move_conversion_aware_catch_1arg_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
             PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u)\
          { return FWD_FUNCTION(arg1, u); }\
          \
          template<class BOOST_MOVE_TEMPL_PARAM>\
-         BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_1arg_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
+         inline typename boost_move_conversion_aware_catch_1arg_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
             PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u)\
          {\
             TYPE t((u));\
@@ -222,14 +222,14 @@
 #elif (defined(_MSC_VER) && (_MSC_VER == 1600))
 
    #define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
       {  return FWD_FUNCTION(arg1, static_cast<const TYPE&>(x)); }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
       {  return FWD_FUNCTION(arg1, ::boost::move(x));  }\
       \
       template<class BOOST_MOVE_TEMPL_PARAM>\
-      BOOST_MOVE_FORCEINLINE typename ::boost::move_detail::disable_if_or\
+      inline typename ::boost::move_detail::disable_if_or\
                         < RETURN_VALUE \
                         , ::boost::move_detail::is_same<TYPE, BOOST_MOVE_TEMPL_PARAM> \
                         , ::boost::move_detail::is_same_or_convertible<BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO> \
@@ -244,10 +244,10 @@
 #else
 
    #define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
       {  return FWD_FUNCTION(arg1, static_cast<const TYPE&>(x)); }\
       \
-      BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
+      inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
       {  return FWD_FUNCTION(arg1, ::boost::move(x));  }\
    //
 
diff --git a/inst/include/boost/move/detail/nsec_clock.hpp b/inst/include/boost/move/detail/nsec_clock.hpp
index 88c0551d2..62ec2dfb0 100644
--- a/inst/include/boost/move/detail/nsec_clock.hpp
+++ b/inst/include/boost/move/detail/nsec_clock.hpp
@@ -43,7 +43,7 @@
 #include <cassert>
 
 #if defined( BOOST_USE_WINDOWS_H )
-#include <Windows.h>
+#include <windows.h>
 #else
 
 #if defined (WIN32_PLATFORM_PSPC)
diff --git a/inst/include/boost/move/detail/placement_new.hpp b/inst/include/boost/move/detail/placement_new.hpp
index 69d33328c..11a9fca57 100644
--- a/inst/include/boost/move/detail/placement_new.hpp
+++ b/inst/include/boost/move/detail/placement_new.hpp
@@ -18,6 +18,8 @@
 #  pragma once
 #endif
 
+#include <cstddef>
+
 struct boost_move_new_t{};
 
 //avoid including <new>
diff --git a/inst/include/boost/move/detail/reverse_iterator.hpp b/inst/include/boost/move/detail/reverse_iterator.hpp
index 7fda6edf0..19fb2877c 100644
--- a/inst/include/boost/move/detail/reverse_iterator.hpp
+++ b/inst/include/boost/move/detail/reverse_iterator.hpp
@@ -29,7 +29,7 @@ namespace boost {
 namespace movelib {
 
 template<class I>
-BOOST_MOVE_FORCEINLINE typename iterator_traits<I>::pointer iterator_arrow_result(const I &i)
+inline typename iterator_traits<I>::pointer iterator_arrow_result(const I &i)
 {  return i.operator->();  }
 
 template<class T>
@@ -49,38 +49,38 @@ class reverse_iterator
 
    typedef It iterator_type;
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator()
+   inline reverse_iterator()
       : m_current()  //Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_MOVE_FORCEINLINE explicit reverse_iterator(It r)
+   inline explicit reverse_iterator(It r)
       : m_current(r)
    {}
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator(const reverse_iterator& r)
+   inline reverse_iterator(const reverse_iterator& r)
       : m_current(r.base())
    {}
 
    template<class OtherIt>
-   BOOST_MOVE_FORCEINLINE
+   inline
       reverse_iterator( const reverse_iterator<OtherIt>& r
                       , typename boost::move_detail::enable_if_convertible<OtherIt, It>::type* =0
                    )
       : m_current(r.base())
    {}
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator & operator=( const reverse_iterator& r)
+   inline reverse_iterator & operator=( const reverse_iterator& r)
    {  m_current = r.base();   return *this;  }
 
    template<class OtherIt>
-   BOOST_MOVE_FORCEINLINE typename boost::move_detail::enable_if_convertible<OtherIt, It, reverse_iterator &>::type
+   inline typename boost::move_detail::enable_if_convertible<OtherIt, It, reverse_iterator &>::type
          operator=( const reverse_iterator<OtherIt>& r)
    {  m_current = r.base();   return *this;  }
 
-   BOOST_MOVE_FORCEINLINE It base() const
+   inline It base() const
    {  return m_current;  }
 
-   BOOST_MOVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    {
       It temp(m_current);
       --temp;
@@ -88,78 +88,78 @@ class reverse_iterator
       return r;
    }
 
-   BOOST_MOVE_FORCEINLINE pointer operator->() const
+   inline pointer operator->() const
    {
       It temp(m_current);
       --temp;
       return (iterator_arrow_result)(temp);
    }
 
-   BOOST_MOVE_FORCEINLINE reference operator[](difference_type off) const
+   inline reference operator[](difference_type off) const
    {
       return this->m_current[difference_type(-off - 1)];
    }
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator& operator++()
+   inline reverse_iterator& operator++()
    {
       --m_current;
       return *this;
    }
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator operator++(int)
+   inline reverse_iterator operator++(int)
    {
       reverse_iterator temp((*this));
       --m_current;
       return temp;
    }
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator& operator--()
+   inline reverse_iterator& operator--()
    {
       ++m_current;
       return *this;
    }
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator operator--(int)
+   inline reverse_iterator operator--(int)
    {
       reverse_iterator temp((*this));
       ++m_current;
       return temp;
    }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator==(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend bool operator==(const reverse_iterator& l, const reverse_iterator& r)
    {  return l.m_current == r.m_current;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator!=(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend bool operator!=(const reverse_iterator& l, const reverse_iterator& r)
    {  return l.m_current != r.m_current;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator<(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend bool operator<(const reverse_iterator& l, const reverse_iterator& r)
    {  return l.m_current > r.m_current;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator<=(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend bool operator<=(const reverse_iterator& l, const reverse_iterator& r)
    {  return l.m_current >= r.m_current;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator>(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend bool operator>(const reverse_iterator& l, const reverse_iterator& r)
    {  return l.m_current < r.m_current;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator>=(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend bool operator>=(const reverse_iterator& l, const reverse_iterator& r)
    {  return l.m_current <= r.m_current;  }
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator& operator+=(difference_type off)
+   inline reverse_iterator& operator+=(difference_type off)
    {  m_current -= off; return *this;  }
 
-   BOOST_MOVE_FORCEINLINE reverse_iterator& operator-=(difference_type off)
+   inline reverse_iterator& operator-=(difference_type off)
    {  m_current += off; return *this;  }
 
-   BOOST_MOVE_FORCEINLINE friend reverse_iterator operator+(reverse_iterator l, difference_type off)
+   inline friend reverse_iterator operator+(reverse_iterator l, difference_type off)
    {  return (l += off);  }
 
-   BOOST_MOVE_FORCEINLINE friend reverse_iterator operator+(difference_type off, reverse_iterator r)
+   inline friend reverse_iterator operator+(difference_type off, reverse_iterator r)
    {  return (r += off);   }
 
-   BOOST_MOVE_FORCEINLINE friend reverse_iterator operator-(reverse_iterator l, difference_type off)
+   inline friend reverse_iterator operator-(reverse_iterator l, difference_type off)
    {  return (l-= off);  }
 
-   BOOST_MOVE_FORCEINLINE friend difference_type operator-(const reverse_iterator& l, const reverse_iterator& r)
+   inline friend difference_type operator-(const reverse_iterator& l, const reverse_iterator& r)
    {  return r.m_current - l.m_current;  }
 
    private:
@@ -167,7 +167,7 @@ class reverse_iterator
 };
 
 template< class Iterator >
-BOOST_MOVE_FORCEINLINE reverse_iterator<Iterator> make_reverse_iterator( Iterator i )
+inline reverse_iterator<Iterator> make_reverse_iterator( Iterator i )
 {  return reverse_iterator<Iterator>(i);  }
 
 } //namespace movelib {
diff --git a/inst/include/boost/move/detail/std_ns_begin.hpp b/inst/include/boost/move/detail/std_ns_begin.hpp
index 2fd3691b6..49a7aba82 100644
--- a/inst/include/boost/move/detail/std_ns_begin.hpp
+++ b/inst/include/boost/move/detail/std_ns_begin.hpp
@@ -23,12 +23,12 @@
 #elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE)  //GCC >= 4.2
    #define BOOST_MOVE_STD_NS_BEG _GLIBCXX_BEGIN_NAMESPACE(std)
    #define BOOST_MOVE_STD_NS_END _GLIBCXX_END_NAMESPACE
-#else
-   #if defined(_MSC_VER) && (_MSC_VER >= 1915)
-      #pragma warning (push)
-      #pragma warning (disable : 4643) // Forward declaring 'X' in namespace std is not permitted by the C++ Standard
-   #endif
+#elif defined(BOOST_DINKUMWARE_STDLIB)
+   #define BOOST_MOVE_STD_NS_BEG _STD_BEGIN
+   #define BOOST_MOVE_STD_NS_END _STD_END
+#endif
 
-   #define BOOST_MOVE_STD_NS_BEG namespace std{
-   #define BOOST_MOVE_STD_NS_END }
+#if defined(_MSC_VER) && (_MSC_VER >= 1915)
+   #pragma warning (push)
+   #pragma warning (disable : 4643) // Forward declaring 'X' in namespace std is not permitted by the C++ Standard
 #endif
diff --git a/inst/include/boost/move/detail/std_ns_end.hpp b/inst/include/boost/move/detail/std_ns_end.hpp
index 61af2d7b1..abc40ed02 100644
--- a/inst/include/boost/move/detail/std_ns_end.hpp
+++ b/inst/include/boost/move/detail/std_ns_end.hpp
@@ -14,3 +14,6 @@
 #elif defined(_MSC_VER) && (_MSC_VER >= 1915)
    #pragma warning (pop)
 #endif   //BOOST_MOVE_STD_NS_GCC_DIAGNOSTIC_PUSH
+
+#undef BOOST_MOVE_STD_NS_BEG
+#undef BOOST_MOVE_STD_NS_END
diff --git a/inst/include/boost/move/detail/to_raw_pointer.hpp b/inst/include/boost/move/detail/to_raw_pointer.hpp
index 7e89beb4d..06beb2d42 100644
--- a/inst/include/boost/move/detail/to_raw_pointer.hpp
+++ b/inst/include/boost/move/detail/to_raw_pointer.hpp
@@ -33,7 +33,7 @@ BOOST_MOVE_FORCEINLINE T* to_raw_pointer(T* p)
 {  return p; }
 
 template <class Pointer>
-BOOST_MOVE_FORCEINLINE typename boost::movelib::pointer_element<Pointer>::type*
+inline typename boost::movelib::pointer_element<Pointer>::type*
 to_raw_pointer(const Pointer &p)
 {  return ::boost::movelib::to_raw_pointer(p.operator->());  }
 
diff --git a/inst/include/boost/move/detail/type_traits.hpp b/inst/include/boost/move/detail/type_traits.hpp
index 5a093186c..de8b2eb6d 100644
--- a/inst/include/boost/move/detail/type_traits.hpp
+++ b/inst/include/boost/move/detail/type_traits.hpp
@@ -581,6 +581,28 @@ struct remove_cvref
 {
 };
 
+//////////////////////////
+//    is_unsigned
+//////////////////////////
+template<class T> struct is_unsigned_cv               { static const bool value = true; };
+template <>       struct is_unsigned_cv<signed char>  { static const bool value = false; };
+template <>       struct is_unsigned_cv<signed short> { static const bool value = false; };
+template <>       struct is_unsigned_cv<signed int>   { static const bool value = false; };
+template <>       struct is_unsigned_cv<signed long>  { static const bool value = false; };
+#ifdef BOOST_HAS_LONG_LONG
+template <>       struct is_unsigned_cv< ::boost::long_long_type > { static const bool value = false; };
+#endif
+
+#ifdef BOOST_HAS_INT128
+template <>       struct is_unsigned_cv< ::boost::int128_type >    { static const bool value = false; };
+#endif
+
+template <class T>
+struct is_unsigned
+   : is_unsigned_cv<typename remove_cv<T>::type>
+{};
+
+
 //////////////////////////
 //    make_unsigned
 //////////////////////////
@@ -594,6 +616,11 @@ template <> struct make_unsigned_impl<signed long>                {  typedef uns
 template <> struct make_unsigned_impl< ::boost::long_long_type >  {  typedef ::boost::ulong_long_type type; };
 #endif
 
+#ifdef BOOST_HAS_INT128
+template <> struct make_unsigned_impl< ::boost::int128_type > { typedef ::boost::uint128_type type; };
+#endif
+
+
 template <class T>
 struct make_unsigned
    : make_unsigned_impl<typename remove_cv<T>::type>
@@ -639,6 +666,13 @@ template<> struct is_integral_cv<            unsigned long>{  static const bool
 template<> struct is_integral_cv< ::boost:: long_long_type>{  static const bool value = true; };
 template<> struct is_integral_cv< ::boost::ulong_long_type>{  static const bool value = true; };
 #endif
+#ifdef BOOST_HAS_INT128
+template <> struct is_integral_cv< ::boost::int128_type >  {  static const bool value = true; };
+template <> struct is_integral_cv< ::boost::uint128_type > {  static const bool value = true; };
+#endif
+#if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
+template<> struct is_integral_cv<char8_t>  { static const bool value = true; };
+#endif
 
 template<class T>
 struct is_integral
@@ -660,13 +694,6 @@ template <class T, std::size_t N>
 struct remove_all_extents<T[N]>
 {  typedef typename remove_all_extents<T>::type type;};
 
-//////////////////////////
-//    is_scalar
-//////////////////////////
-template<class T>
-struct is_scalar
-{  static const bool value = is_integral<T>::value || is_floating_point<T>::value; };
-
 //////////////////////////
 //       is_void
 //////////////////////////
@@ -732,6 +759,11 @@ struct is_nullptr_t
    : is_nullptr_t_cv<typename remove_cv<T>::type>
 {};
 
+template <class T>
+struct is_null_pointer
+   : is_nullptr_t_cv<typename remove_cv<T>::type>
+{};
+
 //////////////////////////////////////
 //          is_function
 //////////////////////////////////////
@@ -802,6 +834,7 @@ struct is_arithmetic
                              is_integral<T>::value;
 };
 
+
 //////////////////////////////////////
 //    is_member_function_pointer
 //////////////////////////////////////
@@ -829,21 +862,38 @@ struct is_member_function_pointer
 template <class T>
 struct is_enum_nonintrinsic
 {
-   static const bool value =  !is_arithmetic<T>::value     &&
-                              !is_reference<T>::value      &&
-                              !is_class_or_union<T>::value &&
-                              !is_array<T>::value          &&
-                              !is_void<T>::value           &&
-                              !is_nullptr_t<T>::value      &&
-                              !is_member_pointer<T>::value &&
-                              !is_pointer<T>::value        &&
-                              !is_function<T>::value;
+   static const bool value = !is_arithmetic<T>::value &&
+      !is_reference<T>::value &&
+      !is_class_or_union<T>::value &&
+      !is_array<T>::value &&
+      !is_void<T>::value &&
+      !is_nullptr_t<T>::value &&
+      !is_member_pointer<T>::value &&
+      !is_pointer<T>::value &&
+      !is_function<T>::value;
 };
 #endif
 
 template <class T>
 struct is_enum
-{  static const bool value = BOOST_MOVE_IS_ENUM_IMPL(T);  };
+{
+   static const bool value = BOOST_MOVE_IS_ENUM_IMPL(T);
+};
+
+
+//////////////////////////
+//    is_scalar
+//////////////////////////
+template<class T>
+struct is_scalar
+{
+   static const bool value = is_arithmetic<T>::value ||
+      is_enum<T>::value ||
+      is_pointer<T>::value ||
+      is_member_pointer<T>::value ||
+      is_null_pointer<T>::value;
+};
+
 
 //////////////////////////////////////
 //       is_pod
@@ -1147,12 +1197,20 @@ struct aligned_struct;
 template <> struct aligned_struct<1> { char data; };
 template <> struct aligned_struct<2> { short data; };
 template <> struct aligned_struct<4> { int data; };
-template <> struct aligned_struct<8> { double data; };
+//8 byte alignment does not propely work in x86 if attribute is not used.
+//If a user declares a variable with 8 byte alignment, such as a double
+//the compiler will not realign the stack.
+// 
+//If _declspec(align) is used MSVC will realign the stack.
+//
+//Disabled specialization
+//template <> struct aligned_struct<8> { double data; };
 
 #define BOOST_MOVE_ALIGNED_STRUCT(x) \
   template <> struct aligned_struct<x> { \
     __declspec(align(x)) char data; \
   }
+BOOST_MOVE_ALIGNED_STRUCT(8);
 BOOST_MOVE_ALIGNED_STRUCT(16);
 BOOST_MOVE_ALIGNED_STRUCT(32);
 BOOST_MOVE_ALIGNED_STRUCT(64);
diff --git a/inst/include/boost/move/detail/workaround.hpp b/inst/include/boost/move/detail/workaround.hpp
index 2fcd027d8..f12e93315 100644
--- a/inst/include/boost/move/detail/workaround.hpp
+++ b/inst/include/boost/move/detail/workaround.hpp
@@ -61,8 +61,11 @@
 #elif defined(BOOST_MSVC) && (_MSC_VER < 1900 || defined(_DEBUG))
    //"__forceinline" and MSVC seems to have some bugs in old versions and in debug mode
    #define BOOST_MOVE_FORCEINLINE inline
-#elif defined(BOOST_GCC) && (__GNUC__ <= 5)
+#elif defined(BOOST_CLANG) || (defined(BOOST_GCC) && ((__GNUC__ <= 5) || defined(__MINGW32__)))
    //Older GCCs have problems with forceinline
+   //Clang can have code bloat issues with forceinline, see
+   //https://lists.boost.org/boost-users/2023/04/91445.php and
+   //https://github.com/llvm/llvm-project/issues/62202
    #define BOOST_MOVE_FORCEINLINE inline
 #else
    #define BOOST_MOVE_FORCEINLINE BOOST_FORCEINLINE
@@ -126,7 +129,7 @@ template<unsigned> struct static_assert_test {};
 #define BOOST_MOVE_STATIC_ASSERT(B) \
          typedef ::boost::move_detail::static_assert_test<\
             (unsigned)sizeof(::boost::move_detail::STATIC_ASSERTION_FAILURE<bool(B)>)>\
-               BOOST_JOIN(boost_static_assert_typedef_, __LINE__) BOOST_ATTRIBUTE_UNUSED
+               BOOST_JOIN(boost_move_static_assert_typedef_, __LINE__) BOOST_ATTRIBUTE_UNUSED
 
 #endif
 
@@ -144,5 +147,10 @@ template<unsigned> struct static_assert_test {};
 #define BOOST_MOVE_INTRINSIC_CAST BOOST_MOVE_FORCEINLINE
 #endif
 
-#endif   //#ifndef BOOST_MOVE_DETAIL_WORKAROUND_HPP
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_launder)
+   #define BOOST_MOVE_HAS_BUILTIN_LAUNDER
+#endif
+#endif
 
+#endif   //#ifndef BOOST_MOVE_DETAIL_WORKAROUND_HPP
diff --git a/inst/include/boost/move/iterator.hpp b/inst/include/boost/move/iterator.hpp
index c289c0836..7d1636e05 100644
--- a/inst/include/boost/move/iterator.hpp
+++ b/inst/include/boost/move/iterator.hpp
@@ -58,20 +58,20 @@ class move_iterator
    typedef typename boost::movelib::iterator_traits<iterator_type>::difference_type   difference_type;
    typedef typename boost::movelib::iterator_traits<iterator_type>::iterator_category iterator_category;
 
-   BOOST_MOVE_FORCEINLINE move_iterator()
+   inline move_iterator()
       : m_it()
    {}
 
-   BOOST_MOVE_FORCEINLINE explicit move_iterator(const It &i)
+   inline explicit move_iterator(const It &i)
       :  m_it(i)
    {}
 
    template <class U>
-   BOOST_MOVE_FORCEINLINE move_iterator(const move_iterator<U>& u)
+   inline move_iterator(const move_iterator<U>& u)
       :  m_it(u.m_it)
    {}
 
-   BOOST_MOVE_FORCEINLINE reference operator*() const
+   inline reference operator*() const
    {
       #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
       return *m_it;
@@ -80,34 +80,34 @@ class move_iterator
       #endif
    }
 
-   BOOST_MOVE_FORCEINLINE pointer   operator->() const
+   inline pointer   operator->() const
    {  return m_it;   }
 
-   BOOST_MOVE_FORCEINLINE move_iterator& operator++()
+   inline move_iterator& operator++()
    {  ++m_it; return *this;   }
 
-   BOOST_MOVE_FORCEINLINE move_iterator<iterator_type>  operator++(int)
+   inline move_iterator<iterator_type>  operator++(int)
    {  move_iterator<iterator_type> tmp(*this); ++(*this); return tmp;   }
 
-   BOOST_MOVE_FORCEINLINE move_iterator& operator--()
+   inline move_iterator& operator--()
    {  --m_it; return *this;   }
 
-   BOOST_MOVE_FORCEINLINE move_iterator<iterator_type>  operator--(int)
+   inline move_iterator<iterator_type>  operator--(int)
    {  move_iterator<iterator_type> tmp(*this); --(*this); return tmp;   }
 
    move_iterator<iterator_type>  operator+ (difference_type n) const
    {  return move_iterator<iterator_type>(m_it + n);  }
 
-   BOOST_MOVE_FORCEINLINE move_iterator& operator+=(difference_type n)
+   inline move_iterator& operator+=(difference_type n)
    {  m_it += n; return *this;   }
 
-   BOOST_MOVE_FORCEINLINE move_iterator<iterator_type>  operator- (difference_type n) const
+   inline move_iterator<iterator_type>  operator- (difference_type n) const
    {  return move_iterator<iterator_type>(m_it - n);  }
 
-   BOOST_MOVE_FORCEINLINE move_iterator& operator-=(difference_type n)
+   inline move_iterator& operator-=(difference_type n)
    {  m_it -= n; return *this;   }
 
-   BOOST_MOVE_FORCEINLINE reference operator[](difference_type n) const
+   inline reference operator[](difference_type n) const
    {
       #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
       return m_it[n];
@@ -116,28 +116,28 @@ class move_iterator
       #endif
    }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator==(const move_iterator& x, const move_iterator& y)
+   inline friend bool operator==(const move_iterator& x, const move_iterator& y)
    {  return x.m_it == y.m_it;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator!=(const move_iterator& x, const move_iterator& y)
+   inline friend bool operator!=(const move_iterator& x, const move_iterator& y)
    {  return x.m_it != y.m_it;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator< (const move_iterator& x, const move_iterator& y)
+   inline friend bool operator< (const move_iterator& x, const move_iterator& y)
    {  return x.m_it < y.m_it;   }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator<=(const move_iterator& x, const move_iterator& y)
+   inline friend bool operator<=(const move_iterator& x, const move_iterator& y)
    {  return x.m_it <= y.m_it;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator> (const move_iterator& x, const move_iterator& y)
+   inline friend bool operator> (const move_iterator& x, const move_iterator& y)
    {  return x.m_it > y.m_it;  }
 
-   BOOST_MOVE_FORCEINLINE friend bool operator>=(const move_iterator& x, const move_iterator& y)
+   inline friend bool operator>=(const move_iterator& x, const move_iterator& y)
    {  return x.m_it >= y.m_it;  }
 
-   BOOST_MOVE_FORCEINLINE friend difference_type operator-(const move_iterator& x, const move_iterator& y)
+   inline friend difference_type operator-(const move_iterator& x, const move_iterator& y)
    {  return x.m_it - y.m_it;   }
 
-   BOOST_MOVE_FORCEINLINE friend move_iterator operator+(difference_type n, const move_iterator& x)
+   inline friend move_iterator operator+(difference_type n, const move_iterator& x)
    {  return move_iterator(x.m_it + n);   }
 
    private:
@@ -170,7 +170,7 @@ struct is_move_iterator< ::boost::move_iterator<I> >
 //!
 //! <b>Returns</b>: move_iterator<It>(i).
 template<class It>
-BOOST_MOVE_FORCEINLINE move_iterator<It> make_move_iterator(const It &it)
+inline move_iterator<It> make_move_iterator(const It &it)
 {  return move_iterator<It>(it); }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/inst/include/boost/move/unique_ptr.hpp b/inst/include/boost/move/unique_ptr.hpp
index 210287228..6a9bb67a9 100644
--- a/inst/include/boost/move/unique_ptr.hpp
+++ b/inst/include/boost/move/unique_ptr.hpp
@@ -92,25 +92,25 @@ struct unique_ptr_data
    typedef typename deleter_types<D>::del_ref            del_ref;
    typedef typename deleter_types<D>::del_cref           del_cref;
 
-   BOOST_MOVE_FORCEINLINE unique_ptr_data() BOOST_NOEXCEPT
+   inline unique_ptr_data() BOOST_NOEXCEPT
       : m_p(), d()
    {}
 
-   BOOST_MOVE_FORCEINLINE explicit unique_ptr_data(P p) BOOST_NOEXCEPT
+   inline explicit unique_ptr_data(P p) BOOST_NOEXCEPT
       : m_p(p), d()
    {}
 
-   BOOST_MOVE_FORCEINLINE unique_ptr_data(P p, deleter_arg_type1 d1) BOOST_NOEXCEPT
+   inline unique_ptr_data(P p, deleter_arg_type1 d1) BOOST_NOEXCEPT
       : m_p(p), d(d1)
    {}
 
    template <class U>
-   BOOST_MOVE_FORCEINLINE unique_ptr_data(P p, BOOST_FWD_REF(U) d1) BOOST_NOEXCEPT
+   inline unique_ptr_data(P p, BOOST_FWD_REF(U) d1) BOOST_NOEXCEPT
       : m_p(p), d(::boost::forward<U>(d1))
    {}
 
-   BOOST_MOVE_FORCEINLINE del_ref deleter()       { return d; }
-   BOOST_MOVE_FORCEINLINE del_cref deleter() const{ return d; }
+   inline del_ref deleter()       { return d; }
+   inline del_cref deleter() const{ return d; }
 
    P m_p;
    D d;
@@ -128,25 +128,25 @@ struct unique_ptr_data<P, D, false>
    typedef typename deleter_types<D>::del_ref            del_ref;
    typedef typename deleter_types<D>::del_cref           del_cref;
 
-   BOOST_MOVE_FORCEINLINE unique_ptr_data() BOOST_NOEXCEPT
+   inline unique_ptr_data() BOOST_NOEXCEPT
       : D(), m_p()
    {}
 
-   BOOST_MOVE_FORCEINLINE explicit unique_ptr_data(P p) BOOST_NOEXCEPT
+   inline explicit unique_ptr_data(P p) BOOST_NOEXCEPT
       : D(), m_p(p)
    {}
 
-   BOOST_MOVE_FORCEINLINE unique_ptr_data(P p, deleter_arg_type1 d1) BOOST_NOEXCEPT
+   inline unique_ptr_data(P p, deleter_arg_type1 d1) BOOST_NOEXCEPT
       : D(d1), m_p(p)
    {}
 
    template <class U>
-   BOOST_MOVE_FORCEINLINE unique_ptr_data(P p, BOOST_FWD_REF(U) d) BOOST_NOEXCEPT
+   inline unique_ptr_data(P p, BOOST_FWD_REF(U) d) BOOST_NOEXCEPT
       : D(::boost::forward<U>(d)), m_p(p)
    {}
 
-   BOOST_MOVE_FORCEINLINE del_ref deleter()        BOOST_NOEXCEPT   {  return static_cast<del_ref>(*this);   }
-   BOOST_MOVE_FORCEINLINE del_cref deleter() const BOOST_NOEXCEPT   {  return static_cast<del_cref>(*this);  }
+   inline del_ref deleter()        BOOST_NOEXCEPT   {  return static_cast<del_ref>(*this);   }
+   inline del_cref deleter() const BOOST_NOEXCEPT   {  return static_cast<del_cref>(*this);  }
 
    P m_p;
 
@@ -388,7 +388,7 @@ class unique_ptr
    //!
    //! <b>Remarks</b>: If this constructor is instantiated with a pointer type or reference type
    //!   for the template argument D, the program is ill-formed.   
-   BOOST_MOVE_FORCEINLINE BOOST_CONSTEXPR unique_ptr() BOOST_NOEXCEPT
+   inline BOOST_CONSTEXPR unique_ptr() BOOST_NOEXCEPT
       : m_data()
    {
       //If this constructor is instantiated with a pointer type or reference type
@@ -399,7 +399,7 @@ class unique_ptr
 
    //! <b>Effects</b>: Same as <tt>unique_ptr()</tt> (default constructor).
    //! 
-   BOOST_MOVE_FORCEINLINE BOOST_CONSTEXPR unique_ptr(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type)) BOOST_NOEXCEPT
+   inline BOOST_CONSTEXPR unique_ptr(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type)) BOOST_NOEXCEPT
       : m_data()
    {
       //If this constructor is instantiated with a pointer type or reference type
@@ -422,7 +422,7 @@ class unique_ptr
    //!      - If T is not an array type and Pointer is implicitly convertible to pointer.
    //!      - If T is an array type and Pointer is a more CV qualified pointer to element_type.
    template<class Pointer>
-   BOOST_MOVE_FORCEINLINE explicit unique_ptr(Pointer p
+   inline explicit unique_ptr(Pointer p
       BOOST_MOVE_DOCIGN(BOOST_MOVE_I typename bmupd::enable_up_ptr<T BOOST_MOVE_I Pointer BOOST_MOVE_I pointer>::type* =0)
                  ) BOOST_NOEXCEPT
       : m_data(p)
@@ -460,7 +460,7 @@ class unique_ptr
    //!      - If T is not an array type and Pointer is implicitly convertible to pointer.
    //!      - If T is an array type and Pointer is a more CV qualified pointer to element_type.
    template<class Pointer>
-   BOOST_MOVE_FORCEINLINE unique_ptr(Pointer p, BOOST_MOVE_SEEDOC(deleter_arg_type1) d1
+   inline unique_ptr(Pointer p, BOOST_MOVE_SEEDOC(deleter_arg_type1) d1
       BOOST_MOVE_DOCIGN(BOOST_MOVE_I typename bmupd::enable_up_ptr<T BOOST_MOVE_I Pointer BOOST_MOVE_I pointer>::type* =0)
               ) BOOST_NOEXCEPT
       : m_data(p, d1)
@@ -473,7 +473,7 @@ class unique_ptr
 
    //! <b>Effects</b>: Same effects as <tt>template<class Pointer> unique_ptr(Pointer p, deleter_arg_type1 d1)</tt>
    //!   and additionally <tt>get() == nullptr</tt>
-   BOOST_MOVE_FORCEINLINE unique_ptr(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), BOOST_MOVE_SEEDOC(deleter_arg_type1) d1) BOOST_NOEXCEPT
+   inline unique_ptr(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), BOOST_MOVE_SEEDOC(deleter_arg_type1) d1) BOOST_NOEXCEPT
       : m_data(pointer(), d1)
    {}
 
@@ -498,7 +498,7 @@ class unique_ptr
    //!      - If T is not an array type and Pointer is implicitly convertible to pointer.
    //!      - If T is an array type and Pointer is a more CV qualified pointer to element_type.
    template<class Pointer>
-   BOOST_MOVE_FORCEINLINE unique_ptr(Pointer p, BOOST_MOVE_SEEDOC(deleter_arg_type2) d2
+   inline unique_ptr(Pointer p, BOOST_MOVE_SEEDOC(deleter_arg_type2) d2
       BOOST_MOVE_DOCIGN(BOOST_MOVE_I typename bmupd::enable_up_ptr<T BOOST_MOVE_I Pointer BOOST_MOVE_I pointer>::type* =0)
              ) BOOST_NOEXCEPT
       : m_data(p, ::boost::move(d2))
@@ -511,7 +511,7 @@ class unique_ptr
 
    //! <b>Effects</b>: Same effects as <tt>template<class Pointer> unique_ptr(Pointer p, deleter_arg_type2 d2)</tt>
    //!   and additionally <tt>get() == nullptr</tt>
-   BOOST_MOVE_FORCEINLINE unique_ptr(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), BOOST_MOVE_SEEDOC(deleter_arg_type2) d2) BOOST_NOEXCEPT
+   inline unique_ptr(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), BOOST_MOVE_SEEDOC(deleter_arg_type2) d2) BOOST_NOEXCEPT
       : m_data(pointer(), ::boost::move(d2))
    {}
 
@@ -525,7 +525,7 @@ class unique_ptr
    //! <b>Postconditions</b>: <tt>get()</tt> yields the value u.get() yielded before the construction. <tt>get_deleter()</tt>
    //! returns a reference to the stored deleter that was constructed from u.get_deleter(). If D is a
    //! reference type then <tt>get_deleter()</tt> and <tt>u.get_deleter()</tt> both reference the same lvalue deleter.
-   BOOST_MOVE_FORCEINLINE unique_ptr(BOOST_RV_REF(unique_ptr) u) BOOST_NOEXCEPT
+   inline unique_ptr(BOOST_RV_REF(unique_ptr) u) BOOST_NOEXCEPT
       : m_data(u.release(), ::boost::move_if_not_lvalue_reference<D>(u.get_deleter()))
    {}
 
@@ -545,7 +545,7 @@ class unique_ptr
    //! <b>Postconditions</b>: <tt>get()</tt> yields the value <tt>u.get()</tt> yielded before the construction. <tt>get_deleter()</tt>
    //!   returns a reference to the stored deleter that was constructed from <tt>u.get_deleter()</tt>.
    template <class U, class E>
-   BOOST_MOVE_FORCEINLINE unique_ptr( BOOST_RV_REF_BEG_IF_CXX11 unique_ptr<U, E> BOOST_RV_REF_END_IF_CXX11 u
+   inline unique_ptr( BOOST_RV_REF_BEG_IF_CXX11 unique_ptr<U, E> BOOST_RV_REF_END_IF_CXX11 u
       BOOST_MOVE_DOCIGN(BOOST_MOVE_I typename bmupd::enable_up_moveconv_constr<T BOOST_MOVE_I D BOOST_MOVE_I U BOOST_MOVE_I E>::type* =0)
       ) BOOST_NOEXCEPT
       : m_data(u.release(), ::boost::move_if_not_lvalue_reference<E>(u.get_deleter()))
@@ -628,7 +628,7 @@ class unique_ptr
    //! <b>Returns</b>: <tt>get()[i]</tt>.
    //!
    //! <b>Remarks</b: If T is not an array type, the program is ill-formed.
-   BOOST_MOVE_FORCEINLINE BOOST_MOVE_DOC1ST(element_type&, typename bmupmu::add_lvalue_reference<element_type>::type)
+   inline BOOST_MOVE_DOC1ST(element_type&, typename bmupmu::add_lvalue_reference<element_type>::type)
       operator[](std::size_t i) const BOOST_NOEXCEPT
    {
       assert( bmupmu::extent<T>::value == 0 || i < bmupmu::extent<T>::value );
@@ -643,7 +643,7 @@ class unique_ptr
    //! <b>Note</b>: use typically requires that T be a complete type.
    //!
    //! <b>Remarks</b: If T is an array type, the program is ill-formed.
-   BOOST_MOVE_FORCEINLINE pointer operator->() const BOOST_NOEXCEPT
+   inline pointer operator->() const BOOST_NOEXCEPT
    {
       BOOST_MOVE_STATIC_ASSERT((!bmupmu::is_array<T>::value));
       assert(m_data.m_p);
@@ -652,27 +652,27 @@ class unique_ptr
 
    //! <b>Returns</b>: The stored pointer.
    //!
-   BOOST_MOVE_FORCEINLINE pointer get() const BOOST_NOEXCEPT
+   inline pointer get() const BOOST_NOEXCEPT
    {  return m_data.m_p;  }
 
    //! <b>Returns</b>: A reference to the stored deleter.
    //!
-   BOOST_MOVE_FORCEINLINE BOOST_MOVE_DOC1ST(D&, typename bmupmu::add_lvalue_reference<D>::type)
+   inline BOOST_MOVE_DOC1ST(D&, typename bmupmu::add_lvalue_reference<D>::type)
       get_deleter() BOOST_NOEXCEPT
    {  return m_data.deleter();  }   
 
    //! <b>Returns</b>: A reference to the stored deleter.
    //!
-   BOOST_MOVE_FORCEINLINE BOOST_MOVE_DOC1ST(const D&, typename bmupmu::add_const_lvalue_reference<D>::type)
+   inline BOOST_MOVE_DOC1ST(const D&, typename bmupmu::add_const_lvalue_reference<D>::type)
       get_deleter() const BOOST_NOEXCEPT
    {  return m_data.deleter();  }
 
    #ifdef BOOST_MOVE_DOXYGEN_INVOKED
    //! <b>Returns</b>: Returns: get() != nullptr.
    //!
-   BOOST_MOVE_FORCEINLINE explicit operator bool
+   inline explicit operator bool
    #else
-   BOOST_MOVE_FORCEINLINE operator bmupd::explicit_bool_arg
+   inline operator bmupd::explicit_bool_arg
    #endif
       ()const BOOST_NOEXCEPT
    {
@@ -684,7 +684,7 @@ class unique_ptr
    //! <b>Postcondition</b>: <tt>get() == nullptr</tt>.
    //!
    //! <b>Returns</b>: The value <tt>get()</tt> had at the start of the call to release.   
-   BOOST_MOVE_FORCEINLINE pointer release() BOOST_NOEXCEPT
+   inline pointer release() BOOST_NOEXCEPT
    {
       const pointer tmp = m_data.m_p;
       m_data.m_p = pointer();
@@ -747,19 +747,19 @@ class unique_ptr
 //! <b>Effects</b>: Calls <tt>x.swap(y)</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE void swap(unique_ptr<T, D> &x, unique_ptr<T, D> &y) BOOST_NOEXCEPT
+inline void swap(unique_ptr<T, D> &x, unique_ptr<T, D> &y) BOOST_NOEXCEPT
 {  x.swap(y); }
 
 //! <b>Returns</b>: <tt>x.get() == y.get()</tt>.
 //!
 template <class T1, class D1, class T2, class D2>
-BOOST_MOVE_FORCEINLINE bool operator==(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
+inline bool operator==(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
 {  return x.get() == y.get(); }
 
 //! <b>Returns</b>: <tt>x.get() != y.get()</tt>.
 //!
 template <class T1, class D1, class T2, class D2>
-BOOST_MOVE_FORCEINLINE bool operator!=(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
+inline bool operator!=(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
 {  return x.get() != y.get(); }
 
 //! <b>Returns</b>: x.get() < y.get().
@@ -767,99 +767,99 @@ BOOST_MOVE_FORCEINLINE bool operator!=(const unique_ptr<T1, D1> &x, const unique
 //! <b>Remarks</b>: This comparison shall induce a
 //!   strict weak ordering betwen pointers.
 template <class T1, class D1, class T2, class D2>
-BOOST_MOVE_FORCEINLINE bool operator<(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
+inline bool operator<(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
 {  return x.get() < y.get();  }
 
 //! <b>Returns</b>: !(y < x).
 //!
 template <class T1, class D1, class T2, class D2>
-BOOST_MOVE_FORCEINLINE bool operator<=(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
+inline bool operator<=(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
 {  return !(y < x);  }
 
 //! <b>Returns</b>: y < x.
 //!
 template <class T1, class D1, class T2, class D2>
-BOOST_MOVE_FORCEINLINE bool operator>(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
+inline bool operator>(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
 {  return y < x;  }
 
 //! <b>Returns</b>:!(x < y).
 //!
 template <class T1, class D1, class T2, class D2>
-BOOST_MOVE_FORCEINLINE bool operator>=(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
+inline bool operator>=(const unique_ptr<T1, D1> &x, const unique_ptr<T2, D2> &y)
 {  return !(x < y);  }
 
 //! <b>Returns</b>:!x.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator==(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type)) BOOST_NOEXCEPT
+inline bool operator==(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type)) BOOST_NOEXCEPT
 {  return !x;  }
 
 //! <b>Returns</b>:!x.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator==(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x) BOOST_NOEXCEPT
+inline bool operator==(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x) BOOST_NOEXCEPT
 {  return !x;  }
 
 //! <b>Returns</b>: (bool)x.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator!=(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type)) BOOST_NOEXCEPT
+inline bool operator!=(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type)) BOOST_NOEXCEPT
 {  return !!x;  }
 
 //! <b>Returns</b>: (bool)x.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator!=(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x) BOOST_NOEXCEPT
+inline bool operator!=(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x) BOOST_NOEXCEPT
 {  return !!x;  }
 
 //! <b>Requires</b>: <tt>operator </tt> shall induce a strict weak ordering on unique_ptr<T, D>::pointer values.
 //!
 //! <b>Returns</b>: Returns <tt>x.get() < pointer()</tt>.
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator<(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
+inline bool operator<(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
 {  return x.get() < typename unique_ptr<T, D>::pointer();  }
 
 //! <b>Requires</b>: <tt>operator </tt> shall induce a strict weak ordering on unique_ptr<T, D>::pointer values.
 //!
 //! <b>Returns</b>: Returns <tt>pointer() < x.get()</tt>.
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator<(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
+inline bool operator<(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
 {  return typename unique_ptr<T, D>::pointer() < x.get();  }
 
 //! <b>Returns</b>: <tt>nullptr < x</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator>(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
+inline bool operator>(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
 {  return x.get() > typename unique_ptr<T, D>::pointer();  }
 
 //! <b>Returns</b>: <tt>x < nullptr</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator>(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
+inline bool operator>(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
 {  return typename unique_ptr<T, D>::pointer() > x.get();  }
 
 //! <b>Returns</b>: <tt>!(nullptr < x)</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator<=(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
+inline bool operator<=(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
 {  return !(bmupd::nullptr_type() < x);  }
 
 //! <b>Returns</b>: <tt>!(x < nullptr)</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator<=(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
+inline bool operator<=(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
 {  return !(x < bmupd::nullptr_type());  }
 
 //! <b>Returns</b>: <tt>!(x < nullptr)</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator>=(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
+inline bool operator>=(const unique_ptr<T, D> &x, BOOST_MOVE_DOC0PTR(bmupd::nullptr_type))
 {  return !(x < bmupd::nullptr_type());  }
 
 //! <b>Returns</b>: <tt>!(nullptr < x)</tt>.
 //!
 template <class T, class D>
-BOOST_MOVE_FORCEINLINE bool operator>=(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
+inline bool operator>=(BOOST_MOVE_DOC0PTR(bmupd::nullptr_type), const unique_ptr<T, D> &x)
 {  return !(bmupd::nullptr_type() < x);  }
 
 }  //namespace movelib {
diff --git a/inst/include/boost/mp11.hpp b/inst/include/boost/mp11.hpp
index 5e459395f..799a3063a 100644
--- a/inst/include/boost/mp11.hpp
+++ b/inst/include/boost/mp11.hpp
@@ -1,7 +1,7 @@
 #ifndef BOOST_MP11_HPP_INCLUDED
 #define BOOST_MP11_HPP_INCLUDED
 
-//  Copyright 2015 Peter Dimov.
+//  Copyright 2015-2024 Peter Dimov.
 //
 //  Distributed under the Boost Software License, Version 1.0.
 //
@@ -16,6 +16,7 @@
 #include <boost/mp11/map.hpp>
 #include <boost/mp11/set.hpp>
 #include <boost/mp11/bind.hpp>
+#include <boost/mp11/lambda.hpp>
 #include <boost/mp11/integer_sequence.hpp>
 #include <boost/mp11/tuple.hpp>
 
diff --git a/inst/include/boost/mp11/algorithm.hpp b/inst/include/boost/mp11/algorithm.hpp
index be377f5a6..8f802440a 100644
--- a/inst/include/boost/mp11/algorithm.hpp
+++ b/inst/include/boost/mp11/algorithm.hpp
@@ -26,6 +26,11 @@
 #include <type_traits>
 #include <utility>
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 namespace boost
 {
 namespace mp11
@@ -84,6 +89,25 @@ template<template<class...> class F, template<class...> class L1, class... T1, t
 #endif
 };
 
+#if defined(BOOST_MP11_HAS_TEMPLATE_AUTO)
+
+template<template<class...> class F, template<auto...> class L, auto... A> struct mp_transform_impl<F, L<A...>>
+{
+    using type = L< F< mp_value<A> >::value... >;
+};
+
+template<template<class...> class F, template<auto...> class L1, auto... A1, template<auto...> class L2, auto... A2> struct mp_transform_impl<F, L1<A1...>, L2<A2...>>
+{
+    using type = L1< F< mp_value<A1>, mp_value<A2> >::value... >;
+};
+
+template<template<class...> class F, template<auto...> class L1, auto... A1, template<auto...> class L2, auto... A2, template<auto...> class L3, auto... A3> struct mp_transform_impl<F, L1<A1...>, L2<A2...>, L3<A3...>>
+{
+    using type = L1< F< mp_value<A1>, mp_value<A2>, mp_value<A3> >::value... >;
+};
+
+#endif
+
 #if BOOST_MP11_WORKAROUND( BOOST_MP11_MSVC, == 1900 ) || BOOST_MP11_WORKAROUND( BOOST_MP11_GCC, < 40800 )
 
 template<class... L> using mp_same_size_1 = mp_same<mp_size<L>...>;
@@ -473,6 +497,10 @@ struct mp_take_c_impl<N, L<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T...>, typen
 template<class L, std::size_t N> using mp_take_c = mp_assign<L, typename detail::mp_take_c_impl<N, mp_rename<L, mp_list>>::type>;
 template<class L, class N> using mp_take = mp_take_c<L, std::size_t{ N::value }>;
 
+// mp_slice(_c)<L, I, J>
+template<class L, std::size_t I, std::size_t J> using mp_slice_c = mp_drop_c< mp_take_c<L, J>, I >;
+template<class L, class I, class J> using mp_slice = mp_drop< mp_take<L, J>, I >;
+
 // mp_back<L>
 template<class L> using mp_back = mp_at_c<L, mp_size<L>::value - 1>;
 
@@ -1261,6 +1289,33 @@ template<class L, class Q> using mp_pairwise_fold_impl = mp_transform_q<Q, mp_po
 template<class L, class Q> using mp_pairwise_fold_q = mp_eval_if<mp_empty<L>, mp_clear<L>, detail::mp_pairwise_fold_impl, L, Q>;
 template<class L, template<class...> class F> using mp_pairwise_fold = mp_pairwise_fold_q<L, mp_quote<F>>;
 
+// mp_sliding_fold<L, N, F>
+namespace detail
+{
+
+template<class C, class L, class Q, class S> struct mp_sliding_fold_impl;
+
+template<class L, class N, class Q> struct mp_sliding_fold_impl<mp_true, L, N, Q>
+{
+    static const std::size_t M = mp_size<L>::value - N::value + 1;
+
+    template<class I> using F = mp_slice_c<L, I::value, I::value + M>;
+
+    using J = mp_transform<F, mp_iota<N>>;
+
+    using type = mp_apply<mp_transform_q, mp_push_front<J, Q>>;
+};
+
+template<class L, class N, class Q> struct mp_sliding_fold_impl<mp_false, L, N, Q>
+{
+    using type = mp_clear<L>;
+};
+
+} // namespace detail
+
+template<class L, class N, class Q> using mp_sliding_fold_q = typename detail::mp_sliding_fold_impl<mp_bool<(mp_size<L>::value >= N::value)>, L, N, Q>::type;
+template<class L, class N, template<class...> class F> using mp_sliding_fold = mp_sliding_fold_q<L, N, mp_quote<F>>;
+
 // mp_intersperse<L, S>
 namespace detail
 {
@@ -1324,4 +1379,8 @@ template<class L, class S> using mp_join = mp_apply<mp_append, mp_intersperse<L,
 } // namespace mp11
 } // namespace boost
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #endif // #ifndef BOOST_MP11_ALGORITHM_HPP_INCLUDED
diff --git a/inst/include/boost/mp11/bind.hpp b/inst/include/boost/mp11/bind.hpp
index bbdecd220..289b073f6 100644
--- a/inst/include/boost/mp11/bind.hpp
+++ b/inst/include/boost/mp11/bind.hpp
@@ -12,6 +12,11 @@
 #include <boost/mp11/utility.hpp>
 #include <cstddef>
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 namespace boost
 {
 namespace mp11
@@ -108,4 +113,8 @@ template<class Q, class... T> using mp_bind_q = mp_bind<Q::template fn, T...>;
 } // namespace mp11
 } // namespace boost
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #endif // #ifndef BOOST_MP11_BIND_HPP_INCLUDED
diff --git a/inst/include/boost/mp11/detail/mp_count.hpp b/inst/include/boost/mp11/detail/mp_count.hpp
index 37b39ed54..bc8aed93e 100644
--- a/inst/include/boost/mp11/detail/mp_count.hpp
+++ b/inst/include/boost/mp11/detail/mp_count.hpp
@@ -51,9 +51,9 @@ template<class V, class... T> constexpr std::size_t cx_count()
 
     std::size_t r = 0;
 
-    for( std::size_t i = 1; i < sizeof...(T) + 1; ++i )
+    for( std::size_t i = 0; i < sizeof...(T); ++i )
     {
-        r += a[ i ];
+        r += a[ i+1 ];
     }
 
     return r;
@@ -98,9 +98,9 @@ template<template<class...> class P, class... T> constexpr std::size_t cx_count_
 
     std::size_t r = 0;
 
-    for( std::size_t i = 1; i < sizeof...(T) + 1; ++i )
+    for( std::size_t i = 0; i < sizeof...(T); ++i )
     {
-        r += a[ i ];
+        r += a[ i+1 ];
     }
 
     return r;
diff --git a/inst/include/boost/mp11/detail/mp_fold.hpp b/inst/include/boost/mp11/detail/mp_fold.hpp
index 266d9c18f..e2c464c99 100644
--- a/inst/include/boost/mp11/detail/mp_fold.hpp
+++ b/inst/include/boost/mp11/detail/mp_fold.hpp
@@ -10,6 +10,8 @@
 
 #include <boost/mp11/detail/config.hpp>
 #include <boost/mp11/detail/mp_defer.hpp>
+#include <boost/mp11/detail/mp_rename.hpp>
+#include <boost/mp11/detail/mp_list.hpp>
 
 namespace boost
 {
@@ -155,7 +157,7 @@ struct mp_fold_impl<L<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T...>, V, F>
 
 } // namespace detail
 
-template<class L, class V, template<class...> class F> using mp_fold = typename detail::mp_fold_impl<L, V, F>::type;
+template<class L, class V, template<class...> class F> using mp_fold = typename detail::mp_fold_impl<mp_rename<L, mp_list>, V, F>::type;
 template<class L, class V, class Q> using mp_fold_q = mp_fold<L, V, Q::template fn>;
 
 } // namespace mp11
diff --git a/inst/include/boost/mp11/integer_sequence.hpp b/inst/include/boost/mp11/integer_sequence.hpp
index 83e24501b..013991fa5 100644
--- a/inst/include/boost/mp11/integer_sequence.hpp
+++ b/inst/include/boost/mp11/integer_sequence.hpp
@@ -11,6 +11,11 @@
 #include <boost/mp11/version.hpp>
 #include <cstddef>
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 #if defined(__has_builtin)
 # if __has_builtin(__make_integer_seq)
 #  define BOOST_MP11_HAS_MAKE_INTEGER_SEQ
@@ -109,4 +114,8 @@ template<class... T> using index_sequence_for = make_integer_sequence<std::size_
 } // namespace mp11
 } // namespace boost
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #endif // #ifndef BOOST_MP11_INTEGER_SEQUENCE_HPP_INCLUDED
diff --git a/inst/include/boost/mp11/integral.hpp b/inst/include/boost/mp11/integral.hpp
index 1b4fea3e2..4848ac80e 100644
--- a/inst/include/boost/mp11/integral.hpp
+++ b/inst/include/boost/mp11/integral.hpp
@@ -13,6 +13,11 @@
 #include <type_traits>
 #include <cstddef>
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 namespace boost
 {
 namespace mp11
@@ -39,4 +44,8 @@ template<std::size_t N> using mp_size_t = std::integral_constant<std::size_t, N>
 } // namespace mp11
 } // namespace boost
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #endif // #ifndef BOOST_MP11_INTEGRAL_HPP_INCLUDED
diff --git a/inst/include/boost/mp11/lambda.hpp b/inst/include/boost/mp11/lambda.hpp
new file mode 100644
index 000000000..3d027c2a6
--- /dev/null
+++ b/inst/include/boost/mp11/lambda.hpp
@@ -0,0 +1,199 @@
+#ifndef BOOST_MP11_LAMBDA_HPP_INCLUDED
+#define BOOST_MP11_LAMBDA_HPP_INCLUDED
+
+//  Copyright 2024 Joaquin M Lopez Munoz.
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//
+//  See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/mp11/detail/config.hpp>
+
+#if BOOST_MP11_WORKAROUND(BOOST_MP11_MSVC, <= 1800)
+
+// mp_lambda not supported due to compiler limitations
+
+#else
+
+#include <boost/mp11/bind.hpp>
+#include <cstddef>
+#include <type_traits>
+
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
+namespace boost
+{
+namespace mp11
+{
+namespace detail
+{
+
+template<class T> struct lambda_impl;
+
+} // namespace detail
+
+// mp_lambda
+template<class T> using mp_lambda = typename detail::lambda_impl<T>::type;
+
+namespace detail
+{
+
+// base case (no placeholder replacement)
+template<class T> struct lambda_impl
+{
+    template<class... U> using make = T;
+    using type = mp_bind<make>;
+};
+
+// placeholders (behave directly as mp_bind expressions)
+template<std::size_t I> struct lambda_impl<mp_arg<I>>
+{
+    using type = mp_arg<I>;
+};
+
+#define BOOST_MP11_SPECIALIZE_LAMBDA_IMPL(name, compound_type) \
+template<class T> using lambda_make_##name = compound_type;    \
+                                                               \
+template<class T> struct lambda_impl<compound_type>            \
+{                                                              \
+    using type = mp_bind<lambda_make_##name, mp_lambda<T>>;    \
+};
+
+// [basic.type.qualifier]
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL(const, const T)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL(volatile, volatile T)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL(const_volatile, const volatile T)
+
+// [dcl.ptr]
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL(pointer, T*)
+
+// [dcl.ref]
+// GCC < 7 fails with template<class U> using make = U&;
+template<class T> struct lambda_impl<T&>
+{
+    template<class U> using make = typename std::add_lvalue_reference<U>::type;
+    using type = mp_bind<make, mp_lambda<T>>;
+};
+
+template<class T> struct lambda_impl<T&&>
+{
+    template<class U> using make = typename std::add_rvalue_reference<U>::type;
+    using type = mp_bind<make, mp_lambda<T>>;
+};
+
+// [dcl.array]
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL(array, T[])
+
+#undef BOOST_MP11_SPECIALIZE_LAMBDA_IMPL
+
+template<class T, std::size_t N> struct lambda_impl<T[N]>
+{
+    template<class Q> using make = Q[N];
+    using type = mp_bind<make, mp_lambda<T>>;
+};
+
+// [dcl.fct], [dcl.mptr] (member functions)
+#define BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(name, qualifier)                 \
+template<class R, class... T> using lambda_make_fct_##name = R(T...) qualifier;          \
+                                                                                         \
+template<class R, class... T> struct lambda_impl<R(T...) qualifier>                      \
+{                                                                                        \
+    using type =  mp_bind<                                                               \
+        lambda_make_fct_##name,                                                          \
+        mp_lambda<R>, mp_lambda<T>...>;                                                  \
+};                                                                                       \
+                                                                                         \
+template<class R, class... T> using lambda_make_fct_##name##_ellipsis =                  \
+    R(T..., ...) qualifier;                                                              \
+                                                                                         \
+template<class R, class... T> struct lambda_impl<R(T..., ...) qualifier>                 \
+{                                                                                        \
+    using type = mp_bind<                                                                \
+        lambda_make_fct_##name##_ellipsis,                                               \
+        mp_lambda<R>, mp_lambda<T>...>;                                                  \
+};                                                                                       \
+                                                                                         \
+template<class R, class C, class... T> using lambda_make_mfptr_##name =                  \
+    R (C::*)(T...) qualifier;                                                            \
+                                                                                         \
+template<class R, class C, class... T> struct lambda_impl<R (C::*)(T...) qualifier>      \
+{                                                                                        \
+    using type = mp_bind<                                                                \
+        lambda_make_mfptr_##name,                                                        \
+        mp_lambda<R>, mp_lambda<C>, mp_lambda<T>...>;                                    \
+};                                                                                       \
+                                                                                         \
+template<class R, class C, class... T> using lambda_make_mfptr_##name##_ellipsis =       \
+    R (C::*)(T..., ...) qualifier;                                                       \
+                                                                                         \
+template<class R, class C, class... T> struct lambda_impl<R (C::*)(T..., ...) qualifier> \
+{                                                                                        \
+    using type = mp_bind<                                                                \
+        lambda_make_mfptr_##name##_ellipsis,                                             \
+        mp_lambda<R>, mp_lambda<C>, mp_lambda<T>...>;                                    \
+};
+
+#define BOOST_MP11_LAMBDA_EMPTY()
+
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(no_qualifier, BOOST_MP11_LAMBDA_EMPTY())
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const, const)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(volatile, volatile)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_volatile, const volatile)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(ref, &)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_ref, const&)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(volatile_ref, volatile&)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_volatile_ref, const volatile&)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(rvalue_ref, &&)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_rvalue_ref, const&&)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(volatile_rvalue_ref, volatile&&)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_volatile_rvalue_ref, const volatile&&)
+
+#if (defined(_MSVC_LANG) &&  _MSVC_LANG >= 201703L) || __cplusplus >= 201703L
+
+// P0012R1: exception specification as part of the type system
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(noexcept, noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_noexcept, const noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(volatile_noexcept, volatile noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_volatile_noexcept, const volatile noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(ref_noexcept, & noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_ref_noexcept, const& noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(volatile_ref_noexcept, volatile& noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_volatile_ref_noexcept, const volatile& noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(rvalue_ref_noexcept, && noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_rvalue_ref_noexcept, const&& noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(volatile_rvalue_ref_noexcept, volatile&& noexcept)
+BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR(const_volatile_rvalue_ref_noexcept, const volatile&& noexcept)
+
+#endif // P0012R1
+
+#undef BOOST_MP11_LAMBDA_EMPTY
+#undef BOOST_MP11_SPECIALIZE_LAMBDA_IMPL_FCT_AND_MFPTR
+
+// [dcl.mptr] (data members)
+template<class T, class C> struct lambda_impl<T C::*>
+{
+    template<class U, class D> using make = U D::*;
+    using type = mp_bind<make, mp_lambda<T>, mp_lambda<C>>;
+};
+
+// template class instantiation
+template<template <class...> class C, class... Ts> struct lambda_impl<C<Ts...>>
+{
+    using type = mp_bind<C, mp_lambda<Ts>...>;
+};
+
+} // namespace detail
+} // namespace mp11
+} // namespace boost
+
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
+#endif // mp_lambda supported
+
+#endif // #ifndef BOOST_MP11_LAMBDA_HPP_INCLUDED
diff --git a/inst/include/boost/mp11/list.hpp b/inst/include/boost/mp11/list.hpp
index 364676445..46b560536 100644
--- a/inst/include/boost/mp11/list.hpp
+++ b/inst/include/boost/mp11/list.hpp
@@ -19,6 +19,11 @@
 #include <boost/mp11/detail/config.hpp>
 #include <type_traits>
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma push_macro( "I" )
+# undef I
+#endif
+
 namespace boost
 {
 namespace mp11
@@ -469,4 +474,8 @@ template<class L, class Q> using mp_transform_third_q = mp_transform_third<L, Q:
 } // namespace mp11
 } // namespace boost
 
+#if defined(_MSC_VER) || defined(__GNUC__)
+# pragma pop_macro( "I" )
+#endif
+
 #endif // #ifndef BOOST_MP11_LIST_HPP_INCLUDED
diff --git a/inst/include/boost/mp11/version.hpp b/inst/include/boost/mp11/version.hpp
index ab5e09c39..381068358 100644
--- a/inst/include/boost/mp11/version.hpp
+++ b/inst/include/boost/mp11/version.hpp
@@ -11,6 +11,6 @@
 // Same format as BOOST_VERSION:
 //   major * 100000 + minor * 100 + patch
 
-#define BOOST_MP11_VERSION 108400
+#define BOOST_MP11_VERSION 108700
 
 #endif // #ifndef BOOST_MP11_VERSION_HPP_INCLUDED
diff --git a/inst/include/boost/mpi/config.hpp b/inst/include/boost/mpi/config.hpp
index 94625ad37..a22649a48 100644
--- a/inst/include/boost/mpi/config.hpp
+++ b/inst/include/boost/mpi/config.hpp
@@ -13,11 +13,16 @@
 #ifndef BOOST_MPI_CONFIG_HPP
 #define BOOST_MPI_CONFIG_HPP
 
+#if !defined(MPICH_IGNORE_CXX_SEEK)
 /* Force MPICH not to define SEEK_SET, SEEK_CUR, and SEEK_END, which
    conflict with the versions in <stdio.h> and <cstdio>. */
-#define MPICH_IGNORE_CXX_SEEK 1
+# define MPICH_IGNORE_CXX_SEEK 1
+#endif
+
+#if !defined(OMPI_SKIP_MPICXX)
 /* We do not want to link in the OpenMPI CXX stuff */
-#define OMPI_SKIP_MPICXX
+# define OMPI_SKIP_MPICXX
+#endif
 
 #include <mpi.h>
 #include <boost/config.hpp>
diff --git a/inst/include/boost/mpl/aux_/integral_wrapper.hpp b/inst/include/boost/mpl/aux_/integral_wrapper.hpp
index 8748fbb93..5f24b7949 100644
--- a/inst/include/boost/mpl/aux_/integral_wrapper.hpp
+++ b/inst/include/boost/mpl/aux_/integral_wrapper.hpp
@@ -56,7 +56,8 @@ struct AUX_WRAPPER_NAME
 // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
 // while some other don't like 'value + 1' (Borland), and some don't like
 // either
-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) \
+    || __cplusplus >= 201103L
  private:
     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/inst/include/boost/multi_index/detail/safe_mode.hpp b/inst/include/boost/multi_index/detail/safe_mode.hpp
index b3fed3dcc..08de2f4ff 100644
--- a/inst/include/boost/multi_index/detail/safe_mode.hpp
+++ b/inst/include/boost/multi_index/detail/safe_mode.hpp
@@ -119,7 +119,7 @@
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <algorithm>
 #include <boost/core/addressof.hpp>
-  #include <boost/core/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <boost/multi_index/detail/access_specifier.hpp>
 #include <boost/multi_index/detail/any_container_view.hpp>
 #include <boost/multi_index/detail/iter_adaptor.hpp>
@@ -131,7 +131,7 @@
 #endif
 
 #if defined(BOOST_HAS_THREADS)
-#include <boost/detail/lightweight_mutex.hpp>
+#include <boost/smart_ptr/detail/lightweight_mutex.hpp>
 #include <boost/multi_index/detail/scoped_bilock.hpp>
 #endif
 
diff --git a/inst/include/boost/multiprecision/complex_adaptor.hpp b/inst/include/boost/multiprecision/complex_adaptor.hpp
index 2956e32e2..d5edd917f 100644
--- a/inst/include/boost/multiprecision/complex_adaptor.hpp
+++ b/inst/include/boost/multiprecision/complex_adaptor.hpp
@@ -192,6 +192,56 @@ struct complex_adaptor
       m_real.negate();
       m_imag.negate();
    }
+
+   //
+   // Default precision:
+   //
+   static BOOST_MP_CXX14_CONSTEXPR unsigned default_precision() noexcept
+   {
+      return Backend::default_precision();
+   }
+   static BOOST_MP_CXX14_CONSTEXPR void default_precision(unsigned digits10)
+   {
+      Backend::default_precision(digits10);
+      Backend::thread_default_precision(digits10);
+   }
+   static BOOST_MP_CXX14_CONSTEXPR unsigned thread_default_precision() noexcept
+   {
+      return Backend::thread_default_precision();
+   }
+   static BOOST_MP_CXX14_CONSTEXPR void thread_default_precision(unsigned digits10)
+   {
+      Backend::thread_default_precision(digits10);
+   }
+   BOOST_MP_CXX14_CONSTEXPR unsigned precision() const noexcept
+   {
+      return m_real.precision();
+   }
+   BOOST_MP_CXX14_CONSTEXPR void precision(unsigned digits10)
+   {
+      m_real.precision(digits10);
+      m_imag.precision(digits10);
+   }
+   //
+   // Variable precision options:
+   // 
+   static constexpr variable_precision_options default_variable_precision_options()noexcept
+   {
+      return Backend::default_variable_precision_options();
+   }
+   static constexpr variable_precision_options thread_default_variable_precision_options()noexcept
+   {
+      return Backend::thread_default_variable_precision_options();
+   }
+   static BOOST_MP_CXX14_CONSTEXPR void default_variable_precision_options(variable_precision_options opts)
+   {
+      Backend::default_variable_precision_options(opts);
+      Backend::thread_default_variable_precision_options(opts);
+   }
+   static BOOST_MP_CXX14_CONSTEXPR void thread_default_variable_precision_options(variable_precision_options opts)
+   {
+      Backend::thread_default_variable_precision_options(opts);
+   }
 };
 
 template <class Backend, class T>
diff --git a/inst/include/boost/multiprecision/cpp_bin_float.hpp b/inst/include/boost/multiprecision/cpp_bin_float.hpp
index 82ac4afe7..4d873b4be 100644
--- a/inst/include/boost/multiprecision/cpp_bin_float.hpp
+++ b/inst/include/boost/multiprecision/cpp_bin_float.hpp
@@ -37,7 +37,10 @@
 #endif
 
 #ifdef BOOST_HAS_FLOAT128
-#include <quadmath.h>
+#  if __has_include(<quadmath.h>)
+#    include <quadmath.h>
+#    define BOOST_MP_HAS_FLOAT128_SUPPORT
+#  endif
 #endif
 
 namespace boost {
@@ -66,7 +69,7 @@ template <class Float, std::ptrdiff_t bit_count>
 struct is_cpp_bin_float_implicitly_constructible_from_type<Float, bit_count, true>
 {
    static constexpr bool value = (std::numeric_limits<Float>::digits <= static_cast<int>(bit_count)) && (std::numeric_limits<Float>::radix == 2) && std::numeric_limits<Float>::is_specialized
-#ifdef BOOST_HAS_FLOAT128
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
                              && !std::is_same<Float, float128_type>::value
 #endif
                              && (std::is_floating_point<Float>::value || is_number<Float>::value);
@@ -82,7 +85,7 @@ template <class Float, std::ptrdiff_t bit_count>
 struct is_cpp_bin_float_explicitly_constructible_from_type<Float, bit_count, true>
 {
    static constexpr bool value = (std::numeric_limits<Float>::digits > static_cast<int>(bit_count)) && (std::numeric_limits<Float>::radix == 2) && std::numeric_limits<Float>::is_specialized
-#ifdef BOOST_HAS_FLOAT128
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
                              && !std::is_same<Float, float128_type>::value
 #endif
        ;
@@ -167,7 +170,7 @@ class cpp_bin_float
    {
       this->assign_float(f);
    }
-#ifdef BOOST_HAS_FLOAT128
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
    template <class Float>
    cpp_bin_float(const Float& f,
                  typename std::enable_if<
@@ -277,7 +280,7 @@ class cpp_bin_float
       }
       return *this;
    }
-#ifdef BOOST_HAS_FLOAT128
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
    template <class Float>
    typename std::enable_if<
        (number_category<Float>::value == number_kind_floating_point)
@@ -298,9 +301,15 @@ class cpp_bin_float
       return assign_float(f);
    }
 
-#ifdef BOOST_HAS_FLOAT128
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
    template <class Float>
-   typename std::enable_if<std::is_same<Float, float128_type>::value, cpp_bin_float&>::type assign_float(Float f)
+   typename std::enable_if<std::is_same<Float, float128_type>::value && (std::numeric_limits<Float>::digits > Digits), cpp_bin_float&>::type assign_float(Float f)
+   {
+      cpp_bin_float<113, DigitBase, Allocator, Exponent, MinExponent, MaxExponent> bf(f);
+      return *this = bf;
+   }
+   template <class Float>
+   typename std::enable_if<std::is_same<Float, float128_type>::value && (std::numeric_limits<Float>::digits <= Digits), cpp_bin_float&>::type assign_float(Float f)
    {
       using default_ops::eval_add;
       using bf_int_type = typename boost::multiprecision::detail::canonical<int, cpp_bin_float>::type;
@@ -337,7 +346,7 @@ class cpp_bin_float
       m_sign     = false;
       m_exponent = 0;
 
-      constexpr std::ptrdiff_t bits = sizeof(int) * CHAR_BIT - 1;
+      constexpr std::ptrdiff_t bits = sizeof(int) * CHAR_BIT - 1 < MaxExponent - 1 ? sizeof(int) * CHAR_BIT - 1 : 3;
       int              e;
       f = frexpq(f, &e);
       while (f)
@@ -352,15 +361,36 @@ class cpp_bin_float
          eval_add(*this, t);
       }
       m_exponent += static_cast<Exponent>(e);
+      if (m_exponent > max_exponent)
+      {
+          m_exponent = exponent_infinity;
+          m_data = static_cast<ui_type>(0u);
+      }
+      else if (m_exponent < min_exponent)
+      {
+          m_exponent = exponent_zero;
+          m_data = static_cast<ui_type>(0u);
+      }
       return *this;
    }
 #endif
-#ifdef BOOST_HAS_FLOAT128
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
+   template <class Float>
+   typename std::enable_if<std::is_floating_point<Float>::value && !std::is_same<Float, float128_type>::value && (std::numeric_limits<Float>::digits > Digits), cpp_bin_float&>::type assign_float(Float f)
+#else
+   template <class Float>
+   typename std::enable_if<std::is_floating_point<Float>::value && (std::numeric_limits<Float>::digits > Digits), cpp_bin_float&>::type assign_float(Float f)
+#endif
+   {
+      cpp_bin_float<std::numeric_limits<Float>::digits, DigitBase, Allocator, Exponent, MinExponent, MaxExponent> bf(f);
+      return *this = bf;
+   }
+#ifdef BOOST_MP_HAS_FLOAT128_SUPPORT
    template <class Float>
-   typename std::enable_if<std::is_floating_point<Float>::value && !std::is_same<Float, float128_type>::value, cpp_bin_float&>::type assign_float(Float f)
+   typename std::enable_if<std::is_floating_point<Float>::value && !std::is_same<Float, float128_type>::value && (std::numeric_limits<Float>::digits <= Digits), cpp_bin_float&>::type assign_float(Float f)
 #else
    template <class Float>
-   typename std::enable_if<std::is_floating_point<Float>::value, cpp_bin_float&>::type assign_float(Float f)
+   typename std::enable_if<std::is_floating_point<Float>::value && (std::numeric_limits<Float>::digits <= Digits), cpp_bin_float&>::type assign_float(Float f)
 #endif
    {
       using std::frexp;
@@ -399,7 +429,13 @@ class cpp_bin_float
       m_sign     = false;
       m_exponent = 0;
 
-      constexpr std::ptrdiff_t bits = sizeof(int) * CHAR_BIT - 1;
+      //
+      // This code picks off the bits in f a few at a time and injects them into *this.
+      // It does not do roundingm so we must have more digits precision in *this than
+      // in the floating point value (the normal situation, unless we're emulating another 
+      // type like float16_t).
+      //
+      constexpr std::ptrdiff_t bits = static_cast<std::ptrdiff_t>(sizeof(int) * CHAR_BIT - 1) < static_cast<std::ptrdiff_t>(MaxExponent - 1) ? static_cast<std::ptrdiff_t>(sizeof(int) * CHAR_BIT - 1) : 3;
       int e;
       f = frexp(f, &e);
       while (f != static_cast<Float>(0.0F))
@@ -414,6 +450,16 @@ class cpp_bin_float
          eval_add(*this, t);
       }
       m_exponent += static_cast<Exponent>(e);
+      if (m_exponent > max_exponent)
+      {
+          m_exponent = exponent_infinity;
+          m_data = static_cast<ui_type>(0u);
+      }
+      else if(m_exponent < min_exponent)
+      {
+          m_exponent = exponent_zero;
+          m_data = static_cast<ui_type>(0u);
+      }
       return *this;
    }
 
@@ -514,7 +560,12 @@ class cpp_bin_float
          using ar_type = typename boost::multiprecision::detail::canonical<ui_type, rep_type>::type;
          m_data         = static_cast<ar_type>(fi);
          std::size_t shift = msb(fi);
-         if (shift >= bit_count)
+         if (shift > max_exponent)
+         {
+             m_exponent = exponent_infinity;
+             m_data = static_cast<limb_type>(0);
+         }
+         else if (shift >= bit_count)
          {
             m_exponent = static_cast<Exponent>(shift);
             m_data     = static_cast<ar_type>(fi >> (shift + 1 - bit_count));
@@ -524,7 +575,7 @@ class cpp_bin_float
             m_exponent = static_cast<Exponent>(shift);
             eval_left_shift(m_data, bit_count - shift - 1);
          }
-         BOOST_MP_ASSERT(eval_bit_test(m_data, bit_count - 1));
+         BOOST_MP_ASSERT((m_exponent == exponent_infinity) || eval_bit_test(m_data, bit_count - 1));
          m_sign = detail::is_negative(i);
       }
       return *this;
@@ -1281,7 +1332,7 @@ inline void eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, Mi
 
 template <unsigned Digits, digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE,
    class Allocator2, class Exponent2, Exponent MinE2, Exponent MaxE2, class U>
-inline typename std::enable_if<boost::multiprecision::detail::is_unsigned<U>::value>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res, 
+inline typename std::enable_if<boost::multiprecision::detail::is_unsigned<U>::value && (std::numeric_limits<U>::digits <= Digits)>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res,
    const cpp_bin_float<Digits, DigitBase, Allocator2, Exponent2, MinE2, MaxE2>& u, const U& v)
 {
 #ifdef BOOST_MSVC
@@ -1396,14 +1447,14 @@ inline typename std::enable_if<boost::multiprecision::detail::is_unsigned<U>::va
 }
 
 template <unsigned Digits, digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE, class U>
-inline typename std::enable_if<boost::multiprecision::detail::is_unsigned<U>::value>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res, const U& v)
+inline typename std::enable_if<boost::multiprecision::detail::is_unsigned<U>::value && (std::numeric_limits<U>::digits <= Digits)>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res, const U& v)
 {
    eval_divide(res, res, v);
 }
 
 template <unsigned Digits, digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE,
    class Allocator2, class Exponent2, Exponent MinE2, Exponent MaxE2, class S>
-inline typename std::enable_if<boost::multiprecision::detail::is_signed<S>::value && boost::multiprecision::detail::is_integral<S>::value>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res, 
+inline typename std::enable_if<boost::multiprecision::detail::is_signed<S>::value && boost::multiprecision::detail::is_integral<S>::value && (std::numeric_limits<S>::digits <= Digits)>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res,
    const cpp_bin_float<Digits, DigitBase, Allocator2, Exponent2, MinE2, MaxE2>& u, const S& v)
 {
    using ui_type = typename boost::multiprecision::detail::make_unsigned<S>::type;
@@ -1413,7 +1464,7 @@ inline typename std::enable_if<boost::multiprecision::detail::is_signed<S>::valu
 }
 
 template <unsigned Digits, digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE, class S>
-inline typename std::enable_if<boost::multiprecision::detail::is_signed<S>::value && boost::multiprecision::detail::is_integral<S>::value>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res, const S& v)
+inline typename std::enable_if<boost::multiprecision::detail::is_signed<S>::value && boost::multiprecision::detail::is_integral<S>::value && (std::numeric_limits<S>::digits <= Digits)>::type eval_divide(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>& res, const S& v)
 {
    eval_divide(res, res, v);
 }
@@ -1658,7 +1709,7 @@ inline typename std::enable_if<std::is_floating_point<Float>::value>::type eval_
    //
    // Perform rounding first, then afterwards extract the digits:
    //
-   cpp_bin_float<static_cast<unsigned>(float_digits), digit_base_2, Allocator, Exponent, MinE, MaxE>           arg;
+   cpp_bin_float<static_cast<unsigned>(float_digits), digit_base_2, Allocator, Exponent, 0, 0> arg;
    typename cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::rep_type bits(original_arg.bits());
    arg.exponent() = original_arg.exponent();
    copy_and_round(arg, bits, (std::ptrdiff_t)digits_to_round_to);
@@ -2154,7 +2205,14 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_bi
    static constexpr bool                                                                                                             has_infinity      = true;
    static constexpr bool                                                                                                             has_quiet_NaN     = true;
    static constexpr bool                                                                                                             has_signaling_NaN = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
    static constexpr float_denorm_style has_denorm                                                                                                      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
    static constexpr bool               has_denorm_loss                                                                                                 = false;
    static number_type infinity()
    {
@@ -2209,8 +2267,15 @@ template <unsigned Digits, boost::multiprecision::backends::digit_base_type Digi
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>, ExpressionTemplates> >::has_quiet_NaN;
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>, ExpressionTemplates> >::has_denorm_loss;
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinE, Exponent MaxE, boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/cpp_dec_float.hpp b/inst/include/boost/multiprecision/cpp_dec_float.hpp
index 17a73559b..6270556c0 100644
--- a/inst/include/boost/multiprecision/cpp_dec_float.hpp
+++ b/inst/include/boost/multiprecision/cpp_dec_float.hpp
@@ -635,8 +635,8 @@ class cpp_dec_float
       }
       else
       {
-         std::copy(result.cbegin() + 1,
-                   result.cbegin() + (std::min)(static_cast<std::int32_t>(prec_elems_for_multiply + 1), cpp_dec_float_elem_number),
+         std::copy(result.cbegin() + static_cast<std::ptrdiff_t>(1),
+                   result.cbegin() + static_cast<std::ptrdiff_t>(1 + (std::min)(prec_elems_for_multiply, cpp_dec_float_elem_number)),
                    data.begin());
       }
    }
@@ -673,8 +673,8 @@ class cpp_dec_float
          }
          else
          {
-            std::copy(result.cbegin() + 1,
-                      result.cbegin() + (std::min)(static_cast<std::int32_t>(prec_elems_for_multiply + 1), cpp_dec_float_elem_number),
+            std::copy(result.cbegin() + static_cast<std::ptrdiff_t>(1),
+                      result.cbegin() + static_cast<std::ptrdiff_t>(1 + (std::min)(prec_elems_for_multiply, cpp_dec_float_elem_number)),
                       data.begin());
          }
       }
@@ -719,8 +719,8 @@ class cpp_dec_float
          }
          else
          {
-            std::copy(result + 1,
-                      result + (std::min)(static_cast<std::int32_t>(prec_elems_for_multiply + 1), cpp_dec_float_elem_number),
+            std::copy(result + static_cast<std::ptrdiff_t>(1),
+                      result + static_cast<std::ptrdiff_t>(1 + (std::min)(prec_elems_for_multiply, cpp_dec_float_elem_number)),
                       data.begin());
          }
       }
@@ -3578,7 +3578,14 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_de
    static constexpr bool                    has_infinity      = true;
    static constexpr bool                    has_quiet_NaN     = true;
    static constexpr bool                    has_signaling_NaN = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
    static constexpr std::float_denorm_style has_denorm        = std::denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
    static constexpr bool                    has_denorm_loss   = false;
    static constexpr bool                    traps             = false;
    static constexpr bool                    tinyness_before   = false;
@@ -3622,8 +3629,15 @@ template <unsigned Digits10, class ExponentType, class Allocator, boost::multipr
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_dec_float<Digits10, ExponentType, Allocator>, ExpressionTemplates> >::has_quiet_NaN;
 template <unsigned Digits10, class ExponentType, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_dec_float<Digits10, ExponentType, Allocator>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <unsigned Digits10, class ExponentType, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_dec_float<Digits10, ExponentType, Allocator>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <unsigned Digits10, class ExponentType, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_dec_float<Digits10, ExponentType, Allocator>, ExpressionTemplates> >::has_denorm_loss;
 template <unsigned Digits10, class ExponentType, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/cpp_int.hpp b/inst/include/boost/multiprecision/cpp_int.hpp
index 0fed9522e..076a96a5f 100644
--- a/inst/include/boost/multiprecision/cpp_int.hpp
+++ b/inst/include/boost/multiprecision/cpp_int.hpp
@@ -844,10 +844,17 @@ struct cpp_int_base<MinBits, MinBits, unsigned_magnitude, Checked, void, false>
    BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR void normalize() noexcept((Checked == unchecked))
    {
       limb_pointer p = limbs();
-      detail::verify_limb_mask(m_limbs == internal_limb_count, p[internal_limb_count - 1], upper_limb_mask, checked_type());
+
+      limb_type c = p[internal_limb_count - 1];
+      bool full_limbs = m_limbs == internal_limb_count;
+
       p[internal_limb_count - 1] &= upper_limb_mask;
       while ((m_limbs - 1) && !p[m_limbs - 1])
          --m_limbs;
+      //
+      // Verification at the end, so that we're in a valid state if we throw:
+      //
+      detail::verify_limb_mask(full_limbs, c, upper_limb_mask, checked_type());
    }
 
    BOOST_MP_FORCEINLINE constexpr cpp_int_base() noexcept
@@ -1264,8 +1271,13 @@ struct cpp_int_base<MinBits, MinBits, unsigned_magnitude, Checked, void, true>
    }
    BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR void normalize() noexcept((Checked == unchecked))
    {
-      detail::verify_limb_mask(true, m_data, limb_mask, checked_type());
+      local_limb_type c = m_data;
       m_data &= limb_mask;
+      //
+      // Verification has to come afterwards, otherwise we can leave 
+      // ourselves in an invalid state:
+      //
+      detail::verify_limb_mask(true, c, limb_mask, checked_type());
    }
 
    BOOST_MP_FORCEINLINE constexpr cpp_int_base() noexcept : m_data(0) {}
diff --git a/inst/include/boost/multiprecision/cpp_int/divide.hpp b/inst/include/boost/multiprecision/cpp_int/divide.hpp
index 136facea4..50d8aa9f1 100644
--- a/inst/include/boost/multiprecision/cpp_int/divide.hpp
+++ b/inst/include/boost/multiprecision/cpp_int/divide.hpp
@@ -551,6 +551,10 @@ eval_modulus(
     const cpp_int_backend<MinBits2, MaxBits2, SignType2, Checked2, Allocator2>& a,
     const limb_type                                                             mod)
 {
+
+   if(mod == 0)
+     BOOST_MP_THROW_EXCEPTION(std::overflow_error("Division by zero."));
+
    const std::ptrdiff_t n = static_cast<std::ptrdiff_t>(a.size());
 
    const double_limb_type two_n_mod =
@@ -656,6 +660,44 @@ eval_modulus(
    result.sign(result.sign());
 }
 
+template <std::size_t MinBits1, std::size_t MaxBits1, cpp_integer_type SignType1, cpp_int_check_type Checked1, class Allocator1, class V>
+BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR typename std::enable_if<
+    is_trivial_cpp_int<cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1> >::value && std::is_unsigned<V>::value>::type
+eval_modulus(
+    cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& result,
+    const cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& a,
+    V o)
+{
+   using local_limb_type = typename cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>::local_limb_type;
+
+   BOOST_IF_CONSTEXPR(std::numeric_limits<V>::digits > MaxBits1)
+   {
+      if (o >= (static_cast<V>(1u) << MaxBits1))
+      {
+         // Modulus is larger than any value that the result can hold,
+         // so the result is just "a":
+         result = a;
+         return;
+      }
+   }
+   if (!o)
+      BOOST_MP_THROW_EXCEPTION(std::overflow_error("Division by zero."));
+   *result.limbs() = *a.limbs() % static_cast<local_limb_type>(o);
+   result.sign(a.sign());
+}
+
+template <std::size_t MinBits1, std::size_t MaxBits1, cpp_integer_type SignType1, cpp_int_check_type Checked1, class Allocator1, class V>
+BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR typename std::enable_if<
+    is_trivial_cpp_int<cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1> >::value && std::is_signed<V>::value>::type
+eval_modulus(
+    cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& result,
+    const cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& a,
+    V o)
+{
+   using unsigned_type = typename std::make_unsigned<V>::type;
+   eval_modulus(result, a, static_cast<unsigned_type>(o < 0 ? -o : o));
+}
+
 }}} // namespace boost::multiprecision::backends
 
 #endif
diff --git a/inst/include/boost/multiprecision/cpp_int/limits.hpp b/inst/include/boost/multiprecision/cpp_int/limits.hpp
index df80d02e7..fa29cc48b 100644
--- a/inst/include/boost/multiprecision/cpp_int/limits.hpp
+++ b/inst/include/boost/multiprecision/cpp_int/limits.hpp
@@ -200,7 +200,14 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_in
    static constexpr bool has_infinity                  = false;
    static constexpr bool has_quiet_NaN                 = false;
    static constexpr bool has_signaling_NaN             = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
    static constexpr float_denorm_style has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
    static constexpr bool               has_denorm_loss = false;
    static BOOST_CXX14_CONSTEXPR_IF_DETECTION number_type                        infinity() { return 0; }
    static BOOST_CXX14_CONSTEXPR_IF_DETECTION number_type                        quiet_NaN() { return 0; }
@@ -242,8 +249,15 @@ template <std::size_t MinBits, std::size_t MaxBits, boost::multiprecision::cpp_i
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_int_backend<MinBits, MaxBits, SignType, Checked, Allocator>, ExpressionTemplates> >::has_quiet_NaN;
 template <std::size_t MinBits, std::size_t MaxBits, boost::multiprecision::cpp_integer_type SignType, boost::multiprecision::cpp_int_check_type Checked, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_int_backend<MinBits, MaxBits, SignType, Checked, Allocator>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
 template <std::size_t MinBits, std::size_t MaxBits, boost::multiprecision::cpp_integer_type SignType, boost::multiprecision::cpp_int_check_type Checked, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_int_backend<MinBits, MaxBits, SignType, Checked, Allocator>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <std::size_t MinBits, std::size_t MaxBits, boost::multiprecision::cpp_integer_type SignType, boost::multiprecision::cpp_int_check_type Checked, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::cpp_int_backend<MinBits, MaxBits, SignType, Checked, Allocator>, ExpressionTemplates> >::has_denorm_loss;
 template <std::size_t MinBits, std::size_t MaxBits, boost::multiprecision::cpp_integer_type SignType, boost::multiprecision::cpp_int_check_type Checked, class Allocator, boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/cpp_int/misc.hpp b/inst/include/boost/multiprecision/cpp_int/misc.hpp
index 58265a925..5cc32f587 100644
--- a/inst/include/boost/multiprecision/cpp_int/misc.hpp
+++ b/inst/include/boost/multiprecision/cpp_int/misc.hpp
@@ -184,7 +184,9 @@ eval_convert_to(R* result, const cpp_int_backend<MinBits1, MaxBits1, SignType1,
 
 template <class R, std::size_t MinBits1, std::size_t MaxBits1, cpp_integer_type SignType1, cpp_int_check_type Checked1, class Allocator1>
 inline BOOST_MP_CXX14_CONSTEXPR typename std::enable_if<std::is_floating_point<R>::value && !is_trivial_cpp_int<cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1> >::value, void>::type
-eval_convert_to(R* result, const cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& backend) noexcept(boost::multiprecision::detail::is_arithmetic<R>::value && std::numeric_limits<R>::has_infinity)
+eval_convert_to(R* result, const cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& backend) noexcept(boost::multiprecision::detail::is_arithmetic<R>::value &&
+                                                                                                                         (std::numeric_limits<R>::has_infinity ||
+                                                                                                                          std::numeric_limits<R>::has_quiet_NaN))
 {
    BOOST_MP_FLOAT128_USING using std::ldexp;
    if (eval_is_zero(backend))
@@ -244,10 +246,11 @@ eval_convert_to(R* result, const cpp_int_backend<MinBits1, MaxBits1, SignType1,
          if ((eval_lsb_imp(backend) < static_cast<std::size_t>(bits)) || eval_bit_test(backend, static_cast<std::size_t>(bits + 1)))
          {
             #ifdef BOOST_MP_MATH_AVAILABLE
-            BOOST_IF_CONSTEXPR(std::numeric_limits<R>::has_infinity)
+            BOOST_IF_CONSTEXPR(std::numeric_limits<R>::has_infinity || std::numeric_limits<R>::has_quiet_NaN)
             {
                // Must NOT throw:
-               *result = boost::math::float_next(*result, boost::math::policies::make_policy(boost::math::policies::overflow_error<boost::math::policies::ignore_error>()));
+               *result = boost::math::float_next(*result, boost::math::policies::make_policy(boost::math::policies::overflow_error<boost::math::policies::ignore_error>(),
+                                                                                             boost::math::policies::domain_error<boost::math::policies::ignore_error>()));
             }
             else
             {
diff --git a/inst/include/boost/multiprecision/detail/default_ops.hpp b/inst/include/boost/multiprecision/detail/default_ops.hpp
index 6a2cc98be..bd0240aba 100644
--- a/inst/include/boost/multiprecision/detail/default_ops.hpp
+++ b/inst/include/boost/multiprecision/detail/default_ops.hpp
@@ -1295,6 +1295,30 @@ inline BOOST_MP_CXX14_CONSTEXPR void eval_fmod(T& result, const T& a, const T& b
       eval_floor(n, result);
    eval_multiply(n, b);
    eval_subtract(result, a, n);
+   if (eval_get_sign(result) != 0)
+   {
+      //
+      // Sanity check, that due to rounding errors in division, 
+      // we haven't accidently calculated the wrong value:
+      // See https://github.com/boostorg/multiprecision/issues/604 for an example.
+      //
+      if (eval_get_sign(result) == eval_get_sign(b))
+      {
+         if (result.compare(b) >= 0)
+         {
+            eval_subtract(result, b);
+         }
+      }
+      else
+      {
+         n = b;
+         n.negate();
+         if (result.compare(n) >= 0)
+         {
+            eval_subtract(result, n);
+         }
+      }
+   }
 }
 template <class T, class A>
 inline BOOST_MP_CXX14_CONSTEXPR typename std::enable_if<boost::multiprecision::detail::is_arithmetic<A>::value, void>::type eval_fmod(T& result, const T& x, const A& a)
@@ -2462,7 +2486,7 @@ void raise_rounding_error(T1, T2, T3, T4, T5)
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
 void raise_overflow_error(T1, T2, T3, T4, T5)
 {
-   BOOST_MP_THROW_EXCEPTION(std::runtime_error("Overflow error"));
+   BOOST_MP_THROW_EXCEPTION(std::overflow_error("Overflow error"));
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
@@ -2471,6 +2495,12 @@ void raise_evaluation_error(T1, T2, T3, T4, T5)
    BOOST_MP_THROW_EXCEPTION(std::runtime_error("Evaluation error"));
 }
 
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+void raise_domain_error(T1, T2, T3, T4, T5)
+{
+   BOOST_MP_THROW_EXCEPTION(std::domain_error("Domain error"));
+}
+
 template <typename T, typename... Args>
 struct is_policy
 {
@@ -3950,41 +3980,46 @@ ilogb(const detail::expression<tag, A1, A2, A3, A4>& val)
 } //namespace multiprecision
 
 namespace math {
+
+
 //
 // Overload of Boost.Math functions that find the wrong overload when used with number:
 //
 namespace detail {
+
 template <class T>
 T sinc_pi_imp(T);
-template <class T>
-T sinhc_pi_imp(T);
+template <class T, class Policy>
+T sinhc_pi_imp(T, const Policy&);
+
 } // namespace detail
+
 template <class Backend, multiprecision::expression_template_option ExpressionTemplates>
 inline multiprecision::number<Backend, ExpressionTemplates> sinc_pi(const multiprecision::number<Backend, ExpressionTemplates>& x)
 {
    boost::multiprecision::detail::scoped_default_precision<multiprecision::number<Backend, ExpressionTemplates> > precision_guard(x);
-   return std::move(detail::sinc_pi_imp(x));
+   return detail::sinc_pi_imp(x);
 }
 
 template <class Backend, multiprecision::expression_template_option ExpressionTemplates, class Policy>
 inline multiprecision::number<Backend, ExpressionTemplates> sinc_pi(const multiprecision::number<Backend, ExpressionTemplates>& x, const Policy&)
 {
    boost::multiprecision::detail::scoped_default_precision<multiprecision::number<Backend, ExpressionTemplates> > precision_guard(x);
-   return std::move(detail::sinc_pi_imp(x));
+   return detail::sinc_pi_imp(x);
 }
 
 template <class Backend, multiprecision::expression_template_option ExpressionTemplates>
 inline multiprecision::number<Backend, ExpressionTemplates> sinhc_pi(const multiprecision::number<Backend, ExpressionTemplates>& x)
 {
    boost::multiprecision::detail::scoped_default_precision<multiprecision::number<Backend, ExpressionTemplates> > precision_guard(x);
-   return std::move(detail::sinhc_pi_imp(x));
+   return detail::sinhc_pi_imp(x, boost::math::policies::policy<>());
 }
 
 template <class Backend, multiprecision::expression_template_option ExpressionTemplates, class Policy>
-inline multiprecision::number<Backend, ExpressionTemplates> sinhc_pi(const multiprecision::number<Backend, ExpressionTemplates>& x, const Policy&)
+inline multiprecision::number<Backend, ExpressionTemplates> sinhc_pi(const multiprecision::number<Backend, ExpressionTemplates>& x, const Policy& pol)
 {
-   boost::multiprecision::detail::scoped_default_precision<multiprecision::number<Backend, ExpressionTemplates> > precision_guard(x);
-   return std::move(boost::math::sinhc_pi(x));
+   boost::multiprecision::detail::scoped_default_precision<multiprecision::number<Backend, ExpressionTemplates> > precision_guard(x, pol);
+   return detail::sinhc_pi_imp(x, pol);
 }
 
 using boost::multiprecision::gcd;
diff --git a/inst/include/boost/multiprecision/detail/functions/trunc.hpp b/inst/include/boost/multiprecision/detail/functions/trunc.hpp
index 84e2444ae..28b6e6fb6 100644
--- a/inst/include/boost/multiprecision/detail/functions/trunc.hpp
+++ b/inst/include/boost/multiprecision/detail/functions/trunc.hpp
@@ -23,12 +23,16 @@ namespace impl {
 template <typename T>
 inline T trunc BOOST_PREVENT_MACRO_SUBSTITUTION (const T arg)
 {
-    using std::floor;
-    using std::ceil;
+    if (arg > 0)
+    {
+       using std::floor;
 
-    return (arg > 0) ? floor(arg) : ceil(arg);
-}
+       return floor(arg);
+    }
+
+    using std::ceil;
 
+    return ceil(arg);}
 } // namespace impl
 
 #ifdef BOOST_MP_MATH_AVAILABLE
diff --git a/inst/include/boost/multiprecision/detail/min_max.hpp b/inst/include/boost/multiprecision/detail/min_max.hpp
index 8a78c612b..835ed8a61 100644
--- a/inst/include/boost/multiprecision/detail/min_max.hpp
+++ b/inst/include/boost/multiprecision/detail/min_max.hpp
@@ -36,14 +36,14 @@ inline typename std::enable_if<boost::multiprecision::detail::is_backend<Backend
    number<Backend, et_on> t(b);
    if (a < t)
       return a;
-   return std::move(t);
+   return t;
 }
 template <class tag, class A1, class A2, class A3, class A4, class Backend>
 inline typename std::enable_if<boost::multiprecision::detail::is_backend<Backend>::value, const number<Backend, et_on> >::type(min)(const detail::expression<tag, A1, A2, A3, A4>& a, const number<Backend, et_on>& b)
 {
    number<Backend, et_on> t(a);
    if (t < b)
-      return std::move(t);
+      return t;
    return b;
 }
 template <class tag, class A1, class A2, class A3, class A4, class tagb, class A1b, class A2b, class A3b, class A4b>
@@ -51,16 +51,16 @@ inline typename detail::expression<tag, A1, A2, A3, A4>::result_type(min)(const
 {
    typename detail::expression<tag, A1, A2, A3, A4>::result_type t1(a), t2(b);
    if (t1 < t2)
-      return std::move(t1);
-   return std::move(t2);
+      return t1;
+   return t2;
 }
 template <class tag, class A1, class A2, class A3, class A4>
 inline typename detail::expression<tag, A1, A2, A3, A4>::result_type(min)(const detail::expression<tag, A1, A2, A3, A4>& a, const detail::expression<tag, A1, A2, A3, A4>& b)
 {
    typename detail::expression<tag, A1, A2, A3, A4>::result_type t1(a), t2(b);
    if (t1 < t2)
-      return std::move(t1);
-   return std::move(t2);
+      return t1;
+   return t2;
 }
 
 template <class Backend>
@@ -74,14 +74,14 @@ inline typename std::enable_if<boost::multiprecision::detail::is_backend<Backend
    number<Backend, et_on> t(b);
    if (a > t)
       return a;
-   return std::move(t);
+   return t;
 }
 template <class tag, class A1, class A2, class A3, class A4, class Backend>
 inline typename std::enable_if<boost::multiprecision::detail::is_backend<Backend>::value, const number<Backend, et_on> >::type(max)(const detail::expression<tag, A1, A2, A3, A4>& a, const number<Backend, et_on>& b)
 {
    number<Backend, et_on> t(a);
    if (t > b)
-      return std::move(t);
+      return t;
    return b;
 }
 template <class tag, class A1, class A2, class A3, class A4, class tagb, class A1b, class A2b, class A3b, class A4b>
@@ -89,16 +89,16 @@ inline typename detail::expression<tag, A1, A2, A3, A4>::result_type(max)(const
 {
    typename detail::expression<tag, A1, A2, A3, A4>::result_type t1(a), t2(b);
    if (t1 > t2)
-      return std::move(t1);
-   return std::move(t2);
+      return t1;
+   return t2;
 }
 template <class tag, class A1, class A2, class A3, class A4>
 inline typename detail::expression<tag, A1, A2, A3, A4>::result_type(max)(const detail::expression<tag, A1, A2, A3, A4>& a, const detail::expression<tag, A1, A2, A3, A4>& b)
 {
    typename detail::expression<tag, A1, A2, A3, A4>::result_type t1(a), t2(b);
    if (t1 > t2)
-      return std::move(t1);
-   return std::move(t2);
+      return t1;
+   return t2;
 }
 
 }} // namespace boost::multiprecision
diff --git a/inst/include/boost/multiprecision/detail/number_base.hpp b/inst/include/boost/multiprecision/detail/number_base.hpp
index 2f4db9df3..99017c92e 100644
--- a/inst/include/boost/multiprecision/detail/number_base.hpp
+++ b/inst/include/boost/multiprecision/detail/number_base.hpp
@@ -150,10 +150,17 @@ template <class tag, class Arg1, class Arg2, class Arg3, class Arg4>
 struct is_number_expression<detail::expression<tag, Arg1, Arg2, Arg3, Arg4> > : public std::integral_constant<bool, true>
 {};
 
+namespace detail {
+template <class Val, class Backend>
+struct canonical;
+}
+
 template <class T, class Num>
 struct is_compatible_arithmetic_type
     : public std::integral_constant<bool, 
-          std::is_convertible<T, Num>::value && !std::is_same<T, Num>::value && !is_number_expression<T>::value>
+          std::is_convertible<T, Num>::value && !std::is_same<T, Num>::value && !is_number_expression<T>::value
+          && (std::is_constructible<typename Num::backend_type, typename detail::canonical<T, typename Num::backend_type>::type>::value 
+             || std::is_assignable<typename Num::backend_type, typename detail::canonical<T, typename Num::backend_type>::type>::value || is_number<T>::value || is_number_expression<T>::value)>
 {};
 
 namespace detail {
@@ -199,7 +206,7 @@ struct bits_of
                                               : sizeof(T) * CHAR_BIT - (boost::multiprecision::detail::is_signed<T>::value ? 1 : 0);
 };
 
-#if defined(_GLIBCXX_USE_FLOAT128) && defined(BOOST_GCC) && !defined(__STRICT_ANSI__)
+#if defined(_GLIBCXX_USE_FLOAT128) && defined(BOOST_GCC) && !defined(__STRICT_ANSI__) && !defined(__PGI)
 #define BOOST_MP_BITS_OF_FLOAT128_DEFINED
 template <>
 struct bits_of<float128_type>
@@ -1527,6 +1534,11 @@ struct number_category<number<Backend, ExpressionTemplates> > : public number_ca
 template <class tag, class A1, class A2, class A3, class A4>
 struct number_category<detail::expression<tag, A1, A2, A3, A4> > : public number_category<typename detail::expression<tag, A1, A2, A3, A4>::result_type>
 {};
+#if defined(__SIZEOF_FLOAT128__) || defined(BOOST_HAS_FLOAT128)
+template <>
+struct number_category<__float128> : public std::integral_constant<int, number_kind_floating_point> {};
+#endif
+
 //
 // Specializations for types which do not always have numberic_limits specializations:
 //
@@ -1538,11 +1550,6 @@ template <>
 struct number_category<boost::multiprecision::uint128_type> : public std::integral_constant<int, number_kind_integer>
 {};
 #endif
-#ifdef BOOST_HAS_FLOAT128
-template <>
-struct number_category<boost::multiprecision::float128_type> : public std::integral_constant<int, number_kind_floating_point>
-{};
-#endif
 
 template <class T>
 struct component_type
diff --git a/inst/include/boost/multiprecision/detail/string_helpers.hpp b/inst/include/boost/multiprecision/detail/string_helpers.hpp
index dbc5f2f08..68a6b5a04 100644
--- a/inst/include/boost/multiprecision/detail/string_helpers.hpp
+++ b/inst/include/boost/multiprecision/detail/string_helpers.hpp
@@ -34,12 +34,12 @@ namespace boost { namespace multiprecision { namespace detail {
    template <class Iterator>
    std::size_t find_first_of(Iterator begin, Iterator end, const char* what)
    {
-      return std::find_if(begin, end, is_in_string(what)) - begin;
+      return static_cast<std::size_t>(std::find_if(begin, end, is_in_string(what)) - begin);
    }
    template <class Iterator>
    std::size_t find_first_not_of(Iterator begin, Iterator end, const char* what)
    {
-      return std::find_if(begin, end, is_not_in_string(what)) - begin;
+      return static_cast<std::size_t>(std::find_if(begin, end, is_not_in_string(what)) - begin);
    }
 
 
diff --git a/inst/include/boost/multiprecision/float128.hpp b/inst/include/boost/multiprecision/float128.hpp
index dffca9de0..83f5f11f9 100644
--- a/inst/include/boost/multiprecision/float128.hpp
+++ b/inst/include/boost/multiprecision/float128.hpp
@@ -176,12 +176,9 @@ struct float128_backend
 
  public:
    constexpr   float128_backend() noexcept : m_value(0) {}
-   constexpr   float128_backend(const float128_backend& o) noexcept : m_value(o.m_value) {}
-   BOOST_MP_CXX14_CONSTEXPR float128_backend& operator=(const float128_backend& o) noexcept
-   {
-      m_value = o.m_value;
-      return *this;
-   }
+   constexpr   float128_backend(const float128_backend& o) noexcept = default;
+   BOOST_MP_CXX14_CONSTEXPR float128_backend& operator=(const float128_backend& o) noexcept = default;
+
    template <class T>
    constexpr float128_backend(const T& i, const typename std::enable_if<std::is_convertible<T, float128_type>::value>::type* = nullptr) noexcept(noexcept(std::declval<float128_type&>() = std::declval<const T&>()))
        : m_value(i) {}
@@ -835,8 +832,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::backen
    static constexpr bool has_infinity                  = true;
    static constexpr bool has_quiet_NaN                 = true;
    static constexpr bool has_signaling_NaN             = false;
-   static constexpr float_denorm_style has_denorm      = denorm_present;
-   static constexpr bool               has_denorm_loss = true;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style                                has_denorm      = denorm_present;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool                                              has_denorm_loss = true;
    static BOOST_MP_CXX14_CONSTEXPR number_type                        infinity() { return HUGE_VAL; /* conversion from double infinity OK */ }
    static BOOST_MP_CXX14_CONSTEXPR number_type                        quiet_NaN() { return number_type(NAN); }
    static BOOST_MP_CXX14_CONSTEXPR number_type                        signaling_NaN() { return 0; }
@@ -898,8 +902,15 @@ constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecisio
 
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_round_style numeric_limits<boost::multiprecision::number<boost::multiprecision::backends::float128_backend, ExpressionTemplates> >::round_style;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::backends::float128_backend, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 } // namespace std
 
diff --git a/inst/include/boost/multiprecision/gmp.hpp b/inst/include/boost/multiprecision/gmp.hpp
index ce02a5dff..5a30e9045 100644
--- a/inst/include/boost/multiprecision/gmp.hpp
+++ b/inst/include/boost/multiprecision/gmp.hpp
@@ -3590,8 +3590,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_fl
    static constexpr bool               has_infinity      = false;
    static constexpr bool               has_quiet_NaN     = false;
    static constexpr bool               has_signaling_NaN = false;
-   static constexpr float_denorm_style has_denorm        = denorm_absent;
-   static constexpr bool               has_denorm_loss   = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool               has_denorm_loss = false;
    static constexpr number_type        infinity() { return number_type(); }
    static constexpr number_type        quiet_NaN() { return number_type(); }
    static constexpr number_type        signaling_NaN() { return number_type(); }
@@ -3632,8 +3639,15 @@ template <unsigned Digits10, boost::multiprecision::expression_template_option E
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<Digits10>, ExpressionTemplates> >::has_quiet_NaN;
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<Digits10>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<Digits10>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<Digits10>, ExpressionTemplates> >::has_denorm_loss;
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
@@ -3675,8 +3689,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_fl
    static constexpr bool               has_infinity      = false;
    static constexpr bool               has_quiet_NaN     = false;
    static constexpr bool               has_signaling_NaN = false;
-   static constexpr float_denorm_style has_denorm        = denorm_absent;
-   static constexpr bool               has_denorm_loss   = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool                     has_denorm_loss = false;
    static number_type                        infinity() { return number_type(); }
    static number_type                        quiet_NaN() { return number_type(); }
    static number_type                        signaling_NaN() { return number_type(); }
@@ -3717,8 +3738,15 @@ template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<0>, ExpressionTemplates> >::has_quiet_NaN;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<0>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<0>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_float<0>, ExpressionTemplates> >::has_denorm_loss;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
@@ -3770,8 +3798,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_in
    static constexpr bool               has_infinity      = false;
    static constexpr bool               has_quiet_NaN     = false;
    static constexpr bool               has_signaling_NaN = false;
-   static constexpr float_denorm_style has_denorm        = denorm_absent;
-   static constexpr bool               has_denorm_loss   = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool                     has_denorm_loss = false;
    static number_type                        infinity() { return number_type(); }
    static number_type                        quiet_NaN() { return number_type(); }
    static number_type                        signaling_NaN() { return number_type(); }
@@ -3812,8 +3847,15 @@ template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_int, ExpressionTemplates> >::has_quiet_NaN;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_int, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_int, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_int, ExpressionTemplates> >::has_denorm_loss;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
@@ -3866,8 +3908,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_ra
    static constexpr bool               has_infinity      = false;
    static constexpr bool               has_quiet_NaN     = false;
    static constexpr bool               has_signaling_NaN = false;
-   static constexpr float_denorm_style has_denorm        = denorm_absent;
-   static constexpr bool               has_denorm_loss   = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool                     has_denorm_loss = false;
    static number_type                        infinity() { return number_type(); }
    static number_type                        quiet_NaN() { return number_type(); }
    static number_type                        signaling_NaN() { return number_type(); }
@@ -3908,8 +3957,15 @@ template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_rational, ExpressionTemplates> >::has_quiet_NaN;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_rational, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_rational, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::gmp_rational, ExpressionTemplates> >::has_denorm_loss;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/mpfi.hpp b/inst/include/boost/multiprecision/mpfi.hpp
index 2f7626fe1..891760c55 100644
--- a/inst/include/boost/multiprecision/mpfi.hpp
+++ b/inst/include/boost/multiprecision/mpfi.hpp
@@ -2372,8 +2372,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_f
    static constexpr bool has_infinity                  = true;
    static constexpr bool has_quiet_NaN                 = true;
    static constexpr bool has_signaling_NaN             = false;
-   static constexpr float_denorm_style has_denorm      = denorm_absent;
-   static constexpr bool               has_denorm_loss = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool has_denorm_loss = false;
    static number_type                        infinity()
    {
       static number_type value{get_infinity()};
@@ -2425,8 +2432,15 @@ template <unsigned Digits10, boost::multiprecision::expression_template_option E
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<Digits10>, ExpressionTemplates> >::has_quiet_NaN;
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<Digits10>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<Digits10>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<Digits10>, ExpressionTemplates> >::has_denorm_loss;
 template <unsigned Digits10, boost::multiprecision::expression_template_option ExpressionTemplates>
@@ -2468,8 +2482,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_f
    static constexpr bool has_infinity                  = false;
    static constexpr bool has_quiet_NaN                 = false;
    static constexpr bool has_signaling_NaN             = false;
-   static constexpr float_denorm_style has_denorm      = denorm_absent;
-   static constexpr bool               has_denorm_loss = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool                     has_denorm_loss = false;
    static number_type                        infinity() { return number_type(0); }
    static number_type                        quiet_NaN() { return number_type(0); }
    static number_type                        signaling_NaN() { return number_type(0); }
@@ -2510,8 +2531,15 @@ template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<0>, ExpressionTemplates> >::has_quiet_NaN;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<0>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<0>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfi_float_backend<0>, ExpressionTemplates> >::has_denorm_loss;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/mpfr.hpp b/inst/include/boost/multiprecision/mpfr.hpp
index a84183edc..cc85553bf 100644
--- a/inst/include/boost/multiprecision/mpfr.hpp
+++ b/inst/include/boost/multiprecision/mpfr.hpp
@@ -2802,6 +2802,8 @@ inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<D
    boost::multiprecision::detail::scoped_default_precision<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> > precision_guard(arg);
 
    boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> result;
+   if (mpfr_nan_p(arg.backend().data()))
+      return policies::raise_domain_error("cbrt<%1%>(%1%)", "Input is a NaN", result, Policy());
    mpfr_cbrt(result.backend().data(), arg.backend().data(), GMP_RNDN);
    if (mpfr_inf_p(result.backend().data()))
       return policies::raise_overflow_error<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >("cbrt<%1%>(%1%)", nullptr, Policy());
@@ -2821,6 +2823,8 @@ inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<D
    boost::multiprecision::detail::scoped_default_precision<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> > precision_guard(arg);
 
    boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> result;
+   if (mpfr_nan_p(arg.backend().data()))
+      return policies::raise_domain_error("erf<%1%>(%1%)", "Input is a NaN", result, pol);
    mpfr_erf(result.backend().data(), arg.backend().data(), GMP_RNDN);
    if (mpfr_inf_p(result.backend().data()))
       return policies::raise_overflow_error<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >("erf<%1%>(%1%)", nullptr, pol);
@@ -2840,6 +2844,8 @@ inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<D
    boost::multiprecision::detail::scoped_default_precision<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> > precision_guard(arg);
 
    boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> result;
+   if (mpfr_nan_p(arg.backend().data()))
+      return policies::raise_domain_error("erf<%1%>(%1%)", "Input is a NaN", result, pol);
    mpfr_erfc(result.backend().data(), arg.backend().data(), GMP_RNDN);
    if (mpfr_inf_p(result.backend().data()))
       return policies::raise_overflow_error<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >("erfc<%1%>(%1%)", nullptr, pol);
@@ -2859,6 +2865,8 @@ inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<D
    boost::multiprecision::detail::scoped_default_precision<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> > precision_guard(arg);
 
    boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> result;
+   if (mpfr_nan_p(arg.backend().data()))
+      return policies::raise_domain_error("erf<%1%>(%1%)", "Input is a NaN", result, pol);
    mpfr_expm1(result.backend().data(), arg.backend().data(), GMP_RNDN);
    if (mpfr_inf_p(result.backend().data()))
       return policies::raise_overflow_error<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >("expm1<%1%>(%1%)", nullptr, pol);
@@ -2867,7 +2875,7 @@ inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<D
    return result;
 }
 template <unsigned Digits10, boost::multiprecision::mpfr_allocation_type AllocateType, boost::multiprecision::expression_template_option ExpressionTemplates>
-inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> exm1 BOOST_PREVENT_MACRO_SUBSTITUTION(const boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates>& arg)
+inline boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(const boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates>& arg)
 {
    return expm1(arg, policies::policy<>());
 }
@@ -3416,8 +3424,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_f
    static constexpr bool has_infinity                  = true;
    static constexpr bool has_quiet_NaN                 = true;
    static constexpr bool has_signaling_NaN             = false;
-   static constexpr float_denorm_style has_denorm      = denorm_absent;
-   static constexpr bool               has_denorm_loss = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool has_denorm_loss = false;
    static number_type                        infinity()
    {
       number_type value;
@@ -3471,8 +3486,15 @@ template <unsigned Digits10, boost::multiprecision::mpfr_allocation_type Allocat
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >::has_quiet_NaN;
 template <unsigned Digits10, boost::multiprecision::mpfr_allocation_type AllocateType, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <unsigned Digits10, boost::multiprecision::mpfr_allocation_type AllocateType, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <unsigned Digits10, boost::multiprecision::mpfr_allocation_type AllocateType, boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<Digits10, AllocateType>, ExpressionTemplates> >::has_denorm_loss;
 template <unsigned Digits10, boost::multiprecision::mpfr_allocation_type AllocateType, boost::multiprecision::expression_template_option ExpressionTemplates>
@@ -3535,8 +3557,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_f
    static constexpr bool has_infinity                  = true;
    static constexpr bool has_quiet_NaN                 = true;
    static constexpr bool has_signaling_NaN             = false;
-   static constexpr float_denorm_style has_denorm      = denorm_absent;
-   static constexpr bool               has_denorm_loss = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool has_denorm_loss = false;
    static number_type                        infinity()
    {
       number_type value;
@@ -3587,8 +3616,15 @@ template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<0>, ExpressionTemplates> >::has_quiet_NaN;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<0>, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<0>, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::mpfr_float_backend<0>, ExpressionTemplates> >::has_denorm_loss;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/number.hpp b/inst/include/boost/multiprecision/number.hpp
index 4dd1fb028..aac21d3cc 100644
--- a/inst/include/boost/multiprecision/number.hpp
+++ b/inst/include/boost/multiprecision/number.hpp
@@ -51,7 +51,7 @@ class number
    static constexpr expression_template_option et = ExpressionTemplates;
 
    BOOST_MP_FORCEINLINE constexpr number() noexcept(noexcept(Backend())) {}
-   BOOST_MP_FORCEINLINE constexpr number(const number& e) noexcept(noexcept(Backend(std::declval<Backend const&>()))) : m_backend(e.m_backend) {}
+   BOOST_MP_FORCEINLINE constexpr number(const number& e) noexcept(noexcept(Backend(std::declval<Backend const&>()))) = default;
    template <class V>
    BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR number(const V& v, 
       typename std::enable_if<
@@ -372,11 +372,7 @@ class number
    }
 
    BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR number& operator=(const number& e)
-       noexcept(noexcept(std::declval<Backend&>() = std::declval<Backend const&>()))
-   {
-      m_backend = e.m_backend;
-      return *this;
-   }
+       noexcept(noexcept(std::declval<Backend&>() = std::declval<Backend const&>())) = default;
 
    template <class V>
    BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR typename std::enable_if<std::is_convertible<V, self_type>::value, number<Backend, ExpressionTemplates>&>::type
@@ -451,14 +447,9 @@ class number
 
    // rvalues:
    BOOST_MP_FORCEINLINE constexpr number(number&& r)
-       noexcept(noexcept(Backend(std::declval<Backend>())))
-       : m_backend(static_cast<Backend&&>(r.m_backend))
-   {}
-   BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR number& operator=(number&& r) noexcept(noexcept(std::declval<Backend&>() = std::declval<Backend>()))
-   {
-      m_backend = static_cast<Backend&&>(r.m_backend);
-      return *this;
-   }
+       noexcept(noexcept(Backend(std::declval<Backend>()))) = default;
+   BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR number& operator=(number&& r) noexcept(noexcept(std::declval<Backend&>() = std::declval<Backend>())) = default;
+
    template <class Other, expression_template_option ET>
    BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR number(number<Other, ET>&& val,
                                                         typename std::enable_if<(std::is_convertible<Other, Backend>::value && !detail::is_restricted_conversion<Other, Backend>::value)>::type* = nullptr)
diff --git a/inst/include/boost/multiprecision/tommath.hpp b/inst/include/boost/multiprecision/tommath.hpp
index 2e2530f7e..363b3be1e 100644
--- a/inst/include/boost/multiprecision/tommath.hpp
+++ b/inst/include/boost/multiprecision/tommath.hpp
@@ -440,8 +440,14 @@ struct tommath_int
       if ((base != 10) && m_data.sign)
          BOOST_MP_THROW_EXCEPTION(std::runtime_error("Formatted output in bases 8 or 16 is only available for positive numbers"));
 
+      // Check against known removed macro that was removed around the same time as type was changed
+      #ifdef mp_tobinary
       int s;
+      #else
+      size_t s;
+      #endif
       detail::check_tommath_result(mp_radix_size(const_cast< ::mp_int*>(&m_data), base, &s));
+
       std::unique_ptr<char[]> a(new char[s + 1]);
 #ifndef mp_to_binary
       detail::check_tommath_result(mp_toradix_n(const_cast< ::mp_int*>(&m_data), a.get(), base, s + 1));
@@ -950,8 +956,15 @@ class numeric_limits<boost::multiprecision::number<boost::multiprecision::tommat
    static constexpr bool               has_infinity      = false;
    static constexpr bool               has_quiet_NaN     = false;
    static constexpr bool               has_signaling_NaN = false;
-   static constexpr float_denorm_style has_denorm        = denorm_absent;
-   static constexpr bool               has_denorm_loss   = false;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+   static constexpr float_denorm_style       has_denorm      = denorm_absent;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+   static constexpr bool                     has_denorm_loss = false;
    static number_type                        infinity() { return number_type(); }
    static number_type                        quiet_NaN() { return number_type(); }
    static number_type                        signaling_NaN() { return number_type(); }
@@ -992,8 +1005,15 @@ template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::tommath_int, ExpressionTemplates> >::has_quiet_NaN;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::tommath_int, ExpressionTemplates> >::has_signaling_NaN;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr float_denorm_style numeric_limits<boost::multiprecision::number<boost::multiprecision::tommath_int, ExpressionTemplates> >::has_denorm;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
 constexpr bool numeric_limits<boost::multiprecision::number<boost::multiprecision::tommath_int, ExpressionTemplates> >::has_denorm_loss;
 template <boost::multiprecision::expression_template_option ExpressionTemplates>
diff --git a/inst/include/boost/multiprecision/traits/std_integer_traits.hpp b/inst/include/boost/multiprecision/traits/std_integer_traits.hpp
index 2c835887b..d6b126f86 100644
--- a/inst/include/boost/multiprecision/traits/std_integer_traits.hpp
+++ b/inst/include/boost/multiprecision/traits/std_integer_traits.hpp
@@ -27,6 +27,11 @@ struct make_unsigned : public std::make_unsigned<T> {};
 template <class T>
 struct make_signed : public std::make_signed<T> {};
 
+#if defined(__SIZEOF_FLOAT128__)
+template <>
+struct is_arithmetic<__float128> : public std::true_type {};
+#endif
+
 #ifdef BOOST_HAS_INT128
 
 template <>
diff --git a/inst/include/boost/none.hpp b/inst/include/boost/none.hpp
index 5f927cc36..3e7a95005 100644
--- a/inst/include/boost/none.hpp
+++ b/inst/include/boost/none.hpp
@@ -50,7 +50,7 @@ namespace {
 
 #else
 
-BOOST_INLINE_VARIABLE BOOST_CONSTEXPR_OR_CONST none_t none ((none_t::init_tag()));
+BOOST_INLINE_CONSTEXPR none_t none ((none_t::init_tag()));
 
 #endif // older definitions
 
diff --git a/inst/include/boost/none_t.hpp b/inst/include/boost/none_t.hpp
index 419a72866..1c8e07611 100644
--- a/inst/include/boost/none_t.hpp
+++ b/inst/include/boost/none_t.hpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2014, 2015 Andrzej Krzemienski.
+// Copyright (C) 2014, 2024 Andrzej Krzemienski.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,10 +16,16 @@
 #include <boost/config.hpp>
 #include <boost/config/pragma_message.hpp>
 
-#if defined (BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_REF_QUALIFIERS) \
-|| defined(BOOST_NO_CXX11_LAMBDAS) || defined(BOOST_NO_CXX11_DECLTYPE_N3276) || defined(BOOST_NO_CXX11_NOEXCEPT) || defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_MOVES) || defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
+#if defined (BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) \
+|| defined(BOOST_NO_CXX11_LAMBDAS) || defined(BOOST_NO_CXX11_DECLTYPE_N3276)  \
+|| defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) \
+|| defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) || defined(BOOST_NO_CXX11_STATIC_ASSERT)
 
-BOOST_PRAGMA_MESSAGE("C++03 support is deprecated in Boost.Optional 1.83 and will be removed in Boost.Optional 1.86.")
+#error "Boost.Optional requires some C++11 features since version 1.87. If you have an older C++ version use Boost.Optional version 1.86 or earlier."
+
+#elif defined(BOOST_NO_CXX11_REF_QUALIFIERS) || defined(BOOST_NO_CXX11_NOEXCEPT) || defined(BOOST_NO_CXX11_DEFAULTED_MOVES)
+
+BOOST_PRAGMA_MESSAGE("C++03 support is deprecated in Boost.Optional 1.83 and will be removed in Boost.Optional 1.88.")
 
 #endif
 
diff --git a/inst/include/boost/numeric/odeint/algebra/algebra_dispatcher.hpp b/inst/include/boost/numeric/odeint/algebra/algebra_dispatcher.hpp
index 88cf159e0..cf4d0c36f 100644
--- a/inst/include/boost/numeric/odeint/algebra/algebra_dispatcher.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/algebra_dispatcher.hpp
@@ -17,10 +17,11 @@
 #ifndef BOOST_NUMERIC_ODEINT_ALGEBRA_ALGEBRA_DISPATCHER_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_ALGEBRA_ALGEBRA_DISPATCHER_HPP_INCLUDED
 
-#include <boost/numeric/odeint/config.hpp>
-
+#include <type_traits>
 #include <complex>
-#include <boost/type_traits/is_floating_point.hpp>
+#include <array>
+
+#include <boost/numeric/odeint/config.hpp>
 
 #include <boost/numeric/ublas/vector.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
@@ -29,9 +30,6 @@
 #include <boost/numeric/odeint/algebra/array_algebra.hpp>
 #include <boost/numeric/odeint/algebra/vector_space_algebra.hpp>
 
-#include <boost/array.hpp>
-
-
 namespace boost {
 namespace numeric {
 namespace odeint {
@@ -48,14 +46,14 @@ struct algebra_dispatcher : algebra_dispatcher_sfinae< StateType > { };
 
 // specialize for array
 template< class T , size_t N >
-struct algebra_dispatcher< boost::array< T , N > >
+struct algebra_dispatcher< std::array< T , N > >
 {
     typedef array_algebra algebra_type;
 };
 
 //specialize for some integral types
 template< typename T >
-struct algebra_dispatcher_sfinae< T , typename boost::enable_if< typename boost::is_floating_point< T >::type >::type >
+struct algebra_dispatcher_sfinae< T , typename std::enable_if< std::is_floating_point< T >::value >::type >
 {
     typedef vector_space_algebra algebra_type;
 };
@@ -85,26 +83,4 @@ struct algebra_dispatcher< boost::numeric::ublas::matrix< T , L , A > >
 }
 }
 
-#ifdef BOOST_NUMERIC_ODEINT_CXX11
-
-// c++11 mode: specialization for std::array if available
-
-#include <array>
-
-namespace boost {
-namespace numeric {
-namespace odeint {
-    
-// specialize for std::array
-template< class T , size_t N >
-struct algebra_dispatcher< std::array< T , N > >
-{
-    typedef array_algebra algebra_type;
-};
-
-} } }
-
-#endif
-
-
 #endif
diff --git a/inst/include/boost/numeric/odeint/algebra/array_algebra.hpp b/inst/include/boost/numeric/odeint/algebra/array_algebra.hpp
index 471e866fe..3d1705586 100644
--- a/inst/include/boost/numeric/odeint/algebra/array_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/array_algebra.hpp
@@ -23,7 +23,7 @@
 #define BOOST_NUMERIC_ODEINT_ALGEBRA_ARRAY_ALGEBRA_HPP_INCLUDED
 
 #include <algorithm>
-#include <boost/array.hpp>
+#include <array>
 
 #include <boost/numeric/odeint/algebra/norm_result_type.hpp>
 
diff --git a/inst/include/boost/numeric/odeint/algebra/default_operations.hpp b/inst/include/boost/numeric/odeint/algebra/default_operations.hpp
index 56139083c..0101e48e3 100644
--- a/inst/include/boost/numeric/odeint/algebra/default_operations.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/default_operations.hpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 
 #include <boost/config.hpp>
-#include <boost/array.hpp>
+#include <array>
 
 #include <boost/numeric/odeint/util/unit_helper.hpp>
 
diff --git a/inst/include/boost/numeric/odeint/algebra/detail/extract_value_type.hpp b/inst/include/boost/numeric/odeint/algebra/detail/extract_value_type.hpp
index c5246bb6f..fa640be18 100644
--- a/inst/include/boost/numeric/odeint/algebra/detail/extract_value_type.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/detail/extract_value_type.hpp
@@ -17,7 +17,10 @@
 #ifndef BOOST_NUMERIC_ODEINT_ALGEBRA_DETAIL_EXTRACT_VALUE_TYPE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_ALGEBRA_DETAIL_EXTRACT_VALUE_TYPE_HPP_INCLUDED
 
+#include <type_traits>
 #include <boost/utility.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/mpl/has_xxx.hpp>
 
 BOOST_MPL_HAS_XXX_TRAIT_DEF(value_type)
@@ -28,24 +31,20 @@ namespace odeint {
 namespace detail {
 
 template< typename S , typename Enabler = void >
-struct extract_value_type {};
-
-// as long as value_types are defined we go down the value_type chain
-// e.g. returning S::value_type::value_type::value_type
-
-template< typename S >
-struct extract_value_type<S , typename boost::disable_if< has_value_type<S> >::type >
+struct extract_value_type
 {
-    // no value_type defined, return S
     typedef S type;
 };
 
+// as long as value_types are defined we go down the value_type chain
+// e.g. returning S::value_type::value_type::value_type
+
 template< typename S >
-struct extract_value_type< S , typename boost::enable_if< has_value_type<S> >::type >
-{
-    // go down the value_type
-    typedef typename extract_value_type< typename S::value_type >::type type;
-};
+struct extract_value_type< S , typename std::enable_if< has_value_type<S>::value >::type >
+  : mpl::if_< std::is_same< S, typename S::value_type > ,
+        mpl::identity< S > , // cut the recursion if S and S::value_type are the same
+        extract_value_type< typename S::value_type > >::type
+{};
 
 } } } }
 
diff --git a/inst/include/boost/numeric/odeint/algebra/detail/macros.hpp b/inst/include/boost/numeric/odeint/algebra/detail/macros.hpp
index 9e18a8a2f..9badf2238 100644
--- a/inst/include/boost/numeric/odeint/algebra/detail/macros.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/detail/macros.hpp
@@ -18,14 +18,13 @@
 #ifndef BOOST_NUMERIC_ODEINT_ALGEBRA_DETAIL_MACROS_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_ALGEBRA_DETAIL_MACROS_HPP_INCLUDED
 
+#include <type_traits>
 
 //type traits aren't working with nvcc
 #ifndef __CUDACC__
-#include <boost/type_traits.hpp>
-#include <boost/static_assert.hpp>
 
 #define BOOST_ODEINT_CHECK_CONTAINER_TYPE( Type1 , Type2 ) \
-        BOOST_STATIC_ASSERT(( boost::is_same< typename boost::remove_const< Type1 >::type , Type2 >::value ))
+        static_assert(( std::is_same< typename std::remove_const< Type1 >::type , Type2 >::value ));
 
 #else
 //empty macro for nvcc
@@ -33,11 +32,4 @@
 
 #endif // __CUDACC__
 
-
-
-/*
-#define BOOST_ODEINT_CHECK_OPERATION_ARITY( Operation , Arity ) \
-        BOOST_STATIC_ASSERT(( boost::function_traits< Operation >::arity == Arity ))
- */
-
 #endif // BOOST_NUMERIC_ODEINT_ALGEBRA_DETAIL_MACROS_HPP_INCLUDED
diff --git a/inst/include/boost/numeric/odeint/algebra/detail/norm_inf.hpp b/inst/include/boost/numeric/odeint/algebra/detail/norm_inf.hpp
index 3d32c99be..066c309fb 100644
--- a/inst/include/boost/numeric/odeint/algebra/detail/norm_inf.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/detail/norm_inf.hpp
@@ -19,6 +19,7 @@
 #define BOOST_NUMERIC_ODEINT_ALGEBRA_DETAIL_NORM_INF_HPP_INCLUDED
 
 #include <cmath>
+#include <algorithm>
 
 namespace boost {
 namespace numeric {
diff --git a/inst/include/boost/numeric/odeint/algebra/fusion_algebra.hpp b/inst/include/boost/numeric/odeint/algebra/fusion_algebra.hpp
index 0055e5d4d..69f4a39b3 100644
--- a/inst/include/boost/numeric/odeint/algebra/fusion_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/fusion_algebra.hpp
@@ -122,7 +122,7 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class Op >
     static void for_each8( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 8 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 8 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -131,7 +131,7 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class Op >
     static void for_each9( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 9 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 9 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -140,7 +140,7 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class S10 , class Op >
     static void for_each10( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 10 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 10 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& , S10& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 , s10 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -149,8 +149,8 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class S10 , class S11 , class Op >
     static void for_each11( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 11 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
-        BOOST_STATIC_ASSERT_MSG( BOOST_RESULT_OF_NUM_ARGS >= 11 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 11 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_RESULT_OF_NUM_ARGS >= 11 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& , S10& , S11& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 , s10 , s11 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -159,8 +159,8 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class S10 , class S11 , class S12 , class Op >
     static void for_each12( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , S12 &s12 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 12 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
-        BOOST_STATIC_ASSERT_MSG( BOOST_RESULT_OF_NUM_ARGS >= 12 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 12 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_RESULT_OF_NUM_ARGS >= 12 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& , S10& , S11& , S12& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 , s10 , s11 , s12 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -169,8 +169,8 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class S10 , class S11 , class S12 , class S13 , class Op >
     static void for_each13( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , S12 &s12 , S13 &s13 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 13 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
-        BOOST_STATIC_ASSERT_MSG( BOOST_RESULT_OF_NUM_ARGS >= 13 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 13 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_RESULT_OF_NUM_ARGS >= 13 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& , S10& , S11& , S12& , S13& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 , s10 , s11 , s12 , s13 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -179,8 +179,8 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class S10 , class S11 , class S12 , class S13 , class S14 , class Op >
     static void for_each14( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , S12 &s12 , S13 &s13 , S14 &s14 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 14 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
-        BOOST_STATIC_ASSERT_MSG( BOOST_RESULT_OF_NUM_ARGS >= 14 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 14 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_RESULT_OF_NUM_ARGS >= 14 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& , S10& , S11& , S12& , S13& , S14& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 , s10 , s11 , s12 , s13 , s14 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
@@ -189,8 +189,8 @@ struct fusion_algebra
     template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 , class S7 , class S8 , class S9 , class S10 , class S11 , class S12 , class S13 , class S14 , class S15 , class Op >
     static void for_each15( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , S12 &s12 , S13 &s13 , S14 &s14 , S15 &s15 , Op op )
     {
-        BOOST_STATIC_ASSERT_MSG( BOOST_FUSION_INVOKE_MAX_ARITY >= 15 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
-        BOOST_STATIC_ASSERT_MSG( BOOST_RESULT_OF_NUM_ARGS >= 15 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
+        static_assert( BOOST_FUSION_INVOKE_MAX_ARITY >= 15 , "Macro Parameter BOOST_FUSION_INVOKE_MAX_ARITY to small!" );
+        static_assert( BOOST_RESULT_OF_NUM_ARGS >= 15 , "Macro Parameter BOOST_RESULT_OF_NUM_ARGS to small!" );
         typedef boost::fusion::vector< S1& , S2& , S3& , S4& , S5& , S6& , S7& , S8& , S9& , S10& , S11& , S12& , S13& , S14& , S15& > Sequences;
         Sequences sequences( s1 , s2 , s3 , s4 , s5 , s6 , s7 , s8 , s9 , s10 , s11 , s12 , s13 , s14 , s15 );
         boost::fusion::for_each( boost::fusion::zip_view< Sequences >( sequences ) , boost::fusion::make_fused( op ) );
diff --git a/inst/include/boost/numeric/odeint/algebra/range_algebra.hpp b/inst/include/boost/numeric/odeint/algebra/range_algebra.hpp
index 3d7695c81..71ec0bc0d 100644
--- a/inst/include/boost/numeric/odeint/algebra/range_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/range_algebra.hpp
@@ -3,7 +3,7 @@
  boost/numeric/odeint/algebra/range_algebra.hpp
 
  [begin_description]
- Default algebra, which works with the most state types, like vector< double >, boost::array< double >, boost::range.
+ Default algebra, which works with the most state types, like vector< double >, std::array< double >, boost::range.
  Internally is uses boost::range to obtain the begin and end iterator of the according sequence.
  [end_description]
 
diff --git a/inst/include/boost/numeric/odeint/algebra/vector_space_algebra.hpp b/inst/include/boost/numeric/odeint/algebra/vector_space_algebra.hpp
index 450a015ac..00240e04e 100644
--- a/inst/include/boost/numeric/odeint/algebra/vector_space_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/algebra/vector_space_algebra.hpp
@@ -20,9 +20,6 @@
 
 #include <complex>
 
-#include <boost/type_traits/remove_reference.hpp>
-
-
 namespace boost {
 namespace numeric {
 namespace odeint {
diff --git a/inst/include/boost/numeric/odeint/config.hpp b/inst/include/boost/numeric/odeint/config.hpp
index f19158255..964bb1bdd 100644
--- a/inst/include/boost/numeric/odeint/config.hpp
+++ b/inst/include/boost/numeric/odeint/config.hpp
@@ -43,7 +43,7 @@
 
 #include <boost/config.hpp>
 
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
 #define BOOST_NUMERIC_ODEINT_CXX11 1
 #endif
 
diff --git a/inst/include/boost/numeric/odeint/external/blaze/blaze_resize.hpp b/inst/include/boost/numeric/odeint/external/blaze/blaze_resize.hpp
index 3c5f2d46a..0fcf348ef 100644
--- a/inst/include/boost/numeric/odeint/external/blaze/blaze_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/blaze/blaze_resize.hpp
@@ -24,6 +24,8 @@
 
 #include <blaze/math/dense/DynamicVector.h>
 
+#include <type_traits>
+
 namespace boost {
 namespace numeric {
 namespace odeint {
@@ -31,7 +33,7 @@ namespace odeint {
 template< typename T , bool TF >
 struct is_resizeable< blaze::DynamicVector< T , TF > > 
 { 
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/external/compute/compute_resize.hpp b/inst/include/boost/numeric/odeint/external/compute/compute_resize.hpp
index 013a7acc4..e9f2f651d 100644
--- a/inst/include/boost/numeric/odeint/external/compute/compute_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/compute/compute_resize.hpp
@@ -22,6 +22,8 @@
 
 #include <boost/numeric/odeint/util/copy.hpp>
 
+#include <type_traits>
+
 namespace boost {
 namespace numeric {
 namespace odeint {
@@ -29,7 +31,7 @@ namespace odeint {
 template< class T, class A >
 struct is_resizeable< boost::compute::vector< T , A > >
 {
-    struct type : public boost::true_type { };
+    struct type : public std::true_type { };
     const static bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/external/eigen/eigen_resize.hpp b/inst/include/boost/numeric/odeint/external/eigen/eigen_resize.hpp
index 1989cc36c..3e69e13f7 100644
--- a/inst/include/boost/numeric/odeint/external/eigen/eigen_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/eigen/eigen_resize.hpp
@@ -18,36 +18,32 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_EIGEN_EIGEN_RESIZE_HPP_DEFINED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_EIGEN_EIGEN_RESIZE_HPP_DEFINED
 
+#include <type_traits>
 
 #include <boost/numeric/odeint/util/is_resizeable.hpp>
 #include <boost/numeric/odeint/util/resize.hpp>
 #include <boost/numeric/odeint/util/same_size.hpp>
 
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-
 #include <Eigen/Dense>
 
 namespace boost {
 namespace numeric {
 namespace odeint {
 
-
-
 template< class Derived >
 struct is_resizeable_sfinae< Derived ,
-                      typename boost::enable_if< typename boost::is_base_of< Eigen::MatrixBase< Derived > , Derived >::type >::type >
+                      typename std::enable_if< std::is_base_of< Eigen::MatrixBase< Derived > , Derived >::value >::type >
 { 
-    typedef boost::true_type type;
+    typedef std::integral_constant<bool, true> type;
     const static bool value = type::value;
 };
 
 
 template < class Derived  >
 struct is_resizeable_sfinae< Derived ,
-                      typename boost::enable_if< typename boost::is_base_of< Eigen::ArrayBase< Derived > , Derived >::type >::type >
+                      typename std::enable_if< std::is_base_of< Eigen::ArrayBase< Derived > , Derived >::value >::type >
 { 
-    typedef boost::true_type type;
+    typedef std::integral_constant<bool, true> type;
     const static bool value = type::value;
 };
 
@@ -55,7 +51,7 @@ struct is_resizeable_sfinae< Derived ,
 
 template< class Derived >
 struct same_size_impl_sfinae< Derived , Derived ,
-                       typename boost::enable_if< typename boost::is_base_of< Eigen::MatrixBase< Derived > , Derived >::type >::type >
+                       typename std::enable_if< std::is_base_of< Eigen::MatrixBase< Derived > , Derived >::value >::type >
 {
     static bool same_size( const Eigen::MatrixBase< Derived > &m1 , const Eigen::MatrixBase< Derived > &m2 )
 
@@ -66,7 +62,7 @@ struct same_size_impl_sfinae< Derived , Derived ,
 
 template< class Derived  >
 struct same_size_impl_sfinae< Derived , Derived ,
-                       typename boost::enable_if< typename boost::is_base_of< Eigen::ArrayBase< Derived > , Derived >::type >::type >
+                       typename std::enable_if< std::is_base_of< Eigen::ArrayBase< Derived > , Derived >::value >::type >
 {
     static bool same_size( const Eigen::ArrayBase< Derived > &v1 , const Eigen::ArrayBase< Derived >  &v2 )
     {
@@ -79,7 +75,7 @@ struct same_size_impl_sfinae< Derived , Derived ,
 
 template< class Derived >
 struct resize_impl_sfinae< Derived , Derived ,
-                    typename boost::enable_if< typename boost::is_base_of< Eigen::MatrixBase< Derived > , Derived >::type >::type >
+                    typename std::enable_if< std::is_base_of< Eigen::MatrixBase< Derived > , Derived >::value >::type >
 {
     static void resize( Eigen::MatrixBase< Derived > &m1 , const Eigen::MatrixBase< Derived > &m2 )
     {
@@ -89,7 +85,7 @@ struct resize_impl_sfinae< Derived , Derived ,
 
 template< class Derived >
 struct resize_impl_sfinae< Derived , Derived ,
-                    typename boost::enable_if< typename boost::is_base_of< Eigen::ArrayBase< Derived > , Derived >::type >::type >
+                    typename std::enable_if< std::is_base_of< Eigen::ArrayBase< Derived > , Derived >::value >::type >
 {
     static void resize( Eigen::ArrayBase< Derived > &v1 , const Eigen::ArrayBase< Derived > &v2 )
     {
diff --git a/inst/include/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp b/inst/include/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp
index a856f6e8a..e7d808134 100644
--- a/inst/include/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp
+++ b/inst/include/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp
@@ -22,7 +22,6 @@
 
 #include <gsl/gsl_vector.h>
 
-#include <boost/type_traits/integral_constant.hpp>
 #include <boost/range.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
@@ -167,8 +166,8 @@ namespace odeint {
 template<>
 struct is_resizeable< gsl_vector* >
 {
-    //struct type : public boost::true_type { };
-    typedef boost::true_type type;
+    //struct type : public std::integral_constant<bool, true> { };
+    typedef std::integral_constant<bool, true> type;
     const static bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp b/inst/include/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp
index 096d40a65..3ac0a1978 100644
--- a/inst/include/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp
+++ b/inst/include/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp
@@ -26,6 +26,7 @@
 #include <boost/numeric/odeint/util/split_adaptor.hpp>
 #include <boost/numeric/odeint/algebra/algebra_dispatcher.hpp>
 #include <boost/numeric/odeint/external/mpi/mpi_state.hpp>
+#include <boost/numeric/odeint/tools/assert.hpp>
 
 namespace boost {
 namespace numeric {
@@ -75,7 +76,7 @@ struct unsplit_impl< mpi_state< InnerState >, Target,
             size_t total_size = 0;
             for(size_t i = 0 ; i < pieces.size() ; i++)
                 total_size += boost::size(pieces[i]);
-            BOOST_ASSERT( total_size <= boost::size(to) );
+            BOOST_NUMERIC_ODEINT_ASSERT( total_size <= boost::size(to) );
             // copy parts
             iterator out = boost::begin(to);
             for(size_t i = 0 ; i < pieces.size() ; i++)
diff --git a/inst/include/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp b/inst/include/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp
index a3f03507c..5efecc415 100644
--- a/inst/include/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp
+++ b/inst/include/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp
@@ -75,8 +75,7 @@ class implicit_euler_mtl4
         deriv_func_type &deriv_func = sys.first;
         jacobi_func_type &jacobi_func = sys.second;
 
-        m_resizer.adjust_size( x , detail::bind(
-                                   &stepper_type::template resize_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         m_identity.m_v = 1;
 
diff --git a/inst/include/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp b/inst/include/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp
index 6295c03a6..b92a6d1f5 100644
--- a/inst/include/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp
@@ -24,6 +24,7 @@ copy at http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/numeric/mtl/matrix/dense2D.hpp>
 #include <boost/numeric/mtl/matrix/compressed2D.hpp>
 
+#include <type_traits>
 
 namespace boost {
 namespace numeric {
@@ -33,21 +34,21 @@ namespace odeint {
 template< class Value , class Parameters >
 struct is_resizeable< mtl::dense_vector< Value , Parameters > >
 { 
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
 template< class Value , class Parameters >
 struct is_resizeable< mtl::dense2D< Value , Parameters > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
 template< class Value , class Parameters >
 struct is_resizeable< mtl::compressed2D< Value , Parameters > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp b/inst/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp
index d9c2359c3..50a99e5c4 100644
--- a/inst/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp
@@ -13,12 +13,14 @@
 
 #include <boost/numeric/odeint/util/same_size.hpp>
 
+#include <type_traits>
+
 namespace boost { namespace numeric { namespace odeint {
 
 template<typename T, typename S>
 struct is_resizeable< nt2::container::table<T,S> >
 {
-  typedef boost::true_type type;
+  typedef std::true_type type;
   static const bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp b/inst/include/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp
index a3d299f0a..370da8197 100644
--- a/inst/include/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp
@@ -19,10 +19,10 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_OPENMP_OPENMP_NESTED_ALGEBRA_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_OPENMP_OPENMP_NESTED_ALGEBRA_HPP_INCLUDED
 
-#include <boost/assert.hpp>
 #include <boost/range.hpp>
 #include <boost/numeric/odeint/algebra/norm_result_type.hpp>
 #include <boost/numeric/odeint/util/n_ary_helper.hpp>
+#include <boost/numeric/odeint/tools/assert.hpp>
 
 namespace boost {
 namespace numeric {
@@ -40,7 +40,7 @@ struct openmp_nested_algebra
 #if __cplusplus >= 201103L // C++11 supports _Pragma
 
 #define BOOST_ODEINT_GEN_LOCAL(z, n, unused) \
-    BOOST_ASSERT_MSG( len == boost::size(s ## n), "All nested state ranges must have the same size." ); \
+    BOOST_NUMERIC_ODEINT_ASSERT_MSG( len == boost::size(s ## n), "All nested state ranges must have the same size." ); \
     typename boost::range_iterator<S ## n>::type beg ## n = boost::begin(s ## n);
 #define BOOST_ODEINT_GEN_BODY(n) \
     const size_t len = boost::size(s0); \
diff --git a/inst/include/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp b/inst/include/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp
index 295db647d..d90e88500 100644
--- a/inst/include/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp
@@ -19,10 +19,10 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_OPENMP_OPENMP_RANGE_ALGEBRA_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_OPENMP_OPENMP_RANGE_ALGEBRA_HPP_INCLUDED
 
-#include <boost/assert.hpp>
 #include <boost/range.hpp>
 #include <boost/numeric/odeint/algebra/norm_result_type.hpp>
 #include <boost/numeric/odeint/util/n_ary_helper.hpp>
+#include <boost/numeric/odeint/tools/assert.hpp>
 
 namespace boost {
 namespace numeric {
@@ -38,7 +38,7 @@ struct openmp_range_algebra
 #if __cplusplus >= 201103L // C++11 supports _Pragma
 
 #define BOOST_ODEINT_GEN_LOCAL(z, n, unused) \
-    BOOST_ASSERT_MSG( len == boost::size(s ## n), "All state ranges must have the same size." ); \
+    BOOST_NUMERIC_ODEINT_ASSERT_MSG( len == boost::size(s ## n), "All state ranges must have the same size." ); \
     typename boost::range_iterator<S ## n>::type beg ## n = boost::begin(s ## n);
 #define BOOST_ODEINT_GEN_BODY(n) \
     const size_t len = boost::size(s0); \
diff --git a/inst/include/boost/numeric/odeint/external/openmp/openmp_state.hpp b/inst/include/boost/numeric/odeint/external/openmp/openmp_state.hpp
index 83bbc1923..8b35e804e 100644
--- a/inst/include/boost/numeric/odeint/external/openmp/openmp_state.hpp
+++ b/inst/include/boost/numeric/odeint/external/openmp/openmp_state.hpp
@@ -22,6 +22,7 @@
 #include <omp.h>
 #include <vector>
 #include <algorithm>
+#include <type_traits>
 #include <boost/range/adaptor/sliced.hpp>
 #include <boost/numeric/odeint/util/copy.hpp>
 #include <boost/numeric/odeint/util/split.hpp>
@@ -56,7 +57,7 @@ struct openmp_state : public std::vector< std::vector< T > >
 
 
 template< class T >
-struct is_resizeable< openmp_state< T > > : boost::true_type { };
+struct is_resizeable< openmp_state< T > > : std::true_type { };
 
 
 template< class T >
diff --git a/inst/include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp b/inst/include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp
index 096134635..cbfc08930 100644
--- a/inst/include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp
+++ b/inst/include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp
@@ -53,7 +53,18 @@ struct algebra_dispatcher< thrust::device_vector< T , A > >
 
 #include <thrust/version.h>
 
-#if THRUST_VERSION >= 100600
+#if THRUST_VERSION >= 101000
+
+#include <thrust/detail/vector_base.h>
+namespace boost { namespace numeric { namespace odeint {
+    template< class T , class A >
+    struct algebra_dispatcher< thrust::detail::vector_base< T , A > >
+    {
+        typedef thrust_algebra algebra_type;
+    };
+} } }
+
+#elif THRUST_VERSION >= 100600
 
 // specialization for thrust cpp vector
 #include <thrust/system/cpp/vector.h>
diff --git a/inst/include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp b/inst/include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp
index e9b3a6423..4e9c2d82c 100644
--- a/inst/include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp
+++ b/inst/include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp
@@ -52,7 +52,18 @@ struct operations_dispatcher< thrust::device_vector< T , A > >
 
 #include <thrust/version.h>
 
-#if THRUST_VERSION >= 100600
+#if THRUST_VERSION >= 101000
+
+#include <thrust/detail/vector_base.h>
+namespace boost { namespace numeric { namespace odeint {
+    template< class T , class A >
+    struct operations_dispatcher< thrust::detail::vector_base< T , A > >
+    {
+        typedef thrust_operations operations_type;
+    };
+} } }
+
+#elif THRUST_VERSION >= 100600
 
 // specialization for thrust cpp vector
 #include <thrust/system/cpp/vector.h>
diff --git a/inst/include/boost/numeric/odeint/external/thrust/thrust_resize.hpp b/inst/include/boost/numeric/odeint/external/thrust/thrust_resize.hpp
index 2f7f7b23b..6bb307583 100644
--- a/inst/include/boost/numeric/odeint/external/thrust/thrust_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/thrust/thrust_resize.hpp
@@ -18,6 +18,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_THRUST_THRUST_RESIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_THRUST_THRUST_RESIZE_HPP_INCLUDED
 
+#include <type_traits>
+
 #include <boost/range.hpp>
 
 #include <thrust/device_vector.h>
@@ -38,7 +40,7 @@ namespace odeint {
 template< class T , class A >                               \
 struct is_resizeable< THRUST_VECTOR<T,A> >                  \
 {                                                           \
-    struct type : public boost::true_type { };              \
+    struct type : public std::true_type { };              \
     const static bool value = type::value;                  \
 };                                                          \
 
@@ -140,7 +142,17 @@ ODEINT_THRUST_COPY_IMPL( thrust::host_vector )
 
 #include <thrust/version.h>
 
-#if THRUST_VERSION >= 100600
+#if THRUST_VERSION >= 101000
+
+#include <thrust/detail/vector_base.h>
+namespace boost { namespace numeric { namespace odeint {
+    ODEINT_THRUST_VECTOR_IS_RESIZEABLE( thrust::detail::vector_base )
+    ODEINT_TRHUST_VECTOR_RESIZE_IMPL( thrust::detail::vector_base )
+    ODEINT_THRUST_SAME_SIZE_IMPL( thrust::detail::vector_base )
+    ODEINT_THRUST_COPY_IMPL( thrust::detail::vector_base )
+} } }
+
+#elif THRUST_VERSION >= 100600
 
 #include <thrust/system/cpp/vector.h>
 namespace boost { namespace numeric { namespace odeint {
diff --git a/inst/include/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp b/inst/include/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp
index 2d6291edf..e7bb90a89 100644
--- a/inst/include/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp
@@ -19,6 +19,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_VEXCL_VEXCL_RESIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_VEXCL_VEXCL_RESIZE_HPP_INCLUDED
 
+#include <type_traits>
+
 #include <vexcl/vector.hpp>
 #include <vexcl/multivector.hpp>
 
@@ -36,7 +38,7 @@ namespace odeint {
  * specializations for vex::vector< T >
  */
 template< typename T >
-struct is_resizeable< vex::vector< T > > : boost::true_type { };
+struct is_resizeable< vex::vector< T > > : std::true_type { };
 
 template< typename T >
 struct resize_impl< vex::vector< T > , vex::vector< T > >
@@ -64,7 +66,7 @@ struct same_size_impl< vex::vector< T > , vex::vector< T > >
  * specializations for vex::multivector< T >
  */
 template< typename T , size_t N >
-struct is_resizeable< vex::multivector< T , N > > : boost::true_type { };
+struct is_resizeable< vex::multivector< T , N > > : std::true_type { };
 
 template< typename T , size_t N >
 struct resize_impl< vex::multivector< T , N > , vex::multivector< T , N > >
diff --git a/inst/include/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp b/inst/include/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp
index d3240705b..5f814a91b 100644
--- a/inst/include/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp
+++ b/inst/include/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp
@@ -19,6 +19,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_EXTERNAL_VIENNACL_VIENNACL_RESIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_EXTERNAL_VIENNACL_VIENNACL_RESIZE_HPP_INCLUDED
 
+#include <type_traits>
+
 #include <viennacl/vector.hpp>
 
 #include <boost/numeric/odeint/util/is_resizeable.hpp>
@@ -35,7 +37,7 @@ namespace odeint {
  * specializations for viennacl::vector< T >
  */
 template< typename T >
-struct is_resizeable< viennacl::vector< T > > : boost::true_type { };
+struct is_resizeable< viennacl::vector< T > > : std::true_type { };
 
 template< typename T >
 struct resize_impl< viennacl::vector< T > , viennacl::vector< T > >
diff --git a/inst/include/boost/numeric/odeint/integrate/integrate_adaptive.hpp b/inst/include/boost/numeric/odeint/integrate/integrate_adaptive.hpp
index 09997142f..ee4a7177d 100644
--- a/inst/include/boost/numeric/odeint/integrate/integrate_adaptive.hpp
+++ b/inst/include/boost/numeric/odeint/integrate/integrate_adaptive.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_ADAPTIVE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_ADAPTIVE_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/integrate/null_observer.hpp>
 #include <boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp>
diff --git a/inst/include/boost/numeric/odeint/integrate/integrate_const.hpp b/inst/include/boost/numeric/odeint/integrate/integrate_const.hpp
index fae683f97..32d02d26d 100644
--- a/inst/include/boost/numeric/odeint/integrate/integrate_const.hpp
+++ b/inst/include/boost/numeric/odeint/integrate/integrate_const.hpp
@@ -19,7 +19,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_CONST_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_CONST_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
+#include <type_traits>
 
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/integrate/null_observer.hpp>
@@ -44,7 +44,7 @@ size_t integrate_const(
     typedef typename odeint::unwrap_reference<Stepper>::type::stepper_category stepper_category;
     // we want to get as fast as possible to the end
     // no overflow checks needed
-    if (boost::is_same<null_observer, Observer>::value) {
+    BOOST_IF_CONSTEXPR (std::is_same<null_observer, Observer>::value) {
         return detail::integrate_adaptive(
                 stepper, system, start_state,
                 start_time, end_time, dt,
@@ -77,7 +77,7 @@ size_t integrate_const(
     typedef typename odeint::unwrap_reference<Stepper>::type::stepper_category stepper_category;
     // we want to get as fast as possible to the end
 
-    if (boost::is_same<null_observer, Observer>::value) {
+    BOOST_IF_CONSTEXPR (std::is_same<null_observer, Observer>::value) {
         return detail::integrate_adaptive(
                 stepper, system, start_state,
                 start_time, end_time, dt,
diff --git a/inst/include/boost/numeric/odeint/integrate/integrate_n_steps.hpp b/inst/include/boost/numeric/odeint/integrate/integrate_n_steps.hpp
index 5cc8aa0e7..a0412899f 100644
--- a/inst/include/boost/numeric/odeint/integrate/integrate_n_steps.hpp
+++ b/inst/include/boost/numeric/odeint/integrate/integrate_n_steps.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_N_STEPS_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_N_STEPS_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/integrate/null_observer.hpp>
 #include <boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp>
diff --git a/inst/include/boost/numeric/odeint/integrate/integrate_times.hpp b/inst/include/boost/numeric/odeint/integrate/integrate_times.hpp
index 79fba4f1b..d4bb6b831 100644
--- a/inst/include/boost/numeric/odeint/integrate/integrate_times.hpp
+++ b/inst/include/boost/numeric/odeint/integrate/integrate_times.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_TIMES_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_TIMES_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/range.hpp>
 
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
diff --git a/inst/include/boost/numeric/odeint/integrate/observer_collection.hpp b/inst/include/boost/numeric/odeint/integrate/observer_collection.hpp
index f8c9af8e2..4c4949a13 100644
--- a/inst/include/boost/numeric/odeint/integrate/observer_collection.hpp
+++ b/inst/include/boost/numeric/odeint/integrate/observer_collection.hpp
@@ -19,8 +19,7 @@
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_OBSERVER_COLLECTION_HPP_INCLUDED
 
 #include <vector>
-
-#include <boost/function.hpp>
+#include <functional>
 
 namespace boost {
 namespace numeric {
@@ -31,7 +30,7 @@ class observer_collection
 {
 public:
 
-    typedef boost::function< void( const State& , const Time& ) > observer_type;
+    typedef std::function< void( const State& , const Time& ) > observer_type;
     typedef std::vector< observer_type > collection_type;
 
     void operator()( const State& x , Time t )
diff --git a/inst/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp b/inst/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp
index e5b4b3cf4..96de1c6e9 100644
--- a/inst/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_ITERATOR_DETAIL_ADAPTIVE_ITERATOR_IMPL_HPP_DEFINED
 #define BOOST_NUMERIC_ODEINT_ITERATOR_DETAIL_ADAPTIVE_ITERATOR_IMPL_HPP_DEFINED
 
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <boost/numeric/odeint/util/unit_helper.hpp>
diff --git a/inst/include/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp b/inst/include/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp
index 7a2b48d82..1fd8c50db 100644
--- a/inst/include/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_ITERATOR_DETAIL_TIMES_ITERATOR_IMPL_HPP_DEFINED
 #define BOOST_NUMERIC_ODEINT_ITERATOR_DETAIL_TIMES_ITERATOR_IMPL_HPP_DEFINED
 
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <boost/numeric/odeint/util/unit_helper.hpp>
diff --git a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp
index 3229a00c6..77b4227f1 100644
--- a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_ADAPTIVE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_ADAPTIVE_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/iterator/integrate/null_observer.hpp>
 #include <boost/numeric/odeint/iterator/integrate/detail/integrate_adaptive.hpp>
diff --git a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_const.hpp b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_const.hpp
index ffcea6c19..ce0c29732 100644
--- a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_const.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_const.hpp
@@ -19,7 +19,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_CONST_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_CONST_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
+#include <type_traits>
 
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/iterator/integrate/null_observer.hpp>
@@ -46,7 +46,7 @@ size_t integrate_const(
 {
     typedef typename odeint::unwrap_reference< Stepper >::type::stepper_category stepper_category;
     // we want to get as fast as possible to the end
-    if( boost::is_same< null_observer , Observer >::value )
+    BOOST_IF_CONSTEXPR ( std::is_same< null_observer , Observer >::value )
     {
         return detail::integrate_adaptive(
                 stepper , system , start_state ,
@@ -74,7 +74,7 @@ size_t integrate_const(
 {
     typedef typename odeint::unwrap_reference< Stepper >::type::stepper_category stepper_category;
     // we want to get as fast as possible to the end
-    if( boost::is_same< null_observer , Observer >::value )
+    BOOST_IF_CONSTEXPR ( std::is_same< null_observer , Observer >::value )
     {
         return detail::integrate_adaptive(
                 stepper , system , start_state ,
diff --git a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp
index 8f30c7796..d35ce20cf 100644
--- a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_N_STEPS_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_N_STEPS_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/iterator/integrate/null_observer.hpp>
 #include <boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp>
diff --git a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_times.hpp b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_times.hpp
index 1bbd83673..8d5ab1ec5 100644
--- a/inst/include/boost/numeric/odeint/iterator/integrate/integrate_times.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/integrate/integrate_times.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_TIMES_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_INTEGRATE_TIMES_HPP_INCLUDED
 
-#include <boost/type_traits/is_same.hpp>
-
 #include <boost/range.hpp>
 
 #include <boost/numeric/odeint/stepper/stepper_categories.hpp>
diff --git a/inst/include/boost/numeric/odeint/iterator/integrate/observer_collection.hpp b/inst/include/boost/numeric/odeint/iterator/integrate/observer_collection.hpp
index 26101a3af..8c40378b5 100644
--- a/inst/include/boost/numeric/odeint/iterator/integrate/observer_collection.hpp
+++ b/inst/include/boost/numeric/odeint/iterator/integrate/observer_collection.hpp
@@ -19,8 +19,7 @@
 #define BOOST_NUMERIC_ODEINT_INTEGRATE_OBSERVER_COLLECTION_HPP_INCLUDED
 
 #include <vector>
-
-#include <boost/function.hpp>
+#include <functional>
 
 namespace boost {
 namespace numeric {
@@ -31,7 +30,7 @@ class observer_collection
 {
 public:
 
-    typedef boost::function< void( const State& , const Time& ) > observer_type;
+    typedef std::function< void( const State& , const Time& ) > observer_type;
     typedef std::vector< observer_type > collection_type;
 
     void operator()( const State& x , Time t )
diff --git a/inst/include/boost/numeric/odeint/stepper/adams_bashforth.hpp b/inst/include/boost/numeric/odeint/stepper/adams_bashforth.hpp
index 5ff1e8358..40cd6df1e 100644
--- a/inst/include/boost/numeric/odeint/stepper/adams_bashforth.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/adams_bashforth.hpp
@@ -23,7 +23,6 @@
 
 #include <boost/static_assert.hpp>
 
-#include <boost/numeric/odeint/util/bind.hpp>
 #include <boost/numeric/odeint/util/unwrap_reference.hpp>
 
 #include <boost/numeric/odeint/algebra/range_algebra.hpp>
@@ -85,8 +84,7 @@ class adams_bashforth : public algebra_stepper_base< Algebra , Operations >
 {
 
 #ifndef DOXYGEN_SKIP
-    BOOST_STATIC_ASSERT(( Steps > 0 ));
-    BOOST_STATIC_ASSERT(( Steps < 9 ));
+    static_assert(( Steps > 0 && Steps < 9 ), "Must have between 1 and 8 steps inclusive");
 #endif
 
 public :
@@ -195,7 +193,7 @@ public :
         typename odeint::unwrap_reference< ExplicitStepper >::type &stepper = explicit_stepper;
         typename odeint::unwrap_reference< System >::type &sys = system;
 
-        m_resizer.adjust_size( x , detail::bind( &stepper_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         for( size_t i=0 ; i+1<steps ; ++i )
         {
@@ -211,7 +209,7 @@ public :
     template< class System , class StateIn >
     void initialize( System system , StateIn &x , time_type &t , time_type dt )
     {
-        initialize( detail::ref( m_initializing_stepper ) , system , x , t , dt );
+        initialize( std::ref( m_initializing_stepper ) , system , x , t , dt );
     }
 
     void reset( void )
@@ -234,7 +232,7 @@ public :
     void do_step_impl( System system , const StateIn &in , time_type t , StateOut &out , time_type dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        if( m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) ) )
+        if( m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); } ) )
         {
             m_steps_initialized = 0;
         }
diff --git a/inst/include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp b/inst/include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp
index f3edce198..79998494f 100644
--- a/inst/include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp
@@ -56,8 +56,7 @@ class adams_bashforth_moulton
 {
 
 #ifndef DOXYGEN_SKIP
-    BOOST_STATIC_ASSERT(( Steps > 0 ));
-    BOOST_STATIC_ASSERT(( Steps < 9 ));
+    static_assert(( Steps > 0 && Steps < 9 ), "Must have between 1 and 8 steps inclusive");
 #endif
 
 public :
@@ -164,7 +163,7 @@ public :
     {
         if( m_adams_bashforth.is_initialized() )
         {
-            m_resizer.adjust_size( x , detail::bind( &stepper_type::template resize_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+            m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
             m_adams_bashforth.do_step( system , x , t , m_x.m_v , dt );
             m_adams_moulton.do_step( system , x , m_x.m_v , t+dt , x , dt , m_adams_bashforth.step_storage() );
         }
@@ -179,7 +178,7 @@ public :
     {
         if( m_adams_bashforth.is_initialized() )
         {
-            m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );        
+            m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });      
             m_adams_bashforth.do_step( system , in , t , m_x.m_v , dt );
             m_adams_moulton.do_step( system , in , m_x.m_v , t+dt , out , dt , m_adams_bashforth.step_storage() );
         }
diff --git a/inst/include/boost/numeric/odeint/stepper/adams_moulton.hpp b/inst/include/boost/numeric/odeint/stepper/adams_moulton.hpp
index 05b427773..1bde5b0f5 100644
--- a/inst/include/boost/numeric/odeint/stepper/adams_moulton.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/adams_moulton.hpp
@@ -166,7 +166,7 @@ public :
     void do_step_impl( System system , const StateIn &in , const PredIn &pred , time_type t , StateOut &out , time_type dt , const ABBuf &buf )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
         sys( pred , m_dxdt.m_v , t );
         detail::adams_moulton_call_algebra< steps , algebra_type , operations_type >()( m_algebra , in , out , m_dxdt.m_v , buf , m_coefficients , dt );
     }
diff --git a/inst/include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp b/inst/include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp
index 0d3d0c125..e1ebba5b8 100644
--- a/inst/include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp
@@ -86,7 +86,7 @@ class adaptive_adams_bashforth_moulton: public algebra_stepper_base< Algebra , O
     template< class System >
     void do_step(System system, state_type &inOut, time_type t, time_type dt )
     {
-        m_xnew_resizer.adjust_size( inOut , detail::bind( &stepper_type::template resize_xnew_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(inOut, [this](auto&& arg) { return this->resize_xnew_impl<state_type>(std::forward<decltype(arg)>(arg)); });
     
         do_step(system, inOut, t, m_xnew.m_v, dt, m_xerr.m_v);
         boost::numeric::odeint::copy( m_xnew.m_v , inOut);
@@ -101,7 +101,7 @@ class adaptive_adams_bashforth_moulton: public algebra_stepper_base< Algebra , O
     template< class System >
     void do_step(System system, state_type &inOut, time_type t, time_type dt, state_type &xerr)
     {
-        m_xnew_resizer.adjust_size( inOut , detail::bind( &stepper_type::template resize_xnew_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(inOut, [this](auto&& arg) { return this->resize_xnew_impl<state_type>(std::forward<decltype(arg)>(arg)); });
     
         do_step(system, inOut, t, m_xnew.m_v, dt, xerr);
         boost::numeric::odeint::copy( m_xnew.m_v , inOut);
@@ -128,7 +128,7 @@ class adaptive_adams_bashforth_moulton: public algebra_stepper_base< Algebra , O
         reset();
         dt = dt/static_cast< time_type >(order_value);
 
-        m_dxdt_resizer.adjust_size( inOut , detail::bind( &stepper_type::template resize_dxdt_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_dxdt_resizer.adjust_size(inOut, [this](auto&& arg) { return this->resize_dxdt_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         system( inOut , m_dxdt.m_v , t );
         for( size_t i=0 ; i<order_value; ++i )
@@ -168,8 +168,8 @@ class adaptive_adams_bashforth_moulton: public algebra_stepper_base< Algebra , O
     {
         size_t eO = m_coeff.m_eo;
 
-        m_xerr_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_xerr_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
-        m_dxdt_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_dxdt_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xerr_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_xerr_impl<state_type>(std::forward<decltype(arg)>(arg)); });
+        m_dxdt_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_dxdt_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         m_coeff.predict(t, dt);
         if (m_coeff.m_steps_init == 1)
diff --git a/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp b/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp
index 08009dc16..faba72ae3 100644
--- a/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp
@@ -179,7 +179,7 @@ class explicit_error_stepper_base : public algebra_stepper_base< Algebra , Opera
     do_step( System system , const StateIn &in , time_type t , StateOut &out , time_type dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( in , detail::bind( &internal_stepper_base_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
         sys( in , m_dxdt.m_v ,t );
         this->stepper().do_step_impl( system , in , m_dxdt.m_v , t , out , dt );
     }
@@ -258,7 +258,7 @@ class explicit_error_stepper_base : public algebra_stepper_base< Algebra , Opera
     void do_step( System system , const StateIn &in , time_type t , StateOut &out , time_type dt , Err &xerr )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( in , detail::bind( &internal_stepper_base_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
         sys( in , m_dxdt.m_v ,t );
         this->stepper().do_step_impl( system , in , m_dxdt.m_v , t , out , dt , xerr );
     }
@@ -289,7 +289,7 @@ class explicit_error_stepper_base : public algebra_stepper_base< Algebra , Opera
     void do_step_v1( System system , StateInOut &x , time_type t , time_type dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( x , detail::bind( &internal_stepper_base_type::template resize_impl<StateInOut> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
         sys( x , m_dxdt.m_v , t );
         this->stepper().do_step_impl( system , x , m_dxdt.m_v , t , x , dt );
     }
@@ -298,7 +298,7 @@ class explicit_error_stepper_base : public algebra_stepper_base< Algebra , Opera
     void do_step_v5( System system , StateInOut &x , time_type t , time_type dt , Err &xerr )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( x , detail::bind( &internal_stepper_base_type::template resize_impl<StateInOut> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
         sys( x , m_dxdt.m_v ,t );
         this->stepper().do_step_impl( system , x , m_dxdt.m_v , t , x , dt , xerr );
     }
diff --git a/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp b/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp
index b1d751a0c..6a930a8ee 100644
--- a/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp
@@ -177,7 +177,7 @@ class explicit_error_stepper_fsal_base : public algebra_stepper_base< Algebra ,
     typename boost::disable_if< boost::is_same< StateIn , time_type > , void >::type
     do_step( System system , const StateIn &in , time_type t , StateOut &out , time_type dt )
     {
-        if( m_resizer.adjust_size( in , detail::bind( &internal_stepper_base_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) ) || m_first_call )
+        if( m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); }) || m_first_call )
         {
             initialize( system , in , t );
         }
@@ -251,7 +251,7 @@ class explicit_error_stepper_fsal_base : public algebra_stepper_base< Algebra ,
     template< class System , class StateIn , class StateOut , class Err >
     void do_step( System system , const StateIn &in , time_type t , StateOut &out , time_type dt , Err &xerr )
     {
-        if( m_resizer.adjust_size( in , detail::bind( &internal_stepper_base_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) ) || m_first_call )
+        if( m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); }) || m_first_call )
         {
             initialize( system , in , t );
         }
@@ -310,7 +310,7 @@ class explicit_error_stepper_fsal_base : public algebra_stepper_base< Algebra ,
     template< class System , class StateInOut >
     void do_step_v1( System system , StateInOut &x , time_type t , time_type dt )
     {
-        if( m_resizer.adjust_size( x , detail::bind( &internal_stepper_base_type::template resize_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) ) || m_first_call )
+        if( m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateInOut>(std::forward<decltype(arg)>(arg)); }) || m_first_call )
         {
             initialize( system , x , t );
         }
@@ -320,7 +320,7 @@ class explicit_error_stepper_fsal_base : public algebra_stepper_base< Algebra ,
     template< class System , class StateInOut , class Err >
     void do_step_v5( System system , StateInOut &x , time_type t , time_type dt , Err &xerr )
     {
-        if( m_resizer.adjust_size( x , detail::bind( &internal_stepper_base_type::template resize_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) ) || m_first_call )
+        if( m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateInOut>(std::forward<decltype(arg)>(arg)); }) || m_first_call )
         {
             initialize( system , x , t );
         }
diff --git a/inst/include/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp b/inst/include/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp
index d81c8c7a7..8cb1a6ba3 100644
--- a/inst/include/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp
@@ -162,7 +162,7 @@ class explicit_stepper_base : public algebra_stepper_base< Algebra , Operations
     void do_step( System system , const StateIn &in , time_type t , StateOut &out , time_type dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( in , detail::bind( &internal_stepper_base_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
         sys( in , m_dxdt.m_v ,t );
         this->stepper().do_step_impl( system , in , m_dxdt.m_v , t , out , dt );
     }
@@ -225,7 +225,7 @@ class explicit_stepper_base : public algebra_stepper_base< Algebra , Operations
     void do_step_v1( System system , StateInOut &x , time_type t , time_type dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_resizer.adjust_size( x , detail::bind( &internal_stepper_base_type::template resize_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
         sys( x , m_dxdt.m_v ,t );
         this->stepper().do_step_impl( system , x , m_dxdt.m_v , t , x , dt );
     }
diff --git a/inst/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp b/inst/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp
index eb09aefc8..11dc2cfd2 100644
--- a/inst/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp
@@ -19,7 +19,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_BASE_SYMPLECTIC_RKN_STEPPER_BASE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_BASE_SYMPLECTIC_RKN_STEPPER_BASE_HPP_INCLUDED
 
-#include <boost/array.hpp>
+#include <array>
+#include <type_traits>
 
 #include <boost/numeric/odeint/util/bind.hpp>
 #include <boost/numeric/odeint/util/unwrap_reference.hpp>
@@ -86,7 +87,7 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
 
     static const order_type order_value = Order;
 
-    typedef boost::array< value_type , num_of_stages > coef_type;
+    typedef std::array< value_type , num_of_stages > coef_type;
 
     symplectic_nystroem_stepper_base( const coef_type &coef_a , const coef_type &coef_b , const algebra_type &algebra = algebra_type() )
         : algebra_stepper_base_type( algebra ) , m_coef_a( coef_a ) , m_coef_b( coef_b ) ,
@@ -135,7 +136,7 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
     template< class System , class CoorInOut , class MomentumInOut >
     void do_step( System system , CoorInOut &q , MomentumInOut &p , time_type t , time_type dt )
     {
-        do_step( system , std::make_pair( detail::ref( q ) , detail::ref( p ) ) , t , dt );
+        do_step( system , std::make_pair( std::ref( q ) , std::ref( p ) ) , t , dt );
     }
 
     /**
@@ -145,7 +146,7 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
     template< class System , class CoorInOut , class MomentumInOut >
     void do_step( System system , const CoorInOut &q , const MomentumInOut &p , time_type t , time_type dt )
     {
-        do_step( system , std::make_pair( detail::ref( q ) , detail::ref( p ) ) , t , dt );
+        do_step( system , std::make_pair( std::ref( q ) , std::ref( p ) ) , t , dt );
     }
 
 
@@ -182,7 +183,7 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
 
     // stepper for systems with function for dq/dt = f(p) and dp/dt = -f(q)
     template< class System , class StateIn , class StateOut >
-    void do_step_impl( System system , const StateIn &in , time_type /* t */ , StateOut &out , time_type dt , boost::mpl::true_ )
+    void do_step_impl( System system , const StateIn &in , time_type /* t */ , StateOut &out , time_type dt , std::integral_constant<bool, true> )
     {
         typedef typename odeint::unwrap_reference< System >::type system_type;
         typedef typename odeint::unwrap_reference< typename system_type::first_type >::type coor_deriv_func_type;
@@ -205,8 +206,8 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
         coor_out_type &coor_out = state_out.first;
         momentum_out_type &momentum_out = state_out.second;
 
-        m_dqdt_resizer.adjust_size( coor_in , detail::bind( &internal_stepper_base_type::template resize_dqdt< coor_in_type > , detail::ref( *this ) , detail::_1 ) );
-        m_dpdt_resizer.adjust_size( momentum_in , detail::bind( &internal_stepper_base_type::template resize_dpdt< momentum_in_type > , detail::ref( *this ) , detail::_1 ) );
+        m_dqdt_resizer.adjust_size(coor_in, [this](auto&& arg) { return this->resize_dqdt<coor_in_type>(std::forward<decltype(arg)>(arg)); });
+        m_dpdt_resizer.adjust_size(momentum_in, [this](auto&& arg) { return this->resize_dpdt<momentum_in_type>(std::forward<decltype(arg)>(arg)); });
 
         // ToDo: check sizes?
 
@@ -236,7 +237,7 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
 
     // stepper for systems with only function dp /dt = -f(q), dq/dt = p, time not required but still expected for compatibility reasons
     template< class System , class StateIn , class StateOut >
-    void do_step_impl( System system , const StateIn &in , time_type  /* t */ , StateOut &out , time_type dt , boost::mpl::false_ )
+    void do_step_impl( System system , const StateIn &in , time_type  /* t */ , StateOut &out , time_type dt , std::integral_constant<bool, false> )
     {
         typedef typename odeint::unwrap_reference< System >::type momentum_deriv_func_type;
         momentum_deriv_func_type &momentum_func = system;
@@ -257,8 +258,7 @@ class symplectic_nystroem_stepper_base : public algebra_stepper_base< Algebra ,
 
 
         // m_dqdt not required when called with momentum_func only - don't resize
-        // m_dqdt_resizer.adjust_size( coor_in , detail::bind( &internal_stepper_base_type::template resize_dqdt< coor_in_type > , detail::ref( *this ) , detail::_1 ) );
-        m_dpdt_resizer.adjust_size( momentum_in , detail::bind( &internal_stepper_base_type::template resize_dpdt< momentum_in_type > , detail::ref( *this ) , detail::_1 ) );
+        m_dpdt_resizer.adjust_size(momentum_in, [this](auto&& arg) { return this->resize_dpdt<momentum_in_type>(std::forward<decltype(arg)>(arg)); });
 
 
         // ToDo: check sizes?
diff --git a/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer.hpp b/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer.hpp
index 02c37492b..ec60951f2 100644
--- a/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer.hpp
@@ -152,7 +152,7 @@ class bulirsch_stoer {
     template< class System , class StateInOut , class DerivIn >
     controlled_step_result try_step( System system , StateInOut &x , const DerivIn &dxdt , time_type &t , time_type &dt )
     {
-        m_xnew_resizer.adjust_size( x , detail::bind( &controlled_error_bs_type::template resize_m_xnew< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_xnew<StateInOut>(std::forward<decltype(arg)>(arg)); });
         controlled_step_result res = try_step( system , x , dxdt , t , m_xnew.m_v , dt );
         if( res == success )
         {
@@ -171,7 +171,7 @@ class bulirsch_stoer {
     try_step( System system , const StateIn &in , time_type &t , StateOut &out , time_type &dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_dxdt_resizer.adjust_size( in , detail::bind( &controlled_error_bs_type::template resize_m_dxdt< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_dxdt_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_m_dxdt<StateIn>(std::forward<decltype(arg)>(arg)); });
         sys( in , m_dxdt.m_v , t );
         return try_step( system , in , m_dxdt.m_v , t , out , dt );
     }
@@ -198,7 +198,7 @@ class bulirsch_stoer {
 
         static const value_type val1( 1.0 );
 
-        if( m_resizer.adjust_size( in , detail::bind( &controlled_error_bs_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) ) )
+        if( m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); }) )
         {
             reset(); // system resized -> reset
         }
@@ -388,7 +388,7 @@ class bulirsch_stoer {
     controlled_step_result try_step_v1( System system , StateInOut &x , time_type &t , time_type &dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_dxdt_resizer.adjust_size( x , detail::bind( &controlled_error_bs_type::template resize_m_dxdt< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+        m_dxdt_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_dxdt<StateInOut>(std::forward<decltype(arg)>(arg)); });
         sys( x , m_dxdt.m_v ,t );
         return try_step( system , x , m_dxdt.m_v , t , dt );
     }
diff --git a/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp b/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp
index 22eb373bb..1b2321d26 100644
--- a/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp
@@ -45,9 +45,6 @@
 
 #include <boost/numeric/odeint/integrate/max_step_checker.hpp>
 
-#include <boost/type_traits.hpp>
-
-
 namespace boost {
 namespace numeric {
 namespace odeint {
@@ -311,7 +308,7 @@ class bulirsch_stoer_dense_out {
     template< class StateType >
     void initialize( const StateType &x0 , const time_type &t0 , const time_type &dt0 )
     {
-        m_resizer.adjust_size( x0 , detail::bind( &controlled_error_bs_type::template resize_impl< StateType > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x0, [this](auto&& arg) { return this->resize_impl<StateType>(std::forward<decltype(arg)>(arg)); });
         boost::numeric::odeint::copy( x0 , get_current_state() );
         m_t = t0;
         m_dt = dt0;
diff --git a/inst/include/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp b/inst/include/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp
index 85ee4d01c..68157dae8 100644
--- a/inst/include/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp
@@ -53,7 +53,7 @@ class default_order_adjuster
     : m_algebra( algebra )
     {};
 
-    size_t adjust_order(size_t order, size_t init, boost::array<wrapped_state_type, 4> &xerr)
+    size_t adjust_order(size_t order, size_t init, std::array<wrapped_state_type, 4> &xerr)
     {
         using std::abs;
 
@@ -149,7 +149,7 @@ class controlled_adams_bashforth_moulton
 
     typedef typename stepper_type::wrapped_state_type wrapped_state_type;
     typedef typename stepper_type::wrapped_deriv_type wrapped_deriv_type;
-    typedef boost::array< wrapped_state_type , 4 > error_storage_type;
+    typedef std::array< wrapped_state_type , 4 > error_storage_type;
 
     typedef typename stepper_type::coeff_type coeff_type;
     typedef controlled_adams_bashforth_moulton< ErrorStepper , StepAdjuster , OrderAdjuster , Resizer > controlled_stepper_type;
@@ -178,7 +178,7 @@ class controlled_adams_bashforth_moulton
         reset();
         coeff_type &coeff = m_stepper.coeff();
 
-        m_dxdt_resizer.adjust_size( inOut , detail::bind( &controlled_stepper_type::template resize_dxdt_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_dxdt_resizer.adjust_size(inOut, [this](auto&& arg) { return this->resize_dxdt_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         controlled_step_result res = fail;
 
@@ -206,7 +206,7 @@ class controlled_adams_bashforth_moulton
     template< class System >
     controlled_step_result try_step(System system, state_type & inOut, time_type &t, time_type &dt)
     {
-        m_xnew_resizer.adjust_size( inOut , detail::bind( &controlled_stepper_type::template resize_xnew_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(inOut, [this](auto&& arg) { return this->resize_xnew_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         controlled_step_result res = try_step(system, inOut, t, m_xnew.m_v, dt);
 
@@ -221,8 +221,8 @@ class controlled_adams_bashforth_moulton
     template< class System >
     controlled_step_result try_step(System system, const state_type & in, time_type &t, state_type & out, time_type &dt)
     {
-        m_xerr_resizer.adjust_size( in , detail::bind( &controlled_stepper_type::template resize_xerr_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
-        m_dxdt_resizer.adjust_size( in , detail::bind( &controlled_stepper_type::template resize_dxdt_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xerr_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_xerr_impl<state_type>(std::forward<decltype(arg)>(arg)); });
+        m_dxdt_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_dxdt_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         m_stepper.do_step_impl(system, in, t, out, dt, m_xerr[2].m_v);
 
diff --git a/inst/include/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp b/inst/include/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp
index be00827f6..be2555bda 100644
--- a/inst/include/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp
@@ -263,7 +263,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster, Resize
      * \brief Tries to perform one step.
      *
      * This method tries to do one step with step size dt. If the error estimate
-     * is to large, the step is rejected and the method returns fail and the 
+     * is too large, the step is rejected and the method returns fail and the 
      * step size dt is reduced. If the error estimate is acceptably small, the
      * step is performed, success is returned and dt might be increased to make 
      * the steps as large as possible. This method also updates t if a step is
@@ -337,7 +337,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster, Resize
     template< class System , class StateInOut , class DerivIn >
     controlled_step_result try_step( System system , StateInOut &x , const DerivIn &dxdt , time_type &t , time_type &dt )
     {
-        m_xnew_resizer.adjust_size( x , detail::bind( &controlled_runge_kutta::template resize_m_xnew_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_xnew_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
         controlled_step_result res = try_step( system , x , dxdt , t , m_xnew.m_v , dt );
         if( res == success )
         {
@@ -378,7 +378,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster, Resize
     try_step( System system , const StateIn &in , time_type &t , StateOut &out , time_type &dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_dxdt_resizer.adjust_size( in , detail::bind( &controlled_runge_kutta::template resize_m_dxdt_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_dxdt_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_m_dxdt_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
         sys( in , m_dxdt.m_v , t );
         return try_step( system , in , m_dxdt.m_v , t , out , dt );
     }
@@ -419,7 +419,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster, Resize
             return fail;
         }
 
-        m_xerr_resizer.adjust_size( in , detail::bind( &controlled_runge_kutta::template resize_m_xerr_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_xerr_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_m_xerr_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         // do one step with error calculation
         m_stepper.do_step( system , in , dxdt , t , out , dt , m_xerr.m_v );
@@ -478,7 +478,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster, Resize
     controlled_step_result try_step_v1( System system , StateInOut &x , time_type &t , time_type &dt )
     {
         typename odeint::unwrap_reference< System >::type &sys = system;
-        m_dxdt_resizer.adjust_size( x , detail::bind( &controlled_runge_kutta::template resize_m_dxdt_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+        m_dxdt_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_dxdt_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
         sys( x , m_dxdt.m_v ,t );
         return try_step( system , x , m_dxdt.m_v , t , dt );
     }
@@ -678,7 +678,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster , Resiz
     typename boost::disable_if< boost::is_same< StateIn , time_type > , controlled_step_result >::type
     try_step( System system , const StateIn &in , time_type &t , StateOut &out , time_type &dt )
     {
-        if( m_dxdt_resizer.adjust_size( in , detail::bind( &controlled_runge_kutta::template resize_m_dxdt_impl< StateIn > , detail::ref( *this ) , detail::_1 ) ) || m_first_call )
+        if( m_dxdt_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_m_dxdt_impl<StateIn>(std::forward<decltype(arg)>(arg)); }) || m_first_call )
         {
             initialize( system , in , t );
         }
@@ -713,8 +713,8 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster , Resiz
     template< class System , class StateInOut , class DerivInOut >
     controlled_step_result try_step( System system , StateInOut &x , DerivInOut &dxdt , time_type &t , time_type &dt )
     {
-        m_xnew_resizer.adjust_size( x , detail::bind( &controlled_runge_kutta::template resize_m_xnew_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );
-        m_dxdt_new_resizer.adjust_size( x , detail::bind( &controlled_runge_kutta::template resize_m_dxdt_new_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_xnew_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
+        m_dxdt_new_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_dxdt_new_impl<StateInOut>(std::forward<decltype(arg)>(arg)); });
         controlled_step_result res = try_step( system , x , dxdt , t , m_xnew.m_v , m_dxdtnew.m_v , dt );
         if( res == success )
         {
@@ -761,7 +761,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster , Resiz
             return fail;
         }
 
-        m_xerr_resizer.adjust_size( in , detail::bind( &controlled_runge_kutta::template resize_m_xerr_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_xerr_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_m_xerr_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         //fsal: m_stepper.get_dxdt( dxdt );
         //fsal: m_stepper.do_step( sys , x , dxdt , t , dt , m_x_err );
@@ -895,7 +895,7 @@ class controlled_runge_kutta< ErrorStepper , ErrorChecker , StepAdjuster , Resiz
     template< class System , class StateInOut >
     controlled_step_result try_step_v1( System system , StateInOut &x , time_type &t , time_type &dt )
     {
-        if( m_dxdt_resizer.adjust_size( x , detail::bind( &controlled_runge_kutta::template resize_m_dxdt_impl< StateInOut > , detail::ref( *this ) , detail::_1 ) ) || m_first_call )
+        if( m_dxdt_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_dxdt_impl<StateInOut>(std::forward<decltype(arg)>(arg)); }) || m_first_call )
         {
             initialize( system , x , t );
         }
diff --git a/inst/include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp b/inst/include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp
index 83982dc7b..ab8a29a2a 100644
--- a/inst/include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp
@@ -105,7 +105,7 @@ class dense_output_runge_kutta< Stepper , stepper_tag >
     template< class StateType >
     void initialize( const StateType &x0 , time_type t0 , time_type dt0 )
     {
-        m_resizer.adjust_size( x0 , detail::bind( &dense_output_stepper_type::template resize_impl< StateType > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x0, [this](auto&& arg) { return this->resize_impl<StateType>(std::forward<decltype(arg)>(arg)); });
         boost::numeric::odeint::copy( x0 , get_current_state() );
         m_t = t0;
         m_dt = dt0;
@@ -313,7 +313,7 @@ class dense_output_runge_kutta< Stepper , explicit_controlled_stepper_fsal_tag >
     template< class StateType >
     void initialize( const StateType &x0 , time_type t0 , time_type dt0 )
     {
-        m_resizer.adjust_size( x0 , detail::bind( &dense_output_stepper_type::template resize< StateType > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x0, [this](auto&& arg) { return this->resize<StateType>(std::forward<decltype(arg)>(arg)); });
         boost::numeric::odeint::copy( x0 , get_current_state() );
         m_t = t0;
         m_dt = dt0;
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp b/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp
index cc279abbe..835a641e6 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp
@@ -18,8 +18,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_BASHFORTH_CALL_ALGEBRA_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_BASHFORTH_CALL_ALGEBRA_HPP_INCLUDED
 
-#include <boost/assert.hpp>
-
+#include <cstddef>
 
 namespace boost {
 namespace numeric {
@@ -115,7 +114,6 @@ struct adams_bashforth_call_algebra< 7 , Algebra , Operations >
     template< class StateIn , class StateOut , class StepStorage , class Coefficients , class Time >
     void operator()( Algebra &algebra , const StateIn &in , StateOut &out , const StepStorage &steps , const Coefficients &coef , Time dt ) const
     {
-        //BOOST_ASSERT( false ); // not implemented
         typedef typename Coefficients::value_type value_type;
         algebra.for_each9( out , in , steps[0].m_v , steps[1].m_v , steps[2].m_v , steps[3].m_v , steps[4].m_v , steps[5].m_v , steps[6].m_v ,
                             typename Operations::template scale_sum8< value_type , Time , Time , Time , Time , Time , Time >(
@@ -130,7 +128,6 @@ struct adams_bashforth_call_algebra< 8 , Algebra , Operations >
     template< class StateIn , class StateOut , class StepStorage , class Coefficients , class Time >
     void operator()( Algebra &algebra , const StateIn &in , StateOut &out , const StepStorage &steps , const Coefficients &coef , Time dt ) const
     {
-        //BOOST_ASSERT( false ); // not implemented
         typedef typename Coefficients::value_type value_type;
         algebra.for_each10( out , in , steps[0].m_v , steps[1].m_v , steps[2].m_v , steps[3].m_v , steps[4].m_v , steps[5].m_v , steps[6].m_v , steps[7].m_v ,
                              typename Operations::template scale_sum9< value_type , Time , Time , Time , Time , Time , Time , Time >(
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp b/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp
index 26a9f9a6b..5a7cdf214 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp
@@ -18,7 +18,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_BASHFORTH_COEFFICIENTS_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_BASHFORTH_COEFFICIENTS_HPP_INCLUDED
 
-#include <boost/array.hpp>
+#include <array>
 
 
 namespace boost {
@@ -30,11 +30,11 @@ template< class Value , size_t Steps >
 class adams_bashforth_coefficients ;
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 1 > : public boost::array< Value , 1 >
+class adams_bashforth_coefficients< Value , 1 > : public std::array< Value , 1 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 1 >()
+    : std::array< Value , 1 >()
       {
         (*this)[0] = static_cast< Value >( 1 );
       }
@@ -42,11 +42,11 @@ class adams_bashforth_coefficients< Value , 1 > : public boost::array< Value , 1
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 2 > : public boost::array< Value , 2 >
+class adams_bashforth_coefficients< Value , 2 > : public std::array< Value , 2 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 2 >()
+    : std::array< Value , 2 >()
       {
         (*this)[0] = static_cast< Value >( 3 ) / static_cast< Value >( 2 );
         (*this)[1] = -static_cast< Value >( 1 ) / static_cast< Value >( 2 );
@@ -55,11 +55,11 @@ class adams_bashforth_coefficients< Value , 2 > : public boost::array< Value , 2
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 3 > : public boost::array< Value , 3 >
+class adams_bashforth_coefficients< Value , 3 > : public std::array< Value , 3 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 3 >()
+    : std::array< Value , 3 >()
       {
         (*this)[0] = static_cast< Value >( 23 ) / static_cast< Value >( 12 );
         (*this)[1] = -static_cast< Value >( 4 ) / static_cast< Value >( 3 );
@@ -69,11 +69,11 @@ class adams_bashforth_coefficients< Value , 3 > : public boost::array< Value , 3
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 4 > : public boost::array< Value , 4 >
+class adams_bashforth_coefficients< Value , 4 > : public std::array< Value , 4 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 4 >()
+    : std::array< Value , 4 >()
       {
         (*this)[0] = static_cast< Value >( 55 ) / static_cast< Value >( 24 );
         (*this)[1] = -static_cast< Value >( 59 ) / static_cast< Value >( 24 );
@@ -84,11 +84,11 @@ class adams_bashforth_coefficients< Value , 4 > : public boost::array< Value , 4
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 5 > : public boost::array< Value , 5 >
+class adams_bashforth_coefficients< Value , 5 > : public std::array< Value , 5 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 5 >()
+    : std::array< Value , 5 >()
       {
         (*this)[0] = static_cast< Value >( 1901 ) / static_cast< Value >( 720 );
         (*this)[1] = -static_cast< Value >( 1387 ) / static_cast< Value >( 360 );
@@ -100,11 +100,11 @@ class adams_bashforth_coefficients< Value , 5 > : public boost::array< Value , 5
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 6 > : public boost::array< Value , 6 >
+class adams_bashforth_coefficients< Value , 6 > : public std::array< Value , 6 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 6 >()
+    : std::array< Value , 6 >()
       {
         (*this)[0] = static_cast< Value >( 4277 ) / static_cast< Value >( 1440 );
         (*this)[1] = -static_cast< Value >( 2641 ) / static_cast< Value >( 480 );
@@ -117,11 +117,11 @@ class adams_bashforth_coefficients< Value , 6 > : public boost::array< Value , 6
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 7 > : public boost::array< Value , 7 >
+class adams_bashforth_coefficients< Value , 7 > : public std::array< Value , 7 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 7 >()
+    : std::array< Value , 7 >()
       {
         (*this)[0] = static_cast< Value >( 198721 ) / static_cast< Value >( 60480 );
         (*this)[1] = -static_cast< Value >( 18637 ) / static_cast< Value >( 2520 );
@@ -135,11 +135,11 @@ class adams_bashforth_coefficients< Value , 7 > : public boost::array< Value , 7
 
 
 template< class Value >
-class adams_bashforth_coefficients< Value , 8 > : public boost::array< Value , 8 >
+class adams_bashforth_coefficients< Value , 8 > : public std::array< Value , 8 >
 {
 public:
     adams_bashforth_coefficients( void )
-    : boost::array< Value , 8 >()
+    : std::array< Value , 8 >()
       {
         (*this)[0] = static_cast< Value >( 16083 ) / static_cast< Value >( 4480 );
         (*this)[1] = -static_cast< Value >( 1152169 ) / static_cast< Value >( 120960 );
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp b/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp
index b6f5f2a40..5d7837a9d 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp
@@ -18,7 +18,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_MOULTON_CALL_ALGEBRA_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_MOULTON_CALL_ALGEBRA_HPP_INCLUDED
 
-#include <boost/assert.hpp> 
+#include <cstddef>
 
 namespace boost {
 namespace numeric {
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp b/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp
index 8047fa8ae..22ba8de14 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp
@@ -19,7 +19,7 @@
 #define BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ADAMS_MOULTON_COEFFICIENTS_HPP_INCLUDED
 
 
-#include <boost/array.hpp>
+#include <array>
 
 
 namespace boost {
@@ -31,11 +31,11 @@ template< class Value , size_t Steps >
 class adams_moulton_coefficients ;
 
 template< class Value >
-class adams_moulton_coefficients< Value , 1 > : public boost::array< Value , 1 >
+class adams_moulton_coefficients< Value , 1 > : public std::array< Value , 1 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 1 >()
+    : std::array< Value , 1 >()
       {
         (*this)[0] = static_cast< Value >( 1 );
       }
@@ -43,11 +43,11 @@ class adams_moulton_coefficients< Value , 1 > : public boost::array< Value , 1 >
 
 
 template< class Value >
-class adams_moulton_coefficients< Value , 2 > : public boost::array< Value , 2 >
+class adams_moulton_coefficients< Value , 2 > : public std::array< Value , 2 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 2 >()
+    : std::array< Value , 2 >()
       {
         (*this)[0] = static_cast< Value >( 1 ) / static_cast< Value >( 2 );
         (*this)[1] = static_cast< Value >( 1 ) / static_cast< Value >( 2 );
@@ -56,11 +56,11 @@ class adams_moulton_coefficients< Value , 2 > : public boost::array< Value , 2 >
 
 
 template< class Value >
-class adams_moulton_coefficients< Value , 3 > : public boost::array< Value , 3 >
+class adams_moulton_coefficients< Value , 3 > : public std::array< Value , 3 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 3 >()
+    : std::array< Value , 3 >()
       {
         (*this)[0] = static_cast< Value >( 5 ) / static_cast< Value >( 12 );
         (*this)[1] = static_cast< Value >( 2 ) / static_cast< Value >( 3 );
@@ -70,11 +70,11 @@ class adams_moulton_coefficients< Value , 3 > : public boost::array< Value , 3 >
 
 
 template< class Value >
-class adams_moulton_coefficients< Value , 4 > : public boost::array< Value , 4 >
+class adams_moulton_coefficients< Value , 4 > : public std::array< Value , 4 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 4 >()
+    : std::array< Value , 4 >()
       {
         (*this)[0] = static_cast< Value >( 3 ) / static_cast< Value >( 8 );
         (*this)[1] = static_cast< Value >( 19 ) / static_cast< Value >( 24 );
@@ -85,11 +85,11 @@ class adams_moulton_coefficients< Value , 4 > : public boost::array< Value , 4 >
 
 
 template< class Value >
-class adams_moulton_coefficients< Value , 5 > : public boost::array< Value , 5 >
+class adams_moulton_coefficients< Value , 5 > : public std::array< Value , 5 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 5 >()
+    : std::array< Value , 5 >()
       {
         (*this)[0] = static_cast< Value >( 251 ) / static_cast< Value >( 720 );
         (*this)[1] = static_cast< Value >( 323 ) / static_cast< Value >( 360 );
@@ -101,11 +101,11 @@ class adams_moulton_coefficients< Value , 5 > : public boost::array< Value , 5 >
 
 
 template< class Value >
-class adams_moulton_coefficients< Value , 6 > : public boost::array< Value , 6 >
+class adams_moulton_coefficients< Value , 6 > : public std::array< Value , 6 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 6 >()
+    : std::array< Value , 6 >()
       {
         (*this)[0] = static_cast< Value >( 95 ) / static_cast< Value >( 288 );
         (*this)[1] = static_cast< Value >( 1427 ) / static_cast< Value >( 1440 );
@@ -117,11 +117,11 @@ class adams_moulton_coefficients< Value , 6 > : public boost::array< Value , 6 >
 };
 
 template< class Value >
-class adams_moulton_coefficients< Value , 7 > : public boost::array< Value , 7 >
+class adams_moulton_coefficients< Value , 7 > : public std::array< Value , 7 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 7 >()
+    : std::array< Value , 7 >()
       {
         (*this)[0] = static_cast< Value >( 19087 ) / static_cast< Value >( 60480 );
         (*this)[1] = static_cast< Value >( 2713 ) / static_cast< Value >( 2520 );
@@ -135,11 +135,11 @@ class adams_moulton_coefficients< Value , 7 > : public boost::array< Value , 7 >
 
 
 template< class Value >
-class adams_moulton_coefficients< Value , 8 > : public boost::array< Value , 8 >
+class adams_moulton_coefficients< Value , 8 > : public std::array< Value , 8 >
 {
 public:
     adams_moulton_coefficients( void )
-    : boost::array< Value , 8 >()
+    : std::array< Value , 8 >()
       {
         (*this)[0] = static_cast< Value >( 5257 ) / static_cast< Value >( 17280 );
         (*this)[1] = static_cast< Value >( 139849 ) / static_cast< Value >( 120960 );
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp b/inst/include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp
index c1029a167..f36f93fb0 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp
@@ -27,7 +27,7 @@
 #include <boost/numeric/odeint/algebra/algebra_dispatcher.hpp>
 #include <boost/numeric/odeint/algebra/operations_dispatcher.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 namespace boost {
 namespace numeric {
@@ -132,7 +132,7 @@ class adaptive_adams_coefficients
 
     void do_step(const deriv_type &dxdt, const int o = 0)
     {
-        m_phi_resizer.adjust_size( dxdt , detail::bind( &aac_type::template resize_phi_impl< deriv_type > , detail::ref( *this ) , detail::_1 ) );
+        m_phi_resizer.adjust_size(dxdt, [this](auto&& arg) { return this->resize_phi_impl<deriv_type>(std::forward<decltype(arg)>(arg)); });
 
         phi[o][0].m_v = dxdt;
 
@@ -168,10 +168,10 @@ class adaptive_adams_coefficients
     size_t m_eo;
     size_t m_steps_init;
 
-    rotating_buffer<boost::array<value_type, order_value+1>, 2> beta; // beta[0] = beta(n)
-    rotating_buffer<boost::array<wrapped_deriv_type, order_value+2>, 3> phi; // phi[0] = phi(n+1)
-    boost::array<value_type, order_value + 2> g;
-    boost::array<value_type, 14> gs;
+    rotating_buffer<std::array<value_type, order_value+1>, 2> beta; // beta[0] = beta(n)
+    rotating_buffer<std::array<wrapped_deriv_type, order_value+2>, 3> phi; // phi[0] = phi(n+1)
+    std::array<value_type, order_value + 2> g;
+    std::array<value_type, 14> gs;
 
 private:
     template< class StateType >
@@ -192,7 +192,7 @@ class adaptive_adams_coefficients
 
     time_storage_type m_time_storage;
     static const size_t c_size = order_value + 2;
-    boost::array<value_type, c_size*c_size> c;
+    std::array<value_type, c_size*c_size> c;
 
     algebra_type m_algebra;
 
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp b/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp
index ab74b24ee..46ca997c9 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp
@@ -33,7 +33,7 @@
 #include <boost/fusion/mpl.hpp>
 #include <boost/fusion/sequence.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 #include <boost/numeric/odeint/algebra/range_algebra.hpp>
 #include <boost/numeric/odeint/algebra/default_operations.hpp>
@@ -49,14 +49,14 @@ namespace detail {
 template< class T , class Constant >
 struct array_wrapper
 {
-    typedef const typename boost::array< T , Constant::value > type;
+    typedef const typename std::array< T , Constant::value > type;
 };
 
 template< class T , size_t i >
 struct stage
 {
     T c;
-    boost::array< T , i > a;
+    std::array< T , i > a;
 };
 
 
@@ -91,8 +91,8 @@ class generic_rk_algorithm {
     >::type
     >::type coef_a_type;
 
-    typedef boost::array< Value , StageCount > coef_b_type;
-    typedef boost::array< Value , StageCount > coef_c_type;
+    typedef std::array< Value , StageCount > coef_b_type;
+    typedef std::array< Value , StageCount > coef_c_type;
 
     typedef typename boost::fusion::result_of::as_vector
             <
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp b/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp
index 2cce3f4d0..add68edff 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp
@@ -30,7 +30,7 @@ struct generic_rk_scale_sum;
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 1 , Operations , Fac , Time > : public Operations::template scale_sum2< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,1> &a , Time dt ) : Operations::template scale_sum2< Fac , Time >( 1.0 , a[0]*dt )
+    generic_rk_scale_sum( const std::array<Fac,1> &a , Time dt ) : Operations::template scale_sum2< Fac , Time >( 1.0 , a[0]*dt )
                 { }
 
     typedef void result_type;
@@ -40,7 +40,7 @@ struct generic_rk_scale_sum< 1 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 2 , Operations , Fac , Time > : public Operations::template scale_sum3< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,2> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,2> &a , Time dt )
                     : Operations::template scale_sum3< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt )
                       { }
 
@@ -50,7 +50,7 @@ struct generic_rk_scale_sum< 2 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 3 , Operations , Fac , Time > : public Operations::template scale_sum4< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,3> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,3> &a , Time dt )
                     : Operations::template scale_sum4< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt )
                       { }
 
@@ -60,7 +60,7 @@ struct generic_rk_scale_sum< 3 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 4 , Operations , Fac , Time > : public Operations::template scale_sum5< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,4> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,4> &a , Time dt )
                     : Operations::template scale_sum5< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt )
                       { }
 
@@ -70,7 +70,7 @@ struct generic_rk_scale_sum< 4 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 5 , Operations , Fac , Time > : public Operations::template scale_sum6< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,5> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,5> &a , Time dt )
                     : Operations::template scale_sum6< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt )
                       { }
 
@@ -80,7 +80,7 @@ struct generic_rk_scale_sum< 5 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 6 , Operations , Fac , Time > : public Operations::template scale_sum7< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,6> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,6> &a , Time dt )
                     : Operations::template scale_sum7< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt , a[5]*dt )
                       { }
 
@@ -90,7 +90,7 @@ struct generic_rk_scale_sum< 6 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 7 , Operations , Fac , Time > : public Operations::template scale_sum8< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,7> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,7> &a , Time dt )
                     : Operations::template scale_sum8< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt , a[5]*dt , a[6]*dt )
                       { }
 
@@ -100,7 +100,7 @@ struct generic_rk_scale_sum< 7 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 8 , Operations , Fac , Time > : public Operations::template scale_sum9< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,8> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,8> &a , Time dt )
                     : Operations::template scale_sum9< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt ,
                             a[5]*dt , a[6]*dt , a[7]*dt )
                       { }
@@ -111,7 +111,7 @@ struct generic_rk_scale_sum< 8 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 9 , Operations , Fac , Time > : public Operations::template scale_sum10< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,9> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,9> &a , Time dt )
                     : Operations::template scale_sum10< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt ,
                             a[5]*dt , a[6]*dt , a[7]*dt , a[8]*dt )
                       { }
@@ -122,7 +122,7 @@ struct generic_rk_scale_sum< 9 , Operations , Fac , Time > : public Operations::
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 10 , Operations , Fac , Time > : public Operations::template scale_sum11< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,10> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,10> &a , Time dt )
                     : Operations::template scale_sum11< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt ,
                             a[5]*dt , a[6]*dt , a[7]*dt , a[8]*dt , a[9]*dt )
                       { }
@@ -133,7 +133,7 @@ struct generic_rk_scale_sum< 10 , Operations , Fac , Time > : public Operations:
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 11 , Operations , Fac , Time > : public Operations::template scale_sum12< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,11> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,11> &a , Time dt )
                     : Operations::template scale_sum12< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt ,
                             a[5]*dt , a[6]*dt , a[7]*dt , a[8]*dt , a[9]*dt , a[10]*dt )
                       { }
@@ -144,7 +144,7 @@ struct generic_rk_scale_sum< 11 , Operations , Fac , Time > : public Operations:
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 12 , Operations , Fac , Time > : public Operations::template scale_sum13< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,12> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,12> &a , Time dt )
                     : Operations::template scale_sum13< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt ,
                             a[5]*dt , a[6]*dt , a[7]*dt , a[8]*dt , a[9]*dt , a[10]*dt , a[11]*dt )
                       { }
@@ -155,7 +155,7 @@ struct generic_rk_scale_sum< 12 , Operations , Fac , Time > : public Operations:
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum< 13 , Operations , Fac , Time > : public Operations::template scale_sum14< Fac , Time >
 {
-    generic_rk_scale_sum( const boost::array<Fac,13> &a , Time dt )
+    generic_rk_scale_sum( const std::array<Fac,13> &a , Time dt )
                     : Operations::template scale_sum14< Fac , Time >( 1.0 , a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt ,
                             a[5]*dt , a[6]*dt , a[7]*dt , a[8]*dt , a[9]*dt , a[10]*dt , a[11]*dt , a[12]*dt  )
                       { }
@@ -171,7 +171,7 @@ struct generic_rk_scale_sum_err;
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 1 , Operations , Fac , Time > : public Operations::template scale_sum1< Time >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,1> &a , Time dt ) : Operations::template scale_sum1< Time >( a[0]*dt )
+    generic_rk_scale_sum_err( const std::array<Fac,1> &a , Time dt ) : Operations::template scale_sum1< Time >( a[0]*dt )
                 { }
 
     typedef void result_type;
@@ -181,7 +181,7 @@ struct generic_rk_scale_sum_err< 1 , Operations , Fac , Time > : public Operatio
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 2 , Operations , Fac , Time > : public Operations::template scale_sum2< Time >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,2> &a , Time dt )
+    generic_rk_scale_sum_err( const std::array<Fac,2> &a , Time dt )
                     : Operations::template scale_sum2< Time >( a[0]*dt , a[1]*dt )
                       { }
 
@@ -191,7 +191,7 @@ struct generic_rk_scale_sum_err< 2 , Operations , Fac , Time > : public Operatio
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 3 , Operations , Fac , Time > : public Operations::template scale_sum3< Time >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,3> &a , Time dt )
+    generic_rk_scale_sum_err( const std::array<Fac,3> &a , Time dt )
                     : Operations::template scale_sum3< Time >( a[0]*dt , a[1]*dt , a[2]*dt )
                       { }
 
@@ -201,7 +201,7 @@ struct generic_rk_scale_sum_err< 3 , Operations , Fac , Time > : public Operatio
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 4 , Operations , Fac , Time > : public Operations::template scale_sum4< Time >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,4> &a , Time dt )
+    generic_rk_scale_sum_err( const std::array<Fac,4> &a , Time dt )
                     : Operations::template scale_sum4< Time >( a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt )
                       { }
 
@@ -211,7 +211,7 @@ struct generic_rk_scale_sum_err< 4 , Operations , Fac , Time > : public Operatio
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 5 , Operations , Fac , Time > : public Operations::template scale_sum5< Fac >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,5> &a , Time dt )
+    generic_rk_scale_sum_err( const std::array<Fac,5> &a , Time dt )
                     : Operations::template scale_sum5< Time >( a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt )
                       { }
 
@@ -222,7 +222,7 @@ struct generic_rk_scale_sum_err< 5 , Operations , Fac , Time > : public Operatio
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 6 , Operations , Fac , Time > : public Operations::template scale_sum6< Time >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,6> &a , Time dt )
+    generic_rk_scale_sum_err( const std::array<Fac,6> &a , Time dt )
                     : Operations::template scale_sum6< Time >( a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt , a[5]*dt )
                       { }
 
@@ -234,7 +234,7 @@ struct generic_rk_scale_sum_err< 6 , Operations , Fac , Time > : public Operatio
 template< class Operations , class Fac , class Time >
 struct generic_rk_scale_sum_err< 13 , Operations , Fac , Time > : public Operations::template scale_sum13< Time >
 {
-    generic_rk_scale_sum_err( const boost::array<Fac,13> &a , Time dt )
+    generic_rk_scale_sum_err( const std::array<Fac,13> &a , Time dt )
                     : Operations::template scale_sum13< Time >( a[0]*dt , a[1]*dt , a[2]*dt , a[3]*dt , a[4]*dt , a[5]*dt ,
                         a[6]*dt , a[7]*dt , a[8]*dt , a[9]*dt , a[10]*dt , a[11]*dt , a[12]*dt )
                       { }
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp b/inst/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp
index 2dee6ed19..3114d2ac4 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp
@@ -15,7 +15,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_PID_STEP_ADJUSTER_COEFFICIENTS_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_PID_STEP_ADJUSTER_COEFFICIENTS_HPP_INCLUDED
 
-#include <boost/array.hpp>
+#include <array>
 
 namespace boost {
 namespace numeric {
@@ -38,11 +38,11 @@ template<int Type>
 class pid_step_adjuster_coefficients;
 
 template<>
-class pid_step_adjuster_coefficients<BASIC> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<BASIC> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0;
         (*this)[1] = 0.0;
@@ -53,11 +53,11 @@ class pid_step_adjuster_coefficients<BASIC> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H0211> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H0211> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0 / 2.0;
         (*this)[1] = 1.0 / 2.0;
@@ -68,11 +68,11 @@ class pid_step_adjuster_coefficients<H0211> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H211b> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H211b> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0 / 5.0;
         (*this)[1] = 2.0 / 5.0;
@@ -83,11 +83,11 @@ class pid_step_adjuster_coefficients<H211b> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H211PI> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H211PI> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0 / 6.0;
         (*this)[1] = 2.0 / 6.0;
@@ -98,11 +98,11 @@ class pid_step_adjuster_coefficients<H211PI> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H0312> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H0312> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0 / 4.0;
         (*this)[1] = 2.0 / 2.0;
@@ -113,11 +113,11 @@ class pid_step_adjuster_coefficients<H0312> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H312b> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H312b> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0 / 6.0;
         (*this)[1] = 2.0 / 6.0;
@@ -128,11 +128,11 @@ class pid_step_adjuster_coefficients<H312b> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H312PID> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H312PID> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] = 1.0 / 18.0;
         (*this)[1] = 2.0 / 9.0;
@@ -143,11 +143,11 @@ class pid_step_adjuster_coefficients<H312PID> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H0321> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H0321> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] =  5.0 / 4.0;
         (*this)[1] =  1.0 / 2.0;
@@ -158,11 +158,11 @@ class pid_step_adjuster_coefficients<H0321> : public boost::array<double, 5>
 };
 
 template<>
-class pid_step_adjuster_coefficients<H321> : public boost::array<double, 5>
+class pid_step_adjuster_coefficients<H321> : public std::array<double, 5>
 {
 public:
     pid_step_adjuster_coefficients()
-    : boost::array<double, 5>()
+    : std::array<double, 5>()
     {
         (*this)[0] =  1.0 / 3.0;
         (*this)[1] =  1.0 / 18.0;
diff --git a/inst/include/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp b/inst/include/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp
index 2338afd94..d801583a5 100644
--- a/inst/include/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp
@@ -18,7 +18,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ROTATING_BUFFER_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_DETAIL_ROTATING_BUFFER_HPP_INCLUDED
 
-#include <boost/array.hpp>
+#include <array>
 
 namespace boost {
 namespace numeric {
diff --git a/inst/include/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp b/inst/include/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp
index 3c59810b6..cca482320 100644
--- a/inst/include/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp
@@ -129,7 +129,7 @@ class explicit_error_generic_rk : public explicit_error_stepper_base
     void do_step_impl( System system , const StateIn &in , const DerivIn &dxdt ,
             time_type t , StateOut &out , time_type dt )
     {
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         // actual calculation done in generic_rk.hpp
         m_rk_algorithm.do_step( stepper_base_type::m_algebra , system , in , dxdt , t , out , dt , m_x_tmp.m_v , m_F );
diff --git a/inst/include/boost/numeric/odeint/stepper/explicit_generic_rk.hpp b/inst/include/boost/numeric/odeint/stepper/explicit_generic_rk.hpp
index f8edc201a..27c6ec8e8 100644
--- a/inst/include/boost/numeric/odeint/stepper/explicit_generic_rk.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/explicit_generic_rk.hpp
@@ -20,7 +20,7 @@
 #define BOOST_NUMERIC_ODEINT_STEPPER_EXPLICIT_GENERIC_RK_HPP_INCLUDED
 
 
-#include <boost/array.hpp>
+#include <array>
 
 
 #include <boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp>
@@ -60,14 +60,14 @@ struct stage_vector;
 template< class T , class Constant >
 struct array_wrapper
 {
-    typedef const typename boost::array< T , Constant::value > type;
+    typedef const typename std::array< T , Constant::value > type;
 };
 
 template< class T , size_t i >
 struct stage
 {
     T c;
-    boost::array< T , i > a;
+    std::array< T , i > a;
 };
 
 
@@ -146,7 +146,7 @@ class explicit_generic_rk : public explicit_stepper_base
     void do_step_impl( System system , const StateIn &in , const DerivIn &dxdt ,
             time_type t , StateOut &out , time_type dt )
     {
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         // actual calculation done in generic_rk.hpp
         m_rk_algorithm.do_step( stepper_base_type::m_algebra , system , in , dxdt , t , out , dt , m_x_tmp.m_v , m_F );
diff --git a/inst/include/boost/numeric/odeint/stepper/extrapolation_stepper.hpp b/inst/include/boost/numeric/odeint/stepper/extrapolation_stepper.hpp
index 3b688e958..b5cce25be 100644
--- a/inst/include/boost/numeric/odeint/stepper/extrapolation_stepper.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/extrapolation_stepper.hpp
@@ -67,7 +67,7 @@ class extrapolation_stepper : public explicit_error_stepper_base
 
   private:
     // check for Order being odd
-    BOOST_STATIC_ASSERT_MSG(
+    static_assert(
         ( ( Order % 2 ) == 0 ) && ( Order > 2 ),
         "extrapolation_stepper requires even Order larger than 2" );
 
@@ -172,9 +172,7 @@ class extrapolation_stepper : public explicit_error_stepper_base
     void do_step_impl( System system, const StateIn &in, const DerivIn &dxdt,
                        time_type t, StateOut &out, time_type dt )
     {
-        m_resizer.adjust_size(
-            in, detail::bind( &stepper_type::template resize_impl< StateIn >,
-                              detail::ref( *this ), detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
         size_t k = 0;
         m_midpoint.set_steps( m_interval_sequence[k] );
         m_midpoint.do_step( system, in, dxdt, t, out, dt );
@@ -191,10 +189,7 @@ class extrapolation_stepper : public explicit_error_stepper_base
                           time_type t, time_type dt )
     {
         // special care for inout
-        m_xout_resizer.adjust_size(
-            inout,
-            detail::bind( &stepper_type::template resize_m_xout< StateInOut >,
-                          detail::ref( *this ), detail::_1 ) );
+        m_xout_resizer.adjust_size(inout, [this](auto&& arg) { return this->resize_m_xout<StateInOut>(std::forward<decltype(arg)>(arg)); });
         do_step_impl( system, inout, dxdt, t, m_xout.m_v, dt );
         boost::numeric::odeint::copy( m_xout.m_v, inout );
     }
diff --git a/inst/include/boost/numeric/odeint/stepper/implicit_euler.hpp b/inst/include/boost/numeric/odeint/stepper/implicit_euler.hpp
index e1c64164b..bff24dbc9 100644
--- a/inst/include/boost/numeric/odeint/stepper/implicit_euler.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/implicit_euler.hpp
@@ -80,7 +80,7 @@ class implicit_euler
         deriv_func_type &deriv_func = sys.first;
         jacobi_func_type &jacobi_func = sys.second;
 
-        m_resizer.adjust_size( x , detail::bind( &stepper_type::template resize_impl<state_type> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         for( size_t i=0 ; i<x.size() ; ++i )
             m_pm.m_v[i] = i;
diff --git a/inst/include/boost/numeric/odeint/stepper/modified_midpoint.hpp b/inst/include/boost/numeric/odeint/stepper/modified_midpoint.hpp
index 9e34c7da2..9d932fc5f 100644
--- a/inst/include/boost/numeric/odeint/stepper/modified_midpoint.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/modified_midpoint.hpp
@@ -81,7 +81,7 @@ public :
         static const value_type val1 = static_cast< value_type >( 1 );
         static const value_type val05 = static_cast< value_type >( 1 ) / static_cast< value_type >( 2 );
 
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         const time_type h = dt /  static_cast<value_type>( m_steps );
         const time_type h2 = static_cast<value_type>(2) * h;
@@ -204,7 +204,7 @@ public :
         static const value_type val1 = static_cast< value_type >( 1 );
         static const value_type val05 = static_cast< value_type >( 1 ) / static_cast< value_type >( 2 );
 
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         const time_type h = dt / static_cast<value_type>( m_steps );
         const time_type h2 = static_cast<value_type>( 2 ) * h;
diff --git a/inst/include/boost/numeric/odeint/stepper/rosenbrock4.hpp b/inst/include/boost/numeric/odeint/stepper/rosenbrock4.hpp
index 86136989d..94933ff81 100644
--- a/inst/include/boost/numeric/odeint/stepper/rosenbrock4.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/rosenbrock4.hpp
@@ -178,7 +178,7 @@ class rosenbrock4
 
         const size_t n = x.size();
 
-        m_resizer.adjust_size( x , detail::bind( &stepper_type::template resize_impl<state_type> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_impl<state_type>(std::forward<decltype(arg)>(arg)); });
 
         for( size_t i=0 ; i<n ; ++i )
             m_pm.m_v( i ) = i;
@@ -249,14 +249,14 @@ class rosenbrock4
     template< class System >
     void do_step( System system , const state_type &x , time_type t , state_type &xout , time_type dt )
     {
-        m_x_err_resizer.adjust_size( x , detail::bind( &stepper_type::template resize_x_err<state_type> , detail::ref( *this ) , detail::_1 ) );
+        m_x_err_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_x_err<state_type>(std::forward<decltype(arg)>(arg)); });
         do_step( system , x , t , xout , dt , m_x_err.m_v );
     }
 
     template< class System >
     void do_step( System system , state_type &x , time_type t , time_type dt )
     {
-        m_x_err_resizer.adjust_size( x , detail::bind( &stepper_type::template resize_x_err<state_type> , detail::ref( *this ) , detail::_1 ) );
+        m_x_err_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_x_err<state_type>(std::forward<decltype(arg)>(arg)); });
         do_step( system , x , t , dt , m_x_err.m_v );
     }
 
diff --git a/inst/include/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp b/inst/include/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp
index 5ad1600d6..a60bf5c34 100644
--- a/inst/include/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp
@@ -99,7 +99,7 @@ class rosenbrock4_controller
     boost::numeric::odeint::controlled_step_result
     try_step( System sys , state_type &x , time_type &t , time_type &dt )
     {
-        m_xnew_resizer.adjust_size( x , detail::bind( &controller_type::template resize_m_xnew< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xnew_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_xnew<state_type>(std::forward<decltype(arg)>(arg)); });
         boost::numeric::odeint::controlled_step_result res = try_step( sys , x , t , m_xnew.m_v , dt );
         if( res == success )
         {
@@ -127,7 +127,7 @@ class rosenbrock4_controller
 
         static const value_type safe = 0.9 , fac1 = 5.0 , fac2 = 1.0 / 6.0;
 
-        m_xerr_resizer.adjust_size( x , detail::bind( &controller_type::template resize_m_xerr< state_type > , detail::ref( *this ) , detail::_1 ) );
+        m_xerr_resizer.adjust_size(x, [this](auto&& arg) { return this->resize_m_xerr<state_type>(std::forward<decltype(arg)>(arg)); });
 
         m_stepper.do_step( sys , x , t , xout , dt , m_xerr.m_v );
         value_type err = error( xout , x , m_xerr.m_v );
diff --git a/inst/include/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp b/inst/include/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp
index d296246ae..860a121dc 100644
--- a/inst/include/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp
@@ -67,7 +67,7 @@ class rosenbrock4_dense_output
     template< class StateType >
     void initialize( const StateType &x0 , time_type t0 , time_type dt0 )
     {
-        m_resizer.adjust_size( x0 , detail::bind( &dense_output_stepper_type::template resize_impl< StateType > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(x0, [this](auto&& arg) { return this->resize_impl<StateType>(std::forward<decltype(arg)>(arg)); });
         get_current_state() = x0;
         m_t = t0;
         m_dt = dt0;
diff --git a/inst/include/boost/numeric/odeint/stepper/runge_kutta4.hpp b/inst/include/boost/numeric/odeint/stepper/runge_kutta4.hpp
index 2410774ee..df2a213bd 100644
--- a/inst/include/boost/numeric/odeint/stepper/runge_kutta4.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/runge_kutta4.hpp
@@ -30,7 +30,7 @@
 #include <boost/numeric/odeint/algebra/algebra_dispatcher.hpp>
 #include <boost/numeric/odeint/algebra/operations_dispatcher.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 #include <boost/numeric/odeint/util/resizer.hpp>
 
@@ -42,7 +42,7 @@ namespace odeint {
 
 #ifndef DOXYGEN_SKIP
 template< class Value = double >
-struct rk4_coefficients_a1 : boost::array< Value , 1 >
+struct rk4_coefficients_a1 : std::array< Value , 1 >
 {
     rk4_coefficients_a1( void )
     {
@@ -51,7 +51,7 @@ struct rk4_coefficients_a1 : boost::array< Value , 1 >
 };
 
 template< class Value = double >
-struct rk4_coefficients_a2 : boost::array< Value , 2 >
+struct rk4_coefficients_a2 : std::array< Value , 2 >
 {
     rk4_coefficients_a2( void )
     {
@@ -62,7 +62,7 @@ struct rk4_coefficients_a2 : boost::array< Value , 2 >
 
 
 template< class Value = double >
-struct rk4_coefficients_a3 : boost::array< Value , 3 >
+struct rk4_coefficients_a3 : std::array< Value , 3 >
 {
     rk4_coefficients_a3( void )
             {
@@ -73,7 +73,7 @@ struct rk4_coefficients_a3 : boost::array< Value , 3 >
 };
 
 template< class Value = double >
-struct rk4_coefficients_b : boost::array< Value , 4 >
+struct rk4_coefficients_b : std::array< Value , 4 >
 {
     rk4_coefficients_b( void )
     {
@@ -85,7 +85,7 @@ struct rk4_coefficients_b : boost::array< Value , 4 >
 };
 
 template< class Value = double >
-struct rk4_coefficients_c : boost::array< Value , 4 >
+struct rk4_coefficients_c : std::array< Value , 4 >
 {
     rk4_coefficients_c( void )
     {
diff --git a/inst/include/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp b/inst/include/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp
index 32bda0bd7..1c6a1f9ed 100644
--- a/inst/include/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp
@@ -91,7 +91,7 @@ public :
 
         static const value_type val1 = static_cast< value_type >( 1 );
 
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl< StateIn > , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         typename odeint::unwrap_reference< System >::type &sys = system;
 
diff --git a/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp b/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp
index beecb3f32..2475c332a 100644
--- a/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp
@@ -31,7 +31,7 @@
 #include <boost/numeric/odeint/util/is_resizeable.hpp>
 #include <boost/numeric/odeint/util/resizer.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 
 
@@ -43,7 +43,7 @@ namespace odeint {
 
 #ifndef DOXYGEN_SKIP
 template< class Value = double >
-struct rk54_ck_coefficients_a1 : boost::array< Value , 1 >
+struct rk54_ck_coefficients_a1 : std::array< Value , 1 >
 {
     rk54_ck_coefficients_a1( void )
     {
@@ -52,7 +52,7 @@ struct rk54_ck_coefficients_a1 : boost::array< Value , 1 >
 };
 
 template< class Value = double >
-struct rk54_ck_coefficients_a2 : boost::array< Value , 2 >
+struct rk54_ck_coefficients_a2 : std::array< Value , 2 >
 {
     rk54_ck_coefficients_a2( void )
     {
@@ -63,7 +63,7 @@ struct rk54_ck_coefficients_a2 : boost::array< Value , 2 >
 
 
 template< class Value = double >
-struct rk54_ck_coefficients_a3 : boost::array< Value , 3 >
+struct rk54_ck_coefficients_a3 : std::array< Value , 3 >
 {
     rk54_ck_coefficients_a3( void )
     {
@@ -74,7 +74,7 @@ struct rk54_ck_coefficients_a3 : boost::array< Value , 3 >
 };
 
 template< class Value = double >
-struct rk54_ck_coefficients_a4 : boost::array< Value , 4 >
+struct rk54_ck_coefficients_a4 : std::array< Value , 4 >
 {
     rk54_ck_coefficients_a4( void )
     {
@@ -86,7 +86,7 @@ struct rk54_ck_coefficients_a4 : boost::array< Value , 4 >
 };
 
 template< class Value = double >
-struct rk54_ck_coefficients_a5 : boost::array< Value , 5 >
+struct rk54_ck_coefficients_a5 : std::array< Value , 5 >
 {
     rk54_ck_coefficients_a5( void )
     {
@@ -99,7 +99,7 @@ struct rk54_ck_coefficients_a5 : boost::array< Value , 5 >
 };
 
 template< class Value = double >
-struct rk54_ck_coefficients_b : boost::array< Value , 6 >
+struct rk54_ck_coefficients_b : std::array< Value , 6 >
 {
     rk54_ck_coefficients_b( void )
     {
@@ -113,7 +113,7 @@ struct rk54_ck_coefficients_b : boost::array< Value , 6 >
 };
 
 template< class Value = double >
-struct rk54_ck_coefficients_db : boost::array< Value , 6 >
+struct rk54_ck_coefficients_db : std::array< Value , 6 >
 {
     rk54_ck_coefficients_db( void )
     {
@@ -128,7 +128,7 @@ struct rk54_ck_coefficients_db : boost::array< Value , 6 >
 
 
 template< class Value = double >
-struct rk54_ck_coefficients_c : boost::array< Value , 6 >
+struct rk54_ck_coefficients_c : std::array< Value , 6 >
 {
     rk54_ck_coefficients_c( void )
     {
diff --git a/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp b/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp
index 80f1a3c03..06d5f50ce 100644
--- a/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp
@@ -145,7 +145,7 @@ public :
 
         typename odeint::unwrap_reference< System >::type &sys = system;
 
-        m_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         //m_x1 = x + dt*b21*dxdt
         stepper_base_type::m_algebra.for_each3( m_x_tmp.m_v , in , dxdt ,
diff --git a/inst/include/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp b/inst/include/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp
index 260cd74f4..1ae51b4c4 100644
--- a/inst/include/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp
@@ -125,7 +125,7 @@ public :
 
         typename odeint::unwrap_reference< System >::type &sys = system;
 
-        m_k_x_tmp_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_k_x_tmp_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+        m_k_x_tmp_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_k_x_tmp_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
 
         //m_x_tmp = x + dt*b21*dxdt
         stepper_base_type::m_algebra.for_each3( m_x_tmp.m_v , in , dxdt_in ,
@@ -179,7 +179,7 @@ public :
         /* ToDo: copy only if &dxdt_in == &dxdt_out ? */
         if( same_instance( dxdt_in , dxdt_out ) )
         {
-            m_dxdt_tmp_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_dxdt_tmp_impl<StateIn> , detail::ref( *this ) , detail::_1 ) );
+            m_dxdt_tmp_resizer.adjust_size(in, [this](auto&& arg) { return this->resize_dxdt_tmp_impl<StateIn>(std::forward<decltype(arg)>(arg)); });
             boost::numeric::odeint::copy( dxdt_in , m_dxdt_tmp.m_v );
             do_step_impl( system , in , dxdt_in , t , out , dxdt_out , dt );
             //error estimate
diff --git a/inst/include/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp b/inst/include/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp
index f2f8251f2..7727f8933 100644
--- a/inst/include/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp
@@ -28,7 +28,7 @@
 #include <boost/numeric/odeint/algebra/algebra_dispatcher.hpp>
 #include <boost/numeric/odeint/algebra/operations_dispatcher.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 #include <boost/numeric/odeint/util/state_wrapper.hpp>
 #include <boost/numeric/odeint/util/is_resizeable.hpp>
@@ -44,7 +44,7 @@ namespace odeint {
 
 #ifndef DOXYGEN_SKIP
 template< class Value = double >
-struct rk78_coefficients_a1 : boost::array< Value , 1 >
+struct rk78_coefficients_a1 : std::array< Value , 1 >
 {
     rk78_coefficients_a1( void )
             {
@@ -53,7 +53,7 @@ struct rk78_coefficients_a1 : boost::array< Value , 1 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a2 : boost::array< Value , 2 >
+struct rk78_coefficients_a2 : std::array< Value , 2 >
 {
     rk78_coefficients_a2( void )
             {
@@ -64,7 +64,7 @@ struct rk78_coefficients_a2 : boost::array< Value , 2 >
 
 
 template< class Value = double >
-struct rk78_coefficients_a3 : boost::array< Value , 3 >
+struct rk78_coefficients_a3 : std::array< Value , 3 >
 {
     rk78_coefficients_a3( void )
             {
@@ -75,7 +75,7 @@ struct rk78_coefficients_a3 : boost::array< Value , 3 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a4 : boost::array< Value , 4 >
+struct rk78_coefficients_a4 : std::array< Value , 4 >
 {
     rk78_coefficients_a4( void )
             {
@@ -87,7 +87,7 @@ struct rk78_coefficients_a4 : boost::array< Value , 4 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a5 : boost::array< Value , 5 >
+struct rk78_coefficients_a5 : std::array< Value , 5 >
 {
     rk78_coefficients_a5( void )
             {
@@ -101,7 +101,7 @@ struct rk78_coefficients_a5 : boost::array< Value , 5 >
 
 
 template< class Value = double >
-struct rk78_coefficients_a6 : boost::array< Value , 6 >
+struct rk78_coefficients_a6 : std::array< Value , 6 >
 {
     rk78_coefficients_a6( void )
             {
@@ -115,7 +115,7 @@ struct rk78_coefficients_a6 : boost::array< Value , 6 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a7 : boost::array< Value , 7 >
+struct rk78_coefficients_a7 : std::array< Value , 7 >
 {
     rk78_coefficients_a7( void )
             {
@@ -130,7 +130,7 @@ struct rk78_coefficients_a7 : boost::array< Value , 7 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a8 : boost::array< Value , 8 >
+struct rk78_coefficients_a8 : std::array< Value , 8 >
 {
     rk78_coefficients_a8( void )
             {
@@ -146,7 +146,7 @@ struct rk78_coefficients_a8 : boost::array< Value , 8 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a9 : boost::array< Value , 9 >
+struct rk78_coefficients_a9 : std::array< Value , 9 >
 {
     rk78_coefficients_a9( void )
             {
@@ -163,7 +163,7 @@ struct rk78_coefficients_a9 : boost::array< Value , 9 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a10 : boost::array< Value , 10 >
+struct rk78_coefficients_a10 : std::array< Value , 10 >
 {
     rk78_coefficients_a10( void )
             {
@@ -181,7 +181,7 @@ struct rk78_coefficients_a10 : boost::array< Value , 10 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a11 : boost::array< Value , 11 >
+struct rk78_coefficients_a11 : std::array< Value , 11 >
 {
     rk78_coefficients_a11( void )
             {
@@ -200,7 +200,7 @@ struct rk78_coefficients_a11 : boost::array< Value , 11 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_a12 : boost::array< Value , 12 >
+struct rk78_coefficients_a12 : std::array< Value , 12 >
 {
     rk78_coefficients_a12( void )
             {
@@ -220,7 +220,7 @@ struct rk78_coefficients_a12 : boost::array< Value , 12 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_b : boost::array< Value , 13 >
+struct rk78_coefficients_b : std::array< Value , 13 >
 {
     rk78_coefficients_b( void )
             {
@@ -241,7 +241,7 @@ struct rk78_coefficients_b : boost::array< Value , 13 >
 };
 
 template< class Value = double >
-struct rk78_coefficients_db : boost::array< Value , 13 >
+struct rk78_coefficients_db : std::array< Value , 13 >
 {
     rk78_coefficients_db( void )
             {
@@ -263,7 +263,7 @@ struct rk78_coefficients_db : boost::array< Value , 13 >
 
 
 template< class Value = double >
-struct rk78_coefficients_c : boost::array< Value , 13 >
+struct rk78_coefficients_c : std::array< Value , 13 >
 {
     rk78_coefficients_c( void )
             {
diff --git a/inst/include/boost/numeric/odeint/stepper/stepper_categories.hpp b/inst/include/boost/numeric/odeint/stepper/stepper_categories.hpp
index 9bc537234..def29d0a8 100644
--- a/inst/include/boost/numeric/odeint/stepper/stepper_categories.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/stepper_categories.hpp
@@ -18,8 +18,6 @@
 #ifndef BOOST_NUMERIC_ODEINT_STEPPER_STEPPER_CATEGORIES_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_STEPPER_STEPPER_CATEGORIES_HPP_INCLUDED
 
-#include <boost/type_traits/integral_constant.hpp>
-
 namespace boost {
 namespace numeric {
 namespace odeint {
diff --git a/inst/include/boost/numeric/odeint/stepper/symplectic_euler.hpp b/inst/include/boost/numeric/odeint/stepper/symplectic_euler.hpp
index bd40860b0..22a2bd0f7 100644
--- a/inst/include/boost/numeric/odeint/stepper/symplectic_euler.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/symplectic_euler.hpp
@@ -26,7 +26,7 @@
 #include <boost/numeric/odeint/algebra/algebra_dispatcher.hpp>
 #include <boost/numeric/odeint/algebra/operations_dispatcher.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 namespace boost {
 namespace numeric {
@@ -38,7 +38,7 @@ namespace detail {
 namespace symplectic_euler_coef {
 
 template< class Value >
-struct coef_a_type : public boost::array< Value , 1 >
+struct coef_a_type : public std::array< Value , 1 >
 {
     coef_a_type( void )
     {
@@ -47,7 +47,7 @@ struct coef_a_type : public boost::array< Value , 1 >
 };
 
 template< class Value >
-struct coef_b_type : public boost::array< Value , 1 >
+struct coef_b_type : public std::array< Value , 1 >
 {
     coef_b_type( void )
     {
diff --git a/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp b/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp
index b33773e2f..4d30d09ec 100644
--- a/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp
@@ -44,7 +44,7 @@ namespace symplectic_rkn_sb3a_m4_mclachlan {
 
 
     template< class Value >
-    struct coef_a_type : public boost::array< Value , 5 >
+    struct coef_a_type : public std::array< Value , 5 >
     {
         coef_a_type( void )
         {
@@ -60,7 +60,7 @@ namespace symplectic_rkn_sb3a_m4_mclachlan {
     };
 
     template< class Value >
-    struct coef_b_type : public boost::array< Value , 5 >
+    struct coef_b_type : public std::array< Value , 5 >
     {
         coef_b_type( void )
         {
diff --git a/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp b/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp
index d75c53534..073e79172 100644
--- a/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp
@@ -28,7 +28,7 @@
 
 #include <boost/numeric/odeint/util/resizer.hpp>
 
-#include <boost/array.hpp>
+#include <array>
 
 namespace boost {
 namespace numeric {
@@ -48,7 +48,7 @@ namespace symplectic_rkn_sb3a_mclachlan {
     */
 
     template< class Value >
-    struct coef_a_type : public boost::array< Value , 6 >
+    struct coef_a_type : public std::array< Value , 6 >
     {
         coef_a_type( void )
         {
@@ -63,7 +63,7 @@ namespace symplectic_rkn_sb3a_mclachlan {
     };
 
     template< class Value >
-    struct coef_b_type : public boost::array< Value , 6 >
+    struct coef_b_type : public std::array< Value , 6 >
     {
         coef_b_type( void )
         {
diff --git a/inst/include/boost/numeric/odeint/stepper/velocity_verlet.hpp b/inst/include/boost/numeric/odeint/stepper/velocity_verlet.hpp
index 3a20fc25c..b898c51d3 100644
--- a/inst/include/boost/numeric/odeint/stepper/velocity_verlet.hpp
+++ b/inst/include/boost/numeric/odeint/stepper/velocity_verlet.hpp
@@ -31,7 +31,7 @@
 #include <boost/numeric/odeint/util/copy.hpp>
 #include <boost/numeric/odeint/util/resizer.hpp>
 // #include <boost/numeric/odeint/util/is_pair.hpp>
-// #include <boost/array.hpp>
+// #include <array>
 
 
 
@@ -149,9 +149,7 @@ class velocity_verlet : public algebra_stepper_base< Algebra , Operations >
     void initialize( const AccelerationIn & ain )
     {
         // alloc a
-        m_resizer.adjust_size( ain ,
-                               detail::bind( &velocity_verlet::template resize_impl< AccelerationIn > ,
-                                             detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(ain, [this](auto&& arg) { return this->resize_impl<AccelerationIn>(std::forward<decltype(arg)>(arg)); });
         boost::numeric::odeint::copy( ain , get_current_acc() );
         m_first_call = false;
     }
@@ -160,9 +158,7 @@ class velocity_verlet : public algebra_stepper_base< Algebra , Operations >
     template< class System , class CoorIn , class VelocityIn >
     void initialize( System system , const CoorIn & qin , const VelocityIn & pin , time_type t )
     {
-        m_resizer.adjust_size( qin ,
-                               detail::bind( &velocity_verlet::template resize_impl< CoorIn > ,
-                                             detail::ref( *this ) , detail::_1 ) );
+        m_resizer.adjust_size(qin, [this](auto&& arg) { return this->resize_impl<CoorIn>(std::forward<decltype(arg)>(arg)); });
         initialize_acc( system , qin , pin , t );
     }
 
@@ -195,10 +191,8 @@ class velocity_verlet : public algebra_stepper_base< Algebra , Operations >
         momentum_in_type & pinout = statein.second;
 
         // alloc a
-        if( m_resizer.adjust_size( qinout ,
-                                   detail::bind( &velocity_verlet::template resize_impl< xyz_type > ,
-                                                 detail::ref( *this ) , detail::_1 ) )
-         || m_first_call )
+        if( m_resizer.adjust_size(qinout, [this](auto&& arg) { return this->resize_impl<xyz_type>(std::forward<decltype(arg)>(arg)); })
+           || m_first_call )
         {
             initialize_acc( system , qinout , pinout , t );
         }
diff --git a/inst/include/boost/numeric/odeint/tools/assert.hpp b/inst/include/boost/numeric/odeint/tools/assert.hpp
new file mode 100644
index 000000000..0f1a200c0
--- /dev/null
+++ b/inst/include/boost/numeric/odeint/tools/assert.hpp
@@ -0,0 +1,30 @@
+//  (C) Copyright Matt Borland 2021 - 2023.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// We deliberately use assert in here:
+//
+// boost-no-inspect
+
+#ifndef BOOST_NUMERIC_ODEINT_TOOLS_ASSERT_HPP
+#define BOOST_NUMERIC_ODEINT_TOOLS_ASSERT_HPP
+
+#include <boost/numeric/odeint/tools/is_standalone.hpp>
+
+#ifndef BOOST_NUMERIC_ODEINT_STANDALONE
+
+#include <boost/assert.hpp>
+
+#define BOOST_NUMERIC_ODEINT_ASSERT(expr) BOOST_ASSERT(expr)
+#define BOOST_NUMERIC_ODEINT_ASSERT_MSG(expr, msg) BOOST_ASSERT_MSG(expr, msg)
+
+#else // Standalone mode so we use cassert
+
+#include <cassert>
+#define BOOST_NUMERIC_ODEINT_ASSERT(expr) assert(expr)
+#define BOOST_NUMERIC_ODEINT_ASSERT_MSG(expr, msg) assert((expr)&&(msg))
+
+#endif
+
+#endif //BOOST_NUMERIC_ODEINT_TOOLS_ASSERT_HPP
diff --git a/inst/include/boost/numeric/odeint/tools/is_standalone.hpp b/inst/include/boost/numeric/odeint/tools/is_standalone.hpp
new file mode 100644
index 000000000..9578cd584
--- /dev/null
+++ b/inst/include/boost/numeric/odeint/tools/is_standalone.hpp
@@ -0,0 +1,21 @@
+//  Copyright Matt Borland 2021.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_NUMERIC_ODEINT_TOOLS_IS_STANDALONE_HPP
+#define BOOST_NUMERIC_ODEINT_TOOLS_IS_STANDALONE_HPP
+
+// If one or more of our required dependencies are missing assume we are
+// in standalone mode
+
+#ifdef __has_include
+#if !__has_include(<boost/config.hpp>) || !__has_include(<boost/assert.hpp>) || !__has_include(<boost/lexical_cast.hpp>) || \
+    !__has_include(<boost/throw_exception.hpp>) || !__has_include(<boost/predef/other/endian.h>)
+#   ifndef BOOST_NUMERIC_ODEINT_STANDALONE
+#       define BOOST_NUMERIC_ODEINT_STANDALONE
+#   endif
+#endif
+#endif
+
+#endif //BOOST_NUMERIC_ODEINT_TOOLS_IS_STANDALONE_HPP
diff --git a/inst/include/boost/numeric/odeint/tools/traits.hpp b/inst/include/boost/numeric/odeint/tools/traits.hpp
new file mode 100644
index 000000000..f321412cb
--- /dev/null
+++ b/inst/include/boost/numeric/odeint/tools/traits.hpp
@@ -0,0 +1,39 @@
+//  Copyright Matt Borland 2021 - 2023.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_NUMERIC_ODEINT_TOOLS_TRAITS
+#define BOOST_NUMERIC_ODEINT_TOOLS_TRAITS
+
+#include <type_traits>
+
+namespace boost {
+namespace numeric {
+namespace odeint {
+namespace detail {
+
+#define BOOST_NUMERIC_ODEINT_HAS_NAMED_TRAIT(trait, name)               \
+template <typename T>                                                   \
+class trait                                                             \
+{                                                                       \
+private:                                                                \
+   using yes = char;                                                    \
+   struct no { char x[2]; };                                            \
+                                                                        \
+   template <typename U>                                                \
+   static yes test(typename U::name* = nullptr);                        \
+                                                                        \
+   template <typename U>                                                \
+   static no test(...);                                                 \
+                                                                        \
+public:                                                                 \
+   static constexpr bool value = (sizeof(test<T>(0)) == sizeof(char));  \
+};
+
+} //namespace detail
+} //namespace odeint
+} //namespace numeric
+} //namespace boost
+
+#endif //BOOST_NUMERIC_ODEINT_TOOLS_TRAITS
diff --git a/inst/include/boost/numeric/odeint/util/bind.hpp b/inst/include/boost/numeric/odeint/util/bind.hpp
index 1201afab8..27826f07d 100644
--- a/inst/include/boost/numeric/odeint/util/bind.hpp
+++ b/inst/include/boost/numeric/odeint/util/bind.hpp
@@ -17,85 +17,19 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_BIND_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_BIND_HPP_INCLUDED
 
-
-#include <boost/numeric/odeint/config.hpp>
-
-
-#if BOOST_NUMERIC_ODEINT_CXX11 
-    #include <functional>
-#else
-#define BOOST_BIND_NO_PLACEHOLDERS
-#include <boost/bind.hpp>
-#endif
-
-namespace boost {
-namespace numeric {
-namespace odeint {
-namespace detail {
-
-#if BOOST_NUMERIC_ODEINT_CXX11 
-
-using ::std::bind;
-using namespace ::std::placeholders;
-
-
-#else
-
-// unnamed namespace to avoid multiple declarations (#138)
-namespace {
-using ::boost::bind;
-boost::arg<1> _1;
-boost::arg<2> _2;
-}
-// using ::boost::bind;
-// using ::_1;
-// using ::_2;
-
-#endif
-
-}
-}
-}
-}
-
-
-
-
-
-/*
-
-// the following is the suggested way. Unfortunately it does not work with all compilers.
-
-#ifdef BOOST_NO_CXX11_HDR_FUNCTIONAL
-#include <boost/bind.hpp>
-#else
 #include <functional>
-#endif
-
 
 namespace boost {
 namespace numeric {
 namespace odeint {
 namespace detail {
 
-    
-#ifdef BOOST_NO_CXX11_HDR_FUNCTIONAL
-
-using ::boost::bind;
-using ::_1;
-using ::_2;
-
-#else
-
-using ::std::bind;
-using namespace ::std::placeholders;
-
-#endif
-
+using std::bind;
+using namespace std::placeholders;
 
-}
-}
-}
-}*/
+} //namespace detail
+} //namespace odeint
+} //namespace numeric
+} //namespace boost
 
 #endif // BOOST_NUMERIC_ODEINT_UTIL_BIND_HPP_INCLUDED
diff --git a/inst/include/boost/numeric/odeint/util/copy.hpp b/inst/include/boost/numeric/odeint/util/copy.hpp
index 161f13553..7e263ff5d 100644
--- a/inst/include/boost/numeric/odeint/util/copy.hpp
+++ b/inst/include/boost/numeric/odeint/util/copy.hpp
@@ -18,6 +18,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_COPY_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_COPY_HPP_INCLUDED
 
+#include <type_traits>
 
 #include <boost/range/algorithm/copy.hpp>
 
@@ -32,13 +33,13 @@ namespace odeint {
 namespace detail {
 
     template< class Container1 , class Container2 >
-    void do_copying( const Container1 &from , Container2 &to , boost::mpl::true_ )
+    void do_copying( const Container1 &from , Container2 &to , std::integral_constant<bool, true>)
     {
         boost::range::copy( from , boost::begin( to ) );
     }
 
     template< class Container1 , class Container2 >
-    void do_copying( const Container1 &from , Container2 &to , boost::mpl::false_ )
+    void do_copying( const Container1 &from , Container2 &to , std::integral_constant<bool, false>)
     {
         to = from;
     }
diff --git a/inst/include/boost/numeric/odeint/util/detail/is_range.hpp b/inst/include/boost/numeric/odeint/util/detail/is_range.hpp
index a17685541..b77ca595e 100644
--- a/inst/include/boost/numeric/odeint/util/detail/is_range.hpp
+++ b/inst/include/boost/numeric/odeint/util/detail/is_range.hpp
@@ -26,28 +26,21 @@
 #endif
 
 #include <cstddef>
+#include <type_traits>
 #include <boost/range/config.hpp>
-#include <boost/mpl/has_xxx.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/and.hpp>
+#include <boost/numeric/odeint/tools/traits.hpp>
 
 namespace boost {
 namespace numeric {
 namespace odeint {
 
+namespace detail {
 
-
-namespace range_detail
-{
-BOOST_MPL_HAS_XXX_TRAIT_DEF(iterator)
-    BOOST_MPL_HAS_XXX_TRAIT_DEF(const_iterator)
-}
-
-namespace detail
-{
+BOOST_NUMERIC_ODEINT_HAS_NAMED_TRAIT(has_iterator, iterator);
+BOOST_NUMERIC_ODEINT_HAS_NAMED_TRAIT(has_const_iterator, const_iterator);
 
 template< typename Range >
-struct is_range : boost::mpl::and_<range_detail::has_iterator<Range>, range_detail::has_const_iterator<Range> >
+struct is_range : std::integral_constant<bool, (has_iterator<Range>::value && has_const_iterator<Range>::value)>
 {
 };
 
@@ -56,12 +49,12 @@ struct is_range : boost::mpl::and_<range_detail::has_iterator<Range>, range_deta
 //////////////////////////////////////////////////////////////////////////
 
 template< typename iteratorT >
-struct is_range< std::pair<iteratorT,iteratorT> > : boost::mpl::true_
+struct is_range< std::pair<iteratorT,iteratorT> > : std::integral_constant<bool, true>
 {
 };
 
 template< typename iteratorT >
-struct is_range< const std::pair<iteratorT,iteratorT> > : boost::mpl::true_
+struct is_range< const std::pair<iteratorT,iteratorT> > : std::integral_constant<bool, true>
 {
 };
 
@@ -70,12 +63,12 @@ struct is_range< const std::pair<iteratorT,iteratorT> > : boost::mpl::true_
 //////////////////////////////////////////////////////////////////////////
 
 template< typename elementT, std::size_t sz >
-struct is_range< elementT[sz] > : boost::mpl::true_
+struct is_range< elementT[sz] > : std::integral_constant<bool, true>
 {
 };
 
 template< typename elementT, std::size_t sz >
-struct is_range< const elementT[sz] > : boost::mpl::true_
+struct is_range< const elementT[sz] > : std::integral_constant<bool, true>
 {
 };
 
@@ -84,42 +77,42 @@ struct is_range< const elementT[sz] > : boost::mpl::true_
 //////////////////////////////////////////////////////////////////////////
 
 template<>
-struct is_range< char* > : boost::mpl::true_
+struct is_range< char* > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< wchar_t* > : boost::mpl::true_
+struct is_range< wchar_t* > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< const char* > : boost::mpl::true_
+struct is_range< const char* > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< const wchar_t* > : boost::mpl::true_
+struct is_range< const wchar_t* > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< char* const > : boost::mpl::true_
+struct is_range< char* const > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< wchar_t* const > : boost::mpl::true_
+struct is_range< wchar_t* const > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< const char* const > : boost::mpl::true_
+struct is_range< const char* const > : std::integral_constant<bool, true>
 {
 };
 
 template<>
-struct is_range< const wchar_t* const > : boost::mpl::true_
+struct is_range< const wchar_t* const > : std::integral_constant<bool, true>
 {
 };
 
diff --git a/inst/include/boost/numeric/odeint/util/is_pair.hpp b/inst/include/boost/numeric/odeint/util/is_pair.hpp
index 1827840fe..b6519f417 100644
--- a/inst/include/boost/numeric/odeint/util/is_pair.hpp
+++ b/inst/include/boost/numeric/odeint/util/is_pair.hpp
@@ -18,22 +18,19 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_IS_PAIR_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_IS_PAIR_HPP_INCLUDED
 
-
-#include <boost/mpl/bool.hpp>
-#include <utility>
-
+#include <type_traits>
 
 namespace boost {
 namespace numeric {
 namespace odeint {
 
 template< class T >
-struct is_pair : public boost::mpl::false_
+struct is_pair : public std::integral_constant<bool, false>
 {
 };
 
 template< class T1 , class T2 >
-struct is_pair< std::pair< T1 , T2 > > : public boost::mpl::true_
+struct is_pair< std::pair< T1 , T2 > > : public std::integral_constant<bool, true>
 {
 };
 
diff --git a/inst/include/boost/numeric/odeint/util/is_resizeable.hpp b/inst/include/boost/numeric/odeint/util/is_resizeable.hpp
index ad7332dca..e60564f5c 100644
--- a/inst/include/boost/numeric/odeint/util/is_resizeable.hpp
+++ b/inst/include/boost/numeric/odeint/util/is_resizeable.hpp
@@ -20,6 +20,7 @@
 
 
 #include <vector>
+#include <type_traits>
 
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/type_traits/remove_reference.hpp>
@@ -40,7 +41,7 @@ namespace odeint {
  * by default any type is not resizable
  */
 template< typename Container , typename Enabler = void >
-struct is_resizeable_sfinae : boost::false_type {};
+struct is_resizeable_sfinae : std::false_type {};
 
 template< typename Container >
 struct is_resizeable : is_resizeable_sfinae< Container > {};
@@ -51,7 +52,7 @@ struct is_resizeable : is_resizeable_sfinae< Container > {};
  * specialization for std::vector
  */
 template< class V, class A >
-struct is_resizeable< std::vector< V , A  > > : boost::true_type {};
+struct is_resizeable< std::vector< V , A  > > : std::true_type {};
 
 
 /*
@@ -65,7 +66,7 @@ struct is_resizeable_sfinae<
     typedef typename boost::mpl::find_if< FusionSequence , is_resizeable< boost::mpl::_1 > >::type iter;
     typedef typename boost::mpl::end< FusionSequence >::type last;
 
-    typedef typename boost::mpl::if_< boost::is_same< iter , last > , boost::false_type , boost::true_type >::type type;
+    typedef typename boost::mpl::if_< boost::is_same< iter , last > , std::false_type , std::true_type >::type type;
     const static bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/util/multi_array_adaption.hpp b/inst/include/boost/numeric/odeint/util/multi_array_adaption.hpp
index e2c0a4836..8eaf26bd7 100644
--- a/inst/include/boost/numeric/odeint/util/multi_array_adaption.hpp
+++ b/inst/include/boost/numeric/odeint/util/multi_array_adaption.hpp
@@ -28,6 +28,7 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/multi_array.hpp>
 
+#include <type_traits>
 
 namespace boost {
 namespace numeric {
@@ -36,14 +37,14 @@ namespace odeint {
 template< typename T >
 struct is_multi_array
 {
-    typedef boost::false_type type;
+    typedef std::false_type type;
     const static bool value = type::value;
 };
     
 template< typename T >
 struct is_resizeable_multi_array
 {
-    typedef boost::false_type type;
+    typedef std::false_type type;
     const static bool value = type::value;
 };
 
@@ -52,14 +53,14 @@ struct is_resizeable_multi_array
 template< typename V , size_t Dim , typename A >
 struct is_multi_array< boost::multi_array< V , Dim , A > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
 template< typename V , size_t Dim , typename A >
 struct is_resizeable_multi_array< boost::multi_array< V , Dim , A > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
@@ -69,7 +70,7 @@ struct is_resizeable_multi_array< boost::multi_array< V , Dim , A > >
 template< typename T  >
 struct is_resizeable_sfinae< T , typename boost::enable_if< typename is_resizeable_multi_array< T >::type >::type >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
@@ -111,10 +112,10 @@ struct resize_impl_sfinae< T1 , T2 ,
 {
     static void resize( T1 &x1 , const T2 &x2 )
     {
-        boost::array< int , T1::dimensionality > extents;
+        std::array< int , T1::dimensionality > extents;
         for( size_t i=0 ; i<T1::dimensionality ; ++i ) extents[i] = x2.shape()[i];
         x1.resize( extents );
-        boost::array< int , T1::dimensionality > origins;
+        std::array< int , T1::dimensionality > origins;
         for( size_t i=0 ; i<T1::dimensionality ; ++i ) origins[i] = x2.index_bases()[i];
         x1.reindex( origins );
     }
diff --git a/inst/include/boost/numeric/odeint/util/resize.hpp b/inst/include/boost/numeric/odeint/util/resize.hpp
index 3645782ae..496aacca2 100644
--- a/inst/include/boost/numeric/odeint/util/resize.hpp
+++ b/inst/include/boost/numeric/odeint/util/resize.hpp
@@ -19,6 +19,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_RESIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_RESIZE_HPP_INCLUDED
 
+#include <type_traits>
+
 #include <boost/range.hpp>
 
 #include <boost/utility/enable_if.hpp>
@@ -77,13 +79,13 @@ namespace detail {
         }
 
         template< class StateOut , class StateIn >
-        void resize_op( StateOut &x1 , const StateIn &x2 , boost::true_type ) const
+        void resize_op( StateOut &x1 , const StateIn &x2 , std::true_type ) const
         {
             resize( x1 , x2 );
         }
 
         template< class StateOut , class StateIn >
-        void resize_op( StateOut &/*x1*/ , const StateIn &/*x2*/ , boost::false_type ) const
+        void resize_op( StateOut &/*x1*/ , const StateIn &/*x2*/ , std::false_type ) const
         {
         }
 
diff --git a/inst/include/boost/numeric/odeint/util/resizer.hpp b/inst/include/boost/numeric/odeint/util/resizer.hpp
index cd27990bd..965966b06 100644
--- a/inst/include/boost/numeric/odeint/util/resizer.hpp
+++ b/inst/include/boost/numeric/odeint/util/resizer.hpp
@@ -22,13 +22,14 @@
 #include <boost/numeric/odeint/util/is_resizeable.hpp>
 #include <boost/numeric/odeint/util/same_size.hpp>
 #include <boost/numeric/odeint/util/resize.hpp>
+#include <type_traits>
 
 namespace boost {
 namespace numeric {
 namespace odeint {
 
 template< class ResizeWrappedState , class State >
-bool adjust_size_by_resizeability( ResizeWrappedState &x , const State &y , boost::true_type )
+bool adjust_size_by_resizeability( ResizeWrappedState &x , const State &y , std::true_type )
 {
     if ( !same_size( x.m_v , y ) )
     {
@@ -40,7 +41,7 @@ bool adjust_size_by_resizeability( ResizeWrappedState &x , const State &y , boos
 }
 
 template< class ResizeWrappedState , class State >
-bool adjust_size_by_resizeability( ResizeWrappedState & /* x */ , const State & /* y */ , boost::false_type )
+bool adjust_size_by_resizeability( ResizeWrappedState & /* x */ , const State & /* y */ , std::false_type )
 {
     return false;
 }
diff --git a/inst/include/boost/numeric/odeint/util/same_size.hpp b/inst/include/boost/numeric/odeint/util/same_size.hpp
index 81ae249d1..c7f5b71b0 100644
--- a/inst/include/boost/numeric/odeint/util/same_size.hpp
+++ b/inst/include/boost/numeric/odeint/util/same_size.hpp
@@ -19,6 +19,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_SAME_SIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_SAME_SIZE_HPP_INCLUDED
 
+#include <type_traits>
+
 #include <boost/numeric/odeint/util/is_resizeable.hpp>
 
 #include <boost/utility/enable_if.hpp>
@@ -77,13 +79,13 @@ struct same_size_fusion
     }
 
     template< class S1 , class S2 >
-    bool same_size_op( const S1 &x1 , const S2 &x2 , boost::true_type ) const
+    bool same_size_op( const S1 &x1 , const S2 &x2 , std::true_type ) const
     {
         return same_size( x1 , x2 );
     }
 
     template< class S1 , class S2 >
-    bool same_size_op( const S1 &/*x1*/ , const S2 &/*x2*/ , boost::false_type ) const
+    bool same_size_op( const S1 &/*x1*/ , const S2 &/*x2*/ , std::false_type ) const
     {
         return true;
     }
diff --git a/inst/include/boost/numeric/odeint/util/split_adaptor.hpp b/inst/include/boost/numeric/odeint/util/split_adaptor.hpp
index cf0d62381..556f9112a 100644
--- a/inst/include/boost/numeric/odeint/util/split_adaptor.hpp
+++ b/inst/include/boost/numeric/odeint/util/split_adaptor.hpp
@@ -19,6 +19,7 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_SPLIT_ADAPTOR_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_SPLIT_ADAPTOR_INCLUDED
 
+#include <boost/numeric/odeint/tools/assert.hpp>
 #include <boost/range/adaptor/argument_fwd.hpp>
 #include <boost/range/size_type.hpp>
 #include <boost/range/iterator_range.hpp>
@@ -33,8 +34,8 @@ namespace detail {
 inline std::pair<std::size_t, std::size_t>
 split_offsets( std::size_t total_length, std::size_t index, std::size_t parts )
 {
-    BOOST_ASSERT( parts > 0 );
-    BOOST_ASSERT( index < parts );
+    BOOST_NUMERIC_ODEINT_ASSERT( parts > 0 );
+    BOOST_NUMERIC_ODEINT_ASSERT( index < parts );
     const std::size_t
         slice = total_length / parts,
         partial = total_length % parts,
diff --git a/inst/include/boost/numeric/odeint/util/ublas_wrapper.hpp b/inst/include/boost/numeric/odeint/util/ublas_wrapper.hpp
index c8facfc46..dde16ccdb 100644
--- a/inst/include/boost/numeric/odeint/util/ublas_wrapper.hpp
+++ b/inst/include/boost/numeric/odeint/util/ublas_wrapper.hpp
@@ -18,8 +18,8 @@
 #ifndef BOOST_NUMERIC_ODEINT_UTIL_UBLAS_WRAPPER_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_UTIL_UBLAS_WRAPPER_HPP_INCLUDED
 
+#include <type_traits>
 
-#include <boost/type_traits/integral_constant.hpp>
 #include <boost/numeric/ublas/vector.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
 #include <boost/numeric/ublas/lu.hpp>
@@ -171,7 +171,7 @@ namespace odeint {
 template< class T , class A >
 struct is_resizeable< boost::numeric::ublas::vector< T , A > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
@@ -182,7 +182,7 @@ struct is_resizeable< boost::numeric::ublas::vector< T , A > >
 template< class T , class L , class A >
 struct is_resizeable< boost::numeric::ublas::matrix< T , L , A > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
@@ -193,7 +193,7 @@ struct is_resizeable< boost::numeric::ublas::matrix< T , L , A > >
 template< class T , class A >
 struct is_resizeable< boost::numeric::ublas::permutation_matrix< T , A > >
 {
-    typedef boost::true_type type;
+    typedef std::true_type type;
     const static bool value = type::value;
 };
 
diff --git a/inst/include/boost/numeric/odeint/util/unwrap_reference.hpp b/inst/include/boost/numeric/odeint/util/unwrap_reference.hpp
index e16087839..bbe087b2b 100644
--- a/inst/include/boost/numeric/odeint/util/unwrap_reference.hpp
+++ b/inst/include/boost/numeric/odeint/util/unwrap_reference.hpp
@@ -20,28 +20,16 @@
 
 
 #include <boost/numeric/odeint/config.hpp>
-
-
-#if BOOST_NUMERIC_ODEINT_CXX11
 #include <functional>
-#else
-#include <boost/ref.hpp>
-#endif
 
 namespace boost {
 
-#if BOOST_NUMERIC_ODEINT_CXX11
 template<typename T> class reference_wrapper;
-
 template<typename T> struct unwrap_reference;
-#endif
 
 namespace numeric {
 namespace odeint {
 
-
-#if BOOST_NUMERIC_ODEINT_CXX11
-
 template<typename T>
 struct unwrap_reference
 {
@@ -60,24 +48,11 @@ struct unwrap_reference< boost::reference_wrapper<T> >
     typedef typename boost::unwrap_reference<T>::type type;
 };
 
-#else
-
-using ::boost::unwrap_reference;
-
-#endif
-
 namespace detail
 {
 
-#if BOOST_NUMERIC_ODEINT_CXX11
-
 using ::std::ref;
 
-#else
-
-using ::boost::ref;
-
-#endif
 }
 
 }
diff --git a/inst/include/boost/numeric/ublas/detail/iterator.hpp b/inst/include/boost/numeric/ublas/detail/iterator.hpp
index 1723a301c..7aebf2f9f 100644
--- a/inst/include/boost/numeric/ublas/detail/iterator.hpp
+++ b/inst/include/boost/numeric/ublas/detail/iterator.hpp
@@ -107,8 +107,12 @@ namespace boost { namespace numeric { namespace ublas {
    * via the post increment operator.
    */
     template<class IC, class I, class T>
-    struct forward_iterator_base:
-        public std::iterator<IC, T> {
+    struct forward_iterator_base {
+        typedef IC iterator_category;
+        typedef T value_type;
+        typedef std::ptrdiff_t difference_type;
+        typedef T* pointer;
+        typedef T& reference;
         typedef I derived_iterator_type;
         typedef T derived_value_type;
 
@@ -145,8 +149,12 @@ namespace boost { namespace numeric { namespace ublas {
    * via the post increment and post decrement operator.
    */
     template<class IC, class I, class T>
-    struct bidirectional_iterator_base:
-        public std::iterator<IC, T> {
+    struct bidirectional_iterator_base {
+        typedef IC iterator_category;
+        typedef T value_type;
+        typedef std::ptrdiff_t difference_type;
+        typedef T* pointer;
+        typedef T& reference;
         typedef I derived_iterator_type;
         typedef T derived_value_type;
 
@@ -200,8 +208,12 @@ namespace boost { namespace numeric { namespace ublas {
    */
     template<class IC, class I, class T, class D = std::ptrdiff_t>
     // ISSUE the default for D seems rather dangerous as it can easily be (silently) incorrect
-    struct random_access_iterator_base:
-        public std::iterator<IC, T> {
+    struct random_access_iterator_base {
+        typedef IC iterator_category;
+        typedef T value_type;
+        typedef D difference_type;
+        typedef T* pointer;
+        typedef T& reference;
         typedef I derived_iterator_type;
         typedef T derived_value_type;
         typedef D derived_difference_type;
diff --git a/inst/include/boost/optional/detail/old_optional_implementation.hpp b/inst/include/boost/optional/detail/old_optional_implementation.hpp
deleted file mode 100644
index 75d4bdcf1..000000000
--- a/inst/include/boost/optional/detail/old_optional_implementation.hpp
+++ /dev/null
@@ -1,1059 +0,0 @@
-// Copyright (C) 2003, 2008 Fernando Luis Cacciola Carballal.
-// Copyright (C) 2014-2016 Andrzej Krzemienski.
-//
-// Use, modification, and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/optional for documentation.
-//
-// You are welcome to contact the maintainer at:
-//  akrzemi1@gmail.com
-
-#ifndef BOOST_OPTIONAL_DETAIL_OLD_OPTIONAL_IMPLEMENTATION_AJK_28JAN2015_HPP
-#define BOOST_OPTIONAL_DETAIL_OLD_OPTIONAL_IMPLEMENTATION_AJK_28JAN2015_HPP
-
-#include <boost/detail/reference_content.hpp>
-#include <boost/type_traits/is_reference.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#include <boost/type_traits/conditional.hpp>
-#include <boost/core/invoke_swap.hpp>
-
-namespace boost {
-
-namespace optional_detail {
-
-
-template<class T>
-struct types_when_isnt_ref
-{
-  typedef T const& reference_const_type ;
-  typedef T &      reference_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-  typedef T &&     rval_reference_type ;
-  typedef T &&     reference_type_of_temporary_wrapper;
-#ifdef BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
-  // GCC 4.4 has support for an early draft of rvalue references. The conforming version below
-  // causes warnings about returning references to a temporary.
-  static T&& move(T&& r) { return r; }
-#else
-  static rval_reference_type move(reference_type r) { return boost::move(r); }
-#endif
-#endif
-  typedef T const* pointer_const_type ;
-  typedef T *      pointer_type ;
-  typedef T const& argument_type ;
-} ;
-
-template<class T>
-struct types_when_is_ref
-{
-  typedef BOOST_DEDUCED_TYPENAME remove_reference<T>::type raw_type ;
-
-  typedef raw_type&  reference_const_type ;
-  typedef raw_type&  reference_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-  typedef BOOST_DEDUCED_TYPENAME remove_const<raw_type>::type&& rval_reference_type ;
-  typedef raw_type&  reference_type_of_temporary_wrapper;
-  static reference_type move(reference_type r) { return r; }
-#endif
-  typedef raw_type*  pointer_const_type ;
-  typedef raw_type*  pointer_type ;
-  typedef raw_type&  argument_type ;
-} ;
-
-template <class To, class From>
-void prevent_binding_rvalue_ref_to_optional_lvalue_ref()
-{
-#ifndef BOOST_OPTIONAL_CONFIG_ALLOW_BINDING_TO_RVALUES
-  BOOST_STATIC_ASSERT_MSG(
-    !boost::is_lvalue_reference<To>::value || !boost::is_rvalue_reference<From>::value, 
-    "binding rvalue references to optional lvalue references is disallowed");
-#endif    
-}
-
-struct optional_tag {} ;
-
-template<class T>
-class optional_base : public optional_tag
-{
-  private :
-
-    typedef
-#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
-    BOOST_DEDUCED_TYPENAME
-#endif
-    ::boost::detail::make_reference_content<T>::type internal_type ;
-
-    typedef aligned_storage<internal_type> storage_type ;
-
-    typedef types_when_isnt_ref<T> types_when_not_ref ;
-    typedef types_when_is_ref<T>   types_when_ref   ;
-
-    typedef optional_base<T> this_type ;
-
-  protected :
-
-    typedef T value_type ;
-
-    typedef true_type  is_reference_tag ;
-    typedef false_type is_not_reference_tag ;
-
-    typedef BOOST_DEDUCED_TYPENAME is_reference<T>::type is_reference_predicate ;
-
-  public:
-    typedef BOOST_DEDUCED_TYPENAME conditional<is_reference_predicate::value,types_when_ref,types_when_not_ref>::type types ;
-
-  protected:
-    typedef BOOST_DEDUCED_TYPENAME types::reference_type       reference_type ;
-    typedef BOOST_DEDUCED_TYPENAME types::reference_const_type reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    typedef BOOST_DEDUCED_TYPENAME types::rval_reference_type  rval_reference_type ;
-    typedef BOOST_DEDUCED_TYPENAME types::reference_type_of_temporary_wrapper reference_type_of_temporary_wrapper ;
-#endif
-    typedef BOOST_DEDUCED_TYPENAME types::pointer_type         pointer_type ;
-    typedef BOOST_DEDUCED_TYPENAME types::pointer_const_type   pointer_const_type ;
-    typedef BOOST_DEDUCED_TYPENAME types::argument_type        argument_type ;
-
-    // Creates an optional<T> uninitialized.
-    // No-throw
-    optional_base()
-      :
-      m_initialized(false) {}
-
-    // Creates an optional<T> uninitialized.
-    // No-throw
-    optional_base ( none_t )
-      :
-      m_initialized(false) {}
-
-    // Creates an optional<T> initialized with 'val'.
-    // Can throw if T::T(T const&) does
-    optional_base ( argument_type val )
-      :
-      m_initialized(false)
-    {
-        construct(val);
-    }
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // move-construct an optional<T> initialized from an rvalue-ref to 'val'.
-    // Can throw if T::T(T&&) does
-    optional_base ( rval_reference_type val )
-      :
-      m_initialized(false)
-    {
-      construct( boost::move(val) );
-    }
-#endif
-
-    // Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional<T>.
-    // Can throw if T::T(T const&) does
-    optional_base ( bool cond, argument_type val )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(val);
-    }
-
-    // Creates a deep copy of another optional<T>
-    // Can throw if T::T(T const&) does
-    optional_base ( optional_base const& rhs )
-      :
-      m_initialized(false)
-    {
-      if ( rhs.is_initialized() )
-        construct(rhs.get_impl());
-    }
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Creates a deep move of another optional<T>
-    // Can throw if T::T(T&&) does
-    optional_base ( optional_base&& rhs )
-      :
-      m_initialized(false)
-    {
-      if ( rhs.is_initialized() )
-        construct( boost::move(rhs.get_impl()) );
-    }
-#endif
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-
-    template<class Expr, class PtrExpr>
-    explicit optional_base ( Expr&& expr, PtrExpr const* tag )
-      :
-      m_initialized(false)
-    {
-      construct(boost::forward<Expr>(expr),tag);
-    }
-
-#else
-    // This is used for both converting and in-place constructions.
-    // Derived classes use the 'tag' to select the appropriate
-    // implementation (the correct 'construct()' overload)
-    template<class Expr>
-    explicit optional_base ( Expr const& expr, Expr const* tag )
-      :
-      m_initialized(false)
-    {
-      construct(expr,tag);
-    }
-
-#endif
-
-
-    // No-throw (assuming T::~T() doesn't)
-    ~optional_base() { destroy() ; }
-
-    // Assigns from another optional<T> (deep-copies the rhs value)
-    void assign ( optional_base const& rhs )
-    {
-      if (is_initialized())
-      {
-        if ( rhs.is_initialized() )
-             assign_value(rhs.get_impl(), is_reference_predicate() );
-        else destroy();
-      }
-      else
-      {
-        if ( rhs.is_initialized() )
-          construct(rhs.get_impl());
-      }
-    }
-    
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Assigns from another optional<T> (deep-moves the rhs value)
-    void assign ( optional_base&& rhs )
-    {
-      if (is_initialized())
-      {
-        if ( rhs.is_initialized() )
-             assign_value(boost::move(rhs.get_impl()), is_reference_predicate() );
-        else destroy();
-      }
-      else
-      {
-        if ( rhs.is_initialized() )
-          construct(boost::move(rhs.get_impl()));
-      }
-    }
-#endif 
-
-    // Assigns from another _convertible_ optional<U> (deep-copies the rhs value)
-    template<class U>
-    void assign ( optional<U> const& rhs )
-    {
-      if (is_initialized())
-      {
-        if ( rhs.is_initialized() )
-#ifndef BOOST_OPTIONAL_CONFIG_RESTORE_ASSIGNMENT_OF_NONCONVERTIBLE_TYPES
-          assign_value(rhs.get(), is_reference_predicate() );
-#else
-          assign_value(static_cast<value_type>(rhs.get()), is_reference_predicate() );
-#endif
-          
-        else destroy();
-      }
-      else
-      {
-        if ( rhs.is_initialized() )
-#ifndef BOOST_OPTIONAL_CONFIG_RESTORE_ASSIGNMENT_OF_NONCONVERTIBLE_TYPES
-          construct(rhs.get());
-#else
-          construct(static_cast<value_type>(rhs.get()));
-#endif
-      }
-    }
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // move-assigns from another _convertible_ optional<U> (deep-moves from the rhs value)
-    template<class U>
-    void assign ( optional<U>&& rhs )
-    {
-      typedef BOOST_DEDUCED_TYPENAME optional<U>::rval_reference_type ref_type;
-      if (is_initialized())
-      {
-        if ( rhs.is_initialized() )
-             assign_value(static_cast<ref_type>(rhs.get()), is_reference_predicate() );
-        else destroy();
-      }
-      else
-      {
-        if ( rhs.is_initialized() )
-          construct(static_cast<ref_type>(rhs.get()));
-      }
-    }
-#endif
-    
-    // Assigns from a T (deep-copies the rhs value)
-    void assign ( argument_type val )
-    {
-      if (is_initialized())
-           assign_value(val, is_reference_predicate() );
-      else construct(val);
-    }
-    
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Assigns from a T (deep-moves the rhs value)
-    void assign ( rval_reference_type val )
-    {
-      if (is_initialized())
-           assign_value( boost::move(val), is_reference_predicate() );
-      else construct( boost::move(val) );
-    }
-#endif
-
-    // Assigns from "none", destroying the current value, if any, leaving this UNINITIALIZED
-    // No-throw (assuming T::~T() doesn't)
-    void assign ( none_t ) BOOST_NOEXCEPT { destroy(); }
-
-#ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    template<class Expr, class ExprPtr>
-    void assign_expr ( Expr&& expr, ExprPtr const* tag )
-    {
-      if (is_initialized())
-        assign_expr_to_initialized(boost::forward<Expr>(expr),tag);
-      else construct(boost::forward<Expr>(expr),tag);
-    }
-#else
-    template<class Expr>
-    void assign_expr ( Expr const& expr, Expr const* tag )
-    {
-      if (is_initialized())
-        assign_expr_to_initialized(expr,tag);
-      else construct(expr,tag);
-    }
-#endif
-
-#endif
-
-  public :
-
-    // Destroys the current value, if any, leaving this UNINITIALIZED
-    // No-throw (assuming T::~T() doesn't)
-    void reset() BOOST_NOEXCEPT { destroy(); }
-
-    // **DEPRECATED** Replaces the current value -if any- with 'val'
-    void reset ( argument_type val ) { assign(val); }
-
-    // Returns a pointer to the value if this is initialized, otherwise,
-    // returns NULL.
-    // No-throw
-    pointer_const_type get_ptr() const { return m_initialized ? get_ptr_impl() : 0 ; }
-    pointer_type       get_ptr()       { return m_initialized ? get_ptr_impl() : 0 ; }
-
-    bool is_initialized() const { return m_initialized ; }
-
-  protected :
-
-    void construct ( argument_type val )
-     {
-       ::new (m_storage.address()) internal_type(val) ;
-       m_initialized = true ;
-     }
-     
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    void construct ( rval_reference_type val )
-     {
-       ::new (m_storage.address()) internal_type( types::move(val) ) ;
-       m_initialized = true ;
-     }
-#endif
-
-
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    // Constructs in-place
-    // upon exception *this is always uninitialized
-    template<class... Args>
-    void emplace_assign ( Args&&... args )
-     {
-       destroy();
-       ::new (m_storage.address()) internal_type( boost::forward<Args>(args)... );
-       m_initialized = true ;
-     }
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void emplace_assign ( Arg&& arg )
-     {
-       destroy();
-       ::new (m_storage.address()) internal_type( boost::forward<Arg>(arg) );
-       m_initialized = true ;
-     }
-     
-    void emplace_assign ()
-     {
-       destroy();
-       ::new (m_storage.address()) internal_type();
-       m_initialized = true ;
-     }
-#else
-    template<class Arg>
-    void emplace_assign ( const Arg& arg )
-     {
-       destroy();
-       ::new (m_storage.address()) internal_type( arg );
-       m_initialized = true ;
-     }
-     
-    template<class Arg>
-    void emplace_assign ( Arg& arg )
-     {
-       destroy();
-       ::new (m_storage.address()) internal_type( arg );
-       m_initialized = true ;
-     }
-     
-    void emplace_assign ()
-     {
-       destroy();
-       ::new (m_storage.address()) internal_type();
-       m_initialized = true ;
-     }
-#endif
-
-#ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Constructs in-place using the given factory
-    template<class Expr>
-    void construct ( Expr&& factory, in_place_factory_base const* )
-     {
-       BOOST_STATIC_ASSERT ( !is_reference_predicate::value ) ;
-       boost_optional_detail::construct<value_type>(factory, m_storage.address());
-       m_initialized = true ;
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void construct ( Expr&& factory, typed_in_place_factory_base const* )
-     {
-       BOOST_STATIC_ASSERT ( !is_reference_predicate::value ) ;
-       factory.apply(m_storage.address()) ;
-       m_initialized = true ;
-     }
-
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr&& factory, in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr&& factory, typed_in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-
-#else
-    // Constructs in-place using the given factory
-    template<class Expr>
-    void construct ( Expr const& factory, in_place_factory_base const* )
-     {
-       BOOST_STATIC_ASSERT ( !is_reference_predicate::value ) ;
-       boost_optional_detail::construct<value_type>(factory, m_storage.address());
-       m_initialized = true ;
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void construct ( Expr const& factory, typed_in_place_factory_base const* )
-     {
-       BOOST_STATIC_ASSERT ( !is_reference_predicate::value ) ;
-       factory.apply(m_storage.address()) ;
-       m_initialized = true ;
-     }
-
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, typed_in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-#endif
-
-#endif
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Constructs using any expression implicitly convertible to the single argument
-    // of a one-argument T constructor.
-    // Converting constructions of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting constructor of T from U.
-    template<class Expr>
-    void construct ( Expr&& expr, void const* )
-    {
-      new (m_storage.address()) internal_type(boost::forward<Expr>(expr)) ;
-      m_initialized = true ;
-    }
-
-    // Assigns using a form any expression implicitly convertible to the single argument
-    // of a T's assignment operator.
-    // Converting assignments of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting assignment of T from U.
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr&& expr, void const* )
-    {
-      assign_value(boost::forward<Expr>(expr), is_reference_predicate());
-    }
-#else
-    // Constructs using any expression implicitly convertible to the single argument
-    // of a one-argument T constructor.
-    // Converting constructions of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting constructor of T from U.
-    template<class Expr>
-    void construct ( Expr const& expr, void const* )
-     {
-       new (m_storage.address()) internal_type(expr) ;
-       m_initialized = true ;
-     }
-
-    // Assigns using a form any expression implicitly convertible to the single argument
-    // of a T's assignment operator.
-    // Converting assignments of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting assignment of T from U.
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& expr, void const* )
-     {
-       assign_value(expr, is_reference_predicate());
-     }
-
-#endif
-
-#ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
-    // BCB5.64 (and probably lower versions) workaround.
-    //   The in-place factories are supported by means of catch-all constructors
-    //   and assignment operators (the functions are parameterized in terms of
-    //   an arbitrary 'Expr' type)
-    //   This compiler incorrectly resolves the overload set and sinks optional<T> and optional<U>
-    //   to the 'Expr'-taking functions even though explicit overloads are present for them.
-    //   Thus, the following overload is needed to properly handle the case when the 'lhs'
-    //   is another optional.
-    //
-    // For VC<=70 compilers this workaround doesn't work because the compiler issues and error
-    // instead of choosing the wrong overload
-    //
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Notice that 'Expr' will be optional<T> or optional<U> (but not optional_base<..>)
-    template<class Expr>
-    void construct ( Expr&& expr, optional_tag const* )
-     {
-       if ( expr.is_initialized() )
-       {
-         // An exception can be thrown here.
-         // It it happens, THIS will be left uninitialized.
-         new (m_storage.address()) internal_type(types::move(expr.get())) ;
-         m_initialized = true ;
-       }
-     }
-#else
-    // Notice that 'Expr' will be optional<T> or optional<U> (but not optional_base<..>)
-    template<class Expr>
-    void construct ( Expr const& expr, optional_tag const* )
-     {
-       if ( expr.is_initialized() )
-       {
-         // An exception can be thrown here.
-         // It it happens, THIS will be left uninitialized.
-         new (m_storage.address()) internal_type(expr.get()) ;
-         m_initialized = true ;
-       }
-     }
-#endif
-#endif // defined BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
-
-    void assign_value ( argument_type val, is_not_reference_tag ) { get_impl() = val; }
-    void assign_value ( argument_type val, is_reference_tag     ) { construct(val); }
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    void assign_value ( rval_reference_type val, is_not_reference_tag ) { get_impl() = static_cast<rval_reference_type>(val); }
-    void assign_value ( rval_reference_type val, is_reference_tag     ) { construct( static_cast<rval_reference_type>(val) ); }
-#endif
-
-    void destroy()
-    {
-      if ( m_initialized )
-        destroy_impl(is_reference_predicate()) ;
-    }
-
-    reference_const_type get_impl() const { return dereference(get_object(), is_reference_predicate() ) ; }
-    reference_type       get_impl()       { return dereference(get_object(), is_reference_predicate() ) ; }
-
-    pointer_const_type get_ptr_impl() const { return cast_ptr(get_object(), is_reference_predicate() ) ; }
-    pointer_type       get_ptr_impl()       { return cast_ptr(get_object(), is_reference_predicate() ) ; }
-
-  private :
-
-    // internal_type can be either T or reference_content<T>
-#if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
-    // This workaround is supposed to silence GCC warnings about broken strict aliasing rules
-    internal_type const* get_object() const
-    {
-        union { void const* ap_pvoid; internal_type const* as_ptype; } caster = { m_storage.address() };
-        return caster.as_ptype;
-    }
-    internal_type *      get_object()
-    {
-        union { void* ap_pvoid; internal_type* as_ptype; } caster = { m_storage.address() };
-        return caster.as_ptype;
-    }
-#else
-    internal_type const* get_object() const { return static_cast<internal_type const*>(m_storage.address()); }
-    internal_type *      get_object()       { return static_cast<internal_type *>     (m_storage.address()); }
-#endif
-
-    // reference_content<T> lacks an implicit conversion to T&, so the following is needed to obtain a proper reference.
-    reference_const_type dereference( internal_type const* p, is_not_reference_tag ) const { return *p ; }
-    reference_type       dereference( internal_type*       p, is_not_reference_tag )       { return *p ; }
-    reference_const_type dereference( internal_type const* p, is_reference_tag     ) const { return p->get() ; }
-    reference_type       dereference( internal_type*       p, is_reference_tag     )       { return p->get() ; }
-
-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581))
-    void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; }
-#else
-    void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; }
-#endif
-
-    void destroy_impl ( is_reference_tag     ) { m_initialized = false ; }
-
-    // If T is of reference type, trying to get a pointer to the held value must result in a compile-time error.
-    // Decent compilers should disallow conversions from reference_content<T>* to T*, but just in case,
-    // the following overloads are used to filter out the case and guarantee an error in case of T being a reference.
-    pointer_const_type cast_ptr( internal_type const* p, is_not_reference_tag ) const { return p ; }
-    pointer_type       cast_ptr( internal_type *      p, is_not_reference_tag )       { return p ; }
-    pointer_const_type cast_ptr( internal_type const* p, is_reference_tag     ) const { return &p->get() ; }
-    pointer_type       cast_ptr( internal_type *      p, is_reference_tag     )       { return &p->get() ; }
-
-    bool m_initialized ;
-    storage_type m_storage ;
-} ;
-
-} // namespace optional_detail
-
-template<class T>
-class optional : public optional_detail::optional_base<T>
-{
-    typedef optional_detail::optional_base<T> base ;
-
-  public :
-
-    typedef optional<T> this_type ;
-
-    typedef BOOST_DEDUCED_TYPENAME base::value_type           value_type ;
-    typedef BOOST_DEDUCED_TYPENAME base::reference_type       reference_type ;
-    typedef BOOST_DEDUCED_TYPENAME base::reference_const_type reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    typedef BOOST_DEDUCED_TYPENAME base::rval_reference_type  rval_reference_type ;
-    typedef BOOST_DEDUCED_TYPENAME base::reference_type_of_temporary_wrapper reference_type_of_temporary_wrapper ;
-#endif
-    typedef BOOST_DEDUCED_TYPENAME base::pointer_type         pointer_type ;
-    typedef BOOST_DEDUCED_TYPENAME base::pointer_const_type   pointer_const_type ;
-    typedef BOOST_DEDUCED_TYPENAME base::argument_type        argument_type ;
-
-    // Creates an optional<T> uninitialized.
-    // No-throw
-    optional() BOOST_NOEXCEPT : base() {}
-
-    // Creates an optional<T> uninitialized.
-    // No-throw
-    optional( none_t none_ ) BOOST_NOEXCEPT : base(none_) {}
-
-    // Creates an optional<T> initialized with 'val'.
-    // Can throw if T::T(T const&) does
-    optional ( argument_type val ) : base(val) {}
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Creates an optional<T> initialized with 'move(val)'.
-    // Can throw if T::T(T &&) does
-    optional ( rval_reference_type val ) : base( boost::forward<T>(val) ) 
-      {optional_detail::prevent_binding_rvalue_ref_to_optional_lvalue_ref<T, rval_reference_type>();}
-#endif
-
-    // Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional.
-    // Can throw if T::T(T const&) does
-    optional ( bool cond, argument_type val ) : base(cond,val) {}
-
-    // NOTE: MSVC needs templated versions first
-
-    // Creates a deep copy of another convertible optional<U>
-    // Requires a valid conversion from U to T.
-    // Can throw if T::T(U const&) does
-    template<class U>
-    explicit optional ( optional<U> const& rhs )
-      :
-      base()
-    {
-      if ( rhs.is_initialized() )
-        this->construct(rhs.get());
-    }
-    
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Creates a deep move of another convertible optional<U>
-    // Requires a valid conversion from U to T.
-    // Can throw if T::T(U&&) does
-    template<class U>
-    explicit optional ( optional<U> && rhs )
-      :
-      base()
-    {
-      if ( rhs.is_initialized() )
-        this->construct( boost::move(rhs.get()) );
-    }
-#endif
-
-#ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
-    // Creates an optional<T> with an expression which can be either
-    //  (a) An instance of InPlaceFactory (i.e. in_place(a,b,...,n);
-    //  (b) An instance of TypedInPlaceFactory ( i.e. in_place<T>(a,b,...,n);
-    //  (c) Any expression implicitly convertible to the single type
-    //      of a one-argument T's constructor.
-    //  (d*) Weak compilers (BCB) might also resolved Expr as optional<T> and optional<U>
-    //       even though explicit overloads are present for these.
-    // Depending on the above some T ctor is called.
-    // Can throw if the resolved T ctor throws.
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-
-
-  template<class Expr>
-  explicit optional ( Expr&& expr, 
-                      BOOST_DEDUCED_TYPENAME boost::disable_if_c<
-                        (boost::is_base_of<optional_detail::optional_tag, BOOST_DEDUCED_TYPENAME boost::decay<Expr>::type>::value) || 
-                        boost::is_same<BOOST_DEDUCED_TYPENAME boost::decay<Expr>::type, none_t>::value, bool >::type = true 
-  ) 
-    : base(boost::forward<Expr>(expr),boost::addressof(expr)) 
-    {optional_detail::prevent_binding_rvalue_ref_to_optional_lvalue_ref<T, Expr&&>();}
-
-#else
-    template<class Expr>
-    explicit optional ( Expr const& expr ) : base(expr,boost::addressof(expr)) {}
-#endif // !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-#endif // !defined BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
-
-    // Creates a deep copy of another optional<T>
-    // Can throw if T::T(T const&) does
-    optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {}
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Creates a deep move of another optional<T>
-    // Can throw if T::T(T&&) does
-    optional ( optional && rhs )
-      BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value)
-      : base( boost::move(rhs) )
-    {}
-
-#endif
-   // No-throw (assuming T::~T() doesn't)
-    ~optional() {}
-
-#if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
-    // Assigns from an expression. See corresponding constructor.
-    // Basic Guarantee: If the resolved T ctor throws, this is left UNINITIALIZED
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-
-    template<class Expr>
-    BOOST_DEDUCED_TYPENAME boost::disable_if_c<
-      boost::is_base_of<optional_detail::optional_tag, BOOST_DEDUCED_TYPENAME boost::decay<Expr>::type>::value || 
-        boost::is_same<BOOST_DEDUCED_TYPENAME boost::decay<Expr>::type, none_t>::value,
-      optional&
-    >::type 
-    operator= ( Expr&& expr )
-      {
-        optional_detail::prevent_binding_rvalue_ref_to_optional_lvalue_ref<T, Expr&&>();
-        this->assign_expr(boost::forward<Expr>(expr),boost::addressof(expr));
-        return *this ;
-      }
-
-#else
-    template<class Expr>
-    optional& operator= ( Expr const& expr )
-      {
-        this->assign_expr(expr,boost::addressof(expr));
-        return *this ;
-      }
-#endif // !defined  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-#endif // !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
-
-    // Copy-assigns from another convertible optional<U> (converts && deep-copies the rhs value)
-    // Requires a valid conversion from U to T.
-    // Basic Guarantee: If T::T( U const& ) throws, this is left UNINITIALIZED
-    template<class U>
-    optional& operator= ( optional<U> const& rhs )
-      {
-        this->assign(rhs);
-        return *this ;
-      }
-      
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Move-assigns from another convertible optional<U> (converts && deep-moves the rhs value)
-    // Requires a valid conversion from U to T.
-    // Basic Guarantee: If T::T( U && ) throws, this is left UNINITIALIZED
-    template<class U>
-    optional& operator= ( optional<U> && rhs )
-      {
-        this->assign(boost::move(rhs));
-        return *this ;
-      }
-#endif
-
-    // Assigns from another optional<T> (deep-copies the rhs value)
-    // Basic Guarantee: If T::T( T const& ) throws, this is left UNINITIALIZED
-    //  (NOTE: On BCB, this operator is not actually called and left is left UNMODIFIED in case of a throw)
-    optional& operator= ( optional const& rhs )
-      {
-        this->assign( static_cast<base const&>(rhs) ) ;
-        return *this ;
-      }
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Assigns from another optional<T> (deep-moves the rhs value)
-    optional& operator= ( optional && rhs ) 
-      BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
-      {
-        this->assign( static_cast<base &&>(rhs) ) ;
-        return *this ;
-      }
-#endif
-
-    // Assigns from a T (deep-copies the rhs value)
-    // Basic Guarantee: If T::( T const& ) throws, this is left UNINITIALIZED
-    optional& operator= ( argument_type val )
-      {
-        this->assign( val ) ;
-        return *this ;
-      }
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    // Assigns from a T (deep-moves the rhs value)
-    optional& operator= ( rval_reference_type val )
-      {
-        optional_detail::prevent_binding_rvalue_ref_to_optional_lvalue_ref<T, rval_reference_type>();
-        this->assign( boost::move(val) ) ;
-        return *this ;
-      }
-#endif
-
-    // Assigns from a "none"
-    // Which destroys the current value, if any, leaving this UNINITIALIZED
-    // No-throw (assuming T::~T() doesn't)
-    optional& operator= ( none_t none_ ) BOOST_NOEXCEPT
-      {
-        this->assign( none_ ) ;
-        return *this ;
-      }
-      
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    // Constructs in-place
-    // upon exception *this is always uninitialized
-    template<class... Args>
-    void emplace ( Args&&... args )
-     {
-       this->emplace_assign( boost::forward<Args>(args)... );
-     }
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void emplace ( Arg&& arg )
-     {
-       this->emplace_assign( boost::forward<Arg>(arg) );
-     }
-     
-    void emplace ()
-     {
-       this->emplace_assign();
-     }
-#else
-    template<class Arg>
-    void emplace ( const Arg& arg )
-     {
-       this->emplace_assign( arg );
-     }
-     
-    template<class Arg>
-    void emplace ( Arg& arg )
-     {
-       this->emplace_assign( arg );
-     }
-     
-    void emplace ()
-     {
-       this->emplace_assign();
-     }
-#endif
-
-    void swap( optional & arg )
-      BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
-      {
-        // allow for Koenig lookup
-        boost::core::invoke_swap(*this, arg);
-      }
-
-
-    // Returns a reference to the value if this is initialized, otherwise,
-    // the behaviour is UNDEFINED
-    // No-throw
-    reference_const_type get() const { BOOST_ASSERT(this->is_initialized()) ; return this->get_impl(); }
-    reference_type       get()       { BOOST_ASSERT(this->is_initialized()) ; return this->get_impl(); }
-
-    // Returns a copy of the value if this is initialized, 'v' otherwise
-    reference_const_type get_value_or ( reference_const_type v ) const { return this->is_initialized() ? get() : v ; }
-    reference_type       get_value_or ( reference_type       v )       { return this->is_initialized() ? get() : v ; }
-
-    // Returns a pointer to the value if this is initialized, otherwise,
-    // the behaviour is UNDEFINED
-    // No-throw
-    pointer_const_type operator->() const { BOOST_ASSERT(this->is_initialized()) ; return this->get_ptr_impl() ; }
-    pointer_type       operator->()       { BOOST_ASSERT(this->is_initialized()) ; return this->get_ptr_impl() ; }
-
-    // Returns a reference to the value if this is initialized, otherwise,
-    // the behaviour is UNDEFINED
-    // No-throw
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) 
-    reference_const_type operator *() const& { return this->get() ; }
-    reference_type       operator *() &      { return this->get() ; }
-    reference_type_of_temporary_wrapper operator *() && { return base::types::move(this->get()) ; }
-#else
-    reference_const_type operator *() const { return this->get() ; }
-    reference_type       operator *()       { return this->get() ; }
-#endif // !defined BOOST_NO_CXX11_REF_QUALIFIERS
-
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) 
-    reference_const_type value() const&
-      { 
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-      
-    reference_type value() &
-      { 
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-      
-    reference_type_of_temporary_wrapper value() &&
-      { 
-        if (this->is_initialized())
-          return base::types::move(this->get()) ;
-        else
-          throw_exception(bad_optional_access());
-      }
-
-#else 
-    reference_const_type value() const
-      { 
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-      
-    reference_type value()
-      { 
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-#endif
-
-
-#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
-    template <class U>
-    value_type value_or ( U&& v ) const&
-      { 
-        if (this->is_initialized())
-          return get();
-        else
-          return boost::forward<U>(v);
-      }
-    
-    template <class U>
-    value_type value_or ( U&& v ) && 
-      { 
-        if (this->is_initialized())
-          return base::types::move(get());
-        else
-          return boost::forward<U>(v);
-      }
-#elif !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    template <class U>
-    value_type value_or ( U&& v ) const 
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return boost::forward<U>(v);
-      }
-#else
-    template <class U>
-    value_type value_or ( U const& v ) const 
-      { 
-        if (this->is_initialized())
-          return get();
-        else
-          return v;
-      }
-      
-    template <class U>
-    value_type value_or ( U& v ) const 
-      { 
-        if (this->is_initialized())
-          return get();
-        else
-          return v;
-      }
-#endif
-
-
-#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
-    template <typename F>
-    value_type value_or_eval ( F f ) const&
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return f();
-      }
-      
-    template <typename F>
-    value_type value_or_eval ( F f ) &&
-      {
-        if (this->is_initialized())
-          return base::types::move(get());
-        else
-          return f();
-      }
-#else
-    template <typename F>
-    value_type value_or_eval ( F f ) const
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return f();
-      }
-#endif
-      
-    bool operator!() const BOOST_NOEXCEPT { return !this->is_initialized() ; }
-    
-    BOOST_EXPLICIT_OPERATOR_BOOL_NOEXCEPT()
-} ;
-
-} // namespace boost
-
-
-#endif // header guard
diff --git a/inst/include/boost/optional/detail/optional_aligned_storage.hpp b/inst/include/boost/optional/detail/optional_aligned_storage.hpp
index b290921d3..704cadb6f 100644
--- a/inst/include/boost/optional/detail/optional_aligned_storage.hpp
+++ b/inst/include/boost/optional/detail/optional_aligned_storage.hpp
@@ -60,9 +60,8 @@ class aligned_storage
     T *      ptr_ref()       { return static_cast<T *>     (address()); }
 #endif
 
-    T const& ref() const { return *ptr_ref(); }
-    T &      ref()       { return *ptr_ref(); }
-  
+    T const& ref() const { return *boost::core::launder(ptr_ref()); }
+    T &      ref()       { return *boost::core::launder(ptr_ref()); }
 } ;
 
 } // namespace optional_detail
diff --git a/inst/include/boost/optional/detail/optional_config.hpp b/inst/include/boost/optional/detail/optional_config.hpp
index b5040a470..b7ccc3e69 100644
--- a/inst/include/boost/optional/detail/optional_config.hpp
+++ b/inst/include/boost/optional/detail/optional_config.hpp
@@ -14,9 +14,9 @@
 #define BOOST_OPTIONAL_DETAIL_OPTIONAL_CONFIG_AJK_28JAN2015_HPP
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
-#if (defined BOOST_NO_CXX11_RVALUE_REFERENCES) || (defined BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES)
+#if (defined BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES)
 # define BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 #endif
 
@@ -55,7 +55,7 @@
 #if (defined(_MSC_VER) && _MSC_VER <= 1800)
 // on MSVC 2013 and earlier an unwanted temporary is created when you assign from
 // a const lvalue of integral type. Thus we bind not to the original address but
-// to a temporary. 
+// to a temporary.
 # define BOOST_OPTIONAL_CONFIG_NO_PROPER_ASSIGN_FROM_CONST_INT
 #endif
 
@@ -82,7 +82,7 @@
 
 #endif // defined(__GNUC__)
 
-#if (defined __GNUC__) && (!defined BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if (defined __GNUC__)
 // On some initial rvalue reference implementations GCC does it in a strange way,
 // preferring perfect-forwarding constructor to implicit copy constructor.
 
@@ -132,4 +132,13 @@
 #endif
 
 
+#ifdef BOOST_NO_CXX11_REF_QUALIFIERS
+# define BOOST_OPTIONAL_CONST_REF_QUAL const
+# define BOOST_OPTIONAL_REF_QUAL
+#else
+# define BOOST_OPTIONAL_CONST_REF_QUAL const&
+# define BOOST_OPTIONAL_REF_QUAL &
+#endif
+
+
 #endif // header guard
diff --git a/inst/include/boost/optional/detail/optional_reference_spec.hpp b/inst/include/boost/optional/detail/optional_reference_spec.hpp
index b013f0b5d..d8405f82a 100644
--- a/inst/include/boost/optional/detail/optional_reference_spec.hpp
+++ b/inst/include/boost/optional/detail/optional_reference_spec.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Andrzej Krzemienski.
+// Copyright (C) 2015-2024 Andrzej Krzemienski.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -29,17 +29,17 @@ template <class From>
 void prevent_binding_rvalue()
 {
 #ifndef BOOST_OPTIONAL_CONFIG_ALLOW_BINDING_TO_RVALUES
-    BOOST_STATIC_ASSERT_MSG(boost::is_lvalue_reference<From>::value, 
-                            "binding rvalue references to optional lvalue references is disallowed");
-#endif    
+    static_assert(boost::is_lvalue_reference<From>::value,
+                  "binding rvalue references to optional lvalue references is disallowed");
+#endif
 }
 
 template <class T>
 BOOST_DEDUCED_TYPENAME boost::remove_reference<T>::type& forward_reference(T&& r)
 {
-    BOOST_STATIC_ASSERT_MSG(boost::is_lvalue_reference<T>::value, 
-                            "binding rvalue references to optional lvalue references is disallowed");
-    return boost::forward<T>(r);
+    static_assert(boost::is_lvalue_reference<T>::value,
+                  "binding rvalue references to optional lvalue references is disallowed");
+    return optional_detail::forward<T>(r);
 }
 
 #endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
@@ -68,10 +68,10 @@ void prevent_assignment_from_false_const_integral()
 #ifdef BOOST_OPTIONAL_CONFIG_NO_PROPER_ASSIGN_FROM_CONST_INT
     // MSVC compiler without rvalue references: we need to disable the assignment from
     // const integral lvalue reference, as it may be an invalid temporary
-    BOOST_STATIC_ASSERT_MSG(!is_const_integral<From>::value, 
-                            "binding const lvalue references to integral types is disabled in this compiler");
+    static_assert(!is_const_integral<From>::value,
+                  "binding const lvalue references to integral types is disabled in this compiler");
+#endif
 #endif
-#endif   
 }
 
 
@@ -114,7 +114,7 @@ template <class T>
 class optional<T&> : public optional_detail::optional_tag
 {
     T* ptr_;
-    
+
 public:
     typedef T& value_type;
     typedef T& reference_type;
@@ -122,19 +122,19 @@ class optional<T&> : public optional_detail::optional_tag
     typedef T& rval_reference_type;
     typedef T* pointer_type;
     typedef T* pointer_const_type;
-    
+
     optional() BOOST_NOEXCEPT : ptr_() {}
-    optional(none_t) BOOST_NOEXCEPT : ptr_() {}  
+    optional(none_t) BOOST_NOEXCEPT : ptr_() {}
 
     template <class U>
         explicit optional(const optional<U&>& rhs) BOOST_NOEXCEPT : ptr_(rhs.get_ptr()) {}
     optional(const optional& rhs) BOOST_NOEXCEPT : ptr_(rhs.get_ptr()) {}
-    
+
     // the following two implement a 'conditionally explicit' constructor: condition is a hack for buggy compilers with screwed conversion construction from const int
     template <class U>
       explicit optional(U& rhs, BOOST_DEDUCED_TYPENAME boost::enable_if_c<detail::is_same_decayed<T, U>::value && detail::is_const_integral_bad_for_conversion<U>::value, bool>::type = true) BOOST_NOEXCEPT
       : ptr_(boost::addressof(rhs)) {}
-      
+
     template <class U>
       optional(U& rhs, BOOST_DEDUCED_TYPENAME boost::enable_if_c<detail::is_same_decayed<T, U>::value && !detail::is_const_integral_bad_for_conversion<U>::value, bool>::type = true) BOOST_NOEXCEPT
       : ptr_(boost::addressof(rhs)) {}
@@ -143,15 +143,15 @@ class optional<T&> : public optional_detail::optional_tag
     template <class U>
         optional& operator=(const optional<U&>& rhs) BOOST_NOEXCEPT { ptr_ = rhs.get_ptr(); return *this; }
     optional& operator=(none_t) BOOST_NOEXCEPT { ptr_ = 0; return *this; }
-    
-    
+
+
     void swap(optional& rhs) BOOST_NOEXCEPT { std::swap(ptr_, rhs.ptr_); }
     T& get() const { BOOST_ASSERT(ptr_); return   *ptr_; }
 
     T* get_ptr() const BOOST_NOEXCEPT { return ptr_; }
     T* operator->() const { BOOST_ASSERT(ptr_); return ptr_; }
     T& operator*() const { BOOST_ASSERT(ptr_); return *ptr_; }
-    
+
     T& value() const
     {
       if (this->is_initialized())
@@ -159,17 +159,17 @@ class optional<T&> : public optional_detail::optional_tag
       else
         throw_exception(bad_optional_access());
     }
-    
-    bool operator!() const BOOST_NOEXCEPT { return ptr_ == 0; }  
-    BOOST_EXPLICIT_OPERATOR_BOOL_NOEXCEPT()
-      
+
+    explicit operator bool() const BOOST_NOEXCEPT { return ptr_ != 0; }
+
     void reset() BOOST_NOEXCEPT { ptr_ = 0; }
 
     bool is_initialized() const BOOST_NOEXCEPT { return ptr_ != 0; }
     bool has_value() const BOOST_NOEXCEPT { return ptr_ != 0; }
-    
+
     template <typename F>
-    optional<typename boost::result_of<F(T&)>::type> map(F f) const
+    optional<typename optional_detail::result_of<F, reference_const_type>::type>
+    map(F f) const
     {
       if (this->has_value())
         return f(this->get());
@@ -178,61 +178,62 @@ class optional<T&> : public optional_detail::optional_tag
     }
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(T&)>::type>::type> flat_map(F f) const
+    optional<typename optional_detail::result_value_type<F, reference_const_type>::type>
+    flat_map(F f) const
       {
         if (this->has_value())
           return f(get());
         else
           return none;
       }
-    
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES   
- 
+
+#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
+
     optional(T&& /* rhs */) BOOST_NOEXCEPT { detail::prevent_binding_rvalue<T&&>(); }
-    
+
     template <class R>
         optional(R&& r, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::no_unboxing_cond<T, R>, bool>::type = true) BOOST_NOEXCEPT
         : ptr_(boost::addressof(r)) { detail::prevent_binding_rvalue<R>(); }
-        
+
     template <class R>
         optional(bool cond, R&& r, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<R>, bool>::type = true) BOOST_NOEXCEPT
         : ptr_(cond ? boost::addressof(r) : 0) { detail::prevent_binding_rvalue<R>(); }
-        
+
     template <class R>
         BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<R>, optional<T&>&>::type
         operator=(R&& r) BOOST_NOEXCEPT { detail::prevent_binding_rvalue<R>(); ptr_ = boost::addressof(r); return *this; }
-        
+
     template <class R>
         void emplace(R&& r, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<R>, bool>::type = true) BOOST_NOEXCEPT
         { detail::prevent_binding_rvalue<R>(); ptr_ = boost::addressof(r); }
-        
+
     template <class R>
       T& get_value_or(R&& r, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<R>, bool>::type = true) const BOOST_NOEXCEPT
       { detail::prevent_binding_rvalue<R>(); return ptr_ ? *ptr_ : r; }
-      
+
     template <class R>
         T& value_or(R&& r, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<R>, bool>::type = true) const BOOST_NOEXCEPT
         { detail::prevent_binding_rvalue<R>(); return ptr_ ? *ptr_ : r; }
-        
+
     template <class R>
       void reset(R&& r, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<R>, bool>::type = true) BOOST_NOEXCEPT
       { detail::prevent_binding_rvalue<R>(); ptr_ = boost::addressof(r); }
-      
+
     template <class F>
         T& value_or_eval(F f) const { return ptr_ ? *ptr_ : detail::forward_reference(f()); }
-      
+
 #else  // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
-    
+
     // the following two implement a 'conditionally explicit' constructor
     template <class U>
       explicit optional(U& v, BOOST_DEDUCED_TYPENAME boost::enable_if_c<detail::no_unboxing_cond<T, U>::value && detail::is_const_integral_bad_for_conversion<U>::value, bool>::type = true) BOOST_NOEXCEPT
       : ptr_(boost::addressof(v)) { }
-      
+
     template <class U>
       optional(U& v, BOOST_DEDUCED_TYPENAME boost::enable_if_c<detail::no_unboxing_cond<T, U>::value && !detail::is_const_integral_bad_for_conversion<U>::value, bool>::type = true) BOOST_NOEXCEPT
       : ptr_(boost::addressof(v)) { }
-        
+
     template <class U>
       optional(bool cond, U& v, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<U>, bool>::type = true) BOOST_NOEXCEPT : ptr_(cond ? boost::addressof(v) : 0) {}
 
@@ -247,26 +248,26 @@ class optional<T&> : public optional_detail::optional_tag
     template <class U>
         void emplace(U& v, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<U>, bool>::type = true) BOOST_NOEXCEPT
         { ptr_ = boost::addressof(v); }
-        
+
     template <class U>
       T& get_value_or(U& v, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<U>, bool>::type = true) const BOOST_NOEXCEPT
       { return ptr_ ? *ptr_ : v; }
-      
+
     template <class U>
         T& value_or(U& v, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<U>, bool>::type = true) const BOOST_NOEXCEPT
         { return ptr_ ? *ptr_ : v; }
-        
+
     template <class U>
       void reset(U& v, BOOST_DEDUCED_TYPENAME boost::enable_if<detail::is_no_optional<U>, bool>::type = true) BOOST_NOEXCEPT
       { ptr_ = boost::addressof(v); }
-      
+
     template <class F>
       T& value_or_eval(F f) const { return ptr_ ? *ptr_ : f(); }
-      
+
 #endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 };
 
-template <class T> 
+template <class T>
   void swap ( optional<T&>& x, optional<T&>& y) BOOST_NOEXCEPT
 {
   x.swap(y);
diff --git a/inst/include/boost/optional/detail/optional_relops.hpp b/inst/include/boost/optional/detail/optional_relops.hpp
index 1c155787b..dc558ea67 100644
--- a/inst/include/boost/optional/detail/optional_relops.hpp
+++ b/inst/include/boost/optional/detail/optional_relops.hpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2003, 2008 Fernando Luis Cacciola Carballal.
-// Copyright (C) 2015 Andrzej Krzemienski.
+// Copyright (C) 2015, 2024 Andrzej Krzemienski.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,7 +16,8 @@
 namespace boost {
 
 // optional's relational operators ( ==, !=, <, >, <=, >= ) have deep-semantics (compare values).
-// WARNING: This is UNLIKE pointers. Use equal_pointees()/less_pointees() in generic code instead.
+// WARNING: This is UNLIKE pointers. Use equal_pointees()/less_pointees() in generic code instead,
+// to obtain the same semantic for pointers.
 
 
 //
@@ -31,7 +32,7 @@ bool operator == ( optional<T> const& x, optional<T> const& y )
 template<class T>
 inline
 bool operator < ( optional<T> const& x, optional<T> const& y )
-{ return less_pointees(x,y); }
+{ return !y ? false : (!x ? true : (*x) < (*y)); }
 
 template<class T>
 inline
@@ -60,12 +61,12 @@ bool operator >= ( optional<T> const& x, optional<T> const& y )
 template<class T>
 inline
 bool operator == ( optional<T> const& x, T const& y )
-{ return equal_pointees(x, optional<T>(y)); }
+{ return x && (*x == y); }
 
 template<class T>
 inline
 bool operator < ( optional<T> const& x, T const& y )
-{ return less_pointees(x, optional<T>(y)); }
+{ return (!x) || (*x < y); }
 
 template<class T>
 inline
@@ -94,12 +95,12 @@ bool operator >= ( optional<T> const& x, T const& y )
 template<class T>
 inline
 bool operator == ( T const& x, optional<T> const& y )
-{ return equal_pointees( optional<T>(x), y ); }
+{ return y && (x == *y); }
 
 template<class T>
 inline
 bool operator < ( T const& x, optional<T> const& y )
-{ return less_pointees( optional<T>(x), y ); }
+{ return y && (x < *y); }
 
 template<class T>
 inline
@@ -133,8 +134,8 @@ bool operator == ( optional<T> const& x, none_t ) BOOST_NOEXCEPT
 
 template<class T>
 inline
-bool operator < ( optional<T> const& x, none_t )
-{ return less_pointees(x,optional<T>() ); }
+bool operator < ( optional<T> const&, none_t )
+{ return false; }
 
 template<class T>
 inline
@@ -168,7 +169,7 @@ bool operator == ( none_t , optional<T> const& y ) BOOST_NOEXCEPT
 template<class T>
 inline
 bool operator < ( none_t , optional<T> const& y )
-{ return less_pointees(optional<T>() ,y); }
+{ return bool(y); }
 
 template<class T>
 inline
@@ -193,4 +194,3 @@ bool operator >= ( none_t x, optional<T> const& y )
 } // namespace boost
 
 #endif // header guard
-
diff --git a/inst/include/boost/optional/detail/optional_swap.hpp b/inst/include/boost/optional/detail/optional_swap.hpp
index f4eceabb5..f1d301b4e 100644
--- a/inst/include/boost/optional/detail/optional_swap.hpp
+++ b/inst/include/boost/optional/detail/optional_swap.hpp
@@ -54,7 +54,7 @@ struct swap_selector<true>
 #endif
 
 #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-# define BOOST_OPTIONAL_DETAIL_MOVE(EXPR_) boost::move(EXPR_)
+# define BOOST_OPTIONAL_DETAIL_MOVE(EXPR_) optional_detail::move(EXPR_)
 #else
 # define BOOST_OPTIONAL_DETAIL_MOVE(EXPR_) EXPR_
 #endif
@@ -63,7 +63,7 @@ template <>
 struct swap_selector<false>
 {
     template <class T>
-    static void optional_swap ( optional<T>& x, optional<T>& y ) 
+    static void optional_swap ( optional<T>& x, optional<T>& y )
     //BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && BOOST_NOEXCEPT_EXPR(boost::core::invoke_swap(*x, *y)))
     {
         if (x)
@@ -91,7 +91,7 @@ struct swap_selector<false>
 
 } // namespace optional_detail
 
-#if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES) && (!defined BOOST_CONFIG_RESTORE_OBSOLETE_SWAP_IMPLEMENTATION)
+#if (!defined BOOST_CONFIG_RESTORE_OBSOLETE_SWAP_IMPLEMENTATION)
 
 template<class T>
 struct optional_swap_should_use_default_constructor : boost::false_type {} ;
diff --git a/inst/include/boost/optional/detail/optional_trivially_copyable_base.hpp b/inst/include/boost/optional/detail/optional_trivially_copyable_base.hpp
index 8d98a8449..3a08f7d8a 100644
--- a/inst/include/boost/optional/detail/optional_trivially_copyable_base.hpp
+++ b/inst/include/boost/optional/detail/optional_trivially_copyable_base.hpp
@@ -25,21 +25,19 @@ class tc_optional_base : public optional_tag
   protected:
     typedef T &       reference_type ;
     typedef T const&  reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     typedef T &&  rval_reference_type ;
     typedef T &&  reference_type_of_temporary_wrapper ;
-#endif
     typedef T *         pointer_type ;
     typedef T const*    pointer_const_type ;
     typedef T const&    argument_type ;
 
     tc_optional_base()
       :
-      m_initialized(false) {}
+      m_initialized(false), m_storage() {}
 
     tc_optional_base ( none_t )
       :
-      m_initialized(false) {}
+      m_initialized(false), m_storage() {}
 
     tc_optional_base ( init_value_tag, argument_type val )
       :
@@ -51,31 +49,14 @@ class tc_optional_base : public optional_tag
 
     // tc_optional_base ( tc_optional_base const& ) = default;
 
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-
     template<class Expr, class PtrExpr>
     explicit tc_optional_base ( Expr&& expr, PtrExpr const* tag )
       :
       m_initialized(false)
     {
-      construct(boost::forward<Expr>(expr),tag);
-    }
-
-#else
-    // This is used for both converting and in-place constructions.
-    // Derived classes use the 'tag' to select the appropriate
-    // implementation (the correct 'construct()' overload)
-    template<class Expr>
-    explicit tc_optional_base ( Expr const& expr, Expr const* tag )
-      :
-      m_initialized(false)
-    {
-      construct(expr,tag);
+      construct(optional_detail::forward<Expr>(expr),tag);
     }
 
-#endif
-
     // tc_optional_base& operator= ( tc_optional_base const& ) = default;
     // ~tc_optional_base() = default;
 
@@ -99,7 +80,6 @@ class tc_optional_base : public optional_tag
       m_initialized = rhs.is_initialized();
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // move-assigns from another _convertible_ optional<U> (deep-moves from the rhs value)
     template<class U>
     void assign ( optional<U>&& rhs )
@@ -109,7 +89,6 @@ class tc_optional_base : public optional_tag
         m_storage = static_cast<ref_type>(rhs.get());
       m_initialized = rhs.is_initialized();
     }
-#endif
 
     void assign ( argument_type val )
     {
@@ -120,19 +99,11 @@ class tc_optional_base : public optional_tag
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     template<class Expr, class ExprPtr>
     void assign_expr ( Expr&& expr, ExprPtr const* tag )
     {
-       construct(boost::forward<Expr>(expr),tag);
+       construct(optional_detail::forward<Expr>(expr),tag);
     }
-#else
-    template<class Expr>
-    void assign_expr ( Expr const& expr, Expr const* tag )
-    {
-      construct(expr,tag);
-    }
-#endif
 
 #endif
 
@@ -162,20 +133,19 @@ class tc_optional_base : public optional_tag
      }
 
 
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     // Constructs in-place
     // upon exception *this is always uninitialized
     template<class... Args>
     void construct ( in_place_init_t, Args&&... args )
     {
-      m_storage = value_type( boost::forward<Args>(args)... ) ;
+      m_storage = value_type( optional_detail::forward<Args>(args)... ) ;
       m_initialized = true ;
     }
 
     template<class... Args>
     void emplace_assign ( Args&&... args )
     {
-      construct(in_place_init, boost::forward<Args>(args)...);
+      construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
 
     template<class... Args>
@@ -183,7 +153,7 @@ class tc_optional_base : public optional_tag
       :
       m_initialized(false)
     {
-      construct(in_place_init, boost::forward<Args>(args)...);
+      construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
 
     template<class... Args>
@@ -192,148 +162,11 @@ class tc_optional_base : public optional_tag
       m_initialized(false)
     {
       if ( cond )
-        construct(in_place_init, boost::forward<Args>(args)...);
-    }
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void construct ( in_place_init_t, Arg&& arg )
-     {
-       m_storage = value_type( boost::forward<Arg>(arg) );
-       m_initialized = true ;
-     }
-
-    void construct ( in_place_init_t )
-     {
-       m_storage = value_type();
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void emplace_assign ( Arg&& arg )
-     {
-       construct(in_place_init, boost::forward<Arg>(arg)) ;
-     }
-
-    void emplace_assign ()
-     {
-       construct(in_place_init) ;
-     }
-
-    template<class Arg>
-    explicit tc_optional_base ( in_place_init_t, Arg&& arg )
-      :
-      m_initialized(false)
-    {
-      construct(in_place_init, boost::forward<Arg>(arg));
-    }
-
-    explicit tc_optional_base ( in_place_init_t )
-      :
-      m_initialized(false), m_storage() {}
-
-    template<class Arg>
-    explicit tc_optional_base ( in_place_init_if_t, bool cond, Arg&& arg )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, boost::forward<Arg>(arg));
-    }
-
-    explicit tc_optional_base ( in_place_init_if_t, bool cond )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init);
-    }
-
-#else
-
-    template<class Arg>
-    void construct ( in_place_init_t, const Arg& arg )
-     {
-       m_storage = value_type( arg );
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void construct ( in_place_init_t, Arg& arg )
-     {
-       m_storage = value_type( arg );
-       m_initialized = true ;
-     }
-
-    void construct ( in_place_init_t )
-     {
-       m_storage = value_type();
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void emplace_assign ( const Arg& arg )
-    {
-      construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    void emplace_assign ( Arg& arg )
-    {
-      construct(in_place_init, arg);
-    }
-
-    void emplace_assign ()
-    {
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit tc_optional_base ( in_place_init_t, const Arg& arg )
-      : m_initialized(false)
-    {
-      construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    explicit tc_optional_base ( in_place_init_t, Arg& arg )
-      : m_initialized(false)
-    {
-      construct(in_place_init, arg);
-    }
-
-    explicit tc_optional_base ( in_place_init_t )
-      : m_initialized(false)
-    {
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit tc_optional_base ( in_place_init_if_t, bool cond, const Arg& arg )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    explicit tc_optional_base ( in_place_init_if_t, bool cond, Arg& arg )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, arg);
-    }
-
-    explicit tc_optional_base ( in_place_init_if_t, bool cond )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init);
+        construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
-#endif
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Constructs in-place using the given factory
     template<class Expr>
     void construct ( Expr&& factory, in_place_factory_base const* )
@@ -365,42 +198,8 @@ class tc_optional_base : public optional_tag
        construct(factory,tag);
      }
 
-#else
-    // Constructs in-place using the given factory
-    template<class Expr>
-    void construct ( Expr const& factory, in_place_factory_base const* )
-     {
-       boost_optional_detail::construct<value_type>(factory, boost::addressof(m_storage));
-       m_initialized = true ;
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void construct ( Expr const& factory, typed_in_place_factory_base const* )
-     {
-       factory.apply(boost::addressof(m_storage)) ;
-       m_initialized = true ;
-     }
-
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, typed_in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-#endif
-
 #endif
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Constructs using any expression implicitly convertible to the single argument
     // of a one-argument T constructor.
     // Converting constructions of optional<T> from optional<U> uses this function with
@@ -408,7 +207,7 @@ class tc_optional_base : public optional_tag
     template<class Expr>
     void construct ( Expr&& expr, void const* )
     {
-      m_storage = value_type(boost::forward<Expr>(expr)) ;
+      m_storage = value_type(optional_detail::forward<Expr>(expr)) ;
       m_initialized = true ;
     }
 
@@ -419,31 +218,8 @@ class tc_optional_base : public optional_tag
     template<class Expr>
     void assign_expr_to_initialized ( Expr&& expr, void const* )
     {
-      assign_value( boost::forward<Expr>(expr) );
+      assign_value( optional_detail::forward<Expr>(expr) );
     }
-#else
-    // Constructs using any expression implicitly convertible to the single argument
-    // of a one-argument T constructor.
-    // Converting constructions of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting constructor of T from U.
-    template<class Expr>
-    void construct ( Expr const& expr, void const* )
-     {
-       m_storage = value_type(expr) ;
-       m_initialized = true ;
-     }
-
-    // Assigns using a form any expression implicitly convertible to the single argument
-    // of a T's assignment operator.
-    // Converting assignments of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting assignment of T from U.
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& expr, void const* )
-     {
-       assign_value(expr);
-     }
-
-#endif
 
 #ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
     // BCB5.64 (and probably lower versions) workaround.
@@ -458,7 +234,7 @@ class tc_optional_base : public optional_tag
     // For VC<=70 compilers this workaround doesn't work because the compiler issues and error
     // instead of choosing the wrong overload
     //
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
+
     // Notice that 'Expr' will be optional<T> or optional<U> (but not tc_optional_base<..>)
     template<class Expr>
     void construct ( Expr&& expr, optional_tag const* )
@@ -467,30 +243,14 @@ class tc_optional_base : public optional_tag
        {
          // An exception can be thrown here.
          // It it happens, THIS will be left uninitialized.
-         m_storage = value_type(boost::move(expr.get())) ;
-         m_initialized = true ;
-       }
-     }
-#else
-    // Notice that 'Expr' will be optional<T> or optional<U> (but not tc_optional_base<..>)
-    template<class Expr>
-    void construct ( Expr const& expr, optional_tag const* )
-     {
-       if ( expr.is_initialized() )
-       {
-         // An exception can be thrown here.
-         // It it happens, THIS will be left uninitialized.
-         m_storage = value_type(expr.get()) ;
+         m_storage = value_type(optional_detail::move(expr.get())) ;
          m_initialized = true ;
        }
      }
-#endif
 #endif // defined BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
 
     void assign_value ( argument_type val ) { m_storage = val; }
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     void assign_value ( rval_reference_type val ) { m_storage = static_cast<rval_reference_type>(val); }
-#endif
 
     void destroy()
     {
diff --git a/inst/include/boost/optional/detail/optional_utility.hpp b/inst/include/boost/optional/detail/optional_utility.hpp
new file mode 100644
index 000000000..f7c04ffec
--- /dev/null
+++ b/inst/include/boost/optional/detail/optional_utility.hpp
@@ -0,0 +1,41 @@
+// Copyright (C) 2024 Ryan Malcolm Underwood.
+//
+// Use, modification, and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  typenametea@gmail.com
+
+#ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_RMU_06OCT2024_HPP
+#define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_RMU_06OCT2024_HPP
+
+namespace boost {
+namespace optional_detail {
+
+// Workaround: forward and move aren't constexpr in C++11
+template <class T>
+inline constexpr T&& forward(typename boost::remove_reference<T>::type& t) noexcept
+{
+  return static_cast<T&&>(t);
+}
+
+template <class T>
+inline constexpr T&& forward(typename boost::remove_reference<T>::type&& t) noexcept
+{
+  static_assert(!boost::is_lvalue_reference<T>::value, "Can not forward an rvalue as an lvalue.");
+  return static_cast<T&&>(t);
+}
+
+template <class T>
+inline constexpr typename boost::remove_reference<T>::type&& move(T&& t) noexcept
+{
+  return static_cast<typename boost::remove_reference<T>::type&&>(t);
+}
+
+} // namespace optional_detail
+} // namespace boost
+
+#endif
diff --git a/inst/include/boost/optional/optional.hpp b/inst/include/boost/optional/optional.hpp
index f5fdf992f..b8f402d87 100644
--- a/inst/include/boost/optional/optional.hpp
+++ b/inst/include/boost/optional/optional.hpp
@@ -22,19 +22,13 @@
 #include <iosfwd>
 #endif // BOOST_NO_IOSTREAM
 
-#ifdef BOOST_OPTIONAL_DETAIL_USE_STD_TYPE_TRAITS
-#  include <type_traits>
-#endif
-
 #include <boost/assert.hpp>
 #include <boost/core/addressof.hpp>
 #include <boost/core/enable_if.hpp>
-#include <boost/core/explicit_operator_bool.hpp>
 #include <boost/core/invoke_swap.hpp>
+#include <boost/core/launder.hpp>
 #include <boost/optional/bad_optional_access.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/throw_exception.hpp>
-#include <boost/type.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 #include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/conjunction.hpp>
@@ -56,16 +50,14 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_volatile.hpp>
 #include <boost/type_traits/is_scalar.hpp>
-#include <boost/move/utility.hpp>
 #include <boost/none.hpp>
-#include <boost/utility/compare_pointees.hpp>
-#include <boost/utility/result_of.hpp>
 
 #include <boost/optional/optional_fwd.hpp>
 #include <boost/optional/detail/optional_config.hpp>
 #include <boost/optional/detail/optional_factory_support.hpp>
 #include <boost/optional/detail/optional_aligned_storage.hpp>
 #include <boost/optional/detail/optional_hash.hpp>
+#include <boost/optional/detail/optional_utility.hpp>
 
 namespace boost { namespace optional_detail {
 
@@ -74,17 +66,34 @@ struct optional_value_type
 {
 };
 
+template <typename U>
+struct optional_value_type< ::boost::optional<U> >
+{
+  typedef U type;
+};
+
 template <typename T>
-struct optional_value_type< ::boost::optional<T> >
+T declval();
+
+
+// implementing my own result_of so that it works for C++11 (std::result_of)
+// and in C++20 (std::invoke_result).
+template <typename F, typename Ref, typename Rslt = decltype(declval<F>()(declval<Ref>()))>
+struct result_of
+{
+  typedef Rslt type;
+};
+
+template <typename F, typename Ref, typename Rslt = typename optional_value_type<typename result_of<F, Ref>::type>::type>
+struct result_value_type
 {
-  typedef T type;
+  typedef Rslt type;
 };
 
+// optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type>()))>::type>
+
 }} // namespace boost::optional_detail
 
-#ifdef BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-#include <boost/optional/detail/old_optional_implementation.hpp>
-#else
 namespace boost {
 
 namespace optional_ns {
@@ -93,17 +102,17 @@ namespace optional_ns {
 struct in_place_init_t
 {
   struct init_tag{};
-  explicit in_place_init_t(init_tag){}
+  BOOST_CONSTEXPR explicit in_place_init_t(init_tag){}
 };
-const in_place_init_t in_place_init ((in_place_init_t::init_tag()));
+BOOST_INLINE_CONSTEXPR in_place_init_t in_place_init ((in_place_init_t::init_tag()));
 
 // a tag for conditional in-place initialization of contained value
 struct in_place_init_if_t
 {
   struct init_tag{};
-  explicit in_place_init_if_t(init_tag){}
+  BOOST_CONSTEXPR explicit in_place_init_if_t(init_tag){}
 };
-const in_place_init_if_t in_place_init_if ((in_place_init_if_t::init_tag()));
+BOOST_INLINE_CONSTEXPR in_place_init_if_t in_place_init_if ((in_place_init_if_t::init_tag()));
 
 } // namespace optional_ns
 
@@ -135,10 +144,8 @@ class optional_base : public optional_tag
   protected:
     typedef T &       reference_type ;
     typedef T const&  reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     typedef T &&  rval_reference_type ;
     typedef T &&  reference_type_of_temporary_wrapper ;
-#endif
     typedef T *         pointer_type ;
     typedef T const*    pointer_const_type ;
     typedef T const&    argument_type ;
@@ -164,16 +171,14 @@ class optional_base : public optional_tag
         construct(val);
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // move-construct an optional<T> initialized from an rvalue-ref to 'val'.
     // Can throw if T::T(T&&) does
     optional_base ( init_value_tag, rval_reference_type val )
       :
       m_initialized(false)
     {
-      construct( boost::move(val) );
+      construct( optional_detail::move(val) );
     }
-#endif
 
     // Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional<T>.
     // Can throw if T::T(T const&) does
@@ -185,7 +190,6 @@ class optional_base : public optional_tag
         construct(val);
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates an optional<T> initialized with 'move(val)' IFF cond is true, otherwise creates an uninitialized optional<T>.
     // Can throw if T::T(T &&) does
     optional_base ( bool cond, rval_reference_type val )
@@ -193,9 +197,8 @@ class optional_base : public optional_tag
       m_initialized(false)
     {
       if ( cond )
-        construct(boost::move(val));
+        construct(optional_detail::move(val));
     }
-#endif
 
     // Creates a deep copy of another optional<T>
     // Can throw if T::T(T const&) does
@@ -207,7 +210,6 @@ class optional_base : public optional_tag
         construct(rhs.get_impl());
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates a deep move of another optional<T>
     // Can throw if T::T(T&&) does
     optional_base ( optional_base&& rhs )
@@ -216,48 +218,30 @@ class optional_base : public optional_tag
       m_initialized(false)
     {
       if ( rhs.is_initialized() )
-        construct( boost::move(rhs.get_impl()) );
+        construct( optional_detail::move(rhs.get_impl()) );
     }
-#endif
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
     template<class Expr, class PtrExpr>
     explicit optional_base ( Expr&& expr, PtrExpr const* tag )
       :
       m_initialized(false)
     {
-      construct(boost::forward<Expr>(expr),tag);
-    }
-
-#else
-    // This is used for both converting and in-place constructions.
-    // Derived classes use the 'tag' to select the appropriate
-    // implementation (the correct 'construct()' overload)
-    template<class Expr>
-    explicit optional_base ( Expr const& expr, Expr const* tag )
-      :
-      m_initialized(false)
-    {
-      construct(expr,tag);
+      construct(optional_detail::forward<Expr>(expr),tag);
     }
 
-#endif
-
     optional_base& operator= ( optional_base const& rhs )
     {
       this->assign(rhs);
       return *this;
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     optional_base& operator= ( optional_base && rhs )
     BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
     {
       this->assign(static_cast<optional_base&&>(rhs));
       return *this;
     }
-#endif
 
     // No-throw (assuming T::~T() doesn't)
     ~optional_base() { destroy() ; }
@@ -278,23 +262,21 @@ class optional_base : public optional_tag
       }
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from another optional<T> (deep-moves the rhs value)
     void assign ( optional_base&& rhs )
     {
       if (is_initialized())
       {
         if ( rhs.is_initialized() )
-             assign_value( boost::move(rhs.get_impl()) );
+             assign_value( optional_detail::move(rhs.get_impl()) );
         else destroy();
       }
       else
       {
         if ( rhs.is_initialized() )
-          construct(boost::move(rhs.get_impl()));
+          construct(optional_detail::move(rhs.get_impl()));
       }
     }
-#endif
 
     // Assigns from another _convertible_ optional<U> (deep-copies the rhs value)
     template<class U>
@@ -322,7 +304,6 @@ class optional_base : public optional_tag
       }
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // move-assigns from another _convertible_ optional<U> (deep-moves from the rhs value)
     template<class U>
     void assign ( optional<U>&& rhs )
@@ -340,7 +321,6 @@ class optional_base : public optional_tag
           construct(static_cast<ref_type>(rhs.get()));
       }
     }
-#endif
 
     // Assigns from a T (deep-copies the rhs value)
     void assign ( argument_type val )
@@ -350,15 +330,13 @@ class optional_base : public optional_tag
       else construct(val);
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from a T (deep-moves the rhs value)
     void assign ( rval_reference_type val )
     {
       if (is_initialized())
-           assign_value( boost::move(val) );
-      else construct( boost::move(val) );
+           assign_value( optional_detail::move(val) );
+      else construct( optional_detail::move(val) );
     }
-#endif
 
     // Assigns from "none", destroying the current value, if any, leaving this UNINITIALIZED
     // No-throw (assuming T::~T() doesn't)
@@ -366,23 +344,13 @@ class optional_base : public optional_tag
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     template<class Expr, class ExprPtr>
     void assign_expr ( Expr&& expr, ExprPtr const* tag )
     {
       if (is_initialized())
-        assign_expr_to_initialized(boost::forward<Expr>(expr),tag);
-      else construct(boost::forward<Expr>(expr),tag);
-    }
-#else
-    template<class Expr>
-    void assign_expr ( Expr const& expr, Expr const* tag )
-    {
-      if (is_initialized())
-        assign_expr_to_initialized(expr,tag);
-      else construct(expr,tag);
+        assign_expr_to_initialized(optional_detail::forward<Expr>(expr),tag);
+      else construct(optional_detail::forward<Expr>(expr),tag);
     }
-#endif
 
 #endif
 
@@ -411,22 +379,19 @@ class optional_base : public optional_tag
        m_initialized = true ;
      }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     void construct ( rval_reference_type val )
      {
-       ::new (m_storage.address()) unqualified_value_type( boost::move(val) ) ;
+       ::new (m_storage.address()) unqualified_value_type( optional_detail::move(val) ) ;
        m_initialized = true ;
      }
-#endif
 
 
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     // Constructs in-place
     // upon exception *this is always uninitialized
     template<class... Args>
     void construct ( in_place_init_t, Args&&... args )
     {
-      ::new (m_storage.address()) unqualified_value_type( boost::forward<Args>(args)... ) ;
+      ::new (m_storage.address()) unqualified_value_type( optional_detail::forward<Args>(args)... ) ;
       m_initialized = true ;
     }
 
@@ -434,7 +399,7 @@ class optional_base : public optional_tag
     void emplace_assign ( Args&&... args )
     {
       destroy();
-      construct(in_place_init, boost::forward<Args>(args)...);
+      construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
 
     template<class... Args>
@@ -442,7 +407,7 @@ class optional_base : public optional_tag
       :
       m_initialized(false)
     {
-      construct(in_place_init, boost::forward<Args>(args)...);
+      construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
 
     template<class... Args>
@@ -451,156 +416,11 @@ class optional_base : public optional_tag
       m_initialized(false)
     {
       if ( cond )
-        construct(in_place_init, boost::forward<Args>(args)...);
-    }
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void construct ( in_place_init_t, Arg&& arg )
-     {
-       ::new (m_storage.address()) unqualified_value_type( boost::forward<Arg>(arg) );
-       m_initialized = true ;
-     }
-
-    void construct ( in_place_init_t )
-     {
-       ::new (m_storage.address()) unqualified_value_type();
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void emplace_assign ( Arg&& arg )
-     {
-       destroy();
-       construct(in_place_init, boost::forward<Arg>(arg)) ;
-     }
-
-    void emplace_assign ()
-     {
-       destroy();
-       construct(in_place_init) ;
-     }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_t, Arg&& arg )
-      :
-      m_initialized(false)
-    {
-      construct(in_place_init, boost::forward<Arg>(arg));
-    }
-
-    explicit optional_base ( in_place_init_t )
-      :
-      m_initialized(false)
-    {
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_if_t, bool cond, Arg&& arg )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, boost::forward<Arg>(arg));
-    }
-
-    explicit optional_base ( in_place_init_if_t, bool cond )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init);
-    }
-
-#else
-
-    template<class Arg>
-    void construct ( in_place_init_t, const Arg& arg )
-     {
-       ::new (m_storage.address()) unqualified_value_type( arg );
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void construct ( in_place_init_t, Arg& arg )
-     {
-       ::new (m_storage.address()) unqualified_value_type( arg );
-       m_initialized = true ;
-     }
-
-    void construct ( in_place_init_t )
-     {
-       ::new (m_storage.address()) unqualified_value_type();
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void emplace_assign ( const Arg& arg )
-    {
-      destroy();
-      construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    void emplace_assign ( Arg& arg )
-    {
-      destroy();
-      construct(in_place_init, arg);
-    }
-
-    void emplace_assign ()
-    {
-      destroy();
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_t, const Arg& arg )
-      : m_initialized(false)
-    {
-      construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_t, Arg& arg )
-      : m_initialized(false)
-    {
-      construct(in_place_init, arg);
-    }
-
-    explicit optional_base ( in_place_init_t )
-      : m_initialized(false)
-    {
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_if_t, bool cond, const Arg& arg )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_if_t, bool cond, Arg& arg )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, arg);
-    }
-
-    explicit optional_base ( in_place_init_if_t, bool cond )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init);
+        construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
-#endif
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Constructs in-place using the given factory
     template<class Expr>
     void construct ( Expr&& factory, in_place_factory_base const* )
@@ -632,42 +452,8 @@ class optional_base : public optional_tag
        construct(factory,tag);
      }
 
-#else
-    // Constructs in-place using the given factory
-    template<class Expr>
-    void construct ( Expr const& factory, in_place_factory_base const* )
-     {
-       boost_optional_detail::construct<value_type>(factory, m_storage.address());
-       m_initialized = true ;
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void construct ( Expr const& factory, typed_in_place_factory_base const* )
-     {
-       factory.apply(m_storage.address()) ;
-       m_initialized = true ;
-     }
-
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, typed_in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
 #endif
 
-#endif
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Constructs using any expression implicitly convertible to the single argument
     // of a one-argument T constructor.
     // Converting constructions of optional<T> from optional<U> uses this function with
@@ -675,7 +461,7 @@ class optional_base : public optional_tag
     template<class Expr>
     void construct ( Expr&& expr, void const* )
     {
-      new (m_storage.address()) unqualified_value_type(boost::forward<Expr>(expr)) ;
+      new (m_storage.address()) unqualified_value_type(optional_detail::forward<Expr>(expr)) ;
       m_initialized = true ;
     }
 
@@ -686,31 +472,8 @@ class optional_base : public optional_tag
     template<class Expr>
     void assign_expr_to_initialized ( Expr&& expr, void const* )
     {
-      assign_value( boost::forward<Expr>(expr) );
+      assign_value( optional_detail::forward<Expr>(expr) );
     }
-#else
-    // Constructs using any expression implicitly convertible to the single argument
-    // of a one-argument T constructor.
-    // Converting constructions of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting constructor of T from U.
-    template<class Expr>
-    void construct ( Expr const& expr, void const* )
-     {
-       new (m_storage.address()) unqualified_value_type(expr) ;
-       m_initialized = true ;
-     }
-
-    // Assigns using a form any expression implicitly convertible to the single argument
-    // of a T's assignment operator.
-    // Converting assignments of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting assignment of T from U.
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& expr, void const* )
-     {
-       assign_value(expr);
-     }
-
-#endif
 
 #ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
     // BCB5.64 (and probably lower versions) workaround.
@@ -725,7 +488,7 @@ class optional_base : public optional_tag
     // For VC<=70 compilers this workaround doesn't work because the compiler issues and error
     // instead of choosing the wrong overload
     //
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
+
     // Notice that 'Expr' will be optional<T> or optional<U> (but not optional_base<..>)
     template<class Expr>
     void construct ( Expr&& expr, optional_tag const* )
@@ -734,30 +497,14 @@ class optional_base : public optional_tag
        {
          // An exception can be thrown here.
          // It it happens, THIS will be left uninitialized.
-         new (m_storage.address()) unqualified_value_type(boost::move(expr.get())) ;
-         m_initialized = true ;
-       }
-     }
-#else
-    // Notice that 'Expr' will be optional<T> or optional<U> (but not optional_base<..>)
-    template<class Expr>
-    void construct ( Expr const& expr, optional_tag const* )
-     {
-       if ( expr.is_initialized() )
-       {
-         // An exception can be thrown here.
-         // It it happens, THIS will be left uninitialized.
-         new (m_storage.address()) unqualified_value_type(expr.get()) ;
+         new (m_storage.address()) unqualified_value_type(optional_detail::move(expr.get())) ;
          m_initialized = true ;
        }
      }
-#endif
 #endif // defined BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
 
     void assign_value ( argument_type val ) { get_impl() = val; }
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     void assign_value ( rval_reference_type val ) { get_impl() = static_cast<rval_reference_type>(val); }
-#endif
 
     void destroy()
     {
@@ -832,7 +579,6 @@ struct is_optional_constructible : boost::true_type
 #if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
 // for is_assignable
 
-#if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES)
 // On some initial rvalue reference implementations GCC does it in a strange way,
 // preferring perfect-forwarding constructor to implicit copy constructor.
 
@@ -843,15 +589,6 @@ struct is_opt_assignable
 
 #else
 
-template <typename T, typename U>
-struct is_opt_assignable
-  : boost::conjunction<boost::is_convertible<U, T>, boost::is_assignable<T&, U> >
-{};
-
-#endif
-
-#else
-
 template <typename T, typename U>
 struct is_opt_assignable : boost::is_convertible<U, T>
 {};
@@ -918,10 +655,8 @@ class optional
     typedef BOOST_DEDUCED_TYPENAME base::value_type           value_type ;
     typedef BOOST_DEDUCED_TYPENAME base::reference_type       reference_type ;
     typedef BOOST_DEDUCED_TYPENAME base::reference_const_type reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     typedef BOOST_DEDUCED_TYPENAME base::rval_reference_type  rval_reference_type ;
     typedef BOOST_DEDUCED_TYPENAME base::reference_type_of_temporary_wrapper reference_type_of_temporary_wrapper ;
-#endif
     typedef BOOST_DEDUCED_TYPENAME base::pointer_type         pointer_type ;
     typedef BOOST_DEDUCED_TYPENAME base::pointer_const_type   pointer_const_type ;
     typedef BOOST_DEDUCED_TYPENAME base::argument_type        argument_type ;
@@ -938,23 +673,19 @@ class optional
     // Can throw if T::T(T const&) does
     optional ( argument_type val ) : base(optional_detail::init_value_tag(), val) {}
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates an optional<T> initialized with 'move(val)'.
     // Can throw if T::T(T &&) does
-    optional ( rval_reference_type val ) : base(optional_detail::init_value_tag(), boost::forward<T>(val))
+    optional ( rval_reference_type val ) : base(optional_detail::init_value_tag(), optional_detail::forward<T>(val))
       {}
-#endif
 
     // Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional.
     // Can throw if T::T(T const&) does
     optional ( bool cond, argument_type val ) : base(cond,val) {}
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     /// Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional.
     // Can throw if T::T(T &&) does
-    optional ( bool cond, rval_reference_type val ) : base( cond, boost::forward<T>(val) )
+    optional ( bool cond, rval_reference_type val ) : base( cond, optional_detail::forward<T>(val) )
       {}
-#endif
 
     // NOTE: MSVC needs templated versions first
 
@@ -974,7 +705,6 @@ class optional
         this->construct(rhs.get());
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates a deep move of another convertible optional<U>
     // Requires a valid conversion from U to T.
     // Can throw if T::T(U&&) does
@@ -988,9 +718,8 @@ class optional
       base()
     {
       if ( rhs.is_initialized() )
-        this->construct( boost::move(rhs.get()) );
+        this->construct( optional_detail::move(rhs.get()) );
     }
-#endif
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
     // Creates an optional<T> with an expression which can be either
@@ -1002,20 +731,15 @@ class optional
     //       even though explicit overloads are present for these.
     // Depending on the above some T ctor is called.
     // Can throw if the resolved T ctor throws.
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
 
   template<class Expr>
   explicit optional ( Expr&& expr,
                       BOOST_DEDUCED_TYPENAME boost::enable_if< optional_detail::is_optional_val_init_candidate<T, Expr>, bool>::type = true
   )
-    : base(boost::forward<Expr>(expr),boost::addressof(expr))
+    : base(optional_detail::forward<Expr>(expr),boost::addressof(expr))
     {}
 
-#else
-    template<class Expr>
-    explicit optional ( Expr const& expr ) : base(expr,boost::addressof(expr)) {}
-#endif // !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 #endif // !defined BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
     // Creates a deep copy of another optional<T>
@@ -1026,20 +750,17 @@ class optional
     optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {}
 #endif
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates a deep move of another optional<T>
     // Can throw if T::T(T&&) does
-
 #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
     optional ( optional && ) = default;
 #else
     optional ( optional && rhs )
       BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value)
-      : base( boost::move(rhs) )
+      : base( optional_detail::move(rhs) )
     {}
 #endif
 
-#endif
 
 #if BOOST_WORKAROUND(_MSC_VER, <= 1600)
     //  On old MSVC compilers the implicitly declared dtor is not called
@@ -1050,24 +771,15 @@ class optional
 #if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
     // Assigns from an expression. See corresponding constructor.
     // Basic Guarantee: If the resolved T ctor throws, this is left UNINITIALIZED
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
     template<class Expr>
     BOOST_DEDUCED_TYPENAME boost::enable_if<optional_detail::is_optional_val_assign_candidate<T, Expr>, optional&>::type
     operator= ( Expr&& expr )
       {
-        this->assign_expr(boost::forward<Expr>(expr),boost::addressof(expr));
+        this->assign_expr(optional_detail::forward<Expr>(expr),boost::addressof(expr));
         return *this ;
       }
 
-#else
-    template<class Expr>
-    optional& operator= ( Expr const& expr )
-      {
-        this->assign_expr(expr,boost::addressof(expr));
-        return *this ;
-      }
-#endif // !defined  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 #endif // !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
 
     // Copy-assigns from another convertible optional<U> (converts && deep-copies the rhs value)
@@ -1080,17 +792,15 @@ class optional
         return *this ;
       }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Move-assigns from another convertible optional<U> (converts && deep-moves the rhs value)
     // Requires a valid conversion from U to T.
     // Basic Guarantee: If T::T( U && ) throws, this is left UNINITIALIZED
     template<class U>
     optional& operator= ( optional<U> && rhs )
       {
-        this->assign(boost::move(rhs));
+        this->assign(optional_detail::move(rhs));
         return *this ;
       }
-#endif
 
     // Assigns from another optional<T> (deep-copies the rhs value)
     // Basic Guarantee: If T::T( T const& ) throws, this is left UNINITIALIZED
@@ -1105,7 +815,6 @@ class optional
       }
 #endif
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from another optional<T> (deep-moves the rhs value)
 #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
     optional& operator= ( optional && ) = default;
@@ -1118,8 +827,6 @@ class optional
       }
 #endif
 
-#endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-
 #ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
 
     // Assigns from a T (deep-moves/copies the rhs value)
@@ -1127,7 +834,7 @@ class optional
     BOOST_DEDUCED_TYPENAME boost::enable_if<boost::is_same<T, BOOST_DEDUCED_TYPENAME boost::decay<T_>::type>, optional&>::type
     operator= ( T_&& val )
       {
-        this->assign( boost::forward<T_>(val) ) ;
+        this->assign( optional_detail::forward<T_>(val) ) ;
         return *this ;
       }
 
@@ -1141,14 +848,12 @@ class optional
         return *this ;
       }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from a T (deep-moves the rhs value)
     optional& operator= ( rval_reference_type val )
       {
-        this->assign( boost::move(val) ) ;
+        this->assign( optional_detail::move(val) ) ;
         return *this ;
       }
-#endif
 
 #endif // BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
 
@@ -1161,101 +866,24 @@ class optional
         return *this ;
       }
 
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     // Constructs in-place
     // upon exception *this is always uninitialized
     template<class... Args>
     void emplace ( Args&&... args )
     {
-      this->emplace_assign( boost::forward<Args>(args)... );
+      this->emplace_assign( optional_detail::forward<Args>(args)... );
     }
 
     template<class... Args>
     explicit optional ( in_place_init_t, Args&&... args )
-    : base( in_place_init, boost::forward<Args>(args)... )
+    : base( in_place_init, optional_detail::forward<Args>(args)... )
     {}
 
     template<class... Args>
     explicit optional ( in_place_init_if_t, bool cond, Args&&... args )
-    : base( in_place_init_if, cond, boost::forward<Args>(args)... )
-    {}
-
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void emplace ( Arg&& arg )
-     {
-       this->emplace_assign( boost::forward<Arg>(arg) );
-     }
-
-    void emplace ()
-     {
-       this->emplace_assign();
-     }
-
-    template<class Args>
-    explicit optional ( in_place_init_t, Args&& args )
-    : base( in_place_init, boost::forward<Args>(args) )
+    : base( in_place_init_if, cond, optional_detail::forward<Args>(args)... )
     {}
 
-    explicit optional ( in_place_init_t )
-    : base( in_place_init )
-    {}
-
-    template<class Args>
-    explicit optional ( in_place_init_if_t, bool cond, Args&& args )
-    : base( in_place_init_if, cond, boost::forward<Args>(args) )
-    {}
-
-    explicit optional ( in_place_init_if_t, bool cond )
-    : base( in_place_init_if, cond )
-    {}
-#else
-    template<class Arg>
-    void emplace ( const Arg& arg )
-     {
-       this->emplace_assign( arg );
-     }
-
-    template<class Arg>
-    void emplace ( Arg& arg )
-     {
-       this->emplace_assign( arg );
-     }
-
-    void emplace ()
-     {
-       this->emplace_assign();
-     }
-
-    template<class Arg>
-    explicit optional ( in_place_init_t, const Arg& arg )
-    : base( in_place_init, arg )
-    {}
-
-    template<class Arg>
-    explicit optional ( in_place_init_t, Arg& arg )
-    : base( in_place_init, arg )
-    {}
-
-    explicit optional ( in_place_init_t )
-    : base( in_place_init )
-    {}
-
-    template<class Arg>
-    explicit optional ( in_place_init_if_t, bool cond, const Arg& arg )
-    : base( in_place_init_if, cond, arg )
-    {}
-
-    template<class Arg>
-    explicit optional ( in_place_init_if_t, bool cond, Arg& arg )
-    : base( in_place_init_if, cond, arg )
-    {}
-
-    explicit optional ( in_place_init_if_t, bool cond )
-    : base( in_place_init_if, cond )
-    {}
-#endif
-
     void swap( optional & arg )
       BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
       {
@@ -1283,42 +911,14 @@ class optional
     // Returns a reference to the value if this is initialized, otherwise,
     // the behaviour is UNDEFINED
     // No-throw
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    reference_const_type operator *() const& { return this->get() ; }
-    reference_type       operator *() &      { return this->get() ; }
-    reference_type_of_temporary_wrapper operator *() && { return boost::move(this->get()) ; }
-#else
-    reference_const_type operator *() const { return this->get() ; }
-    reference_type       operator *()       { return this->get() ; }
-#endif // !defined BOOST_NO_CXX11_REF_QUALIFIERS
+    reference_const_type operator *() BOOST_OPTIONAL_CONST_REF_QUAL { return this->get() ; }
+    reference_type       operator *() BOOST_OPTIONAL_REF_QUAL       { return this->get() ; }
 
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    reference_const_type value() const&
-      {
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-
-    reference_type value() &
-      {
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-
-    reference_type_of_temporary_wrapper value() &&
-      {
-        if (this->is_initialized())
-          return boost::move(this->get()) ;
-        else
-          throw_exception(bad_optional_access());
-      }
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
+    reference_type_of_temporary_wrapper operator *() && { return optional_detail::move(this->get()) ; }
+#endif
 
-#else
-    reference_const_type value() const
+    reference_const_type value() BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->is_initialized())
           return this->get() ;
@@ -1326,112 +926,64 @@ class optional
           throw_exception(bad_optional_access());
       }
 
-    reference_type value()
+    reference_type value() BOOST_OPTIONAL_REF_QUAL
       {
         if (this->is_initialized())
           return this->get() ;
         else
           throw_exception(bad_optional_access());
       }
-#endif
-
 
-#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     template <class U>
-    value_type value_or ( U&& v ) const&
+    value_type value_or ( U&& v ) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->is_initialized())
           return get();
         else
-          return boost::forward<U>(v);
+          return optional_detail::forward<U>(v);
       }
 
-    template <class U>
-    value_type value_or ( U&& v ) &&
-      {
-        if (this->is_initialized())
-          return boost::move(get());
-        else
-          return boost::forward<U>(v);
-      }
-#elif !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    template <class U>
-    value_type value_or ( U&& v ) const
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return boost::forward<U>(v);
-      }
-#else
-    template <class U>
-    value_type value_or ( U const& v ) const
+    template <typename F>
+    value_type value_or_eval ( F f ) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->is_initialized())
           return get();
         else
-          return v;
+          return f();
       }
 
-    template <class U>
-    value_type value_or ( U& v ) const
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
+    reference_type_of_temporary_wrapper value() &&
       {
         if (this->is_initialized())
-          return get();
+          return optional_detail::move(this->get()) ;
         else
-          return v;
+          throw_exception(bad_optional_access());
       }
-#endif
-
 
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template <typename F>
-    value_type value_or_eval ( F f ) const&
+    template <class U>
+    value_type value_or ( U&& v ) &&
       {
         if (this->is_initialized())
-          return get();
+          return optional_detail::move(get());
         else
-          return f();
+          return optional_detail::forward<U>(v);
       }
 
     template <typename F>
     value_type value_or_eval ( F f ) &&
       {
         if (this->is_initialized())
-          return boost::move(get());
+          return optional_detail::move(get());
         else
           return f();
       }
+#endif
 
-    template <typename F>
-    optional<typename boost::result_of<F(reference_type)>::type> map(F f) &
-      {
-        if (this->has_value())
-          return f(get());
-        else
-          return none;
-      }
-
-    template <typename F>
-    optional<typename boost::result_of<F(reference_const_type)>::type> map(F f) const&
-      {
-        if (this->has_value())
-          return f(get());
-        else
-          return none;
-      }
-
-    template <typename F>
-    optional<typename boost::result_of<F(reference_type_of_temporary_wrapper)>::type> map(F f) &&
-      {
-        if (this->has_value())
-          return f(boost::move(this->get()));
-        else
-          return none;
-      }
+// Monadic interface
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type)>::type>::type> flat_map(F f) &
+    optional<typename optional_detail::result_of<F, reference_type>::type> map(F f) BOOST_OPTIONAL_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1440,7 +992,7 @@ class optional
       }
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_const_type)>::type>::type> flat_map(F f) const&
+    optional<typename optional_detail::result_of<F, reference_const_type>::type> map(F f) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1448,36 +1000,20 @@ class optional
           return none;
       }
 
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type_of_temporary_wrapper)>::type>::type> flat_map(F f) &&
-      {
-        if (this->has_value())
-          return f(boost::move(get()));
-        else
-          return none;
-      }
-
-#else
-    template <typename F>
-    value_type value_or_eval ( F f ) const
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return f();
-      }
-
-    template <typename F>
-    optional<typename boost::result_of<F(reference_type)>::type> map(F f)
+    optional<typename optional_detail::result_of<F, reference_type_of_temporary_wrapper>::type> map(F f) &&
       {
         if (this->has_value())
-          return f(get());
+          return f(optional_detail::move(this->get()));
         else
           return none;
       }
+#endif
 
     template <typename F>
-    optional<typename boost::result_of<F(reference_const_type)>::type> map(F f) const
+    optional<typename optional_detail::result_value_type<F, reference_type>::type>
+    flat_map(F f) BOOST_OPTIONAL_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1486,7 +1022,8 @@ class optional
       }
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type)>::type>::type> flat_map(F f)
+    optional<typename optional_detail::result_value_type<F, reference_const_type>::type>
+    flat_map(F f) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1494,37 +1031,29 @@ class optional
           return none;
       }
 
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_const_type)>::type>::type> flat_map(F f) const
+    optional<typename optional_detail::result_value_type<F, reference_type_of_temporary_wrapper>::type>
+    flat_map(F f) &&
       {
         if (this->has_value())
-          return f(get());
+          return f(optional_detail::move(get()));
         else
           return none;
       }
-
 #endif
 
     bool has_value() const BOOST_NOEXCEPT { return this->is_initialized() ; }
 
-    bool operator!() const BOOST_NOEXCEPT { return !this->is_initialized() ; }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL_NOEXCEPT()
+    explicit operator bool() const BOOST_NOEXCEPT { return this->has_value() ; }
 } ;
 
-} // namespace boost
-
-#endif // BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
 
-namespace boost {
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 template<class T>
 class optional<T&&>
 {
-  BOOST_STATIC_ASSERT_MSG(sizeof(T) == 0, "Optional rvalue references are illegal.");
+  static_assert(sizeof(T) == 0, "Optional rvalue references are illegal.");
 } ;
-#endif
 
 } // namespace boost
 
@@ -1534,13 +1063,12 @@ class optional<T&&>
 
 namespace boost {
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
 template<class T>
 inline
 optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type> make_optional ( T && v  )
 {
-  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(boost::forward<T>(v));
+  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(optional_detail::forward<T>(v));
 }
 
 // Returns optional<T>(cond,v)
@@ -1548,28 +1076,9 @@ template<class T>
 inline
 optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type> make_optional ( bool cond, T && v )
 {
-  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(cond,boost::forward<T>(v));
-}
-
-#else
-
-// Returns optional<T>(v)
-template<class T>
-inline
-optional<T> make_optional ( T const& v  )
-{
-  return optional<T>(v);
-}
-
-// Returns optional<T>(cond,v)
-template<class T>
-inline
-optional<T> make_optional ( bool cond, T const& v )
-{
-  return optional<T>(cond,v);
+  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(cond,optional_detail::forward<T>(v));
 }
 
-#endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
 // Returns a reference to the value if this is initialized, otherwise, the behaviour is UNDEFINED.
 // No-throw
@@ -1653,7 +1162,7 @@ template<class CharType, class CharTrait>
 std::basic_ostream<CharType, CharTrait>&
 operator<<(std::basic_ostream<CharType, CharTrait>& os, optional_detail::optional_tag const&)
 {
-  BOOST_STATIC_ASSERT_MSG(sizeof(CharType) == 0, "If you want to output boost::optional, include header <boost/optional/optional_io.hpp>");
+  static_assert(sizeof(CharType) == 0, "If you want to output boost::optional, include header <boost/optional/optional_io.hpp>");
   return os;
 }
 
diff --git a/inst/include/boost/optional/optional_io.hpp b/inst/include/boost/optional/optional_io.hpp
index 3db6ddae7..85acfa17c 100644
--- a/inst/include/boost/optional/optional_io.hpp
+++ b/inst/include/boost/optional/optional_io.hpp
@@ -63,11 +63,7 @@ operator>>(std::basic_istream<CharType, CharTrait>& in, optional<T>& v)
     {
       T x;
       in >> x;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-      v = boost::move(x);
-#else
-      v = x;
-#endif
+      v = optional_detail::move(x);
     }
     else
     {
diff --git a/inst/include/boost/pending/detail/disjoint_sets.hpp b/inst/include/boost/pending/detail/disjoint_sets.hpp
index 1ec0e4950..9a91b294b 100644
--- a/inst/include/boost/pending/detail/disjoint_sets.hpp
+++ b/inst/include/boost/pending/detail/disjoint_sets.hpp
@@ -6,6 +6,8 @@
 #ifndef BOOST_DETAIL_DISJOINT_SETS_HPP
 #define BOOST_DETAIL_DISJOINT_SETS_HPP
 
+#include <cassert>
+
 namespace boost
 {
 
@@ -50,13 +52,11 @@ namespace detail
     /* the postcondition of link sets is:
      component_representative(i) == component_representative(j)
      */
-    template < class ParentPA, class RankPA, class Vertex,
-        class ComponentRepresentative >
-    inline void link_sets(ParentPA p, RankPA rank, Vertex i, Vertex j,
-        ComponentRepresentative comp_rep)
+    template < class ParentPA, class RankPA, class Vertex>
+    inline void link_sets(ParentPA p, RankPA rank, Vertex i, Vertex j)
     {
-        i = comp_rep(p, i);
-        j = comp_rep(p, j);
+        assert(i == get(p, i));
+        assert(j == get(p, j));
         if (i == j)
             return;
         if (get(rank, i) > get(rank, j))
diff --git a/inst/include/boost/pending/disjoint_sets.hpp b/inst/include/boost/pending/disjoint_sets.hpp
index 85a7c4ce8..28bf3c3c3 100644
--- a/inst/include/boost/pending/disjoint_sets.hpp
+++ b/inst/include/boost/pending/disjoint_sets.hpp
@@ -72,7 +72,7 @@ class disjoint_sets
     // Link - union the two sets represented by vertex x and y
     template < class Element > inline void link(Element x, Element y)
     {
-        detail::link_sets(parent, rank, x, y, rep);
+        detail::link_sets(parent, rank, x, y);
     }
 
     // Union-Set - union the two sets containing vertex x and y
@@ -146,7 +146,7 @@ class disjoint_sets_with_storage
     template < class Element > inline void link(Element x, Element y)
     {
         extend_sets(x, y);
-        detail::link_sets(&parent[0], &rank[0], get(id, x), get(id, y), rep);
+        detail::link_sets(&parent[0], &rank[0], get(id, x), get(id, y));
     }
     template < class Element > inline void union_set(Element x, Element y)
     {
diff --git a/inst/include/boost/pending/property.hpp b/inst/include/boost/pending/property.hpp
index 8e98e84ea..6b4ee07f6 100644
--- a/inst/include/boost/pending/property.hpp
+++ b/inst/include/boost/pending/property.hpp
@@ -6,6 +6,7 @@
 #ifndef BOOST_PROPERTY_HPP
 #define BOOST_PROPERTY_HPP
 
+#include <boost/config.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/has_xxx.hpp>
@@ -30,7 +31,7 @@ template < class Tag, class T, class Base = no_property > struct property
     // copy constructor and assignment operator will be generated by compiler
 
     T m_value;
-    Base m_base;
+    BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS Base m_base;
 };
 
 // Kinds of properties
diff --git a/inst/include/boost/pointer_cast.hpp b/inst/include/boost/pointer_cast.hpp
index d47327bc7..a19fcb6c7 100644
--- a/inst/include/boost/pointer_cast.hpp
+++ b/inst/include/boost/pointer_cast.hpp
@@ -10,49 +10,39 @@
 #ifndef BOOST_POINTER_CAST_HPP
 #define BOOST_POINTER_CAST_HPP
 
-#include <boost/config.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <memory>
+#include <type_traits>
 
 namespace boost { 
 
 //static_pointer_cast overload for raw pointers
 template<class T, class U>
-inline T* static_pointer_cast(U *ptr) BOOST_SP_NOEXCEPT
+inline T* static_pointer_cast(U *ptr) noexcept
 {  
    return static_cast<T*>(ptr);
 }
 
 //dynamic_pointer_cast overload for raw pointers
 template<class T, class U>
-inline T* dynamic_pointer_cast(U *ptr) BOOST_SP_NOEXCEPT
+inline T* dynamic_pointer_cast(U *ptr) noexcept
 {  
    return dynamic_cast<T*>(ptr);
 }
 
 //const_pointer_cast overload for raw pointers
 template<class T, class U>
-inline T* const_pointer_cast(U *ptr) BOOST_SP_NOEXCEPT
+inline T* const_pointer_cast(U *ptr) noexcept
 {  
    return const_cast<T*>(ptr);
 }
 
 //reinterpret_pointer_cast overload for raw pointers
 template<class T, class U>
-inline T* reinterpret_pointer_cast(U *ptr) BOOST_SP_NOEXCEPT
+inline T* reinterpret_pointer_cast(U *ptr) noexcept
 {  
    return reinterpret_cast<T*>(ptr);
 }
 
-} // namespace boost
-
-#if !defined( BOOST_NO_CXX11_SMART_PTR )
-
-#include <boost/type_traits/has_virtual_destructor.hpp>
-#include <boost/static_assert.hpp>
-#include <memory>
-
-namespace boost {
-
 //static_pointer_cast overload for std::shared_ptr
 using std::static_pointer_cast;
 
@@ -63,7 +53,7 @@ using std::dynamic_pointer_cast;
 using std::const_pointer_cast;
 
 //reinterpret_pointer_cast overload for std::shared_ptr
-template<class T, class U> std::shared_ptr<T> reinterpret_pointer_cast(const std::shared_ptr<U> & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> std::shared_ptr<T> reinterpret_pointer_cast(const std::shared_ptr<U> & r ) noexcept
 {
     (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -74,7 +64,7 @@ template<class T, class U> std::shared_ptr<T> reinterpret_pointer_cast(const std
 }
 
 //static_pointer_cast overload for std::unique_ptr
-template<class T, class U> std::unique_ptr<T> static_pointer_cast( std::unique_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> std::unique_ptr<T> static_pointer_cast( std::unique_ptr<U> && r ) noexcept
 {
     (void) static_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -84,11 +74,11 @@ template<class T, class U> std::unique_ptr<T> static_pointer_cast( std::unique_p
 }
 
 //dynamic_pointer_cast overload for std::unique_ptr
-template<class T, class U> std::unique_ptr<T> dynamic_pointer_cast( std::unique_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> std::unique_ptr<T> dynamic_pointer_cast( std::unique_ptr<U> && r ) noexcept
 {
     (void) dynamic_cast< T* >( static_cast< U* >( 0 ) );
 
-    BOOST_STATIC_ASSERT_MSG( boost::has_virtual_destructor<T>::value, "The target of dynamic_pointer_cast must have a virtual destructor." );
+    static_assert( std::has_virtual_destructor<T>::value, "The target of dynamic_pointer_cast must have a virtual destructor." );
 
     T * p = dynamic_cast<T*>( r.get() );
     if( p ) r.release();
@@ -96,7 +86,7 @@ template<class T, class U> std::unique_ptr<T> dynamic_pointer_cast( std::unique_
 }
 
 //const_pointer_cast overload for std::unique_ptr
-template<class T, class U> std::unique_ptr<T> const_pointer_cast( std::unique_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> std::unique_ptr<T> const_pointer_cast( std::unique_ptr<U> && r ) noexcept
 {
     (void) const_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -106,7 +96,7 @@ template<class T, class U> std::unique_ptr<T> const_pointer_cast( std::unique_pt
 }
 
 //reinterpret_pointer_cast overload for std::unique_ptr
-template<class T, class U> std::unique_ptr<T> reinterpret_pointer_cast( std::unique_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> std::unique_ptr<T> reinterpret_pointer_cast( std::unique_ptr<U> && r ) noexcept
 {
     (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -117,6 +107,4 @@ template<class T, class U> std::unique_ptr<T> reinterpret_pointer_cast( std::uni
 
 } // namespace boost
 
-#endif // #if !defined( BOOST_NO_CXX11_SMART_PTR )
-
 #endif   //BOOST_POINTER_CAST_HPP
diff --git a/inst/include/boost/pool/pool.hpp b/inst/include/boost/pool/pool.hpp
index 12728a7ae..f6d9e6c82 100644
--- a/inst/include/boost/pool/pool.hpp
+++ b/inst/include/boost/pool/pool.hpp
@@ -360,7 +360,7 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t
     size_type max_chunks() const
     { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
       size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
-      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+      return ((std::numeric_limits<size_type>::max)() - POD_size) / alloc_size();
     }
 
     static void * & nextof(void * const ptr)
diff --git a/inst/include/boost/predef/version.h b/inst/include/boost/predef/version.h
index 4428eb56e..ba8f62cec 100644
--- a/inst/include/boost/predef/version.h
+++ b/inst/include/boost/predef/version.h
@@ -10,6 +10,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/predef/version_number.h>
 
-#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,15,0)
+#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,15,1)
 
 #endif
diff --git a/inst/include/boost/preprocessor/variadic/has_opt.hpp b/inst/include/boost/preprocessor/variadic/has_opt.hpp
index 7054e9455..bb40e3787 100644
--- a/inst/include/boost/preprocessor/variadic/has_opt.hpp
+++ b/inst/include/boost/preprocessor/variadic/has_opt.hpp
@@ -19,6 +19,8 @@
 # if defined(__cplusplus) && __cplusplus > 201703L
 #  if defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 8 && __GNUC__ < 10
 #   define BOOST_PP_VARIADIC_HAS_OPT() 0
+#  elif defined(__clang__) && __clang_major__ < 9
+#   define BOOST_PP_VARIADIC_HAS_OPT() 0
 #  else
 #   include <boost/preprocessor/variadic/detail/has_opt.hpp>
 #   define BOOST_PP_VARIADIC_HAS_OPT() \
diff --git a/inst/include/boost/process.hpp b/inst/include/boost/process.hpp
index 1bf59516f..5702e5b52 100644
--- a/inst/include/boost/process.hpp
+++ b/inst/include/boost/process.hpp
@@ -19,24 +19,16 @@
  * boost.process header files.
  */
 
-#include <boost/process/args.hpp>
-#include <boost/process/async.hpp>
-#include <boost/process/async_system.hpp>
-#include <boost/process/group.hpp>
-#include <boost/process/child.hpp>
-#include <boost/process/cmd.hpp>
-#include <boost/process/env.hpp>
-#include <boost/process/environment.hpp>
-#include <boost/process/error.hpp>
-#include <boost/process/exe.hpp>
-#include <boost/process/group.hpp>
-#include <boost/process/handles.hpp>
-#include <boost/process/io.hpp>
-#include <boost/process/pipe.hpp>
-#include <boost/process/shell.hpp>
-#include <boost/process/search_path.hpp>
-#include <boost/process/spawn.hpp>
-#include <boost/process/system.hpp>
-#include <boost/process/start_dir.hpp>
+#if !defined(BOOST_PROCESS_VERSION)
+#define BOOST_PROCESS_VERSION 1
+#endif
+
+#if BOOST_PROCESS_VERSION == 1
+#include <boost/process/v1.hpp>
+#elif BOOST_PROCESS_VERSION == 2
+#include <boost/process/v2.hpp>
+#else
+#error "Unknown boost process version"
+#endif
 
 #endif
diff --git a/inst/include/boost/process/args.hpp b/inst/include/boost/process/args.hpp
index 8b6b3354f..09584fbb0 100644
--- a/inst/include/boost/process/args.hpp
+++ b/inst/include/boost/process/args.hpp
@@ -1,279 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_ARGS_HPP
-#define BOOST_PROCESS_ARGS_HPP
 
-/** \file boost/process/args.hpp
- *
- *    This header provides the \xmlonly <globalname alt="boost::process::args">args</globalname>\endxmlonly property. It also provides the
- *    alternative name \xmlonly <globalname alt="boost::process::argv">argv</globalname>\endxmlonly .
- *
- *
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::args">args</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::argv">argv</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
- */
-
-
-#include <boost/process/detail/basic_cmd.hpp>
-#include <iterator>
-
-namespace boost { namespace process { namespace detail {
-
-struct args_
-{
-    template<typename T>
-    using remove_reference_t = typename std::remove_reference<T>::type;
-    template<typename T>
-    using value_type = typename remove_reference_t<T>::value_type;
-
-    template<typename T>
-    using vvalue_type = value_type<value_type<T>>;
-
-    template <class Range>
-    arg_setter_<vvalue_type<Range>, true>     operator()(Range &&range) const
-    {
-        return arg_setter_<vvalue_type<Range>, true>(std::forward<Range>(range));
-    }
-    template <class Range>
-    arg_setter_<vvalue_type<Range>, true>     operator+=(Range &&range) const
-    {
-        return arg_setter_<vvalue_type<Range>, true>(std::forward<Range>(range));
-    }
-    template <class Range>
-    arg_setter_<vvalue_type<Range>, false>    operator= (Range &&range) const
-    {
-        return arg_setter_<vvalue_type<Range>, false>(std::forward<Range>(range));
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator()(std::basic_string<Char> && str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator+=(std::basic_string<Char> && str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, false>    operator= (std::basic_string<Char> && str) const
-    {
-        return arg_setter_<Char, false>(str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator()(const std::basic_string<Char> & str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator+=(const std::basic_string<Char> & str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, false>    operator= (const std::basic_string<Char> & str) const
-    {
-        return arg_setter_<Char, false>(str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator()(std::basic_string<Char> & str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator+=(std::basic_string<Char> & str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, false>    operator= (std::basic_string<Char> & str) const
-    {
-        return arg_setter_<Char, false>(str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator()(const Char* str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, true>     operator+=(const Char* str) const
-    {
-        return arg_setter_<Char, true> (str);
-    }
-    template<typename Char>
-    arg_setter_<Char, false>    operator= (const Char* str) const
-    {
-        return arg_setter_<Char, false>(str);
-    }
-//    template<typename Char, std::size_t Size>
-//    arg_setter_<Char, true>     operator()(const Char (&str) [Size]) const
-//    {
-//        return arg_setter_<Char, true> (str);
-//    }
-//    template<typename Char, std::size_t Size>
-//    arg_setter_<Char, true>     operator+=(const Char (&str) [Size]) const
-//    {
-//        return arg_setter_<Char, true> (str);
-//    }
-//    template<typename Char, std::size_t Size>
-//    arg_setter_<Char, false>    operator= (const Char (&str) [Size]) const
-//    {
-//        return arg_setter_<Char, false>(str);
-//    }
-
-    arg_setter_<char, true> operator()(std::initializer_list<const char*> &&range) const
-    {
-        return arg_setter_<char, true>(range.begin(), range.end());
-    }
-    arg_setter_<char, true> operator+=(std::initializer_list<const char*> &&range) const
-    {
-        return arg_setter_<char, true>(range.begin(), range.end());
-    }
-    arg_setter_<char, false> operator= (std::initializer_list<const char*> &&range) const
-    {
-        return arg_setter_<char, false>(range.begin(), range.end());
-    }
-    arg_setter_<char, true> operator()(std::initializer_list<std::string> &&range) const
-    {
-        return arg_setter_<char, true>(range.begin(), range.end());
-    }
-    arg_setter_<char, true> operator+=(std::initializer_list<std::string> &&range) const
-    {
-        return arg_setter_<char, true>(range.begin(), range.end());
-    }
-    arg_setter_<char, false> operator= (std::initializer_list<std::string> &&range) const
-    {
-        return arg_setter_<char, false>(range.begin(), range.end());
-    }
-
-    arg_setter_<wchar_t, true> operator()(std::initializer_list<const wchar_t*> &&range) const
-    {
-        return arg_setter_<wchar_t, true>(range.begin(), range.end());
-    }
-    arg_setter_<wchar_t, true> operator+=(std::initializer_list<const wchar_t*> &&range) const
-    {
-        return arg_setter_<wchar_t, true>(range.begin(), range.end());
-    }
-    arg_setter_<wchar_t, false> operator= (std::initializer_list<const wchar_t*> &&range) const
-    {
-        return arg_setter_<wchar_t, false>(range.begin(), range.end());
-    }
-    arg_setter_<wchar_t, true> operator()(std::initializer_list<std::wstring> &&range) const
-    {
-        return arg_setter_<wchar_t, true>(range.begin(), range.end());
-    }
-    arg_setter_<wchar_t, true> operator+=(std::initializer_list<std::wstring> &&range) const
-    {
-        return arg_setter_<wchar_t, true>(range.begin(), range.end());
-    }
-    arg_setter_<wchar_t, false> operator= (std::initializer_list<std::wstring> &&range) const
-    {
-        return arg_setter_<wchar_t, false>(range.begin(), range.end());
-    }
-};
-
-
-}
-/**
-
-The `args` property allows to explicitly set arguments for the execution. The
-name of the executable will always be the first element in the arg-vector.
-
-\section args_details Details
-
-\subsection args_operations Operations
-
-\subsubsection args_set_var Setting values
-
-To set a the argument vector the following syntax can be used.
-
-\code{.cpp}
-args = value;
-args(value);
-\endcode
-
-`std::initializer_list` is among the allowed types, so the following syntax is also possible.
-
-\code{.cpp}
-args = {value1, value2};
-args({value1, value2});
-\endcode
-
-Below the possible types for `value` are listed, with `char_type` being either `char` or `wchar_t`.
-
-\paragraph args_set_var_value value
-
- - `std::basic_string<char_type>`
- - `const char_type * `
- - `std::initializer_list<const char_type *>`
- - `std::vector<std::basic_string<char_type>>`
-
-Additionally any range of `std::basic_string<char_type>` can be passed.
-
-\subsubsection args_append_var Appending values
-
-To append a the argument vector the following syntax can be used.
-
-\code{.cpp}
-args += value;
-\endcode
-
-`std::initializer_list` is among the allowed types, so the following syntax is also possible.
-
-\code{.cpp}
-args += {value1, value2};
-\endcode
-
-Below the possible types for `value` are listed, with `char_type` being either `char` or `wchar_t`.
-
-\paragraph args_append_var_value value
-
- - `std::basic_string<char_type>`
- - `const char_type * `
- - `std::initializer_list<const char_type *>`
- - `std::vector<std::basic_string<char_type>>`
-
-Additionally any range of `std::basic_string<char_type>` can be passed.
-
-
-\subsection args_example Example
-
-The overload form is used when more than one string is passed, from the second one forward.
-I.e. the following expressions have the same results:
-
-\code{.cpp}
-spawn("gcc", "--version");
-spawn("gcc", args ="--version");
-spawn("gcc", args+="--version");
-spawn("gcc", args ={"--version"});
-spawn("gcc", args+={"--version"});
-\endcode
-
-\note A string will be parsed and set in quotes if it has none and contains spaces.
-
-
- */
-constexpr boost::process::detail::args_ args{};
-
-///Alias for \xmlonly <globalname alt="boost::process::args">args</globalname> \endxmlonly .
-constexpr boost::process::detail::args_ argv{};
-
-
-}}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/args.hpp>")
+#include <boost/process/v1/args.hpp>
diff --git a/inst/include/boost/process/async.hpp b/inst/include/boost/process/async.hpp
index e0d002225..65137600a 100644
--- a/inst/include/boost/process/async.hpp
+++ b/inst/include/boost/process/async.hpp
@@ -1,132 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/** \file boost/process/async.hpp
 
-The header which provides the basic asynchronous features.
-It provides the on_exit property, which allows callbacks when the process exits.
-It also implements the necessary traits for passing an boost::asio::io_context,
-which is needed for asynchronous communication.
-
-It also pulls the [boost::asio::buffer](http://www.boost.org/doc/libs/release/doc/html/boost_asio/reference/buffer.html)
-into the boost::process namespace for convenience.
-
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <ulink url="http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/buffer.html">buffer</ulink>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::on_exit">on_exit</globalname>;
-  }
-}
-</programlisting>
-
-\endxmlonly
-  */
-
-#ifndef BOOST_PROCESS_ASYNC_HPP_
-#define BOOST_PROCESS_ASYNC_HPP_
-
-#include <boost/process/detail/traits.hpp>
-#include <boost/process/detail/on_exit.hpp>
-
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/streambuf.hpp>
-#include <boost/asio/buffer.hpp>
-#include <type_traits>
-#include <boost/fusion/iterator/deref.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/io_context_ref.hpp>
-#include <boost/process/detail/posix/async_in.hpp>
-#include <boost/process/detail/posix/async_out.hpp>
-#include <boost/process/detail/posix/on_exit.hpp>
-
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/io_context_ref.hpp>
-#include <boost/process/detail/windows/async_in.hpp>
-#include <boost/process/detail/windows/async_out.hpp>
-#include <boost/process/detail/windows/on_exit.hpp>
-#endif
-
-namespace boost { namespace process { namespace detail {
-
-struct async_tag;
-
-template<typename T>
-struct is_io_context : std::false_type {};
-template<>
-struct is_io_context<api::io_context_ref> : std::true_type {};
-
-template<typename Tuple>
-inline asio::io_context& get_io_context(const Tuple & tup)
-{
-    auto& ref = *boost::fusion::find_if<is_io_context<boost::mpl::_>>(tup);
-    return ref.get();
-}
-
-struct async_builder
-{
-    boost::asio::io_context * ios;
-
-    void operator()(boost::asio::io_context & ios_) {this->ios = &ios_;};
-
-    typedef api::io_context_ref result_type;
-    api::io_context_ref get_initializer() {return api::io_context_ref (*ios);};
-};
-
-
-template<>
-struct initializer_builder<async_tag>
-{
-    typedef async_builder type;
-};
-
-}
-
-using ::boost::asio::buffer;
-
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/** When an io_context is passed, the on_exit property can be used, to be notified
-    when the child process exits.
-
-
-The following syntax is valid
-
-\code{.cpp}
-on_exit=function;
-on_exit(function);
-\endcode
-
-with `function` being a callable object with the signature `(int, const std::error_code&)` or an
-`std::future<int>`.
-
-\par Example
-
-\code{.cpp}
-io_context ios;
-
-child c("ls", ios, on_exit=[](int exit, const std::error_code& ec_in){});
-
-std::future<int> exit_code;
-chlid c2("ls", ios, on_exit=exit_code);
-
-\endcode
-
-\note The handler is not invoked when the launch fails.
-\warning When used \ref ignore_error it might get invoked on error.
-\warning `on_exit` uses `boost::asio::signal_set` to listen for `SIGCHLD` on posix, and so has the
-same restrictions as that class (do not register a handler for `SIGCHLD` except by using
-`boost::asio::signal_set`).
- */
-constexpr static ::boost::process::detail::on_exit_ on_exit{};
-#endif
-
-}}
-
-
-
-#endif /* INCLUDE_BOOST_PROCESS_DETAIL_ASYNC_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/async.hpp>")
+#include <boost/process/v1/async.hpp>
diff --git a/inst/include/boost/process/async_pipe.hpp b/inst/include/boost/process/async_pipe.hpp
index 0982b9041..1e91d28fb 100644
--- a/inst/include/boost/process/async_pipe.hpp
+++ b/inst/include/boost/process/async_pipe.hpp
@@ -1,217 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_PROCESS_ASYNC_PIPE_HPP
-#define BOOST_PROCESS_ASYNC_PIPE_HPP
-
-#include <boost/config.hpp>
-#include <boost/process/detail/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/async_pipe.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/async_pipe.hpp>
-#endif
-
-namespace boost { namespace process {
-
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-
-
-/** Class implementing an asnychronous I/O-Object for use with boost.asio.
- *  It is based on the corresponding I/O Object, that is either boost::asio::windows::stream_handle or
- *  boost::asio::posix::stream_descriptor.
- *
- *  It can be used directly with boost::asio::async_read or async_write.
- *
- * \note The object is copyable, but that does invoke a handle duplicate.
- */
-class async_pipe
-{
-public:
-    /** Typedef for the native handle representation.
-     * \note This is the handle on the system, not the boost.asio class.
-     *
-     */
-    typedef platform_specific native_handle_type;
-    /** Typedef for the handle representation of boost.asio.
-     *
-     */
-    typedef platform_specific handle_type;
-
-    typedef typename handle_type::executor_type executor_type;
-
-    /** Construct a new async_pipe, does automatically open the pipe.
-     * Initializes source and sink with the same io_context.
-     * @note Windows creates a named pipe here, where the name is automatically generated.
-     */
-    inline async_pipe(boost::asio::io_context & ios);
-
-    /** Construct a new async_pipe, does automatically open the pipe.
-     * @note Windows creates a named pipe here, where the name is automatically generated.
-     */
-    inline async_pipe(boost::asio::io_context & ios_source,
-                      boost::asio::io_context & ios_sink);
-
-    /** Construct a new async_pipe, does automatically open.
-     * Initializes source and sink with the same io_context.
-     *
-     * @note Windows restricts possible names.
-     */
-    inline async_pipe(boost::asio::io_context & ios, const std::string & name);
-
-
-    /** Construct a new async_pipe, does automatically open.
-     *
-     * @note Windows restricts possible names.
-     */
-    inline async_pipe(boost::asio::io_context & ios_source,
-                      boost::asio::io_context & ios_sink, const std::string & name);
-
-    /** Copy-Constructor of the async pipe.
-     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
-     *
-     */
-    async_pipe(const async_pipe& lhs);
-
-    /** Move-Constructor of the async pipe.
-     */
-    async_pipe(async_pipe&& lhs);
-
-    /** Construct the async-pipe from a pipe.
-     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
-     *
-     */
-    template<class CharT, class Traits = std::char_traits<CharT>>
-    explicit async_pipe(boost::asio::io_context & ios, const basic_pipe<CharT, Traits> & p);
-
-    /** Construct the async-pipe from a pipe, with two different io_context objects.
-     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
-     *
-     */
-    template<class CharT, class Traits = std::char_traits<CharT>>
-    explicit async_pipe(boost::asio::io_context & ios_source,
-                        boost::asio::io_context & ios_sink,
-                        const basic_pipe<CharT, Traits> & p);
-
-
-    /** Assign a basic_pipe.
-     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
-     *
-     */
-    template<class CharT, class Traits = std::char_traits<CharT>>
-    inline async_pipe& operator=(const basic_pipe<CharT, Traits>& p);
-
-    /** Copy Assign a pipe.
-     * @note Duplicates the handles.
-     */
-    async_pipe& operator=(const async_pipe& lhs);
-    /** Move assign a pipe */
-    async_pipe& operator=(async_pipe&& lhs);
-
-    /** Destructor. Closes the pipe handles. */
-    ~async_pipe();
-
-    /** Explicit cast to basic_pipe.  */
-    template<class CharT, class Traits = std::char_traits<CharT>>
-    inline explicit operator basic_pipe<CharT, Traits>() const;
-
-    /** Cancel the current asynchronous operations. */
-    void cancel();
-    /** Close the pipe handles. */
-    void close();
-    /** Close the pipe handles. While passing an error_code
-     *
-     */
-    void close(std::error_code & ec);
-
-    /** Check if the pipes are open. */
-    bool is_open() const;
-
-    /** Async close, i.e. close after current operation is completed.
-     *
-     *  \note There is no guarantee that this will indeed read the entire pipe-buffer
-     */
-    void async_close();
-
-    /** Read some data from the handle.
-
-     * See the boost.asio documentation for more details.
-     */
-    template<typename MutableBufferSequence>
-    std::size_t read_some(const MutableBufferSequence & buffers);
-
-    /** Write some data to the handle.
-
-     * See the boost.asio documentation for more details.
-     */
-    template<typename MutableBufferSequence>
-    std::size_t write_some(const MutableBufferSequence & buffers);
-
-    /** Get the native handle of the source. */
-    native_handle native_source() const {return const_cast<boost::asio::windows::stream_handle&>(_source).native();}
-    /** Get the native handle of the sink. */
-    native_handle native_sink  () const {return const_cast<boost::asio::windows::stream_handle&>(_sink  ).native();}
-
-    /** Start an asynchronous read.
-     *
-     * See the [boost.asio documentation](http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/AsyncReadStream.html) for more details.
-     */
-    template<typename MutableBufferSequence,
-             typename ReadHandler>
-    detail::dummy async_read_some(
-        const MutableBufferSequence & buffers,
-              ReadHandler &&handler);
-
-    /** Start an asynchronous write.
-
-     * See the [boost.asio documentation](http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/AsyncWriteStream.html) for more details.
-     */
-    template<typename ConstBufferSequence,
-             typename WriteHandler>
-    detail::dummy async_write_some(
-        const ConstBufferSequence & buffers,
-        WriteHandler && handler);
-
-    ///Get the asio handle of the pipe sink.
-    const handle_type & sink  () const &;
-    ///Get the asio handle of the pipe source.
-    const handle_type & source() const &;
-
-    ///Get the asio handle of the pipe sink. Qualified as rvalue
-    handle_type && sink  () &&;
-    ///Get the asio handle of the pipe source. Qualified as rvalue
-    handle_type && source() &&;
-
-    /// Move the source out of this class and change the io_context. Qualified as rvalue. \attention Will always move.
-    handle_type source(::boost::asio::io_context& ios) &&;
-    /// Move the sink out of this class and change the io_context. Qualified as rvalue. \attention Will always move
-    handle_type sink  (::boost::asio::io_context& ios) &&;
-
-    /// Copy the source out of this class and change the io_context. \attention Will always copy.
-    handle_type source(::boost::asio::io_context& ios) const &;
-    /// Copy the sink out of this class and change the io_context. \attention Will always copy
-    handle_type sink  (::boost::asio::io_context& ios) const &;
-
-
-
-};
-
-#else
-using ::boost::process::detail::api::async_pipe;
-#endif
-
-
-}}
-
-
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/async_pipe.hpp>")
+#include <boost/process/v1/async_pipe.hpp>
diff --git a/inst/include/boost/process/async_system.hpp b/inst/include/boost/process/async_system.hpp
index c11acafe0..86b967365 100644
--- a/inst/include/boost/process/async_system.hpp
+++ b/inst/include/boost/process/async_system.hpp
@@ -1,151 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/**
- * \file boost/process/async_system.hpp
- *
- * Defines the asynchronous version of the system function.
- */
-
-#ifndef BOOST_PROCESS_ASYNC_SYSTEM_HPP
-#define BOOST_PROCESS_ASYNC_SYSTEM_HPP
-
-#include <boost/process/detail/config.hpp>
-#include <boost/process/async.hpp>
-#include <boost/process/child.hpp>
-#include <boost/process/detail/async_handler.hpp>
-#include <boost/process/detail/execute_impl.hpp>
-#include <type_traits>
-#include <memory>
-#include <boost/asio/async_result.hpp>
-#include <boost/asio/post.hpp>
-#include <boost/system/error_code.hpp>
-#include <tuple>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/posix.hpp>
-#endif
-
-namespace boost {
-namespace process {
-namespace detail
-{
-
-template<typename Handler>
-struct async_system_handler : ::boost::process::detail::api::async_handler
-{
-    boost::asio::io_context & ios;
-    Handler handler;
-
-#if defined(BOOST_POSIX_API)
-    bool errored = false;
-#endif
-
-    template<typename ExitHandler_>
-    async_system_handler(
-            boost::asio::io_context & ios,
-            ExitHandler_ && exit_handler) : ios(ios), handler(std::forward<ExitHandler_>(exit_handler))
-    {
-    }
-
-
-    template<typename Exec>
-    void on_error(Exec&, const std::error_code & ec)
-    {
-#if defined(BOOST_POSIX_API)
-        errored = true;
-#endif
-        auto h = std::make_shared<Handler>(std::move(handler));
-        boost::asio::post(
-            ios.get_executor(),
-            [h, ec]() mutable
-            {
-                (*h)(boost::system::error_code(ec.value(), boost::system::system_category()), -1);
-            });
-    }
-
-    template<typename Executor>
-    std::function<void(int, const std::error_code&)> on_exit_handler(Executor&)
-    {
-#if defined(BOOST_POSIX_API)
-        if (errored)
-            return [](int , const std::error_code &){};
-#endif
-        auto h = std::make_shared<Handler>(std::move(handler));
-        return [h](int exit_code, const std::error_code & ec) mutable
-               {
-                    (*h)(boost::system::error_code(ec.value(), boost::system::system_category()), exit_code);
-               };
-    }
-};
-
-
-template<typename ExitHandler>
-struct is_error_handler<async_system_handler<ExitHandler>>    : std::true_type {};
-
-}
-
-/** This function provides an asynchronous interface to process launching.
-
-It uses the same properties and parameters as the other launching function,
-but is similar to the asynchronous functions in [boost.asio](http://www.boost.org/doc/libs/release/doc/html/boost_asio.html)
-
-It uses [asio::async_result](http://www.boost.org/doc/libs/release/doc/html/boost_asio/reference/async_result.html) to determine
-the return value (from the second parameter, `exit_handler`).
-
-\param ios A reference to an [io_context](http://www.boost.org/doc/libs/release/doc/html/boost_asio/reference.html)
-\param exit_handler The exit-handler for the signature `void(boost::system::error_code, int)`
-
-\note This function does not allow custom error handling, since those are done through the `exit_handler`.
-
-*/
-#if defined(BOOST_PROCESS_DOXYGEN)
-template<typename ExitHandler, typename ...Args>
-inline boost::process::detail::dummy
-    async_system(boost::asio::io_context & ios, ExitHandler && exit_handler, Args && ...args);
-#endif
-
-namespace detail
-{
-struct async_system_init_op
-{
-
-    template<typename Handler, typename ... Args>
-    void operator()(Handler && handler, asio::io_context & ios, Args && ... args)
-    {
-        detail::async_system_handler<typename std::decay<Handler>::type> async_h{ios, std::forward<Handler>(handler)};
-        child(ios, std::forward<Args>(args)..., async_h ).detach();
-    }
-};
-
-
-}
-
-
-template<typename ExitHandler, typename ...Args>
-inline BOOST_ASIO_INITFN_RESULT_TYPE(ExitHandler, void (boost::system::error_code, int))
-    async_system(boost::asio::io_context & ios, ExitHandler && exit_handler, Args && ...args)
-{
-    
-    typedef typename ::boost::process::detail::has_error_handler<boost::fusion::tuple<Args...>>::type
-            has_err_handling;
-
-    static_assert(!has_err_handling::value, "async_system cannot have custom error handling");
-
-    return boost::asio::async_initiate<ExitHandler, void (boost::system::error_code, int)>(
-        detail::async_system_init_op{}, exit_handler, ios, std::forward<Args>(args)...
-    );
-}
-
-
-
-}}
-#endif
 
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/async_system.hpp>")
+#include <boost/process/v1/async_system.hpp>
diff --git a/inst/include/boost/process/child.hpp b/inst/include/boost/process/child.hpp
index 8e6dcdd08..ad02db72b 100644
--- a/inst/include/boost/process/child.hpp
+++ b/inst/include/boost/process/child.hpp
@@ -1,154 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/**
- * \file boost/process/child.hpp
- *
- * Defines a child process class.
- */
-
-#ifndef BOOST_PROCESS_CHILD_HPP
-#define BOOST_PROCESS_CHILD_HPP
-
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/child_decl.hpp>
-#include <boost/process/detail/execute_impl.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/posix.hpp>
-#endif
-
-namespace boost {
-
-///The main namespace of boost.process.
-namespace process {
-
-template<typename ...Args>
-child::child(Args&&...args)
-    : child(::boost::process::detail::execute_impl(std::forward<Args>(args)...)) {}
-
-
-///Typedef for the type of an pid_t
-typedef ::boost::process::detail::api::pid_t pid_t;
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/** The main class to hold a child process. It is simliar to [std::thread](http://en.cppreference.com/w/cpp/thread/thread),
- * in that it has a join and detach function.
- *
- * @attention The destructor will call terminate on the process if not joined or detached without any warning.
- *
- */
-
-class child
-{
-    /** Type definition for the native process handle. */
-    typedef platform_specific native_handle_t;
-
-    /** Construct the child from a pid.
-     *
-     * @attention There is no guarantee that this will work. The process need the right access rights, which are very platform specific.
-     */
-    explicit child(pid_t & pid) : _child_handle(pid) {};
-
-    /** Move-Constructor.*/
-    child(child && lhs);
-
-    /** Construct a child from a property list and launch it
-     * The standard version is to create a subprocess, which will spawn the process.
-     */
-    template<typename ...Args>
-    explicit child(Args&&...args);
-
-    /** Construct an empty child. */
-    child() = default;
-
-    /** Move assign. */
-    child& operator=(child && lhs);
-
-    /** Detach the child, i.e. let it run after this handle dies. */
-    void detach();
-    /** Join the child. This just calls wait, but that way the naming is similar to std::thread */
-    void join();
-    /** Check if the child is joinable. */
-    bool joinable();
-
-    /** Destructor.
-     * @attention Will call terminate (without warning) when the child was neither joined nor detached.
-     */
-    ~child();
-
-    /** Get the native handle for the child process. */
-    native_handle_t native_handle() const;
-
-    /** Get the exit_code. The return value is without any meaning if the child wasn't waited for or if it was terminated. */
-    int exit_code() const;
-    /** Get the Process Identifier. */
-    pid_t id()      const;
-
-    /** Get the native, uninterpreted exit code. The return value is without any meaning if the child wasn't waited
-     *  for or if it was terminated. */
-    int native_exit_code() const;
-
-    /** Check if the child process is running. */
-    bool running();
-    /** \overload void running() */
-    bool running(std::error_code & ec) noexcept;
-
-    /** Wait for the child process to exit. */
-    void wait();
-    /** \overload void wait() */
-    void wait(std::error_code & ec) noexcept;
-
-    /** Wait for the child process to exit for a period of time.
-     * \return True if child exited while waiting.
-     */
-    template< class Rep, class Period >
-    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time);
-    /** \overload bool wait_for(const std::chrono::duration<Rep, Period>& rel_time) */
-    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time, std::error_code & ec) noexcept;
-
-    /** Wait for the child process to exit until a point in time.
-      * \return True if child exited while waiting.*/
-    template< class Clock, class Duration >
-    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time );
-    /** \overload bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time )*/
-    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time, std::error_code & ec) noexcept;
-
-    /** Check if this handle holds a child process.
-     * @note That does not mean, that the process is still running. It only means, that the handle does or did exist.
-     */
-    bool valid() const;
-    /** Same as valid, for convenience. */
-    explicit operator bool() const;
-
-    /** Check if the the chlid process is in any process group. */
-    bool in_group() const;
-
-    /** \overload bool in_group() const */
-    bool in_group(std::error_code & ec) const noexcept;
-
-    /** Terminate the child process.
-     *
-     *  This function will cause the child process to unconditionally and immediately exit.
-     *  It is implement with [SIGKILL](http://pubs.opengroup.org/onlinepubs/009695399/functions/kill.html) on posix
-     *  and [TerminateProcess](https://technet.microsoft.com/en-us/library/ms686714.aspx) on windows.
-     *
-     */
-    void terminate();
-
-    /** \overload void terminate() */
-    void terminate(std::error_code & ec) noexcept;
-};
-
-#endif
-
-}}
-#endif
 
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/child.hpp>")
+#include <boost/process/v1/child.hpp>
diff --git a/inst/include/boost/process/cmd.hpp b/inst/include/boost/process/cmd.hpp
index ddba0068a..ccf44fd21 100644
--- a/inst/include/boost/process/cmd.hpp
+++ b/inst/include/boost/process/cmd.hpp
@@ -1,122 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_DETAIL_CMD_LINE_HPP
-#define BOOST_PROCESS_DETAIL_CMD_LINE_HPP
 
-#include <boost/winapi/config.hpp>
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/traits/cmd_or_exe.hpp>
-#include <boost/process/detail/traits/wchar_t.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/cmd.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/cmd.hpp>
-#endif
-
-/** \file boost/process/cmd.hpp
- *
- *    This header provides the \xmlonly <globalname alt="boost::process::cmd">cmd</globalname>\endxmlonly property.
- *
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::cmd">cmd</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
-*/
-
-namespace boost { namespace process { namespace detail {
-
-
-struct cmd_
-{
-    constexpr cmd_() = default;
-
-    template<typename Char>
-    inline api::cmd_setter_<Char> operator()(const Char *s) const
-    {
-        return api::cmd_setter_<Char>(s);
-    }
-    template<typename Char>
-    inline api::cmd_setter_<Char> operator= (const Char *s) const
-    {
-        return api::cmd_setter_<Char>(s);
-    }
-
-    template<typename Char>
-    inline api::cmd_setter_<Char> operator()(const std::basic_string<Char> &s) const
-    {
-        return api::cmd_setter_<Char>(s);
-    }
-    template<typename Char>
-    inline api::cmd_setter_<Char> operator= (const std::basic_string<Char> &s) const
-    {
-        return api::cmd_setter_<Char>(s);
-    }
-};
-
-template<> struct is_wchar_t<api::cmd_setter_<wchar_t>> : std::true_type {};
-
-
-
-template<>
-struct char_converter<char, api::cmd_setter_<wchar_t>>
-{
-    static api::cmd_setter_<char> conv(const api::cmd_setter_<wchar_t> & in)
-    {
-        return { ::boost::process::detail::convert(in.str()) };
-    }
-};
-
-template<>
-struct char_converter<wchar_t, api::cmd_setter_<char>>
-{
-    static api::cmd_setter_<wchar_t> conv(const api::cmd_setter_<char> & in)
-    {
-        return { ::boost::process::detail::convert(in.str()) };
-    }
-};
-
-
-
-
-
-
-}
-
-
-/** The cmd property allows to explicitly set commands for the execution.
-
-The overload form applies when only one string is passed to a launching function.
-The string will be internally parsed and split at spaces.
-
-The following expressions are valid, with `value` being either a C-String or
-a `std::basic_string` with `char` or `wchar_t`.
-
-\code{.cpp}
-cmd="value";
-cmd(value);
-\endcode
-
-The property can only be used for assignments.
-
-
- */
-constexpr static ::boost::process::detail::cmd_ cmd;
-
-}}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/cmd.hpp>")
+#include <boost/process/v1/cmd.hpp>
diff --git a/inst/include/boost/process/detail/traits.hpp b/inst/include/boost/process/detail/traits.hpp
deleted file mode 100644
index 83789d9d0..000000000
--- a/inst/include/boost/process/detail/traits.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-
-#ifndef BOOST_PROCESS_TRAITS_HPP_
-#define BOOST_PROCESS_TRAITS_HPP_
-
-#include <boost/process/detail/traits/decl.hpp>
-#include <boost/process/detail/traits/async.hpp>
-#include <boost/process/detail/traits/cmd_or_exe.hpp>
-#include <boost/process/detail/traits/env.hpp>
-#include <boost/process/detail/traits/error.hpp>
-#include <boost/process/detail/traits/wchar_t.hpp>
-
-#endif /* BOOST_PROCESS_TRAITS_HPP_ */
diff --git a/inst/include/boost/process/env.hpp b/inst/include/boost/process/env.hpp
index 1457a0dcc..aa8145aeb 100644
--- a/inst/include/boost/process/env.hpp
+++ b/inst/include/boost/process/env.hpp
@@ -1,503 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_DETAIL_ENV_HPP_
-#define BOOST_PROCESS_DETAIL_ENV_HPP_
 
-#include <boost/process/detail/traits/wchar_t.hpp>
-#include <boost/process/environment.hpp>
-#include <boost/none.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/env_init.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/env_init.hpp>
-#endif
-
-/** \file boost/process/env.hpp
- *
- *    This header which provides the `env` property. It allows the modification of the
- *    environment the child process will run in, in a functional style.
- *
- *  \xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::env">env</globalname>;
-  }
-}
-</programlisting>
- *  \endxmlonly
- *
- *  For additional information see the platform documentations:
- *
- *   - [windows](https://msdn.microsoft.com/en-US/library/windows/desktop/ms682653.aspx)
- *   - [posix](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html)
- *
- */
-
-
-namespace boost {
-
-namespace process { namespace detail {
-
-
-template<typename Char>
-std::size_t make_env_string_size(const std::basic_string<Char> & ch)
-{
-    return ch.size() + 1;
-}
-
-template<typename Char>
-std::size_t make_env_string_size(const Char * ch)
-{
-    std::size_t sz = 0;
-    while (ch[sz] != null_char<Char>())
-        sz++;
-
-    sz++;
-    return sz;
-}
-
-template<typename Char, typename Container>
-inline std::basic_string<Char> make_env_string(const Container & value)
-{
-    std::size_t sz = 0;
-    for (auto & v : value)
-        sz += make_env_string_size(v);
-
-    std::basic_string<Char> s;
-    s.reserve(sz); //+1 for ;, end doesn't have one.
-
-    for (auto & val : value)
-        (s += val) += api::env_seperator<Char>();
-
-    s.resize(s.size() -1); //remove last ';'
-    return s;
-}
-
-
-template<typename Char>
-struct env_set
-{
-    using string_type = std::basic_string<Char>;
-    string_type key;
-    string_type value;
-};
-
-template<typename Char>
-struct env_append
-{
-    using string_type = std::basic_string<Char>;
-    string_type key;
-    string_type value;
-};
-
-
-
-template<typename Char>
-struct env_reset
-{
-    using string_type = std::basic_string<Char>;
-    string_type key;
-};
-
-
-template<> struct is_wchar_t<env_set<wchar_t>>           : std::true_type {};
-template<> struct is_wchar_t<env_append<wchar_t>>        : std::true_type {};
-template<> struct is_wchar_t<env_reset<wchar_t>>         : std::true_type {};
-template<> struct is_wchar_t<basic_environment<wchar_t>> : std::true_type {};
-
-
-template<>
-struct char_converter<char, env_set<wchar_t>>
-{
-    static env_set<char> conv(const env_set<wchar_t> & in)
-    {
-        return {::boost::process::detail::convert(in.key),
-                ::boost::process::detail::convert(in.value)};
-    }
-};
-
-template<>
-struct char_converter<wchar_t, env_set<char>>
-{
-    static env_set<wchar_t> conv(const env_set<char> & in)
-    {
-        return {::boost::process::detail::convert(in.key),
-                ::boost::process::detail::convert(in.value)};
-    }
-};
-
-template<>
-struct char_converter<char, env_append<wchar_t>>
-{
-    static env_append<char> conv(const env_append<wchar_t> & in)
-    {
-        return {::boost::process::detail::convert(in.key),
-                ::boost::process::detail::convert(in.value)};
-    }
-};
-
-template<>
-struct char_converter<wchar_t, env_append<char>>
-{
-    static env_append<wchar_t> conv(const env_append<char> & in)
-    {
-        return {::boost::process::detail::convert(in.key),
-                ::boost::process::detail::convert(in.value)};
-    }
-};
-
-template<>
-struct char_converter<char, env_reset<wchar_t>>
-{
-    static env_reset<char> conv(const env_reset<wchar_t> & in)
-    {
-        return {::boost::process::detail::convert(in.key)};
-    }
-};
-
-template<>
-struct char_converter<wchar_t, env_reset<char>>
-{
-    static env_reset<wchar_t> conv(const env_reset<char> & in)
-    {
-        return {::boost::process::detail::convert(in.key)};
-    }
-};
-
-
-template<typename Char>
-struct env_init
-{
-    basic_environment<Char> env;
-};
-
-template<>
-struct char_converter<char, env_init<wchar_t>>
-{
-    static env_init<char> conv(const env_init<wchar_t> & in)
-    {
-        return {basic_environment<char>(in.env)};
-    }
-};
-
-template<>
-struct char_converter<wchar_t, env_init<char>>
-{
-    static env_init<wchar_t> conv(const env_init<char> & in)
-    {
-        return {basic_environment<wchar_t>(in.env)};
-    }
-};
-
-template<>
-struct char_converter<char, basic_environment<wchar_t>>
-{
-    static basic_environment<char> conv(const basic_environment<wchar_t> & in)
-    {
-        return { basic_environment<char>(in) };
-    }
-};
-
-template<>
-struct char_converter<wchar_t, basic_environment<char>>
-{
-    static basic_environment<wchar_t> conv(const basic_environment<char> & in)
-    {
-        return { basic_environment<wchar_t>(in) };
-    }
-};
-
-template<typename Char>
-struct env_proxy
-{
-    using string_type = std::basic_string<Char>;
-    string_type key;
-
-
-    env_set<Char> operator=(const string_type & value)
-    {
-        return {std::move(key), value};
-    }
-    env_set<Char> operator=(const std::vector<string_type> & value)
-    {
-        return {std::move(key), make_env_string<Char>(value)};
-    }
-    env_set<Char> operator=(const std::initializer_list<const Char*> & value)
-    {
-        return {std::move(key), make_env_string<Char>(value)};
-    }
-
-    env_append<Char> operator+=(const string_type & value)
-    {
-        return {std::move(key), value};
-    }
-    env_append<Char> operator+=(const std::vector<string_type> & value)
-    {
-        return {std::move(key), make_env_string<Char>(value)};
-    }
-    env_append<Char> operator+=(const std::initializer_list<const Char*> & value)
-    {
-        return {std::move(key), make_env_string<Char>(value)};
-    }
-    env_reset<Char> operator=(boost::none_t)
-    {
-        return {std::move(key)};
-    }
-};
-
-struct env_
-{
-    constexpr env_() {};
-
-    template<typename Char>
-    env_set<Char> operator()(const std::basic_string<Char> & key,
-                             const std::basic_string<Char> & value) const
-    {
-        return {key, value};
-    }
-    template<typename Char>
-    env_set<Char> operator()(const std::basic_string<Char> & key,
-                                const std::vector<std::basic_string<Char>> & value) const
-    {
-        return {key, make_env_string<Char>(value)};
-    }
-    template<typename Char>
-    env_set<Char> operator()(const std::basic_string<Char> & key,
-                             const std::initializer_list<Char*> & value) const
-    {
-        return {key, make_env_string<Char>(value)};
-    }
-    template<typename Char>
-    env_reset<Char> operator()(const std::basic_string<Char> & key, boost::none_t)
-    {
-        return {key};
-    }
-    template<typename Char>
-    env_proxy<Char> operator[](const std::basic_string<Char> & key) const
-    {
-        return {key};
-    }
-    template<typename Char>
-    env_proxy<Char> operator[](const Char* key) const
-    {
-        return {key};
-    }
-    template<typename Char>
-    env_init<Char> operator()(const basic_environment<Char> & env) const
-    {
-        return {env};
-    }
-    template<typename Char>
-    env_init<Char> operator= (const basic_environment<Char> & env) const
-    {
-        return {env};
-    }
-};
-
-template<typename Char>
-struct env_builder
-{
-    basic_environment<Char> env;
-    env_builder() : env{basic_native_environment<Char>()} {}
-
-    void operator()(const basic_environment<Char> & e)
-    {
-        env = e;
-    }
-
-    void operator()(env_init<Char> & ei)
-    {
-        env = std::move(ei.env);
-    }
-    void operator()(env_set<Char> & es)
-    {
-        env[es.key] = es.value;
-    }
-    void operator()(env_reset<Char> & es)
-    {
-        env.erase(es.key);
-    }
-    template<typename T>
-    void operator()(env_append<T> & es)
-    {
-        env[es.key] += es.value;
-    }
-
-    typedef api::env_init<Char> result_type;
-    api::env_init<Char> get_initializer()
-    {
-        return api::env_init<Char>(std::move(env));
-    }
-};
-
-template<>
-struct initializer_builder<env_tag<char>>
-{
-    typedef env_builder<char> type;
-};
-
-template<>
-struct initializer_builder<env_tag<wchar_t>>
-{
-    typedef env_builder<wchar_t> type;
-};
-
-}
-
-/**
-
-The `env` property provides a functional way to modify the environment used by
-the child process. If none is passed the environment is inherited from the father
-process. Appending means that the environment will be interpreted as a ';' or ':'
-separated list as used in `PATH`.
-
-On both `posix` and `windows` the environment variables can be lists of strings,
-separated by ';'. This is typically used for the `PATH` variable.
-
-By default the environment will be inherited from the launching process,
-which is also true if environment are modified with this initializer.
-
-\section env_details Details
-
-\subsection env_operations Operations
-
-\subsubsection env_set_var Setting variables
-
-To set a variable `id` the value `value` the following syntax can be used.
-
-\code{.cpp}
-env[id] = value;
-env(id, value);
-\endcode
-
-`std::initializer_list` is among the allowed types, so the following syntax is also possible.
-
-\code{.cpp}
-env[id] = {value1, value2};
-env(id, {value1, value2});
-\endcode
-
-\note Creates the variable if it does not exist.
-
-The following lists contain possible value types, with `char_type` being either `char` or `wchar_t`
-for both `id` and `value`.
-
-\paragraph id id
-
- - `std::basic_string<char_type>`
- - `const char_type *`
-
-\paragraph env_set_var_value value
-
- - `std::basic_string<char_type>`
- - `const char_type * `
- - `std::initializer_list<const char_type *>`
- - `std::vector<std::basic_string<char_type>>`
-
-
-\note Using `std::vector` or `std::initializer_list`
-
-\subsubsection env_append_var Append variables
-
-Appending means, that a variable will be interpreted as a
-To append  a variable `id` the value `value` the following syntax can be used:
-
-\code{.cpp}
-env[id] += value;
-\endcode
-
-`std::initializer_list` is among the allowed types, so the following syntax is also possible.
-
-\code{.cpp}
-env[id] += {value1, value2};
-\endcode
-
-\note Creates the variable if it does not exist.
-
-The following lists contain possible value types, with `char_type` being either `char` or `wchar_t`
-for both `id` and `value`.
-
-\paragraph env_append_var_id id
-
- - `std::basic_string<char_type>`
- - `const char_type *`
-
-\paragraph env_append_var_value value
-
- - `std::basic_string<char_type>`
- - `const char_type *`
- - `std::initializer_list<const char_type *>`
- - `std::vector<std::basic_string<char_type>>`
-
-
-\subsubsection env_reset Reset variables
-
-Resetting single variables can be done in the following way:
-
-\code{.cpp}
-env[id] = boost::none;
-env(id, boost::none);
-\endcode
-
-\note This does not set the value empty, but removes it from the list.
-
-The following lists contain possible value types, with `char_type` being either `char` or `wchar_t`:
-
-\paragraph env_reset_var_id id
-
- - `std::basic_string<char_type>`
- - `const char_type *`
-
-\subsubsection env_init Initialize the environment
-
-The whole environment can be initialized from an object of type
-\xmlonly <classname>boost::process::environment</classname> \endxmlonly
-
-\code{.cpp}
-env=env;
-env(env);
-\endcode
-
-\note The passed `environment` can also be default-constructed to get an empty environment.
-
-\paragraph env_init_var_id id
-
- - `std::basic_string<char_type>`
- - `const char_type *`
-
-\paragraph env_init_var_value value
-
- - `boost::process::basic_environment<char_type>`
-
-\subsection env_example Example
-
-\code{.cpp}
-spawn("b2", env["PATH"]+="F:/boost", env["SOME_VAR"]=boost::none, env["NEW_VAR"]="VALUE");
-\endcode
-
-If the overload style should be done by passing an instance of
-\xmlonly <classname>boost::process::environment</classname> \endxmlonly
-the above example would look like this.
-
-\code{.cpp}
-environment e = this_process::environment();
-e["PATH"]   += "F:/boost";
-e.erase("SOME_VAR");
-e["NEW_VAR"] = "VALUE";
-spawn("b2", e);
-\endcode
-
-\warning Passing an empty environment will cause undefined behaviour.
-
- */
-constexpr boost::process::detail::env_ env{};
-
-
-}}
-
-#endif /* INCLUDE_BOOST_PROCESS_DETAIL_ENV_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/env.hpp>")
+#include <boost/process/v1/env.hpp>
diff --git a/inst/include/boost/process/environment.hpp b/inst/include/boost/process/environment.hpp
index 3b94f2403..9c9727fb5 100644
--- a/inst/include/boost/process/environment.hpp
+++ b/inst/include/boost/process/environment.hpp
@@ -1,712 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_PROCESS_ENVIRONMENT_HPP_
-#define BOOST_PROCESS_ENVIRONMENT_HPP_
-
-#include <boost/process/detail/config.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <boost/process/filesystem.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/environment.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/environment.hpp>
-#endif
-
-namespace boost { namespace process {
-
-namespace detail {
-
-template<typename Char, typename Environment>
-struct const_entry
-{
-    using value_type    = Char ;
-    using pointer       = const value_type * ;
-    using string_type   = std::basic_string<value_type> ;
-    using range         = boost::iterator_range<pointer> ;
-    using environment_t = Environment ;
-
-    std::vector<string_type> to_vector() const
-    {
-        if (_data == nullptr)
-            return std::vector<string_type>();
-        std::vector<string_type> data;
-        auto str = string_type(_data);
-        struct splitter
-        {
-            bool operator()(wchar_t w) const {return w == api::env_seperator<wchar_t>();}
-            bool operator()(char c)    const {return c == api::env_seperator<char>   ();}
-        } s;
-        boost::split(data, _data, s);
-        return data;
-    }
-    string_type to_string()              const
-    {
-        if (_data != nullptr)
-            return string_type(_data);
-        else
-            return string_type();
-    }
-    string_type get_name() const {return string_type(_name.begin(), _name.end());}
-    explicit const_entry(string_type&& name, pointer data, environment_t & env_) :
-        _name(std::move(name)), _data(data), _env(&env_) {}
-
-    explicit const_entry(string_type &&name, environment_t & env) :
-        _name(std::move(name)), _data(nullptr), _env(&env) {}
-    const_entry(const const_entry&) = default;
-    const_entry& operator=(const const_entry&) = default;
-
-    void reload()
-    {
-        auto p = _env->find(_name);
-        if (p == _env->end())
-            _data = nullptr;
-        else
-            _data = p->_data;
-        this->_env->reload();
-
-    }
-    bool empty() const
-    {
-        return _data == nullptr;
-    }
-protected:
-    string_type _name;
-    pointer _data;
-    environment_t * _env;
-};
-
-template<typename Char, typename Environment>
-struct entry : const_entry<Char, Environment>
-{
-    using father = const_entry<Char, Environment>;
-    using value_type    = typename father::value_type;
-    using string_type   = typename father::string_type;
-    using pointer       = typename father::pointer;
-    using environment_t = typename father::environment_t;
-
-    explicit entry(string_type&& name, pointer data, environment_t & env) :
-        father(std::move(name), data, env) {}
-
-    explicit entry(string_type &&name, environment_t & env_) :
-        father(std::move(name), env_) {}
-
-    entry(const entry&) = default;
-    entry& operator=(const entry&) = default;
-
-    void assign(const string_type &value)
-    {
-        this->_env->set(this->_name, value);
-        this->reload();
-    }
-    void assign(const std::vector<string_type> &value)
-    {
-        string_type data;
-        for (auto &v : value)
-        {
-            if (&v != &value.front())
-                data += api::env_seperator<value_type>();
-            data += v;
-        }
-        this->_env->set(this->_name, data);
-        this->reload();
-
-    }
-    void assign(const std::initializer_list<string_type> &value)
-    {
-        string_type data;
-        for (auto &v : value)
-        {
-            if (&v != &*value.begin())
-                data += api::env_seperator<value_type>();
-            data += v;
-        }
-        this->_env->set(this->_name, data);
-        this->reload();
-
-    }
-    void append(const string_type &value)
-    {
-        if (this->_data == nullptr)
-            this->_env->set(this->_name, value);
-        else
-        {
-            string_type st = this->_data;
-            this->_env->set(this->_name, st + api::env_seperator<value_type>() + value);
-        }
-
-
-        this->reload();
-
-    }
-    void clear()
-    {
-        this->_env->reset(this->_name);
-        this->_env->reload();
-        this->_data = nullptr;
-    }
-    entry &operator=(const string_type & value)
-    {
-        assign(value);
-        return *this;
-    }
-    entry &operator=(const std::vector<string_type> & value)
-    {
-        assign(value);
-        return *this;
-    }
-    entry &operator=(const std::initializer_list<string_type> & value)
-    {
-        assign(value);
-        return *this;
-    }
-    entry &operator+=(const string_type & value)
-    {
-        append(value);
-        return *this;
-    }
-
-};
-
-
-
-template<typename Char, typename Environment>
-struct make_entry
-{
-
-    make_entry(const make_entry&) = default;
-    make_entry& operator=(const make_entry&) = default;
-
-    Environment *env;
-    make_entry(Environment & env) : env(&env) {};
-    entry<Char, Environment> operator()(const Char* data) const
-    {
-        auto p = data;
-        while ((*p != equal_sign<Char>()) && (*p != null_char<Char>()))
-                p++;
-        auto name = std::basic_string<Char>(data, p);
-        p++; //go behind equal sign
-
-        return entry<Char, Environment>(std::move(name), p, *env);
-    }
-};
-
-template<typename Char, typename Environment>
-struct make_const_entry
-{
-
-    make_const_entry(const make_const_entry&) = default;
-    make_const_entry& operator=(const make_const_entry&) = default;
-
-    Environment *env;
-    make_const_entry(Environment & env) : env(&env) {};
-    const_entry<Char, Environment> operator()(const Char* data) const
-    {
-        auto p = data;
-        while ((*p != equal_sign<Char>()) && (*p != null_char<Char>()))
-                p++;
-        auto name = std::basic_string<Char>(data, p);
-        p++; //go behind equal sign
-
-        return const_entry<Char, Environment>(std::move(name), p, *env);
-    }
-};
-
-}
-
-#if !defined (BOOST_PROCESS_DOXYGEN)
-
-template<typename Char, template <class> class Implementation = detail::api::basic_environment_impl>
-class basic_environment_impl : public Implementation<Char>
-{
-    Char** _get_end() const
-    {
-        auto p = this->_env_impl;
-        while (*p != nullptr)
-            p++;
-
-        return p;
-    }
-public:
-    using string_type = std::basic_string<Char>;
-    using implementation_type = Implementation<Char>;
-    using base_type = basic_environment_impl<Char, Implementation>;
-    using       entry_maker = detail::make_entry<Char, base_type>;
-    using entry_type        = detail::entry     <Char, base_type>;
-    using const_entry_type  = detail::const_entry     <Char, const base_type>;
-    using const_entry_maker = detail::make_const_entry<Char, const base_type>;
-
-    friend       entry_type;
-    friend const_entry_type;
-
-    using iterator        = boost::transform_iterator<      entry_maker, Char**,       entry_type,       entry_type>;
-    using const_iterator  = boost::transform_iterator<const_entry_maker, Char**, const_entry_type, const_entry_type>;
-    using size_type       = std::size_t;
-
-    iterator        begin()       {return       iterator(this->_env_impl,       entry_maker(*this));}
-    const_iterator  begin() const {return const_iterator(this->_env_impl, const_entry_maker(*this));}
-    const_iterator cbegin() const {return const_iterator(this->_env_impl, const_entry_maker(*this));}
-
-    iterator        end()       {return       iterator(_get_end(),       entry_maker(*this));}
-    const_iterator  end() const {return const_iterator(_get_end(), const_entry_maker(*this));}
-    const_iterator cend() const {return const_iterator(_get_end(), const_entry_maker(*this));}
-
-    iterator        find( const string_type& key )
-    {
-        auto p = this->_env_impl;
-        auto st1 = key + ::boost::process::detail::equal_sign<Char>();
-        while (*p != nullptr)
-        {
-            const std::size_t len = std::char_traits<Char>::length(*p);
-            if ((std::distance(st1.begin(), st1.end()) < len)
-                 && std::equal(st1.begin(), st1.end(), *p))
-                break;
-            p++;
-        }
-        return iterator(p, entry_maker(*this));
-    }
-    const_iterator  find( const string_type& key ) const
-    {
-        auto p = this->_env_impl;
-        auto st1 = key + ::boost::process::detail::equal_sign<Char>();
-        while (*p != nullptr)
-        {
-            const std::size_t len = std::char_traits<Char>::length(*p);
-            if ((std::distance(st1.begin(), st1.end()) < len)
-                && std::equal(st1.begin(), st1.end(), *p))
-                break;
-            p++;
-        }
-        return const_iterator(p, const_entry_maker(*this));
-    }
-
-    std::size_t count(const string_type & st) const
-    {
-        auto p = this->_env_impl;
-        auto st1 = st + ::boost::process::detail::equal_sign<Char>();
-        while (*p != nullptr)
-        {
-            const std::size_t len = std::char_traits<Char>::length(*p);
-            if ((std::distance(st1.begin(), st1.end()) <
-                 static_cast<typename string_type::iterator::difference_type>(len))
-                && std::equal(st1.begin(), st1.end(), *p))
-                return 1u;
-            p++;
-        }
-        return 0u;
-    }
-    void erase(const string_type & id)
-    {
-        implementation_type::reset(id);
-        this->reload();
-    }
-    std::pair<iterator,bool> emplace(const string_type & id, const string_type & value)
-    {
-        auto f = find(id);
-        if (f == end())
-        {
-            implementation_type::set(id, value);
-            this->reload();
-            return std::pair<iterator, bool>(find(id), true);
-        }
-        else
-            return std::pair<iterator, bool>(f, false);
-    }
-    using implementation_type::implementation_type;
-    using implementation_type::operator=;
-    using native_handle_type = typename implementation_type::native_handle_type;
-    using implementation_type::native_handle;
-    //copy ctor if impl is copy-constructible
-    bool empty()
-    {
-        return *this->_env_impl == nullptr;
-    }
-    std::size_t size() const
-    {
-        return (_get_end() - this->_env_impl);
-    }
-    void clear()
-    {
-        std::vector<string_type> names;
-        names.resize(size());
-        std::transform(cbegin(), cend(), names.begin(), [](const const_entry_type & cet){return cet.get_name();});
-
-        for (auto & nm : names)
-            implementation_type::reset(nm);
-
-        this->reload();
-    }
-
-    entry_type  at( const string_type& key )
-    {
-        auto f = find(key);
-        if (f== end())
-            throw std::out_of_range(key + " not found");
-        return *f;
-    }
-    const_entry_type at( const string_type& key ) const
-    {
-        auto f = find(key);
-        if (f== end())
-            throw std::out_of_range(key + " not found");
-        return *f;
-    }
-    entry_type operator[](const string_type & key)
-    {
-        auto p = find(key);
-        if (p != end())
-            return *p;
-
-        return entry_type(string_type(key), *this);
-    }
-};
-#endif
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/**Template representation of environments. It takes a character type (`char` or `wchar_t`)
- * as template parameter to implement the environment
- */
-template<typename Char>
-class basic_environment
-{
-
-public:
-    typedef std::basic_string<Char> string_type;
-    typedef boost::transform_iterator<      entry_maker, Char**> iterator       ;
-    typedef boost::transform_iterator<const_entry_maker, Char**> const_iterator ;
-    typedef std::size_t                                             size_type      ;
-
-    iterator       begin()        ; ///<Returns an iterator to the beginning
-    const_iterator begin()  const ; ///<Returns an iterator to the beginning
-    const_iterator cbegin() const ; ///<Returns an iterator to the beginning
-
-    iterator       end()       ; ///<Returns an iterator to the end
-    const_iterator end()  const; ///<Returns an iterator to the end
-    const_iterator cend() const; ///<Returns an iterator to the end
-
-    iterator        find( const string_type& key );            ///<Find a variable by its name
-    const_iterator  find( const string_type& key ) const;   ///<Find a variable by its name
-
-    std::size_t count(const string_type & st) const; ///<Number of variables
-    void erase(const string_type & id); ///<Erase variable by id.
-    ///Emplace an environment variable.
-    std::pair<iterator,bool> emplace(const string_type & id, const string_type & value);
-
-    ///Default constructor
-    basic_environment();
-    ///Copy constructor.
-    basic_environment(const basic_environment & );
-    ///Move constructor.
-    basic_environment(basic_environment && );
-
-    ///Copy assignment.
-    basic_environment& operator=(const basic_environment & );
-    ///Move assignment.
-    basic_environment& operator=(basic_environment && );
-
-    typedef typename detail::implementation_type::native_handle_type native_handle;
-
-    ///Check if environment has entries.
-    bool empty();
-    ///Get the number of variables.
-    std::size_t size() const;
-    ///Clear the environment. @attention Use with care, passed environment cannot be empty.
-    void clear();
-    ///Get the entry with the key. Throws if it does not exist.
-    entry_type  at( const string_type& key );
-    ///Get the entry with the key. Throws if it does not exist.
-    const_entry_type at( const string_type& key ) const;
-    ///Get the entry with the given key. It creates the entry if it doesn't exist.
-    entry_type operator[](const string_type & key);
-
-    /**Proxy class used for read access to members by [] or .at()
-     * @attention Holds a reference to the environment it was created from.
-     */
-    template<typename Char, typename Environment>
-    struct const_entry_type
-    {
-        typedef Char value_type;
-        typedef const value_type * pointer;
-        typedef std::basic_string<value_type> string_type;
-        typedef boost::iterator_range<pointer> range;
-        typedef Environment environment_t;
-
-        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
-        std::vector<string_type> to_vector() const
-        ///Get the value as string.
-        string_type to_string()              const
-        ///Get the name of this entry.
-        string_type get_name() const {return string_type(_name.begin(), _name.end());}
-        ///Copy Constructor
-        const_entry(const const_entry&) = default;
-        ///Move Constructor
-        const_entry& operator=(const const_entry&) = default;
-        ///Check if the entry is empty.
-        bool empty() const;
-    };
-
-    /**Proxy class used for read and write access to members by [] or .at()
-     * @attention Holds a reference to the environment it was created from.
-     */
-    template<typename Char, typename Environment>
-    struct entry_type
-    {
-
-        typedef Char value_type;
-        typedef const value_type * pointer;
-        typedef std::basic_string<value_type> string_type;
-        typedef boost::iterator_range<pointer> range;
-        typedef Environment environment_t;
-
-        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
-        std::vector<string_type> to_vector() const
-        ///Get the value as string.
-        string_type to_string()              const
-        ///Get the name of this entry.
-        string_type get_name() const {return string_type(_name.begin(), _name.end());}
-        ///Copy Constructor
-        entry(const entry&) = default;
-        ///Move Constructor
-        entry& operator=(const entry&) = default;
-        ///Check if the entry is empty.
-        bool empty() const;
-
-        ///Assign a string to the value
-        void assign(const string_type &value);
-        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
-        void assign(const std::vector<string_type> &value);
-        ///Append a string to the end of the entry, it will separated by ';' or ':'.
-        void append(const string_type &value);
-        ///Reset the value
-        void clear();
-        ///Assign a string to the entry.
-        entry &operator=(const string_type & value);
-        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
-        entry &operator=(const std::vector<string_type> & value);
-        ///Append a string to the end of the entry, it will separated by ';' or ':'.
-        entry &operator+=(const string_type & value);
-    };
-
-};
-
-/**Template representation of the environment of this process. It takes a template
- * as template parameter to implement the environment. All instances of this class
- * refer to the same environment, but might not get updated if another one makes changes.
- */
-template<typename Char>
-class basic_native_environment
-{
-
-public:
-    typedef std::basic_string<Char> string_type;
-    typedef boost::transform_iterator<      entry_maker, Char**> iterator       ;
-    typedef boost::transform_iterator<const_entry_maker, Char**> const_iterator ;
-    typedef std::size_t                                             size_type      ;
-
-    iterator       begin()        ; ///<Returns an iterator to the beginning
-    const_iterator begin()  const ; ///<Returns an iterator to the beginning
-    const_iterator cbegin() const ; ///<Returns an iterator to the beginning
-
-    iterator       end()       ; ///<Returns an iterator to the end
-    const_iterator end()  const; ///<Returns an iterator to the end
-    const_iterator cend() const; ///<Returns an iterator to the end
-
-    iterator        find( const string_type& key );            ///<Find a variable by its name
-    const_iterator  find( const string_type& key ) const;   ///<Find a variable by its name
-
-    std::size_t count(const string_type & st) const; ///<Number of variables
-    void erase(const string_type & id); ///<Erase variable by id.
-    ///Emplace an environment variable.
-    std::pair<iterator,bool> emplace(const string_type & id, const string_type & value);
-
-    ///Default constructor
-    basic_native_environment();
-    ///Move constructor.
-    basic_native_environment(basic_native_environment && );
-    ///Move assignment.
-    basic_native_environment& operator=(basic_native_environment && );
-
-    typedef typename detail::implementation_type::native_handle_type native_handle;
-
-    ///Check if environment has entries.
-    bool empty();
-    ///Get the number of variables.
-    std::size_t size() const;
-    ///Get the entry with the key. Throws if it does not exist.
-    entry_type  at( const string_type& key );
-    ///Get the entry with the key. Throws if it does not exist.
-    const_entry_type at( const string_type& key ) const;
-    ///Get the entry with the given key. It creates the entry if it doesn't exist.
-    entry_type operator[](const string_type & key);
-
-    /**Proxy class used for read access to members by [] or .at()
-     * @attention Holds a reference to the environment it was created from.
-     */
-    template<typename Char, typename Environment>
-    struct const_entry_type
-    {
-        typedef Char value_type;
-        typedef const value_type * pointer;
-        typedef std::basic_string<value_type> string_type;
-        typedef boost::iterator_range<pointer> range;
-        typedef Environment environment_t;
-
-        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
-        std::vector<string_type> to_vector() const
-        ///Get the value as string.
-        string_type to_string()              const
-        ///Get the name of this entry.
-        string_type get_name() const {return string_type(_name.begin(), _name.end());}
-        ///Copy Constructor
-        const_entry(const const_entry&) = default;
-        ///Move Constructor
-        const_entry& operator=(const const_entry&) = default;
-        ///Check if the entry is empty.
-        bool empty() const;
-    };
-
-    /**Proxy class used for read and write access to members by [] or .at()
-     * @attention Holds a reference to the environment it was created from.
-     */
-    template<typename Char, typename Environment>
-    struct entry_type
-    {
-
-        typedef Char value_type;
-        typedef const value_type * pointer;
-        typedef std::basic_string<value_type> string_type;
-        typedef boost::iterator_range<pointer> range;
-        typedef Environment environment_t;
-
-        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
-        std::vector<string_type> to_vector() const
-        ///Get the value as string.
-        string_type to_string()              const
-        ///Get the name of this entry.
-        string_type get_name() const {return string_type(_name.begin(), _name.end());}
-        ///Copy Constructor
-        entry(const entry&) = default;
-        ///Move Constructor
-        entry& operator=(const entry&) = default;
-        ///Check if the entry is empty.
-        bool empty() const;
-
-        ///Assign a string to the value
-        void assign(const string_type &value);
-        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
-        void assign(const std::vector<string_type> &value);
-        ///Append a string to the end of the entry, it will separated by ';'  or ':'.
-        void append(const string_type &value);
-        ///Reset the value
-        void clear();
-        ///Assign a string to the entry.
-        entry &operator=(const string_type & value);
-        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
-        entry &operator=(const std::vector<string_type> & value);
-        ///Append a string to the end of the entry, it will separated by ';' or ':'.
-        entry &operator+=(const string_type & value);
-    };
-
-};
-
-#endif
-
-///Definition of the environment for the current process.
-template<typename Char>
-class basic_native_environment : public basic_environment_impl<Char, detail::api::native_environment_impl>
-{
-public:
-    using base_type = basic_environment_impl<Char, detail::api::native_environment_impl>;
-    using base_type::base_type;
-    using base_type::operator=;
-};
-
-///Type definition to hold a seperate environment.
-template<typename Char>
-class basic_environment : public basic_environment_impl<Char, detail::api::basic_environment_impl>
-{
-public:
-    using base_type = basic_environment_impl<Char, detail::api::basic_environment_impl>;
-    using base_type::base_type;
-    using base_type::operator=;
-};
-
-
-#if !defined(BOOST_NO_ANSI_APIS)
-///Definition of the environment for the current process.
-typedef basic_native_environment<char>     native_environment;
-#endif
-///Definition of the environment for the current process.
-typedef basic_native_environment<wchar_t> wnative_environment;
-
-#if !defined(BOOST_NO_ANSI_APIS)
-///Type definition to hold a seperate environment.
-typedef basic_environment<char>     environment;
-#endif
-///Type definition to hold a seperate environment.
-typedef basic_environment<wchar_t> wenvironment;
-
-}
-
-///Namespace containing information of the calling process.
-namespace this_process
-{
-
-///Definition of the native handle type.
-typedef ::boost::process::detail::api::native_handle_t native_handle_type;
-
-#if !defined(BOOST_NO_ANSI_APIS)
-///Definition of the environment for this process.
-using ::boost::process::native_environment;
-#endif
-///Definition of the environment for this process.
-using ::boost::process::wnative_environment;
-
-///Get the process id of the current process.
-inline int get_id()                     { return ::boost::process::detail::api::get_id();}
-///Get the native handle of the current process.
-inline native_handle_type native_handle()  { return ::boost::process::detail::api::native_handle();}
-#if !defined(BOOST_NO_ANSI_APIS)
-///Get the enviroment of the current process.
-inline native_environment   environment() { return ::boost::process:: native_environment(); }
-#endif
-///Get the enviroment of the current process.
-inline wnative_environment wenvironment() { return ::boost::process::wnative_environment(); }
-///Get the path environment variable of the current process runs.
-inline std::vector<boost::process::filesystem::path> path()
-{
-#if defined(BOOST_WINDOWS_API)
-    const ::boost::process::wnative_environment ne{};
-    typedef typename ::boost::process::wnative_environment::const_entry_type value_type;
-    static constexpr auto id = L"PATH";
-#else
-    const ::boost::process::native_environment ne{};
-    typedef typename ::boost::process::native_environment::const_entry_type value_type;
-    static constexpr auto id = "PATH";
-#endif
-
-    auto itr = std::find_if(ne.cbegin(), ne.cend(),
-            [&](const value_type & e)
-             {return id == ::boost::to_upper_copy(e.get_name(), ::boost::process::detail::process_locale());});
-
-    if (itr == ne.cend())
-        return {};
-
-    auto vec = itr->to_vector();
-
-    std::vector<boost::process::filesystem::path> val;
-    val.resize(vec.size());
-
-    std::copy(vec.begin(), vec.end(), val.begin());
-
-    return val;
-}
-}
-}
-#endif /* INCLUDE_BOOST_PROCESS_DETAIL_ENVIRONMENT_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/environment.hpp>")
+#include <boost/process/v1/environment.hpp>
diff --git a/inst/include/boost/process/error.hpp b/inst/include/boost/process/error.hpp
index 69c9a8955..347947457 100644
--- a/inst/include/boost/process/error.hpp
+++ b/inst/include/boost/process/error.hpp
@@ -1,211 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_DETAIL_ERROR_HPP
-#define BOOST_PROCESS_DETAIL_ERROR_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/traits.hpp>
-
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/handler.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/handler.hpp>
-#endif
-
-#include <system_error>
-
-#include <type_traits>
-#include <boost/fusion/algorithm/query/find_if.hpp>
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/container/set/convert.hpp>
-#include <boost/type_index.hpp>
-
-/** \file boost/process/error.hpp
- *
- *    Header which provides the error properties. It allows to explicitly set the error handling, the properties are:
- *
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::ignore_error">ignore_error</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::throw_on_error">throw_on_error</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::error">error</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::error_ref">error_ref</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::error_code">error_code</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
- *     For error there are two aliases: error_ref and error_code
- */
-
-namespace boost { namespace process {
-
-namespace detail {
-
-struct throw_on_error_ : ::boost::process::detail::api::handler_base_ext
-{
-    constexpr throw_on_error_() = default;
-
-    template <class Executor>
-    void on_error(Executor&, const std::error_code & ec) const
-    {
-        throw process_error(ec, "process creation failed");
-    }
-
-    const throw_on_error_ &operator()() const {return *this;}
-};
-
-struct ignore_error_ : ::boost::process::detail::api::handler_base_ext
-{
-    constexpr ignore_error_() = default;
-};
-
-struct set_on_error : ::boost::process::detail::api::handler_base_ext
-{
-    set_on_error(const set_on_error&) = default;
-    explicit set_on_error(std::error_code &ec) : ec_(ec) {}
-
-    template <class Executor>
-    void on_error(Executor&, const std::error_code & ec) const noexcept
-    {
-        ec_ = ec;
-    }
-
-private:
-    std::error_code &ec_;
-};
-
-struct error_
-{
-    constexpr error_() = default;
-    set_on_error operator()(std::error_code &ec) const {return set_on_error(ec);}
-    set_on_error operator= (std::error_code &ec) const {return set_on_error(ec);}
-
-};
-
-
-template<typename T>
-struct is_error_handler : std::false_type {};
-
-template<> struct is_error_handler<set_on_error>    : std::true_type {};
-template<> struct is_error_handler<throw_on_error_> : std::true_type {};
-template<> struct is_error_handler<ignore_error_>   : std::true_type {};
-
-
-
-template<typename Iterator, typename End>
-struct has_error_handler_impl
-{
-    typedef typename boost::fusion::result_of::deref<Iterator>::type ref_type;
-    typedef typename std::remove_reference<ref_type>::type res_type_;
-    typedef typename std::remove_cv<res_type_>::type res_type;
-    typedef typename is_error_handler<res_type>::type cond;
-
-    typedef typename boost::fusion::result_of::next<Iterator>::type next_itr;
-    typedef typename has_error_handler_impl<next_itr, End>::type next;
-
-    typedef typename boost::mpl::or_<cond, next>::type type;
-};
-
-template<typename Iterator>
-struct has_error_handler_impl<Iterator, Iterator>
-{
-    typedef boost::mpl::false_ type;
-};
-
-
-template<typename Sequence>
-struct has_error_handler
-{
-    typedef typename boost::fusion::result_of::as_vector<Sequence>::type vector_type;
-
-    typedef typename has_error_handler_impl<
-            typename boost::fusion::result_of::begin<vector_type>::type,
-            typename boost::fusion::result_of::end<  vector_type>::type
-            >::type type;
-};
-
-template<typename Sequence>
-struct has_ignore_error
-{
-    typedef typename boost::fusion::result_of::as_set<Sequence>::type set_type;
-    typedef typename boost::fusion::result_of::has_key<set_type, ignore_error_>::type  type1;
-    typedef typename boost::fusion::result_of::has_key<set_type, ignore_error_&>::type type2;
-    typedef typename boost::fusion::result_of::has_key<set_type, const ignore_error_&>::type type3;
-    typedef typename boost::mpl::or_<type1,type2, type3>::type type;
-};
-
-struct error_builder
-{
-    std::error_code *err;
-    typedef set_on_error result_type;
-    set_on_error get_initializer() {return set_on_error(*err);};
-    void operator()(std::error_code & ec) {err = &ec;};
-};
-
-template<>
-struct initializer_tag<std::error_code>
-{
-    typedef error_tag type;
-};
-
-
-template<>
-struct initializer_builder<error_tag>
-{
-    typedef error_builder type;
-};
-
-}
-/**The ignore_error property will disable any error handling. This can be useful
-on linux, where error handling will require a pipe.*/
-constexpr boost::process::detail::ignore_error_ ignore_error;
-/**The throw_on_error property will enable the exception when launching a process.
-It is unnecessary by default, but may be used, when an additional error_code is provided.*/
-constexpr boost::process::detail::throw_on_error_ throw_on_error;
-/**
-The error property will set the executor to handle any errors by setting an
-[std::error_code](http://en.cppreference.com/w/cpp/error/error_code).
-
-\code{.cpp}
-std::error_code ec;
-system("gcc", error(ec));
-\endcode
-
-The following syntax is valid:
-
-\code{.cpp}
-error(ec);
-error=ec;
-\endcode
-
-The overload version is achieved by just passing an object of
- [std::error_code](http://en.cppreference.com/w/cpp/error/error_code) to the function.
-
-
- */
-constexpr boost::process::detail::error_ error;
-///Alias for \xmlonly <globalname alt="boost::process::error">error</globalname> \endxmlonly .
-constexpr boost::process::detail::error_ error_ref;
-///Alias for \xmlonly <globalname alt="boost::process::error">error</globalname> \endxmlonly .
-constexpr boost::process::detail::error_ error_code;
-
-
-}}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/error.hpp>")
+#include <boost/process/v1/error.hpp>
diff --git a/inst/include/boost/process/exception.hpp b/inst/include/boost/process/exception.hpp
index 1bb391117..a9416db45 100644
--- a/inst/include/boost/process/exception.hpp
+++ b/inst/include/boost/process/exception.hpp
@@ -1,30 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_EXCEPTION_HPP_
-#define BOOST_PROCESS_EXCEPTION_HPP_
 
-#include <system_error>
-
-namespace boost
-{
-namespace process
-{
-///The exception usually thrown by boost.process.
-/** It merely inherits [std::system_error](http://en.cppreference.com/w/cpp/error/system_error)
- * but can then be distinguished in the catch-block from other system errors.
- *
- */
-struct process_error : std::system_error
-{
-    using std::system_error::system_error;
-};
-
-}
-}
-
-
-
-#endif /* BOOST_PROCESS_EXCEPTION_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/exception.hpp>")
+#include <boost/process/v1/exception.hpp>
diff --git a/inst/include/boost/process/exe.hpp b/inst/include/boost/process/exe.hpp
index c9358c0a7..61383c95d 100644
--- a/inst/include/boost/process/exe.hpp
+++ b/inst/include/boost/process/exe.hpp
@@ -1,97 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_EXE_HPP
-#define BOOST_PROCESS_EXE_HPP
 
-#include <boost/process/detail/basic_cmd.hpp>
-
-/** \file boost/process/exe.hpp
- *
- *    Header which provides the exe property.
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::exe">exe</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
- */
-namespace boost {
-namespace filesystem { class path; }
-
-namespace process {
-
-namespace detail {
-
-struct exe_
-{
-    template<typename = void>
-    inline exe_setter_<typename boost::process::filesystem::path::value_type> operator()(const boost::process::filesystem::path & pth) const
-    {
-        return exe_setter_<typename boost::process::filesystem::path::value_type>(pth.native());
-    }
-
-    template<typename = void>
-    inline exe_setter_<typename boost::process::filesystem::path::value_type> operator=(const boost::process::filesystem::path & pth) const
-    {
-        return exe_setter_<typename boost::process::filesystem::path::value_type>(pth.native());
-    }
-
-
-    template<typename Char>
-    inline exe_setter_<Char> operator()(const Char *s) const
-    {
-        return exe_setter_<Char>(s);
-    }
-    template<typename Char>
-    inline exe_setter_<Char> operator= (const Char *s) const
-    {
-        return exe_setter_<Char>(s);
-    }
-
-    template<typename Char>
-    inline exe_setter_<Char> operator()(const std::basic_string<Char> &s) const
-    {
-        return exe_setter_<Char>(s);
-    }
-    template<typename Char>
-    inline exe_setter_<Char> operator= (const std::basic_string<Char> &s) const
-    {
-        return exe_setter_<Char>(s);
-    }
-};
-
-}
-
-/** The exe property allows to explicitly set the executable.
-
-The overload form applies when to the first, when several strings are passed to a launching
-function.
-
-The following expressions are valid, with `value` being either a C-String or
-a `std::basic_string` with `char` or `wchar_t` or a `boost::process::filesystem::path`.
-
-\code{.cpp}
-exe="value";
-exe(value);
-\endcode
-
-The property can only be used for assignments.
-
-
- */
-constexpr boost::process::detail::exe_ exe{};
-
-}}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/exe.hpp>")
+#include <boost/process/v1/exe.hpp>
diff --git a/inst/include/boost/process/extend.hpp b/inst/include/boost/process/extend.hpp
index 393573607..aaa0e8651 100644
--- a/inst/include/boost/process/extend.hpp
+++ b/inst/include/boost/process/extend.hpp
@@ -1,344 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_EXTENSIONS_HPP_
-#define BOOST_PROCESS_EXTENSIONS_HPP_
 
-#include <boost/process/detail/handler.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <memory>
-
-#if defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/executor.hpp>
-#include <boost/process/detail/windows/async_handler.hpp>
-#include <boost/process/detail/windows/asio_fwd.hpp>
-#else
-#include <boost/process/detail/posix/executor.hpp>
-#include <boost/process/detail/posix/async_handler.hpp>
-#include <boost/process/detail/posix/asio_fwd.hpp>
-#endif
-
-
-/** \file boost/process/extend.hpp
- *
- * This header which provides the types and functions provided for custom extensions.
- *
- * \xmlonly
-   Please refer to the <link linkend="boost_process.extend">tutorial</link> for more details.
-   \endxmlonly
- */
-
-
-namespace boost {
-namespace process {
-namespace detail {
-template<typename Tuple>
-inline asio::io_context& get_io_context(const Tuple & tup);
-}
-
-
-///Namespace for extensions \attention This is experimental.
-namespace extend {
-
-#if defined(BOOST_WINDOWS_API)
-
-template<typename Char, typename Sequence>
-using windows_executor = ::boost::process::detail::windows::executor<Char, Sequence>;
-template<typename Sequence>
-struct posix_executor;
-
-#elif defined(BOOST_POSIX_API)
-
-template<typename Sequence>
-using posix_executor = ::boost::process::detail::posix::executor<Sequence>;
-template<typename Char, typename Sequence>
-struct windows_executor;
-
-#endif
-
-using ::boost::process::detail::handler;
-using ::boost::process::detail::api::require_io_context;
-using ::boost::process::detail::api::async_handler;
-using ::boost::process::detail::get_io_context;
-using ::boost::process::detail::get_last_error;
-using ::boost::process::detail::throw_last_error;
-using ::boost::process::detail::uses_handles;
-using ::boost::process::detail::foreach_used_handle;
-using ::boost::process::detail::get_used_handles;
-
-///This handler is invoked before the process in launched, to setup parameters. The required signature is `void(Exec &)`, where `Exec` is a template parameter.
-constexpr boost::process::detail::make_handler_t<boost::process::detail::on_setup_>   on_setup;
-///This handler is invoked if an error occurred. The required signature is `void(auto & exec, const std::error_code&)`, where `Exec` is a template parameter.
-constexpr boost::process::detail::make_handler_t<boost::process::detail::on_error_>   on_error;
-///This handler is invoked if launching the process has succeeded. The required signature is `void(auto & exec)`, where `Exec` is a template parameter.
-constexpr boost::process::detail::make_handler_t<boost::process::detail::on_success_> on_success;
-
-#if defined(BOOST_POSIX_API) || defined(BOOST_PROCESS_DOXYGEN)
-///This handler is invoked if the fork failed. The required signature is `void(auto & exec)`, where `Exec` is a template parameter. \note Only available on posix.
-constexpr ::boost::process::detail::make_handler_t<::boost::process::detail::posix::on_fork_error_  >   on_fork_error;
-///This handler is invoked if the fork succeeded. The required signature is `void(Exec &)`, where `Exec` is a template parameter. \note Only available on posix.
-constexpr ::boost::process::detail::make_handler_t<::boost::process::detail::posix::on_exec_setup_  >   on_exec_setup;
-///This handler is invoked if the exec call errored. The required signature is `void(auto & exec)`, where `Exec` is a template parameter. \note Only available on posix.
-constexpr ::boost::process::detail::make_handler_t<::boost::process::detail::posix::on_exec_error_  >   on_exec_error;
-#endif
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-///Helper function to get the last error code system-independent
-inline std::error_code get_last_error();
-
-///Helper function to get and throw the last system error.
-/// \throws boost::process::process_error
-/// \param msg A message to add to the error code.
-inline void throw_last_error(const std::string & msg);
-///\overload void throw_last_error(const std::string & msg)
-inline void throw_last_error();
-
-
-/** This function gets the io_context from the initializer sequence.
- *
- * \attention Yields a compile-time error if no `io_context` is provided.
- * \param seq The Sequence of the initializer.
- */
-template<typename Sequence>
-inline asio::io_context& get_io_context(const Sequence & seq);
-
-/** This class is the base for every initializer, to be used for extensions.
- *
- *  The usage is done through compile-time polymorphism, so that the required
- *  functions can be overloaded.
- *
- * \note None of the function need to be `const`.
- *
- */
-struct handler
-{
-    ///This function is invoked before the process launch. \note It is not required to be const.
-    template <class Executor>
-    void on_setup(Executor&) const {}
-
-    /** This function is invoked if an error occured while trying to launch the process.
-     * \note It is not required to be const.
-     */
-    template <class Executor>
-    void on_error(Executor&, const std::error_code &) const {}
-
-    /** This function is invoked if the process was successfully launched.
-     * \note It is not required to be const.
-     */
-    template <class Executor>
-    void on_success(Executor&) const {}
-
-    /**This function is invoked if an error occured during the call of `fork`.
-     * \note This function will only be called on posix.
-     */
-    template<typename Executor>
-    void on_fork_error  (Executor &, const std::error_code&) const {}
-
-    /**This function is invoked if the call of `fork` was successful, before
-     * calling `execve`.
-     * \note This function will only be called on posix.
-     * \attention It will be invoked from the new process.
-     */
-    template<typename Executor>
-    void on_exec_setup  (Executor &) const {}
-
-    /**This function is invoked if the call of `execve` failed.
-     * \note This function will only be called on posix.
-     * \attention It will be invoked from the new process.
-     */
-    template<typename Executor>
-    void on_exec_error  (Executor &, const std::error_code&) const {}
-
-};
-
-
-/** Inheriting the class will tell the launching process that an `io_context` is
- * needed. This should always be used when \ref get_io_context is used.
- *
- */
-struct require_io_context {};
-/** Inheriting this class will tell the launching function, that an event handler
- * shall be invoked when the process exits. This automatically does also inherit
- * \ref require_io_context.
- *
- * You must add the following function to your implementation:
- *
- \code{.cpp}
-template<typename Executor>
-std::function<void(int, const std::error_code&)> on_exit_handler(Executor & exec)
-{
-    auto handler_ = this->handler;
-    return [handler_](int exit_code, const std::error_code & ec)
-           {
-                handler_(static_cast<int>(exit_code), ec);
-           };
-
-}
- \endcode
-
- The callback will be obtained by calling this function on setup and it will be
- invoked when the process exits.
-
- *
- * \warning Cannot be used with \ref boost::process::spawn
- */
-struct async_handler : handler, require_io_context
-{
-
-};
-
-///The posix executor type.
-/** This type represents the posix executor and can be used for overloading in a custom handler.
- * \note It is an alias for the implementation on posix, and a forward-declaration on windows.
- *
- * \tparam Sequence The used initializer-sequence, it is fulfills the boost.fusion [sequence](http://www.boost.org/doc/libs/master/libs/fusion/doc/html/fusion/sequence.html) concept.
-
-
-\xmlonly
-As information for extension development, here is the structure of the process launching (in pseudo-code and uml)
-<xi:include href="posix_pseudocode.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-<mediaobject>
-<caption>
-<para>The sequence if when no error occurs.</para>
-</caption>
-<imageobject>
-<imagedata fileref="boost_process/posix_success.svg"/>
-</imageobject>
-</mediaobject>
-
-<mediaobject>
-<caption>
-<para>The sequence if the execution fails.</para>
-</caption>
-<imageobject>
-<imagedata fileref="boost_process/posix_exec_err.svg"/>
-</imageobject>
-</mediaobject>
-
-<mediaobject>
-<caption>
-<para>The sequence if the fork fails.</para>
-</caption>
-<imageobject>
-<imagedata fileref="boost_process/posix_fork_err.svg"/>
-</imageobject>
-</mediaobject>
-
-\endxmlonly
-
-
-\note Error handling if execve fails is done through a pipe, unless \ref ignore_error is used.
-
- */
-template<typename Sequence>
-struct posix_executor
-{
-    ///A reference to the actual initializer-sequence
-     Sequence & seq;
-    ///A pointer to the name of the executable.
-     const char * exe      = nullptr;
-     ///A pointer to the argument-vector.
-     char *const* cmd_line = nullptr;
-     ///A pointer to the environment variables, as default it is set to [environ](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html)
-     char **env      = ::environ;
-     ///The pid of the process - it will be -1 before invoking [fork](http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html), and after forking either 0 for the new process or a positive value if in the current process. */
-     pid_t pid = -1;
-     ///This shared-pointer holds the exit code. It's done this way, so it can be shared between an `asio::io_context` and \ref child.
-     std::shared_ptr<std::atomic<int>> exit_status = std::make_shared<std::atomic<int>>(still_active);
-
-     ///This function returns a const reference to the error state of the executor.
-     const std::error_code & error() const;
-
-     ///This function can be used to report an error to the executor. This will be handled according to the configuration of the executor, i.e. it
-     /// might throw an exception. \note This is the required way to handle errors in initializers.
-     void set_error(const std::error_code &ec, const std::string &msg);
-     ///\overload void set_error(const std::error_code &ec, const std::string &msg);
-     void set_error(const std::error_code &ec, const char* msg);
-};
-
-///The windows executor type.
-/** This type represents the posix executor and can be used for overloading in a custom handler.
- *
- * \note It is an alias for the implementation on posix, and a forward-declaration on windows.
- * \tparam Sequence The used initializer-sequence, it is fulfills the boost.fusion [sequence](http://www.boost.org/doc/libs/master/libs/fusion/doc/html/fusion/sequence.html) concept.
- * \tparam Char The used char-type, either `char` or `wchar_t`.
- *
-
-\xmlonly
-As information for extension development, here is the structure of the process launching (in pseudo-code and uml)<xi:include href="windows_pseudocode.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<mediaobject>
-<caption>
-<para>The sequence for windows process creation.</para>
-</caption>
-<imageobject>
-<imagedata fileref="boost_process/windows_exec.svg"/>
-</imageobject>
-</mediaobject>
-\endxmlonly
-
- */
-
-template<typename Char, typename Sequence>
-struct windows_executor
-{
-    ///A reference to the actual initializer-sequence
-     Sequence & seq;
-
-     ///A pointer to the name of the executable. It's null by default.
-     const Char * exe      = nullptr;
-     ///A pointer to the argument-vector. Must be set by some initializer.
-     char  Char* cmd_line = nullptr;
-     ///A pointer to the environment variables. It's null by default.
-     char  Char* env      = nullptr;
-     ///A pointer to the working directory. It's null by default.
-     const Char * work_dir = nullptr;
-
-     ///A pointer to the process-attributes of type [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/en-us/library/windows/desktop/aa379560.aspx). It's null by default.
-     ::boost::detail::winapi::LPSECURITY_ATTRIBUTES_ proc_attrs   = nullptr;
-     ///A pointer to the thread-attributes of type [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/en-us/library/windows/desktop/aa379560.aspx). It' null by default.
-     ::boost::detail::winapi::LPSECURITY_ATTRIBUTES_ thread_attrs = nullptr;
-     ///A logical bool value setting whether handles shall be inherited or not.
-     ::boost::detail::winapi::BOOL_ inherit_handles = false;
-
-     ///The element holding the process-information after process creation. The type is [PROCESS_INFORMATION](https://msdn.microsoft.com/en-us/library/windows/desktop/ms684873.aspx)
-     ::boost::detail::winapi::PROCESS_INFORMATION_ proc_info{nullptr, nullptr, 0,0};
-
-
-     ///This shared-pointer holds the exit code. It's done this way, so it can be shared between an `asio::io_context` and \ref child.
-     std::shared_ptr<std::atomic<int>> exit_status = std::make_shared<std::atomic<int>>(still_active);
-
-     ///This function returns a const reference to the error state of the executor.
-     const std::error_code & error() const;
-
-     ///This function can be used to report an error to the executor. This will be handled according to the configuration of the executor, i.e. it
-     /// might throw an exception. \note This is the required way to handle errors in initializers.
-     void set_error(const std::error_code &ec, const std::string &msg);
-     ///\overload void set_error(const std::error_code &ec, const std::string &msg);
-     void set_error(const std::error_code &ec, const char* msg);
-
-     ///The creation flags of the process
-    ::boost::detail::winapi::DWORD_ creation_flags;
-    ///The type of the [startup-info](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686331.aspx), depending on the char-type.
-    typedef typename detail::startup_info<Char>::type    startup_info_t;
-    ///The type of the [extended startup-info](https://msdn.microsoft.com/de-de/library/windows/desktop/ms686329.aspx), depending the char-type; only defined with winapi-version equal or higher than 6.
-    typedef typename detail::startup_info_ex<Char>::type startup_info_ex_t;
-    ///This function switches the information, so that the extended structure is used. \note It's only defined with winapi-version equal or higher than 6.
-    void set_startup_info_ex();
-    ///This element is an instance or a reference (if \ref startup_info_ex exists) to the [startup-info](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686331.aspx) for the process.
-    startup_info_t startup_info;
-    ///This element is the instance of the  [extended startup-info](https://msdn.microsoft.com/de-de/library/windows/desktop/ms686329.aspx). It is only available with a winapi-version equal or highter than 6.
-    startup_info_ex_t  startup_info_ex;
-};
-
-
-
-#endif
-
-}
-}
-}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/extend.hpp>")
+#include <boost/process/v1/extend.hpp>
diff --git a/inst/include/boost/process/filesystem.hpp b/inst/include/boost/process/filesystem.hpp
index 4e1c12e84..bb42d8e92 100644
--- a/inst/include/boost/process/filesystem.hpp
+++ b/inst/include/boost/process/filesystem.hpp
@@ -1,28 +1,9 @@
-// Copyright (c) 2021 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_FILESYSTEM_HPP
-#define BOOST_PROCESS_FILESYSTEM_HPP
 
-#ifdef BOOST_PROCESS_USE_STD_FS
-#include <filesystem>
-#else
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
-#endif
 
-namespace boost
-{
-namespace process
-{
-#ifdef BOOST_PROCESS_USE_STD_FS
-namespace filesystem = std::filesystem;
-#else
-namespace filesystem = boost::filesystem;
-#endif
-
-}
-}
-
-#endif //BOOST_PROCESS_FILESYSTEM_HPP
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/filesystem.hpp>")
+#include <boost/process/v1/filesystem.hpp>
diff --git a/inst/include/boost/process/group.hpp b/inst/include/boost/process/group.hpp
index 7487f86ff..f441adf99 100644
--- a/inst/include/boost/process/group.hpp
+++ b/inst/include/boost/process/group.hpp
@@ -1,233 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/**
- * \file boost/process/group.hpp
- *
- * Defines a group process class.
- * For additional information see the platform specific implementations:
- *
- *   - [windows - job object](https://msdn.microsoft.com/en-us/library/windows/desktop/ms684161.aspx)
- *   - [posix - process group](http://pubs.opengroup.org/onlinepubs/009695399/functions/setpgid.html)
- *
- */
-
-#ifndef BOOST_PROCESS_GROUP_HPP
-#define BOOST_PROCESS_GROUP_HPP
-
-#include <boost/process/detail/config.hpp>
-#include <boost/process/child.hpp>
-#include <chrono>
-#include <memory>
-
-#include <boost/none.hpp>
-#include <atomic>
-
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/group_handle.hpp>
-#include <boost/process/detail/posix/group_ref.hpp>
-#include <boost/process/detail/posix/wait_group.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/group_handle.hpp>
-#include <boost/process/detail/windows/group_ref.hpp>
-#include <boost/process/detail/windows/wait_group.hpp>
-#endif
-
-namespace boost {
-
-namespace process {
-
-namespace detail {
-    struct group_builder;
-}
-
-/**
- * Represents a process group.
- *
- * Groups are movable but non-copyable. The destructor
- * automatically closes handles to the group process.
- *
- * The group will have the same interface as std::thread.
- *
- * \note If the destructor is called without a previous detach or wait, the group will be terminated.
- *
- * \attention If a default-constructed group is used before being used in a process launch, the behaviour is undefined.
- *
- * \attention Waiting for groups is currently broken on windows and will most likely result in a dead-lock.
- */
-class group
-{
-    ::boost::process::detail::api::group_handle _group_handle;
-    bool _attached = true;
-public:
-    typedef ::boost::process::detail::api::group_handle group_handle;
-    ///Native representation of the handle.
-    typedef group_handle::handle_t native_handle_t;
-    explicit group(group_handle &&ch) : _group_handle(std::move(ch)) {}
-    ///Construct the group from a native_handle
-    explicit group(native_handle_t & handle) : _group_handle(handle) {};
-    group(const group&) = delete;
-    ///Move constructor
-    group(group && lhs)
-        : _group_handle(std::move(lhs._group_handle)),
-          _attached (lhs._attached)
-    {
-        lhs._attached = false;
-    }
-    ///Default constructor
-    group() = default;
-    group& operator=(const group&) = delete;
-    ///Move assign
-    group& operator=(group && lhs)
-    {
-        _group_handle= std::move(lhs._group_handle);
-        _attached    = lhs._attached;
-
-        return *this;
-    };
-
-    ///Detach the group
-    void detach() {_attached = false; }
-
-    /** Join the child. This just calls wait, but that way the naming is similar to std::thread */
-    void join() {wait();}
-    /** Check if the child is joinable. */
-    bool joinable() {return _attached;}
-
-    /** Destructor
-     *
-     * \note If the destructor is called without a previous detach or wait, the group will be terminated.
-     *
-     */
-    ~group()
-    {
-        std::error_code ec;
-        if ( _attached && valid())
-            terminate(ec);
-    }
-
-    ///Obtain the native handle of the group.
-    native_handle_t native_handle() const { return _group_handle.handle(); }
-
-    ///Wait for the process group to exit.
-    void wait()
-    {
-        boost::process::detail::api::wait(_group_handle);
-    }
-    ///\overload void wait()
-    void wait(std::error_code & ec) noexcept
-    {
-        boost::process::detail::api::wait(_group_handle, ec);
-    }
-#if !defined(BOOST_PROCESS_NO_DEPRECATED)
-    /** Wait for the process group to exit for period of time.
-      *  \return True if all child processes exited while waiting.*/
-    template< class Rep, class Period >
-    BOOST_DEPRECATED("wait_for is unreliable")
-    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time)
-    {
-        return boost::process::detail::api::wait_for(_group_handle, rel_time);
-    }
-
-    /** \overload bool wait_for(const std::chrono::duration<Rep, Period>& timeout_time ) */
-    template< class Rep, class Period >
-    BOOST_DEPRECATED("wait_for is unreliable")
-    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time, std::error_code & ec) noexcept
-    {
-        return boost::process::detail::api::wait_for(_group_handle, rel_time, ec);
-    }
-
-    /** Wait for the process group to exit until a point in time.
-      *  \return True if all child processes exited while waiting.*/
-    template< class Clock, class Duration >
-    BOOST_DEPRECATED("wait_until is unreliable")
-    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time )
-    {
-        return boost::process::detail::api::wait_until(_group_handle, timeout_time);
-    }
-    /** \overload bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time ) */
-    template< class Clock, class Duration >
-    BOOST_DEPRECATED("wait_until is unreliable")
-    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time, std::error_code & ec) noexcept
-    {
-        return boost::process::detail::api::wait_until(_group_handle, timeout_time, ec);
-    }
-#endif
-    ///Check if the group has a valid handle.
-    bool valid() const
-    {
-        return _group_handle.valid();
-    }
-    ///Convenience to call valid.
-    explicit operator bool() const {return valid();}
-
-    ///Terminate the process group, i.e. all processes in the group
-    void terminate()
-    {
-        ::boost::process::detail::api::terminate(_group_handle);
-    }
-    ///\overload void terminate()
-    void terminate(std::error_code & ec) noexcept
-    {
-        ::boost::process::detail::api::terminate(_group_handle, ec);
-    }
-
-    ///Assign a child process to the group
-    void add(const child &c)
-    {
-        _group_handle.add(c.native_handle());
-    }
-    ///\overload void assign(const child & c)
-    void add(const child &c, std::error_code & ec) noexcept
-    {
-        _group_handle.add(c.native_handle(), ec);
-    }
-
-    ///Check if the child process is in the group
-    bool has(const child &c)
-    {
-        return _group_handle.has(c.native_handle());
-    }
-    ///\overload bool has(const child &)
-    bool has(const child &c, std::error_code & ec) noexcept
-    {
-        return _group_handle.has(c.native_handle(), ec);
-
-    }
-
-    friend struct detail::group_builder;
-};
-
-namespace detail
-{
-
-struct group_tag;
-struct group_builder
-{
-    group * group_p;
-
-    void operator()(group & grp) {this->group_p = &grp;};
-
-    typedef api::group_ref result_type;
-    api::group_ref get_initializer() {return api::group_ref (group_p->_group_handle);};
-};
-
-template<>
-struct initializer_tag<group>
-{
-    typedef group_tag type;
-};
-
-template<>
-struct initializer_builder<group_tag>
-{
-    typedef group_builder type;
-};
-
-}
-}}
-#endif
 
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/group.hpp>")
+#include <boost/process/v1/group.hpp>
diff --git a/inst/include/boost/process/handles.hpp b/inst/include/boost/process/handles.hpp
index cc65940dc..82a502109 100644
--- a/inst/include/boost/process/handles.hpp
+++ b/inst/include/boost/process/handles.hpp
@@ -1,107 +1,9 @@
-// Copyright (c) 2019 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_HANDLES_HPP_
-#define BOOST_PROCESS_HANDLES_HPP_
 
-/**
- * \file boost/process/handles.hpp
- *
- * Defines functions to obtain handles of the current process and limit the amount for inherited ones.
- */
-
-#include <boost/process/detail/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/handles.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/handles.hpp>
-#endif
-
-#include <boost/process/detail/used_handles.hpp>
-
-
-namespace boost { namespace this_process
-{
-
-///The native type for handles
-using native_handle_type = ::boost::process::detail::api::native_handle_type;
-
-/**
- * Get a snapshot of all handles of the process (i.e. file descriptors on posix and handles on windows) of the current process.
- *
- * \note This function might not work on certain posix systems.
- *
- * \note On Windows version older than windows 8 this function will iterate all the system handles, meaning it might be quite slow.
- *
- * \warning This functionality is utterly prone to race conditions, since other threads might open or close handles.
- *
- * \return The list of all open handles of the current process
- */
-inline std::vector<native_handle_type> get_handles()
-{
-    return ::boost::process::detail::api::get_handles();
-}
-
-
-/** \overload std::vector<native_handle_type> get_handles() */
-inline std::vector<native_handle_type> get_handles(std::error_code &ec)
-{
-    return ::boost::process::detail::api::get_handles(ec);
-}
-
-/** Determines if a given handle is a a stream-handle, i.e. any handle that can be used with read and write functions.
- * Stream handles include pipes, regular files and sockets.
- *
- * \return Indicates if it's a stream handle.
- */
-inline bool is_stream_handle(native_handle_type handle)
-{
-    return ::boost::process::detail::api::is_stream_handle(handle);
-}
-
-
-/** \overload bool is_stream_handle(native_handle_type handle) */
-inline bool is_stream_handle(native_handle_type handle, std::error_code &ec)
-{
-    return ::boost::process::detail::api::is_stream_handle(handle, ec);
-}
-
-}
-namespace process
-{
-
-namespace detail
-{
-
-using limit_handles_ = ::boost::process::detail::api::limit_handles_;
-
-
-}
-
-/**
- * The limit_handles property sets all properties to be inherited only explicitly. It closes all unused file-descriptors on posix after the fork and
- * removes the inherit flags on windows.
- *
- * \note This is executed after the fork on posix.
- *
- * \code{.cpp}
- * system("gcc", limit_handles);
- * \endcode
- *
- * Since limit also closes the standard handles unless they are explicitly redirected they can be ignored by `limit_handles` in the following way.
- *
- * \code{.cpp}
- * system("gcc", limit_handles.allowStd())
- * \endcode
- *
-*/
-const static ::boost::process::detail::api::limit_handles_ limit_handles;
-
-
-}
-}
-
-#endif //BOOST_PROCESS_HANDLES_HPP_
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/handles.hpp>")
+#include <boost/process/v1/handles.hpp>
diff --git a/inst/include/boost/process/io.hpp b/inst/include/boost/process/io.hpp
index 8238de686..665354597 100644
--- a/inst/include/boost/process/io.hpp
+++ b/inst/include/boost/process/io.hpp
@@ -1,551 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_IO_HPP_
-#define BOOST_PROCESS_IO_HPP_
 
-#include <iosfwd>
-#include <cstdio>
-#include <functional>
-#include <utility>
-#include <boost/process/detail/config.hpp>
-#include <boost/process/pipe.hpp>
-
-#include <future>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/asio_fwd.hpp>
-#include <boost/process/detail/posix/close_in.hpp>
-#include <boost/process/detail/posix/close_out.hpp>
-#include <boost/process/detail/posix/null_in.hpp>
-#include <boost/process/detail/posix/null_out.hpp>
-#include <boost/process/detail/posix/file_in.hpp>
-#include <boost/process/detail/posix/file_out.hpp>
-#include <boost/process/detail/posix/pipe_in.hpp>
-#include <boost/process/detail/posix/pipe_out.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/asio_fwd.hpp>
-#include <boost/process/detail/windows/close_in.hpp>
-#include <boost/process/detail/windows/close_out.hpp>
-#include <boost/process/detail/windows/null_in.hpp>
-#include <boost/process/detail/windows/null_out.hpp>
-#include <boost/process/detail/windows/file_in.hpp>
-#include <boost/process/detail/windows/file_out.hpp>
-#include <boost/process/detail/windows/pipe_in.hpp>
-#include <boost/process/detail/windows/pipe_out.hpp>
-#endif
-
-/** \file boost/process/io.hpp
- *
- *    Header which provides the io properties. It provides the following properties:
- *
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::close">close</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::null">null</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::std_in">std_in</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::std_out">std_out</globalname>;
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::std_err">std_err</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
-
-\par File I/O
-
-The library allows full redirection of streams to files as shown below.
-
-\code{.cpp}
-boost::process::filesystem::path log    = "my_log_file.txt";
-boost::process::filesystem::path input  = "input.txt";
-boost::process::filesystem::path output = "output.txt";
-system("my_prog", std_out>output, std_in<input, std_err>log);
-\endcode
-
-\par Synchronous Pipe I/O
-
-Another way is to communicate through pipes.
-
-\code{.cpp}
-pstream str;
-child c("my_prog", std_out > str);
-
-int i;
-str >> i;
-\endcode
-
-Note that the pipe may also be used between several processes, like this:
-
-\code{.cpp}
-pipe p;
-child c1("nm", "a.out", std_out>p);
-child c2("c++filt", std_in<p);
-\endcode
-
-\par Asynchronous I/O
-
-Utilizing `boost.asio` asynchronous I/O is provided.
-
-\code
-boost::asio::io_context ios;
-std::future<std::string> output;
-system("ls", std_out > output, ios);
-
-auto res = fut.get();
-\endcode
-
-\note `boost/process/async.hpp` must also be included for this to work.
-
-\par Closing
-
-Stream can be closed, so nothing can be read or written.
-
-\code{.cpp}
-system("foo", std_in.close());
-\endcode
-
-\par Null
-
-Streams can be redirected to null, which means, that written date will be
-discarded and read data will only contain `EOF`.
-
-\code{.cpp}
-system("b2", std_out > null);
-\endcode
-
- *
- */
-
-namespace boost { namespace process { namespace detail {
-
-
-template<typename T> using is_streambuf    = typename std::is_same<T, boost::asio::streambuf>::type;
-template<typename T> using is_const_buffer =
-        std::integral_constant<bool,
-            std::is_same<   boost::asio::const_buffer, T>::value |
-            std::is_base_of<boost::asio::const_buffer, T>::value
-        >;
-template<typename T> using is_mutable_buffer =
-        std::integral_constant<bool,
-            std::is_same<   boost::asio::mutable_buffer, T>::value |
-            std::is_base_of<boost::asio::mutable_buffer, T>::value
-        >;
-
-
-struct null_t  {constexpr null_t() = default;};
-struct close_t;
-
-template<class>
-struct std_in_
-{
-    constexpr std_in_() = default;
-
-    api::close_in close() const {return api::close_in(); }
-    api::close_in operator=(const close_t &) const {return api::close_in();}
-    api::close_in operator<(const close_t &) const {return api::close_in();}
-
-    api::null_in null() const {return api::null_in();}
-    api::null_in operator=(const null_t &) const {return api::null_in();}
-    api::null_in operator<(const null_t &) const {return api::null_in();}
-
-    api::file_in operator=(const boost::process::filesystem::path &p) const {return p;}
-    api::file_in operator=(const std::string & p)            const {return p;}
-    api::file_in operator=(const std::wstring &p)            const {return p;}
-    api::file_in operator=(const char * p)                   const {return p;}
-    api::file_in operator=(const wchar_t * p)                const {return p;}
-
-    api::file_in operator<(const boost::process::filesystem::path &p) const {return p;}
-    api::file_in operator<(const std::string &p)             const {return p;}
-    api::file_in operator<(const std::wstring &p)            const {return p;}
-    api::file_in operator<(const char*p)                     const {return p;}
-    api::file_in operator<(const wchar_t * p)                const {return p;}
-
-    api::file_in operator=(FILE * f)                         const {return f;}
-    api::file_in operator<(FILE * f)                         const {return f;}
-
-    template<typename Char, typename Traits> api::pipe_in operator=(basic_pipe<Char, Traits> & p)      const {return p;}
-    template<typename Char, typename Traits> api::pipe_in operator<(basic_pipe<Char, Traits> & p)      const {return p;}
-    template<typename Char, typename Traits> api::pipe_in operator=(basic_opstream<Char, Traits> & p)  const {return p.pipe();}
-    template<typename Char, typename Traits> api::pipe_in operator<(basic_opstream<Char, Traits> & p)  const {return p.pipe();}
-    template<typename Char, typename Traits> api::pipe_in operator=(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
-    template<typename Char, typename Traits> api::pipe_in operator<(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
-
-    api::async_pipe_in operator=(async_pipe & p) const {return p;}
-    api::async_pipe_in operator<(async_pipe & p) const {return p;}
-
-    template<typename T, typename = typename std::enable_if<
-            is_const_buffer<T>::value || is_mutable_buffer<T>::value
-            >::type>
-    api::async_in_buffer<const T> operator=(const T & buf) const {return buf;}
-    template<typename T, typename = typename std::enable_if<is_streambuf<T>::value>::type >
-    api::async_in_buffer<T>       operator=(T       & buf) const {return buf;}
-
-    template<typename T, typename = typename std::enable_if<
-            is_const_buffer<T>::value || is_mutable_buffer<T>::value
-            >::type>
-    api::async_in_buffer<const T> operator<(const T & buf) const {return buf;}
-    template<typename T, typename = typename std::enable_if<is_streambuf<T>::value>::type >
-    api::async_in_buffer<T>       operator<(T       & buf) const {return buf;}
-
-};
-
-//-1 == empty.
-//1 == stdout
-//2 == stderr
-template<int p1, int p2 = -1>
-struct std_out_
-{
-    constexpr std_out_() = default;
-
-    api::close_out<p1,p2> close() const {return api::close_out<p1,p2>(); }
-    api::close_out<p1,p2> operator=(const close_t &) const {return api::close_out<p1,p2>();}
-    api::close_out<p1,p2> operator>(const close_t &) const {return api::close_out<p1,p2>();}
-
-    api::null_out<p1,p2> null() const {return api::null_out<p1,p2>();}
-    api::null_out<p1,p2> operator=(const null_t &) const {return api::null_out<p1,p2>();}
-    api::null_out<p1,p2> operator>(const null_t &) const {return api::null_out<p1,p2>();}
-
-    api::file_out<p1,p2> operator=(const boost::process::filesystem::path &p) const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator=(const std::string &p)             const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator=(const std::wstring &p)            const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator=(const char * p)                   const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator=(const wchar_t * p)                const {return api::file_out<p1,p2>(p);}
-
-    api::file_out<p1,p2> operator>(const boost::process::filesystem::path &p) const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator>(const std::string &p)             const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator>(const std::wstring &p)            const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator>(const char * p)                   const {return api::file_out<p1,p2>(p);}
-    api::file_out<p1,p2> operator>(const wchar_t * p)                const {return api::file_out<p1,p2>(p);}
-
-    api::file_out<p1,p2> operator=(FILE * f)  const {return f;}
-    api::file_out<p1,p2> operator>(FILE * f)  const {return f;}
-
-    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator=(basic_pipe<Char, Traits> & p)      const {return p;}
-    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator>(basic_pipe<Char, Traits> & p)      const {return p;}
-    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator=(basic_ipstream<Char, Traits> & p)  const {return p.pipe();}
-    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator>(basic_ipstream<Char, Traits> & p)  const {return p.pipe();}
-    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator=(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
-    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator>(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
-
-    api::async_pipe_out<p1, p2> operator=(async_pipe & p) const {return p;}
-    api::async_pipe_out<p1, p2> operator>(async_pipe & p) const {return p;}
-
-    api::async_out_buffer<p1, p2, const asio::mutable_buffer>     operator=(const asio::mutable_buffer & buf)     const {return buf;}
-    api::async_out_buffer<p1, p2, const asio::mutable_buffers_1> operator=(const asio::mutable_buffers_1 & buf) const {return buf;}
-    api::async_out_buffer<p1, p2, asio::streambuf>               operator=(asio::streambuf & os)                   const {return os ;}
-
-    api::async_out_buffer<p1, p2, const asio::mutable_buffer>     operator>(const asio::mutable_buffer & buf)     const {return buf;}
-    api::async_out_buffer<p1, p2, const asio::mutable_buffers_1> operator>(const asio::mutable_buffers_1 & buf) const {return buf;}
-    api::async_out_buffer<p1, p2, asio::streambuf>               operator>(asio::streambuf & os)                   const {return os ;}
-
-    api::async_out_future<p1,p2, std::string>       operator=(std::future<std::string> & fut)       const { return fut;}
-    api::async_out_future<p1,p2, std::string>       operator>(std::future<std::string> & fut)       const { return fut;}
-    api::async_out_future<p1,p2, std::vector<char>> operator=(std::future<std::vector<char>> & fut) const { return fut;}
-    api::async_out_future<p1,p2, std::vector<char>> operator>(std::future<std::vector<char>> & fut) const { return fut;}
-
-    template<int pin, typename = typename std::enable_if<
-            (((p1 == 1) && (pin == 2)) ||
-             ((p1 == 2) && (pin == 1)))
-             && (p2 == -1)>::type>
-    constexpr std_out_<1, 2> operator& (const std_out_<pin>&) const
-    {
-        return std_out_<1, 2> ();
-    }
-
-};
-
-struct close_t
-{
-    constexpr close_t() = default;
-    template<int T, int U>
-    api::close_out<T,U> operator()(std_out_<T,U>) {return api::close_out<T,U>();}
-};
-
-
-
-}
-///This constant is a utility to allow syntax like `std_out > close` for closing I/O streams.
-constexpr boost::process::detail::close_t close;
-///This constant is a utility to redirect streams to the null-device.
-constexpr boost::process::detail::null_t  null;
-
-/**
-This property allows to set the input stream for the child process.
-
-\section stdin_details Details
-
-\subsection stdin_file File Input
-
-The file I/O simple redirects the stream to a file, for which the possible types are
-
- - `boost::process::filesystem::path`
- - `std::basic_string<char_type>`
- - `const char_type*`
- - `FILE*`
-
-with `char_type` being either `char` or `wchar_t`.
-
-FILE* is explicitly added, so the process can easily redirect the output stream
-of the child to another output stream of the process. That is:
-
-\code{.cpp}
-system("ls", std_in < stdin);
-\endcode
-
-\warning If the launching and the child process use the input, this leads to undefined behaviour.
-
-A syntax like `system("ls", std_out > std::cerr)` is not possible, due to the C++
-implementation not providing access to the handle.
-
-The valid expressions for this property are
-
-\code{.cpp}
-std_in < file;
-std_in = file;
-\endcode
-
-\subsection stdin_pipe Pipe Input
-
-As explained in the corresponding section, the boost.process library provides a
-@ref boost::process::async_pipe "async_pipe" class which can be
-used to communicate with child processes.
-
-\note Technically the @ref boost::process::async_pipe "async_pipe"
-works synchronous here, since no asio implementation is used by the library here.
-The async-operation will then however not end if the process is finished, since
-the pipe remains open. You can use the async_close function with on_exit to fix that.
-
-Valid expressions with pipes are these:
-
-\code{.cpp}
-std_in < pipe;
-std_in = pipe;
-\endcode
-
-Where the valid types for `pipe` are the following:
-
- - `basic_pipe`
- - `async_pipe`
- - `basic_opstream`
- - `basic_pstream`
-
-Note that the pipe may also be used between several processes, like this:
-
-\code{.cpp}
-pipe p;
-child c1("nm", "a.out", std_out>p);
-child c2("c++filt", std_in<p);
-\endcode
-
-\subsection stdin_async_pipe Asynchronous Pipe Input
-
-Asynchronous Pipe I/O classifies communication which has automatically handling
-of the asynchronous operations by the process library. This means, that a pipe will be
-constructed, the async_read/-write will be automatically started, and that the
-end of the child process will also close the pipe.
-
-Valid types for pipe I/O are the following:
-
- - `boost::asio::const_buffer`   \xmlonly <footnote><para> Constructed with <code>boost::asio::buffer</code></para></footnote> \endxmlonly
- - `boost::asio::mutable_buffer` \xmlonly <footnote><para> Constructed with <code>boost::asio::buffer</code></para></footnote> \endxmlonly
- - `boost::asio::streambuf`
-
-Valid expressions with pipes are these:
-
-\code{.cpp}
-std_in < buffer;
-std_in = buffer;
-std_out > buffer;
-std_out = buffer;
-std_err > buffer;
-std_err = buffer;
-(std_out & std_err) > buffer;
-(std_out & std_err) = buffer;
-\endcode
-
-\note  It is also possible to get a future for std_in, by chaining another `std::future<void>` onto it,
-so you can wait for the input to be completed. It looks like this:
-\code{.cpp}
-std::future<void> fut;
-boost::asio::io_context ios;
-std::string data;
-child c("prog", std_in < buffer(data) >  fut, ios);
-fut.get();
-\endcode
-
-
-\note `boost::asio::buffer` is also available in the `boost::process` namespace.
-
-\warning This feature requires `boost/process/async.hpp` to be included and a reference to `boost::asio::io_context` to be passed to the launching function.
-
-
-\subsection stdin_close Close
-
-The input stream can be closed, so it cannot be read from. This will lead to an error when attempted.
-
-This can be achieved by the following syntax.
-
-\code{.cpp}
-std_in < close;
-std_in = close;
-std_in.close();
-\endcode
-
-\subsection stdin_null Null
-
-The input stream can be redirected to read from the null-device, which means that only `EOF` is read.
-
-The syntax to achieve that has the following variants:
-
-\code{.cpp}
-std_in < null;
-std_in = null;
-std_in.null();
-\endcode
-
-*/
-
-constexpr boost::process::detail::std_in_<void>   std_in;
-
-/**
-This property allows to set the output stream for the child process.
-
-\note The Semantic is the same as for \xmlonly <globalname alt="boost::process::std_err">std_err</globalname> \endxmlonly
-
-\note `std_err` and `std_out` can be combined into one stream, with the `operator &`, i.e. `std_out & std_err`.
-
-\section stdout_details Details
-
-\subsection stdout_file File Input
-
-The file I/O simple redirects the stream to a file, for which the possible types are
-
- - `boost::process::filesystem::path`
- - `std::basic_string<char_type>`
- - `const char_type*`
- - `FILE*`
-
-with `char_type` being either `char` or `wchar_t`.
-
-FILE* is explicitly added, so the process can easily redirect the output stream
-of the child to another output stream of the process. That is:
-
-\code{.cpp}
-system("ls", std_out < stdin);
-\endcode
-
-\warning If the launching and the child process use the input, this leads to undefined behaviour.
-
-A syntax like `system("ls", std_out > std::cerr)` is not possible, due to the C++
-implementation not providing access to the handle.
-
-The valid expressions for this property are
-
-\code{.cpp}
-std_out < file;
-std_out = file;
-\endcode
-
-\subsection stdout_pipe Pipe Output
-
-As explained in the corresponding section, the boost.process library provides a
-@ref boost::process::async_pipe "async_pipe" class which can be
-used to communicate with child processes.
-
-\note Technically the @ref boost::process::async_pipe "async_pipe"
-works like a synchronous pipe here, since no asio implementation is used by the library here.
-The asynchronous operation will then however not end if the process is finished, since
-the pipe remains open. You can use the async_close function with on_exit to fix that.
-
-Valid expressions with pipes are these:
-
-\code{.cpp}
-std_out > pipe;
-std_out = pipe;
-\endcode
-
-Where the valid types for `pipe` are the following:
-
- - `basic_pipe`
- - `async_pipe`
- - `basic_ipstream`
- - `basic_pstream`
-
-Note that the pipe may also be used between several processes, like this:
-
-\code{.cpp}
-pipe p;
-child c1("nm", "a.out", std_out>p);
-child c2("c++filt", std_in<p);
-\endcode
-
-\subsection stdout_async_pipe Asynchronous Pipe Output
-
-Asynchronous Pipe I/O classifies communication which has automatically handling
-of the async operations by the process library. This means, that a pipe will be
-constructed, the async_read/-write will be automatically started, and that the
-end of the child process will also close the pipe.
-
-Valid types for pipe I/O are the following:
-
- - `boost::asio::mutable_buffer` \xmlonly <footnote><para> Constructed with <code>boost::asio::buffer</code></para></footnote> \endxmlonly
- - `boost::asio::streambuf`
- - `std::future<std::vector<char>>`
- - `std::future<std::string>`
-
-Valid expressions with pipes are these:
-
-\code{.cpp}
-std_out > buffer;
-std_out = buffer;
-std_err > buffer;
-std_err = buffer;
-(std_out & std_err) > buffer;
-(std_out & std_err) = buffer;
-\endcode
-
-\note `boost::asio::buffer` is also available in the `boost::process` namespace.
-
-\warning This feature requires `boost/process/async.hpp` to be included and a reference to `boost::asio::io_context` to be passed to the launching function.
-
-
-\subsection stdout_close Close
-
-The out stream can be closed, so it cannot be write from.
-This will lead to an error when attempted.
-
-This can be achieved by the following syntax.
-
-\code{.cpp}
-std_out > close;
-std_out = close;
-std_out.close();
-\endcode
-
-\subsection stdout_null Null
-
-The output stream can be redirected to write to the null-device,
-which means that all output is discarded.
-
-The syntax to achieve that has the following variants:
-
-\code{.cpp}
-std_out > null;
-std_out = null;
-std_out.null();
-\endcode
-
-*/
-
-constexpr boost::process::detail::std_out_<1> std_out;
-/**This property allows setting the `stderr` stream. The semantic and syntax is the same as for
- * \xmlonly <globalname alt="boost::process::std_out">std_out</globalname> \endxmlonly .
- */
-constexpr boost::process::detail::std_out_<2> std_err;
-
-}}
-#endif /* INCLUDE_BOOST_PROCESS_IO_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/io.hpp>")
+#include <boost/process/v1/io.hpp>
diff --git a/inst/include/boost/process/locale.hpp b/inst/include/boost/process/locale.hpp
index fda911285..cd741c753 100644
--- a/inst/include/boost/process/locale.hpp
+++ b/inst/include/boost/process/locale.hpp
@@ -1,245 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
-// Copyright (c) 2008 Beman Dawes
+// Copyright (c) 2024 Klemens D. Morgenstern
+//
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_LOCALE_HPP_
-#define BOOST_PROCESS_LOCALE_HPP_
 
-#include <system_error>
-#include <boost/process/detail/config.hpp>
-
-#if defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/locale.hpp>
-# elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
-|| defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__)
-#include <codecvt>
-#endif
-
-#include <locale>
-
-namespace boost
-{
-namespace process
-{
-namespace detail
-{
-
-class codecvt_category_t : public std::error_category
-{
-public:
-    codecvt_category_t() = default;
-    const char* name() const noexcept override {return "codecvt";}
-    std::string message(int ev) const override
-    {
-        std::string str;
-        switch (ev)
-        {
-        case std::codecvt_base::ok:
-            str = "ok";
-            break;
-        case std::codecvt_base::partial:
-            str = "partial";
-            break;
-        case std::codecvt_base::error:
-            str = "error";
-            break;
-        case std::codecvt_base::noconv:
-            str = "noconv";
-            break;
-        default:
-            str = "unknown error";
-        }
-        return str;
-    }
-};
-
-}
-
-///Internally used error cateory for code conversion.
-inline const std::error_category& codecvt_category()
-{
-    static const ::boost::process::detail::codecvt_category_t cat;
-    return cat;
-}
-
-namespace detail
-{
-//copied from boost.filesystem
-inline std::locale default_locale()
-{
-# if defined(BOOST_WINDOWS_API)
-    std::locale global_loc = std::locale();
-    return std::locale(global_loc, new boost::process::detail::windows::windows_file_codecvt);
-# elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
-|| defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__)
-    std::locale global_loc = std::locale();
-    return std::locale(global_loc, new std::codecvt_utf8<wchar_t>);
-# else  // Other POSIX
-    // Return a default locale object.
-    return std::locale();
-# endif
-}
-
-inline std::locale& process_locale()
-{
-    static std::locale loc(default_locale());
-    return loc;
-}
-
-}
-
-///The internally used type for code conversion.
-typedef std::codecvt<wchar_t, char, std::mbstate_t> codecvt_type;
-
-///Get a reference to the currently used code converter.
-inline const codecvt_type& codecvt()
-{
-  return std::use_facet<std::codecvt<wchar_t, char, std::mbstate_t>>(
-                detail::process_locale());
-}
-
-///Set the locale of the library.
-inline std::locale imbue(const std::locale& loc)
-{
-  std::locale temp(detail::process_locale());
-  detail::process_locale() = loc;
-  return temp;
-}
-
-
-namespace detail
-{
-
-inline std::size_t convert(const char* from,
-                    const char* from_end,
-                    wchar_t* to, wchar_t* to_end,
-                    const ::boost::process::codecvt_type & cvt =
-                                 ::boost::process::codecvt())
-{
-    std::mbstate_t state  = std::mbstate_t();  // perhaps unneeded, but cuts bug reports
-    const char* from_next;
-    wchar_t* to_next;
-
-    auto res = cvt.in(state, from, from_end, from_next,
-                 to, to_end, to_next);
-
-    if (res != std::codecvt_base::ok)
-         throw process_error(res, ::boost::process::codecvt_category(),
-             "boost::process codecvt to wchar_t");
-
-
-    return to_next - to;
-
-}
-
-inline std::size_t convert(const wchar_t* from,
-                    const wchar_t* from_end,
-                    char* to, char* to_end,
-                    const ::boost::process::codecvt_type & cvt =
-                                 ::boost::process::codecvt())
-{
-    std::mbstate_t state  = std::mbstate_t();  // perhaps unneeded, but cuts bug reports
-    const wchar_t* from_next;
-    char* to_next;
-
-    std::codecvt_base::result res;
-
-    if ((res=cvt.out(state, from, from_end, from_next,
-           to, to_end, to_next)) != std::codecvt_base::ok)
-               throw process_error(res, ::boost::process::codecvt_category(),
-                   "boost::process codecvt to char");
-
-    return to_next - to;
-}
-
-inline std::wstring convert(const std::string & st,
-                            const ::boost::process::codecvt_type & cvt =
-                                ::boost::process::codecvt())
-{
-    std::wstring out(st.size() + 10, ' '); //just to be sure
-    auto sz = convert(st.c_str(), st.c_str() + st.size(),
-                      &out.front(), &out.back(), cvt);
-
-    out.resize(sz);
-    return out;
-}
-
-inline std::string convert(const std::wstring & st,
-                           const ::boost::process::codecvt_type & cvt =
-                                ::boost::process::codecvt())
-{
-    std::string out(st.size() * 2, ' '); //just to be sure
-    auto sz = convert(st.c_str(), st.c_str() + st.size(),
-                      &out.front(), &out.back(), cvt);
-
-    out.resize(sz);
-    return out;
-}
-
-inline std::vector<wchar_t> convert(const std::vector<char> & st,
-                                    const ::boost::process::codecvt_type & cvt =
-                                        ::boost::process::codecvt())
-{
-    std::vector<wchar_t> out(st.size() + 10); //just to be sure
-    auto sz = convert(st.data(), st.data() + st.size(),
-                      &out.front(), &out.back(), cvt);
-
-    out.resize(sz);
-    return out;
-}
-
-inline std::vector<char> convert(const std::vector<wchar_t> & st,
-                                 const ::boost::process::codecvt_type & cvt =
-                                     ::boost::process::codecvt())
-{
-    std::vector<char> out(st.size() * 2); //just to be sure
-    auto sz = convert(st.data(), st.data() + st.size(),
-                      &out.front(), &out.back(), cvt);
-
-    out.resize(sz);
-    return out;
-}
-
-
-inline std::wstring convert(const char *begin, const char* end,
-                            const ::boost::process::codecvt_type & cvt =
-                                ::boost::process::codecvt())
-{
-    auto size = end-begin;
-    std::wstring out(size + 10, ' '); //just to be sure
-    using namespace std;
-    auto sz = convert(begin, end,
-                      &out.front(), &out.back(), cvt);
-    out.resize(sz);
-    return out;
-}
-
-inline std::string convert(const wchar_t  * begin, const wchar_t *end,
-                           const ::boost::process::codecvt_type & cvt =
-                                ::boost::process::codecvt())
-{
-    auto size = end-begin;
-
-    std::string out(size * 2, ' '); //just to be sure
-    auto sz = convert(begin, end ,
-                      &out.front(), &out.back(), cvt);
-
-    out.resize(sz);
-    return out;
-}
-
-
-
-
-}
-
-
-
-}
-}
-
-
-
-
-#endif /* BOOST_PROCESS_LOCALE_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/locale.hpp>")
+#include <boost/process/v1/locale.hpp>
diff --git a/inst/include/boost/process/pipe.hpp b/inst/include/boost/process/pipe.hpp
index e20725ed2..0cf85bc9b 100644
--- a/inst/include/boost/process/pipe.hpp
+++ b/inst/include/boost/process/pipe.hpp
@@ -1,631 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_PROCESS_PIPE_HPP
-#define BOOST_PROCESS_PIPE_HPP
-
-#include <boost/config.hpp>
-#include <boost/process/detail/config.hpp>
-#include <streambuf>
-#include <istream>
-#include <ostream>
-#include <vector>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/basic_pipe.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/basic_pipe.hpp>
-#endif
-
-namespace boost { namespace process {
-
-using ::boost::process::detail::api::basic_pipe;
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/** Class implementation of a pipe.
- *
- */
-template<class CharT, class Traits = std::char_traits<CharT>>
-class basic_pipe
-{
-public:
-    typedef CharT                      char_type  ;
-    typedef          Traits            traits_type;
-    typedef typename Traits::int_type  int_type   ;
-    typedef typename Traits::pos_type  pos_type   ;
-    typedef typename Traits::off_type  off_type   ;
-    typedef ::boost::detail::winapi::HANDLE_ native_handle;
-
-    /// Default construct the pipe. Will be opened.
-    basic_pipe();
-
-    ///Construct a named pipe.
-    inline explicit basic_pipe(const std::string & name);
-    /** Copy construct the pipe.
-     *  \note Duplicated the handles.
-     */
-    inline basic_pipe(const basic_pipe& p);
-    /** Move construct the pipe. */
-    basic_pipe(basic_pipe&& lhs);
-    /** Copy assign the pipe.
-     *  \note Duplicated the handles.
-     */
-    inline basic_pipe& operator=(const basic_pipe& p);
-    /** Move assign the pipe. */
-    basic_pipe& operator=(basic_pipe&& lhs);
-    /** Destructor closes the handles. */
-    ~basic_pipe();
-    /** Get the native handle of the source. */
-    native_handle native_source() const;
-    /** Get the native handle of the sink. */
-    native_handle native_sink  () const;
-
-    /** Assign a new value to the source */
-    void assign_source(native_handle h);
-    /** Assign a new value to the sink */
-    void assign_sink  (native_handle h);
-
-
-    ///Write data to the pipe.
-    int_type write(const char_type * data, int_type count);
-    ///Read data from the pipe.
-    int_type read(char_type * data, int_type count);
-    ///Check if the pipe is open.
-    bool is_open();
-    ///Close the pipe
-    void close();
-};
-
-#endif
-
-
-
-typedef basic_pipe<char>     pipe;
-typedef basic_pipe<wchar_t> wpipe;
-
-
-/** Implementation of the stream buffer for a pipe.
- */
-template<
-    class CharT,
-    class Traits = std::char_traits<CharT>
->
-struct basic_pipebuf : std::basic_streambuf<CharT, Traits>
-{
-    typedef basic_pipe<CharT, Traits> pipe_type;
-
-    typedef           CharT            char_type  ;
-    typedef           Traits           traits_type;
-    typedef  typename Traits::int_type int_type   ;
-    typedef  typename Traits::pos_type pos_type   ;
-    typedef  typename Traits::off_type off_type   ;
-
-    constexpr static int default_buffer_size = BOOST_PROCESS_PIPE_SIZE;
-
-    ///Default constructor, will also construct the pipe.
-    basic_pipebuf() : _write(default_buffer_size), _read(default_buffer_size)
-    {
-        this->setg(_read.data(),  _read.data()+ 128,  _read.data() + 128);
-        this->setp(_write.data(), _write.data() + _write.size());
-    }
-    ///Copy Constructor.
-    basic_pipebuf(const basic_pipebuf & ) = default;
-    ///Move Constructor
-    basic_pipebuf(basic_pipebuf && ) = default;
-
-    ///Destructor -> writes the frest of the data
-    ~basic_pipebuf()
-    {
-        try 
-        {
-            if (basic_pipebuf::is_open())
-                basic_pipebuf::overflow(Traits::eof());
-        }
-        catch (process_error & )
-        {
-        }
-    }
-
-    ///Move construct from a pipe.
-    basic_pipebuf(pipe_type && p) : _pipe(std::move(p)),
-                                    _write(default_buffer_size),
-                                    _read(default_buffer_size)
-    {
-        this->setg(_read.data(),  _read.data()+ 128,  _read.data() + 128);
-        this->setp(_write.data(), _write.data() + _write.size());
-    }
-    ///Construct from a pipe.
-    basic_pipebuf(const pipe_type & p) : _pipe(p),
-                                        _write(default_buffer_size),
-                                        _read(default_buffer_size)
-    {
-        this->setg(_read.data(),  _read.data()+ 128,  _read.data() + 128);
-        this->setp(_write.data(), _write.data() + _write.size());
-    }
-    ///Copy assign.
-    basic_pipebuf& operator=(const basic_pipebuf & ) = delete;
-    ///Move assign.
-    basic_pipebuf& operator=(basic_pipebuf && ) = default;
-    ///Move assign a pipe.
-    basic_pipebuf& operator=(pipe_type && p)
-    {
-        _pipe = std::move(p);
-        return *this;
-    }
-    ///Copy assign a pipe.
-    basic_pipebuf& operator=(const pipe_type & p)
-    {
-        _pipe = p;
-        return *this;
-    }
-    ///Writes characters to the associated output sequence from the put area
-    int_type overflow(int_type ch = traits_type::eof()) override
-    {
-        if (_pipe.is_open() && (ch != traits_type::eof()))
-        {
-            if (this->pptr() == this->epptr())
-            {
-                bool wr = this->_write_impl();
-                if (wr)
-                {
-                    *this->pptr() = ch;
-                    this->pbump(1);
-                    return ch;
-                }
-            }
-            else
-            {
-                *this->pptr() = ch;
-                this->pbump(1);
-                if (this->_write_impl())
-                    return ch;
-            }
-        }
-        else if (ch == traits_type::eof())
-           this->sync();
-
-        return traits_type::eof();
-    }
-    ///Synchronizes the buffers with the associated character sequence
-    int sync() override { return this->_write_impl() ? 0 : -1; }
-
-    ///Reads characters from the associated input sequence to the get area
-    int_type underflow() override
-    {
-        if (!_pipe.is_open())
-            return traits_type::eof();
-
-        if (this->egptr() == &_read.back()) //ok, so we're at the end of the buffer
-            this->setg(_read.data(),  _read.data()+ 10,  _read.data() + 10);
-
-
-        auto len = &_read.back() - this->egptr() ;
-        auto res = _pipe.read(
-                        this->egptr(),
-                        static_cast<typename pipe_type::int_type>(len));
-        if (res == 0)
-            return traits_type::eof();
-
-        this->setg(this->eback(), this->gptr(), this->egptr() + res);
-        auto val = *this->gptr();
-
-        return traits_type::to_int_type(val);
-    }
-
-
-    ///Set the pipe of the streambuf.
-    void pipe(pipe_type&& p)      {_pipe = std::move(p); }
-    ///Set the pipe of the streambuf.
-    void pipe(const pipe_type& p) {_pipe = p; }
-    ///Get a reference to the pipe.
-    pipe_type &      pipe() &       {return _pipe;}
-    ///Get a const reference to the pipe.
-    const pipe_type &pipe() const & {return _pipe;}
-    ///Get a rvalue reference to the pipe. Qualified as rvalue.
-    pipe_type &&     pipe()  &&     {return std::move(_pipe);}
-
-    ///Check if the pipe is open
-    bool is_open() const {return _pipe.is_open(); }
-
-    ///Open a new pipe
-    basic_pipebuf<CharT, Traits>* open()
-    {
-        if (is_open())
-            return nullptr;
-        _pipe = pipe();
-        return this;
-    }
-
-    ///Open a new named pipe
-    basic_pipebuf<CharT, Traits>* open(const std::string & name)
-    {
-        if (is_open())
-            return nullptr;
-        _pipe = pipe(name);
-        return this;
-    }
-
-    ///Flush the buffer & close the pipe
-    basic_pipebuf<CharT, Traits>* close()
-    {
-        if (!is_open())
-            return nullptr;
-        overflow(Traits::eof());
-        return this;
-    }
-private:
-    pipe_type _pipe;
-    std::vector<char_type> _write;
-    std::vector<char_type> _read;
-
-    bool _write_impl()
-    {
-        if (!_pipe.is_open())
-            return false;
-
-        auto base = this->pbase();
-
-        if (base == this->pptr())
-            return true;
-
-        std::ptrdiff_t wrt = _pipe.write(base,
-                static_cast<typename pipe_type::int_type>(this->pptr() - base));
-
-        std::ptrdiff_t diff = this->pptr() - base;
-
-        if (wrt < diff)
-            std::move(base + wrt, base + diff, base);
-        else if (wrt == 0) //broken pipe
-            return false;
-
-        this->pbump(static_cast<int>(-wrt));
-
-        return true;
-    }
-};
-
-typedef basic_pipebuf<char>     pipebuf;
-typedef basic_pipebuf<wchar_t> wpipebuf;
-
-/** Implementation of a reading pipe stream.
- *
- */
-template<
-    class CharT,
-    class Traits = std::char_traits<CharT>
->
-class basic_ipstream : public std::basic_istream<CharT, Traits>
-{
-    mutable basic_pipebuf<CharT, Traits> _buf;
-public:
-
-    typedef basic_pipe<CharT, Traits> pipe_type;
-
-    typedef           CharT            char_type  ;
-    typedef           Traits           traits_type;
-    typedef  typename Traits::int_type int_type   ;
-    typedef  typename Traits::pos_type pos_type   ;
-    typedef  typename Traits::off_type off_type   ;
-
-    ///Get access to the underlying stream_buf
-    basic_pipebuf<CharT, Traits>* rdbuf() const {return &_buf;};
-
-    ///Default constructor.
-    basic_ipstream() : std::basic_istream<CharT, Traits>(nullptr)
-    {
-        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy constructor.
-    basic_ipstream(const basic_ipstream & ) = delete;
-    ///Move constructor.
-    basic_ipstream(basic_ipstream && lhs) : std::basic_istream<CharT, Traits>(nullptr), _buf(std::move(lhs._buf))
-    {
-        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
-    }
-
-    ///Move construct from a pipe.
-    basic_ipstream(pipe_type && p)      : std::basic_istream<CharT, Traits>(nullptr), _buf(std::move(p))
-    {
-        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
-    }
-
-    ///Copy construct from a pipe.
-    basic_ipstream(const pipe_type & p) : std::basic_istream<CharT, Traits>(nullptr), _buf(p)
-    {
-        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
-    }
-
-    ///Copy assignment.
-    basic_ipstream& operator=(const basic_ipstream & ) = delete;
-    ///Move assignment
-    basic_ipstream& operator=(basic_ipstream && lhs)
-    {
-        std::basic_istream<CharT, Traits>::operator=(std::move(lhs));
-        _buf = std::move(lhs._buf);
-        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
-        return *this;
-    };
-    ///Move assignment of a pipe.
-    basic_ipstream& operator=(pipe_type && p)
-    {
-        _buf = std::move(p);
-        return *this;
-    }
-    ///Copy assignment of a pipe.
-    basic_ipstream& operator=(const pipe_type & p)
-    {
-        _buf = p;
-        return *this;
-    }
-    ///Set the pipe of the streambuf.
-    void pipe(pipe_type&& p)      {_buf.pipe(std::move(p)); }
-    ///Set the pipe of the streambuf.
-    void pipe(const pipe_type& p) {_buf.pipe(p); }
-    ///Get a reference to the pipe.
-    pipe_type &      pipe() &       {return _buf.pipe();}
-    ///Get a const reference to the pipe.
-    const pipe_type &pipe() const & {return _buf.pipe();}
-    ///Get a rvalue reference to the pipe. Qualified as rvalue.
-    pipe_type &&     pipe()  &&     {return std::move(_buf).pipe();}
-    ///Check if the pipe is open
-    bool is_open() const {return _buf.is_open();}
-
-    ///Open a new pipe
-    void open()
-    {
-        if (_buf.open() == nullptr)
-            this->setstate(std::ios_base::failbit);
-        else
-            this->clear();
-    }
-
-    ///Open a new named pipe
-    void open(const std::string & name)
-    {
-        if (_buf.open() == nullptr)
-            this->setstate(std::ios_base::failbit);
-        else
-            this->clear();
-    }
-
-    ///Flush the buffer & close the pipe
-    void close()
-    {
-        if (_buf.close() == nullptr)
-            this->setstate(std::ios_base::failbit);
-    }
-};
-
-typedef basic_ipstream<char>     ipstream;
-typedef basic_ipstream<wchar_t> wipstream;
-
-/** Implementation of a write pipe stream.
- *
- */
-template<
-    class CharT,
-    class Traits = std::char_traits<CharT>
->
-class basic_opstream : public std::basic_ostream<CharT, Traits>
-{
-    mutable basic_pipebuf<CharT, Traits> _buf;
-public:
-    typedef basic_pipe<CharT, Traits> pipe_type;
-
-    typedef           CharT            char_type  ;
-    typedef           Traits           traits_type;
-    typedef  typename Traits::int_type int_type   ;
-    typedef  typename Traits::pos_type pos_type   ;
-    typedef  typename Traits::off_type off_type   ;
-
-
-    ///Get access to the underlying stream_buf
-    basic_pipebuf<CharT, Traits>* rdbuf() const {return &_buf;};
-
-    ///Default constructor.
-    basic_opstream() : std::basic_ostream<CharT, Traits>(nullptr)
-    {
-        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy constructor.
-    basic_opstream(const basic_opstream & ) = delete;
-    ///Move constructor.
-    basic_opstream(basic_opstream && lhs) : std::basic_ostream<CharT, Traits>(nullptr), _buf(std::move(lhs._buf))
-    {
-        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
-    }
-    ///Move construct from a pipe.
-    basic_opstream(pipe_type && p)      : std::basic_ostream<CharT, Traits>(nullptr), _buf(std::move(p))
-    {
-        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy construct from a pipe.
-    basic_opstream(const pipe_type & p) : std::basic_ostream<CharT, Traits>(nullptr), _buf(p)
-    {
-        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy assignment.
-    basic_opstream& operator=(const basic_opstream & ) = delete;
-    ///Move assignment
-    basic_opstream& operator=(basic_opstream && lhs)
-    {
-        std::basic_ostream<CharT, Traits>::operator=(std::move(lhs));
-        _buf = std::move(lhs._buf);
-        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
-        return *this;
-    };
-
-    ///Move assignment of a pipe.
-    basic_opstream& operator=(pipe_type && p)
-    {
-        _buf = std::move(p);
-        return *this;
-    }
-    ///Copy assignment of a pipe.
-    basic_opstream& operator=(const pipe_type & p)
-    {
-        _buf = p;
-        return *this;
-    }
-    ///Set the pipe of the streambuf.
-    void pipe(pipe_type&& p)      {_buf.pipe(std::move(p)); }
-    ///Set the pipe of the streambuf.
-    void pipe(const pipe_type& p) {_buf.pipe(p); }
-    ///Get a reference to the pipe.
-    pipe_type &      pipe() &       {return _buf.pipe();}
-    ///Get a const reference to the pipe.
-    const pipe_type &pipe() const & {return _buf.pipe();}
-    ///Get a rvalue reference to the pipe. Qualified as rvalue.
-    pipe_type &&     pipe()  &&     {return std::move(_buf).pipe();}
-
-    ///Open a new pipe
-    void open()
-    {
-        if (_buf.open() == nullptr)
-            this->setstate(std::ios_base::failbit);
-        else
-            this->clear();
-    }
-
-    ///Open a new named pipe
-    void open(const std::string & name)
-    {
-        if (_buf.open() == nullptr)
-            this->setstate(std::ios_base::failbit);
-        else
-            this->clear();
-    }
-
-    ///Flush the buffer & close the pipe
-    void close()
-    {
-        if (_buf.close() == nullptr)
-            this->setstate(std::ios_base::failbit);
-    }
-};
-
-typedef basic_opstream<char>     opstream;
-typedef basic_opstream<wchar_t> wopstream;
-
-
-/** Implementation of a read-write pipe stream.
- *
- */
-template<
-    class CharT,
-    class Traits = std::char_traits<CharT>
->
-class basic_pstream : public std::basic_iostream<CharT, Traits>
-{
-    mutable basic_pipebuf<CharT, Traits> _buf;
-public:
-    typedef basic_pipe<CharT, Traits> pipe_type;
-
-    typedef           CharT            char_type  ;
-    typedef           Traits           traits_type;
-    typedef  typename Traits::int_type int_type   ;
-    typedef  typename Traits::pos_type pos_type   ;
-    typedef  typename Traits::off_type off_type   ;
-
-
-    ///Get access to the underlying stream_buf
-    basic_pipebuf<CharT, Traits>* rdbuf() const {return &_buf;};
-
-    ///Default constructor.
-    basic_pstream() : std::basic_iostream<CharT, Traits>(nullptr)
-    {
-        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy constructor.
-    basic_pstream(const basic_pstream & ) = delete;
-    ///Move constructor.
-    basic_pstream(basic_pstream && lhs) : std::basic_iostream<CharT, Traits>(nullptr), _buf(std::move(lhs._buf))
-    {
-        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
-    }
-    ///Move construct from a pipe.
-    basic_pstream(pipe_type && p)      : std::basic_iostream<CharT, Traits>(nullptr), _buf(std::move(p))
-    {
-        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy construct from a pipe.
-    basic_pstream(const pipe_type & p) : std::basic_iostream<CharT, Traits>(nullptr), _buf(p)
-    {
-        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
-    };
-    ///Copy assignment.
-    basic_pstream& operator=(const basic_pstream & ) = delete;
-    ///Move assignment
-    basic_pstream& operator=(basic_pstream && lhs)
-    {
-        std::basic_istream<CharT, Traits>::operator=(std::move(lhs));
-        _buf = std::move(lhs._buf);
-        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
-        return *this;
-    };
-    ///Move assignment of a pipe.
-    basic_pstream& operator=(pipe_type && p)
-    {
-        _buf = std::move(p);
-        return *this;
-    }
-    ///Copy assignment of a pipe.
-    basic_pstream& operator=(const pipe_type & p)
-    {
-        _buf = p;
-        return *this;
-    }
-    ///Set the pipe of the streambuf.
-    void pipe(pipe_type&& p)      {_buf.pipe(std::move(p)); }
-    ///Set the pipe of the streambuf.
-    void pipe(const pipe_type& p) {_buf.pipe(p); }
-    ///Get a reference to the pipe.
-    pipe_type &      pipe() &       {return _buf.pipe();}
-    ///Get a const reference to the pipe.
-    const pipe_type &pipe() const & {return _buf.pipe();}
-    ///Get a rvalue reference to the pipe. Qualified as rvalue.
-    pipe_type &&     pipe()  &&     {return std::move(_buf).pipe();}
-
-    ///Open a new pipe
-    void open()
-    {
-        if (_buf.open() == nullptr)
-            this->setstate(std::ios_base::failbit);
-        else
-            this->clear();
-    }
-
-    ///Open a new named pipe
-    void open(const std::string & name)
-    {
-        if (_buf.open() == nullptr)
-            this->setstate(std::ios_base::failbit);
-        else
-            this->clear();
-    }
-
-    ///Flush the buffer & close the pipe
-    void close()
-    {
-        if (_buf.close() == nullptr)
-            this->setstate(std::ios_base::failbit);
-    }
-};
-
-typedef basic_pstream<char>     pstream;
-typedef basic_pstream<wchar_t> wpstream;
-
-
-
-}}
-
-
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/pipe.hpp>")
+#include <boost/process/v1/pipe.hpp>
diff --git a/inst/include/boost/process/posix.hpp b/inst/include/boost/process/posix.hpp
index 4c3035eb1..ce1d8e60d 100644
--- a/inst/include/boost/process/posix.hpp
+++ b/inst/include/boost/process/posix.hpp
@@ -1,75 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_POSIX_HPP_
-#define BOOST_PROCESS_POSIX_HPP_
 
-#include <boost/process/detail/posix/fd.hpp>
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/use_vfork.hpp>
-#include <boost/process/detail/posix/signal.hpp>
 
-
-/** \file boost/process/posix.hpp
- *
- *    Header which provides the posix extensions.
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    namespace posix {
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::posix::fd">fd</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::posix::sig">sig</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::posix::use_vfork">use_vfork</globalname>;
-    }
-  }
-}
-</programlisting>
- *  \endxmlonly
- *   \warning Only available on posix. See the documentation of [fork](http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html),
- *   [execve](http://pubs.opengroup.org/onlinepubs/009695399/functions/execve.html) and
- *   [vfork](http://pubs.opengroup.org/onlinepubs/009695399/functions/vfork.html).
- *
- */
-
-namespace boost { namespace process {
-
-///Namespace containing the posix extensions.
-namespace posix {
-
-/** This property lets you modify file-descriptors other than the standard ones (0,1,2).
- *
- * It provides the functions `bind`, which implements [dup2](http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup.html)
- * and [close](http://pubs.opengroup.org/onlinepubs/9699919799/functions/close.html).
- *
- * Close can also be called with a range of file-descriptors to be closed.
- *
- */
-constexpr ::boost::process::detail::posix::fd_ fd;
-
-/** This property lets you modify the handling of `SIGCHLD` for this call. It will be reset afterwards.
-
-It can be set to default, by the expression `sig.dfl()`, set to ignore with `sig.ign()` or
-assigned a custom handler. A custom handler must have the type `sighandler_t`and can be assigned with the following syntax:
-
-\code{.cpp}
-sig = handler;
-sig(handler);
-\endcode
-
-\warning @ref spawn will automatically use `sig.ign()`, which will override if you pass a custom handler.
- */
-constexpr ::boost::process::detail::posix::sig_       sig;
-/** This property will replace the usage of [fork](http://pubs.opengroup.org/onlinepubs/9699919799/functions/fork.html) by [vfork](http://pubs.opengroup.org/onlinepubs/009695399/functions/vfork.html).
- \note `vfork` is no longer an official part of the posix standard.
-
- */
-constexpr ::boost::process::detail::posix::use_vfork_ use_vfork;
-
-
-using ::boost::process::detail::posix::sighandler_t;
-
-}}}
-
-#endif /* BOOST_PROCESS_POSIX_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/posix.hpp>")
+#include <boost/process/v1/posix.hpp>
diff --git a/inst/include/boost/process/search_path.hpp b/inst/include/boost/process/search_path.hpp
index 7e33ec552..4a8690255 100644
--- a/inst/include/boost/process/search_path.hpp
+++ b/inst/include/boost/process/search_path.hpp
@@ -1,54 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/**
- * \file boost/process/search_path.hpp
- *
- * Defines a function to search for an executable in path.
- */
 
-#ifndef BOOST_PROCESS_SEARCH_PATH_HPP
-#define BOOST_PROCESS_SEARCH_PATH_HPP
-
-#include <boost/process/detail/config.hpp>
-#include <boost/process/environment.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/search_path.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/search_path.hpp>
-#endif
-
-
-namespace boost { namespace process {
-
-/**
- * Searches for an executable in path.
- *
- * filename must be a basename including the file extension.
- * It must not include any directory separators (like a slash).
- * On Windows the file extension may be omitted. The function
- * will then try the various file extensions for executables on
- * Windows to find filename.
- *
- * \param filename The base of the filename to find
- *
- * \param path the set of paths to search, defaults to the "PATH" environment variable.
- *
- * \returns the absolute path to the executable filename or an
- *          empty string if filename isn't found
- */
-inline boost::process::filesystem::path search_path(const boost::process::filesystem::path &filename,
-                                    const std::vector<boost::process::filesystem::path> path = ::boost::this_process::path())
-{
-    return ::boost::process::detail::api::search_path(filename, path);
-}
-}}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/search_path.hpp>")
+#include <boost/process/v1/search_path.hpp>
diff --git a/inst/include/boost/process/shell.hpp b/inst/include/boost/process/shell.hpp
index 87313d53f..218aa34f6 100644
--- a/inst/include/boost/process/shell.hpp
+++ b/inst/include/boost/process/shell.hpp
@@ -1,92 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_SHELL_PATH_HPP
-#define BOOST_PROCESS_SHELL_PATH_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/traits/wchar_t.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/shell_path.hpp>
-#elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/shell_path.hpp>
-#endif
-
-/** \file boost/process/shell.hpp
- *
- *    Header which provides the shell property. This provides the
- *    property to launch a process through the system shell.
- *    It also allows the user to obtain the shell-path via shell().
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::shell">shell</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
-
- */
-
-namespace boost { namespace process { namespace detail {
-
-
-struct shell_
-{
-    constexpr shell_() {}
-
-    boost::process::filesystem::path operator()() const
-    {
-        return boost::process::detail::api::shell_path();
-    }
-    boost::process::filesystem::path operator()(std::error_code & ec) const noexcept
-    {
-        return boost::process::detail::api::shell_path(ec);
-    }
-};
-
-template<>
-struct is_wchar_t<shell_> : is_wchar_t<boost::process::filesystem::path>
-{
-};
-
-}
-/**
-The shell property enables to launch a program through the shell of the system.
-
-\code{.cpp}
-system("gcc", shell);
-\endcode
-
-The shell argument goes without any expression. The operator() is overloaded, to
-obtain the path of the system shell.
-
-\code{.cpp}
-auto shell_cmd = shell();
-//avoid exceptions
-std::error_code ec;
-shell_cmd = shell(ec);
-\endcode
-
-\attention Launching through the shell will NOT provide proper error handling, i.e.
-you will get an error via the return code.
-
-\attention Executing shell commands that incorporate unsanitized input from an untrusted source makes a program vulnerable to shell injection, a serious security flaw which can result in arbitrary command execution. For this reason, the use of `shell` is strongly discouraged in cases where the command string is constructed from external input:
-
-*/
-constexpr ::boost::process::detail::shell_ shell;
-
-}}
-
-
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/shell.hpp>")
+#include <boost/process/v1/shell.hpp>
diff --git a/inst/include/boost/process/spawn.hpp b/inst/include/boost/process/spawn.hpp
index 70ada3ed1..2d48987bc 100644
--- a/inst/include/boost/process/spawn.hpp
+++ b/inst/include/boost/process/spawn.hpp
@@ -1,69 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/**
- * \file boost/process/spawn.hpp
- *
- * Defines the spawn function.
- */
-
-#ifndef BOOST_PROCESS_SPAWN_HPP
-#define BOOST_PROCESS_SPAWN_HPP
-
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/child_decl.hpp>
-#include <boost/process/detail/execute_impl.hpp>
-#include <boost/process/detail/async_handler.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/posix.hpp>
-#endif
-
-namespace boost {
-
-namespace process {
-
-namespace detail {
-
-}
-
-/** Launch a process and detach it. Returns no handle.
-
-This function starts a process and immediately detaches it. It thereby prevents the system from creating a zombie process,
-but will also cause the system to be unable to wait for the child to exit.
-
-\note This will set `SIGCHLD` to `SIGIGN` on posix.
-
-\warning This function does not allow asynchronous operations, since it cannot wait for the end of the process.
-It will fail to compile if a reference to `boost::asio::io_context` is passed.
-
- */
-template<typename ...Args>
-inline void spawn(Args && ...args)
-{
-    typedef typename ::boost::process::detail::has_async_handler<Args...>::type
-            has_async;
-
-
-    static_assert(
-            !has_async::value,
-            "Spawn cannot wait for exit, so async properties cannot be used");
-
-    auto c = ::boost::process::detail::execute_impl(
-#if defined(BOOST_POSIX_API)
-            ::boost::process::posix::sig.ign(),
-#endif
-             std::forward<Args>(args)...);
-    c.detach();
-}
-
-}}
-#endif
 
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/spawn.hpp>")
+#include <boost/process/v1/spawn.hpp>
diff --git a/inst/include/boost/process/start_dir.hpp b/inst/include/boost/process/start_dir.hpp
index 49f4354a8..1fc31b436 100644
--- a/inst/include/boost/process/start_dir.hpp
+++ b/inst/include/boost/process/start_dir.hpp
@@ -1,111 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_PROCESS_START_IN_DIR_HPP
-#define BOOST_PROCESS_START_IN_DIR_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/handler.hpp>
-#include <boost/process/locale.hpp>
-#include <boost/process/detail/traits/wchar_t.hpp>
-
-#if defined (BOOST_POSIX_API)
-#include <boost/process/detail/posix/start_dir.hpp>
-#elif defined (BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/start_dir.hpp>
-#endif
-
-#include <boost/process/detail/config.hpp>
-#include <string>
-#include <boost/process/filesystem.hpp>
-
-/** \file boost/process/start_dir.hpp
- *
-Header which provides the start_dir property, which allows to set the directory
-the process shall be started in.
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    <emphasis>unspecified</emphasis> <globalname alt="boost::process::start_dir">start_dir</globalname>;
-  }
-}
-</programlisting>
-\endxmlonly
-
- */
-
-namespace boost { namespace process { namespace detail {
-
-struct start_dir_
-{
-    constexpr start_dir_() {};
-
-    template<typename Char>
-    api::start_dir_init<Char> operator()(const std::basic_string<Char> & st) const {return {st}; }
-    template<typename Char>
-    api::start_dir_init<Char> operator()(std::basic_string<Char> && s) const {return {std::move(s)}; }
-    template<typename Char>
-    api::start_dir_init<Char> operator()(const Char* s)                const {return {s}; }
-    api::start_dir_init<typename boost::process::filesystem::path::value_type>
-                              operator()(const boost::process::filesystem::path & st) const {return {st.native()}; }
-
-    template<typename Char>
-    api::start_dir_init<Char> operator= (const std::basic_string<Char> & st) const {return {st}; }
-    template<typename Char>
-    api::start_dir_init<Char> operator= (std::basic_string<Char> && s) const {return {std::move(s)}; }
-    template<typename Char>
-    api::start_dir_init<Char> operator= (const Char* s)                const {return {s}; }
-    api::start_dir_init<typename boost::process::filesystem::path::value_type>
-                              operator= (const boost::process::filesystem::path & st) const {return {st.native()}; }
-
-};
-
-template<> struct is_wchar_t<api::start_dir_init<wchar_t>> : std::true_type {};
-
-template<>
-struct char_converter<char, api::start_dir_init<wchar_t>>
-{
-    static api::start_dir_init<char> conv(const api::start_dir_init<wchar_t> & in)
-    {
-        return api::start_dir_init<char>{::boost::process::detail::convert(in.str())};
-    }
-};
-
-template<>
-struct char_converter<wchar_t, api::start_dir_init<char>>
-{
-    static api::start_dir_init<wchar_t> conv(const api::start_dir_init<char> & in)
-    {
-        return api::start_dir_init<wchar_t>{::boost::process::detail::convert(in.str())};
-    }
-};
-
-}
-
-/**
-
-To set the start dir, the `start_dir` property is provided.
-
-The valid operations are the following:
-
-\code{.cpp}
-start_dir=path
-start_dir(path)
-\endcode
-
-It can be used with `std::string`, `std::wstring` and `boost::process::filesystem::path`.
-
-
- */
-constexpr ::boost::process::detail::start_dir_ start_dir;
-
-}}
-
-#endif
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/start_dir.hpp>")
+#include <boost/process/v1/start_dir.hpp>
diff --git a/inst/include/boost/process/system.hpp b/inst/include/boost/process/system.hpp
index 6cf48f265..3fd073791 100644
--- a/inst/include/boost/process/system.hpp
+++ b/inst/include/boost/process/system.hpp
@@ -1,157 +1,9 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-/**
- * \file boost/process/system.hpp
- *
- * Defines a system function.
- */
-
-#ifndef BOOST_PROCESS_SYSTEM_HPP
-#define BOOST_PROCESS_SYSTEM_HPP
-
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/on_exit.hpp>
-#include <boost/process/child.hpp>
-#include <boost/process/detail/async_handler.hpp>
-#include <boost/process/detail/execute_impl.hpp>
-#include <boost/asio/post.hpp>
-#include <type_traits>
-#include <mutex>
-#include <condition_variable>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/posix.hpp>
-#endif
-
-namespace boost {
-
-namespace process {
-
-namespace detail
-{
-
-struct system_impl_success_check : handler
-{
-    bool succeeded = false;
-
-    template<typename Exec>
-    void on_success(Exec &) { succeeded = true; }
-};
-
-template<typename IoService, typename ...Args>
-inline int system_impl(
-        std::true_type, /*needs ios*/
-        std::true_type, /*has io_context*/
-        Args && ...args)
-{
-    IoService & ios = ::boost::process::detail::get_io_context_var(args...);
-
-    system_impl_success_check check;
-
-    std::atomic_bool exited{false};
-
-    child c(std::forward<Args>(args)...,
-            check,
-            ::boost::process::on_exit(
-                [&](int, const std::error_code&)
-                {
-                    boost::asio::post(ios.get_executor(), [&]{exited.store(true);});
-                }));
-    if (!c.valid() || !check.succeeded)
-        return -1;
-
-    while (!exited.load())
-        ios.poll();
-
-    return c.exit_code();
-}
-
-template<typename IoService, typename ...Args>
-inline int system_impl(
-        std::true_type,  /*needs ios */
-        std::false_type, /*has io_context*/
-        Args && ...args)
-{
-    IoService ios;
-    child c(ios, std::forward<Args>(args)...);
-    if (!c.valid())
-        return -1;
-
-    ios.run();
-    if (c.running())
-        c.wait();
-    return c.exit_code();
-}
-
-
-template<typename IoService, typename ...Args>
-inline int system_impl(
-        std::false_type, /*needs ios*/
-        std::true_type, /*has io_context*/
-        Args && ...args)
-{
-    child c(std::forward<Args>(args)...);
-    if (!c.valid())
-        return -1;
-    c.wait();
-    return c.exit_code();
-}
-
-template<typename IoService, typename ...Args>
-inline int system_impl(
-        std::false_type, /*has async */
-        std::false_type, /*has io_context*/
-        Args && ...args)
-{
-    child c(std::forward<Args>(args)...
-#if defined(BOOST_POSIX_API)
-            ,::boost::process::posix::sig.dfl()
-#endif
-            );
-    if (!c.valid())
-        return -1;
-    c.wait();
-    return c.exit_code();
-}
-
-}
-
-/** Launches a process and waits for its exit.
-It works as std::system, though it allows
-all the properties boost.process provides. It will execute the process and wait for it's exit; then return the exit_code.
-
-\code{.cpp}
-int ret = system("ls");
-\endcode
-
-\attention Using this function with synchronous pipes leads to many potential deadlocks.
-
-When using this function with an asynchronous properties and NOT passing an io_context object,
-the system function will create one and run it. When the io_context is passed to the function,
-the system function will check if it is active, and call the io_context::run function if not.
-
-*/
-template<typename ...Args>
-inline int system(Args && ...args)
-{
-    typedef typename ::boost::process::detail::needs_io_context<Args...>::type
-            need_ios;
-    typedef typename ::boost::process::detail::has_io_context<Args...>::type
-            has_ios;
-    return ::boost::process::detail::system_impl<boost::asio::io_context>(
-            need_ios(), has_ios(),
-            std::forward<Args>(args)...);
-}
-
-
-}}
-#endif
 
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/system.hpp>")
+#include <boost/process/v1/system.hpp>
diff --git a/inst/include/boost/process/v1.hpp b/inst/include/boost/process/v1.hpp
new file mode 100644
index 000000000..9d081cda6
--- /dev/null
+++ b/inst/include/boost/process/v1.hpp
@@ -0,0 +1,28 @@
+// Copyright (c) 2024 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#ifndef BOOST_PROCESS_V1_HPP
+#define BOOST_PROCESS_V1_HPP
+
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/system.hpp>
+#include <boost/process/v1/start_dir.hpp>
+
+#endif //BOOST_PROCESS_V1_HPP
diff --git a/inst/include/boost/process/v1/args.hpp b/inst/include/boost/process/v1/args.hpp
new file mode 100644
index 000000000..b06ca624c
--- /dev/null
+++ b/inst/include/boost/process/v1/args.hpp
@@ -0,0 +1,279 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_ARGS_HPP
+#define BOOST_PROCESS_ARGS_HPP
+
+/** \file boost/process/args.hpp
+ *
+ *    This header provides the \xmlonly <globalname alt="boost::process::v1::args">args</globalname>\endxmlonly property. It also provides the
+ *    alternative name \xmlonly <globalname alt="boost::process::v1::argv">argv</globalname>\endxmlonly .
+ *
+ *
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::args">args</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::argv">argv</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+ */
+
+
+#include <boost/process/v1/detail/basic_cmd.hpp>
+#include <iterator>
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+struct args_
+{
+    template<typename T>
+    using remove_reference_t = typename std::remove_reference<T>::type;
+    template<typename T>
+    using value_type = typename remove_reference_t<T>::value_type;
+
+    template<typename T>
+    using vvalue_type = value_type<value_type<T>>;
+
+    template <class Range>
+    arg_setter_<vvalue_type<Range>, true>     operator()(Range &&range) const
+    {
+        return arg_setter_<vvalue_type<Range>, true>(std::forward<Range>(range));
+    }
+    template <class Range>
+    arg_setter_<vvalue_type<Range>, true>     operator+=(Range &&range) const
+    {
+        return arg_setter_<vvalue_type<Range>, true>(std::forward<Range>(range));
+    }
+    template <class Range>
+    arg_setter_<vvalue_type<Range>, false>    operator= (Range &&range) const
+    {
+        return arg_setter_<vvalue_type<Range>, false>(std::forward<Range>(range));
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator()(std::basic_string<Char> && str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator+=(std::basic_string<Char> && str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, false>    operator= (std::basic_string<Char> && str) const
+    {
+        return arg_setter_<Char, false>(str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator()(const std::basic_string<Char> & str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator+=(const std::basic_string<Char> & str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, false>    operator= (const std::basic_string<Char> & str) const
+    {
+        return arg_setter_<Char, false>(str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator()(std::basic_string<Char> & str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator+=(std::basic_string<Char> & str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, false>    operator= (std::basic_string<Char> & str) const
+    {
+        return arg_setter_<Char, false>(str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator()(const Char* str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, true>     operator+=(const Char* str) const
+    {
+        return arg_setter_<Char, true> (str);
+    }
+    template<typename Char>
+    arg_setter_<Char, false>    operator= (const Char* str) const
+    {
+        return arg_setter_<Char, false>(str);
+    }
+//    template<typename Char, std::size_t Size>
+//    arg_setter_<Char, true>     operator()(const Char (&str) [Size]) const
+//    {
+//        return arg_setter_<Char, true> (str);
+//    }
+//    template<typename Char, std::size_t Size>
+//    arg_setter_<Char, true>     operator+=(const Char (&str) [Size]) const
+//    {
+//        return arg_setter_<Char, true> (str);
+//    }
+//    template<typename Char, std::size_t Size>
+//    arg_setter_<Char, false>    operator= (const Char (&str) [Size]) const
+//    {
+//        return arg_setter_<Char, false>(str);
+//    }
+
+    arg_setter_<char, true> operator()(std::initializer_list<const char*> &&range) const
+    {
+        return arg_setter_<char, true>(range.begin(), range.end());
+    }
+    arg_setter_<char, true> operator+=(std::initializer_list<const char*> &&range) const
+    {
+        return arg_setter_<char, true>(range.begin(), range.end());
+    }
+    arg_setter_<char, false> operator= (std::initializer_list<const char*> &&range) const
+    {
+        return arg_setter_<char, false>(range.begin(), range.end());
+    }
+    arg_setter_<char, true> operator()(std::initializer_list<std::string> &&range) const
+    {
+        return arg_setter_<char, true>(range.begin(), range.end());
+    }
+    arg_setter_<char, true> operator+=(std::initializer_list<std::string> &&range) const
+    {
+        return arg_setter_<char, true>(range.begin(), range.end());
+    }
+    arg_setter_<char, false> operator= (std::initializer_list<std::string> &&range) const
+    {
+        return arg_setter_<char, false>(range.begin(), range.end());
+    }
+
+    arg_setter_<wchar_t, true> operator()(std::initializer_list<const wchar_t*> &&range) const
+    {
+        return arg_setter_<wchar_t, true>(range.begin(), range.end());
+    }
+    arg_setter_<wchar_t, true> operator+=(std::initializer_list<const wchar_t*> &&range) const
+    {
+        return arg_setter_<wchar_t, true>(range.begin(), range.end());
+    }
+    arg_setter_<wchar_t, false> operator= (std::initializer_list<const wchar_t*> &&range) const
+    {
+        return arg_setter_<wchar_t, false>(range.begin(), range.end());
+    }
+    arg_setter_<wchar_t, true> operator()(std::initializer_list<std::wstring> &&range) const
+    {
+        return arg_setter_<wchar_t, true>(range.begin(), range.end());
+    }
+    arg_setter_<wchar_t, true> operator+=(std::initializer_list<std::wstring> &&range) const
+    {
+        return arg_setter_<wchar_t, true>(range.begin(), range.end());
+    }
+    arg_setter_<wchar_t, false> operator= (std::initializer_list<std::wstring> &&range) const
+    {
+        return arg_setter_<wchar_t, false>(range.begin(), range.end());
+    }
+};
+
+
+}
+/**
+
+The `args` property allows to explicitly set arguments for the execution. The
+name of the executable will always be the first element in the arg-vector.
+
+\section args_details Details
+
+\subsection args_operations Operations
+
+\subsubsection args_set_var Setting values
+
+To set a the argument vector the following syntax can be used.
+
+\code{.cpp}
+args = value;
+args(value);
+\endcode
+
+`std::initializer_list` is among the allowed types, so the following syntax is also possible.
+
+\code{.cpp}
+args = {value1, value2};
+args({value1, value2});
+\endcode
+
+Below the possible types for `value` are listed, with `char_type` being either `char` or `wchar_t`.
+
+\paragraph args_set_var_value value
+
+ - `std::basic_string<char_type>`
+ - `const char_type * `
+ - `std::initializer_list<const char_type *>`
+ - `std::vector<std::basic_string<char_type>>`
+
+Additionally any range of `std::basic_string<char_type>` can be passed.
+
+\subsubsection args_append_var Appending values
+
+To append a the argument vector the following syntax can be used.
+
+\code{.cpp}
+args += value;
+\endcode
+
+`std::initializer_list` is among the allowed types, so the following syntax is also possible.
+
+\code{.cpp}
+args += {value1, value2};
+\endcode
+
+Below the possible types for `value` are listed, with `char_type` being either `char` or `wchar_t`.
+
+\paragraph args_append_var_value value
+
+ - `std::basic_string<char_type>`
+ - `const char_type * `
+ - `std::initializer_list<const char_type *>`
+ - `std::vector<std::basic_string<char_type>>`
+
+Additionally any range of `std::basic_string<char_type>` can be passed.
+
+
+\subsection args_example Example
+
+The overload form is used when more than one string is passed, from the second one forward.
+I.e. the following expressions have the same results:
+
+\code{.cpp}
+spawn("gcc", "--version");
+spawn("gcc", args ="--version");
+spawn("gcc", args+="--version");
+spawn("gcc", args ={"--version"});
+spawn("gcc", args+={"--version"});
+\endcode
+
+\note A string will be parsed and set in quotes if it has none and contains spaces.
+
+
+ */
+constexpr boost::process::v1::detail::args_ args{};
+
+///Alias for \xmlonly <globalname alt="boost::process::v1::args">args</globalname> \endxmlonly .
+constexpr boost::process::v1::detail::args_ argv{};
+
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/async.hpp b/inst/include/boost/process/v1/async.hpp
new file mode 100644
index 000000000..d701d921f
--- /dev/null
+++ b/inst/include/boost/process/v1/async.hpp
@@ -0,0 +1,134 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/** \file boost/process/async.hpp
+
+The header which provides the basic asynchronous features.
+It provides the on_exit property, which allows callbacks when the process exits.
+It also implements the necessary traits for passing an boost::asio::io_context,
+which is needed for asynchronous communication.
+
+It also pulls the [boost::asio::buffer](http://www.boost.org/doc/libs/release/doc/html/boost_asio/reference/buffer.html)
+into the boost::process namespace for convenience.
+
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process {
+    namespace v1 {
+      <emphasis>unspecified</emphasis> <ulink url="http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/buffer.html">buffer</ulink>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::on_exit">on_exit</globalname>;
+    }
+  }
+}
+</programlisting>
+
+\endxmlonly
+  */
+
+#ifndef BOOST_PROCESS_ASYNC_HPP_
+#define BOOST_PROCESS_ASYNC_HPP_
+
+#include <boost/process/v1/detail/traits.hpp>
+#include <boost/process/v1/detail/on_exit.hpp>
+
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/streambuf.hpp>
+#include <boost/asio/buffer.hpp>
+#include <type_traits>
+#include <boost/fusion/iterator/deref.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/io_context_ref.hpp>
+#include <boost/process/v1/detail/posix/async_in.hpp>
+#include <boost/process/v1/detail/posix/async_out.hpp>
+#include <boost/process/v1/detail/posix/on_exit.hpp>
+
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/io_context_ref.hpp>
+#include <boost/process/v1/detail/windows/async_in.hpp>
+#include <boost/process/v1/detail/windows/async_out.hpp>
+#include <boost/process/v1/detail/windows/on_exit.hpp>
+#endif
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+struct async_tag;
+
+template<typename T>
+struct is_io_context : std::false_type {};
+template<>
+struct is_io_context<api::io_context_ref> : std::true_type {};
+
+template<typename Tuple>
+inline asio::io_context& get_io_context(const Tuple & tup)
+{
+    auto& ref = *boost::fusion::find_if<is_io_context<boost::mpl::_>>(tup);
+    return ref.get();
+}
+
+struct async_builder
+{
+    boost::asio::io_context * ios;
+
+    void operator()(boost::asio::io_context & ios_) {this->ios = &ios_;};
+
+    typedef api::io_context_ref result_type;
+    api::io_context_ref get_initializer() {return api::io_context_ref (*ios);};
+};
+
+
+template<>
+struct initializer_builder<async_tag>
+{
+    typedef async_builder type;
+};
+
+}
+
+using ::boost::asio::buffer;
+
+
+#if defined(BOOST_PROCESS_DOXYGEN)
+/** When an io_context is passed, the on_exit property can be used, to be notified
+    when the child process exits.
+
+
+The following syntax is valid
+
+\code{.cpp}
+on_exit=function;
+on_exit(function);
+\endcode
+
+with `function` being a callable object with the signature `(int, const std::error_code&)` or an
+`std::future<int>`.
+
+\par Example
+
+\code{.cpp}
+io_context ios;
+
+child c("ls", ios, on_exit=[](int exit, const std::error_code& ec_in){});
+
+std::future<int> exit_code;
+chlid c2("ls", ios, on_exit=exit_code);
+
+\endcode
+
+\note The handler is not invoked when the launch fails.
+\warning When used \ref ignore_error it might get invoked on error.
+\warning `on_exit` uses `boost::asio::signal_set` to listen for `SIGCHLD` on posix, and so has the
+same restrictions as that class (do not register a handler for `SIGCHLD` except by using
+`boost::asio::signal_set`).
+ */
+constexpr static ::boost::process::v1::detail::on_exit_ on_exit{};
+#endif
+
+}}}
+
+
+
+#endif /* INCLUDE_BOOST_PROCESS_DETAIL_ASYNC_HPP_ */
diff --git a/inst/include/boost/process/v1/async_pipe.hpp b/inst/include/boost/process/v1/async_pipe.hpp
new file mode 100644
index 000000000..642c18943
--- /dev/null
+++ b/inst/include/boost/process/v1/async_pipe.hpp
@@ -0,0 +1,217 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+
+#ifndef BOOST_PROCESS_ASYNC_PIPE_HPP
+#define BOOST_PROCESS_ASYNC_PIPE_HPP
+
+#include <boost/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/async_pipe.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/async_pipe.hpp>
+#endif
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+
+#if defined(BOOST_PROCESS_DOXYGEN)
+
+
+/** Class implementing an asnychronous I/O-Object for use with boost.asio.
+ *  It is based on the corresponding I/O Object, that is either boost::asio::windows::stream_handle or
+ *  boost::asio::posix::stream_descriptor.
+ *
+ *  It can be used directly with boost::asio::async_read or async_write.
+ *
+ * \note The object is copyable, but that does invoke a handle duplicate.
+ */
+class async_pipe
+{
+public:
+    /** Typedef for the native handle representation.
+     * \note This is the handle on the system, not the boost.asio class.
+     *
+     */
+    typedef platform_specific native_handle_type;
+    /** Typedef for the handle representation of boost.asio.
+     *
+     */
+    typedef platform_specific handle_type;
+
+    typedef typename handle_type::executor_type executor_type;
+
+    /** Construct a new async_pipe, does automatically open the pipe.
+     * Initializes source and sink with the same io_context.
+     * @note Windows creates a named pipe here, where the name is automatically generated.
+     */
+    inline async_pipe(boost::asio::io_context & ios);
+
+    /** Construct a new async_pipe, does automatically open the pipe.
+     * @note Windows creates a named pipe here, where the name is automatically generated.
+     */
+    inline async_pipe(boost::asio::io_context & ios_source,
+                      boost::asio::io_context & ios_sink);
+
+    /** Construct a new async_pipe, does automatically open.
+     * Initializes source and sink with the same io_context.
+     *
+     * @note Windows restricts possible names.
+     */
+    inline async_pipe(boost::asio::io_context & ios, const std::string & name);
+
+
+    /** Construct a new async_pipe, does automatically open.
+     *
+     * @note Windows restricts possible names.
+     */
+    inline async_pipe(boost::asio::io_context & ios_source,
+                      boost::asio::io_context & ios_sink, const std::string & name);
+
+    /** Copy-Constructor of the async pipe.
+     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
+     *
+     */
+    async_pipe(const async_pipe& lhs);
+
+    /** Move-Constructor of the async pipe.
+     */
+    async_pipe(async_pipe&& lhs);
+
+    /** Construct the async-pipe from a pipe.
+     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
+     *
+     */
+    template<class CharT, class Traits = std::char_traits<CharT>>
+    explicit async_pipe(boost::asio::io_context & ios, const basic_pipe<CharT, Traits> & p);
+
+    /** Construct the async-pipe from a pipe, with two different io_context objects.
+     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
+     *
+     */
+    template<class CharT, class Traits = std::char_traits<CharT>>
+    explicit async_pipe(boost::asio::io_context & ios_source,
+                        boost::asio::io_context & ios_sink,
+                        const basic_pipe<CharT, Traits> & p);
+
+
+    /** Assign a basic_pipe.
+     * @note Windows requires a named pipe for this, if a the wrong type is used an exception is thrown.
+     *
+     */
+    template<class CharT, class Traits = std::char_traits<CharT>>
+    inline async_pipe& operator=(const basic_pipe<CharT, Traits>& p);
+
+    /** Copy Assign a pipe.
+     * @note Duplicates the handles.
+     */
+    async_pipe& operator=(const async_pipe& lhs);
+    /** Move assign a pipe */
+    async_pipe& operator=(async_pipe&& lhs);
+
+    /** Destructor. Closes the pipe handles. */
+    ~async_pipe();
+
+    /** Explicit cast to basic_pipe.  */
+    template<class CharT, class Traits = std::char_traits<CharT>>
+    inline explicit operator basic_pipe<CharT, Traits>() const;
+
+    /** Cancel the current asynchronous operations. */
+    void cancel();
+    /** Close the pipe handles. */
+    void close();
+    /** Close the pipe handles. While passing an error_code
+     *
+     */
+    void close(std::error_code & ec);
+
+    /** Check if the pipes are open. */
+    bool is_open() const;
+
+    /** Async close, i.e. close after current operation is completed.
+     *
+     *  \note There is no guarantee that this will indeed read the entire pipe-buffer
+     */
+    void async_close();
+
+    /** Read some data from the handle.
+
+     * See the boost.asio documentation for more details.
+     */
+    template<typename MutableBufferSequence>
+    std::size_t read_some(const MutableBufferSequence & buffers);
+
+    /** Write some data to the handle.
+
+     * See the boost.asio documentation for more details.
+     */
+    template<typename MutableBufferSequence>
+    std::size_t write_some(const MutableBufferSequence & buffers);
+
+    /** Get the native handle of the source. */
+    native_handle native_source() const {return const_cast<boost::asio::windows::stream_handle&>(_source).native();}
+    /** Get the native handle of the sink. */
+    native_handle native_sink  () const {return const_cast<boost::asio::windows::stream_handle&>(_sink  ).native();}
+
+    /** Start an asynchronous read.
+     *
+     * See the [boost.asio documentation](http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/AsyncReadStream.html) for more details.
+     */
+    template<typename MutableBufferSequence,
+             typename ReadHandler>
+    detail::dummy async_read_some(
+        const MutableBufferSequence & buffers,
+              ReadHandler &&handler);
+
+    /** Start an asynchronous write.
+
+     * See the [boost.asio documentation](http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/AsyncWriteStream.html) for more details.
+     */
+    template<typename ConstBufferSequence,
+             typename WriteHandler>
+    detail::dummy async_write_some(
+        const ConstBufferSequence & buffers,
+        WriteHandler && handler);
+
+    ///Get the asio handle of the pipe sink.
+    const handle_type & sink  () const &;
+    ///Get the asio handle of the pipe source.
+    const handle_type & source() const &;
+
+    ///Get the asio handle of the pipe sink. Qualified as rvalue
+    handle_type && sink  () &&;
+    ///Get the asio handle of the pipe source. Qualified as rvalue
+    handle_type && source() &&;
+
+    /// Move the source out of this class and change the io_context. Qualified as rvalue. \attention Will always move.
+    handle_type source(::boost::asio::io_context& ios) &&;
+    /// Move the sink out of this class and change the io_context. Qualified as rvalue. \attention Will always move
+    handle_type sink  (::boost::asio::io_context& ios) &&;
+
+    /// Copy the source out of this class and change the io_context. \attention Will always copy.
+    handle_type source(::boost::asio::io_context& ios) const &;
+    /// Copy the sink out of this class and change the io_context. \attention Will always copy
+    handle_type sink  (::boost::asio::io_context& ios) const &;
+
+
+
+};
+
+#else
+using ::boost::process::v1::detail::api::async_pipe;
+#endif
+
+
+}}}
+
+
+
+#endif
diff --git a/inst/include/boost/process/v1/async_system.hpp b/inst/include/boost/process/v1/async_system.hpp
new file mode 100644
index 000000000..830a19b82
--- /dev/null
+++ b/inst/include/boost/process/v1/async_system.hpp
@@ -0,0 +1,151 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/**
+ * \file boost/process/async_system.hpp
+ *
+ * Defines the asynchronous version of the system function.
+ */
+
+#ifndef BOOST_PROCESS_ASYNC_SYSTEM_HPP
+#define BOOST_PROCESS_ASYNC_SYSTEM_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/detail/async_handler.hpp>
+#include <boost/process/v1/detail/execute_impl.hpp>
+#include <type_traits>
+#include <memory>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/post.hpp>
+#include <boost/system/error_code.hpp>
+#include <tuple>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#endif
+
+namespace boost {
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+namespace detail
+{
+
+template<typename Handler>
+struct async_system_handler : ::boost::process::v1::detail::api::async_handler
+{
+    boost::asio::io_context & ios;
+    Handler handler;
+
+#if defined(BOOST_POSIX_API)
+    bool errored = false;
+#endif
+
+    template<typename ExitHandler_>
+    async_system_handler(
+            boost::asio::io_context & ios,
+            ExitHandler_ && exit_handler) : ios(ios), handler(std::forward<ExitHandler_>(exit_handler))
+    {
+    }
+
+
+    template<typename Exec>
+    void on_error(Exec&, const std::error_code & ec)
+    {
+#if defined(BOOST_POSIX_API)
+        errored = true;
+#endif
+        auto h = std::make_shared<Handler>(std::move(handler));
+        boost::asio::post(
+            ios.get_executor(),
+            [h, ec]() mutable
+            {
+                (*h)(boost::system::error_code(ec.value(), boost::system::system_category()), -1);
+            });
+    }
+
+    template<typename Executor>
+    std::function<void(int, const std::error_code&)> on_exit_handler(Executor&)
+    {
+#if defined(BOOST_POSIX_API)
+        if (errored)
+            return [](int , const std::error_code &){};
+#endif
+        auto h = std::make_shared<Handler>(std::move(handler));
+        return [h](int exit_code, const std::error_code & ec) mutable
+               {
+                    (*h)(boost::system::error_code(ec.value(), boost::system::system_category()), exit_code);
+               };
+    }
+};
+
+
+template<typename ExitHandler>
+struct is_error_handler<async_system_handler<ExitHandler>>    : std::true_type {};
+
+}
+
+/** This function provides an asynchronous interface to process launching.
+
+It uses the same properties and parameters as the other launching function,
+but is similar to the asynchronous functions in [boost.asio](http://www.boost.org/doc/libs/release/doc/html/boost_asio.html)
+
+It uses [asio::async_result](http://www.boost.org/doc/libs/release/doc/html/boost_asio/reference/async_result.html) to determine
+the return value (from the second parameter, `exit_handler`).
+
+\param ios A reference to an [io_context](http://www.boost.org/doc/libs/release/doc/html/boost_asio/reference.html)
+\param exit_handler The exit-handler for the signature `void(boost::system::error_code, int)`
+
+\note This function does not allow custom error handling, since those are done through the `exit_handler`.
+
+*/
+#if defined(BOOST_PROCESS_DOXYGEN)
+template<typename ExitHandler, typename ...Args>
+inline boost::process::v1::detail::dummy
+    async_system(boost::asio::io_context & ios, ExitHandler && exit_handler, Args && ...args);
+#endif
+
+namespace detail
+{
+struct async_system_init_op
+{
+
+    template<typename Handler, typename ... Args>
+    void operator()(Handler && handler, asio::io_context & ios, Args && ... args)
+    {
+        detail::async_system_handler<typename std::decay<Handler>::type> async_h{ios, std::forward<Handler>(handler)};
+        child(ios, std::forward<Args>(args)..., async_h ).detach();
+    }
+};
+
+
+}
+
+
+template<typename ExitHandler, typename ...Args>
+inline BOOST_ASIO_INITFN_RESULT_TYPE(ExitHandler, void (boost::system::error_code, int))
+    async_system(boost::asio::io_context & ios, ExitHandler && exit_handler, Args && ...args)
+{
+    
+    typedef typename ::boost::process::v1::detail::has_error_handler<boost::fusion::tuple<Args...>>::type
+            has_err_handling;
+
+    static_assert(!has_err_handling::value, "async_system cannot have custom error handling");
+
+    return boost::asio::async_initiate<ExitHandler, void (boost::system::error_code, int)>(
+        detail::async_system_init_op{}, exit_handler, ios, std::forward<Args>(args)...
+    );
+}
+
+
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/child.hpp b/inst/include/boost/process/v1/child.hpp
new file mode 100644
index 000000000..ee0c4f726
--- /dev/null
+++ b/inst/include/boost/process/v1/child.hpp
@@ -0,0 +1,154 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/**
+ * \file boost/process/child.hpp
+ *
+ * Defines a child process class.
+ */
+
+#ifndef BOOST_PROCESS_CHILD_HPP
+#define BOOST_PROCESS_CHILD_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/child_decl.hpp>
+#include <boost/process/v1/detail/execute_impl.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#endif
+
+namespace boost {
+
+///The main namespace of boost.process.
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+template<typename ...Args>
+child::child(Args&&...args)
+    : child(::boost::process::v1::detail::execute_impl(std::forward<Args>(args)...)) {}
+
+
+///Typedef for the type of an pid_t
+typedef ::boost::process::v1::detail::api::pid_t pid_t;
+
+#if defined(BOOST_PROCESS_DOXYGEN)
+/** The main class to hold a child process. It is simliar to [std::thread](http://en.cppreference.com/w/cpp/thread/thread),
+ * in that it has a join and detach function.
+ *
+ * @attention The destructor will call terminate on the process if not joined or detached without any warning.
+ *
+ */
+
+class child
+{
+    /** Type definition for the native process handle. */
+    typedef platform_specific native_handle_t;
+
+    /** Construct the child from a pid.
+     *
+     * @attention There is no guarantee that this will work. The process need the right access rights, which are very platform specific.
+     */
+    explicit child(pid_t & pid) : _child_handle(pid) {};
+
+    /** Move-Constructor.*/
+    child(child && lhs);
+
+    /** Construct a child from a property list and launch it
+     * The standard version is to create a subprocess, which will spawn the process.
+     */
+    template<typename ...Args>
+    explicit child(Args&&...args);
+
+    /** Construct an empty child. */
+    child() = default;
+
+    /** Move assign. */
+    child& operator=(child && lhs);
+
+    /** Detach the child, i.e. let it run after this handle dies. */
+    void detach();
+    /** Join the child. This just calls wait, but that way the naming is similar to std::thread */
+    void join();
+    /** Check if the child is joinable. */
+    bool joinable();
+
+    /** Destructor.
+     * @attention Will call terminate (without warning) when the child was neither joined nor detached.
+     */
+    ~child();
+
+    /** Get the native handle for the child process. */
+    native_handle_t native_handle() const;
+
+    /** Get the exit_code. The return value is without any meaning if the child wasn't waited for or if it was terminated. */
+    int exit_code() const;
+    /** Get the Process Identifier. */
+    pid_t id()      const;
+
+    /** Get the native, uninterpreted exit code. The return value is without any meaning if the child wasn't waited
+     *  for or if it was terminated. */
+    int native_exit_code() const;
+
+    /** Check if the child process is running. */
+    bool running();
+    /** \overload void running() */
+    bool running(std::error_code & ec) noexcept;
+
+    /** Wait for the child process to exit. */
+    void wait();
+    /** \overload void wait() */
+    void wait(std::error_code & ec) noexcept;
+
+    /** Wait for the child process to exit for a period of time.
+     * \return True if child exited while waiting.
+     */
+    template< class Rep, class Period >
+    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time);
+    /** \overload bool wait_for(const std::chrono::duration<Rep, Period>& rel_time) */
+    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time, std::error_code & ec) noexcept;
+
+    /** Wait for the child process to exit until a point in time.
+      * \return True if child exited while waiting.*/
+    template< class Clock, class Duration >
+    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time );
+    /** \overload bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time )*/
+    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time, std::error_code & ec) noexcept;
+
+    /** Check if this handle holds a child process.
+     * @note That does not mean, that the process is still running. It only means, that the handle does or did exist.
+     */
+    bool valid() const;
+    /** Same as valid, for convenience. */
+    explicit operator bool() const;
+
+    /** Check if the the chlid process is in any process group. */
+    bool in_group() const;
+
+    /** \overload bool in_group() const */
+    bool in_group(std::error_code & ec) const noexcept;
+
+    /** Terminate the child process.
+     *
+     *  This function will cause the child process to unconditionally and immediately exit.
+     *  It is implement with [SIGKILL](http://pubs.opengroup.org/onlinepubs/009695399/functions/kill.html) on posix
+     *  and [TerminateProcess](https://technet.microsoft.com/en-us/library/ms686714.aspx) on windows.
+     *
+     */
+    void terminate();
+
+    /** \overload void terminate() */
+    void terminate(std::error_code & ec) noexcept;
+};
+
+#endif
+
+}}}
+#endif
+
diff --git a/inst/include/boost/process/v1/cmd.hpp b/inst/include/boost/process/v1/cmd.hpp
new file mode 100644
index 000000000..7b36eba65
--- /dev/null
+++ b/inst/include/boost/process/v1/cmd.hpp
@@ -0,0 +1,121 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_DETAIL_CMD_LINE_HPP
+#define BOOST_PROCESS_DETAIL_CMD_LINE_HPP
+
+#include <boost/winapi/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/traits/cmd_or_exe.hpp>
+#include <boost/process/v1/detail/traits/wchar_t.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/cmd.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/cmd.hpp>
+#endif
+
+/** \file boost/process/cmd.hpp
+ *
+ *    This header provides the \xmlonly <globalname alt="boost::process::v1::cmd">cmd</globalname>\endxmlonly property.
+ *
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::cmd">cmd</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+*/
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+
+struct cmd_
+{
+    constexpr cmd_() = default;
+
+    template<typename Char>
+    inline api::cmd_setter_<Char> operator()(const Char *s) const
+    {        return api::cmd_setter_<Char>(s);
+    }
+    template<typename Char>
+    inline api::cmd_setter_<Char> operator= (const Char *s) const
+    {
+        return api::cmd_setter_<Char>(s);
+    }
+
+    template<typename Char>
+    inline api::cmd_setter_<Char> operator()(const std::basic_string<Char> &s) const
+    {
+        return api::cmd_setter_<Char>(s);
+    }
+    template<typename Char>
+    inline api::cmd_setter_<Char> operator= (const std::basic_string<Char> &s) const
+    {
+        return api::cmd_setter_<Char>(s);
+    }
+};
+
+template<> struct is_wchar_t<api::cmd_setter_<wchar_t>> : std::true_type {};
+
+
+
+template<>
+struct char_converter<char, api::cmd_setter_<wchar_t>>
+{
+    static api::cmd_setter_<char> conv(const api::cmd_setter_<wchar_t> & in)
+    {
+        return { ::boost::process::v1::detail::convert(in.str()) };
+    }
+};
+
+template<>
+struct char_converter<wchar_t, api::cmd_setter_<char>>
+{
+    static api::cmd_setter_<wchar_t> conv(const api::cmd_setter_<char> & in)
+    {
+        return { ::boost::process::v1::detail::convert(in.str()) };
+    }
+};
+
+
+
+
+
+
+}
+
+
+/** The cmd property allows to explicitly set commands for the execution.
+
+The overload form applies when only one string is passed to a launching function.
+The string will be internally parsed and split at spaces.
+
+The following expressions are valid, with `value` being either a C-String or
+a `std::basic_string` with `char` or `wchar_t`.
+
+\code{.cpp}
+cmd="value";
+cmd(value);
+\endcode
+
+The property can only be used for assignments.
+
+
+ */
+constexpr static ::boost::process::v1::detail::cmd_ cmd;
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/detail/async_handler.hpp b/inst/include/boost/process/v1/detail/async_handler.hpp
similarity index 79%
rename from inst/include/boost/process/detail/async_handler.hpp
rename to inst/include/boost/process/v1/detail/async_handler.hpp
index b4eaf9349..99601daeb 100644
--- a/inst/include/boost/process/detail/async_handler.hpp
+++ b/inst/include/boost/process/v1/detail/async_handler.hpp
@@ -11,26 +11,26 @@
 #include <type_traits>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/posix.hpp>
-#include <boost/process/detail/posix/async_handler.hpp>
-#include <boost/process/detail/posix/asio_fwd.hpp>
+#include <boost/process/v1/posix.hpp>
+#include <boost/process/v1/detail/posix/async_handler.hpp>
+#include <boost/process/v1/detail/posix/asio_fwd.hpp>
 #else
-#include <boost/process/detail/windows/async_handler.hpp>
-#include <boost/process/detail/windows/asio_fwd.hpp>
+#include <boost/process/v1/detail/windows/async_handler.hpp>
+#include <boost/process/v1/detail/windows/asio_fwd.hpp>
 #endif
 
 namespace boost {
 
-namespace process {
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 namespace detail {
 
 #if defined(BOOST_POSIX_API)
-using ::boost::process::detail::posix::is_async_handler;
-using ::boost::process::detail::posix::does_require_io_context;
+using ::boost::process::v1::detail::posix::is_async_handler;
+using ::boost::process::v1::detail::posix::does_require_io_context;
 #else
-using ::boost::process::detail::windows::is_async_handler;
-using ::boost::process::detail::windows::does_require_io_context;
+using ::boost::process::v1::detail::windows::is_async_handler;
+using ::boost::process::v1::detail::windows::does_require_io_context;
 #endif
 
 template<typename ...Args>
@@ -112,6 +112,7 @@ boost::asio::io_context &get_io_context_var(First&, Args&...args)
 }
 }
 }
+}
 
 
 #endif /* BOOST_PROCESS_DETAIL_ASYNC_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/basic_cmd.hpp b/inst/include/boost/process/v1/detail/basic_cmd.hpp
similarity index 87%
rename from inst/include/boost/process/detail/basic_cmd.hpp
rename to inst/include/boost/process/v1/detail/basic_cmd.hpp
index f3405bbb1..8064978af 100644
--- a/inst/include/boost/process/detail/basic_cmd.hpp
+++ b/inst/include/boost/process/v1/detail/basic_cmd.hpp
@@ -7,26 +7,26 @@
 #ifndef BOOST_PROCESS_DETAIL_BASIC_CMD_HPP_
 #define BOOST_PROCESS_DETAIL_BASIC_CMD_HPP_
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/traits/cmd_or_exe.hpp>
-#include <boost/process/detail/traits/wchar_t.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/traits/cmd_or_exe.hpp>
+#include <boost/process/v1/detail/traits/wchar_t.hpp>
 
 #if defined( BOOST_WINDOWS_API )
-#include <boost/process/detail/windows/basic_cmd.hpp>
-#include <boost/process/detail/windows/cmd.hpp>
+#include <boost/process/v1/detail/windows/basic_cmd.hpp>
+#include <boost/process/v1/detail/windows/cmd.hpp>
 #elif defined( BOOST_POSIX_API )
-#include <boost/process/detail/posix/basic_cmd.hpp>
-#include <boost/process/detail/posix/cmd.hpp>
+#include <boost/process/v1/detail/posix/basic_cmd.hpp>
+#include <boost/process/v1/detail/posix/cmd.hpp>
 #endif
 
-#include <boost/process/shell.hpp>
+#include <boost/process/v1/shell.hpp>
 
 #include <iterator>
 
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 template<typename Char>
 struct exe_setter_
@@ -47,7 +47,7 @@ struct char_converter<char, exe_setter_<wchar_t>>
 {
     static exe_setter_<char> conv(const exe_setter_<wchar_t> & in)
     {
-        return {::boost::process::detail::convert(in.exe_)};
+        return {::boost::process::v1::detail::convert(in.exe_)};
     }
 };
 
@@ -56,7 +56,7 @@ struct char_converter<wchar_t, exe_setter_<char>>
 {
     static exe_setter_<wchar_t> conv(const exe_setter_<char> & in)
     {
-        return {::boost::process::detail::convert(in.exe_)};
+        return {::boost::process::v1::detail::convert(in.exe_)};
     }
 };
 
@@ -105,7 +105,7 @@ struct char_converter<char, arg_setter_<wchar_t, true>>
         std::transform(in._args.begin(), in._args.end(), vec.begin(),
                 [](const std::wstring & ws)
                 {
-                    return ::boost::process::detail::convert(ws);
+                    return ::boost::process::v1::detail::convert(ws);
                 });
         return {vec};
     }
@@ -120,7 +120,7 @@ struct char_converter<wchar_t, arg_setter_<char, true>>
         std::transform(in._args.begin(), in._args.end(), vec.begin(),
                 [](const std::string & ws)
                 {
-                    return ::boost::process::detail::convert(ws);
+                    return ::boost::process::v1::detail::convert(ws);
                 });
 
         return {vec};
@@ -136,7 +136,7 @@ struct char_converter<char, arg_setter_<wchar_t, false>>
         std::transform(in._args.begin(), in._args.end(), vec.begin(),
                 [](const std::wstring & ws)
                 {
-                    return ::boost::process::detail::convert(ws);
+                    return ::boost::process::v1::detail::convert(ws);
                 });
         return {vec};    }
 };
@@ -150,7 +150,7 @@ struct char_converter<wchar_t, arg_setter_<char, false>>
         std::transform(in._args.begin(), in._args.end(), vec.begin(),
                 [](const std::string & ws)
                 {
-                    return ::boost::process::detail::convert(ws);
+                    return ::boost::process::v1::detail::convert(ws);
                 });
         return {vec};
     }
@@ -168,7 +168,7 @@ struct exe_builder
     string_type exe;
     std::vector<string_type> args;
 
-    void operator()(const boost::process::filesystem::path & data)
+    void operator()(const boost::process::v1::filesystem::path & data)
     {
         not_cmd = true;
         if (exe.empty())
@@ -285,7 +285,7 @@ struct initializer_builder<cmd_or_exe_tag<wchar_t>>
     typedef exe_builder<wchar_t> type;
 };
 
-}}}
+}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/child_decl.hpp b/inst/include/boost/process/v1/detail/child_decl.hpp
similarity index 74%
rename from inst/include/boost/process/detail/child_decl.hpp
rename to inst/include/boost/process/v1/detail/child_decl.hpp
index 452295a0c..bb84e93af 100644
--- a/inst/include/boost/process/detail/child_decl.hpp
+++ b/inst/include/boost/process/v1/detail/child_decl.hpp
@@ -17,7 +17,7 @@
 #ifndef BOOST_PROCESS_CHILD_DECL_HPP
 #define BOOST_PROCESS_CHILD_DECL_HPP
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <chrono>
 #include <memory>
 
@@ -25,36 +25,36 @@
 #include <atomic>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/child_handle.hpp>
-#include <boost/process/detail/posix/terminate.hpp>
-#include <boost/process/detail/posix/wait_for_exit.hpp>
-#include <boost/process/detail/posix/is_running.hpp>
+#include <boost/process/v1/detail/posix/child_handle.hpp>
+#include <boost/process/v1/detail/posix/terminate.hpp>
+#include <boost/process/v1/detail/posix/wait_for_exit.hpp>
+#include <boost/process/v1/detail/posix/is_running.hpp>
 #elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/child_handle.hpp>
-#include <boost/process/detail/windows/terminate.hpp>
-#include <boost/process/detail/windows/wait_for_exit.hpp>
-#include <boost/process/detail/windows/is_running.hpp>
+#include <boost/process/v1/detail/windows/child_handle.hpp>
+#include <boost/process/v1/detail/windows/terminate.hpp>
+#include <boost/process/v1/detail/windows/wait_for_exit.hpp>
+#include <boost/process/v1/detail/windows/is_running.hpp>
 
 #endif
 namespace boost {
 
-namespace process {
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
-using ::boost::process::detail::api::pid_t;
+using ::boost::process::v1::detail::api::pid_t;
 
 class child
 {
-    ::boost::process::detail::api::child_handle _child_handle;
-    std::shared_ptr<std::atomic<int>> _exit_status = std::make_shared<std::atomic<int>>(::boost::process::detail::api::still_active);
+    ::boost::process::v1::detail::api::child_handle _child_handle;
+    std::shared_ptr<std::atomic<int>> _exit_status = std::make_shared<std::atomic<int>>(::boost::process::v1::detail::api::still_active);
     bool _attached = true;
     bool _terminated = false;
 
     bool _exited()
     {
-        return _terminated || !::boost::process::detail::api::is_running(_exit_status->load());
+        return _terminated || !::boost::process::v1::detail::api::is_running(_exit_status->load());
     };
 public:
-    typedef ::boost::process::detail::api::child_handle child_handle;
+    typedef ::boost::process::v1::detail::api::child_handle child_handle;
     typedef child_handle::process_handle_t native_handle_t;
     explicit child(child_handle &&ch, std::shared_ptr<std::atomic<int>> &ptr) : _child_handle(std::move(ch)), _exit_status(ptr) {}
     explicit child(child_handle &&ch, const std::shared_ptr<std::atomic<int>> &ptr) : _child_handle(std::move(ch)), _exit_status(ptr) {}
@@ -98,7 +98,7 @@ class child
     native_handle_t native_handle() const { return _child_handle.process_handle(); }
 
 
-    int exit_code() const {return ::boost::process::detail::api::eval_exit_status(_exit_status->load());}
+    int exit_code() const {return ::boost::process::v1::detail::api::eval_exit_status(_exit_status->load());}
     pid_t id()      const {return _child_handle.id(); }
 
     int native_exit_code() const {return _exit_status->load();}
@@ -107,7 +107,7 @@ class child
     {
         std::error_code ec;
         bool b = running(ec);
-        boost::process::detail::throw_error(ec, "running error");
+        boost::process::v1::detail::throw_error(ec, "running error");
         return b;
     }
 
@@ -115,14 +115,14 @@ class child
     {
         std::error_code ec;
         terminate(ec);
-        boost::process::detail::throw_error(ec, "terminate error");
+        boost::process::v1::detail::throw_error(ec, "terminate error");
     }
 
     void wait()
     {
         std::error_code ec;
         wait(ec);
-        boost::process::detail::throw_error(ec, "wait error");
+        boost::process::v1::detail::throw_error(ec, "wait error");
     }
 
 #if !defined(BOOST_PROCESS_NO_DEPRECATED)
@@ -133,7 +133,7 @@ class child
     {
         std::error_code ec;
         bool b = wait_for(rel_time, ec);
-        boost::process::detail::throw_error(ec, "wait_for error");
+        boost::process::v1::detail::throw_error(ec, "wait_for error");
         return b;
     }
 
@@ -143,7 +143,7 @@ class child
     {
         std::error_code ec;
         bool b = wait_until(timeout_time, ec);
-        boost::process::detail::throw_error(ec, "wait_until error");
+        boost::process::v1::detail::throw_error(ec, "wait_until error");
         return b;
     }
 #endif
@@ -154,7 +154,7 @@ class child
         if (valid() && !_exited() && !ec)
         {
             int exit_code = 0;
-            auto res = boost::process::detail::api::is_running(_child_handle, exit_code, ec);
+            auto res = boost::process::v1::detail::api::is_running(_child_handle, exit_code, ec);
             if (!ec && !res && !_exited())
                 _exit_status->store(exit_code);
 
@@ -166,7 +166,7 @@ class child
     void terminate(std::error_code & ec) noexcept
     {
         if (valid() && running(ec) && !ec)
-            boost::process::detail::api::terminate(_child_handle, ec);
+            boost::process::v1::detail::api::terminate(_child_handle, ec);
 
         if (!ec)
             _terminated = true;
@@ -177,7 +177,7 @@ class child
         if (!_exited() && valid())
         {
             int exit_code = 0;
-            boost::process::detail::api::wait(_child_handle, exit_code, ec);
+            boost::process::v1::detail::api::wait(_child_handle, exit_code, ec);
             if (!ec)
                 _exit_status->store(exit_code);
         }
@@ -198,7 +198,7 @@ class child
         if (!_exited())
         {
             int exit_code = 0;
-            auto b = boost::process::detail::api::wait_until(_child_handle, exit_code, timeout_time, ec);
+            auto b = boost::process::v1::detail::api::wait_until(_child_handle, exit_code, timeout_time, ec);
             if (!b || ec)
                 return false;
             _exit_status->store(exit_code);
@@ -225,6 +225,7 @@ class child
 
 
 
-}}
+}}}
+
 #endif
 
diff --git a/inst/include/boost/process/detail/config.hpp b/inst/include/boost/process/v1/detail/config.hpp
similarity index 91%
rename from inst/include/boost/process/detail/config.hpp
rename to inst/include/boost/process/v1/detail/config.hpp
index eec7bde10..60978cc01 100644
--- a/inst/include/boost/process/detail/config.hpp
+++ b/inst/include/boost/process/v1/detail/config.hpp
@@ -21,8 +21,18 @@
 #include <system_error>
 #include <boost/system/api_config.hpp>
 
+#if !defined(BOOST_PROCESS_VERSION)
+#define  BOOST_PROCESS_VERSION 1
+#endif
+
+#if BOOST_PROCESS_VERSION == 1
+#define BOOST_PROCESS_V1_INLINE inline
+#else
+#define BOOST_PROCESS_V1_INLINE
+#endif
+
 #include <boost/throw_exception.hpp>
-#include <boost/process/exception.hpp>
+#include <boost/process/v1/exception.hpp>
 #include <boost/assert/source_location.hpp>
 
 #if defined(BOOST_POSIX_API)
@@ -38,7 +48,9 @@ extern char **environ;
 #error "System API not supported by boost.process"
 #endif
 
-namespace boost { namespace process { namespace detail
+
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail
 {
 
 #if !defined(BOOST_PROCESS_PIPE_SIZE)
@@ -121,5 +133,7 @@ template<> constexpr wchar_t  space_sign<wchar_t> () {return L' '; }
 }
 }
 }
+}
+
 
 #endif
diff --git a/inst/include/boost/process/detail/execute_impl.hpp b/inst/include/boost/process/v1/detail/execute_impl.hpp
similarity index 89%
rename from inst/include/boost/process/detail/execute_impl.hpp
rename to inst/include/boost/process/v1/detail/execute_impl.hpp
index 77722f78c..9f305250d 100644
--- a/inst/include/boost/process/detail/execute_impl.hpp
+++ b/inst/include/boost/process/v1/detail/execute_impl.hpp
@@ -17,17 +17,17 @@
 #ifndef BOOST_PROCESS_EXECUTE_HPP
 #define BOOST_PROCESS_EXECUTE_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/traits.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/traits.hpp>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/executor.hpp>
+#include <boost/process/v1/detail/posix/executor.hpp>
 #elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/executor.hpp>
+#include <boost/process/v1/detail/windows/executor.hpp>
 #endif
 
-#include <boost/process/detail/basic_cmd.hpp>
-#include <boost/process/detail/handler.hpp>
+#include <boost/process/v1/detail/basic_cmd.hpp>
+#include <boost/process/v1/detail/handler.hpp>
 
 #include <boost/fusion/view.hpp>
 #include <boost/fusion/container.hpp>
@@ -40,7 +40,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace boost { namespace process {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 class child;
 
@@ -228,7 +228,7 @@ inline child basic_execute_impl(Args && ... args)
     boost::fusion::tuple<typename std::remove_reference<Args>::type&...> tup(args...);
 
     auto inits = boost::fusion::filter_if<
-                boost::process::detail::is_initializer<
+                boost::process::v1::detail::is_initializer<
                     typename std::remove_reference<
                         boost::mpl::_
                         >::type
@@ -237,7 +237,7 @@ inline child basic_execute_impl(Args && ... args)
 
     auto others = boost::fusion::filter_if<
                 boost::mpl::not_<
-                    boost::process::detail::is_initializer<
+                    boost::process::v1::detail::is_initializer<
                      typename std::remove_reference<
                             boost::mpl::_
                             >::type
@@ -250,20 +250,20 @@ inline child basic_execute_impl(Args && ... args)
     //typedef typename boost::fusion::result_of::as_vector<decltype(inits)>::type  inits_t;
     typedef typename boost::fusion::result_of::as_vector<decltype(others)>::type others_t;
     //  typedef decltype(others) others_t;
-    typedef typename ::boost::process::detail::make_builders_from_view<
+    typedef typename ::boost::process::v1::detail::make_builders_from_view<
             typename boost::fusion::result_of::begin<others_t>::type,
             typename boost::fusion::result_of::end  <others_t>::type>::type builder_t;
 
     builder_t builders;
-    ::boost::process::detail::builder_ref<builder_t> builder_ref(builders);
+    ::boost::process::v1::detail::builder_ref<builder_t> builder_ref(builders);
 
     boost::fusion::for_each(others, builder_ref);
-    auto other_inits = ::boost::process::detail::get_initializers(builders);
+    auto other_inits = ::boost::process::v1::detail::get_initializers(builders);
 
 
     boost::fusion::joint_view<decltype(other_inits), decltype(inits)> complete_inits(other_inits, inits);
 
-    auto exec = boost::process::detail::api::make_executor<Char>(complete_inits);
+    auto exec = boost::process::v1::detail::api::make_executor<Char>(complete_inits);
     return exec();
 }
 
@@ -273,12 +273,11 @@ inline child execute_impl(Args&& ... args)
     typedef required_char_type_t<Args...> req_char_type;
 
     return basic_execute_impl<req_char_type>(
-        boost::process::detail::char_converter_t<req_char_type, Args>::conv(
+        boost::process::v1::detail::char_converter_t<req_char_type, Args>::conv(
                 std::forward<Args>(args))...
             );
 }
 
-}}}
-
+}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/handler.hpp b/inst/include/boost/process/v1/detail/handler.hpp
similarity index 83%
rename from inst/include/boost/process/detail/handler.hpp
rename to inst/include/boost/process/v1/detail/handler.hpp
index 1cc5d624b..a12aec543 100644
--- a/inst/include/boost/process/detail/handler.hpp
+++ b/inst/include/boost/process/v1/detail/handler.hpp
@@ -7,16 +7,16 @@
 #ifndef BOOST_PROCESS_DETAIL_HANDLER_HPP_
 #define BOOST_PROCESS_DETAIL_HANDLER_HPP_
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 #endif
 
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 //extended handler base.
 typedef api::handler_base_ext handler;
@@ -68,8 +68,6 @@ struct on_success_ : handler
 
 
 
-}}
-
-
+}}}
 
 #endif /* BOOST_PROCESS_DETAIL_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/handler_base.hpp b/inst/include/boost/process/v1/detail/handler_base.hpp
similarity index 90%
rename from inst/include/boost/process/detail/handler_base.hpp
rename to inst/include/boost/process/v1/detail/handler_base.hpp
index 93a80520e..732b13c42 100644
--- a/inst/include/boost/process/detail/handler_base.hpp
+++ b/inst/include/boost/process/v1/detail/handler_base.hpp
@@ -11,9 +11,10 @@
 #ifndef BOOST_PROCESS_DETAIL_HANDLER_BASE_HPP
 #define BOOST_PROCESS_DETAIL_HANDLER_BASE_HPP
 
+#include <boost/process/v1/detail/config.hpp>
 #include <system_error>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 template<template <class> class Template>
 struct make_handler_t
@@ -44,6 +45,6 @@ struct handler_base
 };
 
 
-}}}
+}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/on_exit.hpp b/inst/include/boost/process/v1/detail/on_exit.hpp
similarity index 81%
rename from inst/include/boost/process/detail/on_exit.hpp
rename to inst/include/boost/process/v1/detail/on_exit.hpp
index d0fd5b8c8..41f351651 100644
--- a/inst/include/boost/process/detail/on_exit.hpp
+++ b/inst/include/boost/process/v1/detail/on_exit.hpp
@@ -6,18 +6,18 @@
 #ifndef BOOST_PROCESS_DETAIL_ON_EXIT_HPP_
 #define BOOST_PROCESS_DETAIL_ON_EXIT_HPP_
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/on_exit.hpp>
+#include <boost/process/v1/detail/posix/on_exit.hpp>
 #elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/on_exit.hpp>
+#include <boost/process/v1/detail/windows/on_exit.hpp>
 #endif
 
 #include <future>
 #include <memory>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 inline std::function<void(int, const std::error_code &)> on_exit_from_future(std::future<int> &f)
 {
@@ -46,8 +46,9 @@ struct on_exit_
 
 }
 
-constexpr static ::boost::process::detail::on_exit_ on_exit{};
+constexpr static ::boost::process::v1::detail::on_exit_ on_exit{};
 
 
-}}
+}}}
+
 #endif /* INCLUDE_BOOST_PROCESS_WINDOWS_ON_EXIT_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/asio_fwd.hpp b/inst/include/boost/process/v1/detail/posix/asio_fwd.hpp
similarity index 88%
rename from inst/include/boost/process/detail/posix/asio_fwd.hpp
rename to inst/include/boost/process/v1/detail/posix/asio_fwd.hpp
index 2c9e7c67d..48c22de4f 100644
--- a/inst/include/boost/process/detail/posix/asio_fwd.hpp
+++ b/inst/include/boost/process/v1/detail/posix/asio_fwd.hpp
@@ -38,7 +38,7 @@ typedef basic_stream_descriptor<any_io_executor> stream_descriptor;
 } //posix
 } //asio
 
-namespace process { namespace detail { namespace posix {
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 class async_pipe;
 
@@ -54,8 +54,9 @@ struct async_out_future;
 } // posix
 } // detail
 
-using ::boost::process::detail::posix::async_pipe;
+using ::boost::process::v1::detail::posix::async_pipe;
 
+} // v1
 } // process
 } // boost
 
diff --git a/inst/include/boost/process/detail/posix/async_handler.hpp b/inst/include/boost/process/v1/detail/posix/async_handler.hpp
similarity index 85%
rename from inst/include/boost/process/detail/posix/async_handler.hpp
rename to inst/include/boost/process/v1/detail/posix/async_handler.hpp
index e25860ad6..b285f32be 100644
--- a/inst/include/boost/process/detail/posix/async_handler.hpp
+++ b/inst/include/boost/process/v1/detail/posix/async_handler.hpp
@@ -7,10 +7,10 @@
 #ifndef BOOST_PROCESS_POSIX_ASYNC_HANDLER_HPP_
 #define BOOST_PROCESS_POSIX_ASYNC_HANDLER_HPP_
 
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <type_traits>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 struct require_io_context {};
 
@@ -35,6 +35,6 @@ template<typename T>
 struct does_require_io_context<const T&> : std::is_base_of<require_io_context, T> {};
 
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_WINDOWS_ASYNC_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/async_in.hpp b/inst/include/boost/process/v1/detail/posix/async_in.hpp
similarity index 77%
rename from inst/include/boost/process/detail/posix/async_in.hpp
rename to inst/include/boost/process/v1/detail/posix/async_in.hpp
index 513163816..558e80bbc 100644
--- a/inst/include/boost/process/detail/posix/async_in.hpp
+++ b/inst/include/boost/process/v1/detail/posix/async_in.hpp
@@ -10,22 +10,22 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_ASYNC_IN_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_ASYNC_IN_HPP
 
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/posix/async_handler.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/posix/async_handler.hpp>
 #include <boost/asio/write.hpp>
-#include <boost/process/async_pipe.hpp>
+#include <boost/process/v1/async_pipe.hpp>
 #include <memory>
 #include <future>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <array>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 
 template<typename Buffer>
-struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
-                         ::boost::process::detail::posix::require_io_context,
-                         ::boost::process::detail::uses_handles
+struct async_in_buffer : ::boost::process::v1::detail::posix::handler_base_ext,
+                         ::boost::process::v1::detail::posix::require_io_context,
+                         ::boost::process::v1::detail::uses_handles
 {
     Buffer & buf;
 
@@ -37,7 +37,7 @@ struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
     }
 
 
-    std::shared_ptr<boost::process::async_pipe> pipe;
+    std::shared_ptr<boost::process::v1::async_pipe> pipe;
 
     async_in_buffer(Buffer & buf) : buf(buf)
     {
@@ -81,7 +81,7 @@ struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
     void on_setup(Executor & exec)
     {
         if (!pipe)
-            pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+            pipe = std::make_shared<boost::process::v1::async_pipe>(get_io_context(exec.seq));
     }
 
     std::array<int, 3> get_used_handles()
@@ -97,7 +97,7 @@ struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
     void on_exec_setup(Executor &exec)
     {
         if (::dup2(pipe->native_source(), STDIN_FILENO) == -1)
-            exec.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+            exec.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
         if (pipe->native_source() != STDIN_FILENO)
             ::close(pipe->native_source());
@@ -106,6 +106,6 @@ struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
 };
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/async_out.hpp b/inst/include/boost/process/v1/detail/posix/async_out.hpp
similarity index 80%
rename from inst/include/boost/process/detail/posix/async_out.hpp
rename to inst/include/boost/process/v1/detail/posix/async_out.hpp
index 17f55f61d..1fef5bb07 100644
--- a/inst/include/boost/process/detail/posix/async_out.hpp
+++ b/inst/include/boost/process/v1/detail/posix/async_out.hpp
@@ -11,18 +11,18 @@
 #define BOOST_PROCESS_DETAIL_POSIX_ASYNC_OUT_HPP
 
 
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <boost/asio/posix/stream_descriptor.hpp>
 #include <boost/asio/read.hpp>
-#include <boost/process/async_pipe.hpp>
+#include <boost/process/v1/async_pipe.hpp>
 #include <istream>
 #include <memory>
 #include <exception>
 #include <future>
 #include <array>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 
 inline int apply_out_handles(int handle, std::integral_constant<int, 1>, std::integral_constant<int, -1>)
@@ -46,13 +46,13 @@ inline int apply_out_handles(int handle, std::integral_constant<int, 1>, std::in
 }
 
 template<int p1, int p2, typename Buffer>
-struct async_out_buffer : ::boost::process::detail::posix::handler_base_ext,
-                          ::boost::process::detail::posix::require_io_context,
-                          ::boost::process::detail::uses_handles
+struct async_out_buffer : ::boost::process::v1::detail::posix::handler_base_ext,
+                          ::boost::process::v1::detail::posix::require_io_context,
+                          ::boost::process::v1::detail::uses_handles
 {
     Buffer & buf;
 
-    std::shared_ptr<boost::process::async_pipe> pipe;
+    std::shared_ptr<boost::process::v1::async_pipe> pipe;
 
     std::array<int, 4> get_used_handles()
     {
@@ -90,7 +90,7 @@ struct async_out_buffer : ::boost::process::detail::posix::handler_base_ext,
     template<typename Executor>
     void on_setup(Executor & exec)
     {
-        pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+        pipe = std::make_shared<boost::process::v1::async_pipe>(get_io_context(exec.seq));
     }
 
 
@@ -100,7 +100,7 @@ struct async_out_buffer : ::boost::process::detail::posix::handler_base_ext,
         int res = apply_out_handles(pipe->native_sink(),
                       std::integral_constant<int, p1>(), std::integral_constant<int, p2>());
         if (res == -1)
-            exec.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+            exec.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
         ::close(pipe->native_sink());
         ::close(pipe->native_source());
@@ -112,14 +112,14 @@ struct async_out_buffer : ::boost::process::detail::posix::handler_base_ext,
 
 
 template<int p1, int p2, typename Type>
-struct async_out_future : ::boost::process::detail::posix::handler_base_ext,
-                          ::boost::process::detail::posix::require_io_context
+struct async_out_future : ::boost::process::v1::detail::posix::handler_base_ext,
+                          ::boost::process::v1::detail::posix::require_io_context
 {
     std::shared_ptr<std::promise<Type>> promise = std::make_shared<std::promise<Type>>();
 
     std::shared_ptr<boost::asio::streambuf> buffer = std::make_shared<boost::asio::streambuf>();
 
-    std::shared_ptr<boost::process::async_pipe> pipe;
+    std::shared_ptr<boost::process::v1::async_pipe> pipe;
 
     async_out_future(std::future<Type> & fut)
     {
@@ -167,7 +167,7 @@ struct async_out_future : ::boost::process::detail::posix::handler_base_ext,
     template<typename Executor>
     void on_setup(Executor & exec)
     {
-        pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+        pipe = std::make_shared<boost::process::v1::async_pipe>(get_io_context(exec.seq));
     }
 
     template <typename Executor>
@@ -177,7 +177,7 @@ struct async_out_future : ::boost::process::detail::posix::handler_base_ext,
         int res = apply_out_handles(pipe->native_sink(),
                       std::integral_constant<int, p1>(), std::integral_constant<int, p2>());
         if (res == -1)
-            exec.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+            exec.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
         ::close(pipe->native_sink());
         ::close(pipe->native_source());
@@ -185,6 +185,6 @@ struct async_out_future : ::boost::process::detail::posix::handler_base_ext,
 
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/async_pipe.hpp b/inst/include/boost/process/v1/detail/posix/async_pipe.hpp
similarity index 92%
rename from inst/include/boost/process/detail/posix/async_pipe.hpp
rename to inst/include/boost/process/v1/detail/posix/async_pipe.hpp
index ea3bbe0ce..350ba407b 100644
--- a/inst/include/boost/process/detail/posix/async_pipe.hpp
+++ b/inst/include/boost/process/v1/detail/posix/async_pipe.hpp
@@ -7,14 +7,14 @@
 #define BOOST_PROCESS_DETAIL_POSIX_ASYNC_PIPE_HPP_
 
 
-#include <boost/process/detail/posix/basic_pipe.hpp>
+#include <boost/process/v1/detail/posix/basic_pipe.hpp>
 #include <boost/asio/posix/stream_descriptor.hpp>
 #include <boost/asio/post.hpp>
 #include <system_error>
 #include <string>
 #include <utility>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 class async_pipe
 {
@@ -37,7 +37,7 @@ class async_pipe
     {
         int fds[2];
         if (::pipe(fds) == -1)
-            boost::process::detail::throw_last_error("pipe(2) failed");
+            boost::process::v1::detail::throw_last_error("pipe(2) failed");
 
         _source.assign(fds[0]);
         _sink  .assign(fds[1]);
@@ -205,18 +205,18 @@ async_pipe::async_pipe(boost::asio::io_context & ios_source,
     auto fifo = mkfifo(name.c_str(), 0666 );
 
     if (fifo != 0)
-        boost::process::detail::throw_last_error("mkfifo() failed");
+        boost::process::v1::detail::throw_last_error("mkfifo() failed");
 
 
     int  read_fd = open(name.c_str(), O_RDWR);
 
     if (read_fd == -1)
-        boost::process::detail::throw_last_error();
+        boost::process::v1::detail::throw_last_error();
 
     int write_fd = dup(read_fd);
 
     if (write_fd == -1)
-        boost::process::detail::throw_last_error();
+        boost::process::v1::detail::throw_last_error();
 
     _source.assign(read_fd);
     _sink  .assign(write_fd);
@@ -236,7 +236,7 @@ async_pipe::async_pipe(const async_pipe & p) :
     {
         _source.assign(::dup(source_in));
         if (_source.native_handle()== -1)
-            ::boost::process::detail::throw_last_error("dup()");
+            ::boost::process::v1::detail::throw_last_error("dup()");
     }
 
     if (sink_in   == -1)
@@ -245,7 +245,7 @@ async_pipe::async_pipe(const async_pipe & p) :
     {
         _sink.assign(::dup(sink_in));
         if (_sink.native_handle() == -1)
-            ::boost::process::detail::throw_last_error("dup()");
+            ::boost::process::v1::detail::throw_last_error("dup()");
     }
 }
 
@@ -263,7 +263,7 @@ async_pipe& async_pipe::operator=(const async_pipe & p)
     {
         source = ::dup(source_in);
         if (source == -1)
-            ::boost::process::detail::throw_last_error("dup()");
+            ::boost::process::v1::detail::throw_last_error("dup()");
     }
 
     if (sink_in   == -1)
@@ -272,7 +272,7 @@ async_pipe& async_pipe::operator=(const async_pipe & p)
     {
         sink  = ::dup(sink_in);
         if (sink == -1)
-            ::boost::process::detail::throw_last_error("dup()");
+            ::boost::process::v1::detail::throw_last_error("dup()");
     }
     _source.assign(source);
     _sink.  assign(sink);
@@ -304,7 +304,7 @@ async_pipe::operator basic_pipe<CharT, Traits>() const
     {
         source = ::dup(source_in);
         if (source == -1)
-            ::boost::process::detail::throw_last_error("dup()");
+            ::boost::process::v1::detail::throw_last_error("dup()");
     }
 
     if (sink_in   == -1)
@@ -313,7 +313,7 @@ async_pipe::operator basic_pipe<CharT, Traits>() const
     {
         sink = ::dup(sink_in);
         if (sink == -1)
-            ::boost::process::detail::throw_last_error("dup()");
+            ::boost::process::v1::detail::throw_last_error("dup()");
     }
 
     return basic_pipe<CharT, Traits>{source, sink};
@@ -360,6 +360,6 @@ inline bool operator!=(const basic_pipe<Char, Traits> & lhs, const async_pipe &
            !compare_handles(lhs.native_sink(),   rhs.native_sink());
 }
 
-}}}}
+}}}}}
 
 #endif /* INCLUDE_BOOST_PIPE_DETAIL_WINDOWS_ASYNC_PIPE_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/basic_cmd.hpp b/inst/include/boost/process/v1/detail/posix/basic_cmd.hpp
similarity index 93%
rename from inst/include/boost/process/detail/posix/basic_cmd.hpp
rename to inst/include/boost/process/v1/detail/posix/basic_cmd.hpp
index f310f1276..5423d5c91 100644
--- a/inst/include/boost/process/detail/posix/basic_cmd.hpp
+++ b/inst/include/boost/process/v1/detail/posix/basic_cmd.hpp
@@ -7,10 +7,11 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_BASIC_CMD_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_BASIC_CMD_HPP_
 
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/cmd.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/cmd.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/process/shell.hpp>
+#include <boost/process/v1/shell.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <string>
@@ -20,12 +21,13 @@ namespace boost
 {
 namespace process
 {
+BOOST_PROCESS_V1_INLINE namespace v1
+{
 namespace detail
 {
 namespace posix
 {
 
-
 inline std::string build_cmd_shell(const std::string & exe, std::vector<std::string> && data)
 {
     std::string st = exe;
@@ -101,7 +103,7 @@ template<typename Char>
 struct exe_cmd_init;
 
 template<>
-struct exe_cmd_init<char> : boost::process::detail::api::handler_base_ext
+struct exe_cmd_init<char> : boost::process::v1::detail::api::handler_base_ext
 {
     exe_cmd_init(const exe_cmd_init & ) = delete;
     exe_cmd_init(exe_cmd_init && ) = default;
@@ -175,6 +177,6 @@ std::vector<char*> exe_cmd_init<char>::make_cmd()
 }
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/basic_pipe.hpp b/inst/include/boost/process/v1/detail/posix/basic_pipe.hpp
similarity index 84%
rename from inst/include/boost/process/detail/posix/basic_pipe.hpp
rename to inst/include/boost/process/v1/detail/posix/basic_pipe.hpp
index 50fd4de39..9316298ef 100644
--- a/inst/include/boost/process/detail/posix/basic_pipe.hpp
+++ b/inst/include/boost/process/v1/detail/posix/basic_pipe.hpp
@@ -11,15 +11,15 @@
 #define BOOST_PROCESS_POSIX_PIPE_HPP
 
 
-#include <boost/process/filesystem.hpp>
-#include <boost/process/detail/posix/compare_handles.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/detail/posix/compare_handles.hpp>
 #include <system_error>
 #include <array>
 #include <unistd.h>
 #include <fcntl.h>
 #include <memory>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 
 template<class CharT, class Traits = std::char_traits<CharT>>
@@ -41,7 +41,7 @@ class basic_pipe
     {
         int fds[2];
         if (::pipe(fds) == -1)
-            boost::process::detail::throw_last_error("pipe(2) failed");
+            boost::process::v1::detail::throw_last_error("pipe(2) failed");
 
         _source = fds[0];
         _sink   = fds[1];
@@ -85,7 +85,7 @@ class basic_pipe
             //Try again if interrupted
             auto err = errno;
             if (err != EINTR)
-                ::boost::process::detail::throw_last_error();
+                ::boost::process::v1::detail::throw_last_error();
         }
         return static_cast<int_type>(write_len);
     }
@@ -97,7 +97,7 @@ class basic_pipe
             //Try again if interrupted
             auto err = errno;
             if (err != EINTR)
-                ::boost::process::detail::throw_last_error();
+                ::boost::process::v1::detail::throw_last_error();
         }
         return static_cast<int_type>(read_len);
     }
@@ -126,13 +126,13 @@ basic_pipe<CharT, Traits>::basic_pipe(const basic_pipe & rhs)
        {
            _source = ::dup(rhs._source);
            if (_source == -1)
-               ::boost::process::detail::throw_last_error("dup() failed");
+               ::boost::process::v1::detail::throw_last_error("dup() failed");
        }
     if (rhs._sink != -1)
     {
         _sink = ::dup(rhs._sink);
         if (_sink == -1)
-            ::boost::process::detail::throw_last_error("dup() failed");
+            ::boost::process::v1::detail::throw_last_error("dup() failed");
 
     }
 }
@@ -144,13 +144,13 @@ basic_pipe<CharT, Traits> &basic_pipe<CharT, Traits>::operator=(const basic_pipe
        {
            _source = ::dup(rhs._source);
            if (_source == -1)
-               ::boost::process::detail::throw_last_error("dup() failed");
+               ::boost::process::v1::detail::throw_last_error("dup() failed");
        }
     if (rhs._sink != -1)
     {
         _sink = ::dup(rhs._sink);
         if (_sink == -1)
-            ::boost::process::detail::throw_last_error("dup() failed");
+            ::boost::process::v1::detail::throw_last_error("dup() failed");
 
     }
     return *this;
@@ -163,18 +163,18 @@ basic_pipe<CharT, Traits>::basic_pipe(const std::string & name)
     auto fifo = mkfifo(name.c_str(), 0666 );
             
     if (fifo != 0) 
-        boost::process::detail::throw_last_error("mkfifo() failed");
+        boost::process::v1::detail::throw_last_error("mkfifo() failed");
 
     
     int  read_fd = open(name.c_str(), O_RDWR);
         
     if (read_fd == -1)
-        boost::process::detail::throw_last_error();
+        boost::process::v1::detail::throw_last_error();
     
     int write_fd = dup(read_fd);
     
     if (write_fd == -1)
-        boost::process::detail::throw_last_error();
+        boost::process::v1::detail::throw_last_error();
 
     _sink = write_fd;
     _source = read_fd;
@@ -195,6 +195,6 @@ inline bool operator!=(const basic_pipe<Char, Traits> & lhs, const basic_pipe<Ch
            !compare_handles(lhs.native_sink(),   rhs.native_sink());
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/child_handle.hpp b/inst/include/boost/process/v1/detail/posix/child_handle.hpp
similarity index 91%
rename from inst/include/boost/process/detail/posix/child_handle.hpp
rename to inst/include/boost/process/v1/detail/posix/child_handle.hpp
index 8ce246d00..7e7534a46 100644
--- a/inst/include/boost/process/detail/posix/child_handle.hpp
+++ b/inst/include/boost/process/v1/detail/posix/child_handle.hpp
@@ -13,7 +13,7 @@
 #include <utility>
 #include <system_error>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 typedef ::pid_t pid_t;
 
@@ -55,6 +55,6 @@ struct child_handle
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/close_in.hpp b/inst/include/boost/process/v1/detail/posix/close_in.hpp
similarity index 64%
rename from inst/include/boost/process/detail/posix/close_in.hpp
rename to inst/include/boost/process/v1/detail/posix/close_in.hpp
index 708f1ac44..c209d8a81 100644
--- a/inst/include/boost/process/detail/posix/close_in.hpp
+++ b/inst/include/boost/process/v1/detail/posix/close_in.hpp
@@ -11,24 +11,24 @@
 #define BOOST_PROCESS_WINDOWS_INITIALIZERS_CLOSE_IN_HPP
 
 
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
-struct close_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct close_in : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     template <class Executor>
     void on_exec_setup(Executor &e) const
     {
         if (::close(STDIN_FILENO) == -1)
-            e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+            e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
     }
 
     int get_used_handles() {return STDIN_FILENO;}
 
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/close_out.hpp b/inst/include/boost/process/v1/detail/posix/close_out.hpp
similarity index 68%
rename from inst/include/boost/process/detail/posix/close_out.hpp
rename to inst/include/boost/process/v1/detail/posix/close_out.hpp
index 1ad6891da..1bc3669d2 100644
--- a/inst/include/boost/process/detail/posix/close_out.hpp
+++ b/inst/include/boost/process/v1/detail/posix/close_out.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_CLOSE_OUT_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_CLOSE_OUT_HPP
 
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <array>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<int p1, int p2>
 struct close_out : handler_base_ext
@@ -30,7 +30,7 @@ template<typename Executor>
 void close_out<1,-1>::on_exec_setup(Executor &e) const
 {
     if (::close(STDOUT_FILENO) == -1)
-        e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+        e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
 
 }
 
@@ -39,7 +39,7 @@ template<typename Executor>
 void close_out<2,-1>::on_exec_setup(Executor &e) const
 {
     if (::close(STDERR_FILENO) == -1)
-        e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+        e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
 }
 
 template<>
@@ -47,12 +47,12 @@ template<typename Executor>
 void close_out<1,2>::on_exec_setup(Executor &e) const
 {
     if (::close(STDOUT_FILENO) == -1)
-        e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+        e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
 
     if (::close(STDERR_FILENO) == -1)
-        e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+        e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/cmd.hpp b/inst/include/boost/process/v1/detail/posix/cmd.hpp
similarity index 94%
rename from inst/include/boost/process/detail/posix/cmd.hpp
rename to inst/include/boost/process/v1/detail/posix/cmd.hpp
index ab4f4fb06..caa0a4310 100644
--- a/inst/include/boost/process/detail/posix/cmd.hpp
+++ b/inst/include/boost/process/v1/detail/posix/cmd.hpp
@@ -7,8 +7,8 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_CMD_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_CMD_HPP_
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <string>
 #include <vector>
 
@@ -16,6 +16,8 @@ namespace boost
 {
 namespace process
 {
+BOOST_PROCESS_V1_INLINE namespace v1
+{
 namespace detail
 {
 namespace posix
@@ -99,6 +101,6 @@ std::vector<Char*> cmd_setter_<Char>::make_cmd(std::vector<std::basic_string<Cha
     return vec;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/compare_handles.hpp b/inst/include/boost/process/v1/detail/posix/compare_handles.hpp
similarity index 66%
rename from inst/include/boost/process/detail/posix/compare_handles.hpp
rename to inst/include/boost/process/v1/detail/posix/compare_handles.hpp
index 634757215..d8be9b537 100644
--- a/inst/include/boost/process/detail/posix/compare_handles.hpp
+++ b/inst/include/boost/process/v1/detail/posix/compare_handles.hpp
@@ -7,12 +7,12 @@
 #define BOOST_PROCESS_DETAIL_POSIX_COMPARE_HANDLES_HPP_
 
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 
 inline bool compare_handles(int lhs, int rhs)
@@ -25,8 +25,8 @@ inline bool compare_handles(int lhs, int rhs)
         return true;
 
     struct stat stat1, stat2;
-    if(fstat(lhs, &stat1) < 0) ::boost::process::detail::throw_last_error("fstat() failed");
-    if(fstat(rhs, &stat2) < 0) ::boost::process::detail::throw_last_error("fstat() failed");
+    if(fstat(lhs, &stat1) < 0) ::boost::process::v1::detail::throw_last_error("fstat() failed");
+    if(fstat(rhs, &stat2) < 0) ::boost::process::v1::detail::throw_last_error("fstat() failed");
     
     return (stat1.st_dev == stat2.st_dev) && (stat1.st_ino == stat2.st_ino);   
 }
@@ -35,7 +35,7 @@ inline bool compare_handles(int lhs, int rhs)
 
 
 
-}}}}
+}}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/posix/env_init.hpp b/inst/include/boost/process/v1/detail/posix/env_init.hpp
similarity index 56%
rename from inst/include/boost/process/detail/posix/env_init.hpp
rename to inst/include/boost/process/v1/detail/posix/env_init.hpp
index 4d01cdad1..9bf30e9a3 100644
--- a/inst/include/boost/process/detail/posix/env_init.hpp
+++ b/inst/include/boost/process/v1/detail/posix/env_init.hpp
@@ -8,11 +8,11 @@
 #define BOOST_PROCESS_DETAIL_POSIX_ENV_INIT_HPP_
 
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/environment.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/environment.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<typename Char>
 struct env_init;
@@ -20,10 +20,10 @@ struct env_init;
 template<>
 struct env_init<char> : handler_base_ext
 {
-    boost::process::environment env;
+    boost::process::v1::environment env;
 
-    env_init(boost::process::environment && env) : env(std::move(env)) {};
-    env_init(const boost::process::environment & env) : env(env) {};
+    env_init(boost::process::v1::environment && env) : env(std::move(env)) {};
+    env_init(const boost::process::v1::environment & env) : env(env) {};
 
 
     template <class Executor>
@@ -34,7 +34,7 @@ struct env_init<char> : handler_base_ext
 
 };
 
-}}}}
+}}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/posix/environment.hpp b/inst/include/boost/process/v1/detail/posix/environment.hpp
similarity index 86%
rename from inst/include/boost/process/detail/posix/environment.hpp
rename to inst/include/boost/process/v1/detail/posix/environment.hpp
index c883f0c23..6ddfc559c 100644
--- a/inst/include/boost/process/detail/posix/environment.hpp
+++ b/inst/include/boost/process/v1/detail/posix/environment.hpp
@@ -9,13 +9,13 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <algorithm>
 #include <cstdlib>
-#include <boost/process/locale.hpp>
+#include <boost/process/v1/locale.hpp>
 
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<typename Char>
 class native_environment_impl
@@ -27,7 +27,7 @@ class native_environment_impl
         while (*p != nullptr)
         {
             std::string str = *p;
-            val.push_back(::boost::process::detail::convert(str));
+            val.push_back(::boost::process::v1::detail::convert(str));
             p++;
         }
         return val;
@@ -68,24 +68,24 @@ class native_environment_impl
 
     string_type get(const string_type & id)
     {
-        std::string id_c = ::boost::process::detail::convert(id);
+        std::string id_c = ::boost::process::v1::detail::convert(id);
         std::string g = ::getenv(id_c.c_str());
-        return ::boost::process::detail::convert(g.c_str());
+        return ::boost::process::v1::detail::convert(g.c_str());
     }
     void        set(const string_type & id, const string_type & value)
     {
-        std::string id_c    = ::boost::process::detail::convert(id.c_str());
-        std::string value_c = ::boost::process::detail::convert(value.c_str());
+        std::string id_c    = ::boost::process::v1::detail::convert(id.c_str());
+        std::string value_c = ::boost::process::v1::detail::convert(value.c_str());
         auto res = ::setenv(id_c.c_str(), value_c.c_str(), true);
         if (res != 0)
-            boost::process::detail::throw_last_error();
+            boost::process::v1::detail::throw_last_error();
     }
     void      reset(const string_type & id)
     {
-        std::string id_c = ::boost::process::detail::convert(id.c_str());
+        std::string id_c = ::boost::process::v1::detail::convert(id.c_str());
         auto res = ::unsetenv(id_c.c_str());
         if (res != 0)
-            ::boost::process::detail::throw_last_error();
+            ::boost::process::v1::detail::throw_last_error();
     }
 
     native_environment_impl() = default;
@@ -114,14 +114,14 @@ class native_environment_impl<char>
     {
         auto res = ::setenv(id, value, 1);
         if (res != 0)
-            boost::process::detail::throw_last_error();
+            boost::process::v1::detail::throw_last_error();
         reload();
     }
     void      reset(const pointer_type id)
     {
         auto res = ::unsetenv(id);
         if (res != 0)
-            boost::process::detail::throw_last_error();
+            boost::process::v1::detail::throw_last_error();
         reload();
     }
 
@@ -186,13 +186,13 @@ struct basic_environment_impl
     template<typename CharR>
     explicit inline  basic_environment_impl(
                 const basic_environment_impl<CharR>& rhs,
-                const ::boost::process::codecvt_type & cv = ::boost::process::codecvt())
+                const ::boost::process::v1::codecvt_type & cv = ::boost::process::v1::codecvt())
         : _data(rhs._data.size())
     {
         std::transform(rhs._data.begin(), rhs._data.end(), _data.begin(),
                 [&](const std::basic_string<CharR> & st)
                 {
-                    return ::boost::process::detail::convert(st, cv);
+                    return ::boost::process::v1::detail::convert(st, cv);
                 }
 
             );
@@ -202,7 +202,7 @@ struct basic_environment_impl
     template<typename CharR>
     basic_environment_impl & operator=(const basic_environment_impl<CharR>& rhs)
     {
-        _data = ::boost::process::detail::convert(rhs._data);
+        _data = ::boost::process::v1::detail::convert(rhs._data);
         _env_arr = _load_var(&*_data.begin());
         _env_impl = &*_env_arr.begin();
         return *this;
@@ -230,7 +230,7 @@ basic_environment_impl<Char>::basic_environment_impl(const native_environment_im
 template<typename Char>
 inline auto basic_environment_impl<Char>::get(const string_type &id) -> string_type
 {
-    auto itr = std::find_if(_data.begin(), _data.end(), 
+    auto itr = std::find_if(_data.begin(), _data.end(),
             [&](const string_type & st) -> bool
             {
                 if (st.size() <= id.size())
@@ -250,7 +250,7 @@ inline auto basic_environment_impl<Char>::get(const string_type &id) -> string_t
 template<typename Char>
 inline void basic_environment_impl<Char>::set(const string_type &id, const string_type &value)
 {
-    auto itr = std::find_if(_data.begin(), _data.end(), 
+    auto itr = std::find_if(_data.begin(), _data.end(),
         [&](const string_type & st) -> bool
         {
             if (st.size() <= id.size())
@@ -261,7 +261,7 @@ inline void basic_environment_impl<Char>::set(const string_type &id, const strin
 
     if (itr != _data.end())
         *itr = id + equal_sign<Char>() + value;
-    else 
+    else
         _data.push_back(id + equal_sign<Char>() + value);
 
     reload();
@@ -270,7 +270,7 @@ inline void basic_environment_impl<Char>::set(const string_type &id, const strin
 template<typename Char>
 inline void  basic_environment_impl<Char>::reset(const string_type &id)
 {
-    auto itr = std::find_if(_data.begin(), _data.end(), 
+    auto itr = std::find_if(_data.begin(), _data.end(),
         [&](const string_type & st) -> bool
         {
             if (st.size() <= id.size())
@@ -280,9 +280,9 @@ inline void  basic_environment_impl<Char>::reset(const string_type &id)
     );
     if (itr != _data.end())
     {
-        _data.erase(itr);//and remove it    
+        _data.erase(itr);//and remove it
     }
-    
+
     reload();
 
 
@@ -320,7 +320,7 @@ inline int native_handle()  {return getpid(); }
 }
 }
 }
-
+}
 
 
 
diff --git a/inst/include/boost/process/detail/posix/exe.hpp b/inst/include/boost/process/v1/detail/posix/exe.hpp
similarity index 86%
rename from inst/include/boost/process/detail/posix/exe.hpp
rename to inst/include/boost/process/v1/detail/posix/exe.hpp
index 9de68acc4..8df0d53c4 100644
--- a/inst/include/boost/process/detail/posix/exe.hpp
+++ b/inst/include/boost/process/v1/detail/posix/exe.hpp
@@ -7,11 +7,14 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_EXE_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_EXE_HPP_
 
+#include <boost/process/v1/detail/config.hpp>
 
 namespace boost
 {
 namespace process
 {
+BOOST_PROCESS_V1_INLINE namespace v1
+{
 namespace detail
 {
 namespace posix
@@ -30,7 +33,7 @@ inline void apply_exe(const StringType & exe, Executor & e)
 }
 }
 }
-
+}
 
 
 #endif /* INCLUDE_BOOST_PROCESS_WINDOWS_ARGS_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/executor.hpp b/inst/include/boost/process/v1/detail/posix/executor.hpp
similarity index 91%
rename from inst/include/boost/process/detail/posix/executor.hpp
rename to inst/include/boost/process/v1/detail/posix/executor.hpp
index c4d999063..cc1bcb6cf 100644
--- a/inst/include/boost/process/detail/posix/executor.hpp
+++ b/inst/include/boost/process/v1/detail/posix/executor.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_EXECUTOR_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_EXECUTOR_HPP
 
-#include <boost/process/detail/child_decl.hpp>
-#include <boost/process/error.hpp>
-#include <boost/process/pipe.hpp>
-#include <boost/process/detail/posix/basic_pipe.hpp>
-#include <boost/process/detail/posix/use_vfork.hpp>
+#include <boost/process/v1/detail/child_decl.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/detail/posix/basic_pipe.hpp>
+#include <boost/process/v1/detail/posix/use_vfork.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <cstdlib>
 #include <sys/types.h>
@@ -28,7 +28,7 @@
 
 #include <boost/core/ignore_unused.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<typename Executor>
 struct on_setup_t
@@ -204,9 +204,9 @@ class executor
             throw process_error(_ec, _msg);
     }
 
-    typedef typename ::boost::process::detail::has_error_handler<Sequence>::type has_error_handler;
-    typedef typename ::boost::process::detail::has_ignore_error <Sequence>::type has_ignore_error;
-    typedef typename ::boost::process::detail::posix::shall_use_vfork<Sequence>::type shall_use_vfork;
+    typedef typename ::boost::process::v1::detail::has_error_handler<Sequence>::type has_error_handler;
+    typedef typename ::boost::process::v1::detail::has_ignore_error <Sequence>::type has_ignore_error;
+    typedef typename ::boost::process::v1::detail::posix::shall_use_vfork<Sequence>::type shall_use_vfork;
 
     inline child invoke(boost::mpl::true_ , boost::mpl::true_ );
     inline child invoke(boost::mpl::false_, boost::mpl::true_ );
@@ -349,7 +349,7 @@ child executor<Sequence>::invoke(boost::mpl::true_, boost::mpl::false_) //ignore
     this->pid = ::fork();
     if (pid == -1)
     {
-        auto ec = boost::process::detail::get_last_error();
+        auto ec = boost::process::v1::detail::get_last_error();
         boost::fusion::for_each(seq, call_on_fork_error(*this, ec));
         return child();
     }
@@ -357,7 +357,7 @@ child executor<Sequence>::invoke(boost::mpl::true_, boost::mpl::false_) //ignore
     {
         boost::fusion::for_each(seq, call_on_exec_setup(*this));
         ::execve(exe, cmd_line, env);
-        auto ec = boost::process::detail::get_last_error();
+        auto ec = boost::process::v1::detail::get_last_error();
         boost::fusion::for_each(seq, call_on_exec_error(*this, ec));
         _exit(EXIT_FAILURE);
     }
@@ -389,21 +389,25 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
 
         if (::pipe(p.p) == -1)
         {
-            set_error(::boost::process::detail::get_last_error(), "pipe(2) failed");
+            set_error(::boost::process::v1::detail::get_last_error(), "pipe(2) failed");
             return child();
         }
         if (::fcntl(p.p[1], F_SETFD, FD_CLOEXEC) == -1)
         {
-            auto err = ::boost::process::detail::get_last_error();
+            auto err = ::boost::process::v1::detail::get_last_error();
             set_error(err, "fcntl(2) failed");//this might throw, so we need to be sure our pipe is safe.
             return child();
         }
+
+        _pipe_sink = p.p[1];
+
         _ec.clear();
         boost::fusion::for_each(seq, call_on_setup(*this));
 
         if (_ec)
         {
             boost::fusion::for_each(seq, call_on_error(*this, _ec));
+            _pipe_sink = -1;
             return child();
         }
 
@@ -413,20 +417,20 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
         this->pid = ::fork();
         if (pid == -1)
         {
-            _ec = boost::process::detail::get_last_error();
+            _ec = boost::process::v1::detail::get_last_error();
             _msg = "fork() failed";
             boost::fusion::for_each(seq, call_on_fork_error(*this, _ec));
             boost::fusion::for_each(seq, call_on_error(*this, _ec));
+            _pipe_sink = -1;
             return child();
         }
         else if (pid == 0)
         {
-            _pipe_sink = p.p[1];
             ::close(p.p[0]);
 
             boost::fusion::for_each(seq, call_on_exec_setup(*this));
             ::execve(exe, cmd_line, env);
-            _ec = boost::process::detail::get_last_error();
+            _ec = boost::process::v1::detail::get_last_error();
             _msg = "execve failed";
             boost::fusion::for_each(seq, call_on_exec_error(*this, _ec));
 
@@ -439,6 +443,7 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
 
         ::close(p.p[1]);
         p.p[1] = -1;
+        _pipe_sink = -1;
         _read_error(p.p[0]);
 
     }
@@ -475,7 +480,7 @@ child executor<Sequence>::invoke(boost::mpl::true_, boost::mpl::true_) //ignore
     this->pid = ::vfork();
     if (pid == -1)
     {
-        auto ec = boost::process::detail::get_last_error();
+        auto ec = boost::process::v1::detail::get_last_error();
         boost::fusion::for_each(seq, call_on_fork_error(*this, ec));
         return child();
     }
@@ -483,7 +488,7 @@ child executor<Sequence>::invoke(boost::mpl::true_, boost::mpl::true_) //ignore
     {
         boost::fusion::for_each(seq, call_on_exec_setup(*this));
         ::execve(exe, cmd_line, env);
-        auto ec = boost::process::detail::get_last_error();
+        auto ec = boost::process::v1::detail::get_last_error();
         boost::fusion::for_each(seq, call_on_exec_error(*this, ec));
         _exit(EXIT_FAILURE);
     }
@@ -511,7 +516,7 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::true_)
     this->pid = ::vfork();
     if (pid == -1)
     {
-        _ec = boost::process::detail::get_last_error();
+        _ec = boost::process::v1::detail::get_last_error();
         _msg = "fork() failed";
         boost::fusion::for_each(seq, call_on_fork_error(*this, _ec));
         boost::fusion::for_each(seq, call_on_error(*this, _ec));
@@ -524,7 +529,7 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::true_)
 
         ::execve(exe, cmd_line, env);
 
-        _ec = boost::process::detail::get_last_error();
+        _ec = boost::process::v1::detail::get_last_error();
         _msg = "execve failed";
         boost::fusion::for_each(seq, call_on_exec_error(*this, _ec));
 
@@ -563,6 +568,6 @@ inline executor<Tup> make_executor(Tup & tup)
     return executor<Tup>(tup);
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/fd.hpp b/inst/include/boost/process/v1/detail/posix/fd.hpp
similarity index 72%
rename from inst/include/boost/process/detail/posix/fd.hpp
rename to inst/include/boost/process/v1/detail/posix/fd.hpp
index bd5f153d3..20216bd73 100644
--- a/inst/include/boost/process/detail/posix/fd.hpp
+++ b/inst/include/boost/process/v1/detail/posix/fd.hpp
@@ -10,15 +10,15 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_FD_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_FD_HPP
 
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <unistd.h>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <array>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 
-struct close_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
+struct close_fd_ : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     close_fd_(int fd) : fd_(fd) {}
 
@@ -26,7 +26,7 @@ struct close_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
     void on_exec_setup(PosixExecutor& e) const
     {
         if (::close(fd_) == -1)
-            e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+            e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
     }
 
     int get_used_handles() {return fd_;}
@@ -37,7 +37,7 @@ struct close_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
 };
 
 template <class Range>
-struct close_fds_ : handler_base_ext, ::boost::process::detail::uses_handles
+struct close_fds_ : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
 public:
     close_fds_(const Range &fds) : fds_(fds) {}
@@ -48,7 +48,7 @@ struct close_fds_ : handler_base_ext, ::boost::process::detail::uses_handles
         for (auto & fd_ : fds_)
             if (::close(fd_) == -1)
             {
-                 e.set_error(::boost::process::detail::get_last_error(), "close() failed");
+                 e.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
                  break;
             }
     }
@@ -62,7 +62,7 @@ struct close_fds_ : handler_base_ext, ::boost::process::detail::uses_handles
 
 
 template <class FileDescriptor>
-struct bind_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
+struct bind_fd_ : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
 public:
     bind_fd_(int id, const FileDescriptor &fd) : id_(id), fd_(fd) {}
@@ -71,7 +71,7 @@ struct bind_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
     void on_exec_setup(PosixExecutor& e) const
     {
         if (::dup2(fd_, id_) == -1)
-             e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+             e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
     }
 
     std::array<int, 2> get_used_handles() {return {id_, fd_};}
@@ -97,6 +97,6 @@ struct fd_
 };
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/file_descriptor.hpp b/inst/include/boost/process/v1/detail/posix/file_descriptor.hpp
similarity index 88%
rename from inst/include/boost/process/detail/posix/file_descriptor.hpp
rename to inst/include/boost/process/v1/detail/posix/file_descriptor.hpp
index 1d897b11d..fb4fd7c1c 100644
--- a/inst/include/boost/process/detail/posix/file_descriptor.hpp
+++ b/inst/include/boost/process/v1/detail/posix/file_descriptor.hpp
@@ -8,10 +8,10 @@
 
 #include <fcntl.h>
 #include <string>
-#include <boost/process/filesystem.hpp>
+#include <boost/process/v1/filesystem.hpp>
 #include <boost/core/exchange.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 struct file_descriptor
 {
@@ -24,7 +24,7 @@ struct file_descriptor
 
 
     file_descriptor() = default;
-    explicit file_descriptor(const boost::process::filesystem::path& p, mode_t mode = read_write)
+    explicit file_descriptor(const boost::process::v1::filesystem::path& p, mode_t mode = read_write)
         : file_descriptor(p.native(), mode)
     {
     }
@@ -84,6 +84,6 @@ struct file_descriptor
     int _handle = -1;
 };
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_FILE_DESCRIPTOR_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/file_in.hpp b/inst/include/boost/process/v1/detail/posix/file_in.hpp
similarity index 66%
rename from inst/include/boost/process/detail/posix/file_in.hpp
rename to inst/include/boost/process/v1/detail/posix/file_in.hpp
index 87388e8a3..b5df08fdf 100644
--- a/inst/include/boost/process/detail/posix/file_in.hpp
+++ b/inst/include/boost/process/v1/detail/posix/file_in.hpp
@@ -10,16 +10,16 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_FILE_IN_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_FILE_IN_HPP
 
-#include <boost/process/pipe.hpp>
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/file_descriptor.hpp>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/file_descriptor.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <cstdio>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
-struct file_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct file_in : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     file_descriptor file;
     int handle = file.handle();
@@ -37,10 +37,10 @@ struct file_in : handler_base_ext, ::boost::process::detail::uses_handles
     void on_exec_setup(WindowsExecutor &e) const
     {
         if (::dup2(handle, STDIN_FILENO) == -1)
-             e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+             e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/file_out.hpp b/inst/include/boost/process/v1/detail/posix/file_out.hpp
similarity index 68%
rename from inst/include/boost/process/detail/posix/file_out.hpp
rename to inst/include/boost/process/v1/detail/posix/file_out.hpp
index ce32b3263..e1a6f3948 100644
--- a/inst/include/boost/process/detail/posix/file_out.hpp
+++ b/inst/include/boost/process/v1/detail/posix/file_out.hpp
@@ -11,15 +11,15 @@
 #ifndef BOOST_PROCESS_POSIX_FILE_OUT_HPP
 #define BOOST_PROCESS_POSIX_FILE_OUT_HPP
 
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/file_descriptor.hpp>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/file_descriptor.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<int p1, int p2>
-struct file_out : handler_base_ext, ::boost::process::detail::uses_handles
+struct file_out : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     file_descriptor file;
     int handle = file.handle();
@@ -45,7 +45,7 @@ template<typename Executor>
 void file_out<1,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(handle, STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 }
 
 template<>
@@ -53,7 +53,7 @@ template<typename Executor>
 void file_out<2,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(handle, STDERR_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 }
 
 template<>
@@ -61,13 +61,13 @@ template<typename Executor>
 void file_out<1,2>::on_exec_setup(Executor &e) const
 {
     if (::dup2(handle, STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
     if (::dup2(handle, STDERR_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/group_handle.hpp b/inst/include/boost/process/v1/detail/posix/group_handle.hpp
similarity index 82%
rename from inst/include/boost/process/detail/posix/group_handle.hpp
rename to inst/include/boost/process/v1/detail/posix/group_handle.hpp
index 8438b9099..9de663bd5 100644
--- a/inst/include/boost/process/detail/posix/group_handle.hpp
+++ b/inst/include/boost/process/v1/detail/posix/group_handle.hpp
@@ -6,12 +6,12 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_GROUP_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_GROUP_HPP_
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/child_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/child_handle.hpp>
 #include <system_error>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 struct group_handle
 {
@@ -70,7 +70,7 @@ struct group_handle
 inline  void terminate(group_handle &p, std::error_code &ec) noexcept
 {
     if (::killpg(p.grp, SIGKILL) == -1)
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
         ec.clear();
 
@@ -81,7 +81,7 @@ inline void terminate(group_handle &p)
 {
     std::error_code ec;
     terminate(p, ec);
-    boost::process::detail::throw_error(ec, "killpg(2) failed in terminate");
+    boost::process::v1::detail::throw_error(ec, "killpg(2) failed in terminate");
 }
 
 inline bool in_group()
@@ -89,6 +89,6 @@ inline bool in_group()
     return true;
 }
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_GROUP_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/group_ref.hpp b/inst/include/boost/process/v1/detail/posix/group_ref.hpp
similarity index 78%
rename from inst/include/boost/process/detail/posix/group_ref.hpp
rename to inst/include/boost/process/v1/detail/posix/group_ref.hpp
index 730450fe1..2f4d42e8b 100644
--- a/inst/include/boost/process/detail/posix/group_ref.hpp
+++ b/inst/include/boost/process/v1/detail/posix/group_ref.hpp
@@ -6,13 +6,13 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_GROUP_REF_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_GROUP_REF_HPP_
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/group_handle.hpp>
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/group_handle.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <unistd.h>
 
 
-namespace boost { namespace process {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 namespace detail { namespace posix {
 
@@ -46,7 +46,7 @@ struct group_ref : handler_base_ext
 
 };
 
-}}}}
+}}}}}
 
 
 #endif /* BOOST_PROCESS_DETAIL_POSIX_GROUP_REF_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/handler.hpp b/inst/include/boost/process/v1/detail/posix/handler.hpp
similarity index 90%
rename from inst/include/boost/process/detail/posix/handler.hpp
rename to inst/include/boost/process/v1/detail/posix/handler.hpp
index 5ca3989a0..b1964551d 100644
--- a/inst/include/boost/process/detail/posix/handler.hpp
+++ b/inst/include/boost/process/v1/detail/posix/handler.hpp
@@ -6,9 +6,9 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_HANDLER_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_HANDLER_HPP_
 
-#include <boost/process/detail/handler_base.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 //does not extend anything.
 struct handler_base_ext : handler_base 
@@ -67,7 +67,7 @@ struct on_exec_error_ : handler_base_ext
     Handler handler_;
 };
 
-}}}}
+}}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/posix/handles.hpp b/inst/include/boost/process/v1/detail/posix/handles.hpp
similarity index 83%
rename from inst/include/boost/process/detail/posix/handles.hpp
rename to inst/include/boost/process/v1/detail/posix/handles.hpp
index 304e77b1c..bd1b498e4 100644
--- a/inst/include/boost/process/detail/posix/handles.hpp
+++ b/inst/include/boost/process/v1/detail/posix/handles.hpp
@@ -13,9 +13,9 @@
 #include <algorithm>
 #include <memory>
 #include <cstdlib>
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 
 using native_handle_type = int;
@@ -27,7 +27,7 @@ inline std::vector<native_handle_type> get_handles(std::error_code & ec)
     std::unique_ptr<DIR, void(*)(DIR*)> dir{::opendir("/dev/fd"), +[](DIR* p){::closedir(p);}};
     if (!dir)
     {
-        ec = ::boost::process::detail::get_last_error();
+        ec = ::boost::process::v1::detail::get_last_error();
         return {};
     }
     else
@@ -60,7 +60,7 @@ inline std::vector<native_handle_type> get_handles()
 
     auto res = get_handles(ec);
     if (ec)
-        boost::process::detail::throw_error(ec, "open_dir(\"/dev/fd\") failed");
+        boost::process::v1::detail::throw_error(ec, "open_dir(\"/dev/fd\") failed");
 
     return res;
 }
@@ -72,7 +72,7 @@ inline bool is_stream_handle(native_handle_type handle, std::error_code & ec)
 
     if (::fstat(handle, &stat_) != 0)
     {
-        ec = ::boost::process::detail::get_last_error();
+        ec = ::boost::process::v1::detail::get_last_error();
     }
     else
         ec.clear();
@@ -90,7 +90,7 @@ inline bool is_stream_handle(native_handle_type handle)
     std::error_code ec;
     auto res = is_stream_handle(handle, ec);
     if (ec)
-        boost::process::detail::throw_error(ec, "fstat() failed");
+        boost::process::v1::detail::throw_error(ec, "fstat() failed");
 
     return res;
 }
@@ -113,7 +113,7 @@ struct limit_handles_ : handler_base_ext
         auto dir = ::opendir("/dev/fd");
         if (!dir)
         {
-            exec.set_error(::boost::process::detail::get_last_error(), "opendir(\"/dev/fd\")");
+            exec.set_error(::boost::process::v1::detail::get_last_error(), "opendir(\"/dev/fd\")");
             return;
         }
 
@@ -135,7 +135,7 @@ struct limit_handles_ : handler_base_ext
 
             if (::close(conv) != 0)
             {
-                exec.set_error(::boost::process::detail::get_last_error(), "close() failed");
+                exec.set_error(::boost::process::v1::detail::get_last_error(), "close() failed");
                 return;
             }
         }
@@ -143,6 +143,6 @@ struct limit_handles_ : handler_base_ext
     }
 };
 
-}}}}
+}}}}}
 
 #endif //PROCESS_HANDLES_HPP
diff --git a/inst/include/boost/process/detail/posix/io_context_ref.hpp b/inst/include/boost/process/v1/detail/posix/io_context_ref.hpp
similarity index 85%
rename from inst/include/boost/process/detail/posix/io_context_ref.hpp
rename to inst/include/boost/process/v1/detail/posix/io_context_ref.hpp
index e9cddb626..468739ed4 100644
--- a/inst/include/boost/process/detail/posix/io_context_ref.hpp
+++ b/inst/include/boost/process/v1/detail/posix/io_context_ref.hpp
@@ -6,8 +6,8 @@
 #ifndef BOOST_PROCESS_POSIX_IO_CONTEXT_REF_HPP_
 #define BOOST_PROCESS_POSIX_IO_CONTEXT_REF_HPP_
 
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/async_handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/async_handler.hpp>
 #include <boost/asio/io_context.hpp>
 
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
@@ -17,8 +17,8 @@
 #include <boost/fusion/container/vector/convert.hpp>
 
 
-#include <boost/process/detail/posix/sigchld_service.hpp>
-#include <boost/process/detail/posix/is_running.hpp>
+#include <boost/process/v1/detail/posix/sigchld_service.hpp>
+#include <boost/process/v1/detail/posix/is_running.hpp>
 
 #include <functional>
 #include <type_traits>
@@ -26,7 +26,7 @@
 #include <vector>
 #include <sys/wait.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<typename Executor>
 struct on_exit_handler_transformer
@@ -100,7 +100,7 @@ struct io_context_ref : handler_base_ext
                 {
                     es->store(val);
                     for (auto & func : funcs)
-                        func(::boost::process::detail::posix::eval_exit_status(val), ec);
+                        func(::boost::process::v1::detail::posix::eval_exit_status(val), ec);
                 };
 
         sigchld_service.async_wait(exec.pid, std::move(wh));
@@ -117,9 +117,9 @@ struct io_context_ref : handler_base_ext
 
 private:
     boost::asio::io_context &ios;
-    boost::process::detail::posix::sigchld_service &sigchld_service = boost::asio::use_service<boost::process::detail::posix::sigchld_service>(ios);
+    boost::process::v1::detail::posix::sigchld_service &sigchld_service = boost::asio::use_service<boost::process::v1::detail::posix::sigchld_service>(ios);
 };
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_WINDOWS_IO_CONTEXT_REF_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/is_running.hpp b/inst/include/boost/process/v1/detail/posix/is_running.hpp
similarity index 84%
rename from inst/include/boost/process/detail/posix/is_running.hpp
rename to inst/include/boost/process/v1/detail/posix/is_running.hpp
index 0f86b44d0..133ad9c06 100644
--- a/inst/include/boost/process/detail/posix/is_running.hpp
+++ b/inst/include/boost/process/v1/detail/posix/is_running.hpp
@@ -6,12 +6,12 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_IS_RUNNING_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_IS_RUNNING_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/child_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/child_handle.hpp>
 #include <system_error>
 #include <sys/wait.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 // Use the "stopped" state (WIFSTOPPED) to indicate "not terminated".
 // This bit arrangement of status codes is not guaranteed by POSIX, but (according to comments in
@@ -35,7 +35,7 @@ inline bool is_running(const child_handle &p, int & exit_code, std::error_code &
     if (ret == -1)
     {
         if (errno != ECHILD) //because it no child is running, then this one isn't either, obviously.
-            ec = ::boost::process::detail::get_last_error();
+            ec = ::boost::process::v1::detail::get_last_error();
         return false;
     }
     else if (ret == 0)
@@ -55,7 +55,7 @@ inline bool is_running(const child_handle &p, int & exit_code)
 {
     std::error_code ec;
     bool b = is_running(p, exit_code, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in is_running");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in is_running");
     return b;
 }
 
@@ -75,6 +75,6 @@ inline int eval_exit_status(int code)
     }
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/null_in.hpp b/inst/include/boost/process/v1/detail/posix/null_in.hpp
similarity index 63%
rename from inst/include/boost/process/detail/posix/null_in.hpp
rename to inst/include/boost/process/v1/detail/posix/null_in.hpp
index def5641d5..5719512fc 100644
--- a/inst/include/boost/process/detail/posix/null_in.hpp
+++ b/inst/include/boost/process/v1/detail/posix/null_in.hpp
@@ -10,16 +10,16 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_NULL_IN_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_NULL_IN_HPP
 
-#include <boost/process/pipe.hpp>
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/file_descriptor.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/file_descriptor.hpp>
 #include <unistd.h>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <array>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
-struct null_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct null_in : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     file_descriptor source{"/dev/null", file_descriptor::read};
 
@@ -34,10 +34,10 @@ struct null_in : handler_base_ext, ::boost::process::detail::uses_handles
     void on_exec_setup(Executor &e) const
     {
         if (::dup2(source.handle(), STDIN_FILENO) == -1)
-             e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+             e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/null_out.hpp b/inst/include/boost/process/v1/detail/posix/null_out.hpp
similarity index 66%
rename from inst/include/boost/process/detail/posix/null_out.hpp
rename to inst/include/boost/process/v1/detail/posix/null_out.hpp
index b879ff54d..6deb72a21 100644
--- a/inst/include/boost/process/detail/posix/null_out.hpp
+++ b/inst/include/boost/process/v1/detail/posix/null_out.hpp
@@ -11,16 +11,16 @@
 #ifndef BOOST_PROCESS_POSIX_PIPE_OUT_HPP
 #define BOOST_PROCESS_POSIX_PIPE_OUT_HPP
 
-#include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/posix/file_descriptor.hpp>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/file_descriptor.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <unistd.h>
 #include <array>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<int p1, int p2>
-struct null_out : handler_base_ext, ::boost::process::detail::uses_handles
+struct null_out : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     file_descriptor sink{"/dev/null", file_descriptor::write};
     
@@ -41,7 +41,7 @@ template<typename Executor>
 void null_out<1,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink.handle(), STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 }
 
 template<>
@@ -49,7 +49,7 @@ template<typename Executor>
 void null_out<2,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink.handle(), STDERR_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 }
 
 template<>
@@ -57,12 +57,12 @@ template<typename Executor>
 void null_out<1,2>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink.handle(), STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
     if (::dup2(sink.handle(), STDERR_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/on_exit.hpp b/inst/include/boost/process/v1/detail/posix/on_exit.hpp
similarity index 70%
rename from inst/include/boost/process/detail/posix/on_exit.hpp
rename to inst/include/boost/process/v1/detail/posix/on_exit.hpp
index 1dcac300c..b61a18547 100644
--- a/inst/include/boost/process/detail/posix/on_exit.hpp
+++ b/inst/include/boost/process/v1/detail/posix/on_exit.hpp
@@ -7,21 +7,21 @@
 #define BOOST_PROCESS_POSIX_ON_EXIT_HPP_
 
 #include <boost/asio/execution.hpp>
-#include <boost/process/async.hpp>
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/posix/async_handler.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/posix/async_handler.hpp>
 #include <system_error>
 #include <functional>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 template<typename Tuple>
 inline asio::io_context& get_io_context(const Tuple & tup);
 
 namespace posix {
 
-struct on_exit_ : boost::process::detail::posix::async_handler
+struct on_exit_ : boost::process::v1::detail::posix::async_handler
 {
     std::function<void(int, const std::error_code&)> handler;
     on_exit_(const std::function<void(int, const std::error_code&)> & handler) : handler(handler)
@@ -31,7 +31,7 @@ struct on_exit_ : boost::process::detail::posix::async_handler
     template<typename Executor>
     std::function<void(int, const std::error_code&)> on_exit_handler(Executor& exec)
     {
-        auto v = boost::asio::prefer(boost::process::detail::get_io_context(exec.seq).get_executor(),
+        auto v = boost::asio::prefer(boost::process::v1::detail::get_io_context(exec.seq).get_executor(),
                                      boost::asio::execution::outstanding_work.tracked);
         auto handler_ = this->handler;
         return
@@ -44,5 +44,5 @@ struct on_exit_ : boost::process::detail::posix::async_handler
 };
 
 
-}}}}
+}}}}}
 #endif /* BOOST_PROCESS_POSIX_ON_EXIT_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/pipe_in.hpp b/inst/include/boost/process/v1/detail/posix/pipe_in.hpp
similarity index 82%
rename from inst/include/boost/process/detail/posix/pipe_in.hpp
rename to inst/include/boost/process/v1/detail/posix/pipe_in.hpp
index 32588ead4..3607dd343 100644
--- a/inst/include/boost/process/detail/posix/pipe_in.hpp
+++ b/inst/include/boost/process/v1/detail/posix/pipe_in.hpp
@@ -10,15 +10,15 @@
 #ifndef BOOST_PROCESS_POSIX_PIPE_IN_HPP
 #define BOOST_PROCESS_POSIX_PIPE_IN_HPP
 
-#include <boost/process/pipe.hpp>
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <unistd.h>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
 #include <array>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
-struct pipe_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct pipe_in : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     int source;
     int sink; //opposite end
@@ -53,7 +53,7 @@ struct pipe_in : handler_base_ext, ::boost::process::detail::uses_handles
     void on_exec_setup(Executor &e) const
     {
         if (::dup2(source, STDIN_FILENO) == -1)
-             e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+             e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
         if (source != STDIN_FILENO)
             ::close(source);
 
@@ -93,6 +93,6 @@ struct async_pipe_in : public pipe_in
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/pipe_out.hpp b/inst/include/boost/process/v1/detail/posix/pipe_out.hpp
similarity index 73%
rename from inst/include/boost/process/detail/posix/pipe_out.hpp
rename to inst/include/boost/process/v1/detail/posix/pipe_out.hpp
index d54cca4ef..332a24d58 100644
--- a/inst/include/boost/process/detail/posix/pipe_out.hpp
+++ b/inst/include/boost/process/v1/detail/posix/pipe_out.hpp
@@ -11,18 +11,28 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_PIPE_OUT_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_PIPE_OUT_HPP
 
-#include <boost/process/pipe.hpp>
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <unistd.h>
+#include <array>
+#include <boost/process/v1/detail/used_handles.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<int p1, int p2>
-struct pipe_out : handler_base_ext
+struct pipe_out : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     int sink;
     int source; //opposite end
 
+    std::array<int, 4> get_used_handles()
+    {
+        const auto pp1 = p1 != -1 ? p1 : p2;
+        const auto pp2 = p2 != -1 ? p2 : p1;
+
+        return {source, sink, pp1, pp2};
+    }
+
     pipe_out(int sink, int source) : sink(sink), source(source) {}
 
     template<typename T>
@@ -52,7 +62,7 @@ template<typename Executor>
 void pipe_out<1,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink, STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
     if (sink != STDOUT_FILENO)
         ::close(sink);
@@ -64,7 +74,7 @@ template<typename Executor>
 void pipe_out<2,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink, STDERR_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
 
     if (sink != STDOUT_FILENO)
         ::close(sink);
@@ -76,11 +86,12 @@ template<typename Executor>
 void pipe_out<1,2>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink, STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
     if (::dup2(sink, STDERR_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
+         e.set_error(::boost::process::v1::detail::get_last_error(), "dup2() failed");
     if ((sink != STDOUT_FILENO) && (sink != STDERR_FILENO))
         ::close(sink);
+    ::close(source);
 }
 
 class async_pipe;
@@ -115,6 +126,6 @@ struct async_pipe_out : public pipe_out<p1, p2>
 };
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/search_path.hpp b/inst/include/boost/process/v1/detail/posix/search_path.hpp
similarity index 61%
rename from inst/include/boost/process/detail/posix/search_path.hpp
rename to inst/include/boost/process/v1/detail/posix/search_path.hpp
index b409642a5..86a43d051 100644
--- a/inst/include/boost/process/detail/posix/search_path.hpp
+++ b/inst/include/boost/process/v1/detail/posix/search_path.hpp
@@ -10,21 +10,21 @@
 #ifndef BOOST_PROCESS_POSIX_SEARCH_PATH_HPP
 #define BOOST_PROCESS_POSIX_SEARCH_PATH_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/filesystem.hpp>
 #include <boost/tokenizer.hpp>
 #include <string>
 #include <stdexcept>
 #include <stdlib.h>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
-inline boost::process::filesystem::path search_path(
-        const boost::process::filesystem::path &filename,
-        const std::vector<boost::process::filesystem::path> &path)
+inline boost::process::v1::filesystem::path search_path(
+        const boost::process::v1::filesystem::path &filename,
+        const std::vector<boost::process::v1::filesystem::path> &path)
 {
-    for (const boost::process::filesystem::path & pp : path)
+    for (const boost::process::v1::filesystem::path & pp : path)
     {
         auto p = pp / filename;
 #if defined(BOOST_PROCESS_USE_STD_FS)
@@ -32,13 +32,13 @@ inline boost::process::filesystem::path search_path(
 #else
         boost::system::error_code ec;
 #endif
-        bool file = boost::process::filesystem::is_regular_file(p, ec);
+        bool file = boost::process::v1::filesystem::is_regular_file(p, ec);
         if (!ec && file && ::access(p.c_str(), X_OK) == 0)
             return p;
     }
     return "";
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/shell_path.hpp b/inst/include/boost/process/v1/detail/posix/shell_path.hpp
similarity index 64%
rename from inst/include/boost/process/detail/posix/shell_path.hpp
rename to inst/include/boost/process/v1/detail/posix/shell_path.hpp
index c05d8ad92..4e399ae6d 100644
--- a/inst/include/boost/process/detail/posix/shell_path.hpp
+++ b/inst/include/boost/process/v1/detail/posix/shell_path.hpp
@@ -10,23 +10,23 @@
 #ifndef BOOST_PROCESS_POSIX_SHELL_PATH_HPP
 #define BOOST_PROCESS_POSIX_SHELL_PATH_HPP
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <boost/system/error_code.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/process/v1/filesystem.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
-inline boost::process::filesystem::path shell_path()
+inline boost::process::v1::filesystem::path shell_path()
 {
     return "/bin/sh";
 }
 
-inline boost::process::filesystem::path shell_path(std::error_code &ec)
+inline boost::process::v1::filesystem::path shell_path(std::error_code &ec)
 {
     ec.clear();
     return "/bin/sh";
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/sigchld_service.hpp b/inst/include/boost/process/v1/detail/posix/sigchld_service.hpp
similarity index 97%
rename from inst/include/boost/process/detail/posix/sigchld_service.hpp
rename to inst/include/boost/process/v1/detail/posix/sigchld_service.hpp
index 9d6640935..eac7dedd0 100644
--- a/inst/include/boost/process/detail/posix/sigchld_service.hpp
+++ b/inst/include/boost/process/v1/detail/posix/sigchld_service.hpp
@@ -20,7 +20,7 @@
 #include <sys/wait.h>
 #include <list>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 class sigchld_service : public boost::asio::detail::service_base<sigchld_service>
 {
@@ -145,7 +145,7 @@ void sigchld_service::_handle_signal(const boost::system::error_code & ec)
 }
 }
 }
-
+}
 
 
 
diff --git a/inst/include/boost/process/detail/posix/signal.hpp b/inst/include/boost/process/v1/detail/posix/signal.hpp
similarity index 74%
rename from inst/include/boost/process/detail/posix/signal.hpp
rename to inst/include/boost/process/v1/detail/posix/signal.hpp
index f9ef32d05..766830274 100644
--- a/inst/include/boost/process/detail/posix/signal.hpp
+++ b/inst/include/boost/process/v1/detail/posix/signal.hpp
@@ -11,10 +11,10 @@
 #ifndef BOOST_PROCESS_POSIX_SIGNAL_HPP
 #define BOOST_PROCESS_POSIX_SIGNAL_HPP
 
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <signal.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 #if defined(__GLIBC__)
     using sighandler_t = ::sighandler_t;
@@ -55,16 +55,16 @@ struct sig_init_ : handler_base_ext
     }
 private:
     bool _reset = false;
-    ::boost::process::detail::posix::sighandler_t _old{0};
-    ::boost::process::detail::posix::sighandler_t _handler{0};
+    ::boost::process::v1::detail::posix::sighandler_t _old{0};
+    ::boost::process::v1::detail::posix::sighandler_t _handler{0};
 };
 
 struct sig_
 {
     constexpr sig_() {}
 
-    sig_init_ operator()(::boost::process::detail::posix::sighandler_t h) const {return h;}
-    sig_init_ operator= (::boost::process::detail::posix::sighandler_t h) const {return h;}
+    sig_init_ operator()(::boost::process::v1::detail::posix::sighandler_t h) const {return h;}
+    sig_init_ operator= (::boost::process::v1::detail::posix::sighandler_t h) const {return h;}
     sig_init_ dfl() const {return SIG_DFL;}
     sig_init_ ign() const {return SIG_IGN;}
 
@@ -74,6 +74,6 @@ struct sig_
 
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/start_dir.hpp b/inst/include/boost/process/v1/detail/posix/start_dir.hpp
similarity index 85%
rename from inst/include/boost/process/detail/posix/start_dir.hpp
rename to inst/include/boost/process/v1/detail/posix/start_dir.hpp
index 5483bb73d..4a3bc9c80 100644
--- a/inst/include/boost/process/detail/posix/start_dir.hpp
+++ b/inst/include/boost/process/v1/detail/posix/start_dir.hpp
@@ -10,12 +10,12 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_START_DIR_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_START_DIR_HPP
 
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <string>
 #include <unistd.h>
 #include <boost/core/ignore_unused.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 template<typename Char>
 struct start_dir_init : handler_base_ext
@@ -34,6 +34,6 @@ struct start_dir_init : handler_base_ext
     string_type s_;
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/terminate.hpp b/inst/include/boost/process/v1/detail/posix/terminate.hpp
similarity index 72%
rename from inst/include/boost/process/detail/posix/terminate.hpp
rename to inst/include/boost/process/v1/detail/posix/terminate.hpp
index a707ea501..1e993996c 100644
--- a/inst/include/boost/process/detail/posix/terminate.hpp
+++ b/inst/include/boost/process/v1/detail/posix/terminate.hpp
@@ -10,19 +10,19 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_TERMINATE_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_TERMINATE_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/child_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/child_handle.hpp>
 #include <system_error>
 #include <signal.h>
 #include <sys/wait.h>
 
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 inline void terminate(const child_handle &p, std::error_code &ec) noexcept
 {
     if (::kill(p.pid, SIGKILL) == -1)
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
         ec.clear();
 
@@ -34,9 +34,9 @@ inline void terminate(const child_handle &p)
 {
     std::error_code ec;
     terminate(p, ec);
-    boost::process::detail::throw_error(ec, "kill(2) failed");
+    boost::process::v1::detail::throw_error(ec, "kill(2) failed");
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/use_vfork.hpp b/inst/include/boost/process/v1/detail/posix/use_vfork.hpp
similarity index 79%
rename from inst/include/boost/process/detail/posix/use_vfork.hpp
rename to inst/include/boost/process/v1/detail/posix/use_vfork.hpp
index 98f74b24f..b7f32b377 100644
--- a/inst/include/boost/process/detail/posix/use_vfork.hpp
+++ b/inst/include/boost/process/v1/detail/posix/use_vfork.hpp
@@ -9,11 +9,11 @@
 #define BOOST_PROCESS_DETAIL_POSIX_USE_VFORK_HPP_
 
 
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #include <boost/fusion/sequence/intrinsic/has_key.hpp>
 #include <boost/fusion/container/set/convert.hpp>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 struct use_vfork_ : handler_base_ext
 {
@@ -28,6 +28,6 @@ struct shall_use_vfork
 };
 
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_POSIX_USE_VFORK_HPP_ */
diff --git a/inst/include/boost/process/detail/posix/wait_for_exit.hpp b/inst/include/boost/process/v1/detail/posix/wait_for_exit.hpp
similarity index 90%
rename from inst/include/boost/process/detail/posix/wait_for_exit.hpp
rename to inst/include/boost/process/v1/detail/posix/wait_for_exit.hpp
index de8153b81..6bd85c842 100644
--- a/inst/include/boost/process/detail/posix/wait_for_exit.hpp
+++ b/inst/include/boost/process/v1/detail/posix/wait_for_exit.hpp
@@ -10,14 +10,14 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_WAIT_FOR_EXIT_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_WAIT_FOR_EXIT_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/child_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/child_handle.hpp>
 #include <system_error>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 inline void wait(const child_handle &p, int & exit_code, std::error_code &ec) noexcept
 {
@@ -32,7 +32,7 @@ inline void wait(const child_handle &p, int & exit_code, std::error_code &ec) no
            (ret != -1 && !WIFEXITED(status) && !WIFSIGNALED(status)));
 
     if (ret == -1)
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
     {
         ec.clear();
@@ -44,7 +44,7 @@ inline void wait(const child_handle &p, int & exit_code) noexcept
 {
     std::error_code ec;
     wait(p, exit_code, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in wait");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in wait");
 }
 
 template< class Clock, class Duration >
@@ -131,7 +131,7 @@ inline bool wait_until(
     pid_t timeout_pid = ::fork();
     if (timeout_pid  == -1)
     {
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
         return true;
     }
     else if (timeout_pid == 0)
@@ -192,7 +192,7 @@ inline bool wait_until(
 #endif
 
     if (ret == -1)
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
     {
         ec.clear();
@@ -210,7 +210,7 @@ inline bool wait_until(
 {
     std::error_code ec;
     bool b = wait_until(p, exit_code, time_out, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in wait_until");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in wait_until");
     return b;
 }
 
@@ -232,10 +232,10 @@ inline bool wait_for(
 {
     std::error_code ec;
     bool b = wait_for(p, exit_code, rel_time, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in wait_for");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in wait_for");
     return b;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/posix/wait_group.hpp b/inst/include/boost/process/v1/detail/posix/wait_group.hpp
similarity index 83%
rename from inst/include/boost/process/detail/posix/wait_group.hpp
rename to inst/include/boost/process/v1/detail/posix/wait_group.hpp
index 426fd3092..c0d678b44 100644
--- a/inst/include/boost/process/detail/posix/wait_group.hpp
+++ b/inst/include/boost/process/v1/detail/posix/wait_group.hpp
@@ -10,15 +10,15 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_WAIT_GROUP_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_WAIT_GROUP_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/posix/group_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/posix/group_handle.hpp>
 #include <chrono>
 #include <system_error>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-namespace boost { namespace process { namespace detail { namespace posix {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace posix {
 
 inline void wait(const group_handle &p, std::error_code &ec) noexcept
 {
@@ -40,7 +40,7 @@ inline void wait(const group_handle &p, std::error_code &ec) noexcept
     while ((ret != -1) || (errno != ECHILD));
    
     if (errno != ECHILD)
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
         ec.clear();
 }
@@ -49,7 +49,7 @@ inline void wait(const group_handle &p) noexcept
 {
     std::error_code ec;
     wait(p, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in wait");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in wait");
 }
 
 template< class Clock, class Duration >
@@ -79,7 +79,7 @@ inline bool wait_until(
                 ec.clear();
                 return true;
             }
-            ec = boost::process::detail::get_last_error();
+            ec = boost::process::v1::detail::get_last_error();
             return false;
         }
         //we can wait, because unlike in the wait_for_exit, we have no race condition regarding eh exit code.
@@ -95,7 +95,7 @@ inline bool wait_until(
 {
     std::error_code ec;
     bool b = wait_until(p, time_out, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in wait_until");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in wait_until");
     return b;
 }
 
@@ -115,10 +115,10 @@ inline bool wait_for(
 {
     std::error_code ec;
     bool b = wait_for(p, rel_time, ec);
-    boost::process::detail::throw_error(ec, "waitpid(2) failed in wait_for");
+    boost::process::v1::detail::throw_error(ec, "waitpid(2) failed in wait_for");
     return b;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/throw_on_error.hpp b/inst/include/boost/process/v1/detail/throw_on_error.hpp
similarity index 71%
rename from inst/include/boost/process/detail/throw_on_error.hpp
rename to inst/include/boost/process/v1/detail/throw_on_error.hpp
index 071aaec0c..e06edaca6 100644
--- a/inst/include/boost/process/detail/throw_on_error.hpp
+++ b/inst/include/boost/process/v1/detail/throw_on_error.hpp
@@ -11,12 +11,12 @@
 #ifndef BOOST_PROCESS_DETAIL_INITIALIZERS_THROW_ON_ERROR_HPP
 #define BOOST_PROCESS_DETAIL_INITIALIZERS_THROW_ON_ERROR_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/handler_base.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
-struct throw_on_error_ : ::boost::process::detail::handler
+struct throw_on_error_ : ::boost::process::v1::detail::handler
 {
     template <class Executor>
     void on_error(Executor& exec, const std::error_code & ec) const
@@ -29,8 +29,8 @@ struct throw_on_error_ : ::boost::process::detail::handler
 
 }
 
-constexpr boost::process::detail::throw_on_error_ throw_on_error;
+constexpr boost::process::v1::detail::throw_on_error_ throw_on_error;
 
-}}
+}}}
 
 #endif
diff --git a/inst/include/boost/process/v1/detail/traits.hpp b/inst/include/boost/process/v1/detail/traits.hpp
new file mode 100644
index 000000000..dc3cc5e4a
--- /dev/null
+++ b/inst/include/boost/process/v1/detail/traits.hpp
@@ -0,0 +1,17 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+
+#ifndef BOOST_PROCESS_TRAITS_HPP_
+#define BOOST_PROCESS_TRAITS_HPP_
+
+#include <boost/process/v1/detail/traits/decl.hpp>
+#include <boost/process/v1/detail/traits/async.hpp>
+#include <boost/process/v1/detail/traits/cmd_or_exe.hpp>
+#include <boost/process/v1/detail/traits/env.hpp>
+#include <boost/process/v1/detail/traits/error.hpp>
+#include <boost/process/v1/detail/traits/wchar_t.hpp>
+
+#endif /* BOOST_PROCESS_TRAITS_HPP_ */
diff --git a/inst/include/boost/process/detail/traits/async.hpp b/inst/include/boost/process/v1/detail/traits/async.hpp
similarity index 74%
rename from inst/include/boost/process/detail/traits/async.hpp
rename to inst/include/boost/process/v1/detail/traits/async.hpp
index 380f9f320..1e02e3885 100644
--- a/inst/include/boost/process/detail/traits/async.hpp
+++ b/inst/include/boost/process/v1/detail/traits/async.hpp
@@ -7,15 +7,15 @@
 #ifndef BOOST_PROCESS_DETAIL_TRAITS_ASYNC_HPP_
 #define BOOST_PROCESS_DETAIL_TRAITS_ASYNC_HPP_
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/traits/decl.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/traits/decl.hpp>
 
 namespace boost { namespace asio {
 
 class io_context;
 }}
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 struct async_tag {};
 
@@ -27,8 +27,6 @@ template<> struct initializer_tag<::boost::asio::io_context> { typedef async_tag
 
 
 
-}}}
-
-
+}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/traits/cmd_or_exe.hpp b/inst/include/boost/process/v1/detail/traits/cmd_or_exe.hpp
similarity index 87%
rename from inst/include/boost/process/detail/traits/cmd_or_exe.hpp
rename to inst/include/boost/process/v1/detail/traits/cmd_or_exe.hpp
index 66af5b32d..e1c873bb5 100644
--- a/inst/include/boost/process/detail/traits/cmd_or_exe.hpp
+++ b/inst/include/boost/process/v1/detail/traits/cmd_or_exe.hpp
@@ -11,9 +11,11 @@
 #include <vector>
 #include <type_traits>
 #include <initializer_list>
-#include <boost/process/filesystem.hpp>
-#include <boost/process/detail/traits/decl.hpp>
-namespace boost { namespace process { namespace detail {
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/detail/traits/decl.hpp>
+
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 template<typename Char>
 struct cmd_or_exe_tag {};
@@ -53,12 +55,12 @@ template<> struct initializer_tag<std::initializer_list<const wchar_t *>> { type
 
 template<> struct initializer_tag<shell_>
 {
-    typedef cmd_or_exe_tag<typename boost::process::filesystem::path::value_type> type;
+    typedef cmd_or_exe_tag<typename boost::process::v1::filesystem::path::value_type> type;
 };
 
-template<> struct initializer_tag<boost::process::filesystem::path>
+template<> struct initializer_tag<boost::process::v1::filesystem::path>
 {
-    typedef cmd_or_exe_tag<typename boost::process::filesystem::path::value_type> type;
+    typedef cmd_or_exe_tag<typename boost::process::v1::filesystem::path::value_type> type;
 };
 
 template <typename Char>
@@ -78,8 +80,6 @@ template<>
 struct initializer_builder<cmd_or_exe_tag<wchar_t>>;
 
 
-}}}
-
-
+}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_STRING_TRAITS_HPP_ */
diff --git a/inst/include/boost/process/detail/traits/decl.hpp b/inst/include/boost/process/v1/detail/traits/decl.hpp
similarity index 87%
rename from inst/include/boost/process/detail/traits/decl.hpp
rename to inst/include/boost/process/v1/detail/traits/decl.hpp
index 6062b2264..457b97eb8 100644
--- a/inst/include/boost/process/detail/traits/decl.hpp
+++ b/inst/include/boost/process/v1/detail/traits/decl.hpp
@@ -7,18 +7,18 @@
 #ifndef BOOST_PROCESS_DETAIL_TRAITS_DECL_HPP_
 #define BOOST_PROCESS_DETAIL_TRAITS_DECL_HPP_
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <boost/none.hpp>
 #include <type_traits>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
 #elif defined(BOOST_WINDOWS_API)
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 #endif
 
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 
 template<typename T>
@@ -69,8 +69,6 @@ struct valid_argument_list
 
 
 
-}}}
-
-
+}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/traits/env.hpp b/inst/include/boost/process/v1/detail/traits/env.hpp
similarity index 80%
rename from inst/include/boost/process/detail/traits/env.hpp
rename to inst/include/boost/process/v1/detail/traits/env.hpp
index fdcf8add0..2f6fdb8a0 100644
--- a/inst/include/boost/process/detail/traits/env.hpp
+++ b/inst/include/boost/process/v1/detail/traits/env.hpp
@@ -6,11 +6,10 @@
 #ifndef BOOST_PROCESS_DETAIL_TRAITS_ENV_HPP_
 #define BOOST_PROCESS_DETAIL_TRAITS_ENV_HPP_
 
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/traits/decl.hpp>
 
-#include <boost/process/detail/traits/decl.hpp>
-
-
-namespace boost { namespace process {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 template<typename Char>
 class basic_environment;
@@ -23,9 +22,6 @@ namespace detail {
 template<typename Char>
 struct env_tag {};
 
-
-
-
 template<typename Char> struct env_set;
 template<typename Char> struct env_append;
 
@@ -39,8 +35,8 @@ template<typename Char> struct initializer_tag<env_append<Char>> { typedef env_t
 template<typename Char> struct initializer_tag<env_reset<Char>> { typedef env_tag<Char> type;};
 template<typename Char> struct initializer_tag<env_init <Char>> { typedef env_tag<Char> type;};
 
-template<typename Char>  struct initializer_tag<::boost::process::basic_environment<Char>>           { typedef env_tag<Char> type; };
-template<typename Char>  struct initializer_tag<::boost::process::basic_native_environment<Char>> { typedef env_tag<Char> type; };
+template<typename Char>  struct initializer_tag<::boost::process::v1::basic_environment<Char>>        { typedef env_tag<Char> type; };
+template<typename Char>  struct initializer_tag<::boost::process::v1::basic_native_environment<Char>> { typedef env_tag<Char> type; };
 
 template<> struct initializer_builder<env_tag<char>>;
 template<> struct initializer_builder<env_tag<wchar_t>>;
@@ -48,6 +44,5 @@ template<> struct initializer_builder<env_tag<wchar_t>>;
 }
 
 
-}}
-
+}}}
 #endif /* INCLUDE_BOOST_PROCESS_DETAIL_ENV_HPP_ */
diff --git a/inst/include/boost/process/detail/traits/error.hpp b/inst/include/boost/process/v1/detail/traits/error.hpp
similarity index 69%
rename from inst/include/boost/process/detail/traits/error.hpp
rename to inst/include/boost/process/v1/detail/traits/error.hpp
index d2f7d5e48..e5ee9ace1 100644
--- a/inst/include/boost/process/detail/traits/error.hpp
+++ b/inst/include/boost/process/v1/detail/traits/error.hpp
@@ -7,21 +7,19 @@
 #ifndef BOOST_PROCESS_DETAIL_TRAITS_ERROR_HPP_
 #define BOOST_PROCESS_DETAIL_TRAITS_ERROR_HPP_
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <system_error>
-#include <boost/process/detail/traits/decl.hpp>
+#include <boost/process/v1/detail/traits/decl.hpp>
 
 
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 struct error_tag;
 
 template<>
 struct initializer_tag<std::error_code>;
 
-}}}
-
-
+}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/traits/group.hpp b/inst/include/boost/process/v1/detail/traits/group.hpp
similarity index 63%
rename from inst/include/boost/process/detail/traits/group.hpp
rename to inst/include/boost/process/v1/detail/traits/group.hpp
index 3e7897c68..53b20596a 100644
--- a/inst/include/boost/process/detail/traits/group.hpp
+++ b/inst/include/boost/process/v1/detail/traits/group.hpp
@@ -7,12 +7,12 @@
 #ifndef BOOST_PROCESS_DETAIL_TRAITS_GROUP_HPP_
 #define BOOST_PROCESS_DETAIL_TRAITS_GROUP_HPP_
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/traits/decl.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/traits/decl.hpp>
 
 
 
-namespace boost { namespace process {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 struct group;
 
@@ -25,12 +25,12 @@ template<>
 struct make_initializer_t<group_tag>;
 
 
-template<> struct initializer_tag_t<::boost::process::group> { typedef group_tag type;};
+template<> struct initializer_tag_t<::boost::process::v1::group> { typedef group_tag type;};
 
 
 
 
-}}}
+}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/traits/wchar_t.hpp b/inst/include/boost/process/v1/detail/traits/wchar_t.hpp
similarity index 87%
rename from inst/include/boost/process/detail/traits/wchar_t.hpp
rename to inst/include/boost/process/v1/detail/traits/wchar_t.hpp
index 6e10cb14f..34dc591d7 100644
--- a/inst/include/boost/process/detail/traits/wchar_t.hpp
+++ b/inst/include/boost/process/v1/detail/traits/wchar_t.hpp
@@ -9,18 +9,18 @@
 
 #include <algorithm>
 
-#include <boost/process/detail/traits/decl.hpp>
-#include <boost/process/detail/traits/cmd_or_exe.hpp>
-#include <boost/process/detail/traits/env.hpp>
-#include <boost/process/locale.hpp>
+#include <boost/process/v1/detail/traits/decl.hpp>
+#include <boost/process/v1/detail/traits/cmd_or_exe.hpp>
+#include <boost/process/v1/detail/traits/env.hpp>
+#include <boost/process/v1/locale.hpp>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 //template
 
 template<typename T> struct is_wchar_t : std::false_type {};
 
-template<> struct is_wchar_t<boost::process::filesystem::path> : std::is_same<typename boost::process::filesystem::path::value_type, wchar_t>
+template<> struct is_wchar_t<boost::process::v1::filesystem::path> : std::is_same<typename boost::process::v1::filesystem::path::value_type, wchar_t>
 {
 };
 
@@ -68,7 +68,7 @@ struct char_converter<char, const wchar_t*>
     {
         std::size_t size = 0;
         while (in[size] != L'\0') size++;
-        return ::boost::process::detail::convert(in, in + size);
+        return ::boost::process::v1::detail::convert(in, in + size);
     }
 };
 
@@ -79,7 +79,7 @@ struct char_converter<char, wchar_t*>
     {
         std::size_t size = 0;
         while (in[size] != L'\0') size++;
-        return ::boost::process::detail::convert(in, in + size);
+        return ::boost::process::v1::detail::convert(in, in + size);
     }
 };
 
@@ -88,7 +88,7 @@ struct char_converter<char, wchar_t[Size]>
 {
     static std::string conv(const wchar_t(&in)[Size])
     {
-        return ::boost::process::detail::convert(in, in + Size -1);
+        return ::boost::process::v1::detail::convert(in, in + Size -1);
     }
 };
 
@@ -99,7 +99,7 @@ struct char_converter<wchar_t, const char*>
     {
         std::size_t size = 0;
         while (in[size] != '\0') size++;
-        return ::boost::process::detail::convert(in, in + size);
+        return ::boost::process::v1::detail::convert(in, in + size);
     }
 };
 
@@ -110,7 +110,7 @@ struct char_converter<wchar_t, char*>
     {
         std::size_t size = 0;
         while (in[size] != '\0') size++;
-        return ::boost::process::detail::convert(in, in + size);
+        return ::boost::process::v1::detail::convert(in, in + size);
     }
 };
 
@@ -120,7 +120,7 @@ struct char_converter<wchar_t, char[Size]>
 {
     static std::wstring conv(const char(&in)[Size])
     {
-        return ::boost::process::detail::convert(in, in + Size -1);
+        return ::boost::process::v1::detail::convert(in, in + Size -1);
     }
 };
 
@@ -130,7 +130,7 @@ struct char_converter<wchar_t, std::string>
 {
     static std::wstring conv(const std::string & in)
     {
-        return ::boost::process::detail::convert(in);
+        return ::boost::process::v1::detail::convert(in);
     }
 };
 
@@ -139,7 +139,7 @@ struct char_converter<char, std::wstring>
 {
     static std::string conv(const std::wstring & in)
     {
-        return ::boost::process::detail::convert(in);
+        return ::boost::process::v1::detail::convert(in);
     }
 };
 
@@ -272,5 +272,5 @@ struct char_converter<char, std::initializer_list<wchar_t * >>
 };
 
 
-}}}
+}}}}
 #endif /* BOOST_PROCESS_DETAIL_TRAITS_WCHAR_T_HPP_ */
diff --git a/inst/include/boost/process/detail/used_handles.hpp b/inst/include/boost/process/v1/detail/used_handles.hpp
similarity index 71%
rename from inst/include/boost/process/detail/used_handles.hpp
rename to inst/include/boost/process/v1/detail/used_handles.hpp
index 8db226d43..db1720a26 100644
--- a/inst/include/boost/process/detail/used_handles.hpp
+++ b/inst/include/boost/process/v1/detail/used_handles.hpp
@@ -11,14 +11,14 @@
 #include <boost/fusion/include/for_each.hpp>
 
 #if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/handles.hpp>
-#include <boost/process/detail/posix/asio_fwd.hpp>
+#include <boost/process/v1/detail/posix/handles.hpp>
+#include <boost/process/v1/detail/posix/asio_fwd.hpp>
 #else
-#include <boost/process/detail/windows/handles.hpp>
-#include <boost/process/detail/windows/asio_fwd.hpp>
+#include <boost/process/v1/detail/windows/handles.hpp>
+#include <boost/process/v1/detail/windows/asio_fwd.hpp>
 #endif
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 struct uses_handles
 {
@@ -52,7 +52,7 @@ struct foreach_handle_invocator
             func(handle_);
 
     }
-    void invoke(::boost::process::detail::api::native_handle_type handle) const {func(handle);};
+    void invoke(::boost::process::v1::detail::api::native_handle_type handle) const {func(handle);};
 
     template<typename T>
     void operator()(T & val) const {invoke(val.get_used_handles());}
@@ -66,16 +66,16 @@ void foreach_used_handle(Executor &exec, Function &&func)
 }
 
 template<typename Executor>
-std::vector<::boost::process::detail::api::native_handle_type>
+std::vector<::boost::process::v1::detail::api::native_handle_type>
         get_used_handles(Executor &exec)
 {
-    std::vector<::boost::process::detail::api::native_handle_type> res = exec.get_used_handles();
-    foreach_used_handle(exec, [&](::boost::process::detail::api::native_handle_type handle){res.push_back(handle);});
+    std::vector<::boost::process::v1::detail::api::native_handle_type> res = exec.get_used_handles();
+    foreach_used_handle(exec, [&](::boost::process::v1::detail::api::native_handle_type handle){res.push_back(handle);});
     return res;
 }
 
 
 
-}}}
+}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_USED_HANDLES_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/asio_fwd.hpp b/inst/include/boost/process/v1/detail/windows/asio_fwd.hpp
similarity index 85%
rename from inst/include/boost/process/detail/windows/asio_fwd.hpp
rename to inst/include/boost/process/v1/detail/windows/asio_fwd.hpp
index 207b140ba..8a3e6d5af 100644
--- a/inst/include/boost/process/detail/windows/asio_fwd.hpp
+++ b/inst/include/boost/process/v1/detail/windows/asio_fwd.hpp
@@ -6,8 +6,9 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_ASIO_FWD_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_ASIO_FWD_HPP_
 
-#include <memory>
+#include <boost/process/v1/detail/config.hpp>
 #include <boost/asio/ts/netfwd.hpp>
+#include <memory>
 
 namespace boost { namespace asio {
 
@@ -37,7 +38,7 @@ typedef basic_object_handle<any_io_executor> object_handle;
 } //windows
 } //asio
 
-namespace process { namespace detail { namespace windows {
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 class async_pipe;
 
@@ -53,8 +54,9 @@ struct async_out_future;
 } // windows
 } // detail
 
-using ::boost::process::detail::windows::async_pipe;
+using ::boost::process::v1::detail::windows::async_pipe;
 
+} // v1
 } // process
 } // boost
 
diff --git a/inst/include/boost/process/detail/windows/async_handler.hpp b/inst/include/boost/process/v1/detail/windows/async_handler.hpp
similarity index 82%
rename from inst/include/boost/process/detail/windows/async_handler.hpp
rename to inst/include/boost/process/v1/detail/windows/async_handler.hpp
index ad0410eba..8295671bb 100644
--- a/inst/include/boost/process/detail/windows/async_handler.hpp
+++ b/inst/include/boost/process/v1/detail/windows/async_handler.hpp
@@ -7,10 +7,11 @@
 #ifndef BOOST_PROCESS_WINDOWS_ASYNC_HANDLER_HPP_
 #define BOOST_PROCESS_WINDOWS_ASYNC_HANDLER_HPP_
 
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 #include <type_traits>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 struct require_io_context {};
 
@@ -35,6 +36,6 @@ template<typename T>
 struct does_require_io_context<const T&> : std::is_base_of<require_io_context, T> {};
 
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_WINDOWS_ASYNC_HANDLER_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/async_in.hpp b/inst/include/boost/process/v1/detail/windows/async_in.hpp
similarity index 78%
rename from inst/include/boost/process/detail/windows/async_in.hpp
rename to inst/include/boost/process/v1/detail/windows/async_in.hpp
index cd45835af..37ee72e9d 100644
--- a/inst/include/boost/process/detail/windows/async_in.hpp
+++ b/inst/include/boost/process/v1/detail/windows/async_in.hpp
@@ -16,21 +16,21 @@
 #include <boost/winapi/error_codes.hpp>
 
 #include <boost/asio/write.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/async_handler.hpp>
-#include <boost/process/detail/windows/asio_fwd.hpp>
-#include <boost/process/async_pipe.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/async_handler.hpp>
+#include <boost/process/v1/detail/windows/asio_fwd.hpp>
+#include <boost/process/v1/async_pipe.hpp>
 #include <memory>
 #include <future>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 
 template<typename Buffer>
-struct async_in_buffer : ::boost::process::detail::windows::handler_base_ext,
-                         ::boost::process::detail::windows::require_io_context,
-                         ::boost::process::detail::uses_handles
+struct async_in_buffer : ::boost::process::v1::detail::windows::handler_base_ext,
+                         ::boost::process::v1::detail::windows::require_io_context,
+                         ::boost::process::v1::detail::uses_handles
 {
     Buffer & buf;
 
@@ -41,7 +41,7 @@ struct async_in_buffer : ::boost::process::detail::windows::handler_base_ext,
         fut = promise->get_future(); return std::move(*this);
     }
 
-    std::shared_ptr<boost::process::async_pipe> pipe;
+    std::shared_ptr<boost::process::v1::async_pipe> pipe;
 
     ::boost::winapi::HANDLE_ get_used_handles() const
     {
@@ -91,7 +91,7 @@ struct async_in_buffer : ::boost::process::detail::windows::handler_base_ext,
     void on_setup(WindowsExecutor &exec)
     {
         if (!pipe)
-            pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+            pipe = std::make_shared<boost::process::v1::async_pipe>(get_io_context(exec.seq));
 
         ::boost::winapi::HANDLE_ source_handle = std::move(*pipe).source().native_handle();
 
@@ -106,6 +106,6 @@ struct async_in_buffer : ::boost::process::detail::windows::handler_base_ext,
 };
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/async_out.hpp b/inst/include/boost/process/v1/detail/windows/async_out.hpp
similarity index 83%
rename from inst/include/boost/process/detail/windows/async_out.hpp
rename to inst/include/boost/process/v1/detail/windows/async_out.hpp
index ed39b0340..b22272ce6 100644
--- a/inst/include/boost/process/detail/windows/async_out.hpp
+++ b/inst/include/boost/process/v1/detail/windows/async_out.hpp
@@ -15,9 +15,9 @@
 #include <boost/winapi/handle_info.hpp>
 #include <boost/winapi/error_codes.hpp>
 #include <boost/asio/read.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/asio_fwd.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/asio_fwd.hpp>
 
 #include <istream>
 #include <memory>
@@ -25,7 +25,7 @@
 #include <future>
 
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 
 template <typename Executor>
@@ -67,12 +67,12 @@ inline void apply_out_handles(Executor &e, void* handle, std::integral_constant<
 }
 
 template<int p1, int p2, typename Buffer>
-struct async_out_buffer : ::boost::process::detail::windows::handler_base_ext,
-                          ::boost::process::detail::windows::require_io_context
+struct async_out_buffer : ::boost::process::v1::detail::windows::handler_base_ext,
+                          ::boost::process::v1::detail::windows::require_io_context
 {
     Buffer & buf;
 
-    std::shared_ptr<boost::process::async_pipe> pipe;
+    std::shared_ptr<boost::process::v1::async_pipe> pipe;
 
 
     async_out_buffer(Buffer & buf) : buf(buf)
@@ -99,7 +99,7 @@ struct async_out_buffer : ::boost::process::detail::windows::handler_base_ext,
     void on_setup(WindowsExecutor &exec)
     {
         if (!pipe)
-            pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+            pipe = std::make_shared<boost::process::v1::async_pipe>(get_io_context(exec.seq));
         apply_out_handles(exec, std::move(*pipe).sink().native_handle(),
                 std::integral_constant<int, p1>(), std::integral_constant<int, p2>());
     }
@@ -108,11 +108,11 @@ struct async_out_buffer : ::boost::process::detail::windows::handler_base_ext,
 
 
 template<int p1, int p2, typename Type>
-struct async_out_future : ::boost::process::detail::windows::handler_base_ext,
-                          ::boost::process::detail::windows::require_io_context,
-                          ::boost::process::detail::uses_handles
+struct async_out_future : ::boost::process::v1::detail::windows::handler_base_ext,
+                          ::boost::process::v1::detail::windows::require_io_context,
+                          ::boost::process::v1::detail::uses_handles
 {
-    std::shared_ptr<boost::process::async_pipe> pipe;
+    std::shared_ptr<boost::process::v1::async_pipe> pipe;
     std::shared_ptr<std::promise<Type>> promise = std::make_shared<std::promise<Type>>();
     std::shared_ptr<boost::asio::streambuf> buffer = std::make_shared<boost::asio::streambuf>();
 
@@ -173,7 +173,7 @@ struct async_out_future : ::boost::process::detail::windows::handler_base_ext,
     void on_setup(WindowsExecutor &exec)
     {
         if (!pipe)
-            pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+            pipe = std::make_shared<boost::process::v1::async_pipe>(get_io_context(exec.seq));
 
         apply_out_handles(exec, std::move(*pipe).sink().native_handle(),
                 std::integral_constant<int, p1>(), std::integral_constant<int, p2>());
@@ -181,6 +181,6 @@ struct async_out_future : ::boost::process::detail::windows::handler_base_ext,
 };
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/async_pipe.hpp b/inst/include/boost/process/v1/detail/windows/async_pipe.hpp
similarity index 97%
rename from inst/include/boost/process/detail/windows/async_pipe.hpp
rename to inst/include/boost/process/v1/detail/windows/async_pipe.hpp
index 0b447f9b8..718f300d4 100644
--- a/inst/include/boost/process/detail/windows/async_pipe.hpp
+++ b/inst/include/boost/process/v1/detail/windows/async_pipe.hpp
@@ -13,14 +13,14 @@
 #include <boost/winapi/get_last_error.hpp>
 #include <boost/winapi/access_rights.hpp>
 #include <boost/winapi/process.hpp>
-#include <boost/process/detail/windows/basic_pipe.hpp>
+#include <boost/process/v1/detail/windows/basic_pipe.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/asio/windows/stream_handle.hpp>
 #include <atomic>
 #include <system_error>
 #include <string>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 inline std::string make_pipe_name()
 {
@@ -290,7 +290,7 @@ async_pipe::async_pipe(boost::asio::io_context & ios_source,
 
     ::boost::winapi::HANDLE_ source = ::boost::winapi::create_named_pipe(
 #if defined(BOOST_NO_ANSI_APIS)
-            ::boost::process::detail::convert(name).c_str(),
+            ::boost::process::v1::detail::convert(name).c_str(),
 #else
             name.c_str(),
 #endif
@@ -300,13 +300,13 @@ async_pipe::async_pipe(boost::asio::io_context & ios_source,
 
 
     if (source == boost::winapi::INVALID_HANDLE_VALUE_)
-        ::boost::process::detail::throw_last_error("create_named_pipe(" + name + ") failed");
+        ::boost::process::v1::detail::throw_last_error("create_named_pipe(" + name + ") failed");
 
     _source.assign(source);
 
     ::boost::winapi::HANDLE_ sink = boost::winapi::create_file(
 #if defined(BOOST_NO_ANSI_APIS)
-            ::boost::process::detail::convert(name).c_str(),
+            ::boost::process::v1::detail::convert(name).c_str(),
 #else
             name.c_str(),
 #endif
@@ -316,7 +316,7 @@ async_pipe::async_pipe(boost::asio::io_context & ios_source,
             nullptr);
 
     if (sink == ::boost::winapi::INVALID_HANDLE_VALUE_)
-        ::boost::process::detail::throw_last_error("create_file() failed");
+        ::boost::process::v1::detail::throw_last_error("create_file() failed");
 
     _sink.assign(sink);
 }
@@ -480,6 +480,6 @@ inline bool operator!=(const basic_pipe<Char, Traits> & lhs, const async_pipe &
            !compare_handles(lhs.native_sink(),   rhs.native_sink());
 }
 
-}}}}
+}}}}}
 
 #endif /* INCLUDE_BOOST_PIPE_DETAIL_WINDOWS_ASYNC_PIPE_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/basic_cmd.hpp b/inst/include/boost/process/v1/detail/windows/basic_cmd.hpp
similarity index 97%
rename from inst/include/boost/process/detail/windows/basic_cmd.hpp
rename to inst/include/boost/process/v1/detail/windows/basic_cmd.hpp
index c4cd215ef..87a0e85d8 100644
--- a/inst/include/boost/process/detail/windows/basic_cmd.hpp
+++ b/inst/include/boost/process/v1/detail/windows/basic_cmd.hpp
@@ -9,8 +9,8 @@
 
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/process/shell.hpp>
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 
 #include <vector>
 #include <string>
@@ -21,6 +21,8 @@ namespace boost
 {
 namespace process
 {
+BOOST_PROCESS_V1_INLINE namespace v1
+{
 namespace detail
 {
 namespace windows
@@ -197,7 +199,7 @@ struct exe_cmd_init : handler_base_ext
 }
 }
 }
-
+}
 
 
 #endif /* INCLUDE_BOOST_PROCESS_WINDOWS_ARGS_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/basic_pipe.hpp b/inst/include/boost/process/v1/detail/windows/basic_pipe.hpp
similarity index 93%
rename from inst/include/boost/process/detail/windows/basic_pipe.hpp
rename to inst/include/boost/process/v1/detail/windows/basic_pipe.hpp
index 0fe524d21..df3e46107 100644
--- a/inst/include/boost/process/detail/windows/basic_pipe.hpp
+++ b/inst/include/boost/process/v1/detail/windows/basic_pipe.hpp
@@ -14,12 +14,12 @@
 #include <boost/winapi/get_last_error.hpp>
 #include <boost/winapi/access_rights.hpp>
 #include <boost/winapi/process.hpp>
-#include <boost/process/detail/windows/compare_handles.hpp>
+#include <boost/process/v1/detail/windows/compare_handles.hpp>
 #include <system_error>
 #include <string>
 
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<class CharT, class Traits = std::char_traits<CharT>>
 class basic_pipe
@@ -72,7 +72,7 @@ class basic_pipe
                 _sink, data, count * sizeof(char_type), &write_len, nullptr
                 ))
         {
-            auto ec = ::boost::process::detail::get_last_error();
+            auto ec = ::boost::process::v1::detail::get_last_error();
             if ((ec.value() == ::boost::winapi::ERROR_BROKEN_PIPE_) ||
                 (ec.value() == ::boost::winapi::ERROR_NO_DATA_))
                 return 0;
@@ -88,7 +88,7 @@ class basic_pipe
                 _source, data, count * sizeof(char_type), &read_len, nullptr
                 ))
         {
-            auto ec = ::boost::process::detail::get_last_error();
+            auto ec = ::boost::process::v1::detail::get_last_error();
             if ((ec.value() == ::boost::winapi::ERROR_BROKEN_PIPE_) ||
                 (ec.value() == ::boost::winapi::ERROR_NO_DATA_))
                 return 0;
@@ -144,7 +144,7 @@ basic_pipe<Char, Traits>::basic_pipe(const std::string & name)
     //static constexpr int FILE_ATTRIBUTE_NORMAL_ = 0x00000080; //temporary
 
 #if BOOST_NO_ANSI_APIS
-    std::wstring name_ = boost::process::detail::convert(name);
+    std::wstring name_ = boost::process::v1::detail::convert(name);
 #else
     auto &name_ = name;
 #endif
@@ -155,7 +155,7 @@ basic_pipe<Char, Traits>::basic_pipe(const std::string & name)
             0, ::boost::winapi::PIPE_UNLIMITED_INSTANCES_, 8192, 8192, 0, nullptr);
 
     if (source == boost::winapi::INVALID_HANDLE_VALUE_)
-        ::boost::process::detail::throw_last_error("create_named_pipe() failed");
+        ::boost::process::v1::detail::throw_last_error("create_named_pipe() failed");
 
     ::boost::winapi::HANDLE_ sink = boost::winapi::create_file(
             name_.c_str(),
@@ -165,7 +165,7 @@ basic_pipe<Char, Traits>::basic_pipe(const std::string & name)
             nullptr);
 
     if (sink == ::boost::winapi::INVALID_HANDLE_VALUE_)
-        ::boost::process::detail::throw_last_error("create_file() failed");
+        ::boost::process::v1::detail::throw_last_error("create_file() failed");
 
     _source = source;
     _sink   = sink;
@@ -225,6 +225,6 @@ inline bool operator!=(const basic_pipe<Char, Traits> & lhs, const basic_pipe<Ch
            !compare_handles(lhs.native_sink(),   rhs.native_sink());
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/child_handle.hpp b/inst/include/boost/process/v1/detail/windows/child_handle.hpp
similarity index 94%
rename from inst/include/boost/process/detail/windows/child_handle.hpp
rename to inst/include/boost/process/v1/detail/windows/child_handle.hpp
index b7f46db91..7ce2c50ef 100644
--- a/inst/include/boost/process/detail/windows/child_handle.hpp
+++ b/inst/include/boost/process/v1/detail/windows/child_handle.hpp
@@ -10,12 +10,13 @@
 #ifndef BOOST_PROCESS_WINDOWS_CHILD_HPP
 #define BOOST_PROCESS_WINDOWS_CHILD_HPP
 
+#include <boost/process/v1/detail/config.hpp>
 #include <boost/move/move.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/jobs.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 typedef ::boost::winapi::DWORD_ pid_t;
 
@@ -93,6 +94,6 @@ struct child_handle
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/close_in.hpp b/inst/include/boost/process/v1/detail/windows/close_in.hpp
similarity index 74%
rename from inst/include/boost/process/detail/windows/close_in.hpp
rename to inst/include/boost/process/v1/detail/windows/close_in.hpp
index 63ff772f7..f9e4e3a65 100644
--- a/inst/include/boost/process/detail/windows/close_in.hpp
+++ b/inst/include/boost/process/v1/detail/windows/close_in.hpp
@@ -10,13 +10,14 @@
 #ifndef BOOST_PROCESS_WINDOWS_INITIALIZERS_CLOSE_IN_HPP
 #define BOOST_PROCESS_WINDOWS_INITIALIZERS_CLOSE_IN_HPP
 
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/handler_base.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
-struct close_in : public ::boost::process::detail::handler_base
+struct close_in : public ::boost::process::v1::detail::handler_base
 {
     template <class WindowsExecutor>
     void on_setup(WindowsExecutor &e) const
@@ -26,6 +27,6 @@ struct close_in : public ::boost::process::detail::handler_base
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/close_out.hpp b/inst/include/boost/process/v1/detail/windows/close_out.hpp
similarity index 84%
rename from inst/include/boost/process/detail/windows/close_out.hpp
rename to inst/include/boost/process/v1/detail/windows/close_out.hpp
index bec4b0195..3641dab2d 100644
--- a/inst/include/boost/process/detail/windows/close_out.hpp
+++ b/inst/include/boost/process/v1/detail/windows/close_out.hpp
@@ -10,14 +10,15 @@
 #ifndef BOOST_PROCESS_WINDOWS_INITIALIZERS_CLOSE_OUT_HPP
 #define BOOST_PROCESS_WINDOWS_INITIALIZERS_CLOSE_OUT_HPP
 
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/handler_base.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<int p1, int p2>
-struct close_out : public ::boost::process::detail::handler_base
+struct close_out : public ::boost::process::v1::detail::handler_base
 {
     template <class WindowsExecutor>
     inline void on_setup(WindowsExecutor &e) const;
@@ -48,6 +49,6 @@ void close_out<1,2>::on_setup(WindowsExecutor &e) const
     e.startup_info.dwFlags   |= ::boost::winapi::STARTF_USESTDHANDLES_;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/cmd.hpp b/inst/include/boost/process/v1/detail/windows/cmd.hpp
similarity index 89%
rename from inst/include/boost/process/detail/windows/cmd.hpp
rename to inst/include/boost/process/v1/detail/windows/cmd.hpp
index 2298debf3..ffa0342f6 100644
--- a/inst/include/boost/process/detail/windows/cmd.hpp
+++ b/inst/include/boost/process/v1/detail/windows/cmd.hpp
@@ -13,13 +13,15 @@ namespace boost
 {
 namespace process
 {
+BOOST_PROCESS_V1_INLINE namespace v1
+{
 namespace detail
 {
 namespace windows
 {
 
 template<typename CharType>
-struct cmd_setter_ : ::boost::process::detail::handler_base
+struct cmd_setter_ : ::boost::process::v1::detail::handler_base
 {
     typedef CharType value_type;
     typedef std::basic_string<value_type> string_type;
@@ -43,7 +45,7 @@ struct cmd_setter_ : ::boost::process::detail::handler_base
 }
 }
 }
-
+}
 
 
 #endif /* INCLUDE_BOOST_PROCESS_WINDOWS_ARGS_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/compare_handles.hpp b/inst/include/boost/process/v1/detail/windows/compare_handles.hpp
similarity index 77%
rename from inst/include/boost/process/detail/windows/compare_handles.hpp
rename to inst/include/boost/process/v1/detail/windows/compare_handles.hpp
index 03361492a..36a48103d 100644
--- a/inst/include/boost/process/detail/windows/compare_handles.hpp
+++ b/inst/include/boost/process/v1/detail/windows/compare_handles.hpp
@@ -8,9 +8,9 @@
 
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/file_management.hpp>
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 inline bool compare_handles(boost::winapi::HANDLE_ lhs, boost::winapi::HANDLE_ rhs)
 {
@@ -25,16 +25,16 @@ inline bool compare_handles(boost::winapi::HANDLE_ lhs, boost::winapi::HANDLE_ r
     ::boost::winapi::BY_HANDLE_FILE_INFORMATION_ rhs_info{0,{0,0},{0,0},{0,0},0,0,0,0,0,0};
 
     if (!::boost::winapi::GetFileInformationByHandle(lhs, &lhs_info))
-        ::boost::process::detail::throw_last_error("GetFileInformationByHandle");
+        ::boost::process::v1::detail::throw_last_error("GetFileInformationByHandle");
 
     if (!::boost::winapi::GetFileInformationByHandle(rhs, &rhs_info))
-        ::boost::process::detail::throw_last_error("GetFileInformationByHandle");
+        ::boost::process::v1::detail::throw_last_error("GetFileInformationByHandle");
 
     return     (lhs_info.nFileIndexHigh == rhs_info.nFileIndexHigh)
             && (lhs_info.nFileIndexLow  == rhs_info.nFileIndexLow);
 }
 
-}}}}
+}}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/windows/env_init.hpp b/inst/include/boost/process/v1/detail/windows/env_init.hpp
similarity index 66%
rename from inst/include/boost/process/detail/windows/env_init.hpp
rename to inst/include/boost/process/v1/detail/windows/env_init.hpp
index 4d3279587..de84e2c5b 100644
--- a/inst/include/boost/process/detail/windows/env_init.hpp
+++ b/inst/include/boost/process/v1/detail/windows/env_init.hpp
@@ -11,19 +11,19 @@
 #include <boost/winapi/process.hpp>
 
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/environment.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/environment.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<typename Char>
-struct env_init : public ::boost::process::detail::handler_base
+struct env_init : public ::boost::process::v1::detail::handler_base
 {
-    boost::process::basic_environment<Char> env;
+    boost::process::v1::basic_environment<Char> env;
 
-    env_init(boost::process::basic_environment<Char> && env) : env(std::move(env)) {};
-    env_init(const boost::process::basic_environment<Char> & env) : env(env) {};
+    env_init(boost::process::v1::basic_environment<Char> && env) : env(std::move(env)) {};
+    env_init(const boost::process::v1::basic_environment<Char> & env) : env(env) {};
 
     constexpr static ::boost::winapi::DWORD_ creation_flag(char)    {return 0u;}
     constexpr static ::boost::winapi::DWORD_ creation_flag(wchar_t)
@@ -47,7 +47,7 @@ struct env_init : public ::boost::process::detail::handler_base
 
 };
 
-}}}}
+}}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/windows/environment.hpp b/inst/include/boost/process/v1/detail/windows/environment.hpp
similarity index 94%
rename from inst/include/boost/process/detail/windows/environment.hpp
rename to inst/include/boost/process/v1/detail/windows/environment.hpp
index 421557985..420d0181e 100644
--- a/inst/include/boost/process/detail/windows/environment.hpp
+++ b/inst/include/boost/process/v1/detail/windows/environment.hpp
@@ -13,11 +13,11 @@
 #include <boost/winapi/environment.hpp>
 #include <boost/winapi/get_current_process.hpp>
 #include <boost/winapi/get_current_process_id.hpp>
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <algorithm>
-#include <boost/process/locale.hpp>
+#include <boost/process/v1/locale.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<typename Char>
 class native_environment_impl
@@ -65,7 +65,7 @@ inline auto native_environment_impl<Char>::get(const pointer_type id) -> string_
     {
         auto err =  ::boost::winapi::GetLastError();
         if (err == ::boost::winapi::ERROR_ENVVAR_NOT_FOUND_)//well, then we consider that an empty value
-            return "";
+            return string_type();
         else
             throw process_error(std::error_code(err, std::system_category()),
                                "GetEnvironmentVariable() failed");
@@ -87,7 +87,7 @@ inline auto native_environment_impl<Char>::get(const pointer_type id) -> string_
             if (size == buf_size) //buffer to small
                 buf_size *= 2;
             else if (size == 0)
-                ::boost::process::detail::throw_last_error("GetEnvironmentVariable() failed");
+                ::boost::process::v1::detail::throw_last_error("GetEnvironmentVariable() failed");
             else
                 return std::basic_string<Char>(
                         buf.data(), buf.data()+ size);
@@ -194,15 +194,15 @@ struct basic_environment_impl
     template<typename CharR>
     explicit inline  basic_environment_impl(
                 const basic_environment_impl<CharR>& rhs,
-                const ::boost::process::codecvt_type & cv = ::boost::process::codecvt())
-        : _data(::boost::process::detail::convert(rhs._data, cv))
+                const ::boost::process::v1::codecvt_type & cv = ::boost::process::v1::codecvt())
+        : _data(::boost::process::v1::detail::convert(rhs._data, cv))
     {
     }
 
     template<typename CharR>
     basic_environment_impl & operator=(const basic_environment_impl<CharR>& rhs)
     {
-        _data = ::boost::process::detail::convert(rhs._data);
+        _data = ::boost::process::v1::detail::convert(rhs._data);
         _env_arr = _load_var(&*_data.begin());
         _env_impl = &*_env_arr.begin();
         return *this;
@@ -349,7 +349,7 @@ typedef void* native_handle_t;
 }
 }
 }
-
+}
 
 
 
diff --git a/inst/include/boost/process/detail/windows/executor.hpp b/inst/include/boost/process/v1/detail/windows/executor.hpp
similarity index 93%
rename from inst/include/boost/process/detail/windows/executor.hpp
rename to inst/include/boost/process/v1/detail/windows/executor.hpp
index 6321b619c..6ea6faf28 100644
--- a/inst/include/boost/process/detail/windows/executor.hpp
+++ b/inst/include/boost/process/v1/detail/windows/executor.hpp
@@ -11,10 +11,10 @@
 #ifndef BOOST_PROCESS_WINDOWS_EXECUTOR_HPP
 #define BOOST_PROCESS_WINDOWS_EXECUTOR_HPP
 
-#include <boost/process/detail/child_decl.hpp>
-#include <boost/process/detail/windows/is_running.hpp>
-#include <boost/process/detail/traits.hpp>
-#include <boost/process/error.hpp>
+#include <boost/process/v1/detail/child_decl.hpp>
+#include <boost/process/v1/detail/windows/is_running.hpp>
+#include <boost/process/v1/detail/traits.hpp>
+#include <boost/process/v1/error.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/process.hpp>
@@ -24,7 +24,7 @@
 #include <atomic>
 #include <cstring>
 
-namespace boost { namespace process {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 namespace detail { namespace windows {
 
@@ -160,8 +160,8 @@ class executor : public startup_info_impl<Char>
         }
     };
 
-    typedef typename ::boost::process::detail::has_error_handler<Sequence>::type has_error_handler;
-    typedef typename ::boost::process::detail::has_ignore_error <Sequence>::type has_ignore_error;
+    typedef typename ::boost::process::v1::detail::has_error_handler<Sequence>::type has_error_handler;
+    typedef typename ::boost::process::v1::detail::has_ignore_error <Sequence>::type has_ignore_error;
 
     std::error_code _ec{0, std::system_category()};
 
@@ -207,7 +207,7 @@ class executor : public startup_info_impl<Char>
             boost::fusion::for_each(seq, on_success_fn);
         }
         else
-            set_error(::boost::process::detail::get_last_error(),
+            set_error(::boost::process::v1::detail::get_last_error(),
                     " CreateProcess failed");
 
         if ( _ec)
@@ -254,6 +254,6 @@ executor<Char, Tup> make_executor(Tup & tup)
 }
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/file_descriptor.hpp b/inst/include/boost/process/v1/detail/windows/file_descriptor.hpp
similarity index 91%
rename from inst/include/boost/process/detail/windows/file_descriptor.hpp
rename to inst/include/boost/process/v1/detail/windows/file_descriptor.hpp
index 033df0288..b94c48822 100644
--- a/inst/include/boost/process/detail/windows/file_descriptor.hpp
+++ b/inst/include/boost/process/v1/detail/windows/file_descriptor.hpp
@@ -10,10 +10,10 @@
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/file_management.hpp>
 #include <string>
-#include <boost/process/filesystem.hpp>
+#include <boost/process/v1/filesystem.hpp>
 #include <boost/core/exchange.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 struct file_descriptor
 {
@@ -40,14 +40,14 @@ struct file_descriptor
     }
 
     file_descriptor() = default;
-    file_descriptor(const boost::process::filesystem::path& p, mode_t mode = read_write)
+    file_descriptor(const boost::process::v1::filesystem::path& p, mode_t mode = read_write)
         : file_descriptor(p.native(), mode)
     {
     }
 
     file_descriptor(const std::string & path , mode_t mode = read_write)
 #if defined(BOOST_NO_ANSI_APIS)
-        : file_descriptor(::boost::process::detail::convert(path), mode)
+        : file_descriptor(::boost::process::v1::detail::convert(path), mode)
 #else
         : file_descriptor(path.c_str(), mode)
 #endif
@@ -117,6 +117,6 @@ struct file_descriptor
     ::boost::winapi::HANDLE_ _handle = ::boost::winapi::INVALID_HANDLE_VALUE_;
 };
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_FILE_DESCRIPTOR_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/file_in.hpp b/inst/include/boost/process/v1/detail/windows/file_in.hpp
similarity index 76%
rename from inst/include/boost/process/detail/windows/file_in.hpp
rename to inst/include/boost/process/v1/detail/windows/file_in.hpp
index c56f91ef0..bdcb3d5ee 100644
--- a/inst/include/boost/process/detail/windows/file_in.hpp
+++ b/inst/include/boost/process/v1/detail/windows/file_in.hpp
@@ -12,15 +12,15 @@
 
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/file_descriptor.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/file_descriptor.hpp>
 #include <io.h>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
-struct file_in : public ::boost::process::detail::handler_base,
-                        ::boost::process::detail::uses_handles
+struct file_in : public ::boost::process::v1::detail::handler_base,
+                        ::boost::process::v1::detail::uses_handles
 {
     file_descriptor file;
     ::boost::winapi::HANDLE_ handle = file.handle();
@@ -43,6 +43,6 @@ struct file_in : public ::boost::process::detail::handler_base,
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/file_out.hpp b/inst/include/boost/process/v1/detail/windows/file_out.hpp
similarity index 84%
rename from inst/include/boost/process/detail/windows/file_out.hpp
rename to inst/include/boost/process/v1/detail/windows/file_out.hpp
index 88f0848d8..8083de29f 100644
--- a/inst/include/boost/process/detail/windows/file_out.hpp
+++ b/inst/include/boost/process/v1/detail/windows/file_out.hpp
@@ -13,15 +13,15 @@
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/file_descriptor.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/file_descriptor.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<int p1, int p2>
-struct file_out : public ::boost::process::detail::handler_base,
-                         ::boost::process::detail::uses_handles
+struct file_out : public ::boost::process::v1::detail::handler_base,
+                         ::boost::process::v1::detail::uses_handles
 {
     file_descriptor file;
     ::boost::winapi::HANDLE_ handle = file.handle();
@@ -77,6 +77,6 @@ void file_out<1,2>::on_setup(WindowsExecutor &e) const
     e.inherit_handles = true;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/group_handle.hpp b/inst/include/boost/process/v1/detail/windows/group_handle.hpp
similarity index 93%
rename from inst/include/boost/process/detail/windows/group_handle.hpp
rename to inst/include/boost/process/v1/detail/windows/group_handle.hpp
index b3f7143c6..7da6aa662 100644
--- a/inst/include/boost/process/detail/windows/group_handle.hpp
+++ b/inst/include/boost/process/v1/detail/windows/group_handle.hpp
@@ -6,13 +6,13 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_GROUP_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_GROUP_HPP_
 
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 #include <boost/winapi/jobs.hpp>
-#include <boost/process/detail/windows/child_handle.hpp>
-#include <boost/process/detail/windows/job_workaround.hpp>
+#include <boost/process/v1/detail/windows/child_handle.hpp>
+#include <boost/process/v1/detail/windows/job_workaround.hpp>
 #include <system_error>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 inline bool break_away_enabled(::boost::winapi::HANDLE_ h)
 {
@@ -184,13 +184,13 @@ struct group_handle
 inline void terminate(const group_handle &p)
 {
     if (!::boost::winapi::TerminateJobObject(p.handle(), EXIT_FAILURE))
-        boost::process::detail::throw_last_error("TerminateJobObject() failed");
+        boost::process::v1::detail::throw_last_error("TerminateJobObject() failed");
 }
 
 inline void terminate(const group_handle &p, std::error_code &ec) noexcept
 {
     if (!::boost::winapi::TerminateJobObject(p.handle(), EXIT_FAILURE))
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
         ec.clear();
 }
@@ -206,7 +206,7 @@ inline bool in_group()
 
 
 
-}}}}
+}}}}}
 
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_GROUP_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/group_ref.hpp b/inst/include/boost/process/v1/detail/windows/group_ref.hpp
similarity index 72%
rename from inst/include/boost/process/detail/windows/group_ref.hpp
rename to inst/include/boost/process/v1/detail/windows/group_ref.hpp
index 6e8fe71f2..ac6763c03 100644
--- a/inst/include/boost/process/detail/windows/group_ref.hpp
+++ b/inst/include/boost/process/v1/detail/windows/group_ref.hpp
@@ -7,18 +7,18 @@
 #define BOOST_PROCESS_DETAIL_WINDOWS_GROUP_REF_HPP_
 
 #include <boost/winapi/process.hpp>
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/windows/group_handle.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/windows/group_handle.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 
-namespace boost { namespace process {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
 
 namespace detail { namespace windows {
 
 
 
-struct group_ref : handler_base_ext, ::boost::process::detail::uses_handles
+struct group_ref : handler_base_ext, ::boost::process::v1::detail::uses_handles
 {
     ::boost::winapi::HANDLE_ handle;
 
@@ -41,14 +41,14 @@ struct group_ref : handler_base_ext, ::boost::process::detail::uses_handles
     void on_success(Executor& exec) const
     {
         if (!::boost::winapi::AssignProcessToJobObject(handle, exec.proc_info.hProcess))
-            exec.set_error(::boost::process::detail::get_last_error(),
+            exec.set_error(::boost::process::v1::detail::get_last_error(),
                            "AssignProcessToJobObject() failed.");
 
     }
 
 };
 
-}}}}
+}}}}}
 
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_GROUP_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/handle_workaround.hpp b/inst/include/boost/process/v1/detail/windows/handle_workaround.hpp
similarity index 97%
rename from inst/include/boost/process/detail/windows/handle_workaround.hpp
rename to inst/include/boost/process/v1/detail/windows/handle_workaround.hpp
index c288bec83..48c25dc56 100644
--- a/inst/include/boost/process/detail/windows/handle_workaround.hpp
+++ b/inst/include/boost/process/v1/detail/windows/handle_workaround.hpp
@@ -6,6 +6,8 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_HANDLE_WORKAROUND_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_HANDLE_WORKAROUND_HPP_
 
+#include <boost/process/v1/detail/config.hpp>
+
 #include <boost/winapi/basic_types.hpp>
 #include <boost/winapi/dll.hpp>
 #include <boost/winapi/access_rights.hpp>
@@ -16,7 +18,7 @@
 #endif
 
 
-namespace boost { namespace process { namespace detail { namespace windows { namespace workaround
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows { namespace workaround
 {
 
 
@@ -257,6 +259,6 @@ inline ::boost::winapi::BOOL_ nt_query_object(
 
 #endif
 
-}}}}}
+}}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_JOB_WORKAROUND_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/handler.hpp b/inst/include/boost/process/v1/detail/windows/handler.hpp
similarity index 66%
rename from inst/include/boost/process/detail/windows/handler.hpp
rename to inst/include/boost/process/v1/detail/windows/handler.hpp
index f151ccc86..a04bf835f 100644
--- a/inst/include/boost/process/detail/windows/handler.hpp
+++ b/inst/include/boost/process/v1/detail/windows/handler.hpp
@@ -6,14 +6,15 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_HANDLER_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_HANDLER_HPP_
 
-#include <boost/process/detail/handler_base.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 //does not extend anything.
 struct handler_base_ext : handler_base {};
 
-}}}}
+}}}}}
 
 
 
diff --git a/inst/include/boost/process/detail/windows/handles.hpp b/inst/include/boost/process/v1/detail/windows/handles.hpp
similarity index 87%
rename from inst/include/boost/process/detail/windows/handles.hpp
rename to inst/include/boost/process/v1/detail/windows/handles.hpp
index 901b339a4..b91d16b7e 100644
--- a/inst/include/boost/process/detail/windows/handles.hpp
+++ b/inst/include/boost/process/v1/detail/windows/handles.hpp
@@ -8,13 +8,13 @@
 
 #include <vector>
 #include <system_error>
-#include <boost/process/detail/windows/handle_workaround.hpp>
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/windows/handle_workaround.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 #include <boost/winapi/get_current_process_id.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 
 template<typename Executor, typename Function>
@@ -50,7 +50,7 @@ inline std::vector<native_handle_type> get_handles(std::error_code & ec)
 
     if (nt_status < 0 || nt_status > 0x7FFFFFFF)
     {
-        ec = ::boost::process::detail::get_last_error();
+        ec = ::boost::process::v1::detail::get_last_error();
         return {};
     }
     else
@@ -72,7 +72,7 @@ inline std::vector<native_handle_type> get_handles()
 
     auto res = get_handles(ec);
     if (ec)
-        boost::process::detail::throw_error(ec, "NtQuerySystemInformation failed");
+        boost::process::v1::detail::throw_error(ec, "NtQuerySystemInformation failed");
 
     return res;
 }
@@ -99,7 +99,7 @@ inline bool is_stream_handle(native_handle_type handle, std::error_code & ec)
 
     if (nt_status < 0 || nt_status > 0x7FFFFFFF)
     {
-        ec = ::boost::process::detail::get_last_error();
+        ec = ::boost::process::v1::detail::get_last_error();
         return false;
     }
     else
@@ -120,7 +120,7 @@ inline bool is_stream_handle(native_handle_type handle)
     std::error_code ec;
     auto res = is_stream_handle(handle, ec);
     if (ec)
-        boost::process::detail::throw_error(ec, "NtQueryObject failed");
+        boost::process::v1::detail::throw_error(ec, "NtQueryObject failed");
 
     return res;
 }
@@ -140,10 +140,7 @@ struct limit_handles_ : handler_base_ext
                     auto itr = std::find(all_handles.begin(), all_handles .end(), handle);
                     ::boost::winapi::DWORD_ flags = 0u;
                     if (itr != all_handles.end())
-                        *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
-                    else if ((::boost::winapi::GetHandleInformation(*itr, &flags) != 0)
-                            &&((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too
-                        *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
+                        *itr = ::boost::winapi::INVALID_HANDLE_VALUE_; // the handle is used mark it as invalid, so it doesn't get reset
                 });
 
         auto part_itr = std::partition(all_handles.begin(), all_handles.end(),
@@ -173,6 +170,6 @@ struct limit_handles_ : handler_base_ext
 };
 
 
-}}}}
+}}}}}
 
 #endif //PROCESS_HANDLES_HPP
diff --git a/inst/include/boost/process/detail/windows/io_context_ref.hpp b/inst/include/boost/process/v1/detail/windows/io_context_ref.hpp
similarity index 92%
rename from inst/include/boost/process/detail/windows/io_context_ref.hpp
rename to inst/include/boost/process/v1/detail/windows/io_context_ref.hpp
index 3722ff12a..3848a2c0c 100644
--- a/inst/include/boost/process/detail/windows/io_context_ref.hpp
+++ b/inst/include/boost/process/v1/detail/windows/io_context_ref.hpp
@@ -6,9 +6,9 @@
 #ifndef BOOST_PROCESS_WINDOWS_IO_CONTEXT_REF_HPP_
 #define BOOST_PROCESS_WINDOWS_IO_CONTEXT_REF_HPP_
 
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/windows/async_handler.hpp>
-#include <boost/process/detail/windows/is_running.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/windows/async_handler.hpp>
+#include <boost/process/v1/detail/windows/is_running.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/asio/windows/object_handle.hpp>
@@ -30,7 +30,7 @@
 
 #include <boost/type_index.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<typename Executor>
 struct on_exit_handler_transformer
@@ -72,7 +72,7 @@ struct async_handler_collector
 };
 
 //Also set's up waiting for the exit, so it can close async stuff.
-struct io_context_ref : boost::process::detail::handler_base
+struct io_context_ref : boost::process::v1::detail::handler_base
 {
 
     io_context_ref(boost::asio::io_context & ios)
@@ -106,7 +106,7 @@ struct io_context_ref : boost::process::detail::handler_base
               static_cast<::boost::winapi::BOOL_>(true),
                ::boost::winapi::DUPLICATE_SAME_ACCESS_))
 
-        exec.set_error(::boost::process::detail::get_last_error(),
+        exec.set_error(::boost::process::v1::detail::get_last_error(),
                                  "Duplicate Pipe Failed");
 
 
@@ -167,6 +167,6 @@ struct io_context_ref : boost::process::detail::handler_base
     boost::asio::io_context &ios;
 };
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_WINDOWS_IO_CONTEXT_REF_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/is_running.hpp b/inst/include/boost/process/v1/detail/windows/is_running.hpp
similarity index 74%
rename from inst/include/boost/process/detail/windows/is_running.hpp
rename to inst/include/boost/process/v1/detail/windows/is_running.hpp
index f1115cdc6..a6e27148a 100644
--- a/inst/include/boost/process/detail/windows/is_running.hpp
+++ b/inst/include/boost/process/v1/detail/windows/is_running.hpp
@@ -6,13 +6,13 @@
 #ifndef BOOST_PROCESS_WINDOWS_IS_RUNNING_HPP
 #define BOOST_PROCESS_WINDOWS_IS_RUNNING_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/windows/child_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/windows/child_handle.hpp>
 #include <system_error>
 #include <cstdlib>
 #include <boost/winapi/process.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 constexpr static ::boost::winapi::DWORD_ still_active = 259;
 
@@ -24,7 +24,7 @@ inline bool is_running(const child_handle &p, int & exit_code, std::error_code &
     ::boost::winapi::DWORD_ code;
     //single value, not needed in the winapi.
     if (!::boost::winapi::GetExitCodeProcess(p.process_handle(), &code))
-        ec = ::boost::process::detail::get_last_error();
+        ec = ::boost::process::v1::detail::get_last_error();
     else
         ec.clear();
 
@@ -41,7 +41,7 @@ inline bool is_running(const child_handle &p, int & exit_code)
 {
     std::error_code ec;
     bool b = is_running(p, exit_code, ec);
-    boost::process::detail::throw_error(ec, "GetExitCodeProcess() failed in is_running");
+    boost::process::v1::detail::throw_error(ec, "GetExitCodeProcess() failed in is_running");
     return b;
 }
 
@@ -52,6 +52,6 @@ inline bool is_running(int code)
 
 inline int eval_exit_status(int in ) {return in;}
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/job_workaround.hpp b/inst/include/boost/process/v1/detail/windows/job_workaround.hpp
similarity index 98%
rename from inst/include/boost/process/detail/windows/job_workaround.hpp
rename to inst/include/boost/process/v1/detail/windows/job_workaround.hpp
index 3f15d1c19..9b79abb5f 100644
--- a/inst/include/boost/process/detail/windows/job_workaround.hpp
+++ b/inst/include/boost/process/v1/detail/windows/job_workaround.hpp
@@ -6,6 +6,7 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_JOB_WORKAROUND_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_JOB_WORKAROUND_HPP_
 
+#include <boost/process/v1/detail/config.hpp>
 #include <boost/winapi/config.hpp>
 #include <boost/winapi/basic_types.hpp>
 #include <boost/winapi/dll.hpp>
@@ -33,7 +34,7 @@ BOOST_SYMBOL_IMPORT ::boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC GetQueuedCompl
 
 }
 #endif
-namespace boost { namespace process { namespace detail { namespace windows { namespace workaround {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows { namespace workaround {
 
 extern "C"
 {
@@ -256,6 +257,6 @@ inline ::boost::winapi::BOOL_ set_information_job_object(
 
 constexpr static ::boost::winapi::DWORD_ JOB_OBJECT_LIMIT_BREAKAWAY_OK_ = 0x00000800;
 
-}}}}}
+}}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_JOB_WORKAROUND_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/locale.hpp b/inst/include/boost/process/v1/detail/windows/locale.hpp
similarity index 97%
rename from inst/include/boost/process/detail/windows/locale.hpp
rename to inst/include/boost/process/v1/detail/windows/locale.hpp
index ee16c6347..d35a541a8 100644
--- a/inst/include/boost/process/detail/windows/locale.hpp
+++ b/inst/include/boost/process/v1/detail/windows/locale.hpp
@@ -7,6 +7,7 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_LOCALE_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_LOCALE_HPP_
 
+#include <boost/process/v1/detail/config.hpp>
 #include <locale>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/winapi/file_management.hpp>
@@ -16,6 +17,8 @@ namespace boost
 {
 namespace process
 {
+BOOST_PROCESS_V1_INLINE namespace v1
+{
 namespace detail
 {
 namespace windows
@@ -105,7 +108,7 @@ class windows_file_codecvt
 }
 }
 }
-
+}
 
 
 #endif /* BOOST_PROCESS_LOCALE_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/null_in.hpp b/inst/include/boost/process/v1/detail/windows/null_in.hpp
similarity index 75%
rename from inst/include/boost/process/detail/windows/null_in.hpp
rename to inst/include/boost/process/v1/detail/windows/null_in.hpp
index d29eb8f41..a61f9c807 100644
--- a/inst/include/boost/process/detail/windows/null_in.hpp
+++ b/inst/include/boost/process/v1/detail/windows/null_in.hpp
@@ -13,13 +13,13 @@
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/file_descriptor.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/file_descriptor.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
-struct null_in : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct null_in : public ::boost::process::v1::detail::handler_base, ::boost::process::v1::detail::uses_handles
 {
     file_descriptor source{"NUL", file_descriptor::read};
 
@@ -40,6 +40,6 @@ struct null_in : public ::boost::process::detail::handler_base, ::boost::process
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/null_out.hpp b/inst/include/boost/process/v1/detail/windows/null_out.hpp
similarity index 84%
rename from inst/include/boost/process/detail/windows/null_out.hpp
rename to inst/include/boost/process/v1/detail/windows/null_out.hpp
index 0f80cf6cb..4cda2cf15 100644
--- a/inst/include/boost/process/detail/windows/null_out.hpp
+++ b/inst/include/boost/process/v1/detail/windows/null_out.hpp
@@ -13,14 +13,14 @@
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/windows/file_descriptor.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/windows/file_descriptor.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<int p1, int p2>
-struct null_out : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct null_out : public ::boost::process::v1::detail::handler_base, ::boost::process::v1::detail::uses_handles
 {
     file_descriptor sink {"NUL", file_descriptor::write}; //works because it gets destroyed AFTER launch.
 
@@ -73,6 +73,6 @@ void null_out<1,2>::on_setup(WindowsExecutor &e) const
 
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/on_exit.hpp b/inst/include/boost/process/v1/detail/windows/on_exit.hpp
similarity index 70%
rename from inst/include/boost/process/detail/windows/on_exit.hpp
rename to inst/include/boost/process/v1/detail/windows/on_exit.hpp
index c98f8d09d..c6fb12f88 100644
--- a/inst/include/boost/process/detail/windows/on_exit.hpp
+++ b/inst/include/boost/process/v1/detail/windows/on_exit.hpp
@@ -6,22 +6,22 @@
 #ifndef BOOST_PROCESS_WINDOWS_ON_EXIT_HPP_
 #define BOOST_PROCESS_WINDOWS_ON_EXIT_HPP_
 
-#include <boost/process/async.hpp>
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/windows/async_handler.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
+#include <boost/process/v1/detail/windows/async_handler.hpp>
 #include <boost/asio/execution.hpp>
 #include <system_error>
 #include <functional>
 
-namespace boost { namespace process { namespace detail {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
 
 template<typename Tuple>
 inline asio::io_context& get_io_context(const Tuple & tup);
 
 namespace windows {
 
-struct on_exit_ : boost::process::detail::windows::async_handler
+struct on_exit_ : boost::process::v1::detail::windows::async_handler
 {
     std::function<void(int, const std::error_code&)> handler;
     on_exit_(const std::function<void(int, const std::error_code&)> & handler) : handler(handler)
@@ -32,7 +32,7 @@ struct on_exit_ : boost::process::detail::windows::async_handler
     template<typename Executor>
     std::function<void(int, const std::error_code&)> on_exit_handler(Executor& exec)
     {
-        auto v = boost::asio::prefer(boost::process::detail::get_io_context(exec.seq).get_executor(),
+        auto v = boost::asio::prefer(boost::process::v1::detail::get_io_context(exec.seq).get_executor(),
                                      boost::asio::execution::outstanding_work.tracked);
         auto handler_ = this->handler;
         return [v, handler_](int exit_code, const std::error_code & ec)
@@ -44,5 +44,5 @@ struct on_exit_ : boost::process::detail::windows::async_handler
 };
 
 
-}}}}
+}}}}}
 #endif /* INCLUDE_BOOST_PROCESS_WINDOWS_ON_EXIT_HPP_ */
diff --git a/inst/include/boost/process/detail/windows/pipe_in.hpp b/inst/include/boost/process/v1/detail/windows/pipe_in.hpp
similarity index 87%
rename from inst/include/boost/process/detail/windows/pipe_in.hpp
rename to inst/include/boost/process/v1/detail/windows/pipe_in.hpp
index 1ef215279..9f7a59066 100644
--- a/inst/include/boost/process/detail/windows/pipe_in.hpp
+++ b/inst/include/boost/process/v1/detail/windows/pipe_in.hpp
@@ -12,14 +12,14 @@
 
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 #include <boost/system/error_code.hpp>
 
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
-struct pipe_in : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct pipe_in : public ::boost::process::v1::detail::handler_base, ::boost::process::v1::detail::uses_handles
 {
     ::boost::winapi::HANDLE_ handle;
 
@@ -89,6 +89,6 @@ struct async_pipe_in : public pipe_in
 };
 
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/pipe_out.hpp b/inst/include/boost/process/v1/detail/windows/pipe_out.hpp
similarity index 90%
rename from inst/include/boost/process/detail/windows/pipe_out.hpp
rename to inst/include/boost/process/v1/detail/windows/pipe_out.hpp
index 24cd6a82a..66012f03a 100644
--- a/inst/include/boost/process/detail/windows/pipe_out.hpp
+++ b/inst/include/boost/process/v1/detail/windows/pipe_out.hpp
@@ -13,15 +13,15 @@
 
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <boost/process/detail/handler_base.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 #include <boost/system/error_code.hpp>
 
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<int p1, int p2>
-struct pipe_out : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct pipe_out : public ::boost::process::v1::detail::handler_base, ::boost::process::v1::detail::uses_handles
 {
     ::boost::winapi::HANDLE_ handle;
 
@@ -120,6 +120,6 @@ struct async_pipe_out : public pipe_out<p1, p2>
     }
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/search_path.hpp b/inst/include/boost/process/v1/detail/windows/search_path.hpp
similarity index 65%
rename from inst/include/boost/process/detail/windows/search_path.hpp
rename to inst/include/boost/process/v1/detail/windows/search_path.hpp
index 5817a304f..0401ebcc3 100644
--- a/inst/include/boost/process/detail/windows/search_path.hpp
+++ b/inst/include/boost/process/v1/detail/windows/search_path.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_PROCESS_WINDOWS_SEARCH_PATH_HPP
 #define BOOST_PROCESS_WINDOWS_SEARCH_PATH_HPP
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/filesystem.hpp>
 #include <boost/system/error_code.hpp>
 #include <string>
 #include <stdexcept>
@@ -19,21 +19,21 @@
 #include <atomic>
 #include <cstdlib>
 #include <boost/winapi/shell.hpp>
-#include <boost/process/environment.hpp>
+#include <boost/process/v1/environment.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
-inline boost::process::filesystem::path search_path(
-        const boost::process::filesystem::path &filename,
-        const std::vector<boost::process::filesystem::path> &path)
+inline boost::process::v1::filesystem::path search_path(
+        const boost::process::v1::filesystem::path &filename,
+        const std::vector<boost::process::v1::filesystem::path> &path)
 {
-    const ::boost::process::wnative_environment ne{};
-    typedef typename ::boost::process::wnative_environment::const_entry_type value_type;
+    const ::boost::process::v1::wnative_environment ne{};
+    typedef typename ::boost::process::v1::wnative_environment::const_entry_type value_type;
     const auto id = L"PATHEXT";
 
     auto itr = std::find_if(ne.cbegin(), ne.cend(),
             [&](const value_type & e)
-             {return id == ::boost::to_upper_copy(e.get_name(), ::boost::process::detail::process_locale());});
+             {return id == ::boost::to_upper_copy(e.get_name(), ::boost::process::v1::detail::process_locale());});
 
     std::vector<std::wstring> extensions_in;
     if (itr != ne.cend())
@@ -44,10 +44,10 @@ inline boost::process::filesystem::path search_path(
     auto it_ex = extensions.begin();
     it_ex++;
     it_ex = std::transform(extensions_in.begin(), extensions_in.end(), it_ex,
-                [](const std::wstring & ws){return boost::to_lower_copy(ws, ::boost::process::detail::process_locale());});
+                [](const std::wstring & ws){return boost::to_lower_copy(ws, ::boost::process::v1::detail::process_locale());});
 
     std::transform(extensions_in.begin(), extensions_in.end(), it_ex,
-                [](const std::wstring & ws){return boost::to_upper_copy(ws, ::boost::process::detail::process_locale());});
+                [](const std::wstring & ws){return boost::to_upper_copy(ws, ::boost::process::v1::detail::process_locale());});
 
 
     std::copy(std::make_move_iterator(extensions_in.begin()), std::make_move_iterator(extensions_in.end()), extensions.begin() + 1);
@@ -56,19 +56,19 @@ inline boost::process::filesystem::path search_path(
     for (auto & ext : extensions)
         boost::to_lower(ext);
 
-    for (const boost::process::filesystem::path & pp_ : path)
+    for (const boost::process::v1::filesystem::path & pp_ : path)
     {
         auto p = pp_ / filename;
-        for (boost::process::filesystem::path ext : extensions)
+        for (boost::process::v1::filesystem::path ext : extensions)
         {
-            boost::process::filesystem::path pp_ext = p;
+            boost::process::v1::filesystem::path pp_ext = p;
             pp_ext += ext;
 #if defined(BOOST_PROCESS_USE_STD_FS)
             std::error_code ec;
 #else
             boost::system::error_code ec;
 #endif
-            bool file = boost::process::filesystem::is_regular_file(pp_ext, ec);
+            bool file = boost::process::v1::filesystem::is_regular_file(pp_ext, ec);
             if (!ec && file &&
                 ::boost::winapi::sh_get_file_info(pp_ext.native().c_str(), 0, 0, 0, ::boost::winapi::SHGFI_EXETYPE_))
             {
@@ -79,6 +79,6 @@ inline boost::process::filesystem::path search_path(
     return "";
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/shell_path.hpp b/inst/include/boost/process/v1/detail/windows/shell_path.hpp
similarity index 73%
rename from inst/include/boost/process/detail/windows/shell_path.hpp
rename to inst/include/boost/process/v1/detail/windows/shell_path.hpp
index bb150c944..8435813f6 100644
--- a/inst/include/boost/process/detail/windows/shell_path.hpp
+++ b/inst/include/boost/process/v1/detail/windows/shell_path.hpp
@@ -10,31 +10,31 @@
 #ifndef BOOST_PROCESS_WINDOWS_SHELL_PATH_HPP
 #define BOOST_PROCESS_WINDOWS_SHELL_PATH_HPP
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <system_error>
-#include <boost/process/filesystem.hpp>
+#include <boost/process/v1/filesystem.hpp>
 #include <boost/winapi/basic_types.hpp>
 #include <boost/winapi/get_system_directory.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
-inline boost::process::filesystem::path shell_path()
+inline boost::process::v1::filesystem::path shell_path()
 {
     ::boost::winapi::WCHAR_ sysdir[260];
     unsigned int size = ::boost::winapi::get_system_directory(sysdir, sizeof(sysdir));
     if (!size)
         throw_last_error("GetSystemDirectory() failed");
 
-    boost::process::filesystem::path p = sysdir;
+    boost::process::v1::filesystem::path p = sysdir;
     return p / "cmd.exe";
 }
 
-inline boost::process::filesystem::path shell_path(std::error_code &ec) noexcept
+inline boost::process::v1::filesystem::path shell_path(std::error_code &ec) noexcept
 {
 
     ::boost::winapi::WCHAR_ sysdir[260];
     unsigned int size = ::boost::winapi::get_system_directory(sysdir, sizeof(sysdir));
-    boost::process::filesystem::path p;
+    boost::process::v1::filesystem::path p;
     if (!size)
         ec = std::error_code(
                 ::boost::winapi::GetLastError(),
@@ -48,6 +48,6 @@ inline boost::process::filesystem::path shell_path(std::error_code &ec) noexcept
     return p;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/show_window.hpp b/inst/include/boost/process/v1/detail/windows/show_window.hpp
similarity index 74%
rename from inst/include/boost/process/detail/windows/show_window.hpp
rename to inst/include/boost/process/v1/detail/windows/show_window.hpp
index 0aa5567a0..70100b24d 100644
--- a/inst/include/boost/process/detail/windows/show_window.hpp
+++ b/inst/include/boost/process/v1/detail/windows/show_window.hpp
@@ -11,15 +11,16 @@
 #ifndef BOOST_PROCESS_WINDOWS_SHOW_WINDOW_HPP
 #define BOOST_PROCESS_WINDOWS_SHOW_WINDOW_HPP
 
+#include <boost/process/v1/detail/config.hpp>
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/show_window.hpp>
-#include <boost/process/detail/handler_base.hpp>
+#include <boost/process/v1/detail/handler_base.hpp>
 
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<::boost::winapi::WORD_ Flags>
-struct show_window : ::boost::process::detail::handler_base
+struct show_window : ::boost::process::v1::detail::handler_base
 {
     template <class WindowsExecutor>
     void on_setup(WindowsExecutor &e) const
@@ -29,7 +30,7 @@ struct show_window : ::boost::process::detail::handler_base
     }
 };
 
-struct create_no_window_ : public ::boost::process::detail::handler_base
+struct create_no_window_ : public ::boost::process::v1::detail::handler_base
 {
     template <class Executor>
     void on_setup(Executor &exec) const
@@ -39,7 +40,7 @@ struct create_no_window_ : public ::boost::process::detail::handler_base
 };
 
 
-}}}}
+}}}}}
 
 #endif
 
diff --git a/inst/include/boost/process/detail/windows/start_dir.hpp b/inst/include/boost/process/v1/detail/windows/start_dir.hpp
similarity index 83%
rename from inst/include/boost/process/detail/windows/start_dir.hpp
rename to inst/include/boost/process/v1/detail/windows/start_dir.hpp
index a52ecb8ff..5d8e4a7af 100644
--- a/inst/include/boost/process/detail/windows/start_dir.hpp
+++ b/inst/include/boost/process/v1/detail/windows/start_dir.hpp
@@ -11,9 +11,9 @@
 #define BOOST_PROCESS_DETAIL_WINDOWS_START_DIR_HPP
 
 #include <string>
-#include <boost/process/detail/windows/handler.hpp>
+#include <boost/process/v1/detail/windows/handler.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 template<typename Char>
 struct start_dir_init : handler_base_ext
@@ -31,6 +31,6 @@ struct start_dir_init : handler_base_ext
     std::basic_string<Char> s_;
 };
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/terminate.hpp b/inst/include/boost/process/v1/detail/windows/terminate.hpp
similarity index 76%
rename from inst/include/boost/process/detail/windows/terminate.hpp
rename to inst/include/boost/process/v1/detail/windows/terminate.hpp
index 8a413173d..51583dede 100644
--- a/inst/include/boost/process/detail/windows/terminate.hpp
+++ b/inst/include/boost/process/v1/detail/windows/terminate.hpp
@@ -10,20 +10,20 @@
 #ifndef BOOST_PROCESS_WINDOWS_TERMINATE_HPP
 #define BOOST_PROCESS_WINDOWS_TERMINATE_HPP
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <system_error>
 #include <cstdlib>
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/get_last_error.hpp>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 struct child_handle;
 
 inline void terminate(child_handle &p, std::error_code &ec) noexcept
 {
     if (!::boost::winapi::TerminateProcess(p.process_handle(), EXIT_FAILURE))
-        ec = boost::process::detail::get_last_error();
+        ec = boost::process::v1::detail::get_last_error();
     else
     {
         ec.clear();
@@ -36,9 +36,9 @@ inline void terminate(child_handle &p)
 {
     std::error_code ec;
     terminate(p, ec);
-    boost::process::detail::throw_error(ec, "TerminateProcess() failed in terminate");
+    boost::process::v1::detail::throw_error(ec, "TerminateProcess() failed in terminate");
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/wait_for_exit.hpp b/inst/include/boost/process/v1/detail/windows/wait_for_exit.hpp
similarity index 89%
rename from inst/include/boost/process/detail/windows/wait_for_exit.hpp
rename to inst/include/boost/process/v1/detail/windows/wait_for_exit.hpp
index 37d24b1ae..de033d54e 100644
--- a/inst/include/boost/process/detail/windows/wait_for_exit.hpp
+++ b/inst/include/boost/process/v1/detail/windows/wait_for_exit.hpp
@@ -11,14 +11,14 @@
 #ifndef BOOST_PROCESS_WINDOWS_WAIT_FOR_EXIT_HPP
 #define BOOST_PROCESS_WINDOWS_WAIT_FOR_EXIT_HPP
 
-#include <boost/process/detail/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
 #include <system_error>
 #include <boost/winapi/synchronization.hpp>
 #include <boost/winapi/process.hpp>
-#include <boost/process/detail/windows/child_handle.hpp>
+#include <boost/process/v1/detail/windows/child_handle.hpp>
 #include <chrono>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 inline void wait(child_handle &p, int & exit_code, std::error_code &ec) noexcept
 {
@@ -45,7 +45,7 @@ inline void wait(child_handle &p, int & exit_code)
 {
     std::error_code ec;
     wait(p, exit_code, ec);
-    boost::process::detail::throw_error(ec, "wait error");
+    boost::process::v1::detail::throw_error(ec, "wait error");
 }
 
 template< class Clock, class Duration >
@@ -92,7 +92,7 @@ inline bool wait_until(
 {
     std::error_code ec;
     bool b = wait_until(p, exit_code, timeout_time, ec);
-    boost::process::detail::throw_error(ec, "wait_until error");
+    boost::process::v1::detail::throw_error(ec, "wait_until error");
     return b;
 }
 
@@ -114,10 +114,10 @@ inline bool wait_for(
 {
     std::error_code ec;
     bool b = wait_for(p, exit_code, rel_time, ec);
-    boost::process::detail::throw_error(ec, "wait_for error");
+    boost::process::v1::detail::throw_error(ec, "wait_for error");
     return b;
 }
 
-}}}}
+}}}}}
 
 #endif
diff --git a/inst/include/boost/process/detail/windows/wait_group.hpp b/inst/include/boost/process/v1/detail/windows/wait_group.hpp
similarity index 90%
rename from inst/include/boost/process/detail/windows/wait_group.hpp
rename to inst/include/boost/process/v1/detail/windows/wait_group.hpp
index d00fd0c56..b215c0ab3 100644
--- a/inst/include/boost/process/detail/windows/wait_group.hpp
+++ b/inst/include/boost/process/v1/detail/windows/wait_group.hpp
@@ -6,13 +6,13 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_WAIT_GROUP_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_WAIT_GROUP_HPP_
 
-#include <boost/process/detail/config.hpp>
-#include <boost/process/detail/windows/group_handle.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/windows/group_handle.hpp>
 #include <boost/winapi/jobs.hpp>
 #include <boost/winapi/wait.hpp>
 #include <chrono>
 
-namespace boost { namespace process { namespace detail { namespace windows {
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail { namespace windows {
 
 struct group_handle;
 
@@ -77,7 +77,7 @@ inline void wait(const group_handle &p)
 {
     std::error_code ec;
     wait(p, ec);
-    boost::process::detail::throw_error(ec, "wait error");
+    boost::process::v1::detail::throw_error(ec, "wait error");
 }
 
 template< class Clock, class Duration >
@@ -101,7 +101,7 @@ inline bool wait_until(
 {
     std::error_code ec;
     bool b = wait_until(p, timeout_time, ec);
-    boost::process::detail::throw_error(ec, "wait_until error");
+    boost::process::v1::detail::throw_error(ec, "wait_until error");
     return b;
 }
 
@@ -123,10 +123,10 @@ inline bool wait_for(
 {
     std::error_code ec;
     bool b = wait_for(p, rel_time, ec);
-    boost::process::detail::throw_error(ec, "wait_for error");
+    boost::process::v1::detail::throw_error(ec, "wait_for error");
     return b;
 }
 
-}}}}
+}}}}}
 
 #endif /* BOOST_PROCESS_DETAIL_WINDOWS_WAIT_GROUP_HPP_ */
diff --git a/inst/include/boost/process/v1/env.hpp b/inst/include/boost/process/v1/env.hpp
new file mode 100644
index 000000000..2bd039980
--- /dev/null
+++ b/inst/include/boost/process/v1/env.hpp
@@ -0,0 +1,503 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_DETAIL_ENV_HPP_
+#define BOOST_PROCESS_DETAIL_ENV_HPP_
+
+#include <boost/process/v1/detail/traits/wchar_t.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/none.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/env_init.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/env_init.hpp>
+#endif
+
+/** \file boost/process/env.hpp
+ *
+ *    This header which provides the `env` property. It allows the modification of the
+ *    environment the child process will run in, in a functional style.
+ *
+ *  \xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::env">env</globalname>;
+  }
+}
+</programlisting>
+ *  \endxmlonly
+ *
+ *  For additional information see the platform documentations:
+ *
+ *   - [windows](https://msdn.microsoft.com/en-US/library/windows/desktop/ms682653.aspx)
+ *   - [posix](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html)
+ *
+ */
+
+
+namespace boost {
+
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+
+template<typename Char>
+std::size_t make_env_string_size(const std::basic_string<Char> & ch)
+{
+    return ch.size() + 1;
+}
+
+template<typename Char>
+std::size_t make_env_string_size(const Char * ch)
+{
+    std::size_t sz = 0;
+    while (ch[sz] != null_char<Char>())
+        sz++;
+
+    sz++;
+    return sz;
+}
+
+template<typename Char, typename Container>
+inline std::basic_string<Char> make_env_string(const Container & value)
+{
+    std::size_t sz = 0;
+    for (auto & v : value)
+        sz += make_env_string_size(v);
+
+    std::basic_string<Char> s;
+    s.reserve(sz); //+1 for ;, end doesn't have one.
+
+    for (auto & val : value)
+        (s += val) += api::env_seperator<Char>();
+
+    s.resize(s.size() -1); //remove last ';'
+    return s;
+}
+
+
+template<typename Char>
+struct env_set
+{
+    using string_type = std::basic_string<Char>;
+    string_type key;
+    string_type value;
+};
+
+template<typename Char>
+struct env_append
+{
+    using string_type = std::basic_string<Char>;
+    string_type key;
+    string_type value;
+};
+
+
+
+template<typename Char>
+struct env_reset
+{
+    using string_type = std::basic_string<Char>;
+    string_type key;
+};
+
+
+template<> struct is_wchar_t<env_set<wchar_t>>           : std::true_type {};
+template<> struct is_wchar_t<env_append<wchar_t>>        : std::true_type {};
+template<> struct is_wchar_t<env_reset<wchar_t>>         : std::true_type {};
+template<> struct is_wchar_t<basic_environment<wchar_t>> : std::true_type {};
+
+
+template<>
+struct char_converter<char, env_set<wchar_t>>
+{
+    static env_set<char> conv(const env_set<wchar_t> & in)
+    {
+        return {::boost::process::v1::detail::convert(in.key),
+                ::boost::process::v1::detail::convert(in.value)};
+    }
+};
+
+template<>
+struct char_converter<wchar_t, env_set<char>>
+{
+    static env_set<wchar_t> conv(const env_set<char> & in)
+    {
+        return {::boost::process::v1::detail::convert(in.key),
+                ::boost::process::v1::detail::convert(in.value)};
+    }
+};
+
+template<>
+struct char_converter<char, env_append<wchar_t>>
+{
+    static env_append<char> conv(const env_append<wchar_t> & in)
+    {
+        return {::boost::process::v1::detail::convert(in.key),
+                ::boost::process::v1::detail::convert(in.value)};
+    }
+};
+
+template<>
+struct char_converter<wchar_t, env_append<char>>
+{
+    static env_append<wchar_t> conv(const env_append<char> & in)
+    {
+        return {::boost::process::v1::detail::convert(in.key),
+                ::boost::process::v1::detail::convert(in.value)};
+    }
+};
+
+template<>
+struct char_converter<char, env_reset<wchar_t>>
+{
+    static env_reset<char> conv(const env_reset<wchar_t> & in)
+    {
+        return {::boost::process::v1::detail::convert(in.key)};
+    }
+};
+
+template<>
+struct char_converter<wchar_t, env_reset<char>>
+{
+    static env_reset<wchar_t> conv(const env_reset<char> & in)
+    {
+        return {::boost::process::v1::detail::convert(in.key)};
+    }
+};
+
+
+template<typename Char>
+struct env_init
+{
+    basic_environment<Char> env;
+};
+
+template<>
+struct char_converter<char, env_init<wchar_t>>
+{
+    static env_init<char> conv(const env_init<wchar_t> & in)
+    {
+        return {basic_environment<char>(in.env)};
+    }
+};
+
+template<>
+struct char_converter<wchar_t, env_init<char>>
+{
+    static env_init<wchar_t> conv(const env_init<char> & in)
+    {
+        return {basic_environment<wchar_t>(in.env)};
+    }
+};
+
+template<>
+struct char_converter<char, basic_environment<wchar_t>>
+{
+    static basic_environment<char> conv(const basic_environment<wchar_t> & in)
+    {
+        return { basic_environment<char>(in) };
+    }
+};
+
+template<>
+struct char_converter<wchar_t, basic_environment<char>>
+{
+    static basic_environment<wchar_t> conv(const basic_environment<char> & in)
+    {
+        return { basic_environment<wchar_t>(in) };
+    }
+};
+
+template<typename Char>
+struct env_proxy
+{
+    using string_type = std::basic_string<Char>;
+    string_type key;
+
+
+    env_set<Char> operator=(const string_type & value)
+    {
+        return {std::move(key), value};
+    }
+    env_set<Char> operator=(const std::vector<string_type> & value)
+    {
+        return {std::move(key), make_env_string<Char>(value)};
+    }
+    env_set<Char> operator=(const std::initializer_list<const Char*> & value)
+    {
+        return {std::move(key), make_env_string<Char>(value)};
+    }
+
+    env_append<Char> operator+=(const string_type & value)
+    {
+        return {std::move(key), value};
+    }
+    env_append<Char> operator+=(const std::vector<string_type> & value)
+    {
+        return {std::move(key), make_env_string<Char>(value)};
+    }
+    env_append<Char> operator+=(const std::initializer_list<const Char*> & value)
+    {
+        return {std::move(key), make_env_string<Char>(value)};
+    }
+    env_reset<Char> operator=(boost::none_t)
+    {
+        return {std::move(key)};
+    }
+};
+
+struct env_
+{
+    constexpr env_() {};
+
+    template<typename Char>
+    env_set<Char> operator()(const std::basic_string<Char> & key,
+                             const std::basic_string<Char> & value) const
+    {
+        return {key, value};
+    }
+    template<typename Char>
+    env_set<Char> operator()(const std::basic_string<Char> & key,
+                                const std::vector<std::basic_string<Char>> & value) const
+    {
+        return {key, make_env_string<Char>(value)};
+    }
+    template<typename Char>
+    env_set<Char> operator()(const std::basic_string<Char> & key,
+                             const std::initializer_list<Char*> & value) const
+    {
+        return {key, make_env_string<Char>(value)};
+    }
+    template<typename Char>
+    env_reset<Char> operator()(const std::basic_string<Char> & key, boost::none_t)
+    {
+        return {key};
+    }
+    template<typename Char>
+    env_proxy<Char> operator[](const std::basic_string<Char> & key) const
+    {
+        return {key};
+    }
+    template<typename Char>
+    env_proxy<Char> operator[](const Char* key) const
+    {
+        return {key};
+    }
+    template<typename Char>
+    env_init<Char> operator()(const basic_environment<Char> & env) const
+    {
+        return {env};
+    }
+    template<typename Char>
+    env_init<Char> operator= (const basic_environment<Char> & env) const
+    {
+        return {env};
+    }
+};
+
+template<typename Char>
+struct env_builder
+{
+    basic_environment<Char> env;
+    env_builder() : env{basic_native_environment<Char>()} {}
+
+    void operator()(const basic_environment<Char> & e)
+    {
+        env = e;
+    }
+
+    void operator()(env_init<Char> & ei)
+    {
+        env = std::move(ei.env);
+    }
+    void operator()(env_set<Char> & es)
+    {
+        env[es.key] = es.value;
+    }
+    void operator()(env_reset<Char> & es)
+    {
+        env.erase(es.key);
+    }
+    template<typename T>
+    void operator()(env_append<T> & es)
+    {
+        env[es.key] += es.value;
+    }
+
+    typedef api::env_init<Char> result_type;
+    api::env_init<Char> get_initializer()
+    {
+        return api::env_init<Char>(std::move(env));
+    }
+};
+
+template<>
+struct initializer_builder<env_tag<char>>
+{
+    typedef env_builder<char> type;
+};
+
+template<>
+struct initializer_builder<env_tag<wchar_t>>
+{
+    typedef env_builder<wchar_t> type;
+};
+
+}
+
+/**
+
+The `env` property provides a functional way to modify the environment used by
+the child process. If none is passed the environment is inherited from the father
+process. Appending means that the environment will be interpreted as a ';' or ':'
+separated list as used in `PATH`.
+
+On both `posix` and `windows` the environment variables can be lists of strings,
+separated by ';'. This is typically used for the `PATH` variable.
+
+By default the environment will be inherited from the launching process,
+which is also true if environment are modified with this initializer.
+
+\section env_details Details
+
+\subsection env_operations Operations
+
+\subsubsection env_set_var Setting variables
+
+To set a variable `id` the value `value` the following syntax can be used.
+
+\code{.cpp}
+env[id] = value;
+env(id, value);
+\endcode
+
+`std::initializer_list` is among the allowed types, so the following syntax is also possible.
+
+\code{.cpp}
+env[id] = {value1, value2};
+env(id, {value1, value2});
+\endcode
+
+\note Creates the variable if it does not exist.
+
+The following lists contain possible value types, with `char_type` being either `char` or `wchar_t`
+for both `id` and `value`.
+
+\paragraph id id
+
+ - `std::basic_string<char_type>`
+ - `const char_type *`
+
+\paragraph env_set_var_value value
+
+ - `std::basic_string<char_type>`
+ - `const char_type * `
+ - `std::initializer_list<const char_type *>`
+ - `std::vector<std::basic_string<char_type>>`
+
+
+\note Using `std::vector` or `std::initializer_list`
+
+\subsubsection env_append_var Append variables
+
+Appending means, that a variable will be interpreted as a
+To append  a variable `id` the value `value` the following syntax can be used:
+
+\code{.cpp}
+env[id] += value;
+\endcode
+
+`std::initializer_list` is among the allowed types, so the following syntax is also possible.
+
+\code{.cpp}
+env[id] += {value1, value2};
+\endcode
+
+\note Creates the variable if it does not exist.
+
+The following lists contain possible value types, with `char_type` being either `char` or `wchar_t`
+for both `id` and `value`.
+
+\paragraph env_append_var_id id
+
+ - `std::basic_string<char_type>`
+ - `const char_type *`
+
+\paragraph env_append_var_value value
+
+ - `std::basic_string<char_type>`
+ - `const char_type *`
+ - `std::initializer_list<const char_type *>`
+ - `std::vector<std::basic_string<char_type>>`
+
+
+\subsubsection env_reset Reset variables
+
+Resetting single variables can be done in the following way:
+
+\code{.cpp}
+env[id] = boost::none;
+env(id, boost::none);
+\endcode
+
+\note This does not set the value empty, but removes it from the list.
+
+The following lists contain possible value types, with `char_type` being either `char` or `wchar_t`:
+
+\paragraph env_reset_var_id id
+
+ - `std::basic_string<char_type>`
+ - `const char_type *`
+
+\subsubsection env_init Initialize the environment
+
+The whole environment can be initialized from an object of type
+\xmlonly <classname>boost::process::v1::environment</classname> \endxmlonly
+
+\code{.cpp}
+env=env;
+env(env);
+\endcode
+
+\note The passed `environment` can also be default-constructed to get an empty environment.
+
+\paragraph env_init_var_id id
+
+ - `std::basic_string<char_type>`
+ - `const char_type *`
+
+\paragraph env_init_var_value value
+
+ - `boost::process::v1::basic_environment<char_type>`
+
+\subsection env_example Example
+
+\code{.cpp}
+spawn("b2", env["PATH"]+="F:/boost", env["SOME_VAR"]=boost::none, env["NEW_VAR"]="VALUE");
+\endcode
+
+If the overload style should be done by passing an instance of
+\xmlonly <classname>boost::process::v1::environment</classname> \endxmlonly
+the above example would look like this.
+
+\code{.cpp}
+environment e = this_process::environment();
+e["PATH"]   += "F:/boost";
+e.erase("SOME_VAR");
+e["NEW_VAR"] = "VALUE";
+spawn("b2", e);
+\endcode
+
+\warning Passing an empty environment will cause undefined behaviour.
+
+ */
+constexpr boost::process::v1::detail::env_ env{};
+
+
+}}}
+
+#endif /* INCLUDE_BOOST_PROCESS_DETAIL_ENV_HPP_ */
diff --git a/inst/include/boost/process/v1/environment.hpp b/inst/include/boost/process/v1/environment.hpp
new file mode 100644
index 000000000..6ba67c4f3
--- /dev/null
+++ b/inst/include/boost/process/v1/environment.hpp
@@ -0,0 +1,712 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+
+#ifndef BOOST_PROCESS_ENVIRONMENT_HPP_
+#define BOOST_PROCESS_ENVIRONMENT_HPP_
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/iterator/transform_iterator.hpp>
+#include <boost/process/v1/filesystem.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/environment.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/environment.hpp>
+#endif
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+namespace detail {
+
+template<typename Char, typename Environment>
+struct const_entry
+{
+    using value_type    = Char ;
+    using pointer       = const value_type * ;
+    using string_type   = std::basic_string<value_type> ;
+    using range         = boost::iterator_range<pointer> ;
+    using environment_t = Environment ;
+
+    std::vector<string_type> to_vector() const
+    {
+        if (_data == nullptr)
+            return std::vector<string_type>();
+        std::vector<string_type> data;
+        auto str = string_type(_data);
+        struct splitter
+        {
+            bool operator()(wchar_t w) const {return w == api::env_seperator<wchar_t>();}
+            bool operator()(char c)    const {return c == api::env_seperator<char>   ();}
+        } s;
+        boost::split(data, _data, s);
+        return data;
+    }
+    string_type to_string()              const
+    {
+        if (_data != nullptr)
+            return string_type(_data);
+        else
+            return string_type();
+    }
+    string_type get_name() const {return string_type(_name.begin(), _name.end());}
+    explicit const_entry(string_type&& name, pointer data, environment_t & env_) :
+        _name(std::move(name)), _data(data), _env(&env_) {}
+
+    explicit const_entry(string_type &&name, environment_t & env) :
+        _name(std::move(name)), _data(nullptr), _env(&env) {}
+    const_entry(const const_entry&) = default;
+    const_entry& operator=(const const_entry&) = default;
+
+    void reload()
+    {
+        auto p = _env->find(_name);
+        if (p == _env->end())
+            _data = nullptr;
+        else
+            _data = p->_data;
+        this->_env->reload();
+
+    }
+    bool empty() const
+    {
+        return _data == nullptr;
+    }
+protected:
+    string_type _name;
+    pointer _data;
+    environment_t * _env;
+};
+
+template<typename Char, typename Environment>
+struct entry : const_entry<Char, Environment>
+{
+    using father = const_entry<Char, Environment>;
+    using value_type    = typename father::value_type;
+    using string_type   = typename father::string_type;
+    using pointer       = typename father::pointer;
+    using environment_t = typename father::environment_t;
+
+    explicit entry(string_type&& name, pointer data, environment_t & env) :
+        father(std::move(name), data, env) {}
+
+    explicit entry(string_type &&name, environment_t & env_) :
+        father(std::move(name), env_) {}
+
+    entry(const entry&) = default;
+    entry& operator=(const entry&) = default;
+
+    void assign(const string_type &value)
+    {
+        this->_env->set(this->_name, value);
+        this->reload();
+    }
+    void assign(const std::vector<string_type> &value)
+    {
+        string_type data;
+        for (auto &v : value)
+        {
+            if (&v != &value.front())
+                data += api::env_seperator<value_type>();
+            data += v;
+        }
+        this->_env->set(this->_name, data);
+        this->reload();
+
+    }
+    void assign(const std::initializer_list<string_type> &value)
+    {
+        string_type data;
+        for (auto &v : value)
+        {
+            if (&v != &*value.begin())
+                data += api::env_seperator<value_type>();
+            data += v;
+        }
+        this->_env->set(this->_name, data);
+        this->reload();
+
+    }
+    void append(const string_type &value)
+    {
+        if (this->_data == nullptr)
+            this->_env->set(this->_name, value);
+        else
+        {
+            string_type st = this->_data;
+            this->_env->set(this->_name, st + api::env_seperator<value_type>() + value);
+        }
+
+
+        this->reload();
+
+    }
+    void clear()
+    {
+        this->_env->reset(this->_name);
+        this->_env->reload();
+        this->_data = nullptr;
+    }
+    entry &operator=(const string_type & value)
+    {
+        assign(value);
+        return *this;
+    }
+    entry &operator=(const std::vector<string_type> & value)
+    {
+        assign(value);
+        return *this;
+    }
+    entry &operator=(const std::initializer_list<string_type> & value)
+    {
+        assign(value);
+        return *this;
+    }
+    entry &operator+=(const string_type & value)
+    {
+        append(value);
+        return *this;
+    }
+
+};
+
+
+
+template<typename Char, typename Environment>
+struct make_entry
+{
+
+    make_entry(const make_entry&) = default;
+    make_entry& operator=(const make_entry&) = default;
+
+    Environment *env;
+    make_entry(Environment & env) : env(&env) {};
+    entry<Char, Environment> operator()(const Char* data) const
+    {
+        auto p = data;
+        while ((*p != equal_sign<Char>()) && (*p != null_char<Char>()))
+                p++;
+        auto name = std::basic_string<Char>(data, p);
+        p++; //go behind equal sign
+
+        return entry<Char, Environment>(std::move(name), p, *env);
+    }
+};
+
+template<typename Char, typename Environment>
+struct make_const_entry
+{
+
+    make_const_entry(const make_const_entry&) = default;
+    make_const_entry& operator=(const make_const_entry&) = default;
+
+    Environment *env;
+    make_const_entry(Environment & env) : env(&env) {};
+    const_entry<Char, Environment> operator()(const Char* data) const
+    {
+        auto p = data;
+        while ((*p != equal_sign<Char>()) && (*p != null_char<Char>()))
+                p++;
+        auto name = std::basic_string<Char>(data, p);
+        p++; //go behind equal sign
+
+        return const_entry<Char, Environment>(std::move(name), p, *env);
+    }
+};
+
+}
+
+#if !defined (BOOST_PROCESS_DOXYGEN)
+
+template<typename Char, template <class> class Implementation = detail::api::basic_environment_impl>
+class basic_environment_impl : public Implementation<Char>
+{
+    Char** _get_end() const
+    {
+        auto p = this->_env_impl;
+        while (*p != nullptr)
+            p++;
+
+        return p;
+    }
+public:
+    using string_type = std::basic_string<Char>;
+    using implementation_type = Implementation<Char>;
+    using base_type = basic_environment_impl<Char, Implementation>;
+    using       entry_maker = detail::make_entry<Char, base_type>;
+    using entry_type        = detail::entry     <Char, base_type>;
+    using const_entry_type  = detail::const_entry     <Char, const base_type>;
+    using const_entry_maker = detail::make_const_entry<Char, const base_type>;
+
+    friend       entry_type;
+    friend const_entry_type;
+
+    using iterator        = boost::transform_iterator<      entry_maker, Char**,       entry_type,       entry_type>;
+    using const_iterator  = boost::transform_iterator<const_entry_maker, Char**, const_entry_type, const_entry_type>;
+    using size_type       = std::size_t;
+
+    iterator        begin()       {return       iterator(this->_env_impl,       entry_maker(*this));}
+    const_iterator  begin() const {return const_iterator(this->_env_impl, const_entry_maker(*this));}
+    const_iterator cbegin() const {return const_iterator(this->_env_impl, const_entry_maker(*this));}
+
+    iterator        end()       {return       iterator(_get_end(),       entry_maker(*this));}
+    const_iterator  end() const {return const_iterator(_get_end(), const_entry_maker(*this));}
+    const_iterator cend() const {return const_iterator(_get_end(), const_entry_maker(*this));}
+
+    iterator        find( const string_type& key )
+    {
+        auto p = this->_env_impl;
+        auto st1 = key + ::boost::process::v1::detail::equal_sign<Char>();
+        while (*p != nullptr)
+        {
+            const std::ptrdiff_t len = std::char_traits<Char>::length(*p);
+            if ((std::distance(st1.begin(), st1.end()) < len)
+                 && std::equal(st1.begin(), st1.end(), *p))
+                break;
+            p++;
+        }
+        return iterator(p, entry_maker(*this));
+    }
+    const_iterator  find( const string_type& key ) const
+    {
+        auto p = this->_env_impl;
+        auto st1 = key + ::boost::process::v1::detail::equal_sign<Char>();
+        while (*p != nullptr)
+        {
+            const std::size_t len = std::char_traits<Char>::length(*p);
+            if ((std::distance(st1.begin(), st1.end()) < len)
+                && std::equal(st1.begin(), st1.end(), *p))
+                break;
+            p++;
+        }
+        return const_iterator(p, const_entry_maker(*this));
+    }
+
+    std::size_t count(const string_type & st) const
+    {
+        auto p = this->_env_impl;
+        auto st1 = st + ::boost::process::v1::detail::equal_sign<Char>();
+        while (*p != nullptr)
+        {
+            const std::size_t len = std::char_traits<Char>::length(*p);
+            if ((std::distance(st1.begin(), st1.end()) <
+                 static_cast<typename string_type::iterator::difference_type>(len))
+                && std::equal(st1.begin(), st1.end(), *p))
+                return 1u;
+            p++;
+        }
+        return 0u;
+    }
+    void erase(const string_type & id)
+    {
+        implementation_type::reset(id);
+        this->reload();
+    }
+    std::pair<iterator,bool> emplace(const string_type & id, const string_type & value)
+    {
+        auto f = find(id);
+        if (f == end())
+        {
+            implementation_type::set(id, value);
+            this->reload();
+            return std::pair<iterator, bool>(find(id), true);
+        }
+        else
+            return std::pair<iterator, bool>(f, false);
+    }
+    using implementation_type::implementation_type;
+    using implementation_type::operator=;
+    using native_handle_type = typename implementation_type::native_handle_type;
+    using implementation_type::native_handle;
+    //copy ctor if impl is copy-constructible
+    bool empty()
+    {
+        return *this->_env_impl == nullptr;
+    }
+    std::size_t size() const
+    {
+        return (_get_end() - this->_env_impl);
+    }
+    void clear()
+    {
+        std::vector<string_type> names;
+        names.resize(size());
+        std::transform(cbegin(), cend(), names.begin(), [](const const_entry_type & cet){return cet.get_name();});
+
+        for (auto & nm : names)
+            implementation_type::reset(nm);
+
+        this->reload();
+    }
+
+    entry_type  at( const string_type& key )
+    {
+        auto f = find(key);
+        if (f== end())
+            throw std::out_of_range(key + " not found");
+        return *f;
+    }
+    const_entry_type at( const string_type& key ) const
+    {
+        auto f = find(key);
+        if (f== end())
+            throw std::out_of_range(key + " not found");
+        return *f;
+    }
+    entry_type operator[](const string_type & key)
+    {
+        auto p = find(key);
+        if (p != end())
+            return *p;
+
+        return entry_type(string_type(key), *this);
+    }
+};
+#endif
+
+#if defined(BOOST_PROCESS_DOXYGEN)
+/**Template representation of environments. It takes a character type (`char` or `wchar_t`)
+ * as template parameter to implement the environment
+ */
+template<typename Char>
+class basic_environment
+{
+
+public:
+    typedef std::basic_string<Char> string_type;
+    typedef boost::transform_iterator<      entry_maker, Char**> iterator       ;
+    typedef boost::transform_iterator<const_entry_maker, Char**> const_iterator ;
+    typedef std::size_t                                             size_type      ;
+
+    iterator       begin()        ; ///<Returns an iterator to the beginning
+    const_iterator begin()  const ; ///<Returns an iterator to the beginning
+    const_iterator cbegin() const ; ///<Returns an iterator to the beginning
+
+    iterator       end()       ; ///<Returns an iterator to the end
+    const_iterator end()  const; ///<Returns an iterator to the end
+    const_iterator cend() const; ///<Returns an iterator to the end
+
+    iterator        find( const string_type& key );            ///<Find a variable by its name
+    const_iterator  find( const string_type& key ) const;   ///<Find a variable by its name
+
+    std::size_t count(const string_type & st) const; ///<Number of variables
+    void erase(const string_type & id); ///<Erase variable by id.
+    ///Emplace an environment variable.
+    std::pair<iterator,bool> emplace(const string_type & id, const string_type & value);
+
+    ///Default constructor
+    basic_environment();
+    ///Copy constructor.
+    basic_environment(const basic_environment & );
+    ///Move constructor.
+    basic_environment(basic_environment && );
+
+    ///Copy assignment.
+    basic_environment& operator=(const basic_environment & );
+    ///Move assignment.
+    basic_environment& operator=(basic_environment && );
+
+    typedef typename detail::implementation_type::native_handle_type native_handle;
+
+    ///Check if environment has entries.
+    bool empty();
+    ///Get the number of variables.
+    std::size_t size() const;
+    ///Clear the environment. @attention Use with care, passed environment cannot be empty.
+    void clear();
+    ///Get the entry with the key. Throws if it does not exist.
+    entry_type  at( const string_type& key );
+    ///Get the entry with the key. Throws if it does not exist.
+    const_entry_type at( const string_type& key ) const;
+    ///Get the entry with the given key. It creates the entry if it doesn't exist.
+    entry_type operator[](const string_type & key);
+
+    /**Proxy class used for read access to members by [] or .at()
+     * @attention Holds a reference to the environment it was created from.
+     */
+    template<typename Char, typename Environment>
+    struct const_entry_type
+    {
+        typedef Char value_type;
+        typedef const value_type * pointer;
+        typedef std::basic_string<value_type> string_type;
+        typedef boost::iterator_range<pointer> range;
+        typedef Environment environment_t;
+
+        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
+        std::vector<string_type> to_vector() const
+        ///Get the value as string.
+        string_type to_string()              const
+        ///Get the name of this entry.
+        string_type get_name() const {return string_type(_name.begin(), _name.end());}
+        ///Copy Constructor
+        const_entry(const const_entry&) = default;
+        ///Move Constructor
+        const_entry& operator=(const const_entry&) = default;
+        ///Check if the entry is empty.
+        bool empty() const;
+    };
+
+    /**Proxy class used for read and write access to members by [] or .at()
+     * @attention Holds a reference to the environment it was created from.
+     */
+    template<typename Char, typename Environment>
+    struct entry_type
+    {
+
+        typedef Char value_type;
+        typedef const value_type * pointer;
+        typedef std::basic_string<value_type> string_type;
+        typedef boost::iterator_range<pointer> range;
+        typedef Environment environment_t;
+
+        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
+        std::vector<string_type> to_vector() const
+        ///Get the value as string.
+        string_type to_string()              const
+        ///Get the name of this entry.
+        string_type get_name() const {return string_type(_name.begin(), _name.end());}
+        ///Copy Constructor
+        entry(const entry&) = default;
+        ///Move Constructor
+        entry& operator=(const entry&) = default;
+        ///Check if the entry is empty.
+        bool empty() const;
+
+        ///Assign a string to the value
+        void assign(const string_type &value);
+        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
+        void assign(const std::vector<string_type> &value);
+        ///Append a string to the end of the entry, it will separated by ';' or ':'.
+        void append(const string_type &value);
+        ///Reset the value
+        void clear();
+        ///Assign a string to the entry.
+        entry &operator=(const string_type & value);
+        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
+        entry &operator=(const std::vector<string_type> & value);
+        ///Append a string to the end of the entry, it will separated by ';' or ':'.
+        entry &operator+=(const string_type & value);
+    };
+
+};
+
+/**Template representation of the environment of this process. It takes a template
+ * as template parameter to implement the environment. All instances of this class
+ * refer to the same environment, but might not get updated if another one makes changes.
+ */
+template<typename Char>
+class basic_native_environment
+{
+
+public:
+    typedef std::basic_string<Char> string_type;
+    typedef boost::transform_iterator<      entry_maker, Char**> iterator       ;
+    typedef boost::transform_iterator<const_entry_maker, Char**> const_iterator ;
+    typedef std::size_t                                             size_type      ;
+
+    iterator       begin()        ; ///<Returns an iterator to the beginning
+    const_iterator begin()  const ; ///<Returns an iterator to the beginning
+    const_iterator cbegin() const ; ///<Returns an iterator to the beginning
+
+    iterator       end()       ; ///<Returns an iterator to the end
+    const_iterator end()  const; ///<Returns an iterator to the end
+    const_iterator cend() const; ///<Returns an iterator to the end
+
+    iterator        find( const string_type& key );            ///<Find a variable by its name
+    const_iterator  find( const string_type& key ) const;   ///<Find a variable by its name
+
+    std::size_t count(const string_type & st) const; ///<Number of variables
+    void erase(const string_type & id); ///<Erase variable by id.
+    ///Emplace an environment variable.
+    std::pair<iterator,bool> emplace(const string_type & id, const string_type & value);
+
+    ///Default constructor
+    basic_native_environment();
+    ///Move constructor.
+    basic_native_environment(basic_native_environment && );
+    ///Move assignment.
+    basic_native_environment& operator=(basic_native_environment && );
+
+    typedef typename detail::implementation_type::native_handle_type native_handle;
+
+    ///Check if environment has entries.
+    bool empty();
+    ///Get the number of variables.
+    std::size_t size() const;
+    ///Get the entry with the key. Throws if it does not exist.
+    entry_type  at( const string_type& key );
+    ///Get the entry with the key. Throws if it does not exist.
+    const_entry_type at( const string_type& key ) const;
+    ///Get the entry with the given key. It creates the entry if it doesn't exist.
+    entry_type operator[](const string_type & key);
+
+    /**Proxy class used for read access to members by [] or .at()
+     * @attention Holds a reference to the environment it was created from.
+     */
+    template<typename Char, typename Environment>
+    struct const_entry_type
+    {
+        typedef Char value_type;
+        typedef const value_type * pointer;
+        typedef std::basic_string<value_type> string_type;
+        typedef boost::iterator_range<pointer> range;
+        typedef Environment environment_t;
+
+        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
+        std::vector<string_type> to_vector() const
+        ///Get the value as string.
+        string_type to_string()              const
+        ///Get the name of this entry.
+        string_type get_name() const {return string_type(_name.begin(), _name.end());}
+        ///Copy Constructor
+        const_entry(const const_entry&) = default;
+        ///Move Constructor
+        const_entry& operator=(const const_entry&) = default;
+        ///Check if the entry is empty.
+        bool empty() const;
+    };
+
+    /**Proxy class used for read and write access to members by [] or .at()
+     * @attention Holds a reference to the environment it was created from.
+     */
+    template<typename Char, typename Environment>
+    struct entry_type
+    {
+
+        typedef Char value_type;
+        typedef const value_type * pointer;
+        typedef std::basic_string<value_type> string_type;
+        typedef boost::iterator_range<pointer> range;
+        typedef Environment environment_t;
+
+        ///Split the entry by ";" or ":" and return it as a vector. Used by PATH.
+        std::vector<string_type> to_vector() const
+        ///Get the value as string.
+        string_type to_string()              const
+        ///Get the name of this entry.
+        string_type get_name() const {return string_type(_name.begin(), _name.end());}
+        ///Copy Constructor
+        entry(const entry&) = default;
+        ///Move Constructor
+        entry& operator=(const entry&) = default;
+        ///Check if the entry is empty.
+        bool empty() const;
+
+        ///Assign a string to the value
+        void assign(const string_type &value);
+        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
+        void assign(const std::vector<string_type> &value);
+        ///Append a string to the end of the entry, it will separated by ';'  or ':'.
+        void append(const string_type &value);
+        ///Reset the value
+        void clear();
+        ///Assign a string to the entry.
+        entry &operator=(const string_type & value);
+        ///Assign a set of strings to the entry; they will be separated by ';' or ':'.
+        entry &operator=(const std::vector<string_type> & value);
+        ///Append a string to the end of the entry, it will separated by ';' or ':'.
+        entry &operator+=(const string_type & value);
+    };
+
+};
+
+#endif
+
+///Definition of the environment for the current process.
+template<typename Char>
+class basic_native_environment : public basic_environment_impl<Char, detail::api::native_environment_impl>
+{
+public:
+    using base_type = basic_environment_impl<Char, detail::api::native_environment_impl>;
+    using base_type::base_type;
+    using base_type::operator=;
+};
+
+///Type definition to hold a seperate environment.
+template<typename Char>
+class basic_environment : public basic_environment_impl<Char, detail::api::basic_environment_impl>
+{
+public:
+    using base_type = basic_environment_impl<Char, detail::api::basic_environment_impl>;
+    using base_type::base_type;
+    using base_type::operator=;
+};
+
+
+#if !defined(BOOST_NO_ANSI_APIS)
+///Definition of the environment for the current process.
+typedef basic_native_environment<char>     native_environment;
+#endif
+///Definition of the environment for the current process.
+typedef basic_native_environment<wchar_t> wnative_environment;
+
+#if !defined(BOOST_NO_ANSI_APIS)
+///Type definition to hold a seperate environment.
+typedef basic_environment<char>     environment;
+#endif
+///Type definition to hold a seperate environment.
+typedef basic_environment<wchar_t> wenvironment;
+
+}}
+
+///Namespace containing information of the calling process.
+namespace this_process
+{
+
+///Definition of the native handle type.
+typedef ::boost::process::v1::detail::api::native_handle_t native_handle_type;
+
+#if !defined(BOOST_NO_ANSI_APIS)
+///Definition of the environment for this process.
+using ::boost::process::v1::native_environment;
+#endif
+///Definition of the environment for this process.
+using ::boost::process::v1::wnative_environment;
+
+///Get the process id of the current process.
+inline int get_id()                     { return ::boost::process::v1::detail::api::get_id();}
+///Get the native handle of the current process.
+inline native_handle_type native_handle()  { return ::boost::process::v1::detail::api::native_handle();}
+#if !defined(BOOST_NO_ANSI_APIS)
+///Get the enviroment of the current process.
+inline native_environment   environment() { return ::boost::process::v1:: native_environment(); }
+#endif
+///Get the enviroment of the current process.
+inline wnative_environment wenvironment() { return ::boost::process::v1::wnative_environment(); }
+///Get the path environment variable of the current process runs.
+inline std::vector<boost::process::v1::filesystem::path> path()
+{
+#if defined(BOOST_WINDOWS_API)
+    const ::boost::process::v1::wnative_environment ne{};
+    typedef typename ::boost::process::v1::wnative_environment::const_entry_type value_type;
+    static constexpr auto id = L"PATH";
+#else
+    const ::boost::process::v1::native_environment ne{};
+    typedef typename ::boost::process::v1::native_environment::const_entry_type value_type;
+    static constexpr auto id = "PATH";
+#endif
+
+    auto itr = std::find_if(ne.cbegin(), ne.cend(),
+            [&](const value_type & e)
+             {return id == ::boost::to_upper_copy(e.get_name(), ::boost::process::v1::detail::process_locale());});
+
+    if (itr == ne.cend())
+        return {};
+
+    auto vec = itr->to_vector();
+
+    std::vector<boost::process::v1::filesystem::path> val;
+    val.resize(vec.size());
+
+    std::copy(vec.begin(), vec.end(), val.begin());
+
+    return val;
+}
+}
+}
+#endif /* INCLUDE_BOOST_PROCESS_DETAIL_ENVIRONMENT_HPP_ */
diff --git a/inst/include/boost/process/v1/error.hpp b/inst/include/boost/process/v1/error.hpp
new file mode 100644
index 000000000..99992e1cf
--- /dev/null
+++ b/inst/include/boost/process/v1/error.hpp
@@ -0,0 +1,211 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_DETAIL_ERROR_HPP
+#define BOOST_PROCESS_DETAIL_ERROR_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/traits.hpp>
+
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/handler.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/handler.hpp>
+#endif
+
+#include <system_error>
+
+#include <type_traits>
+#include <boost/fusion/algorithm/query/find_if.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/iterator/deref.hpp>
+#include <boost/fusion/sequence/comparison/equal_to.hpp>
+#include <boost/fusion/container/set/convert.hpp>
+#include <boost/type_index.hpp>
+
+/** \file boost/process/error.hpp
+ *
+ *    Header which provides the error properties. It allows to explicitly set the error handling, the properties are:
+ *
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::ignore_error">ignore_error</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::throw_on_error">throw_on_error</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::error">error</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::error_ref">error_ref</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::error_code">error_code</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+ *     For error there are two aliases: error_ref and error_code
+ */
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+namespace detail {
+
+struct throw_on_error_ : ::boost::process::v1::detail::api::handler_base_ext
+{
+    constexpr throw_on_error_() = default;
+
+    template <class Executor>
+    void on_error(Executor&, const std::error_code & ec) const
+    {
+        throw process_error(ec, "process creation failed");
+    }
+
+    const throw_on_error_ &operator()() const {return *this;}
+};
+
+struct ignore_error_ : ::boost::process::v1::detail::api::handler_base_ext
+{
+    constexpr ignore_error_() = default;
+};
+
+struct set_on_error : ::boost::process::v1::detail::api::handler_base_ext
+{
+    set_on_error(const set_on_error&) = default;
+    explicit set_on_error(std::error_code &ec) : ec_(ec) {}
+
+    template <class Executor>
+    void on_error(Executor&, const std::error_code & ec) const noexcept
+    {
+        ec_ = ec;
+    }
+
+private:
+    std::error_code &ec_;
+};
+
+struct error_
+{
+    constexpr error_() = default;
+    set_on_error operator()(std::error_code &ec) const {return set_on_error(ec);}
+    set_on_error operator= (std::error_code &ec) const {return set_on_error(ec);}
+
+};
+
+
+template<typename T>
+struct is_error_handler : std::false_type {};
+
+template<> struct is_error_handler<set_on_error>    : std::true_type {};
+template<> struct is_error_handler<throw_on_error_> : std::true_type {};
+template<> struct is_error_handler<ignore_error_>   : std::true_type {};
+
+
+
+template<typename Iterator, typename End>
+struct has_error_handler_impl
+{
+    typedef typename boost::fusion::result_of::deref<Iterator>::type ref_type;
+    typedef typename std::remove_reference<ref_type>::type res_type_;
+    typedef typename std::remove_cv<res_type_>::type res_type;
+    typedef typename is_error_handler<res_type>::type cond;
+
+    typedef typename boost::fusion::result_of::next<Iterator>::type next_itr;
+    typedef typename has_error_handler_impl<next_itr, End>::type next;
+
+    typedef typename boost::mpl::or_<cond, next>::type type;
+};
+
+template<typename Iterator>
+struct has_error_handler_impl<Iterator, Iterator>
+{
+    typedef boost::mpl::false_ type;
+};
+
+
+template<typename Sequence>
+struct has_error_handler
+{
+    typedef typename boost::fusion::result_of::as_vector<Sequence>::type vector_type;
+
+    typedef typename has_error_handler_impl<
+            typename boost::fusion::result_of::begin<vector_type>::type,
+            typename boost::fusion::result_of::end<  vector_type>::type
+            >::type type;
+};
+
+template<typename Sequence>
+struct has_ignore_error
+{
+    typedef typename boost::fusion::result_of::as_set<Sequence>::type set_type;
+    typedef typename boost::fusion::result_of::has_key<set_type, ignore_error_>::type  type1;
+    typedef typename boost::fusion::result_of::has_key<set_type, ignore_error_&>::type type2;
+    typedef typename boost::fusion::result_of::has_key<set_type, const ignore_error_&>::type type3;
+    typedef typename boost::mpl::or_<type1,type2, type3>::type type;
+};
+
+struct error_builder
+{
+    std::error_code *err;
+    typedef set_on_error result_type;
+    set_on_error get_initializer() {return set_on_error(*err);};
+    void operator()(std::error_code & ec) {err = &ec;};
+};
+
+template<>
+struct initializer_tag<std::error_code>
+{
+    typedef error_tag type;
+};
+
+
+template<>
+struct initializer_builder<error_tag>
+{
+    typedef error_builder type;
+};
+
+}
+/**The ignore_error property will disable any error handling. This can be useful
+on linux, where error handling will require a pipe.*/
+constexpr boost::process::v1::detail::ignore_error_ ignore_error;
+/**The throw_on_error property will enable the exception when launching a process.
+It is unnecessary by default, but may be used, when an additional error_code is provided.*/
+constexpr boost::process::v1::detail::throw_on_error_ throw_on_error;
+/**
+The error property will set the executor to handle any errors by setting an
+[std::error_code](http://en.cppreference.com/w/cpp/error/error_code).
+
+\code{.cpp}
+std::error_code ec;
+system("gcc", error(ec));
+\endcode
+
+The following syntax is valid:
+
+\code{.cpp}
+error(ec);
+error=ec;
+\endcode
+
+The overload version is achieved by just passing an object of
+ [std::error_code](http://en.cppreference.com/w/cpp/error/error_code) to the function.
+
+
+ */
+constexpr boost::process::v1::detail::error_ error;
+///Alias for \xmlonly <globalname alt="boost::process::v1::error">error</globalname> \endxmlonly .
+constexpr boost::process::v1::detail::error_ error_ref;
+///Alias for \xmlonly <globalname alt="boost::process::v1::error">error</globalname> \endxmlonly .
+constexpr boost::process::v1::detail::error_ error_code;
+
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/exception.hpp b/inst/include/boost/process/v1/exception.hpp
new file mode 100644
index 000000000..e121b436f
--- /dev/null
+++ b/inst/include/boost/process/v1/exception.hpp
@@ -0,0 +1,35 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_EXCEPTION_HPP_
+#define BOOST_PROCESS_EXCEPTION_HPP_
+
+#include <system_error>
+#include <boost/process/v1/detail/config.hpp>
+
+namespace boost
+{
+namespace process
+{
+
+BOOST_PROCESS_V1_INLINE namespace v1
+{
+
+///The exception usually thrown by boost.process.v1.
+/** It merely inherits [std::system_error](http://en.cppreference.com/w/cpp/error/system_error)
+ * but can then be distinguished in the catch-block from other system errors.
+ *
+ */
+struct process_error : std::system_error
+{
+    using std::system_error::system_error;
+};
+
+}
+}
+}
+
+
+#endif /* BOOST_PROCESS_EXCEPTION_HPP_ */
diff --git a/inst/include/boost/process/v1/exe.hpp b/inst/include/boost/process/v1/exe.hpp
new file mode 100644
index 000000000..5c9fe1993
--- /dev/null
+++ b/inst/include/boost/process/v1/exe.hpp
@@ -0,0 +1,97 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_EXE_HPP
+#define BOOST_PROCESS_EXE_HPP
+
+#include <boost/process/v1/detail/basic_cmd.hpp>
+
+/** \file boost/process/exe.hpp
+ *
+ *    Header which provides the exe property.
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::exe">exe</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+ */
+namespace boost {
+namespace filesystem { class path; }
+
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+namespace detail {
+
+struct exe_
+{
+    template<typename = void>
+    inline exe_setter_<typename boost::process::v1::filesystem::path::value_type> operator()(const boost::process::v1::filesystem::path & pth) const
+    {
+        return exe_setter_<typename boost::process::v1::filesystem::path::value_type>(pth.native());
+    }
+
+    template<typename = void>
+    inline exe_setter_<typename boost::process::v1::filesystem::path::value_type> operator=(const boost::process::v1::filesystem::path & pth) const
+    {
+        return exe_setter_<typename boost::process::v1::filesystem::path::value_type>(pth.native());
+    }
+
+
+    template<typename Char>
+    inline exe_setter_<Char> operator()(const Char *s) const
+    {
+        return exe_setter_<Char>(s);
+    }
+    template<typename Char>
+    inline exe_setter_<Char> operator= (const Char *s) const
+    {
+        return exe_setter_<Char>(s);
+    }
+
+    template<typename Char>
+    inline exe_setter_<Char> operator()(const std::basic_string<Char> &s) const
+    {
+        return exe_setter_<Char>(s);
+    }
+    template<typename Char>
+    inline exe_setter_<Char> operator= (const std::basic_string<Char> &s) const
+    {
+        return exe_setter_<Char>(s);
+    }
+};
+
+}
+
+/** The exe property allows to explicitly set the executable.
+
+The overload form applies when to the first, when several strings are passed to a launching
+function.
+
+The following expressions are valid, with `value` being either a C-String or
+a `std::basic_string` with `char` or `wchar_t` or a `boost::process::v1::filesystem::path`.
+
+\code{.cpp}
+exe="value";
+exe(value);
+\endcode
+
+The property can only be used for assignments.
+
+
+ */
+constexpr boost::process::v1::detail::exe_ exe{};
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/extend.hpp b/inst/include/boost/process/v1/extend.hpp
new file mode 100644
index 000000000..fced1619e
--- /dev/null
+++ b/inst/include/boost/process/v1/extend.hpp
@@ -0,0 +1,350 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_EXTENSIONS_HPP_
+#define BOOST_PROCESS_EXTENSIONS_HPP_
+
+#include <boost/process/v1/detail/handler.hpp>
+#include <boost/process/v1/detail/used_handles.hpp>
+#include <memory>
+
+#if defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/executor.hpp>
+#include <boost/process/v1/detail/windows/async_handler.hpp>
+#include <boost/process/v1/detail/windows/asio_fwd.hpp>
+#else
+#include <boost/process/v1/detail/posix/executor.hpp>
+#include <boost/process/v1/detail/posix/async_handler.hpp>
+#include <boost/process/v1/detail/posix/asio_fwd.hpp>
+#endif
+
+
+/** \file boost/process/extend.hpp
+ *
+ * This header which provides the types and functions provided for custom extensions.
+ *
+ * \xmlonly
+   Please refer to the <link linkend="boost_process.extend">tutorial</link> for more details.
+   \endxmlonly
+ */
+
+
+namespace boost
+{
+namespace process
+{
+BOOST_PROCESS_V1_INLINE namespace v1
+{
+namespace detail
+{
+template<typename Tuple>
+inline asio::io_context &get_io_context(const Tuple &tup);
+}
+
+
+///Namespace for extensions \attention This is experimental.
+namespace extend
+{
+
+#if defined(BOOST_WINDOWS_API)
+
+template<typename Char, typename Sequence>
+using windows_executor = ::boost::process::v1::detail::windows::executor<Char, Sequence>;
+template<typename Sequence>
+struct posix_executor;
+
+#elif defined(BOOST_POSIX_API)
+
+template<typename Sequence>
+using posix_executor = ::boost::process::v1::detail::posix::executor<Sequence>;
+template<typename Char, typename Sequence>
+struct windows_executor;
+
+#endif
+
+using ::boost::process::v1::detail::handler;
+using ::boost::process::v1::detail::api::require_io_context;
+using ::boost::process::v1::detail::api::async_handler;
+using ::boost::process::v1::detail::get_io_context;
+using ::boost::process::v1::detail::get_last_error;
+using ::boost::process::v1::detail::throw_last_error;
+using ::boost::process::v1::detail::uses_handles;
+using ::boost::process::v1::detail::foreach_used_handle;
+using ::boost::process::v1::detail::get_used_handles;
+
+///This handler is invoked before the process in launched, to setup parameters. The required signature is `void(Exec &)`, where `Exec` is a template parameter.
+constexpr boost::process::v1::detail::make_handler_t<boost::process::v1::detail::on_setup_> on_setup;
+///This handler is invoked if an error occurred. The required signature is `void(auto & exec, const std::error_code&)`, where `Exec` is a template parameter.
+constexpr boost::process::v1::detail::make_handler_t<boost::process::v1::detail::on_error_> on_error;
+///This handler is invoked if launching the process has succeeded. The required signature is `void(auto & exec)`, where `Exec` is a template parameter.
+constexpr boost::process::v1::detail::make_handler_t<boost::process::v1::detail::on_success_> on_success;
+
+#if defined(BOOST_POSIX_API) || defined(BOOST_PROCESS_DOXYGEN)
+///This handler is invoked if the fork failed. The required signature is `void(auto & exec)`, where `Exec` is a template parameter. \note Only available on posix.
+constexpr ::boost::process::v1::detail::make_handler_t<::boost::process::v1::detail::posix::on_fork_error_> on_fork_error;
+///This handler is invoked if the fork succeeded. The required signature is `void(Exec &)`, where `Exec` is a template parameter. \note Only available on posix.
+constexpr ::boost::process::v1::detail::make_handler_t<::boost::process::v1::detail::posix::on_exec_setup_> on_exec_setup;
+///This handler is invoked if the exec call errored. The required signature is `void(auto & exec)`, where `Exec` is a template parameter. \note Only available on posix.
+constexpr ::boost::process::v1::detail::make_handler_t<::boost::process::v1::detail::posix::on_exec_error_> on_exec_error;
+#endif
+
+#if defined(BOOST_PROCESS_DOXYGEN)
+///Helper function to get the last error code system-independent
+inline std::error_code get_last_error();
+
+///Helper function to get and throw the last system error.
+/// \throws boost::process::v1::process_error
+/// \param msg A message to add to the error code.
+inline void throw_last_error(const std::string & msg);
+///\overload void throw_last_error(const std::string & msg)
+inline void throw_last_error();
+
+
+/** This function gets the io_context from the initializer sequence.
+ *
+ * \attention Yields a compile-time error if no `io_context` is provided.
+ * \param seq The Sequence of the initializer.
+ */
+template<typename Sequence>
+inline asio::io_context& get_io_context(const Sequence & seq);
+
+/** This class is the base for every initializer, to be used for extensions.
+ *
+ *  The usage is done through compile-time polymorphism, so that the required
+ *  functions can be overloaded.
+ *
+ * \note None of the function need to be `const`.
+ *
+ */
+struct handler
+{
+    ///This function is invoked before the process launch. \note It is not required to be const.
+    template <class Executor>
+    void on_setup(Executor&) const {}
+
+    /** This function is invoked if an error occured while trying to launch the process.
+     * \note It is not required to be const.
+     */
+    template <class Executor>
+    void on_error(Executor&, const std::error_code &) const {}
+
+    /** This function is invoked if the process was successfully launched.
+     * \note It is not required to be const.
+     */
+    template <class Executor>
+    void on_success(Executor&) const {}
+
+    /**This function is invoked if an error occured during the call of `fork`.
+     * \note This function will only be called on posix.
+     */
+    template<typename Executor>
+    void on_fork_error  (Executor &, const std::error_code&) const {}
+
+    /**This function is invoked if the call of `fork` was successful, before
+     * calling `execve`.
+     * \note This function will only be called on posix.
+     * \attention It will be invoked from the new process.
+     */
+    template<typename Executor>
+    void on_exec_setup  (Executor &) const {}
+
+    /**This function is invoked if the call of `execve` failed.
+     * \note This function will only be called on posix.
+     * \attention It will be invoked from the new process.
+     */
+    template<typename Executor>
+    void on_exec_error  (Executor &, const std::error_code&) const {}
+
+};
+
+
+/** Inheriting the class will tell the launching process that an `io_context` is
+ * needed. This should always be used when \ref get_io_context is used.
+ *
+ */
+struct require_io_context {};
+/** Inheriting this class will tell the launching function, that an event handler
+ * shall be invoked when the process exits. This automatically does also inherit
+ * \ref require_io_context.
+ *
+ * You must add the following function to your implementation:
+ *
+ \code{.cpp}
+template<typename Executor>
+std::function<void(int, const std::error_code&)> on_exit_handler(Executor & exec)
+{
+    auto handler_ = this->handler;
+    return [handler_](int exit_code, const std::error_code & ec)
+           {
+                handler_(static_cast<int>(exit_code), ec);
+           };
+
+}
+ \endcode
+
+ The callback will be obtained by calling this function on setup and it will be
+ invoked when the process exits.
+
+ *
+ * \warning Cannot be used with \ref boost::process::v1::spawn
+ */
+struct async_handler : handler, require_io_context
+{
+
+};
+
+///The posix executor type.
+/** This type represents the posix executor and can be used for overloading in a custom handler.
+ * \note It is an alias for the implementation on posix, and a forward-declaration on windows.
+ *
+ * \tparam Sequence The used initializer-sequence, it is fulfills the boost.fusion [sequence](http://www.boost.org/doc/libs/master/libs/fusion/doc/html/fusion/sequence.html) concept.
+
+
+\xmlonly
+As information for extension development, here is the structure of the process launching (in pseudo-code and uml)
+<xi:include href="posix_pseudocode.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<mediaobject>
+<caption>
+<para>The sequence if when no error occurs.</para>
+</caption>
+<imageobject>
+<imagedata fileref="boost_process/posix_success.svg"/>
+</imageobject>
+</mediaobject>
+
+<mediaobject>
+<caption>
+<para>The sequence if the execution fails.</para>
+</caption>
+<imageobject>
+<imagedata fileref="boost_process/posix_exec_err.svg"/>
+</imageobject>
+</mediaobject>
+
+<mediaobject>
+<caption>
+<para>The sequence if the fork fails.</para>
+</caption>
+<imageobject>
+<imagedata fileref="boost_process/posix_fork_err.svg"/>
+</imageobject>
+</mediaobject>
+
+\endxmlonly
+
+
+\note Error handling if execve fails is done through a pipe, unless \ref ignore_error is used.
+
+ */
+template<typename Sequence>
+struct posix_executor
+{
+    ///A reference to the actual initializer-sequence
+     Sequence & seq;
+    ///A pointer to the name of the executable.
+     const char * exe      = nullptr;
+     ///A pointer to the argument-vector.
+     char *const* cmd_line = nullptr;
+     ///A pointer to the environment variables, as default it is set to [environ](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html)
+     char **env      = ::environ;
+     ///The pid of the process - it will be -1 before invoking [fork](http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html), and after forking either 0 for the new process or a positive value if in the current process. */
+     pid_t pid = -1;
+     ///This shared-pointer holds the exit code. It's done this way, so it can be shared between an `asio::io_context` and \ref child.
+     std::shared_ptr<std::atomic<int>> exit_status = std::make_shared<std::atomic<int>>(still_active);
+
+     ///This function returns a const reference to the error state of the executor.
+     const std::error_code & error() const;
+
+     ///This function can be used to report an error to the executor. This will be handled according to the configuration of the executor, i.e. it
+     /// might throw an exception. \note This is the required way to handle errors in initializers.
+     void set_error(const std::error_code &ec, const std::string &msg);
+     ///\overload void set_error(const std::error_code &ec, const std::string &msg);
+     void set_error(const std::error_code &ec, const char* msg);
+};
+
+///The windows executor type.
+/** This type represents the posix executor and can be used for overloading in a custom handler.
+ *
+ * \note It is an alias for the implementation on posix, and a forward-declaration on windows.
+ * \tparam Sequence The used initializer-sequence, it is fulfills the boost.fusion [sequence](http://www.boost.org/doc/libs/master/libs/fusion/doc/html/fusion/sequence.html) concept.
+ * \tparam Char The used char-type, either `char` or `wchar_t`.
+ *
+
+\xmlonly
+As information for extension development, here is the structure of the process launching (in pseudo-code and uml)<xi:include href="windows_pseudocode.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<mediaobject>
+<caption>
+<para>The sequence for windows process creation.</para>
+</caption>
+<imageobject>
+<imagedata fileref="boost_process/windows_exec.svg"/>
+</imageobject>
+</mediaobject>
+\endxmlonly
+
+ */
+
+template<typename Char, typename Sequence>
+struct windows_executor
+{
+    ///A reference to the actual initializer-sequence
+     Sequence & seq;
+
+     ///A pointer to the name of the executable. It's null by default.
+     const Char * exe      = nullptr;
+     ///A pointer to the argument-vector. Must be set by some initializer.
+     char  Char* cmd_line = nullptr;
+     ///A pointer to the environment variables. It's null by default.
+     char  Char* env      = nullptr;
+     ///A pointer to the working directory. It's null by default.
+     const Char * work_dir = nullptr;
+
+     ///A pointer to the process-attributes of type [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/en-us/library/windows/desktop/aa379560.aspx). It's null by default.
+     ::boost::detail::winapi::LPSECURITY_ATTRIBUTES_ proc_attrs   = nullptr;
+     ///A pointer to the thread-attributes of type [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/en-us/library/windows/desktop/aa379560.aspx). It' null by default.
+     ::boost::detail::winapi::LPSECURITY_ATTRIBUTES_ thread_attrs = nullptr;
+     ///A logical bool value setting whether handles shall be inherited or not.
+     ::boost::detail::winapi::BOOL_ inherit_handles = false;
+
+     ///The element holding the process-information after process creation. The type is [PROCESS_INFORMATION](https://msdn.microsoft.com/en-us/library/windows/desktop/ms684873.aspx)
+     ::boost::detail::winapi::PROCESS_INFORMATION_ proc_info{nullptr, nullptr, 0,0};
+
+
+     ///This shared-pointer holds the exit code. It's done this way, so it can be shared between an `asio::io_context` and \ref child.
+     std::shared_ptr<std::atomic<int>> exit_status = std::make_shared<std::atomic<int>>(still_active);
+
+     ///This function returns a const reference to the error state of the executor.
+     const std::error_code & error() const;
+
+     ///This function can be used to report an error to the executor. This will be handled according to the configuration of the executor, i.e. it
+     /// might throw an exception. \note This is the required way to handle errors in initializers.
+     void set_error(const std::error_code &ec, const std::string &msg);
+     ///\overload void set_error(const std::error_code &ec, const std::string &msg);
+     void set_error(const std::error_code &ec, const char* msg);
+
+     ///The creation flags of the process
+    ::boost::detail::winapi::DWORD_ creation_flags;
+    ///The type of the [startup-info](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686331.aspx), depending on the char-type.
+    typedef typename detail::startup_info<Char>::type    startup_info_t;
+    ///The type of the [extended startup-info](https://msdn.microsoft.com/de-de/library/windows/desktop/ms686329.aspx), depending the char-type; only defined with winapi-version equal or higher than 6.
+    typedef typename detail::startup_info_ex<Char>::type startup_info_ex_t;
+    ///This function switches the information, so that the extended structure is used. \note It's only defined with winapi-version equal or higher than 6.
+    void set_startup_info_ex();
+    ///This element is an instance or a reference (if \ref startup_info_ex exists) to the [startup-info](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686331.aspx) for the process.
+    startup_info_t startup_info;
+    ///This element is the instance of the  [extended startup-info](https://msdn.microsoft.com/de-de/library/windows/desktop/ms686329.aspx). It is only available with a winapi-version equal or highter than 6.
+    startup_info_ex_t  startup_info_ex;
+};
+
+
+
+#endif
+
+}
+}
+}
+}
+#endif
diff --git a/inst/include/boost/process/v1/filesystem.hpp b/inst/include/boost/process/v1/filesystem.hpp
new file mode 100644
index 000000000..092561882
--- /dev/null
+++ b/inst/include/boost/process/v1/filesystem.hpp
@@ -0,0 +1,34 @@
+// Copyright (c) 2021 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#ifndef BOOST_PROCESS_FILESYSTEM_HPP
+#define BOOST_PROCESS_FILESYSTEM_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+
+#ifdef BOOST_PROCESS_USE_STD_FS
+#include <filesystem>
+#else
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#endif
+
+namespace boost
+{
+namespace process
+{
+BOOST_PROCESS_V1_INLINE namespace v1
+{
+
+#ifdef BOOST_PROCESS_USE_STD_FS
+namespace filesystem = std::filesystem;
+#else
+namespace filesystem = boost::filesystem;
+#endif
+
+}
+}
+}
+
+#endif //BOOST_PROCESS_FILESYSTEM_HPP
diff --git a/inst/include/boost/process/v1/group.hpp b/inst/include/boost/process/v1/group.hpp
new file mode 100644
index 000000000..92a3a53b5
--- /dev/null
+++ b/inst/include/boost/process/v1/group.hpp
@@ -0,0 +1,233 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/**
+ * \file boost/process/group.hpp
+ *
+ * Defines a group process class.
+ * For additional information see the platform specific implementations:
+ *
+ *   - [windows - job object](https://msdn.microsoft.com/en-us/library/windows/desktop/ms684161.aspx)
+ *   - [posix - process group](http://pubs.opengroup.org/onlinepubs/009695399/functions/setpgid.html)
+ *
+ */
+
+#ifndef BOOST_PROCESS_GROUP_HPP
+#define BOOST_PROCESS_GROUP_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/child.hpp>
+#include <chrono>
+#include <memory>
+
+#include <boost/none.hpp>
+#include <atomic>
+
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/group_handle.hpp>
+#include <boost/process/v1/detail/posix/group_ref.hpp>
+#include <boost/process/v1/detail/posix/wait_group.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/group_handle.hpp>
+#include <boost/process/v1/detail/windows/group_ref.hpp>
+#include <boost/process/v1/detail/windows/wait_group.hpp>
+#endif
+
+namespace boost {
+
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+namespace detail {
+    struct group_builder;
+}
+
+/**
+ * Represents a process group.
+ *
+ * Groups are movable but non-copyable. The destructor
+ * automatically closes handles to the group process.
+ *
+ * The group will have the same interface as std::thread.
+ *
+ * \note If the destructor is called without a previous detach or wait, the group will be terminated.
+ *
+ * \attention If a default-constructed group is used before being used in a process launch, the behaviour is undefined.
+ *
+ * \attention Waiting for groups is currently broken on windows and will most likely result in a dead-lock.
+ */
+class group
+{
+    ::boost::process::v1::detail::api::group_handle _group_handle;
+    bool _attached = true;
+public:
+    typedef ::boost::process::v1::detail::api::group_handle group_handle;
+    ///Native representation of the handle.
+    typedef group_handle::handle_t native_handle_t;
+    explicit group(group_handle &&ch) : _group_handle(std::move(ch)) {}
+    ///Construct the group from a native_handle
+    explicit group(native_handle_t & handle) : _group_handle(handle) {};
+    group(const group&) = delete;
+    ///Move constructor
+    group(group && lhs)
+        : _group_handle(std::move(lhs._group_handle)),
+          _attached (lhs._attached)
+    {
+        lhs._attached = false;
+    }
+    ///Default constructor
+    group() = default;
+    group& operator=(const group&) = delete;
+    ///Move assign
+    group& operator=(group && lhs)
+    {
+        _group_handle= std::move(lhs._group_handle);
+        _attached    = lhs._attached;
+
+        return *this;
+    };
+
+    ///Detach the group
+    void detach() {_attached = false; }
+
+    /** Join the child. This just calls wait, but that way the naming is similar to std::thread */
+    void join() {wait();}
+    /** Check if the child is joinable. */
+    bool joinable() {return _attached;}
+
+    /** Destructor
+     *
+     * \note If the destructor is called without a previous detach or wait, the group will be terminated.
+     *
+     */
+    ~group()
+    {
+        std::error_code ec;
+        if ( _attached && valid())
+            terminate(ec);
+    }
+
+    ///Obtain the native handle of the group.
+    native_handle_t native_handle() const { return _group_handle.handle(); }
+
+    ///Wait for the process group to exit.
+    void wait()
+    {
+        boost::process::v1::detail::api::wait(_group_handle);
+    }
+    ///\overload void wait()
+    void wait(std::error_code & ec) noexcept
+    {
+        boost::process::v1::detail::api::wait(_group_handle, ec);
+    }
+#if !defined(BOOST_PROCESS_NO_DEPRECATED)
+    /** Wait for the process group to exit for period of time.
+      *  \return True if all child processes exited while waiting.*/
+    template< class Rep, class Period >
+    BOOST_DEPRECATED("wait_for is unreliable")
+    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time)
+    {
+        return boost::process::v1::detail::api::wait_for(_group_handle, rel_time);
+    }
+
+    /** \overload bool wait_for(const std::chrono::duration<Rep, Period>& timeout_time ) */
+    template< class Rep, class Period >
+    BOOST_DEPRECATED("wait_for is unreliable")
+    bool wait_for  (const std::chrono::duration<Rep, Period>& rel_time, std::error_code & ec) noexcept
+    {
+        return boost::process::v1::detail::api::wait_for(_group_handle, rel_time, ec);
+    }
+
+    /** Wait for the process group to exit until a point in time.
+      *  \return True if all child processes exited while waiting.*/
+    template< class Clock, class Duration >
+    BOOST_DEPRECATED("wait_until is unreliable")
+    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time )
+    {
+        return boost::process::v1::detail::api::wait_until(_group_handle, timeout_time);
+    }
+    /** \overload bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time ) */
+    template< class Clock, class Duration >
+    BOOST_DEPRECATED("wait_until is unreliable")
+    bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time, std::error_code & ec) noexcept
+    {
+        return boost::process::v1::detail::api::wait_until(_group_handle, timeout_time, ec);
+    }
+#endif
+    ///Check if the group has a valid handle.
+    bool valid() const
+    {
+        return _group_handle.valid();
+    }
+    ///Convenience to call valid.
+    explicit operator bool() const {return valid();}
+
+    ///Terminate the process group, i.e. all processes in the group
+    void terminate()
+    {
+        ::boost::process::v1::detail::api::terminate(_group_handle);
+    }
+    ///\overload void terminate()
+    void terminate(std::error_code & ec) noexcept
+    {
+        ::boost::process::v1::detail::api::terminate(_group_handle, ec);
+    }
+
+    ///Assign a child process to the group
+    void add(const child &c)
+    {
+        _group_handle.add(c.native_handle());
+    }
+    ///\overload void assign(const child & c)
+    void add(const child &c, std::error_code & ec) noexcept
+    {
+        _group_handle.add(c.native_handle(), ec);
+    }
+
+    ///Check if the child process is in the group
+    bool has(const child &c)
+    {
+        return _group_handle.has(c.native_handle());
+    }
+    ///\overload bool has(const child &)
+    bool has(const child &c, std::error_code & ec) noexcept
+    {
+        return _group_handle.has(c.native_handle(), ec);
+
+    }
+
+    friend struct detail::group_builder;
+};
+
+namespace detail
+{
+
+struct group_tag;
+struct group_builder
+{
+    group * group_p;
+
+    void operator()(group & grp) {this->group_p = &grp;};
+
+    typedef api::group_ref result_type;
+    api::group_ref get_initializer() {return api::group_ref (group_p->_group_handle);};
+};
+
+template<>
+struct initializer_tag<group>
+{
+    typedef group_tag type;
+};
+
+template<>
+struct initializer_builder<group_tag>
+{
+    typedef group_builder type;
+};
+
+}
+}}}
+#endif
+
diff --git a/inst/include/boost/process/v1/handles.hpp b/inst/include/boost/process/v1/handles.hpp
new file mode 100644
index 000000000..50636444c
--- /dev/null
+++ b/inst/include/boost/process/v1/handles.hpp
@@ -0,0 +1,113 @@
+// Copyright (c) 2019 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_HANDLES_HPP_
+#define BOOST_PROCESS_HANDLES_HPP_
+
+/**
+ * \file boost/process/handles.hpp
+ *
+ * Defines functions to obtain handles of the current process and limit the amount for inherited ones.
+ */
+
+#include <boost/process/v1/detail/config.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/handles.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/handles.hpp>
+#endif
+
+#include <boost/process/v1/detail/used_handles.hpp>
+
+
+namespace boost
+{
+namespace this_process
+{
+
+///The native type for handles
+using native_handle_type = ::boost::process::v1::detail::api::native_handle_type;
+
+/**
+ * Get a snapshot of all handles of the process (i.e. file descriptors on posix and handles on windows) of the current process.
+ *
+ * \note This function might not work on certain posix systems.
+ *
+ * \note On Windows version older than windows 8 this function will iterate all the system handles, meaning it might be quite slow.
+ *
+ * \warning This functionality is utterly prone to race conditions, since other threads might open or close handles.
+ *
+ * \return The list of all open handles of the current process
+ */
+inline std::vector <native_handle_type> get_handles()
+{
+  return ::boost::process::v1::detail::api::get_handles();
+}
+
+
+/** \overload std::vector<native_handle_type> get_handles() */
+inline std::vector <native_handle_type> get_handles(std::error_code &ec)
+{
+  return ::boost::process::v1::detail::api::get_handles(ec);
+}
+
+/** Determines if a given handle is a a stream-handle, i.e. any handle that can be used with read and write functions.
+ * Stream handles include pipes, regular files and sockets.
+ *
+ * \return Indicates if it's a stream handle.
+ */
+inline bool is_stream_handle(native_handle_type handle)
+{
+  return ::boost::process::v1::detail::api::is_stream_handle(handle);
+}
+
+
+/** \overload bool is_stream_handle(native_handle_type handle) */
+inline bool is_stream_handle(native_handle_type handle, std::error_code &ec)
+{
+  return ::boost::process::v1::detail::api::is_stream_handle(handle, ec);
+}
+
+}
+namespace process
+{
+BOOST_PROCESS_V1_INLINE
+namespace v1
+{
+
+namespace detail
+{
+
+using limit_handles_ = ::boost::process::v1::detail::api::limit_handles_;
+
+
+}
+
+/**
+ * The limit_handles property sets all properties to be inherited only explicitly. It closes all unused file-descriptors on posix after the fork and
+ * removes the inherit flags on windows.
+ *
+ * \note This is executed after the fork on posix.
+ *
+ * \code{.cpp}
+ * system("gcc", limit_handles);
+ * \endcode
+ *
+ * Since limit also closes the standard handles unless they are explicitly redirected they can be ignored by `limit_handles` in the following way.
+ *
+ * \code{.cpp}
+ * system("gcc", limit_handles.allowStd())
+ * \endcode
+ *
+*/
+const static ::boost::process::v1::detail::api::limit_handles_ limit_handles;
+
+
+}
+}
+}
+
+#endif //BOOST_PROCESS_HANDLES_HPP_
diff --git a/inst/include/boost/process/v1/io.hpp b/inst/include/boost/process/v1/io.hpp
new file mode 100644
index 000000000..5c60435b9
--- /dev/null
+++ b/inst/include/boost/process/v1/io.hpp
@@ -0,0 +1,552 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_IO_HPP_
+#define BOOST_PROCESS_IO_HPP_
+
+#include <iosfwd>
+#include <cstdio>
+#include <functional>
+#include <utility>
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/pipe.hpp>
+
+#include <future>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/asio_fwd.hpp>
+#include <boost/process/v1/detail/posix/close_in.hpp>
+#include <boost/process/v1/detail/posix/close_out.hpp>
+#include <boost/process/v1/detail/posix/null_in.hpp>
+#include <boost/process/v1/detail/posix/null_out.hpp>
+#include <boost/process/v1/detail/posix/file_in.hpp>
+#include <boost/process/v1/detail/posix/file_out.hpp>
+#include <boost/process/v1/detail/posix/pipe_in.hpp>
+#include <boost/process/v1/detail/posix/pipe_out.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/asio_fwd.hpp>
+#include <boost/process/v1/detail/windows/close_in.hpp>
+#include <boost/process/v1/detail/windows/close_out.hpp>
+#include <boost/process/v1/detail/windows/null_in.hpp>
+#include <boost/process/v1/detail/windows/null_out.hpp>
+#include <boost/process/v1/detail/windows/file_in.hpp>
+#include <boost/process/v1/detail/windows/file_out.hpp>
+#include <boost/process/v1/detail/windows/pipe_in.hpp>
+#include <boost/process/v1/detail/windows/pipe_out.hpp>
+#endif
+
+/** \file boost/process/io.hpp
+ *
+ *    Header which provides the io properties. It provides the following properties:
+ *
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::close">close</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::null">null</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::std_in">std_in</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::std_out">std_out</globalname>;
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::std_err">std_err</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+
+\par File I/O
+
+The library allows full redirection of streams to files as shown below.
+
+\code{.cpp}
+boost::process::v1::filesystem::path log    = "my_log_file.txt";
+boost::process::v1::filesystem::path input  = "input.txt";
+boost::process::v1::filesystem::path output = "output.txt";
+system("my_prog", std_out>output, std_in<input, std_err>log);
+\endcode
+
+\par Synchronous Pipe I/O
+
+Another way is to communicate through pipes.
+
+\code{.cpp}
+pstream str;
+child c("my_prog", std_out > str);
+
+int i;
+str >> i;
+\endcode
+
+Note that the pipe may also be used between several processes, like this:
+
+\code{.cpp}
+pipe p;
+child c1("nm", "a.out", std_out>p);
+child c2("c++filt", std_in<p);
+\endcode
+
+\par Asynchronous I/O
+
+Utilizing `boost.asio` asynchronous I/O is provided.
+
+\code
+boost::asio::io_context ios;
+std::future<std::string> output;
+system("ls", std_out > output, ios);
+
+auto res = fut.get();
+\endcode
+
+\note `boost/process/async.hpp` must also be included for this to work.
+
+\par Closing
+
+Stream can be closed, so nothing can be read or written.
+
+\code{.cpp}
+system("foo", std_in.close());
+\endcode
+
+\par Null
+
+Streams can be redirected to null, which means, that written date will be
+discarded and read data will only contain `EOF`.
+
+\code{.cpp}
+system("b2", std_out > null);
+\endcode
+
+ *
+ */
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+
+template<typename T> using is_streambuf    = typename std::is_same<T, boost::asio::streambuf>::type;
+template<typename T> using is_const_buffer =
+        std::integral_constant<bool,
+            std::is_same<   boost::asio::const_buffer, T>::value |
+            std::is_base_of<boost::asio::const_buffer, T>::value
+        >;
+template<typename T> using is_mutable_buffer =
+        std::integral_constant<bool,
+            std::is_same<   boost::asio::mutable_buffer, T>::value |
+            std::is_base_of<boost::asio::mutable_buffer, T>::value
+        >;
+
+
+struct null_t  {constexpr null_t() = default;};
+struct close_t;
+
+template<class>
+struct std_in_
+{
+    constexpr std_in_() = default;
+
+    api::close_in close() const {return api::close_in(); }
+    api::close_in operator=(const close_t &) const {return api::close_in();}
+    api::close_in operator<(const close_t &) const {return api::close_in();}
+
+    api::null_in null() const {return api::null_in();}
+    api::null_in operator=(const null_t &) const {return api::null_in();}
+    api::null_in operator<(const null_t &) const {return api::null_in();}
+
+    api::file_in operator=(const boost::process::v1::filesystem::path &p) const {return p;}
+    api::file_in operator=(const std::string & p)            const {return p;}
+    api::file_in operator=(const std::wstring &p)            const {return p;}
+    api::file_in operator=(const char * p)                   const {return p;}
+    api::file_in operator=(const wchar_t * p)                const {return p;}
+
+    api::file_in operator<(const boost::process::v1::filesystem::path &p) const {return p;}
+    api::file_in operator<(const std::string &p)             const {return p;}
+    api::file_in operator<(const std::wstring &p)            const {return p;}
+    api::file_in operator<(const char*p)                     const {return p;}
+    api::file_in operator<(const wchar_t * p)                const {return p;}
+
+    api::file_in operator=(FILE * f)                         const {return f;}
+    api::file_in operator<(FILE * f)                         const {return f;}
+
+    template<typename Char, typename Traits> api::pipe_in operator=(basic_pipe<Char, Traits> & p)      const {return p;}
+    template<typename Char, typename Traits> api::pipe_in operator<(basic_pipe<Char, Traits> & p)      const {return p;}
+    template<typename Char, typename Traits> api::pipe_in operator=(basic_opstream<Char, Traits> & p)  const {return p.pipe();}
+    template<typename Char, typename Traits> api::pipe_in operator<(basic_opstream<Char, Traits> & p)  const {return p.pipe();}
+    template<typename Char, typename Traits> api::pipe_in operator=(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
+    template<typename Char, typename Traits> api::pipe_in operator<(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
+
+    api::async_pipe_in operator=(async_pipe & p) const {return p;}
+    api::async_pipe_in operator<(async_pipe & p) const {return p;}
+
+    template<typename T, typename = typename std::enable_if<
+            is_const_buffer<T>::value || is_mutable_buffer<T>::value
+            >::type>
+    api::async_in_buffer<const T> operator=(const T & buf) const {return buf;}
+    template<typename T, typename = typename std::enable_if<is_streambuf<T>::value>::type >
+    api::async_in_buffer<T>       operator=(T       & buf) const {return buf;}
+
+    template<typename T, typename = typename std::enable_if<
+            is_const_buffer<T>::value || is_mutable_buffer<T>::value
+            >::type>
+    api::async_in_buffer<const T> operator<(const T & buf) const {return buf;}
+    template<typename T, typename = typename std::enable_if<is_streambuf<T>::value>::type >
+    api::async_in_buffer<T>       operator<(T       & buf) const {return buf;}
+
+};
+
+//-1 == empty.
+//1 == stdout
+//2 == stderr
+template<int p1, int p2 = -1>
+struct std_out_
+{
+    constexpr std_out_() = default;
+
+    api::close_out<p1,p2> close() const {return api::close_out<p1,p2>(); }
+    api::close_out<p1,p2> operator=(const close_t &) const {return api::close_out<p1,p2>();}
+    api::close_out<p1,p2> operator>(const close_t &) const {return api::close_out<p1,p2>();}
+
+    api::null_out<p1,p2> null() const {return api::null_out<p1,p2>();}
+    api::null_out<p1,p2> operator=(const null_t &) const {return api::null_out<p1,p2>();}
+    api::null_out<p1,p2> operator>(const null_t &) const {return api::null_out<p1,p2>();}
+
+    api::file_out<p1,p2> operator=(const boost::process::v1::filesystem::path &p) const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator=(const std::string &p)             const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator=(const std::wstring &p)            const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator=(const char * p)                   const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator=(const wchar_t * p)                const {return api::file_out<p1,p2>(p);}
+
+    api::file_out<p1,p2> operator>(const boost::process::v1::filesystem::path &p) const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator>(const std::string &p)             const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator>(const std::wstring &p)            const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator>(const char * p)                   const {return api::file_out<p1,p2>(p);}
+    api::file_out<p1,p2> operator>(const wchar_t * p)                const {return api::file_out<p1,p2>(p);}
+
+    api::file_out<p1,p2> operator=(FILE * f)  const {return f;}
+    api::file_out<p1,p2> operator>(FILE * f)  const {return f;}
+
+    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator=(basic_pipe<Char, Traits> & p)      const {return p;}
+    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator>(basic_pipe<Char, Traits> & p)      const {return p;}
+    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator=(basic_ipstream<Char, Traits> & p)  const {return p.pipe();}
+    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator>(basic_ipstream<Char, Traits> & p)  const {return p.pipe();}
+    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator=(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
+    template<typename Char, typename Traits> api::pipe_out<p1,p2> operator>(basic_pstream <Char, Traits> & p)  const {return p.pipe();}
+
+    api::async_pipe_out<p1, p2> operator=(async_pipe & p) const {return p;}
+    api::async_pipe_out<p1, p2> operator>(async_pipe & p) const {return p;}
+
+    api::async_out_buffer<p1, p2, const asio::mutable_buffer>     operator=(const asio::mutable_buffer & buf)     const {return buf;}
+    api::async_out_buffer<p1, p2, const asio::mutable_buffers_1> operator=(const asio::mutable_buffers_1 & buf) const {return buf;}
+    api::async_out_buffer<p1, p2, asio::streambuf>               operator=(asio::streambuf & os)                   const {return os ;}
+
+    api::async_out_buffer<p1, p2, const asio::mutable_buffer>     operator>(const asio::mutable_buffer & buf)     const {return buf;}
+    api::async_out_buffer<p1, p2, const asio::mutable_buffers_1> operator>(const asio::mutable_buffers_1 & buf) const {return buf;}
+    api::async_out_buffer<p1, p2, asio::streambuf>               operator>(asio::streambuf & os)                   const {return os ;}
+
+    api::async_out_future<p1,p2, std::string>       operator=(std::future<std::string> & fut)       const { return fut;}
+    api::async_out_future<p1,p2, std::string>       operator>(std::future<std::string> & fut)       const { return fut;}
+    api::async_out_future<p1,p2, std::vector<char>> operator=(std::future<std::vector<char>> & fut) const { return fut;}
+    api::async_out_future<p1,p2, std::vector<char>> operator>(std::future<std::vector<char>> & fut) const { return fut;}
+
+    template<int pin, typename = typename std::enable_if<
+            (((p1 == 1) && (pin == 2)) ||
+             ((p1 == 2) && (pin == 1)))
+             && (p2 == -1)>::type>
+    constexpr std_out_<1, 2> operator& (const std_out_<pin>&) const
+    {
+        return std_out_<1, 2> ();
+    }
+
+};
+
+struct close_t
+{
+    constexpr close_t() = default;
+    template<int T, int U>
+    api::close_out<T,U> operator()(std_out_<T,U>) {return api::close_out<T,U>();}
+};
+
+
+
+}
+///This constant is a utility to allow syntax like `std_out > close` for closing I/O streams.
+constexpr boost::process::v1::detail::close_t close;
+///This constant is a utility to redirect streams to the null-device.
+constexpr boost::process::v1::detail::null_t  null;
+
+/**
+This property allows to set the input stream for the child process.
+
+\section stdin_details Details
+
+\subsection stdin_file File Input
+
+The file I/O simple redirects the stream to a file, for which the possible types are
+
+ - `boost::process::v1::filesystem::path`
+ - `std::basic_string<char_type>`
+ - `const char_type*`
+ - `FILE*`
+
+with `char_type` being either `char` or `wchar_t`.
+
+FILE* is explicitly added, so the process can easily redirect the output stream
+of the child to another output stream of the process. That is:
+
+\code{.cpp}
+system("ls", std_in < stdin);
+\endcode
+
+\warning If the launching and the child process use the input, this leads to undefined behaviour.
+
+A syntax like `system("ls", std_out > std::cerr)` is not possible, due to the C++
+implementation not providing access to the handle.
+
+The valid expressions for this property are
+
+\code{.cpp}
+std_in < file;
+std_in = file;
+\endcode
+
+\subsection stdin_pipe Pipe Input
+
+As explained in the corresponding section, the boost.process library provides a
+@ref boost::process::v1::async_pipe "async_pipe" class which can be
+used to communicate with child processes.
+
+\note Technically the @ref boost::process::v1::async_pipe "async_pipe"
+works synchronous here, since no asio implementation is used by the library here.
+The async-operation will then however not end if the process is finished, since
+the pipe remains open. You can use the async_close function with on_exit to fix that.
+
+Valid expressions with pipes are these:
+
+\code{.cpp}
+std_in < pipe;
+std_in = pipe;
+\endcode
+
+Where the valid types for `pipe` are the following:
+
+ - `basic_pipe`
+ - `async_pipe`
+ - `basic_opstream`
+ - `basic_pstream`
+
+Note that the pipe may also be used between several processes, like this:
+
+\code{.cpp}
+pipe p;
+child c1("nm", "a.out", std_out>p);
+child c2("c++filt", std_in<p);
+\endcode
+
+\subsection stdin_async_pipe Asynchronous Pipe Input
+
+Asynchronous Pipe I/O classifies communication which has automatically handling
+of the asynchronous operations by the process library. This means, that a pipe will be
+constructed, the async_read/-write will be automatically started, and that the
+end of the child process will also close the pipe.
+
+Valid types for pipe I/O are the following:
+
+ - `boost::asio::const_buffer`   \xmlonly <footnote><para> Constructed with <code>boost::asio::buffer</code></para></footnote> \endxmlonly
+ - `boost::asio::mutable_buffer` \xmlonly <footnote><para> Constructed with <code>boost::asio::buffer</code></para></footnote> \endxmlonly
+ - `boost::asio::streambuf`
+
+Valid expressions with pipes are these:
+
+\code{.cpp}
+std_in < buffer;
+std_in = buffer;
+std_out > buffer;
+std_out = buffer;
+std_err > buffer;
+std_err = buffer;
+(std_out & std_err) > buffer;
+(std_out & std_err) = buffer;
+\endcode
+
+\note  It is also possible to get a future for std_in, by chaining another `std::future<void>` onto it,
+so you can wait for the input to be completed. It looks like this:
+\code{.cpp}
+std::future<void> fut;
+boost::asio::io_context ios;
+std::string data;
+child c("prog", std_in < buffer(data) >  fut, ios);
+fut.get();
+\endcode
+
+
+\note `boost::asio::buffer` is also available in the `boost::process` namespace.
+
+\warning This feature requires `boost/process/async.hpp` to be included and a reference to `boost::asio::io_context` to be passed to the launching function.
+
+
+\subsection stdin_close Close
+
+The input stream can be closed, so it cannot be read from. This will lead to an error when attempted.
+
+This can be achieved by the following syntax.
+
+\code{.cpp}
+std_in < close;
+std_in = close;
+std_in.close();
+\endcode
+
+\subsection stdin_null Null
+
+The input stream can be redirected to read from the null-device, which means that only `EOF` is read.
+
+The syntax to achieve that has the following variants:
+
+\code{.cpp}
+std_in < null;
+std_in = null;
+std_in.null();
+\endcode
+
+*/
+
+constexpr boost::process::v1::detail::std_in_<void>   std_in;
+
+/**
+This property allows to set the output stream for the child process.
+
+\note The Semantic is the same as for \xmlonly <globalname alt="boost::process::v1::std_err">std_err</globalname> \endxmlonly
+
+\note `std_err` and `std_out` can be combined into one stream, with the `operator &`, i.e. `std_out & std_err`.
+
+\section stdout_details Details
+
+\subsection stdout_file File Input
+
+The file I/O simple redirects the stream to a file, for which the possible types are
+
+ - `boost::process::v1::filesystem::path`
+ - `std::basic_string<char_type>`
+ - `const char_type*`
+ - `FILE*`
+
+with `char_type` being either `char` or `wchar_t`.
+
+FILE* is explicitly added, so the process can easily redirect the output stream
+of the child to another output stream of the process. That is:
+
+\code{.cpp}
+system("ls", std_out < stdin);
+\endcode
+
+\warning If the launching and the child process use the input, this leads to undefined behaviour.
+
+A syntax like `system("ls", std_out > std::cerr)` is not possible, due to the C++
+implementation not providing access to the handle.
+
+The valid expressions for this property are
+
+\code{.cpp}
+std_out < file;
+std_out = file;
+\endcode
+
+\subsection stdout_pipe Pipe Output
+
+As explained in the corresponding section, the boost.process library provides a
+@ref boost::process::v1::async_pipe "async_pipe" class which can be
+used to communicate with child processes.
+
+\note Technically the @ref boost::process::v1::async_pipe "async_pipe"
+works like a synchronous pipe here, since no asio implementation is used by the library here.
+The asynchronous operation will then however not end if the process is finished, since
+the pipe remains open. You can use the async_close function with on_exit to fix that.
+
+Valid expressions with pipes are these:
+
+\code{.cpp}
+std_out > pipe;
+std_out = pipe;
+\endcode
+
+Where the valid types for `pipe` are the following:
+
+ - `basic_pipe`
+ - `async_pipe`
+ - `basic_ipstream`
+ - `basic_pstream`
+
+Note that the pipe may also be used between several processes, like this:
+
+\code{.cpp}
+pipe p;
+child c1("nm", "a.out", std_out>p);
+child c2("c++filt", std_in<p);
+\endcode
+
+\subsection stdout_async_pipe Asynchronous Pipe Output
+
+Asynchronous Pipe I/O classifies communication which has automatically handling
+of the async operations by the process library. This means, that a pipe will be
+constructed, the async_read/-write will be automatically started, and that the
+end of the child process will also close the pipe.
+
+Valid types for pipe I/O are the following:
+
+ - `boost::asio::mutable_buffer` \xmlonly <footnote><para> Constructed with <code>boost::asio::buffer</code></para></footnote> \endxmlonly
+ - `boost::asio::streambuf`
+ - `std::future<std::vector<char>>`
+ - `std::future<std::string>`
+
+Valid expressions with pipes are these:
+
+\code{.cpp}
+std_out > buffer;
+std_out = buffer;
+std_err > buffer;
+std_err = buffer;
+(std_out & std_err) > buffer;
+(std_out & std_err) = buffer;
+\endcode
+
+\note `boost::asio::buffer` is also available in the `boost::process` namespace.
+
+\warning This feature requires `boost/process/async.hpp` to be included and a reference to `boost::asio::io_context` to be passed to the launching function.
+
+
+\subsection stdout_close Close
+
+The out stream can be closed, so it cannot be write from.
+This will lead to an error when attempted.
+
+This can be achieved by the following syntax.
+
+\code{.cpp}
+std_out > close;
+std_out = close;
+std_out.close();
+\endcode
+
+\subsection stdout_null Null
+
+The output stream can be redirected to write to the null-device,
+which means that all output is discarded.
+
+The syntax to achieve that has the following variants:
+
+\code{.cpp}
+std_out > null;
+std_out = null;
+std_out.null();
+\endcode
+
+*/
+
+constexpr boost::process::v1::detail::std_out_<1> std_out;
+/**This property allows setting the `stderr` stream. The semantic and syntax is the same as for
+ * \xmlonly <globalname alt="boost::process::v1::std_out">std_out</globalname> \endxmlonly .
+ */
+constexpr boost::process::v1::detail::std_out_<2> std_err;
+
+}}}
+
+#endif /* INCLUDE_BOOST_PROCESS_IO_HPP_ */
diff --git a/inst/include/boost/process/v1/locale.hpp b/inst/include/boost/process/v1/locale.hpp
new file mode 100644
index 000000000..d7d07575d
--- /dev/null
+++ b/inst/include/boost/process/v1/locale.hpp
@@ -0,0 +1,243 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2008 Beman Dawes
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_LOCALE_HPP_
+#define BOOST_PROCESS_LOCALE_HPP_
+
+#include <system_error>
+#include <boost/process/v1/detail/config.hpp>
+
+#if defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/locale.hpp>
+# elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
+|| defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__)
+#include <codecvt>
+#endif
+
+#include <locale>
+
+namespace boost
+{
+namespace process
+{
+BOOST_PROCESS_V1_INLINE namespace v1
+{
+namespace detail
+{
+
+class codecvt_category_t : public std::error_category
+{
+public:
+    codecvt_category_t() = default;
+    const char* name() const noexcept override {return "codecvt";}
+    std::string message(int ev) const override
+    {
+        std::string str;
+        switch (ev)
+        {
+        case std::codecvt_base::ok:
+            str = "ok";
+            break;
+        case std::codecvt_base::partial:
+            str = "partial";
+            break;
+        case std::codecvt_base::error:
+            str = "error";
+            break;
+        case std::codecvt_base::noconv:
+            str = "noconv";
+            break;
+        default:
+            str = "unknown error";
+        }
+        return str;
+    }
+};
+
+}
+
+///Internally used error cateory for code conversion.
+inline const std::error_category& codecvt_category()
+{
+    static const ::boost::process::v1::detail::codecvt_category_t cat;
+    return cat;
+}
+
+namespace detail
+{
+//copied from boost.filesystem
+inline std::locale default_locale()
+{
+# if defined(BOOST_WINDOWS_API)
+    std::locale global_loc = std::locale();
+    return std::locale(global_loc, new boost::process::v1::detail::windows::windows_file_codecvt);
+# elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
+|| defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__)
+    std::locale global_loc = std::locale();
+    return std::locale(global_loc, new std::codecvt_utf8<wchar_t>);
+# else  // Other POSIX
+    // Return a default locale object.
+    return std::locale();
+# endif
+}
+
+inline std::locale& process_locale()
+{
+    static std::locale loc(default_locale());
+    return loc;
+}
+
+}
+
+///The internally used type for code conversion.
+typedef std::codecvt<wchar_t, char, std::mbstate_t> codecvt_type;
+
+///Get a reference to the currently used code converter.
+inline const codecvt_type& codecvt()
+{
+  return std::use_facet<std::codecvt<wchar_t, char, std::mbstate_t>>(
+                detail::process_locale());
+}
+
+///Set the locale of the library.
+inline std::locale imbue(const std::locale& loc)
+{
+  std::locale temp(detail::process_locale());
+  detail::process_locale() = loc;
+  return temp;
+}
+
+
+namespace detail
+{
+
+inline std::size_t convert(const char* from,
+                    const char* from_end,
+                    wchar_t* to, wchar_t* to_end,
+                    const ::boost::process::v1::codecvt_type & cvt =
+                                 ::boost::process::v1::codecvt())
+{
+    std::mbstate_t state  = std::mbstate_t();  // perhaps unneeded, but cuts bug reports
+    const char* from_next;
+    wchar_t* to_next;
+
+    auto res = cvt.in(state, from, from_end, from_next,
+                 to, to_end, to_next);
+
+    if (res != std::codecvt_base::ok)
+         throw process_error(res, ::boost::process::v1::codecvt_category(),
+             "boost::process codecvt to wchar_t");
+
+
+    return to_next - to;
+
+}
+
+inline std::size_t convert(const wchar_t* from,
+                    const wchar_t* from_end,
+                    char* to, char* to_end,
+                    const ::boost::process::v1::codecvt_type & cvt =
+                                 ::boost::process::v1::codecvt())
+{
+    std::mbstate_t state  = std::mbstate_t();  // perhaps unneeded, but cuts bug reports
+    const wchar_t* from_next;
+    char* to_next;
+
+    std::codecvt_base::result res;
+
+    if ((res=cvt.out(state, from, from_end, from_next,
+           to, to_end, to_next)) != std::codecvt_base::ok)
+               throw process_error(res, ::boost::process::v1::codecvt_category(),
+                   "boost::process codecvt to char");
+
+    return to_next - to;
+}
+
+inline std::wstring convert(const std::string & st,
+                            const ::boost::process::v1::codecvt_type & cvt =
+                                ::boost::process::v1::codecvt())
+{
+    std::wstring out(st.size() + 10, ' '); //just to be sure
+    auto sz = convert(st.c_str(), st.c_str() + st.size(),
+                      &out.front(), &out.back(), cvt);
+
+    out.resize(sz);
+    return out;
+}
+
+inline std::string convert(const std::wstring & st,
+                           const ::boost::process::v1::codecvt_type & cvt =
+                                ::boost::process::v1::codecvt())
+{
+    std::string out(st.size() * 2, ' '); //just to be sure
+    auto sz = convert(st.c_str(), st.c_str() + st.size(),
+                      &out.front(), &out.back(), cvt);
+
+    out.resize(sz);
+    return out;
+}
+
+inline std::vector<wchar_t> convert(const std::vector<char> & st,
+                                    const ::boost::process::v1::codecvt_type & cvt =
+                                        ::boost::process::v1::codecvt())
+{
+    std::vector<wchar_t> out(st.size() + 10); //just to be sure
+    auto sz = convert(st.data(), st.data() + st.size(),
+                      &out.front(), &out.back(), cvt);
+
+    out.resize(sz);
+    return out;
+}
+
+inline std::vector<char> convert(const std::vector<wchar_t> & st,
+                                 const ::boost::process::v1::codecvt_type & cvt =
+                                     ::boost::process::v1::codecvt())
+{
+    std::vector<char> out(st.size() * 2); //just to be sure
+    auto sz = convert(st.data(), st.data() + st.size(),
+                      &out.front(), &out.back(), cvt);
+
+    out.resize(sz);
+    return out;
+}
+
+
+inline std::wstring convert(const char *begin, const char* end,
+                            const ::boost::process::v1::codecvt_type & cvt =
+                                ::boost::process::v1::codecvt())
+{
+    auto size = end-begin;
+    std::wstring out(size + 10, ' '); //just to be sure
+    using namespace std;
+    auto sz = convert(begin, end,
+                      &out.front(), &out.back(), cvt);
+    out.resize(sz);
+    return out;
+}
+
+inline std::string convert(const wchar_t  * begin, const wchar_t *end,
+                           const ::boost::process::v1::codecvt_type & cvt =
+                                ::boost::process::v1::codecvt())
+{
+    auto size = end-begin;
+
+    std::string out(size * 2, ' '); //just to be sure
+    auto sz = convert(begin, end ,
+                      &out.front(), &out.back(), cvt);
+
+    out.resize(sz);
+    return out;
+}
+
+
+
+
+}
+
+
+
+}}}
+
+#endif /* BOOST_PROCESS_LOCALE_HPP_ */
diff --git a/inst/include/boost/process/v1/pipe.hpp b/inst/include/boost/process/v1/pipe.hpp
new file mode 100644
index 000000000..a852b8117
--- /dev/null
+++ b/inst/include/boost/process/v1/pipe.hpp
@@ -0,0 +1,638 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+
+#ifndef BOOST_PROCESS_PIPE_HPP
+#define BOOST_PROCESS_PIPE_HPP
+
+#include <boost/config.hpp>
+#include <boost/process/v1/detail/config.hpp>
+#include <streambuf>
+#include <istream>
+#include <ostream>
+#include <vector>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/basic_pipe.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/basic_pipe.hpp>
+#endif
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+using ::boost::process::v1::detail::api::basic_pipe;
+
+#if defined(BOOST_PROCESS_DOXYGEN)
+/** Class implementation of a pipe.
+ *
+ */
+template<class CharT, class Traits = std::char_traits<CharT>>
+class basic_pipe
+{
+public:
+    typedef CharT                      char_type  ;
+    typedef          Traits            traits_type;
+    typedef typename Traits::int_type  int_type   ;
+    typedef typename Traits::pos_type  pos_type   ;
+    typedef typename Traits::off_type  off_type   ;
+    typedef ::boost::detail::winapi::HANDLE_ native_handle;
+
+    /// Default construct the pipe. Will be opened.
+    basic_pipe();
+
+    ///Construct a named pipe.
+    inline explicit basic_pipe(const std::string & name);
+    /** Copy construct the pipe.
+     *  \note Duplicated the handles.
+     */
+    inline basic_pipe(const basic_pipe& p);
+    /** Move construct the pipe. */
+    basic_pipe(basic_pipe&& lhs);
+    /** Copy assign the pipe.
+     *  \note Duplicated the handles.
+     */
+    inline basic_pipe& operator=(const basic_pipe& p);
+    /** Move assign the pipe. */
+    basic_pipe& operator=(basic_pipe&& lhs);
+    /** Destructor closes the handles. */
+    ~basic_pipe();
+    /** Get the native handle of the source. */
+    native_handle native_source() const;
+    /** Get the native handle of the sink. */
+    native_handle native_sink  () const;
+
+    /** Assign a new value to the source */
+    void assign_source(native_handle h);
+    /** Assign a new value to the sink */
+    void assign_sink  (native_handle h);
+
+
+    ///Write data to the pipe.
+    int_type write(const char_type * data, int_type count);
+    ///Read data from the pipe.
+    int_type read(char_type * data, int_type count);
+    ///Check if the pipe is open.
+    bool is_open();
+    ///Close the pipe
+    void close();
+};
+
+#endif
+
+
+
+typedef basic_pipe<char>     pipe;
+typedef basic_pipe<wchar_t> wpipe;
+
+
+/** Implementation of the stream buffer for a pipe.
+ */
+template<
+    class CharT,
+    class Traits = std::char_traits<CharT>
+>
+struct basic_pipebuf : std::basic_streambuf<CharT, Traits>
+{
+    typedef basic_pipe<CharT, Traits> pipe_type;
+
+    typedef           CharT            char_type  ;
+    typedef           Traits           traits_type;
+    typedef  typename Traits::int_type int_type   ;
+    typedef  typename Traits::pos_type pos_type   ;
+    typedef  typename Traits::off_type off_type   ;
+
+    constexpr static int default_buffer_size = BOOST_PROCESS_PIPE_SIZE;
+
+    ///Default constructor, will also construct the pipe.
+    basic_pipebuf() : _write(default_buffer_size), _read(default_buffer_size)
+    {
+        this->setg(_read.data(),  _read.data()+ 128,  _read.data() + 128);
+        this->setp(_write.data(), _write.data() + _write.size());
+    }
+    ///Copy Constructor.
+    basic_pipebuf(const basic_pipebuf & ) = default;
+    ///Move Constructor
+    basic_pipebuf(basic_pipebuf && ) = default;
+
+    ///Destructor -> writes the frest of the data
+    ~basic_pipebuf()
+    {
+        try 
+        {
+            if (basic_pipebuf::is_open())
+                basic_pipebuf::overflow(Traits::eof());
+        }
+        catch (process_error & )
+        {
+        }
+    }
+
+    ///Move construct from a pipe.
+    basic_pipebuf(pipe_type && p) : _pipe(std::move(p)),
+                                    _write(default_buffer_size),
+                                    _read(default_buffer_size)
+    {
+        this->setg(_read.data(),  _read.data()+ 128,  _read.data() + 128);
+        this->setp(_write.data(), _write.data() + _write.size());
+    }
+    ///Construct from a pipe.
+    basic_pipebuf(const pipe_type & p) : _pipe(p),
+                                        _write(default_buffer_size),
+                                        _read(default_buffer_size)
+    {
+        this->setg(_read.data(),  _read.data()+ 128,  _read.data() + 128);
+        this->setp(_write.data(), _write.data() + _write.size());
+    }
+    ///Copy assign.
+    basic_pipebuf& operator=(const basic_pipebuf & ) = delete;
+    ///Move assign.
+    basic_pipebuf& operator=(basic_pipebuf && ) = default;
+    ///Move assign a pipe.
+    basic_pipebuf& operator=(pipe_type && p)
+    {
+        _pipe = std::move(p);
+        return *this;
+    }
+    ///Copy assign a pipe.
+    basic_pipebuf& operator=(const pipe_type & p)
+    {
+        _pipe = p;
+        return *this;
+    }
+    ///Writes characters to the associated output sequence from the put area
+    int_type overflow(int_type ch = traits_type::eof()) override
+    {
+        if (_pipe.is_open() && (ch != traits_type::eof()))
+        {
+            if (this->pptr() == this->epptr())
+            {
+                bool wr = this->_write_impl();
+                if (wr)
+                {
+                    *this->pptr() = ch;
+                    this->pbump(1);
+                    return ch;
+                }
+            }
+            else
+            {
+                *this->pptr() = ch;
+                this->pbump(1);
+                if (this->_write_impl())
+                    return ch;
+            }
+        }
+        else if (ch == traits_type::eof())
+           this->sync();
+
+        return traits_type::eof();
+    }
+    ///Synchronizes the buffers with the associated character sequence
+    int sync() override { return this->_write_impl() ? 0 : -1; }
+
+    ///Reads characters from the associated input sequence to the get area
+    int_type underflow() override
+    {
+        if (!_pipe.is_open())
+            return traits_type::eof();
+
+        if (this->egptr() == &_read.back()) //ok, so we're at the end of the buffer
+            this->setg(_read.data(),  _read.data()+ 10,  _read.data() + 10);
+
+
+        auto len = &_read.back() - this->egptr() ;
+        auto res = _pipe.read(
+                        this->egptr(),
+                        static_cast<typename pipe_type::int_type>(len));
+        if (res == 0)
+            return traits_type::eof();
+
+        this->setg(this->eback(), this->gptr(), this->egptr() + res);
+        auto val = *this->gptr();
+
+        return traits_type::to_int_type(val);
+    }
+
+
+    ///Set the pipe of the streambuf.
+    void pipe(pipe_type&& p)      {_pipe = std::move(p); }
+    ///Set the pipe of the streambuf.
+    void pipe(const pipe_type& p) {_pipe = p; }
+    ///Get a reference to the pipe.
+    pipe_type &      pipe() &       {return _pipe;}
+    ///Get a const reference to the pipe.
+    const pipe_type &pipe() const & {return _pipe;}
+    ///Get a rvalue reference to the pipe. Qualified as rvalue.
+    pipe_type &&     pipe()  &&     {return std::move(_pipe);}
+
+    ///Check if the pipe is open
+    bool is_open() const {return _pipe.is_open(); }
+
+    ///Open a new pipe
+    basic_pipebuf<CharT, Traits>* open()
+    {
+        if (is_open())
+            return nullptr;
+        _pipe = pipe();
+        return this;
+    }
+
+    ///Open a new named pipe
+    basic_pipebuf<CharT, Traits>* open(const std::string & name)
+    {
+        if (is_open())
+            return nullptr;
+        _pipe = pipe(name);
+        return this;
+    }
+
+    ///Flush the buffer & close the pipe
+    basic_pipebuf<CharT, Traits>* close()
+    {
+        if (!is_open())
+            return nullptr;
+        try {
+          overflow(Traits::eof());
+          _pipe.close();
+          return this;
+        }
+        catch(...)
+        {
+          _pipe.close();
+          throw ;
+        }
+        return this;
+    }
+private:
+    pipe_type _pipe;
+    std::vector<char_type> _write;
+    std::vector<char_type> _read;
+
+    bool _write_impl()
+    {
+        if (!_pipe.is_open())
+            return false;
+
+        auto base = this->pbase();
+
+        if (base == this->pptr())
+            return true;
+
+        std::ptrdiff_t wrt = _pipe.write(base,
+                static_cast<typename pipe_type::int_type>(this->pptr() - base));
+
+        std::ptrdiff_t diff = this->pptr() - base;
+
+        if (wrt < diff)
+            std::move(base + wrt, base + diff, base);
+        else if (wrt == 0) //broken pipe
+            return false;
+
+        this->pbump(static_cast<int>(-wrt));
+
+        return true;
+    }
+};
+
+typedef basic_pipebuf<char>     pipebuf;
+typedef basic_pipebuf<wchar_t> wpipebuf;
+
+/** Implementation of a reading pipe stream.
+ *
+ */
+template<
+    class CharT,
+    class Traits = std::char_traits<CharT>
+>
+class basic_ipstream : public std::basic_istream<CharT, Traits>
+{
+    mutable basic_pipebuf<CharT, Traits> _buf;
+public:
+
+    typedef basic_pipe<CharT, Traits> pipe_type;
+
+    typedef           CharT            char_type  ;
+    typedef           Traits           traits_type;
+    typedef  typename Traits::int_type int_type   ;
+    typedef  typename Traits::pos_type pos_type   ;
+    typedef  typename Traits::off_type off_type   ;
+
+    ///Get access to the underlying stream_buf
+    basic_pipebuf<CharT, Traits>* rdbuf() const {return &_buf;};
+
+    ///Default constructor.
+    basic_ipstream() : std::basic_istream<CharT, Traits>(nullptr)
+    {
+        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy constructor.
+    basic_ipstream(const basic_ipstream & ) = delete;
+    ///Move constructor.
+    basic_ipstream(basic_ipstream && lhs) : std::basic_istream<CharT, Traits>(nullptr), _buf(std::move(lhs._buf))
+    {
+        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
+    }
+
+    ///Move construct from a pipe.
+    basic_ipstream(pipe_type && p)      : std::basic_istream<CharT, Traits>(nullptr), _buf(std::move(p))
+    {
+        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
+    }
+
+    ///Copy construct from a pipe.
+    basic_ipstream(const pipe_type & p) : std::basic_istream<CharT, Traits>(nullptr), _buf(p)
+    {
+        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
+    }
+
+    ///Copy assignment.
+    basic_ipstream& operator=(const basic_ipstream & ) = delete;
+    ///Move assignment
+    basic_ipstream& operator=(basic_ipstream && lhs)
+    {
+        std::basic_istream<CharT, Traits>::operator=(std::move(lhs));
+        _buf = std::move(lhs._buf);
+        std::basic_istream<CharT, Traits>::rdbuf(&_buf);
+        return *this;
+    };
+    ///Move assignment of a pipe.
+    basic_ipstream& operator=(pipe_type && p)
+    {
+        _buf = std::move(p);
+        return *this;
+    }
+    ///Copy assignment of a pipe.
+    basic_ipstream& operator=(const pipe_type & p)
+    {
+        _buf = p;
+        return *this;
+    }
+    ///Set the pipe of the streambuf.
+    void pipe(pipe_type&& p)      {_buf.pipe(std::move(p)); }
+    ///Set the pipe of the streambuf.
+    void pipe(const pipe_type& p) {_buf.pipe(p); }
+    ///Get a reference to the pipe.
+    pipe_type &      pipe() &       {return _buf.pipe();}
+    ///Get a const reference to the pipe.
+    const pipe_type &pipe() const & {return _buf.pipe();}
+    ///Get a rvalue reference to the pipe. Qualified as rvalue.
+    pipe_type &&     pipe()  &&     {return std::move(_buf).pipe();}
+    ///Check if the pipe is open
+    bool is_open() const {return _buf.is_open();}
+
+    ///Open a new pipe
+    void open()
+    {
+        if (_buf.open() == nullptr)
+            this->setstate(std::ios_base::failbit);
+        else
+            this->clear();
+    }
+
+    ///Open a new named pipe
+    void open(const std::string & name)
+    {
+        if (_buf.open() == nullptr)
+            this->setstate(std::ios_base::failbit);
+        else
+            this->clear();
+    }
+
+    ///Flush the buffer & close the pipe
+    void close()
+    {
+        if (_buf.close() == nullptr)
+            this->setstate(std::ios_base::failbit);
+    }
+};
+
+typedef basic_ipstream<char>     ipstream;
+typedef basic_ipstream<wchar_t> wipstream;
+
+/** Implementation of a write pipe stream.
+ *
+ */
+template<
+    class CharT,
+    class Traits = std::char_traits<CharT>
+>
+class basic_opstream : public std::basic_ostream<CharT, Traits>
+{
+    mutable basic_pipebuf<CharT, Traits> _buf;
+public:
+    typedef basic_pipe<CharT, Traits> pipe_type;
+
+    typedef           CharT            char_type  ;
+    typedef           Traits           traits_type;
+    typedef  typename Traits::int_type int_type   ;
+    typedef  typename Traits::pos_type pos_type   ;
+    typedef  typename Traits::off_type off_type   ;
+
+
+    ///Get access to the underlying stream_buf
+    basic_pipebuf<CharT, Traits>* rdbuf() const {return &_buf;};
+
+    ///Default constructor.
+    basic_opstream() : std::basic_ostream<CharT, Traits>(nullptr)
+    {
+        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy constructor.
+    basic_opstream(const basic_opstream & ) = delete;
+    ///Move constructor.
+    basic_opstream(basic_opstream && lhs) : std::basic_ostream<CharT, Traits>(nullptr), _buf(std::move(lhs._buf))
+    {
+        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
+    }
+    ///Move construct from a pipe.
+    basic_opstream(pipe_type && p)      : std::basic_ostream<CharT, Traits>(nullptr), _buf(std::move(p))
+    {
+        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy construct from a pipe.
+    basic_opstream(const pipe_type & p) : std::basic_ostream<CharT, Traits>(nullptr), _buf(p)
+    {
+        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy assignment.
+    basic_opstream& operator=(const basic_opstream & ) = delete;
+    ///Move assignment
+    basic_opstream& operator=(basic_opstream && lhs)
+    {
+        std::basic_ostream<CharT, Traits>::operator=(std::move(lhs));
+        _buf = std::move(lhs._buf);
+        std::basic_ostream<CharT, Traits>::rdbuf(&_buf);
+        return *this;
+    };
+
+    ///Move assignment of a pipe.
+    basic_opstream& operator=(pipe_type && p)
+    {
+        _buf = std::move(p);
+        return *this;
+    }
+    ///Copy assignment of a pipe.
+    basic_opstream& operator=(const pipe_type & p)
+    {
+        _buf = p;
+        return *this;
+    }
+    ///Set the pipe of the streambuf.
+    void pipe(pipe_type&& p)      {_buf.pipe(std::move(p)); }
+    ///Set the pipe of the streambuf.
+    void pipe(const pipe_type& p) {_buf.pipe(p); }
+    ///Get a reference to the pipe.
+    pipe_type &      pipe() &       {return _buf.pipe();}
+    ///Get a const reference to the pipe.
+    const pipe_type &pipe() const & {return _buf.pipe();}
+    ///Get a rvalue reference to the pipe. Qualified as rvalue.
+    pipe_type &&     pipe()  &&     {return std::move(_buf).pipe();}
+
+    ///Open a new pipe
+    void open()
+    {
+        if (_buf.open() == nullptr)
+            this->setstate(std::ios_base::failbit);
+        else
+            this->clear();
+    }
+
+    ///Open a new named pipe
+    void open(const std::string & name)
+    {
+        if (_buf.open() == nullptr)
+            this->setstate(std::ios_base::failbit);
+        else
+            this->clear();
+    }
+
+    ///Flush the buffer & close the pipe
+    void close()
+    {
+        if (_buf.close() == nullptr)
+            this->setstate(std::ios_base::failbit);
+    }
+};
+
+typedef basic_opstream<char>     opstream;
+typedef basic_opstream<wchar_t> wopstream;
+
+
+/** Implementation of a read-write pipe stream.
+ *
+ */
+template<
+    class CharT,
+    class Traits = std::char_traits<CharT>
+>
+class basic_pstream : public std::basic_iostream<CharT, Traits>
+{
+    mutable basic_pipebuf<CharT, Traits> _buf;
+public:
+    typedef basic_pipe<CharT, Traits> pipe_type;
+
+    typedef           CharT            char_type  ;
+    typedef           Traits           traits_type;
+    typedef  typename Traits::int_type int_type   ;
+    typedef  typename Traits::pos_type pos_type   ;
+    typedef  typename Traits::off_type off_type   ;
+
+
+    ///Get access to the underlying stream_buf
+    basic_pipebuf<CharT, Traits>* rdbuf() const {return &_buf;};
+
+    ///Default constructor.
+    basic_pstream() : std::basic_iostream<CharT, Traits>(nullptr)
+    {
+        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy constructor.
+    basic_pstream(const basic_pstream & ) = delete;
+    ///Move constructor.
+    basic_pstream(basic_pstream && lhs) : std::basic_iostream<CharT, Traits>(nullptr), _buf(std::move(lhs._buf))
+    {
+        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
+    }
+    ///Move construct from a pipe.
+    basic_pstream(pipe_type && p)      : std::basic_iostream<CharT, Traits>(nullptr), _buf(std::move(p))
+    {
+        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy construct from a pipe.
+    basic_pstream(const pipe_type & p) : std::basic_iostream<CharT, Traits>(nullptr), _buf(p)
+    {
+        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
+    };
+    ///Copy assignment.
+    basic_pstream& operator=(const basic_pstream & ) = delete;
+    ///Move assignment
+    basic_pstream& operator=(basic_pstream && lhs)
+    {
+        std::basic_istream<CharT, Traits>::operator=(std::move(lhs));
+        _buf = std::move(lhs._buf);
+        std::basic_iostream<CharT, Traits>::rdbuf(&_buf);
+        return *this;
+    };
+    ///Move assignment of a pipe.
+    basic_pstream& operator=(pipe_type && p)
+    {
+        _buf = std::move(p);
+        return *this;
+    }
+    ///Copy assignment of a pipe.
+    basic_pstream& operator=(const pipe_type & p)
+    {
+        _buf = p;
+        return *this;
+    }
+    ///Set the pipe of the streambuf.
+    void pipe(pipe_type&& p)      {_buf.pipe(std::move(p)); }
+    ///Set the pipe of the streambuf.
+    void pipe(const pipe_type& p) {_buf.pipe(p); }
+    ///Get a reference to the pipe.
+    pipe_type &      pipe() &       {return _buf.pipe();}
+    ///Get a const reference to the pipe.
+    const pipe_type &pipe() const & {return _buf.pipe();}
+    ///Get a rvalue reference to the pipe. Qualified as rvalue.
+    pipe_type &&     pipe()  &&     {return std::move(_buf).pipe();}
+
+    ///Open a new pipe
+    void open()
+    {
+        if (_buf.open() == nullptr)
+            this->setstate(std::ios_base::failbit);
+        else
+            this->clear();
+    }
+
+    ///Open a new named pipe
+    void open(const std::string & name)
+    {
+        if (_buf.open() == nullptr)
+            this->setstate(std::ios_base::failbit);
+        else
+            this->clear();
+    }
+
+    ///Flush the buffer & close the pipe
+    void close()
+    {
+        if (_buf.close() == nullptr)
+            this->setstate(std::ios_base::failbit);
+    }
+};
+
+typedef basic_pstream<char>     pstream;
+typedef basic_pstream<wchar_t> wpstream;
+
+
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/posix.hpp b/inst/include/boost/process/v1/posix.hpp
new file mode 100644
index 000000000..4d07a222b
--- /dev/null
+++ b/inst/include/boost/process/v1/posix.hpp
@@ -0,0 +1,75 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#ifndef BOOST_PROCESS_POSIX_HPP_
+#define BOOST_PROCESS_POSIX_HPP_
+
+#include <boost/process/v1/detail/posix/fd.hpp>
+#include <boost/process/v1/detail/posix/handler.hpp>
+#include <boost/process/v1/detail/posix/use_vfork.hpp>
+#include <boost/process/v1/detail/posix/signal.hpp>
+
+
+/** \file boost/process/posix.hpp
+ *
+ *    Header which provides the posix extensions.
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    namespace posix {
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::posix::fd">fd</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::posix::sig">sig</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::posix::use_vfork">use_vfork</globalname>;
+    }
+  }
+}
+</programlisting>
+ *  \endxmlonly
+ *   \warning Only available on posix. See the documentation of [fork](http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html),
+ *   [execve](http://pubs.opengroup.org/onlinepubs/009695399/functions/execve.html) and
+ *   [vfork](http://pubs.opengroup.org/onlinepubs/009695399/functions/vfork.html).
+ *
+ */
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+///Namespace containing the posix extensions.
+namespace posix {
+
+/** This property lets you modify file-descriptors other than the standard ones (0,1,2).
+ *
+ * It provides the functions `bind`, which implements [dup2](http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup.html)
+ * and [close](http://pubs.opengroup.org/onlinepubs/9699919799/functions/close.html).
+ *
+ * Close can also be called with a range of file-descriptors to be closed.
+ *
+ */
+constexpr ::boost::process::v1::detail::posix::fd_ fd;
+
+/** This property lets you modify the handling of `SIGCHLD` for this call. It will be reset afterwards.
+
+It can be set to default, by the expression `sig.dfl()`, set to ignore with `sig.ign()` or
+assigned a custom handler. A custom handler must have the type `sighandler_t`and can be assigned with the following syntax:
+
+\code{.cpp}
+sig = handler;
+sig(handler);
+\endcode
+
+\warning @ref spawn will automatically use `sig.ign()`, which will override if you pass a custom handler.
+ */
+constexpr ::boost::process::v1::detail::posix::sig_       sig;
+/** This property will replace the usage of [fork](http://pubs.opengroup.org/onlinepubs/9699919799/functions/fork.html) by [vfork](http://pubs.opengroup.org/onlinepubs/009695399/functions/vfork.html).
+ \note `vfork` is no longer an official part of the posix standard.
+
+ */
+constexpr ::boost::process::v1::detail::posix::use_vfork_ use_vfork;
+
+
+using ::boost::process::v1::detail::posix::sighandler_t;
+
+}}}}
+
+#endif /* BOOST_PROCESS_POSIX_HPP_ */
diff --git a/inst/include/boost/process/v1/search_path.hpp b/inst/include/boost/process/v1/search_path.hpp
new file mode 100644
index 000000000..a456df1fb
--- /dev/null
+++ b/inst/include/boost/process/v1/search_path.hpp
@@ -0,0 +1,55 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/**
+ * \file boost/process/search_path.hpp
+ *
+ * Defines a function to search for an executable in path.
+ */
+
+#ifndef BOOST_PROCESS_SEARCH_PATH_HPP
+#define BOOST_PROCESS_SEARCH_PATH_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/environment.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/search_path.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/search_path.hpp>
+#endif
+
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+/**
+ * Searches for an executable in path.
+ *
+ * filename must be a basename including the file extension.
+ * It must not include any directory separators (like a slash).
+ * On Windows the file extension may be omitted. The function
+ * will then try the various file extensions for executables on
+ * Windows to find filename.
+ *
+ * \param filename The base of the filename to find
+ *
+ * \param path the set of paths to search, defaults to the "PATH" environment variable.
+ *
+ * \returns the absolute path to the executable filename or an
+ *          empty string if filename isn't found
+ */
+inline boost::process::v1::filesystem::path search_path(const boost::process::v1::filesystem::path &filename,
+                                    const std::vector<boost::process::v1::filesystem::path> path = ::boost::this_process::path())
+{
+    return ::boost::process::v1::detail::api::search_path(filename, path);
+}
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/shell.hpp b/inst/include/boost/process/v1/shell.hpp
new file mode 100644
index 000000000..9aef86370
--- /dev/null
+++ b/inst/include/boost/process/v1/shell.hpp
@@ -0,0 +1,90 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_SHELL_PATH_HPP
+#define BOOST_PROCESS_SHELL_PATH_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/traits/wchar_t.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/shell_path.hpp>
+#elif defined(BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/shell_path.hpp>
+#endif
+
+/** \file boost/process/shell.hpp
+ *
+ *    Header which provides the shell property. This provides the
+ *    property to launch a process through the system shell.
+ *    It also allows the user to obtain the shell-path via shell().
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::shell">shell</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+
+ */
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+
+struct shell_
+{
+    constexpr shell_() {}
+
+    boost::process::v1::filesystem::path operator()() const
+    {
+        return boost::process::v1::detail::api::shell_path();
+    }
+    boost::process::v1::filesystem::path operator()(std::error_code & ec) const noexcept
+    {
+        return boost::process::v1::detail::api::shell_path(ec);
+    }
+};
+
+template<>
+struct is_wchar_t<shell_> : is_wchar_t<boost::process::v1::filesystem::path>
+{
+};
+
+}
+/**
+The shell property enables to launch a program through the shell of the system.
+
+\code{.cpp}
+system("gcc", shell);
+\endcode
+
+The shell argument goes without any expression. The operator() is overloaded, to
+obtain the path of the system shell.
+
+\code{.cpp}
+auto shell_cmd = shell();
+//avoid exceptions
+std::error_code ec;
+shell_cmd = shell(ec);
+\endcode
+
+\attention Launching through the shell will NOT provide proper error handling, i.e.
+you will get an error via the return code.
+
+\attention Executing shell commands that incorporate unsanitized input from an untrusted source makes a program vulnerable to shell injection, a serious security flaw which can result in arbitrary command execution. For this reason, the use of `shell` is strongly discouraged in cases where the command string is constructed from external input:
+
+*/
+constexpr ::boost::process::v1::detail::shell_ shell;
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/spawn.hpp b/inst/include/boost/process/v1/spawn.hpp
new file mode 100644
index 000000000..601a5e315
--- /dev/null
+++ b/inst/include/boost/process/v1/spawn.hpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/**
+ * \file boost/process/spawn.hpp
+ *
+ * Defines the spawn function.
+ */
+
+#ifndef BOOST_PROCESS_SPAWN_HPP
+#define BOOST_PROCESS_SPAWN_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/child_decl.hpp>
+#include <boost/process/v1/detail/execute_impl.hpp>
+#include <boost/process/v1/detail/async_handler.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#endif
+
+namespace boost {
+
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+namespace detail {
+
+}
+
+/** Launch a process and detach it. Returns no handle.
+
+This function starts a process and immediately detaches it. It thereby prevents the system from creating a zombie process,
+but will also cause the system to be unable to wait for the child to exit.
+
+\note This will set `SIGCHLD` to `SIGIGN` on posix.
+
+\warning This function does not allow asynchronous operations, since it cannot wait for the end of the process.
+It will fail to compile if a reference to `boost::asio::io_context` is passed.
+
+ */
+template<typename ...Args>
+inline void spawn(Args && ...args)
+{
+    typedef typename ::boost::process::v1::detail::has_async_handler<Args...>::type
+            has_async;
+
+
+    static_assert(
+            !has_async::value,
+            "Spawn cannot wait for exit, so async properties cannot be used");
+
+    auto c = ::boost::process::v1::detail::execute_impl(
+#if defined(BOOST_POSIX_API)
+            ::boost::process::v1::posix::sig.ign(),
+#endif
+             std::forward<Args>(args)...);
+    c.detach();
+}
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/start_dir.hpp b/inst/include/boost/process/v1/start_dir.hpp
new file mode 100644
index 000000000..32ba338ce
--- /dev/null
+++ b/inst/include/boost/process/v1/start_dir.hpp
@@ -0,0 +1,111 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PROCESS_START_IN_DIR_HPP
+#define BOOST_PROCESS_START_IN_DIR_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/handler.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/detail/traits/wchar_t.hpp>
+
+#if defined (BOOST_POSIX_API)
+#include <boost/process/v1/detail/posix/start_dir.hpp>
+#elif defined (BOOST_WINDOWS_API)
+#include <boost/process/v1/detail/windows/start_dir.hpp>
+#endif
+
+#include <boost/process/v1/detail/config.hpp>
+#include <string>
+#include <boost/process/v1/filesystem.hpp>
+
+/** \file boost/process/start_dir.hpp
+ *
+Header which provides the start_dir property, which allows to set the directory
+the process shall be started in.
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::start_dir">start_dir</globalname>;
+  }
+}
+</programlisting>
+\endxmlonly
+
+ */
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 { namespace detail {
+
+struct start_dir_
+{
+    constexpr start_dir_() {};
+
+    template<typename Char>
+    api::start_dir_init<Char> operator()(const std::basic_string<Char> & st) const {return {st}; }
+    template<typename Char>
+    api::start_dir_init<Char> operator()(std::basic_string<Char> && s) const {return {std::move(s)}; }
+    template<typename Char>
+    api::start_dir_init<Char> operator()(const Char* s)                const {return {s}; }
+    api::start_dir_init<typename boost::process::v1::filesystem::path::value_type>
+                              operator()(const boost::process::v1::filesystem::path & st) const {return {st.native()}; }
+
+    template<typename Char>
+    api::start_dir_init<Char> operator= (const std::basic_string<Char> & st) const {return {st}; }
+    template<typename Char>
+    api::start_dir_init<Char> operator= (std::basic_string<Char> && s) const {return {std::move(s)}; }
+    template<typename Char>
+    api::start_dir_init<Char> operator= (const Char* s)                const {return {s}; }
+    api::start_dir_init<typename boost::process::v1::filesystem::path::value_type>
+                              operator= (const boost::process::v1::filesystem::path & st) const {return {st.native()}; }
+
+};
+
+template<> struct is_wchar_t<api::start_dir_init<wchar_t>> : std::true_type {};
+
+template<>
+struct char_converter<char, api::start_dir_init<wchar_t>>
+{
+    static api::start_dir_init<char> conv(const api::start_dir_init<wchar_t> & in)
+    {
+        return api::start_dir_init<char>{::boost::process::v1::detail::convert(in.str())};
+    }
+};
+
+template<>
+struct char_converter<wchar_t, api::start_dir_init<char>>
+{
+    static api::start_dir_init<wchar_t> conv(const api::start_dir_init<char> & in)
+    {
+        return api::start_dir_init<wchar_t>{::boost::process::v1::detail::convert(in.str())};
+    }
+};
+
+}
+
+/**
+
+To set the start dir, the `start_dir` property is provided.
+
+The valid operations are the following:
+
+\code{.cpp}
+start_dir=path
+start_dir(path)
+\endcode
+
+It can be used with `std::string`, `std::wstring` and `boost::process::v1::filesystem::path`.
+
+
+ */
+constexpr ::boost::process::v1::detail::start_dir_ start_dir;
+
+}}}
+
+#endif
diff --git a/inst/include/boost/process/v1/system.hpp b/inst/include/boost/process/v1/system.hpp
new file mode 100644
index 000000000..dff78d742
--- /dev/null
+++ b/inst/include/boost/process/v1/system.hpp
@@ -0,0 +1,158 @@
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+// Copyright (c) 2011, 2012 Jeff Flinn, Boris Schaeling
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+/**
+ * \file boost/process/system.hpp
+ *
+ * Defines a system function.
+ */
+
+#ifndef BOOST_PROCESS_SYSTEM_HPP
+#define BOOST_PROCESS_SYSTEM_HPP
+
+#include <boost/process/v1/detail/config.hpp>
+#include <boost/process/v1/detail/on_exit.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/detail/async_handler.hpp>
+#include <boost/process/v1/detail/execute_impl.hpp>
+#include <boost/asio/post.hpp>
+#include <type_traits>
+#include <mutex>
+#include <condition_variable>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#endif
+
+namespace boost {
+
+namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+namespace detail
+{
+
+struct system_impl_success_check : handler
+{
+    bool succeeded = false;
+
+    template<typename Exec>
+    void on_success(Exec &) { succeeded = true; }
+};
+
+template<typename IoService, typename ...Args>
+inline int system_impl(
+        std::true_type, /*needs ios*/
+        std::true_type, /*has io_context*/
+        Args && ...args)
+{
+    IoService & ios = ::boost::process::v1::detail::get_io_context_var(args...);
+
+    system_impl_success_check check;
+
+    std::atomic_bool exited{false};
+
+    child c(std::forward<Args>(args)...,
+            check,
+            ::boost::process::v1::on_exit(
+                [&](int, const std::error_code&)
+                {
+                    boost::asio::post(ios.get_executor(), [&]{exited.store(true);});
+                }));
+    if (!c.valid() || !check.succeeded)
+        return -1;
+
+    while (!exited.load())
+        ios.poll();
+
+    return c.exit_code();
+}
+
+template<typename IoService, typename ...Args>
+inline int system_impl(
+        std::true_type,  /*needs ios */
+        std::false_type, /*has io_context*/
+        Args && ...args)
+{
+    IoService ios;
+    child c(ios, std::forward<Args>(args)...);
+    if (!c.valid())
+        return -1;
+
+    ios.run();
+    if (c.running())
+        c.wait();
+    return c.exit_code();
+}
+
+
+template<typename IoService, typename ...Args>
+inline int system_impl(
+        std::false_type, /*needs ios*/
+        std::true_type, /*has io_context*/
+        Args && ...args)
+{
+    child c(std::forward<Args>(args)...);
+    if (!c.valid())
+        return -1;
+    c.wait();
+    return c.exit_code();
+}
+
+template<typename IoService, typename ...Args>
+inline int system_impl(
+        std::false_type, /*has async */
+        std::false_type, /*has io_context*/
+        Args && ...args)
+{
+    child c(std::forward<Args>(args)...
+#if defined(BOOST_POSIX_API)
+            ,::boost::process::v1::posix::sig.dfl()
+#endif
+            );
+    if (!c.valid())
+        return -1;
+    c.wait();
+    return c.exit_code();
+}
+
+}
+
+/** Launches a process and waits for its exit.
+It works as std::system, though it allows
+all the properties boost.process provides. It will execute the process and wait for it's exit; then return the exit_code.
+
+\code{.cpp}
+int ret = system("ls");
+\endcode
+
+\attention Using this function with synchronous pipes leads to many potential deadlocks.
+
+When using this function with an asynchronous properties and NOT passing an io_context object,
+the system function will create one and run it. When the io_context is passed to the function,
+the system function will check if it is active, and call the io_context::run function if not.
+
+*/
+template<typename ...Args>
+inline int system(Args && ...args)
+{
+    typedef typename ::boost::process::v1::detail::needs_io_context<Args...>::type
+            need_ios;
+    typedef typename ::boost::process::v1::detail::has_io_context<Args...>::type
+            has_ios;
+    return ::boost::process::v1::detail::system_impl<boost::asio::io_context>(
+            need_ios(), has_ios(),
+            std::forward<Args>(args)...);
+}
+
+
+}}}
+
+#endif
+
diff --git a/inst/include/boost/process/v1/windows.hpp b/inst/include/boost/process/v1/windows.hpp
new file mode 100644
index 000000000..4eff5ef57
--- /dev/null
+++ b/inst/include/boost/process/v1/windows.hpp
@@ -0,0 +1,61 @@
+// Copyright (c) 2016 Klemens D. Morgenstern
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#ifndef BOOST_PROCESS_WINDOWS_HPP_
+#define BOOST_PROCESS_WINDOWS_HPP_
+
+#include <boost/process/v1/detail/windows/show_window.hpp>
+
+/** \file boost/process/windows.hpp
+ *
+ *    Header which provides the windows extensions.
+
+\xmlonly
+<programlisting>
+namespace boost {
+  namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+    namespace windows {
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::hide">hide</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::maximized">maximized</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::minimized">minimized</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::minimized_not_active">minimized_not_active</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::not_active">not_active</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::show">show</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::show_normal">show_normal</globalname>;
+      <emphasis>unspecified</emphasis> <globalname alt="boost::process::v1::windows::create_no_window">create_no_window</globalname>;
+    }
+  }
+}
+</programlisting>
+ *  \endxmlonly
+ *   \warning Only available on windows.
+ *   See the parameter documentation of [ShowWindow](https://msdn.microsoft.com/en-us/library/windows/desktop/ms633548.aspx) for more details.
+ */
+
+namespace boost { namespace process { BOOST_PROCESS_V1_INLINE namespace v1 {
+
+///Namespace containing the windows extensions.
+namespace windows {
+
+///Hides the window and activates another window.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_HIDE_           > hide;
+///Activates the window and displays it as a maximized window.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_SHOWMAXIMIZED_  > maximized;
+///Activates the window and displays it as a minimized window.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_SHOWMINIMIZED_  > minimized;
+///Displays the window as a minimized window. This value is similar to `minimized`, except the window is not activated.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_SHOWMINNOACTIVE_> minimized_not_active;
+///Displays a window in its most recent size and position. This value is similar to show_normal`, except that the window is not activated.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_SHOWNOACTIVATE_ > not_active;
+///Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag when displaying the window for the first time.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_SHOWNORMAL_     > show;
+///Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag when displaying the window for the first time.
+constexpr ::boost::process::v1::detail::windows::show_window<::boost::winapi::SW_SHOWNORMAL_     > show_normal;
+
+///Adds the [CREATE_NO_WINDOW](https://msdn.microsoft.com/en-us/library/windows/desktop/ms684863(v=vs.85).aspx) flag.
+constexpr ::boost::process::v1::detail::windows::create_no_window_ create_no_window;
+
+}}}}
+
+#endif /* BOOST_PROCESS_WINDOWS_HPP_ */
diff --git a/inst/include/boost/process/v2/bind_launcher.hpp b/inst/include/boost/process/v2/bind_launcher.hpp
index 158244816..e63260c51 100644
--- a/inst/include/boost/process/v2/bind_launcher.hpp
+++ b/inst/include/boost/process/v2/bind_launcher.hpp
@@ -71,7 +71,7 @@ struct bound_launcher
     template<typename ExecutionContext, typename Args, typename ... Inits>
     auto operator()(ExecutionContext & context,
                     const typename std::enable_if<std::is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits) -> basic_process<typename ExecutionContext::executor_type>
@@ -88,7 +88,7 @@ struct bound_launcher
     auto operator()(ExecutionContext & context,
                     error_code & ec,
                     const typename std::enable_if<std::is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -103,8 +103,8 @@ struct bound_launcher
     template<typename Executor, typename Args, typename ... Inits>
     auto operator()(Executor exec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -120,8 +120,8 @@ struct bound_launcher
     auto operator()(Executor exec,
                     error_code & ec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -138,7 +138,7 @@ struct bound_launcher
     auto invoke(detail::index_sequence<Idx...>, 
                 ExecutionContext & context,
                 const typename std::enable_if<std::is_convertible<
-                        ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                        ExecutionContext&, net::execution_context&>::value,
                         filesystem::path >::type & executable,
                 Args && args,
                 Inits && ... inits) -> basic_process<typename ExecutionContext::executor_type>
@@ -156,7 +156,7 @@ struct bound_launcher
                 ExecutionContext & context,
                 error_code & ec,
                 const typename std::enable_if<std::is_convertible<
-                        ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                        ExecutionContext&, net::execution_context&>::value,
                         filesystem::path >::type & executable,
                 Args && args,
                 Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -172,8 +172,8 @@ struct bound_launcher
     auto invoke(detail::index_sequence<Idx...>,
                 Executor exec,
                 const typename std::enable_if<
-                        BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                        BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                        net::execution::is_executor<Executor>::value ||
+                        net::is_executor<Executor>::value,
                         filesystem::path >::type & executable,
                 Args && args,
                 Inits && ... inits ) -> basic_process<Executor>
@@ -190,8 +190,8 @@ struct bound_launcher
                 Executor exec,
                 error_code & ec,
                 const typename std::enable_if<
-                        BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                        BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                        net::execution::is_executor<Executor>::value ||
+                        net::is_executor<Executor>::value,
                         filesystem::path >::type & executable,
                 Args && args,
                 Inits && ... inits ) -> basic_process<Executor>
diff --git a/inst/include/boost/process/v2/default_launcher.hpp b/inst/include/boost/process/v2/default_launcher.hpp
index 42a26b724..a95570758 100644
--- a/inst/include/boost/process/v2/default_launcher.hpp
+++ b/inst/include/boost/process/v2/default_launcher.hpp
@@ -59,8 +59,5 @@ typedef posix::default_launcher default_process_launcher;
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-#include <boost/process/v2/impl/default_launcher.ipp>
-#endif
 
 #endif //BOOST_PROCESS_V2_DEFAULT_LAUNCHER_HPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/detail/config.hpp b/inst/include/boost/process/v2/detail/config.hpp
index 0c985d181..a38c89ed9 100644
--- a/inst/include/boost/process/v2/detail/config.hpp
+++ b/inst/include/boost/process/v2/detail/config.hpp
@@ -7,12 +7,7 @@
 
 #if defined(BOOST_PROCESS_V2_STANDALONE)
 
-#define BOOST_PROCESS_V2_ASIO_NAMESPACE asio
 #define BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(Sig) ASIO_COMPLETION_TOKEN_FOR(Sig)
-#define BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(Executor) ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(Executor)
-#define BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(Token, Signature) ASIO_INITFN_AUTO_RESULT_TYPE(Token, Signature)
-#define BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN(Executor) ASIO_DEFAULT_COMPLETION_TOKEN(Executor)
-#define BOOST_PROCESS_V2_INITFN_DEDUCED_RESULT_TYPE(x,y,z) ASIO_INITFN_DEDUCED_RESULT_TYPE(x,y,z)
 
 #include <asio/detail/config.hpp>
 #include <system_error>
@@ -24,10 +19,6 @@
 #if defined(ASIO_WINDOWS)
 #define BOOST_PROCESS_V2_WINDOWS 1
 
-// Windows: suppress definition of "min" and "max" macros.
-#if !defined(NOMINMAX)
-# define NOMINMAX 1
-#endif
 #endif
 
 #if defined(ASIO_HAS_UNISTD_H)
@@ -38,14 +29,14 @@
 #define BOOST_PROCESS_V2_END_NAMESPACE   }
 #define BOOST_PROCESS_V2_NAMESPACE process_v2
 
+namespace asio {}
+BOOST_PROCESS_V2_BEGIN_NAMESPACE
+namespace net = ::asio;
+BOOST_PROCESS_V2_END_NAMESPACE
+
 #else
 
-#define BOOST_PROCESS_V2_ASIO_NAMESPACE boost::asio
 #define BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(Sig) BOOST_ASIO_COMPLETION_TOKEN_FOR(Sig)
-#define BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(Executor) BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(Executor)
-#define BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(Token, Signature) BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(Token, Signature)
-#define BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN(Executor) BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(Executor)
-#define BOOST_PROCESS_V2_INITFN_DEDUCED_RESULT_TYPE(x,y,z) BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(x,y,z)
 
 #include <boost/config.hpp>
 #include <boost/io/quoted.hpp>
@@ -57,10 +48,6 @@
 #if defined(BOOST_WINDOWS_API)
 #define BOOST_PROCESS_V2_WINDOWS 1
 
-// Windows: suppress definition of "min" and "max" macros.
-#if !defined(NOMINMAX)
-# define NOMINMAX 1
-#endif
 
 #endif
 
@@ -79,10 +66,26 @@
 #include <boost/filesystem/operations.hpp>
 #endif
 
+
+#if !defined(BOOST_PROCESS_VERSION)
+#define  BOOST_PROCESS_VERSION 1
+#endif
+
+
+#if BOOST_PROCESS_VERSION == 2
 #define BOOST_PROCESS_V2_BEGIN_NAMESPACE namespace boost { namespace process { namespace v2 {
+#else
+#define BOOST_PROCESS_V2_BEGIN_NAMESPACE namespace boost { namespace process { inline namespace v2 {
+#endif
+
 #define BOOST_PROCESS_V2_END_NAMESPACE  } } }
 #define BOOST_PROCESS_V2_NAMESPACE boost::process::v2
 
+namespace boost { namespace asio {} }
+BOOST_PROCESS_V2_BEGIN_NAMESPACE
+namespace net = ::boost::asio;
+BOOST_PROCESS_V2_END_NAMESPACE
+
 #endif
 
 BOOST_PROCESS_V2_BEGIN_NAMESPACE
@@ -97,9 +100,6 @@ namespace filesystem = std::filesystem;
 using std::quoted;
 using std::optional;
 
-#define BOOST_PROCESS_V2_RETURN_EC(ev)                                                                  \
-  return ::BOOST_PROCESS_V2_NAMESPACE::error_code(ev, ::BOOST_PROCESS_V2_NAMESPACE::system_category()); \
-
 #define BOOST_PROCESS_V2_ASSIGN_EC(ec, ...) ec.assign(__VA_ARGS__);
 #define BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)                         \
   ec.assign(::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error());   \
@@ -120,41 +120,35 @@ namespace filesystem = std::filesystem;
 namespace filesystem = boost::filesystem;
 #endif
 
-#define BOOST_PROCESS_V2_RETURN_EC(ev)                                                                     \
-{                                                                                                          \
-  static constexpr auto loc##__LINE__((BOOST_CURRENT_LOCATION));                                           \
-  return ::BOOST_PROCESS_V2_NAMESPACE::error_code(ev, ::BOOST_PROCESS_V2_NAMESPACE::system_category(), &loc##__LINE__);   \
-}
-
 #define BOOST_PROCESS_V2_ASSIGN_EC(ec, ...)                       \
+do                                                                \
 {                                                                 \
   static constexpr auto loc##__LINE__((BOOST_CURRENT_LOCATION));  \
   ec.assign(__VA_ARGS__,  &loc##__LINE__);                        \
-}
+}                                                                 \
+while (false)
 
 #define BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)                                         \
+do                                                                                     \
 {                                                                                      \
   static constexpr auto loc##__LINE__((BOOST_CURRENT_LOCATION));                       \
   ec.assign(::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error(), &loc##__LINE__);   \
-}
+}                                                                                      \
+while (false)
 
 
 #endif
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#ifndef BOOST_PROCESS_V2_HEADER_ONLY
-# ifndef BOOST_PROCESS_V2_SEPARATE_COMPILATION
-#   define BOOST_PROCESS_V2_HEADER_ONLY 1
-# endif
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_PROCESS_DYN_LINK)
+#if defined(BOOST_PROCESS_SOURCE)
+#define BOOST_PROCESS_V2_DECL BOOST_SYMBOL_EXPORT
+#else
+#define BOOST_PROCESS_V2_DECL BOOST_SYMBOL_IMPORT
 #endif
-
-#if BOOST_PROCESS_V2_DOXYGEN
-# define BOOST_PROCESS_V2_DECL
-#elif defined(BOOST_PROCESS_V2_HEADER_ONLY)
-# define BOOST_PROCESS_V2_DECL inline
 #else
-# define BOOST_PROCESS_V2_DECL
+#define BOOST_PROCESS_V2_DECL
 #endif
 
 #if defined(BOOST_PROCESS_V2_POSIX)
@@ -177,4 +171,11 @@ BOOST_PROCESS_V2_END_NAMESPACE
 #define BOOST_PROCESS_V2_HAS_PROCESS_HANDLE 1
 #endif
 
+#if BOOST_PROCESS_VERSION == 2
+#define BOOST_PROCESS_V2_INLINE inline
+#else
+#define BOOST_PROCESS_V2_INLINE
+#endif
+
+
 #endif //BOOST_PROCESS_V2_DETAIL_CONFIG_HPP
diff --git a/inst/include/boost/process/v2/detail/environment_posix.hpp b/inst/include/boost/process/v2/detail/environment_posix.hpp
index e945a86c2..756432d66 100644
--- a/inst/include/boost/process/v2/detail/environment_posix.hpp
+++ b/inst/include/boost/process/v2/detail/environment_posix.hpp
@@ -69,7 +69,12 @@ BOOST_PROCESS_V2_DECL native_iterator next(native_handle_type nh);
 BOOST_PROCESS_V2_DECL native_iterator find_end(native_handle_type nh);
 inline const char_type * dereference(native_iterator iterator) {return *iterator;}
 
-BOOST_PROCESS_V2_DECL bool is_executable(const filesystem::path & pth, error_code & ec);
+BOOST_PROCESS_V2_DECL bool has_x_access(const char * pth);
+
+inline bool is_executable(const filesystem::path & pth, error_code & ec)
+{
+  return filesystem::is_regular_file(pth, ec) && has_x_access(pth.c_str());
+}
 
 }
 
diff --git a/inst/include/boost/process/v2/detail/environment_win.hpp b/inst/include/boost/process/v2/detail/environment_win.hpp
index 3ddd419e8..d01aad369 100644
--- a/inst/include/boost/process/v2/detail/environment_win.hpp
+++ b/inst/include/boost/process/v2/detail/environment_win.hpp
@@ -57,7 +57,7 @@ struct key_char_traits
     return to_lower(c1) < to_lower(c2);
   }
 
-  BOOST_CONSTEXPR static
+  BOOST_CXX14_CONSTEXPR static
   int compare(const char_type* s1, const char_type* s2, size_t n) BOOST_NOEXCEPT
   {
     auto itrs = std::mismatch(s1, s1 + n, s2, &eq);
@@ -69,17 +69,17 @@ struct key_char_traits
     return (c1 < c2 ) ? -1 : 1;
   }
 
-  BOOST_CONSTEXPR static size_t length(const char* s)    BOOST_NOEXCEPT  { return std::strlen(s); }
-  BOOST_CONSTEXPR static size_t length(const wchar_t* s) BOOST_NOEXCEPT  { return std::wcslen(s); }
+  static size_t length(const char* s)    BOOST_NOEXCEPT  { return std::strlen(s); }
+  static size_t length(const wchar_t* s) BOOST_NOEXCEPT  { return std::wcslen(s); }
 
-  BOOST_CONSTEXPR static
+  BOOST_CXX14_CONSTEXPR static
   const char_type* find(const char_type* s, size_t n, const char_type& a) BOOST_NOEXCEPT
   {
     const char_type u = to_lower(a);
     return std::find_if(s, s + n, [u](char_type c){return to_lower(c) == u;});
   }
 
-  BOOST_CONSTEXPR static
+  BOOST_CXX14_CONSTEXPR static
   char_type* move(char_type* s1, const char_type* s2, size_t n) BOOST_NOEXCEPT
   {
     if (s1 < s2)
@@ -94,7 +94,7 @@ struct key_char_traits
     return std::copy(s2, s2 + n, s1);
   }
 
-  BOOST_CONSTEXPR static
+  BOOST_CXX14_CONSTEXPR static
   char_type* assign(char_type* s, size_t n, char_type a) BOOST_NOEXCEPT
   {
     std::fill(s, s + n, a);
@@ -203,7 +203,15 @@ struct native_handle_deleter
 inline const char_type * dereference(native_iterator iterator) {return iterator;}
 BOOST_PROCESS_V2_DECL native_iterator next(native_iterator nh);
 BOOST_PROCESS_V2_DECL native_iterator find_end(native_handle_type nh);
-BOOST_PROCESS_V2_DECL bool is_executable(const filesystem::path & pth, error_code & ec);
+
+
+BOOST_PROCESS_V2_DECL bool is_exec_type(const wchar_t * pth);
+
+inline bool is_executable(const filesystem::path & pth, error_code & ec)
+{
+  return filesystem::is_regular_file(pth, ec) && is_exec_type(pth.c_str());
+}
+
 }
 
 }
diff --git a/inst/include/boost/process/v2/detail/impl/environment.ipp b/inst/include/boost/process/v2/detail/impl/environment.ipp
deleted file mode 100644
index 3dc1b6615..000000000
--- a/inst/include/boost/process/v2/detail/impl/environment.ipp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_DETAIL_IMPL_ENVIRONMENT_IPP
-#define BOOST_PROCESS_V2_DETAIL_IMPL_ENVIRONMENT_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <boost/process/v2/detail/impl/environment_win.ipp>
-#elif defined(BOOST_PROCESS_V2_POSIX)
-#include <boost/process/v2/detail/impl/environment_posix.ipp>
-#else
-#error Operating System not supported.
-#endif
-
-#endif //BOOST_PROCESS_V2_DETAIL_IMPL_ENVIRONMENT_IPP
diff --git a/inst/include/boost/process/v2/detail/impl/environment_posix.ipp b/inst/include/boost/process/v2/detail/impl/environment_posix.ipp
deleted file mode 100644
index 0f76b816f..000000000
--- a/inst/include/boost/process/v2/detail/impl/environment_posix.ipp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// process/this_process/detail/environment_posix.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2021 Klemens D. Morgenstern (klemens dot morgenstern at gmx dot net)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_PROCESS_V2_DETAIL_ENVIRONMENT_WIN_HPP
-#define BOOST_PROCESS_V2_DETAIL_ENVIRONMENT_WIN_HPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/environment.hpp>
-#include <boost/process/v2/cstring_ref.hpp>
-
-#include <unistd.h>
-#include <cstring>
-
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace environment
-{
-namespace detail
-{
-
-basic_cstring_ref<char_type, value_char_traits<char>> get(
-        basic_cstring_ref<char_type, key_char_traits<char_type>> key,
-        error_code & ec)
-{
-    auto res = ::getenv(key.c_str());
-    if (res == nullptr)
-    {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOENT, system_category())
-        return {};
-    }
-    return res;
-}
-
-void set(basic_cstring_ref<char_type,   key_char_traits<char_type>>   key,
-         basic_cstring_ref<char_type, value_char_traits<char_type>> value,
-                error_code & ec)
-{
-    if (::setenv(key.c_str(), value.c_str(), true))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void unset(basic_cstring_ref<char_type, key_char_traits<char_type>> key, error_code & ec)
-{
-    if (::unsetenv(key.c_str()))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-
-native_handle_type load_native_handle() { return ::environ; }
-
-
-native_iterator next(native_iterator nh)
-{
-    return nh + 1;
-}
-
-native_iterator find_end(native_handle_type nh)
-{
-    while (*nh != nullptr)
-        nh++;
-    return nh;
-}
-bool is_executable(const filesystem::path & p, error_code & ec)
-{
-    return filesystem::is_regular_file(p, ec) && (::access(p.c_str(), X_OK) == 0);
-}
-
-}
-}
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_DETAIL_ENVIRONMENT_WIN_HPP
diff --git a/inst/include/boost/process/v2/detail/impl/environment_win.ipp b/inst/include/boost/process/v2/detail/impl/environment_win.ipp
deleted file mode 100644
index 86792f2e3..000000000
--- a/inst/include/boost/process/v2/detail/impl/environment_win.ipp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// process/this_process/detail/environment_win.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2021 Klemens D. Morgenstern (klemens dot morgenstern at gmx dot net)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_PROCESS_V2_DETAIL_IMPL_ENVIRONMENT_WIN_IPP
-#define BOOST_PROCESS_V2_DETAIL_IMPL_ENVIRONMENT_WIN_IPP
-
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/environment_win.hpp>
-#include <boost/process/v2/detail/impl/environment.ipp>
-#include <boost/process/v2/detail/last_error.hpp>
-
-#include <algorithm>
-#include <cwctype>
-#include <cstring>
-
-#include <shellapi.h>
-
-#include <boost/process/v2/cstring_ref.hpp>
-#include <boost/process/v2/error.hpp>
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace environment
-{
-namespace detail
-{
-
-std::basic_string<char_type, value_char_traits<char_type>> get(
-        basic_cstring_ref<char_type, key_char_traits<char_type>> key,
-        error_code & ec)
-{
-  std::basic_string<char_type, value_char_traits<char_type>> buf;
-
-  std::size_t size = 0u;
-  do
-  {
-    buf.resize(buf.size() + 4096);
-    size = ::GetEnvironmentVariableW(key.c_str(), &buf.front(), static_cast<DWORD>(buf.size()));
-  }
-  while (size == buf.size());
-
-  buf.resize(size);
-
-  if (buf.size() == 0)
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-
-  return buf;
-}
-
-void set(basic_cstring_ref<char_type,   key_char_traits<char_type>>   key,
-         basic_cstring_ref<char_type, value_char_traits<char_type>> value,
-         error_code & ec)
-{
-  if (!::SetEnvironmentVariableW(key.c_str(), value.c_str()))
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void unset(basic_cstring_ref<char_type, key_char_traits<char_type>> key,
-           error_code & ec)
-{
-  if (!::SetEnvironmentVariableW(key.c_str(), nullptr))
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-
-std::basic_string<char, value_char_traits<char>> get(
-        basic_cstring_ref<char, key_char_traits<char>> key,
-        error_code & ec)
-{
-  std::basic_string<char, value_char_traits<char>> buf;
-
-  std::size_t size = 0u;
-  do
-  {
-    buf.resize(buf.size() + 4096);
-    size = ::GetEnvironmentVariableA(key.c_str(), &buf.front(), static_cast<DWORD>(buf.size()));
-  }
-  while (size == buf.size());
-
-  buf.resize(size);
-
-  if (buf.size() == 0)
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-
-  return buf;
-}
-
-void set(basic_cstring_ref<char,   key_char_traits<char>>   key,
-         basic_cstring_ref<char, value_char_traits<char>> value,
-         error_code & ec)
-{
-  if (!::SetEnvironmentVariableA(key.c_str(), value.c_str()))
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void unset(basic_cstring_ref<char, key_char_traits<char>> key,
-           error_code & ec)
-{
-  if (!::SetEnvironmentVariableA(key.c_str(), nullptr))
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-
-native_handle_type load_native_handle() { return ::GetEnvironmentStringsW(); }
-void native_handle_deleter::operator()(native_handle_type nh) const
-{
-    ::FreeEnvironmentStringsW(nh);
-}
-
-native_iterator next(native_iterator nh)
-{
-    while (*nh != L'\0')
-        nh++;
-    return ++nh;
-}
-
-
-native_iterator find_end(native_handle_type nh)
-{
-  while ((*nh != L'\0') || (*std::next(nh) != L'\0'))
-    nh++;
-  return ++nh;
-}
-
-bool is_executable(const filesystem::path & pth, error_code & ec)
-{
-    return filesystem::is_regular_file(pth, ec) && SHGetFileInfoW(pth.native().c_str(), 0,0,0, SHGFI_EXETYPE);
-}
-
-}
-}
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_DETAIL_IMPL_ENVIRONMENT_WIN_IPP
diff --git a/inst/include/boost/process/v2/detail/impl/last_error.ipp b/inst/include/boost/process/v2/detail/impl/last_error.ipp
deleted file mode 100644
index 8254fdb63..000000000
--- a/inst/include/boost/process/v2/detail/impl/last_error.ipp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_DETAIL_IMPL_LAST_ERROR_IPP
-#define BOOST_PROCESS_V2_DETAIL_IMPL_LAST_ERROR_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <windows.h>
-#else
-#include <cerrno>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-namespace detail
-{
-
-error_code get_last_error()
-{
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-    return error_code(::GetLastError(), system_category());
-#else
-    return error_code(errno, system_category());
-#endif
-
-}
-
-}
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_DETAIL_IMPL_LAST_ERROR_IPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/detail/impl/process_handle_windows.ipp b/inst/include/boost/process/v2/detail/impl/process_handle_windows.ipp
deleted file mode 100644
index 535bc011d..000000000
--- a/inst/include/boost/process/v2/detail/impl/process_handle_windows.ipp
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_DETAIL_IMPL_PROCESS_HANDLE_WINDOWS_IPP
-#define BOOST_PROCESS_V2_DETAIL_IMPL_PROCESS_HANDLE_WINDOWS_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/detail/process_handle_windows.hpp>
-#include <boost/process/v2/ext/detail/proc_info.hpp>
-
-#include <windows.h>
-
-#if !defined(BOOST_PROCESS_V2_DISABLE_UNDOCUMENTED_API)
-extern "C" 
-{
-
-LONG WINAPI NtResumeProcess(HANDLE ProcessHandle);
-LONG WINAPI NtSuspendProcess(HANDLE ProcessHandle);
-
-}
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace detail
-{
-
-void get_exit_code_(
-    HANDLE handle,
-    native_exit_code_type & exit_code, 
-    error_code & ec)
-{
-    if (!::GetExitCodeProcess(handle, &exit_code))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-
-HANDLE open_process_(DWORD pid)
-{
-    auto proc = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE, FALSE, pid);
-    if (proc == nullptr)
-    {
-        error_code ec;
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        throw system_error(ec, "open_process()");
-    }
-
-    return proc;
-}
-
-
-void terminate_if_running_(HANDLE handle)
-{
-    DWORD exit_code = 0u;
-    if (handle == INVALID_HANDLE_VALUE)
-        return ;
-    if (::GetExitCodeProcess(handle, &exit_code))
-        if (exit_code == STILL_ACTIVE)
-            ::TerminateProcess(handle, 260);
-}
-
-bool check_handle_(HANDLE handle, error_code & ec)
-{
-    if (handle == INVALID_HANDLE_VALUE)
-    {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_INVALID_HANDLE_STATE, system_category())
-        return false;
-    }
-    return true;
-}
-
-bool check_pid_(pid_type pid_, error_code & ec)
-{
-    if (pid_ == 0)
-    {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_INVALID_HANDLE_STATE, system_category())
-        return false;
-    }
-    return true;
-}
-
-struct enum_windows_data_t
-{
-    error_code &ec;
-    pid_type pid;
-};
-
-static BOOL CALLBACK enum_window(HWND hwnd, LPARAM param)
-{
-    auto data = reinterpret_cast<enum_windows_data_t*>(param);
-    DWORD pid{0u};
-    GetWindowThreadProcessId(hwnd, &pid);
-    if (pid != data->pid)
-        return TRUE;
-    
-    LRESULT res = ::SendMessageW(hwnd, WM_CLOSE, 0, 0);
-
-    if (res)
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(data->ec)
-    return res == 0;
-}
-
-void request_exit_(pid_type pid_, error_code & ec)
-{
-    enum_windows_data_t data{ec, pid_};
-
-    if (!::EnumWindows(enum_window, reinterpret_cast<LONG_PTR>(&data)))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void interrupt_(pid_type pid_, error_code & ec)
-{
-    if (!::GenerateConsoleCtrlEvent(CTRL_C_EVENT, pid_))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void terminate_(HANDLE handle, error_code & ec, DWORD & exit_status)
-{
-    if (!::TerminateProcess(handle, 260))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void check_running_(HANDLE handle, error_code & ec, DWORD & exit_status)
-{
-    if (!::GetExitCodeProcess(handle, &exit_status))
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-#if !defined(BOOST_PROCESS_V2_DISABLE_UNDOCUMENTED_API)
-void suspend_(HANDLE handle, error_code & ec)
-{
-    auto nt_err = NtSuspendProcess(handle);
-    ULONG dos_err = RtlNtStatusToDosError(nt_err);
-    if (dos_err)
-       BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-
-void resume_(HANDLE handle, error_code & ec)
-{
-    auto nt_err = NtResumeProcess(handle);
-    ULONG dos_err = RtlNtStatusToDosError(nt_err);
-    if (dos_err)
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-}
-#else
-void suspend_(HANDLE, error_code & ec)
-{
-    BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_CALL_NOT_IMPLEMENTED, system_category())
-}
-
-void resume_(HANDLE handle, error_code & ec)
-{
-    BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_CALL_NOT_IMPLEMENTED, system_category())
-}
-#endif
-
-#if !defined(BOOST_PROCESS_V2_HEADER_ONLY)
-template struct basic_process_handle_win<>;
-#endif
-
-}
-
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_DETAIL_IMPL_PROCESS_HANDLE_WINDOWS_IPP
diff --git a/inst/include/boost/process/v2/detail/impl/throw_error.ipp b/inst/include/boost/process/v2/detail/impl/throw_error.ipp
deleted file mode 100644
index 663bb1674..000000000
--- a/inst/include/boost/process/v2/detail/impl/throw_error.ipp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_DETAIL_IMPL_THROW_ERROR_IPP
-#define BOOST_PROCESS_V2_DETAIL_IMPL_THROW_ERROR_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/detail/throw_exception.hpp>
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-namespace detail
-{
-
-void do_throw_error(const error_code& err)
-{
-    system_error e(err);
-    throw_exception(e);
-}
-
-void do_throw_error(const error_code& err, const char* location)
-{
-    system_error e(err, location);
-    throw_exception(e);
-}
-
-}
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_DETAIL_IMPL_THROW_ERROR_IPP
diff --git a/inst/include/boost/process/v2/detail/impl/utf8.ipp b/inst/include/boost/process/v2/detail/impl/utf8.ipp
deleted file mode 100644
index c0e0bf69d..000000000
--- a/inst/include/boost/process/v2/detail/impl/utf8.ipp
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_DETAIL_IMPL_UTF8_HPP
-#define BOOST_PROCESS_V2_DETAIL_IMPL_UTF8_HPP
-
-#include <boost/process/v2/detail/utf8.hpp>
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/error.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <Windows.h>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace detail
-{
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-inline void handle_error(error_code & ec)
-{
-    const auto err = ::GetLastError();
-    switch (err)
-    {
-    case ERROR_INSUFFICIENT_BUFFER:
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::utf8_category)
-        break;
-    case ERROR_NO_UNICODE_TRANSLATION:
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::utf8_category)
-        break;
-    default:
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, err, system_category())
-    }
-}
-
-std::size_t size_as_utf8(const wchar_t * in, std::size_t size, error_code & ec)
-{
-    auto res = WideCharToMultiByte(
-                          CP_UTF8,                // CodePage,
-                          0,                      // dwFlags,
-                          in,                     // lpWideCharStr,
-                          static_cast<int>(size), // cchWideChar,
-                          nullptr,                // lpMultiByteStr,
-                          0,                      // cbMultiByte,
-                          nullptr,                // lpDefaultChar,
-                          FALSE);                 // lpUsedDefaultChar
-    
-    if (res == 0u)
-        handle_error(ec);
-    return static_cast<std::size_t>(res);
-}
-
-std::size_t size_as_wide(const char * in, std::size_t size, error_code & ec)
-{
-    auto res = ::MultiByteToWideChar(
-                          CP_UTF8,                // CodePage
-                          0,                      // dwFlags
-                          in,                     // lpMultiByteStr
-                          static_cast<int>(size), // cbMultiByte
-                          nullptr,                // lpWideCharStr
-                          0);                     // cchWideChar
-    if (res == 0u)
-        handle_error(ec);
-
-    return static_cast<std::size_t>(res);
-}
-
-std::size_t convert_to_utf8(const wchar_t *in, std::size_t size,  char * out, 
-                            std::size_t max_size, error_code & ec)
-{
-    auto res = ::WideCharToMultiByte(
-                    CP_UTF8,                    // CodePage
-                    0,                          // dwFlags
-                    in,                         // lpWideCharStr
-                    static_cast<int>(size),     // cchWideChar
-                    out,                        // lpMultiByteStr
-                    static_cast<int>(max_size), // cbMultiByte
-                    nullptr,                    // lpDefaultChar
-                    FALSE);                     // lpUsedDefaultChar
-    if (res == 0u)
-        handle_error(ec);
-
-    return static_cast<std::size_t>(res);
-}
-
-std::size_t convert_to_wide(const char *in, std::size_t size,  wchar_t * out, 
-                            std::size_t max_size, error_code & ec)
-{
-    auto res = ::MultiByteToWideChar(
-                          CP_UTF8,                     // CodePage
-                          0,                           // dwFlags
-                          in,                          // lpMultiByteStr
-                          static_cast<int>(size),      // cbMultiByte
-                          out,                         // lpWideCharStr
-                          static_cast<int>(max_size)); // cchWideChar
-    if (res == 0u)
-        handle_error(ec);
-
-    return static_cast<std::size_t>(res);
-}
-
-#else
-
-
-template<std::size_t s>
-inline int get_cont_octet_out_count_impl(wchar_t word) {
-    if (word < 0x80) {
-        return 0;
-    }
-    if (word < 0x800) {
-        return 1;
-    }
-    return 2;
-}
-
-template<>
-inline int get_cont_octet_out_count_impl<4>(wchar_t word) {
-    if (word < 0x80) {
-        return 0;
-    }
-    if (word < 0x800) {
-        return 1;
-    }
-
-    // Note that the following code will generate warnings on some platforms
-    // where wchar_t is defined as UCS2.  The warnings are superfluous as the
-    // specialization is never instantiated with such compilers, but this
-    // can cause problems if warnings are being treated as errors, so we guard
-    // against that. Including <boost/detail/utf8_codecvt_facet.hpp> as we do
-    // should be enough to get WCHAR_MAX defined.
-#if !defined(WCHAR_MAX)
-#   error WCHAR_MAX not defined!
-#endif
-    // cope with VC++ 7.1 or earlier having invalid WCHAR_MAX
-#if defined(_MSC_VER) && _MSC_VER <= 1310 // 7.1 or earlier
-    return 2;
-#elif WCHAR_MAX > 0x10000
-
-    if (word < 0x10000) {
-        return 2;
-    }
-    if (word < 0x200000) {
-        return 3;
-    }
-    if (word < 0x4000000) {
-        return 4;
-    }
-    return 5;
-
-#else
-    return 2;
-#endif
-}
-
-inline int get_cont_octet_out_count(wchar_t word)
-{
-    return detail::get_cont_octet_out_count_impl<sizeof(wchar_t)>(word);
-}
-
-// copied from boost/detail/utf8_codecvt_facet.ipp
-// Copyright (c) 2001 Ronald Garcia, Indiana University (garcia@osl.iu.edu)
-// Andrew Lumsdaine, Indiana University (lums@osl.iu.edu).
-
-inline unsigned int get_octet_count(unsigned char lead_octet)
-{
-    // if the 0-bit (MSB) is 0, then 1 character
-    if (lead_octet <= 0x7f) return 1;
-
-    // Otherwise the count number of consecutive 1 bits starting at MSB
-//    assert(0xc0 <= lead_octet && lead_octet <= 0xfd);
-
-    if (0xc0 <= lead_octet && lead_octet <= 0xdf) return 2;
-    else if (0xe0 <= lead_octet && lead_octet <= 0xef) return 3;
-    else if (0xf0 <= lead_octet && lead_octet <= 0xf7) return 4;
-    else if (0xf8 <= lead_octet && lead_octet <= 0xfb) return 5;
-    else return 6;
-}
-
-inline bool invalid_continuing_octet(unsigned char octet_1) {
-    return (octet_1 < 0x80|| 0xbf< octet_1);
-}
-
-inline unsigned int get_cont_octet_count(unsigned char lead_octet)
-{
-    return get_octet_count(lead_octet) - 1;
-}
-
-inline const wchar_t * get_octet1_modifier_table() noexcept
-{
-    static const wchar_t octet1_modifier_table[] = {
-        0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc
-    };
-    return octet1_modifier_table;
-}
-
-
-std::size_t size_as_utf8(const wchar_t * in, std::size_t size, error_code & ec)
-{
-    std::size_t res = 0u;
-    const auto from_end = in + size;
-    for (auto from = in; from != from_end; from++)
-        res += get_cont_octet_out_count(*from) + 1;
-    return res;
-}
-
-std::size_t size_as_wide(const  char   * in, std::size_t size, error_code & ec)
-{
-    const auto from = in;
-    const auto from_end = from + size;
-    const char * from_next = from;
-    for (std::size_t char_count = 0u; from_next < from_end; ++char_count) {
-        unsigned int octet_count = get_octet_count(*from_next);
-        // The buffer may represent incomplete characters, so terminate early if one is found
-        if (octet_count > static_cast<std::size_t>(from_end - from_next))
-            break;
-        from_next += octet_count;
-    }
-
-    return from_next - from;
-}
-
-std::size_t convert_to_utf8(const wchar_t * in, std::size_t size,
-                            char   * out, std::size_t max_size, error_code & ec)
-{
-
-    const wchar_t * from = in;
-    const wchar_t * from_end = from + size;
-    const wchar_t * & from_next = from;
-    char * to = out;
-    char * to_end = out + max_size;
-    char * & to_next = to;
-
-    const wchar_t * const octet1_modifier_table = get_octet1_modifier_table();
-    wchar_t max_wchar = (std::numeric_limits<wchar_t>::max)();
-    while (from != from_end && to != to_end) {
-
-        // Check for invalid UCS-4 character
-        if (*from  > max_wchar) {
-            from_next = from;
-            to_next = to;
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::get_utf8_category())
-            return 0u;
-        }
-
-        int cont_octet_count = get_cont_octet_out_count(*from);
-
-        // RG - comment this formula better
-        int shift_exponent = cont_octet_count * 6;
-
-        // Process the first character
-        *to++ = static_cast<char>(octet1_modifier_table[cont_octet_count] +
-                                  (unsigned char)(*from / (1 << shift_exponent)));
-
-        // Process the continuation characters
-        // Invariants: At the start of the loop:
-        //   1) 'i' continuing octets have been generated
-        //   2) '*to' points to the next location to place an octet
-        //   3) shift_exponent is 6 more than needed for the next octet
-        int i = 0;
-        while (i != cont_octet_count && to != to_end) {
-            shift_exponent -= 6;
-            *to++ = static_cast<char>(0x80 + ((*from / (1 << shift_exponent)) % (1 << 6)));
-            ++i;
-        }
-        // If we filled up the out buffer before encoding the character
-        if (to == to_end && i != cont_octet_count) {
-            from_next = from;
-            to_next = to - (i + 1);
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
-            return 0u;
-        }
-        ++from;
-    }
-    from_next = from;
-    to_next = to;
-
-    // Were we done or did we run out of destination space
-    if (from != from_end)
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
-
-    return to_next - out;
-}
-
-inline bool invalid_leading_octet(unsigned char octet_1) {
-    return (0x7f < octet_1 && octet_1 < 0xc0) ||
-           (octet_1 > 0xfd);
-}
-
-std::size_t convert_to_wide(const  char   * in, std::size_t size,
-                            wchar_t * out, std::size_t max_size, error_code & ec)
-{
-    const char * from = in;
-    const char * from_end = from + size;
-    const char * & from_next = from;
-    wchar_t * to = out;
-    wchar_t * to_end = out + max_size;
-    wchar_t * & to_next = to;
-
-    // Basic algorithm: The first octet determines how many
-    // octets total make up the UCS-4 character. The remaining
-    // "continuing octets" all begin with "10". To convert, subtract
-    // the amount that specifies the number of octets from the first
-    // octet. Subtract 0x80 (1000 0000) from each continuing octet,
-    // then mash the whole lot together. Note that each continuing
-    // octet only uses 6 bits as unique values, so only shift by
-    // multiples of 6 to combine.
-    const wchar_t * const octet1_modifier_table = detail::get_octet1_modifier_table();
-    while (from != from_end && to != to_end) {
-
-        // Error checking on the first octet
-        if (invalid_leading_octet(*from)) {
-            from_next = from;
-            to_next = to;
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::get_utf8_category())
-            return 0u;
-        }
-
-        // The first octet is adjusted by a value dependent upon
-        // the number of "continuing octets" encoding the character
-        const int cont_octet_count = get_cont_octet_count(*from);
-
-        // The unsigned char conversion is necessary in case char is
-        // signed (I learned this the hard way)
-        wchar_t ucs_result =
-                (unsigned char)(*from++) - octet1_modifier_table[cont_octet_count];
-
-        // Invariants:
-        //   1) At the start of the loop, 'i' continuing characters have been
-        //      processed
-        //   2) *from points to the next continuing character to be processed.
-        int i = 0;
-        while (i != cont_octet_count && from != from_end) {
-
-            // Error checking on continuing characters
-            if (invalid_continuing_octet(*from)) {
-                from_next = from;
-                to_next = to;
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::get_utf8_category())
-                return 0u;
-            }
-
-            ucs_result *= (1 << 6);
-
-            // each continuing character has an extra (10xxxxxx)b attached to
-            // it that must be removed.
-            ucs_result += (unsigned char)(*from++) - 0x80;
-            ++i;
-        }
-
-        // If the buffer ends with an incomplete unicode character...
-        if (from == from_end && i != cont_octet_count) {
-            // rewind "from" to before the current character translation
-            from_next = from - (i + 1);
-            to_next = to;
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
-            return 0u;
-        }
-        *to++ = ucs_result;
-    }
-    from_next = from;
-    to_next = to;
-
-    if (from != from_end)
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
-
-    return to_next - out;
-}
-
-#endif
-
-}
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_DETAIL_IMPL_UTF8_HPP
diff --git a/inst/include/boost/process/v2/detail/last_error.hpp b/inst/include/boost/process/v2/detail/last_error.hpp
index 6b2d70f66..bf92a4411 100644
--- a/inst/include/boost/process/v2/detail/last_error.hpp
+++ b/inst/include/boost/process/v2/detail/last_error.hpp
@@ -18,11 +18,5 @@ BOOST_PROCESS_V2_DECL error_code get_last_error();
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/detail/impl/last_error.ipp>
-
-#endif
-
 
 #endif //BOOST_PROCESS_V2_DETAIL_LAST_ERROR_HPP
diff --git a/inst/include/boost/process/v2/detail/process_handle_fd.hpp b/inst/include/boost/process/v2/detail/process_handle_fd.hpp
index d3b198dde..9a0363355 100644
--- a/inst/include/boost/process/v2/detail/process_handle_fd.hpp
+++ b/inst/include/boost/process/v2/detail/process_handle_fd.hpp
@@ -34,7 +34,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
 namespace detail
 {
 
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_process_handle_fd
 {
     using native_handle_type = int;
@@ -56,7 +56,7 @@ struct basic_process_handle_fd
     basic_process_handle_fd(ExecutionContext &context,
                             typename std::enable_if<
                                 std::is_convertible<ExecutionContext &,
-                                    BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context &>::value>::type * = nullptr)
+                                    net::execution_context &>::value>::type * = nullptr)
             : pid_(-1), descriptor_(context)
     {
     }
@@ -226,6 +226,8 @@ struct basic_process_handle_fd
             return;
         if (::kill(pid_, SIGKILL) == -1)
             ec = get_last_error();
+        else
+            wait(exit_status, ec);
     }
 
     void terminate(native_exit_code_type &exit_status)
@@ -248,16 +250,12 @@ struct basic_process_handle_fd
             ec = get_last_error();
         else if (res == 0)
             return true;
-        else
-            ec.clear();
-
-        if (res == 0)
-            return true;
         else
         {
+            ec.clear();
             exit_code = code;
-            return false;
         }
+      return false;
     }
 
     bool running(native_exit_code_type &exit_code)
@@ -277,35 +275,27 @@ struct basic_process_handle_fd
         return pid_ != -1;
     }
 
-    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, native_exit_code_type))
-    WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, native_exit_code_type))
-    async_wait(WaitHandler &&handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    {
-        return BOOST_PROCESS_V2_ASIO_NAMESPACE::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
-                async_wait_op_{descriptor_, pid_}, handler, descriptor_);
-    }
-
   private:
     template<typename>
     friend
     struct basic_process_handle_fd;
     pid_type pid_ = -1;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::basic_stream_descriptor<Executor> descriptor_;
+    net::posix::basic_stream_descriptor<Executor> descriptor_;
 
     struct async_wait_op_
     {
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::basic_descriptor<Executor> &descriptor;
+        net::posix::basic_descriptor<Executor> &descriptor;
         pid_type pid_;
 
         template<typename Self>
         void operator()(Self &&self)
         {
+            self.reset_cancellation_state(asio::enable_total_cancellation());
             error_code ec;
             native_exit_code_type exit_code{};
             int wait_res = -1;
             if (pid_ <= 0) // error, complete early
-                ec = BOOST_PROCESS_V2_ASIO_NAMESPACE::error::bad_descriptor;
+                ec = net::error::bad_descriptor;
             else 
             {
                 wait_res = ::waitpid(pid_, &exit_code, WNOHANG);
@@ -316,8 +306,7 @@ struct basic_process_handle_fd
 
             if (!ec && (wait_res == 0))
             {
-                descriptor.async_wait(
-                        BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::descriptor_base::wait_read, std::move(self));
+                descriptor.async_wait(net::posix::descriptor_base::wait_read, std::move(self));
                 return;
             }
 
@@ -332,8 +321,7 @@ struct basic_process_handle_fd
                     self.complete(ec, code);
                 }
             };
-            BOOST_PROCESS_V2_ASIO_NAMESPACE::post(descriptor.get_executor(),
-                                                  completer{ec, exit_code, std::move(self)});
+            net::post(descriptor.get_executor(), completer{ec, exit_code, std::move(self)});
 
         }
 
@@ -347,6 +335,18 @@ struct basic_process_handle_fd
             std::move(self).complete(ec, exit_code);
         }
     };
+ public:
+
+    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, native_exit_code_type))
+    WaitHandler = net::default_completion_token_t<executor_type>>
+    auto async_wait(WaitHandler &&handler = net::default_completion_token_t<executor_type>())
+    -> decltype(net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+        async_wait_op_{descriptor_, pid_}, handler, descriptor_))
+    {
+      return net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+          async_wait_op_{descriptor_, pid_}, handler, descriptor_);
+    }
+
 };
 }
 
diff --git a/inst/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp b/inst/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp
index dfbee11f0..5c2416765 100644
--- a/inst/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp
+++ b/inst/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp
@@ -37,7 +37,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
 namespace detail
 {
 
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_process_handle_fd_or_signal
 {
     using native_handle_type = int;
@@ -59,7 +59,7 @@ struct basic_process_handle_fd_or_signal
     basic_process_handle_fd_or_signal(ExecutionContext &context,
                                 typename std::enable_if<
                                         std::is_convertible<ExecutionContext &,
-                                                BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context &>::value
+                                                net::execution_context &>::value
                                 >::type * = nullptr)
             : pid_(-1), descriptor_(context)
     {
@@ -70,7 +70,7 @@ struct basic_process_handle_fd_or_signal
                                       pid_type pid,
                                       typename std::enable_if<
                                           std::is_convertible<ExecutionContext &,
-                                              BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context &>::value
+                                              net::execution_context &>::value
                                           >::type * = nullptr)
             : pid_(pid), descriptor_(context)
     {
@@ -81,7 +81,7 @@ struct basic_process_handle_fd_or_signal
                                       pid_type pid, native_handle_type process_handle,
                                       typename std::enable_if<
                                           std::is_convertible<ExecutionContext &,
-                                              BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context &>::value
+                                              net::execution_context &>::value
                                           >::type * = nullptr)
             : pid_(pid), descriptor_(context, process_handle)
     {
@@ -255,6 +255,8 @@ struct basic_process_handle_fd_or_signal
             return;
         if (::kill(pid_, SIGKILL) == -1)
             ec = get_last_error();
+        else
+            wait(exit_status, ec);
     }
 
     void terminate(native_exit_code_type &exit_status)
@@ -281,10 +283,9 @@ struct basic_process_handle_fd_or_signal
         if (process_is_running(res))
             return true;
         else
-        {
             exit_code = code;
-            return false;
-        }
+
+        return false;
     }
 
     bool running(native_exit_code_type &exit_code)
@@ -304,37 +305,35 @@ struct basic_process_handle_fd_or_signal
         return pid_ != -1;
     }
 
-    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, int))
-    WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, native_exit_code_type))
-    async_wait(WaitHandler &&handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    {
-        return BOOST_PROCESS_V2_ASIO_NAMESPACE::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
-                async_wait_op_{descriptor_, signal_set_, pid_}, handler, descriptor_);
-    }
-
   private:
     template<typename>
     friend
     struct basic_process_handle_fd_or_signal;
     pid_type pid_ = -1;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::basic_stream_descriptor<Executor> descriptor_;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_signal_set<Executor> signal_set_{descriptor_.get_executor(), SIGCHLD};
+    net::posix::basic_stream_descriptor<Executor> descriptor_;
+    net::basic_signal_set<Executor> signal_set_{descriptor_.get_executor(), SIGCHLD};
 
     struct async_wait_op_
     {
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::basic_descriptor<Executor> &descriptor;
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_signal_set<Executor> &handle;
+        net::posix::basic_descriptor<Executor> &descriptor;
+        net::basic_signal_set<Executor> &handle;
         pid_type pid_;
         bool needs_post = true;
 
         template<typename Self>
-        void operator()(Self &&self, error_code ec = {}, int = 0)
+        void operator()(Self && self)
+        {
+          self.reset_cancellation_state(asio::enable_total_cancellation());
+          (*this)(std::move(self), error_code{});
+        }
+
+        template<typename Self>
+        void operator()(Self &&self, error_code ec, int = 0)
         {
             native_exit_code_type exit_code{};
             int wait_res = -1;
             if (pid_ <= 0) // error, complete early
-                ec = BOOST_PROCESS_V2_ASIO_NAMESPACE::error::bad_descriptor;
+                ec = net::error::bad_descriptor;
             else 
             {
                 wait_res = ::waitpid(pid_, &exit_code, WNOHANG);
@@ -347,7 +346,7 @@ struct basic_process_handle_fd_or_signal
                 needs_post = false;
                 if (descriptor.is_open())
                     descriptor.async_wait(
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::descriptor_base::wait_read, 
+                            net::posix::descriptor_base::wait_read,
                             std::move(self));
                 else
                     handle.async_wait(std::move(self));
@@ -369,12 +368,22 @@ struct basic_process_handle_fd_or_signal
             const auto exec = self.get_executor();
             completer cpl{ec, exit_code, std::move(self)};
             if (needs_post)
-                BOOST_PROCESS_V2_ASIO_NAMESPACE::post(exec, std::move(cpl));
+                net::post(exec, std::move(cpl));
             else
-                BOOST_PROCESS_V2_ASIO_NAMESPACE::dispatch(exec, std::move(cpl));
+                net::dispatch(exec, std::move(cpl));
 
         }
     };
+ public:
+    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, int))
+             WaitHandler = net::default_completion_token_t<executor_type>>
+    auto async_wait(WaitHandler &&handler = net::default_completion_token_t<executor_type>())
+      -> decltype(net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+                  async_wait_op_{descriptor_, signal_set_, pid_}, handler, descriptor_))
+    {
+        return net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+                async_wait_op_{descriptor_, signal_set_, pid_}, handler, descriptor_);
+    }
 };
 }
 
diff --git a/inst/include/boost/process/v2/detail/process_handle_signal.hpp b/inst/include/boost/process/v2/detail/process_handle_signal.hpp
index 1ebd5a59b..6cf5ec893 100644
--- a/inst/include/boost/process/v2/detail/process_handle_signal.hpp
+++ b/inst/include/boost/process/v2/detail/process_handle_signal.hpp
@@ -34,7 +34,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
 namespace detail
 {
 
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_process_handle_signal
 {
     struct native_handle_type
@@ -61,7 +61,7 @@ struct basic_process_handle_signal
     basic_process_handle_signal(ExecutionContext &context,
                          typename std::enable_if<
                                  std::is_convertible<ExecutionContext &,
-                                         BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context &>::value
+                                         net::execution_context &>::value
                          >::type * = nullptr)
             : pid_(-1), signal_set_(context, SIGCHLD)
     {
@@ -87,7 +87,7 @@ struct basic_process_handle_signal
     {
         pid_ = handle.id();
         signal_set_.~basic_signal_set();
-        using ss = BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_signal_set<Executor>;
+        using ss = net::basic_signal_set<Executor>;
         new (&signal_set_) ss(handle.get_executor(), SIGCHLD);
         handle.pid_ = -1;
         return *this;
@@ -148,7 +148,7 @@ struct basic_process_handle_signal
     {
         if (pid_ <= 0)
             return;
-        if (::kill(pid_, SIGTERM) == -1)
+        if (::kill(pid_, SIGINT) == -1)
             ec = get_last_error();
     }
 
@@ -194,7 +194,7 @@ struct basic_process_handle_signal
     {
         if (pid_ <= 0)
             return;
-        if (::kill(pid_, SIGCONT) == -1)
+        if (::kill(pid_, SIGSTOP) == -1)
             ec = get_last_error();
     }
 
@@ -212,7 +212,7 @@ struct basic_process_handle_signal
     {
         if (pid_ <= 0)
             return;
-        if (::kill(pid_, SIGTERM) == -1)
+        if (::kill(pid_, SIGCONT) == -1)
             ec = get_last_error();
     }
 
@@ -222,6 +222,8 @@ struct basic_process_handle_signal
             return;
         if (::kill(pid_, SIGKILL) == -1)
             ec = get_last_error();
+        else
+            wait(exit_status, ec);
     }
 
     void terminate(native_exit_code_type &exit_status)
@@ -246,10 +248,8 @@ struct basic_process_handle_signal
         if (res == 0)
             return true;
         else
-        {
             exit_code = code;
-            return false;
-        }
+        return false;
     }
 
     bool running(native_exit_code_type &exit_code)
@@ -269,29 +269,21 @@ struct basic_process_handle_signal
         return pid_ != -1;
     }
 
-    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, int))
-    WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, native_exit_code_type))
-    async_wait(WaitHandler &&handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    {
-        return BOOST_PROCESS_V2_ASIO_NAMESPACE::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
-                async_wait_op_{signal_set_, pid_}, handler, signal_set_);
-    }
-
   private:
     template<typename>
     friend struct basic_process_handle_signal;
     pid_type pid_ = -1;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_signal_set<Executor> signal_set_;
+    net::basic_signal_set<Executor> signal_set_;
 
     struct async_wait_op_
     {
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_signal_set<Executor> &handle;
+        net::basic_signal_set<Executor> &handle;
         pid_type pid_;
         
         template<typename Self>
         void operator()(Self &&self)
         {
+            self.reset_cancellation_state(asio::enable_total_cancellation());
             handle.async_wait(std::move(self));
             handle.cancel();
             // we cancel so we end up on the signal-sets executor 
@@ -300,16 +292,16 @@ struct basic_process_handle_signal
         template<typename Self>
         void operator()(Self &&self, error_code ec, int sig)
         {
-            if (ec == BOOST_PROCESS_V2_ASIO_NAMESPACE::error::operation_aborted && 
+            if (ec == net::error::operation_aborted &&
                 self.get_cancellation_state().cancelled() 
-                    == BOOST_PROCESS_V2_ASIO_NAMESPACE::cancellation_type::none)
+                    == net::cancellation_type::none)
                 ec.clear();
 
             native_exit_code_type exit_code = -1;
             int wait_res = -1;
 
             if (pid_ <= 0) // error, complete early
-                ec = BOOST_PROCESS_V2_ASIO_NAMESPACE::error::bad_descriptor;
+                ec = net::error::bad_descriptor;
             else if (!ec)
             {
                 wait_res = ::waitpid(pid_, &exit_code, WNOHANG);
@@ -336,9 +328,19 @@ struct basic_process_handle_signal
             };
 
             const auto exec = self.get_executor();
-            BOOST_PROCESS_V2_ASIO_NAMESPACE::dispatch(exec, completer{ec, exit_code, std::move(self)});
+            net::dispatch(exec, completer{ec, exit_code, std::move(self)});
         }
     };
+ public:
+    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, int))
+             WaitHandler = net::default_completion_token_t<executor_type>>
+    auto async_wait(WaitHandler &&handler = net::default_completion_token_t<executor_type>())
+      -> decltype(net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+                    async_wait_op_{signal_set_, pid_}, handler, signal_set_))
+    {
+        return net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+                async_wait_op_{signal_set_, pid_}, handler, signal_set_);
+    }
 };
 
 }
diff --git a/inst/include/boost/process/v2/detail/process_handle_windows.hpp b/inst/include/boost/process/v2/detail/process_handle_windows.hpp
index bf78bae52..20330e985 100644
--- a/inst/include/boost/process/v2/detail/process_handle_windows.hpp
+++ b/inst/include/boost/process/v2/detail/process_handle_windows.hpp
@@ -38,10 +38,10 @@ BOOST_PROCESS_V2_DECL void terminate_(void * handle, error_code & ec, native_exi
 BOOST_PROCESS_V2_DECL void request_exit_(pid_type pid_, error_code & ec);
 BOOST_PROCESS_V2_DECL void check_running_(void* handle, error_code & ec, native_exit_code_type & exit_status);
 
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_process_handle_win
 {
-    typedef BOOST_PROCESS_V2_ASIO_NAMESPACE::windows::basic_object_handle<Executor> handle_type;
+    typedef net::windows::basic_object_handle<Executor> handle_type;
     typedef typename handle_type::native_handle_type native_handle_type;
 
     typedef Executor executor_type;
@@ -61,7 +61,7 @@ struct basic_process_handle_win
     basic_process_handle_win(ExecutionContext &context,
                          typename std::enable_if<
                                  std::is_convertible<ExecutionContext &,
-                                         BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context &>::value
+                                         net::execution_context &>::value
                          >::type = 0)
             : pid_(0), handle_(context)
     {
@@ -84,22 +84,32 @@ struct basic_process_handle_win
 
 
     template<typename Executor1>
-    basic_process_handle_win(basic_process_handle_win<Executor1> && handle)
-            : pid_(handle.pid_), handle_(std::move(handle.handle_))
+    basic_process_handle_win(basic_process_handle_win<Executor1> && other)
+            : pid_(other.pid_), handle_(std::move(other.handle_))
     {
+      other.pid_ = static_cast<DWORD>(-1);
     }
 
-    basic_process_handle_win(basic_process_handle_win && handle) 
-        :  pid_(handle.id()), handle_(std::move(handle.handle_))
+    basic_process_handle_win(basic_process_handle_win && other)
+        :  pid_(other.pid_), handle_(std::move(other.handle_))
     {
-        handle.pid_ = static_cast<DWORD>(-1);
+      other.pid_ = static_cast<DWORD>(-1);
     }
 
-    basic_process_handle_win& operator=(basic_process_handle_win && handle)
+    basic_process_handle_win& operator=(basic_process_handle_win && other)
     {
-        pid_ = handle.pid_;
-        handle_ = std::move(handle.handle_);
-        handle.pid_ = static_cast<DWORD>(-1);
+        pid_ = other.pid_;
+        handle_ = std::move(other.handle_);
+        other.pid_ = static_cast<DWORD>(-1);
+        return *this;
+    }
+
+    template<typename Executor1>
+    basic_process_handle_win& operator=(basic_process_handle_win<Executor1> && other)
+    {
+        pid_ = other.pid_;
+        handle_ = std::move(other.handle_);
+        other.pid_ = static_cast<DWORD>(-1);
         return *this;
     }
 
@@ -199,7 +209,7 @@ struct basic_process_handle_win
     void resume()
     {
         error_code ec;
-        suspend(ec);
+        resume(ec);
         if (ec)
             detail::throw_error(ec, "resume");
     }
@@ -237,10 +247,9 @@ struct basic_process_handle_win
         if (process_is_running(code))
             return true;
         else
-        {
             exit_code = code;
-            return false;
-        }
+
+        return false;
     }
 
     bool running(native_exit_code_type &exit_code)
@@ -257,15 +266,6 @@ struct basic_process_handle_win
         return handle_.is_open();
     }
 
-    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, native_exit_code_type))
-    WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, native_exit_code_type))
-    async_wait(WaitHandler &&handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    {
-        return BOOST_PROCESS_V2_ASIO_NAMESPACE::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
-                async_wait_op_{handle_}, handler, handle_
-        );
-    }
     template<typename>
     friend struct basic_process_handle_win;
   private:
@@ -279,6 +279,17 @@ struct basic_process_handle_win
         template<typename Self>
         void operator()(Self &&self)
         {
+
+            self.reset_cancellation_state(asio::enable_total_cancellation());
+            auto sl = self.get_cancellation_state().slot();
+            auto & h = handle;
+            if (sl.is_connected())
+                sl.assign(
+                    [&h](asio::cancellation_type ct)
+                    {
+                      boost::system::error_code ec;
+                      h.cancel(ec);
+                    });
             handle.async_wait(std::move(self));
         }
 
@@ -286,16 +297,28 @@ struct basic_process_handle_win
         void operator()(Self &&self, error_code ec)
         {
             native_exit_code_type exit_code{};
+            if (ec == asio::error::operation_aborted && !self.get_cancellation_state().cancelled())
+              return handle.async_wait(std::move(self));
+
             if (!ec)
                 detail::get_exit_code_(handle.native_handle(), exit_code, ec);
             std::move(self).complete(ec, exit_code);
         }
     };
+ public:
+    template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, native_exit_code_type))
+             WaitHandler = net::default_completion_token_t<executor_type>>
+    auto async_wait(WaitHandler &&handler = net::default_completion_token_t<executor_type>())
+        -> decltype(net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+                    async_wait_op_{handle_}, handler, handle_))
+    {
+        return net::async_compose<WaitHandler, void(error_code, native_exit_code_type)>(
+                async_wait_op_{handle_}, handler, handle_
+        );
+    }
 };
 
-#if !defined(BOOST_PROCESS_V2_HEADER_ONLY)
 extern template struct basic_process_handle_win<>;
-#endif
 
 }
 
diff --git a/inst/include/boost/process/v2/detail/throw_error.hpp b/inst/include/boost/process/v2/detail/throw_error.hpp
index 4ddb682ce..3409ff611 100644
--- a/inst/include/boost/process/v2/detail/throw_error.hpp
+++ b/inst/include/boost/process/v2/detail/throw_error.hpp
@@ -29,10 +29,5 @@ inline void throw_error(const error_code& err, const char* location)
 }
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/detail/impl/throw_error.ipp>
-
-#endif
 
 #endif //BOOST_PROCESS_V2_DETAIL_THROW_ERROR_HPP
diff --git a/inst/include/boost/process/v2/detail/utf8.hpp b/inst/include/boost/process/v2/detail/utf8.hpp
index edceeb056..a31cdff4d 100644
--- a/inst/include/boost/process/v2/detail/utf8.hpp
+++ b/inst/include/boost/process/v2/detail/utf8.hpp
@@ -23,8 +23,7 @@ BOOST_PROCESS_V2_DECL std::size_t convert_to_wide(const  char   * in, std::size_
 
 template<typename CharOut, typename Traits = std::char_traits<CharOut>, 
          typename Allocator = std::allocator<CharOut>, typename CharIn,
-         typename = typename std::enable_if<std::is_same<CharOut, CharIn>::value>::type>
-BOOST_PROCESS_V2_DECL 
+         typename = typename std::enable_if<std::is_same<CharOut, CharIn>::value>::type> 
 std::basic_string<CharOut, Traits, Allocator> conv_string(
     const CharIn * data, std::size_t size, 
     const Allocator allocator = Allocator{})
@@ -35,8 +34,7 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(
 
 template<typename CharOut, typename Traits = std::char_traits<CharOut>, 
          typename Allocator = std::allocator<CharOut>,
-         typename = typename std::enable_if<std::is_same<CharOut, char>::value>::type>
-BOOST_PROCESS_V2_DECL 
+         typename = typename std::enable_if<std::is_same<CharOut, char>::value>::type> 
 std::basic_string<CharOut, Traits, Allocator> conv_string(
     const wchar_t * data, std::size_t size, 
     const Allocator allocator = Allocator{})
@@ -59,8 +57,7 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(
 
 template<typename CharOut, typename Traits = std::char_traits<CharOut>, 
          typename Allocator = std::allocator<CharOut>,
-         typename = typename std::enable_if<std::is_same<CharOut, wchar_t>::value>::type>
-BOOST_PROCESS_V2_DECL 
+         typename = typename std::enable_if<std::is_same<CharOut, wchar_t>::value>::type> 
 std::basic_string<CharOut, Traits, Allocator> conv_string(
     const char * data, std::size_t size, 
     const Allocator allocator = Allocator{})
@@ -85,11 +82,5 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/detail/impl/utf8.ipp>
-
-#endif
-
 
 #endif //BOOST_PROCESS_V2_DETAIL_UTF8_HPP
diff --git a/inst/include/boost/process/v2/environment.hpp b/inst/include/boost/process/v2/environment.hpp
index 0a7006577..dec87ac10 100644
--- a/inst/include/boost/process/v2/environment.hpp
+++ b/inst/include/boost/process/v2/environment.hpp
@@ -13,10 +13,13 @@
 #include <boost/process/v2/detail/config.hpp>
 #include <boost/process/v2/cstring_ref.hpp>
 #include <boost/process/v2/detail/utf8.hpp>
+
 #include <boost/type_traits.hpp>
+
 #include <functional>
 #include <memory>
 #include <numeric>
+#include <vector>
 
 #if !defined(GENERATING_DOCUMENTATION)
 #if defined(BOOST_PROCESS_V2_WINDOWS)
@@ -761,7 +764,7 @@ struct value
     value& operator=( const Source& source )
     {
         value_ = BOOST_PROCESS_V2_NAMESPACE::detail::conv_string<char_type, traits_type>(
-            source.data(), source.size);
+            source.data(), source.size());
         return *this;
     }
 
@@ -1885,12 +1888,4 @@ struct hash<BOOST_PROCESS_V2_NAMESPACE::environment::key_value_pair>
 }
 
 
-
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/impl/environment.ipp>
-#include <boost/process/v2/detail/impl/environment.ipp>
-
-#endif
-
 #endif //BOOST_PROCESS_V2_ENVIRONMENT_HPP
diff --git a/inst/include/boost/process/v2/error.hpp b/inst/include/boost/process/v2/error.hpp
index 621f032d3..f80f7d989 100644
--- a/inst/include/boost/process/v2/error.hpp
+++ b/inst/include/boost/process/v2/error.hpp
@@ -41,10 +41,4 @@ static const error_category& exit_code_category = get_exit_code_category();
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/impl/error.ipp>
-
-#endif
-
 #endif //BOOST_PROCESS_V2_ERROR_HPP
diff --git a/inst/include/boost/process/v2/execute.hpp b/inst/include/boost/process/v2/execute.hpp
index 18c46172b..2ce2c1af5 100644
--- a/inst/include/boost/process/v2/execute.hpp
+++ b/inst/include/boost/process/v2/execute.hpp
@@ -47,7 +47,7 @@ struct execute_op
 
     struct cancel
     {
-        using cancellation_type = BOOST_PROCESS_V2_ASIO_NAMESPACE::cancellation_type;
+        using cancellation_type = net::cancellation_type;
         basic_process<Executor> * proc;
         cancel(basic_process<Executor> * proc) : proc(proc) {}
 
@@ -66,15 +66,15 @@ struct execute_op
     template<typename Self>
     void operator()(Self && self)
     {
-        self.reset_cancellation_state(BOOST_PROCESS_V2_ASIO_NAMESPACE::enable_total_cancellation());
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::cancellation_slot s = self.get_cancellation_state().slot();
+        self.reset_cancellation_state(net::enable_total_cancellation());
+        net::cancellation_slot s = self.get_cancellation_state().slot();
         if (s.is_connected())
             s.emplace<cancel>(proc.get());
 
         auto pro_ = proc.get();
         pro_->async_wait(
-                BOOST_PROCESS_V2_ASIO_NAMESPACE::bind_cancellation_slot(
-                    BOOST_PROCESS_V2_ASIO_NAMESPACE::cancellation_slot(),
+                net::bind_cancellation_slot(
+                    net::cancellation_slot(),
                     std::move(self)));
     }
 
@@ -101,17 +101,18 @@ struct execute_op
  * It is to note that `async_execute` will us the lowest selected cancellation
  * type. A subprocess might ignore anything not terminal.
  */
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor,
+template<typename Executor = net::any_io_executor,
         BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void (error_code, int))
-            WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(Executor)>
+            WaitHandler = net::default_completion_token_t<Executor>>
 inline
-BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, int))
-async_execute(basic_process<Executor> proc,
-                         WaitHandler && handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(Executor))
+auto async_execute(basic_process<Executor> proc,
+                         WaitHandler && handler = net::default_completion_token_t<Executor>())
+   -> decltype(net::async_compose<WaitHandler, void(error_code, int)>(
+                  detail::execute_op<Executor>{nullptr}, handler, std::declval<Executor>()))
 {
     std::unique_ptr<basic_process<Executor>> pro_(new basic_process<Executor>(std::move(proc)));
-    auto exec = proc.get_executor();
-    return BOOST_PROCESS_V2_ASIO_NAMESPACE::async_compose<WaitHandler, void(error_code, int)>(
+    auto exec = pro_->get_executor();
+    return net::async_compose<WaitHandler, void(error_code, int)>(
             detail::execute_op<Executor>{std::move(pro_)}, handler, exec);
 }
 
diff --git a/inst/include/boost/process/v2/exit_code.hpp b/inst/include/boost/process/v2/exit_code.hpp
index 3ee580063..485b3d674 100644
--- a/inst/include/boost/process/v2/exit_code.hpp
+++ b/inst/include/boost/process/v2/exit_code.hpp
@@ -72,7 +72,11 @@ typedef int native_exit_code_type;
 
 namespace detail
 {
-constexpr native_exit_code_type still_active = 0x7f;
+constexpr native_exit_code_type still_active = 0x17f;
+static_assert(WIFSTOPPED(still_active), "Expected still_active to indicate WIFSTOPPED");
+static_assert(!WIFEXITED(still_active), "Expected still_active to not indicate WIFEXITED");
+static_assert(!WIFSIGNALED(still_active), "Expected still_active to not indicate WIFSIGNALED");
+static_assert(!WIFCONTINUED(still_active), "Expected still_active to not indicate WIFCONTINUED");
 }
 
 inline bool process_is_running(int code)
diff --git a/inst/include/boost/process/v2/ext/cmd.hpp b/inst/include/boost/process/v2/ext/cmd.hpp
index 0e5b3427a..b429465bf 100644
--- a/inst/include/boost/process/v2/ext/cmd.hpp
+++ b/inst/include/boost/process/v2/ext/cmd.hpp
@@ -8,6 +8,7 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 
 #include <boost/process/v2/detail/config.hpp>
 #include <boost/process/v2/detail/throw_error.hpp>
@@ -36,7 +37,7 @@ BOOST_PROCESS_V2_DECL shell cmd(HANDLE handle);
 #endif
 
 template<typename Executor>
-BOOST_PROCESS_V2_DECL shell cmd(basic_process_handle<Executor> & handle, error_code & ec)
+inline shell cmd(basic_process_handle<Executor> & handle, error_code & ec)
 {
 #if defined(BOOST_PROCESS_V2_WINDOWS)
     return cmd(handle.native_handle(), ec);
@@ -46,7 +47,7 @@ BOOST_PROCESS_V2_DECL shell cmd(basic_process_handle<Executor> & handle, error_c
 }
 
 template<typename Executor>
-BOOST_PROCESS_V2_DECL shell cmd(basic_process_handle<Executor> & handle)
+inline shell cmd(basic_process_handle<Executor> & handle)
 {
 #if defined(BOOST_PROCESS_V2_WINDOWS)
     return cmd(handle.native_handle());
@@ -61,11 +62,5 @@ BOOST_PROCESS_V2_DECL shell cmd(basic_process_handle<Executor> & handle)
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/ext/impl/cmd.ipp>
-
-#endif
-
 
 #endif // BOOST_PROCESS_V2_CMD_HPP
diff --git a/inst/include/boost/process/v2/ext/cwd.hpp b/inst/include/boost/process/v2/ext/cwd.hpp
index e255d3dd5..07e76cf30 100644
--- a/inst/include/boost/process/v2/ext/cwd.hpp
+++ b/inst/include/boost/process/v2/ext/cwd.hpp
@@ -7,9 +7,10 @@
 #define BOOST_PROCESS_V2_CWD_HPP
 
 #include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
 
+#include <boost/process/v2/detail/throw_error.hpp>
 #include <boost/process/v2/pid.hpp>
+#include <boost/process/v2/process_handle.hpp>
 
 BOOST_PROCESS_V2_BEGIN_NAMESPACE
 
@@ -26,7 +27,7 @@ BOOST_PROCESS_V2_DECL filesystem::path cwd(pid_type pid, error_code & ec);
 BOOST_PROCESS_V2_DECL filesystem::path cwd(pid_type pid);
 
 template<typename Executor>
-BOOST_PROCESS_V2_DECL filesystem::path cwd(basic_process_handle<Executor> & handle, error_code & ec)
+inline filesystem::path cwd(basic_process_handle<Executor> & handle, error_code & ec)
 {
 #if defined(BOOST_PROCESS_V2_WINDOWS)
     return cwd(handle.native_handle(), ec);
@@ -36,7 +37,7 @@ BOOST_PROCESS_V2_DECL filesystem::path cwd(basic_process_handle<Executor> & hand
 }
 
 template<typename Executor>
-BOOST_PROCESS_V2_DECL filesystem::path cwd(basic_process_handle<Executor> & handle)
+inline filesystem::path cwd(basic_process_handle<Executor> & handle)
 {
 #if defined(BOOST_PROCESS_V2_WINDOWS)
     return cwd(handle.native_handle());
@@ -51,8 +52,4 @@ BOOST_PROCESS_V2_DECL filesystem::path cwd(basic_process_handle<Executor> & hand
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-#include <boost/process/v2/ext/impl/cwd.ipp>
-#endif
-
 #endif // BOOST_PROCESS_V2_CWD_HPP
diff --git a/inst/include/boost/process/v2/ext/detail/impl/proc_info.ipp b/inst/include/boost/process/v2/ext/detail/impl/proc_info.ipp
deleted file mode 100644
index 4de38dad6..000000000
--- a/inst/include/boost/process/v2/ext/detail/impl/proc_info.ipp
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-// Copyright (c) 2022 Samuel Venable
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_DETAIL_PROC_INFO_IPP
-#define BOOST_PROCESS_V2_IMPL_DETAIL_PROC_INFO_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/ext/detail/proc_info.hpp>
-
-#include <string>
-
-#if (defined(__APPLE__) && defined(__MACH__))
-#include <cstdlib>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/proc_info.h>
-#include <libproc.h>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace detail
-{
-
-namespace ext
-{
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-// type of process memory to read?
-enum MEMTYP {MEMCMD, MEMCWD};
-std::wstring cwd_cmd_from_proc(HANDLE proc, int type, boost::system::error_code & ec)
-{
-    std::wstring buffer;
-    PEB peb;
-    SIZE_T nRead = 0; 
-    ULONG len = 0;
-    PROCESS_BASIC_INFORMATION pbi;
-    RTL_USER_PROCESS_PARAMETERS_EXTENDED upp;
-
-    NTSTATUS status = 0;
-    PVOID buf = nullptr;
-    status = NtQueryInformationProcess(proc, ProcessBasicInformation, &pbi, sizeof(pbi), &len);
-    ULONG error = RtlNtStatusToDosError(status);
-
-    if (error)
-    {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error, boost::system::system_category())
-        return {};
-    }
-
-    if (!ReadProcessMemory(proc, pbi.PebBaseAddress, &peb, sizeof(peb), &nRead))
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    if (!ReadProcessMemory(proc, peb.ProcessParameters, &upp, sizeof(upp), &nRead))
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    if (type == MEMCWD)
-    {
-        buf = upp.CurrentDirectory.DosPath.Buffer;
-        len = upp.CurrentDirectory.DosPath.Length;
-    }
-    else if (type == MEMCMD)
-    {
-        buf = upp.CommandLine.Buffer;
-        len = upp.CommandLine.Length;
-    }
-
-    buffer.resize(len / 2 + 1);
-
-    if (!ReadProcessMemory(proc, buf, &buffer[0], len, &nRead))
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    buffer.pop_back();
-    return buffer;
-}
-
-// with debug_privilege enabled allows reading info from more processes
-// this includes stuff such as exe path, cwd path, cmdline, and environ
-HANDLE open_process_with_debug_privilege(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    HANDLE proc = nullptr;
-    HANDLE hToken = nullptr;
-    LUID luid;
-    TOKEN_PRIVILEGES tkp;
-    if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
-    {
-        if (LookupPrivilegeValue(nullptr, SE_DEBUG_NAME, &luid))
-        {
-            tkp.PrivilegeCount = 1;
-            tkp.Privileges[0].Luid = luid;
-            tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-            if (AdjustTokenPrivileges(hToken, false, &tkp, sizeof(tkp), nullptr, nullptr))
-            {
-                proc = OpenProcess(PROCESS_ALL_ACCESS, false, pid);
-            }
-        }
-        CloseHandle(hToken);
-    }
-    if (!proc)
-        proc = OpenProcess(PROCESS_ALL_ACCESS, false, pid);
-    if (!proc)
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return proc;
-}
-#endif
-
-} // namespace ext
-
-} // namespace detail
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif // BOOST_PROCESS_V2_IMPL_DETAIL_PROC_INFO_IPP
-
diff --git a/inst/include/boost/process/v2/ext/detail/proc_info.hpp b/inst/include/boost/process/v2/ext/detail/proc_info.hpp
index c1c24fa39..2cbdd0060 100644
--- a/inst/include/boost/process/v2/ext/detail/proc_info.hpp
+++ b/inst/include/boost/process/v2/ext/detail/proc_info.hpp
@@ -115,11 +115,5 @@ BOOST_PROCESS_V2_DECL HANDLE open_process_with_debug_privilege(boost::process::v
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/ext/detail/impl/proc_info.ipp>
-
-#endif
-
 #endif // BOOST_PROCESS_V2_DETAIL_PROC_INFO_HPP
 
diff --git a/inst/include/boost/process/v2/ext/env.hpp b/inst/include/boost/process/v2/ext/env.hpp
index 33ca2345f..4e2a92ca7 100644
--- a/inst/include/boost/process/v2/ext/env.hpp
+++ b/inst/include/boost/process/v2/ext/env.hpp
@@ -8,6 +8,7 @@
 #define BOOST_PROCESS_V2_ENV_HPP
 #include <string>
 #include <vector>
+#include <memory>
 
 #include <boost/process/v2/detail/config.hpp>
 #include <boost/process/v2/detail/throw_error.hpp>
@@ -26,9 +27,6 @@ namespace ext
 #if defined(BOOST_PROCESS_V2_WINDOWS)
 using native_env_handle_type = wchar_t *;
 using native_env_iterator = wchar_t *;
-#elif defined(__FreeBSD__)
-using native_env_handle_type = char **;
-using native_env_iterator = char **;
 #else
 using native_env_handle_type = char *;
 using native_env_iterator = char *;
@@ -120,7 +118,7 @@ BOOST_PROCESS_V2_DECL env_view env(pid_type pid, error_code & ec);
 BOOST_PROCESS_V2_DECL env_view env(pid_type pid);
 
 template<typename Executor>
-BOOST_PROCESS_V2_DECL env_view env(basic_process_handle<Executor> & handle, error_code & ec)
+inline env_view env(basic_process_handle<Executor> & handle, error_code & ec)
 {
 #if defined(BOOST_PROCESS_V2_WINDOWS)
     return env(handle.native_handle(), ec);
@@ -130,7 +128,7 @@ BOOST_PROCESS_V2_DECL env_view env(basic_process_handle<Executor> & handle, erro
 }
 
 template<typename Executor>
-BOOST_PROCESS_V2_DECL env_view env(basic_process_handle<Executor> & handle)
+inline env_view env(basic_process_handle<Executor> & handle)
 {
 #if defined(BOOST_PROCESS_V2_WINDOWS)
   return env(handle.native_handle());
@@ -147,9 +145,4 @@ BOOST_PROCESS_V2_DECL env_view env(basic_process_handle<Executor> & handle)
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/ext/impl/env.ipp>
-
-#endif
 #endif // BOOST_PROCESS_V2_ENV_HPP
diff --git a/inst/include/boost/process/v2/ext/exe.hpp b/inst/include/boost/process/v2/ext/exe.hpp
index a809f9503..54017a551 100644
--- a/inst/include/boost/process/v2/ext/exe.hpp
+++ b/inst/include/boost/process/v2/ext/exe.hpp
@@ -54,9 +54,5 @@ filesystem::path exe(basic_process_handle<Executor> & handle)
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-#include <boost/process/v2/ext/impl/exe.ipp>
-#endif
-
 #endif // BOOST_PROCESS_V2_EXE_HPP
 
diff --git a/inst/include/boost/process/v2/ext/impl/cmd.ipp b/inst/include/boost/process/v2/ext/impl/cmd.ipp
deleted file mode 100644
index 79e5655e4..000000000
--- a/inst/include/boost/process/v2/ext/impl/cmd.ipp
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-// Copyright (c) 2022 Samuel Venable
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_CMD_IPP
-#define BOOST_PROCESS_V2_IMPL_CMD_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/ext/detail/proc_info.hpp>
-#include <boost/process/v2/ext/cmd.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <windows.h>
-#include <shellapi.h>
-#else
-#include <cstdlib>
-#endif
-
-#if (defined(__linux__) || defined(__ANDROID__))
-#include <cstdio>
-#endif
-
-#if defined(__FreeBSD__)
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/user.h>
-#include <libprocstat.h>
-#endif
-
-#if (defined(__DragonFly__) ||  defined(__OpenBSD__))
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/user.h>
-#include <kvm.h>
-#endif
-
-#if defined(__NetBSD__)
-#include <sys/types.h>
-#include <kvm.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#endif
-
-#if defined(__sun)
-#include <sys/types.h>
-#include <kvm.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-struct make_cmd_shell_
-{
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-    static shell make(std::wstring data)
-    {
-        shell res;
-        res.input_  = res.buffer_ = std::move(data);
-        res.parse_();
-        return res;
-    }
-#else
-    static shell make(std::string data,
-                      int argc, char ** argv,
-                      void(*free_func)(int, char**))
-    {
-        shell res;
-        res.argc_  = argc;
-        res.input_ = res.buffer_ = std::move(data);
-        res.argv_  = argv;
-        res.free_argv_ = free_func;
-
-        return res;
-    }
-
-    static shell clone(char ** cmd)
-    {
-        shell res;
-        res.argc_ = 0;
-        std::size_t str_lengths = 0;
-        for (auto c = cmd; *c != nullptr; c++)
-        {
-            res.argc_++;
-            str_lengths += (std::strlen(*c) + 1);
-        }
-        // yes, not the greatest solution.
-        res.buffer_.resize(str_lengths);
-
-        res.argv_ = new char*[res.argc_ + 1];
-        res.free_argv_ = +[](int argc, char ** argv) {delete[] argv;};
-        res.argv_[res.argc_] = nullptr;
-        auto p = &*res.buffer_.begin();
-
-        for (int i = 0; i < res.argc_; i++)
-        {
-            const auto ln = std::strlen(cmd[i]);
-            res.argv_[i] = std::strcpy(p, cmd[i]);
-            p += (ln + 1);
-        }
-
-        return res;
-    }
-
-#endif
-};
-
-namespace ext {
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-shell cmd(HANDLE proc, error_code & ec)
-{
-    std::wstring buffer = boost::process::v2::detail::ext::cwd_cmd_from_proc(proc, 0/*=MEMCMD*/, ec);
-
-    if (!ec)
-        return make_cmd_shell_::make(std::move(buffer));
-    else
-        return {};
-}
-
-shell cmd(HANDLE proc)
-{
-    boost::system::error_code ec;
-    auto res = cmd(proc, ec);
-    if (ec)
-        detail::throw_error(ec, "cmd");
-    return res;
-}
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    struct del
-    {
-        void operator()(HANDLE h)
-        {
-            ::CloseHandle(h);
-        };
-    };
-    std::unique_ptr<void, del> proc{detail::ext::open_process_with_debug_privilege(pid, ec)};
-    if (proc == nullptr)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
-        return shell{};
-    }
-    else
-        return cmd(proc.get(), ec);
-
-}
-    
-#elif (defined(__APPLE__) && defined(__MACH__))
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    int mib[3] = {CTL_KERN, KERN_ARGMAX, 0};
-    int argmax = 0;
-    auto size = sizeof(argmax);
-    if (sysctl(mib, 2, &argmax, &size, nullptr, 0) == -1)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    std::string procargs;
-    procargs.resize(argmax - 1);
-    mib[1] = KERN_PROCARGS;
-    mib[2] = pid;
-
-    size = argmax;
-
-    if (sysctl(mib, 3, &*procargs.begin(), &size, nullptr, 0) != 0)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    int argc = *reinterpret_cast<const int*>(procargs.data());
-    auto itr = procargs.begin() + sizeof(argc);
-
-    std::unique_ptr<char*[]> argv{new char*[argc + 1]};
-    const auto end = procargs.end();
-
-    argv[argc] = nullptr; //args is a null-terminated list
-
-    for (auto n = 0u; n <= argc; n++)
-    {
-        auto e = std::find(itr, end, '\0');
-        if (e == end && n < argc) // something off
-        {
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, EINVAL, system_category())
-            return {};
-        }
-        argv[n] = &*itr;
-        itr = e + 1; // start searching start
-    }
-
-    auto fr_func = +[](int argc, char ** argv) {delete [] argv;};
-
-    return make_cmd_shell_::make(std::move(procargs), argc, argv.release(), fr_func);
-}
-    
-#elif (defined(__linux__) || defined(__ANDROID__))
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    std::string procargs;
-    procargs.resize(4096);
-    int f = ::open(("/proc/" + std::to_string(pid) + "/cmdline").c_str(), O_RDONLY);
-
-    while (procargs.back() != EOF)
-    {
-        auto r = ::read(f, &*(procargs.end() - 4096), 4096);
-        if (r < 0)
-        {
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-            ::close(f);
-            return {};
-        }
-        if (r < 4096) // done!
-        {
-            procargs.resize(procargs.size() - 4096 + r);
-            break;
-        }
-        procargs.resize(procargs.size() + 4096);
-    }
-    ::close(f);
-
-    if (procargs.back() == EOF)
-        procargs.pop_back();
-
-    auto argc = std::count(procargs.begin(), procargs.end(), '\0');
-
-    auto itr = procargs.begin();
-
-    std::unique_ptr<char*[]> argv{new char*[argc + 1]};
-    const auto end = procargs.end();
-
-    argv[argc] = nullptr; //args is a null-terminated list
-
-
-    for (auto n = 0u; n <= argc; n++)
-    {
-        auto e = std::find(itr, end, '\0');
-        if (e == end && n < argc) // something off
-        {
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, EINVAL, system_category())
-            return {};
-        }
-        argv[n] = &*itr;
-        itr = e + 1; // start searching start
-    }
-
-    auto fr_func = +[](int argc, char ** argv) {delete [] argv;};
-
-    return make_cmd_shell_::make(std::move(procargs), argc, argv.release(), fr_func);
-}
-    
-#elif defined(__FreeBSD__)
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    struct cl_proc_stat
-    {
-        void operator()(struct procstat *proc_stat)
-        {
-            procstat_close(proc_stat);
-        }
-    };
-    std::unique_ptr<struct procstat, cl_proc_stat> proc_stat{procstat_open_sysctl()};
-    if (!proc_stat)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    struct proc_info_close
-    {
-        struct procstat * proc_stat;
-
-        void operator()(struct kinfo_proc * proc_info)
-        {
-            procstat_freeprocs(proc_stat, proc_info);
-        }
-    };
-
-    unsigned cntp;
-    std::unique_ptr<struct kinfo_proc, proc_info_close> proc_info{
-            procstat_getprocs(proc_stat.get(), KERN_PROC_PID, pid, &cntp),
-            proc_info_close{proc_stat.get()}};
-
-    if (!proc_info)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    char **cmd = procstat_getargv(proc_stat.get(), proc_info.get(), 0);
-    if (!cmd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-    auto res = make_cmd_shell_::clone(cmd);
-    procstat_freeargv(proc_stat.get());
-    return res;
-}
-    
-#elif defined(__DragonFly__)
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    const char *nlistf, *memf;
-    nlistf = memf = "/dev/null";
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
-    if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};}
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, &cntp))) 
-    {
-        char **cmd = kvm_getargv(kd.get(), proc_info, 0);
-        if (cmd)
-            return make_cmd_shell_::clone(cmd);
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return {};
-}
-    
-#elif defined(__NetBSD__)
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-
-    std::vector<std::string> vec;
-    int cntp = 0;
-    kinfo_proc2 *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-
-    if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return vec;}
-    if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &cntp))) 
-    {
-        char **cmd = kvm_getargv2(kd.get(), proc_info, 0);
-        if (cmd)
-            return make_cmd_shell_::clone(cmd);
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-    
-#elif defined(__OpenBSD__)
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    std::vector<std::string> vec;
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-    if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return vec;}
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &cntp))) 
-    {
-        char **cmd = kvm_getargv(kd.get(), proc_info, 0);
-        if (cmd)
-            return make_cmd_shell_::clone(cmd);
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    kvm_close(kd);
-    return {};
-}
-    
-#elif defined(__sun)
-
-shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    char **cmd = nullptr;
-    proc *proc_info = nullptr;
-    user *proc_user = nullptr;
-    kd = kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr);
-    if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};}
-    if ((proc_info = kvm_getproc(kd, pid))) 
-    {
-        if ((proc_user = kvm_getu(kd, proc_info))) 
-        {
-            if (!kvm_getcmd(kd, proc_info, proc_user, &cmd, nullptr)) 
-            {
-                int argc = 0;
-                for (int i = 0; cmd[i] != nullptr; i++)
-                    argc ++;
-                return make_cmd_shell_::make(
-                        {}, argc, cmd,
-                        +[](int, char ** argv) {::free(argv);})
-            }
-            else
-                BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        }
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    
-    kvm_close(kd);
-    return {};
-}
-
-#else
-#error "Platform not supported"
-#endif
-
-shell cmd(boost::process::v2::pid_type pid)
-{
-    boost::system::error_code ec;
-    auto res = cmd(pid, ec);
-    if (ec)
-            detail::throw_error(ec, "cmd");
-    return res;
-}
-
-} // namespace ext
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif // BOOST_PROCESS_V2_IMPL_CMD_IPP
-
diff --git a/inst/include/boost/process/v2/ext/impl/cwd.ipp b/inst/include/boost/process/v2/ext/impl/cwd.ipp
deleted file mode 100644
index 8f828751f..000000000
--- a/inst/include/boost/process/v2/ext/impl/cwd.ipp
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-// Copyright (c) 2022 Samuel Venable
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_CWD_IPP
-#define BOOST_PROCESS_V2_IMPL_CWD_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/ext/detail/proc_info.hpp>
-#include <boost/process/v2/ext/cwd.hpp>
-
-#include <string>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <windows.h>
-#else
-#include <climits>
-#endif
-
-#if (defined(__APPLE__) && defined(__MACH__))
-#include <sys/proc_info.h>
-#include <libproc.h>
-#endif
-
-#if (defined(BOOST_PROCESS_V2_WINDOWS) || defined(__linux__) || defined(__ANDROID__) || defined(__sun))
-#include <cstdlib>
-#endif
-
-#if defined(__FreeBSD__)
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/user.h>
-#include <libprocstat.h>
-#endif
-
-#if (defined(__NetBSD__) || defined(__OpenBSD__))
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
-
-#if defined(__DragonFly__)
-#include <cstring>
-#include <cstdio>
-#endif
-
-#ifdef BOOST_PROCESS_USE_STD_FS
-namespace filesystem = std::filesystem;
-#else
-namespace filesystem = boost::filesystem;
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace ext {
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-filesystem::path cwd(HANDLE proc, boost::system::error_code & ec)
-{
-    auto buffer = boost::process::v2::detail::ext::cwd_cmd_from_proc(proc, 1/*=MEMCWD*/, ec);
-    if (!buffer.empty())
-      return filesystem::canonical(buffer, ec);
-    else 
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return "";
-}
-
-filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    struct del
-    {
-        void operator()(HANDLE h)
-        {
-            ::CloseHandle(h);
-        };
-    };
-    std::unique_ptr<void, del> proc{detail::ext::open_process_with_debug_privilege(pid, ec)};
-    if (proc == nullptr)
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    else
-        return cwd(proc.get(), ec);
-    return {};
-}
-
-filesystem::path cwd(HANDLE proc)
-{
-    boost::system::error_code ec;
-    auto res = cwd(proc, ec);
-    if (ec)
-        detail::throw_error(ec, "cwd");
-    return res;
-}
-
-#elif (defined(__APPLE__) && defined(__MACH__))
-
-filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    proc_vnodepathinfo vpi;
-    if (proc_pidinfo(pid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi)) > 0)
-        return filesystem::canonical(vpi.pvi_cdir.vip_path, ec);
-    else
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return "";
-}
-
-#elif (defined(__linux__) || defined(__ANDROID__) || defined(__sun))
-
-filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-#if (defined(__linux__) || defined(__ANDROID__))
-    return filesystem::canonical(
-            filesystem::path("/proc") / std::to_string(pid) / "cwd", ec
-            );
-#elif defined(__sun)
-    return fileystem::canonical(
-            filesystem::path("/proc") / std::to_string(pid) / "path/cwd", ec
-            );
-#endif
-}
-
-#elif defined(__FreeBSD__)
-
-// FIXME: Add error handling.
-filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec) 
-{
-    filesystem::path path;
-    unsigned cntp = 0;
-    procstat *proc_stat = procstat_open_sysctl();
-    if (proc_stat) {
-        kinfo_proc *proc_info = procstat_getprocs(proc_stat, KERN_PROC_PID, pid, &cntp);
-        if (proc_info) {
-            filestat_list *head = procstat_getfiles(proc_stat, proc_info, 0);
-            if (head) {
-                filestat *fst = nullptr;
-                STAILQ_FOREACH(fst, head, next) {
-                    if (fst->fs_uflags & PS_FST_UFLAG_CDIR) 
-                    {
-                        path = filesystem::canonical(fst->fs_path, ec);
-                    }
-                }
-                procstat_freefiles(proc_stat, head);
-            }
-            else
-                BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-            procstat_freeprocs(proc_stat, proc_info);
-        }
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        procstat_close(proc_stat);
-    }
-    else
-         BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return path;
-}
-
-#elif defined(__DragonFly__)
-
-// FIXME: Add error handling.
-filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec) 
-{
-    filesystem::path path;
-    /* Probably the hackiest thing ever we are doing here, because the "official" API is broken OS-level. */
-    FILE *fp = popen(("pos=`ans=\\`/usr/bin/fstat -w -p " + std::to_string(pid) + " | /usr/bin/sed -n 1p\\`; " +
-        "/usr/bin/awk -v ans=\"$ans\" 'BEGIN{print index(ans, \"INUM\")}'`; str=`/usr/bin/fstat -w -p " + 
-        std::to_string(pid) + " | /usr/bin/sed -n 3p`; /usr/bin/awk -v str=\"$str\" -v pos=\"$pos\" " +
-        "'BEGIN{print substr(str, 0, pos + 4)}' | /usr/bin/awk 'NF{NF--};1 {$1=$2=$3=$4=\"\"; print" +
-        " substr($0, 5)'}").c_str(), "r");
-    if (fp) 
-    {
-        char buffer[PATH_MAX];
-        if (fgets(buffer, sizeof(buffer), fp)) 
-        {
-            std::string str = buffer;
-            std::size_t pos = str.find("\n", strlen(buffer) - 1);
-            if (pos != std::string::npos) 
-            {
-                str.replace(pos, 1, "");
-            }
-            path = filesystem::canonical(str.c_str(), ec);
-        }
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        pclose(fp);
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return path;
-}
-
-#elif (defined(__NetBSD__) || defined(__OpenBSD__))
-
-filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    std::string path;
-#if defined(__NetBSD__)
-    int mib[4] = {CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_CWD};
-    const std::size_t sz = 4;
-#elif defined(__OpenBSD__)
-    int mib[3] = {CTL_KERN, KERN_PROC_CWD, pid};
-    const std::size_t sz = 3;
-#endif
-    std::size_t len = 0;
-    if (sysctl(mib, sz, nullptr, &len, nullptr, 0) == 0) 
-    {
-        std::string strbuff;
-        strbuff.resize(len);
-        if (sysctl(mib, 4, &strbuff[0], &len, nullptr, 0) == 0)
-        {
-            filesystem::canonical(strbuff, ec);
-        }
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    }
-
-    return "";
-}
-
-#else
-#error "Platform not supported"
-#endif
-
-filesystem::path cwd(boost::process::v2::pid_type pid)
-{
-    boost::system::error_code ec;
-    auto res = cwd(pid, ec);
-    if (ec)
-        detail::throw_error(ec, "cwd");
-    return res;
-}
-
-} // namespace ext
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif // BOOST_PROCESS_V2_IMPL_CWD_IPP
-
diff --git a/inst/include/boost/process/v2/ext/impl/env.ipp b/inst/include/boost/process/v2/ext/impl/env.ipp
deleted file mode 100644
index a6d87e6fc..000000000
--- a/inst/include/boost/process/v2/ext/impl/env.ipp
+++ /dev/null
@@ -1,389 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_EXT_IMPL_ENV_IPP
-#define BOOST_PROCESS_V2_EXT_IMPL_ENV_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/ext/detail/proc_info.hpp>
-#include <boost/process/v2/ext/env.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <shellapi.h>
-#else
-#include <cstdlib>
-#endif
-
-#if (defined(__linux__) || defined(__ANDROID__))
-#include <cstdio>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace detail {
-namespace ext {
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-void native_env_handle_deleter::operator()(native_env_handle_type h) const
-{
-    delete [] h;
-}
-
-native_env_iterator next(native_env_iterator nh)
-{
-    while (*nh != L'\0')
-        nh ++;
-    return ++nh ;
-}
-native_env_iterator find_end(native_env_iterator nh)
-{
-    while (*nh - 1 != L'\0' && *nh != L'\0')
-        nh ++;
-    return nh ;
-}
-
-const environment::char_type * dereference(native_env_iterator iterator)
-{
-    return iterator;
-}
-
-#elif (defined(__linux__) || defined(__ANDROID__))
-//linux stores this as a blob with an EOF at the end
-
-void native_env_handle_deleter::operator()(native_env_handle_type h) const
-{
-    delete [] h;
-}
-
-native_env_iterator next(native_env_iterator nh)
-{
-    while (*nh != '\0')
-        nh ++;
-    return ++nh ;
-}
-native_env_iterator find_end(native_env_iterator nh)
-{
-    while (*nh != EOF)
-        nh ++;
-    return nh ;
-}
-
-const environment::char_type * dereference(native_env_iterator iterator)
-{
-    return iterator;
-}
-
-#elif (defined(__APPLE___) || defined(__MACH__))
-
-void native_env_handle_deleter::operator()(native_env_handle_type h) const
-{
-    delete [] h;
-}
-
-native_env_iterator next(native_env_iterator nh)
-{
-    while (*nh != '\0')
-        nh ++;
-    return ++nh ;
-}
-native_env_iterator find_end(native_env_iterator nh)
-{
-    while (*nh - 1 != '\0' && *nh != '\0')
-        nh ++;
-    return nh ;
-}
-
-const environment::char_type * dereference(native_env_iterator iterator)
-{
-    return iterator;
-}
-
-
-#elif defined(__FreeBSD__)
-
-void native_env_handle_deleter::operator()(native_env_handle_type h) const
-{
-    delete [] h;
-}
-
-native_env_iterator next(native_env_iterator nh)
-{
-    return ++nh ;
-}
-native_env_iterator find_end(native_env_iterator nh)
-{
-    while (*nh != nullptr)
-      nh++;
-
-    return nh ;
-}
-
-const environment::char_type * dereference(native_env_iterator iterator)
-{
-    return *iterator;
-}
-
-#endif
-
-}
-}
-
-namespace ext
-{
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-env_view env(HANDLE proc, boost::system::error_code & ec)
-{
-    wchar_t *buffer = nullptr;
-    PEB peb;
-    SIZE_T nRead = 0; 
-    ULONG len = 0;
-    PROCESS_BASIC_INFORMATION pbi;
-    detail::ext::RTL_USER_PROCESS_PARAMETERS_EXTENDED upp;
-
-    NTSTATUS status = 0;
-    PVOID buf = nullptr;
-    status = NtQueryInformationProcess(proc, ProcessBasicInformation, &pbi, sizeof(pbi), &len);
-    ULONG error = RtlNtStatusToDosError(status);
-
-    if (error)
-    {
-        BOOST_PROCESS_V2_ASSIGN_EC(ec, error, boost::system::system_category())
-        return {};
-    }
-
-    if (!ReadProcessMemory(proc, pbi.PebBaseAddress, &peb, sizeof(peb), &nRead))
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    if (!ReadProcessMemory(proc, peb.ProcessParameters, &upp, sizeof(upp), &nRead))
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    env_view ev;
-    buf = upp.Environment;
-    len = (ULONG)upp.EnvironmentSize;
-    ev.handle_.reset(new wchar_t[len / 2 + 1]());
-
-    if (!ReadProcessMemory(proc, buf, ev.handle_.get(), len, &nRead))
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    ev.handle_.get()[len / 2] = L'\0';
-    return ev;
-}
-
-env_view env(HANDLE handle)
-{
-    boost::system::error_code ec;
-    auto res = env(handle, ec);
-    if (ec)
-        detail::throw_error(ec, "env");
-    return res;
-}
-
-env_view env(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    struct del
-    {
-        void operator()(HANDLE h)
-        {
-            ::CloseHandle(h);
-        };
-    };
-    std::unique_ptr<void, del> proc{detail::ext::open_process_with_debug_privilege(pid, ec)};
-    if (proc == nullptr)
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    else
-	    return env(proc.get(), ec);
-
-	return {};
-}
-
-#elif (defined(__APPLE___) || defined(__MACH__))
-
-env_view env(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    int mib[3] = {CTL_KERN, KERN_ARGMAX, 0};
-    int argmax = 0;
-    auto size = sizeof(argmax);
-    if (sysctl(mib, 2, &argmax, &size, nullptr, 0) == -1)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-
-    std::string procargs;
-    procargs.resize(argmax - 1);
-    mib[1] = KERN_PROCARGS2;
-    mib[2] = pid;
-
-    size = argmax;
-
-    if (sysctl(mib, 3, &*procargs.begin(), &size, nullptr, 0) != 0)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-    std::uint32_t nargs;
-    memcpy(&nargs, &*procargs.begin(), sizeof(nargs));
-    char *cp = &*procargs.begin() + sizeof(nargs);
-
-    for (; cp < &*procargs.end(); cp++)
-        if (*cp == '\0')
-          break;
-
-
-    if (cp == &procargs[size])
-        return {};
-
-
-    for (; cp < &*procargs.end(); cp++)
-        if (*cp != '\0') break;
-
-
-    if (cp == &*procargs.end())
-        return {};
-
-
-    int i = 0;
-    char *sp = cp;
-    std::vector<char> vec;
-
-    while ((*sp != '\0' || i < nargs) && sp < &*procargs.end()) {
-        if (i >= nargs)
-            vec.push_back(*sp);
-
-        sp += 1;
-    }
-    
-    env_view ev;
-    ev.handle_.reset(new char[vec.size()]());
-    std::copy(vec.begin(), vec.end(), ev.handle_.get());
-    return ev;
-}
-
-#elif (defined(__linux__) || defined(__ANDROID__))
-
-env_view env(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    std::size_t size = 0;
-    std::unique_ptr<char, detail::ext::native_env_handle_deleter> procargs{};
-
-    int f = ::open(("/proc/" + std::to_string(pid) + "/environ").c_str(), O_RDONLY);
-
-    while (!procargs || procargs.get()[size - 1] != EOF)
-    {
-        std::unique_ptr<char, detail::ext::native_env_handle_deleter> buf{new char[size + 4096]};
-        if (size > 0)
-            std::memmove(buf.get(), procargs.get(), size);
-        auto r = ::read(f, buf.get() + size, 4096);
-        if (r < 0)
-        {
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-            ::close(f);
-            return {};
-        }
-        procargs = std::move(buf);
-        size += r;
-        if (r < 4096) // done!
-        {
-            procargs.get()[size] = EOF;
-            break;
-        }
-    }
-    ::close(f);
-
-    env_view ev;
-    ev.handle_ = std::move(procargs);
-    return ev;
-}
-
-#elif defined(__FreeBSD__)
-env_view env(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-  env_view ev;
-
-  unsigned cntp = 0;
-  procstat *proc_stat = procstat_open_sysctl();
-  if (proc_stat != nullptr)
-  {
-    kinfo_proc *proc_info = procstat_getprocs(proc_stat, KERN_PROC_PID, pid, &cntp);
-    if (proc_info != nullptr)
-    {
-      char **env = procstat_getenvv(proc_stat, proc_info, 0);
-      if (env != nullptr)
-      {
-        auto e = env;
-        std::size_t n = 0u, len = 0u;
-        while (e && *e != nullptr)
-        {
-          n ++;
-          len += std::strlen(*e);
-          e++;
-        }
-        std::size_t mem_needed =
-            // environ         -  nullptr       - strlen  + null terminators
-            (n * sizeof(char*)) + sizeof(char*) + len     + n;
-
-        char * out = new (std::nothrow) char[mem_needed];
-        if (out != nullptr)
-        {
-          auto eno = reinterpret_cast<char**>(out);
-          auto eeo = eno;
-            auto str = out +  (n * sizeof(char*)) + sizeof(char*);
-          e = env;
-          while (*e != nullptr)
-          {
-            auto len = std::strlen(*e) + 1u;
-            std::memcpy(str, *e, len);
-            *eno = str;
-            str += len;
-            eno ++;
-            e++;
-          }
-          *eno = nullptr;
-
-          ev.handle_.reset(eeo);
-        }
-        else
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-
-      }
-      procstat_freeprocs(proc_stat, proc_info);
-
-    }
-    else
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    procstat_close(proc_stat);
-  }
-  else
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-  return ev;
-}
-
-#endif
-
-env_view env(boost::process::v2::pid_type pid)
-{
-    boost::system::error_code ec;
-    auto res = env(pid, ec);
-    if (ec)
-        detail::throw_error(ec, "env");
-    return res;
-}
-}
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_EXT_IMPL_ENV_IPP
diff --git a/inst/include/boost/process/v2/ext/impl/exe.ipp b/inst/include/boost/process/v2/ext/impl/exe.ipp
deleted file mode 100644
index 067e583e0..000000000
--- a/inst/include/boost/process/v2/ext/impl/exe.ipp
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-// Copyright (c) 2022 Samuel Venable
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_EXE_IPP
-#define BOOST_PROCESS_V2_IMPL_EXE_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/ext/detail/proc_info.hpp>
-#include <boost/process/v2/ext/exe.hpp>
-
-#include <string>
-#include <vector>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <windows.h>
-#else
-#include <climits>
-#endif
-
-#if (defined(__APPLE__) && defined(__MACH__))
-#include <sys/proc_info.h>
-#include <libproc.h>
-#endif
-
-#if (defined(BOOST_PROCESS_V2_WINDOWS) || defined(__linux__) || defined(__ANDROID__) || defined(__sun))
-#include <cstdlib>
-#endif
-
-#if (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__))
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#if !defined(__FreeBSD__)
-#include <alloca.h>
-#endif
-#endif
-
-#if defined(__OpenBSD__)
-#include <boost/process/v2/ext/cwd.hpp>
-#include <boost/process/v2/ext/cmd.hpp>
-#include <boost/process/v2/ext/env.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <kvm.h>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace ext {
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-filesystem::path exe(HANDLE process_handle)
-{
-    boost::system::error_code ec;
-    auto res = exe(process_handle, ec);
-    if (ec)
-        detail::throw_error(ec, "exe");
-    return res;
-}
-
-
-filesystem::path exe(HANDLE proc, boost::system::error_code & ec)
-{
-    wchar_t buffer[MAX_PATH];
-    // On input, specifies the size of the lpExeName buffer, in characters.
-    DWORD size = MAX_PATH;
-    if (QueryFullProcessImageNameW(proc, 0, buffer, &size))
-    {
-        return filesystem::canonical(buffer, ec);
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-
-    return "";
-}
-
-filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    if (pid == GetCurrentProcessId())
-    {
-        wchar_t buffer[MAX_PATH];
-        if (GetModuleFileNameW(nullptr, buffer, sizeof(buffer))) 
-        {
-            return filesystem::canonical(buffer, ec);
-        }
-    } 
-    else 
-    {
-        struct del
-        {
-            void operator()(HANDLE h)
-            {
-                ::CloseHandle(h);
-            };
-        };
-        std::unique_ptr<void, del> proc{detail::ext::open_process_with_debug_privilege(pid, ec)};
-        if (proc == nullptr)
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        else
-            return exe(proc.get(), ec);
-    }
-    return "";
-}
-
-#elif (defined(__APPLE__) && defined(__MACH__))
-
-filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    char buffer[PROC_PIDPATHINFO_MAXSIZE];
-    if (proc_pidpath(pid, buffer, sizeof(buffer)) > 0) 
-    {
-        return filesystem::canonical(buffer, ec);
-    }
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return "";
-}
-
-#elif (defined(__linux__) || defined(__ANDROID__) || defined(__sun))
-
-filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-#if (defined(__linux__) || defined(__ANDROID__))
-    return filesystem::canonical(
-            filesystem::path("/proc") / std::to_string(pid) / "exe", ec
-            );
-#elif defined(__sun)
-    return fileystem::canonical(
-            filesystem::path("/proc") / std::to_string(pid) / "path/a.out", ec
-            );
-#endif
-}
-
-#elif (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__))
-
-filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-#if (defined(__FreeBSD__) || defined(__DragonFly__))
-    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid};
-#elif defined(__NetBSD__)
-    int mib[4] = {CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_PATHNAME};
-#endif
-    std::size_t len = 0;
-    if (sysctl(mib, 4, nullptr, &len, nullptr, 0) == 0) 
-    {
-        std::string strbuff;
-        strbuff.resize(len);
-        if (sysctl(mib, 4, &strbuff[0], &len, nullptr, 0) == 0)
-        {
-            strbuff.resize(len - 1);
-            return filesystem::canonical(strbuff, ec);
-        }
-    }
-
-    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return "";
-}
-
-#elif defined(__OpenBSD__)
-
-filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code & ec)
-{
-    BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOTSUP, boost::system::system_category())
-    return "";
-}
-
-#else
-#error "Platform not supported"
-#endif
-
-filesystem::path exe(boost::process::v2::pid_type pid)
-{
-    boost::system::error_code ec;
-    auto res = exe(pid, ec);
-    if (ec)
-        detail::throw_error(ec, "exe");
-    return res;
-}
-
-
-} // namespace ext
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif // BOOST_PROCESS_V2_IMPL_EXE_IPP
-
diff --git a/inst/include/boost/process/v2/impl/default_launcher.ipp b/inst/include/boost/process/v2/impl/default_launcher.ipp
deleted file mode 100644
index 26a897940..000000000
--- a/inst/include/boost/process/v2/impl/default_launcher.ipp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// boost/process/v2/default_launcher.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2022 Klemens D. Morgenstern (klemens dot morgenstern at gmx dot net)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_PROCESS_V2_IMPL_DEFAULT_LAUNCHER_IPP
-#define BOOST_PROCESS_V2_IMPL_DEFAULT_LAUNCHER_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <boost/process/v2/windows/impl/default_launcher.ipp>
-#else
-#include <boost/process/v2/posix/detail/close_handles.ipp>
-#endif
-
-
-
-#endif //BOOST_PROCESS_V2_IMPL_DEFAULT_LAUNCHER_IPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/impl/environment.ipp b/inst/include/boost/process/v2/impl/environment.ipp
deleted file mode 100644
index d756bf1ab..000000000
--- a/inst/include/boost/process/v2/impl/environment.ipp
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// boost/process/v2/impl/environment.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2022 Klemens D. Morgenstern (klemens dot morgenstern at gmx dot net)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_PROCESS_V2_IMPL_ENVIRONMENT_IPP
-#define BOOST_PROCESS_V2_IMPL_ENVIRONMENT_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/default_launcher.hpp>
-#include <boost/process/v2/environment.hpp>
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-error_code process_environment::on_setup(windows::default_launcher & launcher, const filesystem::path &, const std::wstring &)
-{
-    if (!unicode_env.empty() && !ec)
-    {
-      launcher.creation_flags |= CREATE_UNICODE_ENVIRONMENT ;
-      launcher.environment = unicode_env.data();
-    }
-
-    return ec;
-};
-
-#else
-
-error_code process_environment::on_setup(posix::default_launcher & launcher, const filesystem::path &, const char * const *)
-{
-    launcher.env = env.data();
-    return error_code{};
-};
-
-#endif
-
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-
-#endif //BOOST_PROCESS_V2_IMPL_ENVIRONMENT_IPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/impl/error.ipp b/inst/include/boost/process/v2/impl/error.ipp
deleted file mode 100644
index 2aaf992a1..000000000
--- a/inst/include/boost/process/v2/impl/error.ipp
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) 2021 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_ERROR_IPP
-#define BOOST_PROCESS_V2_IMPL_ERROR_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/error.hpp>
-#include <boost/process/v2/exit_code.hpp>
-
-#include <cstdlib>
-
-#if defined(BOOST_PROCESS_V2_POSIX)
-#include <sys/wait.h>
-#endif
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace error
-{
-
-namespace detail
-{
-
-struct utf8_category final : public error_category
-{
-    utf8_category() : error_category(0xDAEDu) {}
-
-    const char* name() const noexcept
-    {
-        return "process.v2.utf8";
-    }
-    std::string message(int value) const
-    {
-        switch (static_cast<utf8_conv_error>(value))
-        {
-            case utf8_conv_error::insufficient_buffer:
-                return "A supplied buffer size was not large enough";
-            case utf8_conv_error::invalid_character:
-                return "Invalid characters were found in a string.";
-            default:
-                return "process.v2.utf8 error";
-        }
-    }
-};
-
-
-struct exit_code_category final : public error_category
-{
-    exit_code_category() : error_category(0xDAEEu) {}
-
-    const char* name() const noexcept
-    {
-        return "process.v2.exit_code";
-    }
-    std::string message(int status) const
-    {
-        switch (evaluate_exit_code(status))
-        {
-            case v2::detail::still_active:
-                return "still-active";
-            case EXIT_SUCCESS:
-                return "exit_success";
-            case EXIT_FAILURE:
-                return "exit_failure";
-            default:
-#if defined(BOOST_PROCESS_V2_POSIX)
-                if (WIFCONTINUED(status))
-                    return "continued";
-                switch (WTERMSIG(status))
-                {
-#            if defined(SIGABRT)
-                    case SIGABRT: return "SIGABRT:   Abort signal from abort(3)";
-#            endif
-#            if defined(SIGALRM)
-                    case SIGALRM: return "SIGALRM:   Timer signal from alarm(2)";
-#            endif
-#            if defined(SIGBUS)
-                    case SIGBUS: return "SIGBUS:    Bus error (bad memory access)";
-#            endif
-#            if defined(SIGCHLD)
-                    case SIGCHLD: return "SIGCHLD:   Child stopped or terminated";
-#            endif
-#            if defined(SIGCONT)
-                    case SIGCONT: return "SIGCONT:   Continue if stopped";
-#            endif
-#            if defined(SIGEMT)
-                    case SIGEMT: return "SIGEMT:    Emulator trap";
-#            endif
-#            if defined(SIGFPE)
-                    case SIGFPE: return "SIGFPE:    Floating-point exception";
-#            endif
-#            if defined(SIGHUP)
-                    case SIGHUP: return "SIGHUP:    Hangup detected on controlling terminal";
-#            endif
-#            if defined(SIGILL)
-                    case SIGILL: return "SIGILL:    Illegal Instruction";
-#            endif
-#            if defined(SIGINFO)
-                    case SIGINFO: return "SIGINFO:   A synonym for SIGPWR";
-#            endif
-#            if defined(SIGINT)
-                    case SIGINT: return "SIGINT:    Interrupt from keyboard";
-#            endif
-#            if defined(SIGIO)
-                    case SIGIO: return "SIGIO:     I/O now possible (4.2BSD)";
-#            endif
-#            if defined(SIGKILL)
-                    case SIGKILL: return "SIGKILL:   Kill signal";
-#            endif
-#            if defined(SIGLOST)
-                    case SIGLOST: return "SIGLOST:   File lock lost (unused)";
-#            endif
-#            if defined(SIGPIPE)
-                    case SIGPIPE: return "SIGPIPE:   Broken pipe: write to pipe with no";
-#            endif
-#            if defined(SIGPOLL) && !defined(SIGIO)
-                    case SIGPOLL: return "SIGPOLL:   Pollable event (Sys V);";
-#            endif
-#            if defined(SIGPROF)
-                    case SIGPROF: return "SIGPROF:   Profiling timer expired";
-#            endif
-#            if defined(SIGPWR)
-                    case SIGPWR: return "SIGPWR:    Power failure (System V)";
-#            endif
-#            if defined(SIGQUIT)
-                    case SIGQUIT: return "SIGQUIT:   Quit from keyboard";
-#            endif
-#            if defined(SIGSEGV)
-                    case SIGSEGV: return "SIGSEGV:   Invalid memory reference";
-#            endif
-#            if defined(SIGSTKFLT)
-                    case SIGSTKFLT: return "SIGSTKFLT: Stack fault on coprocessor (unused)";
-#            endif
-#            if defined(SIGSTOP)
-                    case SIGSTOP: return "SIGSTOP:   Stop process";
-#            endif
-#            if defined(SIGTSTP)
-                    case SIGTSTP: return "SIGTSTP:   Stop typed at terminal";
-#            endif
-#            if defined(SIGSYS)
-                    case SIGSYS: return "SIGSYS:    Bad system call (SVr4);";
-#            endif
-#            if defined(SIGTERM)
-                    case SIGTERM: return "SIGTERM:   Termination signal";
-#            endif
-#            if defined(SIGTRAP)
-                    case SIGTRAP: return "SIGTRAP:   Trace/breakpoint trap";
-#            endif
-#            if defined(SIGTTIN)
-                    case SIGTTIN: return "SIGTTIN:   Terminal input for background process";
-#            endif
-#            if defined(SIGTTOU)
-                    case SIGTTOU: return "SIGTTOU:   Terminal output for background process";
-#            endif
-#            if defined(SIGURG)
-                    case SIGURG: return "SIGURG:    Urgent condition on socket (4.2BSD)";
-#            endif
-#            if defined(SIGUSR1)
-                    case SIGUSR1: return "SIGUSR1:   User-defined signal 1";
-#            endif
-#            if defined(SIGUSR2)
-                    case SIGUSR2: return "SIGUSR2:   User-defined signal 2";
-#            endif
-#            if defined(SIGVTALRM)
-                    case SIGVTALRM: return "SIGVTALRM: Virtual alarm clock (4.2BSD)";
-#            endif
-#            if defined(SIGXCPU)
-                    case SIGXCPU: return "SIGXCPU:   CPU time limit exceeded (4.2BSD);";
-#            endif
-#            if defined(SIGXFSZ)
-                    case SIGXFSZ: return "SIGXFSZ:   File size limit exceeded (4.2BSD);";
-#            endif
-#            if defined(SIGWINCH)
-                    case SIGWINCH: return "SIGWINCH:  Window resize signal (4.3BSD, Sun)";
-#            endif
-                    default: return "Unknown signal";
-                }
-#endif
-                return "exited with other error";
-        }
-    }
-};
-
-
-
-
-} // namespace detail
-
-BOOST_PROCESS_V2_DECL const error_category& get_utf8_category()
-{
-    static detail::utf8_category instance;
-    return instance;
-}
-
-BOOST_PROCESS_V2_DECL const error_category& get_exit_code_category()
-{
-    static detail::exit_code_category instance;
-    return instance;
-}
-
-}
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_IMPL_ERROR_IPP
diff --git a/inst/include/boost/process/v2/impl/pid.ipp b/inst/include/boost/process/v2/impl/pid.ipp
deleted file mode 100644
index e638fa14b..000000000
--- a/inst/include/boost/process/v2/impl/pid.ipp
+++ /dev/null
@@ -1,762 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-// Copyright (c) 2022 Samuel Venable
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_PID_IPP
-#define BOOST_PROCESS_V2_IMPL_PID_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/pid.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <windows.h>
-#include <tlhelp32.h>
-#else
-#include <unistd.h>
-#endif
-
-#if (defined(__APPLE__) && defined(__MACH__))
-#include <sys/proc_info.h>
-#include <libproc.h>
-#endif
-
-#if (defined(__linux__) || defined(__ANDROID__))
-#include <dirent.h>
-#endif
-
-#if defined(__FreeBSD__)
-#include <sys/types.h>
-#include <sys/user.h>
-#include <libutil.h>
-#include <cstdlib>
-#endif
-
-#if (defined(__DragonFly__) ||  defined(__OpenBSD__))
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/user.h>
-#include <kvm.h>
-#endif
-
-#if defined(__NetBSD__)
-#include <sys/types.h>
-#include <kvm.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#endif
-
-#if defined(__sun)
-#include <sys/types.h>
-#include <kvm.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-pid_type current_pid() {return ::GetCurrentProcessId();}
-#else
-pid_type current_pid() {return ::getpid();}
-#endif
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    HANDLE hp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (!hp)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    PROCESSENTRY32 pe;
-    pe.dwSize = sizeof(PROCESSENTRY32);
-    if (Process32First(hp, &pe)) 
-    {
-        do 
-        {
-            vec.push_back(pe.th32ProcessID);
-        } while (Process32Next(hp, &pe));
-    }
-    CloseHandle(hp);
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    HANDLE hp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (!hp)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    }
-    PROCESSENTRY32 pe;
-    pe.dwSize = sizeof(PROCESSENTRY32);
-    if (Process32First(hp, &pe))
-    {
-        do
-        {
-            if (pe.th32ProcessID == pid)
-            {
-                ppid = pe.th32ParentProcessID;
-                break;
-            }
-        }
-        while (Process32Next(hp, &pe));
-    }
-    CloseHandle(hp);
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    HANDLE hp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (!hp)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    PROCESSENTRY32 pe;
-    pe.dwSize = sizeof(PROCESSENTRY32);
-    if (Process32First(hp, &pe))
-    {
-        do
-        {
-            if (pe.th32ParentProcessID == pid)
-            {
-                vec.push_back(pe.th32ProcessID);
-            }
-        } 
-        while (Process32Next(hp, &pe));
-    }
-    CloseHandle(hp);
-    return vec;
-}
-
-#elif (defined(__APPLE__) && defined(__MACH__))
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    vec.resize(proc_listpids(PROC_ALL_PIDS, 0, nullptr, 0) / sizeof(pid_type));
-    const auto sz = proc_listpids(PROC_ALL_PIDS, 0, &vec[0], sizeof(pid_type) * vec.size());
-    if (sz < 0)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-    vec.resize(sz);
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec) 
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    proc_bsdinfo proc_info;
-    if (proc_pidinfo(pid, PROC_PIDTBSDINFO, 0, &proc_info, sizeof(proc_info)) <= 0)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    }
-    else
-        ppid = proc_info.pbi_ppid;
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec) 
-{
-    std::vector<pid_type> vec;
-    vec.resize(proc_listpids(PROC_PPID_ONLY, (uint32_t)pid, nullptr, 0) / sizeof(pid_type));
-    const auto sz = proc_listpids(PROC_PPID_ONLY, (uint32_t)pid, &vec[0], sizeof(pid_type) * vec.size());
-    if (sz < 0)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return {};
-    }
-    vec.resize(sz);
-    return vec;
-}
-
-#elif (defined(__linux__) || defined(__ANDROID__))
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    DIR *proc = opendir("/proc");
-    if (!proc)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    } 
-    struct dirent *ent = nullptr;
-    while ((ent = readdir(proc))) 
-    {
-        if (!isdigit(*ent->d_name))
-            continue;
-        vec.push_back(atoi(ent->d_name));
-    }
-    closedir(proc);
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec) 
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    char buffer[BUFSIZ];
-    sprintf(buffer, "/proc/%d/stat", pid);
-    FILE *stat = fopen(buffer, "r");
-    if (!stat)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    } 
-    else
-    {
-        std::size_t size = fread(buffer, sizeof(char), sizeof(buffer), stat);
-        if (size > 0) 
-        {
-            char *token = nullptr;
-            if ((token = strtok(buffer, " "))) 
-            {
-                if ((token = strtok(nullptr, " "))) 
-                {
-                    if ((token = strtok(nullptr, " "))) 
-                    {
-                        if ((token = strtok(nullptr, " "))) 
-                        {
-                            ppid = (pid_type)strtoul(token, nullptr, 10);
-                        }
-                    }
-                }
-            }
-            if (!token)
-            {
-                fclose(stat);
-                BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-                return ppid;
-            }
-        }
-        fclose(stat);
-    }
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec) 
-{
-    std::vector<pid_type> vec;
-    std::vector<pid_type> pids = all_pids(ec);
-    if (!pids.empty()) 
-        vec.reserve(pids.size());
-    for (std::size_t i = 0; i < pids.size(); i++)
-    {
-        pid_type ppid = parent_pid(pids[i], ec);
-        if (ppid != -1 && ppid == pid)
-        {
-            vec.push_back(pids[i]);
-        }
-    }
-    return vec;
-}
-
-#elif defined(__FreeBSD__)
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc *proc_info = kinfo_getallproc(&cntp);
-    if (proc_info) 
-    {
-        vec.reserve(cntp);
-        for (int i = 0; i < cntp; i++)
-            vec.push_back(proc_info[i].ki_pid);
-        free(proc_info);
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    kinfo_proc *proc_info = kinfo_getproc(pid);
-    if (proc_info)
-    {
-        ppid = proc_info->ki_ppid;
-        free(proc_info);
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec) 
-{
-    std::vector<pid_type> vec;
-    int cntp = 0; 
-    kinfo_proc *proc_info = kinfo_getallproc(&cntp);
-    if (proc_info)
-    {
-        vec.reserve(cntp);
-        for (int i = 0; i < cntp; i++)
-        {
-            if (proc_info[i].ki_ppid == pid)
-            {
-                vec.push_back(proc_info[i].ki_pid);
-            }
-        }
-        free(proc_info);
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-#elif defined(__DragonFly__)
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    const char *nlistf, *memf;
-    nlistf = memf = "/dev/null";
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
-    if (!kd) 
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, &cntp))) 
-    {
-        vec.reserve(cntp);
-        for (int i = 0; i < cntp; i++) 
-            if (proc_info[i].kp_pid >= 0) 
-                vec.push_back(proc_info[i].kp_pid);
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    const char *nlistf, *memf;
-    nlistf = memf = "/dev/null";
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)}; 
-    if (!kd) 
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    }
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, &cntp)))
-    {
-        if (proc_info->kp_ppid >= 0)
-        {
-            ppid = proc_info->kp_ppid;
-        }
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec) 
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    const char *nlistf, *memf;
-    nlistf = memf = "/dev/null";
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
-    if (!kd) 
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, &cntp)))
-    {
-        vec.reserve(cntp);
-        for (int i = 0; i < cntp; i++)
-        {
-            if (proc_info[i].kp_pid >= 0 && proc_info[i].kp_ppid >= 0 && proc_info[i].kp_ppid == pid)
-            {
-                vec.push_back(proc_info[i].kp_pid);
-            }
-        }
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-#elif defined(__NetBSD__)
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc2  *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-    if (!kd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    } 
-    if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &cntp)))
-    {
-        vec.reserve(cntp);
-        for (int i = cntp - 1; i >= 0; i--) 
-        {
-            vec.push_back(proc_info[i].p_pid);
-        }
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec) 
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    int cntp = 0;
-    kinfo_proc2 *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-    if (!kd) 
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    }
-    if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &cntp)))
-    {
-        ppid = proc_info->p_ppid;
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec) 
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc2 *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-    if (!kd) 
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &cntp)))
-    {
-        vec.reserve(cntp);
-        for (int i = cntp - 1; i >= 0; i--)
-        {
-            if (proc_info[i].p_ppid == pid)
-            {
-                vec.push_back(proc_info[i].p_pid);
-            }
-        }
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-#elif defined(__OpenBSD__)
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-    if (!kd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    } 
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &cntp)))
-    {
-        vec.reserve(cntp);
-        for (int i = cntp - 1; i >= 0; i--)
-        {
-            if (proc_info[i].kp_pid >= 0) 
-            {
-                vec.push_back(proc_info[i].kp_pid);
-            }
-        }
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec) 
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
-    if (!kd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    }
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &cntp)))
-    {
-        ppid = proc_info->p_ppid;
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec) 
-{
-    std::vector<pid_type> vec;
-    int cntp = 0;
-    kinfo_proc *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)}; 
-    if (!kd) 
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &cntp)))
-    {
-        vec.reserve(cntp);
-        for (int i = cntp - 1; i >= 0; i--)
-        {
-            if (proc_info[i].p_ppid == pid)
-            {
-                vec.push_back(proc_info[i].p_pid);
-            }
-        }
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return vec;
-}
-
-
-#elif defined(__sun)
-
-std::vector<pid_type> all_pids(boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    struct pid cur_pid;
-    proc *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
-    if (!kd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    } 
-    while ((proc_info = kvm_nextproc(kd)))
-    {
-        if (kvm_kread(kd, (std::uintptr_t)proc_info->p_pidp, &cur_pid, sizeof(cur_pid)) != -1)
-        {
-            vec.insert(vec.begin(), cur_pid.pid_id);
-        }
-        else
-        {
-            BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-            break;
-        }
-    }
-    return vec;
-}
-
-pid_type parent_pid(pid_type pid, boost::system::error_code & ec) 
-{
-    pid_type ppid = static_cast<pid_type>(-1);
-    proc *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
-    if (!kd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return ppid;
-    }
-    if ((proc_info = kvm_getproc(kd, pid)))
-    {
-        ppid = proc_info->p_ppid;
-    }
-    else
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-    return ppid;
-}
-
-std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
-{
-    std::vector<pid_type> vec;
-    struct pid cur_pid;
-    proc *proc_info = nullptr;
-    struct closer
-    {
-        void operator()(kvm_t * kd)
-        {
-            kvm_close(kd);
-        }
-    };
-
-    std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr);
-    if (!kd)
-    {
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-        return vec;
-    }
-    while ((proc_info = kvm_nextproc(kd)))
-    {
-        if (proc_info->p_ppid == pid)
-        {
-            if (kvm_kread(kd, (std::uintptr_t)proc_info->p_pidp, &cur_pid, sizeof(cur_pid)) != -1)
-            {
-                vec.insert(vec.begin(), cur_pid.pid_id);
-            }
-            else
-            {
-                BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
-                break;
-            }
-        }
-    }
-    return vec;
-}
-
-#else
-#error "Platform not supported"
-#endif
-
-std::vector<pid_type> all_pids()
-{
-    boost::system::error_code ec;
-    auto res = all_pids(ec);
-    if (ec)
-        detail::throw_error(ec, "all_pids");
-    return res;
-}
-
-pid_type parent_pid(pid_type pid)
-{
-    boost::system::error_code ec;
-    auto res = parent_pid(pid, ec);
-    if (ec)
-        detail::throw_error(ec, "parent_pid");
-    return res;
-}
-
-std::vector<pid_type> child_pids(pid_type pid)
-{
-    boost::system::error_code ec;
-    auto res = child_pids(pid, ec);
-    if (ec)
-        detail::throw_error(ec, "child_pids");
-    return res;
-}
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif // BOOST_PROCESS_V2_IMPL_PID_IPP
-
diff --git a/inst/include/boost/process/v2/impl/process_handle.ipp b/inst/include/boost/process/v2/impl/process_handle.ipp
deleted file mode 100644
index 813395c21..000000000
--- a/inst/include/boost/process/v2/impl/process_handle.ipp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_PROCESS_HANDLE_IPP
-#define BOOST_PROCESS_V2_IMPL_PROCESS_HANDLE_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <boost/process/v2/detail/impl/process_handle_windows.ipp>
-#else
-
-
-#endif
-
-#endif //BOOST_PROCESS_V2_IMPL_PROCESS_HANDLE_IPP
diff --git a/inst/include/boost/process/v2/impl/shell.ipp b/inst/include/boost/process/v2/impl/shell.ipp
deleted file mode 100644
index da78404f7..000000000
--- a/inst/include/boost/process/v2/impl/shell.ipp
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) 2022 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_IMPL_SHELL_IPP
-#define BOOST_PROCESS_V2_IMPL_SHELL_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/detail/throw_error.hpp>
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/error.hpp>
-#include <boost/process/v2/shell.hpp>
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-#include <shellapi.h>
-#else
-#include <wordexp.h>
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-#if defined(BOOST_PROCESS_V2_WINDOWS)
-BOOST_PROCESS_V2_DECL const error_category& get_shell_category()
-{
-    return system_category();
-}
-#else
-
-struct shell_category_t final : public error_category
-{
-    shell_category_t() : error_category(0xDAF1u) {}
-
-    const char* name() const noexcept
-    {
-        return "process.v2.utf8";
-    }
-    std::string message(int value) const
-    {
-        switch (value)
-        {
-        case WRDE_BADCHAR:
-            return "Illegal occurrence of newline or one of |, &, ;, <, >, (, ), {, }.";
-        case WRDE_BADVAL:
-            return "An undefined shell variable was referenced, and the WRDE_UNDEF flag told us to consider this an error.";
-        case WRDE_CMDSUB:
-            return "Command substitution occurred, and the WRDE_NOCMD flag told us to consider this an error.";
-        case WRDE_NOSPACE:
-            return "Out of memory.";
-        case WRDE_SYNTAX:
-            return "Shell syntax error, such as unbalanced parentheses or unmatched quotes.";
-        default:
-            return "process.v2.wordexp error";
-        }
-    }
-};
-
-BOOST_PROCESS_V2_DECL const error_category& get_shell_category()
-{
-    static shell_category_t instance;
-    return instance;
-}
-
-#endif
-
-#if defined (BOOST_PROCESS_V2_WINDOWS)
-
-void shell::parse_()
-{
-    argv_ = ::CommandLineToArgvW(input_.c_str(), &argc_);
-    if (argv_ == nullptr)
-    {
-        error_code ec;
-        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
-        throw system_error(ec, "shell::parse");
-    }
-}
-
-shell::~shell()
-{
-    if (argv_ != nullptr)
-        LocalFree(argv_);
-}
-
-auto shell::args() const-> args_type
-{
-    return input_.c_str();
-}
-
-#else
-
-void shell::parse_()
-{
-    wordexp_t we{};
-    auto cd = wordexp(input_.c_str(), &we, WRDE_NOCMD);
-
-    if (cd != 0)
-        detail::throw_error(error_code(cd, get_shell_category()), "shell::parse");
-    else
-    {
-        argc_ = static_cast<int>(we.we_wordc);
-        argv_ = we.we_wordv;
-    }
-
-    free_argv_ = +[](int argc, char ** argv)
-    {
-        wordexp_t we{
-                .we_wordc = static_cast<std::size_t>(argc),
-                .we_wordv = argv,
-                .we_offs = 0
-        };
-        wordfree(&we);
-    };
-}
-
-shell::~shell()
-{
-    if (argv_ != nullptr && free_argv_ != nullptr)
-        free_argv_(argc_, argv_);
-}
-
-auto shell::args() const -> args_type
-{
-    if (argc() == 0)
-    {
-        static const char * helper = nullptr;
-        return &helper;
-    }
-    else
-        return const_cast<const char**>(argv());
-}
-
-#endif
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_IMPL_SHELL_IPP
diff --git a/inst/include/boost/process/v2/pid.hpp b/inst/include/boost/process/v2/pid.hpp
index 6f7baa049..e705b949e 100644
--- a/inst/include/boost/process/v2/pid.hpp
+++ b/inst/include/boost/process/v2/pid.hpp
@@ -9,6 +9,9 @@
 #include <boost/process/v2/detail/config.hpp>
 #include <boost/process/v2/detail/throw_error.hpp>
 
+#include <vector>
+#include <memory>
+
 BOOST_PROCESS_V2_BEGIN_NAMESPACE
 
 #if defined(GENERATING_DOCUMENTATION)
@@ -58,9 +61,6 @@ BOOST_PROCESS_V2_DECL std::vector<pid_type> child_pids(pid_type pid);
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-#include <boost/process/v2/impl/pid.ipp>
-#endif
 
 #endif // BOOST_PROCESS_V2_PID_HPP
 
diff --git a/inst/include/boost/process/v2/popen.hpp b/inst/include/boost/process/v2/popen.hpp
index 7696eb718..4358520a3 100644
--- a/inst/include/boost/process/v2/popen.hpp
+++ b/inst/include/boost/process/v2/popen.hpp
@@ -34,7 +34,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
  * 
  * Popen can be used as a stream object in other protocols.
  */ 
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_popen : basic_process<Executor>
 {
     /// The executor of the process
@@ -69,7 +69,7 @@ struct basic_popen : basic_process<Executor>
     explicit basic_popen(ExecutionContext & context,
         typename std::enable_if<
             is_convertible<ExecutionContext&,
-                    BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value, void *>::type = nullptr)
+                    net::execution_context&>::value, void *>::type = nullptr)
         : basic_process<Executor>{context}
     {
     }
@@ -148,7 +148,7 @@ struct basic_popen : basic_process<Executor>
             ExecutionContext & context,
             typename std::enable_if<
                 std::is_convertible<ExecutionContext&,
-                    BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                    net::execution_context&>::value,
             const filesystem::path&>::type exe,
             std::initializer_list<string_view> args,
             Inits&&... inits)
@@ -169,7 +169,7 @@ struct basic_popen : basic_process<Executor>
             ExecutionContext & context,
             typename std::enable_if<
                 std::is_convertible<ExecutionContext&,
-                    BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                    net::execution_context&>::value,
             const filesystem::path&>::type exe,
             std::initializer_list<string_view> args,
             Inits&&... inits)
@@ -189,7 +189,7 @@ struct basic_popen : basic_process<Executor>
             ExecutionContext & context,
             typename std::enable_if<
                 std::is_convertible<ExecutionContext&,
-                    BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                    net::execution_context&>::value,
             const filesystem::path&>::type exe,
             Args&& args, Inits&&... inits)
             : basic_process<Executor>(context)
@@ -209,7 +209,7 @@ struct basic_popen : basic_process<Executor>
             ExecutionContext & context,
             typename std::enable_if<
                 std::is_convertible<ExecutionContext&,
-                    BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                    net::execution_context&>::value,
             const filesystem::path&>::type exe,
             Args&& args, Inits&&... inits)
             : basic_process<Executor>(context)
@@ -224,9 +224,9 @@ struct basic_popen : basic_process<Executor>
 
 
     /// The type used for stdin on the parent process side.
-    using stdin_type = BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_writable_pipe<Executor>;
+    using stdin_type = net::basic_writable_pipe<Executor>;
     /// The type used for stdout on the parent process side.
-    using stdout_type = BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_readable_pipe<Executor>;
+    using stdout_type = net::basic_readable_pipe<Executor>;
 
     /// Get the stdin pipe.
     stdin_type  & get_stdin()  {return stdin_; }
@@ -336,14 +336,11 @@ struct basic_popen : basic_process<Executor>
      * std::vector.
      */
     template <typename ConstBufferSequence,
-            BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-                                                    std::size_t)) WriteToken
-            BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WriteToken,
-                                       void (boost::system::error_code, std::size_t))
-    async_write_some(const ConstBufferSequence& buffers,
-                     BOOST_ASIO_MOVE_ARG(WriteToken) token
-                     BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
+            BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code, std::size_t))
+            WriteToken = net::default_completion_token_t<executor_type>>
+    auto async_write_some(const ConstBufferSequence& buffers,
+                     WriteToken && token = net::default_completion_token_t<executor_type>())
+         -> decltype(std::declval<stdin_type&>().async_write_some(buffers, std::forward<WriteToken>(token)))
     {
         return stdin_.async_write_some(buffers, std::forward<WriteToken>(token));
     }
@@ -451,14 +448,12 @@ struct basic_popen : basic_process<Executor>
      * std::vector.
      */
     template <typename MutableBufferSequence,
-            BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
-                                                    std::size_t)) ReadToken
-            BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(ReadToken,
-                                       void (boost::system::error_code, std::size_t))
-    async_read_some(const MutableBufferSequence& buffers,
+            BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code, std::size_t))
+            ReadToken = net::default_completion_token_t<executor_type>>
+    auto async_read_some(const MutableBufferSequence& buffers,
                     BOOST_ASIO_MOVE_ARG(ReadToken) token
-                    BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
+                    = net::default_completion_token_t<executor_type>())
+        -> decltype(std::declval<stdout_type&>().async_read_some(buffers, std::forward<ReadToken>(token)))
     {
         return stdout_.async_read_some(buffers, std::forward<ReadToken>(token));
     }
diff --git a/inst/include/boost/process/v2/posix/default_launcher.hpp b/inst/include/boost/process/v2/posix/default_launcher.hpp
index d04e85cd9..2d372e0b7 100644
--- a/inst/include/boost/process/v2/posix/default_launcher.hpp
+++ b/inst/include/boost/process/v2/posix/default_launcher.hpp
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__)
+#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
 extern "C" { extern char **environ; }
 #endif
 
@@ -305,7 +305,7 @@ struct default_launcher
     template<typename ExecutionContext, typename Args, typename ... Inits>
     auto operator()(ExecutionContext & context,
                     const typename std::enable_if<std::is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -324,19 +324,19 @@ struct default_launcher
     auto operator()(ExecutionContext & context,
                     error_code & ec,
                     const typename std::enable_if<std::is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
     {
-        return (*this)(context.get_executor(), executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
+        return (*this)(context.get_executor(), ec, executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
     }
 
     template<typename Executor, typename Args, typename ... Inits>
     auto operator()(Executor exec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -354,8 +354,8 @@ struct default_launcher
     auto operator()(Executor exec,
                     error_code & ec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -365,12 +365,12 @@ struct default_launcher
             pipe_guard pg;
             if (::pipe(pg.p))
             {
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             if (::fcntl(pg.p[1], F_SETFD, FD_CLOEXEC))
             {
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             ec = detail::on_setup(*this, executable, argv, inits ...);
@@ -381,23 +381,23 @@ struct default_launcher
             }
             fd_whitelist.push_back(pg.p[1]);
 
-            auto & ctx = BOOST_PROCESS_V2_ASIO_NAMESPACE::query(
-                    exec, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::context);
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_prepare);
+            auto & ctx = net::query(
+                    exec, net::execution::context);
+            ctx.notify_fork(net::execution_context::fork_prepare);
             pid = ::fork();
             if (pid == -1)
             {
-                ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+                ctx.notify_fork(net::execution_context::fork_parent);
                 detail::on_fork_error(*this, executable, argv, ec, inits...);
                 detail::on_error(*this, executable, argv, ec, inits...);
 
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             else if (pid == 0)
             {
                 ::close(pg.p[0]);
-                ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_child);
+                ctx.notify_fork(net::execution_context::fork_child);
                 ec = detail::on_exec_setup(*this, executable, argv, inits...);
                 if (!ec)
                 {
@@ -407,13 +407,13 @@ struct default_launcher
                     ::execve(executable.c_str(), const_cast<char * const *>(argv), const_cast<char * const *>(env));
 
                 ignore_unused(::write(pg.p[1], &errno, sizeof(int)));
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 detail::on_exec_error(*this, executable, argv, ec, inits...);
                 ::exit(EXIT_FAILURE);
                 return basic_process<Executor>{exec};
             }
 
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+            ctx.notify_fork(net::execution_context::fork_parent);
             ::close(pg.p[1]);
             pg.p[1] = -1;
             int child_error{0};
@@ -423,12 +423,12 @@ struct default_launcher
                 int err = errno;
                 if ((err != EAGAIN) && (err != EINTR))
                 {
-                    BOOST_PROCESS_V2_ASSIGN_EC(ec, err, system_category())
+                    BOOST_PROCESS_V2_ASSIGN_EC(ec, err, system_category());
                     break;
                 }
             }
             if (count != 0)
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, child_error, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, child_error, system_category());
 
             if (ec)
             {
diff --git a/inst/include/boost/process/v2/posix/detail/close_handles.ipp b/inst/include/boost/process/v2/posix/detail/close_handles.ipp
deleted file mode 100644
index a82035655..000000000
--- a/inst/include/boost/process/v2/posix/detail/close_handles.ipp
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-// boost/process/v2/posix/detail/close_handles.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2022 Klemens D. Morgenstern (klemens dot morgenstern at gmx dot net)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BOOST_PROCESS_V2_POSIX_DETAIL_CLOSE_HANDLES_IPP
-#define BOOST_PROCESS_V2_POSIX_DETAIL_CLOSE_HANDLES_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/detail/last_error.hpp>
-#include <boost/process/v2/posix/detail/close_handles.hpp>
-// linux has close_range since 5.19
-
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-
-// https://www.freebsd.org/cgi/man.cgi?query=close_range&apropos=0&sektion=0&manpath=FreeBSD+13.1-RELEASE+and+Ports&arch=default&format=html
-// https://man.netbsd.org/closefrom.3
-// __FreeBSD__
-// 
-// gives us
-//
-// int closefrom(int fd);
-// int close_range(u_int lowfd, u_int highfd, int flags);
-
-#include <unistd.h>
-#define BOOST_PROCESS_V2_HAS_CLOSE_RANGE_AND_CLOSEFROM 1 
-
-#elif defined(__sun)
-
-/*https://docs.oracle.com/cd/E36784_01/html/E36874/closefrom-3c.html
-
-int fdwalk(int (*func)(void *, int), void *cd);
-*/
-
-#include <stdlib.h>
-#define BOOST_PROCESS_V2_HAS_PDFORK 1 
-
-#elif defined(__linux__)
-
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)
-
-// https://man7.org/linux/man-pages/man2/close_range.2.html
-#include <linux/close_range.h>
-#define BOOST_PROCESS_V2_HAS_CLOSE_RANGE 1 
-#else 
-
-#include <dirent.h>
-
-#endif
-
-#else
-
-#include <dirent.h>
-
-#endif
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-
-namespace posix
-{
-
-namespace detail
-{
-
-#if defined(BOOST_PROCESS_V2_HAS_PDFORK)
-
-void close_all(const std::vector<int> & whitelist, error_code & ec)
-{
-    fdwalk(+[](void * p, int fd)
-           {
-                const auto & wl = *static_cast<const std::vector<int>*>(p);
-                if (std::find(wl.begin(), wl.end(), fd) == wl.end())
-                    return ::close(fd);
-                else 
-                    return 0;
-           }, const_cast<void*>(static_cast<const void*>(&whitelist)) );
-    ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
-}
-
-#elif defined(BOOST_PROCESS_V2_HAS_CLOSE_RANGE_AND_CLOSEFROM)
-
-// freeBSD impl - whitelist must be ordered
-void close_all(const std::vector<int> & whitelist, error_code & ec)
-{
-    //the most common scenario is whitelist = {0,1,2}
-    if (!whitelist.empty())
-    {
-        if (whitelist.front() != 0)
-            ::close_range(0, whitelist.front() - 1, 0);
-
-        for (std::size_t idx = 0u; 
-             idx < (whitelist.size() - 1u);
-             idx++)
-        {
-            const auto mine = whitelist[idx];
-            const auto next = whitelist[idx];
-            if ((mine + 1) != next && (mine != next))
-            {
-                ::close_range(mine + 1, next - 1, 0);
-            }
-        }
-
-        ::closefrom(whitelist.back() + 1);
-    }
-    else
-        ::closefrom(0);
-}
-
-#elif defined(BOOST_PROCESS_V2_HAS_CLOSE_RANGE)
-
-
-// linux impl - whitelist must be ordered
-void close_all(const std::vector<int> & whitelist, error_code & ec)
-{
-// https://patchwork.kernel.org/project/linux-fsdevel/cover/20200602204219.186620-1-christian.brauner@ubuntu.com/
-    //the most common scenario is whitelist = {0,1,2}
-    if (!whitelist.empty())
-    {
-        if (whitelist.front() != 0)
-            ::close_range(0, whitelist.front() - 1, CLOSE_RANGE_UNSHARE);
-
-        for (std::size_t idx = 0u; 
-             idx < (whitelist.size() - 1u);
-             idx++)
-        {
-            const auto mine = whitelist[idx];
-            const auto next = whitelist[idx];
-            if ((mine + 1) != next && (mine != next))
-            {
-                ::close_range(mine + 1, next - 1, CLOSE_RANGE_UNSHARE);
-            }
-        }
-
-        ::close_range(whitelist.back() + 1, std::numeric_limits<int>::max(), CLOSE_RANGE_UNSHARE);
-    }
-    else
-        ::close_range(0, std::numeric_limits<int>::max(), CLOSE_RANGE_UNSHARE);
-}
-
-#else
-
-// default one
-void close_all(const std::vector<int> & whitelist, error_code & ec)
-{
-    std::unique_ptr<DIR, void(*)(DIR*)> dir{::opendir("/dev/fd"), +[](DIR* p){::closedir(p);}};
-    if (dir.get() == nullptr)
-    {
-        ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
-        return ;
-    }
-
-    auto dir_fd = ::dirfd(dir.get());
-    if (dir_fd == -1)
-    {
-        ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
-        return ;
-    }
-
-    struct ::dirent * ent_p;
-
-    while ((ent_p = ::readdir(dir.get())) != nullptr)
-    {
-        if (ent_p->d_name[0] == '.')
-            continue;
-
-        const auto conv = std::atoi(ent_p->d_name);
-        if (conv == 0 && (ent_p->d_name[0] != '0' && ent_p->d_name[1] != '\0'))
-            continue;
-
-        if (conv == dir_fd 
-            || (std::find(whitelist.begin(), whitelist.end(), conv) != whitelist.end()))
-            continue;
-
-        ::close(conv);
-    }
-}
-
-#endif
-
-}
-
-}
-
-BOOST_PROCESS_V2_END_NAMESPACE
-
-#endif //BOOST_PROCESS_V2_POSIX_DETAIL_CLOSE_HANDLES_IPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/posix/fork_and_forget_launcher.hpp b/inst/include/boost/process/v2/posix/fork_and_forget_launcher.hpp
index c79f3845b..ff28eef93 100644
--- a/inst/include/boost/process/v2/posix/fork_and_forget_launcher.hpp
+++ b/inst/include/boost/process/v2/posix/fork_and_forget_launcher.hpp
@@ -20,7 +20,7 @@ struct fork_and_forget_launcher : default_launcher
     template<typename ExecutionContext, typename Args, typename ... Inits>
     auto operator()(ExecutionContext & context,
                     const typename std::enable_if<is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -39,19 +39,19 @@ struct fork_and_forget_launcher : default_launcher
     auto operator()(ExecutionContext & context,
                     error_code & ec,
                     const typename std::enable_if<is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
     {
-        return (*this)(context.get_executor(), executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
+        return (*this)(context.get_executor(), ec, executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
     }
 
     template<typename Executor, typename Args, typename ... Inits>
     auto operator()(Executor exec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -69,8 +69,8 @@ struct fork_and_forget_launcher : default_launcher
     auto operator()(Executor exec,
                     error_code & ec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -84,22 +84,22 @@ struct fork_and_forget_launcher : default_launcher
                 return basic_process<Executor>(exec);
             }
 
-            auto & ctx = BOOST_PROCESS_V2_ASIO_NAMESPACE::query(
-                    exec, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::context);
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_prepare);
+            auto & ctx = net::query(
+                    exec, net::execution::context);
+            ctx.notify_fork(net::execution_context::fork_prepare);
             pid = ::fork();
             if (pid == -1)
             {
-                ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+                ctx.notify_fork(net::execution_context::fork_parent);
                 detail::on_fork_error(*this, executable, argv, ec, inits...);
                 detail::on_error(*this, executable, argv, ec, inits...);
 
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             else if (pid == 0)
             {
-                ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_child);
+                ctx.notify_fork(net::execution_context::fork_child);
 
                 ec = detail::on_exec_setup(*this, executable, argv, inits...);
                 if (!ec)
@@ -107,12 +107,12 @@ struct fork_and_forget_launcher : default_launcher
                 if (!ec)
                     ::execve(executable.c_str(), const_cast<char * const *>(argv), const_cast<char * const *>(env));
 
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 detail::on_exec_error(*this, executable, argv, ec, inits...);
                 ::exit(EXIT_FAILURE);
                 return basic_process<Executor>{exec};
             }
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+            ctx.notify_fork(net::execution_context::fork_parent);
             if (ec)
             {
                 detail::on_error(*this, executable, argv, ec, inits...);
diff --git a/inst/include/boost/process/v2/posix/pdfork_launcher.hpp b/inst/include/boost/process/v2/posix/pdfork_launcher.hpp
index 858ce09b0..a00baf4c1 100644
--- a/inst/include/boost/process/v2/posix/pdfork_launcher.hpp
+++ b/inst/include/boost/process/v2/posix/pdfork_launcher.hpp
@@ -25,7 +25,7 @@ struct pdfork_launcher : default_launcher
     template<typename ExecutionContext, typename Args, typename ... Inits>
     auto operator()(ExecutionContext & context,
                     const typename std::enable_if<is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -44,19 +44,19 @@ struct pdfork_launcher : default_launcher
     auto operator()(ExecutionContext & context,
                     error_code & ec,
                     const typename std::enable_if<is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
     {
-        return (*this)(context.get_executor(), executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
+        return (*this)(context.get_executor(), ec, executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
     }
 
     template<typename Executor, typename Args, typename ... Inits>
     auto operator()(Executor exec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -74,8 +74,8 @@ struct pdfork_launcher : default_launcher
     auto operator()(Executor exec,
                     error_code & ec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -85,12 +85,12 @@ struct pdfork_launcher : default_launcher
             pipe_guard pg;
             if (::pipe(pg.p))
             {
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             if (::fcntl(pg.p[1], F_SETFD, FD_CLOEXEC))
             {
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             ec = detail::on_setup(*this, executable, argv, inits ...);
@@ -101,22 +101,22 @@ struct pdfork_launcher : default_launcher
             }
             fd_whitelist.push_back(pg.p[1]);
 
-            auto & ctx = BOOST_PROCESS_V2_ASIO_NAMESPACE::query(
-                    exec, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::context);
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_prepare);
+            auto & ctx = net::query(
+                    exec, net::execution::context);
+            ctx.notify_fork(net::execution_context::fork_prepare);
             pid = ::pdfork(&fd, PD_DAEMON | PD_CLOEXEC);
             if (pid == -1)
             {
-                ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+                ctx.notify_fork(net::execution_context::fork_parent);
                 detail::on_fork_error(*this, executable, argv, ec, inits...);
                 detail::on_error(*this, executable, argv, ec, inits...);
 
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 return basic_process<Executor>{exec};
             }
             else if (pid == 0)
             {
-                ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_child);
+                ctx.notify_fork(net::execution_context::fork_child);
                 ::close(pg.p[0]);
 
                 ec = detail::on_exec_setup(*this, executable, argv, inits...);
@@ -128,12 +128,12 @@ struct pdfork_launcher : default_launcher
                     ::execve(executable.c_str(), const_cast<char * const *>(argv), const_cast<char * const *>(env));
 
                 default_launcher::ignore_unused(::write(pg.p[1], &errno, sizeof(int)));
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
                 detail::on_exec_error(*this, executable, argv, ec, inits...);
                 ::exit(EXIT_FAILURE);
                 return basic_process<Executor>{exec};
             }
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+            ctx.notify_fork(net::execution_context::fork_parent);
             ::close(pg.p[1]);
             pg.p[1] = -1;
             int child_error{0};
@@ -143,12 +143,12 @@ struct pdfork_launcher : default_launcher
                 int err = errno;
                 if ((err != EAGAIN) && (err != EINTR))
                 {
-                    BOOST_PROCESS_V2_ASSIGN_EC(ec, err, system_category())
+                    BOOST_PROCESS_V2_ASSIGN_EC(ec, err, system_category());
                     break;
                 }
             }
             if (count != 0)
-                BOOST_PROCESS_V2_ASSIGN_EC(ec, child_error, system_category())
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, child_error, system_category());
 
             if (ec)
             {
diff --git a/inst/include/boost/process/v2/posix/vfork_launcher.hpp b/inst/include/boost/process/v2/posix/vfork_launcher.hpp
index 89947e0ec..81c0db832 100644
--- a/inst/include/boost/process/v2/posix/vfork_launcher.hpp
+++ b/inst/include/boost/process/v2/posix/vfork_launcher.hpp
@@ -22,7 +22,7 @@ struct vfork_launcher :  default_launcher
     template<typename ExecutionContext, typename Args, typename ... Inits>
     auto operator()(ExecutionContext & context,
                     const typename std::enable_if<std::is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -41,19 +41,19 @@ struct vfork_launcher :  default_launcher
     auto operator()(ExecutionContext & context,
                     error_code & ec,
                     const typename std::enable_if<std::is_convertible<
-                            ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                            ExecutionContext&, net::execution_context&>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
     {
-        return (*this)(context.get_executor(), executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
+        return (*this)(context.get_executor(), ec, executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
     }
 
     template<typename Executor, typename Args, typename ... Inits>
     auto operator()(Executor exec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -71,8 +71,8 @@ struct vfork_launcher :  default_launcher
     auto operator()(Executor exec,
                     error_code & ec,
                     const typename std::enable_if<
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                            net::execution::is_executor<Executor>::value ||
+                            net::is_executor<Executor>::value,
                             filesystem::path >::type & executable,
                     Args && args,
                     Inits && ... inits ) -> basic_process<Executor>
@@ -86,17 +86,17 @@ struct vfork_launcher :  default_launcher
             return basic_process<Executor>(exec);
         }
 
-        auto & ctx = BOOST_PROCESS_V2_ASIO_NAMESPACE::query(
-                exec, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::context);
-        ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_prepare);
+        auto & ctx = net::query(
+                exec, net::execution::context);
+        ctx.notify_fork(net::execution_context::fork_prepare);
         pid = ::vfork();
         if (pid == -1)
         {
-            ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+            ctx.notify_fork(net::execution_context::fork_parent);
             detail::on_fork_error(*this, executable, argv, ec, inits...);
             detail::on_error(*this, executable, argv, ec, inits...);
 
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+            BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
             return basic_process<Executor>{exec};
         }
         else if (pid == 0)
@@ -107,12 +107,12 @@ struct vfork_launcher :  default_launcher
             if (!ec)
                 ::execve(executable.c_str(), const_cast<char * const *>(argv), const_cast<char * const *>(env));
 
-            BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category())
+            BOOST_PROCESS_V2_ASSIGN_EC(ec, errno, system_category());
             detail::on_exec_error(*this, executable, argv, ec, inits...);
             ::_exit(EXIT_FAILURE);
             return basic_process<Executor>{exec};
         }
-        ctx.notify_fork(BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context::fork_parent);
+        ctx.notify_fork(net::execution_context::fork_parent);
 
         if (ec)
         {
diff --git a/inst/include/boost/process/v2/process.hpp b/inst/include/boost/process/v2/process.hpp
index a624297bb..9c96d23b7 100644
--- a/inst/include/boost/process/v2/process.hpp
+++ b/inst/include/boost/process/v2/process.hpp
@@ -34,7 +34,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
 /* A `basic_process` object manages a subprocess; it tracks the status and exit-code,
  * and will terminate the process on destruction if `detach` was not called.
 */
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_process
 {
   /// The executor of the process
@@ -111,7 +111,7 @@ struct basic_process
       ExecutionContext & context,
       typename std::enable_if<
           std::is_convertible<ExecutionContext&, 
-                              BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                              net::execution_context&>::value,
           const filesystem::path&>::type exe,
       std::initializer_list<string_view> args,
       Inits&&... inits)
@@ -125,7 +125,7 @@ struct basic_process
       ExecutionContext & context,
       typename std::enable_if<
           std::is_convertible<ExecutionContext&, 
-                              BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                              net::execution_context&>::value,
           const filesystem::path&>::type exe,
       Args&& args, Inits&&... inits)
       : basic_process(default_process_launcher()(executor_type(context.get_executor()),
@@ -148,7 +148,7 @@ struct basic_process
   explicit basic_process(ExecutionContext & context, pid_type pid,
                          typename std::enable_if<
                              std::is_convertible<ExecutionContext&,
-                                BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value, void *>::type = nullptr)
+                                net::execution_context&>::value, void *>::type = nullptr)
        : process_handle_(context, pid) {}
 
   /// Attach to an existing process and the internal handle
@@ -156,7 +156,7 @@ struct basic_process
   explicit basic_process(ExecutionContext & context, pid_type pid, native_handle_type native_handle,
                          typename std::enable_if<
                             std::is_convertible<ExecutionContext&, 
-                                BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value, void *>::type = nullptr)
+                                net::execution_context&>::value, void *>::type = nullptr)
       : process_handle_(context.get_executor(), pid, native_handle) {}
 
   /// Create an invalid handle
@@ -164,7 +164,7 @@ struct basic_process
   explicit basic_process(ExecutionContext & context,
                          typename std::enable_if<
                              is_convertible<ExecutionContext&, 
-                                BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value, void *>::type = nullptr)
+                                net::execution_context&>::value, void *>::type = nullptr)
      : process_handle_(context.get_executor()) {}
 
 
@@ -325,15 +325,7 @@ struct basic_process
   /** Note that this might be a process that already exited.*/
   bool is_open() const { return process_handle_.is_open(); }
   
-  /// Asynchronously wait for the process to exit and deliver the native exit-code in the completion handler.
-  template <BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void (error_code, int))
-            WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, int))
-  async_wait(WaitHandler && handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-  {
-    return BOOST_PROCESS_V2_ASIO_NAMESPACE::async_compose<WaitHandler, void (error_code, int)>(
-      async_wait_op_{process_handle_, exit_status_}, handler, process_handle_);
-  }
+
 
 private:
   template<typename Executor1>
@@ -363,7 +355,7 @@ struct basic_process
             }
         };
 
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::post(handle.get_executor(),
+        net::post(handle.get_executor(),
                                               completer{static_cast<int>(res), std::move(self)});
       }
       else
@@ -383,6 +375,18 @@ struct basic_process
       }
     }
   };
+
+ public:
+  /// Asynchronously wait for the process to exit and deliver the native exit-code in the completion handler.
+  template <BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void (error_code, int))
+  WaitHandler = net::default_completion_token_t<executor_type>>
+  auto async_wait(WaitHandler && handler = net::default_completion_token_t<executor_type>())
+    -> decltype(net::async_compose<WaitHandler, void (error_code, int)>(
+        async_wait_op_{process_handle_, exit_status_}, handler, process_handle_))
+  {
+    return net::async_compose<WaitHandler, void (error_code, int)>(
+        async_wait_op_{process_handle_, exit_status_}, handler, process_handle_);
+  }
 };
 
 /// Process with the default executor.
diff --git a/inst/include/boost/process/v2/process_handle.hpp b/inst/include/boost/process/v2/process_handle.hpp
index 04ea6e62c..e0894e338 100644
--- a/inst/include/boost/process/v2/process_handle.hpp
+++ b/inst/include/boost/process/v2/process_handle.hpp
@@ -32,7 +32,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
  * Note that the exit code might be discovered early, during a call to `running`.
  * Thus it can only be discovered that process has exited already.
  */
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 struct basic_process_handle
 {
     /// The native handle of the process. 
@@ -123,28 +123,26 @@ struct basic_process_handle
 
     /// Asynchronously wait for the process to exit and deliver the native exit-code in the completion handler.
     template<BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(void(error_code, native_exit_code_type))
-             WaitHandler BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-             BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(WaitHandler, void (error_code, native_exit_code_type))
-    async_wait(WaitHandler &&handler BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type));
-
+             WaitHandler = net::default_completion_token_t<executor_type>>
+    auto async_wait(WaitHandler &&handler = net::default_completion_token_t<executor_type>());
 };
 
 
 #else
 #if defined(BOOST_PROCESS_V2_WINDOWS)
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 using basic_process_handle = detail::basic_process_handle_win<Executor>;
 #else
 
 #if defined(BOOST_PROCESS_V2_PIDFD_OPEN)
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 using basic_process_handle = detail::basic_process_handle_fd<Executor>;
 #elif defined(BOOST_PROCESS_V2_PDFORK)
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 using basic_process_handle = detail::basic_process_handle_fd_or_signal<Executor>;
 #else
 
-template<typename Executor = BOOST_PROCESS_V2_ASIO_NAMESPACE::any_io_executor>
+template<typename Executor = net::any_io_executor>
 using basic_process_handle = detail::basic_process_handle_signal<Executor>;
 
 #endif
@@ -157,13 +155,4 @@ using process_handle = basic_process_handle<>;
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/impl/process_handle.ipp>
-
-#endif
-
-
-
-
 #endif //BOOST_PROCESS_V2_PROCESS_HANDLE_HPP
diff --git a/inst/include/boost/process/v2/shell.hpp b/inst/include/boost/process/v2/shell.hpp
index 518557191..4a991e03f 100644
--- a/inst/include/boost/process/v2/shell.hpp
+++ b/inst/include/boost/process/v2/shell.hpp
@@ -140,10 +140,4 @@ struct shell
 
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-
-#include <boost/process/v2/impl/shell.ipp>
-
-#endif
-
 #endif //BOOST_PROCESS_V2_ERROR_HPP
diff --git a/inst/include/boost/process/v2/src.hpp b/inst/include/boost/process/v2/src.hpp
deleted file mode 100644
index 86470a4d0..000000000
--- a/inst/include/boost/process/v2/src.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2021 Klemens D. Morgenstern
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_V2_SRC_HPP
-#define BOOST_PROCESS_V2_SRC_HPP
-
-#define BOOST_PROCESS_V2_SOURCE
-
-#include <boost/process/v2/detail/config.hpp>
-
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-# error Do not compile Process V2 library source with BOOST_PROCESS_V2_HEADER_ONLY defined. You should probably define BOOST_PROCESS_V2_SEPARATE_COMPILATION
-#endif
-
-#include <boost/process/v2/impl/error.ipp>
-#include <boost/process/v2/impl/pid.ipp>
-#include <boost/process/v2/ext/impl/exe.ipp>
-#include <boost/process/v2/ext/impl/cwd.ipp>
-#include <boost/process/v2/ext/impl/cmd.ipp>
-#include <boost/process/v2/ext/impl/env.ipp>
-#include <boost/process/v2/ext/detail/impl/proc_info.ipp>
-#include <boost/process/v2/detail/impl/environment.ipp>
-#include <boost/process/v2/detail/impl/last_error.ipp>
-#include <boost/process/v2/detail/impl/throw_error.ipp>
-#include <boost/process/v2/detail/impl/utf8.ipp>
-#include <boost/process/v2/impl/default_launcher.ipp>
-#include <boost/process/v2/impl/environment.ipp>
-#include <boost/process/v2/impl/process_handle.ipp>
-#include <boost/process/v2/impl/shell.ipp>
-
-#endif //BOOST_PROCESS_V2_SRC_HPP
diff --git a/inst/include/boost/process/v2/stdio.hpp b/inst/include/boost/process/v2/stdio.hpp
index b2ae021c5..fdc348ca2 100644
--- a/inst/include/boost/process/v2/stdio.hpp
+++ b/inst/include/boost/process/v2/stdio.hpp
@@ -103,7 +103,7 @@ struct process_io_binding
 
 
   template<typename Executor>
-  process_io_binding(BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_readable_pipe<Executor> & pipe)
+  process_io_binding(net::basic_readable_pipe<Executor> & pipe)
   {
     if (Target == STD_INPUT_HANDLE)
     {
@@ -112,9 +112,9 @@ struct process_io_binding
       return ;
     }
 
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::native_pipe_handle p[2];
+    net::detail::native_pipe_handle p[2];
     error_code ec;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::create_pipe(p, ec);
+    net::detail::create_pipe(p, ec);
     if (ec)
       detail::throw_error(ec, "create_pipe");
       
@@ -124,7 +124,7 @@ struct process_io_binding
 
 
   template<typename Executor>
-  process_io_binding(BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_writable_pipe<Executor> & pipe)
+  process_io_binding(net::basic_writable_pipe<Executor> & pipe)
   {
     if (Target != STD_INPUT_HANDLE)
     {
@@ -132,9 +132,9 @@ struct process_io_binding
       h = std::unique_ptr<void, handle_closer>{h_, get_flags(h_)};
       return ;
     }
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::native_pipe_handle p[2];
+    net::detail::native_pipe_handle p[2];
     error_code ec;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::create_pipe(p, ec);
+    net::detail::create_pipe(p, ec);
     if (ec)
       detail::throw_error(ec, "create_pipe");
 
@@ -181,7 +181,7 @@ struct process_io_binding
   }
 
   template<typename Executor>
-  process_io_binding(BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_readable_pipe<Executor> & readable_pipe)
+  process_io_binding(net::basic_readable_pipe<Executor> & readable_pipe)
   {
     if (Target == STDIN_FILENO)
     {
@@ -189,15 +189,15 @@ struct process_io_binding
       return ;
     }
 
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::native_pipe_handle p[2];
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::create_pipe(p, ec);
+    net::detail::native_pipe_handle p[2];
+    net::detail::create_pipe(p, ec);
     if (ec)
       detail::throw_error(ec, "create_pipe");
 
     fd = p[1];
     if (::fcntl(p[0], F_SETFD, FD_CLOEXEC) == -1)
     {
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
       return ;
     }
     fd_needs_closing = true;
@@ -206,7 +206,7 @@ struct process_io_binding
 
 
   template<typename Executor>
-  process_io_binding(BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_writable_pipe<Executor> & writable_pipe)
+  process_io_binding(net::basic_writable_pipe<Executor> & writable_pipe)
   {
 
     if (Target != STDIN_FILENO)
@@ -214,16 +214,16 @@ struct process_io_binding
       fd = writable_pipe.native_handle();
       return ;
     }
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::native_pipe_handle p[2];
+    net::detail::native_pipe_handle p[2];
     error_code ec;
-    BOOST_PROCESS_V2_ASIO_NAMESPACE::detail::create_pipe(p, ec);
+    net::detail::create_pipe(p, ec);
     if (ec)
       detail::throw_error(ec, "create_pipe");
 
     fd = p[0];
     if (::fcntl(p[1], F_SETFD, FD_CLOEXEC) == -1)
     {
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
       return ;
     }
     fd_needs_closing = true;
diff --git a/inst/include/boost/process/v2/windows/as_user_launcher.hpp b/inst/include/boost/process/v2/windows/as_user_launcher.hpp
index 0c47da092..3829a120d 100644
--- a/inst/include/boost/process/v2/windows/as_user_launcher.hpp
+++ b/inst/include/boost/process/v2/windows/as_user_launcher.hpp
@@ -28,7 +28,7 @@ struct as_user_launcher : default_launcher
   template<typename ExecutionContext, typename Args, typename ... Inits>
   auto operator()(ExecutionContext & context,
                   const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -47,19 +47,19 @@ struct as_user_launcher : default_launcher
   auto operator()(ExecutionContext & context,
                      error_code & ec,
                      const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
   {
-      return (*this)(context.get_executor(), executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
+      return (*this)(context.get_executor(), ec, executable, std::forward<Args>(args), std::forward<Inits>(inits)...);
   }
 
   template<typename Executor, typename Args, typename ... Inits>
   auto operator()(Executor exec,
                      const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value ||
+                             net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<Executor>
@@ -77,8 +77,8 @@ struct as_user_launcher : default_launcher
   auto operator()(Executor exec,
                   error_code & ec,
                   const typename std::enable_if<
-                      BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value || 
-                      BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                      net::execution::is_executor<Executor>::value ||
+                      net::is_executor<Executor>::value,
                         filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> basic_process<Executor>
@@ -107,7 +107,7 @@ struct as_user_launcher : default_launcher
 
     if (ok == 0)
     {
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
       detail::on_error(*this, executable, command_line, ec, inits...);
 
       if (process_information.hProcess != INVALID_HANDLE_VALUE)
@@ -133,4 +133,4 @@ struct as_user_launcher : default_launcher
 }
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#endif //  BOOST_PROCESS_V2_WINDOWS_AS_USER_LAUNCHER_HPP
\ No newline at end of file
+#endif //  BOOST_PROCESS_V2_WINDOWS_AS_USER_LAUNCHER_HPP
diff --git a/inst/include/boost/process/v2/windows/default_launcher.hpp b/inst/include/boost/process/v2/windows/default_launcher.hpp
index 2e44b33e4..7ea8c8472 100644
--- a/inst/include/boost/process/v2/windows/default_launcher.hpp
+++ b/inst/include/boost/process/v2/windows/default_launcher.hpp
@@ -236,7 +236,7 @@ struct default_launcher
   template<typename ExecutionContext, typename Args, typename ... Inits>
   auto operator()(ExecutionContext & context,
                   const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> enable_init<typename ExecutionContext::executor_type, Inits...>
@@ -255,7 +255,7 @@ struct default_launcher
   auto operator()(ExecutionContext & context,
                   error_code & ec,
                   const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> enable_init<typename ExecutionContext::executor_type, Inits...>
@@ -266,8 +266,8 @@ struct default_launcher
   template<typename Executor, typename Args, typename ... Inits>
   auto operator()(Executor exec,
                   const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value 
-                          || BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value
+                          || net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> enable_init<Executor, Inits...>
@@ -285,8 +285,8 @@ struct default_launcher
   auto operator()(Executor exec,
                   error_code & ec,
                   const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value || 
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value ||
+                             net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> enable_init<Executor, Inits...>
@@ -314,7 +314,7 @@ struct default_launcher
 
     if (ok == 0)
     {
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
       detail::on_error(*this, executable, command_line, ec, inits...);
 
       if (process_information.hProcess != INVALID_HANDLE_VALUE)
@@ -409,8 +409,6 @@ struct default_launcher
 }
 BOOST_PROCESS_V2_END_NAMESPACE
 
-#if defined(BOOST_PROCESS_V2_HEADER_ONLY)
-#include <boost/process/v2/windows/impl/default_launcher.ipp>
-#endif
+
 
 #endif //BOOST_PROCESS_V2_WINDOWS_DEFAULT_LAUNCHER_HPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/windows/impl/default_launcher.ipp b/inst/include/boost/process/v2/windows/impl/default_launcher.ipp
deleted file mode 100644
index 5c90a65fa..000000000
--- a/inst/include/boost/process/v2/windows/impl/default_launcher.ipp
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// boost/process/v2/windows/impl/default_launcher.ipp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2022 Klemens D. Morgenstern (klemens dot morgenstern at gmx dot net)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-#ifndef BOOST_PROCESS_V2_WINDOWS_IMPL_DEFAULT_LAUNCHER_IPP
-#define BOOST_PROCESS_V2_WINDOWS_IMPL_DEFAULT_LAUNCHER_IPP
-
-#include <boost/process/v2/detail/config.hpp>
-#include <boost/process/v2/windows/default_launcher.hpp>
-
-BOOST_PROCESS_V2_BEGIN_NAMESPACE
-namespace windows
-{
-
-  std::size_t default_launcher::escaped_argv_length(basic_string_view<wchar_t> ws)
-  {
-    if (ws.empty())
-      return 2u; // just quotes
-
-    constexpr static auto space = L' ';
-    constexpr static auto quote = L'"';
-
-    const auto has_space = ws.find(space) != basic_string_view<wchar_t>::npos;
-    const auto quoted = (ws.front() == quote) && (ws.back() == quote);
-    const auto needs_escape = has_space && !quoted ;
-
-    if (!needs_escape)
-      return ws.size();
-    else
-      return ws.size() + std::count(ws.begin(), ws.end(), quote) + 2u;
-  }
-
-
-  std::size_t default_launcher::escape_argv_string(wchar_t * itr, std::size_t max_size, 
-                                        basic_string_view<wchar_t> ws)
-  { 
-    const auto sz = escaped_argv_length(ws);
-    if (sz > max_size)
-      return 0u;
-    if (ws.empty())      
-    {
-      itr[0] = L'"';
-      itr[1] = L'"';
-      return 2u;
-    }
-
-    const auto has_space = ws.find(L' ') != basic_string_view<wchar_t>::npos;
-    const auto quoted = (ws.front() == L'"') && (ws.back() ==  L'"');
-    const auto needs_escape = has_space && !quoted;
-
-    if (!needs_escape)
-      return std::copy(ws.begin(), ws.end(), itr) - itr;
-
-    if (sz < (2u + ws.size()))
-      return 0u;
-      
-    const auto end = itr + sz; 
-    const auto begin = itr;
-    *(itr ++) = L'"';
-    for (auto wc : ws)
-    {
-      if (wc == L'"')
-        *(itr++) = L'\\';
-      *(itr++) = wc;
-    }
-
-    *(itr ++) = L'"';
-    return itr - begin;
-  }
-
-}
-BOOST_PROCESS_V2_END_NAMESPACE
-
-
-#endif //BOOST_PROCESS_V2_WINDOWS_IMPL_DEFAULT_LAUNCHER_IPP
\ No newline at end of file
diff --git a/inst/include/boost/process/v2/windows/with_logon_launcher.hpp b/inst/include/boost/process/v2/windows/with_logon_launcher.hpp
index 29c0e1270..a71540cac 100644
--- a/inst/include/boost/process/v2/windows/with_logon_launcher.hpp
+++ b/inst/include/boost/process/v2/windows/with_logon_launcher.hpp
@@ -39,7 +39,7 @@ struct with_logon_launcher : default_launcher
   auto operator()(ExecutionContext & context,
                   error_code & ec,
                   const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -51,7 +51,7 @@ struct with_logon_launcher : default_launcher
   template<typename ExecutionContext, typename Args, typename ... Inits>
   auto operator()(ExecutionContext & context,
                      const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -62,8 +62,8 @@ struct with_logon_launcher : default_launcher
   template<typename Executor, typename Args, typename ... Inits>
   auto operator()(Executor exec,
                      const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value ||
+                             net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<Executor>
@@ -81,8 +81,8 @@ struct with_logon_launcher : default_launcher
   auto operator()(Executor exec,
                      error_code & ec,
                      const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value || 
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value ||
+                             net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<Executor>
@@ -111,7 +111,7 @@ struct with_logon_launcher : default_launcher
 
     if (ok == 0)
     {
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
       detail::on_error(*this, executable, command_line, ec, inits...);
 
       if (process_information.hProcess != INVALID_HANDLE_VALUE)
diff --git a/inst/include/boost/process/v2/windows/with_token_launcher.hpp b/inst/include/boost/process/v2/windows/with_token_launcher.hpp
index e9f0dbfb2..48efab698 100644
--- a/inst/include/boost/process/v2/windows/with_token_launcher.hpp
+++ b/inst/include/boost/process/v2/windows/with_token_launcher.hpp
@@ -29,7 +29,7 @@ struct with_token_launcher : default_launcher
   template<typename ExecutionContext, typename Args, typename ... Inits>
   auto operator()(ExecutionContext & context,
                   const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                   Args && args,
                   Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -48,7 +48,7 @@ struct with_token_launcher : default_launcher
   auto operator()(ExecutionContext & context,
                      error_code & ec,
                      const typename std::enable_if<std::is_convertible<
-                             ExecutionContext&, BOOST_PROCESS_V2_ASIO_NAMESPACE::execution_context&>::value,
+                             ExecutionContext&, net::execution_context&>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<typename ExecutionContext::executor_type>
@@ -59,8 +59,8 @@ struct with_token_launcher : default_launcher
   template<typename Executor, typename Args, typename ... Inits>
   auto operator()(Executor exec,
                      const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value ||
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value ||
+                             net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<Executor>
@@ -78,8 +78,8 @@ struct with_token_launcher : default_launcher
   auto operator()(Executor exec,
                      error_code & ec,
                      const typename std::enable_if<
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::execution::is_executor<Executor>::value || 
-                             BOOST_PROCESS_V2_ASIO_NAMESPACE::is_executor<Executor>::value,
+                             net::execution::is_executor<Executor>::value ||
+                             net::is_executor<Executor>::value,
                              filesystem::path >::type & executable,
                      Args && args,
                      Inits && ... inits ) -> basic_process<Executor>
@@ -106,7 +106,7 @@ struct with_token_launcher : default_launcher
 
     if (ok == 0)
     {
-      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
       detail::on_error(*this, executable, command_line, ec, inits...);
 
       if (process_information.hProcess != INVALID_HANDLE_VALUE)
diff --git a/inst/include/boost/process/windows.hpp b/inst/include/boost/process/windows.hpp
index b1b0f3ef6..8bc2893b6 100644
--- a/inst/include/boost/process/windows.hpp
+++ b/inst/include/boost/process/windows.hpp
@@ -1,61 +1,9 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2024 Klemens D. Morgenstern
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_PROCESS_WINDOWS_HPP_
-#define BOOST_PROCESS_WINDOWS_HPP_
 
-#include <boost/process/detail/windows/show_window.hpp>
 
-/** \file boost/process/windows.hpp
- *
- *    Header which provides the windows extensions.
-
-\xmlonly
-<programlisting>
-namespace boost {
-  namespace process {
-    namespace windows {
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::hide">hide</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::maximized">maximized</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::minimized">minimized</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::minimized_not_active">minimized_not_active</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::not_active">not_active</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::show">show</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::show_normal">show_normal</globalname>;
-      <emphasis>unspecified</emphasis> <globalname alt="boost::process::windows::create_no_window">create_no_window</globalname>;
-    }
-  }
-}
-</programlisting>
- *  \endxmlonly
- *   \warning Only available on windows.
- *   See the parameter documentation of [ShowWindow](https://msdn.microsoft.com/en-us/library/windows/desktop/ms633548.aspx) for more details.
- */
-
-namespace boost { namespace process {
-
-///Namespace containing the windows extensions.
-namespace windows {
-
-///Hides the window and activates another window.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_HIDE_           > hide;
-///Activates the window and displays it as a maximized window.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_SHOWMAXIMIZED_  > maximized;
-///Activates the window and displays it as a minimized window.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_SHOWMINIMIZED_  > minimized;
-///Displays the window as a minimized window. This value is similar to `minimized`, except the window is not activated.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_SHOWMINNOACTIVE_> minimized_not_active;
-///Displays a window in its most recent size and position. This value is similar to show_normal`, except that the window is not activated.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_SHOWNOACTIVATE_ > not_active;
-///Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag when displaying the window for the first time.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_SHOWNORMAL_     > show;
-///Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag when displaying the window for the first time.
-constexpr ::boost::process::detail::windows::show_window<::boost::winapi::SW_SHOWNORMAL_     > show_normal;
-
-///Adds the [CREATE_NO_WINDOW](https://msdn.microsoft.com/en-us/library/windows/desktop/ms684863(v=vs.85).aspx) flag.
-constexpr ::boost::process::detail::windows::create_no_window_ create_no_window;
-
-}}}
-
-#endif /* BOOST_PROCESS_WINDOWS_HPP_ */
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("<boost/process/v1/windows.hpp>")
+#include <boost/process/v1/windows.hpp>
diff --git a/inst/include/boost/program_options/detail/parsers.hpp b/inst/include/boost/program_options/detail/parsers.hpp
index b644aaa17..cdda539ca 100644
--- a/inst/include/boost/program_options/detail/parsers.hpp
+++ b/inst/include/boost/program_options/detail/parsers.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace program_options {
     basic_command_line_parser<charT>::
     basic_command_line_parser(int argc, const charT* const argv[])
     : detail::cmdline(
-        to_internal(std::vector<std::basic_string<charT> >(argv+1, argv+argc))),
+        to_internal(std::vector<std::basic_string<charT> >(argc ? argv+1 : argv, argv+argc))),
         m_desc()
     {}
 
diff --git a/inst/include/boost/program_options/errors.hpp b/inst/include/boost/program_options/errors.hpp
index 283d009f9..56674bf24 100644
--- a/inst/include/boost/program_options/errors.hpp
+++ b/inst/include/boost/program_options/errors.hpp
@@ -121,7 +121,7 @@ namespace boost { namespace program_options {
         /** gcc says that throw specification on dtor is loosened 
          *  without this line                                     
          *  */ 
-        BOOST_DEFAULTED_FUNCTION(~error_with_option_name() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~error_with_option_name() BOOST_NOEXCEPT_OR_NOTHROW, {})
 
 
         //void dump() const
@@ -183,7 +183,7 @@ namespace boost { namespace program_options {
 
         /** Creates the error_message on the fly
          *      Currently a thin wrapper for substitute_placeholders() */
-        virtual const char* what() const throw();
+        virtual const char* what() const BOOST_NOEXCEPT_OR_NOTHROW;
 
     protected:
         /** Used to hold the error text returned by what() */
@@ -209,7 +209,7 @@ namespace boost { namespace program_options {
         multiple_values() 
          : error_with_option_name("option '%canonical_option%' only takes a single argument"){}
 
-        BOOST_DEFAULTED_FUNCTION(~multiple_values() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~multiple_values() BOOST_NOEXCEPT_OR_NOTHROW, {})
     };
 
     /** Class thrown when there are several occurrences of an
@@ -220,7 +220,7 @@ namespace boost { namespace program_options {
         multiple_occurrences() 
          : error_with_option_name("option '%canonical_option%' cannot be specified more than once"){}
 
-        BOOST_DEFAULTED_FUNCTION(~multiple_occurrences() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~multiple_occurrences() BOOST_NOEXCEPT_OR_NOTHROW, {})
 
     };
 
@@ -233,7 +233,7 @@ namespace boost { namespace program_options {
        {
        }
 
-       BOOST_DEFAULTED_FUNCTION(~required_option() throw(), {})
+       BOOST_DEFAULTED_FUNCTION(~required_option() BOOST_NOEXCEPT_OR_NOTHROW, {})
     };
 
     /** Base class of unparsable options,
@@ -258,7 +258,7 @@ namespace boost { namespace program_options {
         /** Does NOT set option name, because no option name makes sense */
         virtual void set_option_name(const std::string&) {}
 
-        BOOST_DEFAULTED_FUNCTION(~error_with_no_option_name() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~error_with_no_option_name() BOOST_NOEXCEPT_OR_NOTHROW, {})
     };
 
 
@@ -270,7 +270,7 @@ namespace boost { namespace program_options {
         {
         }
 
-        BOOST_DEFAULTED_FUNCTION(~unknown_option() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~unknown_option() BOOST_NOEXCEPT_OR_NOTHROW, {})
     };
 
 
@@ -283,9 +283,9 @@ namespace boost { namespace program_options {
             m_alternatives(xalternatives)
         {}
 
-        BOOST_DEFAULTED_FUNCTION(~ambiguous_option() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~ambiguous_option() BOOST_NOEXCEPT_OR_NOTHROW, {})
 
-        const std::vector<std::string>& alternatives() const throw() {return m_alternatives;}
+        const std::vector<std::string>& alternatives() const BOOST_NOEXCEPT_OR_NOTHROW {return m_alternatives;}
 
     protected:
         /** Makes all substitutions using the template */
@@ -320,7 +320,7 @@ namespace boost { namespace program_options {
         {
         }
 
-        BOOST_DEFAULTED_FUNCTION(~invalid_syntax() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~invalid_syntax() BOOST_NOEXCEPT_OR_NOTHROW, {})
 
         kind_t kind() const {return m_kind;}
 
@@ -340,7 +340,7 @@ namespace boost { namespace program_options {
             m_substitutions["invalid_line"] = invalid_line;
         }
 
-        BOOST_DEFAULTED_FUNCTION(~invalid_config_file_syntax() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~invalid_config_file_syntax() BOOST_NOEXCEPT_OR_NOTHROW, {})
 
         /** Convenience functions for backwards compatibility */
         virtual std::string tokens() const {return m_substitutions.find("invalid_line")->second;    }
@@ -355,7 +355,7 @@ namespace boost { namespace program_options {
                        const std::string& original_token = "",
                        int option_style              = 0):
             invalid_syntax(kind, option_name, original_token, option_style) {}
-        BOOST_DEFAULTED_FUNCTION(~invalid_command_line_syntax() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~invalid_command_line_syntax() BOOST_NOEXCEPT_OR_NOTHROW, {})
     };
 
 
@@ -380,7 +380,7 @@ namespace boost { namespace program_options {
         {
         }
 
-        BOOST_DEFAULTED_FUNCTION(~validation_error() throw(), {})
+        BOOST_DEFAULTED_FUNCTION(~validation_error() BOOST_NOEXCEPT_OR_NOTHROW, {})
 
         kind_t kind() const { return m_kind; }
 
diff --git a/inst/include/boost/program_options/parsers.hpp b/inst/include/boost/program_options/parsers.hpp
index 057646927..7d902690a 100644
--- a/inst/include/boost/program_options/parsers.hpp
+++ b/inst/include/boost/program_options/parsers.hpp
@@ -120,7 +120,11 @@ namespace boost { namespace program_options {
         basic_command_line_parser(const std::vector<
                                   std::basic_string<charT> >& args);
         /** Creates a command line parser for the specified arguments
-            list. The parameters should be the same as passed to 'main'.
+            list. The parameters should be the same as passed to 'main', meaning:
+            @param argc Must be non-negative i.e. >= 0
+            @param argv Argv[argc] must be 0 e.g. nullptr and
+            if argc is >0 argv[0] up to argv[argc-1] must point to
+            null terminated strings
         */
         basic_command_line_parser(int argc, const charT* const argv[]);
 
diff --git a/inst/include/boost/property_tree/detail/exception_implementation.hpp b/inst/include/boost/property_tree/detail/exception_implementation.hpp
index bb39135fd..77cf9bc4a 100644
--- a/inst/include/boost/property_tree/detail/exception_implementation.hpp
+++ b/inst/include/boost/property_tree/detail/exception_implementation.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_PROPERTY_TREE_DETAIL_EXCEPTIONS_IMPLEMENTATION_HPP_INCLUDED
 #define BOOST_PROPERTY_TREE_DETAIL_EXCEPTIONS_IMPLEMENTATION_HPP_INCLUDED
 
+#include <boost/property_tree/exceptions.hpp>
+
+#include <string>
+
 namespace boost { namespace property_tree
 {
 
@@ -35,10 +39,6 @@ namespace boost { namespace property_tree
     {
     }
 
-    inline ptree_error::~ptree_error() throw()
-    {
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // ptree_bad_data
 
@@ -48,10 +48,6 @@ namespace boost { namespace property_tree
     {
     }
 
-    inline ptree_bad_data::~ptree_bad_data() throw()
-    {
-    }
-
     template<class D> inline
     D ptree_bad_data::data() const
     {
@@ -68,10 +64,6 @@ namespace boost { namespace property_tree
 
     }
 
-    inline ptree_bad_path::~ptree_bad_path() throw()
-    {
-    }
-
     template<class P> inline
     P ptree_bad_path::path() const
     {
diff --git a/inst/include/boost/property_tree/detail/file_parser_error.hpp b/inst/include/boost/property_tree/detail/file_parser_error.hpp
index 1a0e49aad..4ed45b497 100644
--- a/inst/include/boost/property_tree/detail/file_parser_error.hpp
+++ b/inst/include/boost/property_tree/detail/file_parser_error.hpp
@@ -12,6 +12,7 @@
 
 #include <boost/property_tree/ptree.hpp>
 #include <string>
+#include <sstream>
 
 namespace boost { namespace property_tree
 {
@@ -23,7 +24,7 @@ namespace boost { namespace property_tree
     public:
 
         ///////////////////////////////////////////////////////////////////////
-        // Construction & destruction
+        // Construction
 
         // Construct error
         file_parser_error(const std::string &msg,
@@ -34,12 +35,6 @@ namespace boost { namespace property_tree
         {
         }
 
-        ~file_parser_error() throw() BOOST_OVERRIDE
-            // gcc 3.4.2 complains about lack of throw specifier on compiler
-            // generated dtor
-        {
-        }
-
         ///////////////////////////////////////////////////////////////////////
         // Data access
 
diff --git a/inst/include/boost/property_tree/detail/info_parser_write.hpp b/inst/include/boost/property_tree/detail/info_parser_write.hpp
index 31ce6dd0d..1aa6c5534 100644
--- a/inst/include/boost/property_tree/detail/info_parser_write.hpp
+++ b/inst/include/boost/property_tree/detail/info_parser_write.hpp
@@ -10,8 +10,11 @@
 #ifndef BOOST_PROPERTY_TREE_DETAIL_INFO_PARSER_WRITE_HPP_INCLUDED
 #define BOOST_PROPERTY_TREE_DETAIL_INFO_PARSER_WRITE_HPP_INCLUDED
 
-#include "boost/property_tree/ptree.hpp"
-#include "boost/property_tree/detail/info_parser_utils.hpp"
+#include <boost/property_tree/detail/info_parser_error.hpp>
+#include <boost/property_tree/detail/info_parser_utils.hpp>
+#include <boost/property_tree/detail/info_parser_writer_settings.hpp>
+#include <boost/property_tree/ptree.hpp>
+
 #include <string>
 
 namespace boost { namespace property_tree { namespace info_parser
diff --git a/inst/include/boost/property_tree/detail/ptree_implementation.hpp b/inst/include/boost/property_tree/detail/ptree_implementation.hpp
index 1af65ca84..1f2d8444a 100644
--- a/inst/include/boost/property_tree/detail/ptree_implementation.hpp
+++ b/inst/include/boost/property_tree/detail/ptree_implementation.hpp
@@ -11,6 +11,7 @@
 #ifndef BOOST_PROPERTY_TREE_DETAIL_PTREE_IMPLEMENTATION_HPP_INCLUDED
 #define BOOST_PROPERTY_TREE_DETAIL_PTREE_IMPLEMENTATION_HPP_INCLUDED
 
+#include <boost/property_tree/ptree.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
 #include <boost/assert.hpp>
diff --git a/inst/include/boost/property_tree/detail/rapidxml.hpp b/inst/include/boost/property_tree/detail/rapidxml.hpp
index 5c297de70..7afc0a600 100644
--- a/inst/include/boost/property_tree/detail/rapidxml.hpp
+++ b/inst/include/boost/property_tree/detail/rapidxml.hpp
@@ -59,7 +59,7 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml
 
         //! Gets human readable description of error.
         //! \return Pointer to null terminated description of the error.
-        const char *what() const throw() BOOST_OVERRIDE
+        const char *what() const throw() override
         {
             return m_what;
         }
diff --git a/inst/include/boost/property_tree/exceptions.hpp b/inst/include/boost/property_tree/exceptions.hpp
index ab4a9511b..853f0a12a 100644
--- a/inst/include/boost/property_tree/exceptions.hpp
+++ b/inst/include/boost/property_tree/exceptions.hpp
@@ -30,8 +30,6 @@ namespace boost { namespace property_tree
         /// Instantiate a ptree_error instance with the given message.
         /// @param what The message to associate with this error.
         ptree_error(const std::string &what);
-
-        ~ptree_error() throw() BOOST_OVERRIDE;
     };
 
 
@@ -48,8 +46,6 @@ namespace boost { namespace property_tree
         template<class T> ptree_bad_data(const std::string &what,
                                          const T &data);
 
-        ~ptree_bad_data() throw() BOOST_OVERRIDE;
-
         /// Retrieve the data associated with this error. This is the source
         /// value that failed to be translated. You need to explicitly
         /// specify its type.
@@ -70,8 +66,6 @@ namespace boost { namespace property_tree
         template<class T> ptree_bad_path(const std::string &what,
                                          const T &path);
 
-        ~ptree_bad_path() throw() BOOST_OVERRIDE;
-
         /// Retrieve the invalid path. You need to explicitly specify the
         /// type of path.
         template<class T> T path() const;
diff --git a/inst/include/boost/property_tree/json_parser/detail/parser.hpp b/inst/include/boost/property_tree/json_parser/detail/parser.hpp
index a03c19eb9..164f1baed 100644
--- a/inst/include/boost/property_tree/json_parser/detail/parser.hpp
+++ b/inst/include/boost/property_tree/json_parser/detail/parser.hpp
@@ -5,6 +5,7 @@
 
 #include <boost/core/ref.hpp>
 #include <boost/bind/bind.hpp>
+#include <boost/bind/placeholders.hpp>
 
 #include <iterator>
 #include <sstream>
diff --git a/inst/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp b/inst/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp
index 0ece28089..36102b10a 100644
--- a/inst/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp
+++ b/inst/include/boost/property_tree/json_parser/detail/standard_callbacks.hpp
@@ -117,7 +117,6 @@ namespace boost { namespace property_tree {
                 return *stack.back().t;
             }
             case object:
-            default:
                 BOOST_ASSERT(false); // must start with string, i.e. call new_value
             case key: {
                 l.t->push_back(std::make_pair(key_buffer, Ptree()));
@@ -130,6 +129,8 @@ namespace boost { namespace property_tree {
                 stack.pop_back();
                 return new_tree();
             }
+            BOOST_ASSERT(false);
+            BOOST_UNREACHABLE_RETURN(root);
         }
         string& new_value() {
             if (stack.empty()) return new_tree().data();
diff --git a/inst/include/boost/property_tree/json_parser/detail/write.hpp b/inst/include/boost/property_tree/json_parser/detail/write.hpp
index b8ef7eb66..71071f074 100644
--- a/inst/include/boost/property_tree/json_parser/detail/write.hpp
+++ b/inst/include/boost/property_tree/json_parser/detail/write.hpp
@@ -10,6 +10,7 @@
 #ifndef BOOST_PROPERTY_TREE_DETAIL_JSON_PARSER_WRITE_HPP_INCLUDED
 #define BOOST_PROPERTY_TREE_DETAIL_JSON_PARSER_WRITE_HPP_INCLUDED
 
+#include <boost/property_tree/json_parser/error.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/next_prior.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
@@ -158,7 +159,10 @@ namespace boost { namespace property_tree { namespace json_parser
         if (!verify_json(pt, 0))
             BOOST_PROPERTY_TREE_THROW(json_parser_error("ptree contains data that cannot be represented in JSON format", filename, 0));
         write_json_helper(stream, pt, 0, pretty);
-        stream << std::endl; // outputting endl performs flush
+
+        if (pretty) stream << std::endl;
+        else stream << std::flush;
+
         if (!stream.good())
             BOOST_PROPERTY_TREE_THROW(json_parser_error("write error", filename, 0));
     }
diff --git a/inst/include/boost/property_tree/ptree.hpp b/inst/include/boost/property_tree/ptree.hpp
index ac4593ba5..2743123c9 100644
--- a/inst/include/boost/property_tree/ptree.hpp
+++ b/inst/include/boost/property_tree/ptree.hpp
@@ -270,6 +270,10 @@ namespace boost { namespace property_tree
         const self_type &get_child(const path_type &path,
                                    const self_type &default_value) const;
 
+        /** Prevents calls to get_child with temporary default values */
+        void get_child(const path_type &path,
+                       const self_type &&default_value) const = delete;
+
         /** Get the child at the given path, or return boost::null. */
         optional<self_type &> get_child_optional(const path_type &path);
 
diff --git a/inst/include/boost/property_tree/ptree_serialization.hpp b/inst/include/boost/property_tree/ptree_serialization.hpp
index d856a0603..3c5564780 100644
--- a/inst/include/boost/property_tree/ptree_serialization.hpp
+++ b/inst/include/boost/property_tree/ptree_serialization.hpp
@@ -42,7 +42,7 @@ namespace boost { namespace property_tree
     template<class Archive, class K, class D, class C>
     inline void save(Archive &ar,
                      const basic_ptree<K, D, C> &t,
-                     const unsigned int file_version)
+                     const unsigned int /*file_version*/)
     {
         using namespace boost::serialization;
         stl::save_collection<Archive, basic_ptree<K, D, C> >(ar, t);
@@ -99,7 +99,7 @@ namespace boost { namespace property_tree
     template<class Archive, class K, class D, class C>
     inline void load(Archive &ar,
                      basic_ptree<K, D, C> &t,
-                     const unsigned int file_version)
+                     const unsigned int /*file_version*/)
     {
         namespace bsl = boost::serialization;
 
diff --git a/inst/include/boost/property_tree/string_path.hpp b/inst/include/boost/property_tree/string_path.hpp
index 6932d59b0..de2abc0a4 100644
--- a/inst/include/boost/property_tree/string_path.hpp
+++ b/inst/include/boost/property_tree/string_path.hpp
@@ -129,6 +129,13 @@ namespace boost { namespace property_tree
             return detail::dump_sequence(m_value);
         }
 
+        /// Concatenates two path components
+        friend string_path operator /(string_path p1, const string_path &p2)
+        {
+            p1 /= p2;
+            return p1;
+        }
+
         /// Append a second path to this one.
         /// @pre o's separator is the same as this one's, or o has no separators
         string_path& operator /=(const string_path &o) {
@@ -243,36 +250,6 @@ namespace boost { namespace property_tree
         typedef std::basic_string<Ch, Traits, Alloc> _string;
         typedef string_path< _string, id_translator<_string> > type;
     };
-
-    template <typename String, typename Translator> inline
-    string_path<String, Translator> operator /(
-                                  string_path<String, Translator> p1,
-                                  const string_path<String, Translator> &p2)
-    {
-        p1 /= p2;
-        return p1;
-    }
-
-    // These shouldn't be necessary, but GCC won't find the one above.
-    template <typename String, typename Translator> inline
-    string_path<String, Translator> operator /(
-                                  string_path<String, Translator> p1,
-                                  const typename String::value_type *p2)
-    {
-        p1 /= p2;
-        return p1;
-    }
-
-    template <typename String, typename Translator> inline
-    string_path<String, Translator> operator /(
-                                  const typename String::value_type *p1,
-                                  const string_path<String, Translator> &p2)
-    {
-        string_path<String, Translator> t(p1);
-        t /= p2;
-        return t;
-    }
-
 }}
 
 #endif
diff --git a/inst/include/boost/python/class.hpp b/inst/include/boost/python/class.hpp
index 77f915ba0..0f1c0fdc1 100644
--- a/inst/include/boost/python/class.hpp
+++ b/inst/include/boost/python/class.hpp
@@ -372,10 +372,11 @@ class class_ : public objects::class_base
     {
         typedef typename api::is_object_operators<F>::type is_obj_or_proxy;
         
-        return this->make_fn_impl(
+        return objects::add_doc(
+            this->make_fn_impl(
             detail::unwrap_wrapper((W*)0)
           , f, is_obj_or_proxy(), (char*)0, detail::is_data_member_pointer<F>()
-        );
+        ), NULL);
     }
     
     template <class F>
@@ -383,10 +384,11 @@ class class_ : public objects::class_base
     {
         typedef typename api::is_object_operators<F>::type is_obj_or_proxy;
         
-        return this->make_fn_impl(
+        return objects::add_doc(
+            this->make_fn_impl(
             detail::unwrap_wrapper((W*)0)
           , f, is_obj_or_proxy(), (int*)0, detail::is_data_member_pointer<F>()
-        );
+        ), NULL);
     }
     
     template <class T, class F>
diff --git a/inst/include/boost/python/converter/pytype_function.hpp b/inst/include/boost/python/converter/pytype_function.hpp
index 8e0a4e799..d072b55fb 100644
--- a/inst/include/boost/python/converter/pytype_function.hpp
+++ b/inst/include/boost/python/converter/pytype_function.hpp
@@ -9,7 +9,7 @@
 # include <boost/python/converter/registered.hpp>
 #  include <boost/python/detail/unwind_type.hpp>
 #  include <boost/python/detail/type_traits.hpp>
-
+# include <boost/python/back_reference.hpp>
 
 namespace boost { namespace python {
 
@@ -46,6 +46,12 @@ inline python::type_info unwind_type_id_(boost::type<T>* = 0, mpl::false_ * =0)
     return boost::python::detail::unwind_type<unwind_type_id_helper, T> ();
 }
 
+template <class T>
+inline python::type_info unwind_type_id_(boost::type<back_reference<T> >* = 0, mpl::false_ * =0)
+{
+    return boost::python::detail::unwind_type<unwind_type_id_helper, T> ();
+}
+
 inline python::type_info unwind_type_id_(boost::type<void>* = 0, mpl::true_* =0)
 {
     return type_id<void>();
diff --git a/inst/include/boost/python/detail/config.hpp b/inst/include/boost/python/detail/config.hpp
index 8dce9b742..e2ac82704 100644
--- a/inst/include/boost/python/detail/config.hpp
+++ b/inst/include/boost/python/detail/config.hpp
@@ -57,9 +57,15 @@
  ****************************************************************************/
 
 // backwards compatibility:
-#ifdef BOOST_PYTHON_STATIC_LIB
-#  define BOOST_PYTHON_STATIC_LINK
-# elif !defined(BOOST_PYTHON_DYNAMIC_LIB)
+#if defined(BOOST_PYTHON_STATIC_LINK) && !defined(BOOST_PYTHON_STATIC_LIB)
+#  define BOOST_PYTHON_STATIC_LIB
+#endif
+
+#if defined(BOOST_PYTHON_DYNAMIC_LINK) && !defined(BOOST_PYTHON_DYNAMIC_LIB)
+#  define BOOST_PYTHON_DYNAMIC_LIB
+#endif
+
+#if !defined(BOOST_PYTHON_STATIC_LIB) && !defined(BOOST_PYTHON_DYNAMIC_LIB)
 #  define BOOST_PYTHON_DYNAMIC_LIB
 #endif
 
diff --git a/inst/include/boost/python/make_constructor.hpp b/inst/include/boost/python/make_constructor.hpp
index 3ec9ad5f8..3769970ca 100644
--- a/inst/include/boost/python/make_constructor.hpp
+++ b/inst/include/boost/python/make_constructor.hpp
@@ -61,7 +61,8 @@ namespace detail
           typedef objects::pointer_holder<Ptr,value_type> holder;
           typedef objects::instance<holder> instance_t;
 
-          void* memory = holder::allocate(this->m_self, offsetof(instance_t, storage), sizeof(holder));
+          void* memory = holder::allocate(this->m_self, offsetof(instance_t, storage), sizeof(holder),
+                                          boost::python::detail::alignment_of<holder>::value);
           try {
 #if defined(BOOST_NO_CXX11_SMART_PTR)
               (new (memory) holder(x))->install(this->m_self);
diff --git a/inst/include/boost/python/object/add_to_namespace.hpp b/inst/include/boost/python/object/add_to_namespace.hpp
index 9f4167d6d..e81186790 100644
--- a/inst/include/boost/python/object/add_to_namespace.hpp
+++ b/inst/include/boost/python/object/add_to_namespace.hpp
@@ -18,6 +18,8 @@ BOOST_PYTHON_DECL void add_to_namespace(
 BOOST_PYTHON_DECL void add_to_namespace(
     object const& name_space, char const* name, object const& attribute, char const* doc);
 
+BOOST_PYTHON_DECL object const& add_doc(object const& attribute, char const* doc);
+
 }}} // namespace boost::python::objects
 
 #endif // ADD_TO_NAMESPACE_DWA200286_HPP
diff --git a/inst/include/boost/python/object/function.hpp b/inst/include/boost/python/object/function.hpp
index f29d34482..ec1fc3d38 100644
--- a/inst/include/boost/python/object/function.hpp
+++ b/inst/include/boost/python/object/function.hpp
@@ -35,6 +35,8 @@ struct BOOST_PYTHON_DECL function : PyObject
     static void add_to_namespace(
         object const& name_space, char const* name, object const& attribute, char const* doc);
 
+    static object const& add_doc(object const& attribute, char const* doc);
+
     object const& doc() const;
     void doc(object const& x);
     
@@ -42,6 +44,8 @@ struct BOOST_PYTHON_DECL function : PyObject
 
     object const& get_namespace() const { return m_namespace; }
     
+    object const& get_module() const { return m_module; }
+
  private: // helper functions
     object signature(bool show_return_type=false) const;
     object signatures(bool show_return_type=false) const;
@@ -53,6 +57,7 @@ struct BOOST_PYTHON_DECL function : PyObject
     handle<function> m_overloads;
     object m_name;
     object m_namespace;
+    object m_module;
     object m_doc;
     object m_arg_names;
     unsigned m_nkeyword_values;
diff --git a/inst/include/boost/python/object/function_doc_signature.hpp b/inst/include/boost/python/object/function_doc_signature.hpp
index 4f00cb385..91c90895c 100644
--- a/inst/include/boost/python/object/function_doc_signature.hpp
+++ b/inst/include/boost/python/object/function_doc_signature.hpp
@@ -18,13 +18,13 @@
 namespace boost { namespace python { namespace objects {
 
 class function_doc_signature_generator{
-    static const  char * py_type_str(const python::detail::signature_element &s);
+    static str py_type_str(const python::detail::signature_element &s, const object& current_module_name);
     static bool arity_cmp( function const *f1, function const *f2 );
     static bool are_seq_overloads( function const *f1, function const *f2 , bool check_docs);
     static std::vector<function const*> flatten(function const *f);
     static std::vector<function const*> split_seq_overloads( const std::vector<function const *> &funcs, bool split_on_doc_change);
     static str raw_function_pretty_signature(function const *f, size_t n_overloads,  bool cpp_types = false);
-    static str parameter_string(py_function const &f, size_t n, object arg_names, bool cpp_types);
+    static str parameter_string(py_function const &f, size_t n, object arg_names, const object& module_name, bool cpp_types);
     static str pretty_signature(function const *f, size_t n_overloads,  bool cpp_types = false);
 
 public:
diff --git a/inst/include/boost/python/pure_virtual.hpp b/inst/include/boost/python/pure_virtual.hpp
index 58e9aedef..f3b298de2 100644
--- a/inst/include/boost/python/pure_virtual.hpp
+++ b/inst/include/boost/python/pure_virtual.hpp
@@ -96,6 +96,7 @@ namespace detail
             , make_function(
                   detail::nullary_function_adaptor<void(*)()>(pure_virtual_called)
                 , default_call_policies()
+                , options.keywords()
                 , detail::error_signature<held_type>(detail::get_signature(m_pmf))
               )
           );
diff --git a/inst/include/boost/qvm.hpp b/inst/include/boost/qvm.hpp
index 4987e8e94..d85b138fe 100644
--- a/inst/include/boost/qvm.hpp
+++ b/inst/include/boost/qvm.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_HPP_INCLUDED
 #define BOOST_QVM_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/all.hpp b/inst/include/boost/qvm/all.hpp
index 42c919e8d..d935d3ab2 100644
--- a/inst/include/boost/qvm/all.hpp
+++ b/inst/include/boost/qvm/all.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/assert.hpp b/inst/include/boost/qvm/assert.hpp
index 6375faa8f..2a6c00542 100644
--- a/inst/include/boost/qvm/assert.hpp
+++ b/inst/include/boost/qvm/assert.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/config.hpp b/inst/include/boost/qvm/config.hpp
index 465814339..51b9578bc 100644
--- a/inst/include/boost/qvm/config.hpp
+++ b/inst/include/boost/qvm/config.hpp
@@ -1,11 +1,10 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
+#ifndef BOOST_QVM_CONFIG_HPP_INCLUDED
+#define BOOST_QVM_CONFIG_HPP_INCLUDED
 
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_QVM_CONFIG_HPP_INCLUDED
-#define BOOST_QVM_CONFIG_HPP_INCLUDED
-
 #if defined( BOOST_STRICT_CONFIG ) || defined( BOOST_QVM_NO_WORKAROUNDS )
 #   define BOOST_QVM_WORKAROUND( symbol, test ) 0
 #else
diff --git a/inst/include/boost/qvm/deduce_mat.hpp b/inst/include/boost/qvm/deduce_mat.hpp
index 5e51d7912..0db6aea76 100644
--- a/inst/include/boost/qvm/deduce_mat.hpp
+++ b/inst/include/boost/qvm/deduce_mat.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DEDUCE_MAT_HPP_INCLUDED
 #define BOOST_QVM_DEDUCE_MAT_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/deduce_quat.hpp b/inst/include/boost/qvm/deduce_quat.hpp
index d29adaa39..f6b729e87 100644
--- a/inst/include/boost/qvm/deduce_quat.hpp
+++ b/inst/include/boost/qvm/deduce_quat.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DEDUCE_QUAT_HPP_INCLUDED
 #define BOOST_QVM_DEDUCE_QUAT_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/deduce_scalar.hpp b/inst/include/boost/qvm/deduce_scalar.hpp
index be94a2dd7..d37bec6bd 100644
--- a/inst/include/boost/qvm/deduce_scalar.hpp
+++ b/inst/include/boost/qvm/deduce_scalar.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DEDUCE_SCALAR_HPP_INCLUDED
 #define BOOST_QVM_DEDUCE_SCALAR_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/deduce_vec.hpp b/inst/include/boost/qvm/deduce_vec.hpp
index 675b09602..3346ca14e 100644
--- a/inst/include/boost/qvm/deduce_vec.hpp
+++ b/inst/include/boost/qvm/deduce_vec.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DEDUCE_VEC_HPP_INCLUDED
 #define BOOST_QVM_DEDUCE_VEC_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/cofactor_impl.hpp b/inst/include/boost/qvm/detail/cofactor_impl.hpp
index ca65ce025..f6571ee23 100644
--- a/inst/include/boost/qvm/detail/cofactor_impl.hpp
+++ b/inst/include/boost/qvm/detail/cofactor_impl.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_COFACTOR_IMPL_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_COFACTOR_IMPL_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/determinant_impl.hpp b/inst/include/boost/qvm/detail/determinant_impl.hpp
index 0e18f959b..fbce55517 100644
--- a/inst/include/boost/qvm/detail/determinant_impl.hpp
+++ b/inst/include/boost/qvm/detail/determinant_impl.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_DETERMINANT_IMPL_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_DETERMINANT_IMPL_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/mat_assign.hpp b/inst/include/boost/qvm/detail/mat_assign.hpp
index 7b6b3464c..d2cddf5ed 100644
--- a/inst/include/boost/qvm/detail/mat_assign.hpp
+++ b/inst/include/boost/qvm/detail/mat_assign.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_MAT_ASSIGN_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_MAT_ASSIGN_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/quat_assign.hpp b/inst/include/boost/qvm/detail/quat_assign.hpp
index 934305b10..dae63a508 100644
--- a/inst/include/boost/qvm/detail/quat_assign.hpp
+++ b/inst/include/boost/qvm/detail/quat_assign.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_QUAT_ASSIGN_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_QUAT_ASSIGN_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/remove_const.hpp b/inst/include/boost/qvm/detail/remove_const.hpp
index a24b98391..2b73e835f 100644
--- a/inst/include/boost/qvm/detail/remove_const.hpp
+++ b/inst/include/boost/qvm/detail/remove_const.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_REMOVE_CONST_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_REMOVE_CONST_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/swizzle_traits.hpp b/inst/include/boost/qvm/detail/swizzle_traits.hpp
index f197fc409..ac24b2b8f 100644
--- a/inst/include/boost/qvm/detail/swizzle_traits.hpp
+++ b/inst/include/boost/qvm/detail/swizzle_traits.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_SWIZZLE_TRAITS_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_SWIZZLE_TRAITS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/transp_impl.hpp b/inst/include/boost/qvm/detail/transp_impl.hpp
index 1953481c9..0e86f7cc9 100644
--- a/inst/include/boost/qvm/detail/transp_impl.hpp
+++ b/inst/include/boost/qvm/detail/transp_impl.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_TRANSP_IMPL_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_TRANSP_IMPL_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/vec_assign.hpp b/inst/include/boost/qvm/detail/vec_assign.hpp
index 04fffef1e..46357020f 100644
--- a/inst/include/boost/qvm/detail/vec_assign.hpp
+++ b/inst/include/boost/qvm/detail/vec_assign.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_DETAIL_VEC_ASSIGN_HPP_INCLUDED
 #define BOOST_QVM_DETAIL_VEC_ASSIGN_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/detail/vec_register_impl.hpp b/inst/include/boost/qvm/detail/vec_register_impl.hpp
index 21eae9862..2dfc90147 100644
--- a/inst/include/boost/qvm/detail/vec_register_impl.hpp
+++ b/inst/include/boost/qvm/detail/vec_register_impl.hpp
@@ -1,9 +1,8 @@
 #ifndef BOOST_QVM_DETAIL_VEC_REGISTER_IMPL_HPP
 #define BOOST_QVM_DETAIL_VEC_REGISTER_IMPL_HPP
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Copyright 2018 agate-pris
-
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/enable_if.hpp b/inst/include/boost/qvm/enable_if.hpp
index 50ed4b44b..a3cc23b9e 100644
--- a/inst/include/boost/qvm/enable_if.hpp
+++ b/inst/include/boost/qvm/enable_if.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_ENABLE_IF_HPP_INCLUDED
 #define BOOST_QVM_ENABLE_IF_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/error.hpp b/inst/include/boost/qvm/error.hpp
index 7e8f08d96..c3a5c18d1 100644
--- a/inst/include/boost/qvm/error.hpp
+++ b/inst/include/boost/qvm/error.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_ERROR_HPP_INCLUDED
 #define BOOST_QVM_ERROR_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/gen/mat_assign2.hpp b/inst/include/boost/qvm/gen/mat_assign2.hpp
index 879bc6da6..645e5b73e 100644
--- a/inst/include/boost/qvm/gen/mat_assign2.hpp
+++ b/inst/include/boost/qvm/gen/mat_assign2.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_MAT_ASSIGN2_HPP_INCLUDED
 #define BOOST_QVM_GEN_MAT_ASSIGN2_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/mat_traits.hpp>
diff --git a/inst/include/boost/qvm/gen/mat_assign3.hpp b/inst/include/boost/qvm/gen/mat_assign3.hpp
index bbaac8644..93946adc9 100644
--- a/inst/include/boost/qvm/gen/mat_assign3.hpp
+++ b/inst/include/boost/qvm/gen/mat_assign3.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_MAT_ASSIGN3_HPP_INCLUDED
 #define BOOST_QVM_GEN_MAT_ASSIGN3_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/mat_traits.hpp>
diff --git a/inst/include/boost/qvm/gen/mat_assign4.hpp b/inst/include/boost/qvm/gen/mat_assign4.hpp
index ed6cd4c3a..ca487d3fb 100644
--- a/inst/include/boost/qvm/gen/mat_assign4.hpp
+++ b/inst/include/boost/qvm/gen/mat_assign4.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_MAT_ASSIGN4_HPP_INCLUDED
 #define BOOST_QVM_GEN_MAT_ASSIGN4_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/mat_traits.hpp>
diff --git a/inst/include/boost/qvm/gen/mat_operations2.hpp b/inst/include/boost/qvm/gen/mat_operations2.hpp
index 46546832d..31320e6e9 100644
--- a/inst/include/boost/qvm/gen/mat_operations2.hpp
+++ b/inst/include/boost/qvm/gen/mat_operations2.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_MAT_OPERATIONS2_HPP_INCLUDED
 #define BOOST_QVM_GEN_MAT_OPERATIONS2_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/assert.hpp>
 #include <boost/qvm/deduce_mat.hpp>
 #include <boost/qvm/deduce_vec.hpp>
diff --git a/inst/include/boost/qvm/gen/mat_operations3.hpp b/inst/include/boost/qvm/gen/mat_operations3.hpp
index b76342710..3f4232066 100644
--- a/inst/include/boost/qvm/gen/mat_operations3.hpp
+++ b/inst/include/boost/qvm/gen/mat_operations3.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_MAT_OPERATIONS3_HPP_INCLUDED
 #define BOOST_QVM_GEN_MAT_OPERATIONS3_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/assert.hpp>
 #include <boost/qvm/deduce_mat.hpp>
 #include <boost/qvm/deduce_vec.hpp>
diff --git a/inst/include/boost/qvm/gen/mat_operations4.hpp b/inst/include/boost/qvm/gen/mat_operations4.hpp
index 262cb6785..830c2effc 100644
--- a/inst/include/boost/qvm/gen/mat_operations4.hpp
+++ b/inst/include/boost/qvm/gen/mat_operations4.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_MAT_OPERATIONS4_HPP_INCLUDED
 #define BOOST_QVM_GEN_MAT_OPERATIONS4_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/assert.hpp>
 #include <boost/qvm/deduce_mat.hpp>
 #include <boost/qvm/deduce_vec.hpp>
diff --git a/inst/include/boost/qvm/gen/swizzle2.hpp b/inst/include/boost/qvm/gen/swizzle2.hpp
index 16475b976..1f4fed310 100644
--- a/inst/include/boost/qvm/gen/swizzle2.hpp
+++ b/inst/include/boost/qvm/gen/swizzle2.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_SWIZZLE2_HPP_INCLUDED
 #define BOOST_QVM_GEN_SWIZZLE2_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/detail/swizzle_traits.hpp>
 #include <boost/qvm/enable_if.hpp>
diff --git a/inst/include/boost/qvm/gen/swizzle3.hpp b/inst/include/boost/qvm/gen/swizzle3.hpp
index 63a31f438..035641df6 100644
--- a/inst/include/boost/qvm/gen/swizzle3.hpp
+++ b/inst/include/boost/qvm/gen/swizzle3.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_SWIZZLE3_HPP_INCLUDED
 #define BOOST_QVM_GEN_SWIZZLE3_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/detail/swizzle_traits.hpp>
 #include <boost/qvm/enable_if.hpp>
diff --git a/inst/include/boost/qvm/gen/swizzle4.hpp b/inst/include/boost/qvm/gen/swizzle4.hpp
index ccd7fc025..d5006da0c 100644
--- a/inst/include/boost/qvm/gen/swizzle4.hpp
+++ b/inst/include/boost/qvm/gen/swizzle4.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_SWIZZLE4_HPP_INCLUDED
 #define BOOST_QVM_GEN_SWIZZLE4_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/detail/swizzle_traits.hpp>
 #include <boost/qvm/enable_if.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_assign2.hpp b/inst/include/boost/qvm/gen/vec_assign2.hpp
index 6e3dc3760..f35bd0bcb 100644
--- a/inst/include/boost/qvm/gen/vec_assign2.hpp
+++ b/inst/include/boost/qvm/gen/vec_assign2.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_ASSIGN2_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_ASSIGN2_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/vec_traits.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_assign3.hpp b/inst/include/boost/qvm/gen/vec_assign3.hpp
index 863bf2771..d5e65caa4 100644
--- a/inst/include/boost/qvm/gen/vec_assign3.hpp
+++ b/inst/include/boost/qvm/gen/vec_assign3.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_ASSIGN3_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_ASSIGN3_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/vec_traits.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_assign4.hpp b/inst/include/boost/qvm/gen/vec_assign4.hpp
index acc7998d2..1e98d1f9a 100644
--- a/inst/include/boost/qvm/gen/vec_assign4.hpp
+++ b/inst/include/boost/qvm/gen/vec_assign4.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_ASSIGN4_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_ASSIGN4_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/vec_traits.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_mat_operations2.hpp b/inst/include/boost/qvm/gen/vec_mat_operations2.hpp
index 44886ca30..ad12b2914 100644
--- a/inst/include/boost/qvm/gen/vec_mat_operations2.hpp
+++ b/inst/include/boost/qvm/gen/vec_mat_operations2.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_MAT_OPERATIONS2_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_MAT_OPERATIONS2_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/deduce_vec.hpp>
 #include <boost/qvm/enable_if.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_mat_operations3.hpp b/inst/include/boost/qvm/gen/vec_mat_operations3.hpp
index 25f9a8650..be537a901 100644
--- a/inst/include/boost/qvm/gen/vec_mat_operations3.hpp
+++ b/inst/include/boost/qvm/gen/vec_mat_operations3.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_MAT_OPERATIONS3_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_MAT_OPERATIONS3_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/deduce_vec.hpp>
 #include <boost/qvm/enable_if.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_mat_operations4.hpp b/inst/include/boost/qvm/gen/vec_mat_operations4.hpp
index aaafced5c..b03a9e98b 100644
--- a/inst/include/boost/qvm/gen/vec_mat_operations4.hpp
+++ b/inst/include/boost/qvm/gen/vec_mat_operations4.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_MAT_OPERATIONS4_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_MAT_OPERATIONS4_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/config.hpp>
 #include <boost/qvm/deduce_vec.hpp>
 #include <boost/qvm/enable_if.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_operations2.hpp b/inst/include/boost/qvm/gen/vec_operations2.hpp
index b52dee2b9..c98577eaf 100644
--- a/inst/include/boost/qvm/gen/vec_operations2.hpp
+++ b/inst/include/boost/qvm/gen/vec_operations2.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_OPERATIONS2_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_OPERATIONS2_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/deduce_scalar.hpp>
 #include <boost/qvm/deduce_vec.hpp>
 #include <boost/qvm/error.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_operations3.hpp b/inst/include/boost/qvm/gen/vec_operations3.hpp
index 53b3dd6ae..e26b4e49a 100644
--- a/inst/include/boost/qvm/gen/vec_operations3.hpp
+++ b/inst/include/boost/qvm/gen/vec_operations3.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_OPERATIONS3_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_OPERATIONS3_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/deduce_scalar.hpp>
 #include <boost/qvm/deduce_vec.hpp>
 #include <boost/qvm/error.hpp>
diff --git a/inst/include/boost/qvm/gen/vec_operations4.hpp b/inst/include/boost/qvm/gen/vec_operations4.hpp
index e492a3bda..f6945f807 100644
--- a/inst/include/boost/qvm/gen/vec_operations4.hpp
+++ b/inst/include/boost/qvm/gen/vec_operations4.hpp
@@ -1,13 +1,11 @@
 #ifndef BOOST_QVM_GEN_VEC_OPERATIONS4_HPP_INCLUDED
 #define BOOST_QVM_GEN_VEC_OPERATIONS4_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// This file was generated by a program. Do not edit manually.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This file was generated by a program. Do not edit manually.
-
 #include <boost/qvm/deduce_scalar.hpp>
 #include <boost/qvm/deduce_vec.hpp>
 #include <boost/qvm/error.hpp>
diff --git a/inst/include/boost/qvm/is_scalar.hpp b/inst/include/boost/qvm/is_scalar.hpp
index 32abbbe4f..6060bfe5b 100644
--- a/inst/include/boost/qvm/is_scalar.hpp
+++ b/inst/include/boost/qvm/is_scalar.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_IS_SCALAR_HPP_INCLUDED
 #define BOOST_QVM_IS_SCALAR_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -28,6 +27,8 @@ template <> struct is_scalar<signed int> { static bool const value=true; };
 template <> struct is_scalar<unsigned int> { static bool const value=true; };
 template <> struct is_scalar<signed long> { static bool const value=true; };
 template <> struct is_scalar<unsigned long> { static bool const value=true; };
+template <> struct is_scalar<signed long long> { static bool const value=true; };
+template <> struct is_scalar<unsigned long long> { static bool const value=true; };
 template <> struct is_scalar<float> { static bool const value=true; };
 template <> struct is_scalar<double> { static bool const value=true; };
 template <> struct is_scalar<long double> { static bool const value=true; };
diff --git a/inst/include/boost/qvm/lite.hpp b/inst/include/boost/qvm/lite.hpp
index 048ba0a95..8139b5b7b 100644
--- a/inst/include/boost/qvm/lite.hpp
+++ b/inst/include/boost/qvm/lite.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/map.hpp b/inst/include/boost/qvm/map.hpp
index 90f3d65fc..c0ed5da86 100644
--- a/inst/include/boost/qvm/map.hpp
+++ b/inst/include/boost/qvm/map.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAP_HPP_INCLUDED
 #define BOOST_QVM_MAP_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/map_mat_mat.hpp b/inst/include/boost/qvm/map_mat_mat.hpp
index 80b811550..194175d11 100644
--- a/inst/include/boost/qvm/map_mat_mat.hpp
+++ b/inst/include/boost/qvm/map_mat_mat.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAP_MAT_MAT_HPP_INCLUDED
 #define BOOST_QVM_MAP_MAT_MAT_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/map_mat_vec.hpp b/inst/include/boost/qvm/map_mat_vec.hpp
index 562e65636..52cf3d7da 100644
--- a/inst/include/boost/qvm/map_mat_vec.hpp
+++ b/inst/include/boost/qvm/map_mat_vec.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAP_MAT_VEC_HPP_INCLUDED
 #define BOOST_QVM_MAP_MAT_VEC_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/map_vec_mat.hpp b/inst/include/boost/qvm/map_vec_mat.hpp
index 1785ab135..143c7bcad 100644
--- a/inst/include/boost/qvm/map_vec_mat.hpp
+++ b/inst/include/boost/qvm/map_vec_mat.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAP_VEC_MAT_HPP_INCLUDED
 #define BOOST_QVM_MAP_VEC_MAT_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat.hpp b/inst/include/boost/qvm/mat.hpp
index 16dca3ee3..9fc118db9 100644
--- a/inst/include/boost/qvm/mat.hpp
+++ b/inst/include/boost/qvm/mat.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAT_HPP_INCLUDED
 #define BOOST_QVM_MAT_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_access.hpp b/inst/include/boost/qvm/mat_access.hpp
index 23dac800d..2963bea55 100644
--- a/inst/include/boost/qvm/mat_access.hpp
+++ b/inst/include/boost/qvm/mat_access.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAT_ACCESS_HPP_INCLUDED
 #define BOOST_QVM_MAT_ACCESS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_operations.hpp b/inst/include/boost/qvm/mat_operations.hpp
index e787dc549..49c4c87c8 100644
--- a/inst/include/boost/qvm/mat_operations.hpp
+++ b/inst/include/boost/qvm/mat_operations.hpp
@@ -3,7 +3,6 @@
 
 // Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
 // Copyright 2019 agate-pris
-
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_operations2.hpp b/inst/include/boost/qvm/mat_operations2.hpp
index 0cb193c29..6d3a08fe4 100644
--- a/inst/include/boost/qvm/mat_operations2.hpp
+++ b/inst/include/boost/qvm/mat_operations2.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_operations3.hpp b/inst/include/boost/qvm/mat_operations3.hpp
index c3da2d3b6..f4b25f1a2 100644
--- a/inst/include/boost/qvm/mat_operations3.hpp
+++ b/inst/include/boost/qvm/mat_operations3.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_operations4.hpp b/inst/include/boost/qvm/mat_operations4.hpp
index b780f81ce..36405d4c0 100644
--- a/inst/include/boost/qvm/mat_operations4.hpp
+++ b/inst/include/boost/qvm/mat_operations4.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_traits.hpp b/inst/include/boost/qvm/mat_traits.hpp
index 97d1a13ad..9592ec2ea 100644
--- a/inst/include/boost/qvm/mat_traits.hpp
+++ b/inst/include/boost/qvm/mat_traits.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_TRAITS_HPP_INCLUDED
 #define BOOST_QVM_TRAITS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_traits_array.hpp b/inst/include/boost/qvm/mat_traits_array.hpp
index ba9175d35..ddcc95ec3 100644
--- a/inst/include/boost/qvm/mat_traits_array.hpp
+++ b/inst/include/boost/qvm/mat_traits_array.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAT_TRAITS_ARRAY_HPP_INCLUDED
 #define BOOST_QVM_MAT_TRAITS_ARRAY_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/mat_traits_defaults.hpp b/inst/include/boost/qvm/mat_traits_defaults.hpp
index 406dbb37c..f0ec482d2 100644
--- a/inst/include/boost/qvm/mat_traits_defaults.hpp
+++ b/inst/include/boost/qvm/mat_traits_defaults.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MAT_TRAITS_DEFAULTS_HPP_INCLUDED
 #define BOOST_QVM_MAT_TRAITS_DEFAULTS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/math.hpp b/inst/include/boost/qvm/math.hpp
index 4959cab10..84192eefd 100644
--- a/inst/include/boost/qvm/math.hpp
+++ b/inst/include/boost/qvm/math.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_MATH_HPP_INCLUDED
 #define BOOST_QVM_MATH_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/operations.hpp b/inst/include/boost/qvm/operations.hpp
index 5fbbd147a..5bb841f33 100644
--- a/inst/include/boost/qvm/operations.hpp
+++ b/inst/include/boost/qvm/operations.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_OPERATIONS_HPP_INCLUDED
 #define BOOST_QVM_OPERATIONS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/quat.hpp b/inst/include/boost/qvm/quat.hpp
index b09ed6e50..867ff6934 100644
--- a/inst/include/boost/qvm/quat.hpp
+++ b/inst/include/boost/qvm/quat.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_HPP_INCLUDED
 #define BOOST_QVM_QUAT_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/quat_access.hpp b/inst/include/boost/qvm/quat_access.hpp
index 545db885b..b2c2688db 100644
--- a/inst/include/boost/qvm/quat_access.hpp
+++ b/inst/include/boost/qvm/quat_access.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_ACCESS_HPP_INCLUDED
 #define BOOST_QVM_QUAT_ACCESS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/quat_operations.hpp b/inst/include/boost/qvm/quat_operations.hpp
index f41affa2f..4dfc2d271 100644
--- a/inst/include/boost/qvm/quat_operations.hpp
+++ b/inst/include/boost/qvm/quat_operations.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_OPERATIONS
 #define BOOST_QVM_QUAT_OPERATIONS
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/quat_traits.hpp b/inst/include/boost/qvm/quat_traits.hpp
index 2af10a22e..fe3b0989e 100644
--- a/inst/include/boost/qvm/quat_traits.hpp
+++ b/inst/include/boost/qvm/quat_traits.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_TRAITS
 #define BOOST_QVM_QUAT_TRAITS
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -79,7 +78,7 @@ typename enable_if_c<
     void>::type
 write_quat_element_idx( int i, Q & q, typename quat_traits<Q>::scalar_type s )
     {
-    quat_traits<Q>::template write_element_idx(i, q) = s;
+    quat_traits<Q>::write_element_idx(i, q) = s;
     }
 
 template <class Q>
@@ -89,7 +88,7 @@ typename enable_if_c<
     void>::type
 write_vec_element_idx( int i, Q & q, typename quat_traits<Q>::scalar_type s )
     {
-    quat_traits<Q>::template write_element_idx(i, q, s);
+    quat_traits<Q>::write_element_idx(i, q, s);
     }
 
 } }
diff --git a/inst/include/boost/qvm/quat_traits_array.hpp b/inst/include/boost/qvm/quat_traits_array.hpp
index 956e0fbab..e7762e930 100644
--- a/inst/include/boost/qvm/quat_traits_array.hpp
+++ b/inst/include/boost/qvm/quat_traits_array.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_TRAITS_ARRAY_HPP_INCLUDED
 #define BOOST_QVM_QUAT_TRAITS_ARRAY_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/quat_traits_defaults.hpp b/inst/include/boost/qvm/quat_traits_defaults.hpp
index 935ece45c..ae29a5e73 100644
--- a/inst/include/boost/qvm/quat_traits_defaults.hpp
+++ b/inst/include/boost/qvm/quat_traits_defaults.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_TRAITS_DEFAULTS_HPP_INCLUDED
 #define BOOST_QVM_QUAT_TRAITS_DEFAULTS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/quat_vec_operations.hpp b/inst/include/boost/qvm/quat_vec_operations.hpp
index 46156450f..1c201e486 100644
--- a/inst/include/boost/qvm/quat_vec_operations.hpp
+++ b/inst/include/boost/qvm/quat_vec_operations.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_QUAT_VEC_OPERATIONS_HPP_INCLUDED
 #define BOOST_QVM_QUAT_VEC_OPERATIONS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/scalar_traits.hpp b/inst/include/boost/qvm/scalar_traits.hpp
index e8bbaddad..7802940d5 100644
--- a/inst/include/boost/qvm/scalar_traits.hpp
+++ b/inst/include/boost/qvm/scalar_traits.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_SCALAR_TRAITS_HPP_INCLUDED
 #define BOOST_QVM_SCALAR_TRAITS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/static_assert.hpp b/inst/include/boost/qvm/static_assert.hpp
index b3d90ff4f..3ef6daf16 100644
--- a/inst/include/boost/qvm/static_assert.hpp
+++ b/inst/include/boost/qvm/static_assert.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/swizzle.hpp b/inst/include/boost/qvm/swizzle.hpp
index b216c2712..e1e4a459f 100644
--- a/inst/include/boost/qvm/swizzle.hpp
+++ b/inst/include/boost/qvm/swizzle.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_SWIZZLE_HPP_INCLUDED
 #define BOOST_QVM_SWIZZLE_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/swizzle2.hpp b/inst/include/boost/qvm/swizzle2.hpp
index 6bb0df29b..438328f9d 100644
--- a/inst/include/boost/qvm/swizzle2.hpp
+++ b/inst/include/boost/qvm/swizzle2.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/swizzle3.hpp b/inst/include/boost/qvm/swizzle3.hpp
index c64e6c85f..adc5453a5 100644
--- a/inst/include/boost/qvm/swizzle3.hpp
+++ b/inst/include/boost/qvm/swizzle3.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/swizzle4.hpp b/inst/include/boost/qvm/swizzle4.hpp
index 7c04e9b54..bdef6451d 100644
--- a/inst/include/boost/qvm/swizzle4.hpp
+++ b/inst/include/boost/qvm/swizzle4.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/throw_exception.hpp b/inst/include/boost/qvm/throw_exception.hpp
index 782ee03fa..c05e586f4 100644
--- a/inst/include/boost/qvm/throw_exception.hpp
+++ b/inst/include/boost/qvm/throw_exception.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/to_string.hpp b/inst/include/boost/qvm/to_string.hpp
index e21c08a42..2e54da4fc 100644
--- a/inst/include/boost/qvm/to_string.hpp
+++ b/inst/include/boost/qvm/to_string.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_TO_STRING_HPP_INCLUDED
 #define BOOST_QVM_TO_STRING_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec.hpp b/inst/include/boost/qvm/vec.hpp
index 03db1d99b..6e5cb53cf 100644
--- a/inst/include/boost/qvm/vec.hpp
+++ b/inst/include/boost/qvm/vec.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_VEC_HPP_INCLUDED
 #define BOOST_QVM_VEC_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_access.hpp b/inst/include/boost/qvm/vec_access.hpp
index 01f88c0a6..8e099f78f 100644
--- a/inst/include/boost/qvm/vec_access.hpp
+++ b/inst/include/boost/qvm/vec_access.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_VEC_ACCESS_HPP_INCLUDED
 #define BOOST_QVM_VEC_ACCESS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_mat_operations.hpp b/inst/include/boost/qvm/vec_mat_operations.hpp
index e11800ae5..464fd46e7 100644
--- a/inst/include/boost/qvm/vec_mat_operations.hpp
+++ b/inst/include/boost/qvm/vec_mat_operations.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_VEC_MAT_OPERATIONS_HPP_INCLUDED
 #define BOOST_QVM_VEC_MAT_OPERATIONS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_mat_operations2.hpp b/inst/include/boost/qvm/vec_mat_operations2.hpp
index 65ab7b89f..b5bc906b9 100644
--- a/inst/include/boost/qvm/vec_mat_operations2.hpp
+++ b/inst/include/boost/qvm/vec_mat_operations2.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_mat_operations3.hpp b/inst/include/boost/qvm/vec_mat_operations3.hpp
index 7b8ffc75c..c35ead3a2 100644
--- a/inst/include/boost/qvm/vec_mat_operations3.hpp
+++ b/inst/include/boost/qvm/vec_mat_operations3.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_mat_operations4.hpp b/inst/include/boost/qvm/vec_mat_operations4.hpp
index 2201d6c18..f03dbcaa6 100644
--- a/inst/include/boost/qvm/vec_mat_operations4.hpp
+++ b/inst/include/boost/qvm/vec_mat_operations4.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_operations.hpp b/inst/include/boost/qvm/vec_operations.hpp
index bfd8d5761..59379d670 100644
--- a/inst/include/boost/qvm/vec_operations.hpp
+++ b/inst/include/boost/qvm/vec_operations.hpp
@@ -3,7 +3,6 @@
 
 // Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
 // Copyright 2019 agate-pris
-
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_operations2.hpp b/inst/include/boost/qvm/vec_operations2.hpp
index 729787d3d..8c39251d1 100644
--- a/inst/include/boost/qvm/vec_operations2.hpp
+++ b/inst/include/boost/qvm/vec_operations2.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_operations3.hpp b/inst/include/boost/qvm/vec_operations3.hpp
index 992effaeb..95cb0194d 100644
--- a/inst/include/boost/qvm/vec_operations3.hpp
+++ b/inst/include/boost/qvm/vec_operations3.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_operations4.hpp b/inst/include/boost/qvm/vec_operations4.hpp
index 4bbb8ef71..933050135 100644
--- a/inst/include/boost/qvm/vec_operations4.hpp
+++ b/inst/include/boost/qvm/vec_operations4.hpp
@@ -1,5 +1,4 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_register.hpp b/inst/include/boost/qvm/vec_register.hpp
index 55672a507..badb9d1f1 100644
--- a/inst/include/boost/qvm/vec_register.hpp
+++ b/inst/include/boost/qvm/vec_register.hpp
@@ -1,9 +1,8 @@
 #ifndef BOOST_QVM_VEC_REGISTER_HPP_INCLUDED
 #define BOOST_QVM_VEC_REGISTER_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Copyright 2018 agate-pris
-
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_register2.hpp b/inst/include/boost/qvm/vec_register2.hpp
index 5d99bb5b2..20d8907bb 100644
--- a/inst/include/boost/qvm/vec_register2.hpp
+++ b/inst/include/boost/qvm/vec_register2.hpp
@@ -1,12 +1,11 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-// Copyright 2018 agate-pris
+#ifndef BOOST_QVM_VEC_REGISTER2_HPP
+#define BOOST_QVM_VEC_REGISTER2_HPP
 
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// Copyright 2018 agate-pris
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_QVM_VEC_REGISTER2_HPP
-#define BOOST_QVM_VEC_REGISTER2_HPP
-
 #include <boost/qvm/detail/vec_register_impl.hpp>
 
 #define BOOST_QVM_REGISTER_VEC_2_READ(VecType, ScalarType, Read0, Read1)                    \
diff --git a/inst/include/boost/qvm/vec_register3.hpp b/inst/include/boost/qvm/vec_register3.hpp
index 517a33f3d..deec8035e 100644
--- a/inst/include/boost/qvm/vec_register3.hpp
+++ b/inst/include/boost/qvm/vec_register3.hpp
@@ -1,12 +1,11 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-// Copyright 2018 agate-pris
+#ifndef BOOST_QVM_VEC_REGISTER3_HPP
+#define BOOST_QVM_VEC_REGISTER3_HPP
 
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// Copyright 2018 agate-pris
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_QVM_VEC_REGISTER3_HPP
-#define BOOST_QVM_VEC_REGISTER3_HPP
-
 #include <boost/qvm/detail/vec_register_impl.hpp>
 
 #define BOOST_QVM_REGISTER_VEC_3_READ(VecType, ScalarType, Read0, Read1, Read2)             \
diff --git a/inst/include/boost/qvm/vec_register4.hpp b/inst/include/boost/qvm/vec_register4.hpp
index 18692946b..08bb5ef94 100644
--- a/inst/include/boost/qvm/vec_register4.hpp
+++ b/inst/include/boost/qvm/vec_register4.hpp
@@ -1,12 +1,11 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-// Copyright 2018 agate-pris
+#ifndef BOOST_QVM_VEC_REGISTER4_HPP
+#define BOOST_QVM_VEC_REGISTER4_HPP
 
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
+// Copyright 2018 agate-pris
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_QVM_VEC_REGISTER4_HPP
-#define BOOST_QVM_VEC_REGISTER4_HPP
-
 #include <boost/qvm/detail/vec_register_impl.hpp>
 
 #define BOOST_QVM_REGISTER_VEC_4_READ(VecType, ScalarType, Read0, Read1, Read2, Read3)      \
diff --git a/inst/include/boost/qvm/vec_traits.hpp b/inst/include/boost/qvm/vec_traits.hpp
index d5ad7dfc7..e6d1c7e5b 100644
--- a/inst/include/boost/qvm/vec_traits.hpp
+++ b/inst/include/boost/qvm/vec_traits.hpp
@@ -1,11 +1,10 @@
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
+#ifndef BOOST_QVM_VEC_TRAITS_HPP_INCLUDED
+#define BOOST_QVM_VEC_TRAITS_HPP_INCLUDED
 
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_QVM_VEC_TRAITS_HPP_INCLUDED
-#define BOOST_QVM_VEC_TRAITS_HPP_INCLUDED
-
 #include <boost/qvm/is_scalar.hpp>
 #include <boost/qvm/enable_if.hpp>
 #include <boost/qvm/config.hpp>
diff --git a/inst/include/boost/qvm/vec_traits_array.hpp b/inst/include/boost/qvm/vec_traits_array.hpp
index 5af5acbda..501bb31e3 100644
--- a/inst/include/boost/qvm/vec_traits_array.hpp
+++ b/inst/include/boost/qvm/vec_traits_array.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_VEC_TRAITS_ARRAY_HPP_INCLUDED
 #define BOOST_QVM_VEC_TRAITS_ARRAY_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_traits_defaults.hpp b/inst/include/boost/qvm/vec_traits_defaults.hpp
index 7e16a9979..a9b07666d 100644
--- a/inst/include/boost/qvm/vec_traits_defaults.hpp
+++ b/inst/include/boost/qvm/vec_traits_defaults.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_VEC_TRAITS_DEFAULTS_HPP_INCLUDED
 #define BOOST_QVM_VEC_TRAITS_DEFAULTS_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/qvm/vec_traits_gnuc.hpp b/inst/include/boost/qvm/vec_traits_gnuc.hpp
index 7c6de36f8..d951fb541 100644
--- a/inst/include/boost/qvm/vec_traits_gnuc.hpp
+++ b/inst/include/boost/qvm/vec_traits_gnuc.hpp
@@ -1,8 +1,7 @@
 #ifndef BOOST_QVM_VEC_TRAITS_GNUC_HPP_INCLUDED
 #define BOOST_QVM_VEC_TRAITS_GNUC_HPP_INCLUDED
 
-// Copyright 2008-2022 Emil Dotchevski and Reverge Studios, Inc.
-
+// Copyright 2008-2024 Emil Dotchevski and Reverge Studios, Inc.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/inst/include/boost/random.hpp b/inst/include/boost/random.hpp
index d85f7633b..c3cc13c41 100644
--- a/inst/include/boost/random.hpp
+++ b/inst/include/boost/random.hpp
@@ -48,6 +48,7 @@
 #include <boost/random/subtract_with_carry.hpp>
 #include <boost/random/taus88.hpp>
 #include <boost/random/xor_combine.hpp>
+#include <boost/random/splitmix64.hpp>
 
 // misc
 #include <boost/random/generate_canonical.hpp>
diff --git a/inst/include/boost/random/beta_distribution.hpp b/inst/include/boost/random/beta_distribution.hpp
index dabb72bfe..145bf9750 100644
--- a/inst/include/boost/random/beta_distribution.hpp
+++ b/inst/include/boost/random/beta_distribution.hpp
@@ -13,9 +13,9 @@
 #ifndef BOOST_RANDOM_BETA_DISTRIBUTION_HPP
 #define BOOST_RANDOM_BETA_DISTRIBUTION_HPP
 
-#include <cassert>
 #include <istream>
 #include <iosfwd>
+#include <boost/assert.hpp>
 #include <boost/random/detail/operators.hpp>
 #include <boost/random/gamma_distribution.hpp>
 
@@ -48,8 +48,8 @@ class beta_distribution {
                             RealType beta_arg = RealType(1.0))
           : _alpha(alpha_arg), _beta(beta_arg)
         {
-            assert(alpha_arg > 0);
-            assert(beta_arg > 0);
+            BOOST_ASSERT(alpha_arg > 0);
+            BOOST_ASSERT(beta_arg > 0);
         }
 
         /** Returns the "alpha" parameter of the distribtuion. */
@@ -86,8 +86,8 @@ class beta_distribution {
                                RealType beta_arg = RealType(1.0))
       : _alpha(alpha_arg), _beta(beta_arg)
     {
-        assert(alpha_arg > 0);
-        assert(beta_arg > 0);
+        BOOST_ASSERT(alpha_arg > 0);
+        BOOST_ASSERT(beta_arg > 0);
     }
     /** Constructs an @c beta_distribution from its parameters. */
     explicit beta_distribution(const param_type& parm)
diff --git a/inst/include/boost/random/hyperexponential_distribution.hpp b/inst/include/boost/random/hyperexponential_distribution.hpp
index 9ce9e4c40..3a71c9e3e 100644
--- a/inst/include/boost/random/hyperexponential_distribution.hpp
+++ b/inst/include/boost/random/hyperexponential_distribution.hpp
@@ -18,6 +18,7 @@
 #define BOOST_RANDOM_HYPEREXPONENTIAL_DISTRIBUTION_HPP
 
 
+#include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/core/cmath.hpp>
 #include <boost/random/detail/operators.hpp>
@@ -28,7 +29,6 @@
 #include <boost/range/end.hpp>
 #include <boost/range/size.hpp>
 #include <boost/type_traits/has_pre_increment.hpp>
-#include <cassert>
 #include <cmath>
 #include <cstddef>
 #include <iterator>
@@ -266,7 +266,7 @@ class hyperexponential_distribution
         {
             hyperexp_detail::normalize(probs_);
 
-            assert( hyperexp_detail::check_params(probs_, rates_) );
+            BOOST_ASSERT( hyperexp_detail::check_params(probs_, rates_) );
         }
 
         /**
@@ -299,7 +299,7 @@ class hyperexponential_distribution
         {
             hyperexp_detail::normalize(probs_);
 
-            assert( hyperexp_detail::check_params(probs_, rates_) );
+            BOOST_ASSERT( hyperexp_detail::check_params(probs_, rates_) );
         }
 
         /**
@@ -336,7 +336,7 @@ class hyperexponential_distribution
         : probs_(std::distance(rate_first, rate_last), 1), // will be normalized below
           rates_(rate_first, rate_last)
         {
-            assert(probs_.size() == rates_.size());
+            BOOST_ASSERT(probs_.size() == rates_.size());
         }
 
         /**
@@ -360,7 +360,7 @@ class hyperexponential_distribution
         {
             hyperexp_detail::normalize(probs_);
 
-            assert( hyperexp_detail::check_params(probs_, rates_) );
+            BOOST_ASSERT( hyperexp_detail::check_params(probs_, rates_) );
         }
 
 #ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
@@ -387,7 +387,7 @@ class hyperexponential_distribution
         {
             hyperexp_detail::normalize(probs_);
 
-            assert( hyperexp_detail::check_params(probs_, rates_) );
+            BOOST_ASSERT( hyperexp_detail::check_params(probs_, rates_) );
         }
 
         /**
@@ -413,7 +413,7 @@ class hyperexponential_distribution
         {
             hyperexp_detail::normalize(probs_);
 
-            assert( hyperexp_detail::check_params(probs_, rates_) );
+            BOOST_ASSERT( hyperexp_detail::check_params(probs_, rates_) );
         }
 #endif // BOOST_NO_CXX11_HDR_INITIALIZER_LIST
 
@@ -518,7 +518,7 @@ class hyperexponential_distribution
             hyperexp_detail::normalize(param.probs_);
 
             //post: vector size conformance
-            assert(param.probs_.size() == param.rates_.size());
+            BOOST_ASSERT(param.probs_.size() == param.rates_.size());
 
             return is;
         }
@@ -578,7 +578,7 @@ class hyperexponential_distribution
     : dd_(prob_first, prob_last),
       rates_(rate_first, rate_last)
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 
     /**
@@ -610,7 +610,7 @@ class hyperexponential_distribution
     : dd_(prob_range),
       rates_(boost::begin(rate_range), boost::end(rate_range))
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 
     /**
@@ -648,7 +648,7 @@ class hyperexponential_distribution
     : dd_(std::vector<RealT>(std::distance(rate_first, rate_last), 1)),
       rates_(rate_first, rate_last)
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 
     /**
@@ -670,7 +670,7 @@ class hyperexponential_distribution
     : dd_(std::vector<RealT>(boost::size(rate_range), 1)),
       rates_(boost::begin(rate_range), boost::end(rate_range))
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 
     /**
@@ -682,7 +682,7 @@ class hyperexponential_distribution
     : dd_(param.probabilities()),
       rates_(param.rates())
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 
 #ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
@@ -708,7 +708,7 @@ class hyperexponential_distribution
     : dd_(l1.begin(), l1.end()),
       rates_(l2.begin(), l2.end())
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 
     /**
@@ -733,7 +733,7 @@ class hyperexponential_distribution
     : dd_(std::vector<RealT>(std::distance(l1.begin(), l1.end()), 1)),
       rates_(l1.begin(), l1.end())
     {
-        assert( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
+        BOOST_ASSERT( hyperexp_detail::check_params(dd_.probabilities(), rates_) );
     }
 #endif
 
diff --git a/inst/include/boost/random/splitmix64.hpp b/inst/include/boost/random/splitmix64.hpp
new file mode 100644
index 000000000..dd89ab5ce
--- /dev/null
+++ b/inst/include/boost/random/splitmix64.hpp
@@ -0,0 +1,203 @@
+/* 
+ * Copyright Sebastiano Vigna 2015.
+ * Copyright Matt Borland 2022.
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ * 
+ */
+
+#ifndef BOOST_RANDOM_SPLITMIX64_HPP
+#define BOOST_RANDOM_SPLITMIX64_HPP
+
+#include <cstdint>
+#include <cstdlib>
+#include <limits>
+#include <array>
+#include <string>
+#include <ios>
+#include <type_traits>
+
+namespace boost { namespace random {
+
+/**
+ *  This is a fixed-increment version of Java 8's SplittableRandom generator
+ *  See http://dx.doi.org/10.1145/2714064.2660195 and
+ *  http://docs.oracle.com/javase/8/docs/api/java/util/SplittableRandom.html
+ *  It is a very fast generator passing BigCrush, and it can be useful if
+ *  for some reason you absolutely want 64 bits of state; otherwise, we
+ *  rather suggest to use a xoroshiro128+ (for moderately parallel
+ *  computations) or xorshift1024* (for massively parallel computations)
+ *  generator.
+ */
+class splitmix64
+{
+private:
+    std::uint64_t state_;
+
+    inline std::uint64_t concatenate(std::uint32_t word1, std::uint32_t word2) noexcept
+    {
+        return static_cast<std::uint64_t>(word1) << 32 | word2;
+    }
+
+public:
+    using result_type = std::uint64_t;
+    using seed_type = std::uint64_t;
+
+    // Required for old Boost.Random concept
+    static constexpr bool has_fixed_range {false};
+
+    /** Seeds the generator with the default seed. */
+    void seed(result_type value = 0) noexcept
+    {
+        if (value == 0)
+        {
+            state_ = UINT64_C(0xA164B43C8F634A13);
+        }
+        else
+        {
+            state_ = value;
+        }
+    }
+
+    /**
+     * Seeds the generator with 32-bit values produced by @c seq.generate().
+     */
+    template <typename Sseq, typename std::enable_if<!std::is_convertible<Sseq, std::uint64_t>::value, bool>::type = true>
+    void seed(Sseq& seq)
+    {
+        std::array<std::uint32_t, 2> seeds;
+        seq.generate(seeds.begin(), seeds.end());
+
+        state_ = concatenate(seeds[0], seeds[1]);
+    }
+
+    /**
+     * Seeds the generator with 64-bit values produced by @c seq.generate().
+     */
+    template <typename Sseq, typename std::enable_if<!std::is_convertible<Sseq, splitmix64>::value, bool>::type = true>
+    explicit splitmix64(Sseq& seq)
+    {
+        seed(seq);
+    }
+
+    /** Seeds the generator with a user provided seed. */
+    template <typename T, typename std::enable_if<std::is_convertible<T, std::uint64_t>::value, bool>::type = true>
+    void seed(T value = 0) noexcept
+    {
+        seed(static_cast<std::uint64_t>(value));
+    }
+
+    /** Seeds the generator with a user provided seed. */
+    explicit splitmix64(std::uint64_t state = 0) noexcept
+    {
+        seed(state);
+    }
+
+    splitmix64(const splitmix64& other) = default;
+    splitmix64& operator=(const splitmix64& other) = default;
+
+    /**  Returns the next value of the generator. */
+    inline result_type next() noexcept
+    {
+        std::uint64_t z {state_ += UINT64_C(0x9E3779B97F4A7C15)};
+	    z = (z ^ (z >> 30)) * UINT64_C(0xBF58476D1CE4E5B9);
+	    z = (z ^ (z >> 27)) * UINT64_C(0x94D049BB133111EB);
+	    
+        return z ^ (z >> 31);
+    }
+
+    /**  Returns the next value of the generator. */
+    inline result_type operator()() noexcept
+    {
+        return next();
+    }
+
+    /** Advances the state of the generator by @c z. */
+    inline void discard(std::uint64_t z) noexcept
+    {
+        for (std::uint64_t i {}; i < z; ++i)
+        {
+            next();
+        }
+    }
+
+    /**
+     * Returns true if the two generators will produce identical
+     * sequences of values.
+     */
+    inline friend bool operator==(const splitmix64& lhs, const splitmix64& rhs) noexcept
+    {
+        return lhs.state_ == rhs.state_;
+    }
+
+    /**
+     * Returns true if the two generators will produce different
+     * sequences of values.
+     */
+    inline friend bool operator!=(const splitmix64& lhs, const splitmix64& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    /**  Writes a @c splitmix64 to a @c std::ostream. */
+    template <typename CharT, typename Traits>
+    inline friend std::basic_ostream<CharT,Traits>& operator<<(std::basic_ostream<CharT,Traits>& ost, 
+                                                               const splitmix64& e)
+    {
+        ost << e.state_;
+        return ost;
+    }
+
+    /**  Writes a @c splitmix64 to a @c std::istream. */
+    template <typename CharT, typename Traits>
+    inline friend std::basic_istream<CharT,Traits>& operator>>(std::basic_istream<CharT,Traits>& ist,
+                                                               splitmix64& e)
+    {
+        std::string sstate;
+        CharT val;
+        while (ist >> val)
+        {
+            if (std::isdigit(val))
+            {
+                sstate.push_back(val);
+            }
+        }
+        
+        e.state_ = std::strtoull(sstate.c_str(), nullptr, 10);
+
+        return ist;
+    }
+
+    /** Fills a range with random values */
+    template <typename FIter>
+    inline void generate(FIter first, FIter last) noexcept
+    {
+        while (first != last)
+        {
+            *first++ = next();
+        }
+    }
+
+    /**
+     * Returns the largest value that the @c splitmix64
+     * can produce.
+     */
+    static constexpr result_type (max)() noexcept
+    {
+        return (std::numeric_limits<std::uint64_t>::max)();
+    }
+
+    /**
+     * Returns the smallest value that the @c splitmix64
+     * can produce.
+     */
+    static constexpr result_type (min)() noexcept
+    {
+        return (std::numeric_limits<std::uint64_t>::min)();
+    }
+};
+
+}} // Namespace boost::random
+
+#endif // BOOST_RANDOM_SPLITMIX64_HPP
diff --git a/inst/include/boost/range/detail/any_iterator_buffer.hpp b/inst/include/boost/range/detail/any_iterator_buffer.hpp
index 2bb5d53a4..9c943de6a 100644
--- a/inst/include/boost/range/detail/any_iterator_buffer.hpp
+++ b/inst/include/boost/range/detail/any_iterator_buffer.hpp
@@ -13,7 +13,7 @@
 #include <boost/array.hpp>
 #include <boost/assert.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 namespace boost
 {
diff --git a/inst/include/boost/range/mfc.hpp b/inst/include/boost/range/mfc.hpp
index 058e54ec6..ac025fbaa 100644
--- a/inst/include/boost/range/mfc.hpp
+++ b/inst/include/boost/range/mfc.hpp
@@ -292,11 +292,8 @@ namespace boost { namespace range_detail_microsoft {
         struct meta
         {
             typedef list_iterator<X, ::CObject *> mutable_iterator;
-    #if !defined(BOOST_RANGE_MFC_CONST_COL_RETURNS_NON_REF)
-            typedef list_iterator<X const, ::CObject const *> const_iterator;
-    #else
+            // const CObList and const CPtrList both return a value (and probably always will)
             typedef list_iterator<X const, ::CObject const * const, ::CObject const * const> const_iterator;
-    #endif
         };
     };
 
@@ -309,11 +306,8 @@ namespace boost { namespace range_detail_microsoft {
         struct meta
         {
             typedef list_iterator<X, void *> mutable_iterator;
-    #if !defined(BOOST_RANGE_MFC_CONST_COL_RETURNS_NON_REF)
-            typedef list_iterator<X const, void const *> const_iterator;
-    #else
+            // const CObList and const CPtrList both return a value (and probably always will)
             typedef list_iterator<X const, void const * const, void const * const> const_iterator;
-    #endif
         };
     };
 
diff --git a/inst/include/boost/scope/detail/compact_storage.hpp b/inst/include/boost/scope/detail/compact_storage.hpp
new file mode 100644
index 000000000..b619e3f7d
--- /dev/null
+++ b/inst/include/boost/scope/detail/compact_storage.hpp
@@ -0,0 +1,102 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2022 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/compact_storage.hpp
+ *
+ * This header contains utility helpers for implementing compact storage
+ * for class members. In particular, it allows to leverage empty base optimization (EBO).
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_COMPACT_STORAGE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_COMPACT_STORAGE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/type_traits/is_final.hpp>
+#include <boost/scope/detail/type_traits/negation.hpp>
+#include <boost/scope/detail/type_traits/conjunction.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+//! The class allows to place data members in the tail padding of type \a T if the user's class derives from it
+template<
+    typename T,
+    typename Tag = void,
+    bool = detail::conjunction< std::is_class< T >, detail::negation< detail::is_final< T > > >::value
+>
+class compact_storage :
+    private T
+{
+public:
+    template< typename... Args >
+    constexpr compact_storage(Args&&... args) noexcept(std::is_nothrow_constructible< T, Args... >::value) :
+        T(static_cast< Args&& >(args)...)
+    {
+    }
+
+    compact_storage(compact_storage&&) = default;
+    compact_storage& operator= (compact_storage&&) = default;
+
+    compact_storage(compact_storage const&) = default;
+    compact_storage& operator= (compact_storage const&) = default;
+
+    T& get() noexcept
+    {
+        return *static_cast< T* >(this);
+    }
+
+    T const& get() const noexcept
+    {
+        return *static_cast< const T* >(this);
+    }
+};
+
+template< typename T, typename Tag >
+class compact_storage< T, Tag, false >
+{
+private:
+    T m_data;
+
+public:
+    template< typename... Args >
+    constexpr compact_storage(Args&&... args) noexcept(std::is_nothrow_constructible< T, Args... >::value) :
+        m_data(static_cast< Args&& >(args)...)
+    {
+    }
+
+    compact_storage(compact_storage&&) = default;
+    compact_storage& operator= (compact_storage&&) = default;
+
+    compact_storage(compact_storage const&) = default;
+    compact_storage& operator= (compact_storage const&) = default;
+
+    T& get() noexcept
+    {
+        return m_data;
+    }
+
+    T const& get() const noexcept
+    {
+        return m_data;
+    }
+};
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_DETAIL_COMPACT_STORAGE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/config.hpp b/inst/include/boost/scope/detail/config.hpp
new file mode 100644
index 000000000..26821ea34
--- /dev/null
+++ b/inst/include/boost/scope/detail/config.hpp
@@ -0,0 +1,50 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/config.hpp
+ *
+ * This header contains Boost.Scope common configuration.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_CONFIG_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_CONFIG_HPP_INCLUDED_
+
+#include <boost/config.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if !(defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510l) && !defined(_NOEXCEPT_TYPES_SUPPORTED)
+#define BOOST_SCOPE_NO_CXX17_NOEXCEPT_FUNCTION_TYPES
+#endif
+
+#if !defined(BOOST_SCOPE_DETAIL_DOC_ALT)
+#if !defined(BOOST_SCOPE_DOXYGEN)
+#define BOOST_SCOPE_DETAIL_DOC_ALT(alt, ...) __VA_ARGS__
+#else
+#define BOOST_SCOPE_DETAIL_DOC_ALT(alt, ...) alt
+#endif
+#endif
+
+#if !defined(BOOST_SCOPE_DETAIL_DOC_HIDDEN)
+#define BOOST_SCOPE_DETAIL_DOC_HIDDEN(...) BOOST_SCOPE_DETAIL_DOC_ALT(..., __VA_ARGS__)
+#endif
+
+#if !defined(BOOST_SCOPE_DETAIL_DOC)
+#if !defined(BOOST_SCOPE_DOXYGEN)
+#define BOOST_SCOPE_DETAIL_DOC(...)
+#else
+#define BOOST_SCOPE_DETAIL_DOC(...) __VA_ARGS__
+#endif
+#endif
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_DETAIL_CONFIG_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/footer.hpp b/inst/include/boost/scope/detail/footer.hpp
new file mode 100644
index 000000000..2d9b12e6b
--- /dev/null
+++ b/inst/include/boost/scope/detail/footer.hpp
@@ -0,0 +1,22 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+
+#if !defined(BOOST_SCOPE_ENABLE_WARNINGS)
+
+#if defined(_MSC_VER) && !defined(__clang__)
+
+#pragma warning(pop)
+
+#elif (defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) \
+    && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
+
+#pragma GCC diagnostic pop
+
+#endif
+
+#endif // !defined(BOOST_SCOPE_ENABLE_WARNINGS)
diff --git a/inst/include/boost/scope/detail/header.hpp b/inst/include/boost/scope/detail/header.hpp
new file mode 100644
index 000000000..ad3920795
--- /dev/null
+++ b/inst/include/boost/scope/detail/header.hpp
@@ -0,0 +1,49 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+
+#if !defined(BOOST_SCOPE_ENABLE_WARNINGS)
+
+#if defined(_MSC_VER) && !defined(__clang__)
+
+#pragma warning(push, 3)
+// unreferenced formal parameter
+#pragma warning(disable: 4100)
+// conditional expression is constant
+#pragma warning(disable: 4127)
+// function marked as __forceinline not inlined
+#pragma warning(disable: 4714)
+// decorated name length exceeded, name was truncated
+#pragma warning(disable: 4503)
+// qualifier applied to function type has no meaning; ignored
+#pragma warning(disable: 4180)
+// qualifier applied to reference type; ignored
+#pragma warning(disable: 4181)
+// unreachable code
+#pragma warning(disable: 4702)
+// destructor never returns, potential memory leak
+#pragma warning(disable: 4722)
+
+#elif (defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) \
+    && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
+
+// Note: clang-cl goes here as well, as it seems to support gcc-style warning control pragmas.
+
+#pragma GCC diagnostic push
+// unused parameter 'arg'
+//#pragma GCC diagnostic ignored "-Wunused-parameter"
+// unused function 'foo'
+//#pragma GCC diagnostic ignored "-Wunused-function"
+
+#if defined(__clang__)
+// template argument uses unnamed type
+//#pragma clang diagnostic ignored "-Wunnamed-type-template-args"
+#endif // defined(__clang__)
+
+#endif
+
+#endif // !defined(BOOST_SCOPE_ENABLE_WARNINGS)
diff --git a/inst/include/boost/scope/detail/is_nonnull_default_constructible.hpp b/inst/include/boost/scope/detail/is_nonnull_default_constructible.hpp
new file mode 100644
index 000000000..e6e86474f
--- /dev/null
+++ b/inst/include/boost/scope/detail/is_nonnull_default_constructible.hpp
@@ -0,0 +1,66 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/is_nonnull_default_constructible.hpp
+ *
+ * This header contains definition of \c is_nonnull_default_constructible
+ * and \c is_nothrow_nonnull_default_constructible type traits. The type
+ * traits are useful for preventing default-construction of pointers to
+ * functions where a default-constructed function object is expected.
+ * Without it, default- or value-constructing a pointer to function would
+ * produce a function object that is not callable.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_IS_NONNULL_DEFAULT_CONSTRUCTIBLE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_IS_NONNULL_DEFAULT_CONSTRUCTIBLE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+//! The type trait checks if \c T is not a pointer and is default-constructible
+template< typename T >
+struct is_nonnull_default_constructible :
+    public std::is_default_constructible< T >
+{
+};
+
+template< typename T >
+struct is_nonnull_default_constructible< T* > :
+    public std::false_type
+{
+};
+
+//! The type trait checks if \c T is not a pointer and is nothrow-default-constructible
+template< typename T >
+struct is_nothrow_nonnull_default_constructible :
+    public std::is_nothrow_default_constructible< T >
+{
+};
+
+template< typename T >
+struct is_nothrow_nonnull_default_constructible< T* > :
+    public std::false_type
+{
+};
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_DETAIL_IS_NONNULL_DEFAULT_CONSTRUCTIBLE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/is_not_like.hpp b/inst/include/boost/scope/detail/is_not_like.hpp
new file mode 100644
index 000000000..3f07fa802
--- /dev/null
+++ b/inst/include/boost/scope/detail/is_not_like.hpp
@@ -0,0 +1,49 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/is_not_like.hpp
+ *
+ * This header contains definition of \c is_not_like type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_IS_NOT_LIKE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_IS_NOT_LIKE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+//! The type trait checks if \c T is not a possibly cv-reference-qualified specialization of \c Template
+template< typename T, template< typename... > class Template >
+struct is_not_like : public std::true_type { };
+template< typename T, template< typename... > class Template >
+struct is_not_like< T&, Template > : public is_not_like< T, Template > { };
+template< template< typename... > class Template, typename... Ts >
+struct is_not_like< Template< Ts... >, Template > : public std::false_type { };
+template< template< typename... > class Template, typename... Ts >
+struct is_not_like< const Template< Ts... >, Template > : public std::false_type { };
+template< template< typename... > class Template, typename... Ts >
+struct is_not_like< volatile Template< Ts... >, Template > : public std::false_type { };
+template< template< typename... > class Template, typename... Ts >
+struct is_not_like< const volatile Template< Ts... >, Template > : public std::false_type { };
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_DETAIL_IS_NOT_LIKE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/move_or_copy_assign_ref.hpp b/inst/include/boost/scope/detail/move_or_copy_assign_ref.hpp
new file mode 100644
index 000000000..0e270f8c1
--- /dev/null
+++ b/inst/include/boost/scope/detail/move_or_copy_assign_ref.hpp
@@ -0,0 +1,52 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2022 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/move_or_copy_assign_ref.hpp
+ *
+ * This header contains definition of \c move_or_copy_assign_ref type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_MOVE_OR_COPY_ASSIGN_REF_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_MOVE_OR_COPY_ASSIGN_REF_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+//! The type trait produces an rvalue reference to \a From if \a To has a non-throwing assignment from a \a From rvalue and an lvalue reference otherwise.
+template< typename From, typename To = From >
+struct move_or_copy_assign_ref
+{
+    using type = typename std::conditional<
+        std::is_nothrow_assignable< To, From >::value,
+        From&&,
+        From const&
+    >::type;
+};
+
+template< typename From, typename To >
+struct move_or_copy_assign_ref< From&, To >
+{
+    using type = From&;
+};
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_DETAIL_MOVE_OR_COPY_ASSIGN_REF_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/move_or_copy_construct_ref.hpp b/inst/include/boost/scope/detail/move_or_copy_construct_ref.hpp
new file mode 100644
index 000000000..b3d379686
--- /dev/null
+++ b/inst/include/boost/scope/detail/move_or_copy_construct_ref.hpp
@@ -0,0 +1,52 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2022 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/move_or_copy_construct_ref.hpp
+ *
+ * This header contains definition of \c move_or_copy_construct_ref type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_MOVE_OR_COPY_CONSTRUCT_REF_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_MOVE_OR_COPY_CONSTRUCT_REF_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+//! The type trait produces an rvalue reference to \a From if \a To has a non-throwing constructor from a \a From rvalue and an lvalue reference otherwise.
+template< typename From, typename To = From >
+struct move_or_copy_construct_ref
+{
+    using type = typename std::conditional<
+        std::is_nothrow_constructible< To, From >::value,
+        From&&,
+        From const&
+    >::type;
+};
+
+template< typename From, typename To >
+struct move_or_copy_construct_ref< From&, To >
+{
+    using type = From&;
+};
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_DETAIL_MOVE_OR_COPY_CONSTRUCT_REF_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/conjunction.hpp b/inst/include/boost/scope/detail/type_traits/conjunction.hpp
new file mode 100644
index 000000000..497f5721d
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/conjunction.hpp
@@ -0,0 +1,53 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/conjunction.hpp
+ *
+ * This header contains definition of \c conjunction type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_CONJUNCTION_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_CONJUNCTION_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_logical_traits) && (__cpp_lib_logical_traits >= 201510l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190023918) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::conjunction;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/conjunction.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using boost::conjunction;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_CONJUNCTION_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/disjunction.hpp b/inst/include/boost/scope/detail/type_traits/disjunction.hpp
new file mode 100644
index 000000000..af1532ded
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/disjunction.hpp
@@ -0,0 +1,53 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/disjunction.hpp
+ *
+ * This header contains definition of \c disjunction type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_DISJUNCTION_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_DISJUNCTION_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_logical_traits) && (__cpp_lib_logical_traits >= 201510l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190023918) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::disjunction;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/disjunction.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using boost::disjunction;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_DISJUNCTION_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/is_final.hpp b/inst/include/boost/scope/detail/type_traits/is_final.hpp
new file mode 100644
index 000000000..57a2bf255
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/is_final.hpp
@@ -0,0 +1,53 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/is_final.hpp
+ *
+ * This header contains definition of \c is_final type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_FINAL_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_FINAL_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_is_final) && (__cpp_lib_is_final >= 201402l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (BOOST_CXX_VERSION >= 201402l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::is_final;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/is_final.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using boost::is_final;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_FINAL_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/is_invocable.hpp b/inst/include/boost/scope/detail/type_traits/is_invocable.hpp
new file mode 100644
index 000000000..987bf1b10
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/is_invocable.hpp
@@ -0,0 +1,63 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/is_invocable.hpp
+ *
+ * This header contains definition of \c is_invocable type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_INVOCABLE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_INVOCABLE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_is_invocable) && (__cpp_lib_is_invocable >= 201703l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::is_invocable;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+// A simplified implementation that does not support member function pointers
+template< typename Func, typename... Args >
+struct is_invocable_impl
+{
+    template< typename F = Func, typename = decltype(std::declval< F >()(std::declval< Args >()...)) >
+    static std::true_type _check_invocable(int);
+    static std::false_type _check_invocable(...);
+
+    using type = decltype(is_invocable_impl::_check_invocable(0));
+};
+
+template< typename Func, typename... Args >
+struct is_invocable : public is_invocable_impl< Func, Args... >::type { };
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_INVOCABLE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/is_nothrow_invocable.hpp b/inst/include/boost/scope/detail/type_traits/is_nothrow_invocable.hpp
new file mode 100644
index 000000000..5510a5fb0
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/is_nothrow_invocable.hpp
@@ -0,0 +1,69 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/is_nothrow_invocable.hpp
+ *
+ * This header contains definition of \c is_nothrow_invocable type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_NOTHROW_INVOCABLE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_NOTHROW_INVOCABLE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_is_invocable) && (__cpp_lib_is_invocable >= 201703l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::is_nothrow_invocable;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/scope/detail/type_traits/is_invocable.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+template< bool, typename Func, typename... Args >
+struct is_nothrow_invocable_impl
+{
+    using type = std::false_type;
+};
+
+template< typename Func, typename... Args >
+struct is_nothrow_invocable_impl< true, Func, Args... >
+{
+    using type = std::integral_constant< bool, noexcept(std::declval< Func >()(std::declval< Args >()...)) >;
+};
+
+template< typename Func, typename... Args >
+struct is_nothrow_invocable :
+    public is_nothrow_invocable_impl< detail::is_invocable< Func, Args... >::value, Func, Args... >::type
+{
+};
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_NOTHROW_INVOCABLE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/is_nothrow_swappable.hpp b/inst/include/boost/scope/detail/type_traits/is_nothrow_swappable.hpp
new file mode 100644
index 000000000..08e317165
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/is_nothrow_swappable.hpp
@@ -0,0 +1,53 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/is_nothrow_swappable.hpp
+ *
+ * This header contains definition of \c is_nothrow_swappable type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_NOTHROW_SWAPPABLE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_NOTHROW_SWAPPABLE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_is_swappable) && (__cpp_lib_is_swappable >= 201603l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190024210) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::is_nothrow_swappable;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/is_nothrow_swappable.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using boost::is_nothrow_swappable;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_NOTHROW_SWAPPABLE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/is_swappable.hpp b/inst/include/boost/scope/detail/type_traits/is_swappable.hpp
new file mode 100644
index 000000000..c84a14791
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/is_swappable.hpp
@@ -0,0 +1,53 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/is_swappable.hpp
+ *
+ * This header contains definition of \c is_swappable type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_SWAPPABLE_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_SWAPPABLE_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_is_swappable) && (__cpp_lib_is_swappable >= 201603l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190024210) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::is_swappable;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/is_swappable.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using boost::is_swappable;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_IS_SWAPPABLE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/detail/type_traits/negation.hpp b/inst/include/boost/scope/detail/type_traits/negation.hpp
new file mode 100644
index 000000000..f78f52f22
--- /dev/null
+++ b/inst/include/boost/scope/detail/type_traits/negation.hpp
@@ -0,0 +1,53 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/detail/type_traits/negation.hpp
+ *
+ * This header contains definition of \c negation type trait.
+ */
+
+#ifndef BOOST_SCOPE_DETAIL_TYPE_TRAITS_NEGATION_HPP_INCLUDED_
+#define BOOST_SCOPE_DETAIL_TYPE_TRAITS_NEGATION_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if (defined(__cpp_lib_logical_traits) && (__cpp_lib_logical_traits >= 201510l)) || \
+    (defined(BOOST_MSSTL_VERSION) && (BOOST_MSSTL_VERSION >= 140) && (_MSC_FULL_VER >= 190023918) && (BOOST_CXX_VERSION >= 201703l))
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using std::negation;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#else
+
+#include <boost/type_traits/negation.hpp>
+
+namespace boost {
+namespace scope {
+namespace detail {
+
+using boost::negation;
+
+} // namespace detail
+} // namespace scope
+} // namespace boost
+
+#endif
+
+#endif // BOOST_SCOPE_DETAIL_TYPE_TRAITS_NEGATION_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/fd_deleter.hpp b/inst/include/boost/scope/fd_deleter.hpp
new file mode 100644
index 000000000..92f3ee21f
--- /dev/null
+++ b/inst/include/boost/scope/fd_deleter.hpp
@@ -0,0 +1,82 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/fd_deleter.hpp
+ *
+ * This header contains definition of a deleter function object for
+ * POSIX-like file descriptors for use with \c unique_resource.
+ */
+
+#ifndef BOOST_SCOPE_FD_DELETER_HPP_INCLUDED_
+#define BOOST_SCOPE_FD_DELETER_HPP_INCLUDED_
+
+#include <boost/scope/detail/config.hpp>
+
+#if !defined(BOOST_WINDOWS)
+#include <unistd.h>
+#if defined(hpux) || defined(_hpux) || defined(__hpux)
+#include <cerrno>
+#endif
+#else // !defined(BOOST_WINDOWS)
+#include <io.h>
+#endif // !defined(BOOST_WINDOWS)
+
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+
+//! POSIX-like file descriptor deleter
+struct fd_deleter
+{
+    using result_type = void;
+
+    //! Closes the file descriptor
+    result_type operator() (int fd) const noexcept
+    {
+#if !defined(BOOST_WINDOWS)
+#if defined(hpux) || defined(_hpux) || defined(__hpux)
+        // Some systems don't close the file descriptor in case if the thread is interrupted by a signal and close(2) returns EINTR.
+        // Other (most) systems do close the file descriptor even when when close(2) returns EINTR, and attempting to close it
+        // again could close a different file descriptor that was opened by a different thread.
+        //
+        // Future POSIX standards will likely fix this by introducing posix_close (see https://www.austingroupbugs.net/view.php?id=529)
+        // and prohibiting returning EINTR from close(2), but we still have to support older systems where this new behavior is not available and close(2)
+        // behaves differently between systems.
+        int res;
+        while (true)
+        {
+            res = ::close(fd);
+            if (BOOST_UNLIKELY(res < 0))
+            {
+                int err = errno;
+                if (err == EINTR)
+                    continue;
+            }
+
+            break;
+        }
+#else
+        ::close(fd);
+#endif
+#else // !defined(BOOST_WINDOWS)
+        ::_close(fd);
+#endif // !defined(BOOST_WINDOWS)
+    }
+};
+
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_FD_DELETER_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/fd_resource_traits.hpp b/inst/include/boost/scope/fd_resource_traits.hpp
new file mode 100644
index 000000000..76177979c
--- /dev/null
+++ b/inst/include/boost/scope/fd_resource_traits.hpp
@@ -0,0 +1,49 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/fd_resource_traits.hpp
+ *
+ * This header contains definition of \c unique_resource traits
+ * for compatibility with POSIX-like file descriptors.
+ */
+
+#ifndef BOOST_SCOPE_FD_RESOURCE_TRAITS_HPP_INCLUDED_
+#define BOOST_SCOPE_FD_RESOURCE_TRAITS_HPP_INCLUDED_
+
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+
+//! POSIX-like file descriptor resource traits
+struct fd_resource_traits
+{
+    //! Creates a default fd value
+    static int make_default() noexcept
+    {
+        return -1;
+    }
+
+    //! Tests if the fd is allocated (valid)
+    static bool is_allocated(int fd) noexcept
+    {
+        return fd >= 0;
+    }
+};
+
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_FD_RESOURCE_TRAITS_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/scope_exit.hpp b/inst/include/boost/scope/scope_exit.hpp
new file mode 100644
index 000000000..0f03ff4c4
--- /dev/null
+++ b/inst/include/boost/scope/scope_exit.hpp
@@ -0,0 +1,560 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/scope_exit.hpp
+ *
+ * This header contains definition of \c scope_exit template.
+ */
+
+#ifndef BOOST_SCOPE_SCOPE_EXIT_HPP_INCLUDED_
+#define BOOST_SCOPE_SCOPE_EXIT_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/is_not_like.hpp>
+#include <boost/scope/detail/compact_storage.hpp>
+#include <boost/scope/detail/move_or_copy_construct_ref.hpp>
+#include <boost/scope/detail/is_nonnull_default_constructible.hpp>
+#include <boost/scope/detail/type_traits/conjunction.hpp>
+#include <boost/scope/detail/type_traits/is_invocable.hpp>
+#include <boost/scope/detail/type_traits/is_nothrow_invocable.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+
+template< typename Func, typename Cond >
+class scope_exit;
+
+namespace detail {
+
+// Workaround for clang < 5.0 which can't pass scope_exit as a template template parameter from within scope_exit definition
+template< typename T >
+using is_not_like_scope_exit = detail::is_not_like< T, scope_exit >;
+
+//! The scope guard used to invoke the condition and action functions in case of exception during scope guard construction
+template< typename Func, typename Cond >
+class init_guard
+{
+private:
+    Func& m_func;
+    Cond& m_cond;
+    bool m_active;
+
+public:
+    init_guard(Func& func, Cond& cond, bool active) noexcept :
+        m_func(func),
+        m_cond(cond),
+        m_active(active)
+    {
+    }
+
+    init_guard(init_guard const&) = delete;
+    init_guard& operator= (init_guard const&) = delete;
+
+    ~init_guard()
+        noexcept(detail::conjunction<
+            detail::is_nothrow_invocable< Func& >,
+            detail::is_nothrow_invocable< Cond& >
+        >::value)
+    {
+        if (m_active && m_cond())
+            m_func();
+    }
+
+    Func&& get_func() noexcept
+    {
+        return static_cast< Func&& >(m_func);
+    }
+
+    Cond&& get_cond() noexcept
+    {
+        return static_cast< Cond&& >(m_cond);
+    }
+
+    void deactivate() noexcept
+    {
+        m_active = false;
+    }
+};
+
+} // namespace detail
+
+/*!
+ * \brief A predicate that always returns \c true.
+ *
+ * This predicate can be used as the default condition function object for
+ * \c scope_exit and similar scope guards.
+ */
+class always_true
+{
+public:
+    //! Predicate result type
+    using result_type = bool;
+
+    /*!
+     * **Throws:** Nothing.
+     *
+     * \returns \c true.
+     */
+    result_type operator()() const noexcept
+    {
+        return true;
+    }
+};
+
+/*!
+ * \brief Scope exit guard that conditionally invokes a function upon leaving the scope.
+ *
+ * The scope guard wraps two function objects: the scope guard action and
+ * a condition for invoking the action. Both function objects must be
+ * callable with no arguments and can be one of:
+ *
+ * \li A user-defined class with a public `operator()`.
+ * \li An lvalue reference to such class.
+ * \li An lvalue reference or pointer to function taking no arguments.
+ *
+ * The condition function object `operator()` must return a value
+ * contextually convertible to \c true, if the action function object
+ * is allowed to be executed, and \c false otherwise. Additionally,
+ * the condition function object `operator()` must not throw, as
+ * otherwise the action function object may not be called.
+ *
+ * The condition function object is optional, and if not specified in
+ * template parameters, the scope guard will operate as if the condition
+ * always returns \c true.
+ *
+ * The scope guard can be in either active or inactive state. By default,
+ * the constructed scope guard is active. When active, and condition
+ * function object returns \c true, the scope guard invokes the wrapped
+ * action function object on destruction. Otherwise, the scope guard
+ * does not call the wrapped action function object.
+ *
+ * The scope guard can be made inactive by moving-from the scope guard
+ * or calling `set_active(false)`. An inactive scope guard can be made
+ * active by calling `set_active(true)`. If a moved-from scope guard
+ * is active on destruction, the behavior is undefined.
+ *
+ * \tparam Func Scope guard action function object type.
+ * \tparam Cond Scope guard condition function object type.
+ */
+template< typename Func, typename Cond = always_true >
+class scope_exit
+{
+//! \cond
+private:
+    struct func_holder :
+        public detail::compact_storage< Func >
+    {
+        using func_base = detail::compact_storage< Func >;
+
+        template<
+            typename F,
+            typename C,
+            typename = typename std::enable_if< std::is_constructible< Func, F >::value >::type
+        >
+        explicit func_holder(F&& func, C&& cond, bool active, std::true_type) noexcept :
+            func_base(static_cast< F&& >(func))
+        {
+        }
+
+        template<
+            typename F,
+            typename C,
+            typename = typename std::enable_if< std::is_constructible< Func, F >::value >::type
+        >
+        explicit func_holder(F&& func, C&& cond, bool active, std::false_type) :
+            func_holder(detail::init_guard< F, C >(func, cond, active))
+        {
+        }
+
+    private:
+        template< typename F, typename C >
+        explicit func_holder(detail::init_guard< F, C >&& init) :
+            func_base(init.get_func())
+        {
+            init.deactivate();
+        }
+    };
+
+    struct cond_holder :
+        public detail::compact_storage< Cond >
+    {
+        using cond_base = detail::compact_storage< Cond >;
+
+        template<
+            typename C,
+            typename = typename std::enable_if< std::is_constructible< Cond, C >::value >::type
+        >
+        explicit cond_holder(C&& cond, Func& func, bool active, std::true_type) noexcept :
+            cond_base(static_cast< C&& >(cond))
+        {
+        }
+
+        template<
+            typename C,
+            typename = typename std::enable_if< std::is_constructible< Cond, C >::value >::type
+        >
+        explicit cond_holder(C&& cond, Func& func, bool active, std::false_type) :
+            cond_holder(detail::init_guard< Func&, C >(func, cond, active))
+        {
+        }
+
+    private:
+        template< typename C >
+        explicit cond_holder(detail::init_guard< Func&, C >&& init) :
+            cond_base(init.get_cond())
+        {
+            init.deactivate();
+        }
+    };
+
+    struct data :
+        public func_holder,
+        public cond_holder
+    {
+        bool m_active;
+
+        template<
+            typename F,
+            typename C,
+            typename = typename std::enable_if< detail::conjunction<
+                std::is_constructible< func_holder, F, C, bool, typename std::is_nothrow_constructible< Func, F >::type >,
+                std::is_constructible< cond_holder, C, Func&, bool, typename std::is_nothrow_constructible< Cond, C >::type >
+            >::value >::type
+        >
+        explicit data(F&& func, C&& cond, bool active)
+            noexcept(detail::conjunction< std::is_nothrow_constructible< Func, F >, std::is_nothrow_constructible< Cond, C > >::value) :
+            func_holder(static_cast< F&& >(func), static_cast< C&& >(cond), active, typename std::is_nothrow_constructible< Func, F >::type()),
+            cond_holder(static_cast< C&& >(cond), func_holder::get(), active, typename std::is_nothrow_constructible< Cond, C >::type()),
+            m_active(active)
+        {
+        }
+
+        Func& get_func() noexcept
+        {
+            return func_holder::get();
+        }
+
+        Func const& get_func() const noexcept
+        {
+            return func_holder::get();
+        }
+
+        Cond& get_cond() noexcept
+        {
+            return cond_holder::get();
+        }
+
+        Cond const& get_cond() const noexcept
+        {
+            return cond_holder::get();
+        }
+
+        bool deactivate() noexcept
+        {
+            bool active = m_active;
+            m_active = false;
+            return active;
+        }
+    };
+
+    data m_data;
+
+//! \endcond
+public:
+    /*!
+     * \brief Constructs a scope guard with a given callable action function object.
+     *
+     * **Requires:** \c Func is constructible from \a func. \c Cond is nothrow default-constructible
+     *               and is not a pointer to function.
+     *
+     * \note The requirement for \c Cond default constructor to be non-throwing is to allow for
+     *       the condition function object to be called in case if constructing either function
+     *       object throws.
+     *
+     * **Effects:** Constructs the scope guard as if by calling
+     *              `scope_exit(std::forward< F >(func), Cond(), active)`.
+     *
+     * **Throws:** Nothing, unless construction of the function objects throw.
+     *
+     * \param func The callable action function object to invoke on destruction.
+     * \param active Indicates whether the scope guard should be active upon construction.
+     *
+     * \post `this->active() == active`
+     */
+    template<
+        typename F
+        //! \cond
+        , typename = typename std::enable_if< detail::conjunction<
+            detail::is_nothrow_nonnull_default_constructible< Cond >,
+            std::is_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< F, Func >::type,
+                typename detail::move_or_copy_construct_ref< Cond >::type,
+                bool
+            >,
+            detail::is_not_like_scope_exit< F >
+        >::value >::type
+        //! \endcond
+    >
+    explicit scope_exit(F&& func, bool active = true)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            std::is_nothrow_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< F, Func >::type,
+                typename detail::move_or_copy_construct_ref< Cond >::type,
+                bool
+            >::value
+        )) :
+        m_data
+        (
+            static_cast< typename detail::move_or_copy_construct_ref< F, Func >::type >(func),
+            static_cast< typename detail::move_or_copy_construct_ref< Cond >::type >(Cond()),
+            active
+        )
+    {
+    }
+
+    /*!
+     * \brief Constructs a scope guard with a given callable action and condition function objects.
+     *
+     * **Requires:** \c Func is constructible from \a func. \c Cond is constructible from \a cond.
+     *
+     * **Effects:** If \c Func is nothrow constructible from `F&&` then constructs \c Func from
+     *              `std::forward< F >(func)`, otherwise constructs from `func`. If \c Cond is
+     *              nothrow constructible from `C&&` then constructs \c Cond from
+     *              `std::forward< C >(cond)`, otherwise constructs from `cond`.
+     *
+     *              If \c Func or \c Cond construction throws and \a active is \c true, invokes
+     *              \a cond and, if it returns \c true, \a func before returning with the exception.
+     *
+     * **Throws:** Nothing, unless construction of the function objects throw.
+     *
+     * \param func The callable action function object to invoke on destruction.
+     * \param cond The callable condition function object.
+     * \param active Indicates whether the scope guard should be active upon construction.
+     *
+     * \post `this->active() == active`
+     */
+    template<
+        typename F,
+        typename C
+        //! \cond
+        , typename = typename std::enable_if< detail::conjunction<
+            detail::is_invocable< C const& >,
+            std::is_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< F, Func >::type,
+                typename detail::move_or_copy_construct_ref< C, Cond >::type,
+                bool
+            >
+        >::value >::type
+        //! \endcond
+    >
+    explicit scope_exit(F&& func, C&& cond, bool active = true)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            std::is_nothrow_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< F, Func >::type,
+                typename detail::move_or_copy_construct_ref< C, Cond >::type,
+                bool
+            >::value
+        )) :
+        m_data
+        (
+            static_cast< typename detail::move_or_copy_construct_ref< F, Func >::type >(func),
+            static_cast< typename detail::move_or_copy_construct_ref< C, Cond >::type >(cond),
+            active
+        )
+    {
+    }
+
+    /*!
+     * \brief Move-constructs a scope guard.
+     *
+     * **Requires:** \c Func and \c Cond are nothrow move-constructible or copy-constructible.
+     *
+     * **Effects:** If \c Func is nothrow move-constructible then move-constructs \c Func from
+     *              a member of \a that, otherwise copy-constructs \c Func. If \c Cond is nothrow
+     *              move-constructible then move-constructs \c Cond from a member of \a that,
+     *              otherwise copy-constructs \c Cond.
+     *
+     *              If \c Func or \c Cond construction throws and `that.active() == true`, invokes
+     *              \c Cond object stored in \a that and, if it returns \c true, \a Func object
+     *              (either the newly constructed one, if its construction succeeded, or the original
+     *              one stored in \a that) before returning with the exception.
+     *
+     *              If the construction succeeds, marks \a that as inactive.
+     *
+     * **Throws:** Nothing, unless move-construction of the function objects throw.
+     *
+     * \param that Move source.
+     *
+     * \post `that.active() == false`
+     */
+    //! \cond
+    template<
+        bool Requires = std::is_constructible<
+            data,
+            typename detail::move_or_copy_construct_ref< Func >::type,
+            typename detail::move_or_copy_construct_ref< Cond >::type,
+            bool
+        >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    //! \endcond
+    scope_exit(scope_exit&& that)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            std::is_nothrow_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< Func >::type,
+                typename detail::move_or_copy_construct_ref< Cond >::type,
+                bool
+            >::value
+        )) :
+        m_data
+        (
+            static_cast< typename detail::move_or_copy_construct_ref< Func >::type >(that.m_data.get_func()),
+            static_cast< typename detail::move_or_copy_construct_ref< Cond >::type >(that.m_data.get_cond()),
+            that.m_data.deactivate()
+        )
+    {
+    }
+
+    scope_exit& operator= (scope_exit&&) = delete;
+
+    scope_exit(scope_exit const&) = delete;
+    scope_exit& operator= (scope_exit const&) = delete;
+
+    /*!
+     * \brief If `active() == true`, and invoking the condition function object returns \c true, invokes
+     *        the wrapped callable action function object. Destroys the function objects.
+     *
+     * **Throws:** Nothing, unless invoking a function object throws.
+     */
+    ~scope_exit()
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            detail::conjunction<
+                detail::is_nothrow_invocable< Func& >,
+                detail::is_nothrow_invocable< Cond& >
+            >::value
+        ))
+    {
+        if (BOOST_LIKELY(m_data.m_active && m_data.get_cond()()))
+            m_data.get_func()();
+    }
+
+    /*!
+     * \brief Returns \c true if the scope guard is active, otherwise \c false.
+     *
+     * \note This method does not call the condition function object specified on construction.
+     *
+     * **Throws:** Nothing.
+     */
+    bool active() const noexcept
+    {
+        return m_data.m_active;
+    }
+
+    /*!
+     * \brief Activates or deactivates the scope guard.
+     *
+     * **Throws:** Nothing.
+     *
+     * \param active The active status to set.
+     *
+     * \post `this->active() == active`
+     */
+    void set_active(bool active) noexcept
+    {
+        m_data.m_active = active;
+    }
+};
+
+#if !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
+template< typename Func >
+explicit scope_exit(Func) -> scope_exit< Func >;
+
+template< typename Func >
+explicit scope_exit(Func, bool) -> scope_exit< Func >;
+
+template< typename Func, typename Cond >
+explicit scope_exit(Func, Cond) -> scope_exit< Func, Cond >;
+
+template< typename Func, typename Cond >
+explicit scope_exit(Func, Cond, bool) -> scope_exit< Func, Cond >;
+#endif // !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
+
+/*!
+ * \brief Creates a scope guard with a given action function object.
+ *
+ * **Effects:** Constructs a scope guard as if by calling
+ *              `scope_exit< std::decay_t< F > >(std::forward< F >(func), active)`.
+ *
+ * \param func The callable action function object to invoke on destruction.
+ * \param active Indicates whether the scope guard should be active upon construction.
+ */
+template< typename F >
+inline scope_exit< typename std::decay< F >::type > make_scope_exit(F&& func, bool active = true)
+    noexcept(std::is_nothrow_constructible<
+        scope_exit< typename std::decay< F >::type >,
+        F,
+        bool
+    >::value)
+{
+    return scope_exit< typename std::decay< F >::type >(static_cast< F&& >(func), active);
+}
+
+/*!
+ * \brief Creates a conditional scope guard with given callable function objects.
+ *
+ * **Effects:** Constructs a scope guard as if by calling
+ *              `scope_exit< std::decay_t< F >, std::decay_t< C > >(
+ *              std::forward< F >(func), std::forward< C >(cond), active)`.
+ *
+ * \param func The callable action function object to invoke on destruction.
+ * \param cond The callable condition function object.
+ * \param active Indicates whether the scope guard should be active upon construction.
+ */
+template< typename F, typename C >
+inline
+#if !defined(BOOST_SCOPE_DOXYGEN)
+typename std::enable_if<
+    std::is_constructible<
+        scope_exit< typename std::decay< F >::type, typename std::decay< C >::type >,
+        F,
+        C,
+        bool
+    >::value,
+    scope_exit< typename std::decay< F >::type, typename std::decay< C >::type >
+>::type
+#else
+scope_exit< typename std::decay< F >::type, typename std::decay< C >::type >
+#endif
+make_scope_exit(F&& func, C&& cond, bool active = true)
+    noexcept(std::is_nothrow_constructible<
+        scope_exit< typename std::decay< F >::type, typename std::decay< C >::type >,
+        F,
+        C,
+        bool
+    >::value)
+{
+    return scope_exit< typename std::decay< F >::type, typename std::decay< C >::type >(static_cast< F&& >(func), static_cast< C&& >(cond), active);
+}
+
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_SCOPE_EXIT_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/unique_fd.hpp b/inst/include/boost/scope/unique_fd.hpp
new file mode 100644
index 000000000..305ad3886
--- /dev/null
+++ b/inst/include/boost/scope/unique_fd.hpp
@@ -0,0 +1,38 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2023 Andrey Semashev
+ */
+/*!
+ * \file scope/unique_fd.hpp
+ *
+ * This header contains definition of \c unique_fd type.
+ */
+
+#ifndef BOOST_SCOPE_UNIQUE_FD_HPP_INCLUDED_
+#define BOOST_SCOPE_UNIQUE_FD_HPP_INCLUDED_
+
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/unique_resource.hpp>
+#include <boost/scope/fd_deleter.hpp>
+#include <boost/scope/fd_resource_traits.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+
+//! Unique POSIX-like file descriptor resource
+using unique_fd = unique_resource< int, fd_deleter, fd_resource_traits >;
+
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_UNIQUE_FD_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/unique_resource.hpp b/inst/include/boost/scope/unique_resource.hpp
new file mode 100644
index 000000000..81683c407
--- /dev/null
+++ b/inst/include/boost/scope/unique_resource.hpp
@@ -0,0 +1,1642 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2022-2024 Andrey Semashev
+ */
+/*!
+ * \file scope/unique_resource.hpp
+ *
+ * This header contains definition of \c unique_resource template.
+ */
+
+#ifndef BOOST_SCOPE_UNIQUE_RESOURCE_HPP_INCLUDED_
+#define BOOST_SCOPE_UNIQUE_RESOURCE_HPP_INCLUDED_
+
+#include <new> // for placement new
+#include <type_traits>
+#include <boost/core/addressof.hpp>
+#include <boost/core/invoke_swap.hpp>
+#include <boost/scope/unique_resource_fwd.hpp>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/compact_storage.hpp>
+#include <boost/scope/detail/move_or_copy_assign_ref.hpp>
+#include <boost/scope/detail/move_or_copy_construct_ref.hpp>
+#include <boost/scope/detail/is_nonnull_default_constructible.hpp>
+#include <boost/scope/detail/type_traits/is_swappable.hpp>
+#include <boost/scope/detail/type_traits/is_nothrow_swappable.hpp>
+#include <boost/scope/detail/type_traits/is_nothrow_invocable.hpp>
+#include <boost/scope/detail/type_traits/negation.hpp>
+#include <boost/scope/detail/type_traits/conjunction.hpp>
+#include <boost/scope/detail/type_traits/disjunction.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+
+#if !defined(BOOST_NO_CXX17_FOLD_EXPRESSIONS) && !defined(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS)
+
+/*!
+ * \brief Simple resource traits for one or more unallocated resource values.
+ *
+ * This class template generates resource traits for `unique_resource` that specify
+ * one or more unallocated resource values. The first value, specified in the \c DefaultValue
+ * non-type template parameter, is considered the default. The other values, listed in
+ * \c UnallocatedValues, are optional. Any resource values other than \c DefaultValue
+ * or listed in \c UnallocatedValues are considered as allocated.
+ *
+ * In order for the generated resource traits to enable optimized implementation of
+ * `unique_resource`, the resource type must support non-throwing construction and assignment
+ * from, and comparison for (in)equality with \c DefaultValue or any of the resource
+ * values listed in \c UnallocatedValues.
+ */
+template< auto DefaultValue, auto... UnallocatedValues >
+struct unallocated_resource
+{
+    //! Returns the default resource value
+    static decltype(DefaultValue) make_default() noexcept
+    {
+        return DefaultValue;
+    }
+
+    //! Tests if \a res is an allocated resource value
+    template< typename Resource >
+    static bool is_allocated(Resource const& res) noexcept
+    {
+        static_assert(noexcept(res != DefaultValue && (... && (res != UnallocatedValues))),
+            "Invalid unallocated resource value types: comparing resource values with the unallocated values must be noexcept");
+        return res != DefaultValue && (... && (res != UnallocatedValues));
+    }
+};
+
+#endif // !defined(BOOST_NO_CXX17_FOLD_EXPRESSIONS) && !defined(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS)
+
+struct default_resource_t { };
+
+//! Keyword representing default, unallocated resource argument
+BOOST_INLINE_VARIABLE constexpr default_resource_t default_resource = { };
+
+namespace detail {
+
+// The type trait indicates whether \c T is a possibly qualified \c default_resource_t type
+template< typename T >
+struct is_default_resource : public std::false_type { };
+template< >
+struct is_default_resource< default_resource_t > : public std::true_type { };
+template< >
+struct is_default_resource< const default_resource_t > : public std::true_type { };
+template< >
+struct is_default_resource< volatile default_resource_t > : public std::true_type { };
+template< >
+struct is_default_resource< const volatile default_resource_t > : public std::true_type { };
+template< typename T >
+struct is_default_resource< T& > : public is_default_resource< T >::type { };
+
+// Lightweight reference wrapper
+template< typename T >
+class ref_wrapper
+{
+private:
+    T* m_value;
+
+public:
+    explicit
+#if !defined(BOOST_CORE_NO_CONSTEXPR_ADDRESSOF)
+    constexpr
+#endif
+    ref_wrapper(T& value) noexcept :
+        m_value(boost::addressof(value))
+    {
+    }
+
+    ref_wrapper& operator= (T& value) noexcept
+    {
+        m_value = boost::addressof(value);
+        return *this;
+    }
+
+    ref_wrapper(T&&) = delete;
+    ref_wrapper& operator= (T&&) = delete;
+
+    operator T& () const noexcept
+    {
+        return *m_value;
+    }
+
+    template< typename... Args >
+    void operator() (Args&&... args) const noexcept(detail::is_nothrow_invocable< T&, Args&&... >::value)
+    {
+        (*m_value)(static_cast< Args&& >(args)...);
+    }
+};
+
+template< typename T >
+struct wrap_reference
+{
+    using type = T;
+};
+
+template< typename T >
+struct wrap_reference< T& >
+{
+    using type = ref_wrapper< T >;
+};
+
+template< typename Resource, bool UseCompactStorage >
+class resource_holder :
+    public detail::compact_storage< typename wrap_reference< Resource >::type >
+{
+public:
+    using resource_type = Resource;
+    using internal_resource_type = typename wrap_reference< resource_type >::type;
+
+private:
+    using resource_base = detail::compact_storage< internal_resource_type >;
+
+public:
+    template<
+        bool Requires = std::is_default_constructible< internal_resource_type >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    constexpr resource_holder() noexcept(std::is_nothrow_default_constructible< internal_resource_type >::value) :
+        resource_base()
+    {
+    }
+
+    template<
+        typename R,
+        typename = typename std::enable_if< std::is_constructible< internal_resource_type, R >::value >::type
+    >
+    explicit resource_holder(R&& res) noexcept(std::is_nothrow_constructible< internal_resource_type, R >::value) :
+        resource_base(static_cast< R&& >(res))
+    {
+    }
+
+    template<
+        typename R,
+        typename D,
+        typename = typename std::enable_if< std::is_constructible< internal_resource_type, R >::value >::type
+    >
+    explicit resource_holder(R&& res, D&& del, bool allocated) noexcept(std::is_nothrow_constructible< internal_resource_type, R >::value) :
+        resource_holder(static_cast< R&& >(res), static_cast< D&& >(del), allocated, typename std::is_nothrow_constructible< resource_type, R >::type())
+    {
+    }
+
+    resource_type& get() noexcept
+    {
+        return resource_base::get();
+    }
+
+    resource_type const& get() const noexcept
+    {
+        return resource_base::get();
+    }
+
+    internal_resource_type& get_internal() noexcept
+    {
+        return resource_base::get();
+    }
+
+    internal_resource_type const& get_internal() const noexcept
+    {
+        return resource_base::get();
+    }
+
+    void move_from(internal_resource_type&& that) noexcept(std::is_nothrow_move_assignable< internal_resource_type >::value)
+    {
+        resource_base::get() = static_cast< internal_resource_type&& >(that);
+    }
+
+private:
+    template< typename R, typename D >
+    explicit resource_holder(R&& res, D&& del, bool allocated, std::true_type) noexcept :
+        resource_base(static_cast< R&& >(res))
+    {
+    }
+
+    template< typename R, typename D >
+    explicit resource_holder(R&& res, D&& del, bool allocated, std::false_type) try :
+        resource_base(res)
+    {
+    }
+    catch (...)
+    {
+        if (allocated)
+            del(res);
+    }
+};
+
+template< typename Resource >
+class resource_holder< Resource, false >
+{
+public:
+    using resource_type = Resource;
+    using internal_resource_type = typename wrap_reference< resource_type >::type;
+
+private:
+    // Note: Not using compact_storage since we will need to reuse storage for this complete object in move_from
+    internal_resource_type m_resource;
+
+public:
+    template<
+        bool Requires = std::is_default_constructible< internal_resource_type >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    constexpr resource_holder() noexcept(std::is_nothrow_default_constructible< internal_resource_type >::value) :
+        m_resource()
+    {
+    }
+
+    template<
+        typename R,
+        typename = typename std::enable_if< std::is_constructible< internal_resource_type, R >::value >::type
+    >
+    explicit resource_holder(R&& res) noexcept(std::is_nothrow_constructible< internal_resource_type, R >::value) :
+        m_resource(static_cast< R&& >(res))
+    {
+    }
+
+    template<
+        typename R,
+        typename D,
+        typename = typename std::enable_if< std::is_constructible< internal_resource_type, R >::value >::type
+    >
+    explicit resource_holder(R&& res, D&& del, bool allocated) noexcept(std::is_nothrow_constructible< internal_resource_type, R >::value) :
+        resource_holder(static_cast< R&& >(res), static_cast< D&& >(del), allocated, typename std::is_nothrow_constructible< resource_type, R >::type())
+    {
+    }
+
+    resource_type& get() noexcept
+    {
+        return m_resource;
+    }
+
+    resource_type const& get() const noexcept
+    {
+        return m_resource;
+    }
+
+    internal_resource_type& get_internal() noexcept
+    {
+        return m_resource;
+    }
+
+    internal_resource_type const& get_internal() const noexcept
+    {
+        return m_resource;
+    }
+
+    void move_from(internal_resource_type&& that)
+        noexcept(std::is_nothrow_constructible< internal_resource_type, typename detail::move_or_copy_construct_ref< resource_type >::type >::value)
+    {
+        internal_resource_type* p = boost::addressof(m_resource);
+        p->~internal_resource_type();
+        new (p) internal_resource_type(static_cast< typename detail::move_or_copy_construct_ref< resource_type >::type >(that));
+    }
+
+private:
+    template< typename R, typename D >
+    explicit resource_holder(R&& res, D&& del, bool allocated, std::true_type) noexcept :
+        m_resource(static_cast< R&& >(res))
+    {
+    }
+
+    template< typename R, typename D >
+    explicit resource_holder(R&& res, D&& del, bool allocated, std::false_type) try :
+        m_resource(res)
+    {
+    }
+    catch (...)
+    {
+        if (allocated)
+            del(res);
+    }
+};
+
+template< typename Resource, typename Deleter >
+class deleter_holder :
+    public detail::compact_storage< typename wrap_reference< Deleter >::type >
+{
+public:
+    using resource_type = Resource;
+    using deleter_type = Deleter;
+    using internal_deleter_type = typename wrap_reference< deleter_type >::type;
+
+private:
+    using deleter_base = detail::compact_storage< internal_deleter_type >;
+
+public:
+    template<
+        bool Requires = detail::is_nonnull_default_constructible< internal_deleter_type >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    constexpr deleter_holder() noexcept(detail::is_nothrow_nonnull_default_constructible< internal_deleter_type >::value) :
+        deleter_base()
+    {
+    }
+
+    template<
+        typename D,
+        typename = typename std::enable_if< std::is_constructible< internal_deleter_type, D >::value >::type
+    >
+    explicit deleter_holder(D&& del) noexcept(std::is_nothrow_constructible< internal_deleter_type, D >::value) :
+        deleter_base(static_cast< D&& >(del))
+    {
+    }
+
+    template<
+        typename D,
+        typename = typename std::enable_if< std::is_constructible< internal_deleter_type, D >::value >::type
+    >
+    explicit deleter_holder(D&& del, resource_type& res, bool allocated) noexcept(std::is_nothrow_constructible< internal_deleter_type, D >::value) :
+        deleter_holder(static_cast< D&& >(del), res, allocated, typename std::is_nothrow_constructible< internal_deleter_type, D >::type())
+    {
+    }
+
+    deleter_type& get() noexcept
+    {
+        return deleter_base::get();
+    }
+
+    deleter_type const& get() const noexcept
+    {
+        return deleter_base::get();
+    }
+
+    internal_deleter_type& get_internal() noexcept
+    {
+        return deleter_base::get();
+    }
+
+    internal_deleter_type const& get_internal() const noexcept
+    {
+        return deleter_base::get();
+    }
+
+private:
+    template< typename D >
+    explicit deleter_holder(D&& del, resource_type& res, bool allocated, std::true_type) noexcept :
+        deleter_base(static_cast< D&& >(del))
+    {
+    }
+
+    template< typename D >
+    explicit deleter_holder(D&& del, resource_type& res, bool allocated, std::false_type) try :
+        deleter_base(del)
+    {
+    }
+    catch (...)
+    {
+        if (BOOST_LIKELY(allocated))
+            del(res);
+    }
+};
+
+/*
+ * This metafunction indicates whether \c resource_holder should use \c compact_storage
+ * to optimize storage for the resource object. Its definition must be coherent with
+ * `resource_holder::move_from` definition and move constructor implementation in
+ * \c unique_resource_data.
+ *
+ * There is one tricky case with \c unique_resource move constructor, when the resource move
+ * constructor is noexcept and deleter's move and copy constructors are not. It is possible
+ * that \c unique_resource_data move constructor moves the resource into the object being
+ * constructed but fails to construct the deleter. In this case we want to move the resource
+ * back to the original \c unique_resource_data object (which is guaranteed to not throw since
+ * the resource's move constructor is non-throwing).
+ *
+ * However, if we use the move constructor to move the resource back, we need to use placement
+ * new, and this only lets us create a complete object of the resource type, which prohibits
+ * the use of \c compact_storage, as it may create the resource object as a base subobject of
+ * \c compact_storage. Using placement new on a base subobject may corrupt data that is placed
+ * in the trailing padding bits of the resource type.
+ *
+ * To work around this limitation, we also test if move assignment of the resource type is
+ * also non-throwing (which is reasonable to expect, given that the move constructor is
+ * non-throwing). If it is, we can avoid having to destroy and move-construct the resource and
+ * use move-assignment instead. This doesn't require a complete object of the resource type
+ * and allows us to use \c compact_storage. If move assignment is not noexcept then we have
+ * to use the move constructor and disable the \c compact_storage optimization.
+ *
+ * So this trait has to detect (a) whether we are affected by this tricky case of the
+ * \c unique_resource move constructor in the first place and (b) whether we can use move
+ * assignment to move the resource back to the original \c unique_resource object. If we're
+ * not affected or we can use move assignment then we enable \c compact_storage.
+ */
+template< typename Resource, typename Deleter >
+using use_resource_compact_storage = detail::disjunction<
+    std::is_nothrow_move_assignable< typename wrap_reference< Resource >::type >,
+    std::is_nothrow_constructible< typename wrap_reference< Deleter >::type, typename detail::move_or_copy_construct_ref< Deleter >::type >,
+    detail::negation< std::is_nothrow_constructible< typename wrap_reference< Resource >::type, typename detail::move_or_copy_construct_ref< Resource >::type > >
+>;
+
+template< typename Resource, typename Deleter, typename Traits >
+class unique_resource_data :
+    public detail::resource_holder< Resource, use_resource_compact_storage< Resource, Deleter >::value >,
+    public detail::deleter_holder< Resource, Deleter >
+{
+public:
+    using resource_type = Resource;
+    using deleter_type = Deleter;
+    using traits_type = Traits;
+
+private:
+    using resource_holder = detail::resource_holder< resource_type, use_resource_compact_storage< resource_type, deleter_type >::value >;
+    using deleter_holder = detail::deleter_holder< resource_type, deleter_type >;
+    using result_of_make_default = decltype(traits_type::make_default());
+
+public:
+    using internal_resource_type = typename resource_holder::internal_resource_type;
+    using internal_deleter_type = typename deleter_holder::internal_deleter_type;
+
+    static_assert(noexcept(traits_type::make_default()), "Invalid unique_resource resource traits: make_default must be noexcept");
+    static_assert(std::is_nothrow_assignable< internal_resource_type&, result_of_make_default >::value,
+        "Invalid unique_resource resource traits: resource must be nothrow-assignable from the result of make_default");
+    static_assert(noexcept(traits_type::is_allocated(std::declval< resource_type const& >())), "Invalid unique_resource resource traits: is_allocated must be noexcept");
+
+public:
+    template<
+        bool Requires = detail::conjunction<
+            std::is_constructible< resource_holder, result_of_make_default >,
+            std::is_default_constructible< deleter_holder >
+        >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    constexpr unique_resource_data()
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< resource_holder, result_of_make_default >,
+            std::is_nothrow_default_constructible< deleter_holder >
+        >::value) :
+        resource_holder(traits_type::make_default()),
+        deleter_holder()
+    {
+    }
+
+    unique_resource_data(unique_resource_data const&) = delete;
+    unique_resource_data& operator= (unique_resource_data const&) = delete;
+
+    unique_resource_data(unique_resource_data&& that)
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< internal_resource_type, typename detail::move_or_copy_construct_ref< resource_type >::type >,
+            std::is_nothrow_constructible< internal_deleter_type, typename detail::move_or_copy_construct_ref< deleter_type >::type >
+        >::value) :
+        unique_resource_data
+        (
+            static_cast< unique_resource_data&& >(that),
+            typename std::is_nothrow_constructible< internal_resource_type, typename detail::move_or_copy_construct_ref< resource_type >::type >::type(),
+            typename std::is_nothrow_constructible< internal_deleter_type, typename detail::move_or_copy_construct_ref< deleter_type >::type >::type()
+        )
+    {
+    }
+
+    template<
+        typename D,
+        typename = typename std::enable_if< detail::conjunction<
+            std::is_constructible< resource_holder, result_of_make_default >,
+            std::is_constructible< deleter_holder, D >
+        >::value >::type
+    >
+    explicit unique_resource_data(default_resource_t, D&& del)
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< resource_holder, result_of_make_default >,
+            std::is_nothrow_constructible< deleter_holder, D >
+        >::value) :
+        resource_holder(traits_type::make_default()),
+        deleter_holder(static_cast< D&& >(del))
+    {
+    }
+
+    template<
+        typename R,
+        typename D,
+        typename = typename std::enable_if< detail::conjunction<
+            detail::negation< detail::is_default_resource< R > >,
+            std::is_constructible< resource_holder, R, D, bool >,
+            std::is_constructible< deleter_holder, D, resource_type&, bool >
+        >::value >::type
+    >
+    explicit unique_resource_data(R&& res, D&& del)
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< resource_holder, R, D, bool >,
+            std::is_nothrow_constructible< deleter_holder, D, resource_type&, bool >
+        >::value) :
+        unique_resource_data(static_cast< R&& >(res), static_cast< D&& >(del), traits_type::is_allocated(res)) // don't forward res to is_allocated to make sure res is not moved-from on resource construction
+    {
+        // Since res may not be of the resource type, the is_allocated call made above may require a type conversion or pick a different overload.
+        // We still require it to be noexcept, as we need to know whether we should deallocate it. Otherwise we may leak the resource.
+        static_assert(noexcept(traits_type::is_allocated(res)), "Invalid unique_resource resource traits: is_allocated must be noexcept");
+    }
+
+    template<
+        bool Requires = detail::conjunction<
+            std::is_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< resource_type >::type >,
+            std::is_assignable< internal_deleter_type&, typename detail::move_or_copy_assign_ref< deleter_type >::type >
+        >::value
+    >
+    typename std::enable_if< Requires, unique_resource_data& >::type operator= (unique_resource_data&& that)
+        noexcept(detail::conjunction<
+            std::is_nothrow_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< resource_type >::type >,
+            std::is_nothrow_assignable< internal_deleter_type&, typename detail::move_or_copy_assign_ref< deleter_type >::type >
+        >::value)
+    {
+        assign(static_cast< unique_resource_data&& >(that), typename std::is_nothrow_move_assignable< internal_deleter_type >::type());
+        return *this;
+    }
+
+    resource_type& get_resource() noexcept
+    {
+        return resource_holder::get();
+    }
+
+    resource_type const& get_resource() const noexcept
+    {
+        return resource_holder::get();
+    }
+
+    internal_resource_type& get_internal_resource() noexcept
+    {
+        return resource_holder::get_internal();
+    }
+
+    internal_resource_type const& get_internal_resource() const noexcept
+    {
+        return resource_holder::get_internal();
+    }
+
+    deleter_type& get_deleter() noexcept
+    {
+        return deleter_holder::get();
+    }
+
+    deleter_type const& get_deleter() const noexcept
+    {
+        return deleter_holder::get();
+    }
+
+    internal_deleter_type& get_internal_deleter() noexcept
+    {
+        return deleter_holder::get_internal();
+    }
+
+    internal_deleter_type const& get_internal_deleter() const noexcept
+    {
+        return deleter_holder::get_internal();
+    }
+
+    bool is_allocated() const noexcept
+    {
+        return traits_type::is_allocated(get_resource());
+    }
+
+    void set_unallocated() noexcept
+    {
+        get_internal_resource() = traits_type::make_default();
+    }
+
+    template< typename R >
+    void assign_resource(R&& res) noexcept(std::is_nothrow_assignable< internal_resource_type&, R >::value)
+    {
+        get_internal_resource() = static_cast< R&& >(res);
+    }
+
+    template<
+        bool Requires = detail::conjunction<
+            detail::is_swappable< internal_resource_type >,
+            detail::is_swappable< internal_deleter_type >,
+            detail::disjunction<
+                detail::is_nothrow_swappable< internal_resource_type >,
+                detail::is_nothrow_swappable< internal_deleter_type >
+            >
+        >::value
+    >
+    typename std::enable_if< Requires >::type swap(unique_resource_data& that)
+        noexcept(detail::conjunction< detail::is_nothrow_swappable< internal_resource_type >, detail::is_nothrow_swappable< internal_deleter_type > >::value)
+    {
+        swap_impl
+        (
+            that,
+            std::integral_constant< bool, detail::is_nothrow_swappable< internal_resource_type >::value >(),
+            std::integral_constant< bool, detail::conjunction<
+                detail::is_nothrow_swappable< internal_resource_type >,
+                detail::is_nothrow_swappable< internal_deleter_type >
+            >::value >()
+        );
+    }
+
+private:
+    unique_resource_data(unique_resource_data&& that, std::true_type, std::true_type) noexcept :
+        resource_holder(static_cast< typename detail::move_or_copy_construct_ref< resource_type >::type >(that.get_resource())),
+        deleter_holder(static_cast< typename detail::move_or_copy_construct_ref< deleter_type >::type >(that.get_deleter()))
+    {
+        that.set_unallocated();
+    }
+
+    unique_resource_data(unique_resource_data&& that, std::false_type, std::true_type) :
+        resource_holder(static_cast< resource_type const& >(that.get_resource())),
+        deleter_holder(static_cast< typename detail::move_or_copy_construct_ref< deleter_type >::type >(that.get_deleter()))
+    {
+        that.set_unallocated();
+    }
+
+    unique_resource_data(unique_resource_data&& that, std::true_type, std::false_type) try :
+        resource_holder(static_cast< typename detail::move_or_copy_construct_ref< resource_type >::type >(that.get_resource())),
+        deleter_holder(static_cast< deleter_type const& >(that.get_deleter()))
+    {
+        that.set_unallocated();
+    }
+    catch (...)
+    {
+        // Since only the deleter's constructor could have thrown an exception here, move the resource back
+        // to the original unique_resource. This is guaranteed to not throw.
+        that.resource_holder::move_from(static_cast< internal_resource_type&& >(resource_holder::get_internal()));
+    }
+
+    unique_resource_data(unique_resource_data&& that, std::false_type, std::false_type) :
+        resource_holder(static_cast< resource_type const& >(that.get_resource())),
+        deleter_holder(static_cast< deleter_type const& >(that.get_deleter()))
+    {
+        that.set_unallocated();
+    }
+
+    template<
+        typename R,
+        typename D,
+        typename = typename std::enable_if< detail::conjunction<
+            std::is_constructible< resource_holder, R, D, bool >,
+            std::is_constructible< deleter_holder, D, resource_type&, bool >
+        >::value >::type
+    >
+    explicit unique_resource_data(R&& res, D&& del, bool allocated)
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< resource_holder, R, D, bool >,
+            std::is_nothrow_constructible< deleter_holder, D, resource_type&, bool >
+        >::value) :
+        resource_holder(static_cast< R&& >(res), static_cast< D&& >(del), allocated),
+        deleter_holder(static_cast< D&& >(del), resource_holder::get(), allocated)
+    {
+    }
+
+    void assign(unique_resource_data&& that, std::true_type)
+        noexcept(std::is_nothrow_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< resource_type >::type >::value)
+    {
+        get_internal_resource() = static_cast< typename detail::move_or_copy_assign_ref< resource_type >::type >(that.get_resource());
+        get_internal_deleter() = static_cast< typename detail::move_or_copy_assign_ref< deleter_type >::type >(that.get_deleter());
+
+        that.set_unallocated();
+    }
+
+    void assign(unique_resource_data&& that, std::false_type)
+    {
+        get_internal_deleter() = static_cast< typename detail::move_or_copy_assign_ref< deleter_type >::type >(that.get_deleter());
+        get_internal_resource() = static_cast< typename detail::move_or_copy_assign_ref< resource_type >::type >(that.get_resource());
+
+        that.set_unallocated();
+    }
+
+    void swap_impl(unique_resource_data& that, std::true_type, std::true_type) noexcept
+    {
+        boost::core::invoke_swap(get_internal_resource(), that.get_internal_resource());
+        boost::core::invoke_swap(get_internal_deleter(), that.get_internal_deleter());
+    }
+
+    void swap_impl(unique_resource_data& that, std::true_type, std::false_type)
+    {
+        boost::core::invoke_swap(get_internal_deleter(), that.get_internal_deleter());
+        boost::core::invoke_swap(get_internal_resource(), that.get_internal_resource());
+    }
+
+    void swap_impl(unique_resource_data& that, std::false_type, std::false_type)
+    {
+        boost::core::invoke_swap(get_internal_resource(), that.get_internal_resource());
+        boost::core::invoke_swap(get_internal_deleter(), that.get_internal_deleter());
+    }
+};
+
+template< typename Resource, typename Deleter >
+class unique_resource_data< Resource, Deleter, void > :
+    public detail::resource_holder< Resource, use_resource_compact_storage< Resource, Deleter >::value >,
+    public detail::deleter_holder< Resource, Deleter >
+{
+public:
+    using resource_type = Resource;
+    using deleter_type = Deleter;
+    using traits_type = void;
+
+private:
+    using resource_holder = detail::resource_holder< resource_type, use_resource_compact_storage< resource_type, deleter_type >::value >;
+    using deleter_holder = detail::deleter_holder< resource_type, deleter_type >;
+
+public:
+    using internal_resource_type = typename resource_holder::internal_resource_type;
+    using internal_deleter_type = typename deleter_holder::internal_deleter_type;
+
+private:
+    bool m_allocated;
+
+public:
+    template<
+        bool Requires = detail::conjunction< std::is_default_constructible< resource_holder >, std::is_default_constructible< deleter_holder > >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    constexpr unique_resource_data()
+        noexcept(detail::conjunction< std::is_nothrow_default_constructible< resource_holder >, std::is_nothrow_default_constructible< deleter_holder > >::value) :
+        resource_holder(),
+        deleter_holder(),
+        m_allocated(false)
+    {
+    }
+
+    unique_resource_data(unique_resource_data const&) = delete;
+    unique_resource_data& operator= (unique_resource_data const&) = delete;
+
+    template<
+        bool Requires = detail::conjunction<
+            std::is_constructible< internal_resource_type, typename detail::move_or_copy_construct_ref< resource_type >::type >,
+            std::is_constructible< internal_deleter_type, typename detail::move_or_copy_construct_ref< deleter_type >::type >
+        >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    unique_resource_data(unique_resource_data&& that)
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< internal_resource_type, typename detail::move_or_copy_construct_ref< resource_type >::type >,
+            std::is_nothrow_constructible< internal_deleter_type, typename detail::move_or_copy_construct_ref< deleter_type >::type >
+        >::value) :
+        unique_resource_data
+        (
+            static_cast< unique_resource_data&& >(that),
+            typename std::is_nothrow_constructible< internal_resource_type, typename detail::move_or_copy_construct_ref< resource_type >::type >::type(),
+            typename std::is_nothrow_constructible< internal_deleter_type, typename detail::move_or_copy_construct_ref< deleter_type >::type >::type()
+        )
+    {
+    }
+
+    template<
+        typename D,
+        typename = typename std::enable_if< detail::conjunction<
+            std::is_default_constructible< resource_holder >,
+            std::is_constructible< deleter_holder, D >
+        >::value >::type
+    >
+    explicit unique_resource_data(default_resource_t, D&& del)
+        noexcept(detail::conjunction<
+            std::is_nothrow_default_constructible< resource_holder >,
+            std::is_nothrow_constructible< deleter_holder, D >
+        >::value) :
+        resource_holder(),
+        deleter_holder(static_cast< D&& >(del)),
+        m_allocated(false)
+    {
+    }
+
+    template<
+        typename R,
+        typename D,
+        typename = typename std::enable_if< detail::conjunction<
+            detail::negation< detail::is_default_resource< R > >,
+            std::is_constructible< resource_holder, R, D, bool >,
+            std::is_constructible< deleter_holder, D, resource_type&, bool >
+        >::value >::type
+    >
+    explicit unique_resource_data(R&& res, D&& del)
+        noexcept(detail::conjunction<
+            std::is_nothrow_constructible< resource_holder, R, D, bool >,
+            std::is_nothrow_constructible< deleter_holder, D, resource_type&, bool >
+        >::value) :
+        resource_holder(static_cast< R&& >(res), static_cast< D&& >(del), true),
+        deleter_holder(static_cast< D&& >(del), resource_holder::get(), true),
+        m_allocated(true)
+    {
+    }
+
+    template<
+        bool Requires = detail::conjunction<
+            std::is_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< resource_type >::type >,
+            std::is_assignable< internal_deleter_type&, typename detail::move_or_copy_assign_ref< deleter_type >::type >
+        >::value
+    >
+    typename std::enable_if< Requires, unique_resource_data& >::type operator= (unique_resource_data&& that)
+        noexcept(detail::conjunction<
+            std::is_nothrow_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< resource_type >::type >,
+            std::is_nothrow_assignable< internal_deleter_type&, typename detail::move_or_copy_assign_ref< deleter_type >::type >
+        >::value)
+    {
+        assign(static_cast< unique_resource_data&& >(that), typename std::is_nothrow_move_assignable< internal_deleter_type >::type());
+        return *this;
+    }
+
+    resource_type& get_resource() noexcept
+    {
+        return resource_holder::get();
+    }
+
+    resource_type const& get_resource() const noexcept
+    {
+        return resource_holder::get();
+    }
+
+    internal_resource_type& get_internal_resource() noexcept
+    {
+        return resource_holder::get_internal();
+    }
+
+    internal_resource_type const& get_internal_resource() const noexcept
+    {
+        return resource_holder::get_internal();
+    }
+
+    deleter_type& get_deleter() noexcept
+    {
+        return deleter_holder::get();
+    }
+
+    deleter_type const& get_deleter() const noexcept
+    {
+        return deleter_holder::get();
+    }
+
+    internal_deleter_type& get_internal_deleter() noexcept
+    {
+        return deleter_holder::get_internal();
+    }
+
+    internal_deleter_type const& get_internal_deleter() const noexcept
+    {
+        return deleter_holder::get_internal();
+    }
+
+    bool is_allocated() const noexcept
+    {
+        return m_allocated;
+    }
+
+    void set_unallocated() noexcept
+    {
+        m_allocated = false;
+    }
+
+    template< typename R >
+    void assign_resource(R&& res) noexcept(std::is_nothrow_assignable< internal_resource_type&, R >::value)
+    {
+        get_internal_resource() = static_cast< R&& >(res);
+        m_allocated = true;
+    }
+
+    template<
+        bool Requires = detail::conjunction<
+            detail::is_swappable< internal_resource_type >,
+            detail::is_swappable< internal_deleter_type >,
+            detail::disjunction<
+                detail::is_nothrow_swappable< internal_resource_type >,
+                detail::is_nothrow_swappable< internal_deleter_type >
+            >
+        >::value
+    >
+    typename std::enable_if< Requires >::type swap(unique_resource_data& that)
+        noexcept(detail::conjunction< detail::is_nothrow_swappable< internal_resource_type >, detail::is_nothrow_swappable< internal_deleter_type > >::value)
+    {
+        swap_impl
+        (
+            that,
+            std::integral_constant< bool, detail::is_nothrow_swappable< internal_resource_type >::value >(),
+            std::integral_constant< bool, detail::conjunction<
+                detail::is_nothrow_swappable< internal_resource_type >,
+                detail::is_nothrow_swappable< internal_deleter_type >
+            >::value >()
+        );
+    }
+
+private:
+    unique_resource_data(unique_resource_data&& that, std::true_type, std::true_type) noexcept :
+        resource_holder(static_cast< typename detail::move_or_copy_construct_ref< resource_type >::type >(that.get_resource())),
+        deleter_holder(static_cast< typename detail::move_or_copy_construct_ref< deleter_type >::type >(that.get_deleter())),
+        m_allocated(that.m_allocated)
+    {
+        that.m_allocated = false;
+    }
+
+    unique_resource_data(unique_resource_data&& that, std::false_type, std::true_type) :
+        resource_holder(static_cast< resource_type const& >(that.get_resource())),
+        deleter_holder(static_cast< typename detail::move_or_copy_construct_ref< deleter_type >::type >(that.get_deleter())),
+        m_allocated(that.m_allocated)
+    {
+        that.m_allocated = false;
+    }
+
+    unique_resource_data(unique_resource_data&& that, std::true_type, std::false_type) try :
+        resource_holder(static_cast< typename detail::move_or_copy_construct_ref< resource_type >::type >(that.get_resource())),
+        deleter_holder(static_cast< deleter_type const& >(that.get_deleter())),
+        m_allocated(that.m_allocated)
+    {
+        that.m_allocated = false;
+    }
+    catch (...)
+    {
+        // Since only the deleter's constructor could have thrown an exception here, move the resource back
+        // to the original unique_resource. This is guaranteed to not throw.
+        that.resource_holder::move_from(static_cast< internal_resource_type&& >(resource_holder::get_internal()));
+    }
+
+    unique_resource_data(unique_resource_data&& that, std::false_type, std::false_type) :
+        resource_holder(static_cast< resource_type const& >(that.get_resource())),
+        deleter_holder(static_cast< deleter_type const& >(that.get_deleter())),
+        m_allocated(that.m_allocated)
+    {
+        that.m_allocated = false;
+    }
+
+    void assign(unique_resource_data&& that, std::true_type)
+        noexcept(std::is_nothrow_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< resource_type >::type >::value)
+    {
+        get_internal_resource() = static_cast< typename detail::move_or_copy_assign_ref< resource_type >::type >(that.get_resource());
+        get_internal_deleter() = static_cast< typename detail::move_or_copy_assign_ref< deleter_type >::type >(that.get_deleter());
+
+        m_allocated = that.m_allocated;
+        that.m_allocated = false;
+    }
+
+    void assign(unique_resource_data&& that, std::false_type)
+    {
+        get_internal_deleter() = static_cast< typename detail::move_or_copy_assign_ref< deleter_type >::type >(that.get_deleter());
+        get_internal_resource() = static_cast< typename detail::move_or_copy_assign_ref< resource_type >::type >(that.get_resource());
+
+        m_allocated = that.m_allocated;
+        that.m_allocated = false;
+    }
+
+    void swap_impl(unique_resource_data& that, std::true_type, std::true_type) noexcept
+    {
+        boost::core::invoke_swap(get_internal_resource(), that.get_internal_resource());
+        boost::core::invoke_swap(get_internal_deleter(), that.get_internal_deleter());
+        boost::core::invoke_swap(m_allocated, that.m_allocated);
+    }
+
+    void swap_impl(unique_resource_data& that, std::true_type, std::false_type)
+    {
+        boost::core::invoke_swap(get_internal_deleter(), that.get_internal_deleter());
+        boost::core::invoke_swap(get_internal_resource(), that.get_internal_resource());
+        boost::core::invoke_swap(m_allocated, that.m_allocated);
+    }
+
+    void swap_impl(unique_resource_data& that, std::false_type, std::false_type)
+    {
+        boost::core::invoke_swap(get_internal_resource(), that.get_internal_resource());
+        boost::core::invoke_swap(get_internal_deleter(), that.get_internal_deleter());
+        boost::core::invoke_swap(m_allocated, that.m_allocated);
+    }
+};
+
+template< typename T >
+struct is_dereferenceable_impl
+{
+    template< typename U, typename R = decltype(*std::declval< U const& >()) >
+    static std::true_type _is_dereferenceable_check(int);
+    template< typename U >
+    static std::false_type _is_dereferenceable_check(...);
+
+    using type = decltype(is_dereferenceable_impl::_is_dereferenceable_check< T >(0));
+};
+
+template< typename T >
+struct is_dereferenceable : public is_dereferenceable_impl< T >::type { };
+template< >
+struct is_dereferenceable< void* > : public std::false_type { };
+template< >
+struct is_dereferenceable< const void* > : public std::false_type { };
+template< >
+struct is_dereferenceable< volatile void* > : public std::false_type { };
+template< >
+struct is_dereferenceable< const volatile void* > : public std::false_type { };
+template< >
+struct is_dereferenceable< void*& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const void*& > : public std::false_type { };
+template< >
+struct is_dereferenceable< volatile void*& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const volatile void*& > : public std::false_type { };
+template< >
+struct is_dereferenceable< void* const& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const void* const& > : public std::false_type { };
+template< >
+struct is_dereferenceable< volatile void* const& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const volatile void* const& > : public std::false_type { };
+template< >
+struct is_dereferenceable< void* volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const void* volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< volatile void* volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const volatile void* volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< void* const volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const void* const volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< volatile void* const volatile& > : public std::false_type { };
+template< >
+struct is_dereferenceable< const volatile void* const volatile& > : public std::false_type { };
+
+template< typename T, bool = detail::is_dereferenceable< T >::value >
+struct dereference_traits { };
+template< typename T >
+struct dereference_traits< T, true >
+{
+    using result_type = decltype(*std::declval< T const& >());
+    static constexpr bool is_noexcept = noexcept(*std::declval< T const& >());
+};
+
+} // namespace detail
+
+/*!
+ * \brief RAII wrapper for automatically reclaiming arbitrary resources.
+ *
+ * A \c unique_resource object exclusively owns wrapped resource and invokes
+ * the deleter function object on it on destruction. The wrapped resource can have
+ * any type that is:
+ *
+ * \li Move-constructible, where the move constructor is marked as `noexcept`, or
+ * \li Copy-constructible, or
+ * \li An lvalue reference to an object type.
+ *
+ * The deleter must be a function object type that is callable on an lvalue
+ * of the resource type. The deleter must be copy-constructible.
+ *
+ * An optional resource traits template parameter may be specified. Resource
+ * traits can be used to optimize \c unique_resource implementation when
+ * the following conditions are met:
+ *
+ * \li There is at least one value of the resource type that is considered
+ *     unallocated (that is, no allocated resource shall be equal to one of
+ *     the unallocated resource values). The unallocated resource values need not
+ *     be deallocated using the deleter.
+ * \li One of the unallocated resource values can be considered the default.
+ *     Constructing the default resource value and assigning it to a resource
+ *     object (whether allocated or not) shall not throw exceptions.
+ * \li Resource objects can be tested for being unallocated. Such a test shall
+ *     not throw exceptions.
+ *
+ * If specified, the resource traits must be a class type that has the following
+ * public static members:
+ *
+ * \li `R make_default() noexcept` - must return the default resource value such
+ *     that `std::is_constructible< Resource, R >::value &&
+ *     std::is_nothrow_assignable< Resource&, R >::value` is \c true.
+ * \li `bool is_allocated(Resource const& res) noexcept` - must return \c true
+ *     if \c res is not one of the unallocated resource values and \c false
+ *     otherwise.
+ *
+ * Note that `is_allocated(make_default())` must always return \c false.
+ *
+ * When resource traits satisfying the above requirements are specified,
+ * \c unique_resource will be able to avoid storing additional indication of
+ * whether the owned resource object needs to be deallocated with the deleter
+ * on destruction. It will use the default resource value to initialize the owned
+ * resource object when \c unique_resource is not in the allocated state.
+ * Additionally, it will be possible to construct \c unique_resource with
+ * unallocated resource values, which will create \c unique_resource objects in
+ * unallocated state (the deleter will not be called on unallocated resource
+ * values).
+ * 
+ * \tparam Resource Resource type.
+ * \tparam Deleter Resource deleter function object type.
+ * \tparam Traits Optional resource traits type.
+ */
+template< typename Resource, typename Deleter, typename Traits BOOST_SCOPE_DETAIL_DOC(= void) >
+class unique_resource
+{
+public:
+    //! Resource type
+    using resource_type = Resource;
+    //! Deleter type
+    using deleter_type = Deleter;
+    //! Resource traits
+    using traits_type = Traits;
+
+//! \cond
+private:
+    using data = detail::unique_resource_data< resource_type, deleter_type, traits_type >;
+    using internal_resource_type = typename data::internal_resource_type;
+    using internal_deleter_type = typename data::internal_deleter_type;
+
+    data m_data;
+
+//! \endcond
+public:
+    /*!
+     * \brief Constructs an unallocated unique resource guard.
+     *
+     * **Requires:** Default \c Resource value can be constructed. \c Deleter is default-constructible
+     *               and is not a pointer to function.
+     *
+     * **Effects:** Initializes the \c Resource object with the default resource value. Default-constructs
+     *              the \c Deleter object.
+     *
+     * **Throws:** Nothing, unless construction of \c Resource or \c Deleter throws.
+     *
+     * \post `this->allocated() == false`
+     */
+    //! \cond
+    template<
+        bool Requires = std::is_default_constructible< data >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    //! \endcond
+    constexpr unique_resource() noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(std::is_nothrow_default_constructible< data >::value))
+    {
+    }
+
+    /*!
+     * \brief Constructs an unallocated unique resource guard with the given deleter.
+     *
+     * **Requires:** Default \c Resource value can be constructed and \c Deleter is constructible from \a del.
+     *
+     * **Effects:** Initializes the \c Resource value with the default resource value. If \c Deleter is nothrow
+     *              constructible from `D&&` then constructs \c Deleter from `std::forward< D >(del)`,
+     *              otherwise constructs from `del`.
+     *
+     * **Throws:** Nothing, unless construction of \c Resource or \c Deleter throws.
+     *
+     * \param res A tag argument indicating default resource value.
+     * \param del Resource deleter function object.
+     *
+     * \post `this->allocated() == false`
+     */
+    template<
+        typename D
+        //! \cond
+        , typename = typename std::enable_if<
+            std::is_constructible< data, default_resource_t, typename detail::move_or_copy_construct_ref< D, deleter_type >::type >::value
+        >::type
+        //! \endcond
+    >
+    unique_resource(default_resource_t res, D&& del)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            std::is_nothrow_constructible<
+                data,
+                default_resource_t,
+                typename detail::move_or_copy_construct_ref< D, deleter_type >::type
+            >::value
+        )) :
+        m_data
+        (
+            res,
+            static_cast< typename detail::move_or_copy_construct_ref< D, deleter_type >::type >(del)
+        )
+    {
+    }
+
+    /*!
+     * \brief Constructs a unique resource guard with the given resource and a default-constructed deleter.
+     *
+     * **Requires:** \c Resource is constructible from \a res. \c Deleter is default-constructible and
+     *               is not a pointer to function.
+     *
+     * **Effects:** Constructs the unique resource object as if by calling
+     *              `unique_resource(std::forward< R >(res), Deleter())`.
+     *
+     * **Throws:** Nothing, unless construction of \c Resource or \c Deleter throws.
+     *
+     * \param res Resource object.
+     */
+    template<
+        typename R
+        //! \cond
+        , typename = typename std::enable_if< detail::conjunction<
+            detail::is_nothrow_nonnull_default_constructible< deleter_type >,
+            std::is_constructible< data, typename detail::move_or_copy_construct_ref< R, resource_type >::type, typename detail::move_or_copy_construct_ref< deleter_type >::type >,
+            detail::disjunction< detail::negation< std::is_reference< resource_type > >, std::is_reference< R > > // prevent binding lvalue-reference resource to an rvalue
+        >::value >::type
+        //! \endcond
+    >
+    explicit unique_resource(R&& res)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            std::is_nothrow_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< R, resource_type >::type,
+                typename detail::move_or_copy_construct_ref< deleter_type >::type
+            >::value
+        )) :
+        m_data
+        (
+            static_cast< typename detail::move_or_copy_construct_ref< R, resource_type >::type >(res),
+            static_cast< typename detail::move_or_copy_construct_ref< deleter_type >::type >(deleter_type())
+        )
+    {
+    }
+
+    /*!
+     * \brief Constructs a unique resource guard with the given resource and deleter.
+     *
+     * **Requires:** \c Resource is constructible from \a res and \c Deleter is constructible from \a del.
+     *
+     * **Effects:** If \c Resource is nothrow constructible from `R&&` then constructs \c Resource
+     *              from `std::forward< R >(res)`, otherwise constructs from `res`. If \c Deleter
+     *              is nothrow constructible from `D&&` then constructs \c Deleter from
+     *              `std::forward< D >(del)`, otherwise constructs from `del`.
+     *
+     *              If construction of \c Resource or \c Deleter throws and \a res is not an unallocated resource
+     *              value, invokes \a del on \a res (if \c Resource construction failed) or the constructed
+     *              \c Resource object (if \c Deleter construction failed).
+     *
+     * **Throws:** Nothing, unless construction of \c Resource or \c Deleter throws.
+     *
+     * \param res Resource object.
+     * \param del Resource deleter function object.
+     *
+     * \post If \a res is an unallocated resource value then `this->allocated() == false`, otherwise
+     *       `this->allocated() == true`.
+     */
+    template<
+        typename R,
+        typename D
+        //! \cond
+        , typename = typename std::enable_if< detail::conjunction<
+            std::is_constructible< data, typename detail::move_or_copy_construct_ref< R, resource_type >::type, typename detail::move_or_copy_construct_ref< D, deleter_type >::type >,
+            detail::disjunction< detail::negation< std::is_reference< resource_type > >, std::is_reference< R > > // prevent binding lvalue-reference resource to an rvalue
+        >::value >::type
+        //! \endcond
+    >
+    unique_resource(R&& res, D&& del)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            std::is_nothrow_constructible<
+                data,
+                typename detail::move_or_copy_construct_ref< R, resource_type >::type,
+                typename detail::move_or_copy_construct_ref< D, deleter_type >::type
+            >::value
+        )) :
+        m_data
+        (
+            static_cast< typename detail::move_or_copy_construct_ref< R, resource_type >::type >(res),
+            static_cast< typename detail::move_or_copy_construct_ref< D, deleter_type >::type >(del)
+        )
+    {
+    }
+
+    unique_resource(unique_resource const&) = delete;
+    unique_resource& operator= (unique_resource const&) = delete;
+
+    /*!
+     * \brief Move-constructs a unique resource guard.
+     *
+     * **Requires:** \c Resource and \c Deleter are move-constructible.
+     *
+     * **Effects:** If \c Resource is nothrow move-constructible then move-constructs \c Resource,
+     *              otherwise copy-constructs. If \c Deleter is nothrow move-constructible then move-constructs
+     *              \c Deleter, otherwise copy-constructs. Deactivates the moved-from unique resource object.
+     *
+     *              If an exception is thrown during construction, \a that is left in its original state.
+     *
+     * \note This logic ensures that in case of exception the resource is not leaked and remains owned by the
+     *       move source.
+     *
+     * **Throws:** Nothing, unless construction of \c Resource or \c Deleter throws.
+     *
+     * \param that Move source.
+     *
+     * \post Let \c allocated be equal to `that.allocated()` prior to the operation. Then
+     *       `this->allocated() == allocated` and `that.allocated() == false`.
+     */
+    //! \cond
+    template<
+        bool Requires = std::is_move_constructible< data >::value,
+        typename = typename std::enable_if< Requires >::type
+    >
+    //! \endcond
+    unique_resource(unique_resource&& that) noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(std::is_nothrow_move_constructible< data >::value)) :
+        m_data(static_cast< data&& >(that.m_data))
+    {
+    }
+
+    /*!
+     * \brief Move-assigns a unique resource guard.
+     *
+     * **Requires:** \c Resource and \c Deleter are move-assignable.
+     *
+     * **Effects:** Calls `this->reset()`. Then, if \c Deleter is nothrow move-assignable, move-assigns
+     *              the \c Deleter object first and the \c Resource object next. Otherwise, move-assigns
+     *              the objects in reverse order. Lastly, deactivates the moved-from unique resource object.
+     *
+     *              If an exception is thrown, \a that is left in its original state.
+     *
+     * \note The different orders of assignment ensure that in case of exception the resource is not leaked
+     *       and remains owned by the move source.
+     *
+     * **Throws:** Nothing, unless assignment of \c Resource or \c Deleter throws.
+     *
+     * \param that Move source.
+     *
+     * \post Let \c allocated be equal to `that.allocated()` prior to the operation. Then
+     *       `this->allocated() == allocated` and `that.allocated() == false`.
+     */
+#if !defined(BOOST_SCOPE_DOXYGEN)
+    template< bool Requires = std::is_move_assignable< data >::value >
+    typename std::enable_if< Requires, unique_resource& >::type
+#else
+    unique_resource&
+#endif
+    operator= (unique_resource&& that)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(std::is_nothrow_move_assignable< data >::value))
+    {
+        reset();
+        m_data = static_cast< data&& >(that.m_data);
+        return *this;
+    }
+
+    /*!
+     * \brief If the resource is allocated, calls the deleter function on it. Destroys the resource and the deleter.
+     *
+     * **Throws:** Nothing, unless invoking the deleter throws.
+     */
+    ~unique_resource() noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(detail::is_nothrow_invocable< deleter_type&, resource_type& >::value))
+    {
+        if (BOOST_LIKELY(m_data.is_allocated()))
+            m_data.get_deleter()(m_data.get_resource());
+    }
+
+    /*!
+     * \brief Returns \c true if the resource is allocated and to be reclaimed by the deleter, otherwise \c false.
+     *
+     * \note This method does not test the value of the resource.
+     * 
+     * **Throws:** Nothing.
+     */
+    explicit operator bool () const noexcept
+    {
+        return m_data.is_allocated();
+    }
+
+    /*!
+     * \brief Returns \c true if the resource is allocated and to be reclaimed by the deleter, otherwise \c false.
+     *
+     * **Throws:** Nothing.
+     */
+    bool allocated() const noexcept
+    {
+        return m_data.is_allocated();
+    }
+
+    /*!
+     * \brief Returns a reference to the resource object.
+     *
+     * **Throws:** Nothing.
+     */
+    resource_type const& get() const noexcept
+    {
+        return m_data.get_resource();
+    }
+
+    /*!
+     * \brief Returns a reference to the deleter object.
+     *
+     * **Throws:** Nothing.
+     */
+    deleter_type const& get_deleter() const noexcept
+    {
+        return m_data.get_deleter();
+    }
+
+    /*!
+     * \brief Marks the resource as unallocated. Does not call the deleter if the resource was previously allocated.
+     *
+     * **Throws:** Nothing.
+     *
+     * \post `this->allocated() == false`
+     */
+    void release() noexcept
+    {
+        m_data.set_unallocated();
+    }
+
+    /*!
+     * \brief If the resource is allocated, calls the deleter function on it and marks the resource as unallocated.
+     *
+     * **Throws:** Nothing, unless invoking the deleter throws.
+     *
+     * \post `this->allocated() == false`
+     */
+    void reset() noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(detail::is_nothrow_invocable< deleter_type&, resource_type& >::value))
+    {
+        if (BOOST_LIKELY(m_data.is_allocated()))
+        {
+            m_data.get_deleter()(m_data.get_resource());
+            m_data.set_unallocated();
+        }
+    }
+
+    /*!
+     * \brief Assigns a new resource object to the unique resource wrapper.
+     *
+     * **Effects:** Calls `this->reset()`. Then, if \c Resource is nothrow assignable from `R&&`,
+     *              assigns `std::forward< R >(res)` to the stored resource object, otherwise assigns
+     *              `res`.
+     *
+     *              If \a res is not an unallocated resource value and an exception is thrown during the operation,
+     *              invokes the stored deleter on \a res before returning with the exception.
+     *
+     * **Throws:** Nothing, unless invoking the deleter throws.
+     *
+     * \param res Resource object to assign.
+     *
+     * \post `this->allocated() == false`
+     */
+    template< typename R >
+#if !defined(BOOST_SCOPE_DOXYGEN)
+    typename std::enable_if< detail::conjunction<
+        std::is_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< R, resource_type >::type >,
+        detail::disjunction< detail::negation< std::is_reference< resource_type > >, std::is_reference< R > > // prevent binding lvalue-reference resource to an rvalue
+    >::value >::type
+#else
+    void
+#endif
+    reset(R&& res)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+            detail::conjunction<
+                detail::is_nothrow_invocable< deleter_type&, resource_type& >,
+                std::is_nothrow_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< R, resource_type >::type >
+            >::value
+        ))
+    {
+        reset_impl
+        (
+            static_cast< R&& >(res),
+            typename detail::conjunction<
+                detail::is_nothrow_invocable< deleter_type&, resource_type& >,
+                std::is_nothrow_assignable< internal_resource_type&, typename detail::move_or_copy_assign_ref< R, resource_type >::type >
+            >::type()
+        );
+    }
+
+    /*!
+     * \brief Invokes indirection on the resource object.
+     *
+     * **Requires:** \c Resource is dereferenceable.
+     *
+     * **Effects:** Returns a reference to the resource object as if by calling `get()`.
+     *
+     * \note If \c Resource is not a pointer type, the compiler will invoke its `operator->`.
+     *       Such call sequence will continue until a pointer is obtained.
+     *
+     * **Throws:** Nothing. Note that any implicit subsequent calls to other `operator->`
+     *             functions that are caused by this call may have different throw conditions.
+     */
+#if !defined(BOOST_SCOPE_DOXYGEN)
+    template< bool Requires = detail::is_dereferenceable< resource_type >::value >
+    typename std::enable_if< Requires, resource_type const& >::type
+#else
+    resource_type const&
+#endif
+    operator-> () const noexcept
+    {
+        return get();
+    }
+
+    /*!
+     * \brief Dereferences the resource object.
+     *
+     * **Requires:** \c Resource is dereferenceable.
+     *
+     * **Effects:** Returns the result of dereferencing the resource object as if by calling `*get()`.
+     *
+     * **Throws:** Nothing, unless dereferencing the resource object throws.
+     */
+#if !defined(BOOST_SCOPE_DOXYGEN)
+    template< bool Requires = detail::is_dereferenceable< resource_type >::value >
+    typename detail::dereference_traits< resource_type, Requires >::result_type
+#else
+    auto
+#endif
+    operator* () const
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(detail::dereference_traits< resource_type, Requires >::is_noexcept))
+    {
+        return *get();
+    }
+
+    /*!
+     * \brief Swaps two unique resource wrappers.
+     *
+     * **Requires:** \c Resource and \c Deleter are swappable. At least one of \c Resource and \c Deleter
+     *               is nothrow swappable.
+     *
+     * **Effects:** Swaps the resource objects and deleter objects stored in `*this` and \a that
+     *              as if by calling unqualified `swap` in a context where `std::swap` is
+     *              found by overload resolution.
+     *
+     *              If an exception is thrown, and the failed swap operation supports strong exception
+     *              guarantee, both `*this` and \a that are left in their original states.
+     *
+     * **Throws:** Nothing, unless swapping the resource objects or deleters throw.
+     *
+     * \param that Unique resource wrapper to swap with.
+     */
+#if !defined(BOOST_SCOPE_DOXYGEN)
+    template< bool Requires = detail::is_swappable< data >::value >
+    typename std::enable_if< Requires >::type
+#else
+    void
+#endif
+    swap(unique_resource& that)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(detail::is_nothrow_swappable< data >::value))
+    {
+        m_data.swap(that.m_data);
+    }
+
+    /*!
+     * \brief Swaps two unique resource wrappers.
+     *
+     * **Effects:** As if `left.swap(right)`.
+     */
+#if !defined(BOOST_SCOPE_DOXYGEN)
+    template< bool Requires = detail::is_swappable< data >::value >
+    friend typename std::enable_if< Requires >::type
+#else
+    friend void
+#endif
+    swap(unique_resource& left, unique_resource& right)
+        noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(detail::is_nothrow_swappable< data >::value))
+    {
+        left.swap(right);
+    }
+
+//! \cond
+private:
+    //! Assigns a new resource object to the unique resource wrapper.
+    template< typename R >
+    void reset_impl(R&& res, std::true_type) noexcept
+    {
+        reset();
+        m_data.assign_resource(static_cast< typename detail::move_or_copy_assign_ref< R, resource_type >::type >(res));
+    }
+
+    //! Assigns a new resource object to the unique resource wrapper.
+    template< typename R >
+    void reset_impl(R&& res, std::false_type)
+    {
+        try
+        {
+            reset();
+            m_data.assign_resource(static_cast< typename detail::move_or_copy_assign_ref< R, resource_type >::type >(res));
+        }
+        catch (...)
+        {
+            m_data.get_deleter()(static_cast< R&& >(res));
+            throw;
+        }
+    }
+//! \endcond
+};
+
+#if !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
+template<
+    typename Resource,
+    typename Deleter,
+    typename = typename std::enable_if< !detail::is_default_resource< Resource >::value >::type
+>
+unique_resource(Resource, Deleter) -> unique_resource< Resource, Deleter >;
+#endif // !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
+
+/*!
+ * \brief Checks if the resource is valid and creates a \c unique_resource wrapper.
+ *
+ * **Effects:** If the resource \a res is not equal to \a invalid, creates a unique resource wrapper
+ *              that is in allocated state and owns \a res. Otherwise creates a unique resource wrapper
+ *              in unallocated state.
+ *
+ * \note This function does not call \a del if \a res is equal to \a invalid.
+ *
+ * **Throws:** Nothing, unless \c unique_resource constructor throws.
+ *
+ * \param res Resource to wrap.
+ * \param invalid An invalid value for the resource.
+ * \param del A deleter to invoke on the resource to free it.
+ */
+template< typename Resource, typename Deleter, typename Invalid >
+inline unique_resource< typename std::decay< Resource >::type, typename std::decay< Deleter >::type >
+make_unique_resource_checked(Resource&& res, Invalid const& invalid, Deleter&& del)
+    noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(
+        detail::conjunction<
+            std::is_nothrow_constructible< typename std::decay< Resource >::type, typename detail::move_or_copy_construct_ref< Resource, typename std::decay< Resource >::type >::type >,
+            std::is_nothrow_constructible< typename std::decay< Deleter >::type, typename detail::move_or_copy_construct_ref< Deleter, typename std::decay< Deleter >::type >::type >
+        >::value
+    ))
+{
+    using unique_resource_type = unique_resource< typename std::decay< Resource >::type, typename std::decay< Deleter >::type >;
+    if (!(res == invalid))
+        return unique_resource_type(static_cast< Resource&& >(res), static_cast< Deleter&& >(del));
+    else
+        return unique_resource_type(default_resource_t(), static_cast< Deleter&& >(del));
+}
+
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_UNIQUE_RESOURCE_HPP_INCLUDED_
diff --git a/inst/include/boost/scope/unique_resource_fwd.hpp b/inst/include/boost/scope/unique_resource_fwd.hpp
new file mode 100644
index 000000000..aa9c30ec9
--- /dev/null
+++ b/inst/include/boost/scope/unique_resource_fwd.hpp
@@ -0,0 +1,46 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * https://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2022 Andrey Semashev
+ */
+/*!
+ * \file scope/unique_resource_fwd.hpp
+ *
+ * This header contains forward declaration of \c unique_resource template.
+ */
+
+#ifndef BOOST_SCOPE_UNIQUE_RESOURCE_FWD_HPP_INCLUDED_
+#define BOOST_SCOPE_UNIQUE_RESOURCE_FWD_HPP_INCLUDED_
+
+#include <type_traits>
+#include <boost/scope/detail/config.hpp>
+#include <boost/scope/detail/move_or_copy_construct_ref.hpp>
+#include <boost/scope/detail/type_traits/conjunction.hpp>
+#include <boost/scope/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace scope {
+
+template< typename Resource, typename Deleter, typename Traits = void >
+class unique_resource;
+
+template< typename Resource, typename Deleter, typename Invalid = typename std::decay< Resource >::type >
+unique_resource< typename std::decay< Resource >::type, typename std::decay< Deleter >::type >
+make_unique_resource_checked(Resource&& res, Invalid const& invalid, Deleter&& del)
+    noexcept(BOOST_SCOPE_DETAIL_DOC_HIDDEN(detail::conjunction<
+        std::is_nothrow_constructible< typename std::decay< Resource >::type, typename detail::move_or_copy_construct_ref< Resource, typename std::decay< Resource >::type >::type >,
+        std::is_nothrow_constructible< typename std::decay< Deleter >::type, typename detail::move_or_copy_construct_ref< Deleter, typename std::decay< Deleter >::type >::type >
+    >::value));
+
+} // namespace scope
+} // namespace boost
+
+#include <boost/scope/detail/footer.hpp>
+
+#endif // BOOST_SCOPE_UNIQUE_RESOURCE_FWD_HPP_INCLUDED_
diff --git a/inst/include/boost/signals2/detail/signal_template.hpp b/inst/include/boost/signals2/detail/signal_template.hpp
index a399883c9..618d7d947 100644
--- a/inst/include/boost/signals2/detail/signal_template.hpp
+++ b/inst/include/boost/signals2/detail/signal_template.hpp
@@ -103,9 +103,9 @@ namespace boost
               BOOST_SIGNALS2_FORWARDED_ARGS(BOOST_SIGNALS2_NUM_ARGS));
         }
         template<typename T>
-          bool operator==(const T &other) const
+          bool contains(const T &other) const
         {
-          return _fun == other;
+          return _fun.contains(other);
         }
       private:
         BOOST_SIGNALS2_BOUND_EXTENDED_SLOT_FUNCTION_N(BOOST_SIGNALS2_NUM_ARGS)()
@@ -115,6 +115,8 @@ namespace boost
         boost::shared_ptr<connection> _connection;
       };
 
+      template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)>
+        class BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
       template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)>
         class BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
 
@@ -150,6 +152,8 @@ namespace boost
         typedef GroupCompare group_compare_type;
         typedef typename detail::slot_call_iterator_t<slot_invoker,
           typename connection_list_type::iterator, connection_body<group_key_type, slot_type, Mutex> > slot_call_iterator;
+        typedef detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
+          <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type;
 
         BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const combiner_type &combiner_arg,
           const group_compare_type &group_compare):
@@ -219,7 +223,7 @@ namespace boost
         void disconnect(const T &slot)
         {
           typedef mpl::bool_<(is_convertible<T, group_type>::value)> is_group;
-          do_disconnect(slot, is_group());
+          do_disconnect(unwrap_ref(slot), is_group());
         }
         // emit signal
         result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS))
@@ -531,13 +535,20 @@ namespace boost
             {
               (*it)->nolock_disconnect(lock);
             }else
-            {
-              // check for wrapped extended slot
+            { // check for wrapped extended slot
               bound_extended_slot_function_type *fp;
               fp = (*it)->slot().slot_function().template target<bound_extended_slot_function_type>();
-              if(fp && function_equal(*fp, slot))
+              if(fp && fp->contains(slot))
               {
                 (*it)->nolock_disconnect(lock);
+              }else
+              { // check for wrapped signal
+                weak_signal_type *fp;
+                fp = (*it)->slot().slot_function().template target<weak_signal_type>();
+                if(fp && fp->contains(slot))
+                {
+                  (*it)->nolock_disconnect(lock);
+                }
               }
             }
           }
@@ -588,8 +599,6 @@ namespace boost
         const boost::shared_ptr<mutex_type> _mutex;
       };
 
-      template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)>
-        class BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
     }
 
     template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DEFAULTED_DECL(BOOST_SIGNALS2_NUM_ARGS)>
@@ -603,8 +612,7 @@ namespace boost
       typedef detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
         <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> impl_class;
     public:
-      typedef detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
-        <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type;
+      typedef typename impl_class::weak_signal_type weak_signal_type;
       friend class detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
         <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION>;
 
@@ -706,15 +714,18 @@ namespace boost
       }
       void disconnect_all_slots()
       {
+        if (_pimpl.get() == 0) return;
         (*_pimpl).disconnect_all_slots();
       }
       void disconnect(const group_type &group)
       {
+        if (_pimpl.get() == 0) return;
         (*_pimpl).disconnect(group);
       }
       template <typename T>
       void disconnect(const T &slot)
       {
+        if (_pimpl.get() == 0) return;
         (*_pimpl).disconnect(slot);
       }
       result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS))
@@ -727,10 +738,12 @@ namespace boost
       }
       std::size_t num_slots() const
       {
+        if (_pimpl.get() == 0) return 0;
         return (*_pimpl).num_slots();
       }
       bool empty() const
       {
+        if (_pimpl.get() == 0) return true;
         return (*_pimpl).empty();
       }
       combiner_type combiner() const
@@ -746,12 +759,28 @@ namespace boost
         using std::swap;
         swap(_pimpl, other._pimpl);
       }
+      bool operator==(const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) & other) const
+      {
+        return _pimpl.get() == other._pimpl.get();
+      }
+      bool null() const
+      {
+        return _pimpl.get() == 0;
+      }
     protected:
       virtual shared_ptr<void> lock_pimpl() const
       {
         return _pimpl;
       }
     private:
+      // explicit private copy constructor to avoid compiler trying to do implicit conversions to signal
+      explicit BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(
+        const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) & other) BOOST_NOEXCEPT
+      {
+          // noncopyable
+          BOOST_ASSERT(false);
+      }
+
       shared_ptr<impl_class>
         _pimpl;
     };
@@ -802,6 +831,16 @@ namespace boost
             shared_pimpl(_weak_pimpl.lock());
           return (*shared_pimpl)(BOOST_SIGNALS2_SIGNATURE_ARG_NAMES(BOOST_SIGNALS2_NUM_ARGS));
         }
+        bool contains(const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
+          <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> &signal) const
+        {
+          return _weak_pimpl.lock().get() == signal._pimpl.get(); 
+        }
+        template <typename T>
+        bool contains(const T&) const
+        {
+          return false;
+        }
       private:
         boost::weak_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
           <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > _weak_pimpl;
diff --git a/inst/include/boost/signals2/detail/slot_call_iterator.hpp b/inst/include/boost/signals2/detail/slot_call_iterator.hpp
index 02c8f9b32..f5f3d39c5 100644
--- a/inst/include/boost/signals2/detail/slot_call_iterator.hpp
+++ b/inst/include/boost/signals2/detail/slot_call_iterator.hpp
@@ -77,13 +77,11 @@ namespace boost {
       class slot_call_iterator_t
         : public boost::iterator_facade<slot_call_iterator_t<Function, Iterator, ConnectionBody>,
         typename Function::result_type,
-        boost::single_pass_traversal_tag,
-        typename boost::add_reference<typename boost::add_const<typename Function::result_type>::type>::type >
+        boost::single_pass_traversal_tag>
       {
         typedef boost::iterator_facade<slot_call_iterator_t<Function, Iterator, ConnectionBody>,
           typename Function::result_type,
-          boost::single_pass_traversal_tag,
-          typename boost::add_reference<typename boost::add_const<typename Function::result_type>::type>::type >
+          boost::single_pass_traversal_tag>
         inherited;
 
         typedef typename Function::result_type result_type;
@@ -107,7 +105,7 @@ namespace boost {
           if (!cache->result) {
             BOOST_TRY
             {
-              cache->result.reset(cache->f(*iter));
+              cache->result = cache->f(*iter);
             }
             BOOST_CATCH(expired_slot &)
             {
diff --git a/inst/include/boost/signals2/last_value.hpp b/inst/include/boost/signals2/last_value.hpp
index 1dd0712ea..2e89eaf77 100644
--- a/inst/include/boost/signals2/last_value.hpp
+++ b/inst/include/boost/signals2/last_value.hpp
@@ -12,6 +12,7 @@
 #define BOOST_SIGNALS2_LAST_VALUE_HPP
 
 #include <boost/core/no_exceptions_support.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2/expired_slot.hpp>
 #include <boost/throw_exception.hpp>
@@ -45,7 +46,7 @@ namespace boost {
         {
           BOOST_TRY
           {
-            value = *first;
+            value = boost::move_if_not_lvalue_reference<T>(*first);
           }
           BOOST_CATCH(const expired_slot &) {}
           BOOST_CATCH_END
diff --git a/inst/include/boost/signals2/optional_last_value.hpp b/inst/include/boost/signals2/optional_last_value.hpp
index 812d152c7..26f121d27 100644
--- a/inst/include/boost/signals2/optional_last_value.hpp
+++ b/inst/include/boost/signals2/optional_last_value.hpp
@@ -12,6 +12,7 @@
 #define BOOST_SIGNALS2_OPTIONAL_LAST_VALUE_HPP
 
 #include <boost/core/no_exceptions_support.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2/expired_slot.hpp>
 
@@ -32,7 +33,7 @@ namespace boost {
         {
           BOOST_TRY
           {
-            value = *first;
+            value = boost::move_if_not_lvalue_reference<T>(*first);
           }
           BOOST_CATCH(const expired_slot &) {}
           BOOST_CATCH_END
diff --git a/inst/include/boost/smart_ptr/allocate_local_shared_array.hpp b/inst/include/boost/smart_ptr/allocate_local_shared_array.hpp
index 72ecfcf8a..64761135f 100644
--- a/inst/include/boost/smart_ptr/allocate_local_shared_array.hpp
+++ b/inst/include/boost/smart_ptr/allocate_local_shared_array.hpp
@@ -8,9 +8,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_ALLOCATE_LOCAL_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_ALLOCATE_LOCAL_SHARED_ARRAY_HPP
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/allocate_shared_array.hpp>
 #include <boost/smart_ptr/local_shared_ptr.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
+#include <type_traits>
 
 namespace boost {
 namespace detail {
@@ -18,16 +19,16 @@ namespace detail {
 class BOOST_SYMBOL_VISIBLE lsp_array_base
     : public local_counted_base {
 public:
-    void set(sp_counted_base* base) BOOST_SP_NOEXCEPT {
+    void set(sp_counted_base* base) noexcept {
         count_ = shared_count(base);
     }
 
-    void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+    void local_cb_destroy() noexcept override {
         shared_count().swap(count_);
     }
 
     shared_count local_cb_get_shared_count() const
-        BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+        noexcept override {
         return count_;
     }
 
@@ -40,10 +41,10 @@ class lsp_array_state
     : public sp_array_state<A> {
 public:
     template<class U>
-    lsp_array_state(const U& other, std::size_t size) BOOST_SP_NOEXCEPT
+    lsp_array_state(const U& other, std::size_t size) noexcept
         : sp_array_state<A>(other, size) { }
 
-    lsp_array_base& base() BOOST_SP_NOEXCEPT {
+    lsp_array_base& base() noexcept {
         return base_;
     }
 
@@ -56,10 +57,10 @@ class lsp_size_array_state
     : public sp_size_array_state<A, N> {
 public:
     template<class U>
-    lsp_size_array_state(const U& other, std::size_t size) BOOST_SP_NOEXCEPT
+    lsp_size_array_state(const U& other, std::size_t size) noexcept
         : sp_size_array_state<A, N>(other, size) { }
 
-    lsp_array_base& base() BOOST_SP_NOEXCEPT {
+    lsp_array_base& base() noexcept {
         return base_;
     }
 
@@ -70,7 +71,7 @@ class lsp_size_array_state
 } /* detail */
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     local_shared_ptr<T> >::type
 allocate_local_shared(const A& allocator, std::size_t count)
 {
@@ -90,12 +91,12 @@ allocate_local_shared(const A& allocator, std::size_t count)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     local_shared_ptr<T> >::type
 allocate_local_shared(const A& allocator)
 {
     enum {
-        count = extent<T>::value
+        count = std::extent<T>::value
     };
     typedef typename detail::sp_array_element<T>::type element;
     typedef typename allocator_rebind<A, element>::type other;
@@ -113,10 +114,10 @@ allocate_local_shared(const A& allocator)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     local_shared_ptr<T> >::type
 allocate_local_shared(const A& allocator, std::size_t count,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
     typedef typename detail::sp_array_element<T>::type element;
     typedef typename allocator_rebind<A, element>::type other;
@@ -134,13 +135,13 @@ allocate_local_shared(const A& allocator, std::size_t count,
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     local_shared_ptr<T> >::type
 allocate_local_shared(const A& allocator,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
     enum {
-        count = extent<T>::value
+        count = std::extent<T>::value
     };
     typedef typename detail::sp_array_element<T>::type element;
     typedef typename allocator_rebind<A, element>::type other;
@@ -158,7 +159,7 @@ allocate_local_shared(const A& allocator,
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     local_shared_ptr<T> >::type
 allocate_local_shared_noinit(const A& allocator, std::size_t count)
 {
@@ -167,7 +168,7 @@ allocate_local_shared_noinit(const A& allocator, std::size_t count)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     local_shared_ptr<T> >::type
 allocate_local_shared_noinit(const A& allocator)
 {
diff --git a/inst/include/boost/smart_ptr/allocate_shared_array.hpp b/inst/include/boost/smart_ptr/allocate_shared_array.hpp
index f07702bdb..59004bca5 100644
--- a/inst/include/boost/smart_ptr/allocate_shared_array.hpp
+++ b/inst/include/boost/smart_ptr/allocate_shared_array.hpp
@@ -8,27 +8,20 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/alloc_construct.hpp>
 #include <boost/core/first_scalar.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/type_traits/alignment_of.hpp>
-#include <boost/type_traits/enable_if.hpp>
-#include <boost/type_traits/extent.hpp>
-#include <boost/type_traits/is_bounded_array.hpp>
-#include <boost/type_traits/is_unbounded_array.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_extent.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
+#include <type_traits>
 
 namespace boost {
 namespace detail {
 
 template<class T>
 struct sp_array_element {
-    typedef typename boost::remove_cv<typename
-        boost::remove_extent<T>::type>::type type;
+    typedef typename std::remove_cv<typename
+        std::remove_extent<T>::type>::type type;
 };
 
 template<class T>
@@ -60,8 +53,8 @@ struct sp_align_up {
 };
 
 template<class T>
-BOOST_CONSTEXPR inline std::size_t
-sp_objects(std::size_t size) BOOST_SP_NOEXCEPT
+constexpr inline std::size_t
+sp_objects(std::size_t size) noexcept
 {
     return (size + sizeof(T) - 1) / sizeof(T);
 }
@@ -72,15 +65,15 @@ class sp_array_state {
     typedef A type;
 
     template<class U>
-    sp_array_state(const U& _allocator, std::size_t _size) BOOST_SP_NOEXCEPT
+    sp_array_state(const U& _allocator, std::size_t _size) noexcept
         : allocator_(_allocator),
           size_(_size) { }
 
-    A& allocator() BOOST_SP_NOEXCEPT {
+    A& allocator() noexcept {
         return allocator_;
     }
 
-    std::size_t size() const BOOST_SP_NOEXCEPT {
+    std::size_t size() const noexcept {
         return size_;
     }
 
@@ -95,14 +88,14 @@ class sp_size_array_state {
     typedef A type;
 
     template<class U>
-    sp_size_array_state(const U& _allocator, std::size_t) BOOST_SP_NOEXCEPT
+    sp_size_array_state(const U& _allocator, std::size_t) noexcept
         : allocator_(_allocator) { }
 
-    A& allocator() BOOST_SP_NOEXCEPT {
+    A& allocator() noexcept {
         return allocator_;
     }
 
-    BOOST_CONSTEXPR std::size_t size() const BOOST_SP_NOEXCEPT {
+    constexpr std::size_t size() const noexcept {
         return N;
     }
 
@@ -113,8 +106,8 @@ class sp_size_array_state {
 template<class T, class U>
 struct sp_array_alignment {
     enum {
-        value = sp_max_size<boost::alignment_of<T>::value,
-            boost::alignment_of<U>::value>::value
+        value = sp_max_size<std::alignment_of<T>::value,
+            std::alignment_of<U>::value>::value
     };
 };
 
@@ -127,7 +120,7 @@ struct sp_array_offset {
 
 template<class U, class T>
 inline U*
-sp_array_start(T* base) BOOST_SP_NOEXCEPT
+sp_array_start(T* base) noexcept
 {
     enum {
         size = sp_array_offset<T, U>::value
@@ -143,12 +136,12 @@ class sp_array_creator {
         offset = sp_array_offset<T, element>::value
     };
 
-    typedef typename boost::type_with_alignment<sp_array_alignment<T,
+    typedef typename sp_type_with_alignment<sp_array_alignment<T,
         element>::value>::type type;
 
 public:
     template<class U>
-    sp_array_creator(const U& other, std::size_t size) BOOST_SP_NOEXCEPT
+    sp_array_creator(const U& other, std::size_t size) noexcept
         : other_(other),
           size_(sp_objects<type>(offset + sizeof(element) * size)) { }
 
@@ -192,33 +185,33 @@ class BOOST_SYMBOL_VISIBLE sp_array_base
             boost::first_scalar(&list), count);
     }
 
-    T& state() BOOST_SP_NOEXCEPT {
+    T& state() noexcept {
         return state_;
     }
 
-    void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+    void dispose() noexcept override {
         boost::alloc_destroy_n(state_.allocator(),
             boost::first_scalar(sp_array_start<type>(this)),
             state_.size() * sp_array_count<type>::value);
     }
 
-    void destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+    void destroy() noexcept override {
         sp_array_creator<allocator, sp_array_base> other(state_.allocator(),
             state_.size());
         this->~sp_array_base();
         other.destroy(this);
     }
 
-    void* get_deleter(const sp_typeinfo_&) BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+    void* get_deleter(const sp_typeinfo_&) noexcept override {
         return 0;
     }
 
     void* get_local_deleter(const sp_typeinfo_&)
-        BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+        noexcept override {
         return 0;
     }
 
-    void* get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
+    void* get_untyped_deleter() noexcept override {
         return 0;
     }
 
@@ -240,11 +233,11 @@ struct sp_array_result {
         }
     }
 
-    T* get() const BOOST_SP_NOEXCEPT {
+    T* get() const noexcept {
         return result_;
     }
 
-    void release() BOOST_SP_NOEXCEPT {
+    void release() noexcept {
         result_ = 0;
     }
 
@@ -259,7 +252,7 @@ struct sp_array_result {
 } /* detail */
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value, shared_ptr<T> >::type
 allocate_shared(const A& allocator, std::size_t count)
 {
     typedef typename detail::sp_array_element<T>::type element;
@@ -276,15 +269,15 @@ allocate_shared(const A& allocator, std::size_t count)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value, shared_ptr<T> >::type
 allocate_shared(const A& allocator)
 {
     enum {
-        count = extent<T>::value
+        count = std::extent<T>::value
     };
     typedef typename detail::sp_array_element<T>::type element;
     typedef typename allocator_rebind<A, element>::type other;
-    typedef detail::sp_size_array_state<other, extent<T>::value> state;
+    typedef detail::sp_size_array_state<other, std::extent<T>::value> state;
     typedef detail::sp_array_base<state> base;
     detail::sp_array_result<other, base> result(allocator, count);
     base* node = result.get();
@@ -296,9 +289,9 @@ allocate_shared(const A& allocator)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value, shared_ptr<T> >::type
 allocate_shared(const A& allocator, std::size_t count,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
     typedef typename detail::sp_array_element<T>::type element;
     typedef typename allocator_rebind<A, element>::type other;
@@ -314,16 +307,16 @@ allocate_shared(const A& allocator, std::size_t count,
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value, shared_ptr<T> >::type
 allocate_shared(const A& allocator,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
     enum {
-        count = extent<T>::value
+        count = std::extent<T>::value
     };
     typedef typename detail::sp_array_element<T>::type element;
     typedef typename allocator_rebind<A, element>::type other;
-    typedef detail::sp_size_array_state<other, extent<T>::value> state;
+    typedef detail::sp_size_array_state<other, std::extent<T>::value> state;
     typedef detail::sp_array_base<state> base;
     detail::sp_array_result<other, base> result(allocator, count);
     base* node = result.get();
@@ -335,14 +328,14 @@ allocate_shared(const A& allocator,
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value, shared_ptr<T> >::type
 allocate_shared_noinit(const A& allocator, std::size_t count)
 {
     return boost::allocate_shared<T>(boost::noinit_adapt(allocator), count);
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value, shared_ptr<T> >::type
 allocate_shared_noinit(const A& allocator)
 {
     return boost::allocate_shared<T>(boost::noinit_adapt(allocator));
diff --git a/inst/include/boost/smart_ptr/allocate_unique.hpp b/inst/include/boost/smart_ptr/allocate_unique.hpp
index 412b34423..969d54710 100644
--- a/inst/include/boost/smart_ptr/allocate_unique.hpp
+++ b/inst/include/boost/smart_ptr/allocate_unique.hpp
@@ -8,43 +8,35 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_ALLOCATE_UNIQUE_HPP
 #define BOOST_SMART_PTR_ALLOCATE_UNIQUE_HPP
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/alloc_construct.hpp>
 #include <boost/core/empty_value.hpp>
 #include <boost/core/first_scalar.hpp>
 #include <boost/core/noinit_adaptor.hpp>
 #include <boost/core/pointer_traits.hpp>
-#include <boost/type_traits/enable_if.hpp>
-#include <boost/type_traits/extent.hpp>
-#include <boost/type_traits/is_array.hpp>
-#include <boost/type_traits/is_bounded_array.hpp>
-#include <boost/type_traits/is_unbounded_array.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_extent.hpp>
-#include <boost/type_traits/type_identity.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
 #include <boost/config.hpp>
 #include <memory>
 #include <utility>
+#include <cstddef>
+#include <type_traits>
 
 namespace boost {
 namespace detail {
 
 template<class T>
 struct sp_alloc_size {
-    BOOST_STATIC_CONSTEXPR std::size_t value = 1;
+    static constexpr std::size_t value = 1;
 };
 
 template<class T>
 struct sp_alloc_size<T[]> {
-    BOOST_STATIC_CONSTEXPR std::size_t value = sp_alloc_size<T>::value;
+    static constexpr std::size_t value = sp_alloc_size<T>::value;
 };
 
 template<class T, std::size_t N>
 struct sp_alloc_size<T[N]> {
-    BOOST_STATIC_CONSTEXPR std::size_t value = N * sp_alloc_size<T>::value;
+    static constexpr std::size_t value = N * sp_alloc_size<T>::value;
 };
 
 template<class T>
@@ -59,8 +51,8 @@ struct sp_alloc_result<T[N]> {
 
 template<class T>
 struct sp_alloc_value {
-    typedef typename boost::remove_cv<typename
-        boost::remove_extent<T>::type>::type type;
+    typedef typename std::remove_cv<typename
+        std::remove_extent<T>::type>::type type;
 };
 
 template<class T, class P>
@@ -68,45 +60,41 @@ class sp_alloc_ptr {
 public:
     typedef T element_type;
 
-    sp_alloc_ptr() BOOST_SP_NOEXCEPT
+    sp_alloc_ptr() noexcept
         : p_() { }
 
 #if defined(BOOST_MSVC) && BOOST_MSVC == 1600
-    sp_alloc_ptr(T* p) BOOST_SP_NOEXCEPT
-        : p_(const_cast<typename boost::remove_cv<T>::type*>(p)) { }
+    sp_alloc_ptr(T* p) noexcept
+        : p_(const_cast<typename std::remove_cv<T>::type*>(p)) { }
 #endif
 
-    sp_alloc_ptr(std::size_t, P p) BOOST_SP_NOEXCEPT
+    sp_alloc_ptr(std::size_t, P p) noexcept
         : p_(p) { }
 
-#if !defined(BOOST_NO_CXX11_NULLPTR)
-    sp_alloc_ptr(detail::sp_nullptr_t) BOOST_SP_NOEXCEPT
+    sp_alloc_ptr(std::nullptr_t) noexcept
         : p_() { }
-#endif
 
     T& operator*() const {
         return *p_;
     }
 
-    T* operator->() const BOOST_SP_NOEXCEPT {
+    T* operator->() const noexcept {
         return boost::to_address(p_);
     }
 
-#if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
-    explicit operator bool() const BOOST_SP_NOEXCEPT {
+    explicit operator bool() const noexcept {
         return !!p_;
     }
-#endif
 
-    bool operator!() const BOOST_SP_NOEXCEPT {
+    bool operator!() const noexcept {
         return !p_;
     }
 
-    P ptr() const BOOST_SP_NOEXCEPT {
+    P ptr() const noexcept {
         return p_;
     }
 
-    BOOST_STATIC_CONSTEXPR std::size_t size() BOOST_SP_NOEXCEPT {
+    static constexpr std::size_t size() noexcept {
         return 1;
     }
 
@@ -114,7 +102,7 @@ class sp_alloc_ptr {
     static sp_alloc_ptr pointer_to(T& v) {
         return sp_alloc_ptr(1,
             std::pointer_traits<P>::pointer_to(const_cast<typename
-                boost::remove_cv<T>::type&>(v)));
+                std::remove_cv<T>::type&>(v)));
     }
 #endif
 
@@ -127,37 +115,33 @@ class sp_alloc_ptr<T[], P> {
 public:
     typedef T element_type;
 
-    sp_alloc_ptr() BOOST_SP_NOEXCEPT
+    sp_alloc_ptr() noexcept
         : p_() { }
 
-    sp_alloc_ptr(std::size_t n, P p) BOOST_SP_NOEXCEPT
+    sp_alloc_ptr(std::size_t n, P p) noexcept
         : p_(p)
         , n_(n) { }
 
-#if !defined(BOOST_NO_CXX11_NULLPTR)
-    sp_alloc_ptr(detail::sp_nullptr_t) BOOST_SP_NOEXCEPT
+    sp_alloc_ptr(std::nullptr_t) noexcept
         : p_() { }
-#endif
 
     T& operator[](std::size_t i) const {
         return p_[i];
     }
 
-#if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
-    explicit operator bool() const BOOST_SP_NOEXCEPT {
+    explicit operator bool() const noexcept {
         return !!p_;
     }
-#endif
 
-    bool operator!() const BOOST_SP_NOEXCEPT {
+    bool operator!() const noexcept {
         return !p_;
     }
 
-    P ptr() const BOOST_SP_NOEXCEPT {
+    P ptr() const noexcept {
         return p_;
     }
 
-    std::size_t size() const BOOST_SP_NOEXCEPT {
+    std::size_t size() const noexcept {
         return n_;
     }
 
@@ -165,7 +149,7 @@ class sp_alloc_ptr<T[], P> {
     static sp_alloc_ptr pointer_to(T& v) {
         return sp_alloc_ptr(n_,
             std::pointer_traits<P>::pointer_to(const_cast<typename
-                boost::remove_cv<T>::type&>(v)));
+                std::remove_cv<T>::type&>(v)));
     }
 #endif
 
@@ -179,36 +163,32 @@ class sp_alloc_ptr<T[N], P> {
 public:
     typedef T element_type;
 
-    sp_alloc_ptr() BOOST_SP_NOEXCEPT
+    sp_alloc_ptr() noexcept
         : p_() { }
 
-    sp_alloc_ptr(std::size_t, P p) BOOST_SP_NOEXCEPT
+    sp_alloc_ptr(std::size_t, P p) noexcept
         : p_(p) { }
 
-#if !defined(BOOST_NO_CXX11_NULLPTR)
-    sp_alloc_ptr(detail::sp_nullptr_t) BOOST_SP_NOEXCEPT
+    sp_alloc_ptr(std::nullptr_t) noexcept
         : p_() { }
-#endif
 
     T& operator[](std::size_t i) const {
         return p_[i];
     }
 
-#if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
-    explicit operator bool() const BOOST_SP_NOEXCEPT {
+    explicit operator bool() const noexcept {
         return !!p_;
     }
-#endif
 
-    bool operator!() const BOOST_SP_NOEXCEPT {
+    bool operator!() const noexcept {
         return !p_;
     }
 
-    P ptr() const BOOST_SP_NOEXCEPT {
+    P ptr() const noexcept {
         return p_;
     }
 
-    BOOST_STATIC_CONSTEXPR std::size_t size() BOOST_SP_NOEXCEPT {
+    static constexpr std::size_t size() noexcept {
         return N;
     }
 
@@ -216,7 +196,7 @@ class sp_alloc_ptr<T[N], P> {
     static sp_alloc_ptr pointer_to(T& v) {
         return sp_alloc_ptr(N,
             std::pointer_traits<P>::pointer_to(const_cast<typename
-                boost::remove_cv<T>::type&>(v)));
+                std::remove_cv<T>::type&>(v)));
     }
 #endif
 
@@ -238,19 +218,18 @@ operator!=(const sp_alloc_ptr<T, P>& lhs, const sp_alloc_ptr<T, P>& rhs)
     return !(lhs == rhs);
 }
 
-#if !defined(BOOST_NO_CXX11_NULLPTR)
 template<class T, class P>
 inline bool
 operator==(const sp_alloc_ptr<T, P>& lhs,
-    detail::sp_nullptr_t) BOOST_SP_NOEXCEPT
+    std::nullptr_t) noexcept
 {
     return !lhs.ptr();
 }
 
 template<class T, class P>
 inline bool
-operator==(detail::sp_nullptr_t,
-    const sp_alloc_ptr<T, P>& rhs) BOOST_SP_NOEXCEPT
+operator==(std::nullptr_t,
+    const sp_alloc_ptr<T, P>& rhs) noexcept
 {
     return !rhs.ptr();
 }
@@ -258,24 +237,23 @@ operator==(detail::sp_nullptr_t,
 template<class T, class P>
 inline bool
 operator!=(const sp_alloc_ptr<T, P>& lhs,
-    detail::sp_nullptr_t) BOOST_SP_NOEXCEPT
+    std::nullptr_t) noexcept
 {
     return !!lhs.ptr();
 }
 
 template<class T, class P>
 inline bool
-operator!=(detail::sp_nullptr_t,
-    const sp_alloc_ptr<T, P>& rhs) BOOST_SP_NOEXCEPT
+operator!=(std::nullptr_t,
+    const sp_alloc_ptr<T, P>& rhs) noexcept
 {
     return !!rhs.ptr();
 }
-#endif
 
 template<class A>
 inline void
 sp_alloc_clear(A& a, typename boost::allocator_pointer<A>::type p, std::size_t,
-    boost::false_type)
+    std::false_type)
 {
     boost::alloc_destroy(a, boost::to_address(p));
 }
@@ -283,7 +261,7 @@ sp_alloc_clear(A& a, typename boost::allocator_pointer<A>::type p, std::size_t,
 template<class A>
 inline void
 sp_alloc_clear(A& a, typename boost::allocator_pointer<A>::type p,
-    std::size_t n, boost::true_type)
+    std::size_t n, std::true_type)
 {
 #if defined(BOOST_MSVC) && BOOST_MSVC < 1800
     if (!p) {
@@ -308,19 +286,17 @@ class alloc_deleter
     typedef detail::sp_alloc_ptr<T,
         typename allocator_pointer<allocator>::type> pointer;
 
-    explicit alloc_deleter(const allocator& a) BOOST_SP_NOEXCEPT
+    explicit alloc_deleter(const allocator& a) noexcept
         : base(empty_init_t(), a) { }
 
     void operator()(pointer p) {
-        detail::sp_alloc_clear(base::get(), p.ptr(), p.size(), is_array<T>());
+        detail::sp_alloc_clear(base::get(), p.ptr(), p.size(), std::is_array<T>());
         base::get().deallocate(p.ptr(), p.size());
     }
 };
 
-#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
 template<class T, class A>
 using alloc_noinit_deleter = alloc_deleter<T, noinit_adaptor<A> >;
-#endif
 
 namespace detail {
 
@@ -347,15 +323,15 @@ class sp_alloc_make {
         }
     }
 
-    typename allocator::value_type* get() const BOOST_SP_NOEXCEPT {
+    typename allocator::value_type* get() const noexcept {
         return boost::to_address(p_);
     }
 
-    allocator& state() BOOST_SP_NOEXCEPT {
+    allocator& state() noexcept {
         return a_;
     }
 
-    type release() BOOST_SP_NOEXCEPT {
+    type release() noexcept {
         pointer p = p_;
         p_ = pointer();
         return type(typename deleter::pointer(n_, p), deleter(a_));
@@ -372,7 +348,7 @@ class sp_alloc_make {
 } /* detail */
 
 template<class T, class A>
-inline typename enable_if_<!is_array<T>::value,
+inline typename std::enable_if<!std::is_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, A> > >::type
 allocate_unique(const A& alloc)
 {
@@ -381,9 +357,8 @@ allocate_unique(const A& alloc)
     return c.release();
 }
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 template<class T, class A, class... Args>
-inline typename enable_if_<!is_array<T>::value,
+inline typename std::enable_if<!std::is_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, A> > >::type
 allocate_unique(const A& alloc, Args&&... args)
 {
@@ -391,12 +366,11 @@ allocate_unique(const A& alloc, Args&&... args)
     boost::alloc_construct(c.state(), c.get(), std::forward<Args>(args)...);
     return c.release();
 }
-#endif
 
 template<class T, class A>
-inline typename enable_if_<!is_array<T>::value,
+inline typename std::enable_if<!std::is_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, A> > >::type
-allocate_unique(const A& alloc, typename type_identity<T>::type&& value)
+allocate_unique(const A& alloc, typename detail::sp_type_identity<T>::type&& value)
 {
     detail::sp_alloc_make<T, A> c(alloc, 1);
     boost::alloc_construct(c.state(), c.get(), std::move(value));
@@ -404,7 +378,7 @@ allocate_unique(const A& alloc, typename type_identity<T>::type&& value)
 }
 
 template<class T, class A>
-inline typename enable_if_<!is_array<T>::value,
+inline typename std::enable_if<!std::is_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, noinit_adaptor<A> > > >::type
 allocate_unique_noinit(const A& alloc)
 {
@@ -412,7 +386,7 @@ allocate_unique_noinit(const A& alloc)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, A> > >::type
 allocate_unique(const A& alloc, std::size_t size)
 {
@@ -423,19 +397,19 @@ allocate_unique(const A& alloc, std::size_t size)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     std::unique_ptr<typename detail::sp_alloc_result<T>::type,
         alloc_deleter<T, A> > >::type
 allocate_unique(const A& alloc)
 {
-    detail::sp_alloc_make<T, A> c(alloc, extent<T>::value);
+    detail::sp_alloc_make<T, A> c(alloc, std::extent<T>::value);
     boost::alloc_construct_n(c.state(), boost::first_scalar(c.get()),
         detail::sp_alloc_size<T>::value);
     return c.release();
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, noinit_adaptor<A> > > >::type
 allocate_unique_noinit(const A& alloc, std::size_t size)
 {
@@ -443,7 +417,7 @@ allocate_unique_noinit(const A& alloc, std::size_t size)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     std::unique_ptr<typename detail::sp_alloc_result<T>::type,
         alloc_deleter<T, noinit_adaptor<A> > > >::type
 allocate_unique_noinit(const A& alloc)
@@ -452,29 +426,29 @@ allocate_unique_noinit(const A& alloc)
 }
 
 template<class T, class A>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     std::unique_ptr<T, alloc_deleter<T, A> > >::type
 allocate_unique(const A& alloc, std::size_t size,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
     detail::sp_alloc_make<T, A> c(alloc, size);
     boost::alloc_construct_n(c.state(), boost::first_scalar(c.get()),
         size * detail::sp_alloc_size<T>::value, boost::first_scalar(&value),
-        detail::sp_alloc_size<typename remove_extent<T>::type>::value);
+        detail::sp_alloc_size<typename std::remove_extent<T>::type>::value);
     return c.release();
 }
 
 template<class T, class A>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     std::unique_ptr<typename detail::sp_alloc_result<T>::type,
         alloc_deleter<T, A> > >::type
 allocate_unique(const A& alloc,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
-    detail::sp_alloc_make<T, A> c(alloc, extent<T>::value);
+    detail::sp_alloc_make<T, A> c(alloc, std::extent<T>::value);
     boost::alloc_construct_n(c.state(), boost::first_scalar(c.get()),
         detail::sp_alloc_size<T>::value, boost::first_scalar(&value),
-        detail::sp_alloc_size<typename remove_extent<T>::type>::value);
+        detail::sp_alloc_size<typename std::remove_extent<T>::type>::value);
     return c.release();
 }
 
@@ -482,7 +456,7 @@ template<class T, class U, class A>
 inline typename allocator_pointer<typename allocator_rebind<A,
     typename detail::sp_alloc_value<T>::type>::type>::type
 get_allocator_pointer(const std::unique_ptr<T,
-    alloc_deleter<U, A> >& p) BOOST_NOEXCEPT
+    alloc_deleter<U, A> >& p) noexcept
 {
     return p.get().ptr();
 }
diff --git a/inst/include/boost/smart_ptr/atomic_shared_ptr.hpp b/inst/include/boost/smart_ptr/atomic_shared_ptr.hpp
index d855e5a87..2be0b64cc 100644
--- a/inst/include/boost/smart_ptr/atomic_shared_ptr.hpp
+++ b/inst/include/boost/smart_ptr/atomic_shared_ptr.hpp
@@ -13,7 +13,6 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/smart_ptr/detail/spinlock.hpp>
 #include <cstring>
@@ -34,7 +33,7 @@ template<class T> class atomic_shared_ptr
 
 private:
 
-    bool compare_exchange( shared_ptr<T>& v, shared_ptr<T> w ) BOOST_SP_NOEXCEPT
+    bool compare_exchange( shared_ptr<T>& v, shared_ptr<T> w ) noexcept
     {
         l_.lock();
 
@@ -58,39 +57,16 @@ template<class T> class atomic_shared_ptr
 
 public:
 
-#if !defined( BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX ) && !defined( BOOST_NO_CXX11_CONSTEXPR )
-
-    constexpr atomic_shared_ptr() BOOST_SP_NOEXCEPT: l_ BOOST_DETAIL_SPINLOCK_INIT
+    constexpr atomic_shared_ptr() noexcept: l_ BOOST_DETAIL_SPINLOCK_INIT
     {
     }
 
-    atomic_shared_ptr( shared_ptr<T> p ) BOOST_SP_NOEXCEPT
+    atomic_shared_ptr( shared_ptr<T> p ) noexcept
         : p_( std::move( p ) ), l_ BOOST_DETAIL_SPINLOCK_INIT
     {
     }
 
-#else
-
-    atomic_shared_ptr() BOOST_SP_NOEXCEPT
-    {
-        boost::detail::spinlock init = BOOST_DETAIL_SPINLOCK_INIT;
-        std::memcpy( &l_, &init, sizeof( init ) );
-    }
-
-    atomic_shared_ptr( shared_ptr<T> p ) BOOST_SP_NOEXCEPT
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-        : p_( std::move( p ) )
-#else
-        : p_( p )
-#endif
-    {
-        boost::detail::spinlock init = BOOST_DETAIL_SPINLOCK_INIT;
-        std::memcpy( &l_, &init, sizeof( init ) );
-    }
-
-#endif
-
-    atomic_shared_ptr& operator=( shared_ptr<T> r ) BOOST_SP_NOEXCEPT
+    atomic_shared_ptr& operator=( shared_ptr<T> r ) noexcept
     {
         boost::detail::spinlock::scoped_lock lock( l_ );
         p_.swap( r );
@@ -98,140 +74,120 @@ template<class T> class atomic_shared_ptr
         return *this;
     }
 
-    BOOST_CONSTEXPR bool is_lock_free() const BOOST_SP_NOEXCEPT
+    constexpr bool is_lock_free() const noexcept
     {
         return false;
     }
 
-    shared_ptr<T> load() const BOOST_SP_NOEXCEPT
+    shared_ptr<T> load() const noexcept
     {
         boost::detail::spinlock::scoped_lock lock( l_ );
         return p_;
     }
 
-    template<class M> shared_ptr<T> load( M ) const BOOST_SP_NOEXCEPT
+    template<class M> shared_ptr<T> load( M ) const noexcept
     {
         boost::detail::spinlock::scoped_lock lock( l_ );
         return p_;
     }
 
-    operator shared_ptr<T>() const BOOST_SP_NOEXCEPT
+    operator shared_ptr<T>() const noexcept
     {
         boost::detail::spinlock::scoped_lock lock( l_ );
         return p_;
     }
 
-    void store( shared_ptr<T> r ) BOOST_SP_NOEXCEPT
+    void store( shared_ptr<T> r ) noexcept
     {
         boost::detail::spinlock::scoped_lock lock( l_ );
         p_.swap( r );
     }
 
-    template<class M> void store( shared_ptr<T> r, M ) BOOST_SP_NOEXCEPT
+    template<class M> void store( shared_ptr<T> r, M ) noexcept
     {
         boost::detail::spinlock::scoped_lock lock( l_ );
         p_.swap( r );
     }
 
-    shared_ptr<T> exchange( shared_ptr<T> r ) BOOST_SP_NOEXCEPT
+    shared_ptr<T> exchange( shared_ptr<T> r ) noexcept
     {
         {
             boost::detail::spinlock::scoped_lock lock( l_ );
             p_.swap( r );
         }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
         return std::move( r );
-
-#else
-
-        return r;
-
-#endif
     }
 
-    template<class M> shared_ptr<T> exchange( shared_ptr<T> r, M ) BOOST_SP_NOEXCEPT
+    template<class M> shared_ptr<T> exchange( shared_ptr<T> r, M ) noexcept
     {
         {
             boost::detail::spinlock::scoped_lock lock( l_ );
             p_.swap( r );
         }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
         return std::move( r );
-
-#else
-
-        return r;
-
-#endif
     }
 
-    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, const shared_ptr<T>& w, M, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, const shared_ptr<T>& w, M, M ) noexcept
     {
         return compare_exchange( v, w );
     }
 
-    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, const shared_ptr<T>& w, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, const shared_ptr<T>& w, M ) noexcept
     {
         return compare_exchange( v, w );
     }
 
-    bool compare_exchange_weak( shared_ptr<T>& v, const shared_ptr<T>& w ) BOOST_SP_NOEXCEPT
+    bool compare_exchange_weak( shared_ptr<T>& v, const shared_ptr<T>& w ) noexcept
     {
         return compare_exchange( v, w );
     }
 
-    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, const shared_ptr<T>& w, M, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, const shared_ptr<T>& w, M, M ) noexcept
     {
         return compare_exchange( v, w );
     }
 
-    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, const shared_ptr<T>& w, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, const shared_ptr<T>& w, M ) noexcept
     {
         return compare_exchange( v, w );
     }
 
-    bool compare_exchange_strong( shared_ptr<T>& v, const shared_ptr<T>& w ) BOOST_SP_NOEXCEPT
+    bool compare_exchange_strong( shared_ptr<T>& v, const shared_ptr<T>& w ) noexcept
     {
         return compare_exchange( v, w );
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, shared_ptr<T>&& w, M, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, shared_ptr<T>&& w, M, M ) noexcept
     {
         return compare_exchange( v, std::move( w ) );
     }
 
-    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, shared_ptr<T>&& w, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_weak( shared_ptr<T>& v, shared_ptr<T>&& w, M ) noexcept
     {
         return compare_exchange( v, std::move( w ) );
     }
 
-    bool compare_exchange_weak( shared_ptr<T>& v, shared_ptr<T>&& w ) BOOST_SP_NOEXCEPT
+    bool compare_exchange_weak( shared_ptr<T>& v, shared_ptr<T>&& w ) noexcept
     {
         return compare_exchange( v, std::move( w ) );
     }
 
-    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, shared_ptr<T>&& w, M, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, shared_ptr<T>&& w, M, M ) noexcept
     {
         return compare_exchange( v, std::move( w ) );
     }
 
-    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, shared_ptr<T>&& w, M ) BOOST_SP_NOEXCEPT
+    template<class M> bool compare_exchange_strong( shared_ptr<T>& v, shared_ptr<T>&& w, M ) noexcept
     {
         return compare_exchange( v, std::move( w ) );
     }
 
-    bool compare_exchange_strong( shared_ptr<T>& v, shared_ptr<T>&& w ) BOOST_SP_NOEXCEPT
+    bool compare_exchange_strong( shared_ptr<T>& v, shared_ptr<T>&& w ) noexcept
     {
         return compare_exchange( v, std::move( w ) );
     }
-
-#endif
 };
 
 } // namespace boost
diff --git a/inst/include/boost/smart_ptr/bad_weak_ptr.hpp b/inst/include/boost/smart_ptr/bad_weak_ptr.hpp
index 38e6b0897..c50259ec6 100644
--- a/inst/include/boost/smart_ptr/bad_weak_ptr.hpp
+++ b/inst/include/boost/smart_ptr/bad_weak_ptr.hpp
@@ -20,23 +20,9 @@
 #include <boost/config.hpp>
 #include <exception>
 
-#ifdef BOOST_BORLANDC
-# pragma warn -8026     // Functions with excep. spec. are not expanded inline
-#endif
-
 namespace boost
 {
 
-// The standard library that comes with Borland C++ 5.5.1, 5.6.4
-// defines std::exception and its members as having C calling
-// convention (-pc). When the definition of bad_weak_ptr
-// is compiled with -ps, the compiler issues an error.
-// Hence, the temporary #pragma option -pc below.
-
-#if defined(BOOST_BORLANDC) && BOOST_BORLANDC <= 0x564
-# pragma option push -pc
-#endif
-
 #if defined(BOOST_CLANG)
 // Intel C++ on Mac defines __clang__ but doesn't support the pragma
 # pragma clang diagnostic push
@@ -47,7 +33,7 @@ class bad_weak_ptr: public std::exception
 {
 public:
 
-    char const * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
+    char const * what() const noexcept override
     {
         return "tr1::bad_weak_ptr";
     }
@@ -57,14 +43,6 @@ class bad_weak_ptr: public std::exception
 # pragma clang diagnostic pop
 #endif
 
-#if defined(BOOST_BORLANDC) && BOOST_BORLANDC <= 0x564
-# pragma option pop
-#endif
-
 } // namespace boost
 
-#ifdef BOOST_BORLANDC
-# pragma warn .8026     // Functions with excep. spec. are not expanded inline
-#endif
-
 #endif  // #ifndef BOOST_SMART_PTR_BAD_WEAK_PTR_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/atomic_count.hpp b/inst/include/boost/smart_ptr/detail/atomic_count.hpp
index 749b3f08a..0ed3cb328 100644
--- a/inst/include/boost/smart_ptr/detail/atomic_count.hpp
+++ b/inst/include/boost/smart_ptr/detail/atomic_count.hpp
@@ -45,6 +45,7 @@
 
 #include <boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp>
 #include <boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp>
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
 #include <boost/config.hpp>
 
 #if defined( BOOST_AC_DISABLE_THREADS )
diff --git a/inst/include/boost/smart_ptr/detail/deprecated_macros.hpp b/inst/include/boost/smart_ptr/detail/deprecated_macros.hpp
new file mode 100644
index 000000000..7f5786d8a
--- /dev/null
+++ b/inst/include/boost/smart_ptr/detail/deprecated_macros.hpp
@@ -0,0 +1,52 @@
+#ifndef BOOST_SMART_PTR_DETAIL_DEPRECATED_MACROS_HPP_INCLUDED
+#define BOOST_SMART_PTR_DETAIL_DEPRECATED_MACROS_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config/pragma_message.hpp>
+
+#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_ENABLE_DEBUG_HOOKS has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#if defined(BOOST_SP_USE_STD_ALLOCATOR)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_USE_STD_ALLOCATOR has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#if defined(BOOST_SP_USE_QUICK_ALLOCATOR)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_USE_QUICK_ALLOCATOR has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#if defined(BOOST_AC_USE_SPINLOCK)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_AC_USE_SPINLOCK has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#if defined(BOOST_AC_USE_PTHREADS)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_AC_USE_PTHREADS has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#if defined(BOOST_SP_USE_SPINLOCK)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_USE_SPINLOCK has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#if defined(BOOST_SP_USE_PTHREADS)
+
+BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_USE_PTHREADS has been deprecated in 1.87 and support for it will be removed.")
+
+#endif
+
+#endif // #ifndef BOOST_SMART_PTR_DETAIL_DEPRECATED_MACROS_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/lightweight_thread.hpp b/inst/include/boost/smart_ptr/detail/lightweight_thread.hpp
index 867f00b0b..e14efedef 100644
--- a/inst/include/boost/smart_ptr/detail/lightweight_thread.hpp
+++ b/inst/include/boost/smart_ptr/detail/lightweight_thread.hpp
@@ -106,16 +106,8 @@ class lw_abstract_thread
 
 extern "C" void * lw_thread_routine( void * pv )
 {
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
-    std::auto_ptr<lw_abstract_thread> pt( static_cast<lw_abstract_thread *>( pv ) );
-
-#else
-
     std::unique_ptr<lw_abstract_thread> pt( static_cast<lw_abstract_thread *>( pv ) );
 
-#endif
-
     pt->run();
 
     return 0;
@@ -125,16 +117,8 @@ extern "C" void * lw_thread_routine( void * pv )
 
 unsigned __stdcall lw_thread_routine( void * pv )
 {
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
-    std::auto_ptr<lw_abstract_thread> pt( static_cast<lw_abstract_thread *>( pv ) );
-
-#else
-
     std::unique_ptr<lw_abstract_thread> pt( static_cast<lw_abstract_thread *>( pv ) );
 
-#endif
-
     pt->run();
 
     return 0;
@@ -162,16 +146,8 @@ template<class F> class lw_thread_impl: public lw_abstract_thread
 
 template<class F> int lw_thread_create( lw_thread_t & th, F f )
 {
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
-    std::auto_ptr<lw_abstract_thread> p( new lw_thread_impl<F>( f ) );
-
-#else
-
     std::unique_ptr<lw_abstract_thread> p( new lw_thread_impl<F>( f ) );
 
-#endif
-
     int r = lw_thread_create_( &th, 0, lw_thread_routine, p.get() );
 
     if( r == 0 )
diff --git a/inst/include/boost/smart_ptr/detail/local_counted_base.hpp b/inst/include/boost/smart_ptr/detail/local_counted_base.hpp
index f73041984..ec644860b 100644
--- a/inst/include/boost/smart_ptr/detail/local_counted_base.hpp
+++ b/inst/include/boost/smart_ptr/detail/local_counted_base.hpp
@@ -42,23 +42,23 @@ class BOOST_SYMBOL_VISIBLE local_counted_base
 
 public:
 
-    BOOST_CONSTEXPR local_counted_base() BOOST_SP_NOEXCEPT: local_use_count_( initial_ )
+    constexpr local_counted_base() noexcept: local_use_count_( initial_ )
     {
     }
 
-    BOOST_CONSTEXPR local_counted_base( local_counted_base const & ) BOOST_SP_NOEXCEPT: local_use_count_( initial_ )
+    constexpr local_counted_base( local_counted_base const & ) noexcept: local_use_count_( initial_ )
     {
     }
 
-    virtual ~local_counted_base() /*BOOST_SP_NOEXCEPT*/
+    virtual ~local_counted_base() /*noexcept*/
     {
     }
 
-    virtual void local_cb_destroy() BOOST_SP_NOEXCEPT = 0;
+    virtual void local_cb_destroy() noexcept = 0;
 
-    virtual boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT = 0;
+    virtual boost::detail::shared_count local_cb_get_shared_count() const noexcept = 0;
 
-    void add_ref() BOOST_SP_NOEXCEPT
+    void add_ref() noexcept
     {
 #if !defined(__NVCC__)
 #if defined( __has_builtin )
@@ -73,7 +73,7 @@ class BOOST_SYMBOL_VISIBLE local_counted_base
         local_use_count_ = static_cast<count_type>( local_use_count_ + 1 );
     }
 
-    void release() BOOST_SP_NOEXCEPT
+    void release() noexcept
     {
         local_use_count_ = static_cast<count_type>( local_use_count_ - 1 );
 
@@ -83,7 +83,7 @@ class BOOST_SYMBOL_VISIBLE local_counted_base
         }
     }
 
-    long local_use_count() const BOOST_SP_NOEXCEPT
+    long local_use_count() const noexcept
     {
         return local_use_count_;
     }
@@ -101,24 +101,20 @@ class BOOST_SYMBOL_VISIBLE local_counted_impl: public local_counted_base
 
 public:
 
-    explicit local_counted_impl( shared_count const& pn ) BOOST_SP_NOEXCEPT: pn_( pn )
+    explicit local_counted_impl( shared_count const& pn ) noexcept: pn_( pn )
     {
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    explicit local_counted_impl( shared_count && pn ) BOOST_SP_NOEXCEPT: pn_( std::move(pn) )
+    explicit local_counted_impl( shared_count && pn ) noexcept: pn_( std::move(pn) )
     {
     }
 
-#endif
-
-    void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void local_cb_destroy() noexcept override
     {
         delete this;
     }
 
-    boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    boost::detail::shared_count local_cb_get_shared_count() const noexcept override
     {
         return pn_;
     }
@@ -130,12 +126,12 @@ class BOOST_SYMBOL_VISIBLE local_counted_impl_em: public local_counted_base
 
     shared_count pn_;
 
-    void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void local_cb_destroy() noexcept override
     {
         shared_count().swap( pn_ );
     }
 
-    boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    boost::detail::shared_count local_cb_get_shared_count() const noexcept override
     {
         return pn_;
     }
diff --git a/inst/include/boost/smart_ptr/detail/local_sp_deleter.hpp b/inst/include/boost/smart_ptr/detail/local_sp_deleter.hpp
index 9ede7e36c..af3743dff 100644
--- a/inst/include/boost/smart_ptr/detail/local_sp_deleter.hpp
+++ b/inst/include/boost/smart_ptr/detail/local_sp_deleter.hpp
@@ -38,48 +38,40 @@ template<class D> class local_sp_deleter: public local_counted_impl_em
     {
     }
 
-    explicit local_sp_deleter( D const& d ) BOOST_SP_NOEXCEPT: d_( d )
+    explicit local_sp_deleter( D const& d ) noexcept: d_( d )
     {
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    explicit local_sp_deleter( D&& d ) BOOST_SP_NOEXCEPT: d_( std::move(d) )
+    explicit local_sp_deleter( D&& d ) noexcept: d_( std::move(d) )
     {
     }
 
-#endif
-
-    D& deleter() BOOST_SP_NOEXCEPT
+    D& deleter() noexcept
     {
         return d_;
     }
 
-    template<class Y> void operator()( Y* p ) BOOST_SP_NOEXCEPT
+    template<class Y> void operator()( Y* p ) noexcept
     {
         d_( p );
     }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    void operator()( boost::detail::sp_nullptr_t p ) BOOST_SP_NOEXCEPT
+    void operator()( std::nullptr_t p ) noexcept
     {
         d_( p );
     }
-
-#endif
 };
 
 template<> class local_sp_deleter<void>
 {
 };
 
-template<class D> D * get_local_deleter( local_sp_deleter<D> * p ) BOOST_SP_NOEXCEPT
+template<class D> D * get_local_deleter( local_sp_deleter<D> * p ) noexcept
 {
     return &p->deleter();
 }
 
-inline void * get_local_deleter( local_sp_deleter<void> * /*p*/ ) BOOST_SP_NOEXCEPT
+inline void * get_local_deleter( local_sp_deleter<void> * /*p*/ ) noexcept
 {
     return 0;
 }
diff --git a/inst/include/boost/smart_ptr/detail/operator_bool.hpp b/inst/include/boost/smart_ptr/detail/operator_bool.hpp
deleted file mode 100644
index f9c5ef680..000000000
--- a/inst/include/boost/smart_ptr/detail/operator_bool.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//  This header intentionally has no include guards.
-//
-//  Copyright (c) 2001-2009, 2012 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-
-#if !defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) && !defined( BOOST_NO_CXX11_NULLPTR )\
-    && !(defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5130))
-
-    explicit operator bool () const BOOST_SP_NOEXCEPT
-    {
-        return px != 0;
-    }
-
-#elif ( defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, < 0x570) ) || defined(__CINT__)
-
-    operator bool () const BOOST_SP_NOEXCEPT
-    {
-        return px != 0;
-    }
-
-#elif defined( _MANAGED )
-
-    static void unspecified_bool( this_type*** )
-    {
-    }
-
-    typedef void (*unspecified_bool_type)( this_type*** );
-
-    operator unspecified_bool_type() const BOOST_SP_NOEXCEPT
-    {
-        return px == 0? 0: unspecified_bool;
-    }
-
-#elif \
-    ( defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, < 0x3200) ) || \
-    ( defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 304) ) || \
-    ( defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590) )
-
-    typedef element_type * (this_type::*unspecified_bool_type)() const;
-
-    operator unspecified_bool_type() const BOOST_SP_NOEXCEPT
-    {
-        return px == 0? 0: &this_type::get;
-    }
-
-#else
-
-    typedef element_type * this_type::*unspecified_bool_type;
-
-    operator unspecified_bool_type() const BOOST_SP_NOEXCEPT
-    {
-        return px == 0? 0: &this_type::px;
-    }
-
-#endif
-
-    // operator! is redundant, but some compilers need it
-    bool operator! () const BOOST_SP_NOEXCEPT
-    {
-        return px == 0;
-    }
diff --git a/inst/include/boost/smart_ptr/detail/quick_allocator.hpp b/inst/include/boost/smart_ptr/detail/quick_allocator.hpp
index 159bd5e7a..8ec6dfa30 100644
--- a/inst/include/boost/smart_ptr/detail/quick_allocator.hpp
+++ b/inst/include/boost/smart_ptr/detail/quick_allocator.hpp
@@ -21,21 +21,20 @@
 #include <boost/config.hpp>
 
 #include <boost/smart_ptr/detail/lightweight_mutex.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
-#include <boost/type_traits/alignment_of.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
 
+#include <type_traits>
 #include <new>              // ::operator new, ::operator delete
 #include <cstddef>          // std::size_t
 
 namespace boost
 {
-
 namespace detail
 {
 
 template<unsigned size, unsigned align_> union freeblock
 {
-    typedef typename boost::type_with_alignment<align_>::type aligner_type;
+    typedef typename sp_type_with_alignment<align_>::type aligner_type;
     aligner_type aligner;
     char bytes[size];
     freeblock * next;
@@ -74,7 +73,7 @@ template<unsigned size, unsigned align_> struct allocator_impl
 
     static lightweight_mutex & mutex()
     {
-        static freeblock< sizeof( lightweight_mutex ), boost::alignment_of< lightweight_mutex >::value > fbm;
+        static freeblock< sizeof( lightweight_mutex ), std::alignment_of< lightweight_mutex >::value > fbm;
         static lightweight_mutex * pm = new( &fbm ) lightweight_mutex;
         return *pm;
     }
@@ -188,7 +187,7 @@ template<unsigned size, unsigned align_>
   unsigned allocator_impl<size, align_>::last = allocator_impl<size, align_>::items_per_page;
 
 template<class T>
-struct quick_allocator: public allocator_impl< sizeof(T), boost::alignment_of<T>::value >
+struct quick_allocator: public allocator_impl< sizeof(T), std::alignment_of<T>::value >
 {
 };
 
diff --git a/inst/include/boost/smart_ptr/detail/shared_count.hpp b/inst/include/boost/smart_ptr/detail/shared_count.hpp
index 7623b2eeb..232ad8502 100644
--- a/inst/include/boost/smart_ptr/detail/shared_count.hpp
+++ b/inst/include/boost/smart_ptr/detail/shared_count.hpp
@@ -18,15 +18,11 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#if defined(__BORLANDC__) && !defined(__clang__)
-# pragma warn -8027     // Functions containing try are not expanded inline
-#endif
-
 #include <boost/smart_ptr/bad_weak_ptr.hpp>
 #include <boost/smart_ptr/detail/sp_counted_base.hpp>
 #include <boost/smart_ptr/detail/sp_counted_impl.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
 #include <boost/core/checked_delete.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/core/addressof.hpp>
@@ -100,7 +96,7 @@ template< class D > struct sp_convert_reference< D& >
     typedef sp_reference_wrapper< D > type;
 };
 
-template<class T> std::size_t sp_hash_pointer( T* p ) BOOST_NOEXCEPT
+template<class T> std::size_t sp_hash_pointer( T* p ) noexcept
 {
     boost::uintptr_t v = reinterpret_cast<boost::uintptr_t>( p );
 
@@ -124,14 +120,14 @@ class shared_count
 
 public:
 
-    BOOST_CONSTEXPR shared_count() BOOST_SP_NOEXCEPT: pi_(0)
+    constexpr shared_count() noexcept: pi_(0)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
     {
     }
 
-    BOOST_CONSTEXPR explicit shared_count( sp_counted_base * pi ) BOOST_SP_NOEXCEPT: pi_( pi )
+    constexpr explicit shared_count( sp_counted_base * pi ) noexcept: pi_( pi )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
@@ -168,18 +164,11 @@ class shared_count
 #endif
     }
 
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1200 )
-    template<class Y, class D> shared_count( Y * p, D d ): pi_(0)
-#else
     template<class P, class D> shared_count( P p, D d ): pi_(0)
-#endif
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
     {
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1200 )
-        typedef Y* P;
-#endif
 #ifndef BOOST_NO_EXCEPTIONS
 
         try
@@ -205,8 +194,6 @@ class shared_count
 #endif
     }
 
-#if !defined( BOOST_NO_FUNCTION_TEMPLATE_ORDERING )
-
     template< class P, class D > shared_count( P p, sp_inplace_tag<D> ): pi_( 0 )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
@@ -237,8 +224,6 @@ class shared_count
 #endif // #ifndef BOOST_NO_EXCEPTIONS
     }
 
-#endif // !defined( BOOST_NO_FUNCTION_TEMPLATE_ORDERING )
-
     template<class P, class D, class A> shared_count( P p, D d, A a ): pi_( 0 )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
@@ -246,16 +231,8 @@ class shared_count
     {
         typedef sp_counted_impl_pda<P, D, A> impl_type;
 
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
         typedef typename std::allocator_traits<A>::template rebind_alloc< impl_type > A2;
 
-#else
-
-        typedef typename A::template rebind< impl_type >::other A2;
-
-#endif
-
         A2 a2( a );
 
 #ifndef BOOST_NO_EXCEPTIONS
@@ -294,8 +271,6 @@ class shared_count
 #endif
     }
 
-#if !defined( BOOST_NO_FUNCTION_TEMPLATE_ORDERING )
-
     template< class P, class D, class A > shared_count( P p, sp_inplace_tag< D >, A a ): pi_( 0 )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
@@ -303,16 +278,8 @@ class shared_count
     {
         typedef sp_counted_impl_pda< P, D, A > impl_type;
 
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
         typedef typename std::allocator_traits<A>::template rebind_alloc< impl_type > A2;
 
-#else
-
-        typedef typename A::template rebind< impl_type >::other A2;
-
-#endif
-
         A2 a2( a );
 
 #ifndef BOOST_NO_EXCEPTIONS
@@ -351,8 +318,6 @@ class shared_count
 #endif // #ifndef BOOST_NO_EXCEPTIONS
     }
 
-#endif // !defined( BOOST_NO_FUNCTION_TEMPLATE_ORDERING )
-
 #ifndef BOOST_NO_AUTO_PTR
 
     // auto_ptr<Y> is special cased to provide the strong guarantee
@@ -377,8 +342,6 @@ class shared_count
 
 #endif 
 
-#if !defined( BOOST_NO_CXX11_SMART_PTR )
-
     template<class Y, class D>
     explicit shared_count( std::unique_ptr<Y, D> & r ): pi_( 0 )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -402,8 +365,6 @@ class shared_count
         r.release();
     }
 
-#endif
-
     template<class Y, class D>
     explicit shared_count( boost::movelib::unique_ptr<Y, D> & r ): pi_( 0 )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -427,7 +388,7 @@ class shared_count
         r.release();
     }
 
-    ~shared_count() /*BOOST_SP_NOEXCEPT*/
+    ~shared_count() /*noexcept*/
     {
         if( pi_ != 0 ) pi_->release();
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -435,7 +396,7 @@ class shared_count
 #endif
     }
 
-    shared_count(shared_count const & r) BOOST_SP_NOEXCEPT: pi_(r.pi_)
+    shared_count(shared_count const & r) noexcept: pi_(r.pi_)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
@@ -443,9 +404,7 @@ class shared_count
         if( pi_ != 0 ) pi_->add_ref_copy();
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    shared_count(shared_count && r) BOOST_SP_NOEXCEPT: pi_(r.pi_)
+    shared_count(shared_count && r) noexcept: pi_(r.pi_)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
@@ -453,12 +412,10 @@ class shared_count
         r.pi_ = 0;
     }
 
-#endif
-
     explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0
-    shared_count( weak_count const & r, sp_nothrow_tag ) BOOST_SP_NOEXCEPT; // constructs an empty *this when r.use_count() == 0
+    shared_count( weak_count const & r, sp_nothrow_tag ) noexcept; // constructs an empty *this when r.use_count() == 0
 
-    shared_count & operator= (shared_count const & r) BOOST_SP_NOEXCEPT
+    shared_count & operator= (shared_count const & r) noexcept
     {
         sp_counted_base * tmp = r.pi_;
 
@@ -472,58 +429,58 @@ class shared_count
         return *this;
     }
 
-    void swap(shared_count & r) BOOST_SP_NOEXCEPT
+    void swap(shared_count & r) noexcept
     {
         sp_counted_base * tmp = r.pi_;
         r.pi_ = pi_;
         pi_ = tmp;
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return pi_ != 0? pi_->use_count(): 0;
     }
 
-    bool unique() const BOOST_SP_NOEXCEPT
+    bool unique() const noexcept
     {
         return use_count() == 1;
     }
 
-    bool empty() const BOOST_SP_NOEXCEPT
+    bool empty() const noexcept
     {
         return pi_ == 0;
     }
 
-    bool operator==( shared_count const & r ) const BOOST_SP_NOEXCEPT
+    bool operator==( shared_count const & r ) const noexcept
     {
         return pi_ == r.pi_;
     }
 
-    bool operator==( weak_count const & r ) const BOOST_SP_NOEXCEPT;
+    bool operator==( weak_count const & r ) const noexcept;
 
-    bool operator<( shared_count const & r ) const BOOST_SP_NOEXCEPT
+    bool operator<( shared_count const & r ) const noexcept
     {
         return std::less<sp_counted_base *>()( pi_, r.pi_ );
     }
 
-    bool operator<( weak_count const & r ) const BOOST_SP_NOEXCEPT;
+    bool operator<( weak_count const & r ) const noexcept;
 
-    void * get_deleter( sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT
+    void * get_deleter( sp_typeinfo_ const & ti ) const noexcept
     {
         return pi_? pi_->get_deleter( ti ): 0;
     }
 
-    void * get_local_deleter( sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT
+    void * get_local_deleter( sp_typeinfo_ const & ti ) const noexcept
     {
         return pi_? pi_->get_local_deleter( ti ): 0;
     }
 
-    void * get_untyped_deleter() const BOOST_SP_NOEXCEPT
+    void * get_untyped_deleter() const noexcept
     {
         return pi_? pi_->get_untyped_deleter(): 0;
     }
 
-    std::size_t hash_value() const BOOST_SP_NOEXCEPT
+    std::size_t hash_value() const noexcept
     {
         return sp_hash_pointer( pi_ );
     }
@@ -544,14 +501,14 @@ class weak_count
 
 public:
 
-    BOOST_CONSTEXPR weak_count() BOOST_SP_NOEXCEPT: pi_(0)
+    constexpr weak_count() noexcept: pi_(0)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(weak_count_id)
 #endif
     {
     }
 
-    weak_count(shared_count const & r) BOOST_SP_NOEXCEPT: pi_(r.pi_)
+    weak_count(shared_count const & r) noexcept: pi_(r.pi_)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(weak_count_id)
 #endif
@@ -559,7 +516,7 @@ class weak_count
         if(pi_ != 0) pi_->weak_add_ref();
     }
 
-    weak_count(weak_count const & r) BOOST_SP_NOEXCEPT: pi_(r.pi_)
+    weak_count(weak_count const & r) noexcept: pi_(r.pi_)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(weak_count_id)
 #endif
@@ -569,9 +526,7 @@ class weak_count
 
 // Move support
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    weak_count(weak_count && r) BOOST_SP_NOEXCEPT: pi_(r.pi_)
+    weak_count(weak_count && r) noexcept: pi_(r.pi_)
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(weak_count_id)
 #endif
@@ -579,9 +534,7 @@ class weak_count
         r.pi_ = 0;
     }
 
-#endif
-
-    ~weak_count() /*BOOST_SP_NOEXCEPT*/
+    ~weak_count() /*noexcept*/
     {
         if(pi_ != 0) pi_->weak_release();
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -589,7 +542,7 @@ class weak_count
 #endif
     }
 
-    weak_count & operator= (shared_count const & r) BOOST_SP_NOEXCEPT
+    weak_count & operator= (shared_count const & r) noexcept
     {
         sp_counted_base * tmp = r.pi_;
 
@@ -603,7 +556,7 @@ class weak_count
         return *this;
     }
 
-    weak_count & operator= (weak_count const & r) BOOST_SP_NOEXCEPT
+    weak_count & operator= (weak_count const & r) noexcept
     {
         sp_counted_base * tmp = r.pi_;
 
@@ -617,44 +570,44 @@ class weak_count
         return *this;
     }
 
-    void swap(weak_count & r) BOOST_SP_NOEXCEPT
+    void swap(weak_count & r) noexcept
     {
         sp_counted_base * tmp = r.pi_;
         r.pi_ = pi_;
         pi_ = tmp;
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return pi_ != 0? pi_->use_count(): 0;
     }
 
-    bool empty() const BOOST_SP_NOEXCEPT
+    bool empty() const noexcept
     {
         return pi_ == 0;
     }
 
-    bool operator==( weak_count const & r ) const BOOST_SP_NOEXCEPT
+    bool operator==( weak_count const & r ) const noexcept
     {
         return pi_ == r.pi_;
     }
 
-    bool operator==( shared_count const & r ) const BOOST_SP_NOEXCEPT
+    bool operator==( shared_count const & r ) const noexcept
     {
         return pi_ == r.pi_;
     }
 
-    bool operator<( weak_count const & r ) const BOOST_SP_NOEXCEPT
+    bool operator<( weak_count const & r ) const noexcept
     {
         return std::less<sp_counted_base *>()( pi_, r.pi_ );
     }
 
-    bool operator<( shared_count const & r ) const BOOST_SP_NOEXCEPT
+    bool operator<( shared_count const & r ) const noexcept
     {
         return std::less<sp_counted_base *>()( pi_, r.pi_ );
     }
 
-    std::size_t hash_value() const BOOST_SP_NOEXCEPT
+    std::size_t hash_value() const noexcept
     {
         return sp_hash_pointer( pi_ );
     }
@@ -671,7 +624,7 @@ inline shared_count::shared_count( weak_count const & r ): pi_( r.pi_ )
     }
 }
 
-inline shared_count::shared_count( weak_count const & r, sp_nothrow_tag ) BOOST_SP_NOEXCEPT: pi_( r.pi_ )
+inline shared_count::shared_count( weak_count const & r, sp_nothrow_tag ) noexcept: pi_( r.pi_ )
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
@@ -682,12 +635,12 @@ inline shared_count::shared_count( weak_count const & r, sp_nothrow_tag ) BOOST_
     }
 }
 
-inline bool shared_count::operator==( weak_count const & r ) const BOOST_SP_NOEXCEPT
+inline bool shared_count::operator==( weak_count const & r ) const noexcept
 {
     return pi_ == r.pi_;
 }
 
-inline bool shared_count::operator<( weak_count const & r ) const BOOST_SP_NOEXCEPT
+inline bool shared_count::operator<( weak_count const & r ) const noexcept
 {
     return std::less<sp_counted_base *>()( pi_, r.pi_ );
 }
@@ -700,8 +653,4 @@ inline bool shared_count::operator<( weak_count const & r ) const BOOST_SP_NOEXC
 #pragma GCC diagnostic pop
 #endif
 
-#if defined(__BORLANDC__) && !defined(__clang__)
-# pragma warn .8027     // Functions containing try are not expanded inline
-#endif
-
 #endif  // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/sp_convertible.hpp b/inst/include/boost/smart_ptr/detail/sp_convertible.hpp
index af422883c..c60f69fae 100644
--- a/inst/include/boost/smart_ptr/detail/sp_convertible.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_convertible.hpp
@@ -18,20 +18,6 @@
 #include <boost/config.hpp>
 #include <cstddef>
 
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( BOOST_NO_SFINAE )
-# define BOOST_SP_NO_SP_CONVERTIBLE
-#endif
-
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ < 303 )
-# define BOOST_SP_NO_SP_CONVERTIBLE
-#endif
-
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( BOOST_BORLANDC ) && ( BOOST_BORLANDC < 0x630 )
-# define BOOST_SP_NO_SP_CONVERTIBLE
-#endif
-
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
 namespace boost
 {
 
@@ -87,6 +73,4 @@ template< class Y, class T > struct sp_enable_if_convertible: public sp_enable_i
 
 } // namespace boost
 
-#endif // !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
 #endif  // #ifndef BOOST_SMART_PTR_DETAIL_SP_CONVERTIBLE_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/sp_counted_base.hpp b/inst/include/boost/smart_ptr/detail/sp_counted_base.hpp
index 536926a58..d67008335 100644
--- a/inst/include/boost/smart_ptr/detail/sp_counted_base.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_counted_base.hpp
@@ -19,6 +19,7 @@
 
 #include <boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp>
 #include <boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp>
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
 #include <boost/config.hpp>
 
 #if defined( BOOST_SP_DISABLE_THREADS )
diff --git a/inst/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp b/inst/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
index eb37a7943..04b7a6a1d 100644
--- a/inst/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
@@ -19,7 +19,6 @@
 //
 
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
 #include <boost/config.hpp>
 #include <boost/cstdint.hpp>
 
@@ -48,43 +47,43 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
 
 public:
 
-    sp_counted_base() BOOST_SP_NOEXCEPT: use_count_( 1 ), weak_count_( 1 )
+    sp_counted_base() noexcept: use_count_( 1 ), weak_count_( 1 )
     {
     }
 
-    virtual ~sp_counted_base() /*BOOST_SP_NOEXCEPT*/
+    virtual ~sp_counted_base() /*noexcept*/
     {
     }
 
     // dispose() is called when use_count_ drops to zero, to release
     // the resources managed by *this.
 
-    virtual void dispose() BOOST_SP_NOEXCEPT = 0; // nothrow
+    virtual void dispose() noexcept = 0; // nothrow
 
     // destroy() is called when weak_count_ drops to zero.
 
-    virtual void destroy() BOOST_SP_NOEXCEPT // nothrow
+    virtual void destroy() noexcept // nothrow
     {
         delete this;
     }
 
-    virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0;
-    virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0;
-    virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT = 0;
+    virtual void * get_deleter( sp_typeinfo_ const & ti ) noexcept = 0;
+    virtual void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept = 0;
+    virtual void * get_untyped_deleter() noexcept = 0;
 
-    void add_ref_copy() BOOST_SP_NOEXCEPT
+    void add_ref_copy() noexcept
     {
         ++use_count_;
     }
 
-    bool add_ref_lock() BOOST_SP_NOEXCEPT // true on success
+    bool add_ref_lock() noexcept // true on success
     {
         if( use_count_ == 0 ) return false;
         ++use_count_;
         return true;
     }
 
-    void release() BOOST_SP_NOEXCEPT
+    void release() noexcept
     {
         if( --use_count_ == 0 )
         {
@@ -93,12 +92,12 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
         }
     }
 
-    void weak_add_ref() BOOST_SP_NOEXCEPT
+    void weak_add_ref() noexcept
     {
         ++weak_count_;
     }
 
-    void weak_release() BOOST_SP_NOEXCEPT
+    void weak_release() noexcept
     {
         if( --weak_count_ == 0 )
         {
@@ -106,7 +105,7 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
         }
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return use_count_;
     }
diff --git a/inst/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp b/inst/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
index 52acf92b9..7237f1e0f 100644
--- a/inst/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp
@@ -16,7 +16,6 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
 #include <boost/config.hpp>
 #include <atomic>
 #include <cstdint>
@@ -34,17 +33,17 @@ namespace boost
 namespace detail
 {
 
-inline void atomic_increment( std::atomic_int_least32_t * pw ) BOOST_SP_NOEXCEPT
+inline void atomic_increment( std::atomic_int_least32_t * pw ) noexcept
 {
     pw->fetch_add( 1, std::memory_order_relaxed );
 }
 
-inline std::int_least32_t atomic_decrement( std::atomic_int_least32_t * pw ) BOOST_SP_NOEXCEPT
+inline std::int_least32_t atomic_decrement( std::atomic_int_least32_t * pw ) noexcept
 {
     return pw->fetch_sub( 1, std::memory_order_acq_rel );
 }
 
-inline std::int_least32_t atomic_conditional_increment( std::atomic_int_least32_t * pw ) BOOST_SP_NOEXCEPT
+inline std::int_least32_t atomic_conditional_increment( std::atomic_int_least32_t * pw ) noexcept
 {
     // long r = *pw;
     // if( r != 0 ) ++*pw;
@@ -78,41 +77,41 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
 
 public:
 
-    sp_counted_base() BOOST_SP_NOEXCEPT: use_count_( 1 ), weak_count_( 1 )
+    sp_counted_base() noexcept: use_count_( 1 ), weak_count_( 1 )
     {
     }
 
-    virtual ~sp_counted_base() /*BOOST_SP_NOEXCEPT*/
+    virtual ~sp_counted_base() /*noexcept*/
     {
     }
 
     // dispose() is called when use_count_ drops to zero, to release
     // the resources managed by *this.
 
-    virtual void dispose() BOOST_SP_NOEXCEPT = 0;
+    virtual void dispose() noexcept = 0;
 
     // destroy() is called when weak_count_ drops to zero.
 
-    virtual void destroy() BOOST_SP_NOEXCEPT
+    virtual void destroy() noexcept
     {
         delete this;
     }
 
-    virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0;
-    virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0;
-    virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT = 0;
+    virtual void * get_deleter( sp_typeinfo_ const & ti ) noexcept = 0;
+    virtual void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept = 0;
+    virtual void * get_untyped_deleter() noexcept = 0;
 
-    void add_ref_copy() BOOST_SP_NOEXCEPT
+    void add_ref_copy() noexcept
     {
         atomic_increment( &use_count_ );
     }
 
-    bool add_ref_lock() BOOST_SP_NOEXCEPT // true on success
+    bool add_ref_lock() noexcept // true on success
     {
         return atomic_conditional_increment( &use_count_ ) != 0;
     }
 
-    void release() BOOST_SP_NOEXCEPT
+    void release() noexcept
     {
         if( atomic_decrement( &use_count_ ) == 1 )
         {
@@ -121,12 +120,12 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
         }
     }
 
-    void weak_add_ref() BOOST_SP_NOEXCEPT
+    void weak_add_ref() noexcept
     {
         atomic_increment( &weak_count_ );
     }
 
-    void weak_release() BOOST_SP_NOEXCEPT
+    void weak_release() noexcept
     {
         if( atomic_decrement( &weak_count_ ) == 1 )
         {
@@ -134,7 +133,7 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
         }
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return use_count_.load( std::memory_order_acquire );
     }
diff --git a/inst/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp b/inst/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
index dc0df4acb..0fe034115 100644
--- a/inst/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
@@ -90,18 +90,7 @@ class BOOST_SYMBOL_VISIBLE sp_counted_base
             long tmp = static_cast< long const volatile& >( use_count_ );
             if( tmp == 0 ) return false;
 
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, == 1200 )
-
-            // work around a code generation bug
-
-            long tmp2 = tmp + 1;
-            if( BOOST_SP_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp2, tmp ) == tmp2 - 1 ) return true;
-
-#else
-
             if( BOOST_SP_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp + 1, tmp ) == tmp ) return true;
-
-#endif
         }
     }
 
diff --git a/inst/include/boost/smart_ptr/detail/sp_counted_impl.hpp b/inst/include/boost/smart_ptr/detail/sp_counted_impl.hpp
index 8c12ac908..828e758ea 100644
--- a/inst/include/boost/smart_ptr/detail/sp_counted_impl.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_counted_impl.hpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <boost/smart_ptr/detail/sp_counted_base.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
 #include <boost/core/checked_delete.hpp>
 #include <boost/core/addressof.hpp>
 #include <boost/config.hpp>
@@ -52,12 +52,12 @@ namespace detail
 
 template<class D> class local_sp_deleter;
 
-template<class D> D * get_local_deleter( D * /*p*/ ) BOOST_SP_NOEXCEPT
+template<class D> D * get_local_deleter( D * /*p*/ ) noexcept
 {
     return 0;
 }
 
-template<class D> D * get_local_deleter( local_sp_deleter<D> * p ) BOOST_SP_NOEXCEPT;
+template<class D> D * get_local_deleter( local_sp_deleter<D> * p ) noexcept;
 
 //
 
@@ -81,7 +81,7 @@ template<class X> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p: public sp_counte
 #endif
     }
 
-    void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void dispose() noexcept override
     {
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         boost::sp_scalar_destructor_hook( px_, sizeof(X), this );
@@ -89,17 +89,17 @@ template<class X> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p: public sp_counte
         boost::checked_delete( px_ );
     }
 
-    void * get_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_deleter( sp_typeinfo_ const & ) noexcept override
     {
         return 0;
     }
 
-    void * get_local_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_local_deleter( sp_typeinfo_ const & ) noexcept override
     {
         return 0;
     }
 
-    void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_untyped_deleter() noexcept override
     {
         return 0;
     }
@@ -133,13 +133,6 @@ template<class X> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p: public sp_counte
 #endif
 };
 
-//
-// Borland's Codeguard trips up over the -Vx- option here:
-//
-#ifdef __CODEGUARD__
-# pragma option push -Vx-
-#endif
-
 template<class P, class D> class BOOST_SYMBOL_VISIBLE sp_counted_impl_pd: public sp_counted_base
 {
 private:
@@ -156,40 +149,30 @@ template<class P, class D> class BOOST_SYMBOL_VISIBLE sp_counted_impl_pd: public
 
     // pre: d(p) must not throw
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     sp_counted_impl_pd( P p, D & d ): ptr( p ), del( static_cast< D&& >( d ) )
     {
     }
 
-#else
-
-    sp_counted_impl_pd( P p, D & d ): ptr( p ), del( d )
-    {
-    }
-
-#endif
-
     sp_counted_impl_pd( P p ): ptr( p ), del()
     {
     }
 
-    void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void dispose() noexcept override
     {
         del( ptr );
     }
 
-    void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_deleter( sp_typeinfo_ const & ti ) noexcept override
     {
         return ti == BOOST_SP_TYPEID_(D)? &reinterpret_cast<char&>( del ): 0;
     }
 
-    void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept override
     {
         return ti == BOOST_SP_TYPEID_(D)? boost::detail::get_local_deleter( boost::addressof( del ) ): 0;
     }
 
-    void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_untyped_deleter() noexcept override
     {
         return &reinterpret_cast<char&>( del );
     }
@@ -240,41 +223,23 @@ template<class P, class D, class A> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p
 
     // pre: d( p ) must not throw
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     sp_counted_impl_pda( P p, D & d, A a ): p_( p ), d_( static_cast< D&& >( d ) ), a_( a )
     {
     }
 
-#else
-
-    sp_counted_impl_pda( P p, D & d, A a ): p_( p ), d_( d ), a_( a )
-    {
-    }
-
-#endif
-
     sp_counted_impl_pda( P p, A a ): p_( p ), d_( a ), a_( a )
     {
     }
 
-    void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void dispose() noexcept override
     {
         d_( p_ );
     }
 
-    void destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void destroy() noexcept override
     {
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
         typedef typename std::allocator_traits<A>::template rebind_alloc< this_type > A2;
 
-#else
-
-        typedef typename A::template rebind< this_type >::other A2;
-
-#endif
-
         A2 a2( a_ );
 
         this->~this_type();
@@ -282,26 +247,22 @@ template<class P, class D, class A> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p
         a2.deallocate( this, 1 );
     }
 
-    void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_deleter( sp_typeinfo_ const & ti ) noexcept override
     {
         return ti == BOOST_SP_TYPEID_( D )? &reinterpret_cast<char&>( d_ ): 0;
     }
 
-    void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept override
     {
         return ti == BOOST_SP_TYPEID_( D )? boost::detail::get_local_deleter( boost::addressof( d_ ) ): 0;
     }
 
-    void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE
+    void * get_untyped_deleter() noexcept override
     {
         return &reinterpret_cast<char&>( d_ );
     }
 };
 
-#ifdef __CODEGUARD__
-# pragma option pop
-#endif
-
 } // namespace detail
 
 } // namespace boost
diff --git a/inst/include/boost/smart_ptr/detail/sp_forward.hpp b/inst/include/boost/smart_ptr/detail/sp_forward.hpp
deleted file mode 100644
index 8fdec65b7..000000000
--- a/inst/include/boost/smart_ptr/detail/sp_forward.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef BOOST_SMART_PTR_DETAIL_SP_FORWARD_HPP_INCLUDED
-#define BOOST_SMART_PTR_DETAIL_SP_FORWARD_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//  detail/sp_forward.hpp
-//
-//  Copyright 2008,2012 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/config.hpp>
-
-namespace boost
-{
-
-namespace detail
-{
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-#if defined( BOOST_GCC ) && __GNUC__ * 100 + __GNUC_MINOR__ <= 404
-
-// GCC 4.4 supports an outdated version of rvalue references and creates a copy of the forwarded object.
-// This results in warnings 'returning reference to temporary'. Therefore we use a special version similar to std::forward.
-template< class T > T&& sp_forward( T && t ) BOOST_NOEXCEPT
-{
-    return t;
-}
-
-#else
-
-template< class T > T&& sp_forward( T & t ) BOOST_NOEXCEPT
-{
-    return static_cast< T&& >( t );
-}
-
-#endif
-
-#endif
-
-} // namespace detail
-
-} // namespace boost
-
-#endif  // #ifndef BOOST_SMART_PTR_DETAIL_SP_FORWARD_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp b/inst/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp
index 2e15f7909..cf2d897da 100644
--- a/inst/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp
@@ -17,8 +17,11 @@
 // Defines the BOOST_SP_HAS_GCC_INTRINSICS macro if the __atomic_*
 // intrinsics are available.
 
+// Libraries (e.g. Kokkos) sometimes define the __ATOMIC_RELAXED macros,
+// leading to errors under MSVC (https://github.com/boostorg/smart_ptr/pull/112)
 
-#if defined( __ATOMIC_RELAXED ) && defined( __ATOMIC_ACQUIRE ) && defined( __ATOMIC_RELEASE ) && defined( __ATOMIC_ACQ_REL )
+#if defined( __ATOMIC_RELAXED ) && defined( __ATOMIC_ACQUIRE ) && defined( __ATOMIC_RELEASE ) && defined( __ATOMIC_ACQ_REL ) \
+    && !( defined(_MSC_VER) && !defined(__clang__) )
 
 # define BOOST_SP_HAS_GCC_INTRINSICS
 
diff --git a/inst/include/boost/smart_ptr/detail/sp_noexcept.hpp b/inst/include/boost/smart_ptr/detail/sp_noexcept.hpp
index 1287ba495..3b0d04ed5 100644
--- a/inst/include/boost/smart_ptr/detail/sp_noexcept.hpp
+++ b/inst/include/boost/smart_ptr/detail/sp_noexcept.hpp
@@ -15,25 +15,16 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/config.hpp>
 
-// BOOST_SP_NOEXCEPT
+// BOOST_SP_NOEXCEPT (obsolete, only retained for compatibility)
 
-#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1700 && BOOST_MSVC < 1900
+#define BOOST_SP_NOEXCEPT noexcept
 
-#  define BOOST_SP_NOEXCEPT BOOST_NOEXCEPT_OR_NOTHROW
-
-#else
-
-#  define BOOST_SP_NOEXCEPT BOOST_NOEXCEPT
-
-#endif
-
-// BOOST_SP_NOEXCEPT_WITH_ASSERT
+// BOOST_SP_NOEXCEPT_WITH_ASSERT (noexcept, unless a user assertion handler is present)
 
 #if defined(BOOST_DISABLE_ASSERTS) || ( defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && defined(NDEBUG) )
 
-#  define BOOST_SP_NOEXCEPT_WITH_ASSERT BOOST_SP_NOEXCEPT
+#  define BOOST_SP_NOEXCEPT_WITH_ASSERT noexcept
 
 #elif defined(BOOST_ENABLE_ASSERT_HANDLER) || ( defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG) )
 
@@ -41,7 +32,7 @@
 
 #else
 
-#  define BOOST_SP_NOEXCEPT_WITH_ASSERT BOOST_SP_NOEXCEPT
+#  define BOOST_SP_NOEXCEPT_WITH_ASSERT noexcept
 
 #endif
 
diff --git a/inst/include/boost/smart_ptr/detail/sp_nullptr_t.hpp b/inst/include/boost/smart_ptr/detail/sp_nullptr_t.hpp
deleted file mode 100644
index 219ae8070..000000000
--- a/inst/include/boost/smart_ptr/detail/sp_nullptr_t.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef BOOST_SMART_PTR_DETAIL_SP_NULLPTR_T_HPP_INCLUDED
-#define BOOST_SMART_PTR_DETAIL_SP_NULLPTR_T_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//  detail/sp_nullptr_t.hpp
-//
-//  Copyright 2013 Peter Dimov
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/config.hpp>
-#include <cstddef>
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-namespace boost
-{
-
-namespace detail
-{
-
-#if !defined( BOOST_NO_CXX11_DECLTYPE ) && ( ( defined( __clang__ ) && !defined( _LIBCPP_VERSION ) ) || defined( __INTEL_COMPILER ) )
-
-    typedef decltype(nullptr) sp_nullptr_t;
-
-#else
-
-    typedef std::nullptr_t sp_nullptr_t;
-
-#endif
-
-} // namespace detail
-
-} // namespace boost
-
-#endif // !defined( BOOST_NO_CXX11_NULLPTR )
-
-#endif  // #ifndef BOOST_SMART_PTR_DETAIL_SP_NULLPTR_T_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/sp_type_traits.hpp b/inst/include/boost/smart_ptr/detail/sp_type_traits.hpp
new file mode 100644
index 000000000..a717f92ff
--- /dev/null
+++ b/inst/include/boost/smart_ptr/detail/sp_type_traits.hpp
@@ -0,0 +1,55 @@
+#ifndef BOOST_SMART_PTR_DETAIL_SP_TYPE_TRAITS_HPP_INCLUDED
+#define BOOST_SMART_PTR_DETAIL_SP_TYPE_TRAITS_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <type_traits>
+
+namespace boost
+{
+namespace detail
+{
+
+// std::is_bounded_array (C++20)
+
+template<class T> struct sp_is_bounded_array: std::false_type
+{
+};
+
+template<class T, std::size_t N> struct sp_is_bounded_array< T[N] >: std::true_type
+{
+};
+
+// std::is_unbounded_array (C++20)
+
+template<class T> struct sp_is_unbounded_array: std::false_type
+{
+};
+
+template<class T> struct sp_is_unbounded_array< T[] >: std::true_type
+{
+};
+
+// std::type_identity (C++20)
+
+template<class T> struct sp_type_identity
+{
+    typedef T type;
+};
+
+// boost::type_with_alignment
+
+template<std::size_t A> struct sp_type_with_alignment
+{
+    struct alignas(A) type
+    {
+        unsigned char padding[ A ];
+    };
+};
+
+} // namespace detail
+} // namespace boost
+
+#endif  // #ifndef BOOST_SMART_PTR_DETAIL_SP_TYPE_TRAITS_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/detail/spinlock.hpp b/inst/include/boost/smart_ptr/detail/spinlock.hpp
index 26e1b081e..1c90becfe 100644
--- a/inst/include/boost/smart_ptr/detail/spinlock.hpp
+++ b/inst/include/boost/smart_ptr/detail/spinlock.hpp
@@ -30,6 +30,7 @@
 
 #include <boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp>
 #include <boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp>
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
 #include <boost/config.hpp>
 
 #if defined( BOOST_SP_USE_STD_ATOMIC )
diff --git a/inst/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp b/inst/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp
index 458370c50..013ce4e02 100644
--- a/inst/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp
+++ b/inst/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp
@@ -16,7 +16,6 @@
 //
 
 #include <boost/smart_ptr/detail/yield_k.hpp>
-#include <boost/config.hpp>
 #include <atomic>
 
 #if defined(BOOST_SP_REPORT_IMPLEMENTATION)
@@ -40,12 +39,12 @@ class spinlock
 
 public:
 
-    bool try_lock() BOOST_NOEXCEPT
+    bool try_lock() noexcept
     {
         return !v_.test_and_set( std::memory_order_acquire );
     }
 
-    void lock() BOOST_NOEXCEPT
+    void lock() noexcept
     {
         for( unsigned k = 0; !try_lock(); ++k )
         {
@@ -53,7 +52,7 @@ class spinlock
         }
     }
 
-    void unlock() BOOST_NOEXCEPT
+    void unlock() noexcept
     {
         v_ .clear( std::memory_order_release );
     }
@@ -71,12 +70,12 @@ class spinlock
 
     public:
 
-        explicit scoped_lock( spinlock & sp ) BOOST_NOEXCEPT: sp_( sp )
+        explicit scoped_lock( spinlock & sp ) noexcept: sp_( sp )
         {
             sp.lock();
         }
 
-        ~scoped_lock() /*BOOST_NOEXCEPT*/
+        ~scoped_lock() /*noexcept*/
         {
             sp_.unlock();
         }
diff --git a/inst/include/boost/smart_ptr/enable_shared_from.hpp b/inst/include/boost/smart_ptr/enable_shared_from.hpp
index 68fb8e42a..66212d702 100644
--- a/inst/include/boost/smart_ptr/enable_shared_from.hpp
+++ b/inst/include/boost/smart_ptr/enable_shared_from.hpp
@@ -11,9 +11,7 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/enable_shared_from_this.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
 
 namespace boost
 {
@@ -32,7 +30,7 @@ template<class T> shared_ptr<T> shared_from( T * p )
     return shared_ptr<T>( p->enable_shared_from_this<enable_shared_from>::shared_from_this(), p );
 }
 
-template<class T> weak_ptr<T> weak_from( T * p ) BOOST_SP_NOEXCEPT
+template<class T> weak_ptr<T> weak_from( T * p ) noexcept
 {
     return weak_ptr<T>( p->enable_shared_from_this<enable_shared_from>::weak_from_this(), p );
 }
diff --git a/inst/include/boost/smart_ptr/enable_shared_from_raw.hpp b/inst/include/boost/smart_ptr/enable_shared_from_raw.hpp
index 3b2da3e7d..50e86d033 100644
--- a/inst/include/boost/smart_ptr/enable_shared_from_raw.hpp
+++ b/inst/include/boost/smart_ptr/enable_shared_from_raw.hpp
@@ -71,15 +71,12 @@ class enable_shared_from_raw
         }
     }
 
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
 private:
+
     template<class Y> friend class shared_ptr;
     template<typename T> friend boost::shared_ptr<T> shared_from_raw(T *);
     template<typename T> friend boost::weak_ptr<T> weak_from_raw(T *);
     template< class X, class Y > friend inline void detail::sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe );
-#endif
 
     shared_ptr<void const volatile> shared_from_this() const
     {
diff --git a/inst/include/boost/smart_ptr/enable_shared_from_this.hpp b/inst/include/boost/smart_ptr/enable_shared_from_this.hpp
index b4ea23cf8..0c2b3f934 100644
--- a/inst/include/boost/smart_ptr/enable_shared_from_this.hpp
+++ b/inst/include/boost/smart_ptr/enable_shared_from_this.hpp
@@ -13,12 +13,9 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
 #include <boost/assert.hpp>
-#include <boost/config.hpp>
 
 namespace boost
 {
@@ -27,20 +24,20 @@ template<class T> class enable_shared_from_this
 {
 protected:
 
-    BOOST_CONSTEXPR enable_shared_from_this() BOOST_SP_NOEXCEPT
+    constexpr enable_shared_from_this() noexcept
     {
     }
 
-    BOOST_CONSTEXPR enable_shared_from_this(enable_shared_from_this const &) BOOST_SP_NOEXCEPT
+    constexpr enable_shared_from_this(enable_shared_from_this const &) noexcept
     {
     }
 
-    enable_shared_from_this & operator=(enable_shared_from_this const &) BOOST_SP_NOEXCEPT
+    enable_shared_from_this & operator=(enable_shared_from_this const &) noexcept
     {
         return *this;
     }
 
-    ~enable_shared_from_this() BOOST_SP_NOEXCEPT // ~weak_ptr<T> newer throws, so this call also must not throw
+    ~enable_shared_from_this() noexcept // ~weak_ptr<T> newer throws, so this call also must not throw
     {
     }
 
@@ -60,12 +57,12 @@ template<class T> class enable_shared_from_this
         return p;
     }
 
-    weak_ptr<T> weak_from_this() BOOST_SP_NOEXCEPT
+    weak_ptr<T> weak_from_this() noexcept
     {
         return weak_this_;
     }
 
-    weak_ptr<T const> weak_from_this() const BOOST_SP_NOEXCEPT
+    weak_ptr<T const> weak_from_this() const noexcept
     {
         return weak_this_;
     }
@@ -73,7 +70,7 @@ template<class T> class enable_shared_from_this
 public: // actually private, but avoids compiler template friendship issues
 
     // Note: invoked automatically by shared_ptr; do not call
-    template<class X, class Y> void _internal_accept_owner( shared_ptr<X> const * ppx, Y * py ) const BOOST_SP_NOEXCEPT
+    template<class X, class Y> void _internal_accept_owner( shared_ptr<X> const * ppx, Y * py ) const noexcept
     {
         if( weak_this_.expired() )
         {
diff --git a/inst/include/boost/smart_ptr/intrusive_ptr.hpp b/inst/include/boost/smart_ptr/intrusive_ptr.hpp
index 733be391f..ddb20c0b0 100644
--- a/inst/include/boost/smart_ptr/intrusive_ptr.hpp
+++ b/inst/include/boost/smart_ptr/intrusive_ptr.hpp
@@ -13,26 +13,13 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-
-#include <boost/config.hpp>
-
-#include <boost/assert.hpp>
-#include <boost/config/workaround.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/assert.hpp>
 
-#include <boost/config/no_tr1/functional.hpp>           // for std::less
-
-#if !defined(BOOST_NO_IOSTREAM)
-#if !defined(BOOST_NO_IOSFWD)
+#include <functional>           // for std::less
 #include <iosfwd>               // for std::basic_ostream
-#else
-#include <ostream>
-#endif
-#endif
-
+#include <cstddef>
 
 namespace boost
 {
@@ -62,7 +49,7 @@ template<class T> class intrusive_ptr
 
     typedef T element_type;
 
-    BOOST_CONSTEXPR intrusive_ptr() BOOST_SP_NOEXCEPT : px( 0 )
+    constexpr intrusive_ptr() noexcept : px( 0 )
     {
     }
 
@@ -71,25 +58,13 @@ template<class T> class intrusive_ptr
         if( px != 0 && add_ref ) intrusive_ptr_add_ref( px );
     }
 
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-
     template<class U>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     intrusive_ptr( intrusive_ptr<U> const & rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty() )
-
-#else
-
-    intrusive_ptr( intrusive_ptr<U> const & rhs )
-
-#endif
     : px( rhs.get() )
     {
         if( px != 0 ) intrusive_ptr_add_ref( px );
     }
 
-#endif
-
     intrusive_ptr(intrusive_ptr const & rhs): px( rhs.px )
     {
         if( px != 0 ) intrusive_ptr_add_ref( px );
@@ -100,26 +75,20 @@ template<class T> class intrusive_ptr
         if( px != 0 ) intrusive_ptr_release( px );
     }
 
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-
     template<class U> intrusive_ptr & operator=(intrusive_ptr<U> const & rhs)
     {
         this_type(rhs).swap(*this);
         return *this;
     }
 
-#endif
-
 // Move support
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    intrusive_ptr(intrusive_ptr && rhs) BOOST_SP_NOEXCEPT : px( rhs.px )
+    intrusive_ptr(intrusive_ptr && rhs) noexcept : px( rhs.px )
     {
         rhs.px = 0;
     }
 
-    intrusive_ptr & operator=(intrusive_ptr && rhs) BOOST_SP_NOEXCEPT
+    intrusive_ptr & operator=(intrusive_ptr && rhs) noexcept
     {
         this_type( static_cast< intrusive_ptr && >( rhs ) ).swap(*this);
         return *this;
@@ -128,29 +97,19 @@ template<class T> class intrusive_ptr
     template<class U> friend class intrusive_ptr;
 
     template<class U>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     intrusive_ptr(intrusive_ptr<U> && rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty())
-
-#else
-
-    intrusive_ptr(intrusive_ptr<U> && rhs)
-
-#endif        
     : px( rhs.px )
     {
         rhs.px = 0;
     }
 
     template<class U>
-    intrusive_ptr & operator=(intrusive_ptr<U> && rhs) BOOST_SP_NOEXCEPT
+    intrusive_ptr & operator=(intrusive_ptr<U> && rhs) noexcept
     {
         this_type( static_cast< intrusive_ptr<U> && >( rhs ) ).swap(*this);
         return *this;
     }
 
-#endif
-
     intrusive_ptr & operator=(intrusive_ptr const & rhs)
     {
         this_type(rhs).swap(*this);
@@ -178,12 +137,12 @@ template<class T> class intrusive_ptr
         this_type( rhs, add_ref ).swap( *this );
     }
 
-    T * get() const BOOST_SP_NOEXCEPT
+    T * get() const noexcept
     {
         return px;
     }
 
-    T * detach() BOOST_SP_NOEXCEPT
+    T * detach() noexcept
     {
         T * ret = px;
         px = 0;
@@ -202,10 +161,12 @@ template<class T> class intrusive_ptr
         return px;
     }
 
-// implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+    explicit operator bool () const noexcept
+    {
+        return px != 0;
+    }
 
-    void swap(intrusive_ptr & rhs) BOOST_SP_NOEXCEPT
+    void swap(intrusive_ptr & rhs) noexcept
     {
         T * tmp = px;
         px = rhs.px;
@@ -217,84 +178,69 @@ template<class T> class intrusive_ptr
     T * px;
 };
 
-template<class T, class U> inline bool operator==(intrusive_ptr<T> const & a, intrusive_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==(intrusive_ptr<T> const & a, intrusive_ptr<U> const & b) noexcept
 {
     return a.get() == b.get();
 }
 
-template<class T, class U> inline bool operator!=(intrusive_ptr<T> const & a, intrusive_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=(intrusive_ptr<T> const & a, intrusive_ptr<U> const & b) noexcept
 {
     return a.get() != b.get();
 }
 
-template<class T, class U> inline bool operator==(intrusive_ptr<T> const & a, U * b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==(intrusive_ptr<T> const & a, U * b) noexcept
 {
     return a.get() == b;
 }
 
-template<class T, class U> inline bool operator!=(intrusive_ptr<T> const & a, U * b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=(intrusive_ptr<T> const & a, U * b) noexcept
 {
     return a.get() != b;
 }
 
-template<class T, class U> inline bool operator==(T * a, intrusive_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==(T * a, intrusive_ptr<U> const & b) noexcept
 {
     return a == b.get();
 }
 
-template<class T, class U> inline bool operator!=(T * a, intrusive_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=(T * a, intrusive_ptr<U> const & b) noexcept
 {
     return a != b.get();
 }
 
-#if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-
-// Resolve the ambiguity between our op!= and the one in rel_ops
-
-template<class T> inline bool operator!=(intrusive_ptr<T> const & a, intrusive_ptr<T> const & b) BOOST_SP_NOEXCEPT
-{
-    return a.get() != b.get();
-}
-
-#endif
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-template<class T> inline bool operator==( intrusive_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( intrusive_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator==( boost::detail::sp_nullptr_t, intrusive_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( std::nullptr_t, intrusive_ptr<T> const & p ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator!=( intrusive_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( intrusive_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() != 0;
 }
 
-template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, intrusive_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( std::nullptr_t, intrusive_ptr<T> const & p ) noexcept
 {
     return p.get() != 0;
 }
 
-#endif
-
-template<class T> inline bool operator<(intrusive_ptr<T> const & a, intrusive_ptr<T> const & b) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator<(intrusive_ptr<T> const & a, intrusive_ptr<T> const & b) noexcept
 {
     return std::less<T *>()(a.get(), b.get());
 }
 
-template<class T> void swap(intrusive_ptr<T> & lhs, intrusive_ptr<T> & rhs) BOOST_SP_NOEXCEPT
+template<class T> void swap(intrusive_ptr<T> & lhs, intrusive_ptr<T> & rhs) noexcept
 {
     lhs.swap(rhs);
 }
 
 // mem_fn support
 
-template<class T> T * get_pointer(intrusive_ptr<T> const & p) BOOST_SP_NOEXCEPT
+template<class T> T * get_pointer(intrusive_ptr<T> const & p) noexcept
 {
     return p.get();
 }
@@ -316,19 +262,17 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast(intrusive_ptr<U
     return dynamic_cast<T *>(p.get());
 }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-template<class T, class U> intrusive_ptr<T> static_pointer_cast( intrusive_ptr<U> && p ) BOOST_SP_NOEXCEPT
+template<class T, class U> intrusive_ptr<T> static_pointer_cast( intrusive_ptr<U> && p ) noexcept
 {
     return intrusive_ptr<T>( static_cast<T*>( p.detach() ), false );
 }
 
-template<class T, class U> intrusive_ptr<T> const_pointer_cast( intrusive_ptr<U> && p ) BOOST_SP_NOEXCEPT
+template<class T, class U> intrusive_ptr<T> const_pointer_cast( intrusive_ptr<U> && p ) noexcept
 {
     return intrusive_ptr<T>( const_cast<T*>( p.detach() ), false );
 }
 
-template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<U> && p ) BOOST_SP_NOEXCEPT
+template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<U> && p ) noexcept
 {
     T * p2 = dynamic_cast<T*>( p.get() );
 
@@ -339,48 +283,19 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<
     return r;
 }
 
-#endif // defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 // operator<<
 
-#if !defined(BOOST_NO_IOSTREAM)
-
-#if defined(BOOST_NO_TEMPLATED_IOSTREAMS) || ( defined(__GNUC__) &&  (__GNUC__ < 3) )
-
 template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
 {
     os << p.get();
     return os;
 }
 
-#else
-
-// in STLport's no-iostreams mode no iostream symbols can be used
-#ifndef _STLP_NO_IOSTREAMS
-
-# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT)
-// MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL
-using std::basic_ostream;
-template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
-# else
-template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
-# endif 
-{
-    os << p.get();
-    return os;
-}
-
-#endif // _STLP_NO_IOSTREAMS
-
-#endif // __GNUC__ < 3
-
-#endif // !defined(BOOST_NO_IOSTREAM)
-
 // hash_value
 
 template< class T > struct hash;
 
-template< class T > std::size_t hash_value( boost::intrusive_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template< class T > std::size_t hash_value( boost::intrusive_ptr<T> const & p ) noexcept
 {
     return boost::hash< T* >()( p.get() );
 }
@@ -389,14 +304,12 @@ template< class T > std::size_t hash_value( boost::intrusive_ptr<T> const & p )
 
 // std::hash
 
-#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 namespace std
 {
 
 template<class T> struct hash< ::boost::intrusive_ptr<T> >
 {
-    std::size_t operator()( ::boost::intrusive_ptr<T> const & p ) const BOOST_SP_NOEXCEPT
+    std::size_t operator()( ::boost::intrusive_ptr<T> const & p ) const noexcept
     {
         return std::hash< T* >()( p.get() );
     }
@@ -404,6 +317,4 @@ template<class T> struct hash< ::boost::intrusive_ptr<T> >
 
 } // namespace std
 
-#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 #endif  // #ifndef BOOST_SMART_PTR_INTRUSIVE_PTR_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/intrusive_ref_counter.hpp b/inst/include/boost/smart_ptr/intrusive_ref_counter.hpp
index c2f918d0a..641937660 100644
--- a/inst/include/boost/smart_ptr/intrusive_ref_counter.hpp
+++ b/inst/include/boost/smart_ptr/intrusive_ref_counter.hpp
@@ -15,9 +15,8 @@
 #ifndef BOOST_SMART_PTR_INTRUSIVE_REF_COUNTER_HPP_INCLUDED_
 #define BOOST_SMART_PTR_INTRUSIVE_REF_COUNTER_HPP_INCLUDED_
 
-#include <boost/config.hpp>
 #include <boost/smart_ptr/detail/atomic_count.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -46,17 +45,17 @@ struct thread_unsafe_counter
 {
     typedef unsigned int type;
 
-    static unsigned int load(unsigned int const& counter) BOOST_SP_NOEXCEPT
+    static unsigned int load(unsigned int const& counter) noexcept
     {
         return counter;
     }
 
-    static void increment(unsigned int& counter) BOOST_SP_NOEXCEPT
+    static void increment(unsigned int& counter) noexcept
     {
         ++counter;
     }
 
-    static unsigned int decrement(unsigned int& counter) BOOST_SP_NOEXCEPT
+    static unsigned int decrement(unsigned int& counter) noexcept
     {
         return --counter;
     }
@@ -72,17 +71,17 @@ struct thread_safe_counter
 {
     typedef boost::detail::atomic_count type;
 
-    static unsigned int load(boost::detail::atomic_count const& counter) BOOST_SP_NOEXCEPT
+    static unsigned int load(boost::detail::atomic_count const& counter) noexcept
     {
         return static_cast< unsigned int >(static_cast< long >(counter));
     }
 
-    static void increment(boost::detail::atomic_count& counter) BOOST_SP_NOEXCEPT
+    static void increment(boost::detail::atomic_count& counter) noexcept
     {
         ++counter;
     }
 
-    static unsigned int decrement(boost::detail::atomic_count& counter) BOOST_SP_NOEXCEPT
+    static unsigned int decrement(boost::detail::atomic_count& counter) noexcept
     {
         return static_cast< unsigned int >(--counter);
     }
@@ -92,9 +91,9 @@ template< typename DerivedT, typename CounterPolicyT = thread_safe_counter >
 class intrusive_ref_counter;
 
 template< typename DerivedT, typename CounterPolicyT >
-void intrusive_ptr_add_ref(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) BOOST_SP_NOEXCEPT;
+void intrusive_ptr_add_ref(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) noexcept;
 template< typename DerivedT, typename CounterPolicyT >
-void intrusive_ptr_release(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) BOOST_SP_NOEXCEPT;
+void intrusive_ptr_release(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) noexcept;
 
 /*!
  * \brief A reference counter base class
@@ -122,7 +121,7 @@ class intrusive_ref_counter
      *
      * \post <tt>use_count() == 0</tt>
      */
-    intrusive_ref_counter() BOOST_SP_NOEXCEPT : m_ref_counter(0)
+    intrusive_ref_counter() noexcept : m_ref_counter(0)
     {
     }
 
@@ -131,7 +130,7 @@ class intrusive_ref_counter
      *
      * \post <tt>use_count() == 0</tt>
      */
-    intrusive_ref_counter(intrusive_ref_counter const&) BOOST_SP_NOEXCEPT : m_ref_counter(0)
+    intrusive_ref_counter(intrusive_ref_counter const&) noexcept : m_ref_counter(0)
     {
     }
 
@@ -140,12 +139,12 @@ class intrusive_ref_counter
      *
      * \post The reference counter is not modified after assignment
      */
-    intrusive_ref_counter& operator= (intrusive_ref_counter const&) BOOST_SP_NOEXCEPT { return *this; }
+    intrusive_ref_counter& operator= (intrusive_ref_counter const&) noexcept { return *this; }
 
     /*!
      * \return The reference counter
      */
-    unsigned int use_count() const BOOST_SP_NOEXCEPT
+    unsigned int use_count() const noexcept
     {
         return CounterPolicyT::load(m_ref_counter);
     }
@@ -156,18 +155,18 @@ class intrusive_ref_counter
      */
     BOOST_DEFAULTED_FUNCTION(~intrusive_ref_counter(), {})
 
-    friend void intrusive_ptr_add_ref< DerivedT, CounterPolicyT >(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) BOOST_SP_NOEXCEPT;
-    friend void intrusive_ptr_release< DerivedT, CounterPolicyT >(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) BOOST_SP_NOEXCEPT;
+    friend void intrusive_ptr_add_ref< DerivedT, CounterPolicyT >(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) noexcept;
+    friend void intrusive_ptr_release< DerivedT, CounterPolicyT >(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) noexcept;
 };
 
 template< typename DerivedT, typename CounterPolicyT >
-inline void intrusive_ptr_add_ref(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) BOOST_SP_NOEXCEPT
+inline void intrusive_ptr_add_ref(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) noexcept
 {
     CounterPolicyT::increment(p->m_ref_counter);
 }
 
 template< typename DerivedT, typename CounterPolicyT >
-inline void intrusive_ptr_release(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) BOOST_SP_NOEXCEPT
+inline void intrusive_ptr_release(const intrusive_ref_counter< DerivedT, CounterPolicyT >* p) noexcept
 {
     if (CounterPolicyT::decrement(p->m_ref_counter) == 0)
         delete static_cast< const DerivedT* >(p);
diff --git a/inst/include/boost/smart_ptr/local_shared_ptr.hpp b/inst/include/boost/smart_ptr/local_shared_ptr.hpp
index 19051dfd6..5fac9c2a0 100644
--- a/inst/include/boost/smart_ptr/local_shared_ptr.hpp
+++ b/inst/include/boost/smart_ptr/local_shared_ptr.hpp
@@ -11,8 +11,9 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/assert.hpp>
 
 namespace boost
 {
@@ -127,7 +128,7 @@ template<class T> class local_shared_ptr
 
     // destructor
 
-    ~local_shared_ptr() BOOST_SP_NOEXCEPT
+    ~local_shared_ptr() noexcept
     {
         if( pn )
         {
@@ -137,20 +138,16 @@ template<class T> class local_shared_ptr
 
     // constructors
 
-    BOOST_CONSTEXPR local_shared_ptr() BOOST_SP_NOEXCEPT : px( 0 ), pn( 0 )
+    constexpr local_shared_ptr() noexcept : px( 0 ), pn( 0 )
     {
     }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    BOOST_CONSTEXPR local_shared_ptr( boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT : px( 0 ), pn( 0 )
+    constexpr local_shared_ptr( std::nullptr_t ) noexcept : px( 0 ), pn( 0 )
     {
     }
 
-#endif
-
     // internal constructor, used by make_shared
-    BOOST_CONSTEXPR local_shared_ptr( boost::detail::lsp_internal_constructor_tag, element_type * px_, boost::detail::local_counted_base * pn_ ) BOOST_SP_NOEXCEPT : px( px_ ), pn( pn_ )
+    constexpr local_shared_ptr( boost::detail::lsp_internal_constructor_tag, element_type * px_, boost::detail::local_counted_base * pn_ ) noexcept : px( px_ ), pn( pn_ )
     {
     }
 
@@ -165,29 +162,21 @@ template<class T> class local_shared_ptr
         boost::detail::lsp_deleter_construct( this, p, d, pn );
     }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    template<class D> local_shared_ptr( boost::detail::sp_nullptr_t p, D d ): px( p ), pn( 0 )
+    template<class D> local_shared_ptr( std::nullptr_t p, D d ): px( p ), pn( 0 )
     {
         boost::detail::lsp_deleter_construct( this, p, d, pn );
     }
 
-#endif
-
     template<class Y, class D, class A> local_shared_ptr( Y * p, D d, A a ): px( p ), pn( 0 )
     {
         boost::detail::lsp_allocator_construct( this, p, d, a, pn );
     }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    template<class D, class A> local_shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( 0 )
+    template<class D, class A> local_shared_ptr( std::nullptr_t p, D d, A a ): px( p ), pn( 0 )
     {
         boost::detail::lsp_allocator_construct( this, p, d, a, pn );
     }
 
-#endif
-
     // construction from shared_ptr
 
     template<class Y> local_shared_ptr( shared_ptr<Y> const & r,
@@ -202,8 +191,6 @@ template<class T> class local_shared_ptr
         }
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y> local_shared_ptr( shared_ptr<Y> && r,
         typename boost::detail::sp_enable_if_convertible<Y, T>::type = boost::detail::sp_empty() )
         : px( r.get() ), pn( 0 )
@@ -217,12 +204,8 @@ template<class T> class local_shared_ptr
         }
     }
 
-#endif
-
     // construction from unique_ptr
 
-#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template< class Y, class D >
     local_shared_ptr( std::unique_ptr< Y, D > && r,
         typename boost::detail::sp_enable_if_convertible<Y, T>::type = boost::detail::sp_empty() )
@@ -236,8 +219,6 @@ template<class T> class local_shared_ptr
         }
     }
 
-#endif
-
     template< class Y, class D >
     local_shared_ptr( boost::movelib::unique_ptr< Y, D > r ); // !
     //  : px( r.get() ), pn( new boost::detail::local_counted_impl( shared_ptr<T>( std::move(r) ) ) )
@@ -247,7 +228,7 @@ template<class T> class local_shared_ptr
 
     // copy constructor
 
-    local_shared_ptr( local_shared_ptr const & r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    local_shared_ptr( local_shared_ptr const & r ) noexcept : px( r.px ), pn( r.pn )
     {
         if( pn )
         {
@@ -257,20 +238,16 @@ template<class T> class local_shared_ptr
 
     // move constructor
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    local_shared_ptr( local_shared_ptr && r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    local_shared_ptr( local_shared_ptr && r ) noexcept : px( r.px ), pn( r.pn )
     {
         r.px = 0;
         r.pn = 0;
     }
 
-#endif
-
     // converting copy constructor
 
     template<class Y> local_shared_ptr( local_shared_ptr<Y> const & r,
-        typename boost::detail::sp_enable_if_convertible<Y, T>::type = boost::detail::sp_empty() ) BOOST_SP_NOEXCEPT
+        typename boost::detail::sp_enable_if_convertible<Y, T>::type = boost::detail::sp_empty() ) noexcept
         : px( r.px ), pn( r.pn )
     {
         boost::detail::sp_assert_convertible< Y, T >();
@@ -283,10 +260,8 @@ template<class T> class local_shared_ptr
 
     // converting move constructor
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y> local_shared_ptr( local_shared_ptr<Y> && r,
-        typename boost::detail::sp_enable_if_convertible<Y, T>::type = boost::detail::sp_empty() ) BOOST_SP_NOEXCEPT
+        typename boost::detail::sp_enable_if_convertible<Y, T>::type = boost::detail::sp_empty() ) noexcept
         : px( r.px ), pn( r.pn )
     {
         boost::detail::sp_assert_convertible< Y, T >();
@@ -295,12 +270,10 @@ template<class T> class local_shared_ptr
         r.pn = 0;
     }
 
-#endif
-
     // aliasing
 
     template<class Y>
-    local_shared_ptr( local_shared_ptr<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn( r.pn )
+    local_shared_ptr( local_shared_ptr<Y> const & r, element_type * p ) noexcept : px( p ), pn( r.pn )
     {
         if( pn )
         {
@@ -308,60 +281,46 @@ template<class T> class local_shared_ptr
         }
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y>
-    local_shared_ptr( local_shared_ptr<Y> && r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn( r.pn )
+    local_shared_ptr( local_shared_ptr<Y> && r, element_type * p ) noexcept : px( p ), pn( r.pn )
     {
         r.px = 0;
         r.pn = 0;
     }
 
-#endif
-
     // assignment
 
-    local_shared_ptr & operator=( local_shared_ptr const & r ) BOOST_SP_NOEXCEPT
+    local_shared_ptr & operator=( local_shared_ptr const & r ) noexcept
     {
         local_shared_ptr( r ).swap( *this );
         return *this;
     }
 
-    template<class Y> local_shared_ptr & operator=( local_shared_ptr<Y> const & r ) BOOST_SP_NOEXCEPT
+    template<class Y> local_shared_ptr & operator=( local_shared_ptr<Y> const & r ) noexcept
     {
         local_shared_ptr( r ).swap( *this );
         return *this;
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    local_shared_ptr & operator=( local_shared_ptr && r ) BOOST_SP_NOEXCEPT
+    local_shared_ptr & operator=( local_shared_ptr && r ) noexcept
     {
         local_shared_ptr( std::move( r ) ).swap( *this );
         return *this;
     }
 
     template<class Y>
-    local_shared_ptr & operator=( local_shared_ptr<Y> && r ) BOOST_SP_NOEXCEPT
+    local_shared_ptr & operator=( local_shared_ptr<Y> && r ) noexcept
     {
         local_shared_ptr( std::move( r ) ).swap( *this );
         return *this;
     }
 
-#endif
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    local_shared_ptr & operator=( boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+    local_shared_ptr & operator=( std::nullptr_t ) noexcept
     {
         local_shared_ptr().swap(*this);
         return *this;
     }
 
-#endif
-
-#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y, class D>
     local_shared_ptr & operator=( std::unique_ptr<Y, D> && r )
     {
@@ -369,14 +328,12 @@ template<class T> class local_shared_ptr
         return *this;
     }
 
-#endif
-
     template<class Y, class D>
     local_shared_ptr & operator=( boost::movelib::unique_ptr<Y, D> r ); // !
 
     // reset
 
-    void reset() BOOST_SP_NOEXCEPT
+    void reset() noexcept
     {
         local_shared_ptr().swap( *this );
     }
@@ -396,28 +353,24 @@ template<class T> class local_shared_ptr
         local_shared_ptr( p, d, a ).swap( *this );
     }
 
-    template<class Y> void reset( local_shared_ptr<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT
+    template<class Y> void reset( local_shared_ptr<Y> const & r, element_type * p ) noexcept
     {
         local_shared_ptr( r, p ).swap( *this );
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    template<class Y> void reset( local_shared_ptr<Y> && r, element_type * p ) BOOST_SP_NOEXCEPT
+    template<class Y> void reset( local_shared_ptr<Y> && r, element_type * p ) noexcept
     {
         local_shared_ptr( std::move( r ), p ).swap( *this );
     }
 
-#endif
-
     // accessors
 
-    typename boost::detail::sp_dereference< T >::type operator* () const BOOST_SP_NOEXCEPT
+    typename boost::detail::sp_dereference< T >::type operator* () const noexcept
     {
         return *px;
     }
 
-    typename boost::detail::sp_member_access< T >::type operator-> () const BOOST_SP_NOEXCEPT
+    typename boost::detail::sp_member_access< T >::type operator-> () const noexcept
     {
         return px;
     }
@@ -430,26 +383,24 @@ template<class T> class local_shared_ptr
         return static_cast< typename boost::detail::sp_array_access< T >::type >( px[ i ] );
     }
 
-    element_type * get() const BOOST_SP_NOEXCEPT
+    element_type * get() const noexcept
     {
         return px;
     }
 
-    // implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+    explicit operator bool () const noexcept
+    {
+        return px != 0;
+    }
 
-    long local_use_count() const BOOST_SP_NOEXCEPT
+    long local_use_count() const noexcept
     {
         return pn? pn->local_use_count(): 0;
     }
 
     // conversions to shared_ptr, weak_ptr
 
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
-    template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator shared_ptr<Y>() const BOOST_SP_NOEXCEPT
-#else
-    template<class Y> operator shared_ptr<Y>() const BOOST_SP_NOEXCEPT
-#endif
+    template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator shared_ptr<Y>() const noexcept
     {
         boost::detail::sp_assert_convertible<T, Y>();
 
@@ -463,11 +414,7 @@ template<class T> class local_shared_ptr
         }
     }
 
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
-    template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator weak_ptr<Y>() const BOOST_SP_NOEXCEPT
-#else
-    template<class Y> operator weak_ptr<Y>() const BOOST_SP_NOEXCEPT
-#endif
+    template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator weak_ptr<Y>() const noexcept
     {
         boost::detail::sp_assert_convertible<T, Y>();
 
@@ -483,7 +430,7 @@ template<class T> class local_shared_ptr
 
     // swap
 
-    void swap( local_shared_ptr & r ) BOOST_SP_NOEXCEPT
+    void swap( local_shared_ptr & r ) noexcept
     {
         std::swap( px, r.px );
         std::swap( pn, r.pn );
@@ -491,84 +438,80 @@ template<class T> class local_shared_ptr
 
     // owner_before
 
-    template<class Y> bool owner_before( local_shared_ptr<Y> const & r ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_before( local_shared_ptr<Y> const & r ) const noexcept
     {
         return std::less< boost::detail::local_counted_base* >()( pn, r.pn );
     }
 
     // owner_equals
 
-    template<class Y> bool owner_equals( local_shared_ptr<Y> const & r ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_equals( local_shared_ptr<Y> const & r ) const noexcept
     {
         return pn == r.pn;
     }
 };
 
-template<class T, class U> inline bool operator==( local_shared_ptr<T> const & a, local_shared_ptr<U> const & b ) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==( local_shared_ptr<T> const & a, local_shared_ptr<U> const & b ) noexcept
 {
     return a.get() == b.get();
 }
 
-template<class T, class U> inline bool operator!=( local_shared_ptr<T> const & a, local_shared_ptr<U> const & b ) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=( local_shared_ptr<T> const & a, local_shared_ptr<U> const & b ) noexcept
 {
     return a.get() != b.get();
 }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-template<class T> inline bool operator==( local_shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( local_shared_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator==( boost::detail::sp_nullptr_t, local_shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( std::nullptr_t, local_shared_ptr<T> const & p ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator!=( local_shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( local_shared_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() != 0;
 }
 
-template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, local_shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( std::nullptr_t, local_shared_ptr<T> const & p ) noexcept
 {
     return p.get() != 0;
 }
 
-#endif
-
-template<class T, class U> inline bool operator==( local_shared_ptr<T> const & a, shared_ptr<U> const & b ) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==( local_shared_ptr<T> const & a, shared_ptr<U> const & b ) noexcept
 {
     return a.get() == b.get();
 }
 
-template<class T, class U> inline bool operator!=( local_shared_ptr<T> const & a, shared_ptr<U> const & b ) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=( local_shared_ptr<T> const & a, shared_ptr<U> const & b ) noexcept
 {
     return a.get() != b.get();
 }
 
-template<class T, class U> inline bool operator==( shared_ptr<T> const & a, local_shared_ptr<U> const & b ) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==( shared_ptr<T> const & a, local_shared_ptr<U> const & b ) noexcept
 {
     return a.get() == b.get();
 }
 
-template<class T, class U> inline bool operator!=( shared_ptr<T> const & a, local_shared_ptr<U> const & b ) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=( shared_ptr<T> const & a, local_shared_ptr<U> const & b ) noexcept
 {
     return a.get() != b.get();
 }
 
-template<class T, class U> inline bool operator<(local_shared_ptr<T> const & a, local_shared_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator<(local_shared_ptr<T> const & a, local_shared_ptr<U> const & b) noexcept
 {
     return a.owner_before( b );
 }
 
-template<class T> inline void swap( local_shared_ptr<T> & a, local_shared_ptr<T> & b ) BOOST_SP_NOEXCEPT
+template<class T> inline void swap( local_shared_ptr<T> & a, local_shared_ptr<T> & b ) noexcept
 {
     a.swap( b );
 }
 
-template<class T, class U> local_shared_ptr<T> static_pointer_cast( local_shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> static_pointer_cast( local_shared_ptr<U> const & r ) noexcept
 {
     (void) static_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -578,7 +521,7 @@ template<class T, class U> local_shared_ptr<T> static_pointer_cast( local_shared
     return local_shared_ptr<T>( r, p );
 }
 
-template<class T, class U> local_shared_ptr<T> const_pointer_cast( local_shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> const_pointer_cast( local_shared_ptr<U> const & r ) noexcept
 {
     (void) const_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -588,7 +531,7 @@ template<class T, class U> local_shared_ptr<T> const_pointer_cast( local_shared_
     return local_shared_ptr<T>( r, p );
 }
 
-template<class T, class U> local_shared_ptr<T> dynamic_pointer_cast( local_shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> dynamic_pointer_cast( local_shared_ptr<U> const & r ) noexcept
 {
     (void) dynamic_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -598,7 +541,7 @@ template<class T, class U> local_shared_ptr<T> dynamic_pointer_cast( local_share
     return p? local_shared_ptr<T>( r, p ): local_shared_ptr<T>();
 }
 
-template<class T, class U> local_shared_ptr<T> reinterpret_pointer_cast( local_shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> reinterpret_pointer_cast( local_shared_ptr<U> const & r ) noexcept
 {
     (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -608,9 +551,7 @@ template<class T, class U> local_shared_ptr<T> reinterpret_pointer_cast( local_s
     return local_shared_ptr<T>( r, p );
 }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-template<class T, class U> local_shared_ptr<T> static_pointer_cast( local_shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> static_pointer_cast( local_shared_ptr<U> && r ) noexcept
 {
     (void) static_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -620,7 +561,7 @@ template<class T, class U> local_shared_ptr<T> static_pointer_cast( local_shared
     return local_shared_ptr<T>( std::move(r), p );
 }
 
-template<class T, class U> local_shared_ptr<T> const_pointer_cast( local_shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> const_pointer_cast( local_shared_ptr<U> && r ) noexcept
 {
     (void) const_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -630,7 +571,7 @@ template<class T, class U> local_shared_ptr<T> const_pointer_cast( local_shared_
     return local_shared_ptr<T>( std::move(r), p );
 }
 
-template<class T, class U> local_shared_ptr<T> dynamic_pointer_cast( local_shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> dynamic_pointer_cast( local_shared_ptr<U> && r ) noexcept
 {
     (void) dynamic_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -640,7 +581,7 @@ template<class T, class U> local_shared_ptr<T> dynamic_pointer_cast( local_share
     return p? local_shared_ptr<T>( std::move(r), p ): local_shared_ptr<T>();
 }
 
-template<class T, class U> local_shared_ptr<T> reinterpret_pointer_cast( local_shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> local_shared_ptr<T> reinterpret_pointer_cast( local_shared_ptr<U> && r ) noexcept
 {
     (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -650,30 +591,24 @@ template<class T, class U> local_shared_ptr<T> reinterpret_pointer_cast( local_s
     return local_shared_ptr<T>( std::move(r), p );
 }
 
-#endif // !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 // get_pointer() enables boost::mem_fn to recognize local_shared_ptr
 
-template<class T> inline typename local_shared_ptr<T>::element_type * get_pointer( local_shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline typename local_shared_ptr<T>::element_type * get_pointer( local_shared_ptr<T> const & p ) noexcept
 {
     return p.get();
 }
 
 // operator<<
 
-#if !defined(BOOST_NO_IOSTREAM)
-
 template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< ( std::basic_ostream<E, T> & os, local_shared_ptr<Y> const & p )
 {
     os << p.get();
     return os;
 }
 
-#endif // !defined(BOOST_NO_IOSTREAM)
-
 // get_deleter
 
-template<class D, class T> D * get_deleter( local_shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class D, class T> D * get_deleter( local_shared_ptr<T> const & p ) noexcept
 {
     return get_deleter<D>( shared_ptr<T>( p ) );
 }
@@ -682,7 +617,7 @@ template<class D, class T> D * get_deleter( local_shared_ptr<T> const & p ) BOOS
 
 template< class T > struct hash;
 
-template< class T > std::size_t hash_value( local_shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template< class T > std::size_t hash_value( local_shared_ptr<T> const & p ) noexcept
 {
     return boost::hash< typename local_shared_ptr<T>::element_type* >()( p.get() );
 }
@@ -691,14 +626,12 @@ template< class T > std::size_t hash_value( local_shared_ptr<T> const & p ) BOOS
 
 // std::hash
 
-#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 namespace std
 {
 
 template<class T> struct hash< ::boost::local_shared_ptr<T> >
 {
-    std::size_t operator()( ::boost::local_shared_ptr<T> const & p ) const BOOST_SP_NOEXCEPT
+    std::size_t operator()( ::boost::local_shared_ptr<T> const & p ) const noexcept
     {
         return std::hash< typename ::boost::local_shared_ptr<T>::element_type* >()( p.get() );
     }
@@ -706,6 +639,4 @@ template<class T> struct hash< ::boost::local_shared_ptr<T> >
 
 } // namespace std
 
-#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 #endif  // #ifndef BOOST_SMART_PTR_LOCAL_SHARED_PTR_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/make_local_shared.hpp b/inst/include/boost/smart_ptr/make_local_shared.hpp
index 2ad55a7df..23114fea2 100644
--- a/inst/include/boost/smart_ptr/make_local_shared.hpp
+++ b/inst/include/boost/smart_ptr/make_local_shared.hpp
@@ -11,7 +11,6 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/make_local_shared_object.hpp>
 #include <boost/smart_ptr/make_local_shared_array.hpp>
 
diff --git a/inst/include/boost/smart_ptr/make_local_shared_array.hpp b/inst/include/boost/smart_ptr/make_local_shared_array.hpp
index 6caf78abc..e9089fd4c 100644
--- a/inst/include/boost/smart_ptr/make_local_shared_array.hpp
+++ b/inst/include/boost/smart_ptr/make_local_shared_array.hpp
@@ -9,14 +9,15 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_MAKE_LOCAL_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_MAKE_LOCAL_SHARED_ARRAY_HPP
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/core/default_allocator.hpp>
 #include <boost/smart_ptr/allocate_local_shared_array.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
+#include <type_traits>
 
 namespace boost {
 
 template<class T>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     local_shared_ptr<T> >::type
 make_local_shared()
 {
@@ -25,16 +26,16 @@ make_local_shared()
 }
 
 template<class T>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     local_shared_ptr<T> >::type
-make_local_shared(const typename remove_extent<T>::type& value)
+make_local_shared(const typename std::remove_extent<T>::type& value)
 {
     return boost::allocate_local_shared<T>(boost::default_allocator<typename
         detail::sp_array_element<T>::type>(), value);
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     local_shared_ptr<T> >::type
 make_local_shared(std::size_t size)
 {
@@ -43,17 +44,17 @@ make_local_shared(std::size_t size)
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     local_shared_ptr<T> >::type
 make_local_shared(std::size_t size,
-    const typename remove_extent<T>::type& value)
+    const typename std::remove_extent<T>::type& value)
 {
     return boost::allocate_local_shared<T>(boost::default_allocator<typename
         detail::sp_array_element<T>::type>(), size, value);
 }
 
 template<class T>
-inline typename enable_if_<is_bounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value,
     local_shared_ptr<T> >::type
 make_local_shared_noinit()
 {
@@ -62,7 +63,7 @@ make_local_shared_noinit()
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     local_shared_ptr<T> >::type
 make_local_shared_noinit(std::size_t size)
 {
diff --git a/inst/include/boost/smart_ptr/make_local_shared_object.hpp b/inst/include/boost/smart_ptr/make_local_shared_object.hpp
index 222668851..21a582c67 100644
--- a/inst/include/boost/smart_ptr/make_local_shared_object.hpp
+++ b/inst/include/boost/smart_ptr/make_local_shared_object.hpp
@@ -11,11 +11,10 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
-#include <boost/type_traits/remove_const.hpp>
 #include <boost/config.hpp>
+#include <type_traits>
 #include <utility>
 #include <cstddef>
 
@@ -46,7 +45,7 @@ template<class T, class A> class lsp_ms_deleter: public local_counted_impl_em
 {
 private:
 
-    typedef typename sp_aligned_storage<sizeof(T), ::boost::alignment_of<T>::value>::type storage_type;
+    typedef typename sp_aligned_storage<sizeof(T), std::alignment_of<T>::value>::type storage_type;
 
     storage_type storage_;
     A a_;
@@ -54,57 +53,49 @@ template<class T, class A> class lsp_ms_deleter: public local_counted_impl_em
 
 private:
 
-    void destroy() BOOST_SP_NOEXCEPT
+    void destroy() noexcept
     {
         if( initialized_ )
         {
             T * p = reinterpret_cast< T* >( storage_.data_ );
 
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
             std::allocator_traits<A>::destroy( a_, p );
 
-#else
-
-            p->~T();
-
-#endif
-
             initialized_ = false;
         }
     }
 
 public:
 
-    explicit lsp_ms_deleter( A const & a ) BOOST_SP_NOEXCEPT : a_( a ), initialized_( false )
+    explicit lsp_ms_deleter( A const & a ) noexcept : a_( a ), initialized_( false )
     {
     }
 
     // optimization: do not copy storage_
-    lsp_ms_deleter( lsp_ms_deleter const & r ) BOOST_SP_NOEXCEPT : a_( r.a_), initialized_( false )
+    lsp_ms_deleter( lsp_ms_deleter const & r ) noexcept : a_( r.a_), initialized_( false )
     {
     }
 
-    ~lsp_ms_deleter() BOOST_SP_NOEXCEPT
+    ~lsp_ms_deleter() noexcept
     {
         destroy();
     }
 
-    void operator()( T * ) BOOST_SP_NOEXCEPT
+    void operator()( T * ) noexcept
     {
         destroy();
     }
 
-    static void operator_fn( T* ) BOOST_SP_NOEXCEPT // operator() can't be static
+    static void operator_fn( T* ) noexcept // operator() can't be static
     {
     }
 
-    void * address() BOOST_SP_NOEXCEPT
+    void * address() noexcept
     {
         return storage_.data_;
     }
 
-    void set_initialized() BOOST_SP_NOEXCEPT
+    void set_initialized() noexcept
     {
         initialized_ = true;
     }
@@ -114,16 +105,8 @@ template<class T, class A> class lsp_ms_deleter: public local_counted_impl_em
 
 template<class T, class A, class... Args> typename boost::detail::lsp_if_not_array<T>::type allocate_local_shared( A const & a, Args&&... args )
 {
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
     typedef typename std::allocator_traits<A>::template rebind_alloc<T> A2;
 
-#else
-
-    typedef typename A::template rebind<T>::other A2;
-
-#endif
-
     A2 a2( a );
 
     typedef boost::detail::lsp_ms_deleter<T, A2> D;
@@ -133,16 +116,8 @@ template<class T, class A, class... Args> typename boost::detail::lsp_if_not_arr
     D * pd = static_cast< D* >( pt._internal_get_untyped_deleter() );
     void * pv = pd->address();
 
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
     std::allocator_traits<A2>::construct( a2, static_cast< T* >( pv ), std::forward<Args>( args )... );
 
-#else
-
-    ::new( pv ) T( std::forward<Args>( args )... );
-
-#endif
-
     pd->set_initialized();
 
     T * pt2 = static_cast< T* >( pv );
@@ -155,16 +130,8 @@ template<class T, class A, class... Args> typename boost::detail::lsp_if_not_arr
 
 template<class T, class A> typename boost::detail::lsp_if_not_array<T>::type allocate_local_shared_noinit( A const & a )
 {
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
     typedef typename std::allocator_traits<A>::template rebind_alloc<T> A2;
 
-#else
-
-    typedef typename A::template rebind<T>::other A2;
-
-#endif
-
     A2 a2( a );
 
     typedef boost::detail::lsp_ms_deleter< T, std::allocator<T> > D;
@@ -188,13 +155,13 @@ template<class T, class A> typename boost::detail::lsp_if_not_array<T>::type all
 
 template<class T, class... Args> typename boost::detail::lsp_if_not_array<T>::type make_local_shared( Args&&... args )
 {
-    typedef typename boost::remove_const<T>::type T2;
+    typedef typename std::remove_const<T>::type T2;
     return boost::allocate_local_shared<T2>( std::allocator<T2>(), std::forward<Args>(args)... );
 }
 
 template<class T> typename boost::detail::lsp_if_not_array<T>::type make_local_shared_noinit()
 {
-    typedef typename boost::remove_const<T>::type T2;
+    typedef typename std::remove_const<T>::type T2;
     return boost::allocate_shared_noinit<T2>( std::allocator<T2>() );
 }
 
diff --git a/inst/include/boost/smart_ptr/make_shared.hpp b/inst/include/boost/smart_ptr/make_shared.hpp
index fd2261bc5..1fdf6d615 100644
--- a/inst/include/boost/smart_ptr/make_shared.hpp
+++ b/inst/include/boost/smart_ptr/make_shared.hpp
@@ -11,12 +11,8 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/make_shared_object.hpp>
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_NO_SFINAE )
-# include <boost/smart_ptr/make_shared_array.hpp>
-# include <boost/smart_ptr/allocate_shared_array.hpp>
-#endif
+#include <boost/smart_ptr/make_shared_array.hpp>
+#include <boost/smart_ptr/allocate_shared_array.hpp>
 
 #endif // #ifndef BOOST_SMART_PTR_MAKE_SHARED_HPP_INCLUDED
diff --git a/inst/include/boost/smart_ptr/make_shared_array.hpp b/inst/include/boost/smart_ptr/make_shared_array.hpp
index 10dfdaa1b..a0aa62b89 100644
--- a/inst/include/boost/smart_ptr/make_shared_array.hpp
+++ b/inst/include/boost/smart_ptr/make_shared_array.hpp
@@ -8,14 +8,15 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/core/default_allocator.hpp>
 #include <boost/smart_ptr/allocate_shared_array.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
+#include <type_traits>
 
 namespace boost {
 
 template<class T>
-inline typename enable_if_<is_bounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value, shared_ptr<T> >::type
 make_shared()
 {
     return boost::allocate_shared<T>(boost::default_allocator<typename
@@ -23,15 +24,15 @@ make_shared()
 }
 
 template<class T>
-inline typename enable_if_<is_bounded_array<T>::value, shared_ptr<T> >::type
-make_shared(const typename remove_extent<T>::type& value)
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value, shared_ptr<T> >::type
+make_shared(const typename std::remove_extent<T>::type& value)
 {
     return boost::allocate_shared<T>(boost::default_allocator<typename
         detail::sp_array_element<T>::type>(), value);
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value, shared_ptr<T> >::type
 make_shared(std::size_t size)
 {
     return boost::allocate_shared<T>(boost::default_allocator<typename
@@ -39,15 +40,15 @@ make_shared(std::size_t size)
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value, shared_ptr<T> >::type
-make_shared(std::size_t size, const typename remove_extent<T>::type& value)
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value, shared_ptr<T> >::type
+make_shared(std::size_t size, const typename std::remove_extent<T>::type& value)
 {
     return boost::allocate_shared<T>(boost::default_allocator<typename
         detail::sp_array_element<T>::type>(), size, value);
 }
 
 template<class T>
-inline typename enable_if_<is_bounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_bounded_array<T>::value, shared_ptr<T> >::type
 make_shared_noinit()
 {
     return boost::allocate_shared_noinit<T>(boost::default_allocator<typename
@@ -55,7 +56,7 @@ make_shared_noinit()
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value, shared_ptr<T> >::type
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value, shared_ptr<T> >::type
 make_shared_noinit(std::size_t size)
 {
     return boost::allocate_shared_noinit<T>(boost::default_allocator<typename
diff --git a/inst/include/boost/smart_ptr/make_shared_object.hpp b/inst/include/boost/smart_ptr/make_shared_object.hpp
index 12a7bac10..cc68ce34d 100644
--- a/inst/include/boost/smart_ptr/make_shared_object.hpp
+++ b/inst/include/boost/smart_ptr/make_shared_object.hpp
@@ -11,21 +11,16 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
-#include <boost/move/core.hpp>
-#include <boost/move/utility_core.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/detail/sp_forward.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
-#include <boost/type_traits/alignment_of.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
+#include <boost/config.hpp>
+#include <utility>
 #include <cstddef>
 #include <new>
+#include <type_traits>
 
 namespace boost
 {
-
 namespace detail
 {
 
@@ -34,7 +29,7 @@ template< std::size_t N, std::size_t A > struct sp_aligned_storage
     union type
     {
         char data_[ N ];
-        typename boost::type_with_alignment< A >::type align_;
+        typename sp_type_with_alignment< A >::type align_;
     };
 };
 
@@ -42,14 +37,14 @@ template< class T > class sp_ms_deleter
 {
 private:
 
-    typedef typename sp_aligned_storage< sizeof( T ), ::boost::alignment_of< T >::value >::type storage_type;
+    typedef typename sp_aligned_storage< sizeof( T ), std::alignment_of< T >::value >::type storage_type;
 
     bool initialized_;
     storage_type storage_;
 
 private:
 
-    void destroy() BOOST_SP_NOEXCEPT
+    void destroy() noexcept
     {
         if( initialized_ )
         {
@@ -71,39 +66,39 @@ template< class T > class sp_ms_deleter
 
 public:
 
-    sp_ms_deleter() BOOST_SP_NOEXCEPT : initialized_( false )
+    sp_ms_deleter() noexcept : initialized_( false )
     {
     }
 
-    template<class A> explicit sp_ms_deleter( A const & ) BOOST_SP_NOEXCEPT : initialized_( false )
+    template<class A> explicit sp_ms_deleter( A const & ) noexcept : initialized_( false )
     {
     }
 
     // optimization: do not copy storage_
-    sp_ms_deleter( sp_ms_deleter const & ) BOOST_SP_NOEXCEPT : initialized_( false )
+    sp_ms_deleter( sp_ms_deleter const & ) noexcept : initialized_( false )
     {
     }
 
-    ~sp_ms_deleter() BOOST_SP_NOEXCEPT
+    ~sp_ms_deleter() noexcept
     {
         destroy();
     }
 
-    void operator()( T * ) BOOST_SP_NOEXCEPT
+    void operator()( T * ) noexcept
     {
         destroy();
     }
 
-    static void operator_fn( T* ) BOOST_SP_NOEXCEPT // operator() can't be static
+    static void operator_fn( T* ) noexcept // operator() can't be static
     {
     }
 
-    void * address() BOOST_SP_NOEXCEPT
+    void * address() noexcept
     {
         return storage_.data_;
     }
 
-    void set_initialized() BOOST_SP_NOEXCEPT
+    void set_initialized() noexcept
     {
         initialized_ = true;
     }
@@ -113,7 +108,7 @@ template< class T, class A > class sp_as_deleter
 {
 private:
 
-    typedef typename sp_aligned_storage< sizeof( T ), ::boost::alignment_of< T >::value >::type storage_type;
+    typedef typename sp_aligned_storage< sizeof( T ), std::alignment_of< T >::value >::type storage_type;
 
     storage_type storage_;
     A a_;
@@ -121,57 +116,49 @@ template< class T, class A > class sp_as_deleter
 
 private:
 
-    void destroy() BOOST_SP_NOEXCEPT
+    void destroy() noexcept
     {
         if( initialized_ )
         {
             T * p = reinterpret_cast< T* >( storage_.data_ );
 
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
             std::allocator_traits<A>::destroy( a_, p );
 
-#else
-
-            p->~T();
-
-#endif
-
             initialized_ = false;
         }
     }
 
 public:
 
-    sp_as_deleter( A const & a ) BOOST_SP_NOEXCEPT : a_( a ), initialized_( false )
+    sp_as_deleter( A const & a ) noexcept : a_( a ), initialized_( false )
     {
     }
 
     // optimization: do not copy storage_
-    sp_as_deleter( sp_as_deleter const & r ) BOOST_SP_NOEXCEPT : a_( r.a_), initialized_( false )
+    sp_as_deleter( sp_as_deleter const & r ) noexcept : a_( r.a_), initialized_( false )
     {
     }
 
-    ~sp_as_deleter() BOOST_SP_NOEXCEPT
+    ~sp_as_deleter() noexcept
     {
         destroy();
     }
 
-    void operator()( T * ) BOOST_SP_NOEXCEPT
+    void operator()( T * ) noexcept
     {
         destroy();
     }
 
-    static void operator_fn( T* ) BOOST_SP_NOEXCEPT // operator() can't be static
+    static void operator_fn( T* ) noexcept // operator() can't be static
     {
     }
 
-    void * address() BOOST_SP_NOEXCEPT
+    void * address() noexcept
     {
         return storage_.data_;
     }
 
-    void set_initialized() BOOST_SP_NOEXCEPT
+    void set_initialized() noexcept
     {
         initialized_ = true;
     }
@@ -182,29 +169,17 @@ template< class T > struct sp_if_not_array
     typedef boost::shared_ptr< T > type;
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T > struct sp_if_not_array< T[] >
 {
 };
 
-#if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
-
 template< class T, std::size_t N > struct sp_if_not_array< T[N] >
 {
 };
 
-#endif
-
-#endif
-
 } // namespace detail
 
-#if !defined( BOOST_NO_FUNCTION_TEMPLATE_ORDERING )
-# define BOOST_SP_MSD( T ) boost::detail::sp_inplace_tag< boost::detail::sp_ms_deleter< T > >()
-#else
-# define BOOST_SP_MSD( T ) boost::detail::sp_ms_deleter< T >()
-#endif
+#define BOOST_SP_MSD( T ) boost::detail::sp_inplace_tag< boost::detail::sp_ms_deleter< T > >()
 
 // _noinit versions
 
@@ -242,9 +217,7 @@ template< class T, class A > typename boost::detail::sp_if_not_array< T >::type
     return boost::shared_ptr< T >( pt, pt2 );
 }
 
-#if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-// Variadic templates, rvalue reference
+//
 
 template< class T, class... Args > typename boost::detail::sp_if_not_array< T >::type make_shared( Args && ... args )
 {
@@ -254,7 +227,7 @@ template< class T, class... Args > typename boost::detail::sp_if_not_array< T >:
 
     void * pv = pd->address();
 
-    ::new( pv ) T( boost::detail::sp_forward<Args>( args )... );
+    ::new( pv ) T( std::forward<Args>( args )... );
     pd->set_initialized();
 
     T * pt2 = static_cast< T* >( pv );
@@ -265,8 +238,6 @@ template< class T, class... Args > typename boost::detail::sp_if_not_array< T >:
 
 template< class T, class A, class... Args > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, Args && ... args )
 {
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
     typedef typename std::allocator_traits<A>::template rebind_alloc<T> A2;
     A2 a2( a );
 
@@ -274,222 +245,10 @@ template< class T, class A, class... Args > typename boost::detail::sp_if_not_ar
 
     boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_inplace_tag<D>(), a2 );
 
-#else
-
-    typedef boost::detail::sp_ms_deleter< T > D;
-
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_inplace_tag<D>(), a );
-
-#endif
-
     D * pd = static_cast< D* >( pt._internal_get_untyped_deleter() );
     void * pv = pd->address();
 
-#if !defined( BOOST_NO_CXX11_ALLOCATOR )
-
-    std::allocator_traits<A2>::construct( a2, static_cast< T* >( pv ), boost::detail::sp_forward<Args>( args )... );
-
-#else
-
-    ::new( pv ) T( boost::detail::sp_forward<Args>( args )... );
-
-#endif
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-#else // !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-// Common zero-argument versions
-
-template< class T > typename boost::detail::sp_if_not_array< T >::type make_shared()
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T();
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A > typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T();
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-// C++03 version
-
-template< class T, class A1 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2, class A3 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3, class A4 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 )
-        );
+    std::allocator_traits<A2>::construct( a2, static_cast< T* >( pv ), std::forward<Args>( args )... );
 
     pd->set_initialized();
 
@@ -499,302 +258,6 @@ typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1
     return boost::shared_ptr< T >( pt, pt2 );
 }
 
-template< class T, class A, class A1, class A2, class A3, class A4 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3, class A4, class A5 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2, class A3, class A4, class A5 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3, class A4, class A5, class A6 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6, BOOST_FWD_REF(A7) a7 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 ),
-        boost::forward<A7>( a7 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6, BOOST_FWD_REF(A7) a7 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 ),
-        boost::forward<A7>( a7 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6, BOOST_FWD_REF(A7) a7, BOOST_FWD_REF(A8) a8 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 ),
-        boost::forward<A7>( a7 ),
-        boost::forward<A8>( a8 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6, BOOST_FWD_REF(A7) a7, BOOST_FWD_REF(A8) a8 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 ),
-        boost::forward<A7>( a7 ),
-        boost::forward<A8>( a8 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 >
-typename boost::detail::sp_if_not_array< T >::type make_shared( BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6, BOOST_FWD_REF(A7) a7, BOOST_FWD_REF(A8) a8, BOOST_FWD_REF(A9) a9 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ) );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 ),
-        boost::forward<A7>( a7 ),
-        boost::forward<A8>( a8 ),
-        boost::forward<A9>( a9 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 >
-typename boost::detail::sp_if_not_array< T >::type allocate_shared( A const & a, BOOST_FWD_REF(A1) a1, BOOST_FWD_REF(A2) a2, BOOST_FWD_REF(A3) a3, BOOST_FWD_REF(A4) a4, BOOST_FWD_REF(A5) a5, BOOST_FWD_REF(A6) a6, BOOST_FWD_REF(A7) a7, BOOST_FWD_REF(A8) a8, BOOST_FWD_REF(A9) a9 )
-{
-    boost::shared_ptr< T > pt( static_cast< T* >( 0 ), BOOST_SP_MSD( T ), a );
-
-    boost::detail::sp_ms_deleter< T > * pd = static_cast<boost::detail::sp_ms_deleter< T > *>( pt._internal_get_untyped_deleter() );
-
-    void * pv = pd->address();
-
-    ::new( pv ) T(
-        boost::forward<A1>( a1 ),
-        boost::forward<A2>( a2 ),
-        boost::forward<A3>( a3 ),
-        boost::forward<A4>( a4 ),
-        boost::forward<A5>( a5 ),
-        boost::forward<A6>( a6 ),
-        boost::forward<A7>( a7 ),
-        boost::forward<A8>( a8 ),
-        boost::forward<A9>( a9 )
-        );
-
-    pd->set_initialized();
-
-    T * pt2 = static_cast< T* >( pv );
-
-    boost::detail::sp_enable_shared_from_this( &pt, pt2, pt2 );
-    return boost::shared_ptr< T >( pt, pt2 );
-}
-
-#endif // !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 #undef BOOST_SP_MSD
 
 } // namespace boost
diff --git a/inst/include/boost/smart_ptr/make_unique.hpp b/inst/include/boost/smart_ptr/make_unique.hpp
index c2c6ef30e..fe7fb3d67 100644
--- a/inst/include/boost/smart_ptr/make_unique.hpp
+++ b/inst/include/boost/smart_ptr/make_unique.hpp
@@ -8,61 +8,55 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_MAKE_UNIQUE_HPP
 #define BOOST_SMART_PTR_MAKE_UNIQUE_HPP
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-#include <boost/type_traits/enable_if.hpp>
-#include <boost/type_traits/is_array.hpp>
-#include <boost/type_traits/is_unbounded_array.hpp>
-#include <boost/type_traits/remove_extent.hpp>
-#include <boost/type_traits/remove_reference.hpp>
+#include <boost/smart_ptr/detail/sp_type_traits.hpp>
 #include <memory>
+#include <type_traits>
 #include <utility>
 
 namespace boost {
 
 template<class T>
-inline typename enable_if_<!is_array<T>::value, std::unique_ptr<T> >::type
+inline typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T> >::type
 make_unique()
 {
     return std::unique_ptr<T>(new T());
 }
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 template<class T, class... Args>
-inline typename enable_if_<!is_array<T>::value, std::unique_ptr<T> >::type
+inline typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T> >::type
 make_unique(Args&&... args)
 {
     return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }
-#endif
 
 template<class T>
-inline typename enable_if_<!is_array<T>::value, std::unique_ptr<T> >::type
-make_unique(typename remove_reference<T>::type&& value)
+inline typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T> >::type
+make_unique(typename std::remove_reference<T>::type&& value)
 {
     return std::unique_ptr<T>(new T(std::move(value)));
 }
 
 template<class T>
-inline typename enable_if_<!is_array<T>::value, std::unique_ptr<T> >::type
+inline typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T> >::type
 make_unique_noinit()
 {
     return std::unique_ptr<T>(new T);
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     std::unique_ptr<T> >::type
 make_unique(std::size_t size)
 {
-    return std::unique_ptr<T>(new typename remove_extent<T>::type[size]());
+    return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
 }
 
 template<class T>
-inline typename enable_if_<is_unbounded_array<T>::value,
+inline typename std::enable_if<detail::sp_is_unbounded_array<T>::value,
     std::unique_ptr<T> >::type
 make_unique_noinit(std::size_t size)
 {
-    return std::unique_ptr<T>(new typename remove_extent<T>::type[size]);
+    return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]);
 }
 
 } /* boost */
diff --git a/inst/include/boost/smart_ptr/owner_equal_to.hpp b/inst/include/boost/smart_ptr/owner_equal_to.hpp
index a43e9545d..b80d035ba 100644
--- a/inst/include/boost/smart_ptr/owner_equal_to.hpp
+++ b/inst/include/boost/smart_ptr/owner_equal_to.hpp
@@ -5,8 +5,6 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/config.hpp>
-
 namespace boost
 {
 
@@ -16,7 +14,7 @@ template<class T = void> struct owner_equal_to
     typedef T first_argument_type;
     typedef T second_argument_type;
 
-    template<class U, class V> bool operator()( U const & u, V const & v ) const BOOST_NOEXCEPT
+    template<class U, class V> bool operator()( U const & u, V const & v ) const noexcept
     {
         return u.owner_equals( v );
     }
diff --git a/inst/include/boost/smart_ptr/owner_hash.hpp b/inst/include/boost/smart_ptr/owner_hash.hpp
index 4378d9170..47aa1b475 100644
--- a/inst/include/boost/smart_ptr/owner_hash.hpp
+++ b/inst/include/boost/smart_ptr/owner_hash.hpp
@@ -5,7 +5,6 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/config.hpp>
 #include <cstddef>
 
 namespace boost
@@ -16,7 +15,7 @@ template<class T> struct owner_hash
     typedef std::size_t result_type;
     typedef T argument_type;
 
-    std::size_t operator()( T const & t ) const BOOST_NOEXCEPT
+    std::size_t operator()( T const & t ) const noexcept
     {
         return t.owner_hash_value();
     }
diff --git a/inst/include/boost/smart_ptr/owner_less.hpp b/inst/include/boost/smart_ptr/owner_less.hpp
index 1c0a7d25b..0c569649a 100644
--- a/inst/include/boost/smart_ptr/owner_less.hpp
+++ b/inst/include/boost/smart_ptr/owner_less.hpp
@@ -14,8 +14,6 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/config.hpp>
-
 namespace boost
 {
 
@@ -25,7 +23,7 @@ template<class T = void> struct owner_less
     typedef T first_argument_type;
     typedef T second_argument_type;
 
-    template<class U, class V> bool operator()( U const & u, V const & v ) const BOOST_NOEXCEPT
+    template<class U, class V> bool operator()( U const & u, V const & v ) const noexcept
     {
         return u.owner_before( v );
     }
diff --git a/inst/include/boost/smart_ptr/scoped_array.hpp b/inst/include/boost/smart_ptr/scoped_array.hpp
index d3c250d07..b04c021da 100644
--- a/inst/include/boost/smart_ptr/scoped_array.hpp
+++ b/inst/include/boost/smart_ptr/scoped_array.hpp
@@ -10,13 +10,11 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
-#include <boost/assert.hpp>
-#include <boost/core/checked_delete.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
-
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
+#include <boost/core/checked_delete.hpp>
+#include <boost/assert.hpp>
+#include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
 
 #include <cstddef>            // for std::ptrdiff_t
@@ -55,14 +53,14 @@ template<class T> class scoped_array // noncopyable
 
     typedef T element_type;
 
-    explicit scoped_array( T * p = 0 ) BOOST_SP_NOEXCEPT : px( p )
+    explicit scoped_array( T * p = 0 ) noexcept : px( p )
     {
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         boost::sp_array_constructor_hook( px );
 #endif
     }
 
-    ~scoped_array() BOOST_SP_NOEXCEPT
+    ~scoped_array() noexcept
     {
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         boost::sp_array_destructor_hook( px );
@@ -83,15 +81,17 @@ template<class T> class scoped_array // noncopyable
         return px[i];
     }
 
-    T * get() const BOOST_SP_NOEXCEPT
+    T * get() const noexcept
     {
         return px;
     }
 
-// implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+    explicit operator bool () const noexcept
+    {
+        return px != 0;
+    }
 
-    void swap(scoped_array & b) BOOST_SP_NOEXCEPT
+    void swap(scoped_array & b) noexcept
     {
         T * tmp = b.px;
         b.px = px;
@@ -99,31 +99,27 @@ template<class T> class scoped_array // noncopyable
     }
 };
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-template<class T> inline bool operator==( scoped_array<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( scoped_array<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator==( boost::detail::sp_nullptr_t, scoped_array<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( std::nullptr_t, scoped_array<T> const & p ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator!=( scoped_array<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( scoped_array<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() != 0;
 }
 
-template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, scoped_array<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( std::nullptr_t, scoped_array<T> const & p ) noexcept
 {
     return p.get() != 0;
 }
 
-#endif
-
-template<class T> inline void swap(scoped_array<T> & a, scoped_array<T> & b) BOOST_SP_NOEXCEPT
+template<class T> inline void swap(scoped_array<T> & a, scoped_array<T> & b) noexcept
 {
     a.swap(b);
 }
diff --git a/inst/include/boost/smart_ptr/scoped_ptr.hpp b/inst/include/boost/smart_ptr/scoped_ptr.hpp
index 27def3b43..6f58e2e91 100644
--- a/inst/include/boost/smart_ptr/scoped_ptr.hpp
+++ b/inst/include/boost/smart_ptr/scoped_ptr.hpp
@@ -10,14 +10,14 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-#include <boost/config.hpp>
-#include <boost/assert.hpp>
-#include <boost/core/checked_delete.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/smart_ptr/detail/deprecated_macros.hpp>
+#include <boost/core/checked_delete.hpp>
+#include <boost/assert.hpp>
 #include <boost/config/workaround.hpp>
+#include <boost/config.hpp>
+#include <cstddef>
 
 #ifndef BOOST_NO_AUTO_PTR
 # include <memory>          // for std::auto_ptr
@@ -63,7 +63,7 @@ template<class T> class scoped_ptr // noncopyable
 
     typedef T element_type;
 
-    explicit scoped_ptr( T * p = 0 ) BOOST_SP_NOEXCEPT : px( p )
+    explicit scoped_ptr( T * p = 0 ) noexcept : px( p )
     {
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         boost::sp_scalar_constructor_hook( px );
@@ -72,7 +72,7 @@ template<class T> class scoped_ptr // noncopyable
 
 #ifndef BOOST_NO_AUTO_PTR
 
-    explicit scoped_ptr( std::auto_ptr<T> p ) BOOST_SP_NOEXCEPT : px( p.release() )
+    explicit scoped_ptr( std::auto_ptr<T> p ) noexcept : px( p.release() )
     {
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         boost::sp_scalar_constructor_hook( px );
@@ -81,7 +81,7 @@ template<class T> class scoped_ptr // noncopyable
 
 #endif
 
-    ~scoped_ptr() BOOST_SP_NOEXCEPT
+    ~scoped_ptr() noexcept
     {
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         boost::sp_scalar_destructor_hook( px );
@@ -107,15 +107,17 @@ template<class T> class scoped_ptr // noncopyable
         return px;
     }
 
-    T * get() const BOOST_SP_NOEXCEPT
+    T * get() const noexcept
     {
         return px;
     }
 
-// implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+    explicit operator bool () const noexcept
+    {
+        return px != 0;
+    }
 
-    void swap(scoped_ptr & b) BOOST_SP_NOEXCEPT
+    void swap(scoped_ptr & b) noexcept
     {
         T * tmp = b.px;
         b.px = px;
@@ -123,38 +125,34 @@ template<class T> class scoped_ptr // noncopyable
     }
 };
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-template<class T> inline bool operator==( scoped_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( scoped_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator==( boost::detail::sp_nullptr_t, scoped_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( std::nullptr_t, scoped_ptr<T> const & p ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator!=( scoped_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( scoped_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() != 0;
 }
 
-template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, scoped_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( std::nullptr_t, scoped_ptr<T> const & p ) noexcept
 {
     return p.get() != 0;
 }
 
-#endif
-
-template<class T> inline void swap(scoped_ptr<T> & a, scoped_ptr<T> & b) BOOST_SP_NOEXCEPT
+template<class T> inline void swap(scoped_ptr<T> & a, scoped_ptr<T> & b) noexcept
 {
     a.swap(b);
 }
 
 // get_pointer(p) is a generic way to say p.get()
 
-template<class T> inline T * get_pointer(scoped_ptr<T> const & p) BOOST_SP_NOEXCEPT
+template<class T> inline T * get_pointer(scoped_ptr<T> const & p) noexcept
 {
     return p.get();
 }
diff --git a/inst/include/boost/smart_ptr/shared_array.hpp b/inst/include/boost/smart_ptr/shared_array.hpp
index 05933e04c..005175b52 100644
--- a/inst/include/boost/smart_ptr/shared_array.hpp
+++ b/inst/include/boost/smart_ptr/shared_array.hpp
@@ -14,24 +14,17 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
-
-#include <boost/config.hpp>   // for broken compiler workarounds
-
-#include <memory>             // TR1 cyclic inclusion fix
-
-#include <boost/assert.hpp>
-#include <boost/core/checked_delete.hpp>
-
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
+#include <boost/core/checked_delete.hpp>
+#include <boost/assert.hpp>
+#include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
 
-#include <cstddef>            // for std::ptrdiff_t
 #include <algorithm>          // for std::swap
 #include <functional>         // for std::less
+#include <cstddef>            // for std::ptrdiff_t
 
 namespace boost
 {
@@ -56,18 +49,14 @@ template<class T> class shared_array
 
     typedef T element_type;
 
-    shared_array() BOOST_SP_NOEXCEPT : px( 0 ), pn()
+    shared_array() noexcept : px( 0 ), pn()
     {
     }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    shared_array( boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT : px( 0 ), pn()
+    shared_array( std::nullptr_t ) noexcept : px( 0 ), pn()
     {
     }
 
-#endif
-
     template<class Y>
     explicit shared_array( Y * p ): px( p ), pn( p, checked_array_deleter<Y>() )
     {
@@ -93,36 +82,23 @@ template<class T> class shared_array
     }
 
 //  generated copy constructor, destructor are fine...
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 // ... except in C++0x, move disables the implicit copy
 
-    shared_array( shared_array const & r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    shared_array( shared_array const & r ) noexcept : px( r.px ), pn( r.pn )
     {
     }
 
-    shared_array( shared_array && r ) BOOST_SP_NOEXCEPT : px( r.px ), pn()
+    shared_array( shared_array && r ) noexcept : px( r.px ), pn()
     {
         pn.swap( r.pn );
         r.px = 0;
     }
 
-#endif
-
     // conversion
 
     template<class Y>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     shared_array( shared_array<Y> const & r, typename boost::detail::sp_enable_if_convertible< Y[], T[] >::type = boost::detail::sp_empty() )
-
-#else
-
-    shared_array( shared_array<Y> const & r )
-
-#endif
-    BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    noexcept : px( r.px ), pn( r.pn )
     {
         boost::detail::sp_assert_convertible< Y[], T[] >();
     }
@@ -130,47 +106,39 @@ template<class T> class shared_array
     // aliasing
 
     template< class Y >
-    shared_array( shared_array<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn( r.pn )
+    shared_array( shared_array<Y> const & r, element_type * p ) noexcept : px( p ), pn( r.pn )
     {
     }
 
     // assignment
 
-    shared_array & operator=( shared_array const & r ) BOOST_SP_NOEXCEPT
+    shared_array & operator=( shared_array const & r ) noexcept
     {
         this_type( r ).swap( *this );
         return *this;
     }
 
-#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1400)
-
     template<class Y>
-    shared_array & operator=( shared_array<Y> const & r ) BOOST_SP_NOEXCEPT
+    shared_array & operator=( shared_array<Y> const & r ) noexcept
     {
         this_type( r ).swap( *this );
         return *this;
     }
 
-#endif
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    shared_array & operator=( shared_array && r ) BOOST_SP_NOEXCEPT
+    shared_array & operator=( shared_array && r ) noexcept
     {
         this_type( static_cast< shared_array && >( r ) ).swap( *this );
         return *this;
     }
 
     template<class Y>
-    shared_array & operator=( shared_array<Y> && r ) BOOST_SP_NOEXCEPT
+    shared_array & operator=( shared_array<Y> && r ) noexcept
     {
         this_type( static_cast< shared_array<Y> && >( r ) ).swap( *this );
         return *this;
     }
 
-#endif
-
-    void reset() BOOST_SP_NOEXCEPT
+    void reset() noexcept
     {
         this_type().swap( *this );
     }
@@ -191,7 +159,7 @@ template<class T> class shared_array
         this_type( p, d, a ).swap( *this );
     }
 
-    template<class Y> void reset( shared_array<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT
+    template<class Y> void reset( shared_array<Y> const & r, element_type * p ) noexcept
     {
         this_type( r, p ).swap( *this );
     }
@@ -203,31 +171,33 @@ template<class T> class shared_array
         return px[i];
     }
     
-    T * get() const BOOST_SP_NOEXCEPT
+    T * get() const noexcept
     {
         return px;
     }
 
-// implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+    explicit operator bool () const noexcept
+    {
+        return px != 0;
+    }
 
-    bool unique() const BOOST_SP_NOEXCEPT
+    bool unique() const noexcept
     {
         return pn.unique();
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return pn.use_count();
     }
 
-    void swap(shared_array<T> & other) BOOST_SP_NOEXCEPT
+    void swap(shared_array<T> & other) noexcept
     {
         std::swap(px, other.px);
         pn.swap(other.pn);
     }
 
-    void * _internal_get_deleter( boost::detail::sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT
+    void * _internal_get_deleter( boost::detail::sp_typeinfo_ const & ti ) const noexcept
     {
         return pn.get_deleter( ti );
     }
@@ -241,51 +211,47 @@ template<class T> class shared_array
 
 };  // shared_array
 
-template<class T> inline bool operator==(shared_array<T> const & a, shared_array<T> const & b) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==(shared_array<T> const & a, shared_array<T> const & b) noexcept
 {
     return a.get() == b.get();
 }
 
-template<class T> inline bool operator!=(shared_array<T> const & a, shared_array<T> const & b) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=(shared_array<T> const & a, shared_array<T> const & b) noexcept
 {
     return a.get() != b.get();
 }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-template<class T> inline bool operator==( shared_array<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( shared_array<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator==( boost::detail::sp_nullptr_t, shared_array<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( std::nullptr_t, shared_array<T> const & p ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator!=( shared_array<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( shared_array<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() != 0;
 }
 
-template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, shared_array<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( std::nullptr_t, shared_array<T> const & p ) noexcept
 {
     return p.get() != 0;
 }
 
-#endif
-
-template<class T> inline bool operator<(shared_array<T> const & a, shared_array<T> const & b) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator<(shared_array<T> const & a, shared_array<T> const & b) noexcept
 {
     return std::less<T*>()(a.get(), b.get());
 }
 
-template<class T> void swap(shared_array<T> & a, shared_array<T> & b) BOOST_SP_NOEXCEPT
+template<class T> void swap(shared_array<T> & a, shared_array<T> & b) noexcept
 {
     a.swap(b);
 }
 
-template< class D, class T > D * get_deleter( shared_array<T> const & p ) BOOST_SP_NOEXCEPT
+template< class D, class T > D * get_deleter( shared_array<T> const & p ) noexcept
 {
     return static_cast< D * >( p._internal_get_deleter( BOOST_SP_TYPEID_(D) ) );
 }
diff --git a/inst/include/boost/smart_ptr/shared_ptr.hpp b/inst/include/boost/smart_ptr/shared_ptr.hpp
index 34e087eb0..b4b6b7a52 100644
--- a/inst/include/boost/smart_ptr/shared_ptr.hpp
+++ b/inst/include/boost/smart_ptr/shared_ptr.hpp
@@ -14,10 +14,8 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
-#include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
 #include <boost/core/checked_delete.hpp>
@@ -35,14 +33,7 @@
 #include <typeinfo>             // for std::bad_cast
 #include <cstddef>              // for std::size_t
 #include <memory>               // for std::auto_ptr
-
-#if !defined(BOOST_NO_IOSTREAM)
-#if !defined(BOOST_NO_IOSFWD)
 #include <iosfwd>               // for std::basic_ostream
-#else
-#include <ostream>
-#endif
-#endif
 
 #if defined( BOOST_SP_DISABLE_DEPRECATED )
 #pragma GCC diagnostic push
@@ -74,24 +65,16 @@ template< class T > struct sp_element
     typedef T type;
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T > struct sp_element< T[] >
 {
     typedef T type;
 };
 
-#if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
-
 template< class T, std::size_t N > struct sp_element< T[N] >
 {
     typedef T type;
 };
 
-#endif
-
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 // sp_dereference, return type of operator*
 
 template< class T > struct sp_dereference
@@ -104,8 +87,6 @@ template<> struct sp_dereference< void >
     typedef void type;
 };
 
-#if !defined(BOOST_NO_CV_VOID_SPECIALIZATIONS)
-
 template<> struct sp_dereference< void const >
 {
     typedef void type;
@@ -121,26 +102,16 @@ template<> struct sp_dereference< void const volatile >
     typedef void type;
 };
 
-#endif // !defined(BOOST_NO_CV_VOID_SPECIALIZATIONS)
-
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T > struct sp_dereference< T[] >
 {
     typedef void type;
 };
 
-#if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
-
 template< class T, std::size_t N > struct sp_dereference< T[N] >
 {
     typedef void type;
 };
 
-#endif
-
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 // sp_member_access, return type of operator->
 
 template< class T > struct sp_member_access
@@ -148,24 +119,16 @@ template< class T > struct sp_member_access
     typedef T * type;
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T > struct sp_member_access< T[] >
 {
     typedef void type;
 };
 
-#if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
-
 template< class T, std::size_t N > struct sp_member_access< T[N] >
 {
     typedef void type;
 };
 
-#endif
-
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 // sp_array_access, return type of operator[]
 
 template< class T > struct sp_array_access
@@ -173,24 +136,16 @@ template< class T > struct sp_array_access
     typedef void type;
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T > struct sp_array_access< T[] >
 {
     typedef T & type;
 };
 
-#if !defined( BOOST_BORLANDC ) || !BOOST_WORKAROUND( BOOST_BORLANDC, < 0x600 )
-
 template< class T, std::size_t N > struct sp_array_access< T[N] >
 {
     typedef T & type;
 };
 
-#endif
-
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 // sp_extent, for operator[] index check
 
 template< class T > struct sp_extent
@@ -198,15 +153,11 @@ template< class T > struct sp_extent
     enum _vt { value = 0 };
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T, std::size_t N > struct sp_extent< T[N] >
 {
     enum _vt { value = N };
 };
 
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 // enable_shared_from_this support
 
 template< class X, class Y, class T > inline void sp_enable_shared_from_this( boost::shared_ptr<X> const * ppx, Y const * py, boost::enable_shared_from_this< T > const * pe )
@@ -240,37 +191,11 @@ inline void sp_enable_shared_from_this( ... )
 
 #endif // _MANAGED
 
-#if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_NO_AUTO_PTR )
-
-// rvalue auto_ptr support based on a technique by Dave Abrahams
-
-template< class T, class R > struct sp_enable_if_auto_ptr
-{
-};
-
-template< class T, class R > struct sp_enable_if_auto_ptr< std::auto_ptr< T >, R >
-{
-    typedef R type;
-}; 
-
-#endif
-
 // sp_assert_convertible
 
-template< class Y, class T > inline void sp_assert_convertible() BOOST_SP_NOEXCEPT
+template< class Y, class T > inline void sp_assert_convertible() noexcept
 {
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
-    // static_assert( sp_convertible< Y, T >::value );
-    typedef char tmp[ sp_convertible< Y, T >::value? 1: -1 ];
-    (void)sizeof( tmp );
-
-#else
-
-    T* p = static_cast< Y* >( 0 );
-    (void)p;
-
-#endif
+    static_assert( sp_convertible< Y, T >::value, "incompatible pointer type" );
 }
 
 // pointer constructor helper
@@ -281,8 +206,6 @@ template< class T, class Y > inline void sp_pointer_construct( boost::shared_ptr
     boost::detail::sp_enable_shared_from_this( ppx, p, p );
 }
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T, class Y > inline void sp_pointer_construct( boost::shared_ptr< T[] > * /*ppx*/, Y * p, boost::detail::shared_count & pn )
 {
     sp_assert_convertible< Y[], T[] >();
@@ -295,8 +218,6 @@ template< class T, std::size_t N, class Y > inline void sp_pointer_construct( bo
     boost::detail::shared_count( p, boost::checked_array_deleter< T >() ).swap( pn );
 }
 
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 // deleter constructor helper
 
 template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr< T > * ppx, Y * p )
@@ -304,8 +225,6 @@ template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr
     boost::detail::sp_enable_shared_from_this( ppx, p, p );
 }
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 template< class T, class Y > inline void sp_deleter_construct( boost::shared_ptr< T[] > * /*ppx*/, Y * /*p*/ )
 {
     sp_assert_convertible< Y[], T[] >();
@@ -316,8 +235,6 @@ template< class T, std::size_t N, class Y > inline void sp_deleter_construct( bo
     sp_assert_convertible< Y[N], T[N] >();
 }
 
-#endif // !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
 struct sp_internal_constructor_tag
 {
 };
@@ -344,30 +261,22 @@ template<class T> class shared_ptr
 
     typedef typename boost::detail::sp_element< T >::type element_type;
 
-    BOOST_CONSTEXPR shared_ptr() BOOST_SP_NOEXCEPT : px( 0 ), pn()
+    constexpr shared_ptr() noexcept : px( 0 ), pn()
     {
     }
 
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    BOOST_CONSTEXPR shared_ptr( boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT : px( 0 ), pn()
+    constexpr shared_ptr( std::nullptr_t ) noexcept : px( 0 ), pn()
     {
     }
 
-#endif
-
-    BOOST_CONSTEXPR shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count const & pn_ ) BOOST_SP_NOEXCEPT : px( px_ ), pn( pn_ )
+    constexpr shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count const & pn_ ) noexcept : px( px_ ), pn( pn_ )
     {
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    BOOST_CONSTEXPR shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count && pn_ ) BOOST_SP_NOEXCEPT : px( px_ ), pn( std::move( pn_ ) )
+    constexpr shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count && pn_ ) noexcept : px( px_ ), pn( std::move( pn_ ) )
     {
     }
 
-#endif
-
     template<class Y>
     explicit shared_ptr( Y * p ): px( p ), pn() // Y must be complete
     {
@@ -380,88 +289,33 @@ template<class T> class shared_ptr
     // shared_ptr will release p by calling d(p)
     //
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y, class D> shared_ptr( Y * p, D d ): px( p ), pn( p, static_cast< D&& >( d ) )
     {
         boost::detail::sp_deleter_construct( this, p );
     }
 
-#else
-
-    template<class Y, class D> shared_ptr( Y * p, D d ): px( p ), pn( p, d )
+    template<class D> shared_ptr( std::nullptr_t p, D d ): px( p ), pn( p, static_cast< D&& >( d ) )
     {
-        boost::detail::sp_deleter_construct( this, p );
     }
 
-#endif
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    template<class D> shared_ptr( boost::detail::sp_nullptr_t p, D d ): px( p ), pn( p, static_cast< D&& >( d ) )
-    {
-    }
-
-#else
-
-    template<class D> shared_ptr( boost::detail::sp_nullptr_t p, D d ): px( p ), pn( p, d )
-    {
-    }
-
-#endif
-
-#endif
-
     // As above, but with allocator. A's copy constructor shall not throw.
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y, class D, class A> shared_ptr( Y * p, D d, A a ): px( p ), pn( p, static_cast< D&& >( d ), a )
     {
         boost::detail::sp_deleter_construct( this, p );
     }
 
-#else
-
-    template<class Y, class D, class A> shared_ptr( Y * p, D d, A a ): px( p ), pn( p, d, a )
-    {
-        boost::detail::sp_deleter_construct( this, p );
-    }
-
-#endif
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    template<class D, class A> shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( p, static_cast< D&& >( d ), a )
+    template<class D, class A> shared_ptr( std::nullptr_t p, D d, A a ): px( p ), pn( p, static_cast< D&& >( d ), a )
     {
     }
 
-#else
-
-    template<class D, class A> shared_ptr( boost::detail::sp_nullptr_t p, D d, A a ): px( p ), pn( p, d, a )
-    {
-    }
-
-#endif
-
-#endif
-
 //  generated copy constructor, destructor are fine...
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 // ... except in C++0x, move disables the implicit copy
 
-    shared_ptr( shared_ptr const & r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    shared_ptr( shared_ptr const & r ) noexcept : px( r.px ), pn( r.pn )
     {
     }
 
-#endif
-
     template<class Y>
     explicit shared_ptr( weak_ptr<Y> const & r ): pn( r.pn ) // may throw
     {
@@ -473,7 +327,7 @@ template<class T> class shared_ptr
 
     template<class Y>
     shared_ptr( weak_ptr<Y> const & r, boost::detail::sp_nothrow_tag )
-    BOOST_SP_NOEXCEPT : px( 0 ), pn( r.pn, boost::detail::sp_nothrow_tag() )
+    noexcept : px( 0 ), pn( r.pn, boost::detail::sp_nothrow_tag() )
     {
         if( !pn.empty() )
         {
@@ -482,23 +336,15 @@ template<class T> class shared_ptr
     }
 
     template<class Y>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     shared_ptr( shared_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() )
-
-#else
-
-    shared_ptr( shared_ptr<Y> const & r )
-
-#endif
-    BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    noexcept : px( r.px ), pn( r.pn )
     {
         boost::detail::sp_assert_convertible< Y, T >();
     }
 
     // aliasing
     template< class Y >
-    shared_ptr( shared_ptr<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn( r.pn )
+    shared_ptr( shared_ptr<Y> const & r, element_type * p ) noexcept : px( p ), pn( r.pn )
     {
     }
 
@@ -515,8 +361,6 @@ template<class T> class shared_ptr
         boost::detail::sp_deleter_construct( this, tmp );
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y>
     shared_ptr( std::auto_ptr<Y> && r ): px(r.get()), pn()
     {
@@ -528,27 +372,8 @@ template<class T> class shared_ptr
         boost::detail::sp_deleter_construct( this, tmp );
     }
 
-#elif !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-    template<class Ap>
-    explicit shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn()
-    {
-        typedef typename Ap::element_type Y;
-
-        boost::detail::sp_assert_convertible< Y, T >();
-
-        Y * tmp = r.get();
-        pn = boost::detail::shared_count( r );
-
-        boost::detail::sp_deleter_construct( this, tmp );
-    }
-
-#endif // BOOST_NO_SFINAE, BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
 #endif // BOOST_NO_AUTO_PTR
 
-#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template< class Y, class D >
     shared_ptr( std::unique_ptr< Y, D > && r ): px( r.get() ), pn()
     {
@@ -563,8 +388,6 @@ template<class T> class shared_ptr
         }
     }
 
-#endif
-
     template< class Y, class D >
     shared_ptr( boost::movelib::unique_ptr< Y, D > r ): px( r.get() ), pn()
     {
@@ -581,23 +404,19 @@ template<class T> class shared_ptr
 
     // assignment
 
-    shared_ptr & operator=( shared_ptr const & r ) BOOST_SP_NOEXCEPT
+    shared_ptr & operator=( shared_ptr const & r ) noexcept
     {
         this_type(r).swap(*this);
         return *this;
     }
 
-#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1400)
-
     template<class Y>
-    shared_ptr & operator=(shared_ptr<Y> const & r) BOOST_SP_NOEXCEPT
+    shared_ptr & operator=(shared_ptr<Y> const & r) noexcept
     {
         this_type(r).swap(*this);
         return *this;
     }
 
-#endif
-
 #ifndef BOOST_NO_AUTO_PTR
 
     template<class Y>
@@ -607,8 +426,6 @@ template<class T> class shared_ptr
         return *this;
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y>
     shared_ptr & operator=( std::auto_ptr<Y> && r )
     {
@@ -616,21 +433,8 @@ template<class T> class shared_ptr
         return *this;
     }
 
-#elif !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
-
-    template<class Ap>
-    typename boost::detail::sp_enable_if_auto_ptr< Ap, shared_ptr & >::type operator=( Ap r )
-    {
-        this_type( r ).swap( *this );
-        return *this;
-    }
-
-#endif // BOOST_NO_SFINAE, BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
 #endif // BOOST_NO_AUTO_PTR
 
-#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y, class D>
     shared_ptr & operator=( std::unique_ptr<Y, D> && r )
     {
@@ -638,8 +442,6 @@ template<class T> class shared_ptr
         return *this;
     }
 
-#endif
-
     template<class Y, class D>
     shared_ptr & operator=( boost::movelib::unique_ptr<Y, D> r )
     {
@@ -666,37 +468,27 @@ template<class T> class shared_ptr
 
 // Move support
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    shared_ptr( shared_ptr && r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) )
+    shared_ptr( shared_ptr && r ) noexcept : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) )
     {
         r.px = 0;
     }
 
     template<class Y>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     shared_ptr( shared_ptr<Y> && r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() )
-
-#else
-
-    shared_ptr( shared_ptr<Y> && r )
-
-#endif
-    BOOST_SP_NOEXCEPT : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) )
+    noexcept : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) )
     {
         boost::detail::sp_assert_convertible< Y, T >();
         r.px = 0;
     }
 
-    shared_ptr & operator=( shared_ptr && r ) BOOST_SP_NOEXCEPT
+    shared_ptr & operator=( shared_ptr && r ) noexcept
     {
         this_type( static_cast< shared_ptr && >( r ) ).swap( *this );
         return *this;
     }
 
     template<class Y>
-    shared_ptr & operator=( shared_ptr<Y> && r ) BOOST_SP_NOEXCEPT
+    shared_ptr & operator=( shared_ptr<Y> && r ) noexcept
     {
         this_type( static_cast< shared_ptr<Y> && >( r ) ).swap( *this );
         return *this;
@@ -704,25 +496,19 @@ template<class T> class shared_ptr
 
     // aliasing move
     template<class Y>
-    shared_ptr( shared_ptr<Y> && r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn()
+    shared_ptr( shared_ptr<Y> && r, element_type * p ) noexcept : px( p ), pn()
     {
         pn.swap( r.pn );
         r.px = 0;
     }
 
-#endif
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-    shared_ptr & operator=( boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+    shared_ptr & operator=( std::nullptr_t ) noexcept
     {
         this_type().swap(*this);
         return *this;
     }
 
-#endif
-
-    void reset() BOOST_SP_NOEXCEPT
+    void reset() noexcept
     {
         this_type().swap(*this);
     }
@@ -733,8 +519,6 @@ template<class T> class shared_ptr
         this_type( p ).swap( *this );
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y, class D> void reset( Y * p, D d )
     {
         this_type( p, static_cast< D&& >( d ) ).swap( *this );
@@ -745,34 +529,16 @@ template<class T> class shared_ptr
         this_type( p, static_cast< D&& >( d ), a ).swap( *this );
     }
 
-#else
-
-    template<class Y, class D> void reset( Y * p, D d )
-    {
-        this_type( p, d ).swap( *this );
-    }
-
-    template<class Y, class D, class A> void reset( Y * p, D d, A a )
-    {
-        this_type( p, d, a ).swap( *this );
-    }
-
-#endif
-
-    template<class Y> void reset( shared_ptr<Y> const & r, element_type * p ) BOOST_SP_NOEXCEPT
+    template<class Y> void reset( shared_ptr<Y> const & r, element_type * p ) noexcept
     {
         this_type( r, p ).swap( *this );
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    template<class Y> void reset( shared_ptr<Y> && r, element_type * p ) BOOST_SP_NOEXCEPT
+    template<class Y> void reset( shared_ptr<Y> && r, element_type * p ) noexcept
     {
         this_type( static_cast< shared_ptr<Y> && >( r ), p ).swap( *this );
     }
 
-#endif
-
     typename boost::detail::sp_dereference< T >::type operator* () const BOOST_SP_NOEXCEPT_WITH_ASSERT
     {
         BOOST_ASSERT( px != 0 );
@@ -793,154 +559,134 @@ template<class T> class shared_ptr
         return static_cast< typename boost::detail::sp_array_access< T >::type >( px[ i ] );
     }
 
-    element_type * get() const BOOST_SP_NOEXCEPT
+    element_type * get() const noexcept
     {
         return px;
     }
 
-// implicit conversion to "bool"
-#include <boost/smart_ptr/detail/operator_bool.hpp>
+    explicit operator bool () const noexcept
+    {
+        return px != 0;
+    }
 
-    bool unique() const BOOST_SP_NOEXCEPT
+    bool unique() const noexcept
     {
         return pn.unique();
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return pn.use_count();
     }
 
-    void swap( shared_ptr & other ) BOOST_SP_NOEXCEPT
+    void swap( shared_ptr & other ) noexcept
     {
         std::swap(px, other.px);
         pn.swap(other.pn);
     }
 
-    template<class Y> bool owner_before( shared_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_before( shared_ptr<Y> const & rhs ) const noexcept
     {
         return pn < rhs.pn;
     }
 
-    template<class Y> bool owner_before( weak_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_before( weak_ptr<Y> const & rhs ) const noexcept
     {
         return pn < rhs.pn;
     }
 
-    template<class Y> bool owner_equals( shared_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_equals( shared_ptr<Y> const & rhs ) const noexcept
     {
         return pn == rhs.pn;
     }
 
-    template<class Y> bool owner_equals( weak_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_equals( weak_ptr<Y> const & rhs ) const noexcept
     {
         return pn == rhs.pn;
     }
 
-    std::size_t owner_hash_value() const BOOST_SP_NOEXCEPT
+    std::size_t owner_hash_value() const noexcept
     {
         return pn.hash_value();
     }
 
-    void * _internal_get_deleter( boost::detail::sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT
+    void * _internal_get_deleter( boost::detail::sp_typeinfo_ const & ti ) const noexcept
     {
         return pn.get_deleter( ti );
     }
 
-    void * _internal_get_local_deleter( boost::detail::sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT
+    void * _internal_get_local_deleter( boost::detail::sp_typeinfo_ const & ti ) const noexcept
     {
         return pn.get_local_deleter( ti );
     }
 
-    void * _internal_get_untyped_deleter() const BOOST_SP_NOEXCEPT
+    void * _internal_get_untyped_deleter() const noexcept
     {
         return pn.get_untyped_deleter();
     }
 
-    bool _internal_equiv( shared_ptr const & r ) const BOOST_SP_NOEXCEPT
+    bool _internal_equiv( shared_ptr const & r ) const noexcept
     {
         return px == r.px && pn == r.pn;
     }
 
-    boost::detail::shared_count _internal_count() const BOOST_SP_NOEXCEPT
+    boost::detail::shared_count _internal_count() const noexcept
     {
         return pn;
     }
 
-// Tasteless as this may seem, making all members public allows member templates
-// to work in the absence of member template friends. (Matthew Langston)
-
-#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-
 private:
 
     template<class Y> friend class shared_ptr;
     template<class Y> friend class weak_ptr;
 
 
-#endif
-
     element_type * px;                 // contained pointer
     boost::detail::shared_count pn;    // reference counter
 
 };  // shared_ptr
 
-template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b) noexcept
 {
     return a.get() == b.get();
 }
 
-template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b) BOOST_SP_NOEXCEPT
-{
-    return a.get() != b.get();
-}
-
-#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-
-// Resolve the ambiguity between our op!= and the one in rel_ops
-
-template<class T> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<T> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b) noexcept
 {
     return a.get() != b.get();
 }
 
-#endif
-
-#if !defined( BOOST_NO_CXX11_NULLPTR )
-
-template<class T> inline bool operator==( shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( shared_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator==( boost::detail::sp_nullptr_t, shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator==( std::nullptr_t, shared_ptr<T> const & p ) noexcept
 {
     return p.get() == 0;
 }
 
-template<class T> inline bool operator!=( shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( shared_ptr<T> const & p, std::nullptr_t ) noexcept
 {
     return p.get() != 0;
 }
 
-template<class T> inline bool operator!=( boost::detail::sp_nullptr_t, shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class T> inline bool operator!=( std::nullptr_t, shared_ptr<T> const & p ) noexcept
 {
     return p.get() != 0;
 }
 
-#endif
-
-template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b) noexcept
 {
     return a.owner_before( b );
 }
 
-template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b) BOOST_SP_NOEXCEPT
+template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b) noexcept
 {
     a.swap(b);
 }
 
-template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> const & r ) noexcept
 {
     (void) static_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -950,7 +696,7 @@ template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> cons
     return shared_ptr<T>( r, p );
 }
 
-template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> const & r ) noexcept
 {
     (void) const_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -960,7 +706,7 @@ template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> const
     return shared_ptr<T>( r, p );
 }
 
-template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> const & r ) noexcept
 {
     (void) dynamic_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -970,7 +716,7 @@ template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> con
     return p? shared_ptr<T>( r, p ): shared_ptr<T>();
 }
 
-template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U> const & r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U> const & r ) noexcept
 {
     (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -980,9 +726,7 @@ template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U>
     return shared_ptr<T>( r, p );
 }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> && r ) noexcept
 {
     (void) static_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -992,7 +736,7 @@ template<class T, class U> shared_ptr<T> static_pointer_cast( shared_ptr<U> && r
     return shared_ptr<T>( std::move(r), p );
 }
 
-template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> && r ) noexcept
 {
     (void) const_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -1002,7 +746,7 @@ template<class T, class U> shared_ptr<T> const_pointer_cast( shared_ptr<U> && r
     return shared_ptr<T>( std::move(r), p );
 }
 
-template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> && r ) noexcept
 {
     (void) dynamic_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -1012,7 +756,7 @@ template<class T, class U> shared_ptr<T> dynamic_pointer_cast( shared_ptr<U> &&
     return p? shared_ptr<T>( std::move(r), p ): shared_ptr<T>();
 }
 
-template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U> && r ) BOOST_SP_NOEXCEPT
+template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U> && r ) noexcept
 {
     (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) );
 
@@ -1022,62 +766,33 @@ template<class T, class U> shared_ptr<T> reinterpret_pointer_cast( shared_ptr<U>
     return shared_ptr<T>( std::move(r), p );
 }
 
-#endif // !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 // get_pointer() enables boost::mem_fn to recognize shared_ptr
 
-template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shared_ptr<T> const & p) BOOST_SP_NOEXCEPT
+template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shared_ptr<T> const & p) noexcept
 {
     return p.get();
 }
 
 // operator<<
 
-#if !defined(BOOST_NO_IOSTREAM)
-
-#if defined(BOOST_NO_TEMPLATED_IOSTREAMS) || ( defined(__GNUC__) &&  (__GNUC__ < 3) )
-
 template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
 {
     os << p.get();
     return os;
 }
 
-#else
-
-// in STLport's no-iostreams mode no iostream symbols can be used
-#ifndef _STLP_NO_IOSTREAMS
-
-# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT)
-// MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL
-using std::basic_ostream;
-template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, shared_ptr<Y> const & p)
-# else
-template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
-# endif
-{
-    os << p.get();
-    return os;
-}
-
-#endif // _STLP_NO_IOSTREAMS
-
-#endif // __GNUC__ < 3
-
-#endif // !defined(BOOST_NO_IOSTREAM)
-
 // get_deleter
 
 namespace detail
 {
 
-template<class D, class T> D * basic_get_deleter( shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class D, class T> D * basic_get_deleter( shared_ptr<T> const & p ) noexcept
 {
     return static_cast<D *>( p._internal_get_deleter(BOOST_SP_TYPEID_(D)) );
 }
 
-template<class D, class T> D * basic_get_local_deleter( D *, shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT;
-template<class D, class T> D const * basic_get_local_deleter( D const *, shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT;
+template<class D, class T> D * basic_get_local_deleter( D *, shared_ptr<T> const & p ) noexcept;
+template<class D, class T> D const * basic_get_local_deleter( D const *, shared_ptr<T> const & p ) noexcept;
 
 class esft2_deleter_wrapper
 {
@@ -1087,16 +802,16 @@ class esft2_deleter_wrapper
 
 public:
 
-    esft2_deleter_wrapper() BOOST_SP_NOEXCEPT
+    esft2_deleter_wrapper() noexcept
     {
     }
 
-    template< class T > void set_deleter( shared_ptr<T> const & deleter ) BOOST_SP_NOEXCEPT
+    template< class T > void set_deleter( shared_ptr<T> const & deleter ) noexcept
     {
         deleter_ = deleter;
     }
 
-    template<typename D> D* get_deleter() const BOOST_SP_NOEXCEPT
+    template<typename D> D* get_deleter() const noexcept
     {
         return boost::detail::basic_get_deleter<D>( deleter_ );
     }
@@ -1110,7 +825,7 @@ class esft2_deleter_wrapper
 
 } // namespace detail
 
-template<class D, class T> D * get_deleter( shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class D, class T> D * get_deleter( shared_ptr<T> const & p ) noexcept
 {
     D * d = boost::detail::basic_get_deleter<D>( p );
 
@@ -1134,34 +849,34 @@ template<class D, class T> D * get_deleter( shared_ptr<T> const & p ) BOOST_SP_N
 
 #if !defined(BOOST_SP_NO_ATOMIC_ACCESS)
 
-template<class T> inline bool atomic_is_lock_free( shared_ptr<T> const * /*p*/ ) BOOST_SP_NOEXCEPT
+template<class T> inline bool atomic_is_lock_free( shared_ptr<T> const * /*p*/ ) noexcept
 {
     return false;
 }
 
-template<class T> shared_ptr<T> atomic_load( shared_ptr<T> const * p ) BOOST_SP_NOEXCEPT
+template<class T> shared_ptr<T> atomic_load( shared_ptr<T> const * p ) noexcept
 {
     boost::detail::spinlock_pool<2>::scoped_lock lock( p );
     return *p;
 }
 
-template<class T, class M> inline shared_ptr<T> atomic_load_explicit( shared_ptr<T> const * p, /*memory_order mo*/ M ) BOOST_SP_NOEXCEPT
+template<class T, class M> inline shared_ptr<T> atomic_load_explicit( shared_ptr<T> const * p, /*memory_order mo*/ M ) noexcept
 {
     return atomic_load( p );
 }
 
-template<class T> void atomic_store( shared_ptr<T> * p, shared_ptr<T> r ) BOOST_SP_NOEXCEPT
+template<class T> void atomic_store( shared_ptr<T> * p, shared_ptr<T> r ) noexcept
 {
     boost::detail::spinlock_pool<2>::scoped_lock lock( p );
     p->swap( r );
 }
 
-template<class T, class M> inline void atomic_store_explicit( shared_ptr<T> * p, shared_ptr<T> r, /*memory_order mo*/ M ) BOOST_SP_NOEXCEPT
+template<class T, class M> inline void atomic_store_explicit( shared_ptr<T> * p, shared_ptr<T> r, /*memory_order mo*/ M ) noexcept
 {
     atomic_store( p, r ); // std::move( r )
 }
 
-template<class T> shared_ptr<T> atomic_exchange( shared_ptr<T> * p, shared_ptr<T> r ) BOOST_SP_NOEXCEPT
+template<class T> shared_ptr<T> atomic_exchange( shared_ptr<T> * p, shared_ptr<T> r ) noexcept
 {
     boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( p );
 
@@ -1172,12 +887,12 @@ template<class T> shared_ptr<T> atomic_exchange( shared_ptr<T> * p, shared_ptr<T
     return r; // return std::move( r )
 }
 
-template<class T, class M> shared_ptr<T> inline atomic_exchange_explicit( shared_ptr<T> * p, shared_ptr<T> r, /*memory_order mo*/ M ) BOOST_SP_NOEXCEPT
+template<class T, class M> shared_ptr<T> inline atomic_exchange_explicit( shared_ptr<T> * p, shared_ptr<T> r, /*memory_order mo*/ M ) noexcept
 {
     return atomic_exchange( p, r ); // std::move( r )
 }
 
-template<class T> bool atomic_compare_exchange( shared_ptr<T> * p, shared_ptr<T> * v, shared_ptr<T> w ) BOOST_SP_NOEXCEPT
+template<class T> bool atomic_compare_exchange( shared_ptr<T> * p, shared_ptr<T> * v, shared_ptr<T> w ) noexcept
 {
     boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( p );
 
@@ -1202,7 +917,7 @@ template<class T> bool atomic_compare_exchange( shared_ptr<T> * p, shared_ptr<T>
     }
 }
 
-template<class T, class M> inline bool atomic_compare_exchange_explicit( shared_ptr<T> * p, shared_ptr<T> * v, shared_ptr<T> w, /*memory_order success*/ M, /*memory_order failure*/ M ) BOOST_SP_NOEXCEPT
+template<class T, class M> inline bool atomic_compare_exchange_explicit( shared_ptr<T> * p, shared_ptr<T> * v, shared_ptr<T> w, /*memory_order success*/ M, /*memory_order failure*/ M ) noexcept
 {
     return atomic_compare_exchange( p, v, w ); // std::move( w )
 }
@@ -1213,7 +928,7 @@ template<class T, class M> inline bool atomic_compare_exchange_explicit( shared_
 
 template< class T > struct hash;
 
-template< class T > std::size_t hash_value( boost::shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template< class T > std::size_t hash_value( boost::shared_ptr<T> const & p ) noexcept
 {
     return boost::hash< typename boost::shared_ptr<T>::element_type* >()( p.get() );
 }
@@ -1222,14 +937,12 @@ template< class T > std::size_t hash_value( boost::shared_ptr<T> const & p ) BOO
 
 // std::hash
 
-#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 namespace std
 {
 
 template<class T> struct hash< ::boost::shared_ptr<T> >
 {
-    std::size_t operator()( ::boost::shared_ptr<T> const & p ) const BOOST_SP_NOEXCEPT
+    std::size_t operator()( ::boost::shared_ptr<T> const & p ) const noexcept
     {
         return std::hash< typename ::boost::shared_ptr<T>::element_type* >()( p.get() );
     }
@@ -1237,8 +950,6 @@ template<class T> struct hash< ::boost::shared_ptr<T> >
 
 } // namespace std
 
-#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 #include <boost/smart_ptr/detail/local_sp_deleter.hpp>
 
 namespace boost
@@ -1247,12 +958,12 @@ namespace boost
 namespace detail
 {
 
-template<class D, class T> D * basic_get_local_deleter( D *, shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class D, class T> D * basic_get_local_deleter( D *, shared_ptr<T> const & p ) noexcept
 {
     return static_cast<D *>( p._internal_get_local_deleter( BOOST_SP_TYPEID_(local_sp_deleter<D>) ) );
 }
 
-template<class D, class T> D const * basic_get_local_deleter( D const *, shared_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template<class D, class T> D const * basic_get_local_deleter( D const *, shared_ptr<T> const & p ) noexcept
 {
     return static_cast<D *>( p._internal_get_local_deleter( BOOST_SP_TYPEID_(local_sp_deleter<D>) ) );
 }
diff --git a/inst/include/boost/smart_ptr/weak_ptr.hpp b/inst/include/boost/smart_ptr/weak_ptr.hpp
index 2022bce8d..61ad97164 100644
--- a/inst/include/boost/smart_ptr/weak_ptr.hpp
+++ b/inst/include/boost/smart_ptr/weak_ptr.hpp
@@ -13,10 +13,8 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
-#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/detail/sp_noexcept.hpp>
 #include <memory>
 #include <cstddef>
 
@@ -34,29 +32,24 @@ template<class T> class weak_ptr
 
     typedef typename boost::detail::sp_element< T >::type element_type;
 
-    BOOST_CONSTEXPR weak_ptr() BOOST_SP_NOEXCEPT : px(0), pn()
+    constexpr weak_ptr() noexcept : px(0), pn()
     {
     }
 
 //  generated copy constructor, assignment, destructor are fine...
-
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
 // ... except in C++0x, move disables the implicit copy
 
-    weak_ptr( weak_ptr const & r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    weak_ptr( weak_ptr const & r ) noexcept : px( r.px ), pn( r.pn )
     {
     }
 
-    weak_ptr & operator=( weak_ptr const & r ) BOOST_SP_NOEXCEPT
+    weak_ptr & operator=( weak_ptr const & r ) noexcept
     {
         px = r.px;
         pn = r.pn;
         return *this;
     }
 
-#endif
-
 //
 //  The "obvious" converting constructor implementation:
 //
@@ -75,33 +68,15 @@ template<class T> class weak_ptr
 //
 
     template<class Y>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     weak_ptr( weak_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() )
-
-#else
-
-    weak_ptr( weak_ptr<Y> const & r )
-
-#endif
-    BOOST_SP_NOEXCEPT : px(r.lock().get()), pn(r.pn)
+    noexcept : px(r.lock().get()), pn(r.pn)
     {
         boost::detail::sp_assert_convertible< Y, T >();
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     weak_ptr( weak_ptr<Y> && r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() )
-
-#else
-
-    weak_ptr( weak_ptr<Y> && r )
-
-#endif
-    BOOST_SP_NOEXCEPT : px( r.lock().get() ), pn( static_cast< boost::detail::weak_count && >( r.pn ) )
+    noexcept : px( r.lock().get() ), pn( static_cast< boost::detail::weak_count && >( r.pn ) )
     {
         boost::detail::sp_assert_convertible< Y, T >();
         r.px = 0;
@@ -109,57 +84,41 @@ template<class T> class weak_ptr
 
     // for better efficiency in the T == Y case
     weak_ptr( weak_ptr && r )
-    BOOST_SP_NOEXCEPT : px( r.px ), pn( static_cast< boost::detail::weak_count && >( r.pn ) )
+    noexcept : px( r.px ), pn( static_cast< boost::detail::weak_count && >( r.pn ) )
     {
         r.px = 0;
     }
 
     // for better efficiency in the T == Y case
-    weak_ptr & operator=( weak_ptr && r ) BOOST_SP_NOEXCEPT
+    weak_ptr & operator=( weak_ptr && r ) noexcept
     {
         this_type( static_cast< weak_ptr && >( r ) ).swap( *this );
         return *this;
     }
 
 
-#endif
-
     template<class Y>
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
-
     weak_ptr( shared_ptr<Y> const & r, typename boost::detail::sp_enable_if_convertible<Y,T>::type = boost::detail::sp_empty() )
-
-#else
-
-    weak_ptr( shared_ptr<Y> const & r )
-
-#endif
-    BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn )
+    noexcept : px( r.px ), pn( r.pn )
     {
         boost::detail::sp_assert_convertible< Y, T >();
     }
 
     // aliasing
-    template<class Y> weak_ptr(shared_ptr<Y> const & r, element_type * p) BOOST_SP_NOEXCEPT: px( p ), pn( r.pn )
+    template<class Y> weak_ptr(shared_ptr<Y> const & r, element_type * p) noexcept: px( p ), pn( r.pn )
     {
     }
 
-    template<class Y> weak_ptr(weak_ptr<Y> const & r, element_type * p) BOOST_SP_NOEXCEPT: px( p ), pn( r.pn )
+    template<class Y> weak_ptr(weak_ptr<Y> const & r, element_type * p) noexcept: px( p ), pn( r.pn )
     {
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
-    template<class Y> weak_ptr(weak_ptr<Y> && r, element_type * p) BOOST_SP_NOEXCEPT: px( p ), pn( std::move( r.pn ) )
+    template<class Y> weak_ptr(weak_ptr<Y> && r, element_type * p) noexcept: px( p ), pn( std::move( r.pn ) )
     {
     }
 
-#endif
-
-#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300)
-
     template<class Y>
-    weak_ptr & operator=( weak_ptr<Y> const & r ) BOOST_SP_NOEXCEPT
+    weak_ptr & operator=( weak_ptr<Y> const & r ) noexcept
     {
         boost::detail::sp_assert_convertible< Y, T >();
 
@@ -169,19 +128,15 @@ template<class T> class weak_ptr
         return *this;
     }
 
-#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
-
     template<class Y>
-    weak_ptr & operator=( weak_ptr<Y> && r ) BOOST_SP_NOEXCEPT
+    weak_ptr & operator=( weak_ptr<Y> && r ) noexcept
     {
         this_type( static_cast< weak_ptr<Y> && >( r ) ).swap( *this );
         return *this;
     }
 
-#endif
-
     template<class Y>
-    weak_ptr & operator=( shared_ptr<Y> const & r ) BOOST_SP_NOEXCEPT
+    weak_ptr & operator=( shared_ptr<Y> const & r ) noexcept
     {
         boost::detail::sp_assert_convertible< Y, T >();
 
@@ -191,92 +146,83 @@ template<class T> class weak_ptr
         return *this;
     }
 
-#endif
-
-    shared_ptr<T> lock() const BOOST_SP_NOEXCEPT
+    shared_ptr<T> lock() const noexcept
     {
         return shared_ptr<T>( *this, boost::detail::sp_nothrow_tag() );
     }
 
-    long use_count() const BOOST_SP_NOEXCEPT
+    long use_count() const noexcept
     {
         return pn.use_count();
     }
 
-    bool expired() const BOOST_SP_NOEXCEPT
+    bool expired() const noexcept
     {
         return pn.use_count() == 0;
     }
 
-    bool _empty() const BOOST_SP_NOEXCEPT // extension, not in std::weak_ptr
+    bool _empty() const noexcept // extension, not in std::weak_ptr
     {
         return pn.empty();
     }
 
-    bool empty() const BOOST_SP_NOEXCEPT // extension, not in std::weak_ptr
+    bool empty() const noexcept // extension, not in std::weak_ptr
     {
         return pn.empty();
     }
 
-    void reset() BOOST_SP_NOEXCEPT
+    void reset() noexcept
     {
         this_type().swap(*this);
     }
 
-    void swap(this_type & other) BOOST_SP_NOEXCEPT
+    void swap(this_type & other) noexcept
     {
         std::swap(px, other.px);
         pn.swap(other.pn);
     }
 
-    template<class Y> bool owner_before( weak_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_before( weak_ptr<Y> const & rhs ) const noexcept
     {
         return pn < rhs.pn;
     }
 
-    template<class Y> bool owner_before( shared_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_before( shared_ptr<Y> const & rhs ) const noexcept
     {
         return pn < rhs.pn;
     }
 
-    template<class Y> bool owner_equals( weak_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_equals( weak_ptr<Y> const & rhs ) const noexcept
     {
         return pn == rhs.pn;
     }
 
-    template<class Y> bool owner_equals( shared_ptr<Y> const & rhs ) const BOOST_SP_NOEXCEPT
+    template<class Y> bool owner_equals( shared_ptr<Y> const & rhs ) const noexcept
     {
         return pn == rhs.pn;
     }
 
-    std::size_t owner_hash_value() const BOOST_SP_NOEXCEPT
+    std::size_t owner_hash_value() const noexcept
     {
         return pn.hash_value();
     }
 
-// Tasteless as this may seem, making all members public allows member templates
-// to work in the absence of member template friends. (Matthew Langston)
-
-#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-
 private:
 
     template<class Y> friend class weak_ptr;
     template<class Y> friend class shared_ptr;
 
-#endif
-
     element_type * px;            // contained pointer
     boost::detail::weak_count pn; // reference counter
 
 };  // weak_ptr
 
-template<class T, class U> inline bool operator<(weak_ptr<T> const & a, weak_ptr<U> const & b) BOOST_SP_NOEXCEPT
+template<class T, class U> inline bool operator<(weak_ptr<T> const & a, weak_ptr<U> const & b) noexcept
 {
     return a.owner_before( b );
 }
 
-template<class T> void swap(weak_ptr<T> & a, weak_ptr<T> & b) BOOST_SP_NOEXCEPT
+template<class T> void swap(weak_ptr<T> & a, weak_ptr<T> & b) noexcept
 {
     a.swap(b);
 }
@@ -289,7 +235,7 @@ template<class T> weak_ptr( shared_ptr<T> ) -> weak_ptr<T>;
 
 // hash_value
 
-template< class T > std::size_t hash_value( boost::weak_ptr<T> const & p ) BOOST_SP_NOEXCEPT
+template< class T > std::size_t hash_value( boost::weak_ptr<T> const & p ) noexcept
 {
     return p.owner_hash_value();
 }
@@ -301,21 +247,17 @@ template< class T > std::size_t hash_value( boost::weak_ptr<T> const & p ) BOOST
 namespace std
 {
 
-#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 template<class T> struct hash< ::boost::weak_ptr<T> >
 {
-    std::size_t operator()( ::boost::weak_ptr<T> const & p ) const BOOST_SP_NOEXCEPT
+    std::size_t operator()( ::boost::weak_ptr<T> const & p ) const noexcept
     {
         return p.owner_hash_value();
     }
 };
 
-#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
-
 template<class T> struct equal_to< ::boost::weak_ptr<T> >
 {
-    bool operator()( ::boost::weak_ptr<T> const & a, ::boost::weak_ptr<T> const & b ) const BOOST_SP_NOEXCEPT
+    bool operator()( ::boost::weak_ptr<T> const & a, ::boost::weak_ptr<T> const & b ) const noexcept
     {
         return a.owner_equals( b );
     }
diff --git a/inst/include/boost/spirit/home/karma/binary/binary.hpp b/inst/include/boost/spirit/home/karma/binary/binary.hpp
index 02418f31b..edc3dc2ee 100644
--- a/inst/include/boost/spirit/home/karma/binary/binary.hpp
+++ b/inst/include/boost/spirit/home/karma/binary/binary.hpp
@@ -22,6 +22,7 @@
 #include <boost/spirit/home/karma/detail/extract_from.hpp>
 #include <boost/spirit/home/support/unused.hpp>
 #include <boost/spirit/home/support/container.hpp>
+#include <boost/core/scoped_enum.hpp>
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/include/at.hpp>
 #include <boost/mpl/or.hpp>
diff --git a/inst/include/boost/spirit/home/x3/operator/sequence.hpp b/inst/include/boost/spirit/home/x3/operator/sequence.hpp
index 9e6e1702f..6557827d6 100644
--- a/inst/include/boost/spirit/home/x3/operator/sequence.hpp
+++ b/inst/include/boost/spirit/home/x3/operator/sequence.hpp
@@ -59,6 +59,7 @@ namespace boost { namespace spirit { namespace x3
 
     template <typename Left, typename Right>
     constexpr auto operator>(Left const& left, Right const& right)
+      -> decltype(left >> expect[right])
     {
         return left >> expect[right];
     }
diff --git a/inst/include/boost/static_string/config.hpp b/inst/include/boost/static_string/config.hpp
index 2217fe8c0..a0f0095f3 100644
--- a/inst/include/boost/static_string/config.hpp
+++ b/inst/include/boost/static_string/config.hpp
@@ -14,6 +14,17 @@
 // Are we dependent on Boost?
 // #define BOOST_STATIC_STRING_STANDALONE
 
+#include <cstdint>
+
+// detect 32/64 bit
+#if UINTPTR_MAX == UINT64_MAX
+#define BOOST_STATIC_STRING_ARCH 64
+#elif UINTPTR_MAX == UINT32_MAX
+#define BOOST_STATIC_STRING_ARCH 32
+#else
+#error Unknown or unsupported architecture, please open an issue
+#endif
+
 // Can we have deduction guides?
 #if __cpp_deduction_guides >= 201703L
 #define BOOST_STATIC_STRING_USE_DEDUCT
@@ -228,6 +239,24 @@ defined(BOOST_STATIC_STRING_CPP14)
 #define BOOST_STATIC_STRING_GCC5_BAD_CONSTEXPR
 #endif
 
+#ifndef BOOST_STATIC_STRING_STANDALONE
+#if ! defined(BOOST_NO_CWCHAR) && ! defined(BOOST_NO_SWPRINTF)
+#define BOOST_STATIC_STRING_HAS_WCHAR
+#endif
+#else
+#ifndef __has_include
+// If we don't have __has_include in standalone,
+// we will assume that <cwchar> exists.
+#define BOOST_STATIC_STRING_HAS_WCHAR
+#elif __has_include(<cwchar>)
+#define BOOST_STATIC_STRING_HAS_WCHAR
+#endif
+#endif
+
+#ifdef BOOST_STATIC_STRING_HAS_WCHAR
+#include <cwchar>
+#endif
+
 // Define the basic string_view type used by the library
 // Conversions to and from other available string_view types
 // are still defined.
diff --git a/inst/include/boost/static_string/static_string.hpp b/inst/include/boost/static_string/static_string.hpp
index def31dce6..325a77420 100644
--- a/inst/include/boost/static_string/static_string.hpp
+++ b/inst/include/boost/static_string/static_string.hpp
@@ -34,7 +34,6 @@
 #include <algorithm>
 #include <cstdint>
 #include <cstdio>
-#include <cwchar>
 #include <functional>
 #include <initializer_list>
 #include <limits>
@@ -58,9 +57,11 @@ template<std::size_t N>
 using static_string =
   basic_static_string<N, char, std::char_traits<char>>;
 
+#ifdef BOOST_STATIC_STRING_HAS_WCHAR
 template<std::size_t N>
 using static_wstring =
   basic_static_string<N, wchar_t, std::char_traits<wchar_t>>;
+#endif
 
 template<std::size_t N>
 using static_u16string =
@@ -145,31 +146,36 @@ struct is_string_like<
 // directly and other convertible types such as std::string.
 // When no string_view type is available, then we check for the
 // data and size member functions, and use them directly for assignments.
-template<typename T, typename CharT, typename Traits, typename = void>
+// Types convertible to basic_static_string are not considered viewable
+// to prevent any ambiguity during overload resolution.
+template<std::size_t N, typename T, typename CharT, typename Traits, typename = void>
 struct enable_if_viewable { };
 
-template<typename T, typename CharT, typename Traits>
-struct enable_if_viewable<T, CharT, Traits,
+template<std::size_t N, typename T, typename CharT, typename Traits>
+struct enable_if_viewable<N, T, CharT, Traits,
     typename std::enable_if<
 #if !defined(BOOST_STATIC_STRING_HAS_ANY_STRING_VIEW)
-        is_string_like<T, CharT>::value
+        is_string_like<T, CharT>::value &&
+        !std::is_convertible<const T&, const basic_static_string<N, CharT, Traits>&>::value
 #elif defined(BOOST_STATIC_STRING_STANDALONE)
         std::is_convertible<const T&, std::basic_string_view<CharT, Traits>>::value &&
-        !std::is_convertible<const T&, const CharT*>::value
+        !std::is_convertible<const T&, const CharT*>::value &&
+        !std::is_convertible<const T&, const basic_static_string<N, CharT, Traits>&>::value
 #else
         (
             std::is_convertible<const T&, basic_string_view<CharT, Traits>>::value ||
             std::is_convertible<const T&, core::basic_string_view<CharT>>::value
         ) &&
-        !std::is_convertible<const T&, const CharT*>::value
+        !std::is_convertible<const T&, const CharT*>::value &&
+        !std::is_convertible<const T&, const basic_static_string<N, CharT, Traits>&>::value
 #endif
     >::type>
 {
   using type = void;
 };
 
-template<typename T, typename CharT, typename Traits>
-using enable_if_viewable_t = typename enable_if_viewable<T, CharT, Traits>::type;
+template<std::size_t N, typename T, typename CharT, typename Traits>
+using enable_if_viewable_t = typename enable_if_viewable<N, T, CharT, Traits>::type;
 
 // The common string_view type used in private operations with enable_if_viewable_t
 // - T const& itself when no string_view type is available
@@ -550,6 +556,7 @@ to_static_string_int_impl(Integer value) noexcept
   return static_string<N>(digits_begin, std::distance(digits_begin, digits_end));
 }
 
+#ifdef BOOST_STATIC_STRING_HAS_WCHAR
 template<std::size_t N, typename Integer>
 inline
 static_wstring<N>
@@ -561,6 +568,7 @@ to_static_wstring_int_impl(Integer value) noexcept
     digits_end, value, std::is_signed<Integer>{});
   return static_wstring<N>(digits_begin, std::distance(digits_begin, digits_end));
 }
+#endif
 
 BOOST_STATIC_STRING_CPP11_CONSTEXPR
 inline
@@ -638,6 +646,7 @@ to_static_string_float_impl(long double value) noexcept
   return static_string<N>(buffer);
 }
 
+#ifdef BOOST_STATIC_STRING_HAS_WCHAR
 template<std::size_t N>
 inline
 static_wstring<N>
@@ -711,6 +720,7 @@ to_static_wstring_float_impl(long double value) noexcept
   // this will not throw
   return static_wstring<N>(buffer);
 }
+#endif
 
 #if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic pop
@@ -1117,7 +1127,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   explicit
@@ -1137,7 +1147,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -1314,7 +1324,8 @@ class basic_static_string
 
       @code
       std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value
       @endcode
 
       @return `*this`
@@ -1325,7 +1336,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -1603,7 +1614,8 @@ class basic_static_string
 
       @code
       std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value
       @endcode
 
       @return `*this`
@@ -1614,7 +1626,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -1648,7 +1660,8 @@ class basic_static_string
 
       @code
       std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value
       @endcode
 
       @return `*this`
@@ -1664,7 +1677,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   basic_static_string&
@@ -2594,7 +2607,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @param index The index to insert at.
       @param t The string to insert from.
@@ -2604,7 +2618,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -2635,7 +2649,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const_pointer>::value`.
+      !std::is_convertible<const T&, const_pointer>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return `*this`
 
@@ -2651,7 +2666,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3006,7 +3021,8 @@ class basic_static_string
 
       @code
       std::is_convertible<T const&, string_view>::value &&
-      !std::is_convertible<T const&, char const*>::value
+      !std::is_convertible<T const&, char const*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value
       @endcode
 
       @return `*this`
@@ -3017,7 +3033,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3043,7 +3059,8 @@ class basic_static_string
 
       @code
       std::is_convertible<T const&, string_view>::value &&
-      !std::is_convertible<T const&, char const*>::value
+      !std::is_convertible<T const&, char const*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value
       @endcode
 
       @return `*this`
@@ -3059,7 +3076,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3181,7 +3198,8 @@ class basic_static_string
 
       @code
       std::is_convertible<T const&, string_view>::value &&
-      !std::is_convertible<T const&, char const*>::value
+      !std::is_convertible<T const&, char const*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value
       @endcode
 
       @return `*this`
@@ -3192,7 +3210,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3440,7 +3458,8 @@ class basic_static_string
 
       @code
       std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const_pointer>::value.
+      !std::is_convertible<const T&, const_pointer>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value.
       @endcode
 
       @return The result of lexicographically comparing `s` and the string.
@@ -3449,7 +3468,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3484,7 +3503,8 @@ class basic_static_string
 
       @code
       std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const_pointer>::value.
+      !std::is_convertible<const T&, const_pointer>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value.
       @endcode
 
       @return The result of lexicographically comparing `s` and `sub`.
@@ -3497,7 +3517,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3535,7 +3555,8 @@ class basic_static_string
 
       @code
       std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const_pointer>::value.
+      !std::is_convertible<const T&, const_pointer>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value.
       @endcode
 
       @return The result of lexicographically comparing `sub1` and `sub2`.
@@ -3552,7 +3573,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3867,7 +3888,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return `*this`
 
@@ -3880,7 +3902,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -3913,7 +3935,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return `*this`
 
@@ -3930,7 +3953,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -4129,7 +4152,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return `*this`
 
@@ -4142,7 +4166,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -4392,7 +4416,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return The lowest index `idx` greater than or equal to `pos`
       where each element of `{sv.begin(), sv.end())` is equal to
@@ -4405,7 +4430,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -4549,7 +4574,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return The highest index `idx` less than or equal to `pos`
       where each element of `{sv.begin(), sv.end())` is equal to
@@ -4562,7 +4588,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -4702,7 +4728,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return The index corrosponding to the first occurrence of
       any of the characters in `{sv.begin(), sv.end())` within
@@ -4714,7 +4741,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -4849,7 +4876,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return The index corrosponding to the last occurrence of
       any of the characters in `{sv.begin(), sv.end())` within
@@ -4861,7 +4889,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -4995,7 +5023,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return The index corrosponding to the first occurrence of
       a character that is not in `{sv.begin(), sv.end())` within
@@ -5007,7 +5036,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5140,7 +5169,8 @@ class basic_static_string
       @par Constraints
 
       `std::is_convertible<const T&, string_view>::value &&
-      !std::is_convertible<const T&, const CharT*>::value`.
+      !std::is_convertible<const T&, const CharT*>::value &&
+      !std::is_convertible<const T&, const basic_static_string&>::value`.
 
       @return The index corrosponding to the last occurrence of
       a character that is not in `{sv.begin(), sv.end())` within
@@ -5152,7 +5182,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-    , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+    , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5284,7 +5314,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-            , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+            , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5348,7 +5378,7 @@ class basic_static_string
   */
   template<typename T
 #ifndef BOOST_STATIC_STRING_DOCS
-            , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+            , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
   >
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5617,7 +5647,7 @@ operator==(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5635,7 +5665,7 @@ operator==(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5679,7 +5709,7 @@ operator!=(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5697,7 +5727,7 @@ operator!=(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5741,7 +5771,7 @@ operator<(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5759,7 +5789,7 @@ operator<(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5803,7 +5833,7 @@ operator<=(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5821,7 +5851,7 @@ operator<=(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5865,7 +5895,7 @@ operator>(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5883,7 +5913,7 @@ operator>(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5928,7 +5958,7 @@ operator>=(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -5946,7 +5976,7 @@ operator>=(
 
 template<std::size_t N, typename CharT, typename Traits, class T
 #ifndef BOOST_STATIC_STRING_DOCS
-      , typename = detail::enable_if_viewable_t<T, CharT, Traits>
+      , typename = detail::enable_if_viewable_t<N, T, CharT, Traits>
 #endif
     >
 BOOST_STATIC_STRING_CPP14_CONSTEXPR
@@ -6202,6 +6232,7 @@ to_static_string(long double value) noexcept
     std::numeric_limits<long double>::max_digits10 + 4>(value);
 }
 
+#ifdef BOOST_STATIC_STRING_HAS_WCHAR
 /// Converts `value` to a `static_wstring`
 static_wstring<std::numeric_limits<int>::digits10 + 2>
 inline
@@ -6282,6 +6313,7 @@ to_static_wstring(long double value) noexcept
   return detail::to_static_wstring_float_impl<
     std::numeric_limits<long double>::max_digits10 + 4>(value);
 }
+#endif
 
 //------------------------------------------------------------------------------
 //
@@ -6322,7 +6354,9 @@ hash_value(
 //------------------------------------------------------------------------------
 
 using static_strings::static_string;
+#ifdef BOOST_STATIC_STRING_HAS_WCHAR
 using static_strings::static_wstring;
+#endif
 using static_strings::static_u16string;
 using static_strings::static_u32string;
 } // boost
@@ -6351,39 +6385,30 @@ struct hash<
     return std::hash<view_type>()(view_type(str.data(), str.size()));
 #else
     std::size_t seed = 0;
-    for (CharT const& c : str) {
-      mix_impl(std::integral_constant<bool, sizeof(std::size_t) >= 8>{}, seed, c);
+    for (CharT const& c : str)
+    {
+#if BOOST_STATIC_STRING_ARCH == 64
+      seed += 0x9e3779b9 + std::hash<CharT>()( c );
+      std::size_t const m = (std::size_t(0xe9846af) << 32) + 0x9b1a615d;
+      seed ^= seed >> 32;
+      seed *= m;
+      seed ^= seed >> 32;
+      seed *= m;
+      seed ^= seed >> 28;
+#elif BOOST_STATIC_STRING_ARCH == 32
+      seed += 0x9e3779b9 + std::hash<CharT>()( c );
+      std::size_t const m1 = 0x21f0aaad;
+      std::size_t const m2 = 0x735a2d97;
+      seed ^= seed >> 16;
+      seed *= m1;
+      seed ^= seed >> 15;
+      seed *= m2;
+      seed ^= seed >> 15;
+#endif
     }
     return seed;
 #endif
   }
-
-  static
-  void
-  mix_impl(std::true_type, std::size_t& seed, CharT c)
-  {
-    seed += 0x9e3779b9 + std::hash<CharT>()( c );
-    std::size_t const m = (std::size_t(0xe9846af) << 32) + 0x9b1a615d;
-    seed ^= seed >> 32;
-    seed *= m;
-    seed ^= seed >> 32;
-    seed *= m;
-    seed ^= seed >> 28;
-  }
-
-  static
-  void
-  mix_impl(std::false_type, std::size_t& seed, CharT c)
-  {
-    seed += 0x9e3779b9 + std::hash<CharT>()( c );
-    std::size_t const m1 = 0x21f0aaad;
-    std::size_t const m2 = 0x735a2d97;
-    seed ^= seed >> 16;
-    seed *= m1;
-    seed ^= seed >> 15;
-    seed *= m2;
-    seed ^= seed >> 15;
-  }
 };
 } // std
 
diff --git a/inst/include/boost/system/detail/config.hpp b/inst/include/boost/system/detail/config.hpp
index 123129141..c231f0de9 100644
--- a/inst/include/boost/system/detail/config.hpp
+++ b/inst/include/boost/system/detail/config.hpp
@@ -8,26 +8,19 @@
 //
 // See http://www.boost.org/libs/system for documentation.
 
-#include <boost/system/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
 
-// BOOST_SYSTEM_HAS_SYSTEM_ERROR
-//
 // The macro BOOST_SYSTEM_DISABLE_THREADS can be defined on configurations
 // that provide <system_error> and <atomic>, but not <mutex>, such as the
 // single-threaded libstdc++.
 //
 // https://github.com/boostorg/system/issues/92
 
-#if !defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR) && !defined(BOOST_NO_CXX11_HDR_ATOMIC) && ( !defined(BOOST_NO_CXX11_HDR_MUTEX) || defined(BOOST_SYSTEM_DISABLE_THREADS) )
-# define BOOST_SYSTEM_HAS_SYSTEM_ERROR
-#endif
-
 // BOOST_SYSTEM_NOEXCEPT
 // Retained for backward compatibility
 
-#define BOOST_SYSTEM_NOEXCEPT BOOST_NOEXCEPT
+#define BOOST_SYSTEM_NOEXCEPT noexcept
 
 // BOOST_SYSTEM_HAS_CONSTEXPR
 
diff --git a/inst/include/boost/system/detail/enable_if.hpp b/inst/include/boost/system/detail/enable_if.hpp
index 7f3d70bae..5e78c4887 100644
--- a/inst/include/boost/system/detail/enable_if.hpp
+++ b/inst/include/boost/system/detail/enable_if.hpp
@@ -5,28 +5,19 @@
 // Distributed under the Boost Software License, Version 1.0
 // http://www.boost.org/LICENSE_1_0.txt
 
+#include <type_traits>
+
 namespace boost
 {
-
 namespace system
 {
-
 namespace detail
 {
 
-template<bool C, class T = void> struct enable_if
-{
-    typedef T type;
-};
-
-template<class T> struct enable_if<false, T>
-{
-};
+using std::enable_if;
 
 } // namespace detail
-
 } // namespace system
-
 } // namespace boost
 
 #endif // #ifndef BOOST_SYSTEM_DETAIL_ENABLE_IF_HPP_INCLUDED
diff --git a/inst/include/boost/system/detail/error_category.hpp b/inst/include/boost/system/detail/error_category.hpp
index 7c2e6dcdb..a13321114 100644
--- a/inst/include/boost/system/detail/error_category.hpp
+++ b/inst/include/boost/system/detail/error_category.hpp
@@ -17,11 +17,8 @@
 #include <string>
 #include <functional>
 #include <cstddef>
-
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-# include <system_error>
-# include <atomic>
-#endif
+#include <system_error>
+#include <atomic>
 
 namespace boost
 {
@@ -64,20 +61,11 @@ class BOOST_SYMBOL_VISIBLE error_category
     friend class error_code;
     friend class error_condition;
 
-#if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
 public:
 
     error_category( error_category const & ) = delete;
     error_category& operator=( error_category const & ) = delete;
 
-#else
-private:
-
-    error_category( error_category const & );
-    error_category& operator=( error_category const & );
-
-#endif
-
 private:
 
     boost::ulong_long_type id_;
@@ -90,75 +78,47 @@ class BOOST_SYMBOL_VISIBLE error_category
         void const* stdcat_align_;
     };
 
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
     mutable std::atomic< unsigned > sc_init_;
 
-#else
-
-    unsigned sc_init_;
-
-#endif
-
 protected:
 
-#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS)
-
     ~error_category() = default;
 
-#else
-
-    // We'd like to make the destructor protected, to make code that deletes
-    // an error_category* not compile; unfortunately, doing the below makes
-    // the destructor user-provided and hence breaks use after main, as the
-    // categories may get destroyed before code that uses them
-
-    // ~error_category() {}
-
-#endif
-
-#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
-    BOOST_CONSTEXPR
-#endif
-    error_category() BOOST_NOEXCEPT: id_( 0 ), stdcat_(), sc_init_()
+    constexpr error_category() noexcept: id_( 0 ), stdcat_(), sc_init_()
     {
     }
 
-    explicit
-#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
-    BOOST_CONSTEXPR
-#endif
-    error_category( boost::ulong_long_type id ) BOOST_NOEXCEPT: id_( id ), stdcat_(), sc_init_()
+    explicit constexpr error_category( boost::ulong_long_type id ) noexcept: id_( id ), stdcat_(), sc_init_()
     {
     }
 
 public:
 
-    virtual const char * name() const BOOST_NOEXCEPT = 0;
+    virtual const char * name() const noexcept = 0;
 
-    virtual error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT;
-    virtual bool equivalent( int code, const error_condition & condition ) const BOOST_NOEXCEPT;
-    virtual bool equivalent( const error_code & code, int condition ) const BOOST_NOEXCEPT;
+    virtual error_condition default_error_condition( int ev ) const noexcept;
+    virtual bool equivalent( int code, const error_condition & condition ) const noexcept;
+    virtual bool equivalent( const error_code & code, int condition ) const noexcept;
 
     virtual std::string message( int ev ) const = 0;
-    virtual char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT;
+    virtual char const * message( int ev, char * buffer, std::size_t len ) const noexcept;
 
-    virtual bool failed( int ev ) const BOOST_NOEXCEPT
+    virtual bool failed( int ev ) const noexcept
     {
         return ev != 0;
     }
 
-    friend BOOST_SYSTEM_CONSTEXPR bool operator==( error_category const & lhs, error_category const & rhs ) BOOST_NOEXCEPT
+    friend BOOST_SYSTEM_CONSTEXPR bool operator==( error_category const & lhs, error_category const & rhs ) noexcept
     {
         return rhs.id_ == 0? &lhs == &rhs: lhs.id_ == rhs.id_;
     }
 
-    friend BOOST_SYSTEM_CONSTEXPR bool operator!=( error_category const & lhs, error_category const & rhs ) BOOST_NOEXCEPT
+    friend BOOST_SYSTEM_CONSTEXPR bool operator!=( error_category const & lhs, error_category const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-    friend BOOST_SYSTEM_CONSTEXPR bool operator<( error_category const & lhs, error_category const & rhs ) BOOST_NOEXCEPT
+    friend BOOST_SYSTEM_CONSTEXPR bool operator<( error_category const & lhs, error_category const & rhs ) noexcept
     {
         if( lhs.id_ < rhs.id_ )
         {
@@ -178,8 +138,6 @@ class BOOST_SYMBOL_VISIBLE error_category
         return std::less<error_category const *>()( &lhs, &rhs );
     }
 
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
     void init_stdcat() const;
 
 # if defined(__SUNPRO_CC) // trailing __global is not supported
@@ -187,8 +145,6 @@ class BOOST_SYMBOL_VISIBLE error_category
 # else
     operator std::error_category const & () const BOOST_SYMBOL_VISIBLE;
 # endif
-
-#endif
 };
 
 #if defined(BOOST_MSVC) && BOOST_MSVC < 1900
diff --git a/inst/include/boost/system/detail/error_category_impl.hpp b/inst/include/boost/system/detail/error_category_impl.hpp
index 1c9293894..94f4f8434 100644
--- a/inst/include/boost/system/detail/error_category_impl.hpp
+++ b/inst/include/boost/system/detail/error_category_impl.hpp
@@ -26,22 +26,22 @@ namespace system
 
 // error_category default implementation
 
-inline error_condition error_category::default_error_condition( int ev ) const BOOST_NOEXCEPT
+inline error_condition error_category::default_error_condition( int ev ) const noexcept
 {
     return error_condition( ev, *this );
 }
 
-inline bool error_category::equivalent( int code, const error_condition & condition ) const BOOST_NOEXCEPT
+inline bool error_category::equivalent( int code, const error_condition & condition ) const noexcept
 {
     return default_error_condition( code ) == condition;
 }
 
-inline bool error_category::equivalent( const error_code & code, int condition ) const BOOST_NOEXCEPT
+inline bool error_category::equivalent( const error_code & code, int condition ) const noexcept
 {
     return code.equals( condition, *this );
 }
 
-inline char const * error_category::message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT
+inline char const * error_category::message( int ev, char * buffer, std::size_t len ) const noexcept
 {
     if( len == 0 )
     {
@@ -58,27 +58,7 @@ inline char const * error_category::message( int ev, char * buffer, std::size_t
     try
 #endif
     {
-        std::string m = this->message( ev );
-
-# if defined( BOOST_MSVC )
-#  pragma warning( push )
-#  pragma warning( disable: 4996 )
-# elif defined(__clang__) && defined(__has_warning)
-#  pragma clang diagnostic push
-#  if __has_warning("-Wdeprecated-declarations")
-        //#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#  endif
-# endif
-
-        std::strncpy( buffer, m.c_str(), len - 1 );
-        buffer[ len-1 ] = 0;
-
-# if defined( BOOST_MSVC )
-#  pragma warning( pop )
-# elif defined(__clang__) && defined(__has_warning)
-#  pragma clang diagnostic pop
-# endif
-
+        detail::snprintf( buffer, len, "%s", this->message( ev ).c_str() );
         return buffer;
     }
 #if !defined(BOOST_NO_EXCEPTIONS)
@@ -95,8 +75,6 @@ inline char const * error_category::message( int ev, char * buffer, std::size_t
 
 // interoperability with std::error_code, std::error_condition
 
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
 #include <boost/system/detail/std_category_impl.hpp>
 #include <boost/system/detail/mutex.hpp>
 #include <new>
@@ -185,6 +163,4 @@ inline BOOST_NOINLINE error_category::operator std::error_category const & () co
 } // namespace system
 } // namespace boost
 
-#endif // #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
 #endif // #ifndef BOOST_SYSTEM_DETAIL_ERROR_CATEGORY_IMPL_HPP_INCLUDED
diff --git a/inst/include/boost/system/detail/error_code.hpp b/inst/include/boost/system/detail/error_code.hpp
index c8573109a..2a3f81e54 100644
--- a/inst/include/boost/system/detail/error_code.hpp
+++ b/inst/include/boost/system/detail/error_code.hpp
@@ -21,11 +21,7 @@
 #include <boost/system/detail/append_int.hpp>
 #include <boost/system/detail/snprintf.hpp>
 #include <boost/system/detail/config.hpp>
-
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-# include <boost/system/detail/std_category.hpp>
-#endif
-
+#include <boost/system/detail/std_category.hpp>
 #include <boost/assert/source_location.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/config.hpp>
@@ -33,10 +29,7 @@
 #include <ostream>
 #include <new>
 #include <cstdio>
-
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-# include <system_error>
-#endif
+#include <system_error>
 
 #if defined(BOOST_GCC) && BOOST_GCC >= 40600 && BOOST_GCC < 70000
 # pragma GCC diagnostic push
@@ -58,14 +51,14 @@ namespace system
 //  and error_code containing a pointer to an object of a type derived
 //  from error_category.
 
-bool operator==( const error_code & code, const error_condition & condition ) BOOST_NOEXCEPT;
+bool operator==( const error_code & code, const error_condition & condition ) noexcept;
 std::size_t hash_value( error_code const & ec );
 
 class error_code
 {
 private:
 
-    friend bool operator==( const error_code & code, const error_condition & condition ) BOOST_NOEXCEPT;
+    friend bool operator==( const error_code & code, const error_condition & condition ) noexcept;
     friend std::size_t hash_value( error_code const & ec );
 
 private:
@@ -79,9 +72,7 @@ class error_code
     union
     {
         data d1_;
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
         unsigned char d2_[ sizeof(std::error_code) ];
-#endif
     };
 
     // 0: default constructed, d1_ value initialized
@@ -93,7 +84,7 @@ class error_code
 
 private:
 
-    char const* category_name() const BOOST_NOEXCEPT
+    char const* category_name() const noexcept
     {
         // return category().name();
 
@@ -117,22 +108,19 @@ class error_code
 
     // constructors:
 
-#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
-    BOOST_CONSTEXPR
-#endif
-    error_code() BOOST_NOEXCEPT:
+    constexpr error_code() noexcept:
         d1_(), lc_flags_( 0 )
     {
     }
 
-    BOOST_SYSTEM_CONSTEXPR error_code( int val, const error_category & cat ) BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR error_code( int val, const error_category & cat ) noexcept:
         d1_(), lc_flags_( 2 + detail::failed_impl( val, cat ) )
     {
         d1_.val_ = val;
         d1_.cat_ = &cat;
     }
 
-    error_code( int val, const error_category & cat, source_location const * loc ) BOOST_NOEXCEPT:
+    error_code( int val, const error_category & cat, source_location const * loc ) noexcept:
         d1_(), lc_flags_( ( loc? reinterpret_cast<boost::uintptr_t>( loc ): 2 ) | +detail::failed_impl( val, cat ) )
     {
         d1_.val_ = val;
@@ -142,15 +130,13 @@ class error_code
     template<class ErrorCodeEnum> BOOST_SYSTEM_CONSTEXPR error_code( ErrorCodeEnum e,
         typename detail::enable_if<
             is_error_code_enum<ErrorCodeEnum>::value
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
             || std::is_error_code_enum<ErrorCodeEnum>::value
-#endif
-        >::type* = 0 ) BOOST_NOEXCEPT: d1_(), lc_flags_( 0 )
+        >::type* = 0 ) noexcept: d1_(), lc_flags_( 0 )
     {
         *this = make_error_code( e );
     }
 
-    error_code( error_code const& ec, source_location const * loc ) BOOST_NOEXCEPT:
+    error_code( error_code const& ec, source_location const * loc ) noexcept:
         d1_(), lc_flags_( 0 )
     {
         *this = ec;
@@ -161,9 +147,7 @@ class error_code
         }
     }
 
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
-    error_code( std::error_code const& ec ) BOOST_NOEXCEPT:
+    error_code( std::error_code const& ec ) noexcept:
         d1_(), lc_flags_( 0 )
     {
 #ifndef BOOST_NO_RTTI
@@ -181,41 +165,39 @@ class error_code
         }
     }
 
-#endif
-
     // modifiers:
 
-    BOOST_SYSTEM_CONSTEXPR void assign( int val, const error_category & cat ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR void assign( int val, const error_category & cat ) noexcept
     {
         *this = error_code( val, cat );
     }
 
-    void assign( int val, const error_category & cat, source_location const * loc ) BOOST_NOEXCEPT
+    void assign( int val, const error_category & cat, source_location const * loc ) noexcept
     {
         *this = error_code( val, cat, loc );
     }
 
-    void assign( error_code const& ec, source_location const * loc ) BOOST_NOEXCEPT
+    void assign( error_code const& ec, source_location const * loc ) noexcept
     {
         *this = error_code( ec, loc );
     }
 
     template<typename ErrorCodeEnum>
         BOOST_SYSTEM_CONSTEXPR typename detail::enable_if<is_error_code_enum<ErrorCodeEnum>::value, error_code>::type &
-        operator=( ErrorCodeEnum val ) BOOST_NOEXCEPT
+        operator=( ErrorCodeEnum val ) noexcept
     {
         *this = make_error_code( val );
         return *this;
     }
 
-    BOOST_SYSTEM_CONSTEXPR void clear() BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR void clear() noexcept
     {
         *this = error_code();
     }
 
     // observers:
 
-    BOOST_SYSTEM_CONSTEXPR int value() const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR int value() const noexcept
     {
         if( lc_flags_ != 1 )
         {
@@ -223,22 +205,16 @@ class error_code
         }
         else
         {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
             std::error_code const& ec = *reinterpret_cast<std::error_code const*>( d2_ );
 
             unsigned cv = static_cast<unsigned>( ec.value() );
             unsigned ch = static_cast<unsigned>( reinterpret_cast<boost::uintptr_t>( &ec.category() ) % 2097143 ); // 2^21-9, prime
 
             return static_cast<int>( cv + 1000 * ch );
-#else
-
-            return -1;
-#endif
         }
     }
 
-    BOOST_SYSTEM_CONSTEXPR const error_category & category() const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR const error_category & category() const noexcept
     {
         if( lc_flags_ == 0 )
         {
@@ -255,24 +231,19 @@ class error_code
     }
 
     // deprecated?
-    error_condition default_error_condition() const BOOST_NOEXCEPT
+    error_condition default_error_condition() const noexcept
     {
         return category().default_error_condition( value() );
     }
 
     std::string message() const
     {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
         if( lc_flags_ == 1 )
         {
             std::error_code const& ec = *reinterpret_cast<std::error_code const*>( d2_ );
             return ec.message();
         }
-
-#endif
-
-        if( lc_flags_ == 0 )
+        else if( lc_flags_ == 0 )
         {
             return detail::system_error_category_message( value() );
         }
@@ -282,9 +253,8 @@ class error_code
         }
     }
 
-    char const * message( char * buffer, std::size_t len ) const BOOST_NOEXCEPT
+    char const * message( char * buffer, std::size_t len ) const noexcept
     {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
         if( lc_flags_ == 1 )
         {
             std::error_code const& ec = *reinterpret_cast<std::error_code const*>( d2_ );
@@ -304,9 +274,7 @@ class error_code
             }
 #endif
         }
-#endif
-
-        if( lc_flags_ == 0 )
+        else if( lc_flags_ == 0 )
         {
             return detail::system_error_category_message( value(), buffer, len );
         }
@@ -316,17 +284,16 @@ class error_code
         }
     }
 
-    BOOST_SYSTEM_CONSTEXPR bool failed() const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR bool failed() const noexcept
     {
         if( lc_flags_ & 1 )
         {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
             if( lc_flags_ == 1 )
             {
                 std::error_code const& ec = *reinterpret_cast<std::error_code const*>( d2_ );
                 return ec.value() != 0;
             }
-#endif
+
             return true;
         }
         else
@@ -335,36 +302,17 @@ class error_code
         }
     }
 
-#if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
-
-    BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT  // true if error
+    BOOST_SYSTEM_CONSTEXPR explicit operator bool() const noexcept  // true if error
     {
         return failed();
     }
 
-#else
-
-    typedef void (*unspecified_bool_type)();
-    static void unspecified_bool_true() {}
-
-    BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const  BOOST_NOEXCEPT // true if error
-    {
-        return failed()? unspecified_bool_true: 0;
-    }
-
-    BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT // true if no error
-    {
-        return !failed();
-    }
-
-#endif
-
-    bool has_location() const BOOST_NOEXCEPT
+    bool has_location() const noexcept
     {
         return lc_flags_ >= 4;
     }
 
-    source_location const & location() const BOOST_NOEXCEPT
+    source_location const & location() const noexcept
     {
         BOOST_STATIC_CONSTEXPR source_location loc;
         return lc_flags_ >= 4? *reinterpret_cast<source_location const*>( lc_flags_ &~ static_cast<boost::uintptr_t>( 1 ) ): loc;
@@ -378,7 +326,7 @@ class error_code
 
     friend class error_category;
 
-    BOOST_SYSTEM_CONSTEXPR bool equals( int val, error_category const& cat ) const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR bool equals( int val, error_category const& cat ) const noexcept
     {
         if( lc_flags_ == 0 )
         {
@@ -399,10 +347,8 @@ class error_code
     //  the more symmetrical non-member syntax allows enum
     //  conversions work for both rhs and lhs.
 
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( const error_code & lhs, const error_code & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( const error_code & lhs, const error_code & rhs ) noexcept
     {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
         bool s1 = lhs.lc_flags_ == 1;
         bool s2 = rhs.lc_flags_ == 1;
 
@@ -416,16 +362,13 @@ class error_code
             return e1 == e2;
         }
         else
-#endif
         {
             return lhs.value() == rhs.value() && lhs.category() == rhs.category();
         }
     }
 
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator<( const error_code & lhs, const error_code & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator<( const error_code & lhs, const error_code & rhs ) noexcept
     {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
         bool s1 = lhs.lc_flags_ == 1;
         bool s2 = rhs.lc_flags_ == 1;
 
@@ -440,35 +383,32 @@ class error_code
             return e1 < e2;
         }
         else
-#endif
         {
             return lhs.category() < rhs.category() || (lhs.category() == rhs.category() && lhs.value() < rhs.value());
         }
     }
 
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( const error_code & lhs, const error_code & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( const error_code & lhs, const error_code & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
-    inline friend bool operator==( std::error_code const & lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( std::error_code const & lhs, error_code const & rhs ) noexcept
     {
         return lhs == static_cast< std::error_code >( rhs );
     }
 
-    inline friend bool operator==( error_code const & lhs, std::error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( error_code const & lhs, std::error_code const & rhs ) noexcept
     {
         return static_cast< std::error_code >( lhs ) == rhs;
     }
 
-    inline friend bool operator!=( std::error_code const & lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( std::error_code const & lhs, error_code const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-    inline friend bool operator!=( error_code const & lhs, std::error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( error_code const & lhs, std::error_code const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
@@ -476,25 +416,25 @@ class error_code
     //
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    inline friend bool operator==( error_code const & lhs, E rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( error_code const & lhs, E rhs ) noexcept
     {
         return lhs == make_error_condition( rhs );
     }
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    inline friend bool operator==( E lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( E lhs, error_code const & rhs ) noexcept
     {
         return make_error_condition( lhs ) == rhs;
     }
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    inline friend bool operator!=( error_code const & lhs, E rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( error_code const & lhs, E rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    inline friend bool operator!=( E lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( E lhs, error_code const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
@@ -502,47 +442,47 @@ class error_code
     //
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( error_code const & lhs, E rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( error_code const & lhs, E rhs ) noexcept
     {
         return lhs == make_error_code( rhs );
     }
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( E lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( E lhs, error_code const & rhs ) noexcept
     {
         return make_error_code( lhs ) == rhs;
     }
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( error_code const & lhs, E rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( error_code const & lhs, E rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( E lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( E lhs, error_code const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
 #if defined(BOOST_SYSTEM_CLANG_6)
 
-    inline friend bool operator==( error_code const & lhs, std::error_condition const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( error_code const & lhs, std::error_condition const & rhs ) noexcept
     {
         return static_cast< std::error_code >( lhs ) == rhs;
     }
 
-    inline friend bool operator==( std::error_condition const & lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( std::error_condition const & lhs, error_code const & rhs ) noexcept
     {
         return lhs == static_cast< std::error_code >( rhs );
     }
 
-    inline friend bool operator!=( error_code const & lhs, std::error_condition const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( error_code const & lhs, std::error_condition const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-    inline friend bool operator!=( std::error_condition const & lhs, error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( std::error_condition const & lhs, error_code const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
@@ -601,14 +541,10 @@ class error_code
       class E = typename std::enable_if<std::is_same<T, std::error_code>::value>::type>
       operator T const& () = delete;
 
-#endif
-
 #endif
 
     std::string to_string() const
     {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
         if( lc_flags_ == 1 )
         {
             std::error_code const& e2 = *reinterpret_cast<std::error_code const*>( d2_ );
@@ -620,7 +556,6 @@ class error_code
             return r;
         }
         else
-#endif
         {
             std::string r = category_name();
             detail::append_int( r, value() );
@@ -653,49 +588,41 @@ class error_code
     }
 };
 
-inline bool operator==( const error_code & code, const error_condition & condition ) BOOST_NOEXCEPT
+inline bool operator==( const error_code & code, const error_condition & condition ) noexcept
 {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
     if( code.lc_flags_ == 1 )
     {
         return static_cast<std::error_code>( code ) == static_cast<std::error_condition>( condition );
     }
     else
-
-#endif
     {
         return code.category().equivalent( code.value(), condition ) || condition.category().equivalent( code, condition.value() );
     }
 }
 
-inline bool operator==( const error_condition & condition, const error_code & code ) BOOST_NOEXCEPT
+inline bool operator==( const error_condition & condition, const error_code & code ) noexcept
 {
     return code == condition;
 }
 
-inline bool operator!=( const error_code & lhs, const error_condition & rhs ) BOOST_NOEXCEPT
+inline bool operator!=( const error_code & lhs, const error_condition & rhs ) noexcept
 {
     return !( lhs == rhs );
 }
 
-inline bool operator!=( const error_condition & lhs, const error_code & rhs ) BOOST_NOEXCEPT
+inline bool operator!=( const error_condition & lhs, const error_code & rhs ) noexcept
 {
     return !( lhs == rhs );
 }
 
 inline std::size_t hash_value( error_code const & ec )
 {
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
     if( ec.lc_flags_ == 1 )
     {
         std::error_code const& e2 = *reinterpret_cast<std::error_code const*>( ec.d2_ );
         return std::hash<std::error_code>()( e2 );
     }
 
-#endif
-
     error_category const & cat = ec.category();
 
     boost::ulong_long_type id_ = cat.id_;
diff --git a/inst/include/boost/system/detail/error_condition.hpp b/inst/include/boost/system/detail/error_condition.hpp
index b2da2811b..6aeb9506a 100644
--- a/inst/include/boost/system/detail/error_condition.hpp
+++ b/inst/include/boost/system/detail/error_condition.hpp
@@ -50,7 +50,7 @@ class error_condition
 
 private:
 
-    boost::ulong_long_type cat_id() const BOOST_NOEXCEPT
+    boost::ulong_long_type cat_id() const noexcept
     {
         return cat_? cat_->id_: detail::generic_category_id;
     }
@@ -59,17 +59,17 @@ class error_condition
 
     // constructors:
 
-    BOOST_SYSTEM_CONSTEXPR error_condition() BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR error_condition() noexcept:
         val_( 0 ), cat_( 0 )
     {
     }
 
-    BOOST_SYSTEM_CONSTEXPR error_condition( int val, const error_category & cat ) BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR error_condition( int val, const error_category & cat ) noexcept:
         val_( val ), cat_( &cat )
     {
     }
 
-    BOOST_SYSTEM_CONSTEXPR explicit error_condition( boost::system::detail::generic_value_tag vt ) BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR explicit error_condition( boost::system::detail::generic_value_tag vt ) noexcept:
         val_( vt.value ), cat_( 0 )
     {
     }
@@ -77,20 +77,20 @@ class error_condition
     template<class ErrorConditionEnum> BOOST_SYSTEM_CONSTEXPR error_condition( ErrorConditionEnum e,
       typename detail::enable_if<
         is_error_condition_enum<ErrorConditionEnum>::value && !boost::system::detail::is_same<ErrorConditionEnum, errc::errc_t>::value
-      >::type* = 0) BOOST_NOEXCEPT
+      >::type* = 0) noexcept
     {
         *this = make_error_condition( e );
     }
 
     template<class ErrorConditionEnum> BOOST_SYSTEM_CONSTEXPR error_condition( ErrorConditionEnum e,
-      typename detail::enable_if<boost::system::detail::is_same<ErrorConditionEnum, errc::errc_t>::value>::type* = 0) BOOST_NOEXCEPT:
+      typename detail::enable_if<boost::system::detail::is_same<ErrorConditionEnum, errc::errc_t>::value>::type* = 0) noexcept:
         val_( e ), cat_( 0 )
     {
     }
 
     // modifiers:
 
-    BOOST_SYSTEM_CONSTEXPR void assign( int val, const error_category & cat ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR void assign( int val, const error_category & cat ) noexcept
     {
         val_ = val;
         cat_ = &cat;
@@ -98,13 +98,13 @@ class error_condition
 
     template<typename ErrorConditionEnum>
         BOOST_SYSTEM_CONSTEXPR typename detail::enable_if<is_error_condition_enum<ErrorConditionEnum>::value, error_condition>::type &
-        operator=( ErrorConditionEnum val ) BOOST_NOEXCEPT
+        operator=( ErrorConditionEnum val ) noexcept
     {
         *this = error_condition( val );
         return *this;
     }
 
-    BOOST_SYSTEM_CONSTEXPR void clear() BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR void clear() noexcept
     {
         val_ = 0;
         cat_ = 0;
@@ -112,12 +112,12 @@ class error_condition
 
     // observers:
 
-    BOOST_SYSTEM_CONSTEXPR int value() const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR int value() const noexcept
     {
         return val_;
     }
 
-    BOOST_SYSTEM_CONSTEXPR const error_category & category() const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR const error_category & category() const noexcept
     {
         return cat_? *cat_: generic_category();
     }
@@ -134,7 +134,7 @@ class error_condition
         }
     }
 
-    char const * message( char * buffer, std::size_t len ) const BOOST_NOEXCEPT
+    char const * message( char * buffer, std::size_t len ) const noexcept
     {
         if( cat_ )
         {
@@ -146,7 +146,7 @@ class error_condition
         }
     }
 
-    BOOST_SYSTEM_CONSTEXPR bool failed() const BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR bool failed() const noexcept
     {
         if( cat_ )
         {
@@ -158,35 +158,16 @@ class error_condition
         }
     }
 
-#if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
-
-    BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT  // true if error
+    BOOST_SYSTEM_CONSTEXPR explicit operator bool() const noexcept  // true if error
     {
         return failed();
     }
 
-#else
-
-    typedef void (*unspecified_bool_type)();
-    static void unspecified_bool_true() {}
-
-    BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const BOOST_NOEXCEPT  // true if error
-    {
-        return failed()? unspecified_bool_true: 0;
-    }
-
-    BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT  // true if no error
-    {
-        return !failed();
-    }
-
-#endif
-
     // relationals:
     //  the more symmetrical non-member syntax allows enum
     //  conversions work for both rhs and lhs.
 
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( const error_condition & lhs, const error_condition & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( const error_condition & lhs, const error_condition & rhs ) noexcept
     {
         if( lhs.val_ != rhs.val_ )
         {
@@ -206,20 +187,18 @@ class error_condition
         }
     }
 
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator<( const error_condition & lhs, const error_condition & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator<( const error_condition & lhs, const error_condition & rhs ) noexcept
     {
         error_category const& lcat = lhs.category();
         error_category const& rcat = rhs.category();
         return lcat < rcat || ( lcat == rcat && lhs.val_ < rhs.val_ );
     }
 
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( const error_condition & lhs, const error_condition & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( const error_condition & lhs, const error_condition & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
-
     operator std::error_condition () const
     {
 // This condition must be the same as the one in error_category_impl.hpp
@@ -241,22 +220,22 @@ class error_condition
 #endif
     }
 
-    inline friend bool operator==( std::error_code const & lhs, error_condition const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( std::error_code const & lhs, error_condition const & rhs ) noexcept
     {
         return lhs == static_cast< std::error_condition >( rhs );
     }
 
-    inline friend bool operator==( error_condition const & lhs, std::error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( error_condition const & lhs, std::error_code const & rhs ) noexcept
     {
         return static_cast< std::error_condition >( lhs ) == rhs;
     }
 
-    inline friend bool operator!=( std::error_code const & lhs, error_condition const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( std::error_code const & lhs, error_condition const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-    inline friend bool operator!=( error_condition const & lhs, std::error_code const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( error_condition const & lhs, std::error_code const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
@@ -264,25 +243,25 @@ class error_condition
     //
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( error_condition const & lhs, E rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( error_condition const & lhs, E rhs ) noexcept
     {
         return lhs == make_error_condition( rhs );
     }
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( E lhs, error_condition const & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator==( E lhs, error_condition const & rhs ) noexcept
     {
         return make_error_condition( lhs ) == rhs;
     }
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( error_condition const & lhs, E rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( error_condition const & lhs, E rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
     template<class E, class N = typename detail::enable_if<std::is_error_condition_enum<E>::value>::type>
-    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( E lhs, error_condition const & rhs ) BOOST_NOEXCEPT
+    BOOST_SYSTEM_CONSTEXPR inline friend bool operator!=( E lhs, error_condition const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
@@ -290,31 +269,29 @@ class error_condition
     //
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    inline friend bool operator==( error_condition const & lhs, E rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( error_condition const & lhs, E rhs ) noexcept
     {
         return lhs == make_error_code( rhs );
     }
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    inline friend bool operator==( E lhs, error_condition const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator==( E lhs, error_condition const & rhs ) noexcept
     {
         return make_error_code( lhs ) == rhs;
     }
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    inline friend bool operator!=( error_condition const & lhs, E rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( error_condition const & lhs, E rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
     template<class E, class N1 = void, class N2 = typename detail::enable_if<std::is_error_code_enum<E>::value>::type>
-    inline friend bool operator!=( E lhs, error_condition const & rhs ) BOOST_NOEXCEPT
+    inline friend bool operator!=( E lhs, error_condition const & rhs ) noexcept
     {
         return !( lhs == rhs );
     }
 
-#endif
-
     std::string to_string() const
     {
         std::string r( "cond:" );
diff --git a/inst/include/boost/system/detail/generic_category.hpp b/inst/include/boost/system/detail/generic_category.hpp
index fd233e683..89c44cc0b 100644
--- a/inst/include/boost/system/detail/generic_category.hpp
+++ b/inst/include/boost/system/detail/generic_category.hpp
@@ -35,18 +35,18 @@ class BOOST_SYMBOL_VISIBLE generic_error_category: public error_category
 {
 public:
 
-    BOOST_SYSTEM_CONSTEXPR generic_error_category() BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR generic_error_category() noexcept:
         error_category( detail::generic_category_id )
     {
     }
 
-    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
+    const char * name() const noexcept BOOST_OVERRIDE
     {
         return "generic";
     }
 
     std::string message( int ev ) const BOOST_OVERRIDE;
-    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
+    char const * message( int ev, char * buffer, std::size_t len ) const noexcept BOOST_OVERRIDE;
 };
 
 #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
@@ -55,7 +55,7 @@ class BOOST_SYMBOL_VISIBLE generic_error_category: public error_category
 
 // generic_error_category::message
 
-inline char const * generic_error_category::message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT
+inline char const * generic_error_category::message( int ev, char * buffer, std::size_t len ) const noexcept
 {
     return generic_error_category_message( ev, buffer, len );
 }
@@ -86,7 +86,7 @@ template<class T> constexpr generic_error_category generic_cat_holder<T>::instan
 
 } // namespace detail
 
-constexpr error_category const & generic_category() BOOST_NOEXCEPT
+constexpr error_category const & generic_category() noexcept
 {
     return detail::generic_cat_holder<void>::instance;
 }
@@ -94,10 +94,10 @@ constexpr error_category const & generic_category() BOOST_NOEXCEPT
 #else // #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
 
 #if !defined(__SUNPRO_CC) // trailing __global is not supported
-inline error_category const & generic_category() BOOST_NOEXCEPT BOOST_SYMBOL_VISIBLE;
+inline error_category const & generic_category() noexcept BOOST_SYMBOL_VISIBLE;
 #endif
 
-inline error_category const & generic_category() BOOST_NOEXCEPT
+inline error_category const & generic_category() noexcept
 {
     static const detail::generic_error_category instance;
     return instance;
diff --git a/inst/include/boost/system/detail/generic_category_message.hpp b/inst/include/boost/system/detail/generic_category_message.hpp
index 55f101696..57761ff94 100644
--- a/inst/include/boost/system/detail/generic_category_message.hpp
+++ b/inst/include/boost/system/detail/generic_category_message.hpp
@@ -27,19 +27,31 @@ namespace detail
 
 // glibc has two incompatible strerror_r definitions
 
-inline char const * strerror_r_helper( char const * r, char const * ) BOOST_NOEXCEPT
+inline char const * strerror_r_helper( char const * r, char const * ) noexcept
 {
     return r;
 }
 
-inline char const * strerror_r_helper( int r, char const * buffer ) BOOST_NOEXCEPT
+inline char const * strerror_r_helper( int r, char const * buffer ) noexcept
 {
     return r == 0? buffer: "Unknown error";
 }
 
-inline char const * generic_error_category_message( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
+inline char const * generic_error_category_message( int ev, char * buffer, std::size_t len ) noexcept
 {
-    return strerror_r_helper( strerror_r( ev, buffer, len ), buffer );
+    if( buffer != nullptr )
+    {
+        return strerror_r_helper( strerror_r( ev, buffer, len ), buffer );
+    }
+    else
+    {
+        // strerror_r requires non-null buffer pointer
+
+        char tmp[ 1 ] = {};
+        char const* r = strerror_r_helper( strerror_r( ev, tmp, 0 ), buffer );
+
+        return r == tmp? nullptr: r;
+    }
 }
 
 inline std::string generic_error_category_message( int ev )
@@ -68,7 +80,7 @@ inline std::string generic_error_category_message( int ev )
     return m? m: "Unknown error";
 }
 
-inline char const * generic_error_category_message( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
+inline char const * generic_error_category_message( int ev, char * buffer, std::size_t len ) noexcept
 {
     if( len == 0 )
     {
diff --git a/inst/include/boost/system/detail/interop_category.hpp b/inst/include/boost/system/detail/interop_category.hpp
index 1a2145d8b..fe35b99fe 100644
--- a/inst/include/boost/system/detail/interop_category.hpp
+++ b/inst/include/boost/system/detail/interop_category.hpp
@@ -35,25 +35,25 @@ class BOOST_SYMBOL_VISIBLE interop_error_category: public error_category
 {
 public:
 
-    BOOST_SYSTEM_CONSTEXPR interop_error_category() BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR interop_error_category() noexcept:
         error_category( detail::interop_category_id )
     {
     }
 
-    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
+    const char * name() const noexcept BOOST_OVERRIDE
     {
         return "std:unknown";
     }
 
     std::string message( int ev ) const BOOST_OVERRIDE;
-    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
+    char const * message( int ev, char * buffer, std::size_t len ) const noexcept BOOST_OVERRIDE;
 };
 
 #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
 #pragma GCC diagnostic pop
 #endif
 
-inline char const * interop_error_category::message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT
+inline char const * interop_error_category::message( int ev, char * buffer, std::size_t len ) const noexcept
 {
     detail::snprintf( buffer, len, "Unknown interop error %d", ev );
     return buffer;
@@ -79,7 +79,7 @@ template<class T> struct BOOST_SYMBOL_VISIBLE interop_cat_holder
 template<class T> constexpr interop_error_category interop_cat_holder<T>::instance;
 #endif
 
-constexpr error_category const & interop_category() BOOST_NOEXCEPT
+constexpr error_category const & interop_category() noexcept
 {
     return interop_cat_holder<void>::instance;
 }
@@ -87,10 +87,10 @@ constexpr error_category const & interop_category() BOOST_NOEXCEPT
 #else // #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
 
 #if !defined(__SUNPRO_CC) // trailing __global is not supported
-inline error_category const & interop_category() BOOST_NOEXCEPT BOOST_SYMBOL_VISIBLE;
+inline error_category const & interop_category() noexcept BOOST_SYMBOL_VISIBLE;
 #endif
 
-inline error_category const & interop_category() BOOST_NOEXCEPT
+inline error_category const & interop_category() noexcept
 {
     static const detail::interop_error_category instance;
     return instance;
diff --git a/inst/include/boost/system/detail/is_same.hpp b/inst/include/boost/system/detail/is_same.hpp
index dc466f8ee..12c1e585a 100644
--- a/inst/include/boost/system/detail/is_same.hpp
+++ b/inst/include/boost/system/detail/is_same.hpp
@@ -5,29 +5,19 @@
 // Distributed under the Boost Software License, Version 1.0
 // http://www.boost.org/LICENSE_1_0.txt
 
+#include <type_traits>
+
 namespace boost
 {
-
 namespace system
 {
-
 namespace detail
 {
 
-template<class T1, class T2> struct is_same
-{
-    enum _vt { value = 0 };
-};
-
-template<class T> struct is_same<T, T>
-{
-    enum _vt { value = 1 };
-};
+using std::is_same;
 
 } // namespace detail
-
 } // namespace system
-
 } // namespace boost
 
 #endif // #ifndef BOOST_SYSTEM_DETAIL_IS_SAME_HPP_INCLUDED
diff --git a/inst/include/boost/system/detail/requires_cxx11.hpp b/inst/include/boost/system/detail/requires_cxx11.hpp
deleted file mode 100644
index 016791c08..000000000
--- a/inst/include/boost/system/detail/requires_cxx11.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef BOOST_SYSTEM_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-#define BOOST_SYSTEM_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
-
-// Copyright 2023 Peter Dimov
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/config.hpp>
-#include <boost/config/pragma_message.hpp>
-
-#if defined(BOOST_NO_CXX11_CONSTEXPR) || \
-    defined(BOOST_NO_CXX11_NOEXCEPT) || \
-    defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) || \
-    defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || \
-    defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)
-
-BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.System 1.82 and will be removed in Boost.System 1.85.")
-
-#endif
-
-#endif // #ifndef BOOST_SYSTEM_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
diff --git a/inst/include/boost/system/detail/snprintf.hpp b/inst/include/boost/system/detail/snprintf.hpp
index f54a3514f..b999dd9c9 100644
--- a/inst/include/boost/system/detail/snprintf.hpp
+++ b/inst/include/boost/system/detail/snprintf.hpp
@@ -8,66 +8,21 @@
 //
 // See library home page at http://www.boost.org/libs/system
 
-#include <boost/config.hpp>
 #include <cstdio>
-#include <cstdarg>
 
 //
 
 namespace boost
 {
-
 namespace system
 {
-
 namespace detail
 {
 
-#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) )
-
-inline void snprintf( char * buffer, std::size_t len, char const * format, ... )
-{
-# if defined( BOOST_MSVC )
-#  pragma warning( push )
-#  pragma warning( disable: 4996 )
-# endif
-
-    if( len == 0 ) return;
-
-    va_list args;
-    va_start( args, format );
-
-    _vsnprintf( buffer, len - 1, format, args );
-    buffer[ len - 1 ] = 0;
-
-    va_end( args );
-
-# if defined( BOOST_MSVC )
-#  pragma warning( pop )
-# endif
-}
-
-#else
-
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__format__ (__printf__, 3, 4)))
-#endif
-inline void snprintf( char * buffer, std::size_t len, char const * format, ... )
-{
-    va_list args;
-    va_start( args, format );
-
-    std::vsnprintf( buffer, len, format, args );
-
-    va_end( args );
-}
-
-#endif
+using std::snprintf;
 
 } // namespace detail
-
 } // namespace system
-
 } // namespace boost
 
 #endif // #ifndef BOOST_SYSTEM_DETAIL_SNPRINTF_HPP_INCLUDED
diff --git a/inst/include/boost/system/detail/std_category.hpp b/inst/include/boost/system/detail/std_category.hpp
index 68073c1b9..6aabc2814 100644
--- a/inst/include/boost/system/detail/std_category.hpp
+++ b/inst/include/boost/system/detail/std_category.hpp
@@ -35,7 +35,7 @@ class BOOST_SYMBOL_VISIBLE std_category: public std::error_category
 
 public:
 
-    boost::system::error_category const & original_category() const BOOST_NOEXCEPT
+    boost::system::error_category const & original_category() const noexcept
     {
         return *pc_;
     }
@@ -51,16 +51,12 @@ class BOOST_SYMBOL_VISIBLE std_category: public std::error_category
         // here when Id != 0, but this should never happen now because this code
         // path is no longer used
 
-#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
-
         static_assert( Id == 0, "This constructor should only be called with Id == 0 under MS STL 14.0+" );
 
-#endif
-
 #endif
     }
 
-    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
+    const char * name() const noexcept BOOST_OVERRIDE
     {
         return pc_->name();
     }
@@ -70,13 +66,13 @@ class BOOST_SYMBOL_VISIBLE std_category: public std::error_category
         return pc_->message( ev );
     }
 
-    std::error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT BOOST_OVERRIDE
+    std::error_condition default_error_condition( int ev ) const noexcept BOOST_OVERRIDE
     {
         return pc_->default_error_condition( ev );
     }
 
-    inline bool equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
-    inline bool equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
+    inline bool equivalent( int code, const std::error_condition & condition ) const noexcept BOOST_OVERRIDE;
+    inline bool equivalent( const std::error_code & code, int condition ) const noexcept BOOST_OVERRIDE;
 };
 
 } // namespace detail
diff --git a/inst/include/boost/system/detail/std_category_impl.hpp b/inst/include/boost/system/detail/std_category_impl.hpp
index 9dee5e798..3843bd343 100644
--- a/inst/include/boost/system/detail/std_category_impl.hpp
+++ b/inst/include/boost/system/detail/std_category_impl.hpp
@@ -26,7 +26,7 @@ namespace system
 namespace detail
 {
 
-inline bool std_category::equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT
+inline bool std_category::equivalent( int code, const std::error_condition & condition ) const noexcept
 {
     if( condition.category() == *this )
     {
@@ -55,7 +55,7 @@ inline bool std_category::equivalent( int code, const std::error_condition & con
     }
 }
 
-inline bool std_category::equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT
+inline bool std_category::equivalent( const std::error_code & code, int condition ) const noexcept
 {
     if( code.category() == *this )
     {
diff --git a/inst/include/boost/system/detail/system_category.hpp b/inst/include/boost/system/detail/system_category.hpp
index 1e239511a..0d8f3d03f 100644
--- a/inst/include/boost/system/detail/system_category.hpp
+++ b/inst/include/boost/system/detail/system_category.hpp
@@ -34,20 +34,20 @@ class BOOST_SYMBOL_VISIBLE system_error_category: public error_category
 {
 public:
 
-    BOOST_SYSTEM_CONSTEXPR system_error_category() BOOST_NOEXCEPT:
+    BOOST_SYSTEM_CONSTEXPR system_error_category() noexcept:
         error_category( detail::system_category_id )
     {
     }
 
-    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
+    const char * name() const noexcept BOOST_OVERRIDE
     {
         return "system";
     }
 
-    error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
+    error_condition default_error_condition( int ev ) const noexcept BOOST_OVERRIDE;
 
     std::string message( int ev ) const BOOST_OVERRIDE;
-    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
+    char const * message( int ev, char * buffer, std::size_t len ) const noexcept BOOST_OVERRIDE;
 };
 
 #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
@@ -75,7 +75,7 @@ template<class T> constexpr system_error_category system_cat_holder<T>::instance
 
 } // namespace detail
 
-constexpr error_category const & system_category() BOOST_NOEXCEPT
+constexpr error_category const & system_category() noexcept
 {
     return detail::system_cat_holder<void>::instance;
 }
@@ -83,10 +83,10 @@ constexpr error_category const & system_category() BOOST_NOEXCEPT
 #else // #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
 
 #if !defined(__SUNPRO_CC) // trailing __global is not supported
-inline error_category const & system_category() BOOST_NOEXCEPT BOOST_SYMBOL_VISIBLE;
+inline error_category const & system_category() noexcept BOOST_SYMBOL_VISIBLE;
 #endif
 
-inline error_category const & system_category() BOOST_NOEXCEPT
+inline error_category const & system_category() noexcept
 {
     static const detail::system_error_category instance;
     return instance;
diff --git a/inst/include/boost/system/detail/system_category_condition_win32.hpp b/inst/include/boost/system/detail/system_category_condition_win32.hpp
index 446a35194..a43d67666 100644
--- a/inst/include/boost/system/detail/system_category_condition_win32.hpp
+++ b/inst/include/boost/system/detail/system_category_condition_win32.hpp
@@ -25,7 +25,7 @@ namespace system
 namespace detail
 {
 
-inline int system_category_condition_win32( int ev ) BOOST_NOEXCEPT
+inline int system_category_condition_win32( int ev ) noexcept
 {
     // When using the Windows Runtime, most system errors are reported as HRESULTs.
     // We want to map the common Win32 errors to their equivalent error condition,
diff --git a/inst/include/boost/system/detail/system_category_impl.hpp b/inst/include/boost/system/detail/system_category_impl.hpp
index fc3933e2f..5da83f0b2 100644
--- a/inst/include/boost/system/detail/system_category_impl.hpp
+++ b/inst/include/boost/system/detail/system_category_impl.hpp
@@ -25,7 +25,7 @@
 
 #include <boost/system/detail/system_category_condition_win32.hpp>
 
-inline boost::system::error_condition boost::system::detail::system_error_category::default_error_condition( int ev ) const BOOST_NOEXCEPT
+inline boost::system::error_condition boost::system::detail::system_error_category::default_error_condition( int ev ) const noexcept
 {
     int e2 = system_category_condition_win32( ev );
 
@@ -41,7 +41,7 @@ inline boost::system::error_condition boost::system::detail::system_error_catego
 
 #else // #if defined(BOOST_WINDOWS_API)
 
-inline boost::system::error_condition boost::system::detail::system_error_category::default_error_condition( int ev ) const BOOST_NOEXCEPT
+inline boost::system::error_condition boost::system::detail::system_error_category::default_error_condition( int ev ) const noexcept
 {
     return error_condition( boost::system::detail::generic_value_tag( ev ) );
 }
@@ -53,7 +53,7 @@ inline std::string boost::system::detail::system_error_category::message( int ev
     return system_error_category_message( ev );
 }
 
-inline char const * boost::system::detail::system_error_category::message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT
+inline char const * boost::system::detail::system_error_category::message( int ev, char * buffer, std::size_t len ) const noexcept
 {
     return system_error_category_message( ev, buffer, len );
 }
diff --git a/inst/include/boost/system/detail/system_category_message.hpp b/inst/include/boost/system/detail/system_category_message.hpp
index 203e75aa9..cd1437b00 100644
--- a/inst/include/boost/system/detail/system_category_message.hpp
+++ b/inst/include/boost/system/detail/system_category_message.hpp
@@ -32,7 +32,7 @@ inline std::string system_error_category_message( int ev )
     return system_category_message_win32( ev );
 }
 
-inline char const * system_error_category_message( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
+inline char const * system_error_category_message( int ev, char * buffer, std::size_t len ) noexcept
 {
     return system_category_message_win32( ev, buffer, len );
 }
@@ -57,7 +57,7 @@ inline std::string system_error_category_message( int ev )
     return generic_error_category_message( ev );
 }
 
-inline char const * system_error_category_message( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
+inline char const * system_error_category_message( int ev, char * buffer, std::size_t len ) noexcept
 {
     return generic_error_category_message( ev, buffer, len );
 }
diff --git a/inst/include/boost/system/detail/system_category_message_win32.hpp b/inst/include/boost/system/detail/system_category_message_win32.hpp
index e5f544ccd..47f385ae2 100644
--- a/inst/include/boost/system/detail/system_category_message_win32.hpp
+++ b/inst/include/boost/system/detail/system_category_message_win32.hpp
@@ -47,7 +47,7 @@ inline boost::winapi::UINT_ message_cp_win32()
 #endif
 }
 
-inline char const * system_category_message_win32( int ev, char * buffer, std::size_t len ) BOOST_NOEXCEPT
+inline char const * system_category_message_win32( int ev, char * buffer, std::size_t len ) noexcept
 {
     if( len == 0 )
     {
@@ -73,7 +73,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
         DWORD_ retval = boost::winapi::FormatMessageA(
             FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
             NULL,
-            ev,
+            static_cast<DWORD_>(ev),
             MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
             buffer,
             static_cast<DWORD_>( len ),
@@ -94,7 +94,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
         DWORD_ retval = boost::winapi::FormatMessageW(
             FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
             NULL,
-            ev,
+            static_cast<DWORD_>(ev),
             MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
             (LPWSTR_) &lpMsgBuf,
             0,
@@ -152,7 +152,7 @@ inline std::string system_category_message_win32( int ev )
     DWORD_ retval = boost::winapi::FormatMessageW(
         FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
         NULL,
-        ev,
+        static_cast<DWORD_>(ev),
         MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
         (LPWSTR_) &lpMsgBuf,
         0,
@@ -176,7 +176,7 @@ inline std::string system_category_message_win32( int ev )
         return unknown_message_win32( ev );
     }
 
-    std::string buffer( r, char() );
+    std::string buffer( static_cast<std::size_t>(r), char() );
 
     r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, &buffer[0], r, NULL, NULL );
 
@@ -187,12 +187,12 @@ inline std::string system_category_message_win32( int ev )
 
     --r; // exclude null terminator
 
-    while( r > 0 && ( buffer[ r-1 ] == '\n' || buffer[ r-1 ] == '\r' ) )
+    while( r > 0 && ( buffer[ static_cast<std::size_t>(r)-1 ] == '\n' || buffer[ static_cast<std::size_t>(r)-1 ] == '\r' ) )
     {
         --r;
     }
 
-    if( r > 0 && buffer[ r-1 ] == '.' )
+    if( r > 0 && buffer[ static_cast<std::size_t>(r)-1 ] == '.' )
     {
         --r;
     }
diff --git a/inst/include/boost/system/errc.hpp b/inst/include/boost/system/errc.hpp
index 2b642cd76..3e7cfc8d4 100644
--- a/inst/include/boost/system/errc.hpp
+++ b/inst/include/boost/system/errc.hpp
@@ -31,19 +31,19 @@ namespace errc
 {
 
 // explicit conversion:
-BOOST_SYSTEM_CONSTEXPR inline error_code make_error_code( errc_t e ) BOOST_NOEXCEPT
+BOOST_SYSTEM_CONSTEXPR inline error_code make_error_code( errc_t e ) noexcept
 {
     return error_code( e, generic_category() );
 }
 
 // explicit conversion:
-inline error_code make_error_code( errc_t e, boost::source_location const * loc ) BOOST_NOEXCEPT
+inline error_code make_error_code( errc_t e, boost::source_location const * loc ) noexcept
 {
     return error_code( e, generic_category(), loc );
 }
 
 // implicit conversion:
-BOOST_SYSTEM_CONSTEXPR inline error_condition make_error_condition( errc_t e ) BOOST_NOEXCEPT
+BOOST_SYSTEM_CONSTEXPR inline error_condition make_error_condition( errc_t e ) noexcept
 {
     return error_condition( e, generic_category() );
 }
diff --git a/inst/include/boost/system/result.hpp b/inst/include/boost/system/result.hpp
index e750c5881..21e68d677 100644
--- a/inst/include/boost/system/result.hpp
+++ b/inst/include/boost/system/result.hpp
@@ -73,10 +73,10 @@ BOOST_NORETURN BOOST_NOINLINE inline void throw_exception_from_error( std::excep
 // in_place_*
 
 using in_place_value_t = variant2::in_place_index_t<0>;
-constexpr in_place_value_t in_place_value{};
+BOOST_INLINE_CONSTEXPR in_place_value_t in_place_value{};
 
 using in_place_error_t = variant2::in_place_index_t<1>;
-constexpr in_place_error_t in_place_error{};
+BOOST_INLINE_CONSTEXPR in_place_error_t in_place_error{};
 
 namespace detail
 {
@@ -450,6 +450,13 @@ template<class T, class E = error_code> class result
     }
 };
 
+#if defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+
+template<class T, class E> constexpr in_place_value_t result<T, E>::in_place_value;
+template<class T, class E> constexpr in_place_error_t result<T, E>::in_place_error;
+
+#endif
+
 template<class Ch, class Tr, class T, class E> std::basic_ostream<Ch, Tr>& operator<<( std::basic_ostream<Ch, Tr>& os, result<T, E> const & r )
 {
     if( r.has_value() )
@@ -652,6 +659,13 @@ template<class E> class result<void, E>
     }
 };
 
+#if defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+
+template<class E> constexpr in_place_value_t result<void, E>::in_place_value;
+template<class E> constexpr in_place_error_t result<void, E>::in_place_error;
+
+#endif
+
 template<class Ch, class Tr, class E> std::basic_ostream<Ch, Tr>& operator<<( std::basic_ostream<Ch, Tr>& os, result<void, E> const & r )
 {
     if( r.has_value() )
@@ -885,6 +899,13 @@ template<class U, class E> class result<U&, E>
     }
 };
 
+#if defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+
+template<class U, class E> constexpr in_place_value_t result<U&, E>::in_place_value;
+template<class U, class E> constexpr in_place_error_t result<U&, E>::in_place_error;
+
+#endif
+
 // operator|
 
 namespace detail
@@ -1046,13 +1067,65 @@ U operator|( result<void, E>&& r, F&& f )
     }
 }
 
+// operator|=
+
+// result |= value
+
+template<class T, class E, class U,
+    class En = typename std::enable_if<detail::is_value_convertible_to<U, T>::value>::type
+>
+result<T, E>& operator|=( result<T, E>& r, U&& u )
+{
+    if( !r )
+    {
+        r = std::forward<U>( u );
+    }
+
+    return r;
+}
+
+// result |= nullary-returning-value
+
+template<class T, class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En = typename std::enable_if<detail::is_value_convertible_to<U, T>::value>::type
+>
+result<T, E>& operator|=( result<T, E>& r, F&& f )
+{
+    if( !r )
+    {
+        r = std::forward<F>( f )();
+    }
+
+    return r;
+}
+
+// result |= nullary-returning-result
+
+template<class T, class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En1 = typename std::enable_if<detail::is_result<U>::value>::type,
+    class En2 = typename std::enable_if<detail::is_value_convertible_to<typename U::value_type, T>::value>::type,
+    class En3 = typename std::enable_if<std::is_convertible<typename U::error_type, E>::value>::type
+>
+result<T, E>& operator|=( result<T, E>& r, F&& f )
+{
+    if( !r )
+    {
+        r = std::forward<F>( f )();
+    }
+
+    return r;
+}
+
 // operator&
 
 // result & unary-returning-value
 
 template<class T, class E, class F,
     class U = decltype( std::declval<F>()( std::declval<T const&>() ) ),
-    class En = typename std::enable_if<!detail::is_result<U>::value>::type
+    class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
+    class En2 = typename std::enable_if<!std::is_void<U>::value>::type
 >
 result<U, E> operator&( result<T, E> const& r, F&& f )
 {
@@ -1068,7 +1141,8 @@ result<U, E> operator&( result<T, E> const& r, F&& f )
 
 template<class T, class E, class F,
     class U = decltype( std::declval<F>()( std::declval<T>() ) ),
-    class En = typename std::enable_if<!detail::is_result<U>::value>::type
+    class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
+    class En2 = typename std::enable_if<!std::is_void<U>::value>::type
 >
 result<U, E> operator&( result<T, E>&& r, F&& f )
 {
@@ -1082,6 +1156,74 @@ result<U, E> operator&( result<T, E>&& r, F&& f )
     }
 }
 
+template<class T, class E, class F,
+    class U = decltype( std::declval<F>()( std::declval<T const&>() ) ),
+    class En = typename std::enable_if<std::is_void<U>::value>::type
+>
+result<U, E> operator&( result<T, E> const& r, F&& f )
+{
+    if( r.has_error() )
+    {
+        return r.error();
+    }
+    else
+    {
+        std::forward<F>( f )( *r );
+        return {};
+    }
+}
+
+template<class T, class E, class F,
+    class U = decltype( std::declval<F>()( std::declval<T>() ) ),
+    class En = typename std::enable_if<std::is_void<U>::value>::type
+>
+result<U, E> operator&( result<T, E>&& r, F&& f )
+{
+    if( r.has_error() )
+    {
+        return r.error();
+    }
+    else
+    {
+        std::forward<F>( f )( *std::move( r ) );
+        return {};
+    }
+}
+
+template<class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
+    class En2 = typename std::enable_if<!std::is_void<U>::value>::type
+>
+result<U, E> operator&( result<void, E> const& r, F&& f )
+{
+    if( r.has_error() )
+    {
+        return r.error();
+    }
+    else
+    {
+        return std::forward<F>( f )();
+    }
+}
+
+template<class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En = typename std::enable_if<std::is_void<U>::value>::type
+>
+result<U, E> operator&( result<void, E> const& r, F&& f )
+{
+    if( r.has_error() )
+    {
+        return r.error();
+    }
+    else
+    {
+        std::forward<F>( f )();
+        return {};
+    }
+}
+
 // result & unary-returning-result
 
 template<class T, class E, class F,
@@ -1118,6 +1260,23 @@ U operator&( result<T, E>&& r, F&& f )
     }
 }
 
+template<class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En1 = typename std::enable_if<detail::is_result<U>::value>::type,
+    class En2 = typename std::enable_if<std::is_convertible<E, typename U::error_type>::value>::type
+>
+U operator&( result<void, E> const& r, F&& f )
+{
+    if( r.has_error() )
+    {
+        return r.error();
+    }
+    else
+    {
+        return std::forward<F>( f )();
+    }
+}
+
 // operator&=
 
 // result &= unary-returning-value
@@ -1137,6 +1296,20 @@ result<T, E>& operator&=( result<T, E>& r, F&& f )
     return r;
 }
 
+template<class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En = typename std::enable_if<!detail::is_result<U>::value>::type
+>
+result<void, E>& operator&=( result<void, E>& r, F&& f )
+{
+    if( r )
+    {
+        std::forward<F>( f )();
+    }
+
+    return r;
+}
+
 // result &= unary-returning-result
 
 template<class T, class E, class F,
@@ -1155,6 +1328,22 @@ result<T, E>& operator&=( result<T, E>& r, F&& f )
     return r;
 }
 
+template<class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En1 = typename std::enable_if<detail::is_result<U>::value>::type,
+    class En2 = typename std::enable_if<std::is_void<typename U::value_type>::value>::type,
+    class En3 = typename std::enable_if<std::is_convertible<typename U::error_type, E>::value>::type
+>
+result<void, E>& operator&=( result<void, E>& r, F&& f )
+{
+    if( r )
+    {
+        r = std::forward<F>( f )();
+    }
+
+    return r;
+}
+
 } // namespace system
 } // namespace boost
 
diff --git a/inst/include/boost/system/system_error.hpp b/inst/include/boost/system/system_error.hpp
index 09d65e2ac..7d6d8b60b 100644
--- a/inst/include/boost/system/system_error.hpp
+++ b/inst/include/boost/system/system_error.hpp
@@ -43,7 +43,7 @@ class BOOST_SYMBOL_VISIBLE system_error: public std::runtime_error
     system_error( int ev, error_category const & ecat, char const * prefix ):
         std::runtime_error( std::string( prefix ) + ": " + error_code( ev, ecat ).what() ), code_( ev, ecat ) {}
 
-    error_code code() const BOOST_NOEXCEPT
+    error_code code() const noexcept
     {
         return code_;
     }
diff --git a/inst/include/boost/test/detail/config.hpp b/inst/include/boost/test/detail/config.hpp
index 835a94533..3072bf775 100644
--- a/inst/include/boost/test/detail/config.hpp
+++ b/inst/include/boost/test/detail/config.hpp
@@ -136,7 +136,7 @@ class type_info;
 #define BOOST_PP_VARIADICS 1
 #endif
 
-#if BOOST_CLANG
+#ifdef BOOST_CLANG
 #define BOOST_PP_VARIADICS 1
 #endif
 
@@ -151,7 +151,8 @@ class type_info;
 #endif /* ifndef BOOST_PP_VARIADICS */
 
 // some versions of VC exibit a manifest error with this BOOST_UNREACHABLE_RETURN
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
+// gcc <= 4.6 fails with unused variable even when the return is never reached 
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) || (defined(BOOST_GCC) && BOOST_GCC < 40700)
 # define BOOST_TEST_UNREACHABLE_RETURN(x) return x
 #else
 # define BOOST_TEST_UNREACHABLE_RETURN(x) BOOST_UNREACHABLE_RETURN(x)
@@ -165,7 +166,7 @@ class type_info;
 #if (defined(BOOST_MSVC) && BOOST_MSVC < 1900) || (defined(BOOST_GCC) && BOOST_GCC < 40700)
 #  define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) fun body
 #else
-#  define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) BOOST_DEFAULTED_FUNCTION(fun, body);
+#  define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) BOOST_DEFAULTED_FUNCTION(fun, body)
 #endif
 
 //____________________________________________________________________________//
diff --git a/inst/include/boost/test/detail/global_typedef.hpp b/inst/include/boost/test/detail/global_typedef.hpp
index 5e6f96073..19621ad67 100644
--- a/inst/include/boost/test/detail/global_typedef.hpp
+++ b/inst/include/boost/test/detail/global_typedef.hpp
@@ -29,17 +29,21 @@ typedef unsigned long   counter_t;
 
 //____________________________________________________________________________//
 
-enum report_level  { INV_REPORT_LEVEL, CONFIRMATION_REPORT, SHORT_REPORT, DETAILED_REPORT, NO_REPORT };
+enum BOOST_SYMBOL_VISIBLE report_level  { INV_REPORT_LEVEL,
+                                          CONFIRMATION_REPORT,
+                                          SHORT_REPORT,
+                                          DETAILED_REPORT,
+                                          NO_REPORT };
 
 //____________________________________________________________________________//
 
 //! Indicates the output format for the loggers or the test tree printing
-enum output_format { OF_INVALID,
-                     OF_CLF,      ///< compiler log format
-                     OF_XML,      ///< XML format for report and log,
-                     OF_JUNIT,    ///< JUNIT format for report and log,
-                     OF_CUSTOM_LOGGER, ///< User specified logger.
-                     OF_DOT       ///< dot format for output content
+enum BOOST_SYMBOL_VISIBLE output_format { OF_INVALID,
+                                          OF_CLF,      ///< compiler log format
+                                          OF_XML,      ///< XML format for report and log,
+                                          OF_JUNIT,    ///< JUNIT format for report and log,
+                                          OF_CUSTOM_LOGGER, ///< User specified logger.
+                                          OF_DOT       ///< dot format for output content
 };
 
 //____________________________________________________________________________//
diff --git a/inst/include/boost/test/impl/test_tools.ipp b/inst/include/boost/test/impl/test_tools.ipp
index 03b631ebb..e68e6e069 100644
--- a/inst/include/boost/test/impl/test_tools.ipp
+++ b/inst/include/boost/test/impl/test_tools.ipp
@@ -320,6 +320,11 @@ format_report( OutStream& os, assertion_result const& pr, unit_test::lazy_ostrea
 
 //____________________________________________________________________________//
 
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4702) // There is intentionally unreachable code
+#endif
+
 bool
 report_assertion( assertion_result const&   ar,
                   lazy_ostream const&       assertion_descr,
@@ -411,6 +416,10 @@ report_assertion( assertion_result const&   ar,
     return true;
 }
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
 //____________________________________________________________________________//
 
 assertion_result
diff --git a/inst/include/boost/test/prg_exec_monitor.hpp b/inst/include/boost/test/prg_exec_monitor.hpp
index f072e215d..8da2aa062 100644
--- a/inst/include/boost/test/prg_exec_monitor.hpp
+++ b/inst/include/boost/test/prg_exec_monitor.hpp
@@ -30,6 +30,7 @@
 
 // Automatically link to the correct build variant where possible.
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
+    !defined(BOOST_PRG_EXEC_MONITOR_NO_LIB) && \
     !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
 #  define BOOST_LIB_NAME boost_prg_exec_monitor
 
diff --git a/inst/include/boost/test/test_exec_monitor.hpp b/inst/include/boost/test/test_exec_monitor.hpp
index 045080933..144a8e0db 100644
--- a/inst/include/boost/test/test_exec_monitor.hpp
+++ b/inst/include/boost/test/test_exec_monitor.hpp
@@ -43,6 +43,7 @@
 
 // Automatically link to the correct build variant where possible.
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
+    !defined(BOOST_TEST_EXEC_MONITOR_NO_LIB) && \
     !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
 
 #  define BOOST_LIB_NAME boost_test_exec_monitor
diff --git a/inst/include/boost/test/tools/detail/fwd.hpp b/inst/include/boost/test/tools/detail/fwd.hpp
index 339ab39ed..cdec41958 100644
--- a/inst/include/boost/test/tools/detail/fwd.hpp
+++ b/inst/include/boost/test/tools/detail/fwd.hpp
@@ -42,8 +42,6 @@ class assertion_result;
 
 namespace tt_detail {
 
-inline bool dummy_cond() { return false; }
-
 // ************************************************************************** //
 // **************        types of supported assertions         ************** //
 // ************************************************************************** //
diff --git a/inst/include/boost/test/tools/detail/print_helper.hpp b/inst/include/boost/test/tools/detail/print_helper.hpp
index dafa2bd48..8c805907a 100644
--- a/inst/include/boost/test/tools/detail/print_helper.hpp
+++ b/inst/include/boost/test/tools/detail/print_helper.hpp
@@ -97,7 +97,7 @@ struct print_log_value {
     std::streamsize set_precision( std::ostream& ostr, mpl::false_ )
     {
         if( std::numeric_limits<T>::is_specialized && std::numeric_limits<T>::radix == 2 )
-            return ostr.precision( 2 + std::numeric_limits<T>::digits * 301/1000 );
+            return ostr.precision( 2 + std::streamsize(std::numeric_limits<T>::digits) * 301/1000 );
         else if ( std::numeric_limits<T>::is_specialized && std::numeric_limits<T>::radix == 10 ) {
 #ifdef BOOST_NO_CXX11_NUMERIC_LIMITS
             // (was BOOST_NO_NUMERIC_LIMITS_LOWEST but now deprecated).
diff --git a/inst/include/boost/test/tools/interface.hpp b/inst/include/boost/test/tools/interface.hpp
index e62ae946c..24c408a2e 100644
--- a/inst/include/boost/test/tools/interface.hpp
+++ b/inst/include/boost/test/tools/interface.hpp
@@ -55,7 +55,7 @@ do {                                                            \
         ::boost::test_tools::tt_detail::level,                  \
         ::boost::test_tools::tt_detail::CHECK_MSG,              \
         0 );                                                    \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )         \
+} while( 0 )                                                    \
 /**/
 
 //____________________________________________________________________________//
@@ -74,7 +74,7 @@ do {                                                            \
       ::boost::test_tools::tt_detail::level,                    \
       ::boost::test_tools::tt_detail::CHECK_BUILT_ASSERTION,    \
       0 );                                                      \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )         \
+} while( 0 )                                                    \
 /**/
 
 //____________________________________________________________________________//
@@ -98,7 +98,7 @@ do {                                                            \
       ::boost::test_tools::tt_detail::assertion_type()          \
           << arg,                                               \
       0 );                                                      \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )         \
+} while( 0 )                                                    \
 /**/
 
 //____________________________________________________________________________//
@@ -121,7 +121,7 @@ do {                                                                        \
         BOOST_TEST_TOOL_DIRECT_IMPL( P, level, BOOST_TEST_STRINGIZE( P ) ); \
     else                                                                    \
         BOOST_TEST_TOOL_ET_IMPL( P, level );                                \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )                     \
+} while( 0 )                                                                \
 /**/
 
 #define BOOST_TEST_TOOL_UNIV_EX( level, P, ... )                            \
@@ -177,7 +177,7 @@ do { try {                                                                  \
     BOOST_TEST_TOOL_DIRECT_IMPL( Ppassed, TL, Mpassed );                    \
 } catch( E ) {                                                              \
     BOOST_TEST_TOOL_DIRECT_IMPL( Pcaught, TL, Mcaught );                    \
-}} while( ::boost::test_tools::tt_detail::dummy_cond() )                    \
+}} while( 0 )                                                               \
 /**/
 
 #elif defined(BOOST_TEST_TOOLS_DEBUGGABLE)
@@ -190,7 +190,7 @@ do { try {                                                                  \
     BOOST_TEST_TOOL_DIRECT_IMPL( Ppassed, TL, Mpassed );                    \
 } catch( E ) {                                                              \
     BOOST_TEST_TOOL_DIRECT_IMPL( Pcaught, TL, Mcaught );                    \
-}} while( ::boost::test_tools::tt_detail::dummy_cond() )                    \
+}} while( 0 )                                                               \
 /**/
 
 #else
@@ -202,7 +202,7 @@ do { try {                                                                  \
     BOOST_TEST_TOOL_DIRECT_IMPL( Ppassed, TL, Mpassed );                    \
 } catch( E ) {                                                              \
     BOOST_TEST_TOOL_DIRECT_IMPL( Pcaught, TL, Mcaught );                    \
-}} while( ::boost::test_tools::tt_detail::dummy_cond() )                    \
+}} while( 0 )                                                               \
 /**/
 
 #endif
diff --git a/inst/include/boost/test/tools/old/interface.hpp b/inst/include/boost/test/tools/old/interface.hpp
index 1b23c291a..b09b0cf3c 100644
--- a/inst/include/boost/test/tools/old/interface.hpp
+++ b/inst/include/boost/test/tools/old/interface.hpp
@@ -72,7 +72,7 @@ do {
         ::boost::test_tools::tt_detail::TL,                                     \
         ::boost::test_tools::tt_detail::CT                                      \
         BOOST_JOIN( BOOST_TEST_TOOL_PASS_ARGS, frwd_type )( ARGS ) );           \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )                         \
+} while( 0 )                                                                    \
 /**/
 
 //____________________________________________________________________________//
@@ -110,7 +110,7 @@ do {
                               "exception \"" BOOST_STRINGIZE( E )"\" raised as expected" postfix,   \
                               TL, CHECK_MSG, _  );                                      \
     }                                                                                   \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )                                 \
+} while( 0 )                                                                            \
 /**/
 
 //____________________________________________________________________________//
@@ -140,7 +140,7 @@ do {
         BOOST_TEST_TOOL_IMPL( 2, false, "unexpected exception thrown by " BOOST_STRINGIZE( S ),    \
                               TL, CHECK_MSG, _ );                                       \
     }                                                                                   \
-} while( ::boost::test_tools::tt_detail::dummy_cond() )                                 \
+} while( 0 )                                                                            \
 /**/
 
 #define BOOST_WARN_NO_THROW( S )            BOOST_CHECK_NO_THROW_IMPL( S, WARN )
diff --git a/inst/include/boost/test/unit_test.hpp b/inst/include/boost/test/unit_test.hpp
index 879b09c0a..5f529c753 100644
--- a/inst/include/boost/test/unit_test.hpp
+++ b/inst/include/boost/test/unit_test.hpp
@@ -25,6 +25,7 @@
 // ************************************************************************** //
 
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
+    !defined(BOOST_UNIT_TEST_FRAMEWORK_NO_LIB) && \
     !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED) && \
     defined(BOOST_TEST_MAIN)
 #  define BOOST_LIB_NAME boost_unit_test_framework
diff --git a/inst/include/boost/test/utils/named_params.hpp b/inst/include/boost/test/utils/named_params.hpp
index 26dac798f..ceabd6034 100644
--- a/inst/include/boost/test/utils/named_params.hpp
+++ b/inst/include/boost/test/utils/named_params.hpp
@@ -131,11 +131,11 @@ struct nil {
 #else
     operator T const&() const
 #endif
-    { nfp_detail::report_access_to_invalid_parameter(true); static T* v = 0; return *v; }
+    { nfp_detail::report_access_to_invalid_parameter(true); BOOST_TEST_UNREACHABLE_RETURN(*static_cast<T*>(0)); }
 
     template<typename T>
     T any_cast() const
-    { nfp_detail::report_access_to_invalid_parameter(true); static typename remove_reference<T>::type* v = 0; return *v; }
+    { nfp_detail::report_access_to_invalid_parameter(true); BOOST_TEST_UNREACHABLE_RETURN(*static_cast<typename std::remove_reference<T>::type*>(0)); }
 
     template<typename Arg1>
     nil operator()( Arg1 const& )
diff --git a/inst/include/boost/type_index.hpp b/inst/include/boost/type_index.hpp
index 41a1bbfc3..367dc8d51 100644
--- a/inst/include/boost/type_index.hpp
+++ b/inst/include/boost/type_index.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2012-2023 Antony Polukhin.
+// Copyright 2012-2024 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/inst/include/boost/type_index/ctti_type_index.hpp b/inst/include/boost/type_index/ctti_type_index.hpp
index d6717f3b8..f54a4faf9 100644
--- a/inst/include/boost/type_index/ctti_type_index.hpp
+++ b/inst/include/boost/type_index/ctti_type_index.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2013-2023 Antony Polukhin.
+// Copyright 2013-2024 Antony Polukhin.
 //
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/type_index/detail/compile_time_type_info.hpp b/inst/include/boost/type_index/detail/compile_time_type_info.hpp
index 9d6129a8d..236c4ab79 100644
--- a/inst/include/boost/type_index/detail/compile_time_type_info.hpp
+++ b/inst/include/boost/type_index/detail/compile_time_type_info.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2012-2023 Antony Polukhin.
+// Copyright 2012-2024 Antony Polukhin.
 //
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/type_index/detail/ctti_register_class.hpp b/inst/include/boost/type_index/detail/ctti_register_class.hpp
index 9c69d49c6..57e55d9c6 100644
--- a/inst/include/boost/type_index/detail/ctti_register_class.hpp
+++ b/inst/include/boost/type_index/detail/ctti_register_class.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2013-2023 Antony Polukhin.
+// Copyright 2013-2024 Antony Polukhin.
 //
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/type_index/detail/stl_register_class.hpp b/inst/include/boost/type_index/detail/stl_register_class.hpp
index 20eb818af..ee4a64f06 100644
--- a/inst/include/boost/type_index/detail/stl_register_class.hpp
+++ b/inst/include/boost/type_index/detail/stl_register_class.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2013-2023 Antony Polukhin.
+// Copyright 2013-2024 Antony Polukhin.
 //
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/type_index/stl_type_index.hpp b/inst/include/boost/type_index/stl_type_index.hpp
index 66d66e238..3e86e04a2 100644
--- a/inst/include/boost/type_index/stl_type_index.hpp
+++ b/inst/include/boost/type_index/stl_type_index.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2013-2023 Antony Polukhin.
+// Copyright 2013-2024 Antony Polukhin.
 //
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/type_index/type_index_facade.hpp b/inst/include/boost/type_index/type_index_facade.hpp
index e4691af80..421e06b1c 100644
--- a/inst/include/boost/type_index/type_index_facade.hpp
+++ b/inst/include/boost/type_index/type_index_facade.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2013-2023 Antony Polukhin.
+// Copyright 2013-2024 Antony Polukhin.
 //
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/inst/include/boost/type_traits/is_floating_point.hpp b/inst/include/boost/type_traits/is_floating_point.hpp
index 196c900cf..f9f3d3956 100644
--- a/inst/include/boost/type_traits/is_floating_point.hpp
+++ b/inst/include/boost/type_traits/is_floating_point.hpp
@@ -10,6 +10,10 @@
 
 #include <boost/type_traits/integral_constant.hpp>
 
+#ifndef BOOST_NO_CXX23_HDR_STDFLOAT
+#include <stdfloat>
+#endif
+
 namespace boost {
 
 //* is a type T a floating-point type described in the standard (3.9.1p8)
@@ -25,6 +29,24 @@ namespace boost {
    template<> struct is_floating_point<__float128> : public true_type{};
 #endif
 
+#ifndef BOOST_NO_CXX23_HDR_STDFLOAT
+#if defined(__STDCPP_FLOAT16_T__)
+   template<> struct is_floating_point<std::float16_t> : public true_type {};
+#endif
+#if defined(__STDCPP_FLOAT32_T__)
+   template<> struct is_floating_point<std::float32_t> : public true_type {};
+#endif
+#if defined(__STDCPP_FLOAT64_T__)
+   template<> struct is_floating_point<std::float64_t> : public true_type {};
+#endif
+#if defined(__STDCPP_FLOAT128_T__)
+   template<> struct is_floating_point<std::float128_t> : public true_type {};
+#endif
+#if defined(__STDCPP_BFLOAT16_T__)
+   template<> struct is_floating_point<std::bfloat16_t> : public true_type {};
+#endif
+#endif
+
 } // namespace boost
 
 #endif // BOOST_TYPE_TRAITS_IS_FLOAT_HPP_INCLUDED
diff --git a/inst/include/boost/units/cmath.hpp b/inst/include/boost/units/cmath.hpp
new file mode 100644
index 000000000..da3da46f4
--- /dev/null
+++ b/inst/include/boost/units/cmath.hpp
@@ -0,0 +1,729 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and 
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2007-2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_CMATH_HPP 
+#define BOOST_UNITS_CMATH_HPP
+
+#include <boost/config/no_tr1/cmath.hpp>
+#include <cstdlib>
+
+#include <boost/math/special_functions/fpclassify.hpp>
+#include <boost/math/special_functions/hypot.hpp>
+#include <boost/math/special_functions/next.hpp>
+#include <boost/math/special_functions/round.hpp>
+#include <boost/math/special_functions/sign.hpp>
+
+#include <boost/units/dimensionless_quantity.hpp>
+#include <boost/units/pow.hpp>
+#include <boost/units/quantity.hpp>
+#include <boost/units/detail/cmath_impl.hpp>
+#include <boost/units/detail/dimensionless_unit.hpp>
+
+#include <boost/units/systems/si/plane_angle.hpp>
+
+/// \file
+/// \brief Overloads of functions in \<cmath\> for quantities.
+/// \details Only functions for which a dimensionally-correct result type
+///   can be determined are overloaded.
+///   All functions work with dimensionless quantities.
+
+// BOOST_PREVENT_MACRO_SUBSTITUTION is needed on certain compilers that define 
+// some <cmath> functions as macros; it is used for all functions even though it
+// isn't necessary -- I didn't want to think :)
+//
+// the form using namespace detail; return(f(x)); is used
+// to enable ADL for UDTs.
+
+namespace boost {
+
+namespace units { 
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isfinite BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{ 
+    using boost::math::isfinite;
+    return isfinite BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isinf BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{ 
+    using boost::math::isinf;
+    return isinf BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
+}
+
+template<class Unit,class Y>
+inline
+BOOST_CONSTEXPR
+bool 
+isnan BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{ 
+    using boost::math::isnan;
+    return isnan BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isnormal BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{ 
+    using boost::math::isnormal;
+    return isnormal BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isgreater BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                            const quantity<Unit,Y>& q2)
+{ 
+    using namespace detail;
+    return isgreater BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                                 const quantity<Unit,Y>& q2)
+{ 
+    using namespace detail;
+    return isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isless BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                         const quantity<Unit,Y>& q2)
+{ 
+    using namespace detail;
+    return isless BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+islessequal BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                              const quantity<Unit,Y>& q2)
+{ 
+    using namespace detail;
+    return islessequal BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                                const quantity<Unit,Y>& q2)
+{ 
+    using namespace detail;
+    return islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+bool 
+isunordered BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                              const quantity<Unit,Y>& q2)
+{ 
+    using namespace detail;
+    return isunordered BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+abs BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using std::abs;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(abs BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+ceil BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using std::ceil;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(ceil BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+copysign BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+         const quantity<Unit,Y>& q2)
+{
+    using boost::math::copysign;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(copysign BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+fabs BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using std::fabs;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(fabs BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+floor BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using std::floor;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(floor BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+fdim BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                       const quantity<Unit,Y>& q2)
+{
+    using namespace detail;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(fdim BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+
+#if 0
+
+template<class Unit1,class Unit2,class Unit3,class Y>
+inline 
+BOOST_CONSTEXPR
+typename add_typeof_helper<
+    typename multiply_typeof_helper<quantity<Unit1,Y>,
+                                    quantity<Unit2,Y> >::type,
+    quantity<Unit3,Y> >::type 
+fma BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit1,Y>& q1,
+                                      const quantity<Unit2,Y>& q2,
+                                      const quantity<Unit3,Y>& q3)
+{
+    using namespace detail;
+
+    typedef quantity<Unit1,Y>   type1;
+    typedef quantity<Unit2,Y>   type2;
+    typedef quantity<Unit3,Y>   type3;
+    
+    typedef typename multiply_typeof_helper<type1,type2>::type  prod_type;
+    typedef typename add_typeof_helper<prod_type,type3>::type   quantity_type;
+    
+    return quantity_type::from_value(fma BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value(),q3.value()));
+}
+
+#endif
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+fmax BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                       const quantity<Unit,Y>& q2)
+{
+    using namespace detail;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(fmax BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+fmin BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                       const quantity<Unit,Y>& q2)
+{
+    using namespace detail;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(fmin BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+int 
+fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{ 
+    using boost::math::fpclassify;
+
+    return fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+typename root_typeof_helper<
+    typename add_typeof_helper<
+        typename power_typeof_helper<quantity<Unit,Y>,
+                                     static_rational<2> >::type,
+        typename power_typeof_helper<quantity<Unit,Y>,
+                                     static_rational<2> >::type>::type,
+        static_rational<2> >::type
+hypot BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,const quantity<Unit,Y>& q2)
+{
+    using boost::math::hypot;
+
+    typedef quantity<Unit,Y>    type1;
+    
+    typedef typename power_typeof_helper<type1,static_rational<2> >::type   pow_type;
+    typedef typename add_typeof_helper<pow_type,pow_type>::type             add_type;
+    typedef typename root_typeof_helper<add_type,static_rational<2> >::type quantity_type;
+        
+    return quantity_type::from_value(hypot BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+
+// does ISO C++ support long long? g++ claims not
+//template<class Unit,class Y>
+//inline 
+//BOOST_CONSTEXPR
+//quantity<Unit,long long> 
+//llrint BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+//{
+//    using namespace detail;
+//
+//    typedef quantity<Unit,long long>    quantity_type;
+//    
+//    return quantity_type::from_value(llrint BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+//}
+
+// does ISO C++ support long long? g++ claims not
+//template<class Unit,class Y>
+//inline 
+//BOOST_CONSTEXPR
+//quantity<Unit,long long> 
+//llround BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+//{
+//    using namespace detail;
+//
+//    typedef quantity<Unit,long long>    quantity_type;
+//    
+//    return quantity_type::from_value(llround BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+//}
+
+#if 0
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+nearbyint BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using namespace detail;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(nearbyint BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+#endif
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> nextafter BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                                             const quantity<Unit,Y>& q2)
+{
+    using boost::math::nextafter;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(nextafter BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
+                                                              const quantity<Unit,Y>& q2)
+{
+    // the only difference between nextafter and nexttowards is
+    // in the argument types.  Since we are requiring identical
+    // argument types, there is no difference.
+    using boost::math::nextafter;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(nextafter BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
+}
+
+#if 0
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+rint BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using namespace detail;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(rint BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+#endif
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+round BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using boost::math::round;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(round BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+int 
+signbit BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{ 
+    using boost::math::signbit;
+
+    return signbit BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+quantity<Unit,Y> 
+trunc BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
+{
+    using namespace detail;
+
+    typedef quantity<Unit,Y>    quantity_type;
+    
+    return quantity_type::from_value(trunc BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
+}
+
+template<class Unit,class Y>
+inline
+BOOST_CONSTEXPR
+quantity<Unit, Y>
+fmod(const quantity<Unit,Y>& q1, const quantity<Unit,Y>& q2)
+{
+    using std::fmod;
+    
+    typedef quantity<Unit,Y> quantity_type;
+
+    return quantity_type::from_value(fmod(q1.value(), q2.value()));
+}
+
+template<class Unit, class Y>
+inline
+BOOST_CONSTEXPR
+quantity<Unit, Y>
+modf(const quantity<Unit, Y>& q1, quantity<Unit, Y>* q2)
+{
+    using std::modf;
+
+    typedef quantity<Unit,Y> quantity_type;
+
+    return quantity_type::from_value(modf(q1.value(), &quantity_cast<Y&>(*q2)));
+}
+
+template<class Unit, class Y, class Int>
+inline
+BOOST_CONSTEXPR
+quantity<Unit, Y>
+frexp(const quantity<Unit, Y>& q,Int* ex)
+{
+    using std::frexp;
+
+    typedef quantity<Unit,Y> quantity_type;
+
+    return quantity_type::from_value(frexp(q.value(),ex));
+}
+
+/// For non-dimensionless quantities, integral and rational powers 
+/// and roots can be computed by @c pow<Ex> and @c root<Rt> respectively.
+template<class S, class Y>
+inline
+BOOST_CONSTEXPR
+quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>
+pow(const quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>& q1,
+    const quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>& q2)
+{
+    using std::pow;
+
+    typedef quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S),Y> quantity_type;
+
+    return quantity_type::from_value(pow(q1.value(), q2.value()));
+}
+
+template<class S, class Y>
+inline
+BOOST_CONSTEXPR
+quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>
+exp(const quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>& q)
+{
+    using std::exp;
+
+    typedef quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y> quantity_type;
+
+    return quantity_type::from_value(exp(q.value()));
+}
+
+template<class Unit, class Y, class Int>
+inline
+BOOST_CONSTEXPR
+quantity<Unit, Y>
+ldexp(const quantity<Unit, Y>& q,const Int& ex)
+{
+    using std::ldexp;
+
+    typedef quantity<Unit,Y> quantity_type;
+
+    return quantity_type::from_value(ldexp(q.value(), ex));
+}
+
+template<class S, class Y>
+inline
+BOOST_CONSTEXPR
+quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>
+log(const quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>& q)
+{
+    using std::log;
+
+    typedef quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y> quantity_type;
+
+    return quantity_type::from_value(log(q.value()));
+}
+
+template<class S, class Y>
+inline
+BOOST_CONSTEXPR
+quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>
+log10(const quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y>& q)
+{
+    using std::log10;
+
+    typedef quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(S), Y> quantity_type;
+
+    return quantity_type::from_value(log10(q.value()));
+}
+
+template<class Unit,class Y>
+inline 
+BOOST_CONSTEXPR
+typename root_typeof_helper<
+                            quantity<Unit,Y>,
+                            static_rational<2>
+                           >::type
+sqrt(const quantity<Unit,Y>& q)
+{
+    using std::sqrt;
+
+    typedef typename root_typeof_helper<
+                                        quantity<Unit,Y>,
+                                        static_rational<2>
+                                       >::type quantity_type;
+
+    return quantity_type::from_value(sqrt(q.value()));
+}
+
+} // namespace units
+
+} // namespace boost
+
+namespace boost {
+
+namespace units {
+
+// trig functions with si argument/return types
+
+/// cos of theta in radians
+template<class Y>
+BOOST_CONSTEXPR
+typename dimensionless_quantity<si::system,Y>::type 
+cos(const quantity<si::plane_angle,Y>& theta)
+{
+    using std::cos;
+    return cos(theta.value());
+}
+
+/// sin of theta in radians
+template<class Y>
+BOOST_CONSTEXPR
+typename dimensionless_quantity<si::system,Y>::type 
+sin(const quantity<si::plane_angle,Y>& theta)
+{
+    using std::sin;
+    return sin(theta.value());
+}
+
+/// tan of theta in radians
+template<class Y>
+BOOST_CONSTEXPR
+typename dimensionless_quantity<si::system,Y>::type 
+tan(const quantity<si::plane_angle,Y>& theta)
+{
+    using std::tan;
+    return tan(theta.value());
+}
+
+/// cos of theta in other angular units 
+template<class System,class Y>
+BOOST_CONSTEXPR
+typename dimensionless_quantity<System,Y>::type 
+cos(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
+{
+    return cos(quantity<si::plane_angle,Y>(theta));
+}
+
+/// sin of theta in other angular units 
+template<class System,class Y>
+BOOST_CONSTEXPR
+typename dimensionless_quantity<System,Y>::type 
+sin(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
+{
+    return sin(quantity<si::plane_angle,Y>(theta));
+}
+
+/// tan of theta in other angular units 
+template<class System,class Y>
+BOOST_CONSTEXPR
+typename dimensionless_quantity<System,Y>::type 
+tan(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
+{
+    return tan(quantity<si::plane_angle,Y>(theta));
+}
+
+/// acos of dimensionless quantity returning angle in same system
+template<class Y,class System>
+BOOST_CONSTEXPR
+quantity<unit<plane_angle_dimension, homogeneous_system<System> >,Y>
+acos(const quantity<unit<dimensionless_type, homogeneous_system<System> >,Y>& val)
+{
+    using std::acos;
+    return quantity<unit<plane_angle_dimension, homogeneous_system<System> >,Y>(acos(val.value())*si::radians);
+}
+
+/// acos of dimensionless quantity returning angle in radians
+template<class Y>
+BOOST_CONSTEXPR
+quantity<angle::radian_base_unit::unit_type,Y>
+acos(const quantity<unit<dimensionless_type, heterogeneous_dimensionless_system>,Y>& val)
+{
+    using std::acos;
+    return quantity<angle::radian_base_unit::unit_type,Y>::from_value(acos(val.value()));
+}
+
+/// asin of dimensionless quantity returning angle in same system
+template<class Y,class System>
+BOOST_CONSTEXPR
+quantity<unit<plane_angle_dimension, homogeneous_system<System> >,Y>
+asin(const quantity<unit<dimensionless_type, homogeneous_system<System> >,Y>& val)
+{
+    using std::asin;
+    return quantity<unit<plane_angle_dimension, homogeneous_system<System> >,Y>(asin(val.value())*si::radians);
+}
+
+/// asin of dimensionless quantity returning angle in radians
+template<class Y>
+BOOST_CONSTEXPR
+quantity<angle::radian_base_unit::unit_type,Y>
+asin(const quantity<unit<dimensionless_type, heterogeneous_dimensionless_system>,Y>& val)
+{
+    using std::asin;
+    return quantity<angle::radian_base_unit::unit_type,Y>::from_value(asin(val.value()));
+}
+
+/// atan of dimensionless quantity returning angle in same system
+template<class Y,class System>
+BOOST_CONSTEXPR
+quantity<unit<plane_angle_dimension, homogeneous_system<System> >,Y>
+atan(const quantity<unit<dimensionless_type, homogeneous_system<System> >, Y>& val)
+{
+    using std::atan;
+    return quantity<unit<plane_angle_dimension, homogeneous_system<System> >,Y>(atan(val.value())*si::radians);
+}
+
+/// atan of dimensionless quantity returning angle in radians
+template<class Y>
+BOOST_CONSTEXPR
+quantity<angle::radian_base_unit::unit_type,Y>
+atan(const quantity<unit<dimensionless_type, heterogeneous_dimensionless_system>, Y>& val)
+{
+    using std::atan;
+    return quantity<angle::radian_base_unit::unit_type,Y>::from_value(atan(val.value()));
+}
+
+/// atan2 of @c value_type returning angle in radians
+template<class Y, class Dimension, class System>
+BOOST_CONSTEXPR
+quantity<unit<plane_angle_dimension, homogeneous_system<System> >, Y>
+atan2(const quantity<unit<Dimension, homogeneous_system<System> >, Y>& y,
+      const quantity<unit<Dimension, homogeneous_system<System> >, Y>& x)
+{
+    using std::atan2;
+    return quantity<unit<plane_angle_dimension, homogeneous_system<System> >, Y>(atan2(y.value(),x.value())*si::radians);
+}
+
+/// atan2 of @c value_type returning angle in radians
+template<class Y, class Dimension, class System>
+BOOST_CONSTEXPR
+quantity<angle::radian_base_unit::unit_type,Y>
+atan2(const quantity<unit<Dimension, heterogeneous_system<System> >, Y>& y,
+      const quantity<unit<Dimension, heterogeneous_system<System> >, Y>& x)
+{
+    using std::atan2;
+    return quantity<angle::radian_base_unit::unit_type,Y>::from_value(atan2(y.value(),x.value()));
+}
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_CMATH_HPP
diff --git a/inst/include/boost/units/detail/cmath_impl.hpp b/inst/include/boost/units/detail/cmath_impl.hpp
new file mode 100644
index 000000000..d5bec14f4
--- /dev/null
+++ b/inst/include/boost/units/detail/cmath_impl.hpp
@@ -0,0 +1,154 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and 
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_CMATH_IMPL_HPP 
+#define BOOST_UNITS_CMATH_IMPL_HPP
+
+#include <boost/config.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+
+namespace boost {
+namespace units {
+namespace detail {
+
+template<class Y> 
+inline bool isgreater BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
+    else return v1 > v2;
+}
+
+template<class Y> 
+inline bool isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
+    else return v1 >= v2;
+}
+
+template<class Y> 
+inline bool isless BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
+    else return v1 < v2;
+}
+
+template<class Y> 
+inline bool islessequal BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
+    else return v1 <= v2;
+}
+
+template<class Y> 
+inline bool islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
+    else return v1 < v2 || v1 > v2;
+}
+
+template<class Y> 
+inline bool isunordered BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    return (boost::math::isnan)(v1) || (boost::math::isnan)(v2);
+}
+
+template<class Y>
+inline Y fdim BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1)) return v1;
+    else if((boost::math::isnan)(v2)) return v2;
+    else if(v1 > v2) return(v1 - v2);
+    else return(Y(0));
+}
+
+#if 0
+
+template<class T>
+struct fma_issue_warning {
+    enum { value = false };
+};
+
+template<class Y>
+inline Y fma(const Y& v1,const Y& v2,const Y& v3)
+{
+    //this implementation does *not* meet the
+    //requirement of infinite intermediate precision
+    BOOST_STATIC_WARNING((fma_issue_warning<Y>::value));
+
+    return v1 * v2 + v3;
+}
+
+#endif
+
+template<class Y>
+inline Y fmax BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1)) return(v2);
+    else if((boost::math::isnan)(v2)) return(v1);
+    else if(v1 > v2) return(v1);
+    else return(v2);
+}
+
+template<class Y>
+inline Y fmin BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
+{
+    if((boost::math::isnan)(v1)) return(v2);
+    else if((boost::math::isnan)(v2)) return(v1);
+    else if(v1 < v2) return(v1);
+    else return(v2);
+}
+
+//template<class Y>
+//inline long long llrint(const Y& val)
+//{
+//    return static_cast<long long>(rint(val));
+//}
+//
+//template<class Y>
+//inline long long llround(const Y& val)
+//{
+//    return static_cast<long long>(round(val));
+//}
+
+#if 0
+
+template<class Y>
+inline Y nearbyint(const Y& val)
+{
+    //this is not really correct.
+    //the result should be according to the
+    //current rounding mode.
+    using boost::math::round;
+    return round(val);
+}
+
+template<class Y>
+inline Y rint(const Y& val)
+{
+    //I don't feel like trying to figure out
+    //how to raise a floating pointer exception
+    return nearbyint(val);
+}
+
+#endif
+
+template<class Y>
+inline Y trunc BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& val)
+{
+    if(val > 0) return std::floor(val);
+    else if(val < 0) return std::ceil(val);
+    else return val;
+}
+
+}
+}
+}
+
+#endif // BOOST_UNITS_CMATH_IMPL_HPP
diff --git a/inst/include/boost/units/dimensionless_quantity.hpp b/inst/include/boost/units/dimensionless_quantity.hpp
new file mode 100644
index 000000000..7ac6bfb97
--- /dev/null
+++ b/inst/include/boost/units/dimensionless_quantity.hpp
@@ -0,0 +1,37 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and 
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_DIMENSIONLESS_QUANTITY_HPP
+#define BOOST_UNITS_DIMENSIONLESS_QUANTITY_HPP
+
+///
+/// \file
+/// \brief Utility class to simplify construction of dimensionless quantities.
+///
+
+#include <boost/units/dimensionless_unit.hpp>
+#include <boost/units/quantity.hpp>
+
+namespace boost {
+
+namespace units {
+
+/// Utility class to simplify construction of dimensionless quantities.
+template<class System,class Y>
+struct dimensionless_quantity
+{
+    typedef quantity<typename dimensionless_unit<System>::type,Y>   type;
+};
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_DIMENSIONLESS_QUANTITY_HPP
diff --git a/inst/include/boost/units/dimensionless_unit.hpp b/inst/include/boost/units/dimensionless_unit.hpp
new file mode 100644
index 000000000..8e6368f8a
--- /dev/null
+++ b/inst/include/boost/units/dimensionless_unit.hpp
@@ -0,0 +1,37 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and 
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_DIMENSIONLESS_UNIT_HPP
+#define BOOST_UNITS_DIMENSIONLESS_UNIT_HPP
+
+///
+/// \file
+/// \brief Utility class to simplify construction of dimensionless units in a system.
+///
+
+#include <boost/units/dimensionless_type.hpp>
+#include <boost/units/unit.hpp>
+
+namespace boost {
+
+namespace units {
+
+/// Utility class to simplify construction of dimensionless units in a system.
+template<class System>
+struct dimensionless_unit
+{
+    typedef unit<dimensionless_type,System> type;
+};
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_DIMENSIONLESS_UNIT_HPP
diff --git a/inst/include/boost/units/pow.hpp b/inst/include/boost/units/pow.hpp
new file mode 100644
index 000000000..a6772eec6
--- /dev/null
+++ b/inst/include/boost/units/pow.hpp
@@ -0,0 +1,115 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and 
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_POW_HPP 
+#define BOOST_UNITS_POW_HPP
+
+#include <boost/type_traits/is_integral.hpp>
+
+#include <boost/units/operators.hpp>
+#include <boost/units/static_rational.hpp>
+#include <boost/units/detail/static_rational_power.hpp>
+
+/// \file 
+/// \brief Raise values to exponents known at compile-time.
+
+namespace boost {
+
+namespace units {
+
+/// raise a value to a @c static_rational power.
+template<class Rat,class Y>
+BOOST_CONSTEXPR
+inline typename power_typeof_helper<Y,Rat>::type
+pow(const Y& x)
+{
+    return power_typeof_helper<Y,Rat>::value(x);
+}
+
+/// raise a value to an integer power.
+template<long N,class Y>
+BOOST_CONSTEXPR
+inline typename power_typeof_helper<Y,static_rational<N> >::type
+pow(const Y& x)
+{
+    return power_typeof_helper<Y,static_rational<N> >::value(x);
+}
+
+#ifndef BOOST_UNITS_DOXYGEN
+
+/// raise @c T to a @c static_rational power.
+template<class T, long N,long D> 
+struct power_typeof_helper<T, static_rational<N,D> >                
+{ 
+    typedef typename mpl::if_<boost::is_integral<T>, double, T>::type internal_type;
+    typedef detail::static_rational_power_impl<static_rational<N, D>, internal_type> impl;
+    typedef typename impl::type type; 
+    
+    static BOOST_CONSTEXPR type value(const T& x)  
+    {
+        return impl::call(x);
+    }
+};
+
+/// raise @c float to a @c static_rational power.
+template<long N,long D> 
+struct power_typeof_helper<float, static_rational<N,D> >
+{
+    // N.B.  pathscale doesn't accept inheritance for some reason.
+    typedef power_typeof_helper<double, static_rational<N,D> > base;
+    typedef typename base::type type;
+    static BOOST_CONSTEXPR type value(const double& x)
+    {
+        return base::value(x);
+    }
+};
+
+#endif
+
+/// take the @c static_rational root of a value.
+template<class Rat,class Y>
+BOOST_CONSTEXPR
+typename root_typeof_helper<Y,Rat>::type
+root(const Y& x)
+{
+    return root_typeof_helper<Y,Rat>::value(x);
+}
+
+/// take the integer root of a value.
+template<long N,class Y>
+BOOST_CONSTEXPR
+typename root_typeof_helper<Y,static_rational<N> >::type
+root(const Y& x)
+{
+    return root_typeof_helper<Y,static_rational<N> >::value(x);
+}
+
+#ifndef BOOST_UNITS_DOXYGEN
+
+/// take @c static_rational root of an @c T
+template<class T, long N,long D> 
+struct root_typeof_helper<T,static_rational<N,D> >
+{
+    // N.B.  pathscale doesn't accept inheritance for some reason.
+    typedef power_typeof_helper<T, static_rational<D,N> > base;
+    typedef typename base::type type;
+    static BOOST_CONSTEXPR type value(const T& x)
+    {
+        return(base::value(x));
+    }
+};
+
+#endif
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_STATIC_RATIONAL_HPP
diff --git a/inst/include/boost/unordered/concurrent_flat_map.hpp b/inst/include/boost/unordered/concurrent_flat_map.hpp
index 15f45de23..77445d187 100644
--- a/inst/include/boost/unordered/concurrent_flat_map.hpp
+++ b/inst/include/boost/unordered/concurrent_flat_map.hpp
@@ -1,7 +1,7 @@
 /* Fast open-addressing concurrent hashmap.
  *
  * Copyright 2023 Christian Mazakas.
- * Copyright 2023 Joaquin M Lopez Munoz.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -75,6 +75,10 @@ namespace boost {
         typename boost::allocator_const_pointer<allocator_type>::type;
       static constexpr size_type bulk_visit_size = table_type::bulk_visit_size;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       concurrent_flat_map()
           : concurrent_flat_map(detail::foa::default_bucket_count)
       {
@@ -186,6 +190,7 @@ namespace boost {
       }
 
 
+      template <bool avoid_explicit_instantiation = true>
       concurrent_flat_map(
         unordered_flat_map<Key, T, Hash, Pred, Allocator>&& other)
           : table_(std::move(other.table_))
@@ -415,16 +420,18 @@ namespace boost {
       }
 
       template <class InputIterator>
-      void insert(InputIterator begin, InputIterator end)
+      size_type insert(InputIterator begin, InputIterator end)
       {
-        for (auto pos = begin; pos != end; ++pos) {
+        size_type count_elements = 0;
+        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
           table_.emplace(*pos);
         }
+        return count_elements;
       }
 
-      void insert(std::initializer_list<value_type> ilist)
+      size_type insert(std::initializer_list<value_type> ilist)
       {
-        this->insert(ilist.begin(), ilist.end());
+        return this->insert(ilist.begin(), ilist.end());
       }
 
       template <class M>
@@ -467,19 +474,21 @@ namespace boost {
       }
 
       template <class InputIterator, class F>
-      void insert_or_visit(InputIterator first, InputIterator last, F f)
+      size_type insert_or_visit(InputIterator first, InputIterator last, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
-        for (; first != last; ++first) {
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
           table_.emplace_or_visit(*first, f);
         }
+        return count_elements;
       }
 
       template <class F>
-      void insert_or_visit(std::initializer_list<value_type> ilist, F f)
+      size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
-        this->insert_or_visit(ilist.begin(), ilist.end(), f);
+        return this->insert_or_visit(ilist.begin(), ilist.end(), std::ref(f));
       }
 
       template <class Ty, class F>
@@ -498,19 +507,101 @@ namespace boost {
       }
 
       template <class InputIterator, class F>
-      void insert_or_cvisit(InputIterator first, InputIterator last, F f)
+      size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        for (; first != last; ++first) {
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
           table_.emplace_or_cvisit(*first, f);
         }
+        return count_elements;
       }
 
       template <class F>
-      void insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
+      size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
+        return this->insert_or_cvisit(ilist.begin(), ilist.end(), std::ref(f));
+      }
+
+      template <class Ty, class F1, class F2>
+      BOOST_FORCEINLINE auto insert_and_visit(Ty&& value, F1 f1, F2 f2)
+        -> decltype(table_.insert_and_visit(std::forward<Ty>(value), f1, f2))
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        return table_.insert_and_visit(std::forward<Ty>(value), f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_visit(init_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        return table_.insert_and_visit(std::move(obj), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_visit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_visit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_visit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        return this->insert_and_visit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
+      }
+
+      template <class Ty, class F1, class F2>
+      BOOST_FORCEINLINE auto insert_and_cvisit(Ty&& value, F1 f1, F2 f2)
+        -> decltype(table_.insert_and_cvisit(std::forward<Ty>(value), f1, f2))
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(std::forward<Ty>(value), f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_cvisit(init_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(std::move(obj), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_cvisit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_cvisit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_cvisit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return this->insert_and_cvisit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
       }
 
       template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args)
@@ -534,6 +625,30 @@ namespace boost {
           std::forward<Arg>(arg), std::forward<Args>(args)...);
       }
 
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_visit(
+         Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_visit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_cvisit(
+        Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_cvisit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
       template <class... Args>
       BOOST_FORCEINLINE bool try_emplace(key_type const& k, Args&&... args)
       {
@@ -609,6 +724,78 @@ namespace boost {
           std::forward<Arg>(arg), std::forward<Args>(args)...);
       }
 
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_visit(
+        key_type const& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_visit(
+          k, std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_cvisit(
+        key_type const& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_cvisit(
+          k, std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_visit(
+        key_type&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_visit(
+          std::move(k), std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_cvisit(
+        key_type&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_cvisit(
+          std::move(k), std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class K, class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_visit(
+        K&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_visit(std::forward<K>(k),
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class K, class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_cvisit(
+        K&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_cvisit(std::forward<K>(k),
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
       BOOST_FORCEINLINE size_type erase(key_type const& k)
       {
         return table_.erase(k);
@@ -714,6 +901,14 @@ namespace boost {
       void rehash(size_type n) { table_.rehash(n); }
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
       allocator_type get_allocator() const noexcept
diff --git a/inst/include/boost/unordered/concurrent_flat_map_fwd.hpp b/inst/include/boost/unordered/concurrent_flat_map_fwd.hpp
index 99fa130cc..e66f3674c 100644
--- a/inst/include/boost/unordered/concurrent_flat_map_fwd.hpp
+++ b/inst/include/boost/unordered/concurrent_flat_map_fwd.hpp
@@ -1,6 +1,7 @@
 /* Fast open-addressing concurrent hashmap.
  *
  * Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Braden Ganetsky.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -11,11 +12,16 @@
 #ifndef BOOST_UNORDERED_CONCURRENT_FLAT_MAP_FWD_HPP
 #define BOOST_UNORDERED_CONCURRENT_FLAT_MAP_FWD_HPP
 
+#include <boost/config.hpp>
 #include <boost/container_hash/hash_fwd.hpp>
 
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
 
@@ -43,6 +49,15 @@ namespace boost {
     typename concurrent_flat_map<K, T, H, P, A>::size_type erase_if(
       concurrent_flat_map<K, T, H, P, A>& c, Predicate pred);
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class T, class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key> >
+      using concurrent_flat_map = boost::unordered::concurrent_flat_map<Key, T,
+        Hash, Pred, std::pmr::polymorphic_allocator<std::pair<Key const, T> > >;
+    } // namespace pmr
+#endif
+
   } // namespace unordered
 
   using boost::unordered::concurrent_flat_map;
diff --git a/inst/include/boost/unordered/concurrent_flat_set.hpp b/inst/include/boost/unordered/concurrent_flat_set.hpp
index 57f20cdd8..f0f44308e 100644
--- a/inst/include/boost/unordered/concurrent_flat_set.hpp
+++ b/inst/include/boost/unordered/concurrent_flat_set.hpp
@@ -1,7 +1,7 @@
 /* Fast open-addressing concurrent hashset.
  *
  * Copyright 2023 Christian Mazakas.
- * Copyright 2023 Joaquin M Lopez Munoz.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -72,6 +72,10 @@ namespace boost {
         typename boost::allocator_const_pointer<allocator_type>::type;
       static constexpr size_type bulk_visit_size = table_type::bulk_visit_size;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       concurrent_flat_set()
           : concurrent_flat_set(detail::foa::default_bucket_count)
       {
@@ -183,6 +187,7 @@ namespace boost {
       }
 
 
+      template <bool avoid_explicit_instantiation = true>
       concurrent_flat_set(
         unordered_flat_set<Key, Hash, Pred, Allocator>&& other)
           : table_(std::move(other.table_))
@@ -223,6 +228,13 @@ namespace boost {
         return size() == 0;
       }
 
+      template <class F>
+      BOOST_FORCEINLINE size_type visit(key_type const& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
       template <class F>
       BOOST_FORCEINLINE size_type visit(key_type const& k, F f) const
       {
@@ -237,6 +249,15 @@ namespace boost {
         return table_.visit(k, f);
       }
 
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      visit(K&& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
       template <class K, class F>
       BOOST_FORCEINLINE typename std::enable_if<
         detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
@@ -255,6 +276,15 @@ namespace boost {
         return table_.visit(std::forward<K>(k), f);
       }
 
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t visit(FwdIterator first, FwdIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
       template<class FwdIterator, class F>
       BOOST_FORCEINLINE
       size_t visit(FwdIterator first, FwdIterator last, F f) const
@@ -273,6 +303,12 @@ namespace boost {
         return table_.visit(first, last, f);
       }
 
+      template <class F> size_type visit_all(F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_all(f);
+      }
+
       template <class F> size_type visit_all(F f) const
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
@@ -286,6 +322,16 @@ namespace boost {
       }
 
 #if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      visit_all(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.visit_all(p, f);
+      }
+
       template <class ExecPolicy, class F>
       typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
         void>::type
@@ -307,6 +353,12 @@ namespace boost {
       }
 #endif
 
+      template <class F> bool visit_while(F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_while(f);
+      }
+
       template <class F> bool visit_while(F f) const
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
@@ -320,6 +372,16 @@ namespace boost {
       }
 
 #if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      visit_while(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.visit_while(p, f);
+      }
+
       template <class ExecPolicy, class F>
       typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
         bool>::type
@@ -364,30 +426,32 @@ namespace boost {
       }
 
       template <class InputIterator>
-      void insert(InputIterator begin, InputIterator end)
+      size_type insert(InputIterator begin, InputIterator end)
       {
-        for (auto pos = begin; pos != end; ++pos) {
+        size_type count_elements = 0;
+        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
           table_.emplace(*pos);
         }
+        return count_elements;
       }
 
-      void insert(std::initializer_list<value_type> ilist)
+      size_type insert(std::initializer_list<value_type> ilist)
       {
-        this->insert(ilist.begin(), ilist.end());
+        return this->insert(ilist.begin(), ilist.end());
       }
 
       template <class F>
       BOOST_FORCEINLINE bool insert_or_visit(value_type const& obj, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        return table_.insert_or_cvisit(obj, f);
+        return table_.insert_or_visit(obj, f);
       }
 
       template <class F>
       BOOST_FORCEINLINE bool insert_or_visit(value_type&& obj, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        return table_.insert_or_cvisit(std::move(obj), f);
+        return table_.insert_or_visit(std::move(obj), f);
       }
 
       template <class K, class F>
@@ -397,23 +461,25 @@ namespace boost {
       insert_or_visit(K&& k, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        return table_.try_emplace_or_cvisit(std::forward<K>(k), f);
+        return table_.try_emplace_or_visit(std::forward<K>(k), f);
       }
 
       template <class InputIterator, class F>
-      void insert_or_visit(InputIterator first, InputIterator last, F f)
+      size_type insert_or_visit(InputIterator first, InputIterator last, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        for (; first != last; ++first) {
-          table_.emplace_or_cvisit(*first, f);
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_or_visit(*first, f);
         }
+        return count_elements;
       }
 
       template <class F>
-      void insert_or_visit(std::initializer_list<value_type> ilist, F f)
+      size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
+        return this->insert_or_visit(ilist.begin(), ilist.end(), std::ref(f));
       }
 
       template <class F>
@@ -441,19 +507,122 @@ namespace boost {
       }
 
       template <class InputIterator, class F>
-      void insert_or_cvisit(InputIterator first, InputIterator last, F f)
+      size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        for (; first != last; ++first) {
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
           table_.emplace_or_cvisit(*first, f);
         }
+        return count_elements;
       }
 
       template <class F>
-      void insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
+      size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
       {
         BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
-        this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
+        return this->insert_or_cvisit(ilist.begin(), ilist.end(), std::ref(f));
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_visit(
+        value_type const& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_visit(obj, f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_visit(value_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_visit(std::move(obj), f1, f2);
+      }
+
+      template <class K, class F1, class F2>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert_and_visit(K&& k, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.try_emplace_and_visit(std::forward<K>(k), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_visit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_visit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_visit(std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return this->insert_and_visit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_cvisit(
+        value_type const& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(obj, f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_cvisit(value_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(std::move(obj), f1, f2);
+      }
+
+      template <class K, class F1, class F2>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert_and_cvisit(K&& k, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.try_emplace_and_cvisit(std::forward<K>(k), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_cvisit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_cvisit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_cvisit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return this->insert_and_cvisit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
       }
 
       template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args)
@@ -465,7 +634,7 @@ namespace boost {
       BOOST_FORCEINLINE bool emplace_or_visit(Arg&& arg, Args&&... args)
       {
         BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
-        return table_.emplace_or_cvisit(
+        return table_.emplace_or_visit(
           std::forward<Arg>(arg), std::forward<Args>(args)...);
       }
 
@@ -477,6 +646,30 @@ namespace boost {
           std::forward<Arg>(arg), std::forward<Args>(args)...);
       }
 
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_visit(
+        Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_CONST_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_visit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_cvisit(
+        Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_CONST_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_cvisit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
       BOOST_FORCEINLINE size_type erase(key_type const& k)
       {
         return table_.erase(k);
@@ -582,6 +775,14 @@ namespace boost {
       void rehash(size_type n) { table_.rehash(n); }
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
       allocator_type get_allocator() const noexcept
diff --git a/inst/include/boost/unordered/concurrent_flat_set_fwd.hpp b/inst/include/boost/unordered/concurrent_flat_set_fwd.hpp
index 03bcc5b4e..1133d9c93 100644
--- a/inst/include/boost/unordered/concurrent_flat_set_fwd.hpp
+++ b/inst/include/boost/unordered/concurrent_flat_set_fwd.hpp
@@ -2,6 +2,7 @@
  *
  * Copyright 2023 Christian Mazakas.
  * Copyright 2023 Joaquin M Lopez Munoz.
+ * Copyright 2024 Braden Ganetsky.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -12,11 +13,16 @@
 #ifndef BOOST_UNORDERED_CONCURRENT_FLAT_SET_FWD_HPP
 #define BOOST_UNORDERED_CONCURRENT_FLAT_SET_FWD_HPP
 
+#include <boost/config.hpp>
 #include <boost/container_hash/hash_fwd.hpp>
 
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
 
@@ -44,6 +50,15 @@ namespace boost {
     typename concurrent_flat_set<K, H, P, A>::size_type erase_if(
       concurrent_flat_set<K, H, P, A>& c, Predicate pred);
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key> >
+      using concurrent_flat_set = boost::unordered::concurrent_flat_set<Key,
+        Hash, Pred, std::pmr::polymorphic_allocator<Key> >;
+    } // namespace pmr
+#endif
+
   } // namespace unordered
 
   using boost::unordered::concurrent_flat_set;
diff --git a/inst/include/boost/unordered/concurrent_node_map.hpp b/inst/include/boost/unordered/concurrent_node_map.hpp
new file mode 100644
index 000000000..1b6f1623a
--- /dev/null
+++ b/inst/include/boost/unordered/concurrent_node_map.hpp
@@ -0,0 +1,1202 @@
+/* Fast open-addressing, node-based concurrent hashmap.
+ *
+ * Copyright 2023 Christian Mazakas.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_CONCURRENT_NODE_MAP_HPP
+#define BOOST_UNORDERED_CONCURRENT_NODE_MAP_HPP
+
+#include <boost/unordered/concurrent_node_map_fwd.hpp>
+#include <boost/unordered/detail/concurrent_static_asserts.hpp>
+#include <boost/unordered/detail/foa/concurrent_table.hpp>
+#include <boost/unordered/detail/foa/element_type.hpp>
+#include <boost/unordered/detail/foa/node_map_handle.hpp>
+#include <boost/unordered/detail/foa/node_map_types.hpp>
+#include <boost/unordered/detail/type_traits.hpp>
+#include <boost/unordered/unordered_node_map_fwd.hpp>
+
+#include <boost/container_hash/hash.hpp>
+#include <boost/core/allocator_access.hpp>
+#include <boost/core/serialization.hpp>
+
+#include <type_traits>
+
+namespace boost {
+  namespace unordered {
+    template <class Key, class T, class Hash, class Pred, class Allocator>
+    class concurrent_node_map
+    {
+    private:
+      template <class Key2, class T2, class Hash2, class Pred2,
+        class Allocator2>
+      friend class concurrent_node_map;
+      template <class Key2, class T2, class Hash2, class Pred2,
+        class Allocator2>
+      friend class unordered_node_map;
+
+      using type_policy = detail::foa::node_map_types<Key, T,
+        typename boost::allocator_void_pointer<Allocator>::type>;
+
+      using table_type =
+        detail::foa::concurrent_table<type_policy, Hash, Pred, Allocator>;
+
+      table_type table_;
+
+      template <class K, class V, class H, class KE, class A>
+      bool friend operator==(concurrent_node_map<K, V, H, KE, A> const& lhs,
+        concurrent_node_map<K, V, H, KE, A> const& rhs);
+
+      template <class K, class V, class H, class KE, class A, class Predicate>
+      friend typename concurrent_node_map<K, V, H, KE, A>::size_type erase_if(
+        concurrent_node_map<K, V, H, KE, A>& set, Predicate pred);
+
+      template<class Archive, class K, class V, class H, class KE, class A>
+      friend void serialize(
+        Archive& ar, concurrent_node_map<K, V, H, KE, A>& c,
+        unsigned int version);
+
+    public:
+      using key_type = Key;
+      using mapped_type = T;
+      using value_type = typename type_policy::value_type;
+      using init_type = typename type_policy::init_type;
+      using size_type = std::size_t;
+      using difference_type = std::ptrdiff_t;
+      using hasher = typename boost::unordered::detail::type_identity<Hash>::type;
+      using key_equal = typename boost::unordered::detail::type_identity<Pred>::type;
+      using allocator_type = typename boost::unordered::detail::type_identity<Allocator>::type;
+      using reference = value_type&;
+      using const_reference = value_type const&;
+      using pointer = typename boost::allocator_pointer<allocator_type>::type;
+      using const_pointer =
+        typename boost::allocator_const_pointer<allocator_type>::type;
+      using node_type = detail::foa::node_map_handle<type_policy,
+        typename boost::allocator_rebind<Allocator,
+          typename type_policy::value_type>::type>;
+      using insert_return_type =
+        detail::foa::iteratorless_insert_return_type<node_type>;
+      static constexpr size_type bulk_visit_size = table_type::bulk_visit_size;
+
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
+      concurrent_node_map()
+          : concurrent_node_map(detail::foa::default_bucket_count)
+      {
+      }
+
+      explicit concurrent_node_map(size_type n, const hasher& hf = hasher(),
+        const key_equal& eql = key_equal(),
+        const allocator_type& a = allocator_type())
+          : table_(n, hf, eql, a)
+      {
+      }
+
+      template <class InputIterator>
+      concurrent_node_map(InputIterator f, InputIterator l,
+        size_type n = detail::foa::default_bucket_count,
+        const hasher& hf = hasher(), const key_equal& eql = key_equal(),
+        const allocator_type& a = allocator_type())
+          : table_(n, hf, eql, a)
+      {
+        this->insert(f, l);
+      }
+
+      concurrent_node_map(concurrent_node_map const& rhs)
+          : table_(rhs.table_,
+              boost::allocator_select_on_container_copy_construction(
+                rhs.get_allocator()))
+      {
+      }
+
+      concurrent_node_map(concurrent_node_map&& rhs)
+          : table_(std::move(rhs.table_))
+      {
+      }
+
+      template <class InputIterator>
+      concurrent_node_map(
+        InputIterator f, InputIterator l, allocator_type const& a)
+          : concurrent_node_map(f, l, 0, hasher(), key_equal(), a)
+      {
+      }
+
+      explicit concurrent_node_map(allocator_type const& a)
+          : table_(detail::foa::default_bucket_count, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_map(
+        concurrent_node_map const& rhs, allocator_type const& a)
+          : table_(rhs.table_, a)
+      {
+      }
+
+      concurrent_node_map(concurrent_node_map&& rhs, allocator_type const& a)
+          : table_(std::move(rhs.table_), a)
+      {
+      }
+
+      concurrent_node_map(std::initializer_list<value_type> il,
+        size_type n = detail::foa::default_bucket_count,
+        const hasher& hf = hasher(), const key_equal& eql = key_equal(),
+        const allocator_type& a = allocator_type())
+          : concurrent_node_map(n, hf, eql, a)
+      {
+        this->insert(il.begin(), il.end());
+      }
+
+      concurrent_node_map(size_type n, const allocator_type& a)
+          : concurrent_node_map(n, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_map(
+        size_type n, const hasher& hf, const allocator_type& a)
+          : concurrent_node_map(n, hf, key_equal(), a)
+      {
+      }
+
+      template <typename InputIterator>
+      concurrent_node_map(
+        InputIterator f, InputIterator l, size_type n, const allocator_type& a)
+          : concurrent_node_map(f, l, n, hasher(), key_equal(), a)
+      {
+      }
+
+      template <typename InputIterator>
+      concurrent_node_map(InputIterator f, InputIterator l, size_type n,
+        const hasher& hf, const allocator_type& a)
+          : concurrent_node_map(f, l, n, hf, key_equal(), a)
+      {
+      }
+
+      concurrent_node_map(
+        std::initializer_list<value_type> il, const allocator_type& a)
+          : concurrent_node_map(
+              il, detail::foa::default_bucket_count, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_map(std::initializer_list<value_type> il, size_type n,
+        const allocator_type& a)
+          : concurrent_node_map(il, n, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_map(std::initializer_list<value_type> il, size_type n,
+        const hasher& hf, const allocator_type& a)
+          : concurrent_node_map(il, n, hf, key_equal(), a)
+      {
+      }
+
+      template <bool avoid_explicit_instantiation = true>
+      concurrent_node_map(
+        unordered_node_map<Key, T, Hash, Pred, Allocator>&& other)
+          : table_(std::move(other.table_))
+      {
+      }
+
+      ~concurrent_node_map() = default;
+
+      concurrent_node_map& operator=(concurrent_node_map const& rhs)
+      {
+        table_ = rhs.table_;
+        return *this;
+      }
+
+      concurrent_node_map& operator=(concurrent_node_map&& rhs) noexcept(
+        noexcept(std::declval<table_type&>() = std::declval<table_type&&>()))
+      {
+        table_ = std::move(rhs.table_);
+        return *this;
+      }
+
+      concurrent_node_map& operator=(std::initializer_list<value_type> ilist)
+      {
+        table_ = ilist;
+        return *this;
+      }
+
+      /// Capacity
+      ///
+
+      size_type size() const noexcept { return table_.size(); }
+      size_type max_size() const noexcept { return table_.max_size(); }
+
+      BOOST_ATTRIBUTE_NODISCARD bool empty() const noexcept
+      {
+        return size() == 0;
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type visit(key_type const& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type visit(key_type const& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type cvisit(key_type const& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      visit(K&& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      visit(K&& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      cvisit(K&& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t visit(FwdIterator first, FwdIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t visit(FwdIterator first, FwdIterator last, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t cvisit(FwdIterator first, FwdIterator last, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
+      template <class F> size_type visit_all(F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.visit_all(f);
+      }
+
+      template <class F> size_type visit_all(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_all(f);
+      }
+
+      template <class F> size_type cvisit_all(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.cvisit_all(f);
+      }
+
+#if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      visit_all(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.visit_all(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      visit_all(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.visit_all(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      cvisit_all(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.cvisit_all(p, f);
+      }
+#endif
+
+      template <class F> bool visit_while(F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.visit_while(f);
+      }
+
+      template <class F> bool visit_while(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_while(f);
+      }
+
+      template <class F> bool cvisit_while(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.cvisit_while(f);
+      }
+
+#if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      visit_while(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.visit_while(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      visit_while(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.visit_while(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      cvisit_while(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.cvisit_while(p, f);
+      }
+#endif
+
+      /// Modifiers
+      ///
+
+      template <class Ty>
+      BOOST_FORCEINLINE auto insert(Ty&& value)
+        -> decltype(table_.insert(std::forward<Ty>(value)))
+      {
+        return table_.insert(std::forward<Ty>(value));
+      }
+
+      BOOST_FORCEINLINE bool insert(init_type&& obj)
+      {
+        return table_.insert(std::move(obj));
+      }
+
+      template <class InputIterator>
+      size_type insert(InputIterator begin, InputIterator end)
+      {
+        size_type count_elements = 0;
+        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
+          table_.emplace(*pos);
+        }
+        return count_elements;
+      }
+
+      size_type insert(std::initializer_list<value_type> ilist)
+      {
+        return this->insert(ilist.begin(), ilist.end());
+      }
+
+      insert_return_type insert(node_type&& nh)
+      {
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert(std::move(access::element(nh)))) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class M>
+      BOOST_FORCEINLINE bool insert_or_assign(key_type const& k, M&& obj)
+      {
+        return table_.try_emplace_or_visit(k, std::forward<M>(obj),
+          [&](value_type& m) { m.second = std::forward<M>(obj); });
+      }
+
+      template <class M>
+      BOOST_FORCEINLINE bool insert_or_assign(key_type&& k, M&& obj)
+      {
+        return table_.try_emplace_or_visit(std::move(k), std::forward<M>(obj),
+          [&](value_type& m) { m.second = std::forward<M>(obj); });
+      }
+
+      template <class K, class M>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, bool>::type
+      insert_or_assign(K&& k, M&& obj)
+      {
+        return table_.try_emplace_or_visit(std::forward<K>(k),
+          std::forward<M>(obj),
+          [&](value_type& m) { m.second = std::forward<M>(obj); });
+      }
+
+      template <class Ty, class F>
+      BOOST_FORCEINLINE auto insert_or_visit(Ty&& value, F f)
+        -> decltype(table_.insert_or_visit(std::forward<Ty>(value), f))
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.insert_or_visit(std::forward<Ty>(value), f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE bool insert_or_visit(init_type&& obj, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return table_.insert_or_visit(std::move(obj), f);
+      }
+
+      template <class InputIterator, class F>
+      size_type insert_or_visit(InputIterator first, InputIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_or_visit(*first, f);
+        }
+        return count_elements;
+      }
+
+      template <class F>
+      size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        return this->insert_or_visit(ilist.begin(), ilist.end(), std::ref(f));
+      }
+
+      template <class F>
+      insert_return_type insert_or_visit(node_type&& nh, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_or_visit(std::move(access::element(nh)), f)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class Ty, class F>
+      BOOST_FORCEINLINE auto insert_or_cvisit(Ty&& value, F f)
+        -> decltype(table_.insert_or_cvisit(std::forward<Ty>(value), f))
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.insert_or_cvisit(std::forward<Ty>(value), f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE bool insert_or_cvisit(init_type&& obj, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.insert_or_cvisit(std::move(obj), f);
+      }
+
+      template <class InputIterator, class F>
+      size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_or_cvisit(*first, f);
+        }
+        return count_elements;
+      }
+
+      template <class F>
+      size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return this->insert_or_cvisit(ilist.begin(), ilist.end(), std::ref(f));
+      }
+
+      template <class F>
+      insert_return_type insert_or_cvisit(node_type&& nh, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_or_cvisit(std::move(access::element(nh)), f)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class Ty, class F1, class F2>
+      BOOST_FORCEINLINE auto insert_and_visit(Ty&& value, F1 f1, F2 f2)
+        -> decltype(table_.insert_and_visit(std::forward<Ty>(value), f1, f2))
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        return table_.insert_and_visit(std::forward<Ty>(value), f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_visit(init_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        return table_.insert_and_visit(std::move(obj), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_visit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_visit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_visit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        return this->insert_and_visit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
+      }
+
+      template <class F1, class F2>
+      insert_return_type insert_and_visit(node_type&& nh, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_and_visit(std::move(access::element(nh)), f1, f2)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class Ty, class F1, class F2>
+      BOOST_FORCEINLINE auto insert_and_cvisit(Ty&& value, F1 f1, F2 f2)
+        -> decltype(table_.insert_and_cvisit(std::forward<Ty>(value), f1, f2))
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(std::forward<Ty>(value), f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_cvisit(init_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(std::move(obj), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_cvisit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_cvisit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_cvisit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return this->insert_and_cvisit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
+      }
+
+      template <class F1, class F2>
+      insert_return_type insert_and_cvisit(node_type&& nh, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_and_cvisit(std::move(access::element(nh)), f1, f2)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args)
+      {
+        return table_.emplace(std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool emplace_or_visit(Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg, Args...)
+        return table_.emplace_or_visit(
+          std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool emplace_or_cvisit(Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
+        return table_.emplace_or_cvisit(
+          std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_visit(
+         Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_visit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_cvisit(
+        Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_cvisit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class... Args>
+      BOOST_FORCEINLINE bool try_emplace(key_type const& k, Args&&... args)
+      {
+        return table_.try_emplace(k, std::forward<Args>(args)...);
+      }
+
+      template <class... Args>
+      BOOST_FORCEINLINE bool try_emplace(key_type&& k, Args&&... args)
+      {
+        return table_.try_emplace(std::move(k), std::forward<Args>(args)...);
+      }
+
+      template <class K, class... Args>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, bool>::type
+      try_emplace(K&& k, Args&&... args)
+      {
+        return table_.try_emplace(
+          std::forward<K>(k), std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_or_visit(
+        key_type const& k, Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg, Args...)
+        return table_.try_emplace_or_visit(
+          k, std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_or_cvisit(
+        key_type const& k, Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
+        return table_.try_emplace_or_cvisit(
+          k, std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_or_visit(
+        key_type&& k, Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg, Args...)
+        return table_.try_emplace_or_visit(
+          std::move(k), std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_or_cvisit(
+        key_type&& k, Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
+        return table_.try_emplace_or_cvisit(
+          std::move(k), std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class K, class Arg, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_or_visit(
+        K&& k, Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg, Args...)
+        return table_.try_emplace_or_visit(std::forward<K>(k),
+          std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class K, class Arg, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_or_cvisit(
+        K&& k, Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
+        return table_.try_emplace_or_cvisit(std::forward<K>(k),
+          std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_visit(
+        key_type const& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_visit(
+          k, std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_cvisit(
+        key_type const& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_cvisit(
+          k, std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_visit(
+        key_type&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_visit(
+          std::move(k), std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_cvisit(
+        key_type&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_cvisit(
+          std::move(k), std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class K, class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_visit(
+        K&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_visit(std::forward<K>(k),
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class K, class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool try_emplace_and_cvisit(
+        K&& k, Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.try_emplace_and_cvisit(std::forward<K>(k),
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      BOOST_FORCEINLINE size_type erase(key_type const& k)
+      {
+        return table_.erase(k);
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      erase(K&& k)
+      {
+        return table_.erase(std::forward<K>(k));
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type erase_if(key_type const& k, F f)
+      {
+        return table_.erase_if(k, f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value &&
+          !detail::is_execution_policy<K>::value,
+        size_type>::type
+      erase_if(K&& k, F f)
+      {
+        return table_.erase_if(std::forward<K>(k), f);
+      }
+
+#if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      erase_if(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.erase_if(p, f);
+      }
+#endif
+
+      template <class F> size_type erase_if(F f) { return table_.erase_if(f); }
+
+      void swap(concurrent_node_map& other) noexcept(
+        boost::allocator_is_always_equal<Allocator>::type::value ||
+        boost::allocator_propagate_on_container_swap<Allocator>::type::value)
+      {
+        return table_.swap(other.table_);
+      }
+
+      node_type extract(key_type const& key)
+      {
+        node_type nh;
+        table_.extract(key, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      template <class K>
+      typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, node_type>::type
+      extract(K const& key)
+      {
+        node_type nh;
+        table_.extract(key, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      template <class F>
+      node_type extract_if(key_type const& key, F f)
+      {
+        node_type nh;
+        table_.extract_if(key, f, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      template <class K, class F>
+      typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, node_type>::type
+      extract_if(K const& key, F f)
+      {
+        node_type nh;
+        table_.extract_if(key, f, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      void clear() noexcept { table_.clear(); }
+
+      template <typename H2, typename P2>
+      size_type merge(concurrent_node_map<Key, T, H2, P2, Allocator>& x)
+      {
+        BOOST_ASSERT(get_allocator() == x.get_allocator());
+        return table_.merge(x.table_);
+      }
+
+      template <typename H2, typename P2>
+      size_type merge(concurrent_node_map<Key, T, H2, P2, Allocator>&& x)
+      {
+        return merge(x);
+      }
+
+      BOOST_FORCEINLINE size_type count(key_type const& k) const
+      {
+        return table_.count(k);
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      count(K const& k)
+      {
+        return table_.count(k);
+      }
+
+      BOOST_FORCEINLINE bool contains(key_type const& k) const
+      {
+        return table_.contains(k);
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, bool>::type
+      contains(K const& k) const
+      {
+        return table_.contains(k);
+      }
+
+      /// Hash Policy
+      ///
+      size_type bucket_count() const noexcept { return table_.capacity(); }
+
+      float load_factor() const noexcept { return table_.load_factor(); }
+      float max_load_factor() const noexcept
+      {
+        return table_.max_load_factor();
+      }
+      void max_load_factor(float) {}
+      size_type max_load() const noexcept { return table_.max_load(); }
+
+      void rehash(size_type n) { table_.rehash(n); }
+      void reserve(size_type n) { table_.reserve(n); }
+
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
+      /// Observers
+      ///
+      allocator_type get_allocator() const noexcept
+      {
+        return table_.get_allocator();
+      }
+
+      hasher hash_function() const { return table_.hash_function(); }
+      key_equal key_eq() const { return table_.key_eq(); }
+    };
+
+    template <class Key, class T, class Hash, class KeyEqual, class Allocator>
+    bool operator==(
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& rhs)
+    {
+      return lhs.table_ == rhs.table_;
+    }
+
+    template <class Key, class T, class Hash, class KeyEqual, class Allocator>
+    bool operator!=(
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& rhs)
+    {
+      return !(lhs == rhs);
+    }
+
+    template <class Key, class T, class Hash, class Pred, class Alloc>
+    void swap(concurrent_node_map<Key, T, Hash, Pred, Alloc>& x,
+      concurrent_node_map<Key, T, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)))
+    {
+      x.swap(y);
+    }
+
+    template <class K, class T, class H, class P, class A, class Predicate>
+    typename concurrent_node_map<K, T, H, P, A>::size_type erase_if(
+      concurrent_node_map<K, T, H, P, A>& c, Predicate pred)
+    {
+      return c.table_.erase_if(pred);
+    }
+
+    template<class Archive, class K, class V, class H, class KE, class A>
+    void serialize(
+      Archive& ar, concurrent_node_map<K, V, H, KE, A>& c, unsigned int)
+    {
+      ar & core::make_nvp("table",c.table_);
+    }
+
+#if BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES
+
+    template <class InputIterator,
+      class Hash =
+        boost::hash<boost::unordered::detail::iter_key_t<InputIterator> >,
+      class Pred =
+        std::equal_to<boost::unordered::detail::iter_key_t<InputIterator> >,
+      class Allocator = std::allocator<
+        boost::unordered::detail::iter_to_alloc_t<InputIterator> >,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_pred_v<Pred> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(InputIterator, InputIterator,
+      std::size_t = boost::unordered::detail::foa::default_bucket_count,
+      Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> concurrent_node_map<
+        boost::unordered::detail::iter_key_t<InputIterator>,
+        boost::unordered::detail::iter_val_t<InputIterator>, Hash, Pred,
+        Allocator>;
+
+    template <class Key, class T,
+      class Hash = boost::hash<std::remove_const_t<Key> >,
+      class Pred = std::equal_to<std::remove_const_t<Key> >,
+      class Allocator = std::allocator<std::pair<const Key, T> >,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_pred_v<Pred> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(std::initializer_list<std::pair<Key, T> >,
+      std::size_t = boost::unordered::detail::foa::default_bucket_count,
+      Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> concurrent_node_map<std::remove_const_t<Key>, T, Hash, Pred,
+        Allocator>;
+
+    template <class InputIterator, class Allocator,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(InputIterator, InputIterator, std::size_t, Allocator)
+      -> concurrent_node_map<
+        boost::unordered::detail::iter_key_t<InputIterator>,
+        boost::unordered::detail::iter_val_t<InputIterator>,
+        boost::hash<boost::unordered::detail::iter_key_t<InputIterator> >,
+        std::equal_to<boost::unordered::detail::iter_key_t<InputIterator> >,
+        Allocator>;
+
+    template <class InputIterator, class Allocator,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(InputIterator, InputIterator, Allocator)
+      -> concurrent_node_map<
+        boost::unordered::detail::iter_key_t<InputIterator>,
+        boost::unordered::detail::iter_val_t<InputIterator>,
+        boost::hash<boost::unordered::detail::iter_key_t<InputIterator> >,
+        std::equal_to<boost::unordered::detail::iter_key_t<InputIterator> >,
+        Allocator>;
+
+    template <class InputIterator, class Hash, class Allocator,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(
+      InputIterator, InputIterator, std::size_t, Hash, Allocator)
+      -> concurrent_node_map<
+        boost::unordered::detail::iter_key_t<InputIterator>,
+        boost::unordered::detail::iter_val_t<InputIterator>, Hash,
+        std::equal_to<boost::unordered::detail::iter_key_t<InputIterator> >,
+        Allocator>;
+
+    template <class Key, class T, class Allocator,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(std::initializer_list<std::pair<Key, T> >, std::size_t,
+      Allocator) -> concurrent_node_map<std::remove_const_t<Key>, T,
+      boost::hash<std::remove_const_t<Key> >,
+      std::equal_to<std::remove_const_t<Key> >, Allocator>;
+
+    template <class Key, class T, class Allocator,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(std::initializer_list<std::pair<Key, T> >, Allocator)
+      -> concurrent_node_map<std::remove_const_t<Key>, T,
+        boost::hash<std::remove_const_t<Key> >,
+        std::equal_to<std::remove_const_t<Key> >, Allocator>;
+
+    template <class Key, class T, class Hash, class Allocator,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_map(std::initializer_list<std::pair<Key, T> >, std::size_t,
+      Hash, Allocator) -> concurrent_node_map<std::remove_const_t<Key>, T,
+      Hash, std::equal_to<std::remove_const_t<Key> >, Allocator>;
+
+#endif
+
+  } // namespace unordered
+} // namespace boost
+
+#endif // BOOST_UNORDERED_CONCURRENT_NODE_MAP_HPP
diff --git a/inst/include/boost/unordered/concurrent_node_map_fwd.hpp b/inst/include/boost/unordered/concurrent_node_map_fwd.hpp
new file mode 100644
index 000000000..dd1f6fc0c
--- /dev/null
+++ b/inst/include/boost/unordered/concurrent_node_map_fwd.hpp
@@ -0,0 +1,67 @@
+/* Fast open-addressing, node-based concurrent hashmap.
+ *
+ * Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Braden Ganetsky.
+ * Copyright 2024 Joaquin M Lopez Munoz.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_CONCURRENT_NODE_MAP_FWD_HPP
+#define BOOST_UNORDERED_CONCURRENT_NODE_MAP_FWD_HPP
+
+#include <boost/config.hpp>
+#include <boost/container_hash/hash_fwd.hpp>
+
+#include <functional>
+#include <memory>
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
+namespace boost {
+  namespace unordered {
+
+    template <class Key, class T, class Hash = boost::hash<Key>,
+      class Pred = std::equal_to<Key>,
+      class Allocator = std::allocator<std::pair<Key const, T> > >
+    class concurrent_node_map;
+
+    template <class Key, class T, class Hash, class KeyEqual, class Allocator>
+    bool operator==(
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& rhs);
+
+    template <class Key, class T, class Hash, class KeyEqual, class Allocator>
+    bool operator!=(
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_map<Key, T, Hash, KeyEqual, Allocator> const& rhs);
+
+    template <class Key, class T, class Hash, class Pred, class Alloc>
+    void swap(concurrent_node_map<Key, T, Hash, Pred, Alloc>& x,
+      concurrent_node_map<Key, T, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
+
+    template <class K, class T, class H, class P, class A, class Predicate>
+    typename concurrent_node_map<K, T, H, P, A>::size_type erase_if(
+      concurrent_node_map<K, T, H, P, A>& c, Predicate pred);
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class T, class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key> >
+      using concurrent_node_map = boost::unordered::concurrent_node_map<Key, T,
+        Hash, Pred, std::pmr::polymorphic_allocator<std::pair<Key const, T> > >;
+    } // namespace pmr
+#endif
+
+  } // namespace unordered
+
+  using boost::unordered::concurrent_node_map;
+} // namespace boost
+
+#endif // BOOST_UNORDERED_CONCURRENT_NODE_MAP_FWD_HPP
diff --git a/inst/include/boost/unordered/concurrent_node_set.hpp b/inst/include/boost/unordered/concurrent_node_set.hpp
new file mode 100644
index 000000000..430bc0798
--- /dev/null
+++ b/inst/include/boost/unordered/concurrent_node_set.hpp
@@ -0,0 +1,1065 @@
+/* Fast open-addressing, node-based concurrent hashset.
+ *
+ * Copyright 2023 Christian Mazakas.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_CONCURRENT_NODE_SET_HPP
+#define BOOST_UNORDERED_CONCURRENT_NODE_SET_HPP
+
+#include <boost/unordered/concurrent_node_set_fwd.hpp>
+#include <boost/unordered/detail/concurrent_static_asserts.hpp>
+#include <boost/unordered/detail/foa/concurrent_table.hpp>
+#include <boost/unordered/detail/foa/element_type.hpp>
+#include <boost/unordered/detail/foa/node_set_handle.hpp>
+#include <boost/unordered/detail/foa/node_set_types.hpp>
+#include <boost/unordered/detail/type_traits.hpp>
+#include <boost/unordered/unordered_node_set_fwd.hpp>
+
+#include <boost/container_hash/hash.hpp>
+#include <boost/core/allocator_access.hpp>
+#include <boost/core/serialization.hpp>
+
+#include <utility>
+
+namespace boost {
+  namespace unordered {
+    template <class Key, class Hash, class Pred, class Allocator>
+    class concurrent_node_set
+    {
+    private:
+      template <class Key2, class Hash2, class Pred2, class Allocator2>
+      friend class concurrent_node_set;
+      template <class Key2, class Hash2, class Pred2, class Allocator2>
+      friend class unordered_node_set;
+
+      using type_policy = detail::foa::node_set_types<Key,
+        typename boost::allocator_void_pointer<Allocator>::type>;
+
+      using table_type =
+        detail::foa::concurrent_table<type_policy, Hash, Pred, Allocator>;
+
+      table_type table_;
+
+      template <class K, class H, class KE, class A>
+      bool friend operator==(concurrent_node_set<K, H, KE, A> const& lhs,
+        concurrent_node_set<K, H, KE, A> const& rhs);
+
+      template <class K, class H, class KE, class A, class Predicate>
+      friend typename concurrent_node_set<K, H, KE, A>::size_type erase_if(
+        concurrent_node_set<K, H, KE, A>& set, Predicate pred);
+
+      template<class Archive, class K, class H, class KE, class A>
+      friend void serialize(
+        Archive& ar, concurrent_node_set<K, H, KE, A>& c,
+        unsigned int version);
+
+    public:
+      using key_type = Key;
+      using value_type = typename type_policy::value_type;
+      using init_type = typename type_policy::init_type;
+      using size_type = std::size_t;
+      using difference_type = std::ptrdiff_t;
+      using hasher = typename boost::unordered::detail::type_identity<Hash>::type;
+      using key_equal = typename boost::unordered::detail::type_identity<Pred>::type;
+      using allocator_type = typename boost::unordered::detail::type_identity<Allocator>::type;
+      using reference = value_type&;
+      using const_reference = value_type const&;
+      using pointer = typename boost::allocator_pointer<allocator_type>::type;
+      using const_pointer =
+        typename boost::allocator_const_pointer<allocator_type>::type;
+      using node_type = detail::foa::node_set_handle<type_policy,
+        typename boost::allocator_rebind<Allocator,
+          typename type_policy::value_type>::type>;
+      using insert_return_type =
+        detail::foa::iteratorless_insert_return_type<node_type>;
+      static constexpr size_type bulk_visit_size = table_type::bulk_visit_size;
+
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
+      concurrent_node_set()
+          : concurrent_node_set(detail::foa::default_bucket_count)
+      {
+      }
+
+      explicit concurrent_node_set(size_type n, const hasher& hf = hasher(),
+        const key_equal& eql = key_equal(),
+        const allocator_type& a = allocator_type())
+          : table_(n, hf, eql, a)
+      {
+      }
+
+      template <class InputIterator>
+      concurrent_node_set(InputIterator f, InputIterator l,
+        size_type n = detail::foa::default_bucket_count,
+        const hasher& hf = hasher(), const key_equal& eql = key_equal(),
+        const allocator_type& a = allocator_type())
+          : table_(n, hf, eql, a)
+      {
+        this->insert(f, l);
+      }
+
+      concurrent_node_set(concurrent_node_set const& rhs)
+          : table_(rhs.table_,
+              boost::allocator_select_on_container_copy_construction(
+                rhs.get_allocator()))
+      {
+      }
+
+      concurrent_node_set(concurrent_node_set&& rhs)
+          : table_(std::move(rhs.table_))
+      {
+      }
+
+      template <class InputIterator>
+      concurrent_node_set(
+        InputIterator f, InputIterator l, allocator_type const& a)
+          : concurrent_node_set(f, l, 0, hasher(), key_equal(), a)
+      {
+      }
+
+      explicit concurrent_node_set(allocator_type const& a)
+          : table_(detail::foa::default_bucket_count, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_set(
+        concurrent_node_set const& rhs, allocator_type const& a)
+          : table_(rhs.table_, a)
+      {
+      }
+
+      concurrent_node_set(concurrent_node_set&& rhs, allocator_type const& a)
+          : table_(std::move(rhs.table_), a)
+      {
+      }
+
+      concurrent_node_set(std::initializer_list<value_type> il,
+        size_type n = detail::foa::default_bucket_count,
+        const hasher& hf = hasher(), const key_equal& eql = key_equal(),
+        const allocator_type& a = allocator_type())
+          : concurrent_node_set(n, hf, eql, a)
+      {
+        this->insert(il.begin(), il.end());
+      }
+
+      concurrent_node_set(size_type n, const allocator_type& a)
+          : concurrent_node_set(n, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_set(
+        size_type n, const hasher& hf, const allocator_type& a)
+          : concurrent_node_set(n, hf, key_equal(), a)
+      {
+      }
+
+      template <typename InputIterator>
+      concurrent_node_set(
+        InputIterator f, InputIterator l, size_type n, const allocator_type& a)
+          : concurrent_node_set(f, l, n, hasher(), key_equal(), a)
+      {
+      }
+
+      template <typename InputIterator>
+      concurrent_node_set(InputIterator f, InputIterator l, size_type n,
+        const hasher& hf, const allocator_type& a)
+          : concurrent_node_set(f, l, n, hf, key_equal(), a)
+      {
+      }
+
+      concurrent_node_set(
+        std::initializer_list<value_type> il, const allocator_type& a)
+          : concurrent_node_set(
+              il, detail::foa::default_bucket_count, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_set(std::initializer_list<value_type> il, size_type n,
+        const allocator_type& a)
+          : concurrent_node_set(il, n, hasher(), key_equal(), a)
+      {
+      }
+
+      concurrent_node_set(std::initializer_list<value_type> il, size_type n,
+        const hasher& hf, const allocator_type& a)
+          : concurrent_node_set(il, n, hf, key_equal(), a)
+      {
+      }
+
+      template <bool avoid_explicit_instantiation = true>
+      concurrent_node_set(
+        unordered_node_set<Key, Hash, Pred, Allocator>&& other)
+          : table_(std::move(other.table_))
+      {
+      }
+
+      ~concurrent_node_set() = default;
+
+      concurrent_node_set& operator=(concurrent_node_set const& rhs)
+      {
+        table_ = rhs.table_;
+        return *this;
+      }
+
+      concurrent_node_set& operator=(concurrent_node_set&& rhs)
+        noexcept(boost::allocator_is_always_equal<Allocator>::type::value ||
+                 boost::allocator_propagate_on_container_move_assignment<
+                   Allocator>::type::value)
+      {
+        table_ = std::move(rhs.table_);
+        return *this;
+      }
+
+      concurrent_node_set& operator=(std::initializer_list<value_type> ilist)
+      {
+        table_ = ilist;
+        return *this;
+      }
+
+      /// Capacity
+      ///
+
+      size_type size() const noexcept { return table_.size(); }
+      size_type max_size() const noexcept { return table_.max_size(); }
+
+      BOOST_ATTRIBUTE_NODISCARD bool empty() const noexcept
+      {
+        return size() == 0;
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type visit(key_type const& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type visit(key_type const& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type cvisit(key_type const& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(k, f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      visit(K&& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      visit(K&& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      cvisit(K&& k, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(std::forward<K>(k), f);
+      }
+
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t visit(FwdIterator first, FwdIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t visit(FwdIterator first, FwdIterator last, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
+      template<class FwdIterator, class F>
+      BOOST_FORCEINLINE
+      size_t cvisit(FwdIterator first, FwdIterator last, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_BULK_VISIT_ITERATOR(FwdIterator)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit(first, last, f);
+      }
+
+      template <class F> size_type visit_all(F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_all(f);
+      }
+
+      template <class F> size_type visit_all(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_all(f);
+      }
+
+      template <class F> size_type cvisit_all(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.cvisit_all(f);
+      }
+
+#if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      visit_all(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.visit_all(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      visit_all(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.visit_all(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      cvisit_all(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.cvisit_all(p, f);
+      }
+#endif
+
+      template <class F> bool visit_while(F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_while(f);
+      }
+
+      template <class F> bool visit_while(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.visit_while(f);
+      }
+
+      template <class F> bool cvisit_while(F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.cvisit_while(f);
+      }
+
+#if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      visit_while(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.visit_while(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      visit_while(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.visit_while(p, f);
+      }
+
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        bool>::type
+      cvisit_while(ExecPolicy&& p, F f) const
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        return table_.cvisit_while(p, f);
+      }
+#endif
+
+      /// Modifiers
+      ///
+
+      BOOST_FORCEINLINE bool insert(value_type const& obj)
+      {
+        return table_.insert(obj);
+      }
+
+      BOOST_FORCEINLINE bool insert(value_type&& obj)
+      {
+        return table_.insert(std::move(obj));
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert(K&& k)
+      {
+        return table_.try_emplace(std::forward<K>(k));
+      }
+
+      template <class InputIterator>
+      size_type insert(InputIterator begin, InputIterator end)
+      {
+        size_type count_elements = 0;
+        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
+          table_.emplace(*pos);
+        }
+        return count_elements;
+      }
+
+      size_type insert(std::initializer_list<value_type> ilist)
+      {
+        return this->insert(ilist.begin(), ilist.end());
+      }
+
+      insert_return_type insert(node_type&& nh)
+      {
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert(std::move(access::element(nh)))) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE bool insert_or_visit(value_type const& obj, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.insert_or_visit(obj, f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE bool insert_or_visit(value_type&& obj, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.insert_or_visit(std::move(obj), f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert_or_visit(K&& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.try_emplace_or_visit(std::forward<K>(k), f);
+      }
+
+      template <class InputIterator, class F>
+      size_type insert_or_visit(InputIterator first, InputIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_or_visit(*first, f);
+        }
+        return count_elements;
+      }
+
+      template <class F>
+      size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return this->insert_or_visit(ilist.begin(), ilist.end(), std::ref(f));
+      }
+
+      template <class F>
+      insert_return_type insert_or_visit(node_type&& nh, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_or_visit(std::move(access::element(nh)), f)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE bool insert_or_cvisit(value_type const& obj, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.insert_or_cvisit(obj, f);
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE bool insert_or_cvisit(value_type&& obj, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.insert_or_cvisit(std::move(obj), f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert_or_cvisit(K&& k, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return table_.try_emplace_or_cvisit(std::forward<K>(k), f);
+      }
+
+      template <class InputIterator, class F>
+      size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_or_cvisit(*first, f);
+        }
+        return count_elements;
+      }
+
+      template <class F>
+      size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        return this->insert_or_cvisit(ilist.begin(), ilist.end(), std::ref(f));
+      }
+
+      template <class F>
+      insert_return_type insert_or_cvisit(node_type&& nh, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_or_cvisit(std::move(access::element(nh)), f)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_visit(
+        value_type const& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_visit(obj, f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_visit(value_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_visit(std::move(obj), f1, f2);
+      }
+
+      template <class K, class F1, class F2>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert_and_visit(K&& k, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.try_emplace_and_visit(std::forward<K>(k), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_visit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_visit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_visit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return this->insert_and_visit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
+      }
+
+      template <class F1, class F2>
+      insert_return_type insert_and_visit(node_type&& nh, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_and_visit(std::move(access::element(nh)), f1, f2)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_cvisit(
+        value_type const& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(obj, f1, f2);
+      }
+
+      template <class F1, class F2>
+      BOOST_FORCEINLINE bool insert_and_cvisit(value_type&& obj, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.insert_and_cvisit(std::move(obj), f1, f2);
+      }
+
+      template <class K, class F1, class F2>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value,
+        bool >::type
+      insert_and_cvisit(K&& k, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return table_.try_emplace_and_cvisit(std::forward<K>(k), f1, f2);
+      }
+
+      template <class InputIterator, class F1, class F2>
+      size_type insert_and_cvisit(
+        InputIterator first, InputIterator last, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        size_type count_elements = 0;
+        for (; first != last; ++first, ++count_elements) {
+          table_.emplace_and_cvisit(*first, f1, f2);
+        }
+        return count_elements;
+      }
+
+      template <class F1, class F2>
+      size_type insert_and_cvisit(
+        std::initializer_list<value_type> ilist, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        return this->insert_and_cvisit(
+          ilist.begin(), ilist.end(), std::ref(f1), std::ref(f2));
+      }
+
+      template <class F1, class F2>
+      insert_return_type insert_and_cvisit(node_type&& nh, F1 f1, F2 f2)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
+        BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
+        using access = detail::foa::node_handle_access;
+
+        if (nh.empty()) {
+          return {false, node_type{}};
+        }
+
+        // Caveat: get_allocator() incurs synchronization (not cheap)
+        BOOST_ASSERT(get_allocator() == nh.get_allocator());
+
+        if (table_.insert_and_cvisit(std::move(access::element(nh)), f1, f2)) {
+          access::reset(nh);
+          return {true, node_type{}};
+        } else {
+          return {false, std::move(nh)};
+        }
+      }
+
+      template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args)
+      {
+        return table_.emplace(std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool emplace_or_visit(Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
+        return table_.emplace_or_visit(
+          std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg, class... Args>
+      BOOST_FORCEINLINE bool emplace_or_cvisit(Arg&& arg, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg, Args...)
+        return table_.emplace_or_cvisit(
+          std::forward<Arg>(arg), std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_visit(
+        Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_CONST_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_visit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      template <class Arg1, class Arg2, class... Args>
+      BOOST_FORCEINLINE bool emplace_and_cvisit(
+        Arg1&& arg1, Arg2&& arg2, Args&&... args)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_CONST_INVOCABLE(
+          Arg1, Arg2, Args...)
+        BOOST_UNORDERED_STATIC_ASSERT_LAST_ARG_CONST_INVOCABLE(Arg2, Args...)
+        return table_.emplace_and_cvisit(
+          std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
+          std::forward<Args>(args)...);
+      }
+
+      BOOST_FORCEINLINE size_type erase(key_type const& k)
+      {
+        return table_.erase(k);
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      erase(K&& k)
+      {
+        return table_.erase(std::forward<K>(k));
+      }
+
+      template <class F>
+      BOOST_FORCEINLINE size_type erase_if(key_type const& k, F f)
+      {
+        return table_.erase_if(k, f);
+      }
+
+      template <class K, class F>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value &&
+          !detail::is_execution_policy<K>::value,
+        size_type>::type
+      erase_if(K&& k, F f)
+      {
+        return table_.erase_if(std::forward<K>(k), f);
+      }
+
+#if defined(BOOST_UNORDERED_PARALLEL_ALGORITHMS)
+      template <class ExecPolicy, class F>
+      typename std::enable_if<detail::is_execution_policy<ExecPolicy>::value,
+        void>::type
+      erase_if(ExecPolicy&& p, F f)
+      {
+        BOOST_UNORDERED_STATIC_ASSERT_EXEC_POLICY(ExecPolicy)
+        table_.erase_if(p, f);
+      }
+#endif
+
+      template <class F> size_type erase_if(F f) { return table_.erase_if(f); }
+
+      void swap(concurrent_node_set& other) noexcept(
+        boost::allocator_is_always_equal<Allocator>::type::value ||
+        boost::allocator_propagate_on_container_swap<Allocator>::type::value)
+      {
+        return table_.swap(other.table_);
+      }
+
+      node_type extract(key_type const& key)
+      {
+        node_type nh;
+        table_.extract(key, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      template <class K>
+      typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, node_type>::type
+      extract(K const& key)
+      {
+        node_type nh;
+        table_.extract(key, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      template <class F>
+      node_type extract_if(key_type const& key, F f)
+      {
+        node_type nh;
+        table_.extract_if(key, f, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      template <class K, class F>
+      typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, node_type>::type
+      extract_if(K const& key, F f)
+      {
+        node_type nh;
+        table_.extract_if(key, f, detail::foa::node_handle_emplacer(nh));
+        return nh;
+      }
+
+      void clear() noexcept { table_.clear(); }
+
+      template <typename H2, typename P2>
+      size_type merge(concurrent_node_set<Key, H2, P2, Allocator>& x)
+      {
+        BOOST_ASSERT(get_allocator() == x.get_allocator());
+        return table_.merge(x.table_);
+      }
+
+      template <typename H2, typename P2>
+      size_type merge(concurrent_node_set<Key, H2, P2, Allocator>&& x)
+      {
+        return merge(x);
+      }
+
+      BOOST_FORCEINLINE size_type count(key_type const& k) const
+      {
+        return table_.count(k);
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, size_type>::type
+      count(K const& k)
+      {
+        return table_.count(k);
+      }
+
+      BOOST_FORCEINLINE bool contains(key_type const& k) const
+      {
+        return table_.contains(k);
+      }
+
+      template <class K>
+      BOOST_FORCEINLINE typename std::enable_if<
+        detail::are_transparent<K, hasher, key_equal>::value, bool>::type
+      contains(K const& k) const
+      {
+        return table_.contains(k);
+      }
+
+      /// Hash Policy
+      ///
+      size_type bucket_count() const noexcept { return table_.capacity(); }
+
+      float load_factor() const noexcept { return table_.load_factor(); }
+      float max_load_factor() const noexcept
+      {
+        return table_.max_load_factor();
+      }
+      void max_load_factor(float) {}
+      size_type max_load() const noexcept { return table_.max_load(); }
+
+      void rehash(size_type n) { table_.rehash(n); }
+      void reserve(size_type n) { table_.reserve(n); }
+
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
+      /// Observers
+      ///
+      allocator_type get_allocator() const noexcept
+      {
+        return table_.get_allocator();
+      }
+
+      hasher hash_function() const { return table_.hash_function(); }
+      key_equal key_eq() const { return table_.key_eq(); }
+    };
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    bool operator==(
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& rhs)
+    {
+      return lhs.table_ == rhs.table_;
+    }
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    bool operator!=(
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& rhs)
+    {
+      return !(lhs == rhs);
+    }
+
+    template <class Key, class Hash, class Pred, class Alloc>
+    void swap(concurrent_node_set<Key, Hash, Pred, Alloc>& x,
+      concurrent_node_set<Key, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)))
+    {
+      x.swap(y);
+    }
+
+    template <class K, class H, class P, class A, class Predicate>
+    typename concurrent_node_set<K, H, P, A>::size_type erase_if(
+      concurrent_node_set<K, H, P, A>& c, Predicate pred)
+    {
+      return c.table_.erase_if(pred);
+    }
+
+    template<class Archive, class K, class H, class KE, class A>
+    void serialize(
+      Archive& ar, concurrent_node_set<K, H, KE, A>& c, unsigned int)
+    {
+      ar & core::make_nvp("table",c.table_);
+    }
+
+#if BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES
+
+    template <class InputIterator,
+      class Hash =
+        boost::hash<typename std::iterator_traits<InputIterator>::value_type>,
+      class Pred =
+        std::equal_to<typename std::iterator_traits<InputIterator>::value_type>,
+      class Allocator = std::allocator<
+        typename std::iterator_traits<InputIterator>::value_type>,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_pred_v<Pred> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(InputIterator, InputIterator,
+      std::size_t = boost::unordered::detail::foa::default_bucket_count,
+      Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> concurrent_node_set<
+        typename std::iterator_traits<InputIterator>::value_type, Hash, Pred,
+        Allocator>;
+
+    template <class T, class Hash = boost::hash<T>,
+      class Pred = std::equal_to<T>, class Allocator = std::allocator<T>,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_pred_v<Pred> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(std::initializer_list<T>,
+      std::size_t = boost::unordered::detail::foa::default_bucket_count,
+      Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> concurrent_node_set< T, Hash, Pred, Allocator>;
+
+    template <class InputIterator, class Allocator,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(InputIterator, InputIterator, std::size_t, Allocator)
+      -> concurrent_node_set<
+        typename std::iterator_traits<InputIterator>::value_type,
+        boost::hash<typename std::iterator_traits<InputIterator>::value_type>,
+        std::equal_to<typename std::iterator_traits<InputIterator>::value_type>,
+        Allocator>;
+
+    template <class InputIterator, class Allocator,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(InputIterator, InputIterator, Allocator)
+      -> concurrent_node_set<
+        typename std::iterator_traits<InputIterator>::value_type,
+        boost::hash<typename std::iterator_traits<InputIterator>::value_type>,
+        std::equal_to<typename std::iterator_traits<InputIterator>::value_type>,
+        Allocator>;
+
+    template <class InputIterator, class Hash, class Allocator,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_input_iterator_v<InputIterator> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(
+      InputIterator, InputIterator, std::size_t, Hash, Allocator)
+      -> concurrent_node_set<
+        typename std::iterator_traits<InputIterator>::value_type, Hash,
+        std::equal_to<typename std::iterator_traits<InputIterator>::value_type>,
+        Allocator>;
+
+    template <class T, class Allocator,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(std::initializer_list<T>, std::size_t, Allocator)
+      -> concurrent_node_set<T, boost::hash<T>,std::equal_to<T>, Allocator>;
+
+    template <class T, class Allocator,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(std::initializer_list<T >, Allocator)
+      -> concurrent_node_set<T, boost::hash<T>, std::equal_to<T>, Allocator>;
+
+    template <class T, class Hash, class Allocator,
+      class = std::enable_if_t<detail::is_hash_v<Hash> >,
+      class = std::enable_if_t<detail::is_allocator_v<Allocator> > >
+    concurrent_node_set(std::initializer_list<T >, std::size_t,Hash, Allocator)
+      -> concurrent_node_set<T, Hash, std::equal_to<T>, Allocator>;
+
+#endif
+
+  } // namespace unordered
+} // namespace boost
+
+#endif // BOOST_UNORDERED_CONCURRENT_NODE_SET_HPP
diff --git a/inst/include/boost/unordered/concurrent_node_set_fwd.hpp b/inst/include/boost/unordered/concurrent_node_set_fwd.hpp
new file mode 100644
index 000000000..62e066149
--- /dev/null
+++ b/inst/include/boost/unordered/concurrent_node_set_fwd.hpp
@@ -0,0 +1,67 @@
+/* Fast open-addressing, node-based concurrent hashset.
+ *
+ * Copyright 2023 Christian Mazakas.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Copyright 2024 Braden Ganetsky.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_CONCURRENT_NODE_SET_FWD_HPP
+#define BOOST_UNORDERED_CONCURRENT_NODE_SET_FWD_HPP
+
+#include <boost/config.hpp>
+#include <boost/container_hash/hash_fwd.hpp>
+
+#include <functional>
+#include <memory>
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
+namespace boost {
+  namespace unordered {
+
+    template <class Key, class Hash = boost::hash<Key>,
+      class Pred = std::equal_to<Key>,
+      class Allocator = std::allocator<Key> >
+    class concurrent_node_set;
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    bool operator==(
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& rhs);
+
+    template <class Key, class Hash, class KeyEqual, class Allocator>
+    bool operator!=(
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& lhs,
+      concurrent_node_set<Key, Hash, KeyEqual, Allocator> const& rhs);
+
+    template <class Key, class Hash, class Pred, class Alloc>
+    void swap(concurrent_node_set<Key, Hash, Pred, Alloc>& x,
+      concurrent_node_set<Key, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
+
+    template <class K, class H, class P, class A, class Predicate>
+    typename concurrent_node_set<K, H, P, A>::size_type erase_if(
+      concurrent_node_set<K, H, P, A>& c, Predicate pred);
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key> >
+      using concurrent_node_set = boost::unordered::concurrent_node_set<Key,
+        Hash, Pred, std::pmr::polymorphic_allocator<Key> >;
+    } // namespace pmr
+#endif
+
+  } // namespace unordered
+
+  using boost::unordered::concurrent_node_set;
+} // namespace boost
+
+#endif // BOOST_UNORDERED_CONCURRENT_NODE_SET_FWD_HPP
diff --git a/inst/include/boost/unordered/detail/allocator_constructed.hpp b/inst/include/boost/unordered/detail/allocator_constructed.hpp
new file mode 100644
index 000000000..29fb15664
--- /dev/null
+++ b/inst/include/boost/unordered/detail/allocator_constructed.hpp
@@ -0,0 +1,59 @@
+/* Copyright 2024 Braden Ganetsky.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_DETAIL_ALLOCATOR_CONSTRUCTED_HPP
+#define BOOST_UNORDERED_DETAIL_ALLOCATOR_CONSTRUCTED_HPP
+
+#include <boost/core/allocator_traits.hpp>
+#include <boost/unordered/detail/opt_storage.hpp>
+
+namespace boost {
+  namespace unordered {
+    namespace detail {
+
+      struct allocator_policy
+      {
+        template <class Allocator, class T, class... Args>
+        static void construct(Allocator& a, T* p, Args&&... args)
+        {
+          boost::allocator_construct(a, p, std::forward<Args>(args)...);
+        }
+
+        template <class Allocator, class T>
+        static void destroy(Allocator& a, T* p)
+        {
+          boost::allocator_destroy(a, p);
+        }
+      };
+
+      /* constructs a stack-based object with the given policy and allocator */
+      template <class Allocator, class T, class Policy = allocator_policy>
+      class allocator_constructed
+      {
+        opt_storage<T> storage;
+        Allocator alloc;
+
+      public:
+        template <class... Args>
+        allocator_constructed(Allocator const& alloc_, Args&&... args)
+            : alloc(alloc_)
+        {
+          Policy::construct(
+            alloc, storage.address(), std::forward<Args>(args)...);
+        }
+
+        ~allocator_constructed() { Policy::destroy(alloc, storage.address()); }
+
+        T& value() { return *storage.address(); }
+      };
+
+    } /* namespace detail */
+  }   /* namespace unordered */
+} /* namespace boost */
+
+#endif
diff --git a/inst/include/boost/unordered/detail/concurrent_static_asserts.hpp b/inst/include/boost/unordered/detail/concurrent_static_asserts.hpp
index 48784ac8c..09b050bfe 100644
--- a/inst/include/boost/unordered/detail/concurrent_static_asserts.hpp
+++ b/inst/include/boost/unordered/detail/concurrent_static_asserts.hpp
@@ -1,5 +1,5 @@
 /* Copyright 2023 Christian Mazakas.
- * Copyright 2023 Joaquin M Lopez Munoz.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -13,10 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
-
-#include <functional>
-#include <iterator>
-#include <type_traits>
+#include <boost/unordered/detail/type_traits.hpp>
 
 #define BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)                             \
   static_assert(boost::unordered::detail::is_invocable<F, value_type&>::value, \
@@ -58,16 +55,41 @@
   BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(                               \
     BOOST_UNORDERED_DETAIL_LAST_ARG(Arg, Args))
 
+#define BOOST_UNORDERED_DETAIL_PENULTIMATE_ARG(Arg1, Arg2, Args)               \
+  mp11::mp_at_c<mp11::mp_list<                                                 \
+    Arg1 BOOST_UNORDERED_DETAIL_COMMA Arg2 BOOST_UNORDERED_DETAIL_COMMA Args   \
+    >,                                                                         \
+    mp11::mp_size<mp11::mp_list<                                               \
+      Arg1 BOOST_UNORDERED_DETAIL_COMMA Arg2 BOOST_UNORDERED_DETAIL_COMMA Args \
+    >>::value - 2>
+
+#define BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_INVOCABLE(               \
+  Arg1, Arg2, Args)                                                            \
+  BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(                                     \
+    BOOST_UNORDERED_DETAIL_PENULTIMATE_ARG(Arg1, Arg2, Args))
+
+#define BOOST_UNORDERED_STATIC_ASSERT_PENULTIMATE_ARG_CONST_INVOCABLE(         \
+  Arg1, Arg2, Args)                                                            \
+  BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(                               \
+    BOOST_UNORDERED_DETAIL_PENULTIMATE_ARG(Arg1, Arg2, Args))
+
 namespace boost {
   namespace unordered {
     namespace detail {
+      template <class...> struct is_invocable_helper : std::false_type
+      {
+      };
+
       template <class F, class... Args>
-      struct is_invocable
-          : std::is_constructible<std::function<void(Args...)>,
-              std::reference_wrapper<typename std::remove_reference<F>::type> >
+      struct is_invocable_helper<
+        void_t<decltype(std::declval<F>()(std::declval<Args>()...))>, F,
+        Args...> : std::true_type
       {
       };
 
+      template <class F, class... Args>
+      using is_invocable = is_invocable_helper<void, F, Args...>;
+
     } // namespace detail
 
   } // namespace unordered
diff --git a/inst/include/boost/unordered/detail/fca.hpp b/inst/include/boost/unordered/detail/fca.hpp
index 6461bc0fa..1f733db20 100644
--- a/inst/include/boost/unordered/detail/fca.hpp
+++ b/inst/include/boost/unordered/detail/fca.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joaquin M Lopez Munoz.
+// Copyright (C) 2022-2024 Joaquin M Lopez Munoz.
 // Copyright (C) 2022 Christian Mazakas
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -518,7 +518,8 @@ namespace boost {
         }
 
         grouped_bucket_array(size_type n, const Allocator& al)
-            : empty_value<node_allocator_type>(empty_init_t(), al),
+            : empty_value<node_allocator_type>(
+                empty_init_t(), node_allocator_type(al)),
               size_index_(0), size_(0), buckets(), groups()
         {
           if (n == 0) {
@@ -658,12 +659,7 @@ namespace boost {
           std::swap(buckets, other.buckets);
           std::swap(groups, other.groups);
 
-          bool b = boost::allocator_propagate_on_container_swap<
-            allocator_type>::type::value;
-          if (b) {
-            boost::core::invoke_swap(
-              get_node_allocator(), other.get_node_allocator());
-          }
+          swap_allocator_if_pocs(other);
         }
 
         node_allocator_type const& get_node_allocator() const
@@ -678,12 +674,17 @@ namespace boost {
 
         bucket_allocator_type get_bucket_allocator() const
         {
-          return this->get_node_allocator();
+          return bucket_allocator_type(this->get_node_allocator());
         }
 
         group_allocator_type get_group_allocator() const
         {
-          return this->get_node_allocator();
+          return group_allocator_type(this->get_node_allocator());
+        }
+
+        Allocator get_allocator() const
+        {
+          return Allocator(this->get_node_allocator());
         }
 
         size_type buckets_len() const noexcept { return size_ + 1; }
@@ -870,6 +871,27 @@ namespace boost {
           pbg->prev->next = pbg->next;
           pbg->prev = pbg->next = group_pointer();
         }
+
+        void swap_allocator_if_pocs(grouped_bucket_array& other)
+        {
+          using allocator_pocs =
+            typename boost::allocator_propagate_on_container_swap<
+              allocator_type>::type;
+          swap_allocator_if_pocs(
+            other, std::integral_constant<bool, allocator_pocs::value>());
+        }
+
+        void swap_allocator_if_pocs(
+          grouped_bucket_array& other, std::true_type /* propagate */)
+        {
+          boost::core::invoke_swap(
+            get_node_allocator(), other.get_node_allocator());
+        }
+
+        void swap_allocator_if_pocs(
+          grouped_bucket_array&, std::false_type /* don't propagate */)
+        {
+        }
       };
     } // namespace detail
   } // namespace unordered
diff --git a/inst/include/boost/unordered/detail/foa/concurrent_table.hpp b/inst/include/boost/unordered/detail/foa/concurrent_table.hpp
index e93784a65..d2f0991c0 100644
--- a/inst/include/boost/unordered/detail/foa/concurrent_table.hpp
+++ b/inst/include/boost/unordered/detail/foa/concurrent_table.hpp
@@ -1,6 +1,7 @@
 /* Fast open-addressing concurrent hash table.
  *
- * Copyright 2023 Joaquin M Lopez Munoz.
+ * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Copyright 2024 Braden Ganetsky.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -28,6 +29,7 @@
 #include <boost/unordered/detail/foa/tuple_rotate_right.hpp>
 #include <boost/unordered/detail/serialization_version.hpp>
 #include <boost/unordered/detail/static_assert.hpp>
+#include <boost/unordered/detail/type_traits.hpp>
 #include <cstddef>
 #include <functional>
 #include <initializer_list>
@@ -213,7 +215,7 @@ struct atomic_integral
 
 /* Group-level concurrency protection. It provides a rw mutex plus an
  * atomic insertion counter for optimistic insertion (see
- * unprotected_norehash_emplace_or_visit).
+ * unprotected_norehash_emplace_and_visit).
  */
 
 struct group_access
@@ -257,6 +259,7 @@ struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy,Allocator>
     typename boost::allocator_pointer<group_access_allocator_type>::type;
 
   using super=table_arrays<Value,Group,SizePolicy,Allocator>;
+  using allocator_type=typename super::allocator_type;
 
   concurrent_table_arrays(const super& arrays,group_access_pointer pga):
     super{arrays},group_accesses_{pga}{}
@@ -265,12 +268,11 @@ struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy,Allocator>
     return boost::to_address(group_accesses_);
   }
 
-  static concurrent_table_arrays new_(
-    group_access_allocator_type al,std::size_t n)
+  static concurrent_table_arrays new_(allocator_type al,std::size_t n)
   {
     super x{super::new_(al,n)};
     BOOST_TRY{
-      return new_group_access(al,x);
+      return new_group_access(group_access_allocator_type(al),x);
     }
     BOOST_CATCH(...){
       super::delete_(al,x);
@@ -320,10 +322,9 @@ struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy,Allocator>
     return arrays;
   }
 
-  static void delete_(
-    group_access_allocator_type al,concurrent_table_arrays& arrays)noexcept
+  static void delete_(allocator_type al,concurrent_table_arrays& arrays)noexcept
   {
-    delete_group_access(al,arrays);
+    delete_group_access(group_access_allocator_type(al),arrays);
     super::delete_(al,arrays);
   }
 
@@ -396,10 +397,10 @@ inline void swap(atomic_size_control& x,atomic_size_control& y)
  *   - Parallel versions of [c]visit_all(f) and erase_if(f) are provided based
  *     on C++17 stdlib parallel algorithms.
  * 
- * Consult boost::concurrent_flat_(map|set) docs for the full API reference.
- * Heterogeneous lookup is suported by default, that is, without checking for
- * any ::is_transparent typedefs --this checking is done by the wrapping
- * containers.
+ * Consult boost::concurrent_(flat|node)_(map|set) docs for the full API
+ * reference. Heterogeneous lookup is suported by default, that is, without
+ * checking for any ::is_transparent typedefs --this checking is done by the
+ * wrapping containers.
  *
  * Thread-safe concurrency is implemented using a two-level lock system:
  * 
@@ -468,6 +469,10 @@ class concurrent_table:
   using size_type=typename super::size_type;
   static constexpr std::size_t bulk_visit_size=16;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  using stats=typename super::stats;
+#endif
+
 private:
   template<typename Value,typename T>
   using enable_if_is_value_type=typename std::enable_if<
@@ -509,6 +514,7 @@ class concurrent_table:
     x.arrays=ah.release();
     x.size_ctrl.ml=x.initial_max_load();
     x.size_ctrl.size=0;
+    BOOST_UNORDERED_SWAP_STATS(this->cstats,x.cstats);
   }
 
   concurrent_table(compatible_nonconcurrent_table&& x):
@@ -682,6 +688,26 @@ class concurrent_table:
     return construct_and_emplace(std::forward<Args>(args)...);
   }
 
+  /* Optimization for value_type and init_type, to avoid constructing twice */
+  template<typename Value>
+  BOOST_FORCEINLINE auto emplace(Value&& x)->typename std::enable_if<
+    detail::is_similar_to_any<Value,value_type,init_type>::value,bool>::type
+  {
+    return emplace_impl(std::forward<Value>(x));
+  }
+
+  /* Optimizations for maps for (k,v) to avoid eagerly constructing value */
+  template <typename K, typename V>
+  BOOST_FORCEINLINE auto emplace(K&& k, V&& v) ->
+    typename std::enable_if<is_emplace_kv_able<concurrent_table, K>::value,
+      bool>::type
+  {
+    alloc_cted_or_fwded_key_type<type_policy, Allocator, K&&> x(
+      this->al(), std::forward<K>(k));
+    return emplace_impl(
+      try_emplace_args_t{}, x.move_or_fwd(), std::forward<V>(v));
+  }
+
   BOOST_FORCEINLINE bool
   insert(const init_type& x){return emplace_impl(x);}
 
@@ -698,6 +724,14 @@ class concurrent_table:
   BOOST_FORCEINLINE bool
   insert(value_type&& x){return emplace_impl(std::move(x));}
 
+  template<typename T=element_type>
+  BOOST_FORCEINLINE
+  typename std::enable_if<
+    !std::is_same<T,value_type>::value,
+    bool
+  >::type
+  insert(element_type&& x){return emplace_impl(std::move(x));}
+
   template<typename Key,typename... Args>
   BOOST_FORCEINLINE bool try_emplace(Key&& x,Args&&... args)
   {
@@ -721,6 +755,22 @@ class concurrent_table:
       try_emplace_args_t{},std::forward<Key>(x),std::forward<Args>(args)...);
   }
 
+  template<typename Key,typename... Args>
+  BOOST_FORCEINLINE bool try_emplace_and_visit(Key&& x,Args&&... args)
+  {
+    return emplace_and_visit_flast(
+      group_exclusive{},
+      try_emplace_args_t{},std::forward<Key>(x),std::forward<Args>(args)...);
+  }
+
+  template<typename Key,typename... Args>
+  BOOST_FORCEINLINE bool try_emplace_and_cvisit(Key&& x,Args&&... args)
+  {
+    return emplace_and_visit_flast(
+      group_shared{},
+      try_emplace_args_t{},std::forward<Key>(x),std::forward<Args>(args)...);
+  }
+
   template<typename... Args>
   BOOST_FORCEINLINE bool emplace_or_visit(Args&&... args)
   {
@@ -735,62 +785,121 @@ class concurrent_table:
       group_shared{},std::forward<Args>(args)...);
   }
 
-  template<typename F>
-  BOOST_FORCEINLINE bool insert_or_visit(const init_type& x,F&& f)
+  template<typename... Args>
+  BOOST_FORCEINLINE bool emplace_and_visit(Args&&... args)
   {
-    return emplace_or_visit_impl(group_exclusive{},std::forward<F>(f),x);
+    return construct_and_emplace_and_visit_flast(
+      group_exclusive{},std::forward<Args>(args)...);
   }
 
-  template<typename F>
-  BOOST_FORCEINLINE bool insert_or_cvisit(const init_type& x,F&& f)
+  template<typename... Args>
+  BOOST_FORCEINLINE bool emplace_and_cvisit(Args&&... args)
   {
-    return emplace_or_visit_impl(group_shared{},std::forward<F>(f),x);
+    return construct_and_emplace_and_visit_flast(
+      group_shared{},std::forward<Args>(args)...);
   }
 
-  template<typename F>
-  BOOST_FORCEINLINE bool insert_or_visit(init_type&& x,F&& f)
+  template<typename Value,typename F>
+  BOOST_FORCEINLINE bool insert_or_visit(Value&& x,F&& f)
   {
-    return emplace_or_visit_impl(
-      group_exclusive{},std::forward<F>(f),std::move(x));
+    return insert_and_visit(
+      std::forward<Value>(x),[](const value_type&){},std::forward<F>(f));
   }
 
-  template<typename F>
-  BOOST_FORCEINLINE bool insert_or_cvisit(init_type&& x,F&& f)
+  template<typename Value,typename F>
+  BOOST_FORCEINLINE bool insert_or_cvisit(Value&& x,F&& f)
   {
-    return emplace_or_visit_impl(
-      group_shared{},std::forward<F>(f),std::move(x));
+    return insert_and_cvisit(
+      std::forward<Value>(x),[](const value_type&){},std::forward<F>(f));
+  }
+
+  template<typename F1,typename F2>
+  BOOST_FORCEINLINE bool insert_and_visit(const init_type& x,F1&& f1,F2&& f2)
+  {
+    return emplace_and_visit_impl(
+      group_exclusive{},std::forward<F1>(f1),std::forward<F2>(f2),x);
+  }
+
+  template<typename F1,typename F2>
+  BOOST_FORCEINLINE bool insert_and_cvisit(const init_type& x,F1&& f1,F2&& f2)
+  {
+    return emplace_and_visit_impl(
+      group_shared{},std::forward<F1>(f1),std::forward<F2>(f2),x);
+  }
+
+  template<typename F1,typename F2>
+  BOOST_FORCEINLINE bool insert_and_visit(init_type&& x,F1&& f1,F2&& f2)
+  {
+    return emplace_and_visit_impl(
+      group_exclusive{},std::forward<F1>(f1),std::forward<F2>(f2),
+      std::move(x));
+  }
+
+  template<typename F1,typename F2>
+  BOOST_FORCEINLINE bool insert_and_cvisit(init_type&& x,F1&& f1,F2&& f2)
+  {
+    return emplace_and_visit_impl(
+      group_shared{},std::forward<F1>(f1),std::forward<F2>(f2),std::move(x));
   }
 
   /* SFINAE tilts call ambiguities in favor of init_type */
 
-  template<typename Value,typename F>
-  BOOST_FORCEINLINE auto insert_or_visit(const Value& x,F&& f)
+  template<typename Value,typename F1,typename F2>
+  BOOST_FORCEINLINE auto insert_and_visit(const Value& x,F1&& f1,F2&& f2)
     ->enable_if_is_value_type<Value,bool>
   {
-    return emplace_or_visit_impl(group_exclusive{},std::forward<F>(f),x);
+    return emplace_and_visit_impl(
+      group_exclusive{},std::forward<F1>(f1),std::forward<F2>(f2),x);
   }
 
-  template<typename Value,typename F>
-  BOOST_FORCEINLINE auto insert_or_cvisit(const Value& x,F&& f)
+  template<typename Value,typename F1,typename F2>
+  BOOST_FORCEINLINE auto insert_and_cvisit(const Value& x,F1&& f1,F2&& f2)
     ->enable_if_is_value_type<Value,bool>
   {
-    return emplace_or_visit_impl(group_shared{},std::forward<F>(f),x);
+    return emplace_and_visit_impl(
+      group_shared{},std::forward<F1>(f1),std::forward<F2>(f2),x);
   }
 
-  template<typename Value,typename F>
-  BOOST_FORCEINLINE auto insert_or_visit(Value&& x,F&& f)
+  template<typename Value,typename F1,typename F2>
+  BOOST_FORCEINLINE auto insert_and_visit(Value&& x,F1&& f1,F2&& f2)
     ->enable_if_is_value_type<Value,bool>
   {
-    return emplace_or_visit_impl(
-      group_exclusive{},std::forward<F>(f),std::move(x));
+    return emplace_and_visit_impl(
+      group_exclusive{},std::forward<F1>(f1),std::forward<F2>(f2),
+      std::move(x));
   }
 
-  template<typename Value,typename F>
-  BOOST_FORCEINLINE auto insert_or_cvisit(Value&& x,F&& f)
+  template<typename Value,typename F1,typename F2>
+  BOOST_FORCEINLINE auto insert_and_cvisit(Value&& x,F1&& f1,F2&& f2)
     ->enable_if_is_value_type<Value,bool>
   {
-    return emplace_or_visit_impl(
-      group_shared{},std::forward<F>(f),std::move(x));
+    return emplace_and_visit_impl(
+      group_shared{},std::forward<F1>(f1),std::forward<F2>(f2),std::move(x));
+  }
+
+  template<typename F1,typename F2,typename T=element_type>
+  BOOST_FORCEINLINE
+  typename std::enable_if<
+    !std::is_same<T,value_type>::value,
+    bool
+  >::type
+  insert_and_visit(element_type&& x,F1&& f1,F2&& f2)
+  {
+    return emplace_and_visit_impl(
+      group_exclusive{},std::forward<F1>(f1),std::forward<F2>(f2),
+      std::move(x));
+  }
+
+  template<typename F1,typename F2,typename T=element_type>
+  BOOST_FORCEINLINE
+  typename std::enable_if<
+    !std::is_same<T,value_type>::value,
+    bool
+  >::type
+  insert_and_cvisit(element_type&& x,F1&& f1,F2&& f2)
+  {
+    return emplace_and_visit_impl(
+      group_shared{},std::forward<F1>(f1),std::forward<F2>(f2),std::move(x));
   }
 
   template<typename Key>
@@ -863,6 +972,29 @@ class concurrent_table:
     super::clear();
   }
 
+  template<typename Key,typename Extractor>
+  BOOST_FORCEINLINE void extract(const Key& x,Extractor&& ext)
+  {
+    extract_if(
+      x,[](const value_type&){return true;},std::forward<Extractor>(ext));
+  }
+
+  template<typename Key,typename F,typename Extractor>
+  BOOST_FORCEINLINE void extract_if(const Key& x,F&& f,Extractor&& ext)
+  {
+    auto        lck=shared_access();
+    auto        hash=this->hash_for(x);
+    unprotected_internal_visit(
+      group_exclusive{},x,this->position_for(hash),hash,
+      [&,this](group_type* pg,unsigned int n,element_type* p)
+      {
+        if(f(cast_for(group_exclusive{},type_policy::value_from(*p)))){
+          ext(std::move(*p),this->al());
+          super::erase(pg,n,p);
+        }
+      });
+  }
+
   // TODO: should we accept different allocator too?
   template<typename Hash2,typename Pred2>
   size_type merge(concurrent_table<TypePolicy,Hash2,Pred2,Allocator>& x)
@@ -944,6 +1076,13 @@ class concurrent_table:
     super::reserve(n);
   }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  /* already thread safe */
+
+  using super::get_stats;
+  using super::reset_stats;
+#endif
+
   template<typename Predicate>
   friend std::size_t erase_if(concurrent_table& x,Predicate&& pr)
   {
@@ -1165,6 +1304,7 @@ class concurrent_table:
     GroupAccessMode access_mode,
     const Key& x,std::size_t pos0,std::size_t hash,F&& f)const
   {    
+    BOOST_UNORDERED_STATS_COUNTER(num_cmps);
     prober pb(pos0);
     do{
       auto pos=pb.get();
@@ -1176,19 +1316,27 @@ class concurrent_table:
         auto lck=access(access_mode,pos);
         do{
           auto n=unchecked_countr_zero(mask);
-          if(BOOST_LIKELY(
-            pg->is_occupied(n)&&bool(this->pred()(x,this->key_from(p[n]))))){
-            f(pg,n,p+n);
-            return 1;
+          if(BOOST_LIKELY(pg->is_occupied(n))){
+            BOOST_UNORDERED_INCREMENT_STATS_COUNTER(num_cmps);
+            if(BOOST_LIKELY(bool(this->pred()(x,this->key_from(p[n]))))){
+              f(pg,n,p+n);
+              BOOST_UNORDERED_ADD_STATS(
+                this->cstats.successful_lookup,(pb.length(),num_cmps));
+              return 1;
+            }
           }
           mask&=mask-1;
         }while(mask);
       }
       if(BOOST_LIKELY(pg->is_not_overflowed(hash))){
+        BOOST_UNORDERED_ADD_STATS(
+          this->cstats.unsuccessful_lookup,(pb.length(),num_cmps));
         return 0;
       }
     }
     while(BOOST_LIKELY(pb.next(this->arrays.groups_size_mask)));
+    BOOST_UNORDERED_ADD_STATS(
+      this->cstats.unsuccessful_lookup,(pb.length(),num_cmps));
     return 0;
   }
 
@@ -1223,6 +1371,7 @@ class concurrent_table:
 
     it=first;
     for(auto i=m;i--;++it){
+      BOOST_UNORDERED_STATS_COUNTER(num_cmps);
       auto          pos=positions[i];
       prober        pb(pos);
       auto          pg=this->arrays.groups()+pos;
@@ -1235,12 +1384,15 @@ class concurrent_table:
           auto lck=access(access_mode,pos);
           do{
             auto n=unchecked_countr_zero(mask);
-            if(BOOST_LIKELY(
-              pg->is_occupied(n)&&
-              bool(this->pred()(*it,this->key_from(p[n]))))){
-              f(cast_for(access_mode,type_policy::value_from(p[n])));
-              ++res;
-              goto next_key;
+            if(BOOST_LIKELY(pg->is_occupied(n))){
+              BOOST_UNORDERED_INCREMENT_STATS_COUNTER(num_cmps);
+              if(bool(this->pred()(*it,this->key_from(p[n])))){
+                f(cast_for(access_mode,type_policy::value_from(p[n])));
+                ++res;
+                BOOST_UNORDERED_ADD_STATS(
+                  this->cstats.successful_lookup,(pb.length(),num_cmps));
+                goto next_key;
+              }
             }
             mask&=mask-1;
           }while(mask);
@@ -1249,6 +1401,8 @@ class concurrent_table:
         do{
           if(BOOST_LIKELY(pg->is_not_overflowed(hashes[i]))||
              BOOST_UNLIKELY(!pb.next(this->arrays.groups_size_mask))){
+            BOOST_UNORDERED_ADD_STATS(
+              this->cstats.unsuccessful_lookup,(pb.length(),num_cmps));
             goto next_key;
           }
           pos=pb.get();
@@ -1305,23 +1459,59 @@ class concurrent_table:
     );
   }
 
+  struct call_construct_and_emplace_and_visit
+  {
+    template<typename... Args>
+    BOOST_FORCEINLINE bool operator()(
+      concurrent_table* this_,Args&&... args)const
+    {
+      return this_->construct_and_emplace_and_visit(
+        std::forward<Args>(args)...);
+    }
+  };
+
+  template<typename GroupAccessMode,typename... Args>
+  BOOST_FORCEINLINE bool construct_and_emplace_and_visit_flast(
+    GroupAccessMode access_mode,Args&&... args)
+  {
+    return mp11::tuple_apply(
+      call_construct_and_emplace_and_visit{},
+      std::tuple_cat(
+        std::make_tuple(this,access_mode),
+        tuple_rotate_right<2>(
+          std::forward_as_tuple(std::forward<Args>(args)...))
+      )
+    );
+  }
+
   template<typename GroupAccessMode,typename F,typename... Args>
   BOOST_FORCEINLINE bool construct_and_emplace_or_visit(
     GroupAccessMode access_mode,F&& f,Args&&... args)
+  {
+    return construct_and_emplace_and_visit(
+      access_mode,[](const value_type&){},std::forward<F>(f),
+      std::forward<Args>(args)...);
+  }
+
+  template<typename GroupAccessMode,typename F1,typename F2,typename... Args>
+  BOOST_FORCEINLINE bool construct_and_emplace_and_visit(
+    GroupAccessMode access_mode,F1&& f1,F2&& f2,Args&&... args)
   {
     auto lck=shared_access();
 
-    auto x=alloc_make_insert_type<type_policy>(
+    alloc_cted_insert_type<type_policy,Allocator,Args...> x(
       this->al(),std::forward<Args>(args)...);
-    int res=unprotected_norehash_emplace_or_visit(
-      access_mode,std::forward<F>(f),type_policy::move(x.value()));
+    int res=unprotected_norehash_emplace_and_visit(
+      access_mode,std::forward<F1>(f1),std::forward<F2>(f2),
+      type_policy::move(x.value()));
     if(BOOST_LIKELY(res>=0))return res!=0;
 
     lck.unlock();
 
     rehash_if_full();
-    return noinline_emplace_or_visit(
-      access_mode,std::forward<F>(f),type_policy::move(x.value()));
+    return noinline_emplace_and_visit(
+      access_mode,std::forward<F1>(f1),std::forward<F2>(f2),
+      type_policy::move(x.value()));
   }
 
   template<typename... Args>
@@ -1339,6 +1529,15 @@ class concurrent_table:
       access_mode,std::forward<F>(f),std::forward<Args>(args)...);
   }
 
+  template<typename GroupAccessMode,typename F1,typename F2,typename... Args>
+  BOOST_NOINLINE bool noinline_emplace_and_visit(
+    GroupAccessMode access_mode,F1&& f1,F2&& f2,Args&&... args)
+  {
+    return emplace_and_visit_impl(
+      access_mode,std::forward<F1>(f1),std::forward<F2>(f2),
+      std::forward<Args>(args)...);
+  }
+
   struct call_emplace_or_visit_impl
   {
     template<typename... Args>
@@ -1362,15 +1561,49 @@ class concurrent_table:
     );
   }
 
+  struct call_emplace_and_visit_impl
+  {
+    template<typename... Args>
+    BOOST_FORCEINLINE bool operator()(
+      concurrent_table* this_,Args&&... args)const
+    {
+      return this_->emplace_and_visit_impl(std::forward<Args>(args)...);
+    }
+  };
+
+  template<typename GroupAccessMode,typename... Args>
+  BOOST_FORCEINLINE bool emplace_and_visit_flast(
+    GroupAccessMode access_mode,Args&&... args)
+  {
+    return mp11::tuple_apply(
+      call_emplace_and_visit_impl{},
+      std::tuple_cat(
+        std::make_tuple(this,access_mode),
+        tuple_rotate_right<2>(
+          std::forward_as_tuple(std::forward<Args>(args)...))
+      )
+    );
+  }
+
   template<typename GroupAccessMode,typename F,typename... Args>
   BOOST_FORCEINLINE bool emplace_or_visit_impl(
     GroupAccessMode access_mode,F&& f,Args&&... args)
+  {
+    return emplace_and_visit_impl(
+      access_mode,[](const value_type&){},std::forward<F>(f),
+      std::forward<Args>(args)...);
+  }
+
+  template<typename GroupAccessMode,typename F1,typename F2,typename... Args>
+  BOOST_FORCEINLINE bool emplace_and_visit_impl(
+    GroupAccessMode access_mode,F1&& f1,F2&& f2,Args&&... args)
   {
     for(;;){
       {
         auto lck=shared_access();
-        int res=unprotected_norehash_emplace_or_visit(
-          access_mode,std::forward<F>(f),std::forward<Args>(args)...);
+        int res=unprotected_norehash_emplace_and_visit(
+          access_mode,std::forward<F1>(f1),std::forward<F2>(f2),
+          std::forward<Args>(args)...);
         if(BOOST_LIKELY(res>=0))return res!=0;
       }
       rehash_if_full();
@@ -1395,6 +1628,16 @@ class concurrent_table:
     return true;
   }
 
+  template<typename GroupAccessMode,typename F,typename... Args>
+  BOOST_FORCEINLINE int
+  unprotected_norehash_emplace_or_visit(
+    GroupAccessMode access_mode,F&& f,Args&&... args)
+  {
+    return unprotected_norehash_emplace_and_visit(
+      access_mode,[&](const value_type&){},
+      std::forward<F>(f),std::forward<Args>(args)...);
+  }
+
   struct reserve_size
   {
     reserve_size(concurrent_table& x_):x(x_)
@@ -1436,10 +1679,10 @@ class concurrent_table:
     bool        commit_=false;
   };
 
-  template<typename GroupAccessMode,typename F,typename... Args>
+  template<typename GroupAccessMode,typename F1,typename F2,typename... Args>
   BOOST_FORCEINLINE int
-  unprotected_norehash_emplace_or_visit(
-    GroupAccessMode access_mode,F&& f,Args&&... args)
+  unprotected_norehash_emplace_and_visit(
+    GroupAccessMode access_mode,F1&& f1,F2&& f2,Args&&... args)
   {
     const auto &k=this->key_from(std::forward<Args>(args)...);
     auto        hash=this->hash_for(k);
@@ -1449,7 +1692,7 @@ class concurrent_table:
     startover:
       boost::uint32_t counter=insert_counter(pos0);
       if(unprotected_visit(
-        access_mode,k,pos0,hash,std::forward<F>(f)))return 0;
+        access_mode,k,pos0,hash,std::forward<F2>(f2)))return 0;
 
       reserve_size rsize(*this);
       if(BOOST_LIKELY(rsize.succeeded())){
@@ -1469,6 +1712,8 @@ class concurrent_table:
             this->construct_element(p,std::forward<Args>(args)...);
             rslot.commit();
             rsize.commit();
+            f1(cast_for(group_exclusive{},type_policy::value_from(*p)));
+            BOOST_UNORDERED_ADD_STATS(this->cstats.insertion,(pb.length()));
             return 1;
           }
           pg->mark_overflow(hash);
@@ -1684,7 +1929,8 @@ class concurrent_table:
 
       if(this->find(x,pos0,hash))throw_exception(bad_archive_exception());
       auto loc=this->unchecked_emplace_at(pos0,hash,std::move(x));
-      ar.reset_object_address(std::addressof(*loc.p),std::addressof(x));
+      ar.reset_object_address(
+        std::addressof(type_policy::value_from(*loc.p)),std::addressof(x));
     }
   }
 
@@ -1693,7 +1939,7 @@ class concurrent_table:
   {
     using raw_key_type=typename std::remove_const<key_type>::type;
     using raw_mapped_type=typename std::remove_const<
-      typename TypePolicy::mapped_type>::type;
+      typename type_policy::mapped_type>::type;
 
     auto                                   lck=exclusive_access();
     std::size_t                            s;
@@ -1717,8 +1963,12 @@ class concurrent_table:
 
       if(this->find(k,pos0,hash))throw_exception(bad_archive_exception());
       auto loc=this->unchecked_emplace_at(pos0,hash,std::move(k),std::move(m));
-      ar.reset_object_address(std::addressof(loc.p->first),std::addressof(k));
-      ar.reset_object_address(std::addressof(loc.p->second),std::addressof(m));
+      ar.reset_object_address(
+        std::addressof(type_policy::value_from(*loc.p).first),
+        std::addressof(k));
+      ar.reset_object_address(
+        std::addressof(type_policy::value_from(*loc.p).second),
+        std::addressof(m));
     }
   }
 
diff --git a/inst/include/boost/unordered/detail/foa/core.hpp b/inst/include/boost/unordered/detail/foa/core.hpp
index 0ffbfc034..1d96644d6 100644
--- a/inst/include/boost/unordered/detail/foa/core.hpp
+++ b/inst/include/boost/unordered/detail/foa/core.hpp
@@ -1,7 +1,8 @@
 /* Common base for Boost.Unordered open-addressing tables.
  *
- * Copyright 2022-2023 Joaquin M Lopez Munoz.
+ * Copyright 2022-2024 Joaquin M Lopez Munoz.
  * Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Braden Ganetsky.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -22,11 +23,13 @@
 #include <boost/core/pointer_traits.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/predef.h>
+#include <boost/unordered/detail/allocator_constructed.hpp>
 #include <boost/unordered/detail/narrow_cast.hpp>
 #include <boost/unordered/detail/mulx.hpp>
 #include <boost/unordered/detail/static_assert.hpp>
 #include <boost/unordered/detail/type_traits.hpp>
 #include <boost/unordered/hash_traits.hpp>
+#include <boost/unordered/unordered_printers.hpp>
 #include <climits>
 #include <cmath>
 #include <cstddef>
@@ -38,6 +41,10 @@
 #include <type_traits>
 #include <utility>
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+#include <boost/unordered/detail/foa/cumulative_stats.hpp>
+#endif
+
 #if !defined(BOOST_UNORDERED_DISABLE_SSE2)
 #if defined(BOOST_UNORDERED_ENABLE_SSE2)|| \
     defined(__SSE2__)|| \
@@ -862,6 +869,7 @@ struct pow2_quadratic_prober
   pow2_quadratic_prober(std::size_t pos_):pos{pos_}{}
 
   inline std::size_t get()const{return pos;}
+  inline std::size_t length()const{return step+1;}
 
   /* next returns false when the whole array has been traversed, which ends
    * probing (in practice, full-table probing will only happen with very small
@@ -975,7 +983,12 @@ struct arrays_holder
   arrays_holder(arrays_holder const&);
   arrays_holder& operator=(arrays_holder const&)=delete;
 
-  ~arrays_holder(){if(!released_)arrays_.delete_(al_,arrays_);}
+  ~arrays_holder()
+  {
+    if(!released_){
+      arrays_.delete_(typename Arrays::allocator_type(al_),arrays_);
+    }
+  }
 
   const Arrays& release()
   {
@@ -1005,6 +1018,11 @@ struct table_arrays
       rebind<group_type>;
   using group_type_pointer_traits=boost::pointer_traits<group_type_pointer>;
 
+  // For natvis purposes
+  using char_pointer=
+    typename boost::pointer_traits<value_type_pointer>::template
+      rebind<unsigned char>;
+
   table_arrays(
     std::size_t gsi,std::size_t gsm,
     group_type_pointer pg,value_type_pointer pe):
@@ -1118,6 +1136,54 @@ struct table_arrays
   value_type_pointer elements_;
 };
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+/* stats support */
+
+struct table_core_cumulative_stats
+{
+  concurrent_cumulative_stats<1> insertion;
+  concurrent_cumulative_stats<2> successful_lookup,
+                                 unsuccessful_lookup;
+};
+
+struct table_core_insertion_stats
+{
+  std::size_t            count;
+  sequence_stats_summary probe_length;
+};
+
+struct table_core_lookup_stats
+{
+  std::size_t            count;
+  sequence_stats_summary probe_length;
+  sequence_stats_summary num_comparisons;
+};
+
+struct table_core_stats
+{
+  table_core_insertion_stats insertion;
+  table_core_lookup_stats    successful_lookup,
+                             unsuccessful_lookup;
+};
+
+#define BOOST_UNORDERED_ADD_STATS(stats,args) stats.add args
+#define BOOST_UNORDERED_SWAP_STATS(stats1,stats2) std::swap(stats1,stats2)
+#define BOOST_UNORDERED_COPY_STATS(stats1,stats2) stats1=stats2
+#define BOOST_UNORDERED_RESET_STATS_OF(x) x.reset_stats()
+#define BOOST_UNORDERED_STATS_COUNTER(name) std::size_t name=0
+#define BOOST_UNORDERED_INCREMENT_STATS_COUNTER(name) ++name
+
+#else
+
+#define BOOST_UNORDERED_ADD_STATS(stats,args) ((void)0)
+#define BOOST_UNORDERED_SWAP_STATS(stats1,stats2) ((void)0)
+#define BOOST_UNORDERED_COPY_STATS(stats1,stats2) ((void)0)
+#define BOOST_UNORDERED_RESET_STATS_OF(x) ((void)0)
+#define BOOST_UNORDERED_STATS_COUNTER(name) ((void)0)
+#define BOOST_UNORDERED_INCREMENT_STATS_COUNTER(name) ((void)0)
+
+#endif
+
 struct if_constexpr_void_else{void operator()()const{}};
 
 template<bool B,typename F,typename G=if_constexpr_void_else>
@@ -1220,22 +1286,15 @@ class alloc_cted_insert_type
     emplace_type,typename TypePolicy::element_type
   >::type;
 
-  alignas(insert_type) unsigned char storage[sizeof(insert_type)];
-  Allocator                          al;
+  using alloc_cted = allocator_constructed<Allocator, insert_type, TypePolicy>;
+  alloc_cted val;
 
 public:
-  alloc_cted_insert_type(const Allocator& al_,Args&&... args):al{al_}
-  {
-    TypePolicy::construct(al,data(),std::forward<Args>(args)...);
-  }
-
-  ~alloc_cted_insert_type()
+  alloc_cted_insert_type(const Allocator& al_,Args&&... args):val{al_,std::forward<Args>(args)...}
   {
-    TypePolicy::destroy(al,data());
   }
 
-  insert_type* data(){return reinterpret_cast<insert_type*>(&storage);}
-  insert_type& value(){return *data();}
+  insert_type& value(){return val.value();}
 };
 
 template<typename TypePolicy,typename Allocator,typename... Args>
@@ -1245,6 +1304,51 @@ alloc_make_insert_type(const Allocator& al,Args&&... args)
   return {al,std::forward<Args>(args)...};
 }
 
+template <typename TypePolicy, typename Allocator, typename KFwdRef,
+  typename = void>
+class alloc_cted_or_fwded_key_type
+{
+  using key_type = typename TypePolicy::key_type;
+  allocator_constructed<Allocator, key_type, TypePolicy> val;
+
+public:
+  alloc_cted_or_fwded_key_type(const Allocator& al_, KFwdRef k)
+      : val(al_, std::forward<KFwdRef>(k))
+  {
+  }
+
+  key_type&& move_or_fwd() { return std::move(val.value()); }
+};
+
+template <typename TypePolicy, typename Allocator, typename KFwdRef>
+class alloc_cted_or_fwded_key_type<TypePolicy, Allocator, KFwdRef,
+  typename std::enable_if<
+    is_similar<KFwdRef, typename TypePolicy::key_type>::value>::type>
+{
+  // This specialization acts as a forwarding-reference wrapper
+  BOOST_UNORDERED_STATIC_ASSERT(std::is_reference<KFwdRef>::value);
+  KFwdRef ref;
+
+public:
+  alloc_cted_or_fwded_key_type(const Allocator&, KFwdRef k)
+      : ref(std::forward<KFwdRef>(k))
+  {
+  }
+
+  KFwdRef move_or_fwd() { return std::forward<KFwdRef>(ref); }
+};
+
+template <typename Container>
+using is_map =
+  std::integral_constant<bool, !std::is_same<typename Container::key_type,
+                                 typename Container::value_type>::value>;
+
+template <typename Container, typename K>
+using is_emplace_kv_able = std::integral_constant<bool,
+  is_map<Container>::value &&
+    (is_similar<K, typename Container::key_type>::value ||
+      is_complete_and_move_constructible<typename Container::key_type>::value)>;
+
 /* table_core. The TypePolicy template parameter is used to generate
  * instantiations suitable for either maps or sets, and introduces non-standard
  * init_type and element_type:
@@ -1262,7 +1366,7 @@ alloc_make_insert_type(const Allocator& al,Args&&... args)
  *
  *   - TypePolicy::construct and TypePolicy::destroy are used for the
  *     construction and destruction of the internal types: value_type,
- *     init_type and element_type.
+ *     init_type, element_type, and key_type.
  * 
  *   - TypePolicy::move is used to provide move semantics for the internal
  *     types used by the container during rehashing and emplace. These types
@@ -1350,6 +1454,16 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
   using locator=table_locator<group_type,element_type>;
   using arrays_holder_type=arrays_holder<arrays_type,Allocator>;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  using cumulative_stats=table_core_cumulative_stats;
+  using stats=table_core_stats;
+#endif
+
+#if defined(BOOST_GCC)
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
   table_core(
     std::size_t n=default_bucket_count,const Hash& h_=Hash(),
     const Pred& pred_=Pred(),const Allocator& al_=Allocator()):
@@ -1358,6 +1472,10 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
     size_ctrl{initial_max_load(),0}
     {}
 
+#if defined(BOOST_GCC)
+#pragma GCC diagnostic pop
+#endif
+
   /* genericize on an ArraysFn so that we can do things like delay an
    * allocation for the group_access data required by cfoa after the move
    * constructors of Hash, Pred have been invoked
@@ -1384,6 +1502,7 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
     x.arrays=ah.release();
     x.size_ctrl.ml=x.initial_max_load();
     x.size_ctrl.size=0;
+    BOOST_UNORDERED_SWAP_STATS(cstats,x.cstats);
   }
 
   table_core(table_core&& x)
@@ -1409,11 +1528,13 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
       using std::swap;
       swap(arrays,x.arrays);
       swap(size_ctrl,x.size_ctrl);
+      BOOST_UNORDERED_SWAP_STATS(cstats,x.cstats);
     }
     else{
       reserve(x.size());
       clear_on_exit c{x};
       (void)c; /* unused var warning */
+      BOOST_UNORDERED_RESET_STATS_OF(x);
 
       /* This works because subsequent x.clear() does not depend on the
        * elements' values.
@@ -1529,9 +1650,11 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
         arrays=x.arrays;
         size_ctrl.ml=std::size_t(x.size_ctrl.ml);
         size_ctrl.size=std::size_t(x.size_ctrl.size);
+        BOOST_UNORDERED_COPY_STATS(cstats,x.cstats);
         x.arrays=ah.release();
         x.size_ctrl.ml=x.initial_max_load();
         x.size_ctrl.size=0;
+        BOOST_UNORDERED_RESET_STATS_OF(x);
       }
       else{
         swap(h(),x.h());
@@ -1541,6 +1664,7 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
         noshrink_reserve(x.size());
         clear_on_exit c{x};
         (void)c; /* unused var warning */
+        BOOST_UNORDERED_RESET_STATS_OF(x);
 
         /* This works because subsequent x.clear() does not depend on the
          * elements' values.
@@ -1594,6 +1718,7 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
   BOOST_FORCEINLINE locator find(
     const Key& x,std::size_t pos0,std::size_t hash)const
   {    
+    BOOST_UNORDERED_STATS_COUNTER(num_cmps);
     prober pb(pos0);
     do{
       auto pos=pb.get();
@@ -1605,18 +1730,25 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
         auto p=elements+pos*N;
         BOOST_UNORDERED_PREFETCH_ELEMENTS(p,N);
         do{
+          BOOST_UNORDERED_INCREMENT_STATS_COUNTER(num_cmps);
           auto n=unchecked_countr_zero(mask);
           if(BOOST_LIKELY(bool(pred()(x,key_from(p[n]))))){
+            BOOST_UNORDERED_ADD_STATS(
+              cstats.successful_lookup,(pb.length(),num_cmps));
             return {pg,n,p+n};
           }
           mask&=mask-1;
         }while(mask);
       }
       if(BOOST_LIKELY(pg->is_not_overflowed(hash))){
+        BOOST_UNORDERED_ADD_STATS(
+          cstats.unsuccessful_lookup,(pb.length(),num_cmps));
         return {};
       }
     }
     while(BOOST_LIKELY(pb.next(arrays.groups_size_mask)));
+    BOOST_UNORDERED_ADD_STATS(
+      cstats.unsuccessful_lookup,(pb.length(),num_cmps));
     return {};
   }
 
@@ -1701,6 +1833,38 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
     rehash(std::size_t(std::ceil(float(n)/mlf)));
   }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  stats get_stats()const
+  {
+    auto insertion=cstats.insertion.get_summary();
+    auto successful_lookup=cstats.successful_lookup.get_summary();
+    auto unsuccessful_lookup=cstats.unsuccessful_lookup.get_summary();
+    return{
+      {
+        insertion.count,
+        insertion.sequence_summary[0]
+      },
+      {
+        successful_lookup.count,
+        successful_lookup.sequence_summary[0],
+        successful_lookup.sequence_summary[1]
+      },
+      {
+        unsuccessful_lookup.count,
+        unsuccessful_lookup.sequence_summary[0],
+        unsuccessful_lookup.sequence_summary[1]
+      },
+    };
+  }
+
+  void reset_stats()noexcept
+  {
+    cstats.insertion.reset();
+    cstats.successful_lookup.reset();
+    cstats.unsuccessful_lookup.reset();
+  }
+#endif
+
   friend bool operator==(const table_core& x,const table_core& y)
   {
     return
@@ -1908,8 +2072,12 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
     return true;
   }
 
-  arrays_type    arrays;
-  size_ctrl_type size_ctrl;
+  arrays_type              arrays;
+  size_ctrl_type           size_ctrl;
+
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  mutable cumulative_stats cstats;
+#endif
 
 private:
   template<
@@ -1922,6 +2090,11 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
   using pred_base=empty_value<Pred,1>;
   using allocator_base=empty_value<Allocator,2>;
 
+#if defined(BOOST_GCC)
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
   /* used by allocator-extended move ctor */
 
   table_core(Hash&& h_,Pred&& pred_,const Allocator& al_):
@@ -1932,9 +2105,13 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
   {
   }
 
+#if defined(BOOST_GCC)
+#pragma GCC diagnostic pop
+#endif
+
   arrays_type new_arrays(std::size_t n)const
   {
-    return arrays_type::new_(al(),n);
+    return arrays_type::new_(typename arrays_type::allocator_type(al()),n);
   }
 
   arrays_type new_arrays_for_growth()const
@@ -1955,7 +2132,7 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
 
   void delete_arrays(arrays_type& arrays_)noexcept
   {
-    arrays_type::delete_(al(),arrays_);
+    arrays_type::delete_(typename arrays_type::allocator_type(al()),arrays_);
   }
 
   arrays_holder_type make_arrays(std::size_t n)const
@@ -2198,6 +2375,7 @@ table_core:empty_value<Hash,0>,empty_value<Pred,1>,empty_value<Allocator,2>
         auto p=arrays_.elements()+pos*N+n;
         construct_element(p,std::forward<Args>(args)...);
         pg->set(n,hash);
+        BOOST_UNORDERED_ADD_STATS(cstats.insertion,(pb.length()));
         return {pg,n,p};
       }
       else pg->mark_overflow(hash);
diff --git a/inst/include/boost/unordered/detail/foa/cumulative_stats.hpp b/inst/include/boost/unordered/detail/foa/cumulative_stats.hpp
new file mode 100644
index 000000000..13a157474
--- /dev/null
+++ b/inst/include/boost/unordered/detail/foa/cumulative_stats.hpp
@@ -0,0 +1,177 @@
+/* Copyright 2024 Joaquin M Lopez Munoz.
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_DETAIL_FOA_CUMULATIVE_STATS_HPP
+#define BOOST_UNORDERED_DETAIL_FOA_CUMULATIVE_STATS_HPP
+
+#include <array>
+#include <boost/config.hpp>
+#include <boost/mp11/tuple.hpp>
+#include <cmath>
+#include <cstddef>
+
+#if defined(BOOST_HAS_THREADS)
+#include <boost/unordered/detail/foa/rw_spinlock.hpp>
+#include <mutex>
+#endif
+
+namespace boost{
+namespace unordered{
+namespace detail{
+namespace foa{
+
+/* Cumulative one-pass calculation of the average, variance and deviation of
+ * running sequences.
+ */
+
+struct sequence_stats_data
+{
+  double m=0.0;
+  double m_prior=0.0;
+  double s=0.0;
+};
+
+struct welfords_algorithm /* 0-based */
+{
+  template<typename T>
+  int operator()(T&& x,sequence_stats_data& d)const noexcept
+  {
+    static_assert(
+      noexcept(static_cast<double>(x)),
+      "Argument conversion to double must not throw.");
+
+    d.m_prior=d.m;
+    d.m+=(static_cast<double>(x)-d.m)/static_cast<double>(n);
+    d.s+=(n!=1)*
+      (static_cast<double>(x)-d.m_prior)*(static_cast<double>(x)-d.m);
+
+    return 0; /* mp11::tuple_transform requires that return type not be void */
+  }
+
+  std::size_t n;
+};
+
+struct sequence_stats_summary
+{
+  double average;
+  double variance;
+  double deviation;
+};
+
+/* Stats calculated jointly for N same-sized sequences to save the space
+ * for count.
+ */
+
+template<std::size_t N>
+class cumulative_stats
+{
+public:
+  struct summary
+  {
+    std::size_t                          count;
+    std::array<sequence_stats_summary,N> sequence_summary;
+  };
+
+  void reset()noexcept{*this=cumulative_stats();}
+  
+  template<typename... Ts>
+  void add(Ts&&... xs)noexcept
+  {
+    static_assert(
+      sizeof...(Ts)==N,"A sample must be provided for each sequence.");
+
+    if(BOOST_UNLIKELY(++n==0)){ /* wraparound */
+      reset();
+      n=1;
+    }
+    mp11::tuple_transform(
+      welfords_algorithm{n},
+      std::forward_as_tuple(std::forward<Ts>(xs)...),
+      data);
+  }
+  
+  summary get_summary()const noexcept
+  {
+    summary res;
+    res.count=n;
+    for(std::size_t i=0;i<N;++i){
+      double average=data[i].m,
+             variance=n!=0?data[i].s/static_cast<double>(n):0.0, /* biased */
+             deviation=std::sqrt(variance);
+      res.sequence_summary[i]={average,variance,deviation};
+    }
+    return res;
+  }
+
+private:
+  std::size_t                       n=0;
+  std::array<sequence_stats_data,N> data;
+};
+
+#if defined(BOOST_HAS_THREADS)
+
+template<std::size_t N>
+class concurrent_cumulative_stats:cumulative_stats<N>
+{
+  using super=cumulative_stats<N>;
+  using lock_guard=std::lock_guard<rw_spinlock>;
+
+public:
+  using summary=typename super::summary;
+
+  concurrent_cumulative_stats()noexcept:super{}{}
+  concurrent_cumulative_stats(const concurrent_cumulative_stats& x)noexcept:
+    concurrent_cumulative_stats{x,lock_guard{x.mut}}{}
+
+  concurrent_cumulative_stats&
+  operator=(const concurrent_cumulative_stats& x)noexcept
+  {
+    auto x1=x;
+    lock_guard lck{mut};
+    static_cast<super&>(*this)=x1;
+    return *this;
+  }
+
+  void reset()noexcept
+  {
+    lock_guard lck{mut};
+    super::reset();
+  }
+  
+  template<typename... Ts>
+  void add(Ts&&... xs)noexcept
+  {
+    lock_guard lck{mut};
+    super::add(std::forward<Ts>(xs)...);
+  }
+  
+  summary get_summary()const noexcept
+  {
+    lock_guard lck{mut};
+    return super::get_summary();
+  }
+
+private:
+  concurrent_cumulative_stats(const super& x,lock_guard&&):super{x}{}
+
+  mutable rw_spinlock mut;
+};
+
+#else
+
+template<std::size_t N>
+using concurrent_cumulative_stats=cumulative_stats<N>;
+
+#endif
+
+} /* namespace foa */
+} /* namespace detail */
+} /* namespace unordered */
+} /* namespace boost */
+
+#endif
diff --git a/inst/include/boost/unordered/detail/foa/flat_map_types.hpp b/inst/include/boost/unordered/detail/foa/flat_map_types.hpp
index 712df5fbb..750691310 100644
--- a/inst/include/boost/unordered/detail/foa/flat_map_types.hpp
+++ b/inst/include/boost/unordered/detail/foa/flat_map_types.hpp
@@ -1,10 +1,13 @@
 // Copyright (C) 2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_UNORDERED_DETAIL_FOA_FLAT_MAP_TYPES_HPP
 #define BOOST_UNORDERED_DETAIL_FOA_FLAT_MAP_TYPES_HPP
 
+#include <boost/unordered/detail/foa/types_constructibility.hpp>
+
 #include <boost/core/allocator_access.hpp>
 
 namespace boost {
@@ -24,6 +27,9 @@ namespace boost {
 
           using element_type = value_type;
 
+          using types = flat_map_types<Key, T>;
+          using constructibility_checker = map_types_constructibility<types>;
+
           static value_type& value_from(element_type& x) { return x; }
 
           template <class K, class V>
@@ -47,12 +53,21 @@ namespace boost {
           template <class A, class... Args>
           static void construct(A& al, init_type* p, Args&&... args)
           {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
             boost::allocator_construct(al, p, std::forward<Args>(args)...);
           }
 
           template <class A, class... Args>
           static void construct(A& al, value_type* p, Args&&... args)
           {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
+            boost::allocator_construct(al, p, std::forward<Args>(args)...);
+          }
+
+          template <class A, class... Args>
+          static void construct(A& al, key_type* p, Args&&... args)
+          {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
             boost::allocator_construct(al, p, std::forward<Args>(args)...);
           }
 
@@ -65,10 +80,15 @@ namespace boost {
           {
             boost::allocator_destroy(al, p);
           }
+
+          template <class A> static void destroy(A& al, key_type* p) noexcept
+          {
+            boost::allocator_destroy(al, p);
+          }
         };
       } // namespace foa
-    }   // namespace detail
-  }     // namespace unordered
+    } // namespace detail
+  } // namespace unordered
 } // namespace boost
 
 #endif // BOOST_UNORDERED_DETAIL_FOA_FLAT_MAP_TYPES_HPP
diff --git a/inst/include/boost/unordered/detail/foa/flat_set_types.hpp b/inst/include/boost/unordered/detail/foa/flat_set_types.hpp
index 493cb4fe4..3da1f49e3 100644
--- a/inst/include/boost/unordered/detail/foa/flat_set_types.hpp
+++ b/inst/include/boost/unordered/detail/foa/flat_set_types.hpp
@@ -5,6 +5,8 @@
 #ifndef BOOST_UNORDERED_DETAIL_FOA_FLAT_SET_TYPES_HPP
 #define BOOST_UNORDERED_DETAIL_FOA_FLAT_SET_TYPES_HPP
 
+#include <boost/unordered/detail/foa/types_constructibility.hpp>
+
 #include <boost/core/allocator_access.hpp>
 
 namespace boost {
@@ -21,6 +23,9 @@ namespace boost {
 
           using element_type = value_type;
 
+          using types = flat_set_types<Key>;
+          using constructibility_checker = set_types_constructibility<types>;
+
           static Key& value_from(element_type& x) { return x; }
 
           static element_type&& move(element_type& x) { return std::move(x); }
@@ -28,6 +33,7 @@ namespace boost {
           template <class A, class... Args>
           static void construct(A& al, value_type* p, Args&&... args)
           {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
             boost::allocator_construct(al, p, std::forward<Args>(args)...);
           }
 
@@ -37,8 +43,8 @@ namespace boost {
           }
         };
       } // namespace foa
-    }   // namespace detail
-  }     // namespace unordered
+    } // namespace detail
+  } // namespace unordered
 } // namespace boost
 
 #endif // BOOST_UNORDERED_DETAIL_FOA_FLAT_SET_TYPES_HPP
diff --git a/inst/include/boost/unordered/detail/foa/node_handle.hpp b/inst/include/boost/unordered/detail/foa/node_handle.hpp
index ae1600d84..5af22798c 100644
--- a/inst/include/boost/unordered/detail/foa/node_handle.hpp
+++ b/inst/include/boost/unordered/detail/foa/node_handle.hpp
@@ -1,4 +1,5 @@
 /* Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -11,8 +12,11 @@
 
 #include <boost/unordered/detail/opt_storage.hpp>
 
+#include <boost/assert.hpp>
 #include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/core/allocator_access.hpp>
+#include <type_traits>
 
 namespace boost{
 namespace unordered{
@@ -27,6 +31,13 @@ struct insert_return_type
   NodeType node;
 };
 
+template <class NodeType>
+struct iteratorless_insert_return_type
+{
+  bool     inserted;
+  NodeType node;
+};
+
 template <class TypePolicy,class Allocator>
 struct node_handle_base
 {
@@ -42,7 +53,27 @@ struct node_handle_base
     element_type p_;
     BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS opt_storage<Allocator> a_;
 
-  protected:
+    friend struct node_handle_access;
+
+    template<bool B>
+    void move_assign_allocator_if(node_handle_base&& nh)noexcept
+    {
+      move_assign_allocator_if(
+        std::integral_constant<bool,B>{}, std::move(nh));
+    }
+
+    void move_assign_allocator_if(
+      std::true_type, node_handle_base&& nh)noexcept
+    {
+      al()=std::move(nh.al());
+    }
+
+    void move_assign_allocator_if(
+      std::false_type, node_handle_base&&)noexcept
+    {
+    }
+
+protected:
     node_value_type& data()noexcept
     {
       return *(p_.p);
@@ -126,9 +157,7 @@ struct node_handle_base
             BOOST_ASSERT(pocma||al()==nh.al());
 
             type_policy::destroy(al(),&p_);
-            if(pocma){
-              al()=std::move(nh.al());
-            }
+            move_assign_allocator_if<pocma>(std::move(nh));
 
             p_=std::move(nh.p_);
             nh.reset();
@@ -153,7 +182,17 @@ struct node_handle_base
       }
     }
 
-    allocator_type get_allocator()const noexcept{return al();}
+    allocator_type get_allocator()const
+    {
+#if defined(BOOST_GCC)
+      /* GCC lifetime analysis incorrectly warns about uninitialized
+       * allocator object under some circumstances.
+       */
+      if(empty())__builtin_unreachable();
+#endif
+      return al();
+    }
+
     explicit operator bool()const noexcept{ return !empty();}
     BOOST_ATTRIBUTE_NODISCARD bool empty()const noexcept{return p_.p==nullptr;}
 
@@ -196,6 +235,82 @@ struct node_handle_base
     }
 };
 
+// Internal usage of node_handle_base protected API
+
+struct node_handle_access
+{
+  template <class TypePolicy, class Allocator>
+  using node_type = node_handle_base<TypePolicy, Allocator>;
+
+#if BOOST_WORKAROUND(BOOST_CLANG_VERSION,<190000)
+  // https://github.com/llvm/llvm-project/issues/25708
+
+  template <class TypePolicy, class Allocator>
+  struct element_type_impl
+  {
+    using type = typename node_type<TypePolicy, Allocator>::element_type;
+  };
+  template <class TypePolicy, class Allocator>
+  using element_type = typename element_type_impl<TypePolicy, Allocator>::type;
+#else
+  template <class TypePolicy, class Allocator>
+  using element_type = typename node_type<TypePolicy, Allocator>::element_type;
+#endif
+
+  template <class TypePolicy, class Allocator>
+  static element_type<TypePolicy, Allocator>&
+  element(node_type<TypePolicy, Allocator>& nh)noexcept
+  {
+    return nh.element();
+  }
+
+  template <class TypePolicy, class Allocator>
+  static element_type<TypePolicy, Allocator>
+  const& element(node_type<TypePolicy, Allocator> const& nh)noexcept
+  {
+    return nh.element();
+  }
+
+  template <class TypePolicy, class Allocator>
+  static void emplace(
+    node_type<TypePolicy, Allocator>& nh,
+    element_type<TypePolicy, Allocator>&& x, Allocator a)
+  {
+    nh.emplace(std::move(x), a);
+  }
+
+  template <class TypePolicy,class Allocator>
+  static void reset(node_type<TypePolicy, Allocator>& nh)
+  {
+    nh.reset();
+  }
+};
+
+template <class TypePolicy, class Allocator>
+class node_handle_emplacer_class
+{
+  using access = node_handle_access;
+  using node_type = access::node_type<TypePolicy, Allocator>;
+  using element_type = access::element_type<TypePolicy, Allocator>;
+
+  node_type & nh;
+
+public:
+  node_handle_emplacer_class(node_type& nh_): nh(nh_) {}
+
+  void operator()(element_type&& x,Allocator a)
+  {
+    access::emplace(nh, std::move(x), a);
+  }
+};
+
+template <class TypePolicy, class Allocator>
+node_handle_emplacer_class<TypePolicy, Allocator>
+node_handle_emplacer(node_handle_base<TypePolicy, Allocator>& nh)
+{
+  return {nh};
+}
+
 }
 }
 }
diff --git a/inst/include/boost/unordered/detail/foa/node_map_handle.hpp b/inst/include/boost/unordered/detail/foa/node_map_handle.hpp
new file mode 100644
index 000000000..8df922787
--- /dev/null
+++ b/inst/include/boost/unordered/detail/foa/node_map_handle.hpp
@@ -0,0 +1,56 @@
+/* Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Joaquin M Lopez Munoz. 
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_DETAIL_FOA_NODE_MAP_HANDLE_HPP
+#define BOOST_UNORDERED_DETAIL_FOA_NODE_MAP_HANDLE_HPP
+
+#include <boost/unordered/detail/foa/node_handle.hpp>
+
+namespace boost{
+namespace unordered{
+namespace detail{
+namespace foa{
+
+template <class TypePolicy, class Allocator>
+struct node_map_handle
+    : public node_handle_base<TypePolicy, Allocator>
+{
+private:
+  using base_type = node_handle_base<TypePolicy, Allocator>;
+
+  using typename base_type::type_policy;
+
+public:
+  using key_type = typename TypePolicy::key_type;
+  using mapped_type = typename TypePolicy::mapped_type;
+
+  constexpr node_map_handle() noexcept = default;
+  node_map_handle(node_map_handle&& nh) noexcept = default;
+
+  node_map_handle& operator=(node_map_handle&&) noexcept = default;
+
+  key_type& key() const
+  {
+    BOOST_ASSERT(!this->empty());
+    return const_cast<key_type&>(this->data().first);
+  }
+
+  mapped_type& mapped() const
+  {
+    BOOST_ASSERT(!this->empty());
+    return const_cast<mapped_type&>(this->data().second);
+  }
+};
+
+}
+}
+}
+}
+
+#endif // BOOST_UNORDERED_DETAIL_FOA_NODE_MAP_HANDLE_HPP
diff --git a/inst/include/boost/unordered/detail/foa/node_map_types.hpp b/inst/include/boost/unordered/detail/foa/node_map_types.hpp
index ccb378efb..f13a7a84d 100644
--- a/inst/include/boost/unordered/detail/foa/node_map_types.hpp
+++ b/inst/include/boost/unordered/detail/foa/node_map_types.hpp
@@ -1,4 +1,5 @@
 // Copyright (C) 2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -6,6 +7,8 @@
 #define BOOST_UNORDERED_DETAIL_FOA_NODE_MAP_TYPES_HPP
 
 #include <boost/unordered/detail/foa/element_type.hpp>
+#include <boost/unordered/detail/foa/types_constructibility.hpp>
+#include <boost/unordered/detail/type_traits.hpp>
 
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/no_exceptions_support.hpp>
@@ -28,6 +31,9 @@ namespace boost {
 
           using element_type = foa::element_type<value_type, VoidPtr>;
 
+          using types = node_map_types<Key, T, VoidPtr>;
+          using constructibility_checker = map_types_constructibility<types>;
+
           static value_type& value_from(element_type const& x)
           {
             return *(x.p);
@@ -67,18 +73,27 @@ namespace boost {
           static void construct(
             A& al, element_type* p, element_type const& copy)
           {
-            construct(al, p, *copy.p);
+            construct(al, p, detail::as_const(*copy.p));
           }
 
           template <class A, class... Args>
           static void construct(A& al, init_type* p, Args&&... args)
           {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
             boost::allocator_construct(al, p, std::forward<Args>(args)...);
           }
 
           template <class A, class... Args>
           static void construct(A& al, value_type* p, Args&&... args)
           {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
+            boost::allocator_construct(al, p, std::forward<Args>(args)...);
+          }
+
+          template <class A, class... Args>
+          static void construct(A& al, key_type* p, Args&&... args)
+          {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
             boost::allocator_construct(al, p, std::forward<Args>(args)...);
           }
 
@@ -88,8 +103,11 @@ namespace boost {
             p->p = boost::allocator_allocate(al, 1);
             BOOST_TRY
             {
+              auto address = boost::to_address(p->p);
+              constructibility_checker::check(
+                al, address, std::forward<Args>(args)...);
               boost::allocator_construct(
-                al, boost::to_address(p->p), std::forward<Args>(args)...);
+                al, address, std::forward<Args>(args)...);
             }
             BOOST_CATCH(...)
             {
@@ -109,6 +127,11 @@ namespace boost {
             boost::allocator_destroy(al, p);
           }
 
+          template <class A> static void destroy(A& al, key_type* p) noexcept
+          {
+            boost::allocator_destroy(al, p);
+          }
+
           template <class A>
           static void destroy(A& al, element_type* p) noexcept
           {
@@ -120,8 +143,8 @@ namespace boost {
         };
 
       } // namespace foa
-    }   // namespace detail
-  }     // namespace unordered
+    } // namespace detail
+  } // namespace unordered
 } // namespace boost
 
 #endif // BOOST_UNORDERED_DETAIL_FOA_NODE_MAP_TYPES_HPP
diff --git a/inst/include/boost/unordered/detail/foa/node_set_handle.hpp b/inst/include/boost/unordered/detail/foa/node_set_handle.hpp
new file mode 100644
index 000000000..c3bc065b1
--- /dev/null
+++ b/inst/include/boost/unordered/detail/foa/node_set_handle.hpp
@@ -0,0 +1,48 @@
+/* Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Joaquin M Lopez Munoz. 
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * See https://www.boost.org/libs/unordered for library home page.
+ */
+
+#ifndef BOOST_UNORDERED_DETAIL_FOA_NODE_SET_HANDLE_HPP
+#define BOOST_UNORDERED_DETAIL_FOA_NODE_SET_HANDLE_HPP
+
+#include <boost/unordered/detail/foa/node_handle.hpp>
+
+namespace boost{
+namespace unordered{
+namespace detail{
+namespace foa{
+
+template <class TypePolicy, class Allocator>
+struct node_set_handle
+    : public detail::foa::node_handle_base<TypePolicy, Allocator>
+{
+private:
+  using base_type = detail::foa::node_handle_base<TypePolicy, Allocator>;
+
+  using typename base_type::type_policy;
+
+public:
+  using value_type = typename TypePolicy::value_type;
+
+  constexpr node_set_handle() noexcept = default;
+  node_set_handle(node_set_handle&& nh) noexcept = default;
+  node_set_handle& operator=(node_set_handle&&) noexcept = default;
+
+  value_type& value() const
+  {
+    BOOST_ASSERT(!this->empty());
+    return const_cast<value_type&>(this->data());
+  }
+};
+
+}
+}
+}
+}
+
+#endif // BOOST_UNORDERED_DETAIL_FOA_NODE_SET_HANDLE_HPP
diff --git a/inst/include/boost/unordered/detail/foa/node_set_types.hpp b/inst/include/boost/unordered/detail/foa/node_set_types.hpp
index 710ac6ccd..da47793f7 100644
--- a/inst/include/boost/unordered/detail/foa/node_set_types.hpp
+++ b/inst/include/boost/unordered/detail/foa/node_set_types.hpp
@@ -6,6 +6,8 @@
 #define BOOST_UNORDERED_DETAIL_FOA_NODE_SET_TYPES_HPP
 
 #include <boost/unordered/detail/foa/element_type.hpp>
+#include <boost/unordered/detail/foa/types_constructibility.hpp>
+#include <boost/unordered/detail/type_traits.hpp>
 
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/no_exceptions_support.hpp>
@@ -26,6 +28,9 @@ namespace boost {
 
           using element_type = foa::element_type<value_type, VoidPtr>;
 
+          using types = node_set_types<Key, VoidPtr>;
+          using constructibility_checker = set_types_constructibility<types>;
+
           static value_type& value_from(element_type const& x) { return *x.p; }
           static Key const& extract(element_type const& k) { return *k.p; }
           static element_type&& move(element_type& x) { return std::move(x); }
@@ -35,7 +40,7 @@ namespace boost {
           static void construct(
             A& al, element_type* p, element_type const& copy)
           {
-            construct(al, p, *copy.p);
+            construct(al, p, detail::as_const(*copy.p));
           }
 
           template <typename Allocator>
@@ -49,6 +54,7 @@ namespace boost {
           template <class A, class... Args>
           static void construct(A& al, value_type* p, Args&&... args)
           {
+            constructibility_checker::check(al, p, std::forward<Args>(args)...);
             boost::allocator_construct(al, p, std::forward<Args>(args)...);
           }
 
@@ -58,8 +64,11 @@ namespace boost {
             p->p = boost::allocator_allocate(al, 1);
             BOOST_TRY
             {
+              auto address = boost::to_address(p->p);
+              constructibility_checker::check(
+                al, address, std::forward<Args>(args)...);
               boost::allocator_construct(
-                al, boost::to_address(p->p), std::forward<Args>(args)...);
+                al, address, std::forward<Args>(args)...);
             }
             BOOST_CATCH(...)
             {
@@ -85,8 +94,8 @@ namespace boost {
         };
 
       } // namespace foa
-    }   // namespace detail
-  }     // namespace unordered
+    } // namespace detail
+  } // namespace unordered
 } // namespace boost
 
 #endif // BOOST_UNORDERED_DETAIL_FOA_NODE_SET_TYPES_HPP
diff --git a/inst/include/boost/unordered/detail/foa/table.hpp b/inst/include/boost/unordered/detail/foa/table.hpp
index 7e14bc752..529a514cd 100644
--- a/inst/include/boost/unordered/detail/foa/table.hpp
+++ b/inst/include/boost/unordered/detail/foa/table.hpp
@@ -1,7 +1,8 @@
 /* Fast open-addressing hash table.
  *
- * Copyright 2022-2023 Joaquin M Lopez Munoz.
+ * Copyright 2022-2024 Joaquin M Lopez Munoz.
  * Copyright 2023 Christian Mazakas.
+ * Copyright 2024 Braden Ganetsky.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +19,7 @@
 #include <boost/core/serialization.hpp>
 #include <boost/unordered/detail/foa/core.hpp>
 #include <boost/unordered/detail/serialize_tracked_address.hpp>
+#include <boost/unordered/detail/type_traits.hpp>
 #include <cstddef>
 #include <iterator>
 #include <memory>
@@ -359,6 +361,10 @@ class table:table_core_impl<TypePolicy,Hash,Pred,Allocator>
     const_iterator>::type;
   using erase_return_type=table_erase_return_type<iterator>;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  using stats=typename super::stats;
+#endif
+
   table(
     std::size_t n=default_bucket_count,const Hash& h_=Hash(),
     const Pred& pred_=Pred(),const Allocator& al_=Allocator()):
@@ -400,11 +406,34 @@ class table:table_core_impl<TypePolicy,Hash,Pred,Allocator>
   template<typename... Args>
   BOOST_FORCEINLINE std::pair<iterator,bool> emplace(Args&&... args)
   {
-    auto x=alloc_make_insert_type<type_policy>(
+    alloc_cted_insert_type<type_policy,Allocator,Args...> x(
       this->al(),std::forward<Args>(args)...);
     return emplace_impl(type_policy::move(x.value()));
   }
 
+  /* Optimization for value_type and init_type, to avoid constructing twice */
+  template <typename T>
+  BOOST_FORCEINLINE typename std::enable_if<
+    detail::is_similar_to_any<T, value_type, init_type>::value,
+    std::pair<iterator, bool> >::type
+  emplace(T&& x)
+  {
+    return emplace_impl(std::forward<T>(x));
+  }
+
+  /* Optimizations for maps for (k,v) to avoid eagerly constructing value */
+  template <typename K, typename V>
+  BOOST_FORCEINLINE
+    typename std::enable_if<is_emplace_kv_able<table, K>::value,
+      std::pair<iterator, bool> >::type
+    emplace(K&& k, V&& v)
+  {
+    alloc_cted_or_fwded_key_type<type_policy, Allocator, K&&> x(
+      this->al(), std::forward<K>(k));
+    return emplace_impl(
+      try_emplace_args_t{}, x.move_or_fwd(), std::forward<V>(v));
+  }
+
   template<typename Key,typename... Args>
   BOOST_FORCEINLINE std::pair<iterator,bool> try_emplace(
     Key&& x,Args&&... args)
@@ -517,6 +546,11 @@ class table:table_core_impl<TypePolicy,Hash,Pred,Allocator>
   using super::rehash;
   using super::reserve;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+  using super::get_stats;
+  using super::reset_stats;
+#endif
+
   template<typename Predicate>
   friend std::size_t erase_if(table& x,Predicate& pr)
   {
@@ -559,6 +593,7 @@ class table:table_core_impl<TypePolicy,Hash,Pred,Allocator>
     x.arrays=ah.release();
     x.size_ctrl.ml=x.initial_max_load();
     x.size_ctrl.size=0;
+    BOOST_UNORDERED_SWAP_STATS(this->cstats,x.cstats);
   }
 
   template<typename ExclusiveLockGuard>
diff --git a/inst/include/boost/unordered/detail/foa/tuple_rotate_right.hpp b/inst/include/boost/unordered/detail/foa/tuple_rotate_right.hpp
index c95077b25..bd08842f3 100644
--- a/inst/include/boost/unordered/detail/foa/tuple_rotate_right.hpp
+++ b/inst/include/boost/unordered/detail/foa/tuple_rotate_right.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2023 Joaquin M Lopez Munoz.
+/* Copyright 2023-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -19,27 +19,28 @@ namespace unordered{
 namespace detail{
 namespace foa{
 
-template<typename Tuple>
+template<std::size_t Offset,typename Tuple>
 using tuple_rotate_right_return_type=mp11::mp_rotate_right_c<
   typename std::remove_cv<typename std::remove_reference<Tuple>::type>::type,
-  1
+  Offset
 >;
 
-template<std::size_t... Is,typename Tuple>
-tuple_rotate_right_return_type<Tuple>
+template<std::size_t Offset,std::size_t... Is,typename Tuple>
+tuple_rotate_right_return_type<Offset,Tuple>
 tuple_rotate_right_aux(mp11::index_sequence<Is...>,Tuple&& x)
 {
-  return tuple_rotate_right_return_type<Tuple>{
-    std::get<(Is+sizeof...(Is)-1)%sizeof...(Is)>(std::forward<Tuple>(x))...};
+  return tuple_rotate_right_return_type<Offset,Tuple>{
+    std::get<(Is+sizeof...(Is)-Offset)%sizeof...(Is)>(
+      std::forward<Tuple>(x))...};
 }
 
-template<typename Tuple>
-tuple_rotate_right_return_type<Tuple> tuple_rotate_right(Tuple&& x)
+template<std::size_t Offset=1,typename Tuple>
+tuple_rotate_right_return_type<Offset,Tuple> tuple_rotate_right(Tuple&& x)
 {
   using RawTuple=typename std::remove_cv<
     typename std::remove_reference<Tuple>::type>::type;
 
-  return tuple_rotate_right_aux(
+  return tuple_rotate_right_aux<Offset>(
     mp11::make_index_sequence<std::tuple_size<RawTuple>::value>{},
     std::forward<Tuple>(x));
 }
diff --git a/inst/include/boost/unordered/detail/foa/types_constructibility.hpp b/inst/include/boost/unordered/detail/foa/types_constructibility.hpp
new file mode 100644
index 000000000..10b9208b1
--- /dev/null
+++ b/inst/include/boost/unordered/detail/foa/types_constructibility.hpp
@@ -0,0 +1,172 @@
+// Copyright (C) 2024 Braden Ganetsky
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNORDERED_DETAIL_FOA_TYPES_CONSTRUCTIBILITY_HPP
+#define BOOST_UNORDERED_DETAIL_FOA_TYPES_CONSTRUCTIBILITY_HPP
+
+#include <memory>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
+namespace boost {
+  namespace unordered {
+    namespace detail {
+      namespace foa {
+        template <class Key, class... Args> struct check_key_type_t
+        {
+          static_assert(std::is_constructible<Key, Args...>::value,
+            "key_type must be constructible from Args");
+        };
+        template <class Key> struct check_key_type_t<Key>
+        {
+          static_assert(std::is_constructible<Key>::value,
+            "key_type must be default constructible");
+        };
+        template <class Key> struct check_key_type_t<Key, const Key&>
+        {
+          static_assert(std::is_constructible<Key, const Key&>::value,
+            "key_type must be copy constructible");
+        };
+        template <class Key> struct check_key_type_t<Key, Key&&>
+        {
+          static_assert(std::is_constructible<Key, Key&&>::value,
+            "key_type must be move constructible");
+        };
+
+        template <class Mapped, class... Args> struct check_mapped_type_t
+        {
+          static_assert(std::is_constructible<Mapped, Args...>::value,
+            "mapped_type must be constructible from Args");
+        };
+        template <class Mapped> struct check_mapped_type_t<Mapped>
+        {
+          static_assert(std::is_constructible<Mapped>::value,
+            "mapped_type must be default constructible");
+        };
+        template <class Mapped>
+        struct check_mapped_type_t<Mapped, const Mapped&>
+        {
+          static_assert(std::is_constructible<Mapped, const Mapped&>::value,
+            "mapped_type must be copy constructible");
+        };
+        template <class Mapped> struct check_mapped_type_t<Mapped, Mapped&&>
+        {
+          static_assert(std::is_constructible<Mapped, Mapped&&>::value,
+            "mapped_type must be move constructible");
+        };
+
+        template <class TypePolicy> struct map_types_constructibility
+        {
+          using key_type = typename TypePolicy::key_type;
+          using mapped_type = typename TypePolicy::mapped_type;
+          using init_type = typename TypePolicy::init_type;
+          using value_type = typename TypePolicy::value_type;
+
+          template <class A, class X, class... Args>
+          static void check(A&, X*, Args&&...)
+          {
+            // Pass through, as we cannot say anything about a general allocator
+          }
+
+          template <class... Args> static void check_key_type()
+          {
+            (void)check_key_type_t<key_type, Args...>{};
+          }
+          template <class... Args> static void check_mapped_type()
+          {
+            (void)check_mapped_type_t<mapped_type, Args...>{};
+          }
+
+          template <class Arg>
+          static void check(std::allocator<value_type>&, key_type*, Arg&&)
+          {
+            check_key_type<Arg&&>();
+          }
+
+          template <class Arg1, class Arg2>
+          static void check(
+            std::allocator<value_type>&, value_type*, Arg1&&, Arg2&&)
+          {
+            check_key_type<Arg1&&>();
+            check_mapped_type<Arg2&&>();
+          }
+          template <class Arg1, class Arg2>
+          static void check(std::allocator<value_type>&, value_type*,
+            const std::pair<Arg1, Arg2>&)
+          {
+            check_key_type<const Arg1&>();
+            check_mapped_type<const Arg2&>();
+          }
+          template <class Arg1, class Arg2>
+          static void check(
+            std::allocator<value_type>&, value_type*, std::pair<Arg1, Arg2>&&)
+          {
+            check_key_type<Arg1&&>();
+            check_mapped_type<Arg2&&>();
+          }
+          template <class... Args1, class... Args2>
+          static void check(std::allocator<value_type>&, value_type*,
+            std::piecewise_construct_t, std::tuple<Args1...>&&,
+            std::tuple<Args2...>&&)
+          {
+            check_key_type<Args1&&...>();
+            check_mapped_type<Args2&&...>();
+          }
+
+          template <class Arg1, class Arg2>
+          static void check(
+            std::allocator<value_type>&, init_type*, Arg1&&, Arg2&&)
+          {
+            check_key_type<Arg1&&>();
+            check_mapped_type<Arg2&&>();
+          }
+          template <class Arg1, class Arg2>
+          static void check(std::allocator<value_type>&, init_type*,
+            const std::pair<Arg1, Arg2>&)
+          {
+            check_key_type<const Arg1&>();
+            check_mapped_type<const Arg2&>();
+          }
+          template <class Arg1, class Arg2>
+          static void check(
+            std::allocator<value_type>&, init_type*, std::pair<Arg1, Arg2>&&)
+          {
+            check_key_type<Arg1&&>();
+            check_mapped_type<Arg2&&>();
+          }
+          template <class... Args1, class... Args2>
+          static void check(std::allocator<value_type>&, init_type*,
+            std::piecewise_construct_t, std::tuple<Args1...>&&,
+            std::tuple<Args2...>&&)
+          {
+            check_key_type<Args1&&...>();
+            check_mapped_type<Args2&&...>();
+          }
+        };
+
+        template <class TypePolicy> struct set_types_constructibility
+        {
+          using key_type = typename TypePolicy::key_type;
+          using value_type = typename TypePolicy::value_type;
+          static_assert(std::is_same<key_type, value_type>::value, "");
+
+          template <class A, class X, class... Args>
+          static void check(A&, X*, Args&&...)
+          {
+            // Pass through, as we cannot say anything about a general allocator
+          }
+
+          template <class... Args>
+          static void check(std::allocator<value_type>&, key_type*, Args&&...)
+          {
+            (void)check_key_type_t<key_type, Args&&...>{};
+          }
+        };
+      } // namespace foa
+    } // namespace detail
+  } // namespace unordered
+} // namespace boost
+
+#endif // BOOST_UNORDERED_DETAIL_FOA_TYPES_CONSTRUCTIBILITY_HPP
diff --git a/inst/include/boost/unordered/detail/implementation.hpp b/inst/include/boost/unordered/detail/implementation.hpp
index 858bafd81..d2c0cbd05 100644
--- a/inst/include/boost/unordered/detail/implementation.hpp
+++ b/inst/include/boost/unordered/detail/implementation.hpp
@@ -1,7 +1,8 @@
 // Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
 // Copyright (C) 2005-2016 Daniel James
-// Copyright (C) 2022-2023 Joaquin M Lopez Munoz.
+// Copyright (C) 2022-2024 Joaquin M Lopez Munoz.
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,11 +15,13 @@
 #pragma once
 #endif
 
+#include <boost/unordered/detail/allocator_constructed.hpp>
 #include <boost/unordered/detail/fca.hpp>
 #include <boost/unordered/detail/opt_storage.hpp>
 #include <boost/unordered/detail/serialize_tracked_address.hpp>
 #include <boost/unordered/detail/static_assert.hpp>
 #include <boost/unordered/detail/type_traits.hpp>
+#include <boost/unordered/unordered_printers.hpp>
 
 #include <boost/assert.hpp>
 #include <boost/core/allocator_traits.hpp>
@@ -38,6 +41,7 @@
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
+#include <tuple> // std::forward_as_tuple
 
 namespace boost {
   namespace tuples {
@@ -103,6 +107,10 @@ namespace boost {
         template <class T> no_key(T const&) {}
       };
 
+      struct converting_key
+      {
+      };
+
       namespace func {
         template <class T> inline void ignore_unused_variable_warning(T const&)
         {
@@ -1359,14 +1367,14 @@ namespace boost {
         }
 
         table(std::size_t num_buckets, hasher const& hf, key_equal const& eq,
-          node_allocator_type const& a)
+          value_allocator const& a)
             : functions(hf, eq), size_(0), mlf_(1.0f), max_load_(0),
               buckets_(num_buckets, a)
         {
           recalculate_max_load();
         }
 
-        table(table const& x, node_allocator_type const& a)
+        table(table const& x, value_allocator const& a)
             : functions(x), size_(0), mlf_(x.mlf_), max_load_(0),
               buckets_(x.size_, a)
         {
@@ -1381,7 +1389,7 @@ namespace boost {
           x.max_load_ = 0;
         }
 
-        table(table& x, node_allocator_type const& a,
+        table(table& x, value_allocator const& a,
           boost::unordered::detail::move_tag m)
             : functions(x, m), size_(0), mlf_(x.mlf_), max_load_(0),
               buckets_(x.bucket_count(), a)
@@ -1912,6 +1920,16 @@ namespace boost {
           }
         }
 
+        template <typename K, typename V>
+        emplace_return emplace_unique(converting_key, K&& k, V&& v)
+        {
+          using alloc_cted = allocator_constructed<node_allocator_type,
+            typename Types::key_type>;
+          alloc_cted key(this->node_alloc(), std::forward<K>(k));
+          return emplace_unique(
+            key.value(), std::move(key.value()), std::forward<V>(v));
+        }
+
         template <typename Key> emplace_return try_emplace_unique(Key&& k)
         {
           std::size_t key_hash = this->hash(k);
@@ -2705,7 +2723,7 @@ namespace boost {
       inline void table<Types>::rehash_impl(std::size_t num_buckets)
       {
         bucket_array_type new_buckets(
-          num_buckets, buckets_.get_node_allocator());
+          num_buckets, buckets_.get_allocator());
 
         BOOST_TRY
         {
@@ -2834,9 +2852,13 @@ namespace boost {
         }
 
         template <class Arg1, class Arg2>
-        static no_key extract(Arg1 const&, Arg2 const&)
+        static typename std::conditional<
+          (is_similar<Arg1, key_type>::value ||
+            is_complete_and_move_constructible<key_type>::value),
+          converting_key, no_key>::type
+        extract(Arg1 const&, Arg2 const&)
         {
-          return no_key();
+          return {};
         }
 
         template <class Arg1, class Arg2, class Arg3, class... Args>
diff --git a/inst/include/boost/unordered/detail/map.hpp b/inst/include/boost/unordered/detail/map.hpp
index ccd2508f2..1d6c06829 100644
--- a/inst/include/boost/unordered/detail/map.hpp
+++ b/inst/include/boost/unordered/detail/map.hpp
@@ -1,6 +1,7 @@
 
 // Copyright (C) 2005-2016 Daniel James
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -18,6 +19,7 @@ namespace boost {
         typedef std::pair<K const, M> value_type;
         typedef H hasher;
         typedef P key_equal;
+        typedef K key_type;
         typedef K const const_key_type;
 
         typedef
@@ -39,23 +41,6 @@ namespace boost {
         typedef typename table::iterator iterator;
         typedef boost::unordered::insert_return_type_map<iterator, node_type> insert_return_type;
       };
-
-      template <typename K, typename M, typename H, typename P, typename A>
-      class instantiate_map
-      {
-        typedef boost::unordered_map<K, M, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-        typename container::insert_return_type insert_return_type;
-      };
-
-      template <typename K, typename M, typename H, typename P, typename A>
-      class instantiate_multimap
-      {
-        typedef boost::unordered_multimap<K, M, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-      };
     }
   }
 }
diff --git a/inst/include/boost/unordered/detail/set.hpp b/inst/include/boost/unordered/detail/set.hpp
index 6025e40ee..7ae3b307c 100644
--- a/inst/include/boost/unordered/detail/set.hpp
+++ b/inst/include/boost/unordered/detail/set.hpp
@@ -39,23 +39,6 @@ namespace boost {
         typedef boost::unordered::insert_return_type_set<iterator, node_type>
           insert_return_type;
       };
-
-      template <typename T, typename H, typename P, typename A>
-      class instantiate_set
-      {
-        typedef boost::unordered_set<T, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-        typename container::insert_return_type insert_return_type;
-      };
-
-      template <typename T, typename H, typename P, typename A>
-      class instantiate_multiset
-      {
-        typedef boost::unordered_multiset<T, H, P, A> container;
-        container x;
-        typename container::node_type node_type;
-      };
     }
   }
 }
diff --git a/inst/include/boost/unordered/detail/throw_exception.hpp b/inst/include/boost/unordered/detail/throw_exception.hpp
new file mode 100644
index 000000000..702f4be04
--- /dev/null
+++ b/inst/include/boost/unordered/detail/throw_exception.hpp
@@ -0,0 +1,30 @@
+// Copyright (C) 2023 Braden Ganetsky
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNORDERED_DETAIL_THROW_EXCEPTION_HPP
+#define BOOST_UNORDERED_DETAIL_THROW_EXCEPTION_HPP
+
+#include <boost/config.hpp>
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#pragma once
+#endif
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+namespace boost {
+  namespace unordered {
+    namespace detail {
+
+      BOOST_NOINLINE BOOST_NORETURN inline void throw_out_of_range(
+        char const* message)
+      {
+        boost::throw_exception(std::out_of_range(message));
+      }
+
+    } // namespace detail
+  } // namespace unordered
+} // namespace boost
+
+#endif // BOOST_UNORDERED_DETAIL_THROW_EXCEPTION_HPP
diff --git a/inst/include/boost/unordered/detail/type_traits.hpp b/inst/include/boost/unordered/detail/type_traits.hpp
index dc7ebafe3..f99f7f424 100644
--- a/inst/include/boost/unordered/detail/type_traits.hpp
+++ b/inst/include/boost/unordered/detail/type_traits.hpp
@@ -1,4 +1,5 @@
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -48,6 +49,20 @@ namespace boost {
 
       template <typename... Ts> using void_t = typename make_void<Ts...>::type;
 
+      template <class T, class = void> struct is_complete : std::false_type
+      {
+      };
+
+      template <class T>
+      struct is_complete<T, void_t<int[sizeof(T)]> > : std::true_type
+      {
+      };
+
+      template <class T>
+      using is_complete_and_move_constructible =
+        typename std::conditional<is_complete<T>::value,
+          std::is_move_constructible<T>, std::false_type>::type;
+
 #if BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, < 50000)
       /* std::is_trivially_default_constructible not provided */
       template <class T>
@@ -147,6 +162,23 @@ namespace boost {
           !std::is_convertible<Key, const_iterator>::value;
       };
 
+      template <class T>
+      using remove_cvref_t =
+        typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+      template <class T, class U>
+      using is_similar = std::is_same<remove_cvref_t<T>, remove_cvref_t<U> >;
+
+      template <class, class...> struct is_similar_to_any : std::false_type
+      {
+      };
+      template <class T, class U, class... Us>
+      struct is_similar_to_any<T, U, Us...>
+          : std::conditional<is_similar<T, U>::value, is_similar<T, U>,
+              is_similar_to_any<T, Us...> >::type
+      {
+      };
+
 #if BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES
       // https://eel.is/c++draft/container.requirements#container.alloc.reqmts-34
       // https://eel.is/c++draft/container.requirements#unord.req.general-243
@@ -187,6 +219,17 @@ namespace boost {
       using iter_to_alloc_t =
         typename std::pair<iter_key_t<T> const, iter_val_t<T> >;
 #endif
+
+#if BOOST_CXX_VERSION < 201703L
+      template <class T>
+      constexpr typename std::add_const<T>::type& as_const(T& t) noexcept
+      {
+        return t;
+      }
+      template <class T> void as_const(const T&&) = delete;
+#else
+      using std::as_const;
+#endif
     } // namespace detail
   } // namespace unordered
 } // namespace boost
diff --git a/inst/include/boost/unordered/hash_traits.hpp b/inst/include/boost/unordered/hash_traits.hpp
index d5f94a789..5e2b1af05 100644
--- a/inst/include/boost/unordered/hash_traits.hpp
+++ b/inst/include/boost/unordered/hash_traits.hpp
@@ -1,6 +1,6 @@
 /* Hash function characterization.
  *
- * Copyright 2022 Joaquin M Lopez Munoz.
+ * Copyright 2022-2024 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -19,12 +19,34 @@ namespace unordered{
 namespace detail{
 
 template<typename Hash,typename=void>
-struct hash_is_avalanching_impl: std::false_type{};
+struct hash_is_avalanching_impl:std::false_type{};
+
+template<typename IsAvalanching>
+struct avalanching_value
+{
+  static constexpr bool value=IsAvalanching::value;
+};
+
+/* may be explicitly marked as BOOST_DEPRECATED in the future */
+template<> struct avalanching_value<void>
+{
+  static constexpr bool value=true;
+};
+
+template<typename Hash>
+struct hash_is_avalanching_impl<
+  Hash,
+  boost::unordered::detail::void_t<typename Hash::is_avalanching>
+>:std::integral_constant<
+  bool,
+  avalanching_value<typename Hash::is_avalanching>::value
+>{};
 
 template<typename Hash>
-struct hash_is_avalanching_impl<Hash,
-  boost::unordered::detail::void_t<typename Hash::is_avalanching> >:
-    std::true_type{};
+struct hash_is_avalanching_impl<
+  Hash,
+  typename std::enable_if<((void)Hash::is_avalanching,true)>::type
+>{}; /* Hash::is_avalanching is not a type: compile error downstream */
 
 } /* namespace detail */
 
@@ -32,8 +54,12 @@ struct hash_is_avalanching_impl<Hash,
  * when actual characterization differs from default.
  */
 
-/* hash_is_avalanching<Hash>::value is true when the type Hash::is_avalanching
- * is present, false otherwise.
+/* hash_is_avalanching<Hash>::value is:
+ *   - false if Hash::is_avalanching is not present.
+ *   - Hash::is_avalanching::value if this is present and constexpr-convertible
+ *     to a bool.
+ *   - true if Hash::is_avalanching is void (deprecated).
+ *   - ill-formed otherwise.
  */
 template<typename Hash>
 struct hash_is_avalanching: detail::hash_is_avalanching_impl<Hash>::type{};
diff --git a/inst/include/boost/unordered/unordered_flat_map.hpp b/inst/include/boost/unordered/unordered_flat_map.hpp
index 5d565a31e..6ad25d8ee 100644
--- a/inst/include/boost/unordered/unordered_flat_map.hpp
+++ b/inst/include/boost/unordered/unordered_flat_map.hpp
@@ -1,4 +1,5 @@
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Joaquin M Lopez Munoz
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -14,12 +15,12 @@
 #include <boost/unordered/detail/foa/flat_map_types.hpp>
 #include <boost/unordered/detail/foa/table.hpp>
 #include <boost/unordered/detail/serialize_container.hpp>
+#include <boost/unordered/detail/throw_exception.hpp>
 #include <boost/unordered/detail/type_traits.hpp>
 #include <boost/unordered/unordered_flat_map_fwd.hpp>
 
 #include <boost/core/allocator_access.hpp>
 #include <boost/container_hash/hash.hpp>
-#include <boost/throw_exception.hpp>
 
 #include <initializer_list>
 #include <iterator>
@@ -76,6 +77,10 @@ namespace boost {
       using iterator = typename table_type::iterator;
       using const_iterator = typename table_type::const_iterator;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       unordered_flat_map() : unordered_flat_map(0) {}
 
       explicit unordered_flat_map(size_type n, hasher const& h = hasher(),
@@ -177,6 +182,7 @@ namespace boost {
       {
       }
 
+      template <bool avoid_explicit_instantiation = true>
       unordered_flat_map(
         concurrent_flat_map<Key, T, Hash, KeyEqual, Allocator>&& other)
           : table_(std::move(other.table_))
@@ -198,6 +204,13 @@ namespace boost {
         return *this;
       }
 
+      unordered_flat_map& operator=(std::initializer_list<value_type> il)
+      {
+        this->clear();
+        this->insert(il.begin(), il.end());
+        return *this;
+      }
+
       allocator_type get_allocator() const noexcept
       {
         return table_.get_allocator();
@@ -459,8 +472,8 @@ namespace boost {
         // TODO: someday refactor this to conditionally serialize the key and
         // include it in the error message
         //
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_flat_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_flat_map");
       }
 
       mapped_type const& at(key_type const& key) const
@@ -469,8 +482,8 @@ namespace boost {
         if (pos != table_.end()) {
           return pos->second;
         }
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_flat_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_flat_map");
       }
 
       template <class K>
@@ -483,8 +496,8 @@ namespace boost {
         if (pos != table_.end()) {
           return pos->second;
         }
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_flat_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_flat_map");
       }
 
       template <class K>
@@ -497,8 +510,8 @@ namespace boost {
         if (pos != table_.end()) {
           return pos->second;
         }
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_flat_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_flat_map");
       }
 
       BOOST_FORCEINLINE mapped_type& operator[](key_type const& key)
@@ -654,6 +667,14 @@ namespace boost {
 
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
 
diff --git a/inst/include/boost/unordered/unordered_flat_map_fwd.hpp b/inst/include/boost/unordered/unordered_flat_map_fwd.hpp
index 5551d1a6e..f758f83a0 100644
--- a/inst/include/boost/unordered/unordered_flat_map_fwd.hpp
+++ b/inst/include/boost/unordered/unordered_flat_map_fwd.hpp
@@ -1,5 +1,6 @@
 
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -15,6 +16,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class Key, class T, class Hash = boost::hash<Key>,
@@ -36,6 +41,16 @@ namespace boost {
     void swap(unordered_flat_map<Key, T, Hash, KeyEqual, Allocator>& lhs,
       unordered_flat_map<Key, T, Hash, KeyEqual, Allocator>& rhs)
       noexcept(noexcept(lhs.swap(rhs)));
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class T, class Hash = boost::hash<Key>,
+        class KeyEqual = std::equal_to<Key> >
+      using unordered_flat_map =
+        boost::unordered::unordered_flat_map<Key, T, Hash, KeyEqual,
+          std::pmr::polymorphic_allocator<std::pair<const Key, T> > >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_flat_map;
diff --git a/inst/include/boost/unordered/unordered_flat_set.hpp b/inst/include/boost/unordered/unordered_flat_set.hpp
index a6aba397c..8e925931b 100644
--- a/inst/include/boost/unordered/unordered_flat_set.hpp
+++ b/inst/include/boost/unordered/unordered_flat_set.hpp
@@ -1,4 +1,5 @@
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Joaquin M Lopez Munoz
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -72,6 +73,10 @@ namespace boost {
       using iterator = typename table_type::iterator;
       using const_iterator = typename table_type::const_iterator;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       unordered_flat_set() : unordered_flat_set(0) {}
 
       explicit unordered_flat_set(size_type n, hasher const& h = hasher(),
@@ -173,6 +178,7 @@ namespace boost {
       {
       }
 
+      template <bool avoid_explicit_instantiation = true>
       unordered_flat_set(
         concurrent_flat_set<Key, Hash, KeyEqual, Allocator>&& other)
           : table_(std::move(other.table_))
@@ -194,6 +200,13 @@ namespace boost {
         return *this;
       }
 
+      unordered_flat_set& operator=(std::initializer_list<value_type> il)
+      {
+        this->clear();
+        this->insert(il.begin(), il.end());
+        return *this;
+      }
+
       allocator_type get_allocator() const noexcept
       {
         return table_.get_allocator();
@@ -474,6 +487,14 @@ namespace boost {
 
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
 
diff --git a/inst/include/boost/unordered/unordered_flat_set_fwd.hpp b/inst/include/boost/unordered/unordered_flat_set_fwd.hpp
index 02435bab4..9214939fc 100644
--- a/inst/include/boost/unordered/unordered_flat_set_fwd.hpp
+++ b/inst/include/boost/unordered/unordered_flat_set_fwd.hpp
@@ -1,5 +1,6 @@
 
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -15,6 +16,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class Key, class Hash = boost::hash<Key>,
@@ -36,6 +41,15 @@ namespace boost {
     void swap(unordered_flat_set<Key, Hash, KeyEqual, Allocator>& lhs,
       unordered_flat_set<Key, Hash, KeyEqual, Allocator>& rhs)
       noexcept(noexcept(lhs.swap(rhs)));
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class Hash = boost::hash<Key>,
+        class KeyEqual = std::equal_to<Key> >
+      using unordered_flat_set = boost::unordered::unordered_flat_set<Key, Hash,
+        KeyEqual, std::pmr::polymorphic_allocator<Key> >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_flat_set;
diff --git a/inst/include/boost/unordered/unordered_map.hpp b/inst/include/boost/unordered/unordered_map.hpp
index ba10a9700..6b7418b03 100644
--- a/inst/include/boost/unordered/unordered_map.hpp
+++ b/inst/include/boost/unordered/unordered_map.hpp
@@ -1,6 +1,7 @@
 // Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
 // Copyright (C) 2005-2011 Daniel James.
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Joaquin M Lopez Munoz.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -16,6 +17,7 @@
 
 #include <boost/unordered/detail/map.hpp>
 #include <boost/unordered/detail/serialize_fca_container.hpp>
+#include <boost/unordered/detail/throw_exception.hpp>
 #include <boost/unordered/detail/type_traits.hpp>
 
 #include <boost/container_hash/hash.hpp>
@@ -157,7 +159,7 @@ namespace boost {
 
       allocator_type get_allocator() const noexcept
       {
-        return table_.node_alloc();
+        return allocator_type(table_.node_alloc());
       }
 
       //       // iterators
@@ -196,7 +198,7 @@ namespace boost {
       template <class... Args> std::pair<iterator, bool> emplace(Args&&... args)
       {
         return table_.emplace_unique(
-          table::extractor::extract(std::forward<Args>(args)...),
+          table::extractor::extract(detail::as_const(args)...),
           std::forward<Args>(args)...);
       }
 
@@ -204,7 +206,7 @@ namespace boost {
       iterator emplace_hint(const_iterator hint, Args&&... args)
       {
         return table_.emplace_hint_unique(hint,
-          table::extractor::extract(std::forward<Args>(args)...),
+          table::extractor::extract(detail::as_const(args)...),
           std::forward<Args>(args)...);
       }
 
@@ -253,12 +255,15 @@ namespace boost {
       node_type extract(const_iterator position)
       {
         return node_type(
-          table_.extract_by_iterator_unique(position), table_.node_alloc());
+          table_.extract_by_iterator_unique(position),
+          allocator_type(table_.node_alloc()));
       }
 
       node_type extract(const key_type& k)
       {
-        return node_type(table_.extract_by_key_impl(k), table_.node_alloc());
+        return node_type(
+          table_.extract_by_key_impl(k),
+          allocator_type(table_.node_alloc()));
       }
 
       template <class Key>
@@ -267,8 +272,9 @@ namespace boost {
         node_type>::type
       extract(Key&& k)
       {
-        return node_type(table_.extract_by_key_impl(std::forward<Key>(k)),
-          table_.node_alloc());
+        return node_type(
+          table_.extract_by_key_impl(std::forward<Key>(k)),
+          allocator_type(table_.node_alloc()));
       }
 
       insert_return_type insert(node_type&& np)
@@ -805,7 +811,7 @@ namespace boost {
 
       allocator_type get_allocator() const noexcept
       {
-        return table_.node_alloc();
+        return allocator_type(table_.node_alloc());
       }
 
       // iterators
@@ -1586,8 +1592,8 @@ namespace boost {
           return p->value().second;
       }
 
-      boost::throw_exception(
-        std::out_of_range("Unable to find key in unordered_map."));
+      boost::unordered::detail::throw_out_of_range(
+        "Unable to find key in unordered_map.");
     }
 
     template <class K, class T, class H, class P, class A>
@@ -1602,8 +1608,8 @@ namespace boost {
           return p->value().second;
       }
 
-      boost::throw_exception(
-        std::out_of_range("Unable to find key in unordered_map."));
+      boost::unordered::detail::throw_out_of_range(
+        "Unable to find key in unordered_map.");
     }
 
     template <class K, class T, class H, class P, class A>
@@ -1620,8 +1626,8 @@ namespace boost {
           return p->value().second;
       }
 
-      boost::throw_exception(
-        std::out_of_range("Unable to find key in unordered_map."));
+      boost::unordered::detail::throw_out_of_range(
+        "Unable to find key in unordered_map.");
     }
 
     template <class K, class T, class H, class P, class A>
@@ -1638,8 +1644,8 @@ namespace boost {
           return p->value().second;
       }
 
-      boost::throw_exception(
-        std::out_of_range("Unable to find key in unordered_map."));
+      boost::unordered::detail::throw_out_of_range(
+        "Unable to find key in unordered_map.");
     }
 
     template <class K, class T, class H, class P, class A>
@@ -2051,8 +2057,7 @@ namespace boost {
     unordered_multimap<K, T, H, P, A>::find(CompatibleKey const& k,
       CompatibleHash const& hash, CompatiblePredicate const& eq) const
     {
-      return const_iterator(
-        table_.find_node_impl(table::policy::apply_hash(hash, k), k, eq));
+      return table_.transparent_find(k, hash, eq);
     }
 
     template <class K, class T, class H, class P, class A>
diff --git a/inst/include/boost/unordered/unordered_map_fwd.hpp b/inst/include/boost/unordered/unordered_map_fwd.hpp
index b374965e0..375889a1c 100644
--- a/inst/include/boost/unordered/unordered_map_fwd.hpp
+++ b/inst/include/boost/unordered/unordered_map_fwd.hpp
@@ -1,6 +1,7 @@
 
 // Copyright (C) 2008-2011 Daniel James.
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -16,6 +17,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class K, class T, class H = boost::hash<K>,
@@ -58,6 +63,20 @@ namespace boost {
 
     template <class N, class K, class T, class A> class node_handle_map;
     template <class Iter, class NodeType> struct insert_return_type_map;
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class K, class T, class H = boost::hash<K>,
+        class P = std::equal_to<K> >
+      using unordered_map = boost::unordered::unordered_map<K, T, H, P,
+        std::pmr::polymorphic_allocator<std::pair<const K, T> > >;
+
+      template <class K, class T, class H = boost::hash<K>,
+        class P = std::equal_to<K> >
+      using unordered_multimap = boost::unordered::unordered_multimap<K, T, H,
+        P, std::pmr::polymorphic_allocator<std::pair<const K, T> > >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_map;
diff --git a/inst/include/boost/unordered/unordered_node_map.hpp b/inst/include/boost/unordered/unordered_node_map.hpp
index 10c72cb44..6f644dc0f 100644
--- a/inst/include/boost/unordered/unordered_node_map.hpp
+++ b/inst/include/boost/unordered/unordered_node_map.hpp
@@ -1,4 +1,5 @@
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Joaquin M Lopez Munoz
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -10,17 +11,17 @@
 #pragma once
 #endif
 
-#include <boost/unordered/detail/foa/element_type.hpp>
-#include <boost/unordered/detail/foa/node_handle.hpp>
+#include <boost/unordered/concurrent_node_map_fwd.hpp>
+#include <boost/unordered/detail/foa/node_map_handle.hpp>
 #include <boost/unordered/detail/foa/node_map_types.hpp>
 #include <boost/unordered/detail/foa/table.hpp>
 #include <boost/unordered/detail/serialize_container.hpp>
+#include <boost/unordered/detail/throw_exception.hpp>
 #include <boost/unordered/detail/type_traits.hpp>
 #include <boost/unordered/unordered_node_map_fwd.hpp>
 
 #include <boost/core/allocator_access.hpp>
 #include <boost/container_hash/hash.hpp>
-#include <boost/throw_exception.hpp>
 
 #include <initializer_list>
 #include <iterator>
@@ -36,45 +37,13 @@ namespace boost {
 #pragma warning(disable : 4714) /* marked as __forceinline not inlined */
 #endif
 
-    namespace detail {
-      template <class TypePolicy, class Allocator>
-      struct node_map_handle
-          : public detail::foa::node_handle_base<TypePolicy, Allocator>
-      {
-      private:
-        using base_type = detail::foa::node_handle_base<TypePolicy, Allocator>;
-
-        using typename base_type::type_policy;
-
-        template <class Key, class T, class Hash, class Pred, class Alloc>
-        friend class boost::unordered::unordered_node_map;
-
-      public:
-        using key_type = typename TypePolicy::key_type;
-        using mapped_type = typename TypePolicy::mapped_type;
-
-        constexpr node_map_handle() noexcept = default;
-        node_map_handle(node_map_handle&& nh) noexcept = default;
-
-        node_map_handle& operator=(node_map_handle&&) noexcept = default;
-
-        key_type& key() const
-        {
-          BOOST_ASSERT(!this->empty());
-          return const_cast<key_type&>(this->data().first);
-        }
-
-        mapped_type& mapped() const
-        {
-          BOOST_ASSERT(!this->empty());
-          return const_cast<mapped_type&>(this->data().second);
-        }
-      };
-    } // namespace detail
-
     template <class Key, class T, class Hash, class KeyEqual, class Allocator>
     class unordered_node_map
     {
+      template <class Key2, class T2, class Hash2, class Pred2,
+        class Allocator2>
+      friend class concurrent_node_map;
+
       using map_types = detail::foa::node_map_types<Key, T,
         typename boost::allocator_void_pointer<Allocator>::type>;
 
@@ -109,12 +78,16 @@ namespace boost {
         typename boost::allocator_const_pointer<allocator_type>::type;
       using iterator = typename table_type::iterator;
       using const_iterator = typename table_type::const_iterator;
-      using node_type = detail::node_map_handle<map_types,
+      using node_type = detail::foa::node_map_handle<map_types,
         typename boost::allocator_rebind<Allocator,
           typename map_types::value_type>::type>;
       using insert_return_type =
         detail::foa::insert_return_type<iterator, node_type>;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       unordered_node_map() : unordered_node_map(0) {}
 
       explicit unordered_node_map(size_type n, hasher const& h = hasher(),
@@ -216,6 +189,13 @@ namespace boost {
       {
       }
 
+      template <bool avoid_explicit_instantiation = true>
+      unordered_node_map(
+        concurrent_node_map<Key, T, Hash, KeyEqual, Allocator>&& other)
+          : table_(std::move(other.table_))
+      {
+      }
+
       ~unordered_node_map() = default;
 
       unordered_node_map& operator=(unordered_node_map const& other)
@@ -231,6 +211,13 @@ namespace boost {
         return *this;
       }
 
+      unordered_node_map& operator=(std::initializer_list<value_type> il)
+      {
+        this->clear();
+        this->insert(il.begin(), il.end());
+        return *this;
+      }
+
       allocator_type get_allocator() const noexcept
       {
         return table_.get_allocator();
@@ -303,15 +290,17 @@ namespace boost {
 
       insert_return_type insert(node_type&& nh)
       {
+        using access = detail::foa::node_handle_access;
+
         if (nh.empty()) {
           return {end(), false, node_type{}};
         }
 
         BOOST_ASSERT(get_allocator() == nh.get_allocator());
 
-        auto itp = table_.insert(std::move(nh.element()));
+        auto itp = table_.insert(std::move(access::element(nh)));
         if (itp.second) {
-          nh.reset();
+          access::reset(nh);
           return {itp.first, true, node_type{}};
         } else {
           return {itp.first, false, std::move(nh)};
@@ -320,15 +309,17 @@ namespace boost {
 
       iterator insert(const_iterator, node_type&& nh)
       {
+        using access = detail::foa::node_handle_access;
+
         if (nh.empty()) {
           return end();
         }
 
         BOOST_ASSERT(get_allocator() == nh.get_allocator());
 
-        auto itp = table_.insert(std::move(nh.element()));
+        auto itp = table_.insert(std::move(access::element(nh)));
         if (itp.second) {
-          nh.reset();
+          access::reset(nh);
           return itp.first;
         } else {
           return itp.first;
@@ -503,7 +494,8 @@ namespace boost {
         BOOST_ASSERT(pos != end());
         node_type nh;
         auto elem = table_.extract(pos);
-        nh.emplace(std::move(elem), get_allocator());
+        detail::foa::node_handle_emplacer(nh)(
+          std::move(elem), get_allocator());
         return nh;
       }
 
@@ -554,8 +546,8 @@ namespace boost {
         // TODO: someday refactor this to conditionally serialize the key and
         // include it in the error message
         //
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_node_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_node_map");
       }
 
       mapped_type const& at(key_type const& key) const
@@ -564,8 +556,8 @@ namespace boost {
         if (pos != table_.end()) {
           return pos->second;
         }
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_node_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_node_map");
       }
 
       template <class K>
@@ -578,8 +570,8 @@ namespace boost {
         if (pos != table_.end()) {
           return pos->second;
         }
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_node_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_node_map");
       }
 
       template <class K>
@@ -592,8 +584,8 @@ namespace boost {
         if (pos != table_.end()) {
           return pos->second;
         }
-        boost::throw_exception(
-          std::out_of_range("key was not found in unordered_node_map"));
+        boost::unordered::detail::throw_out_of_range(
+          "key was not found in unordered_node_map");
       }
 
       BOOST_FORCEINLINE mapped_type& operator[](key_type const& key)
@@ -749,6 +741,14 @@ namespace boost {
 
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
 
diff --git a/inst/include/boost/unordered/unordered_node_map_fwd.hpp b/inst/include/boost/unordered/unordered_node_map_fwd.hpp
index ec598168b..95ac162da 100644
--- a/inst/include/boost/unordered/unordered_node_map_fwd.hpp
+++ b/inst/include/boost/unordered/unordered_node_map_fwd.hpp
@@ -1,5 +1,6 @@
 
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -15,6 +16,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class Key, class T, class Hash = boost::hash<Key>,
@@ -36,6 +41,16 @@ namespace boost {
     void swap(unordered_node_map<Key, T, Hash, KeyEqual, Allocator>& lhs,
       unordered_node_map<Key, T, Hash, KeyEqual, Allocator>& rhs)
       noexcept(noexcept(lhs.swap(rhs)));
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class T, class Hash = boost::hash<Key>,
+        class KeyEqual = std::equal_to<Key> >
+      using unordered_node_map =
+        boost::unordered::unordered_node_map<Key, T, Hash, KeyEqual,
+          std::pmr::polymorphic_allocator<std::pair<const Key, T> > >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_node_map;
diff --git a/inst/include/boost/unordered/unordered_node_set.hpp b/inst/include/boost/unordered/unordered_node_set.hpp
index 14b44bed0..537f305e3 100644
--- a/inst/include/boost/unordered/unordered_node_set.hpp
+++ b/inst/include/boost/unordered/unordered_node_set.hpp
@@ -1,4 +1,5 @@
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Joaquin M Lopez Munoz
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -10,8 +11,9 @@
 #pragma once
 #endif
 
+#include <boost/unordered/concurrent_node_set_fwd.hpp>
 #include <boost/unordered/detail/foa/element_type.hpp>
-#include <boost/unordered/detail/foa/node_handle.hpp>
+#include <boost/unordered/detail/foa/node_set_handle.hpp>
 #include <boost/unordered/detail/foa/node_set_types.hpp>
 #include <boost/unordered/detail/foa/table.hpp>
 #include <boost/unordered/detail/serialize_container.hpp>
@@ -35,37 +37,12 @@ namespace boost {
 #pragma warning(disable : 4714) /* marked as __forceinline not inlined */
 #endif
 
-    namespace detail {
-      template <class TypePolicy, class Allocator>
-      struct node_set_handle
-          : public detail::foa::node_handle_base<TypePolicy, Allocator>
-      {
-      private:
-        using base_type = detail::foa::node_handle_base<TypePolicy, Allocator>;
-
-        using typename base_type::type_policy;
-
-        template <class Key, class Hash, class Pred, class Alloc>
-        friend class boost::unordered::unordered_node_set;
-
-      public:
-        using value_type = typename TypePolicy::value_type;
-
-        constexpr node_set_handle() noexcept = default;
-        node_set_handle(node_set_handle&& nh) noexcept = default;
-        node_set_handle& operator=(node_set_handle&&) noexcept = default;
-
-        value_type& value() const
-        {
-          BOOST_ASSERT(!this->empty());
-          return const_cast<value_type&>(this->data());
-        }
-      };
-    } // namespace detail
-
     template <class Key, class Hash, class KeyEqual, class Allocator>
     class unordered_node_set
     {
+      template <class Key2, class Hash2, class Pred2, class Allocator2>
+      friend class concurrent_node_set;
+
       using set_types = detail::foa::node_set_types<Key,
         typename boost::allocator_void_pointer<Allocator>::type>;
 
@@ -99,12 +76,16 @@ namespace boost {
         typename boost::allocator_const_pointer<allocator_type>::type;
       using iterator = typename table_type::iterator;
       using const_iterator = typename table_type::const_iterator;
-      using node_type = detail::node_set_handle<set_types,
+      using node_type = detail::foa::node_set_handle<set_types,
         typename boost::allocator_rebind<Allocator,
           typename set_types::value_type>::type>;
       using insert_return_type =
         detail::foa::insert_return_type<iterator, node_type>;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       unordered_node_set() : unordered_node_set(0) {}
 
       explicit unordered_node_set(size_type n, hasher const& h = hasher(),
@@ -206,6 +187,13 @@ namespace boost {
       {
       }
 
+      template <bool avoid_explicit_instantiation = true>
+      unordered_node_set(
+        concurrent_node_set<Key, Hash, KeyEqual, Allocator>&& other)
+          : table_(std::move(other.table_))
+      {
+      }
+
       ~unordered_node_set() = default;
 
       unordered_node_set& operator=(unordered_node_set const& other)
@@ -221,6 +209,13 @@ namespace boost {
         return *this;
       }
 
+      unordered_node_set& operator=(std::initializer_list<value_type> il)
+      {
+        this->clear();
+        this->insert(il.begin(), il.end());
+        return *this;
+      }
+
       allocator_type get_allocator() const noexcept
       {
         return table_.get_allocator();
@@ -308,15 +303,17 @@ namespace boost {
 
       insert_return_type insert(node_type&& nh)
       {
+        using access = detail::foa::node_handle_access;
+
         if (nh.empty()) {
           return {end(), false, node_type{}};
         }
 
         BOOST_ASSERT(get_allocator() == nh.get_allocator());
 
-        auto itp = table_.insert(std::move(nh.element()));
+        auto itp = table_.insert(std::move(access::element(nh)));
         if (itp.second) {
-          nh.reset();
+          access::reset(nh);
           return {itp.first, true, node_type{}};
         } else {
           return {itp.first, false, std::move(nh)};
@@ -325,15 +322,17 @@ namespace boost {
 
       iterator insert(const_iterator, node_type&& nh)
       {
+        using access = detail::foa::node_handle_access;
+
         if (nh.empty()) {
           return end();
         }
 
         BOOST_ASSERT(get_allocator() == nh.get_allocator());
 
-        auto itp = table_.insert(std::move(nh.element()));
+        auto itp = table_.insert(std::move(access::element(nh)));
         if (itp.second) {
-          nh.reset();
+          access::reset(nh);
           return itp.first;
         } else {
           return itp.first;
@@ -391,7 +390,8 @@ namespace boost {
         BOOST_ASSERT(pos != end());
         node_type nh;
         auto elem = table_.extract(pos);
-        nh.emplace(std::move(elem), get_allocator());
+        detail::foa::node_handle_emplacer(nh)(
+          std::move(elem), get_allocator());
         return nh;
       }
 
@@ -563,6 +563,14 @@ namespace boost {
 
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
 
diff --git a/inst/include/boost/unordered/unordered_node_set_fwd.hpp b/inst/include/boost/unordered/unordered_node_set_fwd.hpp
index 977d032fd..75215f2ae 100644
--- a/inst/include/boost/unordered/unordered_node_set_fwd.hpp
+++ b/inst/include/boost/unordered/unordered_node_set_fwd.hpp
@@ -1,5 +1,6 @@
 
 // Copyright (C) 2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -15,6 +16,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class Key, class Hash = boost::hash<Key>,
@@ -36,6 +41,15 @@ namespace boost {
     void swap(unordered_node_set<Key, Hash, KeyEqual, Allocator>& lhs,
       unordered_node_set<Key, Hash, KeyEqual, Allocator>& rhs)
       noexcept(noexcept(lhs.swap(rhs)));
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class Hash = boost::hash<Key>,
+        class KeyEqual = std::equal_to<Key> >
+      using unordered_node_set = boost::unordered::unordered_node_set<Key, Hash,
+        KeyEqual, std::pmr::polymorphic_allocator<Key> >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_node_set;
diff --git a/inst/include/boost/unordered/unordered_printers.hpp b/inst/include/boost/unordered/unordered_printers.hpp
new file mode 100644
index 000000000..28072202a
--- /dev/null
+++ b/inst/include/boost/unordered/unordered_printers.hpp
@@ -0,0 +1,414 @@
+// Copyright 2024 Braden Ganetsky
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+// Generated on 2024-08-25T17:48:54
+
+#ifndef BOOST_UNORDERED_UNORDERED_PRINTERS_HPP
+#define BOOST_UNORDERED_UNORDERED_PRINTERS_HPP
+
+#ifndef BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS
+#if defined(__ELF__)
+#ifdef __clang__
+#pragma clang diagnostic push
+//#pragma clang diagnostic ignored "-Woverlength-strings"
+#endif
+__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+        ".ascii \"\\4gdb.inlined-script.BOOST_UNORDERED_UNORDERED_PRINTERS_HPP\\n\"\n"
+        ".ascii \"import gdb.printing\\n\"\n"
+        ".ascii \"import gdb.xmethod\\n\"\n"
+        ".ascii \"import re\\n\"\n"
+        ".ascii \"import math\\n\"\n"
+
+        ".ascii \"class BoostUnorderedHelpers:\\n\"\n"
+        ".ascii \"    def maybe_unwrap_atomic(n):\\n\"\n"
+        ".ascii \"        if f\\\"{n.type.strip_typedefs()}\\\".startswith(\\\"std::atomic<\\\"):\\n\"\n"
+        ".ascii \"            underlying_type = n.type.template_argument(0)\\n\"\n"
+        ".ascii \"            return n.cast(underlying_type)\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            return n\\n\"\n"
+
+        ".ascii \"    def maybe_unwrap_foa_element(e):\\n\"\n"
+        ".ascii \"        if f\\\"{e.type.strip_typedefs()}\\\".startswith(\\\"boost::unordered::detail::foa::element_type<\\\"):\\n\"\n"
+        ".ascii \"            return e[\\\"p\\\"]\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            return e\\n\"\n"
+
+        ".ascii \"    def maybe_unwrap_reference(value):\\n\"\n"
+        ".ascii \"        if value.type.code == gdb.TYPE_CODE_REF:\\n\"\n"
+        ".ascii \"            return value.referenced_value()\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            return value\\n\"\n"
+
+        ".ascii \"    def countr_zero(n):\\n\"\n"
+        ".ascii \"        for i in range(32):\\n\"\n"
+        ".ascii \"            if (n & (1 << i)) != 0:\\n\"\n"
+        ".ascii \"                return i\\n\"\n"
+        ".ascii \"        return 32\\n\"\n"
+
+        ".ascii \"class BoostUnorderedPointerCustomizationPoint:\\n\"\n"
+        ".ascii \"    def __init__(self, any_ptr):\\n\"\n"
+        ".ascii \"        vis = gdb.default_visualizer(any_ptr)\\n\"\n"
+        ".ascii \"        if vis is None:\\n\"\n"
+        ".ascii \"            self.to_address = lambda ptr: ptr\\n\"\n"
+        ".ascii \"            self.next = lambda ptr, offset: ptr + offset\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            self.to_address = lambda ptr: ptr if (ptr.type.code == gdb.TYPE_CODE_PTR) else type(vis).boost_to_address(ptr)\\n\"\n"
+        ".ascii \"            self.next = lambda ptr, offset: type(vis).boost_next(ptr, offset)\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFcaPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = BoostUnorderedHelpers.maybe_unwrap_reference(val)\\n\"\n"
+        ".ascii \"        self.name = f\\\"{self.val.type.strip_typedefs()}\\\".split(\\\"<\\\")[0]\\n\"\n"
+        ".ascii \"        self.name = self.name.replace(\\\"boost::unordered::\\\", \\\"boost::\\\")\\n\"\n"
+        ".ascii \"        self.is_map = self.name.endswith(\\\"map\\\")\\n\"\n"
+        ".ascii \"        self.cpo = BoostUnorderedPointerCustomizationPoint(self.val[\\\"table_\\\"][\\\"buckets_\\\"][\\\"buckets\\\"])\\n\"\n"
+
+        ".ascii \"    def to_string(self):\\n\"\n"
+        ".ascii \"        size = self.val[\\\"table_\\\"][\\\"size_\\\"]\\n\"\n"
+        ".ascii \"        return f\\\"{self.name} with {size} elements\\\"\\n\"\n"
+
+        ".ascii \"    def display_hint(self):\\n\"\n"
+        ".ascii \"        return \\\"map\\\"\\n\"\n"
+
+        ".ascii \"    def children(self):\\n\"\n"
+        ".ascii \"        def generator():\\n\"\n"
+        ".ascii \"            grouped_buckets = self.val[\\\"table_\\\"][\\\"buckets_\\\"]\\n\"\n"
+
+        ".ascii \"            size = grouped_buckets[\\\"size_\\\"]\\n\"\n"
+        ".ascii \"            buckets = grouped_buckets[\\\"buckets\\\"]\\n\"\n"
+        ".ascii \"            bucket_index = 0\\n\"\n"
+
+        ".ascii \"            count = 0\\n\"\n"
+        ".ascii \"            while bucket_index != size:\\n\"\n"
+        ".ascii \"                current_bucket = self.cpo.next(self.cpo.to_address(buckets), bucket_index)\\n\"\n"
+        ".ascii \"                node = self.cpo.to_address(current_bucket.dereference()[\\\"next\\\"])\\n\"\n"
+        ".ascii \"                while node != 0:\\n\"\n"
+        ".ascii \"                    value = node.dereference()[\\\"buf\\\"][\\\"t_\\\"]\\n\"\n"
+        ".ascii \"                    if self.is_map:\\n\"\n"
+        ".ascii \"                        first = value[\\\"first\\\"]\\n\"\n"
+        ".ascii \"                        second = value[\\\"second\\\"]\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", first\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", second\\n\"\n"
+        ".ascii \"                    else:\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", count\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", value\\n\"\n"
+        ".ascii \"                    count += 1\\n\"\n"
+        ".ascii \"                    node = self.cpo.to_address(node.dereference()[\\\"next\\\"])\\n\"\n"
+        ".ascii \"                bucket_index += 1\\n\"\n"
+
+        ".ascii \"        return generator()\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFcaIteratorPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = val\\n\"\n"
+        ".ascii \"        self.cpo = BoostUnorderedPointerCustomizationPoint(self.val[\\\"p\\\"])\\n\"\n"
+
+        ".ascii \"    def to_string(self):\\n\"\n"
+        ".ascii \"        if self.valid():\\n\"\n"
+        ".ascii \"            value = self.cpo.to_address(self.val[\\\"p\\\"]).dereference()[\\\"buf\\\"][\\\"t_\\\"]\\n\"\n"
+        ".ascii \"            return f\\\"iterator = {{ {value} }}\\\"\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            return \\\"iterator = { end iterator }\\\"\\n\"\n"
+
+        ".ascii \"    def valid(self):\\n\"\n"
+        ".ascii \"        return (self.cpo.to_address(self.val[\\\"p\\\"]) != 0) and (self.cpo.to_address(self.val[\\\"itb\\\"][\\\"p\\\"]) != 0)\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFoaTableCoreCumulativeStatsPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = val\\n\"\n"
+
+        ".ascii \"    def to_string(self):\\n\"\n"
+        ".ascii \"        return \\\"[stats]\\\"\\n\"\n"
+
+        ".ascii \"    def display_hint(self):\\n\"\n"
+        ".ascii \"        return \\\"map\\\"\\n\"\n"
+
+        ".ascii \"    def children(self):\\n\"\n"
+        ".ascii \"        def generator():\\n\"\n"
+        ".ascii \"            members = [\\\"insertion\\\", \\\"successful_lookup\\\", \\\"unsuccessful_lookup\\\"]\\n\"\n"
+        ".ascii \"            for member in members:\\n\"\n"
+        ".ascii \"                yield \\\"\\\", member\\n\"\n"
+        ".ascii \"                yield \\\"\\\", self.val[member]\\n\"\n"
+        ".ascii \"        return generator()\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFoaCumulativeStatsPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = val\\n\"\n"
+        ".ascii \"        self.n = self.val[\\\"n\\\"]\\n\"\n"
+        ".ascii \"        self.N = self.val.type.template_argument(0)\\n\"\n"
+
+        ".ascii \"    def display_hint(self):\\n\"\n"
+        ".ascii \"        return \\\"map\\\"\\n\"\n"
+
+        ".ascii \"    def children(self):\\n\"\n"
+        ".ascii \"        def generator():\\n\"\n"
+        ".ascii \"            yield \\\"\\\", \\\"count\\\"\\n\"\n"
+        ".ascii \"            yield \\\"\\\", self.n\\n\"\n"
+
+        ".ascii \"            sequence_stats_data = gdb.lookup_type(\\\"boost::unordered::detail::foa::sequence_stats_data\\\")\\n\"\n"
+        ".ascii \"            data = self.val[\\\"data\\\"]\\n\"\n"
+        ".ascii \"            arr = data.address.reinterpret_cast(sequence_stats_data.pointer())\\n\"\n"
+        ".ascii \"            def build_string(idx):\\n\"\n"
+        ".ascii \"                entry = arr[idx]\\n\"\n"
+        ".ascii \"                avg = float(entry[\\\"m\\\"])\\n\"\n"
+        ".ascii \"                var = float(entry[\\\"s\\\"] / self.n) if (self.n != 0) else 0.0\\n\"\n"
+        ".ascii \"                dev = math.sqrt(var)\\n\"\n"
+        ".ascii \"                return f\\\"{{avg = {avg}, var = {var}, dev = {dev}}}\\\"\\n\"\n"
+
+        ".ascii \"            if self.N > 0:\\n\"\n"
+        ".ascii \"                yield \\\"\\\", \\\"probe_length\\\"\\n\"\n"
+        ".ascii \"                yield \\\"\\\", build_string(0)\\n\"\n"
+        ".ascii \"            if self.N > 1:\\n\"\n"
+        ".ascii \"                yield \\\"\\\", \\\"num_comparisons\\\"\\n\"\n"
+        ".ascii \"                yield \\\"\\\", build_string(1)\\n\"\n"
+
+        ".ascii \"        return generator()\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFoaPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = BoostUnorderedHelpers.maybe_unwrap_reference(val)\\n\"\n"
+        ".ascii \"        self.name = f\\\"{self.val.type.strip_typedefs()}\\\".split(\\\"<\\\")[0]\\n\"\n"
+        ".ascii \"        self.name = self.name.replace(\\\"boost::unordered::\\\", \\\"boost::\\\")\\n\"\n"
+        ".ascii \"        self.is_map = self.name.endswith(\\\"map\\\")\\n\"\n"
+        ".ascii \"        self.cpo = BoostUnorderedPointerCustomizationPoint(self.val[\\\"table_\\\"][\\\"arrays\\\"][\\\"groups_\\\"])\\n\"\n"
+
+        ".ascii \"    def to_string(self):\\n\"\n"
+        ".ascii \"        size = BoostUnorderedHelpers.maybe_unwrap_atomic(self.val[\\\"table_\\\"][\\\"size_ctrl\\\"][\\\"size\\\"])\\n\"\n"
+        ".ascii \"        return f\\\"{self.name} with {size} elements\\\"\\n\"\n"
+
+        ".ascii \"    def display_hint(self):\\n\"\n"
+        ".ascii \"        return \\\"map\\\"\\n\"\n"
+
+        ".ascii \"    def is_regular_layout(self, group):\\n\"\n"
+        ".ascii \"        typename = group[\\\"m\\\"].type.strip_typedefs()\\n\"\n"
+        ".ascii \"        array_size = typename.sizeof // typename.target().sizeof\\n\"\n"
+        ".ascii \"        if array_size == 16:\\n\"\n"
+        ".ascii \"            return True\\n\"\n"
+        ".ascii \"        elif array_size == 2:\\n\"\n"
+        ".ascii \"            return False\\n\"\n"
+
+        ".ascii \"    def match_occupied(self, group):\\n\"\n"
+        ".ascii \"        m = group[\\\"m\\\"]\\n\"\n"
+        ".ascii \"        at = lambda b: BoostUnorderedHelpers.maybe_unwrap_atomic(m[b][\\\"n\\\"])\\n\"\n"
+
+        ".ascii \"        if self.is_regular_layout(group):\\n\"\n"
+        ".ascii \"            bits = [1 << b for b in range(16) if at(b) == 0]\\n\"\n"
+        ".ascii \"            return 0x7FFF & ~sum(bits)\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            xx = at(0) | at(1)\\n\"\n"
+        ".ascii \"            yy = xx | (xx >> 32)\\n\"\n"
+        ".ascii \"            return 0x7FFF & (yy | (yy >> 16))\\n\"\n"
+
+        ".ascii \"    def is_sentinel(self, group, pos):\\n\"\n"
+        ".ascii \"        m = group[\\\"m\\\"]\\n\"\n"
+        ".ascii \"        at = lambda b: BoostUnorderedHelpers.maybe_unwrap_atomic(m[b][\\\"n\\\"])\\n\"\n"
+
+        ".ascii \"        N = group[\\\"N\\\"]\\n\"\n"
+        ".ascii \"        sentinel_ = group[\\\"sentinel_\\\"]\\n\"\n"
+        ".ascii \"        if self.is_regular_layout(group):\\n\"\n"
+        ".ascii \"            return pos == N-1 and at(N-1) == sentinel_\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            return pos == N-1 and (at(0) & 0x4000400040004000) == 0x4000 and (at(1) & 0x4000400040004000) == 0\\n\"\n"
+
+        ".ascii \"    def children(self):\\n\"\n"
+        ".ascii \"        def generator():\\n\"\n"
+        ".ascii \"            table = self.val[\\\"table_\\\"]\\n\"\n"
+        ".ascii \"            groups = self.cpo.to_address(table[\\\"arrays\\\"][\\\"groups_\\\"])\\n\"\n"
+        ".ascii \"            elements = self.cpo.to_address(table[\\\"arrays\\\"][\\\"elements_\\\"])\\n\"\n"
+
+        ".ascii \"            pc_ = groups.cast(gdb.lookup_type(\\\"unsigned char\\\").pointer())\\n\"\n"
+        ".ascii \"            p_ = elements\\n\"\n"
+        ".ascii \"            first_time = True\\n\"\n"
+        ".ascii \"            mask = 0\\n\"\n"
+        ".ascii \"            n0 = 0\\n\"\n"
+        ".ascii \"            n = 0\\n\"\n"
+
+        ".ascii \"            count = 0\\n\"\n"
+        ".ascii \"            while p_ != 0:\\n\"\n"
+        ".ascii \"                # This if block mirrors the condition in the begin() call\\n\"\n"
+        ".ascii \"                if (not first_time) or (self.match_occupied(groups.dereference()) & 1):\\n\"\n"
+        ".ascii \"                    pointer = BoostUnorderedHelpers.maybe_unwrap_foa_element(p_)\\n\"\n"
+        ".ascii \"                    value = self.cpo.to_address(pointer).dereference()\\n\"\n"
+        ".ascii \"                    if self.is_map:\\n\"\n"
+        ".ascii \"                        first = value[\\\"first\\\"]\\n\"\n"
+        ".ascii \"                        second = value[\\\"second\\\"]\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", first\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", second\\n\"\n"
+        ".ascii \"                    else:\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", count\\n\"\n"
+        ".ascii \"                        yield \\\"\\\", value\\n\"\n"
+        ".ascii \"                    count += 1\\n\"\n"
+        ".ascii \"                first_time = False\\n\"\n"
+
+        ".ascii \"                n0 = pc_.cast(gdb.lookup_type(\\\"uintptr_t\\\")) % groups.dereference().type.sizeof\\n\"\n"
+        ".ascii \"                pc_ = self.cpo.next(pc_, -n0)\\n\"\n"
+
+        ".ascii \"                mask = (self.match_occupied(pc_.cast(groups.type).dereference()) >> (n0+1)) << (n0+1)\\n\"\n"
+        ".ascii \"                while mask == 0:\\n\"\n"
+        ".ascii \"                    pc_ = self.cpo.next(pc_, groups.dereference().type.sizeof)\\n\"\n"
+        ".ascii \"                    p_ = self.cpo.next(p_, groups.dereference()[\\\"N\\\"])\\n\"\n"
+        ".ascii \"                    mask = self.match_occupied(pc_.cast(groups.type).dereference())\\n\"\n"
+
+        ".ascii \"                n = BoostUnorderedHelpers.countr_zero(mask)\\n\"\n"
+        ".ascii \"                if self.is_sentinel(pc_.cast(groups.type).dereference(), n):\\n\"\n"
+        ".ascii \"                    p_ = 0\\n\"\n"
+        ".ascii \"                else:\\n\"\n"
+        ".ascii \"                    pc_ = self.cpo.next(pc_, n)\\n\"\n"
+        ".ascii \"                    p_ = self.cpo.next(p_, n - n0)\\n\"\n"
+
+        ".ascii \"        return generator()\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFoaIteratorPrinter:\\n\"\n"
+        ".ascii \"    def __init__(self, val):\\n\"\n"
+        ".ascii \"        self.val = val\\n\"\n"
+        ".ascii \"        self.cpo = BoostUnorderedPointerCustomizationPoint(self.val[\\\"p_\\\"])\\n\"\n"
+
+        ".ascii \"    def to_string(self):\\n\"\n"
+        ".ascii \"        if self.valid():\\n\"\n"
+        ".ascii \"            element = self.cpo.to_address(self.val[\\\"p_\\\"])\\n\"\n"
+        ".ascii \"            pointer = BoostUnorderedHelpers.maybe_unwrap_foa_element(element)\\n\"\n"
+        ".ascii \"            value = self.cpo.to_address(pointer).dereference()\\n\"\n"
+        ".ascii \"            return f\\\"iterator = {{ {value} }}\\\"\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            return \\\"iterator = { end iterator }\\\"\\n\"\n"
+
+        ".ascii \"    def valid(self):\\n\"\n"
+        ".ascii \"        return (self.cpo.to_address(self.val[\\\"p_\\\"]) != 0) and (self.cpo.to_address(self.val[\\\"pc_\\\"]) != 0)\\n\"\n"
+
+        ".ascii \"def boost_unordered_build_pretty_printer():\\n\"\n"
+        ".ascii \"    pp = gdb.printing.RegexpCollectionPrettyPrinter(\\\"boost_unordered\\\")\\n\"\n"
+        ".ascii \"    add_template_printer = lambda name, printer: pp.add_printer(name, f\\\"^{name}<.*>$\\\", printer)\\n\"\n"
+        ".ascii \"    add_concrete_printer = lambda name, printer: pp.add_printer(name, f\\\"^{name}$\\\", printer)\\n\"\n"
+
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_map\\\", BoostUnorderedFcaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_multimap\\\", BoostUnorderedFcaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_set\\\", BoostUnorderedFcaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_multiset\\\", BoostUnorderedFcaPrinter)\\n\"\n"
+
+        ".ascii \"    add_template_printer(\\\"boost::unordered::detail::iterator_detail::iterator\\\", BoostUnorderedFcaIteratorPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::detail::iterator_detail::c_iterator\\\", BoostUnorderedFcaIteratorPrinter)\\n\"\n"
+
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_flat_map\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_flat_set\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_node_map\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::unordered_node_set\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::concurrent_flat_map\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::concurrent_flat_set\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::concurrent_node_map\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::concurrent_node_set\\\", BoostUnorderedFoaPrinter)\\n\"\n"
+
+        ".ascii \"    add_template_printer(\\\"boost::unordered::detail::foa::table_iterator\\\", BoostUnorderedFoaIteratorPrinter)\\n\"\n"
+
+        ".ascii \"    add_concrete_printer(\\\"boost::unordered::detail::foa::table_core_cumulative_stats\\\", BoostUnorderedFoaTableCoreCumulativeStatsPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::detail::foa::cumulative_stats\\\", BoostUnorderedFoaCumulativeStatsPrinter)\\n\"\n"
+        ".ascii \"    add_template_printer(\\\"boost::unordered::detail::foa::concurrent_cumulative_stats\\\", BoostUnorderedFoaCumulativeStatsPrinter)\\n\"\n"
+
+        ".ascii \"    return pp\\n\"\n"
+
+        ".ascii \"gdb.printing.register_pretty_printer(gdb.current_objfile(), boost_unordered_build_pretty_printer())\\n\"\n"
+
+
+
+        ".ascii \"# https://sourceware.org/gdb/current/onlinedocs/gdb.html/Writing-an-Xmethod.html\\n\"\n"
+        ".ascii \"class BoostUnorderedFoaGetStatsMethod(gdb.xmethod.XMethod):\\n\"\n"
+        ".ascii \"    def __init__(self):\\n\"\n"
+        ".ascii \"        gdb.xmethod.XMethod.__init__(self, \\\"get_stats\\\")\\n\"\n"
+
+        ".ascii \"    def get_worker(self, method_name):\\n\"\n"
+        ".ascii \"        if method_name == \\\"get_stats\\\":\\n\"\n"
+        ".ascii \"            return BoostUnorderedFoaGetStatsWorker()\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFoaGetStatsWorker(gdb.xmethod.XMethodWorker):\\n\"\n"
+        ".ascii \"    def get_arg_types(self):\\n\"\n"
+        ".ascii \"        return None\\n\"\n"
+
+        ".ascii \"    def get_result_type(self, obj):\\n\"\n"
+        ".ascii \"        return gdb.lookup_type(\\\"boost::unordered::detail::foa::table_core_cumulative_stats\\\")\\n\"\n"
+
+        ".ascii \"    def __call__(self, obj):\\n\"\n"
+        ".ascii \"        try:\\n\"\n"
+        ".ascii \"            return obj[\\\"table_\\\"][\\\"cstats\\\"]\\n\"\n"
+        ".ascii \"        except gdb.error:\\n\"\n"
+        ".ascii \"            print(\\\"Error: Binary was compiled without stats. Recompile with `BOOST_UNORDERED_ENABLE_STATS` defined.\\\")\\n\"\n"
+        ".ascii \"            return\\n\"\n"
+
+        ".ascii \"class BoostUnorderedFoaMatcher(gdb.xmethod.XMethodMatcher):\\n\"\n"
+        ".ascii \"    def __init__(self):\\n\"\n"
+        ".ascii \"        gdb.xmethod.XMethodMatcher.__init__(self, 'BoostUnorderedFoaMatcher')\\n\"\n"
+        ".ascii \"        self.methods = [BoostUnorderedFoaGetStatsMethod()]\\n\"\n"
+
+        ".ascii \"    def match(self, class_type, method_name):\\n\"\n"
+        ".ascii \"        template_name = f\\\"{class_type.strip_typedefs()}\\\".split(\\\"<\\\")[0]\\n\"\n"
+        ".ascii \"        regex = \\\"^boost::unordered::(unordered|concurrent)_(flat|node)_(map|set)$\\\"\\n\"\n"
+        ".ascii \"        if not re.match(regex, template_name):\\n\"\n"
+        ".ascii \"            return None\\n\"\n"
+
+        ".ascii \"        workers = []\\n\"\n"
+        ".ascii \"        for method in self.methods:\\n\"\n"
+        ".ascii \"            if method.enabled:\\n\"\n"
+        ".ascii \"                worker = method.get_worker(method_name)\\n\"\n"
+        ".ascii \"                if worker:\\n\"\n"
+        ".ascii \"                    workers.append(worker)\\n\"\n"
+        ".ascii \"        return workers\\n\"\n"
+
+        ".ascii \"gdb.xmethod.register_xmethod_matcher(None, BoostUnorderedFoaMatcher())\\n\"\n"
+
+
+
+        ".ascii \"\\\"\\\"\\\" Fancy pointer support \\\"\\\"\\\"\\n\"\n"
+
+        ".ascii \"\\\"\\\"\\\"\\n\"\n"
+        ".ascii \"To allow your own fancy pointer type to interact with Boost.Unordered GDB pretty-printers,\\n\"\n"
+        ".ascii \"create a pretty-printer for your own type with the following additional methods.\\n\"\n"
+
+        ".ascii \"(Note, this is assuming the presence of a type alias `pointer` for the underlying\\n\"\n"
+        ".ascii \"raw pointer type, Substitute whichever name is applicable in your case.)\\n\"\n"
+
+        ".ascii \"`boost_to_address(fancy_ptr)`\\n\"\n"
+        ".ascii \"    * A static method, but `@staticmethod` is not required\\n\"\n"
+        ".ascii \"    * Parameter `fancy_ptr` of type `gdb.Value`\\n\"\n"
+        ".ascii \"        * Its `.type` will be your fancy pointer type\\n\"\n"
+        ".ascii \"    * Returns a `gdb.Value` with the raw pointer equivalent to your fancy pointer\\n\"\n"
+        ".ascii \"        * This method should be equivalent to calling `operator->()` on your fancy pointer in C++\\n\"\n"
+
+        ".ascii \"`boost_next(raw_ptr, offset)`\\n\"\n"
+        ".ascii \"    * Parameter `raw_ptr` of type `gdb.Value`\\n\"\n"
+        ".ascii \"        * Its `.type` will be `pointer`\\n\"\n"
+        ".ascii \"    * Parameter `offset`\\n\"\n"
+        ".ascii \"        * Either has integer type, or is of type `gdb.Value` with an underlying integer\\n\"\n"
+        ".ascii \"    * Returns a `gdb.Value` with the raw pointer equivalent to your fancy pointer, as if you did the following operations\\n\"\n"
+        ".ascii \"        1. Convert the incoming raw pointer to your fancy pointer\\n\"\n"
+        ".ascii \"        2. Use operator+= to add the offset to the fancy pointer\\n\"\n"
+        ".ascii \"        3. Convert back to the raw pointer\\n\"\n"
+        ".ascii \"    * Note, you will not actually do these operations as stated. You will do equivalent lower-level operations that emulate having done the above\\n\"\n"
+        ".ascii \"        * Ultimately, it will be as if you called `operator+()` on your fancy pointer in C++, but using only raw pointers\\n\"\n"
+
+        ".ascii \"Example\\n\"\n"
+        ".ascii \"```\\n\"\n"
+        ".ascii \"class MyFancyPtrPrinter:\\n\"\n"
+        ".ascii \"    ...\\n\"\n"
+
+        ".ascii \"    # Equivalent to `operator->()`\\n\"\n"
+        ".ascii \"    def boost_to_address(fancy_ptr):\\n\"\n"
+        ".ascii \"        ...\\n\"\n"
+        ".ascii \"        return ...\\n\"\n"
+
+        ".ascii \"    # Equivalent to `operator+()`\\n\"\n"
+        ".ascii \"    def boost_next(raw_ptr, offset):\\n\"\n"
+        ".ascii \"        ...\\n\"\n"
+        ".ascii \"        return ...\\n\"\n"
+
+        ".ascii \"    ...\\n\"\n"
+        ".ascii \"```\\n\"\n"
+        ".ascii \"\\\"\\\"\\\"\\n\"\n"
+
+        ".byte 0\n"
+        ".popsection\n");
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+#endif // defined(__ELF__)
+#endif // !defined(BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS)
+
+#endif // !defined(BOOST_UNORDERED_UNORDERED_PRINTERS_HPP)
diff --git a/inst/include/boost/unordered/unordered_set.hpp b/inst/include/boost/unordered/unordered_set.hpp
index 680b65657..eae846ddb 100644
--- a/inst/include/boost/unordered/unordered_set.hpp
+++ b/inst/include/boost/unordered/unordered_set.hpp
@@ -1,6 +1,7 @@
 // Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
 // Copyright (C) 2005-2011 Daniel James.
 // Copyright (C) 2022-2023 Christian Mazakas
+// Copyright (C) 2024 Joaquin M Lopez Munoz.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -154,7 +155,7 @@ namespace boost {
 
       allocator_type get_allocator() const noexcept
       {
-        return table_.node_alloc();
+        return allocator_type(table_.node_alloc());
       }
 
       // iterators
@@ -193,7 +194,7 @@ namespace boost {
       template <class... Args> std::pair<iterator, bool> emplace(Args&&... args)
       {
         return table_.emplace_unique(
-          table::extractor::extract(std::forward<Args>(args)...),
+          table::extractor::extract(detail::as_const(args)...),
           std::forward<Args>(args)...);
       }
 
@@ -201,7 +202,7 @@ namespace boost {
       iterator emplace_hint(const_iterator hint, Args&&... args)
       {
         return table_.emplace_hint_unique(hint,
-          table::extractor::extract(std::forward<Args>(args)...),
+          table::extractor::extract(detail::as_const(args)...),
           std::forward<Args>(args)...);
       }
 
@@ -252,12 +253,15 @@ namespace boost {
       node_type extract(const_iterator position)
       {
         return node_type(
-          table_.extract_by_iterator_unique(position), table_.node_alloc());
+          table_.extract_by_iterator_unique(position),
+          allocator_type(table_.node_alloc()));
       }
 
       node_type extract(const key_type& k)
       {
-        return node_type(table_.extract_by_key_impl(k), table_.node_alloc());
+        return node_type(
+          table_.extract_by_key_impl(k),
+          allocator_type(table_.node_alloc()));
       }
 
       template <class Key>
@@ -266,7 +270,9 @@ namespace boost {
         node_type>::type
       extract(const Key& k)
       {
-        return node_type(table_.extract_by_key_impl(k), table_.node_alloc());
+        return node_type(
+          table_.extract_by_key_impl(k),
+          allocator_type(table_.node_alloc()));
       }
 
       insert_return_type insert(node_type&& np)
@@ -647,7 +653,7 @@ namespace boost {
 
       allocator_type get_allocator() const noexcept
       {
-        return table_.node_alloc();
+        return allocator_type(table_.node_alloc());
       }
 
       // iterators
diff --git a/inst/include/boost/unordered/unordered_set_fwd.hpp b/inst/include/boost/unordered/unordered_set_fwd.hpp
index b74c61368..aea95d882 100644
--- a/inst/include/boost/unordered/unordered_set_fwd.hpp
+++ b/inst/include/boost/unordered/unordered_set_fwd.hpp
@@ -1,6 +1,7 @@
 
 // Copyright (C) 2008-2011 Daniel James.
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -16,6 +17,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class T, class H = boost::hash<T>, class P = std::equal_to<T>,
@@ -56,6 +61,18 @@ namespace boost {
 
     template <class N, class T, class A> class node_handle_set;
     template <class Iter, class NodeType> struct insert_return_type_set;
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class T, class H = boost::hash<T>, class P = std::equal_to<T> >
+      using unordered_set = boost::unordered::unordered_set<T, H, P,
+        std::pmr::polymorphic_allocator<T> >;
+
+      template <class T, class H = boost::hash<T>, class P = std::equal_to<T> >
+      using unordered_multiset = boost::unordered::unordered_multiset<T, H, P,
+        std::pmr::polymorphic_allocator<T> >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_multiset;
diff --git a/inst/include/boost/url.hpp b/inst/include/boost/url.hpp
index 82ccb3294..31a828ce0 100644
--- a/inst/include/boost/url.hpp
+++ b/inst/include/boost/url.hpp
@@ -43,6 +43,7 @@
 #include <boost/url/segments_ref.hpp>
 #include <boost/url/segments_view.hpp>
 #include <boost/url/static_url.hpp>
+#include <boost/url/string_view.hpp>
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/url.hpp>
 #include <boost/url/url_base.hpp>
diff --git a/inst/include/boost/url/authority_view.hpp b/inst/include/boost/url/authority_view.hpp
index 3f8d8a115..285b019d4 100644
--- a/inst/include/boost/url/authority_view.hpp
+++ b/inst/include/boost/url/authority_view.hpp
@@ -1354,7 +1354,24 @@ class BOOST_URL_DECL
 
     //--------------------------------------------
 
-    // hidden friend
+    /** Format the encoded authority to the output stream
+
+        This hidden friend function serializes the encoded URL
+        to the output stream.
+
+        @par Example
+        @code
+        authority_view a( "www.example.com" );
+
+        std::cout << a << std::endl;
+        @endcode
+
+        @return A reference to the output stream, for chaining
+
+        @param os The output stream to write to
+
+        @param a The URL to write
+    */
     friend
     std::ostream&
     operator<<(
diff --git a/inst/include/boost/url/decode_view.hpp b/inst/include/boost/url/decode_view.hpp
index 06372d79e..f92318055 100644
--- a/inst/include/boost/url/decode_view.hpp
+++ b/inst/include/boost/url/decode_view.hpp
@@ -136,8 +136,17 @@ class decode_view
         dereferenced.
     */
 #ifdef BOOST_URL_DOCS
-    using iterator = __see_below__;
+    using iterator = __see_below__
 #else
+
+    /** An iterator of constant, decoded characters.
+
+        This iterator is used to access the encoded
+        string as a bidirectional range of characters
+        with percent-decoding applied. Escape sequences
+        are not decoded until the iterator is
+        dereferenced.
+    */
     class iterator;
 #endif
 
@@ -575,6 +584,12 @@ class decode_view
     }
 public:
 
+    /// Compare two decode views for equality
+    /**
+     * This function is only enabled if both types are
+     * decode_view or convertible to `core::string_view`,
+     * but not both are convertible to `core::string_view`
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator==(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -584,6 +599,12 @@ class decode_view
         return decode_compare(s0, s1) == 0;
     }
 
+    /// Compare two decode views for inequality
+    /**
+     * This function is only enabled if both types are
+     * decode_view or convertible to `core::string_view`,
+     * but not both are convertible to `core::string_view`
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator!=(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -593,6 +614,12 @@ class decode_view
         return decode_compare(s0, s1) != 0;
     }
 
+    /// Compare two decode views for less than
+    /**
+     * This function is only enabled if both types are
+     * decode_view or convertible to `core::string_view`,
+     * but not both are convertible to `core::string_view`
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator<(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -602,6 +629,12 @@ class decode_view
         return decode_compare(s0, s1) < 0;
     }
 
+    /// Compare two decode views for less than or equal
+    /**
+     * This function is only enabled if both types are
+     * decode_view or convertible to `core::string_view`,
+     * but not both are convertible to `core::string_view`
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator<=(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -611,6 +644,12 @@ class decode_view
         return decode_compare(s0, s1) <= 0;
     }
 
+    /// Compare two decode views for greater than
+    /**
+     * This function is only enabled if both types are
+     * decode_view or convertible to `core::string_view`,
+     * but not both are convertible to `core::string_view`
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator>(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -620,6 +659,12 @@ class decode_view
         return decode_compare(s0, s1) > 0;
     }
 
+    /// Compare two decode views for greater than or equal
+    /**
+     * This function is only enabled if both types are
+     * decode_view or convertible to `core::string_view`,
+     * but not both are convertible to `core::string_view`
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator>=(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -630,7 +675,17 @@ class decode_view
     }
 #endif
 
-    // hidden friend
+    /** Format the string with percent-decoding applied to the output stream
+
+        This hidden friend function serializes the decoded view
+        to the output stream.
+
+        @return A reference to the output stream, for chaining
+
+        @param os The output stream to write to
+
+        @param s The decoded view to write
+    */
     friend
     std::ostream&
     operator<<(
diff --git a/inst/include/boost/url/detail/config.hpp b/inst/include/boost/url/detail/config.hpp
index c2980308e..fc6045e9f 100644
--- a/inst/include/boost/url/detail/config.hpp
+++ b/inst/include/boost/url/detail/config.hpp
@@ -131,6 +131,26 @@
 #define BOOST_URL_DEPRECATED(msg) BOOST_DEPRECATED(msg)
 #endif
 
+// Implementation defined type for Doxygen while Clang
+// can still parse the comments into the AST
+#ifndef BOOST_URL_DOCS
+#define BOOST_URL_IMPLEMENTATION_DEFINED(Type) Type
+#else
+#define BOOST_URL_IMPLEMENTATION_DEFINED(Type) __implementation_defined__
+#endif
+
+#ifndef BOOST_URL_DOCS
+#define BOOST_URL_SEE_BELOW(Type) Type
+#else
+#define BOOST_URL_SEE_BELOW(Type) __see_below__
+#endif
+
+#ifdef __cpp_lib_array_constexpr
+#define BOOST_URL_LIB_ARRAY_CONSTEXPR constexpr
+#else
+#define BOOST_URL_LIB_ARRAY_CONSTEXPR
+#endif
+
 // avoid Boost.TypeTraits for these traits
 namespace boost {
 namespace urls {
diff --git a/inst/include/boost/url/detail/decode.hpp b/inst/include/boost/url/detail/decode.hpp
deleted file mode 100644
index ef08b540f..000000000
--- a/inst/include/boost/url/detail/decode.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
-// Copyright (c) 2022 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_DECODE_HPP
-#define BOOST_URL_DETAIL_DECODE_HPP
-
-#include <boost/url/encoding_opts.hpp>
-#include <boost/core/detail/string_view.hpp>
-#include <cstdlib>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-BOOST_URL_DECL
-char
-decode_one(
-    char const* it) noexcept;
-
-BOOST_URL_DECL
-std::size_t
-decode_bytes_unsafe(
-    core::string_view s) noexcept;
-
-BOOST_URL_DECL
-std::size_t
-decode_unsafe(
-    char* dest,
-    char const* end,
-    core::string_view s,
-    encoding_opts opt = {}) noexcept;
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/encode.hpp b/inst/include/boost/url/detail/encode.hpp
index a0fc5d00c..9c6f785a7 100644
--- a/inst/include/boost/url/detail/encode.hpp
+++ b/inst/include/boost/url/detail/encode.hpp
@@ -38,63 +38,32 @@ template<class CharSet>
 std::size_t
 re_encoded_size_unsafe(
     core::string_view s,
-    CharSet const& unreserved,
-    encoding_opts opt) noexcept
+    CharSet const& unreserved) noexcept
 {
     std::size_t n = 0;
-    auto const end = s.end();
     auto it = s.begin();
-    if(opt.space_as_plus)
+    auto const end = s.end();
+    while(it != end)
     {
-        while(it != end)
+        if(*it != '%')
         {
-            if(*it != '%')
-            {
-                if( unreserved(*it)
-                    || *it == ' ')
-                    n += 1; 
-                else
-                    n += 3;
-                ++it;
-            }
+            if( unreserved(*it) )
+                n += 1;
             else
-            {
-                BOOST_ASSERT(end - it >= 3);
-                BOOST_ASSERT(
-                    grammar::hexdig_value(
-                        it[1]) >= 0);
-                BOOST_ASSERT(
-                    grammar::hexdig_value(
-                        it[2]) >= 0);
                 n += 3;
-                it += 3;
-            }
+            ++it;
         }
-    }
-    else
-    {
-        while(it != end)
+        else
         {
-            if(*it != '%')
-            {
-                if(unreserved(*it))
-                    n += 1; 
-                else
-                    n += 3;
-                ++it;
-            }
-            else
-            {
-                BOOST_ASSERT(end - it >= 3);
-                BOOST_ASSERT(
+            BOOST_ASSERT(end - it >= 3);
+            BOOST_ASSERT(
                     grammar::hexdig_value(
-                        it[1]) >= 0);
-                BOOST_ASSERT(
+                            it[1]) >= 0);
+            BOOST_ASSERT(
                     grammar::hexdig_value(
-                        it[2]) >= 0);
-                n += 3;
-                it += 3;
-            }
+                            it[2]) >= 0);
+            n += 3;
+            it += 3;
         }
     }
     return n;
@@ -108,15 +77,15 @@ re_encode_unsafe(
     char*& dest_,
     char const* const end,
     core::string_view s,
-    CharSet const& unreserved,
-    encoding_opts opt) noexcept
+    CharSet const& unreserved) noexcept
 {
-    char const* const hex =
-        detail::hexdigs[opt.lower_case];
+    static constexpr bool lower_case = false;
+    char const* const hex = detail::hexdigs[lower_case];
     auto const encode = [end, hex](
-        char*& dest,
-        unsigned char c) noexcept
+            char*& dest,
+            char c0) noexcept
     {
+        auto c = static_cast<unsigned char>(c0);
         ignore_unused(end);
         *dest++ = '%';
         BOOST_ASSERT(dest != end);
@@ -131,67 +100,30 @@ re_encode_unsafe(
     auto const last = s.end();
     std::size_t dn = 0;
     auto it = s.begin();
-
-    if(opt.space_as_plus)
+    while(it != last)
     {
-        while(it != last)
+        BOOST_ASSERT(dest != end);
+        if(*it != '%')
         {
-            BOOST_ASSERT(dest != end);
-            if(*it != '%')
+            if(unreserved(*it))
             {
-                if(*it == ' ')
-                {
-                    *dest++ = '+';
-                }
-                else if(unreserved(*it))
-                {
-                    *dest++ = *it;
-                }
-                else
-                {
-                    encode(dest, *it);
-                    dn += 2;
-                }
-                ++it;
+                *dest++ = *it;
             }
             else
             {
-                *dest++ = *it++;
-                BOOST_ASSERT(dest != end);
-                *dest++ = *it++;
-                BOOST_ASSERT(dest != end);
-                *dest++ = *it++;
+                encode(dest, *it);
                 dn += 2;
             }
+            ++it;
         }
-    }
-    else
-    {
-        while(it != last)
+        else
         {
+            *dest++ = *it++;
             BOOST_ASSERT(dest != end);
-            if(*it != '%')
-            {
-                if(unreserved(*it))
-                {
-                    *dest++ = *it;
-                }
-                else
-                {
-                    encode(dest, *it);
-                    dn += 2;
-                }
-                ++it;
-            }
-            else
-            {
-                *dest++ = *it++;
-                BOOST_ASSERT(dest != end);
-                *dest++ = *it++;
-                BOOST_ASSERT(dest != end);
-                *dest++ = *it++;
-                dn += 2;
-            }
+            *dest++ = *it++;
+            BOOST_ASSERT(dest != end);
+            *dest++ = *it++;
+            dn += 2;
         }
     }
     dest_ = dest;
diff --git a/inst/include/boost/url/detail/format_args.hpp b/inst/include/boost/url/detail/format_args.hpp
index 0d8416cd6..92ad6e3cd 100644
--- a/inst/include/boost/url/detail/format_args.hpp
+++ b/inst/include/boost/url/detail/format_args.hpp
@@ -332,9 +332,17 @@ template <class T, class = void>
 struct formatter;
 
 } // detail
+namespace see_below {
+using format_arg = detail::format_arg;
+}
+namespace implementation_defined {
+template <class T>
+using named_arg = detail::named_arg<T>;
+}
 } // url
 } // boost
 
+
 #include <boost/url/detail/impl/format_args.hpp>
 
 #endif
diff --git a/inst/include/boost/url/detail/impl/format_args.hpp b/inst/include/boost/url/detail/impl/format_args.hpp
index 4ce26db68..759a86520 100644
--- a/inst/include/boost/url/detail/impl/format_args.hpp
+++ b/inst/include/boost/url/detail/impl/format_args.hpp
@@ -106,7 +106,8 @@ measure_impl(
     grammar::lut_chars const& cs,
     void const* a )
 {
-    using ref_t = typename std::remove_reference<A>::type;
+    using ref_t = typename std::remove_cv<
+        typename std::remove_reference<A>::type>::type;
     A const& ref = *static_cast<ref_t*>(
         const_cast<void*>( a ) );
     formatter<ref_t> f;
@@ -123,7 +124,8 @@ format_impl(
     grammar::lut_chars const& cs,
     void const* a )
 {
-    using ref_t = typename std::remove_reference<A>::type;
+    using ref_t = typename std::remove_cv<
+        typename std::remove_reference<A>::type>::type;
     A const& ref = *static_cast<ref_t*>(
             const_cast<void*>( a ) );
     formatter<ref_t> f;
diff --git a/inst/include/boost/url/detail/move_chars.hpp b/inst/include/boost/url/detail/move_chars.hpp
deleted file mode 100644
index 7af4f4b46..000000000
--- a/inst/include/boost/url/detail/move_chars.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_MOVE_CHARS_HPP
-#define BOOST_URL_DETAIL_MOVE_CHARS_HPP
-
-#include <boost/core/detail/string_view.hpp>
-#include <boost/assert.hpp>
-#include <cstring>
-#include <functional>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-// Moves characters, and adjusts any passed
-// views if they point to any moved characters.
-
-// true if s completely overlapped by buf
-inline
-bool
-is_overlapping(
-    core::string_view buf,
-    core::string_view s) noexcept
-{
-    auto const b0 = buf.data();
-    auto const e0 = b0 + buf.size();
-    auto const b1 = s.data();
-    auto const e1 = b1 + s.size();
-    auto const less_equal =
-        std::less_equal<char const*>();
-    if(less_equal(e0, b1))
-        return false;
-    if(less_equal(e1, b0))
-        return false;
-    // partial overlap is undefined
-    BOOST_ASSERT(less_equal(e1, e0));
-    BOOST_ASSERT(less_equal(b0, b1));
-    return true;
-}
-
-inline
-void
-move_chars_impl(
-    std::ptrdiff_t,
-    core::string_view const&) noexcept
-{
-}
-
-template<class... Sn>
-void
-move_chars_impl(
-    std::ptrdiff_t d,
-    core::string_view const& buf,
-    core::string_view& s,
-    Sn&... sn) noexcept
-{
-    if(is_overlapping(buf, s))
-        s = {s.data() + d, s.size()};
-    move_chars_impl(d, buf, sn...);
-}
-
-template<class... Args>
-void
-move_chars(
-    char* dest,
-    char const* src,
-    std::size_t n,
-    Args&... args) noexcept
-{
-    core::string_view buf(src, n);
-    move_chars_impl(
-        dest - src,
-        core::string_view(src, n),
-        args...);
-    std::memmove(
-        dest, src, n);
-}
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/normalize.hpp b/inst/include/boost/url/detail/normalize.hpp
deleted file mode 100644
index dc1117825..000000000
--- a/inst/include/boost/url/detail/normalize.hpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-// Copyright (c) 2022 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_NORMALIZED_HPP
-#define BOOST_URL_DETAIL_NORMALIZED_HPP
-
-#include <boost/core/detail/string_view.hpp>
-#include <boost/url/segments_encoded_view.hpp>
-#include <boost/url/detail/normalize.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-class fnv_1a
-{
-public:
-    using digest_type = std::size_t;
-
-#if BOOST_URL_ARCH == 64
-    static constexpr std::size_t const prime =
-        static_cast<std::size_t>(0x100000001B3ULL);
-    static constexpr std::size_t init_hash  =
-        static_cast<std::size_t>(0xcbf29ce484222325ULL);
-#else
-    static constexpr std::size_t const prime =
-        static_cast<std::size_t>(0x01000193UL);
-    static constexpr std::size_t init_hash  =
-        static_cast<std::size_t>(0x811C9DC5UL);
-#endif
-
-    explicit
-    fnv_1a(std::size_t salt) noexcept
-    : h_(init_hash + salt)
-    {
-    }
-
-    void
-    put(char c) noexcept
-    {
-        h_ ^= c;
-        h_ *= prime;
-    }
-
-    void
-    put(core::string_view s) noexcept
-    {
-        for (char c: s)
-        {
-            put(c);
-        }
-    }
-
-    digest_type
-    digest() const noexcept
-    {
-        return h_;
-    }
-
-private:
-    std::size_t h_;
-};
-
-void
-pop_encoded_front(
-    core::string_view& s,
-    char& c,
-    std::size_t& n) noexcept;
-
-// compare two core::string_views as if they are both
-// percent-decoded
-int
-compare_encoded(
-    core::string_view lhs,
-    core::string_view rhs) noexcept;
-
-// digest a core::string_view as if it were
-// percent-decoded
-void
-digest_encoded(
-    core::string_view s,
-    fnv_1a& hasher) noexcept;
-
-void
-digest(
-    core::string_view s,
-    fnv_1a& hasher) noexcept;
-
-// check if core::string_view lhs starts with core::string_view
-// rhs as if they are both percent-decoded. If
-// lhs starts with rhs, return number of chars
-// matched in the encoded core::string_view
-std::size_t
-path_starts_with(
-    core::string_view lhs,
-    core::string_view rhs) noexcept;
-
-// check if core::string_view lhs ends with core::string_view
-// rhs as if they are both percent-decoded. If
-// lhs ends with rhs, return number of chars
-// matched in the encoded core::string_view
-std::size_t
-path_ends_with(
-    core::string_view lhs,
-    core::string_view rhs) noexcept;
-
-// compare two core::string_views as if they are both
-// percent-decoded and lowercase
-int
-ci_compare_encoded(
-    core::string_view lhs,
-    core::string_view rhs) noexcept;
-
-// digest a core::string_view as if it were decoded
-// and lowercase
-void
-ci_digest_encoded(
-    core::string_view s,
-    fnv_1a& hasher) noexcept;
-
-// compare two ascii core::string_views
-int
-compare(
-    core::string_view lhs,
-    core::string_view rhs) noexcept;
-
-// compare two core::string_views as if they are both
-// lowercase
-int
-ci_compare(
-    core::string_view lhs,
-    core::string_view rhs) noexcept;
-
-// digest a core::string_view as if it were lowercase
-void
-ci_digest(
-    core::string_view s,
-    fnv_1a& hasher) noexcept;
-
-BOOST_URL_DECL
-std::size_t
-remove_dot_segments(
-    char* dest,
-    char const* end,
-    core::string_view s) noexcept;
-
-void
-pop_last_segment(
-    core::string_view& s,
-    core::string_view& c,
-    std::size_t& level,
-    bool r) noexcept;
-
-char
-path_pop_back( core::string_view& s );
-
-void
-normalized_path_digest(
-    core::string_view s,
-    bool remove_unmatched,
-    fnv_1a& hasher) noexcept;
-
-int
-segments_compare(
-    segments_encoded_view seg0,
-    segments_encoded_view seg1) noexcept;
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/over_allocator.hpp b/inst/include/boost/url/detail/over_allocator.hpp
deleted file mode 100644
index 5bb4897c8..000000000
--- a/inst/include/boost/url/detail/over_allocator.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
- //
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_OVER_ALLOCATOR_HPP
-#define BOOST_URL_DETAIL_OVER_ALLOCATOR_HPP
-
-#include <boost/config.hpp>
-#include <boost/core/empty_value.hpp>
-#include <boost/assert.hpp>
-#include <boost/type_traits/is_final.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
-#ifdef BOOST_NO_CXX11_ALLOCATOR
-# include <boost/core/allocator_traits.hpp>
-#endif
-#include <cstddef>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-// This is a workaround for allocator_traits
-// implementations which falsely claim C++11
-// compatibility.
-#ifdef BOOST_NO_CXX11_ALLOCATOR
-template<class Alloc>
-using allocator_traits =
-    boost::allocator_traits<Alloc>;
-#else
-template<class Alloc>
-using allocator_traits = std::allocator_traits<Alloc>;
-#endif
-
-template<class T, class Allocator>
-class over_allocator
-    : private empty_value<Allocator>
-{
-    template<class U, class OtherAlloc>
-    friend class over_allocator;
-
-    std::size_t extra_;
-
-public:
-    using is_always_equal = std::false_type;
-    using value_type = typename
-        allocator_traits<typename allocator_traits<
-            Allocator>::template rebind_alloc<T>>::value_type;
-    using pointer = typename
-        allocator_traits<typename allocator_traits<
-            Allocator>::template rebind_alloc<T>>::pointer;
-    using const_pointer = typename
-        allocator_traits<typename allocator_traits<
-            Allocator>::template rebind_alloc<T>>::const_pointer;
-    using size_type = typename
-        allocator_traits<typename allocator_traits<
-            Allocator>::template rebind_alloc<T>>::size_type;
-    using difference_type = typename
-        allocator_traits<typename allocator_traits<
-            Allocator>::template rebind_alloc<T>>::difference_type;
-
-    template<class U>
-    struct rebind
-    {
-        using other = over_allocator<U, Allocator>;
-    };
-
-    over_allocator(
-        std::size_t extra,
-        Allocator const& alloc)
-        : empty_value<Allocator>(
-            empty_init, alloc)
-        , extra_(extra)
-    {
-    }
-
-    template<class U>
-    over_allocator(over_allocator<U, Allocator> const& other) noexcept
-        : empty_value<Allocator>(
-            empty_init, other.get())
-        , extra_(other.extra_)
-    {
-    }
-
-    pointer
-    allocate(size_type n)
-    {
-        BOOST_ASSERT(n == 1);
-        using U = typename boost::type_with_alignment<
-            alignof(value_type)>::type;
-        auto constexpr S = sizeof(U);
-        using A = typename allocator_traits<
-            Allocator>::template rebind_alloc<U>;
-        A a(this->get());
-        return reinterpret_cast<pointer>(
-            std::allocator_traits<A>::allocate(a,
-                (n * sizeof(value_type) + extra_ + S - 1) / S));
-    }
-
-    void
-    deallocate(pointer p, size_type n)
-    {
-        BOOST_ASSERT(n == 1);
-        using U = typename boost::type_with_alignment<
-            alignof(value_type)>::type;
-        auto constexpr S = sizeof(U);
-        using A = typename allocator_traits<
-            Allocator>::template rebind_alloc<U>;
-        A a{this->get()};
-        std::allocator_traits<A>::deallocate(a,
-            reinterpret_cast<U*>(p),
-                (n * sizeof(value_type) + extra_ + S - 1) / S);
-    }
-
-#if defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 60000
-    template<class U, class... Args>
-    void
-    construct(U* ptr, Args&&... args)
-    {
-        ::new((void*)ptr) U(std::forward<Args>(args)...);
-    }
-
-    template<class U>
-    void
-    destroy(U* ptr)
-    {
-        ptr->~U();
-    }
-#endif
-
-    template<class U>
-    friend
-    bool
-    operator==(
-        over_allocator const& lhs,
-        over_allocator<U, Allocator> const& rhs)
-    {
-        return
-            lhs.get() == rhs.get() &&
-            lhs.extra_ == rhs.extra_;
-    }
-
-    template<class U>
-    friend
-    bool
-    operator!=(
-        over_allocator const& lhs,
-        over_allocator<U, Allocator> const& rhs)
-    {
-        return ! (lhs == rhs);
-    }
-};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/path.hpp b/inst/include/boost/url/detail/path.hpp
deleted file mode 100644
index d4c368269..000000000
--- a/inst/include/boost/url/detail/path.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_PATH_HPP
-#define BOOST_URL_DETAIL_PATH_HPP
-
-#include <boost/core/detail/string_view.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-// Return the number of characters at
-// the front of the path that are reserved
-inline
-std::size_t
-path_prefix(
-    char const* p,
-    std::size_t n) noexcept
-{
-    switch(n)
-    {
-    case 0:
-        return 0;
-
-    case 1:
-        if(p[0] == '/')
-            return 1;
-        return 0;
-
-    case 2:
-        if(p[0] == '/')
-            return 1;
-        if( p[0] == '.' &&
-            p[1] == '/')
-            return 2;
-        return 0;
-
-    default:
-        if(p[0] == '/')
-        {
-            if( p[1] == '.' &&
-                p[2] == '/')
-                return 3;
-            return 1;
-        }
-        if( p[0] == '.' &&
-            p[1] == '/')
-            return 2;
-        break;
-    }
-    return 0;
-}
-
-// VFALCO DEPRECATED
-inline
-std::size_t
-path_prefix(
-    core::string_view s) noexcept
-{
-    return path_prefix(
-        s.data(), s.size());
-}
-
-// returns the number of adjusted
-// segments based on the malleable prefix.
-inline
-std::size_t
-path_segments(
-    core::string_view s,
-    std::size_t nseg) noexcept
-{
-    switch(s.size())
-    {
-    case 0:
-        BOOST_ASSERT(nseg == 0);
-        return 0;
-
-    case 1:
-        BOOST_ASSERT(nseg == 1);
-        if(s[0] == '/')
-            return 0;
-        return 1;
-
-    case 2:
-        if(s[0] == '/')
-            return nseg;
-        if( s[0] == '.' &&
-            s[1] == '/')
-        {
-            BOOST_ASSERT(nseg > 1);
-            return nseg - 1;
-        }
-        return nseg;
-
-    default:
-        if(s[0] == '/')
-        {
-            if( s[1] == '.' &&
-                s[2] == '/')
-            {
-                BOOST_ASSERT(nseg > 1);
-                return nseg - 1;
-            }
-            return nseg;
-        }
-        if( s[0] == '.' &&
-            s[1] == '/')
-        {
-            BOOST_ASSERT(nseg > 1);
-            return nseg - 1;
-        }
-        break;
-    }
-    return nseg;
-}
-
-// Trim reserved characters from
-// the front of the path.
-inline
-core::string_view
-clean_path(
-    core::string_view s) noexcept
-{
-    s.remove_prefix(
-        path_prefix(s));
-    return s;
-}
-
-} // detail
-} // urls
-} // boost
-
-#endif
\ No newline at end of file
diff --git a/inst/include/boost/url/detail/pattern.hpp b/inst/include/boost/url/detail/pattern.hpp
deleted file mode 100644
index 931d2dd2b..000000000
--- a/inst/include/boost/url/detail/pattern.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2022 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_PATTERN_HPP
-#define BOOST_URL_DETAIL_PATTERN_HPP
-
-#include <boost/url/error_types.hpp>
-#include <boost/url/url_base.hpp>
-#include <boost/core/detail/string_view.hpp>
-
-// This file includes functions and classes
-// to parse uri templates or format strings
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-class format_args;
-
-struct pattern
-{
-    core::string_view scheme;
-    core::string_view user;
-    core::string_view pass;
-    core::string_view host;
-    core::string_view port;
-    core::string_view path;
-    core::string_view query;
-    core::string_view frag;
-
-    bool has_authority = false;
-    bool has_user = false;
-    bool has_pass = false;
-    bool has_port = false;
-    bool has_query = false;
-    bool has_frag = false;
-
-    BOOST_URL_DECL
-    void
-    apply(
-        url_base& u,
-        format_args const& args) const;
-};
-
-BOOST_URL_DECL
-system::result<pattern>
-parse_pattern(
-    core::string_view s);
-
-} // detail
-} // url
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/pct_format.hpp b/inst/include/boost/url/detail/pct_format.hpp
deleted file mode 100644
index 0d13b3fcf..000000000
--- a/inst/include/boost/url/detail/pct_format.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2022 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_PCT_FORMAT_HPP
-#define BOOST_URL_DETAIL_PCT_FORMAT_HPP
-
-#include <boost/core/detail/string_view.hpp>
-#include <boost/url/url.hpp>
-#include <boost/url/grammar/lut_chars.hpp>
-#include <boost/url/detail/format_args.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-// measure a single string
-BOOST_URL_DECL
-std::size_t
-pct_vmeasure(
-    grammar::lut_chars const& cs,
-    format_parse_context& pctx,
-    measure_context& mctx);
-
-// format a single string
-BOOST_URL_DECL
-char*
-pct_vformat(
-    grammar::lut_chars const& cs,
-    format_parse_context& pctx,
-    format_context& fctx);
-
-} // detail
-} // url
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/print.hpp b/inst/include/boost/url/detail/print.hpp
deleted file mode 100644
index dffc5ab2f..000000000
--- a/inst/include/boost/url/detail/print.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
- //
-// Copyright (c) 2019 Vinnie Falco (vinnie.falco@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_DETAIL_PRINT_HPP
-#define BOOST_URL_DETAIL_PRINT_HPP
-
-#include <cstdint>
-#include <type_traits>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-// std::uint64_t
-// 18446744073709551615
-//          1          2
-template<class T>
-struct printed
-    : std::false_type
-{
-};
-
-// 16-bit unsigned
-template<>
-class printed<std::uint16_t>
-    : std::false_type
-{
-    char n_;
-    char buf_[5];
-
-public:
-    printed(std::uint16_t n)
-    {
-        char* it =
-            buf_ + sizeof(buf_);
-        if(n == 0)
-        {
-            *--it = '0';
-            n_ = 1;
-        }
-        else
-        {
-            while(n > 0)
-            {
-                *--it = '0' + (n % 10);
-                n /= 10;
-            }
-            n_ = static_cast<char>(
-                sizeof(buf_) - (
-                    it - buf_));
-        }
-    }
-
-    core::string_view
-    string() const noexcept
-    {
-        return core::string_view(buf_ +
-            sizeof(buf_) - n_, n_);
-    }
-};
-
-template<class T>
-printed<T>
-make_printed(T t)
-{
-    return printed<T>(t);
-}
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/detail/url_impl.hpp b/inst/include/boost/url/detail/url_impl.hpp
index ca600d5f6..879fbe6de 100644
--- a/inst/include/boost/url/detail/url_impl.hpp
+++ b/inst/include/boost/url/detail/url_impl.hpp
@@ -76,7 +76,8 @@ struct BOOST_URL_DECL url_impl : parts_base
     pct_string_view pct_get(int, int) const noexcept;
     void set_size(int, std::size_t) noexcept;
     void split(int, std::size_t) noexcept;
-    void adjust(int, int, std::size_t) noexcept;
+    void adjust_right(int first, int last, std::size_t n) noexcept;
+    void adjust_left(int first, int last, std::size_t n) noexcept;
     void collapse(int, int, std::size_t) noexcept;
 
     void apply_scheme(core::string_view) noexcept;
diff --git a/inst/include/boost/url/detail/vformat.hpp b/inst/include/boost/url/detail/vformat.hpp
index 126d321bf..ab91da6f9 100644
--- a/inst/include/boost/url/detail/vformat.hpp
+++ b/inst/include/boost/url/detail/vformat.hpp
@@ -11,7 +11,6 @@
 #define BOOST_URL_DETAIL_FORMAT_HPP
 
 #include <boost/url/detail/format_args.hpp>
-#include <boost/url/detail/pattern.hpp>
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/url.hpp>
 
@@ -19,22 +18,18 @@ namespace boost {
 namespace urls {
 namespace detail {
 
-inline
+BOOST_URL_DECL
 void
 vformat_to(
     url_base& u,
     core::string_view fmt,
-    detail::format_args args)
-{
-    parse_pattern(fmt)
-        .value().apply(u, args);
-}
+    format_args args);
 
 inline
 url
 vformat(
     core::string_view fmt,
-    detail::format_args args)
+    format_args args)
 {
     url u;
     vformat_to(u, fmt, args);
diff --git a/inst/include/boost/url/error_types.hpp b/inst/include/boost/url/error_types.hpp
index 10a31a15a..cbb1662dc 100644
--- a/inst/include/boost/url/error_types.hpp
+++ b/inst/include/boost/url/error_types.hpp
@@ -24,7 +24,7 @@ namespace error_types {
 
 /** The type of error category used by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `system::error_category` instead.
 
@@ -46,7 +46,7 @@ using error_category
 
 /** The type of error code used by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `system::error_code` instead.
 
@@ -68,7 +68,7 @@ using error_code
 
 /** The type of error condition used by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `system::error_condition` instead.
 
@@ -90,7 +90,7 @@ using error_condition
 
 /** The type of system error thrown by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `system::system_error` instead.
 
@@ -112,7 +112,7 @@ using system_error
 
 /** A function to return the generic error category used by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `core::string_view` instead.
 
@@ -131,12 +131,31 @@ using system_error
 #ifdef BOOST_URL_DOCS
 error_category const& generic_category();
 #else
+
+/** A function to return the generic error category used by the library
+
+    @warning This alias is no longer supported and
+    should not be used in new code. Please use
+    `core::string_view` instead.
+
+    This alias is included for backwards
+    compatibility with earlier versions of the
+    library.
+
+    However, it will be removed in future releases,
+    and using it in new code is not recommended.
+
+    Please use the updated version instead to
+    ensure compatibility with future versions of
+    the library.
+
+ */
 using boost::system::generic_category;
 #endif
 
 /** A function to return the system error category used by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `core::string_view` instead.
 
@@ -155,12 +174,31 @@ using boost::system::generic_category;
 #ifdef BOOST_URL_DOCS
 error_category const& system_category();
 #else
+
+/** A function to return the system error category used by the library
+
+    @warning This alias is no longer supported and
+    should not be used in new code. Please use
+    `core::string_view` instead.
+
+    This alias is included for backwards
+    compatibility with earlier versions of the
+    library.
+
+    However, it will be removed in future releases,
+    and using it in new code is not recommended.
+
+    Please use the updated version instead to
+    ensure compatibility with future versions of
+    the library.
+
+ */
 using boost::system::system_category;
 #endif
 
 /** The set of constants used for cross-platform error codes
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `core::string_view` instead.
 
@@ -176,18 +214,11 @@ using boost::system::system_category;
     the library.
 
  */
-#ifdef BOOST_URL_DOCS
-enum errc
-{
-    __see_below__
-};
-#else
 namespace errc = boost::system::errc;
-#endif
 
 /** The type of result returned by library functions
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `system::result` instead.
 
diff --git a/inst/include/boost/url/format.hpp b/inst/include/boost/url/format.hpp
index 58042a975..3fad7d992 100644
--- a/inst/include/boost/url/format.hpp
+++ b/inst/include/boost/url/format.hpp
@@ -266,7 +266,7 @@ format(
 #ifdef BOOST_URL_DOCS
     std::initializer_list<__see_below__> args
 #else
-    std::initializer_list<detail::format_arg> args
+    std::initializer_list<see_below::format_arg> args
 #endif
     )
 {
@@ -364,7 +364,7 @@ format_to(
 #ifdef BOOST_URL_DOCS
     std::initializer_list<__see_below__> args
 #else
-    std::initializer_list<detail::format_arg> args
+    std::initializer_list<see_below::format_arg> args
 #endif
     )
 {
@@ -400,11 +400,7 @@ format_to(
 
 */
 template <class T>
-#ifdef BOOST_URL_DOCS
-__implementation_defined__
-#else
-detail::named_arg<T>
-#endif
+BOOST_URL_IMPLEMENTATION_DEFINED(implementation_defined::named_arg<T>)
 arg(core::string_view name, T const& arg)
 {
     return {name, arg};
diff --git a/inst/include/boost/url/grammar/all_chars.hpp b/inst/include/boost/url/grammar/all_chars.hpp
index 97946d225..69b389db3 100644
--- a/inst/include/boost/url/grammar/all_chars.hpp
+++ b/inst/include/boost/url/grammar/all_chars.hpp
@@ -40,6 +40,8 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ all_chars;
 #else
+namespace implementation_defined
+{
 struct all_chars_t
 {
     constexpr
@@ -72,13 +74,29 @@ struct all_chars_t
     }
 #endif
 };
+} // implementation_defined
+
+/** The set of all characters
+
+    @par Example
+    Character sets are used with rules and the
+    functions @ref find_if and @ref find_if_not.
+    @code
+    system::result< core::string_view > rv = parse( "JohnDoe", token_rule( all_chars ) );
+    @endcode
 
-/** A character set containing all characters.
+    @par BNF
+    @code
+    ALL       = %x00-FF
+    @endcode
 
     @see
-        @ref all_chars_t
+        @ref find_if,
+        @ref find_if_not,
+        @ref parse,
+        @ref token_rule.
 */
-constexpr all_chars_t all_chars{};
+BOOST_INLINE_VARIABLE constexpr implementation_defined::all_chars_t all_chars{};
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/alnum_chars.hpp b/inst/include/boost/url/grammar/alnum_chars.hpp
index a7d4ef938..6c6618dc0 100644
--- a/inst/include/boost/url/grammar/alnum_chars.hpp
+++ b/inst/include/boost/url/grammar/alnum_chars.hpp
@@ -50,6 +50,7 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ alnum_chars;
 #else
+namespace implementation_defined {
 struct alnum_chars_t
 {
     constexpr
@@ -82,8 +83,39 @@ struct alnum_chars_t
     }
 #endif
 };
+} // implementation_defined
 
-constexpr alnum_chars_t alnum_chars{};
+/** The set of letters and digits
+
+    @par Example
+    Character sets are used with rules and the
+    functions @ref find_if and @ref find_if_not.
+    @code
+    system::result< core::string_view > = parse( "Johnny42", token_rule( alnumchars ) );
+    @endcode
+
+    @par BNF
+    @code
+    ALNUM       = ALPHA / DIGIT
+
+    ALPHA       = %x41-5A / %x61-7A
+                ; A-Z / a-z
+
+    DIGIT       = %x30-39
+                ; 0-9
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#appendix-B.1"
+        >B.1. Core Rules (rfc5234)</a>
+
+    @see
+        @ref find_if,
+        @ref find_if_not,
+        @ref parse,
+        @ref token_rule.
+*/
+constexpr implementation_defined::alnum_chars_t alnum_chars{};
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/alpha_chars.hpp b/inst/include/boost/url/grammar/alpha_chars.hpp
index 88e2ab590..18fdb9c0c 100644
--- a/inst/include/boost/url/grammar/alpha_chars.hpp
+++ b/inst/include/boost/url/grammar/alpha_chars.hpp
@@ -45,6 +45,7 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ alpha_chars;
 #else
+namespace implementation_defined {
 struct alpha_chars_t
 {
     constexpr
@@ -79,13 +80,34 @@ struct alpha_chars_t
     }
 #endif
 };
+} // implementation_defined
 
-/** A character set containing the alphabetical characters.
+/** The set of all letters
+
+    @par Example
+    Character sets are used with rules and the
+    functions @ref find_if and @ref find_if_not.
+    @code
+    system::result< core::string_view > rv = parse( "JohnDoe", token_rule( alpha_chars ) );
+    @endcode
+
+    @par BNF
+    @code
+    ALPHA       = %x41-5A / %x61-7A
+                ; A-Z / a-z
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#appendix-B.1"
+        >B.1. Core Rules (rfc5234)</a>
 
     @see
-        @ref alpha_chars_t
+        @ref find_if,
+        @ref find_if_not,
+        @ref parse,
+        @ref token_rule.
 */
-constexpr alpha_chars_t alpha_chars{};
+constexpr implementation_defined::alpha_chars_t alpha_chars{};
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/charset.hpp b/inst/include/boost/url/grammar/charset.hpp
index 42eecace7..16da97d2a 100644
--- a/inst/include/boost/url/grammar/charset.hpp
+++ b/inst/include/boost/url/grammar/charset.hpp
@@ -21,6 +21,22 @@ namespace boost {
 namespace urls {
 namespace grammar {
 
+namespace see_below
+{
+template<class T, class = void>
+struct is_charset : std::false_type {};
+
+template<class T>
+struct is_charset<T, void_t<
+    decltype(
+    std::declval<bool&>() =
+        std::declval<T const&>().operator()(
+            std::declval<char>())
+            ) > > : std::true_type
+{
+};
+}
+
 /** Alias for `std::true_type` if T satisfies <em>CharSet</em>.
 
     This metafunction determines if the
@@ -43,23 +59,8 @@ namespace grammar {
 
     @tparam T the type to check.
 */
-#ifdef BOOST_URL_DOCS
 template<class T>
-using is_charset = __see_below__;
-#else
-template<class T, class = void>
-struct is_charset : std::false_type {};
-
-template<class T>
-struct is_charset<T, void_t<
-    decltype(
-    std::declval<bool&>() =
-        std::declval<T const&>().operator()(
-            std::declval<char>())
-            ) > > : std::true_type
-{
-};
-#endif
+using is_charset = BOOST_URL_SEE_BELOW(see_below::is_charset<T>);
 
 //------------------------------------------------
 
@@ -142,7 +143,7 @@ find_if_not(
 //------------------------------------------------
 
 #ifndef BOOST_URL_DOCS
-namespace detail {
+namespace implementation_defined {
 
 template<class CharSet>
 struct charset_ref
@@ -175,7 +176,7 @@ struct charset_ref
     }
 };
 
-} // detail
+} // implementation_defined
 #endif
 
 /** Return a reference to a character set
@@ -193,22 +194,41 @@ struct charset_ref
     `ref` should only be used with compile-time
     constants.
 */
+#ifdef BOOST_URL_DOCS
 template<class CharSet>
 constexpr
-#ifdef BOOST_URL_DOCS
 __implementation_defined__
+ref(CharSet const& cs) noexcept;
 #else
+
+/** Return a reference to a character set
+
+    This function returns a character set which
+    references the specified object. This is
+    used to reduce the number of bytes of
+    storage (`sizeof`) required by a combinator
+    when it stores a copy of the object.
+    <br>
+    Ownership of the object is not transferred;
+    the caller is responsible for ensuring the
+    lifetime of the object is extended until it
+    is no longer referenced. For best results,
+    `ref` should only be used with compile-time
+    constants.
+*/
+template<class CharSet>
+constexpr
 typename std::enable_if<
     is_charset<CharSet>::value &&
     ! std::is_same<CharSet,
-        detail::charset_ref<CharSet> >::value,
-    detail::charset_ref<CharSet> >::type
-#endif
+        implementation_defined::charset_ref<CharSet> >::value,
+    implementation_defined::charset_ref<CharSet> >::type
 ref(CharSet const& cs) noexcept
 {
-    return detail::charset_ref<
+    return implementation_defined::charset_ref<
         CharSet>{cs};
 }
+#endif
 
 } // grammar
 } // urls
diff --git a/inst/include/boost/url/grammar/ci_string.hpp b/inst/include/boost/url/grammar/ci_string.hpp
index 1899d3497..c615780eb 100644
--- a/inst/include/boost/url/grammar/ci_string.hpp
+++ b/inst/include/boost/url/grammar/ci_string.hpp
@@ -167,6 +167,20 @@ ci_is_equal(
     String1 const& s1);
 #else
 
+/** Return true if s0 equals s1 using case-insensitive comparison
+
+    The function is defined only for strings
+    containing low-ASCII characters.
+
+    @par Example
+    @code
+    assert( ci_is_equal( "Boost", "boost" ) );
+    @endcode
+
+    @see
+        @ref ci_compare,
+        @ref ci_is_less.
+*/
 template<
     class String0,
     class String1>
@@ -189,6 +203,20 @@ ci_is_equal(
     return detail::ci_is_equal(s0, s1);
 }
 
+/** Return true if s0 equals s1 using case-insensitive comparison
+
+    The function is defined only for strings
+    containing low-ASCII characters.
+
+    @par Example
+    @code
+    assert( ci_is_equal( "Boost", "boost" ) );
+    @endcode
+
+    @see
+        @ref ci_compare,
+        @ref ci_is_less.
+*/
 inline
 bool
 ci_is_equal(
@@ -258,6 +286,7 @@ ci_is_less(
 #ifdef BOOST_URL_DOCS
 using ci_hash = __see_below__;
 #else
+namespace see_below {
 struct ci_hash
 {
     using is_transparent = void;
@@ -269,6 +298,30 @@ struct ci_hash
         return ci_digest(s);
     }
 };
+}
+
+/** A case-insensitive hash function object for strings
+
+    The hash function is non-cryptographic and
+    not hardened against algorithmic complexity
+    attacks.
+    This is a suitable hash function for
+    unordered containers.
+    The function is defined only for strings
+    containing low-ASCII characters.
+
+    @par Example
+    @code
+    boost::unordered_map< std::string, std::string, ci_hash, ci_equal > m1;
+
+    std::unordered_map  < std::string, std::string, ci_hash, ci_equal > m2; // (since C++20)
+    @endcode
+
+    @see
+        @ref ci_equal,
+        @ref ci_less.
+*/
+using ci_hash = see_below::ci_hash;
 #endif
 
 /** A case-insensitive equals predicate for strings
@@ -294,6 +347,7 @@ struct ci_hash
 #ifdef BOOST_URL_DOCS
 using ci_equal = __see_below__;
 #else
+namespace see_below {
 struct ci_equal
 {
     using is_transparent = void;
@@ -308,6 +362,29 @@ struct ci_equal
         return ci_is_equal(s0, s1);
     }
 };
+} // see_below
+
+/** A case-insensitive equals predicate for strings
+
+    The function object returns `true` when
+    two strings are equal, ignoring case.
+    This is a suitable equality predicate for
+    unordered containers.
+    The function is defined only for strings
+    containing low-ASCII characters.
+
+    @par Example
+    @code
+    boost::unordered_map< std::string, std::string, ci_hash, ci_equal > m1;
+
+    std::unordered_map  < std::string, std::string, ci_hash, ci_equal > m2; // (since C++20)
+    @endcode
+
+    @see
+        @ref ci_hash,
+        @ref ci_less.
+*/
+using ci_equal = see_below::ci_equal;
 #endif
 
 /** A case-insensitive less predicate for strings
@@ -335,6 +412,7 @@ struct ci_equal
 #ifdef BOOST_URL_DOCS
 using ci_less = __see_below__;
 #else
+namespace see_below {
 struct ci_less
 {
     using is_transparent = void;
@@ -347,6 +425,31 @@ struct ci_less
         return ci_is_less(s0, s1);
     }
 };
+}
+
+/** A case-insensitive less predicate for strings
+
+    The comparison algorithm implements a
+    case-insensitive total order on the set
+    of all ASCII strings; however, it is
+    not a lexicographical comparison.
+    This is a suitable predicate for
+    ordered containers.
+    The function is defined only for strings
+    containing low-ASCII characters.
+
+    @par Example
+    @code
+    boost::container::map< std::string, std::string, ci_less > m1;
+
+    std::map< std::string, std::string, ci_less > m2; // (since C++14)
+    @endcode
+
+    @see
+        @ref ci_equal,
+        @ref ci_hash.
+*/
+using ci_less = see_below::ci_less;
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/dec_octet_rule.hpp b/inst/include/boost/url/grammar/dec_octet_rule.hpp
index 955652c0c..43c398860 100644
--- a/inst/include/boost/url/grammar/dec_octet_rule.hpp
+++ b/inst/include/boost/url/grammar/dec_octet_rule.hpp
@@ -53,6 +53,7 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ dec_octet_rule;
 #else
+namespace implementation_defined {
 struct dec_octet_rule_t
 {
     using value_type = unsigned char;
@@ -65,8 +66,42 @@ struct dec_octet_rule_t
             ) const noexcept ->
         system::result<value_type>;
 };
+}
 
-constexpr dec_octet_rule_t dec_octet_rule{};
+/** Match a decimal octet
+
+    A decimal octet is precise way of
+    saying a number from 0 to 255. These
+    are commonly used in IPv4 addresses.
+
+    @par Value Type
+    @code
+    using value_type = unsigned char;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< unsigned char > rv = parse( "255", dec_octet_rule );
+    @endcode
+
+    @par BNF
+    @code
+    dec-octet   = DIGIT                 ; 0-9
+                / %x31-39 DIGIT         ; 10-99
+                / "1" 2DIGIT            ; 100-199
+                / "2" %x30-34 DIGIT     ; 200-249
+                / "25" %x30-35          ; 250-255
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
+        >3.2.2.  Host (rfc3986)</a>
+
+    @see
+        @ref parse.
+*/
+constexpr implementation_defined::dec_octet_rule_t dec_octet_rule{};
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/delim_rule.hpp b/inst/include/boost/url/grammar/delim_rule.hpp
index be71d3241..ad9cc0853 100644
--- a/inst/include/boost/url/grammar/delim_rule.hpp
+++ b/inst/include/boost/url/grammar/delim_rule.hpp
@@ -58,6 +58,8 @@ constexpr
 __implementation_defined__
 delim_rule( char ch ) noexcept;
 #else
+
+namespace implementation_defined {
 struct ch_delim_rule
 {
     using value_type = core::string_view;
@@ -77,12 +79,45 @@ struct ch_delim_rule
 private:
     char ch_;
 };
+} // implementation_defined
+
+/** Match a character literal
+
+    This matches the specified character.
+    The value is a reference to the character
+    in the underlying buffer, expressed as a
+    `core::string_view`. The function @ref squelch
+    may be used to turn this into `void` instead.
+    If there is no more input, the error code
+    @ref error::need_more is returned.
+
+    @par Value Type
+    @code
+    using value_type = core::string_view;
+    @endcode
 
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< core::string_view > rv = parse( ".", delim_rule('.') );
+    @endcode
+
+    @par BNF
+    @code
+    char        = %00-FF
+    @endcode
+
+    @param ch The character to match
+
+    @see
+        @ref parse,
+        @ref squelch.
+*/
 constexpr
-ch_delim_rule
+implementation_defined::ch_delim_rule
 delim_rule( char ch ) noexcept
 {
-    return ch_delim_rule(ch);
+    return {ch};
 }
 #endif
 
@@ -123,6 +158,7 @@ constexpr
 __implementation_defined__
 delim_rule( CharSet const& cs ) noexcept;
 #else
+namespace implementation_defined {
 template<class CharSet>
 struct cs_delim_rule
 {
@@ -159,13 +195,43 @@ struct cs_delim_rule
 private:
     CharSet cs_;
 };
+} // implementation_defined
+
+/** Match a single character from a character set
+
+    This matches exactly one character which
+    belongs to the specified character set.
+    The value is a reference to the character
+    in the underlying buffer, expressed as a
+    `core::string_view`. The function @ref squelch
+    may be used to turn this into `void` instead.
+    If there is no more input, the error code
+    @ref error::need_more is returned.
 
+    @par Value Type
+    @code
+    using value_type = core::string_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< core::string_view > rv = parse( "X", delim_rule( alpha_chars ) );
+    @endcode
+
+    @param cs The character set to use.
+
+    @see
+        @ref alpha_chars,
+        @ref parse,
+        @ref squelch.
+*/
 template<class CharSet>
 constexpr
 typename std::enable_if<
     ! std::is_convertible<
         CharSet, char>::value,
-    cs_delim_rule<CharSet>>::type
+    implementation_defined::cs_delim_rule<CharSet>>::type
 delim_rule(
     CharSet const& cs) noexcept
 {
@@ -177,7 +243,7 @@ delim_rule(
         is_charset<CharSet>::value,
         "CharSet requirements not met");
 
-    return cs_delim_rule<CharSet>(cs);
+    return implementation_defined::cs_delim_rule<CharSet>(cs);
 }
 #endif
 
diff --git a/inst/include/boost/url/grammar/detail/recycled.hpp b/inst/include/boost/url/grammar/detail/recycled.hpp
index 12fd4c29b..482815615 100644
--- a/inst/include/boost/url/grammar/detail/recycled.hpp
+++ b/inst/include/boost/url/grammar/detail/recycled.hpp
@@ -15,7 +15,7 @@
 namespace boost {
 namespace urls {
 namespace grammar {
-namespace detail {
+namespace see_below {
 
 template<
     std::size_t Size,
@@ -94,7 +94,7 @@ inline void recycled_remove(
 
 #endif
 
-} // detail
+} // implementation_defined
 } // grammar
 } // urls
 } // boost
diff --git a/inst/include/boost/url/grammar/digit_chars.hpp b/inst/include/boost/url/grammar/digit_chars.hpp
index d5aa75373..e9224092a 100644
--- a/inst/include/boost/url/grammar/digit_chars.hpp
+++ b/inst/include/boost/url/grammar/digit_chars.hpp
@@ -45,6 +45,7 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ digit_chars;
 #else
+namespace implementation_defined {
 struct digit_chars_t
 {
     constexpr
@@ -74,8 +75,34 @@ struct digit_chars_t
     }
 #endif
 };
+}
 
-constexpr digit_chars_t digit_chars{};
+/** The set of decimal digits
+
+    @par Example
+    Character sets are used with rules and the
+    functions @ref find_if and @ref find_if_not.
+    @code
+    system::result< core::string_view > rv = parse( "2022", token_rule( digit_chars ) );
+    @endcode
+
+    @par BNF
+    @code
+    DIGIT       = %x30-39
+                ; 0-9
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#appendix-B.1"
+        >B.1. Core Rules (rfc5234)</a>
+
+    @see
+        @ref find_if,
+        @ref find_if_not,
+        @ref parse,
+        @ref token_rule.
+*/
+constexpr implementation_defined::digit_chars_t digit_chars{};
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/hexdig_chars.hpp b/inst/include/boost/url/grammar/hexdig_chars.hpp
index 2f34f30e2..abfcc3a25 100644
--- a/inst/include/boost/url/grammar/hexdig_chars.hpp
+++ b/inst/include/boost/url/grammar/hexdig_chars.hpp
@@ -58,6 +58,7 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ hexdig_chars;
 #else
+namespace implementation_defined {
 struct hexdig_chars_t
 {
     /** Return true if c is in the character set.
@@ -92,8 +93,47 @@ struct hexdig_chars_t
     }
 #endif
 };
+}
+
+/** The set of hexadecimal digits
+
+    @par Example
+    Character sets are used with rules and the
+    functions @ref find_if and @ref find_if_not.
+    @code
+    system::result< core::string_view > rv = parse( "8086FC19", token_rule( hexdig_chars ) );
+    @endcode
 
-constexpr hexdig_chars_t hexdig_chars{};
+    @par BNF
+    @code
+    HEXDIG      = DIGIT
+                / "A" / "B" / "C" / "D" / "E" / "F"
+                / "a" / "b" / "c" / "d" / "e" / "f"
+    @endcode
+
+    @note The RFCs are inconsistent on the case
+    sensitivity of hexadecimal digits. Existing
+    uses suggest case-insensitivity is a de-facto
+    standard.
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#appendix-B.1"
+        >B.1. Core Rules (rfc5234)</a>
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc7230#section-1.2"
+        >1.2. Syntax Notation (rfc7230)</a>
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5952#section-2.3"
+        >2.3. Uppercase or Lowercase (rfc5952)</a>
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5952#section-4.3"
+        >4.3. Lowercase (rfc5952)</a>
+
+    @see
+        @ref find_if,
+        @ref find_if_not,
+        @ref hexdig_value,
+        @ref parse,
+        @ref token_rule.
+*/
+constexpr implementation_defined::hexdig_chars_t hexdig_chars{};
 #endif
 
 // VFALCO We can declare
diff --git a/inst/include/boost/url/grammar/impl/not_empty_rule.hpp b/inst/include/boost/url/grammar/impl/not_empty_rule.hpp
index 6831558ad..87beabab6 100644
--- a/inst/include/boost/url/grammar/impl/not_empty_rule.hpp
+++ b/inst/include/boost/url/grammar/impl/not_empty_rule.hpp
@@ -17,6 +17,7 @@ namespace boost {
 namespace urls {
 namespace grammar {
 
+namespace implementation_defined {
 template<class R>
 auto
 not_empty_rule_t<R>::
@@ -47,6 +48,7 @@ parse(
     // value
     return rv;
 }
+}
 
 } // grammar
 } // urls
diff --git a/inst/include/boost/url/grammar/impl/optional_rule.hpp b/inst/include/boost/url/grammar/impl/optional_rule.hpp
index 8e12565c2..8bc7bf5c7 100644
--- a/inst/include/boost/url/grammar/impl/optional_rule.hpp
+++ b/inst/include/boost/url/grammar/impl/optional_rule.hpp
@@ -18,7 +18,7 @@ namespace grammar {
 
 template<class R>
 auto
-optional_rule_t<R>::
+implementation_defined::optional_rule_t<R>::
 parse(
     char const*& it,
     char const* end) const ->
diff --git a/inst/include/boost/url/grammar/impl/range_rule.hpp b/inst/include/boost/url/grammar/impl/range_rule.hpp
index 42806502a..06513e342 100644
--- a/inst/include/boost/url/grammar/impl/range_rule.hpp
+++ b/inst/include/boost/url/grammar/impl/range_rule.hpp
@@ -600,7 +600,7 @@ end() const noexcept ->
 
 template<class R>
 auto
-range_rule_t<R>::
+implementation_defined::range_rule_t<R>::
 parse(
     char const*& it,
     char const* end) const ->
@@ -669,7 +669,7 @@ parse(
 
 template<class R0, class R1>
 auto
-range_rule_t<R0, R1>::
+implementation_defined::range_rule_t<R0, R1>::
 parse(
     char const*& it,
     char const* end) const ->
diff --git a/inst/include/boost/url/grammar/impl/recycled.hpp b/inst/include/boost/url/grammar/impl/recycled.hpp
index 03ed208d0..4392381cc 100644
--- a/inst/include/boost/url/grammar/impl/recycled.hpp
+++ b/inst/include/boost/url/grammar/impl/recycled.hpp
@@ -36,7 +36,7 @@ recycled<T>::
         delete it;
         it = next;
     }
-    detail::recycled_remove(
+    see_below::recycled_remove(
         sizeof(U) * n);
 }
 
@@ -57,7 +57,7 @@ acquire() ->
         {
             // reuse
             head_ = head_->next;
-            detail::recycled_remove(
+            see_below::recycled_remove(
                 sizeof(U));
             ++p->refs;
         }
@@ -85,7 +85,7 @@ release(U* u) noexcept
         u->next = head_;
         head_ = u;
     }
-    detail::recycled_add(
+    see_below::recycled_add(
         sizeof(U));
 }
 
diff --git a/inst/include/boost/url/grammar/impl/token_rule.hpp b/inst/include/boost/url/grammar/impl/token_rule.hpp
index da01ddaf5..76945aee2 100644
--- a/inst/include/boost/url/grammar/impl/token_rule.hpp
+++ b/inst/include/boost/url/grammar/impl/token_rule.hpp
@@ -18,7 +18,7 @@ namespace grammar {
 
 template<class CharSet>
 auto
-token_rule_t<CharSet>::
+implementation_defined::token_rule_t<CharSet>::
 parse(
     char const*& it,
     char const* end
diff --git a/inst/include/boost/url/grammar/impl/tuple_rule.hpp b/inst/include/boost/url/grammar/impl/tuple_rule.hpp
index 7d90d38b2..b713696c2 100644
--- a/inst/include/boost/url/grammar/impl/tuple_rule.hpp
+++ b/inst/include/boost/url/grammar/impl/tuple_rule.hpp
@@ -142,7 +142,7 @@ struct parse_sequence
 
     auto
     make_result() noexcept ->
-        system::result<typename tuple_rule_t<
+        system::result<typename implementation_defined::tuple_rule_t<
             R0, Rn...>::value_type>
     {
         if(ec.failed())
@@ -266,7 +266,7 @@ template<
     class R0,
     class... Rn>
 auto
-tuple_rule_t<R0, Rn...>::
+implementation_defined::tuple_rule_t<R0, Rn...>::
 parse(
     char const*& it,
     char const* end) const ->
diff --git a/inst/include/boost/url/grammar/impl/variant_rule.hpp b/inst/include/boost/url/grammar/impl/variant_rule.hpp
index 26db32b23..407c437a0 100644
--- a/inst/include/boost/url/grammar/impl/variant_rule.hpp
+++ b/inst/include/boost/url/grammar/impl/variant_rule.hpp
@@ -35,7 +35,7 @@ parse_variant(
     std::integral_constant<
         std::size_t, I> const&,
     std::false_type const&) ->
-        system::result<variant<
+        system::result<variant2::variant<
             typename R0::value_type,
             typename Rn::value_type...>>
 {
@@ -57,7 +57,7 @@ parse_variant(
     std::integral_constant<
         std::size_t, I> const&,
     std::true_type const&) ->
-        system::result<variant<
+        system::result<variant2::variant<
             typename R0::value_type,
             typename Rn::value_type...>>
 {
@@ -65,7 +65,7 @@ parse_variant(
     auto rv = parse(
         it, end, get<I>(rn));
     if( rv )
-        return variant<
+        return variant2::variant<
             typename R0::value_type,
             typename Rn::value_type...>{
                 variant2::in_place_index_t<I>{}, *rv};
@@ -83,7 +83,7 @@ parse_variant(
 
 template<class R0, class... Rn>
 auto
-variant_rule_t<R0, Rn...>::
+implementation_defined::variant_rule_t<R0, Rn...>::
 parse(
     char const*& it,
     char const* end) const ->
@@ -104,7 +104,7 @@ constexpr
 variant_rule(
     R0 const& r0,
     Rn const&... rn) noexcept ->
-        variant_rule_t<R0, Rn...>
+        implementation_defined::variant_rule_t<R0, Rn...>
 {
     return { r0, rn... };
 }
diff --git a/inst/include/boost/url/grammar/lut_chars.hpp b/inst/include/boost/url/grammar/lut_chars.hpp
index 0454a8a99..8cd448a5e 100644
--- a/inst/include/boost/url/grammar/lut_chars.hpp
+++ b/inst/include/boost/url/grammar/lut_chars.hpp
@@ -116,8 +116,8 @@ class lut_chars
         unsigned char ch) noexcept
     {
         return ch == 255
-            ? construct(ch, pred(ch))
-            : construct(ch, pred(ch)) +
+            ? construct(ch, pred(static_cast<char>(ch)))
+            : construct(ch, pred(static_cast<char>(ch))) +
                 construct(pred, ch + 1);
     }
 
@@ -257,6 +257,14 @@ class lut_chars
     bool
     operator()(
         unsigned char ch) const noexcept
+    {
+        return operator()(static_cast<char>(ch));
+    }
+
+    /// @copydoc operator()(unsigned char) const
+    constexpr
+    bool
+    operator()(char ch) const noexcept
     {
         return mask_[lo(ch)] & hi(ch);
     }
diff --git a/inst/include/boost/url/grammar/not_empty_rule.hpp b/inst/include/boost/url/grammar/not_empty_rule.hpp
index 2aa732d76..81fcb308f 100644
--- a/inst/include/boost/url/grammar/not_empty_rule.hpp
+++ b/inst/include/boost/url/grammar/not_empty_rule.hpp
@@ -49,6 +49,7 @@ constexpr
 __implementation_defined__
 not_empty_rule( Rule r );
 #else
+namespace implementation_defined {
 template<class R>
 struct not_empty_rule_t
 {
@@ -61,15 +62,6 @@ struct not_empty_rule_t
         char const* end) const ->
             system::result<value_type>;
 
-    template<class R_>
-    friend
-    constexpr
-    auto
-    not_empty_rule(
-        R_ const& r) ->
-            not_empty_rule_t<R_>;
-
-private:
     constexpr
     not_empty_rule_t(
         R const& r) noexcept
@@ -77,15 +69,42 @@ struct not_empty_rule_t
     {
     }
 
+private:
     R r_;
 };
+} // implementation_defined
+
+/** Match another rule, if the result is not empty
+
+    This adapts another rule such that
+    when an empty string is successfully
+    parsed, the result is an error.
+
+    @par Value Type
+    @code
+    using value_type = typename Rule::value_type;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< decode_view > rv = parse( "Program%20Files",
+        not_empty_rule( pct_encoded_rule( unreserved_chars ) ) );
+    @endcode
 
+    @param r The rule to match
+
+    @see
+        @ref parse,
+        @ref pct_encoded_rule,
+        @ref unreserved_chars.
+*/
 template<class Rule>
 auto
 constexpr
 not_empty_rule(
     Rule const& r) ->
-        not_empty_rule_t<Rule>
+        implementation_defined::not_empty_rule_t<Rule>
 {
     // If you get a compile error here it
     // means that your rule does not meet
diff --git a/inst/include/boost/url/grammar/optional_rule.hpp b/inst/include/boost/url/grammar/optional_rule.hpp
index c3443f0dc..9ee44a757 100644
--- a/inst/include/boost/url/grammar/optional_rule.hpp
+++ b/inst/include/boost/url/grammar/optional_rule.hpp
@@ -61,6 +61,7 @@ constexpr
 __implementation_defined__
 optional_rule( Rule r ) noexcept;
 #else
+namespace implementation_defined {
 template<class Rule>
 struct optional_rule_t
     : private empty_value<Rule>
@@ -73,15 +74,6 @@ struct optional_rule_t
         char const*& it,
         char const* end) const;
 
-    template<class R_>
-    friend
-    constexpr
-    auto
-    optional_rule(
-        R_ const& r) ->
-            optional_rule_t<R_>;
-
-private:
     constexpr
     optional_rule_t(
         Rule const& r) noexcept
@@ -91,13 +83,49 @@ struct optional_rule_t
     {
     }
 };
+} // implementation_defined
+
+/** Match a rule, or the empty string
+
+    Optional BNF elements are denoted with
+    square brackets. If the specified rule
+    returns any error it is treated as if
+    the rule did not match.
 
+    @par Value Type
+    @code
+    using value_type = optional< typename Rule::value_type >;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< optional< core::string_view > > rv = parse( "", optional_rule( token_rule( alpha_chars ) ) );
+    @endcode
+
+    @par BNF
+    @code
+    optional     = [ rule ]
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#section-3.8"
+        >3.8.  Optional Sequence (rfc5234)</a>
+
+    @param r The rule to match
+
+    @see
+        @ref alpha_chars,
+        @ref parse,
+        @ref optional,
+        @ref token_rule.
+*/
 template<class Rule>
 auto
 constexpr
 optional_rule(
     Rule const& r) ->
-        optional_rule_t<Rule>
+        implementation_defined::optional_rule_t<Rule>
 {
     return { r };
 }
diff --git a/inst/include/boost/url/grammar/parse.hpp b/inst/include/boost/url/grammar/parse.hpp
index c5491d69f..924b6ecec 100644
--- a/inst/include/boost/url/grammar/parse.hpp
+++ b/inst/include/boost/url/grammar/parse.hpp
@@ -33,9 +33,6 @@ namespace grammar {
 
     @return The parsed value upon success,
     otherwise an error.
-
-    @see
-        @ref result.
 */
 template<class Rule>
 system::result<typename Rule::value_type>
@@ -57,9 +54,6 @@ parse(
 
     @return The parsed value upon success,
     otherwise an error.
-
-    @see
-        @ref result.
 */
 template<class Rule>
 system::result<typename Rule::value_type>
@@ -70,7 +64,7 @@ parse(
 //------------------------------------------------
 
 #ifndef BOOST_URL_DOCS
-namespace detail {
+namespace implementation_defined {
 
 template<class Rule>
 struct rule_ref
@@ -109,24 +103,46 @@ struct rule_ref
 
     @param r The rule to use
 */
+#ifdef BOOST_URL_DOCS
 template<class Rule>
 constexpr
-#ifdef BOOST_URL_DOCS
 __implementation_defined__
+ref(Rule const& r) noexcept;
 #else
+
+/** Return a reference to a rule
+
+    This function returns a rule which
+    references the specified object. This is
+    used to reduce the number of bytes of
+    storage (`sizeof`) required by a combinator
+    when it stores a copy of the object.
+    <br>
+    Ownership of the object is not transferred;
+    the caller is responsible for ensuring the
+    lifetime of the object is extended until it
+    is no longer referenced. For best results,
+    `ref` should only be used with compile-time
+    constants.
+
+    @param r The rule to use
+*/
+template<class Rule>
+constexpr
 typename std::enable_if<
     is_rule<Rule>::value &&
     ! std::is_same<Rule,
-        detail::rule_ref<Rule> >::value,
-    detail::rule_ref<Rule> >::type
-#endif
+        implementation_defined::rule_ref<Rule> >::value,
+    implementation_defined::rule_ref<Rule> >::type
 ref(Rule const& r) noexcept
 {
-    return detail::rule_ref<
+    return implementation_defined::rule_ref<
         Rule>{r};
 }
+#endif
 
 #ifndef BOOST_URL_DOCS
+#ifndef BOOST_URL_MRDOCS
 // If you get a compile error here it
 // means you called ref with something
 // that is not a CharSet or Rule!
@@ -134,6 +150,7 @@ constexpr
 void
 ref(...) = delete;
 #endif
+#endif
 
 } // grammar
 } // urls
diff --git a/inst/include/boost/url/grammar/range_rule.hpp b/inst/include/boost/url/grammar/range_rule.hpp
index 24d99af0f..e8f1a5f86 100644
--- a/inst/include/boost/url/grammar/range_rule.hpp
+++ b/inst/include/boost/url/grammar/range_rule.hpp
@@ -19,12 +19,15 @@
 #include <cstddef>
 #include <iterator>
 #include <type_traits>
-
 #include <stddef.h> // ::max_align_t
 
 namespace boost {
 namespace urls {
 namespace grammar {
+namespace implementation_defined {
+template<class R0, class R1>
+struct range_rule_t;
+} // implementation_defined
 
 /** A forward range of parsed elements
 
@@ -96,7 +99,7 @@ class range
 
     template<
         class R0, class R1>
-    friend struct range_rule_t;
+    friend struct implementation_defined::range_rule_t;
 
     any_rule&
     get() noexcept
@@ -205,7 +208,7 @@ class range
     */
     range(range const&) noexcept;
 
-    /** Constructor
+    /** Assignment
 
         After the move, this references the
         same underlying character buffer. Ownership
@@ -273,10 +276,12 @@ class range
 //------------------------------------------------
 
 #ifndef BOOST_URL_DOCS
+namespace implementation_defined {
 template<
     class R0,
     class R1 = void>
 struct range_rule_t;
+}
 #endif
 
 //------------------------------------------------
@@ -355,6 +360,7 @@ range_rule(
     std::size_t M =
         std::size_t(-1)) noexcept;
 #else
+namespace implementation_defined {
 template<class R>
 struct range_rule_t<R>
 {
@@ -366,7 +372,6 @@ struct range_rule_t<R>
         char const*& it,
         char const* end) const;
 
-private:
     constexpr
     range_rule_t(
         R const& next,
@@ -378,23 +383,80 @@ struct range_rule_t<R>
     {
     }
 
-    template<class R_>
-    friend
-    constexpr
-    range_rule_t<R_>
-    range_rule(
-        R_ const& next,
-        std::size_t N,
-        std::size_t M) noexcept;
-
+private:
     R const next_;
     std::size_t N_;
     std::size_t M_;
 };
+} // implementation_defined
+
+/** Match a repeating number of elements
+
+    Elements are matched using the passed rule.
+    <br>
+    Normally when the rule returns an error,
+    the range ends and the input is rewound to
+    one past the last character that matched
+    successfully. However, if the rule returns
+    the special value @ref error::end_of_range, the
+    input is not rewound. This allows for rules
+    which consume input without producing
+    elements in the range. For example, to
+    relax the grammar for a comma-delimited
+    list by allowing extra commas in between
+    elements.
+
+    @par Value Type
+    @code
+    using value_type = range< typename Rule::value_type >;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    // range    = 1*( ";" token )
+
+    system::result< range<core::string_view> > rv = parse( ";alpha;xray;charlie",
+        range_rule(
+            tuple_rule(
+                squelch( delim_rule( ';' ) ),
+                token_rule( alpha_chars ) ),
+            1 ) );
+    @endcode
+
+    @par BNF
+    @code
+    range        = <N>*<M>next
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#section-3.6"
+        >3.6.  Variable Repetition (rfc5234)</a>
 
+    @param next The rule to use for matching
+    each element. The range extends until this
+    rule returns an error.
+
+    @param N The minimum number of elements for
+    the range to be valid. If omitted, this
+    defaults to zero.
+
+    @param M The maximum number of elements for
+    the range to be valid. If omitted, this
+    defaults to unlimited.
+
+    @see
+        @ref alpha_chars,
+        @ref delim_rule,
+        @ref error::end_of_range,
+        @ref parse,
+        @ref range,
+        @ref tuple_rule,
+        @ref squelch.
+*/
 template<class Rule>
 constexpr
-range_rule_t<Rule>
+implementation_defined::range_rule_t<Rule>
 range_rule(
     Rule const& next,
     std::size_t N = 0,
@@ -409,7 +471,7 @@ range_rule(
         is_rule<Rule>::value,
         "Rule requirements not met");
 
-    return range_rule_t<Rule>{
+    return implementation_defined::range_rule_t<Rule>{
         next, N, M};
 }
 #endif
@@ -500,6 +562,7 @@ range_rule(
     std::size_t M =
         std::size_t(-1)) noexcept;
 #else
+namespace implementation_defined {
 template<class R0, class R1>
 struct range_rule_t
 {
@@ -511,7 +574,6 @@ struct range_rule_t
         char const*& it,
         char const* end) const;
 
-private:
     constexpr
     range_rule_t(
         R0 const& first,
@@ -525,30 +587,86 @@ struct range_rule_t
     {
     }
 
-    template<
-        class R0_, class R1_>
-    friend
-    constexpr
-    auto
-    range_rule(
-        R0_ const& first,
-        R1_ const& next,
-        std::size_t N,
-        std::size_t M) noexcept ->
-#if 1
-            typename std::enable_if<
-                ! std::is_integral<R1_>::value,
-                range_rule_t<R0_, R1_>>::type;
-#else
-        range_rule_t<R0_, R1_>;
-#endif
-
+private:
     R0 const first_;
     R1 const next_;
     std::size_t N_;
     std::size_t M_;
 };
+} // implementation_defined
+
+/** Match a repeating number of elements
+
+    Two rules are used for match. The rule
+    `first` is used for matching the first
+    element, while the `next` rule is used
+    to match every subsequent element.
+    <br>
+    Normally when the rule returns an error,
+    the range ends and the input is rewound to
+    one past the last character that matched
+    successfully. However, if the rule returns
+    the special value @ref error::end_of_range, the
+    input is not rewound. This allows for rules
+    which consume input without producing
+    elements in the range. For example, to
+    relax the grammar for a comma-delimited
+    list by allowing extra commas in between
+    elements.
+
+    @par Value Type
+    @code
+    using value_type = range< typename Rule::value_type >;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    // range    = [ token ] *( "," token )
+
+    system::result< range< core::string_view > > rv = parse( "whiskey,tango,foxtrot",
+        range_rule(
+            token_rule( alpha_chars ),          // first
+            tuple_rule(                      // next
+                squelch( delim_rule(',') ),
+                token_rule( alpha_chars ) ) ) );
+    @endcode
+
+    @par BNF
+    @code
+    range       = <1>*<1>first
+                / first <N-1>*<M-1>next
+    @endcode
 
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#section-3.6"
+        >3.6.  Variable Repetition (rfc5234)</a>
+
+    @param first The rule to use for matching
+    the first element. If this rule returns
+    an error, the range is empty.
+
+    @param next The rule to use for matching
+    each subsequent element. The range extends
+    until this rule returns an error.
+
+    @param N The minimum number of elements for
+    the range to be valid. If omitted, this
+    defaults to zero.
+
+    @param M The maximum number of elements for
+    the range to be valid. If omitted, this
+    defaults to unlimited.
+
+    @see
+        @ref alpha_chars,
+        @ref delim_rule,
+        @ref error::end_of_range,
+        @ref parse,
+        @ref range,
+        @ref tuple_rule,
+        @ref squelch.
+*/
 template<
     class Rule1, class Rule2>
 constexpr
@@ -562,7 +680,7 @@ range_rule(
 #if 1
     typename std::enable_if<
         ! std::is_integral<Rule2>::value,
-        range_rule_t<Rule1, Rule2>>::type
+        implementation_defined::range_rule_t<Rule1, Rule2>>::type
 #else
     range_rule_t<Rule1, Rule2>
 #endif
@@ -588,7 +706,7 @@ range_rule(
             typename Rule2::value_type>::value,
         "Rule requirements not met");
 
-    return range_rule_t<Rule1, Rule2>{
+    return implementation_defined::range_rule_t<Rule1, Rule2>{
         first, next, N, M};
 }
 #endif
diff --git a/inst/include/boost/url/grammar/recycled.hpp b/inst/include/boost/url/grammar/recycled.hpp
index 504605dc4..277654e22 100644
--- a/inst/include/boost/url/grammar/recycled.hpp
+++ b/inst/include/boost/url/grammar/recycled.hpp
@@ -40,10 +40,25 @@ struct aligned_storage
     void const* addr() const noexcept;
 };
 #else
+/** Provides an aligned storage buffer aligned for T
+
+    @code
+    template<class T>
+    struct aligned_storage
+    {
+        /// Return a pointer to the aligned storage area
+        void* addr() noexcept;
+
+        /// Return a pointer to the aligned storage area
+        void const* addr() const noexcept;
+    };
+    @endcode
+
+ */
 template<class T>
 using aligned_storage =
-    detail::aligned_storage_impl<
-        detail::nearest_pow2(sizeof(T), 64),
+    see_below::aligned_storage_impl<
+        see_below::nearest_pow2(sizeof(T), 64),
             (alignof(::max_align_t) > alignof(T)) ?
                 alignof(::max_align_t) : alignof(T)>;
 #endif
@@ -123,7 +138,7 @@ class recycled
 
 //------------------------------------------------
 
-/** A pointer to shared instance of T
+/** A pointer to a shared instance of T
 
     This is a smart pointer container which can
     acquire shared ownership of an instance of
diff --git a/inst/include/boost/url/grammar/string_token.hpp b/inst/include/boost/url/grammar/string_token.hpp
index 442ac7b69..a7830cb47 100644
--- a/inst/include/boost/url/grammar/string_token.hpp
+++ b/inst/include/boost/url/grammar/string_token.hpp
@@ -67,12 +67,22 @@ struct arg
     */
     virtual char* prepare(std::size_t n) = 0;
 
-    // prevent misuse
+    /// Virtual destructor
     virtual ~arg() = default;
+
+    /// Default constructor
     arg() = default;
+
+    /// Default move constructor
     arg(arg&&) = default;
+
+    /// Deleted copy constructor
     arg(arg const&) = delete;
+
+    /// Deleted move assignment
     arg& operator=(arg&&) = delete;
+
+    /// Deleted copy assignment
     arg& operator=(arg const&) = delete;
 };
 
@@ -84,9 +94,14 @@ struct arg
 template<class T>
 using is_token = __see_below__;
 #else
+namespace see_below {
+/** Metafunction returning true if T is a StringToken
+ */
 template<class T, class = void>
 struct is_token : std::false_type {};
 
+/** Metafunction returning true if T is a StringToken
+ */
 template<class T>
 struct is_token<T, void_t<
     decltype(std::declval<T&>().prepare(
@@ -105,6 +120,12 @@ struct is_token<T, void_t<
     >
 {
 };
+} // see_below
+
+/** Metafunction returning true if T is a StringToken
+ */
+template<class T>
+using is_token = see_below::is_token<T>;
 #endif
 
 //------------------------------------------------
@@ -114,6 +135,7 @@ struct is_token<T, void_t<
 #ifdef BOOST_URL_DOCS
 using return_string = __implementation_defined__;
 #else
+namespace implementation_defined {
 struct return_string
     : arg
 {
@@ -135,6 +157,11 @@ struct return_string
 private:
     result_type s_;
 };
+} // implementation_defined
+
+/** A token for returning a plain string
+ */
+using return_string = implementation_defined::return_string;
 #endif
 
 //------------------------------------------------
@@ -152,6 +179,7 @@ append_to(
         std::char_traits<char>,
         Allocator>& s);
 #else
+namespace implementation_defined {
 template<class Alloc>
 struct append_to_t
     : arg
@@ -188,18 +216,21 @@ struct append_to_t
 private:
     string_type& s_;
 };
+} // implementation_defined
 
+/** Create a token for appending to a plain string
+ */
 template<
     class Alloc =
         std::allocator<char>>
-append_to_t<Alloc>
+implementation_defined::append_to_t<Alloc>
 append_to(
     std::basic_string<
         char,
         std::char_traits<char>,
         Alloc>& s)
 {
-    return append_to_t<Alloc>(s);
+    return implementation_defined::append_to_t<Alloc>(s);
 }
 #endif
 
@@ -218,6 +249,7 @@ assign_to(
         std::char_traits<char>,
         Allocator>& s);
 #else
+namespace implementation_defined {
 template<class Alloc>
 struct assign_to_t
     : arg
@@ -251,18 +283,21 @@ struct assign_to_t
 private:
     string_type& s_;
 };
+} // implementation_defined
 
+/** A token for assigning to a plain string
+ */
 template<
     class Alloc =
         std::allocator<char>>
-assign_to_t<Alloc>
+implementation_defined::assign_to_t<Alloc>
 assign_to(
     std::basic_string<
         char,
         std::char_traits<char>,
         Alloc>& s)
 {
-    return assign_to_t<Alloc>(s);
+    return implementation_defined::assign_to_t<Alloc>(s);
 }
 #endif
 
@@ -281,6 +316,7 @@ preserve_size(
         std::char_traits<char>,
         Allocator>& s);
 #else
+namespace implementation_defined {
 template<class Alloc>
 struct preserve_size_t
     : arg
@@ -320,18 +356,21 @@ struct preserve_size_t
     string_type& s_;
     std::size_t n_ = 0;
 };
+} // implementation_defined
 
+/** A token for producing a durable core::string_view from a temporary string
+ */
 template<
     class Alloc =
         std::allocator<char>>
-preserve_size_t<Alloc>
+implementation_defined::preserve_size_t<Alloc>
 preserve_size(
     std::basic_string<
         char,
         std::char_traits<char>,
         Alloc>& s)
 {
-    return preserve_size_t<Alloc>(s);
+    return implementation_defined::preserve_size_t<Alloc>(s);
 }
 #endif
 
diff --git a/inst/include/boost/url/grammar/string_view_base.hpp b/inst/include/boost/url/grammar/string_view_base.hpp
index c623d9f0b..9be943f3e 100644
--- a/inst/include/boost/url/grammar/string_view_base.hpp
+++ b/inst/include/boost/url/grammar/string_view_base.hpp
@@ -190,9 +190,7 @@ class string_view_base
 
         See `core::string_view::rbegin`
     */
-#ifdef __cpp_lib_array_constexpr
-    constexpr
-#endif
+    BOOST_URL_LIB_ARRAY_CONSTEXPR
     const_reverse_iterator rbegin() const noexcept
     {
         return s_.rbegin();
@@ -202,9 +200,7 @@ class string_view_base
 
         See `core::string_view::rend`
     */
-#ifdef __cpp_lib_array_constexpr
-    constexpr
-#endif
+    BOOST_URL_LIB_ARRAY_CONSTEXPR
     const_reverse_iterator rend() const noexcept
     {
         return s_.rend();
@@ -214,9 +210,7 @@ class string_view_base
 
         See `core::string_view::crbegin`
     */
-#ifdef __cpp_lib_array_constexpr
-    constexpr
-#endif
+    BOOST_URL_LIB_ARRAY_CONSTEXPR
     const_reverse_iterator crbegin() const noexcept
     {
         return s_.crbegin();
@@ -226,9 +220,7 @@ class string_view_base
 
         See `core::string_view::crend`
     */
-#ifdef __cpp_lib_array_constexpr
-    constexpr
-#endif
+    BOOST_URL_LIB_ARRAY_CONSTEXPR
     const_reverse_iterator crend() const noexcept
     {
         return s_.crend();
@@ -772,6 +764,12 @@ class string_view_base
                 string_view_base const volatile*>::value))>;
 public:
 
+    /// Compare two string views for equality
+    /**
+     * This function is only enabled if both arguments
+     * are convertible to `core::string_view` and at least
+     * one of the arguments is derived from `string_view_base`.
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator==(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -781,6 +779,12 @@ class string_view_base
         return urls::detail::to_sv(s0) == urls::detail::to_sv(s1);
     }
 
+    /// Compare two string views for inequality
+    /**
+     * This function is only enabled if both arguments
+     * are convertible to `core::string_view` and at least
+     * one of the arguments is derived from `string_view_base`.
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator!=(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -790,6 +794,12 @@ class string_view_base
         return urls::detail::to_sv(s0) != urls::detail::to_sv(s1);
     }
 
+    /// Compare two string views for less than
+    /**
+     * This function is only enabled if both arguments
+     * are convertible to `core::string_view` and at least
+     * one of the arguments is derived from `string_view_base`.
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator<(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -799,6 +809,12 @@ class string_view_base
         return urls::detail::to_sv(s0) < urls::detail::to_sv(s1);
     }
 
+    /// Compare two string views for less than or equal
+    /**
+     * This function is only enabled if both arguments
+     * are convertible to `core::string_view` and at least
+     * one of the arguments is derived from `string_view_base`.
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator<=(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -808,6 +824,12 @@ class string_view_base
         return urls::detail::to_sv(s0) <= urls::detail::to_sv(s1);
     }
 
+    /// Compare two string views for greater than
+    /**
+     * This function is only enabled if both arguments
+     * are convertible to `core::string_view` and at least
+     * one of the arguments is derived from `string_view_base`.
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator>(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -817,6 +839,12 @@ class string_view_base
         return urls::detail::to_sv(s0) > urls::detail::to_sv(s1);
     }
 
+    /// Compare two string views for greater than or equal
+    /**
+     * This function is only enabled if both arguments
+     * are convertible to `core::string_view` and at least
+     * one of the arguments is derived from `string_view_base`.
+     */
     template<class S0, class S1>
     BOOST_CXX14_CONSTEXPR friend auto operator>=(
         S0 const& s0, S1 const& s1) noexcept ->
@@ -839,6 +867,8 @@ class string_view_base
         return hash_value(s.s_);
     }
 
+    /** Format a string to an output stream
+     */
     BOOST_URL_DECL
     friend
     std::ostream&
diff --git a/inst/include/boost/url/grammar/token_rule.hpp b/inst/include/boost/url/grammar/token_rule.hpp
index 323906f41..44e655aa3 100644
--- a/inst/include/boost/url/grammar/token_rule.hpp
+++ b/inst/include/boost/url/grammar/token_rule.hpp
@@ -53,6 +53,7 @@ __implementation_defined__
 token_rule(
     CharSet cs) noexcept;
 #else
+namespace implementation_defined {
 template<class CharSet>
 struct token_rule_t
 {
@@ -69,15 +70,6 @@ struct token_rule_t
             ) const noexcept ->
         system::result<value_type>;
 
-private:
-    template<class CharSet_>
-    friend
-    constexpr
-    auto
-    token_rule(
-        CharSet_ const&) noexcept ->
-            token_rule_t<CharSet_>;
-
     constexpr
     token_rule_t(
         CharSet const& cs) noexcept
@@ -85,15 +77,44 @@ struct token_rule_t
     {
     }
 
+private:
     CharSet const cs_;
 };
+}
+
+/** Match a non-empty string of characters from a set
 
+    If there is no more input, the error code
+    @ref error::need_more is returned.
+
+    @par Value Type
+    @code
+    using value_type = core::string_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< core::string_view > rv = parse( "abcdef", token_rule( alpha_chars ) );
+    @endcode
+
+    @par BNF
+    @code
+    token     = 1*( ch )
+    @endcode
+
+    @param cs The character set to use
+
+    @see
+        @ref alpha_chars,
+        @ref parse.
+*/
 template<class CharSet>
 constexpr
 auto
 token_rule(
     CharSet const& cs) noexcept ->
-        token_rule_t<CharSet>
+        implementation_defined::token_rule_t<CharSet>
 {
     return {cs};
 }
diff --git a/inst/include/boost/url/grammar/tuple_rule.hpp b/inst/include/boost/url/grammar/tuple_rule.hpp
index 9b8fdea77..47c2dc88d 100644
--- a/inst/include/boost/url/grammar/tuple_rule.hpp
+++ b/inst/include/boost/url/grammar/tuple_rule.hpp
@@ -83,6 +83,7 @@ constexpr
 __implementation_defined__
 tuple_rule( Rules... rn ) noexcept;
 #else
+namespace implementation_defined {
 template<
     class R0,
     class... Rn>
@@ -103,23 +104,6 @@ class tuple_rule_t
         mp11::mp_eval_if_c<IsList,
             T, mp11::mp_first, T>;
 
-    template<
-        class R0_,
-        class... Rn_>
-    friend
-    constexpr
-    auto
-    tuple_rule(
-        R0_ const& r0,
-        Rn_ const&... rn) noexcept ->
-            tuple_rule_t<R0_, Rn_...>;
-
-    system::result<value_type>
-    parse(
-        char const*& it,
-        char const* end) const;
-
-private:
     constexpr
     tuple_rule_t(
         R0 const& r0,
@@ -130,8 +114,70 @@ class tuple_rule_t
                 r0, rn...)
     {
     }
+
+    system::result<value_type>
+    parse(
+        char const*& it,
+        char const* end) const;
+
 };
+} // implementation_defined
+
+/** Match a series of rules in order
+
+    This matches a series of rules in the
+    order specified. Upon success the input
+    is adjusted to point to the first
+    unconsumed character. There is no
+    implicit specification of linear white
+    space between each rule.
+
+    @par Value Type
+    @code
+    using value_type = __see_below__;
+    @endcode
+
+    The sequence rule usually returns a
+    `std::tuple` containing the the `value_type`
+    of each corresponding rule in the sequence,
+    except that `void` values are removed.
+    However, if there is exactly one non-void
+    value type `T`, then the sequence rule
+    returns `system::result<T>` instead of
+    `system::result<tuple<...>>`.
 
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< std::tuple< unsigned char, unsigned char, unsigned char, unsigned char > > rv =
+        parse( "192.168.0.1",
+            tuple_rule(
+                dec_octet_rule,
+                squelch( delim_rule('.') ),
+                dec_octet_rule,
+                squelch( delim_rule('.') ),
+                dec_octet_rule,
+                squelch( delim_rule('.') ),
+                dec_octet_rule ) );
+    @endcode
+
+    @par BNF
+    @code
+    sequence     = rule1 rule2 rule3...
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#section-3.1"
+        >3.1.  Concatenation (rfc5234)</a>
+
+    @param rn A list of one or more rules to match
+
+    @see
+        @ref dec_octet_rule,
+        @ref delim_rule,
+        @ref parse,
+        @ref squelch.
+*/
 template<
     class R0,
     class... Rn>
@@ -140,7 +186,7 @@ auto
 tuple_rule(
     R0 const& r0,
     Rn const&... rn) noexcept ->
-        tuple_rule_t<
+        implementation_defined::tuple_rule_t<
             R0, Rn...>
 {
     return { r0, rn... };
@@ -148,7 +194,7 @@ tuple_rule(
 #endif
 
 #ifndef BOOST_URL_DOCS
-namespace detail {
+namespace implementation_defined {
 
 template<class Rule>
 struct squelch_rule_t
@@ -176,7 +222,7 @@ struct squelch_rule_t
     }
 };
 
-} // detail
+} // implementation_defined
 #endif
 
 /** Squelch the value of a rule
@@ -229,11 +275,7 @@ struct squelch_rule_t
 */
 template<class Rule>
 constexpr
-#ifdef BOOST_URL_DOCS
-__implementation_defined__
-#else
-detail::squelch_rule_t<Rule>
-#endif
+BOOST_URL_IMPLEMENTATION_DEFINED(implementation_defined::squelch_rule_t<Rule>)
 squelch( Rule const& r ) noexcept
 {
     return { r };
diff --git a/inst/include/boost/url/grammar/type_traits.hpp b/inst/include/boost/url/grammar/type_traits.hpp
index f40fd4986..6df51b796 100644
--- a/inst/include/boost/url/grammar/type_traits.hpp
+++ b/inst/include/boost/url/grammar/type_traits.hpp
@@ -18,6 +18,22 @@ namespace boost {
 namespace urls {
 namespace grammar {
 
+namespace see_below
+{
+template<class T, class = void>
+struct is_rule : std::false_type {};
+
+template<class T>
+struct is_rule<T, void_t<decltype(
+    std::declval<system::result<typename T::value_type>&>() =
+        std::declval<T const&>().parse(
+            std::declval<char const*&>(),
+            std::declval<char const*>())
+    )>> : std::is_nothrow_copy_constructible<T>
+{
+};
+}
+
 /** Determine if T meets the requirements of Rule
 
     This is an alias for `std::true_type` if
@@ -43,23 +59,8 @@ namespace grammar {
     @see
         @ref parse.
 */
-#ifdef BOOST_URL_DOCS
 template<class T>
-using is_rule = __see_below__;
-#else
-template<class T, class = void>
-struct is_rule : std::false_type {};
-
-template<class T>
-struct is_rule<T, void_t<decltype(
-    std::declval<system::result<typename T::value_type>&>() =
-        std::declval<T const&>().parse(
-            std::declval<char const*&>(),
-            std::declval<char const*>())
-    )>> : std::is_nothrow_copy_constructible<T>
-{
-};
-#endif
+using is_rule = BOOST_URL_SEE_BELOW(see_below::is_rule<T>);
 
 } // grammar
 } // urls
diff --git a/inst/include/boost/url/grammar/unsigned_rule.hpp b/inst/include/boost/url/grammar/unsigned_rule.hpp
index 85ecc8bc6..0f1e20639 100644
--- a/inst/include/boost/url/grammar/unsigned_rule.hpp
+++ b/inst/include/boost/url/grammar/unsigned_rule.hpp
@@ -53,6 +53,32 @@ namespace grammar {
 template<class Unsigned>
 struct unsigned_rule;
 #else
+/** Match an unsigned decimal
+
+    Extra leading zeroes are disallowed.
+
+    @par Value Type
+    @code
+    using value_type = Unsigned;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    system::result< unsigned short > rv = parse( "32767", unsigned_rule< unsigned short >{} );
+    @endcode
+
+    @par BNF
+    @code
+    unsigned      = "0" / ( ["1"..."9"] *DIGIT )
+    @endcode
+
+    @tparam Unsigned The unsigned integer type used
+    to store the result.
+
+    @see
+        @ref grammar::parse.
+*/
 template<class Unsigned>
 struct unsigned_rule
 {
diff --git a/inst/include/boost/url/grammar/variant_rule.hpp b/inst/include/boost/url/grammar/variant_rule.hpp
index 2e08d5e5c..4a47d5b5c 100644
--- a/inst/include/boost/url/grammar/variant_rule.hpp
+++ b/inst/include/boost/url/grammar/variant_rule.hpp
@@ -73,12 +73,13 @@ constexpr
 __implementation_defined__
 variant_rule( Rules... rn ) noexcept;
 #else
+namespace implementation_defined {
 template<
     class R0, class... Rn>
 class variant_rule_t
 {
 public:
-    using value_type = variant<
+    using value_type = variant2::variant<
         typename R0::value_type,
         typename Rn::value_type...>;
 
@@ -88,18 +89,6 @@ class variant_rule_t
         char const* end) const ->
             system::result<value_type>;
 
-    template<
-        class R0_,
-        class... Rn_>
-    friend
-    constexpr
-    auto
-    variant_rule(
-        R0_ const& r0,
-        Rn_ const&... rn) noexcept ->
-            variant_rule_t<R0_, Rn_...>;
-
-private:
     constexpr
     variant_rule_t(
         R0 const& r0,
@@ -108,9 +97,60 @@ class variant_rule_t
     {
     }
 
+private:
+
     detail::tuple<R0, Rn...> rn_;
 };
+} // implementation_defined
+
+/** Match one of a set of rules
+
+    Each specified rule is tried in sequence.
+    When the first match occurs, the result
+    is stored and returned in the variant. If
+    no match occurs, an error is returned.
+
+    @par Value Type
+    @code
+    using value_type = variant< typename Rules::value_type... >;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref parse.
+    @code
+    // request-target = origin-form
+    //                / absolute-form
+    //                / authority-form
+    //                / asterisk-form
+
+    system::result< variant< url_view, url_view, authority_view, core::string_view > > rv = grammar::parse(
+        "/index.html?width=full",
+        variant_rule(
+            origin_form_rule,
+            absolute_uri_rule,
+            authority_rule,
+            delim_rule('*') ) );
+    @endcode
 
+    @par BNF
+    @code
+    variant     = rule1 / rule2 / rule3...
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#section-3.2"
+        >3.2.  Alternatives (rfc5234)</a>
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc7230#section-5.3"
+        >5.3.  Request Target (rfc7230)</a>
+
+    @see
+        @ref absolute_uri_rule,
+        @ref authority_rule,
+        @ref delim_rule,
+        @ref parse,
+        @ref origin_form_rule,
+        @ref url_view.
+*/
 template<
     class R0,
     class... Rn>
@@ -119,7 +159,7 @@ auto
 variant_rule(
     R0 const& r0,
     Rn const&... rn) noexcept ->
-        variant_rule_t<R0, Rn...>;
+        implementation_defined::variant_rule_t<R0, Rn...>;
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/grammar/vchars.hpp b/inst/include/boost/url/grammar/vchars.hpp
index b325e6df1..63f35f805 100644
--- a/inst/include/boost/url/grammar/vchars.hpp
+++ b/inst/include/boost/url/grammar/vchars.hpp
@@ -45,6 +45,7 @@ namespace grammar {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ vchars;
 #else
+namespace implementation_defined {
 struct vchars_t
 {
     constexpr
@@ -74,8 +75,34 @@ struct vchars_t
     }
 #endif
 };
+} // implementation_defined
 
-constexpr vchars_t vchars{};
+/** The set of visible characters
+
+    @par Example
+    Character sets are used with rules and the
+    functions @ref find_if and @ref find_if_not.
+    @code
+    system::result< core::string_view > rv = parse( "JohnDoe", token_rule( vchars ) );
+    @endcode
+
+    @par BNF
+    @code
+    VCHAR       = 0x21-0x7E
+                ; visible (printing) characters
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc5234#appendix-B.1"
+        >B.1. Core Rules (rfc5234)</a>
+
+    @see
+        @ref find_if,
+        @ref find_if_not,
+        @ref parse,
+        @ref token_rule.
+*/
+constexpr implementation_defined::vchars_t vchars{};
 #endif
 
 } // grammar
diff --git a/inst/include/boost/url/ignore_case.hpp b/inst/include/boost/url/ignore_case.hpp
index 9c326b6b9..ff5472bb1 100644
--- a/inst/include/boost/url/ignore_case.hpp
+++ b/inst/include/boost/url/ignore_case.hpp
@@ -29,11 +29,7 @@ struct ignore_case_t
     comparisons should be case-insensitive.
 */
 constexpr
-#ifdef BOOST_URL_DOCS
-__implementation_defined__
-#else
-ignore_case_t
-#endif
+BOOST_URL_IMPLEMENTATION_DEFINED(ignore_case_t)
 ignore_case{};
 
 /** An optional parameter to determine case-sensitivity
diff --git a/inst/include/boost/url/ipv4_address.hpp b/inst/include/boost/url/ipv4_address.hpp
index f32d84a3d..06052fe11 100644
--- a/inst/include/boost/url/ipv4_address.hpp
+++ b/inst/include/boost/url/ipv4_address.hpp
@@ -287,7 +287,15 @@ class ipv4_address
         return ipv4_address(0xFFFFFFFF);
     }
 
-    // hidden friend
+    /** Format the address to an output stream.
+
+        IPv4 addresses written to output streams
+        are written in their dotted decimal format.
+
+        @param os The output stream.
+
+        @param addr The address to format.
+    */
     friend
     std::ostream&
     operator<<(
diff --git a/inst/include/boost/url/ipv6_address.hpp b/inst/include/boost/url/ipv6_address.hpp
index 06d698b5d..bfd366b5d 100644
--- a/inst/include/boost/url/ipv6_address.hpp
+++ b/inst/include/boost/url/ipv6_address.hpp
@@ -325,7 +325,18 @@ class ipv6_address
     ipv6_address
     loopback() noexcept;
 
-    // hidden friend
+    /** Format the address to an output stream
+
+        This hidden friend function writes the
+        address to an output stream using
+        standard notation.
+
+        @return The output stream, for chaining.
+
+        @param os The output stream to write to.
+
+        @param addr The address to write.
+    */
     friend
     std::ostream&
     operator<<(
diff --git a/inst/include/boost/url/optional.hpp b/inst/include/boost/url/optional.hpp
index 11daaf6e2..6e36bede2 100644
--- a/inst/include/boost/url/optional.hpp
+++ b/inst/include/boost/url/optional.hpp
@@ -16,9 +16,10 @@
 namespace boost {
 namespace urls {
 
+#ifndef BOOST_URL_DOCS
 /** The type of optional used by the library
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `boost::optional` instead.
 
@@ -34,12 +35,29 @@ namespace urls {
     the library.
 
 */
-#ifndef BOOST_URL_DOCS
 template<class T>
 using optional
     BOOST_URL_DEPRECATED("Use boost::optional<T> instead") =
     boost::optional<T>;
 #else
+/** The type of optional used by the library
+
+    @warning This alias is no longer supported and
+    should not be used in new code. Please use
+    `boost::optional` instead.
+
+    This alias is included for backwards
+    compatibility with earlier versions of the
+    library.
+
+    However, it will be removed in future releases,
+    and using it in new code is not recommended.
+
+    Please use the updated version instead to
+    ensure compatibility with future versions of
+    the library.
+
+*/
 template<class T>
 using optional = boost::optional<T>;
 #endif
diff --git a/inst/include/boost/url/param.hpp b/inst/include/boost/url/param.hpp
index 578cf4691..6d1a28b1e 100644
--- a/inst/include/boost/url/param.hpp
+++ b/inst/include/boost/url/param.hpp
@@ -847,6 +847,15 @@ struct param_pct_view
             has_value);
     }
 
+    /** Conversion to param_view
+
+        This function performs a conversion from
+        a pct_string_view query parameter to one
+        using a simple string_view.
+
+        @par Exception Safety
+        Calls to allocate may throw.
+    */
     operator
     param_view() const noexcept
     {
@@ -855,14 +864,14 @@ struct param_pct_view
     }
 
 #ifndef BOOST_URL_DOCS
-    // arrow support
+    /// Arrow support
     param_pct_view const*
     operator->() const noexcept
     {
         return this;
     }
 
-    // aggregate construction
+    /// aggregate construction
     param_pct_view(
         pct_string_view key,
         pct_string_view value,
diff --git a/inst/include/boost/url/params_base.hpp b/inst/include/boost/url/params_base.hpp
index 6f5aac274..5d9a166b9 100644
--- a/inst/include/boost/url/params_base.hpp
+++ b/inst/include/boost/url/params_base.hpp
@@ -88,6 +88,37 @@ class BOOST_URL_DECL params_base
 #ifdef BOOST_URL_DOCS
     using iterator = __see_below__;
 #else
+
+    /** A Bidirectional iterator to a query parameter
+
+        Objects of this type allow iteration
+        through the parameters in the query.
+        Any percent-escapes in returned strings
+        are decoded first.
+        The values returned are read-only;
+        changes to parameters must be made
+        through the container instead, if the
+        container supports modification.
+
+        <br>
+
+        The strings produced when iterators are
+        dereferenced belong to the iterator and
+        become invalidated when that particular
+        iterator is incremented, decremented,
+        or destroyed.
+
+        @note
+
+        The implementation may use temporary,
+        recycled storage to store decoded
+        strings. These iterators are meant
+        to be used ephemerally. That is, for
+        short durations such as within a
+        function scope. Do not store
+        iterators with static storage
+        duration or as long-lived objects.
+    */
     class iterator;
 #endif
 
diff --git a/inst/include/boost/url/params_encoded_base.hpp b/inst/include/boost/url/params_encoded_base.hpp
index e6042e76b..ff20a1243 100644
--- a/inst/include/boost/url/params_encoded_base.hpp
+++ b/inst/include/boost/url/params_encoded_base.hpp
@@ -77,6 +77,29 @@ class BOOST_URL_DECL params_encoded_base
 #ifdef BOOST_URL_DOCS
     using iterator = __see_below__;
 #else
+
+    /** A Bidirectional iterator to a query parameter
+
+        Objects of this type allow iteration
+        through the parameters in the query.
+        Strings returned by iterators may
+        contain percent escapes.
+        The values returned are read-only;
+        changes to parameters must be made
+        through the container instead, if the
+        container supports modification.
+
+        <br>
+
+        The strings produced when iterators
+        are dereferenced refer to the underlying
+        character buffer.
+        Ownership is not transferred; the caller
+        is responsible for ensuring that the
+        lifetime of the buffer extends until
+        it is no longer referenced by any
+        container or iterator.
+    */
     class iterator;
 #endif
 
diff --git a/inst/include/boost/url/params_encoded_ref.hpp b/inst/include/boost/url/params_encoded_ref.hpp
index 0f0fbc9a5..209fbdc4f 100644
--- a/inst/include/boost/url/params_encoded_ref.hpp
+++ b/inst/include/boost/url/params_encoded_ref.hpp
@@ -955,18 +955,6 @@ class BOOST_URL_DECL params_encoded_ref
         ignore_case_param ic = {});
 
 private:
-    detail::params_iter_impl
-    find_impl(
-        detail::params_iter_impl,
-        pct_string_view,
-        ignore_case_param) const noexcept;
-
-    detail::params_iter_impl
-    find_last_impl(
-        detail::params_iter_impl,
-        pct_string_view,
-        ignore_case_param) const noexcept;
-
     template<class FwdIt>
     void
     assign(FwdIt first, FwdIt last,
diff --git a/inst/include/boost/url/params_encoded_view.hpp b/inst/include/boost/url/params_encoded_view.hpp
index bef2cf1b2..c750c3070 100644
--- a/inst/include/boost/url/params_encoded_view.hpp
+++ b/inst/include/boost/url/params_encoded_view.hpp
@@ -22,6 +22,10 @@
 namespace boost {
 namespace urls {
 
+namespace implementation_defined {
+    struct query_rule_t;
+}
+
 /** A view representing query parameters in a URL
 
     Objects of this type are used to interpret
@@ -57,7 +61,7 @@ class BOOST_URL_DECL params_encoded_view
     friend class url_view_base;
     friend class params_view;
     friend class params_encoded_ref;
-    friend struct query_rule_t;
+    friend struct implementation_defined::query_rule_t;
 
     params_encoded_view(
         detail::query_ref const& ref) noexcept;
@@ -225,6 +229,30 @@ class BOOST_URL_DECL params_encoded_view
 
     //--------------------------------------------
 
+    /** Parse a string and return an encoded params view
+
+        This function parses the string and returns the
+        corresponding params object if the string is valid,
+        otherwise returns an error.
+
+        @par BNF
+        @code
+        query         = *( pchar / "/" / "?" )
+        @endcode
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @return A valid view on success, otherwise an
+        error code.
+
+        @param s The string to parse
+
+        @par Specification
+
+        @see
+            @ref params_encoded_view.
+    */
     friend
     BOOST_URL_DECL
     system::result<params_encoded_view>
diff --git a/inst/include/boost/url/params_ref.hpp b/inst/include/boost/url/params_ref.hpp
index 05230eb63..4802bd98a 100644
--- a/inst/include/boost/url/params_ref.hpp
+++ b/inst/include/boost/url/params_ref.hpp
@@ -916,18 +916,6 @@ class BOOST_URL_DECL params_ref
     //--------------------------------------------
 
 private:
-    detail::params_iter_impl
-    find_impl(
-        detail::params_iter_impl,
-        core::string_view,
-        ignore_case_param) const noexcept;
-
-    detail::params_iter_impl
-    find_last_impl(
-        detail::params_iter_impl,
-        core::string_view,
-        ignore_case_param) const noexcept;
-
     template<class FwdIt>
     void
     assign(FwdIt first, FwdIt last,
diff --git a/inst/include/boost/url/parse_query.hpp b/inst/include/boost/url/parse_query.hpp
index 29a69ad52..4a7e03615 100644
--- a/inst/include/boost/url/parse_query.hpp
+++ b/inst/include/boost/url/parse_query.hpp
@@ -27,6 +27,7 @@ namespace urls {
 
     @par BNF
     @code
+    query         = *( pchar / "/" / "?" )
     @endcode
 
     @par Exception Safety
diff --git a/inst/include/boost/url/pct_string_view.hpp b/inst/include/boost/url/pct_string_view.hpp
index 378cca2c3..524fcede0 100644
--- a/inst/include/boost/url/pct_string_view.hpp
+++ b/inst/include/boost/url/pct_string_view.hpp
@@ -263,6 +263,25 @@ class pct_string_view final
     pct_string_view& operator=(
         pct_string_view const& other) = default;
 
+    /** Return a valid percent-encoded string
+
+        If `s` is a valid percent-encoded string,
+        the function returns the buffer as a valid
+        view which may be used to perform decoding
+        or measurements.
+        Otherwise the result contains an error code.
+        Upon success, the returned view references
+        the original character buffer;
+        Ownership is not transferred.
+
+        @par Complexity
+        Linear in `s.size()`.
+
+        @par Exception Safety
+        Throws nothing.
+
+        @param s The string to validate.
+    */
     friend
     BOOST_URL_DECL
     system::result<pct_string_view>
@@ -362,7 +381,7 @@ class pct_string_view final
     }
 
 #ifndef BOOST_URL_DOCS
-    // arrow support
+    /// Arrow support
     pct_string_view const*
     operator->() const noexcept
     {
diff --git a/inst/include/boost/url/rfc/absolute_uri_rule.hpp b/inst/include/boost/url/rfc/absolute_uri_rule.hpp
index 6e96691fb..c325df537 100644
--- a/inst/include/boost/url/rfc/absolute_uri_rule.hpp
+++ b/inst/include/boost/url/rfc/absolute_uri_rule.hpp
@@ -52,6 +52,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ absolute_uri_rule;
 #else
+namespace implementation_defined {
 struct absolute_uri_rule_t
 {
     using value_type = url_view;
@@ -64,8 +65,41 @@ struct absolute_uri_rule_t
             ) const noexcept ->
         system::result<value_type>;
 };
+} // implementation_defined
 
-constexpr absolute_uri_rule_t absolute_uri_rule{};
+/** Rule for absolute-URI
+
+    @par Value Type
+    @code
+    using value_type = url_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< url_view > rv = grammar::parse( "http://example.com/index.htm?id=1", absolute_uri_rule );
+    @endcode
+
+    @par BNF
+    @code
+    absolute-URI    = scheme ":" hier-part [ "?" query ]
+
+    hier-part       = "//" authority path-abempty
+                    / path-absolute
+                    / path-rootless
+                    / path-empty
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-4.3"
+        >4.3. Absolute URI (rfc3986)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref parse_absolute_uri,
+        @ref url_view.
+*/
+constexpr implementation_defined::absolute_uri_rule_t absolute_uri_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/authority_rule.hpp b/inst/include/boost/url/rfc/authority_rule.hpp
index 57ff296da..8895b0870 100644
--- a/inst/include/boost/url/rfc/authority_rule.hpp
+++ b/inst/include/boost/url/rfc/authority_rule.hpp
@@ -47,6 +47,8 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ authority_rule;
 #else
+
+namespace implementation_defined {
 struct authority_rule_t
 {
     using value_type = authority_view;
@@ -59,8 +61,36 @@ struct authority_rule_t
             ) const noexcept ->
         system::result<value_type>;
 };
+} // implementation_defined
+
+/** Rule for authority
+
+    @par Value Type
+    @code
+    using value_type = authority_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< authority_view > rv = grammar::parse( "user:pass@example.com:8080", authority_rule );
+    @endcode
 
-constexpr authority_rule_t authority_rule{};
+    @par BNF
+    @code
+    authority   = [ userinfo "@" ] host [ ":" port ]
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2"
+        >3.2. Authority (rfc3986)</a>
+
+    @see
+        @ref authority_view,
+        @ref grammar::parse,
+        @ref parse_authority.
+*/
+constexpr implementation_defined::authority_rule_t authority_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/detail/charsets.hpp b/inst/include/boost/url/rfc/detail/charsets.hpp
deleted file mode 100644
index 826337273..000000000
--- a/inst/include/boost/url/rfc/detail/charsets.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2022 alandefreitas (alandefreitas@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_CHARSETS_HPP
-#define BOOST_URL_RFC_DETAIL_CHARSETS_HPP
-
-#include <boost/url/rfc/pchars.hpp>
-#include <boost/url/rfc/sub_delim_chars.hpp>
-#include <boost/url/rfc/unreserved_chars.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-constexpr
-auto
-user_chars =
-    unreserved_chars + sub_delim_chars;
-
-constexpr
-auto
-password_chars =
-    unreserved_chars + sub_delim_chars + ':';
-
-constexpr
-auto
-userinfo_chars =
-    password_chars;
-
-constexpr
-auto
-host_chars =
-    unreserved_chars + sub_delim_chars;
-
-constexpr
-auto
-reg_name_chars =
-    unreserved_chars + '-' + '.';
-
-constexpr
-auto
-segment_chars =
-    pchars;
-
-constexpr
-auto
-path_chars =
-    segment_chars + '/';
-
-constexpr
-auto
-query_chars =
-    pchars + '/' + '?';
-
-constexpr
-auto
-param_key_chars = pchars
-    + '/' + '?' + '[' + ']'
-    - '&' - '=';
-
-constexpr
-auto
-param_value_chars = pchars
-    + '/' + '?'
-    - '&';
-
-constexpr
-auto
-fragment_chars =
-    pchars + '/' + '?' + '#';
-
-constexpr
-auto
-nocolon_pchars =
-    pchars - ':';
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/fragment_part_rule.hpp b/inst/include/boost/url/rfc/detail/fragment_part_rule.hpp
deleted file mode 100644
index 62a3fe034..000000000
--- a/inst/include/boost/url/rfc/detail/fragment_part_rule.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_FRAGMENT_PART_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_FRAGMENT_PART_RULE_HPP
-
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/grammar/parse.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for fragment-part
-
-    @par BNF
-    @code
-    fragment-part   = [ "#" fragment ]
-
-    fragment        = *( pchar / "/" / "?" )
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.5"
-        >3.5. Fragment (rfc3986)</a>
-*/
-struct fragment_part_rule_t
-{
-    struct value_type
-    {
-        pct_string_view fragment;
-        bool has_fragment = false;
-    };
-
-    system::result<value_type>
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept
-    {
-        if( it == end ||
-            *it != '#')
-            return {};
-        ++it;
-        auto rv = grammar::parse(
-            it, end, pct_encoded_rule(
-                fragment_chars));
-        if(! rv)
-            return rv.error();
-        value_type t;
-        t.fragment = *rv;
-        t.has_fragment = true;
-        return t;
-    }
-};
-constexpr fragment_part_rule_t fragment_part_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/h16_rule.hpp b/inst/include/boost/url/rfc/detail/h16_rule.hpp
deleted file mode 100644
index 58ce519d0..000000000
--- a/inst/include/boost/url/rfc/detail/h16_rule.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_H16_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_H16_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <cstdint>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for h16
-
-    This parses a sixteen bit unsigned
-    hexadecimal number.
-
-    @par BNF
-    @code
-    h16         = 1*4HEXDIG
-                ; 16 bits of address represented in hexadecimal
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2.  Host (rfc3986)</a>
-*/
-struct h16_rule_t
-{
-    struct value_type
-    {
-        std::uint8_t hi;
-        std::uint8_t lo;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr h16_rule_t h16_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/hier_part_rule.hpp b/inst/include/boost/url/rfc/detail/hier_part_rule.hpp
deleted file mode 100644
index 80d05c8e6..000000000
--- a/inst/include/boost/url/rfc/detail/hier_part_rule.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_HIER_PART_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_HIER_PART_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/authority_rule.hpp>
-#include <cstdlib>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for hier-part
-
-    @par BNF
-    @code
-    hier-part     = "//" authority path-abempty
-                  / path-absolute
-                  / path-rootless
-                  / path-empty
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3"
-        >3. Syntax Components (rfc3986)</a>
-*/
-struct hier_part_rule_t
-{
-    struct value_type
-    {
-        authority_view authority;
-        pct_string_view path;
-        std::size_t segment_count = 0;
-        bool has_authority = false;
-    };
-
-    BOOST_URL_DECL
-    auto
-    parse(
-        char const*& it,
-        char const* const end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr hier_part_rule_t hier_part_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/host_rule.hpp b/inst/include/boost/url/rfc/detail/host_rule.hpp
deleted file mode 100644
index 57b18a0e2..000000000
--- a/inst/include/boost/url/rfc/detail/host_rule.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_HOST_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_HOST_RULE_HPP
-
-#include <boost/url/host_type.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/ipv4_address.hpp>
-#include <boost/url/ipv6_address.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for host
-
-    @par BNF
-    @code
-    host          = IP-literal / IPv4address / reg-name
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-
-    @see
-        @ref host_type,
-        @ref ipv4_address,
-        @ref ipv6_address.
-*/
-struct host_rule_t
-{
-    struct value_type
-    {
-        urls::host_type host_type =
-            urls::host_type::none;
-        core::string_view match;
-        unsigned char addr[16] = {};
-        pct_string_view name;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr host_rule_t host_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/ip_literal_rule.hpp b/inst/include/boost/url/rfc/detail/ip_literal_rule.hpp
deleted file mode 100644
index 33a5929b3..000000000
--- a/inst/include/boost/url/rfc/detail/ip_literal_rule.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-// Copyright (c) 2022 Alan de Freitas (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_IP_LITERAL_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_IP_LITERAL_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/ipv6_address.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/core/detail/string_view.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for IP-literal
-
-    @par BNF
-    @code
-    IP-literal = "[" ( IPv6address / IPv6addrz / IPvFuture  ) "]"
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-
-    @see
-        @ref ipv6_address.
-*/
-struct ip_literal_rule_t
-{
-    struct value_type
-    {
-        bool is_ipv6 = false;
-        ipv6_address ipv6;
-        core::string_view ipvfuture;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr ip_literal_rule_t ip_literal_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/ipv6_addrz_rule.hpp b/inst/include/boost/url/rfc/detail/ipv6_addrz_rule.hpp
deleted file mode 100644
index a27adfa67..000000000
--- a/inst/include/boost/url/rfc/detail/ipv6_addrz_rule.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2023 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_IPV6ADDRZ_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_IPV6ADDRZ_RULE_HPP
-
-#include <boost/url/error_types.hpp>
-#include <boost/url/ipv6_address.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/core/detail/string_view.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for IPvFuture
-
-    @par BNF
-    @code
-    IPv6addrz = IPv6address "%25" ZoneID
-    ZoneID = 1*( unreserved / pct-encoded )
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-*/
-struct ipv6_addrz_rule_t
-{
-    struct value_type
-    {
-        ipv6_address ipv6;
-        pct_string_view zone_id;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* const end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr ipv6_addrz_rule_t ipv6_addrz_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/ipvfuture_rule.hpp b/inst/include/boost/url/rfc/detail/ipvfuture_rule.hpp
deleted file mode 100644
index 6f3a6a47e..000000000
--- a/inst/include/boost/url/rfc/detail/ipvfuture_rule.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_IPVFUTURE_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_IPVFUTURE_RULE_HPP
-
-#include <boost/url/error_types.hpp>
-#include <boost/core/detail/string_view.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for IPvFuture
-
-    @par BNF
-    @code
-    IPvFuture     = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-*/
-struct ipvfuture_rule_t
-{
-    struct value_type
-    {
-        core::string_view str;
-        core::string_view major;
-        core::string_view minor;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* const end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr ipvfuture_rule_t ipvfuture_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/path_rules.hpp b/inst/include/boost/url/rfc/detail/path_rules.hpp
index 3f47dfc47..95a49637a 100644
--- a/inst/include/boost/url/rfc/detail/path_rules.hpp
+++ b/inst/include/boost/url/rfc/detail/path_rules.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_URL_RFC_DETAIL_PATH_RULES_HPP
 #define BOOST_URL_RFC_DETAIL_PATH_RULES_HPP
 
-#include <boost/url/rfc/pchars.hpp>
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/grammar/delim_rule.hpp>
-#include <boost/url/grammar/range_rule.hpp>
-#include <boost/url/grammar/tuple_rule.hpp>
+#include "boost/url/rfc/pchars.hpp"
+#include "boost/url/rfc/pct_encoded_rule.hpp"
+#include "boost/url/grammar/delim_rule.hpp"
+#include "boost/url/grammar/range_rule.hpp"
+#include "boost/url/grammar/tuple_rule.hpp"
 
 namespace boost {
 namespace urls {
diff --git a/inst/include/boost/url/rfc/detail/port_rule.hpp b/inst/include/boost/url/rfc/detail/port_rule.hpp
deleted file mode 100644
index 22459aa07..000000000
--- a/inst/include/boost/url/rfc/detail/port_rule.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_PORT_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_PORT_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/core/detail/string_view.hpp>
-#include <cstdint>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for port
-
-    @par BNF
-    @code
-    port          = *DIGIT
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-
-    @see
-        @ref port_part_rule.
-*/
-struct port_rule
-{
-    struct value_type
-    {
-        core::string_view str;
-        std::uint16_t number = 0;
-        bool has_number = false;
-    };
-
-    system::result<value_type>
-    parse(
-        char const*& it,
-        char const* end) const noexcept;
-};
-
-//------------------------------------------------
-
-/** Rule for port-part
-
-    @par BNF
-    @code
-    port-part       = [ ":" port ]
-
-    port            = *DIGIT
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-
-    @see
-        @ref port_rule.
-*/
-struct port_part_rule_t
-{
-    struct value_type
-    {
-        bool has_port = false;
-        core::string_view port;
-        bool has_number = false;
-        std::uint16_t port_number = 0;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr port_part_rule_t port_part_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/query_part_rule.hpp b/inst/include/boost/url/rfc/detail/query_part_rule.hpp
deleted file mode 100644
index 04b2c5aef..000000000
--- a/inst/include/boost/url/rfc/detail/query_part_rule.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_QUERY_PART_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_QUERY_PART_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/query_rule.hpp>
-#include <boost/url/grammar/parse.hpp>
-#include <cstdlib>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for query-part
-
-    @par BNF
-    @code
-    query-part    = [ "?" query ]
-    @endcode
-*/
-struct query_part_rule_t
-{
-    struct value_type
-    {
-        pct_string_view query;
-        std::size_t count = 0;
-        bool has_query = false;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>
-    {
-        if( it == end ||
-            *it != '?')
-            return {};
-        ++it;
-        auto rv = grammar::parse(
-            it, end, query_rule);
-        if(! rv)
-            return rv.error();
-        value_type t;
-        t.query = rv->buffer();
-        t.count = rv->size();
-        t.has_query = true;
-        return t;
-    }
-};
-
-constexpr query_part_rule_t query_part_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
\ No newline at end of file
diff --git a/inst/include/boost/url/rfc/detail/reg_name_rule.hpp b/inst/include/boost/url/rfc/detail/reg_name_rule.hpp
deleted file mode 100644
index 2f552b890..000000000
--- a/inst/include/boost/url/rfc/detail/reg_name_rule.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_REG_NAME_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_REG_NAME_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/rfc/sub_delim_chars.hpp>
-#include <boost/url/rfc/unreserved_chars.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/*  VFALCO In theory we could enforce these
-    additional requirements from errata 4942:
-
-    Such a name consists of a sequence of domain
-    labels separated by ".", each domain label
-    starting and ending with an alphanumeric character
-    and possibly also containing "-" characters.  The
-    rightmost domain label of a fully qualified domain
-    name in DNS may be followed by a single "." and
-    should be if it is necessary to distinguish between
-    the complete domain name and some local domain.
-*/
-
-/** Rule for reg-name
-
-    @par BNF
-    @code
-    reg-name    = *( unreserved / pct-encoded / "-" / ".")
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
-        >3.2.2. Host (rfc3986)</a>
-    @li <a href="https://www.rfc-editor.org/errata/eid4942"
-        >Errata ID: 4942</a>
-*/
-constexpr auto reg_name_rule =
-    pct_encoded_rule(unreserved_chars + sub_delim_chars);
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/relative_part_rule.hpp b/inst/include/boost/url/rfc/detail/relative_part_rule.hpp
deleted file mode 100644
index 7d37f8fce..000000000
--- a/inst/include/boost/url/rfc/detail/relative_part_rule.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_RELATIVE_PART_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_RELATIVE_PART_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/authority_rule.hpp>
-#include <cstdlib>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for relative-part
-
-    @par BNF
-    @code
-    relative-part = "//" authority path-abempty
-                  / path-absolute
-                  / path-noscheme
-                  / path-abempty
-                  / path-empty
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-4.2"
-        >4.2. Relative Reference (rfc3986)</a>
-    @li <a href="https://www.rfc-editor.org/errata/eid5428"
-        >Errata ID: 5428 (rfc3986)</a>
-
-    @see
-        @ref authority_rule.
-*/
-struct relative_part_rule_t
-{
-    struct value_type
-    {
-        authority_view authority;
-        pct_string_view path;
-        std::size_t segment_count = 0;
-        bool has_authority = false;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr relative_part_rule_t relative_part_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/scheme_rule.hpp b/inst/include/boost/url/rfc/detail/scheme_rule.hpp
deleted file mode 100644
index a97557c18..000000000
--- a/inst/include/boost/url/rfc/detail/scheme_rule.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_SCHEME_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_SCHEME_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/scheme.hpp>
-#include <boost/core/detail/string_view.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for scheme
-
-    @par BNF
-    @code
-    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-    @endcode
-
-    @par Specification
-    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.1"
-        >3.1. Scheme (rfc3986)</a>
-
-    @see
-        @ref scheme.
-*/
-struct scheme_rule
-{
-    struct value_type
-    {
-        core::string_view scheme;
-        urls::scheme scheme_id =
-            urls::scheme::unknown;
-    };
-
-    system::result<value_type>
-    parse(
-        char const*& it,
-        char const* end) const noexcept;
-};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/detail/userinfo_rule.hpp b/inst/include/boost/url/rfc/detail/userinfo_rule.hpp
deleted file mode 100644
index bd66ff1bc..000000000
--- a/inst/include/boost/url/rfc/detail/userinfo_rule.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/url
-//
-
-#ifndef BOOST_URL_RFC_DETAIL_USERINFO_RULE_HPP
-#define BOOST_URL_RFC_DETAIL_USERINFO_RULE_HPP
-
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-
-namespace boost {
-namespace urls {
-namespace detail {
-
-/** Rule for userinfo
-
-    @par BNF
-    @code
-    userinfo    = user [ ":" [ password ] ]
-
-    user        = *( unreserved / pct-encoded / sub-delims )
-    password    = *( unreserved / pct-encoded / sub-delims / ":" )
-    @endcode
-
-    @par Specification
-    <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.1"
-        >3.2.1. User Information (3986)</a>
-*/
-struct userinfo_rule_t
-{
-    struct value_type
-    {
-        pct_string_view user;
-        pct_string_view password;
-        bool has_password = false;
-    };
-
-    auto
-    parse(
-        char const*& it,
-        char const* end
-            ) const noexcept ->
-        system::result<value_type>;
-};
-
-constexpr userinfo_rule_t userinfo_rule{};
-
-} // detail
-} // urls
-} // boost
-
-#endif
diff --git a/inst/include/boost/url/rfc/impl/pct_encoded_rule.hpp b/inst/include/boost/url/rfc/impl/pct_encoded_rule.hpp
index 2b93f6509..da7a3823d 100644
--- a/inst/include/boost/url/rfc/impl/pct_encoded_rule.hpp
+++ b/inst/include/boost/url/rfc/impl/pct_encoded_rule.hpp
@@ -87,7 +87,7 @@ parse_encoded(
 
 template<class CharSet>
 auto
-pct_encoded_rule_t<CharSet>::
+implementation_defined::pct_encoded_rule_t<CharSet>::
 parse(
     char const*& it,
     char const* end) const noexcept ->
diff --git a/inst/include/boost/url/rfc/ipv4_address_rule.hpp b/inst/include/boost/url/rfc/ipv4_address_rule.hpp
index aff5fb8d9..005f82ad4 100644
--- a/inst/include/boost/url/rfc/ipv4_address_rule.hpp
+++ b/inst/include/boost/url/rfc/ipv4_address_rule.hpp
@@ -55,6 +55,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ ipv4_address_rule;
 #else
+namespace implementation_defined {
 struct ipv4_address_rule_t
 {
     using value_type =
@@ -68,8 +69,44 @@ struct ipv4_address_rule_t
             ) const noexcept ->
         system::result<ipv4_address>;
 };
+} // implementation_defined
 
-constexpr ipv4_address_rule_t ipv4_address_rule{};
+/** Rule for an IP version 4 style address
+
+    @par Value Type
+    @code
+    using value_type = ipv4_address;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< ipv4_address > rv = grammar::parse( "192.168.0.1", ipv4_address_rule );
+    @endcode
+
+    @par BNF
+    @code
+    IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
+
+    dec-octet   = DIGIT                 ; 0-9
+                / %x31-39 DIGIT         ; 10-99
+                / "1" 2DIGIT            ; 100-199
+                / "2" %x30-34 DIGIT     ; 200-249
+                / "25" %x30-35          ; 250-255
+    @endcode
+
+    @par Specification
+    @li <a href="https://en.wikipedia.org/wiki/IPv4"
+        >IPv4 (Wikipedia)</a>
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
+        >3.2.2. Host (rfc3986)</a>
+
+    @see
+        @ref ipv4_address,
+        @ref parse_ipv4_address,
+        @ref grammar::parse.
+*/
+constexpr implementation_defined::ipv4_address_rule_t ipv4_address_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/ipv6_address_rule.hpp b/inst/include/boost/url/rfc/ipv6_address_rule.hpp
index 0ddfa1e25..f01bc5c95 100644
--- a/inst/include/boost/url/rfc/ipv6_address_rule.hpp
+++ b/inst/include/boost/url/rfc/ipv6_address_rule.hpp
@@ -63,6 +63,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ ipv6_address_rule;
 #else
+namespace implementation_defined {
 struct ipv6_address_rule_t
 {
     using value_type =
@@ -76,8 +77,52 @@ struct ipv6_address_rule_t
             ) const noexcept ->
         system::result<ipv6_address>;
 };
+} // implementation_defined
 
-constexpr ipv6_address_rule_t ipv6_address_rule{};
+/** Rule for An IP version 6 style address
+
+    @par Value Type
+    @code
+    using value_type = ipv6_address;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< ipv6_address > rv = grammar::parse( "2001:0db8:85a3:0000:0000:8a2e:0370:7334", ipv6_address_rule );
+    @endcode
+
+    @par BNF
+    @code
+    IPv6address =                            6( h16 ":" ) ls32
+                /                       "::" 5( h16 ":" ) ls32
+                / [               h16 ] "::" 4( h16 ":" ) ls32
+                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+                / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+                / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
+                / [ *4( h16 ":" ) h16 ] "::"              ls32
+                / [ *5( h16 ":" ) h16 ] "::"              h16
+                / [ *6( h16 ":" ) h16 ] "::"
+
+    ls32        = ( h16 ":" h16 ) / IPv4address
+                ; least-significant 32 bits of address
+
+    h16         = 1*4HEXDIG
+                ; 16 bits of address represented in hexadecimal
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc4291"
+        >IP Version 6 Addressing Architecture (rfc4291)</a>
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2"
+        >3.2.2. Host (rfc3986)</a>
+
+    @see
+        @ref ipv6_address,
+        @ref parse_ipv6_address,
+        @ref grammar::parse.
+*/
+constexpr implementation_defined::ipv6_address_rule_t ipv6_address_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/origin_form_rule.hpp b/inst/include/boost/url/rfc/origin_form_rule.hpp
index 22782f71a..19be6ba90 100644
--- a/inst/include/boost/url/rfc/origin_form_rule.hpp
+++ b/inst/include/boost/url/rfc/origin_form_rule.hpp
@@ -63,6 +63,37 @@ struct origin_form_rule_t
             ) const noexcept;
 };
 
+/** Rule for origin-form
+
+    This appears in the HTTP/1 request-line grammar.
+
+    @par Value Type
+    @code
+    using value_type = url_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< url_view > rv = grammar::parse( "/index.htm?layout=mobile", origin_form_rule );
+    @endcode
+
+    @par BNF
+    @code
+    origin-form    = absolute-path [ "?" query ]
+
+    absolute-path = 1*( "/" segment )
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc7230#section-5.3.1"
+        >5.3.1.  origin-form (rfc7230)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref parse_origin_form,
+        @ref url_view.
+*/
 constexpr origin_form_rule_t origin_form_rule{};
 #endif
 
diff --git a/inst/include/boost/url/rfc/pct_encoded_rule.hpp b/inst/include/boost/url/rfc/pct_encoded_rule.hpp
index 66b7055a7..85c0bde1b 100644
--- a/inst/include/boost/url/rfc/pct_encoded_rule.hpp
+++ b/inst/include/boost/url/rfc/pct_encoded_rule.hpp
@@ -65,25 +65,17 @@ __implementation_defined__
 pct_encoded_rule( CharSet const& cs ) noexcept;
 /**@}*/
 #else
+namespace implementation_defined {
 template<class CharSet>
 struct pct_encoded_rule_t
 {
     using value_type = pct_string_view;
 
-    template<class CharSet_>
-    friend
-    constexpr
-    auto
-    pct_encoded_rule(
-        CharSet_ const& cs) noexcept ->
-            pct_encoded_rule_t<CharSet_>;
-
     system::result<value_type>
     parse(
         char const*& it,
         char const* end) const noexcept;
 
-private:
     constexpr
     pct_encoded_rule_t(
         CharSet const& cs) noexcept
@@ -91,15 +83,56 @@ struct pct_encoded_rule_t
     {
     }
 
+private:
     CharSet cs_;
 };
+} // implementation_defined
+
+/** Rule for a string with percent-encoded escapes
+
+    This function returns a rule which matches
+    a percent-encoded string, permitting characters
+    in the string which are also in the specified
+    character set to be used unescaped.
 
+    @par Value Type
+    @code
+    using value_type = pct_string_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    //  pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+
+    system::result< pct_string_view > rv = grammar::parse( "Program%20Files", pct_encoded_rule( pchars ) );
+    @endcode
+
+    @par BNF
+    @code
+    pct-encoded   = "%" HEXDIG HEXDIG
+    @endcode
+
+    @param cs The character set indicating
+    which characters are allowed without escapes.
+    Any character which is not in this set must be
+    escaped, or else parsing returns an error.
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-2.1">
+        2.1. Percent-Encoding (rfc3986)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref pchars,
+        @ref pct_string_view.
+*/
 template<class CharSet>
 constexpr
 auto
 pct_encoded_rule(
     CharSet const& cs) noexcept ->
-        pct_encoded_rule_t<CharSet>
+        implementation_defined::pct_encoded_rule_t<CharSet>
 {
     // If an error occurs here it means that
     // the value of your type does not meet
@@ -109,7 +142,7 @@ pct_encoded_rule(
         grammar::is_charset<CharSet>::value,
         "CharSet requirements not met");
 
-    return pct_encoded_rule_t<CharSet>(cs);
+    return implementation_defined::pct_encoded_rule_t<CharSet>(cs);
 }
 
 #endif
diff --git a/inst/include/boost/url/rfc/query_rule.hpp b/inst/include/boost/url/rfc/query_rule.hpp
index 06b446dc0..ac7107e94 100644
--- a/inst/include/boost/url/rfc/query_rule.hpp
+++ b/inst/include/boost/url/rfc/query_rule.hpp
@@ -57,6 +57,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ query_rule;
 #else
+namespace implementation_defined {
 struct query_rule_t
 {
     using value_type = params_encoded_view;
@@ -68,8 +69,45 @@ struct query_rule_t
         char const* end
             ) const noexcept;
 };
+} // implementation_defined
 
-constexpr query_rule_t query_rule{};
+/** Rule for query
+
+    @par Value Type
+    @code
+    using value_type = params_encoded_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< params_encoded_view > rv = grammar::parse( "format=web&id=42&compact", query_rule );
+    @endcode
+
+    @par BNF
+    @code
+    query           = *( pchar / "/" / "?" )
+
+    query-params    = [ query-param ] *( "&" query-param )
+    query-param     = key [ "=" value ]
+    key             = *qpchar
+    value           = *( qpchar / "=" )
+    qpchar          = unreserved
+                    / pct-encoded
+                    / "!" / "$" / "'" / "(" / ")"
+                    / "*" / "+" / "," / ";"
+                    / ":" / "@" / "/" / "?"
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.4"
+        >3.4. Query (rfc3986)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref params_encoded_view.
+*/
+constexpr implementation_defined::query_rule_t query_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/relative_ref_rule.hpp b/inst/include/boost/url/rfc/relative_ref_rule.hpp
index ef553f574..bebe872a5 100644
--- a/inst/include/boost/url/rfc/relative_ref_rule.hpp
+++ b/inst/include/boost/url/rfc/relative_ref_rule.hpp
@@ -47,6 +47,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ relative_ref_rule;
 #else
+namespace implementation_defined {
 struct relative_ref_rule_t
 {
     using value_type = url_view;
@@ -59,8 +60,36 @@ struct relative_ref_rule_t
             ) const noexcept ->
         system::result<value_type>;
 };
+} // implementation_defined
 
-constexpr relative_ref_rule_t relative_ref_rule{};
+/** Rule for relative-ref
+
+    @par Value Type
+    @code
+    using value_type = url_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< url_view > rv = grammar::parse( "images/dot.gif?v=hide#a", relative_ref_rule );
+    @endcode
+
+    @par BNF
+    @code
+    relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-4.2"
+        >4.2. Relative Reference (rfc3986)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref parse_relative_ref,
+        @ref url_view.
+*/
+constexpr implementation_defined::relative_ref_rule_t relative_ref_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/uri_reference_rule.hpp b/inst/include/boost/url/rfc/uri_reference_rule.hpp
index c61769348..047918b98 100644
--- a/inst/include/boost/url/rfc/uri_reference_rule.hpp
+++ b/inst/include/boost/url/rfc/uri_reference_rule.hpp
@@ -50,6 +50,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ uri_reference_rule{};
 #else
+namespace implementation_defined {
 struct uri_reference_rule_t
 {
     using value_type = url_view;
@@ -62,8 +63,39 @@ struct uri_reference_rule_t
             ) const noexcept ->
     system::result<value_type>;
 };
+} // implementation_defined
 
-constexpr uri_reference_rule_t uri_reference_rule{};
+/** Rule for URI-reference
+
+    @par Value Type
+    @code
+    using value_type = url_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< url_view > rv = grammar::parse( "ws://echo.example.com/?name=boost#demo", uri_reference_rule );
+    @endcode
+
+    @par BNF
+    @code
+    URI-reference = URI / relative-ref
+
+    URI           = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+    relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3"
+        >3. Syntax Components (rfc3986)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref parse_uri_reference,
+        @ref url_view.
+*/
+constexpr implementation_defined::uri_reference_rule_t uri_reference_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/rfc/uri_rule.hpp b/inst/include/boost/url/rfc/uri_rule.hpp
index 9681e74d8..12219f381 100644
--- a/inst/include/boost/url/rfc/uri_rule.hpp
+++ b/inst/include/boost/url/rfc/uri_rule.hpp
@@ -47,6 +47,7 @@ namespace urls {
 #ifdef BOOST_URL_DOCS
 constexpr __implementation_defined__ uri_rule{};
 #else
+namespace implementation_defined {
 struct uri_rule_t
 {
     using value_type = url_view;
@@ -59,8 +60,36 @@ struct uri_rule_t
             ) const noexcept ->
         system::result<value_type>;
 };
+} // implementation_defined
 
-constexpr uri_rule_t uri_rule{};
+/** Rule for URI
+
+    @par Value Type
+    @code
+    using value_type = url_view;
+    @endcode
+
+    @par Example
+    Rules are used with the function @ref grammar::parse.
+    @code
+    system::result< url_view > rv = grammar::parse( "https://www.example.com/index.htm?id=guest#s1", uri_rule );
+    @endcode
+
+    @par BNF
+    @code
+    URI           = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+    @endcode
+
+    @par Specification
+    @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3"
+        >3. Syntax Components (rfc3986)</a>
+
+    @see
+        @ref grammar::parse,
+        @ref parse_uri,
+        @ref url_view.
+*/
+constexpr implementation_defined::uri_rule_t uri_rule{};
 #endif
 
 } // urls
diff --git a/inst/include/boost/url/segments_base.hpp b/inst/include/boost/url/segments_base.hpp
index 4b116fa9a..ef7e73a6d 100644
--- a/inst/include/boost/url/segments_base.hpp
+++ b/inst/include/boost/url/segments_base.hpp
@@ -73,6 +73,26 @@ class segments_base
 #ifdef BOOST_URL_DOCS
     using iterator = __see_below__;
 #else
+
+    /** A Bidirectional iterator to a path segment
+
+        Objects of this type allow iteration
+        through the segments in the path.
+        Any percent-escapes in returned strings
+        are decoded first.
+        The values returned are read-only;
+        changes to segments must be made
+        through the container instead, if the
+        container supports modification.
+
+        <br>
+
+        The strings produced when iterators are
+        dereferenced belong to the iterator and
+        become invalidated when that particular
+        iterator is incremented, decremented,
+        or destroyed.
+    */
     class iterator;
 #endif
 
diff --git a/inst/include/boost/url/segments_encoded_base.hpp b/inst/include/boost/url/segments_encoded_base.hpp
index e371e6445..ce0c253cf 100644
--- a/inst/include/boost/url/segments_encoded_base.hpp
+++ b/inst/include/boost/url/segments_encoded_base.hpp
@@ -76,6 +76,29 @@ class segments_encoded_base
 #ifdef BOOST_URL_DOCS
     using iterator = __see_below__;
 #else
+
+    /** A Bidirectional iterator to a path segment
+
+        Objects of this type allow iteration
+        through the segments in the path.
+        Strings returned by iterators may
+        contain percent escapes.
+        The values returned are read-only;
+        changes to segments must be made
+        through the container instead, if the
+        container supports modification.
+
+        <br>
+
+        The strings produced when iterators
+        are dereferenced refer to the underlying
+        character buffer.
+        Ownership is not transferred; the caller
+        is responsible for ensuring that the
+        lifetime of the buffer extends until
+        it is no longer referenced by any
+        container or iterator.
+    */
     class iterator;
 #endif
 
diff --git a/inst/include/boost/url/segments_encoded_view.hpp b/inst/include/boost/url/segments_encoded_view.hpp
index eeed98cf8..de917c3a7 100644
--- a/inst/include/boost/url/segments_encoded_view.hpp
+++ b/inst/include/boost/url/segments_encoded_view.hpp
@@ -228,10 +228,36 @@ class segments_encoded_view
 
     //--------------------------------------------
 
+    /** Parse a string and return an encoded segment view
+
+        This function parses the string and returns the
+        corresponding path object if the string is valid,
+        otherwise returns an error.
+
+        @par BNF
+        @code
+        path          = [ "/" ] segment *( "/" segment )
+        @endcode
+
+        @par Exception Safety
+        No-throw guarantee.
+
+        @return A valid view on success, otherwise an
+        error code.
+
+        @param s The string to parse
+
+        @par Specification
+        @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.3"
+            >3.3.  Path (rfc3986)</a>
+
+        @see
+            @ref segments_encoded_view.
+    */
     BOOST_URL_DECL
     friend
-        system::result<segments_encoded_view>
-        parse_path(core::string_view s) noexcept;
+    system::result<segments_encoded_view>
+    parse_path(core::string_view s) noexcept;
 };
 
 } // urls
diff --git a/inst/include/boost/url/static_url.hpp b/inst/include/boost/url/static_url.hpp
index 9bac26175..b2224bbc6 100644
--- a/inst/include/boost/url/static_url.hpp
+++ b/inst/include/boost/url/static_url.hpp
@@ -92,7 +92,7 @@ class BOOST_URL_DECL
 
     @par Invariants
     @code
-    this->capacity() == Capacity
+    this->capacity() == Capacity + 1
     @endcode
 
     @tparam Capacity The maximum capacity
@@ -406,6 +406,8 @@ class static_url
     static_url& set_query(core::string_view s) { url_base::set_query(s); return *this; }
     /// @copydoc url_base::set_encoded_query
     static_url& set_encoded_query(pct_string_view s) { url_base::set_encoded_query(s); return *this; }
+    /// @copydoc url_base::set_params
+    static_url& set_params(std::initializer_list<param_view> ps, encoding_opts opts = {}) { url_base::set_params(ps, opts); return *this; }
     /// @copydoc url_base::remove_query
     static_url& remove_query() noexcept { url_base::remove_query(); return *this; }
 
diff --git a/inst/include/boost/url/string_view.hpp b/inst/include/boost/url/string_view.hpp
index 1a7ff0fbd..47f0c6862 100644
--- a/inst/include/boost/url/string_view.hpp
+++ b/inst/include/boost/url/string_view.hpp
@@ -26,7 +26,7 @@ namespace urls {
     buffer extends until it is no longer
     referenced.
 
-    @note This alias is no longer supported and
+    @warning This alias is no longer supported and
     should not be used in new code. Please use
     `core::string_view` instead.
 
diff --git a/inst/include/boost/url/url.hpp b/inst/include/boost/url/url.hpp
index f70c17a68..a8671140d 100644
--- a/inst/include/boost/url/url.hpp
+++ b/inst/include/boost/url/url.hpp
@@ -471,7 +471,7 @@ class BOOST_URL_DECL url
     /// @copydoc url_base::set_encoded_query
     url& set_encoded_query(pct_string_view s) { url_base::set_encoded_query(s); return *this; }
     /// @copydoc url_base::set_params
-    url& set_params(std::initializer_list<param_view> ps) { url_base::set_params(ps); return *this; }
+    url& set_params(std::initializer_list<param_view> ps, encoding_opts opts = {}) { url_base::set_params(ps, opts); return *this; }
     /// @copydoc url_base::set_encoded_params
     url& set_encoded_params(std::initializer_list< param_pct_view > ps) { url_base::set_encoded_params(ps); return *this; }
     /// @copydoc url_base::remove_query
diff --git a/inst/include/boost/url/url_base.hpp b/inst/include/boost/url/url_base.hpp
index 5b2019504..7c3f3c078 100644
--- a/inst/include/boost/url/url_base.hpp
+++ b/inst/include/boost/url/url_base.hpp
@@ -73,7 +73,9 @@ class BOOST_URL_DECL
     friend class segments_ref;
     friend class segments_encoded_ref;
     friend class params_encoded_ref;
+#ifndef BOOST_URL_DOCS
     friend struct detail::pattern;
+#endif
 
     struct op_t
     {
@@ -242,6 +244,7 @@ class BOOST_URL_DECL
     url_base&
     set_scheme(core::string_view s);
 
+#ifndef BOOST_URL_DOCS
     /** Set the scheme
 
         This function sets the scheme to the specified
@@ -274,9 +277,40 @@ class BOOST_URL_DECL
             3.1. Scheme (rfc3986)</a>
     */
     url_base&
-#ifndef BOOST_URL_DOCS
     set_scheme_id(urls::scheme id);
 #else
+    /** Set the scheme
+
+        This function sets the scheme to the specified
+        known @ref urls::scheme id, which may not be
+        @ref scheme::unknown or else an exception is
+        thrown. If the id is @ref scheme::none, this
+        function behaves as if @ref remove_scheme
+        were called.
+
+        @par Example
+        @code
+        assert( url( "http://example.com/echo.cgi" ).set_scheme_id( scheme::wss ).buffer() == "wss://example.com/echo.cgi" );
+        @endcode
+
+        @par Complexity
+        Linear in `this->size()`.
+
+        @par Exception Safety
+        Strong guarantee.
+        Calls to allocate may throw.
+        Exceptions thrown on invalid input.
+
+        @throw system_error
+        The scheme is invalid.
+
+        @param id The scheme to set.
+
+        @par Specification
+        @li <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-3.1">
+            3.1. Scheme (rfc3986)</a>
+    */
+    url_base&
     set_scheme_id(scheme id);
 #endif
 
@@ -2219,6 +2253,7 @@ class BOOST_URL_DECL
         Linear.
 
         @param ps The params to set.
+        @param opts The options for encoding.
 
         @par BNF
         @code
@@ -2241,7 +2276,9 @@ class BOOST_URL_DECL
             @ref set_query.
     */
     url_base&
-    set_params( std::initializer_list<param_view> ps ) noexcept;
+    set_params(
+        std::initializer_list<param_view> ps,
+        encoding_opts opts = {}) noexcept;
 
     /** Set the query params
 
@@ -2696,6 +2733,13 @@ class BOOST_URL_DECL
         this URL are unspecified and a @ref result
         with an `system::error_code` is returned.
 
+        @note Abnormal hrefs where the number of ".."
+        segments exceeds the number of segments in
+        the base path are handled by including the
+        unmatched ".." segments in the result, as described
+        in <a href="https://www.rfc-editor.org/errata/eid4547"
+        >Errata 4547</a>.
+
         @par Example
         @code
         url base1( "/one/two/three" );
@@ -2741,6 +2785,97 @@ class BOOST_URL_DECL
     resolve(
         url_view_base const& ref);
 
+    /** Resolve a URL reference against a base URL
+
+        This function attempts to resolve a URL
+        reference `ref` against the base URL `base`
+        in a manner similar to that of a web browser
+        resolving an anchor tag.
+
+        The base URL must satisfy the <em>URI</em>
+        grammar. In other words, it must contain
+        a scheme.
+
+        Relative references are only usable when
+        in the context of a base absolute URI.
+        This process of resolving a relative
+        <em>reference</em> within the context of
+        a <em>base</em> URI is defined in detail
+        in rfc3986 (see below).
+
+        The resolution process works as if the
+        relative reference is appended to the base
+        URI and the result is normalized.
+
+        Given the input base URL, this function
+        resolves the relative reference
+        as if performing the following steps:
+
+        @li Ensure the base URI has at least a scheme
+        @li Normalizing the reference path
+        @li Merge base and reference paths
+        @li Normalize the merged path
+
+        This function places the result of the
+        resolution into `dest`, which can be
+        any of the url containers that inherit
+        from @ref url_base.
+
+        If an error occurs, the contents of
+        `dest` is unspecified and `ec` is set.
+
+        @note Abnormal hrefs where the number of ".."
+        segments exceeds the number of segments in
+        the base path are handled by including the
+        unmatched ".." segments in the result, as described
+        in <a href="https://www.rfc-editor.org/errata/eid4547"
+        >Errata 4547</a>.
+
+        @par Example
+        @code
+        url dest;
+        system::error_code ec;
+
+        resolve("/one/two/three", "four", dest, ec);
+        assert( dest.str() == "/one/two/four" );
+
+        resolve("http://example.com/", "/one", dest, ec);
+        assert( dest.str() == "http://example.com/one" );
+
+        resolve("http://example.com/one", "/two", dest, ec);
+        assert( dest.str() == "http://example.com/two" );
+
+        resolve("http://a/b/c/d;p?q", "g#s", dest, ec);
+        assert( dest.str() == "http://a/b/c/g#s" );
+        @endcode
+
+        @par BNF
+        @code
+        absolute-URI  = scheme ":" hier-part [ "?" query ]
+        @endcode
+
+        @par Exception Safety
+        Basic guarantee.
+        Calls to allocate may throw.
+
+        @return An empty @ref result upon success,
+        otherwise an error code if `!base.has_scheme()`.
+
+        @param base The base URL to resolve against.
+
+        @param ref The URL reference to resolve.
+
+        @param dest The container where the result
+        is written, upon success.
+
+        @par Specification
+        <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-5"
+            >5. Reference Resolution (rfc3986)</a>
+
+        @see
+            @ref url,
+            @ref url_view.
+    */
     friend
     system::result<void>
     resolve(
@@ -2787,11 +2922,6 @@ class BOOST_URL_DECL
         detail::any_params_iter&&) ->
             detail::params_iter_impl;
 
-    system::result<void>
-    resolve_impl(
-        url_view_base const& base,
-        url_view_base const& ref);
-
     template<class CharSet>
     void normalize_octets_impl(int,
         CharSet const& allowed, op_t&) noexcept;
@@ -2840,6 +2970,13 @@ class BOOST_URL_DECL
     If an error occurs, the contents of
     `dest` is unspecified and `ec` is set.
 
+    @note Abnormal hrefs where the number of ".."
+    segments exceeds the number of segments in
+    the base path are handled by including the
+    unmatched ".." segments in the result, as described
+    in <a href="https://www.rfc-editor.org/errata/eid4547"
+    >Errata 4547</a>.
+
     @par Example
     @code
     url dest;
diff --git a/inst/include/boost/url/url_view_base.hpp b/inst/include/boost/url/url_view_base.hpp
index 85798e769..917a1f9fb 100644
--- a/inst/include/boost/url/url_view_base.hpp
+++ b/inst/include/boost/url/url_view_base.hpp
@@ -108,11 +108,26 @@ class BOOST_URL_DECL
     url_view_base& operator=(
         url_view_base const&) = delete;
 
-#ifndef BOOST_URL_DOCS
-public:
-#endif
+protected:
+    /** Calculate a hash of the url
+
+        This function calculates a hash of the
+        url as if it were always normalized.
+
+        @par Complexity
+        Linear in `this->size()`.
+
+        @par Exception Safety
+        Throws nothing.
+
+        @param salt An initial value to add to
+        the hash
+
+        @return A hash value suitable for use
+        in hash-based containers.
+    */
     std::size_t
-    digest(std::size_t = 0) const noexcept;
+    digest(std::size_t salt = 0) const noexcept;
 
 public:
     //--------------------------------------------
@@ -2378,24 +2393,7 @@ class BOOST_URL_DECL
         a.normalize();
         url b(u1);
         b.normalize();
-        return std::make_tuple(
-                   a.scheme(),
-                   a.user(),
-                   a.password(),
-                   a.host(),
-                   a.port(),
-                   a.path(),
-                   a.query(),
-                   a.fragment()) ==
-               std::make_tuple(
-                   b.scheme(),
-                   b.user(),
-                   b.password(),
-                   b.host(),
-                   b.port(),
-                   b.path(),
-                   b.query(),
-                   b.fragment());
+        return a.buffer() == b.buffer();
         @endcode
 
         @par Complexity
@@ -2438,24 +2436,7 @@ class BOOST_URL_DECL
         a.normalize();
         url b(u1);
         b.normalize();
-        return std::make_tuple(
-                   a.scheme(),
-                   a.user(),
-                   a.password(),
-                   a.host(),
-                   a.port(),
-                   a.path(),
-                   a.query(),
-                   a.fragment()) !=
-               std::make_tuple(
-                   b.scheme(),
-                   b.user(),
-                   b.password(),
-                   b.host(),
-                   b.port(),
-                   b.path(),
-                   b.query(),
-                   b.fragment());
+        return a.buffer() != b.buffer();
         @endcode
 
         @par Complexity
@@ -2498,24 +2479,7 @@ class BOOST_URL_DECL
         a.normalize();
         url b(u1);
         b.normalize();
-        return std::make_tuple(
-                   a.scheme(),
-                   a.user(),
-                   a.password(),
-                   a.host(),
-                   a.port(),
-                   a.path(),
-                   a.query(),
-                   a.fragment()) <
-               std::make_tuple(
-                   b.scheme(),
-                   b.user(),
-                   b.password(),
-                   b.host(),
-                   b.port(),
-                   b.path(),
-                   b.query(),
-                   b.fragment());
+        return a.buffer() < b.buffer();
         @endcode
 
         @par Complexity
@@ -2558,24 +2522,7 @@ class BOOST_URL_DECL
         a.normalize();
         url b(u1);
         b.normalize();
-        return std::make_tuple(
-                   a.scheme(),
-                   a.user(),
-                   a.password(),
-                   a.host(),
-                   a.port(),
-                   a.path(),
-                   a.query(),
-                   a.fragment()) <=
-               std::make_tuple(
-                   b.scheme(),
-                   b.user(),
-                   b.password(),
-                   b.host(),
-                   b.port(),
-                   b.path(),
-                   b.query(),
-                   b.fragment());
+        return a.buffer() <= b.buffer();
         @endcode
 
         @par Complexity
@@ -2618,24 +2565,7 @@ class BOOST_URL_DECL
         a.normalize();
         url b(u1);
         b.normalize();
-        return std::make_tuple(
-                   a.scheme(),
-                   a.user(),
-                   a.password(),
-                   a.host(),
-                   a.port(),
-                   a.path(),
-                   a.query(),
-                   a.fragment()) >
-               std::make_tuple(
-                   b.scheme(),
-                   b.user(),
-                   b.password(),
-                   b.host(),
-                   b.port(),
-                   b.path(),
-                   b.query(),
-                   b.fragment());
+        return a.buffer() > b.buffer();
         @endcode
 
         @par Complexity
@@ -2678,24 +2608,7 @@ class BOOST_URL_DECL
         a.normalize();
         url b(u1);
         b.normalize();
-        return std::make_tuple(
-                   a.scheme(),
-                   a.user(),
-                   a.password(),
-                   a.host(),
-                   a.port(),
-                   a.path(),
-                   a.query(),
-                   a.fragment()) >=
-               std::make_tuple(
-                   b.scheme(),
-                   b.user(),
-                   b.password(),
-                   b.host(),
-                   b.port(),
-                   b.path(),
-                   b.query(),
-                   b.fragment());
+        return a.buffer() >= b.buffer();
         @endcode
 
         @par Complexity
@@ -2719,6 +2632,38 @@ class BOOST_URL_DECL
         return u0.compare(u1) >= 0;
     }
 
+    /** Format the url to the output stream
+
+        This function serializes the url to
+        the specified output stream. Any
+        percent-escapes are emitted as-is;
+        no decoding is performed.
+
+        @par Example
+        @code
+        url_view u( "http://www.example.com/index.htm" );
+        std::stringstream ss;
+        ss << u;
+        assert( ss.str() == "http://www.example.com/index.htm" );
+        @endcode
+
+        @par Effects
+        @code
+        return os << u.buffer();
+        @endcode
+
+        @par Complexity
+        Linear in `u.buffer().size()`
+
+        @par Exception Safety
+        Basic guarantee.
+
+        @return A reference to the output stream, for chaining
+
+        @param os The output stream to write to.
+
+        @param u The url to write.
+    */
     friend
     std::ostream&
     operator<<(
diff --git a/inst/include/boost/url/variant.hpp b/inst/include/boost/url/variant.hpp
index dbb2d0410..01ca0378f 100644
--- a/inst/include/boost/url/variant.hpp
+++ b/inst/include/boost/url/variant.hpp
@@ -17,6 +17,22 @@ namespace boost {
 namespace urls {
 
 /** The type of variant used by the library
+
+    @warning This alias is no longer supported and
+    should not be used in new code. Please use
+    `boost::variant2::variant` instead.
+
+    This alias is included for backwards
+    compatibility with earlier versions of the
+    library.
+
+    However, it will be removed in future releases,
+    and using it in new code is not recommended.
+
+    Please use the updated version instead to
+    ensure compatibility with future versions of
+    the library.
+
 */
 template<class... Ts>
 using variant
diff --git a/inst/include/boost/utility/detail/minstd_rand.hpp b/inst/include/boost/utility/detail/minstd_rand.hpp
index 95efb21a3..a13614bb0 100644
--- a/inst/include/boost/utility/detail/minstd_rand.hpp
+++ b/inst/include/boost/utility/detail/minstd_rand.hpp
@@ -11,48 +11,6 @@
 // An implementation of minstd_rand that does not require
 // the Random library
 
-#include <boost/cstdint.hpp>
-
-namespace boost
-{
-namespace detail
-{
-
-class minstd_rand
-{
-private:
-
-    boost::uint_least32_t x_;
-
-    enum { a = 48271, m = 2147483647 };
-
-public:
-
-    minstd_rand(): x_( 1 )
-    {
-    }
-
-    explicit minstd_rand( boost::uint_least32_t x ): x_( x % m )
-    {
-        if( x_ == 0 )
-        {
-            x_ = 1;
-        }
-    }
-
-    boost::uint_least32_t operator()()
-    {
-        boost::uint_least64_t y = x_;
-
-        y = ( a * y ) % m;
-
-        x_ = static_cast<boost::uint_least32_t>( y );
-
-        return x_;
-    }
-};
-
-} // namespace detail
-} // namespace boost
+#include <boost/core/detail/minstd_rand.hpp>
 
 #endif // #ifndef BOOST_UTILITY_DETAIL_MINSTD_RAND_HPP_INCLUDED
diff --git a/inst/include/boost/uuid.hpp b/inst/include/boost/uuid.hpp
new file mode 100644
index 000000000..623336bb7
--- /dev/null
+++ b/inst/include/boost/uuid.hpp
@@ -0,0 +1,12 @@
+#ifndef BOOST_UUID_HPP_INCLUDED
+#define BOOST_UUID_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_io.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+
+#endif // #ifndef BOOST_UUID_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/basic_name_generator.hpp b/inst/include/boost/uuid/basic_name_generator.hpp
index 746904693..f52f3e3fd 100644
--- a/inst/include/boost/uuid/basic_name_generator.hpp
+++ b/inst/include/boost/uuid/basic_name_generator.hpp
@@ -1,166 +1,22 @@
-// Boost basic_name_generator.hpp header file  -----------------------//
+#ifndef BOOST_UUID_BASIC_NAME_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_BASIC_NAME_GENERATOR_HPP_INCLUDED
 
-// Copyright 2010 Andy Tompkins.
-// Copyright 2017 James E. King III
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-//  https://www.boost.org/LICENSE_1_0.txt)
+// This header is only provided for compatibility with
+// Boost release 1.85 and earlier.
 
-#ifndef BOOST_UUID_BASIC_NAME_GENERATOR_HPP
-#define BOOST_UUID_BASIC_NAME_GENERATOR_HPP
-
-#include <boost/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/uuid/uuid.hpp>
-#include <cstring> // for strlen, wcslen
-#include <string>
-
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
-#endif
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std {
-    using ::size_t;
-    using ::strlen;
-    using ::wcslen;
-} //namespace std
-#endif //BOOST_NO_STDC_NAMESPACE
+#include <boost/uuid/detail/basic_name_generator.hpp>
 
 namespace boost {
 namespace uuids {
 
-//! \brief Generate a name based UUID using
-//!        the provided hashing algorithm that
-//!        implements the NameHashProvider concept.
-template<class HashAlgo>
-class basic_name_generator
-{
-  public:
-    typedef uuid result_type;
-    typedef typename HashAlgo::digest_type digest_type;
-
-    explicit basic_name_generator(uuid const& namespace_uuid_)
-        : namespace_uuid(namespace_uuid_)
-    {}
-
-    uuid operator()(const char* name) const {
-        HashAlgo hash;
-        hash.process_bytes(namespace_uuid.begin(), namespace_uuid.size());
-        process_characters(hash, name, std::strlen(name));
-        return hash_to_uuid(hash);
-    }
-
-    uuid operator()(const wchar_t* name) const {
-        HashAlgo hash;
-        hash.process_bytes(namespace_uuid.begin(), namespace_uuid.size());
-        process_characters(hash, name, std::wcslen(name));
-        return hash_to_uuid(hash);
-    }
-
-    template <typename ch, typename char_traits, typename alloc>
-    uuid operator()(std::basic_string<ch, char_traits, alloc> const& name) const {
-        HashAlgo hash;
-        hash.process_bytes(namespace_uuid.begin(), namespace_uuid.size());
-        process_characters(hash, name.c_str(), name.length());
-        return hash_to_uuid(hash);
-    }
-
-    uuid operator()(void const* buffer, std::size_t byte_count) const {
-        HashAlgo hash;
-        hash.process_bytes(namespace_uuid.begin(), namespace_uuid.size());
-        hash.process_bytes(buffer, byte_count);
-        return hash_to_uuid(hash);
-    }
-
-private:
-    // we convert all characters to uint32_t so that each
-    // character is 4 bytes regardless of sizeof(char) or
-    // sizeof(wchar_t).  We want the name string on any
-    // platform / compiler to generate the same uuid
-    // except for char
-    template <typename char_type>
-    void process_characters(HashAlgo& hash, char_type const*const characters, std::size_t count) const {
-        BOOST_STATIC_ASSERT(sizeof(uint32_t) >= sizeof(char_type));
-
-        for (std::size_t i=0; i<count; i++) {
-            std::size_t c = characters[i];
-            hash.process_byte(static_cast<unsigned char>((c >>  0) & 0xFF));
-            hash.process_byte(static_cast<unsigned char>((c >>  8) & 0xFF));
-            hash.process_byte(static_cast<unsigned char>((c >> 16) & 0xFF));
-            hash.process_byte(static_cast<unsigned char>((c >> 24) & 0xFF));
-        }
-    }
-
-    void process_characters(HashAlgo& hash, char const*const characters, std::size_t count) const {
-        hash.process_bytes(characters, count);
-    }
-
-    uuid hash_to_uuid(HashAlgo& hash) const
-    {
-        digest_type digest;
-        hash.get_digest(digest);
-
-        BOOST_STATIC_ASSERT(sizeof(digest_type) >= 16);
-
-        uuid u;
-        for (int i=0; i<4; ++i) {
-            *(u.begin() + i*4+0) = static_cast<uint8_t>((digest[i] >> 24) & 0xFF);
-            *(u.begin() + i*4+1) = static_cast<uint8_t>((digest[i] >> 16) & 0xFF);
-            *(u.begin() + i*4+2) = static_cast<uint8_t>((digest[i] >> 8) & 0xFF);
-            *(u.begin() + i*4+3) = static_cast<uint8_t>((digest[i] >> 0) & 0xFF);
-        }
-
-        // set variant: must be 0b10xxxxxx
-        *(u.begin()+8) &= 0xBF;
-        *(u.begin()+8) |= 0x80;
-
-        // set version
-        unsigned char hashver = hash.get_version();
-        *(u.begin()+6) &= 0x0F;             // clear out the relevant bits
-        *(u.begin()+6) |= (hashver << 4);   // and apply them
-
-        return u;
-    }
-
-private:
-    uuid namespace_uuid;
-};
-
-namespace ns {
-
-BOOST_FORCEINLINE uuid dns() {
-    uuid result = {{
-        0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1 ,
-        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
-    return result;
-}
-
-BOOST_FORCEINLINE uuid url() {
-    uuid result = {{
-        0x6b, 0xa7, 0xb8, 0x11, 0x9d, 0xad, 0x11, 0xd1 ,
-        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
-    return result;
-}
-
-BOOST_FORCEINLINE uuid oid() {
-    uuid result = {{
-        0x6b, 0xa7, 0xb8, 0x12, 0x9d, 0xad, 0x11, 0xd1 ,
-        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
-    return result;
-}
-
-BOOST_FORCEINLINE uuid x500dn() {
-    uuid result = {{
-        0x6b, 0xa7, 0xb8, 0x14, 0x9d, 0xad, 0x11, 0xd1 ,
-        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
-    return result;
-}
+// Only provided for compatibility with 1.85
+using detail::basic_name_generator;
 
-} // ns
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_BASIC_NAME_GENERATOR_HPP
+#endif // BOOST_UUID_BASIC_NAME_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/basic_random_generator.hpp b/inst/include/boost/uuid/basic_random_generator.hpp
new file mode 100644
index 000000000..16a0d29dc
--- /dev/null
+++ b/inst/include/boost/uuid/basic_random_generator.hpp
@@ -0,0 +1,103 @@
+#ifndef BOOST_UUID_BASIC_RANDOM_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_BASIC_RANDOM_GENERATOR_HPP_INCLUDED
+
+// Copyright 2010 Andy Tompkins
+// Copyright 2017 James E. King III
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/detail/random_provider.hpp>
+#include <boost/uuid/detail/endian.hpp>
+#include <boost/assert.hpp>
+#include <type_traits>
+#include <random>
+#include <cstdint>
+
+namespace boost {
+namespace uuids {
+
+template<class UniformRandomNumberGenerator>
+class basic_random_generator
+{
+private:
+
+    UniformRandomNumberGenerator* p_;
+    UniformRandomNumberGenerator g_;
+
+public:
+
+    using result_type = uuid;
+
+    // default constructor creates the random number generator and
+    // if the UniformRandomNumberGenerator is a PseudoRandomNumberGenerator
+    // then it gets seeded by a random_provider.
+    basic_random_generator(): p_( 0 ), g_()
+    {
+        // seed the random number generator if it is capable
+        seed( g_, 0 );
+    }
+
+    // keep a reference to a random number generator
+    // don't seed a given random number generator
+    explicit basic_random_generator( UniformRandomNumberGenerator& gen ): p_( &gen )
+    {
+    }
+
+    // keep a pointer to a random number generator
+    // don't seed a given random number generator
+    explicit basic_random_generator( UniformRandomNumberGenerator* gen ): p_( gen )
+    {
+        BOOST_ASSERT( gen != 0 );
+    }
+
+    result_type operator()()
+    {
+        UniformRandomNumberGenerator& gen = p_? *p_: g_;
+
+        std::uniform_int_distribution<std::uint32_t> dist;
+
+        result_type u;
+
+        detail::store_native_u32( u.data +  0, dist( gen ) );
+        detail::store_native_u32( u.data +  4, dist( gen ) );
+        detail::store_native_u32( u.data +  8, dist( gen ) );
+        detail::store_native_u32( u.data + 12, dist( gen ) );
+
+        // set variant
+        // must be 0b10xxxxxx
+        *(u.begin() + 8) &= 0x3F;
+        *(u.begin() + 8) |= 0x80;
+
+        // set version
+        // must be 0b0100xxxx
+        *(u.begin() + 6) &= 0x0F; //0b00001111
+        *(u.begin() + 6) |= 0x40; //0b01000000
+
+        return u;
+    }
+
+private:
+
+    // Detect whether UniformRandomNumberGenerator has a seed() method which indicates that
+    // it is a PseudoRandomNumberGenerator and needs a seed to initialize it.  This allows
+    // basic_random_generator to take any type of UniformRandomNumberGenerator and still
+    // meet the post-conditions for the default constructor.
+
+    template<class MaybePseudoRandomNumberGenerator, class En = decltype( std::declval<MaybePseudoRandomNumberGenerator&>().seed() )>
+    void seed( MaybePseudoRandomNumberGenerator& rng, int )
+    {
+        detail::random_provider seeder;
+        rng.seed(seeder);
+    }
+
+    template<class MaybePseudoRandomNumberGenerator>
+    void seed( MaybePseudoRandomNumberGenerator&, long )
+    {
+    }
+};
+
+}} // namespace boost::uuids
+
+#endif // BOOST_UUID_BASIC_RANDOM_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/basic_name_generator.hpp b/inst/include/boost/uuid/detail/basic_name_generator.hpp
new file mode 100644
index 000000000..eccaae566
--- /dev/null
+++ b/inst/include/boost/uuid/detail/basic_name_generator.hpp
@@ -0,0 +1,217 @@
+#ifndef BOOST_UUID_DETAIL_BASIC_NAME_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_BASIC_NAME_GENERATOR_HPP_INCLUDED
+
+// Boost basic_name_generator.hpp header file  -----------------------//
+
+// Copyright 2010 Andy Tompkins.
+// Copyright 2017 James E. King III
+
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+//  https://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/uuid/namespaces.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/detail/static_assert.hpp>
+#include <boost/config.hpp>
+#include <string>
+#include <cstdint>
+#include <cstring> // for strlen, wcslen
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+template<class HashAlgo>
+class basic_name_generator
+{
+private:
+
+    uuid namespace_uuid_;
+
+private:
+
+    using digest_type = typename HashAlgo::digest_type;
+
+public:
+
+    using result_type = uuid;
+
+    explicit basic_name_generator( uuid const& namespace_uuid ) noexcept
+        : namespace_uuid_( namespace_uuid )
+    {}
+
+    template<class Ch> uuid operator()( Ch const* name ) const noexcept
+    {
+        HashAlgo hash;
+
+        hash.process_bytes( namespace_uuid_.begin(), namespace_uuid_.size() );
+        process_characters( hash, name, std::char_traits<Ch>().length( name ) );
+
+        return hash_to_uuid( hash );
+    }
+
+    template<class Ch, class Traits, class Alloc>
+    uuid operator()( std::basic_string<Ch, Traits, Alloc> const& name ) const noexcept
+    {
+        HashAlgo hash;
+
+        hash.process_bytes( namespace_uuid_.begin(), namespace_uuid_.size() );
+        process_characters( hash, name.c_str(), name.length() );
+
+        return hash_to_uuid( hash );
+    }
+
+    uuid operator()( void const* buffer, std::size_t byte_count ) const noexcept
+    {
+        HashAlgo hash;
+
+        hash.process_bytes( namespace_uuid_.begin(), namespace_uuid_.size() );
+        hash.process_bytes( buffer, byte_count );
+
+        return hash_to_uuid( hash );
+    }
+
+private:
+
+    void process_characters( HashAlgo& hash, char const* p, std::size_t n ) const noexcept
+    {
+        hash.process_bytes( p, n );
+    }
+
+    // For portability, we convert all wide characters to uint32_t so that each
+    // character is 4 bytes regardless of sizeof(wchar_t).
+
+    void process_characters( HashAlgo& hash, wchar_t const* p, std::size_t n ) const noexcept
+    {
+        BOOST_UUID_STATIC_ASSERT( sizeof( std::uint32_t ) >= sizeof( wchar_t ) );
+
+        for( std::size_t i = 0; i < n; ++i)
+        {
+            std::uint32_t ch = p[ i ];
+
+            unsigned char bytes[ 4 ] =
+            {
+                static_cast<unsigned char>( ( ch >>  0 ) & 0xFF ),
+                static_cast<unsigned char>( ( ch >>  8 ) & 0xFF ),
+                static_cast<unsigned char>( ( ch >> 16 ) & 0xFF ),
+                static_cast<unsigned char>( ( ch >> 24 ) & 0xFF )
+            };
+
+            hash.process_bytes( bytes, 4 );
+        }
+    }
+
+    void process_characters( HashAlgo& hash, char32_t const* p, std::size_t n ) const noexcept
+    {
+        for( std::size_t i = 0; i < n; ++i)
+        {
+            process_utf32_codepoint( hash, p[ i ] );
+        }
+    }
+
+    void process_characters( HashAlgo& hash, char16_t const* p, std::size_t n ) const noexcept
+    {
+        for( std::size_t i = 0; i < n; ++i)
+        {
+            char16_t ch = p[ i ];
+
+            if( ch >= 0xD800 && ch <= 0xDBFF && i + 1 < n && p[ i+1 ] >= 0xDC00 && p[ i+1 ] <= 0xDFFF )
+            {
+                char16_t ch2 = p[ ++i ];
+
+                std::uint32_t high = ch - 0xD800;
+                std::uint32_t low = ch2 - 0xDC00;
+
+                process_utf32_codepoint( hash, ( high << 10 ) + low + 0x10000 );
+            }
+            else
+            {
+                process_utf32_codepoint( hash, ch );
+            }
+        }
+    }
+
+    void process_utf32_codepoint( HashAlgo& hash, std::uint32_t cp ) const noexcept
+    {
+        if( ( cp >= 0xD800 && cp <= 0xDFFF ) || cp > 0x10FFFF )
+        {
+            cp = 0xFFFD; // Unicode replacement character
+        }
+
+        if( cp < 0x80 )
+        {
+            hash.process_byte( static_cast<unsigned char>( cp ) );
+        }
+        else if( cp < 0x800 )
+        {
+            unsigned char bytes[ 2 ] =
+            {
+                static_cast<unsigned char>( 0xC0 | (cp >>   6) ),
+                static_cast<unsigned char>( 0x80 | (cp & 0x3F) )
+            };
+
+            hash.process_bytes( bytes, 2 );
+        }
+        else if( cp < 0x10000 )
+        {
+            unsigned char bytes[ 3 ] =
+            {
+                static_cast<unsigned char>( 0xE0 | (cp >> 12)         ),
+                static_cast<unsigned char>( 0x80 | ((cp >> 6) & 0x3F) ),
+                static_cast<unsigned char>( 0x80 | (cp & 0x3F)        )
+            };
+
+            hash.process_bytes( bytes, 3 );
+        }
+        else
+        {
+            unsigned char bytes[ 4 ] =
+            {
+                static_cast<unsigned char>( 0xF0 | ( cp >> 18 )          ),
+                static_cast<unsigned char>( 0x80 | ((cp >> 12 ) & 0x3F ) ),
+                static_cast<unsigned char>( 0x80 | ((cp >>  6 ) & 0x3F ) ),
+                static_cast<unsigned char>( 0x80 | (cp & 0x3F)           )
+            };
+
+            hash.process_bytes( bytes, 4 );
+        }
+    }
+
+#if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
+
+    void process_characters( HashAlgo& hash, char8_t const* p, std::size_t n ) const noexcept
+    {
+        hash.process_bytes( p, n );
+    }
+
+#endif
+
+    uuid hash_to_uuid( HashAlgo& hash ) const noexcept
+    {
+        digest_type digest;
+        hash.get_digest(digest);
+
+        BOOST_UUID_STATIC_ASSERT( sizeof(digest_type) >= 16 );
+
+        uuid u;
+        std::memcpy( u.data, digest, 16 );
+
+        // set variant: must be 0b10xxxxxx
+        *(u.begin()+8) &= 0x3F;
+        *(u.begin()+8) |= 0x80;
+
+        // set version
+        unsigned char hashver = hash.get_version();
+        *(u.begin()+6) &= 0x0F;             // clear out the relevant bits
+        *(u.begin()+6) |= (hashver << 4);   // and apply them
+
+        return u;
+    }
+};
+
+} // namespace detail
+} // uuids
+} // boost
+
+#endif // BOOST_UUID_DETAIL_BASIC_NAME_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/chacha20.hpp b/inst/include/boost/uuid/detail/chacha20.hpp
new file mode 100644
index 000000000..6e66ce221
--- /dev/null
+++ b/inst/include/boost/uuid/detail/chacha20.hpp
@@ -0,0 +1,160 @@
+#ifndef BOOST_UUID_DETAIL_CHACHA20_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_CHACHA20_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <limits>
+#include <cstdint>
+#include <cstddef>
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+class chacha20_12
+{
+private:
+
+    std::uint32_t state_[ 16 ];
+    std::uint32_t block_[ 16 ];
+    std::size_t index_;
+
+private:
+
+    static inline std::uint32_t rotl( std::uint32_t x, int n ) noexcept
+    {
+        return ( x << n ) | ( x >> (32 - n) );
+    }
+
+    static inline void quarter_round( std::uint32_t (&x)[ 16 ], int a, int b, int c, int d ) noexcept
+    {
+        x[ a ] += x[ b ]; x[ d ] = rotl( x[d] ^ x[a], 16 );
+        x[ c ] += x[ d ]; x[ b ] = rotl( x[b] ^ x[c], 12 );
+        x[ a ] += x[ b ]; x[ d ] = rotl( x[d] ^ x[a],  8 );
+        x[ c ] += x[ d ]; x[ b ] = rotl( x[b] ^ x[c],  7 );
+    }
+
+    void get_next_block() noexcept
+    {
+        for( int i = 0; i < 16; ++i )
+        {
+            block_[ i ] = state_[ i ];
+        }
+
+        for( int i = 0; i < 6; ++i )
+        {
+            quarter_round( block_, 0, 4,  8, 12 );
+            quarter_round( block_, 1, 5,  9, 13 );
+            quarter_round( block_, 2, 6, 10, 14 );
+            quarter_round( block_, 3, 7, 11, 15 );
+            quarter_round( block_, 0, 5, 10, 15 );
+            quarter_round( block_, 1, 6, 11, 12 );
+            quarter_round( block_, 2, 7,  8, 13 );
+            quarter_round( block_, 3, 4,  9, 14 );
+        }
+
+        for( int i = 0; i < 16; ++i )
+        {
+            block_[ i ] += state_[ i ];
+        }
+
+        if( ++state_[ 12 ] == 0 ) ++state_[ 13 ];
+    }
+
+public:
+
+    using result_type = std::uint32_t;
+
+    chacha20_12() noexcept: index_( 16 )
+    {
+        state_[ 0 ] = 0x61707865;
+        state_[ 1 ] = 0x3320646e;
+        state_[ 2 ] = 0x79622d32;
+        state_[ 3 ] = 0x6b206574;
+
+        for( int i = 4; i < 16; ++i )
+        {
+            state_[ i ] = 0;
+        }
+    }
+
+    chacha20_12( std::uint32_t const (&key)[ 8 ], std::uint32_t const (&nonce)[ 2 ] ) noexcept: index_( 16 )
+    {
+        state_[ 0 ] = 0x61707865;
+        state_[ 1 ] = 0x3320646e;
+        state_[ 2 ] = 0x79622d32;
+        state_[ 3 ] = 0x6b206574;
+
+        for( int i = 0; i < 8; ++i )
+        {
+            state_[ i + 4 ] = key[ i ];
+        }
+
+        state_[ 12 ] = 0;
+        state_[ 13 ] = 0;
+
+        state_[ 14 ] = nonce[ 0 ];
+        state_[ 15 ] = nonce[ 1 ];
+    }
+
+    // only needed because basic_random_generator looks for it
+    void seed() noexcept
+    {
+        index_ = 16;
+
+        for( int i = 4; i < 16; ++i )
+        {
+            state_[ i ] = 0;
+        }
+    }
+
+    template<class Seq> void seed( Seq& seq )
+    {
+        index_ = 16;
+
+        seq.generate( state_ + 4, state_ + 16 );
+
+        // reset counter
+        state_[ 12 ] = 0;
+        state_[ 13 ] = 0;
+    }
+
+    // perturbs the generator state so that it no longer generates
+    // the same sequence; useful for e.g. moved from objects
+    void perturb() noexcept
+    {
+        index_ = 16;
+
+        for( int i = 12; i < 16; ++i )
+        {
+            ++state_[ i ];
+        }
+    }
+
+    static constexpr result_type min() noexcept
+    {
+        return std::numeric_limits<result_type>::min();
+    }
+
+    static constexpr result_type max() noexcept
+    {
+        return std::numeric_limits<result_type>::max();
+    }
+
+    result_type operator()() noexcept
+    {
+        if( index_ == 16 )
+        {
+            get_next_block();
+            index_ = 0;
+        }
+
+        return block_[ index_++ ];
+    }
+};
+
+}}} // namespace boost::uuids::detail
+
+#endif // #ifndef BOOST_UUID_DETAIL_SHA1_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/config.hpp b/inst/include/boost/uuid/detail/config.hpp
index f78b97aea..3710f4272 100644
--- a/inst/include/boost/uuid/detail/config.hpp
+++ b/inst/include/boost/uuid/detail/config.hpp
@@ -40,30 +40,31 @@
 #define BOOST_UUID_USE_AVX
 #endif
 
+#if ((defined(__AVX512F__) && defined(__AVX512VL__) && defined(__AVX512BW__)) || defined(__AVX10_1__)) && !defined(BOOST_UUID_USE_AVX10_1)
+#define BOOST_UUID_USE_AVX10_1
+#endif
+
 #elif defined(_MSC_VER)
 
 #if (defined(_M_X64) || (defined(_M_IX86) && defined(_M_IX86_FP) && _M_IX86_FP >= 2)) && !defined(BOOST_UUID_USE_SSE2)
 #define BOOST_UUID_USE_SSE2
 #endif
 
-#if defined(__AVX__)
-#if !defined(BOOST_UUID_USE_AVX)
+#if defined(__AVX__) && !defined(BOOST_UUID_USE_AVX)
 #define BOOST_UUID_USE_AVX
 #endif
-#if !defined(BOOST_UUID_USE_SSE41)
-#define BOOST_UUID_USE_SSE41
-#endif
-#if !defined(BOOST_UUID_USE_SSE3)
-#define BOOST_UUID_USE_SSE3
-#endif
-#if !defined(BOOST_UUID_USE_SSE2)
-#define BOOST_UUID_USE_SSE2
-#endif
+
+#if ((defined(__AVX512F__) && defined(__AVX512VL__) && defined(__AVX512BW__)) || defined(__AVX10_1__)) && !defined(BOOST_UUID_USE_AVX10_1)
+#define BOOST_UUID_USE_AVX10_1
 #endif
 
 #endif
 
 // More advanced ISA extensions imply less advanced are also available
+#if !defined(BOOST_UUID_USE_AVX) && defined(BOOST_UUID_USE_AVX10_1)
+#define BOOST_UUID_USE_AVX
+#endif
+
 #if !defined(BOOST_UUID_USE_SSE41) && defined(BOOST_UUID_USE_AVX)
 #define BOOST_UUID_USE_SSE41
 #endif
@@ -77,6 +78,7 @@
 #endif
 
 #if !defined(BOOST_UUID_NO_SIMD) && \
+    !defined(BOOST_UUID_USE_AVX10_1) && \
     !defined(BOOST_UUID_USE_AVX) && \
     !defined(BOOST_UUID_USE_SSE41) && \
     !defined(BOOST_UUID_USE_SSE3) && \
diff --git a/inst/include/boost/uuid/detail/endian.hpp b/inst/include/boost/uuid/detail/endian.hpp
new file mode 100644
index 000000000..1761a6b08
--- /dev/null
+++ b/inst/include/boost/uuid/detail/endian.hpp
@@ -0,0 +1,404 @@
+#ifndef BOOST_UUID_DETAIL_ENDIAN_INCLUDED
+#define BOOST_UUID_DETAIL_ENDIAN_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <cstring>
+#include <cstdint>
+
+#if defined(_MSC_VER) && !defined(__clang__)
+# include <intrin.h>
+#endif
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+// Byte order macros
+
+#if defined(__BYTE_ORDER__)
+
+#define BOOST_UUID_BYTE_ORDER __BYTE_ORDER__
+#define BOOST_UUID_ORDER_LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
+#define BOOST_UUID_ORDER_BIG_ENDIAN __ORDER_BIG_ENDIAN__
+
+#elif defined(__LITTLE_ENDIAN__) || defined(_MSC_VER) || defined(__i386__) || defined(__x86_64__)
+
+#define BOOST_UUID_BYTE_ORDER 1234
+#define BOOST_UUID_ORDER_LITTLE_ENDIAN 1234
+#define BOOST_UUID_ORDER_BIG_ENDIAN 4321
+
+#elif defined(__BIG_ENDIAN__)
+
+#define BOOST_UUID_BYTE_ORDER 4321
+#define BOOST_UUID_ORDER_LITTLE_ENDIAN 1234
+#define BOOST_UUID_ORDER_BIG_ENDIAN 4321
+
+#else
+
+# error Unrecognized platform
+
+#endif
+
+// byteswap
+
+#if defined(__GNUC__) || defined(__clang__)
+
+inline std::uint16_t byteswap( std::uint16_t x ) noexcept
+{
+    return __builtin_bswap16( x );
+}
+
+inline std::uint32_t byteswap( std::uint32_t x ) noexcept
+{
+    return __builtin_bswap32( x );
+}
+
+inline std::uint64_t byteswap( std::uint64_t x ) noexcept
+{
+    return __builtin_bswap64( x );
+}
+
+#elif defined(_MSC_VER)
+
+inline std::uint16_t byteswap( std::uint16_t x ) noexcept
+{
+    return _byteswap_ushort( x );
+}
+
+inline std::uint32_t byteswap( std::uint32_t x ) noexcept
+{
+    return _byteswap_ulong( x );
+}
+
+inline std::uint64_t byteswap( std::uint64_t x ) noexcept
+{
+    return _byteswap_uint64( x );
+}
+
+#else
+
+inline std::uint16_t byteswap( std::uint16_t x ) noexcept
+{
+    return static_cast<std::uint16_t>( x << 8 | x >> 8 );
+}
+
+inline std::uint32_t byteswap( std::uint32_t x ) noexcept
+{
+    std::uint32_t step16 = x << 16 | x >> 16;
+    return ((step16 << 8) & 0xff00ff00) | ((step16 >> 8) & 0x00ff00ff);
+}
+
+inline std::uint64_t byteswap( std::uint64_t x ) noexcept
+{
+    std::uint64_t step32 = x << 32 | x >> 32;
+    std::uint64_t step16 = (step32 & 0x0000FFFF0000FFFFULL) << 16 | (step32 & 0xFFFF0000FFFF0000ULL) >> 16;
+    return (step16 & 0x00FF00FF00FF00FFULL) << 8 | (step16 & 0xFF00FF00FF00FF00ULL) >> 8;
+}
+
+#endif
+
+#if defined(__SIZEOF_INT128__)
+
+inline __uint128_t byteswap( __uint128_t x ) noexcept
+{
+    return ( static_cast<__uint128_t>( detail::byteswap( static_cast<std::uint64_t>( x ) ) ) << 64 ) | detail::byteswap( static_cast<std::uint64_t>( x >> 64 ) );
+}
+
+#endif
+
+// load_*_u16
+
+inline std::uint16_t load_native_u16( void const* p ) noexcept
+{
+    std::uint16_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+    return tmp;
+}
+
+inline std::uint16_t load_little_u16( void const* p ) noexcept
+{
+    std::uint16_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+inline std::uint16_t load_big_u16( void const* p ) noexcept
+{
+    std::uint16_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_BIG_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+// load_*_u32
+
+inline std::uint32_t load_native_u32( void const* p ) noexcept
+{
+    std::uint32_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+    return tmp;
+}
+
+inline std::uint32_t load_little_u32( void const* p ) noexcept
+{
+    std::uint32_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+inline std::uint32_t load_big_u32( void const* p ) noexcept
+{
+    std::uint32_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_BIG_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+// load_*_u64
+
+inline std::uint64_t load_native_u64( void const* p ) noexcept
+{
+    std::uint64_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+    return tmp;
+}
+
+inline std::uint64_t load_little_u64( void const* p ) noexcept
+{
+    std::uint64_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+inline std::uint64_t load_big_u64( void const* p ) noexcept
+{
+    std::uint64_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_BIG_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+// load_*_u128
+
+#if defined(__SIZEOF_INT128__)
+
+inline __uint128_t load_native_u128( void const* p ) noexcept
+{
+    __uint128_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+    return tmp;
+}
+
+inline __uint128_t load_little_u128( void const* p ) noexcept
+{
+    __uint128_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+inline __uint128_t load_big_u128( void const* p ) noexcept
+{
+    __uint128_t tmp;
+    std::memcpy( &tmp, p, sizeof( tmp ) );
+
+#if BOOST_UUID_BYTE_ORDER == BOOST_UUID_ORDER_BIG_ENDIAN
+
+    return tmp;
+
+#else
+
+    return detail::byteswap( tmp );
+
+#endif
+}
+
+#endif
+
+// store_*_u16
+
+inline void store_native_u16( void* p, std::uint16_t v ) noexcept
+{
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_little_u16( void* p, std::uint16_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_big_u16( void* p, std::uint16_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_BIG_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+// store_*_u32
+
+inline void store_native_u32( void* p, std::uint32_t v ) noexcept
+{
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_little_u32( void* p, std::uint32_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_big_u32( void* p, std::uint32_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_BIG_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+// store_*_u64
+
+inline void store_native_u64( void* p, std::uint64_t v ) noexcept
+{
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_little_u64( void* p, std::uint64_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_big_u64( void* p, std::uint64_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_BIG_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+// store_*_u128
+
+#if defined(__SIZEOF_INT128__)
+
+inline void store_native_u128( void* p, __uint128_t v ) noexcept
+{
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_little_u128( void* p, __uint128_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_LITTLE_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+inline void store_big_u128( void* p, __uint128_t v ) noexcept
+{
+#if BOOST_UUID_BYTE_ORDER != BOOST_UUID_ORDER_BIG_ENDIAN
+
+    v = detail::byteswap( v );
+
+#endif
+
+    std::memcpy( p, &v, sizeof( v ) );
+}
+
+#endif
+
+} // detail
+} // uuids
+} // boost
+
+#endif // #ifndef BOOST_UUID_DETAIL_ENDIAN_INCLUDED
diff --git a/inst/include/boost/uuid/detail/hash_mix.hpp b/inst/include/boost/uuid/detail/hash_mix.hpp
new file mode 100644
index 000000000..9f182eff0
--- /dev/null
+++ b/inst/include/boost/uuid/detail/hash_mix.hpp
@@ -0,0 +1,43 @@
+#ifndef BOOST_UUID_DETAIL_HASH_MIX_INCLUDED
+#define BOOST_UUID_DETAIL_HASH_MIX_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <cstdint>
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+// The multipliers are 32 bit, which makes the product
+// easier to compute on 32 bit platforms.
+//
+// The mixing functions have been created with
+// https://github.com/skeeto/hash-prospector
+
+// prospector -p mul,xorr -t 1000
+// score = 592.20293470138972
+inline std::uint64_t hash_mix_mx( std::uint64_t x ) noexcept
+{
+    x *= 0xD96AAA55;
+    x ^= x >> 16;
+    return x;
+}
+
+// prospector -p mul:0xD96AAA55,xorr:16,mul,xorr -t 1000
+// score = 79.5223047689704
+// (with mx prepended)
+inline std::uint64_t hash_mix_fmx( std::uint64_t x ) noexcept
+{
+    x *= 0x7DF954AB;
+    x ^= x >> 16;
+    return x;
+}
+
+} // detail
+} // uuids
+} // boost
+
+#endif // #ifndef BOOST_UUID_DETAIL_HASH_MIX_INCLUDED
diff --git a/inst/include/boost/uuid/detail/md5.hpp b/inst/include/boost/uuid/detail/md5.hpp
index 1dbdb77f3..dd5560367 100644
--- a/inst/include/boost/uuid/detail/md5.hpp
+++ b/inst/include/boost/uuid/detail/md5.hpp
@@ -1,3 +1,6 @@
+#ifndef BOOST_UUID_DETAIL_MD5_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_MD5_HPP_INCLUDED
+
 /*
  * This RFC 1321 compatible MD5 implementation originated at:
  * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
@@ -23,14 +26,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // https://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UUID_MD5_HPP
-#define BOOST_UUID_MD5_HPP
-
-#include <boost/cast.hpp>
-#include <boost/config.hpp>
-#include <boost/cstdint.hpp>
+#include <boost/uuid/detail/numeric_cast.hpp>
 #include <boost/uuid/uuid.hpp> // for version
-#include <boost/predef/other/endian.h>
 #include <string.h>
 
 namespace boost {
@@ -40,7 +37,8 @@ namespace detail {
 class md5
 {
 public:
-    typedef unsigned int(digest_type)[4];
+
+    typedef unsigned char digest_type[ 16 ];
 
     md5()
     {
@@ -54,12 +52,12 @@ class md5
 
     void process_bytes(void const* buffer, std::size_t byte_count)
     {
-        MD5_Update(&ctx_, buffer, boost::numeric_cast<unsigned long>(byte_count));
+        MD5_Update(&ctx_, buffer, detail::numeric_cast<unsigned long>(byte_count));
     }
 
     void get_digest(digest_type& digest)
     {
-        MD5_Final(reinterpret_cast<unsigned char *>(&digest[0]), &ctx_);
+        MD5_Final(digest, &ctx_);
     }
 
     unsigned char get_version() const
@@ -71,7 +69,7 @@ class md5
 private:
 
     /* Any 32-bit or wider unsigned integer data type will do */
-    typedef uint32_t MD5_u32plus;
+    typedef std::uint32_t MD5_u32plus;
 
     typedef struct {
         MD5_u32plus lo, hi;
@@ -118,9 +116,9 @@ class md5
      */
     #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
     #define BOOST_UUID_DETAIL_MD5_SET(n) \
-        (*(MD5_u32plus *)&ptr[(n) * 4])
+        (memcpy(&ctx->block[(n)], &ptr[(n) * 4], sizeof(MD5_u32plus)), (ctx->block[(n)]))
     #define BOOST_UUID_DETAIL_MD5_GET(n) \
-        BOOST_UUID_DETAIL_MD5_SET(n)
+        (ctx->block[(n)])
     #else
     #define BOOST_UUID_DETAIL_MD5_SET(n) \
         (ctx->block[(n)] = \
@@ -288,50 +286,12 @@ class md5
         memcpy(ctx->buffer, data, size);
     }
 
-    // This must remain consistent no matter the endianness
     #define BOOST_UUID_DETAIL_MD5_OUT(dst, src) \
         (dst)[0] = (unsigned char)(src); \
         (dst)[1] = (unsigned char)((src) >> 8); \
         (dst)[2] = (unsigned char)((src) >> 16); \
         (dst)[3] = (unsigned char)((src) >> 24);
 
-    //
-    // A big-endian issue with MD5 results was resolved
-    // in boost 1.71.  If you generated md5 name-based uuids
-    // with boost 1.66 through 1.70 and stored them, then
-    // set the following compatibility flag to ensure that
-    // your hash generation remains consistent.
-    //
-#if defined(BOOST_UUID_COMPAT_PRE_1_71_MD5)
-    #define BOOST_UUID_DETAIL_MD5_BYTE_OUT(dst, src) \
-        BOOST_UUID_DETAIL_MD5_OUT(dst, src)
-#else
-    //
-    // We're copying into a byte buffer which is actually
-    // backed by an unsigned int array, which later on
-    // is then swabbed one more time by the basic name
-    // generator.  Therefore the logic here is reversed.
-    // This was done to minimize the impact to existing
-    // name-based hash generation.  The correct fix would
-    // be to make this and name generation endian-correct
-    // but that would even break previously generated sha1
-    // hashes too.
-    //
-#if BOOST_ENDIAN_LITTLE_BYTE
-    #define BOOST_UUID_DETAIL_MD5_BYTE_OUT(dst, src) \
-        (dst)[0] = (unsigned char)((src) >> 24); \
-        (dst)[1] = (unsigned char)((src) >> 16); \
-        (dst)[2] = (unsigned char)((src) >> 8); \
-        (dst)[3] = (unsigned char)(src);
-#else
-    #define BOOST_UUID_DETAIL_MD5_BYTE_OUT(dst, src) \
-        (dst)[0] = (unsigned char)(src); \
-        (dst)[1] = (unsigned char)((src) >> 8); \
-        (dst)[2] = (unsigned char)((src) >> 16); \
-        (dst)[3] = (unsigned char)((src) >> 24);
-#endif
-#endif // BOOST_UUID_COMPAT_PRE_1_71_MD5
-
     void MD5_Final(unsigned char *result, MD5_CTX *ctx)
     {
         unsigned long used, available;
@@ -357,10 +317,10 @@ class md5
 
         body(ctx, ctx->buffer, 64);
 
-        BOOST_UUID_DETAIL_MD5_BYTE_OUT(&result[0], ctx->a)
-        BOOST_UUID_DETAIL_MD5_BYTE_OUT(&result[4], ctx->b)
-        BOOST_UUID_DETAIL_MD5_BYTE_OUT(&result[8], ctx->c)
-        BOOST_UUID_DETAIL_MD5_BYTE_OUT(&result[12], ctx->d)
+        BOOST_UUID_DETAIL_MD5_OUT(&result[0], ctx->a)
+        BOOST_UUID_DETAIL_MD5_OUT(&result[4], ctx->b)
+        BOOST_UUID_DETAIL_MD5_OUT(&result[8], ctx->c)
+        BOOST_UUID_DETAIL_MD5_OUT(&result[12], ctx->d)
 
         memset(ctx, 0, sizeof(*ctx));
     }
@@ -378,4 +338,4 @@ class md5
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_MD5_HPP
+#endif // BOOST_UUID_DETAIL_MD5_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/numeric_cast.hpp b/inst/include/boost/uuid/detail/numeric_cast.hpp
new file mode 100644
index 000000000..7fd56589c
--- /dev/null
+++ b/inst/include/boost/uuid/detail/numeric_cast.hpp
@@ -0,0 +1,38 @@
+#ifndef BOOST_UUID_DETAIL_NUMERIC_CAST_INCLUDED
+#define BOOST_UUID_DETAIL_NUMERIC_CAST_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/detail/static_assert.hpp>
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+#include <limits>
+#include <type_traits>
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+template<class T, class U> T numeric_cast( U u )
+{
+    BOOST_UUID_STATIC_ASSERT( std::is_integral<T>::value );
+    BOOST_UUID_STATIC_ASSERT( std::is_unsigned<T>::value );
+
+    BOOST_UUID_STATIC_ASSERT( std::is_integral<U>::value );
+    BOOST_UUID_STATIC_ASSERT( std::is_unsigned<U>::value );
+
+    if( u > std::numeric_limits<T>::max() )
+    {
+        BOOST_THROW_EXCEPTION( std::range_error( "Argument to numeric_cast is out of range of destination type" ) );
+    }
+
+    return static_cast<T>( u );
+}
+
+} // detail
+} // uuids
+} // boost
+
+#endif // #ifndef BOOST_UUID_DETAIL_NUMERIC_CAST_INCLUDED
diff --git a/inst/include/boost/uuid/detail/random_device.hpp b/inst/include/boost/uuid/detail/random_device.hpp
new file mode 100644
index 000000000..771cdadf5
--- /dev/null
+++ b/inst/include/boost/uuid/detail/random_device.hpp
@@ -0,0 +1,79 @@
+#ifndef BOOST_UUID_DETAIL_RANDOM_DEVICE_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_RANDOM_DEVICE_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#if defined(__MINGW32__)
+
+// Under MinGW up to GCC 9, std::random_device is
+// deterministic and always produces the same
+// sequence
+
+#include <boost/throw_exception.hpp>
+#include <system_error>
+#include <limits>
+#include <stdlib.h>
+
+extern "C" int __cdecl rand_s( unsigned int *randomValue );
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+struct random_device
+{
+    // noncopyable to match std::random_device
+    random_device() = default;
+    random_device( random_device&& ) = delete;
+    random_device& operator=( random_device&& ) = delete;
+
+    using result_type = unsigned;
+
+    static constexpr result_type min()
+    {
+        return std::numeric_limits<result_type>::min();
+    }
+
+    static constexpr result_type max()
+    {
+        return std::numeric_limits<result_type>::max();
+    }
+
+    result_type operator()()
+    {
+        unsigned v;
+
+        auto r = rand_s( &v );
+
+        if( r != 0 )
+        {
+            BOOST_THROW_EXCEPTION( std::system_error( r, std::generic_category(), "rand_s" ) );
+        }
+
+        return v;
+    }
+};
+
+} // detail
+} // uuids
+} // boost
+
+#else
+
+#include <random>
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+using std::random_device;
+
+} // detail
+} // uuids
+} // boost
+
+#endif
+
+#endif // BOOST_UUID_DETAIL_RANDOM_DEVICE_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/random_provider.hpp b/inst/include/boost/uuid/detail/random_provider.hpp
index bf8e0bee3..c9adbb8ec 100644
--- a/inst/include/boost/uuid/detail/random_provider.hpp
+++ b/inst/include/boost/uuid/detail/random_provider.hpp
@@ -1,86 +1,48 @@
-//
+#ifndef BOOST_UUID_DETAIL_RANDOM_PROVIDER_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_RANDOM_PROVIDER_HPP_INCLUDED
+
 // Copyright (c) 2017 James E. King III
-//
+// Copyright (c) 2024 Peter Dimov
 // Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// Platform-specific random entropy provider
-//
-
-#ifndef BOOST_UUID_DETAIL_RANDOM_PROVIDER_HPP
-#define BOOST_UUID_DETAIL_RANDOM_PROVIDER_HPP
-
-#include <boost/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/limits.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/move/core.hpp>
-#include <boost/move/utility_core.hpp>
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/type_traits/is_unsigned.hpp>
-#include <boost/uuid/entropy_error.hpp>
-#include <climits>
-#include <iterator>
-
-// Detection of the platform is separated from inclusion of the correct
-// header to facilitate mock testing of the provider implementations.
-
-#include <boost/uuid/detail/random_provider_detect_platform.hpp>
-#include <boost/uuid/detail/random_provider_include_platform.hpp>
+// https://www.boost.org/LICENSE_1_0.txt
 
+#include <boost/uuid/detail/random_device.hpp>
+#include <random>
+#include <cstdint>
 
 namespace boost {
 namespace uuids {
 namespace detail {
 
-//! \brief Contains code common to all random_provider implementations.
-//! \note  random_provider_base is required to provide this method:
-//!        void get_random_bytes(void *buf, size_t siz);
-//! \note  noncopyable because of some base implementations so
-//!        this makes it uniform across platforms to avoid any  
-//!        porting surprises
-class random_provider :
-    public detail::random_provider_base
+class random_provider
 {
-    BOOST_MOVABLE_BUT_NOT_COPYABLE(random_provider)
+private:
+
+    detail::random_device dev_;
 
 public:
-    BOOST_DEFAULTED_FUNCTION(random_provider(), {})
 
-    random_provider(BOOST_RV_REF(random_provider) that) BOOST_NOEXCEPT :
-        detail::random_provider_base(boost::move(static_cast< detail::random_provider_base& >(that)))
-    {
-    }
+    using result_type = std::uint32_t;
 
-    random_provider& operator= (BOOST_RV_REF(random_provider) that) BOOST_NOEXCEPT
-    {
-        static_cast< detail::random_provider_base& >(*this) = boost::move(static_cast< detail::random_provider_base& >(that));
-        return *this;
-    }
+    random_provider() = default;
+
+    // Leverage the provider as a SeedSeq for
+    // PseudoRandomNumberGeneration seeding.
 
-    //! Leverage the provider as a SeedSeq for
-    //! PseudoRandomNumberGeneration seeing.
-    //! \note: See Boost.Random documentation for more details
     template<class Iter>
     void generate(Iter first, Iter last)
     {
-        typedef typename std::iterator_traits<Iter>::value_type value_type;
-        BOOST_STATIC_ASSERT(is_integral<value_type>::value);
-        BOOST_STATIC_ASSERT(is_unsigned<value_type>::value);
-        BOOST_STATIC_ASSERT(sizeof(value_type) * CHAR_BIT >= 32);
+        std::uniform_int_distribution<std::uint32_t> dist;
 
-        for (; first != last; ++first)
+        for( ; first != last; ++first )
         {
-            get_random_bytes(&*first, sizeof(*first));
-            *first &= (std::numeric_limits<boost::uint32_t>::max)();
+            *first = dist( dev_ );
         }
     }
 
-    //! Return the name of the selected provider
     const char * name() const
     {
-        return BOOST_UUID_RANDOM_PROVIDER_STRINGIFY(BOOST_UUID_RANDOM_PROVIDER_NAME);
+        return "std::random_device";
     }
 };
 
@@ -88,4 +50,4 @@ class random_provider :
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_DETAIL_RANDOM_PROVIDER_HPP
+#endif // BOOST_UUID_DETAIL_RANDOM_PROVIDER_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/random_provider_arc4random.ipp b/inst/include/boost/uuid/detail/random_provider_arc4random.ipp
deleted file mode 100644
index bb25f0358..000000000
--- a/inst/include/boost/uuid/detail/random_provider_arc4random.ipp
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright (c) 2017 James E. King III
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// "A Replacement Call for Random"
-// https://man.openbsd.org/arc4random.3
-//
-
-#include <cstddef>
-#include <stdlib.h>
-
-namespace boost {
-namespace uuids {
-namespace detail {
-
-class random_provider_base
-{
-  public:
-    //! Obtain entropy and place it into a memory location
-    //! \param[in]  buf  the location to write entropy
-    //! \param[in]  siz  the number of bytes to acquire
-    void get_random_bytes(void *buf, std::size_t siz)
-    {
-        arc4random_buf(buf, siz);
-    }
-};
-
-} // detail
-} // uuids
-} // boost
diff --git a/inst/include/boost/uuid/detail/random_provider_bcrypt.ipp b/inst/include/boost/uuid/detail/random_provider_bcrypt.ipp
deleted file mode 100644
index d6d4a3523..000000000
--- a/inst/include/boost/uuid/detail/random_provider_bcrypt.ipp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2017 James E. King III
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// BCrypt provider for entropy
-//
-
-#include <cstddef>
-#include <boost/config.hpp>
-#include <boost/core/ignore_unused.hpp>
-#include <boost/move/core.hpp>
-#include <boost/numeric/conversion/cast.hpp>
-#include <boost/winapi/bcrypt.hpp>
-#include <boost/winapi/get_last_error.hpp>
-#include <boost/throw_exception.hpp>
-
-#if defined(BOOST_UUID_FORCE_AUTO_LINK) || (!defined(BOOST_ALL_NO_LIB) && !defined(BOOST_UUID_RANDOM_PROVIDER_NO_LIB))
-#   define BOOST_LIB_NAME "bcrypt"
-#   if defined(BOOST_AUTO_LINK_NOMANGLE)
-#      include <boost/config/auto_link.hpp>
-#   else
-#      define BOOST_AUTO_LINK_NOMANGLE
-#      include <boost/config/auto_link.hpp>
-#      undef BOOST_AUTO_LINK_NOMANGLE
-#   endif
-#endif
-
-namespace boost {
-namespace uuids {
-namespace detail {
-
-class random_provider_base
-{
-    BOOST_MOVABLE_BUT_NOT_COPYABLE(random_provider_base)
-
-public:
-    random_provider_base()
-      : hProv_(NULL)
-    {
-        boost::winapi::NTSTATUS_ status =
-            boost::winapi::BCryptOpenAlgorithmProvider(
-                &hProv_, 
-                boost::winapi::BCRYPT_RNG_ALGORITHM_,
-                NULL,
-                0);
-
-        if (BOOST_UNLIKELY(status != 0))
-        {
-            BOOST_THROW_EXCEPTION(entropy_error(status, "BCryptOpenAlgorithmProvider"));
-        }
-    }
-
-    random_provider_base(BOOST_RV_REF(random_provider_base) that) BOOST_NOEXCEPT : hProv_(that.hProv_)
-    {
-        that.hProv_ = NULL;
-    }
-
-    random_provider_base& operator= (BOOST_RV_REF(random_provider_base) that) BOOST_NOEXCEPT
-    {
-        destroy();
-        hProv_ = that.hProv_;
-        that.hProv_ = NULL;
-        return *this;
-    }
-
-    ~random_provider_base() BOOST_NOEXCEPT
-    {
-        destroy();
-    }
-
-    //! Obtain entropy and place it into a memory location
-    //! \param[in]  buf  the location to write entropy
-    //! \param[in]  siz  the number of bytes to acquire
-    void get_random_bytes(void *buf, std::size_t siz)
-    {
-        boost::winapi::NTSTATUS_ status =
-            boost::winapi::BCryptGenRandom(
-                hProv_,
-                static_cast<boost::winapi::PUCHAR_>(buf),
-                boost::numeric_cast<boost::winapi::ULONG_>(siz),
-                0);
-
-        if (BOOST_UNLIKELY(status != 0))
-        {
-            BOOST_THROW_EXCEPTION(entropy_error(status, "BCryptGenRandom"));
-        }
-    }
-
-private:
-    void destroy() BOOST_NOEXCEPT
-    {
-        if (hProv_)
-        {
-            boost::ignore_unused(boost::winapi::BCryptCloseAlgorithmProvider(hProv_, 0));
-        }
-    }
-
-private:
-    boost::winapi::BCRYPT_ALG_HANDLE_ hProv_;
-};
-
-} // detail
-} // uuids
-} // boost
diff --git a/inst/include/boost/uuid/detail/random_provider_detect_platform.hpp b/inst/include/boost/uuid/detail/random_provider_detect_platform.hpp
deleted file mode 100644
index 014c83be6..000000000
--- a/inst/include/boost/uuid/detail/random_provider_detect_platform.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2017 James E. King III
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// Platform-specific random entropy provider platform detection
-//
-
-#ifndef BOOST_UUID_DETAIL_RANDOM_PROVIDER_PLATFORM_DETECTION_HPP
-#define BOOST_UUID_DETAIL_RANDOM_PROVIDER_PLATFORM_DETECTION_HPP
-
-#include <boost/predef/library/c/cloudabi.h>
-#include <boost/predef/library/c/gnu.h>
-#include <boost/predef/os/bsd/open.h>
-#include <boost/predef/os/windows.h>
-
-// Note: Don't use Boost.Predef to detect Linux and Android as it may give different results depending on header inclusion order.
-// https://github.com/boostorg/predef/issues/81#issuecomment-413329061
-#if (defined(__linux__) || defined(__linux) || defined(linux)) && (!defined(__ANDROID__) || __ANDROID_API__ >= 28)
-#include <sys/syscall.h>
-#if defined(SYS_getrandom)
-#define BOOST_UUID_RANDOM_PROVIDER_HAS_GETRANDOM
-#endif // defined(SYS_getrandom)
-#endif
-
-// On Linux, getentropy is implemented via getrandom. If we know that getrandom is not supported by the kernel, getentropy
-// will certainly not work, even if libc provides a wrapper function for it. There is no reason, ever, to use getentropy on that platform.
-#if !defined(BOOST_UUID_RANDOM_PROVIDER_DISABLE_GETENTROPY) && (defined(__linux__) || defined(__linux) || defined(linux) || defined(__ANDROID__))
-#define BOOST_UUID_RANDOM_PROVIDER_DISABLE_GETENTROPY
-#endif
-
-//
-// Platform Detection - will load in the correct header and
-// will define the class <tt>random_provider_base</tt>.
-//
-
-#if BOOST_OS_BSD_OPEN >= BOOST_VERSION_NUMBER(2, 1, 0) || BOOST_LIB_C_CLOUDABI
-# define BOOST_UUID_RANDOM_PROVIDER_ARC4RANDOM
-# define BOOST_UUID_RANDOM_PROVIDER_NAME arc4random
-
-#elif BOOST_OS_WINDOWS
-# include <boost/winapi/config.hpp>
-# if BOOST_WINAPI_PARTITION_APP_SYSTEM && \
-     !defined(BOOST_UUID_RANDOM_PROVIDER_FORCE_WINCRYPT) && \
-     !defined(_WIN32_WCE) && \
-     (BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6)
-#  define BOOST_UUID_RANDOM_PROVIDER_BCRYPT
-#  define BOOST_UUID_RANDOM_PROVIDER_NAME bcrypt
-
-# elif BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
-#  define BOOST_UUID_RANDOM_PROVIDER_WINCRYPT
-#  define BOOST_UUID_RANDOM_PROVIDER_NAME wincrypt
-# else
-#  error Unable to find a suitable windows entropy provider
-# endif
-
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_HAS_GETRANDOM) && !defined(BOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX) && !defined(BOOST_UUID_RANDOM_PROVIDER_DISABLE_GETRANDOM)
-# define BOOST_UUID_RANDOM_PROVIDER_GETRANDOM
-# define BOOST_UUID_RANDOM_PROVIDER_NAME getrandom
-
-#elif BOOST_LIB_C_GNU >= BOOST_VERSION_NUMBER(2, 25, 0) && !defined(BOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX) && !defined(BOOST_UUID_RANDOM_PROVIDER_DISABLE_GETENTROPY)
-# define BOOST_UUID_RANDOM_PROVIDER_GETENTROPY
-# define BOOST_UUID_RANDOM_PROVIDER_NAME getentropy
-
-#else
-# define BOOST_UUID_RANDOM_PROVIDER_POSIX
-# define BOOST_UUID_RANDOM_PROVIDER_NAME posix
-
-#endif
-
-#define BOOST_UUID_RANDOM_PROVIDER_STRINGIFY2(X) #X
-#define BOOST_UUID_RANDOM_PROVIDER_STRINGIFY(X) BOOST_UUID_RANDOM_PROVIDER_STRINGIFY2(X)
-
-#if defined(BOOST_UUID_RANDOM_PROVIDER_SHOW)
-#pragma message("BOOST_UUID_RANDOM_PROVIDER_NAME " BOOST_UUID_RANDOM_PROVIDER_STRINGIFY(BOOST_UUID_RANDOM_PROVIDER_NAME))
-#endif
-
-#endif // BOOST_UUID_DETAIL_RANDOM_PROVIDER_PLATFORM_DETECTION_HPP
diff --git a/inst/include/boost/uuid/detail/random_provider_getentropy.ipp b/inst/include/boost/uuid/detail/random_provider_getentropy.ipp
deleted file mode 100644
index c0144999e..000000000
--- a/inst/include/boost/uuid/detail/random_provider_getentropy.ipp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (c) 2017 James E. King III
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// getentropy() capable platforms
-//
-
-#include <boost/config.hpp>
-#include <boost/throw_exception.hpp>
-#include <cerrno>
-#include <cstddef>
-#include <unistd.h>
-
-namespace boost {
-namespace uuids {
-namespace detail {
-
-class random_provider_base
-{
-public:
-    //! Obtain entropy and place it into a memory location
-    //! \param[in]  buf  the location to write entropy
-    //! \param[in]  siz  the number of bytes to acquire
-    void get_random_bytes(void *buf, std::size_t siz)
-    {
-        int res = getentropy(buf, siz);
-        if (BOOST_UNLIKELY(-1 == res))
-        {
-            int err = errno;
-            BOOST_THROW_EXCEPTION(entropy_error(err, "getentropy"));
-        }
-    }
-};
-
-} // detail
-} // uuids
-} // boost
diff --git a/inst/include/boost/uuid/detail/random_provider_getrandom.ipp b/inst/include/boost/uuid/detail/random_provider_getrandom.ipp
deleted file mode 100644
index cf0e5a578..000000000
--- a/inst/include/boost/uuid/detail/random_provider_getrandom.ipp
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2018 Andrey Semashev
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// getrandom() capable platforms
-//
-
-#include <boost/config.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/predef/library/c/gnu.h>
-#include <cerrno>
-#include <cstddef>
-
-#if !defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_IMPL_GETRANDOM) && !defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_DISABLE_LIBC_WRAPPER)
-#if BOOST_LIB_C_GNU >= BOOST_VERSION_NUMBER(2, 25, 0)
-#define BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_HAS_LIBC_WRAPPER
-#elif defined(__has_include)
-#if __has_include(<sys/random.h>)
-#define BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_HAS_LIBC_WRAPPER
-#endif
-#endif
-#endif // !defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_IMPL_GETRANDOM) && !defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_DISABLE_LIBC_WRAPPER)
-
-#if defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_HAS_LIBC_WRAPPER)
-#include <sys/random.h>
-#else
-#include <stddef.h> // ssize_t
-#endif
-
-namespace boost {
-namespace uuids {
-namespace detail {
-
-class random_provider_base
-{
-public:
-    //! Obtain entropy and place it into a memory location
-    //! \param[in]  buf  the location to write entropy
-    //! \param[in]  siz  the number of bytes to acquire
-    void get_random_bytes(void *buf, std::size_t siz)
-    {
-        std::size_t offset = 0;
-        while (offset < siz)
-        {
-            ssize_t sz = get_random(static_cast< char* >(buf) + offset, siz - offset, 0u);
-
-            if (BOOST_UNLIKELY(sz < 0))
-            {
-                int err = errno;
-                if (err == EINTR)
-                    continue;
-                BOOST_THROW_EXCEPTION(entropy_error(err, "getrandom"));
-            }
-
-            offset += sz;
-        }
-    }
-
-private:
-    static ssize_t get_random(void *buf, std::size_t size, unsigned int flags)
-    {
-#if defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_IMPL_GETRANDOM)
-        return BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_IMPL_GETRANDOM(buf, size, flags);
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM_HAS_LIBC_WRAPPER)
-        return ::getrandom(buf, size, flags);
-#else
-        return ::syscall(SYS_getrandom, buf, size, flags);
-#endif
-    }
-};
-
-} // detail
-} // uuids
-} // boost
diff --git a/inst/include/boost/uuid/detail/random_provider_include_platform.hpp b/inst/include/boost/uuid/detail/random_provider_include_platform.hpp
deleted file mode 100644
index 7b99b80c3..000000000
--- a/inst/include/boost/uuid/detail/random_provider_include_platform.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2017 James E. King III
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// Platform-specific random entropy provider platform definition
-//
-
-#ifndef BOOST_UUID_DETAIL_RANDOM_PROVIDER_PLATFORM_INCLUDE_HPP
-#define BOOST_UUID_DETAIL_RANDOM_PROVIDER_PLATFORM_INCLUDE_HPP
-
-#if   defined(BOOST_UUID_RANDOM_PROVIDER_ARC4RANDOM)
-# include <boost/uuid/detail/random_provider_arc4random.ipp>
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_BCRYPT)
-# include <boost/uuid/detail/random_provider_bcrypt.ipp>
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_GETENTROPY)
-# include <boost/uuid/detail/random_provider_getentropy.ipp>
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_GETRANDOM)
-# include <boost/uuid/detail/random_provider_getrandom.ipp>
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_POSIX)
-# include <boost/uuid/detail/random_provider_posix.ipp>
-#elif defined(BOOST_UUID_RANDOM_PROVIDER_WINCRYPT)
-# include <boost/uuid/detail/random_provider_wincrypt.ipp>
-#endif
-
-#endif // BOOST_UUID_DETAIL_RANDOM_PROVIDER_PLATFORM_INCLUDE_HPP
-
diff --git a/inst/include/boost/uuid/detail/random_provider_posix.ipp b/inst/include/boost/uuid/detail/random_provider_posix.ipp
deleted file mode 100644
index 4a22235a5..000000000
--- a/inst/include/boost/uuid/detail/random_provider_posix.ipp
+++ /dev/null
@@ -1,120 +0,0 @@
-/* boost uuid/detail/random_provider_posix implementation
-*
-* Copyright Jens Maurer 2000
-* Copyright 2007 Andy Tompkins.
-* Copyright Steven Watanabe 2010-2011
-* Copyright 2017 James E. King III
-*
-* Distributed under the Boost Software License, Version 1.0. (See
-* accompanying file LICENSE_1_0.txt or copy at
-* https://www.boost.org/LICENSE_1_0.txt)
-*
-* $Id$
-*/
-
-#include <boost/config.hpp>
-#include <boost/core/ignore_unused.hpp>
-#include <boost/move/core.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/uuid/entropy_error.hpp>
-#include <cerrno>
-#include <cstddef>
-#include <fcntl.h>    // open
-#include <sys/stat.h>
-#include <sys/types.h>
-#if defined(BOOST_HAS_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#ifndef BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_CLOSE
-#define BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_CLOSE ::close
-#endif
-#ifndef BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_OPEN
-#define BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_OPEN ::open
-#endif
-#ifndef BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_READ
-#define BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_READ ::read
-#endif
-
-namespace boost {
-namespace uuids {
-namespace detail {
-
-class random_provider_base
-{
-    BOOST_MOVABLE_BUT_NOT_COPYABLE(random_provider_base)
-
-public:
-    random_provider_base()
-      : fd_(-1)
-    {
-        int flags = O_RDONLY;
-#if defined(O_CLOEXEC)
-        flags |= O_CLOEXEC;
-#endif
-        fd_ = BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_OPEN("/dev/urandom", flags);
-
-        if (BOOST_UNLIKELY(-1 == fd_))
-        {
-            int err = errno;
-            BOOST_THROW_EXCEPTION(entropy_error(err, "open /dev/urandom"));
-        }
-    }
-
-    random_provider_base(BOOST_RV_REF(random_provider_base) that) BOOST_NOEXCEPT : fd_(that.fd_)
-    {
-        that.fd_ = -1;
-    }
-
-    random_provider_base& operator= (BOOST_RV_REF(random_provider_base) that) BOOST_NOEXCEPT
-    {
-        destroy();
-        fd_ = that.fd_;
-        that.fd_ = -1;
-        return *this;
-    }
-
-    ~random_provider_base() BOOST_NOEXCEPT
-    {
-        destroy();
-    }
-
-    //! Obtain entropy and place it into a memory location
-    //! \param[in]  buf  the location to write entropy
-    //! \param[in]  siz  the number of bytes to acquire
-    void get_random_bytes(void *buf, std::size_t siz)
-    {
-        std::size_t offset = 0;
-        while (offset < siz)
-        {
-            ssize_t sz = BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_READ(
-                fd_, static_cast<char *>(buf) + offset, siz - offset);
-
-            if (BOOST_UNLIKELY(sz < 0))
-            {
-                int err = errno;
-                if (err == EINTR)
-                    continue;
-                BOOST_THROW_EXCEPTION(entropy_error(err, "read"));
-            }
-
-            offset += sz;
-        }
-    }
-
-private:
-    void destroy() BOOST_NOEXCEPT
-    {
-        if (fd_ >= 0)
-        {
-            boost::ignore_unused(BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_CLOSE(fd_));
-        }
-    }
-
-private:
-    int fd_;
-};
-
-} // detail
-} // uuids
-} // boost
diff --git a/inst/include/boost/uuid/detail/random_provider_wincrypt.ipp b/inst/include/boost/uuid/detail/random_provider_wincrypt.ipp
deleted file mode 100644
index 099f70cb5..000000000
--- a/inst/include/boost/uuid/detail/random_provider_wincrypt.ipp
+++ /dev/null
@@ -1,113 +0,0 @@
-/* boost uuid/detail/random_provider_wincrypt implementation
-*
-* Copyright Jens Maurer 2000
-* Copyright 2007 Andy Tompkins.
-* Copyright Steven Watanabe 2010-2011
-* Copyright 2017 James E. King III
-*
-* Distributed under the Boost Software License, Version 1.0. (See
-* accompanying file LICENSE_1_0.txt or copy at
-* https://www.boost.org/LICENSE_1_0.txt)
-*
-* $Id$
-*/
-
-#include <cstddef>
-#include <boost/config.hpp>
-#include <boost/core/ignore_unused.hpp>
-#include <boost/move/core.hpp>
-#include <boost/numeric/conversion/cast.hpp>
-#include <boost/winapi/crypt.hpp>
-#include <boost/winapi/get_last_error.hpp>
-#include <boost/throw_exception.hpp>
-
-#if defined(BOOST_UUID_FORCE_AUTO_LINK) || (!defined(BOOST_ALL_NO_LIB) && !defined(BOOST_UUID_RANDOM_PROVIDER_NO_LIB))
-#   if defined(_WIN32_WCE)
-#      define BOOST_LIB_NAME "coredll"
-#   else
-#      define BOOST_LIB_NAME "advapi32"
-#   endif
-#   if defined(BOOST_AUTO_LINK_NOMANGLE)
-#      include <boost/config/auto_link.hpp>
-#   else
-#      define BOOST_AUTO_LINK_NOMANGLE
-#      include <boost/config/auto_link.hpp>
-#      undef BOOST_AUTO_LINK_NOMANGLE
-#   endif
-#endif
-
-namespace boost {
-namespace uuids {
-namespace detail {
-
-class random_provider_base
-{
-    BOOST_MOVABLE_BUT_NOT_COPYABLE(random_provider_base)
-
-public:
-    random_provider_base()
-        : hProv_(0)
-    {
-        boost::winapi::BOOL_ res = boost::winapi::CryptAcquireContextW(
-            &hProv_,
-            NULL,
-            NULL,
-            boost::winapi::PROV_RSA_FULL_,
-            boost::winapi::CRYPT_VERIFYCONTEXT_ | boost::winapi::CRYPT_SILENT_);
-        if (BOOST_UNLIKELY(!res))
-        {
-            boost::winapi::DWORD_ err = boost::winapi::GetLastError();
-            BOOST_THROW_EXCEPTION(entropy_error(err, "CryptAcquireContext"));
-        }
-    }
-
-    random_provider_base(BOOST_RV_REF(random_provider_base) that) BOOST_NOEXCEPT : hProv_(that.hProv_)
-    {
-        that.hProv_ = 0;
-    }
-
-    random_provider_base& operator= (BOOST_RV_REF(random_provider_base) that) BOOST_NOEXCEPT
-    {
-        destroy();
-        hProv_ = that.hProv_;
-        that.hProv_ = 0;
-        return *this;
-    }
-
-    ~random_provider_base() BOOST_NOEXCEPT
-    {
-        destroy();
-    }
-
-    //! Obtain entropy and place it into a memory location
-    //! \param[in]  buf  the location to write entropy
-    //! \param[in]  siz  the number of bytes to acquire
-    void get_random_bytes(void *buf, std::size_t siz)
-    {
-        boost::winapi::BOOL_ res = boost::winapi::CryptGenRandom(
-            hProv_,
-            boost::numeric_cast<boost::winapi::DWORD_>(siz),
-            static_cast<boost::winapi::BYTE_ *>(buf));
-        if (BOOST_UNLIKELY(!res))
-        {
-            boost::winapi::DWORD_ err = boost::winapi::GetLastError();
-            BOOST_THROW_EXCEPTION(entropy_error(err, "CryptGenRandom"));
-        }
-    }
-
-private:
-    void destroy() BOOST_NOEXCEPT
-    {
-        if (hProv_)
-        {
-            boost::ignore_unused(boost::winapi::CryptReleaseContext(hProv_, 0));
-        }
-    }
-
-private:
-    boost::winapi::HCRYPTPROV_ hProv_;
-};
-
-} // detail
-} // uuids
-} // boost
diff --git a/inst/include/boost/uuid/detail/sha1.hpp b/inst/include/boost/uuid/detail/sha1.hpp
index 47f858a34..f1fab219d 100644
--- a/inst/include/boost/uuid/detail/sha1.hpp
+++ b/inst/include/boost/uuid/detail/sha1.hpp
@@ -1,37 +1,24 @@
+#ifndef BOOST_UUID_DETAIL_SHA1_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_SHA1_HPP_INCLUDED
+
 // Copyright 2007 Andy Tompkins.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // https://www.boost.org/LICENSE_1_0.txt)
 
-// Revision History
-//  29 May 2007 - Initial Revision
-//  25 Feb 2008 - moved to namespace boost::uuids::detail
-//  10 Jan 2012 - can now handle the full size of messages (2^64 - 1 bits)
-
-// This is a byte oriented implementation
-
-#ifndef BOOST_UUID_SHA1_H
-#define BOOST_UUID_SHA1_H
-
-#include <boost/static_assert.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/uuid/detail/endian.hpp>
+#include <boost/uuid/detail/static_assert.hpp>
 #include <boost/uuid/uuid.hpp> // for version
 #include <cstddef>
 #include <stdexcept>
 #include <string>
 
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std {
-    using ::size_t;
-} // namespace std
-#endif
-
 namespace boost {
 namespace uuids {
 namespace detail {
 
-BOOST_STATIC_ASSERT(sizeof(unsigned char)*8 == 8);
-BOOST_STATIC_ASSERT(sizeof(unsigned int)*8 == 32);
+BOOST_UUID_STATIC_ASSERT(sizeof(unsigned char)*8 == 8);
+BOOST_UUID_STATIC_ASSERT(sizeof(unsigned int)*8 == 32);
 
 inline unsigned int left_rotate(unsigned int x, std::size_t n)
 {
@@ -41,8 +28,11 @@ inline unsigned int left_rotate(unsigned int x, std::size_t n)
 class sha1
 {
 public:
-    typedef unsigned int(digest_type)[5];
+
+    typedef unsigned char digest_type[ 20 ];
+
 public:
+
     sha1();
 
     void reset();
@@ -55,10 +45,12 @@ class sha1
     unsigned char get_version() const;
 
 private:
+
     void process_block();
     void process_byte_impl(unsigned char byte);
 
 private:
+
     unsigned int h_[5];
 
     unsigned char block_[64];
@@ -97,12 +89,7 @@ inline void sha1::process_byte(unsigned char byte)
         bit_count_low += 8;
     } else {
         bit_count_low = 0;
-
-        if (bit_count_high <= 0xFFFFFFFE) {
-            ++bit_count_high;
-        } else {
-            BOOST_THROW_EXCEPTION(std::runtime_error("sha1 too many bytes"));
-        }
+        ++bit_count_high;
     }
 }
 
@@ -186,7 +173,7 @@ inline void sha1::process_block()
 inline unsigned char sha1::get_version() const
 {
     // RFC 4122 Section 4.1.3
-    return uuid::version_name_based_sha1;
+        return uuid::version_name_based_sha1;
 }
 
 inline void sha1::get_digest(digest_type& digest)
@@ -225,13 +212,13 @@ inline void sha1::get_digest(digest_type& digest)
     process_byte_impl( static_cast<unsigned char>((bit_count_low)     & 0xFF) );
 
     // get final digest
-    digest[0] = h_[0];
-    digest[1] = h_[1];
-    digest[2] = h_[2];
-    digest[3] = h_[3];
-    digest[4] = h_[4];
+    detail::store_big_u32( digest +  0, h_[0] );
+    detail::store_big_u32( digest +  4, h_[1] );
+    detail::store_big_u32( digest +  8, h_[2] );
+    detail::store_big_u32( digest + 12, h_[3] );
+    detail::store_big_u32( digest + 16, h_[4] );
 }
 
 }}} // namespace boost::uuids::detail
 
-#endif
+#endif // #ifndef BOOST_UUID_DETAIL_SHA1_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/static_assert.hpp b/inst/include/boost/uuid/detail/static_assert.hpp
new file mode 100644
index 000000000..7162414ff
--- /dev/null
+++ b/inst/include/boost/uuid/detail/static_assert.hpp
@@ -0,0 +1,10 @@
+#ifndef BOOST_UUID_DETAIL_STATIC_ASSERT_INCLUDED
+#define BOOST_UUID_DETAIL_STATIC_ASSERT_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#define BOOST_UUID_STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)
+
+#endif // #ifndef BOOST_UUID_DETAIL_STATIC_ASSERT_INCLUDED
diff --git a/inst/include/boost/uuid/detail/to_chars.hpp b/inst/include/boost/uuid/detail/to_chars.hpp
new file mode 100644
index 000000000..7cf5d8fea
--- /dev/null
+++ b/inst/include/boost/uuid/detail/to_chars.hpp
@@ -0,0 +1,67 @@
+#ifndef BOOST_UUID_DETAIL_TO_CHARS_HPP_INCLUDED
+#define BOOST_UUID_DETAIL_TO_CHARS_HPP_INCLUDED
+
+// Copyright 2009 Andy Tompkins
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid.hpp>
+
+namespace boost {
+namespace uuids {
+namespace detail {
+
+constexpr char const* digits( char const* ) noexcept
+{
+    return "0123456789abcdef-";
+}
+
+constexpr wchar_t const* digits( wchar_t const* ) noexcept
+{
+    return L"0123456789abcdef-";
+}
+
+constexpr char16_t const* digits( char16_t const* ) noexcept
+{
+    return u"0123456789abcdef-";
+}
+
+constexpr char32_t const* digits( char32_t const* ) noexcept
+{
+    return U"0123456789abcdef-";
+}
+
+#if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
+
+constexpr char8_t const* digits( char8_t const* ) noexcept
+{
+    return u8"0123456789abcdef-";
+}
+
+#endif
+
+template<class Ch> inline Ch* to_chars( uuid const& u, Ch* out ) noexcept
+{
+    constexpr Ch const* p = digits( static_cast<Ch const*>( nullptr ) );
+
+    for( std::size_t i = 0; i < 16; ++i )
+    {
+        std::uint8_t ch = u.data()[ i ];
+
+        *out++ = p[ (ch >> 4) & 0x0F ];
+        *out++ = p[ ch & 0x0F ];
+
+        if( i == 3 || i == 5 || i == 7 || i == 9 )
+        {
+            *out++ = p[ 16 ];
+        }
+    }
+
+    return out;
+}
+
+} // namespace detail
+}} //namespace boost::uuids
+
+#endif // BOOST_UUID_DETAIL_TO_CHARS_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/uuid_generic.ipp b/inst/include/boost/uuid/detail/uuid_generic.ipp
index e473f2ef4..8e78c4aa9 100644
--- a/inst/include/boost/uuid/detail/uuid_generic.ipp
+++ b/inst/include/boost/uuid/detail/uuid_generic.ipp
@@ -1,51 +1,87 @@
-/*
- *             Copyright Andy Tompkins 2006.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE_1_0.txt or copy at
- *          https://www.boost.org/LICENSE_1_0.txt)
- */
-/*!
- * \file   uuid/detail/uuid_generic.ipp
- *
- * \brief  This header contains generic implementation of \c boost::uuid operations.
- */
-
-#ifndef BOOST_UUID_DETAIL_UUID_GENERIC_IPP_INCLUDED_
-#define BOOST_UUID_DETAIL_UUID_GENERIC_IPP_INCLUDED_
-
-#include <string.h>
+#ifndef BOOST_UUID_DETAIL_UUID_GENERIC_IPP_INCLUDED
+#define BOOST_UUID_DETAIL_UUID_GENERIC_IPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/detail/endian.hpp>
+#include <cstdint>
+
+#if defined(BOOST_UUID_REPORT_IMPLEMENTATION)
+
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE( "Using uuid_generic.ipp" )
+
+#endif
 
 namespace boost {
 namespace uuids {
 
-inline bool uuid::is_nil() const BOOST_NOEXCEPT
+inline bool uuid::is_nil() const noexcept
 {
-    for (std::size_t i = 0; i < sizeof(data); ++i)
-    {
-        if (data[i] != 0U)
-            return false;
-    }
-    return true;
+    std::uint64_t v = detail::load_native_u64( this->data + 0 );
+    std::uint64_t w = detail::load_native_u64( this->data + 8 );
+
+    return v == 0 && w == 0;
 }
 
-inline void uuid::swap(uuid& rhs) BOOST_NOEXCEPT
+inline void uuid::swap( uuid& rhs ) noexcept
 {
-    uuid tmp = *this;
-    *this = rhs;
-    rhs = tmp;
+    std::uint64_t v1 = detail::load_native_u64( this->data + 0 );
+    std::uint64_t w1 = detail::load_native_u64( this->data + 8 );
+
+    std::uint64_t v2 = detail::load_native_u64( rhs.data + 0 );
+    std::uint64_t w2 = detail::load_native_u64( rhs.data + 8 );
+
+    detail::store_native_u64( this->data + 0, v2 );
+    detail::store_native_u64( this->data + 8, w2 );
+
+    detail::store_native_u64( rhs.data + 0, v1 );
+    detail::store_native_u64( rhs.data + 8, w1 );
 }
 
-inline bool operator== (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator==( uuid const& lhs, uuid const& rhs ) noexcept
 {
-    return memcmp(lhs.data, rhs.data, sizeof(lhs.data)) == 0;
+    std::uint64_t v1 = detail::load_native_u64( lhs.data + 0 );
+    std::uint64_t w1 = detail::load_native_u64( lhs.data + 8 );
+
+    std::uint64_t v2 = detail::load_native_u64( rhs.data + 0 );
+    std::uint64_t w2 = detail::load_native_u64( rhs.data + 8 );
+
+    return v1 == v2 && w1 == w2;
 }
 
-inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator<( uuid const& lhs, uuid const& rhs ) noexcept
 {
-    return memcmp(lhs.data, rhs.data, sizeof(lhs.data)) < 0;
+    std::uint64_t v1 = detail::load_big_u64( lhs.data + 0 );
+    std::uint64_t w1 = detail::load_big_u64( lhs.data + 8 );
+
+    std::uint64_t v2 = detail::load_big_u64( rhs.data + 0 );
+    std::uint64_t w2 = detail::load_big_u64( rhs.data + 8 );
+
+    return v1 < v2 || ( !( v2 < v1 ) && w1 < w2 );
+}
+
+#if defined(BOOST_UUID_HAS_THREE_WAY_COMPARISON)
+
+inline std::strong_ordering operator<=> (uuid const& lhs, uuid const& rhs) noexcept
+{
+    std::uint64_t v1 = detail::load_big_u64( lhs.data + 0 );
+    std::uint64_t w1 = detail::load_big_u64( lhs.data + 8 );
+
+    std::uint64_t v2 = detail::load_big_u64( rhs.data + 0 );
+    std::uint64_t w2 = detail::load_big_u64( rhs.data + 8 );
+
+    if( v1 < v2 ) return std::strong_ordering::less;
+    if( v1 > v2 ) return std::strong_ordering::greater;
+
+    return w1 <=> w2;
 }
 
+#endif
+
 } // namespace uuids
 } // namespace boost
 
-#endif // BOOST_UUID_DETAIL_UUID_GENERIC_IPP_INCLUDED_
+#endif // BOOST_UUID_DETAIL_UUID_GENERIC_IPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/uuid_uint128.ipp b/inst/include/boost/uuid/detail/uuid_uint128.ipp
new file mode 100644
index 000000000..5e6f71cde
--- /dev/null
+++ b/inst/include/boost/uuid/detail/uuid_uint128.ipp
@@ -0,0 +1,66 @@
+#ifndef BOOST_UUID_DETAIL_UUID_UINT128_IPP_INCLUDED
+#define BOOST_UUID_DETAIL_UUID_UINT128_IPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/detail/endian.hpp>
+
+#if defined(BOOST_UUID_REPORT_IMPLEMENTATION)
+
+#include <boost/config/pragma_message.hpp>
+BOOST_PRAGMA_MESSAGE( "Using uuid_uint128.ipp" )
+
+#endif
+
+namespace boost {
+namespace uuids {
+
+inline bool uuid::is_nil() const noexcept
+{
+    __uint128_t v = detail::load_native_u128( this->data );
+    return v == 0;
+}
+
+inline void uuid::swap( uuid& rhs ) noexcept
+{
+    __uint128_t v1 = detail::load_native_u128( this->data );
+    __uint128_t v2 = detail::load_native_u128( rhs.data );
+
+    detail::store_native_u128( this->data, v2 );
+    detail::store_native_u128( rhs.data, v1 );
+}
+
+inline bool operator==( uuid const& lhs, uuid const& rhs ) noexcept
+{
+    __uint128_t v1 = detail::load_native_u128( lhs.data );
+    __uint128_t v2 = detail::load_native_u128( rhs.data );
+
+    return v1 == v2;
+}
+
+inline bool operator<( uuid const& lhs, uuid const& rhs ) noexcept
+{
+    __uint128_t v1 = detail::load_big_u128( lhs.data );
+    __uint128_t v2 = detail::load_big_u128( rhs.data );
+
+    return v1 < v2;
+}
+
+#if defined(BOOST_UUID_HAS_THREE_WAY_COMPARISON)
+
+inline std::strong_ordering operator<=> (uuid const& lhs, uuid const& rhs) noexcept
+{
+    __uint128_t v1 = detail::load_big_u128( lhs.data );
+    __uint128_t v2 = detail::load_big_u128( rhs.data );
+
+    return v1 <=> v2;
+}
+
+#endif
+
+} // namespace uuids
+} // namespace boost
+
+#endif // BOOST_UUID_DETAIL_UUID_UINT128_IPP_INCLUDED
diff --git a/inst/include/boost/uuid/detail/uuid_x86.ipp b/inst/include/boost/uuid/detail/uuid_x86.ipp
index 73680afb0..9db09637f 100644
--- a/inst/include/boost/uuid/detail/uuid_x86.ipp
+++ b/inst/include/boost/uuid/detail/uuid_x86.ipp
@@ -1,5 +1,5 @@
 /*
- *          Copyright Andrey Semashev 2013, 2022.
+ *        Copyright Andrey Semashev 2013, 2022, 2024.
  * Distributed under the Boost Software License, Version 1.0.
  *    (See accompanying file LICENSE_1_0.txt or copy at
  *          https://www.boost.org/LICENSE_1_0.txt)
@@ -13,8 +13,31 @@
 #ifndef BOOST_UUID_DETAIL_UUID_X86_IPP_INCLUDED_
 #define BOOST_UUID_DETAIL_UUID_X86_IPP_INCLUDED_
 
+#include <boost/uuid/detail/endian.hpp>
+#include <cstdint>
+
+#if defined(BOOST_UUID_REPORT_IMPLEMENTATION)
+#include <boost/config/pragma_message.hpp>
+
+#if defined(BOOST_UUID_USE_AVX10_1)
+BOOST_PRAGMA_MESSAGE( "Using uuid_x86.ipp, AVX10.1" )
+
+#elif defined(BOOST_UUID_USE_SSE41)
+BOOST_PRAGMA_MESSAGE( "Using uuid_x86.ipp, SSE4.1" )
+
+#elif defined(BOOST_UUID_USE_SSE3)
+BOOST_PRAGMA_MESSAGE( "Using uuid_x86.ipp, SSE3" )
+
+#else
+BOOST_PRAGMA_MESSAGE( "Using uuid_x86.ipp, SSE2" )
+
+#endif
+#endif // #if defined(BOOST_UUID_REPORT_IMPLEMENTATION)
+
 // MSVC does not always have immintrin.h (at least, not up to MSVC 10), so include the appropriate header for each instruction set
-#if defined(BOOST_UUID_USE_SSE41)
+#if defined(BOOST_UUID_USE_AVX10_1)
+#include <immintrin.h>
+#elif defined(BOOST_UUID_USE_SSE41)
 #include <smmintrin.h>
 #elif defined(BOOST_UUID_USE_SSE3)
 #include <pmmintrin.h>
@@ -22,45 +45,64 @@
 #include <emmintrin.h>
 #endif
 
-#if defined(BOOST_MSVC) && defined(_M_X64) && (BOOST_MSVC < 1900 /* Fixed in Visual Studio 2015 */ )
-// At least MSVC 9 (VS2008) and 12 (VS2013) have an optimizer bug that sometimes results in incorrect SIMD code
-// generated in Release x64 mode. In particular, it affects operator==, where the compiler sometimes generates
-// pcmpeqd with a memory opereand instead of movdqu followed by pcmpeqd. The problem is that uuid can be
-// not aligned to 16 bytes and pcmpeqd causes alignment violation in this case. We cannot be sure that other
-// MSVC versions are not affected so we apply the workaround for all versions, except VS2015 on up where
-// the bug has been fixed.
-//
-// https://svn.boost.org/trac/boost/ticket/8509#comment:3
-// https://connect.microsoft.com/VisualStudio/feedbackdetail/view/981648#tabs
-#define BOOST_UUID_DETAIL_MSVC_BUG981648
-#if BOOST_MSVC >= 1600
-extern "C" void _ReadWriteBarrier(void);
-#pragma intrinsic(_ReadWriteBarrier)
-#endif
-#endif
-
 namespace boost {
 namespace uuids {
 namespace detail {
 
-BOOST_FORCEINLINE __m128i load_unaligned_si128(const uint8_t* p) BOOST_NOEXCEPT
+BOOST_FORCEINLINE __m128i load_unaligned_si128(const std::uint8_t* p) noexcept
 {
-#if !defined(BOOST_UUID_DETAIL_MSVC_BUG981648) || defined(BOOST_UUID_USE_AVX)
     return _mm_loadu_si128(reinterpret_cast< const __m128i* >(p));
-#elif defined(BOOST_MSVC) && BOOST_MSVC >= 1600
-    __m128i mm = _mm_loadu_si128(reinterpret_cast< const __m128i* >(p));
-    // Make sure this load doesn't get merged with the subsequent instructions
-    _ReadWriteBarrier();
-    return mm;
-#else
-    // VS2008 x64 doesn't respect _ReadWriteBarrier above, so we have to generate this crippled code to load unaligned data
-    return _mm_unpacklo_epi64(_mm_loadl_epi64(reinterpret_cast< const __m128i* >(p)), _mm_loadl_epi64(reinterpret_cast< const __m128i* >(p + 8)));
-#endif
+}
+
+BOOST_FORCEINLINE void compare(uuid const& lhs, uuid const& rhs, std::uint32_t& cmp, std::uint32_t& rcmp) noexcept
+{
+    __m128i mm_left = uuids::detail::load_unaligned_si128(lhs.data);
+    __m128i mm_right = uuids::detail::load_unaligned_si128(rhs.data);
+
+    // To emulate lexicographical_compare behavior we have to perform two comparisons - the forward and reverse one.
+    // Then we know which bytes are equivalent and which ones are different, and for those different the comparison results
+    // will be opposite. Then we'll be able to find the first differing comparison result (for both forward and reverse ways),
+    // and depending on which way it is for, this will be the result of the operation. There are a few notes to consider:
+    //
+    // 1. Due to little endian byte order the first bytes go into the lower part of the xmm registers,
+    //    so the comparison results in the least significant bits will actually be the most signigicant for the final operation result.
+    //    This means we have to determine which of the comparison results have the least significant bit on, and this is achieved with
+    //    the "(x - 1) ^ x" trick. With BMI, this will produce a single blsmsk instruction.
+    // 2. Because there is only signed byte comparison until AVX-512, we have to invert byte comparison results whenever signs of the
+    //    corresponding bytes are different. I.e. in signed comparison it's -1 < 1, but in unsigned it is the opposite (255 > 1). To do
+    //    that we XOR left and right, making the most significant bit of each byte 1 if the signs are different, and later apply this mask
+    //    with another XOR to the comparison results.
+    // 3. Until AVX-512, there is only pcmpgtb instruction that compares for "greater" relation, so we swap the arguments to get what we need.
+
+#if defined(BOOST_UUID_USE_AVX10_1)
+
+    __mmask16 k_cmp = _mm_cmplt_epu8_mask(mm_left, mm_right);
+    __mmask16 k_rcmp = _mm_cmplt_epu8_mask(mm_right, mm_left);
+
+    cmp = static_cast< std::uint32_t >(_cvtmask16_u32(k_cmp));
+    rcmp = static_cast< std::uint32_t >(_cvtmask16_u32(k_rcmp));
+
+#else // defined(BOOST_UUID_USE_AVX10_1)
+
+    const __m128i mm_signs_mask = _mm_xor_si128(mm_left, mm_right);
+
+    __m128i mm_cmp = _mm_cmpgt_epi8(mm_right, mm_left), mm_rcmp = _mm_cmpgt_epi8(mm_left, mm_right);
+
+    mm_cmp = _mm_xor_si128(mm_signs_mask, mm_cmp);
+    mm_rcmp = _mm_xor_si128(mm_signs_mask, mm_rcmp);
+
+    cmp = static_cast< std::uint32_t >(_mm_movemask_epi8(mm_cmp));
+    rcmp = static_cast< std::uint32_t >(_mm_movemask_epi8(mm_rcmp));
+
+#endif // defined(BOOST_UUID_USE_AVX10_1)
+
+    cmp = (cmp - 1u) ^ cmp;
+    rcmp = (rcmp - 1u) ^ rcmp;
 }
 
 } // namespace detail
 
-inline bool uuid::is_nil() const BOOST_NOEXCEPT
+inline bool uuid::is_nil() const noexcept
 {
     __m128i mm = uuids::detail::load_unaligned_si128(data);
 #if defined(BOOST_UUID_USE_SSE41)
@@ -71,15 +113,15 @@ inline bool uuid::is_nil() const BOOST_NOEXCEPT
 #endif
 }
 
-inline void uuid::swap(uuid& rhs) BOOST_NOEXCEPT
+inline void uuid::swap(uuid& rhs) noexcept
 {
     __m128i mm_this = uuids::detail::load_unaligned_si128(data);
     __m128i mm_rhs = uuids::detail::load_unaligned_si128(rhs.data);
-    _mm_storeu_si128(reinterpret_cast< __m128i* >(rhs.data), mm_this);
-    _mm_storeu_si128(reinterpret_cast< __m128i* >(data), mm_rhs);
+    _mm_storeu_si128(reinterpret_cast< __m128i* >(rhs.data+0), mm_this);
+    _mm_storeu_si128(reinterpret_cast< __m128i* >(data+0), mm_rhs);
 }
 
-inline bool operator== (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator== (uuid const& lhs, uuid const& rhs) noexcept
 {
     __m128i mm_left = uuids::detail::load_unaligned_si128(lhs.data);
     __m128i mm_right = uuids::detail::load_unaligned_si128(rhs.data);
@@ -93,40 +135,24 @@ inline bool operator== (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
 #endif
 }
 
-inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator< (uuid const& lhs, uuid const& rhs) noexcept
 {
-    __m128i mm_left = uuids::detail::load_unaligned_si128(lhs.data);
-    __m128i mm_right = uuids::detail::load_unaligned_si128(rhs.data);
-
-    // To emulate lexicographical_compare behavior we have to perform two comparisons - the forward and reverse one.
-    // Then we know which bytes are equivalent and which ones are different, and for those different the comparison results
-    // will be opposite. Then we'll be able to find the first differing comparison result (for both forward and reverse ways),
-    // and depending on which way it is for, this will be the result of the operation. There are a few notes to consider:
-    //
-    // 1. Due to little endian byte order the first bytes go into the lower part of the xmm registers,
-    //    so the comparison results in the least significant bits will actually be the most signigicant for the final operation result.
-    //    This means we have to determine which of the comparison results have the least significant bit on, and this is achieved with
-    //    the "(x - 1) ^ x" trick.
-    // 2. Because there is only signed comparison in SSE/AVX, we have to invert byte comparison results whenever signs of the corresponding
-    //    bytes are different. I.e. in signed comparison it's -1 < 1, but in unsigned it is the opposite (255 > 1). To do that we XOR left and right,
-    //    making the most significant bit of each byte 1 if the signs are different, and later apply this mask with another XOR to the comparison results.
-    // 3. pcmpgtw compares for "greater" relation, so we swap the arguments to get what we need.
-
-    const __m128i mm_signs_mask = _mm_xor_si128(mm_left, mm_right);
-
-    __m128i mm_cmp = _mm_cmpgt_epi8(mm_right, mm_left), mm_rcmp = _mm_cmpgt_epi8(mm_left, mm_right);
-
-    mm_cmp = _mm_xor_si128(mm_signs_mask, mm_cmp);
-    mm_rcmp = _mm_xor_si128(mm_signs_mask, mm_rcmp);
-
-    uint32_t cmp = static_cast< uint32_t >(_mm_movemask_epi8(mm_cmp)), rcmp = static_cast< uint32_t >(_mm_movemask_epi8(mm_rcmp));
+    std::uint32_t cmp, rcmp;
+    uuids::detail::compare(lhs, rhs, cmp, rcmp);
+    return cmp < rcmp;
+}
 
-    cmp = (cmp - 1u) ^ cmp;
-    rcmp = (rcmp - 1u) ^ rcmp;
+#if defined(BOOST_UUID_HAS_THREE_WAY_COMPARISON)
 
-    return cmp < rcmp;
+inline std::strong_ordering operator<=> (uuid const& lhs, uuid const& rhs) noexcept
+{
+    std::uint32_t cmp, rcmp;
+    uuids::detail::compare(lhs, rhs, cmp, rcmp);
+    return cmp <=> rcmp;
 }
 
+#endif
+
 } // namespace uuids
 } // namespace boost
 
diff --git a/inst/include/boost/uuid/entropy_error.hpp b/inst/include/boost/uuid/entropy_error.hpp
index 27a7078b0..0aafb46c6 100644
--- a/inst/include/boost/uuid/entropy_error.hpp
+++ b/inst/include/boost/uuid/entropy_error.hpp
@@ -1,3 +1,6 @@
+#ifndef BOOST_UUID_ENTROPY_ERROR_HPP_INCLUDED
+#define BOOST_UUID_ENTROPY_ERROR_HPP_INCLUDED
+
 //
 // Copyright (c) 2017, 2018 James E. King III
 //
@@ -8,13 +11,10 @@
 // Entropy error class
 //
 
-#ifndef BOOST_UUID_RANDOM_ENTROPY_ERROR_HPP
-#define BOOST_UUID_RANDOM_ENTROPY_ERROR_HPP
-
 #include <boost/config.hpp>
-#include <boost/cstdint.hpp>
 #include <stdexcept>
 #include <string>
+#include <cstdint>
 
 namespace boost {
 namespace uuids {
@@ -25,22 +25,22 @@ namespace uuids {
 class BOOST_SYMBOL_VISIBLE entropy_error : public std::runtime_error
 {
 public:
-    entropy_error(boost::intmax_t errCode, const std::string& message)
+    entropy_error(std::intmax_t errCode, const std::string& message)
         : std::runtime_error(message)
         , m_errcode(errCode)
     {
     }
 
-    virtual boost::intmax_t errcode() const
+    virtual std::intmax_t errcode() const
     {
         return m_errcode;
     }
 
 private:
-    boost::intmax_t m_errcode;
+    std::intmax_t m_errcode;
 };
 
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_RANDOM_ENTROPY_ERROR_HPP
+#endif // BOOST_UUID_ENTROPY_ERROR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/name_generator.hpp b/inst/include/boost/uuid/name_generator.hpp
index 4aab7fdad..efa94ea47 100644
--- a/inst/include/boost/uuid/name_generator.hpp
+++ b/inst/include/boost/uuid/name_generator.hpp
@@ -1,3 +1,6 @@
+#ifndef BOOST_UUID_NAME_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_NAME_GENERATOR_HPP_INCLUDED
+
 // Boost name_generator.hpp header file  -----------------------------//
 
 // Copyright 2010 Andy Tompkins.
@@ -7,32 +10,19 @@
 // accompanying file LICENSE_1_0.txt or copy at
 //  https://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UUID_NAME_GENERATOR_HPP
-#define BOOST_UUID_NAME_GENERATOR_HPP
-
-#include <boost/config.hpp>
+#include <boost/uuid/name_generator_md5.hpp>
 #include <boost/uuid/name_generator_sha1.hpp>
 
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
-#endif
-
 namespace boost {
 namespace uuids {
 
-//! \deprecated
-//! \brief this provides backwards compatibility with previous boost
-//!        releases however it is now deprecated to ensure that once
-//!        a new hashing algorithm is defined for name generation that
-//!        there is no confusion - at that time this will be removed.
-typedef name_generator_sha1 name_generator;
+// Only provided for compatibility with 1.85 and earlier
+using name_generator = name_generator_sha1;
 
-//! \brief this provides the latest name generator hashing algorithm
-//!        regardless of boost release; if you do not need stable
-//!        name generation across releases then this will suffice
-typedef name_generator_sha1 name_generator_latest;
+// Only provided for compatibility with 1.85 and earlier
+using name_generator_latest = name_generator_sha1;
 
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_NAME_GENERATOR_HPP
+#endif // BOOST_UUID_NAME_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/name_generator_md5.hpp b/inst/include/boost/uuid/name_generator_md5.hpp
index 6462b452b..674b971aa 100644
--- a/inst/include/boost/uuid/name_generator_md5.hpp
+++ b/inst/include/boost/uuid/name_generator_md5.hpp
@@ -1,25 +1,28 @@
-// Boost name_generator_md5.hpp header file  ------------------------//
+#ifndef BOOST_UUID_NAME_GENERATOR_MD5_HPP_INCLUDED
+#define BOOST_UUID_NAME_GENERATOR_MD5_HPP_INCLUDED
 
 // Copyright 2017 James E. King III
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-//  https://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_UUID_NAME_GENERATOR_MD5_HPP
-#define BOOST_UUID_NAME_GENERATOR_MD5_HPP
-
-#include <boost/uuid/basic_name_generator.hpp>
+#include <boost/uuid/detail/basic_name_generator.hpp>
 #include <boost/uuid/detail/md5.hpp>
 
 namespace boost {
 namespace uuids {
 
-//! \brief MD5 hashing is defined in RFC 4122 however it is not commonly
-//!        used; the definition is provided for backwards compatibility.
-typedef basic_name_generator<detail::md5> name_generator_md5;
+class name_generator_md5: public detail::basic_name_generator<detail::md5>
+{
+public:
+
+    explicit name_generator_md5( uuid const& namespace_uuid ) noexcept:
+        detail::basic_name_generator<detail::md5>( namespace_uuid )
+    {
+    }
+};
 
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_NAME_GENERATOR_MD5_HPP
+#endif // BOOST_UUID_NAME_GENERATOR_MD5_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/name_generator_sha1.hpp b/inst/include/boost/uuid/name_generator_sha1.hpp
index 722e79af6..92b621412 100644
--- a/inst/include/boost/uuid/name_generator_sha1.hpp
+++ b/inst/include/boost/uuid/name_generator_sha1.hpp
@@ -1,26 +1,29 @@
-// Boost name_generator_sha1.hpp header file  ------------------------//
+#ifndef BOOST_UUID_NAME_GENERATOR_SHA1_HPP_INCLUDED
+#define BOOST_UUID_NAME_GENERATOR_SHA1_HPP_INCLUDED
 
-// Copyright 2010 Andy Tompkins.
+// Copyright 2010 Andy Tompkins
 // Copyright 2017 James E. King III
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-//  https://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_UUID_NAME_GENERATOR_SHA1_HPP
-#define BOOST_UUID_NAME_GENERATOR_SHA1_HPP
-
-#include <boost/uuid/basic_name_generator.hpp>
+#include <boost/uuid/detail/basic_name_generator.hpp>
 #include <boost/uuid/detail/sha1.hpp>
 
 namespace boost {
 namespace uuids {
 
-//! \brief SHA1 hashing is the default method defined in RFC 4122 to be
-//!        used when backwards compatibility is not necessary.
-typedef basic_name_generator<detail::sha1> name_generator_sha1;
+class name_generator_sha1: public detail::basic_name_generator<detail::sha1>
+{
+public:
+
+    explicit name_generator_sha1( uuid const& namespace_uuid ) noexcept:
+        detail::basic_name_generator<detail::sha1>( namespace_uuid )
+    {
+    }
+};
 
 } // uuids
 } // boost
 
-#endif // BOOST_UUID_NAME_GENERATOR_SHA1_HPP
+#endif // BOOST_UUID_NAME_GENERATOR_SHA1_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/namespaces.hpp b/inst/include/boost/uuid/namespaces.hpp
new file mode 100644
index 000000000..82c4ec7d3
--- /dev/null
+++ b/inst/include/boost/uuid/namespaces.hpp
@@ -0,0 +1,49 @@
+#ifndef BOOST_UUID_NAMESPACES_HPP_INCLUDED
+#define BOOST_UUID_NAMESPACES_HPP_INCLUDED
+
+// Copyright 2010 Andy Tompkins
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid.hpp>
+
+namespace boost {
+namespace uuids {
+namespace ns {
+
+inline uuid dns() noexcept
+{
+    uuid result = {{
+        0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1,
+        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
+    return result;
+}
+
+inline uuid url() noexcept
+{
+    uuid result = {{
+        0x6b, 0xa7, 0xb8, 0x11, 0x9d, 0xad, 0x11, 0xd1,
+        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
+    return result;
+}
+
+inline uuid oid() noexcept
+{
+    uuid result = {{
+        0x6b, 0xa7, 0xb8, 0x12, 0x9d, 0xad, 0x11, 0xd1,
+        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
+    return result;
+}
+
+inline uuid x500dn() noexcept
+{
+    uuid result = {{
+        0x6b, 0xa7, 0xb8, 0x14, 0x9d, 0xad, 0x11, 0xd1,
+        0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8 }};
+    return result;
+}
+
+}}} // namespace boost::uuids::ns
+
+#endif // BOOST_UUID_NAMESPACES_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/nil_generator.hpp b/inst/include/boost/uuid/nil_generator.hpp
index 4c298192e..5b3ace7d5 100644
--- a/inst/include/boost/uuid/nil_generator.hpp
+++ b/inst/include/boost/uuid/nil_generator.hpp
@@ -1,12 +1,9 @@
-// Boost nil_generator.hpp header file  ----------------------------------------------//
+#ifndef BOOST_UUID_NIL_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_NIL_GENERATOR_HPP_INCLUDED
 
 // Copyright 2010 Andy Tompkins.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_UUID_NIL_GENERATOR_HPP
-#define BOOST_UUID_NIL_GENERATOR_HPP
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/uuid/uuid.hpp>
 
@@ -14,21 +11,21 @@ namespace boost {
 namespace uuids {
 
 // generate a nil uuid
-struct nil_generator {
-    typedef uuid result_type;
+struct nil_generator
+{
+    using result_type = uuid;
     
-    uuid operator()() const {
-        // initialize to all zeros
-        uuid u = {{0}};
-        return u;
+    uuid operator()() const noexcept
+    {
+        return {{}};
     }
 };
 
-inline uuid nil_uuid() {
-    return nil_generator()();
+inline uuid nil_uuid() noexcept
+{
+    return {{}};
 }
 
 }} // namespace boost::uuids
 
-#endif // BOOST_UUID_NIL_GENERATOR_HPP
-
+#endif // BOOST_UUID_NIL_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/random_generator.hpp b/inst/include/boost/uuid/random_generator.hpp
index 0fa34c045..6242867cd 100644
--- a/inst/include/boost/uuid/random_generator.hpp
+++ b/inst/include/boost/uuid/random_generator.hpp
@@ -1,228 +1,30 @@
-// Boost random_generator.hpp header file  ----------------------------------------------//
+#ifndef BOOST_UUID_RANDOM_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_RANDOM_GENERATOR_HPP_INCLUDED
 
 // Copyright 2010 Andy Tompkins.
 // Copyright 2017 James E. King III
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-#ifndef BOOST_UUID_RANDOM_GENERATOR_HPP
-#define BOOST_UUID_RANDOM_GENERATOR_HPP
-
-#include <boost/config.hpp>
-#include <boost/assert.hpp>
-#include <boost/move/core.hpp>
-#include <boost/move/utility_core.hpp>
-#include <boost/core/enable_if.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <boost/random/variate_generator.hpp>
-#include <boost/tti/has_member_function.hpp>
-#include <boost/uuid/detail/random_provider.hpp>
-#include <boost/uuid/uuid.hpp>
-#include <limits>
+#include <boost/uuid/basic_random_generator.hpp>
+#include <boost/uuid/detail/random_device.hpp>
+#include <boost/uuid/detail/chacha20.hpp>
 
 namespace boost {
 namespace uuids {
 
-namespace detail {
-    template<class U>
-    U& set_uuid_random_vv(U& u)
-    {
-        // set variant
-        // must be 0b10xxxxxx
-        *(u.begin() + 8) &= 0xBF;
-        *(u.begin() + 8) |= 0x80;
-
-        // set version
-        // must be 0b0100xxxx
-        *(u.begin() + 6) &= 0x4F; //0b01001111
-        *(u.begin() + 6) |= 0x40; //0b01000000
-
-        return u;
-    }
-
-    BOOST_TTI_HAS_MEMBER_FUNCTION(seed)
-}
-
-//! generate a random-based uuid
-//! \param[in]  UniformRandomNumberGenerator  see Boost.Random documentation
-template <typename UniformRandomNumberGenerator>
-class basic_random_generator
+// the default random generator
+class random_generator: public basic_random_generator<detail::chacha20_12>
 {
-    BOOST_MOVABLE_BUT_NOT_COPYABLE(basic_random_generator)
-
-private:
-    typedef uniform_int<unsigned long> distribution_type;
-    typedef variate_generator<UniformRandomNumberGenerator*, distribution_type> generator_type;
-
-    struct impl
-    {
-        generator_type generator;
-
-        explicit impl(UniformRandomNumberGenerator* purng_arg) :
-            generator(purng_arg, distribution_type((std::numeric_limits<unsigned long>::min)(), (std::numeric_limits<unsigned long>::max)()))
-        {
-        }
-
-        virtual ~impl() {}
-
-        BOOST_DELETED_FUNCTION(impl(impl const&))
-        BOOST_DELETED_FUNCTION(impl& operator= (impl const&))
-    };
-
-    struct urng_holder
-    {
-        UniformRandomNumberGenerator urng;
-    };
-
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-// 'this' : used in base member initializer list
-#pragma warning(disable: 4355)
-#endif
-
-    struct self_contained_impl :
-        public urng_holder,
-        public impl
-    {
-        self_contained_impl() : impl(&this->urng_holder::urng)
-        {
-        }
-    };
-
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
-public:
-    typedef uuid result_type;
-
-    // default constructor creates the random number generator and
-    // if the UniformRandomNumberGenerator is a PseudoRandomNumberGenerator
-    // then it gets seeded by a random_provider.
-    basic_random_generator() : m_impl(new self_contained_impl())
-    {
-        // seed the random number generator if it is capable
-        seed(static_cast< self_contained_impl* >(m_impl)->urng);
-    }
-
-    // keep a reference to a random number generator
-    // don't seed a given random number generator
-    explicit basic_random_generator(UniformRandomNumberGenerator& gen) : m_impl(new impl(&gen))
-    {
-    }
-
-    // keep a pointer to a random number generator
-    // don't seed a given random number generator
-    explicit basic_random_generator(UniformRandomNumberGenerator* gen) : m_impl(new impl(gen))
-    {
-        BOOST_ASSERT(!!gen);
-    }
-
-    basic_random_generator(BOOST_RV_REF(basic_random_generator) that) BOOST_NOEXCEPT : m_impl(that.m_impl)
-    {
-        that.m_impl = 0;
-    }
-
-    basic_random_generator& operator= (BOOST_RV_REF(basic_random_generator) that) BOOST_NOEXCEPT
-    {
-        delete m_impl;
-        m_impl = that.m_impl;
-        that.m_impl = 0;
-        return *this;
-    }
-
-    ~basic_random_generator()
-    {
-        delete m_impl;
-    }
-
-    result_type operator()()
-    {
-        result_type u;
-
-        int i=0;
-        unsigned long random_value = m_impl->generator();
-        for (uuid::iterator it = u.begin(), end = u.end(); it != end; ++it, ++i) {
-            if (i==sizeof(unsigned long)) {
-                random_value = m_impl->generator();
-                i = 0;
-            }
-
-            // static_cast gets rid of warnings of converting unsigned long to boost::uint8_t
-            *it = static_cast<uuid::value_type>((random_value >> (i*8)) & 0xFF);
-        }
-
-        return detail::set_uuid_random_vv(u);
-    }
-
-private:
-    // Detect whether UniformRandomNumberGenerator has a seed() method which indicates that
-    // it is a PseudoRandomNumberGenerator and needs a seed to initialize it.  This allows
-    // basic_random_generator to take any type of UniformRandomNumberGenerator and still
-    // meet the post-conditions for the default constructor.
-
-    template<class MaybePseudoRandomNumberGenerator>
-    typename boost::enable_if<detail::has_member_function_seed<MaybePseudoRandomNumberGenerator, void> >::type
-        seed(MaybePseudoRandomNumberGenerator& rng)
-    {
-        detail::random_provider seeder;
-        rng.seed(seeder);
-    }
-
-    template<class MaybePseudoRandomNumberGenerator>
-    typename boost::disable_if<detail::has_member_function_seed<MaybePseudoRandomNumberGenerator, void> >::type
-        seed(MaybePseudoRandomNumberGenerator&)
-    {
-    }
-
-    impl* m_impl;
 };
 
-//! \brief a far less complex random generator that uses
-//!        operating system provided entropy which will
-//!        satisfy the majority of use cases
-class random_generator_pure
-{
-    BOOST_MOVABLE_BUT_NOT_COPYABLE(random_generator_pure)
-
-public:
-    typedef uuid result_type;
-
-    BOOST_DEFAULTED_FUNCTION(random_generator_pure(), {})
-
-    random_generator_pure(BOOST_RV_REF(random_generator_pure) that) BOOST_NOEXCEPT :
-        prov_(boost::move(that.prov_))
-    {
-    }
-
-    random_generator_pure& operator= (BOOST_RV_REF(random_generator_pure) that) BOOST_NOEXCEPT
-    {
-        prov_ = boost::move(that.prov_);
-        return *this;
-    }
-
-    //! \returns a random, valid uuid
-    //! \throws entropy_error
-    result_type operator()()
-    {
-        result_type result;
-        prov_.get_random_bytes(&result, sizeof(result_type));
-        return detail::set_uuid_random_vv(result);
-    }
-
-private:
-    detail::random_provider prov_;
-};
+// only provided for compatibility with 1.85
+using random_generator_mt19937 = basic_random_generator<std::mt19937>;
 
-#if defined(BOOST_UUID_RANDOM_GENERATOR_COMPAT)
-typedef basic_random_generator<mt19937> random_generator;
-#else
-typedef random_generator_pure random_generator;
-typedef basic_random_generator<mt19937> random_generator_mt19937;
-#endif
+// only provided for compatibility with 1.85
+using random_generator_pure = basic_random_generator<detail::random_device>;
 
 }} // namespace boost::uuids
 
-#endif // BOOST_UUID_RANDOM_GENERATOR_HPP
+#endif // BOOST_UUID_RANDOM_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/string_generator.hpp b/inst/include/boost/uuid/string_generator.hpp
index 7d9597eda..36f899188 100644
--- a/inst/include/boost/uuid/string_generator.hpp
+++ b/inst/include/boost/uuid/string_generator.hpp
@@ -1,199 +1,241 @@
-// Boost string_generator.hpp header file  ----------------------------------------------//
+#ifndef BOOST_UUID_STRING_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_STRING_GENERATOR_HPP_INCLUDED
 
-// Copyright 2010 Andy Tompkins.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_UUID_STRING_GENERATOR_HPP
-#define BOOST_UUID_STRING_GENERATOR_HPP
+// Copyright 2010 Andy Tompkins
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/uuid/uuid.hpp>
+#include <boost/throw_exception.hpp>
+#include <boost/config.hpp>
 #include <string>
-#include <cstring> // for strlen, wcslen
 #include <iterator>
 #include <algorithm> // for find
 #include <stdexcept>
-#include <boost/throw_exception.hpp>
-#include <boost/config.hpp>
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std {
-    using ::strlen;
-    using ::wcslen;
-} //namespace std
-#endif //BOOST_NO_STDC_NAMESPACE
+#include <cstring> // for strlen, wcslen
+#include <cstdio>
 
 namespace boost {
 namespace uuids {
 
-// generate a uuid from a string
-// lexical_cast works fine using uuid_io.hpp
-// but this generator should accept more forms
-// and be more efficient
-// would like to accept the following forms:
+// Generates a UUID from a string
+//
+// Accepts the following forms:
+//
 // 0123456789abcdef0123456789abcdef
 // 01234567-89ab-cdef-0123-456789abcdef
 // {01234567-89ab-cdef-0123-456789abcdef}
 // {0123456789abcdef0123456789abcdef}
-// others?
-struct string_generator {
-    typedef uuid result_type;
-    
-    template <typename ch, typename char_traits, typename alloc>
-    uuid operator()(std::basic_string<ch, char_traits, alloc> const& s) const {
+
+struct string_generator
+{
+    using result_type = uuid;
+
+    template<class Ch, class Traits, class Alloc>
+    uuid operator()( std::basic_string<Ch, Traits, Alloc> const& s ) const
+    {
         return operator()(s.begin(), s.end());
     }
 
-    uuid operator()(char const*const s) const {
-        return operator()(s, s+std::strlen(s));
+    uuid operator()( char const* s ) const
+    {
+        return operator()( s, s + std::strlen( s ) );
     }
 
-    uuid operator()(wchar_t const*const s) const {
-        return operator()(s, s+std::wcslen(s));
+    uuid operator()( wchar_t const* s ) const
+    {
+        return operator()( s, s + std::wcslen( s ) );
     }
 
-    template <typename CharIterator>
-    uuid operator()(CharIterator begin, CharIterator end) const
+    template<class CharIterator>
+    uuid operator()( CharIterator begin, CharIterator end ) const
     {
-        typedef typename std::iterator_traits<CharIterator>::value_type char_type;
+        using char_type = typename std::iterator_traits<CharIterator>::value_type;
+
+        int ipos = 0;
 
         // check open brace
-        char_type c = get_next_char(begin, end);
-        bool has_open_brace = is_open_brace(c);
+        char_type c = get_next_char( begin, end, ipos );
+
+        bool has_open_brace = is_open_brace( c );
+
         char_type open_brace_char = c;
-        if (has_open_brace) {
-            c = get_next_char(begin, end);
+
+        if( has_open_brace )
+        {
+            c = get_next_char( begin, end, ipos );
         }
 
         bool has_dashes = false;
 
         uuid u;
-        int i=0;
-        for (uuid::iterator it_byte=u.begin(); it_byte!=u.end(); ++it_byte, ++i) {
-            if (it_byte != u.begin()) {
-                c = get_next_char(begin, end);
+
+        int i = 0;
+
+        for( uuid::iterator it_byte = u.begin(); it_byte != u.end(); ++it_byte, ++i )
+        {
+            if( it_byte != u.begin() )
+            {
+                c = get_next_char( begin, end, ipos );
             }
-            
-            if (i == 4) {
-                has_dashes = is_dash(c);
-                if (has_dashes) {
-                    c = get_next_char(begin, end);
+
+            if( i == 4 )
+            {
+                has_dashes = is_dash( c );
+
+                if( has_dashes )
+                {
+                    c = get_next_char( begin, end, ipos );
                 }
             }
-            
-            // if there are dashes, they must be in every slot
-            else if (i == 6 || i == 8 || i == 10) {
-                if (has_dashes == true) {
-                    if (is_dash(c)) {
-                        c = get_next_char(begin, end);
-                    } else {
-                        throw_invalid();
+            else if( i == 6 || i == 8 || i == 10 )
+            {
+                // if there are dashes, they must be in every slot
+                if( has_dashes )
+                {
+                    if( is_dash( c ) )
+                    {
+                        c = get_next_char( begin, end, ipos );
+                    }
+                    else
+                    {
+                        throw_invalid( ipos - 1, "dash expected" );
                     }
                 }
             }
-                
 
-            *it_byte = get_value(c);
+            *it_byte = get_value( c, ipos - 1 );
+
+            c = get_next_char( begin, end, ipos );
 
-            c = get_next_char(begin, end);
             *it_byte <<= 4;
-            *it_byte |= get_value(c);
+            *it_byte |= get_value( c, ipos - 1 );
         }
 
         // check close brace
-        if (has_open_brace) {
-            c = get_next_char(begin, end);
-            check_close_brace(c, open_brace_char);
+        if( has_open_brace )
+        {
+            c = get_next_char( begin, end, ipos );
+            check_close_brace( c, open_brace_char, ipos - 1 );
         }
 
         // check end of string - any additional data is an invalid uuid
-        if (begin != end) {
-            throw_invalid();
+        if( begin != end )
+        {
+            throw_invalid( ipos, "unexpected extra input" );
         }
-        
+
         return u;
     }
-    
+
 private:
+
+    BOOST_NORETURN void throw_invalid( int ipos, char const* error ) const
+    {
+        char buffer[ 16 ];
+        std::snprintf( buffer, sizeof( buffer ), "%d", ipos );
+
+        BOOST_THROW_EXCEPTION( std::runtime_error( std::string( "Invalid UUID string at position " ) + buffer + ": " + error ) );
+    }
+
     template <typename CharIterator>
     typename std::iterator_traits<CharIterator>::value_type
-    get_next_char(CharIterator& begin, CharIterator end) const {
-        if (begin == end) {
-            throw_invalid();
+    get_next_char( CharIterator& begin, CharIterator end, int& ipos ) const
+    {
+        if( begin == end )
+        {
+            throw_invalid( ipos, "unexpected end of input" );
         }
+
+        ++ipos;
         return *begin++;
     }
 
-    unsigned char get_value(char c) const {
+    unsigned char get_value( char c, int ipos ) const
+    {
         static char const digits_begin[] = "0123456789abcdefABCDEF";
         static size_t digits_len = (sizeof(digits_begin) / sizeof(char)) - 1;
-        static char const*const digits_end = digits_begin + digits_len;
+        static char const* const digits_end = digits_begin + digits_len;
 
         static unsigned char const values[] =
             { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,10,11,12,13,14,15 };
 
-        size_t pos = std::find(digits_begin, digits_end, c) - digits_begin;
-        if (pos >= digits_len) {
-            throw_invalid();
+        size_t pos = std::find( digits_begin, digits_end, c ) - digits_begin;
+
+        if( pos >= digits_len )
+        {
+            throw_invalid( ipos, "hex digit expected" );
         }
-        return values[pos];
+
+        return values[ pos ];
     }
 
-    unsigned char get_value(wchar_t c) const {
+    unsigned char get_value( wchar_t c, int ipos ) const
+    {
         static wchar_t const digits_begin[] = L"0123456789abcdefABCDEF";
         static size_t digits_len = (sizeof(digits_begin) / sizeof(wchar_t)) - 1;
-        static wchar_t const*const digits_end = digits_begin + digits_len;
-        
+        static wchar_t const* const digits_end = digits_begin + digits_len;
+
         static unsigned char const values[] =
             { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,10,11,12,13,14,15 };
 
-        size_t pos = std::find(digits_begin, digits_end, c) - digits_begin;
-        if (pos >= digits_len) {
-            throw_invalid();
+        size_t pos = std::find( digits_begin, digits_end, c ) - digits_begin;
+
+        if( pos >= digits_len )
+        {
+            throw_invalid( ipos, "hex digit expected" );
         }
-        return values[pos];
+
+        return values[ pos ];
     }
 
-    bool is_dash(char c) const {
+    bool is_dash( char c ) const
+    {
         return c == '-';
     }
-    
-    bool is_dash(wchar_t c) const {
+
+    bool is_dash( wchar_t c ) const
+    {
         return c == L'-';
     }
-    
+
     // return closing brace
-    bool is_open_brace(char c) const {
-        return (c == '{');
+    bool is_open_brace( char c ) const
+    {
+        return c == '{';
     }
-    
-    bool is_open_brace(wchar_t c) const {
-        return (c == L'{');
+
+    bool is_open_brace( wchar_t c ) const
+    {
+        return c == L'{';
     }
-    
-    void check_close_brace(char c, char open_brace) const {
-        if (open_brace == '{' && c == '}') {
+
+    void check_close_brace( char c, char open_brace, int ipos ) const
+    {
+        if( open_brace == '{' && c == '}' )
+        {
             //great
-        } else {
-            throw_invalid();
+        }
+        else
+        {
+            throw_invalid( ipos, "closing brace expected" );
         }
     }
-    
-    void check_close_brace(wchar_t c, wchar_t open_brace) const {
-        if (open_brace == L'{' && c == L'}') {
+
+    void check_close_brace( wchar_t c, wchar_t open_brace, int ipos ) const
+    {
+        if( open_brace == L'{' && c == L'}' )
+        {
             // great
-        } else {
-            throw_invalid();
         }
-    }
-    
-    BOOST_NORETURN void throw_invalid() const {
-        BOOST_THROW_EXCEPTION(std::runtime_error("invalid uuid string"));
+        else
+        {
+            throw_invalid( ipos, "closing brace expected" );
+        }
     }
 };
 
 }} // namespace boost::uuids
 
-#endif //BOOST_UUID_STRING_GENERATOR_HPP
-
+#endif // BOOST_UUID_STRING_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/time_generator.hpp b/inst/include/boost/uuid/time_generator.hpp
new file mode 100644
index 000000000..4c61f252d
--- /dev/null
+++ b/inst/include/boost/uuid/time_generator.hpp
@@ -0,0 +1,12 @@
+#ifndef BOOST_UUID_TIME_GENERATOR_HPP_INCLUDED
+#define BOOST_UUID_TIME_GENERATOR_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/time_generator_v1.hpp>
+#include <boost/uuid/time_generator_v6.hpp>
+#include <boost/uuid/time_generator_v7.hpp>
+
+#endif // BOOST_UUID_TIME_GENERATOR_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/time_generator_v1.hpp b/inst/include/boost/uuid/time_generator_v1.hpp
new file mode 100644
index 000000000..2e8493e62
--- /dev/null
+++ b/inst/include/boost/uuid/time_generator_v1.hpp
@@ -0,0 +1,170 @@
+#ifndef BOOST_UUID_TIME_GENERATOR_V1_HPP_INCLUDED
+#define BOOST_UUID_TIME_GENERATOR_V1_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_clock.hpp>
+#include <boost/uuid/detail/random_provider.hpp>
+#include <boost/uuid/detail/endian.hpp>
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
+#include <atomic>
+#include <cstdint>
+#include <cstring>
+
+namespace boost {
+namespace uuids {
+
+// time_generator_v1
+
+class time_generator_v1
+{
+public:
+
+    struct state_type
+    {
+        std::uint64_t timestamp;
+        std::uint16_t clock_seq;
+
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114865
+#if BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, >= 130000)
+# if BOOST_CXX_VERSION >= 201402L
+
+        std::uint16_t padding[ 3 ] = {};
+
+# else
+
+        std::uint16_t padding[ 3 ];
+
+# endif
+#endif
+    };
+
+private:
+
+    uuid::node_type node_ = {{}};
+
+    std::atomic<state_type>* ps_ = nullptr;
+
+#if BOOST_WORKAROUND(BOOST_GCC, < 50000)
+
+    // Avoid -Wmissing-field-initializers under GCC 4.x
+    state_type state_ = { 0, 0 };
+
+#else
+
+    state_type state_ = {};
+
+#endif
+
+public:
+
+    using result_type = uuid;
+
+    time_generator_v1();
+    time_generator_v1( uuid::node_type const& node, state_type const& state ) noexcept;
+    time_generator_v1( uuid::node_type const& node, std::atomic<state_type>& state ) noexcept;
+
+    result_type operator()() noexcept;
+
+private:
+
+    static state_type get_new_state( state_type const& oldst ) noexcept;
+};
+
+// constructors
+
+inline time_generator_v1::time_generator_v1()
+{
+    detail::random_provider prov;
+
+    // generate a pseudorandom node identifier
+
+    std::uint32_t tmp[ 3 ];
+    prov.generate( tmp, tmp + 3 );
+
+    std::memcpy( node_.data(), tmp, node_.size() );
+    node_[ 0 ] |= 0x01; // mark as multicast
+
+    // generate a pseudorandom 14 bit clock sequence
+
+    state_.clock_seq = static_cast<std::uint16_t>( tmp[ 2 ] & 0x3FFF );
+}
+
+inline time_generator_v1::time_generator_v1( uuid::node_type const& node, state_type const& state ) noexcept: node_( node ), state_( state )
+{
+}
+
+inline time_generator_v1::time_generator_v1( uuid::node_type const& node, std::atomic<state_type>& state ) noexcept: node_( node ), ps_( &state )
+{
+}
+
+// get_new_state
+
+inline time_generator_v1::state_type time_generator_v1::get_new_state( state_type const& oldst ) noexcept
+{
+    state_type newst( oldst );
+
+    std::uint64_t timestamp = uuid_clock::now().time_since_epoch().count();
+
+    if( timestamp <= newst.timestamp )
+    {
+        newst.clock_seq = ( newst.clock_seq + 1 ) & 0x3FFF;
+    }
+
+    newst.timestamp = timestamp;
+
+    return newst;
+}
+
+// operator()
+
+inline time_generator_v1::result_type time_generator_v1::operator()() noexcept
+{
+    if( ps_ )
+    {
+        auto oldst = ps_->load( std::memory_order_relaxed );
+
+        for( ;; )
+        {
+            auto newst = get_new_state( oldst );
+
+            if( ps_->compare_exchange_strong( oldst, newst, std::memory_order_relaxed, std::memory_order_relaxed ) )
+            {
+                state_ = newst;
+                break;
+            }
+        }
+    }
+    else
+    {
+        state_ = get_new_state( state_ );
+    }
+
+    uuid result;
+
+    std::uint32_t time_low = static_cast< std::uint32_t >( state_.timestamp );
+
+    detail::store_big_u32( result.data + 0, time_low );
+
+    std::uint16_t time_mid = static_cast< std::uint16_t >( state_.timestamp >> 32 );
+
+    detail::store_big_u16( result.data + 4, time_mid );
+
+    std::uint16_t time_hi_and_version = static_cast< std::uint16_t >( state_.timestamp >> 48 ) | 0x1000;
+
+    detail::store_big_u16( result.data + 6, time_hi_and_version );
+
+    detail::store_big_u16( result.data + 8, state_.clock_seq | 0x8000 );
+
+    std::memcpy( result.data + 10, node_.data(), 6 );
+
+    return result;
+}
+
+}} // namespace boost::uuids
+
+#endif // BOOST_UUID_TIME_GENERATOR_V1_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/time_generator_v6.hpp b/inst/include/boost/uuid/time_generator_v6.hpp
new file mode 100644
index 000000000..8edc8a2c2
--- /dev/null
+++ b/inst/include/boost/uuid/time_generator_v6.hpp
@@ -0,0 +1,53 @@
+#ifndef BOOST_UUID_TIME_GENERATOR_V6_HPP_INCLUDED
+#define BOOST_UUID_TIME_GENERATOR_V6_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/time_generator_v1.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/detail/endian.hpp>
+
+namespace boost {
+namespace uuids {
+
+// time_generator_v6
+
+class time_generator_v6: public time_generator_v1
+{
+public:
+
+    using result_type = uuid;
+
+    using time_generator_v1::time_generator_v1;
+
+    result_type operator()() noexcept;
+};
+
+// operator()
+
+inline time_generator_v6::result_type time_generator_v6::operator()() noexcept
+{
+    uuid result = time_generator_v1::operator()();
+
+    std::uint64_t timestamp = result.timestamp_v1();
+
+    std::uint32_t time_high = static_cast< std::uint32_t >( timestamp >> 28 );
+
+    detail::store_big_u32( result.data + 0, time_high );
+
+    std::uint16_t time_mid = static_cast< std::uint16_t >( timestamp >> 12 );
+
+    detail::store_big_u16( result.data + 4, time_mid );
+
+    std::uint16_t time_low_and_version = static_cast< std::uint16_t >( timestamp & 0xFFF ) | 0x6000;
+
+    detail::store_big_u16( result.data + 6, time_low_and_version );
+
+    return result;
+}
+
+}} // namespace boost::uuids
+
+#endif // BOOST_UUID_TIME_GENERATOR_V1_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/time_generator_v7.hpp b/inst/include/boost/uuid/time_generator_v7.hpp
new file mode 100644
index 000000000..50c942c10
--- /dev/null
+++ b/inst/include/boost/uuid/time_generator_v7.hpp
@@ -0,0 +1,152 @@
+#ifndef BOOST_UUID_TIME_GENERATOR_V7_HPP_INCLUDED
+#define BOOST_UUID_TIME_GENERATOR_V7_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/detail/chacha20.hpp>
+#include <boost/uuid/detail/random_provider.hpp>
+#include <boost/uuid/detail/endian.hpp>
+#include <random>
+#include <cstdint>
+#include <cstring>
+
+namespace boost {
+namespace uuids {
+
+// time_generator_v7
+
+class time_generator_v7
+{
+private:
+
+    // Bit layout from high to low:
+    // 48 bits: millisecond part of Unix epoch timestamp
+    // 10 bits: microsecond part of Unix epoch timestamp
+    //  6 bits: conflict resolution counter
+
+    using state_type = std::uint64_t;
+
+    state_type state_ = {};
+
+    detail::chacha20_12 rng_;
+
+public:
+
+    using result_type = uuid;
+
+    time_generator_v7();
+
+    time_generator_v7( time_generator_v7 const& rhs );
+    time_generator_v7( time_generator_v7&& rhs ) noexcept;
+
+    time_generator_v7& operator=( time_generator_v7 const& rhs ) noexcept;
+    time_generator_v7& operator=( time_generator_v7&& rhs ) noexcept;
+
+    result_type operator()() noexcept;
+
+private:
+
+    static state_type get_new_state( state_type const& oldst ) noexcept;
+};
+
+// constructors
+
+inline time_generator_v7::time_generator_v7()
+{
+    detail::random_provider seeder;
+    rng_.seed( seeder );
+}
+
+inline time_generator_v7::time_generator_v7( time_generator_v7 const& rhs ): state_( rhs.state_ )
+{
+    detail::random_provider seeder;
+    rng_.seed( seeder );
+}
+
+inline time_generator_v7::time_generator_v7( time_generator_v7&& rhs ) noexcept: state_( std::move( rhs.state_ ) ), rng_( std::move( rhs.rng_ ) )
+{
+    rhs.rng_.perturb();
+}
+
+// assignment
+
+inline time_generator_v7& time_generator_v7::operator=( time_generator_v7 const& rhs ) noexcept
+{
+    state_ = rhs.state_;
+    return *this;
+}
+
+inline time_generator_v7& time_generator_v7::operator=( time_generator_v7&& rhs ) noexcept
+{
+    state_ = std::move( rhs.state_ );
+    rng_ = std::move( rhs.rng_ );
+
+    rhs.rng_.perturb();
+
+    return *this;
+}
+
+// get_new_state
+
+inline time_generator_v7::state_type time_generator_v7::get_new_state( state_type const& oldst ) noexcept
+{
+    // `now()` in microseconds
+    std::uint64_t now_in_us = std::chrono::time_point_cast< std::chrono::microseconds >( std::chrono::system_clock::now() ).time_since_epoch().count();
+
+    std::uint64_t time_ms = now_in_us / 1000; // timestamp, ms part
+    std::uint64_t time_us = now_in_us % 1000; // timestamp, us part
+
+    std::uint64_t newst = ( time_ms << 16 ) | ( time_us << 6 );
+
+    // if the time has advanced, reset counter to zero
+    if( newst > oldst )
+    {
+        return newst;
+    }
+
+    // if time_in_ms has gone backwards, we can't be monotonic
+    if( time_ms < ( oldst >> 16 ) )
+    {
+        return newst;
+    }
+
+    // otherwise, use the old value and increment the counter
+    return oldst + 1;
+}
+
+// operator()
+
+inline time_generator_v7::result_type time_generator_v7::operator()() noexcept
+{
+    uuid result;
+
+    // set lower 64 bits to random values
+
+    std::uniform_int_distribution<std::uint32_t> dist;
+
+    detail::store_native_u32( result.data +  8, dist( rng_ ) );
+    detail::store_native_u32( result.data + 12, dist( rng_ ) );
+
+    // get new timestamp
+    state_ = get_new_state( state_ );
+
+    std::uint64_t time_ms = state_ >> 16; // timestamp, ms part
+    std::uint64_t time_us = ( state_ & 0xFFFF ) >> 6; // timestamp, us part
+
+    std::uint64_t timestamp = ( time_ms << 16 ) | 0x7000 | time_us;
+
+    detail::store_big_u64( result.data + 0, timestamp );
+
+    // set variant and counter
+
+    result.data[ 8 ] = static_cast< std::uint8_t >( 0x80 | ( state_ & 0x3F ) );
+
+    return result;
+}
+
+}} // namespace boost::uuids
+
+#endif // BOOST_UUID_TIME_GENERATOR_V7_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/uuid.hpp b/inst/include/boost/uuid/uuid.hpp
index d3bb34b72..b0677ba0d 100644
--- a/inst/include/boost/uuid/uuid.hpp
+++ b/inst/include/boost/uuid/uuid.hpp
@@ -1,91 +1,179 @@
-// Boost uuid.hpp header file  ----------------------------------------------//
-
-// Copyright 2006 Andy Tompkins.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
-
-// Revision History
-//  06 Feb 2006 - Initial Revision
-//  09 Nov 2006 - fixed variant and version bits for v4 guids
-//  13 Nov 2006 - added serialization
-//  17 Nov 2006 - added name-based guid creation
-//  20 Nov 2006 - add fixes for gcc (from Tim Blechmann)
-//  07 Mar 2007 - converted to header only
-//  10 May 2007 - removed need for Boost.Thread
-//              - added better seed - thanks Peter Dimov
-//              - removed null()
-//              - replaced byte_count() and output_bytes() with size() and begin() and end()
-//  11 May 2007 - fixed guid(ByteInputIterator first, ByteInputIterator last)
-//              - optimized operator>>
-//  14 May 2007 - converted from guid to uuid
-//  29 May 2007 - uses new implementation of sha1
-//  01 Jun 2007 - removed using namespace directives
-//  09 Nov 2007 - moved implementation to uuid.ipp file
-//  12 Nov 2007 - moved serialize code to uuid_serialize.hpp file
-//  25 Feb 2008 - moved to namespace boost::uuids
-//  19 Mar 2009 - changed to a POD, reorganized files
-//  28 Nov 2009 - disabled deprecated warnings for MSVC
-//  30 Nov 2009 - used BOOST_STATIC_CONSTANT
-//  02 Dec 2009 - removed BOOST_STATIC_CONSTANT - not all compilers like it
-//  29 Apr 2013 - added support for noexcept and constexpr, added optimizations for SSE/AVX
-
-#ifndef BOOST_UUID_HPP
-#define BOOST_UUID_HPP
+#ifndef BOOST_UUID_UUID_HPP_INCLUDED
+#define BOOST_UUID_UUID_HPP_INCLUDED
 
-#include <cstddef>
-#include <boost/cstdint.hpp>
+// Copyright 2006 Andy Tompkins
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/uuid/uuid_clock.hpp>
+#include <boost/uuid/detail/endian.hpp>
+#include <boost/uuid/detail/hash_mix.hpp>
 #include <boost/uuid/detail/config.hpp>
-#ifndef BOOST_UUID_NO_TYPE_TRAITS
-#include <boost/type_traits/is_pod.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-#endif
+#include <boost/type_traits/integral_constant.hpp> // for Serialization support
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
+#include <array>
+#include <chrono>
+#include <typeindex> // cheapest std::hash
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
+#if defined(__has_builtin)
+# if __has_builtin(__builtin_is_constant_evaluated)
+#  define BOOST_UUID_HAS_BUILTIN_ISCONSTEVAL
+# endif
 #endif
 
-#if defined(_MSC_VER)
-#pragma warning(push) // Save warning settings.
-#pragma warning(disable : 4996) // Disable deprecated std::swap_ranges, std::equal
+#if !defined(BOOST_UUID_HAS_BUILTIN_ISCONSTEVAL) && defined(BOOST_MSVC) && BOOST_MSVC >= 1925
+# define BOOST_UUID_HAS_BUILTIN_ISCONSTEVAL
 #endif
 
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std {
-    using ::size_t;
-    using ::ptrdiff_t;
-} //namespace std
-#endif //BOOST_NO_STDC_NAMESPACE
+#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L && defined(__has_include)
+# if __has_include(<compare>)
+#  include <compare>
+#  if defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+#   define BOOST_UUID_HAS_THREE_WAY_COMPARISON __cpp_lib_three_way_comparison
+#  elif defined(_LIBCPP_VERSION)
+//  https://github.com/llvm/llvm-project/issues/73953
+#   define BOOST_UUID_HAS_THREE_WAY_COMPARISON _LIBCPP_VERSION
+#  endif
+# endif
+#endif
 
 namespace boost {
 namespace uuids {
 
 struct uuid
 {
+private:
+
+    using repr_type = std::uint8_t[ 16 ];
+
+    struct data_type
+    {
+    private:
+
+        union
+        {
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1950)
+
+            std::uint8_t repr_[ 16 ] = {};
+
+#else
+
+            std::uint8_t repr_[ 16 ];
+
+#endif
+
+#if !defined(BOOST_UUID_DISABLE_ALIGNMENT)
+
+            std::uint64_t align_u64_;
+
+#endif
+        };
+
+    public:
+
+        BOOST_CXX14_CONSTEXPR operator repr_type& () noexcept { return repr_; }
+        constexpr operator repr_type const& () const noexcept { return repr_; }
+
+        BOOST_CXX14_CONSTEXPR std::uint8_t* operator()() noexcept { return repr_; }
+        constexpr std::uint8_t const* operator()() const noexcept { return repr_; }
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1930)
+
+        BOOST_CXX14_CONSTEXPR std::uint8_t* operator+( std::ptrdiff_t i ) noexcept { return repr_ + i; }
+        constexpr std::uint8_t const* operator+( std::ptrdiff_t i ) const noexcept { return repr_ + i; }
+
+        BOOST_CXX14_CONSTEXPR std::uint8_t& operator[]( std::ptrdiff_t i ) noexcept { return repr_[ i ]; }
+        constexpr std::uint8_t const& operator[]( std::ptrdiff_t i ) const noexcept { return repr_[ i ]; }
+
+#endif
+    };
+
 public:
-    typedef uint8_t value_type;
-    typedef uint8_t& reference;
-    typedef uint8_t const& const_reference;
-    typedef uint8_t* iterator;
-    typedef uint8_t const* const_iterator;
-    typedef std::size_t size_type;
-    typedef std::ptrdiff_t difference_type;
+
+    // data
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1950)
+
+    data_type data;
+
+#else
+
+    data_type data = {};
+
+#endif
+
+public:
+
+    // constructors
+
+    uuid() = default;
+
+#if defined(BOOST_NO_CXX14_CONSTEXPR)
+
+    uuid( repr_type const& r ) noexcept
+    {
+        std::memcpy( data, r, 16 );
+    }
+
+#elif defined(BOOST_UUID_HAS_BUILTIN_ISCONSTEVAL)
+
+    constexpr uuid( repr_type const& r ) noexcept
+    {
+        if( __builtin_is_constant_evaluated() )
+        {
+            for( int i = 0; i < 16; ++i ) data[ i ] = r[ i ];
+        }
+        else
+        {
+            std::memcpy( data, r, 16 );
+        }
+    }
+
+#else
+
+    constexpr uuid( repr_type const& r ) noexcept
+    {
+        for( int i = 0; i < 16; ++i ) data[ i ] = r[ i ];
+    }
+
+#endif
+
+    // iteration
+
+    using value_type = std::uint8_t;
+    using reference = std::uint8_t&;
+    using const_reference = std::uint8_t const&;
+    using iterator = std::uint8_t*;
+    using const_iterator = std::uint8_t const*;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+
+    iterator begin() noexcept { return data; }
+    const_iterator begin() const noexcept { return data; }
+
+    iterator end() noexcept { return data() + size(); }
+    const_iterator end() const noexcept { return data() + size(); }
+
+    // size
+
+    constexpr size_type size() const noexcept { return static_size(); }
 
     // This does not work on some compilers
-    // They seem to want the variable definec in
+    // They seem to want the variable defined in
     // a cpp file
     //BOOST_STATIC_CONSTANT(size_type, static_size = 16);
-    static BOOST_CONSTEXPR size_type static_size() BOOST_NOEXCEPT { return 16; }
+    static constexpr size_type static_size() noexcept { return 16; }
 
-public:
-    iterator begin() BOOST_NOEXCEPT { return data; }
-    const_iterator begin() const BOOST_NOEXCEPT { return data; }
-    iterator end() BOOST_NOEXCEPT { return data+size(); }
-    const_iterator end() const BOOST_NOEXCEPT { return data+size(); }
+    // is_nil
 
-    BOOST_CONSTEXPR size_type size() const BOOST_NOEXCEPT { return static_size(); }
+    bool is_nil() const noexcept;
 
-    bool is_nil() const BOOST_NOEXCEPT;
+    // variant
 
     enum variant_type
     {
@@ -94,7 +182,8 @@ struct uuid
         variant_microsoft, // Microsoft Corporation backward compatibility
         variant_future // future definition
     };
-    variant_type variant() const BOOST_NOEXCEPT
+
+    variant_type variant() const noexcept
     {
         // variant is stored in octet 7
         // which is index 8, since indexes count backwards
@@ -111,6 +200,8 @@ struct uuid
         }
     }
 
+    // version
+
     enum version_type
     {
         version_unknown = -1,
@@ -118,13 +209,17 @@ struct uuid
         version_dce_security = 2,
         version_name_based_md5 = 3,
         version_random_number_based = 4,
-        version_name_based_sha1 = 5
+        version_name_based_sha1 = 5,
+        version_time_based_v6 = 6,
+        version_time_based_v7 = 7,
+        version_custom_v8 = 8
     };
-    version_type version() const BOOST_NOEXCEPT
+
+    version_type version() const noexcept
     {
         // version is stored in octet 9
         // which is index 6, since indexes count backwards
-        uint8_t octet9 = data[6];
+        std::uint8_t octet9 = data[6];
         if ( (octet9 & 0xF0) == 0x10 ) {
             return version_time_based;
         } else if ( (octet9 & 0xF0) == 0x20 ) {
@@ -135,78 +230,177 @@ struct uuid
             return version_random_number_based;
         } else if ( (octet9 & 0xF0) == 0x50 ) {
             return version_name_based_sha1;
+        } else if ( (octet9 & 0xF0) == 0x60 ) {
+            return version_time_based_v6;
+        } else if ( (octet9 & 0xF0) == 0x70 ) {
+            return version_time_based_v7;
+        } else if ( (octet9 & 0xF0) == 0x80 ) {
+            return version_custom_v8;
         } else {
             return version_unknown;
         }
     }
 
-    // note: linear complexity
-    void swap(uuid& rhs) BOOST_NOEXCEPT;
+    // timestamp
 
-public:
-    // or should it be array<uint8_t, 16>
-    uint8_t data[16];
+    using timestamp_type = std::uint64_t;
+
+    timestamp_type timestamp_v1() const noexcept
+    {
+        std::uint32_t time_low = detail::load_big_u32( this->data + 0 );
+        std::uint16_t time_mid = detail::load_big_u16( this->data + 4 );
+        std::uint16_t time_hi = detail::load_big_u16( this->data + 6 ) & 0x0FFF;
+
+        return time_low | static_cast<std::uint64_t>( time_mid ) << 32 | static_cast<std::uint64_t>( time_hi ) << 48;
+    }
+
+    timestamp_type timestamp_v6() const noexcept
+    {
+        std::uint32_t time_high = detail::load_big_u32( this->data + 0 );
+        std::uint16_t time_mid = detail::load_big_u16( this->data + 4 );
+        std::uint16_t time_low = detail::load_big_u16( this->data + 6 ) & 0x0FFF;
+
+        return time_low | static_cast<std::uint64_t>( time_mid ) << 12 | static_cast<std::uint64_t>( time_high ) << 28;
+    }
+
+    timestamp_type timestamp_v7() const noexcept
+    {
+        std::uint64_t time_and_version = detail::load_big_u64( this->data + 0 );
+        return time_and_version >> 16;
+    }
+
+    // time_point
+
+    uuid_clock::time_point time_point_v1() const noexcept
+    {
+        return uuid_clock::from_timestamp( timestamp_v1() );
+    }
+
+    uuid_clock::time_point time_point_v6() const noexcept
+    {
+        return uuid_clock::from_timestamp( timestamp_v6() );
+    }
+
+    std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds> time_point_v7() const noexcept
+    {
+        return std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds>( std::chrono::milliseconds( timestamp_v7() ) );
+    }
+
+    // clock_seq
+
+    using clock_seq_type = std::uint16_t;
+
+    clock_seq_type clock_seq() const noexcept
+    {
+        return detail::load_big_u16( this->data + 8 ) & 0x3FFF;
+    }
+
+    // node_identifier
+
+    using node_type = std::array<std::uint8_t, 6>;
+
+    node_type node_identifier() const noexcept
+    {
+        node_type node = {{}};
+
+        std::memcpy( node.data(), this->data + 10, 6 );
+        return node;
+    }
+
+    // swap
+
+    void swap( uuid& rhs ) noexcept;
 };
 
-bool operator== (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT;
-bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT;
+// operators
+
+inline bool operator==( uuid const& lhs, uuid const& rhs ) noexcept;
+inline bool operator< ( uuid const& lhs, uuid const& rhs ) noexcept;
 
-inline bool operator!=(uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator!=( uuid const& lhs, uuid const& rhs ) noexcept
 {
     return !(lhs == rhs);
 }
 
-inline bool operator>(uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator>( uuid const& lhs, uuid const& rhs ) noexcept
 {
     return rhs < lhs;
 }
-inline bool operator<=(uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator<=( uuid const& lhs, uuid const& rhs ) noexcept
 {
     return !(rhs < lhs);
 }
 
-inline bool operator>=(uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+inline bool operator>=( uuid const& lhs, uuid const& rhs ) noexcept
 {
     return !(lhs < rhs);
 }
 
-inline void swap(uuid& lhs, uuid& rhs) BOOST_NOEXCEPT
+#if defined(BOOST_UUID_HAS_THREE_WAY_COMPARISON)
+
+inline std::strong_ordering operator<=>( uuid const& lhs, uuid const& rhs ) noexcept;
+
+#endif
+
+// swap
+
+inline void swap( uuid& lhs, uuid& rhs ) noexcept
 {
-    lhs.swap(rhs);
+    lhs.swap( rhs );
 }
 
-// This is equivalent to boost::hash_range(u.begin(), u.end());
-inline std::size_t hash_value(uuid const& u) BOOST_NOEXCEPT
+// hash_value
+
+inline std::size_t hash_value( uuid const& u ) noexcept
 {
-    std::size_t seed = 0;
-    for(uuid::const_iterator i=u.begin(), e=u.end(); i != e; ++i)
-    {
-        seed ^= static_cast<std::size_t>(*i) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-    }
+    std::uint64_t r = 0;
 
-    return seed;
+    r = detail::hash_mix_mx( r + detail::load_little_u32( u.data +  0 ) );
+    r = detail::hash_mix_mx( r + detail::load_little_u32( u.data +  4 ) );
+    r = detail::hash_mix_mx( r + detail::load_little_u32( u.data +  8 ) );
+    r = detail::hash_mix_mx( r + detail::load_little_u32( u.data + 12 ) );
+
+    return static_cast<std::size_t>( detail::hash_mix_fmx( r ) );
 }
 
 }} //namespace boost::uuids
 
-#ifndef BOOST_UUID_NO_TYPE_TRAITS
-// type traits specializations
-namespace boost {
+// Boost.Serialization support
 
-template <>
-struct is_pod<uuids::uuid> : true_type {};
+// BOOST_CLASS_IMPLEMENTATION(boost::uuids::uuid, boost::serialization::primitive_type)
 
+namespace boost
+{
+namespace serialization
+{
+
+template<class T> struct implementation_level_impl;
+template<> struct implementation_level_impl<const uuids::uuid>: boost::integral_constant<int, 1> {};
+
+} // namespace serialization
 } // namespace boost
-#endif
+
+// std::hash support
+
+namespace std
+{
+
+template<> struct hash<boost::uuids::uuid>
+{
+    std::size_t operator()( boost::uuids::uuid const& value ) const noexcept
+    {
+        return boost::uuids::hash_value( value );
+    }
+};
+
+} // namespace std
 
 #if defined(BOOST_UUID_USE_SSE2)
-#include <boost/uuid/detail/uuid_x86.ipp>
+# include <boost/uuid/detail/uuid_x86.ipp>
+#elif defined(__SIZEOF_INT128__)
+# include <boost/uuid/detail/uuid_uint128.ipp>
 #else
-#include <boost/uuid/detail/uuid_generic.ipp>
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(pop) // Restore warnings to previous state.
+# include <boost/uuid/detail/uuid_generic.ipp>
 #endif
 
-#endif // BOOST_UUID_HPP
+#endif // BOOST_UUID_UUID_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/uuid_clock.hpp b/inst/include/boost/uuid/uuid_clock.hpp
new file mode 100644
index 000000000..0ec70291b
--- /dev/null
+++ b/inst/include/boost/uuid/uuid_clock.hpp
@@ -0,0 +1,72 @@
+#ifndef BOOST_UUID_UUID_CLOCK_HPP_INCLUDED
+#define BOOST_UUID_UUID_CLOCK_HPP_INCLUDED
+
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <chrono>
+#include <ratio>
+#include <cstdint>
+
+namespace boost {
+namespace uuids {
+
+class uuid_clock
+{
+public:
+
+    using rep = std::int64_t;
+    using period = std::ratio<1, 10000000>; // 100ns
+    using duration = std::chrono::duration<rep, period>;
+    using time_point = std::chrono::time_point<uuid_clock, duration>;
+
+    static constexpr bool is_steady = false;
+
+    static time_point now() noexcept;
+
+    template<class Duration> static time_point from_sys( std::chrono::time_point<std::chrono::system_clock, Duration> const& tp ) noexcept;
+    static std::chrono::time_point<std::chrono::system_clock, duration> to_sys( time_point const& tp ) noexcept;
+
+    static time_point from_timestamp( std::uint64_t timestamp ) noexcept;
+    static std::uint64_t to_timestamp( time_point const& tp ) noexcept;
+};
+
+inline uuid_clock::time_point uuid_clock::now() noexcept
+{
+    return from_sys( std::chrono::system_clock::now() );
+}
+
+template<class Duration>
+inline uuid_clock::time_point uuid_clock::from_sys( std::chrono::time_point<std::chrono::system_clock, Duration> const& tp ) noexcept
+{
+    using days = std::chrono::duration< std::int32_t, std::ratio<86400> >;
+    constexpr auto epoch_diff = days( 141427 );
+
+    auto uuid_since = std::chrono::duration_cast<uuid_clock::duration>( tp.time_since_epoch() ) + epoch_diff;
+
+    return uuid_clock::time_point( uuid_since );
+}
+
+inline std::chrono::time_point<std::chrono::system_clock, uuid_clock::duration> uuid_clock::to_sys( time_point const& tp ) noexcept
+{
+    using days = std::chrono::duration< std::int32_t, std::ratio<86400> >;
+    constexpr auto epoch_diff = days( 141427 );
+
+    return std::chrono::time_point<std::chrono::system_clock, duration>( tp.time_since_epoch() - epoch_diff );
+}
+
+inline uuid_clock::time_point uuid_clock::from_timestamp( std::uint64_t timestamp ) noexcept
+{
+    return time_point( duration( timestamp ) );
+}
+
+inline std::uint64_t uuid_clock::to_timestamp( time_point const& tp ) noexcept
+{
+    return static_cast<std::uint64_t>(tp.time_since_epoch().count());
+}
+
+} // uuids
+} // boost
+
+#endif // BOOST_UUID_UUID_CLOCK_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/uuid_generators.hpp b/inst/include/boost/uuid/uuid_generators.hpp
index 2916e69a0..7a7d216ef 100644
--- a/inst/include/boost/uuid/uuid_generators.hpp
+++ b/inst/include/boost/uuid/uuid_generators.hpp
@@ -1,3 +1,6 @@
+#ifndef BOOST_UUID_UUID_GENERATORS_HPP_INCLUDED
+#define BOOST_UUID_UUID_GENERATORS_HPP_INCLUDED
+
 // Boost uuid_generators.hpp header file  ----------------------------------------------//
 
 // Copyright 2006 Andy Tompkins.
@@ -5,15 +8,10 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // https://www.boost.org/LICENSE_1_0.txt)
 
-// Revision History
-//  06 Feb 2006 - Initial Revision
-
-#ifndef BOOST_UUID_GENERATORS_HPP
-#define BOOST_UUID_GENERATORS_HPP
-
 #include <boost/uuid/nil_generator.hpp>
 #include <boost/uuid/string_generator.hpp>
 #include <boost/uuid/name_generator.hpp>
 #include <boost/uuid/random_generator.hpp>
+#include <boost/uuid/time_generator.hpp>
 
-#endif //BOOST_UUID_GENERATORS_HPP
+#endif //BOOST_UUID_UUID_GENERATORS_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/uuid_hash.hpp b/inst/include/boost/uuid/uuid_hash.hpp
index 8fe56bc4c..baa122f6f 100644
--- a/inst/include/boost/uuid/uuid_hash.hpp
+++ b/inst/include/boost/uuid/uuid_hash.hpp
@@ -1,40 +1,13 @@
-//
+#ifndef BOOST_UUID_UUID_HASH_HPP_INCLUDED
+#define BOOST_UUID_UUID_HASH_HPP_INCLUDED
+
 // Copyright (c) 2018 James E. King III
-//
 // Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-//   https://www.boost.org/LICENSE_1_0.txt)
-//
-// std::hash support for uuid
-//
+// https://www.boost.org/LICENSE_1_0.txt
 
-#ifndef BOOST_UUID_HASH_HPP
-#define BOOST_UUID_HASH_HPP
+// This header is no longer needed and is only retained
+// for backward compatibility.
 
-#include <boost/config.hpp>
-#include <boost/container_hash/hash.hpp>
 #include <boost/uuid/uuid.hpp>
 
-#ifdef BOOST_HAS_PRAGMA_ONCE
-#pragma once
-#endif
-
-#ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
-
-#include <cstddef>
-#include <functional>
-
-namespace std
-{
-    template<>
-    struct hash<boost::uuids::uuid>
-    {
-        std::size_t operator () (const boost::uuids::uuid& value) const BOOST_NOEXCEPT
-        {
-            return boost::uuids::hash_value(value);
-        }
-    };
-}
-
-#endif /* !BOOST_NO_CXX11_HDR_FUNCTIONAL */
-#endif /* !BOOST_UUID_HASH_HPP */
+#endif // #ifndef BOOST_UUID_UUID_HASH_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/uuid_io.hpp b/inst/include/boost/uuid/uuid_io.hpp
index a0f2edd12..bf1ba8464 100644
--- a/inst/include/boost/uuid/uuid_io.hpp
+++ b/inst/include/boost/uuid/uuid_io.hpp
@@ -1,24 +1,21 @@
-// Boost uuid_io.hpp header file  ----------------------------------------------//
+#ifndef BOOST_UUID_UUID_IO_HPP_INCLUDED
+#define BOOST_UUID_UUID_IO_HPP_INCLUDED
 
-// Copyright 2009 Andy Tompkins.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
-
-// Revision History
-//  20 Mar 2009 - Initial Revision
-//  28 Nov 2009 - disabled deprecated warnings for MSVC
-
-#ifndef BOOST_UUID_IO_HPP
-#define BOOST_UUID_IO_HPP
+// Copyright 2009 Andy Tompkins
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/uuid/uuid.hpp>
-#include <ios>
-#include <ostream>
+#include <boost/uuid/detail/to_chars.hpp>
+#include <boost/uuid/detail/static_assert.hpp>
+#include <boost/config.hpp>
+#include <iosfwd>
 #include <istream>
-#include <boost/io/ios_state.hpp>
 #include <locale>
 #include <algorithm>
+#include <string>
+#include <cstddef>
 
 #if defined(_MSC_VER)
 #pragma warning(push) // Save warning settings.
@@ -28,186 +25,152 @@
 namespace boost {
 namespace uuids {
 
-template <typename ch, typename char_traits>
-    std::basic_ostream<ch, char_traits>& operator<<(std::basic_ostream<ch, char_traits> &os, uuid const& u)
+// to_chars
+
+template<class OutputIterator>
+OutputIterator to_chars( uuid const& u, OutputIterator out )
 {
-    io::ios_flags_saver flags_saver(os);
-    io::basic_ios_fill_saver<ch, char_traits> fill_saver(os);
-
-    const typename std::basic_ostream<ch, char_traits>::sentry ok(os);
-    if (ok) {
-        const std::streamsize width = os.width(0);
-        const std::streamsize uuid_width = 36;
-        const std::ios_base::fmtflags flags = os.flags();
-        const typename std::basic_ios<ch, char_traits>::char_type fill = os.fill();
-        if (flags & (std::ios_base::right | std::ios_base::internal)) {
-            for (std::streamsize i=uuid_width; i<width; i++) {
-                os << fill;
-            }
-        }
+    char tmp[ 36 ];
+    detail::to_chars( u, tmp );
 
-        os << std::hex << std::right;
-        os.fill(os.widen('0'));
+    return std::copy_n( tmp, 36, out );
+}
 
-        std::size_t i=0;
-        for (uuid::const_iterator i_data = u.begin(); i_data!=u.end(); ++i_data, ++i) {
-            os.width(2);
-            os << static_cast<unsigned int>(*i_data);
-            if (i == 3 || i == 5 || i == 7 || i == 9) {
-                os << os.widen('-');
-            }
-        }
+template<class Ch>
+inline bool to_chars( uuid const& u, Ch* first, Ch* last ) noexcept
+{
+    if( last - first < 36 )
+    {
+        return false;
+    }
 
-        if (flags & std::ios_base::left) {
-            for (std::streamsize s=uuid_width; s<width; s++) {
-                os << fill;
-            }
-        }
+    detail::to_chars( u, first );
+    return true;
+}
 
-        os.width(0); //used the width so reset it
-    }
+template<class Ch, std::size_t N>
+inline Ch* to_chars( uuid const& u, Ch (&buffer)[ N ] ) noexcept
+{
+    BOOST_UUID_STATIC_ASSERT( N >= 37 );
+
+    detail::to_chars( u, buffer + 0 );
+    buffer[ 36 ] = 0;
+
+    return buffer + 36;
+}
+
+// only provided for compatibility; deprecated
+template<class Ch>
+BOOST_DEPRECATED( "Use Ch[37] instead of Ch[36] to allow for the null terminator" )
+inline Ch* to_chars( uuid const& u, Ch (&buffer)[ 36 ] ) noexcept
+{
+    detail::to_chars( u, buffer + 0 );
+    return buffer + 36;
+}
+
+// operator<<
+
+template<class Ch, class Traits>
+std::basic_ostream<Ch, Traits>& operator<<( std::basic_ostream<Ch, Traits>& os, uuid const& u )
+{
+    char tmp[ 37 ];
+    to_chars( u, tmp );
+
+    os << tmp;
     return os;
 }
 
-template <typename ch, typename char_traits>
-    std::basic_istream<ch, char_traits>& operator>>(std::basic_istream<ch, char_traits> &is, uuid &u)
+// operator>>
+
+template<class Ch, class Traits>
+std::basic_istream<Ch, Traits>& operator>>( std::basic_istream<Ch, Traits>& is, uuid& u )
 {
-    const typename std::basic_istream<ch, char_traits>::sentry ok(is);
-    if (ok) {
-        unsigned char data[16];
+    Ch tmp[ 37 ] = {};
 
-        typedef std::ctype<ch> ctype_t;
-        ctype_t const& ctype = std::use_facet<ctype_t>(is.getloc());
+    is.width( 37 ); // required for pre-C++20
+
+    if( is >> tmp )
+    {
+        u = {};
+
+        using ctype_t = std::ctype<Ch>;
+        ctype_t const& ctype = std::use_facet<ctype_t>( is.getloc() );
+
+        Ch xdigits[ 17 ];
 
-        ch xdigits[16];
         {
-            char szdigits[] = "0123456789ABCDEF";
-            ctype.widen(szdigits, szdigits+16, xdigits);
+            char szdigits[] = "0123456789ABCDEF-";
+            ctype.widen( szdigits, szdigits + 17, xdigits );
         }
-        ch*const xdigits_end = xdigits+16;
 
-        ch c;
-        for (std::size_t i=0; i<u.size() && is; ++i) {
-            is >> c;
-            c = ctype.toupper(c);
+        Ch* const xdigits_end = xdigits + 16;
+
+        ctype.toupper( tmp, tmp + 36 );
 
-            ch* f = std::find(xdigits, xdigits_end, c);
-            if (f == xdigits_end) {
-                is.setstate(std::ios_base::failbit);
-                break;
+        int j = 0;
+
+        for( std::size_t i = 0; i < 16; ++i )
+        {
+            Ch* f = std::find( xdigits, xdigits_end, tmp[ j++ ] );
+
+            if( f == xdigits_end )
+            {
+                is.setstate( std::ios_base::failbit );
+                return is;
             }
 
-            unsigned char byte = static_cast<unsigned char>(std::distance(&xdigits[0], f));
+            unsigned char byte = static_cast<unsigned char>( f - xdigits );
+
+            f = std::find( xdigits, xdigits_end, tmp[ j++ ] );
 
-            is >> c;
-            c = ctype.toupper(c);
-            f = std::find(xdigits, xdigits_end, c);
-            if (f == xdigits_end) {
-                is.setstate(std::ios_base::failbit);
-                break;
+            if( f == xdigits_end )
+            {
+                is.setstate( std::ios_base::failbit );
+                return is;
             }
 
             byte <<= 4;
-            byte |= static_cast<unsigned char>(std::distance(&xdigits[0], f));
+            byte |= static_cast<unsigned char>( f - xdigits );
 
-            data[i] = byte;
+            u.data()[ i ] = byte;
 
-            if (is) {
-                if (i == 3 || i == 5 || i == 7 || i == 9) {
-                    is >> c;
-                    if (c != is.widen('-')) is.setstate(std::ios_base::failbit);
+            if( i == 3 || i == 5 || i == 7 || i == 9 )
+            {
+                if( tmp[ j++ ] != xdigits[ 16 ] )
+                {
+                    is.setstate( std::ios_base::failbit );
+                    return is;
                 }
             }
         }
-
-        if (is) {
-            std::copy(data, data+16, u.begin());
-        }
-    }
-    return is;
-}
-
-namespace detail {
-inline char to_char(size_t i) {
-    if (i <= 9) {
-        return static_cast<char>('0' + i);
-    } else {
-        return static_cast<char>('a' + (i-10));
     }
-}
 
-inline wchar_t to_wchar(size_t i) {
-    if (i <= 9) {
-        return static_cast<wchar_t>(L'0' + i);
-    } else {
-        return static_cast<wchar_t>(L'a' + (i-10));
-    }
+    return is;
 }
 
-} // namespace detail
-
-template<class OutputIterator>
-OutputIterator to_chars(uuid const& u, OutputIterator out)
-{
-    std::size_t i=0;
-    for (uuid::const_iterator it_data = u.begin(); it_data!=u.end(); ++it_data, ++i) {
-        const size_t hi = ((*it_data) >> 4) & 0x0F;
-        *out++ = detail::to_char(hi);
-
-        const size_t lo = (*it_data) & 0x0F;
-        *out++ = detail::to_char(lo);
-
-        if (i == 3 || i == 5 || i == 7 || i == 9) {
-            *out++ = '-';
-        }
-    }
-    return out;
-}
+// to_string
 
-inline bool to_chars(uuid const& u, char* first, char* last)
+inline std::string to_string( uuid const& u )
 {
-    if (last - first < 36) {
-        return false;
-    }
-    to_chars(u, first);
-    return true;
-}
+    std::string result( 36, char() );
 
-inline std::string to_string(uuid const& u)
-{
-    std::string result(36, char());
     // string::data() returns const char* before C++17
-    to_chars(u, &result[0]);
+    detail::to_chars( u, &result[0] );
     return result;
 }
 
-#ifndef BOOST_NO_STD_WSTRING
-inline std::wstring to_wstring(uuid const& u)
+inline std::wstring to_wstring( uuid const& u )
 {
-    std::wstring result;
-    result.reserve(36);
-
-    std::size_t i=0;
-    for (uuid::const_iterator it_data = u.begin(); it_data!=u.end(); ++it_data, ++i) {
-        const size_t hi = ((*it_data) >> 4) & 0x0F;
-        result += detail::to_wchar(hi);
-
-        const size_t lo = (*it_data) & 0x0F;
-        result += detail::to_wchar(lo);
+    std::wstring result( 36, wchar_t() );
 
-        if (i == 3 || i == 5 || i == 7 || i == 9) {
-            result += L'-';
-        }
-    }
+    detail::to_chars( u, &result[0] );
     return result;
 }
 
-#endif
-
 }} //namespace boost::uuids
 
 #if defined(_MSC_VER)
 #pragma warning(pop) // Restore warnings to previous state.
 #endif
 
-#endif // BOOST_UUID_IO_HPP
+#endif // BOOST_UUID_UUID_IO_HPP_INCLUDED
diff --git a/inst/include/boost/uuid/uuid_serialize.hpp b/inst/include/boost/uuid/uuid_serialize.hpp
index e57b4ba0f..f58e976a8 100644
--- a/inst/include/boost/uuid/uuid_serialize.hpp
+++ b/inst/include/boost/uuid/uuid_serialize.hpp
@@ -1,31 +1,13 @@
-// Boost uuid_serialize.hpp header file  ----------------------------------------------//
+#ifndef BOOST_UUID_UUID_SERIALIZE_HPP_INCLUDED
+#define BOOST_UUID_UUID_SERIALIZE_HPP_INCLUDED
 
 // Copyright 2007 Andy Tompkins.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
 
-// Revision History
-//  12 Nov 2007 - Initial Revision
-//  25 Feb 2008 - moved to namespace boost::uuids::detail
-
-#ifndef BOOST_UUID_SERIALIZE_HPP
-#define BOOST_UUID_SERIALIZE_HPP
+// This header is no longer needed and is only retained
+// for backward compatibility.
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/type_traits/integral_constant.hpp>
-
-// BOOST_CLASS_IMPLEMENTATION(boost::uuids::uuid, boost::serialization::primitive_type)
-
-namespace boost
-{
-namespace serialization
-{
-
-template<class T> struct implementation_level_impl;
-template<> struct implementation_level_impl<const uuids::uuid>: boost::integral_constant<int, 1> {};
-
-} // namespace serialization
-} // namespace boost
 
-#endif // BOOST_UUID_SERIALIZE_HPP
+#endif // BOOST_UUID_UUID_SERIALIZE_HPP_INCLUDED
diff --git a/inst/include/boost/variant/detail/apply_visitor_binary.hpp b/inst/include/boost/variant/detail/apply_visitor_binary.hpp
index 32c128bf4..1b1016c68 100644
--- a/inst/include/boost/variant/detail/apply_visitor_binary.hpp
+++ b/inst/include/boost/variant/detail/apply_visitor_binary.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2002-2003 Eric Friedman
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/apply_visitor_unary.hpp b/inst/include/boost/variant/detail/apply_visitor_unary.hpp
index c34c0e9b3..dc73f90af 100644
--- a/inst/include/boost/variant/detail/apply_visitor_unary.hpp
+++ b/inst/include/boost/variant/detail/apply_visitor_unary.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2002-2003 Eric Friedman
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/config.hpp b/inst/include/boost/variant/detail/config.hpp
index da76fe2a6..236cc982f 100644
--- a/inst/include/boost/variant/detail/config.hpp
+++ b/inst/include/boost/variant/detail/config.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2003 Eric Friedman
-// Copyright (c) 2016-2023 Antony Polukhin
+// Copyright (c) 2016-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/element_index.hpp b/inst/include/boost/variant/detail/element_index.hpp
index 06cf06d77..8b529cb70 100644
--- a/inst/include/boost/variant/detail/element_index.hpp
+++ b/inst/include/boost/variant/detail/element_index.hpp
@@ -3,7 +3,7 @@
 // See http://www.boost.org for updates, documentation, and revision history.
 //-----------------------------------------------------------------------------
 //
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/forced_return.hpp b/inst/include/boost/variant/detail/forced_return.hpp
index 6d8911b10..75904f845 100644
--- a/inst/include/boost/variant/detail/forced_return.hpp
+++ b/inst/include/boost/variant/detail/forced_return.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2003 Eric Friedman
-// Copyright (c) 2015-2023 Antony Polukhin
+// Copyright (c) 2015-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/has_result_type.hpp b/inst/include/boost/variant/detail/has_result_type.hpp
index e1ca5b402..973b36d2f 100644
--- a/inst/include/boost/variant/detail/has_result_type.hpp
+++ b/inst/include/boost/variant/detail/has_result_type.hpp
@@ -3,7 +3,7 @@
 // See http://www.boost.org for updates, documentation, and revision history.
 //-----------------------------------------------------------------------------
 //
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/hash_variant.hpp b/inst/include/boost/variant/detail/hash_variant.hpp
index 4eb837721..469bc81b0 100644
--- a/inst/include/boost/variant/detail/hash_variant.hpp
+++ b/inst/include/boost/variant/detail/hash_variant.hpp
@@ -3,7 +3,7 @@
 // See http://www.boost.org for updates, documentation, and revision history.
 //-----------------------------------------------------------------------------
 //
-// Copyright (c) 2011-2023 Antony Polukhin
+// Copyright (c) 2011-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/initializer.hpp b/inst/include/boost/variant/detail/initializer.hpp
index 4a54c273c..331f375b7 100644
--- a/inst/include/boost/variant/detail/initializer.hpp
+++ b/inst/include/boost/variant/detail/initializer.hpp
@@ -22,7 +22,6 @@
 #include <boost/variant/recursive_wrapper_fwd.hpp>
 #include <boost/variant/detail/move.hpp>
 
-#if !defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
 #   include <boost/mpl/aux_/value_wknd.hpp>
 #   include <boost/mpl/int.hpp>
 #   include <boost/mpl/iter_fold.hpp>
@@ -30,12 +29,7 @@
 #   include <boost/mpl/deref.hpp>
 #   include <boost/mpl/pair.hpp>
 #   include <boost/mpl/protect.hpp>
-#else
-#   include <boost/variant/variant_fwd.hpp>
-#   include <boost/preprocessor/cat.hpp>
-#   include <boost/preprocessor/enum.hpp>
-#   include <boost/preprocessor/repeat.hpp>
-#endif
+
 
 namespace boost {
 namespace detail { namespace variant {
@@ -53,8 +47,6 @@ namespace detail { namespace variant {
 // size of the variant's psuedo-variadic template parameter list.
 //
 
-#if !defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
 // (detail) quoted metafunction make_initializer_node
 //
 // Exposes a pair whose first type is a node in the initializer hierarchy.
@@ -81,7 +73,6 @@ struct make_initializer_node
             typedef typename unwrap_recursive<recursive_enabled_T>::type
                 public_T;
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
             typedef boost::is_reference<public_T> 
                 is_reference_content_t;
 
@@ -92,10 +83,6 @@ struct make_initializer_node
 
             typedef typename boost::mpl::if_<is_reference_content_t, disable_overload<public_T>, public_T&& >::type 
                 param2_T;
-#else
-            typedef typename call_traits<public_T>::param_type
-                param_T;
-#endif
 
         public: // static functions
 
@@ -111,7 +98,6 @@ struct make_initializer_node
                 return BOOST_MPL_AUX_VALUE_WKND(index)::value; // which
             }
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
             static int initialize(void* dest, param2_T operand)
             {
                 // This assert must newer trigger, because all the reference contents are
@@ -122,7 +108,6 @@ struct make_initializer_node
                 new(dest) value_T( boost::detail::variant::move(operand) );
                 return BOOST_MPL_AUX_VALUE_WKND(index)::value; // which
             }
-#endif
         };
 
         friend class initializer_node;
@@ -150,61 +135,6 @@ class initializer_root
 
 };
 
-#else // defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
-    // Obsolete. Remove.
-    #define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_PARAMS \
-          BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) \
-    /**/
-
-    // Obsolete. Remove.
-    #define BOOST_VARIANT_AUX_PP_INITIALIZER_DEFINE_PARAM_T(N) \
-        typedef typename unwrap_recursive< \
-              BOOST_PP_CAT(recursive_enabled_T,N) \
-            >::type BOOST_PP_CAT(public_T,N); \
-        typedef typename call_traits< \
-              BOOST_PP_CAT(public_T,N) \
-            >::param_type BOOST_PP_CAT(param_T,N); \
-    /**/
-
-template < BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) >
-struct preprocessor_list_initializer
-{
-public: // static functions
-
-    #define BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION(z,N,_) \
-        typedef typename unwrap_recursive< \
-              BOOST_PP_CAT(recursive_enabled_T,N) \
-            >::type BOOST_PP_CAT(public_T,N); \
-        typedef typename call_traits< \
-              BOOST_PP_CAT(public_T,N) \
-            >::param_type BOOST_PP_CAT(param_T,N); \
-        static int initialize( \
-              void* dest \
-            , BOOST_PP_CAT(param_T,N) operand \
-            ) \
-        { \
-            typedef typename boost::detail::make_reference_content< \
-                  BOOST_PP_CAT(recursive_enabled_T,N) \
-                >::type internal_T; \
-            \
-            new(dest) internal_T(operand); \
-            return (N); /*which*/ \
-        } \
-        /**/
-
-    BOOST_PP_REPEAT(
-          BOOST_VARIANT_LIMIT_TYPES
-        , BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION
-        , _
-        )
-
-    #undef BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION
-
-};
-
-#endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
-
 }} // namespace detail::variant
 } // namespace boost
 
@@ -216,8 +146,6 @@ struct preprocessor_list_initializer
 // most appropriate to the current compiler.
 //
 
-#if !defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
 #define BOOST_VARIANT_AUX_INITIALIZER_T( mpl_seq, typename_base ) \
     ::boost::mpl::iter_fold< \
           mpl_seq \
@@ -231,19 +159,4 @@ struct preprocessor_list_initializer
         >::type::first \
     /**/
 
-#else // defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
-    // Obsolete. Remove.
-    #define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_ARGS(typename_base) \
-          BOOST_VARIANT_ENUM_PARAMS(typename_base) \
-        /**/
-
-#define BOOST_VARIANT_AUX_INITIALIZER_T( mpl_seq, typename_base ) \
-    ::boost::detail::variant::preprocessor_list_initializer< \
-          BOOST_VARIANT_ENUM_PARAMS(typename_base) \
-        > \
-    /**/
-
-#endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
-
 #endif // BOOST_VARIANT_DETAIL_INITIALIZER_HPP
diff --git a/inst/include/boost/variant/detail/make_variant_list.hpp b/inst/include/boost/variant/detail/make_variant_list.hpp
index d6ad8e99a..eafe1cb78 100644
--- a/inst/include/boost/variant/detail/make_variant_list.hpp
+++ b/inst/include/boost/variant/detail/make_variant_list.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2002-2003 Eric Friedman, Itay Maman
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/move.hpp b/inst/include/boost/variant/detail/move.hpp
index b8eafd64c..9788e1331 100644
--- a/inst/include/boost/variant/detail/move.hpp
+++ b/inst/include/boost/variant/detail/move.hpp
@@ -5,7 +5,7 @@
 //
 //  Copyright (c) 2002-2003 Eric Friedman
 //  Copyright (c) 2002 by Andrei Alexandrescu
-//  Copyright (c) 2013-2023 Antony Polukhin
+//  Copyright (c) 2013-2024 Antony Polukhin
 //
 //  Use, modification and distribution are subject to the
 //  Boost Software License, Version 1.0. (See accompanying file
diff --git a/inst/include/boost/variant/detail/std_hash.hpp b/inst/include/boost/variant/detail/std_hash.hpp
index 3e05c5c90..7335902e7 100644
--- a/inst/include/boost/variant/detail/std_hash.hpp
+++ b/inst/include/boost/variant/detail/std_hash.hpp
@@ -3,7 +3,7 @@
 // See http://www.boost.org for updates, documentation, and revision history.
 //-----------------------------------------------------------------------------
 //
-// Copyright (c) 2018-2023 Antony Polukhin
+// Copyright (c) 2018-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/detail/substitute.hpp b/inst/include/boost/variant/detail/substitute.hpp
index f8c05b8a2..213259d72 100644
--- a/inst/include/boost/variant/detail/substitute.hpp
+++ b/inst/include/boost/variant/detail/substitute.hpp
@@ -22,10 +22,7 @@
 #include <boost/mpl/aux_/preprocessor/repeat.hpp>
 #include <boost/mpl/int_fwd.hpp>
 #include <boost/mpl/limits/arity.hpp>
-#include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/iterate.hpp>
 
 namespace boost {
 namespace detail { namespace variant {
diff --git a/inst/include/boost/variant/detail/variant_io.hpp b/inst/include/boost/variant/detail/variant_io.hpp
index 63df74f24..9e560f4e5 100644
--- a/inst/include/boost/variant/detail/variant_io.hpp
+++ b/inst/include/boost/variant/detail/variant_io.hpp
@@ -16,8 +16,6 @@
 #include <iosfwd> // for std::basic_ostream forward declare
 
 #include <boost/variant/variant_fwd.hpp>
-
-#include <boost/detail/templated_streams.hpp>
 #include <boost/variant/static_visitor.hpp>
 
 namespace boost {
@@ -29,14 +27,9 @@ namespace boost {
 //
 
 // forward declare (allows output of embedded variant< variant< ... >, ... >)
-template <
-      BOOST_TEMPLATED_STREAM_ARGS(E,T)
-    BOOST_TEMPLATED_STREAM_COMMA
-      BOOST_VARIANT_ENUM_PARAMS(typename U)
-    >
-inline BOOST_TEMPLATED_STREAM(ostream, E,T)& operator<<(
-      BOOST_TEMPLATED_STREAM(ostream, E,T)& out
-    , const variant< BOOST_VARIANT_ENUM_PARAMS(U) >& rhs
+template <class CharT, class Trait, typename... U>
+inline std::basic_ostream<CharT, Trait>& operator<<(
+      std::basic_ostream<CharT, Trait>& out, const variant<U...>& rhs
     );
 
 namespace detail { namespace variant {
@@ -71,18 +64,13 @@ class printer
 
 }} // namespace detail::variant
 
-template <
-      BOOST_TEMPLATED_STREAM_ARGS(E,T)
-    BOOST_TEMPLATED_STREAM_COMMA
-      BOOST_VARIANT_ENUM_PARAMS(typename U)
-    >
-inline BOOST_TEMPLATED_STREAM(ostream, E,T)& operator<<(
-      BOOST_TEMPLATED_STREAM(ostream, E,T)& out
-    , const variant< BOOST_VARIANT_ENUM_PARAMS(U) >& rhs
+template <class CharT, class Trait, typename... U>
+inline std::basic_ostream<CharT, Trait>& operator<<(
+      std::basic_ostream<CharT, Trait>& out, const variant<U...>& rhs
     )
 {
     detail::variant::printer<
-          BOOST_TEMPLATED_STREAM(ostream, E,T)
+          std::basic_ostream<CharT, Trait>
         > visitor(out);
 
     rhs.apply_visitor(visitor);
diff --git a/inst/include/boost/variant/detail/visitation_impl.hpp b/inst/include/boost/variant/detail/visitation_impl.hpp
index 862d83980..13fa9214d 100644
--- a/inst/include/boost/variant/detail/visitation_impl.hpp
+++ b/inst/include/boost/variant/detail/visitation_impl.hpp
@@ -53,13 +53,6 @@
 
 #endif
 
-// Define a compiler generic null pointer value
-#if defined(BOOST_NO_CXX11_NULLPTR)
-#define BOOST_VARIANT_NULL 0
-#else
-#define BOOST_VARIANT_NULL nullptr
-#endif
-
 namespace boost {
 namespace detail { namespace variant {
 
@@ -179,7 +172,7 @@ inline typename Visitor::result_type
 visitation_impl(
       int, int, Visitor&, VPCV
     , mpl::true_ // is_apply_visitor_unrolled
-    , NBF, W* = BOOST_VARIANT_NULL, S* = BOOST_VARIANT_NULL
+    , NBF, W* = nullptr, S* = nullptr
     )
 {
     // should never be here at runtime!
@@ -198,7 +191,7 @@ visitation_impl(
     , Visitor& visitor, VoidPtrCV storage
     , mpl::false_ // is_apply_visitor_unrolled
     , NoBackupFlag no_backup_flag
-    , Which* = BOOST_VARIANT_NULL, step0* = BOOST_VARIANT_NULL
+    , Which* = nullptr, step0* = nullptr
     )
 {
     // Typedef apply_visitor_unrolled steps and associated types...
diff --git a/inst/include/boost/variant/get.hpp b/inst/include/boost/variant/get.hpp
index 0a81b67dc..652e57f9b 100644
--- a/inst/include/boost/variant/get.hpp
+++ b/inst/include/boost/variant/get.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2003 Eric Friedman, Itay Maman
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/recursive_variant.hpp b/inst/include/boost/variant/recursive_variant.hpp
index 96ae08746..d68e202da 100644
--- a/inst/include/boost/variant/recursive_variant.hpp
+++ b/inst/include/boost/variant/recursive_variant.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2003 Eric Friedman
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
diff --git a/inst/include/boost/variant/recursive_wrapper_fwd.hpp b/inst/include/boost/variant/recursive_wrapper_fwd.hpp
index b5d7e7195..b8b59ee60 100644
--- a/inst/include/boost/variant/recursive_wrapper_fwd.hpp
+++ b/inst/include/boost/variant/recursive_wrapper_fwd.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2002 Eric Friedman, Itay Maman
-// Copyright (c) 2016-2023 Antony Polukhin
+// Copyright (c) 2016-2024 Antony Polukhin
 //
 // Portions Copyright (C) 2002 David Abrahams
 //
diff --git a/inst/include/boost/variant/variant.hpp b/inst/include/boost/variant/variant.hpp
index 44657f0e5..f28a01204 100644
--- a/inst/include/boost/variant/variant.hpp
+++ b/inst/include/boost/variant/variant.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2002-2003 Eric Friedman, Itay Maman
-// Copyright (c) 2012-2023 Antony Polukhin
+// Copyright (c) 2012-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -40,8 +40,6 @@
 #include <boost/blank.hpp>
 #include <boost/integer/common_factor_ct.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/repeat.hpp>
 #include <boost/type_traits/aligned_storage.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 #include <boost/type_traits/add_const.hpp>
@@ -1096,8 +1094,6 @@ class variant
     {
     };
 
-#if !defined(BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT)
-
 private: // helpers, for typedefs (below)
 
     typedef typename mpl::eval_if<
@@ -1141,82 +1137,6 @@ class variant
           internal_types
         >::type internal_T0;
 
-#else // defined(BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT)
-
-private: // helpers, for typedefs (below)
-
-    typedef unwrapped_T0_ T0;
-
-    #define BOOST_VARIANT_AUX_ENABLE_RECURSIVE_TYPEDEFS(z,N,_) \
-        typedef typename mpl::eval_if< \
-              is_recursive_ \
-            , detail::variant::enable_recursive< \
-                  BOOST_PP_CAT(T,N) \
-                , wknd_self_t \
-                > \
-            , mpl::identity< BOOST_PP_CAT(T,N) > \
-            >::type BOOST_PP_CAT(recursive_enabled_T,N); \
-        /**/
-
-    BOOST_PP_REPEAT(
-          BOOST_VARIANT_LIMIT_TYPES
-        , BOOST_VARIANT_AUX_ENABLE_RECURSIVE_TYPEDEFS
-        , _
-        )
-
-    #undef BOOST_VARIANT_AUX_ENABLE_RECURSIVE_TYPEDEFS
-
-    #define BOOST_VARIANT_AUX_UNWRAP_RECURSIVE_TYPEDEFS(z,N,_) \
-        typedef typename unwrap_recursive< \
-              BOOST_PP_CAT(recursive_enabled_T,N) \
-            >::type BOOST_PP_CAT(public_T,N); \
-        /**/
-
-    BOOST_PP_REPEAT(
-          BOOST_VARIANT_LIMIT_TYPES
-        , BOOST_VARIANT_AUX_UNWRAP_RECURSIVE_TYPEDEFS
-        , _
-        )
-
-    #undef BOOST_VARIANT_AUX_UNWRAP_RECURSIVE_TYPEDEFS
-
-public: // public typedefs
-
-    typedef typename detail::variant::make_variant_list<
-          BOOST_VARIANT_ENUM_PARAMS(public_T)
-        >::type types;
-
-private: // helpers, for internal typedefs (below)
-
-    #define BOOST_VARIANT_AUX_MAKE_REFERENCE_CONTENT_TYPEDEFS(z,N,_) \
-        typedef detail::make_reference_content< \
-              BOOST_PP_CAT(recursive_enabled_T,N) \
-            >::type BOOST_PP_CAT(internal_T,N); \
-        /**/
-
-    BOOST_PP_REPEAT(
-          BOOST_VARIANT_LIMIT_TYPES
-        , BOOST_VARIANT_AUX_MAKE_REFERENCE_CONTENT_TYPEDEFS
-        , _
-        )
-
-    #undef BOOST_VARIANT_AUX_MAKE_REFERENCE_CONTENT_TYPEDEFS
-
-private: // internal typedefs
-
-    typedef typename detail::variant::make_variant_list<
-          BOOST_VARIANT_ENUM_PARAMS(internal_T)
-        >::type internal_types;
-
-private: // static precondition assertions
-
-    // NOTE TO USER :
-    // variant< type-sequence > syntax is not supported on this compiler!
-    //
-    BOOST_MPL_ASSERT_NOT(( is_sequence_based_ ));
-
-#endif // BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT workaround
-
 private: // helpers, for representation (below)
 
     typedef typename detail::variant::find_fallback_type<
diff --git a/inst/include/boost/variant/variant_fwd.hpp b/inst/include/boost/variant/variant_fwd.hpp
index 1484f204d..c5f800243 100644
--- a/inst/include/boost/variant/variant_fwd.hpp
+++ b/inst/include/boost/variant/variant_fwd.hpp
@@ -4,7 +4,7 @@
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 2003 Eric Friedman, Itay Maman
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -25,15 +25,6 @@
 #include <boost/preprocessor/enum_shifted_params.hpp>
 #include <boost/preprocessor/repeat.hpp>
 
-///////////////////////////////////////////////////////////////////////////////
-// macro BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT
-//
-// Defined if variant does not support make_variant_over (see below). 
-//
-#if defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-#   define BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // macro BOOST_VARIANT_NO_FULL_RECURSIVE_VARIANT_SUPPORT
 //
@@ -118,40 +109,6 @@ struct convert_void< void_ >
     typedef mpl::na type;
 };
 
-///////////////////////////////////////////////////////////////////////////////
-// (workaround) BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-//
-// Needed to work around compilers that don't support using-declaration
-// overloads. (See the variant::initializer workarounds below.)
-//
-
-#if defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-// (detail) tags voidNN -- NN defined on [0, BOOST_VARIANT_LIMIT_TYPES)
-//
-// Defines void types that are each unique and specializations of
-// convert_void that yields mpl::na for each voidNN type.
-//
-
-#define BOOST_VARIANT_DETAIL_DEFINE_VOID_N(z,N,_)          \
-    struct BOOST_PP_CAT(void,N);                           \
-                                                           \
-    template <>                                            \
-    struct convert_void< BOOST_PP_CAT(void,N) >            \
-    {                                                      \
-        typedef mpl::na type;                              \
-    };                                                     \
-    /**/
-
-BOOST_PP_REPEAT(
-      BOOST_VARIANT_LIMIT_TYPES
-    , BOOST_VARIANT_DETAIL_DEFINE_VOID_N
-    , _
-    )
-
-#undef BOOST_VARIANT_DETAIL_DEFINE_VOID_N
-
-#endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
-
 }} // namespace detail::variant
 
 #define BOOST_VARIANT_AUX_DECLARE_PARAMS BOOST_VARIANT_ENUM_PARAMS(typename T)
diff --git a/inst/include/boost/variant2/variant.hpp b/inst/include/boost/variant2/variant.hpp
index aec896624..233b94f3f 100644
--- a/inst/include/boost/variant2/variant.hpp
+++ b/inst/include/boost/variant2/variant.hpp
@@ -83,7 +83,7 @@ struct monostate
 {
 };
 
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1940)
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1950)
 
 constexpr bool operator<(monostate, monostate) noexcept { return false; }
 constexpr bool operator>(monostate, monostate) noexcept { return false; }
@@ -688,10 +688,10 @@ template<class T1, class... T> union variant_storage_impl<mp11::mp_true, T1, T..
 #if defined(BOOST_GCC) && (__GNUC__ >= 7)
 # pragma GCC diagnostic push
 // False positive in at least GCC 7 and GCC 10 ASAN triggered by monostate (via result<void>)
-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #if __GNUC__ >= 12
 // False positive in at least GCC 12 and GCC 13 ASAN and -Og triggered by monostate (via result<void>)
-# pragma GCC diagnostic ignored "-Wuninitialized"
+//# pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
 #endif
         *this = variant_storage_impl( mp11::mp_size_t<I>(), std::forward<A>(a)... );
@@ -1634,7 +1634,17 @@ template<class... T> class variant: private detail::variant_ma_base<T...>
     template<class U,
         class Ud = typename std::decay<U>::type,
         class E1 = typename std::enable_if< !std::is_same<Ud, variant>::value && !std::is_base_of<variant, Ud>::value && !detail::is_in_place_index<Ud>::value && !detail::is_in_place_type<Ud>::value >::type,
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1950)
+
+        class V = mp11::mp_apply_q< mp11::mp_bind_front<detail::resolve_overload_type, U&&>, variant >,
+
+#else
+
         class V = detail::resolve_overload_type<U&&, T...>,
+
+#endif
+
         class E2 = typename std::enable_if<std::is_constructible<V, U&&>::value>::type
         >
     constexpr variant( U&& u )
diff --git a/inst/include/boost/version.hpp b/inst/include/boost/version.hpp
index 6cd7e9aa3..a74f18742 100644
--- a/inst/include/boost/version.hpp
+++ b/inst/include/boost/version.hpp
@@ -19,7 +19,7 @@
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 108400
+#define BOOST_VERSION 108700
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,6 +27,6 @@
 //  number, y is the minor version number, and z is the patch level if not 0.
 //  This is used by <config/auto_link.hpp> to select which library version to link to.
 
-#define BOOST_LIB_VERSION "1_84"
+#define BOOST_LIB_VERSION "1_87"
 
 #endif
diff --git a/inst/include/boost/winapi/get_proc_address.hpp b/inst/include/boost/winapi/get_proc_address.hpp
index 2240930cd..f6aba5ea7 100644
--- a/inst/include/boost/winapi/get_proc_address.hpp
+++ b/inst/include/boost/winapi/get_proc_address.hpp
@@ -72,6 +72,19 @@ BOOST_FORCEINLINE FARPROC_ get_proc_address(HMODULE_ hModule, LPCSTR_ lpProcName
 #endif
 }
 
+template< typename FuncPtr >
+BOOST_FORCEINLINE FuncPtr get_proc_address(HMODULE_ hModule, LPCSTR_ lpProcName)
+{
+#if defined(BOOST_GCC) && BOOST_GCC >= 80000
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+    return reinterpret_cast< FuncPtr >(boost::winapi::get_proc_address(hModule, lpProcName));
+#if defined(BOOST_GCC) && BOOST_GCC >= 80000
+#pragma GCC diagnostic pop
+#endif
+}
+
 } // namespace winapi
 } // namespace boost
 
diff --git a/inst/include/boost/xpressive/detail/utility/counted_base.hpp b/inst/include/boost/xpressive/detail/utility/counted_base.hpp
index 406c69db1..8f6317bd4 100644
--- a/inst/include/boost/xpressive/detail/utility/counted_base.hpp
+++ b/inst/include/boost/xpressive/detail/utility/counted_base.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
-#include <boost/detail/atomic_count.hpp>
+#include <boost/smart_ptr/detail/atomic_count.hpp>
 
 namespace boost { namespace xpressive { namespace detail
 {
diff --git a/inst/include/boost/xpressive/detail/utility/tracking_ptr.hpp b/inst/include/boost/xpressive/detail/utility/tracking_ptr.hpp
index 4cb32a047..fc12fafd6 100644
--- a/inst/include/boost/xpressive/detail/utility/tracking_ptr.hpp
+++ b/inst/include/boost/xpressive/detail/utility/tracking_ptr.hpp
@@ -24,8 +24,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/detail/atomic_count.hpp>
+#include <boost/config/workaround.hpp>
+#include <boost/smart_ptr/detail/atomic_count.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
diff --git a/inst/include/boost/xpressive/xpressive_static.hpp b/inst/include/boost/xpressive/xpressive_static.hpp
index eef6b0494..fd6757c32 100644
--- a/inst/include/boost/xpressive/xpressive_static.hpp
+++ b/inst/include/boost/xpressive/xpressive_static.hpp
@@ -15,7 +15,7 @@
 # pragma once
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 // inline aggressively
 # pragma inline_recursion(on) // turn on inline recursion
 # pragma inline_depth(255)    // max inline depth
diff --git a/local/files/DESCRIPTION b/local/files/DESCRIPTION
index ae8d1bc8f..177cbd795 100644
--- a/local/files/DESCRIPTION
+++ b/local/files/DESCRIPTION
@@ -3,8 +3,11 @@ Type: Package
 Title: Boost C++ header files
 Version: XXX
 Date: YYY
-Author: Dirk Eddelbuettel, John W. Emerson and Michael J. Kane
-Maintainer: Dirk Eddelbuettel <edd@debian.org>
+Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org",
+                    comment = c(ORCID = "0000-0001-6419-907X")),
+             person("John W.", "Emerson", role = "aut"),
+             person("Michael J.", "Kane", role = "aut",
+                    comment = c(ORCID = "0000-0003-1899-6662")))
 Description: Boost provides free peer-reviewed portable C++ source 
   libraries.  A large part of Boost is provided as C++ template code
   which is resolved entirely at compile-time without linking.  This 
diff --git a/local/patches/bh_1.87.0-0.patch b/local/patches/bh_1.87.0-0.patch
new file mode 100644
index 000000000..841653dd3
--- /dev/null
+++ b/local/patches/bh_1.87.0-0.patch
@@ -0,0 +1,1886 @@
+diff --git a/inst/include/boost/asio/detail/push_options.hpp b/inst/include/boost/asio/detail/push_options.hpp
+index 31229364..8ea8c589 100644
+--- a/inst/include/boost/asio/detail/push_options.hpp
++++ b/inst/include/boost/asio/detail/push_options.hpp
+@@ -61,9 +61,9 @@
+ # endif // !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32)
+ 
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++//# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ # if (__clang_major__ >= 6)
+-#  pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
++//#  pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+ # endif // (__clang_major__ >= 6)
+ 
+ # pragma push_macro ("emit")
+@@ -102,12 +102,12 @@
+ # endif // (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
+ 
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++//# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (__GNUC__ > 4)
+-#  pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
++//#  pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+ # endif // (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (__GNUC__ > 4)
+ # if (__GNUC__ >= 7)
+-#  pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
++//#  pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+ # endif // (__GNUC__ >= 7)
+ 
+ # pragma push_macro ("emit")
+diff --git a/inst/include/boost/atomic/detail/bitwise_cast.hpp b/inst/include/boost/atomic/detail/bitwise_cast.hpp
+index 3318eb44..176077a5 100644
+--- a/inst/include/boost/atomic/detail/bitwise_cast.hpp
++++ b/inst/include/boost/atomic/detail/bitwise_cast.hpp
+@@ -56,7 +56,7 @@
+ #if defined(BOOST_GCC) && BOOST_GCC >= 80000
+ #pragma GCC diagnostic push
+ // copying an object of non-trivial type X from an array of Y. This is benign because we use memcpy to copy trivially copyable objects.
+-#pragma GCC diagnostic ignored "-Wclass-memaccess"
++//#pragma GCC diagnostic ignored "-Wclass-memaccess"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/atomic/detail/extra_fp_ops_generic.hpp b/inst/include/boost/atomic/detail/extra_fp_ops_generic.hpp
+index aefd7d32..029c1594 100644
+--- a/inst/include/boost/atomic/detail/extra_fp_ops_generic.hpp
++++ b/inst/include/boost/atomic/detail/extra_fp_ops_generic.hpp
+@@ -31,7 +31,7 @@
+ #if defined(BOOST_GCC) && BOOST_GCC >= 60000
+ #pragma GCC diagnostic push
+ // ignoring attributes on template argument X - this warning is because we need to pass storage_type as a template argument; no problem in this case
+-#pragma GCC diagnostic ignored "-Wignored-attributes"
++//#pragma GCC diagnostic ignored "-Wignored-attributes"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/atomic/detail/header.hpp b/inst/include/boost/atomic/detail/header.hpp
+index 0251c616..5dbe0572 100644
+--- a/inst/include/boost/atomic/detail/header.hpp
++++ b/inst/include/boost/atomic/detail/header.hpp
+@@ -55,17 +55,17 @@
+ 
+ #pragma GCC diagnostic push
+ // unused parameter 'arg'
+-#pragma GCC diagnostic ignored "-Wunused-parameter"
++//#pragma GCC diagnostic ignored "-Wunused-parameter"
+ // missing initializer for member var
+-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ 
+ #elif defined(BOOST_CLANG)
+ 
+ #pragma clang diagnostic push
+ // unused parameter 'arg'
+-#pragma clang diagnostic ignored "-Wunused-parameter"
++//#pragma clang diagnostic ignored "-Wunused-parameter"
+ // missing initializer for member var
+-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
++//#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+ 
+ #endif
+ 
+diff --git a/inst/include/boost/beast/_experimental/unit_test/suite.hpp b/inst/include/boost/beast/_experimental/unit_test/suite.hpp
+index b82eb539..7e5b55fd 100644
+--- a/inst/include/boost/beast/_experimental/unit_test/suite.hpp
++++ b/inst/include/boost/beast/_experimental/unit_test/suite.hpp
+@@ -18,7 +18,7 @@
+ 
+ #if defined(BOOST_GCC) && BOOST_GCC >= 70000 && BOOST_GCC < 80000
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnoexcept-type"
++//#pragma GCC diagnostic ignored "-Wnoexcept-type"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/bind.hpp b/inst/include/boost/bind.hpp
+index 48cc4094..0f00ad35 100644
+--- a/inst/include/boost/bind.hpp
++++ b/inst/include/boost/bind.hpp
+@@ -45,7 +45,7 @@ BOOST_PRAGMA_MESSAGE(
+ #if defined(BOOST_CLANG)
+ # pragma clang diagnostic push
+ # if  __has_warning("-Wheader-hygiene")
+-#  pragma clang diagnostic ignored "-Wheader-hygiene"
++//#  pragma clang diagnostic ignored "-Wheader-hygiene"
+ # endif
+ #endif
+ 
+diff --git a/inst/include/boost/concept/detail/general.hpp b/inst/include/boost/concept/detail/general.hpp
+index 8d7d6f69..53d3b49c 100644
+--- a/inst/include/boost/concept/detail/general.hpp
++++ b/inst/include/boost/concept/detail/general.hpp
+@@ -30,7 +30,7 @@ struct requirement
+ {
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+ #   pragma GCC diagnostic push
+-#   pragma GCC diagnostic ignored "-Wnonnull"
++  //#   pragma GCC diagnostic ignored "-Wnonnull"
+ #   endif
+     static void failed() { ((Model*)0)->~Model(); }
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+@@ -45,7 +45,7 @@ struct requirement<failed ************ Model::************>
+ {
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+ #   pragma GCC diagnostic push
+-#   pragma GCC diagnostic ignored "-Wnonnull"
++  //#   pragma GCC diagnostic ignored "-Wnonnull"
+ #   endif
+     static void failed() { ((Model*)0)->~Model(); }
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+@@ -60,7 +60,7 @@ struct constraint
+ {
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+ #   pragma GCC diagnostic push
+-#   pragma GCC diagnostic ignored "-Wnonnull"
++  //#   pragma GCC diagnostic ignored "-Wnonnull"
+ #   endif
+     static void failed() { ((Model*)0)->constraints(); }
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+diff --git a/inst/include/boost/concept/usage.hpp b/inst/include/boost/concept/usage.hpp
+index fe88b5f5..56f934dc 100644
+--- a/inst/include/boost/concept/usage.hpp
++++ b/inst/include/boost/concept/usage.hpp
+@@ -15,7 +15,7 @@ struct usage_requirements
+ {
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+ #   pragma GCC diagnostic push
+-#   pragma GCC diagnostic ignored "-Wnonnull"
++  //#   pragma GCC diagnostic ignored "-Wnonnull"
+ #   endif
+     ~usage_requirements() { ((Model*)0)->~Model(); }
+ #   if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+diff --git a/inst/include/boost/container/allocator_traits.hpp b/inst/include/boost/container/allocator_traits.hpp
+index dd5bf0e4..4f554fba 100644
+--- a/inst/include/boost/container/allocator_traits.hpp
++++ b/inst/include/boost/container/allocator_traits.hpp
+@@ -51,8 +51,8 @@
+ 
+ #if defined(BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-result"
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wunused-result"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ #define BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME allocate
+diff --git a/inst/include/boost/container/detail/config_begin.hpp b/inst/include/boost/container/detail/config_begin.hpp
+index d459a066..55661109 100644
+--- a/inst/include/boost/container/detail/config_begin.hpp
++++ b/inst/include/boost/container/detail/config_begin.hpp
+@@ -57,6 +57,6 @@
+ //Sign conversion warnings broken before GCC 9.3
+ //(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87519)
+ #if BOOST_GCC < 90300
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ #endif
+diff --git a/inst/include/boost/container/detail/copy_move_algo.hpp b/inst/include/boost/container/detail/copy_move_algo.hpp
+index 7c7d216f..e2b6f7bd 100644
+--- a/inst/include/boost/container/detail/copy_move_algo.hpp
++++ b/inst/include/boost/container/detail/copy_move_algo.hpp
+@@ -42,19 +42,19 @@
+ #pragma GCC diagnostic push
+ //pair memcpy optimizations rightfully detected by GCC
+ #  if defined(BOOST_GCC) && (BOOST_GCC >= 80000)
+-#     pragma GCC diagnostic ignored "-Wclass-memaccess"
++//#     pragma GCC diagnostic ignored "-Wclass-memaccess"
+ #  endif
+ //GCC 8 seems a bit confused about array access error with static_vector
+ //when out of bound exceptions are being thrown.
+ #  if defined(BOOST_GCC) && ((BOOST_GCC >= 80000) && (BOOST_GCC < 80200))
+-#     pragma GCC diagnostic ignored "-Wstringop-overflow"
++//#     pragma GCC diagnostic ignored "-Wstringop-overflow"
+ #  endif
+ //GCC 12 seems a bit confused about array access error with small_vector
+ #  if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
+-#     pragma GCC diagnostic ignored "-Wstringop-overread"
+-#     pragma GCC diagnostic ignored "-Wstringop-overflow"
++//#     pragma GCC diagnostic ignored "-Wstringop-overread"
++//#     pragma GCC diagnostic ignored "-Wstringop-overflow"
+ #  endif
+-#  pragma GCC diagnostic ignored "-Warray-bounds"
++//#  pragma GCC diagnostic ignored "-Warray-bounds"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/container/detail/flat_tree.hpp b/inst/include/boost/container/detail/flat_tree.hpp
+index a753a456..b17e4f7d 100644
+--- a/inst/include/boost/container/detail/flat_tree.hpp
++++ b/inst/include/boost/container/detail/flat_tree.hpp
+@@ -59,7 +59,7 @@
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-result"
++//#pragma GCC diagnostic ignored "-Wunused-result"
+ #endif
+ 
+ //merge_unique
+diff --git a/inst/include/boost/container/detail/is_container.hpp b/inst/include/boost/container/detail/is_container.hpp
+index fe44b465..ccf9119d 100644
+--- a/inst/include/boost/container/detail/is_container.hpp
++++ b/inst/include/boost/container/detail/is_container.hpp
+@@ -20,7 +20,7 @@
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-result"
++//#pragma GCC diagnostic ignored "-Wunused-result"
+ #endif
+ 
+ //empty
+diff --git a/inst/include/boost/container/detail/is_contiguous_container.hpp b/inst/include/boost/container/detail/is_contiguous_container.hpp
+index e0cf6bab..97245f1c 100644
+--- a/inst/include/boost/container/detail/is_contiguous_container.hpp
++++ b/inst/include/boost/container/detail/is_contiguous_container.hpp
+@@ -20,7 +20,7 @@
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-result"
++//#pragma GCC diagnostic ignored "-Wunused-result"
+ #endif
+ 
+ //data
+diff --git a/inst/include/boost/container/detail/node_alloc_holder.hpp b/inst/include/boost/container/detail/node_alloc_holder.hpp
+index 32023e39..31e3f9b4 100644
+--- a/inst/include/boost/container/detail/node_alloc_holder.hpp
++++ b/inst/include/boost/container/detail/node_alloc_holder.hpp
+@@ -82,7 +82,7 @@ struct base_node
+ 
+    #if defined(BOOST_GCC) && (BOOST_GCC >= 40600) && (BOOST_GCC < 80000)
+       #pragma GCC diagnostic push
+-      #pragma GCC diagnostic ignored "-Wstrict-aliasing"
++  //      #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+       #define BOOST_CONTAINER_DISABLE_ALIASING_WARNING
+    #  endif
+    public:
+diff --git a/inst/include/boost/container/node_handle.hpp b/inst/include/boost/container/node_handle.hpp
+index 5179022d..3ec8f7ee 100644
+--- a/inst/include/boost/container/node_handle.hpp
++++ b/inst/include/boost/container/node_handle.hpp
+@@ -36,7 +36,7 @@
+ //GCC 12 is confused about maybe uninitialized allocators
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 120000) && (BOOST_GCC < 130000)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+ 
+ 
+diff --git a/inst/include/boost/container/small_vector.hpp b/inst/include/boost/container/small_vector.hpp
+index afed9108..3d95ad6c 100644
+--- a/inst/include/boost/container/small_vector.hpp
++++ b/inst/include/boost/container/small_vector.hpp
+@@ -482,8 +482,8 @@ inline std::size_t get_small_vector_storage_offset()
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wcast-align"
+-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
++//#pragma GCC diagnostic ignored "-Wcast-align"
++//#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+ #endif
+ 
+ //Internal storage hack
+diff --git a/inst/include/boost/container/stable_vector.hpp b/inst/include/boost/container/stable_vector.hpp
+index f8952c83..af9abfa5 100644
+--- a/inst/include/boost/container/stable_vector.hpp
++++ b/inst/include/boost/container/stable_vector.hpp
+@@ -161,7 +161,7 @@ struct node
+ 
+    #if defined(BOOST_GCC) && (BOOST_GCC >= 40600) && (BOOST_GCC < 80000)
+       #pragma GCC diagnostic push
+-      #pragma GCC diagnostic ignored "-Wstrict-aliasing"
++  //      #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+       #define BOOST_CONTAINER_DISABLE_ALIASING_WARNING
+    #  endif
+ 
+diff --git a/inst/include/boost/container/string.hpp b/inst/include/boost/container/string.hpp
+index 4a69e192..59a6bac2 100644
+--- a/inst/include/boost/container/string.hpp
++++ b/inst/include/boost/container/string.hpp
+@@ -65,7 +65,7 @@
+ //GCC 12 has a regression for array-bounds warnings
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 120000) && (BOOST_GCC < 130000)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Warray-bounds"
++//#pragma GCC diagnostic ignored "-Warray-bounds"
+ #endif
+ 
+ 
+@@ -136,7 +136,7 @@ class basic_string_base
+ 
+    #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+    #pragma GCC diagnostic push
+-   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++  //   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+    #endif
+ 
+    //This is the structure controlling a long string
+@@ -404,7 +404,7 @@ class basic_string_base
+    //GCC seems a bit confused about uninitialized accesses
+    #if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
+    #pragma GCC diagnostic push
+-   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++  //   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+    #endif
+ 
+    inline pointer priv_long_addr() const
+diff --git a/inst/include/boost/core/allocator_access.hpp b/inst/include/boost/core/allocator_access.hpp
+index 0f0ed325..88084a81 100644
+--- a/inst/include/boost/core/allocator_access.hpp
++++ b/inst/include/boost/core/allocator_access.hpp
+@@ -46,14 +46,14 @@ _STL_DISABLE_DEPRECATED_WARNING
+ #if defined(__clang__) && defined(__has_warning)
+ # if __has_warning("-Wdeprecated-declarations")
+ #  pragma clang diagnostic push
+-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
++//#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ # endif
+ #elif defined(_MSC_VER)
+ # pragma warning(push)
+ # pragma warning(disable: 4996)
+ #elif defined(BOOST_GCC) && BOOST_GCC >= 40600
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/core/detail/lwt_unattended.hpp b/inst/include/boost/core/detail/lwt_unattended.hpp
+index 96fc5fc5..0d98f2e6 100644
+--- a/inst/include/boost/core/detail/lwt_unattended.hpp
++++ b/inst/include/boost/core/detail/lwt_unattended.hpp
+@@ -32,7 +32,7 @@ inline void lwt_unattended()
+ 
+ # if defined(__clang__)
+ #  pragma clang diagnostic push
+-#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
++//#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ # endif
+ 
+ #if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == 100 /*WINAPI_FAMILY_DESKTOP_APP*/
+diff --git a/inst/include/boost/core/detail/string_view.hpp b/inst/include/boost/core/detail/string_view.hpp
+index 5cce6f6c..83a3d45a 100644
+--- a/inst/include/boost/core/detail/string_view.hpp
++++ b/inst/include/boost/core/detail/string_view.hpp
+@@ -61,7 +61,7 @@ template<> struct sv_to_uchar<char>
+ 
+ #if defined(__GNUC__) && __GNUC__ * 100 + __GNUC_MINOR__ >= 406
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wtype-limits"
++  //# pragma GCC diagnostic ignored "-Wtype-limits"
+ #endif
+ 
+ template<class Ch> BOOST_CXX14_CONSTEXPR std::size_t find_first_of( Ch const* p_, std::size_t n_, Ch const* s, std::size_t pos, std::size_t n ) BOOST_NOEXCEPT
+diff --git a/inst/include/boost/core/lightweight_test.hpp b/inst/include/boost/core/lightweight_test.hpp
+index 43baea05..aa32efbf 100644
+--- a/inst/include/boost/core/lightweight_test.hpp
++++ b/inst/include/boost/core/lightweight_test.hpp
+@@ -145,15 +145,15 @@ inline void no_throw_failed_impl(const char* expr, const char* what, const char*
+ #if defined(__clang__) && defined(__has_warning)
+ # if __has_warning("-Wsign-compare")
+ #  pragma clang diagnostic push
+-#  pragma clang diagnostic ignored "-Wsign-compare"
++//#  pragma clang diagnostic ignored "-Wsign-compare"
+ # endif
+ #elif defined(_MSC_VER)
+ # pragma warning(push)
+ # pragma warning(disable: 4389)
+ #elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wsign-compare"
+-# pragma GCC diagnostic ignored "-Wsign-conversion"
++//# pragma GCC diagnostic ignored "-Wsign-compare"
++//# pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ // specialize test output for char pointers to avoid printing as cstring
+diff --git a/inst/include/boost/date_time/c_time.hpp b/inst/include/boost/date_time/c_time.hpp
+index 24286f8a..d64bfcf4 100644
+--- a/inst/include/boost/date_time/c_time.hpp
++++ b/inst/include/boost/date_time/c_time.hpp
+@@ -92,7 +92,7 @@ namespace date_time {
+ 
+ #if defined(__clang__) // Clang has to be checked before MSVC
+ #pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++    //#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ #elif (defined(_MSC_VER) && (_MSC_VER >= 1400))
+ #pragma warning(push) // preserve warning settings
+ #pragma warning(disable : 4996) // disable depricated localtime/gmtime warning on vc8
+diff --git a/inst/include/boost/filesystem/detail/header.hpp b/inst/include/boost/filesystem/detail/header.hpp
+index f98b0aba..f5ceed76 100644
+--- a/inst/include/boost/filesystem/detail/header.hpp
++++ b/inst/include/boost/filesystem/detail/header.hpp
+@@ -40,13 +40,13 @@
+ 
+ #pragma GCC diagnostic push
+ // unused parameter 'arg'
+-#pragma GCC diagnostic ignored "-Wunused-parameter"
++//#pragma GCC diagnostic ignored "-Wunused-parameter"
+ // unused function 'foo'
+-#pragma GCC diagnostic ignored "-Wunused-function"
++//#pragma GCC diagnostic ignored "-Wunused-function"
+ 
+ #if defined(__clang__)
+ // template argument uses unnamed type
+-#pragma clang diagnostic ignored "-Wunnamed-type-template-args"
++//#pragma clang diagnostic ignored "-Wunnamed-type-template-args"
+ #endif // defined(__clang__)
+ 
+ #endif
+diff --git a/inst/include/boost/function/function_base.hpp b/inst/include/boost/function/function_base.hpp
+index ca15b7b7..73186251 100644
+--- a/inst/include/boost/function/function_base.hpp
++++ b/inst/include/boost/function/function_base.hpp
+@@ -581,7 +581,7 @@ public: // should be protected, but GCC 2.95.3 will fail to allow access
+ 
+ #if defined(BOOST_CLANG)
+ #   pragma clang diagnostic push
+-#   pragma clang diagnostic ignored "-Wweak-vtables"
++  //#   pragma clang diagnostic ignored "-Wweak-vtables"
+ #endif
+ /**
+  * The bad_function_call exception class is thrown when a boost::function
+diff --git a/inst/include/boost/function/function_template.hpp b/inst/include/boost/function/function_template.hpp
+index ac4a5b24..777feca0 100644
+--- a/inst/include/boost/function/function_template.hpp
++++ b/inst/include/boost/function/function_template.hpp
+@@ -436,7 +436,7 @@ namespace boost {
+ #if defined(BOOST_GCC) && (__GNUC__ >= 11)
+ # pragma GCC diagnostic push
+ // False positive in GCC 11/12 for empty function objects
+-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+           if (base.manager)
+             base.manager(functor, functor, destroy_functor_tag);
+@@ -899,10 +899,10 @@ namespace boost {
+ #           pragma GCC diagnostic push
+             // This warning is technically correct, but we don't want to pay the price for initializing
+             // just to silence a warning: https://github.com/boostorg/function/issues/27
+-#           pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//#           pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #           if (BOOST_GCC >= 110000)
+               // GCC 11.3, 12 emit a different warning: https://github.com/boostorg/function/issues/42
+-#             pragma GCC diagnostic ignored "-Wuninitialized"
++//#             pragma GCC diagnostic ignored "-Wuninitialized"
+ #           endif
+ #         endif
+           std::memcpy(this->functor.data, f.functor.data, sizeof(boost::detail::function::function_buffer));
+@@ -999,10 +999,10 @@ namespace boost {
+ #             pragma GCC diagnostic push
+               // This warning is technically correct, but we don't want to pay the price for initializing
+               // just to silence a warning: https://github.com/boostorg/function/issues/27
+-#             pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++            //#             pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #             if (BOOST_GCC >= 120000)
+                 // GCC 12 emits a different warning: https://github.com/boostorg/function/issues/42
+-#               pragma GCC diagnostic ignored "-Wuninitialized"
++            //#               pragma GCC diagnostic ignored "-Wuninitialized"
+ #             endif
+ #           endif
+             std::memcpy(this->functor.data, f.functor.data, sizeof(this->functor.data));
+@@ -1013,7 +1013,7 @@ namespace boost {
+ #if defined(BOOST_GCC) && (__GNUC__ >= 11)
+ # pragma GCC diagnostic push
+ // False positive in GCC 11/12 for empty function objects (function_n_test.cpp:673)
+-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+             get_vtable()->base.manager(f.functor, this->functor,
+                                      boost::detail::function::move_functor_tag);
+diff --git a/inst/include/boost/get_pointer.hpp b/inst/include/boost/get_pointer.hpp
+index 36e2cd7d..b8d82f07 100644
+--- a/inst/include/boost/get_pointer.hpp
++++ b/inst/include/boost/get_pointer.hpp
+@@ -41,7 +41,7 @@ template<class T> T * get_pointer(T * p)
+ #if defined( BOOST_CORE_DETAIL_DISABLE_LIBSTDCXX_DEPRECATED_WARNINGS )
+ // Disable libstdc++ warnings about std::auto_ptr being deprecated in C++11 mode
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++  //#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #define BOOST_CORE_DETAIL_DISABLED_DEPRECATED_WARNINGS
+ #endif
+ 
+diff --git a/inst/include/boost/interprocess/detail/config_begin.hpp b/inst/include/boost/interprocess/detail/config_begin.hpp
+index 8c8a0ff5..bd03a4f5 100644
+--- a/inst/include/boost/interprocess/detail/config_begin.hpp
++++ b/inst/include/boost/interprocess/detail/config_begin.hpp
+@@ -46,5 +46,5 @@
+ 
+ #if (defined(BOOST_GCC) && (BOOST_GCC >= 40600)) || (defined(BOOST_CLANG) && defined(_MSC_VER))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+diff --git a/inst/include/boost/interprocess/detail/config_external_begin.hpp b/inst/include/boost/interprocess/detail/config_external_begin.hpp
+index 67c05568..93446dac 100644
+--- a/inst/include/boost/interprocess/detail/config_external_begin.hpp
++++ b/inst/include/boost/interprocess/detail/config_external_begin.hpp
+@@ -14,10 +14,10 @@
+ 
+ #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+ #  pragma GCC diagnostic push
+-#  pragma GCC diagnostic ignored "-Wshadow"
+-#  pragma GCC diagnostic ignored "-Wsign-conversion"
+-#  pragma GCC diagnostic ignored "-Wconversion"
++//#  pragma GCC diagnostic ignored "-Wshadow"
++//#  pragma GCC diagnostic ignored "-Wsign-conversion"
++//#  pragma GCC diagnostic ignored "-Wconversion"
+ #  if (BOOST_GCC >= 100000)
+-#     pragma GCC diagnostic ignored "-Warith-conversion"
++//#     pragma GCC diagnostic ignored "-Warith-conversion"
+ #  endif
+ #endif
+diff --git a/inst/include/boost/interprocess/detail/timed_utils.hpp b/inst/include/boost/interprocess/detail/timed_utils.hpp
+index 268b6925..b56567f2 100644
+--- a/inst/include/boost/interprocess/detail/timed_utils.hpp
++++ b/inst/include/boost/interprocess/detail/timed_utils.hpp
+@@ -109,7 +109,7 @@ struct enable_if_usduration
+ 
+    #if defined(__clang__) // Clang has to be checked before MSVC
+    #  pragma clang diagnostic push
+-   #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
++  //   #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    #elif (defined(_MSC_VER) && (_MSC_VER >= 1400))
+    #  pragma warning(push) // preserve warning settings
+    #  pragma warning(disable : 4996) // disable depricated localtime/gmtime warning on vc8
+diff --git a/inst/include/boost/interprocess/detail/win32_api.hpp b/inst/include/boost/interprocess/detail/win32_api.hpp
+index 44b770d9..0ddbe0ac 100644
+--- a/inst/include/boost/interprocess/detail/win32_api.hpp
++++ b/inst/include/boost/interprocess/detail/win32_api.hpp
+@@ -61,17 +61,17 @@
+ #  if (BOOST_GCC >= 40600)
+ #     pragma GCC diagnostic push
+ #     if (BOOST_GCC >= 40800)
+-#        pragma GCC diagnostic ignored "-Wpedantic"
++//#        pragma GCC diagnostic ignored "-Wpedantic"
+ #     else
+-#        pragma GCC diagnostic ignored "-pedantic"
++//#        pragma GCC diagnostic ignored "-pedantic"
+ #     endif
+-#     pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++//#     pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ #  else
+ #     pragma GCC system_header
+ #  endif
+ //When loading DLLs we have no option but reinterpret casting function types  
+ #  if (BOOST_GCC >= 80000)
+-#        pragma GCC diagnostic ignored "-Wcast-function-type"
++//#        pragma GCC diagnostic ignored "-Wcast-function-type"
+ #  endif
+ #endif
+ 
+diff --git a/inst/include/boost/interprocess/detail/workaround.hpp b/inst/include/boost/interprocess/detail/workaround.hpp
+index af044b7c..f2aa7c9c 100644
+--- a/inst/include/boost/interprocess/detail/workaround.hpp
++++ b/inst/include/boost/interprocess/detail/workaround.hpp
+@@ -246,7 +246,7 @@
+ 
+ #ifdef __clang__
+    #define BOOST_INTERPROCESS_DISABLE_DEPRECATED_WARNING _Pragma("clang diagnostic push") \
+-                                                         _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
++//                                                         _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+    #define BOOST_INTERPROCESS_RESTORE_WARNING            _Pragma("clang diagnostic pop")
+ #else // __clang__
+    #define BOOST_INTERPROCESS_DISABLE_DEPRECATED_WARNING __pragma(warning(push)) \
+diff --git a/inst/include/boost/interprocess/interprocess_printers.hpp b/inst/include/boost/interprocess/interprocess_printers.hpp
+index 263f964c..112bc14b 100644
+--- a/inst/include/boost/interprocess/interprocess_printers.hpp
++++ b/inst/include/boost/interprocess/interprocess_printers.hpp
+@@ -11,7 +11,7 @@
+ #if defined(__ELF__)
+ #ifdef __clang__
+ #pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Woverlength-strings"
++//#pragma clang diagnostic ignored "-Woverlength-strings"
+ #endif
+ __asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+         ".ascii \"\\4gdb.inlined-script.BOOST_INTERPROCESS_INTERPROCESS_PRINTERS_HPP\\n\"\n"
+diff --git a/inst/include/boost/interprocess/offset_ptr.hpp b/inst/include/boost/interprocess/offset_ptr.hpp
+index 13d4a7fb..be4249dc 100644
+--- a/inst/include/boost/interprocess/offset_ptr.hpp
++++ b/inst/include/boost/interprocess/offset_ptr.hpp
+@@ -35,7 +35,7 @@
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+ 
+ //!\file
+diff --git a/inst/include/boost/intrusive/pointer_plus_bits.hpp b/inst/include/boost/intrusive/pointer_plus_bits.hpp
+index b967bb63..6084ef08 100644
+--- a/inst/include/boost/intrusive/pointer_plus_bits.hpp
++++ b/inst/include/boost/intrusive/pointer_plus_bits.hpp
+@@ -29,9 +29,9 @@
+ #if defined(BOOST_GCC)
+ #  if (BOOST_GCC >= 40600)
+ #     pragma GCC diagnostic push
+-#     pragma GCC diagnostic ignored "-Wuninitialized"
++//#     pragma GCC diagnostic ignored "-Wuninitialized"
+ #     if (BOOST_GCC >= 40700)
+-#        pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//#        pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #     endif
+ #  endif
+ #endif
+diff --git a/inst/include/boost/iterator/advance.hpp b/inst/include/boost/iterator/advance.hpp
+index 2b742565..2f810ad7 100644
+--- a/inst/include/boost/iterator/advance.hpp
++++ b/inst/include/boost/iterator/advance.hpp
+@@ -32,7 +32,7 @@ namespace iterators {
+ #if BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 40600)
+ // type-limits warning issued below when n is an unsigned integral
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wtype-limits"
++      //#pragma GCC diagnostic ignored "-Wtype-limits"
+ #endif
+ 
+         template <typename BidirectionalIterator, typename Distance>
+diff --git a/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp b/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp
+index a4944a28..f3cb49a9 100644
+--- a/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp
++++ b/inst/include/boost/json/detail/charconv/detail/fast_float/parse_number.hpp
+@@ -30,7 +30,7 @@ namespace detail {
+ 
+ #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+ 
+ template <typename T, typename UC>
+@@ -128,10 +128,10 @@ BOOST_FORCEINLINE bool rounds_to_nearest() noexcept {
+   //  see https://stackoverflow.com/questions/46079446/is-there-a-warning-for-floating-point-equality-checking-in-visual-studio-2013
+   #elif defined(__clang__)
+   #   pragma clang diagnostic push
+-  #   pragma clang diagnostic ignored "-Wfloat-equal"
++//  #   pragma clang diagnostic ignored "-Wfloat-equal"
+   #elif defined(__GNUC__)
+   #   pragma GCC diagnostic push
+-  #   pragma GCC diagnostic ignored "-Wfloat-equal"
++//  #   pragma GCC diagnostic ignored "-Wfloat-equal"
+   #endif
+   return (fmini + 1.0f == 1.0f - fmini);
+   #ifdef BOOST_JSON_FASTFLOAT_VISUAL_STUDIO
+diff --git a/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp b/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp
+index 6ca5a250..dc9bede0 100644
+--- a/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp
++++ b/inst/include/boost/json/detail/charconv/detail/from_chars_float_impl.hpp
+@@ -22,7 +22,7 @@ namespace boost { namespace json { namespace detail { namespace charconv { names
+ # pragma warning(disable: 4244) // Implict converion when BOOST_IF_CONSTEXPR expands to if
+ #elif defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+ 
+ template <typename T>
+diff --git a/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp b/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp
+index f709ab7e..f559736b 100644
+--- a/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp
++++ b/inst/include/boost/json/detail/charconv/detail/from_chars_integer_impl.hpp
+@@ -51,15 +51,15 @@ constexpr unsigned char digit_from_char(char val) noexcept
+ 
+ #elif defined(__clang__)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wconstant-conversion"
++//# pragma clang diagnostic ignored "-Wconstant-conversion"
+ 
+ #elif defined(__GNUC__) && (__GNUC__ < 7)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Woverflow"
++//# pragma GCC diagnostic ignored "-Woverflow"
+ 
+ #elif defined(__GNUC__) && (__GNUC__ >= 7)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ 
+ #endif
+ 
+diff --git a/inst/include/boost/json/detail/charconv/detail/parser.hpp b/inst/include/boost/json/detail/charconv/detail/parser.hpp
+index b24f47fa..c8fc9881 100644
+--- a/inst/include/boost/json/detail/charconv/detail/parser.hpp
++++ b/inst/include/boost/json/detail/charconv/detail/parser.hpp
+@@ -20,7 +20,7 @@
+ 
+ #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+ 
+ namespace boost { namespace json { namespace detail { namespace charconv { namespace detail {
+diff --git a/inst/include/boost/json/detail/charconv/impl/from_chars.ipp b/inst/include/boost/json/detail/charconv/impl/from_chars.ipp
+index e3ae6482..f012d36c 100644
+--- a/inst/include/boost/json/detail/charconv/impl/from_chars.ipp
++++ b/inst/include/boost/json/detail/charconv/impl/from_chars.ipp
+@@ -21,7 +21,7 @@
+ #include <cstring>
+ 
+ #if defined(__GNUC__) && __GNUC__ < 5
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+ 
+ std::errc boost::json::detail::charconv::detail::errno_to_errc(int errno_value) noexcept
+diff --git a/inst/include/boost/json/detail/gdb_printers.hpp b/inst/include/boost/json/detail/gdb_printers.hpp
+index ccc7f1eb..6307379d 100644
+--- a/inst/include/boost/json/detail/gdb_printers.hpp
++++ b/inst/include/boost/json/detail/gdb_printers.hpp
+@@ -16,10 +16,10 @@
+ 
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Woverlength-strings"
++//# pragma clang diagnostic ignored "-Woverlength-strings"
+ #elif defined(__GNUC__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Woverlength-strings"
++//# pragma GCC diagnostic ignored "-Woverlength-strings"
+ #endif
+ 
+ __asm__(
+diff --git a/inst/include/boost/json/detail/parse_into.hpp b/inst/include/boost/json/detail/parse_into.hpp
+index 3f7418a2..ad3fd554 100644
+--- a/inst/include/boost/json/detail/parse_into.hpp
++++ b/inst/include/boost/json/detail/parse_into.hpp
+@@ -141,7 +141,7 @@ protected:
+     P* parent_;
+ #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+     V next_value_ = {};
+     inner_handler_type inner_;
+@@ -567,7 +567,7 @@ public:
+         *inserter++ = std::move(this->next_value_);
+ #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+         this->next_value_ = {};
+ #if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+diff --git a/inst/include/boost/json/detail/sbo_buffer.hpp b/inst/include/boost/json/detail/sbo_buffer.hpp
+index 5529fa5a..6e486191 100644
+--- a/inst/include/boost/json/detail/sbo_buffer.hpp
++++ b/inst/include/boost/json/detail/sbo_buffer.hpp
+@@ -52,7 +52,7 @@ class sbo_buffer
+         delete[] data_;
+ #if defined(__GNUC__)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ #endif
+         buffer_ = {};
+ #if defined(__GNUC__)
+diff --git a/inst/include/boost/json/detail/value_to.hpp b/inst/include/boost/json/detail/value_to.hpp
+index 29ae444f..5c4dbe28 100644
+--- a/inst/include/boost/json/detail/value_to.hpp
++++ b/inst/include/boost/json/detail/value_to.hpp
+@@ -306,7 +306,7 @@ try_make_tuple_like(
+             ...);
+ #if defined(BOOST_GCC)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+     if( ec.failed() )
+         return {boost::system::in_place_error, ec};
+@@ -379,8 +379,8 @@ struct to_described_member
+ 
+ #if defined(__GNUC__) && BOOST_GCC_VERSION >= 80000 && BOOST_GCC_VERSION < 11000
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wunused"
+-# pragma GCC diagnostic ignored "-Wunused-variable"
++//# pragma GCC diagnostic ignored "-Wunused"
++//# pragma GCC diagnostic ignored "-Wunused-variable"
+ #endif
+         auto member_res = try_value_to<M>( found->value(), ctx );
+ #if defined(__GNUC__) && BOOST_GCC_VERSION >= 80000 && BOOST_GCC_VERSION < 11000
+diff --git a/inst/include/boost/json/impl/serializer.hpp b/inst/include/boost/json/impl/serializer.hpp
+index 203c7ba5..f759d96c 100644
+--- a/inst/include/boost/json/impl/serializer.hpp
++++ b/inst/include/boost/json/impl/serializer.hpp
+@@ -111,10 +111,10 @@ write_impl(integral_conversion_tag, writer& w, stream& ss0)
+ 
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wsign-compare"
++//# pragma clang diagnostic ignored "-Wsign-compare"
+ #elif defined(__GNUC__)
+ # pragma GCC diagnostic push
+-# pragma GCC  diagnostic ignored "-Wsign-compare"
++//# pragma GCC  diagnostic ignored "-Wsign-compare"
+ #elif defined(_MSC_VER)
+ # pragma warning( push )
+ # pragma warning( disable : 4018 )
+diff --git a/inst/include/boost/json/value.hpp b/inst/include/boost/json/value.hpp
+index 151b8e3e..ace92a9e 100644
+--- a/inst/include/boost/json/value.hpp
++++ b/inst/include/boost/json/value.hpp
+@@ -4779,7 +4779,7 @@ get<1>(key_value_pair&& kvp) noexcept
+ 
+ #ifdef __clang__
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wmismatched-tags"
++//# pragma clang diagnostic ignored "-Wmismatched-tags"
+ #endif
+ 
+ #ifndef BOOST_JSON_DOCS
+diff --git a/inst/include/boost/locale/detail/facet_id.hpp b/inst/include/boost/locale/detail/facet_id.hpp
+index 14ab4583..06bbea9d 100644
+--- a/inst/include/boost/locale/detail/facet_id.hpp
++++ b/inst/include/boost/locale/detail/facet_id.hpp
+@@ -14,7 +14,7 @@
+ namespace boost { namespace locale { namespace detail {
+ #if BOOST_CLANG_VERSION >= 40900
+ #    pragma clang diagnostic push
+-#    pragma clang diagnostic ignored "-Wundefined-var-template"
++//#    pragma clang diagnostic ignored "-Wundefined-var-template"
+ #endif
+     /// CRTP base class to hold the id required for facets
+     ///
+diff --git a/inst/include/boost/log/detail/header.hpp b/inst/include/boost/log/detail/header.hpp
+index 37495c00..784d0b7e 100644
+--- a/inst/include/boost/log/detail/header.hpp
++++ b/inst/include/boost/log/detail/header.hpp
+@@ -52,20 +52,20 @@
+ 
+ #pragma GCC diagnostic push
+ // 'var' defined but not used
+-#pragma GCC diagnostic ignored "-Wunused-variable"
++//#pragma GCC diagnostic ignored "-Wunused-variable"
+ // unused parameter 'arg'
+-#pragma GCC diagnostic ignored "-Wunused-parameter"
++//#pragma GCC diagnostic ignored "-Wunused-parameter"
+ // missing initializer for member var
+-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
++//#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+ 
+ #if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
+ // typedef 'foo' locally defined but not used
+-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
++//#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #endif
+ 
+ #if defined(__clang__)
+ // the argument to '__builtin_assume' has side effects that will be discarded
+-#pragma clang diagnostic ignored "-Wassume"
++//#pragma clang diagnostic ignored "-Wassume"
+ #endif // defined(__clang__)
+ 
+ #endif
+diff --git a/inst/include/boost/math/ccmath/isinf.hpp b/inst/include/boost/math/ccmath/isinf.hpp
+index ecf0d620..1e868417 100644
+--- a/inst/include/boost/math/ccmath/isinf.hpp
++++ b/inst/include/boost/math/ccmath/isinf.hpp
+@@ -24,7 +24,7 @@ constexpr bool isinf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(T x) noexcept
+         {
+ #if defined(__clang_major__) && __clang_major__ >= 6
+ #pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wtautological-constant-compare"
++//#pragma clang diagnostic ignored "-Wtautological-constant-compare"
+ #endif
+             return x == std::numeric_limits<T>::infinity() || -x == std::numeric_limits<T>::infinity();
+ #if defined(__clang_major__) && __clang_major__ >= 6
+diff --git a/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_small_a_negative_b_by_ratio.hpp b/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_small_a_negative_b_by_ratio.hpp
+deleted file mode 100644
+index 4414a75d..00000000
+--- a/inst/include/boost/math/special_functions/detail/hypergeometric_1F1_small_a_negative_b_by_ratio.hpp
++++ /dev/null
+@@ -1,70 +0,0 @@
+-
+-///////////////////////////////////////////////////////////////////////////////
+-//  Copyright 2018 John Maddock
+-//  Distributed under the Boost
+-//  Software License, Version 1.0. (See accompanying file
+-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+-//
+-#ifndef BOOST_MATH_HYPERGEOMETRIC_1F1_SMALL_A_NEG_B_HPP
+-#define BOOST_MATH_HYPERGEOMETRIC_1F1_SMALL_A_NEG_B_HPP
+-
+-#include <algorithm>
+-#include <boost/math/tools/recurrence.hpp>
+-
+-  namespace boost { namespace math { namespace detail {
+-
+-     // forward declaration for initial values
+-     template <class T, class Policy>
+-     inline T hypergeometric_1F1_imp(const T& a, const T& b, const T& z, const Policy& pol);
+-
+-     template <class T, class Policy>
+-     inline T hypergeometric_1F1_imp(const T& a, const T& b, const T& z, const Policy& pol, long long& log_scaling);
+-
+-      template <class T>
+-      T max_b_for_1F1_small_a_negative_b_by_ratio(const T& z)
+-      {
+-         if (z < -998)
+-            return (z * 2) / 3;
+-         float max_b[][2] = 
+-         {
+-            { 0.0f, -47.3046f }, {-6.7275f, -52.0351f }, { -8.9543f, -57.2386f }, {-11.9182f, -62.9625f }, {-14.421f, -69.2587f }, {-19.1943f, -76.1846f }, {-23.2252f, -83.803f }, {-28.1024f, -92.1833f }, {-34.0039f, -101.402f }, {-37.4043f, -111.542f }, {-45.2593f, -122.696f }, {-54.7637f, -134.966f }, {-60.2401f, -148.462f }, {-72.8905f, -163.308f }, {-88.1975f, -179.639f }, {-88.1975f, -197.603f }, {-106.719f, -217.363f }, {-129.13f, -239.1f }, {-142.043f, -263.01f }, {-156.247f, -289.311f }, {-189.059f, -318.242f }, {-207.965f, -350.066f }, {-228.762f, -385.073f }, {-276.801f, -423.58f }, {-304.482f, -465.938f }, {-334.93f, -512.532f }, {-368.423f, -563.785f }, {-405.265f, -620.163f }, {-445.792f, -682.18f }, {-539.408f, -750.398f }, {-593.349f, -825.437f }, {-652.683f, -907.981f }, {-717.952f, -998.779f }
+-         };
+-         auto p = std::lower_bound(max_b, max_b + sizeof(max_b) / sizeof(max_b[0]), z, [](const float (&a)[2], const T& z) { return a[1] > z; });
+-         T b = p - max_b ? (*--p)[0] : 0;
+-         //
+-         // We need approximately an extra 10 recurrences per 50 binary digits precision above that of double:
+-         //
+-         b += (std::max)(0, boost::math::tools::digits<T>() - 53) / 5;
+-         return b;
+-      }
+-
+-      template <class T, class Policy>
+-      T hypergeometric_1F1_small_a_negative_b_by_ratio(const T& a, const T& b, const T& z, const Policy& pol, long long& log_scaling)
+-      {
+-         BOOST_MATH_STD_USING
+-         //
+-         // We grab the ratio for M[a, b, z] / M[a, b+1, z] and use it to seed 2 initial values,
+-         // then recurse until b > 0, compute a reference value and normalize (Millers method).
+-         //
+-         int iterations = itrunc(-b, pol);
+-         std::uintmax_t max_iter = boost::math::policies::get_max_series_iterations<Policy>();
+-         T ratio = boost::math::tools::function_ratio_from_forwards_recurrence(boost::math::detail::hypergeometric_1F1_recurrence_b_coefficients<T>(a, b, z), boost::math::tools::epsilon<T>(), max_iter);
+-         boost::math::policies::check_series_iterations<T>("boost::math::hypergeometric_1F1_small_a_negative_b_by_ratio<%1%>(%1%,%1%,%1%)", max_iter, pol);
+-         T first = 1;
+-         T second = 1 / ratio;
+-         long long scaling1 = 0;
+-         BOOST_MATH_ASSERT(b + iterations != a);
+-         second = boost::math::tools::apply_recurrence_relation_forward(boost::math::detail::hypergeometric_1F1_recurrence_b_coefficients<T>(a, b + 1, z), iterations, first, second, &scaling1);
+-         long long scaling2 = 0;
+-         first = hypergeometric_1F1_imp(a, T(b + iterations + 1), z, pol, scaling2);
+-         //
+-         // Result is now first/second * e^(scaling2 - scaling1)
+-         //
+-         log_scaling += scaling2 - scaling1;
+-         return first / second;
+-      }
+-
+-
+-  } } } // namespaces
+-
+-#endif // BOOST_MATH_HYPERGEOMETRIC_1F1_SMALL_A_NEG_B_HPP
+diff --git a/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp b/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp
+index fd53cddb..73444520 100644
+--- a/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp
++++ b/inst/include/boost/math/special_functions/hypergeometric_1F1.hpp
+@@ -24,7 +24,7 @@
+ #include <boost/math/special_functions/detail/hypergeometric_pFq_checked_series.hpp>
+ #include <boost/math/special_functions/detail/hypergeometric_1F1_addition_theorems_on_z.hpp>
+ #include <boost/math/special_functions/detail/hypergeometric_1F1_large_abz.hpp>
+-#include <boost/math/special_functions/detail/hypergeometric_1F1_small_a_negative_b_by_ratio.hpp>
++#include <boost/math/special_functions/detail/hypergeometric_1F1_small_a_negative_b_by_r.hpp>
+ #include <boost/math/special_functions/detail/hypergeometric_1F1_negative_b_regions.hpp>
+ 
+ namespace boost { namespace math { namespace detail {
+diff --git a/inst/include/boost/move/algo/adaptive_merge.hpp b/inst/include/boost/move/algo/adaptive_merge.hpp
+index 5261d729..3631adef 100644
+--- a/inst/include/boost/move/algo/adaptive_merge.hpp
++++ b/inst/include/boost/move/algo/adaptive_merge.hpp
+@@ -18,8 +18,8 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
+-#pragma GCC diagnostic ignored "-Wconversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wconversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/algo/adaptive_sort.hpp b/inst/include/boost/move/algo/adaptive_sort.hpp
+index 54fa87b4..8e313ae2 100644
+--- a/inst/include/boost/move/algo/adaptive_sort.hpp
++++ b/inst/include/boost/move/algo/adaptive_sort.hpp
+@@ -19,8 +19,8 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
+-#pragma GCC diagnostic ignored "-Wconversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wconversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp b/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp
+index 2b45407d..b9b1fde3 100644
+--- a/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp
++++ b/inst/include/boost/move/algo/detail/adaptive_sort_merge.hpp
+@@ -59,8 +59,8 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
+-#pragma GCC diagnostic ignored "-Wconversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wconversion"
+ #endif
+ 
+ #ifndef BOOST_MOVE_ADAPTIVE_SORT_STATS_LEVEL
+diff --git a/inst/include/boost/move/algo/detail/heap_sort.hpp b/inst/include/boost/move/algo/detail/heap_sort.hpp
+index 4ed5a1c7..1158a2cb 100644
+--- a/inst/include/boost/move/algo/detail/heap_sort.hpp
++++ b/inst/include/boost/move/algo/detail/heap_sort.hpp
+@@ -32,7 +32,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {  namespace movelib{
+diff --git a/inst/include/boost/move/algo/detail/insertion_sort.hpp b/inst/include/boost/move/algo/detail/insertion_sort.hpp
+index 77f0b698..c5a6e501 100644
+--- a/inst/include/boost/move/algo/detail/insertion_sort.hpp
++++ b/inst/include/boost/move/algo/detail/insertion_sort.hpp
+@@ -35,7 +35,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {  namespace movelib{
+diff --git a/inst/include/boost/move/algo/detail/merge.hpp b/inst/include/boost/move/algo/detail/merge.hpp
+index f9f12757..3617da8c 100644
+--- a/inst/include/boost/move/algo/detail/merge.hpp
++++ b/inst/include/boost/move/algo/detail/merge.hpp
+@@ -23,7 +23,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/algo/detail/merge_sort.hpp b/inst/include/boost/move/algo/detail/merge_sort.hpp
+index dbc4797c..a9ec3e57 100644
+--- a/inst/include/boost/move/algo/detail/merge_sort.hpp
++++ b/inst/include/boost/move/algo/detail/merge_sort.hpp
+@@ -36,7 +36,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/algo/detail/pdqsort.hpp b/inst/include/boost/move/algo/detail/pdqsort.hpp
+index 1e927558..1b46b0af 100644
+--- a/inst/include/boost/move/algo/detail/pdqsort.hpp
++++ b/inst/include/boost/move/algo/detail/pdqsort.hpp
+@@ -59,7 +59,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/algo/detail/search.hpp b/inst/include/boost/move/algo/detail/search.hpp
+index 9433fbd4..10e89302 100644
+--- a/inst/include/boost/move/algo/detail/search.hpp
++++ b/inst/include/boost/move/algo/detail/search.hpp
+@@ -15,7 +15,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/algo/detail/set_difference.hpp b/inst/include/boost/move/algo/detail/set_difference.hpp
+index 812ca5f3..1d5163ed 100644
+--- a/inst/include/boost/move/algo/detail/set_difference.hpp
++++ b/inst/include/boost/move/algo/detail/set_difference.hpp
+@@ -17,7 +17,7 @@
+ 
+ #if defined(BOOST_CLANG) || (defined(BOOST_GCC) && (BOOST_GCC >= 40600))
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wsign-conversion"
++//#pragma GCC diagnostic ignored "-Wsign-conversion"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/move/detail/std_ns_begin.hpp b/inst/include/boost/move/detail/std_ns_begin.hpp
+index de13cde5..49a7aba8 100644
+--- a/inst/include/boost/move/detail/std_ns_begin.hpp
++++ b/inst/include/boost/move/detail/std_ns_begin.hpp
+@@ -13,7 +13,7 @@
+    #if defined(__clang__)
+       #define BOOST_MOVE_STD_NS_GCC_DIAGNOSTIC_PUSH
+       #pragma GCC diagnostic push
+-      #pragma GCC diagnostic ignored "-Wc++11-extensions"
++//      #pragma GCC diagnostic ignored "-Wc++11-extensions"
+    #endif
+    #define BOOST_MOVE_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
+    #define BOOST_MOVE_STD_NS_END _LIBCPP_END_NAMESPACE_STD
+diff --git a/inst/include/boost/mp11/function.hpp b/inst/include/boost/mp11/function.hpp
+index e20b4520..6aa9c6f2 100644
+--- a/inst/include/boost/mp11/function.hpp
++++ b/inst/include/boost/mp11/function.hpp
+@@ -200,7 +200,7 @@ template<class... T> using mp_similar = typename detail::mp_similar_impl<T...>::
+ 
+ #if BOOST_MP11_GCC
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wsign-compare"
++  //# pragma GCC diagnostic ignored "-Wsign-compare"
+ #endif
+ 
+ // mp_less<T1, T2>
+diff --git a/inst/include/boost/mpl/assert.hpp b/inst/include/boost/mpl/assert.hpp
+index c7ecddf0..1143345c 100644
+--- a/inst/include/boost/mpl/assert.hpp
++++ b/inst/include/boost/mpl/assert.hpp
+@@ -187,7 +187,7 @@ template< typename P > struct assert_arg_pred_not
+ #if BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 80000)
+ #define BOOST_MPL_IGNORE_PARENTHESES_WARNING
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wparentheses"
++//#pragma GCC diagnostic ignored "-Wparentheses"
+ #endif
+ 
+ template< typename Pred >
+diff --git a/inst/include/boost/mpl/print.hpp b/inst/include/boost/mpl/print.hpp
+index 36e25cd3..430aa797 100644
+--- a/inst/include/boost/mpl/print.hpp
++++ b/inst/include/boost/mpl/print.hpp
+@@ -48,7 +48,7 @@ struct print
+ {
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wc++11-extensions"
++  //# pragma clang diagnostic ignored "-Wc++11-extensions"
+     const int m_x = 1 / (sizeof(T) - sizeof(T));
+ # pragma clang diagnostic pop
+ #elif defined(BOOST_MSVC)
+diff --git a/inst/include/boost/multi_array.hpp b/inst/include/boost/multi_array.hpp
+index c9ed215b..8b2ad940 100644
+--- a/inst/include/boost/multi_array.hpp
++++ b/inst/include/boost/multi_array.hpp
+@@ -23,7 +23,7 @@
+ 
+ #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+ #  pragma GCC diagnostic push
+-#  pragma GCC diagnostic ignored "-Wshadow"
++//#  pragma GCC diagnostic ignored "-Wshadow"
+ #endif
+ 
+ #include "boost/multi_array/base.hpp"
+diff --git a/inst/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp b/inst/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp
+index ae398456..6524edc1 100644
+--- a/inst/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp
++++ b/inst/include/boost/multi_index/detail/ignore_wstrict_aliasing.hpp
+@@ -11,7 +11,7 @@
+ #if defined(BOOST_GCC)&&(BOOST_GCC>=4*10000+6*100)
+ #if !defined(BOOST_MULTI_INDEX_DETAIL_RESTORE_WSTRICT_ALIASING)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
++//#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+ #else
+ #pragma GCC diagnostic pop
+ #endif
+diff --git a/inst/include/boost/multiprecision/cpp_int.hpp b/inst/include/boost/multiprecision/cpp_int.hpp
+index efcf50ca..076a96a5 100644
+--- a/inst/include/boost/multiprecision/cpp_int.hpp
++++ b/inst/include/boost/multiprecision/cpp_int.hpp
+@@ -44,7 +44,7 @@ namespace multiprecision {
+ // see https://github.com/boostorg/multiprecision/issues/413
+ // and https://github.com/boostorg/multiprecision/issues/431
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++  //#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+ 
+ namespace detail {
+diff --git a/inst/include/boost/multiprecision/cpp_int/misc.hpp b/inst/include/boost/multiprecision/cpp_int/misc.hpp
+index a8a76400..5cc32f58 100644
+--- a/inst/include/boost/multiprecision/cpp_int/misc.hpp
++++ b/inst/include/boost/multiprecision/cpp_int/misc.hpp
+@@ -370,7 +370,7 @@ eval_msb(const cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocato
+ // spurious.  The warning appears only when in release mode, and asserts are on.
+ //
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Warray-bounds"
++//#pragma GCC diagnostic ignored "-Warray-bounds"
+ #endif
+ 
+ template <std::size_t MinBits1, std::size_t MaxBits1, cpp_integer_type SignType1, cpp_int_check_type Checked1, class Allocator1>
+diff --git a/inst/include/boost/numeric/odeint/stepper/generation.hpp b/inst/include/boost/numeric/odeint/stepper/generation.hpp
+index a051d13b..ed7a320d 100644
+--- a/inst/include/boost/numeric/odeint/stepper/generation.hpp
++++ b/inst/include/boost/numeric/odeint/stepper/generation.hpp
+@@ -24,12 +24,12 @@
+ #include <boost/numeric/odeint/stepper/generation/generation_controlled_runge_kutta.hpp>
+ #include <boost/numeric/odeint/stepper/generation/generation_dense_output_runge_kutta.hpp>
+ 
+-#include <boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp>
++#include <boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_cl.hpp>
+ #include <boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54.hpp>
+ #include <boost/numeric/odeint/stepper/generation/generation_runge_kutta_dopri5.hpp>
+ #include <boost/numeric/odeint/stepper/generation/generation_runge_kutta_fehlberg78.hpp>
+ 
+-#include <boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp>
++#include <boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_m.hpp>
+ 
+ #include <boost/numeric/odeint/stepper/generation/generation_rosenbrock4.hpp>
+ 
+diff --git a/inst/include/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp b/inst/include/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp
+deleted file mode 100644
+index ca95a1f5..00000000
+--- a/inst/include/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/*
+- boost/numeric/odeint/stepper/detail/generation_controlled_adams_bashforth_moulton.hpp
+-
+- [begin_description]
+- Spezialization of the generation functions for creation of the controlled adams bashforth moulton stepper.
+- [end_description]
+-
+- Copyright 2017 Valentin Noah Hartmann
+-
+- Distributed under the Boost Software License, Version 1.0.
+- (See accompanying file LICENSE_1_0.txt or
+- copy at http://www.boost.org/LICENSE_1_0.txt)
+- */
+-
+-#ifndef GENERATION_CONTROLLED_ADAMS_BASHFORTH_MOULTON_HPP_INCLUDED
+-#define GENERATION_CONTROLLED_ADAMS_BASHFORTH_MOULTON_HPP_INCLUDED
+-
+-#include <boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp>
+-#include <boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp>
+-#include <boost/numeric/odeint/stepper/generation/make_controlled.hpp>
+-
+-namespace boost {
+-namespace numeric {
+-namespace odeint {
+-
+-template< size_t Steps, class State , class Value , class Deriv , class Time , class Algebra , class Operations , class Resizer >
+-struct get_controller< adaptive_adams_bashforth_moulton< Steps, State , Value , Deriv , Time , Algebra , Operations , Resizer > >
+-{
+-	typedef adaptive_adams_bashforth_moulton<Steps, State, Value, Deriv, Time, Algebra, Operations, Resizer> stepper_type;
+-    typedef controlled_adams_bashforth_moulton< stepper_type > type;
+-};
+-
+-// controller factory for controlled_adams_bashforth_moulton
+-template< class Stepper >
+-struct controller_factory< Stepper , controlled_adams_bashforth_moulton< Stepper > >
+-{
+-    typedef Stepper stepper_type;
+-    typedef controlled_adams_bashforth_moulton< stepper_type > controller_type;
+-    typedef typename controller_type::step_adjuster_type step_adjuster_type;
+-    typedef typename stepper_type::value_type value_type;
+-    typedef typename stepper_type::value_type time_type;
+-
+-    controller_type operator()( value_type abs_error , value_type rel_error , const stepper_type &stepper )
+-    {
+-        return controller_type(step_adjuster_type(abs_error, rel_error));
+-    }
+-
+-    controller_type operator()( value_type abs_error , value_type rel_error ,
+-                                time_type max_dt, const stepper_type &stepper )
+-    {
+-        return controller_type( step_adjuster_type(abs_error, rel_error, max_dt));
+-    }
+-};
+-
+-}
+-}
+-}
+-
+-#endif
+\ No newline at end of file
+diff --git a/inst/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp b/inst/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp
+deleted file mode 100644
+index 1cc0f91d..00000000
+--- a/inst/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/*
+- [auto_generated]
+- boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp
+-
+- [begin_description]
+- Enable the factory functions for the controller and the dense output of the
+- Runge-Kutta-Cash-Karp 54 method with the classical implementation.
+- [end_description]
+-
+- Copyright 2011 Karsten Ahnert
+- Copyright 2011 Mario Mulansky
+-
+- Distributed under the Boost Software License, Version 1.0.
+- (See accompanying file LICENSE_1_0.txt or
+- copy at http://www.boost.org/LICENSE_1_0.txt)
+- */
+-
+-
+-#ifndef BOOST_NUMERIC_ODEINT_STEPPER_GENERATION_GENERATION_RUNGE_KUTTA_CASH_KARP54_CLASSIC_HPP_INCLUDED
+-#define BOOST_NUMERIC_ODEINT_STEPPER_GENERATION_GENERATION_RUNGE_KUTTA_CASH_KARP54_CLASSIC_HPP_INCLUDED
+-
+-#include <boost/numeric/odeint/stepper/controlled_runge_kutta.hpp>
+-#include <boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp>
+-#include <boost/numeric/odeint/stepper/generation/make_controlled.hpp>
+-
+-
+-namespace boost {
+-namespace numeric {
+-namespace odeint {
+-
+-
+-// Specializations for runge_kutta_cash_karp54
+-template< class State , class Value , class Deriv , class Time , class Algebra , class Operations , class Resize >
+-struct get_controller< runge_kutta_cash_karp54_classic< State , Value , Deriv , Time , Algebra , Operations , Resize > >
+-{
+-    typedef runge_kutta_cash_karp54_classic< State , Value , Deriv , Time , Algebra , Operations , Resize > stepper_type;
+-    typedef controlled_runge_kutta< stepper_type > type;
+-};
+-
+-
+-
+-
+-} // odeint
+-} // numeric
+-} // boost
+-
+-
+-#endif // BOOST_NUMERIC_ODEINT_STEPPER_GENERATION_GENERATION_RUNGE_KUTTA_CASH_KARP54_CLASSIC_HPP_INCLUDED
+diff --git a/inst/include/boost/optional/bad_optional_access.hpp b/inst/include/boost/optional/bad_optional_access.hpp
+index add78675..2555898a 100644
+--- a/inst/include/boost/optional/bad_optional_access.hpp
++++ b/inst/include/boost/optional/bad_optional_access.hpp
+@@ -21,7 +21,7 @@ namespace boost {
+ 
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wweak-vtables"
++  //# pragma clang diagnostic ignored "-Wweak-vtables"
+ #endif
+ 
+ class bad_optional_access : public std::logic_error
+diff --git a/inst/include/boost/phoenix/core/actor.hpp b/inst/include/boost/phoenix/core/actor.hpp
+index 5a9fa0c5..b7b6dab2 100644
+--- a/inst/include/boost/phoenix/core/actor.hpp
++++ b/inst/include/boost/phoenix/core/actor.hpp
+@@ -132,7 +132,7 @@ namespace boost { namespace phoenix
+ #if defined __clang__ && defined __has_warning
+ #  pragma clang diagnostic push
+ #  if __has_warning("-Wdeprecated-copy")
+-#    pragma clang diagnostic ignored "-Wdeprecated-copy"
++  //#    pragma clang diagnostic ignored "-Wdeprecated-copy"
+ #  endif
+ #endif
+     template <typename Expr>
+diff --git a/inst/include/boost/proto/expr.hpp b/inst/include/boost/proto/expr.hpp
+index bbdb014a..25f5e73a 100644
+--- a/inst/include/boost/proto/expr.hpp
++++ b/inst/include/boost/proto/expr.hpp
+@@ -137,7 +137,7 @@ namespace boost { namespace proto
+             // The warning cannot be fixed for aggregates
+             // Sadly, GCC currently emits the warning at the use location:
+             // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94492
+-            #pragma GCC diagnostic ignored "-Wdeprecated-copy"
++      //            #pragma GCC diagnostic ignored "-Wdeprecated-copy"
+         #endif
+ 
+         // This is where the expr specialization are
+diff --git a/inst/include/boost/ptr_container/detail/reversible_ptr_container.hpp b/inst/include/boost/ptr_container/detail/reversible_ptr_container.hpp
+index f5eb396c..c802530a 100644
+--- a/inst/include/boost/ptr_container/detail/reversible_ptr_container.hpp
++++ b/inst/include/boost/ptr_container/detail/reversible_ptr_container.hpp
+@@ -48,7 +48,7 @@
+ 
+ #if defined(BOOST_PTR_CONTAINER_DISABLE_DEPRECATED)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/ptr_container/ptr_sequence_adapter.hpp b/inst/include/boost/ptr_container/ptr_sequence_adapter.hpp
+index eb907ba9..8c5f8a91 100644
+--- a/inst/include/boost/ptr_container/ptr_sequence_adapter.hpp
++++ b/inst/include/boost/ptr_container/ptr_sequence_adapter.hpp
+@@ -27,7 +27,7 @@
+ 
+ #if defined(BOOST_PTR_CONTAINER_DISABLE_DEPRECATED)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/ptr_container/ptr_vector.hpp b/inst/include/boost/ptr_container/ptr_vector.hpp
+index 87016297..9896baa7 100644
+--- a/inst/include/boost/ptr_container/ptr_vector.hpp
++++ b/inst/include/boost/ptr_container/ptr_vector.hpp
+@@ -24,7 +24,7 @@
+ 
+ #if defined(BOOST_PTR_CONTAINER_DISABLE_DEPRECATED)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/python/detail/wrap_python.hpp b/inst/include/boost/python/detail/wrap_python.hpp
+index 037e4bf2..a0aef791 100644
+--- a/inst/include/boost/python/detail/wrap_python.hpp
++++ b/inst/include/boost/python/detail/wrap_python.hpp
+@@ -166,7 +166,7 @@ typedef int pid_t;
+ // Python.h header uses `register` keyword until Python 3.4
+ #if BOOST_PYTHON_GCC_HAS_WREGISTER
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wregister"
++//# pragma GCC diagnostic ignored "-Wregister"
+ #elif defined(_MSC_VER)
+ # pragma warning(push)
+ # pragma warning(disable : 5033)  // 'register' is no longer a supported storage class
+diff --git a/inst/include/boost/random/detail/disable_warnings.hpp b/inst/include/boost/random/detail/disable_warnings.hpp
+index 4582dcb1..47c7b2e8 100644
+--- a/inst/include/boost/random/detail/disable_warnings.hpp
++++ b/inst/include/boost/random/detail/disable_warnings.hpp
+@@ -25,5 +25,5 @@
+ 
+ #if defined(BOOST_GCC) && BOOST_GCC >= 40600
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wlogical-op"
++//#pragma GCC diagnostic ignored "-Wlogical-op"
+ #endif
+diff --git a/inst/include/boost/range/adaptor/indexed.hpp b/inst/include/boost/range/adaptor/indexed.hpp
+index 8fd02890..b98fa3ac 100644
+--- a/inst/include/boost/range/adaptor/indexed.hpp
++++ b/inst/include/boost/range/adaptor/indexed.hpp
+@@ -373,7 +373,7 @@ namespace std {
+ 
+ #if defined(BOOST_CLANG)
+ #pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wmismatched-tags"
++  //#pragma clang diagnostic ignored "-Wmismatched-tags"
+ #endif
+ 
+ template<size_t N, class T, class Indexable>
+diff --git a/inst/include/boost/scope/detail/header.hpp b/inst/include/boost/scope/detail/header.hpp
+index fc99f16c..ad392079 100644
+--- a/inst/include/boost/scope/detail/header.hpp
++++ b/inst/include/boost/scope/detail/header.hpp
+@@ -35,13 +35,13 @@
+ 
+ #pragma GCC diagnostic push
+ // unused parameter 'arg'
+-#pragma GCC diagnostic ignored "-Wunused-parameter"
++//#pragma GCC diagnostic ignored "-Wunused-parameter"
+ // unused function 'foo'
+-#pragma GCC diagnostic ignored "-Wunused-function"
++//#pragma GCC diagnostic ignored "-Wunused-function"
+ 
+ #if defined(__clang__)
+ // template argument uses unnamed type
+-#pragma clang diagnostic ignored "-Wunnamed-type-template-args"
++//#pragma clang diagnostic ignored "-Wunnamed-type-template-args"
+ #endif // defined(__clang__)
+ 
+ #endif
+diff --git a/inst/include/boost/smart_ptr/bad_weak_ptr.hpp b/inst/include/boost/smart_ptr/bad_weak_ptr.hpp
+index b0cc5109..c50259ec 100644
+--- a/inst/include/boost/smart_ptr/bad_weak_ptr.hpp
++++ b/inst/include/boost/smart_ptr/bad_weak_ptr.hpp
+@@ -26,7 +26,7 @@ namespace boost
+ #if defined(BOOST_CLANG)
+ // Intel C++ on Mac defines __clang__ but doesn't support the pragma
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wweak-vtables"
++  //# pragma clang diagnostic ignored "-Wweak-vtables"
+ #endif
+ 
+ class bad_weak_ptr: public std::exception
+diff --git a/inst/include/boost/smart_ptr/detail/shared_count.hpp b/inst/include/boost/smart_ptr/detail/shared_count.hpp
+index cafd3c2f..232ad850 100644
+--- a/inst/include/boost/smart_ptr/detail/shared_count.hpp
++++ b/inst/include/boost/smart_ptr/detail/shared_count.hpp
+@@ -39,7 +39,7 @@
+ 
+ #if defined( BOOST_SP_DISABLE_DEPRECATED )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/smart_ptr/scoped_ptr.hpp b/inst/include/boost/smart_ptr/scoped_ptr.hpp
+index c71d70d0..6f58e2e9 100644
+--- a/inst/include/boost/smart_ptr/scoped_ptr.hpp
++++ b/inst/include/boost/smart_ptr/scoped_ptr.hpp
+@@ -25,7 +25,7 @@
+ 
+ #if defined( BOOST_SP_DISABLE_DEPRECATED )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/smart_ptr/shared_ptr.hpp b/inst/include/boost/smart_ptr/shared_ptr.hpp
+index 2431a335..b4b6b7a5 100644
+--- a/inst/include/boost/smart_ptr/shared_ptr.hpp
++++ b/inst/include/boost/smart_ptr/shared_ptr.hpp
+@@ -37,7 +37,7 @@
+ 
+ #if defined( BOOST_SP_DISABLE_DEPRECATED )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/static_string/static_string.hpp b/inst/include/boost/static_string/static_string.hpp
+index fce1ddb7..325a7742 100644
+--- a/inst/include/boost/static_string/static_string.hpp
++++ b/inst/include/boost/static_string/static_string.hpp
+@@ -13,16 +13,16 @@
+ 
+ #if defined(__GNUC__) && __GNUC__ >= 8
+ #pragma GCC diagnostic push
+-#pragma GCC system_header
++//#pragma GCC system_header
+ // false positives
+-#pragma GCC diagnostic ignored "-Warray-bounds"
+-#pragma GCC diagnostic ignored "-Wrestrict"
+-#pragma GCC diagnostic ignored "-Wstringop-overflow"
++//#pragma GCC diagnostic ignored "-Warray-bounds"
++//#pragma GCC diagnostic ignored "-Wrestrict"
++//#pragma GCC diagnostic ignored "-Wstringop-overflow"
+ #endif
+ 
+ #if defined(__GNUC__) && __GNUC__ >= 7
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnoexcept-type"
++//#pragma GCC diagnostic ignored "-Wnoexcept-type"
+ #endif
+ 
+ // External include guard
+@@ -583,7 +583,7 @@ count_digits(std::size_t value)
+ // not need to be extremely precise.
+ #if defined(__GNUC__) && __GNUC__ >= 7
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wformat-truncation"
++//#pragma GCC diagnostic ignored "-Wformat-truncation"
+ #endif
+ 
+ template<std::size_t N>
+diff --git a/inst/include/boost/system/detail/error_category.hpp b/inst/include/boost/system/detail/error_category.hpp
+index e7042213..a1332111 100644
+--- a/inst/include/boost/system/detail/error_category.hpp
++++ b/inst/include/boost/system/detail/error_category.hpp
+@@ -43,7 +43,7 @@ class std_category;
+ 
+ #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++  //#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ #endif
+ 
+ #if defined(BOOST_MSVC) && BOOST_MSVC < 1900
+diff --git a/inst/include/boost/system/detail/error_category_impl.hpp b/inst/include/boost/system/detail/error_category_impl.hpp
+index 7d69f71d..94f4f843 100644
+--- a/inst/include/boost/system/detail/error_category_impl.hpp
++++ b/inst/include/boost/system/detail/error_category_impl.hpp
+@@ -113,7 +113,7 @@ inline void error_category::init_stdcat() const
+ 
+ #if defined( BOOST_GCC ) && BOOST_GCC >= 40800 && BOOST_GCC < 70000
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
++  //#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+ #endif
+ 
+ inline BOOST_NOINLINE error_category::operator std::error_category const & () const
+diff --git a/inst/include/boost/system/detail/error_code.hpp b/inst/include/boost/system/detail/error_code.hpp
+index a395c818..2a3f81e5 100644
+--- a/inst/include/boost/system/detail/error_code.hpp
++++ b/inst/include/boost/system/detail/error_code.hpp
+@@ -33,7 +33,7 @@
+ 
+ #if defined(BOOST_GCC) && BOOST_GCC >= 40600 && BOOST_GCC < 70000
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wstrict-aliasing"
++//# pragma GCC diagnostic ignored "-Wstrict-aliasing"
+ #endif
+ 
+ namespace boost
+diff --git a/inst/include/boost/system/detail/generic_category.hpp b/inst/include/boost/system/detail/generic_category.hpp
+index 6a1a0581..89c44cc0 100644
+--- a/inst/include/boost/system/detail/generic_category.hpp
++++ b/inst/include/boost/system/detail/generic_category.hpp
+@@ -28,7 +28,7 @@ namespace detail
+ 
+ #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++  //#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ #endif
+ 
+ class BOOST_SYMBOL_VISIBLE generic_error_category: public error_category
+diff --git a/inst/include/boost/system/detail/generic_category_message.hpp b/inst/include/boost/system/detail/generic_category_message.hpp
+index 611ce378..57761ff9 100644
+--- a/inst/include/boost/system/detail/generic_category_message.hpp
++++ b/inst/include/boost/system/detail/generic_category_message.hpp
+@@ -70,7 +70,7 @@ inline std::string generic_error_category_message( int ev )
+ # elif defined(__clang__) && defined(__has_warning)
+ #  pragma clang diagnostic push
+ #  if __has_warning("-Wdeprecated-declarations")
+-#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
++  //#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ #  endif
+ # endif
+ 
+diff --git a/inst/include/boost/system/detail/interop_category.hpp b/inst/include/boost/system/detail/interop_category.hpp
+index 418c6918..fe35b99f 100644
+--- a/inst/include/boost/system/detail/interop_category.hpp
++++ b/inst/include/boost/system/detail/interop_category.hpp
+@@ -28,7 +28,7 @@ namespace detail
+ 
+ #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++  //#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ #endif
+ 
+ class BOOST_SYMBOL_VISIBLE interop_error_category: public error_category
+diff --git a/inst/include/boost/system/detail/system_category.hpp b/inst/include/boost/system/detail/system_category.hpp
+index 260894d4..0d8f3d03 100644
+--- a/inst/include/boost/system/detail/system_category.hpp
++++ b/inst/include/boost/system/detail/system_category.hpp
+@@ -27,7 +27,7 @@ namespace detail
+ 
+ #if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++  //#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ #endif
+ 
+ class BOOST_SYMBOL_VISIBLE system_error_category: public error_category
+diff --git a/inst/include/boost/system/result.hpp b/inst/include/boost/system/result.hpp
+index 456a7929..21e68d67 100644
+--- a/inst/include/boost/system/result.hpp
++++ b/inst/include/boost/system/result.hpp
+@@ -31,7 +31,7 @@ namespace system
+ 
+ #if defined(__GNUC__) && __GNUC__ >= 7 && __GNUC__ <= 8
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wattributes"
++  //# pragma GCC diagnostic ignored "-Wattributes"
+ #endif
+ 
+ BOOST_NORETURN BOOST_NOINLINE inline void throw_exception_from_error( error_code const & e, boost::source_location const& loc )
+diff --git a/inst/include/boost/test/detail/suppress_warnings.hpp b/inst/include/boost/test/detail/suppress_warnings.hpp
+index 2145da5f..79ed3b25 100644
+--- a/inst/include/boost/test/detail/suppress_warnings.hpp
++++ b/inst/include/boost/test/detail/suppress_warnings.hpp
+@@ -28,14 +28,14 @@
+ 
+ #if defined(BOOST_CLANG) && (BOOST_CLANG == 1)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wvariadic-macros"
+-# pragma clang diagnostic ignored "-Wmissing-declarations"
++//# pragma clang diagnostic ignored "-Wvariadic-macros"
++//# pragma clang diagnostic ignored "-Wmissing-declarations"
+ #endif
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 4 * 10000 + 6 * 100)
+ # pragma GCC diagnostic push
+-# pragma GCC diagnostic ignored "-Wvariadic-macros"
+-# pragma GCC diagnostic ignored "-Wmissing-declarations"
++//# pragma GCC diagnostic ignored "-Wvariadic-macros"
++//# pragma GCC diagnostic ignored "-Wmissing-declarations"
+ // # pragma GCC diagnostic ignored "-Wattributes"
+ #endif
+ 
+diff --git a/inst/include/boost/tuple/detail/tuple_basic.hpp b/inst/include/boost/tuple/detail/tuple_basic.hpp
+index ad488be7..a4969ae0 100644
+--- a/inst/include/boost/tuple/detail/tuple_basic.hpp
++++ b/inst/include/boost/tuple/detail/tuple_basic.hpp
+@@ -45,7 +45,7 @@
+ 
+ #if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
++//#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #endif
+ 
+ namespace boost {
+diff --git a/inst/include/boost/tuple/tuple.hpp b/inst/include/boost/tuple/tuple.hpp
+index cbebdf1b..8ed3e5fc 100644
+--- a/inst/include/boost/tuple/tuple.hpp
++++ b/inst/include/boost/tuple/tuple.hpp
+@@ -73,7 +73,7 @@ namespace std
+ 
+ #if defined(BOOST_CLANG)
+ # pragma clang diagnostic push
+-# pragma clang diagnostic ignored "-Wmismatched-tags"
++  //# pragma clang diagnostic ignored "-Wmismatched-tags"
+ #endif
+ 
+ // std::tuple_size
+diff --git a/inst/include/boost/type_traits/detail/has_prefix_operator.hpp b/inst/include/boost/type_traits/detail/has_prefix_operator.hpp
+index 77818c20..f423e391 100644
+--- a/inst/include/boost/type_traits/detail/has_prefix_operator.hpp
++++ b/inst/include/boost/type_traits/detail/has_prefix_operator.hpp
+@@ -20,7 +20,7 @@
+ 
+ #ifdef BOOST_GCC
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated"
++//#pragma GCC diagnostic ignored "-Wdeprecated"
+ #endif
+ #if defined(BOOST_MSVC)
+ #   pragma warning ( push )
+diff --git a/inst/include/boost/type_traits/has_logical_not.hpp b/inst/include/boost/type_traits/has_logical_not.hpp
+index d36858e1..9e0f7065 100644
+--- a/inst/include/boost/type_traits/has_logical_not.hpp
++++ b/inst/include/boost/type_traits/has_logical_not.hpp
+@@ -11,7 +11,7 @@
+ 
+ #if defined(__GNUC__) && (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__ > 40800)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wunused-value"
++//#pragma GCC diagnostic ignored "-Wunused-value"
+ #endif
+ 
+ #define BOOST_TT_TRAIT_NAME has_logical_not
+diff --git a/inst/include/boost/unordered/detail/archive_constructed.hpp b/inst/include/boost/unordered/detail/archive_constructed.hpp
+index 341e2dbd..a6128a38 100644
+--- a/inst/include/boost/unordered/detail/archive_constructed.hpp
++++ b/inst/include/boost/unordered/detail/archive_constructed.hpp
+@@ -50,7 +50,7 @@ struct archive_constructed:private noncopyable
+ 
+ #if defined(BOOST_UNORDERED_IGNORE_WSTRICT_ALIASING)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
++  //#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+ #endif
+ 
+   T& get(){return *space.address();}
+diff --git a/inst/include/boost/unordered/detail/foa/core.hpp b/inst/include/boost/unordered/detail/foa/core.hpp
+index 062b7112..1d96644d 100644
+--- a/inst/include/boost/unordered/detail/foa/core.hpp
++++ b/inst/include/boost/unordered/detail/foa/core.hpp
+@@ -1461,7 +1461,7 @@ public:
+ 
+ #if defined(BOOST_GCC)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+ 
+   table_core(
+@@ -2092,7 +2092,7 @@ private:
+ 
+ #if defined(BOOST_GCC)
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
+ 
+   /* used by allocator-extended move ctor */
+diff --git a/inst/include/boost/unordered/detail/foa/ignore_wshadow.hpp b/inst/include/boost/unordered/detail/foa/ignore_wshadow.hpp
+index f84262bc..c894fd02 100644
+--- a/inst/include/boost/unordered/detail/foa/ignore_wshadow.hpp
++++ b/inst/include/boost/unordered/detail/foa/ignore_wshadow.hpp
+@@ -28,7 +28,7 @@
+  */
+ 
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wshadow"
++//#pragma GCC diagnostic ignored "-Wshadow"
+ #else
+ #pragma GCC diagnostic pop
+ #endif
+diff --git a/inst/include/boost/unordered/unordered_printers.hpp b/inst/include/boost/unordered/unordered_printers.hpp
+index cace173b..28072202 100644
+--- a/inst/include/boost/unordered/unordered_printers.hpp
++++ b/inst/include/boost/unordered/unordered_printers.hpp
+@@ -11,7 +11,7 @@
+ #if defined(__ELF__)
+ #ifdef __clang__
+ #pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Woverlength-strings"
++//#pragma clang diagnostic ignored "-Woverlength-strings"
+ #endif
+ __asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
+         ".ascii \"\\4gdb.inlined-script.BOOST_UNORDERED_UNORDERED_PRINTERS_HPP\\n\"\n"
+diff --git a/inst/include/boost/variant/get.hpp b/inst/include/boost/variant/get.hpp
+index 085c6f23..652e57f9 100644
+--- a/inst/include/boost/variant/get.hpp
++++ b/inst/include/boost/variant/get.hpp
+@@ -32,7 +32,7 @@ namespace boost {
+ 
+ #if defined(BOOST_CLANG)
+ #   pragma clang diagnostic push
+-#   pragma clang diagnostic ignored "-Wweak-vtables"
++  //#   pragma clang diagnostic ignored "-Wweak-vtables"
+ #endif
+ //////////////////////////////////////////////////////////////////////////
+ // class bad_get
+diff --git a/inst/include/boost/variant2/variant.hpp b/inst/include/boost/variant2/variant.hpp
+index 3eb53424..233b94f3 100644
+--- a/inst/include/boost/variant2/variant.hpp
++++ b/inst/include/boost/variant2/variant.hpp
+@@ -688,10 +688,10 @@ template<class T1, class... T> union variant_storage_impl<mp11::mp_true, T1, T..
+ #if defined(BOOST_GCC) && (__GNUC__ >= 7)
+ # pragma GCC diagnostic push
+ // False positive in at least GCC 7 and GCC 10 ASAN triggered by monostate (via result<void>)
+-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
++//# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #if __GNUC__ >= 12
+ // False positive in at least GCC 12 and GCC 13 ASAN and -Og triggered by monostate (via result<void>)
+-# pragma GCC diagnostic ignored "-Wuninitialized"
++//# pragma GCC diagnostic ignored "-Wuninitialized"
+ #endif
+ #endif
+         *this = variant_storage_impl( mp11::mp_size_t<I>(), std::forward<A>(a)... );
+diff --git a/inst/include/boost/winapi/detail/header.hpp b/inst/include/boost/winapi/detail/header.hpp
+index c03c42a2..47376f4f 100644
+--- a/inst/include/boost/winapi/detail/header.hpp
++++ b/inst/include/boost/winapi/detail/header.hpp
+@@ -20,7 +20,7 @@
+ 
+ #pragma GCC diagnostic push
+ // ISO C++ 1998 does not support 'long long'
+-#pragma GCC diagnostic ignored "-Wlong-long"
++//#pragma GCC diagnostic ignored "-Wlong-long"
+ 
+ #endif
+ 
+diff --git a/inst/include/boost/winapi/get_proc_address.hpp b/inst/include/boost/winapi/get_proc_address.hpp
+index 897061ac..f6aba5ea 100644
+--- a/inst/include/boost/winapi/get_proc_address.hpp
++++ b/inst/include/boost/winapi/get_proc_address.hpp
+@@ -77,7 +77,7 @@ BOOST_FORCEINLINE FuncPtr get_proc_address(HMODULE_ hModule, LPCSTR_ lpProcName)
+ {
+ #if defined(BOOST_GCC) && BOOST_GCC >= 80000
+ #pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wcast-function-type"
++//#pragma GCC diagnostic ignored "-Wcast-function-type"
+ #endif
+     return reinterpret_cast< FuncPtr >(boost::winapi::get_proc_address(hModule, lpProcName));
+ #if defined(BOOST_GCC) && BOOST_GCC >= 80000
diff --git a/local/scripts/CreateBoost.sh b/local/scripts/CreateBoost.sh
index 5e4223d71..985f5a06a 100755
--- a/local/scripts/CreateBoost.sh
+++ b/local/scripts/CreateBoost.sh
@@ -2,7 +2,8 @@
 ##
 ## CreateBoost.sh -- derived from CreateBoost.R
 ##
-## Jay Emerson and Dirk Eddelbuettel,  2012 - 2023
+## Jay Emerson and Dirk Eddelbuettel,  2012 - 2013
+## Dirk Eddelbuettel, 2014 - 2024
 
 
 ## (1) Adjust these variables as needed
@@ -10,10 +11,10 @@
 ## -- on a standard git checkout, this repo it may be ~/git/bh
 pkgdir="${HOME}/git/bh"
 ## -- current boost sources, placed eg in ${pkgdir}/local/
-boosttargz="boost_1_84_0.tar.gz"
+boosttargz="boost_1_87_0.tar.gz"
 ## -- current package version and date (and other metadata as needed)
-version="1.84.0-0"
-date="2023-12-17"
+version="1.87.0-0"
+date="2024-12-12"